diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 07ccb34f27..0000000000
--- a/.drone.yml
+++ /dev/null
@@ -1,183 +0,0 @@
----
-kind: pipeline
-name: unit-tests
-
-steps:
-    - name: bootstrap
-      image: signalwire/freeswitch-public-base:bullseye
-      pull: always
-      commands:
-      - cat /proc/sys/kernel/core_pattern
-      - ./bootstrap.sh -j
-
-    - name: configure
-      image: signalwire/freeswitch-public-base:bullseye
-      pull: always
-      environment:
-        REPOTOKEN:
-          from_secret: repotoken
-      commands:
-      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
-      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
-      - export REPOTOKEN=''
-      - rm -rf /etc/apt/auth.conf
-      - git clone https://github.com/freeswitch/sofia-sip.git
-      - cd sofia-sip && ./autogen.sh && ./configure.gnu && make -j`nproc` && make install && cd ..
-      - echo 'codecs/mod_openh264' >> modules.conf
-      - sed -i '/applications\\/mod_http_cache/s/^#//g' modules.conf
-      - sed -i '/event_handlers\\/mod_rayo/s/^#//g' modules.conf
-      - sed -i '/formats\\/mod_opusfile/s/^#//g' modules.conf
-      - sed -i '/languages\\/mod_lua/s/^#//g' modules.conf
-      - export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
-      - ./configure --enable-address-sanitizer --enable-fake-dlclose
-
-    - name: build
-      image: signalwire/freeswitch-public-base:bullseye
-      pull: always
-      environment:
-        REPOTOKEN:
-          from_secret: repotoken
-      commands:
-      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
-      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
-      - export REPOTOKEN=''
-      - rm -rf /etc/apt/auth.conf
-      - cd sofia-sip && make install && cd ..
-      - echo '#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./build-status.txt\n' > build.sh
-      - chmod +x build.sh
-      - ./build.sh
-
-    - name: run-tests
-      image: signalwire/freeswitch-public-base:bullseye
-      pull: always
-      environment:
-        REPOTOKEN:
-          from_secret: repotoken
-      commands:
-      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
-      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
-      - export REPOTOKEN=''
-      - rm -rf /etc/apt/auth.conf
-      - cd sofia-sip && make install && cd ..
-      - make install || true
-      - cd tests/unit
-      - export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
-      - ./run-tests.sh
-      - ls -la /cores
-      - mkdir logs && (mv log_run-tests_*.html logs || true) && (mv backtrace_*.txt logs || true)
-      - echo 0 > run-tests-status.txt
-      - ./collect-test-logs.sh && exit 0 || echo 'Some tests failed'
-      - echo 1 > run-tests-status.txt
-      - cd logs && ls -la
-
-    - name: notify
-      image: signalwire/drone-notify
-      pull: always
-      environment:
-        SLACK_WEBHOOK_URL:
-          from_secret: slack_webhook_url
-        ENV_FILE:
-          from_secret: notify_env
-      commands:
-      - /root/unit-tests-notify.sh
-
-trigger:
-  branch:
-  - master
-  event:
-  - pull_request
-  - push
-
----
-kind: pipeline
-name: scan-build
-
-steps:
-    - name: bootstrap
-      image: signalwire/freeswitch-public-base:bullseye
-      pull: always
-      commands:
-      - ./bootstrap.sh -j
-
-    - name: configure
-      image: signalwire/freeswitch-public-base:bullseye
-      pull: always
-      environment:
-        REPOTOKEN:
-          from_secret: repotoken
-      commands:
-      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
-      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
-      - export REPOTOKEN=''
-      - rm -rf /etc/apt/auth.conf
-      - cp build/modules.conf.most modules.conf
-      #Enable/Uncomment mods
-      - echo 'codecs/mod_openh264' >> modules.conf
-      - sed -i "/mod_mariadb/s/^#//g" modules.conf
-      - sed -i "/mod_v8/s/^#//g" modules.conf
-      #Disable/Comment out mods
-      - sed -i '/mod_ilbc/s/^/#/g' modules.conf
-      - sed -i '/mod_isac/s/^/#/g' modules.conf
-      - sed -i '/mod_mp4/s/^/#/g' modules.conf
-      - sed -i '/mod_mongo/s/^/#/g' modules.conf
-      - sed -i '/mod_pocketsphinx/s/^/#/g' modules.conf
-      - sed -i '/mod_sangoma_codec/s/^/#/g' modules.conf
-      - sed -i '/mod_siren/s/^/#/g' modules.conf
-      #Comment out mods for a while
-      - sed -i '/mod_avmd/s/^/#/g' modules.conf
-      - sed -i '/mod_basic/s/^/#/g' modules.conf
-      - sed -i '/mod_cdr_mongodb/s/^/#/g' modules.conf
-      - sed -i '/mod_cv/s/^/#/g' modules.conf
-      - sed -i '/mod_erlang_event/s/^/#/g' modules.conf
-      - sed -i '/mod_perl/s/^/#/g' modules.conf
-      - sed -i '/mod_rtmp/s/^/#/g' modules.conf
-      - sed -i '/mod_unimrcp/s/^/#/g' modules.conf
-      - sed -i '/mod_xml_rpc/s/^/#/g' modules.conf
-      - ./configure
-
-    - name: scan-build
-      image: signalwire/freeswitch-public-base:bullseye
-      pull: always
-      environment:
-        REPOTOKEN:
-          from_secret: repotoken
-      commands:
-      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
-      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
-      - export REPOTOKEN=''
-      - rm -rf /etc/apt/auth.conf
-      - mkdir -p scan-build
-      - echo '#!/bin/bash\nscan-build-11 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
-      - chmod +x scan.sh
-      - ./scan.sh
-      - exitstatus=`cat ./scan-build-status.txt`
-      - echo "*** Exit status is $exitstatus"
-
-    - name: notify
-      image: signalwire/drone-notify
-      pull: always
-      environment:
-        SLACK_WEBHOOK_URL:
-          from_secret: slack_webhook_url
-        ENV_FILE:
-          from_secret: notify_env
-      commands:
-      - /root/scan-build-notify.sh
-
-trigger:
-  branch:
-  - master
-  event:
-  - pull_request
-  - push
-
----
-kind: signature
-hmac: 780e4aaee61e3683ea4a8d6fe5131f7c9e62ebad727546013f18df0fca80d705
-
-...
diff --git a/.github/docker/debian/bookworm/amd64/CI/Dockerfile b/.github/docker/debian/bookworm/amd64/CI/Dockerfile
new file mode 100644
index 0000000000..0fd3cec5f4
--- /dev/null
+++ b/.github/docker/debian/bookworm/amd64/CI/Dockerfile
@@ -0,0 +1,24 @@
+ARG BUILDER_IMAGE=signalwire/freeswitch-public-ci-base:bookworm-amd64
+
+FROM ${BUILDER_IMAGE}
+
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+LABEL org.opencontainers.image.authors="${MAINTAINER_EMAIL}"
+
+SHELL ["/bin/bash", "-c"]
+
+COPY --from=sofia-sip / /usr/src/sofia-sip
+COPY --from=freeswitch / /usr/src/freeswitch
+
+RUN cd /usr/src/freeswitch && \
+    ./ci.sh -t unit-test -a configure -c sofia-sip -p "/usr/src/sofia-sip" && \
+    ./ci.sh -t unit-test -a build -c sofia-sip -p "/usr/src/sofia-sip" && \
+    ./ci.sh -t unit-test -a install -c sofia-sip -p "/usr/src/sofia-sip" && \
+    ./ci.sh -t unit-test -a configure -c freeswitch -p "/usr/src/freeswitch" && \
+    ./ci.sh -t unit-test -a build -c freeswitch -p "/usr/src/freeswitch" && \
+    ./ci.sh -t unit-test -a install -c freeswitch -p "/usr/src/freeswitch"
+
+WORKDIR /usr/src/freeswitch/tests/unit
+
+ENTRYPOINT ["/usr/src/freeswitch/tests/unit/run-tests.sh"]
diff --git a/.github/docker/debian/bookworm/amd64/public.release.Dockerfile b/.github/docker/debian/bookworm/amd64/public.release.Dockerfile
new file mode 100644
index 0000000000..e6ec64661e
--- /dev/null
+++ b/.github/docker/debian/bookworm/amd64/public.release.Dockerfile
@@ -0,0 +1,103 @@
+ARG BUILDER_IMAGE=debian:bookworm-20240513
+
+FROM ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bookworm
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/debian-release/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile b/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile
new file mode 100644
index 0000000000..3ef7b38b38
--- /dev/null
+++ b/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile
@@ -0,0 +1,103 @@
+ARG BUILDER_IMAGE=debian:bookworm-20240513
+
+FROM ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bookworm
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-unstable ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-unstable ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/debian-unstable/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile b/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile
new file mode 100644
index 0000000000..d636a0c6ea
--- /dev/null
+++ b/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=arm32v7/debian:bookworm-20240513
+
+FROM --platform=linux/arm32 ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bookworm
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-release ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-release ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/rpi/debian-release/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile b/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile
new file mode 100644
index 0000000000..6259c7e8e9
--- /dev/null
+++ b/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=arm32v7/debian:bookworm-20240513
+
+FROM --platform=linux/arm32 ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bookworm
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-dev ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-dev ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/rpi/debian-dev/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile b/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile
new file mode 100644
index 0000000000..5c34022d29
--- /dev/null
+++ b/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=arm64v8/debian:bookworm-20240513
+
+FROM --platform=linux/arm64 ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bookworm
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/debian-release/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile b/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile
new file mode 100644
index 0000000000..0df5a178fe
--- /dev/null
+++ b/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=arm64v8/debian:bookworm-20240513
+
+FROM --platform=linux/arm64 ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bookworm
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-unstable ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-unstable ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/debian-unstable/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bullseye/amd64/public.release.Dockerfile b/.github/docker/debian/bullseye/amd64/public.release.Dockerfile
new file mode 100644
index 0000000000..94c5e335b2
--- /dev/null
+++ b/.github/docker/debian/bullseye/amd64/public.release.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=debian:bullseye-20240513
+
+FROM ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bullseye
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/debian-release/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile b/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile
new file mode 100644
index 0000000000..56586d338e
--- /dev/null
+++ b/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=debian:bullseye-20240513
+
+FROM ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bullseye
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-unstable ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-unstable ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/debian-unstable/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile b/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile
new file mode 100644
index 0000000000..200b8dca1a
--- /dev/null
+++ b/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=arm32v7/debian:bullseye-20240513
+
+FROM --platform=linux/arm32 ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bullseye
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-release ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-release ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/rpi/debian-release/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile b/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile
new file mode 100644
index 0000000000..24c5804b68
--- /dev/null
+++ b/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=arm32v7/debian:bullseye-20240513
+
+FROM --platform=linux/arm32 ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bullseye
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-dev ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-dev ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/rpi/debian-dev/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile b/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile
new file mode 100644
index 0000000000..5476c22192
--- /dev/null
+++ b/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=arm64v8/debian:bullseye-20240513
+
+FROM --platform=linux/arm64 ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bullseye
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/debian-release/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile b/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile
new file mode 100644
index 0000000000..f5a6a906c4
--- /dev/null
+++ b/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile
@@ -0,0 +1,102 @@
+ARG BUILDER_IMAGE=arm64v8/debian:bullseye-20240513
+
+FROM --platform=linux/arm64 ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="andrey@signalwire.com"
+
+# Credentials
+ARG REPO_DOMAIN=freeswitch.signalwire.com
+ARG REPO_USERNAME=user
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+ARG CODENAME=bullseye
+ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
+
+MAINTAINER "${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+        apt-transport-https \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN echo "export CODENAME=${CODENAME}" | tee ~/.env && \
+    chmod +x ~/.env
+
+RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
+deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-unstable ${CODENAME} main
+deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-unstable ${CODENAME} main
+EOF
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
+
+RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
+
+RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
+    printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
+    printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
+    printf "password "               >> /etc/apt/auth.conf && \
+    cat /run/secrets/REPO_PASSWORD   >> /etc/apt/auth.conf && \
+    sha512sum /run/secrets/REPO_PASSWORD && \
+    curl \
+        --fail \
+        --netrc-file /etc/apt/auth.conf \
+        --output ${GPG_KEY} \
+        https://${REPO_DOMAIN}/repo/deb/debian-unstable/signalwire-freeswitch-repo.gpg && \
+    file ${GPG_KEY} && \
+    apt-get --quiet update && \
+    mk-build-deps \
+        --install \
+        --remove debian/control \
+        --tool "apt-get --yes --no-install-recommends" && \
+    apt-get --yes --fix-broken install && \
+    rm -f /etc/apt/auth.conf
+
+ENV DEB_BUILD_OPTIONS="parallel=1"
+RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
+  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN dpkg-source \
+        --diff-ignore=.* \
+        --compression=xz \
+        --compression-level=9 \
+        --build \
+    . \
+    && debuild -b -us -uc \
+    && mkdir OUT \
+    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000000..d27560454b
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,215 @@
+name: Build and Distribute
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - v1.10
+    paths:
+      - "**"
+  workflow_dispatch:
+    inputs:
+      freeswitch_ref:
+        description: 'FreeSWITCH repository ref'
+        required: true
+        default: master
+        type: string
+      release:
+        description: 'FreeSWITCH release type'
+        type: choice
+        required: true
+        default: unstable
+        options:
+          - release
+          - unstable
+      publish:
+        description: 'Publish build data'
+        required: true
+        default: false
+        type: boolean
+
+concurrency:
+  group: ${{ github.head_ref || github.ref }}
+
+jobs:
+  preconfig:
+    name: 'Preconfig'
+    runs-on: ubuntu-latest
+    outputs:
+      deb: ${{ steps.deb.outputs.excludes }}
+      release: ${{ steps.release.outputs.release }}
+    steps:
+      - name: Generate Matrix excludes for DEB
+        id: deb
+        run: |
+          JSON="[]"
+
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            JSON=$(jq -n '[
+              {
+                "version": "bookworm",
+                "platform": {
+                  "name": "arm64v8"
+                }
+              },
+              {
+                "version": "bullseye",
+                "platform": {
+                  "name": "amd64"
+                }
+              },
+              {
+                "version": "bullseye",
+                "platform": {
+                  "name": "arm32v7"
+                }
+              }
+            ]')
+          fi
+
+          echo "excludes=$(echo $JSON | jq -c .)" | tee -a $GITHUB_OUTPUT
+
+      - name: Get release type based on branch
+        id: release
+        run: |
+          if [[ '${{ github.event_name }}' == 'pull_request' ]]; then
+            if [[ '${{ github.base_ref }}' == 'v1.10' ]]; then
+              echo 'release=release' | tee -a $GITHUB_OUTPUT
+            else
+              echo 'release=unstable' | tee -a $GITHUB_OUTPUT
+            fi
+          elif [[ '${{ github.event_name }}' == 'workflow_dispatch' ]]; then
+            echo 'release=${{ inputs.release }}' | tee -a $GITHUB_OUTPUT
+          elif [[ '${{ github.ref }}' == 'refs/heads/v1.10' ]]; then
+            echo 'release=release' | tee -a $GITHUB_OUTPUT
+          else
+            echo 'release=unstable' | tee -a $GITHUB_OUTPUT
+          fi
+
+  get-nonce:
+    name: 'Get Nonce for token'
+    runs-on: freeswitch-repo-auth-client
+    outputs:
+      nonce: ${{ steps.get-nonce.outputs.nonce }}
+    steps:
+      - name: Get Nonce
+        id: get-nonce
+        uses: signalwire/actions-template/.github/actions/repo-auth-client@main
+        with:
+          mode: nonce
+
+  issue-token:
+    name: 'Issue temporary token'
+    runs-on: ubuntu-latest
+    needs: get-nonce
+    outputs:
+      token: ${{ steps.issue-token.outputs.token }}
+    steps:
+      - name: Issue Token
+        id: issue-token
+        uses: signalwire/actions-template/.github/actions/repo-auth-client@main
+        env:
+          NONCE: ${{ needs.get-nonce.outputs.nonce }}
+        with:
+          mode: issue
+
+  deb-public:
+    name: 'DEB-PUBLIC'
+    permissions:
+      id-token: write
+      contents: read
+    needs:
+      - preconfig
+      - issue-token
+    uses: signalwire/actions-template/.github/workflows/cicd-docker-build-and-distribute.yml@main
+    strategy:
+      # max-parallel: 1
+      fail-fast: false
+      matrix:
+        os:
+          - debian
+        version:
+          - bookworm
+          - bullseye
+        platform:
+          - name: amd64
+            runner: ubuntu-latest
+          - name: arm32v7
+            runner: linux-arm64-4-core-public
+          - name: arm64v8
+            runner: linux-arm64-4-core-public
+        release:
+          - ${{ needs.preconfig.outputs.release }}
+        exclude: ${{ fromJson(needs.preconfig.outputs.deb) }}
+    with:
+      RUNNER: ${{ matrix.platform.runner }}
+      REF: ${{ inputs.freeswitch_ref }}
+      ARTIFACTS_PATTERN: '.*\.(deb|dsc|changes|tar.bz2|tar.gz|tar.lzma|tar.xz)$'
+      DOCKERFILE: .github/docker/${{ matrix.os }}/${{ matrix.version }}/${{ matrix.platform.name }}/public.${{ matrix.release }}.Dockerfile
+      MAINTAINER: 'Andrey Volk <andrey@signalwire.com>'
+      META_FILE_PATH_PREFIX: /var/www/freeswitch/public/${{ matrix.release }}/${{ github.ref_name }}/${{ github.run_id }}-${{ github.run_number }}
+      PLATFORM: ${{ matrix.platform.name }}
+      REPO_DOMAIN: 'freeswitch.signalwire.com'
+      TARGET_ARTIFACT_NAME: ${{ matrix.os }}-${{ matrix.version }}-${{ matrix.platform.name }}-public-${{ matrix.release }}-artifact
+      UPLOAD_BUILD_ARTIFACTS: >-
+        ${{
+          (github.event.pull_request.head.repo.full_name == github.repository) &&
+          (
+            (
+              github.event_name != 'pull_request' &&
+              github.event_name != 'workflow_dispatch'
+            ) ||
+            (github.event_name == 'workflow_dispatch' && inputs.publish)
+          )
+        }}
+    secrets:
+      GH_BOT_DEPLOY_TOKEN: ${{ secrets.PAT }}
+      HOSTNAME: ${{ secrets.HOSTNAME }}
+      PROXY_URL: ${{ secrets.PROXY_URL }}
+      USERNAME: ${{ secrets.USERNAME }}
+      TELEPORT_TOKEN: ${{ secrets.TELEPORT_TOKEN }}
+      REPO_USERNAME: 'SWUSERNAME'
+      REPO_PASSWORD: ${{ needs.issue-token.outputs.token }}
+
+  revoke-token:
+    name: 'Revoke temporary token'
+    runs-on: ubuntu-latest
+    # if: always()
+    needs:
+      - issue-token
+      - deb-public
+    steps:
+      - name: Revoke Token
+        id: revoke-token
+        uses: signalwire/actions-template/.github/actions/repo-auth-client@main
+        env:
+          TOKEN: ${{ needs.issue-token.outputs.token }}
+        with:
+          mode: revoke
+
+  meta:
+    name: 'Publish build data to meta-repo'
+    if: >-
+      ${{
+        (github.event.pull_request.head.repo.full_name == github.repository) &&
+        (
+          (
+            github.event_name != 'pull_request' &&
+            github.event_name != 'workflow_dispatch'
+          ) ||
+          (github.event_name == 'workflow_dispatch' && inputs.publish)
+        )
+      }}
+    needs:
+      - deb-public
+    permissions:
+      id-token: write
+      contents: read
+    uses: signalwire/actions-template/.github/workflows/meta-repo-content.yml@main
+    with:
+      META_CONTENT: '/var/www/freeswitch/public/{release,unstable}/${{ github.ref_name }}/${{ github.run_id }}-${{ github.run_number }}'
+      META_REPO: signalwire/bamboo_gha_trigger
+      META_REPO_BRANCH: trigger/freeswitch/${{ github.ref_name }}
+    secrets:
+      GH_BOT_DEPLOY_TOKEN: ${{ secrets.PAT }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..0a774108e0
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,103 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+      - v1.10
+  pull_request:
+    types:
+      - opened
+      - synchronize
+  workflow_dispatch:
+    inputs:
+      freeswitch_ref:
+        description: 'FreeSWITCH repository ref'
+        required: false
+        type: string
+      sofia-sip_ref:
+        description: 'Sofia-Sip repository ref'
+        required: false
+        type: string
+      dind:
+        description: 'Run tests using Docker-in-Docker'
+        required: false
+        type: boolean
+        default: false
+
+env:
+  CI_BASE_STATIC_IMAGE: signalwire/freeswitch-public-ci-base:bookworm-amd64
+  DOCKER_BUILD_SUMMARY: false
+  DOCKER_BUILD_CHECKS_ANNOTATIONS: false
+  DOCKER_BUILD_RECORD_UPLOAD: false
+
+jobs:
+  unit-tests-pre-config:
+    if: ${{ !inputs.dind }}
+    name: "Unit-tests pre-config"
+    runs-on: ubuntu-latest
+    env:
+      TOTAL_GROUPS: 2
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      container-image: ${{ steps.set-vars.outputs.container-image }}
+      working-directory: ${{ steps.set-vars.outputs.working-directory }}
+      tests-only: ${{ steps.set-vars.outputs.tests-only }}
+    steps:
+      - id: set-matrix
+        shell: bash
+        run: |
+          MATRIX=$(jq -c -n --argjson groups "${{ env.TOTAL_GROUPS }}" \
+            '{
+              include: [range(1; $groups + 1) | {group: ., total: $groups}]
+            }')
+          echo "matrix=$MATRIX" | tee -a $GITHUB_OUTPUT
+      - id: set-vars
+        shell: bash
+        run: |
+          echo "tests-only=false" >> $GITHUB_OUTPUT
+          echo "working-directory=freeswitch/tests/unit" >> $GITHUB_OUTPUT
+          echo "container-image=$CI_BASE_STATIC_IMAGE" >> $GITHUB_OUTPUT
+
+  unit-tests:
+    if: ${{ !inputs.dind }}
+    name: "Unit-tests (group ${{ matrix.group }})"
+    needs:
+      - unit-tests-pre-config
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.unit-tests-pre-config.outputs.matrix) }}
+    uses: ./.github/workflows/unit-test.yml
+    with:
+      total-groups: ${{ matrix.total }}
+      current-group: ${{ matrix.group }}
+      container-image: ${{ needs.unit-tests-pre-config.outputs.container-image }}
+      working-directory: ${{ needs.unit-tests-pre-config.outputs.working-directory }}
+      tests-only: ${{ fromJson(needs.unit-tests-pre-config.outputs.tests-only) }}
+    secrets: inherit
+
+  validate-unit-tests:
+    if: ${{ always() && !inputs.dind }}
+    name: "Validate Unit-tests"
+    needs: unit-tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check unit tests status
+        run: |
+          if [ "${{ needs.unit-tests.result }}" != "success" ]; then
+            exit 1
+          fi
+
+  unit-tests-dind:
+    if: ${{ inputs.dind }}
+    name: "Unit-tests D-in-D"
+    uses: ./.github/workflows/unit-test-dind.yml
+    with:
+      freeswitch_ref: ${{ inputs.freeswitch_ref }}
+      sofia-sip_ref: ${{ inputs.sofia-sip_ref }}
+    secrets: inherit
+
+  scan-build:
+    name: "Scan Build"
+    uses: ./.github/workflows/scan-build.yml
+    secrets: inherit
diff --git a/.github/workflows/scan-build.yml b/.github/workflows/scan-build.yml
new file mode 100644
index 0000000000..b274f45d6b
--- /dev/null
+++ b/.github/workflows/scan-build.yml
@@ -0,0 +1,99 @@
+name: Scan build (Static Analysis)
+
+on:
+  workflow_call:
+    inputs:
+      freeswitch_ref:
+        description: 'FreeSWITCH repository ref'
+        required: false
+        type: string
+      sofia-sip_ref:
+        description: 'Sofia-Sip repository ref'
+        required: false
+        type: string
+
+jobs:
+  scan-build:
+    runs-on: ubuntu-latest
+    container:
+      image: signalwire/freeswitch-public-ci-base:bookworm-amd64
+      options: --privileged
+    env:
+      DEBIAN_FRONTEND: noninteractive
+
+    steps:
+      - name: Checkout Sofia-Sip
+        if: inputs.sofia-sip_ref == ''
+        uses: actions/checkout@v4
+        with:
+          repository: freeswitch/sofia-sip
+          path: sofia-sip
+
+      - name: Checkout Sofia-Sip (via ref)
+        if: inputs.sofia-sip_ref != ''
+        uses: actions/checkout@v4
+        with:
+          repository: freeswitch/sofia-sip
+          ref: ${{ inputs.sofia-sip_ref }}
+          path: sofia-sip
+
+      - name: Checkout FreeSWITCH (via ref)
+        if: inputs.freeswitch_ref != ''
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.freeswitch_ref }}
+          path: freeswitch
+
+      - name: Checkout FreeSWITCH
+        if: inputs.freeswitch_ref == ''
+        uses: actions/checkout@v4
+        with:
+          path: freeswitch
+
+      - name: Configure, Build and Install Sofia-Sip
+        shell: bash
+        working-directory: freeswitch
+        run: |
+          ./ci.sh -t scan-build -a configure -c sofia-sip -p "$GITHUB_WORKSPACE/sofia-sip"
+          ./ci.sh -t scan-build -a build -c sofia-sip -p "$GITHUB_WORKSPACE/sofia-sip"
+          ./ci.sh -t scan-build -a install -c sofia-sip -p "$GITHUB_WORKSPACE/sofia-sip"
+
+      - name: Configure FreeSWITCH
+        shell: bash
+        working-directory: freeswitch
+        run: |
+          ./ci.sh -t scan-build -a configure -c freeswitch -p "$GITHUB_WORKSPACE/freeswitch"
+
+      - name: Run scan-build analysis
+        shell: bash
+        working-directory: freeswitch
+        run: |
+          ./ci.sh -t scan-build -a build -c freeswitch -p "$GITHUB_WORKSPACE/freeswitch"
+
+      - name: Check analysis results
+        if: always()
+        shell: bash
+        working-directory: freeswitch
+        run: |
+          ./ci.sh -t scan-build -a validate -c freeswitch -p "$GITHUB_WORKSPACE/freeswitch"
+
+      - name: Upload Scan-Build logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: scan-build-logs
+          path: freeswitch/scan-build
+          if-no-files-found: ignore
+          compression-level: 9
+
+      - name: Notify run tests result to slack
+        if: |
+          failure() &&
+          github.event_name == 'push' &&
+          (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10')
+        uses: signalwire/actions-template/.github/actions/slack@main
+        with:
+          CHANNEL: ${{ secrets.SLACK_DEVOPS_CI_CHANNEL }}
+          MESSAGE: Scan-Build ${{ github.repository }} > <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.run_id }}>. Static analysis failed.
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/unit-test-dind.yml b/.github/workflows/unit-test-dind.yml
new file mode 100644
index 0000000000..ca3abd5a6f
--- /dev/null
+++ b/.github/workflows/unit-test-dind.yml
@@ -0,0 +1,100 @@
+name: Unit-tests D-in-D
+
+on:
+  workflow_call:
+    inputs:
+      freeswitch_ref:
+        description: 'FreeSWITCH repository ref'
+        required: false
+        type: string
+      sofia-sip_ref:
+        description: 'Sofia-Sip repository ref'
+        required: false
+        type: string
+
+env:
+  MAX_CONTAINERS: 8
+  NUM_CPU_PER_CONTAINER: 1
+  DOCKER_BUILD_SUMMARY: false
+  DOCKER_BUILD_CHECKS_ANNOTATIONS: false
+  DOCKER_BUILD_RECORD_UPLOAD: false
+
+jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+    container:
+      image: signalwire/freeswitch-public-ci-base:bookworm-amd64
+      options: --privileged
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      ASAN_OPTIONS: log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
+
+    steps:
+      - name: Checkout Sofia-Sip (via ref)
+        if: inputs.sofia-sip_ref != ''
+        uses: actions/checkout@v4
+        with:
+          repository: freeswitch/sofia-sip
+          ref: ${{ inputs.sofia-sip_ref }}
+          path: sofia-sip
+
+      - name: Checkout Sofia-Sip
+        if: inputs.sofia-sip_ref == ''
+        uses: actions/checkout@v4
+        with:
+          repository: freeswitch/sofia-sip
+          path: sofia-sip
+
+      - name: Checkout FreeSWITCH (via ref)
+        if: inputs.freeswitch_ref != ''
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.freeswitch_ref }}
+          path: freeswitch
+
+      - name: Checkout FreeSWITCH
+        if: inputs.freeswitch_ref == ''
+        uses: actions/checkout@v4
+        with:
+          path: freeswitch
+
+      - name: Run Unit-Test containers and collect artifacts
+        id: unit_tests
+        shell: bash
+        run: |
+          echo "logs_path=${GITHUB_WORKSPACE}/freeswitch/tests/unit/logs" >> $GITHUB_OUTPUT
+
+          "${GITHUB_WORKSPACE}/freeswitch/tests/unit/run-tests-docker.sh" \
+            --base-image signalwire/freeswitch-public-ci-base:bookworm-amd64 \
+            --cpus ${{ env.NUM_CPU_PER_CONTAINER }} \
+            --image-tag ci.local \
+            --max-containers ${{ env.MAX_CONTAINERS }} \
+            --output-dir "${GITHUB_WORKSPACE}/freeswitch/tests/unit/logs" \
+            --sofia-sip-path "${GITHUB_WORKSPACE}/sofia-sip" \
+            --freeswitch-path "${GITHUB_WORKSPACE}/freeswitch"
+
+          test -d "/cores" && ls -lah /cores
+
+          cd "${GITHUB_WORKSPACE}/freeswitch/tests/unit/" && \
+          ./collect-test-logs.sh --dir logs --print
+
+      - name: Upload Unit-Test logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results-${{ github.sha }}-${{ github.run_number }}
+          path: ${{ steps.unit_tests.outputs.logs_path }}
+          if-no-files-found: ignore
+          compression-level: 9
+
+      - name: Notify run tests result to slack
+        if: |
+          failure() &&
+          github.event_name == 'push' &&
+          (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10')
+        uses: signalwire/actions-template/.github/actions/slack@main
+        with:
+          CHANNEL: ${{ secrets.SLACK_DEVOPS_CI_CHANNEL }}
+          MESSAGE: Unit-Tests ${{ github.repository }} > <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.run_id }}>. Some tests are failing.
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
new file mode 100644
index 0000000000..fc108b0ffe
--- /dev/null
+++ b/.github/workflows/unit-test.yml
@@ -0,0 +1,136 @@
+name: Unit tests
+
+on:
+  workflow_call:
+    inputs:
+      total-groups:
+        description: 'Total number of test groups'
+        required: true
+        type: number
+        default: 1
+      current-group:
+        description: 'Current test group number'
+        required: true
+        type: number
+        default: 1
+      freeswitch_ref:
+        description: 'FreeSWITCH repository ref'
+        required: false
+        type: string
+      sofia-sip_ref:
+        description: 'Sofia-Sip repository ref'
+        required: false
+        type: string
+      container-image:
+        description: 'Container image to use for running tests'
+        required: false
+        type: string
+        default: 'signalwire/freeswitch-public-ci-base:bookworm-amd64'
+      working-directory:
+        description: 'Working directory for running tests'
+        required: false
+        type: string
+        default: 'freeswitch/tests/unit'
+      tests-only:
+        description: 'Run only tests, skip other tasks'
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  unit-test:
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ inputs.container-image }}
+      options: --privileged
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      ASAN_OPTIONS: log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
+
+    steps:
+      - name: Override core_pattern
+        shell: bash
+        run: |
+          echo '/cores/core.%s.%E.%e.%p.%t' > /proc/sys/kernel/core_pattern
+          cat /proc/sys/kernel/core_pattern
+
+      - name: Checkout Sofia-Sip (via ref)
+        if: ${{ !inputs.tests-only && inputs.sofia-sip_ref != '' }}
+        uses: actions/checkout@v4
+        with:
+          repository: freeswitch/sofia-sip
+          ref: ${{ inputs.sofia-sip_ref }}
+          path: sofia-sip
+
+      - name: Checkout Sofia-Sip
+        if: ${{ !inputs.tests-only && inputs.sofia-sip_ref == '' }}
+        uses: actions/checkout@v4
+        with:
+          repository: freeswitch/sofia-sip
+          path: sofia-sip
+
+      - name: Checkout FreeSWITCH (via ref)
+        if: ${{ !inputs.tests-only && inputs.freeswitch_ref != '' }}
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.freeswitch_ref }}
+          path: freeswitch
+
+      - name: Checkout FreeSWITCH
+        if: ${{ !inputs.tests-only && inputs.freeswitch_ref == '' }}
+        uses: actions/checkout@v4
+        with:
+          path: freeswitch
+
+      - name: Configure, Build and Install Sofia-Sip
+        if: ${{ !inputs.tests-only }}
+        shell: bash
+        working-directory: freeswitch
+        run: |
+          ./ci.sh -t unit-test -a configure -c sofia-sip -p "$GITHUB_WORKSPACE/sofia-sip"
+          ./ci.sh -t unit-test -a build -c sofia-sip -p "$GITHUB_WORKSPACE/sofia-sip"
+          ./ci.sh -t unit-test -a install -c sofia-sip -p "$GITHUB_WORKSPACE/sofia-sip"
+
+      - name: Configure, Build and Install FreeSWITCH
+        if: ${{ !inputs.tests-only }}
+        shell: bash
+        working-directory: freeswitch
+        run: |
+          ./ci.sh -t unit-test -a configure -c freeswitch -p "$GITHUB_WORKSPACE/freeswitch"
+          ./ci.sh -t unit-test -a build -c freeswitch -p "$GITHUB_WORKSPACE/freeswitch"
+          ./ci.sh -t unit-test -a install -c freeswitch -p "$GITHUB_WORKSPACE/freeswitch"
+
+      - name: Run unit tests
+        shell: bash
+        working-directory: ${{ inputs.working-directory }}
+        run: |
+          ./run-tests.sh ${{ inputs.total-groups }} ${{ inputs.current-group }} --output-dir logs || exit 1
+
+      - name: Collect unit test logs
+        if: always()
+        shell: bash
+        working-directory: ${{ inputs.working-directory }}
+        run: |
+          test -d "/cores" && ls -lah /cores
+          ./collect-test-logs.sh --dir logs --print
+
+      - name: Upload Unit-Test logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results-${{ github.sha }}-${{ github.run_number }}-${{ inputs.current-group }}-of-${{ inputs.total-groups }}
+          path: ${{ inputs.working-directory }}/logs
+          if-no-files-found: ignore
+          compression-level: 9
+
+      - name: Notify run tests result to slack
+        if: |
+          failure() &&
+          github.event_name == 'push' &&
+          (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10')
+        uses: signalwire/actions-template/.github/actions/slack@main
+        with:
+          CHANNEL: ${{ secrets.SLACK_DEVOPS_CI_CHANNEL }}
+          MESSAGE: Unit-Tests ${{ github.repository }} > <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.run_id }}>. Some tests are failing.
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000000..5d59fba2a1
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,28 @@
+name: Windows
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+  push:
+    branches: [master, release]
+jobs:
+  x64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Build
+      run: msbuild Freeswitch.2017.sln -t:build -verbosity:minimal -property:Configuration=Release -property:Platform=x64
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: MSI Package
+        path: D:\a\freeswitch\freeswitch\x64\*.msi
+      if: contains(github.event.pull_request.title, ':upload-artifacts') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10'
diff --git a/.gitignore b/.gitignore
index 0461c273de..1df535d36c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,13 +145,11 @@ Release/
 /src/mod/applications/mod_nibblebill/Makefile
 /src/mod/applications/mod_osp/Makefile
 /src/mod/applications/mod_osp/Makefile.in
-/src/mod/applications/mod_rss/Makefile
 /src/mod/applications/mod_snipe_hunt/Makefile
 /src/mod/applications/mod_test/test/Makefile
 /src/mod/applications/mod_test/test/Makefile.in
 /src/mod/codecs/mod_com_g729/Makefile
 /src/mod/codecs/mod_com_g729/Makefile.in
-/src/mod/codecs/mod_dahdi_codec/Makefile
 /src/mod/dialplans/mod_dialplan_directory/Makefile
 /src/mod/formats/mod_shell_stream/Makefile
 /src/mod/languages/mod_lua/mod_lua_wrap.cpp.orig
@@ -175,7 +173,6 @@ BuildLog.htm
 
 !/libs/win32/
 !/libs/speex/win32/
-!/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/
 *.suo
 *.sdf
 x64/
@@ -187,7 +184,7 @@ ipch/
 /w32/Setup/obj
 *dSYM*
 
-/UpgradeLog.*
+/UpgradeLog*.*
 /_UpgradeReport_Files/
 *.aps
 /w32/Library/switch_version.inc
@@ -255,9 +252,6 @@ libs/sofia-sip*
 
 src/mod/applications/mod_test/test/test_asr
 src/mod/applications/mod_test/test/test_tts
-src/mod/event_handlers/mod_rayo/test/test_iks
-src/mod/event_handlers/mod_rayo/test/test_nlsml
-src/mod/event_handlers/mod_rayo/test/test_srgs
 src/mod/applications/mod_http_cache/test/Makefile
 src/mod/applications/mod_http_cache/test/Makefile.in
 src/mod/applications/mod_http_cache/test/test-suite.log
@@ -266,7 +260,6 @@ src/mod/applications/mod_http_cache/test/test_aws.log
 src/mod/applications/mod_http_cache/test/test_aws.trs
 src/mod/formats/mod_sndfile/test/test_sndfile
 src/mod/formats/mod_sndfile/test/test_sndfile_conf
-src/mod/formats/mod_ssml/test/test_tts_format
 src/mod/*/*/test/*.log
 src/mod/*/*/test/*.trs
 src/mod/*/*/test/[0-9]*/*
diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln
index 5f3259a6e0..abeeb4fe04 100644
--- a/Freeswitch.2017.sln
+++ b/Freeswitch.2017.sln
@@ -79,8 +79,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 		conf\vanilla\autoload_configs\logfile.conf.xml = conf\vanilla\autoload_configs\logfile.conf.xml
 		conf\vanilla\autoload_configs\modules.conf.xml = conf\vanilla\autoload_configs\modules.conf.xml
 		conf\vanilla\autoload_configs\openmrcp.conf.xml = conf\vanilla\autoload_configs\openmrcp.conf.xml
-		conf\vanilla\autoload_configs\portaudio.conf.xml = conf\vanilla\autoload_configs\portaudio.conf.xml
-		conf\vanilla\autoload_configs\rss.conf.xml = conf\vanilla\autoload_configs\rss.conf.xml
 		conf\vanilla\autoload_configs\sofia.conf.xml = conf\vanilla\autoload_configs\sofia.conf.xml
 		conf\vanilla\autoload_configs\switch.conf.xml = conf\vanilla\autoload_configs\switch.conf.xml
 		conf\vanilla\autoload_configs\syslog.conf.xml = conf\vanilla\autoload_configs\syslog.conf.xml
@@ -173,8 +171,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.2017.vcxproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.2017.vcxproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docs", "docs\docs.2017.vcxproj", "{1A1FF289-4FD6-4285-A422-D31DD67A4723}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.2017.vcxproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}"
@@ -191,8 +187,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_v8", "src\mod\languages
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_v8_skel", "src\mod\languages\mod_v8\mod_v8_skel.2017.vcxproj", "{8B754330-A434-4791-97E5-1EE67060BAC0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "src\mod\asr_tts\mod_cepstral\mod_cepstral.2017.vcxproj", "{692F6330-4D87-4C82-81DF-40DB5892636E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.2017.vcxproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.2017.vcxproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}"
@@ -204,8 +198,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_
 		{BED7539C-0099-4A14-AD5D-30828F15A171} = {BED7539C-0099-4A14-AD5D-30828F15A171}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.2017.vcxproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.2017.vcxproj", "{C24FB505-05D7-4319-8485-7540B44C8603}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.2017.vcxproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}"
@@ -218,16 +210,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsqlite", "libs\win32\sql
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.2017.vcxproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksemel\iksemel.2017.vcxproj", "{E727E8F6-935D-46FE-8B0E-37834748A0E3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2017.vcxproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread", "libs\win32\pthread\pthread.2017.vcxproj", "{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.2017.vcxproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iSAC", "src\mod\codecs\mod_isac\mod_iSAC.2017.vcxproj", "{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.2017.vcxproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.2017.vcxproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}"
@@ -238,14 +226,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.2017.vcxproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\win32\portaudio\portaudio.2017.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.2017.vcxproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.2017.vcxproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_h26x", "src\mod\codecs\mod_h26x\mod_h26x.2017.vcxproj", "{2C3C2423-234B-4772-8899-D3B137E5CA35}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_esf", "src\mod\applications\mod_esf\mod_esf.2017.vcxproj", "{3850D93A-5F24-4922-BC1C-74D08C37C256}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod\formats\mod_local_stream\mod_local_stream.2017.vcxproj", "{2CA40887-1622-46A1-A7F9-17FD7E7E545B}"
@@ -302,8 +286,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shout", "src\mod\format
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libs\win32\libogg\libogg.2017.vcxproj", "{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_snom", "src\mod\applications\mod_snom\mod_snom.2017.vcxproj", "{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_zh", "src\mod\say\mod_say_zh\mod_say_zh.2017.vcxproj", "{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_managed", "src\mod\languages\mod_managed\mod_managed.2017.vcxproj", "{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}"
@@ -407,16 +389,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spy", "src\mod\applicat
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_httapi", "src\mod\applications\mod_httapi\mod_httapi.2017.vcxproj", "{4748FF56-CA85-4809-97D6-A94C0FAC1D77}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_abstraction", "src\mod\applications\mod_abstraction\mod_abstraction.2017.vcxproj", "{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sms", "src\mod\applications\mod_sms\mod_sms.2017.vcxproj", "{2469B306-B027-4FF2-8815-C9C1EA2CAE79}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xmlrpc-c", "xmlrpc-c", "{9DE35039-A8F6-4FBF-B1B6-EB527F802411}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmlib", "src\mod\endpoints\mod_gsmopen\gsmlib\gsmlib-1.10-patched-13ubuntu\win32\gsmlib.2017.vcxproj", "{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsmopen", "src\mod\endpoints\mod_gsmopen\mod_gsmopen.2017.vcxproj", "{74B120FF-6935-4DFE-A142-CDB6BEA99C90}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_redis", "src\mod\applications\mod_redis\mod_redis.2017.vcxproj", "{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "libs\win32\libjpeg\libjpeg.2017.vcxproj", "{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}"
@@ -450,8 +426,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup.2017", "w32\Setup\Set
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "libs\win32\spandsp\make_math_fixed_tables.2017.vcxproj", "{2386B892-35F5-46CF-A0F0-10394D2FBF9B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt\libcbt.2017.vcxproj", "{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\win32\spandsp\make_cielab_luts.2017.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}"
@@ -554,6 +528,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_switch_core_db", "test
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_switch_ivr_originate", "tests\unit\test_switch_ivr_originate.2017.vcxproj", "{69A7464A-9B0D-4804-A108-835229DACF58}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_switch_core_codec", "tests\unit\test_switch_core_codec.2017.vcxproj", "{589A07E7-5DE5-49FD-A62C-27795B806AFB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_tts_format", "tests\unit\test_tts_format.2017.vcxproj", "{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_test", "src\mod\applications\mod_test\mod_test.2017.vcxproj", "{E9FF8127-D5F0-2398-59EB-702CE55F7800}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -608,17 +588,6 @@ Global
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.Build.0 = Release|Win32
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64.ActiveCfg = Release|x64
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64.Build.0 = Release|x64
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|Win32.ActiveCfg = Release|x64
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|x64.ActiveCfg = Release|x64
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|x64.Build.0 = Release|x64
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.Build.0 = Debug|Win32
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|x64.ActiveCfg = Debug|x64
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|x64.Build.0 = Debug|x64
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.ActiveCfg = Release|Win32
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.Build.0 = Release|Win32
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x64.ActiveCfg = Release|x64
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x64.Build.0 = Release|x64
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.ActiveCfg = Release|Win32
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|x64.ActiveCfg = Release|Win32
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -698,13 +667,6 @@ Global
 		{8B754330-A434-4791-97E5-1EE67060BAC0}.Debug|x64.ActiveCfg = Debug|x64
 		{8B754330-A434-4791-97E5-1EE67060BAC0}.Release|Win32.ActiveCfg = Release|Win32
 		{8B754330-A434-4791-97E5-1EE67060BAC0}.Release|x64.ActiveCfg = Release|x64
-		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|Win32.ActiveCfg = Release|x64
-		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.ActiveCfg = Release|x64
-		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.Build.0 = Release|x64
-		{692F6330-4D87-4C82-81DF-40DB5892636E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{692F6330-4D87-4C82-81DF-40DB5892636E}.Debug|x64.ActiveCfg = Debug|x64
-		{692F6330-4D87-4C82-81DF-40DB5892636E}.Release|Win32.ActiveCfg = Release|Win32
-		{692F6330-4D87-4C82-81DF-40DB5892636E}.Release|x64.ActiveCfg = Release|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.All|Win32.ActiveCfg = Release|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.All|x64.ActiveCfg = Release|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.All|x64.Build.0 = Release|x64
@@ -749,17 +711,6 @@ Global
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|Win32.Build.0 = Release|Win32
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64.ActiveCfg = Release|x64
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64.Build.0 = Release|x64
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|Win32.ActiveCfg = Release|x64
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64.ActiveCfg = Release|x64
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64.Build.0 = Release|x64
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.Build.0 = Debug|Win32
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64.ActiveCfg = Debug|x64
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64.Build.0 = Debug|x64
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.ActiveCfg = Release|Win32
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.Build.0 = Release|Win32
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64.ActiveCfg = Release|x64
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64.Build.0 = Release|x64
 		{C24FB505-05D7-4319-8485-7540B44C8603}.All|Win32.ActiveCfg = Release|x64
 		{C24FB505-05D7-4319-8485-7540B44C8603}.All|x64.ActiveCfg = Release|x64
 		{C24FB505-05D7-4319-8485-7540B44C8603}.All|x64.Build.0 = Release|x64
@@ -826,17 +777,6 @@ Global
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.Build.0 = Release|Win32
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.ActiveCfg = Release|x64
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.Build.0 = Release|x64
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|Win32.ActiveCfg = Release|x64
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64.ActiveCfg = Release|x64
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64.Build.0 = Release|x64
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.Build.0 = Debug|Win32
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|x64.ActiveCfg = Debug|x64
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|x64.Build.0 = Debug|x64
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.ActiveCfg = Release|Win32
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.Build.0 = Release|Win32
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64.ActiveCfg = Release|x64
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64.Build.0 = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.Build.0 = Release|x64
@@ -870,17 +810,6 @@ Global
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|Win32.Build.0 = Release Passthrough|Win32
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64.ActiveCfg = Release Passthrough|x64
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64.Build.0 = Release Passthrough|x64
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.All|Win32.ActiveCfg = Release|x64
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.All|x64.ActiveCfg = Release|x64
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.All|x64.Build.0 = Release|x64
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|Win32.Build.0 = Debug|Win32
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|x64.ActiveCfg = Debug|x64
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|x64.Build.0 = Debug|x64
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|Win32.ActiveCfg = Release|Win32
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|Win32.Build.0 = Release|Win32
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|x64.ActiveCfg = Release|x64
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|x64.Build.0 = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|Win32.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64.Build.0 = Release|x64
@@ -932,17 +861,6 @@ Global
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|Win32.Build.0 = Release|Win32
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|x64.ActiveCfg = Release|x64
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|x64.Build.0 = Release|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|Win32.ActiveCfg = Release DirectSound|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64.ActiveCfg = Release DirectSound|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64.Build.0 = Release DirectSound|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug DirectSound|Win32
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug DirectSound|Win32
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug DirectSound|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug DirectSound|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release DirectSound|Win32
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release DirectSound|Win32
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release DirectSound|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release DirectSound|x64
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|Win32.ActiveCfg = Release|x64
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.ActiveCfg = Release|x64
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.Build.0 = Release|x64
@@ -965,17 +883,6 @@ Global
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|Win32.Build.0 = Release Passthrough|Win32
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.ActiveCfg = Release Passthrough|x64
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.Build.0 = Release Passthrough|x64
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|Win32.ActiveCfg = Release|x64
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64.ActiveCfg = Release|x64
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64.Build.0 = Release|x64
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.Build.0 = Debug|Win32
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.ActiveCfg = Debug|x64
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.Build.0 = Debug|x64
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.ActiveCfg = Release|Win32
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.Build.0 = Release|Win32
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.ActiveCfg = Release|x64
-		{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.Build.0 = Release|x64
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|Win32.ActiveCfg = Release|x64
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64.ActiveCfg = Release|x64
 		{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64.Build.0 = Release|x64
@@ -1280,17 +1187,6 @@ Global
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|Win32.Build.0 = Release|Win32
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x64.ActiveCfg = Release|x64
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x64.Build.0 = Release|x64
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|Win32.ActiveCfg = Release|x64
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64.ActiveCfg = Release|x64
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64.Build.0 = Release|x64
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|Win32.Build.0 = Debug|Win32
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x64.ActiveCfg = Debug|x64
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x64.Build.0 = Debug|x64
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|Win32.ActiveCfg = Release|Win32
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|Win32.Build.0 = Release|Win32
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x64.ActiveCfg = Release|x64
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x64.Build.0 = Release|x64
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|Win32.ActiveCfg = Release|x64
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64.ActiveCfg = Release|x64
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64.Build.0 = Release|x64
@@ -1819,17 +1715,6 @@ Global
 		{4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|Win32.Build.0 = Release|Win32
 		{4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|x64.ActiveCfg = Release|x64
 		{4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|x64.Build.0 = Release|x64
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|Win32.ActiveCfg = Release|x64
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|x64.ActiveCfg = Release|x64
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|x64.Build.0 = Release|x64
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|Win32.Build.0 = Debug|Win32
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|x64.ActiveCfg = Debug|x64
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|x64.Build.0 = Debug|x64
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|Win32.ActiveCfg = Release|Win32
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|Win32.Build.0 = Release|Win32
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|x64.ActiveCfg = Release|x64
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|x64.Build.0 = Release|x64
 		{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|Win32.ActiveCfg = Release|x64
 		{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|x64.ActiveCfg = Release|x64
 		{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|x64.Build.0 = Release|x64
@@ -1841,28 +1726,6 @@ Global
 		{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.Release|Win32.Build.0 = Release|Win32
 		{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.Release|x64.ActiveCfg = Release|x64
 		{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.Release|x64.Build.0 = Release|x64
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.All|Win32.ActiveCfg = Release|x64
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.All|x64.ActiveCfg = Release|x64
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.All|x64.Build.0 = Release|x64
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|Win32.ActiveCfg = Debug|Win32
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|Win32.Build.0 = Debug|Win32
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|x64.ActiveCfg = Debug|x64
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|x64.Build.0 = Debug|x64
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|Win32.ActiveCfg = Release|Win32
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|Win32.Build.0 = Release|Win32
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|x64.ActiveCfg = Release|x64
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|x64.Build.0 = Release|x64
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.All|Win32.ActiveCfg = Release|x64
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.All|x64.ActiveCfg = Release|x64
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.All|x64.Build.0 = Release|x64
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Debug|Win32.Build.0 = Debug|Win32
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Debug|x64.ActiveCfg = Debug|x64
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Debug|x64.Build.0 = Debug|x64
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|Win32.ActiveCfg = Release|Win32
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|Win32.Build.0 = Release|Win32
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.ActiveCfg = Release|x64
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.Build.0 = Release|x64
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|Win32.ActiveCfg = Release|x64
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|x64.ActiveCfg = Release|x64
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|x64.Build.0 = Release|x64
@@ -1963,17 +1826,6 @@ Global
 		{2386B892-35F5-46CF-A0F0-10394D2FBF9B}.Release|Win32.Build.0 = All|Win32
 		{2386B892-35F5-46CF-A0F0-10394D2FBF9B}.Release|x64.ActiveCfg = All|Win32
 		{2386B892-35F5-46CF-A0F0-10394D2FBF9B}.Release|x64.Build.0 = All|Win32
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|Win32.ActiveCfg = Release|Win32
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|Win32.Build.0 = Release|Win32
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|x64.ActiveCfg = Release|Win32
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|Win32.Build.0 = Debug|Win32
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x64.ActiveCfg = Debug|x64
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x64.Build.0 = Debug|x64
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|Win32.ActiveCfg = Release|Win32
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|Win32.Build.0 = Release|Win32
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64.ActiveCfg = Release|x64
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64.Build.0 = Release|x64
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|Win32.ActiveCfg = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|Win32.Build.0 = All|Win32
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.All|x64.ActiveCfg = All|Win32
@@ -2516,6 +2368,42 @@ Global
 		{69A7464A-9B0D-4804-A108-835229DACF58}.Release|Win32.Build.0 = Release|Win32
 		{69A7464A-9B0D-4804-A108-835229DACF58}.Release|x64.ActiveCfg = Release|x64
 		{69A7464A-9B0D-4804-A108-835229DACF58}.Release|x64.Build.0 = Release|x64
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.All|Win32.ActiveCfg = Debug|Win32
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.All|Win32.Build.0 = Debug|Win32
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.All|x64.ActiveCfg = Debug|x64
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.All|x64.Build.0 = Debug|x64
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.Debug|Win32.Build.0 = Debug|Win32
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.Debug|x64.ActiveCfg = Debug|x64
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.Debug|x64.Build.0 = Debug|x64
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|Win32.ActiveCfg = Release|Win32
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|Win32.Build.0 = Release|Win32
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|x64.ActiveCfg = Release|x64
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|x64.Build.0 = Release|x64
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.All|Win32.ActiveCfg = Debug|Win32
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.All|Win32.Build.0 = Debug|Win32
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.All|x64.ActiveCfg = Debug|x64
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.All|x64.Build.0 = Debug|x64
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.Debug|Win32.Build.0 = Debug|Win32
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.Debug|x64.ActiveCfg = Debug|x64
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.Debug|x64.Build.0 = Debug|x64
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.Release|Win32.ActiveCfg = Release|Win32
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.Release|Win32.Build.0 = Release|Win32
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.Release|x64.ActiveCfg = Release|x64
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.Release|x64.Build.0 = Release|x64
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.All|Win32.ActiveCfg = Debug|Win32
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.All|Win32.Build.0 = Debug|Win32
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.All|x64.ActiveCfg = Debug|x64
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.All|x64.Build.0 = Debug|x64
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.Debug|Win32.Build.0 = Debug|Win32
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.Debug|x64.ActiveCfg = Debug|x64
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.Debug|x64.Build.0 = Debug|x64
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.Release|Win32.ActiveCfg = Release|Win32
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.Release|Win32.Build.0 = Release|Win32
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.Release|x64.ActiveCfg = Release|x64
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2540,7 +2428,6 @@ Global
 		{3DAF028C-AB5B-4183-A01B-DCC43F5A87F0} = {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5}
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
-		{5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A}
 		{07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4}
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
@@ -2549,32 +2436,26 @@ Global
 		{89385C74-5860-4174-9CAF-A39E7C48909C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{9B9D2551-D6BD-4F20-8BE5-DE30E154A064} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{8B754330-A434-4791-97E5-1EE67060BAC0} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
-		{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{05515420-16DE-4E63-BE73-85BE85BA5142} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
-		{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
 		{8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
-		{2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
 		{3850D93A-5F24-4922-BC1C-74D08C37C256} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
@@ -2603,7 +2484,6 @@ Global
 		{D3D8B329-20BE-475E-9E83-653CEA0E0EF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{38FE0559-9910-43A8-9E45-3E5004C27692} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
 		{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0} = {0C808854-54D1-4230-BFF5-77B5FD905000}
@@ -2652,11 +2532,8 @@ Global
 		{50AAC2CE-BFC9-4912-87CC-C6381850D735} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{A61D7CB4-75A5-4A55-8CA1-BE5AF615D921} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{4748FF56-CA85-4809-97D6-A94C0FAC1D77} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
-		{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{2469B306-B027-4FF2-8815-C9C1EA2CAE79} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{9DE35039-A8F6-4FBF-B1B6-EB527F802411} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{74B120FF-6935-4DFE-A142-CDB6BEA99C90} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411}
@@ -2665,7 +2542,6 @@ Global
 		{CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411}
 		{B535402E-38D2-4D54-8360-423ACBD17192} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411}
 		{2386B892-35F5-46CF-A0F0-10394D2FBF9B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{ED2CA8B5-8E91-4296-A120-02BB0B674652} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} = {ED2CA8B5-8E91-4296-A120-02BB0B674652}
@@ -2714,6 +2590,9 @@ Global
 		{0B612F84-7533-4DEC-AEDD-5C9CBCF15EAC} = {31C2761D-20E0-4BF8-98B9-E32F0D8DD6E1}
 		{580675D7-C1C9-4197-AAC5-00F64FAFDE78} = {9388C266-C3FC-468A-92EF-0CBC35941412}
 		{69A7464A-9B0D-4804-A108-835229DACF58} = {9388C266-C3FC-468A-92EF-0CBC35941412}
+		{589A07E7-5DE5-49FD-A62C-27795B806AFB} = {9388C266-C3FC-468A-92EF-0CBC35941412}
+		{3745B86B-6BE8-3E67-FCB9-BE62A6131D67} = {9388C266-C3FC-468A-92EF-0CBC35941412}
+		{E9FF8127-D5F0-2398-59EB-702CE55F7800} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {09840DE7-9208-45AA-9667-1A71EE93BD1E}
diff --git a/LICENSE b/LICENSE
index e36ad2a73c..2fb4682ad0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1202,10 +1202,6 @@ Files: src/include/switch_cpp.h
 Copyright: 2007 Yossi Neiman <freeswitch@cartissolutions.com>
 License: MPL-1.1  (well, maybe -- it refers to a COPYING file, so probably docs/COPYING, in which case MPL-1.1)
 
-Files: libs/iksemel/*
-Copyright: 2000-2007 Gurer Ozen <madcat@e-kolay.net>
-License: LGPL-2.1
-
 Files: libs/apr*/*
 Copyright: 2000-2005 The Apache Software Foundation or its licensors
  1991-1992, RSA Data Security, Inc.
@@ -1313,11 +1309,6 @@ Copyright: 2009-2012 10gen Inc.
  2001 Unicode, Inc.
 License: Apache-2.0
 
-Files: src/mod/applications/mod_stress/FFTReal.h
- src/mod/applications/mod_stress/FFTReal.cpp
-Copyright: 1999 Laurent de Soras
-License: unclear
-
 Files: src/mod/loggers/mod_syslog/mod_syslog.c
 Copyright: 2005-2010, James Martelletti <james@nerdc0re.com>
 License: MPL-1.1
@@ -1330,10 +1321,6 @@ Files: src/mod/event_handlers/mod_cdr_mongodb/driver/src/md5.[ch]
 Copyright: 1999, 2000, 2002 Aladdin Enterprises.
 License: zlib/libpng
 
-Files: src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h
-Copyright: 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com>
-License: MPL-1.1
-
 Files: src/mod/say/mod_say_??/mod_say_??.c
  scripts/c/socket2me/socket2me.c
  src/mod/xml_int/mod_xml_scgi/xml_scgi_server.pl
@@ -1497,18 +1484,6 @@ Copyright: 2010 Ilnitskiy Mixim (max.h323@gmail.com)
  2010 Georgiewskiy Yuriy (bottleman@icf.org.ru)
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_khomp/*
-Copyright: 2007-2010 Khomp Ind. & Com.
-License: MPL-1.1 or LGPL-2.1+
-
-Files: src/mod/endpoints/mod_khomp/mod_khomp.cpp
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
-Files: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
-Copyright: 1998 Doug Rabson
-License: BSD-2-clause
-
 Files: src/mod/languages/mod_java/modjava.c
 Copyright: 2007, Damjan Jovanovic <d a m j a n d o t j o v a t g m a i l d o t c o m>
 License: MPL-1.1
@@ -1517,22 +1492,6 @@ Files: src/mod/languages/mod_managed/*
 Copyright: 2008, Michael Giagnocavo <mgg@giagnocavo.net>
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/*
- src/mod/languages/mod_lua/lua-mode.el
- libs/iksemel/ltmain.sh
-Copyright: 1995-2007 Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: src/mod/endpoints/mod_gsmopen/libctb-0.16/*
-Copyright: 2001-2010 Joachim Buermann
-License: wxWindows
-
-Files: src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/getopt.cpp
-Copyright: 2001 ?
-License: clueless and unacceptable
- FIXME -- this cannot go in Debian -- the license is stated as:
-  (I think Open Source)
-
 Files: src/mod/endpoints/mod_rtmp/libamf/src/types.[ch]
 Copyright: 2007, 2008 Marc Noirot <marc.noirot AT gmail.com>
 License: GPL-2+
@@ -1544,10 +1503,6 @@ Files: src/mod/endpoints/mod_rtmp/rtmp.c
 Copyright: 2011-2012, Barracuda Networks Inc.
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.[ch]
-Copyright: 2001-2006 Steve Underwood
-License: GPL-2
-
 Files: src/mod/endpoints/mod_skinny/*
  src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c
 Copyright: 2009-2010, Mathieu Parent <math.parent@gmail.com>
@@ -1557,15 +1512,6 @@ Files: src/mod/endpoints/mod_skinny/*.p[lm]
 Copyright: 2010, Mathieu Parent <math.parent@gmail.com>
 License: Perl
 
-Files: src/mod/endpoints/mod_portaudio/*
-Copyright: 1999-2000 Ross Bencina and Phil Burk
- 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MIT/X11 (BSD like)
-
-Files: src/mod/endpoints/mod_portaudio/mod_portaudio.c
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
 Files: src/mod/endpoints/mod_sofia/sip-dig.c
 Copyright: 2006 Nokia Corporation
 License: LGPL-2.1+
@@ -1606,20 +1552,11 @@ Files: libs/libcodec2/src/pack.c
 Copyright: 2010 Perens LLC <bruce@perens.com>
 License: GPL-3+
 
-Files: src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
- src/include/switch_profile.h
+Files: src/include/switch_profile.h
  src/switch_profile.c
 Copyright: 2009,2010, Sangoma Technologies
 License: BSD-3-clause
 
-Files: src/mod/codecs/mod_isac/*
-Copyright: 2011-2012 The WebRTC project authors
-License: BSD-3-clause
-
-Files: src/mod/codecs/mod_isac/mod_isac.c
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
 Files: libs/srtp/*
 Copyright: 2001-2006, Cisco Systems, Inc.
  2005 Ingate Systems AB
diff --git a/Makefile.am b/Makefile.am
index fdd339a68b..09574caa6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -668,9 +668,6 @@ nodepends: .nodepends
 yesdepends:
 	rm .nodepends
 
-iksemel-dep:
-	make -C src/mod/formats/mod_ssml deps
-
 core: $(switch_builddir)/modules.conf src/include/switch_version.h $(CORE_LIBS) 
 	$(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la
 
@@ -744,13 +741,6 @@ srtp-reconf:
 	cd libs/srtp && sh ./config.status --recheck
 	cd libs/srtp && sh ./config.status
 
-
-iks-reconf:
-	cd libs/iksemel && $(MAKE) clean
-	cd libs/iksemel && autoreconf -fi
-	cd libs/iksemel && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-	$(MAKE) mod_ssml-clean
-
 cluecon:
 	@clear
 	@echo Thank you for updating. This is going to take a while so relax.
diff --git a/README.md b/README.md
index 15cda2e22f..e8412857d6 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,8 @@ The main index for documentation is available at:
 
 Step by step tutorials to install FreeSWITCH from packages:
 
-  * [Debian](https://freeswitch.org/confluence/display/FREESWITCH/Debian) [<b>Recommended</b>]
+  * [Using FSGET](/scripts/packaging) [<b>Recommended</b>]
+  * [Debian](https://freeswitch.org/confluence/display/FREESWITCH/Debian)
   * [Raspberry Pi](https://freeswitch.org/confluence/display/FREESWITCH/Raspberry+Pi)
   * [CentOS 7](https://freeswitch.org/confluence/display/FREESWITCH/CentOS+7+and+RHEL+7)
 
@@ -67,8 +68,8 @@ This is the place to get answers faster and chat with other users in real time.
 Slack Community:
   * https://signalwire.community/
 
-Mailing list:
+Mailing list (ARCHIVED):
 
-  * http://lists.freeswitch.org/mailman/listinfo/freeswitch-users
+  * http://lists.freeswitch.org/pipermail/freeswitch-users/
 
 **Thank you for using FreeSWITCH!**
diff --git a/acinclude.m4 b/acinclude.m4
index 26630f64ef..96f48285e2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -13,4 +13,3 @@ m4_include([build/config/sac-pkg-config.m4])
 m4_include([build/config/sac-openssl.m4])
 m4_include([build/config/sched_setaffinity.m4])
 m4_include([libs/apr/build/apr_common.m4])
-m4_include([libs/iksemel/build/libgnutls.m4])
diff --git a/bootstrap.sh b/bootstrap.sh
index afa73687f5..4251c8edb9 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -10,7 +10,7 @@ BGJOB=false
 VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
-SUBDIRS="apr iksemel srtp fs";
+SUBDIRS="apr srtp fs";
 
 while getopts 'jhd:v' o; do 
   case "$o" in
diff --git a/build/modmake.rulesam b/build/modmake.rulesam
index 5ccdf8b5c2..9e4eb56f97 100644
--- a/build/modmake.rulesam
+++ b/build/modmake.rulesam
@@ -17,5 +17,4 @@ extraclean-modules: extraclean
 
 print_tests:
 	@set +e; \
-	test -z "$(TESTS)" || for i in $(TESTS); do echo $(subdir)/$$i; done;
-	
\ No newline at end of file
+	test -z "$(TESTS)" || for i in $(TESTS); do echo $(subdir)/$$i; done; echo;
diff --git a/build/modules.conf.in b/build/modules.conf.in
old mode 100644
new mode 100755
index 7bf59e2acc..d30c5f0177
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -1,4 +1,3 @@
-#applications/mod_abstraction
 applications/mod_av
 #applications/mod_avmd
 #applications/mod_bert
@@ -26,29 +25,19 @@ applications/mod_hash
 #applications/mod_hiredis
 applications/mod_httapi
 #applications/mod_http_cache
-#applications/mod_ladspa
 #applications/mod_lcr
 #applications/mod_memcache
 #applications/mod_mongo
-#applications/mod_mp4
-#applications/mod_mp4v2
 #applications/mod_nibblebill
 #applications/mod_oreka
 #applications/mod_osp
 #applications/mod_prefix
-#applications/mod_rad_auth
 #applications/mod_redis
-#applications/mod_rss
 applications/mod_signalwire
 applications/mod_sms
-#applications/mod_sms_flowroute
 #applications/mod_snapshot
-#applications/mod_snom
-#applications/mod_sonar
-#applications/mod_soundtouch
 applications/mod_spandsp
 #applications/mod_spy
-#applications/mod_stress
 applications/mod_test
 #applications/mod_translate
 applications/mod_valet_parking
@@ -56,7 +45,6 @@ applications/mod_valet_parking
 #applications/mod_vmd
 applications/mod_voicemail
 #applications/mod_voicemail_ivr
-#asr_tts/mod_cepstral
 #asr_tts/mod_flite
 #asr_tts/mod_pocketsphinx
 #asr_tts/mod_tts_commandline
@@ -67,15 +55,10 @@ codecs/mod_b64
 #codecs/mod_clearmode
 #codecs/mod_codec2
 #codecs/mod_com_g729
-#codecs/mod_dahdi_codec
 codecs/mod_g723_1
 codecs/mod_g729
-codecs/mod_h26x
 #codecs/mod_ilbc
-#codecs/mod_isac
-#codecs/mod_mp4v
 codecs/mod_opus
-#codecs/mod_sangoma_codec
 #codecs/mod_silk
 #codecs/mod_siren
 #codecs/mod_theora
@@ -86,12 +69,9 @@ dialplans/mod_dialplan_asterisk
 dialplans/mod_dialplan_xml
 #directories/mod_ldap
 #endpoints/mod_alsa
-#endpoints/mod_gsmopen
 #endpoints/mod_h323
-#endpoints/mod_khomp
 endpoints/mod_loopback
 #endpoints/mod_opal
-#endpoints/mod_portaudio
 endpoints/mod_rtc
 #endpoints/mod_rtmp
 endpoints/mod_skinny
@@ -108,22 +88,16 @@ event_handlers/mod_event_socket
 #event_handlers/mod_fail2ban
 #event_handlers/mod_format_cdr
 #event_handlers/mod_json_cdr
-#event_handlers/mod_radius_cdr
 #event_handlers/mod_odbc_cdr
-#event_handlers/mod_kazoo
-#event_handlers/mod_rayo
 #event_handlers/mod_smpp
 #event_handlers/mod_snmp
-#event_handlers/mod_event_zmq
 #formats/mod_imagick
 formats/mod_local_stream
 formats/mod_native_file
 formats/mod_png
-#formats/mod_portaudio_stream
 #formats/mod_shell_stream
 #formats/mod_shout
 formats/mod_sndfile
-#formats/mod_ssml
 formats/mod_tone_stream
 #formats/mod_vlc
 #formats/mod_opusfile
@@ -140,7 +114,6 @@ loggers/mod_console
 #loggers/mod_graylog2
 loggers/mod_logfile
 loggers/mod_syslog
-#loggers/mod_raven
 #say/mod_say_de
 say/mod_say_en
 #say/mod_say_es
@@ -164,7 +137,6 @@ say/mod_say_en
 xml_int/mod_xml_cdr
 #xml_int/mod_xml_curl
 #xml_int/mod_xml_ldap
-#xml_int/mod_xml_radius
 xml_int/mod_xml_rpc
 xml_int/mod_xml_scgi
 
diff --git a/build/modules.conf.most b/build/modules.conf.most
old mode 100644
new mode 100755
index fbf8100a90..40a61c8daa
--- a/build/modules.conf.most
+++ b/build/modules.conf.most
@@ -1,4 +1,3 @@
-applications/mod_abstraction
 applications/mod_av
 applications/mod_avmd
 applications/mod_bert
@@ -26,27 +25,19 @@ applications/mod_hash
 applications/mod_hiredis
 applications/mod_httapi
 applications/mod_http_cache
-#applications/mod_ladspa
 applications/mod_lcr
 applications/mod_memcache
 applications/mod_mongo
-applications/mod_mp4
 applications/mod_nibblebill
 applications/mod_oreka
 #applications/mod_osp
 applications/mod_prefix
-#applications/mod_rad_auth
 applications/mod_redis
-applications/mod_rss
 applications/mod_signalwire
 applications/mod_sms
 applications/mod_snapshot
-applications/mod_snom
-applications/mod_sonar
-applications/mod_soundtouch
 applications/mod_spandsp
 applications/mod_spy
-applications/mod_stress
 applications/mod_test
 applications/mod_translate
 applications/mod_valet_parking
@@ -54,7 +45,6 @@ applications/mod_video_filter
 applications/mod_vmd
 applications/mod_voicemail
 applications/mod_voicemail_ivr
-#asr_tts/mod_cepstral
 asr_tts/mod_flite
 asr_tts/mod_pocketsphinx
 asr_tts/mod_tts_commandline
@@ -64,15 +54,10 @@ codecs/mod_b64
 codecs/mod_bv
 codecs/mod_codec2
 #codecs/mod_com_g729
-codecs/mod_dahdi_codec
 codecs/mod_g723_1
 codecs/mod_g729
-codecs/mod_h26x
 codecs/mod_ilbc
-codecs/mod_isac
-codecs/mod_mp4v
 codecs/mod_opus
-codecs/mod_sangoma_codec
 codecs/mod_silk
 codecs/mod_siren
 codecs/mod_theora
@@ -83,12 +68,9 @@ dialplans/mod_dialplan_directory
 dialplans/mod_dialplan_xml
 directories/mod_ldap
 #endpoints/mod_alsa
-#endpoints/mod_gsmopen
 #endpoints/mod_h323
-#endpoints/mod_khomp
 endpoints/mod_loopback
 #endpoints/mod_opal
-endpoints/mod_portaudio
 endpoints/mod_rtc
 endpoints/mod_rtmp
 endpoints/mod_skinny
@@ -104,21 +86,15 @@ event_handlers/mod_event_multicast
 event_handlers/mod_event_socket
 event_handlers/mod_format_cdr
 event_handlers/mod_json_cdr
-event_handlers/mod_kazoo
-#event_handlers/mod_radius_cdr
 event_handlers/mod_odbc_cdr
-event_handlers/mod_rayo
 event_handlers/mod_snmp
-#event_handlers/mod_event_zmq
 formats/mod_imagick
 formats/mod_local_stream
 formats/mod_native_file
 formats/mod_png
-formats/mod_portaudio_stream
 formats/mod_shell_stream
 formats/mod_shout
 formats/mod_sndfile
-formats/mod_ssml
 formats/mod_tone_stream
 formats/mod_vlc
 languages/mod_basic
@@ -156,6 +132,5 @@ timers/mod_timerfd
 xml_int/mod_xml_cdr
 xml_int/mod_xml_curl
 xml_int/mod_xml_ldap
-#xml_int/mod_xml_radius
 xml_int/mod_xml_rpc
 xml_int/mod_xml_scgi
diff --git a/build/next-release.txt b/build/next-release.txt
index b61c58c7d4..27cbef8a6e 100644
--- a/build/next-release.txt
+++ b/build/next-release.txt
@@ -1 +1 @@
-1.10.10-dev
+1.10.13-dev
diff --git a/ci.sh b/ci.sh
new file mode 100755
index 0000000000..f689babd9a
--- /dev/null
+++ b/ci.sh
@@ -0,0 +1,255 @@
+#!/usr/bin/env bash
+
+### shfmt -w -s -ci -sr -kp -fn ci.sh
+
+#------------------------------------------------------------------------------
+# CI Script
+# Helper script for running CI jobs
+#------------------------------------------------------------------------------
+
+# Function to display usage information
+display_usage()
+{
+	echo "Usage: $0 -t <type> -a <action> -c <code> -p <path>"
+	echo "Options:"
+	echo "  -t  Type (unit-test, scan-build)"
+	echo "  -a  Action (configure, build, install, validate)"
+	echo "  -c  Code (sofia-sip, freeswitch)"
+	echo "  -p  Path to code"
+	exit 1
+}
+
+# Parse command line arguments
+while getopts "t:p:a:c:h" opt; do
+	case $opt in
+		t) TYPE="$OPTARG" ;;
+		a) ACTION="$OPTARG" ;;
+		c) CODE="$OPTARG" ;;
+		p) PATH_TO_CODE="$OPTARG" ;;
+		h) display_usage ;;
+		?) display_usage ;;
+	esac
+done
+
+# Function to handle sofia-sip configuration
+configure_sofia_sip()
+{
+	./autogen.sh && ./configure.gnu || exit 1
+}
+
+# Function to handle sofia-sip build
+build_sofia_sip()
+{
+	make -j$(nproc) || exit 1
+}
+
+# Function to handle sofia-sip installation
+install_sofia_sip()
+{
+	make install || exit 1
+}
+
+# Function to handle sofia-sip validation
+validate_sofia_sip()
+{
+	exit 0
+}
+
+# Function to handle freeswitch configuration
+configure_freeswitch()
+{
+	local type="$1"
+
+	./bootstrap.sh -j || exit 1
+
+	case "$type" in
+		"unit-test")
+			echo 'codecs/mod_openh264' >> modules.conf
+			sed -i \
+				-e '/applications\/mod_http_cache/s/^#//g' \
+				-e '/formats\/mod_opusfile/s/^#//g' \
+				-e '/languages\/mod_lua/s/^#//g' \
+				modules.conf
+
+			export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
+
+			./configure \
+				--enable-address-sanitizer \
+				--enable-fake-dlclose ||
+				exit 1
+
+			;;
+		"scan-build")
+			cp build/modules.conf.most modules.conf
+
+			# "Enable"/"Uncomment" mods
+			echo 'codecs/mod_openh264' >> modules.conf
+			sed -i \
+				-e '/mod_mariadb/s/^#//g' \
+				-e '/mod_v8/s/^#//g' \
+				modules.conf
+
+			# "Disable"/"Comment out" mods
+			sed -i \
+				-e '/mod_ilbc/s/^/#/g' \
+				-e '/mod_mongo/s/^/#/g' \
+				-e '/mod_pocketsphinx/s/^/#/g' \
+				-e '/mod_siren/s/^/#/g' \
+				-e '/mod_avmd/s/^/#/g' \
+				-e '/mod_basic/s/^/#/g' \
+				-e '/mod_cdr_mongodb/s/^/#/g' \
+				-e '/mod_cv/s/^/#/g' \
+				-e '/mod_erlang_event/s/^/#/g' \
+				-e '/mod_perl/s/^/#/g' \
+				-e '/mod_rtmp/s/^/#/g' \
+				-e '/mod_unimrcp/s/^/#/g' \
+				-e '/mod_xml_rpc/s/^/#/g' \
+				modules.conf
+
+			./configure || exit 1
+
+			;;
+		*)
+			exit 1
+			;;
+	esac
+}
+
+# Function to handle freeswitch build
+build_freeswitch()
+{
+	local type="$1"
+
+	set -o pipefail
+
+	case "$type" in
+		"unit-test")
+			make --no-keep-going -j$(nproc --all) |& tee ./unit-tests-build-result.txt
+			build_status=${PIPESTATUS[0]}
+			if [[ $build_status != "0" ]]; then
+				exit $build_status
+			fi
+
+			;;
+		"scan-build")
+			if ! command -v scan-build-14 > /dev/null 2>&1; then
+				echo "Error: scan-build-14 command not found. Please ensure clang static analyzer is installed." >&2
+				exit 1
+			fi
+
+			mkdir -p scan-build
+
+			scan-build-14 \
+				--force-analyze-debug-code \
+				--status-bugs \
+				-o ./scan-build/ \
+				make --no-keep-going -j$(nproc --all) |& tee ./scan-build-result.txt
+			build_status=${PIPESTATUS[0]}
+
+			if ! grep -siq "scan-build: No bugs found" ./scan-build-result.txt; then
+				echo "scan-build: bugs found!"
+				exit 1
+			fi
+
+			if [[ $build_status != "0" ]]; then
+				echo "scan-build: compilation failed!"
+				exit $build_status
+			fi
+
+			;;
+		*)
+			exit 1
+			;;
+	esac
+}
+
+# Function to handle freeswitch installation
+install_freeswitch()
+{
+	make install || exit 1
+}
+
+# Function to handle freeswitch validation
+validate_freeswitch()
+{
+	local type="$1"
+
+	case "$type" in
+		"unit-test")
+			exit 0
+			;;
+		"scan-build")
+			REPORT_PATH=$(find scan-build* -mindepth 1 -type d)
+			if [ -n "$REPORT_PATH" ]; then
+				echo "Found analysis report at: $REPORT_PATH"
+
+				if command -v html2text > /dev/null 2>&1; then
+					echo "Report contents:"
+					html2text "$REPORT_PATH"/*.html || true
+				fi
+
+				echo "Number of issues found:"
+				grep -c "<!--BUGDESC" "$REPORT_PATH"/*.html || true
+
+				exit $([ -d "$REPORT_PATH" ])
+			else
+				echo "No analysis report found"
+				exit 0
+			fi
+
+			;;
+		*)
+			exit 1
+			;;
+	esac
+}
+
+# Change to the code directory
+if [ -n "$PATH_TO_CODE" ]; then
+	cd "$PATH_TO_CODE" || exit 1
+fi
+
+# Execute appropriate flow based on code, type, and action
+case "$CODE" in
+	"sofia-sip")
+		case "$ACTION" in
+			"configure")
+				configure_sofia_sip "$TYPE"
+				;;
+			"build")
+				build_sofia_sip "$TYPE"
+				;;
+			"install")
+				install_sofia_sip "$TYPE"
+				;;
+			"validate")
+				validate_sofia_sip "$TYPE"
+				;;
+			*)
+				exit 1
+				;;
+		esac
+		;;
+	"freeswitch")
+		case "$ACTION" in
+			"configure")
+				configure_freeswitch "$TYPE"
+				;;
+			"build")
+				build_freeswitch "$TYPE"
+				;;
+			"install")
+				install_freeswitch "$TYPE"
+				;;
+			"validate")
+				validate_freeswitch "$TYPE"
+				;;
+			*)
+				exit 1
+				;;
+		esac
+		;;
+	*)
+		exit 1
+		;;
+esac
diff --git a/conf/curl/autoload_configs/portaudio.conf.xml b/conf/curl/autoload_configs/portaudio.conf.xml
deleted file mode 100644
index 129576acbf..0000000000
--- a/conf/curl/autoload_configs/portaudio.conf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<configuration name="portaudio.conf" description="Soundcard Endpoint">
-  <settings>
-    <!-- indev, outdev, ringdev: 
-	 partial case sensitive string match on something in the name 
-	 or the device number prefixed with # eg "#1" (or blank for default) -->
-
-    <!-- device to use for input -->
-    <param name="indev" value=""/>
-    <!-- device to use for output -->
-    <param name="outdev" value=""/>
-
-    <!--device to use for inbound ring -->
-    <!--<param name="ringdev" value=""/>-->
-    <!--File to play as the ring sound -->
-    <!--<param name="ring-file" value="/sounds/ring.wav"/>-->
-    <!--Number of seconds to pause between rings -->
-    <!--<param name="ring-interval" value="5"/>-->
-
-    <!--file to play when calls are on hold-->
-    <!--<param name="hold-file" value="/sounds/holdmusic.wav"/>-->
-    <!--Timer to use for hold music (i'd leave this one commented)-->
-    <!--<param name="timer-name" value="soft"/>-->
-
-    <!--Default dialplan and caller-id info -->
-    <param name="dialplan" value="XML"/>
-    <param name="cid-name" value="$${outbound_caller_name}"/>
-    <param name="cid-num" value="$${outbound_caller_id}"/>
-
-    <!--audio sample rate and interval -->
-    <param name="sample-rate" value="8000"/>
-    <param name="codec-ms" value="20"/>
-  </settings>
-</configuration>
diff --git a/conf/curl/autoload_configs/rss.conf.xml b/conf/curl/autoload_configs/rss.conf.xml
deleted file mode 100644
index f8c4f6d2b4..0000000000
--- a/conf/curl/autoload_configs/rss.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration name="rss.conf" description="RSS Parser">
-  <feeds>
-    <!-- Just download the files to wherever and refer to them here -->
-    <!-- <feed name="Slash Dot">/home/rss/rss.rss</feed> -->
-    <!-- <feed name="News Forge">/home/rss/newsforge.rss</feed> -->
-  </feeds>
-</configuration>
diff --git a/conf/curl/autoload_configs/timezones.conf.xml b/conf/curl/autoload_configs/timezones.conf.xml
index 14f87f8c67..9ddded792c 100644
--- a/conf/curl/autoload_configs/timezones.conf.xml
+++ b/conf/curl/autoload_configs/timezones.conf.xml
@@ -1,551 +1,661 @@
 <configuration name="timezones.conf" description="Timezones">
     <timezones>
-	<zone name="Africa/Abidjan" value="GMT0" />
-	<zone name="Africa/Accra" value="GMT0" />
-	<zone name="Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="Africa/Algiers" value="CET-1" />
-	<zone name="Africa/Asmara" value="EAT-3" />
-	<zone name="Africa/Asmera" value="EAT-3" />
-	<zone name="Africa/Bamako" value="GMT0" />
-	<zone name="Africa/Bangui" value="WAT-1" />
-	<zone name="Africa/Banjul" value="GMT0" />
-	<zone name="Africa/Bissau" value="GMT0" />
-	<zone name="Africa/Blantyre" value="CAT-2" />
-	<zone name="Africa/Brazzaville" value="WAT-1" />
-	<zone name="Africa/Bujumbura" value="CAT-2" />
-	<zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/1,M9.5.5/3" />
-	<zone name="Africa/Casablanca" value="WET0" />
-	<zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Conakry" value="GMT0" />
-	<zone name="Africa/Dakar" value="GMT0" />
-	<zone name="Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="Africa/Djibouti" value="EAT-3" />
-	<zone name="Africa/Douala" value="WAT-1" />
-	<zone name="Africa/El_Aaiun" value="WET0" />
-	<zone name="Africa/Freetown" value="GMT0" />
-	<zone name="Africa/Gaborone" value="CAT-2" />
-	<zone name="Africa/Harare" value="CAT-2" />
-	<zone name="Africa/Johannesburg" value="SAST-2" />
-	<zone name="Africa/Kampala" value="EAT-3" />
-	<zone name="Africa/Khartoum" value="EAT-3" />
-	<zone name="Africa/Kigali" value="CAT-2" />
-	<zone name="Africa/Kinshasa" value="WAT-1" />
-	<zone name="Africa/Lagos" value="WAT-1" />
-	<zone name="Africa/Libreville" value="WAT-1" />
-	<zone name="Africa/Lome" value="GMT0" />
-	<zone name="Africa/Luanda" value="WAT-1" />
-	<zone name="Africa/Lubumbashi" value="CAT-2" />
-	<zone name="Africa/Lusaka" value="CAT-2" />
-	<zone name="Africa/Malabo" value="WAT-1" />
-	<zone name="Africa/Maputo" value="CAT-2" />
-	<zone name="Africa/Maseru" value="SAST-2" />
-	<zone name="Africa/Mbabane" value="SAST-2" />
-	<zone name="Africa/Mogadishu" value="EAT-3" />
-	<zone name="Africa/Monrovia" value="GMT0" />
-	<zone name="Africa/Nairobi" value="EAT-3" />
-	<zone name="Africa/Ndjamena" value="WAT-1" />
-	<zone name="Africa/Niamey" value="WAT-1" />
-	<zone name="Africa/Nouakchott" value="GMT0" />
-	<zone name="Africa/Ouagadougou" value="GMT0" />
-	<zone name="Africa/Porto-Novo" value="WAT-1" />
-	<zone name="Africa/Sao_Tome" value="GMT0" />
-	<zone name="Africa/Timbuktu" value="GMT0" />
-	<zone name="Africa/Tripoli" value="EET-2" />
-	<zone name="Africa/Tunis" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
+        <zone name="Africa/Abidjan" value="GMT0" />
+        <zone name="Africa/Accra" value="GMT0" />
+        <zone name="Africa/Addis_Ababa" value="EAT-3" />
+        <zone name="Africa/Algiers" value="CET-1" />
+        <zone name="Africa/Asmara" value="EAT-3" />
+        <zone name="Africa/Asmera" value="EAT-3" />
+        <zone name="Africa/Bamako" value="GMT0" />
+        <zone name="Africa/Bangui" value="WAT-1" />
+        <zone name="Africa/Banjul" value="GMT0" />
+        <zone name="Africa/Bissau" value="GMT0" />
+        <zone name="Africa/Blantyre" value="CAT-2" />
+        <zone name="Africa/Brazzaville" value="WAT-1" />
+        <zone name="Africa/Bujumbura" value="CAT-2" />
+        <zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
+        <zone name="Africa/Casablanca" value="STD-1" />
+        <zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Africa/Conakry" value="GMT0" />
+        <zone name="Africa/Dakar" value="GMT0" />
+        <zone name="Africa/Dar_es_Salaam" value="EAT-3" />
+        <zone name="Africa/Djibouti" value="EAT-3" />
+        <zone name="Africa/Douala" value="WAT-1" />
+        <zone name="Africa/El_Aaiun" value="STD-1" />
+        <zone name="Africa/Freetown" value="GMT0" />
+        <zone name="Africa/Gaborone" value="CAT-2" />
+        <zone name="Africa/Harare" value="CAT-2" />
+        <zone name="Africa/Johannesburg" value="SAST-2" />
+        <zone name="Africa/Juba" value="CAT-2" />
+        <zone name="Africa/Kampala" value="EAT-3" />
+        <zone name="Africa/Khartoum" value="CAT-2" />
+        <zone name="Africa/Kigali" value="CAT-2" />
+        <zone name="Africa/Kinshasa" value="WAT-1" />
+        <zone name="Africa/Lagos" value="WAT-1" />
+        <zone name="Africa/Libreville" value="WAT-1" />
+        <zone name="Africa/Lome" value="GMT0" />
+        <zone name="Africa/Luanda" value="WAT-1" />
+        <zone name="Africa/Lubumbashi" value="CAT-2" />
+        <zone name="Africa/Lusaka" value="CAT-2" />
+        <zone name="Africa/Malabo" value="WAT-1" />
+        <zone name="Africa/Maputo" value="CAT-2" />
+        <zone name="Africa/Maseru" value="SAST-2" />
+        <zone name="Africa/Mbabane" value="SAST-2" />
+        <zone name="Africa/Mogadishu" value="EAT-3" />
+        <zone name="Africa/Monrovia" value="GMT0" />
+        <zone name="Africa/Nairobi" value="EAT-3" />
+        <zone name="Africa/Ndjamena" value="WAT-1" />
+        <zone name="Africa/Niamey" value="WAT-1" />
+        <zone name="Africa/Nouakchott" value="GMT0" />
+        <zone name="Africa/Ouagadougou" value="GMT0" />
+        <zone name="Africa/Porto-Novo" value="WAT-1" />
+        <zone name="Africa/Sao_Tome" value="GMT0" />
+        <zone name="Africa/Timbuktu" value="GMT0" />
+        <zone name="Africa/Tripoli" value="EET-2" />
+        <zone name="Africa/Tunis" value="CET-1" />
+        <zone name="Africa/Windhoek" value="CAT-2" />
 
-	<zone name="America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Anguilla" value="AST4" />
-	<zone name="America/Antigua" value="AST4" />
-	<zone name="America/Araguaina" value="BRT3" />
-	<zone name="America/Argentina/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/ComodRivadavia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/La_Rioja" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Rio_Gallegos" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Juan" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Luis" value="ART3" />
-	<zone name="America/Argentina/Tucuman" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Ushuaia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Aruba" value="AST4" />
-	<zone name="America/Asuncion" value="PYT4PYST,M10.3.0/0,M3.2.0/0" />
-	<zone name="America/Atikokan" value="EST5" />
-	<zone name="America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Bahia" value="BRT3" />
-	<zone name="America/Barbados" value="AST4" />
-	<zone name="America/Belem" value="BRT3" />
-	<zone name="America/Belize" value="CST6" />
-	<zone name="America/Blanc-Sablon" value="AST4" />
-	<zone name="America/Boa_Vista" value="AMT4" />
-	<zone name="America/Bogota" value="COT5" />
-	<zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Campo_Grande" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Caracas" value="VET4:30" />
-	<zone name="America/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cayenne" value="GFT3" />
-	<zone name="America/Cayman" value="EST5" />
-	<zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Coral_Harbour" value="EST5" />
-	<zone name="America/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Costa_Rica" value="CST6" />
-	<zone name="America/Cuiaba" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Curacao" value="AST4" />
-	<zone name="America/Danmarkshavn" value="GMT0" />
-	<zone name="America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dawson_Creek" value="MST7" />
-	<zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dominica" value="AST4" />
-	<zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Eirunepe" value="ACT5" />
-	<zone name="America/El_Salvador" value="CST6" />
-	<zone name="America/Ensenada" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Fortaleza" value="BRT3" />
-	<zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Godthab" value="WGST" />
-	<zone name="America/Goose_Bay" value="AST4ADT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Grenada" value="AST4" />
-	<zone name="America/Guadeloupe" value="AST4" />
-	<zone name="America/Guatemala" value="CST6" />
-	<zone name="America/Guayaquil" value="ECT5" />
-	<zone name="America/Guyana" value="GYT4" />
-	<zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Havana" value="CST5CDT,M3.3.0/0,M10.5.0/1" />
-	<zone name="America/Hermosillo" value="MST7" />
-	<zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Jamaica" value="EST5" />
-	<zone name="America/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/La_Paz" value="BOT4" />
-	<zone name="America/Lima" value="PET5" />
-	<zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Maceio" value="BRT3" />
-	<zone name="America/Managua" value="CST6" />
-	<zone name="America/Manaus" value="AMT4" />
-	<zone name="America/Marigot" value="AST4" />
-	<zone name="America/Martinique" value="AST4" />
-	<zone name="America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Montserrat" value="AST4" />
-	<zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Noronha" value="FNT2" />
-	<zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Panama" value="EST5" />
-	<zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Paramaribo" value="SRT3" />
-	<zone name="America/Phoenix" value="MST7" />
-	<zone name="America/Port-au-Prince" value="EST5" />
-	<zone name="America/Porto_Acre" value="ACT5" />
-	<zone name="America/Port_of_Spain" value="AST4" />
-	<zone name="America/Porto_Velho" value="AMT4" />
-	<zone name="America/Puerto_Rico" value="AST4" />
-	<zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Recife" value="BRT3" />
-	<zone name="America/Regina" value="CST6" />
-	<zone name="America/Resolute" value="EST5" />
-	<zone name="America/Rio_Branco" value="ACT5" />
-	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Santiago" value="CLST" />
-	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3" />
-	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Barthelemy" value="AST4" />
-	<zone name="America/St_Johns" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/St_Kitts" value="AST4" />
-	<zone name="America/St_Lucia" value="AST4" />
-	<zone name="America/St_Thomas" value="AST4" />
-	<zone name="America/St_Vincent" value="AST4" />
-	<zone name="America/Swift_Current" value="CST6" />
-	<zone name="America/Tegucigalpa" value="CST6" />
-	<zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tijuana" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tortola" value="AST4" />
-	<zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Virgin" value="AST4" />
-	<zone name="America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anguilla" value="AST4" />
+        <zone name="America/Antigua" value="AST4" />
+        <zone name="America/Araguaina" value="STD3" />
+        <zone name="America/Argentina/Buenos_Aires" value="STD3" />
+        <zone name="America/Argentina/Catamarca" value="STD3" />
+        <zone name="America/Argentina/ComodRivadavia" value="STD3" />
+        <zone name="America/Argentina/Cordoba" value="STD3" />
+        <zone name="America/Argentina/Jujuy" value="STD3" />
+        <zone name="America/Argentina/La_Rioja" value="STD3" />
+        <zone name="America/Argentina/Mendoza" value="STD3" />
+        <zone name="America/Argentina/Rio_Gallegos" value="STD3" />
+        <zone name="America/Argentina/Salta" value="STD3" />
+        <zone name="America/Argentina/San_Juan" value="STD3" />
+        <zone name="America/Argentina/San_Luis" value="STD3" />
+        <zone name="America/Argentina/Tucuman" value="STD3" />
+        <zone name="America/Argentina/Ushuaia" value="STD3" />
+        <zone name="America/Aruba" value="AST4" />
+        <zone name="America/Asuncion" value="STD4DST,M10.1.0/0,M3.4.0/0" />
+        <zone name="America/Atikokan" value="EST5" />
+        <zone name="America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Bahia" value="STD3" />
+        <zone name="America/Bahia_Banderas" value="CST6" />
+        <zone name="America/Barbados" value="AST4" />
+        <zone name="America/Belem" value="STD3" />
+        <zone name="America/Belize" value="CST6" />
+        <zone name="America/Blanc-Sablon" value="AST4" />
+        <zone name="America/Boa_Vista" value="STD4" />
+        <zone name="America/Bogota" value="STD5" />
+        <zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Buenos_Aires" value="STD3" />
+        <zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Campo_Grande" value="STD4" />
+        <zone name="America/Cancun" value="EST5" />
+        <zone name="America/Caracas" value="STD4" />
+        <zone name="America/Catamarca" value="STD3" />
+        <zone name="America/Cayenne" value="STD3" />
+        <zone name="America/Cayman" value="EST5" />
+        <zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Chihuahua" value="CST6" />
+        <zone name="America/Ciudad_Juarez" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Coral_Harbour" value="EST5" />
+        <zone name="America/Cordoba" value="STD3" />
+        <zone name="America/Costa_Rica" value="CST6" />
+        <zone name="America/Creston" value="MST7" />
+        <zone name="America/Cuiaba" value="STD4" />
+        <zone name="America/Curacao" value="AST4" />
+        <zone name="America/Danmarkshavn" value="GMT0" />
+        <zone name="America/Dawson" value="MST7" />
+        <zone name="America/Dawson_Creek" value="MST7" />
+        <zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Dominica" value="AST4" />
+        <zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Eirunepe" value="STD5" />
+        <zone name="America/El_Salvador" value="CST6" />
+        <zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fort_Nelson" value="MST7" />
+        <zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fortaleza" value="STD3" />
+        <zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Godthab" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Grenada" value="AST4" />
+        <zone name="America/Guadeloupe" value="AST4" />
+        <zone name="America/Guatemala" value="CST6" />
+        <zone name="America/Guayaquil" value="STD5" />
+        <zone name="America/Guyana" value="STD4" />
+        <zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
+        <zone name="America/Hermosillo" value="MST7" />
+        <zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Jamaica" value="EST5" />
+        <zone name="America/Jujuy" value="STD3" />
+        <zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kralendijk" value="AST4" />
+        <zone name="America/La_Paz" value="STD4" />
+        <zone name="America/Lima" value="STD5" />
+        <zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Lower_Princes" value="AST4" />
+        <zone name="America/Maceio" value="STD3" />
+        <zone name="America/Managua" value="CST6" />
+        <zone name="America/Manaus" value="STD4" />
+        <zone name="America/Marigot" value="AST4" />
+        <zone name="America/Martinique" value="AST4" />
+        <zone name="America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mazatlan" value="MST7" />
+        <zone name="America/Mendoza" value="STD3" />
+        <zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Merida" value="CST6" />
+        <zone name="America/Metlakatla" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mexico_City" value="CST6" />
+        <zone name="America/Miquelon" value="STD3DST,M3.2.0,M11.1.0" />
+        <zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Monterrey" value="CST6" />
+        <zone name="America/Montevideo" value="STD3" />
+        <zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Montserrat" value="AST4" />
+        <zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Noronha" value="STD2" />
+        <zone name="America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nuuk" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Ojinaga" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Panama" value="EST5" />
+        <zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Paramaribo" value="STD3" />
+        <zone name="America/Phoenix" value="MST7" />
+        <zone name="America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Port_of_Spain" value="AST4" />
+        <zone name="America/Porto_Acre" value="STD5" />
+        <zone name="America/Porto_Velho" value="STD4" />
+        <zone name="America/Puerto_Rico" value="AST4" />
+        <zone name="America/Punta_Arenas" value="STD3" />
+        <zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Recife" value="STD3" />
+        <zone name="America/Regina" value="CST6" />
+        <zone name="America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rio_Branco" value="STD5" />
+        <zone name="America/Rosario" value="STD3" />
+        <zone name="America/Santa_Isabel" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Santarem" value="STD3" />
+        <zone name="America/Santiago" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="America/Santo_Domingo" value="AST4" />
+        <zone name="America/Sao_Paulo" value="STD3" />
+        <zone name="America/Scoresbysund" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Barthelemy" value="AST4" />
+        <zone name="America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Kitts" value="AST4" />
+        <zone name="America/St_Lucia" value="AST4" />
+        <zone name="America/St_Thomas" value="AST4" />
+        <zone name="America/St_Vincent" value="AST4" />
+        <zone name="America/Swift_Current" value="CST6" />
+        <zone name="America/Tegucigalpa" value="CST6" />
+        <zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tortola" value="AST4" />
+        <zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Virgin" value="AST4" />
+        <zone name="America/Whitehorse" value="MST7" />
+        <zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
 
-	<zone name="Antarctica/Casey" value="WST-8" />
-	<zone name="Antarctica/Davis" value="DAVT-7" />
-	<zone name="Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="Antarctica/Mawson" value="MAWT-6" />
-	<zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Palmer" value="CLST" />
-	<zone name="Antarctica/Rothera" value="ROTT3" />
-	<zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Syowa" value="SYOT-3" />
-	<zone name="Antarctica/Vostok" value="VOST-6" />
+        <zone name="Antarctica/Casey" value="STD-11" />
+        <zone name="Antarctica/Davis" value="STD-7" />
+        <zone name="Antarctica/DumontDUrville" value="STD-10" />
+        <zone name="Antarctica/Macquarie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Antarctica/Mawson" value="STD-5" />
+        <zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Palmer" value="STD3" />
+        <zone name="Antarctica/Rothera" value="STD3" />
+        <zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Syowa" value="STD-3" />
+        <zone name="Antarctica/Troll" value="STD-0DST-2,M3.5.0/1,M10.5.0/3" />
+        <zone name="Antarctica/Vostok" value="STD-6" />
 
-	<zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Asia/Aden" value="AST-3" />
-	<zone name="Asia/Almaty" value="ALMT-6" />
-	<zone name="Asia/Amman" value="EET-2EEST,M3.5.4/0,M10.5.5/1" />
-	<zone name="Asia/Anadyr" value="ANAT-12ANAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Aqtau" value="AQTT-5" />
-	<zone name="Asia/Aqtobe" value="AQTT-5" />
-	<zone name="Asia/Ashgabat" value="TMT-5" />
-	<zone name="Asia/Ashkhabad" value="TMT-5" />
-	<zone name="Asia/Baghdad" value="AST-3" />
-	<zone name="Asia/Bahrain" value="AST-3" />
-	<zone name="Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="Asia/Bangkok" value="ICT-7" />
-	<zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="Asia/Bishkek" value="KGT-6" />
-	<zone name="Asia/Brunei" value="BNT-8" />
-	<zone name="Asia/Calcutta" value="IST-5:30" />
-	<zone name="Asia/Choibalsan" value="CHOT-9" />
-	<zone name="Asia/Chongqing" value="CST-8" />
-	<zone name="Asia/Chungking" value="CST-8" />
-	<zone name="Asia/Colombo" value="IST-5:30" />
-	<zone name="Asia/Dacca" value="BDT-6" />
-	<zone name="Asia/Damascus" value="EET-2EEST,M4.1.5/0,J274/0" />
-	<zone name="Asia/Dhaka" value="BDT-6" />
-	<zone name="Asia/Dili" value="TLT-9" />
-	<zone name="Asia/Dubai" value="GST-4" />
-	<zone name="Asia/Dushanbe" value="TJT-5" />
-	<zone name="Asia/Gaza" value="EET-2EEST,J91/0,M9.2.4" />
-	<zone name="Asia/Harbin" value="CST-8" />
-	<zone name="Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="Asia/Hong_Kong" value="HKT-8" />
-	<zone name="Asia/Hovd" value="HOVT-7" />
-	<zone name="Asia/Irkutsk" value="IRKT-8IRKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Jakarta" value="WIT-7" />
-	<zone name="Asia/Jayapura" value="EIT-9" />
-	<zone name="Asia/Jerusalem" value="IDDT" />
-	<zone name="Asia/Kabul" value="AFT-4:30" />
-	<zone name="Asia/Kamchatka" value="PETT-12PETST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Karachi" value="PKT-5" />
-	<zone name="Asia/Kashgar" value="CST-8" />
-	<zone name="Asia/Katmandu" value="NPT-5:45" />
-	<zone name="Asia/Kolkata" value="IST-5:30" />
-	<zone name="Asia/Krasnoyarsk" value="KRAT-7KRAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="Asia/Kuching" value="MYT-8" />
-	<zone name="Asia/Kuwait" value="AST-3" />
-	<zone name="Asia/Macao" value="CST-8" />
-	<zone name="Asia/Macau" value="CST-8" />
-	<zone name="Asia/Magadan" value="MAGT-11MAGST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Makassar" value="CIT-8" />
-	<zone name="Asia/Manila" value="PHT-8" />
-	<zone name="Asia/Muscat" value="GST-4" />
-	<zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Novosibirsk" value="NOVT-6NOVST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Omsk" value="OMST-6OMSST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Oral" value="ORAT-5" />
-	<zone name="Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="Asia/Pontianak" value="WIT-7" />
-	<zone name="Asia/Pyongyang" value="KST-9" />
-	<zone name="Asia/Qatar" value="AST-3" />
-	<zone name="Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="Asia/Rangoon" value="MMT-6:30" />
-	<zone name="Asia/Riyadh" value="AST-3" />
-	<zone name="Asia/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh89" value="zzz-3:07:04" />
-	<zone name="Asia/Saigon" value="ICT-7" />
-	<zone name="Asia/Sakhalin" value="SAKT-10SAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Samarkand" value="UZT-5" />
-	<zone name="Asia/Seoul" value="KST-9" />
-	<zone name="Asia/Shanghai" value="CST-8" />
-	<zone name="Asia/Singapore" value="SGT-8" />
-	<zone name="Asia/Taipei" value="CST-8" />
-	<zone name="Asia/Tashkent" value="UZT-5" />
-	<zone name="Asia/Tbilisi" value="GET-4" />
-	<zone name="Asia/Tehran" value="IRDT" />
-	<zone name="Asia/Tel_Aviv" value="IDDT" />
-	<zone name="Asia/Thimbu" value="BTT-6" />
-	<zone name="Asia/Thimphu" value="BTT-6" />
-	<zone name="Asia/Tokyo" value="JST-9" />
-	<zone name="Asia/Ujung_Pandang" value="CIT-8" />
-	<zone name="Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="Asia/Urumqi" value="CST-8" />
-	<zone name="Asia/Vientiane" value="ICT-7" />
-	<zone name="Asia/Vladivostok" value="VLAT-10VLAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yakutsk" value="YAKT-9YAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yekaterinburg" value="YEKT-5YEKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yerevan" value="AMT-4AMST,M3.5.0,M10.5.0/3" />
+        <zone name="Asia/Aden" value="STD-3" />
+        <zone name="Asia/Almaty" value="STD-6" />
+        <zone name="Asia/Amman" value="STD-3" />
+        <zone name="Asia/Anadyr" value="STD-12" />
+        <zone name="Asia/Aqtau" value="STD-5" />
+        <zone name="Asia/Aqtobe" value="STD-5" />
+        <zone name="Asia/Ashgabat" value="STD-5" />
+        <zone name="Asia/Ashkhabad" value="STD-5" />
+        <zone name="Asia/Atyrau" value="STD-5" />
+        <zone name="Asia/Baghdad" value="STD-3" />
+        <zone name="Asia/Bahrain" value="STD-3" />
+        <zone name="Asia/Baku" value="STD-4" />
+        <zone name="Asia/Bangkok" value="STD-7" />
+        <zone name="Asia/Barnaul" value="STD-7" />
+        <zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
+        <zone name="Asia/Bishkek" value="STD-6" />
+        <zone name="Asia/Brunei" value="STD-8" />
+        <zone name="Asia/Calcutta" value="IST-5:30" />
+        <zone name="Asia/Chita" value="STD-9" />
+        <zone name="Asia/Choibalsan" value="STD-8" />
+        <zone name="Asia/Chongqing" value="CST-8" />
+        <zone name="Asia/Chungking" value="CST-8" />
+        <zone name="Asia/Colombo" value="STD-5:30" />
+        <zone name="Asia/Dacca" value="STD-6" />
+        <zone name="Asia/Damascus" value="STD-3" />
+        <zone name="Asia/Dhaka" value="STD-6" />
+        <zone name="Asia/Dili" value="STD-9" />
+        <zone name="Asia/Dubai" value="STD-4" />
+        <zone name="Asia/Dushanbe" value="STD-5" />
+        <zone name="Asia/Famagusta" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Gaza" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Harbin" value="CST-8" />
+        <zone name="Asia/Hebron" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Ho_Chi_Minh" value="STD-7" />
+        <zone name="Asia/Hong_Kong" value="HKT-8" />
+        <zone name="Asia/Hovd" value="STD-7" />
+        <zone name="Asia/Irkutsk" value="STD-8" />
+        <zone name="Asia/Istanbul" value="STD-3" />
+        <zone name="Asia/Jakarta" value="WIB-7" />
+        <zone name="Asia/Jayapura" value="WIT-9" />
+        <zone name="Asia/Jerusalem" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Kabul" value="STD-4:30" />
+        <zone name="Asia/Kamchatka" value="STD-12" />
+        <zone name="Asia/Karachi" value="PKT-5" />
+        <zone name="Asia/Kashgar" value="STD-6" />
+        <zone name="Asia/Kathmandu" value="STD-5:45" />
+        <zone name="Asia/Katmandu" value="STD-5:45" />
+        <zone name="Asia/Khandyga" value="STD-9" />
+        <zone name="Asia/Kolkata" value="IST-5:30" />
+        <zone name="Asia/Krasnoyarsk" value="STD-7" />
+        <zone name="Asia/Kuala_Lumpur" value="STD-8" />
+        <zone name="Asia/Kuching" value="STD-8" />
+        <zone name="Asia/Kuwait" value="STD-3" />
+        <zone name="Asia/Macao" value="CST-8" />
+        <zone name="Asia/Macau" value="CST-8" />
+        <zone name="Asia/Magadan" value="STD-11" />
+        <zone name="Asia/Makassar" value="WITA-8" />
+        <zone name="Asia/Manila" value="PST-8" />
+        <zone name="Asia/Muscat" value="STD-4" />
+        <zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Novokuznetsk" value="STD-7" />
+        <zone name="Asia/Novosibirsk" value="STD-7" />
+        <zone name="Asia/Omsk" value="STD-6" />
+        <zone name="Asia/Oral" value="STD-5" />
+        <zone name="Asia/Phnom_Penh" value="STD-7" />
+        <zone name="Asia/Pontianak" value="WIB-7" />
+        <zone name="Asia/Pyongyang" value="KST-9" />
+        <zone name="Asia/Qatar" value="STD-3" />
+        <zone name="Asia/Qostanay" value="STD-6" />
+        <zone name="Asia/Qyzylorda" value="STD-5" />
+        <zone name="Asia/Rangoon" value="STD-6:30" />
+        <zone name="Asia/Riyadh" value="STD-3" />
+        <zone name="Asia/Saigon" value="STD-7" />
+        <zone name="Asia/Sakhalin" value="STD-11" />
+        <zone name="Asia/Samarkand" value="STD-5" />
+        <zone name="Asia/Seoul" value="KST-9" />
+        <zone name="Asia/Shanghai" value="CST-8" />
+        <zone name="Asia/Singapore" value="STD-8" />
+        <zone name="Asia/Srednekolymsk" value="STD-11" />
+        <zone name="Asia/Taipei" value="CST-8" />
+        <zone name="Asia/Tashkent" value="STD-5" />
+        <zone name="Asia/Tbilisi" value="STD-4" />
+        <zone name="Asia/Tehran" value="STD-3:30" />
+        <zone name="Asia/Tel_Aviv" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Thimbu" value="STD-6" />
+        <zone name="Asia/Thimphu" value="STD-6" />
+        <zone name="Asia/Tokyo" value="JST-9" />
+        <zone name="Asia/Tomsk" value="STD-7" />
+        <zone name="Asia/Ujung_Pandang" value="WITA-8" />
+        <zone name="Asia/Ulaanbaatar" value="STD-8" />
+        <zone name="Asia/Ulan_Bator" value="STD-8" />
+        <zone name="Asia/Urumqi" value="STD-6" />
+        <zone name="Asia/Ust-Nera" value="STD-10" />
+        <zone name="Asia/Vientiane" value="STD-7" />
+        <zone name="Asia/Vladivostok" value="STD-10" />
+        <zone name="Asia/Yakutsk" value="STD-9" />
+        <zone name="Asia/Yangon" value="STD-6:30" />
+        <zone name="Asia/Yekaterinburg" value="STD-5" />
+        <zone name="Asia/Yerevan" value="STD-4" />
 
-	<zone name="Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Reykjavik" value="GMT0" />
-	<zone name="Atlantic/South_Georgia" value="GST2" />
-	<zone name="Atlantic/Stanley" value="FKT4FKST,M9.1.0,M4.3.0" />
-	<zone name="Atlantic/St_Helena" value="GMT0" />
+        <zone name="Atlantic/Azores" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Cape_Verde" value="STD1" />
+        <zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Reykjavik" value="GMT0" />
+        <zone name="Atlantic/South_Georgia" value="STD2" />
+        <zone name="Atlantic/St_Helena" value="GMT0" />
+        <zone name="Atlantic/Stanley" value="STD3" />
 
-	<zone name="Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Brisbane" value="EST-10" />
-	<zone name="Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Darwin" value="CST-9:30" />
-	<zone name="Australia/Eucla" value="CWST-8:45" />
-	<zone name="Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Lindeman" value="EST-10" />
-	<zone name="Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/North" value="CST-9:30" />
-	<zone name="Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Perth" value="WST-8" />
-	<zone name="Australia/Queensland" value="EST-10" />
-	<zone name="Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/West" value="WST-8" />
-	<zone name="Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Brisbane" value="AEST-10" />
+        <zone name="Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Darwin" value="ACST-9:30" />
+        <zone name="Australia/Eucla" value="STD-8:45" />
+        <zone name="Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/LHI" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Lindeman" value="AEST-10" />
+        <zone name="Australia/Lord_Howe" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/North" value="ACST-9:30" />
+        <zone name="Australia/Perth" value="AWST-8" />
+        <zone name="Australia/Queensland" value="AEST-10" />
+        <zone name="Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/West" value="AWST-8" />
+        <zone name="Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
 
-	<zone name="Brazil/Acre" value="ACT5" />
-	<zone name="Brazil/DeNoronha" value="FNT2" />
-	<zone name="Brazil/East" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
-	<zone name="Brazil/West" value="AMT4" />
+        <zone name="Brazil/Acre" value="STD5" />
+        <zone name="Brazil/DeNoronha" value="STD2" />
+        <zone name="Brazil/East" value="STD3" />
+        <zone name="Brazil/West" value="STD4" />
 
-	<zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/East-Saskatchewan" value="CST6" />
-	<zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Saskatchewan" value="CST6" />
-	<zone name="Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Chile/Continental" value="CLST" />
-	<zone name="Chile/EasterIsland" value="EASST" />
+        <zone name="CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
 
-	<zone name="Etc/GMT" value="GMT0" />
-	<zone name="Etc/GMT0" value="GMT0" />
-	<zone name="Etc/GMT-0" value="GMT0" />
-	<zone name="Etc/GMT+0" value="GMT0" />
-	<zone name="Etc/GMT-1" value="GMT-1" />
-	<zone name="Etc/GMT+1" value="GMT+1" />
-	<zone name="Etc/GMT-10" value="GMT-10" />
-	<zone name="Etc/GMT+10" value="GMT+10" />
-	<zone name="Etc/GMT-11" value="GMT-11" />
-	<zone name="Etc/GMT+11" value="GMT+11" />
-	<zone name="Etc/GMT-12" value="GMT-12" />
-	<zone name="Etc/GMT+12" value="GMT+12" />
-	<zone name="Etc/GMT-13" value="GMT-13" />
-	<zone name="Etc/GMT-14" value="GMT-14" />
-	<zone name="Etc/GMT-2" value="GMT-2" />
-	<zone name="Etc/GMT+2" value="GMT+2" />
-	<zone name="Etc/GMT-3" value="GMT-3" />
-	<zone name="Etc/GMT+3" value="GMT+3" />
-	<zone name="Etc/GMT-4" value="GMT-4" />
-	<zone name="Etc/GMT+4" value="GMT+4" />
-	<zone name="Etc/GMT-5" value="GMT-5" />
-	<zone name="Etc/GMT+5" value="GMT+5" />
-	<zone name="Etc/GMT-6" value="GMT-6" />
-	<zone name="Etc/GMT+6" value="GMT+6" />
-	<zone name="Etc/GMT-7" value="GMT-7" />
-	<zone name="Etc/GMT+7" value="GMT+7" />
-	<zone name="Etc/GMT-8" value="GMT-8" />
-	<zone name="Etc/GMT+8" value="GMT+8" />
-	<zone name="Etc/GMT-9" value="GMT-9" />
-	<zone name="Etc/GMT+9" value="GMT+9" />
-	<zone name="Etc/Greenwich" value="GMT0" />
-	<zone name="Etc/UCT" value="UCT0" />
-	<zone name="Etc/Universal" value="UTC0" />
-	<zone name="Etc/UTC" value="UTC0" />
-	<zone name="Etc/Zulu" value="UTC0" />
+        <zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Saskatchewan" value="CST6" />
+        <zone name="Canada/Yukon" value="MST7" />
 
-	<zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Kaliningrad" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Minsk" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Moscow" value="MSK-3MSD,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Samara" value="SAMT-4SAMST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Simferopol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Volgograd" value="VOLT-3VOLST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Chile/Continental" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="Chile/EasterIsland" value="STD6DST,M9.1.6/22,M4.1.6/22" />
 
-	<zone name="Indian/Antananarivo" value="EAT-3" />
-	<zone name="Indian/Chagos" value="IOT-6" />
-	<zone name="Indian/Christmas" value="CXT-7" />
-	<zone name="Indian/Cocos" value="CCT-6:30" />
-	<zone name="Indian/Comoro" value="EAT-3" />
-	<zone name="Indian/Kerguelen" value="TFT-5" />
-	<zone name="Indian/Mahe" value="SCT-4" />
-	<zone name="Indian/Maldives" value="MVT-5" />
-	<zone name="Indian/Mauritius" value="MUT-4" />
-	<zone name="Indian/Mayotte" value="EAT-3" />
-	<zone name="Indian/Reunion" value="RET-4" />
+        <zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
 
-	<zone name="Mexico/BajaNorte" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
+        <zone name="EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 
-	<zone name="Mideast/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh89" value="zzz-3:07:04" />
+        <zone name="EST" value="EST5" />
 
-	<zone name="Pacific/Apia" value="WST11" />
-	<zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="Pacific/Easter" value="EASST" />
-	<zone name="Pacific/Efate" value="VUT-11" />
-	<zone name="Pacific/Enderbury" value="PHOT-13" />
-	<zone name="Pacific/Fakaofo" value="TKT10" />
-	<zone name="Pacific/Fiji" value="FJT-12" />
-	<zone name="Pacific/Funafuti" value="TVT-12" />
-	<zone name="Pacific/Galapagos" value="GALT6" />
-	<zone name="Pacific/Gambier" value="GAMT9" />
-	<zone name="Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="Pacific/Guam" value="ChST-10" />
-	<zone name="Pacific/Honolulu" value="HST10" />
-	<zone name="Pacific/Johnston" value="HST10" />
-	<zone name="Pacific/Kiritimati" value="LINT-14" />
-	<zone name="Pacific/Kosrae" value="KOST-11" />
-	<zone name="Pacific/Kwajalein" value="MHT-12" />
-	<zone name="Pacific/Majuro" value="MHT-12" />
-	<zone name="Pacific/Marquesas" value="MART9:30" />
-	<zone name="Pacific/Midway" value="SST11" />
-	<zone name="Pacific/Nauru" value="NRT-12" />
-	<zone name="Pacific/Niue" value="NUT11" />
-	<zone name="Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="Pacific/Noumea" value="NCT-11" />
-	<zone name="Pacific/Pago_Pago" value="SST11" />
-	<zone name="Pacific/Palau" value="PWT-9" />
-	<zone name="Pacific/Pitcairn" value="PST8" />
-	<zone name="Pacific/Ponape" value="PONT-11" />
-	<zone name="Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="Pacific/Rarotonga" value="CKT10" />
-	<zone name="Pacific/Saipan" value="ChST-10" />
-	<zone name="Pacific/Samoa" value="SST11" />
-	<zone name="Pacific/Tahiti" value="TAHT10" />
-	<zone name="Pacific/Tarawa" value="GILT-12" />
-	<zone name="Pacific/Tongatapu" value="TOT-13" />
-	<zone name="Pacific/Truk" value="TRUT-10" />
-	<zone name="Pacific/Wake" value="WAKT-12" />
-	<zone name="Pacific/Wallis" value="WFT-12" />
-	<zone name="Pacific/Yap" value="TRUT-10" />
+        <zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
 
-	<zone name="SystemV/AST4" value="AST4" />
-	<zone name="SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/CST6" value="CST6" />
-	<zone name="SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/EST5" value="EST5" />
-	<zone name="SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/HST10" value="HST10" />
-	<zone name="SystemV/MST7" value="MST7" />
-	<zone name="SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/PST8" value="PST8" />
-	<zone name="SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/YST9" value="GAMT9" />
-	<zone name="SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="Egypt" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
 
-	<zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="US/Arizona" value="MST7" />
-	<zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Hawaii" value="HST10" />
-	<zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Samoa" value="SST11" />
+        <zone name="Eire" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+
+        <zone name="Etc/GMT" value="GMT0" />
+        <zone name="Etc/GMT+0" value="GMT0" />
+        <zone name="Etc/GMT+1" value="GMT1" />
+        <zone name="Etc/GMT+10" value="GMT10" />
+        <zone name="Etc/GMT+11" value="GMT11" />
+        <zone name="Etc/GMT+12" value="GMT12" />
+        <zone name="Etc/GMT+2" value="GMT2" />
+        <zone name="Etc/GMT+3" value="GMT3" />
+        <zone name="Etc/GMT+4" value="GMT4" />
+        <zone name="Etc/GMT+5" value="GMT5" />
+        <zone name="Etc/GMT+6" value="GMT6" />
+        <zone name="Etc/GMT+7" value="GMT7" />
+        <zone name="Etc/GMT+8" value="GMT8" />
+        <zone name="Etc/GMT+9" value="GMT9" />
+        <zone name="Etc/GMT-0" value="GMT0" />
+        <zone name="Etc/GMT-1" value="GMT-1" />
+        <zone name="Etc/GMT-10" value="GMT-10" />
+        <zone name="Etc/GMT-11" value="GMT-11" />
+        <zone name="Etc/GMT-12" value="GMT-12" />
+        <zone name="Etc/GMT-13" value="GMT-13" />
+        <zone name="Etc/GMT-14" value="GMT-14" />
+        <zone name="Etc/GMT-2" value="GMT-2" />
+        <zone name="Etc/GMT-3" value="GMT-3" />
+        <zone name="Etc/GMT-4" value="GMT-4" />
+        <zone name="Etc/GMT-5" value="GMT-5" />
+        <zone name="Etc/GMT-6" value="GMT-6" />
+        <zone name="Etc/GMT-7" value="GMT-7" />
+        <zone name="Etc/GMT-8" value="GMT-8" />
+        <zone name="Etc/GMT-9" value="GMT-9" />
+        <zone name="Etc/GMT0" value="GMT0" />
+        <zone name="Etc/Greenwich" value="GMT0" />
+        <zone name="Etc/UCT" value="UTC0" />
+        <zone name="Etc/UTC" value="UTC0" />
+        <zone name="Etc/Universal" value="UTC0" />
+        <zone name="Etc/Zulu" value="UTC0" />
+
+        <zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Astrakhan" value="STD-4" />
+        <zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Dublin" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+        <zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Istanbul" value="STD-3" />
+        <zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Kaliningrad" value="EET-2" />
+        <zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Kirov" value="MSK-3" />
+        <zone name="Europe/Kyiv" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Minsk" value="STD-3" />
+        <zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Moscow" value="MSK-3" />
+        <zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Samara" value="STD-4" />
+        <zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Saratov" value="STD-4" />
+        <zone name="Europe/Simferopol" value="MSK-3" />
+        <zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Ulyanovsk" value="STD-4" />
+        <zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Volgograd" value="MSK-3" />
+        <zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Factory" value="STD0" />
+
+        <zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GMT" value="GMT0" />
+
+        <zone name="GMT+0" value="GMT0" />
+
+        <zone name="GMT-0" value="GMT0" />
+
+        <zone name="GMT0" value="GMT0" />
+
+        <zone name="Greenwich" value="GMT0" />
+
+        <zone name="HST" value="HST10" />
+
+        <zone name="Hongkong" value="HKT-8" />
+
+        <zone name="Iceland" value="GMT0" />
+
+        <zone name="Indian/Antananarivo" value="EAT-3" />
+        <zone name="Indian/Chagos" value="STD-6" />
+        <zone name="Indian/Christmas" value="STD-7" />
+        <zone name="Indian/Cocos" value="STD-6:30" />
+        <zone name="Indian/Comoro" value="EAT-3" />
+        <zone name="Indian/Kerguelen" value="STD-5" />
+        <zone name="Indian/Mahe" value="STD-4" />
+        <zone name="Indian/Maldives" value="STD-5" />
+        <zone name="Indian/Mauritius" value="STD-4" />
+        <zone name="Indian/Mayotte" value="EAT-3" />
+        <zone name="Indian/Reunion" value="STD-4" />
+
+        <zone name="Iran" value="STD-3:30" />
+
+        <zone name="Israel" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+
+        <zone name="Jamaica" value="EST5" />
+
+        <zone name="Japan" value="JST-9" />
+
+        <zone name="Kwajalein" value="STD-12" />
+
+        <zone name="Libya" value="EET-2" />
+
+        <zone name="MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="MST" value="MST7" />
+
+        <zone name="MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Mexico/BajaSur" value="MST7" />
+        <zone name="Mexico/General" value="CST6" />
+
+        <zone name="NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+
+        <zone name="NZ-CHAT" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+
+        <zone name="Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="PRC" value="CST-8" />
+
+        <zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
+
+        <zone name="Pacific/Apia" value="STD-13" />
+        <zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Pacific/Bougainville" value="STD-11" />
+        <zone name="Pacific/Chatham" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+        <zone name="Pacific/Chuuk" value="STD-10" />
+        <zone name="Pacific/Easter" value="STD6DST,M9.1.6/22,M4.1.6/22" />
+        <zone name="Pacific/Efate" value="STD-11" />
+        <zone name="Pacific/Enderbury" value="STD-13" />
+        <zone name="Pacific/Fakaofo" value="STD-13" />
+        <zone name="Pacific/Fiji" value="STD-12" />
+        <zone name="Pacific/Funafuti" value="STD-12" />
+        <zone name="Pacific/Galapagos" value="STD6" />
+        <zone name="Pacific/Gambier" value="STD9" />
+        <zone name="Pacific/Guadalcanal" value="STD-11" />
+        <zone name="Pacific/Guam" value="ChST-10" />
+        <zone name="Pacific/Honolulu" value="HST10" />
+        <zone name="Pacific/Johnston" value="HST10" />
+        <zone name="Pacific/Kanton" value="STD-13" />
+        <zone name="Pacific/Kiritimati" value="STD-14" />
+        <zone name="Pacific/Kosrae" value="STD-11" />
+        <zone name="Pacific/Kwajalein" value="STD-12" />
+        <zone name="Pacific/Majuro" value="STD-12" />
+        <zone name="Pacific/Marquesas" value="STD9:30" />
+        <zone name="Pacific/Midway" value="SST11" />
+        <zone name="Pacific/Nauru" value="STD-12" />
+        <zone name="Pacific/Niue" value="STD11" />
+        <zone name="Pacific/Norfolk" value="STD-11DST,M10.1.0,M4.1.0/3" />
+        <zone name="Pacific/Noumea" value="STD-11" />
+        <zone name="Pacific/Pago_Pago" value="SST11" />
+        <zone name="Pacific/Palau" value="STD-9" />
+        <zone name="Pacific/Pitcairn" value="STD8" />
+        <zone name="Pacific/Pohnpei" value="STD-11" />
+        <zone name="Pacific/Ponape" value="STD-11" />
+        <zone name="Pacific/Port_Moresby" value="STD-10" />
+        <zone name="Pacific/Rarotonga" value="STD10" />
+        <zone name="Pacific/Saipan" value="ChST-10" />
+        <zone name="Pacific/Samoa" value="SST11" />
+        <zone name="Pacific/Tahiti" value="STD10" />
+        <zone name="Pacific/Tarawa" value="STD-12" />
+        <zone name="Pacific/Tongatapu" value="STD-13" />
+        <zone name="Pacific/Truk" value="STD-10" />
+        <zone name="Pacific/Wake" value="STD-12" />
+        <zone name="Pacific/Wallis" value="STD-12" />
+        <zone name="Pacific/Yap" value="STD-10" />
+
+        <zone name="Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
+
+        <zone name="ROC" value="CST-8" />
+
+        <zone name="ROK" value="KST-9" />
+
+        <zone name="Singapore" value="STD-8" />
+
+        <zone name="Turkey" value="STD-3" />
+
+        <zone name="UCT" value="UTC0" />
+
+        <zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="US/Arizona" value="MST7" />
+        <zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Hawaii" value="HST10" />
+        <zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="US/Samoa" value="SST11" />
+
+        <zone name="UTC" value="UTC0" />
+
+        <zone name="Universal" value="UTC0" />
+
+        <zone name="W-SU" value="MSK-3" />
+
+        <zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
+
+        <zone name="Zulu" value="UTC0" />
     </timezones>
 </configuration>
diff --git a/conf/insideout/autoload_configs/modules.conf.xml b/conf/insideout/autoload_configs/modules.conf.xml
old mode 100644
new mode 100755
index 9408bcd29f..f03dfb749c
--- a/conf/insideout/autoload_configs/modules.conf.xml
+++ b/conf/insideout/autoload_configs/modules.conf.xml
@@ -29,7 +29,6 @@
     <!-- Endpoints -->
     <!-- <load module="mod_dingaling"/> -->
     <!-- <load module="mod_iax"/> -->
-    <!-- <load module="mod_portaudio"/> -->
     <!-- <load module="mod_alsa"/> -->
     <load module="mod_sofia"/>
     <load module="mod_loopback"/>
@@ -49,9 +48,6 @@
     <load module="mod_fsv"/>
     <!--<load module="mod_translate"/>-->
 
-    <!-- SNOM Module -->
-    <!--<load module="mod_snom"/>-->
-
     <!-- Dialplan Interfaces -->
     <!-- <load module="mod_dialplan_directory"/> -->
     <load module="mod_dialplan_xml"/>
@@ -63,7 +59,6 @@
     <load module="mod_g729"/>
     <load module="mod_amr"/>
     <!--<load module="mod_ilbc"/>-->
-    <load module="mod_h26x"/>
     <!--<load module="mod_siren"/>-->
 
     <!-- File Format Interfaces -->
@@ -88,9 +83,7 @@
     <!-- ASR /TTS -->
     <!-- <load module="mod_flite"/> -->
     <!-- <load module="mod_pocketsphinx"/> -->
-    <!-- <load module="mod_cepstral"/> -->
     <!-- <load module="mod_openmrcp"/> -->
-    <!-- <load module="mod_rss"/> -->
     
     <!-- Say -->
     <load module="mod_say_en"/>
diff --git a/conf/insideout/autoload_configs/portaudio.conf.xml b/conf/insideout/autoload_configs/portaudio.conf.xml
deleted file mode 100644
index 129576acbf..0000000000
--- a/conf/insideout/autoload_configs/portaudio.conf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<configuration name="portaudio.conf" description="Soundcard Endpoint">
-  <settings>
-    <!-- indev, outdev, ringdev: 
-	 partial case sensitive string match on something in the name 
-	 or the device number prefixed with # eg "#1" (or blank for default) -->
-
-    <!-- device to use for input -->
-    <param name="indev" value=""/>
-    <!-- device to use for output -->
-    <param name="outdev" value=""/>
-
-    <!--device to use for inbound ring -->
-    <!--<param name="ringdev" value=""/>-->
-    <!--File to play as the ring sound -->
-    <!--<param name="ring-file" value="/sounds/ring.wav"/>-->
-    <!--Number of seconds to pause between rings -->
-    <!--<param name="ring-interval" value="5"/>-->
-
-    <!--file to play when calls are on hold-->
-    <!--<param name="hold-file" value="/sounds/holdmusic.wav"/>-->
-    <!--Timer to use for hold music (i'd leave this one commented)-->
-    <!--<param name="timer-name" value="soft"/>-->
-
-    <!--Default dialplan and caller-id info -->
-    <param name="dialplan" value="XML"/>
-    <param name="cid-name" value="$${outbound_caller_name}"/>
-    <param name="cid-num" value="$${outbound_caller_id}"/>
-
-    <!--audio sample rate and interval -->
-    <param name="sample-rate" value="8000"/>
-    <param name="codec-ms" value="20"/>
-  </settings>
-</configuration>
diff --git a/conf/insideout/autoload_configs/rss.conf.xml b/conf/insideout/autoload_configs/rss.conf.xml
deleted file mode 100644
index f8c4f6d2b4..0000000000
--- a/conf/insideout/autoload_configs/rss.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration name="rss.conf" description="RSS Parser">
-  <feeds>
-    <!-- Just download the files to wherever and refer to them here -->
-    <!-- <feed name="Slash Dot">/home/rss/rss.rss</feed> -->
-    <!-- <feed name="News Forge">/home/rss/newsforge.rss</feed> -->
-  </feeds>
-</configuration>
diff --git a/conf/insideout/autoload_configs/timezones.conf.xml b/conf/insideout/autoload_configs/timezones.conf.xml
index 14f87f8c67..9ddded792c 100644
--- a/conf/insideout/autoload_configs/timezones.conf.xml
+++ b/conf/insideout/autoload_configs/timezones.conf.xml
@@ -1,551 +1,661 @@
 <configuration name="timezones.conf" description="Timezones">
     <timezones>
-	<zone name="Africa/Abidjan" value="GMT0" />
-	<zone name="Africa/Accra" value="GMT0" />
-	<zone name="Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="Africa/Algiers" value="CET-1" />
-	<zone name="Africa/Asmara" value="EAT-3" />
-	<zone name="Africa/Asmera" value="EAT-3" />
-	<zone name="Africa/Bamako" value="GMT0" />
-	<zone name="Africa/Bangui" value="WAT-1" />
-	<zone name="Africa/Banjul" value="GMT0" />
-	<zone name="Africa/Bissau" value="GMT0" />
-	<zone name="Africa/Blantyre" value="CAT-2" />
-	<zone name="Africa/Brazzaville" value="WAT-1" />
-	<zone name="Africa/Bujumbura" value="CAT-2" />
-	<zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/1,M9.5.5/3" />
-	<zone name="Africa/Casablanca" value="WET0" />
-	<zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Conakry" value="GMT0" />
-	<zone name="Africa/Dakar" value="GMT0" />
-	<zone name="Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="Africa/Djibouti" value="EAT-3" />
-	<zone name="Africa/Douala" value="WAT-1" />
-	<zone name="Africa/El_Aaiun" value="WET0" />
-	<zone name="Africa/Freetown" value="GMT0" />
-	<zone name="Africa/Gaborone" value="CAT-2" />
-	<zone name="Africa/Harare" value="CAT-2" />
-	<zone name="Africa/Johannesburg" value="SAST-2" />
-	<zone name="Africa/Kampala" value="EAT-3" />
-	<zone name="Africa/Khartoum" value="EAT-3" />
-	<zone name="Africa/Kigali" value="CAT-2" />
-	<zone name="Africa/Kinshasa" value="WAT-1" />
-	<zone name="Africa/Lagos" value="WAT-1" />
-	<zone name="Africa/Libreville" value="WAT-1" />
-	<zone name="Africa/Lome" value="GMT0" />
-	<zone name="Africa/Luanda" value="WAT-1" />
-	<zone name="Africa/Lubumbashi" value="CAT-2" />
-	<zone name="Africa/Lusaka" value="CAT-2" />
-	<zone name="Africa/Malabo" value="WAT-1" />
-	<zone name="Africa/Maputo" value="CAT-2" />
-	<zone name="Africa/Maseru" value="SAST-2" />
-	<zone name="Africa/Mbabane" value="SAST-2" />
-	<zone name="Africa/Mogadishu" value="EAT-3" />
-	<zone name="Africa/Monrovia" value="GMT0" />
-	<zone name="Africa/Nairobi" value="EAT-3" />
-	<zone name="Africa/Ndjamena" value="WAT-1" />
-	<zone name="Africa/Niamey" value="WAT-1" />
-	<zone name="Africa/Nouakchott" value="GMT0" />
-	<zone name="Africa/Ouagadougou" value="GMT0" />
-	<zone name="Africa/Porto-Novo" value="WAT-1" />
-	<zone name="Africa/Sao_Tome" value="GMT0" />
-	<zone name="Africa/Timbuktu" value="GMT0" />
-	<zone name="Africa/Tripoli" value="EET-2" />
-	<zone name="Africa/Tunis" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
+        <zone name="Africa/Abidjan" value="GMT0" />
+        <zone name="Africa/Accra" value="GMT0" />
+        <zone name="Africa/Addis_Ababa" value="EAT-3" />
+        <zone name="Africa/Algiers" value="CET-1" />
+        <zone name="Africa/Asmara" value="EAT-3" />
+        <zone name="Africa/Asmera" value="EAT-3" />
+        <zone name="Africa/Bamako" value="GMT0" />
+        <zone name="Africa/Bangui" value="WAT-1" />
+        <zone name="Africa/Banjul" value="GMT0" />
+        <zone name="Africa/Bissau" value="GMT0" />
+        <zone name="Africa/Blantyre" value="CAT-2" />
+        <zone name="Africa/Brazzaville" value="WAT-1" />
+        <zone name="Africa/Bujumbura" value="CAT-2" />
+        <zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
+        <zone name="Africa/Casablanca" value="STD-1" />
+        <zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Africa/Conakry" value="GMT0" />
+        <zone name="Africa/Dakar" value="GMT0" />
+        <zone name="Africa/Dar_es_Salaam" value="EAT-3" />
+        <zone name="Africa/Djibouti" value="EAT-3" />
+        <zone name="Africa/Douala" value="WAT-1" />
+        <zone name="Africa/El_Aaiun" value="STD-1" />
+        <zone name="Africa/Freetown" value="GMT0" />
+        <zone name="Africa/Gaborone" value="CAT-2" />
+        <zone name="Africa/Harare" value="CAT-2" />
+        <zone name="Africa/Johannesburg" value="SAST-2" />
+        <zone name="Africa/Juba" value="CAT-2" />
+        <zone name="Africa/Kampala" value="EAT-3" />
+        <zone name="Africa/Khartoum" value="CAT-2" />
+        <zone name="Africa/Kigali" value="CAT-2" />
+        <zone name="Africa/Kinshasa" value="WAT-1" />
+        <zone name="Africa/Lagos" value="WAT-1" />
+        <zone name="Africa/Libreville" value="WAT-1" />
+        <zone name="Africa/Lome" value="GMT0" />
+        <zone name="Africa/Luanda" value="WAT-1" />
+        <zone name="Africa/Lubumbashi" value="CAT-2" />
+        <zone name="Africa/Lusaka" value="CAT-2" />
+        <zone name="Africa/Malabo" value="WAT-1" />
+        <zone name="Africa/Maputo" value="CAT-2" />
+        <zone name="Africa/Maseru" value="SAST-2" />
+        <zone name="Africa/Mbabane" value="SAST-2" />
+        <zone name="Africa/Mogadishu" value="EAT-3" />
+        <zone name="Africa/Monrovia" value="GMT0" />
+        <zone name="Africa/Nairobi" value="EAT-3" />
+        <zone name="Africa/Ndjamena" value="WAT-1" />
+        <zone name="Africa/Niamey" value="WAT-1" />
+        <zone name="Africa/Nouakchott" value="GMT0" />
+        <zone name="Africa/Ouagadougou" value="GMT0" />
+        <zone name="Africa/Porto-Novo" value="WAT-1" />
+        <zone name="Africa/Sao_Tome" value="GMT0" />
+        <zone name="Africa/Timbuktu" value="GMT0" />
+        <zone name="Africa/Tripoli" value="EET-2" />
+        <zone name="Africa/Tunis" value="CET-1" />
+        <zone name="Africa/Windhoek" value="CAT-2" />
 
-	<zone name="America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Anguilla" value="AST4" />
-	<zone name="America/Antigua" value="AST4" />
-	<zone name="America/Araguaina" value="BRT3" />
-	<zone name="America/Argentina/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/ComodRivadavia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/La_Rioja" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Rio_Gallegos" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Juan" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Luis" value="ART3" />
-	<zone name="America/Argentina/Tucuman" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Ushuaia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Aruba" value="AST4" />
-	<zone name="America/Asuncion" value="PYT4PYST,M10.3.0/0,M3.2.0/0" />
-	<zone name="America/Atikokan" value="EST5" />
-	<zone name="America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Bahia" value="BRT3" />
-	<zone name="America/Barbados" value="AST4" />
-	<zone name="America/Belem" value="BRT3" />
-	<zone name="America/Belize" value="CST6" />
-	<zone name="America/Blanc-Sablon" value="AST4" />
-	<zone name="America/Boa_Vista" value="AMT4" />
-	<zone name="America/Bogota" value="COT5" />
-	<zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Campo_Grande" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Caracas" value="VET4:30" />
-	<zone name="America/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cayenne" value="GFT3" />
-	<zone name="America/Cayman" value="EST5" />
-	<zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Coral_Harbour" value="EST5" />
-	<zone name="America/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Costa_Rica" value="CST6" />
-	<zone name="America/Cuiaba" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Curacao" value="AST4" />
-	<zone name="America/Danmarkshavn" value="GMT0" />
-	<zone name="America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dawson_Creek" value="MST7" />
-	<zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dominica" value="AST4" />
-	<zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Eirunepe" value="ACT5" />
-	<zone name="America/El_Salvador" value="CST6" />
-	<zone name="America/Ensenada" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Fortaleza" value="BRT3" />
-	<zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Godthab" value="WGST" />
-	<zone name="America/Goose_Bay" value="AST4ADT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Grenada" value="AST4" />
-	<zone name="America/Guadeloupe" value="AST4" />
-	<zone name="America/Guatemala" value="CST6" />
-	<zone name="America/Guayaquil" value="ECT5" />
-	<zone name="America/Guyana" value="GYT4" />
-	<zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Havana" value="CST5CDT,M3.3.0/0,M10.5.0/1" />
-	<zone name="America/Hermosillo" value="MST7" />
-	<zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Jamaica" value="EST5" />
-	<zone name="America/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/La_Paz" value="BOT4" />
-	<zone name="America/Lima" value="PET5" />
-	<zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Maceio" value="BRT3" />
-	<zone name="America/Managua" value="CST6" />
-	<zone name="America/Manaus" value="AMT4" />
-	<zone name="America/Marigot" value="AST4" />
-	<zone name="America/Martinique" value="AST4" />
-	<zone name="America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Montserrat" value="AST4" />
-	<zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Noronha" value="FNT2" />
-	<zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Panama" value="EST5" />
-	<zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Paramaribo" value="SRT3" />
-	<zone name="America/Phoenix" value="MST7" />
-	<zone name="America/Port-au-Prince" value="EST5" />
-	<zone name="America/Porto_Acre" value="ACT5" />
-	<zone name="America/Port_of_Spain" value="AST4" />
-	<zone name="America/Porto_Velho" value="AMT4" />
-	<zone name="America/Puerto_Rico" value="AST4" />
-	<zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Recife" value="BRT3" />
-	<zone name="America/Regina" value="CST6" />
-	<zone name="America/Resolute" value="EST5" />
-	<zone name="America/Rio_Branco" value="ACT5" />
-	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Santiago" value="CLST" />
-	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3" />
-	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Barthelemy" value="AST4" />
-	<zone name="America/St_Johns" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/St_Kitts" value="AST4" />
-	<zone name="America/St_Lucia" value="AST4" />
-	<zone name="America/St_Thomas" value="AST4" />
-	<zone name="America/St_Vincent" value="AST4" />
-	<zone name="America/Swift_Current" value="CST6" />
-	<zone name="America/Tegucigalpa" value="CST6" />
-	<zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tijuana" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tortola" value="AST4" />
-	<zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Virgin" value="AST4" />
-	<zone name="America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anguilla" value="AST4" />
+        <zone name="America/Antigua" value="AST4" />
+        <zone name="America/Araguaina" value="STD3" />
+        <zone name="America/Argentina/Buenos_Aires" value="STD3" />
+        <zone name="America/Argentina/Catamarca" value="STD3" />
+        <zone name="America/Argentina/ComodRivadavia" value="STD3" />
+        <zone name="America/Argentina/Cordoba" value="STD3" />
+        <zone name="America/Argentina/Jujuy" value="STD3" />
+        <zone name="America/Argentina/La_Rioja" value="STD3" />
+        <zone name="America/Argentina/Mendoza" value="STD3" />
+        <zone name="America/Argentina/Rio_Gallegos" value="STD3" />
+        <zone name="America/Argentina/Salta" value="STD3" />
+        <zone name="America/Argentina/San_Juan" value="STD3" />
+        <zone name="America/Argentina/San_Luis" value="STD3" />
+        <zone name="America/Argentina/Tucuman" value="STD3" />
+        <zone name="America/Argentina/Ushuaia" value="STD3" />
+        <zone name="America/Aruba" value="AST4" />
+        <zone name="America/Asuncion" value="STD4DST,M10.1.0/0,M3.4.0/0" />
+        <zone name="America/Atikokan" value="EST5" />
+        <zone name="America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Bahia" value="STD3" />
+        <zone name="America/Bahia_Banderas" value="CST6" />
+        <zone name="America/Barbados" value="AST4" />
+        <zone name="America/Belem" value="STD3" />
+        <zone name="America/Belize" value="CST6" />
+        <zone name="America/Blanc-Sablon" value="AST4" />
+        <zone name="America/Boa_Vista" value="STD4" />
+        <zone name="America/Bogota" value="STD5" />
+        <zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Buenos_Aires" value="STD3" />
+        <zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Campo_Grande" value="STD4" />
+        <zone name="America/Cancun" value="EST5" />
+        <zone name="America/Caracas" value="STD4" />
+        <zone name="America/Catamarca" value="STD3" />
+        <zone name="America/Cayenne" value="STD3" />
+        <zone name="America/Cayman" value="EST5" />
+        <zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Chihuahua" value="CST6" />
+        <zone name="America/Ciudad_Juarez" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Coral_Harbour" value="EST5" />
+        <zone name="America/Cordoba" value="STD3" />
+        <zone name="America/Costa_Rica" value="CST6" />
+        <zone name="America/Creston" value="MST7" />
+        <zone name="America/Cuiaba" value="STD4" />
+        <zone name="America/Curacao" value="AST4" />
+        <zone name="America/Danmarkshavn" value="GMT0" />
+        <zone name="America/Dawson" value="MST7" />
+        <zone name="America/Dawson_Creek" value="MST7" />
+        <zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Dominica" value="AST4" />
+        <zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Eirunepe" value="STD5" />
+        <zone name="America/El_Salvador" value="CST6" />
+        <zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fort_Nelson" value="MST7" />
+        <zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fortaleza" value="STD3" />
+        <zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Godthab" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Grenada" value="AST4" />
+        <zone name="America/Guadeloupe" value="AST4" />
+        <zone name="America/Guatemala" value="CST6" />
+        <zone name="America/Guayaquil" value="STD5" />
+        <zone name="America/Guyana" value="STD4" />
+        <zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
+        <zone name="America/Hermosillo" value="MST7" />
+        <zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Jamaica" value="EST5" />
+        <zone name="America/Jujuy" value="STD3" />
+        <zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kralendijk" value="AST4" />
+        <zone name="America/La_Paz" value="STD4" />
+        <zone name="America/Lima" value="STD5" />
+        <zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Lower_Princes" value="AST4" />
+        <zone name="America/Maceio" value="STD3" />
+        <zone name="America/Managua" value="CST6" />
+        <zone name="America/Manaus" value="STD4" />
+        <zone name="America/Marigot" value="AST4" />
+        <zone name="America/Martinique" value="AST4" />
+        <zone name="America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mazatlan" value="MST7" />
+        <zone name="America/Mendoza" value="STD3" />
+        <zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Merida" value="CST6" />
+        <zone name="America/Metlakatla" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mexico_City" value="CST6" />
+        <zone name="America/Miquelon" value="STD3DST,M3.2.0,M11.1.0" />
+        <zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Monterrey" value="CST6" />
+        <zone name="America/Montevideo" value="STD3" />
+        <zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Montserrat" value="AST4" />
+        <zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Noronha" value="STD2" />
+        <zone name="America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nuuk" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Ojinaga" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Panama" value="EST5" />
+        <zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Paramaribo" value="STD3" />
+        <zone name="America/Phoenix" value="MST7" />
+        <zone name="America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Port_of_Spain" value="AST4" />
+        <zone name="America/Porto_Acre" value="STD5" />
+        <zone name="America/Porto_Velho" value="STD4" />
+        <zone name="America/Puerto_Rico" value="AST4" />
+        <zone name="America/Punta_Arenas" value="STD3" />
+        <zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Recife" value="STD3" />
+        <zone name="America/Regina" value="CST6" />
+        <zone name="America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rio_Branco" value="STD5" />
+        <zone name="America/Rosario" value="STD3" />
+        <zone name="America/Santa_Isabel" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Santarem" value="STD3" />
+        <zone name="America/Santiago" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="America/Santo_Domingo" value="AST4" />
+        <zone name="America/Sao_Paulo" value="STD3" />
+        <zone name="America/Scoresbysund" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Barthelemy" value="AST4" />
+        <zone name="America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Kitts" value="AST4" />
+        <zone name="America/St_Lucia" value="AST4" />
+        <zone name="America/St_Thomas" value="AST4" />
+        <zone name="America/St_Vincent" value="AST4" />
+        <zone name="America/Swift_Current" value="CST6" />
+        <zone name="America/Tegucigalpa" value="CST6" />
+        <zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tortola" value="AST4" />
+        <zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Virgin" value="AST4" />
+        <zone name="America/Whitehorse" value="MST7" />
+        <zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
 
-	<zone name="Antarctica/Casey" value="WST-8" />
-	<zone name="Antarctica/Davis" value="DAVT-7" />
-	<zone name="Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="Antarctica/Mawson" value="MAWT-6" />
-	<zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Palmer" value="CLST" />
-	<zone name="Antarctica/Rothera" value="ROTT3" />
-	<zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Syowa" value="SYOT-3" />
-	<zone name="Antarctica/Vostok" value="VOST-6" />
+        <zone name="Antarctica/Casey" value="STD-11" />
+        <zone name="Antarctica/Davis" value="STD-7" />
+        <zone name="Antarctica/DumontDUrville" value="STD-10" />
+        <zone name="Antarctica/Macquarie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Antarctica/Mawson" value="STD-5" />
+        <zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Palmer" value="STD3" />
+        <zone name="Antarctica/Rothera" value="STD3" />
+        <zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Syowa" value="STD-3" />
+        <zone name="Antarctica/Troll" value="STD-0DST-2,M3.5.0/1,M10.5.0/3" />
+        <zone name="Antarctica/Vostok" value="STD-6" />
 
-	<zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Asia/Aden" value="AST-3" />
-	<zone name="Asia/Almaty" value="ALMT-6" />
-	<zone name="Asia/Amman" value="EET-2EEST,M3.5.4/0,M10.5.5/1" />
-	<zone name="Asia/Anadyr" value="ANAT-12ANAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Aqtau" value="AQTT-5" />
-	<zone name="Asia/Aqtobe" value="AQTT-5" />
-	<zone name="Asia/Ashgabat" value="TMT-5" />
-	<zone name="Asia/Ashkhabad" value="TMT-5" />
-	<zone name="Asia/Baghdad" value="AST-3" />
-	<zone name="Asia/Bahrain" value="AST-3" />
-	<zone name="Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="Asia/Bangkok" value="ICT-7" />
-	<zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="Asia/Bishkek" value="KGT-6" />
-	<zone name="Asia/Brunei" value="BNT-8" />
-	<zone name="Asia/Calcutta" value="IST-5:30" />
-	<zone name="Asia/Choibalsan" value="CHOT-9" />
-	<zone name="Asia/Chongqing" value="CST-8" />
-	<zone name="Asia/Chungking" value="CST-8" />
-	<zone name="Asia/Colombo" value="IST-5:30" />
-	<zone name="Asia/Dacca" value="BDT-6" />
-	<zone name="Asia/Damascus" value="EET-2EEST,M4.1.5/0,J274/0" />
-	<zone name="Asia/Dhaka" value="BDT-6" />
-	<zone name="Asia/Dili" value="TLT-9" />
-	<zone name="Asia/Dubai" value="GST-4" />
-	<zone name="Asia/Dushanbe" value="TJT-5" />
-	<zone name="Asia/Gaza" value="EET-2EEST,J91/0,M9.2.4" />
-	<zone name="Asia/Harbin" value="CST-8" />
-	<zone name="Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="Asia/Hong_Kong" value="HKT-8" />
-	<zone name="Asia/Hovd" value="HOVT-7" />
-	<zone name="Asia/Irkutsk" value="IRKT-8IRKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Jakarta" value="WIT-7" />
-	<zone name="Asia/Jayapura" value="EIT-9" />
-	<zone name="Asia/Jerusalem" value="IDDT" />
-	<zone name="Asia/Kabul" value="AFT-4:30" />
-	<zone name="Asia/Kamchatka" value="PETT-12PETST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Karachi" value="PKT-5" />
-	<zone name="Asia/Kashgar" value="CST-8" />
-	<zone name="Asia/Katmandu" value="NPT-5:45" />
-	<zone name="Asia/Kolkata" value="IST-5:30" />
-	<zone name="Asia/Krasnoyarsk" value="KRAT-7KRAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="Asia/Kuching" value="MYT-8" />
-	<zone name="Asia/Kuwait" value="AST-3" />
-	<zone name="Asia/Macao" value="CST-8" />
-	<zone name="Asia/Macau" value="CST-8" />
-	<zone name="Asia/Magadan" value="MAGT-11MAGST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Makassar" value="CIT-8" />
-	<zone name="Asia/Manila" value="PHT-8" />
-	<zone name="Asia/Muscat" value="GST-4" />
-	<zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Novosibirsk" value="NOVT-6NOVST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Omsk" value="OMST-6OMSST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Oral" value="ORAT-5" />
-	<zone name="Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="Asia/Pontianak" value="WIT-7" />
-	<zone name="Asia/Pyongyang" value="KST-9" />
-	<zone name="Asia/Qatar" value="AST-3" />
-	<zone name="Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="Asia/Rangoon" value="MMT-6:30" />
-	<zone name="Asia/Riyadh" value="AST-3" />
-	<zone name="Asia/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh89" value="zzz-3:07:04" />
-	<zone name="Asia/Saigon" value="ICT-7" />
-	<zone name="Asia/Sakhalin" value="SAKT-10SAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Samarkand" value="UZT-5" />
-	<zone name="Asia/Seoul" value="KST-9" />
-	<zone name="Asia/Shanghai" value="CST-8" />
-	<zone name="Asia/Singapore" value="SGT-8" />
-	<zone name="Asia/Taipei" value="CST-8" />
-	<zone name="Asia/Tashkent" value="UZT-5" />
-	<zone name="Asia/Tbilisi" value="GET-4" />
-	<zone name="Asia/Tehran" value="IRDT" />
-	<zone name="Asia/Tel_Aviv" value="IDDT" />
-	<zone name="Asia/Thimbu" value="BTT-6" />
-	<zone name="Asia/Thimphu" value="BTT-6" />
-	<zone name="Asia/Tokyo" value="JST-9" />
-	<zone name="Asia/Ujung_Pandang" value="CIT-8" />
-	<zone name="Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="Asia/Urumqi" value="CST-8" />
-	<zone name="Asia/Vientiane" value="ICT-7" />
-	<zone name="Asia/Vladivostok" value="VLAT-10VLAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yakutsk" value="YAKT-9YAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yekaterinburg" value="YEKT-5YEKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yerevan" value="AMT-4AMST,M3.5.0,M10.5.0/3" />
+        <zone name="Asia/Aden" value="STD-3" />
+        <zone name="Asia/Almaty" value="STD-6" />
+        <zone name="Asia/Amman" value="STD-3" />
+        <zone name="Asia/Anadyr" value="STD-12" />
+        <zone name="Asia/Aqtau" value="STD-5" />
+        <zone name="Asia/Aqtobe" value="STD-5" />
+        <zone name="Asia/Ashgabat" value="STD-5" />
+        <zone name="Asia/Ashkhabad" value="STD-5" />
+        <zone name="Asia/Atyrau" value="STD-5" />
+        <zone name="Asia/Baghdad" value="STD-3" />
+        <zone name="Asia/Bahrain" value="STD-3" />
+        <zone name="Asia/Baku" value="STD-4" />
+        <zone name="Asia/Bangkok" value="STD-7" />
+        <zone name="Asia/Barnaul" value="STD-7" />
+        <zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
+        <zone name="Asia/Bishkek" value="STD-6" />
+        <zone name="Asia/Brunei" value="STD-8" />
+        <zone name="Asia/Calcutta" value="IST-5:30" />
+        <zone name="Asia/Chita" value="STD-9" />
+        <zone name="Asia/Choibalsan" value="STD-8" />
+        <zone name="Asia/Chongqing" value="CST-8" />
+        <zone name="Asia/Chungking" value="CST-8" />
+        <zone name="Asia/Colombo" value="STD-5:30" />
+        <zone name="Asia/Dacca" value="STD-6" />
+        <zone name="Asia/Damascus" value="STD-3" />
+        <zone name="Asia/Dhaka" value="STD-6" />
+        <zone name="Asia/Dili" value="STD-9" />
+        <zone name="Asia/Dubai" value="STD-4" />
+        <zone name="Asia/Dushanbe" value="STD-5" />
+        <zone name="Asia/Famagusta" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Gaza" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Harbin" value="CST-8" />
+        <zone name="Asia/Hebron" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Ho_Chi_Minh" value="STD-7" />
+        <zone name="Asia/Hong_Kong" value="HKT-8" />
+        <zone name="Asia/Hovd" value="STD-7" />
+        <zone name="Asia/Irkutsk" value="STD-8" />
+        <zone name="Asia/Istanbul" value="STD-3" />
+        <zone name="Asia/Jakarta" value="WIB-7" />
+        <zone name="Asia/Jayapura" value="WIT-9" />
+        <zone name="Asia/Jerusalem" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Kabul" value="STD-4:30" />
+        <zone name="Asia/Kamchatka" value="STD-12" />
+        <zone name="Asia/Karachi" value="PKT-5" />
+        <zone name="Asia/Kashgar" value="STD-6" />
+        <zone name="Asia/Kathmandu" value="STD-5:45" />
+        <zone name="Asia/Katmandu" value="STD-5:45" />
+        <zone name="Asia/Khandyga" value="STD-9" />
+        <zone name="Asia/Kolkata" value="IST-5:30" />
+        <zone name="Asia/Krasnoyarsk" value="STD-7" />
+        <zone name="Asia/Kuala_Lumpur" value="STD-8" />
+        <zone name="Asia/Kuching" value="STD-8" />
+        <zone name="Asia/Kuwait" value="STD-3" />
+        <zone name="Asia/Macao" value="CST-8" />
+        <zone name="Asia/Macau" value="CST-8" />
+        <zone name="Asia/Magadan" value="STD-11" />
+        <zone name="Asia/Makassar" value="WITA-8" />
+        <zone name="Asia/Manila" value="PST-8" />
+        <zone name="Asia/Muscat" value="STD-4" />
+        <zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Novokuznetsk" value="STD-7" />
+        <zone name="Asia/Novosibirsk" value="STD-7" />
+        <zone name="Asia/Omsk" value="STD-6" />
+        <zone name="Asia/Oral" value="STD-5" />
+        <zone name="Asia/Phnom_Penh" value="STD-7" />
+        <zone name="Asia/Pontianak" value="WIB-7" />
+        <zone name="Asia/Pyongyang" value="KST-9" />
+        <zone name="Asia/Qatar" value="STD-3" />
+        <zone name="Asia/Qostanay" value="STD-6" />
+        <zone name="Asia/Qyzylorda" value="STD-5" />
+        <zone name="Asia/Rangoon" value="STD-6:30" />
+        <zone name="Asia/Riyadh" value="STD-3" />
+        <zone name="Asia/Saigon" value="STD-7" />
+        <zone name="Asia/Sakhalin" value="STD-11" />
+        <zone name="Asia/Samarkand" value="STD-5" />
+        <zone name="Asia/Seoul" value="KST-9" />
+        <zone name="Asia/Shanghai" value="CST-8" />
+        <zone name="Asia/Singapore" value="STD-8" />
+        <zone name="Asia/Srednekolymsk" value="STD-11" />
+        <zone name="Asia/Taipei" value="CST-8" />
+        <zone name="Asia/Tashkent" value="STD-5" />
+        <zone name="Asia/Tbilisi" value="STD-4" />
+        <zone name="Asia/Tehran" value="STD-3:30" />
+        <zone name="Asia/Tel_Aviv" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Thimbu" value="STD-6" />
+        <zone name="Asia/Thimphu" value="STD-6" />
+        <zone name="Asia/Tokyo" value="JST-9" />
+        <zone name="Asia/Tomsk" value="STD-7" />
+        <zone name="Asia/Ujung_Pandang" value="WITA-8" />
+        <zone name="Asia/Ulaanbaatar" value="STD-8" />
+        <zone name="Asia/Ulan_Bator" value="STD-8" />
+        <zone name="Asia/Urumqi" value="STD-6" />
+        <zone name="Asia/Ust-Nera" value="STD-10" />
+        <zone name="Asia/Vientiane" value="STD-7" />
+        <zone name="Asia/Vladivostok" value="STD-10" />
+        <zone name="Asia/Yakutsk" value="STD-9" />
+        <zone name="Asia/Yangon" value="STD-6:30" />
+        <zone name="Asia/Yekaterinburg" value="STD-5" />
+        <zone name="Asia/Yerevan" value="STD-4" />
 
-	<zone name="Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Reykjavik" value="GMT0" />
-	<zone name="Atlantic/South_Georgia" value="GST2" />
-	<zone name="Atlantic/Stanley" value="FKT4FKST,M9.1.0,M4.3.0" />
-	<zone name="Atlantic/St_Helena" value="GMT0" />
+        <zone name="Atlantic/Azores" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Cape_Verde" value="STD1" />
+        <zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Reykjavik" value="GMT0" />
+        <zone name="Atlantic/South_Georgia" value="STD2" />
+        <zone name="Atlantic/St_Helena" value="GMT0" />
+        <zone name="Atlantic/Stanley" value="STD3" />
 
-	<zone name="Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Brisbane" value="EST-10" />
-	<zone name="Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Darwin" value="CST-9:30" />
-	<zone name="Australia/Eucla" value="CWST-8:45" />
-	<zone name="Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Lindeman" value="EST-10" />
-	<zone name="Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/North" value="CST-9:30" />
-	<zone name="Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Perth" value="WST-8" />
-	<zone name="Australia/Queensland" value="EST-10" />
-	<zone name="Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/West" value="WST-8" />
-	<zone name="Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Brisbane" value="AEST-10" />
+        <zone name="Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Darwin" value="ACST-9:30" />
+        <zone name="Australia/Eucla" value="STD-8:45" />
+        <zone name="Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/LHI" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Lindeman" value="AEST-10" />
+        <zone name="Australia/Lord_Howe" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/North" value="ACST-9:30" />
+        <zone name="Australia/Perth" value="AWST-8" />
+        <zone name="Australia/Queensland" value="AEST-10" />
+        <zone name="Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/West" value="AWST-8" />
+        <zone name="Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
 
-	<zone name="Brazil/Acre" value="ACT5" />
-	<zone name="Brazil/DeNoronha" value="FNT2" />
-	<zone name="Brazil/East" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
-	<zone name="Brazil/West" value="AMT4" />
+        <zone name="Brazil/Acre" value="STD5" />
+        <zone name="Brazil/DeNoronha" value="STD2" />
+        <zone name="Brazil/East" value="STD3" />
+        <zone name="Brazil/West" value="STD4" />
 
-	<zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/East-Saskatchewan" value="CST6" />
-	<zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Saskatchewan" value="CST6" />
-	<zone name="Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Chile/Continental" value="CLST" />
-	<zone name="Chile/EasterIsland" value="EASST" />
+        <zone name="CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
 
-	<zone name="Etc/GMT" value="GMT0" />
-	<zone name="Etc/GMT0" value="GMT0" />
-	<zone name="Etc/GMT-0" value="GMT0" />
-	<zone name="Etc/GMT+0" value="GMT0" />
-	<zone name="Etc/GMT-1" value="GMT-1" />
-	<zone name="Etc/GMT+1" value="GMT+1" />
-	<zone name="Etc/GMT-10" value="GMT-10" />
-	<zone name="Etc/GMT+10" value="GMT+10" />
-	<zone name="Etc/GMT-11" value="GMT-11" />
-	<zone name="Etc/GMT+11" value="GMT+11" />
-	<zone name="Etc/GMT-12" value="GMT-12" />
-	<zone name="Etc/GMT+12" value="GMT+12" />
-	<zone name="Etc/GMT-13" value="GMT-13" />
-	<zone name="Etc/GMT-14" value="GMT-14" />
-	<zone name="Etc/GMT-2" value="GMT-2" />
-	<zone name="Etc/GMT+2" value="GMT+2" />
-	<zone name="Etc/GMT-3" value="GMT-3" />
-	<zone name="Etc/GMT+3" value="GMT+3" />
-	<zone name="Etc/GMT-4" value="GMT-4" />
-	<zone name="Etc/GMT+4" value="GMT+4" />
-	<zone name="Etc/GMT-5" value="GMT-5" />
-	<zone name="Etc/GMT+5" value="GMT+5" />
-	<zone name="Etc/GMT-6" value="GMT-6" />
-	<zone name="Etc/GMT+6" value="GMT+6" />
-	<zone name="Etc/GMT-7" value="GMT-7" />
-	<zone name="Etc/GMT+7" value="GMT+7" />
-	<zone name="Etc/GMT-8" value="GMT-8" />
-	<zone name="Etc/GMT+8" value="GMT+8" />
-	<zone name="Etc/GMT-9" value="GMT-9" />
-	<zone name="Etc/GMT+9" value="GMT+9" />
-	<zone name="Etc/Greenwich" value="GMT0" />
-	<zone name="Etc/UCT" value="UCT0" />
-	<zone name="Etc/Universal" value="UTC0" />
-	<zone name="Etc/UTC" value="UTC0" />
-	<zone name="Etc/Zulu" value="UTC0" />
+        <zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Saskatchewan" value="CST6" />
+        <zone name="Canada/Yukon" value="MST7" />
 
-	<zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Kaliningrad" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Minsk" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Moscow" value="MSK-3MSD,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Samara" value="SAMT-4SAMST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Simferopol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Volgograd" value="VOLT-3VOLST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Chile/Continental" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="Chile/EasterIsland" value="STD6DST,M9.1.6/22,M4.1.6/22" />
 
-	<zone name="Indian/Antananarivo" value="EAT-3" />
-	<zone name="Indian/Chagos" value="IOT-6" />
-	<zone name="Indian/Christmas" value="CXT-7" />
-	<zone name="Indian/Cocos" value="CCT-6:30" />
-	<zone name="Indian/Comoro" value="EAT-3" />
-	<zone name="Indian/Kerguelen" value="TFT-5" />
-	<zone name="Indian/Mahe" value="SCT-4" />
-	<zone name="Indian/Maldives" value="MVT-5" />
-	<zone name="Indian/Mauritius" value="MUT-4" />
-	<zone name="Indian/Mayotte" value="EAT-3" />
-	<zone name="Indian/Reunion" value="RET-4" />
+        <zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
 
-	<zone name="Mexico/BajaNorte" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
+        <zone name="EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 
-	<zone name="Mideast/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh89" value="zzz-3:07:04" />
+        <zone name="EST" value="EST5" />
 
-	<zone name="Pacific/Apia" value="WST11" />
-	<zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="Pacific/Easter" value="EASST" />
-	<zone name="Pacific/Efate" value="VUT-11" />
-	<zone name="Pacific/Enderbury" value="PHOT-13" />
-	<zone name="Pacific/Fakaofo" value="TKT10" />
-	<zone name="Pacific/Fiji" value="FJT-12" />
-	<zone name="Pacific/Funafuti" value="TVT-12" />
-	<zone name="Pacific/Galapagos" value="GALT6" />
-	<zone name="Pacific/Gambier" value="GAMT9" />
-	<zone name="Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="Pacific/Guam" value="ChST-10" />
-	<zone name="Pacific/Honolulu" value="HST10" />
-	<zone name="Pacific/Johnston" value="HST10" />
-	<zone name="Pacific/Kiritimati" value="LINT-14" />
-	<zone name="Pacific/Kosrae" value="KOST-11" />
-	<zone name="Pacific/Kwajalein" value="MHT-12" />
-	<zone name="Pacific/Majuro" value="MHT-12" />
-	<zone name="Pacific/Marquesas" value="MART9:30" />
-	<zone name="Pacific/Midway" value="SST11" />
-	<zone name="Pacific/Nauru" value="NRT-12" />
-	<zone name="Pacific/Niue" value="NUT11" />
-	<zone name="Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="Pacific/Noumea" value="NCT-11" />
-	<zone name="Pacific/Pago_Pago" value="SST11" />
-	<zone name="Pacific/Palau" value="PWT-9" />
-	<zone name="Pacific/Pitcairn" value="PST8" />
-	<zone name="Pacific/Ponape" value="PONT-11" />
-	<zone name="Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="Pacific/Rarotonga" value="CKT10" />
-	<zone name="Pacific/Saipan" value="ChST-10" />
-	<zone name="Pacific/Samoa" value="SST11" />
-	<zone name="Pacific/Tahiti" value="TAHT10" />
-	<zone name="Pacific/Tarawa" value="GILT-12" />
-	<zone name="Pacific/Tongatapu" value="TOT-13" />
-	<zone name="Pacific/Truk" value="TRUT-10" />
-	<zone name="Pacific/Wake" value="WAKT-12" />
-	<zone name="Pacific/Wallis" value="WFT-12" />
-	<zone name="Pacific/Yap" value="TRUT-10" />
+        <zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
 
-	<zone name="SystemV/AST4" value="AST4" />
-	<zone name="SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/CST6" value="CST6" />
-	<zone name="SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/EST5" value="EST5" />
-	<zone name="SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/HST10" value="HST10" />
-	<zone name="SystemV/MST7" value="MST7" />
-	<zone name="SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/PST8" value="PST8" />
-	<zone name="SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/YST9" value="GAMT9" />
-	<zone name="SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="Egypt" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
 
-	<zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="US/Arizona" value="MST7" />
-	<zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Hawaii" value="HST10" />
-	<zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Samoa" value="SST11" />
+        <zone name="Eire" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+
+        <zone name="Etc/GMT" value="GMT0" />
+        <zone name="Etc/GMT+0" value="GMT0" />
+        <zone name="Etc/GMT+1" value="GMT1" />
+        <zone name="Etc/GMT+10" value="GMT10" />
+        <zone name="Etc/GMT+11" value="GMT11" />
+        <zone name="Etc/GMT+12" value="GMT12" />
+        <zone name="Etc/GMT+2" value="GMT2" />
+        <zone name="Etc/GMT+3" value="GMT3" />
+        <zone name="Etc/GMT+4" value="GMT4" />
+        <zone name="Etc/GMT+5" value="GMT5" />
+        <zone name="Etc/GMT+6" value="GMT6" />
+        <zone name="Etc/GMT+7" value="GMT7" />
+        <zone name="Etc/GMT+8" value="GMT8" />
+        <zone name="Etc/GMT+9" value="GMT9" />
+        <zone name="Etc/GMT-0" value="GMT0" />
+        <zone name="Etc/GMT-1" value="GMT-1" />
+        <zone name="Etc/GMT-10" value="GMT-10" />
+        <zone name="Etc/GMT-11" value="GMT-11" />
+        <zone name="Etc/GMT-12" value="GMT-12" />
+        <zone name="Etc/GMT-13" value="GMT-13" />
+        <zone name="Etc/GMT-14" value="GMT-14" />
+        <zone name="Etc/GMT-2" value="GMT-2" />
+        <zone name="Etc/GMT-3" value="GMT-3" />
+        <zone name="Etc/GMT-4" value="GMT-4" />
+        <zone name="Etc/GMT-5" value="GMT-5" />
+        <zone name="Etc/GMT-6" value="GMT-6" />
+        <zone name="Etc/GMT-7" value="GMT-7" />
+        <zone name="Etc/GMT-8" value="GMT-8" />
+        <zone name="Etc/GMT-9" value="GMT-9" />
+        <zone name="Etc/GMT0" value="GMT0" />
+        <zone name="Etc/Greenwich" value="GMT0" />
+        <zone name="Etc/UCT" value="UTC0" />
+        <zone name="Etc/UTC" value="UTC0" />
+        <zone name="Etc/Universal" value="UTC0" />
+        <zone name="Etc/Zulu" value="UTC0" />
+
+        <zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Astrakhan" value="STD-4" />
+        <zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Dublin" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+        <zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Istanbul" value="STD-3" />
+        <zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Kaliningrad" value="EET-2" />
+        <zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Kirov" value="MSK-3" />
+        <zone name="Europe/Kyiv" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Minsk" value="STD-3" />
+        <zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Moscow" value="MSK-3" />
+        <zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Samara" value="STD-4" />
+        <zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Saratov" value="STD-4" />
+        <zone name="Europe/Simferopol" value="MSK-3" />
+        <zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Ulyanovsk" value="STD-4" />
+        <zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Volgograd" value="MSK-3" />
+        <zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Factory" value="STD0" />
+
+        <zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GMT" value="GMT0" />
+
+        <zone name="GMT+0" value="GMT0" />
+
+        <zone name="GMT-0" value="GMT0" />
+
+        <zone name="GMT0" value="GMT0" />
+
+        <zone name="Greenwich" value="GMT0" />
+
+        <zone name="HST" value="HST10" />
+
+        <zone name="Hongkong" value="HKT-8" />
+
+        <zone name="Iceland" value="GMT0" />
+
+        <zone name="Indian/Antananarivo" value="EAT-3" />
+        <zone name="Indian/Chagos" value="STD-6" />
+        <zone name="Indian/Christmas" value="STD-7" />
+        <zone name="Indian/Cocos" value="STD-6:30" />
+        <zone name="Indian/Comoro" value="EAT-3" />
+        <zone name="Indian/Kerguelen" value="STD-5" />
+        <zone name="Indian/Mahe" value="STD-4" />
+        <zone name="Indian/Maldives" value="STD-5" />
+        <zone name="Indian/Mauritius" value="STD-4" />
+        <zone name="Indian/Mayotte" value="EAT-3" />
+        <zone name="Indian/Reunion" value="STD-4" />
+
+        <zone name="Iran" value="STD-3:30" />
+
+        <zone name="Israel" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+
+        <zone name="Jamaica" value="EST5" />
+
+        <zone name="Japan" value="JST-9" />
+
+        <zone name="Kwajalein" value="STD-12" />
+
+        <zone name="Libya" value="EET-2" />
+
+        <zone name="MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="MST" value="MST7" />
+
+        <zone name="MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Mexico/BajaSur" value="MST7" />
+        <zone name="Mexico/General" value="CST6" />
+
+        <zone name="NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+
+        <zone name="NZ-CHAT" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+
+        <zone name="Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="PRC" value="CST-8" />
+
+        <zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
+
+        <zone name="Pacific/Apia" value="STD-13" />
+        <zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Pacific/Bougainville" value="STD-11" />
+        <zone name="Pacific/Chatham" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+        <zone name="Pacific/Chuuk" value="STD-10" />
+        <zone name="Pacific/Easter" value="STD6DST,M9.1.6/22,M4.1.6/22" />
+        <zone name="Pacific/Efate" value="STD-11" />
+        <zone name="Pacific/Enderbury" value="STD-13" />
+        <zone name="Pacific/Fakaofo" value="STD-13" />
+        <zone name="Pacific/Fiji" value="STD-12" />
+        <zone name="Pacific/Funafuti" value="STD-12" />
+        <zone name="Pacific/Galapagos" value="STD6" />
+        <zone name="Pacific/Gambier" value="STD9" />
+        <zone name="Pacific/Guadalcanal" value="STD-11" />
+        <zone name="Pacific/Guam" value="ChST-10" />
+        <zone name="Pacific/Honolulu" value="HST10" />
+        <zone name="Pacific/Johnston" value="HST10" />
+        <zone name="Pacific/Kanton" value="STD-13" />
+        <zone name="Pacific/Kiritimati" value="STD-14" />
+        <zone name="Pacific/Kosrae" value="STD-11" />
+        <zone name="Pacific/Kwajalein" value="STD-12" />
+        <zone name="Pacific/Majuro" value="STD-12" />
+        <zone name="Pacific/Marquesas" value="STD9:30" />
+        <zone name="Pacific/Midway" value="SST11" />
+        <zone name="Pacific/Nauru" value="STD-12" />
+        <zone name="Pacific/Niue" value="STD11" />
+        <zone name="Pacific/Norfolk" value="STD-11DST,M10.1.0,M4.1.0/3" />
+        <zone name="Pacific/Noumea" value="STD-11" />
+        <zone name="Pacific/Pago_Pago" value="SST11" />
+        <zone name="Pacific/Palau" value="STD-9" />
+        <zone name="Pacific/Pitcairn" value="STD8" />
+        <zone name="Pacific/Pohnpei" value="STD-11" />
+        <zone name="Pacific/Ponape" value="STD-11" />
+        <zone name="Pacific/Port_Moresby" value="STD-10" />
+        <zone name="Pacific/Rarotonga" value="STD10" />
+        <zone name="Pacific/Saipan" value="ChST-10" />
+        <zone name="Pacific/Samoa" value="SST11" />
+        <zone name="Pacific/Tahiti" value="STD10" />
+        <zone name="Pacific/Tarawa" value="STD-12" />
+        <zone name="Pacific/Tongatapu" value="STD-13" />
+        <zone name="Pacific/Truk" value="STD-10" />
+        <zone name="Pacific/Wake" value="STD-12" />
+        <zone name="Pacific/Wallis" value="STD-12" />
+        <zone name="Pacific/Yap" value="STD-10" />
+
+        <zone name="Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
+
+        <zone name="ROC" value="CST-8" />
+
+        <zone name="ROK" value="KST-9" />
+
+        <zone name="Singapore" value="STD-8" />
+
+        <zone name="Turkey" value="STD-3" />
+
+        <zone name="UCT" value="UTC0" />
+
+        <zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="US/Arizona" value="MST7" />
+        <zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Hawaii" value="HST10" />
+        <zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="US/Samoa" value="SST11" />
+
+        <zone name="UTC" value="UTC0" />
+
+        <zone name="Universal" value="UTC0" />
+
+        <zone name="W-SU" value="MSK-3" />
+
+        <zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
+
+        <zone name="Zulu" value="UTC0" />
     </timezones>
 </configuration>
diff --git a/conf/insideout/dialplan/default.xml b/conf/insideout/dialplan/default.xml
index 6290dd53b0..6d78a7f3b3 100644
--- a/conf/insideout/dialplan/default.xml
+++ b/conf/insideout/dialplan/default.xml
@@ -116,24 +116,6 @@
       </condition>
     </extension>
     -->
-    <!--
-	snom button demo, call 9000 to make button 2 mapped to transfer the current call to a conference
-    -->
-
-    <extension name="snom-demo-2">
-      <condition field="destination_number" expression="^9001$">
-	<action application="eval" data="${snom_bind_key(2 off DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message notused)}"/>
-	<action application="transfer" data="3000"/>
-      </condition>
-    </extension>
-    
-    <extension name="snom-demo-1">
-      <condition field="destination_number" expression="^9000$">
-	<!--<key> <light> <label> <user> <host> <profile> <action_name> <action>-->
-	<action application="eval" data="${snom_bind_key(2 on DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message api+uuid_transfer ${uuid} 9001)}"/>
-	<action application="playback" data="$${hold_music}"/>
-      </condition>
-    </extension>
 
     <extension name="eavesdrop">
       <condition field="destination_number" expression="^88(.*)$|^\*0(.*)$">
diff --git a/conf/insideout/vars.xml b/conf/insideout/vars.xml
index 39a5dedd37..8e2b1854c8 100644
--- a/conf/insideout/vars.xml
+++ b/conf/insideout/vars.xml
@@ -59,14 +59,6 @@
        G729             - G729 in passthru mode. (mod_g729)
        G723             - G723.1 in passthru mode. (mod_g723_1)
        AMR              - AMR in passthru mode. (mod_amr)
-       
-       These are the passthru video codecs: (mod_h26x)
-       
-       H261             - H.261 Video
-       H263             - H.263 Video
-       H263-1998        - H.263-1998 Video
-       H263-2000        - H.263-2000 Video
-       H264             - H.264 Video
 
   -->
   <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM"/>
diff --git a/conf/minimal/autoload_configs/timezones.conf.xml b/conf/minimal/autoload_configs/timezones.conf.xml
index 0af4c77d7f..9ddded792c 100644
--- a/conf/minimal/autoload_configs/timezones.conf.xml
+++ b/conf/minimal/autoload_configs/timezones.conf.xml
@@ -1,1850 +1,661 @@
 <configuration name="timezones.conf" description="Timezones">
     <timezones>
-	<zone name="Africa/Abidjan" value="GMT0" />
-	<zone name="Africa/Accra" value="GMT0" />
-	<zone name="Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="Africa/Algiers" value="CET-1" />
-	<zone name="Africa/Asmara" value="EAT-3" />
-	<zone name="Africa/Asmera" value="EAT-3" />
-	<zone name="Africa/Bamako" value="GMT0" />
-	<zone name="Africa/Bangui" value="WAT-1" />
-	<zone name="Africa/Banjul" value="GMT0" />
-	<zone name="Africa/Bissau" value="GMT0" />
-	<zone name="Africa/Blantyre" value="CAT-2" />
-	<zone name="Africa/Brazzaville" value="WAT-1" />
-	<zone name="Africa/Bujumbura" value="CAT-2" />
-	<zone name="Africa/Cairo" value="EEST" />
-	<zone name="Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Conakry" value="GMT0" />
-	<zone name="Africa/Dakar" value="GMT0" />
-	<zone name="Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="Africa/Djibouti" value="EAT-3" />
-	<zone name="Africa/Douala" value="WAT-1" />
-	<zone name="Africa/El_Aaiun" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Freetown" value="GMT0" />
-	<zone name="Africa/Gaborone" value="CAT-2" />
-	<zone name="Africa/Harare" value="CAT-2" />
-	<zone name="Africa/Johannesburg" value="SAST-2" />
-	<zone name="Africa/Juba" value="EAT-3" />
-	<zone name="Africa/Kampala" value="EAT-3" />
-	<zone name="Africa/Khartoum" value="EAT-3" />
-	<zone name="Africa/Kigali" value="CAT-2" />
-	<zone name="Africa/Kinshasa" value="WAT-1" />
-	<zone name="Africa/Lagos" value="WAT-1" />
-	<zone name="Africa/Libreville" value="WAT-1" />
-	<zone name="Africa/Lome" value="GMT0" />
-	<zone name="Africa/Luanda" value="WAT-1" />
-	<zone name="Africa/Lubumbashi" value="CAT-2" />
-	<zone name="Africa/Lusaka" value="CAT-2" />
-	<zone name="Africa/Malabo" value="WAT-1" />
-	<zone name="Africa/Maputo" value="CAT-2" />
-	<zone name="Africa/Maseru" value="SAST-2" />
-	<zone name="Africa/Mbabane" value="SAST-2" />
-	<zone name="Africa/Mogadishu" value="EAT-3" />
-	<zone name="Africa/Monrovia" value="GMT0" />
-	<zone name="Africa/Nairobi" value="EAT-3" />
-	<zone name="Africa/Ndjamena" value="WAT-1" />
-	<zone name="Africa/Niamey" value="WAT-1" />
-	<zone name="Africa/Nouakchott" value="GMT0" />
-	<zone name="Africa/Ouagadougou" value="GMT0" />
-	<zone name="Africa/Porto-Novo" value="WAT-1" />
-	<zone name="Africa/Sao_Tome" value="GMT0" />
-	<zone name="Africa/Timbuktu" value="GMT0" />
-	<zone name="Africa/Tripoli" value="EET-2" />
-	<zone name="Africa/Tunis" value="CET-1" />
-	<zone name="Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
+        <zone name="Africa/Abidjan" value="GMT0" />
+        <zone name="Africa/Accra" value="GMT0" />
+        <zone name="Africa/Addis_Ababa" value="EAT-3" />
+        <zone name="Africa/Algiers" value="CET-1" />
+        <zone name="Africa/Asmara" value="EAT-3" />
+        <zone name="Africa/Asmera" value="EAT-3" />
+        <zone name="Africa/Bamako" value="GMT0" />
+        <zone name="Africa/Bangui" value="WAT-1" />
+        <zone name="Africa/Banjul" value="GMT0" />
+        <zone name="Africa/Bissau" value="GMT0" />
+        <zone name="Africa/Blantyre" value="CAT-2" />
+        <zone name="Africa/Brazzaville" value="WAT-1" />
+        <zone name="Africa/Bujumbura" value="CAT-2" />
+        <zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
+        <zone name="Africa/Casablanca" value="STD-1" />
+        <zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Africa/Conakry" value="GMT0" />
+        <zone name="Africa/Dakar" value="GMT0" />
+        <zone name="Africa/Dar_es_Salaam" value="EAT-3" />
+        <zone name="Africa/Djibouti" value="EAT-3" />
+        <zone name="Africa/Douala" value="WAT-1" />
+        <zone name="Africa/El_Aaiun" value="STD-1" />
+        <zone name="Africa/Freetown" value="GMT0" />
+        <zone name="Africa/Gaborone" value="CAT-2" />
+        <zone name="Africa/Harare" value="CAT-2" />
+        <zone name="Africa/Johannesburg" value="SAST-2" />
+        <zone name="Africa/Juba" value="CAT-2" />
+        <zone name="Africa/Kampala" value="EAT-3" />
+        <zone name="Africa/Khartoum" value="CAT-2" />
+        <zone name="Africa/Kigali" value="CAT-2" />
+        <zone name="Africa/Kinshasa" value="WAT-1" />
+        <zone name="Africa/Lagos" value="WAT-1" />
+        <zone name="Africa/Libreville" value="WAT-1" />
+        <zone name="Africa/Lome" value="GMT0" />
+        <zone name="Africa/Luanda" value="WAT-1" />
+        <zone name="Africa/Lubumbashi" value="CAT-2" />
+        <zone name="Africa/Lusaka" value="CAT-2" />
+        <zone name="Africa/Malabo" value="WAT-1" />
+        <zone name="Africa/Maputo" value="CAT-2" />
+        <zone name="Africa/Maseru" value="SAST-2" />
+        <zone name="Africa/Mbabane" value="SAST-2" />
+        <zone name="Africa/Mogadishu" value="EAT-3" />
+        <zone name="Africa/Monrovia" value="GMT0" />
+        <zone name="Africa/Nairobi" value="EAT-3" />
+        <zone name="Africa/Ndjamena" value="WAT-1" />
+        <zone name="Africa/Niamey" value="WAT-1" />
+        <zone name="Africa/Nouakchott" value="GMT0" />
+        <zone name="Africa/Ouagadougou" value="GMT0" />
+        <zone name="Africa/Porto-Novo" value="WAT-1" />
+        <zone name="Africa/Sao_Tome" value="GMT0" />
+        <zone name="Africa/Timbuktu" value="GMT0" />
+        <zone name="Africa/Tripoli" value="EET-2" />
+        <zone name="Africa/Tunis" value="CET-1" />
+        <zone name="Africa/Windhoek" value="CAT-2" />
+
+        <zone name="America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anguilla" value="AST4" />
+        <zone name="America/Antigua" value="AST4" />
+        <zone name="America/Araguaina" value="STD3" />
+        <zone name="America/Argentina/Buenos_Aires" value="STD3" />
+        <zone name="America/Argentina/Catamarca" value="STD3" />
+        <zone name="America/Argentina/ComodRivadavia" value="STD3" />
+        <zone name="America/Argentina/Cordoba" value="STD3" />
+        <zone name="America/Argentina/Jujuy" value="STD3" />
+        <zone name="America/Argentina/La_Rioja" value="STD3" />
+        <zone name="America/Argentina/Mendoza" value="STD3" />
+        <zone name="America/Argentina/Rio_Gallegos" value="STD3" />
+        <zone name="America/Argentina/Salta" value="STD3" />
+        <zone name="America/Argentina/San_Juan" value="STD3" />
+        <zone name="America/Argentina/San_Luis" value="STD3" />
+        <zone name="America/Argentina/Tucuman" value="STD3" />
+        <zone name="America/Argentina/Ushuaia" value="STD3" />
+        <zone name="America/Aruba" value="AST4" />
+        <zone name="America/Asuncion" value="STD4DST,M10.1.0/0,M3.4.0/0" />
+        <zone name="America/Atikokan" value="EST5" />
+        <zone name="America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Bahia" value="STD3" />
+        <zone name="America/Bahia_Banderas" value="CST6" />
+        <zone name="America/Barbados" value="AST4" />
+        <zone name="America/Belem" value="STD3" />
+        <zone name="America/Belize" value="CST6" />
+        <zone name="America/Blanc-Sablon" value="AST4" />
+        <zone name="America/Boa_Vista" value="STD4" />
+        <zone name="America/Bogota" value="STD5" />
+        <zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Buenos_Aires" value="STD3" />
+        <zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Campo_Grande" value="STD4" />
+        <zone name="America/Cancun" value="EST5" />
+        <zone name="America/Caracas" value="STD4" />
+        <zone name="America/Catamarca" value="STD3" />
+        <zone name="America/Cayenne" value="STD3" />
+        <zone name="America/Cayman" value="EST5" />
+        <zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Chihuahua" value="CST6" />
+        <zone name="America/Ciudad_Juarez" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Coral_Harbour" value="EST5" />
+        <zone name="America/Cordoba" value="STD3" />
+        <zone name="America/Costa_Rica" value="CST6" />
+        <zone name="America/Creston" value="MST7" />
+        <zone name="America/Cuiaba" value="STD4" />
+        <zone name="America/Curacao" value="AST4" />
+        <zone name="America/Danmarkshavn" value="GMT0" />
+        <zone name="America/Dawson" value="MST7" />
+        <zone name="America/Dawson_Creek" value="MST7" />
+        <zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Dominica" value="AST4" />
+        <zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Eirunepe" value="STD5" />
+        <zone name="America/El_Salvador" value="CST6" />
+        <zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fort_Nelson" value="MST7" />
+        <zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fortaleza" value="STD3" />
+        <zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Godthab" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Grenada" value="AST4" />
+        <zone name="America/Guadeloupe" value="AST4" />
+        <zone name="America/Guatemala" value="CST6" />
+        <zone name="America/Guayaquil" value="STD5" />
+        <zone name="America/Guyana" value="STD4" />
+        <zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
+        <zone name="America/Hermosillo" value="MST7" />
+        <zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Jamaica" value="EST5" />
+        <zone name="America/Jujuy" value="STD3" />
+        <zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kralendijk" value="AST4" />
+        <zone name="America/La_Paz" value="STD4" />
+        <zone name="America/Lima" value="STD5" />
+        <zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Lower_Princes" value="AST4" />
+        <zone name="America/Maceio" value="STD3" />
+        <zone name="America/Managua" value="CST6" />
+        <zone name="America/Manaus" value="STD4" />
+        <zone name="America/Marigot" value="AST4" />
+        <zone name="America/Martinique" value="AST4" />
+        <zone name="America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mazatlan" value="MST7" />
+        <zone name="America/Mendoza" value="STD3" />
+        <zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Merida" value="CST6" />
+        <zone name="America/Metlakatla" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mexico_City" value="CST6" />
+        <zone name="America/Miquelon" value="STD3DST,M3.2.0,M11.1.0" />
+        <zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Monterrey" value="CST6" />
+        <zone name="America/Montevideo" value="STD3" />
+        <zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Montserrat" value="AST4" />
+        <zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Noronha" value="STD2" />
+        <zone name="America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nuuk" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Ojinaga" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Panama" value="EST5" />
+        <zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Paramaribo" value="STD3" />
+        <zone name="America/Phoenix" value="MST7" />
+        <zone name="America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Port_of_Spain" value="AST4" />
+        <zone name="America/Porto_Acre" value="STD5" />
+        <zone name="America/Porto_Velho" value="STD4" />
+        <zone name="America/Puerto_Rico" value="AST4" />
+        <zone name="America/Punta_Arenas" value="STD3" />
+        <zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Recife" value="STD3" />
+        <zone name="America/Regina" value="CST6" />
+        <zone name="America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rio_Branco" value="STD5" />
+        <zone name="America/Rosario" value="STD3" />
+        <zone name="America/Santa_Isabel" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Santarem" value="STD3" />
+        <zone name="America/Santiago" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="America/Santo_Domingo" value="AST4" />
+        <zone name="America/Sao_Paulo" value="STD3" />
+        <zone name="America/Scoresbysund" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Barthelemy" value="AST4" />
+        <zone name="America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Kitts" value="AST4" />
+        <zone name="America/St_Lucia" value="AST4" />
+        <zone name="America/St_Thomas" value="AST4" />
+        <zone name="America/St_Vincent" value="AST4" />
+        <zone name="America/Swift_Current" value="CST6" />
+        <zone name="America/Tegucigalpa" value="CST6" />
+        <zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tortola" value="AST4" />
+        <zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Virgin" value="AST4" />
+        <zone name="America/Whitehorse" value="MST7" />
+        <zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="Antarctica/Casey" value="STD-11" />
+        <zone name="Antarctica/Davis" value="STD-7" />
+        <zone name="Antarctica/DumontDUrville" value="STD-10" />
+        <zone name="Antarctica/Macquarie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Antarctica/Mawson" value="STD-5" />
+        <zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Palmer" value="STD3" />
+        <zone name="Antarctica/Rothera" value="STD3" />
+        <zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Syowa" value="STD-3" />
+        <zone name="Antarctica/Troll" value="STD-0DST-2,M3.5.0/1,M10.5.0/3" />
+        <zone name="Antarctica/Vostok" value="STD-6" />
+
+        <zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Asia/Aden" value="STD-3" />
+        <zone name="Asia/Almaty" value="STD-6" />
+        <zone name="Asia/Amman" value="STD-3" />
+        <zone name="Asia/Anadyr" value="STD-12" />
+        <zone name="Asia/Aqtau" value="STD-5" />
+        <zone name="Asia/Aqtobe" value="STD-5" />
+        <zone name="Asia/Ashgabat" value="STD-5" />
+        <zone name="Asia/Ashkhabad" value="STD-5" />
+        <zone name="Asia/Atyrau" value="STD-5" />
+        <zone name="Asia/Baghdad" value="STD-3" />
+        <zone name="Asia/Bahrain" value="STD-3" />
+        <zone name="Asia/Baku" value="STD-4" />
+        <zone name="Asia/Bangkok" value="STD-7" />
+        <zone name="Asia/Barnaul" value="STD-7" />
+        <zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
+        <zone name="Asia/Bishkek" value="STD-6" />
+        <zone name="Asia/Brunei" value="STD-8" />
+        <zone name="Asia/Calcutta" value="IST-5:30" />
+        <zone name="Asia/Chita" value="STD-9" />
+        <zone name="Asia/Choibalsan" value="STD-8" />
+        <zone name="Asia/Chongqing" value="CST-8" />
+        <zone name="Asia/Chungking" value="CST-8" />
+        <zone name="Asia/Colombo" value="STD-5:30" />
+        <zone name="Asia/Dacca" value="STD-6" />
+        <zone name="Asia/Damascus" value="STD-3" />
+        <zone name="Asia/Dhaka" value="STD-6" />
+        <zone name="Asia/Dili" value="STD-9" />
+        <zone name="Asia/Dubai" value="STD-4" />
+        <zone name="Asia/Dushanbe" value="STD-5" />
+        <zone name="Asia/Famagusta" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Gaza" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Harbin" value="CST-8" />
+        <zone name="Asia/Hebron" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Ho_Chi_Minh" value="STD-7" />
+        <zone name="Asia/Hong_Kong" value="HKT-8" />
+        <zone name="Asia/Hovd" value="STD-7" />
+        <zone name="Asia/Irkutsk" value="STD-8" />
+        <zone name="Asia/Istanbul" value="STD-3" />
+        <zone name="Asia/Jakarta" value="WIB-7" />
+        <zone name="Asia/Jayapura" value="WIT-9" />
+        <zone name="Asia/Jerusalem" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Kabul" value="STD-4:30" />
+        <zone name="Asia/Kamchatka" value="STD-12" />
+        <zone name="Asia/Karachi" value="PKT-5" />
+        <zone name="Asia/Kashgar" value="STD-6" />
+        <zone name="Asia/Kathmandu" value="STD-5:45" />
+        <zone name="Asia/Katmandu" value="STD-5:45" />
+        <zone name="Asia/Khandyga" value="STD-9" />
+        <zone name="Asia/Kolkata" value="IST-5:30" />
+        <zone name="Asia/Krasnoyarsk" value="STD-7" />
+        <zone name="Asia/Kuala_Lumpur" value="STD-8" />
+        <zone name="Asia/Kuching" value="STD-8" />
+        <zone name="Asia/Kuwait" value="STD-3" />
+        <zone name="Asia/Macao" value="CST-8" />
+        <zone name="Asia/Macau" value="CST-8" />
+        <zone name="Asia/Magadan" value="STD-11" />
+        <zone name="Asia/Makassar" value="WITA-8" />
+        <zone name="Asia/Manila" value="PST-8" />
+        <zone name="Asia/Muscat" value="STD-4" />
+        <zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Novokuznetsk" value="STD-7" />
+        <zone name="Asia/Novosibirsk" value="STD-7" />
+        <zone name="Asia/Omsk" value="STD-6" />
+        <zone name="Asia/Oral" value="STD-5" />
+        <zone name="Asia/Phnom_Penh" value="STD-7" />
+        <zone name="Asia/Pontianak" value="WIB-7" />
+        <zone name="Asia/Pyongyang" value="KST-9" />
+        <zone name="Asia/Qatar" value="STD-3" />
+        <zone name="Asia/Qostanay" value="STD-6" />
+        <zone name="Asia/Qyzylorda" value="STD-5" />
+        <zone name="Asia/Rangoon" value="STD-6:30" />
+        <zone name="Asia/Riyadh" value="STD-3" />
+        <zone name="Asia/Saigon" value="STD-7" />
+        <zone name="Asia/Sakhalin" value="STD-11" />
+        <zone name="Asia/Samarkand" value="STD-5" />
+        <zone name="Asia/Seoul" value="KST-9" />
+        <zone name="Asia/Shanghai" value="CST-8" />
+        <zone name="Asia/Singapore" value="STD-8" />
+        <zone name="Asia/Srednekolymsk" value="STD-11" />
+        <zone name="Asia/Taipei" value="CST-8" />
+        <zone name="Asia/Tashkent" value="STD-5" />
+        <zone name="Asia/Tbilisi" value="STD-4" />
+        <zone name="Asia/Tehran" value="STD-3:30" />
+        <zone name="Asia/Tel_Aviv" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Thimbu" value="STD-6" />
+        <zone name="Asia/Thimphu" value="STD-6" />
+        <zone name="Asia/Tokyo" value="JST-9" />
+        <zone name="Asia/Tomsk" value="STD-7" />
+        <zone name="Asia/Ujung_Pandang" value="WITA-8" />
+        <zone name="Asia/Ulaanbaatar" value="STD-8" />
+        <zone name="Asia/Ulan_Bator" value="STD-8" />
+        <zone name="Asia/Urumqi" value="STD-6" />
+        <zone name="Asia/Ust-Nera" value="STD-10" />
+        <zone name="Asia/Vientiane" value="STD-7" />
+        <zone name="Asia/Vladivostok" value="STD-10" />
+        <zone name="Asia/Yakutsk" value="STD-9" />
+        <zone name="Asia/Yangon" value="STD-6:30" />
+        <zone name="Asia/Yekaterinburg" value="STD-5" />
+        <zone name="Asia/Yerevan" value="STD-4" />
+
+        <zone name="Atlantic/Azores" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Cape_Verde" value="STD1" />
+        <zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Reykjavik" value="GMT0" />
+        <zone name="Atlantic/South_Georgia" value="STD2" />
+        <zone name="Atlantic/St_Helena" value="GMT0" />
+        <zone name="Atlantic/Stanley" value="STD3" />
+
+        <zone name="Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Brisbane" value="AEST-10" />
+        <zone name="Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Darwin" value="ACST-9:30" />
+        <zone name="Australia/Eucla" value="STD-8:45" />
+        <zone name="Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/LHI" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Lindeman" value="AEST-10" />
+        <zone name="Australia/Lord_Howe" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/North" value="ACST-9:30" />
+        <zone name="Australia/Perth" value="AWST-8" />
+        <zone name="Australia/Queensland" value="AEST-10" />
+        <zone name="Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/West" value="AWST-8" />
+        <zone name="Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+
+        <zone name="Brazil/Acre" value="STD5" />
+        <zone name="Brazil/DeNoronha" value="STD2" />
+        <zone name="Brazil/East" value="STD3" />
+        <zone name="Brazil/West" value="STD4" />
+
+        <zone name="CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
+
+        <zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Saskatchewan" value="CST6" />
+        <zone name="Canada/Yukon" value="MST7" />
+
+        <zone name="Chile/Continental" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="Chile/EasterIsland" value="STD6DST,M9.1.6/22,M4.1.6/22" />
+
+        <zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
+
+        <zone name="EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+
+        <zone name="EST" value="EST5" />
+
+        <zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
+
+        <zone name="Egypt" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
+
+        <zone name="Eire" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+
+        <zone name="Etc/GMT" value="GMT0" />
+        <zone name="Etc/GMT+0" value="GMT0" />
+        <zone name="Etc/GMT+1" value="GMT1" />
+        <zone name="Etc/GMT+10" value="GMT10" />
+        <zone name="Etc/GMT+11" value="GMT11" />
+        <zone name="Etc/GMT+12" value="GMT12" />
+        <zone name="Etc/GMT+2" value="GMT2" />
+        <zone name="Etc/GMT+3" value="GMT3" />
+        <zone name="Etc/GMT+4" value="GMT4" />
+        <zone name="Etc/GMT+5" value="GMT5" />
+        <zone name="Etc/GMT+6" value="GMT6" />
+        <zone name="Etc/GMT+7" value="GMT7" />
+        <zone name="Etc/GMT+8" value="GMT8" />
+        <zone name="Etc/GMT+9" value="GMT9" />
+        <zone name="Etc/GMT-0" value="GMT0" />
+        <zone name="Etc/GMT-1" value="GMT-1" />
+        <zone name="Etc/GMT-10" value="GMT-10" />
+        <zone name="Etc/GMT-11" value="GMT-11" />
+        <zone name="Etc/GMT-12" value="GMT-12" />
+        <zone name="Etc/GMT-13" value="GMT-13" />
+        <zone name="Etc/GMT-14" value="GMT-14" />
+        <zone name="Etc/GMT-2" value="GMT-2" />
+        <zone name="Etc/GMT-3" value="GMT-3" />
+        <zone name="Etc/GMT-4" value="GMT-4" />
+        <zone name="Etc/GMT-5" value="GMT-5" />
+        <zone name="Etc/GMT-6" value="GMT-6" />
+        <zone name="Etc/GMT-7" value="GMT-7" />
+        <zone name="Etc/GMT-8" value="GMT-8" />
+        <zone name="Etc/GMT-9" value="GMT-9" />
+        <zone name="Etc/GMT0" value="GMT0" />
+        <zone name="Etc/Greenwich" value="GMT0" />
+        <zone name="Etc/UCT" value="UTC0" />
+        <zone name="Etc/UTC" value="UTC0" />
+        <zone name="Etc/Universal" value="UTC0" />
+        <zone name="Etc/Zulu" value="UTC0" />
+
+        <zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Astrakhan" value="STD-4" />
+        <zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Dublin" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+        <zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Istanbul" value="STD-3" />
+        <zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Kaliningrad" value="EET-2" />
+        <zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Kirov" value="MSK-3" />
+        <zone name="Europe/Kyiv" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Minsk" value="STD-3" />
+        <zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Moscow" value="MSK-3" />
+        <zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Samara" value="STD-4" />
+        <zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Saratov" value="STD-4" />
+        <zone name="Europe/Simferopol" value="MSK-3" />
+        <zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Ulyanovsk" value="STD-4" />
+        <zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Volgograd" value="MSK-3" />
+        <zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Factory" value="STD0" />
+
+        <zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GMT" value="GMT0" />
+
+        <zone name="GMT+0" value="GMT0" />
+
+        <zone name="GMT-0" value="GMT0" />
+
+        <zone name="GMT0" value="GMT0" />
+
+        <zone name="Greenwich" value="GMT0" />
+
+        <zone name="HST" value="HST10" />
+
+        <zone name="Hongkong" value="HKT-8" />
+
+        <zone name="Iceland" value="GMT0" />
+
+        <zone name="Indian/Antananarivo" value="EAT-3" />
+        <zone name="Indian/Chagos" value="STD-6" />
+        <zone name="Indian/Christmas" value="STD-7" />
+        <zone name="Indian/Cocos" value="STD-6:30" />
+        <zone name="Indian/Comoro" value="EAT-3" />
+        <zone name="Indian/Kerguelen" value="STD-5" />
+        <zone name="Indian/Mahe" value="STD-4" />
+        <zone name="Indian/Maldives" value="STD-5" />
+        <zone name="Indian/Mauritius" value="STD-4" />
+        <zone name="Indian/Mayotte" value="EAT-3" />
+        <zone name="Indian/Reunion" value="STD-4" />
+
+        <zone name="Iran" value="STD-3:30" />
+
+        <zone name="Israel" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+
+        <zone name="Jamaica" value="EST5" />
+
+        <zone name="Japan" value="JST-9" />
+
+        <zone name="Kwajalein" value="STD-12" />
+
+        <zone name="Libya" value="EET-2" />
+
+        <zone name="MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="MST" value="MST7" />
+
+        <zone name="MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Mexico/BajaSur" value="MST7" />
+        <zone name="Mexico/General" value="CST6" />
+
+        <zone name="NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+
+        <zone name="NZ-CHAT" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+
+        <zone name="Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="PRC" value="CST-8" />
+
+        <zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
+
+        <zone name="Pacific/Apia" value="STD-13" />
+        <zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Pacific/Bougainville" value="STD-11" />
+        <zone name="Pacific/Chatham" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+        <zone name="Pacific/Chuuk" value="STD-10" />
+        <zone name="Pacific/Easter" value="STD6DST,M9.1.6/22,M4.1.6/22" />
+        <zone name="Pacific/Efate" value="STD-11" />
+        <zone name="Pacific/Enderbury" value="STD-13" />
+        <zone name="Pacific/Fakaofo" value="STD-13" />
+        <zone name="Pacific/Fiji" value="STD-12" />
+        <zone name="Pacific/Funafuti" value="STD-12" />
+        <zone name="Pacific/Galapagos" value="STD6" />
+        <zone name="Pacific/Gambier" value="STD9" />
+        <zone name="Pacific/Guadalcanal" value="STD-11" />
+        <zone name="Pacific/Guam" value="ChST-10" />
+        <zone name="Pacific/Honolulu" value="HST10" />
+        <zone name="Pacific/Johnston" value="HST10" />
+        <zone name="Pacific/Kanton" value="STD-13" />
+        <zone name="Pacific/Kiritimati" value="STD-14" />
+        <zone name="Pacific/Kosrae" value="STD-11" />
+        <zone name="Pacific/Kwajalein" value="STD-12" />
+        <zone name="Pacific/Majuro" value="STD-12" />
+        <zone name="Pacific/Marquesas" value="STD9:30" />
+        <zone name="Pacific/Midway" value="SST11" />
+        <zone name="Pacific/Nauru" value="STD-12" />
+        <zone name="Pacific/Niue" value="STD11" />
+        <zone name="Pacific/Norfolk" value="STD-11DST,M10.1.0,M4.1.0/3" />
+        <zone name="Pacific/Noumea" value="STD-11" />
+        <zone name="Pacific/Pago_Pago" value="SST11" />
+        <zone name="Pacific/Palau" value="STD-9" />
+        <zone name="Pacific/Pitcairn" value="STD8" />
+        <zone name="Pacific/Pohnpei" value="STD-11" />
+        <zone name="Pacific/Ponape" value="STD-11" />
+        <zone name="Pacific/Port_Moresby" value="STD-10" />
+        <zone name="Pacific/Rarotonga" value="STD10" />
+        <zone name="Pacific/Saipan" value="ChST-10" />
+        <zone name="Pacific/Samoa" value="SST11" />
+        <zone name="Pacific/Tahiti" value="STD10" />
+        <zone name="Pacific/Tarawa" value="STD-12" />
+        <zone name="Pacific/Tongatapu" value="STD-13" />
+        <zone name="Pacific/Truk" value="STD-10" />
+        <zone name="Pacific/Wake" value="STD-12" />
+        <zone name="Pacific/Wallis" value="STD-12" />
+        <zone name="Pacific/Yap" value="STD-10" />
 
-	<zone name="America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Anguilla" value="AST4" />
-	<zone name="America/Antigua" value="AST4" />
-	<zone name="America/Araguaina" value="BRT3" />
-	<zone name="America/Argentina/Buenos_Aires" value="ART3" />
-	<zone name="America/Argentina/Catamarca" value="ART3" />
-	<zone name="America/Argentina/ComodRivadavia" value="ART3" />
-	<zone name="America/Argentina/Cordoba" value="ART3" />
-	<zone name="America/Argentina/Jujuy" value="ART3" />
-	<zone name="America/Argentina/La_Rioja" value="ART3" />
-	<zone name="America/Argentina/Mendoza" value="ART3" />
-	<zone name="America/Argentina/Rio_Gallegos" value="ART3" />
-	<zone name="America/Argentina/Salta" value="ART3" />
-	<zone name="America/Argentina/San_Juan" value="ART3" />
-	<zone name="America/Argentina/San_Luis" value="ART3" />
-	<zone name="America/Argentina/Tucuman" value="ART3" />
-	<zone name="America/Argentina/Ushuaia" value="ART3" />
-	<zone name="America/Aruba" value="AST4" />
-	<zone name="America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
-	<zone name="America/Atikokan" value="EST5" />
-	<zone name="America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Bahia" value="BRT3" />
-	<zone name="America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Barbados" value="AST4" />
-	<zone name="America/Belem" value="BRT3" />
-	<zone name="America/Belize" value="CST6" />
-	<zone name="America/Blanc-Sablon" value="AST4" />
-	<zone name="America/Boa_Vista" value="AMT4" />
-	<zone name="America/Bogota" value="COT5" />
-	<zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Buenos_Aires" value="ART3" />
-	<zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Caracas" value="VET4:30" />
-	<zone name="America/Catamarca" value="ART3" />
-	<zone name="America/Cayenne" value="GFT3" />
-	<zone name="America/Cayman" value="EST5" />
-	<zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Coral_Harbour" value="EST5" />
-	<zone name="America/Cordoba" value="ART3" />
-	<zone name="America/Costa_Rica" value="CST6" />
-	<zone name="America/Creston" value="MST7" />
-	<zone name="America/Cuiaba" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="America/Curacao" value="AST4" />
-	<zone name="America/Danmarkshavn" value="GMT0" />
-	<zone name="America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dawson_Creek" value="MST7" />
-	<zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dominica" value="AST4" />
-	<zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Eirunepe" value="ACT5" />
-	<zone name="America/El_Salvador" value="CST6" />
-	<zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Fortaleza" value="BRT3" />
-	<zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Godthab" value="WGST" />
-	<zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Grenada" value="AST4" />
-	<zone name="America/Guadeloupe" value="AST4" />
-	<zone name="America/Guatemala" value="CST6" />
-	<zone name="America/Guayaquil" value="ECT5" />
-	<zone name="America/Guyana" value="GYT4" />
-	<zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="America/Hermosillo" value="MST7" />
-	<zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Jamaica" value="EST5" />
-	<zone name="America/Jujuy" value="ART3" />
-	<zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kralendijk" value="AST4" />
-	<zone name="America/La_Paz" value="BOT4" />
-	<zone name="America/Lima" value="PET5" />
-	<zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Lower_Princes" value="AST4" />
-	<zone name="America/Maceio" value="BRT3" />
-	<zone name="America/Managua" value="CST6" />
-	<zone name="America/Manaus" value="AMT4" />
-	<zone name="America/Marigot" value="AST4" />
-	<zone name="America/Martinique" value="AST4" />
-	<zone name="America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mendoza" value="ART3" />
-	<zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Metlakatla" value="MeST8" />
-	<zone name="America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Montserrat" value="AST4" />
-	<zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Noronha" value="FNT2" />
-	<zone name="America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Ojinaga" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Panama" value="EST5" />
-	<zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Paramaribo" value="SRT3" />
-	<zone name="America/Phoenix" value="MST7" />
-	<zone name="America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Port_of_Spain" value="AST4" />
-	<zone name="America/Porto_Acre" value="ACT5" />
-	<zone name="America/Porto_Velho" value="AMT4" />
-	<zone name="America/Puerto_Rico" value="AST4" />
-	<zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Recife" value="BRT3" />
-	<zone name="America/Regina" value="CST6" />
-	<zone name="America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rio_Branco" value="ACT5" />
-	<zone name="America/Rosario" value="ART3" />
-	<zone name="America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Santarem" value="BRT3" />
-	<zone name="America/Santiago" value="CLST" />
-	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3" />
-	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Barthelemy" value="AST4" />
-	<zone name="America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Kitts" value="AST4" />
-	<zone name="America/St_Lucia" value="AST4" />
-	<zone name="America/St_Thomas" value="AST4" />
-	<zone name="America/St_Vincent" value="AST4" />
-	<zone name="America/Swift_Current" value="CST6" />
-	<zone name="America/Tegucigalpa" value="CST6" />
-	<zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tortola" value="AST4" />
-	<zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Virgin" value="AST4" />
-	<zone name="America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Antarctica/Casey" value="WST-8" />
-	<zone name="Antarctica/Davis" value="DAVT-7" />
-	<zone name="Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="Antarctica/Macquarie" value="MIST-11" />
-	<zone name="Antarctica/Mawson" value="MAWT-5" />
-	<zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Palmer" value="CLST" />
-	<zone name="Antarctica/Rothera" value="ROTT3" />
-	<zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Syowa" value="SYOT-3" />
-	<zone name="Antarctica/Troll" value="UTC0CEST-2,M3.5.0/1,M10.5.0/3" />
-	<zone name="Antarctica/Vostok" value="VOST-6" />
+        <zone name="Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
 
-	<zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="ROC" value="CST-8" />
 
-	<zone name="Asia/Aden" value="AST-3" />
-	<zone name="Asia/Almaty" value="ALMT-6" />
-	<zone name="Asia/Amman" value="EEST" />
-	<zone name="Asia/Anadyr" value="ANAT-12" />
-	<zone name="Asia/Aqtau" value="AQTT-5" />
-	<zone name="Asia/Aqtobe" value="AQTT-5" />
-	<zone name="Asia/Ashgabat" value="TMT-5" />
-	<zone name="Asia/Ashkhabad" value="TMT-5" />
-	<zone name="Asia/Baghdad" value="AST-3" />
-	<zone name="Asia/Bahrain" value="AST-3" />
-	<zone name="Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="Asia/Bangkok" value="ICT-7" />
-	<zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="Asia/Bishkek" value="KGT-6" />
-	<zone name="Asia/Brunei" value="BNT-8" />
-	<zone name="Asia/Calcutta" value="IST-5:30" />
-	<zone name="Asia/Choibalsan" value="CHOT-8" />
-	<zone name="Asia/Chongqing" value="CST-8" />
-	<zone name="Asia/Chungking" value="CST-8" />
-	<zone name="Asia/Colombo" value="IST-5:30" />
-	<zone name="Asia/Dacca" value="BDT-6" />
-	<zone name="Asia/Damascus" value="EET-2EEST,M3.5.5/0,M10.5.5/0" />
-	<zone name="Asia/Dhaka" value="BDT-6" />
-	<zone name="Asia/Dili" value="TLT-9" />
-	<zone name="Asia/Dubai" value="GST-4" />
-	<zone name="Asia/Dushanbe" value="TJT-5" />
-	<zone name="Asia/Gaza" value="EEST" />
-	<zone name="Asia/Harbin" value="CST-8" />
-	<zone name="Asia/Hebron" value="EEST" />
-	<zone name="Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="Asia/Hong_Kong" value="HKT-8" />
-	<zone name="Asia/Hovd" value="HOVT-7" />
-	<zone name="Asia/Irkutsk" value="IRKT-9" />
-	<zone name="Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Jakarta" value="WIB-7" />
-	<zone name="Asia/Jayapura" value="WIT-9" />
-	<zone name="Asia/Jerusalem" value="IDDT" />
-	<zone name="Asia/Kabul" value="AFT-4:30" />
-	<zone name="Asia/Kamchatka" value="PETT-12" />
-	<zone name="Asia/Karachi" value="PKT-5" />
-	<zone name="Asia/Kashgar" value="CST-8" />
-	<zone name="Asia/Kathmandu" value="NPT-5:45" />
-	<zone name="Asia/Katmandu" value="NPT-5:45" />
-	<zone name="Asia/Khandyga" value="YAKT-10" />
-	<zone name="Asia/Kolkata" value="IST-5:30" />
-	<zone name="Asia/Krasnoyarsk" value="KRAT-8" />
-	<zone name="Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="Asia/Kuching" value="MYT-8" />
-	<zone name="Asia/Kuwait" value="AST-3" />
-	<zone name="Asia/Macao" value="CST-8" />
-	<zone name="Asia/Macau" value="CST-8" />
-	<zone name="Asia/Magadan" value="MAGT-12" />
-	<zone name="Asia/Makassar" value="WITA-8" />
-	<zone name="Asia/Manila" value="PHT-8" />
-	<zone name="Asia/Muscat" value="GST-4" />
-	<zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Novokuznetsk" value="NOVT-7" />
-	<zone name="Asia/Novosibirsk" value="NOVT-7" />
-	<zone name="Asia/Omsk" value="OMST-7" />
-	<zone name="Asia/Oral" value="ORAT-5" />
-	<zone name="Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="Asia/Pontianak" value="WIB-7" />
-	<zone name="Asia/Pyongyang" value="KST-9" />
-	<zone name="Asia/Qatar" value="AST-3" />
-	<zone name="Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="Asia/Rangoon" value="MMT-6:30" />
-	<zone name="Asia/Riyadh" value="AST-3" />
-	<zone name="Asia/Saigon" value="ICT-7" />
-	<zone name="Asia/Sakhalin" value="SAKT-11" />
-	<zone name="Asia/Samarkand" value="UZT-5" />
-	<zone name="Asia/Seoul" value="KST-9" />
-	<zone name="Asia/Shanghai" value="CST-8" />
-	<zone name="Asia/Singapore" value="SGT-8" />
-	<zone name="Asia/Taipei" value="CST-8" />
-	<zone name="Asia/Tashkent" value="UZT-5" />
-	<zone name="Asia/Tbilisi" value="GET-4" />
-	<zone name="Asia/Tehran" value="IRDT" />
-	<zone name="Asia/Tel_Aviv" value="IDDT" />
-	<zone name="Asia/Thimbu" value="BTT-6" />
-	<zone name="Asia/Thimphu" value="BTT-6" />
-	<zone name="Asia/Tokyo" value="JST-9" />
-	<zone name="Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="Asia/Urumqi" value="CST-8" />
-	<zone name="Asia/Ust-Nera" value="VLAT-11" />
-	<zone name="Asia/Vientiane" value="ICT-7" />
-	<zone name="Asia/Vladivostok" value="VLAT-11" />
-	<zone name="Asia/Yakutsk" value="YAKT-10" />
-	<zone name="Asia/Yekaterinburg" value="YEKT-6" />
-	<zone name="Asia/Yerevan" value="AMT-4" />
+        <zone name="ROK" value="KST-9" />
+
+        <zone name="Singapore" value="STD-8" />
+
+        <zone name="Turkey" value="STD-3" />
+
+        <zone name="UCT" value="UTC0" />
+
+        <zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="US/Arizona" value="MST7" />
+        <zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Hawaii" value="HST10" />
+        <zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="US/Samoa" value="SST11" />
 
-	<zone name="Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Reykjavik" value="GMT0" />
-	<zone name="Atlantic/South_Georgia" value="GST2" />
-	<zone name="Atlantic/St_Helena" value="GMT0" />
-	<zone name="Atlantic/Stanley" value="FKST3" />
-
-	<zone name="Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Brisbane" value="EST-10" />
-	<zone name="Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Darwin" value="CST-9:30" />
-	<zone name="Australia/Eucla" value="CWST-8:45" />
-	<zone name="Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Lindeman" value="EST-10" />
-	<zone name="Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/North" value="CST-9:30" />
-	<zone name="Australia/Perth" value="WST-8" />
-	<zone name="Australia/Queensland" value="EST-10" />
-	<zone name="Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/West" value="WST-8" />
-	<zone name="Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-
-	<zone name="Brazil/Acre" value="ACT5" />
-	<zone name="Brazil/DeNoronha" value="FNT2" />
-	<zone name="Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="Brazil/West" value="AMT4" />
-
-	<zone name="CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-
-	<zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/East-Saskatchewan" value="CST6" />
-	<zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Saskatchewan" value="CST6" />
-	<zone name="Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-
-	<zone name="Chile/Continental" value="CLST" />
-	<zone name="Chile/EasterIsland" value="EASST" />
-
-	<zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-
-	<zone name="EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-
-	<zone name="EST" value="EST5" />
-
-	<zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-
-	<zone name="Egypt" value="EEST" />
-
-	<zone name="Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
-
-	<zone name="Etc/GMT" value="GMT0" />
-	<zone name="Etc/GMT+0" value="GMT0" />
-	<zone name="Etc/GMT+1" value="<GMT+1>1" />
-	<zone name="Etc/GMT+10" value="<GMT+10>10" />
-	<zone name="Etc/GMT+11" value="<GMT+11>11" />
-	<zone name="Etc/GMT+12" value="<GMT+12>12" />
-	<zone name="Etc/GMT+2" value="<GMT+2>2" />
-	<zone name="Etc/GMT+3" value="<GMT+3>3" />
-	<zone name="Etc/GMT+4" value="<GMT+4>4" />
-	<zone name="Etc/GMT+5" value="<GMT+5>5" />
-	<zone name="Etc/GMT+6" value="<GMT+6>6" />
-	<zone name="Etc/GMT+7" value="<GMT+7>7" />
-	<zone name="Etc/GMT+8" value="<GMT+8>8" />
-	<zone name="Etc/GMT+9" value="<GMT+9>9" />
-	<zone name="Etc/GMT-0" value="GMT0" />
-	<zone name="Etc/GMT-1" value="<GMT-1>-1" />
-	<zone name="Etc/GMT-10" value="<GMT-10>-10" />
-	<zone name="Etc/GMT-11" value="<GMT-11>-11" />
-	<zone name="Etc/GMT-12" value="<GMT-12>-12" />
-	<zone name="Etc/GMT-13" value="<GMT-13>-13" />
-	<zone name="Etc/GMT-14" value="<GMT-14>-14" />
-	<zone name="Etc/GMT-2" value="<GMT-2>-2" />
-	<zone name="Etc/GMT-3" value="<GMT-3>-3" />
-	<zone name="Etc/GMT-4" value="<GMT-4>-4" />
-	<zone name="Etc/GMT-5" value="<GMT-5>-5" />
-	<zone name="Etc/GMT-6" value="<GMT-6>-6" />
-	<zone name="Etc/GMT-7" value="<GMT-7>-7" />
-	<zone name="Etc/GMT-8" value="<GMT-8>-8" />
-	<zone name="Etc/GMT-9" value="<GMT-9>-9" />
-	<zone name="Etc/GMT0" value="GMT0" />
-	<zone name="Etc/Greenwich" value="GMT0" />
-	<zone name="Etc/UCT" value="UCT0" />
-	<zone name="Etc/UTC" value="UTC0" />
-	<zone name="Etc/Universal" value="UTC0" />
-	<zone name="Etc/Zulu" value="UTC0" />
-
-	<zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Kaliningrad" value="FET-3" />
-	<zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Minsk" value="FET-3" />
-	<zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Moscow" value="MSK-4" />
-	<zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Samara" value="SAMT-4" />
-	<zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Simferopol" value="MSK-4" />
-	<zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Volgograd" value="VOLT-4" />
-	<zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Factory" value="<Local time zone must be set--see zic manual page>0" />
-
-	<zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
-
-	<zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
-
-	<zone name="GMT" value="GMT0" />
-
-	<zone name="GMT+0" value="GMT0" />
-
-	<zone name="GMT-0" value="GMT0" />
-
-	<zone name="GMT0" value="GMT0" />
-
-	<zone name="Greenwich" value="GMT0" />
-
-	<zone name="HST" value="HST10" />
-
-	<zone name="Hongkong" value="HKT-8" />
-
-	<zone name="Iceland" value="GMT0" />
-
-	<zone name="Indian/Antananarivo" value="EAT-3" />
-	<zone name="Indian/Chagos" value="IOT-6" />
-	<zone name="Indian/Christmas" value="CXT-7" />
-	<zone name="Indian/Cocos" value="CCT-6:30" />
-	<zone name="Indian/Comoro" value="EAT-3" />
-	<zone name="Indian/Kerguelen" value="TFT-5" />
-	<zone name="Indian/Mahe" value="SCT-4" />
-	<zone name="Indian/Maldives" value="MVT-5" />
-	<zone name="Indian/Mauritius" value="MUT-4" />
-	<zone name="Indian/Mayotte" value="EAT-3" />
-	<zone name="Indian/Reunion" value="RET-4" />
-
-	<zone name="Iran" value="IRDT" />
-
-	<zone name="Israel" value="IDDT" />
-
-	<zone name="Jamaica" value="EST5" />
-
-	<zone name="Japan" value="JST-9" />
-
-	<zone name="Kwajalein" value="MHT-12" />
-
-	<zone name="Libya" value="EET-2" />
-
-	<zone name="MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="MST" value="MST7" />
-
-	<zone name="MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-
-	<zone name="Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-
-	<zone name="NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-
-	<zone name="NZ-CHAT" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-
-	<zone name="Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
-
-	<zone name="PRC" value="CST-8" />
-
-	<zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-
-	<zone name="Pacific/Apia" value="WST-13WSDT,M9.5.0/3,M4.1.0/4" />
-	<zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="Pacific/Chuuk" value="CHUT-10" />
-	<zone name="Pacific/Easter" value="EASST" />
-	<zone name="Pacific/Efate" value="VUT-11" />
-	<zone name="Pacific/Enderbury" value="PHOT-13" />
-	<zone name="Pacific/Fakaofo" value="TKT-13" />
-	<zone name="Pacific/Fiji" value="FJST" />
-	<zone name="Pacific/Funafuti" value="TVT-12" />
-	<zone name="Pacific/Galapagos" value="GALT6" />
-	<zone name="Pacific/Gambier" value="GAMT9" />
-	<zone name="Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="Pacific/Guam" value="ChST-10" />
-	<zone name="Pacific/Honolulu" value="HST10" />
-	<zone name="Pacific/Johnston" value="HST10" />
-	<zone name="Pacific/Kiritimati" value="LINT-14" />
-	<zone name="Pacific/Kosrae" value="KOST-11" />
-	<zone name="Pacific/Kwajalein" value="MHT-12" />
-	<zone name="Pacific/Majuro" value="MHT-12" />
-	<zone name="Pacific/Marquesas" value="MART9:30" />
-	<zone name="Pacific/Midway" value="SST11" />
-	<zone name="Pacific/Nauru" value="NRT-12" />
-	<zone name="Pacific/Niue" value="NUT11" />
-	<zone name="Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="Pacific/Noumea" value="NCT-11" />
-	<zone name="Pacific/Pago_Pago" value="SST11" />
-	<zone name="Pacific/Palau" value="PWT-9" />
-	<zone name="Pacific/Pitcairn" value="PST8" />
-	<zone name="Pacific/Pohnpei" value="PONT-11" />
-	<zone name="Pacific/Ponape" value="PONT-11" />
-	<zone name="Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="Pacific/Rarotonga" value="CKT10" />
-	<zone name="Pacific/Saipan" value="ChST-10" />
-	<zone name="Pacific/Samoa" value="SST11" />
-	<zone name="Pacific/Tahiti" value="TAHT10" />
-	<zone name="Pacific/Tarawa" value="GILT-12" />
-	<zone name="Pacific/Tongatapu" value="TOT-13" />
-	<zone name="Pacific/Truk" value="CHUT-10" />
-	<zone name="Pacific/Wake" value="WAKT-12" />
-	<zone name="Pacific/Wallis" value="WFT-12" />
-	<zone name="Pacific/Yap" value="CHUT-10" />
-
-	<zone name="Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
-
-	<zone name="ROC" value="CST-8" />
-
-	<zone name="ROK" value="KST-9" />
-
-	<zone name="Singapore" value="SGT-8" />
-
-	<zone name="SystemV/AST4" value="AST4" />
-	<zone name="SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/CST6" value="CST6" />
-	<zone name="SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/EST5" value="EST5" />
-	<zone name="SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/HST10" value="HST10" />
-	<zone name="SystemV/MST7" value="MST7" />
-	<zone name="SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/PST8" value="PST8" />
-	<zone name="SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/YST9" value="GAMT9" />
-	<zone name="SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
-
-	<zone name="Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-
-	<zone name="UCT" value="UCT0" />
-
-	<zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="US/Arizona" value="MST7" />
-	<zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Hawaii" value="HST10" />
-	<zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific-New" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Samoa" value="SST11" />
-
-	<zone name="UTC" value="UTC0" />
-
-	<zone name="Universal" value="UTC0" />
-
-	<zone name="W-SU" value="MSK-4" />
-
-	<zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
-
-	<zone name="Zulu" value="UTC0" />
-
-	<zone name="localtime" value="CST6CDT,M3.2.0,M11.1.0" />
-
-	<zone name="posix/Africa/Abidjan" value="GMT0" />
-	<zone name="posix/Africa/Accra" value="GMT0" />
-	<zone name="posix/Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="posix/Africa/Algiers" value="CET-1" />
-	<zone name="posix/Africa/Asmara" value="EAT-3" />
-	<zone name="posix/Africa/Asmera" value="EAT-3" />
-	<zone name="posix/Africa/Bamako" value="GMT0" />
-	<zone name="posix/Africa/Bangui" value="WAT-1" />
-	<zone name="posix/Africa/Banjul" value="GMT0" />
-	<zone name="posix/Africa/Bissau" value="GMT0" />
-	<zone name="posix/Africa/Blantyre" value="CAT-2" />
-	<zone name="posix/Africa/Brazzaville" value="WAT-1" />
-	<zone name="posix/Africa/Bujumbura" value="CAT-2" />
-	<zone name="posix/Africa/Cairo" value="EEST" />
-	<zone name="posix/Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Africa/Conakry" value="GMT0" />
-	<zone name="posix/Africa/Dakar" value="GMT0" />
-	<zone name="posix/Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="posix/Africa/Djibouti" value="EAT-3" />
-	<zone name="posix/Africa/Douala" value="WAT-1" />
-	<zone name="posix/Africa/El_Aaiun" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Africa/Freetown" value="GMT0" />
-	<zone name="posix/Africa/Gaborone" value="CAT-2" />
-	<zone name="posix/Africa/Harare" value="CAT-2" />
-	<zone name="posix/Africa/Johannesburg" value="SAST-2" />
-	<zone name="posix/Africa/Juba" value="EAT-3" />
-	<zone name="posix/Africa/Kampala" value="EAT-3" />
-	<zone name="posix/Africa/Khartoum" value="EAT-3" />
-	<zone name="posix/Africa/Kigali" value="CAT-2" />
-	<zone name="posix/Africa/Kinshasa" value="WAT-1" />
-	<zone name="posix/Africa/Lagos" value="WAT-1" />
-	<zone name="posix/Africa/Libreville" value="WAT-1" />
-	<zone name="posix/Africa/Lome" value="GMT0" />
-	<zone name="posix/Africa/Luanda" value="WAT-1" />
-	<zone name="posix/Africa/Lubumbashi" value="CAT-2" />
-	<zone name="posix/Africa/Lusaka" value="CAT-2" />
-	<zone name="posix/Africa/Malabo" value="WAT-1" />
-	<zone name="posix/Africa/Maputo" value="CAT-2" />
-	<zone name="posix/Africa/Maseru" value="SAST-2" />
-	<zone name="posix/Africa/Mbabane" value="SAST-2" />
-	<zone name="posix/Africa/Mogadishu" value="EAT-3" />
-	<zone name="posix/Africa/Monrovia" value="GMT0" />
-	<zone name="posix/Africa/Nairobi" value="EAT-3" />
-	<zone name="posix/Africa/Ndjamena" value="WAT-1" />
-	<zone name="posix/Africa/Niamey" value="WAT-1" />
-	<zone name="posix/Africa/Nouakchott" value="GMT0" />
-	<zone name="posix/Africa/Ouagadougou" value="GMT0" />
-	<zone name="posix/Africa/Porto-Novo" value="WAT-1" />
-	<zone name="posix/Africa/Sao_Tome" value="GMT0" />
-	<zone name="posix/Africa/Timbuktu" value="GMT0" />
-	<zone name="posix/Africa/Tripoli" value="EET-2" />
-	<zone name="posix/Africa/Tunis" value="CET-1" />
-	<zone name="posix/Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-	<zone name="posix/America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Anguilla" value="AST4" />
-	<zone name="posix/America/Antigua" value="AST4" />
-	<zone name="posix/America/Araguaina" value="BRT3" />
-	<zone name="posix/America/Argentina/Buenos_Aires" value="ART3" />
-	<zone name="posix/America/Argentina/Catamarca" value="ART3" />
-	<zone name="posix/America/Argentina/ComodRivadavia" value="ART3" />
-	<zone name="posix/America/Argentina/Cordoba" value="ART3" />
-	<zone name="posix/America/Argentina/Jujuy" value="ART3" />
-	<zone name="posix/America/Argentina/La_Rioja" value="ART3" />
-	<zone name="posix/America/Argentina/Mendoza" value="ART3" />
-	<zone name="posix/America/Argentina/Rio_Gallegos" value="ART3" />
-	<zone name="posix/America/Argentina/Salta" value="ART3" />
-	<zone name="posix/America/Argentina/San_Juan" value="ART3" />
-	<zone name="posix/America/Argentina/San_Luis" value="ART3" />
-	<zone name="posix/America/Argentina/Tucuman" value="ART3" />
-	<zone name="posix/America/Argentina/Ushuaia" value="ART3" />
-	<zone name="posix/America/Aruba" value="AST4" />
-	<zone name="posix/America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
-	<zone name="posix/America/Atikokan" value="EST5" />
-	<zone name="posix/America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Bahia" value="BRT3" />
-	<zone name="posix/America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Barbados" value="AST4" />
-	<zone name="posix/America/Belem" value="BRT3" />
-	<zone name="posix/America/Belize" value="CST6" />
-	<zone name="posix/America/Blanc-Sablon" value="AST4" />
-	<zone name="posix/America/Boa_Vista" value="AMT4" />
-	<zone name="posix/America/Bogota" value="COT5" />
-	<zone name="posix/America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Buenos_Aires" value="ART3" />
-	<zone name="posix/America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Caracas" value="VET4:30" />
-	<zone name="posix/America/Catamarca" value="ART3" />
-	<zone name="posix/America/Cayenne" value="GFT3" />
-	<zone name="posix/America/Cayman" value="EST5" />
-	<zone name="posix/America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Coral_Harbour" value="EST5" />
-	<zone name="posix/America/Cordoba" value="ART3" />
-	<zone name="posix/America/Costa_Rica" value="CST6" />
-	<zone name="posix/America/Creston" value="MST7" />
-	<zone name="posix/America/Cuiaba" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Curacao" value="AST4" />
-	<zone name="posix/America/Danmarkshavn" value="GMT0" />
-	<zone name="posix/America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Dawson_Creek" value="MST7" />
-	<zone name="posix/America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Dominica" value="AST4" />
-	<zone name="posix/America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Eirunepe" value="ACT5" />
-	<zone name="posix/America/El_Salvador" value="CST6" />
-	<zone name="posix/America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Fortaleza" value="BRT3" />
-	<zone name="posix/America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Godthab" value="WGST" />
-	<zone name="posix/America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Grenada" value="AST4" />
-	<zone name="posix/America/Guadeloupe" value="AST4" />
-	<zone name="posix/America/Guatemala" value="CST6" />
-	<zone name="posix/America/Guayaquil" value="ECT5" />
-	<zone name="posix/America/Guyana" value="GYT4" />
-	<zone name="posix/America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="posix/America/Hermosillo" value="MST7" />
-	<zone name="posix/America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Jamaica" value="EST5" />
-	<zone name="posix/America/Jujuy" value="ART3" />
-	<zone name="posix/America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Kralendijk" value="AST4" />
-	<zone name="posix/America/La_Paz" value="BOT4" />
-	<zone name="posix/America/Lima" value="PET5" />
-	<zone name="posix/America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Lower_Princes" value="AST4" />
-	<zone name="posix/America/Maceio" value="BRT3" />
-	<zone name="posix/America/Managua" value="CST6" />
-	<zone name="posix/America/Manaus" value="AMT4" />
-	<zone name="posix/America/Marigot" value="AST4" />
-	<zone name="posix/America/Martinique" value="AST4" />
-	<zone name="posix/America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Mendoza" value="ART3" />
-	<zone name="posix/America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Metlakatla" value="MeST8" />
-	<zone name="posix/America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="posix/America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Montserrat" value="AST4" />
-	<zone name="posix/America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Noronha" value="FNT2" />
-	<zone name="posix/America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Ojinaga" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Panama" value="EST5" />
-	<zone name="posix/America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Paramaribo" value="SRT3" />
-	<zone name="posix/America/Phoenix" value="MST7" />
-	<zone name="posix/America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Port_of_Spain" value="AST4" />
-	<zone name="posix/America/Porto_Acre" value="ACT5" />
-	<zone name="posix/America/Porto_Velho" value="AMT4" />
-	<zone name="posix/America/Puerto_Rico" value="AST4" />
-	<zone name="posix/America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Recife" value="BRT3" />
-	<zone name="posix/America/Regina" value="CST6" />
-	<zone name="posix/America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Rio_Branco" value="ACT5" />
-	<zone name="posix/America/Rosario" value="ART3" />
-	<zone name="posix/America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Santarem" value="BRT3" />
-	<zone name="posix/America/Santiago" value="CLST" />
-	<zone name="posix/America/Santo_Domingo" value="AST4" />
-	<zone name="posix/America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="posix/America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/St_Barthelemy" value="AST4" />
-	<zone name="posix/America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/St_Kitts" value="AST4" />
-	<zone name="posix/America/St_Lucia" value="AST4" />
-	<zone name="posix/America/St_Thomas" value="AST4" />
-	<zone name="posix/America/St_Vincent" value="AST4" />
-	<zone name="posix/America/Swift_Current" value="CST6" />
-	<zone name="posix/America/Tegucigalpa" value="CST6" />
-	<zone name="posix/America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Tortola" value="AST4" />
-	<zone name="posix/America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Virgin" value="AST4" />
-	<zone name="posix/America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Antarctica/Casey" value="WST-8" />
-	<zone name="posix/Antarctica/Davis" value="DAVT-7" />
-	<zone name="posix/Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="posix/Antarctica/Macquarie" value="MIST-11" />
-	<zone name="posix/Antarctica/Mawson" value="MAWT-5" />
-	<zone name="posix/Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Antarctica/Palmer" value="CLST" />
-	<zone name="posix/Antarctica/Rothera" value="ROTT3" />
-	<zone name="posix/Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Antarctica/Syowa" value="SYOT-3" />
-	<zone name="posix/Antarctica/Troll" value="UTC0CEST-2,M3.5.0/1,M10.5.0/3" />
-	<zone name="posix/Antarctica/Vostok" value="VOST-6" />
-	<zone name="posix/Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Asia/Aden" value="AST-3" />
-	<zone name="posix/Asia/Almaty" value="ALMT-6" />
-	<zone name="posix/Asia/Amman" value="EEST" />
-	<zone name="posix/Asia/Anadyr" value="ANAT-12" />
-	<zone name="posix/Asia/Aqtau" value="AQTT-5" />
-	<zone name="posix/Asia/Aqtobe" value="AQTT-5" />
-	<zone name="posix/Asia/Ashgabat" value="TMT-5" />
-	<zone name="posix/Asia/Ashkhabad" value="TMT-5" />
-	<zone name="posix/Asia/Baghdad" value="AST-3" />
-	<zone name="posix/Asia/Bahrain" value="AST-3" />
-	<zone name="posix/Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="posix/Asia/Bangkok" value="ICT-7" />
-	<zone name="posix/Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="posix/Asia/Bishkek" value="KGT-6" />
-	<zone name="posix/Asia/Brunei" value="BNT-8" />
-	<zone name="posix/Asia/Calcutta" value="IST-5:30" />
-	<zone name="posix/Asia/Choibalsan" value="CHOT-8" />
-	<zone name="posix/Asia/Chongqing" value="CST-8" />
-	<zone name="posix/Asia/Chungking" value="CST-8" />
-	<zone name="posix/Asia/Colombo" value="IST-5:30" />
-	<zone name="posix/Asia/Dacca" value="BDT-6" />
-	<zone name="posix/Asia/Damascus" value="EET-2EEST,M3.5.5/0,M10.5.5/0" />
-	<zone name="posix/Asia/Dhaka" value="BDT-6" />
-	<zone name="posix/Asia/Dili" value="TLT-9" />
-	<zone name="posix/Asia/Dubai" value="GST-4" />
-	<zone name="posix/Asia/Dushanbe" value="TJT-5" />
-	<zone name="posix/Asia/Gaza" value="EEST" />
-	<zone name="posix/Asia/Harbin" value="CST-8" />
-	<zone name="posix/Asia/Hebron" value="EEST" />
-	<zone name="posix/Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="posix/Asia/Hong_Kong" value="HKT-8" />
-	<zone name="posix/Asia/Hovd" value="HOVT-7" />
-	<zone name="posix/Asia/Irkutsk" value="IRKT-9" />
-	<zone name="posix/Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Asia/Jakarta" value="WIB-7" />
-	<zone name="posix/Asia/Jayapura" value="WIT-9" />
-	<zone name="posix/Asia/Jerusalem" value="IDDT" />
-	<zone name="posix/Asia/Kabul" value="AFT-4:30" />
-	<zone name="posix/Asia/Kamchatka" value="PETT-12" />
-	<zone name="posix/Asia/Karachi" value="PKT-5" />
-	<zone name="posix/Asia/Kashgar" value="CST-8" />
-	<zone name="posix/Asia/Kathmandu" value="NPT-5:45" />
-	<zone name="posix/Asia/Katmandu" value="NPT-5:45" />
-	<zone name="posix/Asia/Khandyga" value="YAKT-10" />
-	<zone name="posix/Asia/Kolkata" value="IST-5:30" />
-	<zone name="posix/Asia/Krasnoyarsk" value="KRAT-8" />
-	<zone name="posix/Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="posix/Asia/Kuching" value="MYT-8" />
-	<zone name="posix/Asia/Kuwait" value="AST-3" />
-	<zone name="posix/Asia/Macao" value="CST-8" />
-	<zone name="posix/Asia/Macau" value="CST-8" />
-	<zone name="posix/Asia/Magadan" value="MAGT-12" />
-	<zone name="posix/Asia/Makassar" value="WITA-8" />
-	<zone name="posix/Asia/Manila" value="PHT-8" />
-	<zone name="posix/Asia/Muscat" value="GST-4" />
-	<zone name="posix/Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Asia/Novokuznetsk" value="NOVT-7" />
-	<zone name="posix/Asia/Novosibirsk" value="NOVT-7" />
-	<zone name="posix/Asia/Omsk" value="OMST-7" />
-	<zone name="posix/Asia/Oral" value="ORAT-5" />
-	<zone name="posix/Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="posix/Asia/Pontianak" value="WIB-7" />
-	<zone name="posix/Asia/Pyongyang" value="KST-9" />
-	<zone name="posix/Asia/Qatar" value="AST-3" />
-	<zone name="posix/Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="posix/Asia/Rangoon" value="MMT-6:30" />
-	<zone name="posix/Asia/Riyadh" value="AST-3" />
-	<zone name="posix/Asia/Saigon" value="ICT-7" />
-	<zone name="posix/Asia/Sakhalin" value="SAKT-11" />
-	<zone name="posix/Asia/Samarkand" value="UZT-5" />
-	<zone name="posix/Asia/Seoul" value="KST-9" />
-	<zone name="posix/Asia/Shanghai" value="CST-8" />
-	<zone name="posix/Asia/Singapore" value="SGT-8" />
-	<zone name="posix/Asia/Taipei" value="CST-8" />
-	<zone name="posix/Asia/Tashkent" value="UZT-5" />
-	<zone name="posix/Asia/Tbilisi" value="GET-4" />
-	<zone name="posix/Asia/Tehran" value="IRDT" />
-	<zone name="posix/Asia/Tel_Aviv" value="IDDT" />
-	<zone name="posix/Asia/Thimbu" value="BTT-6" />
-	<zone name="posix/Asia/Thimphu" value="BTT-6" />
-	<zone name="posix/Asia/Tokyo" value="JST-9" />
-	<zone name="posix/Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="posix/Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="posix/Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="posix/Asia/Urumqi" value="CST-8" />
-	<zone name="posix/Asia/Ust-Nera" value="VLAT-11" />
-	<zone name="posix/Asia/Vientiane" value="ICT-7" />
-	<zone name="posix/Asia/Vladivostok" value="VLAT-11" />
-	<zone name="posix/Asia/Yakutsk" value="YAKT-10" />
-	<zone name="posix/Asia/Yekaterinburg" value="YEKT-6" />
-	<zone name="posix/Asia/Yerevan" value="AMT-4" />
-	<zone name="posix/Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="posix/Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="posix/Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Reykjavik" value="GMT0" />
-	<zone name="posix/Atlantic/South_Georgia" value="GST2" />
-	<zone name="posix/Atlantic/St_Helena" value="GMT0" />
-	<zone name="posix/Atlantic/Stanley" value="FKST3" />
-	<zone name="posix/Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Brisbane" value="EST-10" />
-	<zone name="posix/Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Darwin" value="CST-9:30" />
-	<zone name="posix/Australia/Eucla" value="CWST-8:45" />
-	<zone name="posix/Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="posix/Australia/Lindeman" value="EST-10" />
-	<zone name="posix/Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="posix/Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/North" value="CST-9:30" />
-	<zone name="posix/Australia/Perth" value="WST-8" />
-	<zone name="posix/Australia/Queensland" value="EST-10" />
-	<zone name="posix/Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/West" value="WST-8" />
-	<zone name="posix/Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Brazil/Acre" value="ACT5" />
-	<zone name="posix/Brazil/DeNoronha" value="FNT2" />
-	<zone name="posix/Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/Brazil/West" value="AMT4" />
-	<zone name="posix/CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/East-Saskatchewan" value="CST6" />
-	<zone name="posix/Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Saskatchewan" value="CST6" />
-	<zone name="posix/Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Chile/Continental" value="CLST" />
-	<zone name="posix/Chile/EasterIsland" value="EASST" />
-	<zone name="posix/Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="posix/EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/EST" value="EST5" />
-	<zone name="posix/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Egypt" value="EEST" />
-	<zone name="posix/Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Etc/GMT" value="GMT0" />
-	<zone name="posix/Etc/GMT+0" value="GMT0" />
-	<zone name="posix/Etc/GMT+1" value="<GMT+1>1" />
-	<zone name="posix/Etc/GMT+10" value="<GMT+10>10" />
-	<zone name="posix/Etc/GMT+11" value="<GMT+11>11" />
-	<zone name="posix/Etc/GMT+12" value="<GMT+12>12" />
-	<zone name="posix/Etc/GMT+2" value="<GMT+2>2" />
-	<zone name="posix/Etc/GMT+3" value="<GMT+3>3" />
-	<zone name="posix/Etc/GMT+4" value="<GMT+4>4" />
-	<zone name="posix/Etc/GMT+5" value="<GMT+5>5" />
-	<zone name="posix/Etc/GMT+6" value="<GMT+6>6" />
-	<zone name="posix/Etc/GMT+7" value="<GMT+7>7" />
-	<zone name="posix/Etc/GMT+8" value="<GMT+8>8" />
-	<zone name="posix/Etc/GMT+9" value="<GMT+9>9" />
-	<zone name="posix/Etc/GMT-0" value="GMT0" />
-	<zone name="posix/Etc/GMT-1" value="<GMT-1>-1" />
-	<zone name="posix/Etc/GMT-10" value="<GMT-10>-10" />
-	<zone name="posix/Etc/GMT-11" value="<GMT-11>-11" />
-	<zone name="posix/Etc/GMT-12" value="<GMT-12>-12" />
-	<zone name="posix/Etc/GMT-13" value="<GMT-13>-13" />
-	<zone name="posix/Etc/GMT-14" value="<GMT-14>-14" />
-	<zone name="posix/Etc/GMT-2" value="<GMT-2>-2" />
-	<zone name="posix/Etc/GMT-3" value="<GMT-3>-3" />
-	<zone name="posix/Etc/GMT-4" value="<GMT-4>-4" />
-	<zone name="posix/Etc/GMT-5" value="<GMT-5>-5" />
-	<zone name="posix/Etc/GMT-6" value="<GMT-6>-6" />
-	<zone name="posix/Etc/GMT-7" value="<GMT-7>-7" />
-	<zone name="posix/Etc/GMT-8" value="<GMT-8>-8" />
-	<zone name="posix/Etc/GMT-9" value="<GMT-9>-9" />
-	<zone name="posix/Etc/GMT0" value="GMT0" />
-	<zone name="posix/Etc/Greenwich" value="GMT0" />
-	<zone name="posix/Etc/UCT" value="UCT0" />
-	<zone name="posix/Etc/UTC" value="UTC0" />
-	<zone name="posix/Etc/Universal" value="UTC0" />
-	<zone name="posix/Etc/Zulu" value="UTC0" />
-	<zone name="posix/Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Kaliningrad" value="FET-3" />
-	<zone name="posix/Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Minsk" value="FET-3" />
-	<zone name="posix/Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Moscow" value="MSK-4" />
-	<zone name="posix/Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Samara" value="SAMT-4" />
-	<zone name="posix/Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Simferopol" value="MSK-4" />
-	<zone name="posix/Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Volgograd" value="VOLT-4" />
-	<zone name="posix/Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Factory" value="<Local time zone must be set--see zic manual page>0" />
-	<zone name="posix/GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/GMT" value="GMT0" />
-	<zone name="posix/GMT+0" value="GMT0" />
-	<zone name="posix/GMT-0" value="GMT0" />
-	<zone name="posix/GMT0" value="GMT0" />
-	<zone name="posix/Greenwich" value="GMT0" />
-	<zone name="posix/HST" value="HST10" />
-	<zone name="posix/Hongkong" value="HKT-8" />
-	<zone name="posix/Iceland" value="GMT0" />
-	<zone name="posix/Indian/Antananarivo" value="EAT-3" />
-	<zone name="posix/Indian/Chagos" value="IOT-6" />
-	<zone name="posix/Indian/Christmas" value="CXT-7" />
-	<zone name="posix/Indian/Cocos" value="CCT-6:30" />
-	<zone name="posix/Indian/Comoro" value="EAT-3" />
-	<zone name="posix/Indian/Kerguelen" value="TFT-5" />
-	<zone name="posix/Indian/Mahe" value="SCT-4" />
-	<zone name="posix/Indian/Maldives" value="MVT-5" />
-	<zone name="posix/Indian/Mauritius" value="MUT-4" />
-	<zone name="posix/Indian/Mayotte" value="EAT-3" />
-	<zone name="posix/Indian/Reunion" value="RET-4" />
-	<zone name="posix/Iran" value="IRDT" />
-	<zone name="posix/Israel" value="IDDT" />
-	<zone name="posix/Jamaica" value="EST5" />
-	<zone name="posix/Japan" value="JST-9" />
-	<zone name="posix/Kwajalein" value="MHT-12" />
-	<zone name="posix/Libya" value="EET-2" />
-	<zone name="posix/MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/MST" value="MST7" />
-	<zone name="posix/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="posix/Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/NZ-CHAT" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="posix/Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/PRC" value="CST-8" />
-	<zone name="posix/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Pacific/Apia" value="WST-13WSDT,M9.5.0/3,M4.1.0/4" />
-	<zone name="posix/Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="posix/Pacific/Chuuk" value="CHUT-10" />
-	<zone name="posix/Pacific/Easter" value="EASST" />
-	<zone name="posix/Pacific/Efate" value="VUT-11" />
-	<zone name="posix/Pacific/Enderbury" value="PHOT-13" />
-	<zone name="posix/Pacific/Fakaofo" value="TKT-13" />
-	<zone name="posix/Pacific/Fiji" value="FJST" />
-	<zone name="posix/Pacific/Funafuti" value="TVT-12" />
-	<zone name="posix/Pacific/Galapagos" value="GALT6" />
-	<zone name="posix/Pacific/Gambier" value="GAMT9" />
-	<zone name="posix/Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="posix/Pacific/Guam" value="ChST-10" />
-	<zone name="posix/Pacific/Honolulu" value="HST10" />
-	<zone name="posix/Pacific/Johnston" value="HST10" />
-	<zone name="posix/Pacific/Kiritimati" value="LINT-14" />
-	<zone name="posix/Pacific/Kosrae" value="KOST-11" />
-	<zone name="posix/Pacific/Kwajalein" value="MHT-12" />
-	<zone name="posix/Pacific/Majuro" value="MHT-12" />
-	<zone name="posix/Pacific/Marquesas" value="MART9:30" />
-	<zone name="posix/Pacific/Midway" value="SST11" />
-	<zone name="posix/Pacific/Nauru" value="NRT-12" />
-	<zone name="posix/Pacific/Niue" value="NUT11" />
-	<zone name="posix/Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="posix/Pacific/Noumea" value="NCT-11" />
-	<zone name="posix/Pacific/Pago_Pago" value="SST11" />
-	<zone name="posix/Pacific/Palau" value="PWT-9" />
-	<zone name="posix/Pacific/Pitcairn" value="PST8" />
-	<zone name="posix/Pacific/Pohnpei" value="PONT-11" />
-	<zone name="posix/Pacific/Ponape" value="PONT-11" />
-	<zone name="posix/Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="posix/Pacific/Rarotonga" value="CKT10" />
-	<zone name="posix/Pacific/Saipan" value="ChST-10" />
-	<zone name="posix/Pacific/Samoa" value="SST11" />
-	<zone name="posix/Pacific/Tahiti" value="TAHT10" />
-	<zone name="posix/Pacific/Tarawa" value="GILT-12" />
-	<zone name="posix/Pacific/Tongatapu" value="TOT-13" />
-	<zone name="posix/Pacific/Truk" value="CHUT-10" />
-	<zone name="posix/Pacific/Wake" value="WAKT-12" />
-	<zone name="posix/Pacific/Wallis" value="WFT-12" />
-	<zone name="posix/Pacific/Yap" value="CHUT-10" />
-	<zone name="posix/Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/ROC" value="CST-8" />
-	<zone name="posix/ROK" value="KST-9" />
-	<zone name="posix/Singapore" value="SGT-8" />
-	<zone name="posix/SystemV/AST4" value="AST4" />
-	<zone name="posix/SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/CST6" value="CST6" />
-	<zone name="posix/SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/EST5" value="EST5" />
-	<zone name="posix/SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/HST10" value="HST10" />
-	<zone name="posix/SystemV/MST7" value="MST7" />
-	<zone name="posix/SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/PST8" value="PST8" />
-	<zone name="posix/SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/YST9" value="GAMT9" />
-	<zone name="posix/SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/UCT" value="UCT0" />
-	<zone name="posix/US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Arizona" value="MST7" />
-	<zone name="posix/US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Hawaii" value="HST10" />
-	<zone name="posix/US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Pacific-New" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Samoa" value="SST11" />
-	<zone name="posix/UTC" value="UTC0" />
-	<zone name="posix/Universal" value="UTC0" />
-	<zone name="posix/W-SU" value="MSK-4" />
-	<zone name="posix/WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Zulu" value="UTC0" />
-
-	<zone name="posixrules" value="EST5EDT,M3.2.0,M11.1.0" />
-
-	<zone name="right/Africa/Abidjan" value="GMT0" />
-	<zone name="right/Africa/Accra" value="GMT0" />
-	<zone name="right/Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="right/Africa/Algiers" value="CET-1" />
-	<zone name="right/Africa/Asmara" value="EAT-3" />
-	<zone name="right/Africa/Asmera" value="EAT-3" />
-	<zone name="right/Africa/Bamako" value="GMT0" />
-	<zone name="right/Africa/Bangui" value="WAT-1" />
-	<zone name="right/Africa/Banjul" value="GMT0" />
-	<zone name="right/Africa/Bissau" value="GMT0" />
-	<zone name="right/Africa/Blantyre" value="CAT-2" />
-	<zone name="right/Africa/Brazzaville" value="WAT-1" />
-	<zone name="right/Africa/Bujumbura" value="CAT-2" />
-	<zone name="right/Africa/Cairo" value="EEST" />
-	<zone name="right/Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Africa/Conakry" value="GMT0" />
-	<zone name="right/Africa/Dakar" value="GMT0" />
-	<zone name="right/Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="right/Africa/Djibouti" value="EAT-3" />
-	<zone name="right/Africa/Douala" value="WAT-1" />
-	<zone name="right/Africa/El_Aaiun" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Africa/Freetown" value="GMT0" />
-	<zone name="right/Africa/Gaborone" value="CAT-2" />
-	<zone name="right/Africa/Harare" value="CAT-2" />
-	<zone name="right/Africa/Johannesburg" value="SAST-2" />
-	<zone name="right/Africa/Juba" value="EAT-3" />
-	<zone name="right/Africa/Kampala" value="EAT-3" />
-	<zone name="right/Africa/Khartoum" value="EAT-3" />
-	<zone name="right/Africa/Kigali" value="CAT-2" />
-	<zone name="right/Africa/Kinshasa" value="WAT-1" />
-	<zone name="right/Africa/Lagos" value="WAT-1" />
-	<zone name="right/Africa/Libreville" value="WAT-1" />
-	<zone name="right/Africa/Lome" value="GMT0" />
-	<zone name="right/Africa/Luanda" value="WAT-1" />
-	<zone name="right/Africa/Lubumbashi" value="CAT-2" />
-	<zone name="right/Africa/Lusaka" value="CAT-2" />
-	<zone name="right/Africa/Malabo" value="WAT-1" />
-	<zone name="right/Africa/Maputo" value="CAT-2" />
-	<zone name="right/Africa/Maseru" value="SAST-2" />
-	<zone name="right/Africa/Mbabane" value="SAST-2" />
-	<zone name="right/Africa/Mogadishu" value="EAT-3" />
-	<zone name="right/Africa/Monrovia" value="GMT0" />
-	<zone name="right/Africa/Nairobi" value="EAT-3" />
-	<zone name="right/Africa/Ndjamena" value="WAT-1" />
-	<zone name="right/Africa/Niamey" value="WAT-1" />
-	<zone name="right/Africa/Nouakchott" value="GMT0" />
-	<zone name="right/Africa/Ouagadougou" value="GMT0" />
-	<zone name="right/Africa/Porto-Novo" value="WAT-1" />
-	<zone name="right/Africa/Sao_Tome" value="GMT0" />
-	<zone name="right/Africa/Timbuktu" value="GMT0" />
-	<zone name="right/Africa/Tripoli" value="EET-2" />
-	<zone name="right/Africa/Tunis" value="CET-1" />
-	<zone name="right/Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-	<zone name="right/America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Anguilla" value="AST4" />
-	<zone name="right/America/Antigua" value="AST4" />
-	<zone name="right/America/Araguaina" value="BRT3" />
-	<zone name="right/America/Argentina/Buenos_Aires" value="ART3" />
-	<zone name="right/America/Argentina/Catamarca" value="ART3" />
-	<zone name="right/America/Argentina/ComodRivadavia" value="ART3" />
-	<zone name="right/America/Argentina/Cordoba" value="ART3" />
-	<zone name="right/America/Argentina/Jujuy" value="ART3" />
-	<zone name="right/America/Argentina/La_Rioja" value="ART3" />
-	<zone name="right/America/Argentina/Mendoza" value="ART3" />
-	<zone name="right/America/Argentina/Rio_Gallegos" value="ART3" />
-	<zone name="right/America/Argentina/Salta" value="ART3" />
-	<zone name="right/America/Argentina/San_Juan" value="ART3" />
-	<zone name="right/America/Argentina/San_Luis" value="ART3" />
-	<zone name="right/America/Argentina/Tucuman" value="ART3" />
-	<zone name="right/America/Argentina/Ushuaia" value="ART3" />
-	<zone name="right/America/Aruba" value="AST4" />
-	<zone name="right/America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
-	<zone name="right/America/Atikokan" value="EST5" />
-	<zone name="right/America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Bahia" value="BRT3" />
-	<zone name="right/America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Barbados" value="AST4" />
-	<zone name="right/America/Belem" value="BRT3" />
-	<zone name="right/America/Belize" value="CST6" />
-	<zone name="right/America/Blanc-Sablon" value="AST4" />
-	<zone name="right/America/Boa_Vista" value="AMT4" />
-	<zone name="right/America/Bogota" value="COT5" />
-	<zone name="right/America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Buenos_Aires" value="ART3" />
-	<zone name="right/America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Caracas" value="VET4:30" />
-	<zone name="right/America/Catamarca" value="ART3" />
-	<zone name="right/America/Cayenne" value="GFT3" />
-	<zone name="right/America/Cayman" value="EST5" />
-	<zone name="right/America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Coral_Harbour" value="EST5" />
-	<zone name="right/America/Cordoba" value="ART3" />
-	<zone name="right/America/Costa_Rica" value="CST6" />
-	<zone name="right/America/Creston" value="MST7" />
-	<zone name="right/America/Cuiaba" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Curacao" value="AST4" />
-	<zone name="right/America/Danmarkshavn" value="GMT0" />
-	<zone name="right/America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Dawson_Creek" value="MST7" />
-	<zone name="right/America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Dominica" value="AST4" />
-	<zone name="right/America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Eirunepe" value="ACT5" />
-	<zone name="right/America/El_Salvador" value="CST6" />
-	<zone name="right/America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Fortaleza" value="BRT3" />
-	<zone name="right/America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Godthab" value="WGST" />
-	<zone name="right/America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Grenada" value="AST4" />
-	<zone name="right/America/Guadeloupe" value="AST4" />
-	<zone name="right/America/Guatemala" value="CST6" />
-	<zone name="right/America/Guayaquil" value="ECT5" />
-	<zone name="right/America/Guyana" value="GYT4" />
-	<zone name="right/America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="right/America/Hermosillo" value="MST7" />
-	<zone name="right/America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Jamaica" value="EST5" />
-	<zone name="right/America/Jujuy" value="ART3" />
-	<zone name="right/America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Kralendijk" value="AST4" />
-	<zone name="right/America/La_Paz" value="BOT4" />
-	<zone name="right/America/Lima" value="PET5" />
-	<zone name="right/America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Lower_Princes" value="AST4" />
-	<zone name="right/America/Maceio" value="BRT3" />
-	<zone name="right/America/Managua" value="CST6" />
-	<zone name="right/America/Manaus" value="AMT4" />
-	<zone name="right/America/Marigot" value="AST4" />
-	<zone name="right/America/Martinique" value="AST4" />
-	<zone name="right/America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Mendoza" value="ART3" />
-	<zone name="right/America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Metlakatla" value="MeST8" />
-	<zone name="right/America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="right/America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Montserrat" value="AST4" />
-	<zone name="right/America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Noronha" value="FNT2" />
-	<zone name="right/America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Ojinaga" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Panama" value="EST5" />
-	<zone name="right/America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Paramaribo" value="SRT3" />
-	<zone name="right/America/Phoenix" value="MST7" />
-	<zone name="right/America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Port_of_Spain" value="AST4" />
-	<zone name="right/America/Porto_Acre" value="ACT5" />
-	<zone name="right/America/Porto_Velho" value="AMT4" />
-	<zone name="right/America/Puerto_Rico" value="AST4" />
-	<zone name="right/America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Recife" value="BRT3" />
-	<zone name="right/America/Regina" value="CST6" />
-	<zone name="right/America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Rio_Branco" value="ACT5" />
-	<zone name="right/America/Rosario" value="ART3" />
-	<zone name="right/America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Santarem" value="BRT3" />
-	<zone name="right/America/Santiago" value="CLST" />
-	<zone name="right/America/Santo_Domingo" value="AST4" />
-	<zone name="right/America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="right/America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/St_Barthelemy" value="AST4" />
-	<zone name="right/America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/St_Kitts" value="AST4" />
-	<zone name="right/America/St_Lucia" value="AST4" />
-	<zone name="right/America/St_Thomas" value="AST4" />
-	<zone name="right/America/St_Vincent" value="AST4" />
-	<zone name="right/America/Swift_Current" value="CST6" />
-	<zone name="right/America/Tegucigalpa" value="CST6" />
-	<zone name="right/America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Tortola" value="AST4" />
-	<zone name="right/America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Virgin" value="AST4" />
-	<zone name="right/America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Antarctica/Casey" value="WST-8" />
-	<zone name="right/Antarctica/Davis" value="DAVT-7" />
-	<zone name="right/Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="right/Antarctica/Macquarie" value="MIST-11" />
-	<zone name="right/Antarctica/Mawson" value="MAWT-5" />
-	<zone name="right/Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Antarctica/Palmer" value="CLST" />
-	<zone name="right/Antarctica/Rothera" value="ROTT3" />
-	<zone name="right/Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Antarctica/Syowa" value="SYOT-3" />
-	<zone name="right/Antarctica/Troll" value="UTC0CEST-2,M3.5.0/1,M10.5.0/3" />
-	<zone name="right/Antarctica/Vostok" value="VOST-6" />
-	<zone name="right/Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Asia/Aden" value="AST-3" />
-	<zone name="right/Asia/Almaty" value="ALMT-6" />
-	<zone name="right/Asia/Amman" value="EEST" />
-	<zone name="right/Asia/Anadyr" value="ANAT-12" />
-	<zone name="right/Asia/Aqtau" value="AQTT-5" />
-	<zone name="right/Asia/Aqtobe" value="AQTT-5" />
-	<zone name="right/Asia/Ashgabat" value="TMT-5" />
-	<zone name="right/Asia/Ashkhabad" value="TMT-5" />
-	<zone name="right/Asia/Baghdad" value="AST-3" />
-	<zone name="right/Asia/Bahrain" value="AST-3" />
-	<zone name="right/Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="right/Asia/Bangkok" value="ICT-7" />
-	<zone name="right/Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="right/Asia/Bishkek" value="KGT-6" />
-	<zone name="right/Asia/Brunei" value="BNT-8" />
-	<zone name="right/Asia/Calcutta" value="IST-5:30" />
-	<zone name="right/Asia/Choibalsan" value="CHOT-8" />
-	<zone name="right/Asia/Chongqing" value="CST-8" />
-	<zone name="right/Asia/Chungking" value="CST-8" />
-	<zone name="right/Asia/Colombo" value="IST-5:30" />
-	<zone name="right/Asia/Dacca" value="BDT-6" />
-	<zone name="right/Asia/Damascus" value="EET-2EEST,M3.5.5/0,M10.5.5/0" />
-	<zone name="right/Asia/Dhaka" value="BDT-6" />
-	<zone name="right/Asia/Dili" value="TLT-9" />
-	<zone name="right/Asia/Dubai" value="GST-4" />
-	<zone name="right/Asia/Dushanbe" value="TJT-5" />
-	<zone name="right/Asia/Gaza" value="EEST" />
-	<zone name="right/Asia/Harbin" value="CST-8" />
-	<zone name="right/Asia/Hebron" value="EEST" />
-	<zone name="right/Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="right/Asia/Hong_Kong" value="HKT-8" />
-	<zone name="right/Asia/Hovd" value="HOVT-7" />
-	<zone name="right/Asia/Irkutsk" value="IRKT-9" />
-	<zone name="right/Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Asia/Jakarta" value="WIB-7" />
-	<zone name="right/Asia/Jayapura" value="WIT-9" />
-	<zone name="right/Asia/Jerusalem" value="IDDT" />
-	<zone name="right/Asia/Kabul" value="AFT-4:30" />
-	<zone name="right/Asia/Kamchatka" value="PETT-12" />
-	<zone name="right/Asia/Karachi" value="PKT-5" />
-	<zone name="right/Asia/Kashgar" value="CST-8" />
-	<zone name="right/Asia/Kathmandu" value="NPT-5:45" />
-	<zone name="right/Asia/Katmandu" value="NPT-5:45" />
-	<zone name="right/Asia/Khandyga" value="YAKT-10" />
-	<zone name="right/Asia/Kolkata" value="IST-5:30" />
-	<zone name="right/Asia/Krasnoyarsk" value="KRAT-8" />
-	<zone name="right/Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="right/Asia/Kuching" value="MYT-8" />
-	<zone name="right/Asia/Kuwait" value="AST-3" />
-	<zone name="right/Asia/Macao" value="CST-8" />
-	<zone name="right/Asia/Macau" value="CST-8" />
-	<zone name="right/Asia/Magadan" value="MAGT-12" />
-	<zone name="right/Asia/Makassar" value="WITA-8" />
-	<zone name="right/Asia/Manila" value="PHT-8" />
-	<zone name="right/Asia/Muscat" value="GST-4" />
-	<zone name="right/Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Asia/Novokuznetsk" value="NOVT-7" />
-	<zone name="right/Asia/Novosibirsk" value="NOVT-7" />
-	<zone name="right/Asia/Omsk" value="OMST-7" />
-	<zone name="right/Asia/Oral" value="ORAT-5" />
-	<zone name="right/Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="right/Asia/Pontianak" value="WIB-7" />
-	<zone name="right/Asia/Pyongyang" value="KST-9" />
-	<zone name="right/Asia/Qatar" value="AST-3" />
-	<zone name="right/Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="right/Asia/Rangoon" value="MMT-6:30" />
-	<zone name="right/Asia/Riyadh" value="AST-3" />
-	<zone name="right/Asia/Saigon" value="ICT-7" />
-	<zone name="right/Asia/Sakhalin" value="SAKT-11" />
-	<zone name="right/Asia/Samarkand" value="UZT-5" />
-	<zone name="right/Asia/Seoul" value="KST-9" />
-	<zone name="right/Asia/Shanghai" value="CST-8" />
-	<zone name="right/Asia/Singapore" value="SGT-8" />
-	<zone name="right/Asia/Taipei" value="CST-8" />
-	<zone name="right/Asia/Tashkent" value="UZT-5" />
-	<zone name="right/Asia/Tbilisi" value="GET-4" />
-	<zone name="right/Asia/Tehran" value="IRDT" />
-	<zone name="right/Asia/Tel_Aviv" value="IDDT" />
-	<zone name="right/Asia/Thimbu" value="BTT-6" />
-	<zone name="right/Asia/Thimphu" value="BTT-6" />
-	<zone name="right/Asia/Tokyo" value="JST-9" />
-	<zone name="right/Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="right/Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="right/Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="right/Asia/Urumqi" value="CST-8" />
-	<zone name="right/Asia/Ust-Nera" value="VLAT-11" />
-	<zone name="right/Asia/Vientiane" value="ICT-7" />
-	<zone name="right/Asia/Vladivostok" value="VLAT-11" />
-	<zone name="right/Asia/Yakutsk" value="YAKT-10" />
-	<zone name="right/Asia/Yekaterinburg" value="YEKT-6" />
-	<zone name="right/Asia/Yerevan" value="AMT-4" />
-	<zone name="right/Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="right/Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="right/Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Reykjavik" value="GMT0" />
-	<zone name="right/Atlantic/South_Georgia" value="GST2" />
-	<zone name="right/Atlantic/St_Helena" value="GMT0" />
-	<zone name="right/Atlantic/Stanley" value="FKST3" />
-	<zone name="right/Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Brisbane" value="EST-10" />
-	<zone name="right/Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Darwin" value="CST-9:30" />
-	<zone name="right/Australia/Eucla" value="CWST-8:45" />
-	<zone name="right/Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="right/Australia/Lindeman" value="EST-10" />
-	<zone name="right/Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="right/Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/North" value="CST-9:30" />
-	<zone name="right/Australia/Perth" value="WST-8" />
-	<zone name="right/Australia/Queensland" value="EST-10" />
-	<zone name="right/Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/West" value="WST-8" />
-	<zone name="right/Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Brazil/Acre" value="ACT5" />
-	<zone name="right/Brazil/DeNoronha" value="FNT2" />
-	<zone name="right/Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/Brazil/West" value="AMT4" />
-	<zone name="right/CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/East-Saskatchewan" value="CST6" />
-	<zone name="right/Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Saskatchewan" value="CST6" />
-	<zone name="right/Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Chile/Continental" value="CLST" />
-	<zone name="right/Chile/EasterIsland" value="EASST" />
-	<zone name="right/Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="right/EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/EST" value="EST5" />
-	<zone name="right/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/Egypt" value="EEST" />
-	<zone name="right/Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Etc/GMT" value="GMT0" />
-	<zone name="right/Etc/GMT+0" value="GMT0" />
-	<zone name="right/Etc/GMT+1" value="<GMT+1>1" />
-	<zone name="right/Etc/GMT+10" value="<GMT+10>10" />
-	<zone name="right/Etc/GMT+11" value="<GMT+11>11" />
-	<zone name="right/Etc/GMT+12" value="<GMT+12>12" />
-	<zone name="right/Etc/GMT+2" value="<GMT+2>2" />
-	<zone name="right/Etc/GMT+3" value="<GMT+3>3" />
-	<zone name="right/Etc/GMT+4" value="<GMT+4>4" />
-	<zone name="right/Etc/GMT+5" value="<GMT+5>5" />
-	<zone name="right/Etc/GMT+6" value="<GMT+6>6" />
-	<zone name="right/Etc/GMT+7" value="<GMT+7>7" />
-	<zone name="right/Etc/GMT+8" value="<GMT+8>8" />
-	<zone name="right/Etc/GMT+9" value="<GMT+9>9" />
-	<zone name="right/Etc/GMT-0" value="GMT0" />
-	<zone name="right/Etc/GMT-1" value="<GMT-1>-1" />
-	<zone name="right/Etc/GMT-10" value="<GMT-10>-10" />
-	<zone name="right/Etc/GMT-11" value="<GMT-11>-11" />
-	<zone name="right/Etc/GMT-12" value="<GMT-12>-12" />
-	<zone name="right/Etc/GMT-13" value="<GMT-13>-13" />
-	<zone name="right/Etc/GMT-14" value="<GMT-14>-14" />
-	<zone name="right/Etc/GMT-2" value="<GMT-2>-2" />
-	<zone name="right/Etc/GMT-3" value="<GMT-3>-3" />
-	<zone name="right/Etc/GMT-4" value="<GMT-4>-4" />
-	<zone name="right/Etc/GMT-5" value="<GMT-5>-5" />
-	<zone name="right/Etc/GMT-6" value="<GMT-6>-6" />
-	<zone name="right/Etc/GMT-7" value="<GMT-7>-7" />
-	<zone name="right/Etc/GMT-8" value="<GMT-8>-8" />
-	<zone name="right/Etc/GMT-9" value="<GMT-9>-9" />
-	<zone name="right/Etc/GMT0" value="GMT0" />
-	<zone name="right/Etc/Greenwich" value="GMT0" />
-	<zone name="right/Etc/UCT" value="UCT0" />
-	<zone name="right/Etc/UTC" value="UTC0" />
-	<zone name="right/Etc/Universal" value="UTC0" />
-	<zone name="right/Etc/Zulu" value="UTC0" />
-	<zone name="right/Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Kaliningrad" value="FET-3" />
-	<zone name="right/Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Minsk" value="FET-3" />
-	<zone name="right/Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Moscow" value="MSK-4" />
-	<zone name="right/Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Samara" value="SAMT-4" />
-	<zone name="right/Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Simferopol" value="MSK-4" />
-	<zone name="right/Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Volgograd" value="VOLT-4" />
-	<zone name="right/Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Factory" value="<Local time zone must be set--see zic manual page>0" />
-	<zone name="right/GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/GMT" value="GMT0" />
-	<zone name="right/GMT+0" value="GMT0" />
-	<zone name="right/GMT-0" value="GMT0" />
-	<zone name="right/GMT0" value="GMT0" />
-	<zone name="right/Greenwich" value="GMT0" />
-	<zone name="right/HST" value="HST10" />
-	<zone name="right/Hongkong" value="HKT-8" />
-	<zone name="right/Iceland" value="GMT0" />
-	<zone name="right/Indian/Antananarivo" value="EAT-3" />
-	<zone name="right/Indian/Chagos" value="IOT-6" />
-	<zone name="right/Indian/Christmas" value="CXT-7" />
-	<zone name="right/Indian/Cocos" value="CCT-6:30" />
-	<zone name="right/Indian/Comoro" value="EAT-3" />
-	<zone name="right/Indian/Kerguelen" value="TFT-5" />
-	<zone name="right/Indian/Mahe" value="SCT-4" />
-	<zone name="right/Indian/Maldives" value="MVT-5" />
-	<zone name="right/Indian/Mauritius" value="MUT-4" />
-	<zone name="right/Indian/Mayotte" value="EAT-3" />
-	<zone name="right/Indian/Reunion" value="RET-4" />
-	<zone name="right/Iran" value="IRDT" />
-	<zone name="right/Israel" value="IDDT" />
-	<zone name="right/Jamaica" value="EST5" />
-	<zone name="right/Japan" value="JST-9" />
-	<zone name="right/Kwajalein" value="MHT-12" />
-	<zone name="right/Libya" value="EET-2" />
-	<zone name="right/MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/MST" value="MST7" />
-	<zone name="right/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="right/Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/NZ-CHAT" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="right/Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/PRC" value="CST-8" />
-	<zone name="right/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Pacific/Apia" value="WST-13WSDT,M9.5.0/3,M4.1.0/4" />
-	<zone name="right/Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="right/Pacific/Chuuk" value="CHUT-10" />
-	<zone name="right/Pacific/Easter" value="EASST" />
-	<zone name="right/Pacific/Efate" value="VUT-11" />
-	<zone name="right/Pacific/Enderbury" value="PHOT-13" />
-	<zone name="right/Pacific/Fakaofo" value="TKT-13" />
-	<zone name="right/Pacific/Fiji" value="FJST" />
-	<zone name="right/Pacific/Funafuti" value="TVT-12" />
-	<zone name="right/Pacific/Galapagos" value="GALT6" />
-	<zone name="right/Pacific/Gambier" value="GAMT9" />
-	<zone name="right/Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="right/Pacific/Guam" value="ChST-10" />
-	<zone name="right/Pacific/Honolulu" value="HST10" />
-	<zone name="right/Pacific/Johnston" value="HST10" />
-	<zone name="right/Pacific/Kiritimati" value="LINT-14" />
-	<zone name="right/Pacific/Kosrae" value="KOST-11" />
-	<zone name="right/Pacific/Kwajalein" value="MHT-12" />
-	<zone name="right/Pacific/Majuro" value="MHT-12" />
-	<zone name="right/Pacific/Marquesas" value="MART9:30" />
-	<zone name="right/Pacific/Midway" value="SST11" />
-	<zone name="right/Pacific/Nauru" value="NRT-12" />
-	<zone name="right/Pacific/Niue" value="NUT11" />
-	<zone name="right/Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="right/Pacific/Noumea" value="NCT-11" />
-	<zone name="right/Pacific/Pago_Pago" value="SST11" />
-	<zone name="right/Pacific/Palau" value="PWT-9" />
-	<zone name="right/Pacific/Pitcairn" value="PST8" />
-	<zone name="right/Pacific/Pohnpei" value="PONT-11" />
-	<zone name="right/Pacific/Ponape" value="PONT-11" />
-	<zone name="right/Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="right/Pacific/Rarotonga" value="CKT10" />
-	<zone name="right/Pacific/Saipan" value="ChST-10" />
-	<zone name="right/Pacific/Samoa" value="SST11" />
-	<zone name="right/Pacific/Tahiti" value="TAHT10" />
-	<zone name="right/Pacific/Tarawa" value="GILT-12" />
-	<zone name="right/Pacific/Tongatapu" value="TOT-13" />
-	<zone name="right/Pacific/Truk" value="CHUT-10" />
-	<zone name="right/Pacific/Wake" value="WAKT-12" />
-	<zone name="right/Pacific/Wallis" value="WFT-12" />
-	<zone name="right/Pacific/Yap" value="CHUT-10" />
-	<zone name="right/Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/ROC" value="CST-8" />
-	<zone name="right/ROK" value="KST-9" />
-	<zone name="right/Singapore" value="SGT-8" />
-	<zone name="right/SystemV/AST4" value="AST4" />
-	<zone name="right/SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/CST6" value="CST6" />
-	<zone name="right/SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/EST5" value="EST5" />
-	<zone name="right/SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/HST10" value="HST10" />
-	<zone name="right/SystemV/MST7" value="MST7" />
-	<zone name="right/SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/PST8" value="PST8" />
-	<zone name="right/SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/YST9" value="GAMT9" />
-	<zone name="right/SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/UCT" value="UCT0" />
-	<zone name="right/US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Arizona" value="MST7" />
-	<zone name="right/US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Hawaii" value="HST10" />
-	<zone name="right/US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Pacific-New" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Samoa" value="SST11" />
-	<zone name="right/UTC" value="UTC0" />
-	<zone name="right/Universal" value="UTC0" />
-	<zone name="right/W-SU" value="MSK-4" />
-	<zone name="right/WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Zulu" value="UTC0" />
+        <zone name="UTC" value="UTC0" />
+
+        <zone name="Universal" value="UTC0" />
+
+        <zone name="W-SU" value="MSK-3" />
+
+        <zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
+
+        <zone name="Zulu" value="UTC0" />
     </timezones>
 </configuration>
diff --git a/conf/rayo/autoload_configs/acl.conf.xml b/conf/rayo/autoload_configs/acl.conf.xml
deleted file mode 100644
index b62f1e71bd..0000000000
--- a/conf/rayo/autoload_configs/acl.conf.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<configuration name="acl.conf" description="Network Lists">
-  <network-lists>
-    <!--
-	 These ACL's are automatically created on startup.
-
-	 rfc1918.auto  - RFC1918 Space
-	 nat.auto      - RFC1918 Excluding your local lan.
-	 localnet.auto - ACL for your local lan.
-	 loopback.auto - ACL for your local lan.
-    -->
-
-    <list name="lan" default="allow">
-      <node type="deny" cidr="192.168.42.0/24"/>
-      <node type="allow" cidr="192.168.42.42/32"/>
-    </list>
-
-    <!--
-	This will traverse the directory adding all users
-	with the cidr= tag to this ACL, when this ACL matches
-	the users variables and params apply as if they
-	digest authenticated.
-    -->
-    <list name="domains" default="deny">
-      <!-- domain= is special it scans the domain from the directory to build the ACL -->
-      <node type="allow" domain="$${domain}"/>
-      <!-- use cidr= if you wish to allow ip ranges to this domains acl. -->
-      <!-- <node type="allow" cidr="192.168.0.0/24"/> -->
-    </list>
-
-    <list name="rayo-clients" default="deny">
-      <node type="allow" cidr="192.168.0.39/32"/>
-      <node type="allow" cidr="192.168.0.59/32"/>
-    </list>
-
-    <list name="rayo-servers" default="deny">
-      <node type="allow" cidr="192.168.0.39/32"/>
-    </list>
-
-  </network-lists>
-</configuration>
-
diff --git a/conf/rayo/autoload_configs/cdr_csv.conf.xml b/conf/rayo/autoload_configs/cdr_csv.conf.xml
deleted file mode 100644
index 8d796c68f0..0000000000
--- a/conf/rayo/autoload_configs/cdr_csv.conf.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<configuration name="cdr_csv.conf" description="CDR CSV Format">
-  <settings>
-    <!-- 'cdr-csv' will always be appended to log-base -->
-    <!--<param name="log-base" value="/var/log"/>-->
-    <param name="default-template" value="example"/>
-    <!-- This is like the info app but after the call is hung up -->
-    <!--<param name="debug" value="true"/>-->
-    <param name="rotate-on-hup" value="true"/>
-    <!-- may be a b or ab -->
-    <param name="legs" value="a"/>
-	<!-- Only log in Master.csv -->
-	<!-- <param name="master-file-only" value="true"/> -->
-  </settings>
-  <templates>
-    <template name="sql">INSERT INTO cdr VALUES ("${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}");</template>
-    <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}","${accountcode}","${read_codec}","${write_codec}"</template>
-    <template name="snom">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec}","${sip_user_agent}","${call_clientcode}","${sip_rtp_rxstat}","${sip_rtp_txstat}","${sofia_record_file}"</template>
-    <template name="linksys">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}","${accountcode}","${read_codec}","${write_codec}","${sip_user_agent}","${sip_p_rtp_stat}"</template>
-    <template name="asterisk">"${accountcode}","${caller_id_number}","${destination_number}","${context}","${caller_id}","${channel_name}","${bridge_channel}","${last_app}","${last_arg}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${amaflags}","${uuid}","${userfield}"</template>
-    <template name="opencdrrate">"${uuid}","${signal_bond}","${direction}","${ani}","${destination_number}","${answer_stamp}","${end_stamp}","${billsec}","${accountcode}","${userfield}","${network_addr}","${regex('${original_caller_id_name}'|^.)}","${sip_gateway_name}"</template>
-  </templates>
-</configuration>
-
diff --git a/conf/rayo/autoload_configs/conference.conf.xml b/conf/rayo/autoload_configs/conference.conf.xml
deleted file mode 100644
index 0641df764e..0000000000
--- a/conf/rayo/autoload_configs/conference.conf.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<!-- http://wiki.freeswitch.org/wiki/Mod_conference --> 
-<!-- None of these paths are real if you want any of these options you need to really set them up -->
-<configuration name="conference.conf" description="Audio Conference">
-  <!-- Advertise certain presence on startup . -->
-  <advertise>
-    <room name="3001@$${domain}" status="FreeSWITCH"/>
-  </advertise>
-
-  <!-- These are the default keys that map when you do not specify a caller control group -->	
-  <!-- Note: none and default are reserved names for group names.  Disabled if dist-dtmf member flag is set. -->	
-  <caller-controls>
-    <group name="default">
-      <control action="mute" digits="0"/>
-      <control action="deaf mute" digits="*"/>
-      <control action="energy up" digits="9"/>
-      <control action="energy equ" digits="8"/>
-      <control action="energy dn" digits="7"/>
-      <control action="vol talk up" digits="3"/>
-      <control action="vol talk zero" digits="2"/>
-      <control action="vol talk dn" digits="1"/>
-      <control action="vol listen up" digits="6"/>
-      <control action="vol listen zero" digits="5"/>
-      <control action="vol listen dn" digits="4"/>
-      <control action="hangup" digits="#"/>
-    </group>
-  </caller-controls>
-
-  <!-- Profiles are collections of settings you can reference by name. -->
-  <profiles>
-    <!--If no profile is specified it will default to "default"-->
-    <profile name="default">
-      <!-- Directory to drop CDR's 
-	   'auto' means $PREFIX/logs/conference_cdr/<confernece_uuid>.cdr.xml
-	   a non-absolute path means $PREFIX/logs/<value>/<confernece_uuid>.cdr.xml
-	   absolute path means <value>/<confernece_uuid>.cdr.xml
-      -->
-      <!-- <param name="cdr-log-dir" value="auto"/> -->
-      
-      <!-- Domain (for presence) -->
-      <param name="domain" value="$${domain}"/>
-      <!-- Sample Rate-->
-      <param name="rate" value="8000"/>
-      <!-- Number of milliseconds per frame -->
-      <param name="interval" value="20"/>
-      <!-- Energy level required for audio to be sent to the other users -->
-      <param name="energy-level" value="300"/>
-
-      <!--Can be | delim of waste|mute|deaf|dist-dtmf waste will always transmit data to each channel
-          even during silence.  dist-dtmf propagates dtmfs to all other members, but channel controls
-	  via dtmf will be disabled. -->
-      <!--<param name="member-flags" value="waste"/>-->
-
-      <!-- Name of the caller control group to use for this profile -->
-      <!-- <param name="caller-controls" value="some name"/> -->
-      <!-- Name of the caller control group to use for the moderator in this profile -->
-      <!-- <param name="moderator-controls" value="some name"/> -->
-      <!-- TTS Engine to use -->
-      <!--<param name="tts-engine" value="cepstral"/>-->
-      <!-- TTS Voice to use -->
-      <!--<param name="tts-voice" value="david"/>-->
-
-      <!-- If TTS is enabled all audio-file params beginning with -->
-      <!-- 'say:' will be considered text to say with TTS -->
-      <!-- Override the default path here, after which you use relative paths in the other sound params -->
-      <!-- Note: The default path is the conference's first caller's sound_prefix -->
-      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
-      <!-- File to play to acknowledge success -->
-      <!--<param name="ack-sound" value="beep.wav"/>-->
-      <!-- File to play to acknowledge failure -->
-      <!--<param name="nack-sound" value="beeperr.wav"/>-->
-      <!-- File to play to acknowledge muted -->
-      <param name="muted-sound" value="conference/conf-muted.wav"/>
-      <!-- File to play to acknowledge unmuted -->
-      <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
-      <!-- File to play if you are alone in the conference -->
-      <param name="alone-sound" value="conference/conf-alone.wav"/>
-      <!-- File to play endlessly (nobody will ever be able to talk) -->
-      <!--<param name="perpetual-sound" value="perpetual.wav"/>-->
-      <!-- File to play when you're alone (music on hold)-->
-      <param name="moh-sound" value="$${hold_music}"/>
-      <!-- File to play when you join the conference -->
-      <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
-      <!-- File to play when you leave the conference -->
-      <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
-      <!-- File to play when you ae ejected from the conference -->
-      <param name="kicked-sound" value="conference/conf-kicked.wav"/>
-      <!-- File to play when the conference is locked -->
-      <param name="locked-sound" value="conference/conf-locked.wav"/>
-      <!-- File to play when the conference is locked during the call-->
-      <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
-      <!-- File to play when the conference is unlocked during the call-->
-      <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-      <!-- File to play to prompt for a pin -->
-      <param name="pin-sound" value="conference/conf-pin.wav"/>
-      <!-- File to play to when the pin is invalid -->
-      <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
-      <!-- Conference pin -->
-      <!--<param name="pin" value="12345"/>-->
-      <!--<param name="moderator-pin" value="54321"/>-->
-      <!-- Max number of times the user can be prompted for PIN -->
-      <!--<param name="pin-retries" value="3"/>-->
-      <!-- Default Caller ID Name for outbound calls -->
-      <param name="caller-id-name" value="$${outbound_caller_name}"/>
-      <!-- Default Caller ID Number for outbound calls -->
-      <param name="caller-id-number" value="$${outbound_caller_id}"/>
-      <!-- Suppress start and stop talking events -->
-      <!-- <param name="suppress-events" value="start-talking,stop-talking"/> -->
-      <!-- enable comfort noise generation -->
-      <param name="comfort-noise" value="true"/>
-      <!-- Uncomment auto-record to toggle recording every conference call. -->
-      <!-- Another valid value is   shout://user:pass@server.com/live.mp3   -->
-      <!--
-      <param name="auto-record" value="$${recordings_dir}/${conference_name}_${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
-      -->
-
-      <!-- IVR digit machine timeouts -->
-      <!-- How much to wait between DTMF digits to match caller-controls -->
-      <!-- <param name="ivr-dtmf-timeout" value="500"/> -->
-      <!-- How much to wait for the first DTMF, 0 forever -->
-      <!-- <param name="ivr-input-timeout" value="0" /> -->
-      <!-- Delay before a conference is asked to be terminated -->
-      <!-- <param name="endconf-grace-time" value="120" /> -->
-      <!-- Can be | delim of wait-mod|audio-always|video-bridge|video-floor-only
-           wait_mod will wait until the moderator in,
-           audio-always will always mix audio from all members regardless they are talking or not -->
-      <!-- <param name="conference-flags" value="audio-always"/> -->
-    </profile>
-
-    <profile name="wideband">
-      <param name="domain" value="$${domain}"/>
-      <param name="rate" value="16000"/>
-      <param name="interval" value="20"/>
-      <param name="energy-level" value="300"/>
-      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
-      <param name="muted-sound" value="conference/conf-muted.wav"/>
-      <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
-      <param name="alone-sound" value="conference/conf-alone.wav"/>
-      <param name="moh-sound" value="$${hold_music}"/>
-      <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
-      <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
-      <param name="kicked-sound" value="conference/conf-kicked.wav"/>
-      <param name="locked-sound" value="conference/conf-locked.wav"/>
-      <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
-      <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-      <param name="pin-sound" value="conference/conf-pin.wav"/>
-      <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
-      <param name="caller-id-name" value="$${outbound_caller_name}"/>
-      <param name="caller-id-number" value="$${outbound_caller_id}"/>
-      <param name="comfort-noise" value="true"/>
-      <!--<param name="tts-engine" value="flite"/>-->
-      <!--<param name="tts-voice" value="kal16"/>-->
-    </profile>
-
-    <profile name="ultrawideband">
-      <param name="domain" value="$${domain}"/>
-      <param name="rate" value="32000"/>
-      <param name="interval" value="20"/>
-      <param name="energy-level" value="300"/>
-      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
-      <param name="muted-sound" value="conference/conf-muted.wav"/>
-      <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
-      <param name="alone-sound" value="conference/conf-alone.wav"/>
-      <param name="moh-sound" value="$${hold_music}"/>
-      <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
-      <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
-      <param name="kicked-sound" value="conference/conf-kicked.wav"/>
-      <param name="locked-sound" value="conference/conf-locked.wav"/>
-      <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
-      <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-      <param name="pin-sound" value="conference/conf-pin.wav"/>
-      <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
-      <param name="caller-id-name" value="$${outbound_caller_name}"/>
-      <param name="caller-id-number" value="$${outbound_caller_id}"/>
-      <param name="comfort-noise" value="true"/>
-      <!--<param name="tts-engine" value="flite"/>-->
-      <!--<param name="tts-voice" value="kal16"/>-->
-    </profile>
-
-    <profile name="cdquality">
-      <param name="domain" value="$${domain}"/>
-      <param name="rate" value="48000"/>
-      <param name="interval" value="10"/>
-      <param name="energy-level" value="300"/>
-      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
-      <param name="muted-sound" value="conference/conf-muted.wav"/>
-      <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
-      <param name="alone-sound" value="conference/conf-alone.wav"/>
-      <param name="moh-sound" value="$${hold_music}"/>
-      <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
-      <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
-      <param name="kicked-sound" value="conference/conf-kicked.wav"/>
-      <param name="locked-sound" value="conference/conf-locked.wav"/>
-      <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
-      <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-      <param name="pin-sound" value="conference/conf-pin.wav"/>
-      <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
-      <param name="caller-id-name" value="$${outbound_caller_name}"/>
-      <param name="caller-id-number" value="$${outbound_caller_id}"/>
-      <param name="comfort-noise" value="true"/>
-    </profile>
-
-    <profile name="sla">
-      <param name="domain" value="$${domain}"/>
-      <param name="rate" value="16000"/>
-      <param name="interval" value="20"/>
-      <param name="caller-controls" value="none"/>
-      <param name="energy-level" value="200"/>
-      <param name="moh-sound" value="silence"/>
-      <param name="comfort-noise" value="true"/>
-      <param name="min-required-recording-participants" value="1"/>
-    </profile>
-
-  </profiles>
-</configuration>
diff --git a/conf/rayo/autoload_configs/console.conf.xml b/conf/rayo/autoload_configs/console.conf.xml
deleted file mode 100644
index 44a7e6cb1d..0000000000
--- a/conf/rayo/autoload_configs/console.conf.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<configuration name="console.conf" description="Console Logger">
-  <!-- pick a file name, a function name or 'all' -->
-  <!-- map as many as you need for specific debugging -->
-  <mappings>
-    <!-- 
-      name can be a file name, function name or 'all' 
-      value is one or more of debug,info,notice,warning,err,crit,alert,all
-      See examples below
-
-
-      The following map is the default, which is all debug levels enabled:
-      <map name="all" value="debug,info,notice,warning,err,crit,alert"/>
-
-
-      Example: the following turns on debugging for error and critical levels only
-      <map name="all" value="err,crit"/>
-
-      NOTE: using map name="all" will override any other settings!  If you 
-            want a more specific set of console messages then you will need
-            to specify which files and/or functions you want to have debug
-            messages.  One option is to turn on just the more critical 
-            messages with map name="all", then specify the other types of 
-            console messages you want to see for various files and functions.
-
-      Example: turn on ERROR, CRIT, ALERT for all modules, then specify other
-               levels for various modules and functions
-
-        <map name="all" value="err,crit,alert"/>
-        <map name="switch_loadable_module_process" value="all"/>
-        <map name="mod_local_stream.c" value="warning,debug"/>
-        <map name="mod_sndfile.c" value="warning,info,debug"/>
-     -->
-    <map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
-    
-    <!--
-      You can use or modify this sample set of mappings.  It turns on higher
-      level messages for all modules and then specifies extra lower level
-      messages for Freetdm, Sofia, and switch core messages.
-      
-    <map name="all"                         value="warning,err,crit,alert"/>
-    <map name="zap_analog.c"                value="all"/>
-    <map name="zap_io.c"                    value="all"/>
-    <map name="zap_isdn.c"                  value="all"/>
-    <map name="zap_zt.c"                    value="all"/>
-    <map name="mod_freetdm"                 value="all"/>
-    <map name="sofia.c"                     value="notice"/>
-    <map name="switch_core_state_machine.c" value="all"/>      
-    
-    -->
-  </mappings>
-  <settings>
-    <!-- comment or set to false for no color logging -->
-    <param name="colorize" value="true"/>
-    <param name="loglevel" value="$${console_loglevel}"/>
-  </settings>
-</configuration>
diff --git a/conf/rayo/autoload_configs/event_socket.conf.xml b/conf/rayo/autoload_configs/event_socket.conf.xml
deleted file mode 100644
index 5ea2e09788..0000000000
--- a/conf/rayo/autoload_configs/event_socket.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<configuration name="event_socket.conf" description="Socket Client">
-  <settings>
-    <param name="nat-map" value="false"/>
-    <param name="listen-ip" value="127.0.0.1"/>
-    <param name="listen-port" value="8021"/>
-    <param name="password" value="ClueCon"/>
-    <!--<param name="apply-inbound-acl" value="lan"/>-->
-  </settings>
-</configuration>
diff --git a/conf/rayo/autoload_configs/http_cache.conf.xml b/conf/rayo/autoload_configs/http_cache.conf.xml
deleted file mode 100644
index 5d70ec6a3a..0000000000
--- a/conf/rayo/autoload_configs/http_cache.conf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<configuration name="http_cache.conf" description="HTTP GET cache">
-  <settings>
-    <!-- set to true if you want to enable http:// and https:// formats.  Do not use if mod_httapi is also loaded -->
-    <param name="enable-file-formats" value="true"/>
-    <param name="max-urls" value="10000"/>
-    <param name="location" value="$${base_dir}/http_cache"/>
-    <param name="default-max-age" value="86400"/>
-    <param name="prefetch-thread-count" value="8"/>
-    <param name="prefetch-queue-size" value="100"/>
-    <!-- absolute path to CA bundle file -->
-    <param name="ssl-cacert" value="$${base_dir}/conf/cacert.pem"/>
-    <!-- verify certificates -->
-    <param name="ssl-verifypeer" value="true"/>
-    <!-- verify host name matches certificate -->
-    <param name="ssl-verifyhost" value="true"/>
-    <!-- default is 300 seconds, override here -->
-    <!--param name="connect-timeout" value="300"/-->
-    <!-- default is 300 seconds, override here -->
-    <!--param name="download-timeout" value="300"/-->
-  </settings>
-</configuration>
diff --git a/conf/rayo/autoload_configs/local_stream.conf.xml b/conf/rayo/autoload_configs/local_stream.conf.xml
deleted file mode 100644
index 94a5665392..0000000000
--- a/conf/rayo/autoload_configs/local_stream.conf.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<configuration name="local_stream.conf" description="stream files from local dir">
-  <!-- fallback to default if requested moh class isn't found -->
-  <directory name="default" path="$${sounds_dir}/music/8000">
-    <param name="rate" value="8000"/>
-    <param name="shuffle" value="true"/>
-    <param name="channels" value="1"/>
-    <param name="interval" value="20"/>
-    <param name="timer-name" value="soft"/>
-    <!-- list of short files to break in with every so often -->
-    <!--<param name="chime-list" value="file1.wav,file2.wav"/>-->
-    <!-- frequency of break-in (seconds)-->
-    <!--<param name="chime-freq" value="30"/>-->
-    <!-- limit to how many seconds the file will play -->
-    <!--<param name="chime-max" value="500"/>-->
-  </directory>
-
-  <directory name="moh/8000" path="$${sounds_dir}/music/8000">
-    <param name="rate" value="8000"/>
-    <param name="shuffle" value="true"/>
-    <param name="channels" value="1"/>
-    <param name="interval" value="20"/>
-    <param name="timer-name" value="soft"/>
-  </directory>
-
-  <directory name="moh/16000" path="$${sounds_dir}/music/16000">
-    <param name="rate" value="16000"/>
-    <param name="shuffle" value="true"/>
-    <param name="channels" value="1"/>
-    <param name="interval" value="20"/>
-    <param name="timer-name" value="soft"/>
-  </directory>
-
-  <directory name="moh/32000" path="$${sounds_dir}/music/32000">
-    <param name="rate" value="32000"/>
-    <param name="shuffle" value="true"/>
-    <param name="channels" value="1"/>
-    <param name="interval" value="20"/>
-    <param name="timer-name" value="soft"/>
-  </directory>
-  <!--
-  <directory name="moh/48000" path="$${sounds_dir}/music/48000">
-    <param name="rate" value="48000"/>
-    <param name="shuffle" value="true"/>
-    <param name="channels" value="1"/>
-    <param name="interval" value="10"/>
-    <param name="timer-name" value="soft"/>
-  </directory>
-  -->
-</configuration>
diff --git a/conf/rayo/autoload_configs/logfile.conf.xml b/conf/rayo/autoload_configs/logfile.conf.xml
deleted file mode 100644
index 38a1d39a4c..0000000000
--- a/conf/rayo/autoload_configs/logfile.conf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<configuration name="logfile.conf" description="File Logging">
-  <settings>
-   <!-- true to auto rotate on HUP, false to open/close -->
-   <param name="rotate-on-hup" value="true"/>
-  </settings>
-  <profiles>
-    <profile name="default">
-      <settings>
-        <!-- File to log to -->
-	<!--<param name="logfile" value="/var/log/freeswitch.log"/>-->
-        <!-- At this length in bytes rotate the log file (0 for never) -->
-        <param name="rollover" value="10485760"/>
-		<!-- Maximum number of log files to keep before wrapping -->
-		<!-- If this parameter is enabled, the log filenames will not include a date stamp -->
-		<!-- <param name="maximum-rotate" value="32"/> -->
-        <!-- Uncomment to prefix all log lines by the session's uuid  -->
-        <param name="uuid" value="true" />
-      </settings>
-      <mappings>
-	<!-- 
-	     name can be a file name, function name or 'all' 
-	     value is one or more of debug,info,notice,warning,err,crit,alert,all
-	     Please see comments in console.conf.xml for more information
-	-->
-	<map name="all" value="debug,info,notice,warning,err,crit,alert"/>
-      </mappings>
-    </profile>
-  </profiles>
-</configuration>
diff --git a/conf/rayo/autoload_configs/modules.conf.xml b/conf/rayo/autoload_configs/modules.conf.xml
deleted file mode 100644
index ee44e06c57..0000000000
--- a/conf/rayo/autoload_configs/modules.conf.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<configuration name="modules.conf" description="Modules">
-  <modules>
-    <!-- Loggers -->
-    <load module="mod_console"/>
-    <load module="mod_logfile"/>
-
-    <!-- Event Handlers -->
-    <load module="mod_cdr_csv"/>
-    <load module="mod_event_socket"/>
-    <load module="mod_rayo"/>
-
-    <!-- Endpoints -->
-    <load module="mod_sofia"/>
-    <load module="mod_loopback"/>
-
-    <!-- Applications -->
-    <!--load module="mod_signalwire"-->
-    <load module="mod_commands"/>
-    <load module="mod_conference"/>
-    <load module="mod_dptools"/>
-    <load module="mod_expr"/>
-    <load module="mod_esf"/>
-    <load module="mod_fsv"/>
-    <load module="mod_http_cache"/>
-
-    <!-- Dialplan Interfaces -->
-    <load module="mod_dialplan_xml"/>
-
-    <!-- Codec Interfaces -->
-    <load module="mod_spandsp"/>
-    <load module="mod_opus"/>
-    <load module="mod_ilbc"/>
-    <load module="mod_h26x"/>
-
-    <!-- File Format Interfaces -->
-    <load module="mod_sndfile"/>
-    <load module="mod_native_file"/>
-    <load module="mod_shell_stream"/>
-    <!--For icecast/mp3 streams/files-->
-    <load module="mod_shout"/>
-    <!--For local streams (play all the files in a directory)-->
-    <load module="mod_local_stream"/>
-    <load module="mod_tone_stream"/>
-    <load module="mod_ssml"/>
-
-    <!-- ASR /TTS -->
-    <load module="mod_flite"/>
-    <load module="mod_pocketsphinx"/>
-    <!-- <load module="mod_tts_commandline"/> -->
-
-    <!-- Say -->
-    <!--load module="mod_say_de"/-->
-    <!--load module="mod_say_es"/-->
-    <!--load module="mod_say_fr"/-->
-    <!--load module="mod_say_hr"/-->
-    <!--load module="mod_say_it"/-->
-    <!--load module="mod_say_nl"/-->
-    <!--load module="mod_say_ru"/-->
-    <!--load module="mod_say_zh"/-->
-    <load module="mod_say_en"/>
-    <!--load module="mod_say_fa"/-->
-    <!--load module="mod_say_he"/-->
-    <!--load module="mod_say_hu"/-->
-    <!--load module="mod_say_ja"/-->
-    <!--load module="mod_say_pt"/-->
-    <!--load module="mod_say_th"/-->
-    <!--load module="mod_say_sv"/-->
-
-  </modules>
-</configuration>
diff --git a/conf/rayo/autoload_configs/pocketsphinx.conf.xml b/conf/rayo/autoload_configs/pocketsphinx.conf.xml
deleted file mode 100644
index 3bf7d5e575..0000000000
--- a/conf/rayo/autoload_configs/pocketsphinx.conf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration name="pocketsphinx.conf" description="PocketSphinx ASR Configuration">
-  <settings>
-    <param name="threshold" value="400"/>
-    <param name="silence-hits" value="25"/>
-    <param name="listen-hits" value="1"/>
-    <param name="auto-reload" value="true"/>
-    <!--<param name="language-weight" value="1"/>-->
-    <!--<param name="narrowband-model" value="communicator"/>-->
-    <!--<param name="wideband-model" value="wsj1"/>-->
-    <!--<param name="dictionary" value="default.dic"/>-->
-  </settings>
-</configuration>
diff --git a/conf/rayo/autoload_configs/post_load_modules.conf.xml b/conf/rayo/autoload_configs/post_load_modules.conf.xml
deleted file mode 100644
index 8f4e132fa4..0000000000
--- a/conf/rayo/autoload_configs/post_load_modules.conf.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration name="post_load_modules.conf" description="Modules">
-  <modules>
-  </modules>
-</configuration>
diff --git a/conf/rayo/autoload_configs/pre_load_modules.conf.xml b/conf/rayo/autoload_configs/pre_load_modules.conf.xml
deleted file mode 100644
index 620a6c1cd9..0000000000
--- a/conf/rayo/autoload_configs/pre_load_modules.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration name="pre_load_modules.conf" description="Modules">
-  <modules>
-    <!-- Databases -->
-    <!-- <load module="mod_mariadb"/> -->
-    <load module="mod_pgsql"/>
-  </modules>
-</configuration>
diff --git a/conf/rayo/autoload_configs/presence_map.conf.xml b/conf/rayo/autoload_configs/presence_map.conf.xml
deleted file mode 100644
index 8a9d1dde5a..0000000000
--- a/conf/rayo/autoload_configs/presence_map.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration name="presence_map.conf" description="PRESENCE MAP">
-  <domains>
-    <domain name="$${domain}">
-      <exten regex="3\d+" proto="conf"/>
-    </domain>
-  </domains>
-</configuration>
diff --git a/conf/rayo/autoload_configs/rayo.conf.xml b/conf/rayo/autoload_configs/rayo.conf.xml
deleted file mode 100644
index 9f525c597c..0000000000
--- a/conf/rayo/autoload_configs/rayo.conf.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<configuration name="rayo.conf" description="Rayo server config">
-
-	<!-- rayo params -->
-	<settings>
-		<!-- ends idle calls : unbridged calls that have not been controlled by client in some time -->
-		<param name="max-idle-sec" value="300"/>
-		<!-- conference profile to use for mixers- sla = shared line appearance / conference /w no audio -->
-		<param name="mixer-conf-profile" value="sla"/>
-		<!-- if true, to attribute in offer uses URI instead of name/number -->
-		<param name="offer-uri" value="true"/>
-		<!-- how offers are distributed to clients (all, first, random). -->
-		<param name="offer-algorithm" value="all"/>
-		<!-- If offer is not answered after timeout, next client is offered (based on algorithm picked).
-		     If no other clients are available, the call is rejected.  Set to 0 to disable -->
-		<param name="offer-timeout-ms" value="5000"/>
-		<!-- if true, channel variables are added to rayo client offer -->
-		<param name="add-variables-to-offer" value="false"/>
-                <!-- if true, channel variables are added to offer, ringing, answered, and end events sent to rayo clients -->
-		<param name="add-variables-to-events" value="false"/>
-	</settings>
-
-	<!-- record component params -->
-	<record>
-		<param name="record-file-prefix" value="$${recordings_dir}/"/>
-	</record>
-
-	<!-- input component params -->
-	<input>
-		<param name="default-recognizer" value="pocketsphinx"/>
-	</input>
-
-	<!-- send/receivefax component params -->
-	<fax>
-		<!-- where to store incoming faxes -->
-		<param name="receivefax-file-prefix" value="/tmp/"/>
-	</fax>
-
-	<!-- Call progress analysis configuration -->
-	<!-- Define CPA detectors.  These are sources for Rayo CPA signal events -->
-	<!-- Detectors must fire an event that can be translated by mod_rayo into a CPA signal event -->
-	<cpa>
-		<!-- map DTMF events to CPA -->
-		<detector name="core_dtmf_event">
-			<event class="DTMF" value-header="DTMF-Digit" duration-header="DTMF-Duration">
-				<signal-type value="dtmf"/>
-			</event>
-		</detector>
-
-		<!-- map mod_spandsp fax detector to the Rayo CPA events. Fires DETECTED_FAX_* event once and quits. -->
-		<detector name="mod_spandsp_fax_ced">
-			<start application="spandsp_start_fax_detect" data="event 'Event-Name=CUSTOM,Event-Subclass=DETECTED_FAX_CED' 500 ced"/>
-			<stop application="spandsp_stop_fax_detect" data=""/>
-			<event class="CUSTOM" subclass="DETECTED_FAX_CED">
-				<signal-type value="fax-ced"/>
-			</event>
-		</detector>
-
-		<detector name="mod_spandsp_fax_cng">
-			<start application="spandsp_start_fax_detect" data="event 'Event-Name=CUSTOM,Event-Subclass=DETECTED_FAX_CNG' 500"/>
-			<stop application="spandsp_stop_fax_detect" data=""/>
-			<event class="CUSTOM" subclass="DETECTED_FAX_CNG">
-				<signal-type value="fax-cng"/>
-			</event>
-		</detector>
-
-		<!-- map mod_spandsp call progress tone detector to Rayo CPA signal events.  Fires DETECTED_TONE events until stopped. -->
-		<detector name="mod_spandsp_tone">
-			<start application="spandsp_start_tone_detect" data="1"/>
-			<stop application="spandsp_stop_tone_detect" data=""/>
-			<!-- map tone events to Rayo CPA signal type -->
-			<event class="DETECTED_TONE" type-header="Detected-Tone">
-				<signal-type header-value="SIT" value="sit"/>
-				<signal-type header-value="BUSY_TONE" value="busy"/>
-				<signal-type header-value="REORDER_TONE" value="congestion"/>
-				<signal-type header-value="RING_TONE" value="ring"/>
-			</event>
-		</detector>
-
-		<!-- map mod_avmd detector to Rayo CPA beep event.  Fires avmd::beep event once. -->
-		<detector name="mod_avmd">
-			<start application="avmd" data=""/>
-			<stop application="avmd" data="stop"/>
-			<event class="CUSTOM" subclass="avmd::beep">
-				<signal-type value="beep"/>
-			</event>
-		</detector>
-
-		<!-- Alternative beep detector using mod_vmd.  Fires vmd::beep events until stopped. -->
-		<!--detector name="mod_vmd">
-			<start application="vmd" data=""/>
-			<stop application="vmd" data="stop"/>
-			<event class="CUSTOM" subclass="vmd::beep">
-				<signal-type value="beep"/>
-			</event>
-		</detector-->
-	</cpa>
-
-	<!-- XMPP server domain -->
-	<domain name="$${rayo_domain_name}" shared-secret="ClueCon">
-	<!-- use this instead if you want secure XMPP client to server connections.  Put .crt and .key file in freeswitch/certs -->
-	<!--domain name="$${rayo_domain_name}" shared-secret="ClueCon" cert="$${base_dir}/certs/$${rayo_domain_name}.crt" key="$${base_dir}/certs/$${rayo_domain_name}.key"-->
-
-		<!-- Listeners for new Rayo client connections -->
-		<!--listen type="c2s" port="5222" address="$${local_ip_v4}" acl="rayo-clients"/-->
-		<listen type="c2s" port="5222" address="$${rayo_ip}" acl=""/>
-
-		<!-- Listeners for new server connections -->
-		<!--listen type="s2s" port="5269" address="$${local_ip_v4}" acl="rayo-servers"/-->
-
-		<!-- servers to connect to -->
-		<!--connect port="5269" address="node.example.com" domain="example.com"/-->
-
-		<!-- Authorized users -->
-		<users>
-			<user name="usera" password="1"/>
-		</users>
-	</domain>
-
-	<!-- URI mapping to endpoint / gateway -->
-	<dial-gateways>
-		<dial-gateway uriprefix="default" dialprefix="sofia/gateway/outbound/" strip="0"/>
-		<dial-gateway uriprefix="sip:" dialprefix="sofia/external/" strip="0"/>
-		<dial-gateway uriprefix="tel:" dialprefix="sofia/gateway/outbound/" strip="4"/>
-		<!-- pass through user and sofia unaltered -->
-		<dial-gateway uriprefix="user/" dialprefix="" strip=""/>
-		<dial-gateway uriprefix="sofia/" dialprefix="" strip=""/>
-		<dial-gateway uriprefix="loopback/" dialprefix="" strip=""/>
-	</dial-gateways>
-
-	<!-- IQ request aliases.  Used mainly for testing purposes or for controlling a rayo call via the console -->
-	<aliases>
-		<alias name="detect" target="call" args="1"><![CDATA[<input xmlns="urn:xmpp:rayo:input:1" mode="cpa"><grammar url="urn:xmpp:rayo:cpa:$1:1"/></input>]]></alias>
-		<alias name="detect-once" target="call" args="1"><![CDATA[<input xmlns="urn:xmpp:rayo:input:1" mode="cpa"><grammar url="urn:xmpp:rayo:cpa:$1:1?terminate=true"/></input>]]></alias>
-		<alias name="detect-tones" target="call"><![CDATA[<input xmlns="urn:xmpp:rayo:input:1" mode="cpa"><grammar url="urn:xmpp:rayo:cpa:busy:1"/><grammar url="urn:xmpp:rayo:cpa:congestion:1"/><grammar url="urn:xmpp:rayo:cpa:sit:1"/></input>]]></alias>
-		<alias name="ping" target="external"><![CDATA[<iq type="get"><ping xmlns="urn:xmpp:ping"/></iq>]]></alias>
-		<alias name="dial" target="server" args="2"><![CDATA[<dial xmlns="urn:xmpp:rayo:1" from="$1" to="$2"/>]]></alias>
-		<alias name="answer" target="call"><![CDATA[<answer xmlns="urn:xmpp:rayo:1"/>]]></alias>
-		<alias name="hangup" target="call"><![CDATA[<hangup xmlns="urn:xmpp:rayo:1"/>]]></alias>
-		<alias name="join" target="call" args="1"><![CDATA[<join xmlns="urn:xmpp:rayo:1" call-uri="xmpp:$1"/>]]></alias>
-		<alias name="join_mixer_duplex" target="call" args="1"><![CDATA[<join xmlns="urn:xmpp:rayo:1" mixer-name="$1" direction="duplex"/>]]></alias>
-		<alias name="join_mixer_send" target="call" args="1"><![CDATA[<join xmlns="urn:xmpp:rayo:1" mixer-name="$1" direction="send"/>]]></alias>
-		<alias name="join_mixer_recv" target="call" args="1"><![CDATA[<join xmlns="urn:xmpp:rayo:1" mixer-name="$1" direction="recv"/>]]></alias>
-		<alias name="unjoin_mixer" target="call" args="1"><![CDATA[<unjoin xmlns="urn:xmpp:rayo:1" mixer-name="$1"/>]]></alias>
-		<alias name="unjoin" target="call"><![CDATA[<unjoin xmlns="urn:xmpp:rayo:1"/>]]></alias>
-		<alias name="unjoin_call" target="call" args="1"><![CDATA[<unjoin xmlns="urn:xmpp:rayo:1" call-uri="xmpp:$1"/>]]></alias>
-		<alias name="stop" target="component"><![CDATA[<stop xmlns="urn:xmpp:rayo:ext:1"/>]]></alias>
-		<alias name="output_bad" target="call"><![CDATA[<output xmlns="urn:xmpp:rayo:output:1" repeat-time="100"></output>]]></alias>
-		<alias name="pause" target="output"><![CDATA[<pause xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="resume" target="output"><![CDATA[<resume xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="speed-up" target="output"><![CDATA[<speed-up xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="speed-down" target="output"><![CDATA[<speed-down xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="volume-up" target="output"><![CDATA[<volume-up xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="volume-down" target="output"><![CDATA[<volume-down xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="receivefax" target="call"><![CDATA[<receivefax xmlns="urn:xmpp:rayo:fax:1"/>]]></alias>
-		<alias name="sendfax" target="call" args="1"><![CDATA[<sendfax xmlns="urn:xmpp:rayo:fax:1"><document xmlns="urn:xmpp:rayo:fax:1" url="$1"/></sendfax>]]></alias>
-		<alias name="record" target="call"><![CDATA[<record xmlns="urn:xmpp:rayo:record:1"/>]]></alias>
-		<alias name="record_pause" target="record"><![CDATA[<pause xmlns="urn:xmpp:rayo:record:1"/>]]></alias>
-		<alias name="record_resume" target="record"><![CDATA[<resume xmlns="urn:xmpp:rayo:record:1"/>]]></alias>
-		<alias name="prompt_barge" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="5">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_no_barge" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="false">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="5">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_long" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_multi_digit" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><item repeat="1-4"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></item></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_terminator" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000" terminator="#">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><item repeat="1-4"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></item></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_input_bad" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtf" initial-timeout="5000" inter-digit-timeout="3000" terminator="#">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><item repeat="1-4"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></item></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_output_bad" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-time="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000" terminator="#">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><item repeat="1-4"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></item></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="input" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-					<grammar content-type="application/srgs+xml">
-						<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></rule></grammar>]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>
-
-		<alias name="input_voice_yesno_pocketsphinx" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="voice" recognizer="pocketsphinx" max-silence="5000" initial-timeout="5000">
-					<grammar content-type="application/srgs+xml>
-					<![CDATA[
-						<grammar xmlns="http://www.w3.org/2001/06/grammar"
-							xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-							xsi:schemaLocation="http://www.w3.org/2001/06/grammar http://www.w3.org/TR/speech-grammar/grammar.xsd"
-							xml:lang="en-US" version="1.0">
-								<rule id="yesno"><one-of><item>yes</item><item>no</item></one-of></rule></grammar>
-					]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>
-
-		<alias name="input_voice_yesno_default" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="voice" max-silence="5000" initial-timeout="5000">
-					<grammar content-type="application/srgs+xml>
-					<![CDATA[
-						<grammar xmlns="http://www.w3.org/2001/06/grammar"
-							xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-							xsi:schemaLocation="http://www.w3.org/2001/06/grammar http://www.w3.org/TR/speech-grammar/grammar.xsd"
-							xml:lang="en-US" version="1.0">
-								<rule id="yesno"><one-of><item>yes</item><item>no</item></one-of></rule></grammar>
-					]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>
-
-	</aliases>
-
-</configuration>
diff --git a/conf/rayo/autoload_configs/shout.conf.xml b/conf/rayo/autoload_configs/shout.conf.xml
deleted file mode 100644
index c3d1334b68..0000000000
--- a/conf/rayo/autoload_configs/shout.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<configuration name="shout.conf" description="mod shout config">
-  <settings>
-    <!-- Don't change these unless you are insane -->
-    <!--<param name="decoder" value="i586"/>-->
-    <!--<param name="volume" value=".1"/>-->
-    <!-- mod_shout sets output amplitude scale to 8192 by default - preserve mpg123 default of 32768 -->
-    <param name="outscale" value="32768"/>
-  </settings>
-</configuration>
diff --git a/conf/rayo/autoload_configs/sofia.conf.xml b/conf/rayo/autoload_configs/sofia.conf.xml
deleted file mode 100644
index a5e8614322..0000000000
--- a/conf/rayo/autoload_configs/sofia.conf.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<configuration name="sofia.conf" description="sofia Endpoint">
-
-  <global_settings>
-    <param name="log-level" value="0"/>
-    <!-- <param name="auto-restart" value="false"/> -->
-    <param name="debug-presence" value="0"/>
-    <!-- <param name="capture-server" value="udp:homer.domain.com:5060"/> -->
-  </global_settings>
-
-  <!--
-      The rabbit hole goes deep.  This includes all the
-      profiles in the sip_profiles directory that is up
-      one level from this directory.
-  -->
-  <profiles>
-    <X-PRE-PROCESS cmd="include" data="../sip_profiles/*.xml"/>
-  </profiles>
-
-</configuration>
diff --git a/conf/rayo/autoload_configs/spandsp.conf.xml b/conf/rayo/autoload_configs/spandsp.conf.xml
deleted file mode 100644
index f9556d3c78..0000000000
--- a/conf/rayo/autoload_configs/spandsp.conf.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<configuration name="spandsp.conf" description="SpanDSP config">
-    <modem-settings>
-<!--
-    total-modems set to N will create that many soft-modems.  
-    If you use them with Hylafax you need the following for each one numbered 0..N:
-
-    1) A line like this in /etc/inittab:
-
-      f0:2345:respawn:/usr/lib/fax/faxgetty /dev/FS0
-
-    2) copy conf/config.FS0 to /var/spool/hylafax/etc (or wherver the appropriate dir is on your system)
-
-    Subsequent modem configs would increment the 0 to 1 and so on.
-
--->
-      <param name="total-modems" value="0"/>
-
-      <!-- Default context and dialplan to use on inbound calls from the modems -->
-      <param name="context" value="default"/>
-      <param name="dialplan" value="XML"/>
-
-      <!-- Extra tracing for debugging -->
-      <param name="verbose" value="false"/>
-    </modem-settings>
-
-    <fax-settings>
-	<param name="use-ecm"		value="true"/>
-	<param name="verbose"		value="false"/>
-	<param name="disable-v17"	value="false"/>
-	<param name="ident"		value="SpanDSP Fax Ident"/>
-	<param name="header"		value="SpanDSP Fax Header"/>
-
-	<param name="spool-dir"		value="/tmp"/>
-	<param name="file-prefix"	value="faxrx"/>
-    </fax-settings>
-
-    <descriptors>
-
-     <!-- These tones are defined in Annex to ITU Operational Bulletin No. 781 - 1.II.2003 -->
-     <!-- Various Tones Used in National Networks (According to ITU-T Recommendation E.180)(03/1998) -->
-
-     <!-- North America -->
-     <descriptor name="1">
-       <tone name="CED_TONE">
-         <element freq1="2100" freq2="0" min="700" max="0"/>
-       </tone>
-       <tone name="SIT">
-         <element freq1="950" freq2="0" min="256" max="400"/>
-         <element freq1="1400" freq2="0" min="256" max="400"/>
-         <element freq1="1800" freq2="0" min="256" max="400"/>
-       </tone>
-       <tone name="RING_TONE" description="North America ring">
-         <element freq1="440" freq2="480" min="1200" max="0"/>
-       </tone>
-       <tone name="REORDER_TONE">
-         <element freq1="480" freq2="620" min="224" max="316"/>
-         <element freq1="0" freq2="0" min="168" max="352"/>
-         <element freq1="480" freq2="620" min="224" max="316"/>
-       </tone>
-       <tone name="BUSY_TONE">
-         <element freq1="480" freq2="620" min="464" max="536"/>
-         <element freq1="0" freq2="0" min="464" max="572"/>
-         <element freq1="480" freq2="620" min="464" max="536"/>
-       </tone>
-     </descriptor>
-
-     <!-- United Kingdom -->
-     <descriptor name="44">
-       <tone name="CED_TONE">
-         <element freq1="2100" freq2="0" min="500" max="0"/>
-       </tone>
-       <tone name="SIT">
-         <element freq1="950" freq2="0" min="256" max="400"/>
-         <element freq1="1400" freq2="0" min="256" max="400"/>
-         <element freq1="1800" freq2="0" min="256" max="400"/>
-       </tone>
-       <tone name="REORDER_TONE">
-         <element freq1="400" freq2="0" min="368" max="416"/>
-         <element freq1="0" freq2="0" min="336" max="368"/>
-         <element freq1="400" freq2="0" min="256" max="288"/>
-         <element freq1="0" freq2="0" min="512" max="544"/>
-       </tone>
-       <tone name="BUSY_TONE">
-         <element freq1="400" freq2="0" min="352" max="384"/>
-         <element freq1="0" freq2="0" min="352" max="384"/>
-         <element freq1="400" freq2="0" min="352" max="384"/>
-         <element freq1="0" freq2="0" min="352" max="384"/>
-       </tone>
-     </descriptor>
-
-     <!-- Germany -->
-     <descriptor name="49">
-       <tone name="CED_TONE">
-         <element freq1="2100" freq2="0" min="500" max="0"/>
-       </tone>
-       <tone name="SIT">
-         <element freq1="900" freq2="0" min="256" max="400"/>
-         <element freq1="1400" freq2="0" min="256" max="400"/>
-         <element freq1="1800" freq2="0" min="256" max="400"/>
-       </tone>
-       <tone name="REORDER_TONE">
-         <element freq1="425" freq2="0" min="224" max="272"/>
-         <element freq1="0" freq2="0" min="224" max="272"/>
-       </tone>
-       <tone name="BUSY_TONE">
-         <element freq1="425" freq2="0" min="464" max="516"/>
-         <element freq1="0" freq2="0" min="464" max="516"/>
-       </tone>
-     </descriptor>
-   </descriptors>
-
-</configuration>
-
diff --git a/conf/rayo/autoload_configs/ssml.conf.xml b/conf/rayo/autoload_configs/ssml.conf.xml
deleted file mode 100644
index d4e27bf184..0000000000
--- a/conf/rayo/autoload_configs/ssml.conf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<configuration name="ssml.conf" description="SSML parser config">
-
-	<!-- voices in order of preference -->
-	<tts-voices>
-		<voice name="slt" language="en-US" gender="female" prefix="tts://flite|slt|"/>
-		<voice name="kal" language="en-US" gender="male" prefix="tts://flite|kal|"/>
-		<voice name="rms" language="en-US" gender="male" prefix="tts://flite|rms|"/>
-		<voice name="awb" language="en-US" gender="male" prefix="tts://flite|awb|"/>
-	</tts-voices>
-
-	<!-- maps ISO language to say module -->
-	<language-map>
-		<language iso="en-US" say-module="en" language="en"/>
-	</language-map>
-
-	<!-- say voices in order of preference -->
-	<say-voices>
-		<voice name="callie" language="en-US" gender="female" prefix="$${sound_prefix}/"/>
-	</say-voices>
-
-	<!-- map interpret-as to say macros -->
-	<macros>
-		<macro name="ordinal" type="number" method="counted"/>
-		<macro name="cardinal" type="number" method="pronounced"/>
-		<macro name="characters" type="name_spelled" method="pronounced"/>
-		<macro name="telephone" type="telephone_number" method="pronounced"/>
-	</macros>
-
-</configuration>
diff --git a/conf/rayo/autoload_configs/switch.conf.xml b/conf/rayo/autoload_configs/switch.conf.xml
deleted file mode 100644
index 02aa434f9b..0000000000
--- a/conf/rayo/autoload_configs/switch.conf.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<configuration name="switch.conf" description="Core Configuration">
-
-  <cli-keybindings>
-    <key name="1" value="help"/>
-    <key name="2" value="status"/>
-    <key name="3" value="show channels"/>
-    <key name="4" value="show calls"/>
-    <key name="5" value="sofia status"/>
-    <key name="6" value="reloadxml"/>
-    <key name="7" value="console loglevel 0"/>
-    <key name="8" value="console loglevel 7"/>
-    <key name="9" value="sofia status profile internal"/>
-    <key name="10" value="sofia profile internal siptrace on"/>
-    <key name="11" value="sofia profile internal siptrace off"/>
-    <key name="12" value="version"/>
-  </cli-keybindings> 
-  
-  <default-ptimes>
-    <!-- Set this to override the 20ms assumption of various codecs in the sdp with no ptime defined -->
-    <!-- <codec name="G729" ptime="40"/> -->
-  </default-ptimes>
-  
-  <settings>
-    <!-- Colorize the Console -->
-    <param name="colorize-console" value="true"/>
-
-    <!--Include full timestamps in dialplan logs -->
-    <param name="dialplan-timestamps" value="false"/>
-
-    <!-- Run the timer at 20ms by default and drop down as needed unless you set 1m-timer=true which was previous default -->
-    <!-- <param name="1ms-timer" value="true"/> -->
-
-    <!--
-	Set the Switch Name for HA environments.
-	When setting the switch name, it will override the system hostname for all DB and CURL requests
-	allowing cluster environments such as RHCS to have identical FreeSWITCH configurations but run
-	as different hostnames.
-    -->
-    <!-- <param name="switchname" value="freeswitch"/> -->
-
-    <!-- Maximum number of simultaneous DB handles open -->
-    <param name="max-db-handles" value="50"/>
-    <!-- Maximum number of seconds to wait for a new DB handle before failing -->
-    <param name="db-handle-timeout" value="10"/>
-
-    <!-- Minimum idle CPU before refusing calls -->
-    <!-- <param name="min-idle-cpu" value="25"/> -->
-
-    <!--
-	Max number of sessions to allow at any given time.
-	
-	NOTICE: If you're driving 28 T1's in a single box you should set this to 644*2 or 1288
-	this will ensure you're able to use the entire DS3 without a problem.  Otherwise you'll
-	be 144 channels short of always filling that DS3 up which can translate into waste.
-    -->
-    <param name="max-sessions" value="1000"/>
-    <!--Most channels to create per second -->
-    <param name="sessions-per-second" value="30"/>
-    <!-- Default Global Log Level - value is one of debug,info,notice,warning,err,crit,alert -->
-    <param name="loglevel" value="debug"/>
-
-    <!-- Set the core DEBUG level (0-10) -->
-    <!-- <param name="debug-level" value="10"/> -->
-
-    <!-- SQL Buffer length within rage of 32k to 10m -->
-    <!-- <param name="sql-buffer-len" value="1m"/> -->
-    <!-- Maximum SQL Buffer length must be greater than sql-buffer-len -->
-    <!-- <param name="max-sql-buffer-len" value="2m"/> -->
-
-    <!-- 
-	 The min-dtmf-duration specifies the minimum DTMF duration to use on 
-	 outgoing events. Events shorter than this will be increased in duration
-	 to match min_dtmf_duration. You cannot configure a dtmf duration on a 
-	 profile that is less than this setting. You may increase this value,
-	 but cannot set it lower than 400. This value cannot exceed 
-	 max-dtmf-duration. -->
-    <!-- <param name="min-dtmf-duration" value="400"/> -->
-
-    <!-- 
-	 The max-dtmf-duration caps the playout of a DTMF event at the specified
-	 duration. Events exceeding this duration will be truncated to this
-	 duration. You cannot configure a duration on a profile that exceeds
-	 this setting. This setting can be lowered, but cannot exceed 192000. 
-	 This setting cannot be set lower than min_dtmf_duration. -->
-    <!-- <param name="max-dtmf-duration" value="192000"/> -->
-
-    <!-- 
-	 The default_dtmf_duration specifies the DTMF duration to use on
-	 originated DTMF events or on events that are received without a
-	 duration specified. This value can be increased or lowered. This
-	 value is lower-bounded by min_dtmf_duration and upper-bounded by
-	 max-dtmf-duration\. -->
-    <!-- <param name="default-dtmf-duration" value="2000"/> -->
-
-    <!--
-	If you want to send out voicemail notifications via Windows you'll need to change the mailer-app
-	variable to the setting below:
-	
-	<param name="mailer-app" value="msmtp"/>
-	
-	Do not change mailer-app-args.
-	You will also need to download a sendmail clone for Windows (msmtp). This version works without issue:
-	http://msmtp.sourceforge.net/index.html. Download and copy the .exe to %winddir%\system32.
-	You'll need to create a small config file for smtp credentials (host name, authentication, tls, etc.) in
-	%USERPROFILE%\Application Data\ called "msmtprc.txt". Below is a sample copy of this file:
-	
-	###################################
-	# The SMTP server of the provider.
-	account provider
-	host smtp.myisp.com
-	from john@myisp.com
-	auth login
-	user johndoe
-	password mypassword
-	
-	# Set a default account
-	account default : provider
-	###################################
-	
-    -->    
-
-    <param name="mailer-app" value="sendmail"/>
-    <param name="mailer-app-args" value="-t"/>
-    <param name="dump-cores" value="yes"/>
-
-    <!-- Enable verbose channel events to include every detail about a channel on every event  -->
-    <!-- <param name="verbose-channel-events" value="no"/> -->
-
-    <!-- Enable clock nanosleep -->
-    <!-- <param name="enable-clock-nanosleep" value="true"/> -->
-
-    <!-- Enable monotonic timing -->
-    <!-- <param name="enable-monotonic-timing" value="true"/> -->
-
-    <!-- NEEDS DOCUMENTATION -->
-    <!-- <param name="enable-softtimer-timerfd" value="true"/> -->
-    <!-- <param name="enable-cond-yield" value="true"/> -->
-    <!-- <param name="enable-timer-matrix" value="true"/> -->
-    <!-- <param name="threaded-system-exec" value="true"/> -->
-    <!-- <param name="tipping-point" value="0"/> -->
-    <!-- <param name="timer-affinity" value="disabled"/> -->
-    <!-- NEEDS DOCUMENTATION -->
-
-    <!-- RTP port range -->
-    <!-- <param name="rtp-start-port" value="16384"/> -->
-    <!-- <param name="rtp-end-port" value="32768"/> -->
-
-    <!--
-	 Native PostgreSQL support was removed from the FreeSWITCH Core!
-	 =================================
-	 NOTICE: You MUST enable mod_pgsql        
-	 =================================
-	 According to https://www.postgresql.org/docs/9.6/libpq-connect.html#LIBPQ-CONNSTRING
-	 There are two accepted formats for connection strings supported by the libpq library: 
-	 * For plain keyword = value strings use pgsql://
-	   pgsql://hostaddr=127.0.0.1 dbname=freeswitch user=freeswitch password='' options='-c client_min_messages=NOTICE' application_name='freeswitch'
-	 * For RFC 3986 URIs use postgresql:// or postgres://
-	   postgresql://
-	   postgresql://localhost
-	   postgresql://localhost:5433
-	   postgresql://localhost/mydb
-	   postgresql://user@localhost
-	   postgresql://user:secret@localhost
-	   postgresql://other@localhost/otherdb?connect_timeout=10&application_name=myapp
-	   postgresql:///mydb?host=localhost&port=5433
-    -->
-    <!-- <param name="core-db-dsn" value="pgsql://hostaddr=127.0.0.1 dbname=freeswitch user=freeswitch password='' options='-c client_min_messages=NOTICE' application_name='freeswitch'" /> -->
-    <!-- <param name="core-db-dsn" value="postgresql://freeswitch:@127.0.0.1/freeswitch?options=-c%20client_min_messages%3DNOTICE&application_name=freeswitch" /> -->
-    <!-- <param name="core-db-dsn" value="mariadb://Server=localhost;Database=freeswitch;Uid=freeswitch;Pwd=pass;" /> -->
-    <!-- <param name="core-db-dsn" value="dsn:username:password" /> -->
-    <!-- 
-	 Allow to specify the sqlite db at a different location (In this example, move it to ramdrive for
-	 better performance on most linux distro (note, you loose the data if you reboot))
-    -->
-    <!-- <param name="core-db-name" value="/dev/shm/core.db" /> -->
-
-    <!-- The system will create all the db schemas automatically, set this to false to avoid this behaviour -->
-    <!-- <param name="auto-create-schemas" value="true"/> -->
-    <!-- <param name="auto-clear-sql" value="true"/> -->
-    <!-- <param name="enable-early-hangup" value="true"/> -->
-
-    <!-- <param name="core-dbtype" value="MSSQL"/> -->
-
-    <!-- Allow multiple registrations to the same account in the central registration table -->
-    <!-- <param name="multiple-registrations" value="true"/> -->
-
-  </settings>
-
-</configuration>
-
diff --git a/conf/rayo/autoload_configs/timezones.conf.xml b/conf/rayo/autoload_configs/timezones.conf.xml
deleted file mode 100644
index 14f87f8c67..0000000000
--- a/conf/rayo/autoload_configs/timezones.conf.xml
+++ /dev/null
@@ -1,551 +0,0 @@
-<configuration name="timezones.conf" description="Timezones">
-    <timezones>
-	<zone name="Africa/Abidjan" value="GMT0" />
-	<zone name="Africa/Accra" value="GMT0" />
-	<zone name="Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="Africa/Algiers" value="CET-1" />
-	<zone name="Africa/Asmara" value="EAT-3" />
-	<zone name="Africa/Asmera" value="EAT-3" />
-	<zone name="Africa/Bamako" value="GMT0" />
-	<zone name="Africa/Bangui" value="WAT-1" />
-	<zone name="Africa/Banjul" value="GMT0" />
-	<zone name="Africa/Bissau" value="GMT0" />
-	<zone name="Africa/Blantyre" value="CAT-2" />
-	<zone name="Africa/Brazzaville" value="WAT-1" />
-	<zone name="Africa/Bujumbura" value="CAT-2" />
-	<zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/1,M9.5.5/3" />
-	<zone name="Africa/Casablanca" value="WET0" />
-	<zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Conakry" value="GMT0" />
-	<zone name="Africa/Dakar" value="GMT0" />
-	<zone name="Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="Africa/Djibouti" value="EAT-3" />
-	<zone name="Africa/Douala" value="WAT-1" />
-	<zone name="Africa/El_Aaiun" value="WET0" />
-	<zone name="Africa/Freetown" value="GMT0" />
-	<zone name="Africa/Gaborone" value="CAT-2" />
-	<zone name="Africa/Harare" value="CAT-2" />
-	<zone name="Africa/Johannesburg" value="SAST-2" />
-	<zone name="Africa/Kampala" value="EAT-3" />
-	<zone name="Africa/Khartoum" value="EAT-3" />
-	<zone name="Africa/Kigali" value="CAT-2" />
-	<zone name="Africa/Kinshasa" value="WAT-1" />
-	<zone name="Africa/Lagos" value="WAT-1" />
-	<zone name="Africa/Libreville" value="WAT-1" />
-	<zone name="Africa/Lome" value="GMT0" />
-	<zone name="Africa/Luanda" value="WAT-1" />
-	<zone name="Africa/Lubumbashi" value="CAT-2" />
-	<zone name="Africa/Lusaka" value="CAT-2" />
-	<zone name="Africa/Malabo" value="WAT-1" />
-	<zone name="Africa/Maputo" value="CAT-2" />
-	<zone name="Africa/Maseru" value="SAST-2" />
-	<zone name="Africa/Mbabane" value="SAST-2" />
-	<zone name="Africa/Mogadishu" value="EAT-3" />
-	<zone name="Africa/Monrovia" value="GMT0" />
-	<zone name="Africa/Nairobi" value="EAT-3" />
-	<zone name="Africa/Ndjamena" value="WAT-1" />
-	<zone name="Africa/Niamey" value="WAT-1" />
-	<zone name="Africa/Nouakchott" value="GMT0" />
-	<zone name="Africa/Ouagadougou" value="GMT0" />
-	<zone name="Africa/Porto-Novo" value="WAT-1" />
-	<zone name="Africa/Sao_Tome" value="GMT0" />
-	<zone name="Africa/Timbuktu" value="GMT0" />
-	<zone name="Africa/Tripoli" value="EET-2" />
-	<zone name="Africa/Tunis" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-
-	<zone name="America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Anguilla" value="AST4" />
-	<zone name="America/Antigua" value="AST4" />
-	<zone name="America/Araguaina" value="BRT3" />
-	<zone name="America/Argentina/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/ComodRivadavia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/La_Rioja" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Rio_Gallegos" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Juan" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Luis" value="ART3" />
-	<zone name="America/Argentina/Tucuman" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Ushuaia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Aruba" value="AST4" />
-	<zone name="America/Asuncion" value="PYT4PYST,M10.3.0/0,M3.2.0/0" />
-	<zone name="America/Atikokan" value="EST5" />
-	<zone name="America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Bahia" value="BRT3" />
-	<zone name="America/Barbados" value="AST4" />
-	<zone name="America/Belem" value="BRT3" />
-	<zone name="America/Belize" value="CST6" />
-	<zone name="America/Blanc-Sablon" value="AST4" />
-	<zone name="America/Boa_Vista" value="AMT4" />
-	<zone name="America/Bogota" value="COT5" />
-	<zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Campo_Grande" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Caracas" value="VET4:30" />
-	<zone name="America/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cayenne" value="GFT3" />
-	<zone name="America/Cayman" value="EST5" />
-	<zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Coral_Harbour" value="EST5" />
-	<zone name="America/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Costa_Rica" value="CST6" />
-	<zone name="America/Cuiaba" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Curacao" value="AST4" />
-	<zone name="America/Danmarkshavn" value="GMT0" />
-	<zone name="America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dawson_Creek" value="MST7" />
-	<zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dominica" value="AST4" />
-	<zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Eirunepe" value="ACT5" />
-	<zone name="America/El_Salvador" value="CST6" />
-	<zone name="America/Ensenada" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Fortaleza" value="BRT3" />
-	<zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Godthab" value="WGST" />
-	<zone name="America/Goose_Bay" value="AST4ADT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Grenada" value="AST4" />
-	<zone name="America/Guadeloupe" value="AST4" />
-	<zone name="America/Guatemala" value="CST6" />
-	<zone name="America/Guayaquil" value="ECT5" />
-	<zone name="America/Guyana" value="GYT4" />
-	<zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Havana" value="CST5CDT,M3.3.0/0,M10.5.0/1" />
-	<zone name="America/Hermosillo" value="MST7" />
-	<zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Jamaica" value="EST5" />
-	<zone name="America/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/La_Paz" value="BOT4" />
-	<zone name="America/Lima" value="PET5" />
-	<zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Maceio" value="BRT3" />
-	<zone name="America/Managua" value="CST6" />
-	<zone name="America/Manaus" value="AMT4" />
-	<zone name="America/Marigot" value="AST4" />
-	<zone name="America/Martinique" value="AST4" />
-	<zone name="America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Montserrat" value="AST4" />
-	<zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Noronha" value="FNT2" />
-	<zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Panama" value="EST5" />
-	<zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Paramaribo" value="SRT3" />
-	<zone name="America/Phoenix" value="MST7" />
-	<zone name="America/Port-au-Prince" value="EST5" />
-	<zone name="America/Porto_Acre" value="ACT5" />
-	<zone name="America/Port_of_Spain" value="AST4" />
-	<zone name="America/Porto_Velho" value="AMT4" />
-	<zone name="America/Puerto_Rico" value="AST4" />
-	<zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Recife" value="BRT3" />
-	<zone name="America/Regina" value="CST6" />
-	<zone name="America/Resolute" value="EST5" />
-	<zone name="America/Rio_Branco" value="ACT5" />
-	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Santiago" value="CLST" />
-	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3" />
-	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Barthelemy" value="AST4" />
-	<zone name="America/St_Johns" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/St_Kitts" value="AST4" />
-	<zone name="America/St_Lucia" value="AST4" />
-	<zone name="America/St_Thomas" value="AST4" />
-	<zone name="America/St_Vincent" value="AST4" />
-	<zone name="America/Swift_Current" value="CST6" />
-	<zone name="America/Tegucigalpa" value="CST6" />
-	<zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tijuana" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tortola" value="AST4" />
-	<zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Virgin" value="AST4" />
-	<zone name="America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-
-	<zone name="Antarctica/Casey" value="WST-8" />
-	<zone name="Antarctica/Davis" value="DAVT-7" />
-	<zone name="Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="Antarctica/Mawson" value="MAWT-6" />
-	<zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Palmer" value="CLST" />
-	<zone name="Antarctica/Rothera" value="ROTT3" />
-	<zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Syowa" value="SYOT-3" />
-	<zone name="Antarctica/Vostok" value="VOST-6" />
-
-	<zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Asia/Aden" value="AST-3" />
-	<zone name="Asia/Almaty" value="ALMT-6" />
-	<zone name="Asia/Amman" value="EET-2EEST,M3.5.4/0,M10.5.5/1" />
-	<zone name="Asia/Anadyr" value="ANAT-12ANAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Aqtau" value="AQTT-5" />
-	<zone name="Asia/Aqtobe" value="AQTT-5" />
-	<zone name="Asia/Ashgabat" value="TMT-5" />
-	<zone name="Asia/Ashkhabad" value="TMT-5" />
-	<zone name="Asia/Baghdad" value="AST-3" />
-	<zone name="Asia/Bahrain" value="AST-3" />
-	<zone name="Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="Asia/Bangkok" value="ICT-7" />
-	<zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="Asia/Bishkek" value="KGT-6" />
-	<zone name="Asia/Brunei" value="BNT-8" />
-	<zone name="Asia/Calcutta" value="IST-5:30" />
-	<zone name="Asia/Choibalsan" value="CHOT-9" />
-	<zone name="Asia/Chongqing" value="CST-8" />
-	<zone name="Asia/Chungking" value="CST-8" />
-	<zone name="Asia/Colombo" value="IST-5:30" />
-	<zone name="Asia/Dacca" value="BDT-6" />
-	<zone name="Asia/Damascus" value="EET-2EEST,M4.1.5/0,J274/0" />
-	<zone name="Asia/Dhaka" value="BDT-6" />
-	<zone name="Asia/Dili" value="TLT-9" />
-	<zone name="Asia/Dubai" value="GST-4" />
-	<zone name="Asia/Dushanbe" value="TJT-5" />
-	<zone name="Asia/Gaza" value="EET-2EEST,J91/0,M9.2.4" />
-	<zone name="Asia/Harbin" value="CST-8" />
-	<zone name="Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="Asia/Hong_Kong" value="HKT-8" />
-	<zone name="Asia/Hovd" value="HOVT-7" />
-	<zone name="Asia/Irkutsk" value="IRKT-8IRKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Jakarta" value="WIT-7" />
-	<zone name="Asia/Jayapura" value="EIT-9" />
-	<zone name="Asia/Jerusalem" value="IDDT" />
-	<zone name="Asia/Kabul" value="AFT-4:30" />
-	<zone name="Asia/Kamchatka" value="PETT-12PETST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Karachi" value="PKT-5" />
-	<zone name="Asia/Kashgar" value="CST-8" />
-	<zone name="Asia/Katmandu" value="NPT-5:45" />
-	<zone name="Asia/Kolkata" value="IST-5:30" />
-	<zone name="Asia/Krasnoyarsk" value="KRAT-7KRAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="Asia/Kuching" value="MYT-8" />
-	<zone name="Asia/Kuwait" value="AST-3" />
-	<zone name="Asia/Macao" value="CST-8" />
-	<zone name="Asia/Macau" value="CST-8" />
-	<zone name="Asia/Magadan" value="MAGT-11MAGST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Makassar" value="CIT-8" />
-	<zone name="Asia/Manila" value="PHT-8" />
-	<zone name="Asia/Muscat" value="GST-4" />
-	<zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Novosibirsk" value="NOVT-6NOVST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Omsk" value="OMST-6OMSST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Oral" value="ORAT-5" />
-	<zone name="Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="Asia/Pontianak" value="WIT-7" />
-	<zone name="Asia/Pyongyang" value="KST-9" />
-	<zone name="Asia/Qatar" value="AST-3" />
-	<zone name="Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="Asia/Rangoon" value="MMT-6:30" />
-	<zone name="Asia/Riyadh" value="AST-3" />
-	<zone name="Asia/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh89" value="zzz-3:07:04" />
-	<zone name="Asia/Saigon" value="ICT-7" />
-	<zone name="Asia/Sakhalin" value="SAKT-10SAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Samarkand" value="UZT-5" />
-	<zone name="Asia/Seoul" value="KST-9" />
-	<zone name="Asia/Shanghai" value="CST-8" />
-	<zone name="Asia/Singapore" value="SGT-8" />
-	<zone name="Asia/Taipei" value="CST-8" />
-	<zone name="Asia/Tashkent" value="UZT-5" />
-	<zone name="Asia/Tbilisi" value="GET-4" />
-	<zone name="Asia/Tehran" value="IRDT" />
-	<zone name="Asia/Tel_Aviv" value="IDDT" />
-	<zone name="Asia/Thimbu" value="BTT-6" />
-	<zone name="Asia/Thimphu" value="BTT-6" />
-	<zone name="Asia/Tokyo" value="JST-9" />
-	<zone name="Asia/Ujung_Pandang" value="CIT-8" />
-	<zone name="Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="Asia/Urumqi" value="CST-8" />
-	<zone name="Asia/Vientiane" value="ICT-7" />
-	<zone name="Asia/Vladivostok" value="VLAT-10VLAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yakutsk" value="YAKT-9YAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yekaterinburg" value="YEKT-5YEKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yerevan" value="AMT-4AMST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Reykjavik" value="GMT0" />
-	<zone name="Atlantic/South_Georgia" value="GST2" />
-	<zone name="Atlantic/Stanley" value="FKT4FKST,M9.1.0,M4.3.0" />
-	<zone name="Atlantic/St_Helena" value="GMT0" />
-
-	<zone name="Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Brisbane" value="EST-10" />
-	<zone name="Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Darwin" value="CST-9:30" />
-	<zone name="Australia/Eucla" value="CWST-8:45" />
-	<zone name="Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Lindeman" value="EST-10" />
-	<zone name="Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/North" value="CST-9:30" />
-	<zone name="Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Perth" value="WST-8" />
-	<zone name="Australia/Queensland" value="EST-10" />
-	<zone name="Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/West" value="WST-8" />
-	<zone name="Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-
-	<zone name="Brazil/Acre" value="ACT5" />
-	<zone name="Brazil/DeNoronha" value="FNT2" />
-	<zone name="Brazil/East" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
-	<zone name="Brazil/West" value="AMT4" />
-
-	<zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/East-Saskatchewan" value="CST6" />
-	<zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Saskatchewan" value="CST6" />
-	<zone name="Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-
-	<zone name="Chile/Continental" value="CLST" />
-	<zone name="Chile/EasterIsland" value="EASST" />
-
-	<zone name="Etc/GMT" value="GMT0" />
-	<zone name="Etc/GMT0" value="GMT0" />
-	<zone name="Etc/GMT-0" value="GMT0" />
-	<zone name="Etc/GMT+0" value="GMT0" />
-	<zone name="Etc/GMT-1" value="GMT-1" />
-	<zone name="Etc/GMT+1" value="GMT+1" />
-	<zone name="Etc/GMT-10" value="GMT-10" />
-	<zone name="Etc/GMT+10" value="GMT+10" />
-	<zone name="Etc/GMT-11" value="GMT-11" />
-	<zone name="Etc/GMT+11" value="GMT+11" />
-	<zone name="Etc/GMT-12" value="GMT-12" />
-	<zone name="Etc/GMT+12" value="GMT+12" />
-	<zone name="Etc/GMT-13" value="GMT-13" />
-	<zone name="Etc/GMT-14" value="GMT-14" />
-	<zone name="Etc/GMT-2" value="GMT-2" />
-	<zone name="Etc/GMT+2" value="GMT+2" />
-	<zone name="Etc/GMT-3" value="GMT-3" />
-	<zone name="Etc/GMT+3" value="GMT+3" />
-	<zone name="Etc/GMT-4" value="GMT-4" />
-	<zone name="Etc/GMT+4" value="GMT+4" />
-	<zone name="Etc/GMT-5" value="GMT-5" />
-	<zone name="Etc/GMT+5" value="GMT+5" />
-	<zone name="Etc/GMT-6" value="GMT-6" />
-	<zone name="Etc/GMT+6" value="GMT+6" />
-	<zone name="Etc/GMT-7" value="GMT-7" />
-	<zone name="Etc/GMT+7" value="GMT+7" />
-	<zone name="Etc/GMT-8" value="GMT-8" />
-	<zone name="Etc/GMT+8" value="GMT+8" />
-	<zone name="Etc/GMT-9" value="GMT-9" />
-	<zone name="Etc/GMT+9" value="GMT+9" />
-	<zone name="Etc/Greenwich" value="GMT0" />
-	<zone name="Etc/UCT" value="UCT0" />
-	<zone name="Etc/Universal" value="UTC0" />
-	<zone name="Etc/UTC" value="UTC0" />
-	<zone name="Etc/Zulu" value="UTC0" />
-
-	<zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Kaliningrad" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Minsk" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Moscow" value="MSK-3MSD,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Samara" value="SAMT-4SAMST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Simferopol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Volgograd" value="VOLT-3VOLST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Indian/Antananarivo" value="EAT-3" />
-	<zone name="Indian/Chagos" value="IOT-6" />
-	<zone name="Indian/Christmas" value="CXT-7" />
-	<zone name="Indian/Cocos" value="CCT-6:30" />
-	<zone name="Indian/Comoro" value="EAT-3" />
-	<zone name="Indian/Kerguelen" value="TFT-5" />
-	<zone name="Indian/Mahe" value="SCT-4" />
-	<zone name="Indian/Maldives" value="MVT-5" />
-	<zone name="Indian/Mauritius" value="MUT-4" />
-	<zone name="Indian/Mayotte" value="EAT-3" />
-	<zone name="Indian/Reunion" value="RET-4" />
-
-	<zone name="Mexico/BajaNorte" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-
-	<zone name="Mideast/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh89" value="zzz-3:07:04" />
-
-	<zone name="Pacific/Apia" value="WST11" />
-	<zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="Pacific/Easter" value="EASST" />
-	<zone name="Pacific/Efate" value="VUT-11" />
-	<zone name="Pacific/Enderbury" value="PHOT-13" />
-	<zone name="Pacific/Fakaofo" value="TKT10" />
-	<zone name="Pacific/Fiji" value="FJT-12" />
-	<zone name="Pacific/Funafuti" value="TVT-12" />
-	<zone name="Pacific/Galapagos" value="GALT6" />
-	<zone name="Pacific/Gambier" value="GAMT9" />
-	<zone name="Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="Pacific/Guam" value="ChST-10" />
-	<zone name="Pacific/Honolulu" value="HST10" />
-	<zone name="Pacific/Johnston" value="HST10" />
-	<zone name="Pacific/Kiritimati" value="LINT-14" />
-	<zone name="Pacific/Kosrae" value="KOST-11" />
-	<zone name="Pacific/Kwajalein" value="MHT-12" />
-	<zone name="Pacific/Majuro" value="MHT-12" />
-	<zone name="Pacific/Marquesas" value="MART9:30" />
-	<zone name="Pacific/Midway" value="SST11" />
-	<zone name="Pacific/Nauru" value="NRT-12" />
-	<zone name="Pacific/Niue" value="NUT11" />
-	<zone name="Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="Pacific/Noumea" value="NCT-11" />
-	<zone name="Pacific/Pago_Pago" value="SST11" />
-	<zone name="Pacific/Palau" value="PWT-9" />
-	<zone name="Pacific/Pitcairn" value="PST8" />
-	<zone name="Pacific/Ponape" value="PONT-11" />
-	<zone name="Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="Pacific/Rarotonga" value="CKT10" />
-	<zone name="Pacific/Saipan" value="ChST-10" />
-	<zone name="Pacific/Samoa" value="SST11" />
-	<zone name="Pacific/Tahiti" value="TAHT10" />
-	<zone name="Pacific/Tarawa" value="GILT-12" />
-	<zone name="Pacific/Tongatapu" value="TOT-13" />
-	<zone name="Pacific/Truk" value="TRUT-10" />
-	<zone name="Pacific/Wake" value="WAKT-12" />
-	<zone name="Pacific/Wallis" value="WFT-12" />
-	<zone name="Pacific/Yap" value="TRUT-10" />
-
-	<zone name="SystemV/AST4" value="AST4" />
-	<zone name="SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/CST6" value="CST6" />
-	<zone name="SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/EST5" value="EST5" />
-	<zone name="SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/HST10" value="HST10" />
-	<zone name="SystemV/MST7" value="MST7" />
-	<zone name="SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/PST8" value="PST8" />
-	<zone name="SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/YST9" value="GAMT9" />
-	<zone name="SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
-
-	<zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="US/Arizona" value="MST7" />
-	<zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Hawaii" value="HST10" />
-	<zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Samoa" value="SST11" />
-    </timezones>
-</configuration>
diff --git a/conf/rayo/cacert.pem b/conf/rayo/cacert.pem
deleted file mode 100644
index 72e14177c9..0000000000
--- a/conf/rayo/cacert.pem
+++ /dev/null
@@ -1,3366 +0,0 @@
-##
-## ca-bundle.crt -- Bundle of CA Root Certificates
-##
-## Certificate data from Mozilla as of: Sun Feb 19 04:03:37 2012
-##
-## This is a bundle of X.509 certificates of public Certificate Authorities
-## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt).  This file can be found in the mozilla source tree:
-## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
-##
-## It contains the certificates in PEM format and therefore
-## can be directly used with curl / libcurl / php_curl, or with
-## an Apache+mod_ssl webserver for SSL client authentication.
-## Just configure this file as the SSLCACertificateFile.
-##
-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape security libraries.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1994-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.82 $ $Date: 2012/02/18 21:41:46 $
-
-GTE CyberTrust Global Root
-==========================
------BEGIN CERTIFICATE-----
-MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
-Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEG
-A1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEz
-MjM1OTAwWjB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQL
-Ex5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0
-IEdsb2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrHiM3dFw4u
-sJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTSr41tiGeA5u2ylc9yMcql
-HHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X404Wqk2kmhXBIgD8SFcd5tB8FLztimQID
-AQABMA0GCSqGSIb3DQEBBAUAA4GBAG3rGwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMW
-M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
-NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
------END CERTIFICATE-----
-
-Thawte Server CA
-================
------BEGIN CERTIFICATE-----
-MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
-dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UE
-AxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5j
-b20wHhcNOTYwODAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNV
-BAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29u
-c3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcG
-A1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
-ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl
-/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg7
-1CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGjEzAR
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG7oWDTSEwjsrZqG9J
-GubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6eQNuozDJ0uW8NxuOzRAvZim+aKZuZ
-GCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZqdq5snUb9kLy78fyGPmJvKP/iiMucEc=
------END CERTIFICATE-----
-
-Thawte Premium Server CA
-========================
------BEGIN CERTIFICATE-----
-MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
-dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UE
-AxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZl
-ckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYT
-AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
-VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
-aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZ
-cHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
-aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIh
-Udib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMRuHM/
-qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAm
-SCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUIhfzJATj/Tb7yFkJD57taRvvBxhEf
-8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JMpAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7t
-UCemDaYj+bvLpgcUQg==
------END CERTIFICATE-----
-
-Equifax Secure CA
-=================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
-ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
-B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
-fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
-8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
-CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
-spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
-zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
-BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
-70+sB3c4
------END CERTIFICATE-----
-
-Digital Signature Trust Co. Global CA 1
-=======================================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
-ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMTAeFw05ODEy
-MTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
-IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQCgbIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJE
-NySZj9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlVSn5JTe2i
-o74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
-BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
-dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
-IoAPMTk5ODEyMTAxODEwMjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQY
-MBaAFGp5fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i+DAM
-BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
-ACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lNQseSJqBcNJo4cvj9axY+IO6CizEq
-kzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4
-RbyhkwS7hp86W0N6w4pl
------END CERTIFICATE-----
-
-Digital Signature Trust Co. Global CA 3
-=======================================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
-ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMjAeFw05ODEy
-MDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
-IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQC/k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGOD
-VvsoLeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3oTQPMx7JS
-xhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
-BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
-dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
-IoAPMTk5ODEyMDkxOTE3MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQY
-MBaAFB6CTShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5WzAM
-BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
-AEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHRxdf0CiUPPXiBng+xZ8SQTGPdXqfi
-up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
-mPnHfxsb1gYgAlihw6ID
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
-f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
-hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA
-TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah
-WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf
-Tqj/ZA1k
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G2
-============================================================
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO
-FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71
-lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT
-1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD
-Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9
------END CERTIFICATE-----
-
-GlobalSign Root CA
-==================
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R2
-=======================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
-ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
-s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
-S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
-TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
-ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
-YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
-BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
-9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
-01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
-9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
-
-ValiCert Class 1 VA
-===================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIy
-MjM0OFoXDTE5MDYyNTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9YLqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIi
-GQj4/xEjm84H9b9pGib+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCm
-DuJWBQ8YTfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0LBwG
-lN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLWI8sogTLDAHkY7FkX
-icnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPwnXS3qT6gpf+2SQMT2iLM7XGCK5nP
-Orf1LXLI
------END CERTIFICATE-----
-
-ValiCert Class 2 VA
-===================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
-MTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVC
-CSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7Rf
-ZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZ
-SWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZoDJJKPTEjlbV
-UjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8
-W9ViH0Pd
------END CERTIFICATE-----
-
-RSA Root Certificate 1
-======================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
-MjIzM1oXDTE5MDYyNjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDjmFGWHOjVsQaBalfDcnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td
-3zZxFJmP3MKS8edgkpfs2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89H
-BFx1cQqYJJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliEZwgs
-3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJn0WuPIqpsHEzXcjF
-V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r
-on+jjBXu
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
-EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
-cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
-EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
-055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
-j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
-xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
-t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
-
-Verisign Class 4 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS
-tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM
-8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW
-Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX
-Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt
-mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
-fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd
-RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
-UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
------END CERTIFICATE-----
-
-Entrust.net Secure Server CA
-============================
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMCVVMxFDASBgNV
-BAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5uZXQvQ1BTIGluY29ycC4gYnkg
-cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRl
-ZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTAeFw05OTA1MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIG
-A1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBi
-eSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1p
-dGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQ
-aO2f55M28Qpku0f1BBc/I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5
-gXpa0zf3wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OCAdcw
-ggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHboIHYpIHVMIHSMQsw
-CQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5l
-dC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
-bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
-dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0MFqBDzIwMTkw
-NTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX8+1i0Bow
-HQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAaMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA
-BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyN
-Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9
-n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
-
-Entrust.net Premium 2048 Secure Server CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
-bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
-BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
-NzUwNTFaFw0xOTEyMjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
-d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
-MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
-ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
-Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
-hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
-nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
-VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo3QwcjARBglghkgBhvhC
-AQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGAvtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdER
-gL7YibkIozH5oSQJFrlwMB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0B
-AQUFAAOCAQEAWUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo
-oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQh7A6tcOdBTcS
-o8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18f3v/rxzP5tsHrV7bhZ3QKw0z
-2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfNB/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjX
-OP/swNlQ8C5LWK5Gb9Auw2DaclVyvUxFnmG6v4SBkgPR0ml8xQ==
------END CERTIFICATE-----
-
-Baltimore CyberTrust Root
-=========================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
-ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
-ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
-SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
-dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
-uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
-UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
-G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
-XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
-l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
-VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
-cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
-hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
-Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
-RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-Equifax Secure Global eBusiness CA
-==================================
------BEGIN CERTIFICATE-----
-MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp
-bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds
-b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV
-PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN
-qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn
-hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j
-BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs
-MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN
-I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY
-NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
------END CERTIFICATE-----
-
-Equifax Secure eBusiness CA 1
-=============================
------BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENB
-LTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQwMDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UE
-ChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNz
-IENBLTEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ
-1MRoRvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBuWqDZQu4a
-IZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKwEnv+j6YDAgMBAAGjZjBk
-MBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEp4MlIR21kW
-Nl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRKeDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQF
-AAOBgQB1W6ibAxHm6VZMzfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5
-lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+
-KpYrtWKmpj29f5JZzVoqgrI3eQ==
------END CERTIFICATE-----
-
-Equifax Secure eBusiness CA 2
-=============================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEXMBUGA1UE
-ChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0y
-MB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoT
-DkVxdWlmYXggU2VjdXJlMSYwJAYDVQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn
-2Z0GvxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/BPO3QSQ5
-BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0CAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUx
-JjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTkwNjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9e
-uSBIplBqy/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAAyGgq3oThr1
-jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia
-78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUm
-V+GRMOrN
------END CERTIFICATE-----
-
-AddTrust Low-Value Services Root
-================================
------BEGIN CERTIFICATE-----
-MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
-cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
-CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
-ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
-54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
-oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
-Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
-GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
-HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
-AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
-RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
-HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
-ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
-iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
-eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
-mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
-ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
------END CERTIFICATE-----
-
-AddTrust External Root
-======================
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
-VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
-NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
-cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
-Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
-+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
-Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
-aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
-2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
-7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
-VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
-VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
-j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
-e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
-G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
-
-AddTrust Public Services Root
-=============================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
-cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
-BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
-dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
-nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
-d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
-Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
-HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
-A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
-A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
-JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
-+YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
-GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
-Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
-EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
------END CERTIFICATE-----
-
-AddTrust Qualified Certificates Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
-cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
-CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
-IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
-64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
-KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
-L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
-wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
-MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
-BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
-azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
-GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
-dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
-RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
-iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
------END CERTIFICATE-----
-
-Entrust Root Certification Authority
-====================================
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
-A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
-MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
-MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
-Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
-dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
-A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
-Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
-j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
-rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
-MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
-hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
-Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
-v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
-W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
-tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-RSA Security 2048 v3
-====================
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
-ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
-MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
-BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
-Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
-WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
-KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
-+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
-MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
-FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
-v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
-0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
-VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
-nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
-pKnXwiJPZ9d37CAFYd4=
------END CERTIFICATE-----
-
-GeoTrust Global CA
-==================
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
-MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
-BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
-8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
-T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
-vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
-DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
-zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
-d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
-mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
-XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
-Mw==
------END CERTIFICATE-----
-
-GeoTrust Global CA 2
-====================
------BEGIN CERTIFICATE-----
-MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
-MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
-NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
-LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
-Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
-HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
-K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
-srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
-ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
-OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
-x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
-H4z1Ir+rzoPz4iIprn2DQKi6bA==
------END CERTIFICATE-----
-
-GeoTrust Universal CA
-=====================
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
-MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
-Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
-JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
-RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
-7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
-8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
-qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
-Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
-Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
-KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
-ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
-XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
-hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
-qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
-oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
-xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
-KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
-DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
-xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
-p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
-P/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
-
-GeoTrust Universal CA 2
-=======================
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
-MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
-SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
-DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
-j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
-JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
-QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
-WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
-20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
-ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
-SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
-8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
-+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
-BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
-4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
-mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
-A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
-Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
-pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
-FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
-gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
-X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
-
-America Online Root Certification Authority 1
-=============================================
------BEGIN CERTIFICATE-----
-MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkG
-A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
-T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lkhsmj76CG
-v2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym1BW32J/X3HGrfpq/m44z
-DyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsWOqMFf6Dch9Wc/HKpoH145LcxVR5lu9Rh
-sCFg7RAycsWSJR74kEoYeEfffjA3PlAb2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP
-8c9GsEsPPt2IYriMqQkoO3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0T
-AQH/BAUwAwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAUAK3Z
-o/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQB8itEf
-GDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkFZu90821fnZmv9ov761KyBZiibyrF
-VL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAbLjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft
-3OJvx8Fi8eNy1gTIdGcL+oiroQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43g
-Kd8hdIaC2y+CMMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
-sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
------END CERTIFICATE-----
-
-America Online Root Certification Authority 2
-=============================================
------BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkG
-A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
-T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC206B89en
-fHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFciKtZHgVdEglZTvYYUAQv8
-f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2JxhP7JsowtS013wMPgwr38oE18aO6lhO
-qKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JN
-RvCAOVIyD+OEsnpD8l7eXz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0
-gBe4lL8BPeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67Xnfn
-6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEqZ8A9W6Wa6897Gqid
-FEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZo2C7HK2JNDJiuEMhBnIMoVxtRsX6
-Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnj
-B453cMor9H124HhnAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3Op
-aaEg5+31IqEjFNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmnxPBUlgtk87FY
-T15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2LHo1YGwRgJfMqZJS5ivmae2p
-+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzcccobGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXg
-JXUjhx5c3LqdsKyzadsXg8n33gy8CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//Zoy
-zH1kUQ7rVyZ2OuMeIjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgO
-ZtMADjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2FAjgQ5ANh
-1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUXOm/9riW99XJZZLF0Kjhf
-GEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPbAZO1XB4Y3WRayhgoPmMEEf0cjQAPuDff
-Z4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQlZvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuP
-cX/9XhmgD0uRuMRUvAawRY8mkaKO/qk=
------END CERTIFICATE-----
-
-Visa eCommerce Root
-===================
------BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
-EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
-QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
-WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
-VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
-bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
-F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
-RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
-TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
-/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
-GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
-MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
-CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
-YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
-zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
-YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
-398znM/jra6O1I7mT1GvFpLgXPYHDw==
------END CERTIFICATE-----
-
-Certum Root CA
-==============
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
-ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
-Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
-by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
-wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
-kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
-89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
-Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
-NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
-GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
-GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
-0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
-qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
------END CERTIFICATE-----
-
-Comodo AAA Services root
-========================
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
-MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
-c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
-C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
-i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
-Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
-Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
-Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
-BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
-cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
-LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
-7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
-8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
-12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
-Comodo Secure Services root
-===========================
------BEGIN CERTIFICATE-----
-MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
-MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
-Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
-BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
-9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
-rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
-oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
-p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
-FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
-YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
-aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
-4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
-Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
-DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
-pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
-RR3B7Hzs/Sk=
------END CERTIFICATE-----
-
-Comodo Trusted Services root
-============================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
-MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
-bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
-IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
-3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
-/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
-juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
-ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
-DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
-ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
-cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
-uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
-pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
-BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
-R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
-9y5Xt5hwXsjEeLBi
------END CERTIFICATE-----
-
-QuoVadis Root CA
-================
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
------END CERTIFICATE-----
-
-QuoVadis Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
-ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
-XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
-lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
-lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
-lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
-66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
-wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
-D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
-BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
-J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
-DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
-a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
-Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
-UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
-VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
-+JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
-IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
-WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
-f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
-4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
-VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-QuoVadis Root CA 3
-==================
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
-OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
-DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
-KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
-DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
-BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
-p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
-nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
-MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
-Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
-uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
-BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
-YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
-VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
-ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
-AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
-qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
-hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
-POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
-Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
-8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
-bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
-g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
-vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
-qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-Security Communication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
-8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
-DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
-5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
-DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
-JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
-0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
-mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
-s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
-6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
-FL39vmwLAw==
------END CERTIFICATE-----
-
-Sonera Class 2 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA
-=============================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
-ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
-HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
-bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
-vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
-jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
-C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
-vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
-22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
-HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
-dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
-BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
-EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
-MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
-nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
-iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
------END CERTIFICATE-----
-
-TDC Internet Root CA
-====================
------BEGIN CERTIFICATE-----
-MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJESzEVMBMGA1UE
-ChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTAeFw0wMTA0MDUx
-NjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNVBAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJu
-ZXQxHTAbBgNVBAsTFFREQyBJbnRlcm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxLhAvJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20j
-xsNuZp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a0vnRrEvL
-znWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc14izbSysseLlJ28TQx5yc
-5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGNeGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6
-otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcDR0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZI
-AYb4QgEBBAQDAgAHMGUGA1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMM
-VERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxMEQ1JM
-MTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3WjALBgNVHQ8EBAMC
-AQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAwHQYDVR0OBBYEFGxkAcf9hW2syNqe
-UAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0G
-CSqGSIb3DQEBBQUAA4IBAQBOQ8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540m
-gwV5dOy0uaOXwTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
-2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm899qNLPg7kbWzb
-O0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0jUNAE4z9mQNUecYu6oah9jrU
-Cbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38aQNiuJkFBT1reBK9sG9l
------END CERTIFICATE-----
-
-TDC OCES Root CA
-================
------BEGIN CERTIFICATE-----
-MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJESzEMMAoGA1UE
-ChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEwODM5MzBaFw0zNzAyMTEwOTA5
-MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNUREMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuH
-nEz9pPPEXyG9VhDr2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0
-zY0s2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItUGBxIYXvV
-iGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKjdGqPqcNiKXEx5TukYBde
-dObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+rTpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO
-3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB
-5DCB4TCB3gYIKoFQgSkBAQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5k
-ay9yZXBvc2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRlciBm
-cmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLiBDZXJ0aWZp
-Y2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4x
-LjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1UdHwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEM
-MAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYm
-aHR0cDovL2NybC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy
-MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZJ2cdUBVLc647
-+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6
-NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACromJkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4
-A9G28kNBKWKnctj7fAXmMXAnVBhOinxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYsc
-A+UYyAFMP8uXBV2YcaaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9
-AOoBmbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQYqbsFbS1
-AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9BKNDLdr8C2LqL19iUw==
------END CERTIFICATE-----
-
-UTN DATACorp SGC Root CA
-========================
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ
-BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa
-MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w
-HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy
-dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys
-raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo
-wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA
-9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv
-33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud
-DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9
-BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD
-LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0
-I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx
-EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
-DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
------END CERTIFICATE-----
-
-UTN USERFirst Hardware Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
-BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
-OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
-eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
-ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
-wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
-tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
-i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
-Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
-gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
-lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
-UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
-BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
-XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
-lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
-iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
-nfhmqA==
------END CERTIFICATE-----
-
-Camerfirma Chambers of Commerce Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
-NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
-cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
-MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
-AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
-xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
-NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
-DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
-d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
-EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
-cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
-AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
-bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
-VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
-fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
-L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
-UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
-ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
-erfutGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
-
-Camerfirma Global Chambersign Root
-==================================
------BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
-NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
-YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
-MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
-ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
-1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
-by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
-6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
-8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
-BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
-aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
-Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
-aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
-ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
-PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
-gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
-PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
-IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
-t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
------END CERTIFICATE-----
-
-NetLock Notary (Class A) Root
-=============================
------BEGIN CERTIFICATE-----
-MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
-EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
-ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
-DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
-EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
-VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
-cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
-D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
-z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
-/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
-tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
-4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
-A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
-Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
-bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
-IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
-LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
-ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
-IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
-IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
-b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
-bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
-Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
-bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
-ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
-ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
-CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
-KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
-8CgHrTwXZoi1/baI
------END CERTIFICATE-----
-
-NetLock Business (Class B) Root
-===============================
------BEGIN CERTIFICATE-----
-MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikg
-VGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYD
-VQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRv
-bnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sg
-VXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2S
-o/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr
-1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
-HQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZ
-RUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRh
-dGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0
-ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRv
-c2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUg
-YXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
-c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBz
-Oi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNA
-bmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhl
-IHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2
-YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBj
-cHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM
-43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKR
-stE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI
------END CERTIFICATE-----
-
-NetLock Express (Class C) Root
-==============================
------BEGIN CERTIFICATE-----
-MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBD
-KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJ
-BgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9j
-ayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3Z
-W3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63
-euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQw
-DgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJN
-RklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xn
-YWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBB
-IGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1i
-aXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0
-ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
-ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBo
-dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9y
-emVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5k
-IHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQ
-UyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwg
-YXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2
-xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOW
-gyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A==
------END CERTIFICATE-----
-
-XRamp Global CA Root
-====================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
-dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
-HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
-U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
-IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
-foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
-zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
-AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
-xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
-oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
-AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
-/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
-nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
-8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-Go Daddy Class 2 CA
-===================
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
-VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
-A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
-RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
-ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
-2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
-qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
-YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
-vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
-BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
-atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
-MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
-PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
-I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
-Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
-vZ8=
------END CERTIFICATE-----
-
-Starfield Class 2 CA
-====================
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
-U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
-MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
-A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
-SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
-bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
-JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
-epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
-F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
-MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
-hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
-bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
-afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
-PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
-KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
-QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
-YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
-AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
-Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
-U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
-LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
-cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
-dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
-AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
-3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
-vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
-fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
-fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
-EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
-1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
-lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
-g14=
------END CERTIFICATE-----
-
-Taiwan GRCA
-===========
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
-EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
-DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
-dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
-w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
-BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
-1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
-htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
-J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
-Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
-B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
-O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
-lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
-HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
-09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
-Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
-Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
-D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
-DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
-Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
-7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
-CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
-+fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
------END CERTIFICATE-----
-
-Firmaprofesional Root CA
-========================
------BEGIN CERTIFICATE-----
-MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMxIjAgBgNVBAcT
-GUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1dG9yaWRhZCBkZSBDZXJ0aWZp
-Y2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FA
-ZmlybWFwcm9mZXNpb25hbC5jb20wHhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTEL
-MAkGA1UEBhMCRVMxIjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMT
-OUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2
-ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5uCp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5V
-j1H5WuretXDE7aTt/6MNbg9kUDGvASdYrv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJH
-lShbz++AbOCQl4oBPB3zhxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf
-3H5idPayBQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcLiam8
-NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcbAgMBAAGjgZ8wgZww
-KgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTASBgNVHRMBAf8ECDAG
-AQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQAD
-ggEBAEdz/o0nVPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
-u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36mhoEyIwOdyPdf
-wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm
-7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBpQWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YG
-VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA=
------END CERTIFICATE-----
-
-Wells Fargo Root CA
-===================
------BEGIN CERTIFICATE-----
-MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxFDASBgNV
-BAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
-MDAxMDExMTY0MTI4WhcNMjEwMTE0MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dl
-bGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEv
-MC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n135zHCLielTWi5MbqNQ1mX
-x3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHESxP9cMIlrCL1dQu3U+SlK93OvRw6esP3
-E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4OJgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5
-OEL8pahbSCOz6+MlsoCultQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4j
-sNtlAHCEAQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMBAAGj
-YTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcBCzAyMDAGCCsGAQUF
-BwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRwb2xpY3kwDQYJKoZIhvcNAQEFBQAD
-ggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrv
-m+0fazbuSCUlFLZWohDo7qd/0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0R
-OhPs7fpvcmR7nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
-x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ33ZwmVxwQ023
-tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
------END CERTIFICATE-----
-
-Swisscom Root CA 1
-==================
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG
-EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
-dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4
-MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
-aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM
-MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF
-NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe
-AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC
-b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn
-7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN
-cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp
-WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5
-haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY
-MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
-BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9
-MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn
-jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ
-MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H
-VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl
-vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl
-OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3
-1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq
-nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy
-x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW
-NY6E0F/6MBr1mmz0DlP5OlvRHA==
------END CERTIFICATE-----
-
-DigiCert Assured ID Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
-MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
-9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
-UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
-/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
-oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
-GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
-66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
-hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
-EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
-SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
-8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
-
-DigiCert Global Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
-MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
-TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
-BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
-4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
-7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
-o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
-8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
-BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
-EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
-tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
-UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
-
-DigiCert High Assurance EV Root CA
-==================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
-MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
-Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
-Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
-OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
-MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
-NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
-h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
-Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
-JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
-V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
-myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
-mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
------END CERTIFICATE-----
-
-Certplus Class 2 Primary CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
-BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
-OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
-dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
-5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
-Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
-YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
-e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
-CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
-YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
-L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
-P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
-TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
-7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
-//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
-
-DST Root CA X3
-==============
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
-ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
-DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
-cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
-rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
-UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
-xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
-utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
-dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
-GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
-RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
-fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
-DST ACES CA X6
-==============
------BEGIN CERTIFICATE-----
-MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
-MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
-MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
-CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
-DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
-pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
-GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
-MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
-Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
-dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
-CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
-5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
-Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
-nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
-vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
-oKfN5XozNmr6mis=
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 1
-==============================================
------BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
-MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
-acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
-MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
-U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
-TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
-aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
-yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
-Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
-8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
-W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
-sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
-q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
-B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
-nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 2
-==============================================
------BEGIN CERTIFICATE-----
-MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
-MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
-QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN
-MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr
-dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G
-A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
-acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe
-LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI
-x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g
-QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr
-5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB
-AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt
-Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
-Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+
-hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
-9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5
-UrbnBEI=
------END CERTIFICATE-----
-
-SwissSign Gold CA - G2
-======================
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
-EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
-MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
-c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
-t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
-jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
-vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
-ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
-AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
-jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
-peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
-7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
-GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
-OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
-5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
-44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
-Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
-Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
-mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
-vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
-KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
-NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
-viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-SwissSign Silver CA - G2
-========================
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
-DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
-aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
-N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
-+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
-6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
-MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
-qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
-FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
-ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
-celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
-CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
-tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
-4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
-kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
-3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
-/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
-DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
-e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
-WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
-DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
-DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority
-========================================
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
-CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
-b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
-nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
-RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
-tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
-hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
-Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
-NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
-Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
-1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
-
-thawte Primary Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
-MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
-SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
-KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
-FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
-oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
-1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
-q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
-aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
-afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
-AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
-uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
-jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
-z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G5
-============================================================
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
-biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
-dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
-j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
-Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
-Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
-fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
-Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
-SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
-X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
-KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
-Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
-ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
-
-SecureTrust CA
-==============
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
-dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
-BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
-OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
-DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
-GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
-01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
-ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
-aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
-SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
-mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
-nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
-
-Secure Global CA
-================
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
-bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
-MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
-Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
-YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
-bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
-8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
-HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
-0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
-oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
-OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
-CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
-3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
-
-COMODO Certification Authority
-==============================
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
-MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
-T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
-+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
-xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
-4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
-1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
-rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
-AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
-OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
-IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
-+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
------END CERTIFICATE-----
-
-Network Solutions Certificate Authority
-=======================================
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
-EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
-IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
-MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
-jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
-aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
-crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
-/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
-AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
-bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
-A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
-4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
-GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
-ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
-
-WellsSecure Public Root Certificate Authority
-=============================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
-F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
-NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
-MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
-bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
-VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
-iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
-i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
-bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
-K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
-AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
-cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
-lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
-i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
-GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
-K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
-bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
-qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
-E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
-tylv2G0xffX8oRAHh84vWdw+WNs=
------END CERTIFICATE-----
-
-COMODO ECC Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
-GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
-4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
-wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
-FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
-U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-IGC/A
-=====
------BEGIN CERTIFICATE-----
-MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
-VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
-Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
-MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
-EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
-STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
-TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
-So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
-HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
-frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
-tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
-egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
-iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
-q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
-MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
-Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
-lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
-0mBWWg==
------END CERTIFICATE-----
-
-Security Communication EV RootCA1
-=================================
------BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
-BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
-Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
-/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
-WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
-ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
-bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
-9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
-SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
-iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
-Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
-mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
-T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GA CA
-===============================
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
-BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
-A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
-bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
-VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
-IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
-IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
-Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
-Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
-d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
-/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
-LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
-MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
-+vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
-okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA
-=========================
------BEGIN CERTIFICATE-----
-MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
-BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
-EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
-MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
-dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
-GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
-d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
-oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
-QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
-PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
-MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
-IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
-VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
-LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
-dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
-AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
-4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
-AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
-egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
-Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
-PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
-c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
-cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
-IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
-WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
-MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
-MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
-Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
-HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
-nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
-aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
-86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
-yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
-S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
------END CERTIFICATE-----
-
-Certigna
-========
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
-EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
-MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
-Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
-XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
-GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
-ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
-DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
-Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
-tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
-BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
-SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
-hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
-ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
-PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
-1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
-
-AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
-======================================
------BEGIN CERTIFICATE-----
-MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
-AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
-LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w
-HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+
-U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh
-IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN
-yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU
-2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3
-4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP
-2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm
-8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf
-HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa
-Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK
-5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b
-czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g
-ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF
-BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug
-cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf
-AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX
-EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v
-/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3
-MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4
-3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk
-eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f
-/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h
-RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU
-Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
------END CERTIFICATE-----
-
-TC TrustCenter Class 2 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
-MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
-IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
-xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
-Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
-SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
-dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
-KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
-TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
-JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
-vQ==
------END CERTIFICATE-----
-
-TC TrustCenter Class 3 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw
-MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W
-yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo
-6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ
-uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk
-2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE
-O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8
-yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9
-IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
-092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc
-5A==
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA I
-=============================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
-MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
-VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
-JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
-qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
-xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
-ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
-gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
-BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
-1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
-vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
-ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
-ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
-7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
------END CERTIFICATE-----
-
-Deutsche Telekom Root CA 2
-==========================
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
-RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
-A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
-MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
-A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
-b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
-bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
-KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
-AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
-Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
-jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
-HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
-E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
-zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
-rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
-dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
-
-ComSign Secured CA
-==================
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
-AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
-NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
-QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
-49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
-7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
-kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
-9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
-AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
-U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
-j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
-AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
-BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
-FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
-51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
-OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
------END CERTIFICATE-----
-
-Cybertrust Global Root
-======================
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
-ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
-MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
-ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
-0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
-AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
-89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
-8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
-MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
-A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
-lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
-5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
-hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
-X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
-
-ePKI Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
-MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
-MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
-IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
-lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
-qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
-12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
-WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
-ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
-lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
-vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
-Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
-MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
-1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
-KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
-xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
-NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
-GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
-xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
-gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
-sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
-BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
-=============================================================================================================================
------BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
-DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
-aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
-b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
-BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
-S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
-MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
-IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
-n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
-IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
-dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
-cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
-Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
-xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
-6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
-hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
-BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
-N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
-y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
-LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
-dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
------END CERTIFICATE-----
-
-Buypass Class 2 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
-MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
-cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
-0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
-0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
-uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
-1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
-7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
-fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
-wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
------END CERTIFICATE-----
-
-Buypass Class 3 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
-MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
-ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
-n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
-AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
-1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
-pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
-EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
-htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
-el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
------END CERTIFICATE-----
-
-EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
-==========================================================================
------BEGIN CERTIFICATE-----
-MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg
-QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe
-Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p
-ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt
-IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by
-X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b
-gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr
-eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ
-TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy
-Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn
-uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI
-qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm
-ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0
-Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW
-Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t
-FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm
-zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k
-XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT
-bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU
-RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK
-1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt
-2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ
-Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9
-AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
------END CERTIFICATE-----
-
-certSIGN ROOT CA
-================
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
-VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
-Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
-CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
-JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
-rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
-ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
-0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
-AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
-AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
-SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
-x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
-vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
-TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-CNNIC ROOT
-==========
------BEGIN CERTIFICATE-----
-MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
-ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
-OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
-o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
-VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
-VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
-czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
-y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
-wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
-lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
-Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
-O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
-BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
-G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
-mxE=
------END CERTIFICATE-----
-
-ApplicationCA - Japanese Government
-===================================
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
-SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
-MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
-cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
-fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
-wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
-jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
-nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
-WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
-BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
-vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
-o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
-/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
-io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
-dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
-rosot4LKGAfmt1t06SAZf7IbiVQ=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G3
-=============================================
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
-NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
-YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
-LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
-K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
-c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
-IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
-dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
-2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
-cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
-Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
-t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
-
-thawte Primary Root CA - G2
-===========================
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
-VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
-IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
-Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
-MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
-b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
-IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
-LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
-8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
-mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
-G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
-rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
-
-thawte Primary Root CA - G3
-===========================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
-ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
-VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
-A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
-P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
-+BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
-7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
-vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
-KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
-A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
-8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
-er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G2
-=============================================
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
-OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
-b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
-BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
-KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
-EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
-ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
-npaqBA+K
------END CERTIFICATE-----
-
-VeriSign Universal Root Certification Authority
-===============================================
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
-1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
-MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
-9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
-AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
-tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
-CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
-a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
-Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
-Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
-P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
-wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
-mJO37M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G4
-============================================================
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
-VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
-b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
-ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
-cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
-b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
-Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
-rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
-HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
-Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
-A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
-AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
-
-NetLock Arany (Class Gold) Főtanúsítvány
-============================================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
-A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
-dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
-cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
-MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
-ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
-c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
-0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
-/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
-H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
-fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
-neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
-qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
-YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
-NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
-dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G2
-==================================
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
-5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
-vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
-CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
-e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
-OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
-CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
-48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
-trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
-qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
-AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
-ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
-A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
-+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
-f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
-kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
-CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
-URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
-CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
-oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
-IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
-66+KAQ==
------END CERTIFICATE-----
-
-CA Disig
-========
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
-QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
-MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
-bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
-GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
-Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
-hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
-ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
-gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
-AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
-aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
-ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
-BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
-WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
-mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
-CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
-ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
-4Z7CRneC9VkGjCFMhwnN5ag=
------END CERTIFICATE-----
-
-Juur-SK
-=======
------BEGIN CERTIFICATE-----
-MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
-c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
-DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
-SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
-aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
-TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
-+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
-UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
-Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
-MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
-HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
-AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
-cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
-AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
-cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
-FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
-A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
-ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
-abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
-IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
-Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
-yyqcjg==
------END CERTIFICATE-----
-
-Hongkong Post Root CA 1
-=======================
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
-DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
-NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
-IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
-ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
-auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
-qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
-V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
-HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
-h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
-l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
-IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
-T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
-c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
------END CERTIFICATE-----
-
-SecureSign RootCA11
-===================
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
-SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
-b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
-KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
-cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
-TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
-wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
-g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
-O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
-bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
-t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
-OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
-bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
-Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
-y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
-lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
-ACEDICOM Root
-=============
------BEGIN CERTIFICATE-----
-MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
-T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
-MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
-A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
-WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
-YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
-MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
-m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
-HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
-xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
-3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
-2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
-TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
-4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
-9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
-bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
-aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
-eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
-zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
-ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
-KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
-nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
-I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
-MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
-tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
-f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
-hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
-CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
-bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
-D/xwzoiQ
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
-MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
-c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
-BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
-U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
-fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
-0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
-pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
-1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
-AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
-QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
-FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
-lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
-I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
-yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
-LXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
-===================================================
------BEGIN CERTIFICATE-----
-MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
-ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
-MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
-cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
-aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
-8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
-jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
-JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
-9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
-AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
-SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
-F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
-D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
-Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
-fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
------END CERTIFICATE-----
-
-GlobalSign Root CA - R3
-=======================
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
-iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
-0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
-rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
-OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
-xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
-lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
-EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
-bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
-YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
-kpeDMdmztcpHWD9f
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA III
-===============================
------BEGIN CERTIFICATE-----
-MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe
-Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU
-QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex
-KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt
-QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO
-juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut
-CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1
-M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G
-A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA
-g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+
-KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK
-BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
-CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq
-woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
------END CERTIFICATE-----
-
-Autoridad de Certificacion Firmaprofesional CIF A62634068
-=========================================================
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
-BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
-QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
-NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
-Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
-B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
-7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
-ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
-plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
-MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
-LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
-bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
-vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
-EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
-DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
-bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
-ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
-51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
-R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
-T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
-Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
-osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
-crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
-saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
-KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
-6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
-
-Izenpe.com
-==========
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
-EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
-MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
-QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
-03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
-ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
-+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
-PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
-OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
-F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
-0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
-0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
-leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
-AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
-SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
-NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
-Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
-kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
-hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
-g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
-aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
-nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
-ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
-Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
-WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-Chambers of Commerce Root - 2008
-================================
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
-Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
-ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
-EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
-cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
-XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
-h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
-ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
-NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
-D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
-lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
-0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
-EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
-G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
-BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
-bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
-bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
-CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
-AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
-wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
-3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
-RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
-M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
-YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
-9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
-zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
-nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
------END CERTIFICATE-----
-
-Global Chambersign Root - 2008
-==============================
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
-NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
-Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
-QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
-VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
-XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
-ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
-/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
-TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
-H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
-Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
-HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
-AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
-BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
-BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
-aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
-aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
-1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
-dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
-/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
-ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
-dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
-9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
-foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
-qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
-P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
-c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
-
-Go Daddy Root Certificate Authority - G2
-========================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
-MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
-A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
-9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
-+qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
-fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
-NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
-BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
-vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
-5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
-N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
------END CERTIFICATE-----
-
-Starfield Root Certificate Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
-eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
-DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
-VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
-dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
-W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
-bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
-N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
-ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
-JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
-TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
-4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
-F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
-c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-Starfield Services Root Certificate Authority - G2
-==================================================
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
-IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
-dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
-h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
-hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
-LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
-rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
-SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
-E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
-xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
-YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
------END CERTIFICATE-----
-
-AffirmTrust Commercial
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
-MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
-DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
-C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
-BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
-MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
-HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
-hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
-qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
-0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
-sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-AffirmTrust Networking
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
-MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
-Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
-dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
-/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
-h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
-HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
-UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
-12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
-WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
-/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-AffirmTrust Premium
-===================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
-OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
-dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
-BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
-5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
-+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
-GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
-p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
-S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
-6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
-/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
-+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
-MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
-6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
-L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
-+4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
-BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
-IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
-g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
-zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-AffirmTrust Premium ECC
-=======================
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
-BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
-MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
-cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
-N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
-BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
-BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
-57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
-eQ==
------END CERTIFICATE-----
-
-Certum Trusted Network CA
-=========================
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
-ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
-MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
-ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
-l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
-J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
-fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
-cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
-DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
-jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
-mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
-Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
-
-Certinomis - Autorité Racine
-=============================
------BEGIN CERTIFICATE-----
-MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
-LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
-A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
-JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
-wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
-Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
-2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
-jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
-c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
-lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
-xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
-530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
-4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
-KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
-WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
-R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
-nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
-CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
-JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
-qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
-WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
-wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
-vgt2Fl43N+bYdJeimUV5
------END CERTIFICATE-----
-
-Root CA Generalitat Valenciana
-==============================
------BEGIN CERTIFICATE-----
-MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
-ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
-IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
-WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
-CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
-F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
-ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
-D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
-JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
-AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
-dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
-ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
-AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
-YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
-AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
-aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
-AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
-YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
-AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
-OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
-dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
-BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
-A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
-b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
-TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
-Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
-NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
-iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
-+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
------END CERTIFICATE-----
-
-A-Trust-nQual-03
-================
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
-Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
-a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
-dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
-RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
-ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
-c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
-zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
-yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
-SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
-iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
-cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
-eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
-ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
-sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
-JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
-mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
-ahq97BvIxYSazQ==
------END CERTIFICATE-----
-
-TWCA Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
-VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
-EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
-IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
-QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
-oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
-4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
-y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
-9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
-mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
-QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
-T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
-Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-Security Communication RootCA2
-==============================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
-SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
-aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
-+T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
-3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
-spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
-EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
-QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
-u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
-3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
-tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
-mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-EC-ACC
-======
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
-BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
-ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
-VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
-CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
-BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
-MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
-SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
-Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
-cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
-w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
-ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
-HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
-E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
-0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
-VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
-Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
-dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
-lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
-Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
-l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
-E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
-5EI=
------END CERTIFICATE-----
diff --git a/conf/rayo/dialplan/public.xml b/conf/rayo/dialplan/public.xml
deleted file mode 100644
index 76c4ea280b..0000000000
--- a/conf/rayo/dialplan/public.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<include>
-  <context name="public">
-
-    <extension name="unloop">
-      <condition field="${unroll_loops}" expression="^true$"/>
-      <condition field="${sip_looped_call}" expression="^true$">
-	<action application="deflect" data="${destination_number}"/>
-      </condition>
-    </extension>
-    <!--
-	Tag anything pass thru here as an outside_call so you can make sure not
-	to create any routing loops based on the conditions that it came from 
-	the outside of the switch.  
-    -->
-    <extension name="outside_call" continue="true">
-      <condition>
-	<action application="set" data="outside_call=true"/>
-	<action application="export" data="RFC2822_DATE=${strftime(%a, %d %b %Y %T %z)}"/>
-      </condition>
-    </extension>
-
-    <extension name="call_debug" continue="true">
-      <condition field="${call_debug}" expression="^true$" break="never">
-	<action application="info"/>
-      </condition>
-    </extension>
-
-    <extension name="adhearsion">
-      <condition>
-	<action application="rayo" data=""/>
-      </condition>
-    </extension>
-    
-  </context>
-</include>
-
diff --git a/conf/rayo/directory/default.xml b/conf/rayo/directory/default.xml
deleted file mode 100644
index 11c2e633de..0000000000
--- a/conf/rayo/directory/default.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-    NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE 
-    
-    FreeSWITCH works off the concept of users and domains just like email.
-    You have users that are in domains for example 1000@domain.com.
-    
-    When freeswitch gets a register packet it looks for the user in the directory
-    based on the from or to domain in the packet depending on how your sofia profile
-    is configured.  Out of the box the default domain will be the IP address of the
-    machine running FreeSWITCH.  This IP can be found by typing "sofia status" at the
-    CLI.  You will register your phones to the IP and not the hostname by default.
-    If you wish to register using the domain please open vars.xml in the root conf
-    directory and set the default domain to the hostname you desire.  Then you would
-    use the domain name in the client instead of the IP address to register 
-    with FreeSWITCH.
-    
-    NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE 
--->
-
-<include>
-  <!--the domain or ip (the right hand side of the @ in the addr-->
-  <domain name="$${domain}">
-    <params>
-      <param name="dial-string" value="{^^:sip_invite_domain=${dialed_domain}:presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(*/${dialed_user}@${dialed_domain})}"/>
-    </params>
-
-    <variables>
-    </variables>
-
-    <groups>
-      <group name="default">
-	<users>
-	  <X-PRE-PROCESS cmd="include" data="default/*.xml"/>
-	</users>
-      </group>
-    </groups>
-
-  </domain>
-</include>
diff --git a/conf/rayo/directory/default/usera.xml b/conf/rayo/directory/default/usera.xml
deleted file mode 100644
index 1e9c412be2..0000000000
--- a/conf/rayo/directory/default/usera.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<include>
-  <user id="usera">
-    <!-- Outbound Registrations Related to this user -->
-    <gateways>
-    </gateways>
-    <params>
-      <!-- omit password for authless registration -->
-      <param name="password" value="1"/>
-    </params>
-    <variables>
-      <!--all variables here will be set on all inbound calls that originate from this user -->
-      <variable name="user_context" value="public"/>
-      <variable name="effective_caller_id_name" value="User A"/>
-      <variable name="effective_caller_id_number" value="9009095333"/>
-    </variables>
-
-    <vcard>
-      <!-- insert optional compliant vcard xml here-->
-    </vcard>
-  </user>
-</include>
diff --git a/conf/rayo/directory/default/userb.xml b/conf/rayo/directory/default/userb.xml
deleted file mode 100644
index 9775d8371c..0000000000
--- a/conf/rayo/directory/default/userb.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<include>
-  <user id="userb">
-    <!-- Outbound Registrations Related to this user -->
-    <gateways>
-    </gateways>
-    <params>
-      <!-- omit password for authless registration -->
-      <param name="password" value="1"/>
-    </params>
-    <variables>
-      <!--all variables here will be set on all inbound calls that originate from this user -->
-      <variable name="user_context" value="public"/>
-      <variable name="effective_caller_id_name" value="User B"/>
-      <variable name="effective_caller_id_number" value="9009093733"/>
-    </variables>
-
-    <vcard>
-      <!-- insert optional compliant vcard xml here-->
-    </vcard>
-  </user>
-</include>
diff --git a/conf/rayo/directory/default/userc.xml b/conf/rayo/directory/default/userc.xml
deleted file mode 100644
index d870a051f8..0000000000
--- a/conf/rayo/directory/default/userc.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<include>
-  <user id="userc">
-    <!-- Outbound Registrations Related to this user -->
-    <gateways>
-    </gateways>
-    <params>
-      <!-- omit password for authless registration -->
-      <param name="password" value="1"/>
-    </params>
-    <variables>
-      <!--all variables here will be set on all inbound calls that originate from this user -->
-      <variable name="user_context" value="public"/>
-      <variable name="effective_caller_id_name" value="User C"/>
-      <variable name="effective_caller_id_number" value="8006492568"/>
-    </variables>
-
-    <vcard>
-      <!-- insert optional compliant vcard xml here-->
-    </vcard>
-  </user>
-</include>
diff --git a/conf/rayo/directory/default/userd.xml b/conf/rayo/directory/default/userd.xml
deleted file mode 100644
index e0a63ec76a..0000000000
--- a/conf/rayo/directory/default/userd.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<include>
-  <user id="userd">
-    <!-- Outbound Registrations Related to this user -->
-    <gateways>
-    </gateways>
-    <params>
-      <!-- omit password for authless registration -->
-      <param name="password" value="1"/>
-    </params>
-    <variables>
-      <!--all variables here will be set on all inbound calls that originate from this user -->
-      <variable name="user_context" value="public"/>
-      <variable name="effective_caller_id_name" value="Jenny"/>
-      <variable name="effective_caller_id_number" value="2128675309"/>
-    </variables>
-
-    <vcard>
-      <!-- insert optional compliant vcard xml here-->
-    </vcard>
-  </user>
-</include>
diff --git a/conf/rayo/freeswitch.xml b/conf/rayo/freeswitch.xml
deleted file mode 100644
index f38983ebcb..0000000000
--- a/conf/rayo/freeswitch.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE 
-    
-    This is the FreeSWITCH default config.  Everything you see before you now traverses 
-    down into all the directories including files which include more files.  The default
-    config comes out of the box already working in most situations as a PBX.  This will
-    allow you to get started testing and playing with various things in FreeSWITCH.
-    
-    Before you start to modify this default please visit this wiki page:
-    
-    http://wiki.freeswitch.org/wiki/Getting_Started_Guide#Some_stuff_to_try_out.21
-    
-    If all else fails you can read our FAQ located at:
-    
-    http://wiki.freeswitch.org/wiki/FreeSwitch_FAQ
-    
-    NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE 
--->
-<document type="freeswitch/xml">
-  <!--#comment 
-      All comments starting with #command will be preprocessed and never sent to the xml parser
-      Valid instructions:
-      #include ==> Include another file to this exact point
-                   (partial xml should be encased in <include></include> tags)
-      #set     ==> Set a global variable (can be expanded during preprocessing with $$ variables)
-                   (note the double $$ which denotes preprocessor variables)
-      #comment ==> A general comment such as this
-      
-      The preprocessor will compile the full xml document to ${prefix}/log/freeswitch.xml.fsxml
-      Don't modify it while freeswitch is running cos it is mem mapped in most cases =D
-      
-      The same can be achieved with the <X-PRE-PROCESS> tag where the attrs 'cmd' and 'data' are
-      parsed in the same way.
-  -->
-  <!--#comment
-      vars.xml contains all the #set directives for the preprocessor.
-  -->
-  <X-PRE-PROCESS cmd="include" data="vars.xml"/>
-
-  <section name="configuration" description="Various Configuration">
-    <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/>
-  </section>
-  
-  <section name="dialplan" description="Regex/XML Dialplan">
-    <X-PRE-PROCESS cmd="include" data="dialplan/*.xml"/>
-  </section>
-
-  <!-- mod_dingaling is reliant on the vcard data in the "directory" section. -->
-  <!-- mod_sofia is reliant on the user data for authorization -->
-  <section name="directory" description="User Directory">
-      <X-PRE-PROCESS cmd="include" data="directory/*.xml"/>
-  </section>
-
-  <!-- languages section (under development still) -->
-  <section name="languages" description="Language Management">
-    <X-PRE-PROCESS cmd="include" data="lang/de/*.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/en/*.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/fr/*.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/ru/*.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/he/*.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/es/es_ES.xml"/>
-    <X-NO-PRE-PROCESS cmd="include" data="lang/es/es_MX.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/pt/pt_BR.xml"/>
-    <X-NO-PRE-PROCESS cmd="include" data="lang/pt/pt_PT.xml"/>
-    <X-NO-PRE-PROCESS cmd="include" data="lang/sv/*.xml"/>
-  </section>
-
-</document>
diff --git a/conf/rayo/lang/de/de.xml b/conf/rayo/lang/de/de.xml
deleted file mode 100644
index a7dbab0c0c..0000000000
--- a/conf/rayo/lang/de/de.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<include>
-  <language name="de" sound-prefix="/snds" tts-engine="cepstral" tts-voice="david">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/>
-        <!--voicemail_de_tts is purely implemented with tts, we need a files based implementation too -->
-        <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/>
-      </macros>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/de/demo/demo.xml b/conf/rayo/lang/de/demo/demo.xml
deleted file mode 100644
index fa77948b65..0000000000
--- a/conf/rayo/lang/de/demo/demo.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<include>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <!-- or -->
-        <!--<action function="speak-text" data="Sie haben $1 Nachrichten"/>-->
-      </match>
-    </input>
-  </macro>
-  <macro name="saydate">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="iterated" type="ip_address"/>
-        <action function="say" data="$1" method="pronounced" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell-phonetic">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="tts-timeleft">
-    <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-    <!-- If the function "break" is encountered all parsing will cease -->
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="Sie haben $1 Minuten, $2 Sekunden übrig $strftime(%Y-%m-%d)"/>
-        <action function="break"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="Die Eingabe war ungültig."/>
-      </nomatch>
-    </input>
-    <input pattern="(\d+) min (\d+) sek">
-      <match>
-        <action function="speak-text" data="Sie haben $1 Minuten, $2 Sekunden übrig $strftime(%Y-%m-%d)"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="Die Eingabe war ungültig."/>
-      </nomatch>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/de/vm/sounds.xml b/conf/rayo/lang/de/vm/sounds.xml
deleted file mode 100644
index 657e611c20..0000000000
--- a/conf/rayo/lang/de/vm/sounds.xml
+++ /dev/null
@@ -1,413 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action application="log" data="INFO $1 $2"/>
-        <action function="say" data="$1" method="pronounced" type="items" gender="feminine"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items" gender="feminine"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To listen to new messages -->
-        <action function="play-file" data="voicemail/vm-listen_new.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To listen to saved messages -->
-        <action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- For advanced options -->
-        <action function="play-file" data="voicemail/vm-advanced.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To exit -->
-        <action function="play-file" data="voicemail/vm-to_exit.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To record a greeting -->
-        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To choose greeting -->
-        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To record your name -->
-        <action function="play-file" data="voicemail/vm-record_name2.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To change password -->
-        <action function="play-file" data="voicemail/vm-change_password.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To return to main menu -->
-        <action function="play-file" data="voicemail/vm-main_menu.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-continue.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-        <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-greeting.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-person.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-        <action function="play-file" data="voicemail/vm-message_number.wav"/>
-        <action application="log" data="INFO $1 $2"/>
-        <action function="say" data="$2" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action application="log" data="INFO $1"/>
-        <action function="say" data="$1" method="counted" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/de/vm/tts.xml b/conf/rayo/lang/de/vm/tts.xml
deleted file mode 100644
index f91cae1b99..0000000000
--- a/conf/rayo/lang/de/vm/tts.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Bitte geben Sie Ihren Benutzernamen ein, gefolgt von $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Bitte geben Sie Ihr Passwort ein, gefolgt von $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Falsche Benutzerdaten."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Willkommen in Ihrem Postfach."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Auf Wiedersehen."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Zu viele Fehlversuche."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$">
-      <match>
-        <action function="speak-text" data="Sie haben 1 $2 Nachricht im Ordner ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^([0,2-9]+):(.*)$">
-      <match>
-        <action function="speak-text" data="Sie haben $1 $2 Nachrichten im Ordner ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Um neue Nachrichten zu hören, drücken Sie $1. Um gespeicherte Nachrichten zu hören, drücken Sie $2, Für erweiterte Optionen, drücken Sie $3. Zum beenden drücken Sie $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Um eine Ansage aufzunehmen, drücken Sie $1. Um eine Ansage auszuwählen, drücken Sie $2. Um ihren Namen aufzunehmen, drücken Sie $3. Um zum Hauptmenü zurückzukehren, drücken Sie $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Sprechen Sie Ihren Namen nach dem Ton, drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Um die Aufzeichnung anzuhören, drücken Sie $1. Um die Aufzeichnung zu speichern, drücken Sie $2. Für eine erneute Aufnahme drücken Sie $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Drücken Sie $1 um diese Nachricht als wichtig zu markieren. Um fortzufahren drücken Sie $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Drücken Sie $1 um die Nachricht erneut zu hören. Um die Nachricht zu speichern, drücken Sie $2. Zum löschen der Nachricht drücken Sie $3. Für die Weiterleitung als Email, drücken Sie $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Wählen Sie eine Ansage zwischen 1 und 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Ungültige Eingabe."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Zeichnen Sie Ihre Ansage nach dem Ton auf. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Sprechen Sie nach dem Ton. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Ansage $1 ausgewählt."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 ist nicht verfügbar."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-        <action function="speak-text" data="$1 Nachricht Nummer $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Nachricht $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$strftime($1|%A, %B %d %Y, %I %M %p)"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/en/demo/demo-ivr.xml b/conf/rayo/lang/en/demo/demo-ivr.xml
deleted file mode 100644
index 98f155a265..0000000000
--- a/conf/rayo/lang/en/demo/demo-ivr.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<include>
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/en/demo/demo.xml b/conf/rayo/lang/en/demo/demo.xml
deleted file mode 100644
index bcfe6a8227..0000000000
--- a/conf/rayo/lang/en/demo/demo.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<include>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <!-- or -->
-        <!--<action function="speak-text" data="you have $1 messages"/>-->
-      </match>
-    </input>
-  </macro>
-  <macro name="saydate">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="iterated" type="ip_address"/>
-        <action function="say" data="$1" method="pronounced" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell-phonetic">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="tts-timeleft">
-    <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-    <!-- If the function "break" is encountered all parsing will cease -->
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-        <action function="break"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-    <input pattern="(\d+) min (\d+) sec">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/en/demo/funnies.xml b/conf/rayo/lang/en/demo/funnies.xml
deleted file mode 100644
index e901c5ad9c..0000000000
--- a/conf/rayo/lang/en/demo/funnies.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<include>
-  <macro name="funny_prompts" pause="750">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-wakey_wakey_sunshine.wav"/>
-        <action function="play-file" data="ivr/ivr-no_no_no.wav"/>
-        <action function="play-file" data="ivr/ivr-did_you_mean_to_press_key.wav"/>
-        <action function="play-file" data="ivr/ivr-seriously_mean_to_press_key.wav"/>
-        <action function="play-file" data="ivr/ivr-oh_whatever.wav"/>
-        <action function="play-file" data="ivr/ivr-one_more_mistake.wav"/>
-        <action function="play-file" data="ivr/ivr-congratulations_you_pressed_star.wav"/>
-        <action function="play-file" data="ivr/ivr-engineers_busy_assisting_other_sales.wav"/>
-        <action function="play-file" data="ivr/ivr-message_self_destruct.wav"/>
-        <action function="play-file" data="ivr/ivr-all_your_call_are_belong_to_us.wav"/>
-        <action function="play-file" data="ivr/ivr-love_those_touch_tones.wav"/>
-        <action function="play-file" data="ivr/ivr-yes_we_have_no_bananas.wav"/>
-        <action function="play-file" data="ivr/ivr-dude_you_suck.wav"/>
-        <action function="play-file" data="ivr/ivr-on_hold_indefinitely.wav"/>
-        <action function="play-file" data="ivr/ivr-youre_doing_it_wrong.wav"/>
-        <action function="play-file" data="ivr/ivr-were_asterisk_free.wav"/>
-        <action function="play-file" data="ivr/ivr-douche_telecom.wav"/>
-        <action function="play-file" data="ivr/ivr-asterisk_like_syphilis.wav"/>
-        <action function="play-file" data="ivr/ivr-freeguipy.wav"/>
-        <action function="play-file" data="ivr/ivr-terribly_wrong_awkward.wav"/>
-        <action function="play-file" data="ivr/ivr-it_was_that_bug.wav"/>
-        <action function="play-file" data="ivr/ivr-concentrate.wav"/>
-        <action function="play-file" data="ivr/ivr-founder_of_freesource.wav"/>
-        <action function="play-file" data="ivr/ivr-cold_foolish.wav"/>
-        <action function="play-file" data="ivr/ivr-trollover_minutes.wav"/>
-        <action function="play-file" data="ivr/ivr-yuno_silent_drill.wav"/>
-        <action function="play-file" data="ivr/ivr-beacuase.wav"/>
-      </match>
-    </input>
-  </macro>
-</include>
\ No newline at end of file
diff --git a/conf/rayo/lang/en/demo/new-demo-ivr.xml b/conf/rayo/lang/en/demo/new-demo-ivr.xml
deleted file mode 100644
index 619d9921e9..0000000000
--- a/conf/rayo/lang/en/demo/new-demo-ivr.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-  <macro name="new_demo_ivr_main_menu" pause="100"> <!-- See conf/ivr_menus/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="silence_stream://500"/>
-
-        <!-- Menu option 1: For information about FreeSWITCH... -->
-        <action function="play-file" data="misc/misc-information_about_freeswitch.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: To learn more about FreeSWITCH Solutions... -->
-        <action function="play-file" data="misc/misc-learn_more_about_freeswitch_solutions.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: To hear about ClueCon -->
-        <action function="play-file" data="misc/misc-to_hear_about_cluecon.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: For other options -->
-        <action function="play-file" data="ivr/ivr-for_other_options.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as new_demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="new_demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: For information about FreeSWITCH... -->
-        <action function="play-file" data="misc/misc-information_about_freeswitch.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: To learn more about FreeSWITCH Solutions... -->
-        <action function="play-file" data="misc/misc-learn_more_about_freeswitch_solutions.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: To hear about ClueCon -->
-        <action function="play-file" data="misc/misc-to_hear_about_cluecon.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: For other options -->
-        <action function="play-file" data="ivr/ivr-for_other_options.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- More information about FreeSWITCH... -->
-  <macro name="learn_about_freeswitch_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <!-- Information about FreeSWITCH and OSTAG... -->
-        <action function="play-file" data="misc-freeswitch_is_state_of_the_art.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-it_is_stable_scalable_extensible.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-free_to_download.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-freeswitch_sponsored_by_ostag.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-ostag_learn_more.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-
-        <!-- Menu option 9: Repeat this information -->
-        <action function="play-file" data="ivr/ivr-repeat_this_information.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- More information about FreeSWITCH Solutions... -->
-  <macro name="learn_about_freeswitch_solutions_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <!-- Information about FreeSWITCH Solutions... -->
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-
-        <!-- Menu option 9: Repeat this information -->
-        <action function="play-file" data="ivr/ivr-repeat_this_information.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- More information about ClueCon -->
-  <macro name="learn_about_cluecon_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <!-- Information about ClueCon... -->
-        <action function="play-file" data="misc-cluecon_is_premier_conference.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-chicago_each_summer.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-wide_range_of_persons.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-support_open_source_by_attending.wav"/>
-        <action function="play-file" data="silence_stream://500"/>
-        <action function="play-file" data="ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-        <action function="play-file" data="silence_stream://500"/>
-
-        <!-- Menu option 9: Repeat this information -->
-        <action function="play-file" data="ivr/ivr-repeat_this_information.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/en/dir/sounds.xml b/conf/rayo/lang/en/dir/sounds.xml
deleted file mode 100644
index b715a7f825..0000000000
--- a/conf/rayo/lang/en/dir/sounds.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter_person.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter_person.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-specify_mininum.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="play-file" data="directory/dir-no_matching_results.wav"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-result_match.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-too_many_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-no_more_results.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-result_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-at_extension.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="play-file" data="directory/dir-to_select_entry.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_next.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_prev.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-start_new_search.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/en/dir/tts.xml b/conf/rayo/lang/en/dir/tts.xml
deleted file mode 100644
index d5f112dcda..0000000000
--- a/conf/rayo/lang/en/dir/tts.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Please enter the first few digit of the person last name"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Please enter the first few digit of the person first name"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="to search by first name, press $2"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="to search by last name, press $2"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="You need to specify a minimum the first $1 letters of the person name, try again."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="Your search match no user on this system, try again."/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 result match your search"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Your search returned too many result, please try again"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="No more result"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Result number $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="speak-text" data="To select this entry press $1, for the next entry press $2, for the previous entry press $3, to make a new search press $4"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="at extension $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/en/en.xml b/conf/rayo/lang/en/en.xml
deleted file mode 100644
index 24bee311c9..0000000000
--- a/conf/rayo/lang/en/en.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<include>
-  <language name="en" say-module="en" sound-prefix="$${sound_prefix}" tts-engine="cepstral" tts-voice="callie">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-        <!-- voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. -->
-        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> <!-- vm/tts.xml if you want to use tts and have cepstral -->
-        <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/> <!-- dir/tts.xml if you want to use tts and have cepstral -->
-        <X-PRE-PROCESS cmd="include" data="ivr/*.xml"/>  <!-- IVR and custom phrases go here -->
-      </macros>
-      <X-PRE-PROCESS cmd="include" data="vm/voicemail_ivr.xml"/>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/en/ivr/sounds.xml b/conf/rayo/lang/en/ivr/sounds.xml
deleted file mode 100644
index 0c4f0b9c70..0000000000
--- a/conf/rayo/lang/en/ivr/sounds.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<include>
-  <macro name="queue_position">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="ivr/ivr-you_are_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="ivr/ivr-in_line.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="has_called_conf">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="$1"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-has_joined.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="has_left_conf">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="$1"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-has_left.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="callers_in_conf">
-    <input pattern="^1$" break_on_match="true">
-      <match>
-        <action function="sleep" data="500"/>
-        <!--<action function="play-file" data="ivr/ivr-there_is.wav"/>-->
-        <action function="play-file" data="digits/1.wav"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-listener_in_conference.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-there_are.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-members_in_conference.wav"/>
-      </match>
-      <nomatch>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-there_are.wav"/>
-        <action function="play-file" data="digits/0.wav"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-members_in_conference.wav"/>
-      </nomatch>
-    </input>
-  </macro>
-
-  <macro name="enter_dest_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-enter_destination_telephone_number.wav"/>
-        <action function="sleep" data="1000"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="enter_src_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-enter_source_telephone_number.wav"/>
-        <action function="sleep" data="1000"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="call_forward_set">
-    <input pattern="^(\d+):(\d+)$">
-      <match>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-extension_number.wav"/>
-        <action function="sleep" data="400"/>
-        <action function="say" data="$1" method="iterated" type="number"/>
-        <action function="sleep" data="400"/>
-        <action function="play-file" data="digits/2.wav"/>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-extension_number.wav"/>
-        <action function="sleep" data="400"/>
-        <action function="say" data="$2" method="iterated" type="number"/>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-call_forwarding_has_been_set.wav"/>
-        <action function="sleep" data="1500"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="call_forward_cancel">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-extension_number.wav"/>
-        <action function="sleep" data="400"/>
-        <action function="say" data="$1" method="iterated" type="number"/>
-        <action function="play-file" data="ivr/ivr-call_forwarding_has_been_cancelled.wav"/>
-        <action function="sleep" data="1500"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="screen_confirm">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-call_from.wav"/>
-        <action function="sleep" data="250"/>
-        <!-- Note, be sure to pass in the full path to the file or else!! -->
-        <action function="play-file" data="$1"/>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-to_accept_press_one.wav"/>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-to_reject.wav"/>
-        <action function="sleep" data="50"/>
-        <action function="play-file" data="ivr/ivr-hang_up.wav"/>
-        <action function="sleep" data="1500"/>
-        <action function="play-file" data="ivr/ivr-call_from.wav"/>
-        <action function="sleep" data="250"/>
-        <action function="play-file" data="$1"/>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-to_accept_press_one.wav"/>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-to_reject.wav"/>
-        <action function="sleep" data="50"/>
-        <action function="play-file" data="ivr/ivr-hang_up.wav"/>
-        <action function="sleep" data="1500"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/en/vm/sounds.xml b/conf/rayo/lang/en/vm/sounds.xml
deleted file mode 100644
index fdef472a5b..0000000000
--- a/conf/rayo/lang/en/vm/sounds.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_change_pass_success">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-password_has_been_changed.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_change_pass_fail">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-password_not_valid.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To listen to new messages -->
-        <action function="play-file" data="voicemail/vm-listen_new.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To listen to saved messages -->
-        <action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- For advanced options -->
-        <action function="play-file" data="voicemail/vm-advanced.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To exit -->
-        <action function="play-file" data="voicemail/vm-to_exit.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To record a greeting -->
-        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To choose greeting -->
-        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To record your name -->
-        <action function="play-file" data="voicemail/vm-record_name2.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To change password -->
-        <action function="play-file" data="voicemail/vm-change_password.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To return to main menu -->
-        <action function="play-file" data="voicemail/vm-main_menu.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-continue.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-        <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-greeting.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-person.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-        <action function="play-file" data="voicemail/vm-message_number.wav"/>
-        <action function="say" data="$2" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^000|^$|^[Aa]non|^[Pp]rivate" break_on_match="true">
-      <match>
-        <!-- add 'anonymous caller' sound here -->
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="ivr/ivr-this_is_a_call_from.wav"/>
-        <action function="execute" data="sleep(100)"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(500)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="short_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/en/vm/tts.xml b/conf/rayo/lang/en/vm/tts.xml
deleted file mode 100644
index 2de4b3781e..0000000000
--- a/conf/rayo/lang/en/vm/tts.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="please enter your i d, followed by $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="please enter your password, followed by $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="login incorrect."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="welcome to your voicemail."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="goodbye."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="too many failed attempts."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="you have 1 $1 message in folder ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="speak-text" data="you have $1 $2 messages in folder ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to new messages, press $1, To listen to saved messages, press $2, For advanced options, press $3, to exit, press $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To record a greeting, press $1, To choose a greeting, press $2, To record your name, press $3, to change your password, press $5, to return to the main menu, press $5."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="at the tone, please record your name, press any key or stop talking to end the recording."/>
-
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to the recording, press $1, To save the recording, press $2, To re record, press $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To mark this message urgent, press $1, To continue, press $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="$1 is not a valid extension."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="enter the extension you wish to forward to, then press $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="To record an announcement, press $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to the recording again, press $1, To save the recording, press $2,  To delete the recording, press $3, to forward the recording to your email, press $4, to call the caller now, press $5, To forward this message to another extension, press $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="choose a greeting between 1 and 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="invalid value."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="record your greeting at the tone, press any key or stop talking to end the recording."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="record your message at the tone, press any key or stop talking to end the recording."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="greeting $1 selected."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 is not available."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-        <action function="speak-text" data="$1 message number $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="message $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/en/vm/voicemail_ivr.xml b/conf/rayo/lang/en/vm/voicemail_ivr.xml
deleted file mode 100644
index 1c48299430..0000000000
--- a/conf/rayo/lang/en/vm/voicemail_ivr.xml
+++ /dev/null
@@ -1,417 +0,0 @@
-<include>
-
-  <macros name="voicemail_ivr">
-    <macro name="press_key">
-      <input pattern="^(.*):(.*)$">
-        <match>
-          <action function="play-file" data="$2"/>
-          <action function="play-file" data="voicemail/vm-press.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="plural_msg">
-      <input pattern="^[1]:(.*):(.*)$" break_on_match="true">
-        <match>
-          <action function="play-file" data="$1"/>
-        </match>
-      </input>
-      <input pattern="^.*:(.*):(.*)$" break_on_match="true">
-        <match>
-          <action function="play-file" data="$2"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="enter_id">
-      <input pattern="(.+)">
-        <match>
-          <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-        <nomatch>
-          <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-          <action function="say" data="${VM-Key-Terminator}" method="pronounced" type="name_spelled"/>
-        </nomatch>
-      </input>
-    </macro>
-
-    <macro name="enter_pass">
-      <input pattern="(.+)">
-        <match>
-          <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-        <nomatch>
-          <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-          <action function="say" data="${VM-Key-Terminator}" method="pronounced" type="name_spelled"/>
-        </nomatch>
-
-      </input>
-    </macro>
-
-    <macro name="fail_auth">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="hello">
-      <input>
-        <match>
-          <!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-        </match>
-      </input>
-    </macro>
-
-    <macro name="goodbye">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="abort">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-abort.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="message_count">
-      <input field="${VM-Total-New-Urgent-Messages}" pattern="^(0)$">
-        <nomatch>
-          <action function="play-file" data="voicemail/vm-you_have.wav"/>
-          <action function="say" data="${VM-Total-New-Urgent-Messages}" method="pronounced" type="items"/>
-          <action function="play-file" data="voicemail/vm-urgent-new.wav"/>
-          <action function="phrase" phrase="plural_msg@voicemail_ivr" data="${VM-Total-New-Urgent-Messages}:voicemail/vm-message.wav:voicemail/vm-messages.wav"/>
-        </nomatch>
-      </input>
-      <input field="${VM-Total-New-Messages}" pattern="^(\d+)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-you_have.wav"/>
-          <action function="say" data="${VM-Total-New-Messages}" method="pronounced" type="items"/>
-          <action function="play-file" data="voicemail/vm-new.wav"/>
-          <action function="phrase" phrase="plural_msg@voicemail_ivr" data="${VM-Total-New-Messages}:voicemail/vm-message.wav:voicemail/vm-messages.wav"/>
-        </match>
-      </input>
-      <input field="${VM-Total-Saved-Messages}" pattern="^(0)$">
-        <nomatch>
-          <action function="play-file" data="currency/and.wav"/>
-          <action function="say" data="${VM-Total-Saved-Messages}" method="pronounced" type="items"/>
-          <action function="play-file" data="voicemail/vm-saved.wav"/>
-          <action function="phrase" phrase="plural_msg@voicemail_ivr" data="${VM-Total-Saved-Messages}:voicemail/vm-message.wav:voicemail/vm-messages.wav"/>
-        </nomatch>
-      </input>
-    </macro>
-
-    <macro name="menu">
-      <input field="${VM-Total-New-Messages}" pattern="^(0)$">
-        <nomatch>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Play-New-Messages}:voicemail/vm-listen_new.wav"/>
-	</nomatch>
-      </input>
-      <input field="${VM-Total-Saved-Messages}" pattern="^(0)$">
-	<nomatch>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Play-Saved-Messages}:voicemail/vm-listen_saved.wav"/>
-	</nomatch>
-      </input>
-      <input>
-	<match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Config-Menu}:voicemail/vm-advanced.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Terminator}:voicemail/vm-to_exit.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="config_menu">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Record-Greeting}:voicemail/vm-to_record_greeting.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Choose-Greeting}:voicemail/vm-choose_greeting.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Record-Name}:voicemail/vm-record_name2.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Change-Password}:voicemail/vm-change_password.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Menu}:voicemail/vm-main_menu.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_name">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="forward_ask_prepend">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Prepend}:voicemail/vm-forward_add_intro.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Forward}:voicemail/vm-send_message_now.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="forward_ask_extension">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-          <!--<action function="phrase" phrase="play-file" data="voicemail/vm-followed_by.wav"/>-->
-          <!--<action function="say" data="${VM-Key-Terminate}" method="pronounced" type="name_spelled"/>-->
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_file_check">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Listen-File}:voicemail/vm-listen_to_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Save-File}:voicemail/vm-save_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Record-File}:voicemail/vm-rerecord.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_urgent_check">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Urgent}:voicemail/vm-mark-urgent.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Terminator}:voicemail/vm-continue.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="forward_prepend">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Prepend}:voicemail/vm-forward_add_intro.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Forward}:voicemail/vm-send_message_now.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="forward_message_enter_extension">
-      <input pattern="^([0-9#*])$">
-        <match>
-          <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-          <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="invalid_extension">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="listen_file_check">
-      <input>
-        <match>
-          <!--<action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Next-Msg}:voicemail/vm-for_next_msg.wav"/>--> <!-- Not existant in callie recordings -->
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Listen-File}:voicemail/vm-listen_to_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Save-File}:voicemail/vm-save_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Delete-File}:voicemail/vm-delete_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Forward}:voicemail/vm-to_forward.wav"/>
-        </match>
-      </input>
-      <input field="${VM-Message-Email}" pattern="^$">
-        <nomatch>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Email}:voicemail/vm-forward_to_email.wav"/>
-        </nomatch>
-      </input>
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Callback}:voicemail/vm-return_call.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Forward}:voicemail/vm-to_forward.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="choose_greeting">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="choose_greeting_fail">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_greeting">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_message">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-record_message.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="greeting_selected">
-      <input pattern="^(\d+)$">
-        <match>
-	  <action function="play-file" data="${VM-Preference-Greeting-File-Path}"/>
-          <action function="play-file" data="voicemail/vm-greeting.wav"/>
-          <action function="say" data="$1" method="pronounced" type="items"/>
-          <action function="play-file" data="voicemail/vm-selected.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="play_greeting">
-      <input pattern="^(.*)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-person.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-          <action function="play-file" data="voicemail/vm-not_available.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_number">
-      <input pattern="^(\d+)$">
-        <match>
-          <action function="say" data="$1" method="pronounced" type="items"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_message_number">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-${VM-Message-Type}.wav"/>
-          <action function="play-file" data="voicemail/vm-message_number.wav"/>
-          <action function="say" data="${VM-Message-Number}" method="pronounced" type="items"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_phone_number">
-      <input pattern="^(.*)$">
-        <match>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_name">
-      <input pattern="^(.*)$">
-        <match>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-      </input>
-    </macro>
-    <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-    <macro name="ack">
-      <input pattern="^(too-small)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-too-small.wav"/>
-        </match>
-      </input>
-      <input pattern="^(undeleted)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-      <input pattern="^(deleted)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-      <input pattern="^(saved)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-      <input pattern="^(emailed)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-      <input pattern="^(marked-urgent)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_date">
-      <input pattern="^(.*)$">
-        <match>
-          <action function="say" data="$1" method="pronounced" type="short_date_time"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_date_event">
-      <input>
-        <match>
-          <action function="say" data="${VM-Message-Received-Epoch}" method="pronounced" type="short_date_time"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="play_message">
-      <input>
-        <match>
-          <action function="play-file" data="${VM-Message-File-Path}"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="play_recording">
-      <input>
-        <match>
-          <action function="play-file" data="${VM-Record-File-Path}"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="disk_quota_exceeded">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-      </input>
-    </macro>
-  </macros>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/es/demo/demo-es-ES.xml b/conf/rayo/lang/es/demo/demo-es-ES.xml
deleted file mode 100644
index 4c6919dd0e..0000000000
--- a/conf/rayo/lang/es/demo/demo-es-ES.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-    <macro name="msgcount">
-      <input pattern="(.*)">
-	<match>
-	  <action function="execute" data="sleep(1000)"/>
-	  <action function="play-file" data="voicemail/vm-you_have.wav"/>
-	  <action function="say" data="$1" method="pronounced" type="items"/>
-	  <action function="play-file" data="voicemail/vm-messages.wav"/>
-	  <!-- or -->
-	  <!--<action function="speak-text" data="Usted tiene $1 mensajes"/>-->
-	</match>
-      </input>
-    </macro>
-    <macro name="saydate">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="timespec">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="ip-addr">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="iterated" type="ip_address"/>
-	  <action function="say" data="$1" method="pronounced" type="ip_address"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell-phonetic">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="tts-timeleft">
-      <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-      <!-- If the function "break" is encountered all parsing will cease -->
-      <input pattern="(\d+):(\d+)">
-	<match>
-	  <action function="speak-text" data="Quedan $1 minutos y $2 segundos $strftime(%Y-%m-%d)"/>
-	  <action function="break"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Esa fue una entrada inválida."/>
-	</nomatch>
-      </input>
-      <input pattern="(\d+) min (\d+) sec">
-	<match>
-	  <action function="speak-text" data="Quedan $1 minutos y $2 segundos $strftime(%Y-%m-%d)"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Esa fue una entrada inválida."/>
-	</nomatch>
-      </input>
-    </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/demo/demo-es-MX.xml b/conf/rayo/lang/es/demo/demo-es-MX.xml
deleted file mode 100644
index 4c6919dd0e..0000000000
--- a/conf/rayo/lang/es/demo/demo-es-MX.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-    <macro name="msgcount">
-      <input pattern="(.*)">
-	<match>
-	  <action function="execute" data="sleep(1000)"/>
-	  <action function="play-file" data="voicemail/vm-you_have.wav"/>
-	  <action function="say" data="$1" method="pronounced" type="items"/>
-	  <action function="play-file" data="voicemail/vm-messages.wav"/>
-	  <!-- or -->
-	  <!--<action function="speak-text" data="Usted tiene $1 mensajes"/>-->
-	</match>
-      </input>
-    </macro>
-    <macro name="saydate">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="timespec">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="ip-addr">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="iterated" type="ip_address"/>
-	  <action function="say" data="$1" method="pronounced" type="ip_address"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell-phonetic">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="tts-timeleft">
-      <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-      <!-- If the function "break" is encountered all parsing will cease -->
-      <input pattern="(\d+):(\d+)">
-	<match>
-	  <action function="speak-text" data="Quedan $1 minutos y $2 segundos $strftime(%Y-%m-%d)"/>
-	  <action function="break"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Esa fue una entrada inválida."/>
-	</nomatch>
-      </input>
-      <input pattern="(\d+) min (\d+) sec">
-	<match>
-	  <action function="speak-text" data="Quedan $1 minutos y $2 segundos $strftime(%Y-%m-%d)"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Esa fue una entrada inválida."/>
-	</nomatch>
-      </input>
-    </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/demo/demo-ivr-es-ES.xml b/conf/rayo/lang/es/demo/demo-ivr-es-ES.xml
deleted file mode 100644
index ec7d7bccd2..0000000000
--- a/conf/rayo/lang/es/demo/demo-ivr-es-ES.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/demo/demo-ivr-es-MX.xml b/conf/rayo/lang/es/demo/demo-ivr-es-MX.xml
deleted file mode 100644
index ec7d7bccd2..0000000000
--- a/conf/rayo/lang/es/demo/demo-ivr-es-MX.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/dir/sounds-es-ES.xml b/conf/rayo/lang/es/dir/sounds-es-ES.xml
deleted file mode 100644
index 2bdc1492ec..0000000000
--- a/conf/rayo/lang/es/dir/sounds-es-ES.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-enter_person.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-                <action function="play-file" data="directory/dir-enter_person.wav"/>
-                <action function="play-file" data="directory/dir-first_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-first_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-specify_mininum.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="play-file" data="directory/dir-no_matching_results.wav"/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-result_match.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-too_many_result.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-no_more_results.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-result_number.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-at_extension.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="play-file" data="directory/dir-to_select_entry.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_next.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_prev.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-start_new_search.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/dir/sounds-es-MX.xml b/conf/rayo/lang/es/dir/sounds-es-MX.xml
deleted file mode 100644
index 2bdc1492ec..0000000000
--- a/conf/rayo/lang/es/dir/sounds-es-MX.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-enter_person.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-                <action function="play-file" data="directory/dir-enter_person.wav"/>
-                <action function="play-file" data="directory/dir-first_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-first_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-specify_mininum.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="play-file" data="directory/dir-no_matching_results.wav"/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-result_match.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-too_many_result.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-no_more_results.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-result_number.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-at_extension.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="play-file" data="directory/dir-to_select_entry.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_next.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_prev.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-start_new_search.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/dir/tts-es-ES.xml b/conf/rayo/lang/es/dir/tts-es-ES.xml
deleted file mode 100644
index fbdeca703c..0000000000
--- a/conf/rayo/lang/es/dir/tts-es-ES.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Introduzca las primeras letras del apellido de la persona."/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Introduzca las primeras letras del nombre de la persona."/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por apellido, pulse $2"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por nombre, pulse $2"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Necesita especificar un mínimo de $1 letras del nombre buscado. Por favor intente de nuevo."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="speak-text" data="No hay resultados que coincidan con su busqueda. Por favor intente de nuevo."/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1 resultados coinciden con su busqueda."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Su busqueda genera demasiados resultados. Por favor intente de nuevo."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="No hay más resultados."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Resultado número $1"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="speak-text" data="Para seleccionar este resultado pulse $1, para el resultado siguiente pulse $2, para el resultado previo pulse $3, para empezar una nueva busqueda pulse $4"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="en la extensión $1"/>
-			</match>
-		</input>
-	</macro>
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/dir/tts-es-MX.xml b/conf/rayo/lang/es/dir/tts-es-MX.xml
deleted file mode 100644
index ddf15d0a50..0000000000
--- a/conf/rayo/lang/es/dir/tts-es-MX.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Ingrese las primeras letras del apellido de la persona."/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Ingrese las primeras letras del nombre de la persona."/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por apellido, pulse $2"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por nombre, pulse $2"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Necesita especificar un mínimo de $1 letras del nombre buscado. Por favor intente de nuevo."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="speak-text" data="No hay resultados que coincidan con su busqueda. Por favor intente de nuevo."/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1 resultados coinciden con su busqueda."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Su busqueda genera demasiados resultados. Por favor intente de nuevo."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="No hay más resultados."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Resultado número $1"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="speak-text" data="Para seleccionar este resultado pulse $1, para el resultado siguiente pulse $2, para el resultado previo pulse $3, para empezar una nueva busqueda pulse $4"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="en la extensión $1"/>
-			</match>
-		</input>
-	</macro>
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/es_ES.xml b/conf/rayo/lang/es/es_ES.xml
deleted file mode 100644
index f8de6858ea..0000000000
--- a/conf/rayo/lang/es/es_ES.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <language name="es" sound-path="$${sounds_dir}/es/ES/cristina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-es-ES.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_es_ES_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-es-ES.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-es-ES.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
-  </language>
-</include>
diff --git a/conf/rayo/lang/es/es_MX.xml b/conf/rayo/lang/es/es_MX.xml
deleted file mode 100644
index 936abcf16f..0000000000
--- a/conf/rayo/lang/es/es_MX.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <language name="es" sound-path="$${sounds_dir}/es/mx/maria" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-es-MX.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_es_MX_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-es-MX.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-es-MX.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
-  </language>
-</include>
diff --git a/conf/rayo/lang/es/vm/sounds-es-ES.xml b/conf/rayo/lang/es/vm/sounds-es-ES.xml
deleted file mode 100644
index dcc9d9f76f..0000000000
--- a/conf/rayo/lang/es/vm/sounds-es-ES.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_id.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="play-file" data="digits/un.wav"/>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/> 
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-messages.wav"/>
-	<action function="play-file" data="voicemail/vm-$2_s.wav"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To listen to new messages -->
-	<action function="play-file" data="voicemail/vm-listen_new.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To listen to saved messages -->
-	<action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- For advanced options -->
-	<action function="play-file" data="voicemail/vm-advanced.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To exit -->
-	<action function="play-file" data="voicemail/vm-to_exit.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To record a greeting -->
-	<action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To choose greeting -->
-	<action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To record your name -->
-	<action function="play-file" data="voicemail/vm-record_name2.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To change password -->
-	<action function="play-file" data="voicemail/vm-change_password.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To return to main menu -->
-	<action function="play-file" data="voicemail/vm-main_menu.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-continue.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-	<action function="play-file" data="voicemail/vm-followed_by.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-greeting.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-person.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-$1.wav"/> 
-	<action function="play-file" data="voicemail/vm-message_number.wav"/>
-	<action function="say" data="$2" method="pronounced" type="items"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack"> 
-    <input pattern="^(too-small)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-        <match>
-            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/vm/sounds-es-MX.xml b/conf/rayo/lang/es/vm/sounds-es-MX.xml
deleted file mode 100644
index 1f22c43bdc..0000000000
--- a/conf/rayo/lang/es/vm/sounds-es-MX.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_id.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="play-file" data="digits/un.wav"/>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/> 
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-messages.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To listen to new messages -->
-	<action function="play-file" data="voicemail/vm-listen_new.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To listen to saved messages -->
-	<action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- For advanced options -->
-	<action function="play-file" data="voicemail/vm-advanced.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To exit -->
-	<action function="play-file" data="voicemail/vm-to_exit.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To record a greeting -->
-	<action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To choose greeting -->
-	<action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To record your name -->
-	<action function="play-file" data="voicemail/vm-record_name2.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To change password -->
-	<action function="play-file" data="voicemail/vm-change_password.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To return to main menu -->
-	<action function="play-file" data="voicemail/vm-main_menu.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-continue.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-	<action function="play-file" data="voicemail/vm-followed_by.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-greeting.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-person.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-$1.wav"/> 
-	<action function="play-file" data="voicemail/vm-message_number.wav"/>
-	<action function="say" data="$2" method="pronounced" type="items"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack"> 
-    <input pattern="^(too-small)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-        <match>
-            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/vm/tts-es-ES.xml b/conf/rayo/lang/es/vm/tts-es-ES.xml
deleted file mode 100644
index 6dab48ca60..0000000000
--- a/conf/rayo/lang/es/vm/tts-es-ES.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor introduzca su número de usuario, seguido por $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor introduzca su contraseña, seguido por $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Inicio de sesión incorrecto."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Bienvenido a su buzón de voz."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Adiós."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Demasiados intentos fallidos."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-	<action function="speak-text" data="Usted tiene 1 $1 mensaje en la bandeja de entrada ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="speak-text" data="Usted tiene $1 $2 mensajes en la bandeja de entrada ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar mensajes nuevos, pulse $1. Para escuchar mensajes guardados, pulse $2. Para opciones avanzadas, pulse $3. Para salir, pulse $4."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para grabar un saludo, pulse $1. Para elegir un saludo, pulse $2. Para grabar su nombre, pulse $3. Para cambiar su contraseña, pulse $5. Para el menú principal, pulse $5."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Por favor grabe su nombre después de la señal, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar la grabación, pulse $1. Para guardar la grabación, pulse $2. Para regrabar, pulse $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para marcar este mensaje como urgente, pulse $1. Para continuar, pulse $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="$1 no es una extensión válida."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Introduzca la extensión a la cual quiere enviar este mensaje, seguido de $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Para grabar un saludo, pulse $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar la grabación, pulse $1. Para guardar la grabación, pulse $2. Para eliminar la grabación, pulse $3. Para enviar la grabación a su e-mail, pulse $4. Para devolver la llamada, pulse $5. Para enviar este mensaje a otra extensión, pulse $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Elija un saludo entre 1 y 9."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Valor inválido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Grabe su saludo después de la señal, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Grabe su mensaje después de la señal, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Saludo $1 seleccionado."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1 no está disponible."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-	<action function="speak-text" data="$1 mensaje número $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="mensaje $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/es/vm/tts-es-MX.xml b/conf/rayo/lang/es/vm/tts-es-MX.xml
deleted file mode 100644
index ce5722e934..0000000000
--- a/conf/rayo/lang/es/vm/tts-es-MX.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor ingrese su número de usuario, seguido por $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor ingrese su contraseña, seguido por $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Inicio de sesión incorrecto."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Bienvenido a su buzón de voz."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Adiós."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Demasiados intentos fallidos."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-	<action function="speak-text" data="Usted tiene 1 $1 mensaje en la bandeja de entrada ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="speak-text" data="Usted tiene $1 $2 mensajes en la bandeja de entrada ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar mensajes nuevos, pulse $1. Para escuchar mensajes guardados, pulse $2. Para opciones avanzadas, pulse $3. Para salir, pulse $4."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para grabar un saludo, pulse $1. Para elegir un saludo, pulse $2. Para grabar su nombre, pulse $3. Para cambiar su contraseña, pulse $5. Para el menú principal, pulse $5."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Después del tono, por favor anote su nombre, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar la grabación, pulse $1. Para guardar la grabación, pulse $2. Para regrabar, pulse $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para marcar este mensaje como urgente, pulse $1. Para continuar, pulse $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="$1 no es una extensión válida."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Introduzca la extensión a la cual quiere enviar este mensaje, seguido de $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Para grabar un saludo, pulse $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar la grabación, pulse $1. Para guardar la grabación, pulse $2. Para eliminar la grabación, pulse $3. Para enviar la grabación a su e-mail, pulse $4. Para devolver la llamada, pulse $5. Para enviar este mensaje a otra extensión, pulse $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Elija un saludo entre 1 y 9."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Valor inválido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Grabe su saludo después del tono, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Grabe su mensaje después del tono, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Saludo $1 seleccionado."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1 no está disponible."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-	<action function="speak-text" data="$1 mensaje número $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="mensaje $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/fr/demo/demo.xml b/conf/rayo/lang/fr/demo/demo.xml
deleted file mode 100644
index 0d0de592ac..0000000000
--- a/conf/rayo/lang/fr/demo/demo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<include>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="tuas.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="messages.wav"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timeleft">
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="il reste $1 minutes et $2 secondes"/>
-      </match>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/fr/dir/sounds.xml b/conf/rayo/lang/fr/dir/sounds.xml
deleted file mode 100644
index a0dcb2c0e9..0000000000
--- a/conf/rayo/lang/fr/dir/sounds.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter-person.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter-person.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-specify_mininum_first.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="play-file" data="directory/dir-no_match_entry.wav"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-result_match.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-to_many_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-no_more_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-result_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-at_extension.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="play-file" data="directory/dir-to_select_entry.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_next.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_prev.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-to_make_new_search.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/fr/dir/tts.xml b/conf/rayo/lang/fr/dir/tts.xml
deleted file mode 100644
index 7d3e5e3090..0000000000
--- a/conf/rayo/lang/fr/dir/tts.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Veuillez entrer les premières lettres du nom de famille"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Veuillez entrer les premières lettres du prénom"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="pour chercher par prénom, tapez $2"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="pour chercher par nom de famille, tapez $2"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(1)$">
-      <match>
-        <action function="speak-text" data="Vous devez entrer au minimum une lettre du nom de la personne, essayez encore"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Vous devez entrer au minimum $1 lettres du nom de la personne, essayer encore"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="Votre recherche n'a retournée aucun résultat, essayez encore"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 résultats correspondent à votre recherche"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Votre recherche retourne trop de résultats, essayer encore"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Fin des résultats."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Résultat numéro $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="speak-text" data="Pour sélectionner ce nom, tapez $1, pour le nom suivant tapez $2, pour le nom précédent, tapez $3, pour faire une nouvelle recherche, tapez $4"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="au poste $1"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/fr/fr.xml b/conf/rayo/lang/fr/fr.xml
deleted file mode 100644
index 124ca02415..0000000000
--- a/conf/rayo/lang/fr/fr.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<include>
-  <language name="fr" say-module="fr" sound-prefix="$${sounds_dir}/fr/ca/june" tts-engine="cepstral" tts-voice="david">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/>
-        <!-- voicemail_fr_tts is purely implemented with tts, we need a files based implementation too -->
-        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
-        <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/> <!-- dir/tts.xml if you want to use tts and have cepstral -->
-      </macros>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/fr/vm/sounds.xml b/conf/rayo/lang/fr/vm/sounds.xml
deleted file mode 100644
index 9cd209eab1..0000000000
--- a/conf/rayo/lang/fr/vm/sounds.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Entrez votre Identification, suivi par $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Entrez votre code, suivi par $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Identification incorrecte."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Bienvenue sur votre répondeur."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Au revoir."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Trop de tentatives ont échouées."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^([^:]+):urgent-new">
-      <match>
-        <action function="speak-text" data="Vous avez $1 nouveaux messages urgents dans le répertoire ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^([^:]+):new">
-      <match>
-        <action function="speak-text" data="Vous avez $1 nouveaux messages dans le répertoire ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^([^:]+):saved">
-      <match>
-        <action function="speak-text" data="Vous avez $1 messages sauvegardés dans le répertoire ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Pour écouter les nouveaux messages, tapez $1, Pour écouter les messages enregistrés, tapez $2, Pour les options avancées, tapez $3, pour sortir, tapez $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="pour enregistrer un message d'accueil, tapez $1, Pour choisir votre message d'accueil, tapez $2, Pour enregistrer votre nom, tapez $3, Pour changer votre mot de passe, tapez $4, Pour retourner au menu principal, tapez $5."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="enregistrez votre nom après le bip, puis tapez une touche, ou arrêtez de parler pour arrêter l'enregistrement."/>
-
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Pour écouter l'enregistrement, tapez $1, pour sauvegarder l'enregistrement, tapez $2, Pour réenregistrer, tapez $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Pour indiquer que ce message est urgent, tapez $1, Pour continuer, tapez $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])(:(.*))?$">
-      <match>
-        <action function="speak-text"
-                data="Pour réécouter l'enregistrement à nouveau, tapez $1, Pour sauvegarder l'enregistrement, tapez $2, Pour supprimer l'enregistrement, tapez $3, pour transférer l'enregistrement à votre email $8, tapez $4, Pour appeler l'auteur du message, tapez $5, Pour transférer ce message à un autre numéro, tapez $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="choisissez un message d'accueil entre 1 et 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="valeur incorrecte."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="enregistrez votre message d'accueil après le bip, puis tapez une touche ou arrêtez de parler pour arrêter l'enregistrement."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="enregistrez votre message après le bip, puis tapez une touche ou arrêtez de parler pour arrêter l'enregistrement."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="message d'accueil numéro $1 sélectionné."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 n'est pas disponible."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^new:(.*)$">
-      <match>
-        <action function="speak-text" data="nouveau message numéro $1."/>
-      </match>
-    </input>
-    <input pattern="^saved:(.*)$">
-      <match>
-        <action function="speak-text" data="message sauvegardé numéro $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="speak-text" data="message trop court"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="speak-text" data="message supprimé"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="speak-text" data="message sauvegardé"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="speak-text" data="message envoyé"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="speak-text" data="message marqué urgent"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="${strftime($1|%e/%m/%Y, %H heures %M)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/he/demo/demo-ivr.xml b/conf/rayo/lang/he/demo/demo-ivr.xml
deleted file mode 100644
index df8d24b751..0000000000
--- a/conf/rayo/lang/he/demo/demo-ivr.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<include>
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/he/demo/demo.xml b/conf/rayo/lang/he/demo/demo.xml
deleted file mode 100644
index bcfe6a8227..0000000000
--- a/conf/rayo/lang/he/demo/demo.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<include>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <!-- or -->
-        <!--<action function="speak-text" data="you have $1 messages"/>-->
-      </match>
-    </input>
-  </macro>
-  <macro name="saydate">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="iterated" type="ip_address"/>
-        <action function="say" data="$1" method="pronounced" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell-phonetic">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="tts-timeleft">
-    <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-    <!-- If the function "break" is encountered all parsing will cease -->
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-        <action function="break"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-    <input pattern="(\d+) min (\d+) sec">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/he/dir/sounds.xml b/conf/rayo/lang/he/dir/sounds.xml
deleted file mode 100644
index 5fd13fffc5..0000000000
--- a/conf/rayo/lang/he/dir/sounds.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter_person.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter_person.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-specify_mininum.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="play-file" data="directory/dir-no_matching_results.wav"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-result_match.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-too_many_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-no_more_results.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-result_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-at_extension.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="play-file" data="directory/dir-to_select_entry.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_next.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_prev.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-start_new_search.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/he/he.xml b/conf/rayo/lang/he/he.xml
deleted file mode 100644
index 7cca73c1e8..0000000000
--- a/conf/rayo/lang/he/he.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<include>
-  <language name="he" sound-prefix="$${sounds_dir}/he/daniel" tts-engine="cepstral" tts-voice="daniel">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
-        <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/>
-      </macros>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/he/vm/sounds.xml b/conf/rayo/lang/he/vm/sounds.xml
deleted file mode 100644
index 917c84b038..0000000000
--- a/conf/rayo/lang/he/vm/sounds.xml
+++ /dev/null
@@ -1,417 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To listen to new messages -->
-        <action function="play-file" data="voicemail/vm-listen_new.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To listen to saved messages -->
-        <action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- For advanced options -->
-        <action function="play-file" data="voicemail/vm-advanced.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To exit -->
-        <action function="play-file" data="voicemail/vm-to_exit.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To record a greeting -->
-        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To choose greeting -->
-        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To record your name -->
-        <action function="play-file" data="voicemail/vm-record_name2.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To change password -->
-        <action function="play-file" data="voicemail/vm-change_password.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To return to main menu -->
-        <action function="play-file" data="voicemail/vm-main_menu.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-continue.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-        <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-greeting.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-person.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-        <action function="play-file" data="voicemail/vm-message_number.wav"/>
-        <action function="say" data="$2" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/pt/demo/demo-ivr-pt-BR.xml b/conf/rayo/lang/pt/demo/demo-ivr-pt-BR.xml
deleted file mode 100644
index ec7d7bccd2..0000000000
--- a/conf/rayo/lang/pt/demo/demo-ivr-pt-BR.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/demo/demo-ivr-pt-PT.xml b/conf/rayo/lang/pt/demo/demo-ivr-pt-PT.xml
deleted file mode 100644
index ec7d7bccd2..0000000000
--- a/conf/rayo/lang/pt/demo/demo-ivr-pt-PT.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/demo/demo-pt-BR.xml b/conf/rayo/lang/pt/demo/demo-pt-BR.xml
deleted file mode 100644
index 846561a541..0000000000
--- a/conf/rayo/lang/pt/demo/demo-pt-BR.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-    <macro name="msgcount">
-      <input pattern="(.*)">
-	<match>
-	  <action function="execute" data="sleep(1000)"/>
-	  <action function="play-file" data="voicemail/vm-you_have.wav"/>
-	  <action function="say" data="$1" method="pronounced" type="items"/>
-	  <action function="play-file" data="voicemail/vm-messages.wav"/>
-	  <!-- or -->
-	  <!--<action function="speak-text" data="you have $1 messages"/>-->
-	</match>
-      </input>
-    </macro>
-    <macro name="saydate">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="timespec">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="ip-addr">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="iterated" type="ip_address"/>
-	  <action function="say" data="$1" method="pronounced" type="ip_address"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell-phonetic">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="tts-timeleft">
-      <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-      <!-- If the function "break" is encountered all parsing will cease -->
-      <input pattern="(\d+):(\d+)">
-	<match>
-	  <action function="speak-text" data="Faltam $1 minutos, $2 segundos $strftime(%Y-%m-%d)"/>
-	  <action function="break"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Essa opção não é valida."/>
-	</nomatch>
-      </input>
-      <input pattern="(\d+) min (\d+) sec">
-	<match>
-	  <action function="speak-text" data="Faltam $1 minutos, $2 segundos $strftime(%Y-%m-%d)"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Essa opção não é valida."/>
-	</nomatch>
-      </input>
-    </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/demo/demo-pt-PT.xml b/conf/rayo/lang/pt/demo/demo-pt-PT.xml
deleted file mode 100644
index 34464f7a6d..0000000000
--- a/conf/rayo/lang/pt/demo/demo-pt-PT.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-    <macro name="msgcount">
-      <input pattern="(.*)">
-	<match>
-	  <action function="execute" data="sleep(1000)"/>
-	  <action function="play-file" data="voicemail/vm-you_have.wav"/>
-	  <action function="say" data="$1" method="pronounced" type="items"/>
-	  <action function="play-file" data="voicemail/vm-messages.wav"/>
-	  <!-- or -->
-	  <!--<action function="speak-text" data="Você tem $1 mensagens"/>-->
-	</match>
-      </input>
-    </macro>
-    <macro name="saydate">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="timespec">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="ip-addr">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="iterated" type="ip_address"/>
-	  <action function="say" data="$1" method="pronounced" type="ip_address"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell-phonetic">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="tts-timeleft">
-      <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-      <!-- If the function "break" is encountered all parsing will cease -->
-      <input pattern="(\d+):(\d+)">
-	<match>
-	  <action function="speak-text" data="Faltam $1 minutos, $2 segundos $strftime(%Y-%m-%d)"/>
-	  <action function="break"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Essa era uma entrada inválida."/>
-	</nomatch>
-      </input>
-      <input pattern="(\d+) min (\d+) sec">
-	<match>
-	  <action function="speak-text" data="Faltam $1 minutos, $2 segundos $strftime(%Y-%m-%d)"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Essa era uma entrada inválida."/>
-	</nomatch>
-      </input>
-    </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/dir/sounds-pt-BR.xml b/conf/rayo/lang/pt/dir/sounds-pt-BR.xml
deleted file mode 100644
index 2bdc1492ec..0000000000
--- a/conf/rayo/lang/pt/dir/sounds-pt-BR.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-enter_person.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-                <action function="play-file" data="directory/dir-enter_person.wav"/>
-                <action function="play-file" data="directory/dir-first_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-first_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-specify_mininum.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="play-file" data="directory/dir-no_matching_results.wav"/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-result_match.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-too_many_result.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-no_more_results.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-result_number.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-at_extension.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="play-file" data="directory/dir-to_select_entry.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_next.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_prev.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-start_new_search.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/dir/sounds-pt-PT.xml b/conf/rayo/lang/pt/dir/sounds-pt-PT.xml
deleted file mode 100644
index 2bdc1492ec..0000000000
--- a/conf/rayo/lang/pt/dir/sounds-pt-PT.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-enter_person.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-                <action function="play-file" data="directory/dir-enter_person.wav"/>
-                <action function="play-file" data="directory/dir-first_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-first_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-specify_mininum.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="play-file" data="directory/dir-no_matching_results.wav"/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-result_match.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-too_many_result.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-no_more_results.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-result_number.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-at_extension.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="play-file" data="directory/dir-to_select_entry.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_next.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_prev.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-start_new_search.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/dir/tts-pt-BR.xml b/conf/rayo/lang/pt/dir/tts-pt-BR.xml
deleted file mode 100644
index 71b79c60a8..0000000000
--- a/conf/rayo/lang/pt/dir/tts-pt-BR.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Por favor marque as primeiras letras do apelido da pessoa"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Por favor marque as primeiras letras do nome da pessoa"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por primeiro nome, digite $2"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por apelido, digite $2"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Você precisa dizer um mínimo de $1 letras do nome da pessoa, tente novamente."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="speak-text" data="Não foram encontrados resultados, tente novamente."/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1 resultados encontrados para a sua busca."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="A  sua busca devolveu muitos resultados, por favor tente novamente."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Não há mais resultados."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Resultado número $1"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="speak-text" data="Para escolher este resultado digite $1, Para o resultado seguinte digite $2, Para o resultado anterior digite $3, Para uma nova busca digite $4"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="No ramal $1"/>
-			</match>
-		</input>
-	</macro>
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/dir/tts-pt-PT.xml b/conf/rayo/lang/pt/dir/tts-pt-PT.xml
deleted file mode 100644
index 4f03c5abdb..0000000000
--- a/conf/rayo/lang/pt/dir/tts-pt-PT.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Por favor introduza os primeiras letras do apelido da pessoa"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Por favor introduza os primeiros dígitos do primeiro nome da pessoa"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para pesquisar por primeiro nome, marque $2"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para pesquisar por apelido, marque $2"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Você necessita de especificar um mínimo de $1 letras do nome da pessoa, tente novamente."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="speak-text" data="Não foram encontrados resultados, tente novamente."/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1 resultados encontrados para a sua pesquisa."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="A sua pesquisa devolveu demasiados resultados, por favor tente novamente."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Não há mais resultados"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Resultado número $1"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="speak-text" data="Para seleccionar este resultado marque $1, Para o resultado seguinte marque $2, Para o resultado anterior marque $3, Para iniciar uma nova pesquisa marque $4"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Na extensão $1"/>
-			</match>
-		</input>
-	</macro>
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/pt_BR.xml b/conf/rayo/lang/pt/pt_BR.xml
deleted file mode 100644
index 690ee6974c..0000000000
--- a/conf/rayo/lang/pt/pt_BR.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <language name="pt" sound-path="$${sounds_dir}/pt/BR/karina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-pt-BR.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_pt_BR_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-BR.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-BR.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
-  </language>
-</include>
diff --git a/conf/rayo/lang/pt/pt_PT.xml b/conf/rayo/lang/pt/pt_PT.xml
deleted file mode 100644
index c30b3612f1..0000000000
--- a/conf/rayo/lang/pt/pt_PT.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <language name="pt" sound-path="$${sounds_dir}/pt/PT/karina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-pt-PT.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_pt_PT_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-PT.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-PT.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
-  </language>
-</include>
diff --git a/conf/rayo/lang/pt/vm/sounds-pt-BR.xml b/conf/rayo/lang/pt/vm/sounds-pt-BR.xml
deleted file mode 100644
index 1ab472a71e..0000000000
--- a/conf/rayo/lang/pt/vm/sounds-pt-BR.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_id.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="play-file" data="digits/uma.wav"/>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/> 
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-messages.wav"/>
-	<action function="play-file" data="voicemail/vm-$2_s.wav"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To listen to new messages -->
-	<action function="play-file" data="voicemail/vm-listen_new.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To listen to saved messages -->
-	<action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- For advanced options -->
-	<action function="play-file" data="voicemail/vm-advanced.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To exit -->
-	<action function="play-file" data="voicemail/vm-to_exit.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To record a greeting -->
-	<action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To choose greeting -->
-	<action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To record your name -->
-	<action function="play-file" data="voicemail/vm-record_name2.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To change password -->
-	<action function="play-file" data="voicemail/vm-change_password.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To return to main menu -->
-	<action function="play-file" data="voicemail/vm-main_menu.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-continue.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-	<action function="play-file" data="voicemail/vm-followed_by.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-greeting.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-person.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-$1.wav"/> 
-	<action function="play-file" data="voicemail/vm-message_number.wav"/>
-	<action function="say" data="$2" method="pronounced" type="items"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack"> 
-    <input pattern="^(too-small)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-        <match>
-            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/vm/sounds-pt-PT.xml b/conf/rayo/lang/pt/vm/sounds-pt-PT.xml
deleted file mode 100644
index 587d3fe5bd..0000000000
--- a/conf/rayo/lang/pt/vm/sounds-pt-PT.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_id.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="play-file" data="digits/uma.wav"/>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-messages.wav"/>
-	<action function="play-file" data="voicemail/vm-$2_s.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To listen to new messages -->
-	<action function="play-file" data="voicemail/vm-listen_new.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To listen to saved messages -->
-	<action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- For advanced options -->
-	<action function="play-file" data="voicemail/vm-advanced.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To exit -->
-	<action function="play-file" data="voicemail/vm-to_exit.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To record a greeting -->
-	<action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To choose greeting -->
-	<action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To record your name -->
-	<action function="play-file" data="voicemail/vm-record_name2.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To change password -->
-	<action function="play-file" data="voicemail/vm-change_password.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To return to main menu -->
-	<action function="play-file" data="voicemail/vm-main_menu.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-continue.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-	<action function="play-file" data="voicemail/vm-followed_by.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-greeting.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-person.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-$1.wav"/> 
-	<action function="play-file" data="voicemail/vm-message_number.wav"/>
-	<action function="say" data="$2" method="pronounced" type="items"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack"> 
-    <input pattern="^(too-small)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-        <match>
-            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/vm/tts-pt-BR.xml b/conf/rayo/lang/pt/vm/tts-pt-BR.xml
deleted file mode 100644
index 4f770457e5..0000000000
--- a/conf/rayo/lang/pt/vm/tts-pt-BR.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor digite o seu número de usuario, e depois $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor digite a sua contrasenha, e depois $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Inicio incorreto da sessão."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Bem-vindo ao seu correio de voz."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Até logo."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Muitas tentativas fracassadas."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-	<action function="speak-text" data="Você tem 1 $1 mensagem no directório ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="speak-text" data="Você tem  $1 $2 mensagens no directório ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir as mensagens novas, digite $1, Para ouvir as mensagens armazenadas, digite $2, Para opções avançadas, digite $3, Para sair, digite $4."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para gravar a sua saudação, digite $1, Para escolher a sua saudação, digite $2, Para gravar o seu nome, digite $3, Para mudar a sua senha, digite $5, Para o menu principal, digite $5."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave o seu nome, digite qualquer tecla ou deixe de falar para finalizar a gravação."/>
-
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir a gravação, digite $1, Para guardar a gravação, digite $2, Para gravar novamente, digite $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para marcar esta mensagem como urgente, digite $1, Para continuar, digite $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="$1 não é um ramal válido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Marque o ramal para o qual pretende encaminhar esta mensagem, e depois $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Para gravar um anúncio, digite $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir a gravação novamente, press $1, Para guardar a gravação, press $2,  Para borrar a gravação, press $3, Para enviar a gravação para o seu email, press $4, Para devolver a ligação agora, press $5, Para encaminhar esta mensagem para outro ramal, press $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Escolha uma saudação entre as opções 1 e 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Valor inválido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave a sua saudação, digite qualquer tecla ou deixe de falar para finalizar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave a sua mensagem, digite qualquer tecla ou deixe de falar para finalizar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Saudação $1 selecionada."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1 não está disponível."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-	<action function="speak-text" data="$1 mensagem número $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Mensagem $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/pt/vm/tts-pt-PT.xml b/conf/rayo/lang/pt/vm/tts-pt-PT.xml
deleted file mode 100644
index c3dfc3a066..0000000000
--- a/conf/rayo/lang/pt/vm/tts-pt-PT.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor introduza o seu número de utilizador, seguido de $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor introduza a sua palavra passe, seguida de $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Falha na autenticação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Bem-vindo ao seu correio de voz."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Até breve."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Demasiadas tentativas falhadas."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-	<action function="speak-text" data="Você tem 1 $1 mensagen no directório ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="speak-text" data="Você tem $1 $2 mensagens no directório ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir as mensagens novas, marque $1, Para ouvir as mensagens guardadas, marque $2, Para opções avançadas, marque $3, Para sair, marque $4."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para gravar a sua saudação, marque $1, Para escolher a sua saudação, marque $2, Para gravar o seu nome, marque $3, Para alterar a sua palavra passe, marque $5, Para o menu principal, marque $5."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave o seu nome, pressione qualquer tecla ou deixe de falar para parar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir a gravação, marque $1, Para guardar a gravação, marque $2, Para gravar novamente, marque $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para marcar esta mensagem como urgente, marque $1, Para continuar, marque $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="$1 não é uma extensão válida."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Introduza a extensão para a qual pretende encaminhar esta mensagem, seguido de $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Para gravar um anúncio, marque $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir a gravação novamente, marque $1, Para guardar a gravação, marque $2,  Para apagar a gravação, marque $3, Para encaminhar a gravação para o seu email, marque $4, Para devolver a chamada agora, marque $5, Para encaminhar esta mensagem para outra extensão, marque $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Seleccione uma saudação entre 1 e 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="valor inválido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave a sua saudação, pressione qualquer tecla ou deixe de falar para parar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave a sua mensagem, pressione qualquer tecla ou deixe de falar para parar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Saudação $1 seleccionada."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1 não está disponível."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-	<action function="speak-text" data="$1 mensagem número $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Mensagem $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/lang/ru/demo/demo-ivr.xml b/conf/rayo/lang/ru/demo/demo-ivr.xml
deleted file mode 100644
index 7de0d7fd0d..0000000000
--- a/conf/rayo/lang/ru/demo/demo-ivr.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<include>
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="250"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="execute" data="sleep(1500)"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="execute" data="sleep(2000)"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="250">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="execute" data="sleep(2000)"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/ru/demo/demo.xml b/conf/rayo/lang/ru/demo/demo.xml
deleted file mode 100644
index 10c9dbc552..0000000000
--- a/conf/rayo/lang/ru/demo/demo.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<include>
-  <macro name="saymoney">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="currency"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <!-- or -->
-        <!--<action function="speak-text" data="you have $1 messages"/>-->
-      </match>
-    </input>
-  </macro>
-  <macro name="saydate">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="saydatetime">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec2">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="CURRENT_DATE_TIME"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr-interated">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="iterated" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell-phonetic">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="tts-timeleft">
-    <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-    <!-- If the function "break" is encountered all parsing will cease -->
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-        <action function="break"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-    <input pattern="(\d+) min (\d+) sec">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/ru/dir/sounds.xml b/conf/rayo/lang/ru/dir/sounds.xml
deleted file mode 100644
index a0dcb2c0e9..0000000000
--- a/conf/rayo/lang/ru/dir/sounds.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter-person.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter-person.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-specify_mininum_first.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="play-file" data="directory/dir-no_match_entry.wav"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-result_match.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-to_many_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-no_more_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-result_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-at_extension.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="play-file" data="directory/dir-to_select_entry.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_next.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_prev.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-to_make_new_search.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/ru/dir/tts.xml b/conf/rayo/lang/ru/dir/tts.xml
deleted file mode 100644
index f0aafa267d..0000000000
--- a/conf/rayo/lang/ru/dir/tts.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Please enter the first few digit of the person last name"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Please enter the first few digit of the person first name"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="to search by first name, press $2"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="to search by last name, press $2"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="You need to specify a minimum the first $1 letters of the person name, try again."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="Your search match no user on this system, try again."/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 result match your search"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Your search returned too many result, please try again"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="No more result"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Result number $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="speak-text" data="To select this entry press $1, for the next entry press $2, for the previous entry press $3, to make a new search press $4"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="at extension $1"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/ru/ru.xml b/conf/rayo/lang/ru/ru.xml
deleted file mode 100644
index 5f52e768a4..0000000000
--- a/conf/rayo/lang/ru/ru.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--тестовые файлы Вы звуковые файлы можно взять тут svn co http://svn.freeswitch.ru/bbv/mod_say_ru/ru/  -->
-<include>
-  <language name="ru" sound-prefix="$${sounds_dir}/ru/RU/elena" tts-engine="cepstral" tts-voice="elena">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-        <!--voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. -->
-        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-      </macros>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/ru/vm/sounds.xml b/conf/rayo/lang/ru/vm/sounds.xml
deleted file mode 100644
index 2ee9e6ec58..0000000000
--- a/conf/rayo/lang/ru/vm/sounds.xml
+++ /dev/null
@@ -1,374 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-        <!--<action function="say" data="$1" method="pronounced" type="name_spelled"/>-->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-        <!-- лишнее и так долго <action function="say" data="$1" method="pronounced" type="name_spelled"/>-->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-hello.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(\d+[0,2-9]1|[2-9]1|1):(.*)$"> <!--1, и всё что больше 20-ти 21,31,41 ..   -->
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="MESSAGES"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <!--<action function="play-file" data="voicemail/vm-in_folder.wav"/>-->
-      </match>
-    </input>
-    <!-- от 10 до 19 и ноль --> <!-- от 5до 9 и больше 20-ти 25-29 -->
-    <input pattern="^(\d+1[0-9]|1[0-9]|0|\d+[0-9][0,5-9]|[2-9][0,5-9]|[0,5-9]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="MESSAGES"/>
-        <action function="play-file" data="voicemail/vm-$2x.wav"/>
-        <action function="play-file" data="voicemail/vm-messagex.wav"/>
-        <!--<action function="play-file" data="voicemail/vm-in_folder.wav"/>-->
-      </match>
-    </input>
-    <input pattern="^(\d+[0,2-9][2-4]|[2-9][2-4]|[2-4]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="MESSAGES"/>
-        <action function="play-file" data="voicemail/vm-$2x.wav"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <action function="play-file" data="voicemail/vm-in_folder.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_new.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-advanced.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-        <action function="play-file" data="voicemail/vm-to_exit.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-record_name2.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-change_password.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-main_menu.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-continue.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-        <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-greeting.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-person.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-        <action function="play-file" data="voicemail/vm-message_number.wav"/>
-        <action function="say" data="$2" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/ru/vm/tts.xml b/conf/rayo/lang/ru/vm/tts.xml
deleted file mode 100644
index 2de4b3781e..0000000000
--- a/conf/rayo/lang/ru/vm/tts.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="please enter your i d, followed by $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="please enter your password, followed by $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="login incorrect."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="welcome to your voicemail."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="goodbye."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="too many failed attempts."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="you have 1 $1 message in folder ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="speak-text" data="you have $1 $2 messages in folder ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to new messages, press $1, To listen to saved messages, press $2, For advanced options, press $3, to exit, press $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To record a greeting, press $1, To choose a greeting, press $2, To record your name, press $3, to change your password, press $5, to return to the main menu, press $5."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="at the tone, please record your name, press any key or stop talking to end the recording."/>
-
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to the recording, press $1, To save the recording, press $2, To re record, press $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To mark this message urgent, press $1, To continue, press $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="$1 is not a valid extension."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="enter the extension you wish to forward to, then press $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="To record an announcement, press $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to the recording again, press $1, To save the recording, press $2,  To delete the recording, press $3, to forward the recording to your email, press $4, to call the caller now, press $5, To forward this message to another extension, press $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="choose a greeting between 1 and 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="invalid value."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="record your greeting at the tone, press any key or stop talking to end the recording."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="record your message at the tone, press any key or stop talking to end the recording."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="greeting $1 selected."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 is not available."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-        <action function="speak-text" data="$1 message number $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="message $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/conf/rayo/lang/sv/sv.xml b/conf/rayo/lang/sv/sv.xml
deleted file mode 100644
index f77e0221f6..0000000000
--- a/conf/rayo/lang/sv/sv.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<include>
-  <language name="sv" sound-path="$${sounds_dir}/sv/se/jakob" tts-engine="" tts-voice="">
-    <X-PRE-PROCESS cmd="include" data="ivr/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
-    <!--voicemail is purely implemented with files based one that is the default. -->
-  </language>
-</include>
diff --git a/conf/rayo/lang/sv/vm/sounds.xml b/conf/rayo/lang/sv/vm/sounds.xml
deleted file mode 100644
index aaee3c0b6b..0000000000
--- a/conf/rayo/lang/sv/vm/sounds.xml
+++ /dev/null
@@ -1,504 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-knappa_in_din_anknytning_foljt_av.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-knappa_in_ditt_pinnummer_foljt_av.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-felaktig_inloggning.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<!--<action function="play-file" data="voicemail/vm-hej.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-hejda.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-for_manga_felaktiga_forsok.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-	<!-- 
-	Pattern matching needed:
-		0:*
-		1:new
-		*:new
-			:saved
-			:urgent
-			:urgent-new
-			:urgent-saved
-	-->
-	<input pattern="^(0):(.*)$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="play-file" data="voicemail/vm-inga.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelanden.wav"/>
-		</match>
-	</input>
-	<input pattern="^(1):new$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items" gender="utrum"/>
-			<action function="play-file" data="voicemail/vm-nytt.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelande..wav"/>
-		</match>
-	</input>
-	<input pattern="^(\d+):new$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items"/>
-			<action function="play-file" data="voicemail/vm-nya.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelanden.wav"/>
-		</match>
-	</input>
-	<input pattern="^(1):saved$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items" gender="utrum"/>
-			<action function="play-file" data="voicemail/vm-sparat.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelande..wav"/>
-		</match>
-	</input>
-	<input pattern="^(\d+):saved$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items"/>
-			<action function="play-file" data="voicemail/vm-sparade.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelanden.wav"/>
-		</match>
-	</input>
-	<input pattern="^(1):urgent$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items" gender="utrum"/>
-			<action function="play-file" data="voicemail/vm-viktigt.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelande..wav"/>
-		</match>
-	</input>
-	<input pattern="^(\d+):urgent$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items"/>
-			<action function="play-file" data="voicemail/vm-viktiga.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelanden.wav"/>
-		</match>
-	</input>
-	<input pattern="^(1):urgent-new$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items" gender="utrum"/>
-			<action function="play-file" data="voicemail/vm-viktigt_nytt.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelande..wav"/>
-		</match>
-	</input>
-	<input pattern="^(\d+):urgent-new$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items"/>
-			<action function="play-file" data="voicemail/vm-viktiga_nya.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelanden.wav"/>
-		</match>
-	</input>
-	<input pattern="^(1):urgent-saved$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items" gender="utrum"/>
-			<action function="play-file" data="voicemail/vm-viktigt_sparat.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelande..wav"/>
-		</match>
-	</input>
-	<input pattern="^(\d+):urgent-saved$" break_on_match="true">
-		<match>
-			<action function="play-file" data="voicemail/vm-du_har.wav"/>
-			<action function="say" data="$1" method="pronounced" type="items"/>
-			<action function="play-file" data="voicemail/vm-viktiga_sparade.wav"/> 
-			<action function="play-file" data="voicemail/vm-meddelanden.wav"/>
-		</match>
-	</input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To listen to new messages -->
-	<action function="play-file" data="voicemail/vm-for_att_lyssna_pa_nya_meddelanden.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-
-	<!-- To listen to saved messages -->
-	<action function="play-file" data="voicemail/vm-for_att_lyssna_pa_sparade_meddelanden.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-
-	<!-- For advanced options -->
-	<action function="play-file" data="voicemail/vm-for_avancerade_installningar.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-
-	<!-- To exit -->
-	<action function="play-file" data="voicemail/vm-for_att_avsluta.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To record a greeting -->
-	<action function="play-file" data="voicemail/vm-for_att_spela_in_en_halsning.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-
-	<!-- To choose greeting -->
-	<action function="play-file" data="voicemail/vm-for_att_valja_utgaende_meddelande.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-
-	<!-- To record your name -->
-	<action function="play-file" data="voicemail/vm-for_att_spela_in_ditt_namn.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-
-	<!-- To change password -->
-	<action function="play-file" data="voicemail/vm-for_att_byta_losenord.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-
-	<!-- To return to main menu -->
-	<action function="play-file" data="voicemail/vm-for_att_lyssna_till_huvudmenyn.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-efter_tonen_kan_du_spela_in_ditt_namn.wav"/>
-	<action function="play-file" data="voicemail/vm-for_att_avsluta_inspelningen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck_valfri_knapp_eller_sluta_prata.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-for_att_lyssna_pa_inspelningen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_spara_inspelningen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_spela_in_igen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-for_att_markera_detta_meddelande_viktigt.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_fortsatta.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-for_att_infoga_en_introduktion_till_detta_meddelande.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_skicka_detta_meddelande_nu.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-knappa_in_anknytningen_att_vidarebefordra_detta_meddelande_till.wav"/>
-	<action function="play-file" data="voicemail/vm-foljt_av.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-det_var_en_felaktig_anknytning.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-for_att_lyssna_pa_inspelningen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_spara_meddelandet.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_radera_inspelningen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_vidarebefordra_detta_meddelande_till_din_epost.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_ringa_tillbaka_nu.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_vidarebefordra_detta_meddelande.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-for_att_lyssna_pa_inspelningen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_spara_meddelandet.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_radera_inspelningen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_ringa_tillbaka_nu.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(200)"/>
-	<action function="play-file" data="voicemail/vm-for_att_vidarebefordra_detta_meddelande.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-valj_en_halsning_mellan_1_och_9.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-det_var_ett_felaktigt_val.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-spela_in_din_halsning_efter_tonen.wav"/>
-	<action function="play-file" data="voicemail/vm-for_att_avsluta_inspelningen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck_valfri_knapp_eller_sluta_prata.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-spela_in_ditt_meddelande_efter_tonen.wav"/>
-	<action function="play-file" data="voicemail/vm-for_att_avsluta_inspelningen.wav"/>
-	<action function="play-file" data="voicemail/vm-tryck_valfri_knapp_eller_sluta_prata.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-meddelande_nummer.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-markerad.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-personen_med_anknytning.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-not_ar_inte_tillganglig.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-$1.wav"/> 
-	<action function="play-file" data="voicemail/vm-meddelande_nummer.wav"/>
-	<action function="say" data="$2" method="pronounced" type="items"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack"> 
-    <input pattern="^(too-small)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-din_inspelning_ar_kortare_an_tillaten_langd_vanligen_forsok_igen.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-meddelande.wav"/>
-	<action function="play-file" data="voicemail/vm-raderat.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-meddelande.wav"/>
-	<action function="play-file" data="voicemail/vm-sparat.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-meddelande.wav"/>
-	<action function="play-file" data="voicemail/vm-skickat_pa_epost.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-meddelande.wav"/>
-	<action function="play-file" data="voicemail/vm-markerat_som_viktigt.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-        <match>
-            <action function="play-file" data="voicemail/vm-den_rostbrevladan_ar_full_vanligen_forsok_ringa_senare.wav"/>
-        </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/conf/rayo/mime.types b/conf/rayo/mime.types
deleted file mode 100644
index b680b3327d..0000000000
--- a/conf/rayo/mime.types
+++ /dev/null
@@ -1,1609 +0,0 @@
-#
-# MIME type configs overriden by the FreeSWITCH project.
-#
-audio/mpeg					mp3 mpga mp2 mp2a m2a m3a
-image/jpeg					jpg jpeg jpe
-#
-# Additional MIME types added by the FreeSWITCH project.  Any duplicate file extensions listed here will only be
-# used to map from MIME -> extension and not extension -> MIME
-audio/x-mpeg					mp3
-audio/mp3					mp3
-audio/x-mp3					mp3
-audio/mpeg3					mp3
-audio/x-mpeg3					mp3
-audio/mpg					mp3
-audio/x-mpegaudio				mp3
-audio/x-wave					wav
-audio/wave					wav
-#
-# The section below was taken from Apache httpd Project at
-# <https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types>
-#
-# This file maps Internet media types to unique file extension(s).
-# Although created for httpd, this file is used by many software systems
-# and has been placed in the public domain for unlimited redisribution.
-#
-# The table below contains both registered and (common) unregistered types.
-# A type that has no unique extension can be ignored -- they are listed
-# here to guide configurations toward known types and to make it easier to
-# identify "new" types.  File extensions are also commonly used to indicate
-# content languages and encodings, so choose them carefully.
-#
-# Internet media types should be registered as described in RFC 4288.
-# The registry is at <http://www.iana.org/assignments/media-types/>.
-#
-# MIME type (lowercased)			Extensions
-# ============================================	==========
-# application/1d-interleaved-parityfec
-# application/3gpp-ims+xml
-# application/activemessage
-application/andrew-inset			ez
-# application/applefile
-application/applixware				aw
-application/atom+xml				atom
-application/atomcat+xml				atomcat
-# application/atomicmail
-application/atomsvc+xml				atomsvc
-# application/auth-policy+xml
-# application/batch-smtp
-# application/beep+xml
-# application/calendar+xml
-# application/cals-1840
-# application/ccmp+xml
-application/ccxml+xml				ccxml
-application/cdmi-capability			cdmia
-application/cdmi-container			cdmic
-application/cdmi-domain				cdmid
-application/cdmi-object				cdmio
-application/cdmi-queue				cdmiq
-# application/cea-2018+xml
-# application/cellml+xml
-# application/cfw
-# application/cnrp+xml
-# application/commonground
-# application/conference-info+xml
-# application/cpl+xml
-# application/csta+xml
-# application/cstadata+xml
-application/cu-seeme				cu
-# application/cybercash
-application/davmount+xml			davmount
-# application/dca-rft
-# application/dec-dx
-# application/dialog-info+xml
-# application/dicom
-# application/dns
-application/docbook+xml				dbk
-# application/dskpp+xml
-application/dssc+der				dssc
-application/dssc+xml				xdssc
-# application/dvcs
-application/ecmascript				ecma
-# application/edi-consent
-# application/edi-x12
-# application/edifact
-application/emma+xml				emma
-# application/epp+xml
-application/epub+zip				epub
-# application/eshop
-# application/example
-application/exi					exi
-# application/fastinfoset
-# application/fastsoap
-# application/fits
-application/font-tdpfr				pfr
-# application/framework-attributes+xml
-application/gml+xml				gml
-application/gpx+xml				gpx
-application/gxf					gxf
-# application/h224
-# application/held+xml
-# application/http
-application/hyperstudio				stk
-# application/ibe-key-request+xml
-# application/ibe-pkg-reply+xml
-# application/ibe-pp-data
-# application/iges
-# application/im-iscomposing+xml
-# application/index
-# application/index.cmd
-# application/index.obj
-# application/index.response
-# application/index.vnd
-application/inkml+xml				ink inkml
-# application/iotp
-application/ipfix				ipfix
-# application/ipp
-# application/isup
-application/java-archive			jar
-application/java-serialized-object		ser
-application/java-vm				class
-application/javascript				js
-application/json				json
-application/jsonml+json				jsonml
-# application/kpml-request+xml
-# application/kpml-response+xml
-application/lost+xml				lostxml
-application/mac-binhex40			hqx
-application/mac-compactpro			cpt
-# application/macwriteii
-application/mads+xml				mads
-application/marc				mrc
-application/marcxml+xml				mrcx
-application/mathematica				ma nb mb
-# application/mathml-content+xml
-# application/mathml-presentation+xml
-application/mathml+xml				mathml
-# application/mbms-associated-procedure-description+xml
-# application/mbms-deregister+xml
-# application/mbms-envelope+xml
-# application/mbms-msk+xml
-# application/mbms-msk-response+xml
-# application/mbms-protection-description+xml
-# application/mbms-reception-report+xml
-# application/mbms-register+xml
-# application/mbms-register-response+xml
-# application/mbms-user-service-description+xml
-application/mbox				mbox
-# application/media_control+xml
-application/mediaservercontrol+xml		mscml
-application/metalink+xml			metalink
-application/metalink4+xml			meta4
-application/mets+xml				mets
-# application/mikey
-application/mods+xml				mods
-# application/moss-keys
-# application/moss-signature
-# application/mosskey-data
-# application/mosskey-request
-application/mp21				m21 mp21
-application/mp4					mp4s
-# application/mpeg4-generic
-# application/mpeg4-iod
-# application/mpeg4-iod-xmt
-# application/msc-ivr+xml
-# application/msc-mixer+xml
-application/msword				doc dot
-application/mxf					mxf
-# application/nasdata
-# application/news-checkgroups
-# application/news-groupinfo
-# application/news-transmission
-# application/nss
-# application/ocsp-request
-# application/ocsp-response
-application/octet-stream	bin dms lrf mar so dist distz pkg bpk dump elc deploy
-application/oda					oda
-application/oebps-package+xml			opf
-application/ogg					ogx
-application/omdoc+xml				omdoc
-application/onenote				onetoc onetoc2 onetmp onepkg
-application/oxps				oxps
-# application/parityfec
-application/patch-ops-error+xml			xer
-application/pdf					pdf
-application/pgp-encrypted			pgp
-# application/pgp-keys
-application/pgp-signature			asc sig
-application/pics-rules				prf
-# application/pidf+xml
-# application/pidf-diff+xml
-application/pkcs10				p10
-application/pkcs7-mime				p7m p7c
-application/pkcs7-signature			p7s
-application/pkcs8				p8
-application/pkix-attr-cert			ac
-application/pkix-cert				cer
-application/pkix-crl				crl
-application/pkix-pkipath			pkipath
-application/pkixcmp				pki
-application/pls+xml				pls
-# application/poc-settings+xml
-application/postscript				ai eps ps
-# application/prs.alvestrand.titrax-sheet
-application/prs.cww				cww
-# application/prs.nprend
-# application/prs.plucker
-# application/prs.rdf-xml-crypt
-# application/prs.xsf+xml
-application/pskc+xml				pskcxml
-# application/qsig
-application/rdf+xml				rdf
-application/reginfo+xml				rif
-application/relax-ng-compact-syntax		rnc
-# application/remote-printing
-application/resource-lists+xml			rl
-application/resource-lists-diff+xml		rld
-# application/riscos
-# application/rlmi+xml
-application/rls-services+xml			rs
-application/rpki-ghostbusters			gbr
-application/rpki-manifest			mft
-application/rpki-roa				roa
-# application/rpki-updown
-application/rsd+xml				rsd
-application/rss+xml				rss
-application/rtf					rtf
-# application/rtx
-# application/samlassertion+xml
-# application/samlmetadata+xml
-application/sbml+xml				sbml
-application/scvp-cv-request			scq
-application/scvp-cv-response			scs
-application/scvp-vp-request			spq
-application/scvp-vp-response			spp
-application/sdp					sdp
-# application/set-payment
-application/set-payment-initiation		setpay
-# application/set-registration
-application/set-registration-initiation		setreg
-# application/sgml
-# application/sgml-open-catalog
-application/shf+xml				shf
-# application/sieve
-# application/simple-filter+xml
-# application/simple-message-summary
-# application/simplesymbolcontainer
-# application/slate
-# application/smil
-application/smil+xml				smi smil
-# application/soap+fastinfoset
-# application/soap+xml
-application/sparql-query			rq
-application/sparql-results+xml			srx
-# application/spirits-event+xml
-application/srgs				gram
-application/srgs+xml				grxml
-application/sru+xml				sru
-application/ssdl+xml				ssdl
-application/ssml+xml				ssml
-# application/tamp-apex-update
-# application/tamp-apex-update-confirm
-# application/tamp-community-update
-# application/tamp-community-update-confirm
-# application/tamp-error
-# application/tamp-sequence-adjust
-# application/tamp-sequence-adjust-confirm
-# application/tamp-status-query
-# application/tamp-status-response
-# application/tamp-update
-# application/tamp-update-confirm
-application/tei+xml				tei teicorpus
-application/thraud+xml				tfi
-# application/timestamp-query
-# application/timestamp-reply
-application/timestamped-data			tsd
-# application/tve-trigger
-# application/ulpfec
-# application/vcard+xml
-# application/vemmi
-# application/vividence.scriptfile
-# application/vnd.3gpp.bsf+xml
-application/vnd.3gpp.pic-bw-large		plb
-application/vnd.3gpp.pic-bw-small		psb
-application/vnd.3gpp.pic-bw-var			pvb
-# application/vnd.3gpp.sms
-# application/vnd.3gpp2.bcmcsinfo+xml
-# application/vnd.3gpp2.sms
-application/vnd.3gpp2.tcap			tcap
-application/vnd.3m.post-it-notes		pwn
-application/vnd.accpac.simply.aso		aso
-application/vnd.accpac.simply.imp		imp
-application/vnd.acucobol			acu
-application/vnd.acucorp				atc acutc
-application/vnd.adobe.air-application-installer-package+zip	air
-application/vnd.adobe.formscentral.fcdt		fcdt
-application/vnd.adobe.fxp			fxp fxpl
-# application/vnd.adobe.partial-upload
-application/vnd.adobe.xdp+xml			xdp
-application/vnd.adobe.xfdf			xfdf
-# application/vnd.aether.imp
-# application/vnd.ah-barcode
-application/vnd.ahead.space			ahead
-application/vnd.airzip.filesecure.azf		azf
-application/vnd.airzip.filesecure.azs		azs
-application/vnd.amazon.ebook			azw
-application/vnd.americandynamics.acc		acc
-application/vnd.amiga.ami			ami
-# application/vnd.amundsen.maze+xml
-application/vnd.android.package-archive		apk
-application/vnd.anser-web-certificate-issue-initiation	cii
-application/vnd.anser-web-funds-transfer-initiation	fti
-application/vnd.antix.game-component		atx
-application/vnd.apple.installer+xml		mpkg
-application/vnd.apple.mpegurl			m3u8
-# application/vnd.arastra.swi
-application/vnd.aristanetworks.swi		swi
-application/vnd.astraea-software.iota		iota
-application/vnd.audiograph			aep
-# application/vnd.autopackage
-# application/vnd.avistar+xml
-application/vnd.blueice.multipass		mpm
-# application/vnd.bluetooth.ep.oob
-application/vnd.bmi				bmi
-application/vnd.businessobjects			rep
-# application/vnd.cab-jscript
-# application/vnd.canon-cpdl
-# application/vnd.canon-lips
-# application/vnd.cendio.thinlinc.clientconf
-application/vnd.chemdraw+xml			cdxml
-application/vnd.chipnuts.karaoke-mmd		mmd
-application/vnd.cinderella			cdy
-# application/vnd.cirpack.isdn-ext
-application/vnd.claymore			cla
-application/vnd.cloanto.rp9			rp9
-application/vnd.clonk.c4group			c4g c4d c4f c4p c4u
-application/vnd.cluetrust.cartomobile-config		c11amc
-application/vnd.cluetrust.cartomobile-config-pkg	c11amz
-# application/vnd.collection+json
-# application/vnd.commerce-battelle
-application/vnd.commonspace			csp
-application/vnd.contact.cmsg			cdbcmsg
-application/vnd.cosmocaller			cmc
-application/vnd.crick.clicker			clkx
-application/vnd.crick.clicker.keyboard		clkk
-application/vnd.crick.clicker.palette		clkp
-application/vnd.crick.clicker.template		clkt
-application/vnd.crick.clicker.wordbank		clkw
-application/vnd.criticaltools.wbs+xml		wbs
-application/vnd.ctc-posml			pml
-# application/vnd.ctct.ws+xml
-# application/vnd.cups-pdf
-# application/vnd.cups-postscript
-application/vnd.cups-ppd			ppd
-# application/vnd.cups-raster
-# application/vnd.cups-raw
-# application/vnd.curl
-application/vnd.curl.car			car
-application/vnd.curl.pcurl			pcurl
-# application/vnd.cybank
-application/vnd.dart				dart
-application/vnd.data-vision.rdz			rdz
-application/vnd.dece.data			uvf uvvf uvd uvvd
-application/vnd.dece.ttml+xml			uvt uvvt
-application/vnd.dece.unspecified		uvx uvvx
-application/vnd.dece.zip			uvz uvvz
-application/vnd.denovo.fcselayout-link		fe_launch
-# application/vnd.dir-bi.plate-dl-nosuffix
-application/vnd.dna				dna
-application/vnd.dolby.mlp			mlp
-# application/vnd.dolby.mobile.1
-# application/vnd.dolby.mobile.2
-application/vnd.dpgraph				dpg
-application/vnd.dreamfactory			dfac
-application/vnd.ds-keypoint			kpxx
-application/vnd.dvb.ait				ait
-# application/vnd.dvb.dvbj
-# application/vnd.dvb.esgcontainer
-# application/vnd.dvb.ipdcdftnotifaccess
-# application/vnd.dvb.ipdcesgaccess
-# application/vnd.dvb.ipdcesgaccess2
-# application/vnd.dvb.ipdcesgpdd
-# application/vnd.dvb.ipdcroaming
-# application/vnd.dvb.iptv.alfec-base
-# application/vnd.dvb.iptv.alfec-enhancement
-# application/vnd.dvb.notif-aggregate-root+xml
-# application/vnd.dvb.notif-container+xml
-# application/vnd.dvb.notif-generic+xml
-# application/vnd.dvb.notif-ia-msglist+xml
-# application/vnd.dvb.notif-ia-registration-request+xml
-# application/vnd.dvb.notif-ia-registration-response+xml
-# application/vnd.dvb.notif-init+xml
-# application/vnd.dvb.pfr
-application/vnd.dvb.service			svc
-# application/vnd.dxr
-application/vnd.dynageo				geo
-# application/vnd.easykaraoke.cdgdownload
-# application/vnd.ecdis-update
-application/vnd.ecowin.chart			mag
-# application/vnd.ecowin.filerequest
-# application/vnd.ecowin.fileupdate
-# application/vnd.ecowin.series
-# application/vnd.ecowin.seriesrequest
-# application/vnd.ecowin.seriesupdate
-# application/vnd.emclient.accessrequest+xml
-application/vnd.enliven				nml
-# application/vnd.eprints.data+xml
-application/vnd.epson.esf			esf
-application/vnd.epson.msf			msf
-application/vnd.epson.quickanime		qam
-application/vnd.epson.salt			slt
-application/vnd.epson.ssf			ssf
-# application/vnd.ericsson.quickcall
-application/vnd.eszigno3+xml			es3 et3
-# application/vnd.etsi.aoc+xml
-# application/vnd.etsi.cug+xml
-# application/vnd.etsi.iptvcommand+xml
-# application/vnd.etsi.iptvdiscovery+xml
-# application/vnd.etsi.iptvprofile+xml
-# application/vnd.etsi.iptvsad-bc+xml
-# application/vnd.etsi.iptvsad-cod+xml
-# application/vnd.etsi.iptvsad-npvr+xml
-# application/vnd.etsi.iptvservice+xml
-# application/vnd.etsi.iptvsync+xml
-# application/vnd.etsi.iptvueprofile+xml
-# application/vnd.etsi.mcid+xml
-# application/vnd.etsi.overload-control-policy-dataset+xml
-# application/vnd.etsi.sci+xml
-# application/vnd.etsi.simservs+xml
-# application/vnd.etsi.tsl+xml
-# application/vnd.etsi.tsl.der
-# application/vnd.eudora.data
-application/vnd.ezpix-album			ez2
-application/vnd.ezpix-package			ez3
-# application/vnd.f-secure.mobile
-application/vnd.fdf				fdf
-application/vnd.fdsn.mseed			mseed
-application/vnd.fdsn.seed			seed dataless
-# application/vnd.ffsns
-# application/vnd.fints
-application/vnd.flographit			gph
-application/vnd.fluxtime.clip			ftc
-# application/vnd.font-fontforge-sfd
-application/vnd.framemaker			fm frame maker book
-application/vnd.frogans.fnc			fnc
-application/vnd.frogans.ltf			ltf
-application/vnd.fsc.weblaunch			fsc
-application/vnd.fujitsu.oasys			oas
-application/vnd.fujitsu.oasys2			oa2
-application/vnd.fujitsu.oasys3			oa3
-application/vnd.fujitsu.oasysgp			fg5
-application/vnd.fujitsu.oasysprs		bh2
-# application/vnd.fujixerox.art-ex
-# application/vnd.fujixerox.art4
-# application/vnd.fujixerox.hbpl
-application/vnd.fujixerox.ddd			ddd
-application/vnd.fujixerox.docuworks		xdw
-application/vnd.fujixerox.docuworks.binder	xbd
-# application/vnd.fut-misnet
-application/vnd.fuzzysheet			fzs
-application/vnd.genomatix.tuxedo		txd
-# application/vnd.geocube+xml
-application/vnd.geogebra.file			ggb
-application/vnd.geogebra.tool			ggt
-application/vnd.geometry-explorer		gex gre
-application/vnd.geonext				gxt
-application/vnd.geoplan				g2w
-application/vnd.geospace			g3w
-# application/vnd.globalplatform.card-content-mgt
-# application/vnd.globalplatform.card-content-mgt-response
-application/vnd.gmx				gmx
-application/vnd.google-earth.kml+xml		kml
-application/vnd.google-earth.kmz		kmz
-application/vnd.grafeq				gqf gqs
-# application/vnd.gridmp
-application/vnd.groove-account			gac
-application/vnd.groove-help			ghf
-application/vnd.groove-identity-message		gim
-application/vnd.groove-injector			grv
-application/vnd.groove-tool-message		gtm
-application/vnd.groove-tool-template		tpl
-application/vnd.groove-vcard			vcg
-# application/vnd.hal+json
-application/vnd.hal+xml				hal
-application/vnd.handheld-entertainment+xml	zmm
-application/vnd.hbci				hbci
-# application/vnd.hcl-bireports
-application/vnd.hhe.lesson-player		les
-application/vnd.hp-hpgl				hpgl
-application/vnd.hp-hpid				hpid
-application/vnd.hp-hps				hps
-application/vnd.hp-jlyt				jlt
-application/vnd.hp-pcl				pcl
-application/vnd.hp-pclxl			pclxl
-# application/vnd.httphone
-application/vnd.hydrostatix.sof-data		sfd-hdstx
-# application/vnd.hzn-3d-crossword
-# application/vnd.ibm.afplinedata
-# application/vnd.ibm.electronic-media
-application/vnd.ibm.minipay			mpy
-application/vnd.ibm.modcap			afp listafp list3820
-application/vnd.ibm.rights-management		irm
-application/vnd.ibm.secure-container		sc
-application/vnd.iccprofile			icc icm
-application/vnd.igloader			igl
-application/vnd.immervision-ivp			ivp
-application/vnd.immervision-ivu			ivu
-# application/vnd.informedcontrol.rms+xml
-# application/vnd.informix-visionary
-# application/vnd.infotech.project
-# application/vnd.infotech.project+xml
-# application/vnd.innopath.wamp.notification
-application/vnd.insors.igm			igm
-application/vnd.intercon.formnet		xpw xpx
-application/vnd.intergeo			i2g
-# application/vnd.intertrust.digibox
-# application/vnd.intertrust.nncp
-application/vnd.intu.qbo			qbo
-application/vnd.intu.qfx			qfx
-# application/vnd.iptc.g2.conceptitem+xml
-# application/vnd.iptc.g2.knowledgeitem+xml
-# application/vnd.iptc.g2.newsitem+xml
-# application/vnd.iptc.g2.newsmessage+xml
-# application/vnd.iptc.g2.packageitem+xml
-# application/vnd.iptc.g2.planningitem+xml
-application/vnd.ipunplugged.rcprofile		rcprofile
-application/vnd.irepository.package+xml		irp
-application/vnd.is-xpr				xpr
-application/vnd.isac.fcs			fcs
-application/vnd.jam				jam
-# application/vnd.japannet-directory-service
-# application/vnd.japannet-jpnstore-wakeup
-# application/vnd.japannet-payment-wakeup
-# application/vnd.japannet-registration
-# application/vnd.japannet-registration-wakeup
-# application/vnd.japannet-setstore-wakeup
-# application/vnd.japannet-verification
-# application/vnd.japannet-verification-wakeup
-application/vnd.jcp.javame.midlet-rms		rms
-application/vnd.jisp				jisp
-application/vnd.joost.joda-archive		joda
-application/vnd.kahootz				ktz ktr
-application/vnd.kde.karbon			karbon
-application/vnd.kde.kchart			chrt
-application/vnd.kde.kformula			kfo
-application/vnd.kde.kivio			flw
-application/vnd.kde.kontour			kon
-application/vnd.kde.kpresenter			kpr kpt
-application/vnd.kde.kspread			ksp
-application/vnd.kde.kword			kwd kwt
-application/vnd.kenameaapp			htke
-application/vnd.kidspiration			kia
-application/vnd.kinar				kne knp
-application/vnd.koan				skp skd skt skm
-application/vnd.kodak-descriptor		sse
-application/vnd.las.las+xml			lasxml
-# application/vnd.liberty-request+xml
-application/vnd.llamagraphics.life-balance.desktop	lbd
-application/vnd.llamagraphics.life-balance.exchange+xml	lbe
-application/vnd.lotus-1-2-3			123
-application/vnd.lotus-approach			apr
-application/vnd.lotus-freelance			pre
-application/vnd.lotus-notes			nsf
-application/vnd.lotus-organizer			org
-application/vnd.lotus-screencam			scm
-application/vnd.lotus-wordpro			lwp
-application/vnd.macports.portpkg		portpkg
-# application/vnd.marlin.drm.actiontoken+xml
-# application/vnd.marlin.drm.conftoken+xml
-# application/vnd.marlin.drm.license+xml
-# application/vnd.marlin.drm.mdcf
-application/vnd.mcd				mcd
-application/vnd.medcalcdata			mc1
-application/vnd.mediastation.cdkey		cdkey
-# application/vnd.meridian-slingshot
-application/vnd.mfer				mwf
-application/vnd.mfmp				mfm
-application/vnd.micrografx.flo			flo
-application/vnd.micrografx.igx			igx
-application/vnd.mif				mif
-# application/vnd.minisoft-hp3000-save
-# application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf			daf
-application/vnd.mobius.dis			dis
-application/vnd.mobius.mbk			mbk
-application/vnd.mobius.mqy			mqy
-application/vnd.mobius.msl			msl
-application/vnd.mobius.plc			plc
-application/vnd.mobius.txf			txf
-application/vnd.mophun.application		mpn
-application/vnd.mophun.certificate		mpc
-# application/vnd.motorola.flexsuite
-# application/vnd.motorola.flexsuite.adsi
-# application/vnd.motorola.flexsuite.fis
-# application/vnd.motorola.flexsuite.gotap
-# application/vnd.motorola.flexsuite.kmr
-# application/vnd.motorola.flexsuite.ttc
-# application/vnd.motorola.flexsuite.wem
-# application/vnd.motorola.iprm
-application/vnd.mozilla.xul+xml			xul
-application/vnd.ms-artgalry			cil
-# application/vnd.ms-asf
-application/vnd.ms-cab-compressed		cab
-# application/vnd.ms-color.iccprofile
-application/vnd.ms-excel			xls xlm xla xlc xlt xlw
-application/vnd.ms-excel.addin.macroenabled.12		xlam
-application/vnd.ms-excel.sheet.binary.macroenabled.12	xlsb
-application/vnd.ms-excel.sheet.macroenabled.12		xlsm
-application/vnd.ms-excel.template.macroenabled.12	xltm
-application/vnd.ms-fontobject			eot
-application/vnd.ms-htmlhelp			chm
-application/vnd.ms-ims				ims
-application/vnd.ms-lrm				lrm
-# application/vnd.ms-office.activex+xml
-application/vnd.ms-officetheme			thmx
-# application/vnd.ms-opentype
-# application/vnd.ms-package.obfuscated-opentype
-application/vnd.ms-pki.seccat			cat
-application/vnd.ms-pki.stl			stl
-# application/vnd.ms-playready.initiator+xml
-application/vnd.ms-powerpoint			ppt pps pot
-application/vnd.ms-powerpoint.addin.macroenabled.12		ppam
-application/vnd.ms-powerpoint.presentation.macroenabled.12	pptm
-application/vnd.ms-powerpoint.slide.macroenabled.12		sldm
-application/vnd.ms-powerpoint.slideshow.macroenabled.12		ppsm
-application/vnd.ms-powerpoint.template.macroenabled.12		potm
-# application/vnd.ms-printing.printticket+xml
-application/vnd.ms-project			mpp mpt
-# application/vnd.ms-tnef
-# application/vnd.ms-wmdrm.lic-chlg-req
-# application/vnd.ms-wmdrm.lic-resp
-# application/vnd.ms-wmdrm.meter-chlg-req
-# application/vnd.ms-wmdrm.meter-resp
-application/vnd.ms-word.document.macroenabled.12	docm
-application/vnd.ms-word.template.macroenabled.12	dotm
-application/vnd.ms-works			wps wks wcm wdb
-application/vnd.ms-wpl				wpl
-application/vnd.ms-xpsdocument			xps
-application/vnd.mseq				mseq
-# application/vnd.msign
-# application/vnd.multiad.creator
-# application/vnd.multiad.creator.cif
-# application/vnd.music-niff
-application/vnd.musician			mus
-application/vnd.muvee.style			msty
-application/vnd.mynfc				taglet
-# application/vnd.ncd.control
-# application/vnd.ncd.reference
-# application/vnd.nervana
-# application/vnd.netfpx
-application/vnd.neurolanguage.nlu		nlu
-application/vnd.nitf				ntf nitf
-application/vnd.noblenet-directory		nnd
-application/vnd.noblenet-sealer			nns
-application/vnd.noblenet-web			nnw
-# application/vnd.nokia.catalogs
-# application/vnd.nokia.conml+wbxml
-# application/vnd.nokia.conml+xml
-# application/vnd.nokia.isds-radio-presets
-# application/vnd.nokia.iptv.config+xml
-# application/vnd.nokia.landmark+wbxml
-# application/vnd.nokia.landmark+xml
-# application/vnd.nokia.landmarkcollection+xml
-# application/vnd.nokia.n-gage.ac+xml
-application/vnd.nokia.n-gage.data		ngdat
-application/vnd.nokia.n-gage.symbian.install	n-gage
-# application/vnd.nokia.ncd
-# application/vnd.nokia.pcd+wbxml
-# application/vnd.nokia.pcd+xml
-application/vnd.nokia.radio-preset		rpst
-application/vnd.nokia.radio-presets		rpss
-application/vnd.novadigm.edm			edm
-application/vnd.novadigm.edx			edx
-application/vnd.novadigm.ext			ext
-# application/vnd.ntt-local.file-transfer
-# application/vnd.ntt-local.sip-ta_remote
-# application/vnd.ntt-local.sip-ta_tcp_stream
-application/vnd.oasis.opendocument.chart		odc
-application/vnd.oasis.opendocument.chart-template	otc
-application/vnd.oasis.opendocument.database		odb
-application/vnd.oasis.opendocument.formula		odf
-application/vnd.oasis.opendocument.formula-template	odft
-application/vnd.oasis.opendocument.graphics		odg
-application/vnd.oasis.opendocument.graphics-template	otg
-application/vnd.oasis.opendocument.image		odi
-application/vnd.oasis.opendocument.image-template	oti
-application/vnd.oasis.opendocument.presentation		odp
-application/vnd.oasis.opendocument.presentation-template	otp
-application/vnd.oasis.opendocument.spreadsheet		ods
-application/vnd.oasis.opendocument.spreadsheet-template	ots
-application/vnd.oasis.opendocument.text			odt
-application/vnd.oasis.opendocument.text-master		odm
-application/vnd.oasis.opendocument.text-template	ott
-application/vnd.oasis.opendocument.text-web		oth
-# application/vnd.obn
-# application/vnd.oftn.l10n+json
-# application/vnd.oipf.contentaccessdownload+xml
-# application/vnd.oipf.contentaccessstreaming+xml
-# application/vnd.oipf.cspg-hexbinary
-# application/vnd.oipf.dae.svg+xml
-# application/vnd.oipf.dae.xhtml+xml
-# application/vnd.oipf.mippvcontrolmessage+xml
-# application/vnd.oipf.pae.gem
-# application/vnd.oipf.spdiscovery+xml
-# application/vnd.oipf.spdlist+xml
-# application/vnd.oipf.ueprofile+xml
-# application/vnd.oipf.userprofile+xml
-application/vnd.olpc-sugar			xo
-# application/vnd.oma-scws-config
-# application/vnd.oma-scws-http-request
-# application/vnd.oma-scws-http-response
-# application/vnd.oma.bcast.associated-procedure-parameter+xml
-# application/vnd.oma.bcast.drm-trigger+xml
-# application/vnd.oma.bcast.imd+xml
-# application/vnd.oma.bcast.ltkm
-# application/vnd.oma.bcast.notification+xml
-# application/vnd.oma.bcast.provisioningtrigger
-# application/vnd.oma.bcast.sgboot
-# application/vnd.oma.bcast.sgdd+xml
-# application/vnd.oma.bcast.sgdu
-# application/vnd.oma.bcast.simple-symbol-container
-# application/vnd.oma.bcast.smartcard-trigger+xml
-# application/vnd.oma.bcast.sprov+xml
-# application/vnd.oma.bcast.stkm
-# application/vnd.oma.cab-address-book+xml
-# application/vnd.oma.cab-feature-handler+xml
-# application/vnd.oma.cab-pcc+xml
-# application/vnd.oma.cab-user-prefs+xml
-# application/vnd.oma.dcd
-# application/vnd.oma.dcdc
-application/vnd.oma.dd2+xml			dd2
-# application/vnd.oma.drm.risd+xml
-# application/vnd.oma.group-usage-list+xml
-# application/vnd.oma.pal+xml
-# application/vnd.oma.poc.detailed-progress-report+xml
-# application/vnd.oma.poc.final-report+xml
-# application/vnd.oma.poc.groups+xml
-# application/vnd.oma.poc.invocation-descriptor+xml
-# application/vnd.oma.poc.optimized-progress-report+xml
-# application/vnd.oma.push
-# application/vnd.oma.scidm.messages+xml
-# application/vnd.oma.xcap-directory+xml
-# application/vnd.omads-email+xml
-# application/vnd.omads-file+xml
-# application/vnd.omads-folder+xml
-# application/vnd.omaloc-supl-init
-application/vnd.openofficeorg.extension		oxt
-# application/vnd.openxmlformats-officedocument.custom-properties+xml
-# application/vnd.openxmlformats-officedocument.customxmlproperties+xml
-# application/vnd.openxmlformats-officedocument.drawing+xml
-# application/vnd.openxmlformats-officedocument.drawingml.chart+xml
-# application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml
-# application/vnd.openxmlformats-officedocument.drawingml.diagramcolors+xml
-# application/vnd.openxmlformats-officedocument.drawingml.diagramdata+xml
-# application/vnd.openxmlformats-officedocument.drawingml.diagramlayout+xml
-# application/vnd.openxmlformats-officedocument.drawingml.diagramstyle+xml
-# application/vnd.openxmlformats-officedocument.extended-properties+xml
-# application/vnd.openxmlformats-officedocument.presentationml.commentauthors+xml
-# application/vnd.openxmlformats-officedocument.presentationml.comments+xml
-# application/vnd.openxmlformats-officedocument.presentationml.handoutmaster+xml
-# application/vnd.openxmlformats-officedocument.presentationml.notesmaster+xml
-# application/vnd.openxmlformats-officedocument.presentationml.notesslide+xml
-application/vnd.openxmlformats-officedocument.presentationml.presentation	pptx
-# application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml
-# application/vnd.openxmlformats-officedocument.presentationml.presprops+xml
-application/vnd.openxmlformats-officedocument.presentationml.slide	sldx
-# application/vnd.openxmlformats-officedocument.presentationml.slide+xml
-# application/vnd.openxmlformats-officedocument.presentationml.slidelayout+xml
-# application/vnd.openxmlformats-officedocument.presentationml.slidemaster+xml
-application/vnd.openxmlformats-officedocument.presentationml.slideshow	ppsx
-# application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml
-# application/vnd.openxmlformats-officedocument.presentationml.slideupdateinfo+xml
-# application/vnd.openxmlformats-officedocument.presentationml.tablestyles+xml
-# application/vnd.openxmlformats-officedocument.presentationml.tags+xml
-application/vnd.openxmlformats-officedocument.presentationml.template	potx
-# application/vnd.openxmlformats-officedocument.presentationml.template.main+xml
-# application/vnd.openxmlformats-officedocument.presentationml.viewprops+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.calcchain+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.externallink+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.pivotcachedefinition+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.pivotcacherecords+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.pivottable+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.querytable+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.revisionheaders+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.revisionlog+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.sharedstrings+xml
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet	xlsx
-# application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.sheetmetadata+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.tablesinglecells+xml
-application/vnd.openxmlformats-officedocument.spreadsheetml.template	xltx
-# application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.usernames+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.volatiledependencies+xml
-# application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml
-# application/vnd.openxmlformats-officedocument.theme+xml
-# application/vnd.openxmlformats-officedocument.themeoverride+xml
-# application/vnd.openxmlformats-officedocument.vmldrawing
-# application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml
-application/vnd.openxmlformats-officedocument.wordprocessingml.document	docx
-# application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml
-# application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml
-# application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml
-# application/vnd.openxmlformats-officedocument.wordprocessingml.fonttable+xml
-# application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml
-# application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml
-# application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml
-# application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml
-# application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml
-application/vnd.openxmlformats-officedocument.wordprocessingml.template	dotx
-# application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml
-# application/vnd.openxmlformats-officedocument.wordprocessingml.websettings+xml
-# application/vnd.openxmlformats-package.core-properties+xml
-# application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml
-# application/vnd.openxmlformats-package.relationships+xml
-# application/vnd.quobject-quoxdocument
-# application/vnd.osa.netdeploy
-application/vnd.osgeo.mapguide.package		mgp
-# application/vnd.osgi.bundle
-application/vnd.osgi.dp				dp
-application/vnd.osgi.subsystem			esa
-# application/vnd.otps.ct-kip+xml
-application/vnd.palm				pdb pqa oprc
-# application/vnd.paos.xml
-application/vnd.pawaafile			paw
-application/vnd.pg.format			str
-application/vnd.pg.osasli			ei6
-# application/vnd.piaccess.application-licence
-application/vnd.picsel				efif
-application/vnd.pmi.widget			wg
-# application/vnd.poc.group-advertisement+xml
-application/vnd.pocketlearn			plf
-application/vnd.powerbuilder6			pbd
-# application/vnd.powerbuilder6-s
-# application/vnd.powerbuilder7
-# application/vnd.powerbuilder7-s
-# application/vnd.powerbuilder75
-# application/vnd.powerbuilder75-s
-# application/vnd.preminet
-application/vnd.previewsystems.box		box
-application/vnd.proteus.magazine		mgz
-application/vnd.publishare-delta-tree		qps
-application/vnd.pvi.ptid1			ptid
-# application/vnd.pwg-multiplexed
-# application/vnd.pwg-xhtml-print+xml
-# application/vnd.qualcomm.brew-app-res
-application/vnd.quark.quarkxpress		qxd qxt qwd qwt qxl qxb
-# application/vnd.radisys.moml+xml
-# application/vnd.radisys.msml+xml
-# application/vnd.radisys.msml-audit+xml
-# application/vnd.radisys.msml-audit-conf+xml
-# application/vnd.radisys.msml-audit-conn+xml
-# application/vnd.radisys.msml-audit-dialog+xml
-# application/vnd.radisys.msml-audit-stream+xml
-# application/vnd.radisys.msml-conf+xml
-# application/vnd.radisys.msml-dialog+xml
-# application/vnd.radisys.msml-dialog-base+xml
-# application/vnd.radisys.msml-dialog-fax-detect+xml
-# application/vnd.radisys.msml-dialog-fax-sendrecv+xml
-# application/vnd.radisys.msml-dialog-group+xml
-# application/vnd.radisys.msml-dialog-speech+xml
-# application/vnd.radisys.msml-dialog-transform+xml
-# application/vnd.rainstor.data
-# application/vnd.rapid
-application/vnd.realvnc.bed			bed
-application/vnd.recordare.musicxml		mxl
-application/vnd.recordare.musicxml+xml		musicxml
-# application/vnd.renlearn.rlprint
-application/vnd.rig.cryptonote			cryptonote
-application/vnd.rim.cod				cod
-application/vnd.rn-realmedia			rm
-application/vnd.rn-realmedia-vbr		rmvb
-application/vnd.route66.link66+xml		link66
-# application/vnd.rs-274x
-# application/vnd.ruckus.download
-# application/vnd.s3sms
-application/vnd.sailingtracker.track		st
-# application/vnd.sbm.cid
-# application/vnd.sbm.mid2
-# application/vnd.scribus
-# application/vnd.sealed.3df
-# application/vnd.sealed.csf
-# application/vnd.sealed.doc
-# application/vnd.sealed.eml
-# application/vnd.sealed.mht
-# application/vnd.sealed.net
-# application/vnd.sealed.ppt
-# application/vnd.sealed.tiff
-# application/vnd.sealed.xls
-# application/vnd.sealedmedia.softseal.html
-# application/vnd.sealedmedia.softseal.pdf
-application/vnd.seemail				see
-application/vnd.sema				sema
-application/vnd.semd				semd
-application/vnd.semf				semf
-application/vnd.shana.informed.formdata		ifm
-application/vnd.shana.informed.formtemplate	itp
-application/vnd.shana.informed.interchange	iif
-application/vnd.shana.informed.package		ipk
-application/vnd.simtech-mindmapper		twd twds
-application/vnd.smaf				mmf
-# application/vnd.smart.notebook
-application/vnd.smart.teacher			teacher
-# application/vnd.software602.filler.form+xml
-# application/vnd.software602.filler.form-xml-zip
-application/vnd.solent.sdkm+xml			sdkm sdkd
-application/vnd.spotfire.dxp			dxp
-application/vnd.spotfire.sfs			sfs
-# application/vnd.sss-cod
-# application/vnd.sss-dtf
-# application/vnd.sss-ntf
-application/vnd.stardivision.calc		sdc
-application/vnd.stardivision.draw		sda
-application/vnd.stardivision.impress		sdd
-application/vnd.stardivision.math		smf
-application/vnd.stardivision.writer		sdw vor
-application/vnd.stardivision.writer-global	sgl
-application/vnd.stepmania.package		smzip
-application/vnd.stepmania.stepchart		sm
-# application/vnd.street-stream
-application/vnd.sun.xml.calc			sxc
-application/vnd.sun.xml.calc.template		stc
-application/vnd.sun.xml.draw			sxd
-application/vnd.sun.xml.draw.template		std
-application/vnd.sun.xml.impress			sxi
-application/vnd.sun.xml.impress.template	sti
-application/vnd.sun.xml.math			sxm
-application/vnd.sun.xml.writer			sxw
-application/vnd.sun.xml.writer.global		sxg
-application/vnd.sun.xml.writer.template		stw
-# application/vnd.sun.wadl+xml
-application/vnd.sus-calendar			sus susp
-application/vnd.svd				svd
-# application/vnd.swiftview-ics
-application/vnd.symbian.install			sis sisx
-application/vnd.syncml+xml			xsm
-application/vnd.syncml.dm+wbxml			bdm
-application/vnd.syncml.dm+xml			xdm
-# application/vnd.syncml.dm.notification
-# application/vnd.syncml.ds.notification
-application/vnd.tao.intent-module-archive	tao
-application/vnd.tcpdump.pcap			pcap cap dmp
-application/vnd.tmobile-livetv			tmo
-application/vnd.trid.tpt			tpt
-application/vnd.triscape.mxs			mxs
-application/vnd.trueapp				tra
-# application/vnd.truedoc
-# application/vnd.ubisoft.webplayer
-application/vnd.ufdl				ufd ufdl
-application/vnd.uiq.theme			utz
-application/vnd.umajin				umj
-application/vnd.unity				unityweb
-application/vnd.uoml+xml			uoml
-# application/vnd.uplanet.alert
-# application/vnd.uplanet.alert-wbxml
-# application/vnd.uplanet.bearer-choice
-# application/vnd.uplanet.bearer-choice-wbxml
-# application/vnd.uplanet.cacheop
-# application/vnd.uplanet.cacheop-wbxml
-# application/vnd.uplanet.channel
-# application/vnd.uplanet.channel-wbxml
-# application/vnd.uplanet.list
-# application/vnd.uplanet.list-wbxml
-# application/vnd.uplanet.listcmd
-# application/vnd.uplanet.listcmd-wbxml
-# application/vnd.uplanet.signal
-application/vnd.vcx				vcx
-# application/vnd.vd-study
-# application/vnd.vectorworks
-# application/vnd.verimatrix.vcas
-# application/vnd.vidsoft.vidconference
-application/vnd.visio				vsd vst vss vsw
-application/vnd.visionary			vis
-# application/vnd.vividence.scriptfile
-application/vnd.vsf				vsf
-# application/vnd.wap.sic
-# application/vnd.wap.slc
-application/vnd.wap.wbxml			wbxml
-application/vnd.wap.wmlc			wmlc
-application/vnd.wap.wmlscriptc			wmlsc
-application/vnd.webturbo			wtb
-# application/vnd.wfa.wsc
-# application/vnd.wmc
-# application/vnd.wmf.bootstrap
-# application/vnd.wolfram.mathematica
-# application/vnd.wolfram.mathematica.package
-application/vnd.wolfram.player			nbp
-application/vnd.wordperfect			wpd
-application/vnd.wqd				wqd
-# application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf				stf
-# application/vnd.wv.csp+wbxml
-# application/vnd.wv.csp+xml
-# application/vnd.wv.ssp+xml
-application/vnd.xara				xar
-application/vnd.xfdl				xfdl
-# application/vnd.xfdl.webform
-# application/vnd.xmi+xml
-# application/vnd.xmpie.cpkg
-# application/vnd.xmpie.dpkg
-# application/vnd.xmpie.plan
-# application/vnd.xmpie.ppkg
-# application/vnd.xmpie.xlim
-application/vnd.yamaha.hv-dic			hvd
-application/vnd.yamaha.hv-script		hvs
-application/vnd.yamaha.hv-voice			hvp
-application/vnd.yamaha.openscoreformat			osf
-application/vnd.yamaha.openscoreformat.osfpvg+xml	osfpvg
-# application/vnd.yamaha.remote-setup
-application/vnd.yamaha.smaf-audio		saf
-application/vnd.yamaha.smaf-phrase		spf
-# application/vnd.yamaha.through-ngn
-# application/vnd.yamaha.tunnel-udpencap
-application/vnd.yellowriver-custom-menu		cmp
-application/vnd.zul				zir zirz
-application/vnd.zzazz.deck+xml			zaz
-application/voicexml+xml			vxml
-# application/vq-rtcpxr
-# application/watcherinfo+xml
-# application/whoispp-query
-# application/whoispp-response
-application/widget				wgt
-application/winhlp				hlp
-# application/wita
-# application/wordperfect5.1
-application/wsdl+xml				wsdl
-application/wspolicy+xml			wspolicy
-application/x-7z-compressed			7z
-application/x-abiword				abw
-application/x-ace-compressed			ace
-# application/x-amf
-application/x-apple-diskimage			dmg
-application/x-authorware-bin			aab x32 u32 vox
-application/x-authorware-map			aam
-application/x-authorware-seg			aas
-application/x-bcpio				bcpio
-application/x-bittorrent			torrent
-application/x-blorb				blb blorb
-application/x-bzip				bz
-application/x-bzip2				bz2 boz
-application/x-cbr				cbr cba cbt cbz cb7
-application/x-cdlink				vcd
-application/x-cfs-compressed			cfs
-application/x-chat				chat
-application/x-chess-pgn				pgn
-application/x-conference			nsc
-# application/x-compress
-application/x-cpio				cpio
-application/x-csh				csh
-application/x-debian-package			deb udeb
-application/x-dgc-compressed			dgc
-application/x-director			dir dcr dxr cst cct cxt w3d fgd swa
-application/x-doom				wad
-application/x-dtbncx+xml			ncx
-application/x-dtbook+xml			dtb
-application/x-dtbresource+xml			res
-application/x-dvi				dvi
-application/x-envoy				evy
-application/x-eva				eva
-application/x-font-bdf				bdf
-# application/x-font-dos
-# application/x-font-framemaker
-application/x-font-ghostscript			gsf
-# application/x-font-libgrx
-application/x-font-linux-psf			psf
-application/x-font-otf				otf
-application/x-font-pcf				pcf
-application/x-font-snf				snf
-# application/x-font-speedo
-# application/x-font-sunos-news
-application/x-font-ttf				ttf ttc
-application/x-font-type1			pfa pfb pfm afm
-application/font-woff				woff
-# application/x-font-vfont
-application/x-freearc				arc
-application/x-futuresplash			spl
-application/x-gca-compressed			gca
-application/x-glulx				ulx
-application/x-gnumeric				gnumeric
-application/x-gramps-xml			gramps
-application/x-gtar				gtar
-# application/x-gzip
-application/x-hdf				hdf
-application/x-install-instructions		install
-application/x-iso9660-image			iso
-application/x-java-jnlp-file			jnlp
-application/x-latex				latex
-application/x-lzh-compressed			lzh lha
-application/x-mie				mie
-application/x-mobipocket-ebook			prc mobi
-application/x-ms-application			application
-application/x-ms-shortcut			lnk
-application/x-ms-wmd				wmd
-application/x-ms-wmz				wmz
-application/x-ms-xbap				xbap
-application/x-msaccess				mdb
-application/x-msbinder				obd
-application/x-mscardfile			crd
-application/x-msclip				clp
-application/x-msdownload			exe dll com bat msi
-application/x-msmediaview			mvb m13 m14
-application/x-msmetafile			wmf wmz emf emz
-application/x-msmoney				mny
-application/x-mspublisher			pub
-application/x-msschedule			scd
-application/x-msterminal			trm
-application/x-mswrite				wri
-application/x-netcdf				nc cdf
-application/x-nzb				nzb
-application/x-pkcs12				p12 pfx
-application/x-pkcs7-certificates		p7b spc
-application/x-pkcs7-certreqresp			p7r
-application/x-rar-compressed			rar
-application/x-research-info-systems		ris
-application/x-sh				sh
-application/x-shar				shar
-application/x-shockwave-flash			swf
-application/x-silverlight-app			xap
-application/x-sql				sql
-application/x-stuffit				sit
-application/x-stuffitx				sitx
-application/x-subrip				srt
-application/x-sv4cpio				sv4cpio
-application/x-sv4crc				sv4crc
-application/x-t3vm-image			t3
-application/x-tads				gam
-application/x-tar				tar
-application/x-tcl				tcl
-application/x-tex				tex
-application/x-tex-tfm				tfm
-application/x-texinfo				texinfo texi
-application/x-tgif				obj
-application/x-ustar				ustar
-application/x-wais-source			src
-application/x-x509-ca-cert			der crt
-application/x-xfig				fig
-application/x-xliff+xml				xlf
-application/x-xpinstall				xpi
-application/x-xz				xz
-application/x-zmachine				z1 z2 z3 z4 z5 z6 z7 z8
-# application/x400-bp
-application/xaml+xml				xaml
-# application/xcap-att+xml
-# application/xcap-caps+xml
-application/xcap-diff+xml			xdf
-# application/xcap-el+xml
-# application/xcap-error+xml
-# application/xcap-ns+xml
-# application/xcon-conference-info-diff+xml
-# application/xcon-conference-info+xml
-application/xenc+xml				xenc
-application/xhtml+xml				xhtml xht
-# application/xhtml-voice+xml
-application/xml					xml xsl
-application/xml-dtd				dtd
-# application/xml-external-parsed-entity
-# application/xmpp+xml
-application/xop+xml				xop
-application/xproc+xml				xpl
-application/xslt+xml				xslt
-application/xspf+xml				xspf
-application/xv+xml				mxml xhvml xvml xvm
-application/yang				yang
-application/yin+xml				yin
-application/zip					zip
-# audio/1d-interleaved-parityfec
-# audio/32kadpcm
-# audio/3gpp
-# audio/3gpp2
-# audio/ac3
-audio/adpcm					adp
-# audio/amr
-# audio/amr-wb
-# audio/amr-wb+
-# audio/asc
-# audio/atrac-advanced-lossless
-# audio/atrac-x
-# audio/atrac3
-audio/basic					au snd
-# audio/bv16
-# audio/bv32
-# audio/clearmode
-# audio/cn
-# audio/dat12
-# audio/dls
-# audio/dsr-es201108
-# audio/dsr-es202050
-# audio/dsr-es202211
-# audio/dsr-es202212
-# audio/dv
-# audio/dvi4
-# audio/eac3
-# audio/evrc
-# audio/evrc-qcp
-# audio/evrc0
-# audio/evrc1
-# audio/evrcb
-# audio/evrcb0
-# audio/evrcb1
-# audio/evrcwb
-# audio/evrcwb0
-# audio/evrcwb1
-# audio/example
-# audio/fwdred
-# audio/g719
-# audio/g722
-# audio/g7221
-# audio/g723
-# audio/g726-16
-# audio/g726-24
-# audio/g726-32
-# audio/g726-40
-# audio/g728
-# audio/g729
-# audio/g7291
-# audio/g729d
-# audio/g729e
-# audio/gsm
-# audio/gsm-efr
-# audio/gsm-hr-08
-# audio/ilbc
-# audio/ip-mr_v2.5
-# audio/isac
-# audio/l16
-# audio/l20
-# audio/l24
-# audio/l8
-# audio/lpc
-audio/midi					mid midi kar rmi
-# audio/mobile-xmf
-audio/mp4					mp4a
-# audio/mp4a-latm
-# audio/mpa
-# audio/mpa-robust
-audio/mpeg					mpga mp2 mp2a mp3 m2a m3a
-# audio/mpeg4-generic
-# audio/musepack
-audio/ogg					oga ogg spx
-# audio/opus
-# audio/parityfec
-# audio/pcma
-# audio/pcma-wb
-# audio/pcmu-wb
-# audio/pcmu
-# audio/prs.sid
-# audio/qcelp
-# audio/red
-# audio/rtp-enc-aescm128
-# audio/rtp-midi
-# audio/rtx
-audio/s3m					s3m
-audio/silk					sil
-# audio/smv
-# audio/smv0
-# audio/smv-qcp
-# audio/sp-midi
-# audio/speex
-# audio/t140c
-# audio/t38
-# audio/telephone-event
-# audio/tone
-# audio/uemclip
-# audio/ulpfec
-# audio/vdvi
-# audio/vmr-wb
-# audio/vnd.3gpp.iufp
-# audio/vnd.4sb
-# audio/vnd.audiokoz
-# audio/vnd.celp
-# audio/vnd.cisco.nse
-# audio/vnd.cmles.radio-events
-# audio/vnd.cns.anp1
-# audio/vnd.cns.inf1
-audio/vnd.dece.audio				uva uvva
-audio/vnd.digital-winds				eol
-# audio/vnd.dlna.adts
-# audio/vnd.dolby.heaac.1
-# audio/vnd.dolby.heaac.2
-# audio/vnd.dolby.mlp
-# audio/vnd.dolby.mps
-# audio/vnd.dolby.pl2
-# audio/vnd.dolby.pl2x
-# audio/vnd.dolby.pl2z
-# audio/vnd.dolby.pulse.1
-audio/vnd.dra					dra
-audio/vnd.dts					dts
-audio/vnd.dts.hd				dtshd
-# audio/vnd.dvb.file
-# audio/vnd.everad.plj
-# audio/vnd.hns.audio
-audio/vnd.lucent.voice				lvp
-audio/vnd.ms-playready.media.pya		pya
-# audio/vnd.nokia.mobile-xmf
-# audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800			ecelp4800
-audio/vnd.nuera.ecelp7470			ecelp7470
-audio/vnd.nuera.ecelp9600			ecelp9600
-# audio/vnd.octel.sbc
-# audio/vnd.qcelp
-# audio/vnd.rhetorex.32kadpcm
-audio/vnd.rip					rip
-# audio/vnd.sealedmedia.softseal.mpeg
-# audio/vnd.vmx.cvsd
-# audio/vorbis
-# audio/vorbis-config
-audio/webm					weba
-audio/x-aac					aac
-audio/x-aiff					aif aiff aifc
-audio/x-caf					caf
-audio/x-flac					flac
-audio/x-matroska				mka
-audio/x-mpegurl					m3u
-audio/x-ms-wax					wax
-audio/x-ms-wma					wma
-audio/x-pn-realaudio				ram ra
-audio/x-pn-realaudio-plugin			rmp
-# audio/x-tta
-audio/x-wav					wav
-audio/xm					xm
-chemical/x-cdx					cdx
-chemical/x-cif					cif
-chemical/x-cmdf					cmdf
-chemical/x-cml					cml
-chemical/x-csml					csml
-# chemical/x-pdb
-chemical/x-xyz					xyz
-image/bmp					bmp
-image/cgm					cgm
-# image/example
-# image/fits
-image/g3fax					g3
-image/gif					gif
-image/ief					ief
-# image/jp2
-image/jpeg					jpeg jpg jpe
-# image/jpm
-# image/jpx
-image/ktx					ktx
-# image/naplps
-image/png					png
-image/prs.btif					btif
-# image/prs.pti
-image/sgi					sgi
-image/svg+xml					svg svgz
-# image/t38
-image/tiff					tiff tif
-# image/tiff-fx
-image/vnd.adobe.photoshop			psd
-# image/vnd.cns.inf2
-image/vnd.dece.graphic				uvi uvvi uvg uvvg
-image/vnd.dvb.subtitle				sub
-image/vnd.djvu					djvu djv
-image/vnd.dwg					dwg
-image/vnd.dxf					dxf
-image/vnd.fastbidsheet				fbs
-image/vnd.fpx					fpx
-image/vnd.fst					fst
-image/vnd.fujixerox.edmics-mmr			mmr
-image/vnd.fujixerox.edmics-rlc			rlc
-# image/vnd.globalgraphics.pgb
-# image/vnd.microsoft.icon
-# image/vnd.mix
-image/vnd.ms-modi				mdi
-image/vnd.ms-photo				wdp
-image/vnd.net-fpx				npx
-# image/vnd.radiance
-# image/vnd.sealed.png
-# image/vnd.sealedmedia.softseal.gif
-# image/vnd.sealedmedia.softseal.jpg
-# image/vnd.svf
-image/vnd.wap.wbmp				wbmp
-image/vnd.xiff					xif
-image/webp					webp
-image/x-3ds					3ds
-image/x-cmu-raster				ras
-image/x-cmx					cmx
-image/x-freehand				fh fhc fh4 fh5 fh7
-image/x-icon					ico
-image/x-mrsid-image				sid
-image/x-pcx					pcx
-image/x-pict					pic pct
-image/x-portable-anymap				pnm
-image/x-portable-bitmap				pbm
-image/x-portable-graymap			pgm
-image/x-portable-pixmap				ppm
-image/x-rgb					rgb
-image/x-tga					tga
-image/x-xbitmap					xbm
-image/x-xpixmap					xpm
-image/x-xwindowdump				xwd
-# message/cpim
-# message/delivery-status
-# message/disposition-notification
-# message/example
-# message/external-body
-# message/feedback-report
-# message/global
-# message/global-delivery-status
-# message/global-disposition-notification
-# message/global-headers
-# message/http
-# message/imdn+xml
-# message/news
-# message/partial
-message/rfc822					eml mime
-# message/s-http
-# message/sip
-# message/sipfrag
-# message/tracking-status
-# message/vnd.si.simp
-# model/example
-model/iges					igs iges
-model/mesh					msh mesh silo
-model/vnd.collada+xml				dae
-model/vnd.dwf					dwf
-# model/vnd.flatland.3dml
-model/vnd.gdl					gdl
-# model/vnd.gs-gdl
-# model/vnd.gs.gdl
-model/vnd.gtw					gtw
-# model/vnd.moml+xml
-model/vnd.mts					mts
-# model/vnd.parasolid.transmit.binary
-# model/vnd.parasolid.transmit.text
-model/vnd.vtu					vtu
-model/vrml					wrl vrml
-model/x3d+binary				x3db x3dbz
-model/x3d+vrml					x3dv x3dvz
-model/x3d+xml					x3d x3dz
-# multipart/alternative
-# multipart/appledouble
-# multipart/byteranges
-# multipart/digest
-# multipart/encrypted
-# multipart/example
-# multipart/form-data
-# multipart/header-set
-# multipart/mixed
-# multipart/parallel
-# multipart/related
-# multipart/report
-# multipart/signed
-# multipart/voice-message
-# text/1d-interleaved-parityfec
-text/cache-manifest				appcache
-text/calendar					ics ifb
-text/css					css
-text/csv					csv
-# text/directory
-# text/dns
-# text/ecmascript
-# text/enriched
-# text/example
-# text/fwdred
-text/html					html htm
-# text/javascript
-text/n3						n3
-# text/parityfec
-text/plain					txt text conf def list log in
-# text/prs.fallenstein.rst
-text/prs.lines.tag				dsc
-# text/vnd.radisys.msml-basic-layout
-# text/red
-# text/rfc822-headers
-text/richtext					rtx
-# text/rtf
-# text/rtp-enc-aescm128
-# text/rtx
-text/sgml					sgml sgm
-# text/t140
-text/tab-separated-values			tsv
-text/troff					t tr roff man me ms
-text/turtle					ttl
-# text/ulpfec
-text/uri-list					uri uris urls
-text/vcard					vcard
-# text/vnd.abc
-text/vnd.curl					curl
-text/vnd.curl.dcurl				dcurl
-text/vnd.curl.scurl				scurl
-text/vnd.curl.mcurl				mcurl
-# text/vnd.dmclientscript
-text/vnd.dvb.subtitle				sub
-# text/vnd.esmertec.theme-descriptor
-text/vnd.fly					fly
-text/vnd.fmi.flexstor				flx
-text/vnd.graphviz				gv
-text/vnd.in3d.3dml				3dml
-text/vnd.in3d.spot				spot
-# text/vnd.iptc.newsml
-# text/vnd.iptc.nitf
-# text/vnd.latex-z
-# text/vnd.motorola.reflex
-# text/vnd.ms-mediapackage
-# text/vnd.net2phone.commcenter.command
-# text/vnd.si.uricatalogue
-text/vnd.sun.j2me.app-descriptor		jad
-# text/vnd.trolltech.linguist
-# text/vnd.wap.si
-# text/vnd.wap.sl
-text/vnd.wap.wml				wml
-text/vnd.wap.wmlscript				wmls
-text/x-asm					s asm
-text/x-c					c cc cxx cpp h hh dic
-text/x-fortran					f for f77 f90
-text/x-java-source				java
-text/x-opml					opml
-text/x-pascal					p pas
-text/x-nfo					nfo
-text/x-setext					etx
-text/x-sfv					sfv
-text/x-uuencode					uu
-text/x-vcalendar				vcs
-text/x-vcard					vcf
-# text/xml
-# text/xml-external-parsed-entity
-# video/1d-interleaved-parityfec
-video/3gpp					3gp
-# video/3gpp-tt
-video/3gpp2					3g2
-# video/bmpeg
-# video/bt656
-# video/celb
-# video/dv
-# video/example
-video/h261					h261
-video/h263					h263
-# video/h263-1998
-# video/h263-2000
-video/h264					h264
-# video/h264-rcdo
-# video/h264-svc
-video/jpeg					jpgv
-# video/jpeg2000
-video/jpm					jpm jpgm
-video/mj2					mj2 mjp2
-# video/mp1s
-# video/mp2p
-# video/mp2t
-video/mp4					mp4 mp4v mpg4
-# video/mp4v-es
-video/mpeg					mpeg mpg mpe m1v m2v
-# video/mpeg4-generic
-# video/mpv
-# video/nv
-video/ogg					ogv
-# video/parityfec
-# video/pointer
-video/quicktime					qt mov
-# video/raw
-# video/rtp-enc-aescm128
-# video/rtx
-# video/smpte292m
-# video/ulpfec
-# video/vc1
-# video/vnd.cctv
-video/vnd.dece.hd				uvh uvvh
-video/vnd.dece.mobile				uvm uvvm
-# video/vnd.dece.mp4
-video/vnd.dece.pd				uvp uvvp
-video/vnd.dece.sd				uvs uvvs
-video/vnd.dece.video				uvv uvvv
-# video/vnd.directv.mpeg
-# video/vnd.directv.mpeg-tts
-# video/vnd.dlna.mpeg-tts
-video/vnd.dvb.file				dvb
-video/vnd.fvt					fvt
-# video/vnd.hns.video
-# video/vnd.iptvforum.1dparityfec-1010
-# video/vnd.iptvforum.1dparityfec-2005
-# video/vnd.iptvforum.2dparityfec-1010
-# video/vnd.iptvforum.2dparityfec-2005
-# video/vnd.iptvforum.ttsavc
-# video/vnd.iptvforum.ttsmpeg2
-# video/vnd.motorola.video
-# video/vnd.motorola.videop
-video/vnd.mpegurl				mxu m4u
-video/vnd.ms-playready.media.pyv		pyv
-# video/vnd.nokia.interleaved-multimedia
-# video/vnd.nokia.videovoip
-# video/vnd.objectvideo
-# video/vnd.sealed.mpeg1
-# video/vnd.sealed.mpeg4
-# video/vnd.sealed.swf
-# video/vnd.sealedmedia.softseal.mov
-video/vnd.uvvu.mp4				uvu uvvu
-video/vnd.vivo					viv
-video/webm					webm
-video/x-f4v					f4v
-video/x-fli					fli
-video/x-flv					flv
-video/x-m4v					m4v
-video/x-matroska				mkv mk3d mks
-video/x-mng					mng
-video/x-ms-asf					asf asx
-video/x-ms-vob					vob
-video/x-ms-wm					wm
-video/x-ms-wmv					wmv
-video/x-ms-wmx					wmx
-video/x-ms-wvx					wvx
-video/x-msvideo					avi
-video/x-sgi-movie				movie
-video/x-smv					smv
-x-conference/x-cooltalk				ice
diff --git a/conf/rayo/sip_profiles/external.xml b/conf/rayo/sip_profiles/external.xml
deleted file mode 100644
index 2b601fbb38..0000000000
--- a/conf/rayo/sip_profiles/external.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<profile name="external">
-  <!-- http://wiki.freeswitch.org/wiki/Sofia_Configuration_Files -->
-  <!-- This profile is only for outbound registrations to providers -->
-  <gateways>
-    <X-PRE-PROCESS cmd="include" data="external/*.xml"/>
-  </gateways>
-
-  <aliases>
-    <!--
-        <alias name="outbound"/>
-        <alias name="nat"/>
-    -->
-  </aliases>
-
-  <domains>
-    <domain name="all" alias="false" parse="true"/>
-  </domains>
-
-  <settings>
-    <param name="debug" value="0"/>
-    <!-- If you want FreeSWITCH to shutdown if this profile fails to load, uncomment the next line. -->
-    <!-- <param name="shutdown-on-fail" value="true"/> -->
-    <param name="sip-trace" value="no"/>
-    <param name="sip-capture" value="no"/>
-    <param name="rfc2833-pt" value="101"/>
-    <!-- RFC 5626 : Send reg-id and sip.instance -->
-    <!--<param name="enable-rfc-5626" value="true"/> -->
-    <param name="sip-port" value="$${external_sip_port}"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="public"/>
-    <param name="dtmf-duration" value="2000"/>
-    <param name="inbound-codec-prefs" value="$${global_codec_prefs}"/>
-    <param name="outbound-codec-prefs" value="$${outbound_codec_prefs}"/>
-    <param name="hold-music" value="$${hold_music}"/>
-    <param name="rtp-timer-name" value="soft"/>
-    <!--<param name="enable-100rel" value="true"/>-->
-    <!--<param name="disable-srv503" value="true"/>-->
-    <!-- This could be set to "passive" -->
-    <param name="local-network-acl" value="localnet.auto"/>
-    <param name="manage-presence" value="false"/>
-
-    <!-- used to share presence info across sofia profiles
-         manage-presence needs to be set to passive on this profile
-         if you want it to behave as if it were the internal profile
-         for presence.
-    -->
-    <!-- Name of the db to use for this profile -->
-    <!--<param name="dbname" value="share_presence"/>-->
-    <!--<param name="presence-hosts" value="$${domain}"/>-->
-    <!--<param name="force-register-domain" value="$${domain}"/>-->
-    <!--all inbound reg will stored in the db using this domain -->
-    <!--<param name="force-register-db-domain" value="$${domain}"/>-->
-    <!-- ************************************************* -->
-
-    <!--<param name="aggressive-nat-detection" value="true"/>-->
-    <param name="inbound-codec-negotiation" value="generous"/>
-    <param name="nonce-ttl" value="60"/>
-    <param name="auth-calls" value="$${external_auth_calls}"/>
-    <param name="inbound-late-negotiation" value="true"/>
-    <!--
-        DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
-    -->
-    <param name="rtp-ip" value="$${external_rtp_ip}"/>
-    <param name="sip-ip" value="$${external_sip_ip}"/>
-    <param name="ext-rtp-ip" value="auto-nat"/>
-    <param name="ext-sip-ip" value="auto-nat"/>
-    <param name="rtp-timeout-sec" value="300"/>
-    <param name="rtp-hold-timeout-sec" value="1800"/>
-    <!--<param name="enable-3pcc" value="true"/>-->
-
-    <!-- TLS: disabled by default, set to "true" to enable -->
-    <param name="tls" value="$${external_ssl_enable}"/>
-    <!-- Set to true to not bind on the normal sip-port but only on the TLS port -->
-    <param name="tls-only" value="false"/>
-    <!-- additional bind parameters for TLS -->
-    <param name="tls-bind-params" value="transport=tls"/>
-    <!-- Port to listen on for TLS requests. (5081 will be used if unspecified) -->
-    <param name="tls-sip-port" value="$${external_tls_port}"/>
-    <!-- Location of the agent.pem and cafile.pem ssl certificates (needed for TLS server) -->
-    <param name="tls-cert-dir" value="$${external_ssl_dir}"/>
-    <!-- Optionally set the passphrase password used by openSSL to encrypt/decrypt TLS private key files -->
-    <param name="tls-passphrase" value=""/>
-    <!-- Verify the date on TLS certificates -->
-    <param name="tls-verify-date" value="true"/>
-    <!-- TLS verify policy, when registering/inviting gateways with other servers (outbound) or handling inbound registration/invite requests how should we verify their certificate -->
-    <!-- set to 'in' to only verify incoming connections, 'out' to only verify outgoing connections, 'all' to verify all connections, also 'subjects_in', 'subjects_out' and 'subjects_all' for subject validation. Multiple policies can be split with a '|' pipe -->
-    <param name="tls-verify-policy" value="none"/>
-    <!-- Certificate max verify depth to use for validating peer TLS certificates when the verify policy is not none -->
-    <param name="tls-verify-depth" value="2"/>
-    <!-- If the tls-verify-policy is set to subjects_all or subjects_in this sets which subjects are allowed, multiple subjects can be split with a '|' pipe -->
-    <param name="tls-verify-in-subjects" value=""/>
-    <!-- TLS version ("sslv23" (default), "tlsv1"). NOTE: Phones may not work with TLSv1 -->
-    <param name="tls-version" value="$${sip_tls_version}"/>
-  </settings>
-</profile>
diff --git a/conf/rayo/sip_profiles/external/example.xml b/conf/rayo/sip_profiles/external/example.xml
deleted file mode 100644
index 0497bcd1e1..0000000000
--- a/conf/rayo/sip_profiles/external/example.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<include>
-  <!--<gateway name="asterlink.com">-->
-  <!--/// account username *required* ///-->
-  <!--<param name="username" value="cluecon"/>-->
-  <!--/// auth realm: *optional* same as gateway name, if blank ///-->
-  <!--<param name="realm" value="asterlink.com"/>-->
-  <!--/// username to use in from: *optional* same as  username, if blank ///-->
-  <!--<param name="from-user" value="cluecon"/>-->
-  <!--/// domain to use in from: *optional* same as  realm, if blank ///-->
-  <!--<param name="from-domain" value="asterlink.com"/>-->
-  <!--/// account password *required* ///-->
-  <!--<param name="password" value="2007"/>-->
-  <!--/// extension for inbound calls: *optional* same as username, if blank ///-->
-  <!--<param name="extension" value="cluecon"/>-->
-  <!--/// proxy host: *optional* same as realm, if blank ///-->
-  <!--<param name="proxy" value="asterlink.com"/>-->
-  <!--/// send register to this proxy: *optional* same as proxy, if blank ///-->
-  <!--<param name="register-proxy" value="mysbc.com"/>-->
-  <!--/// expire in seconds: *optional* 3600, if blank ///-->
-  <!--<param name="expire-seconds" value="60"/>-->
-  <!--/// do not register ///-->
-  <!--<param name="register" value="false"/>-->
-  <!-- which transport to use for register -->
-  <!--<param name="register-transport" value="udp"/>-->
-  <!--How many seconds before a retry when a failure or timeout occurs -->
-  <!--<param name="retry-seconds" value="30"/>-->
-  <!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
-  <!--<param name="caller-id-in-from" value="false"/>-->
-  <!--extra sip params to send in the contact-->
-  <!--<param name="contact-params" value=""/>-->
-  <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
-  <!--<param name="ping" value="25"/>-->
-  <!--</gateway>-->
-  <!--rfc5626 : Abilitazione rfc5626 ///-->
-  <!--<param name="rfc-5626" value="true"/>-->
-  <!--rfc5626 : extra sip params to send in the contact-->
-  <!--<param name="reg-id" value="1"/>-->
-</include>
diff --git a/conf/rayo/vars.xml b/conf/rayo/vars.xml
deleted file mode 100644
index af602cad34..0000000000
--- a/conf/rayo/vars.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<include>
-  <X-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/callie"/>
-  <!--<Z-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/allison"/>-->
-
-  <!--
-      This setting is what sets the default domain FreeSWITCH will use if all else fails.
-      
-      FreeSWICH will default to $${local_ip_v4} unless changed.  Changing this setting does 
-      affect the sip authentication.  Please review conf/directory/default.xml for more
-      information on this topic.
-  -->
-  <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
-  <X-PRE-PROCESS cmd="set" data="domain_name=$${domain}"/>
-  <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
-  <X-PRE-PROCESS cmd="set" data="use_profile=external"/>
-
-  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=PCMU,PCMA"/>
-  <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA"/>
-
-  <!-- 
-       THIS IS ONLY USED FOR DINGALING
-
-       bind_server_ip
-
-       Can be an ip address, a dns name, or "auto". 
-       This determines an ip address available on this host to bind.
-       If you are separating RTP and SIP traffic, you will want to have
-       use different addresses where this variable appears.
-       Used by: dingaling.conf.xml
-  -->
-  <X-PRE-PROCESS cmd="set" data="bind_server_ip=auto"/>
-
-  <!-- unroll-loops
-       Used to turn on sip loopback unrolling.
-  --> 
-  <X-PRE-PROCESS cmd="set" data="unroll_loops=true"/>
-
-  <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/>
-  <X-PRE-PROCESS cmd="set" data="outbound_caller_id=0000000000"/>
-
-  <!-- various debug and defaults -->
-  <X-PRE-PROCESS cmd="set" data="call_debug=false"/>
-  <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
-  <X-PRE-PROCESS cmd="set" data="default_areacode=617"/>
-  <X-PRE-PROCESS cmd="set" data="default_country=US"/>
-
-  <!-- if false or undefined, the destination number is included in presence NOTIFY dm:note.
-       if true, the destination number is not included -->
-  <X-PRE-PROCESS cmd="set" data="presence_privacy=false"/>
-
-  <!--
-      SIP and TLS settings. http://wiki.freeswitch.org/wiki/Tls
-  -->
-  <X-PRE-PROCESS cmd="set" data="sip_tls_version=tlsv1"/>
-
-  <!-- Rayo -->
-  <X-PRE-PROCESS cmd="set" data="rayo_ip=$${local_ip_v4}"/>
-  <X-PRE-PROCESS cmd="set" data="rayo_domain_name=$${rayo_ip}"/>
-
-  <!-- External SIP Profile -->
-  <X-PRE-PROCESS cmd="set" data="external_rtp_ip=$${local_ip_v4}"/>
-  <X-PRE-PROCESS cmd="set" data="external_sip_ip=$${local_ip_v4}"/>
-  <X-PRE-PROCESS cmd="set" data="external_sip_port=5060"/>
-  <X-PRE-PROCESS cmd="set" data="external_tls_port=5061"/>
-  <X-PRE-PROCESS cmd="set" data="external_tls_enable=false"/>
-  <X-PRE-PROCESS cmd="set" data="external_tls_dir=$${base_dir}/conf/ssl"/>
-  <X-PRE-PROCESS cmd="set" data="external_auth_calls=false"/>
-</include>
diff --git a/conf/sbc/autoload_configs/modules.conf.xml b/conf/sbc/autoload_configs/modules.conf.xml
index 31f46a4128..c35b9a53e0 100644
--- a/conf/sbc/autoload_configs/modules.conf.xml
+++ b/conf/sbc/autoload_configs/modules.conf.xml
@@ -42,7 +42,6 @@
     <load module="mod_g729"/>
     <load module="mod_amr"/>
     <!--<load module="mod_ilbc"/>-->
-    <load module="mod_h26x"/>
     <!--<load module="mod_siren"/>-->
 
     <!-- Timers -->
diff --git a/conf/sbc/autoload_configs/timezones.conf.xml b/conf/sbc/autoload_configs/timezones.conf.xml
index 14f87f8c67..9ddded792c 100644
--- a/conf/sbc/autoload_configs/timezones.conf.xml
+++ b/conf/sbc/autoload_configs/timezones.conf.xml
@@ -1,551 +1,661 @@
 <configuration name="timezones.conf" description="Timezones">
     <timezones>
-	<zone name="Africa/Abidjan" value="GMT0" />
-	<zone name="Africa/Accra" value="GMT0" />
-	<zone name="Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="Africa/Algiers" value="CET-1" />
-	<zone name="Africa/Asmara" value="EAT-3" />
-	<zone name="Africa/Asmera" value="EAT-3" />
-	<zone name="Africa/Bamako" value="GMT0" />
-	<zone name="Africa/Bangui" value="WAT-1" />
-	<zone name="Africa/Banjul" value="GMT0" />
-	<zone name="Africa/Bissau" value="GMT0" />
-	<zone name="Africa/Blantyre" value="CAT-2" />
-	<zone name="Africa/Brazzaville" value="WAT-1" />
-	<zone name="Africa/Bujumbura" value="CAT-2" />
-	<zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/1,M9.5.5/3" />
-	<zone name="Africa/Casablanca" value="WET0" />
-	<zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Conakry" value="GMT0" />
-	<zone name="Africa/Dakar" value="GMT0" />
-	<zone name="Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="Africa/Djibouti" value="EAT-3" />
-	<zone name="Africa/Douala" value="WAT-1" />
-	<zone name="Africa/El_Aaiun" value="WET0" />
-	<zone name="Africa/Freetown" value="GMT0" />
-	<zone name="Africa/Gaborone" value="CAT-2" />
-	<zone name="Africa/Harare" value="CAT-2" />
-	<zone name="Africa/Johannesburg" value="SAST-2" />
-	<zone name="Africa/Kampala" value="EAT-3" />
-	<zone name="Africa/Khartoum" value="EAT-3" />
-	<zone name="Africa/Kigali" value="CAT-2" />
-	<zone name="Africa/Kinshasa" value="WAT-1" />
-	<zone name="Africa/Lagos" value="WAT-1" />
-	<zone name="Africa/Libreville" value="WAT-1" />
-	<zone name="Africa/Lome" value="GMT0" />
-	<zone name="Africa/Luanda" value="WAT-1" />
-	<zone name="Africa/Lubumbashi" value="CAT-2" />
-	<zone name="Africa/Lusaka" value="CAT-2" />
-	<zone name="Africa/Malabo" value="WAT-1" />
-	<zone name="Africa/Maputo" value="CAT-2" />
-	<zone name="Africa/Maseru" value="SAST-2" />
-	<zone name="Africa/Mbabane" value="SAST-2" />
-	<zone name="Africa/Mogadishu" value="EAT-3" />
-	<zone name="Africa/Monrovia" value="GMT0" />
-	<zone name="Africa/Nairobi" value="EAT-3" />
-	<zone name="Africa/Ndjamena" value="WAT-1" />
-	<zone name="Africa/Niamey" value="WAT-1" />
-	<zone name="Africa/Nouakchott" value="GMT0" />
-	<zone name="Africa/Ouagadougou" value="GMT0" />
-	<zone name="Africa/Porto-Novo" value="WAT-1" />
-	<zone name="Africa/Sao_Tome" value="GMT0" />
-	<zone name="Africa/Timbuktu" value="GMT0" />
-	<zone name="Africa/Tripoli" value="EET-2" />
-	<zone name="Africa/Tunis" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
+        <zone name="Africa/Abidjan" value="GMT0" />
+        <zone name="Africa/Accra" value="GMT0" />
+        <zone name="Africa/Addis_Ababa" value="EAT-3" />
+        <zone name="Africa/Algiers" value="CET-1" />
+        <zone name="Africa/Asmara" value="EAT-3" />
+        <zone name="Africa/Asmera" value="EAT-3" />
+        <zone name="Africa/Bamako" value="GMT0" />
+        <zone name="Africa/Bangui" value="WAT-1" />
+        <zone name="Africa/Banjul" value="GMT0" />
+        <zone name="Africa/Bissau" value="GMT0" />
+        <zone name="Africa/Blantyre" value="CAT-2" />
+        <zone name="Africa/Brazzaville" value="WAT-1" />
+        <zone name="Africa/Bujumbura" value="CAT-2" />
+        <zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
+        <zone name="Africa/Casablanca" value="STD-1" />
+        <zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Africa/Conakry" value="GMT0" />
+        <zone name="Africa/Dakar" value="GMT0" />
+        <zone name="Africa/Dar_es_Salaam" value="EAT-3" />
+        <zone name="Africa/Djibouti" value="EAT-3" />
+        <zone name="Africa/Douala" value="WAT-1" />
+        <zone name="Africa/El_Aaiun" value="STD-1" />
+        <zone name="Africa/Freetown" value="GMT0" />
+        <zone name="Africa/Gaborone" value="CAT-2" />
+        <zone name="Africa/Harare" value="CAT-2" />
+        <zone name="Africa/Johannesburg" value="SAST-2" />
+        <zone name="Africa/Juba" value="CAT-2" />
+        <zone name="Africa/Kampala" value="EAT-3" />
+        <zone name="Africa/Khartoum" value="CAT-2" />
+        <zone name="Africa/Kigali" value="CAT-2" />
+        <zone name="Africa/Kinshasa" value="WAT-1" />
+        <zone name="Africa/Lagos" value="WAT-1" />
+        <zone name="Africa/Libreville" value="WAT-1" />
+        <zone name="Africa/Lome" value="GMT0" />
+        <zone name="Africa/Luanda" value="WAT-1" />
+        <zone name="Africa/Lubumbashi" value="CAT-2" />
+        <zone name="Africa/Lusaka" value="CAT-2" />
+        <zone name="Africa/Malabo" value="WAT-1" />
+        <zone name="Africa/Maputo" value="CAT-2" />
+        <zone name="Africa/Maseru" value="SAST-2" />
+        <zone name="Africa/Mbabane" value="SAST-2" />
+        <zone name="Africa/Mogadishu" value="EAT-3" />
+        <zone name="Africa/Monrovia" value="GMT0" />
+        <zone name="Africa/Nairobi" value="EAT-3" />
+        <zone name="Africa/Ndjamena" value="WAT-1" />
+        <zone name="Africa/Niamey" value="WAT-1" />
+        <zone name="Africa/Nouakchott" value="GMT0" />
+        <zone name="Africa/Ouagadougou" value="GMT0" />
+        <zone name="Africa/Porto-Novo" value="WAT-1" />
+        <zone name="Africa/Sao_Tome" value="GMT0" />
+        <zone name="Africa/Timbuktu" value="GMT0" />
+        <zone name="Africa/Tripoli" value="EET-2" />
+        <zone name="Africa/Tunis" value="CET-1" />
+        <zone name="Africa/Windhoek" value="CAT-2" />
 
-	<zone name="America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Anguilla" value="AST4" />
-	<zone name="America/Antigua" value="AST4" />
-	<zone name="America/Araguaina" value="BRT3" />
-	<zone name="America/Argentina/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/ComodRivadavia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/La_Rioja" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Rio_Gallegos" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Juan" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Luis" value="ART3" />
-	<zone name="America/Argentina/Tucuman" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Ushuaia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Aruba" value="AST4" />
-	<zone name="America/Asuncion" value="PYT4PYST,M10.3.0/0,M3.2.0/0" />
-	<zone name="America/Atikokan" value="EST5" />
-	<zone name="America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Bahia" value="BRT3" />
-	<zone name="America/Barbados" value="AST4" />
-	<zone name="America/Belem" value="BRT3" />
-	<zone name="America/Belize" value="CST6" />
-	<zone name="America/Blanc-Sablon" value="AST4" />
-	<zone name="America/Boa_Vista" value="AMT4" />
-	<zone name="America/Bogota" value="COT5" />
-	<zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Campo_Grande" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Caracas" value="VET4:30" />
-	<zone name="America/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cayenne" value="GFT3" />
-	<zone name="America/Cayman" value="EST5" />
-	<zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Coral_Harbour" value="EST5" />
-	<zone name="America/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Costa_Rica" value="CST6" />
-	<zone name="America/Cuiaba" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Curacao" value="AST4" />
-	<zone name="America/Danmarkshavn" value="GMT0" />
-	<zone name="America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dawson_Creek" value="MST7" />
-	<zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dominica" value="AST4" />
-	<zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Eirunepe" value="ACT5" />
-	<zone name="America/El_Salvador" value="CST6" />
-	<zone name="America/Ensenada" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Fortaleza" value="BRT3" />
-	<zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Godthab" value="WGST" />
-	<zone name="America/Goose_Bay" value="AST4ADT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Grenada" value="AST4" />
-	<zone name="America/Guadeloupe" value="AST4" />
-	<zone name="America/Guatemala" value="CST6" />
-	<zone name="America/Guayaquil" value="ECT5" />
-	<zone name="America/Guyana" value="GYT4" />
-	<zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Havana" value="CST5CDT,M3.3.0/0,M10.5.0/1" />
-	<zone name="America/Hermosillo" value="MST7" />
-	<zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Jamaica" value="EST5" />
-	<zone name="America/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/La_Paz" value="BOT4" />
-	<zone name="America/Lima" value="PET5" />
-	<zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Maceio" value="BRT3" />
-	<zone name="America/Managua" value="CST6" />
-	<zone name="America/Manaus" value="AMT4" />
-	<zone name="America/Marigot" value="AST4" />
-	<zone name="America/Martinique" value="AST4" />
-	<zone name="America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Montserrat" value="AST4" />
-	<zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Noronha" value="FNT2" />
-	<zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Panama" value="EST5" />
-	<zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Paramaribo" value="SRT3" />
-	<zone name="America/Phoenix" value="MST7" />
-	<zone name="America/Port-au-Prince" value="EST5" />
-	<zone name="America/Porto_Acre" value="ACT5" />
-	<zone name="America/Port_of_Spain" value="AST4" />
-	<zone name="America/Porto_Velho" value="AMT4" />
-	<zone name="America/Puerto_Rico" value="AST4" />
-	<zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Recife" value="BRT3" />
-	<zone name="America/Regina" value="CST6" />
-	<zone name="America/Resolute" value="EST5" />
-	<zone name="America/Rio_Branco" value="ACT5" />
-	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Santiago" value="CLST" />
-	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3" />
-	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Barthelemy" value="AST4" />
-	<zone name="America/St_Johns" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/St_Kitts" value="AST4" />
-	<zone name="America/St_Lucia" value="AST4" />
-	<zone name="America/St_Thomas" value="AST4" />
-	<zone name="America/St_Vincent" value="AST4" />
-	<zone name="America/Swift_Current" value="CST6" />
-	<zone name="America/Tegucigalpa" value="CST6" />
-	<zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tijuana" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tortola" value="AST4" />
-	<zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Virgin" value="AST4" />
-	<zone name="America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anguilla" value="AST4" />
+        <zone name="America/Antigua" value="AST4" />
+        <zone name="America/Araguaina" value="STD3" />
+        <zone name="America/Argentina/Buenos_Aires" value="STD3" />
+        <zone name="America/Argentina/Catamarca" value="STD3" />
+        <zone name="America/Argentina/ComodRivadavia" value="STD3" />
+        <zone name="America/Argentina/Cordoba" value="STD3" />
+        <zone name="America/Argentina/Jujuy" value="STD3" />
+        <zone name="America/Argentina/La_Rioja" value="STD3" />
+        <zone name="America/Argentina/Mendoza" value="STD3" />
+        <zone name="America/Argentina/Rio_Gallegos" value="STD3" />
+        <zone name="America/Argentina/Salta" value="STD3" />
+        <zone name="America/Argentina/San_Juan" value="STD3" />
+        <zone name="America/Argentina/San_Luis" value="STD3" />
+        <zone name="America/Argentina/Tucuman" value="STD3" />
+        <zone name="America/Argentina/Ushuaia" value="STD3" />
+        <zone name="America/Aruba" value="AST4" />
+        <zone name="America/Asuncion" value="STD4DST,M10.1.0/0,M3.4.0/0" />
+        <zone name="America/Atikokan" value="EST5" />
+        <zone name="America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Bahia" value="STD3" />
+        <zone name="America/Bahia_Banderas" value="CST6" />
+        <zone name="America/Barbados" value="AST4" />
+        <zone name="America/Belem" value="STD3" />
+        <zone name="America/Belize" value="CST6" />
+        <zone name="America/Blanc-Sablon" value="AST4" />
+        <zone name="America/Boa_Vista" value="STD4" />
+        <zone name="America/Bogota" value="STD5" />
+        <zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Buenos_Aires" value="STD3" />
+        <zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Campo_Grande" value="STD4" />
+        <zone name="America/Cancun" value="EST5" />
+        <zone name="America/Caracas" value="STD4" />
+        <zone name="America/Catamarca" value="STD3" />
+        <zone name="America/Cayenne" value="STD3" />
+        <zone name="America/Cayman" value="EST5" />
+        <zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Chihuahua" value="CST6" />
+        <zone name="America/Ciudad_Juarez" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Coral_Harbour" value="EST5" />
+        <zone name="America/Cordoba" value="STD3" />
+        <zone name="America/Costa_Rica" value="CST6" />
+        <zone name="America/Creston" value="MST7" />
+        <zone name="America/Cuiaba" value="STD4" />
+        <zone name="America/Curacao" value="AST4" />
+        <zone name="America/Danmarkshavn" value="GMT0" />
+        <zone name="America/Dawson" value="MST7" />
+        <zone name="America/Dawson_Creek" value="MST7" />
+        <zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Dominica" value="AST4" />
+        <zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Eirunepe" value="STD5" />
+        <zone name="America/El_Salvador" value="CST6" />
+        <zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fort_Nelson" value="MST7" />
+        <zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fortaleza" value="STD3" />
+        <zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Godthab" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Grenada" value="AST4" />
+        <zone name="America/Guadeloupe" value="AST4" />
+        <zone name="America/Guatemala" value="CST6" />
+        <zone name="America/Guayaquil" value="STD5" />
+        <zone name="America/Guyana" value="STD4" />
+        <zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
+        <zone name="America/Hermosillo" value="MST7" />
+        <zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Jamaica" value="EST5" />
+        <zone name="America/Jujuy" value="STD3" />
+        <zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kralendijk" value="AST4" />
+        <zone name="America/La_Paz" value="STD4" />
+        <zone name="America/Lima" value="STD5" />
+        <zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Lower_Princes" value="AST4" />
+        <zone name="America/Maceio" value="STD3" />
+        <zone name="America/Managua" value="CST6" />
+        <zone name="America/Manaus" value="STD4" />
+        <zone name="America/Marigot" value="AST4" />
+        <zone name="America/Martinique" value="AST4" />
+        <zone name="America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mazatlan" value="MST7" />
+        <zone name="America/Mendoza" value="STD3" />
+        <zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Merida" value="CST6" />
+        <zone name="America/Metlakatla" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mexico_City" value="CST6" />
+        <zone name="America/Miquelon" value="STD3DST,M3.2.0,M11.1.0" />
+        <zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Monterrey" value="CST6" />
+        <zone name="America/Montevideo" value="STD3" />
+        <zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Montserrat" value="AST4" />
+        <zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Noronha" value="STD2" />
+        <zone name="America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nuuk" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Ojinaga" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Panama" value="EST5" />
+        <zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Paramaribo" value="STD3" />
+        <zone name="America/Phoenix" value="MST7" />
+        <zone name="America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Port_of_Spain" value="AST4" />
+        <zone name="America/Porto_Acre" value="STD5" />
+        <zone name="America/Porto_Velho" value="STD4" />
+        <zone name="America/Puerto_Rico" value="AST4" />
+        <zone name="America/Punta_Arenas" value="STD3" />
+        <zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Recife" value="STD3" />
+        <zone name="America/Regina" value="CST6" />
+        <zone name="America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rio_Branco" value="STD5" />
+        <zone name="America/Rosario" value="STD3" />
+        <zone name="America/Santa_Isabel" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Santarem" value="STD3" />
+        <zone name="America/Santiago" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="America/Santo_Domingo" value="AST4" />
+        <zone name="America/Sao_Paulo" value="STD3" />
+        <zone name="America/Scoresbysund" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Barthelemy" value="AST4" />
+        <zone name="America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Kitts" value="AST4" />
+        <zone name="America/St_Lucia" value="AST4" />
+        <zone name="America/St_Thomas" value="AST4" />
+        <zone name="America/St_Vincent" value="AST4" />
+        <zone name="America/Swift_Current" value="CST6" />
+        <zone name="America/Tegucigalpa" value="CST6" />
+        <zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tortola" value="AST4" />
+        <zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Virgin" value="AST4" />
+        <zone name="America/Whitehorse" value="MST7" />
+        <zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
 
-	<zone name="Antarctica/Casey" value="WST-8" />
-	<zone name="Antarctica/Davis" value="DAVT-7" />
-	<zone name="Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="Antarctica/Mawson" value="MAWT-6" />
-	<zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Palmer" value="CLST" />
-	<zone name="Antarctica/Rothera" value="ROTT3" />
-	<zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Syowa" value="SYOT-3" />
-	<zone name="Antarctica/Vostok" value="VOST-6" />
+        <zone name="Antarctica/Casey" value="STD-11" />
+        <zone name="Antarctica/Davis" value="STD-7" />
+        <zone name="Antarctica/DumontDUrville" value="STD-10" />
+        <zone name="Antarctica/Macquarie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Antarctica/Mawson" value="STD-5" />
+        <zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Palmer" value="STD3" />
+        <zone name="Antarctica/Rothera" value="STD3" />
+        <zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Syowa" value="STD-3" />
+        <zone name="Antarctica/Troll" value="STD-0DST-2,M3.5.0/1,M10.5.0/3" />
+        <zone name="Antarctica/Vostok" value="STD-6" />
 
-	<zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Asia/Aden" value="AST-3" />
-	<zone name="Asia/Almaty" value="ALMT-6" />
-	<zone name="Asia/Amman" value="EET-2EEST,M3.5.4/0,M10.5.5/1" />
-	<zone name="Asia/Anadyr" value="ANAT-12ANAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Aqtau" value="AQTT-5" />
-	<zone name="Asia/Aqtobe" value="AQTT-5" />
-	<zone name="Asia/Ashgabat" value="TMT-5" />
-	<zone name="Asia/Ashkhabad" value="TMT-5" />
-	<zone name="Asia/Baghdad" value="AST-3" />
-	<zone name="Asia/Bahrain" value="AST-3" />
-	<zone name="Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="Asia/Bangkok" value="ICT-7" />
-	<zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="Asia/Bishkek" value="KGT-6" />
-	<zone name="Asia/Brunei" value="BNT-8" />
-	<zone name="Asia/Calcutta" value="IST-5:30" />
-	<zone name="Asia/Choibalsan" value="CHOT-9" />
-	<zone name="Asia/Chongqing" value="CST-8" />
-	<zone name="Asia/Chungking" value="CST-8" />
-	<zone name="Asia/Colombo" value="IST-5:30" />
-	<zone name="Asia/Dacca" value="BDT-6" />
-	<zone name="Asia/Damascus" value="EET-2EEST,M4.1.5/0,J274/0" />
-	<zone name="Asia/Dhaka" value="BDT-6" />
-	<zone name="Asia/Dili" value="TLT-9" />
-	<zone name="Asia/Dubai" value="GST-4" />
-	<zone name="Asia/Dushanbe" value="TJT-5" />
-	<zone name="Asia/Gaza" value="EET-2EEST,J91/0,M9.2.4" />
-	<zone name="Asia/Harbin" value="CST-8" />
-	<zone name="Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="Asia/Hong_Kong" value="HKT-8" />
-	<zone name="Asia/Hovd" value="HOVT-7" />
-	<zone name="Asia/Irkutsk" value="IRKT-8IRKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Jakarta" value="WIT-7" />
-	<zone name="Asia/Jayapura" value="EIT-9" />
-	<zone name="Asia/Jerusalem" value="IDDT" />
-	<zone name="Asia/Kabul" value="AFT-4:30" />
-	<zone name="Asia/Kamchatka" value="PETT-12PETST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Karachi" value="PKT-5" />
-	<zone name="Asia/Kashgar" value="CST-8" />
-	<zone name="Asia/Katmandu" value="NPT-5:45" />
-	<zone name="Asia/Kolkata" value="IST-5:30" />
-	<zone name="Asia/Krasnoyarsk" value="KRAT-7KRAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="Asia/Kuching" value="MYT-8" />
-	<zone name="Asia/Kuwait" value="AST-3" />
-	<zone name="Asia/Macao" value="CST-8" />
-	<zone name="Asia/Macau" value="CST-8" />
-	<zone name="Asia/Magadan" value="MAGT-11MAGST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Makassar" value="CIT-8" />
-	<zone name="Asia/Manila" value="PHT-8" />
-	<zone name="Asia/Muscat" value="GST-4" />
-	<zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Novosibirsk" value="NOVT-6NOVST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Omsk" value="OMST-6OMSST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Oral" value="ORAT-5" />
-	<zone name="Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="Asia/Pontianak" value="WIT-7" />
-	<zone name="Asia/Pyongyang" value="KST-9" />
-	<zone name="Asia/Qatar" value="AST-3" />
-	<zone name="Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="Asia/Rangoon" value="MMT-6:30" />
-	<zone name="Asia/Riyadh" value="AST-3" />
-	<zone name="Asia/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh89" value="zzz-3:07:04" />
-	<zone name="Asia/Saigon" value="ICT-7" />
-	<zone name="Asia/Sakhalin" value="SAKT-10SAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Samarkand" value="UZT-5" />
-	<zone name="Asia/Seoul" value="KST-9" />
-	<zone name="Asia/Shanghai" value="CST-8" />
-	<zone name="Asia/Singapore" value="SGT-8" />
-	<zone name="Asia/Taipei" value="CST-8" />
-	<zone name="Asia/Tashkent" value="UZT-5" />
-	<zone name="Asia/Tbilisi" value="GET-4" />
-	<zone name="Asia/Tehran" value="IRDT" />
-	<zone name="Asia/Tel_Aviv" value="IDDT" />
-	<zone name="Asia/Thimbu" value="BTT-6" />
-	<zone name="Asia/Thimphu" value="BTT-6" />
-	<zone name="Asia/Tokyo" value="JST-9" />
-	<zone name="Asia/Ujung_Pandang" value="CIT-8" />
-	<zone name="Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="Asia/Urumqi" value="CST-8" />
-	<zone name="Asia/Vientiane" value="ICT-7" />
-	<zone name="Asia/Vladivostok" value="VLAT-10VLAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yakutsk" value="YAKT-9YAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yekaterinburg" value="YEKT-5YEKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yerevan" value="AMT-4AMST,M3.5.0,M10.5.0/3" />
+        <zone name="Asia/Aden" value="STD-3" />
+        <zone name="Asia/Almaty" value="STD-6" />
+        <zone name="Asia/Amman" value="STD-3" />
+        <zone name="Asia/Anadyr" value="STD-12" />
+        <zone name="Asia/Aqtau" value="STD-5" />
+        <zone name="Asia/Aqtobe" value="STD-5" />
+        <zone name="Asia/Ashgabat" value="STD-5" />
+        <zone name="Asia/Ashkhabad" value="STD-5" />
+        <zone name="Asia/Atyrau" value="STD-5" />
+        <zone name="Asia/Baghdad" value="STD-3" />
+        <zone name="Asia/Bahrain" value="STD-3" />
+        <zone name="Asia/Baku" value="STD-4" />
+        <zone name="Asia/Bangkok" value="STD-7" />
+        <zone name="Asia/Barnaul" value="STD-7" />
+        <zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
+        <zone name="Asia/Bishkek" value="STD-6" />
+        <zone name="Asia/Brunei" value="STD-8" />
+        <zone name="Asia/Calcutta" value="IST-5:30" />
+        <zone name="Asia/Chita" value="STD-9" />
+        <zone name="Asia/Choibalsan" value="STD-8" />
+        <zone name="Asia/Chongqing" value="CST-8" />
+        <zone name="Asia/Chungking" value="CST-8" />
+        <zone name="Asia/Colombo" value="STD-5:30" />
+        <zone name="Asia/Dacca" value="STD-6" />
+        <zone name="Asia/Damascus" value="STD-3" />
+        <zone name="Asia/Dhaka" value="STD-6" />
+        <zone name="Asia/Dili" value="STD-9" />
+        <zone name="Asia/Dubai" value="STD-4" />
+        <zone name="Asia/Dushanbe" value="STD-5" />
+        <zone name="Asia/Famagusta" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Gaza" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Harbin" value="CST-8" />
+        <zone name="Asia/Hebron" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Ho_Chi_Minh" value="STD-7" />
+        <zone name="Asia/Hong_Kong" value="HKT-8" />
+        <zone name="Asia/Hovd" value="STD-7" />
+        <zone name="Asia/Irkutsk" value="STD-8" />
+        <zone name="Asia/Istanbul" value="STD-3" />
+        <zone name="Asia/Jakarta" value="WIB-7" />
+        <zone name="Asia/Jayapura" value="WIT-9" />
+        <zone name="Asia/Jerusalem" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Kabul" value="STD-4:30" />
+        <zone name="Asia/Kamchatka" value="STD-12" />
+        <zone name="Asia/Karachi" value="PKT-5" />
+        <zone name="Asia/Kashgar" value="STD-6" />
+        <zone name="Asia/Kathmandu" value="STD-5:45" />
+        <zone name="Asia/Katmandu" value="STD-5:45" />
+        <zone name="Asia/Khandyga" value="STD-9" />
+        <zone name="Asia/Kolkata" value="IST-5:30" />
+        <zone name="Asia/Krasnoyarsk" value="STD-7" />
+        <zone name="Asia/Kuala_Lumpur" value="STD-8" />
+        <zone name="Asia/Kuching" value="STD-8" />
+        <zone name="Asia/Kuwait" value="STD-3" />
+        <zone name="Asia/Macao" value="CST-8" />
+        <zone name="Asia/Macau" value="CST-8" />
+        <zone name="Asia/Magadan" value="STD-11" />
+        <zone name="Asia/Makassar" value="WITA-8" />
+        <zone name="Asia/Manila" value="PST-8" />
+        <zone name="Asia/Muscat" value="STD-4" />
+        <zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Novokuznetsk" value="STD-7" />
+        <zone name="Asia/Novosibirsk" value="STD-7" />
+        <zone name="Asia/Omsk" value="STD-6" />
+        <zone name="Asia/Oral" value="STD-5" />
+        <zone name="Asia/Phnom_Penh" value="STD-7" />
+        <zone name="Asia/Pontianak" value="WIB-7" />
+        <zone name="Asia/Pyongyang" value="KST-9" />
+        <zone name="Asia/Qatar" value="STD-3" />
+        <zone name="Asia/Qostanay" value="STD-6" />
+        <zone name="Asia/Qyzylorda" value="STD-5" />
+        <zone name="Asia/Rangoon" value="STD-6:30" />
+        <zone name="Asia/Riyadh" value="STD-3" />
+        <zone name="Asia/Saigon" value="STD-7" />
+        <zone name="Asia/Sakhalin" value="STD-11" />
+        <zone name="Asia/Samarkand" value="STD-5" />
+        <zone name="Asia/Seoul" value="KST-9" />
+        <zone name="Asia/Shanghai" value="CST-8" />
+        <zone name="Asia/Singapore" value="STD-8" />
+        <zone name="Asia/Srednekolymsk" value="STD-11" />
+        <zone name="Asia/Taipei" value="CST-8" />
+        <zone name="Asia/Tashkent" value="STD-5" />
+        <zone name="Asia/Tbilisi" value="STD-4" />
+        <zone name="Asia/Tehran" value="STD-3:30" />
+        <zone name="Asia/Tel_Aviv" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Thimbu" value="STD-6" />
+        <zone name="Asia/Thimphu" value="STD-6" />
+        <zone name="Asia/Tokyo" value="JST-9" />
+        <zone name="Asia/Tomsk" value="STD-7" />
+        <zone name="Asia/Ujung_Pandang" value="WITA-8" />
+        <zone name="Asia/Ulaanbaatar" value="STD-8" />
+        <zone name="Asia/Ulan_Bator" value="STD-8" />
+        <zone name="Asia/Urumqi" value="STD-6" />
+        <zone name="Asia/Ust-Nera" value="STD-10" />
+        <zone name="Asia/Vientiane" value="STD-7" />
+        <zone name="Asia/Vladivostok" value="STD-10" />
+        <zone name="Asia/Yakutsk" value="STD-9" />
+        <zone name="Asia/Yangon" value="STD-6:30" />
+        <zone name="Asia/Yekaterinburg" value="STD-5" />
+        <zone name="Asia/Yerevan" value="STD-4" />
 
-	<zone name="Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Reykjavik" value="GMT0" />
-	<zone name="Atlantic/South_Georgia" value="GST2" />
-	<zone name="Atlantic/Stanley" value="FKT4FKST,M9.1.0,M4.3.0" />
-	<zone name="Atlantic/St_Helena" value="GMT0" />
+        <zone name="Atlantic/Azores" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Cape_Verde" value="STD1" />
+        <zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Reykjavik" value="GMT0" />
+        <zone name="Atlantic/South_Georgia" value="STD2" />
+        <zone name="Atlantic/St_Helena" value="GMT0" />
+        <zone name="Atlantic/Stanley" value="STD3" />
 
-	<zone name="Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Brisbane" value="EST-10" />
-	<zone name="Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Darwin" value="CST-9:30" />
-	<zone name="Australia/Eucla" value="CWST-8:45" />
-	<zone name="Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Lindeman" value="EST-10" />
-	<zone name="Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/North" value="CST-9:30" />
-	<zone name="Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Perth" value="WST-8" />
-	<zone name="Australia/Queensland" value="EST-10" />
-	<zone name="Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/West" value="WST-8" />
-	<zone name="Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Brisbane" value="AEST-10" />
+        <zone name="Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Darwin" value="ACST-9:30" />
+        <zone name="Australia/Eucla" value="STD-8:45" />
+        <zone name="Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/LHI" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Lindeman" value="AEST-10" />
+        <zone name="Australia/Lord_Howe" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/North" value="ACST-9:30" />
+        <zone name="Australia/Perth" value="AWST-8" />
+        <zone name="Australia/Queensland" value="AEST-10" />
+        <zone name="Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/West" value="AWST-8" />
+        <zone name="Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
 
-	<zone name="Brazil/Acre" value="ACT5" />
-	<zone name="Brazil/DeNoronha" value="FNT2" />
-	<zone name="Brazil/East" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
-	<zone name="Brazil/West" value="AMT4" />
+        <zone name="Brazil/Acre" value="STD5" />
+        <zone name="Brazil/DeNoronha" value="STD2" />
+        <zone name="Brazil/East" value="STD3" />
+        <zone name="Brazil/West" value="STD4" />
 
-	<zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/East-Saskatchewan" value="CST6" />
-	<zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Saskatchewan" value="CST6" />
-	<zone name="Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Chile/Continental" value="CLST" />
-	<zone name="Chile/EasterIsland" value="EASST" />
+        <zone name="CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
 
-	<zone name="Etc/GMT" value="GMT0" />
-	<zone name="Etc/GMT0" value="GMT0" />
-	<zone name="Etc/GMT-0" value="GMT0" />
-	<zone name="Etc/GMT+0" value="GMT0" />
-	<zone name="Etc/GMT-1" value="GMT-1" />
-	<zone name="Etc/GMT+1" value="GMT+1" />
-	<zone name="Etc/GMT-10" value="GMT-10" />
-	<zone name="Etc/GMT+10" value="GMT+10" />
-	<zone name="Etc/GMT-11" value="GMT-11" />
-	<zone name="Etc/GMT+11" value="GMT+11" />
-	<zone name="Etc/GMT-12" value="GMT-12" />
-	<zone name="Etc/GMT+12" value="GMT+12" />
-	<zone name="Etc/GMT-13" value="GMT-13" />
-	<zone name="Etc/GMT-14" value="GMT-14" />
-	<zone name="Etc/GMT-2" value="GMT-2" />
-	<zone name="Etc/GMT+2" value="GMT+2" />
-	<zone name="Etc/GMT-3" value="GMT-3" />
-	<zone name="Etc/GMT+3" value="GMT+3" />
-	<zone name="Etc/GMT-4" value="GMT-4" />
-	<zone name="Etc/GMT+4" value="GMT+4" />
-	<zone name="Etc/GMT-5" value="GMT-5" />
-	<zone name="Etc/GMT+5" value="GMT+5" />
-	<zone name="Etc/GMT-6" value="GMT-6" />
-	<zone name="Etc/GMT+6" value="GMT+6" />
-	<zone name="Etc/GMT-7" value="GMT-7" />
-	<zone name="Etc/GMT+7" value="GMT+7" />
-	<zone name="Etc/GMT-8" value="GMT-8" />
-	<zone name="Etc/GMT+8" value="GMT+8" />
-	<zone name="Etc/GMT-9" value="GMT-9" />
-	<zone name="Etc/GMT+9" value="GMT+9" />
-	<zone name="Etc/Greenwich" value="GMT0" />
-	<zone name="Etc/UCT" value="UCT0" />
-	<zone name="Etc/Universal" value="UTC0" />
-	<zone name="Etc/UTC" value="UTC0" />
-	<zone name="Etc/Zulu" value="UTC0" />
+        <zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Saskatchewan" value="CST6" />
+        <zone name="Canada/Yukon" value="MST7" />
 
-	<zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Kaliningrad" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Minsk" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Moscow" value="MSK-3MSD,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Samara" value="SAMT-4SAMST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Simferopol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Volgograd" value="VOLT-3VOLST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Chile/Continental" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="Chile/EasterIsland" value="STD6DST,M9.1.6/22,M4.1.6/22" />
 
-	<zone name="Indian/Antananarivo" value="EAT-3" />
-	<zone name="Indian/Chagos" value="IOT-6" />
-	<zone name="Indian/Christmas" value="CXT-7" />
-	<zone name="Indian/Cocos" value="CCT-6:30" />
-	<zone name="Indian/Comoro" value="EAT-3" />
-	<zone name="Indian/Kerguelen" value="TFT-5" />
-	<zone name="Indian/Mahe" value="SCT-4" />
-	<zone name="Indian/Maldives" value="MVT-5" />
-	<zone name="Indian/Mauritius" value="MUT-4" />
-	<zone name="Indian/Mayotte" value="EAT-3" />
-	<zone name="Indian/Reunion" value="RET-4" />
+        <zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
 
-	<zone name="Mexico/BajaNorte" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
+        <zone name="EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 
-	<zone name="Mideast/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh89" value="zzz-3:07:04" />
+        <zone name="EST" value="EST5" />
 
-	<zone name="Pacific/Apia" value="WST11" />
-	<zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="Pacific/Easter" value="EASST" />
-	<zone name="Pacific/Efate" value="VUT-11" />
-	<zone name="Pacific/Enderbury" value="PHOT-13" />
-	<zone name="Pacific/Fakaofo" value="TKT10" />
-	<zone name="Pacific/Fiji" value="FJT-12" />
-	<zone name="Pacific/Funafuti" value="TVT-12" />
-	<zone name="Pacific/Galapagos" value="GALT6" />
-	<zone name="Pacific/Gambier" value="GAMT9" />
-	<zone name="Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="Pacific/Guam" value="ChST-10" />
-	<zone name="Pacific/Honolulu" value="HST10" />
-	<zone name="Pacific/Johnston" value="HST10" />
-	<zone name="Pacific/Kiritimati" value="LINT-14" />
-	<zone name="Pacific/Kosrae" value="KOST-11" />
-	<zone name="Pacific/Kwajalein" value="MHT-12" />
-	<zone name="Pacific/Majuro" value="MHT-12" />
-	<zone name="Pacific/Marquesas" value="MART9:30" />
-	<zone name="Pacific/Midway" value="SST11" />
-	<zone name="Pacific/Nauru" value="NRT-12" />
-	<zone name="Pacific/Niue" value="NUT11" />
-	<zone name="Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="Pacific/Noumea" value="NCT-11" />
-	<zone name="Pacific/Pago_Pago" value="SST11" />
-	<zone name="Pacific/Palau" value="PWT-9" />
-	<zone name="Pacific/Pitcairn" value="PST8" />
-	<zone name="Pacific/Ponape" value="PONT-11" />
-	<zone name="Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="Pacific/Rarotonga" value="CKT10" />
-	<zone name="Pacific/Saipan" value="ChST-10" />
-	<zone name="Pacific/Samoa" value="SST11" />
-	<zone name="Pacific/Tahiti" value="TAHT10" />
-	<zone name="Pacific/Tarawa" value="GILT-12" />
-	<zone name="Pacific/Tongatapu" value="TOT-13" />
-	<zone name="Pacific/Truk" value="TRUT-10" />
-	<zone name="Pacific/Wake" value="WAKT-12" />
-	<zone name="Pacific/Wallis" value="WFT-12" />
-	<zone name="Pacific/Yap" value="TRUT-10" />
+        <zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
 
-	<zone name="SystemV/AST4" value="AST4" />
-	<zone name="SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/CST6" value="CST6" />
-	<zone name="SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/EST5" value="EST5" />
-	<zone name="SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/HST10" value="HST10" />
-	<zone name="SystemV/MST7" value="MST7" />
-	<zone name="SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/PST8" value="PST8" />
-	<zone name="SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/YST9" value="GAMT9" />
-	<zone name="SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="Egypt" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
 
-	<zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="US/Arizona" value="MST7" />
-	<zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Hawaii" value="HST10" />
-	<zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Samoa" value="SST11" />
+        <zone name="Eire" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+
+        <zone name="Etc/GMT" value="GMT0" />
+        <zone name="Etc/GMT+0" value="GMT0" />
+        <zone name="Etc/GMT+1" value="GMT1" />
+        <zone name="Etc/GMT+10" value="GMT10" />
+        <zone name="Etc/GMT+11" value="GMT11" />
+        <zone name="Etc/GMT+12" value="GMT12" />
+        <zone name="Etc/GMT+2" value="GMT2" />
+        <zone name="Etc/GMT+3" value="GMT3" />
+        <zone name="Etc/GMT+4" value="GMT4" />
+        <zone name="Etc/GMT+5" value="GMT5" />
+        <zone name="Etc/GMT+6" value="GMT6" />
+        <zone name="Etc/GMT+7" value="GMT7" />
+        <zone name="Etc/GMT+8" value="GMT8" />
+        <zone name="Etc/GMT+9" value="GMT9" />
+        <zone name="Etc/GMT-0" value="GMT0" />
+        <zone name="Etc/GMT-1" value="GMT-1" />
+        <zone name="Etc/GMT-10" value="GMT-10" />
+        <zone name="Etc/GMT-11" value="GMT-11" />
+        <zone name="Etc/GMT-12" value="GMT-12" />
+        <zone name="Etc/GMT-13" value="GMT-13" />
+        <zone name="Etc/GMT-14" value="GMT-14" />
+        <zone name="Etc/GMT-2" value="GMT-2" />
+        <zone name="Etc/GMT-3" value="GMT-3" />
+        <zone name="Etc/GMT-4" value="GMT-4" />
+        <zone name="Etc/GMT-5" value="GMT-5" />
+        <zone name="Etc/GMT-6" value="GMT-6" />
+        <zone name="Etc/GMT-7" value="GMT-7" />
+        <zone name="Etc/GMT-8" value="GMT-8" />
+        <zone name="Etc/GMT-9" value="GMT-9" />
+        <zone name="Etc/GMT0" value="GMT0" />
+        <zone name="Etc/Greenwich" value="GMT0" />
+        <zone name="Etc/UCT" value="UTC0" />
+        <zone name="Etc/UTC" value="UTC0" />
+        <zone name="Etc/Universal" value="UTC0" />
+        <zone name="Etc/Zulu" value="UTC0" />
+
+        <zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Astrakhan" value="STD-4" />
+        <zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Dublin" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+        <zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Istanbul" value="STD-3" />
+        <zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Kaliningrad" value="EET-2" />
+        <zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Kirov" value="MSK-3" />
+        <zone name="Europe/Kyiv" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Minsk" value="STD-3" />
+        <zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Moscow" value="MSK-3" />
+        <zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Samara" value="STD-4" />
+        <zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Saratov" value="STD-4" />
+        <zone name="Europe/Simferopol" value="MSK-3" />
+        <zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Ulyanovsk" value="STD-4" />
+        <zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Volgograd" value="MSK-3" />
+        <zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Factory" value="STD0" />
+
+        <zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GMT" value="GMT0" />
+
+        <zone name="GMT+0" value="GMT0" />
+
+        <zone name="GMT-0" value="GMT0" />
+
+        <zone name="GMT0" value="GMT0" />
+
+        <zone name="Greenwich" value="GMT0" />
+
+        <zone name="HST" value="HST10" />
+
+        <zone name="Hongkong" value="HKT-8" />
+
+        <zone name="Iceland" value="GMT0" />
+
+        <zone name="Indian/Antananarivo" value="EAT-3" />
+        <zone name="Indian/Chagos" value="STD-6" />
+        <zone name="Indian/Christmas" value="STD-7" />
+        <zone name="Indian/Cocos" value="STD-6:30" />
+        <zone name="Indian/Comoro" value="EAT-3" />
+        <zone name="Indian/Kerguelen" value="STD-5" />
+        <zone name="Indian/Mahe" value="STD-4" />
+        <zone name="Indian/Maldives" value="STD-5" />
+        <zone name="Indian/Mauritius" value="STD-4" />
+        <zone name="Indian/Mayotte" value="EAT-3" />
+        <zone name="Indian/Reunion" value="STD-4" />
+
+        <zone name="Iran" value="STD-3:30" />
+
+        <zone name="Israel" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+
+        <zone name="Jamaica" value="EST5" />
+
+        <zone name="Japan" value="JST-9" />
+
+        <zone name="Kwajalein" value="STD-12" />
+
+        <zone name="Libya" value="EET-2" />
+
+        <zone name="MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="MST" value="MST7" />
+
+        <zone name="MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Mexico/BajaSur" value="MST7" />
+        <zone name="Mexico/General" value="CST6" />
+
+        <zone name="NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+
+        <zone name="NZ-CHAT" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+
+        <zone name="Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="PRC" value="CST-8" />
+
+        <zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
+
+        <zone name="Pacific/Apia" value="STD-13" />
+        <zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Pacific/Bougainville" value="STD-11" />
+        <zone name="Pacific/Chatham" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+        <zone name="Pacific/Chuuk" value="STD-10" />
+        <zone name="Pacific/Easter" value="STD6DST,M9.1.6/22,M4.1.6/22" />
+        <zone name="Pacific/Efate" value="STD-11" />
+        <zone name="Pacific/Enderbury" value="STD-13" />
+        <zone name="Pacific/Fakaofo" value="STD-13" />
+        <zone name="Pacific/Fiji" value="STD-12" />
+        <zone name="Pacific/Funafuti" value="STD-12" />
+        <zone name="Pacific/Galapagos" value="STD6" />
+        <zone name="Pacific/Gambier" value="STD9" />
+        <zone name="Pacific/Guadalcanal" value="STD-11" />
+        <zone name="Pacific/Guam" value="ChST-10" />
+        <zone name="Pacific/Honolulu" value="HST10" />
+        <zone name="Pacific/Johnston" value="HST10" />
+        <zone name="Pacific/Kanton" value="STD-13" />
+        <zone name="Pacific/Kiritimati" value="STD-14" />
+        <zone name="Pacific/Kosrae" value="STD-11" />
+        <zone name="Pacific/Kwajalein" value="STD-12" />
+        <zone name="Pacific/Majuro" value="STD-12" />
+        <zone name="Pacific/Marquesas" value="STD9:30" />
+        <zone name="Pacific/Midway" value="SST11" />
+        <zone name="Pacific/Nauru" value="STD-12" />
+        <zone name="Pacific/Niue" value="STD11" />
+        <zone name="Pacific/Norfolk" value="STD-11DST,M10.1.0,M4.1.0/3" />
+        <zone name="Pacific/Noumea" value="STD-11" />
+        <zone name="Pacific/Pago_Pago" value="SST11" />
+        <zone name="Pacific/Palau" value="STD-9" />
+        <zone name="Pacific/Pitcairn" value="STD8" />
+        <zone name="Pacific/Pohnpei" value="STD-11" />
+        <zone name="Pacific/Ponape" value="STD-11" />
+        <zone name="Pacific/Port_Moresby" value="STD-10" />
+        <zone name="Pacific/Rarotonga" value="STD10" />
+        <zone name="Pacific/Saipan" value="ChST-10" />
+        <zone name="Pacific/Samoa" value="SST11" />
+        <zone name="Pacific/Tahiti" value="STD10" />
+        <zone name="Pacific/Tarawa" value="STD-12" />
+        <zone name="Pacific/Tongatapu" value="STD-13" />
+        <zone name="Pacific/Truk" value="STD-10" />
+        <zone name="Pacific/Wake" value="STD-12" />
+        <zone name="Pacific/Wallis" value="STD-12" />
+        <zone name="Pacific/Yap" value="STD-10" />
+
+        <zone name="Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
+
+        <zone name="ROC" value="CST-8" />
+
+        <zone name="ROK" value="KST-9" />
+
+        <zone name="Singapore" value="STD-8" />
+
+        <zone name="Turkey" value="STD-3" />
+
+        <zone name="UCT" value="UTC0" />
+
+        <zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="US/Arizona" value="MST7" />
+        <zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Hawaii" value="HST10" />
+        <zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="US/Samoa" value="SST11" />
+
+        <zone name="UTC" value="UTC0" />
+
+        <zone name="Universal" value="UTC0" />
+
+        <zone name="W-SU" value="MSK-3" />
+
+        <zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
+
+        <zone name="Zulu" value="UTC0" />
     </timezones>
 </configuration>
diff --git a/conf/sbc/dialplan/default.xml b/conf/sbc/dialplan/default.xml
index bcdd5ddf01..aa3d624033 100644
--- a/conf/sbc/dialplan/default.xml
+++ b/conf/sbc/dialplan/default.xml
@@ -115,24 +115,6 @@
       </condition>
     </extension>
     -->
-    <!--
-	snom button demo, call 9000 to make button 2 mapped to transfer the current call to a conference
-    -->
-
-    <extension name="snom-demo-2">
-      <condition field="destination_number" expression="^9001$">
-	<action application="eval" data="${snom_bind_key(2 off DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message notused)}"/>
-	<action application="transfer" data="3000"/>
-      </condition>
-    </extension>
-    
-    <extension name="snom-demo-1">
-      <condition field="destination_number" expression="^9000$">
-	<!--<key> <light> <label> <user> <host> <profile> <action_name> <action>-->
-	<action application="eval" data="${snom_bind_key(2 on DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message api+uuid_transfer ${uuid} 9001)}"/>
-	<action application="playback" data="$${hold_music}"/>
-      </condition>
-    </extension>
 
     <extension name="eavesdrop">
       <condition field="destination_number" expression="^88(.*)$|^\*0(.*)$">
diff --git a/conf/sbc/vars.xml b/conf/sbc/vars.xml
index 6186ff7cc7..d77d7f17fc 100644
--- a/conf/sbc/vars.xml
+++ b/conf/sbc/vars.xml
@@ -58,14 +58,6 @@
        G723             - G723.1 in passthru mode. (mod_g723_1)
        AMR              - AMR in passthru mode. (mod_amr)
        
-       These are the passthru video codecs: (mod_h26x)
-       
-       H261             - H.261 Video
-       H263             - H.263 Video
-       H263-1998        - H.263-1998 Video
-       H263-2000        - H.263-2000 Video
-       H264             - H.264 Video
-
   -->
   <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM"/>
   <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA,GSM"/>
diff --git a/conf/testing/autoload_configs/timezones.conf.xml b/conf/testing/autoload_configs/timezones.conf.xml
index 0af4c77d7f..9ddded792c 100644
--- a/conf/testing/autoload_configs/timezones.conf.xml
+++ b/conf/testing/autoload_configs/timezones.conf.xml
@@ -1,1850 +1,661 @@
 <configuration name="timezones.conf" description="Timezones">
     <timezones>
-	<zone name="Africa/Abidjan" value="GMT0" />
-	<zone name="Africa/Accra" value="GMT0" />
-	<zone name="Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="Africa/Algiers" value="CET-1" />
-	<zone name="Africa/Asmara" value="EAT-3" />
-	<zone name="Africa/Asmera" value="EAT-3" />
-	<zone name="Africa/Bamako" value="GMT0" />
-	<zone name="Africa/Bangui" value="WAT-1" />
-	<zone name="Africa/Banjul" value="GMT0" />
-	<zone name="Africa/Bissau" value="GMT0" />
-	<zone name="Africa/Blantyre" value="CAT-2" />
-	<zone name="Africa/Brazzaville" value="WAT-1" />
-	<zone name="Africa/Bujumbura" value="CAT-2" />
-	<zone name="Africa/Cairo" value="EEST" />
-	<zone name="Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Conakry" value="GMT0" />
-	<zone name="Africa/Dakar" value="GMT0" />
-	<zone name="Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="Africa/Djibouti" value="EAT-3" />
-	<zone name="Africa/Douala" value="WAT-1" />
-	<zone name="Africa/El_Aaiun" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Freetown" value="GMT0" />
-	<zone name="Africa/Gaborone" value="CAT-2" />
-	<zone name="Africa/Harare" value="CAT-2" />
-	<zone name="Africa/Johannesburg" value="SAST-2" />
-	<zone name="Africa/Juba" value="EAT-3" />
-	<zone name="Africa/Kampala" value="EAT-3" />
-	<zone name="Africa/Khartoum" value="EAT-3" />
-	<zone name="Africa/Kigali" value="CAT-2" />
-	<zone name="Africa/Kinshasa" value="WAT-1" />
-	<zone name="Africa/Lagos" value="WAT-1" />
-	<zone name="Africa/Libreville" value="WAT-1" />
-	<zone name="Africa/Lome" value="GMT0" />
-	<zone name="Africa/Luanda" value="WAT-1" />
-	<zone name="Africa/Lubumbashi" value="CAT-2" />
-	<zone name="Africa/Lusaka" value="CAT-2" />
-	<zone name="Africa/Malabo" value="WAT-1" />
-	<zone name="Africa/Maputo" value="CAT-2" />
-	<zone name="Africa/Maseru" value="SAST-2" />
-	<zone name="Africa/Mbabane" value="SAST-2" />
-	<zone name="Africa/Mogadishu" value="EAT-3" />
-	<zone name="Africa/Monrovia" value="GMT0" />
-	<zone name="Africa/Nairobi" value="EAT-3" />
-	<zone name="Africa/Ndjamena" value="WAT-1" />
-	<zone name="Africa/Niamey" value="WAT-1" />
-	<zone name="Africa/Nouakchott" value="GMT0" />
-	<zone name="Africa/Ouagadougou" value="GMT0" />
-	<zone name="Africa/Porto-Novo" value="WAT-1" />
-	<zone name="Africa/Sao_Tome" value="GMT0" />
-	<zone name="Africa/Timbuktu" value="GMT0" />
-	<zone name="Africa/Tripoli" value="EET-2" />
-	<zone name="Africa/Tunis" value="CET-1" />
-	<zone name="Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
+        <zone name="Africa/Abidjan" value="GMT0" />
+        <zone name="Africa/Accra" value="GMT0" />
+        <zone name="Africa/Addis_Ababa" value="EAT-3" />
+        <zone name="Africa/Algiers" value="CET-1" />
+        <zone name="Africa/Asmara" value="EAT-3" />
+        <zone name="Africa/Asmera" value="EAT-3" />
+        <zone name="Africa/Bamako" value="GMT0" />
+        <zone name="Africa/Bangui" value="WAT-1" />
+        <zone name="Africa/Banjul" value="GMT0" />
+        <zone name="Africa/Bissau" value="GMT0" />
+        <zone name="Africa/Blantyre" value="CAT-2" />
+        <zone name="Africa/Brazzaville" value="WAT-1" />
+        <zone name="Africa/Bujumbura" value="CAT-2" />
+        <zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
+        <zone name="Africa/Casablanca" value="STD-1" />
+        <zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Africa/Conakry" value="GMT0" />
+        <zone name="Africa/Dakar" value="GMT0" />
+        <zone name="Africa/Dar_es_Salaam" value="EAT-3" />
+        <zone name="Africa/Djibouti" value="EAT-3" />
+        <zone name="Africa/Douala" value="WAT-1" />
+        <zone name="Africa/El_Aaiun" value="STD-1" />
+        <zone name="Africa/Freetown" value="GMT0" />
+        <zone name="Africa/Gaborone" value="CAT-2" />
+        <zone name="Africa/Harare" value="CAT-2" />
+        <zone name="Africa/Johannesburg" value="SAST-2" />
+        <zone name="Africa/Juba" value="CAT-2" />
+        <zone name="Africa/Kampala" value="EAT-3" />
+        <zone name="Africa/Khartoum" value="CAT-2" />
+        <zone name="Africa/Kigali" value="CAT-2" />
+        <zone name="Africa/Kinshasa" value="WAT-1" />
+        <zone name="Africa/Lagos" value="WAT-1" />
+        <zone name="Africa/Libreville" value="WAT-1" />
+        <zone name="Africa/Lome" value="GMT0" />
+        <zone name="Africa/Luanda" value="WAT-1" />
+        <zone name="Africa/Lubumbashi" value="CAT-2" />
+        <zone name="Africa/Lusaka" value="CAT-2" />
+        <zone name="Africa/Malabo" value="WAT-1" />
+        <zone name="Africa/Maputo" value="CAT-2" />
+        <zone name="Africa/Maseru" value="SAST-2" />
+        <zone name="Africa/Mbabane" value="SAST-2" />
+        <zone name="Africa/Mogadishu" value="EAT-3" />
+        <zone name="Africa/Monrovia" value="GMT0" />
+        <zone name="Africa/Nairobi" value="EAT-3" />
+        <zone name="Africa/Ndjamena" value="WAT-1" />
+        <zone name="Africa/Niamey" value="WAT-1" />
+        <zone name="Africa/Nouakchott" value="GMT0" />
+        <zone name="Africa/Ouagadougou" value="GMT0" />
+        <zone name="Africa/Porto-Novo" value="WAT-1" />
+        <zone name="Africa/Sao_Tome" value="GMT0" />
+        <zone name="Africa/Timbuktu" value="GMT0" />
+        <zone name="Africa/Tripoli" value="EET-2" />
+        <zone name="Africa/Tunis" value="CET-1" />
+        <zone name="Africa/Windhoek" value="CAT-2" />
+
+        <zone name="America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anguilla" value="AST4" />
+        <zone name="America/Antigua" value="AST4" />
+        <zone name="America/Araguaina" value="STD3" />
+        <zone name="America/Argentina/Buenos_Aires" value="STD3" />
+        <zone name="America/Argentina/Catamarca" value="STD3" />
+        <zone name="America/Argentina/ComodRivadavia" value="STD3" />
+        <zone name="America/Argentina/Cordoba" value="STD3" />
+        <zone name="America/Argentina/Jujuy" value="STD3" />
+        <zone name="America/Argentina/La_Rioja" value="STD3" />
+        <zone name="America/Argentina/Mendoza" value="STD3" />
+        <zone name="America/Argentina/Rio_Gallegos" value="STD3" />
+        <zone name="America/Argentina/Salta" value="STD3" />
+        <zone name="America/Argentina/San_Juan" value="STD3" />
+        <zone name="America/Argentina/San_Luis" value="STD3" />
+        <zone name="America/Argentina/Tucuman" value="STD3" />
+        <zone name="America/Argentina/Ushuaia" value="STD3" />
+        <zone name="America/Aruba" value="AST4" />
+        <zone name="America/Asuncion" value="STD4DST,M10.1.0/0,M3.4.0/0" />
+        <zone name="America/Atikokan" value="EST5" />
+        <zone name="America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Bahia" value="STD3" />
+        <zone name="America/Bahia_Banderas" value="CST6" />
+        <zone name="America/Barbados" value="AST4" />
+        <zone name="America/Belem" value="STD3" />
+        <zone name="America/Belize" value="CST6" />
+        <zone name="America/Blanc-Sablon" value="AST4" />
+        <zone name="America/Boa_Vista" value="STD4" />
+        <zone name="America/Bogota" value="STD5" />
+        <zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Buenos_Aires" value="STD3" />
+        <zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Campo_Grande" value="STD4" />
+        <zone name="America/Cancun" value="EST5" />
+        <zone name="America/Caracas" value="STD4" />
+        <zone name="America/Catamarca" value="STD3" />
+        <zone name="America/Cayenne" value="STD3" />
+        <zone name="America/Cayman" value="EST5" />
+        <zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Chihuahua" value="CST6" />
+        <zone name="America/Ciudad_Juarez" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Coral_Harbour" value="EST5" />
+        <zone name="America/Cordoba" value="STD3" />
+        <zone name="America/Costa_Rica" value="CST6" />
+        <zone name="America/Creston" value="MST7" />
+        <zone name="America/Cuiaba" value="STD4" />
+        <zone name="America/Curacao" value="AST4" />
+        <zone name="America/Danmarkshavn" value="GMT0" />
+        <zone name="America/Dawson" value="MST7" />
+        <zone name="America/Dawson_Creek" value="MST7" />
+        <zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Dominica" value="AST4" />
+        <zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Eirunepe" value="STD5" />
+        <zone name="America/El_Salvador" value="CST6" />
+        <zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fort_Nelson" value="MST7" />
+        <zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fortaleza" value="STD3" />
+        <zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Godthab" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Grenada" value="AST4" />
+        <zone name="America/Guadeloupe" value="AST4" />
+        <zone name="America/Guatemala" value="CST6" />
+        <zone name="America/Guayaquil" value="STD5" />
+        <zone name="America/Guyana" value="STD4" />
+        <zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
+        <zone name="America/Hermosillo" value="MST7" />
+        <zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Jamaica" value="EST5" />
+        <zone name="America/Jujuy" value="STD3" />
+        <zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kralendijk" value="AST4" />
+        <zone name="America/La_Paz" value="STD4" />
+        <zone name="America/Lima" value="STD5" />
+        <zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Lower_Princes" value="AST4" />
+        <zone name="America/Maceio" value="STD3" />
+        <zone name="America/Managua" value="CST6" />
+        <zone name="America/Manaus" value="STD4" />
+        <zone name="America/Marigot" value="AST4" />
+        <zone name="America/Martinique" value="AST4" />
+        <zone name="America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mazatlan" value="MST7" />
+        <zone name="America/Mendoza" value="STD3" />
+        <zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Merida" value="CST6" />
+        <zone name="America/Metlakatla" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mexico_City" value="CST6" />
+        <zone name="America/Miquelon" value="STD3DST,M3.2.0,M11.1.0" />
+        <zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Monterrey" value="CST6" />
+        <zone name="America/Montevideo" value="STD3" />
+        <zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Montserrat" value="AST4" />
+        <zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Noronha" value="STD2" />
+        <zone name="America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nuuk" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Ojinaga" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Panama" value="EST5" />
+        <zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Paramaribo" value="STD3" />
+        <zone name="America/Phoenix" value="MST7" />
+        <zone name="America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Port_of_Spain" value="AST4" />
+        <zone name="America/Porto_Acre" value="STD5" />
+        <zone name="America/Porto_Velho" value="STD4" />
+        <zone name="America/Puerto_Rico" value="AST4" />
+        <zone name="America/Punta_Arenas" value="STD3" />
+        <zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Recife" value="STD3" />
+        <zone name="America/Regina" value="CST6" />
+        <zone name="America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rio_Branco" value="STD5" />
+        <zone name="America/Rosario" value="STD3" />
+        <zone name="America/Santa_Isabel" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Santarem" value="STD3" />
+        <zone name="America/Santiago" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="America/Santo_Domingo" value="AST4" />
+        <zone name="America/Sao_Paulo" value="STD3" />
+        <zone name="America/Scoresbysund" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Barthelemy" value="AST4" />
+        <zone name="America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Kitts" value="AST4" />
+        <zone name="America/St_Lucia" value="AST4" />
+        <zone name="America/St_Thomas" value="AST4" />
+        <zone name="America/St_Vincent" value="AST4" />
+        <zone name="America/Swift_Current" value="CST6" />
+        <zone name="America/Tegucigalpa" value="CST6" />
+        <zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tortola" value="AST4" />
+        <zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Virgin" value="AST4" />
+        <zone name="America/Whitehorse" value="MST7" />
+        <zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="Antarctica/Casey" value="STD-11" />
+        <zone name="Antarctica/Davis" value="STD-7" />
+        <zone name="Antarctica/DumontDUrville" value="STD-10" />
+        <zone name="Antarctica/Macquarie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Antarctica/Mawson" value="STD-5" />
+        <zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Palmer" value="STD3" />
+        <zone name="Antarctica/Rothera" value="STD3" />
+        <zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Syowa" value="STD-3" />
+        <zone name="Antarctica/Troll" value="STD-0DST-2,M3.5.0/1,M10.5.0/3" />
+        <zone name="Antarctica/Vostok" value="STD-6" />
+
+        <zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Asia/Aden" value="STD-3" />
+        <zone name="Asia/Almaty" value="STD-6" />
+        <zone name="Asia/Amman" value="STD-3" />
+        <zone name="Asia/Anadyr" value="STD-12" />
+        <zone name="Asia/Aqtau" value="STD-5" />
+        <zone name="Asia/Aqtobe" value="STD-5" />
+        <zone name="Asia/Ashgabat" value="STD-5" />
+        <zone name="Asia/Ashkhabad" value="STD-5" />
+        <zone name="Asia/Atyrau" value="STD-5" />
+        <zone name="Asia/Baghdad" value="STD-3" />
+        <zone name="Asia/Bahrain" value="STD-3" />
+        <zone name="Asia/Baku" value="STD-4" />
+        <zone name="Asia/Bangkok" value="STD-7" />
+        <zone name="Asia/Barnaul" value="STD-7" />
+        <zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
+        <zone name="Asia/Bishkek" value="STD-6" />
+        <zone name="Asia/Brunei" value="STD-8" />
+        <zone name="Asia/Calcutta" value="IST-5:30" />
+        <zone name="Asia/Chita" value="STD-9" />
+        <zone name="Asia/Choibalsan" value="STD-8" />
+        <zone name="Asia/Chongqing" value="CST-8" />
+        <zone name="Asia/Chungking" value="CST-8" />
+        <zone name="Asia/Colombo" value="STD-5:30" />
+        <zone name="Asia/Dacca" value="STD-6" />
+        <zone name="Asia/Damascus" value="STD-3" />
+        <zone name="Asia/Dhaka" value="STD-6" />
+        <zone name="Asia/Dili" value="STD-9" />
+        <zone name="Asia/Dubai" value="STD-4" />
+        <zone name="Asia/Dushanbe" value="STD-5" />
+        <zone name="Asia/Famagusta" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Gaza" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Harbin" value="CST-8" />
+        <zone name="Asia/Hebron" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Ho_Chi_Minh" value="STD-7" />
+        <zone name="Asia/Hong_Kong" value="HKT-8" />
+        <zone name="Asia/Hovd" value="STD-7" />
+        <zone name="Asia/Irkutsk" value="STD-8" />
+        <zone name="Asia/Istanbul" value="STD-3" />
+        <zone name="Asia/Jakarta" value="WIB-7" />
+        <zone name="Asia/Jayapura" value="WIT-9" />
+        <zone name="Asia/Jerusalem" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Kabul" value="STD-4:30" />
+        <zone name="Asia/Kamchatka" value="STD-12" />
+        <zone name="Asia/Karachi" value="PKT-5" />
+        <zone name="Asia/Kashgar" value="STD-6" />
+        <zone name="Asia/Kathmandu" value="STD-5:45" />
+        <zone name="Asia/Katmandu" value="STD-5:45" />
+        <zone name="Asia/Khandyga" value="STD-9" />
+        <zone name="Asia/Kolkata" value="IST-5:30" />
+        <zone name="Asia/Krasnoyarsk" value="STD-7" />
+        <zone name="Asia/Kuala_Lumpur" value="STD-8" />
+        <zone name="Asia/Kuching" value="STD-8" />
+        <zone name="Asia/Kuwait" value="STD-3" />
+        <zone name="Asia/Macao" value="CST-8" />
+        <zone name="Asia/Macau" value="CST-8" />
+        <zone name="Asia/Magadan" value="STD-11" />
+        <zone name="Asia/Makassar" value="WITA-8" />
+        <zone name="Asia/Manila" value="PST-8" />
+        <zone name="Asia/Muscat" value="STD-4" />
+        <zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Novokuznetsk" value="STD-7" />
+        <zone name="Asia/Novosibirsk" value="STD-7" />
+        <zone name="Asia/Omsk" value="STD-6" />
+        <zone name="Asia/Oral" value="STD-5" />
+        <zone name="Asia/Phnom_Penh" value="STD-7" />
+        <zone name="Asia/Pontianak" value="WIB-7" />
+        <zone name="Asia/Pyongyang" value="KST-9" />
+        <zone name="Asia/Qatar" value="STD-3" />
+        <zone name="Asia/Qostanay" value="STD-6" />
+        <zone name="Asia/Qyzylorda" value="STD-5" />
+        <zone name="Asia/Rangoon" value="STD-6:30" />
+        <zone name="Asia/Riyadh" value="STD-3" />
+        <zone name="Asia/Saigon" value="STD-7" />
+        <zone name="Asia/Sakhalin" value="STD-11" />
+        <zone name="Asia/Samarkand" value="STD-5" />
+        <zone name="Asia/Seoul" value="KST-9" />
+        <zone name="Asia/Shanghai" value="CST-8" />
+        <zone name="Asia/Singapore" value="STD-8" />
+        <zone name="Asia/Srednekolymsk" value="STD-11" />
+        <zone name="Asia/Taipei" value="CST-8" />
+        <zone name="Asia/Tashkent" value="STD-5" />
+        <zone name="Asia/Tbilisi" value="STD-4" />
+        <zone name="Asia/Tehran" value="STD-3:30" />
+        <zone name="Asia/Tel_Aviv" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Thimbu" value="STD-6" />
+        <zone name="Asia/Thimphu" value="STD-6" />
+        <zone name="Asia/Tokyo" value="JST-9" />
+        <zone name="Asia/Tomsk" value="STD-7" />
+        <zone name="Asia/Ujung_Pandang" value="WITA-8" />
+        <zone name="Asia/Ulaanbaatar" value="STD-8" />
+        <zone name="Asia/Ulan_Bator" value="STD-8" />
+        <zone name="Asia/Urumqi" value="STD-6" />
+        <zone name="Asia/Ust-Nera" value="STD-10" />
+        <zone name="Asia/Vientiane" value="STD-7" />
+        <zone name="Asia/Vladivostok" value="STD-10" />
+        <zone name="Asia/Yakutsk" value="STD-9" />
+        <zone name="Asia/Yangon" value="STD-6:30" />
+        <zone name="Asia/Yekaterinburg" value="STD-5" />
+        <zone name="Asia/Yerevan" value="STD-4" />
+
+        <zone name="Atlantic/Azores" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Cape_Verde" value="STD1" />
+        <zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Reykjavik" value="GMT0" />
+        <zone name="Atlantic/South_Georgia" value="STD2" />
+        <zone name="Atlantic/St_Helena" value="GMT0" />
+        <zone name="Atlantic/Stanley" value="STD3" />
+
+        <zone name="Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Brisbane" value="AEST-10" />
+        <zone name="Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Darwin" value="ACST-9:30" />
+        <zone name="Australia/Eucla" value="STD-8:45" />
+        <zone name="Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/LHI" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Lindeman" value="AEST-10" />
+        <zone name="Australia/Lord_Howe" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/North" value="ACST-9:30" />
+        <zone name="Australia/Perth" value="AWST-8" />
+        <zone name="Australia/Queensland" value="AEST-10" />
+        <zone name="Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/West" value="AWST-8" />
+        <zone name="Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+
+        <zone name="Brazil/Acre" value="STD5" />
+        <zone name="Brazil/DeNoronha" value="STD2" />
+        <zone name="Brazil/East" value="STD3" />
+        <zone name="Brazil/West" value="STD4" />
+
+        <zone name="CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
+
+        <zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Saskatchewan" value="CST6" />
+        <zone name="Canada/Yukon" value="MST7" />
+
+        <zone name="Chile/Continental" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="Chile/EasterIsland" value="STD6DST,M9.1.6/22,M4.1.6/22" />
+
+        <zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
+
+        <zone name="EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+
+        <zone name="EST" value="EST5" />
+
+        <zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
+
+        <zone name="Egypt" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
+
+        <zone name="Eire" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+
+        <zone name="Etc/GMT" value="GMT0" />
+        <zone name="Etc/GMT+0" value="GMT0" />
+        <zone name="Etc/GMT+1" value="GMT1" />
+        <zone name="Etc/GMT+10" value="GMT10" />
+        <zone name="Etc/GMT+11" value="GMT11" />
+        <zone name="Etc/GMT+12" value="GMT12" />
+        <zone name="Etc/GMT+2" value="GMT2" />
+        <zone name="Etc/GMT+3" value="GMT3" />
+        <zone name="Etc/GMT+4" value="GMT4" />
+        <zone name="Etc/GMT+5" value="GMT5" />
+        <zone name="Etc/GMT+6" value="GMT6" />
+        <zone name="Etc/GMT+7" value="GMT7" />
+        <zone name="Etc/GMT+8" value="GMT8" />
+        <zone name="Etc/GMT+9" value="GMT9" />
+        <zone name="Etc/GMT-0" value="GMT0" />
+        <zone name="Etc/GMT-1" value="GMT-1" />
+        <zone name="Etc/GMT-10" value="GMT-10" />
+        <zone name="Etc/GMT-11" value="GMT-11" />
+        <zone name="Etc/GMT-12" value="GMT-12" />
+        <zone name="Etc/GMT-13" value="GMT-13" />
+        <zone name="Etc/GMT-14" value="GMT-14" />
+        <zone name="Etc/GMT-2" value="GMT-2" />
+        <zone name="Etc/GMT-3" value="GMT-3" />
+        <zone name="Etc/GMT-4" value="GMT-4" />
+        <zone name="Etc/GMT-5" value="GMT-5" />
+        <zone name="Etc/GMT-6" value="GMT-6" />
+        <zone name="Etc/GMT-7" value="GMT-7" />
+        <zone name="Etc/GMT-8" value="GMT-8" />
+        <zone name="Etc/GMT-9" value="GMT-9" />
+        <zone name="Etc/GMT0" value="GMT0" />
+        <zone name="Etc/Greenwich" value="GMT0" />
+        <zone name="Etc/UCT" value="UTC0" />
+        <zone name="Etc/UTC" value="UTC0" />
+        <zone name="Etc/Universal" value="UTC0" />
+        <zone name="Etc/Zulu" value="UTC0" />
+
+        <zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Astrakhan" value="STD-4" />
+        <zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Dublin" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+        <zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Istanbul" value="STD-3" />
+        <zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Kaliningrad" value="EET-2" />
+        <zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Kirov" value="MSK-3" />
+        <zone name="Europe/Kyiv" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Minsk" value="STD-3" />
+        <zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Moscow" value="MSK-3" />
+        <zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Samara" value="STD-4" />
+        <zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Saratov" value="STD-4" />
+        <zone name="Europe/Simferopol" value="MSK-3" />
+        <zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Ulyanovsk" value="STD-4" />
+        <zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Volgograd" value="MSK-3" />
+        <zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="Factory" value="STD0" />
+
+        <zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
+
+        <zone name="GMT" value="GMT0" />
+
+        <zone name="GMT+0" value="GMT0" />
+
+        <zone name="GMT-0" value="GMT0" />
+
+        <zone name="GMT0" value="GMT0" />
+
+        <zone name="Greenwich" value="GMT0" />
+
+        <zone name="HST" value="HST10" />
+
+        <zone name="Hongkong" value="HKT-8" />
+
+        <zone name="Iceland" value="GMT0" />
+
+        <zone name="Indian/Antananarivo" value="EAT-3" />
+        <zone name="Indian/Chagos" value="STD-6" />
+        <zone name="Indian/Christmas" value="STD-7" />
+        <zone name="Indian/Cocos" value="STD-6:30" />
+        <zone name="Indian/Comoro" value="EAT-3" />
+        <zone name="Indian/Kerguelen" value="STD-5" />
+        <zone name="Indian/Mahe" value="STD-4" />
+        <zone name="Indian/Maldives" value="STD-5" />
+        <zone name="Indian/Mauritius" value="STD-4" />
+        <zone name="Indian/Mayotte" value="EAT-3" />
+        <zone name="Indian/Reunion" value="STD-4" />
+
+        <zone name="Iran" value="STD-3:30" />
+
+        <zone name="Israel" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+
+        <zone name="Jamaica" value="EST5" />
+
+        <zone name="Japan" value="JST-9" />
+
+        <zone name="Kwajalein" value="STD-12" />
+
+        <zone name="Libya" value="EET-2" />
+
+        <zone name="MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
+
+        <zone name="MST" value="MST7" />
+
+        <zone name="MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Mexico/BajaSur" value="MST7" />
+        <zone name="Mexico/General" value="CST6" />
+
+        <zone name="NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+
+        <zone name="NZ-CHAT" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+
+        <zone name="Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
+
+        <zone name="PRC" value="CST-8" />
+
+        <zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
+
+        <zone name="Pacific/Apia" value="STD-13" />
+        <zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Pacific/Bougainville" value="STD-11" />
+        <zone name="Pacific/Chatham" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+        <zone name="Pacific/Chuuk" value="STD-10" />
+        <zone name="Pacific/Easter" value="STD6DST,M9.1.6/22,M4.1.6/22" />
+        <zone name="Pacific/Efate" value="STD-11" />
+        <zone name="Pacific/Enderbury" value="STD-13" />
+        <zone name="Pacific/Fakaofo" value="STD-13" />
+        <zone name="Pacific/Fiji" value="STD-12" />
+        <zone name="Pacific/Funafuti" value="STD-12" />
+        <zone name="Pacific/Galapagos" value="STD6" />
+        <zone name="Pacific/Gambier" value="STD9" />
+        <zone name="Pacific/Guadalcanal" value="STD-11" />
+        <zone name="Pacific/Guam" value="ChST-10" />
+        <zone name="Pacific/Honolulu" value="HST10" />
+        <zone name="Pacific/Johnston" value="HST10" />
+        <zone name="Pacific/Kanton" value="STD-13" />
+        <zone name="Pacific/Kiritimati" value="STD-14" />
+        <zone name="Pacific/Kosrae" value="STD-11" />
+        <zone name="Pacific/Kwajalein" value="STD-12" />
+        <zone name="Pacific/Majuro" value="STD-12" />
+        <zone name="Pacific/Marquesas" value="STD9:30" />
+        <zone name="Pacific/Midway" value="SST11" />
+        <zone name="Pacific/Nauru" value="STD-12" />
+        <zone name="Pacific/Niue" value="STD11" />
+        <zone name="Pacific/Norfolk" value="STD-11DST,M10.1.0,M4.1.0/3" />
+        <zone name="Pacific/Noumea" value="STD-11" />
+        <zone name="Pacific/Pago_Pago" value="SST11" />
+        <zone name="Pacific/Palau" value="STD-9" />
+        <zone name="Pacific/Pitcairn" value="STD8" />
+        <zone name="Pacific/Pohnpei" value="STD-11" />
+        <zone name="Pacific/Ponape" value="STD-11" />
+        <zone name="Pacific/Port_Moresby" value="STD-10" />
+        <zone name="Pacific/Rarotonga" value="STD10" />
+        <zone name="Pacific/Saipan" value="ChST-10" />
+        <zone name="Pacific/Samoa" value="SST11" />
+        <zone name="Pacific/Tahiti" value="STD10" />
+        <zone name="Pacific/Tarawa" value="STD-12" />
+        <zone name="Pacific/Tongatapu" value="STD-13" />
+        <zone name="Pacific/Truk" value="STD-10" />
+        <zone name="Pacific/Wake" value="STD-12" />
+        <zone name="Pacific/Wallis" value="STD-12" />
+        <zone name="Pacific/Yap" value="STD-10" />
 
-	<zone name="America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Anguilla" value="AST4" />
-	<zone name="America/Antigua" value="AST4" />
-	<zone name="America/Araguaina" value="BRT3" />
-	<zone name="America/Argentina/Buenos_Aires" value="ART3" />
-	<zone name="America/Argentina/Catamarca" value="ART3" />
-	<zone name="America/Argentina/ComodRivadavia" value="ART3" />
-	<zone name="America/Argentina/Cordoba" value="ART3" />
-	<zone name="America/Argentina/Jujuy" value="ART3" />
-	<zone name="America/Argentina/La_Rioja" value="ART3" />
-	<zone name="America/Argentina/Mendoza" value="ART3" />
-	<zone name="America/Argentina/Rio_Gallegos" value="ART3" />
-	<zone name="America/Argentina/Salta" value="ART3" />
-	<zone name="America/Argentina/San_Juan" value="ART3" />
-	<zone name="America/Argentina/San_Luis" value="ART3" />
-	<zone name="America/Argentina/Tucuman" value="ART3" />
-	<zone name="America/Argentina/Ushuaia" value="ART3" />
-	<zone name="America/Aruba" value="AST4" />
-	<zone name="America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
-	<zone name="America/Atikokan" value="EST5" />
-	<zone name="America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Bahia" value="BRT3" />
-	<zone name="America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Barbados" value="AST4" />
-	<zone name="America/Belem" value="BRT3" />
-	<zone name="America/Belize" value="CST6" />
-	<zone name="America/Blanc-Sablon" value="AST4" />
-	<zone name="America/Boa_Vista" value="AMT4" />
-	<zone name="America/Bogota" value="COT5" />
-	<zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Buenos_Aires" value="ART3" />
-	<zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Caracas" value="VET4:30" />
-	<zone name="America/Catamarca" value="ART3" />
-	<zone name="America/Cayenne" value="GFT3" />
-	<zone name="America/Cayman" value="EST5" />
-	<zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Coral_Harbour" value="EST5" />
-	<zone name="America/Cordoba" value="ART3" />
-	<zone name="America/Costa_Rica" value="CST6" />
-	<zone name="America/Creston" value="MST7" />
-	<zone name="America/Cuiaba" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="America/Curacao" value="AST4" />
-	<zone name="America/Danmarkshavn" value="GMT0" />
-	<zone name="America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dawson_Creek" value="MST7" />
-	<zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dominica" value="AST4" />
-	<zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Eirunepe" value="ACT5" />
-	<zone name="America/El_Salvador" value="CST6" />
-	<zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Fortaleza" value="BRT3" />
-	<zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Godthab" value="WGST" />
-	<zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Grenada" value="AST4" />
-	<zone name="America/Guadeloupe" value="AST4" />
-	<zone name="America/Guatemala" value="CST6" />
-	<zone name="America/Guayaquil" value="ECT5" />
-	<zone name="America/Guyana" value="GYT4" />
-	<zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="America/Hermosillo" value="MST7" />
-	<zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Jamaica" value="EST5" />
-	<zone name="America/Jujuy" value="ART3" />
-	<zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kralendijk" value="AST4" />
-	<zone name="America/La_Paz" value="BOT4" />
-	<zone name="America/Lima" value="PET5" />
-	<zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Lower_Princes" value="AST4" />
-	<zone name="America/Maceio" value="BRT3" />
-	<zone name="America/Managua" value="CST6" />
-	<zone name="America/Manaus" value="AMT4" />
-	<zone name="America/Marigot" value="AST4" />
-	<zone name="America/Martinique" value="AST4" />
-	<zone name="America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mendoza" value="ART3" />
-	<zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Metlakatla" value="MeST8" />
-	<zone name="America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Montserrat" value="AST4" />
-	<zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Noronha" value="FNT2" />
-	<zone name="America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Ojinaga" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Panama" value="EST5" />
-	<zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Paramaribo" value="SRT3" />
-	<zone name="America/Phoenix" value="MST7" />
-	<zone name="America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Port_of_Spain" value="AST4" />
-	<zone name="America/Porto_Acre" value="ACT5" />
-	<zone name="America/Porto_Velho" value="AMT4" />
-	<zone name="America/Puerto_Rico" value="AST4" />
-	<zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Recife" value="BRT3" />
-	<zone name="America/Regina" value="CST6" />
-	<zone name="America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rio_Branco" value="ACT5" />
-	<zone name="America/Rosario" value="ART3" />
-	<zone name="America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Santarem" value="BRT3" />
-	<zone name="America/Santiago" value="CLST" />
-	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3" />
-	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Barthelemy" value="AST4" />
-	<zone name="America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Kitts" value="AST4" />
-	<zone name="America/St_Lucia" value="AST4" />
-	<zone name="America/St_Thomas" value="AST4" />
-	<zone name="America/St_Vincent" value="AST4" />
-	<zone name="America/Swift_Current" value="CST6" />
-	<zone name="America/Tegucigalpa" value="CST6" />
-	<zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tortola" value="AST4" />
-	<zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Virgin" value="AST4" />
-	<zone name="America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Antarctica/Casey" value="WST-8" />
-	<zone name="Antarctica/Davis" value="DAVT-7" />
-	<zone name="Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="Antarctica/Macquarie" value="MIST-11" />
-	<zone name="Antarctica/Mawson" value="MAWT-5" />
-	<zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Palmer" value="CLST" />
-	<zone name="Antarctica/Rothera" value="ROTT3" />
-	<zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Syowa" value="SYOT-3" />
-	<zone name="Antarctica/Troll" value="UTC0CEST-2,M3.5.0/1,M10.5.0/3" />
-	<zone name="Antarctica/Vostok" value="VOST-6" />
+        <zone name="Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
 
-	<zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="ROC" value="CST-8" />
 
-	<zone name="Asia/Aden" value="AST-3" />
-	<zone name="Asia/Almaty" value="ALMT-6" />
-	<zone name="Asia/Amman" value="EEST" />
-	<zone name="Asia/Anadyr" value="ANAT-12" />
-	<zone name="Asia/Aqtau" value="AQTT-5" />
-	<zone name="Asia/Aqtobe" value="AQTT-5" />
-	<zone name="Asia/Ashgabat" value="TMT-5" />
-	<zone name="Asia/Ashkhabad" value="TMT-5" />
-	<zone name="Asia/Baghdad" value="AST-3" />
-	<zone name="Asia/Bahrain" value="AST-3" />
-	<zone name="Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="Asia/Bangkok" value="ICT-7" />
-	<zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="Asia/Bishkek" value="KGT-6" />
-	<zone name="Asia/Brunei" value="BNT-8" />
-	<zone name="Asia/Calcutta" value="IST-5:30" />
-	<zone name="Asia/Choibalsan" value="CHOT-8" />
-	<zone name="Asia/Chongqing" value="CST-8" />
-	<zone name="Asia/Chungking" value="CST-8" />
-	<zone name="Asia/Colombo" value="IST-5:30" />
-	<zone name="Asia/Dacca" value="BDT-6" />
-	<zone name="Asia/Damascus" value="EET-2EEST,M3.5.5/0,M10.5.5/0" />
-	<zone name="Asia/Dhaka" value="BDT-6" />
-	<zone name="Asia/Dili" value="TLT-9" />
-	<zone name="Asia/Dubai" value="GST-4" />
-	<zone name="Asia/Dushanbe" value="TJT-5" />
-	<zone name="Asia/Gaza" value="EEST" />
-	<zone name="Asia/Harbin" value="CST-8" />
-	<zone name="Asia/Hebron" value="EEST" />
-	<zone name="Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="Asia/Hong_Kong" value="HKT-8" />
-	<zone name="Asia/Hovd" value="HOVT-7" />
-	<zone name="Asia/Irkutsk" value="IRKT-9" />
-	<zone name="Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Jakarta" value="WIB-7" />
-	<zone name="Asia/Jayapura" value="WIT-9" />
-	<zone name="Asia/Jerusalem" value="IDDT" />
-	<zone name="Asia/Kabul" value="AFT-4:30" />
-	<zone name="Asia/Kamchatka" value="PETT-12" />
-	<zone name="Asia/Karachi" value="PKT-5" />
-	<zone name="Asia/Kashgar" value="CST-8" />
-	<zone name="Asia/Kathmandu" value="NPT-5:45" />
-	<zone name="Asia/Katmandu" value="NPT-5:45" />
-	<zone name="Asia/Khandyga" value="YAKT-10" />
-	<zone name="Asia/Kolkata" value="IST-5:30" />
-	<zone name="Asia/Krasnoyarsk" value="KRAT-8" />
-	<zone name="Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="Asia/Kuching" value="MYT-8" />
-	<zone name="Asia/Kuwait" value="AST-3" />
-	<zone name="Asia/Macao" value="CST-8" />
-	<zone name="Asia/Macau" value="CST-8" />
-	<zone name="Asia/Magadan" value="MAGT-12" />
-	<zone name="Asia/Makassar" value="WITA-8" />
-	<zone name="Asia/Manila" value="PHT-8" />
-	<zone name="Asia/Muscat" value="GST-4" />
-	<zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Novokuznetsk" value="NOVT-7" />
-	<zone name="Asia/Novosibirsk" value="NOVT-7" />
-	<zone name="Asia/Omsk" value="OMST-7" />
-	<zone name="Asia/Oral" value="ORAT-5" />
-	<zone name="Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="Asia/Pontianak" value="WIB-7" />
-	<zone name="Asia/Pyongyang" value="KST-9" />
-	<zone name="Asia/Qatar" value="AST-3" />
-	<zone name="Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="Asia/Rangoon" value="MMT-6:30" />
-	<zone name="Asia/Riyadh" value="AST-3" />
-	<zone name="Asia/Saigon" value="ICT-7" />
-	<zone name="Asia/Sakhalin" value="SAKT-11" />
-	<zone name="Asia/Samarkand" value="UZT-5" />
-	<zone name="Asia/Seoul" value="KST-9" />
-	<zone name="Asia/Shanghai" value="CST-8" />
-	<zone name="Asia/Singapore" value="SGT-8" />
-	<zone name="Asia/Taipei" value="CST-8" />
-	<zone name="Asia/Tashkent" value="UZT-5" />
-	<zone name="Asia/Tbilisi" value="GET-4" />
-	<zone name="Asia/Tehran" value="IRDT" />
-	<zone name="Asia/Tel_Aviv" value="IDDT" />
-	<zone name="Asia/Thimbu" value="BTT-6" />
-	<zone name="Asia/Thimphu" value="BTT-6" />
-	<zone name="Asia/Tokyo" value="JST-9" />
-	<zone name="Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="Asia/Urumqi" value="CST-8" />
-	<zone name="Asia/Ust-Nera" value="VLAT-11" />
-	<zone name="Asia/Vientiane" value="ICT-7" />
-	<zone name="Asia/Vladivostok" value="VLAT-11" />
-	<zone name="Asia/Yakutsk" value="YAKT-10" />
-	<zone name="Asia/Yekaterinburg" value="YEKT-6" />
-	<zone name="Asia/Yerevan" value="AMT-4" />
+        <zone name="ROK" value="KST-9" />
+
+        <zone name="Singapore" value="STD-8" />
+
+        <zone name="Turkey" value="STD-3" />
+
+        <zone name="UCT" value="UTC0" />
+
+        <zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="US/Arizona" value="MST7" />
+        <zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Hawaii" value="HST10" />
+        <zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="US/Samoa" value="SST11" />
 
-	<zone name="Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Reykjavik" value="GMT0" />
-	<zone name="Atlantic/South_Georgia" value="GST2" />
-	<zone name="Atlantic/St_Helena" value="GMT0" />
-	<zone name="Atlantic/Stanley" value="FKST3" />
-
-	<zone name="Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Brisbane" value="EST-10" />
-	<zone name="Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Darwin" value="CST-9:30" />
-	<zone name="Australia/Eucla" value="CWST-8:45" />
-	<zone name="Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Lindeman" value="EST-10" />
-	<zone name="Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/North" value="CST-9:30" />
-	<zone name="Australia/Perth" value="WST-8" />
-	<zone name="Australia/Queensland" value="EST-10" />
-	<zone name="Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/West" value="WST-8" />
-	<zone name="Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-
-	<zone name="Brazil/Acre" value="ACT5" />
-	<zone name="Brazil/DeNoronha" value="FNT2" />
-	<zone name="Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="Brazil/West" value="AMT4" />
-
-	<zone name="CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-
-	<zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/East-Saskatchewan" value="CST6" />
-	<zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Saskatchewan" value="CST6" />
-	<zone name="Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-
-	<zone name="Chile/Continental" value="CLST" />
-	<zone name="Chile/EasterIsland" value="EASST" />
-
-	<zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-
-	<zone name="EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-
-	<zone name="EST" value="EST5" />
-
-	<zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-
-	<zone name="Egypt" value="EEST" />
-
-	<zone name="Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
-
-	<zone name="Etc/GMT" value="GMT0" />
-	<zone name="Etc/GMT+0" value="GMT0" />
-	<zone name="Etc/GMT+1" value="<GMT+1>1" />
-	<zone name="Etc/GMT+10" value="<GMT+10>10" />
-	<zone name="Etc/GMT+11" value="<GMT+11>11" />
-	<zone name="Etc/GMT+12" value="<GMT+12>12" />
-	<zone name="Etc/GMT+2" value="<GMT+2>2" />
-	<zone name="Etc/GMT+3" value="<GMT+3>3" />
-	<zone name="Etc/GMT+4" value="<GMT+4>4" />
-	<zone name="Etc/GMT+5" value="<GMT+5>5" />
-	<zone name="Etc/GMT+6" value="<GMT+6>6" />
-	<zone name="Etc/GMT+7" value="<GMT+7>7" />
-	<zone name="Etc/GMT+8" value="<GMT+8>8" />
-	<zone name="Etc/GMT+9" value="<GMT+9>9" />
-	<zone name="Etc/GMT-0" value="GMT0" />
-	<zone name="Etc/GMT-1" value="<GMT-1>-1" />
-	<zone name="Etc/GMT-10" value="<GMT-10>-10" />
-	<zone name="Etc/GMT-11" value="<GMT-11>-11" />
-	<zone name="Etc/GMT-12" value="<GMT-12>-12" />
-	<zone name="Etc/GMT-13" value="<GMT-13>-13" />
-	<zone name="Etc/GMT-14" value="<GMT-14>-14" />
-	<zone name="Etc/GMT-2" value="<GMT-2>-2" />
-	<zone name="Etc/GMT-3" value="<GMT-3>-3" />
-	<zone name="Etc/GMT-4" value="<GMT-4>-4" />
-	<zone name="Etc/GMT-5" value="<GMT-5>-5" />
-	<zone name="Etc/GMT-6" value="<GMT-6>-6" />
-	<zone name="Etc/GMT-7" value="<GMT-7>-7" />
-	<zone name="Etc/GMT-8" value="<GMT-8>-8" />
-	<zone name="Etc/GMT-9" value="<GMT-9>-9" />
-	<zone name="Etc/GMT0" value="GMT0" />
-	<zone name="Etc/Greenwich" value="GMT0" />
-	<zone name="Etc/UCT" value="UCT0" />
-	<zone name="Etc/UTC" value="UTC0" />
-	<zone name="Etc/Universal" value="UTC0" />
-	<zone name="Etc/Zulu" value="UTC0" />
-
-	<zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Kaliningrad" value="FET-3" />
-	<zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Minsk" value="FET-3" />
-	<zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Moscow" value="MSK-4" />
-	<zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Samara" value="SAMT-4" />
-	<zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Simferopol" value="MSK-4" />
-	<zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Volgograd" value="VOLT-4" />
-	<zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Factory" value="<Local time zone must be set--see zic manual page>0" />
-
-	<zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
-
-	<zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
-
-	<zone name="GMT" value="GMT0" />
-
-	<zone name="GMT+0" value="GMT0" />
-
-	<zone name="GMT-0" value="GMT0" />
-
-	<zone name="GMT0" value="GMT0" />
-
-	<zone name="Greenwich" value="GMT0" />
-
-	<zone name="HST" value="HST10" />
-
-	<zone name="Hongkong" value="HKT-8" />
-
-	<zone name="Iceland" value="GMT0" />
-
-	<zone name="Indian/Antananarivo" value="EAT-3" />
-	<zone name="Indian/Chagos" value="IOT-6" />
-	<zone name="Indian/Christmas" value="CXT-7" />
-	<zone name="Indian/Cocos" value="CCT-6:30" />
-	<zone name="Indian/Comoro" value="EAT-3" />
-	<zone name="Indian/Kerguelen" value="TFT-5" />
-	<zone name="Indian/Mahe" value="SCT-4" />
-	<zone name="Indian/Maldives" value="MVT-5" />
-	<zone name="Indian/Mauritius" value="MUT-4" />
-	<zone name="Indian/Mayotte" value="EAT-3" />
-	<zone name="Indian/Reunion" value="RET-4" />
-
-	<zone name="Iran" value="IRDT" />
-
-	<zone name="Israel" value="IDDT" />
-
-	<zone name="Jamaica" value="EST5" />
-
-	<zone name="Japan" value="JST-9" />
-
-	<zone name="Kwajalein" value="MHT-12" />
-
-	<zone name="Libya" value="EET-2" />
-
-	<zone name="MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="MST" value="MST7" />
-
-	<zone name="MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-
-	<zone name="Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-
-	<zone name="NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-
-	<zone name="NZ-CHAT" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-
-	<zone name="Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
-
-	<zone name="PRC" value="CST-8" />
-
-	<zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-
-	<zone name="Pacific/Apia" value="WST-13WSDT,M9.5.0/3,M4.1.0/4" />
-	<zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="Pacific/Chuuk" value="CHUT-10" />
-	<zone name="Pacific/Easter" value="EASST" />
-	<zone name="Pacific/Efate" value="VUT-11" />
-	<zone name="Pacific/Enderbury" value="PHOT-13" />
-	<zone name="Pacific/Fakaofo" value="TKT-13" />
-	<zone name="Pacific/Fiji" value="FJST" />
-	<zone name="Pacific/Funafuti" value="TVT-12" />
-	<zone name="Pacific/Galapagos" value="GALT6" />
-	<zone name="Pacific/Gambier" value="GAMT9" />
-	<zone name="Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="Pacific/Guam" value="ChST-10" />
-	<zone name="Pacific/Honolulu" value="HST10" />
-	<zone name="Pacific/Johnston" value="HST10" />
-	<zone name="Pacific/Kiritimati" value="LINT-14" />
-	<zone name="Pacific/Kosrae" value="KOST-11" />
-	<zone name="Pacific/Kwajalein" value="MHT-12" />
-	<zone name="Pacific/Majuro" value="MHT-12" />
-	<zone name="Pacific/Marquesas" value="MART9:30" />
-	<zone name="Pacific/Midway" value="SST11" />
-	<zone name="Pacific/Nauru" value="NRT-12" />
-	<zone name="Pacific/Niue" value="NUT11" />
-	<zone name="Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="Pacific/Noumea" value="NCT-11" />
-	<zone name="Pacific/Pago_Pago" value="SST11" />
-	<zone name="Pacific/Palau" value="PWT-9" />
-	<zone name="Pacific/Pitcairn" value="PST8" />
-	<zone name="Pacific/Pohnpei" value="PONT-11" />
-	<zone name="Pacific/Ponape" value="PONT-11" />
-	<zone name="Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="Pacific/Rarotonga" value="CKT10" />
-	<zone name="Pacific/Saipan" value="ChST-10" />
-	<zone name="Pacific/Samoa" value="SST11" />
-	<zone name="Pacific/Tahiti" value="TAHT10" />
-	<zone name="Pacific/Tarawa" value="GILT-12" />
-	<zone name="Pacific/Tongatapu" value="TOT-13" />
-	<zone name="Pacific/Truk" value="CHUT-10" />
-	<zone name="Pacific/Wake" value="WAKT-12" />
-	<zone name="Pacific/Wallis" value="WFT-12" />
-	<zone name="Pacific/Yap" value="CHUT-10" />
-
-	<zone name="Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
-
-	<zone name="ROC" value="CST-8" />
-
-	<zone name="ROK" value="KST-9" />
-
-	<zone name="Singapore" value="SGT-8" />
-
-	<zone name="SystemV/AST4" value="AST4" />
-	<zone name="SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/CST6" value="CST6" />
-	<zone name="SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/EST5" value="EST5" />
-	<zone name="SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/HST10" value="HST10" />
-	<zone name="SystemV/MST7" value="MST7" />
-	<zone name="SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/PST8" value="PST8" />
-	<zone name="SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/YST9" value="GAMT9" />
-	<zone name="SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
-
-	<zone name="Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-
-	<zone name="UCT" value="UCT0" />
-
-	<zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="US/Arizona" value="MST7" />
-	<zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Hawaii" value="HST10" />
-	<zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific-New" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Samoa" value="SST11" />
-
-	<zone name="UTC" value="UTC0" />
-
-	<zone name="Universal" value="UTC0" />
-
-	<zone name="W-SU" value="MSK-4" />
-
-	<zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
-
-	<zone name="Zulu" value="UTC0" />
-
-	<zone name="localtime" value="CST6CDT,M3.2.0,M11.1.0" />
-
-	<zone name="posix/Africa/Abidjan" value="GMT0" />
-	<zone name="posix/Africa/Accra" value="GMT0" />
-	<zone name="posix/Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="posix/Africa/Algiers" value="CET-1" />
-	<zone name="posix/Africa/Asmara" value="EAT-3" />
-	<zone name="posix/Africa/Asmera" value="EAT-3" />
-	<zone name="posix/Africa/Bamako" value="GMT0" />
-	<zone name="posix/Africa/Bangui" value="WAT-1" />
-	<zone name="posix/Africa/Banjul" value="GMT0" />
-	<zone name="posix/Africa/Bissau" value="GMT0" />
-	<zone name="posix/Africa/Blantyre" value="CAT-2" />
-	<zone name="posix/Africa/Brazzaville" value="WAT-1" />
-	<zone name="posix/Africa/Bujumbura" value="CAT-2" />
-	<zone name="posix/Africa/Cairo" value="EEST" />
-	<zone name="posix/Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Africa/Conakry" value="GMT0" />
-	<zone name="posix/Africa/Dakar" value="GMT0" />
-	<zone name="posix/Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="posix/Africa/Djibouti" value="EAT-3" />
-	<zone name="posix/Africa/Douala" value="WAT-1" />
-	<zone name="posix/Africa/El_Aaiun" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Africa/Freetown" value="GMT0" />
-	<zone name="posix/Africa/Gaborone" value="CAT-2" />
-	<zone name="posix/Africa/Harare" value="CAT-2" />
-	<zone name="posix/Africa/Johannesburg" value="SAST-2" />
-	<zone name="posix/Africa/Juba" value="EAT-3" />
-	<zone name="posix/Africa/Kampala" value="EAT-3" />
-	<zone name="posix/Africa/Khartoum" value="EAT-3" />
-	<zone name="posix/Africa/Kigali" value="CAT-2" />
-	<zone name="posix/Africa/Kinshasa" value="WAT-1" />
-	<zone name="posix/Africa/Lagos" value="WAT-1" />
-	<zone name="posix/Africa/Libreville" value="WAT-1" />
-	<zone name="posix/Africa/Lome" value="GMT0" />
-	<zone name="posix/Africa/Luanda" value="WAT-1" />
-	<zone name="posix/Africa/Lubumbashi" value="CAT-2" />
-	<zone name="posix/Africa/Lusaka" value="CAT-2" />
-	<zone name="posix/Africa/Malabo" value="WAT-1" />
-	<zone name="posix/Africa/Maputo" value="CAT-2" />
-	<zone name="posix/Africa/Maseru" value="SAST-2" />
-	<zone name="posix/Africa/Mbabane" value="SAST-2" />
-	<zone name="posix/Africa/Mogadishu" value="EAT-3" />
-	<zone name="posix/Africa/Monrovia" value="GMT0" />
-	<zone name="posix/Africa/Nairobi" value="EAT-3" />
-	<zone name="posix/Africa/Ndjamena" value="WAT-1" />
-	<zone name="posix/Africa/Niamey" value="WAT-1" />
-	<zone name="posix/Africa/Nouakchott" value="GMT0" />
-	<zone name="posix/Africa/Ouagadougou" value="GMT0" />
-	<zone name="posix/Africa/Porto-Novo" value="WAT-1" />
-	<zone name="posix/Africa/Sao_Tome" value="GMT0" />
-	<zone name="posix/Africa/Timbuktu" value="GMT0" />
-	<zone name="posix/Africa/Tripoli" value="EET-2" />
-	<zone name="posix/Africa/Tunis" value="CET-1" />
-	<zone name="posix/Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-	<zone name="posix/America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Anguilla" value="AST4" />
-	<zone name="posix/America/Antigua" value="AST4" />
-	<zone name="posix/America/Araguaina" value="BRT3" />
-	<zone name="posix/America/Argentina/Buenos_Aires" value="ART3" />
-	<zone name="posix/America/Argentina/Catamarca" value="ART3" />
-	<zone name="posix/America/Argentina/ComodRivadavia" value="ART3" />
-	<zone name="posix/America/Argentina/Cordoba" value="ART3" />
-	<zone name="posix/America/Argentina/Jujuy" value="ART3" />
-	<zone name="posix/America/Argentina/La_Rioja" value="ART3" />
-	<zone name="posix/America/Argentina/Mendoza" value="ART3" />
-	<zone name="posix/America/Argentina/Rio_Gallegos" value="ART3" />
-	<zone name="posix/America/Argentina/Salta" value="ART3" />
-	<zone name="posix/America/Argentina/San_Juan" value="ART3" />
-	<zone name="posix/America/Argentina/San_Luis" value="ART3" />
-	<zone name="posix/America/Argentina/Tucuman" value="ART3" />
-	<zone name="posix/America/Argentina/Ushuaia" value="ART3" />
-	<zone name="posix/America/Aruba" value="AST4" />
-	<zone name="posix/America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
-	<zone name="posix/America/Atikokan" value="EST5" />
-	<zone name="posix/America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Bahia" value="BRT3" />
-	<zone name="posix/America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Barbados" value="AST4" />
-	<zone name="posix/America/Belem" value="BRT3" />
-	<zone name="posix/America/Belize" value="CST6" />
-	<zone name="posix/America/Blanc-Sablon" value="AST4" />
-	<zone name="posix/America/Boa_Vista" value="AMT4" />
-	<zone name="posix/America/Bogota" value="COT5" />
-	<zone name="posix/America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Buenos_Aires" value="ART3" />
-	<zone name="posix/America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Caracas" value="VET4:30" />
-	<zone name="posix/America/Catamarca" value="ART3" />
-	<zone name="posix/America/Cayenne" value="GFT3" />
-	<zone name="posix/America/Cayman" value="EST5" />
-	<zone name="posix/America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Coral_Harbour" value="EST5" />
-	<zone name="posix/America/Cordoba" value="ART3" />
-	<zone name="posix/America/Costa_Rica" value="CST6" />
-	<zone name="posix/America/Creston" value="MST7" />
-	<zone name="posix/America/Cuiaba" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Curacao" value="AST4" />
-	<zone name="posix/America/Danmarkshavn" value="GMT0" />
-	<zone name="posix/America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Dawson_Creek" value="MST7" />
-	<zone name="posix/America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Dominica" value="AST4" />
-	<zone name="posix/America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Eirunepe" value="ACT5" />
-	<zone name="posix/America/El_Salvador" value="CST6" />
-	<zone name="posix/America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Fortaleza" value="BRT3" />
-	<zone name="posix/America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Godthab" value="WGST" />
-	<zone name="posix/America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Grenada" value="AST4" />
-	<zone name="posix/America/Guadeloupe" value="AST4" />
-	<zone name="posix/America/Guatemala" value="CST6" />
-	<zone name="posix/America/Guayaquil" value="ECT5" />
-	<zone name="posix/America/Guyana" value="GYT4" />
-	<zone name="posix/America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="posix/America/Hermosillo" value="MST7" />
-	<zone name="posix/America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Jamaica" value="EST5" />
-	<zone name="posix/America/Jujuy" value="ART3" />
-	<zone name="posix/America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Kralendijk" value="AST4" />
-	<zone name="posix/America/La_Paz" value="BOT4" />
-	<zone name="posix/America/Lima" value="PET5" />
-	<zone name="posix/America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Lower_Princes" value="AST4" />
-	<zone name="posix/America/Maceio" value="BRT3" />
-	<zone name="posix/America/Managua" value="CST6" />
-	<zone name="posix/America/Manaus" value="AMT4" />
-	<zone name="posix/America/Marigot" value="AST4" />
-	<zone name="posix/America/Martinique" value="AST4" />
-	<zone name="posix/America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Mendoza" value="ART3" />
-	<zone name="posix/America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Metlakatla" value="MeST8" />
-	<zone name="posix/America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="posix/America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Montserrat" value="AST4" />
-	<zone name="posix/America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Noronha" value="FNT2" />
-	<zone name="posix/America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Ojinaga" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Panama" value="EST5" />
-	<zone name="posix/America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Paramaribo" value="SRT3" />
-	<zone name="posix/America/Phoenix" value="MST7" />
-	<zone name="posix/America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Port_of_Spain" value="AST4" />
-	<zone name="posix/America/Porto_Acre" value="ACT5" />
-	<zone name="posix/America/Porto_Velho" value="AMT4" />
-	<zone name="posix/America/Puerto_Rico" value="AST4" />
-	<zone name="posix/America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Recife" value="BRT3" />
-	<zone name="posix/America/Regina" value="CST6" />
-	<zone name="posix/America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Rio_Branco" value="ACT5" />
-	<zone name="posix/America/Rosario" value="ART3" />
-	<zone name="posix/America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Santarem" value="BRT3" />
-	<zone name="posix/America/Santiago" value="CLST" />
-	<zone name="posix/America/Santo_Domingo" value="AST4" />
-	<zone name="posix/America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="posix/America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/St_Barthelemy" value="AST4" />
-	<zone name="posix/America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/St_Kitts" value="AST4" />
-	<zone name="posix/America/St_Lucia" value="AST4" />
-	<zone name="posix/America/St_Thomas" value="AST4" />
-	<zone name="posix/America/St_Vincent" value="AST4" />
-	<zone name="posix/America/Swift_Current" value="CST6" />
-	<zone name="posix/America/Tegucigalpa" value="CST6" />
-	<zone name="posix/America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Tortola" value="AST4" />
-	<zone name="posix/America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Virgin" value="AST4" />
-	<zone name="posix/America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Antarctica/Casey" value="WST-8" />
-	<zone name="posix/Antarctica/Davis" value="DAVT-7" />
-	<zone name="posix/Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="posix/Antarctica/Macquarie" value="MIST-11" />
-	<zone name="posix/Antarctica/Mawson" value="MAWT-5" />
-	<zone name="posix/Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Antarctica/Palmer" value="CLST" />
-	<zone name="posix/Antarctica/Rothera" value="ROTT3" />
-	<zone name="posix/Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Antarctica/Syowa" value="SYOT-3" />
-	<zone name="posix/Antarctica/Troll" value="UTC0CEST-2,M3.5.0/1,M10.5.0/3" />
-	<zone name="posix/Antarctica/Vostok" value="VOST-6" />
-	<zone name="posix/Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Asia/Aden" value="AST-3" />
-	<zone name="posix/Asia/Almaty" value="ALMT-6" />
-	<zone name="posix/Asia/Amman" value="EEST" />
-	<zone name="posix/Asia/Anadyr" value="ANAT-12" />
-	<zone name="posix/Asia/Aqtau" value="AQTT-5" />
-	<zone name="posix/Asia/Aqtobe" value="AQTT-5" />
-	<zone name="posix/Asia/Ashgabat" value="TMT-5" />
-	<zone name="posix/Asia/Ashkhabad" value="TMT-5" />
-	<zone name="posix/Asia/Baghdad" value="AST-3" />
-	<zone name="posix/Asia/Bahrain" value="AST-3" />
-	<zone name="posix/Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="posix/Asia/Bangkok" value="ICT-7" />
-	<zone name="posix/Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="posix/Asia/Bishkek" value="KGT-6" />
-	<zone name="posix/Asia/Brunei" value="BNT-8" />
-	<zone name="posix/Asia/Calcutta" value="IST-5:30" />
-	<zone name="posix/Asia/Choibalsan" value="CHOT-8" />
-	<zone name="posix/Asia/Chongqing" value="CST-8" />
-	<zone name="posix/Asia/Chungking" value="CST-8" />
-	<zone name="posix/Asia/Colombo" value="IST-5:30" />
-	<zone name="posix/Asia/Dacca" value="BDT-6" />
-	<zone name="posix/Asia/Damascus" value="EET-2EEST,M3.5.5/0,M10.5.5/0" />
-	<zone name="posix/Asia/Dhaka" value="BDT-6" />
-	<zone name="posix/Asia/Dili" value="TLT-9" />
-	<zone name="posix/Asia/Dubai" value="GST-4" />
-	<zone name="posix/Asia/Dushanbe" value="TJT-5" />
-	<zone name="posix/Asia/Gaza" value="EEST" />
-	<zone name="posix/Asia/Harbin" value="CST-8" />
-	<zone name="posix/Asia/Hebron" value="EEST" />
-	<zone name="posix/Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="posix/Asia/Hong_Kong" value="HKT-8" />
-	<zone name="posix/Asia/Hovd" value="HOVT-7" />
-	<zone name="posix/Asia/Irkutsk" value="IRKT-9" />
-	<zone name="posix/Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Asia/Jakarta" value="WIB-7" />
-	<zone name="posix/Asia/Jayapura" value="WIT-9" />
-	<zone name="posix/Asia/Jerusalem" value="IDDT" />
-	<zone name="posix/Asia/Kabul" value="AFT-4:30" />
-	<zone name="posix/Asia/Kamchatka" value="PETT-12" />
-	<zone name="posix/Asia/Karachi" value="PKT-5" />
-	<zone name="posix/Asia/Kashgar" value="CST-8" />
-	<zone name="posix/Asia/Kathmandu" value="NPT-5:45" />
-	<zone name="posix/Asia/Katmandu" value="NPT-5:45" />
-	<zone name="posix/Asia/Khandyga" value="YAKT-10" />
-	<zone name="posix/Asia/Kolkata" value="IST-5:30" />
-	<zone name="posix/Asia/Krasnoyarsk" value="KRAT-8" />
-	<zone name="posix/Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="posix/Asia/Kuching" value="MYT-8" />
-	<zone name="posix/Asia/Kuwait" value="AST-3" />
-	<zone name="posix/Asia/Macao" value="CST-8" />
-	<zone name="posix/Asia/Macau" value="CST-8" />
-	<zone name="posix/Asia/Magadan" value="MAGT-12" />
-	<zone name="posix/Asia/Makassar" value="WITA-8" />
-	<zone name="posix/Asia/Manila" value="PHT-8" />
-	<zone name="posix/Asia/Muscat" value="GST-4" />
-	<zone name="posix/Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Asia/Novokuznetsk" value="NOVT-7" />
-	<zone name="posix/Asia/Novosibirsk" value="NOVT-7" />
-	<zone name="posix/Asia/Omsk" value="OMST-7" />
-	<zone name="posix/Asia/Oral" value="ORAT-5" />
-	<zone name="posix/Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="posix/Asia/Pontianak" value="WIB-7" />
-	<zone name="posix/Asia/Pyongyang" value="KST-9" />
-	<zone name="posix/Asia/Qatar" value="AST-3" />
-	<zone name="posix/Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="posix/Asia/Rangoon" value="MMT-6:30" />
-	<zone name="posix/Asia/Riyadh" value="AST-3" />
-	<zone name="posix/Asia/Saigon" value="ICT-7" />
-	<zone name="posix/Asia/Sakhalin" value="SAKT-11" />
-	<zone name="posix/Asia/Samarkand" value="UZT-5" />
-	<zone name="posix/Asia/Seoul" value="KST-9" />
-	<zone name="posix/Asia/Shanghai" value="CST-8" />
-	<zone name="posix/Asia/Singapore" value="SGT-8" />
-	<zone name="posix/Asia/Taipei" value="CST-8" />
-	<zone name="posix/Asia/Tashkent" value="UZT-5" />
-	<zone name="posix/Asia/Tbilisi" value="GET-4" />
-	<zone name="posix/Asia/Tehran" value="IRDT" />
-	<zone name="posix/Asia/Tel_Aviv" value="IDDT" />
-	<zone name="posix/Asia/Thimbu" value="BTT-6" />
-	<zone name="posix/Asia/Thimphu" value="BTT-6" />
-	<zone name="posix/Asia/Tokyo" value="JST-9" />
-	<zone name="posix/Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="posix/Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="posix/Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="posix/Asia/Urumqi" value="CST-8" />
-	<zone name="posix/Asia/Ust-Nera" value="VLAT-11" />
-	<zone name="posix/Asia/Vientiane" value="ICT-7" />
-	<zone name="posix/Asia/Vladivostok" value="VLAT-11" />
-	<zone name="posix/Asia/Yakutsk" value="YAKT-10" />
-	<zone name="posix/Asia/Yekaterinburg" value="YEKT-6" />
-	<zone name="posix/Asia/Yerevan" value="AMT-4" />
-	<zone name="posix/Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="posix/Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="posix/Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Reykjavik" value="GMT0" />
-	<zone name="posix/Atlantic/South_Georgia" value="GST2" />
-	<zone name="posix/Atlantic/St_Helena" value="GMT0" />
-	<zone name="posix/Atlantic/Stanley" value="FKST3" />
-	<zone name="posix/Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Brisbane" value="EST-10" />
-	<zone name="posix/Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Darwin" value="CST-9:30" />
-	<zone name="posix/Australia/Eucla" value="CWST-8:45" />
-	<zone name="posix/Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="posix/Australia/Lindeman" value="EST-10" />
-	<zone name="posix/Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="posix/Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/North" value="CST-9:30" />
-	<zone name="posix/Australia/Perth" value="WST-8" />
-	<zone name="posix/Australia/Queensland" value="EST-10" />
-	<zone name="posix/Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/West" value="WST-8" />
-	<zone name="posix/Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Brazil/Acre" value="ACT5" />
-	<zone name="posix/Brazil/DeNoronha" value="FNT2" />
-	<zone name="posix/Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/Brazil/West" value="AMT4" />
-	<zone name="posix/CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/East-Saskatchewan" value="CST6" />
-	<zone name="posix/Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Saskatchewan" value="CST6" />
-	<zone name="posix/Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Chile/Continental" value="CLST" />
-	<zone name="posix/Chile/EasterIsland" value="EASST" />
-	<zone name="posix/Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="posix/EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/EST" value="EST5" />
-	<zone name="posix/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Egypt" value="EEST" />
-	<zone name="posix/Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Etc/GMT" value="GMT0" />
-	<zone name="posix/Etc/GMT+0" value="GMT0" />
-	<zone name="posix/Etc/GMT+1" value="<GMT+1>1" />
-	<zone name="posix/Etc/GMT+10" value="<GMT+10>10" />
-	<zone name="posix/Etc/GMT+11" value="<GMT+11>11" />
-	<zone name="posix/Etc/GMT+12" value="<GMT+12>12" />
-	<zone name="posix/Etc/GMT+2" value="<GMT+2>2" />
-	<zone name="posix/Etc/GMT+3" value="<GMT+3>3" />
-	<zone name="posix/Etc/GMT+4" value="<GMT+4>4" />
-	<zone name="posix/Etc/GMT+5" value="<GMT+5>5" />
-	<zone name="posix/Etc/GMT+6" value="<GMT+6>6" />
-	<zone name="posix/Etc/GMT+7" value="<GMT+7>7" />
-	<zone name="posix/Etc/GMT+8" value="<GMT+8>8" />
-	<zone name="posix/Etc/GMT+9" value="<GMT+9>9" />
-	<zone name="posix/Etc/GMT-0" value="GMT0" />
-	<zone name="posix/Etc/GMT-1" value="<GMT-1>-1" />
-	<zone name="posix/Etc/GMT-10" value="<GMT-10>-10" />
-	<zone name="posix/Etc/GMT-11" value="<GMT-11>-11" />
-	<zone name="posix/Etc/GMT-12" value="<GMT-12>-12" />
-	<zone name="posix/Etc/GMT-13" value="<GMT-13>-13" />
-	<zone name="posix/Etc/GMT-14" value="<GMT-14>-14" />
-	<zone name="posix/Etc/GMT-2" value="<GMT-2>-2" />
-	<zone name="posix/Etc/GMT-3" value="<GMT-3>-3" />
-	<zone name="posix/Etc/GMT-4" value="<GMT-4>-4" />
-	<zone name="posix/Etc/GMT-5" value="<GMT-5>-5" />
-	<zone name="posix/Etc/GMT-6" value="<GMT-6>-6" />
-	<zone name="posix/Etc/GMT-7" value="<GMT-7>-7" />
-	<zone name="posix/Etc/GMT-8" value="<GMT-8>-8" />
-	<zone name="posix/Etc/GMT-9" value="<GMT-9>-9" />
-	<zone name="posix/Etc/GMT0" value="GMT0" />
-	<zone name="posix/Etc/Greenwich" value="GMT0" />
-	<zone name="posix/Etc/UCT" value="UCT0" />
-	<zone name="posix/Etc/UTC" value="UTC0" />
-	<zone name="posix/Etc/Universal" value="UTC0" />
-	<zone name="posix/Etc/Zulu" value="UTC0" />
-	<zone name="posix/Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Kaliningrad" value="FET-3" />
-	<zone name="posix/Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Minsk" value="FET-3" />
-	<zone name="posix/Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Moscow" value="MSK-4" />
-	<zone name="posix/Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Samara" value="SAMT-4" />
-	<zone name="posix/Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Simferopol" value="MSK-4" />
-	<zone name="posix/Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Volgograd" value="VOLT-4" />
-	<zone name="posix/Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Factory" value="<Local time zone must be set--see zic manual page>0" />
-	<zone name="posix/GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/GMT" value="GMT0" />
-	<zone name="posix/GMT+0" value="GMT0" />
-	<zone name="posix/GMT-0" value="GMT0" />
-	<zone name="posix/GMT0" value="GMT0" />
-	<zone name="posix/Greenwich" value="GMT0" />
-	<zone name="posix/HST" value="HST10" />
-	<zone name="posix/Hongkong" value="HKT-8" />
-	<zone name="posix/Iceland" value="GMT0" />
-	<zone name="posix/Indian/Antananarivo" value="EAT-3" />
-	<zone name="posix/Indian/Chagos" value="IOT-6" />
-	<zone name="posix/Indian/Christmas" value="CXT-7" />
-	<zone name="posix/Indian/Cocos" value="CCT-6:30" />
-	<zone name="posix/Indian/Comoro" value="EAT-3" />
-	<zone name="posix/Indian/Kerguelen" value="TFT-5" />
-	<zone name="posix/Indian/Mahe" value="SCT-4" />
-	<zone name="posix/Indian/Maldives" value="MVT-5" />
-	<zone name="posix/Indian/Mauritius" value="MUT-4" />
-	<zone name="posix/Indian/Mayotte" value="EAT-3" />
-	<zone name="posix/Indian/Reunion" value="RET-4" />
-	<zone name="posix/Iran" value="IRDT" />
-	<zone name="posix/Israel" value="IDDT" />
-	<zone name="posix/Jamaica" value="EST5" />
-	<zone name="posix/Japan" value="JST-9" />
-	<zone name="posix/Kwajalein" value="MHT-12" />
-	<zone name="posix/Libya" value="EET-2" />
-	<zone name="posix/MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/MST" value="MST7" />
-	<zone name="posix/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="posix/Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/NZ-CHAT" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="posix/Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/PRC" value="CST-8" />
-	<zone name="posix/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Pacific/Apia" value="WST-13WSDT,M9.5.0/3,M4.1.0/4" />
-	<zone name="posix/Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="posix/Pacific/Chuuk" value="CHUT-10" />
-	<zone name="posix/Pacific/Easter" value="EASST" />
-	<zone name="posix/Pacific/Efate" value="VUT-11" />
-	<zone name="posix/Pacific/Enderbury" value="PHOT-13" />
-	<zone name="posix/Pacific/Fakaofo" value="TKT-13" />
-	<zone name="posix/Pacific/Fiji" value="FJST" />
-	<zone name="posix/Pacific/Funafuti" value="TVT-12" />
-	<zone name="posix/Pacific/Galapagos" value="GALT6" />
-	<zone name="posix/Pacific/Gambier" value="GAMT9" />
-	<zone name="posix/Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="posix/Pacific/Guam" value="ChST-10" />
-	<zone name="posix/Pacific/Honolulu" value="HST10" />
-	<zone name="posix/Pacific/Johnston" value="HST10" />
-	<zone name="posix/Pacific/Kiritimati" value="LINT-14" />
-	<zone name="posix/Pacific/Kosrae" value="KOST-11" />
-	<zone name="posix/Pacific/Kwajalein" value="MHT-12" />
-	<zone name="posix/Pacific/Majuro" value="MHT-12" />
-	<zone name="posix/Pacific/Marquesas" value="MART9:30" />
-	<zone name="posix/Pacific/Midway" value="SST11" />
-	<zone name="posix/Pacific/Nauru" value="NRT-12" />
-	<zone name="posix/Pacific/Niue" value="NUT11" />
-	<zone name="posix/Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="posix/Pacific/Noumea" value="NCT-11" />
-	<zone name="posix/Pacific/Pago_Pago" value="SST11" />
-	<zone name="posix/Pacific/Palau" value="PWT-9" />
-	<zone name="posix/Pacific/Pitcairn" value="PST8" />
-	<zone name="posix/Pacific/Pohnpei" value="PONT-11" />
-	<zone name="posix/Pacific/Ponape" value="PONT-11" />
-	<zone name="posix/Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="posix/Pacific/Rarotonga" value="CKT10" />
-	<zone name="posix/Pacific/Saipan" value="ChST-10" />
-	<zone name="posix/Pacific/Samoa" value="SST11" />
-	<zone name="posix/Pacific/Tahiti" value="TAHT10" />
-	<zone name="posix/Pacific/Tarawa" value="GILT-12" />
-	<zone name="posix/Pacific/Tongatapu" value="TOT-13" />
-	<zone name="posix/Pacific/Truk" value="CHUT-10" />
-	<zone name="posix/Pacific/Wake" value="WAKT-12" />
-	<zone name="posix/Pacific/Wallis" value="WFT-12" />
-	<zone name="posix/Pacific/Yap" value="CHUT-10" />
-	<zone name="posix/Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/ROC" value="CST-8" />
-	<zone name="posix/ROK" value="KST-9" />
-	<zone name="posix/Singapore" value="SGT-8" />
-	<zone name="posix/SystemV/AST4" value="AST4" />
-	<zone name="posix/SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/CST6" value="CST6" />
-	<zone name="posix/SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/EST5" value="EST5" />
-	<zone name="posix/SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/HST10" value="HST10" />
-	<zone name="posix/SystemV/MST7" value="MST7" />
-	<zone name="posix/SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/PST8" value="PST8" />
-	<zone name="posix/SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/YST9" value="GAMT9" />
-	<zone name="posix/SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/UCT" value="UCT0" />
-	<zone name="posix/US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Arizona" value="MST7" />
-	<zone name="posix/US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Hawaii" value="HST10" />
-	<zone name="posix/US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Pacific-New" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Samoa" value="SST11" />
-	<zone name="posix/UTC" value="UTC0" />
-	<zone name="posix/Universal" value="UTC0" />
-	<zone name="posix/W-SU" value="MSK-4" />
-	<zone name="posix/WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Zulu" value="UTC0" />
-
-	<zone name="posixrules" value="EST5EDT,M3.2.0,M11.1.0" />
-
-	<zone name="right/Africa/Abidjan" value="GMT0" />
-	<zone name="right/Africa/Accra" value="GMT0" />
-	<zone name="right/Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="right/Africa/Algiers" value="CET-1" />
-	<zone name="right/Africa/Asmara" value="EAT-3" />
-	<zone name="right/Africa/Asmera" value="EAT-3" />
-	<zone name="right/Africa/Bamako" value="GMT0" />
-	<zone name="right/Africa/Bangui" value="WAT-1" />
-	<zone name="right/Africa/Banjul" value="GMT0" />
-	<zone name="right/Africa/Bissau" value="GMT0" />
-	<zone name="right/Africa/Blantyre" value="CAT-2" />
-	<zone name="right/Africa/Brazzaville" value="WAT-1" />
-	<zone name="right/Africa/Bujumbura" value="CAT-2" />
-	<zone name="right/Africa/Cairo" value="EEST" />
-	<zone name="right/Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Africa/Conakry" value="GMT0" />
-	<zone name="right/Africa/Dakar" value="GMT0" />
-	<zone name="right/Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="right/Africa/Djibouti" value="EAT-3" />
-	<zone name="right/Africa/Douala" value="WAT-1" />
-	<zone name="right/Africa/El_Aaiun" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Africa/Freetown" value="GMT0" />
-	<zone name="right/Africa/Gaborone" value="CAT-2" />
-	<zone name="right/Africa/Harare" value="CAT-2" />
-	<zone name="right/Africa/Johannesburg" value="SAST-2" />
-	<zone name="right/Africa/Juba" value="EAT-3" />
-	<zone name="right/Africa/Kampala" value="EAT-3" />
-	<zone name="right/Africa/Khartoum" value="EAT-3" />
-	<zone name="right/Africa/Kigali" value="CAT-2" />
-	<zone name="right/Africa/Kinshasa" value="WAT-1" />
-	<zone name="right/Africa/Lagos" value="WAT-1" />
-	<zone name="right/Africa/Libreville" value="WAT-1" />
-	<zone name="right/Africa/Lome" value="GMT0" />
-	<zone name="right/Africa/Luanda" value="WAT-1" />
-	<zone name="right/Africa/Lubumbashi" value="CAT-2" />
-	<zone name="right/Africa/Lusaka" value="CAT-2" />
-	<zone name="right/Africa/Malabo" value="WAT-1" />
-	<zone name="right/Africa/Maputo" value="CAT-2" />
-	<zone name="right/Africa/Maseru" value="SAST-2" />
-	<zone name="right/Africa/Mbabane" value="SAST-2" />
-	<zone name="right/Africa/Mogadishu" value="EAT-3" />
-	<zone name="right/Africa/Monrovia" value="GMT0" />
-	<zone name="right/Africa/Nairobi" value="EAT-3" />
-	<zone name="right/Africa/Ndjamena" value="WAT-1" />
-	<zone name="right/Africa/Niamey" value="WAT-1" />
-	<zone name="right/Africa/Nouakchott" value="GMT0" />
-	<zone name="right/Africa/Ouagadougou" value="GMT0" />
-	<zone name="right/Africa/Porto-Novo" value="WAT-1" />
-	<zone name="right/Africa/Sao_Tome" value="GMT0" />
-	<zone name="right/Africa/Timbuktu" value="GMT0" />
-	<zone name="right/Africa/Tripoli" value="EET-2" />
-	<zone name="right/Africa/Tunis" value="CET-1" />
-	<zone name="right/Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-	<zone name="right/America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Anguilla" value="AST4" />
-	<zone name="right/America/Antigua" value="AST4" />
-	<zone name="right/America/Araguaina" value="BRT3" />
-	<zone name="right/America/Argentina/Buenos_Aires" value="ART3" />
-	<zone name="right/America/Argentina/Catamarca" value="ART3" />
-	<zone name="right/America/Argentina/ComodRivadavia" value="ART3" />
-	<zone name="right/America/Argentina/Cordoba" value="ART3" />
-	<zone name="right/America/Argentina/Jujuy" value="ART3" />
-	<zone name="right/America/Argentina/La_Rioja" value="ART3" />
-	<zone name="right/America/Argentina/Mendoza" value="ART3" />
-	<zone name="right/America/Argentina/Rio_Gallegos" value="ART3" />
-	<zone name="right/America/Argentina/Salta" value="ART3" />
-	<zone name="right/America/Argentina/San_Juan" value="ART3" />
-	<zone name="right/America/Argentina/San_Luis" value="ART3" />
-	<zone name="right/America/Argentina/Tucuman" value="ART3" />
-	<zone name="right/America/Argentina/Ushuaia" value="ART3" />
-	<zone name="right/America/Aruba" value="AST4" />
-	<zone name="right/America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
-	<zone name="right/America/Atikokan" value="EST5" />
-	<zone name="right/America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Bahia" value="BRT3" />
-	<zone name="right/America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Barbados" value="AST4" />
-	<zone name="right/America/Belem" value="BRT3" />
-	<zone name="right/America/Belize" value="CST6" />
-	<zone name="right/America/Blanc-Sablon" value="AST4" />
-	<zone name="right/America/Boa_Vista" value="AMT4" />
-	<zone name="right/America/Bogota" value="COT5" />
-	<zone name="right/America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Buenos_Aires" value="ART3" />
-	<zone name="right/America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Caracas" value="VET4:30" />
-	<zone name="right/America/Catamarca" value="ART3" />
-	<zone name="right/America/Cayenne" value="GFT3" />
-	<zone name="right/America/Cayman" value="EST5" />
-	<zone name="right/America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Coral_Harbour" value="EST5" />
-	<zone name="right/America/Cordoba" value="ART3" />
-	<zone name="right/America/Costa_Rica" value="CST6" />
-	<zone name="right/America/Creston" value="MST7" />
-	<zone name="right/America/Cuiaba" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Curacao" value="AST4" />
-	<zone name="right/America/Danmarkshavn" value="GMT0" />
-	<zone name="right/America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Dawson_Creek" value="MST7" />
-	<zone name="right/America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Dominica" value="AST4" />
-	<zone name="right/America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Eirunepe" value="ACT5" />
-	<zone name="right/America/El_Salvador" value="CST6" />
-	<zone name="right/America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Fortaleza" value="BRT3" />
-	<zone name="right/America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Godthab" value="WGST" />
-	<zone name="right/America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Grenada" value="AST4" />
-	<zone name="right/America/Guadeloupe" value="AST4" />
-	<zone name="right/America/Guatemala" value="CST6" />
-	<zone name="right/America/Guayaquil" value="ECT5" />
-	<zone name="right/America/Guyana" value="GYT4" />
-	<zone name="right/America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="right/America/Hermosillo" value="MST7" />
-	<zone name="right/America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Jamaica" value="EST5" />
-	<zone name="right/America/Jujuy" value="ART3" />
-	<zone name="right/America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Kralendijk" value="AST4" />
-	<zone name="right/America/La_Paz" value="BOT4" />
-	<zone name="right/America/Lima" value="PET5" />
-	<zone name="right/America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Lower_Princes" value="AST4" />
-	<zone name="right/America/Maceio" value="BRT3" />
-	<zone name="right/America/Managua" value="CST6" />
-	<zone name="right/America/Manaus" value="AMT4" />
-	<zone name="right/America/Marigot" value="AST4" />
-	<zone name="right/America/Martinique" value="AST4" />
-	<zone name="right/America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Mendoza" value="ART3" />
-	<zone name="right/America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Metlakatla" value="MeST8" />
-	<zone name="right/America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="right/America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Montserrat" value="AST4" />
-	<zone name="right/America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Noronha" value="FNT2" />
-	<zone name="right/America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Ojinaga" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Panama" value="EST5" />
-	<zone name="right/America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Paramaribo" value="SRT3" />
-	<zone name="right/America/Phoenix" value="MST7" />
-	<zone name="right/America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Port_of_Spain" value="AST4" />
-	<zone name="right/America/Porto_Acre" value="ACT5" />
-	<zone name="right/America/Porto_Velho" value="AMT4" />
-	<zone name="right/America/Puerto_Rico" value="AST4" />
-	<zone name="right/America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Recife" value="BRT3" />
-	<zone name="right/America/Regina" value="CST6" />
-	<zone name="right/America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Rio_Branco" value="ACT5" />
-	<zone name="right/America/Rosario" value="ART3" />
-	<zone name="right/America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Santarem" value="BRT3" />
-	<zone name="right/America/Santiago" value="CLST" />
-	<zone name="right/America/Santo_Domingo" value="AST4" />
-	<zone name="right/America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="right/America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/St_Barthelemy" value="AST4" />
-	<zone name="right/America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/St_Kitts" value="AST4" />
-	<zone name="right/America/St_Lucia" value="AST4" />
-	<zone name="right/America/St_Thomas" value="AST4" />
-	<zone name="right/America/St_Vincent" value="AST4" />
-	<zone name="right/America/Swift_Current" value="CST6" />
-	<zone name="right/America/Tegucigalpa" value="CST6" />
-	<zone name="right/America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Tortola" value="AST4" />
-	<zone name="right/America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Virgin" value="AST4" />
-	<zone name="right/America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Antarctica/Casey" value="WST-8" />
-	<zone name="right/Antarctica/Davis" value="DAVT-7" />
-	<zone name="right/Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="right/Antarctica/Macquarie" value="MIST-11" />
-	<zone name="right/Antarctica/Mawson" value="MAWT-5" />
-	<zone name="right/Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Antarctica/Palmer" value="CLST" />
-	<zone name="right/Antarctica/Rothera" value="ROTT3" />
-	<zone name="right/Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Antarctica/Syowa" value="SYOT-3" />
-	<zone name="right/Antarctica/Troll" value="UTC0CEST-2,M3.5.0/1,M10.5.0/3" />
-	<zone name="right/Antarctica/Vostok" value="VOST-6" />
-	<zone name="right/Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Asia/Aden" value="AST-3" />
-	<zone name="right/Asia/Almaty" value="ALMT-6" />
-	<zone name="right/Asia/Amman" value="EEST" />
-	<zone name="right/Asia/Anadyr" value="ANAT-12" />
-	<zone name="right/Asia/Aqtau" value="AQTT-5" />
-	<zone name="right/Asia/Aqtobe" value="AQTT-5" />
-	<zone name="right/Asia/Ashgabat" value="TMT-5" />
-	<zone name="right/Asia/Ashkhabad" value="TMT-5" />
-	<zone name="right/Asia/Baghdad" value="AST-3" />
-	<zone name="right/Asia/Bahrain" value="AST-3" />
-	<zone name="right/Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="right/Asia/Bangkok" value="ICT-7" />
-	<zone name="right/Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="right/Asia/Bishkek" value="KGT-6" />
-	<zone name="right/Asia/Brunei" value="BNT-8" />
-	<zone name="right/Asia/Calcutta" value="IST-5:30" />
-	<zone name="right/Asia/Choibalsan" value="CHOT-8" />
-	<zone name="right/Asia/Chongqing" value="CST-8" />
-	<zone name="right/Asia/Chungking" value="CST-8" />
-	<zone name="right/Asia/Colombo" value="IST-5:30" />
-	<zone name="right/Asia/Dacca" value="BDT-6" />
-	<zone name="right/Asia/Damascus" value="EET-2EEST,M3.5.5/0,M10.5.5/0" />
-	<zone name="right/Asia/Dhaka" value="BDT-6" />
-	<zone name="right/Asia/Dili" value="TLT-9" />
-	<zone name="right/Asia/Dubai" value="GST-4" />
-	<zone name="right/Asia/Dushanbe" value="TJT-5" />
-	<zone name="right/Asia/Gaza" value="EEST" />
-	<zone name="right/Asia/Harbin" value="CST-8" />
-	<zone name="right/Asia/Hebron" value="EEST" />
-	<zone name="right/Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="right/Asia/Hong_Kong" value="HKT-8" />
-	<zone name="right/Asia/Hovd" value="HOVT-7" />
-	<zone name="right/Asia/Irkutsk" value="IRKT-9" />
-	<zone name="right/Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Asia/Jakarta" value="WIB-7" />
-	<zone name="right/Asia/Jayapura" value="WIT-9" />
-	<zone name="right/Asia/Jerusalem" value="IDDT" />
-	<zone name="right/Asia/Kabul" value="AFT-4:30" />
-	<zone name="right/Asia/Kamchatka" value="PETT-12" />
-	<zone name="right/Asia/Karachi" value="PKT-5" />
-	<zone name="right/Asia/Kashgar" value="CST-8" />
-	<zone name="right/Asia/Kathmandu" value="NPT-5:45" />
-	<zone name="right/Asia/Katmandu" value="NPT-5:45" />
-	<zone name="right/Asia/Khandyga" value="YAKT-10" />
-	<zone name="right/Asia/Kolkata" value="IST-5:30" />
-	<zone name="right/Asia/Krasnoyarsk" value="KRAT-8" />
-	<zone name="right/Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="right/Asia/Kuching" value="MYT-8" />
-	<zone name="right/Asia/Kuwait" value="AST-3" />
-	<zone name="right/Asia/Macao" value="CST-8" />
-	<zone name="right/Asia/Macau" value="CST-8" />
-	<zone name="right/Asia/Magadan" value="MAGT-12" />
-	<zone name="right/Asia/Makassar" value="WITA-8" />
-	<zone name="right/Asia/Manila" value="PHT-8" />
-	<zone name="right/Asia/Muscat" value="GST-4" />
-	<zone name="right/Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Asia/Novokuznetsk" value="NOVT-7" />
-	<zone name="right/Asia/Novosibirsk" value="NOVT-7" />
-	<zone name="right/Asia/Omsk" value="OMST-7" />
-	<zone name="right/Asia/Oral" value="ORAT-5" />
-	<zone name="right/Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="right/Asia/Pontianak" value="WIB-7" />
-	<zone name="right/Asia/Pyongyang" value="KST-9" />
-	<zone name="right/Asia/Qatar" value="AST-3" />
-	<zone name="right/Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="right/Asia/Rangoon" value="MMT-6:30" />
-	<zone name="right/Asia/Riyadh" value="AST-3" />
-	<zone name="right/Asia/Saigon" value="ICT-7" />
-	<zone name="right/Asia/Sakhalin" value="SAKT-11" />
-	<zone name="right/Asia/Samarkand" value="UZT-5" />
-	<zone name="right/Asia/Seoul" value="KST-9" />
-	<zone name="right/Asia/Shanghai" value="CST-8" />
-	<zone name="right/Asia/Singapore" value="SGT-8" />
-	<zone name="right/Asia/Taipei" value="CST-8" />
-	<zone name="right/Asia/Tashkent" value="UZT-5" />
-	<zone name="right/Asia/Tbilisi" value="GET-4" />
-	<zone name="right/Asia/Tehran" value="IRDT" />
-	<zone name="right/Asia/Tel_Aviv" value="IDDT" />
-	<zone name="right/Asia/Thimbu" value="BTT-6" />
-	<zone name="right/Asia/Thimphu" value="BTT-6" />
-	<zone name="right/Asia/Tokyo" value="JST-9" />
-	<zone name="right/Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="right/Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="right/Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="right/Asia/Urumqi" value="CST-8" />
-	<zone name="right/Asia/Ust-Nera" value="VLAT-11" />
-	<zone name="right/Asia/Vientiane" value="ICT-7" />
-	<zone name="right/Asia/Vladivostok" value="VLAT-11" />
-	<zone name="right/Asia/Yakutsk" value="YAKT-10" />
-	<zone name="right/Asia/Yekaterinburg" value="YEKT-6" />
-	<zone name="right/Asia/Yerevan" value="AMT-4" />
-	<zone name="right/Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="right/Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="right/Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Reykjavik" value="GMT0" />
-	<zone name="right/Atlantic/South_Georgia" value="GST2" />
-	<zone name="right/Atlantic/St_Helena" value="GMT0" />
-	<zone name="right/Atlantic/Stanley" value="FKST3" />
-	<zone name="right/Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Brisbane" value="EST-10" />
-	<zone name="right/Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Darwin" value="CST-9:30" />
-	<zone name="right/Australia/Eucla" value="CWST-8:45" />
-	<zone name="right/Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="right/Australia/Lindeman" value="EST-10" />
-	<zone name="right/Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="right/Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/North" value="CST-9:30" />
-	<zone name="right/Australia/Perth" value="WST-8" />
-	<zone name="right/Australia/Queensland" value="EST-10" />
-	<zone name="right/Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/West" value="WST-8" />
-	<zone name="right/Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Brazil/Acre" value="ACT5" />
-	<zone name="right/Brazil/DeNoronha" value="FNT2" />
-	<zone name="right/Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/Brazil/West" value="AMT4" />
-	<zone name="right/CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/East-Saskatchewan" value="CST6" />
-	<zone name="right/Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Saskatchewan" value="CST6" />
-	<zone name="right/Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Chile/Continental" value="CLST" />
-	<zone name="right/Chile/EasterIsland" value="EASST" />
-	<zone name="right/Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="right/EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/EST" value="EST5" />
-	<zone name="right/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/Egypt" value="EEST" />
-	<zone name="right/Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Etc/GMT" value="GMT0" />
-	<zone name="right/Etc/GMT+0" value="GMT0" />
-	<zone name="right/Etc/GMT+1" value="<GMT+1>1" />
-	<zone name="right/Etc/GMT+10" value="<GMT+10>10" />
-	<zone name="right/Etc/GMT+11" value="<GMT+11>11" />
-	<zone name="right/Etc/GMT+12" value="<GMT+12>12" />
-	<zone name="right/Etc/GMT+2" value="<GMT+2>2" />
-	<zone name="right/Etc/GMT+3" value="<GMT+3>3" />
-	<zone name="right/Etc/GMT+4" value="<GMT+4>4" />
-	<zone name="right/Etc/GMT+5" value="<GMT+5>5" />
-	<zone name="right/Etc/GMT+6" value="<GMT+6>6" />
-	<zone name="right/Etc/GMT+7" value="<GMT+7>7" />
-	<zone name="right/Etc/GMT+8" value="<GMT+8>8" />
-	<zone name="right/Etc/GMT+9" value="<GMT+9>9" />
-	<zone name="right/Etc/GMT-0" value="GMT0" />
-	<zone name="right/Etc/GMT-1" value="<GMT-1>-1" />
-	<zone name="right/Etc/GMT-10" value="<GMT-10>-10" />
-	<zone name="right/Etc/GMT-11" value="<GMT-11>-11" />
-	<zone name="right/Etc/GMT-12" value="<GMT-12>-12" />
-	<zone name="right/Etc/GMT-13" value="<GMT-13>-13" />
-	<zone name="right/Etc/GMT-14" value="<GMT-14>-14" />
-	<zone name="right/Etc/GMT-2" value="<GMT-2>-2" />
-	<zone name="right/Etc/GMT-3" value="<GMT-3>-3" />
-	<zone name="right/Etc/GMT-4" value="<GMT-4>-4" />
-	<zone name="right/Etc/GMT-5" value="<GMT-5>-5" />
-	<zone name="right/Etc/GMT-6" value="<GMT-6>-6" />
-	<zone name="right/Etc/GMT-7" value="<GMT-7>-7" />
-	<zone name="right/Etc/GMT-8" value="<GMT-8>-8" />
-	<zone name="right/Etc/GMT-9" value="<GMT-9>-9" />
-	<zone name="right/Etc/GMT0" value="GMT0" />
-	<zone name="right/Etc/Greenwich" value="GMT0" />
-	<zone name="right/Etc/UCT" value="UCT0" />
-	<zone name="right/Etc/UTC" value="UTC0" />
-	<zone name="right/Etc/Universal" value="UTC0" />
-	<zone name="right/Etc/Zulu" value="UTC0" />
-	<zone name="right/Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Kaliningrad" value="FET-3" />
-	<zone name="right/Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Minsk" value="FET-3" />
-	<zone name="right/Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Moscow" value="MSK-4" />
-	<zone name="right/Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Samara" value="SAMT-4" />
-	<zone name="right/Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Simferopol" value="MSK-4" />
-	<zone name="right/Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Volgograd" value="VOLT-4" />
-	<zone name="right/Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Factory" value="<Local time zone must be set--see zic manual page>0" />
-	<zone name="right/GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/GMT" value="GMT0" />
-	<zone name="right/GMT+0" value="GMT0" />
-	<zone name="right/GMT-0" value="GMT0" />
-	<zone name="right/GMT0" value="GMT0" />
-	<zone name="right/Greenwich" value="GMT0" />
-	<zone name="right/HST" value="HST10" />
-	<zone name="right/Hongkong" value="HKT-8" />
-	<zone name="right/Iceland" value="GMT0" />
-	<zone name="right/Indian/Antananarivo" value="EAT-3" />
-	<zone name="right/Indian/Chagos" value="IOT-6" />
-	<zone name="right/Indian/Christmas" value="CXT-7" />
-	<zone name="right/Indian/Cocos" value="CCT-6:30" />
-	<zone name="right/Indian/Comoro" value="EAT-3" />
-	<zone name="right/Indian/Kerguelen" value="TFT-5" />
-	<zone name="right/Indian/Mahe" value="SCT-4" />
-	<zone name="right/Indian/Maldives" value="MVT-5" />
-	<zone name="right/Indian/Mauritius" value="MUT-4" />
-	<zone name="right/Indian/Mayotte" value="EAT-3" />
-	<zone name="right/Indian/Reunion" value="RET-4" />
-	<zone name="right/Iran" value="IRDT" />
-	<zone name="right/Israel" value="IDDT" />
-	<zone name="right/Jamaica" value="EST5" />
-	<zone name="right/Japan" value="JST-9" />
-	<zone name="right/Kwajalein" value="MHT-12" />
-	<zone name="right/Libya" value="EET-2" />
-	<zone name="right/MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/MST" value="MST7" />
-	<zone name="right/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="right/Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/NZ-CHAT" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="right/Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/PRC" value="CST-8" />
-	<zone name="right/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Pacific/Apia" value="WST-13WSDT,M9.5.0/3,M4.1.0/4" />
-	<zone name="right/Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="right/Pacific/Chuuk" value="CHUT-10" />
-	<zone name="right/Pacific/Easter" value="EASST" />
-	<zone name="right/Pacific/Efate" value="VUT-11" />
-	<zone name="right/Pacific/Enderbury" value="PHOT-13" />
-	<zone name="right/Pacific/Fakaofo" value="TKT-13" />
-	<zone name="right/Pacific/Fiji" value="FJST" />
-	<zone name="right/Pacific/Funafuti" value="TVT-12" />
-	<zone name="right/Pacific/Galapagos" value="GALT6" />
-	<zone name="right/Pacific/Gambier" value="GAMT9" />
-	<zone name="right/Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="right/Pacific/Guam" value="ChST-10" />
-	<zone name="right/Pacific/Honolulu" value="HST10" />
-	<zone name="right/Pacific/Johnston" value="HST10" />
-	<zone name="right/Pacific/Kiritimati" value="LINT-14" />
-	<zone name="right/Pacific/Kosrae" value="KOST-11" />
-	<zone name="right/Pacific/Kwajalein" value="MHT-12" />
-	<zone name="right/Pacific/Majuro" value="MHT-12" />
-	<zone name="right/Pacific/Marquesas" value="MART9:30" />
-	<zone name="right/Pacific/Midway" value="SST11" />
-	<zone name="right/Pacific/Nauru" value="NRT-12" />
-	<zone name="right/Pacific/Niue" value="NUT11" />
-	<zone name="right/Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="right/Pacific/Noumea" value="NCT-11" />
-	<zone name="right/Pacific/Pago_Pago" value="SST11" />
-	<zone name="right/Pacific/Palau" value="PWT-9" />
-	<zone name="right/Pacific/Pitcairn" value="PST8" />
-	<zone name="right/Pacific/Pohnpei" value="PONT-11" />
-	<zone name="right/Pacific/Ponape" value="PONT-11" />
-	<zone name="right/Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="right/Pacific/Rarotonga" value="CKT10" />
-	<zone name="right/Pacific/Saipan" value="ChST-10" />
-	<zone name="right/Pacific/Samoa" value="SST11" />
-	<zone name="right/Pacific/Tahiti" value="TAHT10" />
-	<zone name="right/Pacific/Tarawa" value="GILT-12" />
-	<zone name="right/Pacific/Tongatapu" value="TOT-13" />
-	<zone name="right/Pacific/Truk" value="CHUT-10" />
-	<zone name="right/Pacific/Wake" value="WAKT-12" />
-	<zone name="right/Pacific/Wallis" value="WFT-12" />
-	<zone name="right/Pacific/Yap" value="CHUT-10" />
-	<zone name="right/Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/ROC" value="CST-8" />
-	<zone name="right/ROK" value="KST-9" />
-	<zone name="right/Singapore" value="SGT-8" />
-	<zone name="right/SystemV/AST4" value="AST4" />
-	<zone name="right/SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/CST6" value="CST6" />
-	<zone name="right/SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/EST5" value="EST5" />
-	<zone name="right/SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/HST10" value="HST10" />
-	<zone name="right/SystemV/MST7" value="MST7" />
-	<zone name="right/SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/PST8" value="PST8" />
-	<zone name="right/SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/YST9" value="GAMT9" />
-	<zone name="right/SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/UCT" value="UCT0" />
-	<zone name="right/US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Arizona" value="MST7" />
-	<zone name="right/US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Hawaii" value="HST10" />
-	<zone name="right/US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Pacific-New" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Samoa" value="SST11" />
-	<zone name="right/UTC" value="UTC0" />
-	<zone name="right/Universal" value="UTC0" />
-	<zone name="right/W-SU" value="MSK-4" />
-	<zone name="right/WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Zulu" value="UTC0" />
+        <zone name="UTC" value="UTC0" />
+
+        <zone name="Universal" value="UTC0" />
+
+        <zone name="W-SU" value="MSK-3" />
+
+        <zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
+
+        <zone name="Zulu" value="UTC0" />
     </timezones>
 </configuration>
diff --git a/conf/vanilla/autoload_configs/abstraction.conf.xml b/conf/vanilla/autoload_configs/abstraction.conf.xml
deleted file mode 100644
index 7244681374..0000000000
--- a/conf/vanilla/autoload_configs/abstraction.conf.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration name="abstraction.conf" description="Abstraction">
-<apis>
-	<api name="user_name" description="Return Name for extension" syntax="&lt;exten&gt;" parse="(.*)" destination="user_data" argument="$1@default var effective_caller_id_name"/>
-</apis>
-</configuration>
diff --git a/conf/vanilla/autoload_configs/cepstral.conf.xml b/conf/vanilla/autoload_configs/cepstral.conf.xml
deleted file mode 100644
index cf4aa92f41..0000000000
--- a/conf/vanilla/autoload_configs/cepstral.conf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration name="cepstral.conf" description="Cepstral TTS configuration">
-  <settings>
-    <!--
-        Possible encodings:
-        * utf-8
-        * us-ascii
-        * iso8859-1 (default)
-        * iso8859-15
-    -->
-    <param name="encoding" value="utf-8"/>
-  </settings>
-</configuration>
\ No newline at end of file
diff --git a/conf/vanilla/autoload_configs/kazoo.conf.xml b/conf/vanilla/autoload_configs/kazoo.conf.xml
deleted file mode 100644
index b730523d4c..0000000000
--- a/conf/vanilla/autoload_configs/kazoo.conf.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration name="kazoo.conf" description="General purpose Erlang c-node produced to better fit the Kazoo project">
-  <settings>
-    <param name="listen-ip" value="0.0.0.0" />
-    <param name="listen-port" value="8031" />
-    <!--<param name="cookie-file" value="/etc/freeswitch/autoload_configs/.erlang.cookie" />-->
-    <param name="cookie" value="change_me" />
-    <param name="shortname" value="false" />
-    <param name="nodename" value="freeswitch" />
-    <param name="send-msg-batch-size" value="10" />
-    <param name="receive-timeout" value="1" />
-    <!--<param name="receive-msg-preallocate" value="0" />-->
-    <!--<param name="event-stream-preallocate" value="0" />-->
-    <!--<param name="event-stream-framing" value="2" />-->
-    <!--<param name="kazoo-var-prefix" value="ecallmgr" />-->
-    <!--<param name="compat-rel" value="12"/> -->
-  </settings>
-  <event-filter type="whitelist">
-    <header name="Acquired-UUID" />
-    <header name="action" />
-    <header name="Action" />
-    <header name="alt_event_type" />
-    <header name="Answer-State" />
-    <header name="Application" />
-    <header name="Application-Data" />
-    <header name="Application-Name" />
-    <header name="Application-Response" />
-    <header name="att_xfer_replaced_by" />
-    <header name="Auth-Method" />
-    <header name="Auth-Realm" />
-    <header name="Auth-User" />
-    <header name="Bridge-A-Unique-ID" />
-    <header name="Bridge-B-Unique-ID" />
-    <header name="Call-Direction" />
-    <header name="Caller-Callee-ID-Name" />
-    <header name="Caller-Callee-ID-Number" />
-    <header name="Caller-Caller-ID-Name" />
-    <header name="Caller-Caller-ID-Number" />
-    <header name="Caller-Context" />
-    <header name="Caller-Controls" />
-    <header name="Caller-Destination-Number" />
-    <header name="Caller-Dialplan" />
-    <header name="Caller-Network-Addr" />
-    <header name="Caller-Unique-ID" />
-    <header name="Call-ID" />
-    <header name="Channel-Call-State" />
-    <header name="Channel-Call-UUID" />
-    <header name="Channel-Presence-ID" />
-    <header name="Channel-State" />
-    <header name="Chat-Permissions" />
-    <header name="Conference-Name" />
-    <header name="Conference-Profile-Name" />
-    <header name="Conference-Unique-ID" />
-    <header name="Conference-Size" />
-    <header name="New-ID" />
-    <header name="Old-ID" />
-    <header name="Detected-Tone" />
-    <header name="dialog_state" />
-    <header name="direction" />
-    <header name="Distributed-From" />
-    <header name="DTMF-Digit" />
-    <header name="DTMF-Duration" />
-    <header name="Event-Date-Timestamp" />
-    <header name="Event-Name" />
-    <header name="Event-Subclass" />
-    <header name="Expires" />
-    <header name="Ext-SIP-IP" />
-    <header name="File" />
-    <header name="FreeSWITCH-Hostname" />
-    <header name="from" />
-    <header name="Hunt-Destination-Number" />
-    <header name="ip" />
-    <header name="Message-Account" />
-    <header name="metadata" />
-    <header name="old_node_channel_uuid" />
-    <header name="Other-Leg-Callee-ID-Name" />
-    <header name="Other-Leg-Callee-ID-Number" />
-    <header name="Other-Leg-Caller-ID-Name" />
-    <header name="Other-Leg-Caller-ID-Number" />
-    <header name="Other-Leg-Destination-Number" />
-    <header name="Other-Leg-Direction" />
-    <header name="Other-Leg-Unique-ID" />
-    <header name="Participant-Type" />
-    <header name="Path" />
-    <header name="profile_name" />
-    <header name="Profiles" />
-    <header name="proto-specific-event-name" />
-    <header name="Raw-Application-Data" />
-    <header name="Resigning-UUID" />
-    <header name="set" />
-    <header name="sip_auto_answer" />
-    <header name="sip_auth_method" />
-    <header name="sip_from_host" />
-    <header name="sip_from_user" />
-    <header name="sip_to_host" />
-    <header name="sip_to_user" />
-    <header name="sub-call-id" />
-    <header name="technology" />
-    <header name="to" />
-    <header name="Unique-ID" />
-    <header name="URL" />
-    <header name="variable_channel_is_moving" />
-    <header name="variable_collected_digits" />
-    <header name="variable_current_application" />
-    <header name="variable_current_application_data" />
-    <header name="variable_domain_name" />
-    <header name="variable_effective_caller_id_name" />
-    <header name="variable_effective_caller_id_number" />
-    <header name="variable_fax_bad_rows" />
-    <header name="variable_fax_document_total_pages" />
-    <header name="variable_fax_document_transferred_pages" />
-    <header name="variable_fax_ecm_used" />
-    <header name="variable_fax_result_code" />
-    <header name="variable_fax_result_text" />
-    <header name="variable_fax_success" />
-    <header name="variable_fax_transfer_rate" />
-    <header name="variable_holding_uuid" />
-    <header name="variable_hold_music" />
-    <header name="variable_media_group_id" />
-    <header name="variable_originate_disposition" />
-    <header name="variable_playback_terminator_used" />
-    <header name="variable_presence_id" />
-    <header name="variable_record_ms" />
-    <header name="variable_recovered" />
-    <header name="variable_silence_hits_exhausted" />
-    <header name="variable_sip_auth_realm" />
-    <header name="variable_sip_from_host" />
-    <header name="variable_sip_from_user" />
-    <header name="variable_sip_h_X-AUTH-IP" />
-    <header name="variable_sip_received_ip" />
-    <header name="variable_sip_to_host" />
-    <header name="variable_sip_to_user" />
-    <header name="variable_sofia_profile_name" />
-    <header name="variable_transfer_history" />
-    <header name="variable_user_name" />
-    <header name="variable_endpoint_disposition" />
-    <header name="variable_originate_disposition" />
-    <header name="variable_bridge_hangup_cause" />
-    <header name="variable_hangup_cause" />
-    <header name="variable_last_bridge_proto_specific_hangup_cause" />
-    <header name="variable_proto_specific_hangup_cause" />
-    <header name="VM-Call-ID" />
-    <header name="VM-sub-call-id" />
-    <header name="whistle_application_name" />
-    <header name="whistle_application_response" />
-    <header name="whistle_event_name" />
-    <header name="sip_auto_answer_notify" />
-    <header name="eavesdrop_group" />
-    <header name="origination_caller_id_name" />
-    <header name="origination_caller_id_number" />
-    <header name="origination_callee_id_name" />
-    <header name="origination_callee_id_number" />
-    <header name="sip_auth_username" />
-    <header name="sip_auth_password" />
-    <header name="effective_caller_id_name" />
-    <header name="effective_caller_id_number" />
-    <header name="effective_callee_id_name" />
-    <header name="effective_callee_id_number" />
-    
-    <!-- Registrations -->
-    <header name="call-id" />
-    <header name="profile-name" />
-    <header name="from-user" />
-    <header name="from-host" />
-    <header name="presence-hosts" />
-    <header name="contact" />
-    <header name="rpid" />
-    <header name="status" />
-    <header name="expires" />
-    <header name="to-user" />
-    <header name="to-host" />
-    <header name="network-ip" />
-    <header name="network-port" />
-    <header name="username" />
-    <header name="realm" />
-    <header name="user-agent" />
-    
-    <!-- CDR Headers -->
-    <header name="Hangup-Cause" />
-    <header name="Unique-ID" />
-    <header name="variable_switch_r_sdp" />
-    <header name="variable_sip_local_sdp_str" />
-    <header name="variable_sip_to_uri" />
-    <header name="variable_sip_from_uri" />
-    <header name="variable_effective_caller_id_number" />
-    <header name="Caller-Caller-ID-Number" />
-    <header name="variable_effective_caller_id_name" />
-    <header name="Caller-Caller-ID-Name" />
-    <header name="Caller-Callee-ID-Name" />
-    <header name="Caller-Callee-ID-Number" />
-    <header name="Other-Leg-Unique-ID" />
-    <header name="variable_sip_user_agent" />
-    <header name="variable_duration" />
-    <header name="variable_billsec" />
-    <header name="variable_progresssec" />
-    <header name="variable_progress_uepoch" />
-    <header name="variable_progress_media_uepoch" />
-    <header name="variable_start_uepoch" />
-    <header name="variable_digits_dialed" />
-    <header name="variable_sip_cid_type" />
-    
-    <!-- Conference Headers -->
-    <header name="Hear" />
-    <header name="Speak" />
-    <header name="Video" />
-    <header name="Talking" />
-    <header name="Mute-Detect" />
-    <header name="Member-ID" />
-    <header name="Member-Type" />
-    <header name="Energy-Level" />
-    <header name="Current-Energy" />
-    <header name="Floor" />
-    
-  </event-filter>
-</configuration>
diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
old mode 100644
new mode 100755
index b5a58d1580..6363e233cb
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -16,7 +16,6 @@
     <!-- <load module="mod_xml_rpc"/> -->
     <!-- <load module="mod_xml_curl"/> -->
     <!-- <load module="mod_xml_cdr"/> -->
-    <!-- <load module="mod_xml_radius"/> -->
     <!-- <load module="mod_xml_scgi"/> -->
 
     <!-- Event Handlers -->
@@ -25,7 +24,6 @@
     <!-- <load module="mod_cdr_sqlite"/> -->
     <!-- <load module="mod_event_multicast"/> -->
     <load module="mod_event_socket"/>
-    <!-- <load module="mod_event_zmq"/> -->
     <!-- <load module="mod_zeroconf"/> -->
     <!-- <load module="mod_erlang_event"/> -->
     <!-- <load module="mod_smpp"/> -->
@@ -36,15 +34,12 @@
 
     <!-- Endpoints -->
     <!-- <load module="mod_dingaling"/> -->
-    <!-- <load module="mod_portaudio"/> -->
     <!-- <load module="mod_alsa"/> -->
     <load module="mod_sofia"/>
     <load module="mod_loopback"/>
     <!-- <load module="mod_woomera"/> -->
     <!-- <load module="mod_freetdm"/> -->
-    <!-- <load module="mod_unicall"/> -->
     <!-- <load module="mod_skinny"/> -->
-    <!-- <load module="mod_khomp"/>   -->
     <load module="mod_rtc"/>
     <!-- <load module="mod_rtmp"/>   -->
     <load module="mod_verto"/>
@@ -72,18 +67,11 @@
     <!--<load module="mod_fsk"/>-->
     <!--<load module="mod_spy"/>-->
     <!--<load module="mod_sms"/>-->
-    <!--<load module="mod_sms_flowroute"/>-->
     <!--<load module="mod_smpp"/>-->
     <!--<load module="mod_random"/>-->
     <load module="mod_httapi"/>
     <!--<load module="mod_translate"/>-->
 
-    <!-- SNOM Module -->
-    <!--<load module="mod_snom"/>-->
-
-    <!-- This one only works on Linux for now -->
-    <!--<load module="mod_ladspa"/>-->
-
     <!-- Dialplan Interfaces -->
     <!-- <load module="mod_dialplan_directory"/> -->
     <load module="mod_dialplan_xml"/>
@@ -95,10 +83,8 @@
     <load module="mod_g729"/>
     <load module="mod_amr"/>
     <!--<load module="mod_ilbc"/>-->
-    <!--<load module="mod_h26x"/>-->
     <load module="mod_b64"/>
     <!--<load module="mod_siren"/>-->
-    <!--<load module="mod_isac"/>-->
     <load module="mod_opus"/>
 
     <!-- File Format Interfaces -->
@@ -129,9 +115,7 @@
     <!-- ASR /TTS -->
     <!-- <load module="mod_flite"/> -->
     <!-- <load module="mod_pocketsphinx"/> -->
-    <!-- <load module="mod_cepstral"/> -->
     <!-- <load module="mod_tts_commandline"/> -->
-    <!-- <load module="mod_rss"/> -->
 
     <!-- Say -->
     <load module="mod_say_en"/>
diff --git a/conf/vanilla/autoload_configs/portaudio.conf.xml b/conf/vanilla/autoload_configs/portaudio.conf.xml
deleted file mode 100644
index a715571c6f..0000000000
--- a/conf/vanilla/autoload_configs/portaudio.conf.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<configuration name="portaudio.conf" description="Soundcard Endpoint">
-  <settings>
-    <!-- indev, outdev, ringdev: 
-	 partial case sensitive string match on something in the name 
-	 or the device number prefixed with # eg "#1" (or blank for default) -->
-
-    <!-- device to use for input -->
-    <param name="indev" value=""/>
-    <!-- device to use for output -->
-    <param name="outdev" value=""/>
-
-    <!--device to use for inbound ring -->
-    <!--<param name="ringdev" value=""/>-->
-    <!--File to play as the ring sound -->
-    <!--<param name="ring-file" value="/sounds/ring.wav"/>-->
-    <!--Number of seconds to pause between rings -->
-    <!--<param name="ring-interval" value="5"/>-->
-    <!--Enable or Disable dual_streams-->
-    <!--<param name="dual-streams" value="true"/>-->
-
-    <!--file to play when calls are on hold-->
-    <param name="hold-file" value="$${hold_music}"/>
-    <!--Timer to use for hold music (i'd leave this one commented)-->
-    <!--<param name="timer-name" value="soft"/>-->
-
-    <!--Default dialplan and caller-id info -->
-    <param name="dialplan" value="XML"/>
-    <param name="cid-name" value="$${outbound_caller_name}"/>
-    <param name="cid-num" value="$${outbound_caller_id}"/>
-
-    <!--audio sample rate and interval -->
-    <param name="sample-rate" value="48000"/>
-    <param name="codec-ms" value="20"/>
-
-    <!--uncomment the following line to make mod_portaudio fail to load if it fails to find a device-->
-    <!-- <param name="unload-on-device-fail" value="true"/> -->
-  </settings>
-
-  <!-- 
-	mod_portaudio "streams"
-
-	The portaudio streams were introduced to support multiple devices and multiple channels in mod_portaudio.
-	For example, if you have a sound card that supports multiple channels or have multiple sound cards and you
-	want to use them at the same time, you can do it configuring streams and endpoints here.
-
-	A "stream" is just a logical container for some settings required by portaudio in order to stream audio and
-	define a friendly name for that configuration. Streams in itself do not do anything else than contain configs. 
-	Once you have your streams defined you can proceed to define "endpoints". Go to the "<endpoints>" section 
-	for more information on endpoints.
-
-	You can use the command "pa shstreams" (portaudio shared streams) to show the configured streams.
-  -->
-  <streams>
-  	<!--
-	In this example we define 2 streams, one for a usb audio device and another for the usual Mac defaults
-	The name="" attribute in the <stream> tag must uniquely identify the stream configuration and can be
-	later used when creating endpoints in the "instream" and "outstream" parameters of the endpoint.
-	-->
-
-	<!-- This sample "usb1" configuration was tested with a USB Griffin iMic device -->
-  	<stream name="usb1">
-		<!-- 
-			Which device to use for input in this stream 
-			The value for this parameter must be either in the form '#devno', 
-			for example '#2' for device number 2, or 'device-name', like 'iMic USB audio system'
-			The output of command "pa devlist" will show you device names and numbers as enumerated
-			by portaudio.
-		-->
-		<param name="indev" value="#2" />
-
-		<!-- 
-			Same as the indev but for output. In this case the device is capable of input and output
-			Some devices are capable of input only or output only (see the default example)
-	       	-->
-		<param name="outdev" value="#2" />
-
-		<!-- The sample rate to use for this stream -->
-		<param name="sample-rate" value="48000" />
-
-		<!-- 
-			Size of the packets in milliseconds. The smaller the number the less latency you'll have
-			The minimum value is 10ms 
-		-->
-		<param name="codec-ms" value="10" />
-
-		<!-- 
-			How many channels to open for this stream.
-			If you're device is stereo, you can choose 2 here. However, bear in mind that then
-			your left and right channels will be separated and when creating endpoints you will have
-			to either choose the left or right channel. This may or may not be what you want. This separation
-			means that you can have 2 separate FreeSWITCH calls, listening to one of them in your left channel
-			and the other in the right chanel.
-		-->
-		<param name="channels" value="2" />
-  	</stream>
-
-	<!-- This default stream was tested using the default Macbook Pro input/output devices -->
-  	<stream name="default">
-		<!-- The default system input device -->
-		<param name="indev" value="#0" />
-		<!-- The default system output device -->
-		<param name="outdev" value="#1" />
-		<!-- CD quality sampling rate ftw -->
-		<param name="sample-rate" value="48000" />
-		<!-- Low latency -->
-		<param name="codec-ms" value="10" />
-		<!-- Choosing 1 channel allows to hear in both left-right channel when using a headset -->
-		<param name="channels" value="1" />
-  	</stream>
-  </streams>
-
-  <!-- 
-	mod_portaudio "endpoints"
-
-	Endpoints is a way to define the input and output that a given portaudio channel will use.
-	There is a lot of flexibility. You can create endpoints which are "send-only", which means
-	audio will be read from FreeSWITCH and sent down to the provided stream, but no audio will
-	be read from that stream and only silence provided back to FreeSWITCH.
-
-		send-only endpoint:
-			(FS CORE) ->-> audio ->-> sound-card-x
-
-	You can also create a read-only endpoint.
-
-		read-only-endpoint:
-			(FS CORE) <-<- audio <-<- sound-card-x
-
-	And of course you can create a bidirectional endpoint:
-		bidirectional-endpoint:
-			(FS CORE) <-> audio <-> sound-card-x
-
-	You can also define a stream which uses only the left or only the right channel of a given device stream.
-	This means you can have 2 SIP calls connected to the same device haring one call in your left ear and
-	the other call to your right ear :-)
-
-	The name="parameter" of the endpoint allows you to use it in the FreeSWITCH dial plan to dial, ie:
-
-	<action application="bridge" data="portaudio/endpoint/usb1out-left" />
-
-	You can use the command "pa endpoints" to show the configured endpoints.
-  -->
-  <endpoints>
-
-	<!-- 
-		An endpoint is a handle name to refer to a configuration that determines where to read media from 
-		and write media to. The endpoint can use any input/output stream combination for that purpose as 
-		long as the streams match the sampling rate and codec-ms (see <streams> XML tag).
-		You can also omit the instream or the outstream parameter (but obviously not both).
-	-->
-
-	<!-- 
-		Configuration for a "default" bidirectional endpoint that uses the default stream defined previously in
-		the <streams> section.
-	 -->
-  	<endpoint name="default">
-		<!-- 
-			The instream, outstream is the name of the stream and channel to use. The stream
-			name is the same you configured in the <streams> section. This parameters follow 
-			the syntax <stream-name>:<channel index>. You can omit either the outstream
-			or the instream, but not both! The channel index is zero-based and must be consistent 
-			with the number of channels available for that stream (as configured in the <stream> section).
-			You cannot use index 1 if you chose channels=1 in the stream configuration.
-		-->
-		<param name="instream" value="default:0" />
-		<param name="outstream" value="default:0" />
-	</endpoint>
-
-	<!-- 
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'send-only' or 'output-only' and uses the channel index 0 (left channel in a stereo device) 
-	-->
-  	<endpoint name="usb1out-left">
-		<param name="outstream" value="usb1:0" />
-	</endpoint>
-
-	<!-- 
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'send-only' or 'output-only' and uses the channel index 1 (right channel in a stereo device) 
-	-->
-  	<endpoint name="usb1out-right">
-		<param name="outstream" value="usb1:1" />
-	</endpoint>
-
-	<!-- 
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'receive-only' or 'input-only' and uses the channel index 0 (left channel in a stereo device) 
-	-->
-  	<endpoint name="usb1in-left">
-		<param name="instream" value="usb1:0" />
-	</endpoint>
-
-	<!-- 
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'receive-only' or 'input-only' and uses the channel index 1 (right channel in a stereo device) 
-	-->
-  	<endpoint name="usb1in-right">
-		<param name="instream" value="usb1:1" />
-	</endpoint>
-
-	<!-- 
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'bidirectional' or 'send-receive' and uses the channel index 0 (left channel in a stereo device) 
-	-->
-  	<endpoint name="usb1-left">
-		<param name="instream" value="usb1:0" />
-		<param name="outstream" value="usb1:0" />
-	</endpoint>
-
-	<!-- 
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'bidirectional' or 'send-receive' and uses the channel index 1 (right channel in a stereo device) 
-	-->
-  	<endpoint name="usb1-right">
-		<param name="instream" value="usb1:1" />
-		<param name="outstream" value="usb1:1" />
-	</endpoint>
-
-  </endpoints>
-
-</configuration>
-
diff --git a/conf/vanilla/autoload_configs/rss.conf.xml b/conf/vanilla/autoload_configs/rss.conf.xml
deleted file mode 100644
index f8c4f6d2b4..0000000000
--- a/conf/vanilla/autoload_configs/rss.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration name="rss.conf" description="RSS Parser">
-  <feeds>
-    <!-- Just download the files to wherever and refer to them here -->
-    <!-- <feed name="Slash Dot">/home/rss/rss.rss</feed> -->
-    <!-- <feed name="News Forge">/home/rss/newsforge.rss</feed> -->
-  </feeds>
-</configuration>
diff --git a/conf/vanilla/autoload_configs/sangoma_codec.conf.xml b/conf/vanilla/autoload_configs/sangoma_codec.conf.xml
deleted file mode 100644
index eed9d673e1..0000000000
--- a/conf/vanilla/autoload_configs/sangoma_codec.conf.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<configuration name="sangoma_codec.conf" description="Sangoma Codec Configuration">
-
-	<settings>
-		<!--
-		Comma separated list of codecs to register with FreeSWITCH, 
-		by default (if this parameter is not set) all available codecs are registered.
-		Valid codec values are: PCMU,PCMA,G729,G726-32,G722,GSM,G723,AMR,G7221,iLBC
-		If this parameter is not specified only G729 will be registered
-		<param name="register" value="all"/>
-		-->
-
-		<!-- 
-		List of codecs to not register with FreeSWITCH, by default this is empty,
-	        but you may want to not load PCMU and PCMA or may be others to not use your 
-	        resources in codecs that are done well and fast in software.	
-		<param name="noregister" value="PCMU,PCMA"/>
-		-->
-
-		<!--
-		Transcoding SOAP server URL. If you are installing the soap server (sngtc_server)
-		in the same box where FreeSWITCH, do not use this value, the default URL
-		that is hard-coded will work out of the box for local installations.
-		If you modify this value, you must configure your SOAP server (/etc/sngtc/sngtc_server.conf.xml)
-		to listen for HTTP requests on the same IP/port that you specify here.
-		<param name="soapserver" value="http://192.168.1.100:8080"/>
-		-->
-
-		<!--
-		RTP IP to use
-		By default, this module asks FreeSWITCH for the local ip address. However if you want to use a specific
-		IP address you can set it here.
-		<param name="rtpip" value="192.168.1.1"/>
-		-->
-	</settings>
-
-</configuration>
-
diff --git a/conf/vanilla/autoload_configs/sms_flowroute.conf.xml b/conf/vanilla/autoload_configs/sms_flowroute.conf.xml
deleted file mode 100644
index 43d1c3eb06..0000000000
--- a/conf/vanilla/autoload_configs/sms_flowroute.conf.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<configuration name="sms_flowroute.conf" description="SMS_FLOWROUTE send configs">
-  <profiles>
-    <profile name="default">
-      <params>
-	<param name="host" value="https://api.flowroute.com/v2/messages"/>
-	<param name="debug" value="1"/>
-	<param name="port" value="8090"/>
-	<param name="access-key" value="ACCESS-KEY"/>
-	<param name="secret-key" value="SECRET-KEY"/>
-      </params>
-    </profile>
-  </profiles>
-</configuration>
diff --git a/conf/vanilla/autoload_configs/timezones.conf.xml b/conf/vanilla/autoload_configs/timezones.conf.xml
index 48206d1ce4..9ddded792c 100644
--- a/conf/vanilla/autoload_configs/timezones.conf.xml
+++ b/conf/vanilla/autoload_configs/timezones.conf.xml
@@ -1,1816 +1,661 @@
 <configuration name="timezones.conf" description="Timezones">
     <timezones>
-	<zone name="Africa/Abidjan" value="GMT0" />
-	<zone name="Africa/Accra" value="GMT0" />
-	<zone name="Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="Africa/Algiers" value="CET-1" />
-	<zone name="Africa/Asmara" value="EAT-3" />
-	<zone name="Africa/Asmera" value="EAT-3" />
-	<zone name="Africa/Bamako" value="GMT0" />
-	<zone name="Africa/Bangui" value="WAT-1" />
-	<zone name="Africa/Banjul" value="GMT0" />
-	<zone name="Africa/Bissau" value="GMT0" />
-	<zone name="Africa/Blantyre" value="CAT-2" />
-	<zone name="Africa/Brazzaville" value="WAT-1" />
-	<zone name="Africa/Bujumbura" value="CAT-2" />
-	<zone name="Africa/Cairo" value="EET-2" />
-	<zone name="Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Conakry" value="GMT0" />
-	<zone name="Africa/Dakar" value="GMT0" />
-	<zone name="Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="Africa/Djibouti" value="EAT-3" />
-	<zone name="Africa/Douala" value="WAT-1" />
-	<zone name="Africa/El_Aaiun" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Freetown" value="GMT0" />
-	<zone name="Africa/Gaborone" value="CAT-2" />
-	<zone name="Africa/Harare" value="CAT-2" />
-	<zone name="Africa/Johannesburg" value="SAST-2" />
-	<zone name="Africa/Juba" value="EAT-3" />
-	<zone name="Africa/Kampala" value="EAT-3" />
-	<zone name="Africa/Khartoum" value="EAT-3" />
-	<zone name="Africa/Kigali" value="CAT-2" />
-	<zone name="Africa/Kinshasa" value="WAT-1" />
-	<zone name="Africa/Lagos" value="WAT-1" />
-	<zone name="Africa/Libreville" value="WAT-1" />
-	<zone name="Africa/Lome" value="GMT0" />
-	<zone name="Africa/Luanda" value="WAT-1" />
-	<zone name="Africa/Lubumbashi" value="CAT-2" />
-	<zone name="Africa/Lusaka" value="CAT-2" />
-	<zone name="Africa/Malabo" value="WAT-1" />
-	<zone name="Africa/Maputo" value="CAT-2" />
-	<zone name="Africa/Maseru" value="SAST-2" />
-	<zone name="Africa/Mbabane" value="SAST-2" />
-	<zone name="Africa/Mogadishu" value="EAT-3" />
-	<zone name="Africa/Monrovia" value="GMT0" />
-	<zone name="Africa/Nairobi" value="EAT-3" />
-	<zone name="Africa/Ndjamena" value="WAT-1" />
-	<zone name="Africa/Niamey" value="WAT-1" />
-	<zone name="Africa/Nouakchott" value="GMT0" />
-	<zone name="Africa/Ouagadougou" value="GMT0" />
-	<zone name="Africa/Porto-Novo" value="WAT-1" />
-	<zone name="Africa/Sao_Tome" value="GMT0" />
-	<zone name="Africa/Timbuktu" value="GMT0" />
-	<zone name="Africa/Tripoli" value="EET-2" />
-	<zone name="Africa/Tunis" value="CET-1" />
-	<zone name="Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
+        <zone name="Africa/Abidjan" value="GMT0" />
+        <zone name="Africa/Accra" value="GMT0" />
+        <zone name="Africa/Addis_Ababa" value="EAT-3" />
+        <zone name="Africa/Algiers" value="CET-1" />
+        <zone name="Africa/Asmara" value="EAT-3" />
+        <zone name="Africa/Asmera" value="EAT-3" />
+        <zone name="Africa/Bamako" value="GMT0" />
+        <zone name="Africa/Bangui" value="WAT-1" />
+        <zone name="Africa/Banjul" value="GMT0" />
+        <zone name="Africa/Bissau" value="GMT0" />
+        <zone name="Africa/Blantyre" value="CAT-2" />
+        <zone name="Africa/Brazzaville" value="WAT-1" />
+        <zone name="Africa/Bujumbura" value="CAT-2" />
+        <zone name="Africa/Cairo" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
+        <zone name="Africa/Casablanca" value="STD-1" />
+        <zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Africa/Conakry" value="GMT0" />
+        <zone name="Africa/Dakar" value="GMT0" />
+        <zone name="Africa/Dar_es_Salaam" value="EAT-3" />
+        <zone name="Africa/Djibouti" value="EAT-3" />
+        <zone name="Africa/Douala" value="WAT-1" />
+        <zone name="Africa/El_Aaiun" value="STD-1" />
+        <zone name="Africa/Freetown" value="GMT0" />
+        <zone name="Africa/Gaborone" value="CAT-2" />
+        <zone name="Africa/Harare" value="CAT-2" />
+        <zone name="Africa/Johannesburg" value="SAST-2" />
+        <zone name="Africa/Juba" value="CAT-2" />
+        <zone name="Africa/Kampala" value="EAT-3" />
+        <zone name="Africa/Khartoum" value="CAT-2" />
+        <zone name="Africa/Kigali" value="CAT-2" />
+        <zone name="Africa/Kinshasa" value="WAT-1" />
+        <zone name="Africa/Lagos" value="WAT-1" />
+        <zone name="Africa/Libreville" value="WAT-1" />
+        <zone name="Africa/Lome" value="GMT0" />
+        <zone name="Africa/Luanda" value="WAT-1" />
+        <zone name="Africa/Lubumbashi" value="CAT-2" />
+        <zone name="Africa/Lusaka" value="CAT-2" />
+        <zone name="Africa/Malabo" value="WAT-1" />
+        <zone name="Africa/Maputo" value="CAT-2" />
+        <zone name="Africa/Maseru" value="SAST-2" />
+        <zone name="Africa/Mbabane" value="SAST-2" />
+        <zone name="Africa/Mogadishu" value="EAT-3" />
+        <zone name="Africa/Monrovia" value="GMT0" />
+        <zone name="Africa/Nairobi" value="EAT-3" />
+        <zone name="Africa/Ndjamena" value="WAT-1" />
+        <zone name="Africa/Niamey" value="WAT-1" />
+        <zone name="Africa/Nouakchott" value="GMT0" />
+        <zone name="Africa/Ouagadougou" value="GMT0" />
+        <zone name="Africa/Porto-Novo" value="WAT-1" />
+        <zone name="Africa/Sao_Tome" value="GMT0" />
+        <zone name="Africa/Timbuktu" value="GMT0" />
+        <zone name="Africa/Tripoli" value="EET-2" />
+        <zone name="Africa/Tunis" value="CET-1" />
+        <zone name="Africa/Windhoek" value="CAT-2" />
 
-	<zone name="America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
-	<zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Anguilla" value="AST4" />
-	<zone name="America/Antigua" value="AST4" />
-	<zone name="America/Araguaina" value="BRT3" />
-	<zone name="America/Argentina/Buenos_Aires" value="ART3" />
-	<zone name="America/Argentina/Catamarca" value="ART3" />
-	<zone name="America/Argentina/ComodRivadavia" value="ART3" />
-	<zone name="America/Argentina/Cordoba" value="ART3" />
-	<zone name="America/Argentina/Jujuy" value="ART3" />
-	<zone name="America/Argentina/La_Rioja" value="ART3" />
-	<zone name="America/Argentina/Mendoza" value="ART3" />
-	<zone name="America/Argentina/Rio_Gallegos" value="ART3" />
-	<zone name="America/Argentina/Salta" value="ART3" />
-	<zone name="America/Argentina/San_Juan" value="ART3" />
-	<zone name="America/Argentina/San_Luis" value="ART3" />
-	<zone name="America/Argentina/Tucuman" value="ART3" />
-	<zone name="America/Argentina/Ushuaia" value="ART3" />
-	<zone name="America/Aruba" value="AST4" />
-	<zone name="America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
-	<zone name="America/Atikokan" value="EST5" />
-	<zone name="America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
-	<zone name="America/Bahia" value="BRT3" />
-	<zone name="America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Barbados" value="AST4" />
-	<zone name="America/Belem" value="BRT3" />
-	<zone name="America/Belize" value="CST6" />
-	<zone name="America/Blanc-Sablon" value="AST4" />
-	<zone name="America/Boa_Vista" value="AMT4" />
-	<zone name="America/Bogota" value="COT5" />
-	<zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Buenos_Aires" value="ART3" />
-	<zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="America/Cancun" value="EST5" />
-	<zone name="America/Caracas" value="VET4:30" />
-	<zone name="America/Catamarca" value="ART3" />
-	<zone name="America/Cayenne" value="GFT3" />
-	<zone name="America/Cayman" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Coral_Harbour" value="EST5" />
-	<zone name="America/Cordoba" value="ART3" />
-	<zone name="America/Costa_Rica" value="CST6" />
-	<zone name="America/Creston" value="MST7" />
-	<zone name="America/Cuiaba" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="America/Curacao" value="AST4" />
-	<zone name="America/Danmarkshavn" value="GMT0" />
-	<zone name="America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dawson_Creek" value="MST7" />
-	<zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dominica" value="AST4" />
-	<zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Eirunepe" value="ACT5" />
-	<zone name="America/El_Salvador" value="CST6" />
-	<zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Fort_Nelson" value="MST7" />
-	<zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Fortaleza" value="BRT3" />
-	<zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Godthab" value="WGST" />
-	<zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Grand_Turk" value="AST4" />
-	<zone name="America/Grenada" value="AST4" />
-	<zone name="America/Guadeloupe" value="AST4" />
-	<zone name="America/Guatemala" value="CST6" />
-	<zone name="America/Guayaquil" value="ECT5" />
-	<zone name="America/Guyana" value="GYT4" />
-	<zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="America/Hermosillo" value="MST7" />
-	<zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Jamaica" value="EST5" />
-	<zone name="America/Jujuy" value="ART3" />
-	<zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kralendijk" value="AST4" />
-	<zone name="America/La_Paz" value="BOT4" />
-	<zone name="America/Lima" value="PET5" />
-	<zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Lower_Princes" value="AST4" />
-	<zone name="America/Maceio" value="BRT3" />
-	<zone name="America/Managua" value="CST6" />
-	<zone name="America/Manaus" value="AMT4" />
-	<zone name="America/Marigot" value="AST4" />
-	<zone name="America/Martinique" value="AST4" />
-	<zone name="America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mendoza" value="ART3" />
-	<zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Metlakatla" value="PST8" />
-	<zone name="America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Montevideo" value="UYT3" />
-	<zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Montserrat" value="AST4" />
-	<zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Noronha" value="FNT2" />
-	<zone name="America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Ojinaga" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Panama" value="EST5" />
-	<zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Paramaribo" value="SRT3" />
-	<zone name="America/Phoenix" value="MST7" />
-	<zone name="America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Port_of_Spain" value="AST4" />
-	<zone name="America/Porto_Acre" value="ACT5" />
-	<zone name="America/Porto_Velho" value="AMT4" />
-	<zone name="America/Puerto_Rico" value="AST4" />
-	<zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Recife" value="BRT3" />
-	<zone name="America/Regina" value="CST6" />
-	<zone name="America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rio_Branco" value="ACT5" />
-	<zone name="America/Rosario" value="ART3" />
-	<zone name="America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Santarem" value="BRT3" />
-	<zone name="America/Santiago" value="CLT3" />
-	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3" />
-	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Barthelemy" value="AST4" />
-	<zone name="America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Kitts" value="AST4" />
-	<zone name="America/St_Lucia" value="AST4" />
-	<zone name="America/St_Thomas" value="AST4" />
-	<zone name="America/St_Vincent" value="AST4" />
-	<zone name="America/Swift_Current" value="CST6" />
-	<zone name="America/Tegucigalpa" value="CST6" />
-	<zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tortola" value="AST4" />
-	<zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Virgin" value="AST4" />
-	<zone name="America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Anguilla" value="AST4" />
+        <zone name="America/Antigua" value="AST4" />
+        <zone name="America/Araguaina" value="STD3" />
+        <zone name="America/Argentina/Buenos_Aires" value="STD3" />
+        <zone name="America/Argentina/Catamarca" value="STD3" />
+        <zone name="America/Argentina/ComodRivadavia" value="STD3" />
+        <zone name="America/Argentina/Cordoba" value="STD3" />
+        <zone name="America/Argentina/Jujuy" value="STD3" />
+        <zone name="America/Argentina/La_Rioja" value="STD3" />
+        <zone name="America/Argentina/Mendoza" value="STD3" />
+        <zone name="America/Argentina/Rio_Gallegos" value="STD3" />
+        <zone name="America/Argentina/Salta" value="STD3" />
+        <zone name="America/Argentina/San_Juan" value="STD3" />
+        <zone name="America/Argentina/San_Luis" value="STD3" />
+        <zone name="America/Argentina/Tucuman" value="STD3" />
+        <zone name="America/Argentina/Ushuaia" value="STD3" />
+        <zone name="America/Aruba" value="AST4" />
+        <zone name="America/Asuncion" value="STD4DST,M10.1.0/0,M3.4.0/0" />
+        <zone name="America/Atikokan" value="EST5" />
+        <zone name="America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="America/Bahia" value="STD3" />
+        <zone name="America/Bahia_Banderas" value="CST6" />
+        <zone name="America/Barbados" value="AST4" />
+        <zone name="America/Belem" value="STD3" />
+        <zone name="America/Belize" value="CST6" />
+        <zone name="America/Blanc-Sablon" value="AST4" />
+        <zone name="America/Boa_Vista" value="STD4" />
+        <zone name="America/Bogota" value="STD5" />
+        <zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Buenos_Aires" value="STD3" />
+        <zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Campo_Grande" value="STD4" />
+        <zone name="America/Cancun" value="EST5" />
+        <zone name="America/Caracas" value="STD4" />
+        <zone name="America/Catamarca" value="STD3" />
+        <zone name="America/Cayenne" value="STD3" />
+        <zone name="America/Cayman" value="EST5" />
+        <zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Chihuahua" value="CST6" />
+        <zone name="America/Ciudad_Juarez" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Coral_Harbour" value="EST5" />
+        <zone name="America/Cordoba" value="STD3" />
+        <zone name="America/Costa_Rica" value="CST6" />
+        <zone name="America/Creston" value="MST7" />
+        <zone name="America/Cuiaba" value="STD4" />
+        <zone name="America/Curacao" value="AST4" />
+        <zone name="America/Danmarkshavn" value="GMT0" />
+        <zone name="America/Dawson" value="MST7" />
+        <zone name="America/Dawson_Creek" value="MST7" />
+        <zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Dominica" value="AST4" />
+        <zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Eirunepe" value="STD5" />
+        <zone name="America/El_Salvador" value="CST6" />
+        <zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fort_Nelson" value="MST7" />
+        <zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Fortaleza" value="STD3" />
+        <zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Godthab" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Grenada" value="AST4" />
+        <zone name="America/Guadeloupe" value="AST4" />
+        <zone name="America/Guatemala" value="CST6" />
+        <zone name="America/Guayaquil" value="STD5" />
+        <zone name="America/Guyana" value="STD4" />
+        <zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
+        <zone name="America/Hermosillo" value="MST7" />
+        <zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Jamaica" value="EST5" />
+        <zone name="America/Jujuy" value="STD3" />
+        <zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Kralendijk" value="AST4" />
+        <zone name="America/La_Paz" value="STD4" />
+        <zone name="America/Lima" value="STD5" />
+        <zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Lower_Princes" value="AST4" />
+        <zone name="America/Maceio" value="STD3" />
+        <zone name="America/Managua" value="CST6" />
+        <zone name="America/Manaus" value="STD4" />
+        <zone name="America/Marigot" value="AST4" />
+        <zone name="America/Martinique" value="AST4" />
+        <zone name="America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mazatlan" value="MST7" />
+        <zone name="America/Mendoza" value="STD3" />
+        <zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Merida" value="CST6" />
+        <zone name="America/Metlakatla" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Mexico_City" value="CST6" />
+        <zone name="America/Miquelon" value="STD3DST,M3.2.0,M11.1.0" />
+        <zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Monterrey" value="CST6" />
+        <zone name="America/Montevideo" value="STD3" />
+        <zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Montserrat" value="AST4" />
+        <zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Noronha" value="STD2" />
+        <zone name="America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Nuuk" value="STD2DST,M3.5.0/-1,M10.5.0/0" />
+        <zone name="America/Ojinaga" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Panama" value="EST5" />
+        <zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Paramaribo" value="STD3" />
+        <zone name="America/Phoenix" value="MST7" />
+        <zone name="America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Port_of_Spain" value="AST4" />
+        <zone name="America/Porto_Acre" value="STD5" />
+        <zone name="America/Porto_Velho" value="STD4" />
+        <zone name="America/Puerto_Rico" value="AST4" />
+        <zone name="America/Punta_Arenas" value="STD3" />
+        <zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Recife" value="STD3" />
+        <zone name="America/Regina" value="CST6" />
+        <zone name="America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Rio_Branco" value="STD5" />
+        <zone name="America/Rosario" value="STD3" />
+        <zone name="America/Santa_Isabel" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Santarem" value="STD3" />
+        <zone name="America/Santiago" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="America/Santo_Domingo" value="AST4" />
+        <zone name="America/Sao_Paulo" value="STD3" />
+        <zone name="America/Scoresbysund" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Barthelemy" value="AST4" />
+        <zone name="America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="America/St_Kitts" value="AST4" />
+        <zone name="America/St_Lucia" value="AST4" />
+        <zone name="America/St_Thomas" value="AST4" />
+        <zone name="America/St_Vincent" value="AST4" />
+        <zone name="America/Swift_Current" value="CST6" />
+        <zone name="America/Tegucigalpa" value="CST6" />
+        <zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="America/Tortola" value="AST4" />
+        <zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="America/Virgin" value="AST4" />
+        <zone name="America/Whitehorse" value="MST7" />
+        <zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
 
-	<zone name="Antarctica/Casey" value="AWST-8" />
-	<zone name="Antarctica/Davis" value="DAVT-7" />
-	<zone name="Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="Antarctica/Macquarie" value="MIST-11" />
-	<zone name="Antarctica/Mawson" value="MAWT-5" />
-	<zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Palmer" value="CLT3" />
-	<zone name="Antarctica/Rothera" value="ROTT3" />
-	<zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Syowa" value="SYOT-3" />
-	<zone name="Antarctica/Troll" value="UTC0CEST-2,M3.5.0/1,M10.5.0/3" />
-	<zone name="Antarctica/Vostok" value="VOST-6" />
+        <zone name="Antarctica/Casey" value="STD-11" />
+        <zone name="Antarctica/Davis" value="STD-7" />
+        <zone name="Antarctica/DumontDUrville" value="STD-10" />
+        <zone name="Antarctica/Macquarie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Antarctica/Mawson" value="STD-5" />
+        <zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Palmer" value="STD3" />
+        <zone name="Antarctica/Rothera" value="STD3" />
+        <zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Antarctica/Syowa" value="STD-3" />
+        <zone name="Antarctica/Troll" value="STD-0DST-2,M3.5.0/1,M10.5.0/3" />
+        <zone name="Antarctica/Vostok" value="STD-6" />
 
-	<zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Asia/Aden" value="AST-3" />
-	<zone name="Asia/Almaty" value="ALMT-6" />
-	<zone name="Asia/Amman" value="EEST" />
-	<zone name="Asia/Anadyr" value="ANAT-12" />
-	<zone name="Asia/Aqtau" value="AQTT-5" />
-	<zone name="Asia/Aqtobe" value="AQTT-5" />
-	<zone name="Asia/Ashgabat" value="TMT-5" />
-	<zone name="Asia/Ashkhabad" value="TMT-5" />
-	<zone name="Asia/Baghdad" value="AST-3" />
-	<zone name="Asia/Bahrain" value="AST-3" />
-	<zone name="Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="Asia/Bangkok" value="ICT-7" />
-	<zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="Asia/Bishkek" value="KGT-6" />
-	<zone name="Asia/Brunei" value="BNT-8" />
-	<zone name="Asia/Calcutta" value="IST-5:30" />
-	<zone name="Asia/Chita" value="IRKT-8" />
-	<zone name="Asia/Choibalsan" value="CHOT-8CHOST,M3.5.6,M9.5.6/0" />
-	<zone name="Asia/Chongqing" value="CST-8" />
-	<zone name="Asia/Chungking" value="CST-8" />
-	<zone name="Asia/Colombo" value="IST-5:30" />
-	<zone name="Asia/Dacca" value="BDT-6" />
-	<zone name="Asia/Damascus" value="EET-2EEST,M3.5.5/0,M10.5.5/0" />
-	<zone name="Asia/Dhaka" value="BDT-6" />
-	<zone name="Asia/Dili" value="TLT-9" />
-	<zone name="Asia/Dubai" value="GST-4" />
-	<zone name="Asia/Dushanbe" value="TJT-5" />
-	<zone name="Asia/Gaza" value="EEST" />
-	<zone name="Asia/Harbin" value="CST-8" />
-	<zone name="Asia/Hebron" value="EEST" />
-	<zone name="Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="Asia/Hong_Kong" value="HKT-8" />
-	<zone name="Asia/Hovd" value="HOVT-7HOVST,M3.5.6,M9.5.6/0" />
-	<zone name="Asia/Irkutsk" value="IRKT-8" />
-	<zone name="Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Jakarta" value="WIB-7" />
-	<zone name="Asia/Jayapura" value="WIT-9" />
-	<zone name="Asia/Jerusalem" value="IDDT" />
-	<zone name="Asia/Kabul" value="AFT-4:30" />
-	<zone name="Asia/Kamchatka" value="PETT-12" />
-	<zone name="Asia/Karachi" value="PKT-5" />
-	<zone name="Asia/Kashgar" value="XJT-6" />
-	<zone name="Asia/Kathmandu" value="NPT-5:45" />
-	<zone name="Asia/Katmandu" value="NPT-5:45" />
-	<zone name="Asia/Khandyga" value="YAKT-9" />
-	<zone name="Asia/Kolkata" value="IST-5:30" />
-	<zone name="Asia/Krasnoyarsk" value="KRAT-7" />
-	<zone name="Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="Asia/Kuching" value="MYT-8" />
-	<zone name="Asia/Kuwait" value="AST-3" />
-	<zone name="Asia/Macao" value="CST-8" />
-	<zone name="Asia/Macau" value="CST-8" />
-	<zone name="Asia/Magadan" value="MAGT-10" />
-	<zone name="Asia/Makassar" value="WITA-8" />
-	<zone name="Asia/Manila" value="PHT-8" />
-	<zone name="Asia/Muscat" value="GST-4" />
-	<zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Novokuznetsk" value="KRAT-7" />
-	<zone name="Asia/Novosibirsk" value="NOVT-6" />
-	<zone name="Asia/Omsk" value="OMST-6" />
-	<zone name="Asia/Oral" value="ORAT-5" />
-	<zone name="Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="Asia/Pontianak" value="WIB-7" />
-	<zone name="Asia/Pyongyang" value="KST-8:30" />
-	<zone name="Asia/Qatar" value="AST-3" />
-	<zone name="Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="Asia/Rangoon" value="MMT-6:30" />
-	<zone name="Asia/Riyadh" value="AST-3" />
-	<zone name="Asia/Saigon" value="ICT-7" />
-	<zone name="Asia/Sakhalin" value="SAKT-10" />
-	<zone name="Asia/Samarkand" value="UZT-5" />
-	<zone name="Asia/Seoul" value="KST-9" />
-	<zone name="Asia/Shanghai" value="CST-8" />
-	<zone name="Asia/Singapore" value="SGT-8" />
-	<zone name="Asia/Srednekolymsk" value="SRET-11" />
-	<zone name="Asia/Taipei" value="CST-8" />
-	<zone name="Asia/Tashkent" value="UZT-5" />
-	<zone name="Asia/Tbilisi" value="GET-4" />
-	<zone name="Asia/Tehran" value="IRDT" />
-	<zone name="Asia/Tel_Aviv" value="IDDT" />
-	<zone name="Asia/Thimbu" value="BTT-6" />
-	<zone name="Asia/Thimphu" value="BTT-6" />
-	<zone name="Asia/Tokyo" value="JST-9" />
-	<zone name="Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="Asia/Ulaanbaatar" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
-	<zone name="Asia/Ulan_Bator" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
-	<zone name="Asia/Urumqi" value="XJT-6" />
-	<zone name="Asia/Ust-Nera" value="VLAT-10" />
-	<zone name="Asia/Vientiane" value="ICT-7" />
-	<zone name="Asia/Vladivostok" value="VLAT-10" />
-	<zone name="Asia/Yakutsk" value="YAKT-9" />
-	<zone name="Asia/Yekaterinburg" value="YEKT-5" />
-	<zone name="Asia/Yerevan" value="AMT-4" />
+        <zone name="Asia/Aden" value="STD-3" />
+        <zone name="Asia/Almaty" value="STD-6" />
+        <zone name="Asia/Amman" value="STD-3" />
+        <zone name="Asia/Anadyr" value="STD-12" />
+        <zone name="Asia/Aqtau" value="STD-5" />
+        <zone name="Asia/Aqtobe" value="STD-5" />
+        <zone name="Asia/Ashgabat" value="STD-5" />
+        <zone name="Asia/Ashkhabad" value="STD-5" />
+        <zone name="Asia/Atyrau" value="STD-5" />
+        <zone name="Asia/Baghdad" value="STD-3" />
+        <zone name="Asia/Bahrain" value="STD-3" />
+        <zone name="Asia/Baku" value="STD-4" />
+        <zone name="Asia/Bangkok" value="STD-7" />
+        <zone name="Asia/Barnaul" value="STD-7" />
+        <zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
+        <zone name="Asia/Bishkek" value="STD-6" />
+        <zone name="Asia/Brunei" value="STD-8" />
+        <zone name="Asia/Calcutta" value="IST-5:30" />
+        <zone name="Asia/Chita" value="STD-9" />
+        <zone name="Asia/Choibalsan" value="STD-8" />
+        <zone name="Asia/Chongqing" value="CST-8" />
+        <zone name="Asia/Chungking" value="CST-8" />
+        <zone name="Asia/Colombo" value="STD-5:30" />
+        <zone name="Asia/Dacca" value="STD-6" />
+        <zone name="Asia/Damascus" value="STD-3" />
+        <zone name="Asia/Dhaka" value="STD-6" />
+        <zone name="Asia/Dili" value="STD-9" />
+        <zone name="Asia/Dubai" value="STD-4" />
+        <zone name="Asia/Dushanbe" value="STD-5" />
+        <zone name="Asia/Famagusta" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Gaza" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Harbin" value="CST-8" />
+        <zone name="Asia/Hebron" value="EET-2EEST,M3.4.4/50,M10.4.4/50" />
+        <zone name="Asia/Ho_Chi_Minh" value="STD-7" />
+        <zone name="Asia/Hong_Kong" value="HKT-8" />
+        <zone name="Asia/Hovd" value="STD-7" />
+        <zone name="Asia/Irkutsk" value="STD-8" />
+        <zone name="Asia/Istanbul" value="STD-3" />
+        <zone name="Asia/Jakarta" value="WIB-7" />
+        <zone name="Asia/Jayapura" value="WIT-9" />
+        <zone name="Asia/Jerusalem" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Kabul" value="STD-4:30" />
+        <zone name="Asia/Kamchatka" value="STD-12" />
+        <zone name="Asia/Karachi" value="PKT-5" />
+        <zone name="Asia/Kashgar" value="STD-6" />
+        <zone name="Asia/Kathmandu" value="STD-5:45" />
+        <zone name="Asia/Katmandu" value="STD-5:45" />
+        <zone name="Asia/Khandyga" value="STD-9" />
+        <zone name="Asia/Kolkata" value="IST-5:30" />
+        <zone name="Asia/Krasnoyarsk" value="STD-7" />
+        <zone name="Asia/Kuala_Lumpur" value="STD-8" />
+        <zone name="Asia/Kuching" value="STD-8" />
+        <zone name="Asia/Kuwait" value="STD-3" />
+        <zone name="Asia/Macao" value="CST-8" />
+        <zone name="Asia/Macau" value="CST-8" />
+        <zone name="Asia/Magadan" value="STD-11" />
+        <zone name="Asia/Makassar" value="WITA-8" />
+        <zone name="Asia/Manila" value="PST-8" />
+        <zone name="Asia/Muscat" value="STD-4" />
+        <zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Asia/Novokuznetsk" value="STD-7" />
+        <zone name="Asia/Novosibirsk" value="STD-7" />
+        <zone name="Asia/Omsk" value="STD-6" />
+        <zone name="Asia/Oral" value="STD-5" />
+        <zone name="Asia/Phnom_Penh" value="STD-7" />
+        <zone name="Asia/Pontianak" value="WIB-7" />
+        <zone name="Asia/Pyongyang" value="KST-9" />
+        <zone name="Asia/Qatar" value="STD-3" />
+        <zone name="Asia/Qostanay" value="STD-6" />
+        <zone name="Asia/Qyzylorda" value="STD-5" />
+        <zone name="Asia/Rangoon" value="STD-6:30" />
+        <zone name="Asia/Riyadh" value="STD-3" />
+        <zone name="Asia/Saigon" value="STD-7" />
+        <zone name="Asia/Sakhalin" value="STD-11" />
+        <zone name="Asia/Samarkand" value="STD-5" />
+        <zone name="Asia/Seoul" value="KST-9" />
+        <zone name="Asia/Shanghai" value="CST-8" />
+        <zone name="Asia/Singapore" value="STD-8" />
+        <zone name="Asia/Srednekolymsk" value="STD-11" />
+        <zone name="Asia/Taipei" value="CST-8" />
+        <zone name="Asia/Tashkent" value="STD-5" />
+        <zone name="Asia/Tbilisi" value="STD-4" />
+        <zone name="Asia/Tehran" value="STD-3:30" />
+        <zone name="Asia/Tel_Aviv" value="IST-2IDT,M3.4.4/26,M10.5.0" />
+        <zone name="Asia/Thimbu" value="STD-6" />
+        <zone name="Asia/Thimphu" value="STD-6" />
+        <zone name="Asia/Tokyo" value="JST-9" />
+        <zone name="Asia/Tomsk" value="STD-7" />
+        <zone name="Asia/Ujung_Pandang" value="WITA-8" />
+        <zone name="Asia/Ulaanbaatar" value="STD-8" />
+        <zone name="Asia/Ulan_Bator" value="STD-8" />
+        <zone name="Asia/Urumqi" value="STD-6" />
+        <zone name="Asia/Ust-Nera" value="STD-10" />
+        <zone name="Asia/Vientiane" value="STD-7" />
+        <zone name="Asia/Vladivostok" value="STD-10" />
+        <zone name="Asia/Yakutsk" value="STD-9" />
+        <zone name="Asia/Yangon" value="STD-6:30" />
+        <zone name="Asia/Yekaterinburg" value="STD-5" />
+        <zone name="Asia/Yerevan" value="STD-4" />
 
-	<zone name="Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Reykjavik" value="GMT0" />
-	<zone name="Atlantic/South_Georgia" value="GST2" />
-	<zone name="Atlantic/St_Helena" value="GMT0" />
-	<zone name="Atlantic/Stanley" value="FKST3" />
+        <zone name="Atlantic/Azores" value="STD1DST,M3.5.0/0,M10.5.0/1" />
+        <zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Cape_Verde" value="STD1" />
+        <zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Atlantic/Reykjavik" value="GMT0" />
+        <zone name="Atlantic/South_Georgia" value="STD2" />
+        <zone name="Atlantic/St_Helena" value="GMT0" />
+        <zone name="Atlantic/Stanley" value="STD3" />
 
-	<zone name="Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Brisbane" value="AEST-10" />
-	<zone name="Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Darwin" value="ACST-9:30" />
-	<zone name="Australia/Eucla" value="ACWST-8:45" />
-	<zone name="Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/LHI" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Lindeman" value="AEST-10" />
-	<zone name="Australia/Lord_Howe" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/North" value="ACST-9:30" />
-	<zone name="Australia/Perth" value="AWST-8" />
-	<zone name="Australia/Queensland" value="AEST-10" />
-	<zone name="Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/West" value="AWST-8" />
-	<zone name="Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Brisbane" value="AEST-10" />
+        <zone name="Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Darwin" value="ACST-9:30" />
+        <zone name="Australia/Eucla" value="STD-8:45" />
+        <zone name="Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/LHI" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Lindeman" value="AEST-10" />
+        <zone name="Australia/Lord_Howe" value="STD-10:30DST-11,M10.1.0,M4.1.0" />
+        <zone name="Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/North" value="ACST-9:30" />
+        <zone name="Australia/Perth" value="AWST-8" />
+        <zone name="Australia/Queensland" value="AEST-10" />
+        <zone name="Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+        <zone name="Australia/West" value="AWST-8" />
+        <zone name="Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
 
-	<zone name="Brazil/Acre" value="ACT5" />
-	<zone name="Brazil/DeNoronha" value="FNT2" />
-	<zone name="Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="Brazil/West" value="AMT4" />
+        <zone name="Brazil/Acre" value="STD5" />
+        <zone name="Brazil/DeNoronha" value="STD2" />
+        <zone name="Brazil/East" value="STD3" />
+        <zone name="Brazil/West" value="STD4" />
 
-	<zone name="CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
 
-	<zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/East-Saskatchewan" value="CST6" />
-	<zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Saskatchewan" value="CST6" />
-	<zone name="Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Canada/Saskatchewan" value="CST6" />
+        <zone name="Canada/Yukon" value="MST7" />
 
-	<zone name="Chile/Continental" value="CLT3" />
-	<zone name="Chile/EasterIsland" value="EAST5" />
+        <zone name="Chile/Continental" value="STD4DST,M9.1.6/24,M4.1.6/24" />
+        <zone name="Chile/EasterIsland" value="STD6DST,M9.1.6/22,M4.1.6/22" />
 
-	<zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
+        <zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
 
-	<zone name="EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 
-	<zone name="EST" value="EST5" />
+        <zone name="EST" value="EST5" />
 
-	<zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
 
-	<zone name="Egypt" value="EET-2" />
+        <zone name="Egypt" value="EET-2EEST,M4.5.5/0,M10.5.4/24" />
 
-	<zone name="Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
+        <zone name="Eire" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
 
-	<zone name="Etc/GMT" value="GMT0" />
-	<zone name="Etc/GMT+0" value="GMT0" />
-	<zone name="Etc/GMT+1" value="&lt;GMT+1&gt;1" />
-	<zone name="Etc/GMT+10" value="&lt;GMT+10&gt;10" />
-	<zone name="Etc/GMT+11" value="&lt;GMT+11&gt;11" />
-	<zone name="Etc/GMT+12" value="&lt;GMT+12&gt;12" />
-	<zone name="Etc/GMT+2" value="&lt;GMT+2&gt;2" />
-	<zone name="Etc/GMT+3" value="&lt;GMT+3&gt;3" />
-	<zone name="Etc/GMT+4" value="&lt;GMT+4&gt;4" />
-	<zone name="Etc/GMT+5" value="&lt;GMT+5&gt;5" />
-	<zone name="Etc/GMT+6" value="&lt;GMT+6&gt;6" />
-	<zone name="Etc/GMT+7" value="&lt;GMT+7&gt;7" />
-	<zone name="Etc/GMT+8" value="&lt;GMT+8&gt;8" />
-	<zone name="Etc/GMT+9" value="&lt;GMT+9&gt;9" />
-	<zone name="Etc/GMT-0" value="GMT0" />
-	<zone name="Etc/GMT-1" value="&lt;GMT-1&gt;-1" />
-	<zone name="Etc/GMT-10" value="&lt;GMT-10&gt;-10" />
-	<zone name="Etc/GMT-11" value="&lt;GMT-11&gt;-11" />
-	<zone name="Etc/GMT-12" value="&lt;GMT-12&gt;-12" />
-	<zone name="Etc/GMT-13" value="&lt;GMT-13&gt;-13" />
-	<zone name="Etc/GMT-14" value="&lt;GMT-14&gt;-14" />
-	<zone name="Etc/GMT-2" value="&lt;GMT-2&gt;-2" />
-	<zone name="Etc/GMT-3" value="&lt;GMT-3&gt;-3" />
-	<zone name="Etc/GMT-4" value="&lt;GMT-4&gt;-4" />
-	<zone name="Etc/GMT-5" value="&lt;GMT-5&gt;-5" />
-	<zone name="Etc/GMT-6" value="&lt;GMT-6&gt;-6" />
-	<zone name="Etc/GMT-7" value="&lt;GMT-7&gt;-7" />
-	<zone name="Etc/GMT-8" value="&lt;GMT-8&gt;-8" />
-	<zone name="Etc/GMT-9" value="&lt;GMT-9&gt;-9" />
-	<zone name="Etc/GMT0" value="GMT0" />
-	<zone name="Etc/Greenwich" value="GMT0" />
-	<zone name="Etc/UCT" value="UCT0" />
-	<zone name="Etc/UTC" value="UTC0" />
-	<zone name="Etc/Universal" value="UTC0" />
-	<zone name="Etc/Zulu" value="UTC0" />
+        <zone name="Etc/GMT" value="GMT0" />
+        <zone name="Etc/GMT+0" value="GMT0" />
+        <zone name="Etc/GMT+1" value="GMT1" />
+        <zone name="Etc/GMT+10" value="GMT10" />
+        <zone name="Etc/GMT+11" value="GMT11" />
+        <zone name="Etc/GMT+12" value="GMT12" />
+        <zone name="Etc/GMT+2" value="GMT2" />
+        <zone name="Etc/GMT+3" value="GMT3" />
+        <zone name="Etc/GMT+4" value="GMT4" />
+        <zone name="Etc/GMT+5" value="GMT5" />
+        <zone name="Etc/GMT+6" value="GMT6" />
+        <zone name="Etc/GMT+7" value="GMT7" />
+        <zone name="Etc/GMT+8" value="GMT8" />
+        <zone name="Etc/GMT+9" value="GMT9" />
+        <zone name="Etc/GMT-0" value="GMT0" />
+        <zone name="Etc/GMT-1" value="GMT-1" />
+        <zone name="Etc/GMT-10" value="GMT-10" />
+        <zone name="Etc/GMT-11" value="GMT-11" />
+        <zone name="Etc/GMT-12" value="GMT-12" />
+        <zone name="Etc/GMT-13" value="GMT-13" />
+        <zone name="Etc/GMT-14" value="GMT-14" />
+        <zone name="Etc/GMT-2" value="GMT-2" />
+        <zone name="Etc/GMT-3" value="GMT-3" />
+        <zone name="Etc/GMT-4" value="GMT-4" />
+        <zone name="Etc/GMT-5" value="GMT-5" />
+        <zone name="Etc/GMT-6" value="GMT-6" />
+        <zone name="Etc/GMT-7" value="GMT-7" />
+        <zone name="Etc/GMT-8" value="GMT-8" />
+        <zone name="Etc/GMT-9" value="GMT-9" />
+        <zone name="Etc/GMT0" value="GMT0" />
+        <zone name="Etc/Greenwich" value="GMT0" />
+        <zone name="Etc/UCT" value="UTC0" />
+        <zone name="Etc/UTC" value="UTC0" />
+        <zone name="Etc/Universal" value="UTC0" />
+        <zone name="Etc/Zulu" value="UTC0" />
 
-	<zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Kaliningrad" value="EET-2" />
-	<zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Minsk" value="MSK-3" />
-	<zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Moscow" value="MSK-3" />
-	<zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Samara" value="SAMT-4" />
-	<zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Simferopol" value="MSK-3" />
-	<zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Volgograd" value="MSK-3" />
-	<zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Astrakhan" value="STD-4" />
+        <zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Dublin" value="IST-1GMT0,M10.5.0,M3.5.0/1" />
+        <zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Istanbul" value="STD-3" />
+        <zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Kaliningrad" value="EET-2" />
+        <zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Kirov" value="MSK-3" />
+        <zone name="Europe/Kyiv" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Minsk" value="STD-3" />
+        <zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Moscow" value="MSK-3" />
+        <zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Samara" value="STD-4" />
+        <zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Saratov" value="STD-4" />
+        <zone name="Europe/Simferopol" value="MSK-3" />
+        <zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Ulyanovsk" value="STD-4" />
+        <zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Volgograd" value="MSK-3" />
+        <zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="Factory" value="STD0" />
 
-	<zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
+        <zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
 
-	<zone name="GMT" value="GMT0" />
+        <zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
 
-	<zone name="GMT+0" value="GMT0" />
+        <zone name="GMT" value="GMT0" />
 
-	<zone name="GMT-0" value="GMT0" />
+        <zone name="GMT+0" value="GMT0" />
 
-	<zone name="GMT0" value="GMT0" />
+        <zone name="GMT-0" value="GMT0" />
 
-	<zone name="Greenwich" value="GMT0" />
+        <zone name="GMT0" value="GMT0" />
 
-	<zone name="HST" value="HST10" />
+        <zone name="Greenwich" value="GMT0" />
 
-	<zone name="Hongkong" value="HKT-8" />
+        <zone name="HST" value="HST10" />
 
-	<zone name="Iceland" value="GMT0" />
+        <zone name="Hongkong" value="HKT-8" />
 
-	<zone name="Indian/Antananarivo" value="EAT-3" />
-	<zone name="Indian/Chagos" value="IOT-6" />
-	<zone name="Indian/Christmas" value="CXT-7" />
-	<zone name="Indian/Cocos" value="CCT-6:30" />
-	<zone name="Indian/Comoro" value="EAT-3" />
-	<zone name="Indian/Kerguelen" value="TFT-5" />
-	<zone name="Indian/Mahe" value="SCT-4" />
-	<zone name="Indian/Maldives" value="MVT-5" />
-	<zone name="Indian/Mauritius" value="MUT-4" />
-	<zone name="Indian/Mayotte" value="EAT-3" />
-	<zone name="Indian/Reunion" value="RET-4" />
+        <zone name="Iceland" value="GMT0" />
 
-	<zone name="Iran" value="IRDT" />
+        <zone name="Indian/Antananarivo" value="EAT-3" />
+        <zone name="Indian/Chagos" value="STD-6" />
+        <zone name="Indian/Christmas" value="STD-7" />
+        <zone name="Indian/Cocos" value="STD-6:30" />
+        <zone name="Indian/Comoro" value="EAT-3" />
+        <zone name="Indian/Kerguelen" value="STD-5" />
+        <zone name="Indian/Mahe" value="STD-4" />
+        <zone name="Indian/Maldives" value="STD-5" />
+        <zone name="Indian/Mauritius" value="STD-4" />
+        <zone name="Indian/Mayotte" value="EAT-3" />
+        <zone name="Indian/Reunion" value="STD-4" />
 
-	<zone name="Israel" value="IDDT" />
+        <zone name="Iran" value="STD-3:30" />
 
-	<zone name="Jamaica" value="EST5" />
+        <zone name="Israel" value="IST-2IDT,M3.4.4/26,M10.5.0" />
 
-	<zone name="Japan" value="JST-9" />
+        <zone name="Jamaica" value="EST5" />
 
-	<zone name="Kwajalein" value="MHT-12" />
+        <zone name="Japan" value="JST-9" />
 
-	<zone name="Libya" value="EET-2" />
+        <zone name="Kwajalein" value="STD-12" />
 
-	<zone name="MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
+        <zone name="Libya" value="EET-2" />
 
-	<zone name="MST" value="MST7" />
+        <zone name="MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="MST" value="MST7" />
 
-	<zone name="Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
+        <zone name="MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
 
-	<zone name="NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="Mexico/BajaSur" value="MST7" />
+        <zone name="Mexico/General" value="CST6" />
 
-	<zone name="NZ-CHAT" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
+        <zone name="NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
 
-	<zone name="Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="NZ-CHAT" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
 
-	<zone name="PRC" value="CST-8" />
+        <zone name="Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
 
-	<zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="PRC" value="CST-8" />
 
-	<zone name="Pacific/Apia" value="WSST-13WSDT,M9.5.0/3,M4.1.0/4" />
-	<zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Pacific/Bougainville" value="BST-11" />
-	<zone name="Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="Pacific/Chuuk" value="CHUT-10" />
-	<zone name="Pacific/Easter" value="EAST5" />
-	<zone name="Pacific/Efate" value="VUT-11" />
-	<zone name="Pacific/Enderbury" value="PHOT-13" />
-	<zone name="Pacific/Fakaofo" value="TKT-13" />
-	<zone name="Pacific/Fiji" value="FJT-12FJST,M11.1.0,M1.3.0/3" />
-	<zone name="Pacific/Funafuti" value="TVT-12" />
-	<zone name="Pacific/Galapagos" value="GALT6" />
-	<zone name="Pacific/Gambier" value="GAMT9" />
-	<zone name="Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="Pacific/Guam" value="ChST-10" />
-	<zone name="Pacific/Honolulu" value="HST10" />
-	<zone name="Pacific/Johnston" value="HST10" />
-	<zone name="Pacific/Kiritimati" value="LINT-14" />
-	<zone name="Pacific/Kosrae" value="KOST-11" />
-	<zone name="Pacific/Kwajalein" value="MHT-12" />
-	<zone name="Pacific/Majuro" value="MHT-12" />
-	<zone name="Pacific/Marquesas" value="MART9:30" />
-	<zone name="Pacific/Midway" value="SST11" />
-	<zone name="Pacific/Nauru" value="NRT-12" />
-	<zone name="Pacific/Niue" value="NUT11" />
-	<zone name="Pacific/Norfolk" value="NFT-11" />
-	<zone name="Pacific/Noumea" value="NCT-11" />
-	<zone name="Pacific/Pago_Pago" value="SST11" />
-	<zone name="Pacific/Palau" value="PWT-9" />
-	<zone name="Pacific/Pitcairn" value="PST8" />
-	<zone name="Pacific/Pohnpei" value="PONT-11" />
-	<zone name="Pacific/Ponape" value="PONT-11" />
-	<zone name="Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="Pacific/Rarotonga" value="CKT10" />
-	<zone name="Pacific/Saipan" value="ChST-10" />
-	<zone name="Pacific/Samoa" value="SST11" />
-	<zone name="Pacific/Tahiti" value="TAHT10" />
-	<zone name="Pacific/Tarawa" value="GILT-12" />
-	<zone name="Pacific/Tongatapu" value="TOT-13" />
-	<zone name="Pacific/Truk" value="CHUT-10" />
-	<zone name="Pacific/Wake" value="WAKT-12" />
-	<zone name="Pacific/Wallis" value="WFT-12" />
-	<zone name="Pacific/Yap" value="CHUT-10" />
+        <zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
 
-	<zone name="Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
+        <zone name="Pacific/Apia" value="STD-13" />
+        <zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+        <zone name="Pacific/Bougainville" value="STD-11" />
+        <zone name="Pacific/Chatham" value="STD-12:45DST,M9.5.0/2:45,M4.1.0/3:45" />
+        <zone name="Pacific/Chuuk" value="STD-10" />
+        <zone name="Pacific/Easter" value="STD6DST,M9.1.6/22,M4.1.6/22" />
+        <zone name="Pacific/Efate" value="STD-11" />
+        <zone name="Pacific/Enderbury" value="STD-13" />
+        <zone name="Pacific/Fakaofo" value="STD-13" />
+        <zone name="Pacific/Fiji" value="STD-12" />
+        <zone name="Pacific/Funafuti" value="STD-12" />
+        <zone name="Pacific/Galapagos" value="STD6" />
+        <zone name="Pacific/Gambier" value="STD9" />
+        <zone name="Pacific/Guadalcanal" value="STD-11" />
+        <zone name="Pacific/Guam" value="ChST-10" />
+        <zone name="Pacific/Honolulu" value="HST10" />
+        <zone name="Pacific/Johnston" value="HST10" />
+        <zone name="Pacific/Kanton" value="STD-13" />
+        <zone name="Pacific/Kiritimati" value="STD-14" />
+        <zone name="Pacific/Kosrae" value="STD-11" />
+        <zone name="Pacific/Kwajalein" value="STD-12" />
+        <zone name="Pacific/Majuro" value="STD-12" />
+        <zone name="Pacific/Marquesas" value="STD9:30" />
+        <zone name="Pacific/Midway" value="SST11" />
+        <zone name="Pacific/Nauru" value="STD-12" />
+        <zone name="Pacific/Niue" value="STD11" />
+        <zone name="Pacific/Norfolk" value="STD-11DST,M10.1.0,M4.1.0/3" />
+        <zone name="Pacific/Noumea" value="STD-11" />
+        <zone name="Pacific/Pago_Pago" value="SST11" />
+        <zone name="Pacific/Palau" value="STD-9" />
+        <zone name="Pacific/Pitcairn" value="STD8" />
+        <zone name="Pacific/Pohnpei" value="STD-11" />
+        <zone name="Pacific/Ponape" value="STD-11" />
+        <zone name="Pacific/Port_Moresby" value="STD-10" />
+        <zone name="Pacific/Rarotonga" value="STD10" />
+        <zone name="Pacific/Saipan" value="ChST-10" />
+        <zone name="Pacific/Samoa" value="SST11" />
+        <zone name="Pacific/Tahiti" value="STD10" />
+        <zone name="Pacific/Tarawa" value="STD-12" />
+        <zone name="Pacific/Tongatapu" value="STD-13" />
+        <zone name="Pacific/Truk" value="STD-10" />
+        <zone name="Pacific/Wake" value="STD-12" />
+        <zone name="Pacific/Wallis" value="STD-12" />
+        <zone name="Pacific/Yap" value="STD-10" />
 
-	<zone name="Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="ROC" value="CST-8" />
+        <zone name="Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
 
-	<zone name="ROK" value="KST-9" />
+        <zone name="ROC" value="CST-8" />
 
-	<zone name="Singapore" value="SGT-8" />
+        <zone name="ROK" value="KST-9" />
 
-	<zone name="Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+        <zone name="Singapore" value="STD-8" />
 
-	<zone name="UCT" value="UCT0" />
+        <zone name="Turkey" value="STD-3" />
 
-	<zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
-	<zone name="US/Arizona" value="MST7" />
-	<zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Hawaii" value="HST10" />
-	<zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific-New" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Samoa" value="SST11" />
+        <zone name="UCT" value="UTC0" />
 
-	<zone name="UTC" value="UTC0" />
+        <zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
+        <zone name="US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
+        <zone name="US/Arizona" value="MST7" />
+        <zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Hawaii" value="HST10" />
+        <zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
+        <zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
+        <zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
+        <zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
+        <zone name="US/Samoa" value="SST11" />
 
-	<zone name="Universal" value="UTC0" />
+        <zone name="UTC" value="UTC0" />
 
-	<zone name="W-SU" value="MSK-3" />
+        <zone name="Universal" value="UTC0" />
 
-	<zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
+        <zone name="W-SU" value="MSK-3" />
 
-	<zone name="Zulu" value="UTC0" />
+        <zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
 
-	<zone name="posix/Africa/Abidjan" value="GMT0" />
-	<zone name="posix/Africa/Accra" value="GMT0" />
-	<zone name="posix/Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="posix/Africa/Algiers" value="CET-1" />
-	<zone name="posix/Africa/Asmara" value="EAT-3" />
-	<zone name="posix/Africa/Asmera" value="EAT-3" />
-	<zone name="posix/Africa/Bamako" value="GMT0" />
-	<zone name="posix/Africa/Bangui" value="WAT-1" />
-	<zone name="posix/Africa/Banjul" value="GMT0" />
-	<zone name="posix/Africa/Bissau" value="GMT0" />
-	<zone name="posix/Africa/Blantyre" value="CAT-2" />
-	<zone name="posix/Africa/Brazzaville" value="WAT-1" />
-	<zone name="posix/Africa/Bujumbura" value="CAT-2" />
-	<zone name="posix/Africa/Cairo" value="EET-2" />
-	<zone name="posix/Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Africa/Conakry" value="GMT0" />
-	<zone name="posix/Africa/Dakar" value="GMT0" />
-	<zone name="posix/Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="posix/Africa/Djibouti" value="EAT-3" />
-	<zone name="posix/Africa/Douala" value="WAT-1" />
-	<zone name="posix/Africa/El_Aaiun" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Africa/Freetown" value="GMT0" />
-	<zone name="posix/Africa/Gaborone" value="CAT-2" />
-	<zone name="posix/Africa/Harare" value="CAT-2" />
-	<zone name="posix/Africa/Johannesburg" value="SAST-2" />
-	<zone name="posix/Africa/Juba" value="EAT-3" />
-	<zone name="posix/Africa/Kampala" value="EAT-3" />
-	<zone name="posix/Africa/Khartoum" value="EAT-3" />
-	<zone name="posix/Africa/Kigali" value="CAT-2" />
-	<zone name="posix/Africa/Kinshasa" value="WAT-1" />
-	<zone name="posix/Africa/Lagos" value="WAT-1" />
-	<zone name="posix/Africa/Libreville" value="WAT-1" />
-	<zone name="posix/Africa/Lome" value="GMT0" />
-	<zone name="posix/Africa/Luanda" value="WAT-1" />
-	<zone name="posix/Africa/Lubumbashi" value="CAT-2" />
-	<zone name="posix/Africa/Lusaka" value="CAT-2" />
-	<zone name="posix/Africa/Malabo" value="WAT-1" />
-	<zone name="posix/Africa/Maputo" value="CAT-2" />
-	<zone name="posix/Africa/Maseru" value="SAST-2" />
-	<zone name="posix/Africa/Mbabane" value="SAST-2" />
-	<zone name="posix/Africa/Mogadishu" value="EAT-3" />
-	<zone name="posix/Africa/Monrovia" value="GMT0" />
-	<zone name="posix/Africa/Nairobi" value="EAT-3" />
-	<zone name="posix/Africa/Ndjamena" value="WAT-1" />
-	<zone name="posix/Africa/Niamey" value="WAT-1" />
-	<zone name="posix/Africa/Nouakchott" value="GMT0" />
-	<zone name="posix/Africa/Ouagadougou" value="GMT0" />
-	<zone name="posix/Africa/Porto-Novo" value="WAT-1" />
-	<zone name="posix/Africa/Sao_Tome" value="GMT0" />
-	<zone name="posix/Africa/Timbuktu" value="GMT0" />
-	<zone name="posix/Africa/Tripoli" value="EET-2" />
-	<zone name="posix/Africa/Tunis" value="CET-1" />
-	<zone name="posix/Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-	<zone name="posix/America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Anguilla" value="AST4" />
-	<zone name="posix/America/Antigua" value="AST4" />
-	<zone name="posix/America/Araguaina" value="BRT3" />
-	<zone name="posix/America/Argentina/Buenos_Aires" value="ART3" />
-	<zone name="posix/America/Argentina/Catamarca" value="ART3" />
-	<zone name="posix/America/Argentina/ComodRivadavia" value="ART3" />
-	<zone name="posix/America/Argentina/Cordoba" value="ART3" />
-	<zone name="posix/America/Argentina/Jujuy" value="ART3" />
-	<zone name="posix/America/Argentina/La_Rioja" value="ART3" />
-	<zone name="posix/America/Argentina/Mendoza" value="ART3" />
-	<zone name="posix/America/Argentina/Rio_Gallegos" value="ART3" />
-	<zone name="posix/America/Argentina/Salta" value="ART3" />
-	<zone name="posix/America/Argentina/San_Juan" value="ART3" />
-	<zone name="posix/America/Argentina/San_Luis" value="ART3" />
-	<zone name="posix/America/Argentina/Tucuman" value="ART3" />
-	<zone name="posix/America/Argentina/Ushuaia" value="ART3" />
-	<zone name="posix/America/Aruba" value="AST4" />
-	<zone name="posix/America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
-	<zone name="posix/America/Atikokan" value="EST5" />
-	<zone name="posix/America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Bahia" value="BRT3" />
-	<zone name="posix/America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Barbados" value="AST4" />
-	<zone name="posix/America/Belem" value="BRT3" />
-	<zone name="posix/America/Belize" value="CST6" />
-	<zone name="posix/America/Blanc-Sablon" value="AST4" />
-	<zone name="posix/America/Boa_Vista" value="AMT4" />
-	<zone name="posix/America/Bogota" value="COT5" />
-	<zone name="posix/America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Buenos_Aires" value="ART3" />
-	<zone name="posix/America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Cancun" value="EST5" />
-	<zone name="posix/America/Caracas" value="VET4:30" />
-	<zone name="posix/America/Catamarca" value="ART3" />
-	<zone name="posix/America/Cayenne" value="GFT3" />
-	<zone name="posix/America/Cayman" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Coral_Harbour" value="EST5" />
-	<zone name="posix/America/Cordoba" value="ART3" />
-	<zone name="posix/America/Costa_Rica" value="CST6" />
-	<zone name="posix/America/Creston" value="MST7" />
-	<zone name="posix/America/Cuiaba" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Curacao" value="AST4" />
-	<zone name="posix/America/Danmarkshavn" value="GMT0" />
-	<zone name="posix/America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Dawson_Creek" value="MST7" />
-	<zone name="posix/America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Dominica" value="AST4" />
-	<zone name="posix/America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Eirunepe" value="ACT5" />
-	<zone name="posix/America/El_Salvador" value="CST6" />
-	<zone name="posix/America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Fort_Nelson" value="MST7" />
-	<zone name="posix/America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Fortaleza" value="BRT3" />
-	<zone name="posix/America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Godthab" value="WGST" />
-	<zone name="posix/America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Grand_Turk" value="AST4" />
-	<zone name="posix/America/Grenada" value="AST4" />
-	<zone name="posix/America/Guadeloupe" value="AST4" />
-	<zone name="posix/America/Guatemala" value="CST6" />
-	<zone name="posix/America/Guayaquil" value="ECT5" />
-	<zone name="posix/America/Guyana" value="GYT4" />
-	<zone name="posix/America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="posix/America/Hermosillo" value="MST7" />
-	<zone name="posix/America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Jamaica" value="EST5" />
-	<zone name="posix/America/Jujuy" value="ART3" />
-	<zone name="posix/America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Kralendijk" value="AST4" />
-	<zone name="posix/America/La_Paz" value="BOT4" />
-	<zone name="posix/America/Lima" value="PET5" />
-	<zone name="posix/America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Lower_Princes" value="AST4" />
-	<zone name="posix/America/Maceio" value="BRT3" />
-	<zone name="posix/America/Managua" value="CST6" />
-	<zone name="posix/America/Manaus" value="AMT4" />
-	<zone name="posix/America/Marigot" value="AST4" />
-	<zone name="posix/America/Martinique" value="AST4" />
-	<zone name="posix/America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Mendoza" value="ART3" />
-	<zone name="posix/America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Metlakatla" value="PST8" />
-	<zone name="posix/America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Montevideo" value="UYT3" />
-	<zone name="posix/America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Montserrat" value="AST4" />
-	<zone name="posix/America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Noronha" value="FNT2" />
-	<zone name="posix/America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Ojinaga" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Panama" value="EST5" />
-	<zone name="posix/America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Paramaribo" value="SRT3" />
-	<zone name="posix/America/Phoenix" value="MST7" />
-	<zone name="posix/America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Port_of_Spain" value="AST4" />
-	<zone name="posix/America/Porto_Acre" value="ACT5" />
-	<zone name="posix/America/Porto_Velho" value="AMT4" />
-	<zone name="posix/America/Puerto_Rico" value="AST4" />
-	<zone name="posix/America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Recife" value="BRT3" />
-	<zone name="posix/America/Regina" value="CST6" />
-	<zone name="posix/America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Rio_Branco" value="ACT5" />
-	<zone name="posix/America/Rosario" value="ART3" />
-	<zone name="posix/America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Santarem" value="BRT3" />
-	<zone name="posix/America/Santiago" value="CLT3" />
-	<zone name="posix/America/Santo_Domingo" value="AST4" />
-	<zone name="posix/America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="posix/America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/St_Barthelemy" value="AST4" />
-	<zone name="posix/America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/St_Kitts" value="AST4" />
-	<zone name="posix/America/St_Lucia" value="AST4" />
-	<zone name="posix/America/St_Thomas" value="AST4" />
-	<zone name="posix/America/St_Vincent" value="AST4" />
-	<zone name="posix/America/Swift_Current" value="CST6" />
-	<zone name="posix/America/Tegucigalpa" value="CST6" />
-	<zone name="posix/America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Tortola" value="AST4" />
-	<zone name="posix/America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Virgin" value="AST4" />
-	<zone name="posix/America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Antarctica/Casey" value="AWST-8" />
-	<zone name="posix/Antarctica/Davis" value="DAVT-7" />
-	<zone name="posix/Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="posix/Antarctica/Macquarie" value="MIST-11" />
-	<zone name="posix/Antarctica/Mawson" value="MAWT-5" />
-	<zone name="posix/Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Antarctica/Palmer" value="CLT3" />
-	<zone name="posix/Antarctica/Rothera" value="ROTT3" />
-	<zone name="posix/Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Antarctica/Syowa" value="SYOT-3" />
-	<zone name="posix/Antarctica/Troll" value="UTC0CEST-2,M3.5.0/1,M10.5.0/3" />
-	<zone name="posix/Antarctica/Vostok" value="VOST-6" />
-	<zone name="posix/Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Asia/Aden" value="AST-3" />
-	<zone name="posix/Asia/Almaty" value="ALMT-6" />
-	<zone name="posix/Asia/Amman" value="EEST" />
-	<zone name="posix/Asia/Anadyr" value="ANAT-12" />
-	<zone name="posix/Asia/Aqtau" value="AQTT-5" />
-	<zone name="posix/Asia/Aqtobe" value="AQTT-5" />
-	<zone name="posix/Asia/Ashgabat" value="TMT-5" />
-	<zone name="posix/Asia/Ashkhabad" value="TMT-5" />
-	<zone name="posix/Asia/Baghdad" value="AST-3" />
-	<zone name="posix/Asia/Bahrain" value="AST-3" />
-	<zone name="posix/Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="posix/Asia/Bangkok" value="ICT-7" />
-	<zone name="posix/Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="posix/Asia/Bishkek" value="KGT-6" />
-	<zone name="posix/Asia/Brunei" value="BNT-8" />
-	<zone name="posix/Asia/Calcutta" value="IST-5:30" />
-	<zone name="posix/Asia/Chita" value="IRKT-8" />
-	<zone name="posix/Asia/Choibalsan" value="CHOT-8CHOST,M3.5.6,M9.5.6/0" />
-	<zone name="posix/Asia/Chongqing" value="CST-8" />
-	<zone name="posix/Asia/Chungking" value="CST-8" />
-	<zone name="posix/Asia/Colombo" value="IST-5:30" />
-	<zone name="posix/Asia/Dacca" value="BDT-6" />
-	<zone name="posix/Asia/Damascus" value="EET-2EEST,M3.5.5/0,M10.5.5/0" />
-	<zone name="posix/Asia/Dhaka" value="BDT-6" />
-	<zone name="posix/Asia/Dili" value="TLT-9" />
-	<zone name="posix/Asia/Dubai" value="GST-4" />
-	<zone name="posix/Asia/Dushanbe" value="TJT-5" />
-	<zone name="posix/Asia/Gaza" value="EEST" />
-	<zone name="posix/Asia/Harbin" value="CST-8" />
-	<zone name="posix/Asia/Hebron" value="EEST" />
-	<zone name="posix/Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="posix/Asia/Hong_Kong" value="HKT-8" />
-	<zone name="posix/Asia/Hovd" value="HOVT-7HOVST,M3.5.6,M9.5.6/0" />
-	<zone name="posix/Asia/Irkutsk" value="IRKT-8" />
-	<zone name="posix/Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Asia/Jakarta" value="WIB-7" />
-	<zone name="posix/Asia/Jayapura" value="WIT-9" />
-	<zone name="posix/Asia/Jerusalem" value="IDDT" />
-	<zone name="posix/Asia/Kabul" value="AFT-4:30" />
-	<zone name="posix/Asia/Kamchatka" value="PETT-12" />
-	<zone name="posix/Asia/Karachi" value="PKT-5" />
-	<zone name="posix/Asia/Kashgar" value="XJT-6" />
-	<zone name="posix/Asia/Kathmandu" value="NPT-5:45" />
-	<zone name="posix/Asia/Katmandu" value="NPT-5:45" />
-	<zone name="posix/Asia/Khandyga" value="YAKT-9" />
-	<zone name="posix/Asia/Kolkata" value="IST-5:30" />
-	<zone name="posix/Asia/Krasnoyarsk" value="KRAT-7" />
-	<zone name="posix/Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="posix/Asia/Kuching" value="MYT-8" />
-	<zone name="posix/Asia/Kuwait" value="AST-3" />
-	<zone name="posix/Asia/Macao" value="CST-8" />
-	<zone name="posix/Asia/Macau" value="CST-8" />
-	<zone name="posix/Asia/Magadan" value="MAGT-10" />
-	<zone name="posix/Asia/Makassar" value="WITA-8" />
-	<zone name="posix/Asia/Manila" value="PHT-8" />
-	<zone name="posix/Asia/Muscat" value="GST-4" />
-	<zone name="posix/Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Asia/Novokuznetsk" value="KRAT-7" />
-	<zone name="posix/Asia/Novosibirsk" value="NOVT-6" />
-	<zone name="posix/Asia/Omsk" value="OMST-6" />
-	<zone name="posix/Asia/Oral" value="ORAT-5" />
-	<zone name="posix/Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="posix/Asia/Pontianak" value="WIB-7" />
-	<zone name="posix/Asia/Pyongyang" value="KST-8:30" />
-	<zone name="posix/Asia/Qatar" value="AST-3" />
-	<zone name="posix/Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="posix/Asia/Rangoon" value="MMT-6:30" />
-	<zone name="posix/Asia/Riyadh" value="AST-3" />
-	<zone name="posix/Asia/Saigon" value="ICT-7" />
-	<zone name="posix/Asia/Sakhalin" value="SAKT-10" />
-	<zone name="posix/Asia/Samarkand" value="UZT-5" />
-	<zone name="posix/Asia/Seoul" value="KST-9" />
-	<zone name="posix/Asia/Shanghai" value="CST-8" />
-	<zone name="posix/Asia/Singapore" value="SGT-8" />
-	<zone name="posix/Asia/Srednekolymsk" value="SRET-11" />
-	<zone name="posix/Asia/Taipei" value="CST-8" />
-	<zone name="posix/Asia/Tashkent" value="UZT-5" />
-	<zone name="posix/Asia/Tbilisi" value="GET-4" />
-	<zone name="posix/Asia/Tehran" value="IRDT" />
-	<zone name="posix/Asia/Tel_Aviv" value="IDDT" />
-	<zone name="posix/Asia/Thimbu" value="BTT-6" />
-	<zone name="posix/Asia/Thimphu" value="BTT-6" />
-	<zone name="posix/Asia/Tokyo" value="JST-9" />
-	<zone name="posix/Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="posix/Asia/Ulaanbaatar" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
-	<zone name="posix/Asia/Ulan_Bator" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
-	<zone name="posix/Asia/Urumqi" value="XJT-6" />
-	<zone name="posix/Asia/Ust-Nera" value="VLAT-10" />
-	<zone name="posix/Asia/Vientiane" value="ICT-7" />
-	<zone name="posix/Asia/Vladivostok" value="VLAT-10" />
-	<zone name="posix/Asia/Yakutsk" value="YAKT-9" />
-	<zone name="posix/Asia/Yekaterinburg" value="YEKT-5" />
-	<zone name="posix/Asia/Yerevan" value="AMT-4" />
-	<zone name="posix/Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="posix/Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="posix/Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Atlantic/Reykjavik" value="GMT0" />
-	<zone name="posix/Atlantic/South_Georgia" value="GST2" />
-	<zone name="posix/Atlantic/St_Helena" value="GMT0" />
-	<zone name="posix/Atlantic/Stanley" value="FKST3" />
-	<zone name="posix/Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Brisbane" value="AEST-10" />
-	<zone name="posix/Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Darwin" value="ACST-9:30" />
-	<zone name="posix/Australia/Eucla" value="ACWST-8:45" />
-	<zone name="posix/Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/LHI" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
-	<zone name="posix/Australia/Lindeman" value="AEST-10" />
-	<zone name="posix/Australia/Lord_Howe" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
-	<zone name="posix/Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/North" value="ACST-9:30" />
-	<zone name="posix/Australia/Perth" value="AWST-8" />
-	<zone name="posix/Australia/Queensland" value="AEST-10" />
-	<zone name="posix/Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/West" value="AWST-8" />
-	<zone name="posix/Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Brazil/Acre" value="ACT5" />
-	<zone name="posix/Brazil/DeNoronha" value="FNT2" />
-	<zone name="posix/Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/Brazil/West" value="AMT4" />
-	<zone name="posix/CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/East-Saskatchewan" value="CST6" />
-	<zone name="posix/Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Canada/Saskatchewan" value="CST6" />
-	<zone name="posix/Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Chile/Continental" value="CLT3" />
-	<zone name="posix/Chile/EasterIsland" value="EAST5" />
-	<zone name="posix/Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="posix/EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/EST" value="EST5" />
-	<zone name="posix/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Egypt" value="EET-2" />
-	<zone name="posix/Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Etc/GMT" value="GMT0" />
-	<zone name="posix/Etc/GMT+0" value="GMT0" />
-	<zone name="posix/Etc/GMT+1" value="&lt;GMT+1&gt;1" />
-	<zone name="posix/Etc/GMT+10" value="&lt;GMT+10&gt;10" />
-	<zone name="posix/Etc/GMT+11" value="&lt;GMT+11&gt;11" />
-	<zone name="posix/Etc/GMT+12" value="&lt;GMT+12&gt;12" />
-	<zone name="posix/Etc/GMT+2" value="&lt;GMT+2&gt;2" />
-	<zone name="posix/Etc/GMT+3" value="&lt;GMT+3&gt;3" />
-	<zone name="posix/Etc/GMT+4" value="&lt;GMT+4&gt;4" />
-	<zone name="posix/Etc/GMT+5" value="&lt;GMT+5&gt;5" />
-	<zone name="posix/Etc/GMT+6" value="&lt;GMT+6&gt;6" />
-	<zone name="posix/Etc/GMT+7" value="&lt;GMT+7&gt;7" />
-	<zone name="posix/Etc/GMT+8" value="&lt;GMT+8&gt;8" />
-	<zone name="posix/Etc/GMT+9" value="&lt;GMT+9&gt;9" />
-	<zone name="posix/Etc/GMT-0" value="GMT0" />
-	<zone name="posix/Etc/GMT-1" value="&lt;GMT-1&gt;-1" />
-	<zone name="posix/Etc/GMT-10" value="&lt;GMT-10&gt;-10" />
-	<zone name="posix/Etc/GMT-11" value="&lt;GMT-11&gt;-11" />
-	<zone name="posix/Etc/GMT-12" value="&lt;GMT-12&gt;-12" />
-	<zone name="posix/Etc/GMT-13" value="&lt;GMT-13&gt;-13" />
-	<zone name="posix/Etc/GMT-14" value="&lt;GMT-14&gt;-14" />
-	<zone name="posix/Etc/GMT-2" value="&lt;GMT-2&gt;-2" />
-	<zone name="posix/Etc/GMT-3" value="&lt;GMT-3&gt;-3" />
-	<zone name="posix/Etc/GMT-4" value="&lt;GMT-4&gt;-4" />
-	<zone name="posix/Etc/GMT-5" value="&lt;GMT-5&gt;-5" />
-	<zone name="posix/Etc/GMT-6" value="&lt;GMT-6&gt;-6" />
-	<zone name="posix/Etc/GMT-7" value="&lt;GMT-7&gt;-7" />
-	<zone name="posix/Etc/GMT-8" value="&lt;GMT-8&gt;-8" />
-	<zone name="posix/Etc/GMT-9" value="&lt;GMT-9&gt;-9" />
-	<zone name="posix/Etc/GMT0" value="GMT0" />
-	<zone name="posix/Etc/Greenwich" value="GMT0" />
-	<zone name="posix/Etc/UCT" value="UCT0" />
-	<zone name="posix/Etc/UTC" value="UTC0" />
-	<zone name="posix/Etc/Universal" value="UTC0" />
-	<zone name="posix/Etc/Zulu" value="UTC0" />
-	<zone name="posix/Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Kaliningrad" value="EET-2" />
-	<zone name="posix/Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Minsk" value="MSK-3" />
-	<zone name="posix/Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Moscow" value="MSK-3" />
-	<zone name="posix/Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Samara" value="SAMT-4" />
-	<zone name="posix/Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Simferopol" value="MSK-3" />
-	<zone name="posix/Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Volgograd" value="MSK-3" />
-	<zone name="posix/Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/GMT" value="GMT0" />
-	<zone name="posix/GMT+0" value="GMT0" />
-	<zone name="posix/GMT-0" value="GMT0" />
-	<zone name="posix/GMT0" value="GMT0" />
-	<zone name="posix/Greenwich" value="GMT0" />
-	<zone name="posix/HST" value="HST10" />
-	<zone name="posix/Hongkong" value="HKT-8" />
-	<zone name="posix/Iceland" value="GMT0" />
-	<zone name="posix/Indian/Antananarivo" value="EAT-3" />
-	<zone name="posix/Indian/Chagos" value="IOT-6" />
-	<zone name="posix/Indian/Christmas" value="CXT-7" />
-	<zone name="posix/Indian/Cocos" value="CCT-6:30" />
-	<zone name="posix/Indian/Comoro" value="EAT-3" />
-	<zone name="posix/Indian/Kerguelen" value="TFT-5" />
-	<zone name="posix/Indian/Mahe" value="SCT-4" />
-	<zone name="posix/Indian/Maldives" value="MVT-5" />
-	<zone name="posix/Indian/Mauritius" value="MUT-4" />
-	<zone name="posix/Indian/Mayotte" value="EAT-3" />
-	<zone name="posix/Indian/Reunion" value="RET-4" />
-	<zone name="posix/Iran" value="IRDT" />
-	<zone name="posix/Israel" value="IDDT" />
-	<zone name="posix/Jamaica" value="EST5" />
-	<zone name="posix/Japan" value="JST-9" />
-	<zone name="posix/Kwajalein" value="MHT-12" />
-	<zone name="posix/Libya" value="EET-2" />
-	<zone name="posix/MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/MST" value="MST7" />
-	<zone name="posix/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="posix/Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/NZ-CHAT" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="posix/Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/PRC" value="CST-8" />
-	<zone name="posix/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Pacific/Apia" value="WSST-13WSDT,M9.5.0/3,M4.1.0/4" />
-	<zone name="posix/Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Pacific/Bougainville" value="BST-11" />
-	<zone name="posix/Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="posix/Pacific/Chuuk" value="CHUT-10" />
-	<zone name="posix/Pacific/Easter" value="EAST5" />
-	<zone name="posix/Pacific/Efate" value="VUT-11" />
-	<zone name="posix/Pacific/Enderbury" value="PHOT-13" />
-	<zone name="posix/Pacific/Fakaofo" value="TKT-13" />
-	<zone name="posix/Pacific/Fiji" value="FJT-12FJST,M11.1.0,M1.3.0/3" />
-	<zone name="posix/Pacific/Funafuti" value="TVT-12" />
-	<zone name="posix/Pacific/Galapagos" value="GALT6" />
-	<zone name="posix/Pacific/Gambier" value="GAMT9" />
-	<zone name="posix/Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="posix/Pacific/Guam" value="ChST-10" />
-	<zone name="posix/Pacific/Honolulu" value="HST10" />
-	<zone name="posix/Pacific/Johnston" value="HST10" />
-	<zone name="posix/Pacific/Kiritimati" value="LINT-14" />
-	<zone name="posix/Pacific/Kosrae" value="KOST-11" />
-	<zone name="posix/Pacific/Kwajalein" value="MHT-12" />
-	<zone name="posix/Pacific/Majuro" value="MHT-12" />
-	<zone name="posix/Pacific/Marquesas" value="MART9:30" />
-	<zone name="posix/Pacific/Midway" value="SST11" />
-	<zone name="posix/Pacific/Nauru" value="NRT-12" />
-	<zone name="posix/Pacific/Niue" value="NUT11" />
-	<zone name="posix/Pacific/Norfolk" value="NFT-11" />
-	<zone name="posix/Pacific/Noumea" value="NCT-11" />
-	<zone name="posix/Pacific/Pago_Pago" value="SST11" />
-	<zone name="posix/Pacific/Palau" value="PWT-9" />
-	<zone name="posix/Pacific/Pitcairn" value="PST8" />
-	<zone name="posix/Pacific/Pohnpei" value="PONT-11" />
-	<zone name="posix/Pacific/Ponape" value="PONT-11" />
-	<zone name="posix/Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="posix/Pacific/Rarotonga" value="CKT10" />
-	<zone name="posix/Pacific/Saipan" value="ChST-10" />
-	<zone name="posix/Pacific/Samoa" value="SST11" />
-	<zone name="posix/Pacific/Tahiti" value="TAHT10" />
-	<zone name="posix/Pacific/Tarawa" value="GILT-12" />
-	<zone name="posix/Pacific/Tongatapu" value="TOT-13" />
-	<zone name="posix/Pacific/Truk" value="CHUT-10" />
-	<zone name="posix/Pacific/Wake" value="WAKT-12" />
-	<zone name="posix/Pacific/Wallis" value="WFT-12" />
-	<zone name="posix/Pacific/Yap" value="CHUT-10" />
-	<zone name="posix/Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/ROC" value="CST-8" />
-	<zone name="posix/ROK" value="KST-9" />
-	<zone name="posix/Singapore" value="SGT-8" />
-	<zone name="posix/Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/UCT" value="UCT0" />
-	<zone name="posix/US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Arizona" value="MST7" />
-	<zone name="posix/US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Hawaii" value="HST10" />
-	<zone name="posix/US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Pacific-New" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Samoa" value="SST11" />
-	<zone name="posix/UTC" value="UTC0" />
-	<zone name="posix/Universal" value="UTC0" />
-	<zone name="posix/W-SU" value="MSK-3" />
-	<zone name="posix/WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Zulu" value="UTC0" />
-
-	<zone name="posixrules" value="EST5EDT,M3.2.0,M11.1.0" />
-
-	<zone name="right/Africa/Abidjan" value="GMT0" />
-	<zone name="right/Africa/Accra" value="GMT0" />
-	<zone name="right/Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="right/Africa/Algiers" value="CET-1" />
-	<zone name="right/Africa/Asmara" value="EAT-3" />
-	<zone name="right/Africa/Asmera" value="EAT-3" />
-	<zone name="right/Africa/Bamako" value="GMT0" />
-	<zone name="right/Africa/Bangui" value="WAT-1" />
-	<zone name="right/Africa/Banjul" value="GMT0" />
-	<zone name="right/Africa/Bissau" value="GMT0" />
-	<zone name="right/Africa/Blantyre" value="CAT-2" />
-	<zone name="right/Africa/Brazzaville" value="WAT-1" />
-	<zone name="right/Africa/Bujumbura" value="CAT-2" />
-	<zone name="right/Africa/Cairo" value="EET-2" />
-	<zone name="right/Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Africa/Conakry" value="GMT0" />
-	<zone name="right/Africa/Dakar" value="GMT0" />
-	<zone name="right/Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="right/Africa/Djibouti" value="EAT-3" />
-	<zone name="right/Africa/Douala" value="WAT-1" />
-	<zone name="right/Africa/El_Aaiun" value="WET0WEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Africa/Freetown" value="GMT0" />
-	<zone name="right/Africa/Gaborone" value="CAT-2" />
-	<zone name="right/Africa/Harare" value="CAT-2" />
-	<zone name="right/Africa/Johannesburg" value="SAST-2" />
-	<zone name="right/Africa/Juba" value="EAT-3" />
-	<zone name="right/Africa/Kampala" value="EAT-3" />
-	<zone name="right/Africa/Khartoum" value="EAT-3" />
-	<zone name="right/Africa/Kigali" value="CAT-2" />
-	<zone name="right/Africa/Kinshasa" value="WAT-1" />
-	<zone name="right/Africa/Lagos" value="WAT-1" />
-	<zone name="right/Africa/Libreville" value="WAT-1" />
-	<zone name="right/Africa/Lome" value="GMT0" />
-	<zone name="right/Africa/Luanda" value="WAT-1" />
-	<zone name="right/Africa/Lubumbashi" value="CAT-2" />
-	<zone name="right/Africa/Lusaka" value="CAT-2" />
-	<zone name="right/Africa/Malabo" value="WAT-1" />
-	<zone name="right/Africa/Maputo" value="CAT-2" />
-	<zone name="right/Africa/Maseru" value="SAST-2" />
-	<zone name="right/Africa/Mbabane" value="SAST-2" />
-	<zone name="right/Africa/Mogadishu" value="EAT-3" />
-	<zone name="right/Africa/Monrovia" value="GMT0" />
-	<zone name="right/Africa/Nairobi" value="EAT-3" />
-	<zone name="right/Africa/Ndjamena" value="WAT-1" />
-	<zone name="right/Africa/Niamey" value="WAT-1" />
-	<zone name="right/Africa/Nouakchott" value="GMT0" />
-	<zone name="right/Africa/Ouagadougou" value="GMT0" />
-	<zone name="right/Africa/Porto-Novo" value="WAT-1" />
-	<zone name="right/Africa/Sao_Tome" value="GMT0" />
-	<zone name="right/Africa/Timbuktu" value="GMT0" />
-	<zone name="right/Africa/Tripoli" value="EET-2" />
-	<zone name="right/Africa/Tunis" value="CET-1" />
-	<zone name="right/Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-	<zone name="right/America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Anguilla" value="AST4" />
-	<zone name="right/America/Antigua" value="AST4" />
-	<zone name="right/America/Araguaina" value="BRT3" />
-	<zone name="right/America/Argentina/Buenos_Aires" value="ART3" />
-	<zone name="right/America/Argentina/Catamarca" value="ART3" />
-	<zone name="right/America/Argentina/ComodRivadavia" value="ART3" />
-	<zone name="right/America/Argentina/Cordoba" value="ART3" />
-	<zone name="right/America/Argentina/Jujuy" value="ART3" />
-	<zone name="right/America/Argentina/La_Rioja" value="ART3" />
-	<zone name="right/America/Argentina/Mendoza" value="ART3" />
-	<zone name="right/America/Argentina/Rio_Gallegos" value="ART3" />
-	<zone name="right/America/Argentina/Salta" value="ART3" />
-	<zone name="right/America/Argentina/San_Juan" value="ART3" />
-	<zone name="right/America/Argentina/San_Luis" value="ART3" />
-	<zone name="right/America/Argentina/Tucuman" value="ART3" />
-	<zone name="right/America/Argentina/Ushuaia" value="ART3" />
-	<zone name="right/America/Aruba" value="AST4" />
-	<zone name="right/America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
-	<zone name="right/America/Atikokan" value="EST5" />
-	<zone name="right/America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Bahia" value="BRT3" />
-	<zone name="right/America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Barbados" value="AST4" />
-	<zone name="right/America/Belem" value="BRT3" />
-	<zone name="right/America/Belize" value="CST6" />
-	<zone name="right/America/Blanc-Sablon" value="AST4" />
-	<zone name="right/America/Boa_Vista" value="AMT4" />
-	<zone name="right/America/Bogota" value="COT5" />
-	<zone name="right/America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Buenos_Aires" value="ART3" />
-	<zone name="right/America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Cancun" value="EST5" />
-	<zone name="right/America/Caracas" value="VET4:30" />
-	<zone name="right/America/Catamarca" value="ART3" />
-	<zone name="right/America/Cayenne" value="GFT3" />
-	<zone name="right/America/Cayman" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Coral_Harbour" value="EST5" />
-	<zone name="right/America/Cordoba" value="ART3" />
-	<zone name="right/America/Costa_Rica" value="CST6" />
-	<zone name="right/America/Creston" value="MST7" />
-	<zone name="right/America/Cuiaba" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Curacao" value="AST4" />
-	<zone name="right/America/Danmarkshavn" value="GMT0" />
-	<zone name="right/America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Dawson_Creek" value="MST7" />
-	<zone name="right/America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Dominica" value="AST4" />
-	<zone name="right/America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Eirunepe" value="ACT5" />
-	<zone name="right/America/El_Salvador" value="CST6" />
-	<zone name="right/America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Fort_Nelson" value="MST7" />
-	<zone name="right/America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Fortaleza" value="BRT3" />
-	<zone name="right/America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Godthab" value="WGST" />
-	<zone name="right/America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Grand_Turk" value="AST4" />
-	<zone name="right/America/Grenada" value="AST4" />
-	<zone name="right/America/Guadeloupe" value="AST4" />
-	<zone name="right/America/Guatemala" value="CST6" />
-	<zone name="right/America/Guayaquil" value="ECT5" />
-	<zone name="right/America/Guyana" value="GYT4" />
-	<zone name="right/America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Havana" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="right/America/Hermosillo" value="MST7" />
-	<zone name="right/America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Jamaica" value="EST5" />
-	<zone name="right/America/Jujuy" value="ART3" />
-	<zone name="right/America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Kralendijk" value="AST4" />
-	<zone name="right/America/La_Paz" value="BOT4" />
-	<zone name="right/America/Lima" value="PET5" />
-	<zone name="right/America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Lower_Princes" value="AST4" />
-	<zone name="right/America/Maceio" value="BRT3" />
-	<zone name="right/America/Managua" value="CST6" />
-	<zone name="right/America/Manaus" value="AMT4" />
-	<zone name="right/America/Marigot" value="AST4" />
-	<zone name="right/America/Martinique" value="AST4" />
-	<zone name="right/America/Matamoros" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Mendoza" value="ART3" />
-	<zone name="right/America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Metlakatla" value="PST8" />
-	<zone name="right/America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Montevideo" value="UYT3" />
-	<zone name="right/America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Montserrat" value="AST4" />
-	<zone name="right/America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Noronha" value="FNT2" />
-	<zone name="right/America/North_Dakota/Beulah" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Ojinaga" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Panama" value="EST5" />
-	<zone name="right/America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Paramaribo" value="SRT3" />
-	<zone name="right/America/Phoenix" value="MST7" />
-	<zone name="right/America/Port-au-Prince" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Port_of_Spain" value="AST4" />
-	<zone name="right/America/Porto_Acre" value="ACT5" />
-	<zone name="right/America/Porto_Velho" value="AMT4" />
-	<zone name="right/America/Puerto_Rico" value="AST4" />
-	<zone name="right/America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Recife" value="BRT3" />
-	<zone name="right/America/Regina" value="CST6" />
-	<zone name="right/America/Resolute" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Rio_Branco" value="ACT5" />
-	<zone name="right/America/Rosario" value="ART3" />
-	<zone name="right/America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Santarem" value="BRT3" />
-	<zone name="right/America/Santiago" value="CLT3" />
-	<zone name="right/America/Santo_Domingo" value="AST4" />
-	<zone name="right/America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="right/America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/St_Barthelemy" value="AST4" />
-	<zone name="right/America/St_Johns" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/St_Kitts" value="AST4" />
-	<zone name="right/America/St_Lucia" value="AST4" />
-	<zone name="right/America/St_Thomas" value="AST4" />
-	<zone name="right/America/St_Vincent" value="AST4" />
-	<zone name="right/America/Swift_Current" value="CST6" />
-	<zone name="right/America/Tegucigalpa" value="CST6" />
-	<zone name="right/America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Tijuana" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Tortola" value="AST4" />
-	<zone name="right/America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Virgin" value="AST4" />
-	<zone name="right/America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Antarctica/Casey" value="AWST-8" />
-	<zone name="right/Antarctica/Davis" value="DAVT-7" />
-	<zone name="right/Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="right/Antarctica/Macquarie" value="MIST-11" />
-	<zone name="right/Antarctica/Mawson" value="MAWT-5" />
-	<zone name="right/Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Antarctica/Palmer" value="CLT3" />
-	<zone name="right/Antarctica/Rothera" value="ROTT3" />
-	<zone name="right/Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Antarctica/Syowa" value="SYOT-3" />
-	<zone name="right/Antarctica/Troll" value="UTC0CEST-2,M3.5.0/1,M10.5.0/3" />
-	<zone name="right/Antarctica/Vostok" value="VOST-6" />
-	<zone name="right/Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Asia/Aden" value="AST-3" />
-	<zone name="right/Asia/Almaty" value="ALMT-6" />
-	<zone name="right/Asia/Amman" value="EEST" />
-	<zone name="right/Asia/Anadyr" value="ANAT-12" />
-	<zone name="right/Asia/Aqtau" value="AQTT-5" />
-	<zone name="right/Asia/Aqtobe" value="AQTT-5" />
-	<zone name="right/Asia/Ashgabat" value="TMT-5" />
-	<zone name="right/Asia/Ashkhabad" value="TMT-5" />
-	<zone name="right/Asia/Baghdad" value="AST-3" />
-	<zone name="right/Asia/Bahrain" value="AST-3" />
-	<zone name="right/Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="right/Asia/Bangkok" value="ICT-7" />
-	<zone name="right/Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="right/Asia/Bishkek" value="KGT-6" />
-	<zone name="right/Asia/Brunei" value="BNT-8" />
-	<zone name="right/Asia/Calcutta" value="IST-5:30" />
-	<zone name="right/Asia/Chita" value="IRKT-8" />
-	<zone name="right/Asia/Choibalsan" value="CHOT-8CHOST,M3.5.6,M9.5.6/0" />
-	<zone name="right/Asia/Chongqing" value="CST-8" />
-	<zone name="right/Asia/Chungking" value="CST-8" />
-	<zone name="right/Asia/Colombo" value="IST-5:30" />
-	<zone name="right/Asia/Dacca" value="BDT-6" />
-	<zone name="right/Asia/Damascus" value="EET-2EEST,M3.5.5/0,M10.5.5/0" />
-	<zone name="right/Asia/Dhaka" value="BDT-6" />
-	<zone name="right/Asia/Dili" value="TLT-9" />
-	<zone name="right/Asia/Dubai" value="GST-4" />
-	<zone name="right/Asia/Dushanbe" value="TJT-5" />
-	<zone name="right/Asia/Gaza" value="EEST" />
-	<zone name="right/Asia/Harbin" value="CST-8" />
-	<zone name="right/Asia/Hebron" value="EEST" />
-	<zone name="right/Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="right/Asia/Hong_Kong" value="HKT-8" />
-	<zone name="right/Asia/Hovd" value="HOVT-7HOVST,M3.5.6,M9.5.6/0" />
-	<zone name="right/Asia/Irkutsk" value="IRKT-8" />
-	<zone name="right/Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Asia/Jakarta" value="WIB-7" />
-	<zone name="right/Asia/Jayapura" value="WIT-9" />
-	<zone name="right/Asia/Jerusalem" value="IDDT" />
-	<zone name="right/Asia/Kabul" value="AFT-4:30" />
-	<zone name="right/Asia/Kamchatka" value="PETT-12" />
-	<zone name="right/Asia/Karachi" value="PKT-5" />
-	<zone name="right/Asia/Kashgar" value="XJT-6" />
-	<zone name="right/Asia/Kathmandu" value="NPT-5:45" />
-	<zone name="right/Asia/Katmandu" value="NPT-5:45" />
-	<zone name="right/Asia/Khandyga" value="YAKT-9" />
-	<zone name="right/Asia/Kolkata" value="IST-5:30" />
-	<zone name="right/Asia/Krasnoyarsk" value="KRAT-7" />
-	<zone name="right/Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="right/Asia/Kuching" value="MYT-8" />
-	<zone name="right/Asia/Kuwait" value="AST-3" />
-	<zone name="right/Asia/Macao" value="CST-8" />
-	<zone name="right/Asia/Macau" value="CST-8" />
-	<zone name="right/Asia/Magadan" value="MAGT-10" />
-	<zone name="right/Asia/Makassar" value="WITA-8" />
-	<zone name="right/Asia/Manila" value="PHT-8" />
-	<zone name="right/Asia/Muscat" value="GST-4" />
-	<zone name="right/Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Asia/Novokuznetsk" value="KRAT-7" />
-	<zone name="right/Asia/Novosibirsk" value="NOVT-6" />
-	<zone name="right/Asia/Omsk" value="OMST-6" />
-	<zone name="right/Asia/Oral" value="ORAT-5" />
-	<zone name="right/Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="right/Asia/Pontianak" value="WIB-7" />
-	<zone name="right/Asia/Pyongyang" value="KST-8:30" />
-	<zone name="right/Asia/Qatar" value="AST-3" />
-	<zone name="right/Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="right/Asia/Rangoon" value="MMT-6:30" />
-	<zone name="right/Asia/Riyadh" value="AST-3" />
-	<zone name="right/Asia/Saigon" value="ICT-7" />
-	<zone name="right/Asia/Sakhalin" value="SAKT-10" />
-	<zone name="right/Asia/Samarkand" value="UZT-5" />
-	<zone name="right/Asia/Seoul" value="KST-9" />
-	<zone name="right/Asia/Shanghai" value="CST-8" />
-	<zone name="right/Asia/Singapore" value="SGT-8" />
-	<zone name="right/Asia/Srednekolymsk" value="SRET-11" />
-	<zone name="right/Asia/Taipei" value="CST-8" />
-	<zone name="right/Asia/Tashkent" value="UZT-5" />
-	<zone name="right/Asia/Tbilisi" value="GET-4" />
-	<zone name="right/Asia/Tehran" value="IRDT" />
-	<zone name="right/Asia/Tel_Aviv" value="IDDT" />
-	<zone name="right/Asia/Thimbu" value="BTT-6" />
-	<zone name="right/Asia/Thimphu" value="BTT-6" />
-	<zone name="right/Asia/Tokyo" value="JST-9" />
-	<zone name="right/Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="right/Asia/Ulaanbaatar" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
-	<zone name="right/Asia/Ulan_Bator" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
-	<zone name="right/Asia/Urumqi" value="XJT-6" />
-	<zone name="right/Asia/Ust-Nera" value="VLAT-10" />
-	<zone name="right/Asia/Vientiane" value="ICT-7" />
-	<zone name="right/Asia/Vladivostok" value="VLAT-10" />
-	<zone name="right/Asia/Yakutsk" value="YAKT-9" />
-	<zone name="right/Asia/Yekaterinburg" value="YEKT-5" />
-	<zone name="right/Asia/Yerevan" value="AMT-4" />
-	<zone name="right/Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="right/Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="right/Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Atlantic/Reykjavik" value="GMT0" />
-	<zone name="right/Atlantic/South_Georgia" value="GST2" />
-	<zone name="right/Atlantic/St_Helena" value="GMT0" />
-	<zone name="right/Atlantic/Stanley" value="FKST3" />
-	<zone name="right/Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Brisbane" value="AEST-10" />
-	<zone name="right/Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Darwin" value="ACST-9:30" />
-	<zone name="right/Australia/Eucla" value="ACWST-8:45" />
-	<zone name="right/Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/LHI" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
-	<zone name="right/Australia/Lindeman" value="AEST-10" />
-	<zone name="right/Australia/Lord_Howe" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
-	<zone name="right/Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/North" value="ACST-9:30" />
-	<zone name="right/Australia/Perth" value="AWST-8" />
-	<zone name="right/Australia/Queensland" value="AEST-10" />
-	<zone name="right/Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/West" value="AWST-8" />
-	<zone name="right/Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
-	<zone name="right/Brazil/Acre" value="ACT5" />
-	<zone name="right/Brazil/DeNoronha" value="FNT2" />
-	<zone name="right/Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/Brazil/West" value="AMT4" />
-	<zone name="right/CET" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/East-Saskatchewan" value="CST6" />
-	<zone name="right/Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Newfoundland" value="NST3:30NDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Canada/Saskatchewan" value="CST6" />
-	<zone name="right/Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Chile/Continental" value="CLT3" />
-	<zone name="right/Chile/EasterIsland" value="EAST5" />
-	<zone name="right/Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
-	<zone name="right/EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/EST" value="EST5" />
-	<zone name="right/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/Egypt" value="EET-2" />
-	<zone name="right/Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Etc/GMT" value="GMT0" />
-	<zone name="right/Etc/GMT+0" value="GMT0" />
-	<zone name="right/Etc/GMT+1" value="&lt;GMT+1&gt;1" />
-	<zone name="right/Etc/GMT+10" value="&lt;GMT+10&gt;10" />
-	<zone name="right/Etc/GMT+11" value="&lt;GMT+11&gt;11" />
-	<zone name="right/Etc/GMT+12" value="&lt;GMT+12&gt;12" />
-	<zone name="right/Etc/GMT+2" value="&lt;GMT+2&gt;2" />
-	<zone name="right/Etc/GMT+3" value="&lt;GMT+3&gt;3" />
-	<zone name="right/Etc/GMT+4" value="&lt;GMT+4&gt;4" />
-	<zone name="right/Etc/GMT+5" value="&lt;GMT+5&gt;5" />
-	<zone name="right/Etc/GMT+6" value="&lt;GMT+6&gt;6" />
-	<zone name="right/Etc/GMT+7" value="&lt;GMT+7&gt;7" />
-	<zone name="right/Etc/GMT+8" value="&lt;GMT+8&gt;8" />
-	<zone name="right/Etc/GMT+9" value="&lt;GMT+9&gt;9" />
-	<zone name="right/Etc/GMT-0" value="GMT0" />
-	<zone name="right/Etc/GMT-1" value="&lt;GMT-1&gt;-1" />
-	<zone name="right/Etc/GMT-10" value="&lt;GMT-10&gt;-10" />
-	<zone name="right/Etc/GMT-11" value="&lt;GMT-11&gt;-11" />
-	<zone name="right/Etc/GMT-12" value="&lt;GMT-12&gt;-12" />
-	<zone name="right/Etc/GMT-13" value="&lt;GMT-13&gt;-13" />
-	<zone name="right/Etc/GMT-14" value="&lt;GMT-14&gt;-14" />
-	<zone name="right/Etc/GMT-2" value="&lt;GMT-2&gt;-2" />
-	<zone name="right/Etc/GMT-3" value="&lt;GMT-3&gt;-3" />
-	<zone name="right/Etc/GMT-4" value="&lt;GMT-4&gt;-4" />
-	<zone name="right/Etc/GMT-5" value="&lt;GMT-5&gt;-5" />
-	<zone name="right/Etc/GMT-6" value="&lt;GMT-6&gt;-6" />
-	<zone name="right/Etc/GMT-7" value="&lt;GMT-7&gt;-7" />
-	<zone name="right/Etc/GMT-8" value="&lt;GMT-8&gt;-8" />
-	<zone name="right/Etc/GMT-9" value="&lt;GMT-9&gt;-9" />
-	<zone name="right/Etc/GMT0" value="GMT0" />
-	<zone name="right/Etc/Greenwich" value="GMT0" />
-	<zone name="right/Etc/UCT" value="UCT0" />
-	<zone name="right/Etc/UTC" value="UTC0" />
-	<zone name="right/Etc/Universal" value="UTC0" />
-	<zone name="right/Etc/Zulu" value="UTC0" />
-	<zone name="right/Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Kaliningrad" value="EET-2" />
-	<zone name="right/Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Minsk" value="MSK-3" />
-	<zone name="right/Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Moscow" value="MSK-3" />
-	<zone name="right/Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Samara" value="SAMT-4" />
-	<zone name="right/Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Simferopol" value="MSK-3" />
-	<zone name="right/Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Volgograd" value="MSK-3" />
-	<zone name="right/Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/GMT" value="GMT0" />
-	<zone name="right/GMT+0" value="GMT0" />
-	<zone name="right/GMT-0" value="GMT0" />
-	<zone name="right/GMT0" value="GMT0" />
-	<zone name="right/Greenwich" value="GMT0" />
-	<zone name="right/HST" value="HST10" />
-	<zone name="right/Hongkong" value="HKT-8" />
-	<zone name="right/Iceland" value="GMT0" />
-	<zone name="right/Indian/Antananarivo" value="EAT-3" />
-	<zone name="right/Indian/Chagos" value="IOT-6" />
-	<zone name="right/Indian/Christmas" value="CXT-7" />
-	<zone name="right/Indian/Cocos" value="CCT-6:30" />
-	<zone name="right/Indian/Comoro" value="EAT-3" />
-	<zone name="right/Indian/Kerguelen" value="TFT-5" />
-	<zone name="right/Indian/Mahe" value="SCT-4" />
-	<zone name="right/Indian/Maldives" value="MVT-5" />
-	<zone name="right/Indian/Mauritius" value="MUT-4" />
-	<zone name="right/Indian/Mayotte" value="EAT-3" />
-	<zone name="right/Indian/Reunion" value="RET-4" />
-	<zone name="right/Iran" value="IRDT" />
-	<zone name="right/Israel" value="IDDT" />
-	<zone name="right/Jamaica" value="EST5" />
-	<zone name="right/Japan" value="JST-9" />
-	<zone name="right/Kwajalein" value="MHT-12" />
-	<zone name="right/Libya" value="EET-2" />
-	<zone name="right/MET" value="MET-1MEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/MST" value="MST7" />
-	<zone name="right/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Mexico/BajaNorte" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="right/Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/NZ" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/NZ-CHAT" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="right/Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/PRC" value="CST-8" />
-	<zone name="right/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Pacific/Apia" value="WSST-13WSDT,M9.5.0/3,M4.1.0/4" />
-	<zone name="right/Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Pacific/Bougainville" value="BST-11" />
-	<zone name="right/Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="right/Pacific/Chuuk" value="CHUT-10" />
-	<zone name="right/Pacific/Easter" value="EAST5" />
-	<zone name="right/Pacific/Efate" value="VUT-11" />
-	<zone name="right/Pacific/Enderbury" value="PHOT-13" />
-	<zone name="right/Pacific/Fakaofo" value="TKT-13" />
-	<zone name="right/Pacific/Fiji" value="FJT-12FJST,M11.1.0,M1.3.0/3" />
-	<zone name="right/Pacific/Funafuti" value="TVT-12" />
-	<zone name="right/Pacific/Galapagos" value="GALT6" />
-	<zone name="right/Pacific/Gambier" value="GAMT9" />
-	<zone name="right/Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="right/Pacific/Guam" value="ChST-10" />
-	<zone name="right/Pacific/Honolulu" value="HST10" />
-	<zone name="right/Pacific/Johnston" value="HST10" />
-	<zone name="right/Pacific/Kiritimati" value="LINT-14" />
-	<zone name="right/Pacific/Kosrae" value="KOST-11" />
-	<zone name="right/Pacific/Kwajalein" value="MHT-12" />
-	<zone name="right/Pacific/Majuro" value="MHT-12" />
-	<zone name="right/Pacific/Marquesas" value="MART9:30" />
-	<zone name="right/Pacific/Midway" value="SST11" />
-	<zone name="right/Pacific/Nauru" value="NRT-12" />
-	<zone name="right/Pacific/Niue" value="NUT11" />
-	<zone name="right/Pacific/Norfolk" value="NFT-11" />
-	<zone name="right/Pacific/Noumea" value="NCT-11" />
-	<zone name="right/Pacific/Pago_Pago" value="SST11" />
-	<zone name="right/Pacific/Palau" value="PWT-9" />
-	<zone name="right/Pacific/Pitcairn" value="PST8" />
-	<zone name="right/Pacific/Pohnpei" value="PONT-11" />
-	<zone name="right/Pacific/Ponape" value="PONT-11" />
-	<zone name="right/Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="right/Pacific/Rarotonga" value="CKT10" />
-	<zone name="right/Pacific/Saipan" value="ChST-10" />
-	<zone name="right/Pacific/Samoa" value="SST11" />
-	<zone name="right/Pacific/Tahiti" value="TAHT10" />
-	<zone name="right/Pacific/Tarawa" value="GILT-12" />
-	<zone name="right/Pacific/Tongatapu" value="TOT-13" />
-	<zone name="right/Pacific/Truk" value="CHUT-10" />
-	<zone name="right/Pacific/Wake" value="WAKT-12" />
-	<zone name="right/Pacific/Wallis" value="WFT-12" />
-	<zone name="right/Pacific/Yap" value="CHUT-10" />
-	<zone name="right/Poland" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Portugal" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/ROC" value="CST-8" />
-	<zone name="right/ROK" value="KST-9" />
-	<zone name="right/Singapore" value="SGT-8" />
-	<zone name="right/Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/UCT" value="UCT0" />
-	<zone name="right/US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Arizona" value="MST7" />
-	<zone name="right/US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Hawaii" value="HST10" />
-	<zone name="right/US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Pacific-New" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Samoa" value="SST11" />
-	<zone name="right/UTC" value="UTC0" />
-	<zone name="right/Universal" value="UTC0" />
-	<zone name="right/W-SU" value="MSK-3" />
-	<zone name="right/WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Zulu" value="UTC0" />
+        <zone name="Zulu" value="UTC0" />
     </timezones>
 </configuration>
diff --git a/conf/vanilla/autoload_configs/unicall.conf.xml b/conf/vanilla/autoload_configs/unicall.conf.xml
deleted file mode 100644
index eeaa0782f7..0000000000
--- a/conf/vanilla/autoload_configs/unicall.conf.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<configuration name="unicall.conf" description="Unicall Configuration">
-  <settings>
-    <param name="context" value="default"/>
-    <param name="dialplan" value="XML"/>
-    <param name="suppress-dtmf-tone" value="true"/>
-  </settings>
-  <spans>
-    <span id="1">
-      <param name="protocol-class" value="mfcr2"/>
-      <param name="protocol-variant" value="ar"/>
-      <param name="protocol-end" value="peer"/>
-      <param name="outgoing-allowed" value="true"/>
-      <param name="dialplan" value="XML"/>
-      <param name="context" value="default"/>
-    </span>
-    <span id="2">
-      <param name="protocol-class" value="mfcr2"/>
-      <param name="protocol-variant" value="ar"/>
-      <param name="protocol-end" value="peer"/>
-      <param name="outgoing-allowed" value="true"/>
-      <param name="dialplan" value="XML"/>
-      <param name="context" value="default"/>
-    </span>
-  </spans>
-</configuration>
diff --git a/conf/vanilla/dialplan/default.xml b/conf/vanilla/dialplan/default.xml
index c3edafc1c8..5fd9a079b6 100644
--- a/conf/vanilla/dialplan/default.xml
+++ b/conf/vanilla/dialplan/default.xml
@@ -179,24 +179,6 @@
       </condition>
     </extension>
     -->
-    <!--
-	Snom button demo, call 9000 to make button 2 mapped to transfer the current call to a conference
-    -->
-
-    <extension name="snom-demo-2">
-      <condition field="destination_number" expression="^9001$">
-	<action application="eval" data="${snom_bind_key(2 off DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message notused)}"/>
-	<action application="transfer" data="3000"/>
-      </condition>
-    </extension>
-
-    <extension name="snom-demo-1">
-      <condition field="destination_number" expression="^9000$">
-	<!--<key> <light> <label> <user> <host> <profile> <action_name> <action>-->
-	<action application="eval" data="${snom_bind_key(2 on DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message api+uuid_transfer ${uuid} 9001)}"/>
-	<action application="playback" data="$${hold_music}"/>
-      </condition>
-    </extension>
 
     <extension name="eavesdrop">
       <condition field="destination_number" expression="^88(\d{4})$|^\*0(.*)$">
@@ -340,16 +322,6 @@
       </condition>
     </extension>
 
-    <!--
-	 This extension is used by mod_portaudio so you can pa call sip:someone@example.com
-	 mod_portaudio will pass the entire string to the dialplan for routing.
-    -->
-    <extension name="sip_uri">
-      <condition field="destination_number" expression="^sip:(.*)$">
-	<action application="bridge" data="sofia/${use_profile}/$1"/>
-      </condition>
-    </extension>
-
     <!--
 	start a dynamic conference with the settings of the "default" conference profile in conference.conf.xml
     -->
diff --git a/conf/vanilla/dialplan/default/00_ladspa.xml b/conf/vanilla/dialplan/default/00_ladspa.xml
deleted file mode 100644
index a26b193ef5..0000000000
--- a/conf/vanilla/dialplan/default/00_ladspa.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<include>
-  
-  <X-PRE-PROCESS cmd="set" data="AT_EPENT1=0 0 0 -1 -1 0 -1 0 -1 -1 0 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_EPENT2=1 1 1 -1 -1 1 -1 1 -1 -1 1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CPENT1=0 -1 -1 0 -1 0 0 0 -1 -1 0 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CPENT2=1 -1 -1 1 -1 1 1 1 -1 -1 1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CMAJ1=0 -1 0 0 -1 0 -1 0 0 -1 0 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CMAJ2=1 -1 1 1 -1 1 -1 1 1 -1 1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_BBLUES=1 -1 1 -1 -1 1 -1 1 1 1 -1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="ATGPENT2=-1 1 -1 1 -1 1 -1 -1 1 -1 1 -1"/>
-  
-  <extension name="101"> 
-    <condition field="destination_number" expression="^101$"> 
-      <!-- AUTOTALENT DEFAULTS -->
-
-      <!--
-      <action application="set" data="AT_TUNE=440"/>
-      <action application="set" data="AT_FIXED=0"/>
-      <action application="set" data="AT_PULL=0"/>
-      <action application="set" data="AT_A=0"/>
-      <action application="set" data="AT_Bb=-1"/>
-      <action application="set" data="AT_B=0"/>
-      <action application="set" data="AT_C=0"/>
-      <action application="set" data="AT_Db=-1"/>
-      <action application="set" data="AT_D=0"/>
-      <action application="set" data="AT_Eb=-1"/>
-      <action application="set" data="AT_E=0"/>
-      <action application="set" data="AT_F=0"/>
-      <action application="set" data="AT_Gb=-1"/>
-      <action application="set" data="AT_G=0"/>
-      <action application="set" data="AT_Ab=-1"/>
-      <action application="set" data="AT_AMOUNT=1"/>
-      <action application="set" data="AT_SMOOTH=0"/>
-      <action application="set" data="AT_SHIFT=0"/>
-      <action application="set" data="AT_OUTSCALE=0"/>
-      <action application="set" data="AT_LFODEPTH=0"/>
-      <action application="set" data="AT_LFORATE=5"/>
-      <action application="set" data="AT_LFOSHAPE=0"/>
-      <action application="set" data="AT_LFOSYMM=0"/>
-      <action application="set" data="AT_LFOQUANT=0"/>
-      <action application="set" data="AT_FCORR=0"/>
-      <action application="set" data="AT_FWARP=0"/>
-      <action application="set" data="AT_MIX=1"/>
-      -->
-
-
-      <action application="set" data="AT_TUNE=440"/>
-      <action application="set" data="AT_FIXED=0"/>
-      <action application="set" data="AT_PULL=0"/>
-
-      <action application="set" data="AT_AMOUNT=1"/>
-      <action application="set" data="AT_SMOOTH=0"/>
-      <action application="set" data="AT_SHIFT=1"/>
-      <action application="set" data="AT_OUTSCALE=0"/>
-      <action application="set" data="AT_LFODEPTH=0"/>
-      <action application="set" data="AT_LFORATE=5"/>
-      <action application="set" data="AT_LFOSHAPE=0"/>
-      <action application="set" data="AT_LFOSYMM=0"/>
-      <action application="set" data="AT_LFOQUANT=0"/>
-      <action application="set" data="AT_FCORR=0"/>
-      <action application="set" data="AT_FWARP=0"/>
-      <action application="set" data="AT_MIX=1"/>
-
-      <!-- you have to download the ladspa package and the desired plugins from their desired site -->
-
-
-      <action application="set"><![CDATA[ladspa_params=${AT_TUNE} ${AT_FIXED} ${AT_PULL} ${AT_EPENT2} ${AT_AMOUNT} ${AT_SMOOTH} ${AT_SHIFT} ${AT_OUTSCALE} ${AT_LFODEPTH} ${AT_LFORATE} ${AT_LFOSHAPE} ${AT_LFOSYMM} ${AT_LFOQUANT} ${AT_FCORR} ${AT_FWARP} ${AT_MIX}]]></action>
-      
-      <action application="ladspa_run" data="r|autotalent||${ladspa_params}"/>
-      <action application="ladspa_run" data="r|tap_chorusflanger||"/>
-      <action application="ladspa_run" data="r|phasers_1217.so|autoPhaser|"/>
-      <action application="bridge" data="sofia/internal/888@conference.freeswitch.org"/>
-
-      </condition> 
-  </extension> 
-
-</include>
diff --git a/conf/vanilla/freeswitch.xml b/conf/vanilla/freeswitch.xml
index dc66fca170..35f9c6bbb9 100644
--- a/conf/vanilla/freeswitch.xml
+++ b/conf/vanilla/freeswitch.xml
@@ -9,11 +9,11 @@
 
     Before you start to modify this default please visit this wiki page:
 
-    http://wiki.freeswitch.org/wiki/Getting_Started_Guide#Some_stuff_to_try_out.21
+    https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Configuration/Default-Configuration_6587388/#6-configuration-files
 
     If all else fails you can read our FAQ located at:
 
-    http://wiki.freeswitch.org/wiki/FreeSwitch_FAQ
+    https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Miscellaneous/FAQ/
 
     NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
 -->
diff --git a/conf/vanilla/vars.xml b/conf/vanilla/vars.xml
index 8948d179cc..54a15a2534 100644
--- a/conf/vanilla/vars.xml
+++ b/conf/vanilla/vars.xml
@@ -205,14 +205,6 @@
        G723             - G723.1 in passthru mode. (mod_g723_1)
        AMR              - AMR in passthru mode. (mod_amr)
 
-       These are the passthru video codecs: (mod_h26x)
-
-       H261             - H.261 Video
-       H263             - H.263 Video
-       H263-1998        - H.263-1998 Video
-       H263-2000        - H.263-2000 Video
-       H264             - H.264 Video
-
        RTP Dynamic Payload Numbers currently used in FreeSWITCH and their purpose.
 
        96  - AMR
diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
index 7ca19e49e8..7474353205
--- a/configure.ac
+++ b/configure.ac
@@ -3,10 +3,10 @@
 
 # Must change all of the below together
 # For a release, set revision for that tagged release as well and uncomment
-AC_INIT([freeswitch], [1.10.10-dev], bugs@freeswitch.org)
+AC_INIT([freeswitch], [1.10.13-dev], bugs@freeswitch.org)
 AC_SUBST(SWITCH_VERSION_MAJOR, [1])
 AC_SUBST(SWITCH_VERSION_MINOR, [10])
-AC_SUBST(SWITCH_VERSION_MICRO, [10-dev])
+AC_SUBST(SWITCH_VERSION_MICRO, [13-dev])
 AC_SUBST(SWITCH_VERSION_REVISION, [])
 AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
 
@@ -582,7 +582,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS)
 AC_SUBST(SYS_XMLRPC_LDFLAGS)
 AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
 
-for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
+for luaversion in luajit lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
   PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no])
   if test ${have_lua} = yes; then
     break
@@ -716,7 +716,7 @@ PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.0],[
     AC_MSG_ERROR([no usable spandsp; please install spandsp3 devel package or equivalent])
 ])
 
-PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.14],[
+PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.17],[
   AM_CONDITIONAL([HAVE_SOFIA_SIP],[true])],[
     AC_MSG_ERROR([no usable sofia-sip; please install sofia-sip-ua devel package or equivalent])
 ])
@@ -740,6 +740,8 @@ case "$host" in
         APR_REMOVEFROM(SWITCH_AM_CFLAGS, -fPIC)
         APR_ADDTO(CPPFLAGS, -I/usr/local/opt/openssl/include)
         APR_ADDTO(LDFLAGS, -L/usr/local/opt/openssl/lib)
+        APR_ADDTO(CPPFLAGS, -I/opt/homebrew/include)
+        APR_ADDTO(LDFLAGS, -L/opt/homebrew/lib)
         if test "x$enable_core_odbc_support" != "xno"; then
 	   APR_ADDTO([PLATFORM_CORE_LDFLAGS], [--framework CoreFoundation])
 	fi
@@ -838,6 +840,8 @@ AM_CONDITIONAL([SYSTEM_APR],[test "${use_system_apr}" = "yes"])
 
 save_LIBS="$LIBS"
 LIBS=
+
+AC_CHECK_HEADERS([jpeglib.h])
 AC_CHECK_LIB(jpeg, jpeg_std_error,, AC_MSG_ERROR([no usable libjpeg; please install libjpeg devel package or equivalent]))
 
 AC_CHECK_LIB(jbig, jbg_enc_out, have_libjbig=yes, have_libjbig=no)
@@ -1079,8 +1083,8 @@ if test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
 fi
 
 # Tested and fixed lot of modules, but some are untested.  Will be added back when the core team decide it ready
-# Untested modules : mod_osp mod_soundtouch mod_sangoma_codec mod_opal mod_h323 mod_khomp 
-#                    mod_cepstral mod_erlang_event mod_snmp mod_perl mod_java mod_managed
+# Untested modules : mod_osp mod_opal mod_h323
+#                    mod_erlang_event mod_snmp mod_perl mod_java mod_managed
 #
 #saved_CFLAGS="$CFLAGS"
 #AC_CACHE_CHECK([whether compiler supports -Wunused-but-set-variable], [ac_cv_gcc_unused_but_set_variable], [
@@ -1261,8 +1265,9 @@ case $host in
         path_push_unique PKG_CONFIG_PATH /usr/local/opt/curl/lib/pkgconfig
         path_push_unique PKG_CONFIG_PATH /usr/local/opt/sqlite/lib/pkgconfig/
         path_push_unique PKG_CONFIG_PATH /usr/local/opt/ldns/lib/pkgconfig/
-        path_push_unique PKG_CONFIG_PATH /usr/local/opt/portaudio/lib/pkgconfig/
         path_push_unique PKG_CONFIG_PATH /usr/local/opt/ffmpeg/lib/pkgconfig/
+        path_push_unique PKG_CONFIG_PATH /opt/homebrew/lib/pkgconfig/
+        path_push_unique PKG_CONFIG_PATH /opt/homebrew/opt/sqlite/lib/pkgconfig/
        ;;
 esac
 
@@ -1328,9 +1333,6 @@ PKG_CHECK_MODULES([SPEEX], [speex >= 1.2rc1 speexdsp >= 1.2rc1])
 PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1.4],[
   AM_CONDITIONAL([HAVE_YAML],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_YAML],[false])])
-PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0 >= 19],[
-  AM_CONDITIONAL([HAVE_PORTAUDIO],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_PORTAUDIO],[false])])
 PKG_CHECK_MODULES([LDNS], [libldns-fs >= 1.6.6],[
   AM_CONDITIONAL([HAVE_LDNS],[true])],[
 PKG_CHECK_MODULES([LDNS], [libldns >= 1.6.6],[
@@ -1352,7 +1354,21 @@ PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.16.0],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])])
 
 PKG_CHECK_MODULES([SHOUT], [shout >= 2.2.2],[
-  AM_CONDITIONAL([HAVE_SHOUT],[true])],[
+  AM_CONDITIONAL([HAVE_SHOUT],[true])
+  SHOUT_VERSION="`$PKG_CONFIG --modversion shout`"
+  SHOUT_MAJOR_VERSION="`echo $SHOUT_VERSION | cut -d. -f1`"
+  SHOUT_MINOR_VERSION="`echo $SHOUT_VERSION | cut -d. -f2`"
+  SHOUT_PATCH_VERSION="`echo $SHOUT_VERSION | cut -d. -f3`"
+  test -n "$SHOUT_PATCH_VERSION" || SHOUT_PATCH_VERSION=0
+  AC_MSG_NOTICE([SHOUT version: $SHOUT_VERSION])
+  AC_MSG_NOTICE([SHOUT major version: $SHOUT_MAJOR_VERSION])
+  AC_MSG_NOTICE([SHOUT minor version: $SHOUT_MINOR_VERSION])
+  AC_MSG_NOTICE([SHOUT patch version: $SHOUT_PATCH_VERSION])
+  AC_SUBST([SHOUT_VERSION])
+  AC_SUBST([SHOUT_MAJOR_VERSION])
+  AC_SUBST([SHOUT_MINOR_VERSION])
+  AC_SUBST([SHOUT_PATCH_VERSION])
+  ],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SHOUT],[false])])
 
 mp3lame=false
@@ -1459,10 +1475,6 @@ PKG_CHECK_MODULES([OPUS], [opus >= 1.1],[
   AM_CONDITIONAL([HAVE_OPUS],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPUS],[false])])
 
-PKG_CHECK_MODULES([SOUNDTOUCH], [soundtouch >= 1.7.0],[
-  AM_CONDITIONAL([HAVE_SOUNDTOUCH],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SOUNDTOUCH],[false])])
-
 flite="true"
 PKG_CHECK_MODULES([FLITE], [flite >= 2],[],[
   AC_CHECK_LIB([flite], [flite_init],[
@@ -1518,26 +1530,32 @@ PKG_CHECK_MODULES([V8FS_STATIC], [v8-6.1_static >= 6.1.298],[
   ])
 ])
 
-PKG_CHECK_MODULES([KS], [libks >= 1.8.2],[
+PKG_CHECK_MODULES([KS], [libks2 >= 2.0.0],[
   AM_CONDITIONAL([HAVE_KS],[true])],[
-    if module_enabled mod_verto; then
-      AC_MSG_ERROR([You need to either install libks or disable mod_verto in modules.conf])
-    else
-      if module_enabled mod_signalwire; then
-        AC_MSG_ERROR([You need to either install libks or disable mod_signalwire in modules.conf])
+  PKG_CHECK_MODULES([KS], [libks >= 1.8.2],[
+    AM_CONDITIONAL([HAVE_KS],[true])],[
+      if module_enabled mod_verto; then
+        AC_MSG_ERROR([You need to either install libks2 or libks or disable mod_verto in modules.conf])
       else
-        AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])
+        if module_enabled mod_signalwire; then
+          AC_MSG_ERROR([You need to either install libks2 or libks or disable mod_signalwire in modules.conf])
+        else
+          AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])
+        fi
       fi
-    fi
+  ])
 ])
 
-PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
+PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client2 >= 2.0.0],[
   AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
-    if module_enabled mod_signalwire; then
-      AC_MSG_ERROR([You need to either install signalwire-client-c or disable mod_signalwire in modules.conf])
-    else
-      AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
-    fi
+  PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
+    AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
+      if module_enabled mod_signalwire; then
+        AC_MSG_ERROR([You need to either install signalwire-client-c2 or signalwire-client-c or disable mod_signalwire in modules.conf])
+      else
+        AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
+      fi
+  ])
 ])
 
 PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[
@@ -2072,7 +2090,6 @@ AC_CONFIG_FILES([Makefile
 		tests/unit/Makefile
 		src/Makefile
 		src/mod/Makefile
-		src/mod/applications/mod_abstraction/Makefile
 		src/mod/applications/mod_avmd/Makefile
 		src/mod/applications/mod_bert/Makefile
 		src/mod/applications/mod_blacklist/Makefile
@@ -2099,39 +2116,28 @@ AC_CONFIG_FILES([Makefile
 		src/mod/applications/mod_hiredis/Makefile
 		src/mod/applications/mod_httapi/Makefile
 		src/mod/applications/mod_http_cache/Makefile
-		src/mod/applications/mod_ladspa/Makefile
 		src/mod/applications/mod_lcr/Makefile
 		src/mod/applications/mod_limit/Makefile
 		src/mod/applications/mod_memcache/Makefile
 		src/mod/applications/mod_mongo/Makefile
-		src/mod/applications/mod_mp4/Makefile
-		src/mod/applications/mod_mp4v2/Makefile
 		src/mod/applications/mod_nibblebill/Makefile
 		src/mod/applications/mod_oreka/Makefile
 		src/mod/applications/mod_osp/Makefile
 		src/mod/applications/mod_prefix/Makefile
-		src/mod/applications/mod_rad_auth/Makefile
 		src/mod/applications/mod_random/Makefile
 		src/mod/applications/mod_redis/Makefile
-		src/mod/applications/mod_rss/Makefile
 		src/mod/applications/mod_skel/Makefile
 		src/mod/applications/mod_signalwire/Makefile
 		src/mod/applications/mod_sms/Makefile
-		src/mod/applications/mod_sms_flowroute/Makefile
 		src/mod/applications/mod_snapshot/Makefile
-		src/mod/applications/mod_snom/Makefile
-		src/mod/applications/mod_sonar/Makefile
-		src/mod/applications/mod_soundtouch/Makefile
 		src/mod/applications/mod_spandsp/Makefile
 		src/mod/applications/mod_spy/Makefile
-		src/mod/applications/mod_stress/Makefile
 		src/mod/applications/mod_test/Makefile
 		src/mod/applications/mod_translate/Makefile
 		src/mod/applications/mod_valet_parking/Makefile
 		src/mod/applications/mod_vmd/Makefile
 		src/mod/applications/mod_voicemail/Makefile
 		src/mod/applications/mod_voicemail_ivr/Makefile
-		src/mod/asr_tts/mod_cepstral/Makefile
 		src/mod/asr_tts/mod_flite/Makefile
 		src/mod/asr_tts/mod_pocketsphinx/Makefile
 		src/mod/asr_tts/mod_tts_commandline/Makefile
@@ -2142,16 +2148,11 @@ AC_CONFIG_FILES([Makefile
 		src/mod/codecs/mod_clearmode/Makefile
 		src/mod/codecs/mod_codec2/Makefile
 		src/mod/codecs/mod_com_g729/Makefile
-		src/mod/codecs/mod_dahdi_codec/Makefile
 		src/mod/codecs/mod_g723_1/Makefile
 		src/mod/codecs/mod_g729/Makefile
-		src/mod/codecs/mod_h26x/Makefile
 		src/mod/codecs/mod_ilbc/Makefile
-		src/mod/codecs/mod_isac/Makefile
-		src/mod/codecs/mod_mp4v/Makefile
 		src/mod/codecs/mod_opus/Makefile
 		src/mod/codecs/mod_openh264/Makefile
-		src/mod/codecs/mod_sangoma_codec/Makefile
 		src/mod/codecs/mod_silk/Makefile
 		src/mod/codecs/mod_siren/Makefile
 		src/mod/codecs/mod_skel_codec/Makefile
@@ -2163,17 +2164,13 @@ AC_CONFIG_FILES([Makefile
 		src/mod/dialplans/mod_dialplan_xml/Makefile
 		src/mod/directories/mod_ldap/Makefile
 		src/mod/endpoints/mod_alsa/Makefile
-		src/mod/endpoints/mod_gsmopen/Makefile
 		src/mod/endpoints/mod_h323/Makefile
-		src/mod/endpoints/mod_khomp/Makefile
 		src/mod/endpoints/mod_loopback/Makefile
 		src/mod/endpoints/mod_opal/Makefile
-		src/mod/endpoints/mod_portaudio/Makefile
 		src/mod/endpoints/mod_reference/Makefile
 		src/mod/endpoints/mod_rtmp/Makefile
 		src/mod/endpoints/mod_skinny/Makefile
 		src/mod/endpoints/mod_sofia/Makefile
-		src/mod/endpoints/mod_unicall/Makefile
 		src/mod/endpoints/mod_rtc/Makefile
 		src/mod/endpoints/mod_verto/Makefile
 		src/mod/event_handlers/mod_amqp/Makefile
@@ -2188,13 +2185,9 @@ AC_CONFIG_FILES([Makefile
 		src/mod/event_handlers/mod_fail2ban/Makefile
 		src/mod/event_handlers/mod_format_cdr/Makefile
 		src/mod/event_handlers/mod_json_cdr/Makefile
-		src/mod/event_handlers/mod_kazoo/Makefile
-		src/mod/event_handlers/mod_radius_cdr/Makefile
 		src/mod/event_handlers/mod_odbc_cdr/Makefile
-		src/mod/event_handlers/mod_rayo/Makefile
 		src/mod/event_handlers/mod_smpp/Makefile
 		src/mod/event_handlers/mod_snmp/Makefile
-		src/mod/event_handlers/mod_event_zmq/Makefile
 		src/mod/formats/mod_imagick/Makefile
 		src/mod/formats/mod_local_stream/Makefile
 		src/mod/formats/mod_native_file/Makefile
@@ -2203,10 +2196,8 @@ AC_CONFIG_FILES([Makefile
 		src/mod/formats/mod_shell_stream/Makefile
 		src/mod/formats/mod_shout/Makefile
 		src/mod/formats/mod_sndfile/Makefile
-		src/mod/formats/mod_ssml/Makefile
 		src/mod/formats/mod_tone_stream/Makefile
 		src/mod/formats/mod_vlc/Makefile
-		src/mod/formats/mod_portaudio_stream/Makefile
 		src/mod/languages/mod_java/Makefile
 		src/mod/languages/mod_lua/Makefile
 		src/mod/languages/mod_managed/Makefile
@@ -2220,7 +2211,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/loggers/mod_graylog2/Makefile
 		src/mod/loggers/mod_logfile/Makefile
 		src/mod/loggers/mod_syslog/Makefile
-		src/mod/loggers/mod_raven/Makefile
 		src/mod/say/mod_say_de/Makefile
 		src/mod/say/mod_say_en/Makefile
 		src/mod/say/mod_say_es/Makefile
@@ -2244,7 +2234,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/xml_int/mod_xml_cdr/Makefile
 		src/mod/xml_int/mod_xml_curl/Makefile
 		src/mod/xml_int/mod_xml_ldap/Makefile
-		src/mod/xml_int/mod_xml_radius/Makefile
 		src/mod/xml_int/mod_xml_rpc/Makefile
 		src/mod/xml_int/mod_xml_scgi/Makefile
 		src/mod/applications/mod_av/Makefile
@@ -2320,7 +2309,6 @@ AC_CONFIG_SUBDIRS([libs/srtp])
 if test "$use_system_apr" != "yes"; then
    AC_CONFIG_SUBDIRS([libs/apr])
 fi
-AC_CONFIG_SUBDIRS([libs/iksemel])
 
 case $host in
    *-openbsd*|*-netbsd*)
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index e3f0b1b9db..ce5adea315 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -29,48 +29,42 @@ conf_dir="../conf"
 lang_dir="../conf/vanilla/lang"
 fs_description="FreeSWITCH is a scalable open source cross-platform telephony platform designed to route and interconnect popular communication protocols using audio, video, text or any other form of media."
 mod_build_depends="." mod_depends="." mod_recommends="." mod_suggests="."
-supported_debian_distros="wheezy jessie stretch buster bullseye sid"
+supported_debian_distros="wheezy jessie stretch buster bullseye bookworm sid"
 supported_ubuntu_distros="trusty utopic xenial"
 supported_distros="$supported_debian_distros $supported_ubuntu_distros"
 avoid_mods=(
-  applications/mod_sms_flowroute
   applications/mod_limit
   applications/mod_mongo
-  applications/mod_mp4
-  applications/mod_mp4v2
   applications/mod_osp
-  applications/mod_rad_auth
   applications/mod_skel
   applications/mod_cluechoo
-  asr_tts/mod_cepstral
   codecs/mod_com_g729
   codecs/mod_openh264
   codecs/mod_siren
-  codecs/mod_sangoma_codec
   codecs/mod_skel_codec
-  endpoints/mod_gsmopen
   endpoints/mod_h323
-  endpoints/mod_khomp
   endpoints/mod_opal
   endpoints/mod_reference
-  endpoints/mod_skypopen
-  endpoints/mod_unicall
   event_handlers/mod_smpp
-  event_handlers/mod_event_zmq
   formats/mod_webm
   sdk/autotools
   xml_int/mod_xml_ldap
-  xml_int/mod_xml_radius
 )
 avoid_mods_armhf=(
   languages/mod_v8
 )
+avoid_mods_arm64=(
+  languages/mod_v8
+)
 avoid_mods_sid=(
   directories/mod_ldap
 )
 avoid_mods_jessie=(
   directories/mod_ldap
 )
+avoid_mods_bookworm=(
+  languages/mod_python
+)
 avoid_mods_wheezy=(
   event_handlers/mod_amqp
   languages/mod_java
@@ -79,23 +73,18 @@ avoid_mods_wheezy=(
   applications/mod_cv
   applications/mod_hiredis
   formats/mod_shout
-  applications/mod_sonar
-  applications/mod_soundtouch
   formats/mod_vlc
 )
 avoid_mods_trusty=(
   event_handlers/mod_amqp
-  loggers/mod_raven
 )
 avoid_mods_utopic=(
   directories/mod_ldap
-  loggers/mod_raven
 )
 avoid_mods_xenial=(
   event_handlers/mod_ldap
   event_handlers/mod_amqp
   asr_tts/mod_flite
-  loggers/mod_raven
 )
 manual_pkgs=(
 freeswitch-all
@@ -325,14 +314,14 @@ Build-Depends:
 # configure options
  libssl1.0-dev | libssl-dev, unixodbc-dev, libpq-dev,
  libncurses5-dev, libjpeg62-turbo-dev | libjpeg-turbo8-dev | libjpeg62-dev | libjpeg8-dev,
- python-dev | python-dev-is-python2, python3-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
+ python-dev | python-dev-is-python2 | python-dev-is-python3, python3-dev, python-all-dev | python3-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
 # documentation
  doxygen,
 # for APR (not essential for build)
  uuid-dev, libexpat1-dev, libgdbm-dev, libdb-dev,
 # used by many modules
  libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
- bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.14),
+ bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.17),
  libspandsp3-dev,
 # used to format the private freeswitch apt-repo key properly
  gnupg,
@@ -349,7 +338,7 @@ EOF
 print_core_control () {
 cat <<EOF
 Package: freeswitch-all
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: freeswitch-meta-all (= \${binary:Version}), freeswitch-meta-all-dbg (= \${binary:Version})
 Conflicts: freeswitch-all (<= 1.6.7)
 Description: Cross-Platform Scalable Multi-Protocol Soft Switch
@@ -358,7 +347,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  This is a package which depends on all packaged FreeSWITCH modules.
 
 Package: freeswitch
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${shlibs:Depends}, \${perl:Depends}, \${misc:Depends},
  libfreeswitch1 (= \${binary:Version})
 Recommends:
@@ -370,8 +359,8 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  This package contains the FreeSWITCH core.
 
 Package: libfreeswitch1
-Architecture: amd64 armhf
-Depends: \${shlibs:Depends}, \${misc:Depends}, libsofia-sip-ua0 (>= 1.13.14)
+Architecture: amd64 armhf arm64
+Depends: \${shlibs:Depends}, \${misc:Depends}, libsofia-sip-ua0 (>= 1.13.17)
 Recommends:
 Suggests: libfreeswitch1-dbg
 Conflicts: freeswitch-all (<= 1.6.7)
@@ -382,7 +371,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
 
 Package: python-esl
 Section: python
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${shlibs:Depends}, \${misc:Depends}, \${python:Depends}
 Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  $(debian_wrap "${fs_description}")
@@ -391,7 +380,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
 
 Package: libesl-perl
 Section: perl
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${shlibs:Depends}, \${misc:Depends}, \${perl:Depends}
 Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  $(debian_wrap "${fs_description}")
@@ -399,7 +388,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  This package contains the Perl binding for FreeSWITCH Event Socket Library (ESL).
 
 Package: freeswitch-meta-bare
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version})
 Recommends:
  freeswitch-doc (= \${binary:Version}),
@@ -417,7 +406,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  bare FreeSWITCH install.
 
 Package: freeswitch-meta-default
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-commands (= \${binary:Version}),
  freeswitch-mod-conference (= \${binary:Version}),
@@ -459,7 +448,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  reasonably basic FreeSWITCH install.
 
 Package: freeswitch-meta-vanilla
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-init,
  freeswitch-mod-console (= \${binary:Version}),
@@ -488,7 +477,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-g723-1 (= \${binary:Version}),
  freeswitch-mod-g729 (= \${binary:Version}),
  freeswitch-mod-amr (= \${binary:Version}),
- freeswitch-mod-h26x (= \${binary:Version}),
  freeswitch-mod-sndfile (= \${binary:Version}),
  freeswitch-mod-native-file (= \${binary:Version}),
  freeswitch-mod-local-stream (= \${binary:Version}),
@@ -508,7 +496,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  running the FreeSWITCH vanilla example configuration.
 
 Package: freeswitch-meta-sorbet
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
 Recommends:
  freeswitch-init,
@@ -517,7 +505,6 @@ Recommends:
  freeswitch-meta-codecs (= \${binary:Version}),
  freeswitch-music,
  freeswitch-sounds,
- freeswitch-mod-abstraction (= \${binary:Version}),
  freeswitch-mod-avmd (= \${binary:Version}),
  freeswitch-mod-blacklist (= \${binary:Version}),
  freeswitch-mod-callcenter (= \${binary:Version}),
@@ -545,15 +532,10 @@ Recommends:
  freeswitch-mod-oreka (= \${binary:Version}),
  freeswitch-mod-pgsql (= \${binary:Version}),
  freeswitch-mod-redis (= \${binary:Version}),
- freeswitch-mod-rss (= \${binary:Version}),
  freeswitch-mod-sms (= \${binary:Version}),
  freeswitch-mod-snapshot (= \${binary:Version}),
- freeswitch-mod-snom (= \${binary:Version}),
- freeswitch-mod-sonar (= \${binary:Version}),
- freeswitch-mod-soundtouch (= \${binary:Version}),
  freeswitch-mod-spandsp (= \${binary:Version}),
  freeswitch-mod-spy (= \${binary:Version}),
- freeswitch-mod-stress (= \${binary:Version}),
  freeswitch-mod-valet-parking (= \${binary:Version}),
  freeswitch-mod-vmd (= \${binary:Version}),
  freeswitch-mod-voicemail (= \${binary:Version}),
@@ -591,7 +573,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  modules except a few which aren't recommended.
 
 Package: freeswitch-meta-all
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-init,
  freeswitch-lang (= \${binary:Version}),
@@ -602,7 +584,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-meta-mod-say (= \${binary:Version}),
  freeswitch-music,
  freeswitch-sounds,
- freeswitch-mod-abstraction (= \${binary:Version}),
  freeswitch-mod-avmd (= \${binary:Version}),
  freeswitch-mod-av (= \${binary:Version}),
  freeswitch-mod-blacklist (= \${binary:Version}),
@@ -634,17 +615,12 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-pgsql (= \${binary:Version}),
  freeswitch-mod-png (= \${binary:Version}),
  freeswitch-mod-redis (= \${binary:Version}),
- freeswitch-mod-rss (= \${binary:Version}),
  freeswitch-mod-signalwire (= \${binary:Version}),
  freeswitch-mod-shout (= \${binary:Version}),
  freeswitch-mod-sms (= \${binary:Version}),
  freeswitch-mod-snapshot (= \${binary:Version}),
- freeswitch-mod-snom (= \${binary:Version}),
- freeswitch-mod-sonar (= \${binary:Version}),
- freeswitch-mod-soundtouch (= \${binary:Version}),
  freeswitch-mod-spandsp (= \${binary:Version}),
  freeswitch-mod-spy (= \${binary:Version}),
- freeswitch-mod-stress (= \${binary:Version}),
  freeswitch-mod-translate (= \${binary:Version}),
  freeswitch-mod-valet-parking (= \${binary:Version}),
  freeswitch-mod-video-filter (= \${binary:Version}),
@@ -657,7 +633,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-dialplan-directory (= \${binary:Version}),
  freeswitch-mod-dialplan-xml (= \${binary:Version}),
  freeswitch-mod-loopback (= \${binary:Version}),
- freeswitch-mod-portaudio (= \${binary:Version}),
  freeswitch-mod-rtc (= \${binary:Version}),
  freeswitch-mod-rtmp (= \${binary:Version}),
  freeswitch-mod-skinny (= \${binary:Version}),
@@ -670,11 +645,9 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-event-multicast (= \${binary:Version}),
  freeswitch-mod-event-socket (= \${binary:Version}),
  freeswitch-mod-json-cdr (= \${binary:Version}),
- freeswitch-mod-kazoo (= \${binary:Version}),
  freeswitch-mod-snmp (= \${binary:Version}),
  freeswitch-mod-local-stream (= \${binary:Version}),
  freeswitch-mod-native-file (= \${binary:Version}),
- freeswitch-mod-portaudio-stream (= \${binary:Version}),
  freeswitch-mod-shell-stream (= \${binary:Version}),
  freeswitch-mod-sndfile (= \${binary:Version}),
  freeswitch-mod-tone-stream (= \${binary:Version}),
@@ -703,19 +676,15 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  FreeSWITCH modules.
 
 Package: freeswitch-meta-codecs
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-amr (= \${binary:Version}),
  freeswitch-mod-amrwb (= \${binary:Version}),
  freeswitch-mod-b64 (= \${binary:Version}),
  freeswitch-mod-bv (= \${binary:Version}),
  freeswitch-mod-codec2 (= \${binary:Version}),
- freeswitch-mod-dahdi-codec (= \${binary:Version}),
  freeswitch-mod-g723-1 (= \${binary:Version}),
  freeswitch-mod-g729 (= \${binary:Version}),
- freeswitch-mod-h26x (= \${binary:Version}),
- freeswitch-mod-isac (= \${binary:Version}),
- freeswitch-mod-mp4v (= \${binary:Version}),
  freeswitch-mod-opus (= \${binary:Version}),
  freeswitch-mod-silk (= \${binary:Version}),
  freeswitch-mod-spandsp (= \${binary:Version}),
@@ -730,19 +699,15 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  most FreeSWITCH codecs.
 
 Package: freeswitch-meta-codecs-dbg
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-amr-dbg (= \${binary:Version}),
  freeswitch-mod-amrwb-dbg (= \${binary:Version}),
  freeswitch-mod-b64-dbg (= \${binary:Version}),
  freeswitch-mod-bv-dbg (= \${binary:Version}),
  freeswitch-mod-codec2-dbg (= \${binary:Version}),
- freeswitch-mod-dahdi-codec-dbg (= \${binary:Version}),
  freeswitch-mod-g723-1-dbg (= \${binary:Version}),
  freeswitch-mod-g729-dbg (= \${binary:Version}),
- freeswitch-mod-h26x-dbg (= \${binary:Version}),
- freeswitch-mod-isac-dbg (= \${binary:Version}),
- freeswitch-mod-mp4v-dbg (= \${binary:Version}),
  freeswitch-mod-opus-dbg (= \${binary:Version}),
  freeswitch-mod-silk-dbg (= \${binary:Version}),
  freeswitch-mod-spandsp-dbg (= \${binary:Version}),
@@ -757,7 +722,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  most FreeSWITCH codecs.
 
 Package: freeswitch-meta-conf
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends},
  freeswitch-conf-curl (= \${binary:Version}),
  freeswitch-conf-insideout (= \${binary:Version}),
@@ -771,7 +736,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  examples for FreeSWITCH.
 
 Package: freeswitch-meta-lang
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends},
  freeswitch-lang-de (= \${binary:Version}),
  freeswitch-lang-en (= \${binary:Version}),
@@ -787,7 +752,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  FreeSWITCH.
 
 Package: freeswitch-meta-mod-say
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends},
  freeswitch-mod-say-de (= \${binary:Version}),
  freeswitch-mod-say-en (= \${binary:Version}),
@@ -812,7 +777,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  FreeSWITCH.
 
 Package: freeswitch-meta-mod-say-dbg
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends},
  freeswitch-mod-say-de-dbg (= \${binary:Version}),
  freeswitch-mod-say-en-dbg (= \${binary:Version}),
@@ -837,11 +802,10 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  FreeSWITCH.
 
 Package: freeswitch-meta-all-dbg
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-meta-codecs-dbg (= \${binary:Version}),
  freeswitch-meta-mod-say (= \${binary:Version}),
- freeswitch-mod-abstraction-dbg (= \${binary:Version}),
  freeswitch-mod-avmd-dbg (= \${binary:Version}),
  freeswitch-mod-av-dbg (= \${binary:Version}),
  freeswitch-mod-blacklist-dbg (= \${binary:Version}),
@@ -873,15 +837,10 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-pgsql-dbg (= \${binary:Version}),
  freeswitch-mod-png-dbg (= \${binary:Version}),
  freeswitch-mod-redis-dbg (= \${binary:Version}),
- freeswitch-mod-rss-dbg (= \${binary:Version}),
  freeswitch-mod-sms-dbg (= \${binary:Version}),
  freeswitch-mod-snapshot-dbg (= \${binary:Version}),
- freeswitch-mod-snom-dbg (= \${binary:Version}),
- freeswitch-mod-sonar-dbg (= \${binary:Version}),
- freeswitch-mod-soundtouch-dbg (= \${binary:Version}),
  freeswitch-mod-spandsp-dbg (= \${binary:Version}),
  freeswitch-mod-spy-dbg (= \${binary:Version}),
- freeswitch-mod-stress-dbg (= \${binary:Version}),
  freeswitch-mod-translate-dbg (= \${binary:Version}),
  freeswitch-mod-valet-parking-dbg (= \${binary:Version}),
  freeswitch-mod-video-filter-dbg (= \${binary:Version}),
@@ -894,7 +853,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-dialplan-directory-dbg (= \${binary:Version}),
  freeswitch-mod-dialplan-xml-dbg (= \${binary:Version}),
  freeswitch-mod-loopback-dbg (= \${binary:Version}),
- freeswitch-mod-portaudio-dbg (= \${binary:Version}),
  freeswitch-mod-rtc-dbg (= \${binary:Version}),
  freeswitch-mod-rtmp-dbg (= \${binary:Version}),
  freeswitch-mod-skinny-dbg (= \${binary:Version}),
@@ -907,11 +865,9 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-event-multicast-dbg (= \${binary:Version}),
  freeswitch-mod-event-socket-dbg (= \${binary:Version}),
  freeswitch-mod-json-cdr-dbg (= \${binary:Version}),
- freeswitch-mod-kazoo-dbg (= \${binary:Version}),
  freeswitch-mod-snmp-dbg (= \${binary:Version}),
  freeswitch-mod-local-stream-dbg (= \${binary:Version}),
  freeswitch-mod-native-file-dbg (= \${binary:Version}),
- freeswitch-mod-portaudio-stream-dbg (= \${binary:Version}),
  freeswitch-mod-shell-stream-dbg (= \${binary:Version}),
  freeswitch-mod-sndfile-dbg (= \${binary:Version}),
  freeswitch-mod-tone-stream-dbg (= \${binary:Version}),
@@ -942,7 +898,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
 Package: freeswitch-all-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch-meta-all (= \${binary:Version}), freeswitch-meta-all-dbg (= \${binary:Version})
 Description: debugging symbols for FreeSWITCH
  $(debian_wrap "${fs_description}")
@@ -952,7 +908,7 @@ Description: debugging symbols for FreeSWITCH
 Package: freeswitch-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version})
 Description: debugging symbols for FreeSWITCH
  $(debian_wrap "${fs_description}")
@@ -962,7 +918,7 @@ Description: debugging symbols for FreeSWITCH
 Package: libfreeswitch1-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, libfreeswitch1 (= \${binary:Version})
 Description: debugging symbols for FreeSWITCH
  $(debian_wrap "${fs_description}")
@@ -971,7 +927,7 @@ Description: debugging symbols for FreeSWITCH
 
 Package: libfreeswitch-dev
 Section: libdevel
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, freeswitch
 Description: development libraries and header files for FreeSWITCH
  $(debian_wrap "${fs_description}")
@@ -980,7 +936,7 @@ Description: development libraries and header files for FreeSWITCH
 
 Package: freeswitch-doc
 Section: doc
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}
 Description: documentation for FreeSWITCH
  $(debian_wrap "${fs_description}")
@@ -993,7 +949,7 @@ Description: documentation for FreeSWITCH
 ## languages
 
 Package: freeswitch-lang
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends},
  freeswitch-lang-en (= \${binary:Version})
 Description: Language files for FreeSWITCH
@@ -1005,7 +961,7 @@ Description: Language files for FreeSWITCH
 ## timezones
 
 Package: freeswitch-timezones
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}
 Description: Timezone files for FreeSWITCH
  $(debian_wrap "${fs_description}")
@@ -1019,7 +975,7 @@ EOF
 if [ ${use_sysvinit} = "true" ]; then
     cat <<EOF
 Package: freeswitch-sysvinit
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, lsb-base (>= 3.0-6), sysvinit | sysvinit-utils
 Conflicts: freeswitch-init
 Provides: freeswitch-init
@@ -1032,7 +988,7 @@ EOF
 else
     cat <<EOF
 Package: freeswitch-systemd
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}, systemd
 Conflicts: freeswitch-init, freeswitch-all (<= 1.6.7)
 Provides: freeswitch-init
@@ -1050,7 +1006,7 @@ print_mod_control () {
   cat <<EOF
 Package: freeswitch-${module_name//_/-}
 Section: ${m_section}
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 $(debian_wrap "Depends: \${shlibs:Depends}, \${misc:Depends}, libfreeswitch1 (= \${binary:Version}), ${depends}")
 $(debian_wrap "Recommends: ${recommends}")
 $(debian_wrap "Suggests: freeswitch-${module_name//_/-}-dbg, ${suggests}")
@@ -1065,7 +1021,7 @@ Description: ${description} for FreeSWITCH
 Package: freeswitch-${module_name//_/-}-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends},
  freeswitch-${module_name//_/-} (= \${binary:Version})
 Description: ${description} for FreeSWITCH (debug)
@@ -1130,7 +1086,7 @@ print_conf_overrides () {
 print_conf_control () {
   cat <<EOF
 Package: freeswitch-conf-${conf//_/-}
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}
 Conflicts: freeswitch-all (<= 1.6.7)
 Description: FreeSWITCH ${conf} configuration
@@ -1164,7 +1120,7 @@ print_lang_control () {
   esac
   cat <<EOF
 Package: freeswitch-lang-${lang//_/-}
-Architecture: amd64 armhf
+Architecture: amd64 armhf arm64
 Depends: \${misc:Depends}
 Recommends: freeswitch-sounds-${lang}
 Conflicts: freeswitch-all (<= 1.6.7)
diff --git a/debian/control-modules b/debian/control-modules
old mode 100644
new mode 100755
index b9d7a05933..101fab9e08
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -3,15 +3,11 @@
 
 ## mod/applications
 
-Module: applications/mod_abstraction
-Description: Abstraction layer for APIs
- This module provides a way to create new API functions via regex
- rewriting.
-
 Module: applications/mod_av
 Description: mod_av
  Adds mod_av.
 Build-Depends: libavformat-dev, libswscale-dev, libavresample-dev
+Build-Depends-Bookworm: libavformat-dev, libswscale-dev, libswresample-dev
 
 Module: applications/mod_avmd
 Description: Advanced voicemail detection
@@ -129,12 +125,6 @@ Description: HTTP GET with caching
  This module provides an API for making HTTP GET requests where the
  result is cached.
 
-Module: applications/mod_ladspa
-Description: LADSPA
- This module provides an API for accessing LADSPA plugins.
-Build-Depends: ladspa-sdk
-Suggests: tap-plugins, swh-plugins, autotalent
-
 Module: applications/mod_lcr
 Description: LCR
  This module adds a facility for least-cost routing.
@@ -154,16 +144,6 @@ Description: MongoDB
  This module provides an interface to MongoDB.
 Build-Depends: libmongoc-dev
 
-Module: applications/mod_mp4
-Section: contrib/comm
-Description: MP4 video support
- This module adds support for MP4 video playback.
-Build-Depends: libmp4v2-dev
-
-Module: applications/mod_mp4v2
-Description: Adds mod_mp4v2
- Adds mod_mp4v2.
-
 Module: applications/mod_nibblebill
 Description: Nibblebill
  This module allows for real-time accounting of a cash balance and
@@ -184,10 +164,6 @@ Description: Longest prefix match search
  This module provides a data store with fast lookups by the longest
  prefix match (LPM) rule.
 
-Module: applications/mod_rad_auth
-Description: RADIUS AA
- This module implements RADIUS Authentication and Authorization.
-
 Module: applications/mod_random
 Description: Entropy extraction
  This module extracts entropy from FreeSWITCH and feeds it into
@@ -198,10 +174,6 @@ Description: Redis limit backend
  This module provides a mechanism to use Redis as a backend data
  store.
 
-Module: applications/mod_rss
-Description: RSS browser
- This module provides an RSS browser.
-
 Module: applications/mod_skel
 Description: Adds mod_skel
  Adds mod_skel.
@@ -209,7 +181,7 @@ Description: Adds mod_skel
 Module: applications/mod_signalwire
 Description: mod_signalwire
  Adds mod_signalwire.
-Build-Depends: libks, signalwire-client-c
+Build-Depends: libks2, signalwire-client-c2
 
 Module: applications/mod_sms
 Description: Astract SMS
@@ -221,20 +193,6 @@ Description: Snapshot
  This module can record a sliding window of audio and take snapshots
  to disk.
 
-Module: applications/mod_snom
-Description: SNOM specific features
- This module implements features specific to SNOM phones.
-
-Module: applications/mod_sonar
-Description: Sonar ping timer
- This module measures the latency on an audio link by sending audible
- audio sonar pings.
-
-Module: applications/mod_soundtouch
-Description: Soundtouch
- This module implements example media bugs.
-Build-Depends: libsoundtouch-dev
-
 Module: applications/mod_spandsp
 Description: SpanDSP
  This module implements spandsp fax, dsp, and codec functionality.
@@ -243,10 +201,6 @@ Module: applications/mod_spy
 Description: UserSpy
  This module adds the ability to monitor the audio of a channel.
 
-Module: applications/mod_stress
-Description: Voice stress detection
- This module attempts to detect voice stress on an audio channel.
-
 Module: applications/mod_translate
 Description: Number translation
  This module implements number translation.
@@ -274,10 +228,6 @@ Description: Voicemail IVR
 
 ## mod/asr_tts
 
-Module: asr_tts/mod_cepstral
-Description: mod_cepstral
- Adds mod_cepstral.
-
 Module: asr_tts/mod_flite
 Description: mod_flite
  Adds mod_flite.
@@ -320,10 +270,6 @@ Module: codecs/mod_com_g729
 Description: mod_com_g729
  Adds mod_com_g729.
 
-Module: codecs/mod_dahdi_codec
-Description: mod_dahdi_codec
- Adds mod_dahdi_codec.
-
 Module: codecs/mod_g723_1
 Description: mod_g723_1
  Adds mod_g723_1.
@@ -332,24 +278,12 @@ Module: codecs/mod_g729
 Description: mod_g729
  Adds mod_g729.
 
-Module: codecs/mod_h26x
-Description: mod_h26x
- Adds mod_h26x.
-
 Module: codecs/mod_ilbc
 Section: non-free/comm
 Description: mod_ilbc
  Adds mod_ilbc.
 Build-Depends: libilbc-dev
 
-Module: codecs/mod_isac
-Description: mod_isac
- Adds mod_isac.
-
-Module: codecs/mod_mp4v
-Description: mod_mp4v
- Adds mod_mp4v.
-
 Module: codecs/mod_openh264
 Description: Adds mod_openh264
  Adds mod_openh264.
@@ -359,11 +293,6 @@ Description: mod_opus
  Adds mod_opus.
 Build-Depends: libopus-dev
 
-Module: codecs/mod_sangoma_codec
-Description: mod_sangoma_codec
- Adds mod_sangoma_codec.
-Build-Depends: libsngtc-dev
-
 Module: codecs/mod_silk
 Description: mod_silk
  Adds mod_silk.
@@ -427,20 +356,11 @@ Description: mod_alsa
  Adds mod_alsa.
 Build-Depends: libasound2-dev
 
-Module: endpoints/mod_gsmopen
-Description: mod_gsmopen
- Adds mod_gsmopen.
-Build-Depends: libx11-dev
-
 Module: endpoints/mod_h323
 Description: mod_h323
  Adds mod_h323.
 Build-Depends: libopenh323-dev | libh323plus-dev, libpt-dev
 
-Module: endpoints/mod_khomp
-Description: mod_khomp
- Adds mod_khomp.
-
 Module: endpoints/mod_loopback
 Description: mod_loopback
  Adds mod_loopback.
@@ -450,11 +370,6 @@ Description: mod_opal
  Adds mod_opal.
 Build-Depends: libopal-dev
 
-Module: endpoints/mod_portaudio
-Description: mod_portaudio
- Adds mod_portaudio.
-Build-Depends: portaudio19-dev
-
 Module: endpoints/mod_reference
 Description: mod_reference
  Adds mod_reference.
@@ -475,16 +390,13 @@ Module: endpoints/mod_sofia
 Description: mod_sofia
  Adds mod_sofia.
 
-Module: endpoints/mod_unicall
-Description: mod_unicall
- Adds mod_unicall.
-
 Module: endpoints/mod_verto
 Description: Adds mod_verto.
  Adds mod_verto.
 Build-Depends: libperl-dev
 Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
 Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev
+Build-Depends-Bookworm: libperl-dev, libgdbm-compat-dev
 
 ## mod/event_handlers
 
@@ -528,10 +440,6 @@ Module: event_handlers/mod_event_test
 Description: mod_event_test
  Adds mod_event_test.
 
-Module: event_handlers/mod_event_zmq
-Description: mod_event_zmq
- Adds mod_event_zmq.
-
 Module: event_handlers/mod_format_cdr
 Description: mod_format_cdr
  Adds mod_format_cdr.
@@ -540,25 +448,10 @@ Module: event_handlers/mod_json_cdr
 Description: mod_json_cdr
  Adds mod_json_cdr.
 
-Module: event_handlers/mod_kazoo
-Description: mod_kazoo
- Adds mod_kazoo.
-Build-Depends: erlang-dev
-Depends: erlang
-
 Module: event_handlers/mod_odbc_cdr
 Description: mod_odbc_cdr
  Adds mod_odbc_cdr.
 
-Module: event_handlers/mod_radius_cdr
-Description: mod_radius_cdr
- Adds mod_radius_cdr.
-
-Module: event_handlers/mod_rayo
-Description: mod_rayo
- Adds mod_rayo.
-Depends: freeswitch-mod-ssml (= ${binary:Version})
-
 Module: event_handlers/mod_smpp
 Description: mod_snmp
  Adds mod_snmp.
@@ -587,11 +480,6 @@ Module: formats/mod_png
 Description: Adds mod_png
  Adds mod_png.
 
-Module: formats/mod_portaudio_stream
-Description: mod_portaudio_stream
- Adds mod_portaudio_stream.
-Build-Depends: portaudio19-dev
-
 Module: formats/mod_shell_stream
 Description: mod_shell_stream
  Adds mod_shell_stream.
@@ -608,10 +496,6 @@ Description: mod_sndfile
 Build-Depends: libsndfile1-dev, libflac-dev, libogg-dev,
  libvorbis-dev
 
-Module: formats/mod_ssml
-Description: mod_ssml
- Adds mod_ssml.
-
 Module: formats/mod_tone_stream
 Description: mod_tone_stream
  Adds mod_tone_stream.
@@ -647,6 +531,7 @@ Module: languages/mod_lua
 Description: mod_lua
  Adds mod_lua.
 Build-Depends: liblua5.2-dev | liblua5.1-dev
+Build-Depends-Bookworm: liblua5.3-dev | liblua5.2-dev | liblua5.1-dev
 
 Module: languages/mod_managed
 Description: mod_managed
@@ -659,6 +544,7 @@ Description: mod_perl
 Build-Depends: libperl-dev
 Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
 Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev
+Build-Depends-Bookworm: libperl-dev, libgdbm-compat-dev
 
 Module: languages/mod_python
 Description: mod_python
@@ -669,6 +555,7 @@ Module: languages/mod_python3
 Description: mod_python3
  Adds mod_python3.
 Build-Depends: python3-dev
+Build-Depends-Bookworm: python3-dev, python3-setuptools
 
 Module: languages/mod_v8
 Description: mod_v8
@@ -803,10 +690,6 @@ Description: mod_xml_ldap
  Adds mod_xml_ldap.
 Build-Depends: libldap2-dev, libsasl2-dev
 
-Module: xml_int/mod_xml_radius
-Description: mod_xml_radius
- Adds mod_xml_radius
-
 Module: xml_int/mod_xml_rpc
 Description: mod_xml_rpc
  Adds mod_xml_rpc.
diff --git a/debian/copyright b/debian/copyright
old mode 100644
new mode 100755
index 5a76744817..c39ceefb99
--- a/debian/copyright
+++ b/debian/copyright
@@ -1202,10 +1202,6 @@ Files: src/include/switch_cpp.h
 Copyright: 2007 Yossi Neiman <freeswitch@cartissolutions.com>
 License: MPL-1.1  (well, maybe -- it refers to a COPYING file, so probably docs/COPYING, in which case MPL-1.1)
 
-Files: libs/iksemel/*
-Copyright: 2000-2007 Gurer Ozen <madcat@e-kolay.net>
-License: LGPL-2.1
-
 Files: libs/apr*/*
 Copyright: 2000-2005 The Apache Software Foundation or its licensors
  1991-1992, RSA Data Security, Inc.
@@ -1313,11 +1309,6 @@ Copyright: 2009-2012 10gen Inc.
  2001 Unicode, Inc.
 License: Apache-2.0
 
-Files: src/mod/applications/mod_stress/FFTReal.h
- src/mod/applications/mod_stress/FFTReal.cpp
-Copyright: 1999 Laurent de Soras
-License: unclear
-
 Files: src/mod/loggers/mod_syslog/mod_syslog.c
 Copyright: 2005-2010, James Martelletti <james@nerdc0re.com>
 License: MPL-1.1
@@ -1330,10 +1321,6 @@ Files: src/mod/event_handlers/mod_cdr_mongodb/driver/src/md5.[ch]
 Copyright: 1999, 2000, 2002 Aladdin Enterprises.
 License: zlib/libpng
 
-Files: src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h
-Copyright: 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com>
-License: MPL-1.1
-
 Files: src/mod/say/mod_say_??/mod_say_??.c
  scripts/c/socket2me/socket2me.c
  src/mod/xml_int/mod_xml_scgi/xml_scgi_server.pl
@@ -1497,18 +1484,6 @@ Copyright: 2010 Ilnitskiy Mixim (max.h323@gmail.com)
  2010 Georgiewskiy Yuriy (bottleman@icf.org.ru)
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_khomp/*
-Copyright: 2007-2010 Khomp Ind. & Com.
-License: MPL-1.1 or LGPL-2.1+
-
-Files: src/mod/endpoints/mod_khomp/mod_khomp.cpp
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
-Files: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
-Copyright: 1998 Doug Rabson
-License: BSD-2-clause
-
 Files: src/mod/languages/mod_java/modjava.c
 Copyright: 2007, Damjan Jovanovic <d a m j a n d o t j o v a t g m a i l d o t c o m>
 License: MPL-1.1
@@ -1517,22 +1492,6 @@ Files: src/mod/languages/mod_managed/*
 Copyright: 2008, Michael Giagnocavo <mgg@giagnocavo.net>
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/*
- src/mod/languages/mod_lua/lua-mode.el
- libs/iksemel/ltmain.sh
-Copyright: 1995-2007 Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: src/mod/endpoints/mod_gsmopen/libctb-0.16/*
-Copyright: 2001-2010 Joachim Buermann
-License: wxWindows
-
-Files: src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/getopt.cpp
-Copyright: 2001 ?
-License: clueless and unacceptable
- FIXME -- this cannot go in Debian -- the license is stated as:
-  (I think Open Source)
-
 Files: src/mod/endpoints/mod_rtmp/libamf/src/types.[ch]
 Copyright: 2007, 2008 Marc Noirot <marc.noirot AT gmail.com>
 License: GPL-2+
@@ -1544,10 +1503,6 @@ Files: src/mod/endpoints/mod_rtmp/rtmp.c
 Copyright: 2011-2012, Barracuda Networks Inc.
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.[ch]
-Copyright: 2001-2006 Steve Underwood
-License: GPL-2
-
 Files: src/mod/endpoints/mod_skinny/*
  src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c
 Copyright: 2009-2010, Mathieu Parent <math.parent@gmail.com>
@@ -1557,15 +1512,6 @@ Files: src/mod/endpoints/mod_skinny/*.p[lm]
 Copyright: 2010, Mathieu Parent <math.parent@gmail.com>
 License: Perl
 
-Files: src/mod/endpoints/mod_portaudio/*
-Copyright: 1999-2000 Ross Bencina and Phil Burk
- 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MIT/X11 (BSD like)
-
-Files: src/mod/endpoints/mod_portaudio/mod_portaudio.c
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
 Files: src/mod/endpoints/mod_sofia/sip-dig.c
 Copyright: 2006 Nokia Corporation
 License: LGPL-2.1+
@@ -1606,20 +1552,6 @@ Files: libs/libcodec2/src/pack.c
 Copyright: 2010 Perens LLC <bruce@perens.com>
 License: GPL-3+
 
-Files: src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
- src/include/switch_profile.h
- src/switch_profile.c
-Copyright: 2009,2010, Sangoma Technologies
-License: BSD-3-clause
-
-Files: src/mod/codecs/mod_isac/*
-Copyright: 2011-2012 The WebRTC project authors
-License: BSD-3-clause
-
-Files: src/mod/codecs/mod_isac/mod_isac.c
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
 Files: libs/srtp/*
 Copyright: 2001-2006, Cisco Systems, Inc.
  2005 Ingate Systems AB
diff --git a/debian/license-reconcile.yml b/debian/license-reconcile.yml
index 22fdb40a19..d547556a3c 100644
--- a/debian/license-reconcile.yml
+++ b/debian/license-reconcile.yml
@@ -149,18 +149,6 @@ Rules:
    Matches: const\schar\s\*\scopyright\s;
    Copyright: 1999-2009 Erik de Castro Lopo <erikd@mega-nerd.com>
    Justification: prevent false-psitive copyright detection
-  -
-   Glob: src/mod/endpoints/mod_khomp/*
-   Matches: The\scontents\sof\sthis\sfile\sare\ssubject\sto\sthe\sMozilla\sPublic\sLicense\sVersion\s1.1
-   Matches: Alternatively,\sthe\scontents\sof\sthis\sfile\smay\sbe\sused\sunder\sthe\sterms\sof\sthe
-   Matches: GNU\sLesser\sGeneral\sPublic\sLicense\s2\.1.\slicense\s\(the\s.LGPL.\sLicense\),\sin\swhich
-   Matches: version\s2\.1\sof\sthe\sLicense,\sor\s\(at\syour\soption\)\sany\slater\sversion.
-   License: MPL-1.1 or LGPL-2.1+
-  -
-   Glob: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
-   Matches: Original\scopyright\sfollows[:]
-   Matches: Copyright\s\(c\)\s1998\sDoug\sRabson
-   Copyright: 1998 Doug Rabson
   -
    Glob: libs/esl/getopt/getopt_long.c
    Matches: This\scode\sis\sderived\sfrom\ssoftware\scontributed\sto\sThe\sNetBSD\sFoundation
diff --git a/debian/rules b/debian/rules
index 88aaee3f71..8b5d9ebe5e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,6 @@ override_dh_auto_configure: .stamp-configure
 .stamp-build: .stamp-configure
 	@$(call show_vars)
 	make -j$(NJOBS) core
-	make iksemel-dep
 	make -j$(NJOBS)
 	make -C libs/esl pymod
 	make -C libs/esl py3mod
diff --git a/debian/util.sh b/debian/util.sh
index 6a5d8f27da..c82e681d23 100755
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -46,6 +46,7 @@ find_distro () {
   case "$1" in
     experimental) echo "sid";;
     unstable) echo "sid";;
+    experimental) echo "bookworm";;
     testing) echo "bullseye";;
     stable) echo "buster";;
     oldstable) echo "stretch";;
@@ -56,6 +57,7 @@ find_distro () {
 find_suite () {
   case "$1" in
     sid) echo "unstable";;
+    bookworm) echo "experimental";;
     bullseye) echo "testing";;
     buster) echo "stable";;
     stretch) echo "oldstable";;
@@ -103,7 +105,6 @@ getlibs () {
   getlib http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
   #getlib http://download.zeromq.org/zeromq-2.1.9.tar.gz \
   #  || getlib http://download.zeromq.org/historic/zeromq-2.1.9.tar.gz
-  getlib http://files.freeswitch.org/downloads/libs/freeradius-client-1.1.7.tar.gz
   #getlib http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2
 }
 
@@ -133,51 +134,136 @@ get_nightly_revision_human () {
   echo "git $(git rev-list -n1 --abbrev=7 --abbrev-commit HEAD) $(date -u '+%Y-%m-%d %H:%M:%SZ')"
 }
 
-create_orig () {
+prep_create_orig () {
   {
     set -e
+
     local OPTIND OPTARG
-    local uver="" hrev="" bundle_deps=true modules_list="" zl=9e
-    while getopts 'bm:nv:z:' o "$@"; do
+    local uver="" hrev="" bundle_deps=true soft_reset=false
+
+    while getopts 'bm:nv:V:xz:' o "$@"; do
       case "$o" in
-        m) modules_list="$OPTARG";;
+        b) ;;
+        m) ;;
         n) uver="nightly";;
         v) uver="$OPTARG";;
-        z) zl="$OPTARG";;
+        V) uver="$OPTARG";;
+        x) soft_reset=true;;
+        z) ;;
       esac
     done
     shift $(($OPTIND-1))
+
     if [ -z "$uver" ] || [ "$uver" = "nightly" ]; then
       uver="$(get_nightly_version)"
       hrev="$(get_nightly_revision_human)"
     fi
-    local treeish="$1" dver="$(mk_dver "$uver")"
-    local orig="../freeswitch_$dver~$(lsb_release -sc).orig.tar.xz"
+
+    local treeish="$1"
     [ -n "$treeish" ] || treeish="HEAD"
-    check_repo_clean
-    git reset --hard "$treeish"
+
+    if $soft_reset; then
+      git reset --soft "$treeish"
+    else
+      check_repo_clean
+      git reset --hard "$treeish"
+    fi
+
+    if $bundle_deps; then
+      (cd libs && getlibs)
+    fi
+
+    ./build/set-fs-version.sh "$uver" "$hrev" # ToDo: Handle empty $hrev
+
+    echo "$uver" > .version
+  } 1>&2
+  echo "$uver"
+}
+
+create_orig () {
+  {
+    set -e
+
+    local OPTIND OPTARG
+    local bundle_deps=true modules_list="" soft_reset=false auto_orig=false zl=9e
+
+    local uver="$(prep_create_orig "$@")"
+
+    while getopts 'bm:nv:V:xz:' o "$@"; do
+      case "$o" in
+        b) ;;
+        m) modules_list="$OPTARG";;
+        n) ;;
+        v) ;;
+        V) auto_orig=true;;
+        x) soft_reset=true;;
+        z) zl="$OPTARG";;
+      esac
+    done
+    shift $(($OPTIND-1))
+
+    local commit_epoch=$(git log -1 --format=%ct)
+    local source_date=$(date -u -d @$commit_epoch +'%Y-%m-%d %H:%M:%S')
+
+    local orig git_archive_prefix
+    if $auto_orig; then
+      orig="../freeswitch_$(debian/version-omit_revision.pl).orig.tar.xz"
+      git_archive_prefix="freeswitch/"
+    else
+      orig="../freeswitch_$(mk_dver "$uver")~$(lsb_release -sc).orig.tar.xz"
+      git_archive_prefix="freeswitch-$uver/"
+    fi
+
     mv .gitattributes .gitattributes.orig
+
     local -a args=(-e '\bdebian-ignore\b')
     test "$modules_list" = "non-dfsg" || args+=(-e '\bdfsg-nonfree\b')
     grep .gitattributes.orig "${args[@]}" \
       | while xread l; do
       echo "$l export-ignore" >> .gitattributes
     done
+
     if $bundle_deps; then
-      (cd libs && getlibs)
       git add -f libs
     fi
-    ./build/set-fs-version.sh "$uver" "$hrev" && git add configure.ac
-    echo "$uver" > .version && git add -f .version
+
+    git add -f configure.ac .version
     git commit --allow-empty -m "nightly v$uver"
+
+    local tmpsrcdir="$(mktemp -d)"
     git archive -v \
       --worktree-attributes \
       --format=tar \
-      --prefix=freeswitch-$uver/ \
-      HEAD \
-      | xz -c -${zl}v > $orig
+      --prefix=$git_archive_prefix \
+      HEAD | tar --extract --directory="$tmpsrcdir"
+
+    # https://www.gnu.org/software/tar/manual/html_section/Reproducibility.html
+    tar \
+      --sort=name \
+      --format=posix \
+      --pax-option='exthdr.name=%d/PaxHeaders/%f' \
+      --pax-option='delete=atime,delete=ctime' \
+      --clamp-mtime \
+      --mtime="$source_date" \
+      --numeric-owner \
+      --owner=0 \
+      --group=0 \
+      --mode='go+u,go-w' \
+      --create \
+      --directory="$tmpsrcdir" \
+      . | xz -v -c -${zl} > "$orig" && \
+    rm -rf "$tmpsrcdir"
+
+    echo "Source archive checksum:"
+    sha256sum $orig
+
     mv .gitattributes.orig .gitattributes
-    git reset --hard HEAD^ && git clean -fdx
+
+    if $soft_reset; then
+      git reset --soft HEAD^
+    else
+      git reset --hard HEAD^ && git clean -fdx
+    fi
   } 1>&2
   echo $orig
 }
@@ -188,11 +274,12 @@ applications/mod_commands
 EOF
 }
 
-create_dsc () {
+prep_create_dsc () {
   {
     set -e
-    local OPTIND OPTARG modules_conf="" modules_list="" speed="normal" suite_postfix="" suite_postfix_p=false zl=9
-    local modules_add=""
+
+    local OPTIND OPTARG modules_conf="" modules_add="" modules_list="" speed="normal"
+
     while getopts 'a:f:m:p:s:u:z:' o "$@"; do
       case "$o" in
         a) avoid_mods_arch="$OPTARG";;
@@ -200,47 +287,93 @@ create_dsc () {
         m) modules_list="$OPTARG";;
         p) modules_add="$modules_add $OPTARG";;
         s) speed="$OPTARG";;
-        u) suite_postfix="$OPTARG"; suite_postfix_p=true;;
-        z) zl="$OPTARG";;
+        u) ;;
+        z) ;;
       esac
     done
     shift $(($OPTIND-1))
-    local distro="$(find_distro $1)" orig="$2"
-    local suite="$(find_suite $distro)"
-    local orig_ver="$(echo "$orig" | sed -e 's/^.*_//' -e 's/\.orig\.tar.*$//')"
-    local dver="${orig_ver}-1~${distro}+1"
-    $suite_postfix_p && { suite="${distro}${suite_postfix}"; }
-    [ -x "$(which dch)" ] \
-      || err "package devscripts isn't installed"
+
+    local distro="$(find_distro $1)"
+
     if [ -n "$modules_conf" ]; then
       cp $modules_conf debian/modules.conf
     fi
+
     local bootstrap_args=""
+
     if [ -n "$modules_list" ]; then
       if [ "$modules_list" = "non-dfsg" ]; then
         bootstrap_args="-mnon-dfsg"
-      else set_modules_${modules_list}; fi
+      else
+        set_modules_${modules_list}
+      fi
     fi
+
     if test -n "$modules_add"; then
       for x in $modules_add; do
         bootstrap_args="$bootstrap_args -p${x}"
       done
     fi
+
     (cd debian && ./bootstrap.sh -a "$avoid_mods_arch" -c $distro $bootstrap_args)
+
     case "$speed" in
       paranoid) sed -i ./debian/rules \
         -e '/\.stamp-bootstrap:/{:l2 n; /\.\/bootstrap.sh -j/{s/ -j//; :l3 n; b l3}; b l2};' ;;
       reckless) sed -i ./debian/rules \
         -e '/\.stamp-build:/{:l2 n; /make/{s/$/ -j/; :l3 n; b l3}; b l2};' ;;
     esac
+  } 1>&2
+}
+
+create_dsc () {
+  {
+    set -e
+
+    prep_create_dsc "$@"
+
+    local OPTIND OPTARG suite_postfix="" suite_postfix_p=false soft_reset=false zl=9
+
+    while getopts 'a:f:m:p:s:u:xz:' o "$@"; do
+      case "$o" in
+        a) ;;
+        f) ;;
+        m) ;;
+        p) ;;
+        s) ;;
+        u) suite_postfix="$OPTARG"; suite_postfix_p=true;;
+        x) soft_reset=true;;
+        z) zl="$OPTARG";;
+      esac
+    done
+    shift $(($OPTIND-1))
+
+    local distro="$(find_distro $1)" orig="$2"
+    local suite="$(find_suite $distro)"
+    local orig_ver="$(echo "$orig" | sed -e 's/^.*_//' -e 's/\.orig\.tar.*$//')"
+    local dver="${orig_ver}-1~${distro}+1"
+
+    $suite_postfix_p && { suite="${distro}${suite_postfix}"; }
+
+    [ -x "$(which dch)" ] \
+      || err "package devscripts isn't installed"
+
     [ "$zl" -ge "1" ] || zl=1
-    git add debian/rules
+
     dch -b -m -v "$dver" --force-distribution -D "$suite" "Nightly build."
-    git add debian/changelog && git commit -m "nightly v$orig_ver"
+
+    git add debian/rules debian/changelog && git commit -m "nightly v$orig_ver"
+
     dpkg-source -i.* -Zxz -z${zl} -b .
     dpkg-genchanges -S > ../$(dsc_base)_source.changes
+
     local dsc="../$(dsc_base).dsc"
-    git reset --hard HEAD^ && git clean -fdx
+
+    if $soft_reset; then
+      git reset --soft HEAD^
+    else
+      git reset --hard HEAD^ && git clean -fdx
+    fi
   } 1>&2
   echo $dsc
 }
@@ -586,7 +719,7 @@ commands:
 
   create-dbg-pkgs
 
-  create-dsc <distro> <orig-file>
+  create-dsc <distro> <orig-file> (same for 'prep-create-dsc')
 
     -f <modules.conf>
       Build only modules listed in this file
@@ -598,14 +731,17 @@ commands:
       Set FS bootstrap/build -j flags
     -u <suite-postfix>
       Specify a custom suite postfix
+    -x Use git soft reset instead of hard reset
     -z Set compression level
 
-  create-orig <treeish>
+  create-orig <treeish> (same for 'prep_create_orig')
 
     -m [ quicktest | non-dfsg ]
       Choose custom list of modules to build
     -n Nightly build
     -v Set version
+    -V Set version (without replacing every '-' to '~')
+    -x Use git soft reset instead of hard reset
     -z Set compression level
 
 EOF
@@ -627,7 +763,9 @@ case "$cmd" in
   build-all) build_all "$@" ;;
   build-debs) build_debs "$@" ;;
   create-dbg-pkgs) create_dbg_pkgs ;;
+  prep-create-dsc) prep_create_dsc "$@" ;;
   create-dsc) create_dsc "$@" ;;
+  prep-create-orig) prep_create_orig "$@" ;;
   create-orig) create_orig "$@" ;;
   *) usage ;;
 esac
diff --git a/debian/version-omit_revision.pl b/debian/version-omit_revision.pl
new file mode 100755
index 0000000000..c6f5767a29
--- /dev/null
+++ b/debian/version-omit_revision.pl
@@ -0,0 +1,22 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use Dpkg::Version;
+
+my $version;
+
+open(my $fh, '-|', 'dpkg-parsechangelog -S version') or die "Failed to execute dpkg-parsechangelog: $!";
+{
+    local $/;
+    $version = <$fh>;
+}
+close $fh;
+
+$version =~ s/\s+$//;
+
+die "No version found or empty output from dpkg-parsechangelog" unless defined $version and $version ne '';
+
+my $v = Dpkg::Version->new($version);
+my $vs = $v->as_string(omit_epoch => 1, omit_revision => 1);
+
+print "$vs\n";
diff --git a/docker/README.md b/docker/README.md
index e9a321e699..e0ebfff2af 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,7 +2,7 @@
 These are the official Docker files for master branch and the current release packages.
 
 ## Volumes
-These containers are setup so that you can mount your freeswitch configuration form a host or data volume container.
+These containers are set up so that you can mount your freeswitch configuration from a host or data volume container.
 
 To mount freeswitch Configuration
 ```
@@ -16,17 +16,19 @@ To mount tmp directory for storing recordings, etc
 
 The container also has a healthcheck where it does a fs_cli status check to make sure the freeswitch service is still running.
 
-# Ports
+## Ports
 
-The container exposes the following ports:
+The container should be run with host networking using `docker run --network host ...`.
 
-- 5060/tcp 5060/udp 5080/tcp 5080/udp as SIP Signaling ports.
-- 5066/tcp 7443/tcp as WebSocket Signaling ports.
-- 8021/tcp as Event Socket port.
-- 64535-65535/udp as media ports.
-- 16384-32768/udp
+If you prefer to (or for some reason must) publish individual ports via `--publish/-p`, refer to this [issue](https://github.com/moby/moby/issues/11185) and this [potential workaround](https://hub.docker.com/r/bettervoice/freeswitch-container/) regarding using docker with large port ranges.
 
+The following ports will be used, depending upon your specific configuration:
 
+- 5060/tcp, 5060/udp, 5080/tcp, 5080/udp - SIP signaling
+- 5061/tcp, 5081/tcp - SIPS signaling
+- 5066/tcp, 7443/tcp - WebSocket signaling
+- 8021/tcp - the Event Socket
+- 16384-32768/udp,  64535-65535/udp - media
 
 
 If you wish to help improve these please submit a pull request at:
diff --git a/docker/coverity/Dockerfile b/docker/coverity/Dockerfile
new file mode 100644
index 0000000000..7f3fb9216f
--- /dev/null
+++ b/docker/coverity/Dockerfile
@@ -0,0 +1,49 @@
+FROM debian:bookworm-20241202
+MAINTAINER Andrey Volk <andrey@signalwire.com>
+
+ARG REPOTOKEN
+ARG COVERITYTOKEN
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+    wget gnupg2 dos2unix apt-transport-https lsb-release git
+RUN echo "machine freeswitch.signalwire.com login signalwire password ${REPOTOKEN}" > /etc/apt/auth.conf
+RUN wget --http-user=signalwire --http-password=${REPOTOKEN} -O /usr/share/keyrings/signalwire-freeswitch-repo.gpg https://freeswitch.signalwire.com/repo/deb/debian-release/signalwire-freeswitch-repo.gpg 
+RUN echo "deb [signed-by=/usr/share/keyrings/signalwire-freeswitch-repo.gpg] https://freeswitch.signalwire.com/repo/deb/debian-release/ `lsb_release -sc` main" > /etc/apt/sources.list.d/freeswitch.list
+RUN echo "deb-src [signed-by=/usr/share/keyrings/signalwire-freeswitch-repo.gpg] https://freeswitch.signalwire.com/repo/deb/debian-release/ `lsb_release -sc` main" >> /etc/apt/sources.list.d/freeswitch.list
+RUN apt-get update
+RUN apt-get -y build-dep freeswitch
+RUN mkdir /data
+
+ENV PATH="/coverity/cov-analysis-linux64/bin:${PATH}"
+
+RUN echo "#!/bin/bash\n\
+wget https://scan.coverity.com/download/linux64 --post-data \"token=${COVERITYTOKEN}&project=FreeSWITCH\" -O /coverity_tool.tgz\n\
+COVERITYFOLDER=\$(tar -tf /coverity_tool.tgz | head -n1)\n\
+mkdir -p /coverity\n\
+tar zxvf /coverity_tool.tgz -C /coverity/\n\
+cd /coverity\n\
+mv \$COVERITYFOLDER cov-analysis-linux64\n\
+apt-get update && apt-get -y build-dep freeswitch\n\
+apt-get install -y libv8-6.1-dev\n\
+cd /\n\
+git clone https://github.com/signalwire/freeswitch -b "\$FSBRANCH"\n\
+cd /freeswitch\n\
+git status\n\
+mkdir modules\n\
+cd modules\n\
+../debian/bootstrap.sh -c bookworm\n\
+cd ..\n\
+./bootstrap.sh\n\
+cp ./modules/modules_.conf ./modules.conf\n\
+./configure\n\
+cov-build --dir cov-int make -j\$(nproc)\n\
+tar czvf /data/freeswitch.tgz cov-int\n "\
+>> /run.sh
+
+RUN echo /run.sh
+
+WORKDIR /data
+RUN chmod 755 /run.sh
+RUN dos2unix /run.sh
+CMD ["/run.sh"]
\ No newline at end of file
diff --git a/docker/coverity/README.md b/docker/coverity/README.md
new file mode 100644
index 0000000000..aef36d0645
--- /dev/null
+++ b/docker/coverity/README.md
@@ -0,0 +1,23 @@
+# Coverity scan
+
+## Build an image for Coverity
+```
+docker build -t coverity --build-arg REPOTOKEN=<signalwire token> --build-arg COVERITYTOKEN=<coverity token> .
+```
+
+## Scan FreeSWITCH using a Coverity image
+```
+docker run --rm -itv .:/data -e FSBRANCH="master" coverity
+```
+
+This will output `freeswitch.tgz` file to the current folder
+
+## Uploading the result to the Coverity server
+```
+curl --form token=<coverity token> \
+  --form email=andrey@signalwire.com \
+  --form file=@freeswitch.tgz \
+  --form version="Version" \
+  --form description="Description" \
+  https://scan.coverity.com/builds?project=FreeSWITCH
+```
\ No newline at end of file
diff --git a/docker/master/Dockerfile b/docker/master/Dockerfile
index e9b626b400..d036164ac7 100644
--- a/docker/master/Dockerfile
+++ b/docker/master/Dockerfile
@@ -1,56 +1,63 @@
 # vim:set ft=dockerfile:
-ARG DEBIAN_VERSION=buster
+ARG DEBIAN_VERSION=bookworm
 FROM debian:${DEBIAN_VERSION}
+
+# ARGs are cleared after every FROM
+# see: https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
+ARG DEBIAN_VERSION
 ARG TOKEN
 
+# By default, install the full set of FreeSWITCH packages.  Specify an alternative with:
+#   --build-arg="FS_META_PACKAGE=freeswitch-meta-vanilla"
+# alternatives include:
+#   freeswitch-meta-bare
+#   freeswitch-meta-vanilla
+#   freeswitch-meta-sorbet
+#   freeswitch-meta-all-dbg
+ARG FS_META_PACKAGE=freeswitch-meta-all
+
 # Source Dockerfile:
 # https://github.com/docker-library/postgres/blob/master/9.4/Dockerfile
 
 # explicitly set user/group IDs
-RUN groupadd -r freeswitch --gid=999 && useradd -r -g freeswitch --uid=999 freeswitch
-
-# grab gosu for easy step-down from root
-RUN apt-get update && apt-get install -y --no-install-recommends dirmngr gnupg2 ca-certificates wget \
-    && gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-    && gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys 655DA1341B5207915210AFE936B4249FA7B0FB03 \
-    && gpg2 --output /usr/share/keyrings/signalwire-freeswitch-repo.gpg --export 655DA1341B5207915210AFE936B4249FA7B0FB03 \
-    && rm -rf /var/lib/apt/lists/* \
-    && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \
-    && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \
-    && gpg --verify /usr/local/bin/gosu.asc \
-    && rm /usr/local/bin/gosu.asc \
-    && chmod +x /usr/local/bin/gosu \
-    && apt-get purge -y --auto-remove ca-certificates wget dirmngr gnupg2
+ARG FREESWITCH_UID=499
+ARG FREESWITCH_GID=499
+RUN groupadd -r freeswitch --gid=${FREESWITCH_GID} && useradd -r -g freeswitch --uid=${FREESWITCH_UID} freeswitch
 
 # make the "en_US.UTF-8" locale so freeswitch will be utf-8 enabled by default
-RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update -qq \
+    && apt-get install -y --no-install-recommends ca-certificates gnupg2 gosu locales wget \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
 # https://freeswitch.org/confluence/display/FREESWITCH/Debian
+# https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Installation/Linux/Debian_67240088/
 
-RUN apt-get update && apt-get install ca-certificates lsb-release -y --no-install-recommends \
+RUN wget --no-verbose --http-user=signalwire --http-password=${TOKEN} \
+      -O /usr/share/keyrings/signalwire-freeswitch-repo.gpg \
+      https://freeswitch.signalwire.com/repo/deb/debian-release/signalwire-freeswitch-repo.gpg \
     && echo "machine freeswitch.signalwire.com login signalwire password ${TOKEN}" > /etc/apt/auth.conf \
-    && echo "deb [signed-by=/usr/share/keyrings/signalwire-freeswitch-repo.gpg] https://freeswitch.signalwire.com/repo/deb/debian-release/ `lsb_release -sc` main" > /etc/apt/sources.list.d/freeswitch.list \
-    && apt-get update && apt-get install -y freeswitch-all \
-    && apt-get purge -y --auto-remove ca-certificates lsb-release \
+    && echo "deb [signed-by=/usr/share/keyrings/signalwire-freeswitch-repo.gpg] https://freeswitch.signalwire.com/repo/deb/debian-release/ ${DEBIAN_VERSION} main" > /etc/apt/sources.list.d/freeswitch.list \
+    && apt-get -qq update \
+    && apt-get install -y ${FS_META_PACKAGE} \
+    && apt-get purge -y --auto-remove \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 COPY docker-entrypoint.sh /
 # Add anything else here
 
 ## Ports
-# Open the container up to the world.
-### 8021 fs_cli, 5060 5061 5080 5081 sip and sips, 64535-65535 rtp
+# Document ports used by this container
+### 8021 fs_cli, 5060 5061 5080 5081 sip and sips, 5066 ws, 7443 wss, 8081 8082 verto, 16384-32768, 64535-65535 rtp
 EXPOSE 8021/tcp
 EXPOSE 5060/tcp 5060/udp 5080/tcp 5080/udp
 EXPOSE 5061/tcp 5061/udp 5081/tcp 5081/udp
+EXPOSE 5066/tcp
 EXPOSE 7443/tcp
-EXPOSE 5070/udp 5070/tcp
+EXPOSE 8081/tcp 8082/tcp
 EXPOSE 64535-65535/udp
 EXPOSE 16384-32768/udp
 
-
 # Volumes
 ## Freeswitch Configuration
 VOLUME ["/etc/freeswitch"]
@@ -61,11 +68,9 @@ VOLUME ["/tmp"]
 COPY    build/freeswitch.limits.conf /etc/security/limits.d/
 
 # Healthcheck to make sure the service is running
-SHELL       ["/bin/bash"]
+SHELL       ["/bin/bash", "-c"]
 HEALTHCHECK --interval=15s --timeout=5s \
     CMD  fs_cli -x status | grep -q ^UP || exit 1
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-
-
 CMD ["freeswitch"]
diff --git a/docs/Doxygen.conf b/docs/Doxygen.conf
index 9e62b08232..e9394d18bb 100644
--- a/docs/Doxygen.conf
+++ b/docs/Doxygen.conf
@@ -1240,7 +1240,7 @@ SEARCH_INCLUDES        = YES
 # contain include files that are not input files but should be processed by
 # the preprocessor.
 
-INCLUDE_PATH           =../libs/apr ../libs/apr-util ../libs/iksemel ../libs/libnatpmp \
+INCLUDE_PATH           =../libs/apr ../libs/apr-util ../libs/libnatpmp \
 			../libs/miniupnpc ../libs/sofia-sip ../libs/spandsp \
 			../libs/srtp ../libs/win32 ../libs/xmlrpc-c
 
diff --git a/freeswitch-config-rayo.spec b/freeswitch-config-rayo.spec
deleted file mode 100644
index d022978834..0000000000
--- a/freeswitch-config-rayo.spec
+++ /dev/null
@@ -1,177 +0,0 @@
-######################################################################################################################
-#
-# freeswitch-config-rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-# Copyright (C) 2013-2015, Grasshopper
-#
-# Version: MPL 1.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is freeswitch-config-rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-#
-# The Initial Developer of the Original Code is Grasshopper
-# Portions created by the Initial Developer are Copyright (C)
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Chris Rienzo <crienzo@grasshopper.com>
-#
-# freeswitch-rayo-config -- RPM packaging for Rayo Server configuration
-#
-######################################################################################################################
-
-%define nonparsedversion 1.7.0
-%define version %(echo '%{nonparsedversion}' | sed 's/-//g')
-%define release 1
-
-%define fsname freeswitch
-
-%define	PREFIX		%{_prefix}
-%define EXECPREFIX	%{_exec_prefix}
-%define BINDIR		%{_bindir}
-%define SBINDIR		%{_sbindir}
-%define LIBEXECDIR	%{_libexecdir}/%fsname
-%define SYSCONFDIR	%{_sysconfdir}/%fsname
-%define SHARESTATEDIR	%{_sharedstatedir}/%fsname
-%define LOCALSTATEDIR	%{_localstatedir}/lib/%fsname
-%define LIBDIR		%{_libdir}
-%define INCLUDEDIR	%{_includedir}
-%define _datarootdir	%{_prefix}/share
-%define DATAROOTDIR	%{_datarootdir}
-%define DATADIR		%{_datadir}
-%define INFODIR		%{_infodir}
-%define LOCALEDIR	%{_datarootdir}/locale
-%define MANDIR		%{_mandir}
-%define DOCDIR		%{_defaultdocdir}/%fsname
-%define HTMLDIR		%{_defaultdocdir}/%fsname/html
-%define DVIDIR		%{_defaultdocdir}/%fsname/dvi
-%define PDFDIR		%{_defaultdocdir}/%fsname/pdf
-%define PSDIR		%{_defaultdocdir}/%fsname/ps
-%define LOGFILEDIR	/var/log/%fsname
-%define MODINSTDIR	%{_libdir}/%fsname/mod
-%define RUNDIR		%{_localstatedir}/run/%fsname
-%define DBDIR		%{LOCALSTATEDIR}/db
-%define HTDOCSDIR	%{_datarootdir}/%fsname/htdocs
-%define SOUNDSDIR	%{_datarootdir}/%fsname/sounds
-%define GRAMMARDIR	%{_datarootdir}/%fsname/grammar
-%define SCRIPTDIR	%{_datarootdir}/%fsname/scripts
-%define RECORDINGSDIR	%{LOCALSTATEDIR}/recordings
-%define PKGCONFIGDIR	%{_datarootdir}/%fsname/pkgconfig
-%define HOMEDIR		%{LOCALSTATEDIR}
-
-Name: freeswitch-config-rayo
-Version: %{version}
-Release: %{release}%{?dist}
-License: MPL1.1
-Summary: Rayo configuration for the FreeSWITCH Open Source telephone platform.
-Group: System/Libraries
-Packager: Chris Rienzo
-URL: http://www.freeswitch.org/
-Source0: freeswitch-%{nonparsedversion}.tar.bz2
-Requires: freeswitch
-Requires: freeswitch-application-conference
-Requires: freeswitch-application-esf
-Requires: freeswitch-application-expr
-Requires: freeswitch-application-fsv
-Requires: freeswitch-application-http-cache
-Requires: freeswitch-asrtts-flite
-Requires: freeswitch-asrtts-pocketsphinx
-Requires: freeswitch-codec-h26x
-Requires: freeswitch-codec-ilbc
-Requires: freeswitch-codec-opus
-Requires: freeswitch-codec-vp8
-Requires: freeswitch-event-rayo
-Requires: freeswitch-format-local-stream
-Requires: freeswitch-format-mod-shout
-Requires: freeswitch-format-shell-stream
-Requires: freeswitch-format-ssml
-Requires: freeswitch-sounds-music-8000
-Requires: freeswitch-lang-en
-Requires: freeswitch-sounds-en-us-callie-8000
-BuildRequires: bash
-BuildArch: noarch
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-FreeSWITCH rayo server implementation.
-
-%prep
-%setup -b0 -q -n freeswitch-%{nonparsedversion}
-
-%build
-
-%install
-%{__rm} -rf %{buildroot}
-%{__install} -d -m 0750 %{buildroot}/%{SYSCONFDIR}
-%{__install} -d -m 0750 %{buildroot}/%{SYSCONFDIR}/autoload_configs
-%{__install} -d -m 0750 %{buildroot}/%{SYSCONFDIR}/dialplan
-%{__install} -d -m 0750 %{buildroot}/%{SYSCONFDIR}/sip_profiles
-%{__install} -d -m 0750 %{buildroot}/%{SYSCONFDIR}/directory
-%{__cp} -prv ./conf/rayo/*.{xml,types,pem} %{buildroot}/%{SYSCONFDIR}/
-%{__cp} -prv ./conf/rayo/{autoload_configs,dialplan} %{buildroot}/%{SYSCONFDIR}/
-%{__cp} -prv ./conf/rayo/sip_profiles/external.xml %{buildroot}/%{SYSCONFDIR}/sip_profiles
-%{__cp} -prv ./conf/rayo/sip_profiles/external %{buildroot}/%{SYSCONFDIR}/sip_profiles
-%{__cp} -prv ./conf/rayo/directory %{buildroot}/%{SYSCONFDIR}/
-
-%postun
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%files
-%defattr(-,freeswitch,daemon)
-%dir %attr(0750, freeswitch, daemon) %{SYSCONFDIR}
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/cacert.pem
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/mime.types
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/acl.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/cdr_csv.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/conference.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/console.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/event_socket.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/http_cache.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/local_stream.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/logfile.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/modules.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/pocketsphinx.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/post_load_modules.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/presence_map.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/rayo.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/shout.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/sofia.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/spandsp.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/ssml.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/switch.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/autoload_configs/timezones.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/dialplan/public.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/directory/default.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/directory/default/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/sip_profiles/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{SYSCONFDIR}/sip_profiles/external/*.xml
-
-### END OF config-rayo
-
-######################################################################################################################
-#
-#						Changelog
-#
-######################################################################################################################
-%changelog
-* Tue Apr 23 2019 - Andrey Volk
-- Fix build for Stack 20.x
-* Tue Jun 10 2014 crienzo@grasshopper.com
-- Remove dependency to high resolution music and sounds files
-- Remove dependency to specific FreeSWITCH package version
-* Mon Jun 03 2013 - crienzo@grasshopper.com
-- Added users and internal profile for softphone testing
-* Wed May 08 2013 - crienzo@grasshopper.com
-- Initial revision
-
diff --git a/freeswitch.spec b/freeswitch.spec
old mode 100644
new mode 100755
index f3904afa2c..1d98356588
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -29,19 +29,11 @@
 #
 ######################################################################################################################
 # Module build settings
-%define build_sng_isdn 0
-%define build_sng_ss7 0
-%define build_sng_tc 0
 %define build_py26_esl 0
 %define build_timerfd 0
 %define build_mod_esl 0
-%define build_mod_rayo 1
-%define build_mod_ssml 1
 %define build_mod_v8 0
 
-%{?with_sang_tc:%define build_sng_tc 1 }
-%{?with_sang_isdn:%define build_sng_isdn 1 }
-%{?with_sang_ss7:%define build_sng_ss7 1 }
 %{?with_py26_esl:%define build_py26_esl 1 }
 %{?with_timerfd:%define build_timerfd 1 }
 %{?with_mod_esl:%define build_mod_esl 1 }
@@ -118,10 +110,9 @@ Vendor:       	http://www.freeswitch.org/
 #
 ######################################################################################################################
 Source0:        http://files.freeswitch.org/%{name}-%{nonparsedversion}.tar.bz2
-Source1:	http://files.freeswitch.org/downloads/libs/freeradius-client-1.1.7.tar.gz
-Source2:	http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
-Source3:	http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
-Source4:	http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz
+Source1:	http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
+Source2:	http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
+Source3:	http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz
 Prefix:        	%{prefix}
 
 
@@ -140,7 +131,7 @@ BuildRequires: curl-devel >= 7.19
 BuildRequires: gcc-c++
 BuildRequires: libtool >= 1.5.17
 BuildRequires: openssl-devel >= 1.0.1e
-BuildRequires: sofia-sip-devel >= 1.13.14
+BuildRequires: sofia-sip-devel >= 1.13.17
 BuildRequires: spandsp3-devel >= 3.0
 BuildRequires: pcre-devel 
 BuildRequires: speex-devel 
@@ -235,14 +226,6 @@ FreeSWITCH development files
 ######################################################################################################################
 #				FreeSWITCH Application Modules
 ######################################################################################################################
-%package application-abstraction
-Summary:	FreeSWITCH mod_abstraction
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description application-abstraction
-Provide an abstraction to FreeSWITCH API calls
-
 %package application-avmd
 Summary:	FreeSWITCH voicemail detector
 Group:          System/Libraries
@@ -467,14 +450,6 @@ Provides FreeSWITCH mod_nibblebill, provides a credit/debit module for
 FreeSWITCH to allow real-time debiting of credit or cash from a database 
 while calls are in progress.
 
-%package application-rad_auth
-Summary:	FreeSWITCH mod_rad_auth
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description application-rad_auth
-Provides FreeSWITCH mod_rad_auth, authentication via RADIUS protocol from FreeSWITCH dialplan
-
 %package application-redis
 Summary:	FreeSWITCH mod_redis
 Group:          System/Libraries
@@ -484,20 +459,11 @@ Requires:       %{name} = %{version}-%{release}
 Provides FreeSWITCH mod_redis, access to the redis key value pair db system from
 FreeSWITCH
 
-%package application-rss
-Summary:	FreeSWITCH mod_rss
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description application-rss
-Provides FreeSWITCH mod_rss, edisrse and read an XML based RSS feed, then read
-the entries aloud via a TTS engine
-
 %package application-signalwire
 Summary:	FreeSWITCH mod_signalwire
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libks signalwire-client-c
+BuildRequires:  libks2 signalwire-client-c2
 
 %description application-signalwire
 Provides FreeSWITCH mod_signalwire
@@ -521,27 +487,6 @@ Requires:       %{name} = %{version}-%{release}
 Provides FreeSWITCH mod_snapshot, allows recording a sliding window of audio 
 and taking snapshots to disk. 
 
-%package application-snom
-Summary:	FreeSWITCH mod_snom
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description application-snom
-Provides FreeSWITCH mod_snom, an application for controlling the functionality 
-and appearance of the programmable softkeys on Snom phones
-
-%package application-soundtouch
-Summary:	FreeSWITCH mod_soundtouch
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-BuildRequires:  soundtouch-devel >= 1.7.1
-
-%description application-soundtouch
-Provides FreeSWITCH mod_soundtouch, uses the soundtouch library, which can do
-pitch shifting and other audio effects, so you can pipe the audio of a call
-(or any other channel audio) through this module and achieve those effects. You
-can specifically adjust pitch, rate, and tempo.
-
 %package application-spy
 Summary:	FreeSWITCH mod_spy
 Group:          System/Libraries
@@ -551,15 +496,6 @@ Requires:       %{name} = %{version}-%{release}
 Provides FreeSWITCH mod_spy, implements userspy application which provides 
 persistent eavesdrop on all channels bridged to a certain user
 
-%package application-stress
-Summary:	FreeSWITCH mod_stress
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description application-stress
-Provides FreeSWITCH mod_stress. mod_stress attempts to detect stress in a 
-person's voice and generates FreeSWITCH events based on that data. 
-
 %package application-translate
 Summary:	FreeSWITCH mod_translate
 Group:          System/Libraries
@@ -695,14 +631,6 @@ Conflicts:	codec-com-g729
 %description codec-passthru-g729
 Pass-through g729 Codec support for FreeSWITCH open source telephony platform
 
-%package codec-h26x
-Summary:        H.263/H.264 Video Codec support for FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description codec-h26x
-H.263/H.264 Video Codec support for FreeSWITCH open source telephony platform
-
 %package codec-ilbc
 Summary:        iLCB Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
@@ -714,29 +642,13 @@ BuildRequires:  ilbc2-devel
 %description codec-ilbc
 iLBC Codec support for FreeSWITCH open source telephony platform
 
-%package codec-isac
-Summary:        iSAC Codec support for FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description codec-isac
-iSAC Codec support for FreeSWITCH open source telephony platform
-
 %package codec-vpx
 Summary:        vp8 Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description codec-vpx
-iSAC Codec support for FreeSWITCH open source telephony platform
-
-%package codec-mp4v
-Summary:        MP4V Video Codec support for FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description codec-mp4v
-MP4V Video Codec support for FreeSWITCH open source telephony platform
+VP8 Codec support for FreeSWITCH open source telephony platform
 
 %package codec-opus
 Summary:        Opus Codec support for FreeSWITCH open source telephony platform
@@ -748,19 +660,6 @@ BuildRequires:  opus-devel >= 1.1
 %description codec-opus
 OPUS Codec support for FreeSWITCH open source telephony platform
 
-%if %{build_sng_tc}
-%package sangoma-codec
-Summary:	Sangoma D100 and D500 Codec Card Support
-Group:		System/Libraries
-Requires:        %{name} = %{version}-%{release}
-Requires: sng-tc-linux
-BuildRequires: sng-tc-linux
-
-%description sangoma-codec
-Sangoma D100 and D500 Codec Card Support
-
-%endif
-
 %package codec-silk
 Summary:        Silk Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
@@ -832,16 +731,6 @@ PostgreSQL native support for FreeSWITCH.
 #				FreeSWITCH Endpoint Modules
 ######################################################################################################################
 
-#%package endpoint-gsmopen
-#Summary:        Generic GSM endpoint support for FreeSWITCH open source telephony platform
-#Group:          System/Libraries
-#Requires:       %{name} = %{version}-%{release}
-#
-#%description endpoint-gsmopen
-#GSMopen is an endpoint (channel driver) that allows an SMS to be sent or 
-#received from FreeSWITCH as well as incoming and outgoing GSM voice calls.
-#SMS is handled via the standard CHAT API in FreeSWITCH.
-
 #%package endpoint-h323
 #Summary:        H.323 endpoint support for FreeSWITCH open source telephony platform
 #Group:          System/Libraries
@@ -850,25 +739,6 @@ PostgreSQL native support for FreeSWITCH.
 #%description endpoint-h323
 #H.323 endpoint support for FreeSWITCH open source telephony platform
 
-#%package endpoint-khomp
-#Summary:        khomp endpoint support for FreeSWITCH open source telephony platform
-#Group:          System/Libraries
-#Requires:       %{name} = %{version}-%{release}
-#
-#%description endpoint-khomp
-#Khomp hardware endpoint support for FreeSWITCH open source telephony platform.
-
-%package endpoint-portaudio
-Summary:        PortAudio endpoint support for FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:	alsa-lib
-BuildRequires:	alsa-lib-devel
-BuildRequires:	portaudio-devel
-
-%description endpoint-portaudio
-PortAudio endpoint support for FreeSWITCH open source telephony platform.
-
 %package endpoint-rtmp
 Summary:        RTPM Endpoint support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
@@ -952,16 +822,6 @@ Requires:        %{name} = %{version}-%{release}
 %description event-format-cdr
 JSON and XML Logger for the FreeSWITCH open source telephony platform
 
-%package kazoo
-Summary:	Kazoo Module for the FreeSWITCH open source telephony platform
-Group:		System/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	erlang
-BuildRequires:	erlang
-
-%description kazoo
-Kazoo Module for FreeSWITCH.
-
 %package event-multicast
 Summary:	Multicast Event System for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
@@ -970,14 +830,6 @@ Requires:	%{name} = %{version}-%{release}
 %description event-multicast
 Multicast Event System for FreeSWITCH.
 
-#%package event-zmq
-#Summary:	ZeroMQ Event System for the FreeSWITCH open source telephony platform
-#Group:		System/Libraries
-#Requires:	 %{name} = %{version}-%{release}
-#
-#%description event-zmq
-#ZeroMQ Event System for FreeSWITCH.
-
 %package event-json-cdr
 Summary:	JSON CDR Logger for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
@@ -986,25 +838,6 @@ Requires:	%{name} = %{version}-%{release}
 %description event-json-cdr
 JSON CDR Logger for FreeSWITCH.
 
-%package event-radius-cdr
-Summary:        RADIUS Logger for the FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:        %{name} = %{version}-%{release}
-
-%description event-radius-cdr
-RADIUS Logger for the FreeSWITCH open source telephony platform
-
-%if %{build_mod_rayo}
-%package event-rayo
-Summary:        Rayo (XMPP 3PCC) server for the FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description event-rayo
-Rayo 3PCC for FreeSWITCH.  http://rayo.org   http://xmpp.org/extensions/xep-0327.html
-Rayo is an XMPP protocol extension for third-party control of telephone calls.
-%endif
-
 %package event-snmp
 Summary:	SNMP stats reporter for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
@@ -1053,15 +886,6 @@ transcoding is necessary. The default FreeSWITCH sound files are in wav format.
 Generally, these require transcoding when being played to callers. However, if
 a native format sound file is available then FreeSWITCH can use it. 
 
-%package format-portaudio-stream
-Summary:	PortAudio Media Steam support for the FreeSWITCH open source telephony platform
-Group:		System/Libraries
-Requires:	%{name} = %{version}-%{release}
-BuildRequires:	portaudio-devel
-
-%description format-portaudio-stream
-Portaudio Streaming interface Audio for FreeSWITCH
-
 %package format-shell-stream
 Summary:	Implements Media Steaming from arbitrary shell commands for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
@@ -1097,16 +921,6 @@ BuildRequires:	opusfile-devel >= 0.5
 %description format-opusfile
 Mod Opusfile is a FreeSWITCH module to allow you to play Opus encoded files
 
-%if %{build_mod_ssml}
-%package format-ssml
-Summary:        Adds Speech Synthesis Markup Language (SSML) parser format for the FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description format-ssml
-mod_ssml is a FreeSWITCH module that renders SSML into audio.  This module requires a text-to-speech module for speech synthesis.
-%endif
-
 %package format-tone-stream
 Summary:	Implements TGML Tone Generation for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
@@ -1303,7 +1117,6 @@ The Python ESL module allows for native interaction with FreeSWITCH over the eve
 Summary:        Basic vanilla config set for the FreeSWITCH Open Source telephone platform.
 Group:          System/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	freeswitch-application-abstraction
 Requires:	freeswitch-application-avmd
 Requires:	freeswitch-application-blacklist
 Requires:	freeswitch-application-callcenter
@@ -1328,14 +1141,10 @@ Requires:	freeswitch-application-limit
 Requires:	freeswitch-application-memcache
 Requires:	freeswitch-application-nibblebill
 Requires:	freeswitch-application-redis
-Requires:	freeswitch-application-rss
 Requires:	freeswitch-application-signalwire
 Requires:	freeswitch-application-sms
 Requires:	freeswitch-application-snapshot
-Requires:	freeswitch-application-snom
-Requires:	freeswitch-application-soundtouch
 Requires:	freeswitch-application-spy
-Requires:	freeswitch-application-stress
 Requires:	freeswitch-application-valet_parking
 Requires:	freeswitch-application-video_filter
 Requires:	freeswitch-application-voicemail
@@ -1344,13 +1153,11 @@ Requires:	freeswitch-codec-passthru-amr
 Requires:	freeswitch-codec-bv
 Requires:	freeswitch-codec-passthru-g723_1
 Requires:	freeswitch-codec-passthru-g729
-Requires:	freeswitch-codec-h26x
 Requires:	freeswitch-codec-ilbc
 Requires:	freeswitch-codec-siren
 Requires:	freeswitch-database-pgsql
 Requires:	freeswitch-format-local-stream
 Requires:	freeswitch-format-native-file
-Requires:	freeswitch-format-portaudio-stream
 Requires:	freeswitch-format-tone-stream
 Requires:	freeswitch-lang-en
 
@@ -1398,7 +1205,7 @@ export QA_RPATHS=$[ 0x0001|0x0002 ]
 #						Application Modules
 #
 ######################################################################################################################
-APPLICATION_MODULES_AC="applications/mod_abstraction applications/mod_avmd applications/mod_blacklist \
+APPLICATION_MODULES_AC="applications/mod_avmd applications/mod_blacklist \
 			applications/mod_callcenter  applications/mod_cidlookup \
 			applications/mod_commands applications/mod_conference applications/mod_curl"
 APPLICATION_MODULES_DE="applications/mod_db applications/mod_directory applications/mod_distributor \
@@ -1411,11 +1218,11 @@ APPLICATION_MODULES_DE+="applications/mod_esl"
 
 APPLICATION_MODULES_FR="applications/mod_fifo applications/mod_fsk applications/mod_fsv applications/mod_hash \
 			applications/mod_httapi applications/mod_http_cache applications/mod_lcr applications/mod_limit \
-			applications/mod_memcache applications/mod_mongo applications/mod_nibblebill applications/mod_rad_auth \
-			applications/mod_redis applications/mod_rss "
+			applications/mod_memcache applications/mod_mongo applications/mod_nibblebill \
+			applications/mod_redis "
 
-APPLICATION_MODULES_SZ="applications/mod_signalwire applications/mod_sms applications/mod_snapshot applications/mod_snom applications/mod_soundtouch \
-			applications/mod_spandsp applications/mod_spy applications/mod_stress \
+APPLICATION_MODULES_SZ="applications/mod_signalwire applications/mod_sms applications/mod_snapshot \
+			applications/mod_spandsp applications/mod_spy \
 			applications/mod_valet_parking applications/mod_translate applications/mod_voicemail \
 			applications/mod_voicemail_ivr applications/mod_video_filter"
 
@@ -1434,12 +1241,9 @@ ASR_TTS_MODULES="asr_tts/mod_flite asr_tts/mod_pocketsphinx asr_tts/mod_tts_comm
 #
 ######################################################################################################################
 CODECS_MODULES="codecs/mod_amr codecs/mod_amrwb codecs/mod_bv codecs/mod_codec2 codecs/mod_g723_1 \
-		codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc codecs/mod_isac codecs/mod_mp4v codecs/mod_opus codecs/mod_silk \
+		codecs/mod_g729 codecs/mod_ilbc codecs/mod_opus codecs/mod_silk \
 		codecs/mod_siren codecs/mod_theora"
 #
-%if %{build_sng_tc}
-CODECS_MODULES+="codecs/mod_sangoma_codec"
-%endif
 
 ######################################################################################################################
 #
@@ -1468,10 +1272,10 @@ DIRECTORIES_MODULES=""
 #
 ######################################################################################################################
 ENDPOINTS_MODULES=" \
-			endpoints/mod_loopback endpoints/mod_portaudio endpoints/mod_rtmp \
+			endpoints/mod_loopback endpoints/mod_rtmp \
 			endpoints/mod_skinny endpoints/mod_verto endpoints/mod_rtc endpoints/mod_sofia"
 
-## DISABLED MODULES DUE TO BUILD ISSUES endpoints/mod_gsmopen endpoints/mod_h323 endpoints/mod_khomp 
+## DISABLED MODULES DUE TO BUILD ISSUES endpoints/mod_h323
  
 ######################################################################################################################
 #
@@ -1480,23 +1284,16 @@ ENDPOINTS_MODULES=" \
 ######################################################################################################################
 EVENT_HANDLERS_MODULES="event_handlers/mod_cdr_csv event_handlers/mod_cdr_pg_csv event_handlers/mod_cdr_sqlite \
 			event_handlers/mod_cdr_mongodb event_handlers/mod_format_cdr event_handlers/mod_erlang_event event_handlers/mod_event_multicast \
-			event_handlers/mod_event_socket event_handlers/mod_json_cdr event_handlers/mod_kazoo event_handlers/mod_radius_cdr \
+			event_handlers/mod_event_socket event_handlers/mod_json_cdr \
 			event_handlers/mod_snmp"
-%if %{build_mod_rayo}
-EVENT_HANDLERS_MODULES+=" event_handlers/mod_rayo"
-%endif
 
-#### BUILD ISSUES NET RESOLVED FOR RELEASE event_handlers/mod_event_zmq 
 ######################################################################################################################
 #
 #					File and Audio Format Handlers
 #
 ######################################################################################################################
-FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_opusfile formats/mod_portaudio_stream \
+FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_opusfile \
                  formats/mod_shell_stream formats/mod_shout formats/mod_sndfile formats/mod_tone_stream"
-%if %{build_mod_ssml}
-FORMATS_MODULES+=" formats/mod_ssml"
-%endif
 
 ######################################################################################################################
 #
@@ -1697,17 +1494,6 @@ cd ../..
 #
 ######################################################################################################################
 
-%if %{build_sng_ss7}
-#do not delete a thing
-%else
-%{__rm} -f %{buildroot}/%{MODINSTDIR}/ftmod_sangoma_ss7*
-%endif
-%if %{build_sng_isdn}
-#do not delete a thing
-%else
-%{__rm} -f %{buildroot}/%{MODINSTDIR}/ftmod_sangoma_isdn*
-%endif
-
 %{__rm} -f %{buildroot}/%{LIBDIR}/*.la
 %{__rm} -f %{buildroot}/%{MODINSTDIR}/*.la
 
@@ -1877,7 +1663,6 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/*.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/extensions.conf
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/mime.types
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/abstraction.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/acl.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amr.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amrwb.conf.xml
@@ -1891,7 +1676,6 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_mongodb.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_pg_csv.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_sqlite.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cepstral.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cidlookup.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/conference.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/conference_layouts.conf.xml
@@ -1916,7 +1700,6 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/http_cache.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/ivr.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/java.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/kazoo.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/lcr.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/local_stream.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/logfile.conf.xml
@@ -1929,19 +1712,15 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/oreka.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/osp.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/pocketsphinx.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/portaudio.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/post_load_modules.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/pre_load_modules.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/presence_map.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/redis.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/rss.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/rtmp.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sangoma_codec.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/shout.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/signalwire.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/skinny.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/smpp.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sms_flowroute.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sndfile.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sofia.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/spandsp.conf.xml
@@ -1950,7 +1729,6 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/timezones.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/translate.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/tts_commandline.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/unicall.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/verto.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/voicemail.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/voicemail_ivr.conf.xml
@@ -2009,9 +1787,6 @@ fi
 #						Application Packages
 #
 ######################################################################################################################
-%files application-abstraction
-%{MODINSTDIR}/mod_abstraction.so*
-
 %files application-avmd
 %{MODINSTDIR}/mod_avmd.so*
 
@@ -2090,15 +1865,9 @@ fi
 %files application-nibblebill
 %{MODINSTDIR}/mod_nibblebill.so*
 
-%files application-rad_auth
-%{MODINSTDIR}/mod_rad_auth.so*
-
 %files application-redis
 %{MODINSTDIR}/mod_redis.so*
 
-%files application-rss
-%{MODINSTDIR}/mod_rss.so*
-
 %files application-signalwire
 %{MODINSTDIR}/mod_signalwire.so*
 
@@ -2108,18 +1877,9 @@ fi
 %files application-snapshot
 %{MODINSTDIR}/mod_snapshot.so*
 
-%files application-snom
-%{MODINSTDIR}/mod_snom.so*
-
-%files application-soundtouch
-%{MODINSTDIR}/mod_soundtouch.so*
-
 %files application-spy
 %{MODINSTDIR}/mod_spy.so*
 
-%files application-stress
-%{MODINSTDIR}/mod_stress.so*
-
 %files application-translate
 %{MODINSTDIR}/mod_translate.so*
 
@@ -2174,27 +1934,13 @@ fi
 %files codec-passthru-g729
 %{MODINSTDIR}/mod_g729.so*
 
-%files codec-h26x
-%{MODINSTDIR}/mod_h26x.so*
-
 %files codec-ilbc
 %{MODINSTDIR}/mod_ilbc.so*
 
-%files codec-isac
-%{MODINSTDIR}/mod_isac.so*
-
-%files codec-mp4v
-%{MODINSTDIR}/mod_mp4v.so*
-
 %files codec-opus
 %{MODINSTDIR}/mod_opus.so*
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/opus.conf.xml
 
-%if %{build_sng_tc}
-%files sangoma-codec
-%{MODINSTDIR}/mod_sangoma_codec.so*
-%endif
-
 %files codec-silk
 %{MODINSTDIR}/mod_silk.so*
 
@@ -2231,18 +1977,9 @@ fi
 #
 ######################################################################################################################
 
-#%files endpoint-gsmopen
-#%{MODINSTDIR}/mod_gsmopen.so*
-
 #%files endpoint-h323
 #%{MODINSTDIR}/mod_h323.so*
 
-#%files endpoint-khomp
-#%{MODINSTDIR}/mod_khomp.so*
-
-%files endpoint-portaudio
-%{MODINSTDIR}/mod_portaudio.so*
-
 %files endpoint-rtmp
 %{MODINSTDIR}/mod_rtmp.so*
 
@@ -2280,23 +2017,9 @@ fi
 %files event-multicast
 %{MODINSTDIR}/mod_event_multicast.so*
 
-#%files event-zmq
-#%{MODINSTDIR}/mod_xmq.so*
-
 %files event-json-cdr
 %{MODINSTDIR}/mod_json_cdr.so*
 
-%files kazoo
-%{MODINSTDIR}/mod_kazoo.so*
-
-%files event-radius-cdr
-%{MODINSTDIR}/mod_radius_cdr.so*
-
-%if %{build_mod_rayo}
-%files event-rayo 
-%{MODINSTDIR}/mod_rayo.so*
-%endif
-
 %files event-snmp
 %{MODINSTDIR}/mod_snmp.so*
 
@@ -2315,20 +2038,12 @@ fi
 %files format-opusfile
 %{MODINSTDIR}/mod_opusfile.so*
 
-%files format-portaudio-stream
-%{MODINSTDIR}/mod_portaudio_stream.so*
-
 %files format-shell-stream
 %{MODINSTDIR}/mod_shell_stream.so*
 
 %files format-mod-shout
 %{MODINSTDIR}/mod_shout.so*
 
-%if %{build_mod_ssml}
-%files format-ssml
-%{MODINSTDIR}/mod_ssml.so*
-%endif
-
 %files format-tone-stream
 %{MODINSTDIR}/mod_tone_stream.so*
 
diff --git a/libs/.gitignore b/libs/.gitignore
index 87da2671c6..def72ad13e 100644
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -57,33 +57,6 @@ opal
 /esl/Debug/
 /esl/Release/
 /flite-*/
-/freeradius-client-*/
-/iksemel/build/compile
-/iksemel/doc/Makefile
-/iksemel/doc/Makefile.in
-/iksemel/include/config.h
-/iksemel/include/Makefile
-/iksemel/include/Makefile.in
-/iksemel/include/stamp-h1
-/iksemel/Makefile
-/iksemel/Makefile.in
-/iksemel/src/Makefile
-/iksemel/src/Makefile.in
-/iksemel/test/Makefile
-/iksemel/test/Makefile.in
-/iksemel/test/tst-dom
-/iksemel/test/tst-filter
-/iksemel/test/tst-iks
-/iksemel/test/tst-ikstack
-/iksemel/test/tst-jid
-/iksemel/test/tst-md5
-/iksemel/test/tst-sax
-/iksemel/test/tst-sha
-/iksemel/tools/ikslint
-/iksemel/tools/iksperf
-/iksemel/tools/iksroster
-/iksemel/tools/Makefile
-/iksemel/tools/Makefile.in
 /ilbc/config-h.in
 /ilbc/doc/Makefile
 /ilbc/doc/Makefile.in
@@ -446,8 +419,6 @@ opal
 /sofia-sip/win32/Makefile
 /sofia-sip/win32/Makefile.in
 /sounds/
-/soundtouch/
-/soundtouch-*/
 /sphinxbase-*/
 /srtp/aes_tables
 /srtp/config_in.h
@@ -600,7 +571,6 @@ opal
 /v8-*.zip
 
 # build products we should remove
-!/iksemel/ltmain.sh
 !/libg722_1/config/depcomp
 !/libg722_1/config/missing
 !/tiff-*/config/depcomp
@@ -619,10 +589,7 @@ srtp/build/compile
 /sqlite-*/
 /sqlite/
 /ldns/
-/portaudio/
-portaudio.*.log
 apr/configure
-iksemel/configure
 libyuv/Makefile
 libyuv/convert
 srtp/configure
diff --git a/libs/esl/managed/esl.2017.vcxproj b/libs/esl/managed/esl.2017.vcxproj
index f004381411..a140d2d296 100644
--- a/libs/esl/managed/esl.2017.vcxproj
+++ b/libs/esl/managed/esl.2017.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{FEA2D0AE-6713-4E41-A473-A143849BC7FF}</ProjectGuid>
     <RootNamespace>ESL</RootNamespace>
     <Keyword>ManagedCProj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
diff --git a/libs/iksemel/.update b/libs/iksemel/.update
deleted file mode 100644
index a3a56a0ec9..0000000000
--- a/libs/iksemel/.update
+++ /dev/null
@@ -1 +0,0 @@
-Mon Jul 15 16:57:11 CDT 2013
diff --git a/libs/iksemel/AUTHORS b/libs/iksemel/AUTHORS
deleted file mode 100644
index 2ba1196f3e..0000000000
--- a/libs/iksemel/AUTHORS
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Author
-======
-
-Gurer Ozen <madcat@e-kolay.net>
-
-
-Contributions
-=============
-
-Bernhard R. Link (code)
-Fabien Ninoles (code)
-Evan Prodromou (jabberx improvements, project maintenance)
-David Yitzchak Cohen (countless bug reports)
-Benoit Laniel (mingw port)
-Darrell Karbott (ikstransport)
-Rafal Piotrowski (SASL auth)
diff --git a/libs/iksemel/COPYING b/libs/iksemel/COPYING
deleted file mode 100644
index c4792dd27a..0000000000
--- a/libs/iksemel/COPYING
+++ /dev/null
@@ -1,515 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-^L
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it
-does.>
-    Copyright (C) <year>  <name of author>
-
-    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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Also add information on how to contact you by electronic and paper
-mail.
-
-You should also get your employer (if you work as a programmer) or
-your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/libs/iksemel/ChangeLog b/libs/iksemel/ChangeLog
deleted file mode 100644
index 789652105f..0000000000
--- a/libs/iksemel/ChangeLog
+++ /dev/null
@@ -1,648 +0,0 @@
-2007-08-02  Gurer
-	* tst-iks.c: test for new append/prepend functions added.
-
-2007-08-01  Gurer
-	* Patch from Benjamin Bennett:
-	  base64.c: fix padding
-	* sha.c: 64bit fix (long -> int)
-	* iks.c: new funcs: iks_append, iks_prepend
-	  iks_append_cdata, iks_prepend_cdata
-	* stream.c: iks_sasl_challenge split into smaller functions
-	  This change also fixes some possible leaks which are detected
-	  by Coverity Inc's excellent Prevent product.
-
-2006-05-19  Gurer
-	* dom.c: fixed (size % FILE_IO_BUFFER_SIZE) problem in iks_load()
-
-2005-08-29  Gurer
-	* Patch from Jakob Schroter:
-	  iksemel.texi: small documentation update
-	* Patch from Darrell Karbott:
-	  sax.c: use fixed instead of floating point (for arm)
-	  mark static const data properly
-	  explicit char* uchar* casts
-
-2004-08-14  Gurer
-	* version bump to 1.3
-	* patch from Roland Hedberg
-	  io-posix.c: io_connect now tries all addrinfo values.
-
-2004-08-05  Gurer
-	* iksemel.h: ikstransport cosmetic cleanup.
-	* iksemel.texi: mingw notice added.
-
-2004-07-30  Gurer
-	* iksemel.h: get_fd and connect_fd is removed from ikstransport api.
-	  ikstransport structure now has an abi_version field.
-	  new IKS_TRANSPORT_V1 macro defined for using in abi_version.
-	* io-posix.c: modified for new ikstransport scheme.
-	* stream.c: iks_connect_fd and iks_fd now works directly.
-
-2004-07-30  Gurer
-	* sax.c: bug in parser's utf8 checker fixed.
-
-2004-07-28  Gurer
-	* stream.c: buffer size corrected in iks_send_header.
-
-2004-07-26  Gurer
-	* iksroster.c: "iksroster" resource is default, if not given by user.
-	* stream.c: iks_start_tls() cosmetic cleanup.
-
-2004-07-23  Gurer
-	* iks.c: ikstack value of attribute nodes wasnt set correctly. fixed.
-
-2004-07-21  Gurer
-	* patch from Benoit Laniel
-	  configure.ac: objdump check for cross compiling
-	  iksroster.c, perf.c, io-unix.c: WIN32 is changed to _WIN32
-
-2004-07-19  Gurer
-	* iks.c: iks_child() verifies that node is a tag before accessing
-	  children field in struct.
-
-2004-07-13  Gurer
-	* stream.c: if no realm is provided in sasl, server name is used
-
-2004-06-14  Gurer
-	* iksemel.texi: sasl&tls funcs documented a bit.
-
-2004-06-14  Gurer
-	* patch from Darrell Karbott
-	  iksemel.h: async events are passed as a struct
-	    ikstransport struct is defined as const
-	    server_name is passed to the iksTConnectAsync
-	    additional network error codes
-	  stream.c: iks_recv() checks if iks_disconnect called during parsing
-
-2004-05-22  Gurer
-	* iks.c: iks_cdata() returns value for attributes
-	* sax.c: utf8 stack_pos fix
-
-2004-05-19  Gurer
-	* io-posix.c: now compiles without getaddrinfo()
-
-2004-05-05  Gurer
-	* sax.c: iks_parser_stack() added, returns the ikstack of an iksparser
-	* stream.c: ikstranport api is now passing iksparser instead of ikstack
-	  to the connect functions.
-
-2004-05-05  Gurer
-	* stream.c: patch from Rafal Piotrowski
-	  iks_sasl_challenge() cleanup
-
-2004-05-01  Gurer
-	* iksroster.c: sasl auth finally works.
-
-2004-04-30  Gurer
-	* iksroster.c: cleanup.
-
-2004-04-30  Gurer
-	* Another patch from Rafal Piotrowski
-	  tst-md5.c: test code for md5.c functions, and new utils:
-	  iks_make_resource_bind(), iks_make_session(), iks_stream_features()
-	* iksemel.h: iks_auth_sasl renamed to iks_start_sasl
-	   IKS_AUTH_SASL_PLAIN renamed to IKS_SASL_PLAIN
-	   IKS_AUTH_SASL_DIGEST_MD5 renamed to IKS_SASL_DIGEST_MD5
-
-2004-04-29  Gurer
-	* Patch from Rafal Piotrowski applied
-	  md5 and base64 api, and sasl auth support!
-	* iksroster.c: --sasl option added.
-
-2004-04-27  Gurer
-	* io-unix.c: renamed to io-posix.c, it runs on windows with mingw
-	  so less confusion this way.
-	* stream.c: warnings cleaned up, iks_connect_async_with finished.
-
-2004-04-26  Gurer
-	* iksemel.h: new error code IKS_NET_TLSFAIL
-	* stream.c: tls code cleaned up.
-	* configure.ac: new option --disable-default-io
-	  you can use it to disable compiling of io-unix.c if you dont need
-	  it and want to use your own socket code.
-
-2004-04-13  Gurer
-	* iksemel.h: new error code IKS_NET_NOTSUPP
-	* stream.c: not supported error code is supported now :)
-	* sha.c: free() is replaced with iks_free()
-
-2004-04-10  Gurer
-	* stream.c: saga continues, tls is working on ikstransport.
-	* iksroster.c: --log option for turning on xml debug output.
-
-2004-04-10  Gurer
-	* stream.c: second part:
-	  it is using iks_default_transport (provided by io-unix.c) now.
-	  all network code is removed.
-	  iks_connect_with() allows you to use your own transport code.
-	  (note: testing needed and async api is not fully implemented yet)
-
-2004-04-10  Gurer
-	* iksemel.h: first part of the long expected socket abstraction.
-	  many thanks to Darrell Karbott for ideas and a sample implementation.
-	* io-unix.c: new file, transport code for unix sockets.
-
-2004-03-22  Gurer
-	* dom.c: iks_load() now frees the resources if iks_parse returns error.
-
-2004-03-19  Gurer
-	* stream.c: iks_is_secure() added, checks that if a stream is secured.
-	* iksroster.c: cleanup a bit.
-
-2004-03-18  Gurer
-	* iksroster.c, stream.c: secure connection works, but api isn't
-	stablized yet, and some cleanup needed.
-
-2004-03-08  Gurer
-	* iksroster.c: new option for secure connection, needs testing.
-
-2004-03-01  Gurer
-	* sax.c: second part, IKS_NOMEM conditions are checked properly.
-
-2004-02-29  Gurer
-	* iksemel.h: stddef.h is included to get size_t for C apps.
-	* sax.c: first part of the memory usage optimization.
-
-2004-02-27  Gurer
-	* iksemel.h: cstddef is included for C++ apps to provide size_t type.
-
-2004-02-25  Gurer
-	* src/sha.c: iks_sha_print() uses lowercase hex numbers now.
-
-2004-02-10  Gurer
-	* src/iks.c: Tag, cdata and attribute structures have different sizes now.
-	  Saves 8 bytes per tag, 20 bytes per cdata/attrib on 32 bit archs.
-
-2004-02-10  Gurer
-	* src/ikstack.c: iks_stack_stats is dead, long live iks_stack_stat.
-	* tools/iksperf.c: dom test now iks_delete()s the parsed tree
-		and even measures the freeing time.
-
-2004-02-07  Gurer
-	* src/ikstack.c: iks_stack_stats returns total values.
-
-2004-02-06  Gurer
-	* src/ikstack.c: new stack implementation, all callers changed too.
-
-2004-02-03  Gurer
-	* test/tst-ikstack.c: tst-ikstack-str.c moved here.
-	* test/tst-ikstack.c: alignment test added.
-	* src/ikstack.c: iks_stack_alloc() always returns aligned memory.
-	* src/ikstack.c: patch from Ilkka Lyytinen:
-		iks_stack_strecat alignment fix.
-
-2003-10-16  Gurer
-	* src/iks.c: escape_size off by one bug in iks_string() is fixed.
-	* src/dom.c: iks_load and iks_save uses (const char *) for filename now.
-
-2003-10-09  Gurer
-	* src/Makefile.am: --no-undefined changed to -no-undefined
-	* stream.c: data->current is NULLed *before* calling the hook,
-	  so you can keep the node in memory when you are returning
-	  an error from your hook.
-	* tools/perf.c: GetTickCount is used instead of gettimeofday on Windows.
-
-2003-10-08  Gurer
-	* dom.c: iks_save is not using unnecessary object stack.
-	* A great patch from Benoit Laniel <nels@pgroupe.net> applied.
-	This allows iksemel to be compiled on Windows with MinGW.
-	Detailed changes:
-	* configure.ac: check for st_blksize in stat structure (which is
-	  missing in Windows). Check for libwsock32, the Windows socket library.
-	  The check is only done when compiling for a MinGW host to avoid
-	  problems when having Wine libraries.
-	* src/Makefile.am: add -no-undefined to libiksmel_la_LDFLAGS to enable
-	  DLL compilation on Windows.
-	* src/stream.c: include winsock.h and do not include posix socket
-	  headers on Windows. Use closesocket instead of close on Windows.
-	  Check socket errors with '== -1' instead of '< 0'.
-	* tools/ikslint.c: conditional use of st_blksize.
-	* tools/iksroster.c: add Winsock initialization and cleanup code
-	  (needed to use sockets on Windows).
-
-2003-10-05  Gurer
-	* utility.c: iks_set_mem_funcs() added.
-	* iksperf.c: --memdbg option added.
-	* tools/perf.c: mallinfo stuff removed.
-
-2003-09-15  Gurer
-	* version bump to 1.2
-	* stream.c: iks_start_tls() added with the help of gnutls library.
-
-2003-09-11  Gurer
-	* stream.c: iks_connect_via() added. it can send a different name to the
-	  connected server. useful for connecting the server via a ssh tunnel.
-	  suggestion and patch by Wolf Bergenheim.
-
-2003-09-09  Gurer
-	* stream.c: network buffer is allocated inside the stack at the first
-	  connect call, and not free()d with reset.
-
-2003-09-08  Gurer
-	* sax.c: iks_parser_reset() no longer free()s allocated buffers.
-	  it also calls the delete hook of the extending parser.
-	* dom.c: reset zeroes internal state.
-	* stream.c: resetting the parser is now equal to iks_disconnect ()
-
-2003-09-07  Gurer
-	* sax.c: malloc()s changed with iks_malloc()
-	  attr buffer is not freed after each tag. minor speedup.
-
-2003-09-05  Gurer
-	* ikslint.c: tag histogram is per file now instead of global.
-
-2003-09-04  Gurer
-	* iksemel.texi: resource links moved to here from HACKING.
-	* utility.c: iks_malloc(), iks_free() wrappers added.
-	  all malloc() and free() calls are changed with them.
-
-2003-09-03  Gurer
-	* ikslint.c: can display tag usage histogram now.
-
-2003-09-03  Gurer
-	* ikslint.c: benchmark options removed. reading from stdin supported.
-	  reports tag mismatchs.
-	* dom.c: iks_tree() added. converts a string into a tree.
-	* iksemel.texi: iks_tree, iks_set_size_hint, iks_copy documented.
-
-2003-09-03  Gurer
-	* iks.c: iks_string() now malloc()s memory if no stack is given.
-	  it also runs *very* fast now.
-
-2003-09-02  Gurer
-	* iksperf.c: errors are redirected to stderr again.
-	  tree serialization test added.
-
-2003-08-31  Gurer
-	* dom.c: default chunk size is increased. iks_set_size_hint()
-	  function added. you can give an approximate size for the
-	  file, and a better chunk size is selected for memory allocations.
-	  greatly speeds up dom parser.
-	* iksperf.c: dom test uses iks_set_size_hint(). small fixes.
-	* iksperf.c: sha1 test.
-
-2003-08-31  Gurer
-	* tools/iksperf.c: new tool for speed/memory usage testing.
-	* iksemel.texi: a new chapter about iksemel development added.
-
-2003-08-23  Gurer
-	* doc/iksemel.texi: document license changed to GPL from GNU Free
-	  Documentation License.
-	* ikstack.c: iks_stack_strecat() added.
-	* iks.c: iks_insert_cdata() modified to use iks_stack_strecat().
-	  this greatly reduces memory usage when data is parsed in very small
-	  chunks or cdata sections contains lots of escaped characters.
-
-2003-07-29  Gurer
-	* iksemel.h: iks_connect_tcp(), iks_send_stream() and
-	  iks_send_raw() now take const arguments.
-	* iks.c: iks_root() added.
-	* iks.c: iks_string() works on cdata nodes.
-
-2003-07-20  Gurer
-	* iks.c: iks_copy() bug is fixed.
-
-2003-07-15  Gurer
-	* dom.c: whitespace outside of markup won't added to the tree.
-	* stream.c: iks_connect_fd correctly sets SF_FOREIGN flag.
-	* src/Makefile.am: libtool revision bump, forgot that while doing 1.1 bump.
-	* iks.c: new iks_copy() and iks_copy_within() functions.
-
-2003-06-29  Gurer
-	* 1.0 release!
-	* version bump to 1.1
-
-2003-06-26  Gurer
-	* ikstack.c: reallocation bug in iks_stack_strcat() fixed.
-	* ikstack.c: iks_stack_strcat() and iks_stack_strcatv() now returns
-	  a non-zero value if there isn't enough memory.
-	* iks.c: new functions: iks_next_tag(), iks_prev_tag(), iks_first_tag().
-	* iks.c: new function: iks_find_with_attrib().
-
-2003-06-19  Gurer
-	* stream.c: new function iks_connect_fd ().
-	* stream.c: iks_send_header () is modified.
-
-2003-06-17  Gurer
-	* sax.c: tags without attributes which contain whitespace before '>'
-	  parsed correctly.
-
-2003-06-16  Gurer
-	* stream.c: node isn't deleted automatically after hook anymore.
-	* iksroster.c: upload is working.
-
-2003-06-15  Gurer
-	* tools/iksroster.c: new goodie. backups your jabber roster.
-	* iks.c: iks_insert_attrib() can be used for modifying and deleting attributes.
-	* stream.c: return value of the stream hook is actually used.
-
-2003-06-13  Gurer
-	* iksemel.texi: more text.
-	* iksemel.h: iksFilterHook now returns 'int' instead of 'enum iksfilterret'.
-
-2003-06-12  Gurer
-	* iksemel.h: iksStreamHook's return type is changed 'enum ikserror' to int.
-	  type is changed 'enum iksnodetype' to int.
-	* iksemel.texi: more text.
-
-2003-06-09  Gurer
-	* doc/iksemel.texi: restructured.
-	* iksemel.h: 'enum ikstagtype' type is changed to 'int' in iksTagHook.
-	  'enum ikserror' changed to 'int' in iksTagHook, iksCDataHook, iks_parse().
-	  'enum iksfileerror' changed to 'int' in iks_load() and iks_save().
-	  'enum iksneterror' changed to 'int' in stream.c functions.
-	  common error values removed from iksfileerror and iksneterror.
-	* dom.c: iks_load() checks the return value of iks_parse() now.
-
-2003-06-02  Gurer
-	* filter.c: rules now has priority:
-	  id > from = from_partial > ns > subtype > type
-
-2003-05-29  Gurer
-	* jabber.c: fixes and API cleanup:
-	  iks_id_new() now sets id->partial field.
-	  pak->to field removed.
-	  'to' argument added to iks_make_s10n()
-	  'type' and 'to' arguments removed from iks_make_pres()
-	  const keyword added to prototypes.
-	* filter.c: TO rule removed, FROM_PARTIAL rule added.
-
-2003-05-26  Gurer
-	* sax.c: new function iks_nr_lines(), returns how much lines parsed.
-	* ikslint.c: document's line number is displayed in errors. some cleanup.
-
-2003-05-26  Gurer
-	* sax.c: a bug in C_TAG context is found and fixed.
-
-2003-05-24  Gurer
-	* sax.c: saga continues:
-	  UTF8 validity checks added. You can't feed famous 0xC0 0x80 anymore.
-	  <![CDATA[ ... ]]> sections are recognized.
-	* tst-sax.c: related tests added as usual.
-
-2003-05-23  Gurer
-	* tools/ikslint.c: new goodie, checks xml files for well-formedness.
-	* sax.c: Attribute values can contain ' or " if they are quoted within
-	  the other quote character.
-
-2003-05-23  Gurer
-	* tst-sax.c: framework and tests for badly formed xml.
-	* sax.c: more cleanup, and well-formedness checks:
-	  iks_parse() argument for xml data is now const char*.
-	  0xFF, 0xFE and 0x00 bytes are invalid utf8.
-	  Close tags have no attributes.
-	  Single tags must end with '/>'.
-
-2003-05-22  Gurer
-	* sax.c: some cleanup.
-	* sax.c: iks_get_udata() renamed to iks_user_data()
-	* sax.c: new function iks_nr_bytes(), returns how much bytes parsed.
-	* tst-sax.c, tst-dom.c: uses iks_nr_bytes() when reporting bugs.
-
-2003-05-22  Gurer
-	* iks.c: iks_string() was printing siblings of the toplevel tag. fixed.
-	  thanks David Yitzchak Cohen for reporting.
-	* HACKING: URLs of related standart documents added.
-	* tst-filter.c: new framework.
-	* tst-dom.c: new framework and tests.
-
-2003-05-20  Gurer
-	* sax.c: '>' is valid and '--' is invalid inside the comments.
-
-2003-05-17  Gurer
-	* HACKING: explanation of iksemel's design goals added.
-	* sax.c: parser now ignores PIs, markup and comments.
-	* dom.c, stream.c: PI checks removed.
-
-2003-05-16  Gurer
-	* sax.c: several fixes.
-	* tst-sax.c: attribute checks and more tests.
-
-2003-05-16  Gurer
-	* tst-sax.c: improved framework and more tests.
-	* finetune.h: DEFAULT_DOM_CHUNK_SIZE, DEFAULT_STREAM_CHUNK_SIZE
-	* stream.c, dom.c: now uses chunk size values from finetune.h
-
-2003-05-07  Gurer
-	* complete redesign here.
-
-2002-01-16  Evan Prodromou <mr.bad@pigdog.org>
-	* test/testiks.c: removed buggy unit test for previous entry,
-	  since I couldn't figure out why it segfaulted. Will investigate
-	  and fix later.
-	
-2002-01-07  Evan Prodromou <mr.bad@pigdog.org>
-	* core.c: fixed off-by-one bug with reallocation of attributes.
-	* test/testiks.c: added test for above bug.
-	
-2002-12-20  Evan Prodromou <mr.bad@pigdog.org>
-	* COPYING: New version of the LGPL.
-	* INSTALL: New FSF install info. Both of these were updated by autoreconf.
-		
-2002-12-12  Evan Prodromou <mr.bad@pigdog.org>
-	* include/iksemel.h: added id to Jabber packets.
-	* src/jabber.c: get ID in Jabber packets.
-
-2002-12-9  Evan Prodromou <mr.bad@pigdog.org>
-	* doc/ROADMAP: added this file.
-
-2002-11-28  Evan Prodromou <mr.bad@pigdog.org>
-	* io.c: broke out stream initialization to its own function, in
-	  anticipation of supporting other kinds of streams.
-	* iksemel.h: added new stream function.
-
-2002-11-15  Evan Prodromou <mr.bad@pigdog.org>
-	* configure.in: added check to see if you want to build with dmalloc.
-	* parser.c: make Jabber parsers use pool memory. Also, make Jabber
-	  parser delete packets after posting them to callback function.
-	* convert.c: made converter used pool memory.
-	* iks.c: fixed iks constructor/destructor so they mark pool owner
-	  and only delete the pool if the iks is the owner.
-	* sha.c: changed sha objects to use pool memory.
-	
-2002-11-07  Evan Prodromou <mr.bad@pigdog.org>
-
-	* ikspool.c: added ALIGN_ON, ALIGNED(), *_OFFSET macros.
-	  Try to make sure that all pointer math is done with
-	  aligned (val % ALIGN_ON == 0) values.
-	  Fixed bug in _realloc() where incoming size wasn't
-	  checked for alignment, size.
-	* testpool.c: added tests for absurdly small values
-	  of page size, alloc size, realloc size.
-
-2002-11-06  Evan Prodromou <mr.bad@pigdog.org>
-
-	* iksemel.h: added IKS_NS_XROSTER, for jabber:x:roster NS.
-
-2002-11-06  Evan Prodromou <mr.bad@pigdog.org>
-
-	* core.c: changed iks_parse to use realloc instead of
-	  malloc, copy, free.
-
-2002-11-04  Evan Prodromou <mr.bad@pigdog.org>
-
-	* ikspool.c: For iks_pool_realloc, made it call _alloc if the
-	  passed-in pointer is NULL. This is the way realloc() works.
-        * testpool.c: added a test for the above condition.
-	
-2002-11-04  Evan Prodromou <mr.bad@pigdog.org>
-
-	* ikspool.c: Added some comments.
-
-2002-11-03  Evan Prodromou <mr.bad@pigdog.org>
-
-	* iksid.c: changed contract for iks_id_new, iks_id_set: const char *
-	           instead of char *.
-	* iksemel.h: changed prototypes for iks_id_new, iks_id_set.
-
-2002-11-03  Evan Prodromou <mr.bad@pigdog.org>
-
-	* iksid.c: fixed bug in iks_id_set causing segfault if field was
-	           previously NULL.
-	* testid.c: added tests to check for above bug.
-	* test/.cvsignore: Ignore testpool and testid.
-	
-2002-11-03  Evan Prodromou <mr.bad@pigdog.org>
-
-	* iksid.c: fixed bug in iks_id_new with partial (no resource) IDs.
-	* testid.c: added tests to check for above bug.
-	
-2002-11-03  Evan Prodromou <mr.bad@pigdog.org>
-
-	* iksid.c: moved iksid functions to this file from jabber.c.
-	           added new function, iks_id_delete, to delete an iksid.
-		   implemented iks_id_set.
-		   made iks_id_new use iks_pool_set_owner if it creates a pool.
-		   changed iks_id_new so it doesn't write on src.
-	* iksemel.h: added prototype for iks_id_delete.
-	* testid.c: created basic unit tests for iksid.	
-
-2002-11-02  Evan Prodromou <mr.bad@pigdog.org>
-
-	* Added the beginnings of unit tests for memory allocation.
-	  More needed.
-		
-2002-11-02  Evan Prodromou <mr.bad@pigdog.org>
-
-	* ikspool.c: added new best-fit memory allocation functions.
-	* utility.c: removed old memory-allocation functions.
-	* iksemel.h: added new memory allocation functions:
-	  	     iks_pool_owner
-		     iks_pool_set_owner
-		     iks_pool_realloc
-		     iks_pool_calloc
-		     iks_pool_free
-		     redefined ikspool structure for hiding.
-
-2001-06-08  Gurer <palpa@jabber.org>
-
-	* core.c: xml unescaping.
-
-2001-06-07  Gurer <palpa@jabber.org>
-
-	* convert.c: small bugfix in iks_conv_new()
-
-2001-05-25  Gurer <palpa@jabber.org>
-
-	* configure.in: now checks gcc before adding -Wall to CFLAGS
-	* io.c: iks_recv() and iks_load() fixes.
-
-2001-05-24  Gurer <palpa@jabber.org>
-
-	* configure.in: more checks.
-	* include/common.h: deals with including right files depending on
-	  configure checks, source files include this.
-
-2001-05-22  Gurer <palpa@jabber.org>
-
-	* jabber.c: iks_id_printx() added
-	            new packet type IKS_PAK_ERROR for <stream:error>
-	* sha.c: iks_sha_delete() added
-	* configure.in, parser.c: optional expat support
-
-2001-05-21  Gurer <palpa@jabber.org>
-
-	* parser.c: restructured. now parsers are allocated via iks_sax_new
-	* core.c: actual parser is moved to here
-	* convert.c: charset conversion stuff moved to here
-	* utility.c: alignment bug of iks_pool_alloc fixed
-
-2001-04-10  Gurer <palpa@jabber.org>
-
-	* utility.c: charset convertion functions now use a static buffer and
-	             require string length argument
-
-2001-03-19  Gurer <palpa@jabber.org>
-
-	* utility.c: iks_conv_from/to renamed to iks_conv_utf8/locale
-	             iconv fixes
-
-2001-03-17  Gurer <palpa@jabber.org>
-
-	* utility.c: iks_conv_from/to() fixes
-	* doc/: a bit more documentation
-
-2001-03-15  Gurer <palpa@jabber.org>
-
-	* jabber.c: iks_packet() uses the namespace of first child in IQ packets
-	            instead of looking for a <query> tag.
-	* utility.c: iks_conv_ functions for utf8<->locale convertions
-
-2001-03-13  Fabien Ninoles <fabien@debian.org>
-
-	* autogen.sh: Well, autoconf are better run into the src directory, indeed.
-	* configure.in: Add iconv check, ripped from gabber.
-	* src/Makefile.am: Oops! include dir is in srcdir!
-
-2001-03-12  Gurer <palpa@jabber.org>
-
-	* doc/ : new files, basic structure for documentation
-
-2001-03-09  Fabien Ninoles <fabien@debian.org>
-
-	* utility.c: Correction to the unescape routine... which do some
-	             mess around with indexes.
-	* parser.c: Unescape CDATA et attrib value before inserting them.
-	* autogen.sh: Enable running it from a build directory.
-
-2000-03-07  Gurer <palpa@jabber.org>
-
-	* iks.c: iks_string() now works correctly with a NULL ikspool argument
-	* io.c: return code check of fputs in iks_save() is corrected
-	* doc: new directory
-	* doc/main.texi: started documenting the library API in Texinfo format
-
-2000-03-05  Gurer <palpa@jabber.org>
-
-	* iksemel.h: IKS_NS_ macros synced with latest jabber server
-	* parser.c: attribute buffer grow bug fixed
-	* iks.c: iks_hide() implemented
-
-2000-02-01  Gurer <palpa@jabber.org>
-
-	* parser.c: attribute pointers bug fixed
-	* testiks.c: new test for parser
-
-2000-01-30  Gurer <palpa@jabber.org>
-
-	* configure.in, makefile.am, test/makefile.am: make check target works now
-	* testiks.c: new tests for string and xml node functions
-
-2000-01-28  Gurer <palpa@jabber.org>
-
-	* test: new directory
-	* test/testiks.c: a simple program for self testing
-	* makefile.am, src/makefile.am: fixes for make dist
-
-2000-01-25  Gurer <palpa@jabber.org>
-
-	* sha.c: sha1 implementation
-	* jabber.c: iks_make_auth() now supports digest auth
-
-2000-01-16  Gurer <palpa@jabber.org>
-
-	* io.c: iks_load() implemented
-
-2000-12-20  Gurer <palpa@jabber.org>
-
-	* initial commit.
diff --git a/libs/iksemel/HACKING b/libs/iksemel/HACKING
deleted file mode 100644
index 5cd46d5d3a..0000000000
--- a/libs/iksemel/HACKING
+++ /dev/null
@@ -1,71 +0,0 @@
-
-License:
-========
-
-iksemel is developed and released under GNU Lesser General Public License.
-A copy of the license can be found in the file COPYING. You should read it
-before sending patches to the iksemel, since it is implicitly assumed that
-your patches are also submitted under the LGPL license.
-
-
-Roadmap:
-========
-
-Main goal of the iksemel is removing complexity from programs using the
-library and the library itself. This is the reason why only a subset of XML
-is supported. Some things like UTF16, entity definitons, DTDs will be eventually
-implemented when we found ways to implement them without adding
-too much complexity to the iksemel code. Somewhat external standarts
-(XPath, XQuery, XSLT, vs) will probably not make it into the iksemel.
-
-* validation
-
-I think easiest way to add this feature is writing another parser based on the
-sax parser which parses a dtd (either from sax parser's markup callback which
-needs to be implemented or from an external source via iks_vsax_set_dtd() call)
-and checks the arguments of sax callbacks. Using it via dom or stream parsers
-can require some clever tricks. there are also xml schemas. they are easy to parse
-(it is xml anyway) but can be hard to apply.
-
-* utf16
-
-There are two sides of this. Improving parser to accept utf16 can be relatively
-easy. But on the client side things can get confusing. What will be the default
-character set used by iks_new(), iks_insert_cdata() and similar functions? and
-how they will allow other charsets to be used. Supporting more than utf8 and
-utf16 is more difficult. Hopefully there is no immediate need for this. Jabber
-uses only utf8 and you can use iconv if you are using another charset in your
-application. Btw, there is also byte order issue which is silly. Inventor of BOM
-crap must be killed.
-
-* jabber roster
-
-Roster handling generally depends on the UI system used. But I think a generic
-roster handler which parses roster result, pushes, presence changes and
-allows application to access and display this data can be useful. Challenge
-here is making it UI independent and extensible by the application.
-
-
-File Layout:
-============
-
-doc/
-* iksemel.texi                Documentation in texinfo format.
-include/
-* common.h                    Internal header for some common definitions.
-* iksemel.h                   Library API
-* finetune.h                  Default memory allocation sizes.
-src/
-* ikstack.c                   Memory management functions.
-* utility.c                   Small string utility functions.
-* iks.c                       XML tree management.
-* sax.c                       SAX parser.
-* dom.c                       DOM parser.
-* stream.c                    Stream parser.
-* sha.c                       SHA1 hash functions.
-* jabber.c                    Jabber utilities.
-* filter.c                    Packet filter for Jabber.
-test/
-(self test programs)
-tools/
-(varius utility programs)
diff --git a/libs/iksemel/INSTALL b/libs/iksemel/INSTALL
deleted file mode 100644
index 7d1c323bea..0000000000
--- a/libs/iksemel/INSTALL
+++ /dev/null
@@ -1,365 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/libs/iksemel/Makefile.am b/libs/iksemel/Makefile.am
deleted file mode 100644
index 8ba57fec42..0000000000
--- a/libs/iksemel/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## Process this file with automake to produce Makefile.in
-##
-
-SUBDIRS = include src tools test doc
-
-EXTRA_DIST = HACKING iksemel.pc.in
-
-pkgconfigdir=$(libdir)/pkgconfig
-pkgconfig_DATA = iksemel.pc
-
-snapshot:
-	$(MAKE) dist distdir=$(PACKAGE)-`date +"%y%m%d"`
-	mv $(PACKAGE)-`date +"%y%m%d"`.tar.gz ../
-
-ikslite:
-	cp include/iksemel.h ../
-	cat include/finetune.h src/utility.c src/ikstack.c src/sax.c src/iks.c src/dom.c >../iksemel.c
diff --git a/libs/iksemel/NEWS b/libs/iksemel/NEWS
deleted file mode 100644
index 87d60a3a57..0000000000
--- a/libs/iksemel/NEWS
+++ /dev/null
@@ -1,53 +0,0 @@
-V1.3 (2007-08-02)
-* Project is moved to
-    http://code.google.com/p/iksemel/
-  there is also a new mailing list at:
-    http://groups.google.com/group/iksemel
-  Please use those instead of old jabberstudio.org addresses.
-* iksemel is now participating in Coverity Inc's free software
-  quality improvement program (http://scan.coverity.com). As a
-  first result, a few problems found by Coverity's static analysis
-  tool in the iks_sasl_challenge() are fixed in this release, and
-  other than that, iksemel passes from defect test with no problems.
-* Extra padding problem in the base64 encoder is fixed. Some servers
-  were having problems with extra '=' padded SASL digests.
-* New dom functions: iks_append(), iks_prepend(), iks_append_cdata(),
-  iks_prepend_cdata(). You can append/prepend new nodes within the
-  siblings with them, insert_ functions were only appending at the
-  last child. Thus editing a tree is much easier now.
-* iks_load was giving error on files with multiply of 4Kb sizes, fixed.
-
-V1.2 (2004-08-06)
-* SASL authentication.
-* SSH connections via gnutls library.
-* Socket code abstracted, you can even provide your own transport functions.
-* Compiles on Windows with MinGW.
-* iks_sha_print() uses lowercase hex numbers to comply with latest jabber.
-* New stack implementation, much faster and uses less memory.
-  Unfortunately API has changed a bit:
-  iks_stack_strcat, strcatv, print functions removed.
-  iks_stack_stats modified.
-  iks_stack_strecat renamed to iks_stack_strcat.
-  iks_stack_new takes two chunk sizes, one for structures one for strings.
-  iks_stack_strdup returns (char *).
-
-V1.1 (2003-09-11)
-* Minor sax parser speed up.
-* iks_string() and dom parser performance is improved greatly.
-* iksperf: new tool for measuring iksemel performance.
-* ikslint: better error checking. supports stdin. can display tag usage histogram.
-* New dom functions: iks_copy(), iks_copy_within(), iks_root(), iks_tree().
-* License of the documentation changed to GPL from GNU FDL.
-
-V1.0 (2003-06-29)
-* API redesigned.
-* iconv interface removed.
-* ikslint and iksroster tools.
-* Jabber packet filter.
-* IPv6 support.
-* iks_find_with_attrib, iks_next_tag, iks_prev_tag, iks_first_tag functions.
-* Parser improvements (CDATA sections, comments, UTF8 validity checks)
-* Memory pools are replaced with object stacks.
-
-V0.1 (2002-10-30)
-* First release.
diff --git a/libs/iksemel/README b/libs/iksemel/README
deleted file mode 100644
index 306c5596eb..0000000000
--- a/libs/iksemel/README
+++ /dev/null
@@ -1,45 +0,0 @@
-
-                      iksemel 1.3
-
-Copyright (c) 2000-2004 Gurer Ozen <madcat@e-kolay.net>
-
-
-Introduction:
--------------
-
-This is an XML parser library mainly designed for Jabber applications.
-It provides SAX, DOM, and special Jabber stream APIs. Library is coded
-in ANSI C except the network code (which is POSIX compatible), thus
-highly portable. Iksemel is released under GNU Lesser General Public
-License. A copy of the license is included in the COPYING file.
-
-
-Requirements:
--------------
-
-Libtool, Automake and Autoconf packages are required for compiling cvs
-versions.
-
-
-Compiling & Install:
---------------------
-
-If you got the source from CVS, type
-
-  ./autogen.sh
-
-for creating configuration script and files.
-
-Then type
-
-  ./configure
-  make
-
-now library is compiled. You can test it with
-
-  make check
-
-and install it with
-
-  (become root if necessary)
-  make install
diff --git a/libs/iksemel/TODO b/libs/iksemel/TODO
deleted file mode 100644
index d20bebbba3..0000000000
--- a/libs/iksemel/TODO
+++ /dev/null
@@ -1,12 +0,0 @@
-
-This file contains a simple list of TODO items.
-More general ideas can be found in the roadmap part of the file HACKING.
-
-(in order of importance)
-
-* parser: &#1234; and &#xA25F; like entities must be unescaped.
-* packet filter or a generic xml filter? something like a simplified xpath?
-* a separate utf8 validator function can be useful
-* utf8 <-> utf16 conversion functions can be useful
-
-anything else? :-)
diff --git a/libs/iksemel/acinclude.m4 b/libs/iksemel/acinclude.m4
deleted file mode 100644
index 72e6d438a8..0000000000
--- a/libs/iksemel/acinclude.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
-
-
-
diff --git a/libs/iksemel/acsite.m4 b/libs/iksemel/acsite.m4
deleted file mode 100644
index 593df04be8..0000000000
--- a/libs/iksemel/acsite.m4
+++ /dev/null
@@ -1,2 +0,0 @@
-m4_include([build/libgnutls.m4])
-
diff --git a/libs/iksemel/build/libgnutls.m4 b/libs/iksemel/build/libgnutls.m4
deleted file mode 100644
index cf3fe4641a..0000000000
--- a/libs/iksemel/build/libgnutls.m4
+++ /dev/null
@@ -1,168 +0,0 @@
-dnl Autoconf macros for libgnutls
-dnl $id$
-
-# Modified for LIBGNUTLS -- nmav
-# Configure paths for LIBGCRYPT
-# Shamelessly stolen from the one of XDELTA by Owen Taylor
-# Werner Koch   99-12-09
-
-dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
-dnl
-AC_DEFUN([AX_PATH_LIBGNUTLS],
-[dnl
-dnl Get the cflags and libraries from the libgnutls-config script
-dnl
-AC_ARG_WITH(libgnutls-prefix,
-          [  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)],
-          libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
-
-  if test x$libgnutls_config_prefix != x ; then
-     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
-        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
-     fi
-  fi
-
-  AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  no_libgnutls=""
-  if test "$LIBGNUTLS_CONFIG" != "no"; then
-    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
-    LIBGNUTLS_LIBS="`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` -lpthread  -lgcrypt"
-    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
-  elif test "$PKG_CONFIG" != "no"; then
-    LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags gnutls`
-    LIBGNUTLS_LIBS="`$PKG_CONFIG --libs gnutls` -lpthread -lgcrypt"
-    libgnutls_config_version=`$PKG_CONFIG --modversion gnutls`
-  else
-    no_libgnutls=yes
-  fi
-
-  min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
-  AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
-
-  if test x"$no_libgnutls" = x""; then
-
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-      LIBS="$LIBS $LIBGNUTLS_LIBS"
-dnl
-dnl Now check if the installed libgnutls is sufficiently new. Also sanity
-dnl checks the results of libgnutls-config to some extent
-dnl
-      rm -f conf.libgnutlstest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gnutls/gnutls.h>
-
-int
-main ()
-{
-    system ("touch conf.libgnutlstest");
-
-    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
-    {
-      printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
-             "$libgnutls_config_version", gnutls_check_version(NULL) );
-      printf("*** was found! If libgnutls-config was correct, then it is best\n");
-      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
-      printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    }
-    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
-    {
-      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
-      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
-    }
-    else
-    {
-      if ( gnutls_check_version( "$min_libgnutls_version" ) )
-      {
-        return 0;
-      }
-     else
-      {
-        printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
-                gnutls_check_version(NULL) );
-        printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
-               "$min_libgnutls_version" );
-        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
-        printf("*** \n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
-        printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_libgnutls" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])
-  else
-     if test -f conf.libgnutlstest ; then
-        :
-     else
-        AC_MSG_RESULT(no)
-     fi
-     if test "$LIBGNUTLS_CONFIG" = "no" ; then
-       echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
-       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
-       echo "*** full path to libgnutls-config."
-     else
-       if test -f conf.libgnutlstest ; then
-        :
-       else
-          echo "*** Could not run libgnutls test program, checking why..."
-          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-          LIBS="$LIBS $LIBGNUTLS_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gnutls/gnutls.h>
-],      [ return !!gnutls_check_version(NULL); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
-          echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-          echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
-          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
-          echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     LIBGNUTLS_CFLAGS=""
-     LIBGNUTLS_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  rm -f conf.libgnutlstest
-  AC_SUBST(LIBGNUTLS_CFLAGS)
-  AC_SUBST(LIBGNUTLS_LIBS)
-])
-
-dnl *-*wedit:notab*-*  Please keep this as the last line.
diff --git a/libs/iksemel/configure.ac b/libs/iksemel/configure.ac
deleted file mode 100644
index d8a7970f82..0000000000
--- a/libs/iksemel/configure.ac
+++ /dev/null
@@ -1,111 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(iksemel,1.3)
-AC_PREREQ(2.50)
-AC_CONFIG_AUX_DIR(build)
-AC_CONFIG_SRCDIR([configure.ac])
-AM_INIT_AUTOMAKE
-AC_CONFIG_HEADERS(include/config.h)
-
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
-
-AC_CANONICAL_HOST
-
-dnl Checks for programs
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_CHECK_TOOL(OBJDUMP, objdump, :)
-AM_PROG_LIBTOOL
-AC_LANG_C
-
-dnl Checks for header files
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h strings.h errno.h)
-
-dnl Checks for typedefs and structures
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_CHECK_MEMBERS([struct stat.st_blksize])
-
-dnl Special check for windows
-case "$host_os" in
-	*mingw*)
-		AC_CHECK_LIB(wsock32, main, , AC_MSG_ERROR(Winsock is needed for a Win32 build.))
-		;;
-esac
-
-dnl Check for posix io
-AC_ARG_ENABLE(default-io,
-[  --disable-default-io    disable builtin socket transport code ],
-        defio=$enableval, defio=yes)
-if test "$defio" = yes; then
-	AC_DEFINE(USE_DEFAULT_IO,1,[Define this is you want default transport])
-fi
-AM_CONDITIONAL(DO_POSIX, test "x$defio" = "xyes")
-
-dnl Checks for library functions
-AC_SEARCH_LIBS(recv,socket)
-AC_CHECK_FUNCS(getopt_long)
-AC_CHECK_FUNCS(getaddrinfo)
-
-#AX_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
-
-m4_include([openssl.m4])
-SAC_OPENSSL
-
-dnl Check -Wall flag of GCC
-if test "x$GCC" = "xyes"; then
-  if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
-    CFLAGS="$CFLAGS -Wall"
-  fi
-fi
-
-AC_DEFUN([AX_COMPILER_VENDOR],
-[
-AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
- [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
-  # note: don't check for gcc first since some other compilers define __GNUC__
-  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
-    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
-#if !($vencpp)
-      thisisanerror;
-#endif
-])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
-  done
- ])
-])
-
-AX_COMPILER_VENDOR
-
-#  Enable 64 bit build
-AC_ARG_ENABLE(64,
-[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
-
-if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
-    if test "${enable_64}" = "yes"; then
-        CFLAGS="$CFLAGS -mt -m64 -lgpg-error"
-        CXXFLAGS="$CXXFLAGS -mt -m64 -lgpg-error"
-	SUNFLAGS="-xc99=all -mt -m64 -lgpg-error"
-    else 
-	CFLAGS="$CFLAGS  -mt -lgpg-error"
-	CXXFLAGS="$CXXFLAGS -mt -lgpg-error"
-	SUNFLAGS="-xc99=all -mt -lgpg-error"
-    fi
-fi
-
-AC_SUBST(SUNCFLAGS)
-
-dnl Generating makefiles
-AC_CONFIG_FILES([
-Makefile
-iksemel.pc
-src/Makefile
-include/Makefile
-tools/Makefile
-test/Makefile
-doc/Makefile
-])
-AC_OUTPUT
diff --git a/libs/iksemel/configure.gnu b/libs/iksemel/configure.gnu
deleted file mode 100644
index c78238de46..0000000000
--- a/libs/iksemel/configure.gnu
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
-$srcpath/configure "$@" --disable-shared --with-pic
-
diff --git a/libs/iksemel/doc/Makefile.am b/libs/iksemel/doc/Makefile.am
deleted file mode 100644
index e7701d3387..0000000000
--- a/libs/iksemel/doc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-##
-## Process this file with automake to produce Makefile.in
-##
-
-#info_TEXINFOS = iksemel.texi
diff --git a/libs/iksemel/doc/iksemel.texi b/libs/iksemel/doc/iksemel.texi
deleted file mode 100644
index fd683e2685..0000000000
--- a/libs/iksemel/doc/iksemel.texi
+++ /dev/null
@@ -1,1534 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-@c %**start of header
-@setfilename iksemel
-@setcontentsaftertitlepage
-@settitle Iksemel Programmers Manual
-@set VERSION 1.2
-@c %**end of header
-
-@titlepage
-@title iksemel programmers manual
-@subtitle A tutorial and API reference for the iksemel library @value{VERSION}
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 2001-2003 G@"urer @"Ozen
-
-This is a free document; 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, or
-(at your option) any later version.You may obtain a copy of the
-GNU General Public License from the Free Software Foundation
-by visiting their Web site or by writing to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.
-
-@end titlepage
-
-@ifinfo
-@node Top, , , (dir)
-@top iksemel Programmers Manual
-
-Copyright @copyright{} 2001-2003 G@"urer @"Ozen
-
-This is a free document; 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, or
-(at your option) any later version.You may obtain a copy of the
-GNU General Public License from the Free Software Foundation
-by visiting their Web site or by writing to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.
-
-@menu
-* Introduction::
-
-* Tutorials::
-
-* Development::
-
-* Datatype Index::
-
-* Function Index::
-@end menu
-@end ifinfo
-
-@node Introduction, Tutorials, ,Top
-@chapter Introduction
-
-iksemel is an XML (eXtensible Markup Language) parser library
-designed for Jabber applications. It is coded in ANSI C for POSIX
-compatible environments, thus highly portable. It is free software
-released under the GNU Lesser General Public License.
-
-The purprose of this manual is to tell you how to use the facilities
-of the iksemel library. Manual is written with the assumption that you
-are familiar with the C programming language, basic programming
-concepts, XML and Jabber protocol.
-
-@section Compiling the Library
-
-You need to install MinGW (@url{http://mingw.org}) under Windows to be able
-to compile iksemel. Although not tested by the author, Cygwin should
-work equally well.
-
-Library can be built with:
-
-@example
-./configure
-make
-@end example
-
-If you want to make a self test:
-
-@example
-make test
-@end example
-
-Now you can install it with:
-
-@example
-make install
-@end example
-
-
-@section Using iksemel in Applications
-
-You need to include @file{iksemel.h} file in your source to access library API.
-You can do this with:
-
-@code{#include "iksemel.h"}
-
-Now you can use iksemel functions and compile your source. In able to link
-your compiled object files and generate your executable program, you have to
-link with iksemel library. This can be done with:
-
-@example
-gcc -o myprg src1.o src2.o src3.o -liksemel
-@end example
-
-iksemel registers itself with pkg-config while installing, so if you are using
-autotools in your program, you can simply check the availability of iksemel
-and configure your build process accordingly with:
-
-@example
-PKG_CHECK_MODULES(IKSEMEL,iksemel,,exit)
-@end example
-
-This would result in IKSEMEL_LIBS and IKSEMEL_CFLAGS substitution variables
-set to correct values.
-
-@node Tutorials,Development,Introduction,Top
-@chapter Tutorials
-
-@ifinfo
-@menu
-* Parsing an XML Document::
-
-* Working with XML Trees::
-
-* XML Streams::
-
-* Writing a Jabber Client::
-
-* Utility Functions::
-@end menu
-@end ifinfo
-
-
-@comment ============================================================
-@node Parsing an XML Document,Working with XML Trees,,Tutorials
-@section Parsing an XML Document
-
-iksemel parser sequentally processes the XML document. Each encountered XML
-element (i.e. tags, character data, comments, processing instructions, etc.)
-is reported to your application by calling the hook functions you have provided.
-This type of interface is called SAX (serial access) interface.
-
-@tindex iksparser
-Parser stores its state in a small structure. This structure is referenced by
-@code{iksparser} type, and managed with following functions:
-
-@deftypefun iksparser* iks_sax_new (void* @var{user_data}, iksTagHook* @var{tagHook}, iksCDataHook* @var{cdataHook});
-This function allocates and initializes a parser structure. If allocation fails,
-NULL value is returned. @var{user_data} is passed directly to hook functions.
-@end deftypefun
-
-@deftp Typedef iksTagHook
-int iksTagHook (void* @var{user_data}, char* @var{name}, char** @var{atts}, int @var{type});
-
-This function is called when a tag parsed. @var{name} is the name of the tag. If tag has
-no attributes @var{atts} is NULL, otherwise it contains a null terminated list of
-pointers to tag's attributes and their values. If return value isn't @code{IKS_OK},
-it is passed immediately to the caller of the @code{iks_parse}.
-
-@var{type} is one of the following:
-@table @code
-@item IKS_OPEN
-Opening tag, i.e. <tag attr='value'>
-@item IKS_CLOSE
-Closing tag, i.e. </tag>
-@item IKS_SINGLE
-Standalone tag, i.e. <tag attr='value'/>
-@end table
-@end deftp
-
-@deftp Typedef iksCDataHook
-int iksCDataHook (void* @var{user_data}, char* @var{data}, size_t @var{len});
-
-@var{data} is a pointer to the character data. Encoding is UTF-8 and it isn't terminated
-with a null character. Size of the data is given with @var{len} in bytes. This function
-can be called several times with smaller sized data for a single string. If
-return value isn't @code{IKS_OK}, it is passed immediately to the caller of the
-@code{iks_parse}.
-@end deftp
-
-@deftypefun int iks_parse (iksparser* @var{prs}, char *@var{data}, size_t @var{len}, int @var{finish});
-You give XML document to the parser with this function. @var{data}
-is a @var{len} bytes string. If @var{len} is zero, data must be a null
-terminated string.
-
-If @var{finish} value is zero, parser waits for more data later. If you
-want to finish parsing without giving data, call it like:
-@example
-iks_parse (my_parser, NULL, 0, 1);
-@end example
-
-You should check the return value for following conditions:
-@table @code
-@item IKS_OK
-There isn't any problem.
-@item IKS_NOMEM
-Not enough memory.
-@item IKS_BADXML
-Document is not well-formed.
-@item IKS_HOOK
-Your hook decided that there is an error.
-@end table
-@end deftypefun
-
-@deftypefun void iks_parser_delete (iksparser* @var{prs});
-This function frees parser structure and associated data.
-@end deftypefun
-
-Now we have learned how to create and use a sax parser. Lets parse a simple
-XML document. Write following code into a @file{test.c} file.
-
-@smallexample
-#include <stdio.h>
-#include <iksemel.h>
-
-int pr_tag (void *udata, char *name, char **atts, int type)
-@{
-    switch (type) @{
-        case IKS_OPEN:
-            printf ("TAG <%s>\n", name);
-            break;
-        case IKS_CLOSE:
-            printf ("TAG </%s>\n", name);
-            break;
-        case IKS_SINGLE:
-            printf ("TAG <%s/>\n", name);
-            break;
-    @}
-    if (atts) @{
-        int i = 0;
-        while (atts[i]) @{
-            printf ("  ATTRIB %s='%s'\n", atts[i], atts[i+1]);
-            i += 2;
-        @}
-    @}
-    return IKS_OK;
-@}
-
-enum ikserror pr_cdata (void *udata, char *data, size_t len)
-@{
-    int i;
-    printf ("CDATA [");
-    for (i = 0; i < len; i++)
-        putchar (data[i]);
-    printf ("]\n");
-    return IKS_OK;
-@}
-
-int main (int argc, char *argv[])
-@{
-    iksparser *p;
-    p = iks_sax_new (NULL, pr_tag, pr_cdata);
-    switch (iks_parse (p, argv[1], 0, 1)) @{
-        case IKS_OK:
-            puts ("OK");
-            break;
-        case IKS_NOMEM:
-            puts ("Not enough memory");
-            exit (1);
-        case IKS_BADXML:
-            puts ("XML document is not well-formed");
-            exit (2);
-        case IKS_HOOK:
-            puts ("Our hooks didn't like something");
-            exit (2);
-    @}
-    iks_parser_delete (p);
-    return 0;
-@}
-@end smallexample
-
-Now compile and test it with:
-
-@example
-gcc -o test test.c -liksemel
-./test "<test>Hello<br/>World!</test>"
-./test "<lala a='12' b='42'/>"
-@end example
-
-@heading Error Handling
-
-XML standart states that once an error is detected, the processor must not continue
-normal processing (i.e. it must not pass character data or markup information to
-the application). So iksemel stops processing immediately when it encounters a
-syntax error, or one of your hook functions return any one value than @code{IKS_OK},
-and @code{iks_parse} function returns with the error code.
-
-Since it is useful for debugging, iksemel provides functions to get position of
-the error. Position is usually at the starting character for syntax errors. Since
-your hooks are called after whole element (i.e. markup or character data) is
-passed, position is at the end of the erroneous element for @code{IKS_HOOK} errors.
-
-@deftypefun {unsigned long} iks_nr_bytes (iksparser* @var{prs});
-Returns how many number of bytes parsed.
-@end deftypefun
-
-@deftypefun {unsigned long} iks_nr_lines (iksparser* @var{prs});
-Returns how many number of lines parsed.
-@end deftypefun
-
-If you want to parse another document with your parser again, you should use
-the following function to reset your parser.
-
-@deftypefun void iks_parser_reset (iksparser* @var{prs});
-Resets the parser's internal state.
-@end deftypefun
-
-
-@comment ============================================================
-@node Working with XML Trees,XML Streams,Parsing an XML Document,Tutorials
-@section Working with XML Trees
-
-SAX interface uses very little memory, but it forces you to access XML
-documents sequentally. In many cases you want to keep a tree like
-representation of XML document in memory and want to access and
-modify its content randomly.
-
-iksemel provides functions for efficiently creating such trees either
-from documents or programmaticaly. You can access and modify this
-tree and can easily generate a new XML document from the tree.
-
-This is called DOM (Document Object Model) interface.
-
-@ifinfo
-@menu
-* Memory Management::
-
-* Creating a Tree::
-
-* Accessing the Tree::
-
-* Converting a Tree into an XML Document::
-
-* Parsing an XML Document into a Tree::
-@end menu
-@end ifinfo
-
-
-@comment ============================================================
-@node Memory Management,Creating a Tree,,Working with XML Trees
-@subsection Memory Management
-
-Since keeping whole document content uses a lot of memory and requires
-many calls to OS's memory allocation layer, iksemel uses a simple object
-stack system for minimizing calls to the @code{malloc} function and releasing
-all the memory associated with a tree in a single step.
-
-A parsed XML tree contains following objects:
-@table @samp
-@item Nodes
-These are basic blocks of document. They can contain a tag, attribute pair
-of a tag, or character data. Tag nodes can also contain other nodes as
-children. Node structure has a small fixed size depending on the node type.
-@item Names
-Names of tags and attributes. They are utf-8 encoded small strings.
-@item Character Data
-They are similar to names but usually much bigger.
-@end table
-
-iksemel's object stack has two separate areas for keeping these data objects.
-Meta chunk contains all the structures and aligned data, while the data chunk
-contains strings. Each chunk starts with a choosen size memory block, then
-when necessary more blocks allocated for providing space. Unless there is a big
-request, each block is double the size of the previous block, thus real memory
-needs are quickly reached without allocating too many blocks, or wasting
-memory with too big blocks.
-
-@deftp Typedef ikstack
-This is a structure defining the object stack. Its fields are private
-and subject to change with new iksemel releases.
-@end deftp
-
-@deftypefun {ikstack *} iks_stack_new (size_t @var{meta_chunk}, size_t @var{data_chunk});
-Creates an object stack. @var{meta_chunk} is the initial size of the
-data block used for structures and aligned data. @var{data_chunk} is
-the initial size of the data block used for strings. They are both in byte units.
-
-These two initial chunks and a small object stack structure is allocated in
-one @code{malloc} call for optimization purproses.
-@end deftypefun
-
-@deftypefun {void *} iks_stack_alloc (ikstack * @var{stack}, size_t @var{size});
-Allocates @var{size} bytes of space from the object stack's meta chunk.
-Allocated space is aligned on platform's default alignment boundary and
-isn't initialized. Returns a pointer to the space, or NULL if there isn't enough
-space available and allocating a new block fails.
-@end deftypefun
-
-@deftypefun {void *} iks_stack_strdup (ikstack * @var{stack}, const char * @var{src}, size_t @var{len});
-Copies given string @var{src} into the object stack's data chunk. Returns a
-pointer to the new string, or NULL if there isn't enough space in the stack.
-If @var{len} is zero string must be null terminated.
-@end deftypefun
-
-@deftypefun void iks_stack_delete (ikstack * @var{stack});
-Gives all memory associated with object stack to the system.
-@end deftypefun
-
-Since character data sections are usually parsed in separate blocks,
-a growable string implementation is necessary for saving memory.
-
-@deftypefun {char *} iks_stack_strcat (ikstack *@var{stack}, char *@var{old}, size_t @var{old_len}, const char *@var{src}, size_t @var{src_len});
-This function appends the string @var{src} to the string @var{old} in the
-stack's data chunk. If  @var{old} is NULL it behaves like @code{iks_stack_strdup}.
-Otherwise @var{old} has to be a string created with @code{iks_stack_strdup}
-or @code{iks_stack_strcat} functions.
-
-If @var{old_len} or @var{src_len} is zero, corresponding string must be null
-terminated.
-
-Since string can be moved into another block of the data chunk, you must use the
-returned value for new string, and must not reference to @var{old} anymore.
-Return value can be NULL if there isn't enough space in stack, and allocating a
-new block fails.
-@end deftypefun
-
-
-@comment ============================================================
-@node Creating a Tree,Accessing the Tree,Memory Management,Working with XML Trees
-@subsection Creating a Tree
-
-@deftp Typedef iks
-This is a structure defining a XML node. Its fields are private and only
-accessed by following functions.
-@end deftp
-
-@deftypefun iks* iks_new (const char *@var{name});
-Creates an object stack and creates a IKS_TAG type of node with given
-tag name inside the stack. Tag name is also copied into the stack.
-Returns the node pointer, or NULL if there isn't enough memory.
-@end deftypefun
-
-@deftypefun iks* iks_new_within (const char *@var{name}, ikstack* @var{stack});
-Creates a IKS_TAG type of node with the given tag name. Node and tag
-name is allocated inside the given object stack. Returns the node
-pointer, or NULL if there isn't enough memory.
-@end deftypefun
-
-@deftypefun iks* iks_insert (iks *@var{x}, const char *@var{name});
-Creates a IKS_TAG type of node with the given tag name. Node and tag
-name is allocated inside the @var{x} node's object stack and linked
-to @var{x} as a child node. Returns the node pointer, or NULL if there
-isn't enough memory.
-@end deftypefun
-
-@deftypefun iks* iks_insert_cdata (iks* @var{x}, const char* @var{data}, size_t @var{len});
-Creates a IKS_CDATA type of node with given character data. Node is
-allocated inside the @var{x} node's object stack and linked to @var{x}
-as a child node. Data is copied as well. If @var{len} is zero data must
-be a null terminated string. Returns the node pointer, or NULL if
-there isn't enough memory.
-@end deftypefun
-
-@deftypefun iks* iks_insert_attrib (iks* @var{x}, const char* @var{name}, const char* @var{value});
-Creates a IKS_ATTRIBUTE type of node with given attribute name and the
-value. Node is allocated inside the @var{x} node's object stack and
-linked to @var{x} as an attribute node. Attribute name and value is
-copied as well. Returns the node pointer, or NULL if there isn't
-enough memory.
-
-Reinserting another value with same attribute name changes an attribute's
-value. If @var{value} is NULL, attribute is removed from the tag.
-@end deftypefun
-
-@deftypefun iks* iks_insert_node (iks* @var{x}, iks* @var{y});
-Links node @var{y} to node @var{x} as a child node. Nodes are not copied
-between object stacks, be careful.
-@end deftypefun
-
-@deftypefun void iks_hide (iks *@var{x});
-Changes the links of the other nodes so that @var{x} becomes invisible.
-It stays in the same object stack with neighbour nodes, be careful.
-@end deftypefun
-
-@deftypefun void iks_delete (iks *@var{x});
-Frees the object stack of the node @var{x}.
-@end deftypefun
-
-Now lets create a tree representation of following XML document:
-
-@example
-<message type='chat' from='bob@@bd.com'>
-<subject>song lyric</subject><priority>high</priority>
-<body>
-<em style='underline'>here is the correct version:</em>
-i just don't see why i should even care
-it's not dark yet, but it's getting there
-</body>
-</message>
-@end example
-
-here is the code:
-
-@example
-iks *x, *y, *z;
-
-x = iks_new ("message");
-iks_insert_attrib (x, "type", "chat");
-iks_insert_attrib (x, "from", "bob@@bd.com");
-iks_insert_cdata (x, "\n", 1);
-iks_insert_cdata (iks_insert (x, "subject"), "song lyric", 10);
-iks_insert_cdata (iks_insert (x, "priority"), "high", 4);
-iks_insert_cdata (x, "\n", 1);
-y = iks_insert (x, "body");
-iks_insert_cdata (y, "\n", 1);
-z = iks_insert (y, "em");
-iks_insert_attrib (z, "style", "underline");
-iks_insert_cdata (z, "here is the correct version", 0);
-iks_insert_cdata (y, "\n", 1);
-iks_insert_cdata (y, "i just don't see why", 0);
-iks_insert_cdata (y, "i should even care\n", 0);
-iks_insert_cdata (y, "it's not dark yet,", 0);
-iks_insert_cdata (y, "but it's getting there\n", 0);
-iks_insert_cdata (x, "\n", 1);
-@end example
-
-Notice how newlines are inserted for proper formatting of document. They aren't
-necessary for representing data, but they make it easier to read document for
-humans.
-
-Also notice how @code{iks_insert} and @code{iks_insert_cdata} chained.
-
-There are also functions for duplicating xml trees. They are:
-
-@deftypefun {iks *} iks_copy (iks* @var{x});
-Creates a full copy of the tree in a newly created object stack.
-@end deftypefun
-
-@deftypefun {iks *} iks_copy_within (iks* @var{x}, ikstack *@var{s});
-Creates a full copy of the tree in given object stack.
-@end deftypefun
-
-@comment ============================================================
-@node Accessing the Tree,Converting a Tree into an XML Document,Creating a Tree,Working with XML Trees
-@subsection Accessing a Tree
-
-Basic access functions allow you to move on the tree:
-
-@deftypefun iks* iks_next (iks* @var{x});
-@end deftypefun
-@deftypefun iks* iks_prev (iks* @var{x});
-@end deftypefun
-@deftypefun iks* iks_parent (iks* @var{x});
-@end deftypefun
-@deftypefun iks* iks_child (iks* @var{x});
-@end deftypefun
-@deftypefun iks* iks_attrib (iks* @var{x});
-@end deftypefun
-
-These functions return a pointer to the next, previous, parent, first child,
-and first attribute node of the given node @var{x}. If that node doesn't
-exist or @var{x} is NULL, a NULL value is returned.
-
-@deftypefun {iks *} iks_root (iks *@var{x});
-Returns the topmost parent node of the @var{x}.
-@end deftypefun
-
-@deftypefun iks* iks_next_tag (iks* @var{x});
-@end deftypefun
-@deftypefun iks* iks_prev_tag (iks* @var{x});
-@end deftypefun
-@deftypefun iks* iks_first_tag (iks* @var{x});
-@end deftypefun
-
-These functions return a pointer to the next, previous, first child node
-of the given node @var{x}. Only tag nodes are considered, other type
-of the nodes are skipped. If such a node doesn't exist or @var{x} is NULL,
-a NULL value is returned.
-
-Another group of functions allow you to access specific information and
-content of the nodes:
-
-@deftypefun ikstack* iks_stack (iks* @var{x});
-Returns the object stack which node @var{x} stays.
-@end deftypefun
-
-@deftypefun {enum ikstype} iks_type (iks* @var{x});
-Returns the type of the node.
-
-@tindex ikstype
-@table @code
-@item IKS_TAG
-Node is a tag and can contain child nodes and attributes.
-@item IKS_CDATA
-Node contains character data.
-@item IKS_ATTRIBUTE
-Node contains an attribute and its value.
-@end table
-@end deftypefun
-
-@deftypefun char* iks_name (iks* @var{x});
-Returns the name of the tag for nodes with the type @var{IKS_TAG}.
-Returns an attribute's name for nodes of type IKS_ATTRIBUTE.
-@end deftypefun
-
-@deftypefun char* iks_cdata (iks* @var{x});
-Returns a pointer to node's character data if available, NULL otherwise.
-Returns an attribute's value for nodes of type IKS_ATTRIBUTE.
-@end deftypefun
-
-@deftypefun size_t iks_cdata_size (iks *@var{x});
-Returns the size of the node's character data in bytes.
-@end deftypefun
-
-@deftypefun int iks_has_children (iks *@var{x});
-Returns a non-zero value if node @var{x} has a child node.
-@end deftypefun
-
-@deftypefun int iks_has_attribs (iks *@var{x});
-Returns a non-zero value if node @var{x} has attributes.
-@end deftypefun
-
-Last group of the functions simplifies finding and accessing the content
-of a specific node:
-
-@deftypefun iks* iks_find (iks *@var{x}, const char *@var{name});
-Searches a IKS_TAG type of node with @var{name} as tag name in child
-nodes of @var{x}. Returns a pointer to the node if found, NULL otherwise.
-@end deftypefun
-
-@deftypefun char* iks_find_cdata (iks* @var{x}, const char* @var{name});
-Searches a IKS_TAG type of node with @var{name} as tag name in child
-nodes of @var{x}. Returns a pointer to the character data of the node's
-first child node if found, NULL otherwise.
-@end deftypefun
-
-@deftypefun char* iks_find_attrib (iks* @var{x}, const char* @var{name});
-Searches an attribute with given name in attributes of the @var{x}.
-Returns a pointer to attribute value if found, NULL otherwise.
-@end deftypefun
-
-@deftypefun {iks *} iks_find_with_attrib (iks *@var{x}, const char *@var{tagname}, const char *@var{attrname}, const char *@var{value});
-Searches for a child tag of @var{x} which has an attribute with name
-@var{attrname} and value @var{value}. If @var{tagname} isn't NULL,
-name of the tag must also match. Returns a pointer to the node if found,
-NULL otherwise.
-@end deftypefun
-
-Here is an example which demonstrates accessing file names in a fictitious
-XML playlist file:
-
-@example
-<playlist>
-    <item type='mpg'>
-        <name>/home/madcat/download/matrix_rev_trailer.mpg</name>
-        <duration>1:17</duration>
-    </item>
-    <item type='rm'>
-        <name>/home/madcat/anim/clementine_ep1.rm</name>
-        <duration>22:00</duration>
-    </item>
-    <item type='avi'>
-        <name>/home/madcat/anim/futurama/ep101.avi</name>
-        <subtitle>/home/madcat/subs/futurama/ep101.txt</subtitle>
-        <duration>30:00</duration>
-    </item>
-    <repeat/>
-    <fullscreen/>
-    <noui/>
-</playlist>
-@end example
-
-and here is the code:
-
-@example
-#include <stdio.h>
-#include <iksemel.h>
-
-int main (int argc, char *argv[])
-@{
-    iks *x, *y;
-    int e;
-
-    if (argc < 2) @{
-        printf ("usage: %s <playlistfile>", argv[0]);
-        return 0;
-    @}
-    e = iks_load (argv[1], &x);
-    if (e != IKS_OK) @{
-    	printf ("parse error %d\n", e);
-        return 1;
-    @}
-    if (iks_find (x, "repeat")) puts ("repeat mode enabled");
-    y = iks_child (x);
-    while (y) @{
-        if (iks_type (y) == IKS_TAG
-            && strcmp (iks_name (y), "item") == 0) @{
-	        printf ("Filename: [%s]\n", iks_find_cdata (y, "name"));
-        @}
-        y = iks_next (y);
-     @}
-    iks_delete (x);
-    return 0;
-@}
-@end example
-
-
-@comment ============================================================
-@node Converting a Tree into an XML Document,Parsing an XML Document into a Tree,Accessing the Tree,Working with XML Trees
-@subsection Converting a Tree to an XML Document
-
-There is a function for converting given XML tree into a null terminated string.
-
-@deftypefun {char *} iks_string (ikstack* @var{stack}, iks* @var{x});
-Converts given tree into a string. String is created inside the given object
-stack. Returns a pointer to the string, or NULL if there isn't enough memory
-available.
-
-If @var{stack} is NULL, string is created inside an @code{iks_malloc}ed buffer.
-You can free it later with @code{iks_free} function.
-@end deftypefun
-
-Here is an example which builds a tree and print it.
-
-@example
-iks *x;
-char *t;
-
-x = iks_new ("test");
-iks_insert_cdata (iks_insert (x, "a"), "1234", 4);
-iks_insert (x, "br");
-iks_insert_cdata (x, "1234", 4);
-t = iks_string (iks_stack (x), x);
-puts (t);
-iks_delete (x);
-@end example
-
-
-@comment ============================================================
-@node Parsing an XML Document into a Tree,,Converting a Tree into an XML Document,Working with XML Trees
-@subsection Parsing a Document into a Tree
-
-If you want to automatically convert an XML document into a tree, you can use
-iksemel's DOM parser. It is created with following function:
-
-@deftypefun iksparser* iks_dom_new (iks **@var{iksptr});
-Creates a DOM parser. A pointer to the created XML tree is put into the
-variable pointed by @var{iksptr}. Returns a pointer to the parser, or NULL
-is there isn't enough memory.
-@end deftypefun
-
-Usage is same as SAX parser. You feed the data with @code{iks_parse}, and if
-there isn't an error, you can access to your tree from variable @code{*iksptr}.
-
-Here is a simple example:
-
-@example
-iks *x;
-iksparser *p;
-
-p = iks_dom_new (&x);
-if (IKS_OK != iks_parse (p, "<a>bcd</a>", 9, 1)) @{
-    puts ("parse error");
-@}
-/* x is useable after that point */
-
-/* this will print 'bcd' */
-printf ("%s\n", iks_cdata (iks_child (x)));
-@end example
-
-If you know the size of the file ahead, or you have an approximate idea,
-you can tell this to the dom parser for choosing a better memory allocation
-strategy. Here is the function for this.
-
-@deftypefun void iks_set_size_hint (iksparser *@var{prs}, size_t @var{approx_size});
-Parser @var{prs} must be a dom type parser. @var{approx_size} is the
-expected size of the xml document. Parser chooses its chunk size
-based on this information. Helps performance while processing big files.
-@end deftypefun
-
-If you already have your XML document in memory, you can simply parse
-it with:
-
-@deftypefun {iks *} iks_tree (const char *@var{xml_str}, size_t @var{len}, int *@var{err});
-This function parses the buffer pointed by @var{xml_str}. If @var{len} is zero
-buffer is considered as a null terminated utf8 string. Returns the parsed tree,
-or NULL if there is an error. If @var{err} is not NULL, actual error code (returned
-by iks_parse) is put there.
-@end deftypefun
-
-Most of the times you want to load your configuration (or similar) files directly
-into trees. iksemel provides two functions to greatly simplify this:
-
-@deftypefun int iks_load (const char *@var{fname}, iks **@var{xptr});
-Loads the XML file. Tree is placed into the variable pointed by @var{xptr}.
-@end deftypefun
-
-@deftypefun int iks_save (const char *@var{fname}, iks *@var{x});
-Converts tree @var{x} into a string and saves to the file.
-@end deftypefun
-
-Both functions return same error codes as @code{iks_parse}. Some additional
-error codes are defined for indicating file problems. They are:
-
-@table @code
-@item IKS_FILE_NOFILE
-A file with the given name doesn't exist.
-@item IKS_FILE_NOACCESS
-Cannot open file. Possibly a permission problem.
-@item IKS_FILE_RWERR
-Read or write operation failed.
-@end table
-
-Here is a simple example which parses a file and saves it into another:
-
-@example
-iks *x;
-
-if (IKS_OK != iks_load ("file1.xml", &x)) @{
-    puts ("loading error");
-@}
-if (IKS_OK != iks_save ("file2.xml", x)) @{
-    puts ("saving error");
-@}
-@end example
-
-
-@comment ============================================================
-@node XML Streams,Writing a Jabber Client,Working with XML Trees,Tutorials
-@section XML Streams
-
-XML streams function as containers for any XML chunks sent asynchronously
-between network endpoints. They are used for asyncronously exchanging
-relatively small payload of structured information between entities.
-
-A stream is initiated by one of hosts connecting to the other, and sending a
-<stream:stream> tag. Receiving entity replies with a second XML stream
-back to the initiating entity within the same connection. Each unit of
-information is send as a direct child tag of the <stream:stream> tag.
-Stream is closed with </stream:stream>.
-
-XML streams use a subset of XML. Specifically they should not contain
-processing instructions, non-predefined entities, comments, or DTDs.
-
-Jabber protocol uses XML streams for exchanging messages, presence
-information, and other information like authorization, search, time and
-version queries, protocol extensions.
-
-iksemel provides you a stream parser, which automatically handles connection
-to the server, and calls your hook function with incoming information
-parsed and converted to an XML tree.
-
-You can create such a parser with:
-
-@deftypefun iksparser* iks_stream_new (char* @var{name_space}, void* @var{user_data}, iksStreamHook* @var{streamHook});
-Allocates and initalizes a stream parser. @var{name_space} indicates the
-stream type, jabber clients use "jabber:client" namespace. @var{user_data}
-is passed directly to your hook function.
-@end deftypefun
-
-@deftp Typedef iksStreamHook
-int iksStreamHook (void* @var{user_data}, int @var{type}, iks* @var{node});
-
-Depending on the value of the @var{type}, @var{node} contains:
-@table @code
-@item IKS_NODE_START
-Got the <stream:stream> tag, namespace, stream id and other information
-is contained in the @var{node}.
-@item IKS_NODE_NORMAL
-A first level child of the <stream:stream> tag is received. @var{node} contains
-the parsed tag. If you are connected to a jabber server, you can get <message>,
-<presence>, or <iq> tags.
-@item IKS_NODE_ERROR
-Got a <stream:error> tag, details can be accessed from @var{node}.
-@item IKS_NODE_STOP
-</stream:stream> tag is received or connection is closed, @var{node} is @code{NULL}.
-@end table
-
-Freeing the node with @code{iks_delete} is up to you.
-@end deftp
-
-You can manually feed this parser with @code{iks_parse} function, but using
-iksemel's connection facilities is easier for most of the cases.
-
-This functions return @code{IKS_OK} for success. Error codes of @code{iks_parse}
-are used in same manner. Following additional codes are defined for
-network related problems:
-
-@table @code
-@item IKS_NET_NODNS
-Hostname lookup failed. Possible reasons: hostname is incorrect,
-you are not online, your dns server isn't accessible.
-@item IKS_NET_NOSOCK
-Socket cannot created.
-@item IKS_NET_NOCONN
-Connection attemp failed. Possible reasons: host is not an XML stream
-server, port number is wrong, server is busy or closed for the moment.
-@item IKS_NET_RWERR
-@code{send} or @code{recv} call is failed when attempting to exchange
-the data with the server. You should close the connection with @code{iks_disconnect}
-after getting this error from data transfer functions.
-@end table
-
-@deftypefun int iks_connect_tcp (iksparser *@var{prs}, const char *@var{server}, int @var{port});
-This function connects the parser to a server and sends stream header for you.
-@var{server} is the host name of the server and @var{port} is the tcp port
-number which server is listening to. You can use @code{IKS_JABBER_PORT}
-macro for the default jabber client port (5222).
-@end deftypefun
-
-@deftypefun int iks_connect_fd (iksparser *@var{prs}, int @var{fd});
-Attaches parser to an already opened connection. @var{fd} is the socket
-descriptor. Note that @code{iks_disconnect} doesn't close the socket
-for this kind of connection, opening and closing of the socket is up to your
-application. Stream header is not sent automatically. You can use
-@code{iks_send_header} function for sending it.
-@end deftypefun
-
-@deftypefun void iks_disconnect (iksparser *@var{prs});
-Closes connection to the server, and frees connection resources.
-@end deftypefun
-
-After successfully connecting to a server, you can use following functions
-for exchanging information with server.
-
-@deftypefun int iks_recv (iksparser* @var{prs}, int @var{timeout});
-If @var{timeout} is @code{-1}, waits until some data arrives from server,
-and process the data. Your stream hook can be called if a complete
-chunk is arrived.
-
-If @var{timeout} is a positive integer, @code{iks_recv} returns if no data
-arrives for @var{timeout} seconds.
-
-If @var{timeout} is zero, @code{iks_recv} checks if there is any data
-waiting at the network buffer, and returns without waiting for data.
-@end deftypefun
-
-@deftypefun int iks_fd (iksparser* @var{prs});
-Returns the file descriptor of the connected socket. You can use this in
-your @code{select} function or some other input loop to act whenever
-some data from the server arrives. This value of only valid between
-a successful @code{iks_connect_tcp} and @code{iks_disconnect}.
-@end deftypefun
-
-@deftypefun int iks_send (iksparser* @var{prs}, iks* @var{x});
-Converts the tree given in @var{x} to a string, and sends to the server.
-String is created inside the object stack of @var{x}.
-@end deftypefun
-
-@deftypefun int iks_send_raw (iksparser* @var{prs}, char* @var{xmlstr});
-Sends the string given in @var{xmlstr} to the server.
-@end deftypefun
-
-@deftypefun int iks_send_header (iksparser *@var{prs}, char *@var{to});
-Sends the stream header. @var{to} is the name of the server.
-Normally @code{iks_connect_tcp} function calls this for you. This
-is only useful if you are using @code{iks_connect_fd}.
-@end deftypefun
-
-Sometimes it is useful to log incoming and outgoing data to your parser
-for debugging your applications. iksemel provides a logging facility for you.
-
-@deftypefun void iks_set_log_hook (iksparser* @var{prs}, iksLogHook* @var{logHook});
-Sets the log function for your stream parser. You can't use this function
-on any other type of parser.
-@end deftypefun
-
-@deftp Typedef iksLogHook
-void iksLogHook (void* @var{user_data}, const char* @var{data}, size_t @var{size}, int @var{is_incoming});
-
-@var{user_data} is same value which you give with @code{iks_stream_new}.
-@var{data} is @var{size} bytes of data. Be very careful that this data may be
-coming from other side of the connection and can contain malicius bytes. It isn't
-checked by iksemel yet, so you should check it yourself before displaying or
-passing to other systems in your application or computer. If @var{is_incoming}
-is a non-zero value, data is incoming from server, otherwise it is outgoing to the
-server.
-@end deftp
-
-
-@comment ============================================================
-@node Writing a Jabber Client,Utility Functions,XML Streams,Tutorials
-@section Writing a Jabber Client
-
-@ifinfo
-@menu
-* Security::
-
-* Packets::
-
-* Packet Filter::
-
-* Creating Common Packets::
-
-@end menu
-@end ifinfo
-
-@comment ============================================================
-@node Security,Packets,,Writing a Jabber Client
-@subsection Security
-
-iksemel supports TLS protocol for encrypted communication and SASL
-protocol for authentication. TLS is handled by gnutls library.
-
-@deftypefun int iks_has_tls (void);
-If iksemel is compiled with gnutls library, this function returns a non-zero
-value indicating you can try encrypted connection with the server.
-@end deftypefun
-
-@deftypefun int iks_start_tls (iksparser* @var{prs});
-Starts a TLS handshake over already connected parser. Returns IKS_OK or
-one of the IKS_NET_ errors. If handshake succeeds you'll get another
-stream header from server.
-@end deftypefun
-
-@deftypefun int iks_is_secure (iksparser* @var{prs});
-Returns a non-zero value if a secure connection is fully established
-between server.
-@end deftypefun
-
-@deftypefun int iks_start_sasl (iksparser* @var{prs}, enum ikssasltype @var{type}, char* @var{username}, char* @var{pass});
-Starts SASL operation.
-@end deftypefun
-
-See tools/iksroster.c for a good example.
-
-@comment ============================================================
-@node Packets,Packet Filter,Security,Writing a Jabber Client
-@subsection Packets
-
-iksemel can parse a jabber XML node and provide you a public packet
-structure which contains information like node type and subtype, id,
-namespace, sender's jabber id, etc.
-
-This handles a lot of node parsing for you. Packets are also used in
-the packet filter subsystem.
-
-@deftypefun {ikspak *} iks_packet (iks *@var{x});
-Takes a node from stream and extracts information from it to a packet structure.
-Structure is allocated inside the node's object stack.
-@end deftypefun
-
-@tindex ikspak
-@code{ikspak} structure has following fields:
-
-@table @code
-@item iks *x;
-This is a pointer to the node.
-@item iksid *from;
-Sender's jabber id in parsed form. See below for @code{iksid} structure.
-@item iks *query;
-A pointer to the <query> tag for IQ nodes.
-@item char *ns;
-Namespace of the content for IQ nodes.
-@item char *id;
-ID of the node.
-@item enum ikspaktype type;
-Type of the node. Possible types are:
-
-@table @code
-@item IKS_PAK_NONE
-Unknown node.
-@item IKS_PAK_MESSAGE
-Message node.
-@item IKS_PAK_PRESENCE
-Presence node with presence publishing operation.
-@item IKS_PAK_S10N
-Presence node with subscription operation.
-@item IKS_PAK_IQ
-IQ node.
-@end table
-@item enum iksubtype subtype;
-Sub type of the node. Sub types for message nodes:
-
-@table @code
-@item IKS_TYPE_NONE
-A normal message.
-@item IKS_TYPE_CHAT
-Private chat message.
-@item IKS_TYPE_GROUPCHAT
-Multi user chat message.
-@item IKS_TYPE_HEADLINE
-Message from a news source.
-@item IKS_TYPE_ERROR
-Message error.
-@end table
-
-Sub types for IQ nodes:
-
-@table @code
-@item IKS_TYPE_GET
-Asks for some information.
-@item IKS_TYPE_SET
-Request for changing information.
-@item IKS_TYPE_RESULT
-Reply to get and set requests.
-@item IKS_TYPE_ERROR
-IQ error.
-@end table
-
-Sub types for subscription nodes:
-
-@table @code
-@item IKS_TYPE_SUBSCRIBE,
-Asks for subscribing to the presence.
-@item IKS_TYPE_SUBSCRIBED,
-Grants subscription.
-@item IKS_TYPE_UNSUBSCRIBE,
-Asks for unsubscribing to the presence.
-@item IKS_TYPE_UNSUBSCRIBED,
-Cancels subscription.
-@item IKS_TYPE_ERROR
-Presence error.
-@end table
-
-Sub types for presence nodes:
-
-@table @code
-@item IKS_TYPE_PROBE,
-Asks presence status.
-@item IKS_TYPE_AVAILABLE,
-Publishes entity as available. More information can be found in @code{show} field.
-@item IKS_TYPE_UNAVAILABLE
-Publishes entity as unavailable. More information can be found in @code{show} field.
-@end table
-@item enum ikshowtype show;
-Presence state for the presence nodes.
-
-@table @code
-@item IKS_SHOW_UNAVAILABLE
-Entity is unavailable.
-@item IKS_SHOW_AVAILABLE
-Entity is available.
-@item IKS_SHOW_CHAT
-Entity is free for chat.
-@item IKS_SHOW_AWAY
-Entity is away for a short time.
-@item IKS_SHOW_XA
-Entity is away for a long time.
-@item IKS_SHOW_DND
-Entity doesn't want to be disturbed.
-@end table
-@end table
-
-iksemel has two functions to parse and compare jabber IDs.
-
-@deftypefun {iksid *} iks_id_new (ikstack *@var{s}, const char *@var{jid});
-Parses a jabber id into its parts. @code{iksid} structure is created inside
-the @var{s} object stack.
-@end deftypefun
-
-@tindex iksid
-@code{iksid} structure has following fields:
-
-@table @code
-@item char *user;
-User name.
-@item char *server;
-Server name.
-@item char *resource;
-Resource.
-@item char *partial;
-User name and server name.
-@item char *full;
-User name, server name and resource.
-@end table
-
-You can access this fields and read their values. Comparing two parsed jabber
-ids can be done with:
-
-@deftypefun int iks_id_cmp (iksid *@var{a}, iksid *@var{b}, int @var{parts});
-Compares @var{parts} of @var{a} and @var{b}. Part values are:
-
-@table @code
-@item IKS_ID_USER
-@item IKS_ID_SERVER
-@item IKS_ID_RESOURCE
-@end table
-
-@sp 1
-You can combine this values with @code{or} operator. Some common combinations
-are predefined for you:
-
-@table @code
-@item IKS_ID_PARTIAL
-@code{IKS_ID_USER | IKS_ID_SERVER}
-@item IKS_ID_FULL
-@code{IKS_ID_USER | IKS_ID_SERVER | IKS_ID_RESOURCE}
-@end table
-
-Return value is @code{0} for equality. If entities are not equal a combination of
-part values showing different parts is returned.
-@end deftypefun
-
-
-@comment ============================================================
-@node Packet Filter,Creating Common Packets,Packets,Writing a Jabber Client
-@subsection Packet Filter
-
-Packet filter handles routing incoming packets to related functions.
-
-@tindex iksfilter
-@deftypefun {iksfilter *} iks_filter_new (void);
-Creates a new packet filter.
-@end deftypefun
-
-@deftypefun void iks_filter_packet (iksfilter *@var{f}, ikspak *@var{pak});
-Feeds the filter with given packet. Packet is compared to registered rules and
-hook functions of the matching rules are called in most matched to least
-matched order.
-@end deftypefun
-
-@deftypefun void iks_filter_delete (iksfilter *@var{f});
-Frees filter and rules.
-@end deftypefun
-
-Rules are created with following function:
-
-@tindex iksrule
-@deftypefun {iksrule *} iks_filter_add_rule (iksfilter *@var{f}, iksFilterHook *@var{filterHook}, void *@var{user_data}, @dots{});
-Adds a rule to the filter @var{f}. @var{user_data} is passed directly to your
-hook function @var{filterHook}.
-
-A rule consist of one or more type and value pairs. Possible types:
-@table @code
-@item IKS_RULE_ID
-Compares @code{char *} value to packet ids.
-@item IKS_RULE_FROM
-Compares @code{char *} value to packet senders.
-@item IKS_RULE_FROM_PARTIAL
-Compares @code{char *} value to packet sender. Ignores resource part of jabber id.
-@item IKS_RULE_NS
-Compares @code{char *} value to namespace of iq packets.
-@item IKS_RULE_TYPE
-Compares @code{int} value to packet types.
-@item IKS_RULE_SUBTYPE
-Compares @code{int} value to packet sub types.
-@item IKS_RULE_DONE
-Terminates the rule pairs.
-@end table
-@end deftypefun
-
-Here is an example which creates a filter and adds three rules:
-@example
-iksfilter *f;
-
-f = iks_filter_new ();
-iks_filter_add_rule (f, on_msg, NULL,
-                     IKS_RULE_TYPE, IKS_PAK_MESSAGE,
-		     IKS_RULE_DONE);
-iks_filter_add_rule (f, on_auth_result, NULL,
-                     IKS_RULE_TYPE, IKS_PAK_IQ,
-		     IKS_RULE_SUBTYPE, IKS_TYPE_RESULT,
-		     IKS_RULE_ID, "auth",
-		     IKS_RULE_DONE);
-iks_filter_add_rule (f, on_roster_push, NULL,
-                     IKS_RULE_TYPE, IKS_PAK_IQ,
-		     IKS_RULE_SUBTYPE, IKS_TYPE_SET,
-		     IKS_RULE_NS, "jabber:iq:roster",
-		     IKS_RULE_DONE);
-@end example
-
-@deftp Typedef iksFilterHook
-int iksFilterHook (void *user_data, ikspak *pak);
-
-Your hook is called with your @var{user_data} and matching packet @var{pak}.
-You can return two different values from your hook:
-@table @code
-@item IKS_FILTER_PASS
-Packet is forwarded to least matching rules.
-@item IKS_FILTER_EAT
-Filtering process for the packet ends.
-@end table
-@end deftp
-
-You can remove the rules with following functions:
-
-@deftypefun void iks_filter_remove_rule (iksfilter *@var{f}, iksrule *@var{rule});
-Removes the rule from filter.
-@end deftypefun
-
-@deftypefun void iks_filter_remove_hook (iksfilter *@var{f}, iksFilterHook *@var{filterHook});
-Remove the rules using @var{filterHook} function from filter.
-@end deftypefun
-
-
-@comment ============================================================
-@node Creating Common Packets,,Packet Filter,Writing a Jabber Client
-@subsection Creating Common Packets
-
-A usual jabber network traffic contains many similar XML constructs. iksemel
-provides several utility functions for creating them. They all generate an XML
-tree, so you can add or modify some parts of the tree, and send to server then.
-
-@deftypefun {iks *} iks_make_auth (iksid *@var{id}, const char *@var{pass}, const char *@var{sid});
-Creates an authorization packet. @var{id} is your parsed jabber id, and @var{pass}
-is your password.
-
-If stream id @var{sid} isn't NULL, SHA1 authentication is used, otherwise password
-is attached in plain text. You can learn stream id from @code{IKS_STREAM_START}
-packet in your stream hook like this:
-
-@example
-char *sid;
-
-if (type == IKS_STREAM_START) @{
-    sid = iks_find_attrib (node, "id");
-@}
-@end example
-@end deftypefun
-
-@deftypefun {iks *} iks_make_msg (enum iksubtype @var{type}, const char *@var{to}, const char *@var{body});
-Creates a message packet. @var{type} is the message type, @var{to} is jabber id
-of the recipient, @var{body} is the message.
-@end deftypefun
-
-@deftypefun {iks *} iks_make_s10n (enum iksubtype @var{type}, const char *@var{to}, const char *@var{msg});
-Creates a presence packet for subscription operations. @var{type} is operation,
-@var{to} is jabber id of the recipient, @var{msg} is a small message for
-introducing yourself, or explaning the reason of why you are subscribing or
-unsubscribing.
-@end deftypefun
-
-@deftypefun {iks *} iks_make_pres (enum ikshowtype @var{show}, const char *@var{status});
-Creates a presence packet for publishing your presence. @var{show} is your
-presence state and @var{status} is a message explaining why you are not
-available at the moment, or what you are doing now.
-@end deftypefun
-
-@deftypefun {iks *} iks_make_iq (enum iksubtype @var{type}, const char *@var{xmlns});
-Creates an IQ packet. @var{type} is operation type and @var{xmlns} is the
-namespace of the content. You usually have to add real content to the <query>
-tag before sending this packet.
-@end deftypefun
-
-
-@comment ============================================================
-@node Utility Functions,,Writing a Jabber Client,Tutorials
-@section Utility Functions
-
-@subsection Memory Utilities
-
-@deftypefun {void *} iks_malloc (size_t @var{size});
-@end deftypefun
-@deftypefun void iks_free (void *@var{ptr});
-@end deftypefun
-
-These are wrappers around ANSI malloc and free functions used by the
-iksemel library itself. You can free the output of iks_string (only if you
-passed it a NULL stack) with iks_free for example. That is important
-if you are using a malloc debugger in your application but not in iksemel
-or vice versa.
-
-@comment ============================================================
-@subsection String Utilities
-
-@deftypefun {char *} iks_strdup (const char *@var{src});
-@end deftypefun
-@deftypefun int iks_strcmp (const char *@var{a}, const char *@var{b});
-@end deftypefun
-@deftypefun int iks_strcasecmp (const char *@var{a}, const char *@var{b});
-@end deftypefun
-@deftypefun int iks_strncmp (const char *@var{a}, const char *@var{b}, size_t @var{n});
-@end deftypefun
-@deftypefun int iks_strncasecmp (const char *@var{a}, const char *@var{b}, size_t @var{n});
-@end deftypefun
-@deftypefun size_t iks_strlen (const char *@var{src});
-@end deftypefun
-
-These functions work exactly like their ANSI equivalents except that they allow
-NULL values for string pointers. If @var{src} is NULL, iks_strdup and iks_strlen
-returns zero. If @var{a} or @var{b} is NULL in string comparisation functions
-they return -1.
-
-Their usefulness comes from the fact that they can chained with DOM traversing
-functions like this:
-
-@smallexample
-if (iks_strcmp (iks_find_attrib (x, "id"), "x1") == 0) count++;
-@end smallexample
-
-That example works even x doesn't have an 'id' attribute and iks_find_attrib
-returns NULL. So you don't need to use temporary variables in such
-situations.
-
-@comment ============================================================
-@subsection SHA1 Hash
-
-Secure Hash Algorithm (SHA1) is used in the Jabber authentication
-protocol for encoding your password when sending to the server.
-This is normally handled by iks_make_auth() function, but if you
-want to handle it manually, or if you need a good hash function
-for other purproses you can use these functions.
-
-@deftypefun iksha* iks_sha_new (void);
-Allocates a structure for keeping calculation values and the state.
-@end deftypefun
-
-@deftypefun void iks_sha_reset (iksha *@var{sha});
-Resets the state of the calculation.
-@end deftypefun
-
-@deftypefun void iks_sha_hash (iksha *@var{sha}, const unsigned char *@var{data}, int @var{len}, int @var{finish});
-Calculates the hash value of the given data. If @var{finish} is non
-zero, applies the last step of the calculation.
-@end deftypefun
-
-@deftypefun void iks_sha_print (iksha *@var{sha}, char *@var{hash});
-Prints the result of a finished calculation into the buffer pointed by @var{hash}
-in hexadecimal string form. Buffer must be at least 40 bytes long. String
-is not null terminated.
-@end deftypefun
-
-@deftypefun void iks_sha (const char *@var{data}, char *@var{hash});
-Calculates the hash value of @var{data} and prints into @var{hash}.
-This is a helper function for simple hash calculations. It calls
-other functions for the actual work.
-@end deftypefun
-
-
-@comment ============================================================
-
-
-@node Development,Datatype Index,Tutorials,Top
-@chapter Development
-
-This chapter contains information on plan, procedure and standarts of
-iksemel development.
-
-@section Roadmap
-
-There are three main functions iksemel tries to provide to applications:
-@itemize @bullet
-@item
-A generic XML parser with SAX and DOM interfaces.
-@item
-XML stream client and server functionality.
-@item
-Utilities for Jabber clients.
-@end itemize
-
-Goal of the iksemel is providing these functions while supporting embedded
-environments, keeping usage simple, and having a robust implementation.
-
-Some decisions are made to reach this goal:
-
-Code is written in ANSI C with a single dependency on C library. Instead of
-using expat or libxml, a simple built-in parser is used. Similarly glib and
-gnu only features of glibc (like object stacks) are avoided and built-in
-memory and string utilities are used. This may seem like code duplication
-but since they are optimized for iksemel and only a few kb in size,
-it isn't a big disadvantage.
-
-Code is placed files in a modular fashion, and different modules don't depend
-on others' internal details. This allows taking unneeded functionality out when
-building for low resource situations.
-
-It is tried to give functions names which are consistent, clear and short.
-
-API is documented with texinfo for high quality printed output and info file
-output for fast and simple access during application development. Instead
-of using an autogenerated system or simply listing function descriptions,
-a task oriented tutorial approach is used.
-
-@section Coding Style
-
-Here is a short list describing preferred coding style for iksemel.
-Please keep in mind when sending patches.
-
-@itemize @bullet
-@item
-Indentation is done with tabs. Aligning is done with spaces.
-@item
-Placement of braces is K&R style.
-@item
-Function names are put at the start of line.
-@item
-Function names are lowercase.
-@item
-Words of the function names are separated with underscore character.
-@item
-Structure and variable names are lowercase.
-@item
-Macro and enumarations names are uppercase.
-@item
-Exported library API is contained in the single iksemel.h file.
-@item
-Exported function names start with iks_
-@item
-Exported structure and type names start with iks
-@item
-Exported macro and enumaration names start with IKS_
-@end itemize
-
-Here is an example:
-
-@smallexample
-int
-iks_new_func (char *text)
-@{
-    int i;
-
-    i = an_internal_func (text);
-    if (IKS_SOME_VALUE == i) @{
-        iks_some_func (text);
-        i++;
-    @}
-    return i;
-@}
-@end smallexample
-
-@section Resources
-
-@itemize @bullet
-@item
-RFC 2279, UTF-8 format @url{http://www.ietf.org/rfc/rfc2279.txt}
-@item
-W3C Recommendation, Extensible Markup Language 1.0 @url{http://www.w3.org/TR/REC-xml}
-@item
-Annotated XML Specification @url{http://www.xml.com/axml/testaxml.htm}
-@item
-Jabber Protocol Documents @url{http://www.jabber.org/protocol/}
-@end itemize
-
-
-@comment ============================================================
-
-
-@node Datatype Index,Function Index,Development,Top
-@unnumbered Datatype Index
-@printindex tp
-
-
-@node Function Index,,Datatype Index,Top
-@unnumbered Function Index
-@printindex fn
-
-
-@contents
-@bye
diff --git a/libs/iksemel/iksemel.pc.in b/libs/iksemel/iksemel.pc.in
deleted file mode 100644
index 7f5c9d2c10..0000000000
--- a/libs/iksemel/iksemel.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: iksemel
-Description: XML parser library for Jabber
-Version: @VERSION@
-Libs: -L${libdir} -liksemel
-Cflags: -I${includedir}
diff --git a/libs/iksemel/include/Makefile.am b/libs/iksemel/include/Makefile.am
deleted file mode 100644
index 23899eeea8..0000000000
--- a/libs/iksemel/include/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## Process this file with automake to produce Makefile.in
-##
-
-include_HEADERS = iksemel.h
-noinst_HEADERS = common.h finetune.h
diff --git a/libs/iksemel/include/common.h b/libs/iksemel/include/common.h
deleted file mode 100644
index af94f6fb85..0000000000
--- a/libs/iksemel/include/common.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#elif HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifndef errno
-extern int errno;
-#endif
-
-#include "finetune.h"
diff --git a/libs/iksemel/include/finetune.h b/libs/iksemel/include/finetune.h
deleted file mode 100644
index 1eae1d8ea3..0000000000
--- a/libs/iksemel/include/finetune.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-/* minimum sax buffer size */
-#define SAX_BUFFER_MIN_SIZE 128
-
-/* sax parser structure plus extra data of dom parser */
-#define DEFAULT_DOM_CHUNK_SIZE 256
-
-/* sax parser structure plus extra data of stream parser */
-#define DEFAULT_STREAM_CHUNK_SIZE 256
-
-/* iks structure, its data, child iks structures, for stream parsing */
-#define DEFAULT_IKS_CHUNK_SIZE 1024
-
-/* iks structure, its data, child iks structures, for file parsing */
-#define DEFAULT_DOM_IKS_CHUNK_SIZE 2048
-
-/* rule structure and from/to/id/ns strings */
-#define DEFAULT_RULE_CHUNK_SIZE 128
-
-/* file is read by blocks with this size */
-#define FILE_IO_BUF_SIZE 4096
-
-/* network receive buffer */
-#define NET_IO_BUF_SIZE 4096
diff --git a/libs/iksemel/include/iksemel.h b/libs/iksemel/include/iksemel.h
deleted file mode 100644
index dc6df91022..0000000000
--- a/libs/iksemel/include/iksemel.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2007 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#ifndef IKSEMEL_H
-#define IKSEMEL_H 1
-
-#ifdef __cplusplus
-#include <cstddef>	/* size_t for C++ */
-extern "C" {
-#else
-#include <stddef.h>	/* size_t for C */
-#endif
-
-/*****  object stack  *****/
-
-struct ikstack_struct;
-typedef struct ikstack_struct ikstack;
-
-ikstack *iks_stack_new (size_t meta_chunk, size_t data_chunk);
-void *iks_stack_alloc (ikstack *s, size_t size);
-char *iks_stack_strdup (ikstack *s, const char *src, size_t len);
-char *iks_stack_strcat (ikstack *s, char *old, size_t old_len, const char *src, size_t src_len);
-void iks_stack_stat (ikstack *s, size_t *allocated, size_t *used);
-void iks_stack_delete (ikstack **sp);
-
-/*****  utilities  *****/
-
-void *iks_malloc (size_t size);
-void iks_real_free (void *ptr);
-void iks_set_mem_funcs (void *(*malloc_func)(size_t size), void (*free_func)(void *ptr));
-
-char *iks_strdup (const char *src);
-char *iks_strcat (char *dest, const char *src);
-int iks_strcmp (const char *a, const char *b);
-int iks_strcasecmp (const char *a, const char *b);
-int iks_strncmp (const char *a, const char *b, size_t n);
-int iks_strncasecmp (const char *a, const char *b, size_t n);
-size_t iks_strlen (const char *src);
-char *iks_escape (ikstack *s, char *src, size_t len);
-char *iks_unescape (ikstack *s, char *src, size_t len);
-
-#define iks_free(p) if (p) {iks_real_free(p) ; p = NULL;}
-
-/*****  dom tree  *****/
-
-enum ikstype {
-	IKS_NONE = 0,
-	IKS_TAG,
-	IKS_ATTRIBUTE,
-	IKS_CDATA
-};
-
-struct iks_struct;
-typedef struct iks_struct iks;
-
-iks *iks_new (const char *name);
-iks *iks_new_within (const char *name, ikstack *s);
-iks *iks_insert (iks *x, const char *name);
-iks *iks_insert_cdata (iks *x, const char *data, size_t len);
-iks *iks_insert_attrib (iks *x, const char *name, const char *value);
-iks *iks_insert_node (iks *x, iks *y);
-iks *iks_append (iks *x, const char *name);
-iks *iks_prepend (iks *x, const char *name);
-iks *iks_append_cdata (iks *x, const char *data, size_t len);
-iks *iks_prepend_cdata (iks *x, const char *data, size_t len);
-void iks_hide (iks *x);
-void iks_delete (iks *x);
-iks *iks_next (iks *x);
-iks *iks_next_tag (iks *x);
-iks *iks_prev (iks *x);
-iks *iks_prev_tag (iks *x);
-iks *iks_parent (iks *x);
-iks *iks_root (iks *x);
-iks *iks_child (iks *x);
-iks *iks_first_tag (iks *x);
-iks *iks_attrib (iks *x);
-iks *iks_find (iks *x, const char *name);
-char *iks_find_cdata (iks *x, const char *name);
-char *iks_find_attrib (iks *x, const char *name);
-iks *iks_find_with_attrib (iks *x, const char *tagname, const char *attrname, const char *value);
-ikstack *iks_stack (iks *x);
-enum ikstype iks_type (iks *x);
-char *iks_name (iks *x);
-char *iks_cdata (iks *x);
-size_t iks_cdata_size (iks *x);
-int iks_has_children (iks *x);
-int iks_has_attribs (iks *x);
-char *iks_string (ikstack *s, iks *x);
-iks *iks_copy (iks *x);
-iks *iks_copy_within (iks *x, ikstack *s);
-
-/*****  sax parser  *****/
-
-enum ikserror {
-	IKS_OK = 0,
-	IKS_NOMEM,
-	IKS_BADXML,
-	IKS_HOOK
-};
-
-enum ikstagtype {
-	IKS_OPEN,
-	IKS_CLOSE,
-	IKS_SINGLE
-};
-
-typedef int (iksTagHook)(void *user_data, char *name, char **atts, int type);
-typedef int (iksCDataHook)(void *user_data, char *data, size_t len);
-typedef void (iksDeleteHook)(void *user_data);
-
-struct iksparser_struct;
-typedef struct iksparser_struct  iksparser;
-
-iksparser *iks_sax_new (void *user_data, iksTagHook *tagHook, iksCDataHook *cdataHook);
-iksparser *iks_sax_extend (ikstack *s, void *user_data, iksTagHook *tagHook, iksCDataHook *cdataHook, iksDeleteHook *deleteHook);
-ikstack *iks_parser_stack (iksparser *prs);
-void *iks_user_data (iksparser *prs);
-unsigned long iks_nr_bytes (iksparser *prs);
-unsigned long iks_nr_lines (iksparser *prs);
-int iks_parse (iksparser *prs, const char *data, size_t len, int finish);
-void iks_parser_reset (iksparser *prs);
-void iks_parser_delete (iksparser *prs);
-
-/*****  dom parser  *****/
-
-enum iksfileerror {
-	IKS_FILE_NOFILE = 4,
-	IKS_FILE_NOACCESS,
-	IKS_FILE_RWERR
-};
-
-iksparser *iks_dom_new (iks **iksptr);
-void iks_set_size_hint (iksparser *prs, size_t approx_size);
-iks *iks_tree (const char *xml_str, size_t len, int *err);
-int iks_load (const char *fname, iks **xptr);
-int iks_save (const char *fname, iks *x);
-
-/*****  transport layer  *****/
-
-enum iksasyncevents {
-	IKS_ASYNC_RESOLVED,
-	IKS_ASYNC_CONNECTED,
-	IKS_ASYNC_WRITE,
-	IKS_ASYNC_WRITTEN,
-	IKS_ASYNC_READ,
-	IKS_ASYNC_CLOSED,
-	IKS_ASYNC_ERROR
-};
-
-typedef struct iksasyncevent_struct {
-	int event;
-	int data0;
-	int data1;
-} iksasyncevent;
-
-typedef void (iksTClose)(void *socket);
-typedef int (iksTConnect)(iksparser *prs, void **socketptr, const char *server, int port);
-typedef int (iksTSend)(void *socket, const char *data, size_t len);
-typedef int (iksTRecv)(void *socket, char *buffer, size_t buf_len, int timeout);
-typedef int (iksAsyncNotify)(void *user_data, iksasyncevent *event);
-typedef int (iksTConnectAsync)(iksparser *prs, void **socketptr, const char *server, const char *server_name, int port, void *notify_data, iksAsyncNotify *notify_func);
-
-#define IKS_TRANSPORT_V1 0
-
-typedef const struct ikstransport_struct {
-	int abi_version;
-	/* basic api, connect can be NULL if only async api is provided */
-	iksTConnect *connect;
-	iksTSend *send;
-	iksTRecv *recv;
-	iksTClose *close;
-	/* optional async api */
-	iksTConnectAsync *connect_async;
-} ikstransport;
-
-extern ikstransport iks_default_transport;
-
-/*****  stream parser  *****/
-
-enum iksneterror {
-	IKS_NET_NODNS = 4,
-	IKS_NET_NOSOCK,
-	IKS_NET_NOCONN,
-	IKS_NET_RWERR,
-	IKS_NET_NOTSUPP,
-	IKS_NET_TLSFAIL,
-	IKS_NET_DROPPED,
-	IKS_NET_UNKNOWN
-};
-
-enum iksnodetype {
-	IKS_NODE_START,
-	IKS_NODE_NORMAL,
-	IKS_NODE_ERROR,
-	IKS_NODE_STOP
-};
-
-enum ikssasltype {
-	IKS_SASL_PLAIN,
-	IKS_SASL_DIGEST_MD5
-};
-
-#define IKS_JABBER_PORT 5222
-
-typedef int (iksStreamHook)(void *user_data, int type, iks *node);
-typedef void (iksLogHook)(void *user_data, const char *data, size_t size, int is_incoming);
-
-iksparser *iks_stream_new (char *name_space, void *user_data, iksStreamHook *streamHook);
-void *iks_stream_user_data (iksparser *prs);
-void iks_set_log_hook (iksparser *prs, iksLogHook *logHook);
-int iks_connect_tcp (iksparser *prs, const char *server, int port);
-int iks_connect_fd (iksparser *prs, int fd);
-int iks_connect_via (iksparser *prs, const char *server, int port, const char *server_name);
-int iks_connect_with (iksparser *prs, const char *server, int port, const char *server_name, ikstransport *trans);
-int iks_connect_async (iksparser *prs, const char *server, int port, void *notify_data, iksAsyncNotify *notify_func);
-int iks_connect_async_with (iksparser *prs, const char *server, int port, const char *server_name, ikstransport *trans, void *notify_data, iksAsyncNotify *notify_func);
-int iks_fd (iksparser *prs);
-int iks_recv (iksparser *prs, int timeout);
-int iks_send_header (iksparser *prs, const char *to);
-int iks_send (iksparser *prs, iks *x);
-int iks_send_raw (iksparser *prs, const char *xmlstr);
-void iks_disconnect (iksparser *prs);
-int iks_has_tls (void);
-int iks_is_secure (iksparser *prs);
-int iks_start_tls (iksparser *prs);
-int iks_proceed_tls (iksparser *prs, const char *cert_file, const char *key_file);
-int iks_start_sasl (iksparser *prs, enum ikssasltype type, char *username, char *pass);
-
-/*****  jabber  *****/
-
-#define IKS_NS_CLIENT     "jabber:client"
-#define IKS_NS_SERVER     "jabber:server"
-#define IKS_NS_AUTH       "jabber:iq:auth"
-#define IKS_NS_AUTH_0K    "jabber:iq:auth:0k"
-#define IKS_NS_REGISTER   "jabber:iq:register"
-#define IKS_NS_ROSTER     "jabber:iq:roster"
-#define IKS_NS_XROSTER	"jabber:x:roster"
-#define IKS_NS_OFFLINE    "jabber:x:offline"
-#define IKS_NS_AGENT      "jabber:iq:agent"
-#define IKS_NS_AGENTS     "jabber:iq:agents"
-#define IKS_NS_BROWSE     "jabber:iq:browse"
-#define IKS_NS_CONFERENCE "jabber:iq:conference"
-#define IKS_NS_DELAY      "jabber:x:delay"
-#define IKS_NS_VERSION    "jabber:iq:version"
-#define IKS_NS_TIME       "jabber:iq:time"
-#define IKS_NS_VCARD      "vcard-temp"
-#define IKS_NS_PRIVATE    "jabber:iq:private"
-#define IKS_NS_SEARCH     "jabber:iq:search"
-#define IKS_NS_OOB        "jabber:iq:oob"
-#define IKS_NS_XOOB       "jabber:x:oob"
-#define IKS_NS_ADMIN      "jabber:iq:admin"
-#define IKS_NS_FILTER     "jabber:iq:filter"
-#define IKS_NS_GATEWAY    "jabber:iq:gateway"
-#define IKS_NS_LAST       "jabber:iq:last"
-#define IKS_NS_SIGNED     "jabber:x:signed"
-#define IKS_NS_ENCRYPTED  "jabber:x:encrypted"
-#define IKS_NS_ENVELOPE   "jabber:x:envelope"
-#define IKS_NS_EVENT      "jabber:x:event"
-#define IKS_NS_EXPIRE     "jabber:x:expire"
-#define IKS_NS_XHTML      "http://www.w3.org/1999/xhtml"
-#define IKS_NS_XMPP_SASL  "urn:ietf:params:xml:ns:xmpp-sasl"
-#define IKS_NS_XMPP_BIND  "urn:ietf:params:xml:ns:xmpp-bind"
-#define IKS_NS_XMPP_SESSION  "urn:ietf:params:xml:ns:xmpp-session"
-
-#define IKS_ID_USER 1
-#define IKS_ID_SERVER 2
-#define IKS_ID_RESOURCE 4
-#define IKS_ID_PARTIAL IKS_ID_USER | IKS_ID_SERVER
-#define IKS_ID_FULL IKS_ID_USER | IKS_ID_SERVER | IKS_ID_RESOURCE
-
-#define IKS_STREAM_STARTTLS                   1
-#define IKS_STREAM_SESSION                    2
-#define IKS_STREAM_BIND                       4
-#define IKS_STREAM_SASL_PLAIN                 8
-#define IKS_STREAM_SASL_MD5                  16
-
-typedef struct iksid_struct {
-	char *user;
-	char *server;
-	char *resource;
-	char *partial;
-	char *full;
-} iksid;
-
-iksid *iks_id_new (ikstack *s, const char *jid);
-int iks_id_cmp (iksid *a, iksid *b, int parts);
-
-enum ikspaktype {
-	IKS_PAK_NONE = 0,
-	IKS_PAK_MESSAGE,
-	IKS_PAK_PRESENCE,
-	IKS_PAK_IQ,
-	IKS_PAK_S10N
-};
-
-enum iksubtype {
-	IKS_TYPE_NONE = 0,
-	IKS_TYPE_ERROR,
-
-	IKS_TYPE_CHAT,
-	IKS_TYPE_GROUPCHAT,
-	IKS_TYPE_HEADLINE,
-
-	IKS_TYPE_GET,
-	IKS_TYPE_SET,
-	IKS_TYPE_RESULT,
-
-	IKS_TYPE_SUBSCRIBE,
-	IKS_TYPE_SUBSCRIBED,
-	IKS_TYPE_UNSUBSCRIBE,
-	IKS_TYPE_UNSUBSCRIBED,
-	IKS_TYPE_PROBE,
-	IKS_TYPE_AVAILABLE,
-	IKS_TYPE_UNAVAILABLE
-};
-
-enum ikshowtype {
-	IKS_SHOW_UNAVAILABLE = 0,
-	IKS_SHOW_AVAILABLE,
-	IKS_SHOW_CHAT,
-	IKS_SHOW_AWAY,
-	IKS_SHOW_XA,
-	IKS_SHOW_DND
-};
-
-typedef struct ikspak_struct {
-	iks *x;
-	iksid *from;
-	iks *query;
-	char *ns;
-	char *id;
-	enum ikspaktype type;
-	enum iksubtype subtype;
-	enum ikshowtype show;
-} ikspak;
-
-ikspak *iks_packet (iks *x);
-
-iks *iks_make_auth (iksid *id, const char *pass, const char *sid);
-iks *iks_make_msg (enum iksubtype type, const char *to, const char *body);
-iks *iks_make_s10n (enum iksubtype type, const char *to, const char *msg);
-iks *iks_make_pres (enum ikshowtype show, const char *status);
-iks *iks_make_iq (enum iksubtype type, const char *xmlns);
-iks *iks_make_resource_bind(iksid *id);
-iks *iks_make_session(void);
-int iks_stream_features(iks *x);
-
-/*****  jabber packet filter  *****/
-
-#define IKS_RULE_DONE 0
-#define IKS_RULE_ID 1
-#define IKS_RULE_TYPE 2
-#define IKS_RULE_SUBTYPE 4
-#define IKS_RULE_FROM 8
-#define IKS_RULE_FROM_PARTIAL 16
-#define IKS_RULE_NS 32
-
-enum iksfilterret {
-	IKS_FILTER_PASS,
-	IKS_FILTER_EAT
-};
-
-typedef int (iksFilterHook)(void *user_data, ikspak *pak);
-
-struct iksfilter_struct;
-typedef struct iksfilter_struct iksfilter;
-struct iksrule_struct;
-typedef struct iksrule_struct iksrule;
-
-iksfilter *iks_filter_new (void);
-iksrule *iks_filter_add_rule (iksfilter *f, iksFilterHook *filterHook, void *user_data, ...);
-void iks_filter_remove_rule (iksfilter *f, iksrule *rule);
-void iks_filter_remove_hook (iksfilter *f, iksFilterHook *filterHook);
-void iks_filter_packet (iksfilter *f, ikspak *pak);
-void iks_filter_delete (iksfilter *f);
-
-/*****  sha1  *****/
-
-struct iksha_struct;
-typedef struct iksha_struct iksha;
-
-iksha *iks_sha_new (void);
-void iks_sha_reset (iksha *sha);
-void iks_sha_hash (iksha *sha, const unsigned char *data, size_t len, int finish);
-void iks_sha_print (iksha *sha, char *hash);
-void iks_sha_delete (iksha *sha);
-void iks_sha (const char *data, char *hash);
-
-/*****  md5  *****/
-
-struct ikmd5_struct;
-typedef struct iksmd5_struct iksmd5;
-
-iksmd5 *iks_md5_new(void);
-void iks_md5_reset(iksmd5 *md5);
-void iks_md5_hash(iksmd5 *md5, const unsigned char *data, size_t slen, int finish);
-void iks_md5_delete(iksmd5 *md5);
-void iks_md5_print(iksmd5 *md5, char *buf);
-void iks_md5_digest(iksmd5 *md5, unsigned char *digest);
-void iks_md5(const char *data, char *buf);
-
-/*****  base64  *****/
-
-char *iks_base64_decode(const char *buf);
-char *iks_base64_encode(const char *buf, int len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* IKSEMEL_H */
diff --git a/libs/iksemel/include/stamp-h.in b/libs/iksemel/include/stamp-h.in
deleted file mode 100644
index 9788f70238..0000000000
--- a/libs/iksemel/include/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/libs/iksemel/ltmain.sh b/libs/iksemel/ltmain.sh
deleted file mode 100755
index 0223495a02..0000000000
--- a/libs/iksemel/ltmain.sh
+++ /dev/null
@@ -1,6911 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program 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.
-#
-# This program 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-         save_$lt_var=\$$lt_var
-         $lt_var=C
-         export $lt_var
-       fi"
-done
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-	# Failing that, at least try and use $RANDOM to avoid a race
-	my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-	save_mktempdir_umask=`umask`
-	umask 0077
-	$mkdir "$my_tmpdir"
-	umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-	exit $EXIT_FAILURE
-      }
-    fi
-
-    $echo "X$my_tmpdir" | $Xsed
-}
-
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-       *" $my_xlib_u "*)
-         extracted_serial=`expr $extracted_serial + 1`
-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
-       *) break ;;
-       esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $exit_status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-disable_libs=no
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    *.obj) xform=obj ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	exit_status=$?
-	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $exit_status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static | -static-libtool-libs)
-    case $arg in
-    -all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-    -static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-    -static-libtool-libs)
-      if test -z "$pic_flag" && test -n "$link_static_flag"; then
-        dlopen_self=$dlopen_self_static
-      fi
-      prefer_static_libs=yes
-      ;;
-    esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	darwin_framework|darwin_framework_skip)
-	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework|-arch|-isysroot)
-	case " $CC " in
-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
-		prev=darwin_framework_skip ;;
-	  *) compiler_flags="$compiler_flags $arg"
-	     prev=darwin_framework ;;
-	esac
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    absdir="$dir"
-	    notinst_path="$notinst_path $dir"
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -pg pass through profiling flag for GCC
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $exit_status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
-		;;
-	      pass_all)
-		valid_a_lib=yes
-		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-         { { test "$prefer_static_libs" = no ||
-             test "$prefer_static_libs,$installed" = "built,yes"; } ||
-           test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes ; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null |
-                      $EGREP ": [^:]* bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows|none)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-#      for path in $notinst_path; do
-#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-#      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	  fi
-	fi
-	
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    else
-	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-          case $host in
-          *cygwin* | *mingw* )
-            if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-             fi
-            ;;
-          * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            ;;
-          esac
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	exit_status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-            output_name=`basename $output`
-            output_path=`dirname $output`
-            cwrappersource="$output_path/$objdir/lt-$output_name.c"
-            cwrapper="$output_path/$output_name.exe"
-            $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-/* -DDEBUG is fairly common in CFLAGS.  */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int    check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-  DEBUG("(main) program_name : %s\n",program_name);
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-            cat >> $cwrappersource <<EOF
-  newargz[0] = (char *) xstrdup("$SHELL");
-EOF
-
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = find_executable(argv[0]);
-  if (newargz[1] == NULL)
-    lt_fatal("Couldn't find %s", argv[0]);
-  DEBUG("(main) found exe at : %s\n",newargz[1]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-
-  for (i=0; i<argc+1; i++)
-  {
-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-    ;
-  }
-
-EOF
-
-            case $host_os in
-              mingw*)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",(char const **)newargz);
-EOF
-              ;;
-              *)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-              ;;
-            esac
-
-            cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable(const char * path)
-{
-  struct stat st;
-
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0) &&
-      (
-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
-       ((st.st_mode & S_IXUSR) == S_IXUSR))
-      )
-    return 1;
-  else
-    return 0;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise */
-char *
-find_executable (const char* wrapper)
-{
-  int has_slash = 0;
-  const char* p;
-  const char* p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char* concat_name;
-
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-  {
-    concat_name = xstrdup (wrapper);
-    if (check_executable(concat_name))
-      return concat_name;
-    XFREE(concat_name);
-  }
-  else
-  {
-#endif
-    if (IS_DIR_SEPARATOR (wrapper[0]))
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable(concat_name))
-        return concat_name;
-      XFREE(concat_name);
-    }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-    {
-      has_slash = 1;
-      break;
-    }
-  if (!has_slash)
-  {
-    /* no slashes; search PATH */
-    const char* path = getenv ("PATH");
-    if (path != NULL)
-    {
-      for (p = path; *p; p = p_next)
-      {
-        const char* q;
-        size_t p_len;
-        for (q = p; *q; q++)
-          if (IS_PATH_SEPARATOR(*q))
-            break;
-        p_len = q - p;
-        p_next = (*q == '\0' ? q : q + 1);
-        if (p_len == 0)
-        {
-          /* empty path: current directory */
-          if (getcwd (tmp, LT_PATHMAX) == NULL)
-            lt_fatal ("getcwd failed");
-          tmp_len = strlen(tmp);
-          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, tmp, tmp_len);
-          concat_name[tmp_len] = '/';
-          strcpy (concat_name + tmp_len + 1, wrapper);
-        }
-        else
-        {
-          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, p, p_len);
-          concat_name[p_len] = '/';
-          strcpy (concat_name + p_len + 1, wrapper);
-        }
-        if (check_executable(concat_name))
-          return concat_name;
-        XFREE(concat_name);
-      }
-    }
-    /* not found in PATH; assume curdir */
-  }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen(tmp);
-  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable(concat_name))
-    return concat_name;
-  XFREE(concat_name);
-  return NULL;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    exit_status=$?
-	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-	      exit $exit_status
-	    fi
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
-	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir=`func_mktempdir`
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-       eval "if test \"\${save_$lt_var+set}\" = set; then
-               $lt_var=\$save_$lt_var; export $lt_var
-             else
-               $lt_unset $lt_var
-             fi"
-      done
-
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-
-	  case "$mode" in
-	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
-	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-	    esac
-	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=static
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/libs/iksemel/openssl.m4 b/libs/iksemel/openssl.m4
deleted file mode 100644
index 6bf1851021..0000000000
--- a/libs/iksemel/openssl.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-dnl ======================================================================
-dnl SAC_OPENSSL
-dnl ======================================================================
-AC_DEFUN([SAC_OPENSSL], [
-
-AC_ARG_WITH(openssl,
-[  --with-openssl          use OpenSSL [[enabled]]],, with_openssl=pkg-config)
-
-dnl SOSXXX:SAC_ASSERT_DEF([openssl libraries])
-
-
-if test "$with_openssl" = no  ;then
-  : # No openssl
-else
-
-  if test "$with_openssl" = "pkg-config" ; then
-    PKG_CHECK_MODULES(openssl, openssl,
-	[HAVE_TLS=1 HAVE_SSL=1 LIBS="$openssl_LIBS $LIBS"],
-	[HAVE_SSL=0])
-  fi
-
-  if test x$HAVE_SSL = x1 ; then
-     AC_DEFINE([HAVE_LIBCRYPTO], 1, [Define to 1 if you have the `crypto' library (-lcrypto).])
-     AC_DEFINE([HAVE_LIBSSL], 1, [Define to 1 if you have the `ssl' library (-lssl).])
-  else
-    AC_CHECK_HEADERS([openssl/tls1.h], [
-      HAVE_SSL=1 HAVE_TLS=1
-
-      AC_CHECK_LIB(crypto, BIO_new,,
-      	HAVE_SSL=0
-      	AC_MSG_WARN(OpenSSL crypto library was not found))
-
-      AC_CHECK_LIB(ssl, TLSv1_method,,
-      	HAVE_TLS=0
-      	AC_MSG_WARN(OpenSSL protocol library was not found))
-     ],[AC_MSG_WARN(OpenSSL include files were not found)],[#include <openssl/safestack.h>])
-  fi
-
-  if test x$HAVE_SSL = x1; then
-     AC_DEFINE([HAVE_SSL], 1, [Define to 1 if you have OpenSSL])
-  fi
-
-  if test x$HAVE_TLS = x1; then
-    AC_DEFINE([HAVE_TLS], 1, [Define to 1 if you have TLS])
-  fi
-fi
-
-AM_CONDITIONAL(HAVE_TLS, test x$HAVE_TLS = x1)
-])
diff --git a/libs/iksemel/src/Makefile.am b/libs/iksemel/src/Makefile.am
deleted file mode 100644
index 0997e84221..0000000000
--- a/libs/iksemel/src/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## Process this file with automake to produce Makefile.in
-##
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-lib_LTLIBRARIES = libiksemel.la
-
-if DO_POSIX
-posix_c = io-posix.c
-endif
-
-libiksemel_la_SOURCES = \
-	ikstack.c \
-	utility.c \
-	iks.c \
-	sax.c \
-	dom.c \
-	$(posix_c) \
-	stream.c \
-	sha.c \
-	jabber.c \
-	filter.c \
-	md5.c \
-	base64.c
-
-libiksemel_la_LDFLAGS = -version-info 4:0:1 -no-undefined
-libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS)  
-libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS)  
diff --git a/libs/iksemel/src/base64.c b/libs/iksemel/src/base64.c
deleted file mode 100644
index bb89ce86a7..0000000000
--- a/libs/iksemel/src/base64.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-static const char base64_charset[] =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-
-char *iks_base64_decode(const char *buf)
-{
-	char *res, *save;
-	char val;
-        const char *foo; 
-	const char *end;
-	int index;
-	size_t len;
-
-	if (!buf)
-		return NULL;
-
-	len = iks_strlen(buf) * 6 / 8 + 1;
-
-	save = res = iks_malloc(len);
-	if (!save)
-		return NULL;
-	memset(res, 0, len);
-
-	index = 0;
-	end = buf + iks_strlen(buf);
-
-	while (*buf && buf < end) {
-		if (!(foo = strchr(base64_charset, *buf)))
-			foo = base64_charset;
-		val = (int)(foo - base64_charset);
-		buf++;
-		switch (index) {
-			case 0:
-				*res |= val << 2;
-				break;
-			case 1:
-				*res++ |= val >> 4;
-				*res |= val << 4;
-				break;
-			case 2:
-				*res++ |= val >> 2;
-				*res |= val << 6;
-				break;
-			case 3:
-				*res++ |= val;
-				break;
-		}
-		index++;
-		index %= 4;
-	}
-	*res = 0;
-
-	return save;
-}
-
-char *iks_base64_encode(const char *buf, int len)
-{
-	char *res, *save;
-	int k, t;
-
-	len = (len > 0) ? (len) : (iks_strlen(buf));
-	save = res = iks_malloc((len*8) / 6 + 4);
-	if (!save) return NULL;
-
-	for (k = 0; k < len/3; ++k) {
-		*res++ = base64_charset[*buf >> 2];
-		t = ((*buf & 0x03) << 4);
-		buf++;
-		*res++ = base64_charset[t | (*buf >> 4)];
-		t = ((*buf & 0x0F) << 2);
-		buf++;
-		*res++ = base64_charset[t | (*buf >> 6)];
-		*res++ = base64_charset[*buf++ & 0x3F];
-	}
-
-	switch (len % 3) {
-		case 2:
-			*res++ = base64_charset[*buf >> 2];
-			t =  ((*buf & 0x03) << 4);
-			buf++;
-			*res++ = base64_charset[t | (*buf >> 4)];
-			*res++ = base64_charset[((*buf++ & 0x0F) << 2)];
-			*res++ = '=';
-			break;
-		case 1:
-			*res++ = base64_charset[*buf >> 2];
-			*res++ = base64_charset[(*buf++ & 0x03) << 4];
-			*res++ = '=';
-			*res++ = '=';
-			break;
-	}
-	*res = 0;
-	return save;
-}
diff --git a/libs/iksemel/src/dom.c b/libs/iksemel/src/dom.c
deleted file mode 100644
index 849bf20fd7..0000000000
--- a/libs/iksemel/src/dom.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-struct dom_data {
-	iks **iksptr;
-	iks *current;
-	size_t chunk_size;
-};
-
-static int
-tagHook (struct dom_data *data, char *name, char **atts, int type)
-{
-	iks *x;
-
-	if (IKS_OPEN == type || IKS_SINGLE == type) {
-		if (data->current) {
-			x = iks_insert (data->current, name);
-		} else {
-			ikstack *s;
-			s = iks_stack_new (data->chunk_size, data->chunk_size);
-			x = iks_new_within (name, s);
-		}
-		if (atts) {
-			int i=0;
-			while (atts[i]) {
-				iks_insert_attrib (x, atts[i], atts[i+1]);
-				i += 2;
-			}
-		}
-		data->current = x;
-	}
-	if (IKS_CLOSE == type || IKS_SINGLE == type) {
-		x = iks_parent (data->current);
-		if (iks_strcmp(iks_name(data->current), name) != 0)
-			return IKS_BADXML;
-		if (x)
-			data->current = x;
-		else {
-			*(data->iksptr) = data->current;
-			data->current = NULL;
-		}
-	}
-	return IKS_OK;
-}
-
-static int
-cdataHook (struct dom_data *data, char *cdata, size_t len)
-{
-	if (data->current) iks_insert_cdata (data->current, cdata, len);
-	return IKS_OK;
-}
-
-static void
-deleteHook (struct dom_data *data)
-{
-	if (data->current) iks_delete (data->current);
-	data->current = NULL;
-}
-
-iksparser *
-iks_dom_new (iks **iksptr)
-{
-	ikstack *s;
-	struct dom_data *data;
-
-	*iksptr = NULL;
-	s = iks_stack_new (DEFAULT_DOM_CHUNK_SIZE, 0);
-	if (!s) return NULL;
-	data = iks_stack_alloc (s, sizeof (struct dom_data));
-	data->iksptr = iksptr;
-	data->current = NULL;
-	data->chunk_size = DEFAULT_DOM_IKS_CHUNK_SIZE;
-	return iks_sax_extend (s, data, (iksTagHook *) tagHook, (iksCDataHook *) cdataHook, (iksDeleteHook *) deleteHook);
-}
-
-void
-iks_set_size_hint (iksparser *prs, size_t approx_size)
-{
-	size_t cs;
-	struct dom_data *data = iks_user_data (prs);
-
-	cs = approx_size / 10;
-	if (cs < DEFAULT_DOM_IKS_CHUNK_SIZE) cs = DEFAULT_DOM_IKS_CHUNK_SIZE;
-	data->chunk_size = cs;
-}
-
-iks *
-iks_tree (const char *xml_str, size_t len, int *err)
-{
-	iksparser *prs;
-	iks *x;
-	int e;
-
-	if (0 == len) len = strlen (xml_str);
-	prs = iks_dom_new (&x);
-	if (!prs) {
-		if (err) *err = IKS_NOMEM;
-		return NULL;
-	}
-	e = iks_parse (prs, xml_str, len, 1);
-	if (err) *err = e;
-	iks_parser_delete (prs);
-	return x;
-}
-
-int
-iks_load (const char *fname, iks **xptr)
-{
-	iksparser *prs;
-	char *buf;
-	FILE *f;
-	int len, done = 0;
-	int ret;
-
-	*xptr = NULL;
-
-	buf = iks_malloc (FILE_IO_BUF_SIZE);
-	if (!buf) return IKS_NOMEM;
-	ret = IKS_NOMEM;
-	prs = iks_dom_new (xptr);
-	if (prs) {
-		f = fopen (fname, "r");
-		if (f) {
-			while (0 == done) {
-				len = fread (buf, 1, FILE_IO_BUF_SIZE, f);
-				if (len < FILE_IO_BUF_SIZE) {
-					if (0 == feof (f)) {
-						ret = IKS_FILE_RWERR;
-						break;
-					}
-					if (0 == len) ret = IKS_OK;
-					done = 1;
-				}
-				if (len > 0) {
-					int e;
-					e = iks_parse (prs, buf, len, done);
-					if (IKS_OK != e) {
-						ret = e;
-						break;
-					}
-					if (done) ret = IKS_OK;
-				}
-			}
-			fclose (f);
-		} else {
-			if (ENOENT == errno) ret = IKS_FILE_NOFILE;
-			else ret = IKS_FILE_NOACCESS;
-		}
-		iks_parser_delete (prs);
-	}
-	iks_free (buf);
-	return ret;
-}
-
-int
-iks_save (const char *fname, iks *x)
-{
-	FILE *f;
-	char *data;
-	int ret;
-
-	ret = IKS_NOMEM;
-	data = iks_string (NULL, x);
-	if (data) {
-		ret = IKS_FILE_NOACCESS;
-		f = fopen (fname, "w");
-		if (f) {
-			ret = IKS_FILE_RWERR;
-			if (fputs (data, f) >= 0) ret = IKS_OK;
-			fclose (f);
-		}
-		iks_free (data);
-	}
-	return ret;
-}
diff --git a/libs/iksemel/src/filter.c b/libs/iksemel/src/filter.c
deleted file mode 100644
index d5cea11055..0000000000
--- a/libs/iksemel/src/filter.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-struct iksrule_struct {
-	struct iksrule_struct *next, *prev;
-	ikstack *s;
-	void *user_data;
-	iksFilterHook *filterHook;
-	char *id;
-	char *from;
-	char *ns;
-	int score;
-	int rules;
-	enum ikstype type;
-	enum iksubtype subtype;
-};
-
-struct iksfilter_struct {
-	iksrule *rules;
-	iksrule *last_rule;
-};
-
-iksfilter *
-iks_filter_new (void)
-{
-	iksfilter *f;
-
-	f = iks_malloc (sizeof (iksfilter));
-	if (!f) return NULL;
-	memset (f, 0, sizeof (iksfilter));
-
-	return f;
-}
-
-iksrule *
-iks_filter_add_rule (iksfilter *f, iksFilterHook *filterHook, void *user_data, ...)
-{
-	ikstack *s;
-	iksrule *rule;
-	va_list ap;
-	int type;
-
-	s = iks_stack_new (sizeof (iksrule), DEFAULT_RULE_CHUNK_SIZE);
-	if (!s) return NULL;
-	rule = iks_stack_alloc (s, sizeof (iksrule));
-	memset (rule, 0, sizeof (iksrule));
-	rule->s = s;
-	rule->user_data = user_data;
-	rule->filterHook = filterHook;
-
-	va_start (ap, user_data);
-	while (1) {
-		type = va_arg (ap, int);
-		if (IKS_RULE_DONE == type) break;
-		rule->rules += type;
-		switch (type) {
-			case IKS_RULE_TYPE:
-				rule->type = va_arg (ap, int);
-				break;
-			case IKS_RULE_SUBTYPE:
-				rule->subtype = va_arg (ap, int);
-				break;
-			case IKS_RULE_ID:
-				rule->id = iks_stack_strdup (s, va_arg (ap, char *), 0);
-				break;
-			case IKS_RULE_NS:
-				rule->ns = iks_stack_strdup (s, va_arg (ap, char *), 0);
-				break;
-			case IKS_RULE_FROM:
-				rule->from = iks_stack_strdup (s, va_arg (ap, char *), 0);
-				break;
-			case IKS_RULE_FROM_PARTIAL:
-				rule->from = iks_stack_strdup (s, va_arg (ap, char *), 0);
-				break;
-		}
-	}
-	va_end (ap);
-
-	if (!f->rules) f->rules = rule;
-	if (f->last_rule) f->last_rule->next = rule;
-	rule->prev = f->last_rule;
-	f->last_rule = rule;
-	return rule;
-}
-
-void
-iks_filter_remove_rule (iksfilter *f, iksrule *rule)
-{
-	if (rule->prev) rule->prev->next = rule->next;
-	if (rule->next) rule->next->prev = rule->prev;
-	if (f->rules == rule) f->rules = rule->next;
-	if (f->last_rule == rule) f->last_rule = rule->prev;
-	iks_stack_delete (&rule->s);
-}
-
-void
-iks_filter_remove_hook (iksfilter *f, iksFilterHook *filterHook)
-{
-	iksrule *rule, *tmp;
-
-	rule = f->rules;
-	while (rule) {
-		tmp = rule->next;
-		if (rule->filterHook == filterHook) iks_filter_remove_rule (f, rule);
-		rule = tmp;
-	}
-}
-
-void
-iks_filter_packet (iksfilter *f, ikspak *pak)
-{
-	iksrule *rule, *max_rule;
-	int fail, score, max_score;
-
-	rule = f->rules;
-	max_rule = NULL;
-	max_score = 0;
-	while (rule) {
-		score = 0;
-		fail = 0;
-		if (rule->rules & IKS_RULE_TYPE) {
-			if (rule->type == pak->type) score += 1; else fail = 1;
-		}
-		if (rule->rules & IKS_RULE_SUBTYPE) {
-			if (rule->subtype == pak->subtype) score += 2; else fail = 1;
-		}
-		if (rule->rules & IKS_RULE_ID) {
-			if (iks_strcmp (rule->id, pak->id) == 0) score += 16; else fail = 1;
-		}
-		if (rule->rules & IKS_RULE_NS) {
-			if (iks_strcmp (rule->ns, pak->ns) == 0) score += 4; else fail = 1;
-		}
-		if (rule->rules & IKS_RULE_FROM) {
-			if (pak->from && iks_strcmp (rule->from, pak->from->full) == 0) score += 8; else fail = 1;
-		}
-		if (rule->rules & IKS_RULE_FROM_PARTIAL) {
-			if (pak->from && iks_strcmp (rule->from, pak->from->partial) == 0) score += 8; else fail = 1;
-		}
-		if (fail != 0) score = 0;
-		rule->score = score;
-		if (score > max_score) {
-			max_rule = rule;
-			max_score = score;
-		}
-		rule = rule->next;
-	}
-	while (max_rule) {
-		if (IKS_FILTER_EAT == max_rule->filterHook (max_rule->user_data, pak)) return;
-		max_rule->score = 0;
-		max_rule = NULL;
-		max_score = 0;
-		rule = f->rules;
-		while (rule) {
-			if (rule->score > max_score) {
-				max_rule = rule;
-				max_score = rule->score;
-			}
-			rule = rule->next;
-		}
-	}
-}
-
-void
-iks_filter_delete (iksfilter *f)
-{
-	iksrule *rule, *tmp;
-
-	rule = f->rules;
-	while (rule) {
-		tmp = rule->next;
-		iks_stack_delete (&rule->s);
-		rule = tmp;
-	}
-	iks_free (f);
-}
diff --git a/libs/iksemel/src/iks.c b/libs/iksemel/src/iks.c
deleted file mode 100644
index 75071c1329..0000000000
--- a/libs/iksemel/src/iks.c
+++ /dev/null
@@ -1,765 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2007 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-#define IKS_COMMON \
-	struct iks_struct *next, *prev; \
-	struct iks_struct *parent; \
-	enum ikstype type; \
-	ikstack *s
-
-struct iks_struct {
-	IKS_COMMON;
-};
-
-struct iks_tag {
-	IKS_COMMON;
-	struct iks_struct *children, *last_child;
-	struct iks_struct *attribs, *last_attrib;
-	char *name;
-};
-
-#define IKS_TAG_NAME(x) ((struct iks_tag *) (x) )->name
-#define IKS_TAG_CHILDREN(x) ((struct iks_tag *) (x) )->children
-#define IKS_TAG_LAST_CHILD(x) ((struct iks_tag *) (x) )->last_child
-#define IKS_TAG_ATTRIBS(x) ((struct iks_tag *) (x) )->attribs
-#define IKS_TAG_LAST_ATTRIB(x) ((struct iks_tag *) (x) )->last_attrib
-
-struct iks_cdata {
-	IKS_COMMON;
-	char *cdata;
-	size_t len;
-};
-
-#define IKS_CDATA_CDATA(x) ((struct iks_cdata *) (x) )->cdata
-#define IKS_CDATA_LEN(x) ((struct iks_cdata *) (x) )->len
-
-struct iks_attrib {
-	IKS_COMMON;
-	char *name;
-	char *value;
-};
-
-#define IKS_ATTRIB_NAME(x) ((struct iks_attrib *) (x) )->name
-#define IKS_ATTRIB_VALUE(x) ((struct iks_attrib *) (x) )->value
-
-/*****  Node Creating & Deleting  *****/
-
-iks *
-iks_new (const char *name)
-{
-	ikstack *s;
-	iks *x;
-
-	s = iks_stack_new (sizeof (struct iks_tag) * 6, 256);
-	if (!s) return NULL;
-	x = iks_new_within (name, s);
-	if (!x) {
-		iks_stack_delete (&s);
-		return NULL;
-	}
-	return x;
-}
-
-iks *
-iks_new_within (const char *name, ikstack *s)
-{
-	iks *x;
-	size_t len;
-
-	if (name) len = sizeof (struct iks_tag); else len = sizeof (struct iks_cdata);
-	x = iks_stack_alloc (s, len);
-	if (!x) return NULL;
-	memset (x, 0, len);
-	x->s = s;
-	x->type = IKS_TAG;
-	if (name) {
-		IKS_TAG_NAME (x) = iks_stack_strdup (s, name, 0);
-		if (!IKS_TAG_NAME (x)) return NULL;
-	}
-	return x;
-}
-
-iks *
-iks_insert (iks *x, const char *name)
-{
-	iks *y;
-
-	if (!x) return NULL;
-
-	y = iks_new_within (name, x->s);
-	if (!y) return NULL;
-	y->parent = x;
-	if (!IKS_TAG_CHILDREN (x)) IKS_TAG_CHILDREN (x) = y;
-	if (IKS_TAG_LAST_CHILD (x)) {
-		IKS_TAG_LAST_CHILD (x)->next = y;
-		y->prev = IKS_TAG_LAST_CHILD (x);
-	}
-	IKS_TAG_LAST_CHILD (x) = y;
-	return y;
-}
-
-iks *
-iks_insert_cdata (iks *x, const char *data, size_t len)
-{
-	iks *y;
-
-	if(!x || !data) return NULL;
-	if(len == 0) len = strlen (data);
-
-	y = IKS_TAG_LAST_CHILD (x);
-	if (y && y->type == IKS_CDATA) {
-		IKS_CDATA_CDATA (y) = iks_stack_strcat (x->s, IKS_CDATA_CDATA (y), IKS_CDATA_LEN (y), data, len);
-		IKS_CDATA_LEN (y) += len;
-	} else {
-		y = iks_insert (x, NULL);
-		if (!y) return NULL;
-		y->type = IKS_CDATA;
-		IKS_CDATA_CDATA (y) = iks_stack_strdup (x->s, data, len);
-		if (!IKS_CDATA_CDATA (y)) return NULL;
-		IKS_CDATA_LEN (y) = len;
-	}
-	return y;
-}
-
-iks *
-iks_insert_attrib (iks *x, const char *name, const char *value)
-{
-	iks *y;
-
-	if (!x) return NULL;
-
-	y = IKS_TAG_ATTRIBS (x);
-	while (y) {
-		if (strcmp (name, IKS_ATTRIB_NAME (y)) == 0) break;
-		y = y->next;
-	}
-	if (NULL == y) {
-		if (!value) return NULL;
-		y = iks_stack_alloc (x->s, sizeof (struct iks_attrib));
-		if (!y) return NULL;
-		memset (y, 0, sizeof (struct iks_attrib));
-		y->type = IKS_ATTRIBUTE;
-		y->s = x->s;
-		IKS_ATTRIB_NAME (y) = iks_stack_strdup (x->s, name, 0);
-		if (!IKS_ATTRIB_NAME (y)) return NULL;
-		y->parent = x;
-		if (!IKS_TAG_ATTRIBS (x)) IKS_TAG_ATTRIBS (x) = y;
-		if (IKS_TAG_LAST_ATTRIB (x)) {
-			IKS_TAG_LAST_ATTRIB (x)->next = y;
-			y->prev = IKS_TAG_LAST_ATTRIB (x);
-		}
-		IKS_TAG_LAST_ATTRIB (x) = y;
-	}
-
-	if (value) {
-		IKS_ATTRIB_VALUE (y) = iks_stack_strdup (x->s, value, 0);
-		if (!IKS_ATTRIB_VALUE (y)) return NULL;
-	} else {
-		if (y->next) y->next->prev = y->prev;
-		if (y->prev) y->prev->next = y->next;
-		if (IKS_TAG_ATTRIBS (x) == y) IKS_TAG_ATTRIBS (x) = y->next;
-		if (IKS_TAG_LAST_ATTRIB (x) == y) IKS_TAG_LAST_ATTRIB (x) = y->prev;
-	}
-
-	return y;
-}
-
-iks *
-iks_insert_node (iks *x, iks *y)
-{
-	y->parent = x;
-	if (!IKS_TAG_CHILDREN (x)) IKS_TAG_CHILDREN (x) = y;
-	if (IKS_TAG_LAST_CHILD (x)) {
-		IKS_TAG_LAST_CHILD (x)->next = y;
-		y->prev = IKS_TAG_LAST_CHILD (x);
-	}
-	IKS_TAG_LAST_CHILD (x) = y;
-	return y;
-}
-
-iks *
-iks_append (iks *x, const char *name)
-{
-	iks *y;
-
-	if (!x) return NULL;
-	y = iks_new_within (name, x->s);
-	if (!y) return NULL;
-
-	if (x->next) {
-		x->next->prev = y;
-	} else {
-		IKS_TAG_LAST_CHILD (x->parent) = y;
-	}
-	y->next = x->next;
-	x->next = y;
-	y->parent = x->parent;
-	y->prev = x;
-
-	return y;
-}
-
-iks *
-iks_prepend (iks *x, const char *name)
-{
-	iks *y;
-
-	if (!x) return NULL;
-	y = iks_new_within (name, x->s);
-	if (!y) return NULL;
-
-	if (x->prev) {
-		x->prev->next = y;
-	} else {
-		IKS_TAG_CHILDREN (x->parent) = y;
-	}
-	y->prev = x->prev;
-	x->prev = y;
-	y->parent = x->parent;
-	y->next = x;
-
-	return y;
-}
-
-iks *
-iks_append_cdata (iks *x, const char *data, size_t len)
-{
-	iks *y;
-
-	if (!x || !data) return NULL;
-	if (len == 0) len = strlen (data);
-
-	y = iks_new_within (NULL, x->s);
-	if (!y) return NULL;
-	y->type = IKS_CDATA;
-	IKS_CDATA_CDATA (y) = iks_stack_strdup (x->s, data, len);
-	if (!IKS_CDATA_CDATA (y)) return NULL;
-	IKS_CDATA_LEN (y) = len;
-
-	if (x->next) {
-		x->next->prev = y;
-	} else {
-		IKS_TAG_LAST_CHILD (x->parent) = y;
-	}
-	y->next = x->next;
-	x->next = y;
-	y->parent = x->parent;
-	y->prev = x;
-
-	return y;
-}
-
-iks *
-iks_prepend_cdata (iks *x, const char *data, size_t len)
-{
-	iks *y;
-
-	if (!x || !data) return NULL;
-	if (len == 0) len = strlen (data);
-
-	y = iks_new_within (NULL, x->s);
-	if (!y) return NULL;
-	y->type = IKS_CDATA;
-	IKS_CDATA_CDATA(y) = iks_stack_strdup (x->s, data, len);
-	if (!IKS_CDATA_CDATA (y)) return NULL;
-	IKS_CDATA_LEN (y) = len;
-
-	if (x->prev) {
-		x->prev->next = y;
-	} else {
-		IKS_TAG_CHILDREN (x->parent) = y;
-	}
-	y->prev = x->prev;
-	x->prev = y;
-	y->parent = x->parent;
-	y->next = x;
-
-	return y;
-}
-
-void
-iks_hide (iks *x)
-{
-	iks *y;
-
-	if (!x) return;
-
-	if (x->prev) x->prev->next = x->next;
-	if (x->next) x->next->prev = x->prev;
-	y = x->parent;
-	if (y) {
-		if (IKS_TAG_CHILDREN (y) == x) IKS_TAG_CHILDREN (y) = x->next;
-		if (IKS_TAG_LAST_CHILD (y) == x) IKS_TAG_LAST_CHILD (y) = x->prev;
-	}
-}
-
-void
-iks_delete (iks *x)
-{
-	if (x) iks_stack_delete (&x->s);
-}
-
-/*****  Node Traversing  *****/
-
-iks *
-iks_next (iks *x)
-{
-	if (x) return x->next;
-	return NULL;
-}
-
-iks *
-iks_next_tag (iks *x)
-{
-	if (x) {
-		while (1) {
-			x = x->next;
-			if (NULL == x) break;
-			if (IKS_TAG == x->type) return x;
-		}
-	}
-	return NULL;
-}
-
-iks *
-iks_prev (iks *x)
-{
-	if (x) return x->prev;
-	return NULL;
-}
-
-iks *
-iks_prev_tag (iks *x)
-{
-	if (x) {
-		while (1) {
-			x = x->prev;
-			if (NULL == x) break;
-			if (IKS_TAG == x->type) return x;
-		}
-	}
-	return NULL;
-}
-
-iks *
-iks_parent (iks *x)
-{
-	if (x) return x->parent;
-	return NULL;
-}
-
-iks *
-iks_root (iks *x)
-{
-	if (x) {
-		while (x->parent)
-			x = x->parent;
-	}
-	return x;
-}
-
-iks *
-iks_child (iks *x)
-{
-	if (x && IKS_TAG == x->type) return IKS_TAG_CHILDREN (x);
-	return NULL;
-}
-
-iks *
-iks_first_tag (iks *x)
-{
-	if (x) {
-		x = IKS_TAG_CHILDREN (x);
-		while (x) {
-			if (IKS_TAG == x->type) return x;
-			x = x->next;
-		}
-	}
-	return NULL;
-}
-
-iks *
-iks_attrib (iks *x)
-{
-	if (x) return IKS_TAG_ATTRIBS (x);
-	return NULL;
-}
-
-iks *
-iks_find (iks *x, const char *name)
-{
-	iks *y;
-
-	if (!x) return NULL;
-	y = IKS_TAG_CHILDREN (x);
-	while (y) {
-		if (IKS_TAG == y->type && IKS_TAG_NAME (y) && strcmp (IKS_TAG_NAME (y), name) == 0) return y;
-		y = y->next;
-	}
-	return NULL;
-}
-
-char *
-iks_find_cdata (iks *x, const char *name)
-{
-	iks *y;
-
-	y = iks_find (x, name);
-	if (!y) return NULL;
-	y = IKS_TAG_CHILDREN (y);
-	if (!y || IKS_CDATA != y->type) return NULL;
-	return IKS_CDATA_CDATA (y);
-}
-
-char *
-iks_find_attrib (iks *x, const char *name)
-{
-	iks *y;
-
-	if (!x) return NULL;
-
-	y = IKS_TAG_ATTRIBS (x);
-	while (y) {
-		if (IKS_ATTRIB_NAME (y) && strcmp (IKS_ATTRIB_NAME (y), name) == 0)
-			return IKS_ATTRIB_VALUE (y);
-		y = y->next;
-	}
-	return NULL;
-}
-
-iks *
-iks_find_with_attrib (iks *x, const char *tagname, const char *attrname, const char *value)
-{
-	iks *y;
-
-	if (NULL == x) return NULL;
-
-	if (tagname) {
-		for (y = IKS_TAG_CHILDREN (x); y; y = y->next) {
-			if (IKS_TAG == y->type
-				&& strcmp (IKS_TAG_NAME (y), tagname) == 0
-				&& iks_strcmp (iks_find_attrib (y, attrname), value) == 0) {
-					return y;
-			}
-		}
-	} else {
-		for (y = IKS_TAG_CHILDREN (x); y; y = y->next) {
-			if (IKS_TAG == y->type
-				&& iks_strcmp (iks_find_attrib (y, attrname), value) == 0) {
-					return y;
-			}
-		}
-	}
-	return NULL;
-}
-
-/*****  Node Information  *****/
-
-ikstack *
-iks_stack (iks *x)
-{
-	if (x) return x->s;
-	return NULL;
-}
-
-enum ikstype
-iks_type (iks *x)
-{
-	if (x) return x->type;
-	return IKS_NONE;
-}
-
-char *
-iks_name (iks *x)
-{
-	if (x) {
-		if (IKS_TAG == x->type)
-			return IKS_TAG_NAME (x);
-		else
-			return IKS_ATTRIB_NAME (x);
-	}
-	return NULL;
-}
-
-char *
-iks_cdata (iks *x)
-{
-	if (x) {
-		if (IKS_CDATA == x->type)
-			return IKS_CDATA_CDATA (x);
-		else
-			return IKS_ATTRIB_VALUE (x);
-	}
-	return NULL;
-}
-
-size_t
-iks_cdata_size (iks *x)
-{
-	if (x) return IKS_CDATA_LEN (x);
-	return 0;
-}
-
-int
-iks_has_children (iks *x)
-{
-	if (x && IKS_TAG == x->type && IKS_TAG_CHILDREN (x)) return 1;
-	return 0;
-}
-
-int
-iks_has_attribs (iks *x)
-{
-	if (x && IKS_TAG == x->type && IKS_TAG_ATTRIBS (x)) return 1;
-	return 0;
-}
-
-/*****  Serializing  *****/
-
-static size_t
-escape_size (char *src, size_t len)
-{
-	size_t sz;
-	char c;
-	int i;
-
-	sz = 0;
-	for (i = 0; i < len; i++) {
-		c = src[i];
-		switch (c) {
-			case '&': sz += 5; break;
-			case '\'': sz += 6; break;
-			case '"': sz += 6; break;
-			case '<': sz += 4; break;
-			case '>': sz += 4; break;
-			default: sz++; break;
-		}
-	}
-	return sz;
-}
-
-static char *
-my_strcat (char *dest, char *src, size_t len)
-{
-	if (0 == len) len = strlen (src);
-	memcpy (dest, src, len);
-	return dest + len;
-}
-
-static char *
-escape (char *dest, char *src, size_t len)
-{
-	char c;
-	int i;
-	int j = 0;
-
-	for (i = 0; i < len; i++) {
-		c = src[i];
-		if ('&' == c || '<' == c || '>' == c || '\'' == c || '"' == c) {
-			if (i - j > 0) dest = my_strcat (dest, src + j, i - j);
-			j = i + 1;
-			switch (c) {
-			case '&': dest = my_strcat (dest, "&amp;", 5); break;
-			case '\'': dest = my_strcat (dest, "&apos;", 6); break;
-			case '"': dest = my_strcat (dest, "&quot;", 6); break;
-			case '<': dest = my_strcat (dest, "&lt;", 4); break;
-			case '>': dest = my_strcat (dest, "&gt;", 4); break;
-			}
-		}
-	}
-	if (i - j > 0) dest = my_strcat (dest, src + j, i - j);
-	return dest;
-}
-
-char *
-iks_string (ikstack *s, iks *x)
-{
-	size_t size;
-	int level, dir;
-	iks *y, *z;
-	char *ret, *t;
-
-	if (!x) return NULL;
-
-	if (x->type == IKS_CDATA) {
-		if (s) {
-			return iks_stack_strdup (s, IKS_CDATA_CDATA (x), IKS_CDATA_LEN (x));
-		} else {
-			ret = iks_malloc (IKS_CDATA_LEN (x));
-			memcpy (ret, IKS_CDATA_CDATA (x), IKS_CDATA_LEN (x));
-			return ret;
-		}
-	}
-
-	size = 0;
-	level = 0;
-	dir = 0;
-	y = x;
-	while (1) {
-		if (dir==0) {
-			if (y->type == IKS_TAG) {
-				size++;
-				size += strlen (IKS_TAG_NAME (y));
-				for (z = IKS_TAG_ATTRIBS (y); z; z = z->next) {
-					if (z->type == IKS_NONE) {
-						continue;
-					}
-					size += 4 + strlen (IKS_ATTRIB_NAME (z))
-						+ escape_size (IKS_ATTRIB_VALUE (z), strlen (IKS_ATTRIB_VALUE (z)));
-				}
-				if (IKS_TAG_CHILDREN (y)) {
-					size++;
-					y = IKS_TAG_CHILDREN (y);
-					level++;
-					continue;
-				} else {
-					size += 2;
-				}
-			} else {
-				size += escape_size (IKS_CDATA_CDATA (y), IKS_CDATA_LEN (y));
-			}
-		}
-		z = y->next;
-		if (z) {
-			if (0 == level) {
-				if (IKS_TAG_CHILDREN (y)) size += 3 + strlen (IKS_TAG_NAME (y));
-				break;
-			}
-			y = z;
-			dir = 0;
-		} else {
-			y = y->parent;
-			level--;
-			if (level >= 0) size += 3 + strlen (IKS_TAG_NAME (y));
-			if (level < 1) break;
-			dir = 1;
-		}
-	}
-
-	if (s) ret = iks_stack_alloc (s, size + 1);
-	else ret = iks_malloc (size + 1);
-
-	if (!ret) return NULL;
-
-	t = ret;
-	level = 0;
-	dir = 0;
-	while (1) {
-		if (dir==0) {
-			if (x->type == IKS_TAG) {
-				*t++ = '<';
-				t = my_strcat (t, IKS_TAG_NAME (x), 0);
-				y = IKS_TAG_ATTRIBS (x);
-				while (y) {
-					*t++ = ' ';
-					t = my_strcat (t, IKS_ATTRIB_NAME (y), 0);
-					*t++ = '=';
-					*t++ = '\'';
-					t = escape (t, IKS_ATTRIB_VALUE (y), strlen (IKS_ATTRIB_VALUE (y)));
-					*t++ = '\'';
-					y = y->next;
-				}
-				if (IKS_TAG_CHILDREN (x)) {
-					*t++ = '>';
-					x = IKS_TAG_CHILDREN (x);
-					level++;
-					continue;
-				} else {
-					*t++ = '/';
-					*t++ = '>';
-				}
-			} else {
-				t = escape (t, IKS_CDATA_CDATA (x), IKS_CDATA_LEN (x));
-			}
-		}
-		y = x->next;
-		if (y) {
-			if (0 == level) {
-				if (IKS_TAG_CHILDREN (x)) {
-					*t++ = '<';
-					*t++ = '/';
-					t = my_strcat (t, IKS_TAG_NAME (x), 0);
-					*t++ = '>';
-				}
-				break;
-			}
-			x = y;
-			dir = 0;
-		} else {
-			x = x->parent;
-			level--;
-			if (level >= 0) {
-					*t++ = '<';
-					*t++ = '/';
-					t = my_strcat (t, IKS_TAG_NAME (x), 0);
-					*t++ = '>';
-				}
-			if (level < 1) break;
-			dir = 1;
-		}
-	}
-	*t = '\0';
-
-	return ret;
-}
-
-/*****  Copying  *****/
-
-iks *
-iks_copy_within (iks *x, ikstack *s)
-{
-	int level=0, dir=0;
-	iks *copy = NULL;
-	iks *cur = NULL;
-	iks *y;
-
-	while (1) {
-		if (dir == 0) {
-			if (x->type == IKS_TAG) {
-				if (copy == NULL) {
-					copy = iks_new_within (IKS_TAG_NAME (x), s);
-					cur = copy;
-				} else {
-					cur = iks_insert (cur, IKS_TAG_NAME (x));
-				}
-				for (y = IKS_TAG_ATTRIBS (x); y; y = y->next) {
-					iks_insert_attrib (cur, IKS_ATTRIB_NAME (y), IKS_ATTRIB_VALUE (y));
-				}
-				if (IKS_TAG_CHILDREN (x)) {
-					x = IKS_TAG_CHILDREN (x);
-					level++;
-					continue;
-				} else {
-					cur = cur->parent;
-				}
-			} else {
-				iks_insert_cdata (cur, IKS_CDATA_CDATA (x), IKS_CDATA_LEN (x));
-			}
-		}
-		y = x->next;
-		if (y) {
-			if (0 == level) break;
-			x = y;
-			dir = 0;
-		} else {
-			if (level < 2) break;
-			level--;
-			x = x->parent;
-			cur = cur->parent;
-			dir = 1;
-		}
-	}
-	return copy;
-}
-
-iks *
-iks_copy (iks *x)
-{
-	return iks_copy_within (x, iks_stack_new (sizeof (struct iks_tag) * 6, 256));
-}
diff --git a/libs/iksemel/src/ikstack.c b/libs/iksemel/src/ikstack.c
deleted file mode 100644
index b5fd75ef68..0000000000
--- a/libs/iksemel/src/ikstack.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2004 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-struct align_test { char a; double b; };
-#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
-#define ALIGN_MASK ( DEFAULT_ALIGNMENT - 1 )
-#define MIN_CHUNK_SIZE ( DEFAULT_ALIGNMENT * 8 )
-#define MIN_ALLOC_SIZE DEFAULT_ALIGNMENT
-#define ALIGN(x) ( (x) + (DEFAULT_ALIGNMENT - ( (x) & ALIGN_MASK)) )
-
-typedef struct ikschunk_struct {
-	struct ikschunk_struct *next;
-	size_t size;
-	size_t used;
-	size_t last;
-	char data[4];
-} ikschunk;
-
-struct ikstack_struct {
-	size_t allocated;
-	ikschunk *meta;
-	ikschunk *data;
-};
-
-static ikschunk *
-find_space (ikstack *s, ikschunk *c, size_t size)
-{
-	/* FIXME: dont use *2 after over allocated chunks */
-	while (c) {
-		if (c->size - c->used >= size) return c;
-		if (!c->next) {
-			if ((c->size * 2) > size) size = c->size * 2;
-			c->next = iks_malloc (sizeof (ikschunk) + size);
-			if (!c->next) return NULL;
-			s->allocated += sizeof (ikschunk) + size;
-			c = c->next;
-			c->next = NULL;
-			c->size = size;
-			c->used = 0;
-			c->last = (size_t) -1;
-			return c;
-		}
-		c = c->next;
-	}
-	return NULL;
-}
-
-ikstack *
-iks_stack_new (size_t meta_chunk, size_t data_chunk)
-{
-	ikstack *s;
-	size_t len;
-
-	if (meta_chunk < MIN_CHUNK_SIZE) meta_chunk = MIN_CHUNK_SIZE;
-	if (meta_chunk & ALIGN_MASK) meta_chunk = ALIGN (meta_chunk);
-	if (data_chunk < MIN_CHUNK_SIZE) data_chunk = MIN_CHUNK_SIZE;
-	if (data_chunk & ALIGN_MASK) data_chunk = ALIGN (data_chunk);
-
-	len = sizeof (ikstack) + meta_chunk + data_chunk + (sizeof (ikschunk) * 2);
-	s = iks_malloc (len);
-	if (!s) return NULL;
-	s->allocated = len;
-	s->meta = (ikschunk *) ((char *) s + sizeof (ikstack));
-	s->meta->next = NULL;
-	s->meta->size = meta_chunk;
-	s->meta->used = 0;
-	s->meta->last = (size_t) -1;
-	s->data = (ikschunk *) ((char *) s + sizeof (ikstack) + sizeof (ikschunk) + meta_chunk);
-	s->data->next = NULL;
-	s->data->size = data_chunk;
-	s->data->used = 0;
-	s->data->last = (size_t) -1;
-	return s;
-}
-
-void *
-iks_stack_alloc (ikstack *s, size_t size)
-{
-	ikschunk *c;
-	void *mem;
-
-	if (size < MIN_ALLOC_SIZE) size = MIN_ALLOC_SIZE;
-	if (size & ALIGN_MASK) size = ALIGN (size);
-
-	c = find_space (s, s->meta, size);
-	if (!c) return NULL;
-	mem = c->data + c->used;
-	c->used += size;
-	return mem;
-}
-
-char *
-iks_stack_strdup (ikstack *s, const char *src, size_t len)
-{
-	ikschunk *c;
-	char *dest;
-
-	if (!src) return NULL;
-	if (0 == len) len = strlen (src);
-
-	c = find_space (s, s->data, len + 1);
-	if (!c) return NULL;
-	dest = c->data + c->used;
-	c->last = c->used;
-	c->used += len + 1;
-	memcpy (dest, src, len);
-	dest[len] = '\0';
-	return dest;
-}
-
-char *
-iks_stack_strcat (ikstack *s, char *old, size_t old_len, const char *src, size_t src_len)
-{
-	char *ret;
-	ikschunk *c;
-
-	if (!old) {
-		return iks_stack_strdup (s, src, src_len);
-	}
-	if (0 == old_len) old_len = strlen (old);
-	if (0 == src_len) src_len = strlen (src);
-
-	for (c = s->data; c; c = c->next) {
-		if (c->data + c->last == old) break;
-	}
-	if (!c) {
-		c = find_space (s, s->data, old_len + src_len + 1);
-		if (!c) return NULL;
-		ret = c->data + c->used;
-		c->last = c->used;
-		c->used += old_len + src_len + 1;
-		memcpy (ret, old, old_len);
-		memcpy (ret + old_len, src, src_len);
-		ret[old_len + src_len] = '\0';
-		return ret;
-	}
-
-	if (c->size - c->used > src_len) {
-		ret = c->data + c->last;
-		memcpy (ret + old_len, src, src_len);
-		c->used += src_len;
-		ret[old_len + src_len] = '\0';
-	} else {
-		/* FIXME: decrease c->used before moving string to new place */
-		c = find_space (s, s->data, old_len + src_len + 1);
-		if (!c) return NULL;
-		c->last = c->used;
-		ret = c->data + c->used;
-		memcpy (ret, old, old_len);
-		c->used += old_len;
-		memcpy (c->data + c->used, src, src_len);
-		c->used += src_len;
-		c->data[c->used] = '\0';
-		c->used++;
-	}
-	return ret;
-}
-
-void
-iks_stack_stat (ikstack *s, size_t *allocated, size_t *used)
-{
-	ikschunk *c;
-
-	if (allocated) {
-		*allocated = s->allocated;
-	}
-	if (used) {
-		*used = 0;
-		for (c = s->meta; c; c = c->next) {
-			(*used) += c->used;
-		}
-		for (c = s->data; c; c = c->next) {
-			(*used) += c->used;
-		}
-	}
-}
-
-void
-iks_stack_delete (ikstack **sp)
-{
-	ikschunk *c, *tmp;
-	ikstack *s;
-
-	if (!sp) {
-		return;
-	}
-
-	s = *sp;
-
-	if (!s) {
-		return;
-	}
-
-	*sp = NULL;
-	c = s->meta->next;
-	while (c) {
-		tmp = c->next;
-		iks_free (c);
-		c = tmp;
-	}
-	c = s->data->next;
-	while (c) {
-		tmp = c->next;
-		iks_free (c);
-		c = tmp;
-	}
-	iks_free (s);
-}
diff --git a/libs/iksemel/src/io-posix.c b/libs/iksemel/src/io-posix.c
deleted file mode 100644
index f0a8e07101..0000000000
--- a/libs/iksemel/src/io-posix.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2004 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-#ifdef _WIN32
-#include <winsock.h>
-#else
-#include <netdb.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
-static void
-io_close (void *socket)
-{
-	int sock = (int) socket;
-#ifdef _WIN32
-	closesocket (sock);
-#else
-	close (sock);
-#endif
-}
-
-static int
-io_connect (iksparser *prs, void **socketptr, const char *server, int port)
-{
-	int sock = -1;
-	int tmp;
-#ifdef HAVE_GETADDRINFO
-	struct addrinfo hints;
-	struct addrinfo *addr_res, *addr_ptr;
-	char port_str[6];
-	int err = 0;
-	int family = AF_INET;
-
-	if (strchr(server, ':')) {
-		family = AF_INET6;
-	}
-
-	hints.ai_flags = AI_CANONNAME;
-	hints.ai_family = family;
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_protocol = 0;
-	hints.ai_addrlen = 0;
-	hints.ai_canonname = NULL;
-	hints.ai_addr = NULL;
-	hints.ai_next = NULL;
-	sprintf (port_str, "%i", port);
-
-	if (getaddrinfo (server, port_str, &hints, &addr_res) != 0)
-		return IKS_NET_NODNS;
-
-	addr_ptr = addr_res;
-	while (addr_ptr) {
-		err = IKS_NET_NOSOCK;
-		sock = socket (addr_ptr->ai_family, addr_ptr->ai_socktype, addr_ptr->ai_protocol);
-		if (sock != -1) {
-			err = IKS_NET_NOCONN;
-			tmp = connect (sock, addr_ptr->ai_addr, addr_ptr->ai_addrlen);
-
-			if (tmp == 0) break;
-			io_close ((void *) sock);
-			sock = -1;
-		}
-		addr_ptr = addr_ptr->ai_next;
-	}
-	freeaddrinfo (addr_res);
-
-	if (sock == -1) return err;
-#else
-	struct hostent *host;
-	struct sockaddr_in sin;
-
-	host = gethostbyname (server);
-	if (!host) return IKS_NET_NODNS;
-
-	memcpy (&sin.sin_addr, host->h_addr, host->h_length);
-	sin.sin_family = host->h_addrtype;
-	sin.sin_port = htons (port);
-	sock = socket (host->h_addrtype, SOCK_STREAM, 0);
-	if (sock == -1) return IKS_NET_NOSOCK;
-
-	tmp = connect (sock, (struct sockaddr *)&sin, sizeof (struct sockaddr_in));
-	if (tmp != 0) {
-		io_close ((void *) sock);
-		return IKS_NET_NOCONN;
-	}
-#endif
-
-	*socketptr = (void *) sock;
-
-	return IKS_OK;
-}
-
-static int
-io_send (void *socket, const char *data, size_t len)
-{
-	int sock = (int) socket;
-
-	if (send (sock, data, len, 0) == -1) return IKS_NET_RWERR;
-	return IKS_OK;
-}
-
-static int
-io_recv (void *socket, char *buffer, size_t buf_len, int timeout)
-{
-	int sock = (int) socket;
-	fd_set fds;
-	struct timeval tv, *tvptr;
-	int len;
-	char *bound;
-
-	tv.tv_sec = 0;
-	tv.tv_usec = 0;
-
-	FD_ZERO (&fds);
-	FD_SET (sock, &fds);
-	tv.tv_sec = timeout;
-
-	if (timeout != -1) tvptr = &tv; else tvptr = NULL;
-	if (select (sock + 1, &fds, NULL, NULL, tvptr) > 0) {
-		len = recv (sock, buffer, buf_len, 0);
-		if (len > 0) {
-			char *p, *e = NULL, *t = NULL;
-			bound = buffer + (len -1);
-
-			for (p = buffer; p < bound; p++) {
-				if (*p == '>') {
-					e = p;
-					t = p+1;
-					if (*t == '<') {
-						continue;
-					}
-					while(p < bound && t < bound) {
-						if (*t != ' ' && *t != '<') {
-							t = e = NULL;
-							break;
-						}
-						if (*t == '<') {
-							p = t;
-							*(p-1) = '>';
-							*e = ' ';
-							e = NULL;
-							break;
-						}
-
-						t++;
-					}
-				}
-			}
-			return len;
-		} else if (len <= 0) {
-			return -1;
-		}
-	}
-	return 0;
-}
-
-ikstransport iks_default_transport = {
-	IKS_TRANSPORT_V1,
-	io_connect,
-	io_send,
-	io_recv,
-	io_close,
-	NULL
-};
diff --git a/libs/iksemel/src/jabber.c b/libs/iksemel/src/jabber.c
deleted file mode 100644
index 91437517ac..0000000000
--- a/libs/iksemel/src/jabber.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-iksid *
-iks_id_new (ikstack *s, const char *jid)
-{
-	iksid *id;
-	char *src, *tmp;
-
-/* FIXME: add jabber id validity checks to this function */
-/* which characters are allowed in id parts? */
-
-	if (!jid) return NULL;
-	id = iks_stack_alloc (s, sizeof (iksid));
-	if (!id) return NULL;
-	memset (id, 0, sizeof (iksid));
-
-	/* skip scheme */
-	if (strncmp ("jabber:", jid, 7) == 0) jid += 7;
-
-	id->full = iks_stack_strdup (s, jid, 0);
-	src = id->full;
-
-	/* split resource */
-	tmp = strchr (src, '/');
-	if (tmp) {
-		id->partial = iks_stack_strdup (s, src, tmp - src);
-		id->resource = tmp + 1;
-		src = id->partial;
-	} else {
-		id->partial = src;
-	}
-
-	/* split user */
-	tmp = strchr (src, '@');
-	if (tmp) {
-		id->user = iks_stack_strdup (s, src, tmp - src);
-		src = ++tmp;
-	}
-
-	id->server = src;
-
-	return id;
-}
-
-int
-iks_id_cmp (iksid *a, iksid *b, int parts)
-{
-	int diff;
-
-	if (!a || !b) return (IKS_ID_RESOURCE | IKS_ID_USER | IKS_ID_SERVER);
-	diff = 0;
-	if (parts & IKS_ID_RESOURCE && !(!a->resource && !b->resource) && iks_strcmp (a->resource, b->resource) != 0)
-		diff += IKS_ID_RESOURCE;
-	if (parts & IKS_ID_USER && !(!a->user && !b->user) && iks_strcasecmp (a->user, b->user) != 0)
-		diff += IKS_ID_USER;
-	if (parts & IKS_ID_SERVER && !(!a->server && !b->server) && iks_strcmp (a->server, b->server) != 0)
-		diff += IKS_ID_SERVER;
-	return diff;
-}
-
-ikspak *
-iks_packet (iks *x)
-{
-	ikspak *pak;
-	ikstack *s;
-	char *tmp;
-
-	s = iks_stack (x);
-	pak = iks_stack_alloc (s, sizeof (ikspak));
-	if (!pak) return NULL;
-	memset (pak, 0, sizeof (ikspak));
-	pak->x = x;
-	tmp = iks_find_attrib (x, "from");
-	if (tmp) pak->from = iks_id_new (s, tmp);
-	pak->id = iks_find_attrib (x, "id");
-
-	tmp = iks_find_attrib (x, "type");
-	if (strcmp (iks_name (x), "message") == 0) {
-		pak->type = IKS_PAK_MESSAGE;
-		if (tmp) {
-			if (strcmp (tmp, "chat") == 0)
-				pak->subtype = IKS_TYPE_CHAT;
-			else if (strcmp (tmp, "groupchat") == 0)
-				pak->subtype = IKS_TYPE_GROUPCHAT;
-			else if (strcmp (tmp, "headline") == 0)
-				pak->subtype = IKS_TYPE_HEADLINE;
-			else if (strcmp (tmp, "error") == 0)
-				pak->subtype = IKS_TYPE_ERROR;
-		}
-	} else if (strcmp (iks_name (x), "presence") == 0) {
-		pak->type = IKS_PAK_S10N;
-		if (tmp) {
-			if (strcmp (tmp, "unavailable") == 0) {
-				pak->type = IKS_PAK_PRESENCE;
-				pak->subtype = IKS_TYPE_UNAVAILABLE;
-				pak->show = IKS_SHOW_UNAVAILABLE;
-			} else if (strcmp (tmp, "probe") == 0) {
-				pak->type = IKS_PAK_PRESENCE;
-				pak->subtype = IKS_TYPE_PROBE;
-			} else if(strcmp(tmp, "subscribe") == 0)
-				pak->subtype = IKS_TYPE_SUBSCRIBE;
-			else if(strcmp(tmp, "subscribed") == 0)
-				pak->subtype = IKS_TYPE_SUBSCRIBED;
-			else if(strcmp(tmp, "unsubscribe") == 0)
-				pak->subtype = IKS_TYPE_UNSUBSCRIBE;
-			else if(strcmp(tmp, "unsubscribed") == 0)
-				pak->subtype = IKS_TYPE_UNSUBSCRIBED;
-			else if(strcmp(tmp, "error") == 0)
-				pak->subtype = IKS_TYPE_ERROR;
-		} else {
-			pak->type = IKS_PAK_PRESENCE;
-			pak->subtype = IKS_TYPE_AVAILABLE;
-			tmp = iks_find_cdata (x, "show");
-			pak->show = IKS_SHOW_AVAILABLE;
-			if (tmp) {
-				if (strcmp (tmp, "chat") == 0)
-					pak->show = IKS_SHOW_CHAT;
-				else if (strcmp (tmp, "away") == 0)
-					pak->show = IKS_SHOW_AWAY;
-				else if (strcmp (tmp, "xa") == 0)
-					pak->show = IKS_SHOW_XA;
-				else if (strcmp (tmp, "dnd") == 0)
-					pak->show = IKS_SHOW_DND;
-			}
-		}
-	} else if (strcmp (iks_name (x), "iq") == 0) {
-		iks *q;
-		pak->type = IKS_PAK_IQ;
-		if (tmp) {
-			if (strcmp (tmp, "get") == 0)
-				pak->subtype = IKS_TYPE_GET;
-			else if (strcmp (tmp, "set") == 0)
-				pak->subtype = IKS_TYPE_SET;
-			else if (strcmp (tmp, "result") == 0)
-				pak->subtype = IKS_TYPE_RESULT;
-			else if (strcmp (tmp, "error") == 0)
-				pak->subtype = IKS_TYPE_ERROR;
-		}
-		for (q = iks_child (x); q; q = iks_next (q)) {
-			if (IKS_TAG == iks_type (q)) {
-				char *ns;
-				ns = iks_find_attrib (q, "xmlns");
-				if (ns) {
-					pak->query = q;
-					pak->ns = ns;
-					break;
-				}
-			}
-		}
-	}
-	return pak;
-}
-
-iks *
-iks_make_auth (iksid *id, const char *pass, const char *sid)
-{
-	iks *x, *y;
-
-	x = iks_new ("iq");
-	iks_insert_attrib (x, "type", "set");
-	y = iks_insert (x, "query");
-	iks_insert_attrib (y, "xmlns", IKS_NS_AUTH);
-	iks_insert_cdata (iks_insert (y, "username"), id->user, 0);
-	iks_insert_cdata (iks_insert (y, "resource"), id->resource, 0);
-	if(sid) {
-		char buf[41];
-		iksha *sha;
-		sha = iks_sha_new ();
-		iks_sha_hash (sha, (const unsigned char*)sid, strlen (sid), 0);
-		iks_sha_hash (sha, (const unsigned char*)pass, strlen (pass), 1);
-		iks_sha_print (sha, buf);
-		iks_sha_delete (sha);
-		iks_insert_cdata (iks_insert (y, "digest"), buf, 40);
-	} else {
-		iks_insert_cdata (iks_insert (y, "password"), pass, 0);
-	}
-	return x;
-}
-
-iks *
-iks_make_msg (enum iksubtype type, const char *to, const char *body)
-{
-	iks *x;
-	char *t = NULL;
-
-	x = iks_new ("message");
-	switch (type) {
-	case IKS_TYPE_CHAT: t = "chat"; break;
-	case IKS_TYPE_GROUPCHAT: t = "groupchat"; break;
-	case IKS_TYPE_HEADLINE: t = "headline"; break;
-	default: break;
-	}
-	if (t) iks_insert_attrib (x, "type", t);
-	if (to) iks_insert_attrib (x, "to", to);
-	if (body) iks_insert_cdata (iks_insert (x, "body"), body, 0);
-	return x;
-}
-
-iks *
-iks_make_s10n (enum iksubtype type, const char *to, const char *msg)
-{
-	iks *x;
-	char *t;
-
-	x = iks_new ("presence");
-	switch (type) {
-		case IKS_TYPE_SUBSCRIBE: t = "subscribe"; break;
-		case IKS_TYPE_SUBSCRIBED: t = "subscribed"; break;
-		case IKS_TYPE_UNSUBSCRIBE: t = "unsubscribe"; break;
-		case IKS_TYPE_UNSUBSCRIBED: t = "unsubscribed"; break;
-		case IKS_TYPE_PROBE: t = "probe"; break;
-		default: t = NULL; break;
-	}
-	if (t) iks_insert_attrib (x, "type", t);
-	if (to) iks_insert_attrib (x, "to", to);
-	if (msg) iks_insert_cdata(iks_insert (x, "status"), msg, 0);
-	return x;
-}
-
-iks *
-iks_make_pres (enum ikshowtype show, const char *status)
-{
-	iks *x;
-	char *t;
-
-	x = iks_new ("presence");
-	switch (show) {
-		case IKS_SHOW_CHAT: t = "chat"; break;
-		case IKS_SHOW_AWAY: t = "away"; break;
-		case IKS_SHOW_XA: t = "xa"; break;
-		case IKS_SHOW_DND: t = "dnd"; break;
-		case IKS_SHOW_UNAVAILABLE:
-			t = NULL;
-			iks_insert_attrib (x, "type", "unavailable");
-			break;
-		default: t = NULL; break;
-	}
-	if (t) iks_insert_cdata (iks_insert (x, "show"), t, 0);
-	if (status) iks_insert_cdata(iks_insert (x, "status"), status, 0);
-	return x;
-}
-
-iks *
-iks_make_iq (enum iksubtype type, const char *xmlns)
-{
-	iks *x;
-	char *t = NULL;
-
-	x = iks_new ("iq");
-	switch (type) {
-	case IKS_TYPE_GET: t = "get"; break;
-	case IKS_TYPE_SET: t = "set"; break;
-	case IKS_TYPE_RESULT: t = "result"; break;
-	case IKS_TYPE_ERROR: t = "error"; break;
-	default: break;
-	}
-	if (t) iks_insert_attrib (x, "type", t);
-	iks_insert_attrib (iks_insert (x, "query"), "xmlns", xmlns);
-
-	return x;
-}
-
-iks *
-iks_make_resource_bind (iksid *id)
-{
-	iks *x, *y, *z;
-
-	x = iks_new("iq");
-	iks_insert_attrib(x, "type", "set");
-	y = iks_insert(x, "bind");
-	iks_insert_attrib(y, "xmlns", IKS_NS_XMPP_BIND);
-	if (id->resource && iks_strcmp(id->resource, "")) {
-		z = iks_insert(y, "resource");
-		iks_insert_cdata(z, id->resource, 0);
-	}
-	return x;
-}
-
-iks *
-iks_make_session (void)
-{
-	iks *x, *y;
-
-	x = iks_new ("iq");
-	iks_insert_attrib (x, "type", "set");
-	y = iks_insert (x, "session");
-	iks_insert_attrib (y, "xmlns", IKS_NS_XMPP_SESSION);
-	return x;
-}
-
-static int
-iks_sasl_mechanisms (iks *x)
-{
-	int sasl_mech = 0;
-
-	while (x) {
-		if (!iks_strcmp(iks_cdata(iks_child(x)), "DIGEST-MD5"))
-			sasl_mech |= IKS_STREAM_SASL_MD5;
-		else if (!iks_strcmp(iks_cdata(iks_child(x)), "PLAIN"))
-			sasl_mech |= IKS_STREAM_SASL_PLAIN;
-		x = iks_next_tag(x);
-	}
-	return sasl_mech;
-}
-
-int
-iks_stream_features (iks *x)
-{
-	int features = 0;
-
-	if (iks_strcmp(iks_name(x), "stream:features"))
-		return 0;
-	for (x = iks_child(x); x; x = iks_next_tag(x))
-		if (!iks_strcmp(iks_name(x), "starttls"))
-			features |= IKS_STREAM_STARTTLS;
-		else if (!iks_strcmp(iks_name(x), "bind"))
-			features |= IKS_STREAM_BIND;
-		else if (!iks_strcmp(iks_name(x), "session"))
-			features |= IKS_STREAM_SESSION;
-		else if (!iks_strcmp(iks_name(x), "mechanisms"))
-			features |= iks_sasl_mechanisms(iks_child(x));
-	return features;
-}
diff --git a/libs/iksemel/src/md5.c b/libs/iksemel/src/md5.c
deleted file mode 100644
index 11af2d8d55..0000000000
--- a/libs/iksemel/src/md5.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-#define GET_UINT32(n,b,i) {  \
-	(n) = ( (unsigned long int) (b)[(i)    ]     )  \
-		| ( (unsigned long int) (b)[(i) + 1] <<  8 )  \
-		| ( (unsigned long int) (b)[(i) + 2] << 16 )  \
-		| ( (unsigned long int) (b)[(i) + 3] << 24 ); \
-}
-
-#define PUT_UINT32(n,b,i) {  \
-	(b)[(i)    ] = (unsigned char) ( (n)       );  \
-	(b)[(i) + 1] = (unsigned char) ( (n) >>  8 );  \
-	(b)[(i) + 2] = (unsigned char) ( (n) >> 16 );  \
-	(b)[(i) + 3] = (unsigned char) ( (n) >> 24 );  \
-}
-
-#define F(x,y,z) ((z) ^ ((x) & ((y) ^ (z))))
-
-#define G(x,y,z) ((y) ^ ((z) & ((x) ^ (y))))
-
-#define H(x,y,z) ((x) ^ (y) ^ (z))
-
-#define I(x,y,z) ((y) ^ ((x) | ~(z)))
-
-#define S(x,n) (((x) << (n)) | (((x) & 0xFFFFFFFF) >> (32 - (n))))
-
-#define P(r,i,f,k,s,t) {  \
-	r[i] += f(r[((i)+1)%4],r[((i)+2)%4],r[((i)+3)%4]) + X[k] + t; \
-	r[i] = S(r[i],s) + r[((i)+1)%4];  \
-}
-
-struct iksmd5_struct {
-	unsigned long int total[2];
-	unsigned long int state[4];
-	unsigned char buffer[64];
-	unsigned char blen;
-};
-
-static const unsigned long int T[] =
-	{ 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
-	  0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
-	  0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
-	  0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
-	  0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
-	  0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
-	  0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
-	  0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
-	  0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
-	  0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
-	  0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05,
-	  0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
-	  0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
-	  0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
-	  0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
-	  0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 };
-
-static void iks_md5_compute(iksmd5 *md5);
-
-void iks_md5_reset(iksmd5 *md5)
-{
-	memset(md5, 0, sizeof(iksmd5));
-	md5->state[0] = 0x67452301;
-	md5->state[1] = 0xEFCDAB89;
-	md5->state[2] = 0x98BADCFE;
-	md5->state[3] = 0x10325476;
-}
-
-iksmd5 *iks_md5_new(void)
-{
-	iksmd5 *md5 = malloc(sizeof(iksmd5));
-
-	if (!md5)
-		return NULL;
-	iks_md5_reset(md5);
-	return md5;
-}
-
-void iks_md5_hash(iksmd5 *md5, const unsigned char *data, size_t slen, int finish)
-{
-	int i, j;
-	int len = slen;
-
-	i = (64 - md5->blen);
-	j = (len < i) ? (len) : (i);
-	memcpy(md5->buffer + md5->blen, data, j);
-	md5->blen += j;
-	len -= j;
-	data += j;
-	while (len > 0) {
-		iks_md5_compute(md5);
-		md5->blen = 0;
-		md5->total[0] += 8*64;
-		md5->total[1] += (md5->total[0] < 8*64);
-		j = (len < 64) ? (len) : (64);
-		memcpy(md5->buffer, data, j);
-		md5->blen = j;
-		len -= j;
-		data += j;
-	}
-	if (finish) {
-		md5->total[0] += 8*md5->blen;
-		md5->total[1] += (md5->total[0] < 8*md5->blen);
-		md5->buffer[(md5->blen)++] = 0x80;
-		if (md5->blen > 56) {
-			while (md5->blen < 64)
-				md5->buffer[(md5->blen)++] = 0x00;
-			iks_md5_compute(md5);
-			md5->blen = 0;
-		}
-		while (md5->blen < 56)
-			md5->buffer[(md5->blen)++] = 0x00;
-		PUT_UINT32(md5->total[0], md5->buffer, 56);
-		PUT_UINT32(md5->total[1], md5->buffer, 60);
-		iks_md5_compute(md5);
-	}
-}
-
-void iks_md5_delete(iksmd5 *md5)
-{
-	free(md5);
-}
-
-void iks_md5_digest(iksmd5 *md5, unsigned char *digest)
-{
-	PUT_UINT32(md5->state[0], digest,  0);
-	PUT_UINT32(md5->state[1], digest,  4);
-	PUT_UINT32(md5->state[2], digest,  8);
-	PUT_UINT32(md5->state[3], digest, 12);
-}
-
-void iks_md5_print(iksmd5 *md5, char *buf)
-{
-  int i;
-	unsigned char digest[16];
-
-	iks_md5_digest(md5, digest);
-	for (i = 0; i < 16; i++) {
-		sprintf (buf, "%02x", digest[i]);
-		buf += 2;
-	}
-}
-
-void iks_md5(const char *data, char *buf)
-{
-	iksmd5 *md5 = iks_md5_new();
-
-	iks_md5_hash(md5, (const unsigned char*)data, strlen(data), 1);
-	iks_md5_print(md5, buf);
-	iks_md5_delete(md5);
-}
-
-static void iks_md5_compute(iksmd5 *md5)
-{
-	unsigned long int X[16], R[4];
-	unsigned char RS1[] = { 7, 12 ,17, 22 };
-	unsigned char RS2[] = { 5, 9 ,14, 20 };
-	unsigned char RS3[] = { 4, 11 ,16, 23 };
-	unsigned char RS4[] = { 6, 10 ,15, 21 };
-	int i, j, k, p;
-
-	for (i = 0; i < 16; ++i)
-		 GET_UINT32(X[i], md5->buffer, i*4);
-
-	for (i = 0; i < 4; ++i)
-		R[i] = md5->state[i];
-
-	for (i = j = k = 0; i < 16; ++i, j = i%4, k = (k+3)%4)
-		P(R, k, F, i, RS1[j], T[i]);
-
-	for (i = j = k = 0, p = 1; i < 16; ++i, j = i%4, k = (k+3)%4, p = (p+5)%16)
-		P(R, k, G, p, RS2[j], T[i+16]);
-
-	for (i = j = k = 0, p = 5; i < 16; ++i, j = i%4, k = (k+3)%4, p = (p+3)%16)
-		P(R, k, H, p, RS3[j], T[i+32]);
-
-	for (i = j = k = p = 0; i < 16; ++i, j = i%4, k = (k+3)%4, p = (p+7)%16)
-		P(R, k, I, p, RS4[j], T[i+48]);
-
-	for (i = 0; i < 4; ++i)
-		md5->state[i] += R[i];
-}
-
diff --git a/libs/iksemel/src/sax.c b/libs/iksemel/src/sax.c
deleted file mode 100644
index beb3621588..0000000000
--- a/libs/iksemel/src/sax.c
+++ /dev/null
@@ -1,635 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2004 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-enum cons_e {
-	C_CDATA = 0,
-	C_TAG_START,
-	C_TAG,
-	C_TAG_END,
-	C_ATTRIBUTE,
-	C_ATTRIBUTE_1,
-	C_ATTRIBUTE_2,
-	C_VALUE,
-	C_VALUE_APOS,
-	C_VALUE_QUOT,
-	C_WHITESPACE,
-	C_ENTITY,
-	C_COMMENT,
-	C_COMMENT_1,
-	C_COMMENT_2,
-	C_COMMENT_3,
-	C_MARKUP,
-	C_MARKUP_1,
-	C_SECT,
-	C_SECT_CDATA,
-	C_SECT_CDATA_1,
-	C_SECT_CDATA_2,
-	C_SECT_CDATA_3,
-	C_SECT_CDATA_4,
-	C_SECT_CDATA_C,
-	C_SECT_CDATA_E,
-	C_SECT_CDATA_E2,
-	C_PI
-};
-
-/* if you add a variable here, dont forget changing iks_parser_reset */
-struct iksparser_struct {
-	ikstack *s;
-	void *user_data;
-	iksTagHook *tagHook;
-	iksCDataHook *cdataHook;
-	iksDeleteHook *deleteHook;
-	/* parser context */
-	char *stack;
-	size_t stack_pos;
-	size_t stack_max;
-
-	enum cons_e context;
-	enum cons_e oldcontext;
-
-	char *tag_name;
-	enum ikstagtype tagtype;
-
-	unsigned int attmax;
-	unsigned int attcur;
-	int attflag;
-	char **atts;
-	int valflag;
-
-	unsigned int entpos;
-	char entity[8];
-
-	unsigned long nr_bytes;
-	unsigned long nr_lines;
-
-	int uni_max;
-	int uni_len;
-};
-
-iksparser *
-iks_sax_new (void *user_data, iksTagHook *tagHook, iksCDataHook *cdataHook)
-{
-	iksparser *prs;
-
-	prs = iks_malloc (sizeof (iksparser));
-	if (NULL == prs) return NULL;
-	memset (prs, 0, sizeof (iksparser));
-	prs->user_data = user_data;
-	prs->tagHook = tagHook;
-	prs->cdataHook = cdataHook;
-	return prs;
-}
-
-iksparser *
-iks_sax_extend (ikstack *s, void *user_data, iksTagHook *tagHook, iksCDataHook *cdataHook, iksDeleteHook *deleteHook)
-{
-	iksparser *prs;
-
-	prs = iks_stack_alloc (s, sizeof (iksparser));
-	if (NULL == prs) return NULL;
-	memset (prs, 0, sizeof (iksparser));
-	prs->s = s;
-	prs->user_data = user_data;
-	prs->tagHook = tagHook;
-	prs->cdataHook = cdataHook;
-	prs->deleteHook = deleteHook;
-	return prs;
-}
-
-ikstack *
-iks_parser_stack (iksparser *prs)
-{
-	return prs->s;
-}
-
-void *
-iks_user_data (iksparser *prs)
-{
-	return prs->user_data;
-}
-
-unsigned long
-iks_nr_bytes (iksparser *prs)
-{
-	return prs->nr_bytes;
-}
-
-unsigned long
-iks_nr_lines (iksparser *prs)
-{
-	return prs->nr_lines;
-}
-
-#define IS_WHITESPACE(x) ' ' == (x) || '\t' == (x) || '\r' == (x) || '\n' == (x)
-#define NOT_WHITESPACE(x) ' ' != (x) && '\t' != (x) && '\r' != (x) && '\n' != (x)
-
-static int
-stack_init (iksparser *prs)
-{
-	prs->stack = iks_malloc (128);
-	if (!prs->stack) return 0;
-	prs->stack_max = 128;
-	prs->stack_pos = 0;
-	return 1;
-}
-
-static int
-stack_expand (iksparser *prs, int len)
-{
-	size_t need;
-	off_t diff;
-	char *tmp;
-	need = len - (prs->stack_max - prs->stack_pos);
-	if (need < prs->stack_max) {
-		need = prs->stack_max * 2;
-	} else {
-		/* need x 1.2 for integer only archs like ARM */
-		need = prs->stack_max + ( (need * 6) / 5);
-	}
-	tmp = iks_malloc (need);
-	if (!tmp) return 0;
-	diff = tmp - prs->stack;
-	memcpy (tmp, prs->stack, prs->stack_max);
-	iks_free (prs->stack);
-	prs->stack = tmp;
-	prs->stack_max = need;
-	prs->tag_name += diff;
-	if (prs->attflag != 0) {
-		int i = 0;
-		while (i < (prs->attmax * 2)) {
-			if (prs->atts[i]) prs->atts[i] += diff;
-			i++;
-		}
-	}
-	return 1;
-}
-
-#define STACK_INIT \
-	if (NULL == prs->stack && 0 == stack_init (prs)) return IKS_NOMEM
-
-#define STACK_PUSH_START (prs->stack + prs->stack_pos)
-
-#define STACK_PUSH(buf,len) \
-{ \
-	char *sbuf = (buf); \
-	size_t slen = (len); \
-	if (prs->stack_max - prs->stack_pos <= slen) { \
-		if (0 == stack_expand (prs, slen)) return IKS_NOMEM; \
-	} \
-	memcpy (prs->stack + prs->stack_pos, sbuf, slen); \
-	prs->stack_pos += slen; \
-}
-
-#define STACK_PUSH_END \
-{ \
-	if (prs->stack_pos >= prs->stack_max) { \
-		if (0 == stack_expand (prs, 1)) return IKS_NOMEM; \
-	} \
-	prs->stack[prs->stack_pos] = '\0'; \
-	prs->stack_pos++; \
-}
-
-static enum ikserror
-sax_core (iksparser *prs, char *buf, int len)
-{
-	enum ikserror err;
-	int pos = 0, old = 0, re, stack_old = -1;
-	unsigned char c;
-
-	while (pos < len) {
-		re = 0;
-		c = buf[pos];
-		if (0 == c || 0xFE == c || 0xFF == c) return IKS_BADXML;
-		if (prs->uni_max) {
-			if ((c & 0xC0) != 0x80) return IKS_BADXML;
-			prs->uni_len++;
-			if (prs->uni_len == prs->uni_max) prs->uni_max = 0;
-			goto cont;
-		} else {
-			if (c & 0x80) {
-				if ((c & 0x60) == 0x40) {
-					prs->uni_max = 2;
-				} else if ((c & 0x70) == 0x60) {
-					prs->uni_max = 3;
-				} else if ((c & 0x78) == 0x70) {
-					prs->uni_max = 4;
-				} else if ((c & 0x7C) == 0x78) {
-					prs->uni_max = 5;
-				} else if ((c & 0x7E) == 0x7C) {
-					prs->uni_max = 6;
-				} else {
-					return IKS_BADXML;
-				}
-				/* if ((c & mask) == 0) return IKS_BADXML; I AM WRONG */
-				prs->uni_len = 1;
-				if (stack_old == -1
-					&& (prs->context == C_TAG
-						|| prs->context == C_ATTRIBUTE_1
-						|| prs->context == C_VALUE_APOS
-						|| prs->context == C_VALUE_QUOT)) stack_old = pos;
-				goto cont;
-			}
-		}
-
-		switch (prs->context) {
-			case C_CDATA:
-				if ('&' == c) {
-					if (old < pos && prs->cdataHook) {
-						err = prs->cdataHook (prs->user_data, &buf[old], pos - old);
-						if (IKS_OK != err) return err;
-					}
-					prs->context = C_ENTITY;
-					prs->entpos = 0;
-					break;
-				}
-				if ('<' == c) {
-					if (old < pos && prs->cdataHook) {
-						err = prs->cdataHook (prs->user_data, &buf[old], pos - old);
-						if (IKS_OK != err) return err;
-					}
-					STACK_INIT;
-					prs->tag_name = STACK_PUSH_START;
-					if (!prs->tag_name) return IKS_NOMEM;
-					prs->context = C_TAG_START;
-				}
-				break;
-
-			case C_TAG_START:
-				prs->context = C_TAG;
-				if ('/' == c) {
-					prs->tagtype = IKS_CLOSE;
-					break;
-				}
-				if ('?' == c) {
-					prs->context = C_PI;
-					break;
-				}
-				if ('!' == c) {
-					prs->context = C_MARKUP;
-					break;
-				}
-				prs->tagtype = IKS_OPEN;
-				stack_old = pos;
-				break;
-
-			case C_TAG:
-				if (IS_WHITESPACE(c)) {
-					if (IKS_CLOSE == prs->tagtype)
-						prs->oldcontext = C_TAG_END;
-					else
-						prs->oldcontext = C_ATTRIBUTE;
-					prs->context = C_WHITESPACE;
-					if (stack_old != -1) STACK_PUSH (buf + stack_old, pos - stack_old);
-					stack_old = -1;
-					STACK_PUSH_END;
-					break;
-				}
-				if ('/' == c) {
-					if (IKS_CLOSE == prs->tagtype) return IKS_BADXML;
-					prs->tagtype = IKS_SINGLE;
-					prs->context = C_TAG_END;
-					if (stack_old != -1) STACK_PUSH (buf + stack_old, pos - stack_old);
-					stack_old = -1;
-					STACK_PUSH_END;
-					break;
-				}
-				if ('>' == c) {
-					prs->context = C_TAG_END;
-					if (stack_old != -1) STACK_PUSH (buf + stack_old, pos - stack_old);
-					stack_old = -1;
-					STACK_PUSH_END;
-					re = 1;
-					break;
-				}
-				if (stack_old == -1) stack_old = pos;
-				break;
-
-			case C_TAG_END:
-				if (c != '>') return IKS_BADXML;
-				if (prs->tagHook) {
-					char **tmp;
-					if (prs->attcur == 0) tmp = NULL; else tmp = prs->atts;
-					err = prs->tagHook (prs->user_data, prs->tag_name, tmp, prs->tagtype);
-					if (IKS_OK != err) return err;
-				}
-				prs->stack_pos = 0;
-				stack_old = -1;
-				prs->attcur = 0;
-				prs->attflag = 0;
-				prs->context = C_CDATA;
-				old = pos + 1;
-				break;
-
-			case C_ATTRIBUTE:
-				if ('/' == c) {
-					prs->tagtype = IKS_SINGLE;
-					prs->context = C_TAG_END;
-					break;
-				}
-				if ('>' == c) {
-					prs->context = C_TAG_END;
-					re = 1;
-					break;
-				}
-				if (!prs->atts) {
-					prs->attmax = 12;
-					prs->atts = iks_malloc (sizeof(char *) * 2 * 12);
-					if (!prs->atts) return IKS_NOMEM;
-					memset (prs->atts, 0, sizeof(char *) * 2 * 12);
-					prs->attcur = 0;
-				} else {
-					if (prs->attcur >= (prs->attmax * 2)) {
-						void *tmp;
-						prs->attmax += 12;
-						tmp = iks_malloc (sizeof(char *) * 2 * prs->attmax);
-						if (!tmp) return IKS_NOMEM;
-						memset (tmp, 0, sizeof(char *) * 2 * prs->attmax);
-						memcpy (tmp, prs->atts, sizeof(char *) * prs->attcur);
-						free (prs->atts);
-						prs->atts = tmp;
-					}
-				}
-				prs->attflag = 1;
-				prs->atts[prs->attcur] = STACK_PUSH_START;
-				stack_old = pos;
-				prs->context = C_ATTRIBUTE_1;
-				break;
-
-			case C_ATTRIBUTE_1:
-				if ('=' == c) {
-					if (stack_old != -1) STACK_PUSH (buf + stack_old, pos - stack_old);
-					stack_old = -1;
-					STACK_PUSH_END;
-					prs->context = C_VALUE;
-					break;
-				}
-				if (stack_old == -1) stack_old = pos;
-				break;
-
-			case C_ATTRIBUTE_2:
-				if ('/' == c) {
-					prs->tagtype = IKS_SINGLE;
-					prs->atts[prs->attcur] = NULL;
-					prs->context = C_TAG_END;
-					break;
-				}
-				if ('>' == c) {
-					prs->atts[prs->attcur] = NULL;
-					prs->context = C_TAG_END;
-					re = 1;
-					break;
-				}
-				prs->context = C_ATTRIBUTE;
-				re = 1;
-				break;
-
-			case C_VALUE:
-				prs->atts[prs->attcur + 1] = STACK_PUSH_START;
-				if ('\'' == c) {
-					prs->context = C_VALUE_APOS;
-					break;
-				}
-				if ('"' == c) {
-					prs->context = C_VALUE_QUOT;
-					break;
-				}
-				return IKS_BADXML;
-
-			case C_VALUE_APOS:
-				if ('\'' == c) {
-					if (stack_old != -1) STACK_PUSH (buf + stack_old, pos - stack_old);
-					stack_old = -1;
-					STACK_PUSH_END;
-					prs->oldcontext = C_ATTRIBUTE_2;
-					prs->context = C_WHITESPACE;
-					prs->attcur += 2;
-				}
-				if (stack_old == -1) stack_old = pos;
-				break;
-
-			case C_VALUE_QUOT:
-				if ('"' == c) {
-					if (stack_old != -1) STACK_PUSH (buf + stack_old, pos - stack_old);
-					stack_old = -1;
-					STACK_PUSH_END;
-					prs->oldcontext = C_ATTRIBUTE_2;
-					prs->context = C_WHITESPACE;
-					prs->attcur += 2;
-				}
-				if (stack_old == -1) stack_old = pos;
-				break;
-
-			case C_WHITESPACE:
-				if (NOT_WHITESPACE(c)) {
-					prs->context = prs->oldcontext;
-					re = 1;
-				}
-				break;
-
-			case C_ENTITY:
-				if (';' == c) {
-					char hede[2];
-					char t = '?';
-					prs->entity[prs->entpos] = '\0';
-					if (strcmp(prs->entity, "amp") == 0)
-						t = '&';
-					else if (strcmp(prs->entity, "quot") == 0)
-						t = '"';
-					else if (strcmp(prs->entity, "apos") == 0)
-						t = '\'';
-					else if (strcmp(prs->entity, "lt") == 0)
-						t = '<';
-					else if (strcmp(prs->entity, "gt") == 0)
-						t = '>';
-					old = pos + 1;
-					hede[0] = t;
-					if (prs->cdataHook) {
-						err = prs->cdataHook (prs->user_data, &hede[0], 1);
-						if (IKS_OK != err) return err;
-					}
-					prs->context = C_CDATA;
-				} else {
-					prs->entity[prs->entpos++] = buf[pos];
-					if (prs->entpos > 7) return IKS_BADXML;
-				}
-				break;
-
-			case C_COMMENT:
-				if ('-' != c) return IKS_BADXML;
-				prs->context = C_COMMENT_1;
-				break;
-
-			case C_COMMENT_1:
-				if ('-' == c) prs->context = C_COMMENT_2;
-				break;
-
-			case C_COMMENT_2:
-				if ('-' == c)
-					prs->context = C_COMMENT_3;
-				else
-					prs->context = C_COMMENT_1;
-				break;
-
-			case C_COMMENT_3:
-				if ('>' != c) return IKS_BADXML;
-				prs->context = C_CDATA;
-				old = pos + 1;
-				break;
-
-			case C_MARKUP:
-				if ('[' == c) {
-					prs->context = C_SECT;
-					break;
-				}
-				if ('-' == c) {
-					prs->context = C_COMMENT;
-					break;
-				}
-				prs->context = C_MARKUP_1;
-
-			case C_MARKUP_1:
-				if ('>' == c) {
-					old = pos + 1;
-					prs->context = C_CDATA;
-				}
-				break;
-
-			case C_SECT:
-				if ('C' == c) {
-					prs->context = C_SECT_CDATA;
-					break;
-				}
-				return IKS_BADXML;
-
-			case C_SECT_CDATA:
-				if ('D' != c) return IKS_BADXML;
-				prs->context = C_SECT_CDATA_1;
-				break;
-
-			case C_SECT_CDATA_1:
-				if ('A' != c) return IKS_BADXML;
-				prs->context = C_SECT_CDATA_2;
-				break;
-
-			case C_SECT_CDATA_2:
-				if ('T' != c) return IKS_BADXML;
-				prs->context = C_SECT_CDATA_3;
-				break;
-
-			case C_SECT_CDATA_3:
-				if ('A' != c) return IKS_BADXML;
-				prs->context = C_SECT_CDATA_4;
-				break;
-
-			case C_SECT_CDATA_4:
-				if ('[' != c) return IKS_BADXML;
-				old = pos + 1;
-				prs->context = C_SECT_CDATA_C;
-				break;
-
-			case C_SECT_CDATA_C:
-				if (']' == c) {
-					prs->context = C_SECT_CDATA_E;
-					if (prs->cdataHook && old < pos) {
-						err = prs->cdataHook (prs->user_data, &buf[old], pos - old);
-						if (IKS_OK != err) return err;
-					}
-				}
-				break;
-
-			case C_SECT_CDATA_E:
-				if (']' == c) {
-					prs->context = C_SECT_CDATA_E2;
-				} else {
-					if (prs->cdataHook) {
-						err = prs->cdataHook (prs->user_data, "]", 1);
-						if (IKS_OK != err) return err;
-					}
-					old = pos;
-					prs->context = C_SECT_CDATA_C;
-				}
-				break;
-
-			case C_SECT_CDATA_E2:
-				if ('>' == c) {
-					old = pos + 1;
-					prs->context = C_CDATA;
-				} else if (']' == c) {
-					/* ]]] scenario */
-					if (prs->cdataHook) {
-						err = prs->cdataHook (prs->user_data, "]", 1);
-						if (IKS_OK != err) return err;
-					}
-					old = pos;
-				} else {
-					if (prs->cdataHook) {
-						err = prs->cdataHook (prs->user_data, "]]", 2);
-						if (IKS_OK != err) return err;
-					}
-					old = pos;
-					prs->context = C_SECT_CDATA_C;
-				}
-				break;
-
-			case C_PI:
-				old = pos + 1;
-				if ('>' == c) prs->context = C_CDATA;
-				break;
-		}
-cont:
-		if (0 == re) {
-			pos++;
-			prs->nr_bytes++;
-			if ('\n' == c) prs->nr_lines++;
-		}
-	}
-
-	if (stack_old != -1)
-		STACK_PUSH (buf + stack_old, pos - stack_old);
-
-	err = IKS_OK;
-	if (prs->cdataHook && (prs->context == C_CDATA || prs->context == C_SECT_CDATA_C) && old < pos)
-		err = prs->cdataHook (prs->user_data, &buf[old], pos - old);
-	return err;
-}
-
-int
-iks_parse (iksparser *prs, const char *data, size_t len, int finish)
-{
-	if (!data) return IKS_OK;
-	if (len == 0) len = strlen (data);
-	return sax_core (prs, (char *) data, len);
-}
-
-void
-iks_parser_reset (iksparser *prs)
-{
-	if (prs->deleteHook) prs->deleteHook (prs->user_data);
-	prs->stack_pos = 0;
-	prs->context = 0;
-	prs->oldcontext = 0;
-	prs->tagtype = 0;
-	prs->attcur = 0;
-	prs->attflag = 0;
-	prs->valflag = 0;
-	prs->entpos = 0;
-	prs->nr_bytes = 0;
-	prs->nr_lines = 0;
-	prs->uni_max = 0;
-	prs->uni_len = 0;
-}
-
-void
-iks_parser_delete (iksparser *prs)
-{
-	if (prs->deleteHook) prs->deleteHook (prs->user_data);
-	if (prs->stack) iks_free (prs->stack);
-	if (prs->atts) iks_free (prs->atts);
-	if (prs->s) iks_stack_delete (&prs->s); else iks_free (prs);
-}
diff --git a/libs/iksemel/src/sha.c b/libs/iksemel/src/sha.c
deleted file mode 100644
index 330e1b0143..0000000000
--- a/libs/iksemel/src/sha.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-static void sha_buffer (iksha *sha, const unsigned char *data, int len);
-static void sha_calculate (iksha *sha);
-
-struct iksha_struct {
-	unsigned int hash[5];
-	unsigned int buf[80];
-	int blen;
-	unsigned int lenhi, lenlo;
-};
-
-iksha *
-iks_sha_new (void)
-{
-	iksha *sha;
-
-	sha = iks_malloc (sizeof (iksha));
-	if (!sha) return NULL;
-	iks_sha_reset (sha);
-	return sha;
-}
-
-void
-iks_sha_reset (iksha *sha)
-{
-	memset (sha, 0, sizeof (iksha));
-	sha->hash[0] = 0x67452301;
-	sha->hash[1] = 0xefcdab89;
-	sha->hash[2] = 0x98badcfe;
-	sha->hash[3] = 0x10325476;
-	sha->hash[4] = 0xc3d2e1f0;
-}
-
-void
-iks_sha_hash (iksha *sha, const unsigned char *data, size_t len, int finish)
-{
-	unsigned char pad[8];
-	unsigned char padc;
-
-	if (data && len != 0) sha_buffer (sha, data, len);
-	if (!finish) return;
-
-	pad[0] = (unsigned char)((sha->lenhi >> 24) & 0xff);
-	pad[1] = (unsigned char)((sha->lenhi >> 16) & 0xff);
-	pad[2] = (unsigned char)((sha->lenhi >> 8) & 0xff);
-	pad[3] = (unsigned char)(sha->lenhi & 0xff);
-	pad[4] = (unsigned char)((sha->lenlo >> 24) & 0xff);
-	pad[5] = (unsigned char)((sha->lenlo >> 16) & 0xff);
-	pad[6] = (unsigned char)((sha->lenlo >> 8) & 0xff);
-	pad[7] = (unsigned char)(sha->lenlo & 255);
-
-	padc = 0x80;
-	sha_buffer (sha, &padc, 1);
-
-	padc = 0x00;
-	while (sha->blen != 56)
-		sha_buffer (sha, &padc, 1);
-
-	sha_buffer (sha, pad, 8);
-}
-
-void
-iks_sha_print (iksha *sha, char *hash)
-{
-	int i;
-
-	for (i=0; i<5; i++)
-	{
-		sprintf (hash, "%08x", sha->hash[i]);
-		hash += 8;
-	}
-}
-
-void
-iks_sha_delete (iksha *sha)
-{
-	iks_free (sha);
-}
-
-void
-iks_sha (const char *data, char *hash)
-{
-	iksha *sha;
-
-	sha = iks_sha_new ();
-	iks_sha_hash (sha, (const unsigned char*)data, strlen (data), 1);
-	iks_sha_print (sha, hash);
-	iks_free (sha);
-}
-
-static void
-sha_buffer (iksha *sha, const unsigned char *data, int len)
-{
-	int i;
-
-	for (i=0; i<len; i++) {
-		sha->buf[sha->blen / 4] <<= 8;
-		sha->buf[sha->blen / 4] |= (unsigned int)data[i];
-		if ((++sha->blen) % 64 == 0) {
-			sha_calculate (sha);
-			sha->blen = 0;
-		}
-		sha->lenlo += 8;
-		sha->lenhi += (sha->lenlo < 8);
-	}
-}
-
-#define SRL(x,y) (((x) << (y)) | ((x) >> (32-(y))))
-#define SHA(a,b,f,c) \
-	for (i= (a) ; i<= (b) ; i++) { \
-		TMP = SRL(A,5) + ( (f) ) + E + sha->buf[i] + (c) ; \
-		E = D; \
-		D = C; \
-		C = SRL(B,30); \
-		B = A; \
-		A = TMP; \
-	}
-
-static void
-sha_calculate (iksha *sha)
-{
-	int i;
-	unsigned int A, B, C, D, E, TMP;
-
-	for (i=16; i<80; i++)
-		sha->buf[i] = SRL (sha->buf[i-3] ^ sha->buf[i-8] ^ sha->buf[i-14] ^ sha->buf[i-16], 1);
-
-	A = sha->hash[0];
-	B = sha->hash[1];
-	C = sha->hash[2];
-	D = sha->hash[3];
-	E = sha->hash[4];
-
-	SHA (0,  19, ((C^D)&B)^D,     0x5a827999);
-	SHA (20, 39, B^C^D,           0x6ed9eba1);
-	SHA (40, 59, (B&C)|(D&(B|C)), 0x8f1bbcdc);
-	SHA (60, 79, B^C^D,           0xca62c1d6);
-
-	sha->hash[0] += A;
-	sha->hash[1] += B;
-	sha->hash[2] += C;
-	sha->hash[3] += D;
-	sha->hash[4] += E;
-}
diff --git a/libs/iksemel/src/stream.c b/libs/iksemel/src/stream.c
deleted file mode 100644
index f304f67c64..0000000000
--- a/libs/iksemel/src/stream.c
+++ /dev/null
@@ -1,1054 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2007 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "config.h"
-#ifdef HAVE_GNUTLS
-#define _XOPEN_SOURCE 500
-#define _GNU_SOURCE
-#include <pthread.h>
-#endif
-
-
-#include "common.h"
-#include "iksemel.h"
-
-#ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif
-
-#ifdef HAVE_SSL
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#ifdef WIN32
-#include "Winsock2.h"
-typedef unsigned __int32 uint32_t;
-#else
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#include <poll.h>
-#endif
-#endif
-
-#define SF_FOREIGN 1
-#define SF_TRY_SECURE 2
-#define SF_SECURE 4
-#define SF_SERVER 8
-
-struct stream_data {
-	iksparser *prs;
-	ikstack *s;
-	ikstransport *trans;
-	char *name_space;
-	void *user_data;
-	const char *server;
-	iksStreamHook *streamHook;
-	iksLogHook *logHook;
-	iks *current;
-	char *buf;
-	void *sock;
-	unsigned int flags;
-	char *auth_username;
-	char *auth_pass;
-	char *cert_file;
-	char *key_file;
-#ifdef HAVE_GNUTLS
-	gnutls_session sess;
-	gnutls_certificate_credentials cred;
-#elif HAVE_SSL
-	SSL* ssl;
-	SSL_CTX* ssl_ctx; 
-#endif
-};
-
-#define WANT_READ 1
-#define WANT_WRITE 0
-
-#ifdef HAVE_SSL
-#ifdef WIN32
-static int sock_ready(struct stream_data *data, int ms, int w_read)
-{
-	int r = 0, e = 0;
-	fd_set rfds, wfds, efds, *fds;
-	struct timeval tv;
-
-	FD_ZERO(&rfds);
-	FD_ZERO(&wfds);
-	FD_ZERO(&efds);
-
-	if (w_read) {
-		fds = &rfds;
-	} else {
-		fds = &wfds;
-	}
-
-#ifdef WIN32
-#pragma warning( push )
-#pragma warning( disable : 4127 )
-	FD_SET(SSL_get_fd(data->ssl), fds);
-#pragma warning( pop ) 
-#else
-	FD_SET(SSL_get_fd(data->ssl), fds);
-#endif
-
-	tv.tv_sec = ms / 1000;
-	tv.tv_usec = (ms % 1000) * ms;
-	
-	r = select (SSL_get_fd(data->ssl) + 1, w_read ? &rfds : NULL, w_read ? NULL : &wfds, &efds, &tv); 
-
-	if (r > 0) {
-	
-#ifdef WIN32
-#pragma warning( push )
-#pragma warning( disable : 4127 )
-		e = FD_ISSET(SSL_get_fd(data->ssl), &efds);
-#pragma warning( pop ) 
-#else
-		e = FD_ISSET(SSL_get_fd(data->ssl), &efds);
-#endif		
-		
-		if (e) {
-			r = -1;
-		} else {
-		
-#ifdef WIN32
-#pragma warning( push )
-#pragma warning( disable : 4127 )
-			r = FD_ISSET(SSL_get_fd(data->ssl), fds);
-#pragma warning( pop ) 
-#else
-			r = FD_ISSET(SSL_get_fd(data->ssl), fds);
-#endif	
-			
-		}
-	}
-		
-	return r;
-}
-#else
-static int sock_ready(struct stream_data *data, int ms, int w_read)
-{
-	struct pollfd pfds[2] = { { 0 } };
-	int s = 0, r = 0, w = w_read ? POLLIN : POLLOUT;
-	
-	pfds[0].fd = SSL_get_fd(data->ssl);
-	pfds[0].events = w | POLLHUP | POLLERR;
-	
-	s = poll(pfds, 1, ms);
-
-
-	if (s < 0) {
-		r = s;
-	} else if (s > 0) {
-		if ((pfds[0].revents & w)) {
-			r = 1;
-		} else if ((pfds[0].revents & POLLHUP) || (pfds[0].revents & POLLERR)) {
-			r = -1;
-		}
-	}
-
-	return r;
-}
-#endif
-#endif
-
-#ifdef HAVE_GNUTLS
-#ifndef WIN32
-#include <gcrypt.h>
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif
-
-static size_t
-tls_push (iksparser *prs, const char *buffer, size_t len)
-{
-	struct stream_data *data = iks_user_data (prs);
-	int ret;
-	ret = data->trans->send (data->sock, buffer, len);
-	if (ret) return (size_t) -1;
-	return len;
-}
-
-static size_t
-tls_pull (iksparser *prs, char *buffer, size_t len)
-{
-	struct stream_data *data = iks_user_data (prs);
-	int ret;
-	ret = data->trans->recv (data->sock, buffer, len, -1);
-	if (ret == -1) return (size_t) -1;
-	return ret;
-}
-
-static int
-handshake (struct stream_data *data)
-{
-	const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
-	const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
-	const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
-	const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
-	const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
-	int ret;
-
-#ifndef WIN32
-	gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-#endif
-
-	if (gnutls_global_init () != 0)
-		return IKS_NOMEM;
-
-	if (gnutls_certificate_allocate_credentials (&data->cred) < 0)
-		return IKS_NOMEM;
-
-	if (gnutls_init (&data->sess, GNUTLS_CLIENT) != 0) {
-		gnutls_certificate_free_credentials (data->cred);
-		return IKS_NOMEM;
-	}
-
-	gnutls_protocol_set_priority (data->sess, protocol_priority);
-	gnutls_cipher_set_priority(data->sess, cipher_priority);
-	gnutls_compression_set_priority(data->sess, comp_priority);
-	gnutls_kx_set_priority(data->sess, kx_priority);
-	gnutls_mac_set_priority(data->sess, mac_priority);
-	gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
-
-
-	gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);
-	gnutls_transport_set_pull_function (data->sess, (gnutls_pull_func) tls_pull);
-	
-	gnutls_transport_set_ptr (data->sess, data->prs);
-
-	ret = gnutls_handshake (data->sess);
-	if (ret != 0) {
-		gnutls_deinit (data->sess);
-		gnutls_certificate_free_credentials (data->cred);
-		return IKS_NET_TLSFAIL;
-	}
-
-	data->flags &= (~SF_TRY_SECURE);
-	data->flags |= SF_SECURE;
-
-	if (!(data->flags & SF_SERVER)) {
-		iks_send_header (data->prs, data->server);
-	}
-
-	return IKS_OK;
-} // HAVE_GNUTLS
-#elif HAVE_SSL
-static int wait_for_data(struct stream_data *data, int ret, int timeout)
-{
-	int err;
-	int retval = IKS_OK;
-
-	err = SSL_get_error(data->ssl, ret);
-	
-	switch(err)
-	{
-		case SSL_ERROR_WANT_READ:
-			ret = sock_ready(data, timeout*1000, WANT_READ);
-			break;
-		case SSL_ERROR_WANT_WRITE:
-			ret = sock_ready(data, timeout*1000, WANT_WRITE);
-			break;
-		default:
-			if (data->logHook) {
-				data->logHook(data->user_data, ERR_error_string(err, NULL), strlen(ERR_error_string(err, NULL)), 1); 
-			}
-			ret = -1;
-			break;
-
-			
-
-	}
-
-	if (ret == -1) {
-		retval = IKS_NET_TLSFAIL;
-	}
-	
-	
-	ERR_clear_error();
-				
-	return retval;
-}
-
-
-#ifndef WIN32
-#include <fcntl.h>
-#endif
-
-int iks_set_blocking(void *fd, int blocking)
-{
-#ifdef WIN32
-    unsigned long mode = !blocking;
-#endif
-    if (!fd) {
-		return -1;
-	}
-    
-#ifdef WIN32
-    if (ioctlsocket((SOCKET)(intptr_t) fd, FIONBIO, &mode)) {
-        return -1;
-    }
-
-#else
-    int flags;
-	int mfd = (int)(intptr_t)fd;
-
-    if ((flags = fcntl(mfd, F_GETFL, 0)) < 0) {
-        return -1;
-    }
-
-    if (fcntl(mfd, F_SETFL, flags | (!blocking ? O_NONBLOCK : ~O_NONBLOCK)) < 0) {
-        return -1;
-    }
-#endif
-
-    return 0;
-}
-
-
-
-static int
-handshake (struct stream_data *data)
-{
-	int ret;
-	int finished;
-
-	SSL_library_init();
-	SSL_load_error_strings();
-	
-	if (data->flags & SF_SERVER) {
-		data->ssl_ctx = SSL_CTX_new(TLSv1_server_method());
-		if(!data->ssl_ctx) return IKS_NOMEM;
-
-		if (SSL_CTX_use_certificate_file(data->ssl_ctx, data->cert_file, SSL_FILETYPE_PEM) <= 0) {
-			return IKS_NET_TLSFAIL;
-		}
-		if (SSL_CTX_use_PrivateKey_file(data->ssl_ctx, data->key_file, SSL_FILETYPE_PEM) <= 0) {
-			return IKS_NET_TLSFAIL;
-		}
-		SSL_CTX_set_verify(data->ssl_ctx, SSL_VERIFY_NONE, NULL);
-	} else {
-		data->ssl_ctx = SSL_CTX_new(TLSv1_method());
-		if(!data->ssl_ctx) return IKS_NOMEM;
-	}
-	
-	data->ssl = SSL_new(data->ssl_ctx);
-	if(!data->ssl) return IKS_NOMEM;
-	
-	iks_set_blocking(data->sock, 0);
-
-	if( SSL_set_fd(data->ssl, (int)(intptr_t)data->sock) != 1 ) return IKS_NOMEM;
-	
-	/* Set both the read and write BIO's to non-blocking mode */
-	BIO_set_nbio(SSL_get_rbio(data->ssl), 1);
-	BIO_set_nbio(SSL_get_wbio(data->ssl), 1);
-
-	finished = 0;
-	
-	do
-	{
-		if (data->flags & SF_SERVER) {
-			ret = SSL_accept(data->ssl);
-		} else {
-			ret = SSL_connect(data->ssl);
-		}
-		
-		if( ret != 1 ) 
-		{
-			if( wait_for_data(data, ret, 1) != IKS_OK ) 
-			{
-				finished = 1; 
-				SSL_free(data->ssl);
-			}
-		}
-	} while( ret != 1 && finished != 1 );
-	
-	if( ret == 1 )
-	{
-		data->flags &= (~SF_TRY_SECURE);
-		data->flags |= SF_SECURE;
-	
-		if (!(data->flags & SF_SERVER)) {
-			iks_send_header (data->prs, data->server);
-		}
-	}
-	
-	return ret == 1 ? IKS_OK : IKS_NET_TLSFAIL;
-}
-#endif
-
-static void
-insert_attribs (iks *x, char **atts)
-{
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			iks_insert_attrib (x, atts[i], atts[i+1]);
-			i += 2;
-		}
-	}
-}
-
-#define CNONCE_LEN 4
-
-static void
-parse_digest (char *message, const char *key, char **value_ptr, char **value_end_ptr)
-{
-	char *t;
-
-	*value_ptr = NULL;
-	*value_end_ptr = NULL;
-
-	t = strstr(message, key);
-	if (t) {
-		t += strlen(key);
-		*value_ptr = t;
-		while (t[0] != '\0') {
-			if (t[0] != '\\' && t[1] == '"') {
-				++t;
-				*value_end_ptr = t;
-				return;
-			}
-			++t;
-		}
-	}
-}
-
-static iks *
-make_sasl_response (struct stream_data *data, char *message)
-{
-	iks *x = NULL;
-	char *realm, *realm_end;
-	char *nonce, *nonce_end;
-	char cnonce[CNONCE_LEN*8 + 1];
-	iksmd5 *md5;
-	unsigned char a1_h[16], a1[33], a2[33], response_value[33];
-	char *response, *response_coded;
-	int i;
-
-	parse_digest(message, "realm=\"", &realm, &realm_end);
-	parse_digest(message, "nonce=\"", &nonce, &nonce_end);
-
-	/* nonce is necessary for auth */
-	if (!nonce || !nonce_end) return NULL;
-	*nonce_end = '\0';
-
-	/* if no realm is given use the server hostname */
-	if (realm) {
-		if (!realm_end) return NULL;
-		*realm_end = '\0';
-	} else {
-		realm = (char *) data->server;
-	}
-
-	/* generate random client challenge */
-	for (i = 0; i < CNONCE_LEN; ++i)
-		sprintf (cnonce + i*8, "%08x", rand());
-
-	md5 = iks_md5_new();
-	if (!md5) return NULL;
-
-	iks_md5_hash (md5, (const unsigned char*)data->auth_username, iks_strlen (data->auth_username), 0);
-	iks_md5_hash (md5, (const unsigned char*)":", 1, 0);
-	iks_md5_hash (md5, (const unsigned char*)realm, iks_strlen (realm), 0);
-	iks_md5_hash (md5, (const unsigned char*)":", 1, 0);
-	iks_md5_hash (md5, (const unsigned char*)data->auth_pass, iks_strlen (data->auth_pass), 1);
-	iks_md5_digest (md5, a1_h);
-
-	iks_md5_reset (md5);
-	iks_md5_hash (md5, (const unsigned char*)a1_h, 16, 0);
-	iks_md5_hash (md5, (const unsigned char*)":", 1, 0);
-	iks_md5_hash (md5, (const unsigned char*)nonce, iks_strlen (nonce), 0);
-	iks_md5_hash (md5, (const unsigned char*)":", 1, 0);
-	iks_md5_hash (md5, (const unsigned char*)cnonce, iks_strlen (cnonce), 1);
-	iks_md5_print (md5, (char*)a1);
-
-	iks_md5_reset (md5);
-	iks_md5_hash (md5, (const unsigned char*)"AUTHENTICATE:xmpp/", 18, 0);
-	iks_md5_hash (md5, (const unsigned char*)data->server, iks_strlen (data->server), 1);
-	iks_md5_print (md5, (char*)a2);
-
-	iks_md5_reset (md5);
-	iks_md5_hash (md5, (const unsigned char*)a1, 32, 0);
-	iks_md5_hash (md5, (const unsigned char*)":", 1, 0);
-	iks_md5_hash (md5, (const unsigned char*)nonce, iks_strlen (nonce), 0);
-	iks_md5_hash (md5, (const unsigned char*)":00000001:", 10, 0);
-	iks_md5_hash (md5, (const unsigned char*)cnonce, iks_strlen (cnonce), 0);
-	iks_md5_hash (md5, (const unsigned char*)":auth:", 6, 0);
-	iks_md5_hash (md5, (const unsigned char*)a2, 32, 1);
-	iks_md5_print (md5, (char*)response_value);
-
-	iks_md5_delete (md5);
-
-	i = iks_strlen (data->auth_username) + iks_strlen (realm) +
-		iks_strlen (nonce) + iks_strlen (data->server) +
-		CNONCE_LEN*8 + 136;
-	response = iks_malloc (i);
-	if (!response) return NULL;
-
-	sprintf (response, "username=\"%s\",realm=\"%s\",nonce=\"%s\""
-		",cnonce=\"%s\",nc=00000001,qop=auth,digest-uri=\""
-		"xmpp/%s\",response=%s,charset=utf-8",
-		data->auth_username, realm, nonce, cnonce,
-		data->server, response_value);
-
-	response_coded = iks_base64_encode (response, 0);
-	if (response_coded) {
-		x = iks_new ("response");
-		iks_insert_cdata (x, response_coded, 0);
-		iks_free (response_coded);
-	}
-	iks_free (response);
-
-	return x;
-}
-
-static void
-iks_sasl_challenge (struct stream_data *data, iks *challenge)
-{
-	char *message;
-	iks *x;
-	char *tmp;
-
-	tmp = iks_cdata (iks_child (challenge));
-	if (!tmp) return;
-
-	/* decode received blob */
-	message = iks_base64_decode (tmp);
-	if (!message) return;
-
-	/* reply the challenge */
-	if (strstr (message, "rspauth")) {
-		x = iks_new ("response");
-	} else {
-		x = make_sasl_response (data, message);
-	}
-	if (x) {
-		iks_insert_attrib (x, "xmlns", IKS_NS_XMPP_SASL);
-		iks_send (data->prs, x);
-		iks_delete (x);
-	}
-	iks_free (message);
-}
-
-static int
-tagHook (struct stream_data *data, char *name, char **atts, int type)
-{
-	iks *x;
-	int err;
-
-	switch (type) {
-		case IKS_OPEN:
-		case IKS_SINGLE:
-#ifdef HAVE_GNUTLS
-			if (data->flags & SF_TRY_SECURE) {
-				if (strcmp (name, "proceed") == 0) {
-					err = handshake (data);
-					return err;
-				} else if (strcmp (name, "failure") == 0){
-					return IKS_NET_TLSFAIL;
-				}
-			}
-#elif HAVE_SSL
-			if (data->flags & SF_TRY_SECURE) {
-				if (strcmp (name, "proceed") == 0) {
-					err = handshake (data);
-					return err;
-				} else if (strcmp (name, "failure") == 0){
-					return IKS_NET_TLSFAIL;
-				}
-			}
-#endif
-			if (data->current) {
-				x = iks_insert (data->current, name);
-				insert_attribs (x, atts);
-			} else {
-				x = iks_new (name);
-				insert_attribs (x, atts);
-				if (iks_strcmp (name, "stream:stream") == 0) {
-					err = data->streamHook (data->user_data, IKS_NODE_START, x);
-					if (err != IKS_OK) return err;
-					break;
-				}
-			}
-			data->current = x;
-			if (IKS_OPEN == type) break;
-		case IKS_CLOSE:
-			x = data->current;
-			if (NULL == x) {
-				err = data->streamHook (data->user_data, IKS_NODE_STOP, NULL);
-				if (err != IKS_OK) return err;
-				break;
-			}
-			if (NULL == iks_parent (x)) {
-				data->current = NULL;
-				if (iks_strcmp (name, "challenge") == 0)
-					iks_sasl_challenge(data, x);
-				else if (iks_strcmp (name, "stream:error") == 0) {
-					err = data->streamHook (data->user_data, IKS_NODE_ERROR, x);
-					if (err != IKS_OK) return err;
-				} else {
-					err = data->streamHook (data->user_data, IKS_NODE_NORMAL, x);
-					if (err != IKS_OK) return err;
-				}
-				break;
-			}
-			data->current = iks_parent (x);
-	}
-	return IKS_OK;
-}
-
-static int
-cdataHook (struct stream_data *data, char *cdata, size_t len)
-{
-	if (data->current) iks_insert_cdata (data->current, cdata, len);
-	return IKS_OK;
-}
-
-static void
-deleteHook (struct stream_data *data)
-{
-#ifdef HAVE_GNUTLS
-	if (data->flags & SF_SECURE) {
-		gnutls_bye (data->sess, GNUTLS_SHUT_WR);
-		gnutls_deinit (data->sess);
-		gnutls_certificate_free_credentials (data->cred);
-	}
-#elif HAVE_SSL
-	if (data->flags & SF_SECURE) {
-		if( SSL_shutdown(data->ssl) == 0 ) SSL_shutdown(data->ssl);
-		SSL_free(data->ssl);
-	}
-#endif
-	if (data->trans) data->trans->close (data->sock);
-	data->trans = NULL;
-	if (data->current) iks_delete (data->current);
-	data->current = NULL;
-	data->flags = 0;
-}
-
-iksparser *
-iks_stream_new (char *name_space, void *user_data, iksStreamHook *streamHook)
-{
-	ikstack *s;
-	struct stream_data *data;
-
-	s = iks_stack_new (DEFAULT_STREAM_CHUNK_SIZE, 0);
-	if (NULL == s) return NULL;
-	data = iks_stack_alloc (s, sizeof (struct stream_data));
-	memset (data, 0, sizeof (struct stream_data));
-	data->s = s;
-	data->prs = iks_sax_extend (s, data, (iksTagHook *)tagHook, (iksCDataHook *)cdataHook, (iksDeleteHook *)deleteHook);
-	data->name_space = name_space;
-	data->user_data = user_data;
-	data->streamHook = streamHook;
-	return data->prs;
-}
-
-void *
-iks_stream_user_data (iksparser *prs)
-{
-	struct stream_data *data = iks_user_data (prs);
-
-	return data->user_data;
-}
-
-void
-iks_set_log_hook (iksparser *prs, iksLogHook *logHook)
-{
-	struct stream_data *data = iks_user_data (prs);
-
-	data->logHook = logHook;
-}
-
-int
-iks_connect_tcp (iksparser *prs, const char *server, int port)
-{
-#ifdef USE_DEFAULT_IO
-	return iks_connect_with (prs, server, port, server, &iks_default_transport);
-#else
-	return IKS_NET_NOTSUPP;
-#endif
-}
-
-int
-iks_connect_via (iksparser *prs, const char *server, int port, const char *server_name)
-{
-#ifdef USE_DEFAULT_IO
-	return iks_connect_with (prs, server, port, server_name, &iks_default_transport);
-#else
-	return IKS_NET_NOTSUPP;
-#endif
-}
-
-int
-iks_connect_with (iksparser *prs, const char *server, int port, const char *server_name, ikstransport *trans)
-{
-	struct stream_data *data = iks_user_data (prs);
-	int ret;
-
-	if (!trans->connect) return IKS_NET_NOTSUPP;
-
-	if (!data->buf) {
-		data->buf = iks_stack_alloc (data->s, NET_IO_BUF_SIZE);
-		if (NULL == data->buf) return IKS_NOMEM;
-	}
-
-	ret = trans->connect (prs, &data->sock, server, port);
-	if (ret) return ret;
-
-	data->trans = trans;
-
-	return iks_send_header (prs, server_name);
-}
-
-int
-iks_connect_async (iksparser *prs, const char *server, int port, void *notify_data, iksAsyncNotify *notify_func)
-{
-#ifdef USE_DEFAULT_IO
-	return iks_connect_async_with (prs, server, port, server, &iks_default_transport, notify_data, notify_func);
-#else
-	return IKS_NET_NOTSUPP;
-#endif
-}
-
-int
-iks_connect_async_with (iksparser *prs, const char *server, int port, const char *server_name, ikstransport *trans, void *notify_data, iksAsyncNotify *notify_func)
-{
-	struct stream_data *data = iks_user_data (prs);
-	int ret;
-
-	if (NULL == trans->connect_async)
-		return IKS_NET_NOTSUPP;
-
-	if (!data->buf) {
-		data->buf = iks_stack_alloc (data->s, NET_IO_BUF_SIZE);
-		if (NULL == data->buf) return IKS_NOMEM;
-	}
-
-	ret = trans->connect_async (prs, &data->sock, server, server_name, port, notify_data, notify_func);
-	if (ret) return ret;
-
-	data->trans = trans;
-	data->server = server_name;
-
-	return IKS_OK;
-}
-
-int
-iks_connect_fd (iksparser *prs, int fd)
-{
-#ifdef USE_DEFAULT_IO
-	struct stream_data *data = iks_user_data (prs);
-
-	if (!data->buf) {
-		data->buf = iks_stack_alloc (data->s, NET_IO_BUF_SIZE);
-		if (NULL == data->buf) return IKS_NOMEM;
-	}
-
-	data->sock = (void *) (intptr_t) fd;
-	data->flags |= SF_FOREIGN;
-	data->trans = &iks_default_transport;
-
-	return IKS_OK;
-#else
-	return IKS_NET_NOTSUPP;
-#endif
-}
-
-int
-iks_fd (iksparser *prs)
-{
-	struct stream_data *data;
-
-	if (prs) {
-		data = iks_user_data (prs);
-		if (data) {
-			return (int)(intptr_t) data->sock;
-		}
-	}
-	return -1;
-}
-
-int
-iks_recv (iksparser *prs, int timeout)
-{
-	struct stream_data *data = iks_user_data (prs);
-	int len, ret;
-	
-#ifdef HAVE_SSL
-	int   err;
-#endif
-
-	while (1) {
-#ifdef HAVE_GNUTLS
-		if (data->flags & SF_SECURE) {
-			len = gnutls_record_recv (data->sess, data->buf, NET_IO_BUF_SIZE - 1);
-			if (len > 0 && len < 5) {
-				len += gnutls_record_recv (data->sess, data->buf + len, NET_IO_BUF_SIZE - 1 - len);
-			} else if (len == 0) len = -1;
-		} else
-#elif HAVE_SSL
-		if (data->flags & SF_SECURE) {
-			ret = sock_ready(data, timeout*1000, WANT_READ);
-
-			if (ret == -1) {
-				return IKS_NET_TLSFAIL;
-			} else if( ret == 0 ) {
-				return IKS_OK;
-			} else {
-				len = SSL_read(data->ssl, data->buf, NET_IO_BUF_SIZE - 1);
-				if (len > 0 && len < 5) {
-					len += SSL_read(data->ssl, data->buf + len, NET_IO_BUF_SIZE - 1 - len);
-				}
-			}
-			
-			if( len <= 0 ) 
-			{
-				switch( err = SSL_get_error(data->ssl, len) ) 
-				{
-					case SSL_ERROR_WANT_READ:
-					case SSL_ERROR_WANT_WRITE:
-						return IKS_OK;
-						break;
-					default:
-						if(data->logHook)
-							data->logHook(data->user_data, ERR_error_string(err, NULL), strlen(ERR_error_string(err, NULL)), 1); 
-						return IKS_NET_TLSFAIL;
-						break;
-				}
-			}
-		} else
-#endif
-		{
-			len = data->trans->recv (data->sock, data->buf, NET_IO_BUF_SIZE - 1, timeout);
-		}
-		if (len < 0) return IKS_NET_RWERR;
-		if (len == 0) break;
-		data->buf[len] = '\0';
-		if (data->logHook) data->logHook (data->user_data, data->buf, len, 1);
-		ret = iks_parse (prs, data->buf, len, 0);
-
-		if (ret != IKS_OK) return ret;
-		if (!data->trans) {
-			/* stream hook called iks_disconnect */
-			return IKS_NET_NOCONN;
-		}
-		timeout = 0;
-	}
-	return IKS_OK;
-}
-
-int
-iks_send_header (iksparser *prs, const char *to)
-{
-	struct stream_data *data = iks_user_data (prs);
-	char *msg;
-	int len, err;
-
-	len = 91 + strlen (data->name_space) + 6 + strlen (to) + 16 + 1;
-	msg = iks_malloc (len);
-	if (!msg) return IKS_NOMEM;
-	sprintf (msg, "<?xml version='1.0'?>"
-		"<stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='"
-		"%s' to='%s' version='1.0'>", data->name_space, to);
-	err = iks_send_raw (prs, msg);
-	iks_free (msg);
-	if (err) return err;
-	data->server = to;
-	return IKS_OK;
-}
-
-int
-iks_send (iksparser *prs, iks *x)
-{
-	return iks_send_raw (prs, iks_string (iks_stack (x), x));
-}
-
-int
-iks_send_raw (iksparser *prs, const char *xmlstr)
-{
-	struct stream_data *data = iks_user_data (prs);
-	int ret;
-
-#ifdef HAVE_GNUTLS
-	if (data->flags & SF_SECURE) {
-		if (gnutls_record_send (data->sess, xmlstr, strlen (xmlstr)) < 0) return IKS_NET_RWERR;
-	} else
-#elif HAVE_SSL
-	if (data->flags & SF_SECURE) {
-		int r;
-
-		do {
-			r = SSL_write(data->ssl, xmlstr, strlen (xmlstr));
-		} while (r == -1 && SSL_get_error(data->ssl, r) == SSL_ERROR_WANT_WRITE);
-		
-		if (r < 0) {
-			return IKS_NET_RWERR;
-		}
-
-	} else
-#endif
-	{
-		ret = data->trans->send (data->sock, xmlstr, strlen (xmlstr));
-		if (ret) return ret;
-	}
-	if (data->logHook) data->logHook (data->user_data, xmlstr, strlen (xmlstr), 0);
-	return IKS_OK;
-}
-
-void
-iks_disconnect (iksparser *prs)
-{
-	iks_parser_reset (prs);
-}
-
-/*****  tls api  *****/
-
-int
-iks_has_tls (void)
-{
-#ifdef HAVE_GNUTLS
-	return 1;
-#elif HAVE_SSL
-	return 1;
-#else
-	return 0;
-#endif
-}
-
-int
-iks_is_secure (iksparser *prs)
-{
-#ifdef HAVE_GNUTLS
-	struct stream_data *data = iks_user_data (prs);
-
-	return data->flags & SF_SECURE;
-#elif HAVE_SSL
-	struct stream_data *data = iks_user_data (prs);
-	
-	return data->flags & SF_SECURE;
-#else
-	return 0;
-#endif
-}
-#ifdef HAVE_GNUTLS
-
-
-int
-iks_init(void)
-{
-	int ok = 0;
-	
-#ifndef WIN32
-	gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-#endif
-
-	if (gnutls_global_init () != 0)
-		return IKS_NOMEM;
-
-	return ok;
-
-}
-#else
-int
-iks_init(void)
-{
-	return 0;
-}
-#endif
-
-
-int
-iks_start_tls (iksparser *prs)
-{
-#ifdef HAVE_GNUTLS
-	int ret;
-	struct stream_data *data = iks_user_data (prs);
-
-	ret = iks_send_raw (prs, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
-	if (ret) return ret;
-	data->flags |= SF_TRY_SECURE;
-	return IKS_OK;
-#elif HAVE_SSL
-	int ret;
-	struct stream_data *data = iks_user_data (prs);
-	
-	ret = iks_send_raw (prs, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
-	if (ret) return ret;
-	data->flags |= SF_TRY_SECURE;
-	return IKS_OK;
-#else
-	return IKS_NET_NOTSUPP;
-#endif
-}
-
-int
-iks_proceed_tls (iksparser *prs, const char *cert_file, const char *key_file)
-{
-#ifdef HAVE_GNUTLS
-	int ret;
-	struct stream_data *data = iks_user_data (prs);
-
-	ret = iks_send_raw (prs, "<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
-	if (ret) return ret;
-	data->cert_file = iks_stack_strdup(data->s, cert_file, 0);
-	data->key_file = iks_stack_strdup(data->s, key_file, 0);
-	data->flags |= SF_TRY_SECURE | SF_SERVER;
-	return handshake (data);
-#elif HAVE_SSL
-	int ret;
-	struct stream_data *data = iks_user_data (prs);
-
-	ret = iks_send_raw (prs, "<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
-	if (ret) return ret;
-	data->cert_file = iks_stack_strdup(data->s, cert_file, 0);
-	data->key_file = iks_stack_strdup(data->s, key_file, 0);
-	data->flags |= SF_TRY_SECURE | SF_SERVER;
-	return handshake (data);
-#else
-	return IKS_NET_NOTSUPP;
-#endif
-}
-
-/*****  sasl  *****/
-
-int
-iks_start_sasl (iksparser *prs, enum ikssasltype type, char *username, char *pass)
-{
-	iks *x;
-
-	x = iks_new ("auth");
-	iks_insert_attrib (x, "xmlns", IKS_NS_XMPP_SASL);
-	switch (type) {
-		case IKS_SASL_PLAIN: {
-			int len = iks_strlen (username) + iks_strlen (pass) + 2;
-			char *s = iks_malloc (80+len);
-			char *base64;
-
-			iks_insert_attrib (x, "mechanism", "PLAIN");
-			sprintf (s, "%c%s%c%s", 0, username, 0, pass);
-			base64 = iks_base64_encode (s, len);
-			iks_insert_cdata (x, base64, 0);
-			iks_free (base64);
-			iks_free (s);
-			break;
-		}
-		case IKS_SASL_DIGEST_MD5: {
-			struct stream_data *data = iks_user_data (prs);
-
-			iks_insert_attrib (x, "mechanism", "DIGEST-MD5");
-			data->auth_username = username;
-			data->auth_pass = pass;
-			break;
-		}
-		default:
-			iks_delete (x);
-			return IKS_NET_NOTSUPP;
-	}
-	iks_send (prs, x);
-	iks_delete (x);
-	return IKS_OK;
-}
diff --git a/libs/iksemel/src/utility.c b/libs/iksemel/src/utility.c
deleted file mode 100644
index 5653bb534f..0000000000
--- a/libs/iksemel/src/utility.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-/*****  malloc wrapper  *****/
-
-static void *(*my_malloc_func)(size_t size);
-static void (*my_free_func)(void *ptr);
-
-void *
-iks_malloc (size_t size)
-{
-	if (my_malloc_func)
-		return my_malloc_func (size);
-	else
-		return malloc (size);
-}
-
-void
-iks_real_free (void *ptr)
-{
-	if (my_free_func)
-		my_free_func (ptr);
-	else
-		free (ptr);
-}
-
-void
-iks_set_mem_funcs (void *(*malloc_func)(size_t size), void (*free_func)(void *ptr))
-{
-	my_malloc_func = malloc_func;
-	my_free_func = free_func;
-}
-
-/*****  NULL-safe Functions  *****/
-
-char *
-iks_strdup (const char *src)
-{
-	if (src) return strdup(src);
-	return NULL;
-}
-
-char *
-iks_strcat (char *dest, const char *src)
-{
-	size_t len;
-
-	if (!src) return dest;
-
-	len = strlen (src);
-	memcpy (dest, src, len);
-	dest[len] = '\0';
-	return dest + len;
-}
-
-int
-iks_strcmp (const char *a, const char *b)
-{
-	if (!a || !b) return -1;
-	return strcmp (a, b);
-}
-
-int
-iks_strcasecmp (const char *a, const char *b)
-{
-	if (!a || !b) return -1;
-	return strcasecmp (a, b);
-}
-
-int
-iks_strncmp (const char *a, const char *b, size_t n)
-{
-	if (!a || !b) return -1;
-	return strncmp (a, b, n);
-}
-
-int
-iks_strncasecmp (const char *a, const char *b, size_t n)
-{
-	if (!a || !b) return -1;
-	return strncasecmp (a, b, n);
-}
-
-size_t
-iks_strlen (const char *src)
-{
-	if (!src) return 0;
-	return strlen (src);
-}
-
-/*****  XML Escaping  *****/
-
-char *
-iks_escape (ikstack *s, char *src, size_t len)
-{
-	char *ret;
-	int i, j, nlen;
-
-	if (!src || !s) return NULL;
-	if (len == -1) len = strlen (src);
-
-	nlen = len;
-	for (i=0; i<len; i++) {
-		switch (src[i]) {
-		case '&': nlen += 4; break;
-		case '<': nlen += 3; break;
-		case '>': nlen += 3; break;
-		case '\'': nlen += 5; break;
-		case '"': nlen += 5; break;
-		}
-	}
-	if (len == nlen) return src;
-
-	ret = iks_stack_alloc (s, nlen + 1);
-	if (!ret) return NULL;
-
-	for (i=j=0; i<len; i++) {
-		switch (src[i]) {
-		case '&': memcpy (&ret[j], "&amp;", 5); j += 5; break;
-		case '\'': memcpy (&ret[j], "&apos;", 6); j += 6; break;
-		case '"': memcpy (&ret[j], "&quot;", 6); j += 6; break;
-		case '<': memcpy (&ret[j], "&lt;", 4); j += 4; break;
-		case '>': memcpy (&ret[j], "&gt;", 4); j += 4; break;
-		default: ret[j++] = src[i];
-		}
-	}
-	ret[j] = '\0';
-
-	return ret;
-}
-
-char *
-iks_unescape (ikstack *s, char *src, size_t len)
-{
-	int i,j;
-	char *ret;
-
-	if (!s || !src) return NULL;
-	if (!strchr (src, '&')) return src;
-	if (len == -1) len = strlen (src);
-
-	ret = iks_stack_alloc (s, len + 1);
-	if (!ret) return NULL;
-
-	for (i=j=0; i<len; i++) {
-		if (src[i] == '&') {
-			i++;
-			if (strncmp (&src[i], "amp;", 4) == 0) {
-				ret[j] = '&';
-				i += 3;
-			} else if (strncmp (&src[i], "quot;", 5) == 0) {
-				ret[j] = '"';
-				i += 4;
-			} else if (strncmp (&src[i], "apos;", 5) == 0) {
-				ret[j] = '\'';
-				i += 4;
-			} else if (strncmp (&src[i], "lt;", 3) == 0) {
-				ret[j] = '<';
-				i += 2;
-			} else if (strncmp (&src[i], "gt;", 3) == 0) {
-				ret[j] = '>';
-				i += 2;
-			} else {
-				ret[j] = src[--i];
-			}
-		} else {
-			ret[j] = src[i];
-		}
-		j++;
-	}
-	ret[j] = '\0';
-
-	return ret;
-}
diff --git a/libs/iksemel/test/Makefile.am b/libs/iksemel/test/Makefile.am
deleted file mode 100644
index 27b05f04d3..0000000000
--- a/libs/iksemel/test/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-##
-## Process this file with automake to produce Makefile.in
-##
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-TESTS = tst-ikstack tst-iks tst-sax tst-dom tst-sha tst-md5 tst-filter tst-jid
-
-noinst_PROGRAMS = tst-ikstack tst-iks tst-sax tst-dom tst-sha tst-md5 tst-filter tst-jid
-
-tst_ikstack_LDADD = $(top_builddir)/src/libiksemel.la
-tst_ikstack_SOURCES = tst-ikstack.c
-
-tst_iks_LDADD = $(top_builddir)/src/libiksemel.la
-tst_iks_SOURCES = tst-iks.c
-
-tst_sax_LDADD = $(top_builddir)/src/libiksemel.la
-tst_sax_SOURCES = tst-sax.c
-
-tst_dom_LDADD = $(top_builddir)/src/libiksemel.la
-tst_dom_SOURCES = tst-dom.c
-
-tst_sha_LDADD = $(top_builddir)/src/libiksemel.la
-tst_sha_SOURCES = tst-sha.c
-
-tst_md5_LDADD = $(top_builddir)/src/libiksemel.la
-tst_md5_SOURCES = tst-md5.c
-
-tst_filter_LDADD = $(top_builddir)/src/libiksemel.la
-tst_filter_SOURCES = tst-filter.c
-
-tst_jid_LDADD = $(top_builddir)/src/libiksemel.la
-tst_jid_SOURCES = tst-jid.c
diff --git a/libs/iksemel/test/tst-dom.c b/libs/iksemel/test/tst-dom.c
deleted file mode 100644
index 693509e315..0000000000
--- a/libs/iksemel/test/tst-dom.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "iksemel.h"
-
-iks *my_x;
-int nr_tests;
-
-#define PR_TEST printf ("DOM test %d:\n", nr_tests)
-
-void
-document (char *xml)
-{
-	enum ikserror err;
-	iksparser *p;
-
-	nr_tests++;
-	if (my_x) iks_delete (my_x);
-	p = iks_dom_new (&my_x);
-	err = iks_parse (p, xml, 0, 1);
-	switch (err) {
-		case IKS_OK:
-			break;
-		case IKS_NOMEM:
-			PR_TEST;
-			puts ("Not enough memory.");
-			exit (1);
-		case IKS_BADXML:
-			PR_TEST;
-			printf ("Invalid xml at byte %ld in\n[%s]\n", iks_nr_bytes (p), xml);
-			exit (1);
-		case IKS_HOOK:
-			PR_TEST;
-			puts ("Hook.");
-	}
-	iks_parser_delete (p);
-}
-
-void
-tag (char *name, ...)
-{
-	iks *x;
-	va_list ap;
-
-	x = my_x;
-	va_start (ap, name);
-	while (1) {
-		char *name = iks_name (x);
-		char *tmp = va_arg (ap, char*);
-		if (NULL == tmp) break;
-		x = iks_find (x, tmp);
-		if (!x) {
-			PR_TEST;
-			printf ("Tag <%s> is not a child of tag <%s>\n", tmp, name);
-			exit (1);
-		}
-	}
-	if (!x || NULL == iks_find (x, name)) {
-		PR_TEST;
-		printf ("Tag <%s> is not a child of tag <%s>\n", name, iks_name (x));
-		exit (1);
-	}
-	va_end (ap);
-}
-
-void
-cdata (char *data, ...)
-{
-	iks *x;
-	va_list ap;
-
-	x = my_x;
-	va_start (ap, data);
-	while (1) {
-		char *name = iks_name (x);
-		char *tmp = va_arg (ap, char*);
-		if (NULL == tmp) break;
-		x = iks_find (x, tmp);
-		if (!x) {
-			PR_TEST;
-			printf ("Tag <%s> is not a child of tag <%s>\n", tmp, name);
-			exit (1);
-		}
-	}
-	if (iks_strcmp ( iks_cdata (iks_child (x)), data) != 0) {
-		PR_TEST;
-		printf ("CDATA [%s] not found.\n", data);
-		exit (1);
-	}
-	va_end (ap);
-}
-
-void
-attrib (char *att, char *val, ...)
-{
-	iks *x;
-	va_list ap;
-
-	x = my_x;
-	va_start (ap, val);
-	while (1) {
-		char *name = iks_name (x);
-		char *tmp = va_arg (ap, char*);
-		if (NULL == tmp) break;
-		x = iks_find (x, tmp);
-		if (!x) {
-			PR_TEST;
-			printf ("Tag <%s> is not a child of tag <%s>\n", tmp, name);
-			exit (1);
-		}
-	}
-	if (iks_strcmp (val, iks_find_attrib (x, att)) != 0) {
-		PR_TEST;
-		printf ("Attribute '%s' not found.\n", att);
-		exit (1);
-	}
-	va_end (ap);
-}
-
-void
-string (char *xml)
-{
-	char *tmp;
-
-	tmp = iks_string (iks_stack (my_x), my_x);
-	if (iks_strcmp (tmp, xml) != 0) {
-		PR_TEST;
-		printf ("Result:   %s\n", tmp);
-		printf ("Expected: %s\n", xml);
-		exit (1);
-	}
-}
-
-static char buf[] =
-	"<presence id='JCOM_11' to='lala@j.org' type='available'><status>"
-	"&quot; &lt;online&amp;dangerous&gt; &quot;</status>meow<a><b c='d'/>"
-	"</a><test/></presence>";
-
-int main (int argc, char *argv[])
-{
-	document ("<atag></atag>");
-	string ("<atag/>");
-
-	document ("<test>lala<b>bold</b>blablabla<a><c/></a></test>");
-	tag ("b", 0);
-	tag ("c", "a", 0);
-	string ("<test>lala<b>bold</b>blablabla<a><c/></a></test>");
-
-	document (buf);
-	cdata ("\" <online&dangerous> \"", "status", 0);
-	attrib ("c", "d", "a", "b", 0);
-	tag ("test", 0);
-	string (buf);
-
-	return 0;
-}
diff --git a/libs/iksemel/test/tst-filter.c b/libs/iksemel/test/tst-filter.c
deleted file mode 100644
index 64adbd1f62..0000000000
--- a/libs/iksemel/test/tst-filter.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-#include <assert.h>
-
-#include "iksemel.h"
-
-struct {
-	iksfilter *f;
-	char *xml;
-	int nr;
-	iksFilterHook *hook[20];
-	int nr_hook;
-	iksFilterHook *call[20];
-	int nr_call;
-} tester;
-
-void
-document (char *xml)
-{
-	tester.nr++;
-	tester.xml = xml;
-	tester.nr_hook = 0;
-}
-
-void
-hook (iksFilterHook *hk)
-{
-	tester.hook[tester.nr_hook++] = hk;
-}
-
-void
-debug (void)
-{
-	int i;
-
-	printf ("Filter test %d:\n", tester.nr);
-	if (tester.nr_hook) {
-		puts ("Expected hook order:");
-		for (i = 0; i < tester.nr_hook; i++) {
-			printf (" ");
-			tester.hook[i] (NULL, NULL);
-		}
-	} else {
-		puts("No hooks expected.");
-	}
-	if (tester.nr_call) {
-		puts ("Hook order:");
-		for (i = 0; i < tester.nr_call; i++) {
-			printf (" ");
-			tester.call[i] (NULL, NULL);
-		}
-	} else {
-		puts("No hooks called.");
-	}
-	exit (1);
-}
-
-void
-test (void)
-{
-	iksparser *prs;
-	iks *x;
-	int i;
-
-	tester.nr_call = 0;
-
-	prs = iks_dom_new (&x);
-	iks_parse (prs, tester.xml, strlen (tester.xml), 1);
-	iks_parser_delete (prs);
-	iks_filter_packet (tester.f, iks_packet (x));
-	iks_delete (x);
-
-	if (tester.nr_call != tester.nr_hook) debug ();
-	for (i = 0; i < tester.nr_hook; i++) {
-		if (tester.call[i] != tester.hook[i]) debug ();
-	}
-}
-
-#define DEBUG(x) if (NULL == pak) { puts ( (x) ); return IKS_FILTER_PASS; }
-
-int
-on_msg (void *user_data, ikspak *pak)
-{
-	DEBUG ("on_msg");
-	assert (IKS_PAK_MESSAGE == pak->type);
-	tester.call[tester.nr_call++] = on_msg;
-	return IKS_FILTER_PASS;
-}
-
-int
-on_iq (void *user_data, ikspak *pak)
-{
-	DEBUG ("on_iq");
-	assert (IKS_PAK_IQ == pak->type);
-	tester.call[tester.nr_call++] = on_iq;
-	return IKS_FILTER_PASS;
-}
-
-int
-on_iq_result (void *user_data, ikspak *pak)
-{
-	DEBUG ("on_iq_result");
-	assert (IKS_PAK_IQ == pak->type);
-	assert (IKS_TYPE_RESULT == pak->subtype);
-	tester.call[tester.nr_call++] = on_iq_result;
-	return IKS_FILTER_PASS;
-}
-
-int
-on_iq_result_id_auth (void *user_data, ikspak *pak)
-{
-	DEBUG ("on_iq_result_id_auth");
-	assert (IKS_PAK_IQ == pak->type);
-	assert (IKS_TYPE_RESULT == pak->subtype);
-	assert (iks_strcmp (pak->id, "auth") == 0);
-	tester.call[tester.nr_call++] = on_iq_result_id_auth;
-	return IKS_FILTER_PASS;
-}
-
-int
-on_id_auth (void *user_data, ikspak *pak)
-{
-	DEBUG ("on_id_auth");
-	assert (iks_strcmp (pak->id, "auth") == 0);
-	tester.call[tester.nr_call++] = on_id_auth;
-	return IKS_FILTER_PASS;
-}
-
-int
-on_from_patrician (void *user_data, ikspak *pak)
-{
-	DEBUG ("on_from_patrician");
-	assert (iks_strcmp (pak->from->partial, "patrician@morpork.gov") == 0);
-	tester.call[tester.nr_call++] = on_from_patrician;
-	return IKS_FILTER_PASS;
-}
-
-int
-on_msg_chat_from_patrician (void *user_data, ikspak *pak)
-{
-	DEBUG ("on_msg_chat_from_patrician");
-	assert (pak->type == IKS_PAK_MESSAGE);
-	assert (pak->subtype == IKS_TYPE_CHAT);
-	assert (iks_strcmp (pak->from->partial, "patrician@morpork.gov") == 0);
-	tester.call[tester.nr_call++] = on_msg_chat_from_patrician;
-	return IKS_FILTER_PASS;
-}
-
-int
-on_id_albatros (void *user_data, ikspak *pak)
-{
-	DEBUG ("on_id_albatros");
-	assert (iks_strcmp (pak->id, "albatros") == 0);
-	tester.call[tester.nr_call++] = on_id_albatros;
-	return IKS_FILTER_PASS;
-}
-
-int
-on_from_dean (void *user_data, ikspak *pak)
-{
-	DEBUG ("on_from_dean");
-	assert (iks_strcmp (pak->from->partial, "dean@unseen.edu") == 0);
-	tester.call[tester.nr_call++] = on_from_dean;
-	return IKS_FILTER_PASS;
-}
-
-int
-main (int argc, char *argv[])
-{
-	tester.f = iks_filter_new ();
-	iks_filter_add_rule (tester.f, on_msg, 0,
-		IKS_RULE_TYPE, IKS_PAK_MESSAGE,
-		IKS_RULE_DONE);
-	iks_filter_add_rule (tester.f, on_iq, 0,
-		IKS_RULE_TYPE, IKS_PAK_IQ,
-		IKS_RULE_DONE);
-	iks_filter_add_rule (tester.f, on_iq_result, 0,
-		IKS_RULE_TYPE, IKS_PAK_IQ,
-		IKS_RULE_SUBTYPE, IKS_TYPE_RESULT,
-		IKS_RULE_DONE);
-	iks_filter_add_rule (tester.f, on_iq_result_id_auth, 0,
-		IKS_RULE_TYPE, IKS_PAK_IQ,
-		IKS_RULE_SUBTYPE, IKS_TYPE_RESULT,
-		IKS_RULE_ID, "auth",
-		IKS_RULE_DONE);
-	iks_filter_add_rule (tester.f, on_id_auth, 0,
-		IKS_RULE_ID, "auth",
-		IKS_RULE_DONE);
-	iks_filter_add_rule (tester.f, on_from_dean, 0,
-		IKS_RULE_FROM_PARTIAL, "dean@unseen.edu",
-		IKS_RULE_DONE);
-	iks_filter_add_rule (tester.f, on_from_patrician, 0,
-		IKS_RULE_FROM_PARTIAL, "patrician@morpork.gov",
-		IKS_RULE_DONE);
-	iks_filter_add_rule (tester.f, on_msg_chat_from_patrician, 0,
-		IKS_RULE_TYPE, IKS_PAK_MESSAGE,
-		IKS_RULE_SUBTYPE, IKS_TYPE_CHAT,
-		IKS_RULE_FROM_PARTIAL, "patrician@morpork.gov",
-		IKS_RULE_DONE);
-	iks_filter_add_rule (tester.f, on_id_albatros, 0,
-		IKS_RULE_ID, "albatros",
-		IKS_RULE_DONE);
-
-	document ("<message from='dean@unseen.edu' id='1234'><body>Born to Rune.</body></message>");
-	hook (on_from_dean);
-	hook (on_msg);
-	test ();
-
-	document ("<presence from='librarian@unseen.edu' show='away'/>");
-	test ();
-
-	document ("<message from='rincewind@unseen.edu' type='chat' id='albatros'><body>yaaargh</body></message>");
-	hook (on_id_albatros);
-	hook (on_msg);
-	test ();
-
-	document ("<iq type='get' from='rincewind@unseen.edu'><query xmlns='jabber:time'/></iq>");
-	hook (on_iq);
-	test ();
-
-	document ("<message from='patrician@morpork.gov'><body>so you admit it?</body></message>");
-	hook (on_from_patrician);
-	hook (on_msg);
-	test ();
-
-	document ("<iq type='result' from='rincewind@unseen.edu'><query xmlns='jabber:version'><name>cabbar</name><version>1.0</version></query></iq>");
-	hook (on_iq_result);
-	hook (on_iq);
-	test ();
-
-	document ("<presence from='dean@unseen.edu/psi' type='unavailable'/>");
-	hook (on_from_dean);
-	test ();
-
-	document ("<message from='patrician@morpork.gov' type='chat' id='albatros'><body>hmm</body></message>");
-	hook (on_id_albatros);
-	hook (on_msg_chat_from_patrician);
-	hook (on_from_patrician);
-	hook (on_msg);
-	test ();
-
-	document ("<iq type='result' id='auth'/>");
-	hook (on_iq_result_id_auth);
-	hook (on_id_auth);
-	hook (on_iq_result);
-	hook (on_iq);
-	test ();
-
-	iks_filter_delete (tester.f);
-
-	return 0;
-}
diff --git a/libs/iksemel/test/tst-iks.c b/libs/iksemel/test/tst-iks.c
deleted file mode 100644
index 5573b07e3d..0000000000
--- a/libs/iksemel/test/tst-iks.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-
-#include "iksemel.h"
-
-int main (int argc, char *argv[])
-{
-	static char xml[] =
-		"<iq type='result' to='ydobon@jabber.org'><query xmlns='jabber:iq:version'>"
-		"<name>TestClient</name><os>SuxOS 2000</os><version><stable solidity='rock'/>"
-		"1.2.0 patchlevel 2</version></query></iq>";
-	static char xml2[] =
-		"<Ni><C/>lala<br/><A/>Hello World<B/></Ni>";
-	iks *x, *y, *z;
-	char *t;
-
-	setlocale (LC_ALL, "");
-
-	x = iks_new ("iq");
-	iks_insert_attrib (x, "type", "resultypo");
-	iks_insert_attrib (x, "type", "result");
-	iks_insert_attrib (x, "to", "ydobon@jabber.org");
-	y = iks_new_within ("query", iks_stack (x));
-	iks_insert_cdata (iks_insert (y, "name"), "TestClient", 10);
-	iks_insert_cdata (iks_insert (y, "os"), "SuxOS", 0);
-	z = iks_insert (y, "version");
-	iks_insert (z, "stable");
-	iks_insert_cdata (z, "1.2", 3);
-	iks_insert_cdata (z, ".0 patchlevel 2", 0);
-	iks_insert_node (x, y);
-	z = iks_find (y, "os");
-	iks_insert_attrib (z, "error", "yes");
-	iks_insert_attrib (z, "error", NULL);
-	iks_insert_cdata (z, " 2000", 5);
-	z = iks_next (z);
-	z = iks_find (z, "stable");
-	iks_insert_attrib (z, "solidity", "rock");
-	z = iks_parent (iks_parent (z));
-	iks_insert_attrib (z, "xmlns", "jabber:iq:version");
-
-	t = iks_string (iks_stack (x), x);
-	if(!t || strcmp(t, xml) != 0) {
-		printf("Result:   %s\n", t);
-		printf("Expected: %s\n", xml);
-		return 1;
-	}
-	iks_delete(x);
-
-
-	x = iks_new ("Ni");
-	y = iks_insert (x, "br");
-	z = iks_prepend_cdata (y, "lala", 4);
-	iks_prepend (z, "C");
-	z = iks_insert_cdata (x, "Hello", 5);
-	y = iks_append (z, "B");
-	iks_prepend (z, "A");
-	iks_append_cdata (z, " ", 1);
-	iks_prepend_cdata (y, "World", 5);
-
-	t = iks_string (iks_stack (x), x);
-	if(!t || strcmp(t, xml2) != 0) {
-		printf("Result:   %s\n", t);
-		printf("Expected: %s\n", xml2);
-		return 1;
-	}
-	iks_delete(x);
-
-	return 0;
-}
diff --git a/libs/iksemel/test/tst-ikstack.c b/libs/iksemel/test/tst-ikstack.c
deleted file mode 100644
index d123e20047..0000000000
--- a/libs/iksemel/test/tst-ikstack.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2004 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "iksemel.h"
-
-struct align_test { char a; double b; };
-#define DEFAULT_ALIGNMENT  ((size_t) ((char *) &((struct align_test *) 0)->b - (char *) 0))
-#define ALIGN_MASK ( DEFAULT_ALIGNMENT - 1 )
-
-const char buf[] = "1234567890abcdefghijklmnopqrstuv";
-
-void
-test_stack (int cs)
-{
-	ikstack *s;
-	char *mem, *old;
-	int i;
-
-	s = iks_stack_new (cs, cs);
-	old = NULL;
-	for (i = 0; i < strlen (buf); i++) {
-		iks_stack_strdup (s, buf, i);
-		mem = iks_stack_alloc (s, i);
-		if (((unsigned long) mem) & ALIGN_MASK) {
-			printf ("ikstack bug, addr %p should be a multiply of %d\n",
-				mem, DEFAULT_ALIGNMENT);
-			exit (1);
-		}
-		memset (mem, 'x', i);
-		old = iks_stack_strcat (s, old, 0, buf + i, 1);
-	}
-	if (old && strcmp (old, buf) != 0) {
-		printf ("ikstack strcat bug:\nExpected: %s\n  Result: %s\n", buf, old);
-		exit (1);
-	}
-	iks_stack_delete (&s);
-}
-
-int main (int argc, char *argv[])
-{
-	test_stack (0);
-	test_stack (16);
-	test_stack (237);
-	test_stack (1024);
-
-	return 0;
-}
diff --git a/libs/iksemel/test/tst-jid.c b/libs/iksemel/test/tst-jid.c
deleted file mode 100644
index a3899db976..0000000000
--- a/libs/iksemel/test/tst-jid.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-
-#include "iksemel.h"
-
-ikstack *my_stack;
-
-void
-print_id (iksid *id)
-{
-	printf (" Full: [%s]\n Partial: [%s]\n User: [%s]\n Server: [%s]\n Resource: [%s]\n",
-		id->full, id->partial, id->user, id->server, id->resource);
-}
-
-#define BUG(x) { print_id ( (x) ); exit (1); }
-
-void
-test_id (char *id, char *partial, char *user, char *server, char *resource)
-{
-	iksid *a;
-
-	a = iks_id_new (my_stack, id);
-	if ((a->partial || partial) && iks_strcmp (a->partial, partial) != 0) BUG(a);
-	if ((a->user || user) && iks_strcmp (a->user, user) != 0) BUG(a);
-	if ((a->server || server) && iks_strcmp (a->server, server) != 0) BUG(a);
-	if ((a->resource || resource) && iks_strcmp (a->resource, resource) != 0) BUG(a);
-}
-
-void
-test_cmp (char *stra, char *strb, int parts, int diff)
-{
-	iksid *a, *b;
-
-	a = iks_id_new (my_stack, stra);
-	b = iks_id_new (my_stack, strb);
-	if (diff != iks_id_cmp (a, b, parts)) exit (1);
-}
-
-int main (int argc, char *argv[])
-{
-	my_stack = iks_stack_new (1024, 1024);
-
-	test_id ("jabber:madcat@jabber.org/cabbar", "madcat@jabber.org", "madcat", "jabber.org", "cabbar");
-	test_id ("bob@silent.org", "bob@silent.org", "bob", "silent.org", NULL);
-
-	test_cmp ("dante@jabber.org/hell", "dante@jabber.org/heaven", IKS_ID_PARTIAL, 0);
-	test_cmp ("madcat@jabber.org/cabbar", "madcat@jabber.org/jabberx", IKS_ID_FULL, IKS_ID_RESOURCE);
-	test_cmp ("dean@unseen.edu/pda", "librarian@unseen.edu/jabberx", IKS_ID_FULL, IKS_ID_USER | IKS_ID_RESOURCE);
-	test_cmp ("patrician@morpork.gov/gabber", "cohen@guild.org/gsm", IKS_ID_FULL, IKS_ID_FULL);
-	test_cmp ("peter@family.com", "peter@family.com/clam", IKS_ID_PARTIAL, 0);
-
-	iks_stack_delete (&my_stack);
-
-	return 0;
-}
diff --git a/libs/iksemel/test/tst-md5.c b/libs/iksemel/test/tst-md5.c
deleted file mode 100644
index 82584ae167..0000000000
--- a/libs/iksemel/test/tst-md5.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2004 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "iksemel.h"
-
-int main (int argc, char *argv[])
-{
-	struct lala {
-		char *str;
-		char *hash;
-	} known_hashes[] = {
-		{ "abc", "900150983cd24fb0d6963f7d28e17f72" },
-		{ "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
-		  "57edf4a22be3c955ac49da2e2107b67a" },
-		{ NULL, NULL }
-	};
-	int i = 0;
-	char buf[33];
-
-	while (known_hashes[i].str) {
-		iks_md5 (known_hashes[i].str, buf);
-		if (strcmp (buf, known_hashes[i].hash) != 0) {
-			printf("MD5 hash of \"%s\"\n", known_hashes[i].str);
-			printf(" Result:   %s\n", buf);
-			printf(" Expected: %s\n", known_hashes[i].hash);
-			return 1;
-		}
-		i++;
-	}
-	return 0;
-}
diff --git a/libs/iksemel/test/tst-sax.c b/libs/iksemel/test/tst-sax.c
deleted file mode 100644
index c0a041aee1..0000000000
--- a/libs/iksemel/test/tst-sax.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "iksemel.h"
-
-struct element_s {
-	struct element_s *next;
-	enum ikstype type;
-
-	enum ikstagtype tag;
-	char *name;
-	int nr_atts;
-	char *atts[10];
-	char *vals[10];
-
-	char *cdata;
-	int len;
-};
-
-struct {
-	char *doc;
-	int len;
-	struct element_s *elements;
-	struct element_s *last_element;
-	struct element_s *cur;
-	int nr_tests;
-	int nr_cur;
-	int blocksize;
-} tester;
-
-void
-document (char *xml)
-{
-	if (tester.elements) {
-		struct element_s *tmp;
-		for (; tester.elements; tester.elements = tmp) {
-			tmp = tester.elements->next;
-			free (tester.elements);
-		}
-	}
-	tester.doc = xml;
-	tester.len = strlen (xml);
-	tester.elements = NULL;
-	tester.last_element = NULL;
-	tester.nr_tests++;
-}
-
-void
-element (enum ikstype type, ...)
-{
-	struct element_s *el;
-	va_list ap;
-	char *tmp;
-
-	el = malloc (sizeof (struct element_s));
-	memset (el, 0, sizeof (struct element_s));
-	el->type = type;
-
-	va_start (ap, type);
-	switch (type) {
-		case IKS_TAG:
-			el->tag = va_arg (ap, int);
-			el->name = va_arg (ap, char*);
-			if (IKS_CLOSE == el->tag) break;
-			while (1) {
-				tmp = va_arg (ap, char*);
-				if (tmp) {
-					el->atts[el->nr_atts] = tmp;
-					el->vals[el->nr_atts] = va_arg (ap, char*);
-					el->nr_atts++;
-				} else {
-					break;
-				}
-			}
-			break;
-		case IKS_CDATA:
-			tmp = va_arg (ap, char*);
-			el->cdata = tmp;
-			el->len = strlen (tmp);
-			break;
-		case IKS_NONE:
-		case IKS_ATTRIBUTE:
-			puts ("invalid element() call");
-			exit (1);
-	}
-	va_end (ap);
-
-	if (NULL == tester.elements) tester.elements = el;
-	if (tester.last_element) tester.last_element->next = el;
-	tester.last_element = el;
-}
-
-#define PRINT_TEST 	printf ("Sax test %d, blocksize %d, element %d:\n", tester.nr_tests, tester.blocksize, tester.nr_cur)
-#define NEXT_ELEM { tester.cur = tester.cur->next; tester.nr_cur++; }
-
-void
-debug_tag (enum ikstagtype type, char *name, char **atts)
-{
-	int i;
-
-	PRINT_TEST;
-	if (tester.cur && tester.cur->type == IKS_TAG) {
-		switch (tester.cur->tag) {
-			case IKS_OPEN:
-				printf ("  Expecting tag <%s>\n", tester.cur->name);
-				break;
-			case IKS_CLOSE:
-				printf ("  Expecting tag </%s>\n", tester.cur->name);
-				break;
-			case IKS_SINGLE:
-				printf ("  Expecting tag <%s/>\n", tester.cur->name);
-				break;
-		}
-		for (i = 0; i < tester.cur->nr_atts; i++) {
-			printf ("    %s='%s'\n", tester.cur->atts[i], tester.cur->vals[i]);
-		}
-	} else {
-		printf ("  Not expecting a tag here.\n");
-	}
-	switch (type) {
-		case IKS_OPEN:
-			printf ("  Got tag <%s>\n", name);
-			break;
-		case IKS_CLOSE:
-			printf ("  Got tag </%s>\n", name);
-			break;
-		case IKS_SINGLE:
-			printf ("  Got tag <%s/>\n", name);
-			break;
-	}
-	i = 0;
-	while (atts && atts[i]) {
-		printf ("    %s='%s'\n", atts[i], atts[i+1]);
-		i += 2;
-	}
-}
-
-#define TAG_FAIL { debug_tag (type,name,atts); exit (1); }
-
-int
-tagHook (void *udata, char *name, char **atts, int type)
-{
-	int nr, i, flag;
-
-	if (!tester.cur) TAG_FAIL;
-	if (tester.cur->type != IKS_TAG) TAG_FAIL;
-	if (tester.cur->tag != type) TAG_FAIL;
-	if (iks_strcmp (tester.cur->name, name) != 0) TAG_FAIL;
-	if (!atts && tester.cur->nr_atts > 0) TAG_FAIL;
-	if (atts && tester.cur->nr_atts == 0) TAG_FAIL;
-
-	nr = tester.cur->nr_atts;
-	while (nr) {
-		flag = 0;
-		for (i = 0;atts&&atts[i]; i+= 2) {
-			if (iks_strcmp (atts[i], tester.cur->atts[nr-1]) == 0 && iks_strcmp (atts[i+1], tester.cur->vals[nr-1]) == 0) {
-				flag = 1;
-				break;
-			}
-		}
-		if (flag == 0) TAG_FAIL;
-		nr--;
-	}
-
-	NEXT_ELEM;
-	return IKS_OK;
-}
-
-void
-debug_cdata (char *data, size_t len, int pos)
-{
-	int i;
-
-	PRINT_TEST;
-	if (tester.cur && tester.cur->type == IKS_CDATA)
-		printf ("  Expecting cdata [%s]\n", tester.cur->cdata);
-	else
-		printf ("  Not expecting cdata here\n");
-	printf ("  Got cdata [");
-	for (i = 0; i < len; i++) putchar (data[i]);
-	printf ("] at the pos %d.\n", pos);
-}
-
-#define CDATA_FAIL { debug_cdata (data, len, pos); exit (1); }
-
-int
-cdataHook (void *udata, char *data, size_t len)
-{
-	static int pos = 0;
-
-	if (!tester.cur) CDATA_FAIL;
-	if (tester.cur->type != IKS_CDATA) CDATA_FAIL;
-	if (iks_strncmp (tester.cur->cdata + pos, data, len) != 0) CDATA_FAIL;
-	pos += len;
-	if (pos > tester.cur->len) CDATA_FAIL;
-	if (pos == tester.cur->len) {
-		pos = 0;
-		NEXT_ELEM;
-	}
-	return IKS_OK;
-}
-
-void
-test_size (int blocksize)
-{
-	enum ikserror err;
-	iksparser *prs;
-	int i, len;
-
-	tester.cur = tester.elements;
-	tester.nr_cur = 1;
-	tester.blocksize = blocksize;
-	len = tester.len;
-
-	prs = iks_sax_new (NULL, tagHook, cdataHook);
-	i = 0;
-	if (0 == blocksize) blocksize = len;
-	while (i < len) {
-		if (i + blocksize > len) blocksize = len - i;
-		err = iks_parse (prs, tester.doc + i, blocksize, 0);
-		switch (err) {
-			case IKS_OK:
-				break;
-			case IKS_NOMEM:
-				exit (1);
-			case IKS_BADXML:
-				PRINT_TEST;
-				printf ("Invalid xml at byte %ld in\n[%s]\n", iks_nr_bytes (prs), tester.doc);
-				exit (1);
-			case IKS_HOOK:
-				exit (1);
-		}
-		i += blocksize;
-	}
-	if (tester.cur) exit (1);
-	iks_parser_delete (prs);
-}
-
-void
-test (void)
-{
-	int i;
-
-	for (i = 0; i < tester.len; i++) {
-		test_size (i);
-	}
-}
-
-void
-test_bad (int badbyte)
-{
-	iksparser *p;
-	enum ikserror err;
-
-	p = iks_sax_new (NULL, NULL, NULL);
-	err = iks_parse (p, tester.doc, tester.len, 1);
-	switch (err) {
-		case IKS_OK:
-			break;
-		case IKS_NOMEM:
-			exit (1);
-		case IKS_BADXML:
-			if (iks_nr_bytes (p) == badbyte) return;
-			break;
-		case IKS_HOOK:
-			exit (1);
-	}
-	printf ("Sax test %d:\n", tester.nr_tests);
-	printf ("Expected bad byte %d, got %ld in\n[%s]\n", badbyte, iks_nr_bytes (p), tester.doc);
-	exit (1);
-}
-
-int
-main (int argc, char *argv[])
-{
-	document ("<lonely/>");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
-	test ();
-
-	document ("<?xml version='1.0'?><parent><child/><child/>child</parent>");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_CDATA, "child");
-	element (IKS_TAG, IKS_CLOSE, "parent");
-	test ();
-
-	document ("<mytag abc='123' id=\"XC72\"></mytag>");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
-	element (IKS_TAG, IKS_CLOSE, "mytag");
-	test ();
-
-	document ("<body>I&apos;m fixing parser&amp;tester for &quot;&lt;&quot; and &quot;&gt;&quot; chars.</body>");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
-	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
-	element (IKS_TAG, IKS_CLOSE, "body");
-	test ();
-
-	document ("<tag a='1' b='2' c='3' d='4' e='5' f='6' g='7' id='xyz9'><sub></sub></tag>");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
-	element (IKS_TAG, IKS_CLOSE, "sub");
-	element (IKS_TAG, IKS_CLOSE, "tag");
-	test ();
-
-	document ("<item url='http://jabber.org'><!-- little comment -->Jabber Site</item>");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
-	element (IKS_CDATA, "Jabber Site");
-	element (IKS_TAG, IKS_CLOSE, "item");
-	test ();
-
-	document ("<index><!-- <item> - tag has no childs --><item name='lala' page='42'/></index>");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
-	element (IKS_TAG, IKS_CLOSE, "index");
-	test ();
-
-	document ("<ka>1234<![CDATA[ <ka> lala ] ]] ]]] ]]>4321</ka>");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
-	element (IKS_CDATA, "1234 <ka> lala ] ]] ]]] 4321");
-	element (IKS_TAG, IKS_CLOSE, "ka");
-	test ();
-
-	document ("<test><standalone be='happy'/>abcd<br/>&lt;escape&gt;</test>");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
-	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
-	element (IKS_CDATA, "<escape>");
-	element (IKS_TAG, IKS_CLOSE, "test");
-	test ();
-
-	document ("<a><b>john&amp;mary<c><d e='f' g='123456' h='madcat' klm='nop'/></c></b></a>");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
-	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
-	test ();
-
-	document ("<test>\xFF</test>");
-	test_bad (6);
-
-	document ("<t\0></t>");
-	tester.len = 8;
-	test_bad (2);
-
-	document ("<a><b/><c></c/></a>");
-	test_bad (13);
-
-	document ("<e><!-- -- --></e>");
-	test_bad (10);
-
-	document ("<g><test a='123'/ b='lala'></g>");
-	test_bad (17);
-
-	document ("<ha><!-- <lala> --><!- comment -></ha>");
-	test_bad (22);
-
-	document ("<lol>&lt;<&gt;</lol>");
-	test_bad (16);
-
-	document ("<a>\xC0\x80</a>");
-	test_bad (3);
-
-	document ("<\x8F\x85></\x8F\x85>");
-	test_bad (1);
-
-	document ("<utf8>\xC1\x80<br/>\xED\x95\x9C\xEA\xB5\xAD\xEC\x96\xB4<err>\xC1\x65</err></utf8>");
-	test_bad (28);
-
-	return 0;
-}
diff --git a/libs/iksemel/test/tst-sha.c b/libs/iksemel/test/tst-sha.c
deleted file mode 100644
index ff6b3e373e..0000000000
--- a/libs/iksemel/test/tst-sha.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "iksemel.h"
-
-int main (int argc, char *argv[])
-{
-	struct lala {
-		char *str;
-		char *hash;
-	} known_hashes[] = {
-		{ "abc", "a9993e364706816aba3e25717850c26c9cd0d89d" },
-		{ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-		  "84983e441c3bd26ebaae4aa1f95129e5e54670f1" },
-		{ NULL, NULL }
-	};
-	int i = 0;
-	char buf[42];
-
-	while (known_hashes[i].str) {
-		iks_sha (known_hashes[i].str, buf);
-		if (strcmp (buf, known_hashes[i].hash) != 0) {
-			printf("SHA1 hash of \"%s\"\n", known_hashes[i].str);
-			printf(" Result:   %s\n", buf);
-			printf(" Expected: %s\n", known_hashes[i].hash);
-			return 1;
-		}
-		i++;
-	}
-	return 0;
-}
diff --git a/libs/iksemel/tools/Makefile.am b/libs/iksemel/tools/Makefile.am
deleted file mode 100644
index e9e71bff83..0000000000
--- a/libs/iksemel/tools/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## Process this file with automake to produce Makefile.in
-##
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-bin_PROGRAMS = ikslint iksroster iksperf
-
-noinst_HEADERS = perf.h
-
-ikslint_LDADD = $(top_builddir)/src/libiksemel.la @SUNCFLAGS@
-ikslint_SOURCES = ikslint.c hash.c
-
-iksroster_LDADD = $(top_builddir)/src/libiksemel.la @SUNCFLAGS@
-iksroster_SOURCES = iksroster.c
-
-iksperf_LDADD = $(top_builddir)/src/libiksemel.la @SUNCFLAGS@
-iksperf_SOURCES = iksperf.c perf.c
diff --git a/libs/iksemel/tools/hash.c b/libs/iksemel/tools/hash.c
deleted file mode 100644
index c4b1179a87..0000000000
--- a/libs/iksemel/tools/hash.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-static unsigned int
-hash_str (const char *str)
-{
-	const char *p;
-	unsigned int h = 0;
-
-	for (p = str; *p != '\0'; p++) {
-		h = ( h << 5 ) - h + *p;
-	}
-	return h;
-}
-
-struct item {
-	char *name;
-	unsigned int count;
-	struct item *next;
-};
-
-struct hash_s {
-	struct item **table;
-	unsigned int size;
-	unsigned int count;
-	ikstack *s;
-};
-
-typedef struct hash_s hash;
-
-hash *
-hash_new (unsigned int table_size)
-{
-	hash *h;
-
-	h = malloc (sizeof (struct hash_s));
-	if (!h) return NULL;
-	h->table = calloc (sizeof (struct item *), table_size);
-	if (!h->table) {
-		free (h);
-		return NULL;
-	}
-	h->s = iks_stack_new (sizeof (hash) * 128, 8192);
-	if (!h->s) {
-		free (h->table);
-		free (h);
-		return NULL;
-	}
-	h->size = table_size;
-	h->count = 0;
-
-	return h;
-}
-
-char *
-hash_insert (hash *h, const char *name)
-{
-	struct item *t, *p;
-	unsigned int val;
-
-	val = hash_str (name) % h->size;
-	h->count++;
-
-	for (t = h->table[val]; t; t = t->next) {
-		if (strcmp (t->name, name) == 0)
-			break;
-	}
-	if (NULL == t) {
-		t = iks_stack_alloc (h->s, sizeof (struct item));
-		if (!t) return NULL;
-		t->name = iks_stack_strdup (h->s, name, 0);
-		t->count = 0;
-		t->next = NULL;
-		p = h->table[val];
-		if (!p) {
-			h->table[val] = t;
-		} else {
-			while (1) {
-				if (p->next == NULL) {
-					p->next = t;
-					break;
-				}
-				p = p->next;
-			}
-		}
-	}
-	t->count++;
-
-	return t->name;
-}
-
-static int
-my_cmp (const void *a, const void *b)
-{
-	unsigned int c1, c2;
-
-	c1 = (*(struct item **)a)->count;
-	c2 = (*(struct item **)b)->count;
-
-	if (c1 > c2)
-		return -1;
-	else if (c1 == c2)
-		return 0;
-	else
-		return 1;
-}
-
-void
-hash_print (hash *h, char *title_fmt, char *line_fmt)
-{
-	struct item **tags, *t;
-	unsigned int i = 0, pos = 0;
-
-	tags = calloc (sizeof (struct item *), h->count);
-
-	for (; i < h->size; i ++) {
-		for (t = h->table[i]; t; t = t->next) {
-			tags[pos++] = t;
-		}
-	}
-
-	qsort (tags, pos, sizeof (struct item *), my_cmp);
-
-	printf (title_fmt, pos);
-	for (i = 0; i < pos; i++) {
-		printf (line_fmt, tags[i]->name, tags[i]->count);
-	}
-
-	free (tags);
-}
-
-void
-hash_delete (hash *h)
-{
-	iks_stack_delete (h->s);
-	free (h->table);
-	free (h);
-}
diff --git a/libs/iksemel/tools/ikslint.c b/libs/iksemel/tools/ikslint.c
deleted file mode 100644
index 0b655d2df4..0000000000
--- a/libs/iksemel/tools/ikslint.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-struct hash_s;
-typedef struct hash_s hash;
-
-hash *hash_new (unsigned int table_size);
-char *hash_insert (hash *table, const char *name);
-void hash_print (hash *h, char *title_fmt, char *line_fmt);
-void hash_delete (hash *table);
-
-#include <sys/stat.h>
-
-#ifdef HAVE_GETOPT_LONG
-#include <getopt.h>
-#endif
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longopts[] = {
-	{ "stats", 0, 0, 's' },
-	{ "histogram", 0, 0, 't' },
-	{ "help", 0, 0, 'h' },
-	{ "version", 0, 0, 'V' },
-	{ 0, 0, 0, 0 }
-};
-#endif
-
-static char *shortopts = "sthV";
-
-static void
-print_usage (void)
-{
-	puts ("Usage: ikslint [OPTIONS] FILE\n"
-		"This tool checks the well-formedness of an XML document.\n"
-		" -s, --stats      Print statistics.\n"
-		" -t, --histogram  Print tag histogram.\n"
-		" -h, --help       Print this text and exit.\n"
-		" -V, --version    Print version and exit.\n"
-#ifndef HAVE_GETOPT_LONG
-		"(long options are not supported on your system)\n"
-#endif
-		"Report bugs to <iksemel-dev@jabberstudio.org>.");
-}
-
-/* calculate and print statistics */
-int lint_pr_stats = 0;
-
-/* print tag histogram */
-int lint_pr_hist = 0;
-
-hash *tag_table;
-
-char **tag_list;
-int tag_size, tag_pos;
-
-void
-tag_push (const char *name)
-{
-	if (!tag_list) {
-		tag_size = 128;
-		tag_list = malloc (sizeof (char *) * tag_size);
-		if (!tag_list) exit (2);
-	}
-	tag_list[tag_pos] = hash_insert (tag_table, name);
-	if (!tag_list[tag_pos]) exit (2);
-	tag_pos++;
-	if (tag_pos == tag_size) {
-		char **tmp;
-		tmp = malloc (sizeof (char *) * tag_size * 2);
-		if (!tmp) exit (2);
-		memcpy (tmp, tag_list, sizeof (char *) * tag_size);
-		free (tag_list);
-		tag_list = tmp;
-		tag_size *= 2;
-	}
-}
-
-char *
-tag_pull (void)
-{
-	tag_pos--;
-	return tag_list[tag_pos];
-}
-
-struct stats {
-	unsigned int level;
-	unsigned int max_depth;
-	unsigned int nr_tags;
-	unsigned int nr_stags;
-	unsigned int cdata_size;
-};
-
-int
-tagHook (void *udata, char *name, char **atts, int type)
-{
-	struct stats *st = (struct stats *) udata;
-	char *tmp;
-
-	switch (type) {
-		case IKS_OPEN:
-			tag_push (name);
-			st->level++;
-			if (st->level > st->max_depth) st->max_depth = st->level;
-			break;
-		case IKS_CLOSE:
-			tmp = tag_pull ();
-			if (iks_strcmp (tmp, name) != 0) {
-				fprintf (stderr, "Tag mismatch, expecting '%s', got '%s'.\n",
-					tmp, name);
-				return IKS_HOOK;
-			}
-			st->level--;
-			st->nr_tags++;
-			break;
-		case IKS_SINGLE:
-			if (NULL == hash_insert (tag_table, name)) exit (2);
-			st->nr_stags++;
-			break;
-	}
-	return IKS_OK;
-}
-
-int
-cdataHook (void *udata, char *data, size_t len)
-{
-	struct stats *st = (struct stats *) udata;
-
-	st->cdata_size += len;
-	return IKS_OK;
-}
-
-void
-check_file (char *fname)
-{
-	iksparser *prs;
-	struct stats st;
-	FILE *f;
-	char *buf;
-	struct stat fs;
-	size_t sz, blk, ret, pos;
-	enum ikserror err;
-	int done;
-
-	memset (&st, 0, sizeof (struct stats));
-	prs = iks_sax_new (&st, tagHook, cdataHook);
-	if (NULL == prs) exit (2);
-
-	if (fname) {
-		if (stat (fname, &fs) != 0) {
-			fprintf (stderr, "Cannot access file '%s'.\n", fname);
-			exit (1);
-		}
-		sz = fs.st_size;
-#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
-		blk = fs.st_blksize;
-#else
-		blk = 4096;
-#endif
-		f = fopen (fname, "r");
-		if (!f) {
-			fprintf (stderr, "Cannot open file '%s'.\n", fname);
-			exit (1);
-		}
-		buf = malloc (blk);
-		if (!buf) {
-			fclose (f);
-			fprintf (stderr, "Cannot allocate %d bytes.\n", blk);
-			exit (2);
-		}
-	} else {
-		f = stdin;
-		blk = 4096;
-		sz = 0;
-		buf = malloc (blk);
-		if (!buf) exit (2);
-	}
-
-	tag_table = hash_new (367);
-	if (!tag_table) exit (2);
-
-	pos = 0;
-	done = 0;
-	while (0 == done) {
-		ret = fread (buf, 1, blk, f);
-		pos += ret;
-		if (feof (f)) {
-			done = 1;
-		} else {
-			if (ret != blk) {
-				if (fname)
-					fprintf (stderr, "Read error in file '%s'.\n", fname);
-				else
-					fprintf (stderr, "Read error in stream.\n");
-				exit (1);
-			}
-		}
-		err = iks_parse (prs, buf, ret, done);
-		switch (err) {
-			case IKS_OK:
-				break;
-			case IKS_NOMEM:
-				exit (2);
-			case IKS_BADXML:
-				if (fname)
-					fprintf (stderr, "Invalid xml at byte %ld, line %ld in file '%s'.\n",
-						iks_nr_bytes (prs), iks_nr_lines (prs), fname);
-				else
-					fprintf (stderr, "Invalid xml at byte %ld, line %ld in stream.\n",
-						iks_nr_bytes (prs), iks_nr_lines (prs));
-				exit (1);
-			case IKS_HOOK:
-				if (fname)
-					fprintf (stderr, "Byte %ld, line %ld in file '%s'.\n",
-						iks_nr_bytes (prs), iks_nr_lines (prs), fname);
-				else
-					fprintf (stderr, "Byte %ld, line %ld in stream.\n",
-						iks_nr_bytes (prs), iks_nr_lines (prs));
-				exit (1);
-		}
-	}
-
-	free (buf);
-	if (fname) fclose (f);
-
-	if (fname && (lint_pr_stats || lint_pr_hist)) {
-		printf ("File '%s' (%d bytes):\n", fname, sz);
-	}
-	if (lint_pr_stats) {
-		printf ("Tags: %d pairs, %d single, %d max depth.\n", st.nr_tags, st.nr_stags, st.max_depth);
-		printf ("Total size of character data: %d bytes.\n", st.cdata_size);
-	}
-	if (lint_pr_hist) {
-		hash_print (tag_table,
-			"Histogram of %d unique tags:\n",
-			"<%s> %d times.\n");
-	}
-	hash_delete (tag_table);
-
-	iks_parser_delete (prs);
-}
-
-int
-main (int argc, char *argv[])
-{
-	int c;
-
-#ifdef HAVE_GETOPT_LONG
-	int i;
-	while ((c = getopt_long (argc, argv, shortopts, longopts, &i)) != -1) {
-#else
-	while ((c = getopt (argc, argv, shortopts)) != -1) {
-#endif
-		switch (c) {
-			case 's':
-				lint_pr_stats = 1;
-				break;
-			case 't':
-				lint_pr_hist = 1;
-				break;
-			case 'h':
-				print_usage ();
-				exit (0);
-			case 'V':
-				puts ("ikslint (iksemel) "VERSION);
-				exit (0);
-		}
-	}
-	if (!argv[optind]) {
-		check_file (NULL);
-	} else {
-		for (; optind < argc; optind++) {
-			check_file (argv[optind]);
-		}
-	}
-
-	return 0;
-}
diff --git a/libs/iksemel/tools/iksperf.c b/libs/iksemel/tools/iksperf.c
deleted file mode 100644
index 4bcd4b3e57..0000000000
--- a/libs/iksemel/tools/iksperf.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-#include "perf.h"
-
-#include <sys/stat.h>
-
-#ifdef HAVE_GETOPT_LONG
-#include <getopt.h>
-#endif
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longopts[] = {
-	{ "all", 0, 0, 'a' },
-	{ "sax", 0, 0, 's' },
-	{ "dom", 0, 0, 'd' },
-	{ "serialize", 0, 0, 'e' },
-	{ "sha1", 0, 0, '1' },
-	{ "block", required_argument, 0, 'b' },
-	{ "memdbg", 0, 0, 'm' },
-	{ "help", 0, 0, 'h' },
-	{ "version", 0, 0, 'V' },
-	{ 0, 0, 0, 0 }
-};
-#endif
-
-static char *shortopts = "asde1b:mhV";
-
-static void
-print_usage (void)
-{
-	puts ("Usage: iksperf [OPTIONS] FILE\n"
-		"This tool measures the performance of the iksemel library.\n"
-		" -a, --all         Make all tests.\n"
-		" -s, --sax         Sax test.\n"
-		" -d, --dom         Tree generating test.\n"
-		" -e, --serialize   Tree serializing test.\n"
-		" -1, --sha1        SHA1 hashing test.\n"
-		" -b, --block SIZE  Parse the file in SIZE byte blocks.\n"
-		" -m, --memdbg      Trace malloc and free calls.\n"
-		" -h, --help        Print this text and exit.\n"
-		" -V, --version     Print version and exit.\n"
-#ifndef HAVE_GETOPT_LONG
-		"(long options are not supported on your system)\n"
-#endif
-		"Report bugs to <iksemel-dev@jabberstudio.org>.");
-}
-
-/* if not 0, file is parsed in block_size byte blocks */
-int block_size;
-
-char *load_file (const char *fname, int *sizeptr)
-{
-	FILE *f;
-	char *buf;
-	struct stat fs;
-	size_t size, ret;
-
-	if (stat (fname, &fs) != 0) {
-		fprintf (stderr, "Cannot access file '%s'.\n", fname);
-		exit (1);
-	}
-	size = fs.st_size;
-
-	printf ("Test file '%s' (%d bytes):\n", fname, size);
-
-	f = fopen (fname, "rb");
-	if (!f) {
-		fprintf (stderr, "Cannot open file.\n");
-		exit (1);
-	}
-
-	buf = malloc (size);
-	if (!buf) {
-		fclose (f);
-		fprintf (stderr, "Cannot allocate %d bytes for buffer.\n", size);
-		exit (2);
-	}
-
-	ret = fread (buf, 1, size, f);
-	if (ret < size) {
-		fprintf (stderr, "Read error in file.\n");
-		exit (1);
-	}
-
-	*sizeptr = size;
-	fclose (f);
-	return buf;
-}
-
-/* stats */
-int sax_tag;
-int sax_cdata;
-
-int
-tagHook (void *udata, char *name, char **atts, int type)
-{
-	++sax_tag;
-	return IKS_OK;
-}
-
-int
-cdataHook (void *udata, char *data, size_t len)
-{
-	++sax_cdata;
-	return IKS_OK;
-}
-
-void
-sax_test (char *buf, int len)
-{
-	unsigned long time;
-	iksparser *prs;
-	int bs, i, err;
-
-	bs = block_size;
-	if (0 == bs) bs = len;
-	sax_tag = 0;
-	sax_cdata = 0;
-
-	t_reset ();
-
-	prs = iks_sax_new (NULL, tagHook, cdataHook);
-	i = 0;
-	while (i < len) {
-		if (i + bs > len) bs = len - i;
-		err = iks_parse (prs, buf + i, bs, 0);
-		switch (err) {
-			case IKS_OK:
-				break;
-			case IKS_NOMEM:
-				exit (2);
-			case IKS_BADXML:
-				fprintf (stderr, "Invalid xml at byte %ld, line %ld\n",
-					iks_nr_bytes (prs), iks_nr_lines (prs));
-				exit (1);
-			case IKS_HOOK:
-				exit (1);
-		}
-		i += bs;
-	}
-
-	time = t_elapsed ();
-
-	printf ("SAX: parsing took %ld milliseconds.\n", time);
-	printf ("SAX: tag hook called %d, cdata hook called %d times.\n", sax_tag, sax_cdata);
-
-	iks_parser_delete (prs);
-}
-
-void dom_test (char *buf, int len)
-{
-	int bs, i, err;
-	iksparser *prs;
-	unsigned long time;
-	iks *x;
-	size_t allocated, used;
-
-	bs = block_size;
-	if (0 == bs) bs = len;
-
-	t_reset ();
-
-	prs = iks_dom_new (&x);
-	iks_set_size_hint (prs, len);
-	i = 0;
-	while (i < len) {
-		if (i + bs > len) bs = len - i;
-		err = iks_parse (prs, buf + i, bs, 0);
-		switch (err) {
-			case IKS_OK:
-				break;
-			case IKS_NOMEM:
-				exit (2);
-			case IKS_BADXML:
-				fprintf (stderr, "Invalid xml at byte %ld, line %ld\n",
-					iks_nr_bytes (prs), iks_nr_lines (prs));
-				exit (1);
-			case IKS_HOOK:
-				exit (1);
-		}
-		i += bs;
-	}
-
-	time = t_elapsed ();
-	iks_stack_stat (iks_stack (x), &allocated, &used);
-
-	printf ("DOM: parsing and building the tree took %ld milliseconds.\n", time);
-	printf ("DOM: ikstack: %d bytes allocated, %d bytes used.\n", allocated, used);
-
-	t_reset ();
-	iks_delete (x);
-	time = t_elapsed ();
-	printf ("DOM: deleting the tree took %ld milliseconds.\n", time);
-
-	iks_parser_delete (prs);
-}
-
-void
-serialize_test (char *buf, int len)
-{
-	unsigned long time;
-	iks *x;
-	iksparser *prs;
-	int err;
-
-	prs = iks_dom_new (&x);
-	err = iks_parse (prs, buf, len, 1);
-	switch (err) {
-		case IKS_OK:
-			break;
-		case IKS_NOMEM:
-			exit (2);
-		case IKS_BADXML:
-			fprintf (stderr, "Invalid xml at byte %ld, line %ld\n",
-				iks_nr_bytes (prs), iks_nr_lines (prs));
-			exit (1);
-		case IKS_HOOK:
-			exit (1);
-	}
-	iks_parser_delete (prs);
-
-	t_reset ();
-
-	iks_string (iks_stack (x), x);
-
-	time = t_elapsed ();
-
-	printf ("Serialize: serializing the tree took %ld milliseconds.\n", time);
-
-	iks_delete (x);
-}
-
-void
-sha_test (char *buf, int len)
-{
-	unsigned long time;
-	iksha *s;
-	char out[41];
-
-	t_reset ();
-
-	s = iks_sha_new ();
-	iks_sha_hash (s, buf, len, 1);
-	iks_sha_print (s, out);
-	out[40] = '\0';
-	iks_sha_delete (s);
-
-	time = t_elapsed ();
-
-	printf ("SHA: hashing took %ld milliseconds.\n", time);
-	printf ("SHA: hash [%s]\n", out);
-}
-
-int
-main (int argc, char *argv[])
-{
-	int test_type = 0;
-	int c;
-
-#ifdef HAVE_GETOPT_LONG
-	int i;
-	while ((c = getopt_long (argc, argv, shortopts, longopts, &i)) != -1) {
-#else
-	while ((c = getopt (argc, argv, shortopts)) != -1) {
-#endif
-		switch (c) {
-			case 'a':
-				test_type = 0xffff;
-				break;
-			case 's':
-				test_type |= 1;
-				break;
-			case 'd':
-				test_type |= 2;
-				break;
-			case 'e':
-				test_type |= 4;
-				break;
-			case '1':
-				test_type |= 8;
-				break;
-			case 'b':
-				block_size = atoi (optarg);
-				break;
-			case 'm':
-				m_trace ();
-				break;
-			case 'h':
-				print_usage ();
-				exit (0);
-			case 'V':
-				puts ("iksperf (iksemel) "VERSION);
-				exit (0);
-		}
-	}
-	for (; optind < argc; optind++) {
-		char *buf;
-		int len;
-
-		buf = load_file (argv[optind], &len);
-		if (test_type & 1) sax_test (buf, len);
-		if (test_type == 0 || test_type & 2) dom_test (buf, len);
-		if (test_type & 4) serialize_test (buf, len);
-		if (test_type & 8) sha_test (buf, len);
-		free (buf);
-	}
-
-	return 0;
-}
diff --git a/libs/iksemel/tools/iksroster.c b/libs/iksemel/tools/iksroster.c
deleted file mode 100644
index 71237972b3..0000000000
--- a/libs/iksemel/tools/iksroster.c
+++ /dev/null
@@ -1,380 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2004 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include "common.h"
-#include "iksemel.h"
-
-#ifdef HAVE_GETOPT_LONG
-#include <getopt.h>
-#endif
-
-#ifdef _WIN32
-#include <winsock.h>
-#endif
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longopts[] = {
-	{ "backup", required_argument, 0, 'b' },
-	{ "restore", required_argument, 0, 'r' },
-	{ "file", required_argument, 0, 'f' },
-	{ "timeout", required_argument, 0, 't' },
-	{ "secure", 0, 0, 's' },
-	{ "sasl", 0, 0, 'a' },
-	{ "log", 0, 0, 'l' },
-	{ "help", 0, 0, 'h' },
-	{ "version", 0, 0, 'V' },
-	{ 0, 0, 0, 0 }
-};
-#endif
-
-static char *shortopts = "b:r:f:t:salhV";
-
-static void
-print_usage (void)
-{
-	puts ("Usage: iksroster [OPTIONS]\n"
-		"This is a backup tool for your jabber roster.\n"
-		" -b, --backup=JID    Download roster from the server.\n"
-		" -r, --restore=JID   Upload roster to the server.\n"
-		" -f, --file=FILE     Load/Save roster to this file.\n"
-		" -t, --timeout=SECS  Set network timeout.\n"
-		" -s, --secure        Use encrypted connection.\n"
-		" -a, --sasl          Use SASL authentication.\n"
-		" -l, --log           Print exchanged xml data.\n"
-		" -h, --help          Print this text and exit.\n"
-		" -V, --version       Print version and exit.\n"
-#ifndef HAVE_GETOPT_LONG
-		"(long options are not supported on your system)\n"
-#endif
-#ifndef HAVE_GNUTLS
-		"(secure connections are not supported on your system)\n"
-#endif
-		"Report bugs to <iksemel-dev@jabberstudio.org>.");
-}
-
-/* stuff we keep per session */
-struct session {
-	iksparser *prs;
-	iksid *acc;
-	char *pass;
-	int features;
-	int authorized;
-	int counter;
-	int set_roster;
-	int job_done;
-};
-
-/* precious roster we'll deal with */
-iks *my_roster;
-
-/* out packet filter */
-iksfilter *my_filter;
-
-/* connection time outs if nothing comes for this much seconds */
-int opt_timeout = 30;
-
-/* connection flags */
-int opt_use_tls;
-int opt_use_sasl;
-int opt_log;
-
-void
-j_error (char *msg)
-{
-	fprintf (stderr, "iksroster: %s\n", msg);
-	exit (2);
-}
-
-int
-on_result (struct session *sess, ikspak *pak)
-{
-	iks *x;
-
-	if (sess->set_roster == 0) {
-		x = iks_make_iq (IKS_TYPE_GET, IKS_NS_ROSTER);
-		iks_insert_attrib (x, "id", "roster");
-		iks_send (sess->prs, x);
-		iks_delete (x);
-	} else {
-		iks_insert_attrib (my_roster, "type", "set");
-		iks_send (sess->prs, my_roster);
-	}
-	return IKS_FILTER_EAT;
-}
-
-int
-on_stream (struct session *sess, int type, iks *node)
-{
-	sess->counter = opt_timeout;
-
-	switch (type) {
-		case IKS_NODE_START:
-			if (opt_use_tls && !iks_is_secure (sess->prs)) {
-				iks_start_tls (sess->prs);
-				break;
-			}
-			if (!opt_use_sasl) {
-				iks *x;
-
-				x = iks_make_auth (sess->acc, sess->pass, iks_find_attrib (node, "id"));
-				iks_insert_attrib (x, "id", "auth");
-				iks_send (sess->prs, x);
-				iks_delete (x);
-			}
-			break;
-
-		case IKS_NODE_NORMAL:
-			if (strcmp ("stream:features", iks_name (node)) == 0) {
-				sess->features = iks_stream_features (node);
-				if (opt_use_sasl) {
-					if (opt_use_tls && !iks_is_secure (sess->prs)) break;
-					if (sess->authorized) {
-						iks *t;
-						if (sess->features & IKS_STREAM_BIND) {
-							t = iks_make_resource_bind (sess->acc);
-							iks_send (sess->prs, t);
-							iks_delete (t);
-						}
-						if (sess->features & IKS_STREAM_SESSION) {
-							t = iks_make_session ();
-							iks_insert_attrib (t, "id", "auth");
-							iks_send (sess->prs, t);
-							iks_delete (t);
-						}
-					} else {
-						if (sess->features & IKS_STREAM_SASL_MD5)
-							iks_start_sasl (sess->prs, IKS_SASL_DIGEST_MD5, sess->acc->user, sess->pass);
-						else if (sess->features & IKS_STREAM_SASL_PLAIN)
-							iks_start_sasl (sess->prs, IKS_SASL_PLAIN, sess->acc->user, sess->pass);
-					}
-				}
-			} else if (strcmp ("failure", iks_name (node)) == 0) {
-				j_error ("sasl authentication failed");
-			} else if (strcmp ("success", iks_name (node)) == 0) {
-				sess->authorized = 1;
-				iks_send_header (sess->prs, sess->acc->server);
-			} else {
-				ikspak *pak;
-
-				pak = iks_packet (node);
-				iks_filter_packet (my_filter, pak);
-				if (sess->job_done == 1) return IKS_HOOK;
-			}
-			break;
-
-		case IKS_NODE_STOP:
-			j_error ("server disconnected");
-
-		case IKS_NODE_ERROR:
-			j_error ("stream error");
-	}
-
-	if (node) iks_delete (node);
-	return IKS_OK;
-}
-
-int
-on_error (void *user_data, ikspak *pak)
-{
-	j_error ("authorization failed");
-	return IKS_FILTER_EAT;
-}
-
-int
-on_roster (struct session *sess, ikspak *pak)
-{
-	my_roster = pak->x;
-	sess->job_done = 1;
-	return IKS_FILTER_EAT;
-}
-
-void
-on_log (struct session *sess, const char *data, size_t size, int is_incoming)
-{
-	if (iks_is_secure (sess->prs)) fprintf (stderr, "Sec");
-	if (is_incoming) fprintf (stderr, "RECV"); else fprintf (stderr, "SEND");
-	fprintf (stderr, "[%s]\n", data);
-}
-
-void
-j_setup_filter (struct session *sess)
-{
-	if (my_filter) iks_filter_delete (my_filter);
-	my_filter = iks_filter_new ();
-	iks_filter_add_rule (my_filter, (iksFilterHook *) on_result, sess,
-		IKS_RULE_TYPE, IKS_PAK_IQ,
-		IKS_RULE_SUBTYPE, IKS_TYPE_RESULT,
-		IKS_RULE_ID, "auth",
-		IKS_RULE_DONE);
-	iks_filter_add_rule (my_filter, on_error, sess,
-		IKS_RULE_TYPE, IKS_PAK_IQ,
-		IKS_RULE_SUBTYPE, IKS_TYPE_ERROR,
-		IKS_RULE_ID, "auth",
-		IKS_RULE_DONE);
-	iks_filter_add_rule (my_filter, (iksFilterHook *) on_roster, sess,
-		IKS_RULE_TYPE, IKS_PAK_IQ,
-		IKS_RULE_SUBTYPE, IKS_TYPE_RESULT,
-		IKS_RULE_ID, "roster",
-		IKS_RULE_DONE);
-}
-
-void
-j_connect (char *jabber_id, char *pass, int set_roster)
-{
-	struct session sess;
-	int e;
-
-	memset (&sess, 0, sizeof (sess));
-	sess.prs = iks_stream_new (IKS_NS_CLIENT, &sess, (iksStreamHook *) on_stream);
-	if (opt_log) iks_set_log_hook (sess.prs, (iksLogHook *) on_log);
-	sess.acc = iks_id_new (iks_parser_stack (sess.prs), jabber_id);
-	if (NULL == sess.acc->resource) {
-		/* user gave no resource name, use the default */
-		char *tmp;
-		tmp = iks_malloc (strlen (sess.acc->user) + strlen (sess.acc->server) + 9 + 3);
-		sprintf (tmp, "%s@%s/%s", sess.acc->user, sess.acc->server, "iksroster");
-		sess.acc = iks_id_new (iks_parser_stack (sess.prs), tmp);
-		iks_free (tmp);
-	}
-	sess.pass = pass;
-	sess.set_roster = set_roster;
-
-	j_setup_filter (&sess);
-
-	e = iks_connect_tcp (sess.prs, sess.acc->server, IKS_JABBER_PORT);
-	switch (e) {
-		case IKS_OK:
-			break;
-		case IKS_NET_NODNS:
-			j_error ("hostname lookup failed");
-		case IKS_NET_NOCONN:
-			j_error ("connection failed");
-		default:
-			j_error ("io error");
-	}
-
-	sess.counter = opt_timeout;
-	while (1) {
-		e = iks_recv (sess.prs, 1);
-		if (IKS_HOOK == e) break;
-		if (IKS_NET_TLSFAIL == e) j_error ("tls handshake failed");
-		if (IKS_OK != e) j_error ("io error");
-		sess.counter--;
-		if (sess.counter == 0) j_error ("network timeout");
-	}
-	iks_parser_delete (sess.prs);
-}
-
-int
-main (int argc, char *argv[])
-{
-	char *from = NULL;
-	char *to = NULL;
-	char *file = NULL;
-	char from_pw[128], to_pw[128];
-	int c;
-#ifdef HAVE_GETOPT_LONG
-	int i;
-
-	while ((c = getopt_long (argc, argv, shortopts, longopts, &i)) != -1) {
-#else
-	while ((c = getopt (argc, argv, shortopts)) != -1) {
-#endif
-		switch (c) {
-			case 'b':
-				from = optarg;
-				printf ("Password for %s: ", optarg);
-				fflush (stdout);
-				fgets (from_pw, 127, stdin);
-				strtok (from_pw, "\r\n");
-				break;
-			case 'r':
-				to = optarg;
-				printf ("Password for %s: ", optarg);
-				fflush (stdout);
-				fgets (to_pw, 127, stdin);
-				strtok (to_pw, "\r\n");
-				break;
-			case 'f':
-				if (file) free(file);
-				file = strdup (optarg);
-				break;
-			case 't':
-				opt_timeout = atoi (optarg);
-				if (opt_timeout < 10) opt_timeout = 10;
-				break;
-			case 's':
-				if (!iks_has_tls ()) {
-					puts ("Cannot make encrypted connections.");
-					puts ("iksemel library is not compiled with GnuTLS support.");
-					exit (1);
-				}
-				opt_use_tls = 1;
-				break;
-			case 'a':
-				opt_use_sasl = 1;
-				break;
-			case 'l':
-				opt_log = 1;
-				break;
-			case 'h':
-				print_usage ();
-				exit (0);
-			case 'V':
-				puts ("iksroster (iksemel) "VERSION);
-				exit (0);
-		}
-	}
-	if (from == NULL && to == NULL) {
-		puts ("What I'm supposed to do?");
-		print_usage ();
-		exit (1);
-	}
-	if (to && (from == NULL && file == NULL)) {
-		puts ("Store which roster?");
-		print_usage ();
-		exit (1);
-	}
-
-#ifdef _WIN32
-	WSADATA wsaData;
-	WSAStartup (MAKEWORD (1,1), &wsaData);
-#endif
-
-	if (from) {
-		j_connect (from, from_pw, 0);
-		if (file) {
-			switch (iks_save (file, my_roster)) {
-				case IKS_OK:
-					break;
-				case IKS_FILE_NOACCESS:
-					j_error ("cannot write to file");
-				default:
-					j_error ("file io error");
-			}
-		}
-	} else {
-		switch (iks_load (file, &my_roster)) {
-			case IKS_OK:
-				break;
-			case IKS_FILE_NOFILE:
-				j_error ("file not found");
-			case IKS_FILE_NOACCESS:
-				j_error ("cannot read file");
-			default:
-				j_error ("file io error");
-		}
-	}
-	if (to) {
-		j_connect (to, to_pw, 1);
-	}
-
-#ifdef _WIN32
-	WSACleanup ();
-#endif
-	if (file) free(file);
-	return 0;
-}
diff --git a/libs/iksemel/tools/perf.c b/libs/iksemel/tools/perf.c
deleted file mode 100644
index ac5a8483d1..0000000000
--- a/libs/iksemel/tools/perf.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef _WIN32
-#include <windows.h>
-#include <limits.h>
-#else
-#include <sys/time.h>
-#endif
-
-#include "iksemel.h"
-
-/* timing functions */
-
-#ifdef _WIN32
-static DWORD start_tv;
-
-void
-t_reset (void)
-{
-	start_tv = GetTickCount ();
-}
-
-unsigned long
-t_elapsed (void)
-{
-	DWORD end_tv;
-
-	end_tv = GetTickCount ();
-	if (end_tv < start_tv)
-		return UINT_MAX - (start_tv - end_tv - 1);
-	else
-		return end_tv - start_tv;
-}
-
-#else
-static struct timeval start_tv;
-
-void
-t_reset (void)
-{
-	gettimeofday (&start_tv, NULL);
-}
-
-unsigned long
-t_elapsed (void)
-{
-	unsigned long msec;
-	struct timeval cur_tv;
-
-	gettimeofday (&cur_tv, NULL);
-	msec = (cur_tv.tv_sec * 1000) + (cur_tv.tv_usec / 1000);
-	msec -= (start_tv.tv_sec * 1000) + (start_tv.tv_usec / 1000);
-	return msec;
-}
-#endif
-
-/* memory functions */
-
-static void *
-m_malloc (size_t size)
-{
-	void *ptr = malloc (size);
-	printf ("MEM: malloc (%d) => %p\n", size, ptr);
-	return ptr;
-}
-
-static void
-m_free (void *ptr)
-{
-	printf ("MEM: free (%p)\n", ptr);
-}
-
-void
-m_trace (void)
-{
-	iks_set_mem_funcs (m_malloc, m_free);
-}
diff --git a/libs/iksemel/tools/perf.h b/libs/iksemel/tools/perf.h
deleted file mode 100644
index 04f1638c9b..0000000000
--- a/libs/iksemel/tools/perf.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* iksemel (XML parser for Jabber)
-** Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>
-** This code is free software; you can redistribute it and/or
-** modify it under the terms of GNU Lesser General Public License.
-*/
-
-void t_reset (void);
-unsigned long t_elapsed (void);
-
-void m_trace (void);
diff --git a/libs/libvpx/build/make/configure.sh b/libs/libvpx/build/make/configure.sh
index b1f7804a59..140c1d7e0d 100644
--- a/libs/libvpx/build/make/configure.sh
+++ b/libs/libvpx/build/make/configure.sh
@@ -767,6 +767,10 @@ process_common_toolchain() {
 
     # detect tgt_os
     case "$gcctarget" in
+      arm64-apple-darwin*)
+        tgt_isa=arm64
+        tgt_os=darwin
+        ;;
       *darwin*)
         tgt_isa=x86_64
         tgt_os=darwin
@@ -845,7 +849,7 @@ process_common_toolchain() {
   # Handle darwin variants. Newer SDKs allow targeting older
   # platforms, so use the newest one available.
   case ${toolchain} in
-    arm*-darwin*)
+    DISABLE-arm*-darwin*)
       add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
       iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
       if [ -d "${iphoneos_sdk_dir}" ]; then
@@ -1046,7 +1050,7 @@ EOF
           soft_enable unit_tests
           ;;
 
-        darwin*)
+        DISABLE-darwin*)
           XCRUN_FIND="xcrun --sdk iphoneos --find"
           CXX="$(${XCRUN_FIND} clang++)"
           CC="$(${XCRUN_FIND} clang)"
diff --git a/libs/libvpx/vp8/encoder/onyx_if.c b/libs/libvpx/vp8/encoder/onyx_if.c
index c091594121..00bab3f626 100644
--- a/libs/libvpx/vp8/encoder/onyx_if.c
+++ b/libs/libvpx/vp8/encoder/onyx_if.c
@@ -1447,6 +1447,11 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) {
   last_h = cpi->oxcf.Height;
   prev_number_of_layers = cpi->oxcf.number_of_layers;
 
+  if (cpi->initial_width) {
+      // TODO(https://crbug.com/1486441): Allow changing thread counts; the
+      // allocation is done once in vp8_create_compressor().
+      oxcf->multi_threaded = cpi->oxcf.multi_threaded;
+  }
   cpi->oxcf = *oxcf;
 
   switch (cpi->oxcf.Mode) {
diff --git a/libs/libvpx/vp9/common/vp9_alloccommon.c b/libs/libvpx/vp9/common/vp9_alloccommon.c
index 7345e259b6..e2d76880bb 100644
--- a/libs/libvpx/vp9/common/vp9_alloccommon.c
+++ b/libs/libvpx/vp9/common/vp9_alloccommon.c
@@ -123,12 +123,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
     if (cm->alloc_mi(cm, new_mi_size)) goto fail;
   }
 
-  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
-    // Create the segmentation map structure and set to 0.
-    free_seg_map(cm);
-    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
-  }
-
   if (cm->above_context_alloc_cols < cm->mi_cols) {
     vpx_free(cm->above_context);
     cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc(
@@ -143,6 +137,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
     cm->above_context_alloc_cols = cm->mi_cols;
   }
 
+  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
+    // Create the segmentation map structure and set to 0.
+    free_seg_map(cm);
+    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
+  }
+
   if (vp9_alloc_loop_filter(cm)) goto fail;
 
   return 0;
diff --git a/libs/libvpx/vp9/encoder/vp9_encoder.c b/libs/libvpx/vp9/encoder/vp9_encoder.c
index 7f82a470b3..80824e304c 100644
--- a/libs/libvpx/vp9/encoder/vp9_encoder.c
+++ b/libs/libvpx/vp9/encoder/vp9_encoder.c
@@ -1915,6 +1915,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) {
   }
 }
 
+static void free_copy_partition_data(VP9_COMP *cpi) {
+  vpx_free(cpi->prev_partition);
+  cpi->prev_partition = NULL;
+  vpx_free(cpi->prev_segment_id);
+  cpi->prev_segment_id = NULL;
+  vpx_free(cpi->prev_variance_low);
+  cpi->prev_variance_low = NULL;
+  vpx_free(cpi->copied_frame_cnt);
+  cpi->copied_frame_cnt = NULL;
+}
+
 void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
   VP9_COMMON *const cm = &cpi->common;
   RATE_CONTROL *const rc = &cpi->rc;
@@ -1999,6 +2010,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
     new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows);
     if (cm->mi_alloc_size < new_mi_size) {
       vp9_free_context_buffers(cm);
+      vp9_free_pc_tree(&cpi->td);
+      vpx_free(cpi->mbmi_ext_base);
       alloc_compressor_data(cpi);
       realloc_segmentation_maps(cpi);
       cpi->initial_width = cpi->initial_height = 0;
@@ -2014,8 +2027,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
     update_frame_size(cpi);
 
   if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) {
-    memset(cpi->consec_zero_mv, 0,
-           cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv));
+    vpx_free(cpi->consec_zero_mv);
+    CHECK_MEM_ERROR(
+        cm, cpi->consec_zero_mv,
+        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv)));
+
+    vpx_free(cpi->skin_map);
+    CHECK_MEM_ERROR(
+        cm, cpi->skin_map,
+        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0])));
+
+    free_copy_partition_data(cpi);
+    alloc_copy_partition_data(cpi);
     if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ)
       vp9_cyclic_refresh_reset_resize(cpi);
     rc->rc_1_frame = 0;
diff --git a/libs/libvpx/vp9/encoder/vp9_subexp.c b/libs/libvpx/vp9/encoder/vp9_subexp.c
index cf17fcdfce..b5a2390662 100644
--- a/libs/libvpx/vp9/encoder/vp9_subexp.c
+++ b/libs/libvpx/vp9/encoder/vp9_subexp.c
@@ -64,6 +64,9 @@ static int remap_prob(int v, int m) {
     228, 229, 17,  230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
     18,  242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 19,
   };
+
+  assert(m > 0);
+
   v--;
   m--;
   if ((m << 1) <= MAX_PROB)
diff --git a/libs/libvpx/vpx_scale/generic/vpx_scale.c b/libs/libvpx/vpx_scale/generic/vpx_scale.c
index 958bb320fc..e20905e9ce 100644
--- a/libs/libvpx/vpx_scale/generic/vpx_scale.c
+++ b/libs/libvpx/vpx_scale/generic/vpx_scale.c
@@ -167,6 +167,8 @@ static void scale1d_c(const unsigned char *source, int source_step,
 
   (void)source_length;
 
+  assert(dest_scale);
+
   /* These asserts are needed if there are boundary issues... */
   /*assert ( dest_scale > source_scale );*/
   /*assert ( (source_length-1) * dest_scale >= (dest_length-1) * source_scale
diff --git a/libs/libvpx/vpx_scale/vpx_scale.h b/libs/libvpx/vpx_scale/vpx_scale.h
index fd5ba7ccdc..96edb7af20 100644
--- a/libs/libvpx/vpx_scale/vpx_scale.h
+++ b/libs/libvpx/vpx_scale/vpx_scale.h
@@ -11,6 +11,8 @@
 #ifndef VPX_VPX_SCALE_VPX_SCALE_H_
 #define VPX_VPX_SCALE_VPX_SCALE_H_
 
+#include <assert.h>
+
 #include "vpx_scale/yv12config.h"
 
 extern void vpx_scale_frame(YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst,
diff --git a/libs/libyuv/include/libyuv/planar_functions.h b/libs/libyuv/include/libyuv/planar_functions.h
index 5299fe2c0e..50fe5f681d 100644
--- a/libs/libyuv/include/libyuv/planar_functions.h
+++ b/libs/libyuv/include/libyuv/planar_functions.h
@@ -582,7 +582,7 @@ typedef void (*ARGBBlendRow)(const uint8_t* src_argb0,
 
 // Get function to Alpha Blend ARGB pixels and store to destination.
 LIBYUV_API
-ARGBBlendRow GetARGBBlend();
+ARGBBlendRow GetARGBBlend(void);
 
 // Alpha Blend ARGB images and store to destination.
 // Source is pre-multiplied by alpha using ARGBAttenuate.
diff --git a/libs/libyuv/source/planar_functions.cc b/libs/libyuv/source/planar_functions.cc
index 5a9d56d88a..c07f0943d3 100644
--- a/libs/libyuv/source/planar_functions.cc
+++ b/libs/libyuv/source/planar_functions.cc
@@ -1185,7 +1185,7 @@ int ARGBMirror(const uint8_t* src_argb,
 // As there are 6 blenders to choose from, the caller should try to use
 // the same blend function for all pixels if possible.
 LIBYUV_API
-ARGBBlendRow GetARGBBlend() {
+ARGBBlendRow GetARGBBlend(void) {
   void (*ARGBBlendRow)(const uint8_t* src_argb, const uint8_t* src_argb1,
                        uint8_t* dst_argb, int width) = ARGBBlendRow_C;
 #if defined(HAS_ARGBBLENDROW_SSSE3)
diff --git a/libs/miniupnpc/miniupnpc.c b/libs/miniupnpc/miniupnpc.c
index 88faea1c37..a72ef892b6 100644
--- a/libs/miniupnpc/miniupnpc.c
+++ b/libs/miniupnpc/miniupnpc.c
@@ -679,7 +679,6 @@ UPNP_GetValidIGD(struct UPNPDev * devlist,
 	char * descXML;
 	int descXMLsize = 0;
 	struct UPNPDev * dev;
-	int ndev = 0;
 	int state; /* state 1 : IGD connected. State 2 : IGD. State 3 : anything */
 	if(!devlist)
 	{
@@ -698,7 +697,6 @@ UPNP_GetValidIGD(struct UPNPDev * devlist,
 			   	                        lanaddr, lanaddrlen);
 			if(descXML)
 			{
-				ndev++;
 				memset(data, 0, sizeof(struct IGDdatas));
 				memset(urls, 0, sizeof(struct UPNPUrls));
 				parserootdesc(descXML, descXMLsize, data);
diff --git a/libs/win32/civetweb/duktape_lib.vcxproj b/libs/win32/civetweb/duktape_lib.vcxproj
index c5ada61614..5a157971a0 100644
--- a/libs/win32/civetweb/duktape_lib.vcxproj
+++ b/libs/win32/civetweb/duktape_lib.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>duktape_lib</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/libs/win32/civetweb/lua_lib.vcxproj b/libs/win32/civetweb/lua_lib.vcxproj
index 35b9f448b8..d2b5d7503e 100644
--- a/libs/win32/civetweb/lua_lib.vcxproj
+++ b/libs/win32/civetweb/lua_lib.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{8F5E5D77-D269-4665-9E27-1045DA6CF0D8}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>lua_lib</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/libs/win32/ffmpeg/ffmpeg.2017.vcxproj b/libs/win32/ffmpeg/ffmpeg.2017.vcxproj
index 7eb6ef65ed..4c70bf6c71 100644
--- a/libs/win32/ffmpeg/ffmpeg.2017.vcxproj
+++ b/libs/win32/ffmpeg/ffmpeg.2017.vcxproj
@@ -21,10 +21,9 @@
   <PropertyGroup Label="Globals">
     <ProjectName>ffmpeg</ProjectName>
     <RootNamespace>ffmpeg</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectGuid>{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}</ProjectGuid>
   </PropertyGroup>
-  <Import Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Project="$(CUDA_PATH)\extras\visual_studio_integration\MSBuildExtensions\CUDA *.props" />
   <Import Project="$(SolutionDir)w32\zlib.props" Condition=" '$(zlibImported)' == '' " />
   <Import Project="$(SolutionDir)\w32\yasm.props" Condition=" '$(YasmPropsImported)' == '' " />
   <Import Project="$(SolutionDir)\w32\download_ffmpeg.props" Condition=" '$(downloadFfmpegPropsImported)' == '' " />
@@ -78,7 +77,7 @@
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
     <ClCompile>
-      <PreprocessorDefinitions>BUILDING_avdevice;BUILDING_avfilter;BUILDING_avformat;BUILDING_avcodec;BUILDING_avresample;BUILDING_swresample;BUILDING_swscale;BUILDING_avutil;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WC_ERR_INVALID_CHARS=0x00000080;BUILDING_avdevice;BUILDING_avfilter;BUILDING_avformat;BUILDING_avcodec;BUILDING_swresample;BUILDING_swscale;BUILDING_avutil;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-x264|x64'">
@@ -209,6 +208,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\aacenctab.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\aacps_common.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\aacps_fixed.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -242,6 +244,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\ac3.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\ac3_channel_layout_tab.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\ac3_parser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -305,6 +310,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\adxenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\agm.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\aic.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -332,6 +340,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\alsdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\amr_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\amrnbdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -350,6 +361,18 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\aptx.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\aptxdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\aptxenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\arbc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\argo.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\ass.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -392,6 +415,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\atrac9dec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\atsc_a53.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\audio_frame_queue.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -401,6 +427,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\aura.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\av1_frame_merge_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\av1_frame_split_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\av1_metadata_bsf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -410,6 +442,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\av1_parser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\av1dec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avcodec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avdct.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -419,18 +457,21 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avpacket.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avpicture.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avrndec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avs.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avs2.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avs2_parser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avs3_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\avuidec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -458,15 +499,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\bintext.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\bitpacked.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\bitpacked_dec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\bitpacked_enc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\bitstream.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\bitstream_filter.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\bitstream_filters.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -533,12 +574,18 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cbs_av1.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cbs_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cbs_h2645.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cbs_mpeg2.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cbs_sei.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cbs_vp9.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -548,6 +595,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cdgraphics.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cdtoons.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cdxl.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -563,6 +613,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cfhddata.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cfhddsp.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cfhdenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cfhdencdsp.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cga_data.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -596,7 +655,7 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\codec_desc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\codec2utils.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\codec_par.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cook.c">
@@ -608,10 +667,13 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cpia.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cscd.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cri.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cuviddec.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cri_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cscd.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\cyuv.c">
@@ -638,6 +700,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dca_parser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dca_sample_rate_tab.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dca_xll.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -680,6 +745,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dfa.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dfpwmdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dfpwmenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dirac.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -719,6 +790,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dolby_e.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dolby_e_parse.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dolby_e_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dovi_rpu.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dpcm.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -755,6 +835,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dv.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dv_error_marker_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dv_profile.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -764,15 +847,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dvaudiodec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dvbsub.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dvbsub_parser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dvbsubdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dvbsubenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dvd_nav_parser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -782,6 +865,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dvdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dvdsub.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dvdsub_parser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -815,6 +901,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dxva2_vc1.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dynamic_hdr10_plus.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dynamic_hdr_vivid.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\dxva2_vp9.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -875,15 +967,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\faanidct.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\fastaudio.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\faxcompr.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\fdctdsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\fft_fixed.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\fft_fixed_32.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -908,9 +1000,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\fic.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\file_open.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\filter_units_bsf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -980,6 +1069,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\g723_1.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\g723_1_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\g723_1dec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1001,9 +1093,18 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\gdv.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\gemdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\get_buffer.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\gif.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\gif_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\gifdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1049,6 +1150,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\h263dsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\h2645_parse.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\h264_cabac.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1097,9 +1201,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\h264_slice.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\h2645_parse.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\h264chroma.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1124,6 +1225,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\h265_metadata_bsf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\h265_profile_level.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\h274.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\hap.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1133,6 +1240,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\hapqa_extract_bsf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\hcadec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\hcom.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\hevc_cabac.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1241,6 +1354,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\imm4.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\imm5.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\imx.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\imx_dump_header_bsf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1271,6 +1390,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\intrax8dsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\ipu_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\ituh263dec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1301,6 +1423,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\jpeg2000.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\jpeg2000_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\jpeg2000dec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1406,7 +1531,7 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mathtables.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mdct_fixed.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mdct15.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mdct_fixed_32.c">
@@ -1415,9 +1540,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mdct_float.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mdct15.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1433,9 +1555,18 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\metasound_data.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mf_utils.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mfenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\microdvddec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\midivid.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mimic.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1454,6 +1585,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mjpegdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mjpegdec_common.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mjpegenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1466,6 +1600,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mlp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mlp_parse.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mlp_parser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1484,6 +1621,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mmvideo.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mobiclip.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\motion_est.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1538,6 +1678,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpeg4audio.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpeg4audio_sample_rates.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpeg4video.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1559,6 +1702,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpegaudiodata.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpegaudiodec_common.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpegaudiodec_fixed.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1586,6 +1732,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpegaudioenc_float.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpegaudiotabs.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpegpicture.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1595,6 +1744,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpegvideo.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpegvideo_dec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mpegvideo_enc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1640,6 +1792,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\msmpeg4enc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\msp2dec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\msrle.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1673,6 +1828,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\msvideo1enc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mv30.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\mvcdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1691,48 +1849,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\noise_bsf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\notchlc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\null_bsf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nuv.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvdec.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvdec_h264.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvdec_hevc.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvdec_mjpeg.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvdec_mpeg12.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvdec_mpeg4.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvdec_vc1.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvdec_vp8.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvdec_vp9.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvenc.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvenc_h264.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\nvenc_hevc.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\on2avc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1748,6 +1873,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\opus_celt.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\opus_metadata_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\opus_parser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1763,6 +1891,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\opusdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\opusdsp.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\opusenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1793,18 +1924,36 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pcm-bluray.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pcm-blurayenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pcm-dvd.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pcm-dvdenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pcm_rechunk_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pcx.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pcxenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pgs_frame_merge_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pgssubdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pgxdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\photocd.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\pictordec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1832,6 +1981,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\profiles.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\prores_metadata_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\proresdata.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1880,6 +2032,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\qdrw.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\qoi_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\qoidec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\qoienc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\qpeg.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -1964,6 +2125,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\rpza.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\rpzaenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\rtjpeg.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2039,6 +2203,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\scpr.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\setts_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\sga.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\sgidec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2060,9 +2230,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\sinewin.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\sinewin_fixed.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\sipr.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2072,13 +2239,16 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\sipr16k.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\siren.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\smacker.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\smc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\smvjpegdec.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\smcenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\snappy.c">
@@ -2105,6 +2275,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\speedhq.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\speedhqenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\speexdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\srtdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2126,9 +2302,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\svq1.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\svq13.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\svq1dec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2168,6 +2341,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\texturedsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\texturedspenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\tiertexseqv.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2177,21 +2353,24 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\tiff_common.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\tiff_data.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\tiffenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\tmv.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\to_upper4.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\tpeldsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\trace_headers_bsf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\truehd_core_bsf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\truemotion1.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2222,6 +2401,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\ttaencdsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\ttmlenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\twinvq.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2237,9 +2419,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\utils.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\utvideo.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\utvideodec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2282,6 +2461,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\vble.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\vbndec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\vbnenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\vc1.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2318,12 +2503,18 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\vcr1.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\version.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\videodsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\vima.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\vlc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\vmdaudio.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2444,12 +2635,18 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\wavpack.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\wavpackdata.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\wavpackenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\webp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\webp_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\webvttdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2528,6 +2725,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\cavsdsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\celt_pvq_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\cfhddsp_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\cfhdencdsp_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\constants.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2636,7 +2842,7 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\mpegvideoencdsp_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\opus_dsp_init.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\opusdsp_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\pixblockdsp_init.c">
@@ -2726,6 +2932,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\xan.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\xbm_parser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\xbmdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2816,9 +3025,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavdevice\dshow_pin.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavdevice\file_open.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavdevice\gdigrab.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2828,6 +3034,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavdevice\utils.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavdevice\version.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavdevice\vfwcap.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2849,18 +3058,33 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_adeclick.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_adecorrelate.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_adelay.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_adenorm.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_aderivative.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_adynamicequalizer.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_adynamicsmooth.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_aecho.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_aemphasis.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_aexciter.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_afade.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2876,6 +3100,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_aformat.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_afreqshift.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_afwtdn.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_agate.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2897,6 +3127,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_anequalizer.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_anlmdn.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_anlms.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_anull.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2906,12 +3142,21 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_aphaser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_apsyclip.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_apulsator.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_aresample.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_arnndn.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_asdr.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_asetnsamples.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2921,12 +3166,30 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_ashowinfo.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_asoftclip.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_aspectralstats.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_astats.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_asubboost.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_asupercut.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_atempo.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_atilt.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_axcorrelate.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_biquads.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2954,6 +3217,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_dcshift.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_deesser.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_dialoguenhance.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_drmeter.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -2996,9 +3265,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_replaygain.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_resample.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_sidechaincompress.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3008,6 +3274,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_silenceremove.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_speechnorm.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_stereotools.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3026,6 +3295,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_vibrato.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_virtualbass.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\af_volume.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3038,6 +3310,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\asink_anullsink.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\asrc_afirsrc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\asrc_anoisesrc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3077,6 +3352,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\avf_showfreqs.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\avf_showspatial.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\avf_showspectrum.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3095,7 +3373,7 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\bbox.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\boxblur.c">
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\boxblur.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\buffersink.c">
@@ -3110,10 +3388,52 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\colorspacedsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn_backend_native.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_common.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn_interface.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native_layer_avgpool.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native_layer_conv2d.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native_layer_dense.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native_layer_depth2space.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native_layer_mathbinary.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native_layer_mathunary.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native_layer_maximum.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native_layer_pad.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_backend_native_layers.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_interface.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\dnn_io_proc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\queue.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn\safe_queue.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\dnn_filter_common.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\drawutils.c">
@@ -3122,6 +3442,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\ebur128.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\edge_common.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\f_bench.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3140,6 +3463,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\f_interleave.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\f_latency.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\f_loop.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3155,6 +3481,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\f_reverse.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\f_segment.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\f_select.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3203,7 +3532,13 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\pthread.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\scale.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\qp_table.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\scale_eval.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\scene_sad.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\setpts.c">
@@ -3215,6 +3550,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\split.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\src_avsynctest.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\src_movie.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3227,6 +3565,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vaf_spectrumsynth.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\version.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_addroi.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_alphamerge.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3245,6 +3589,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_bbox.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_bilateral.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_bitplanenoise.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3257,6 +3604,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_blend.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_blockdetect.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_blurdetect.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_bm3d.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3266,12 +3619,21 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_bwdif.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_cas.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_chromakey.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_ciescope.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_chromanr.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_chromashift.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_codecview.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3284,18 +3646,33 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colorconstancy.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colorcontrast.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colorcorrect.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colorize.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colorkey.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colorlevels.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colormap.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colormatrix.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colorspace.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_colortemperature.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_convolution.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3320,6 +3697,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_datascope.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_dblur.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_dctdnoiz.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3332,6 +3712,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_decimate.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_dedot.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_deflicker.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3341,6 +3724,9 @@
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_delogo.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_derain.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_deshake.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3353,6 +3739,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_displace.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_dnn_classify.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_dnn_detect.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_dnn_processing.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_drawbox.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3365,15 +3760,27 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_entropy.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_epx.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_eq.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_estdif.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_exposure.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_extractplanes.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_fade.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_feedback.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_fftdnoiz.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3416,18 +3823,30 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_framestep.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_freezedetect.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_freezeframes.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_fspp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_gblur.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_geq.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_geq.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_gradfun.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_grayworld.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_guided.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_hflip.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3443,9 +3862,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_hqx.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_hsvkey.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_hue.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_huesaturation.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_hwdownload.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3455,10 +3880,10 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_hwupload.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_hwupload_cuda.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_hysteresis.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_hysteresis.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_identity.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_idet.c">
@@ -3470,9 +3895,15 @@
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_kerndeint.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_lagfun.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_lenscorrection.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_limitdiff.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_limiter.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3494,7 +3925,16 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_maskedmerge.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_mcdeint.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_maskedminmax.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_maskedthreshold.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_maskfun.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_median.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_mergeplanes.c">
@@ -3512,9 +3952,21 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_mix.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_monochrome.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_morpho.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_mpdecimate.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_multiply.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_negate.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_neighbor.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3554,9 +4006,15 @@
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_phase.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_photosensitivity.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_pixdesctest.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_pixelize.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_pp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3608,10 +4066,10 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_scale.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_scale_cuda.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_scdet.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\include_x64\libavfilter\vf_scale_cuda.ptx.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_scroll.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_selectivecolor.c">
@@ -3623,6 +4081,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_setparams.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_shear.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_showinfo.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3632,6 +4093,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_shuffleframes.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_shufflepixels.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_shuffleplanes.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3641,6 +4105,9 @@
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_signature.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_siti.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_smartblur.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3677,33 +4144,39 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_thumbnail.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_thumbnail_cuda.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\include_x64\libavfilter\vf_thumbnail_cuda.ptx.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_tile.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_tinterlace.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_tmidequalizer.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_tonemap.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_tpad.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_transpose.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_unsharp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_uspp.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_untile.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_v360.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_vaguedenoiser.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_varblur.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_vectorscope.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3716,6 +4189,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_vibrance.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_vif.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_vignette.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3734,13 +4210,16 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_xbr.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_xmedian.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_xfade.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_yadif.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_yadif_cuda.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\include_x64\libavfilter\vf_yadif_cuda.ptx.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_yaepblur.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vf_zoompan.c">
@@ -3755,6 +4234,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vsrc_cellauto.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vsrc_gradients.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vsrc_life.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3764,12 +4246,18 @@
     <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vsrc_mptestsrc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vsrc_sierpinski.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\vsrc_testsrc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\af_afir_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\af_anlmdn_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\af_volume_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3779,19 +4267,31 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\colorspacedsp_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\scene_sad_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_atadenoise_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_blend_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_bwdif_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_eq.c">
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_convolution_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_eq_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_framerate_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_fspp_init.c">
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_fspp_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_gblur_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_gradfun_init.c">
@@ -3800,7 +4300,7 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_hflip_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_hqdn3d_init.c">
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_hqdn3d_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_idet_init.c">
@@ -3809,40 +4309,55 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_limiter_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_lut3d_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_maskedclamp_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_maskedmerge_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_nlmeans_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_noise.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_overlay_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_pp7_init.c">
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_pp7_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_psnr_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_pullup_init.c">
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_pullup_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_removegrain_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_spp.c">
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_spp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_ssim_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_stereo3d_init.c">
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_stereo3d_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_threshold_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_tinterlace_init.c">
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_tinterlace_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_transpose_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_v360_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_w3fdif_init.c">
@@ -3869,9 +4384,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\aadec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\aaxdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ac3dec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\acedec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\acm.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3896,6 +4417,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\afc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\aiff.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\aiffdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3908,9 +4432,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\allformats.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\alp.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\amr.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\amvenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\anm.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3923,6 +4453,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\apetag.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\apm.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\apngdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3935,9 +4468,21 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\aqtitledec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\argo_asf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\argo_brp.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\argo_cvg.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\asf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\asf_tags.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\asfcrypt.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -3971,15 +4516,18 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\au.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\audiointerleave.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\av1.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\av1dec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\avc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\avformat.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\avidec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4001,6 +4549,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\avs.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\avs2dec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\avs3dec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\bethsoftvid.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4010,6 +4564,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\bink.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\binka.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\bintext.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4067,9 +4624,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\crypto.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\cutils.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\dash.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4085,21 +4639,36 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\daudenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\davs2.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\dcstr.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\demux.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\demux_utils.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\derf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\dfa.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\dfpwmdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\dhav.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\diracdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\dnxhddec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\dovi_isom.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\dsfdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4157,9 +4726,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\file.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\file_open.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\filmstripdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4211,6 +4777,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ftp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\fwse.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\g722.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4259,6 +4828,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\hashenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\hca.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\hcom.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\hdsenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4271,6 +4846,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\hls.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\hls_sample_encryption.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\hlsenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4319,6 +4897,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\iff.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ifv.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ilbc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4337,15 +4918,24 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\img2enc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\imx.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ingenientdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ip.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ipfsgateway.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ipmovie.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ipudec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ircam.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4358,6 +4948,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\isom.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\isom_tags.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\iss.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4376,9 +4969,15 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\jacosubenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\jpegxl_probe.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\jvdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\kvag.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\latmenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4397,6 +4996,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\lrcenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\luodatdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\lvfdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4415,6 +5017,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\matroskaenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mca.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mccdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\md5proto.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4457,6 +5065,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mmst.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mods.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\moflex.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mov.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4469,6 +5083,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\movenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\movenc_ttml.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\movenccenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4520,6 +5137,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\msnwc_tcp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mspdec.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mtaf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4532,6 +5152,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mux.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mux_utils.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\mvdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4589,9 +5212,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\oggparsecelt.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\oggparsedaala.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\oggparsedirac.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4652,6 +5272,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\pmpdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\pp_bnk.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\prompeg.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4871,6 +5494,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\rtpenc_mpv.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\rtpenc_rfc4175.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\rtpenc_vc2hq.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4922,6 +5548,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\sccenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\scd.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\sdp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4934,6 +5563,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\sdxdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\seek.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\segafilm.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -4946,6 +5578,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\serdec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\sga.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\shortendec.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5027,6 +5662,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\svag.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\svs.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\swf.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5075,6 +5713,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ttaenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\ttmlenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\tty.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5099,9 +5740,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\utils.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\v210.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\vag.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5114,6 +5752,12 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\vc1testenc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\version.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\vividas.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\vivo.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5174,6 +5818,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\westwood_aud.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\westwood_audenc.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavformat\westwood_vqa.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5234,6 +5881,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\audio_fifo.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\avsscanf.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\avstring.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5267,15 +5917,24 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\crc.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\csp.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\des.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\detection_bbox.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\dict.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\display.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\dovi_meta.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\encryption_info.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5297,6 +5956,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\file_open.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\film_grain_params.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\fixed_dsp.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5309,21 +5971,27 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\hash.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\hdr_dynamic_metadata.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\hdr_dynamic_vivid_metadata.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\hmac.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\hwcontext.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\hwcontext_cuda.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\hwcontext_d3d11va.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\hwcontext_dxva2.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\hwcontext_stub.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\imgutils.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5426,9 +6094,30 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\twofish.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\tx.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\tx_double.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\tx_float.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\tx_int32.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\utils.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\uuid.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\version.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\video_enc_params.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\x86\cpu.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5447,13 +6136,19 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\x86\pixelutils_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\x86\tx_float_init.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\xga_font_data.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\xtea.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libpostproc\postprocess.c">
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libpostproc\postprocess.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libpostproc\version.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libswresample\audioconvert.c">
@@ -5480,6 +6175,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libswresample\swresample_frame.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libswresample\version.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libswresample\x86\audio_convert_init.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5525,6 +6223,9 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libswscale\utils.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libswscale\version.c">
+      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libswscale\vscale.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
@@ -5543,54 +6244,6 @@
     <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libswscale\yuv2rgb.c">
       <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\audio_convert.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\audio_data.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\audio_mix.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\audio_mix_matrix.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\dither.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\options.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\resample.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\utils.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\x86\audio_convert.asm">
-      <Message>Assembling %(Filename)%(Extension) </Message>
-      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
-      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
-    </CustomBuild>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\x86\audio_convert_init.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\x86\audio_mix.asm">
-      <Message>Assembling %(Filename)%(Extension) </Message>
-      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
-      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
-    </CustomBuild>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\x86\audio_mix_init.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\x86\dither.asm">
-      <Message>Assembling %(Filename)%(Extension) </Message>
-      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
-      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
-    </CustomBuild>
-    <ClCompile Include="..\..\ffmpeg-$(ffmpegVersion)\libavresample\x86\dither_init.c">
-      <ObjectFileName>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_'))\</ObjectFileName>
-    </ClCompile>
     <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\aacencdsp.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
@@ -5636,6 +6289,21 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\celt_pvq_search.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\cfhddsp.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\cfhdencdsp.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\dcadsp.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
@@ -5666,7 +6334,7 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\flac_dsp_gpl.asm">
+    <CustomBuild Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\flac_dsp_gpl.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
@@ -5856,7 +6524,7 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\opus_pvq_search.asm">
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavcodec\x86\opusdsp.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
@@ -6041,6 +6709,11 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\af_anlmdn.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\af_volume.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
@@ -6056,6 +6729,16 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\scene_sad.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_atadenoise.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_blend.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
@@ -6066,12 +6749,27 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_convolution.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
+    <CustomBuild Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_eq.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_framerate.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_fspp.asm">
+    <CustomBuild Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_fspp.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_gblur.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
@@ -6086,7 +6784,7 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_hqdn3d.asm">
+    <CustomBuild Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_hqdn3d.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
@@ -6106,17 +6804,32 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_lut3d.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_maskedclamp.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_maskedmerge.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_nlmeans.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_overlay.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_pp7.asm">
+    <CustomBuild Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_pp7.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
@@ -6126,12 +6839,12 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_pullup.asm">
+    <CustomBuild Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_pullup.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_removegrain.asm">
+    <CustomBuild Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_removegrain.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
@@ -6141,7 +6854,12 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_stereo3d.asm">
+    <CustomBuild Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'" Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_stereo3d.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_transpose.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
@@ -6151,6 +6869,11 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_v360.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavfilter\x86\vf_w3fdif.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
@@ -6206,6 +6929,11 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libavutil\x86\tx_float.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libswresample\x86\audio_convert.asm">
       <Message>Assembling %(Filename)%(Extension) </Message>
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
@@ -6241,6 +6969,21 @@
       <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
       <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libswscale\x86\scale_avx2.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libswscale\x86\yuv2yuvX.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\ffmpeg-$(ffmpegVersion)\libswscale\x86\yuv_2_rgb.asm">
+      <Message>Assembling %(Filename)%(Extension) </Message>
+      <Command>$(YasmCommand) -I %(RelativeDir) -o $(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj "%(FullPath)"</Command>
+      <Outputs>$(IntDir)$([System.String]::Copy(%(RelativeDir)).Replace('\','_')).%(FileName).obj</Outputs>
+    </CustomBuild>
   </ItemGroup>
   <Choose>
      <When Condition=" '$(Configuration)'=='Debug-x264' OR '$(Configuration)'=='Release-x264'">
@@ -6256,4 +6999,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/libs/win32/iksemel/cleancount b/libs/win32/iksemel/cleancount
deleted file mode 100644
index 56a6051ca2..0000000000
--- a/libs/win32/iksemel/cleancount
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/win32/iksemel/config.h b/libs/win32/iksemel/config.h
deleted file mode 100644
index cf035d9c57..0000000000
--- a/libs/win32/iksemel/config.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* include/config.h.  Generated by configure.  */
-/* include/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the `getaddrinfo' function. */
-//#define HAVE_GETADDRINFO 1
-
-/* Define to 1 if you have the `getopt_long' function. */
-//#define HAVE_GETOPT_LONG 1
-
-/* "Use libgnutls" */
-//#define HAVE_GNUTLS 
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `wsock32' library (-lwsock32). */
-/* #undef HAVE_LIBWSOCK32 */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-//#define HAVE_UNISTD_H 1
-
-/* Name of package */
-#define PACKAGE "iksemel"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define this is you want default transport */
-#define USE_DEFAULT_IO 1
-
-/* Version number of package */
-#define VERSION "1.3"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
diff --git a/libs/win32/iksemel/iksemel.2017.vcxproj b/libs/win32/iksemel/iksemel.2017.vcxproj
deleted file mode 100644
index 38f4e4d429..0000000000
--- a/libs/win32/iksemel/iksemel.2017.vcxproj
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>iksemel</ProjectName>
-    <ProjectGuid>{E727E8F6-935D-46FE-8B0E-37834748A0E3}</ProjectGuid>
-    <RootNamespace>iksemel</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\..\w32\openssl.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\iksemel\src\base64.c" />
-    <ClCompile Include="..\..\iksemel\src\dom.c" />
-    <ClCompile Include="..\..\iksemel\src\filter.c" />
-    <ClCompile Include="..\..\iksemel\src\iks.c" />
-    <ClCompile Include="..\..\iksemel\src\ikstack.c" />
-    <ClCompile Include="..\..\iksemel\src\io-posix.c" />
-    <ClCompile Include="..\..\iksemel\src\jabber.c" />
-    <ClCompile Include="..\..\iksemel\src\md5.c" />
-    <ClCompile Include="..\..\iksemel\src\sax.c" />
-    <ClCompile Include="..\..\iksemel\src\sha.c" />
-    <ClCompile Include="..\..\iksemel\src\stream.c" />
-    <ClCompile Include="..\..\iksemel\src\utility.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\iksemel\include\common.h" />
-    <ClInclude Include="..\..\iksemel\include\config.h" />
-    <ClInclude Include="..\..\iksemel\include\finetune.h" />
-    <ClInclude Include="..\..\iksemel\include\iksemel.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/win32/ldns/ldns-lib/config.h b/libs/win32/ldns/ldns-lib/config.h
index 58463456b3..fb29bc2c7c 100644
--- a/libs/win32/ldns/ldns-lib/config.h
+++ b/libs/win32/ldns/ldns-lib/config.h
@@ -260,7 +260,9 @@
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
-#define inline
+#ifndef _WIN32
+#define inline /* Do not define inline for Windows to avoid warnings/errors with winsock2.h usage of inline within the latest Windows SDKs */
+#endif
 #endif
 
 #if _MSC_VER >= 1900
diff --git a/libs/win32/libav/libav.2017.vcxproj b/libs/win32/libav/libav.2017.vcxproj
index df547c3a7c..1b4ed945b7 100644
--- a/libs/win32/libav/libav.2017.vcxproj
+++ b/libs/win32/libav/libav.2017.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectName>libav</ProjectName>
     <RootNamespace>libav</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectGuid>{841C345F-FCC7-4F64-8F54-0281CEABEB01}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\w32\yasm.props" Condition=" '$(YasmPropsImported)' == '' " />
diff --git a/libs/win32/libcbt/libcbt.2017.vcxproj b/libs/win32/libcbt/libcbt.2017.vcxproj
deleted file mode 100644
index 9df8a3d599..0000000000
--- a/libs/win32/libcbt/libcbt.2017.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\fifo.cpp" />
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\gpib.cpp" />
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\iobase.cpp" />
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\kbhit.cpp" />
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\portscan.cpp" />
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\serportx.cpp" />
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\win32\getopt.cpp" />
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\win32\serport.cpp" />
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\win32\timer.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\ctb.h" />
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\fifo.h" />
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\getopt.h" />
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\gpib.h" />
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\iobase.h" />
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\kbhit.h" />
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\portscan.h" />
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serport.h" />
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serportx.h" />
-    <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\timer.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}</ProjectGuid>
-    <ProjectName>libcbt</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>$(PlatformName)\$(Configuration)\</OutDir>
-    <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4311;4302;4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/ignore:4042 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4311;4302;4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/ignore:4042 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4311;4302;4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/ignore:4042 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4311;4302;4800;4101;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/ignore:4042 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/win32/libyuv/libyuv.2017.vcxproj b/libs/win32/libyuv/libyuv.2017.vcxproj
index 136ac5119b..f74f7e1203 100644
--- a/libs/win32/libyuv/libyuv.2017.vcxproj
+++ b/libs/win32/libyuv/libyuv.2017.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}</ProjectGuid>
     <RootNamespace>libyuv</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
diff --git a/libs/win32/portaudio/portaudio.2017.vcxproj b/libs/win32/portaudio/portaudio.2017.vcxproj
deleted file mode 100644
index 05445a6ee9..0000000000
--- a/libs/win32/portaudio/portaudio.2017.vcxproj
+++ /dev/null
@@ -1,859 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug DirectSound|Win32">
-      <Configuration>Debug DirectSound</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug DirectSound|x64">
-      <Configuration>Debug DirectSound</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release DirectSound|Win32">
-      <Configuration>Release DirectSound</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release DirectSound|x64">
-      <Configuration>Release DirectSound</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>portaudio</ProjectName>
-    <ProjectGuid>{0A18A071-125E-442F-AFF7-A3F68ABECF99}</ProjectGuid>
-    <RootNamespace>portaudio</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\w32\download_portaudio.props" Condition=" '$(downloadportaudioPropsImported)' == '' " />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;PAWIN_USE_WDMKS_DEVICE_INFO;PAWIN_WDMKS_NO_KSGUID_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\portaudio\src\common\pa_allocation.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_converters.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_cpuload.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_debugprint.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_dither.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_front.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_process.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_stream.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_trace.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\pa_asio.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\asio.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\combase.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\register.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds_dynlink.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\skeleton\pa_hostapi_skeleton.c" />
-    <ClCompile Include="..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\wasapi\pa_win_wasapi.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_coinitialize.c" />
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_hostapis.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_util.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_waveformat.c" />
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_wdmks_utils.c" />
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_x86_plain_converters.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="portaudio.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/win32/speex/libspeexdsp.2017.vcxproj b/libs/win32/speex/libspeexdsp.2017.vcxproj
index 3c50103da9..4e2ba30453 100644
--- a/libs/win32/speex/libspeexdsp.2017.vcxproj
+++ b/libs/win32/speex/libspeexdsp.2017.vcxproj
@@ -38,7 +38,7 @@
     <ProjectGuid>{03207781-0D1C-4DB3-A71D-45C608F28DBD}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <ProjectName>libspeexdsp</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(SolutionDir)\w32\download_speex.props" Condition=" '$(downloadspeexPropsImported)' == '' " />
diff --git a/libs/xmlrpc-c/include/xmlrpc-c/string_int.h b/libs/xmlrpc-c/include/xmlrpc-c/string_int.h
index 04ac8c782b..a0cc58605f 100644
--- a/libs/xmlrpc-c/include/xmlrpc-c/string_int.h
+++ b/libs/xmlrpc-c/include/xmlrpc-c/string_int.h
@@ -3,7 +3,12 @@
 
 
 #include <stdarg.h>
+
+#ifdef __APPLE__
+#include <strings.h>
+#else
 #include <string.h>
+#endif
 
 #include "xmlrpc_config.h"
 #include "c_util.h"
diff --git a/libs/xmlrpc-c/lib/abyss/src/server.c b/libs/xmlrpc-c/lib/abyss/src/server.c
index 6337dcfd78..ca05011b83 100644
--- a/libs/xmlrpc-c/lib/abyss/src/server.c
+++ b/libs/xmlrpc-c/lib/abyss/src/server.c
@@ -1,6 +1,9 @@
 /* Copyright information is at end of file */
 
 #define _XOPEN_SOURCE 600  /* Make sure strdup() is in <string.h> */
+#ifdef __APPLE__
+#define _DARWIN_C_SOURCE
+#endif
 #define _BSD_SOURCE  /* Make sure setgroups()is in <grp.h> */
 #ifndef _DEFAULT_SOURCE
 #define _DEFAULT_SOURCE
diff --git a/libs/xmlrpc-c/lib/abyss/src/thread_fork.c b/libs/xmlrpc-c/lib/abyss/src/thread_fork.c
index d96bf59eb1..7ea382918a 100644
--- a/libs/xmlrpc-c/lib/abyss/src/thread_fork.c
+++ b/libs/xmlrpc-c/lib/abyss/src/thread_fork.c
@@ -3,7 +3,11 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#ifdef __APPLE__
+#include <sys/wait.h>
+#else
 #include <wait.h>
+#endif
 #include <signal.h>
 
 #include "xmlrpc_config.h"
diff --git a/libs/xmlrpc-c/lib/libutil/asprintf.c b/libs/xmlrpc-c/lib/libutil/asprintf.c
index b52523065a..f078518bb5 100644
--- a/libs/xmlrpc-c/lib/libutil/asprintf.c
+++ b/libs/xmlrpc-c/lib/libutil/asprintf.c
@@ -1,4 +1,7 @@
 #define _XOPEN_SOURCE 600  /* Make sure strdup() is in <string.h> */
+#ifdef __APPLE__
+#define _DARWIN_C_SOURCE
+#endif
 #ifndef _GNU_SOURCE
 	#define _GNU_SOURCE  /* But only when HAVE_ASPRINTF */
 #endif
diff --git a/scripts/ci/common.sh b/scripts/ci/common.sh
index cecb1289bc..e5a4ba2dea 100755
--- a/scripts/ci/common.sh
+++ b/scripts/ci/common.sh
@@ -126,11 +126,6 @@ set_fs_ver () {
   sed -e "s|\(%define nonparsedversion \).*|\1$rpm_version|"  \
        freeswitch.spec > freeswitch.spec.$$
   mv freeswitch.spec.$$ freeswitch.spec
-
-  sed -e "s|\(%define nonparsedversion \).*|\1$rpm_version|"  \
-       freeswitch-config-rayo.spec > freeswitch-config-rayo.spec.$$
-  mv freeswitch-config-rayo.spec.$$ freeswitch-config-rayo.spec
-
 #%define version 1.5.16
 
 }
@@ -141,10 +136,6 @@ set_fs_release () {
     sed -e "s|\(%define release \).*|\1$release|"  \
          freeswitch.spec > freeswitch.spec.$$
     mv freeswitch.spec.$$ freeswitch.spec
-
-    sed -e "s|\(%define release \).*|\1$release|"  \
-         freeswitch-config-rayo.spec > freeswitch-config-rayo.spec.$$
-    mv freeswitch-config-rayo.spec.$$ freeswitch-config-rayo.spec
   fi
 }
 
diff --git a/scripts/ci/config-rayo.sh b/scripts/ci/config-rayo.sh
deleted file mode 100755
index 54b77f81ca..0000000000
--- a/scripts/ci/config-rayo.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-##### -*- mode:shell-script; indent-tabs-mode:nil; sh-basic-offset:2 -*-
-
-sdir="."
-[ -n "${0%/*}" ] && sdir="${0%/*}"
-. $sdir/common.sh
-
-check_pwd
-check_input_ver_build $@
-eval $(parse_version "$1")
-
-if [ -n "$rev" ]; then
-  dst_name="freeswitch-$cmajor.$cminor.$cmicro.$rev"
-else
-  dst_name="freeswitch-$cmajor.$cminor.$cmicro"
-fi
-dst_parent="/tmp/"
-dst_dir="/tmp/$dst_name"
-release="1"
-if [ $# -gt 1 ]; then
-  release="$2"
-fi
-
-(mkdir -p rpmbuild && cd rpmbuild && mkdir -p SOURCES BUILD BUILDROOT i386 x86_64 SPECS)
-
-cd $src_repo
-cp -a src_dist/*.spec rpmbuild/SPECS/ || true
-cp -a src_dist/* rpmbuild/SOURCES/ || true
-cd rpmbuild/SPECS
-set_fs_release "$release"
-cd ../../
-
-rpmbuild --define "_topdir %(pwd)/rpmbuild" \
-  --define "_rpmdir %{_topdir}" \
-  --define "_srcrpmdir %{_topdir}" \
-  -ba rpmbuild/SPECS/freeswitch-config-rayo.spec
-
-mkdir -p $src_repo/RPMS
-mv $src_repo/rpmbuild/*/freeswitch-config-rayo*.rpm $src_repo/RPMS/.
-
-cat 1>&2 <<EOF
-----------------------------------------------------------------------
-The Rayo configuration RPMs have been rolled
-----------------------------------------------------------------------
-EOF
-
diff --git a/scripts/ci/src_tarball.sh b/scripts/ci/src_tarball.sh
index 2cc2b382e1..c2c6ed70cf 100755
--- a/scripts/ci/src_tarball.sh
+++ b/scripts/ci/src_tarball.sh
@@ -58,7 +58,6 @@ mkdir -p ${src_repo}/../src_dist
 mv -f ${dst_name}.tar.* ${src_repo}/../src_dist
 mv -f $dst_name.zip ${src_repo}/../src_dist
 cp -f ${dst_dir}/freeswitch.spec ${src_repo}/../src_dist
-cp -f ${dst_dir}/freeswitch-config-rayo.spec ${src_repo}/../src_dist
 
 rm -rf ${dst_name}.tar $dst_dir
 
diff --git a/scripts/freeswitch.pkg_deps.sh b/scripts/freeswitch.pkg_deps.sh
index 77e15f3471..64cdc445a0 100755
--- a/scripts/freeswitch.pkg_deps.sh
+++ b/scripts/freeswitch.pkg_deps.sh
@@ -6,7 +6,6 @@ wget -c http://svn.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/mpg123.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/openldap-2.4.11.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-latest.tar.gz
-wget -c http://svn.freeswitch.org/downloads/libs/soundtouch-1.3.1.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/sphinxbase-0.4.99-latest.tar.gz
 wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-8000-1.0.8.tar.gz
 wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-16000-1.0.8.tar.gz
diff --git a/scripts/lua/hangup_jitterbuffer_metrics.lua b/scripts/lua/hangup_jitterbuffer_metrics.lua
new file mode 100755
index 0000000000..8e3dd37623
--- /dev/null
+++ b/scripts/lua/hangup_jitterbuffer_metrics.lua
@@ -0,0 +1,53 @@
+local https = require("socket.http")
+local ip = os.getenv("LOCAL_IPV4")
+local response_body = {}
+-- jitter buffer stats
+local size_max_ms = session:getVariable("rtp_jb_size_max_ms");
+local size_est_ms = session:getVariable("rtp_jb_size_est_ms");
+local acceleration_ms = session:getVariable("rtp_jb_acceleration_ms");
+local expand_ms = session:getVariable("rtp_jb_expand_ms");
+local jitter_max_ms = session:getVariable("rtp_jb_jitter_max_ms");
+local jitter_est_ms = session:getVariable("rtp_jb_jitter_est_ms");
+
+local reset_count = session:getVariable("rtp_jb_reset_count"); 
+local reset_too_big = session:getVariable("rtp_jb_reset_too_big");
+local reset_missing_frames = session:getVariable("rtp_jb_reset_missing_frames");
+local reset_ts_jump = session:getVariable("rtp_jb_reset_ts_jump");
+local reset_error = session:getVariable("rtp_jb_reset_error");
+local call_id     = session:getVariable("sip_call_id");
+local out_call_id = session:getVariable("last_bridge_to");
+
+if size_max_ms == nil or size_est_ms == nil or acceleration_ms == nil or expand_ms == nil or jitter_max_ms == nil or jitter_est_ms == nil then
+	session:consoleLog("info",  "[metrics] jitter no data\n");
+	return
+end
+local request_body = '{"in_call_id": "'..call_id..'", "out_call_id": "'..out_call_id..'", "jb":{"size_max_ms":'..size_max_ms..
+                      ',"size_est_ms":'..size_est_ms..',"acceleration_ms":'..acceleration_ms..',"expand_ms":'..expand_ms..
+		      ',"jitter_max_ms":'..jitter_max_ms..',"jitter_est_ms":'..jitter_est_ms..',"reset":'..reset_count
+-- if reset_too_big ~= "0" then
+	request_body = request_body .. ',"reset_too_big":'..reset_too_big
+-- end
+if reset_missing_frames ~= "0" then
+	request_body = request_body .. ',"reset_missing_frames":'..reset_missing_frames
+end
+if reset_ts_jump ~= "0" then
+	request_body = request_body .. ',"reset_ts_jump":'..reset_ts_jump
+end
+if reset_error ~= "0" then
+	request_body = request_body .. ',"reset_error":'..reset_error
+end
+
+local v = request_body .. '}}';
+
+local r, c, h, s = https.request{
+	method = 'POST',
+	url = "http://"..ip..":80/freeswitch_metrics",
+	headers = {
+		["Content-Type"] = "application/json",
+		["Content-Length"] = string.len(v)
+	},
+	source = ltn12.source.string(v),
+	sink = ltn12.sink.table(response_body)
+}
+-- print('statusCode ', c)
+session:consoleLog("info",  "[metrics] jitter:".. v .. "\n");
diff --git a/scripts/packaging/README.md b/scripts/packaging/README.md
new file mode 100644
index 0000000000..88059328c7
--- /dev/null
+++ b/scripts/packaging/README.md
@@ -0,0 +1,40 @@
+# Installing FreeSWITCH using FSGET
+
+## Prerequisites
+
+### Dependencies
+Make sure you have `cURL` binary installed or use any other downloader.
+To install curl type
+```
+apt update && apt install -y curl
+```
+
+### Authentication required
+
+A `SignalWire Personal Access Token` (PAT) or an `API Token` (for enterprise customers) is required to access FreeSWITCH install packages.
+
+[HOWTO Create a SignalWire Personal Access Token](https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Installation/how-to-create-a-personal-access-token/how-to-create-a-personal-access-token)
+
+[Upgrade to FreeSWITCH Advantage](https://signalwire.com/products/freeswitch-enterprise)
+
+## Configuring FreeSWITCH Debian repository
+```
+curl -sSL https://freeswitch.org/fsget | bash -s <PAT or API token> [release|prerelease] [install]
+```
+
+Notice that `fsget` accepts arguments:
+- `<PAT or FSA token>` (Required)
+- `[release|prerelease]` (Optional) - `release` by default, `prerelease` is what you see in the `master` branch
+- `[install]` (Optional) - If missing it will not install FreeSWITCH automatically after configuring the repository
+
+`FreeSWITCH Community` or `FreeSWITCH Enterprise` version is installed based on the token provided.
+
+Enterprise customers may install `FreeSWITCH Community` versions by using a `SignalWire Personal Access Token` instead of an `API Token`.
+## Installing FreeSWITCH
+If not installed already type
+
+```
+apt-get install -y freeswitch-meta-all
+```
+
+Enjoy using FreeSWITCH!
\ No newline at end of file
diff --git a/scripts/packaging/fsget.sh b/scripts/packaging/fsget.sh
new file mode 100755
index 0000000000..bb5e005853
--- /dev/null
+++ b/scripts/packaging/fsget.sh
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+TOKEN=$1
+RELEASE=$2
+INSTALL=$3
+
+# Source the os-release file (assuming it exists)
+. /etc/os-release
+echo $ID
+echo $VERSION_CODENAME
+
+if [ "${ID,,}" = "debian" ]; then
+	ARCH=$(dpkg --print-architecture)
+	if [[ "${TOKEN}" == pat_* ]]; then
+		echo "FreeSWITCH Community"
+
+		RPI=""
+
+		if [ "${RELEASE,,}" = "prerelease" ]; then
+			RELEASE="unstable"
+		else
+			RELEASE="release"
+		fi
+
+		echo $RELEASE
+
+		if [ "${ARCH,,}" = "armhf" ]; then
+			RPI="rpi/"
+		fi
+
+		rm -f /etc/apt/sources.list.d/freeswitch.list
+		apt-get update && apt-get install -y gnupg2 wget software-properties-common apt-transport-https
+
+		wget --http-user=signalwire --http-password=$TOKEN -O /usr/share/keyrings/signalwire-freeswitch-repo.gpg https://freeswitch.signalwire.com/repo/deb/${RPI}debian-release/signalwire-freeswitch-repo.gpg
+		echo "machine freeswitch.signalwire.com login signalwire password $TOKEN" > /etc/apt/auth.conf
+		chmod 600 /etc/apt/auth.conf
+		echo "deb [signed-by=/usr/share/keyrings/signalwire-freeswitch-repo.gpg] https://freeswitch.signalwire.com/repo/deb/${RPI}debian-${RELEASE}/ ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/freeswitch.list
+		echo "deb-src [signed-by=/usr/share/keyrings/signalwire-freeswitch-repo.gpg] https://freeswitch.signalwire.com/repo/deb/${RPI}debian-${RELEASE}/ ${VERSION_CODENAME} main" >> /etc/apt/sources.list.d/freeswitch.list
+
+		apt-get update
+		if [ "${INSTALL}" = "install" ]; then
+			echo "Installing FreeSWITCH Community"
+			apt-get install -y freeswitch-meta-all
+			echo "------------------------------------------------------------------"
+			echo " Done installing FreeSWITCH Community"
+			echo "------------------------------------------------------------------"
+		else
+			echo "------------------------------------------------------------------"
+			echo " Done configuring FreeSWITCH Debian repository"
+			echo "------------------------------------------------------------------"
+			echo "To install FreeSWITCH Community type: apt-get install -y freeswitch-meta-all"
+		fi
+	elif [[ "${TOKEN}" == PT* ]]; then
+		echo "FreeSWITCH Enterprise"
+
+		if [ "${RELEASE,,}" = "prerelease" ]; then
+			RELEASE="unstable"
+		else
+			RELEASE="1.8"
+		fi
+
+		echo $RELEASE
+
+		if [ "${ARCH,,}" = "armhf" ]; then
+			RPI="-rpi"
+		fi
+
+		rm -f /etc/apt/sources.list.d/freeswitch.list
+		apt-get update && apt-get install -y gnupg2 wget software-properties-common apt-transport-https
+
+		wget --http-user=signalwire --http-password=$TOKEN -O - https://fsa.freeswitch.com/repo/deb/fsa${RPI}/pubkey.gpg | apt-key add -
+		echo "machine fsa.freeswitch.com login signalwire password $TOKEN" > /etc/apt/auth.conf
+		chmod 600 /etc/apt/auth.conf
+		echo "deb https://fsa.freeswitch.com/repo/deb/fsa${RPI}/ ${VERSION_CODENAME} ${RELEASE}" > /etc/apt/sources.list.d/freeswitch.list
+		echo "deb-src https://fsa.freeswitch.com/repo/deb/fsa${RPI}/ ${VERSION_CODENAME} ${RELEASE}" >> /etc/apt/sources.list.d/freeswitch.list
+
+		apt-get update
+		if [ "${INSTALL}" = "install" ]; then
+			echo "Installing FreeSWITCH Enterprise"
+			apt-get install -y freeswitch-meta-all
+			echo "------------------------------------------------------------------"
+			echo " Done installing FreeSWITCH Enterprise"
+			echo "------------------------------------------------------------------"
+		else
+			echo "------------------------------------------------------------------"
+			echo " Done configuring FreeSWITCH Debian repository"
+			echo "------------------------------------------------------------------"
+			echo "To install FreeSWITCH Enterprise type: apt-get install -y freeswitch-meta-all"
+		fi
+	else
+		echo "Unrecognized token type"
+	fi
+else
+	echo "Unrecognized OS. We support Debian only."
+fi
\ No newline at end of file
diff --git a/scripts/perl/timezones/build-zonedata.pl b/scripts/perl/timezones/build-zonedata.pl
new file mode 100755
index 0000000000..347a743dae
--- /dev/null
+++ b/scripts/perl/timezones/build-zonedata.pl
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+my $remote_version = `wget --quiet https://data.iana.org/time-zones/tzdb/version --output-document -` =~ s/\n//r;
+my $local_version;
+
+if ( open my $in, "<data/version" ) {
+    $local_version = do { local $/; <$in> };
+    close $in;
+}
+
+my $up_to_date = defined($local_version) && $local_version eq $remote_version;
+
+if ( ! $up_to_date ) {
+    open my $out, ">data/version";
+    print $out $remote_version;
+    close $out;
+}
+
+$local_version = $remote_version;
+
+`wget --quiet --timestamping --directory-prefix=data https://data.iana.org/time-zones/tzdb-latest.tar.lz`;
+`tar --extract --file=data/tzdb-latest.tar.lz --directory=data`;
+`make DESTDIR=../ TZDIR=zones-$local_version --directory=data/tzdb-$local_version posix_only`;
+
+print("Yay. Now you can run\n  ./timezone-gen.pl --base=data/zones-$local_version --output=timezones-$local_version.conf.xml")
\ No newline at end of file
diff --git a/scripts/perl/timezones/data/.gitignore b/scripts/perl/timezones/data/.gitignore
new file mode 100644
index 0000000000..144983b728
--- /dev/null
+++ b/scripts/perl/timezones/data/.gitignore
@@ -0,0 +1,4 @@
+tzdb-*
+zones-*
+version
+tzdb-latest.tar.lz
\ No newline at end of file
diff --git a/scripts/perl/timezones/fix-tzstr.pl b/scripts/perl/timezones/fix-tzstr.pl
new file mode 100644
index 0000000000..224c9a550e
--- /dev/null
+++ b/scripts/perl/timezones/fix-tzstr.pl
@@ -0,0 +1,61 @@
+#!/usr/bin/perl
+
+sub fixTzstr {
+    # switch_time.c expects POSIX-style TZ rule, but it won't process quoted TZ
+    # rules that look like this: <-04>4 or <-04>4<-03>
+    # See https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
+
+    # Instead it defaults to UTC for these values. Here we process the quoted
+    # values and convert them into letters. If the zone name has "GMT", we use
+    # that as the replacement prefix, otherwise a default "STD" is used. Zones
+    # that have a quoted suffix have their suffix replaced with "DST".
+
+    my ($tzstr, $name) = @_;
+
+    if ( $tzstr =~ /(<(?<std>[^>]+)>)([^<]+)(?<dst><.+>)?(?<rest>.+)?/ ) {
+        my ($tzprefix, $tzsuffix, $tzrest, $offset, $offsetprefix) = ("") x 5;
+
+        if ( defined($+{std}) ) {
+            my $std = $+{std};
+            
+            if ( lc($name) =~ m/gmt/) {
+                $tzprefix = "GMT";
+            } else {
+                $tzprefix = "STD"; 
+            }
+
+            if ( $std =~ m/\+/ )  {
+                $offset = sprintf "%d", $std =~ s/\+//r;
+                $offsetprefix = "-";
+            } else {
+                $offset = sprintf "%d", $std =~ s/\-//r;
+            }
+
+            my @chars = split(//, $offset);
+            if ( @chars > 2 ) {
+                my $hours = $chars[-3];
+                if ( defined( $chars[-4] ) ) {
+                    $hours = $chars[-4].$hours;
+                }
+
+                $offset = $hours.":".$chars[-2].$chars[-1];
+            }
+
+            $offset = $offsetprefix.$offset;
+        }
+
+        if ( defined($+{dst}) ) {
+            $tzsuffix = "DST";
+        }
+
+        if ( defined($+{rest}) ) {
+            $tzrest = $+{rest};
+        }
+
+        return $tzprefix.$offset.$tzsuffix.$tzrest;
+    }
+
+    return $tzstr;
+}
+
+1;
\ No newline at end of file
diff --git a/scripts/perl/timezones/tests.pl b/scripts/perl/timezones/tests.pl
new file mode 100644
index 0000000000..3aec76ff68
--- /dev/null
+++ b/scripts/perl/timezones/tests.pl
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+=pod
+Tests to verify that the provided modifications to timezone formats produce 
+the correct results. The first set of tests verify the fixTzstr subroutine 
+converts the quoted values to something that won't make FreeSWITCH default to
+UTC.
+
+The second set of tests confirms that those timezone changes actually produce
+the correct timestamps.
+
+Make sure FreeSWITCH already has already loaded the timezones.conf.xml that you 
+want to test.
+
+To run tests:
+
+TIMEZONES_XML_PATH=path/to/timezones.conf.xml prove tests.pl
+=cut
+
+use strict;
+use warnings;
+use Test::More;
+use ESL;
+use XML::LibXML::Reader;
+
+require "./fix-tzstr.pl";
+
+use Env qw(TIMEZONES_XML_PATH);
+die "The TIMEZONES_XML_PATH environment variable must be set to test timezones." unless ( defined($TIMEZONES_XML_PATH) );
+
+ok( fixTzstr("<-02>2", "doesntmatterhere") eq "STD2" );
+ok( fixTzstr("EST5EDT,M3.2.0,M11.1.0", "US/Eastern") eq "EST5EDT,M3.2.0,M11.1.0" );
+ok( fixTzstr("<+11>-11", "GMT-11") eq "GMT-11" );
+ok( fixTzstr("<-02>2<-01>,M3.5.0/-1,M10.5.0/0", "America/Godthab") eq "STD2DST,M3.5.0/-1,M10.5.0/0" );
+
+my $test_count = 4;
+
+my $tz_fmt = "%Y-%m-%d %H:%M:%S";
+my $c = new ESL::ESLconnection("127.0.0.1", "8021", "ClueCon");
+$c->api("reloadxml")->getBody();
+my $epoch = $c->api("strepoch")->getBody();
+run_tests($epoch);
+run_tests("1699613236"); # testing DST, add more epochs as needed
+
+sub run_tests {
+    my $epoch = shift;
+    my $reader = XML::LibXML::Reader->new(location => $TIMEZONES_XML_PATH);
+    while ($reader->read) {
+        my $tag = $reader;
+        if ( $tag->name eq "zone" && $tag->hasAttributes() ) {
+            my $zn = $tag->getAttribute("name");
+
+            my $cmd = `TZ='$zn' date +'$tz_fmt' --date='\@$epoch'`;
+            my $sys_time = $cmd =~ s/\n//r;
+            my $fs_time = $c->api("strftime_tz $zn $epoch|$tz_fmt")->getBody();
+
+            ok ( $sys_time eq $fs_time, $zn ) or diag(
+                "  (sys) $sys_time\t(fs) $fs_time"
+            );
+
+            $test_count++;
+        }
+    }
+}
+
+done_testing($test_count);
\ No newline at end of file
diff --git a/scripts/perl/timezone-gen.pl b/scripts/perl/timezones/timezone-gen.pl
similarity index 90%
rename from scripts/perl/timezone-gen.pl
rename to scripts/perl/timezones/timezone-gen.pl
index e812023ef0..86822cc553 100755
--- a/scripts/perl/timezone-gen.pl
+++ b/scripts/perl/timezones/timezone-gen.pl
@@ -1,10 +1,12 @@
 #!/usr/bin/perl
 
 use strict;
+use warnings;
 use Getopt::Long;
 use XML::Entities;
 use HTML::Entities;
 
+require "./fix-tzstr.pl";
 
 my $base   = "/usr/share/zoneinfo";
 my $output = "timezones.conf.xml";
@@ -18,7 +20,7 @@ my $res = GetOptions(
     "base=s" => \$base,
     "debug+" => \$debug,
     "help"   => \$help,
-    "output" => \$output
+    "output=s" => \$output
 );
 if ( !$res || $help ) {
     print "$0 [--base=/usr/share/zoneinfo] [--output=timezones.conf.xml] [--debug] [--help]\n";
@@ -64,7 +66,9 @@ foreach my $name ( sort( keys(%name_to_file) ) ) {
         next;
     }
 
-    $zones{$name} = pop(@strings);
+    my $tzstr = fixTzstr( pop(@strings), $name );
+
+    $zones{$name} = $tzstr;
 }
 
 open( my $out, ">$output" );
@@ -83,7 +87,7 @@ foreach my $zone ( sort( keys(%zones) ) ) {
     }
     $lastprefix = $newprefix;
 
-    print $out "\t<zone name=\"$zone\" value=\"$str\" />\n";
+    print $out " " x 8, "<zone name=\"$zone\" value=\"$str\" />\n";
 }
 print $out " " x 4, "</timezones>\n";
 print $out "</configuration>\n";
diff --git a/scripts/setup-git.sh b/scripts/setup-git.sh
index 54d30219d6..ffdc47dfe9 100755
--- a/scripts/setup-git.sh
+++ b/scripts/setup-git.sh
@@ -73,7 +73,7 @@ EOF
       via 'git config --global user.name "$name"
 EOF
 
-[ -n "$name" ] \
+[ -n "$email" ] \
   && cat 1>&2 <<EOF
 
     Your email has been set to: $email
diff --git a/src/cJSON.c b/src/cJSON.c
index 6d0e4946fd..ae0a2e2007 100644
--- a/src/cJSON.c
+++ b/src/cJSON.c
@@ -1104,34 +1104,32 @@ static unsigned char *print(const cJSON * const item, cJSON_bool format, const i
     buffer->length = default_buffer_size;
     buffer->format = format;
     buffer->hooks = *hooks;
-    if (buffer->buffer == NULL)
-    {
+
+    if (buffer->buffer == NULL) {
         goto fail;
     }
 
     /* print the value */
-    if (!print_value(item, buffer))
-    {
+    if (!print_value(item, buffer)) {
         goto fail;
     }
+
     update_offset(buffer);
 
     /* check if reallocate is available */
-    if (hooks->reallocate != NULL)
-    {
+    if (hooks->reallocate != NULL) {
         printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->offset + 1);
         if (printed == NULL) {
             goto fail;
         }
+
         buffer->buffer = NULL;
-    }
-    else /* otherwise copy the JSON over to a new buffer */
-    {
+    } else { /* otherwise copy the JSON over to a new buffer */
         printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
-        if (printed == NULL)
-        {
+        if (printed == NULL) {
             goto fail;
         }
+
         memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1));
         printed[buffer->offset] = '\0'; /* just to be sure */
 
@@ -1142,16 +1140,10 @@ static unsigned char *print(const cJSON * const item, cJSON_bool format, const i
     return printed;
 
 fail:
-    if (buffer->buffer != NULL)
-    {
+    if (buffer->buffer != NULL) {
         hooks->deallocate(buffer->buffer);
     }
 
-    if (printed != NULL)
-    {
-        hooks->deallocate(printed);
-    }
-
     return NULL;
 }
 
@@ -1942,33 +1934,41 @@ static cJSON_bool add_item_to_object(cJSON * const object, const char * const st
 
 CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item)
 {
-    add_item_to_object(object, string, item, &global_hooks, false);
+    cJSON_bool res = add_item_to_object(object, string, item, &global_hooks, false);
+    (void)res;
 }
 
 /* Add an item to an object with constant string as key */
 CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item)
 {
-    add_item_to_object(object, string, item, &global_hooks, true);
+    cJSON_bool res = add_item_to_object(object, string, item, &global_hooks, true);
+    (void)res;
 }
 
 CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)
 {
+    cJSON_bool res;
+
     if (array == NULL)
     {
         return;
     }
 
-    add_item_to_array(array, create_reference(item, &global_hooks));
+    res = add_item_to_array(array, create_reference(item, &global_hooks));
+    (void)res;
 }
 
 CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item)
 {
+    cJSON_bool res;
+
     if ((object == NULL) || (string == NULL))
     {
         return;
     }
 
-    add_item_to_object(object, string, create_reference(item, &global_hooks), &global_hooks, false);
+    res = add_item_to_object(object, string, create_reference(item, &global_hooks), &global_hooks, false);
+    (void)res;
 }
 
 CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name)
diff --git a/src/fs_encode.c b/src/fs_encode.c
index 235a5d9f11..527dc3eeff 100644
--- a/src/fs_encode.c
+++ b/src/fs_encode.c
@@ -46,7 +46,7 @@
 #pragma warning (disable:167)
 #endif
 
-static void fs_encode_cleanup()
+static void fs_encode_cleanup(void)
 {
 	switch_safe_free(SWITCH_GLOBAL_dirs.conf_dir);
 	switch_safe_free(SWITCH_GLOBAL_dirs.mod_dir);
diff --git a/src/fs_tts.c b/src/fs_tts.c
index 2a963ee68e..6632e86566 100644
--- a/src/fs_tts.c
+++ b/src/fs_tts.c
@@ -46,7 +46,7 @@
 #pragma warning (disable:167)
 #endif
 
-static void fs_tts_cleanup()
+static void fs_tts_cleanup(void)
 {
 	switch_safe_free(SWITCH_GLOBAL_dirs.conf_dir);
 	switch_safe_free(SWITCH_GLOBAL_dirs.mod_dir);
diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index ee927e6db9..352e399d2a 100644
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -325,6 +325,24 @@ SWITCH_DECLARE(switch_status_t) switch_channel_get_scope_variables(switch_channe
 SWITCH_DECLARE(const char *) switch_channel_get_variable_dup(switch_channel_t *channel, const char *varname, switch_bool_t dup, int idx);
 #define switch_channel_get_variable(_c, _v) switch_channel_get_variable_dup(_c, _v, SWITCH_TRUE, -1)
 
+/*!
+  \brief Retrieve a copy of a variable from a given channel. switch_safe_free() call will be required.
+  \param channel channel to retrieve variable from
+  \param varname the name of the variable
+  \return a strdup copy the value of the requested variable without using a memory pool.
+*/
+SWITCH_DECLARE(const char *) switch_channel_get_variable_strdup(switch_channel_t *channel, const char *varname);
+
+/*!
+  \brief Retrieve a variable from a given channel to a pre-allocated buffer without using a memory pool.
+  \param channel channel to retrieve variable from
+  \param varname the name of the variable
+  \param buf a pre allocated buffer to put the value to
+  \param buflen size of the buffer
+  \return SWITCH_STATUS_SUCCESS if the value was copied to the buffer and it is not NULL, SWITCH_STATUS_FALSE otherwise.
+*/
+SWITCH_DECLARE(switch_status_t) switch_channel_get_variable_buf(switch_channel_t *channel, const char *varname, char *buf, switch_size_t buflen);
+
 SWITCH_DECLARE(switch_status_t) switch_channel_get_variables(switch_channel_t *channel, switch_event_t **event);
 SWITCH_DECLARE(switch_status_t) switch_channel_get_variables_prefix(switch_channel_t *channel, const char *prefix, switch_event_t **event);
 SWITCH_DECLARE(switch_status_t) switch_channel_pass_callee_id(switch_channel_t *channel, switch_channel_t *other_channel);
diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index e4c615941d..ff04fa0954 100644
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -1822,6 +1822,17 @@ SWITCH_DECLARE(void) switch_core_session_unlock_codec_write(_In_ switch_core_ses
 SWITCH_DECLARE(void) switch_core_session_lock_codec_read(_In_ switch_core_session_t *session);
 SWITCH_DECLARE(void) switch_core_session_unlock_codec_read(_In_ switch_core_session_t *session);
 
+/*!
+  \brief Lock codec read mutex and codec write mutex using trylock in an infinite loop
+  \param session session to lock the codec in
+*/
+SWITCH_DECLARE(void) switch_core_codec_lock_full(switch_core_session_t *session);
+
+/*!
+  \brief Unlock codec read mutex and codec write mutex
+  \param session session to unlock the codec in
+*/
+SWITCH_DECLARE(void) switch_core_codec_unlock_full(switch_core_session_t *session);
 
 SWITCH_DECLARE(switch_status_t) switch_core_session_get_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp);
 SWITCH_DECLARE(switch_status_t) switch_core_session_get_real_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp);
diff --git a/src/include/switch_core_media.h b/src/include/switch_core_media.h
index 8694a0bc88..1c1c321cb3 100644
--- a/src/include/switch_core_media.h
+++ b/src/include/switch_core_media.h
@@ -399,6 +399,10 @@ SWITCH_DECLARE(void) switch_core_media_set_smode(switch_core_session_t *session,
 SWITCH_DECLARE(void) switch_core_media_set_resolveice(switch_bool_t resolve_ice);
 SWITCH_DECLARE(switch_bool_t) switch_core_media_has_resolveice(void);
 
+typedef struct switch_rtp_engine_s switch_rtp_engine_t;
+SWITCH_DECLARE(switch_rtp_engine_t *) switch_core_media_get_engine(switch_core_session_t *session, int media_type);
+SWITCH_DECLARE(switch_codec_t*) switch_core_media_get_codec(switch_core_session_t *session, switch_media_type_t type);
+
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs:
diff --git a/src/include/switch_curl.h b/src/include/switch_curl.h
index 5872527865..bad116daf2 100644
--- a/src/include/switch_curl.h
+++ b/src/include/switch_curl.h
@@ -40,6 +40,9 @@ typedef int switch_CURLINFO;
 typedef int switch_CURLcode;
 typedef int switch_CURLoption;
 
+#define HAVE_SWITCH_CURL_MIME
+typedef void switch_curl_mime;
+
 SWITCH_DECLARE(switch_CURL *) switch_curl_easy_init(void);
 SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_perform(switch_CURL *handle);
 SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_getinfo(switch_CURL *curl, switch_CURLINFO info, ... );
@@ -50,7 +53,9 @@ SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_setopt(CURL *handle, switch_CUR
 SWITCH_DECLARE(const char *) switch_curl_easy_strerror(switch_CURLcode errornum );
 SWITCH_DECLARE(void) switch_curl_init(void);
 SWITCH_DECLARE(void) switch_curl_destroy(void);
-SWITCH_DECLARE(switch_status_t) switch_curl_process_form_post_params(switch_event_t *event, switch_CURL *curl_handle, struct curl_httppost **formpostp);
+SWITCH_DECLARE(switch_status_t) switch_curl_process_mime(switch_event_t *event, switch_CURL *curl_handle, switch_curl_mime **mimep);
+SWITCH_DECLARE(void) switch_curl_mime_free(switch_curl_mime **mimep);
+SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_setopt_mime(switch_CURL *curl_handle, switch_curl_mime *mime);
 #define switch_curl_easy_setopt curl_easy_setopt
 
 SWITCH_END_EXTERN_C
diff --git a/src/include/switch_jitterbuffer.h b/src/include/switch_jitterbuffer.h
index bee0fa02f8..f098ede2db 100644
--- a/src/include/switch_jitterbuffer.h
+++ b/src/include/switch_jitterbuffer.h
@@ -61,6 +61,7 @@ SWITCH_DECLARE(switch_status_t) switch_jb_get_packet(switch_jb_t *jb, switch_rtp
 SWITCH_DECLARE(uint32_t) switch_jb_pop_nack(switch_jb_t *jb);
 SWITCH_DECLARE(switch_status_t) switch_jb_get_packet_by_seq(switch_jb_t *jb, uint16_t seq, switch_rtp_packet_t *packet, switch_size_t *len);
 SWITCH_DECLARE(void) switch_jb_set_session(switch_jb_t *jb, switch_core_session_t *session);
+SWITCH_DECLARE(void) switch_jb_set_jitter_estimator(switch_jb_t *jb, double *jitter, uint32_t samples_per_frame, uint32_t samples_per_second);
 SWITCH_DECLARE(void) switch_jb_ts_mode(switch_jb_t *jb, uint32_t samples_per_frame, uint32_t samples_per_second);
 SWITCH_DECLARE(void) switch_jb_set_flag(switch_jb_t *jb, switch_jb_flag_t flag);
 SWITCH_DECLARE(void) switch_jb_clear_flag(switch_jb_t *jb, switch_jb_flag_t flag);
diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h
index 7c54ed67df..ddaaf120a1 100644
--- a/src/include/switch_module_interfaces.h
+++ b/src/include/switch_module_interfaces.h
@@ -676,8 +676,14 @@ struct switch_codec_fmtp {
 	int bits_per_second;
 	/*! number of microseconds of media in one packet (ptime * 1000) */
 	int microseconds_per_packet;
-	/*! stereo  */
-	int stereo;
+	/*! maximum ptime in ms */
+	int max_ptime;
+	/*! minimum ptime in ms */
+	int min_ptime;
+	/*! stereo, typically bidirectional */
+	int stereo; 
+	/* sender properties (stereo) */
+	int sprop_stereo;
 	/*! private data for the codec module to store handle specific info */
 	void *private_info;
 
diff --git a/src/include/switch_rtp.h b/src/include/switch_rtp.h
index ca915cf77a..7986bdb622 100644
--- a/src/include/switch_rtp.h
+++ b/src/include/switch_rtp.h
@@ -103,15 +103,18 @@ typedef struct icand_s {
 	switch_port_t rport;
 	char *generation;
 	uint8_t ready;
+	uint8_t responsive;
+	uint8_t use_candidate;
 } icand_t;
 
 #define MAX_CAND 50
+#define MAX_CAND_IDX_COUNT 2
 typedef struct ice_s {
 
-	icand_t cands[MAX_CAND][2];
-	int cand_idx[2];
-	int chosen[2];
-	int is_chosen[2];
+	icand_t cands[MAX_CAND][MAX_CAND_IDX_COUNT];
+	int cand_idx[MAX_CAND_IDX_COUNT];
+	int chosen[MAX_CAND_IDX_COUNT];
+	int is_chosen[MAX_CAND_IDX_COUNT];
 	char *ufrag;
 	char *pwd;
 	char *options;
diff --git a/src/include/switch_stun.h b/src/include/switch_stun.h
index 54b03088e8..ca612c06aa 100644
--- a/src/include/switch_stun.h
+++ b/src/include/switch_stun.h
@@ -141,6 +141,13 @@ typedef struct {
 	uint32_t address;
 } switch_stun_ip_t;
 
+typedef struct {
+	uint8_t wasted;
+	uint8_t family;
+	uint16_t port;
+	uint8_t address[16];
+} switch_stun_ipv6_t;
+
 #if SWITCH_BYTE_ORDER == __BIG_ENDIAN
 
 typedef struct {
diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 7b519899af..e71570c21d 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -255,6 +255,10 @@ SWITCH_BEGIN_EXTERN_C
 
 typedef uint8_t switch_byte_t;
 
+typedef struct {
+	unsigned int value : 31;
+} switch_uint31_t;
+
 typedef enum {
 	SWITCH_PVT_PRIMARY = 0,
 	SWITCH_PVT_SECONDARY
@@ -595,6 +599,13 @@ SWITCH_DECLARE_DATA extern switch_filenames SWITCH_GLOBAL_filenames;
 
 #define SWITCH_ACCEPTABLE_INTERVAL(_i) (_i && _i <= SWITCH_MAX_INTERVAL && (_i % 10) == 0)
 
+/* Check if RAND_MAX is a power of 2 minus 1 or in other words all bits set */
+#if ((RAND_MAX) & ((RAND_MAX) + 1)) == 0 && (RAND_MAX) != 0
+#define SWITCH_RAND_MAX RAND_MAX
+#else
+#define SWITCH_RAND_MAX 0x7fff
+#endif
+
 typedef enum {
 	SWITCH_RW_READ,
 	SWITCH_RW_WRITE
@@ -1784,7 +1795,8 @@ typedef enum {
 	SWITCH_SPEECH_FLAG_BLOCKING = (1 << 3),
 	SWITCH_SPEECH_FLAG_PAUSE = (1 << 4),
 	SWITCH_SPEECH_FLAG_OPEN = (1 << 5),
-	SWITCH_SPEECH_FLAG_DONE = (1 << 6)
+	SWITCH_SPEECH_FLAG_DONE = (1 << 6),
+	SWITCH_SPEECH_FLAG_MULTI = (1 << 7)
 } switch_speech_flag_enum_t;
 typedef uint32_t switch_speech_flag_t;
 
@@ -2249,7 +2261,8 @@ typedef enum {
 	SWITCH_CAUSE_BAD_IDENTITY_INFO = 821,
 	SWITCH_CAUSE_UNSUPPORTED_CERTIFICATE = 822,
 	SWITCH_CAUSE_INVALID_IDENTITY = 823,
-	SWITCH_CAUSE_STALE_DATE = 824
+	SWITCH_CAUSE_STALE_DATE = 824,
+	SWITCH_CAUSE_REJECT_ALL = 825
 } switch_call_cause_t;
 
 typedef enum {
@@ -2424,6 +2437,7 @@ typedef enum {
 	SCC_VIDEO_RESET,
 	SCC_AUDIO_PACKET_LOSS,
 	SCC_AUDIO_ADJUST_BITRATE,
+	SCC_AUDIO_VAD,
 	SCC_DEBUG,
 	SCC_CODEC_SPECIFIC
 } switch_codec_control_command_t;
@@ -2654,10 +2668,12 @@ struct switch_live_array_s;
 typedef struct switch_live_array_s switch_live_array_t;
 
 typedef enum {
-	SDP_TYPE_REQUEST,
-	SDP_TYPE_RESPONSE
+	SDP_OFFER,
+	SDP_ANSWER
 } switch_sdp_type_t;
 
+#define SDP_TYPE_REQUEST SDP_OFFER
+#define SDP_TYPE_RESPONSE SDP_ANSWER
 
 typedef enum {
 	AEAD_AES_256_GCM_8,
diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 62f3fcd97e..a0c91e6384 100644
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -498,6 +498,14 @@ SWITCH_DECLARE(switch_size_t) switch_fp_read_dline(FILE *fd, char **buf, switch_
 SWITCH_DECLARE(switch_status_t) switch_frame_alloc(switch_frame_t **frame, switch_size_t size);
 SWITCH_DECLARE(switch_status_t) switch_frame_dup(switch_frame_t *orig, switch_frame_t **clone);
 SWITCH_DECLARE(switch_status_t) switch_frame_free(switch_frame_t **frame);
+
+/*! \brief Check if a 32 bit unsigned number is in a range.
+ * \param str string to check. Should not contain non-digit characters.
+ * \param from start of range including this number
+ * \param to end of range including this number
+ * \return true or false
+ */
+SWITCH_DECLARE(switch_bool_t) switch_is_uint_in_range(const char *str, unsigned int from, unsigned int to);
 SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str);
 SWITCH_DECLARE(switch_bool_t) switch_is_leading_number(const char *str);
 SWITCH_DECLARE(char *) switch_find_parameter(const char *str, const char *param, switch_memory_pool_t *pool);
@@ -1506,6 +1514,11 @@ SWITCH_DECLARE(switch_status_t) switch_digest_string(const char *digest_name, ch
 SWITCH_DECLARE(char *) switch_must_strdup(const char *_s);
 SWITCH_DECLARE(const char *) switch_memory_usage_stream(switch_stream_handle_t *stream);
 
+/**
+/ Compliant random number generator. Returns the value between 0 and 0x7fff (RAND_MAX).
+**/
+SWITCH_DECLARE(int) switch_rand(void);
+
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs:
diff --git a/src/include/test/switch_fct.h b/src/include/test/switch_fct.h
index 8cb07cc20f..b28feabb74 100644
--- a/src/include/test/switch_fct.h
+++ b/src/include/test/switch_fct.h
@@ -255,7 +255,7 @@ fctstr_safe_cpy(char *dst, char const *src, size_t num)
 #if defined(WIN32) && _MSC_VER >= 1400
     strncpy_s(dst, num, src, _TRUNCATE);
 #else
-    strncpy(dst, src, num);
+    strncpy(dst, src, num - 1);
 #endif
     dst[num-1] = '\0';
 }
@@ -760,6 +760,7 @@ fct_nlist__init2(fct_nlist_t *list, size_t start_sz)
         list->itm_list = (void**)malloc(sizeof(void*)*start_sz);
         if ( list->itm_list == NULL )
         {
+            list->used_itm_num = 0;
             return 0;
         }
     }
diff --git a/src/mod/.gitignore b/src/mod/.gitignore
index 90608ed1ed..e3298c6125 100644
--- a/src/mod/.gitignore
+++ b/src/mod/.gitignore
@@ -21,9 +21,6 @@
 /applications/mod_spandsp/Makefile
 /applications/mod_spandsp/Makefile.in
 /applications/mod_spandsp/mod_spandsp.log
-/applications/mod_stress/Makefile
-/applications/mod_stress/Makefile.in
-/applications/mod_stress/mod_stress.log
 /applications/mod_translate/Makefile
 /applications/mod_valet_parking/Makefile
 /applications/mod_voicemail/Makefile
@@ -33,24 +30,15 @@
 /codecs/mod_vp8/Makefile
 /dialplans/mod_dialplan_asterisk/Makefile
 /dialplans/mod_dialplan_xml/Makefile
-/endpoints/mod_portaudio/Makefile
-/endpoints/mod_portaudio/Makefile.in
-/endpoints/mod_portaudio/mod_portaudio.log
 /endpoints/mod_skinny/Makefile
 /endpoints/mod_skinny/Makefile.in
 /endpoints/mod_skinny/mod_skinny.log
-/endpoints/mod_skypopen/Makefile
-/endpoints/mod_skypopen/Makefile.in
-/endpoints/mod_skypopen/mod_skypopen.log
 /endpoints/mod_sofia/Makefile
 /endpoints/mod_sofia/Makefile.in
 /endpoints/mod_sofia/mod_sofia.log
 /event_handlers/mod_erlang_event/Makefile
 /event_handlers/mod_event_socket/Makefile
 /formats/mod_native_file/Makefile
-/formats/mod_portaudio_stream/Makefile
-/formats/mod_portaudio_stream/Makefile.in
-/formats/mod_portaudio_stream/mod_portaudio_stream.log
 /formats/mod_tone_stream/Makefile
 /languages/mod_java/Makefile
 /languages/mod_java/classes/
@@ -69,7 +57,6 @@
 /say/mod_say_ru/Makefile
 /timers/mod_posix_timer/Makefile
 /timers/mod_timerfd/Makefile
-/endpoints/mod_unicall/Makefile
 */*/Makefile.in
 */*/Makefile
 */*/mod_*.log
@@ -80,8 +67,6 @@ directories/mod_ldap/Win32/
 languages/mod_managed/Win32/
 /applications/mod_av/test/Makefile
 /applications/mod_av/test/Makefile.in
-/event_handlers/mod_rayo/test/Makefile
-/event_handlers/mod_rayo/test/Makefile.in
 /applications/mod_av/test/test_avformat
 /applications/mod_av/test/test_mod_av
 /languages/mod_lua/test/Makefile
diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index 325e8e81d7..e1cc13fb6d 100644
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -7,10 +7,6 @@ uninstall: $(OUR_UNINSTALL_MODULES) $(OUR_DISABLED_UNINSTALL_MODULES)
 print_tests: $(OUR_TEST_MODULES)
 check: $(OUR_CHECK_MODULES)
 
-mod_skypopen-all: mod_gsmopen-all
-mod_gsmopen-all: mod_spandsp-all
-mod_rayo-all: mod_ssml-all
-mod_ssml-all: mod_rayo-all
 
 $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODULES) $(OUR_DISABLED_MODULES) $(OUR_DISABLED_CLEAN_MODULES) $(OUR_DISABLED_INSTALL_MODULES) $(OUR_DISABLED_UNINSTALL_MODULES) $(OUR_TEST_MODULES) $(OUR_CHECK_MODULES):
 	@set fnord $$MAKEFLAGS; amf=$$2; \
diff --git a/src/mod/applications/mod_abstraction/Makefile.am b/src/mod/applications/mod_abstraction/Makefile.am
deleted file mode 100644
index 8ab961eeb2..0000000000
--- a/src/mod/applications/mod_abstraction/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_abstraction
-
-mod_LTLIBRARIES = mod_abstraction.la
-mod_abstraction_la_SOURCES  = mod_abstraction.c
-mod_abstraction_la_CFLAGS   = $(AM_CFLAGS)
-mod_abstraction_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_abstraction_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml b/src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml
deleted file mode 100644
index d4b1dfd274..0000000000
--- a/src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration name="abstraction.conf" description="Abstraction">
-<apis>
-	<api name="user_name" description="Return Name for extension" syntax="<exten>" parse="(.*)" destination="user_data" argument="$1@default var effective_caller_id_name"/>
-</apis>
-</configuration>
diff --git a/src/mod/applications/mod_abstraction/mod_abstraction.2017.vcxproj b/src/mod/applications/mod_abstraction/mod_abstraction.2017.vcxproj
deleted file mode 100644
index e6a7666b80..0000000000
--- a/src/mod/applications/mod_abstraction/mod_abstraction.2017.vcxproj
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_abstraction</ProjectName>
-    <ProjectGuid>{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}</ProjectGuid>
-    <RootNamespace>mod_abstraction</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_abstraction.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/applications/mod_abstraction/mod_abstraction.c b/src/mod/applications/mod_abstraction/mod_abstraction.c
deleted file mode 100644
index 11144462ec..0000000000
--- a/src/mod/applications/mod_abstraction/mod_abstraction.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Marc Olivier Chouinard <mochouinard@moctel.com>
- *
- *
- * mod_abstraction.c -- Abstraction
- *
- */
-#include <switch.h>
-
-/* Prototypes */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_abstraction_shutdown);
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_abstraction_runtime);
-SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load);
-
-const char *global_cf = "abstraction.conf";
-
-/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime)
- * Defines a switch_loadable_module_function_table_t and a static const char[] modname
- */
-SWITCH_MODULE_DEFINITION(mod_abstraction, mod_abstraction_load, mod_abstraction_shutdown, NULL);
-
-SWITCH_STANDARD_API(api_abstraction_function)
-{
-	const char *api_name = switch_event_get_header(stream->param_event, "API-Command");
-	switch_xml_t cfg, xml, x_apis, x_api;
-
-	if (!(xml = switch_xml_open_cfg(global_cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf);
-		goto end;
-	}
-
-	if (!(x_apis = switch_xml_child(cfg, "apis"))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n");
-		goto end;
-	}
-
-	if ((x_api = switch_xml_find_child_multi(x_apis, "api", "name", api_name , NULL))) {
-		const char *parse = switch_xml_attr_soft(x_api, "parse");
-		const char *destination = switch_xml_attr_soft(x_api, "destination");
-		const char *arguments = switch_xml_attr_soft(x_api, "argument");
-
-		int proceed;
-		switch_regex_t *re = NULL;
-		int ovector[30];
-
-		if ((proceed = switch_regex_perform(cmd, parse, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
-			const char *api_args = NULL;
-			char *substituted = NULL;
-
-			if (cmd && strchr(parse, '(')) {
-				uint32_t len = (uint32_t) (strlen(cmd) + strlen(arguments) + 10) * proceed;
-				if (!(substituted = malloc(len))) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
-					goto end;
-				}
-				memset(substituted, 0, len);
-				switch_perform_substitution(re, proceed, arguments, cmd , substituted, len, ovector);
-				api_args = substituted;
-			} else {
-				api_args = arguments;
-			}
-			switch_api_execute(destination, api_args, session, stream);
-
-			switch_safe_free(substituted);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No match for API %s  (%s != %s)\n", api_name, parse, cmd);
-		}
-		switch_regex_safe_free(re);
-
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "API %s doesn't exist inside the xml structure.  You might have forgot to reload the module after editing it\n", api_name);
-	}
-
-end:
-	if (xml)
-		switch_xml_free(xml);
-
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* Macro expands to: switch_status_t mod_abstraction_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
-SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load)
-{
-	switch_status_t status = SWITCH_STATUS_TERM;
-	switch_api_interface_t *api_interface;
-	switch_xml_t cfg, xml, x_apis, x_api;
-	int count = 0;
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	if (!(xml = switch_xml_open_cfg(global_cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf);
-		goto end;
-	}
-
-	if (!(x_apis = switch_xml_child(cfg, "apis"))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n");
-		goto end;
-	}
-
-	for (x_api = switch_xml_child(x_apis, "api"); x_api; x_api = x_api->next) {
-		const char *name = switch_xml_attr_soft(x_api, "name");
-		const char *description = switch_xml_attr_soft(x_api, "description");
-		const char *syntax = switch_xml_attr_soft(x_api, "syntax");
-		SWITCH_ADD_API(api_interface, name, description, api_abstraction_function, syntax);
-		count++;
-
-	}
-	if (count > 0) {
-		status = SWITCH_STATUS_SUCCESS;
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No API abstraction defined\n");
-	}
-end:
-	if (xml)
-		switch_xml_free(xml);
-
-	return status;
-}
-
-/*
-   Called when the system shuts down
-   Macro expands to: switch_status_t mod_abstraction_shutdown() */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_abstraction_shutdown)
-{
-	/* Cleanup dynamically allocated config settings */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/applications/mod_av/avcodec.c b/src/mod/applications/mod_av/avcodec.c
index a9f6d0927e..0293b83446 100644
--- a/src/mod/applications/mod_av/avcodec.c
+++ b/src/mod/applications/mod_av/avcodec.c
@@ -26,6 +26,7 @@
  * Seven Du <dujinfang@gmail.com>
  * Anthony Minessale <anthm@freeswitch.org>
  * Emmanuel Schmidbauer <eschmidbauer@gmail.com>
+ * Jakub Karolczyk <jakub.karolczyk@signalwire.com>
  *
  * mod_avcodec -- Codec with libav.org and ffmpeg
  *
@@ -34,6 +35,9 @@
 #include <switch.h>
 #include "mod_av.h"
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
+#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
+#endif
 #include <libavformat/avformat.h>
 #include <libavutil/opt.h>
 #include <libavutil/imgutils.h>
@@ -373,8 +377,13 @@ typedef struct our_h264_nalu_s {
 
 typedef struct h264_codec_context_s {
 	switch_buffer_t *nalu_buffer;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 	AVCodec *decoder;
 	AVCodec *encoder;
+#else
+	const AVCodec *decoder;
+	const AVCodec *encoder;
+#endif
 	AVCodecContext *decoder_ctx;
 	int got_pps; /* if pps packet received */
 	int64_t pts;
@@ -393,12 +402,13 @@ typedef struct h264_codec_context_s {
 	switch_codec_settings_t codec_settings;
 	AVCodecContext *encoder_ctx;
 	AVFrame *encoder_avframe;
-	AVPacket encoder_avpacket;
+	AVPacket *encoder_avpacket;
 	AVFrame *decoder_avframe;
 	our_h264_nalu_t nalus[MAX_NALUS];
 	enum AVCodecID av_codec_id;
 	uint16_t last_seq; // last received frame->seq
 	int hw_encoder;
+	switch_packetizer_t *packetizer;
 } h264_codec_context_t;
 
 #ifndef AV_INPUT_BUFFER_PADDING_SIZE
@@ -825,7 +835,11 @@ static void fs_rtp_parse_h263_rfc2190(h264_codec_context_t *context, AVPacket *p
 	const uint8_t *p = buf;
 	const uint8_t *buf_base = buf;
 	uint32_t code = (ntohl(*(uint32_t *)buf) & 0xFFFFFC00) >> 10;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 	int mb_info_size = 0;
+#else
+	switch_size_t mb_info_size = 0;
+#endif
 	int mb_info_pos = 0, mb_info_count = 0;
 	const uint8_t *mb_info;
 
@@ -889,7 +903,11 @@ static void fs_rtp_parse_h263_rfc2190(h264_codec_context_t *context, AVPacket *p
 						    "Unable to split H263 packet! mb_info_pos=%d mb_info_count=%d pos=%d max=%"SWITCH_SIZE_T_FMT"\n", mb_info_pos, mb_info_count, pos, (switch_size_t)(end - buf_base));
 					}
 				} else {
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Should Not Happen!!! mb_info_pos=%d mb_info_count=%d mb_info_size=%d\n", mb_info_pos, mb_info_count, mb_info_size);
+#else
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Should Not Happen!!! mb_info_pos=%d mb_info_count=%d mb_info_size=%"SWITCH_SIZE_T_FMT"\n", mb_info_pos, mb_info_count, mb_info_size);
+#endif
 				}
 			}
 		}
@@ -1033,7 +1051,7 @@ static switch_status_t consume_h263_bitstream(h264_codec_context_t *context, swi
 	}
 
 	if (!context->nalus[context->nalu_current_index].len) {
-		av_packet_unref(&context->encoder_avpacket);
+		av_packet_unref(context->encoder_avpacket);
 		frame->m = 1;
 	}
 
@@ -1081,81 +1099,27 @@ static switch_status_t consume_h263p_bitstream(h264_codec_context_t *context, sw
 #endif
 
 	if (frame->m) {
-		av_packet_unref(&context->encoder_avpacket);
+		av_packet_unref(context->encoder_avpacket);
 		return SWITCH_STATUS_SUCCESS;
 	}
 
 	return SWITCH_STATUS_MORE_DATA;
 }
 
-static switch_status_t consume_h264_bitstream(h264_codec_context_t *context, switch_frame_t *frame)
-{
-	AVPacket *pkt = &context->encoder_avpacket;
-	our_h264_nalu_t *nalu = &context->nalus[context->nalu_current_index];
-	uint8_t nalu_hdr = *(uint8_t *)(nalu->start);
-	uint8_t nalu_type = nalu_hdr & 0x1f;
-	uint8_t nri = nalu_hdr & 0x60;
-	int left = nalu->len - (nalu->eat - nalu->start);
-	uint8_t *p = frame->data;
-	uint8_t start = nalu->start == nalu->eat ? 0x80 : 0;
-	int n = nalu->len / SLICE_SIZE;
-	int slice_size = nalu->len / (n + 1) + 1 + 2;
-
-	if (nalu->len <= SLICE_SIZE) {
-		memcpy(frame->data, nalu->start, nalu->len);
-		frame->datalen = nalu->len;
-		context->nalu_current_index++;
-
-		if (context->nalus[context->nalu_current_index].len) {
-			frame->m = 0;
-			return SWITCH_STATUS_MORE_DATA;
-		}
-
-		if (pkt->size > 0) av_packet_unref(pkt);
-
-		switch_clear_flag(frame, SFF_CNG);
-		frame->m = 1;
-
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (left <= (slice_size - 2)) {
-		p[0] = nri | 28; // FU-A
-		p[1] = 0x40 | nalu_type;
-		memcpy(p+2, nalu->eat, left);
-		nalu->eat += left;
-		frame->datalen = left + 2;
-		context->nalu_current_index++;
-
-		if (!context->nalus[context->nalu_current_index].len) {
-			if (pkt->size > 0) av_packet_unref(pkt);
-			frame->m = 1;
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		return SWITCH_STATUS_MORE_DATA;
-	}
-
-	p[0] = nri | 28; // FU-A
-	p[1] = start | nalu_type;
-	if (start) nalu->eat++;
-	memcpy(p+2, nalu->eat, slice_size - 2);
-	nalu->eat += (slice_size - 2);
-	frame->datalen = slice_size;
-	frame->m = 0;
-	return SWITCH_STATUS_MORE_DATA;
-}
-
 static switch_status_t consume_nalu(h264_codec_context_t *context, switch_frame_t *frame)
 {
-	AVPacket *pkt = &context->encoder_avpacket;
+	AVPacket *pkt = context->encoder_avpacket;
 	our_h264_nalu_t *nalu = &context->nalus[context->nalu_current_index];
 
 	if (!nalu->len) {
 		frame->datalen = 0;
 		frame->m = 0;
-		if (pkt->size > 0) av_packet_unref(pkt);
+		if (pkt->size > 0) {
+			av_packet_unref(pkt);
+		}
+
 		context->nalu_current_index = 0;
+
 		return SWITCH_STATUS_NOTFOUND;
 	}
 
@@ -1167,7 +1131,9 @@ static switch_status_t consume_nalu(h264_codec_context_t *context, switch_frame_
 		return consume_h263p_bitstream(context, frame);
 	}
 
-	return consume_h264_bitstream(context, frame);
+	switch_assert(0);
+
+	return SWITCH_STATUS_FALSE;
 }
 
 static void set_h264_private_data(h264_codec_context_t *context, avcodec_profile_t *profile)
@@ -1342,9 +1308,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 		set_h264_private_data(context, aprofile);
 	}
 
-GCC_DIAG_OFF(deprecated-declarations)
 	avcodec_string(codec_string, sizeof(codec_string), context->encoder_ctx, 0);
-GCC_DIAG_ON(deprecated-declarations)
 
 	dump_encoder_ctx(context->encoder_ctx);
 
@@ -1436,6 +1400,16 @@ static switch_status_t switch_h264_init(switch_codec_t *codec, switch_codec_flag
 		}
 	}
 
+	switch (context->av_codec_id) {
+	case AV_CODEC_ID_H264:
+		context->packetizer = switch_packetizer_create(SPT_H264_BITSTREAM, SLICE_SIZE);
+		break;
+	default:
+		break;
+	}
+
+	context->encoder_avpacket = av_packet_alloc();
+
 	switch_buffer_create_dynamic(&(context->nalu_buffer), H264_NALU_BUFFER_SIZE, H264_NALU_BUFFER_SIZE * 8, 0);
 	codec->private_info = context;
 
@@ -1460,7 +1434,7 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec, switch_frame_t
 	int ret;
 	int *got_output = &context->got_encoded_output;
 	AVFrame *avframe = NULL;
-	AVPacket *pkt = &context->encoder_avpacket;
+	AVPacket **pkt = &context->encoder_avpacket;
 	uint32_t width = 0;
 	uint32_t height = 0;
 	switch_image_t *img = frame->img;
@@ -1480,6 +1454,16 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec, switch_frame_t
 	}
 
 	if (frame->flags & SFF_SAME_IMAGE) {
+		if (context->packetizer) {
+			switch_status_t status = switch_packetizer_read(context->packetizer, frame);
+
+			if (status == SWITCH_STATUS_SUCCESS && (*pkt)->size > 0) {
+				av_packet_unref(*pkt);
+			}
+
+			return status;
+		}
+
 		// read from nalu buffer
 		return consume_nalu(context, frame);
 	}
@@ -1489,6 +1473,7 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec, switch_frame_t
 		if (open_encoder(context, width, height) != SWITCH_STATUS_SUCCESS) {
 			goto error;
 		}
+
 		avctx = context->encoder_ctx;
 	}
 
@@ -1498,6 +1483,7 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec, switch_frame_t
 		if (open_encoder(context, width, height) != SWITCH_STATUS_SUCCESS) {
 			goto error;
 		}
+
 		avctx = context->encoder_ctx;
 	}
 
@@ -1507,13 +1493,13 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec, switch_frame_t
 		if (open_encoder(context, width, height) != SWITCH_STATUS_SUCCESS) {
 			goto error;
 		}
+
 		avctx = context->encoder_ctx;
 		switch_set_flag(frame, SFF_WAIT_KEY_FRAME);
 	}
 
-	av_init_packet(pkt);
-	pkt->data = NULL;      // packet data will be allocated by the encoder
-	pkt->size = 0;
+	av_packet_unref(*pkt);
+	/* packet data will be allocated by the encoder */
 
 	avframe = context->encoder_avframe;
 
@@ -1578,14 +1564,41 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec, switch_frame_t
 	/* encode the image */
 	memset(context->nalus, 0, sizeof(context->nalus));
 	context->nalu_current_index = 0;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 GCC_DIAG_OFF(deprecated-declarations)
-	ret = avcodec_encode_video2(avctx, pkt, avframe, got_output);
+	ret = avcodec_encode_video2(avctx, *pkt, avframe, got_output);
 GCC_DIAG_ON(deprecated-declarations)
 
 	if (ret < 0) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Encoding Error %d\n", ret);
 		goto error;
 	}
+#else
+	ret = avcodec_send_frame(avctx, avframe);
+
+	if (ret == AVERROR_EOF) {
+		ret = 0;
+	} else if (ret == AVERROR(EAGAIN)) {
+		/* we fully drain all the output in each encode call, so this should not ever happen */
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Error sending frame to encoder - BUG, should never happen\n");
+		goto error;
+	} else if (ret < 0) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error sending frame to encoder\n");
+		goto error;
+	}
+
+	while (ret >= 0) {
+		ret = avcodec_receive_packet(avctx, *pkt);
+		if (ret == AVERROR(EAGAIN)) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video packets at the moment\n");
+		} else if (ret == AVERROR_EOF) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video packets at all\n");
+		} else if (ret < 0) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Encoding error\n");
+			av_packet_unref(*pkt);
+			goto error;
+		}
+#endif
 
 	if (context->need_key_frame && avframe->key_frame == 1) {
 		avframe->pict_type = 0;
@@ -1595,81 +1608,78 @@ GCC_DIAG_ON(deprecated-declarations)
 
 // process:
 
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 	if (*got_output) {
-		const uint8_t *p = pkt->data;
-		int i = 0;
+#else
+	if (ret >= 0) {
+#endif
+		switch_status_t status = SWITCH_STATUS_SUCCESS;
 
 		*got_output = 0;
 
 		if (context->av_codec_id == AV_CODEC_ID_H263) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG5,
 							  "Encoded frame %" SWITCH_INT64_T_FMT " (size=%5d) [0x%02x 0x%02x 0x%02x 0x%02x] got_output: %d slices: %d\n",
-							  context->pts, pkt->size, *((uint8_t *)pkt->data), *((uint8_t *)(pkt->data + 1)), *((uint8_t *)(pkt->data + 2)),
-							  *((uint8_t *)(pkt->data + 3)), *got_output, avctx->slices);
+							  context->pts, (*pkt)->size, *((uint8_t *)(*pkt)->data), *((uint8_t *)((*pkt)->data + 1)), *((uint8_t *)((*pkt)->data + 2)),
+							  *((uint8_t *)((*pkt)->data + 3)), *got_output, avctx->slices);
 
 #ifdef H263_MODE_B
-			fs_rtp_parse_h263_rfc2190(context, pkt);
+			fs_rtp_parse_h263_rfc2190(context, *pkt);
 #endif
 
 			context->nalu_current_index = 0;
+
 			return consume_nalu(context, frame);
 		} else if (context->av_codec_id == AV_CODEC_ID_H263P){
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG5,
 							  "Encoded frame %" SWITCH_INT64_T_FMT " (size=%5d) [0x%02x 0x%02x 0x%02x 0x%02x] got_output: %d slices: %d\n",
-							  context->pts, pkt->size, *((uint8_t *)pkt->data), *((uint8_t *)(pkt->data + 1)), *((uint8_t *)(pkt->data + 2)),
-							  *((uint8_t *)(pkt->data + 3)), *got_output, avctx->slices);
-			fs_rtp_parse_h263_rfc4629(context, pkt);
+							  context->pts, (*pkt)->size, *((uint8_t *)(*pkt)->data), *((uint8_t *)((*pkt)->data + 1)), *((uint8_t *)((*pkt)->data + 2)),
+							  *((uint8_t *)((*pkt)->data + 3)), *got_output, avctx->slices);
+			fs_rtp_parse_h263_rfc4629(context, *pkt);
 			context->nalu_current_index = 0;
+
 			return consume_nalu(context, frame);
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG5,
 							  "Encoded frame %" SWITCH_INT64_T_FMT " (size=%5d) nalu_type=0x%x %d\n",
-							  context->pts, pkt->size, *((uint8_t *)pkt->data +4), *got_output);
-		}
-		/* split into nalus */
-		memset(context->nalus, 0, sizeof(context->nalus));
-
-		while ((p = fs_avc_find_startcode(p, pkt->data+pkt->size)) < (pkt->data + pkt->size)) {
-			if (!context->nalus[i].start) {
-				while (!(*p++)) ; /* eat the sync bytes, what ever 0 0 1 or 0 0 0 1 */
-				context->nalus[i].start = p;
-				context->nalus[i].eat = p;
-
-				if ((*p & 0x1f) == 7) { // Got Keyframe
-					// prevent to generate key frame too frequently
-					context->last_keyframe_request = switch_time_now();
-					if (mod_av_globals.debug) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "KEY FRAME GENERATED\n");
-					}
-				}
-			} else {
-				context->nalus[i].len = p - context->nalus[i].start;
-				while (!(*p++)) ; /* eat the sync bytes, what ever 0 0 1 or 0 0 0 1 */
-				i++;
-				context->nalus[i].start = p;
-				context->nalus[i].eat = p;
-			}
-			if (i >= MAX_NALUS - 2) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "TOO MANY SLICES!\n");
-				break;
-			}
+							  context->pts, (*pkt)->size, *((uint8_t *)(*pkt)->data +4), *got_output);
 		}
 
-		context->nalus[i].len = p - context->nalus[i].start;
-		context->nalu_current_index = 0;
-		return consume_nalu(context, frame);
+		status = switch_packetizer_feed(context->packetizer, (*pkt)->data, (*pkt)->size);
+		if (status != SWITCH_STATUS_SUCCESS) {
+			if ((*pkt)->size > 0) {
+				av_packet_unref(*pkt);
+			}
+
+			return status;
+		}
+
+		status = switch_packetizer_read(context->packetizer, frame);
+		if (status == SWITCH_STATUS_SUCCESS && (*pkt)->size > 0) {
+			av_packet_unref(*pkt);
+		}
+
+		return status;
 	}
 
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+		break;
+	}
+#endif
+
 error:
 	frame->datalen = 0;
+
 	return SWITCH_STATUS_FALSE;
 }
 
 static switch_status_t switch_h264_decode(switch_codec_t *codec, switch_frame_t *frame)
 {
 	h264_codec_context_t *context = (h264_codec_context_t *)codec->private_info;
-	AVCodecContext *avctx= context->decoder_ctx;
 	switch_status_t status;
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+	int ret = 0;
+#endif
 
 	switch_assert(frame);
 
@@ -1702,27 +1712,57 @@ static switch_status_t switch_h264_decode(switch_codec_t *codec, switch_frame_t
 
 	if (frame->m) {
 		uint32_t size = switch_buffer_inuse(context->nalu_buffer);
-		AVPacket pkt = { 0 };
+		AVPacket *pkt = NULL;
 		AVFrame *picture;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 		int got_picture = 0;
 		int decoded_len;
+#endif
 
 		if (size > 0) {
-			av_init_packet(&pkt);
+			pkt = av_packet_alloc();
 			switch_buffer_zero_fill(context->nalu_buffer, AV_INPUT_BUFFER_PADDING_SIZE);
-			switch_buffer_peek_zerocopy(context->nalu_buffer, (const void **)&pkt.data);
-			pkt.size = size;
+			switch_buffer_peek_zerocopy(context->nalu_buffer, (const void **)&pkt->data);
+			pkt->size = size;
 
 			if (!context->decoder_avframe) context->decoder_avframe = av_frame_alloc();
 			picture = context->decoder_avframe;
 			switch_assert(picture);
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 GCC_DIAG_OFF(deprecated-declarations)
-			decoded_len = avcodec_decode_video2(avctx, picture, &got_picture, &pkt);
+			decoded_len = avcodec_decode_video2(context->decoder_ctx, picture, &got_picture, pkt);
 GCC_DIAG_ON(deprecated-declarations)
+#else
+			ret = avcodec_send_packet(context->decoder_ctx, pkt);
+
+			if (ret == AVERROR_EOF) {
+				ret = 0;
+			} else if (ret == AVERROR(EAGAIN)) {
+				/* we fully drain all the output in each decode call, so this should not ever happen */
+				ret = AVERROR_BUG;
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error sending packet to decoder BUG, should never happen\n");
+			} else if (ret < 0) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error sending packet to decoder\n");
+			}
+
+			while (ret >= 0) {
+				ret = avcodec_receive_frame(context->decoder_ctx, picture);
+				if (ret == AVERROR(EAGAIN)) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video frames at the moment\n");
+				} else if (ret == AVERROR_EOF) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video frames at all\n");
+				} else if (ret < 0) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Video decoding error\n");
+				}
+#endif
 
 			// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buffer: %d got pic: %d len: %d [%dx%d]\n", size, got_picture, decoded_len, picture->width, picture->height);
 
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 			if (got_picture && decoded_len > 0) {
+#else
+			if (ret >= 0) {
+#endif
 				int width = picture->width;
 				int height = picture->height;
 
@@ -1744,7 +1784,15 @@ GCC_DIAG_ON(deprecated-declarations)
 				frame->img = context->img;
 			}
 
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+				if (ret < 0) {
+					break;
+				}
+			}
+#endif
+
 			av_frame_unref(picture);
+			av_packet_free(&pkt);
 		}
 
 		switch_buffer_zero(context->nalu_buffer);
@@ -1825,6 +1873,10 @@ static switch_status_t switch_h264_destroy(switch_codec_t *codec)
 		av_free(context->encoder_ctx);
 	}
 
+	if (context->packetizer) {
+		switch_packetizer_close(&context->packetizer);
+	}
+
 	if (context->encoder_avframe) {
 		av_frame_free(&context->encoder_avframe);
 	}
@@ -1833,6 +1885,10 @@ static switch_status_t switch_h264_destroy(switch_codec_t *codec)
 		av_frame_free(&context->decoder_avframe);
 	}
 
+	if (context->encoder_avpacket) {
+		av_packet_free(&context->encoder_avpacket);
+	}
+
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -1860,8 +1916,10 @@ static const AVCodec *next_codec_for_id(enum AVCodecID id, const AVCodec *prev,
 #endif
 		if (prev->id == id &&
 			(encoder ? av_codec_is_encoder(prev) : av_codec_is_decoder(prev)))
+
 			return prev;
 	}
+
 	return NULL;
 }
 
@@ -2208,7 +2266,7 @@ static void parse_codecs(avcodec_profile_t *aprofile, switch_xml_t codecs)
 }
 
 
-static void load_config()
+static void load_config(void)
 {
 	switch_xml_t cfg = NULL, xml = NULL;
 
diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c
index 1f767d0bde..c1e0052530 100644
--- a/src/mod/applications/mod_av/avformat.c
+++ b/src/mod/applications/mod_av/avformat.c
@@ -25,6 +25,7 @@
  *
  * Seven Du <dujinfang@gmail.com>
  * Anthony Minessale <anthm@freeswitch.org>
+ * Jakub Karolczyk <jakub.karolczyk@signalwire.com>
  *
  * mod_avformat -- File Formats with libav.org
  *
@@ -34,7 +35,13 @@
 #include "mod_av.h"
 GCC_DIAG_OFF(deprecated-declarations)
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
+#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
+#endif
 #include <libavformat/avformat.h>
+#ifdef _MSC_VER
+#include <libavformat/version.h> /* LIBAVFORMAT_VERSION_INT */
+#endif
 #include <libavutil/opt.h>
 #include <libavutil/imgutils.h>
 #include <libavutil/avstring.h>
@@ -88,7 +95,9 @@ typedef struct MediaStream {
 	AVStream *st;
 	AVFrame *frame;
 	AVFrame *tmp_frame;
-
+#if (LIBAVFORMAT_VERSION_MAJOR >= LIBAVFORMAT_V)
+	AVCodecContext *codec;
+#endif
 	// audio
 	int channels;
 	int sample_rate;
@@ -137,8 +146,13 @@ struct av_file_context {
 	MediaStream video_st;
 	MediaStream audio_st[2];
 	AVFormatContext *fc;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 	AVCodec *audio_codec;
 	AVCodec *video_codec;
+#else
+	const AVCodec *audio_codec;
+	const AVCodec *video_codec;
+#endif
 	enum AVColorSpace colorspace;
 
 	int has_audio;
@@ -220,9 +234,57 @@ static inline char *av_ts_make_time_string(char *buf, int64_t ts, AVRational *tb
 static switch_status_t av_file_close(switch_file_handle_t *handle);
 SWITCH_MODULE_LOAD_FUNCTION(mod_avformat_load);
 
+static inline AVCodecContext *av_get_codec_context(MediaStream *stream)
+{
+	AVCodecContext *c = NULL;
+
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
+GCC_DIAG_OFF(deprecated-declarations)
+	if (stream->st) {
+		c = stream->st->codec;
+	}
+GCC_DIAG_ON(deprecated-declarations)
+#else
+	c = stream->codec;
+#endif
+
+	return c;
+}
+
+static inline enum AVCodecID av_get_codec_id(AVStream *av_stream)
+{
+	if (!av_stream) {
+		return AV_CODEC_ID_NONE;
+	}
+
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
+GCC_DIAG_OFF(deprecated-declarations)
+	return av_stream->codec->codec_id;
+GCC_DIAG_ON(deprecated-declarations)
+#else
+	return av_stream->codecpar->codec_id;
+#endif
+}
+
+static inline enum AVMediaType av_get_codec_type(AVStream *av_stream)
+{
+	if (!av_stream) {
+		return AVMEDIA_TYPE_UNKNOWN;
+	}
+
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
+GCC_DIAG_OFF(deprecated-declarations)
+	return av_stream->codec->codec_type;
+GCC_DIAG_ON(deprecated-declarations)
+#else
+	return av_stream->codecpar->codec_type;
+#endif
+}
+
 static char *const get_error_text(const int error, char *error_buffer, switch_size_t error_buflen)
 {
 	av_strerror(error, error_buffer, error_buflen);
+
 	return error_buffer;
 }
 
@@ -354,18 +416,24 @@ static int interrupt_cb(void *cp)
 }
  
 
-static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, AVOutputFormat *oformat,
-											  const char *format, const char *filename, av_file_context_t *context)
+static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, const char *format, const char *filename, av_file_context_t *context)
 {
 	AVFormatContext *s = avformat_alloc_context();
 	int ret = 0;
 
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
+	AVOutputFormat *oformat = NULL;
+#else
+	const AVOutputFormat *oformat = NULL;
+#endif
+
 	s->interrupt_callback.callback = interrupt_cb;
 	s->interrupt_callback.opaque = context;
-	
+
 	*avctx = NULL;
-	if (!s)
+	if (!s) {
 		goto nomem;
+	}
 
 	if (!oformat) {
 		if (format) {
@@ -389,14 +457,17 @@ static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, AVOutputF
 	s->oformat = oformat;
 	if (s->oformat->priv_data_size > 0) {
 		s->priv_data = av_mallocz(s->oformat->priv_data_size);
-		if (!s->priv_data)
+		if (!s->priv_data) {
 			goto nomem;
+		}
+
 		if (s->oformat->priv_class) {
 			*(const AVClass**)s->priv_data= s->oformat->priv_class;
 			av_opt_set_defaults(s->priv_data);
 		}
-	} else
+	} else {
 		s->priv_data = NULL;
+	}
 
 	if (filename) {
 #if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,7,100))
@@ -408,12 +479,14 @@ static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, AVOutputF
 	}
 
 	*avctx = s;
+
 	return 0;
 nomem:
 	av_log(s, AV_LOG_ERROR, "Out of memory\n");
 	ret = AVERROR(ENOMEM);
 error:
 	avformat_free_context(s);
+
 	return ret;
 }
 
@@ -429,9 +502,13 @@ static int write_frame(AVFormatContext *fmt_ctx, const AVRational *time_base, AV
 }
 
 /* Add an output stream. */
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 static switch_status_t add_stream(av_file_context_t *context, MediaStream *mst, AVFormatContext *fc, AVCodec **codec, enum AVCodecID codec_id, switch_mm_t *mm)
+#else
+static switch_status_t add_stream(av_file_context_t *context, MediaStream *mst, AVFormatContext *fc, const AVCodec **codec, enum AVCodecID codec_id, switch_mm_t *mm)
+#endif
 {
-	AVCodecContext *c;
+	AVCodecContext *c = NULL;
 	switch_status_t status = SWITCH_STATUS_FALSE;
 	//int threads = switch_core_cpu_count();
 	int buffer_bytes = 2097152; /* 2 mb */
@@ -457,9 +534,19 @@ static switch_status_t add_stream(av_file_context_t *context, MediaStream *mst,
 		return status;
 	}
 	mst->st->id = fc->nb_streams - 1;
-GCC_DIAG_OFF(deprecated-declarations)
-	c = mst->st->codec;
-GCC_DIAG_ON(deprecated-declarations)
+
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+	mst->codec = avcodec_alloc_context3(*codec);
+
+	if (!mst->codec) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate codec context\n");
+
+		return status;
+	}
+#endif
+
+	c = av_get_codec_context(mst);
+
 	//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "id:%d den:%d num:%d\n", mst->st->id, mst->st->time_base.den, mst->st->time_base.num);
 
 	//if (threads > 4) {
@@ -471,8 +558,12 @@ GCC_DIAG_ON(deprecated-declarations)
 		c->sample_fmt  = (*codec)->sample_fmts ? (*codec)->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
 		c->bit_rate    = 128000;
 		c->sample_rate = mst->sample_rate = context->handle->samplerate;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 		c->channels    = mst->channels;
 		c->channel_layout = av_get_default_channel_layout(c->channels);
+#else
+		av_channel_layout_default(&c->ch_layout, mst->channels);
+#endif
 
 		if (mm) {
 			if (mm->ab) {
@@ -651,23 +742,28 @@ static AVFrame *alloc_picture(enum AVPixelFormat pix_fmt, int width, int height)
 	return picture;
 }
 
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 static switch_status_t open_video(AVFormatContext *fc, AVCodec *codec, MediaStream *mst)
+#else
+static switch_status_t open_video(AVFormatContext *fc, const AVCodec *codec, MediaStream *mst)
+#endif
 {
 	int ret;
-GCC_DIAG_OFF(deprecated-declarations)
-	AVCodecContext *c = mst->st->codec;
-GCC_DIAG_ON(deprecated-declarations)
+	AVCodecContext *c = NULL;
 	switch_status_t status = SWITCH_STATUS_FALSE;
 //int threads = switch_core_cpu_count();
  
 //	if (threads > 4) threads = 4;
 //	c->thread_count = threads;
 
+	c = av_get_codec_context(mst);
+
 	/* open the codec */
 	ret = avcodec_open2(c, codec, NULL);
 	if (ret < 0) {
 		char ebuf[255] = "";
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not open video codec: %s\n", get_error_text(ret, ebuf, sizeof(ebuf)));
+
 		return status;
 	}
 
@@ -679,17 +775,29 @@ GCC_DIAG_ON(deprecated-declarations)
 	// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "pix_fmt: %d\n", c->pix_fmt);
 	switch_assert(c->pix_fmt == AV_PIX_FMT_YUV420P); // always I420 for NOW
 
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+	if (((ret = avcodec_parameters_from_context(mst->st->codecpar, mst->codec)) < 0)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not copy to codec params ret=%d\n", ret);
+
+		return SWITCH_STATUS_FALSE;
+	}
+#endif
+
 	return SWITCH_STATUS_SUCCESS;
 }
 
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 static switch_status_t open_audio(AVFormatContext *fc, AVCodec *codec, MediaStream *mst)
+#else
+static switch_status_t open_audio(AVFormatContext *fc, const AVCodec *codec, MediaStream *mst)
+#endif
 {
-	AVCodecContext *c;
+	AVCodecContext *c = NULL;
 	int ret;
 	switch_status_t status = SWITCH_STATUS_FALSE;
-GCC_DIAG_OFF(deprecated-declarations)
-	c = mst->st->codec;
-GCC_DIAG_ON(deprecated-declarations)
+
+	c = av_get_codec_context(mst);
+
 	ret = avcodec_open2(c, codec, NULL);
 
 	if (ret == AVERROR_EXPERIMENTAL) {
@@ -711,11 +819,19 @@ GCC_DIAG_ON(deprecated-declarations)
 
 	mst->frame->sample_rate    = c->sample_rate;
 	mst->frame->format         = AV_SAMPLE_FMT_S16;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 	mst->frame->channel_layout = c->channel_layout;
+#else
+	mst->frame->ch_layout = c->ch_layout;
+#endif
 
 	if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
 		//mst->frame->nb_samples = 10000;
-		mst->frame->nb_samples = (mst->frame->sample_rate / 50) * c->channels;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+	mst->frame->nb_samples = (mst->frame->sample_rate / 50) * c->channels;
+#else
+	mst->frame->nb_samples = (mst->frame->sample_rate / 50) * c->ch_layout.nb_channels;
+#endif
 	} else {
 		mst->frame->nb_samples = c->frame_size;
 	}
@@ -733,19 +849,33 @@ GCC_DIAG_ON(deprecated-declarations)
 		}
 
 		/* set options */
+#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59,27,100)) /* FFmpeg 5.0 */
 		av_opt_set_int(mst->resample_ctx, "in_channel_count",   c->channels,       0);
+#else	/* FFmpeg 5.1 */
+		av_opt_set_chlayout(mst->resample_ctx, "in_chlayout", &c->ch_layout, 0);
+#endif
 		av_opt_set_int(mst->resample_ctx, "in_sample_rate",     c->sample_rate,    0);
+#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59,27,100))
 		av_opt_set_int(mst->resample_ctx, "in_sample_fmt",      AV_SAMPLE_FMT_S16, 0);
 		av_opt_set_int(mst->resample_ctx, "in_channel_layout",  c->channel_layout, 0);
 		av_opt_set_int(mst->resample_ctx, "out_channel_count",  c->channels,       0);
+#else
+		av_opt_set_sample_fmt(mst->resample_ctx, "in_sample_fmt", AV_SAMPLE_FMT_S16, 0);
+		av_opt_set_chlayout(mst->resample_ctx, "out_chlayout", &c->ch_layout, 0);
+#endif
 		av_opt_set_int(mst->resample_ctx, "out_sample_rate",    c->sample_rate,    0);
+#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59,27,100))
 		av_opt_set_int(mst->resample_ctx, "out_sample_fmt",     c->sample_fmt,     0);
 		av_opt_set_int(mst->resample_ctx, "out_channel_layout", c->channel_layout, 0);
+#else
+		av_opt_set_sample_fmt(mst->resample_ctx, "out_sample_fmt", c->sample_fmt, 0);
+#endif
 
 		if (swr_init(mst->resample_ctx) < 0) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to initialize the resampling context\n");
 			av_free(mst->resample_ctx);
 			mst->resample_ctx = NULL;
+
 			return status;
 		}
 	}
@@ -753,6 +883,7 @@ GCC_DIAG_ON(deprecated-declarations)
 	ret = av_frame_get_buffer(mst->frame, 0);
 	if (ret < 0) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate audio frame.\n");
+
 		return status;
 	}
 
@@ -762,7 +893,11 @@ GCC_DIAG_ON(deprecated-declarations)
 
 		mst->tmp_frame->sample_rate    = c->sample_rate;
 		mst->tmp_frame->format         = c->sample_fmt;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 		mst->tmp_frame->channel_layout = c->channel_layout;
+#else
+		mst->tmp_frame->ch_layout = c->ch_layout;
+#endif
 		mst->tmp_frame->nb_samples     = mst->frame->nb_samples;
 
 		ret = av_frame_get_buffer(mst->tmp_frame, 0);
@@ -772,6 +907,14 @@ GCC_DIAG_ON(deprecated-declarations)
 		}
 	}
 
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+	if (((ret = avcodec_parameters_from_context(mst->st->codecpar, mst->codec)) < 0)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not copy to codec params ret=%d\n", ret);
+
+		return SWITCH_STATUS_FALSE;
+	}
+#endif
+
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -797,8 +940,7 @@ static void flush_video_pkt_queue(switch_queue_t *q)
 	AVPacket *pkt;
 
 	while (switch_queue_trypop(q, (void **)&pkt) == SWITCH_STATUS_SUCCESS) {
-		av_packet_unref(pkt);
-		free(pkt);
+		av_packet_free(&pkt);
 	}
 }
 
@@ -811,12 +953,16 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
 	int size = 0, skip = 0, skip_freq = 0, skip_count = 0, skip_total = 0, skip_total_count = 0;
 	uint64_t delta_avg = 0, delta_sum = 0, delta_i = 0, delta = 0;
 	int first = 1;
+	AVCodecContext *c = NULL;
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "video thread start\n");
-		switch_assert(context->eh.video_queue);
+	switch_assert(context->eh.video_queue);
+
 	for(;;) {
-		AVPacket pkt = { 0 };
+		AVPacket *pkt = NULL;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 		int got_packet;
+#endif
 		int ret = -1;
 
 	top:
@@ -829,7 +975,7 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
 			switch_img_free(&tmp_img);
 		}
 		if (switch_queue_pop(context->eh.video_queue, &pop) == SWITCH_STATUS_SUCCESS) {
-            switch_img_free(&img);
+			switch_img_free(&img);
 
 			if (!pop) {
 				goto endfor;
@@ -877,8 +1023,6 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
 
 		context->eh.in_callback = 1;
 
-		av_init_packet(&pkt);
-
 		if (context->eh.video_st->frame) {
 			ret = av_frame_make_writable(context->eh.video_st->frame);
 		}
@@ -890,7 +1034,7 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
 		if (context->eh.record_timer_paused) {
 			context->eh.last_ts = 0;
 			continue;
-		}		
+		}
 
 		fill_avframe(context->eh.video_st->frame, img);
 
@@ -937,59 +1081,148 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
 			}
 		}
 
+		pkt = av_packet_alloc();
+
 		context->eh.last_ts = context->eh.video_st->frame->pts;
 
 		// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "pts: %" SWITCH_INT64_T_FMT "\n", context->eh.video_st->frame->pts);
 
 		/* encode the image */
+		c = av_get_codec_context(context->eh.video_st);
+
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 GCC_DIAG_OFF(deprecated-declarations)
-		ret = avcodec_encode_video2(context->eh.video_st->st->codec, &pkt, context->eh.video_st->frame, &got_packet);
+		ret = avcodec_encode_video2(c, pkt, context->eh.video_st->frame, &got_packet);
 GCC_DIAG_ON(deprecated-declarations)
- 
+
 		if (ret < 0) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Encoding Error %d\n", ret);
+			c = NULL;
+			av_packet_free(&pkt);
 			continue;
 		}
 
 		if (got_packet) {
+#else
+		ret = avcodec_send_frame(c, context->eh.video_st->frame);
+
+		if (ret == AVERROR_EOF) {
+			ret = 0;
+		} else if (ret == AVERROR(EAGAIN)) {
+			/* we fully drain all the output in each encode call, so this should not ever happen */
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Error sending frame to encoder AVERROR_BUG - should never happen\n");
+			ret = AVERROR_BUG;
+		} else if (ret < 0) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Error sending frame to encoder\n");
+		}
+
+		while (ret >= 0) {
+			ret = avcodec_receive_packet(c, pkt);
+			if (ret == AVERROR(EAGAIN)) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video packets at the moment\n");
+				break;
+			} else if (ret == AVERROR_EOF) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video packets at all\n");
+				break;
+			} else if (ret < 0) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Encoding error\n");
+				break;
+			}
+#endif
+
 			switch_mutex_lock(context->eh.mutex);
-GCC_DIAG_OFF(deprecated-declarations)
-			write_frame(context->eh.fc, &context->eh.video_st->st->codec->time_base, context->eh.video_st->st, &pkt);
-GCC_DIAG_ON(deprecated-declarations) 
+			write_frame(context->eh.fc, &c->time_base, context->eh.video_st->st, pkt);
 			switch_mutex_unlock(context->eh.mutex);
-			av_packet_unref(&pkt);
 		}
 
 		context->eh.in_callback = 0;
+		av_packet_free(&pkt);
+		c = NULL;
 		//switch_mutex_unlock(context->eh.mutex);
 	}
 
  endfor:
 
 	for(;;) {
-		AVPacket pkt = { 0 };
-		int got_packet = 0;
+		AVPacket *pkt = av_packet_alloc();
 		int ret = 0;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+		int got_packet = 0;
+#else
+		int wret = 0;
+#endif
 
-		av_init_packet(&pkt);
+		c = av_get_codec_context(context->eh.video_st);
 
-GCC_DIAG_OFF(deprecated-declarations)		
-		ret = avcodec_encode_video2(context->eh.video_st->st->codec, &pkt, NULL, &got_packet);
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+GCC_DIAG_OFF(deprecated-declarations)
+		ret = avcodec_encode_video2(c, pkt, NULL, &got_packet);
 GCC_DIAG_ON(deprecated-declarations)
 
 		if (ret < 0) {
-			break;
+			goto do_break;
 		} else if (got_packet) {
-			switch_mutex_lock(context->eh.mutex);
-GCC_DIAG_OFF(deprecated-declarations)
-			ret = write_frame(context->eh.fc, &context->eh.video_st->st->codec->time_base, context->eh.video_st->st, &pkt);
-GCC_DIAG_ON(deprecated-declarations)
-			switch_mutex_unlock(context->eh.mutex);
-			av_packet_unref(&pkt);
-			if (ret < 0) break;
-		} else {
+#else
+	ret = avcodec_send_frame(c, NULL);
+
+	if (ret == AVERROR_EOF) {
+		ret = 0;
+	} else if (ret == AVERROR(EAGAIN)) {
+		/* we fully drain all the output in each encode call, so this should not ever happen */
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Error sending frame to encoder on draining AVERROR_BUG - should never happen\n");
+		goto do_break;
+	} else if (ret < 0) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Error sending frame to encoder on draining\n");
+		c = NULL;
+		goto do_break;
+	}
+
+	while (ret >= 0) {
+		ret = avcodec_receive_packet(c, pkt);
+		if (ret == AVERROR(EAGAIN)) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video packets at the moment on draining\n");
+			break;
+		} else if (ret == AVERROR_EOF) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video packets at all on draining \n");
+			break;
+		} else if (ret < 0) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Encoding error on draining\n");
 			break;
 		}
+#endif
+			switch_mutex_lock(context->eh.mutex);
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+			ret = write_frame(context->eh.fc, &c->time_base, context->eh.video_st->st, pkt);
+#else
+			wret = write_frame(context->eh.fc, &c->time_base, context->eh.video_st->st, pkt);
+#endif
+			switch_mutex_unlock(context->eh.mutex);
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+			if (ret < 0) {
+				goto do_break;
+			}
+		} else {
+			goto do_break;
+#else
+			if (wret < 0) {
+				goto do_break;
+			}
+#endif
+		}
+
+		av_packet_free(&pkt);
+		c = NULL;
+
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+		if (ret < 0 && ret != AVERROR(EAGAIN)) {
+			break;
+		}
+#endif
+
+	continue;
+ do_break:
+		av_packet_free(&pkt);
+		break;
 	}
 
 	while(switch_queue_trypop(context->eh.video_queue, &pop) == SWITCH_STATUS_SUCCESS) {
@@ -1006,6 +1239,8 @@ GCC_DIAG_ON(deprecated-declarations)
 
 static void close_stream(AVFormatContext *fc, MediaStream *mst)
 {
+	AVCodecContext *c = NULL;
+
 	if (!mst->active) return;
 
 	if (mst->resample_ctx) swr_free(&mst->resample_ctx);
@@ -1013,12 +1248,13 @@ static void close_stream(AVFormatContext *fc, MediaStream *mst)
 	if (mst->frame) av_frame_free(&mst->frame);
 	if (mst->tmp_frame) av_frame_free(&mst->tmp_frame);
 
-GCC_DIAG_OFF(deprecated-declarations)
-	if (mst->st && mst->st->codec) {
-		avcodec_close(mst->st->codec);
-	}
-GCC_DIAG_ON(deprecated-declarations)
-
+	c = av_get_codec_context(mst);
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+	avcodec_close(c);
+#else
+	/* avcodec_close() will be called in avcodec_free_context() */
+	avcodec_free_context(&c);
+#endif
 	mst->active = 0;
 }
 
@@ -1136,8 +1372,15 @@ static void mod_avformat_destroy_output_context(av_file_context_t *context)
 
 static switch_status_t open_input_file(av_file_context_t *context, switch_file_handle_t *handle, const char *filename)
 {
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 	AVCodec *audio_codec = NULL;
 	AVCodec *video_codec = NULL;
+#else
+	const AVCodec *audio_codec = NULL;
+	const AVCodec *video_codec = NULL;
+#endif
+	enum AVCodecID codec_id;
+	AVCodecContext *cc = NULL;
 	AVDictionary *opts = NULL;
 	int error;
 	int i, idx = 0;
@@ -1147,7 +1390,7 @@ static switch_status_t open_input_file(av_file_context_t *context, switch_file_h
 
 	/** Open the input file to read from it. */
 
-    if (!context->fc) {
+	if (!context->fc) {
 		context->fc = avformat_alloc_context();
 	}
 
@@ -1166,7 +1409,7 @@ static switch_status_t open_input_file(av_file_context_t *context, switch_file_h
 		context->fc = NULL;
 		switch_goto_status(SWITCH_STATUS_FALSE, err);
 	}
-	
+
 	handle->seekable = context->fc->iformat->read_seek2 ? 1 : (context->fc->iformat->read_seek ? 1 : 0);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "file %s is %sseekable\n", filename, handle->seekable ? "" : "not ");
 
@@ -1182,16 +1425,17 @@ static switch_status_t open_input_file(av_file_context_t *context, switch_file_h
 
 	av_dump_format(context->fc, 0, filename, 0);
 
-	for (i = 0; i< context->fc->nb_streams; i++) {
-GCC_DIAG_OFF(deprecated-declarations)
-		if (context->fc->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO && context->has_audio < 2 && idx < 2) {
+	for (i = 0; i < context->fc->nb_streams; i++) {
+		enum AVMediaType codec_type = av_get_codec_type(context->fc->streams[i]);
+
+		if (codec_type == AVMEDIA_TYPE_AUDIO && context->has_audio < 2 && idx < 2) {
 			context->audio_st[idx++].st = context->fc->streams[i];
 			context->has_audio++;
-		} else if (context->fc->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO && !context->has_video) {
-GCC_DIAG_ON(deprecated-declarations)
+		} else if (codec_type == AVMEDIA_TYPE_VIDEO && !context->has_video) {
 			context->video_st.st = context->fc->streams[i];
 			if (switch_test_flag(handle, SWITCH_FILE_FLAG_VIDEO)) {
 				context->has_video = 1;
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 				handle->duration = av_rescale_q(context->video_st.st->duration != AV_NOPTS_VALUE ? context->video_st.st->duration : context->fc->duration / AV_TIME_BASE * 1000,
 					context->video_st.st->time_base, AV_TIME_BASE_Q);
 			}
@@ -1207,42 +1451,95 @@ GCC_DIAG_ON(deprecated-declarations)
 			}
 
 			context->read_fps = (int)handle->mm.source_fps;
+#else
+			}
+#endif
 		}
 	}
 
 	/** Find a decoder for the audio stream. */
-GCC_DIAG_OFF(deprecated-declarations)
-	if (context->has_audio && !(audio_codec = avcodec_find_decoder(context->audio_st[0].st->codec->codec_id))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not find input codec %d\n", context->audio_st[0].st->codec->codec_id);
+	if (context->has_audio && !(audio_codec = avcodec_find_decoder((codec_id = av_get_codec_id(context->audio_st[0].st))))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not find input codec %d\n", codec_id);
 		context->has_audio = 0;
 	}
 
-	if (context->has_video && !(video_codec = avcodec_find_decoder(context->video_st.st->codec->codec_id))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find input codec %d\n", context->video_st.st->codec->codec_id);
+	if (context->has_video && !(video_codec = avcodec_find_decoder((codec_id = av_get_codec_id(context->video_st.st))))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find input codec %d\n", codec_id);
 		context->has_video = 0;
 	}
 
-	if (context->has_audio && (error = avcodec_open2(context->audio_st[0].st->codec, audio_codec, NULL)) < 0) {
+#if (LIBAVFORMAT_VERSION_MAJOR >= LIBAVFORMAT_V)
+	if (context->has_audio == 2) {
+		context->audio_st[1].codec = avcodec_alloc_context3(audio_codec);
+		context->audio_st[0].codec = avcodec_alloc_context3(audio_codec);
+	} else if (context->has_audio) {
+		context->audio_st[0].codec = avcodec_alloc_context3(audio_codec);
+	}
+
+	if (context->has_video) {
+		context->video_st.codec = avcodec_alloc_context3(video_codec);
+	}
+#endif
+
+	cc = av_get_codec_context(&context->audio_st[0]);
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
+	if (context->has_audio && ((error = avcodec_open2(cc, audio_codec, NULL)) < 0)) {
+#else
+	if (context->has_audio && (((error = avcodec_parameters_to_context(cc, context->audio_st[0].st->codecpar)) < 0) || ((error = avcodec_open2(cc, audio_codec, NULL)) < 0))) {
+#endif
 		char ebuf[255] = "";
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not open input audio codec (error '%s')\n", get_error_text(error, ebuf, sizeof(ebuf)));
 		context->has_audio = 0;
 	}
 
-	if (context->has_audio == 2 && (error = avcodec_open2(context->audio_st[1].st->codec, audio_codec, NULL)) < 0) {
+	cc = av_get_codec_context(&context->audio_st[1]);
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
+	if (context->has_audio == 2 && ((error = avcodec_open2(cc, audio_codec, NULL)) < 0)) {
+#else
+	if (context->has_audio == 2 && (((error = avcodec_parameters_to_context(cc, context->audio_st[1].st->codecpar)) < 0) || ((error = avcodec_open2(cc, audio_codec, NULL)) < 0))) {
+#endif
 		char ebuf[255] = "";
+
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not open input audio codec channel 2 (error '%s')\n", get_error_text(error, ebuf, sizeof(ebuf)));
-		if (context->audio_st[0].st->codec) {
-			avcodec_close(context->audio_st[0].st->codec);
+		if ((cc = av_get_codec_context(&context->audio_st[0]))) {
+			avcodec_close(cc);
 		}
+
 		context->has_audio = 0;
 	}
 
-	if (context->has_video && (error = avcodec_open2(context->video_st.st->codec, video_codec, NULL)) < 0) {
+	cc = av_get_codec_context(&context->video_st);
+
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
+	if (context->has_video && (error = avcodec_open2(cc, video_codec, NULL)) < 0) {
+#else
+	if (context->has_video) {
+		if (((error = avcodec_parameters_to_context(cc, context->video_st.st->codecpar)) < 0) || ((error = avcodec_open2(cc, video_codec, NULL)) < 0)) {
+#endif
 		char ebuf[255] = "";
+
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not open input codec (error '%s')\n", get_error_text(error, ebuf, sizeof(ebuf)));
 		context->has_video = 0;
 	}
-GCC_DIAG_ON(deprecated-declarations)
+
+#if (LIBAVFORMAT_VERSION_MAJOR >= LIBAVFORMAT_V)
+		handle->duration = av_rescale_q(context->video_st.st->duration != AV_NOPTS_VALUE ? context->video_st.st->duration : context->fc->duration / AV_TIME_BASE * 1000,
+		context->video_st.st->time_base, AV_TIME_BASE_Q);
+
+		if (context->fc->bit_rate) {
+			handle->mm.source_kps = context->fc->bit_rate / 1024;
+		}
+
+		if (context->video_st.st->avg_frame_rate.num) {
+			handle->mm.source_fps = ceil(av_q2d(context->video_st.st->avg_frame_rate));
+		} else {
+			handle->mm.source_fps = 25;
+	}
+
+	context->read_fps = (int)handle->mm.source_fps;
+
+	}
+#endif
 
 	context->video_st.active = 1;
 
@@ -1254,16 +1551,16 @@ GCC_DIAG_ON(deprecated-declarations)
 	}
 
 	if (context->has_audio) {
-GCC_DIAG_OFF(deprecated-declarations)
 		AVCodecContext *c[2] = { NULL };
 
-		c[0] = context->audio_st[0].st->codec;
-
-		if (context->audio_st[1].st && context->audio_st[1].st->codec) {
-			c[1] = context->audio_st[1].st->codec;
+		if (!(c[0] = av_get_codec_context(&context->audio_st[0]))) {
+			switch_goto_status(SWITCH_STATUS_FALSE, err);
 		}
-GCC_DIAG_ON(deprecated-declarations)
-		
+
+		if ((cc = av_get_codec_context(&context->audio_st[1]))) {
+			c[1] = cc;
+		}
+
 		context->audio_st[0].frame = av_frame_alloc();
 		switch_assert(context->audio_st[0].frame);
 
@@ -1272,39 +1569,53 @@ GCC_DIAG_ON(deprecated-declarations)
 		if (c[1]) {
 			context->audio_st[1].frame = av_frame_alloc();
 			switch_assert(context->audio_st[1].frame);
-		}
 
-		if (c[0] && c[1]) {
 			context->audio_st[0].channels = 1;
 			context->audio_st[1].channels = 1;
 		} else {
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVFORMAT_V)
 			handle->channels = c[0]->channels > 2 ? 2 : c[0]->channels;
+#else
+			handle->channels = c[0]->ch_layout.nb_channels > 2 ? 2 : c[0]->ch_layout.nb_channels;
+#endif
 			context->audio_st[0].channels = handle->channels;
 		}
 
 		context->audio_st[0].sample_rate = handle->samplerate;
 		context->audio_st[1].sample_rate = handle->samplerate;
 
-GCC_DIAG_OFF(deprecated-declarations)
-		if (context->audio_st[0].st->codec->sample_fmt != AV_SAMPLE_FMT_S16 || context->audio_st[0].st->codec->sample_rate != handle->samplerate) {
-GCC_DIAG_ON(deprecated-declarations)
+		if (c[0]->sample_fmt != AV_SAMPLE_FMT_S16 || c[0]->sample_rate != handle->samplerate) {
 			int x;
+
  			for (x = 0; x < context->has_audio && x < 2 && c[x]; x++) {
 				struct SwrContext *resample_ctx = swr_alloc();
 
 				if (resample_ctx) {
 					int ret;
-					
+
+#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59,27,100)) /* FFmpeg 5.0 */
 					av_opt_set_int(resample_ctx, "in_channel_count",   c[x]->channels,       0);
+#else	/* FFmpeg 5.1 */
+					av_opt_set_chlayout(resample_ctx, "in_chlayout", &c[x]->ch_layout, 0);
+#endif
 					av_opt_set_int(resample_ctx, "in_sample_rate",     c[x]->sample_rate,    0);
+#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59,27,100))
 					av_opt_set_int(resample_ctx, "in_sample_fmt",      c[x]->sample_fmt,     0);
 					av_opt_set_int(resample_ctx, "in_channel_layout",
 								   (c[x]->channel_layout == 0 && c[x]->channels == 2) ? AV_CH_LAYOUT_STEREO : c[x]->channel_layout, 0);
 					av_opt_set_int(resample_ctx, "out_channel_count",  handle->channels,  0);
+#else
+					av_opt_set_sample_fmt(resample_ctx, "in_sample_fmt",      c[x]->sample_fmt,     0);
+					av_opt_set_chlayout(resample_ctx, "out_chlayout",  &c[x]->ch_layout,     0);
+#endif
 					av_opt_set_int(resample_ctx, "out_sample_rate",    handle->samplerate,0);
+#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59,27,100))
 					av_opt_set_int(resample_ctx, "out_sample_fmt",     AV_SAMPLE_FMT_S16, 0);
 					av_opt_set_int(resample_ctx, "out_channel_layout", handle->channels == 2 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO, 0);
-					
+#else
+					av_opt_set_sample_fmt(resample_ctx, "out_sample_fmt", AV_SAMPLE_FMT_S16, 0);
+#endif
+
 					if ((ret = swr_init(resample_ctx)) < 0) {
 						char errbuf[1024];
 						av_strerror(ret, errbuf, 1024);
@@ -1323,8 +1634,11 @@ GCC_DIAG_ON(deprecated-declarations)
 	if (!context->has_video) {
 		switch_clear_flag(handle, SWITCH_FILE_FLAG_VIDEO);
 	} else {
-GCC_DIAG_OFF(deprecated-declarations)
-		switch (context->video_st.st->codec->pix_fmt) {
+		if (!(cc = av_get_codec_context(&context->video_st))) {
+			goto err;
+		}
+
+		switch (cc->pix_fmt) {
 		case AV_PIX_FMT_YUVA420P:
 		case AV_PIX_FMT_RGBA:
 		case AV_PIX_FMT_ARGB:
@@ -1335,8 +1649,7 @@ GCC_DIAG_OFF(deprecated-declarations)
 			context->handle->mm.fmt = SWITCH_IMG_FMT_I420;
 			break;
 		}
-GCC_DIAG_ON(deprecated-declarations)
-		
+
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 
 						  "Opening file in mode: %s\n", context->handle->mm.fmt == SWITCH_IMG_FMT_ARGB ? "ARGB" : "I420");
 	}
@@ -1368,12 +1681,20 @@ err:
 static void *SWITCH_THREAD_FUNC file_read_thread_run(switch_thread_t *thread, void *obj)
 {
 	av_file_context_t *context = (av_file_context_t *) obj;
-	AVPacket pkt = { 0 };
+	AVPacket *pkt = NULL;
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 	int got_data = 0;
+#else
+	int dret = -1;
+#endif
 	int error;
 	int sync  = 0;
 	int eof = 0;
-	
+	AVCodecContext *c = NULL;
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+	AVFrame *vframe = NULL;
+#endif
+
 	switch_mutex_lock(context->mutex);
 	context->file_read_thread_started = 1;
 	context->file_read_thread_running = 1;
@@ -1390,8 +1711,6 @@ static void *SWITCH_THREAD_FUNC file_read_thread_run(switch_thread_t *thread, vo
 			switch_buffer_zero(context->audio_buffer);
 			switch_mutex_unlock(context->mutex);
 
-
-			
 			// if (context->has_audio) stream_id = context->audio_st.st->index;
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "seeking to %" SWITCH_INT64_T_FMT "\n", context->seek_ts);
 			avformat_seek_file(context->fc, stream_id, 0, context->seek_ts, INT64_MAX, 0);
@@ -1402,10 +1721,12 @@ static void *SWITCH_THREAD_FUNC file_read_thread_run(switch_thread_t *thread, vo
 				
 				context->video_st.next_pts = 0;
 				context->video_start_time = 0;
-GCC_DIAG_OFF(deprecated-declarations)
-				avcodec_flush_buffers(context->video_st.st->codec);
-GCC_DIAG_ON(deprecated-declarations)
-				
+				if (!(c = av_get_codec_context(&context->video_st))) {
+					break;
+				}
+
+				avcodec_flush_buffers(c);
+
 				while(switch_queue_trypop(context->eh.video_queue, &pop) == SWITCH_STATUS_SUCCESS) {
 					switch_image_t *img;
 					if (!pop) break;
@@ -1425,21 +1746,18 @@ GCC_DIAG_ON(deprecated-declarations)
 			continue;
 		}
 
+		if (pkt) av_packet_free(&pkt);
+		pkt = av_packet_alloc();
 
-
-		av_init_packet(&pkt);
-		pkt.data = NULL;
-		pkt.size = 0;
-
-		if ((error = av_read_frame(context->fc, &pkt)) < 0) {
+		if ((error = av_read_frame(context->fc, pkt)) < 0) {
 			if (error == AVERROR_EOF) {
 				if (!context->has_video) break;
 
 				eof = 1;
 				/* just make sure*/
-				pkt.data = NULL;
-				pkt.size = 0;
-				pkt.stream_index = context->video_st.st->index;
+				pkt->data = NULL;
+				pkt->size = 0;
+				pkt->stream_index = context->video_st.st->index;
 			} else {
 				char ebuf[255] = "";
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not read frame (error '%s')\n", get_error_text(error, ebuf, sizeof(ebuf)));
@@ -1448,8 +1766,11 @@ GCC_DIAG_ON(deprecated-declarations)
 		}
 
 		// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "stream: %d, pkt size %d\n", pkt.stream_index, pkt.size);
-		if (context->has_video && pkt.stream_index == context->video_st.st->index) {
-			AVFrame *vframe;
+
+		if (context->has_video && pkt->stream_index == context->video_st.st->index) {
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+			AVFrame *vframe = NULL;
+#endif
 			switch_image_t *img;
 
 			if (context->no_video_decode) {
@@ -1457,24 +1778,22 @@ GCC_DIAG_ON(deprecated-declarations)
 					break;
 				} else {
 					switch_status_t status;
-					AVPacket *new_pkt = malloc(sizeof(AVPacket));
+					AVPacket *new_pkt = av_packet_alloc();
 
 					if (0) { // debug
-						uint8_t *p = pkt.data;
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "size = %u %x %x %x %x %x %x\n", pkt.size, *p, *(p+1), *(p+2), *(p+3), *(p+4), *(p+5));
+						uint8_t *p = pkt->data;
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "size = %u %x %x %x %x %x %x\n", pkt->size, *p, *(p+1), *(p+2), *(p+3), *(p+4), *(p+5));
 					}
 
-					av_init_packet(new_pkt);
-					av_packet_ref(new_pkt, &pkt);
+					av_packet_ref(new_pkt, pkt);
 					status = switch_queue_push(context->video_pkt_queue, new_pkt);
 					// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "size = %4u flag=%x pts=%" SWITCH_INT64_T_FMT " dts=%" SWITCH_INT64_T_FMT "\n", pkt.size, pkt.flags, pkt.pts, pkt.dts);
 
 					context->vid_ready = 1;
 					if (status != SWITCH_STATUS_SUCCESS) {
-						av_packet_unref(new_pkt);
-						free(new_pkt);
+						av_packet_free(&new_pkt);
 					}
-					av_packet_unref(&pkt);
+
 					continue;
 				}
 			}
@@ -1488,18 +1807,57 @@ again:
 			vframe = av_frame_alloc();
 			switch_assert(vframe);
 
+			if (!(c = av_get_codec_context(&context->video_st))) {
+				break;
+			}
+
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 GCC_DIAG_OFF(deprecated-declarations)
-			if ((error = avcodec_decode_video2(context->video_st.st->codec, vframe, &got_data, &pkt)) < 0) {
+			error = avcodec_decode_video2(c, vframe, &got_data, pkt);
 GCC_DIAG_ON(deprecated-declarations)
+#else
+			if (eof) {
+				dret = avcodec_send_packet(c, NULL);
+			} else {
+				dret = avcodec_send_packet(c, pkt);
+			}
+
+			if (dret == AVERROR_EOF) {
+				dret = 0;
+			} else if (dret == AVERROR(EAGAIN)) {
+				/* we fully drain all the output in each decode call, so this should not ever happen */
+				dret = AVERROR_BUG;
+				goto check_errors;
+			} else if (dret < 0) {
+				goto check_errors;
+			}
+
+			while (dret >= 0) {
+				dret = avcodec_receive_frame(c, vframe);
+				if (dret == AVERROR(EAGAIN)) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video frames at the moment\n");
+				} else if (dret == AVERROR_EOF) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more video frames at all\n");
+				} else if (dret < 0) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Video decoding error\n");
+				}
+#endif
+
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+ check_errors:
+			if (dret < 0 && dret != AVERROR(EAGAIN) && dret != AVERROR_EOF) {
+#else
+			if (error < 0) {
+#endif
 				char ebuf[255] = "";
+
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not decode frame (error '%s')\n", get_error_text(error, ebuf, sizeof(ebuf)));
-				av_packet_unref(&pkt);
 				av_frame_free(&vframe);
 				continue;
 			}
 
 			// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "pkt: %d, pts: %lld dts: %lld\n", pkt.size, pkt.pts, pkt.dts);
-			av_packet_unref(&pkt);
+			av_packet_unref(pkt);
 
 			//if (switch_queue_size(context->eh.video_queue) > 300) {
 			//	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Dropping frames\n");
@@ -1508,7 +1866,11 @@ GCC_DIAG_ON(deprecated-declarations)
 			//}
 			// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "got_data=%d, error=%d\n", got_data, error);
 
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 			if (got_data && error >= 0) {
+#else
+			if (dret >= 0) {
+#endif
 				switch_img_fmt_t fmt = SWITCH_IMG_FMT_I420;
 				if ((
 						vframe->format == AV_PIX_FMT_YUVA420P ||
@@ -1530,7 +1892,7 @@ GCC_DIAG_ON(deprecated-declarations)
 						if (!context->video_st.sws_ctx) {
 							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot init sws context\n");
 							av_frame_free(&frm);
-							continue;
+							goto do_continue;
 						}
 					}
 
@@ -1541,9 +1903,11 @@ GCC_DIAG_ON(deprecated-declarations)
 					vframe->width = frm->width;
 					vframe->height = frm->height;
 					vframe->pts = frm->pts;
+#if (LIBAVUTIL_VERSION_MAJOR < LIBAVUTIL_V)
 GCC_DIAG_OFF(deprecated-declarations)
 					vframe->pkt_pts = frm->pkt_pts;
 GCC_DIAG_ON(deprecated-declarations)
+#endif
 					vframe->pkt_dts = frm->pkt_dts;
 					ret = av_frame_get_buffer(vframe, 32);
 
@@ -1556,7 +1920,7 @@ GCC_DIAG_ON(deprecated-declarations)
 
 					if (ret <= 0 ) {
 						av_frame_free(&vframe);
-						continue;
+						goto do_continue;
 					}
 				}
 
@@ -1572,9 +1936,13 @@ GCC_DIAG_ON(deprecated-declarations)
 						int diff;
 						int sleep = 66000;
 #endif
+#if (LIBAVUTIL_VERSION_MAJOR < LIBAVUTIL_V)
 GCC_DIAG_OFF(deprecated-declarations)
 						*pts = vframe->pkt_pts;
 GCC_DIAG_ON(deprecated-declarations)
+#else
+						*pts = vframe->pts;
+#endif
 						avframe2img(vframe, img);
 						img->user_priv = pts;
 
@@ -1597,32 +1965,82 @@ GCC_DIAG_ON(deprecated-declarations)
 				}
 			}
 
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 			av_frame_free(&vframe);
+#endif
 
 			if (eof) {
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 				if (got_data) {
+#else
+				if (dret != AVERROR_EOF) {
+#endif
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 					goto again; // to get all delayed video frames in decoder
+#else
+					av_frame_free(&vframe);
+					goto again; // to get all delayed video frames in decoder
+#endif
 				} else {
-					break;
+					goto do_break;
 				}
 			}
-			continue;
-		} else if (context->has_audio && pkt.stream_index == context->audio_st[0].st->index) {
+
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+			}
+
+			av_frame_free(&vframe);
+#endif
+			goto do_continue;
+		} else if (context->has_audio && pkt->stream_index == context->audio_st[0].st->index) {
 			AVFrame in_frame = { { 0 } };
 
-GCC_DIAG_OFF(deprecated-declarations)
-			if ((error = avcodec_decode_audio4(context->audio_st[0].st->codec, &in_frame, &got_data, &pkt)) < 0) {
-GCC_DIAG_ON(deprecated-declarations)
-				char ebuf[255] = "";
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not decode frame (error '%s')\n", get_error_text(error, ebuf, sizeof(ebuf)));
-				av_packet_unref(&pkt);
+			if (!(c = av_get_codec_context(&context->audio_st[0]))) {
 				continue;
 			}
 
-			// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "pkt: %d, decodedddd: %d pts: %lld dts: %lld\n", pkt.size, error, pkt.pts, pkt.dts);
-			av_packet_unref(&pkt);
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+GCC_DIAG_OFF(deprecated-declarations)
+			if ((error = avcodec_decode_audio4(c, &in_frame, &got_data, pkt)) < 0) {
+GCC_DIAG_ON(deprecated-declarations)
+				char ebuf[255] = "";
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not decode frame (error '%s')\n", get_error_text(error, ebuf, sizeof(ebuf)));
+				continue;
+			}
+#else
+			dret = avcodec_send_packet(c, pkt);
 
+			if (dret == AVERROR_EOF) {
+				dret = 0;
+			} else if (dret == AVERROR(EAGAIN)) {
+				/* we fully drain all the output in each decode call, so this should not ever happen */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Error sending audio packet to decoder - BUG, should never happen\n");
+				goto do_continue;
+			} else if (dret < 0) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Error sending audio packet to decoder\n");
+				goto do_continue;
+			}
+
+			while (dret >= 0) {
+				dret = avcodec_receive_frame(c, &in_frame);
+				if (dret == AVERROR(EAGAIN)) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more audio frames at the moment\n");
+				} else if (dret == AVERROR_EOF) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more audio frames at all\n");
+				} else if (dret < 0) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Video decoding error\n");
+					goto do_continue;
+				}
+#endif
+
+			// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "pkt: %d, decodedddd: %d pts: %lld dts: %lld\n", pkt.size, error, pkt.pts, pkt.dts);
+			av_packet_unref(pkt);
+
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 			if (got_data) {
+#else
+			if (dret >= 0) {
+#endif
 				// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "got data frm->format: %d samples: %d\n", in_frame.format, in_frame.nb_samples);
 
 				if (context->audio_st[0].resample_ctx) {
@@ -1661,12 +2079,26 @@ GCC_DIAG_ON(deprecated-declarations)
 				}
 
 			}
-
-		} else {
-			av_packet_unref(&pkt);
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+			}
 		}
+#else
+		} else {
+			av_packet_unref(pkt);
+		}
+#endif
+
+ do_continue:
+		continue;
+ do_break:
+		break;
 	}
 
+	av_packet_free(&pkt);
+#if (LIBAVCODEC_VERSION_MAJOR >= LIBAVCODEC_V)
+	av_frame_free(&vframe);
+#endif
+
 	if (context->has_video) switch_queue_push(context->eh.video_queue, NULL);
 
 	context->file_read_thread_running = 0;
@@ -1679,7 +2111,13 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
 	av_file_context_t *context = NULL;
 	char *ext;
 	const char *tmp = NULL;
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 	AVOutputFormat *fmt;
+#else
+	const AVOutputFormat *fmt;
+	enum AVCodecID video_codec = AV_CODEC_ID_NONE;
+	enum AVCodecID audio_codec = AV_CODEC_ID_NONE;
+#endif
 	const char *format = NULL;
 	int ret;
 	char file[1024];
@@ -1797,18 +2235,28 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
 		return SWITCH_STATUS_SUCCESS;
 	}
 
-	mod_avformat_alloc_output_context2(&context->fc, NULL, format, (char *)file, context);
+	mod_avformat_alloc_output_context2(&context->fc, format, (char *)file, context);
 
 	if (!context->fc) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not deduce output format from file extension\n");
 		switch_goto_status(SWITCH_STATUS_GENERR, end);
 	}
 
+#if (LIBAVFORMAT_VERSION_MAJOR >= LIBAVFORMAT_V)
+	fmt = context->fc->oformat;
+	video_codec = fmt->video_codec;
+	audio_codec = fmt->audio_codec;
+#endif
+
 	fmt = context->fc->oformat;
 
 	if (handle->params && (tmp = switch_event_get_header(handle->params, "av_audio_codec"))) {
 		if ((context->audio_codec = avcodec_find_encoder_by_name(tmp))) {
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 			fmt->audio_codec = context->audio_codec->id;
+#else
+			audio_codec = context->audio_codec->id;
+#endif
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "specified audio codec %s %s [%s]\n", 
 							  tmp, context->audio_codec->name, context->audio_codec->long_name);
 
@@ -1829,7 +2277,11 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
 
 	if (handle->params && (tmp = switch_event_get_header(handle->params, "av_video_codec"))) {
 		if ((context->video_codec = avcodec_find_encoder_by_name(tmp))) {
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 			fmt->video_codec = context->video_codec->id;
+#else
+			video_codec = context->video_codec->id;
+#endif
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "specified video codec %s %s [%s]\n",
 							  tmp, context->video_codec->name, context->video_codec->long_name);
 		}
@@ -1866,16 +2318,28 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
 		handle->mm.vb = switch_calc_bitrate(handle->mm.vw, handle->mm.vh, 1, handle->mm.fps);
 	}
 
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 	if (switch_test_flag(handle, SWITCH_FILE_FLAG_VIDEO) && fmt->video_codec != AV_CODEC_ID_NONE) {
+#else
+	if (switch_test_flag(handle, SWITCH_FILE_FLAG_VIDEO) && video_codec != AV_CODEC_ID_NONE) {
+#endif
 		const AVCodecDescriptor *desc;
 
 		if ((handle->stream_name && (!strcasecmp(handle->stream_name, "rtmp") || !strcasecmp(handle->stream_name, "rtmps") || !strcasecmp(handle->stream_name, "youtube")))) {
-
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 			if (fmt->video_codec != AV_CODEC_ID_H264 ) {
 				fmt->video_codec = AV_CODEC_ID_H264; // force H264
+#else
+			if (video_codec != AV_CODEC_ID_H264 ) {
+				video_codec = AV_CODEC_ID_H264; // force H264
+#endif
 			}
 
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 			fmt->audio_codec = AV_CODEC_ID_AAC;
+#else
+			audio_codec = AV_CODEC_ID_AAC;
+#endif
 			handle->samplerate = 44100;
 			handle->mm.samplerate = 44100;
 			handle->mm.ab = 128;
@@ -1911,12 +2375,21 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
 			}
 		}
 
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 		desc = avcodec_descriptor_get(fmt->video_codec);
 
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "use video codec: [%d] %s (%s)\n", fmt->video_codec, desc->name, desc->long_name);
+#else
+		desc = avcodec_descriptor_get(video_codec);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "use video codec: [%d] %s (%s)\n", video_codec, desc->name, desc->long_name);
+#endif
 	}
 
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 	if (fmt->audio_codec != AV_CODEC_ID_NONE) {
+#else
+	if (audio_codec != AV_CODEC_ID_NONE) {
+#endif
 		const char *issplit = 0;
 
 		context->audio_st[0].channels = handle->channels;
@@ -1929,8 +2402,13 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
 			if (lr || rl) {
 				context->audio_st[0].channels = 1;
 				context->audio_st[1].channels = 1;
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 				add_stream(context, &context->audio_st[0], context->fc, &context->audio_codec, fmt->audio_codec, &handle->mm);
 				add_stream(context, &context->audio_st[1], context->fc, &context->audio_codec, fmt->audio_codec, &handle->mm);
+#else
+				add_stream(context, &context->audio_st[0], context->fc, &context->audio_codec, audio_codec, &handle->mm);
+				add_stream(context, &context->audio_st[1], context->fc, &context->audio_codec, audio_codec, &handle->mm);
+#endif
 			}
 
 			if (lr) {
@@ -1941,7 +2419,11 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
 		}
 
 		if (!context->audio_st[0].active) {
+#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_V)
 			add_stream(context, &context->audio_st[0], context->fc, &context->audio_codec, fmt->audio_codec, &handle->mm);
+#else
+			add_stream(context, &context->audio_st[0], context->fc, &context->audio_codec, audio_codec, &handle->mm);
+#endif
 		}
 
 		if (open_audio(context->fc, context->audio_codec, &context->audio_st[0]) != SWITCH_STATUS_SUCCESS) {
@@ -2014,11 +2496,16 @@ static switch_status_t av_file_write(switch_file_handle_t *handle, void *data, s
 	uint32_t bytes;
 	int inuse;
 	int sample_start = 0;
+	AVCodecContext *c = NULL;
 
 	if (!switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
 		return SWITCH_STATUS_FALSE;
 	}
 
+	if (!context->has_audio) {
+		return SWITCH_STATUS_SUCCESS;
+	}
+
 	if (!context->vid_ready) {
 		if (switch_test_flag(handle, SWITCH_FILE_FLAG_VIDEO)) {
 			switch_buffer_zero(context->audio_buffer);
@@ -2051,9 +2538,7 @@ static switch_status_t av_file_write(switch_file_handle_t *handle, void *data, s
 		switch_buffer_write(context->audio_buffer, data, datalen);
 	}
 
-GCC_DIAG_OFF(deprecated-declarations)
 	bytes = context->audio_st[0].frame->nb_samples * 2 * context->handle->channels; //context->audio_st[0].st->codec->channels;
-GCC_DIAG_ON(deprecated-declarations)
 
 	//{
 	//	int inuse = switch_buffer_inuse(context->audio_buffer);
@@ -2097,13 +2582,18 @@ GCC_DIAG_ON(deprecated-declarations)
 	 }
  
 	while (switch_buffer_inuse(context->audio_buffer) >= bytes) {
-		AVPacket pkt[2] = { {0} };
+		AVPacket *pkt[2];
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 		int got_packet[2] = {0};
+		int result[2] = {0};
+#else
+		int dret = -1;
+#endif
 		int j = 0, ret = -1, audio_stream_count = 1;
 		AVFrame *use_frame = NULL;
 
-		av_init_packet(&pkt[0]);
-		av_init_packet(&pkt[1]);
+		pkt[0] = av_packet_alloc();
+		pkt[1] = av_packet_alloc();
 
 		if (context->audio_st[1].active) {
 			switch_size_t len = 0;
@@ -2139,17 +2629,17 @@ GCC_DIAG_ON(deprecated-declarations)
 			if (context->audio_st[j].resample_ctx) {
 				int out_samples = swr_get_out_samples(context->audio_st[j].resample_ctx, context->audio_st[j].frame->nb_samples);
 				
-				av_frame_make_writable(context->audio_st[j].tmp_frame);				
+				av_frame_make_writable(context->audio_st[j].tmp_frame);
 				
 				/* convert to destination format */
 				ret = swr_convert(context->audio_st[j].resample_ctx,
-										 context->audio_st[j].tmp_frame->data, out_samples,
-										 (const uint8_t **)context->audio_st[j].frame->data, context->audio_st[j].frame->nb_samples);
+										context->audio_st[j].tmp_frame->data, out_samples,
+										(const uint8_t **)context->audio_st[j].frame->data, context->audio_st[j].frame->nb_samples);
 				
 				if (ret < 0) {
 					char ebuf[255] = "";
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error while converting %d samples, error text: %s\n",
-									  context->audio_st[j].frame->nb_samples, get_error_text(ret, ebuf, sizeof(ebuf)));
+									context->audio_st[j].frame->nb_samples, get_error_text(ret, ebuf, sizeof(ebuf)));
 					continue;
 				}
 
@@ -2160,24 +2650,90 @@ GCC_DIAG_ON(deprecated-declarations)
 
 			// context->audio_st[j].next_pts = use_frame->pts + use_frame->nb_samples;
 
-GCC_DIAG_OFF(deprecated-declarations)
-			ret = avcodec_encode_audio2(context->audio_st[j].st->codec, &pkt[j], use_frame, &got_packet[j]);
-GCC_DIAG_ON(deprecated-declarations)
+			if (!(c = av_get_codec_context(&context->audio_st[j]))) {
+				continue;
+			}
 
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+GCC_DIAG_OFF(deprecated-declarations)
+			result[j] = avcodec_encode_audio2(c, pkt[j], use_frame, &got_packet[j]);
+GCC_DIAG_ON(deprecated-declarations)
+#else
+			dret = avcodec_send_frame(c, use_frame);
+
+			if (dret == AVERROR_EOF) {
+				dret = 0;
+			} else if (dret == AVERROR(EAGAIN)) {
+				/* we fully drain all the output in each decode call, so this should not ever happen */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "Encoding error for channel %d on sending frame to encode - BUG, should never happen\n", j);
+				dret = AVERROR_BUG;
+			} else if (dret < 0) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Encoding error for channel %d on sending frame to encode\n", j);
+			}
+
+			while (dret >= 0) {
+				dret = avcodec_receive_packet(c, pkt[j]);
+				if (dret == AVERROR(EAGAIN)) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more audio packets at the moment for channel %d\n", j);
+					break;
+				} else if (dret == AVERROR_EOF) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9, "No more audio packets at all for channel %d\n", j);
+					break;
+				} else if (dret < 0) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Encoding error for channel %d\n", j);
+					break;
+				}
+
+				if (context->mutex) switch_mutex_lock(context->mutex);
+
+				ret = write_frame(context->fc, &c->time_base, context->audio_st[j].st, pkt[j]);
+
+				if (context->mutex) switch_mutex_unlock(context->mutex);
+
+				if (ret < 0) {
+					context->errs++;
+					if ((context->errs % 10) == 0) {
+						char ebuf[255] = "";
+
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error while writing audio frame: %d %s\n", ret, get_error_text(ret, ebuf, sizeof(ebuf)));
+						if ((ret == -5 || ret == -104) && handle->stream_name) {
+							context->errs = 1001;
+						}
+					}
+					//switch_goto_status(SWITCH_STATUS_FALSE, end);
+				} else {
+					context->errs = 0;
+				}
+
+				if (context->errs > 1000) {
+					av_packet_free(&pkt[0]);
+					av_packet_free(&pkt[1]);
+					switch_goto_status(SWITCH_STATUS_FALSE, end);
+				}
+			}
+#endif
 			context->audio_st[j].next_pts += use_frame->nb_samples;
-     	}
-		
-		if (ret < 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error encoding audio frame: %d\n", ret);
+	}
+
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
+		if (result[0] < 0 || result[1] < 0) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error encoding audio frame: %d %d \n", result[0], result[1]);
+			av_packet_free(&pkt[0]);
+			av_packet_free(&pkt[1]);
 			continue;
 		}
-		
+
 		for (j = 0; j < audio_stream_count; j++) {
 			if (got_packet[j]) {
 				if (context->mutex) switch_mutex_lock(context->mutex);
-GCC_DIAG_OFF(deprecated-declarations)
-				ret = write_frame(context->fc, &context->audio_st[j].st->codec->time_base, context->audio_st[j].st, &pkt[j]);
-GCC_DIAG_ON(deprecated-declarations)
+
+				if (!(c = av_get_codec_context(&context->audio_st[j]))) {
+					if (context->mutex) switch_mutex_unlock(context->mutex);
+					continue;
+				}
+
+				ret = write_frame(context->fc, &c->time_base, context->audio_st[j].st, pkt[j]);
+
 				if (context->mutex) switch_mutex_unlock(context->mutex);
 
 				if (ret < 0) {
@@ -2197,6 +2753,10 @@ GCC_DIAG_ON(deprecated-declarations)
 				}
 			}
 		}
+#endif
+
+		av_packet_free(&pkt[0]);
+		av_packet_free(&pkt[1]);
 	}
 
  end:
@@ -2469,10 +3029,10 @@ static switch_status_t no_video_decode_packets(switch_file_handle_t *handle, swi
 	if (context->last_read_pkt) {
 		status = switch_packetizer_read(context->packetizer, frame);
 		if (status == SWITCH_STATUS_SUCCESS) {
-			av_packet_unref(context->last_read_pkt);
-			free(context->last_read_pkt);
+			av_packet_free(&context->last_read_pkt);
 			context->last_read_pkt = NULL;
 		}
+
 		return status;
 	}
 
@@ -2480,6 +3040,7 @@ static switch_status_t no_video_decode_packets(switch_file_handle_t *handle, swi
 
 	if (status != SWITCH_STATUS_SUCCESS || !pkt) {
 		switch_cond_next();
+
 		return SWITCH_STATUS_BREAK;
 	}
 
@@ -2491,12 +3052,10 @@ static switch_status_t no_video_decode_packets(switch_file_handle_t *handle, swi
 	// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "pts=%" SWITCH_INT64_T_FMT " status = %d\n", pts, status);
 
 	if (status == SWITCH_STATUS_SUCCESS) {
-		av_packet_unref(context->last_read_pkt);
-		free(context->last_read_pkt);
+		av_packet_free(&context->last_read_pkt);
 		context->last_read_pkt = NULL;
 	}
 
-
 	if (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_MORE_DATA) {
 		if (!context->video_start_time) {
 			context->video_start_time = switch_time_now() - pts;
@@ -2531,6 +3090,8 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f
 	double fl_to = 0.02;
 	int do_fl = 0;
 	int smaller_ts = context->read_fps;
+	AVCodecContext *c = NULL;
+	AVCodecParserContext *cp = NULL;
 
 	if (!context->has_video) return SWITCH_STATUS_FALSE;
 
@@ -2638,18 +3199,17 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f
 	}
 #endif
 
-GCC_DIAG_OFF(deprecated-declarations)
-	if (st->codec->time_base.num) {
-		ticks = st->parser ? st->parser->repeat_pict + 1 : st->codec->ticks_per_frame;
+	if ((c = av_get_codec_context(mst)) && c->time_base.num) {
+		cp = av_stream_get_parser(st);
+		ticks = cp ? cp->repeat_pict + 1 : c->ticks_per_frame;
 		// mst->next_pts += ((int64_t)AV_TIME_BASE * st->codec->time_base.num * ticks) / st->codec->time_base.den;
 	}
 
 	if (!context->video_start_time) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "start: %" SWITCH_INT64_T_FMT " ticks: %d ticks_per_frame: %d st num:%d st den:%d codec num:%d codec den:%d start: %" SWITCH_TIME_T_FMT ", duration:%" SWITCH_INT64_T_FMT " nb_frames:%" SWITCH_INT64_T_FMT " q2d:%f\n",
-			context->video_start_time, ticks, st->codec->ticks_per_frame, st->time_base.num, st->time_base.den, st->codec->time_base.num, st->codec->time_base.den,
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "start: %" SWITCH_INT64_T_FMT " ticks: %d ticks_per_frame: %d st num:%d st den:%d codec num:%d codec den:%d start: %" SWITCH_TIME_T_FMT ", duration:%" SWITCH_INT64_T_FMT " nb_frames:%" SWITCH_INT64_T_FMT " q2d:%f\n",
+			context->video_start_time, ticks, c ? c->ticks_per_frame : -1, st->time_base.num, st->time_base.den, c ? c->time_base.num : -1, c ? c->time_base.den : -1,
 			st->start_time, st->duration == AV_NOPTS_VALUE ? context->fc->duration / AV_TIME_BASE * 1000 : st->duration, st->nb_frames, av_q2d(st->time_base));
 	}
-GCC_DIAG_ON(deprecated-declarations)
 
  again:
 
@@ -2750,6 +3310,7 @@ static switch_status_t av_file_write_video(switch_file_handle_t *handle, switch_
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	av_file_context_t *context = (av_file_context_t *)handle->private_info;
 	switch_image_t *img = NULL;
+	AVCodecContext *c = NULL;
 
 	if (!switch_test_flag(handle, SWITCH_FILE_FLAG_VIDEO)) {
 		return SWITCH_STATUS_FALSE;
@@ -2766,12 +3327,13 @@ static switch_status_t av_file_write_video(switch_file_handle_t *handle, switch_
 		if (add_stream(context, &context->video_st, context->fc, &context->video_codec, context->fc->oformat->video_codec, &handle->mm) == SWITCH_STATUS_SUCCESS &&
 			open_video(context->fc, context->video_codec, &context->video_st) == SWITCH_STATUS_SUCCESS) {
 
-			char codec_str[256];
+			char codec_str[256] = "";
 			int ret;
 
-GCC_DIAG_OFF(deprecated-declarations)
-			avcodec_string(codec_str, sizeof(codec_str), context->video_st.st->codec, 1);
-GCC_DIAG_ON(deprecated-declarations)
+			if ((c = av_get_codec_context(&context->video_st))) {
+				avcodec_string(codec_str, sizeof(codec_str), c, 1);
+			}
+
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "use video codec implementation %s\n", codec_str);
 			context->has_video = 1;
 
@@ -2804,8 +3366,11 @@ GCC_DIAG_ON(deprecated-declarations)
 		switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
 		switch_core_timer_init(&context->video_timer, "soft", 1, 1, context->pool);
 		context->eh.video_timer = &context->video_timer;
-		context->audio_st[0].frame->pts = 0;
-		context->audio_st[0].next_pts = 0;
+		if (context->has_audio) {
+			context->audio_st[0].frame->pts = 0;
+			context->audio_st[0].next_pts = 0;
+		}
+
 		switch_thread_create(&context->eh.video_thread, thd_attr, video_thread_run, context, handle->memory_pool);
 	}
 
@@ -2861,7 +3426,7 @@ static char *supported_formats[SWITCH_MAX_CODECS] = { 0 };
 
 static const char modname[] = "mod_av";
 
-static switch_status_t load_config()
+static switch_status_t load_config(void)
 {
 	char *cf = "avformat.conf";
 	switch_xml_t cfg, xml, param, settings;
diff --git a/src/mod/applications/mod_av/mod_av.c b/src/mod/applications/mod_av/mod_av.c
index 5d93d9adc7..02a481fd2e 100644
--- a/src/mod/applications/mod_av/mod_av.c
+++ b/src/mod/applications/mod_av/mod_av.c
@@ -25,6 +25,7 @@
  *
  * Seven Du <dujinfang@gmail.com>
  * Anthony Minessale <anthm@freeswitch.org>
+ * Jakub Karolczyk <jakub.karolczyk@signalwire.com>
  *
  * mod_av -- FS Video Codec / File Format using libav.org
  *
@@ -33,7 +34,13 @@
 #include <switch.h>
 #include "mod_av.h"
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
+#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
+#endif
 #include <libavformat/avformat.h>
+#ifdef _MSC_VER
+#include <libavformat/version.h> /* LIBAVFORMAT_VERSION_INT */
+#endif
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_avformat_load);
 SWITCH_MODULE_LOAD_FUNCTION(mod_avcodec_load);
@@ -49,6 +56,7 @@ typedef struct av_mutex_helper_s {
 	switch_memory_pool_t *pool;
 } av_mutex_helper_t;
 
+#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)
 int mod_av_lockmgr_cb(void **m, enum AVLockOp op)
 {
 	av_mutex_helper_t *context = NULL;
@@ -93,6 +101,7 @@ int mod_av_lockmgr_cb(void **m, enum AVLockOp op)
 		}
 	return 0;
 }
+#endif
 
 #ifndef AV_LOG_TRACE
 #define AV_LOG_TRACE 96
diff --git a/src/mod/applications/mod_av/mod_av.h b/src/mod/applications/mod_av/mod_av.h
index b240f98aa7..a89e6cb8f7 100644
--- a/src/mod/applications/mod_av/mod_av.h
+++ b/src/mod/applications/mod_av/mod_av.h
@@ -30,6 +30,7 @@
  * Marcel Barbulescu <marcelbarbulescu@gmail.com>
  * Raymond Chandler <intralanman@gmail.com>
  * Emmanuel Schmidbauer <e.schmidbauer@gmail.com>
+ * Jakub Karolczyk <jakub.karolczyk@signalwire.com>
  *
  *
  * mod_av.h -- LibAV mod
@@ -39,6 +40,10 @@
 #ifndef MOD_AV_H
 #define MOD_AV_H
 
+#define LIBAVCODEC_V 59
+#define LIBAVFORMAT_V 59
+#define LIBAVUTIL_V 57
+
 struct mod_av_globals {
 	int debug;
 };
diff --git a/src/mod/applications/mod_av/test/test_mod_av.2017.vcxproj b/src/mod/applications/mod_av/test/test_mod_av.2017.vcxproj
index 11dd386ff1..da6fdb97c3 100644
--- a/src/mod/applications/mod_av/test/test_mod_av.2017.vcxproj
+++ b/src/mod/applications/mod_av/test/test_mod_av.2017.vcxproj
@@ -22,7 +22,7 @@
     <ProjectName>test_mod_av</ProjectName>
     <RootNamespace>test_mod_av</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectGuid>{7926CB0D-62CE-4A09-AE94-1DA2BC92D625}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/src/mod/applications/mod_avmd/avmd_fast_acosf.c b/src/mod/applications/mod_avmd/avmd_fast_acosf.c
index 572c6a84f9..59b581b98d 100644
--- a/src/mod/applications/mod_avmd/avmd_fast_acosf.c
+++ b/src/mod/applications/mod_avmd/avmd_fast_acosf.c
@@ -86,7 +86,6 @@ typedef union {
 static uint32_t index_from_float(float f);
 static float float_from_index(uint32_t d);
 static float *acos_table = NULL;
-static int acos_fd = -1;
 
 
 #ifdef FAST_ACOSF_TESTING
@@ -112,6 +111,10 @@ extern int compute_table(void)
 
 	acos_table_file = fopen(ACOS_TABLE_FILENAME, "w");
 
+	if (!acos_table_file) {
+		return -3;
+	}
+
 	for (i = 0; i < ACOS_TABLE_LENGTH; i++) {
 		f = acosf(float_from_index(i));
 		res = fwrite(&f, sizeof(f), 1, acos_table_file);
@@ -124,10 +127,12 @@ extern int compute_table(void)
 	if (res != 0) {
 		return -2;
 	}
+
 	return 0;
 
 fail:
 	fclose(acos_table_file);
+
 	return -1;
 }
 
@@ -144,8 +149,9 @@ extern int init_fast_acosf(void)
 			 * or some other error occured */
 			errsv = errno;
 			strerror_r(errsv, err, 150);
-			if (errsv != ENOENT) return -1;
-			else {
+			if (errsv != ENOENT) {
+				return -1;
+			} else {
 				switch_log_printf(
 					SWITCH_CHANNEL_LOG,
 					SWITCH_LOG_NOTICE,
@@ -166,10 +172,10 @@ extern int init_fast_acosf(void)
 	acos_fp = fopen(ACOS_TABLE_FILENAME, "r");
 	if (acos_fp == NULL) return -3;
 	/* can't fail */
-	acos_fd = fileno(acos_fp);
 	acos_table = (float *) mmap(
 			NULL,							   /* kernel chooses the address at which to create the mapping */
-			ACOS_TABLE_LENGTH * sizeof(float), PROT_READ, MAP_SHARED, acos_fd, 0);
+			ACOS_TABLE_LENGTH * sizeof(float), PROT_READ, MAP_SHARED, fileno(acos_fp), 0);
+	fclose(acos_fp);
 	if (acos_table == MAP_FAILED) return -4;
 
 	return 0;
@@ -178,9 +184,7 @@ extern int init_fast_acosf(void)
 extern int destroy_fast_acosf(void)
 {
 	if (munmap(acos_table, ACOS_TABLE_LENGTH) == -1) return -1;
-	if (acos_fd != -1) {
-		if (close(acos_fd) == -1) return -2;
-	}
+
 	/* disable use of fast arc cosine file */
 	acos_table = NULL;
 
diff --git a/src/mod/applications/mod_avmd/mod_avmd.c b/src/mod/applications/mod_avmd/mod_avmd.c
index dde3dfbf93..713f9158cd 100644
--- a/src/mod/applications/mod_avmd/mod_avmd.c
+++ b/src/mod/applications/mod_avmd/mod_avmd.c
@@ -1138,6 +1138,13 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_avmd_load) {
 
 	switch_application_interface_t *app_interface;
 	switch_api_interface_t *api_interface;
+
+	if (pool == NULL) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No memory pool assigned!\n");
+
+		return SWITCH_STATUS_TERM;
+	}
+
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 
@@ -1147,10 +1154,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_avmd_load) {
 	}
 
 	memset(&avmd_globals, 0, sizeof(avmd_globals));
-	if (pool == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No memory pool assigned!\n");
-		return SWITCH_STATUS_TERM;
-	}
 	switch_mutex_init(&avmd_globals.mutex, SWITCH_MUTEX_NESTED, pool);
 	avmd_globals.pool = pool;
 
@@ -1622,9 +1625,6 @@ SWITCH_STANDARD_APP(avmd_start_function) {
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_avmd_shutdown) {
 	size_t session_n;
-#ifndef WIN32
-	int res;
-#endif
 
 	switch_mutex_lock(avmd_globals.mutex);
 
@@ -1638,18 +1638,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_avmd_shutdown) {
 
 #ifndef WIN32
 	if (avmd_globals.settings.fast_math == 1) {
-		res = destroy_fast_acosf();
-		if (res != 0) {
-			switch (res) {
-				case -1:
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed unmap arc cosine table\n");
-					break;
-				case -2:
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed closing arc cosine table\n");
-					break;
-				default:
-					break;
-			}
+		if (destroy_fast_acosf()) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed unmap arc cosine table\n");
 		}
 	}
 #endif
@@ -1658,6 +1648,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_avmd_shutdown) {
 	switch_mutex_unlock(avmd_globals.mutex);
 	switch_mutex_destroy(avmd_globals.mutex);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Advanced voicemail detection disabled\n");
+
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -2139,9 +2130,7 @@ static enum avmd_detection_mode avmd_process_sample(avmd_session_t *s, circ_buff
 	sma_buffer_t *sqa_amp_b = &buffer->sqa_amp_b;
 
 	if (sample_to_skip_n > 0) {
-		sample_to_skip_n--;
-		valid_amplitude = 0;
-		valid_omega = 0;
+
 		return AVMD_DETECT_NONE;
 	}
 
@@ -2154,14 +2143,14 @@ static enum avmd_detection_mode avmd_process_sample(avmd_session_t *s, circ_buff
 				RESET_SMA_BUFFER(sma_amp_b);
 				RESET_SMA_BUFFER(sqa_amp_b);
 				buffer->samples_streak_amp = s->settings.sample_n_continuous_streak_amp;
-				sample_to_skip_n = s->settings.sample_n_to_skip;
 			}
 		} else {
 			if (ISINF(amplitude)) {
 				amplitude = buffer->amplitude_max;
 			}
+
 			if (valid_amplitude == 1) {
-				APPEND_SMA_VAL(sma_amp_b, amplitude);			   /* append amplitude */
+				APPEND_SMA_VAL(sma_amp_b, amplitude);		/* append amplitude */
 				APPEND_SMA_VAL(sqa_amp_b, amplitude * amplitude);
 				if (s->settings.require_continuous_streak_amp == 1) {
 					if (buffer->samples_streak_amp > 0) {
@@ -2170,6 +2159,7 @@ static enum avmd_detection_mode avmd_process_sample(avmd_session_t *s, circ_buff
 					}
 				}
 			}
+
 			if (sma_amp_b->sma > buffer->amplitude_max) {
 				buffer->amplitude_max = sma_amp_b->sma;
 			}
@@ -2185,9 +2175,7 @@ static enum avmd_detection_mode avmd_process_sample(avmd_session_t *s, circ_buff
 				RESET_SMA_BUFFER(sma_b_fir);
 				RESET_SMA_BUFFER(sqa_b_fir);
 				buffer->samples_streak = s->settings.sample_n_continuous_streak;
-				sample_to_skip_n = s->settings.sample_n_to_skip;
 			}
-			sample_to_skip_n = s->settings.sample_n_to_skip;
 		} else if (omega < -0.99999 || omega > 0.99999) {
 			valid_omega = 0;
 			if (s->settings.require_continuous_streak == 1) {
@@ -2196,7 +2184,6 @@ static enum avmd_detection_mode avmd_process_sample(avmd_session_t *s, circ_buff
 				RESET_SMA_BUFFER(sma_b_fir);
 				RESET_SMA_BUFFER(sqa_b_fir);
 				buffer->samples_streak = s->settings.sample_n_continuous_streak;
-				sample_to_skip_n = s->settings.sample_n_to_skip;
 			}
 		} else {
 			if (valid_omega) {
@@ -2225,20 +2212,26 @@ static enum avmd_detection_mode avmd_process_sample(avmd_session_t *s, circ_buff
 	if (((mode == AVMD_DETECT_AMP) || (mode == AVMD_DETECT_BOTH)) && (valid_amplitude == 1)) {
 		v_amp = sqa_amp_b->sma - (sma_amp_b->sma * sma_amp_b->sma); /* calculate variance of amplitude (biased estimator) */
 		if ((mode == AVMD_DETECT_AMP) && (avmd_decision_amplitude(s, buffer, v_amp, AVMD_AMPLITUDE_RSD_THRESHOLD) == 1)) {
+
 			return AVMD_DETECT_AMP;
 		}
 	}
+
 	if (((mode == AVMD_DETECT_FREQ) || (mode == AVMD_DETECT_BOTH)) && (valid_omega == 1)) {
 		v_fir = sqa_b_fir->sma - (sma_b_fir->sma * sma_b_fir->sma); /* calculate variance of filtered samples */
 		if ((mode == AVMD_DETECT_FREQ) && (avmd_decision_freq(s, buffer, v_fir, AVMD_VARIANCE_RSD_THRESHOLD) == 1)) {
+
 			return AVMD_DETECT_FREQ;
 		}
+
 		if (mode == AVMD_DETECT_BOTH) {
-			if ((avmd_decision_amplitude(s, buffer, v_amp, AVMD_AMPLITUDE_RSD_THRESHOLD) == 1) && (avmd_decision_freq(s, buffer, v_fir, AVMD_VARIANCE_RSD_THRESHOLD) == 1))  {
+			if ((avmd_decision_amplitude(s, buffer, v_amp, AVMD_AMPLITUDE_RSD_THRESHOLD) == 1) && (avmd_decision_freq(s, buffer, v_fir, AVMD_VARIANCE_RSD_THRESHOLD) == 1)) {
+
 				return AVMD_DETECT_BOTH;
 			}
 		}
 	}
+
 	return AVMD_DETECT_NONE;
 }
 
diff --git a/src/mod/applications/mod_cidlookup/mod_cidlookup.c b/src/mod/applications/mod_cidlookup/mod_cidlookup.c
index 55d7aa0d90..5531222197 100644
--- a/src/mod/applications/mod_cidlookup/mod_cidlookup.c
+++ b/src/mod/applications/mod_cidlookup/mod_cidlookup.c
@@ -347,7 +347,7 @@ static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data)
 	return realsize;
 }
 
-static long do_lookup_url(switch_memory_pool_t *pool, switch_event_t *event, char **response, const char *query, struct curl_httppost *post,
+static long do_lookup_url(switch_memory_pool_t *pool, switch_event_t *event, char **response, const char *query, switch_curl_mime *post,
 						  switch_curl_slist_t *headers, int timeout)
 {
 	switch_time_t start_time = switch_micro_time_now();
@@ -373,7 +373,7 @@ static long do_lookup_url(switch_memory_pool_t *pool, switch_event_t *event, cha
 		switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
 	}
 	if (post) {
-		switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPPOST, post);
+		switch_curl_easy_setopt_mime(curl_handle, post);
 	} else {
 		switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPGET, 1);
 	}
diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 4394d9b02f..5b9620a781 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -3225,6 +3225,7 @@ SWITCH_STANDARD_API(uuid_capture_text)
 	} else {
 		if ((tsession = switch_core_session_locate(uuid))) {
 			switch_ivr_capture_text(tsession, switch_true(onoff));
+			switch_core_session_rwunlock(tsession);
 		} else {
 			stream->write_function(stream, "-ERR No such channel %s!\n", uuid);
 		}
diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c
index 8bcfc5862f..7e566367fb 100644
--- a/src/mod/applications/mod_conference/conference_api.c
+++ b/src/mod/applications/mod_conference/conference_api.c
@@ -4087,7 +4087,6 @@ switch_status_t conference_api_sub_set(conference_obj_t *conference,
 
 switch_status_t conference_api_sub_xml_list(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
 {
-	int count = 0;
 	switch_hash_index_t *hi;
 	void *val;
 	switch_xml_t x_conference, x_conferences;
@@ -4106,7 +4105,6 @@ switch_status_t conference_api_sub_xml_list(conference_obj_t *conference, switch
 			x_conference = switch_xml_add_child_d(x_conferences, "conference", off++);
 			switch_assert(conference);
 
-			count++;
 			conference_xlist(conference, x_conference, off);
 
 		}
@@ -4114,7 +4112,7 @@ switch_status_t conference_api_sub_xml_list(conference_obj_t *conference, switch
 	} else {
 		x_conference = switch_xml_add_child_d(x_conferences, "conference", off++);
 		switch_assert(conference);
-		count++;
+
 		conference_xlist(conference, x_conference, off);
 	}
 
diff --git a/src/mod/applications/mod_conference/conference_cdr.c b/src/mod/applications/mod_conference/conference_cdr.c
index b6eb630540..9f2ccba63c 100644
--- a/src/mod/applications/mod_conference/conference_cdr.c
+++ b/src/mod/applications/mod_conference/conference_cdr.c
@@ -662,6 +662,9 @@ void conference_cdr_render(conference_obj_t *conference)
 			x_tag = switch_xml_add_child_d(x_flags, "end_conference", flag_off++);
 			switch_xml_set_txt_d(x_tag, conference_cdr_test_mflag(np, MFLAG_ENDCONF) ? "true" : "false");
 
+			x_tag = switch_xml_add_child_d(x_flags, "mandatory_member_end_conference", flag_off++);
+			switch_xml_set_txt_d(x_tag, conference_cdr_test_mflag(np, MFLAG_MANDATORY_MEMBER_ENDCONF) ? "true" : "false");
+
 			x_tag = switch_xml_add_child_d(x_flags, "was_kicked", flag_off++);
 			switch_xml_set_txt_d(x_tag, conference_cdr_test_mflag(np, MFLAG_KICKED) ? "true" : "false");
 
@@ -737,7 +740,7 @@ void conference_cdr_render(conference_obj_t *conference)
 #endif
 				int wrote;
 				wrote = write(fd, xml_text, (unsigned) strlen(xml_text));
-				wrote++;
+				(void)wrote;
 				close(fd);
 			} else {
 				char ebuf[512] = { 0 };
diff --git a/src/mod/applications/mod_conference/conference_loop.c b/src/mod/applications/mod_conference/conference_loop.c
index f6c2856892..f9b7894d0e 100644
--- a/src/mod/applications/mod_conference/conference_loop.c
+++ b/src/mod/applications/mod_conference/conference_loop.c
@@ -75,7 +75,7 @@ struct _mapping control_mappings[] = {
 	{"deaf off", conference_loop_deaf_off}
 };
 
-int conference_loop_mapping_len()
+int conference_loop_mapping_len(void)
 {
 	return (sizeof(control_mappings)/sizeof(control_mappings[0]));
 }
@@ -1316,15 +1316,15 @@ void conference_loop_output(conference_member_t *member)
 	uint32_t flush_len;
 	uint32_t low_count, bytes;
 	call_list_t *call_list, *cp;
-	switch_codec_implementation_t read_impl = { 0 }, real_read_impl = { 0 };
+	switch_codec_implementation_t real_read_impl = { 0 };
 	int sanity;
 
-	switch_core_session_get_read_impl(member->session, &read_impl);
+	switch_core_session_get_read_impl(member->session, &member->read_impl);
 	switch_core_session_get_real_read_impl(member->session, &real_read_impl);
 
 
 	channel = switch_core_session_get_channel(member->session);
-	interval = read_impl.microseconds_per_packet / 1000;
+	interval = member->read_impl.microseconds_per_packet / 1000;
 	samples = switch_samples_per_packet(member->conference->rate, interval);
 	//csamples = samples;
 	tsamples = real_read_impl.samples_per_packet;
diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c
index 6112a2890c..c258e59783 100644
--- a/src/mod/applications/mod_conference/conference_member.c
+++ b/src/mod/applications/mod_conference/conference_member.c
@@ -766,7 +766,12 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
 			conference->count++;
 		}
 
+
 		if (conference_utils_member_test_flag(member, MFLAG_ENDCONF)) {
+			conference->endconference_time = 0;
+		}
+
+		if (conference_utils_member_test_flag(member, MFLAG_MANDATORY_MEMBER_ENDCONF)) {
 			if (conference->end_count++) {
 				conference->endconference_time = 0;
 			}
@@ -1314,9 +1319,14 @@ switch_status_t conference_member_del(conference_obj_t *conference, conference_m
 
 		conference_video_check_flush(member, SWITCH_FALSE);
 
+		/* End conference when any member with "endconf" flag disconnects */
 		if (conference_utils_member_test_flag(member, MFLAG_ENDCONF)) {
+			conference_utils_set_flag_locked(conference, CFLAG_DESTRUCT);
+		}
+
+		/* End conference only if all mandatory members have disconnected */
+		if (conference_utils_member_test_flag(member, MFLAG_MANDATORY_MEMBER_ENDCONF)) {
 			if (!--conference->end_count) {
-				//conference_utils_set_flag_locked(conference, CFLAG_DESTRUCT);
 				conference->endconference_time = switch_epoch_time_now(NULL);
 			}
 		}
diff --git a/src/mod/applications/mod_conference/conference_utils.c b/src/mod/applications/mod_conference/conference_utils.c
index c8dd0fd4e9..a441594ddc 100644
--- a/src/mod/applications/mod_conference/conference_utils.c
+++ b/src/mod/applications/mod_conference/conference_utils.c
@@ -132,6 +132,8 @@ void conference_utils_set_mflags(const char *flags, member_flag_t *f)
 				f[MFLAG_NOMOH] = 1;
 			} else if (!strcasecmp(argv[i], "endconf")) {
 				f[MFLAG_ENDCONF] = 1;
+			} else if (!strcasecmp(argv[i], "mandatory_member_endconf")) {
+				f[MFLAG_MANDATORY_MEMBER_ENDCONF] = 1;
 			} else if (!strcasecmp(argv[i], "mintwo")) {
 				f[MFLAG_MINTWO] = 1;
 			} else if (!strcasecmp(argv[i], "talk-data-events")) {
diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 619cd8c4a6..aa606170d5 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1347,6 +1347,9 @@ void conference_xlist(conference_obj_t *conference, switch_xml_t x_conference, i
 		x_tag = switch_xml_add_child_d(x_flags, "end_conference", count++);
 		switch_xml_set_txt_d(x_tag, conference_utils_member_test_flag(member, MFLAG_ENDCONF) ? "true" : "false");
 
+		x_tag = switch_xml_add_child_d(x_flags, "mandatory_member_end_conference", count++);
+		switch_xml_set_txt_d(x_tag, conference_utils_member_test_flag(member, MFLAG_MANDATORY_MEMBER_ENDCONF) ? "true" : "false");
+
 		x_tag = switch_xml_add_child_d(x_flags, "is_ghost", count++);
 		switch_xml_set_txt_d(x_tag, conference_utils_member_test_flag(member, MFLAG_GHOST) ? "true" : "false");
 
@@ -1360,7 +1363,7 @@ void conference_xlist(conference_obj_t *conference, switch_xml_t x_conference, i
 void conference_jlist(conference_obj_t *conference, cJSON *json_conferences)
 {
 	conference_member_t *member = NULL;
-	static cJSON *json_conference, *json_conference_variables, *json_conference_members, *json_conference_member, *json_conference_member_flags;
+	cJSON *json_conference, *json_conference_variables, *json_conference_members, *json_conference_member, *json_conference_member_flags;
 	switch_event_header_t *hp;
 
 	switch_assert(conference != NULL);
@@ -1456,6 +1459,7 @@ void conference_jlist(conference_obj_t *conference, cJSON *json_conferences)
 		ADDBOOL(json_conference_member_flags, "has_floor", member->id == member->conference->floor_holder);
 		ADDBOOL(json_conference_member_flags, "is_moderator", conference_utils_member_test_flag(member, MFLAG_MOD));
 		ADDBOOL(json_conference_member_flags, "end_conference", conference_utils_member_test_flag(member, MFLAG_ENDCONF));
+		ADDBOOL(json_conference_member_flags, "mandatory_member_end_conference", conference_utils_member_test_flag(member, MFLAG_MANDATORY_MEMBER_ENDCONF));
 		ADDBOOL(json_conference_member_flags, "pass_digits", conference_utils_member_test_flag(member, MFLAG_DIST_DTMF));
 	}
 	switch_mutex_unlock(conference->member_mutex);
diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h
index 3c28634264..e45a921c21 100644
--- a/src/mod/applications/mod_conference/mod_conference.h
+++ b/src/mod/applications/mod_conference/mod_conference.h
@@ -178,6 +178,7 @@ typedef enum {
 	MFLAG_NO_MINIMIZE_ENCODING,
 	MFLAG_FLUSH_BUFFER,
 	MFLAG_ENDCONF,
+	MFLAG_MANDATORY_MEMBER_ENDCONF,
 	MFLAG_HAS_AUDIO,
 	MFLAG_TALKING,
 	MFLAG_RESTART,
@@ -1123,7 +1124,7 @@ void conference_video_canvas_del_fnode_layer(conference_obj_t *conference, confe
 void conference_video_canvas_set_fnode_layer(mcu_canvas_t *canvas, conference_file_node_t *fnode, int idx);
 void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim);
 const char *conference_utils_combine_flag_var(switch_core_session_t *session, const char *var_name);
-int conference_loop_mapping_len();
+int conference_loop_mapping_len(void);
 void conference_api_set_agc(conference_member_t *member, const char *data);
 
 switch_status_t conference_outcall(conference_obj_t *conference,
diff --git a/src/mod/applications/mod_conference/test/conf/freeswitch.xml b/src/mod/applications/mod_conference/test/conf/freeswitch.xml
index ce76dc66f5..8fd583d4e6 100644
--- a/src/mod/applications/mod_conference/test/conf/freeswitch.xml
+++ b/src/mod/applications/mod_conference/test/conf/freeswitch.xml
@@ -7,7 +7,6 @@
         <load module="mod_sndfile"/>
         <load module="mod_loopback"/>
         <load module="mod_dptools"/>
-        <load module="mod_ssml"/>
         <load module="mod_tone_stream"/>
         <load module="mod_conference"/>
         <load module="mod_commands"/>
diff --git a/src/mod/applications/mod_curl/mod_curl.c b/src/mod/applications/mod_curl/mod_curl.c
index 9a2404caea..0f1d923869 100644
--- a/src/mod/applications/mod_curl/mod_curl.c
+++ b/src/mod/applications/mod_curl/mod_curl.c
@@ -57,6 +57,10 @@ static char *SYNTAX = "curl url [headers|json|content-type <mime-type>|connect-t
 #define HTTP_MAX_APPEND_HEADERS 10
 #define HTTP_DEFAULT_MAX_BYTES 64000
 
+#ifndef MOD_CURL_MAX_ARGS
+#define MOD_CURL_MAX_ARGS 30
+#endif
+
 static struct {
 	switch_memory_pool_t *pool;
 	switch_event_node_t *node;
@@ -104,8 +108,13 @@ struct http_sendfile_data_obj {
 	char *extrapost_elements;
 	switch_CURL *curl_handle;
 	char *cacert;
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+	curl_mime *mime;
+	curl_mimepart *part;
+#else
 	struct curl_httppost *formpost;
 	struct curl_httppost *lastptr;
+#endif
 	uint8_t flags; /* This is for where to send output of the curl_sendfile commands */
 	switch_stream_handle_t *stream;
 	char *sendfile_response;
@@ -466,8 +475,19 @@ static void http_sendfile_initialize_curl(http_sendfile_data_t *http_data)
 	curl_easy_setopt(http_data->curl_handle, CURLOPT_WRITEFUNCTION, http_sendfile_response_callback);
 	curl_easy_setopt(http_data->curl_handle, CURLOPT_WRITEDATA, (void *) http_data);
 
+	/* Initial http_data->mime */
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+	http_data->mime = curl_mime_init(http_data->curl_handle);
+#endif
+
 	/* Add the file to upload as a POST form field */
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+	http_data->part = curl_mime_addpart(http_data->mime);
+	curl_mime_name(http_data->part, http_data->filename_element_name);
+	curl_mime_filedata(http_data->part, http_data->filename_element);
+#else
 	curl_formadd(&http_data->formpost, &http_data->lastptr, CURLFORM_COPYNAME, http_data->filename_element_name, CURLFORM_FILE, http_data->filename_element, CURLFORM_END);
+#endif
 
 	if(!zstr(http_data->extrapost_elements))
 	{
@@ -486,16 +506,32 @@ static void http_sendfile_initialize_curl(http_sendfile_data_t *http_data)
 			if(argc2 == 2) {
 				switch_url_decode(argv2[0]);
 				switch_url_decode(argv2[1]);
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+				http_data->part = curl_mime_addpart(http_data->mime);
+				curl_mime_name(http_data->part, argv2[0]);
+				curl_mime_data(http_data->part, argv2[1], CURL_ZERO_TERMINATED);
+#else
 				curl_formadd(&http_data->formpost, &http_data->lastptr, CURLFORM_COPYNAME, argv2[0], CURLFORM_COPYCONTENTS, argv2[1], CURLFORM_END);
+#endif
 			}
 		}
 	}
 
 	/* Fill in the submit field too, even if this isn't really needed */
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+	http_data->part = curl_mime_addpart(http_data->mime);
+	curl_mime_name(http_data->part, "submit");
+	curl_mime_data(http_data->part, "or_die", CURL_ZERO_TERMINATED);
+#else
 	curl_formadd(&http_data->formpost, &http_data->lastptr, CURLFORM_COPYNAME, "submit", CURLFORM_COPYCONTENTS, "or_die", CURLFORM_END);
+#endif
 
 	/* what URL that receives this POST */
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+	curl_easy_setopt(http_data->curl_handle, CURLOPT_MIMEPOST, http_data->mime);
+#else
 	curl_easy_setopt(http_data->curl_handle, CURLOPT_HTTPPOST, http_data->formpost);
+#endif
 
 	// This part actually fires off the curl, captures the HTTP response code, and then frees up the handle.
 	curl_easy_perform(http_data->curl_handle);
@@ -504,7 +540,11 @@ static void http_sendfile_initialize_curl(http_sendfile_data_t *http_data)
 	curl_easy_cleanup(http_data->curl_handle);
 
 	// Clean up the form data from POST
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+	curl_mime_free(http_data->mime);
+#else
 	curl_formfree(http_data->formpost);
+#endif
 }
 
 static switch_status_t http_sendfile_test_file_open(http_sendfile_data_t *http_data, switch_event_t *event)
@@ -840,7 +880,7 @@ SWITCH_STANDARD_APP(curl_app_function)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 
-	char *argv[10] = { 0 };
+	char *argv[MOD_CURL_MAX_ARGS + 1] = { 0 };
 	int argc;
 	char *mydata = NULL;
 
@@ -868,6 +908,9 @@ SWITCH_STANDARD_APP(curl_app_function)
 	if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
 		if (argc == 0) {
 			switch_goto_status(SWITCH_STATUS_SUCCESS, usage);
+		} else if (argc >= MOD_CURL_MAX_ARGS) {
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Max args exceeded: %d\n", MOD_CURL_MAX_ARGS);
+			switch_goto_status(SWITCH_STATUS_FALSE, done);
 		}
 
 		url = switch_core_strdup(pool, argv[0]);
@@ -960,7 +1003,7 @@ SWITCH_STANDARD_APP(curl_app_function)
 SWITCH_STANDARD_API(curl_function)
 {
 	switch_status_t status;
-	char *argv[10] = { 0 };
+	char *argv[MOD_CURL_MAX_ARGS + 1] = { 0 };
 	int argc;
 	char *mydata = NULL;
 	char *url = NULL;
@@ -992,6 +1035,9 @@ SWITCH_STANDARD_API(curl_function)
 	if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
 		if (argc < 1) {
 			switch_goto_status(SWITCH_STATUS_SUCCESS, usage);
+		} else if (argc >= MOD_CURL_MAX_ARGS) {
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Max args exceeded: %d\n", MOD_CURL_MAX_ARGS);
+			switch_goto_status(SWITCH_STATUS_FALSE, done);
 		}
 
 		url = switch_core_strdup(pool, argv[0]);
diff --git a/src/mod/applications/mod_db/mod_db.c b/src/mod/applications/mod_db/mod_db.c
index 0e3e227de7..5f14792f2c 100644
--- a/src/mod/applications/mod_db/mod_db.c
+++ b/src/mod/applications/mod_db/mod_db.c
@@ -280,7 +280,7 @@ static switch_xml_config_item_t config_settings[] = {
 	SWITCH_CONFIG_ITEM_END()
 };
 
-static switch_status_t do_config()
+static switch_status_t do_config(void)
 {
 	switch_cache_db_handle_t *dbh = NULL;
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index f38509016b..d134576fb9 100644
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -161,7 +161,6 @@ static switch_status_t digit_action_callback(switch_ivr_dmachine_match_t *match)
 	char *string = NULL;
 	switch_channel_t *channel;
 	switch_core_session_t *use_session = act->session;
-	int x = 0;
 	char *flags = "";
 
 	if (act->target == DIGIT_TARGET_PEER || act->target == DIGIT_TARGET_BOTH) {
@@ -171,7 +170,6 @@ static switch_status_t digit_action_callback(switch_ivr_dmachine_match_t *match)
 	}
 
  top:
-	x++;
 
 	string = switch_core_session_strdup(use_session, act->string);
 	exec = 0;
@@ -595,7 +593,7 @@ SWITCH_STANDARD_APP(filter_codecs_function)
 	r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE);
 	
 	if (data && r_sdp) {
-		switch_core_media_merge_sdp_codec_string(session, r_sdp, SDP_TYPE_REQUEST, data);
+		switch_core_media_merge_sdp_codec_string(session, r_sdp, SDP_OFFER, data);
 		switch_channel_set_variable(channel, "filter_codec_string", data);
 	} else {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Incomplete data\n");
@@ -4584,7 +4582,7 @@ SWITCH_STANDARD_APP(wait_for_silence_function)
 			timeout_ms = switch_atoui(argv[3]);
 		}
 
-		if (thresh > 0 && silence_hits > 0 && listen_hits >= 0) {
+		if (thresh > 0 && silence_hits > 0) {
 			switch_ivr_wait_for_silence(session, thresh, silence_hits, listen_hits, timeout_ms, argv[4]);
 			return;
 		}
@@ -5324,6 +5322,130 @@ static switch_status_t file_url_file_write(switch_file_handle_t *handle, void *d
 
 /* Registration */
 
+/**
+ * TTS playback state
+ */
+struct tts_context {
+	/** handle to TTS engine */
+	switch_speech_handle_t sh;
+	/** TTS flags */
+	switch_speech_flag_t flags;
+	/** maximum number of samples to read at a time */
+	int max_frame_size;
+	/** done flag */
+	int done;
+};
+
+/**
+ * Do TTS as file format
+ * @param handle
+ * @param path the inline SSML
+ * @return SWITCH_STATUS_SUCCESS if opened
+ */
+static switch_status_t tts_file_open(switch_file_handle_t *handle, const char *path)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	struct tts_context *context = switch_core_alloc(handle->memory_pool, sizeof(*context));
+	char *arg_string = switch_core_strdup(handle->memory_pool, path);
+	char *args[3] = { 0 };
+	int argc = switch_separate_string(arg_string, '|', args, (sizeof(args) / sizeof(args[0])));
+	char *module;
+	char *voice;
+	char *document;
+
+	/* path is module:(optional)profile|voice|{param1=val1,param2=val2}TTS document */
+	if (argc != 3) {
+		return SWITCH_STATUS_FALSE;
+	}
+
+	module = args[0];
+	voice = args[1];
+	document = args[2];
+
+	memset(context, 0, sizeof(*context));
+	context->flags = SWITCH_SPEECH_FLAG_NONE;
+	if ((status = switch_core_speech_open(&context->sh, module, voice, handle->samplerate, handle->interval, handle->channels, &context->flags, NULL)) == SWITCH_STATUS_SUCCESS) {
+		if (handle->params) {
+			const char *channel_uuid = switch_event_get_header(handle->params, "channel-uuid");
+
+			if (!zstr(channel_uuid)) {
+				switch_core_speech_text_param_tts(&context->sh, "channel-uuid", channel_uuid);
+			}
+		}
+
+		if ((status = switch_core_speech_feed_tts(&context->sh, document, &context->flags)) == SWITCH_STATUS_SUCCESS) {
+			handle->channels = 1;
+			handle->samples = 0;
+			handle->format = 0;
+			handle->sections = 0;
+			handle->seekable = 0;
+			handle->speed = 0;
+			context->max_frame_size = handle->samplerate / 1000 * SWITCH_MAX_INTERVAL;
+
+			if ((context->sh.flags & SWITCH_SPEECH_FLAG_MULTI)) {
+				switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_DONE;
+				switch_core_speech_feed_tts(&context->sh, "DONE", &flags);
+			}
+		} else {
+			switch_core_speech_close(&context->sh, &context->flags);
+		}
+	}
+
+	handle->private_info = context;
+
+	return status;
+}
+
+/**
+ * Read audio from TTS engine
+ * @param handle
+ * @param data
+ * @param len
+ * @return
+ */
+static switch_status_t tts_file_read(switch_file_handle_t *handle, void *data, size_t *len)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	struct tts_context *context = (struct tts_context *)handle->private_info;
+	switch_size_t rlen;
+
+	if (*len > context->max_frame_size) {
+		*len = context->max_frame_size;
+	}
+
+	rlen = *len * 2; /* rlen (bytes) = len (samples) * 2 */
+
+	if (!context->done) {
+		context->flags = SWITCH_SPEECH_FLAG_BLOCKING;
+		if ((status = switch_core_speech_read_tts(&context->sh, data, &rlen, &context->flags))) {
+			context->done = 1;
+		}
+	} else {
+		switch_core_speech_flush_tts(&context->sh);
+		memset(data, 0, rlen);
+		status = SWITCH_STATUS_FALSE;
+	}
+
+	*len = rlen / 2; /* len (samples) = rlen (bytes) / 2 */
+
+	return status;
+}
+
+/**
+ * Close TTS engine
+ * @param handle
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t tts_file_close(switch_file_handle_t *handle)
+{
+	struct tts_context *context = (struct tts_context *)handle->private_info;
+
+	switch_core_speech_close(&context->sh, &context->flags);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static char *tts_supported_formats[] = { "tts", NULL };
 static char *file_string_supported_formats[SWITCH_MAX_CODECS] = { 0 };
 static char *file_url_supported_formats[SWITCH_MAX_CODECS] = { 0 };
 
@@ -6466,6 +6588,12 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_dptools_load)
 	file_interface->file_write = file_url_file_write;
 	file_interface->file_seek = file_url_file_seek;
 
+	file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
+	file_interface->interface_name = modname;
+	file_interface->extens = tts_supported_formats;
+	file_interface->file_open = tts_file_open;
+	file_interface->file_close = tts_file_close;
+	file_interface->file_read = tts_file_read;
 
 	error_endpoint_interface = (switch_endpoint_interface_t *) switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
 	error_endpoint_interface->interface_name = "error";
diff --git a/src/mod/applications/mod_fsv/mod_fsv.c b/src/mod/applications/mod_fsv/mod_fsv.c
index 90d64972ad..37f413d6b2 100644
--- a/src/mod/applications/mod_fsv/mod_fsv.c
+++ b/src/mod/applications/mod_fsv/mod_fsv.c
@@ -40,6 +40,11 @@ SWITCH_MODULE_DEFINITION(mod_fsv, mod_fsv_load, NULL, NULL);
 #define VID_BIT (1 << 31)
 #define VERSION 4202
 
+typedef struct fsv_video_data_s {
+	uint32_t size;
+	uint8_t data[];
+} fsv_video_data_t;
+
 struct file_header {
 	int32_t version;
 	char video_codec_name[32];
@@ -983,15 +988,16 @@ again:
 	}
 
 	if (size & VID_BIT) { /* video */
-		uint8_t *video_data = malloc(sizeof(size) + size);
+		fsv_video_data_t *video_data;
 		switch_size_t read_size;
 
-		switch_assert(video_data);
 		size &= ~VID_BIT;
+		video_data = malloc(sizeof(fsv_video_data_t) + size);
+		switch_assert(video_data);
 		read_size = size;
-		*(uint32_t *)video_data = size;
+		video_data->size = size;
 
-		status = switch_file_read(context->fd, video_data + sizeof(size), &read_size);
+		status = switch_file_read(context->fd, video_data->data, &read_size);
 
 		if (status != SWITCH_STATUS_SUCCESS || read_size != size) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
@@ -1033,7 +1039,7 @@ static switch_status_t fsv_file_read_video(switch_file_handle_t *handle, switch_
 	fsv_file_context *context = handle->private_info;
 	switch_image_t *dup = NULL;
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	void *video_packet = NULL;
+	fsv_video_data_t *video_packet = NULL;
 	switch_time_t start = switch_time_now();
 	switch_status_t decode_status = SWITCH_STATUS_MORE_DATA;
 	int new_img = 0;
@@ -1047,8 +1053,9 @@ static switch_status_t fsv_file_read_video(switch_file_handle_t *handle, switch_
 		switch_rtp_hdr_t *rtp;
 
 		while (1) {
+			video_packet = NULL;
 			switch_mutex_lock(context->mutex);
-			status = switch_queue_trypop(context->video_queue, &video_packet);
+			status = switch_queue_trypop(context->video_queue, (void**)&video_packet);
 			switch_mutex_unlock(context->mutex);
 
 			if (status != SWITCH_STATUS_SUCCESS || !video_packet) {
@@ -1065,13 +1072,13 @@ static switch_status_t fsv_file_read_video(switch_file_handle_t *handle, switch_
 			break;
 		}
 
-		size = *(uint32_t *)video_packet;
+		size = video_packet->size;
 		if (size > sizeof(context->video_packet_buffer)) {
 			free(video_packet);
 			return SWITCH_STATUS_BREAK;
 		}
 
-		memcpy(context->video_packet_buffer, (uint8_t *)video_packet + sizeof(uint32_t), size);
+		memcpy(context->video_packet_buffer, video_packet->data, size);
 		free(video_packet);
 		video_packet = NULL;
 
@@ -1093,14 +1100,15 @@ static switch_status_t fsv_file_read_video(switch_file_handle_t *handle, switch_
 			uint32_t size;
 			switch_rtp_hdr_t *rtp;
 
-			switch_mutex_lock(context->mutex);
-			status = switch_queue_trypop(context->video_queue, &video_packet);
+			video_packet = NULL;
+			switch_mutex_lock(context->mutex);			
+			status = switch_queue_trypop(context->video_queue, (void**)&video_packet);
 			switch_mutex_unlock(context->mutex);
 
 			if (status != SWITCH_STATUS_SUCCESS || !video_packet) break;
 
-			size = *(uint32_t *)video_packet;
-			rtp = (switch_rtp_hdr_t *)((uint8_t *)video_packet + sizeof(uint32_t));
+			size = video_packet->size;
+			rtp = (switch_rtp_hdr_t *)(video_packet->data);
 
 			rtp_frame.packet = rtp;
 			rtp_frame.packetlen = size;
diff --git a/src/mod/applications/mod_httapi/mod_httapi.c b/src/mod/applications/mod_httapi/mod_httapi.c
index 4b32d87c6d..1254a6f93c 100644
--- a/src/mod/applications/mod_httapi/mod_httapi.c
+++ b/src/mod/applications/mod_httapi/mod_httapi.c
@@ -1419,7 +1419,7 @@ static switch_status_t httapi_sync(client_t *client)
 	switch_status_t status = SWITCH_STATUS_FALSE;
 	int get_style_method = 0;
 	char *method = NULL;
-	struct curl_httppost *formpost=NULL;
+	switch_curl_mime *formpost = NULL;
 	switch_event_t *save_params = NULL;
 	const char *put_file;
 	FILE *fd = NULL;
@@ -1476,7 +1476,7 @@ static switch_status_t httapi_sync(client_t *client)
 	}
 
 	if (!put_file) {
-		switch_curl_process_form_post_params(client->params, curl_handle, &formpost);
+		switch_curl_process_mime(client->params, curl_handle, &formpost);
 	}
 
 	if (formpost) {
@@ -1588,7 +1588,7 @@ static switch_status_t httapi_sync(client_t *client)
 		curl_easy_setopt(curl_handle, CURLOPT_READFUNCTION, put_file_read);
 
 	} else if (formpost) {
-		curl_easy_setopt(curl_handle, CURLOPT_HTTPPOST, formpost);
+		switch_curl_easy_setopt_mime(curl_handle, formpost);
 	} else {
 		switch_curl_easy_setopt(curl_handle, CURLOPT_POST, !get_style_method);
 	}
@@ -1670,9 +1670,7 @@ static switch_status_t httapi_sync(client_t *client)
 	switch_curl_easy_cleanup(curl_handle);
 	switch_curl_slist_free_all(headers);
 
-	if (formpost) {
-		curl_formfree(formpost);
-	}
+	switch_curl_mime_free(&formpost);
 
 	if (client->err) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error encountered! [%s]\ndata: [%s]\n", client->profile->url, data);
diff --git a/src/mod/applications/mod_http_cache/azure.c b/src/mod/applications/mod_http_cache/azure.c
index f1e4cf8925..a16d2e9f94 100644
--- a/src/mod/applications/mod_http_cache/azure.c
+++ b/src/mod/applications/mod_http_cache/azure.c
@@ -279,7 +279,11 @@ switch_status_t azure_blob_finalise_put(http_profile_t *profile, const char *url
 		goto done;
 	}
 
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x070c01)
+	switch_curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1);
+#else
 	switch_curl_easy_setopt(curl_handle, CURLOPT_PUT, 1);
+#endif
 	switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1);
 	switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers);
 	switch_curl_easy_setopt(curl_handle, CURLOPT_URL, full_url);
diff --git a/src/mod/applications/mod_http_cache/mod_http_cache.c b/src/mod/applications/mod_http_cache/mod_http_cache.c
index 9d19099e56..365ba27425 100644
--- a/src/mod/applications/mod_http_cache/mod_http_cache.c
+++ b/src/mod/applications/mod_http_cache/mod_http_cache.c
@@ -393,7 +393,9 @@ static switch_status_t http_put(url_cache_t *cache, http_profile_t *profile, swi
 			goto done;
 		}
 		switch_curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1);
+#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x070c01)
 		switch_curl_easy_setopt(curl_handle, CURLOPT_PUT, 1);
+#endif
 		switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1);
 		switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers);
 		switch_curl_easy_setopt(curl_handle, CURLOPT_URL, full_url);
diff --git a/src/mod/applications/mod_ladspa/Makefile.am b/src/mod/applications/mod_ladspa/Makefile.am
deleted file mode 100644
index 04dcfb662a..0000000000
--- a/src/mod/applications/mod_ladspa/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_ladspa
-
-mod_LTLIBRARIES = mod_ladspa.la
-mod_ladspa_la_SOURCES  = mod_ladspa.c load.c
-mod_ladspa_la_CFLAGS   = $(AM_CFLAGS)
-mod_ladspa_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_ladspa_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/applications/mod_ladspa/conf/dialplan/00_ladspa.xml b/src/mod/applications/mod_ladspa/conf/dialplan/00_ladspa.xml
deleted file mode 100644
index c950e1b3c0..0000000000
--- a/src/mod/applications/mod_ladspa/conf/dialplan/00_ladspa.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<include>
-
-  <X-PRE-PROCESS cmd="set" data="AT_EPENT1=0 0 0 -1 -1 0 -1 0 -1 -1 0 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_EPENT2=1 1 1 -1 -1 1 -1 1 -1 -1 1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CPENT1=0 -1 -1 0 -1 0 0 0 -1 -1 0 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CPENT2=1 -1 -1 1 -1 1 1 1 -1 -1 1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CMAJ1=0 -1 0 0 -1 0 -1 0 0 -1 0 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CMAJ2=1 -1 1 1 -1 1 -1 1 1 -1 1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_BBLUES=1 -1 1 -1 -1 1 -1 1 1 1 -1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="ATGPENT2=-1 1 -1 1 -1 1 -1 -1 1 -1 1 -1"/>
-
-  <extension name="101">
-    <condition field="destination_number" expression="^101$">
-      <!-- AUTOTALENT DEFAULTS -->
-
-      <!--
-      <action application="set" data="AT_TUNE=440"/>
-      <action application="set" data="AT_FIXED=0"/>
-      <action application="set" data="AT_PULL=0"/>
-      <action application="set" data="AT_A=0"/>
-      <action application="set" data="AT_Bb=-1"/>
-      <action application="set" data="AT_B=0"/>
-      <action application="set" data="AT_C=0"/>
-      <action application="set" data="AT_Db=-1"/>
-      <action application="set" data="AT_D=0"/>
-      <action application="set" data="AT_Eb=-1"/>
-      <action application="set" data="AT_E=0"/>
-      <action application="set" data="AT_F=0"/>
-      <action application="set" data="AT_Gb=-1"/>
-      <action application="set" data="AT_G=0"/>
-      <action application="set" data="AT_Ab=-1"/>
-      <action application="set" data="AT_AMOUNT=1"/>
-      <action application="set" data="AT_SMOOTH=0"/>
-      <action application="set" data="AT_SHIFT=0"/>
-      <action application="set" data="AT_OUTSCALE=0"/>
-      <action application="set" data="AT_LFODEPTH=0"/>
-      <action application="set" data="AT_LFORATE=5"/>
-      <action application="set" data="AT_LFOSHAPE=0"/>
-      <action application="set" data="AT_LFOSYMM=0"/>
-      <action application="set" data="AT_LFOQUANT=0"/>
-      <action application="set" data="AT_FCORR=0"/>
-      <action application="set" data="AT_FWARP=0"/>
-      <action application="set" data="AT_MIX=1"/>
-      -->
-
-
-      <action application="set" data="AT_TUNE=440"/>
-      <action application="set" data="AT_FIXED=0"/>
-      <action application="set" data="AT_PULL=0"/>
-
-      <action application="set" data="AT_AMOUNT=1"/>
-      <action application="set" data="AT_SMOOTH=0"/>
-      <action application="set" data="AT_SHIFT=1"/>
-      <action application="set" data="AT_OUTSCALE=0"/>
-      <action application="set" data="AT_LFODEPTH=0"/>
-      <action application="set" data="AT_LFORATE=5"/>
-      <action application="set" data="AT_LFOSHAPE=0"/>
-      <action application="set" data="AT_LFOSYMM=0"/>
-      <action application="set" data="AT_LFOQUANT=0"/>
-      <action application="set" data="AT_FCORR=0"/>
-      <action application="set" data="AT_FWARP=0"/>
-      <action application="set" data="AT_MIX=1"/>
-
-      <!-- you have to download the ladspa package and the desired plugins from their desired site -->
-
-
-      <action application="set"><![CDATA[ladspa_params=${AT_TUNE} ${AT_FIXED} ${AT_PULL} ${AT_EPENT2} ${AT_AMOUNT} ${AT_SMOOTH} ${AT_SHIFT} ${AT_OUTSCALE} ${AT_LFODEPTH} ${AT_LFORATE} ${AT_LFOSHAPE} ${AT_LFOSYMM} ${AT_LFOQUANT} ${AT_FCORR} ${AT_FWARP} ${AT_MIX}]]></action>
-
-      <action application="ladspa_run" data="r|autotalent||${ladspa_params}"/>
-      <action application="ladspa_run" data="r|tap_chorusflanger||"/>
-      <action application="ladspa_run" data="r|phasers_1217.so|autoPhaser|"/>
-      <action application="bridge" data="sofia/internal/888@conference.freeswitch.org"/>
-
-      </condition>
-  </extension>
-
-</include>
diff --git a/src/mod/applications/mod_ladspa/docs/README b/src/mod/applications/mod_ladspa/docs/README
deleted file mode 100644
index 3a6337d344..0000000000
--- a/src/mod/applications/mod_ladspa/docs/README
+++ /dev/null
@@ -1,4 +0,0 @@
-mod_ladspa is a module that allow to use Linux Audio Developer's Simple Plugin API inside freeswitch in realtime. 
-see http://wiki.freeswitch.org/wiki/Mod_ladspa for installation and configuration documentation.
-
-Please Note Currently this module only works on Linux.
diff --git a/src/mod/applications/mod_ladspa/load.c b/src/mod/applications/mod_ladspa/load.c
deleted file mode 100644
index e8976bfa64..0000000000
--- a/src/mod/applications/mod_ladspa/load.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* load.c
-
-   Free software by Richard W.E. Furse. Do with as you will. No
-   warranty. */
-
-/*****************************************************************************/
-
-#include "switch.h"
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*****************************************************************************/
-
-#include "ladspa.h"
-#include "utils.h"
-#include "inttypes.h"
-/*****************************************************************************/
-
-/* This function provides a wrapping of dlopen(). When the filename is
-   not an absolute path (i.e. does not begin with / character), this
-   routine will search the LADSPA_PATH for the file. */
-static void *dlopenLADSPA(const char *pcFilename, int iFlag)
-{
-
-	char *pcBuffer;
-	const char *pcEnd;
-	const char *pcLADSPAPath;
-	const char *pcStart;
-	int iEndsInSO;
-	int iNeedSlash;
-	size_t iFilenameLength;
-	void *pvResult;
-
-	iFilenameLength = strlen(pcFilename);
-	pvResult = NULL;
-
-	if (pcFilename[0] == '/') {
-
-		/* The filename is absolute. Assume the user knows what he/she is
-		   doing and simply dlopen() it. */
-
-		pvResult = dlopen(pcFilename, iFlag);
-		if (pvResult != NULL)
-			return pvResult;
-
-	} else {
-
-		/* If the filename is not absolute then we wish to check along the
-		   LADSPA_PATH path to see if we can find the file there. We do
-		   NOT call dlopen() directly as this would find plugins on the
-		   LD_LIBRARY_PATH, whereas the LADSPA_PATH is the correct place
-		   to search. */
-
-		pcLADSPAPath = getenv("LADSPA_PATH");
-
-		if (pcLADSPAPath) {
-
-			pcStart = pcLADSPAPath;
-			while (*pcStart != '\0') {
-				pcEnd = pcStart;
-				while (*pcEnd != ':' && *pcEnd != '\0')
-					pcEnd++;
-
-				pcBuffer = malloc(iFilenameLength + 2 + (pcEnd - pcStart));
-				if (pcEnd > pcStart)
-					strncpy(pcBuffer, pcStart, pcEnd - pcStart);
-				iNeedSlash = 0;
-				if (pcEnd > pcStart)
-					if (*(pcEnd - 1) != '/') {
-						iNeedSlash = 1;
-						pcBuffer[pcEnd - pcStart] = '/';
-					}
-				strcpy(pcBuffer + iNeedSlash + (pcEnd - pcStart), pcFilename);
-
-				pvResult = dlopen(pcBuffer, iFlag);
-
-				free(pcBuffer);
-				if (pvResult != NULL)
-					return pvResult;
-
-				pcStart = pcEnd;
-				if (*pcStart == ':')
-					pcStart++;
-			}
-		}
-	}
-
-	/* As a last ditch effort, check if filename does not end with
-	   ".so". In this case, add this suffix and recurse. */
-	iEndsInSO = 0;
-	if (iFilenameLength > 3)
-		iEndsInSO = (strcmp(pcFilename + iFilenameLength - 3, ".so") == 0);
-	if (!iEndsInSO) {
-		pcBuffer = malloc(iFilenameLength + 4);
-		strcpy(pcBuffer, pcFilename);
-		strcat(pcBuffer, ".so");
-		pvResult = dlopenLADSPA(pcBuffer, iFlag);
-		free(pcBuffer);
-	}
-
-	if (pvResult != NULL)
-		return pvResult;
-
-	/* If nothing has worked, then at least we can make sure we set the
-	   correct error message - and this should correspond to a call to
-	   dlopen() with the actual filename requested. The dlopen() manual
-	   page does not specify whether the first or last error message
-	   will be kept when multiple calls are made to dlopen(). We've
-	   covered the former case - now we can handle the latter by calling
-	   dlopen() again here. */
-	return dlopen(pcFilename, iFlag);
-}
-
-/*****************************************************************************/
-
-void *loadLADSPAPluginLibrary(const char *pcPluginFilename)
-{
-
-	void *pvPluginHandle;
-
-	pvPluginHandle = dlopenLADSPA(pcPluginFilename, RTLD_NOW);
-	if (!pvPluginHandle) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to load plugin \"%s\": %s\n", pcPluginFilename, dlerror());
-	}
-
-	return pvPluginHandle;
-}
-
-/*****************************************************************************/
-
-void unloadLADSPAPluginLibrary(void *pvLADSPAPluginLibrary)
-{
-	dlclose(pvLADSPAPluginLibrary);
-}
-
-/*****************************************************************************/
-
-const LADSPA_Descriptor *findLADSPAPluginDescriptor(void *pvLADSPAPluginLibrary, const char *pcPluginLibraryFilename, const char *pcPluginLabel)
-{
-
-	const LADSPA_Descriptor *psDescriptor;
-	LADSPA_Descriptor_Function pfDescriptorFunction;
-	unsigned long lPluginIndex;
-
-	dlerror();
-	pfDescriptorFunction = (LADSPA_Descriptor_Function) (intptr_t)dlsym(pvLADSPAPluginLibrary, "ladspa_descriptor");
-	if (!pfDescriptorFunction) {
-		const char *pcError = dlerror();
-		if (pcError) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-							  "Unable to find ladspa_descriptor() function in plugin "
-							  "library file \"%s\": %s.\n" "Are you sure this is a LADSPA plugin file?\n", pcPluginLibraryFilename, pcError);
-			return NULL;
-		}
-	}
-
-	for (lPluginIndex = 0;; lPluginIndex++) {
-		psDescriptor = pfDescriptorFunction(lPluginIndex);
-		if (psDescriptor == NULL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-							  "Unable to find label \"%s\" in plugin library file \"%s\".\n", pcPluginLabel, pcPluginLibraryFilename);
-			return NULL;
-		}
-		if (strcmp(psDescriptor->Label, pcPluginLabel) == 0)
-			return psDescriptor;
-	}
-}
-
-/*****************************************************************************/
-
-/* EOF */
diff --git a/src/mod/applications/mod_ladspa/mod_ladspa.c b/src/mod/applications/mod_ladspa/mod_ladspa.c
deleted file mode 100644
index 6e04e414a9..0000000000
--- a/src/mod/applications/mod_ladspa/mod_ladspa.c
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- * mod_ladspa.c -- LADSPA
- *
- */
-#include <switch.h>
-#include "ladspa.h"
-#include "utils.h"
-
-/* Prototypes */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_ladspa_shutdown);
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_ladspa_runtime);
-SWITCH_MODULE_LOAD_FUNCTION(mod_ladspa_load);
-
-/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime)
- * Defines a switch_loadable_module_function_table_t and a static const char[] modname
- */
-SWITCH_MODULE_DEFINITION(mod_ladspa, mod_ladspa_load, mod_ladspa_shutdown, NULL);
-
-#define MAX_INDEX 256
-
-typedef struct {
-	switch_core_session_t *session;
-	char *plugin_name;
-	char *label_name;
-	void *library_handle;
-	const LADSPA_Descriptor *ldesc;
-	LADSPA_Handle handle;
-	LADSPA_Data config[MAX_INDEX];
-	int num_idx;
-	char *str_config[MAX_INDEX];
-	int str_idx;
-	uint8_t has_config[MAX_INDEX];
-	int skip;
-	LADSPA_Data in_buf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	LADSPA_Data file_buf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	LADSPA_Data out_buf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	LADSPA_Data out_ports[MAX_INDEX];
-	switch_file_handle_t fh;
-} switch_ladspa_t;
-
-
-
-int check_range(const LADSPA_Descriptor *ldesc, int i, LADSPA_Data val)
-{
-	if (ldesc->PortRangeHints[i].LowerBound && ldesc->PortRangeHints[i].UpperBound &&
-		(val < ldesc->PortRangeHints[i].LowerBound || val > ldesc->PortRangeHints[i].UpperBound)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Param %f out of bounds %f-%f\n",
-						  val, ldesc->PortRangeHints[i].LowerBound, ldesc->PortRangeHints[i].UpperBound);
-		return 0;
-	}
-
-	return 1;
-}
-
-int find_default(const LADSPA_Descriptor *ldesc, int i, LADSPA_Data *ptr)
-
-{
-	LADSPA_Data dftval = 0;
-	int fail = 0;
-
-	LADSPA_PortRangeHintDescriptor port_hint = ldesc->PortRangeHints[i].HintDescriptor;
-
-	switch (port_hint & LADSPA_HINT_DEFAULT_MASK) {
-	case LADSPA_HINT_DEFAULT_NONE:
-		break;
-	case LADSPA_HINT_DEFAULT_MINIMUM:
-		dftval = ldesc->PortRangeHints[i].LowerBound;
-		break;
-	case LADSPA_HINT_DEFAULT_LOW:
-		if (LADSPA_IS_HINT_LOGARITHMIC(port_hint)) {
-			dftval = exp(log(ldesc->PortRangeHints[i].LowerBound)
-						 * 0.75 + log(ldesc->PortRangeHints[i].UpperBound)
-						 * 0.25);
-		} else {
-			dftval = (ldesc->PortRangeHints[i].LowerBound * 0.75 + ldesc->PortRangeHints[i].UpperBound * 0.25);
-		}
-		break;
-	case LADSPA_HINT_DEFAULT_MIDDLE:
-		if (LADSPA_IS_HINT_LOGARITHMIC(port_hint)) {
-			dftval = sqrt(ldesc->PortRangeHints[i].LowerBound * ldesc->PortRangeHints[i].UpperBound);
-		} else {
-			dftval = 0.5 * (ldesc->PortRangeHints[i].LowerBound + ldesc->PortRangeHints[i].UpperBound);
-		}
-		break;
-	case LADSPA_HINT_DEFAULT_HIGH:
-		if (LADSPA_IS_HINT_LOGARITHMIC(port_hint)) {
-			dftval = exp(log(ldesc->PortRangeHints[i].LowerBound)
-						 * 0.25 + log(ldesc->PortRangeHints[i].UpperBound)
-						 * 0.75);
-		} else {
-			dftval = (ldesc->PortRangeHints[i].LowerBound * 0.25 + ldesc->PortRangeHints[i].UpperBound * 0.75);
-		}
-		break;
-	case LADSPA_HINT_DEFAULT_MAXIMUM:
-		dftval = ldesc->PortRangeHints[i].UpperBound;
-		break;
-	case LADSPA_HINT_DEFAULT_0:
-		dftval = 0;
-		break;
-	case LADSPA_HINT_DEFAULT_1:
-		dftval = 1;
-		break;
-	case LADSPA_HINT_DEFAULT_100:
-		dftval = 100;
-		break;
-	case LADSPA_HINT_DEFAULT_440:
-		dftval = 440;
-		break;
-	default:
-		fail = 1;
-		break;
-	}
-
-	if (!fail) {
-		*ptr = dftval;
-	}
-
-	return !fail;
-}
-
-static void dump_info(const LADSPA_Descriptor *ldesc)
-{
-	int i = 0;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Plugin Name: \"%s\"\n", ldesc->Name);
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Plugin Label: \"%s\"\n", ldesc->Label);
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Plugin Unique ID: %lu\n", ldesc->UniqueID);
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Maker: \"%s\"\n", ldesc->Maker);
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Copyright: \"%s\"\n", ldesc->Copyright);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Must Run Real-Time: ");
-	if (LADSPA_IS_REALTIME(ldesc->Properties))
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Yes\n");
-	else
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "No\n");
-
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Has activate() Function: ");
-	if (ldesc->activate != NULL)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Yes\n");
-	else
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "No\n");
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Has deactivate() Function: ");
-	if (ldesc->deactivate != NULL)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Yes\n");
-	else
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "No\n");
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Has run_adding() Function: ");
-	if (ldesc->run_adding != NULL)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Yes\n");
-	else
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "No\n");
-
-	if (ldesc->instantiate == NULL)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "ERROR: PLUGIN HAS NO INSTANTIATE FUNCTION.\n");
-	if (ldesc->connect_port == NULL)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "ERROR: PLUGIN HAS NO CONNECT_PORT FUNCTION.\n");
-	if (ldesc->run == NULL)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "ERROR: PLUGIN HAS NO RUN FUNCTION.\n");
-	if (ldesc->run_adding != NULL && ldesc->set_run_adding_gain == NULL)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "ERROR: PLUGIN HAS RUN_ADDING FUNCTION BUT " "NOT SET_RUN_ADDING_GAIN.\n");
-	if (ldesc->run_adding == NULL && ldesc->set_run_adding_gain != NULL)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "ERROR: PLUGIN HAS SET_RUN_ADDING_GAIN FUNCTION BUT " "NOT RUN_ADDING.\n");
-	if (ldesc->cleanup == NULL)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "ERROR: PLUGIN HAS NO CLEANUP FUNCTION.\n");
-
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Environment: ");
-	if (LADSPA_IS_HARD_RT_CAPABLE(ldesc->Properties))
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Normal or Hard Real-Time\n");
-	else
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Normal\n");
-
-	if (LADSPA_IS_INPLACE_BROKEN(ldesc->Properties))
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "This plugin cannot use in-place processing. " "It will not work with all hosts.\n");
-
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Ports:");
-
-	if (ldesc->PortCount == 0)
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "\tERROR: PLUGIN HAS NO PORTS.\n");
-
-	for (i = 0; i < ldesc->PortCount; i++) {
-		LADSPA_Data dft = 0.0f;
-		int found = 0;
-
-		if (LADSPA_IS_PORT_CONTROL(ldesc->PortDescriptors[i])) {
-			found = find_default(ldesc, i, &dft);
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "\n  \"%s\" ", ldesc->PortNames[i]);
-
-		if (LADSPA_IS_PORT_INPUT(ldesc->PortDescriptors[i])
-			&& LADSPA_IS_PORT_OUTPUT(ldesc->PortDescriptors[i]))
-			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "ERROR: INPUT AND OUTPUT");
-		else if (LADSPA_IS_PORT_INPUT(ldesc->PortDescriptors[i]))
-			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "input");
-		else if (LADSPA_IS_PORT_OUTPUT(ldesc->PortDescriptors[i]))
-			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "output");
-		else
-			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "ERROR: NEITHER INPUT NOR OUTPUT");
-
-		if (LADSPA_IS_PORT_CONTROL(ldesc->PortDescriptors[i])
-			&& LADSPA_IS_PORT_AUDIO(ldesc->PortDescriptors[i]))
-			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, ", ERROR: CONTROL AND AUDIO");
-		else if (LADSPA_IS_PORT_CONTROL(ldesc->PortDescriptors[i]))
-			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, ", control");
-		else if (LADSPA_IS_PORT_AUDIO(ldesc->PortDescriptors[i]))
-			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, ", audio");
-		else
-			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, ", ERROR: NEITHER CONTROL NOR AUDIO");
-
-		if (LADSPA_IS_PORT_CONTROL(ldesc->PortDescriptors[i])) {
-			if (found) {
-				switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "\n    RANGE: %f-%f DEFAULT: %f\n",
-								  ldesc->PortRangeHints[i].LowerBound, ldesc->PortRangeHints[i].UpperBound, dft);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "\n    RANGE: %f-%f DEFAULT: none.\n",
-								  ldesc->PortRangeHints[i].LowerBound, ldesc->PortRangeHints[i].UpperBound);
-			}
-		}
-
-
-
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "\n\n");
-}
-
-
-
-
-
-static switch_bool_t ladspa_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
-{
-	switch_ladspa_t *pvt = (switch_ladspa_t *) user_data;
-	//switch_frame_t *frame = NULL;
-	switch_channel_t *channel = switch_core_session_get_channel(pvt->session);
-
-	switch (type) {
-	case SWITCH_ABC_TYPE_INIT:
-		{
-			switch_codec_implementation_t read_impl = { 0 };
-			LADSPA_PortDescriptor port_desc;
-			int i = 0, j = 0, k = 0, str_idx = 0;
-
-			switch_core_session_get_read_impl(pvt->session, &read_impl);
-
-			if (!(pvt->library_handle = loadLADSPAPluginLibrary(pvt->plugin_name))) {
-				return SWITCH_FALSE;
-			}
-
-			if (!(pvt->ldesc = findLADSPAPluginDescriptor(pvt->library_handle, pvt->plugin_name, pvt->label_name))) {
-				return SWITCH_FALSE;
-			}
-
-
-			pvt->handle = pvt->ldesc->instantiate(pvt->ldesc, read_impl.actual_samples_per_second);
-
-			dump_info(pvt->ldesc);
-
-
-			for (i = 0; i < pvt->ldesc->PortCount; i++) {
-				port_desc = pvt->ldesc->PortDescriptors[i];
-
-				if (LADSPA_IS_PORT_CONTROL(port_desc) && LADSPA_IS_PORT_INPUT(port_desc)) {
-					LADSPA_Data dft = 0.0f;
-					int found = find_default(pvt->ldesc, i, &dft);
-
-					if (found && !pvt->has_config[j]) {
-						pvt->config[j] = dft;
-						pvt->has_config[j] = 1;
-					}
-
-					if (pvt->has_config[j]) {
-						if (!check_range(pvt->ldesc, i, pvt->config[j])) {
-							pvt->config[j] = dft;
-							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session), SWITCH_LOG_WARNING, "FALLING TO DEFAULT PARAM %d [%s] (%f)\n",
-											  j+1,
-											  pvt->ldesc->PortNames[i],
-											  pvt->config[j]);
-						}
-
-						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session), SWITCH_LOG_DEBUG, "ADDING PARAM %d [%s] (%f)\n",
-										  j+1,
-										  pvt->ldesc->PortNames[i],
-										  pvt->config[j]);
-						pvt->ldesc->connect_port(pvt->handle, i, &pvt->config[j++]);
-						usleep(10000);
-					}
-				}
-
-				if (LADSPA_IS_PORT_INPUT(port_desc) && LADSPA_IS_PORT_AUDIO(port_desc)) {
-					int mapped = 0;
-
-					if (pvt->str_idx && !zstr(pvt->str_config[str_idx])) {
-
-						if (!strcasecmp(pvt->str_config[str_idx], "none")) {
-							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session), SWITCH_LOG_DEBUG, "CONNECT NOTHING to port: %s\n",
-											  pvt->ldesc->PortNames[i]
-											  );
-							mapped = 1;
-						} else if (!strncasecmp(pvt->str_config[str_idx], "file:", 5)) {
-							char *file = pvt->str_config[str_idx] + 5;
-
-							if (switch_test_flag((&pvt->fh), SWITCH_FILE_OPEN)) {
-								switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session),
-												  SWITCH_LOG_ERROR, "CAN'T CONNECT FILE [%s] File already mapped\n", file);
-							} else {
-								if (switch_core_file_open(&pvt->fh,
-														  file,
-														  read_impl.number_of_channels,
-														  read_impl.actual_samples_per_second,
-														  SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
-									switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session), SWITCH_LOG_ERROR, "Cannot open file: %s\n", file);
-									return SWITCH_FALSE;
-								}
-
-
-								switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session), SWITCH_LOG_DEBUG, "CONNECT FILE [%s] to port: %s\n",
-												  file,
-												  pvt->ldesc->PortNames[i]
-												  );
-
-								pvt->ldesc->connect_port(pvt->handle, i, pvt->file_buf);
-								mapped = 1;
-							}
-						}
-
-						str_idx++;
-					}
-
-					if (!mapped) {
-						pvt->ldesc->connect_port(pvt->handle, i, pvt->in_buf);
-						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session), SWITCH_LOG_DEBUG, "CONNECT CHANNEL AUDIO to port: %s\n",
-										  pvt->ldesc->PortNames[i]
-										  );
-					}
-
-				}
-
-				if (LADSPA_IS_PORT_OUTPUT(port_desc)) {
-					if (LADSPA_IS_PORT_AUDIO(port_desc)) {
-						pvt->ldesc->connect_port(pvt->handle, i, pvt->out_buf);
-					} else if (k < MAX_INDEX) {
-						pvt->ldesc->connect_port(pvt->handle, i, &pvt->out_ports[k++]);
-					}
-				}
-			}
-
-			if (pvt->ldesc->activate) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session), SWITCH_LOG_DEBUG, "ACTIVATE\n");
-				pvt->ldesc->activate(pvt->handle);
-			}
-		}
-
-		break;
-
-	case SWITCH_ABC_TYPE_CLOSE:
-		{
-
-			if (switch_test_flag((&pvt->fh), SWITCH_FILE_OPEN)) {
-				switch_core_file_close(&pvt->fh);
-			}
-
-			if (pvt->handle && pvt->ldesc) {
-				if (pvt->ldesc->deactivate) {
-					pvt->ldesc->deactivate(pvt->handle);
-				}
-
-				pvt->ldesc->cleanup(pvt->handle);
-			}
-
-			if (pvt->library_handle) {
-				unloadLADSPAPluginLibrary(pvt->library_handle);
-			}
-		}
-		break;
-
-	case SWITCH_ABC_TYPE_WRITE_REPLACE:
-	case SWITCH_ABC_TYPE_READ_REPLACE:
-		{
-			switch_frame_t *rframe;
-			int16_t *slin, abuf[SWITCH_RECOMMENDED_BUFFER_SIZE] =  { 0 };
-			switch_size_t olen = 0;
-
-
-			if (type == SWITCH_ABC_TYPE_READ_REPLACE) {
-				rframe = switch_core_media_bug_get_read_replace_frame(bug);
-			} else {
-				rframe = switch_core_media_bug_get_write_replace_frame(bug);
-			}
-
-			slin = rframe->data;
-
-			if (switch_channel_media_ready(channel)) {
-				switch_short_to_float(slin, pvt->in_buf, rframe->samples);
-
-				if (switch_test_flag((&pvt->fh), SWITCH_FILE_OPEN)) {
-					olen = rframe->samples;
-					if (switch_core_file_read(&pvt->fh, abuf, &olen) != SWITCH_STATUS_SUCCESS) {
-						switch_codec_implementation_t read_impl = { 0 };
-						char *file = switch_core_session_strdup(pvt->session, pvt->fh.file_path);
-						switch_core_session_get_read_impl(pvt->session, &read_impl);
-
-						switch_core_file_close(&pvt->fh);
-
-						if (switch_core_file_open(&pvt->fh,
-												  file,
-												  read_impl.number_of_channels,
-												  read_impl.actual_samples_per_second,
-												  SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
-							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session), SWITCH_LOG_ERROR, "Cannot open file: %s\n", file);
-							return SWITCH_FALSE;
-						}
-
-						olen = rframe->samples;
-						if (switch_core_file_read(&pvt->fh, abuf, &olen) != SWITCH_STATUS_SUCCESS) {
-							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pvt->session), SWITCH_LOG_ERROR, "Cannot READ file: %s\n", file);
-							return SWITCH_FALSE;
-						}
-					}
-
-					switch_short_to_float(abuf, pvt->file_buf, olen);
-				}
-
-				pvt->ldesc->run(pvt->handle, rframe->samples);
-
-				switch_float_to_short(pvt->out_buf, slin, rframe->samples);
-			}
-
-			if (type == SWITCH_ABC_TYPE_READ_REPLACE) {
-				switch_core_media_bug_set_read_replace_frame(bug, rframe);
-			} else {
-				switch_core_media_bug_set_write_replace_frame(bug, rframe);
-			}
-
-			if (pvt->skip && !--pvt->skip) {
-				return SWITCH_FALSE;
-			}
-
-		}
-		break;
-	case SWITCH_ABC_TYPE_WRITE:
-	default:
-		break;
-	}
-
-	return SWITCH_TRUE;
-}
-
-switch_status_t stop_ladspa_session(switch_core_session_t *session)
-{
-	switch_media_bug_t *bug;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-
-	if ((bug = switch_channel_get_private(channel, "ladspa"))) {
-		switch_channel_set_private(channel, "ladspa", NULL);
-		switch_core_media_bug_remove(session, &bug);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	return SWITCH_STATUS_FALSE;
-}
-
-switch_status_t ladspa_session(switch_core_session_t *session, const char *flags, const char *plugin_name, const char *label, const char *params)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_media_bug_t *bug;
-	switch_status_t status;
-	switch_ladspa_t *pvt = { 0 };
-	switch_codec_implementation_t read_impl = { 0 };
-	int i, bflags = SMBF_READ_REPLACE | SMBF_ANSWER_REQ;
-	char *pstr;
-	int argc;
-	char *argv[50];
-	char *dparams = NULL;
-
-	if (zstr(plugin_name)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s INVALID PLUGIN\n", switch_channel_get_name(channel));
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (zstr(flags)) {
-		flags = "r";
-	}
-
-	if (strchr(flags, 'w')) {
-		bflags = SMBF_WRITE_REPLACE;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "FLAGS: %s PLUGIN: %s LABEL: %s PARAMS: %s\n",
-					  flags, plugin_name, label, params);
-
-	switch_core_session_get_read_impl(session, &read_impl);
-
-	pvt = switch_core_session_alloc(session, sizeof(*pvt));
-
-   	pvt->session = session;
-	if (!zstr(label)) {
-		pvt->label_name = switch_core_session_strdup(session, label);
-	} else {
-		char *p;
-		pvt->label_name = switch_core_session_strdup(session, plugin_name);
-		if ((p = strrchr(pvt->label_name, '.'))) {
-			*p = '\0';
-		}
-	}
-
-	if (strstr(plugin_name, ".so")) {
-		pvt->plugin_name = switch_core_session_strdup(session, plugin_name);
-	} else {
-		pvt->plugin_name = switch_core_session_sprintf(session, "%s.so", plugin_name);
-	}
-
-	dparams = switch_core_session_strdup(session, params);
-
-	argc = switch_split(dparams, ' ', argv);
-
-	for (i = 0; i < argc; i++) {
-		if (switch_is_number(argv[i])) {
-			if (pvt->num_idx < MAX_INDEX) {
-				pvt->config[pvt->num_idx] = atof(argv[i]);
-				pvt->has_config[pvt->num_idx] = 1;
-				pvt->num_idx++;
-			}
-		} else {
-			if (pvt->str_idx < MAX_INDEX) {
-				pvt->str_config[pvt->str_idx++] = switch_core_session_strdup(session, argv[i]);
-			}
-		}
-	}
-
-	if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	pstr = switch_core_session_sprintf(session, "%s|%s|%s|%s", flags, plugin_name, label, params);
-
-	if ((status = switch_core_media_bug_add(session, "ladspa", pstr,
-                                            ladspa_callback, pvt, 0, bflags | SMBF_NO_PAUSE, &bug)) != SWITCH_STATUS_SUCCESS) {
-		return status;
-	}
-
-	switch_channel_set_private(channel, "ladspa", bug);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static void ladspa_parse(switch_core_session_t *session, const char *data)
-{
-	char *argv[5] = { 0 };
-	char *lbuf;
-
-	if (data) {
-		lbuf = strdup(data);
-		switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])));
-	   	ladspa_session(session, argv[0], argv[1], argv[2], argv[3]);
-		free(lbuf);
-	}
-}
-
-#define APP_SYNTAX "<flags>|<plugin>|<label>|<params>"
-SWITCH_STANDARD_APP(ladspa_run_function)
-{
-	ladspa_parse(session, data);
-}
-
-
-
-#define API_SYNTAX "<uuid> [start|stop] <flags>|<plugin>|<label>|<params>"
-SWITCH_STANDARD_API(ladspa_api)
-{
-	char *uuid = NULL;
-	char *data = NULL;
-	char *p, *action;
-	switch_core_session_t *ksession = NULL;
-
-	if (!cmd) {
-		stream->write_function(stream, "-ERR Operation Failed\n");
-		goto done;
-	}
-
-	data = strdup(cmd);
-
-	if ((p = strchr(data, ' '))) {
-		uuid = data;
-		*p++ = '\0';
-
-		if (!(ksession = switch_core_session_locate(uuid))) {
-			stream->write_function(stream, "-ERR non-existant UUID\n");
-			goto done;
-		}
-
-		if ((action = strstr(cmd, "stop"))) {
-			stop_ladspa_session(ksession);
-			switch_core_session_rwunlock(ksession);
-			stream->write_function(stream, "+OK\n");
-			goto done;
-		} else if ((action = strstr(cmd, "start"))) {
-			// Advance past 'start' conditional keyword and move on
-			p += 5 * sizeof(char);
-			*p++ = '\0';
-			switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "Tried to remove 'start' and now the string is \"%s\"\n", p);
-		}
-
-		ladspa_parse(ksession, p);
-		stream->write_function(stream, "+OK\n");
-	} else {
-		stream->write_function(stream, "-ERR Usage %s\n", API_SYNTAX);
-	}
-
-done:
-
-	switch_safe_free(data);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-/* Macro expands to: switch_status_t mod_ladspa_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
-SWITCH_MODULE_LOAD_FUNCTION(mod_ladspa_load)
-{
-	switch_application_interface_t *app_interface;
-	switch_api_interface_t *api_interface;
-	char *path = getenv("LADSPA_PATH");
-
-	if (zstr(path)) {
-		if (switch_directory_exists("/usr/lib64/ladspa/", pool) == SWITCH_STATUS_SUCCESS) {
-			setenv("LADSPA_PATH", "/usr/lib64/ladspa/:/usr/local/lib/ladspa", 1);
-		} else if (switch_directory_exists("/usr/lib/ladspa/", pool) == SWITCH_STATUS_SUCCESS) {
-			setenv("LADSPA_PATH", "/usr/lib/ladspa/:/usr/local/lib/ladspa", 1);
-		} else if (switch_directory_exists("/usr/local/lib/ladspa/", pool) == SWITCH_STATUS_SUCCESS) {
-			setenv("LADSPA_PATH", "/usr/local/lib/ladspa", 1);
-		}
-	}
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	SWITCH_ADD_APP(app_interface, "ladspa_run", "ladspa_run", NULL, ladspa_run_function, APP_SYNTAX, SAF_NONE);
-	SWITCH_ADD_API(api_interface, "uuid_ladspa", "ladspa", ladspa_api, API_SYNTAX);
-
-	switch_console_set_complete("add uuid_ladspa ::console::list_uuid");
-
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/*
-  Called when the system shuts down
-  Macro expands to: switch_status_t mod_ladspa_shutdown() */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_ladspa_shutdown)
-{
-	/* Cleanup dynamically allocated config settings */
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/applications/mod_ladspa/utils.h b/src/mod/applications/mod_ladspa/utils.h
deleted file mode 100644
index 593bcf1dbf..0000000000
--- a/src/mod/applications/mod_ladspa/utils.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* utils.h
-
-   Free software by Richard W.E. Furse. Do with as you will. No
-   warranty. */
-
-#ifndef LADSPA_SDK_LOAD_PLUGIN_LIB
-#define LADSPA_SDK_LOAD_PLUGIN_LIB
-
-/*****************************************************************************/
-
-#include "ladspa.h"
-
-/*****************************************************************************/
-
-/* Functions in load.c: */
-
-/* This function call takes a plugin library filename, searches for
-   the library along the LADSPA_PATH, loads it with dlopen() and
-   returns a plugin handle for use with findPluginDescriptor() or
-   unloadLADSPAPluginLibrary(). Errors are handled by writing a
-   message to stderr and calling exit(1). It is alright (although
-   inefficient) to call this more than once for the same file. */
-void * loadLADSPAPluginLibrary(const char * pcPluginFilename);
-
-/* This function unloads a LADSPA plugin library. */
-void unloadLADSPAPluginLibrary(void * pvLADSPAPluginLibrary);
-
-/* This function locates a LADSPA plugin within a plugin library
-   loaded with loadLADSPAPluginLibrary(). Errors are handled by
-   writing a message to stderr and calling exit(1). Note that the
-   plugin library filename is only included to help provide
-   informative error messages. */
-const LADSPA_Descriptor *
-findLADSPAPluginDescriptor(void * pvLADSPAPluginLibrary,
-			   const char * pcPluginLibraryFilename,
-			   const char * pcPluginLabel);
-
-/*****************************************************************************/
-
-/* Functions in search.c: */
-
-/* Callback function for use with LADSPAPluginSearch(). The callback
-   function passes the filename (full path), a plugin handle (dlopen()
-   style) and a LADSPA_DescriptorFunction (from which
-   LADSPA_Descriptors can be acquired). */
-typedef void LADSPAPluginSearchCallbackFunction
-(const char * pcFullFilename,
- void * pvPluginHandle,
- LADSPA_Descriptor_Function fDescriptorFunction);
-
-/* Search through the $(LADSPA_PATH) (or a default path) for any
-   LADSPA plugin libraries. Each plugin library is tested using
-   dlopen() and dlsym(,"ladspa_descriptor"). After loading each
-   library, the callback function is called to process it. This
-   function leaves items passed to the callback function open. */
-void LADSPAPluginSearch(LADSPAPluginSearchCallbackFunction fCallbackFunction);
-
-/*****************************************************************************/
-
-/* Function in default.c: */
-
-/* Find the default value for a port. Return 0 if a default is found
-   and -1 if not. */
-int getLADSPADefault(const LADSPA_PortRangeHint * psPortRangeHint,
-		     const unsigned long          lSampleRate,
-		     LADSPA_Data                * pfResult);
-
-/*****************************************************************************/
-
-#endif
-
-/* EOF */
diff --git a/src/mod/applications/mod_mp4/Makefile.am b/src/mod/applications/mod_mp4/Makefile.am
deleted file mode 100644
index 46d3f78dfa..0000000000
--- a/src/mod/applications/mod_mp4/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_mp4
-
-mod_LTLIBRARIES = mod_mp4.la
-mod_mp4_la_SOURCES  = mod_mp4.cpp mp4_helper.cpp
-mod_mp4_la_CFLAGS   = $(AM_CFLAGS)
-mod_mp4_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_mp4_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lmp4v2
diff --git a/src/mod/applications/mod_mp4/exception.hpp b/src/mod/applications/mod_mp4/exception.hpp
deleted file mode 100644
index 75f84989a2..0000000000
--- a/src/mod/applications/mod_mp4/exception.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-
-The contents of this file are subject to the Mozilla Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is MP4 Helper Library to Freeswitch MP4 module.
-
-The Initial Developer of the Original Code is 
-Paulo Rogério Panhoto <paulo@voicetechnology.com.br>.
-Portions created by the Initial Developer are Copyright (C)
-the Initial Developer. All Rights Reserved.
-
-*/
-
-#ifndef EXCEPTION_HPP_
-#define EXCEPTION_HPP_
-
-#include <exception>
-#include <string>
-
-class Exception: public std::exception {
-  public:
-	Exception()
-	{
-	}
-	
-	Exception(const std::string & message): message_(message)
-	{
-	}
-	
-	Exception(const std::exception & e): message_(e.what())
-	{
-	}
-	
-	Exception(const Exception & e): message_(e.message_)
-	{
-	}
-	
-	virtual ~Exception() throw()
-	{
-	}
-	
-	const char * what() const throw()
-	{
-		return message_.c_str();
-	}
-	
-  private:
-	std::string message_;
-};
-
-#endif
\ No newline at end of file
diff --git a/src/mod/applications/mod_mp4/mod_mp4.cpp b/src/mod/applications/mod_mp4/mod_mp4.cpp
deleted file mode 100644
index 433642d816..0000000000
--- a/src/mod/applications/mod_mp4/mod_mp4.cpp
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Paulo Rogério Panhoto <paulo@voicetechnology.com.br>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * mod_mp4 -- MP4 File Format support for video apps.
- *
- */
-
-#include <switch.h>
-#include "mp4_helper.hpp"
-#include "exception.hpp"
-
-
-#ifndef min
-#define min(x, y) ((x) < (y) ? (x) : (y))
-#endif
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_mp4_load);
-SWITCH_MODULE_DEFINITION(mod_mp4, mod_mp4_load, NULL, NULL);
-
-#define VID_BIT (1 << 31)
-#define VERSION 4201
-
-#ifdef MP4_RECORD
-struct file_header {
-	int32_t version;
-	char video_codec_name[32];
-	char video_fmtp[128];
-	uint32_t audio_rate;
-	uint32_t audio_ptime;
-	switch_time_t created;
-};
-
-struct record_helper {
-	switch_core_session_t *session;
-	switch_mutex_t *mutex;
-	int fd;
-	int up;
-};
-#endif
-
-struct AVParams {
-	switch_core_session_t * session;
-	switch_channel_t * channel;
-	switch_timer_t * timer;
-	switch_frame_t * frame;
-	switch_mutex_t * mutex;
-	bool video;
-	switch_payload_t pt;
-	MP4::Context * vc;
-	bool done;
-	bool * quit;
-};
-
-static void *SWITCH_THREAD_FUNC record_video_thread(switch_thread_t *thread, void *obj)
-{
-#ifdef MP4_RECORD
-	record_helper *eh = reinterpret_cast<record_helper *>(obj);
-	switch_core_session_t *session = eh->session;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_status_t status;
-	switch_frame_t *read_frame;
-	int bytes;
-
-	eh->up = 1;
-	while (switch_channel_ready(channel)) {
-		status = switch_core_session_read_video_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
-
-		if (!SWITCH_READ_ACCEPTABLE(status)) {
-			break;
-		}
-
-		if (switch_test_flag(read_frame, SFF_CNG)) {
-			continue;
-		}
-
-		bytes = read_frame->packetlen | VID_BIT;
-
-		switch_mutex_lock(eh->mutex);
-
-		if (write(eh->fd, &bytes, sizeof(bytes)) != (int) sizeof(bytes)) {
-			switch_mutex_unlock(eh->mutex);
-			break;
-		}
-
-		if (write(eh->fd, read_frame->packet, read_frame->packetlen) != (int) read_frame->packetlen) {
-			switch_mutex_unlock(eh->mutex);
-			break;
-		}
-
-		switch_mutex_unlock(eh->mutex);
-
-		switch_core_session_write_video_frame(session, read_frame, SWITCH_IO_FLAG_NONE, 0);
-	}
-	eh->up = 0;
-#endif
-	return NULL;
-}
-
-SWITCH_STANDARD_APP(record_mp4_function)
-{
-#ifdef MP4_RECORD
-	switch_status_t status;
-	switch_frame_t *read_frame;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	struct record_helper eh = { 0 };
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	int fd;
-	switch_mutex_t *mutex = NULL;
-	switch_codec_t codec, *vid_codec;
-	switch_codec_implementation_t read_impl = { };
-	int count = 0, sanity = 30;
-
-	switch_core_session_get_read_impl(session, &read_impl);
-	switch_channel_answer(channel);
-
-
-	while (switch_channel_up(channel) && !switch_channel_test_flag(channel, CF_VIDEO)) {
-		switch_yield(10000);
-
-		if (count) count--;
-
-		if (count == 0) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "%s waiting for video.\n", switch_channel_get_name(channel));
-			count = 100;
-			if (!--sanity) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s timeout waiting for video.\n",
-								  switch_channel_get_name(channel));
-				return;
-			}
-		}
-	}
-
-	if (!switch_channel_ready(channel)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "%s not ready.\n", switch_channel_get_name(channel));
-		return;
-	}
-
-/*
-	if ((fd = open((char *) data, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR)) < 0) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data);
-		return;
-	}
-*/
-
-	MP4::Context ctx(reinterpret_cast<char*>(data), true);
-
-	if (switch_core_codec_init(&codec,
-							   "L16",
-							   NULL,
-							   NULL,
-							   read_impl.samples_per_second,
-							   read_impl.microseconds_per_packet / 1000,
-							   1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
-							   NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS)
-	{
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n");
-		goto end;
-	}
-
-	switch_core_session_set_read_codec(session, &codec);
-
-	if (switch_channel_test_flag(channel, CF_VIDEO)) {
-		struct file_header h;
-		memset(&h, 0, sizeof(h));
-		vid_codec = switch_core_session_get_video_read_codec(session);
-
-		h.version = VERSION;
-		h.created = switch_micro_time_now();
-		switch_set_string(h.video_codec_name, vid_codec->implementation->iananame);
-		if (vid_codec->fmtp_in) {
-			switch_set_string(h.video_fmtp, vid_codec->fmtp_in);
-		}
-		h.audio_rate = read_impl.samples_per_second;
-		h.audio_ptime = read_impl.microseconds_per_packet / 1000;
-
-		if (write(fd, &h, sizeof(h)) != sizeof(h)) {
-			goto end;
-		}
-
-		switch_mutex_init(&mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-		eh.mutex = mutex;
-		eh.fd = fd;
-		eh.session = session;
-		switch_threadattr_create(&thd_attr, switch_core_session_get_pool(session));
-		switch_threadattr_detach_set(thd_attr, 1);
-		switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-		switch_thread_create(&thread, thd_attr, record_video_thread, &eh, switch_core_session_get_pool(session));
-	}
-
-
-	while (switch_channel_ready(channel)) {
-
-		status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
-
-		if (!SWITCH_READ_ACCEPTABLE(status)) {
-			break;
-		}
-
-		if (switch_test_flag(read_frame, SFF_CNG)) {
-			continue;
-		}
-
-		if (mutex) {
-			switch_mutex_lock(mutex);
-		}
-
-		if (write(fd, &read_frame->datalen, sizeof(read_frame->datalen)) != sizeof(read_frame->datalen)) {
-			if (mutex) {
-				switch_mutex_unlock(mutex);
-			}
-			break;
-		}
-
-		if (write(fd, read_frame->data, read_frame->datalen) != (int) read_frame->datalen) {
-			if (mutex) {
-				switch_mutex_unlock(mutex);
-			}
-			break;
-		}
-
-		if (mutex) {
-			switch_mutex_unlock(mutex);
-		}
-	}
-
-
-  end:
-
-	if (eh.up) {
-		while (eh.up) {
-			switch_cond_next();
-		}
-	}
-
-	switch_core_session_set_read_codec(session, NULL);
-	switch_core_codec_destroy(&codec);
-#endif
-}
-
-static void *SWITCH_THREAD_FUNC play_video_function(switch_thread_t *thread, void *obj)
-{
-	AVParams * pt = reinterpret_cast<AVParams*>(obj);
-	u_int next = 0, first = 0xffffffff;
-	uint64_t ts = 0, control = 0;
-
-	bool ok;
-	bool sent = true;
-	pt->done = false;
-	switch_time_t start = switch_time_now();
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pt->session), SWITCH_LOG_DEBUG, "Video thread Started\n");
-	while (!*pt->quit && switch_channel_ready(pt->channel)) {
-		if (pt->video) {
-			if (sent) {
-				switch_mutex_lock(pt->mutex);
-				pt->frame->packetlen = pt->frame->buflen;
-				ok = pt->vc->getVideoPacket(pt->frame->packet, pt->frame->packetlen, next);
-				switch_mutex_unlock(pt->mutex);
-				sent = false;
-				if (ok) {
-					switch_rtp_hdr_t *hdr = reinterpret_cast<switch_rtp_hdr_t *>(pt->frame->packet);
-					if(first == 0xffffffff) first = next;
-					next -= first;
-					control = next * 90000LL / pt->vc->videoTrack().track.clock;
-					control -= first;
-					hdr->ts = htonl(control);
-					control = control * 1000 / 90;
-					if (pt->pt)
-						hdr->pt = pt->pt;
-				} else break;
-			}
-
-			ts = switch_time_now() - start;
-			int64_t wait = control > ts ? (control - ts) : 0;
-
-			if (wait > 0) {
-				switch_cond_next();
-				// wait the time for the next Video frame
-				switch_sleep(wait);
-			}
-
-			if (switch_channel_test_flag(pt->channel, CF_VIDEO)) {
-				switch_byte_t *data = (switch_byte_t *) pt->frame->packet;
-
-				pt->frame->data = data + 12;
-				pt->frame->datalen = pt->frame->packetlen - 12;
-				switch_core_session_write_video_frame(pt->session, pt->frame, SWITCH_IO_FLAG_NONE, 0);
-				sent = true;
-			}
-
-		}
-	}
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pt->session), SWITCH_LOG_DEBUG, "Video thread ended\n");
-	pt->done = true;
-	return NULL;
-}
-
-static void *SWITCH_THREAD_FUNC play_audio_function(switch_thread_t *thread, void *obj)
-{
-	AVParams * pt = reinterpret_cast<AVParams*>(obj);
-	u_int next = 0, first = 0xffffffff;
-	uint64_t ts = 0, control = 0;
-
-	bool ok;
-	bool sent = true;
-	switch_dtmf_t dtmf = {0};
-	pt->done = false;
-	switch_frame_t * read_frame;
-
-	while (!*pt->quit && switch_channel_ready(pt->channel)) {
-		// event processing.
-		// -- SEE switch_ivr_play_say.c:1231 && mod_dptools.c:1428 && mod_dptools.c:1919
-		switch_core_session_read_frame(pt->session, &read_frame, SWITCH_IO_FLAG_SINGLE_READ, 0);
-
-		if (switch_channel_test_flag(pt->channel, CF_BREAK)) {
-			switch_channel_clear_flag(pt->channel, CF_BREAK);
-			break;
-		}
-
-		switch_ivr_parse_all_events(pt->session);
-
-		if (switch_channel_has_dtmf(pt->channel)) {
-			switch_channel_dequeue_dtmf(pt->channel, &dtmf);
-			const char * terminators = switch_channel_get_variable(pt->channel, SWITCH_PLAYBACK_TERMINATORS_VARIABLE);
-			if (terminators && !strcasecmp(terminators, "none")) terminators = NULL;
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pt->session), SWITCH_LOG_DEBUG, "Digit %c\n", dtmf.digit);
-			if (terminators && strchr(terminators, dtmf.digit)) {
-				std::string digit(&dtmf.digit, 0, 1);
-				switch_channel_set_variable(pt->channel, SWITCH_PLAYBACK_TERMINATOR_USED, digit.c_str());
-				break;
-			}
-		}
-
-		switch_mutex_lock(pt->mutex);
-		pt->frame->datalen = pt->frame->buflen;
-		ok = pt->vc->getAudioPacket(pt->frame->data, pt->frame->datalen, next);
-		switch_mutex_unlock(pt->mutex);
-
-		if (ok) {
-		  if (pt->frame->datalen > (int) pt->frame->buflen)
-				pt->frame->datalen = pt->frame->buflen;
-
-			switch_core_session_write_frame(pt->session, pt->frame, SWITCH_IO_FLAG_NONE, 0);
-			switch_core_timer_next(pt->timer);
-		}
-		else break;
-	}
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(pt->session), SWITCH_LOG_DEBUG, "Audio done\n");
-	*pt->quit = pt->done = true;
-	return NULL;
-}
-
-SWITCH_STANDARD_APP(play_mp4_function)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_frame_t write_frame = { 0 }, vid_frame = {0};
-	switch_codec_t codec = { 0 }, vid_codec = {0}, *read_vid_codec;
-	unsigned char *aud_buffer;
-	unsigned char *vid_buffer;
-	switch_timer_t timer = { 0 };
-	switch_codec_implementation_t read_impl = {};
-	bool done = false;
-
-	try {
-		MP4::Context vc((char *) data);
-
-		switch_payload_t pt = 0;
-
-		switch_core_session_get_read_impl(session, &read_impl);
-
-		aud_buffer = (unsigned char *) switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE);
-		vid_buffer = (unsigned char *) switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE);
-
-		/*
-		if (!vc.isOpen())
-		{
-			char msgbuf[1024];
-			sprintf(msgbuf, "PLAYBACK ERROR (%s): FILE NOT FOUND.", (char*) data);
-			switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, msgbuf);
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data);
-			return;
-		}
-
-		if(!vc.isSupported())
-		{
-			char msgbuf[1024];
-			sprintf(msgbuf, "PLAYBACK ERROR (%s): UNSUPPORTED FORMAT OR FILE NOT HINTED.", (char*) data);
-			switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, msgbuf);
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT,
-				"Error reading track info. Maybe this file is not hinted.\n");
-			throw 1;
-		}
-		*/
-
-		switch_channel_set_variable(channel, "rtp_force_video_fmtp", vc.videoTrack().fmtp.c_str());
-		switch_channel_answer(channel);
-
-		if ((read_vid_codec = switch_core_session_get_video_read_codec(session))) {
-			pt = read_vid_codec->agreed_pt;
-		}
-
-		write_frame.codec = &codec;
-		write_frame.data = aud_buffer;
-		write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
-
-		vid_frame.codec = &vid_codec;
-		vid_frame.packet = vid_buffer;
-		vid_frame.data = vid_buffer + 12;
-		vid_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE - 12;
-		switch_set_flag((&vid_frame), SFF_RAW_RTP);
-		switch_set_flag((&vid_frame), SFF_PROXY_PACKET);
-
-		if (switch_core_timer_init(&timer, "soft", read_impl.microseconds_per_packet / 1000,
-			read_impl.samples_per_packet, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Timer Activation Fail\n");
-			throw 2;
-		}
-
-		if (switch_core_codec_init(&codec,
-								   vc.audioTrack().codecName,
-								   NULL,
-								   NULL,
-								   vc.audioTrack().clock,
-								   vc.audioTrack().packetLength,
-								   1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
-								   NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
-		} else {
-			throw Exception("Audio Codec Activation Fail");
-		}
-
-		if (switch_core_codec_init(&vid_codec,
-								   vc.videoTrack().track.codecName,
-								   NULL,
-								   NULL,
-								   0,
-								   0,
-								   1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
-								   NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Video Codec Activation Success\n");
-		} else
-		{
-			throw Exception("Video Codec Activation Fail");
-		}
-		switch_core_session_set_read_codec(session, &codec);
-
-		AVParams vpt;
-		vpt.session = session;
-		vpt.channel = channel;
-		vpt.frame = &vid_frame;
-		vpt.timer = &timer;
-		vpt.video = true;
-		vpt.pt = pt;
-		vpt.vc = &vc;
-		switch_mutex_init(&vpt.mutex, SWITCH_MUTEX_DEFAULT, switch_core_session_get_pool(session));
-		vpt.quit = &done;
-
-		switch_threadattr_t * thd_attr;
-		switch_threadattr_create(&thd_attr, switch_core_session_get_pool(session));
-		switch_threadattr_detach_set(thd_attr, 1);
-		switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-		switch_thread_t *thread;
-		switch_thread_create(&thread, thd_attr, play_video_function, (void*)&vpt, switch_core_session_get_pool(session));
-
-		AVParams apt;
-		apt.session = session;
-		apt.channel = channel;
-		apt.frame = &write_frame;
-		apt.timer = &timer;
-		apt.video = false;
-		apt.vc = &vc;
-		apt.mutex = vpt.mutex;
-		apt.quit = &done;
-		play_audio_function(NULL, &apt);
-
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Waiting for video thread to join.\n");
-		while (!vpt.done) {
-			switch_cond_next();
-		}
-
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "FILE PLAYED");
-	} catch(const std::exception & e)
-	{
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s\n", e.what());
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE,
-			(std::string("PLAYBACK_FAILED - ") + e.what()).c_str());
-	}catch(...)
-	{
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "PLAYBACK_FAILED - See FS logs for detail.");
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Exception caught.\n");
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "All done.\n");
-	if (timer.interval)  switch_core_timer_destroy(&timer);
-
-	switch_core_session_set_read_codec(session, NULL);
-
-	if (switch_core_codec_ready(&codec)) switch_core_codec_destroy(&codec);
-
-	if (switch_core_codec_ready(&vid_codec)) switch_core_codec_destroy(&vid_codec);
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_mp4_load)
-{
-	switch_application_interface_t *app_interface;
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	SWITCH_ADD_APP(app_interface, "play_mp4", "play an MP4 file", "play an MP4 file", play_mp4_function, "<file>", SAF_NONE);
-	//SWITCH_ADD_APP(app_interface, "record_mp4", "record an MP4 file", "record an MP4 file", record_mp4_function, "<file>", SAF_NONE);
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/applications/mod_mp4/mp4_helper.cpp b/src/mod/applications/mod_mp4/mp4_helper.cpp
deleted file mode 100644
index 0904cafd67..0000000000
--- a/src/mod/applications/mod_mp4/mp4_helper.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-
-The contents of this file are subject to the Mozilla Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is MP4 Helper Library to the Freeswitch MP4 Module.
-
-The Initial Developer of the Original Code is
-Paulo Rogério Panhoto <paulo@voicetechnology.com.br>.
-Portions created by the Initial Developer are Copyright (C)
-the Initial Developer. All Rights Reserved.
-
-Contributors:
-
-	Seven Du <dujinfang@gmail.com>
-*/
-
-#include <switch.h>
-#include "mp4_helper.hpp"
-
-namespace MP4
-{
-
-	Context::Context(const char * file, bool newFile)
-	{
-		if(newFile) create(file);
-		else open(file);
-	}
-
-	Context::~Context()
-	{
-		close();
-	}
-
-	void Context::open(const char * file)
-	{
-		fh = MP4Read(file);
-		if (fh == MP4_INVALID_FILE_HANDLE) throw Exception(file, "Open failed");
-		getTracks(file);
-	}
-
-	void Context::create(const char * file)
-	{
-		fh = MP4Create(file);
-		if (fh == MP4_INVALID_FILE_HANDLE) throw Exception(file, "Create file failed");
-	}
-
-	void Context::close()
-	{
-		if (!isOpen()) return;
-		MP4Close(fh);
-	}
-
-	void Context::getTracks(const char * file)
-	{
-		int i = 0;
-		bool audioTrack = false, videoTrack = false;
-
-		if (!isOpen()) throw Exception(file, "File is closed.");
-
-		for (;;)
-		{
-			TrackProperties track;
-			if((track.hint = MP4FindTrackId(fh, i++, MP4_HINT_TRACK_TYPE, 0)) == MP4_INVALID_TRACK_ID) break;
-
-			MP4GetHintTrackRtpPayload(fh, track.hint, &track.codecName, &track.payload, NULL, NULL);
-
-			track.track = MP4GetHintTrackReferenceTrackId(fh, track.hint);
-			if(track.track == MP4_INVALID_TRACK_ID) continue;
-			track.clock = MP4GetTrackTimeScale(fh, track.hint);
-
-			if (!strcmp(MP4GetTrackType(fh, track.track), MP4_AUDIO_TRACK_TYPE)) {
-				audioTrack = true;
-
-				if(!strncmp(track.codecName, "PCM", 3))
-					track.packetLength = 20;
-				else
-					track.packetLength = track.clock = 0;
-
-				audio = track;
-			} else if (!strcmp(MP4GetTrackType(fh, track.track), MP4_VIDEO_TRACK_TYPE)) {
-				videoTrack = true;
-
-				const char * sdp = MP4GetHintTrackSdp(fh, track.hint);
-				const char * fmtp = strstr(sdp, "fmtp");
-
-				if (fmtp) {
-					// finds beginning of 'fmtp' value;
-					for(fmtp += 5; *fmtp != ' '; ++fmtp);
-					++fmtp;
-
-					const char * eol = fmtp;
-					for(;*eol != '\r' && *eol != '\n'; ++eol);
-					video.fmtp = std::string(fmtp, eol);
-				}
-				video.track = track;
-			}
-		}
-
-		if (!audioTrack || !videoTrack) throw Exception(file, "Missing audio/video track.");
-	}
-
-	bool Context::getVideoPacket(void * buffer, u_int & size, u_int & ts)
-	{
-		return getPacket(video.track.hint, video.track.runtime, true, buffer, size, ts);
-	}
-
-	bool Context::getAudioPacket(void * buffer, u_int & size, u_int & ts)
-	{
-		return getPacket(audio.hint, audio.runtime, false, buffer, size, ts);
-	}
-
-	bool Context::getPacket(MP4TrackId hint, RuntimeProperties & rt,
-				bool header, void * buffer, u_int & size, u_int & ts)
-	{
-		if (rt.frame == 0 || rt.packet == rt.packetsPerFrame) {
-			++rt.frame;
-			if(!MP4ReadRtpHint(fh, hint, rt.frame, &rt.packetsPerFrame))
-				return false;
-			rt.packet = 0;
-			rt.last_frame = MP4GetSampleTime(fh, hint, rt.frame);
-		}
-
-		ts = rt.last_frame;
-		if (!MP4ReadRtpPacket(fh, hint, rt.packet, (uint8_t **) &buffer, &size, 0, header, true)) return false;
-		++rt.packet;
-		return true;
-	}
-}
diff --git a/src/mod/applications/mod_mp4/mp4_helper.hpp b/src/mod/applications/mod_mp4/mp4_helper.hpp
deleted file mode 100644
index 8f61cd6c6b..0000000000
--- a/src/mod/applications/mod_mp4/mp4_helper.hpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-
-The contents of this file are subject to the Mozilla Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is MP4 Helper Library to Freeswitch MP4 module.
-
-The Initial Developer of the Original Code is 
-Paulo Rogério Panhoto <paulo@voicetechnology.com.br>.
-Portions created by the Initial Developer are Copyright (C)
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-
-	Seven Du <dujinfang@gmail.com>
-
-*/
-
-#ifndef MP4_HELPER_HPP_
-#define MP4_HELPER_HPP_
-
-#include <mp4v2/mp4v2.h>
-#include <string>
-#include <exception>
-#include <string>
-
-typedef unsigned int u_int;
-
-namespace MP4
-{
-	class Exception: public std::exception {
-		public:
-			Exception(const std::string & file, const std::string & error)
-			: description_(file + ':' + error)
-			{
-			}
-			
-			const char * what() const throw()
-			{
-				return description_.c_str();
-			}
-			
-			~Exception() throw()
-			{
-			}
-			
-		private:
-			std::string description_;
-	};
-	
-	struct RuntimeProperties {
-		uint32_t frame; // sampleID
-		uint16_t packetsPerFrame;
-		uint16_t packet; // packetID
-		uint32_t last_frame; // timestamp
-
-		RuntimeProperties(): frame(0), packetsPerFrame(0), packet(0)
-		{
-		}
-	};
-
-
-	struct TrackProperties {
-		MP4TrackId hint;
-		MP4TrackId track;
-
-		char * codecName;
-		uint8_t payload;
-		uint32_t clock;
-		uint32_t packetLength; // packet Length in time (ms)
-		
-		RuntimeProperties runtime;
-
-		TrackProperties(): hint(MP4_INVALID_TRACK_ID), track(MP4_INVALID_TRACK_ID), 
-			codecName(NULL), payload(0), clock(0), packetLength(0)
-		{
-		}
-	};
-
-	typedef TrackProperties AudioProperties;
-
-	struct VideoProperties {
-		TrackProperties track;
-		std::string fmtp;
-
-		VideoProperties()
-		{
-		}
-
-		VideoProperties(const TrackProperties & rhs): track(rhs)
-		{
-		}
-	};
-
-	class Context {
-	public:
-
-		Context(const char * file, bool create = false);
-		~Context();
-
-		void open(const char * file);
-		
-		void create(const char * file);
-
-		void close();
-
-		// returns: TRUE = has more data, FALSE = end-of-stream or failure
-		bool getVideoPacket(void * buffer, u_int & size, u_int & ts);
-
-		// returns: TRUE = has more data, FALSE = end-of-stream or failure
-		bool getAudioPacket(void * buffer, u_int & size, u_int & ts);
-
-		bool isOpen() const { return fh != MP4_INVALID_FILE_HANDLE; }
-
-		bool isSupported() const { return audio.track != MP4_INVALID_TRACK_ID && video.track.track != MP4_INVALID_TRACK_ID; }
-
-		const AudioProperties & audioTrack() const { return audio; }
-
-		const VideoProperties & videoTrack() const { return video; }
-
-	private:
-		MP4FileHandle fh;
-		AudioProperties audio;
-
-		VideoProperties video;
-
-		// Prevent copy construction.
-		Context(const Context &);
-
-		bool getPacket(MP4TrackId hint, RuntimeProperties & rt,
-				bool header, void * buffer, u_int & size, u_int & ts);
-
-		void getTracks(const char * file);
-	};
-}
-#endif
diff --git a/src/mod/applications/mod_mp4v2/Makefile.am b/src/mod/applications/mod_mp4v2/Makefile.am
deleted file mode 100644
index f8b8bec05a..0000000000
--- a/src/mod/applications/mod_mp4v2/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_mp4v2
-
-mod_LTLIBRARIES = mod_mp4v2.la
-mod_mp4v2_la_SOURCES  = mod_mp4v2.c
-mod_mp4v2_la_CFLAGS   = $(AM_CFLAGS)
-mod_mp4v2_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_mp4v2_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lmp4v2
diff --git a/src/mod/applications/mod_mp4v2/mod_mp4v2.c b/src/mod/applications/mod_mp4v2/mod_mp4v2.c
deleted file mode 100644
index 8faccc4e02..0000000000
--- a/src/mod/applications/mod_mp4v2/mod_mp4v2.c
+++ /dev/null
@@ -1,772 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2015, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Seven Du <dujinfang@gmail.com>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- *
- * mod_mp4v2 -- MP4 File Format for FreeSWITCH
- *
- *
- * status: For write, codec is hard coded to PCMU for audio and H264 for video
- *         tested with lib mp4v2-2.0.0
- *         Read from mp4 is not supported yet.
- */
-
-#include <switch.h>
-
-#include <mp4v2/mp4v2.h>
-
-#define TIMESCALE 1000
-#define SampleLenFieldSize 4
-#define PTIME 20
-// #define HAS_SPS_PARSER
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_mp4v2_load);
-SWITCH_MODULE_DEFINITION(mod_mp4v2, mod_mp4v2_load, NULL, NULL);
-
-struct record_helper {
-	switch_core_session_t *session;
-	switch_mutex_t *mutex;
-	MP4FileHandle fd;
-	MP4TrackId video_track;
-	MP4TrackId audio_track;
-	switch_timer_t timer;
-	int up;
-	uint64_t last_pts;
-};
-
-#ifdef HAS_SPS_PARSER
-#include "bs.h"
-static void parse_sps_video_size(uint8_t *sps_buffer, int len, int *width, int *height)
-{
-	sps_t sps = { 0 };
-	bs_t b = { 0 };
-
-	bs_init(&b, sps_buffer, len);
-	read_sps(&sps, &b);
-
-	*width = ((sps.pic_width_in_mbs_minus1 +1)*16) - sps.frame_crop_left_offset*2 - sps.frame_crop_right_offset*2;
-	*height= ((2 - sps.frame_mbs_only_flag)* (sps.pic_height_in_map_units_minus1 +1) * 16) - (sps.frame_crop_top_offset * 2) - (sps.frame_crop_bottom_offset * 2);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "H264 Profile: %d size: %dx%d\n", sps.profile_idc, *width, *height);
-}
-#else
-// use hardcoded value
-static void parse_sps_video_size(uint8_t *sps_buffer, int len, int *width, int *height)
-{
-	*width = 1280;
-	*height = 720;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "We have no idea about the video size without decoding the video or actually parse the SPS, using hardcoded %dx%d\n", *width, *height);
-}
-#endif
-
-static void init_video_track(MP4FileHandle mp4, MP4TrackId *video, switch_frame_t *frame)
-{
-	int width = 0;
-	int height = 0;
-	uint8_t *sps_buffer = frame->data;
-	uint32_t sps_bytes = frame->datalen;
-
-	sps_buffer++;
-
-	if (frame->img) {
-		width = frame->img->d_w;
-		height = frame->img->d_h;
-	} else {
-		parse_sps_video_size(sps_buffer, sps_bytes, &width, &height);
-	}
-
-	MP4SetTimeScale(mp4, TIMESCALE);
-
-	*video = MP4AddH264VideoTrack(mp4, TIMESCALE, MP4_INVALID_DURATION, width, height, *(sps_buffer), *(sps_buffer+1), *(sps_buffer+2), SampleLenFieldSize - 1);
-
-	if (*video == MP4_INVALID_TRACK_ID) {
-		return;
-	}
-
-	MP4AddH264SequenceParameterSet(mp4, *video, --sps_buffer, sps_bytes);
-
-	/*
-	MP4SetVideoProfileLevel sets the minumum profile/level of MPEG-4 video support necessary to render the contents of the file.
-
-	ISO/IEC 14496-1:2001 MPEG-4 Systems defines the following values:
-	0x00 Reserved
-	0x01 Simple Profile @ Level 3
-	0x02 Simple Profile @ Level 2
-	0x03 Simple Profile @ Level 1
-	0x04 Simple Scalable Profile @ Level 2
-	0x05 Simple Scalable Profile @ Level 1
-	0x06 Core Profile @ Level 2
-	0x07 Core Profile @ Level 1
-	0x08 Main Profile @ Level 4
-	0x09 Main Profile @ Level 3
-	0x0A Main Profile @ Level 2
-	0x0B N-Bit Profile @ Level 2
-	0x0C Hybrid Profile @ Level 2
-	0x0D Hybrid Profile @ Level 1
-	0x0E Basic Animated Texture @ Level 2
-	0x0F Basic Animated Texture @ Level 1
-	0x10 Scalable Texture @ Level 3
-	0x11 Scalable Texture @ Level 2
-	0x12 Scalable Texture @ Level 1
-	0x13 Simple Face Animation @ Level 2
-	0x14 Simple Face Animation @ Level 1
-	0x15-0x7F Reserved
-	0x80-0xFD User private
-	0xFE No audio profile specified
-	0xFF No audio required
-	*/
-	MP4SetVideoProfileLevel(mp4, 0x7F);
-}
-
-static inline char *get_audio_codec_name(uint8_t audio_type)
-{
-	switch (audio_type) {
-		case MP4_MP3_AUDIO_TYPE:
-			return "MP3";
-		case MP4_ULAW_AUDIO_TYPE:
-			return "PCMU";
-		case MP4_PCM16_LITTLE_ENDIAN_AUDIO_TYPE:
-			return "L16";
-		case MP4_MPEG4_AUDIO_TYPE:
-			return "AAC";
-		default:
-			return "ERROR";
-	}
-}
-
-static int get_aac_sample_rate_index(unsigned int sampleRate)
-{
-    if (92017 <= sampleRate) return 0;
-    if (75132 <= sampleRate) return 1;
-    if (55426 <= sampleRate) return 2;
-    if (46009 <= sampleRate) return 3;
-    if (37566 <= sampleRate) return 4;
-    if (27713 <= sampleRate) return 5;
-    if (23004 <= sampleRate) return 6;
-    if (18783 <= sampleRate) return 7;
-    if (13856 <= sampleRate) return 8;
-    if (11502 <= sampleRate) return 9;
-    if (9391 <= sampleRate) return 10;
-
-    return 11;
-}
-
-struct mp4_file_context {
-	switch_file_handle_t *handle;
-	switch_memory_pool_t *pool;
-	MP4FileHandle fd;
-	MP4TrackId audio;
-	MP4TrackId video;
-	uint32_t audio_frame_size;
-	switch_codec_t audio_codec;
-	switch_codec_t video_codec;
-	switch_mutex_t *mutex;
-	switch_buffer_t *buf;
-	uint32_t last_chunk_size;
-	int sps_set;
-	int pps_set;
-	switch_timer_t timer;
-	uint64_t last_pts;
-	int offset;
-	int audio_start;
-	uint8_t audio_type; // MP4 Audio Type
-	MP4Duration audio_duration;
-	switch_thread_t *video_thread;
-	switch_queue_t *video_queue;
-};
-
-typedef struct mp4_file_context mp4_file_context_t;
-
-static switch_status_t do_write_video(switch_file_handle_t *handle, switch_frame_t *frame);
-
-static void *SWITCH_THREAD_FUNC video_write_thread_run(switch_thread_t *thread, void *obj)
-{
-	mp4_file_context_t *context = (mp4_file_context_t *)obj;
-	void *pop = NULL;
-	switch_image_t *last_img = NULL;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_status_t encode_status = SWITCH_STATUS_SUCCESS;
-	uint8_t data[SWITCH_DEFAULT_VIDEO_SIZE];
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "video_write_thread start\n");
-
-	while (switch_queue_pop(context->video_queue, &pop) == SWITCH_STATUS_SUCCESS) {
-		switch_frame_t frame = { 0 };
-
-		if (!pop) break;
-
-		if (!last_img) { // first img
-			last_img = (switch_image_t *)pop;
-			continue;
-		}
-
-		frame.data = data;
-		frame.img = last_img;
-		// switch_set_flag(&frame, SFF_DYNAMIC);
-
-		do {
-			frame.datalen = SWITCH_DEFAULT_VIDEO_SIZE;
-			encode_status = switch_core_codec_encode_video(&context->video_codec, &frame);
-
-			if (encode_status == SWITCH_STATUS_SUCCESS || encode_status == SWITCH_STATUS_MORE_DATA) {
-				switch_assert((encode_status == SWITCH_STATUS_SUCCESS && frame.m) || !frame.m);
-
-				if (frame.datalen == 0) break;
-
-				status = do_write_video(context->handle, &frame);
-			}
-		} while(status == SWITCH_STATUS_SUCCESS && encode_status == SWITCH_STATUS_MORE_DATA);
-
-		switch_img_free(&last_img);
-		last_img = (switch_image_t *)pop;
-	}
-
-	switch_img_free(&last_img);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "video_write_thread done\n");
-
-	return NULL;
-}
-
-static void launch_video_write_thread(mp4_file_context_t *context, switch_memory_pool_t *pool)
-{
-	//switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-
-	switch_threadattr_create(&thd_attr, pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	// switch_threadattr_priority_set(thd_attr, SWITCH_PRI_REALTIME);
-	switch_thread_create(&context->video_thread, thd_attr, video_write_thread_run, context, pool);
-}
-
-
-static int flush_video_queue(switch_queue_t *q, int min)
-{
-	void *pop;
-
-	if (switch_queue_size(q) > min) {
-		while (switch_queue_trypop(q, &pop) == SWITCH_STATUS_SUCCESS) {
-			switch_image_t *img = (switch_image_t *) pop;
-			switch_img_free(&img);
-			if (min && switch_queue_size(q) <= min) {
-				break;
-			}
-		}
-	}
-
-	return switch_queue_size(q);
-}
-
-static switch_status_t mp4_file_open(switch_file_handle_t *handle, const char *path)
-{
-	mp4_file_context_t *context;
-	char *ext;
-	unsigned int flags = 0;
-	const char *tmp = NULL;
-
-	if ((ext = strrchr(path, '.')) == 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Format\n");
-		return SWITCH_STATUS_GENERR;
-	}
-	ext++;
-
-	if ((context = switch_core_alloc(handle->memory_pool, sizeof(mp4_file_context_t))) == 0) {
-		return SWITCH_STATUS_MEMERR;
-	}
-
-	memset(context, 0, sizeof(mp4_file_context_t));
-
-	context->handle = handle;
-	context->offset = 0;
-
-	if (handle->params && (tmp = switch_event_get_header(handle->params, "mp4v2_video_offset"))) {
-		context->offset = atoi(tmp);
-	}
-
-	context->audio_type = MP4_ULAW_AUDIO_TYPE; // default
-
-	if (handle->params && (tmp = switch_event_get_header(handle->params, "mp4v2_audio_codec"))) {
-		if (!strcasecmp(tmp, "PCMU")) {
-			context->audio_type = MP4_ULAW_AUDIO_TYPE;
-		} else if (!strcasecmp(tmp, "MP3")) {
-			context->audio_type = MP4_MP3_AUDIO_TYPE;
-		} else if (!strcasecmp(tmp, "AAC")) {
-			context->audio_type = MP4_MPEG4_AUDIO_TYPE;
-		} else if (!strcasecmp(tmp, "L16")) {
-			context->audio_type = MP4_PCM16_LITTLE_ENDIAN_AUDIO_TYPE;
-		}
-	}
-
-	switch_mutex_init(&context->mutex, SWITCH_MUTEX_NESTED, handle->memory_pool);
-
-	if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
-		flags |= SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE;
-		if (switch_test_flag(handle, SWITCH_FILE_WRITE_APPEND) || switch_test_flag(handle, SWITCH_FILE_WRITE_OVER)) {
-			flags |= SWITCH_FOPEN_READ;
-		} else {
-			flags |= SWITCH_FOPEN_TRUNCATE;
-		}
-	}
-
-	if (switch_test_flag(handle, SWITCH_FILE_FLAG_READ)) {
-		flags |= SWITCH_FOPEN_READ;
-	}
-
-	if (handle->mm.samplerate) {
-		handle->samplerate = handle->mm.samplerate;
-	} else {
-		handle->mm.samplerate = handle->samplerate;
-	}
-
-	if (!handle->mm.ab) {
-		handle->mm.ab = 128;
-	}
-
-	if (!handle->mm.vb) {
-		handle->mm.vb = switch_calc_bitrate(handle->mm.vw, handle->mm.vh, 1, handle->mm.fps);
-	}
-
-	// MP4_CREATE_64BIT_DATA if file > 4G
-
-	if ((context->fd = MP4CreateEx(path, 0, 1, 1, NULL, 0, NULL, 0)) == MP4_INVALID_FILE_HANDLE) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error opening file %s\n", path);
-		return SWITCH_STATUS_GENERR;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "sample rate: %d, channels: %d\n", handle->samplerate, handle->channels);
-
-	if (context->audio_type == MP4_ULAW_AUDIO_TYPE) {
-		context->audio = MP4AddULawAudioTrack(context->fd, handle->samplerate);
-		MP4SetTrackIntegerProperty(context->fd, context->audio, "mdia.minf.stbl.stsd.ulaw.channels", handle->channels);
-		MP4SetTrackIntegerProperty(context->fd, context->audio, "mdia.minf.stbl.stsd.ulaw.sampleSize", 8);
-	} else if (context->audio_type == MP4_MP3_AUDIO_TYPE) {
-		// handle->samplerate = 44100;
-		context->audio = MP4AddAudioTrack(context->fd, handle->samplerate, handle->samplerate, MP4_MP3_AUDIO_TYPE);
-		MP4SetTrackName(context->fd, context->audio, ".mp3");
-		MP4SetTrackIntegerProperty(context->fd, context->audio, "mdia.minf.stbl.stsd.mp4a.channels", handle->channels);
-		// MP4SetTrackIntegerProperty(context->fd, context->audio, "mdia.minf.stbl.stsd..mp3.channels", handle->channels);
-	} else if (context->audio_type == MP4_PCM16_LITTLE_ENDIAN_AUDIO_TYPE) {
-		context->audio = MP4AddAudioTrack(context->fd, handle->samplerate, handle->samplerate, MP4_PCM16_LITTLE_ENDIAN_AUDIO_TYPE);
-		MP4SetTrackName(context->fd, context->audio, "lpcm");
-		MP4SetTrackIntegerProperty(context->fd, context->audio, "mdia.minf.stbl.stsd.mp4a.channels", handle->channels);
-		MP4SetTrackIntegerProperty(context->fd, context->audio, "mdia.minf.stbl.stsd.lpcm.channels", handle->channels);
-		MP4SetTrackIntegerProperty(context->fd, context->audio, "mdia.minf.stbl.stsd.lpcm.sampleSize", 16);
-	} else if (context->audio_type == MP4_MPEG4_AUDIO_TYPE) {
-		/* AAC object types */
-		#define AAC_MAIN 1
-		#define AAC_LOW  2
-		#define AAC_SSR  3
-		#define AAC_LTP  4
-
-		uint16_t info = 0;
-
-		info |= AAC_LOW << 11; // aacObjectType (5bit)
-		info |= get_aac_sample_rate_index(handle->samplerate) << 7; //(4bit)
-		info |= handle->channels << 3; //(4bit)
-		info = htons(info);
-
-		context->audio = MP4AddAudioTrack(context->fd, handle->samplerate, 1024, MP4_MPEG4_AUDIO_TYPE);
-		MP4SetTrackESConfiguration(context->fd, context->audio, (uint8_t *)&info, sizeof(info));
-		MP4SetTrackIntegerProperty(context->fd, context->audio, "mdia.minf.stbl.stsd.mp4a.channels", handle->channels);
-	}
-
-	handle->format = 0;
-	handle->sections = 0;
-	handle->seekable = 0;
-	handle->speed = 0;
-	handle->pos = 0;
-	handle->private_info = context;
-	context->pool = handle->memory_pool;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening File [%s] %dhz %s\n",
-		path, handle->samplerate, switch_test_flag(handle, SWITCH_FILE_FLAG_VIDEO) ? " with VIDEO" : "");
-
-	if (switch_core_codec_init(&context->audio_codec,
-							   get_audio_codec_name(context->audio_type),
-							   NULL,
-							   NULL,
-							   handle->samplerate,
-							   PTIME,//ms
-							   handle->channels, SWITCH_CODEC_FLAG_ENCODE,
-							   NULL, handle->memory_pool) == SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n");
-		goto end;
-	}
-
-	if (context->audio_type == MP4_MP3_AUDIO_TYPE) { // fetch frame size
-		uint32_t size;
-		uint32_t flag = 0xFFFFFFFF;
-
-		switch_core_codec_encode(&context->audio_codec, NULL, &flag, 0, 0,
-			(void *)&context->audio_frame_size, &size, NULL, &flag);
-	} else if (context->audio_type == MP4_MPEG4_AUDIO_TYPE) {
-		context->audio_frame_size = 1024;
-	}
-
-	if (switch_test_flag(handle, SWITCH_FILE_FLAG_VIDEO)) {
-		switch_codec_settings_t codec_settings = {{ 0 }};
-		codec_settings.video.bandwidth = handle->mm.vb;
-		codec_settings.video.fps = handle->mm.fps;
-
-		if (switch_core_codec_init(&context->video_codec,
-								   "H264",
-								   NULL,
-								   NULL,
-								   90000,
-								   0,//ms
-								   1, SWITCH_CODEC_FLAG_ENCODE,
-								   &codec_settings, handle->memory_pool) == SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video Codec H264 Activation Success\n");
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Video Codec H264 Activation Fail\n");
-			goto end;
-		}
-
-		switch_queue_create(&context->video_queue, 60, handle->memory_pool);
-		launch_video_write_thread(context, handle->memory_pool);
-	}
-
-	if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
-		MP4SetAudioProfileLevel(context->fd, 0x7F);
-	}
-
-	switch_buffer_create_dynamic(&context->buf, 512, 512, 1024000);
-
-	return SWITCH_STATUS_SUCCESS;
-
-end:
-	if (context->fd) {
-		MP4Close(context->fd, 0);
-		context->fd = NULL;
-	}
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t mp4_file_truncate(switch_file_handle_t *handle, int64_t offset)
-{
-	mp4_file_context_t *context = handle->private_info;
-	switch_status_t status;
-
-	if ((status = switch_file_trunc(context->fd, offset)) == SWITCH_STATUS_SUCCESS) {
-		handle->pos = 0;
-	}
-
-	return status;
-
-}
-
-static switch_status_t mp4_file_close(switch_file_handle_t *handle)
-{
-	mp4_file_context_t *context = handle->private_info;
-	switch_status_t status;
-
-	if (context->fd) {
-		MP4Close(context->fd, MP4_CLOSE_DO_NOT_COMPUTE_BITRATE);
-		context->fd = NULL;
-	}
-
-	if (switch_core_codec_ready(&context->audio_codec)) switch_core_codec_destroy(&context->audio_codec);
-	if (switch_core_codec_ready(&context->video_codec)) switch_core_codec_destroy(&context->video_codec);
-
-	if (context->timer.interval) {
-		switch_core_timer_destroy(&context->timer);
-	}
-
-	if (context->video_queue) {
-		switch_queue_term(context->video_queue);
-		flush_video_queue(context->video_queue, 0);
-	}
-
-	if (context->video_thread) {
-		switch_thread_join(&status, context->video_thread);
-	}
-
-	switch_buffer_destroy(&context->buf);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t mp4_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "seek not implemented\n");
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t mp4_file_read(switch_file_handle_t *handle, void *data, size_t *len)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "read not implemented\n");
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t mp4_file_write(switch_file_handle_t *handle, void *data, size_t *len)
-{
-	uint32_t datalen = *len * 2 * handle->channels;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	uint8_t buf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	uint32_t encoded_rate;
-	mp4_file_context_t *context = handle->private_info;
-	uint32_t size = 0;
-	uint32_t flag = 0;
-
-	if (context->audio_type == MP4_PCM16_LITTLE_ENDIAN_AUDIO_TYPE) {
-		size = datalen;
-		memcpy(buf, data, datalen);
-	} else {
-		switch_core_codec_encode(&context->audio_codec, NULL,
-								data, datalen,
-								handle->samplerate,
-								buf, &size, &encoded_rate, &flag);
-	}
-
-	switch_mutex_lock(context->mutex);
-
-	if (!context->timer.interval) {
-		switch_core_timer_init(&context->timer, "soft", 1, 1, context->pool);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "init timer\n");
-	}
-
-	if (size > 0) {
-		MP4WriteSample(context->fd, context->audio, buf, size, context->audio_frame_size ? context->audio_frame_size : *len, 0, 1);
-	}
-
-	context->audio_duration += *len;
-
-	switch_mutex_unlock(context->mutex);
-
-	return status;
-}
-
-static switch_status_t mp4_file_read_video(switch_file_handle_t *handle, switch_frame_t *frame, switch_video_read_flag_t flags)
-{
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t do_write_video(switch_file_handle_t *handle, switch_frame_t *frame)
-{
-	uint32_t datalen = frame->datalen;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	int is_iframe = 0;
-	uint32_t size;
-	uint8_t *hdr = NULL;
-	uint8_t fragment_type;
-	uint8_t nal_type;
-	uint8_t start_bit;
-	uint8_t end_bit;
-	mp4_file_context_t *context = handle->private_info;
-
-	hdr = (uint8_t *)frame->data;
-	fragment_type = hdr[0] & 0x1f;
-	nal_type = hdr[1] & 0x1f;
-	start_bit = hdr[1] & 0x80;
-	end_bit = hdr[1] & 0x40;
-
-	is_iframe = fragment_type == 5 || (fragment_type == 28 && nal_type == 5);
-
-	// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%02x %02x %02x | len:%d m:%d st:%d i:%d\n", hdr[0], hdr[1], hdr[2], datalen, frame->m, start_bit, is_iframe);
-
-	if (fragment_type == 7 && !context->sps_set) { //sps
-		context->sps_set = 1;
-
-		init_video_track(context->fd, &context->video, frame);
-		if (context->video == MP4_INVALID_TRACK_ID) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error add video track!\n");
-			return SWITCH_STATUS_FALSE;
-		}
-	} else if (fragment_type == 8 && context->sps_set && !context->pps_set) { //pps
-		MP4AddH264PictureParameterSet(context->fd, context->video, hdr, datalen);
-		context->pps_set = 1;
-	}
-
-	if (fragment_type == 28) {
-		if (start_bit && end_bit) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "WTF?\n");
-		}
-
-		if (start_bit) {
-			nal_type |= (hdr[0] & 0x60);
-
-			size = htonl(datalen);
-			switch_buffer_write(context->buf, &size, 4);
-			switch_buffer_write(context->buf, &nal_type, 1);
-			switch_buffer_write(context->buf, hdr + 2, datalen - 2);
-			context->last_chunk_size = datalen - 1;
-		} else if (end_bit) {
-			uint32_t used;
-			const void *data;
-			uint32_t *chunk_size = NULL;
-
-			switch_buffer_write(context->buf, hdr + 2, datalen - 2);
-			context->last_chunk_size += datalen - 2;
-			used = switch_buffer_inuse(context->buf);
-			switch_buffer_peek_zerocopy(context->buf, &data);
-			chunk_size = (uint32_t *)((uint8_t *)data + used - context->last_chunk_size - 4);
-			*chunk_size = htonl(context->last_chunk_size);
-		} else {
-			switch_buffer_write(context->buf, hdr + 2, datalen - 2);
-			context->last_chunk_size += datalen - 2;
-		}
-	} else {
-		size = htonl(datalen);
-		switch_buffer_write(context->buf, &size, 4);
-		switch_buffer_write(context->buf, hdr, datalen);
-	}
-
-	if (!frame->m) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	switch_mutex_lock(context->mutex);
-
-	if (context->sps_set && context->pps_set) {
-		uint32_t used = switch_buffer_inuse(context->buf);
-		const void *data;
-		int duration = 0;
-		int ts = 0;
-
-		if (frame->img && frame->img->user_priv) {
-			ts = *(int *)frame->img->user_priv;
-		} else {
-			switch_core_timer_sync(&context->timer);
-			ts = context->timer.samplecount;
-		}
-
-		duration = ts - context->last_pts;
-
-		if (duration <= 0) duration = 1;
-
-		// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "samplecount: %u, duration: %u\n", context->timer.samplecount, duration);
-		switch_buffer_peek_zerocopy(context->buf, &data);
-
-		context->last_pts = ts;
-
-		MP4WriteSample(context->fd, context->video, data, used, duration, 0, is_iframe);
-		switch_buffer_zero(context->buf);
-	}
-
-	switch_mutex_unlock(context->mutex);
-
-	{
-		int delta = context->timer.samplecount * (handle->samplerate / 1000) - context->audio_duration;
-
-		if (delta > (int)handle->samplerate) {
-			uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
-			size_t samples = handle->samplerate / 1000 * PTIME;
-
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "missed audio %d samples at %d\n", delta, (int)context->audio_duration / (handle->samplerate / 1000));
-
-			while ((delta -= samples) > 0) {
-				mp4_file_write(handle, data, &samples);
-				samples = handle->samplerate / 1000 * PTIME;
-			}
-		}
-	}
-
-	return status;
-}
-
-static switch_status_t mp4_file_write_video(switch_file_handle_t *handle, switch_frame_t *frame)
-{
-	mp4_file_context_t *context = handle->private_info;
-
-	if (!frame->img) {
-		return do_write_video(handle, frame);
-	} else {
-		switch_image_t *img = NULL;
-
-		if (!context->timer.interval) {
-			switch_mutex_lock(context->mutex);
-			switch_core_timer_init(&context->timer, "soft", 1, 1, context->pool);
-			switch_mutex_unlock(context->mutex);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "init timer\n");
-		} else {
-			switch_mutex_lock(context->mutex);
-			switch_core_timer_sync(&context->timer);
-			switch_mutex_unlock(context->mutex);
-		}
-
-		switch_img_copy(frame->img, &img);
-		switch_assert(img);
-		img->user_priv = malloc(sizeof(int));
-		*(int *)img->user_priv = context->timer.samplecount;
-
-		if (switch_queue_trypush(context->video_queue, img) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "video queue full, discard one frame\n");
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t mp4_file_set_string(switch_file_handle_t *handle, switch_audio_col_t col, const char *string)
-{
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t mp4_file_get_string(switch_file_handle_t *handle, switch_audio_col_t col, const char **string)
-{
-	return SWITCH_STATUS_FALSE;
-}
-
-static char *supported_formats[3] = { 0 };
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_mp4v2_load)
-{
-	switch_file_interface_t *file_interface;
-
-	supported_formats[0] = "mp4v2";
-	supported_formats[1] = "mp4";
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
-	file_interface->interface_name = modname;
-	file_interface->extens = supported_formats;
-	file_interface->file_open = mp4_file_open;
-	file_interface->file_close = mp4_file_close;
-	file_interface->file_truncate = mp4_file_truncate;
-	file_interface->file_read = mp4_file_read;
-	file_interface->file_write = mp4_file_write;
-	file_interface->file_read_video = mp4_file_read_video;
-	file_interface->file_write_video = mp4_file_write_video;
-	file_interface->file_seek = mp4_file_seek;
-	file_interface->file_set_string = mp4_file_set_string;
-	file_interface->file_get_string = mp4_file_get_string;
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/applications/mod_rad_auth/Makefile.am b/src/mod/applications/mod_rad_auth/Makefile.am
deleted file mode 100644
index 05f7155a80..0000000000
--- a/src/mod/applications/mod_rad_auth/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_rad_auth
-
-RADCLIENT_VERSION=1.1.7
-RADCLIENT=freeradius-client-$(RADCLIENT_VERSION)
-RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT)
-RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT)
-RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib
-RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la
-
-mod_LTLIBRARIES = mod_rad_auth.la
-mod_rad_auth_la_SOURCES  = mod_rad_auth.c
-mod_rad_auth_la_CFLAGS   = $(AM_CFLAGS) -I$(RADCLIENT_DIR)/include
-mod_rad_auth_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(RADCLIENT_LA)
-mod_rad_auth_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
-
-BUILT_SOURCES=$(RADCLIENT_LA)
-
-$(RADCLIENT_DIR):
-	$(GETLIB) $(RADCLIENT).tar.gz
-
-$(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
-	mkdir -p $(RADCLIENT_BUILDDIR)
-	cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
-	$(TOUCH_TARGET)
-
-$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
-	cd $(RADCLIENT_BUILDDIR) && CFLAGS="$(CFLAGS)" $(MAKE)
-	$(TOUCH_TARGET)
diff --git a/src/mod/applications/mod_rad_auth/mod_rad_auth.c b/src/mod/applications/mod_rad_auth/mod_rad_auth.c
deleted file mode 100644
index a4d43d545d..0000000000
--- a/src/mod/applications/mod_rad_auth/mod_rad_auth.c
+++ /dev/null
@@ -1,936 +0,0 @@
-/*
-* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-* Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-*
-* Version: MPL 1.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-*
-* The Initial Developer of the Original Code is
-* Anthony Minessale II <anthm@freeswitch.org>
-* Portions created by the Initial Developer are Copyright (C)
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*
-* Anthony Minessale II <anthm@freeswitch.org>
-* Neal Horman <neal at wanlink dot com>
-* Tihomir Culjaga <tculjaga@gmail.com>
-*
-* mod_rad_auth.c -- module for radius authorization/authentication
-*
-*/
-#include <switch.h>
-#include <freeradius-client.h>
-
-#define RC_CONFIG_FILE "/usr/local/etc/radiusclient/radiusclient.conf"
-#define EMBENDED_CONFIG 1
-
-#define STR_LENGTH 512
-char* rc_config_file = NULL;
-
-struct config_vsas
-{
-	char* name;
-	int id;
-	char* value;
-	int pec;
-	int expr;
-	int direction;
-
-	struct config_vsas *pNext;
-};
-
-struct config_client
-{
-	char* name;
-	char* value;
-
-	struct config_client *pNext;
-};
-
-typedef struct config_vsas CONFIG_VSAS;
-typedef struct config_client CONFIG_CLIENT;
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_rad_authshutdown);
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_rad_authruntime);
-SWITCH_MODULE_LOAD_FUNCTION(mod_rad_authload);
-SWITCH_MODULE_DEFINITION(mod_rad_auth, mod_rad_authload, mod_rad_authshutdown, NULL /*mod_rad_authruntime*/);
-
-CONFIG_VSAS* CONFIGVSAS;
-CONFIG_CLIENT* CONFIGCLIENT;
-
-void free_radius_auth_value_pair(VALUE_PAIR *send, VALUE_PAIR *received, rc_handle *rh)
-{
-	if (send)
-		rc_avpair_free(send);
-
-	if (received)
-		rc_avpair_free(received);
-
-	if (rh)
-		rc_destroy(rh);
-	rh = NULL;
-}
-
-char* extract_in_variable(char* invar)
-{
-	char *var = NULL;
-	if (strlen(invar) < 4)
-		return NULL;
-
-	while (invar[0] == ' ')
-		invar++;
-
-	if (invar[0] != 'i' && invar[0] != 'I' && invar[1] != 'n' && invar[1]
-			!= 'N' && invar[2] != ' ' && invar[2] != ' ')
-	{
-		return NULL;
-	}
-
-	var = strchr(invar, ' ');
-
-	while (var[0] == ' ')
-		var++;
-
-	return var;
-}
-
-char* extract_out_variable(char* outvar)
-{
-	char *var = NULL;
-	if (strlen(outvar) < 5)
-		return NULL;
-
-	while (outvar[0] == ' ')
-		outvar++;
-
-	if (outvar[0] != 'o' && outvar[0] != 'O' && outvar[1] != 'u' && outvar[1]
-			!= 'U' && outvar[2] != 't' && outvar[2] != 'T' && outvar[3] != ' '
-			&& outvar[3] != ' ')
-	{
-		return NULL;
-	}
-
-	var = strchr(outvar, ' ');
-
-	while (var[0] == ' ')
-	{
-		var++;
-	}
-
-	return var;
-}
-
-
-CONFIG_VSAS* GetVSAS(char* key)
-{
-	CONFIG_VSAS* PCONFIGVSAS = CONFIGVSAS;
-
-	while(PCONFIGVSAS)
-	{
-		if (strcmp(key, PCONFIGVSAS->name) == 0)
-		{
-			return PCONFIGVSAS;
-		}
-
-		PCONFIGVSAS = PCONFIGVSAS->pNext;
-	}
-
-	return NULL;
-}
-
-char* GetValue(switch_channel_t *channel, CONFIG_VSAS* VSAS, char* value)
-{
-	if (VSAS == NULL)
-	{
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Internal Error : VSAS is null object.\n");
-		return "";
-	}
-
-	if (VSAS->value == NULL)
-	{
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Internal Error : VSAS->value is null object.\n");
-		return "";
-	}
-
-	if (VSAS->expr == 1)
-	{
-		const char* v = switch_channel_get_variable(channel, VSAS->value);
-
-		if (v != NULL)
-		{
-			strcpy(value, v);
-			return value;
-		}
-		else
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Undefined channel variable: %s.\n", VSAS->value);
-			strcpy(value, "");
-			return value;
-		}
-	}
-	else
-	{
-		strcpy(value, VSAS->value);
-		return value;
-	}
-}
-
-int radius_auth_test(switch_channel_t *channel, char* username1, char* passwd1, char* auth_result, char* biling_model, char* credit_amount, char* currency, char* preffered_lang)
-{
-	int             result;
-	char		username[128];
-	char            passwd[AUTH_PASS_LEN + 1];
-	VALUE_PAIR 	*send, *received;
-	uint32_t		service;
-	char 		msg[4096], username_realm[256];
-	char		*default_realm;
-	rc_handle	*rh;
-
-	strcpy(username, "123");
-	strcpy(passwd, "123");
-
-	if ((rh = rc_read_config(RC_CONFIG_FILE)) == NULL)
-		return ERROR_RC;
-
-	if (rc_read_dictionary(rh, rc_conf_str(rh, "dictionary")) != 0)
-		return ERROR_RC;
-
-	default_realm = rc_conf_str(rh, "default_realm");
-
-
-	send = NULL;
-
-	/*
-	 * Fill in User-Name
-	 */
-
-	strncpy(username_realm, username, sizeof(username_realm));
-
-	/* Append default realm */
-	if ((strchr(username_realm, '@') == NULL) && default_realm &&
-	    (*default_realm != '\0'))
-	{
-		strncat(username_realm, "@", sizeof(username_realm)-strlen(username_realm)-1);
-		strncat(username_realm, default_realm, sizeof(username_realm)-strlen(username_realm)-1);
-	}
-
-	if (rc_avpair_add(rh, &send, PW_USER_NAME, username_realm, -1, 0) == NULL)
-		return ERROR_RC;
-
-	/*
-	 * Fill in User-Password
-	 */
-
-	if (rc_avpair_add(rh, &send, PW_USER_PASSWORD, passwd, -1, 0) == NULL)
-		return ERROR_RC;
-
-	/*
-	 * Fill in Service-Type
-	 */
-
-	service = PW_AUTHENTICATE_ONLY;
-	if (rc_avpair_add(rh, &send, PW_SERVICE_TYPE, &service, -1, 0) == NULL)
-		return ERROR_RC;
-
-	result = rc_auth(rh, 0, send, &received, msg);
-
-	if (result == OK_RC)
-	{
-		fprintf(stderr, "\"%s\" RADIUS Authentication OK\n", username);
-	}
-	else
-	{
-		fprintf(stderr, "\"%s\" RADIUS Authentication failure (RC=%i)\n", username, result);
-	}
-
-	return result;
-
-}
-
-int radius_auth(switch_channel_t *channel, char* called_number, char* username, char* password , char* auth_result/*, char* biling_model, char* credit_amount, char* currency, char* preffered_lang*/)
-{
-	int result = OK_RC;
-	VALUE_PAIR *send = NULL;
-	VALUE_PAIR *received = NULL;
-	VALUE_PAIR 	*service_vp;
-	DICT_ATTR   *pda;
-	CONFIG_VSAS* PCONFIGVSAS = NULL;
-	char *default_realm = NULL;
-	rc_handle *rh = NULL;
-	int attrid  =0;
-
-	char msg[STR_LENGTH * 10 + 1];
-	char username_realm[STR_LENGTH + 1];
-	char value[STR_LENGTH + 1];
-	int integer;
-
-	memset(msg, 0, STR_LENGTH * 10);
-	memset(username_realm, 0, STR_LENGTH);
-
-	send = NULL;
-
-
-
-	do
-	{
-
-#if EMBENDED_CONFIG
-
-		CONFIG_CLIENT* PCONFIGCLIENT = CONFIGCLIENT;
-
-		rh = rc_new();
-		if (rh == NULL)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR: Failed to allocate initial structure.\n");
-			result = ERROR_RC;
-			break;
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "allocate initial structure.\n");
-
-		/* Initialize the config structure */
-
-		rh = rc_config_init(rh);
-		if (rh == NULL)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"ERROR: Failed to initialze configuration.\n");
-			result = ERROR_RC;
-			break;
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"initialzed configuration.\n");
-
-		while(PCONFIGCLIENT)
-		{
-			//if (rc_add_config(rh, "auth_order", "radius", "config", 0) != 0)
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "set %s := %s.\n", PCONFIGCLIENT->name, PCONFIGCLIENT->value);
-			if (rc_add_config(rh, PCONFIGCLIENT->name, PCONFIGCLIENT->value, "config", 0) != 0)
-			{
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR: Unable to set %s := %s.\n", PCONFIGCLIENT->name, PCONFIGCLIENT->value);
-
-				result = ERROR_RC;
-				break;
-			}
-
-			PCONFIGCLIENT = PCONFIGCLIENT->pNext;
-		}
-
-		if (result == ERROR_RC)
-			break;
-
-
-#else
-		if ((rh = rc_read_config(!rc_config_file ? RC_CONFIG_FILE : rc_config_file)) == NULL)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error loading radius config file\n");
-
-			result = ERROR_RC;
-			break;
-		}
-
-#endif
-
-		if (rc_read_dictionary(rh, rc_conf_str(rh, "dictionary")) != 0)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error loading radius dictionary\n");
-
-			result = ERROR_RC;
-			break;
-		}
-
-		default_realm = rc_conf_str(rh, "default_realm");
-		if (default_realm == NULL)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "default_realm is null object.\n");
-			result = ERROR_RC;
-			break;
-		}
-
-		strncpy(username_realm, username, sizeof(username_realm));
-
-		if ((strchr(username_realm, '@') == NULL) && default_realm &&
-		    (*default_realm != '\0'))
-		{
-			strncat(username_realm, "@", sizeof(username_realm)-strlen(username_realm)-1);
-			strncat(username_realm, default_realm, sizeof(username_realm)-strlen(username_realm)-1);
-		}
-
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-			"... radius: User-Name: %s\n", username);
-		if (rc_avpair_add(rh, &send, PW_USER_NAME, username_realm, -1, 0)== NULL)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "An Error occured during rc_avpair_add : username\n");
-			result = ERROR_RC;
-			break;
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-			"... radius: User-Password: %s\n", password);
-		if (rc_avpair_add(rh, &send, PW_USER_PASSWORD, password, -1, 0) == NULL)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "An Error occured during rc_avpair_add : password\n");
-			result = ERROR_RC;
-			break;
-		}
-
-		if (!called_number || strcmp(called_number, "") == 0)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-				"... radius: Called-station-Id is empty, ignoring...\n");
-		}
-		else
-		{
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-				"... radius: Called-station-Id: %s\n", called_number);
-			if (rc_avpair_add(rh, &send, 30, called_number, -1, 0) == NULL)
-			{
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "An Error occured during rc_avpair_add : Called-station-Id\n");
-				result = ERROR_RC;
-				break;
-			}
-		}
-
-
-		PCONFIGVSAS = CONFIGVSAS;
-
-		while(PCONFIGVSAS)
-		{
-			if (PCONFIGVSAS->direction == 1)
-			{
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle attribute: %s\n", PCONFIGVSAS->name	);
-
-				memset(value, 0, STR_LENGTH);
-				GetValue(channel, PCONFIGVSAS, value);
-
-				if (PCONFIGVSAS->pec != 0)
-					attrid = PCONFIGVSAS->id | (PCONFIGVSAS->pec << 16);
-				else
-					attrid = PCONFIGVSAS->id ;
-
-				pda = rc_dict_getattr(rh, attrid);
-
-				if (pda == NULL)
-				{
-					result = ERROR_RC;
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown attribute: key:%s, not found in dictionary\n", PCONFIGVSAS->name);
-					break;
-				}
-
-				if (PCONFIGVSAS->pec != 0 && rc_dict_getvend(rh, PCONFIGVSAS->pec) == NULL)
-				{
-					result = ERROR_RC;
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown vendor specific id: key:%s, id:%dnot found in dictionary\n", PCONFIGVSAS->name, PCONFIGVSAS->pec);
-					break;
-				}
-
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "... dictionary data: id:%d, vendor id:%d, attr type:%d, attr name:%s (%d)\n", PCONFIGVSAS->id, PCONFIGVSAS->pec, pda->type, pda->name, attrid);
-
-				switch(pda->type)
-				{
-					case PW_TYPE_STRING:
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "... radius: key:%s, value:%s (%s) as string\n", PCONFIGVSAS->name, PCONFIGVSAS->value, value);
-						if (rc_avpair_add(rh, &send, PCONFIGVSAS->id, value, -1, PCONFIGVSAS->pec) == NULL)
-						{
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "An Error occured during rc_avpair_add : %s\n", PCONFIGVSAS->name);
-							result = ERROR_RC;
-							break;
-						}
-						break;
-
-					//case PW_TYPE_DATE:
-					case PW_TYPE_INTEGER:
-						integer = atoi(value);
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "... radius: key:%s, value:%s (%d) as integer\n", PCONFIGVSAS->name, PCONFIGVSAS->value, integer);
-
-
-						if (rc_avpair_add(rh, &send, PCONFIGVSAS->id, &integer, -1, PCONFIGVSAS->pec) == NULL)
-						{
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "An Error occured during rc_avpair_add : %s\n", PCONFIGVSAS->name);
-							result = ERROR_RC;
-							break;
-						}
-						break;
-					case PW_TYPE_IPADDR:
-						integer = rc_get_ipaddr(value);
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "... radius: key:%s, value:%s (%d) as ipaddr\n", PCONFIGVSAS->name, PCONFIGVSAS->value, integer);
-
-
-						if (rc_avpair_add(rh, &send, PCONFIGVSAS->id, &integer, -1, PCONFIGVSAS->pec) == NULL)
-						{
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "An Error occured during rc_avpair_add : %s\n", PCONFIGVSAS->name);
-							result = ERROR_RC;
-							break;
-						}
-						break;
-
-					default:
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown attribute type: key:%s, type %d\n", PCONFIGVSAS->name, pda->type);
-						break;
-				}
-			}
-
-			PCONFIGVSAS = PCONFIGVSAS->pNext;
-		}
-
-
-		if (result != ERROR_RC)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "sending radius packet ...\n"	);
-			result = rc_auth(rh, 0, send, &received, msg);
-
-
-			if (result == OK_RC)
-			{
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-					"RADIUS Authentication OK\n");
-
-					strcpy(auth_result, "OK");
-			}
-			else
-			{
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-					" RADIUS Authentication failure (RC=%d)\n",
-					result);
-
-					strcpy(auth_result, "NOK");
-			}
-
-
-
-			PCONFIGVSAS = CONFIGVSAS;
-
-			while(PCONFIGVSAS)
-			{
-				if (PCONFIGVSAS->direction == 0)
-				{
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle attribute: %s\n", PCONFIGVSAS->name	);
-					if ((service_vp = rc_avpair_get(received, PCONFIGVSAS->id, PCONFIGVSAS->pec)) != NULL)
-					{
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\tattribute (%s) found in radius packet\n", PCONFIGVSAS->name);
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\tset variable %s := %s\n", PCONFIGVSAS->value, service_vp->strvalue);
-
-						switch_channel_set_variable(channel, PCONFIGVSAS->value, service_vp->strvalue);
-					}
-					else
-					{
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\tNo found out attribute id: %d, pec:%d, (%s)\n", PCONFIGVSAS->id, PCONFIGVSAS->pec, PCONFIGVSAS->name	);
-					}
-				}
-
-				PCONFIGVSAS = PCONFIGVSAS->pNext;
-			}
-		}
-		else
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "abort sending radius packet.\n"	);
-			break;
-		}
-
-	} while(1 == 0);
-
-	if (result == ERROR_RC)
-	{
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-				"An error occured during RADIUS Authentication(RC=%d)\n",
-				result);
-	}
-
-	free_radius_auth_value_pair(send, received, rh);
-
-	return result;
-}
-
-SWITCH_STANDARD_APP(auth_function)
-{
-	char* in_called_number = NULL;
-	char *in_username = NULL;
-	char *in_password = NULL;
-
-	char *out_auth_result = NULL;
-	/*char *out_biling_model = NULL;
-	char *out_credit_amount = NULL;
-	char *out_currency = NULL;
-	char *out_preffered_lang = NULL;*/
-
-	char auth_result[STR_LENGTH + 1];
-	/*char biling_model[STR_LENGTH + 1];
-	char credit_amount[STR_LENGTH + 1];
-	char currency[STR_LENGTH + 1];
-	char preffered_lang[STR_LENGTH + 1];*/
-
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-
-	memset(auth_result, 0, STR_LENGTH);
-	/*memset(biling_model, 0, STR_LENGTH);
-	memset(credit_amount, 0, STR_LENGTH);
-	memset(currency, 0, STR_LENGTH);
-	memset(preffered_lang, 0, STR_LENGTH);*/
-
-	if (switch_strlen_zero(data))
-	{
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-			"No variable name specified.\n");
-	}
-	else
-	{
-
-		char *in_called_number_expanded = NULL;
-		char *in_username_expanded = NULL;
-		char *in_password_expanded = NULL;
-
-
-		in_called_number = switch_core_session_strdup(session, data);
-
-		in_username = strchr(in_called_number, ',');
-
-		if (in_username)
-		{
-			*in_username++ = '\0';
-			if (switch_strlen_zero(in_username))
-			{
-				in_username = NULL;
-			}
-		}
-
-		in_password = strchr(in_username, ',');
-
-		if (in_password)
-		{
-			*in_password++ = '\0';
-			if (switch_strlen_zero(in_password))
-			{
-				in_password = NULL;
-			}
-		}
-
-		out_auth_result = strchr(in_password, ',');
-
-		if (out_auth_result)
-		{
-			*out_auth_result++ = '\0';
-			if (switch_strlen_zero(out_auth_result))
-			{
-				out_auth_result = NULL;
-			}
-		}
-
-		/*out_biling_model = strchr(out_auth_result, ',');
-
-		if (out_biling_model)
-		{
-			*out_biling_model++ = '\0';
-			if (switch_strlen_zero(out_biling_model))
-			{
-				out_biling_model = NULL;
-			}
-		}
-
-		out_credit_amount = strchr(out_biling_model, ',');
-
-		if (out_credit_amount)
-		{
-			*out_credit_amount++ = '\0';
-			if (switch_strlen_zero(out_credit_amount))
-			{
-				out_credit_amount = NULL;
-			}
-		}
-
-		out_currency = strchr(out_credit_amount, ',');
-
-		if (out_currency)
-		{
-			*out_currency++ = '\0';
-			if (switch_strlen_zero(out_currency))
-			{
-				out_currency = NULL;
-			}
-		}
-
-		out_preffered_lang = strchr(out_currency, ',');
-
-		if (out_preffered_lang)
-		{
-			*out_preffered_lang++ = '\0';
-			if (switch_strlen_zero(out_preffered_lang))
-			{
-				out_preffered_lang = NULL;
-			}
-		}*/
-
-		if (in_called_number)
-			in_called_number = extract_in_variable(in_called_number);
-
-		in_username = extract_in_variable(in_username);
-		in_password = extract_in_variable(in_password);
-		out_auth_result = extract_out_variable(out_auth_result);
-		/*out_biling_model = extract_out_variable(out_biling_model);
-		out_credit_amount = extract_out_variable(out_credit_amount);
-		out_currency = extract_out_variable(out_currency);
-		out_preffered_lang = extract_out_variable(out_preffered_lang);*/
-
-		if (!in_username || !in_password)
-		{
-			//todo: throw Exception
-			switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Syntax error.\n" );
-			return;
-		}
-
-		if (in_called_number)
-			in_called_number_expanded = switch_channel_expand_variables(channel, in_called_number);
-
-		in_username_expanded = switch_channel_expand_variables(channel, in_username);
-		in_password_expanded = switch_channel_expand_variables(channel, in_password);
-
-
-		if (radius_auth(channel, in_called_number_expanded, in_username_expanded, in_password_expanded ,
-				auth_result/*, biling_model, credit_amount, currency, preffered_lang*/) != OK_RC)
-		{
-			switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "An error occured during radius authorization.\n");
-		}
-
-
-		switch_channel_set_variable(channel, out_auth_result, auth_result);
-
-		/*switch_channel_set_variable(channel, out_biling_model, biling_model);
-		switch_channel_set_variable(channel, out_credit_amount, credit_amount);
-		switch_channel_set_variable(channel, out_currency, currency);
-		switch_channel_set_variable(channel, out_preffered_lang, preffered_lang);*/
-
-		if (in_called_number && in_called_number_expanded && in_called_number_expanded != in_called_number)
-		{
-			switch_safe_free(in_called_number_expanded);
-		}
-
-		if (in_username_expanded && in_username_expanded != in_username)
-		{
-			switch_safe_free(in_username_expanded);
-		}
-
-		if (in_password_expanded && in_password_expanded != in_password)
-		{
-			switch_safe_free(in_password_expanded);
-		}
-	}
-}
-
-
-
-
-switch_status_t load_config()
-{
-	CONFIG_VSAS* PCONFIGVSAS = NULL;
-	CONFIG_CLIENT* PCONFIGCLIENT = NULL;
-
-	char *cf = "rad_auth.conf";
-	switch_xml_t cfg, xml, settings, param;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_event_t *params = NULL;
-
-	char *name;
-	char *id;
-	char *value;
-	char *pec;
-	char *expr;
-	char* direction;
-
-	CONFIGVSAS = NULL;
-	CONFIGCLIENT = NULL;
-
-	switch_event_create(&params, SWITCH_EVENT_MESSAGE);
-	switch_assert(params);
-	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile",
-		"profile_rad_auth");
-
-	//vsas
-
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, params)))
-	{
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-			"open of %s failed\n", cf);
-		status = SWITCH_STATUS_FALSE;
-		return status;
-	}
-
-	if ((settings = switch_xml_child(cfg, "settings")))
-	{
-		for (param = switch_xml_child(settings, "param"); param; param
-			= param->next)
-		{
-			name = (char *) switch_xml_attr_soft(param, "name");
-			value = (char *) switch_xml_attr_soft(param, "value");
-
-			if (strcmp(name, "radius_config") == 0)
-			{
-				if (rc_config_file == NULL)
-					rc_config_file = malloc(STR_LENGTH + 1);
-				strcpy(rc_config_file, value);
-
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "radius config: %s\n", value);
-			}
-		}
-	}
-
-	if ((settings = switch_xml_child(cfg, "vsas")))
-	{
-		for (param = switch_xml_child(settings, "param"); param; param
-			= param->next)
-		{
-			if (CONFIGVSAS == NULL)
-			{
-				CONFIGVSAS = malloc(sizeof(CONFIG_VSAS));
-				PCONFIGVSAS = CONFIGVSAS;
-			}
-			else
-			{
-				PCONFIGVSAS->pNext = malloc(sizeof(CONFIG_VSAS));
-				PCONFIGVSAS = PCONFIGVSAS->pNext;
-			}
-
-			name = (char *) switch_xml_attr_soft(param, "name");
-			id = (char *) switch_xml_attr_soft(param, "id");
-			value = (char *) switch_xml_attr_soft(param, "value");
-			pec = (char *) switch_xml_attr_soft(param, "pec");
-			expr = (char *) switch_xml_attr_soft(param, "expr");
-			direction = (char *) switch_xml_attr_soft(param, "direction");
-
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "config attr: %s, %s, %s, %s, %s, %s\n", name, id, value, pec, expr, direction);
-
-			PCONFIGVSAS->name = (char*) malloc(STR_LENGTH + 1);
-			PCONFIGVSAS->value = (char*) malloc(STR_LENGTH + 1);
-
-			strncpy(PCONFIGVSAS->name, name, STR_LENGTH);
-			strncpy(PCONFIGVSAS->value, value, STR_LENGTH);
-			PCONFIGVSAS->id = atoi(id);
-			PCONFIGVSAS->pec = atoi(pec);
-			PCONFIGVSAS->expr = atoi(expr);
-			if(strcmp(direction, "in") == 0)
-				PCONFIGVSAS->direction = 1;
-			else
-				PCONFIGVSAS->direction = 0;
-			PCONFIGVSAS->pNext = NULL;
-		}
-	}
-
-
-	if ((settings = switch_xml_child(cfg, "client")))
-	{
-		for (param = switch_xml_child(settings, "param"); param; param
-			= param->next)
-		{
-			if (CONFIGCLIENT == NULL)
-			{
-				CONFIGCLIENT = malloc(sizeof(CONFIG_CLIENT));
-				PCONFIGCLIENT = CONFIGCLIENT;
-			}
-			else
-			{
-				PCONFIGCLIENT->pNext = malloc(sizeof(CONFIG_CLIENT));
-				PCONFIGCLIENT = PCONFIGCLIENT->pNext;
-			}
-
-			name = (char *) switch_xml_attr_soft(param, "name");
-			value = (char *) switch_xml_attr_soft(param, "value");
-
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "config client: %s, %s\n", name, value);
-
-			PCONFIGCLIENT->name = (char*) malloc(STR_LENGTH + 1);
-			PCONFIGCLIENT->value = (char*) malloc(STR_LENGTH + 1);
-
-			strncpy(PCONFIGCLIENT->name, name, STR_LENGTH);
-			strncpy(PCONFIGCLIENT->value, value, STR_LENGTH);
-
-			PCONFIGCLIENT->pNext = NULL;
-		}
-	}
-
-	switch_xml_free(xml);
-	return status;
-}
-
-
-
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_rad_authload)
-{
-	switch_application_interface_t *app_interface;
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	SWITCH_ADD_APP(app_interface, "auth_function", NULL, NULL, auth_function, "in <USERNAME>, in <PASSWORD>, out <AUTH_RESULT>, out <BILING_MODEL>, out <CREDIT_AMOUNT>, out <CURRENCY>, out <PREFFERED_LANG>", SAF_SUPPORT_NOMEDIA);
-
-	load_config();
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-		"mod rad_auth services is loaded.\n");
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_rad_authruntime)
-{
-	return SWITCH_STATUS_TERM;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_rad_authshutdown)
-{
-	CONFIG_VSAS* PCONFIGVSAS = CONFIGVSAS;
-	CONFIG_CLIENT* PCONFIGCLIENT = CONFIGCLIENT;
-
-	CONFIG_VSAS* tmpVSAS = NULL;
-	CONFIG_CLIENT* tmpCLIENT = NULL;
-
-	while(PCONFIGVSAS)
-	{
-		if (PCONFIGVSAS->name)
-			free(PCONFIGVSAS->name);
-		PCONFIGVSAS->name = NULL;
-
-		if (PCONFIGVSAS->value)
-			free(PCONFIGVSAS->value);
-		PCONFIGVSAS->value = NULL;
-
-		tmpVSAS = PCONFIGVSAS;
-		PCONFIGVSAS = PCONFIGVSAS->pNext;
-
-		free(tmpVSAS);
-	}
-
-	CONFIGVSAS = NULL;
-
-
-	while(PCONFIGCLIENT)
-	{
-		if (PCONFIGCLIENT->name)
-			free(PCONFIGCLIENT->name);
-		PCONFIGCLIENT->name = NULL;
-
-		if (PCONFIGCLIENT->value)
-			free(PCONFIGCLIENT->value);
-		PCONFIGCLIENT->value = NULL;
-
-		tmpCLIENT = PCONFIGCLIENT;
-		PCONFIGCLIENT = PCONFIGCLIENT->pNext;
-
-		free(tmpCLIENT);
-	}
-
-	CONFIGCLIENT = NULL;
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
diff --git a/src/mod/applications/mod_rss/Makefile.am b/src/mod/applications/mod_rss/Makefile.am
deleted file mode 100644
index 718ea0d0eb..0000000000
--- a/src/mod/applications/mod_rss/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_rss
-
-mod_LTLIBRARIES = mod_rss.la
-mod_rss_la_SOURCES  = mod_rss.c
-mod_rss_la_CFLAGS   = $(AM_CFLAGS)
-mod_rss_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_rss_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/applications/mod_rss/conf/autoload_configs/rss.conf.xml b/src/mod/applications/mod_rss/conf/autoload_configs/rss.conf.xml
deleted file mode 100644
index f8c4f6d2b4..0000000000
--- a/src/mod/applications/mod_rss/conf/autoload_configs/rss.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration name="rss.conf" description="RSS Parser">
-  <feeds>
-    <!-- Just download the files to wherever and refer to them here -->
-    <!-- <feed name="Slash Dot">/home/rss/rss.rss</feed> -->
-    <!-- <feed name="News Forge">/home/rss/newsforge.rss</feed> -->
-  </feeds>
-</configuration>
diff --git a/src/mod/applications/mod_rss/conf/dialplan/rss.xml b/src/mod/applications/mod_rss/conf/dialplan/rss.xml
deleted file mode 100644
index 3cd2b17567..0000000000
--- a/src/mod/applications/mod_rss/conf/dialplan/rss.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<include>
-	<extension name="rss">
-		<condition field="destination_number" expression="^rss$">
-			<action application="rss"/>
-		</condition>
-	</extension>
-</include>
diff --git a/src/mod/applications/mod_rss/mod_rss.c b/src/mod/applications/mod_rss/mod_rss.c
deleted file mode 100644
index 16cd35412b..0000000000
--- a/src/mod/applications/mod_rss/mod_rss.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- * Bret McDanel <trixter AT 0xdecafbad.com>
- *
- *
- * mod_rss.c -- RSS Browser
- *
- */
-#include <switch.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_rss_load);
-SWITCH_MODULE_DEFINITION(mod_rss, mod_rss_load, NULL, NULL);
-
-typedef enum {
-	SFLAG_INSTRUCT = (1 << 0),
-	SFLAG_INFO = (1 << 1),
-	SFLAG_MAIN = (1 << 2)
-} SFLAGS;
-
-/* helper object */
-struct dtmf_buffer {
-	int32_t index;
-	uint32_t flags;
-	int32_t speed;
-	char voice[80];
-	switch_speech_handle_t *sh;
-};
-
-#define TTS_MEAN_SPEED 170
-#define TTS_MAX_ENTRIES 99
-#define TTS_DEFAULT_ENGINE "flite"
-#define TTS_DEFAULT_VOICE "slt"
-
-#define MATCH_COUNT
-
-struct rss_entry {
-	uint8_t inuse;
-	char *title_txt;
-	char *description_txt;
-	char *subject_txt;
-	char *dept_txt;
-};
-
-#ifdef MATCH_COUNT
-static uint32_t match_count(char *str, uint32_t max)
-{
-	char tstr[80] = "";
-	uint32_t matches = 0, x = 0;
-	uint32_t len = (uint32_t) strlen(str);
-
-	for (x = 0; x < max; x++) {
-		switch_snprintf(tstr, sizeof(tstr), "%u", x);
-		if (!strncasecmp(str, tstr, len)) {
-			matches++;
-		}
-	}
-	return matches;
-}
-#endif
-
-
-/*
-  dtmf handler function you can hook up to be executed when a digit is dialed during playback
-  if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.
-*/
-static switch_status_t on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
-{
-	switch (itype) {
-	case SWITCH_INPUT_TYPE_DTMF:{
-			switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
-			struct dtmf_buffer *dtb;
-			dtb = (struct dtmf_buffer *) buf;
-
-			switch (dtmf->digit) {
-			case '#':
-				switch_set_flag(dtb, SFLAG_MAIN);
-				return SWITCH_STATUS_BREAK;
-			case '6':
-				dtb->index++;
-				return SWITCH_STATUS_BREAK;
-			case '4':
-				dtb->index--;
-				return SWITCH_STATUS_BREAK;
-			case '*':
-				if (switch_test_flag(dtb->sh, SWITCH_SPEECH_FLAG_PAUSE)) {
-					switch_clear_flag(dtb->sh, SWITCH_SPEECH_FLAG_PAUSE);
-				} else {
-					switch_set_flag(dtb->sh, SWITCH_SPEECH_FLAG_PAUSE);
-				}
-				break;
-			case '5':
-				switch_core_speech_text_param_tts(dtb->sh, "voice", "next");
-				switch_set_flag(dtb, SFLAG_INFO);
-				return SWITCH_STATUS_BREAK;
-			case '9':
-				switch_core_speech_text_param_tts(dtb->sh, "voice", dtb->voice);
-				switch_set_flag(dtb, SFLAG_INFO);
-				return SWITCH_STATUS_BREAK;
-			case '2':
-				if (dtb->speed < 260) {
-					dtb->speed += 30;
-					switch_core_speech_numeric_param_tts(dtb->sh, "speech/rate", dtb->speed);
-					switch_set_flag(dtb, SFLAG_INFO);
-					return SWITCH_STATUS_BREAK;
-				}
-				break;
-			case '7':
-				dtb->speed = TTS_MEAN_SPEED;
-				switch_core_speech_numeric_param_tts(dtb->sh, "speech/rate", dtb->speed);
-				switch_set_flag(dtb, SFLAG_INFO);
-				return SWITCH_STATUS_BREAK;
-			case '8':
-				if (dtb->speed > 80) {
-					dtb->speed -= 30;
-					switch_core_speech_numeric_param_tts(dtb->sh, "speech/rate", dtb->speed);
-					switch_set_flag(dtb, SFLAG_INFO);
-					return SWITCH_STATUS_BREAK;
-				}
-				break;
-			case '0':
-				switch_set_flag(dtb, SFLAG_INSTRUCT);
-				return SWITCH_STATUS_BREAK;
-			}
-		}
-		break;
-	default:
-		break;
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_APP(rss_function)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_status_t status;
-	const char *err = NULL;
-	struct dtmf_buffer dtb = { 0 };
-	switch_xml_t xml = NULL, item, xchannel = NULL;
-	struct rss_entry entries[TTS_MAX_ENTRIES] = { {0} };
-	uint32_t i = 0;
-	char *title_txt = "", *description_txt = "", *rights_txt = "";
-	switch_codec_t speech_codec;
-	char *engine = TTS_DEFAULT_ENGINE;
-	char *voice = TTS_DEFAULT_VOICE;
-	char *timer_name = NULL;
-	switch_speech_handle_t sh;
-	switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
-	switch_timer_t timer = { 0 }, *timerp = NULL;
-	uint32_t last;
-	char *mydata = NULL;
-	char *filename = NULL;
-	char *argv[3], *feed_list[TTS_MAX_ENTRIES] = { 0 }, *feed_names[TTS_MAX_ENTRIES] = {
-	0};
-	int feed_index = 0;
-	const char *cf = "rss.conf";
-	switch_xml_t cfg, cxml, feeds, feed;
-	char buf[1024] = "";
-	int32_t jumpto = -1;
-	uint32_t matches = 0;
-	switch_input_args_t args = { 0 };
-	const char *vcf = NULL;
-	char *chanvars = switch_channel_build_param_string(channel, NULL, NULL);
-	switch_codec_implementation_t read_impl = { 0 };
-	uint32_t rate, interval, channels;
-	switch_core_session_get_read_impl(session, &read_impl);
-	interval = read_impl.microseconds_per_packet / 1000;
-
-	if ((vcf = switch_channel_get_variable(channel, "rss_alt_config"))) {
-		cf = vcf;
-	}
-
-	if (!(cxml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
-		return;
-	}
-	switch_safe_free(chanvars);
-
-	if ((feeds = switch_xml_child(cfg, "feeds"))) {
-		for (feed = switch_xml_child(feeds, "feed"); feed; feed = feed->next) {
-			char *name = (char *) switch_xml_attr_soft(feed, "name");
-			char *expanded = NULL;
-			char *idx = feed->txt;
-
-			if ((expanded = switch_channel_expand_variables(channel, idx)) == idx) {
-				expanded = NULL;
-			} else {
-				idx = expanded;
-			}
-
-			if (!name) {
-				name = "Error No Name.";
-			}
-
-			feed_list[feed_index] = switch_core_session_strdup(session, idx);
-			switch_safe_free(expanded);
-
-			if ((expanded = switch_channel_expand_variables(channel, name)) == name) {
-				expanded = NULL;
-			} else {
-				name = expanded;
-			}
-			feed_names[feed_index] = switch_core_session_strdup(session, name);
-			switch_safe_free(expanded);
-			feed_index++;
-
-		}
-	}
-
-	switch_xml_free(cxml);
-
-	switch_channel_answer(channel);
-
-	if (!zstr(data)) {
-		if ((mydata = switch_core_session_strdup(session, data))) {
-			switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]));
-
-			if (argv[0]) {
-				engine = argv[0];
-				if (argv[1]) {
-					voice = argv[1];
-					if (argv[2]) {
-						jumpto = atoi(argv[2]);
-					}
-				}
-			}
-		}
-	}
-
-	if (!feed_index) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "No Feeds Specified!\n");
-		return;
-	}
-
-	if (switch_channel_media_ready(channel)) {
-		rate = read_impl.actual_samples_per_second;
-		channels = read_impl.number_of_channels;
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Codec Error!\n");
-		return;
-	}
-
-	memset(&sh, 0, sizeof(sh));
-	if (switch_core_speech_open(&sh, engine, voice, rate, interval, channels, &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid TTS module!\n");
-		return;
-	}
-
-	if (switch_core_codec_init(&speech_codec,
-							   "L16",
-							   NULL,
-							   NULL,
-							   (int) rate,
-							   interval,
-							   1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
-							   switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activated\n");
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", rate, interval);
-		flags = 0;
-		switch_core_speech_close(&sh, &flags);
-		return;
-	}
-
-	if (timer_name) {
-		if (switch_core_timer_init(&timer, timer_name, interval, (int) (rate / 50), switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Setup timer failed!\n");
-			switch_core_codec_destroy(&speech_codec);
-			flags = 0;
-			switch_core_speech_close(&sh, &flags);
-			return;
-		}
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", (rate / 50) * 2, interval);
-
-		/* start a thread to absorb incoming audio */
-		switch_core_service_session(session);
-		timerp = &timer;
-	}
-
-	while (switch_channel_ready(channel)) {
-		int32_t len = 0, idx = 0;
-		char cmd[3];
-	  main_menu:
-		filename = NULL;
-		len = 0;
-		*cmd = '\0';
-		title_txt = description_txt = rights_txt = "";
-
-		if (jumpto > -1) {
-			switch_snprintf(cmd, sizeof(cmd), "%d", jumpto);
-			jumpto = -1;
-		} else {
-			switch_core_speech_flush_tts(&sh);
-			switch_ivr_sleep(session, 500, SWITCH_FALSE, NULL);
-
-#ifdef MATCH_COUNT
-			switch_snprintf(buf + len, sizeof(buf) - len, "%s",
-							", Main Menu."
-							"Select one of the following news sources, or press 0 to exit. ");
-#else
-			switch_snprintf(buf + len, sizeof(buf) - len, "%s",
-							",Main Menu. "
-							"Select one of the following news sources, followed by the pound key or press 0 to exit. ");
-#endif
-			len = (int32_t) strlen(buf);
-
-			for (idx = 0; idx < feed_index; idx++) {
-				switch_snprintf(buf + len, sizeof(buf) - len, "%d: %s. />", idx + 1, feed_names[idx]);
-				len = (int32_t) strlen(buf);
-			}
-
-			args.input_callback = NULL;
-			args.buf = cmd;
-			args.buflen = sizeof(cmd);
-			status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, buf, &args);
-			if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
-				goto finished;
-			}
-		}
-		if (*cmd != '\0') {
-			int32_t x;
-			char *p;
-
-			if (strchr(cmd, '0')) {
-				break;
-			}
-
-			if ((p = strchr(cmd, '#'))) {
-				*p = '\0';
-#ifdef MATCH_COUNT
-				/* Hmmm... I know there are no more matches so I don't *need* them to press pound but
-				   I already told them to press it.  Will this confuse people or not?  Let's make em press
-				   pound unless this define is enabled for now.
-				 */
-			} else if (match_count(cmd, feed_index) > 1) {
-#else
-			} else {
-#endif
-				char term;
-				char *cp;
-				switch_size_t blen = sizeof(cmd) - strlen(cmd);
-
-				cp = cmd + blen;
-				switch_ivr_collect_digits_count(session, cp, blen, blen, "#", &term, 5000, 0, 0);
-			}
-
-			x = atoi(cmd) - 1;
-
-			if (x > -1 && x < feed_index) {
-				filename = feed_list[x];
-			} else if (matches > 1) {
-
-			} else {
-				args.input_callback = NULL;
-				args.buf = NULL;
-				args.buflen = 0;
-				status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, "I'm sorry. That is an Invalid Selection. ", &args);
-				if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
-					goto finished;
-				}
-			}
-		}
-
-		if (!filename) {
-			continue;
-		}
-
-		if (!(xml = switch_xml_parse_file(filename))) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of %s failed\n", filename);
-			goto finished;
-		}
-
-		err = switch_xml_error(xml);
-
-		if (!zstr(err)) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Error [%s]\n", err);
-			goto finished;
-		}
-
-		if ((xchannel = switch_xml_child(xml, "channel"))) {
-			switch_xml_t title, description, rights;
-
-			if ((title = switch_xml_child(xchannel, "title"))) {
-				title_txt = title->txt;
-			}
-
-			if ((description = switch_xml_child(xchannel, "description"))) {
-				description_txt = description->txt;
-			}
-
-			if ((rights = switch_xml_child(xchannel, "dc:rights"))) {
-				rights_txt = rights->txt;
-			}
-		}
-
-
-		if (!(item = switch_xml_child(xml, "item"))) {
-			if (xchannel) {
-				item = switch_xml_child(xchannel, "item");
-			}
-		}
-
-		memset(entries, 0, sizeof(entries));
-
-		for (i = 0; item; item = item->next) {
-			switch_xml_t title, description, subject, dept;
-			char *p;
-
-			entries[i].inuse = 1;
-			entries[i].title_txt = NULL;
-			entries[i].description_txt = NULL;
-			entries[i].subject_txt = NULL;
-			entries[i].dept_txt = NULL;
-
-			if ((title = switch_xml_child(item, "title"))) {
-				entries[i].title_txt = title->txt;
-			}
-
-			if ((description = switch_xml_child(item, "description"))) {
-				char *t, *e;
-				entries[i].description_txt = description->txt;
-				for (;;) {
-					if (!(t = strchr(entries[i].description_txt, '<'))) {
-						break;
-					}
-					if (!(e = strchr(t, '>'))) {
-						break;
-					}
-
-					memset(t, 32, ++e - t);
-				}
-			}
-
-			if ((subject = switch_xml_child(item, "dc:subject"))) {
-				entries[i].subject_txt = subject->txt;
-			}
-
-			if ((dept = switch_xml_child(item, "slash:department"))) {
-				entries[i].dept_txt = dept->txt;
-			}
-
-			if (entries[i].description_txt && (p = strchr(entries[i].description_txt, '<'))) {
-				*p = '\0';
-			}
-#ifdef _STRIP_SOME_CHARS_
-			for (p = entries[i].description_txt; *p; p++) {
-				if (*p == '\'' || *p == '"' || *p == ':') {
-					*p = ' ';
-				}
-			}
-#endif
-			i++;
-		}
-
-		if (switch_channel_ready(channel)) {
-			switch_time_exp_t tm;
-			char date[80] = "";
-			switch_size_t retsize;
-			char dtmf[5] = "";
-
-			switch_time_exp_lt(&tm, switch_micro_time_now());
-			switch_strftime_nocheck(date, &retsize, sizeof(date), "%I:%M %p", &tm);
-
-			switch_ivr_sleep(session, 500, SWITCH_FALSE, NULL);
-
-			switch_snprintf(buf, sizeof(buf),
-							",%s. %s. %s. local time: %s, Press 0 for options, 5 to change voice, or pound to return to the main menu. ",
-							title_txt, description_txt, rights_txt, date);
-			args.input_callback = NULL;
-			args.buf = dtmf;
-			args.buflen = sizeof(dtmf);
-			status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, buf, &args);
-			if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
-				goto finished;
-			}
-			if (*dtmf != '\0') {
-				switch (*dtmf) {
-				case '0':
-					switch_set_flag(&dtb, SFLAG_INSTRUCT);
-					break;
-				case '#':
-					goto main_menu;
-				}
-			}
-		}
-
-		for (last = 0; last < TTS_MAX_ENTRIES; last++) {
-			if (!entries[last].inuse) {
-				last--;
-				break;
-			}
-		}
-
-		dtb.index = 0;
-		dtb.sh = &sh;
-		dtb.speed = TTS_MEAN_SPEED;
-		//switch_set_flag(&dtb, SFLAG_INFO);
-		switch_copy_string(dtb.voice, voice, sizeof(dtb.voice));
-		while (entries[0].inuse && switch_channel_ready(channel)) {
-			while (switch_channel_ready(channel)) {
-				uint8_t cont = 0;
-
-				if (dtb.index >= TTS_MAX_ENTRIES) {
-					dtb.index = 0;
-				}
-				if (dtb.index < 0) {
-					dtb.index = last;
-				}
-
-				if (!entries[dtb.index].inuse) {
-					dtb.index = 0;
-					continue;
-				}
-				if (switch_channel_ready(channel)) {
-					char tmpbuf[1024] = "";
-					uint32_t tmplen = 0;
-
-					if (switch_test_flag(&dtb, SFLAG_MAIN)) {
-						switch_clear_flag(&dtb, SFLAG_MAIN);
-						goto main_menu;
-					}
-					if (switch_test_flag(&dtb, SFLAG_INFO)) {
-						switch_clear_flag(&dtb, SFLAG_INFO);
-						switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "%s %s. I am speaking at %u words per minute. ", sh.engine, sh.voice,
-										dtb.speed);
-						tmplen = (uint32_t) strlen(tmpbuf);
-					}
-
-					if (switch_test_flag(&dtb, SFLAG_INSTRUCT)) {
-						switch_clear_flag(&dtb, SFLAG_INSTRUCT);
-						cont = 1;
-						switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "%s",
-										"Press star to pause or resume speech. "
-										"To go to the next item, press six. "
-										"To go back, press 4. "
-										"Press two to go faster, eight to slow down, or 7 to resume normal speed. "
-										"To change voices, press five. To restore the original voice press 9. "
-										"To hear these options again, press zero or press pound to return to the main menu. ");
-					} else {
-						switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "Story %d. ", dtb.index + 1);
-						tmplen = (uint32_t) strlen(tmpbuf);
-
-						if (entries[dtb.index].subject_txt) {
-							switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "Subject: %s. ", entries[dtb.index].subject_txt);
-							tmplen = (uint32_t) strlen(tmpbuf);
-						}
-
-						if (entries[dtb.index].dept_txt) {
-							switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "From the %s department. ", entries[dtb.index].dept_txt);
-							tmplen = (uint32_t) strlen(tmpbuf);
-						}
-
-						if (entries[dtb.index].title_txt) {
-							switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "%s", entries[dtb.index].title_txt);
-						}
-					}
-					switch_core_speech_flush_tts(&sh);
-					args.input_callback = on_dtmf;
-					args.buf = &dtb;
-					args.buflen = sizeof(dtb);
-					status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, tmpbuf, &args);
-					if (status == SWITCH_STATUS_BREAK) {
-						continue;
-					} else if (status != SWITCH_STATUS_SUCCESS) {
-						goto finished;
-					}
-
-					if (cont) {
-						continue;
-					}
-
-					if (entries[dtb.index].description_txt) {
-						args.input_callback = on_dtmf;
-						args.buf = &dtb;
-						args.buflen = sizeof(dtb);
-						status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, entries[dtb.index].description_txt, &args);
-					}
-					if (status == SWITCH_STATUS_BREAK) {
-						continue;
-					} else if (status != SWITCH_STATUS_SUCCESS) {
-						goto finished;
-					}
-				}
-
-				dtb.index++;
-			}
-		}
-	}
-
-  finished:
-	switch_core_speech_close(&sh, &flags);
-	switch_core_codec_destroy(&speech_codec);
-
-	if (timerp) {
-		/* End the audio absorbing thread */
-		switch_core_thread_session_end(session);
-		switch_core_timer_destroy(&timer);
-	}
-
-	switch_xml_free(xml);
-	switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
-}
-
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_rss_load)
-{
-	switch_application_interface_t *app_interface;
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	SWITCH_ADD_APP(app_interface, "rss", NULL, NULL, rss_function, NULL, SAF_NONE);
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/applications/mod_rss/script/news.js b/src/mod/applications/mod_rss/script/news.js
deleted file mode 100644
index d6dea0dc29..0000000000
--- a/src/mod/applications/mod_rss/script/news.js
+++ /dev/null
@@ -1,12 +0,0 @@
-if (session.ready()) {
-   session.answer();
-   session.speak("cepstral","David","Please wait while we refresh the RSS feeds.")
-
-   fetchURLFile("http://weather.yahooapis.com/forecastrss?p=60610","rss/weather.rss");
-   fetchURLFile("http://rss.news.yahoo.com/rss/topstories","rss/yahootop.rss");
-   fetchURLFile("http://rss.news.yahoo.com/rss/science","rss/yahoosci.rss");
-   fetchURLFile("http://rss.news.yahoo.com/rss/business","rss/yahoobus.rss");
-   fetchURLFile("http://rss.news.yahoo.com/rss/entertainment","rss/yahooent.rss");
-   fetchURLFile("http://rss.slashdot.org/Slashdot/slashdot","rss/slashdot.rss");
-   fetchURLFile("http://www.freeswitch.org/xml.php","rss/freeswitch.rss");
-}
diff --git a/src/mod/applications/mod_signalwire/mod_signalwire.c b/src/mod/applications/mod_signalwire/mod_signalwire.c
index 5b0be47a91..108f99b2c5 100644
--- a/src/mod/applications/mod_signalwire/mod_signalwire.c
+++ b/src/mod/applications/mod_signalwire/mod_signalwire.c
@@ -228,7 +228,7 @@ static ks_status_t load_credentials_from_json(ks_json_t *json)
 	const char *relay_connector_id = NULL;
 
 #if SIGNALWIRE_CLIENT_C_VERSION_MAJOR >= 2
-	if ((bootstrap = ks_json_get_string(json, "bootstrap")) == NULL) {
+	if ((bootstrap = ks_json_get_object_string(json, "bootstrap", NULL)) == NULL) {
 #else
 	if ((bootstrap = ks_json_get_object_cstr(json, "bootstrap")) == NULL) {
 #endif
@@ -238,7 +238,7 @@ static ks_status_t load_credentials_from_json(ks_json_t *json)
 	}
 
 #if SIGNALWIRE_CLIENT_C_VERSION_MAJOR >= 2
-	if ((relay_connector_id = ks_json_get_string(json, "relay_connector_id")) == NULL) {
+	if ((relay_connector_id = ks_json_get_object_string(json, "relay_connector_id", NULL)) == NULL) {
 #else
 	if ((relay_connector_id = ks_json_get_object_cstr(json, "relay_connector_id")) == NULL) {
 #endif
@@ -704,7 +704,7 @@ done:
 	return status;
 }
 
-static switch_status_t load_config()
+static switch_status_t load_config(void)
 {
 	char *cf = "signalwire.conf";
 	switch_xml_t cfg, xml;
@@ -797,6 +797,7 @@ static ks_status_t load_credentials(void)
 		status = KS_STATUS_FAIL;
 		goto done;
 	}
+
 	fclose(fp);
 
 	json = ks_json_parse(data);
@@ -805,6 +806,7 @@ static ks_status_t load_credentials(void)
 		status = KS_STATUS_FAIL;
 		goto done;
 	}
+
 	status = load_credentials_from_json(json);
 	ks_json_delete(&json);
 
@@ -981,7 +983,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_signalwire_load)
 #ifdef WIN32
 	sslLoadWindowsCACertificate();
 #endif
-
 	// Configuration
 	swclt_config_create(&globals.config);
 	load_config();
@@ -1206,6 +1207,7 @@ static void mod_signalwire_state_configure(void)
 #if SIGNALWIRE_CLIENT_C_VERSION_MAJOR >= 2
 	if (!swclt_sess_provisioning_configure(globals.signalwire_session, "freeswitch", local_endpoint, external_endpoint, globals.relay_connector_id, &reply)) {
 		if (reply->type == SWCLT_CMD_TYPE_RESULT) {
+			ks_json_t *result;
 #else
 	if (!swclt_sess_provisioning_configure(globals.signalwire_session, "freeswitch", local_endpoint, external_endpoint, globals.relay_connector_id, &cmd)) {
 		SWCLT_CMD_TYPE cmd_type;
@@ -1215,7 +1217,8 @@ static void mod_signalwire_state_configure(void)
 #endif
 			signalwire_provisioning_configure_response_t *configure_res;
 #if SIGNALWIRE_CLIENT_C_VERSION_MAJOR >= 2
-			if (!SIGNALWIRE_PROVISIONING_CONFIGURE_RESPONSE_PARSE(reply->pool, reply->json, &configure_res)) {
+			result = ks_json_get_object_item(reply->json, "result");
+			if (!SIGNALWIRE_PROVISIONING_CONFIGURE_RESPONSE_PARSE(reply->pool, result, &configure_res)) {
 #else
 			swclt_cmd_result(cmd, &result);
 			result = ks_json_get_object_item(result, "result");
@@ -1223,7 +1226,7 @@ static void mod_signalwire_state_configure(void)
 #endif
 				ks_json_t *configuration = configure_res->configuration;
 #if SIGNALWIRE_CLIENT_C_VERSION_MAJOR >= 2
-				const char *configuration_profile = ks_json_get_string(configuration, "profile");
+				const char *configuration_profile = ks_json_get_object_string(configuration, "profile", NULL);
 #else
 				const char *configuration_profile = ks_json_get_object_cstr(configuration, "profile");
 #endif
@@ -1231,6 +1234,7 @@ static void mod_signalwire_state_configure(void)
 					switch_xml_free(globals.signalwire_profile);
 					globals.signalwire_profile = NULL;
 				}
+
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\"%s\"\n", configuration_profile);
 				globals.signalwire_profile = switch_xml_parse_str_dynamic((char *)configuration_profile, SWITCH_TRUE);
 				if (!globals.signalwire_profile) {
@@ -1386,7 +1390,7 @@ static void mod_signalwire_state_register(void)
 	}
 }
 
-static void mod_signalwire_state_ready()
+static void mod_signalwire_state_ready(void)
 {
 	if (globals.profile_update) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Signalwire SIP profile update initiated\n");
diff --git a/src/mod/applications/mod_sms_flowroute/Makefile.am b/src/mod/applications/mod_sms_flowroute/Makefile.am
deleted file mode 100644
index ed5eb0f506..0000000000
--- a/src/mod/applications/mod_sms_flowroute/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_sms_flowroute
-
-if HAVE_H2O
-
-mod_LTLIBRARIES = mod_sms_flowroute.la
-mod_sms_flowroute_la_SOURCES  = mod_sms_flowroute.c
-mod_sms_flowroute_la_CFLAGS   = $(AM_CFLAGS) $(H2O_CFLAGS) $(BROTLIENC_CFLAGS) $(BROTLIDEC_CFLAGS)
-mod_sms_flowroute_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_sms_flowroute_la_LDFLAGS  = -avoid-version -module -no-undefined -shared $(H2O_LIBS) $(BROTLIENC_LIBS) $(BROTLIDEC_LIBS) $(SWITCH_AM_LDFLAGS)
-
-else
-install: error
-all: error
-error:
-	$(error You must install libh2o and libh2o-dev to build this module)
-endif
diff --git a/src/mod/applications/mod_sms_flowroute/TODO.txt b/src/mod/applications/mod_sms_flowroute/TODO.txt
deleted file mode 100644
index 123737e10e..0000000000
--- a/src/mod/applications/mod_sms_flowroute/TODO.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-For inbound, these are known leaks on per module load(not per message). These will likely require additions to libh2o to add a destroy function.
-
-=================================================================
-==4164==ERROR: LeakSanitizer: detected memory leaks
-
-Direct leak of 1104 byte(s) in 26 object(s) allocated from:
-    #0 0x4c1e28 in __interceptor_malloc (/usr/local/freeswitch_sms_flowroute/bin/freeswitch+0x4c1e28)
-        #1 0x7f868d71acbd in wcsdup /build/glibc-h_iKOs/glibc-2.19/wcsmbs/wcsdup.c:30
-
-Direct leak of 184 byte(s) in 1 object(s) allocated from:
-    #0 0x4c1e28 in __interceptor_malloc (/usr/local/freeswitch_sms_flowroute/bin/freeswitch+0x4c1e28)
-        #1 0x7f867cdcbaee in h2o_mem_alloc /usr/src/h2o/include/h2o/memory.h:298
-	    #2 0x7f867cdcbaee in create_socket /usr/src/h2o/lib/common/socket/evloop.c.h:361
-
-Indirect leak of 184 byte(s) in 1 object(s) allocated from:
-    #0 0x4c1e28 in __interceptor_malloc (/usr/local/freeswitch_sms_flowroute/bin/freeswitch+0x4c1e28)
-        #1 0x7f867cdcbaee in h2o_mem_alloc /usr/src/h2o/include/h2o/memory.h:298
-	    #2 0x7f867cdcbaee in create_socket /usr/src/h2o/lib/common/socket/evloop.c.h:361
-
-Indirect leak of 88 byte(s) in 1 object(s) allocated from:
-    #0 0x4c1e28 in __interceptor_malloc (/usr/local/freeswitch_sms_flowroute/bin/freeswitch+0x4c1e28)
-        #1 0x7f867cdc9e12 in h2o_mem_alloc /usr/src/h2o/include/h2o/memory.h:298
-	    #2 0x7f867cdc9e12 in h2o_multithread_create_queue /usr/src/h2o/lib/common/multithread.c:106
-
-SUMMARY: AddressSanitizer: 1560 byte(s) leaked in 29 allocation(s).
diff --git a/src/mod/applications/mod_sms_flowroute/mod_sms_flowroute.c b/src/mod/applications/mod_sms_flowroute/mod_sms_flowroute.c
deleted file mode 100644
index 3c4f7c69cf..0000000000
--- a/src/mod/applications/mod_sms_flowroute/mod_sms_flowroute.c
+++ /dev/null
@@ -1,669 +0,0 @@
-/*
-* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-* Copyright (C) 2005-2015, Anthony Minessale II <anthm@freeswitch.org>
-*
-* Version: MPL 1.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-*
-* The Initial Developer of the Original Code is
-* Anthony Minessale II <anthm@freeswitch.org>
-* Portions created by the Initial Developer are Copyright (C)
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*
-* William King <william.king@quentustech.com>
-*
-* mod_sms_flowroute.c SMS support for Flowroute SMS
-*
-*/
-
-#include "mod_sms_flowroute.h"
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_sms_flowroute_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sms_flowroute_shutdown);
-SWITCH_MODULE_DEFINITION(mod_sms_flowroute, mod_sms_flowroute_load, mod_sms_flowroute_shutdown, NULL);
-
-static mod_sms_flowroute_globals_t mod_sms_flowroute_globals;
-
-static void on_accept(h2o_socket_t *listener, const char *error)
-{
-	mod_sms_flowroute_profile_t *profile = listener->data;
-	h2o_socket_t *sock = NULL;
-
-	if ( error != NULL ){
-		return;
-	}
-
-	if ((sock = h2o_evloop_socket_accept(listener)) == NULL) {
-		return;
-	}
-
-	h2o_accept(profile->h2o_accept_context, sock);
-}
-
-static void mod_sms_flowroute_profile_event_thread_on_timeout(h2o_timeout_entry_t *entry)
-{
-	/* required to have this callback, to enable any per interval checks or cleanup. */
-}
-
-static void *SWITCH_THREAD_FUNC mod_sms_flowroute_profile_event_thread(switch_thread_t *thread, void *obj)
-{
-	mod_sms_flowroute_profile_t *profile = obj;
-	struct sockaddr_in addr;
-	int fd, reuseaddr_flag = 1, err = 0;
-	h2o_socket_t *sock;
-	h2o_timeout_t timeout = {0};
-	h2o_timeout_entry_t timeout_entry = {0};
-
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_addr.s_addr = INADDR_ANY;
-	addr.sin_port = htons(profile->port);
-
-	err = (fd = socket(AF_INET, SOCK_STREAM, 0));
-	if (err == -1 ) {
-		fprintf(stderr, "unable to open socket [%d]\n", err);
-		return 0;
-	}
-
-	err = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr_flag, sizeof(reuseaddr_flag));
-	if (err != 0) {
-		fprintf(stderr, "Unable to set socket options [%d]\n", err);
-		return 0;
-	}
-
-	err = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
-	if (err  != 0 ) {
-		fprintf(stderr, "Unable to bind to socket [%d]\n", err);
-		perror("bind");
-		return 0;
-	}
-
-	err = listen(fd, SOMAXCONN);
-	if ( err != 0) {
-		fprintf(stderr, "Unable to listen on socket [%d]\n", err);
-		return 0;
-	}
-
-	sock = h2o_evloop_socket_create(profile->h2o_context.loop, fd, H2O_SOCKET_FLAG_DONT_READ);
-	sock->data = (void *) profile;
-	h2o_socket_read_start(sock, on_accept);
-
-	while ( profile->running ) {
-		//		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Profile[%s] event thread loop\n", profile->name);
-		h2o_timeout_init(profile->h2o_context.loop, &timeout, 1000); /* 1 second loop */
-		timeout_entry.cb = mod_sms_flowroute_profile_event_thread_on_timeout;
-		h2o_timeout_link(profile->h2o_context.loop, &timeout, &timeout_entry);
-
-		h2o_evloop_run(profile->h2o_context.loop);
-
-		h2o_timeout_unlink(&timeout_entry);
-		h2o_timeout_dispose(profile->h2o_context.loop, &timeout);
-	}
-	h2o_socket_close(sock);
-	return 0;
-}
-
-switch_status_t mod_sms_flowroute_profile_destroy(mod_sms_flowroute_profile_t **old_profile)
-{
-	mod_sms_flowroute_profile_t *profile = NULL;
-	switch_status_t status;
-
-	if ( !old_profile || !*old_profile ) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	profile = *old_profile;
-
-	switch_core_hash_delete(mod_sms_flowroute_globals.profile_hash, profile->name);
-
-	profile->running = 0;
-
-	if (profile->profile_thread) {
-		switch_thread_join(&status, profile->profile_thread);
-	}
-
-	switch_safe_free(profile->h2o_accept_context);
-	switch_safe_free(profile->h2o_context.loop);
-	h2o_context_dispose(&(profile->h2o_context));
-	h2o_config_dispose(&(profile->h2o_globalconf));
-
-	switch_core_destroy_memory_pool(&(profile->pool));
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Profile[%s] destroyed\n", profile->name);
-
-	*old_profile = NULL;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static int mod_sms_flowroute_profile_request_handler(h2o_handler_t *handler, h2o_req_t *request)
-{
-	static h2o_generator_t generator = {NULL, NULL};
-	h2o_iovec_t body = h2o_strdup(&request->pool, "ACCEPTED\n", SIZE_MAX);
-	char *content = strndup(request->entity.base, request->entity.len);
-	cJSON *parsed = NULL;
-	switch_event_t *evt = NULL;
-
-	/* If there were a better way to cJSON_Parse, but with a str and len, this could remove a strndup */
-	parsed = cJSON_Parse(content);
-
-	if ( !parsed ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid request received[%.*s]", (int) request->entity.len, request->entity.base);
-		goto done;
-	}
-
-	switch_event_create(&evt, SWITCH_EVENT_MESSAGE);
-	switch_event_add_header_string(evt, SWITCH_STACK_BOTTOM, "to", cJSON_GetObjectCstr(parsed, "to"));
-	switch_event_add_header_string(evt, SWITCH_STACK_BOTTOM, "body", cJSON_GetObjectCstr(parsed, "body"));
-	switch_event_add_header_string(evt, SWITCH_STACK_BOTTOM, "from", cJSON_GetObjectCstr(parsed, "from"));
-	switch_event_add_header_string(evt, SWITCH_STACK_BOTTOM, "record_id", cJSON_GetObjectCstr(parsed, "id"));
-	switch_event_add_header_string(evt, SWITCH_STACK_BOTTOM, "context", "default");
-	switch_event_add_header_string(evt, SWITCH_STACK_BOTTOM, "proto", "sms_flowroute");
-
-    switch_core_chat_send("GLOBAL_SMS", evt);
-	switch_event_destroy(&evt);
-
-	request->res.status = 200;
-	request->res.reason = "OK";
-	h2o_add_header(&request->pool, &request->res.headers, H2O_TOKEN_CONTENT_TYPE, H2O_STRLIT("text/plain; charset=utf-8"));
-	h2o_start_response(request, &generator);
-	h2o_send(request, &body, 1, 1);
-
- done:
-
-	cJSON_Delete(parsed);
-	switch_safe_free(content);
-	return 0;
-}
-
-switch_status_t mod_sms_flowroute_profile_create(mod_sms_flowroute_profile_t **new_profile, char *name, int debug, int port,
-												 char *access_key, char *secret_key, char *host)
-{
-	mod_sms_flowroute_profile_t *profile = NULL;
-	switch_memory_pool_t *pool = NULL;
-	switch_threadattr_t *thd_attr;
-	char auth[256] = {0};
-	unsigned int auth_size = 0;
-
-	switch_core_new_memory_pool(&pool);
-
-	profile = switch_core_alloc(pool, sizeof(mod_sms_flowroute_profile_t));
-
-	profile->pool = pool;
-	profile->debug = debug;
-	profile->running = 1;
-	profile->name = name ? switch_core_strdup(profile->pool, name) : "default";
-	profile->access_key = access_key ? switch_core_strdup(profile->pool, access_key) : "access_key";
-	profile->secret_key = secret_key ? switch_core_strdup(profile->pool, secret_key) : "secret_key";
-	profile->host = host ? switch_core_strdup(profile->pool, host) : "https://api.flowroute.com/v2/messages";
-	profile->port = port ? port : 8000;
-
-	auth_size = snprintf(auth, 256, "%s:%s", profile->access_key, profile->secret_key);
-	switch_b64_encode((unsigned char *)auth, auth_size, profile->auth_b64, 512);
-	profile->auth_b64_size = strlen((const char *)profile->auth_b64);
-
-	if ( h2o_url_parse(profile->host, SIZE_MAX, &profile->url_parsed) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Profile[%s] error processing url[%s]\n", profile->name, profile->host);
-		goto err;
-	}
-
-	h2o_config_init(&(profile->h2o_globalconf));
-	profile->h2o_hostconf = h2o_config_register_host(&(profile->h2o_globalconf), h2o_iovec_init(H2O_STRLIT("mod_sms_flowroute")), 2048);
-
-	/* Register h2o handlers here */
-	profile->h2o_pathconf = h2o_config_register_path(profile->h2o_hostconf, "/", 0);
-	profile->h2o_handler = h2o_create_handler(profile->h2o_pathconf, sizeof(h2o_handler_t));
-	profile->h2o_handler->on_req = mod_sms_flowroute_profile_request_handler;
-
-	h2o_context_init(&(profile->h2o_context), h2o_evloop_create(), &(profile->h2o_globalconf));
-
-	profile->queue = h2o_multithread_create_queue(profile->h2o_context.loop);
-
-	profile->h2o_accept_context = calloc(1, sizeof(h2o_accept_ctx_t));
-	profile->h2o_accept_context->ctx = &(profile->h2o_context);
-	profile->h2o_accept_context->hosts = profile->h2o_globalconf.hosts;
-
-	switch_threadattr_create(&thd_attr, pool);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&(profile->profile_thread), thd_attr, mod_sms_flowroute_profile_event_thread, (void *) profile, pool);
-
-	switch_core_hash_insert(mod_sms_flowroute_globals.profile_hash, name, (void *) profile);
-	*new_profile = profile;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Profile[%s] created\n", profile->name);
-
-	return SWITCH_STATUS_SUCCESS;
-
- err:
-	return SWITCH_STATUS_GENERR;
-}
-
-
-static int on_body(h2o_http1client_t *client, const char *errstr)
-{
-	h2o_http1client_ctx_t *ctx = client->ctx;
-	mod_sms_flowroute_message_t *msg = H2O_STRUCT_FROM_MEMBER(mod_sms_flowroute_message_t, ctx, ctx);
-
-	if (errstr != NULL && errstr != h2o_http1client_error_is_eos) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SMS Send error on_body[%s]\n", errstr);
-		goto err;
-	}
-
-	fwrite(client->sock->input->bytes, 1, client->sock->input->size, stdout);
-	h2o_buffer_consume(&client->sock->input, client->sock->input->size);
-
-	if (errstr == h2o_http1client_error_is_eos) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "SMS Send EOS\n");
-	}
-
-	msg->status = 0;
-	switch_mutex_unlock(msg->mutex);
-	return 0;
-
- err:
-	msg->status = 3;
-	switch_mutex_unlock(msg->mutex);
-	return -1;
-}
-
-static h2o_http1client_body_cb on_head(h2o_http1client_t *client, const char *errstr, int minor_version, int status, h2o_iovec_t msg_iovec,
-								h2o_http1client_header_t *headers, size_t num_headers)
-{
-	size_t i;
-	switch_log_level_t loglevel = SWITCH_LOG_DEBUG;
-	h2o_http1client_ctx_t *ctx = client->ctx;
-	mod_sms_flowroute_message_t *msg = H2O_STRUCT_FROM_MEMBER(mod_sms_flowroute_message_t, ctx, ctx);
-
-	if (errstr != NULL && errstr != h2o_http1client_error_is_eos) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SMS Send error on_head[%s]\n", errstr);
-		goto err;
-	}
-
-	if ( status != 200 ) {
-		loglevel = SWITCH_LOG_ERROR;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, loglevel, "HTTP/1.%d %d %.*s\n", minor_version, status, (int)msg_iovec.len, msg_iovec.base);
-	for (i = 0; i != num_headers; ++i) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, loglevel, "%.*s: %.*s\n",
-						  (int)headers[i].name_len, headers[i].name, (int)headers[i].value_len, headers[i].value);
-	}
-
-	if (errstr == h2o_http1client_error_is_eos) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SMS Send error on_head no body received[%s]\n", errstr);
-		goto err;
-	}
-
-	return on_body;
-
- err:
-	msg->status = 2;
-	switch_mutex_unlock(msg->mutex);
-	return NULL;
-}
-
-static h2o_http1client_head_cb on_connect(h2o_http1client_t *client, const char *errstr, h2o_iovec_t **reqbufs, size_t *reqbufcnt,
-								   int *method_is_head)
-{
-	h2o_http1client_ctx_t *ctx = client->ctx;
-	mod_sms_flowroute_message_t *msg = H2O_STRUCT_FROM_MEMBER(mod_sms_flowroute_message_t, ctx, ctx);
-
-	if (errstr != NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SMS Send error on_connect[%s]\n", errstr);
-		goto err;
-	}
-
-	*reqbufs = (h2o_iovec_t *)client->data;
-	*reqbufcnt = 1;
-	*method_is_head = 0;
-
-	return on_head;
-
- err:
-	msg->status = 1;
-	switch_mutex_unlock(msg->mutex);
-	return NULL;
-}
-
-switch_status_t mod_sms_flowroute_profile_send_message(mod_sms_flowroute_profile_t *profile, switch_event_t *event)
-{
-	mod_sms_flowroute_message_t *msg = NULL;
-	char *to = NULL, *from = NULL, *text = NULL;
-	switch_status_t status = SWITCH_STATUS_GENERR;
-	int wait_loops = 10; /* 10 seconds */
-	cJSON *body = NULL;
-
-	msg = calloc(1, sizeof(mod_sms_flowroute_message_t));
-	msg->req.base = calloc(1, 2048);
-	msg->ctx.getaddr_receiver = &msg->getaddr_receiver;
-	msg->ctx.io_timeout = &msg->io_timeout;
-	msg->ctx.loop = profile->h2o_context.loop;
-	msg->profile = profile;
-	msg->status = -1;
-	h2o_timeout_init(msg->ctx.loop, &msg->io_timeout, 5000); /* 5 seconds */
-	h2o_multithread_register_receiver(profile->queue, msg->ctx.getaddr_receiver, h2o_hostinfo_getaddr_receiver);
-
-	msg->ctx.ssl_ctx = SSL_CTX_new(TLSv1_2_client_method());
-	SSL_CTX_load_verify_locations(msg->ctx.ssl_ctx, NULL, "/etc/ssl/certs/");
-	SSL_CTX_set_verify(msg->ctx.ssl_ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
-
-	switch_mutex_init(&msg->mutex, SWITCH_MUTEX_UNNESTED, profile->pool);
-	switch_mutex_lock(msg->mutex);
-
-	body = cJSON_CreateObject();
-
-	to = switch_event_get_header(event, "to");
-	if ( !to ) {
-		to = switch_event_get_header(event, "destination_addr");
-	}
-
-	from = switch_event_get_header(event, "from");
-	if ( !from ) {
-		from = switch_event_get_header(event, "source_addr");
-	}
-
-	cJSON_AddItemToObject(body, "to", cJSON_CreateString(to));
-	cJSON_AddItemToObject(body, "from", cJSON_CreateString(from));
-	cJSON_AddItemToObject(body, "body", cJSON_CreateString((const char *) switch_event_get_body(event)));
-
-	text = cJSON_Print(body);
-	cJSON_Delete(body);
-
-	msg->req.len = snprintf(msg->req.base, 2048, "POST %.*s HTTP/1.1\r\n"
-							"Authorization: Basic %.*s\r\n"
-							"Host: %.*s\r\n"
-							"Accept: */*\r\n"
-							"Content-Type: application/json\r\n"
-							"Content-Length: %d\r\n"
-							"\r\n%s",
-							(int) profile->url_parsed.path.len, profile->url_parsed.path.base,
-							profile->auth_b64_size, profile->auth_b64,
-							(int) profile->url_parsed.authority.len, profile->url_parsed.authority.base,
-							(int)strlen(text), text);
-
-	if ( profile->debug ) {
-		char *msg_txt = NULL;
-		switch_event_serialize(event, &msg_txt, SWITCH_FALSE);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Profile[%s] sending message from event\n%s\n", profile->name, msg_txt);
-		switch_safe_free(msg_txt);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Profile[%s] sending message json:\n%s\n", profile->name, text);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "REQUEST\n\n%.*s\n\n", (int) msg->req.len, msg->req.base);
-	}
-
-	h2o_http1client_connect(NULL, &msg->req, &(msg->ctx), profile->url_parsed.host, h2o_url_get_port(&profile->url_parsed), 1, on_connect);
-
-	do {
-		switch_yield(1000000);
-		wait_loops--;
-		status = switch_mutex_trylock(msg->mutex);
-	} while ( wait_loops > 0 && status != SWITCH_STATUS_SUCCESS);
-
-	if ( status != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile[%s] send_message thread timed out on send\n", profile->name);
-		goto err;
-	}
-
-	if ( msg->status > 0 ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile[%s] send_message resulted in failure status %d\n", profile->name, msg->status);
-		goto err;
-	}
-
-	h2o_timeout_dispose(msg->ctx.loop, msg->ctx.io_timeout);
-	switch_mutex_destroy(msg->mutex);
-	switch_safe_free(msg->req.base);
-	switch_safe_free(msg);
-	return SWITCH_STATUS_SUCCESS;
-
- err:
-	if ( msg && msg->mutex ) {
-		switch_mutex_destroy(msg->mutex);
-	}
-	h2o_timeout_dispose(msg->ctx.loop, msg->ctx.io_timeout);
-	switch_safe_free(msg->req.base);
-	switch_safe_free(msg);
-	return SWITCH_STATUS_GENERR;
-}
-
-switch_status_t mod_sms_flowroute_interface_chat_send(switch_event_t *event)
-{
-	mod_sms_flowroute_profile_t *profile = NULL;
-	char *profile_name = switch_event_get_header(event, "sms_flowroute_profile");
-
-	if (zstr(profile_name)) {
-		profile_name = "default";
-	}
-
-	profile = switch_core_hash_find(mod_sms_flowroute_globals.profile_hash, profile_name);
-
-	if (!profile) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "NO SUCH SMS_FLOWROUTE PROFILE[%s].", profile_name);
-		return SWITCH_STATUS_GENERR;
-	}
-
-	mod_sms_flowroute_profile_send_message(profile, event);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* static switch_status_t name (switch_event_t *message, const char *data) */
-SWITCH_STANDARD_CHAT_APP(mod_sms_flowroute_chat_send_function)
-{
-	mod_sms_flowroute_profile_t *profile = NULL;
-
-	profile = switch_core_hash_find(mod_sms_flowroute_globals.profile_hash, data);
-
-	if ( !profile ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "NO SUCH SMS_FLOWROUTE PROFILE[%s].", data);
-		return SWITCH_STATUS_GENERR;
-	}
-
-	mod_sms_flowroute_profile_send_message(profile, message);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* static void name (switch_core_session_t *session, const char *data) */
-SWITCH_STANDARD_APP(mod_sms_flowroute_app_send_function)
-{
-	switch_event_header_t *chan_var = NULL;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_event_t *message = NULL;
-
-	if (switch_event_create(&message, SWITCH_EVENT_MESSAGE) != SWITCH_STATUS_SUCCESS) {
-		return;
-	}
-
-	/* Copy over recognized channel vars. Then call the chat send function */
-	/* Cycle through all of the channel headers, and ones with 'sms_flowroute_' prefix copy over without the prefix */
-	for ( chan_var = switch_channel_variable_first(channel); chan_var; chan_var = chan_var->next) {
-		if ( !strncmp(chan_var->name, "sms_flowroute_", 14) ) {
-			switch_event_add_header_string(message, SWITCH_STACK_BOTTOM, chan_var->name + 14, chan_var->value);
-		}
-	}
-
-	/* Unlock the channel variables */
-	switch_channel_variable_last(channel);
-	mod_sms_flowroute_chat_send_function(message, data);
-	return;
-}
-
-/* static switch_status_t name (_In_opt_z_ const char *cmd, _In_opt_ switch_core_session_t *session, _In_ switch_stream_handle_t *stream) */
-SWITCH_STANDARD_API(mod_sms_flowroute_debug_api)
-{
-	mod_sms_flowroute_globals.debug = switch_true(cmd);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "debug is %s\n", (mod_sms_flowroute_globals.debug ? "on" : "off") );
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* static switch_status_t name (_In_opt_z_ const char *cmd, _In_opt_ switch_core_session_t *session, _In_ switch_stream_handle_t *stream) */
-SWITCH_STANDARD_API(mod_sms_flowroute_send_api)
-{
-	mod_sms_flowroute_profile_t *profile = NULL;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_event_t *message = NULL;
-	char *argv[1024] = { 0 };
-	int argc = 0;
-	char *cmd_dup = strdup(cmd);
-
-	if (!(argc = switch_separate_string(cmd_dup, '|', argv, (sizeof(argv) / sizeof(argv[0])))) || argc != 4 ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid format. Must be | separated like: profile|destination|source|message\n");
-		switch_goto_status(SWITCH_STATUS_GENERR, done);
-	}
-
-	profile = switch_core_hash_find(mod_sms_flowroute_globals.profile_hash, argv[0]);
-
-	if ( !profile ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "NO SUCH SMS_FLOWROUTE PROFILE[%s].", argv[0]);
-		switch_goto_status(SWITCH_STATUS_GENERR, done);
-	}
-
-	if (switch_event_create(&message, SWITCH_EVENT_MESSAGE) != SWITCH_STATUS_SUCCESS) {
-		switch_goto_status(SWITCH_STATUS_GENERR, done);
-	}
-
-	switch_event_add_header_string(message, SWITCH_STACK_BOTTOM, "destination_addr", argv[1]);
-	switch_event_add_header_string(message, SWITCH_STACK_BOTTOM, "source_addr", argv[2]);
-	switch_event_set_body(message, argv[3]);
-
-	if (mod_sms_flowroute_profile_send_message(profile, message) != SWITCH_STATUS_SUCCESS) {
-		switch_goto_status(SWITCH_STATUS_GENERR, done);
-	}
-
- done:
-	switch_safe_free(cmd_dup);
-	return status;
-
-}
-
-switch_status_t mod_sms_flowroute_do_config()
-{
-	char *conf = "sms_flowroute.conf";
-	switch_xml_t xml, cfg, profiles, profile, params, param;
-
-	if (!(xml = switch_xml_open_cfg(conf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", conf);
-		goto err;
-	}
-
-	if ( (profiles = switch_xml_child(cfg, "profiles")) != NULL) {
-		for (profile = switch_xml_child(profiles, "profile"); profile; profile = profile->next) {
-			mod_sms_flowroute_profile_t *new_profile = NULL;
-			int debug = 0, port = 0;
-			char *access_key = NULL, *secret_key = NULL, *host = NULL;
-			char *name = (char *)switch_xml_attr_soft(profile, "name");
-
-			// Load params
-			if ( (params = switch_xml_child(profile, "params")) != NULL) {
-				for (param = switch_xml_child(params, "param"); param; param = param->next) {
-					char *var = (char *) switch_xml_attr_soft(param, "name");
-
-					if ( ! strncmp(var, "debug", 5) ) {
-						debug = atoi(switch_xml_attr_soft(param, "value"));
-					} else if ( ! strncmp(var, "port", 4) ) {
-						port = atoi(switch_xml_attr_soft(param, "value"));
-					} else if ( ! strncmp(var, "access-key", 10) ) {
-						access_key = (char *) switch_xml_attr_soft(param, "value");
-					} else if ( ! strncmp(var, "secret-key", 10) ) {
-						secret_key = (char *) switch_xml_attr_soft(param, "value");
-					} else if ( ! strncmp(var, "host", 4) ) {
-						host = (char *) switch_xml_attr_soft(param, "value");
-					}
-				}
-			}
-
-			if ( mod_sms_flowroute_profile_create(&new_profile, name, debug, port, access_key, secret_key, host) == SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created profile[%s]\n", name);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create profile[%s]\n", name);
-			}
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profiles config is missing\n");
-		goto err;
-	}
-
-	switch_xml_free(xml);
-	return SWITCH_STATUS_SUCCESS;
-
- err:
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Configuration failed\n");
-	if(xml){
-		switch_xml_free(xml);
-	}
-	return SWITCH_STATUS_GENERR;
-}
-
-/* switch_status_t name (switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
-SWITCH_MODULE_LOAD_FUNCTION(mod_sms_flowroute_load)
-{
-	switch_api_interface_t *mod_sms_flowroute_api_interface;
-	switch_chat_interface_t *mod_sms_flowroute_chat_interface;
-	switch_chat_application_interface_t *mod_sms_flowroute_chat_app_interface;
-	switch_application_interface_t *mod_sms_flowroute_app_interface;
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	memset(&mod_sms_flowroute_globals, 0, sizeof(mod_sms_flowroute_globals_t));
-	mod_sms_flowroute_globals.pool = pool;
-	mod_sms_flowroute_globals.debug = 0;
-	switch_core_hash_init(&(mod_sms_flowroute_globals.profile_hash));
-
-	if ( mod_sms_flowroute_do_config() != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to load due to bad configs\n");
-		return SWITCH_STATUS_TERM;
-	}
-
-	/*	SSL_load_error_strings();
-	SSL_library_init();
-	OpenSSL_add_all_algorithms();*/
-
-
-	SWITCH_ADD_CHAT(mod_sms_flowroute_chat_interface, "sms_flowroute", mod_sms_flowroute_interface_chat_send);
-	SWITCH_ADD_API(mod_sms_flowroute_api_interface, "sms_flowroute_send", "mod_sms_flowroute send", mod_sms_flowroute_send_api, NULL);
-	SWITCH_ADD_API(mod_sms_flowroute_api_interface, "sms_flowroute_debug", "mod_sms_flowroute toggle debug", mod_sms_flowroute_debug_api, NULL);
-	SWITCH_ADD_CHAT_APP(mod_sms_flowroute_chat_app_interface, "sms_flowroute_send", "send message to profile", "send message to profile",
-						mod_sms_flowroute_chat_send_function, "", SCAF_NONE);
-	SWITCH_ADD_APP(mod_sms_flowroute_app_interface, "sms_flowroute_send", NULL, NULL, mod_sms_flowroute_app_send_function,
-				   "sms_flowroute_send", SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC);
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sms_flowroute_shutdown)
-{
-	switch_hash_index_t *hi;
-	mod_sms_flowroute_profile_t *profile = NULL;
-
-	while ((hi = switch_core_hash_first(mod_sms_flowroute_globals.profile_hash))) {
-		switch_core_hash_this(hi, NULL, NULL, (void **)&profile);
-		mod_sms_flowroute_profile_destroy(&profile);
-		switch_safe_free(hi);
-	}
-
-	switch_core_hash_destroy(&(mod_sms_flowroute_globals.profile_hash));
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/applications/mod_sms_flowroute/mod_sms_flowroute.h b/src/mod/applications/mod_sms_flowroute/mod_sms_flowroute.h
deleted file mode 100644
index 47651299dc..0000000000
--- a/src/mod/applications/mod_sms_flowroute/mod_sms_flowroute.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-* Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
-*
-* Version: MPL 1.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-*
-* The Initial Developer of the Original Code is
-* Anthony Minessale II <anthm@freeswitch.org>
-* Portions created by the Initial Developer are Copyright (C)
-* the Initial Developer. All Rights Reserved.
-*
-* Based on mod_skel by
-* Anthony Minessale II <anthm@freeswitch.org>
-*
-* Contributor(s):
-*
-* William King <william.king@quentustech.com>
-*
-* mod_sms_flowroute.c SMS support for Flowroute SMS
-*
-*/
-
-#ifndef MOD_SMS_FLOWROUTE_H
-#define MOD_SMS_FLOWROUTE_H
-
-#define H2O_USE_LIBUV 0
-#define H2O_USE_BROTLI 1
-
-#include <switch.h>
-#include "h2o.h"
-#include "h2o/http1client.h"
-
-typedef struct {
-  char *name;
-  int port;
-  int debug;
-  int running;
-  char *host;
-
-  char *access_key;
-  char *secret_key;
-
-  unsigned char auth_b64[512];
-  int auth_b64_size;
-
-  h2o_url_t url_parsed;
-  h2o_socketpool_t *sockpool;
-
-  h2o_globalconf_t h2o_globalconf;
-  h2o_hostconf_t *h2o_hostconf;
-  h2o_pathconf_t *h2o_pathconf;
-  h2o_handler_t *h2o_handler;
-  h2o_context_t h2o_context;
-  h2o_accept_ctx_t *h2o_accept_context;
-  h2o_multithread_queue_t *queue;
-
-  switch_thread_t *profile_thread;
-  switch_memory_pool_t *pool;
-} mod_sms_flowroute_profile_t;
-
-typedef struct {
-  h2o_http1client_ctx_t ctx;
-  mod_sms_flowroute_profile_t *profile;
-  switch_mutex_t *mutex;
-  h2o_iovec_t req;
-  int status;
-  h2o_multithread_receiver_t getaddr_receiver;
-  h2o_timeout_t io_timeout;
-} mod_sms_flowroute_message_t;
-
-typedef struct mod_sms_flowroute_globals_s {
-  switch_memory_pool_t *pool;
-  switch_hash_t *profile_hash;
-  int debug;
-} mod_sms_flowroute_globals_t;
-
-extern mod_sms_flowroute_globals_t mod_sms_flowroute_globals;
-
-
-#endif /* MOD_SMS_FLOWROUTE_H */
-
diff --git a/src/mod/applications/mod_snom/Makefile.am b/src/mod/applications/mod_snom/Makefile.am
deleted file mode 100644
index b388f069ec..0000000000
--- a/src/mod/applications/mod_snom/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_snom
-
-mod_LTLIBRARIES = mod_snom.la
-mod_snom_la_SOURCES  = mod_snom.c
-mod_snom_la_CFLAGS   = $(AM_CFLAGS)
-mod_snom_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
-mod_snom_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_snom_la_LDFLAGS  = $(CURL_LIBS) -avoid-version -module -no-undefined -shared
diff --git a/src/mod/applications/mod_snom/conf/dialplan/snom_demo.xml b/src/mod/applications/mod_snom/conf/dialplan/snom_demo.xml
deleted file mode 100644
index 5917713471..0000000000
--- a/src/mod/applications/mod_snom/conf/dialplan/snom_demo.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<include>
-	<extension name="snom-demo-1">
-		<condition field="destination_number" expression="^9000$">
-			<!-- <key> <light> <label> <user> <host> <profile> <action_name> <action> -->
-			<action application="eval" data="${snom_bind_key(2 on DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message api+uuid_transfer ${uuid} 9001)}"/>
-			<action application="playback" data="$${hold_music}"/>
-		</condition>
-	</extension>
-
-	<extension name="snom-demo-2">
-		<condition field="destination_number" expression="^9001$">
-			<action application="eval" data="${snom_bind_key(2 off DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message notused)}"/>
-			<action application="transfer" data="3000"/>
-		</condition>
-	</extension>
-</include>
diff --git a/src/mod/applications/mod_snom/mod_snom.2017.vcxproj b/src/mod/applications/mod_snom/mod_snom.2017.vcxproj
deleted file mode 100644
index c74c9d08c8..0000000000
--- a/src/mod/applications/mod_snom/mod_snom.2017.vcxproj
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_snom</ProjectName>
-    <ProjectGuid>{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}</ProjectGuid>
-    <RootNamespace>mod_snom</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(SolutionDir)\w32\curl.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>6385;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>6385;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>6385;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>6385;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_snom.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/applications/mod_snom/mod_snom.c b/src/mod/applications/mod_snom/mod_snom.c
deleted file mode 100644
index b3cf2b478e..0000000000
--- a/src/mod/applications/mod_snom/mod_snom.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- * mod_snom.c -- SNOM Specific Features
- *
- */
-#include <switch.h>
-#include <switch_curl.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_snom_load);
-SWITCH_MODULE_DEFINITION(mod_snom, mod_snom_load, NULL, NULL);
-
-static switch_bool_t snom_bind_key(const char *key,
-								   const char *light,
-								   const char *label, const char *user, const char *host, const char *profile, const char *action_name, const char *action)
-{
-	switch_event_t *event;
-
-
-	if (user && host && profile) {
-		if (switch_event_create(&event, SWITCH_EVENT_SEND_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "user", user);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "host", host);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "profile", profile);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "content-type", "application/x-buttons");
-			if (action && action_name) {
-				switch_event_add_body(event, "k=%s\nc=%s\nl=%s\nn=%s\na=%s\n", key, light, label, action, action_name);
-			} else {
-				switch_event_add_body(event, "k=%s\nc=%s\nl=%s\n\n", key, light, label);
-			}
-
-			switch_event_fire(&event);
-		}
-		return SWITCH_TRUE;
-	}
-
-	return SWITCH_FALSE;
-}
-
-
-#define URL_SYNTAX ""
-SWITCH_STANDARD_API(snom_url_api_function)
-{
-#if 0
-	char *tmp;
-	switch_event_serialize(stream->param_event, &tmp, SWITCH_TRUE);
-	printf("W00t\n%s\n", tmp);
-	free(tmp);
-#endif
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-#define KEY_BIND_SYNTAX "<key> <light> <label> <user> <host> <profile> <action_name> <action>"
-SWITCH_STANDARD_API(snom_bind_key_api_function)
-{
-	int argc;
-	char *mydata = NULL, *argv[8];
-
-	mydata = strdup(cmd);
-	argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-
-	if (argc < 6) {
-		goto err;
-	}
-
-	if (snom_bind_key(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7])) {
-		stream->write_function(stream, "+OK %s\n", cmd);
-		goto end;
-	}
-
-  err:
-
-	stream->write_function(stream, "-Error %s\n", KEY_BIND_SYNTAX);
-
-  end:
-
-	free(mydata);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static size_t curl_callback(void *ptr, size_t size, size_t nmemb, void *data)
-{
-	register unsigned int realsize = (unsigned int) (size * nmemb);
-	return realsize;
-}
-
-#define COMMAND_SYNTAX "<ip|user> <command> <type> <username> <password>"
-SWITCH_STANDARD_API(snom_command_api_function)
-{
-	int argc;
-	long httpRes = 0;
-	char *key = NULL;
-	char *url = NULL;
-	char *argv[5] = { 0 };
-	char host[32];
-	char *argdata = NULL;
-	char *userpwd = NULL;
-	char *apiresp = NULL;
-	ip_t  ip;
-	switch_CURL *curl_handle = NULL;
-
-	if (zstr(cmd) || !(argdata = strdup(cmd))) {
-		goto end;
-	}
-
-	argc = switch_separate_string(argdata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-
-	if (argc < 3 || (argc > 3 && argc < 5)) {
-		stream->write_function(stream, "-ERR %s\n", COMMAND_SYNTAX);
-		goto end;
-	}
-
-	if (strcasecmp(argv[1],"key") && strcasecmp(argv[1],"action")) {
-		stream->write_function(stream, "-ERR only key or action commands allowed at the moment\n");
-		goto end;
-	}
-
-	if (switch_inet_pton(AF_INET, argv[0], &ip)) {
-		snprintf(host, sizeof(host), "%s", argv[0]);
-	} else {
-		char *sql = NULL;
-		char *ret = NULL;
-		switch_cache_db_handle_t *db = NULL;
-		switch_stream_handle_t apistream = { 0 };
-
-		SWITCH_STANDARD_STREAM(apistream);
-		if (switch_api_execute("sofia_contact", argv[0], NULL, &apistream) != SWITCH_STATUS_SUCCESS) {
-			stream->write_function(stream, "-ERR error executing sofia_contact\n");
-			goto end;
-		}
-		apiresp = (char*) apistream.data;
-
-		if (!zstr(apiresp)) {
-			if (!strcasecmp(apistream.data,"error/user_not_registered")) {
-				stream->write_function(stream, "-ERR user '%s' not registered\n",argv[0]);
-				goto end;
-			}
-		} else {
-			goto end;
-		}
-
-		if (switch_core_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
-			stream->write_function(stream, "%s", "-ERR Database Error!\n");
-			goto end;
-		}
-
-		sql = switch_mprintf("select network_ip from registrations where url = '%q'", apiresp);
-
-		ret = switch_cache_db_execute_sql2str(db, sql, host, sizeof(host), NULL);
-		switch_safe_free(sql);
-		switch_cache_db_release_db_handle(&db);
-
-		if (!ret) {
-			stream->write_function(stream, "%s", "-ERR Query '%s' failed!\n", sql);
-			goto end;
-		}
-	}
-
-	curl_handle = curl_easy_init();
-
-	if (0 == strcasecmp(argv[1],"key")) {
-		key = curl_easy_escape(curl_handle, argv[2], 0);
-		url = switch_mprintf("http://%s/command.htm?key=%s", host, key);
-		curl_free(key);
-	}
-
-	if (0 == strcasecmp(argv[1],"action")) {
-		if (0 == strcasecmp(argv[2],"reboot")) {
-			url = switch_mprintf("http://%s/advanced_update.htm?reboot=Reboot", host);
-		} else if (0 == strcasecmp(argv[2],"reset")) {
-			url = switch_mprintf("http://%s/advanced_update.htm?reset=Reset", host);
-		} else if (0 == strcasecmp(argv[2],"dialeddel")) {
-			url = switch_mprintf("http://%s/index.htm?dialeddel=0", host);
-		} else if (0 == strcasecmp(argv[2],"misseddel")) {
-			url = switch_mprintf("http://%s/index.htm?misseddel=0", host);
-		} else if (0 == strcasecmp(argv[2],"receiveddel")) {
-			url = switch_mprintf("http://%s/index.htm?receiveddel=0", host);
-		} else {
-			stream->write_function(stream, "-ERR action '%s' not supported (supported actions are reboot, reset, dialeddel, misseddel, receiveddel)\n", argv[2]);
-			curl_easy_cleanup(curl_handle);
-			goto end;
-		}
-	}
-
-	curl_easy_setopt(curl_handle, CURLOPT_HTTPGET, 1);
-	curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, curl_callback);
-	curl_easy_setopt(curl_handle, CURLOPT_URL, url);
-	curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-curl/1.0");
-	curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
-	curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 15);
-	curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1);
-
-	if (argc == 5) {
-		userpwd = switch_mprintf("%s:%s",argv[3],argv[4]);
-		curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, (long)CURLAUTH_ANY);
-		curl_easy_setopt(curl_handle, CURLOPT_USERPWD, userpwd);
-	}
-	curl_easy_perform(curl_handle);
-	curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes);
-	curl_easy_cleanup(curl_handle);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "curl url %s , result %ld\n", url,httpRes);
-
-	if (httpRes != 200)
-		stream->write_function(stream, "-ERR %s [HTTP:%ld]\n", cmd, httpRes);
-	else
-		stream->write_function(stream, "+OK %s\n", cmd);
-
-end:
-	switch_safe_free(apiresp);
-	switch_safe_free(userpwd);
-	switch_safe_free(argdata);
-	switch_safe_free(url);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_snom_load)
-{
-
-	switch_api_interface_t *commands_api_interface;
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-
-	SWITCH_ADD_API(commands_api_interface, "snom_bind_key", "Bind a key", snom_bind_key_api_function, KEY_BIND_SYNTAX);
-	SWITCH_ADD_API(commands_api_interface, "snom_url", "url", snom_url_api_function, URL_SYNTAX);
-	SWITCH_ADD_API(commands_api_interface, "snom_command", "Sends Command over HTTP Request", snom_command_api_function, COMMAND_SYNTAX);
-
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/applications/mod_sonar/Makefile.am b/src/mod/applications/mod_sonar/Makefile.am
deleted file mode 100644
index 4398e3c664..0000000000
--- a/src/mod/applications/mod_sonar/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_sonar
-
-mod_LTLIBRARIES = mod_sonar.la
-mod_sonar_la_SOURCES  = mod_sonar.c
-mod_sonar_la_CFLAGS   = $(AM_CFLAGS)
-mod_sonar_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_sonar_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/applications/mod_sonar/mod_sonar.c b/src/mod/applications/mod_sonar/mod_sonar.c
deleted file mode 100644
index 52bd5ebf17..0000000000
--- a/src/mod/applications/mod_sonar/mod_sonar.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * William King <william.king@quentustech.com>
- * Seven Du <dujinfang@gmail.com>
- *
- * mod_sonar.c -- Sonar ping timer
- *
- *
- */
-
-/*
-  TODO:
-  1. Use libteltone directly
-  2. Use an energy detection to listen for first set of sound back. Use timestamp of detection of energy as the recv stamp if a tone is eventually detected.
-  3. Check for milliwatt pings. Listen for frequency changes, and audio loss
- */
-
-
-#include <switch.h>
-
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
-/* Prototypes */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sonar_shutdown);
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_sonar_runtime);
-SWITCH_MODULE_LOAD_FUNCTION(mod_sonar_load);
-
-/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime)
- * Defines a switch_loadable_module_function_table_t and a static const char[] modname
- */
-SWITCH_MODULE_DEFINITION(mod_sonar, mod_sonar_load, mod_sonar_shutdown, NULL);
-
-
-struct sonar_ping_helper_s {
-	switch_time_t start, end, diff;
-	int samples[1024];
-	int received;
-	int sum, min, max;
-};
-
-typedef struct sonar_ping_helper_s sonar_ping_helper_t;
-
-switch_bool_t sonar_ping_callback(switch_core_session_t *session, const char *app, const char *app_data){
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	sonar_ping_helper_t *ph = switch_channel_get_private(channel, "__sonar_ping__");
-	int diff;
-
-	if (!ph) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate private sonar helper data\n");
-		return SWITCH_TRUE;
-	}
-
-	if ( ph->end ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sonar not yet reset. Likely a repeat detection.\n");
-		return SWITCH_TRUE;
-	}
-
-	ph->end = switch_time_now();
-	diff = ph->end - ph->start;
-
-	ph->start = 0;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sonar ping took %ld milliseconds\n", (long)diff / 1000);
-
-	diff /= 1000;
-	ph->sum += diff;
-	ph->max = MAX(ph->max, diff);
-	ph->min = MIN(ph->min, diff);
-	ph->samples[ph->received++] = diff;
-
-	return SWITCH_TRUE;
-}
-
-SWITCH_STANDARD_APP(sonar_app)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	char *tone = "%(500,0,1004)";
-	const char *arg = (char *) data;
-	int loops;
-	int lost = 0;
-	int x;
-	int avg = 0, sdev = 0, mdev = 0;
-	int sum2;
-	switch_event_t *event;
-	sonar_ping_helper_t ph = { 0 };
-
-	if (zstr(arg)) {
-		loops = 5;
-	} else {
-		loops = atoi(data);
-	}
-
-	if (loops < 0) {
-		loops = 5;
-	} else if (loops > 1024) {
-		loops = 1024;
-	}
-
-	switch_channel_answer(channel);
-	switch_ivr_sleep(session, 1000, SWITCH_FALSE, NULL);
-	switch_channel_set_private(channel, "__sonar_ping__", &ph);
-
-	switch_ivr_tone_detect_session(session,
-								   "soar_ping", "1004",
-								   "r", 0,
-								   1, NULL, NULL, sonar_ping_callback);
-
-	switch_ivr_sleep(session, 1000, SWITCH_FALSE, NULL);
-
-	ph.min = 999999;
-	for( x = 0; x < loops; x++ ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending sonar ping\n");
-		ph.end = 0;
-		ph.start = switch_time_now();
-		switch_ivr_gentones(session, tone, 1, NULL);
-		switch_ivr_sleep(session, 2000, SWITCH_FALSE, NULL);
-		if ( ph.start ) {
-			lost++;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Lost sonar ping\n");
-		}
-	}
-
-	switch_ivr_sleep(session, 1000, SWITCH_FALSE, NULL);
-	switch_ivr_stop_tone_detect_session(session);
-
-	if (loops == lost) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Too bad, we lost all!\n");
-		return;
-	}
-
-	if (ph.received + lost != loops) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Race happend %d + %d != %d\n", ph.received, lost, loops);
-	}
-
-	if (ph.received > 0) avg = ph.sum / ph.received;
-
-	sum2 = 0;
-	for(x = 0; x < ph.received; x++) {
-		sum2 += abs(ph.samples[x] - avg);
-	}
-
-	if (ph.received > 0) {
-		mdev = sum2 / ph.received;
-	}
-
-
-	sum2 = 0;
-	for(x = 0; x < ph.received; x++) {
-		sum2 += (ph.samples[x] - avg) * (ph.samples[x] - avg);
-	}
-
-	if (ph.received > 1) {
-		sdev = sqrt(sum2 / (ph.received - 1));
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
-		"Sonar Ping (in ms): min:%d max:%d avg:%d sdev:%d mdev:%d sent:%d recv: %d lost:%d lost/send:%2.2f%%\n",
-		ph.min, ph.max, avg, sdev, mdev, loops, ph.received, lost, lost * 1.0 / loops);
-
-	if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, "sonar::ping") == SWITCH_STATUS_SUCCESS) {
-		const char *verbose_event;
-
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ping_min", "%d", ph.min);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ping_max", "%d", ph.max);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ping_avg", "%d", avg);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ping_sdev", "%d", sdev);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ping_mdev", "%d", mdev);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ping_sent", "%d", loops);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ping_recv", "%d", ph.received);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ping_lost", "%d", lost);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lost_rate", "%2.2f%%", lost * 1.0 / loops);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "destination_number",
-			switch_channel_get_variable(channel, "ping_destination_number"));
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sonar_ping_ref",
-			switch_channel_get_variable(channel, "sonar_ping_ref"));
-
-		verbose_event = switch_channel_get_variable(channel, "sonar_channel_event");
-
-		if (verbose_event && switch_true(verbose_event)) {
-			switch_channel_event_set_data(channel, event);
-		}
-
-		switch_event_fire(&event);
-	}
-
-}
-
-/* Macro expands to: switch_status_t mod_sonar_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
-SWITCH_MODULE_LOAD_FUNCTION(mod_sonar_load)
-{
-	switch_application_interface_t *app_interface;
-
-	if (switch_event_reserve_subclass("sonar::ping") != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", "sonar::ping");
-		return SWITCH_STATUS_TERM;
-	}
-
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	SWITCH_ADD_APP(app_interface, "sonar", "sonar", "sonar", sonar_app, "", SAF_NONE);
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/*
-  Called when the system shuts down
-  Macro expands to: switch_status_t mod_sonar_shutdown() */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sonar_shutdown)
-{
-
-	switch_event_free_subclass("sonar::ping");
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/applications/mod_soundtouch/Makefile.am b/src/mod/applications/mod_soundtouch/Makefile.am
deleted file mode 100644
index f2883002b7..0000000000
--- a/src/mod/applications/mod_soundtouch/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_soundtouch
-
-if HAVE_SOUNDTOUCH
-
-mod_LTLIBRARIES = mod_soundtouch.la
-mod_soundtouch_la_SOURCES  = mod_soundtouch.cpp
-mod_soundtouch_la_CFLAGS   = $(AM_CFLAGS) $(SOUNDTOUCH_CFLAGS) -DINTEGER_SAMPLES 
-mod_soundtouch_la_CXXFLAGS =  $(SOUNDTOUCH_CFLAGS) -DINTEGER_SAMPLES 
-mod_soundtouch_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SOUNDTOUCH_LIBS)
-mod_soundtouch_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
-
-else
-install: error
-all: error
-error:
-	$(error You must install libsoundtouch-dev to build mod_soundtouch)
-endif
diff --git a/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp b/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp
deleted file mode 100644
index 05461bc453..0000000000
--- a/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- * mod_soundtouch.cpp -- Example of writeable media bugs
- *
- */
-
-#include <stdexcept>
-#include <stdio.h>
-#include <SoundTouch.h>
-using namespace soundtouch;
-using namespace std;
-
-#include <switch.h>
-#define STSTART 1024 * 2
-#define STBLOCK 1024
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_soundtouch_load);
-SWITCH_MODULE_DEFINITION(mod_soundtouch, mod_soundtouch_load, NULL, NULL);
-
-static const float ADJUST_AMOUNT = 0.05f;
-struct soundtouch_helper {
-	SoundTouch *st;
-	switch_core_session_t *session;
-	bool send_not_recv;
-	bool hook_dtmf;
-	float pitch;
-	float rate;
-	float tempo;
-	bool literal;
-};
-
-/* type is p=>pitch,r=>rate,t=>tempo */
-static float normalize_soundtouch_value(char type, float value)
-{
-	float min,max;
-	switch(type)
-	{
-		case 'p':
-			min = 0.01f;
-			max = 1000.0f;
-			break;
-		case 'r':
-			min = 0.01f;
-			max = 1000.0f;
-			break;
-		case 't':
-			min = 0.01f;
-			max = 1000.0f;
-			break;
-	}
-	if (value < min)
-		value = min;
-	if (value > max)
-		value = max;
-	return value;
-}
-
-/*Computation taken from SoundTouch library for conversion*/
-static float compute_pitch_from_octaves(float octaves)
-{
-	return (float)exp(0.69314718056f * octaves);
-}
-
-static switch_status_t on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf, switch_dtmf_direction_t direction)
-{
-
-	switch_media_bug_t *bug;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	if ((bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_soundtouch_"))) {
-		struct soundtouch_helper *sth = (struct soundtouch_helper *) switch_core_media_bug_get_user_data(bug);
-
-		if (sth) {
-			if (sth->literal) {
-				sth->literal = false;
-				return SWITCH_STATUS_SUCCESS;
-			}
-
-
-			switch (dtmf->digit) {
-			case '*':
-				sth->literal=true;
-				break;
-
-			case '1':
-				sth->pitch = normalize_soundtouch_value('p',sth->pitch - ADJUST_AMOUNT);
-				sth->st->setPitch(sth->pitch);
-				break;
-			case '2':
-				sth->pitch = 1.0f;
-				sth->st->setPitch(sth->pitch);
-				break;
-			case '3':
-				sth->pitch = normalize_soundtouch_value('p',sth->pitch + ADJUST_AMOUNT);
-				sth->st->setPitch(sth->pitch);
-				break;
-
-			case '4':
-				sth->rate = normalize_soundtouch_value('r',sth->rate - ADJUST_AMOUNT);
-				sth->st->setRate(sth->rate);
-				break;
-			case '5':
-				sth->rate = 1.0f;
-				sth->st->setRate(sth->rate);
-				break;
-			case '6':
-				sth->rate = normalize_soundtouch_value('r',sth->rate + ADJUST_AMOUNT);
-				sth->st->setRate(sth->rate);
-				break;
-
-			case '7':
-				sth->tempo = normalize_soundtouch_value('t',sth->tempo - ADJUST_AMOUNT);
-				sth->st->setTempo(sth->tempo);
-				break;
-			case '8':
-				sth->tempo = 1.0f;
-				sth->st->setTempo(sth->tempo);
-				break;
-			case '9':
-				sth->tempo = normalize_soundtouch_value('t',sth->tempo + ADJUST_AMOUNT);
-				sth->st->setTempo(sth->tempo);
-				break;
-
-			case '0':
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "pitch: %f tempo: %f rate: %f\n",sth->pitch,sth->tempo,sth->rate);
-			}
-
-		}
-
-
-		return SWITCH_STATUS_FALSE;
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-static switch_bool_t soundtouch_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
-{
-	struct soundtouch_helper *sth = (struct soundtouch_helper *) user_data;
-
-	switch (type) {
-	case SWITCH_ABC_TYPE_INIT:
-		{
-			switch_codec_t *read_codec = switch_core_session_get_read_codec(sth->session);
-			sth->st = new SoundTouch();
-			sth->st->setSampleRate(read_codec->implementation->samples_per_second);
-			sth->st->setChannels(read_codec->implementation->number_of_channels);
-
-			sth->st->setSetting(SETTING_USE_QUICKSEEK, 1);
-			sth->st->setSetting(SETTING_USE_AA_FILTER, 1);
-
-			if (sth->pitch) {
-				sth->st->setPitch(sth->pitch);
-			}
-
-			if (sth->rate) {
-				sth->st->setRate(sth->rate);
-			}
-
-			if (sth->tempo) {
-				sth->st->setTempo(sth->tempo);
-			}
-
-			if (sth->hook_dtmf)
-			{
-				if (sth->send_not_recv) {
-					switch_core_event_hook_add_send_dtmf(sth->session, on_dtmf);
-				} else {
-					switch_core_event_hook_add_recv_dtmf(sth->session, on_dtmf);
-				}
-			}
-		}
-		break;
-	case SWITCH_ABC_TYPE_CLOSE:
-		{
-			delete sth->st;
-			if (sth->send_not_recv) {
-				switch_core_event_hook_remove_send_dtmf(sth->session, on_dtmf);
-			} else {
-				switch_core_event_hook_remove_recv_dtmf(sth->session, on_dtmf);
-			}
-		}
-		break;
-	case SWITCH_ABC_TYPE_READ:
-	case SWITCH_ABC_TYPE_WRITE:
-		break;
-	case SWITCH_ABC_TYPE_READ_REPLACE:
-	case SWITCH_ABC_TYPE_WRITE_REPLACE:
-		{
-			switch_frame_t *frame;
-
-			assert(sth != NULL);
-			assert(sth->st != NULL);
-
-			if (! sth->send_not_recv) {
-				frame = switch_core_media_bug_get_read_replace_frame(bug);
-			} else {
-				frame = switch_core_media_bug_get_write_replace_frame(bug);
-			}
-
-			sth->st->putSamples((SAMPLETYPE *) frame->data, frame->samples);
-
-			if (sth->st->numSamples() >= frame->samples * 2) {
-				frame->samples = sth->st->receiveSamples((SAMPLETYPE *) frame->data, frame->samples);
-				frame->datalen = frame->samples * 2;
-			} else {
-				memset(frame->data, 0, frame->datalen);
-			}
-
-			if (! sth->send_not_recv) {
-				switch_core_media_bug_set_read_replace_frame(bug, frame);
-			} else {
-				switch_core_media_bug_set_write_replace_frame(bug, frame);
-			}
-
-		}
-	default:
-		break;
-	}
-
-	return SWITCH_TRUE;
-}
-
-SWITCH_STANDARD_APP(soundtouch_start_function)
-{
-	switch_media_bug_t *bug;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	struct soundtouch_helper *sth;
-	char *argv[6];
-	int argc;
-	char *lbuf = NULL;
-	int x;
-	int n=0;
-
-	if ((bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_soundtouch_"))) {
-		if (!zstr(data) && !strcasecmp(data, "stop")) {
-			switch_channel_set_private(channel, "_soundtouch_", NULL);
-			switch_core_media_bug_remove(session, &bug);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
-		}
-		return;
-	}
-
-	sth = (struct soundtouch_helper *) switch_core_session_alloc(session, sizeof(*sth));
-	assert(sth != NULL);
-
-
-	if (data && (lbuf = switch_core_session_strdup(session, data))
-		&& (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
-		sth->pitch = 1;
-		sth->rate = 1;
-		sth->tempo = 1;
-		sth->hook_dtmf = false;
-		sth->send_not_recv = false;
-		n = 0;
-		for (x = 0; x < argc; x++) {
-			if (!strncasecmp(argv[x], "send_leg", 8)) {
-				sth->send_not_recv = true;
-			} else if (!strncasecmp(argv[x], "hook_dtmf", 9)) {
-				sth->hook_dtmf = true;
-				n++;
-			} else if (strchr(argv[x], 'p')) {
-				sth->pitch = normalize_soundtouch_value('p', atof(argv[x]));
-				n++;
-			} else if (strchr(argv[x], 'r')) {
-				sth->rate = normalize_soundtouch_value('r', atof(argv[x]));
-				n++;
-			} else if (strchr(argv[x], 'o')) {
-				sth->pitch = normalize_soundtouch_value('p', compute_pitch_from_octaves(atof(argv[x])) );
-				n++;
-			} else if (strchr(argv[x], 's')) {
-				/*12.0f taken from soundtouch conversion to octaves*/
-				sth->pitch = normalize_soundtouch_value('p', compute_pitch_from_octaves(atof(argv[x]) / 12.0f) );
-				n++;
-			} else if (strchr(argv[x], 't')) {
-				sth->tempo = normalize_soundtouch_value('t', atof(argv[x]));
-				n++;
-			}
-		}
-	}
-
-	if (n < 1) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot run, no pitch set\n");
-		return;
-	}
-
-
-	sth->session = session;
-
-	if (switch_core_media_bug_add(session, "soundtouch", NULL, soundtouch_callback, sth, 0,
-											sth->send_not_recv ? SMBF_WRITE_REPLACE : SMBF_READ_REPLACE, &bug) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failure!\n");
-		return;
-	}
-
-	switch_channel_set_private(channel, "_soundtouch_", bug);
-}
-
-/* API Interface Function */
-#define SOUNDTOUCH_API_SYNTAX "<uuid> [start|stop] [send_leg] [hook_dtmf] [-]<X>s [-]<X>o <X>p <X>r <X>t"
-SWITCH_STANDARD_API(soundtouch_api_function)
-{
-	switch_core_session_t *rsession = NULL;
-	switch_channel_t *channel = NULL;
-	switch_media_bug_t *bug;
-	struct soundtouch_helper *sth;
-	char *mycmd = NULL;
-	int argc = 0;
-	char *argv[10] = { 0 };
-	char *uuid = NULL;
-	char *action = NULL;
-	int x, n;
-
-	if (zstr(cmd)) {
-		goto usage;
-	}
-
-        if (!(mycmd = strdup(cmd))) {
-                goto usage;
-        }
-
-        if ((argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) {
-                goto usage;
-        }
-
-        uuid = argv[0];
-        action = argv[1];
-
-        if (!(rsession = switch_core_session_locate(uuid))) {
-                stream->write_function(stream, "-ERR Cannot locate session!\n");
-                goto done;
-        }
-
-	channel = switch_core_session_get_channel(rsession);
-
-	if ((bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_soundtouch_"))) {
-		if (!zstr(action) && !strcasecmp(action, "stop")) {
-			switch_channel_set_private(channel, "_soundtouch_", NULL);
-			switch_core_media_bug_remove(rsession, &bug);
-			stream->write_function(stream, "+OK Success\n");
-		} else {
-			stream->write_function(stream, "-ERR Cannot run 2 at once on the same channel!\n");
-		}
-		goto done;
-	}
-
-	if (!zstr(action) && strcasecmp(action, "start")) {
-		goto usage;
-	}
-
-	if (argc < 3) {
-		goto usage;
-	}
-
-	sth = (struct soundtouch_helper *) switch_core_session_alloc(rsession, sizeof(*sth));
-	assert(sth != NULL);
-
-
-	sth->pitch = 1;
-	sth->rate = 1;
-	sth->tempo = 1;
-	sth->hook_dtmf = false;
-	sth->send_not_recv = false;
-	n = 0;
-	for (x = 2; x < argc; x++) {
-		if (!strncasecmp(argv[x], "send_leg", 8)) {
-			sth->send_not_recv = true;
-		} else if (!strncasecmp(argv[x], "hook_dtmf", 9)) {
-			sth->hook_dtmf = true;
-			n++;
-		} else if (strchr(argv[x], 'p')) {
-			sth->pitch = normalize_soundtouch_value('p', atof(argv[x]));
-			n++;
-		} else if (strchr(argv[x], 'r')) {
-			sth->rate = normalize_soundtouch_value('r', atof(argv[x]));
-			n++;
-		} else if (strchr(argv[x], 'o')) {
-			sth->pitch = normalize_soundtouch_value('p', compute_pitch_from_octaves(atof(argv[x])) );
-			n++;
-		} else if (strchr(argv[x], 's')) {
-			/*12.0f taken from soundtouch conversion to octaves*/
-			sth->pitch = normalize_soundtouch_value('p', compute_pitch_from_octaves(atof(argv[x]) / 12.0f) );
-			n++;
-		} else if (strchr(argv[x], 't')) {
-			sth->tempo = normalize_soundtouch_value('t', atof(argv[x]));
-			n++;
-		}
-	}
-
-	if (n < 1) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rsession), SWITCH_LOG_WARNING, "Cannot run, no pitch set\n");
-		goto usage;
-	}
-
-	sth->session = rsession;
-
-	if (switch_core_media_bug_add(rsession, "soundtouch", NULL, soundtouch_callback, sth, 0,
-											sth->send_not_recv ? SMBF_WRITE_REPLACE : SMBF_READ_REPLACE, &bug) != SWITCH_STATUS_SUCCESS) {
-		stream->write_function(stream, "-ERR Failure!\n");
-		goto done;
-	} else {
-		switch_channel_set_private(channel, "_soundtouch_", bug);
-		stream->write_function(stream, "+OK Success\n");
-		goto done;
-	}
-
-
-  usage:
-        stream->write_function(stream, "-USAGE: %s\n", SOUNDTOUCH_API_SYNTAX);
-
-  done:
-        if (rsession) {
-                switch_core_session_rwunlock(rsession);
-        }
-
-        switch_safe_free(mycmd);
-        return SWITCH_STATUS_SUCCESS;
-}
-
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_soundtouch_load)
-{
-	switch_application_interface_t *app_interface;
-	switch_api_interface_t *api_interface;
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	SWITCH_ADD_APP(app_interface, "soundtouch", "Alter the audio stream", "Alter the audio stream pitch/rate/tempo",
-                   soundtouch_start_function, "[send_leg] [hook_dtmf] [-]<X>s [-]<X>o <X>p <X>r <X>t", SAF_NONE);
-
-	SWITCH_ADD_API(api_interface, "soundtouch", "soundtouch", soundtouch_api_function, SOUNDTOUCH_API_SYNTAX);
-
-	switch_console_set_complete("add soundtouch ::console::list_uuid ::[start:stop");
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_modem.c b/src/mod/applications/mod_spandsp/mod_spandsp_modem.c
index 560a78be44..1f8a88cc75 100644
--- a/src/mod/applications/mod_spandsp/mod_spandsp_modem.c
+++ b/src/mod/applications/mod_spandsp/mod_spandsp_modem.c
@@ -897,9 +897,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 
 	fail:
 
-		if (new_session) {
-			switch_core_session_destroy(new_session);
-		}
+		switch_core_session_destroy(new_session);
 
 		if (modem) {
 			modem_set_state(modem, MODEM_STATE_ONHOOK);
diff --git a/src/mod/applications/mod_stress/FFTReal.cpp b/src/mod/applications/mod_stress/FFTReal.cpp
deleted file mode 100644
index fbc268a88d..0000000000
--- a/src/mod/applications/mod_stress/FFTReal.cpp
+++ /dev/null
@@ -1,615 +0,0 @@
-/*****************************************************************************
-*                                                                            *
-*       DIGITAL SIGNAL PROCESSING TOOLS                                      *
-*       Version 1.03, 2001/06/15                                             *
-*       (c) 1999 - Laurent de Soras                                          *
-*                                                                            *
-*       FFTReal.cpp                                                          *
-*       Fourier transformation of real number arrays.                        *
-*       Portable ISO C++                                                     *
-*                                                                            *
-* Tab = 3                                                                    *
-*****************************************************************************/
-
-
-
-/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
-
-#include	"FFTReal.h"
-
-#include	<cassert>
-#include	<cmath>
-
-
-
-#if defined (_MSC_VER)
-#pragma pack (push, 8)
-#endif	// _MSC_VER
-
-
-
-/*\\\ PUBLIC MEMBER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
-
-
-
-/*==========================================================================*/
-/*      Name: Constructor                                                   */
-/*      Input parameters:                                                   */
-/*        - length: length of the array on which we want to do a FFT.       */
-/*                  Range: power of 2 only, > 0.                            */
-/*      Throws: std::bad_alloc, anything                                    */
-/*==========================================================================*/
-
-FFTReal::FFTReal (const long length)
-:	_length (length)
-,	_nbr_bits (int (floor (log (length) / log (2) + 0.5)))
-,	_bit_rev_lut (int (floor (log (length) / log (2) + 0.5)))
-,	_trigo_lut (int (floor (log (length) / log (2) + 0.5)))
-,	_sqrt2_2 (flt_t (sqrt (2) * 0.5))
-{
-	assert ((1L << _nbr_bits) == length);
-
-	_buffer_ptr = 0;
-	if (_nbr_bits > 2)
-	{
-		_buffer_ptr = new flt_t [_length];
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: Destructor                                                    */
-/*==========================================================================*/
-
-FFTReal::~FFTReal (void)
-{
-	delete [] _buffer_ptr;
-	_buffer_ptr = 0;
-}
-
-
-
-/*==========================================================================*/
-/*      Name: do_fft                                                        */
-/*      Description: Compute the FFT of the array.                          */
-/*      Input parameters:                                                   */
-/*        - x: pointer on the source array (time).                          */
-/*      Output parameters:                                                  */
-/*        - f: pointer on the destination array (frequencies).              */
-/*             f [0...length(x)/2] = real values,                           */
-/*             f [length(x)/2+1...length(x)-1] = imaginary values of        */
-/*               coefficents 1...length(x)/2-1.                             */
-/*      Throws: Nothing                                                     */
-/*==========================================================================*/
-
-void	FFTReal::do_fft (flt_t f [], const flt_t x []) const
-{
-
-/*______________________________________________
- *
- * General case
- *______________________________________________
- */
-
-	if (_nbr_bits > 2)
-	{
-		flt_t *			sf;
-		flt_t *			df;
-
-		if (_nbr_bits & 1)
-		{
-			df = _buffer_ptr;
-			sf = f;
-		}
-		else
-		{
-			df = f;
-			sf = _buffer_ptr;
-		}
-
-		/* Do the transformation in several pass */
-		{
-			int		pass;
-			long		nbr_coef;
-			long		h_nbr_coef;
-			long		d_nbr_coef;
-			long		coef_index;
-
-			/* First and second pass at once */
-			{
-				const long * const	bit_rev_lut_ptr = _bit_rev_lut.get_ptr ();
-				coef_index = 0;
-				do
-				{
-					const long		rev_index_0 = bit_rev_lut_ptr [coef_index];
-					const long		rev_index_1 = bit_rev_lut_ptr [coef_index + 1];
-					const long		rev_index_2 = bit_rev_lut_ptr [coef_index + 2];
-					const long		rev_index_3 = bit_rev_lut_ptr [coef_index + 3];
-
-					flt_t	* const	df2 = df + coef_index;
-					df2 [1] = x [rev_index_0] - x [rev_index_1];
-					df2 [3] = x [rev_index_2] - x [rev_index_3];
-
-					const flt_t		sf_0 = x [rev_index_0] + x [rev_index_1];
-					const flt_t		sf_2 = x [rev_index_2] + x [rev_index_3];
-
-					df2 [0] = sf_0 + sf_2;
-					df2 [2] = sf_0 - sf_2;
-
-					coef_index += 4;
-				}
-				while (coef_index < _length);
-			}
-
-			/* Third pass */
-			{
-				coef_index = 0;
-				const flt_t		sqrt2_2 = _sqrt2_2;
-				do
-				{
-					flt_t				v;
-
-					sf [coef_index] = df [coef_index] + df [coef_index + 4];
-					sf [coef_index + 4] = df [coef_index] - df [coef_index + 4];
-					sf [coef_index + 2] = df [coef_index + 2];
-					sf [coef_index + 6] = df [coef_index + 6];
-
-					v = (df [coef_index + 5] - df [coef_index + 7]) * sqrt2_2;
-					sf [coef_index + 1] = df [coef_index + 1] + v;
-					sf [coef_index + 3] = df [coef_index + 1] - v;
-
-					v = (df [coef_index + 5] + df [coef_index + 7]) * sqrt2_2;
-					sf [coef_index + 5] = v + df [coef_index + 3];
-					sf [coef_index + 7] = v - df [coef_index + 3];
-
-					coef_index += 8;
-				}
-				while (coef_index < _length);
-			}
-
-			/* Next pass */
-			for (pass = 3; pass < _nbr_bits; ++pass)
-			{
-				coef_index = 0;
-				nbr_coef = 1 << pass;
-				h_nbr_coef = nbr_coef >> 1;
-				d_nbr_coef = nbr_coef << 1;
-				const flt_t	* const	cos_ptr = _trigo_lut.get_ptr (pass);
-				do
-				{
-					long				i;
-					const flt_t	*	const sf1r = sf + coef_index;
-					const flt_t	*	const sf2r = sf1r + nbr_coef;
-					flt_t *			const dfr = df + coef_index;
-					flt_t *			const dfi = dfr + nbr_coef;
-
-					/* Extreme coefficients are always real */
-					dfr [0] = sf1r [0] + sf2r [0];
-					dfi [0] = sf1r [0] - sf2r [0];	// dfr [nbr_coef] =
-					dfr [h_nbr_coef] = sf1r [h_nbr_coef];
-					dfi [h_nbr_coef] = sf2r [h_nbr_coef];
-
-					/* Others are conjugate complex numbers */
-					const flt_t	* const	sf1i = sf1r + h_nbr_coef;
-					const flt_t	* const	sf2i = sf1i + nbr_coef;
-					for (i = 1; i < h_nbr_coef; ++ i)
-					{
-						const flt_t		c = cos_ptr [i];					// cos (i*PI/nbr_coef);
-						const flt_t		s = cos_ptr [h_nbr_coef - i];	// sin (i*PI/nbr_coef);
-						flt_t				v;
-
-						v = sf2r [i] * c - sf2i [i] * s;
-						dfr [i] = sf1r [i] + v;
-						dfi [-i] = sf1r [i] - v;	// dfr [nbr_coef - i] =
-
-						v = sf2r [i] * s + sf2i [i] * c;
-						dfi [i] = v + sf1i [i];
-						dfi [nbr_coef - i] = v - sf1i [i];
-					}
-
-					coef_index += d_nbr_coef;
-				}
-				while (coef_index < _length);
-
-				/* Prepare to the next pass */
-				{
-					flt_t	* const		temp_ptr = df;
-					df = sf;
-					sf = temp_ptr;
-				}
-			}
-		}
-	}
-
-/*______________________________________________
- *
- * Special cases
- *______________________________________________
- */
-
-	/* 4-point FFT */
-	else if (_nbr_bits == 2)
-	{
-		f [1] = x [0] - x [2];
-		f [3] = x [1] - x [3];
-
-		const flt_t			b_0 = x [0] + x [2];
-		const flt_t			b_2 = x [1] + x [3];
-
-		f [0] = b_0 + b_2;
-		f [2] = b_0 - b_2;
-	}
-
-	/* 2-point FFT */
-	else if (_nbr_bits == 1)
-	{
-		f [0] = x [0] + x [1];
-		f [1] = x [0] - x [1];
-	}
-
-	/* 1-point FFT */
-	else
-	{
-		f [0] = x [0];
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: do_ifft                                                       */
-/*      Description: Compute the inverse FFT of the array. Notice that      */
-/*                   IFFT (FFT (x)) = x * length (x). Data must be          */
-/*                   post-scaled.                                           */
-/*      Input parameters:                                                   */
-/*        - f: pointer on the source array (frequencies).                   */
-/*             f [0...length(x)/2] = real values,                           */
-/*             f [length(x)/2+1...length(x)] = imaginary values of          */
-/*               coefficents 1...length(x)-1.                               */
-/*      Output parameters:                                                  */
-/*        - x: pointer on the destination array (time).                     */
-/*      Throws: Nothing                                                     */
-/*==========================================================================*/
-
-void	FFTReal::do_ifft (const flt_t f [], flt_t x []) const
-{
-
-/*______________________________________________
- *
- * General case
- *______________________________________________
- */
-
-	if (_nbr_bits > 2)
-	{
-		flt_t *			sf = const_cast <flt_t *> (f);
-		flt_t *			df;
-		flt_t *			df_temp;
-
-		if (_nbr_bits & 1)
-		{
-			df = _buffer_ptr;
-			df_temp = x;
-		}
-		else
-		{
-			df = x;
-			df_temp = _buffer_ptr;
-		}
-
-		/* Do the transformation in several pass */
-		{
-			int			pass;
-			long			nbr_coef;
-			long			h_nbr_coef;
-			long			d_nbr_coef;
-			long			coef_index;
-
-			/* First pass */
-			for (pass = _nbr_bits - 1; pass >= 3; --pass)
-			{
-				coef_index = 0;
-				nbr_coef = 1 << pass;
-				h_nbr_coef = nbr_coef >> 1;
-				d_nbr_coef = nbr_coef << 1;
-				const flt_t	*const cos_ptr = _trigo_lut.get_ptr (pass);
-				do
-				{
-					long				i;
-					const flt_t	*	const sfr = sf + coef_index;
-					const flt_t	*	const sfi = sfr + nbr_coef;
-					flt_t *			const df1r = df + coef_index;
-					flt_t *			const df2r = df1r + nbr_coef;
-
-					/* Extreme coefficients are always real */
-					df1r [0] = sfr [0] + sfi [0];		// + sfr [nbr_coef]
-					df2r [0] = sfr [0] - sfi [0];		// - sfr [nbr_coef]
-					df1r [h_nbr_coef] = sfr [h_nbr_coef] * 2;
-					df2r [h_nbr_coef] = sfi [h_nbr_coef] * 2;
-
-					/* Others are conjugate complex numbers */
-					flt_t * const	df1i = df1r + h_nbr_coef;
-					flt_t * const	df2i = df1i + nbr_coef;
-					for (i = 1; i < h_nbr_coef; ++ i)
-					{
-						df1r [i] = sfr [i] + sfi [-i];		// + sfr [nbr_coef - i]
-						df1i [i] = sfi [i] - sfi [nbr_coef - i];
-
-						const flt_t		c = cos_ptr [i];					// cos (i*PI/nbr_coef);
-						const flt_t		s = cos_ptr [h_nbr_coef - i];	// sin (i*PI/nbr_coef);
-						const flt_t		vr = sfr [i] - sfi [-i];		// - sfr [nbr_coef - i]
-						const flt_t		vi = sfi [i] + sfi [nbr_coef - i];
-
-						df2r [i] = vr * c + vi * s;
-						df2i [i] = vi * c - vr * s;
-					}
-
-					coef_index += d_nbr_coef;
-				}
-				while (coef_index < _length);
-
-				/* Prepare to the next pass */
-				if (pass < _nbr_bits - 1)
-				{
-					flt_t	* const	temp_ptr = df;
-					df = sf;
-					sf = temp_ptr;
-				}
-				else
-				{
-					sf = df;
-					df = df_temp;
-				}
-			}
-
-			/* Antepenultimate pass */
-			{
-				const flt_t		sqrt2_2 = _sqrt2_2;
-				coef_index = 0;
-				do
-				{
-					df [coef_index] = sf [coef_index] + sf [coef_index + 4];
-					df [coef_index + 4] = sf [coef_index] - sf [coef_index + 4];
-					df [coef_index + 2] = sf [coef_index + 2] * 2;
-					df [coef_index + 6] = sf [coef_index + 6] * 2;
-
-					df [coef_index + 1] = sf [coef_index + 1] + sf [coef_index + 3];
-					df [coef_index + 3] = sf [coef_index + 5] - sf [coef_index + 7];
-
-					const flt_t		vr = sf [coef_index + 1] - sf [coef_index + 3];
-					const flt_t		vi = sf [coef_index + 5] + sf [coef_index + 7];
-
-					df [coef_index + 5] = (vr + vi) * sqrt2_2;
-					df [coef_index + 7] = (vi - vr) * sqrt2_2;
-
-					coef_index += 8;
-				}
-				while (coef_index < _length);
-			}
-
-			/* Penultimate and last pass at once */
-			{
-				coef_index = 0;
-				const long *	bit_rev_lut_ptr = _bit_rev_lut.get_ptr ();
-				const flt_t	*	sf2 = df;
-				do
-				{
-					{
-						const flt_t		b_0 = sf2 [0] + sf2 [2];
-						const flt_t		b_2 = sf2 [0] - sf2 [2];
-						const flt_t		b_1 = sf2 [1] * 2;
-						const flt_t		b_3 = sf2 [3] * 2;
-
-						x [bit_rev_lut_ptr [0]] = b_0 + b_1;
-						x [bit_rev_lut_ptr [1]] = b_0 - b_1;
-						x [bit_rev_lut_ptr [2]] = b_2 + b_3;
-						x [bit_rev_lut_ptr [3]] = b_2 - b_3;
-					}
-					{
-						const flt_t		b_0 = sf2 [4] + sf2 [6];
-						const flt_t		b_2 = sf2 [4] - sf2 [6];
-						const flt_t		b_1 = sf2 [5] * 2;
-						const flt_t		b_3 = sf2 [7] * 2;
-
-						x [bit_rev_lut_ptr [4]] = b_0 + b_1;
-						x [bit_rev_lut_ptr [5]] = b_0 - b_1;
-						x [bit_rev_lut_ptr [6]] = b_2 + b_3;
-						x [bit_rev_lut_ptr [7]] = b_2 - b_3;
-					}
-
-					sf2 += 8;
-					coef_index += 8;
-					bit_rev_lut_ptr += 8;
-				}
-				while (coef_index < _length);
-			}
-		}
-	}
-
-/*______________________________________________
- *
- * Special cases
- *______________________________________________
- */
-
-	/* 4-point IFFT */
-	else if (_nbr_bits == 2)
-	{
-		const flt_t		b_0 = f [0] + f [2];
-		const flt_t		b_2 = f [0] - f [2];
-
-		x [0] = b_0 + f [1] * 2;
-		x [2] = b_0 - f [1] * 2;
-		x [1] = b_2 + f [3] * 2;
-		x [3] = b_2 - f [3] * 2;
-	}
-
-	/* 2-point IFFT */
-	else if (_nbr_bits == 1)
-	{
-		x [0] = f [0] + f [1];
-		x [1] = f [0] - f [1];
-	}
-
-	/* 1-point IFFT */
-	else
-	{
-		x [0] = f [0];
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: rescale                                                       */
-/*      Description: Scale an array by divide each element by its length.   */
-/*                   This function should be called after FFT + IFFT.       */
-/*      Input/Output parameters:                                            */
-/*        - x: pointer on array to rescale (time or frequency).             */
-/*      Throws: Nothing                                                     */
-/*==========================================================================*/
-
-void	FFTReal::rescale (flt_t x []) const
-{
-	const flt_t		mul = flt_t (1.0 / _length);
-	long				i = _length - 1;
-
-	do
-	{
-		x [i] *= mul;
-		--i;
-	}
-	while (i >= 0);
-}
-
-
-
-/*\\\ NESTED CLASS MEMBER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
-
-
-
-/*==========================================================================*/
-/*      Name: Constructor                                                   */
-/*      Input parameters:                                                   */
-/*        - nbr_bits: number of bits of the array on which we want to do a  */
-/*                    FFT. Range: > 0                                       */
-/*      Throws: std::bad_alloc                                              */
-/*==========================================================================*/
-
-FFTReal::BitReversedLUT::BitReversedLUT (const int nbr_bits)
-{
-	long				length;
-	long				cnt;
-	long				br_index;
-	long				bit;
-
-	length = 1L << nbr_bits;
-	_ptr = new long [length];
-
-	br_index = 0;
-	_ptr [0] = 0;
-	for (cnt = 1; cnt < length; ++cnt)
-	{
-		/* ++br_index (bit reversed) */
-		bit = length >> 1;
-		while (((br_index ^= bit) & bit) == 0)
-		{
-			bit >>= 1;
-		}
-
-		_ptr [cnt] = br_index;
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: Destructor                                                    */
-/*==========================================================================*/
-
-FFTReal::BitReversedLUT::~BitReversedLUT (void)
-{
-	delete [] _ptr;
-	_ptr = 0;
-}
-
-
-
-/*==========================================================================*/
-/*      Name: Constructor                                                   */
-/*      Input parameters:                                                   */
-/*        - nbr_bits: number of bits of the array on which we want to do a  */
-/*                    FFT. Range: > 0                                       */
-/*      Throws: std::bad_alloc, anything                                    */
-/*==========================================================================*/
-
-FFTReal::TrigoLUT::TrigoLUT (const int nbr_bits)
-{
-	long		total_len;
-
-	_ptr = 0;
-	if (nbr_bits > 3)
-	{
-		total_len = (1L << (nbr_bits - 1)) - 4;
-		_ptr = new flt_t [total_len];
-
-		const double	PI = atan (1) * 4;
-		for (int level = 3; level < nbr_bits; ++level)
-		{
-			const long		level_len = 1L << (level - 1);
-			flt_t	* const	level_ptr = const_cast<flt_t *> (get_ptr (level));
-			const double	mul = PI / (level_len << 1);
-
-			for (long i = 0; i < level_len; ++ i)
-			{
-				level_ptr [i] = (flt_t) cos (i * mul);
-			}
-		}
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: Destructor                                                    */
-/*==========================================================================*/
-
-FFTReal::TrigoLUT::~TrigoLUT (void)
-{
-	delete [] _ptr;
-	_ptr = 0;
-}
-
-
-
-#if defined (_MSC_VER)
-#pragma pack (pop)
-#endif	// _MSC_VER
-
-
-
-/*****************************************************************************
-
-	LEGAL
-
-	Source code may be freely used for any purpose, including commercial
-	applications. Programs must display in their "About" dialog-box (or
-	documentation) a text telling they use these routines by Laurent de Soras.
-	Modified source code can be distributed, but modifications must be clearly
-	indicated.
-
-	CONTACT
-
-	Laurent de Soras
-	92 avenue Albert 1er
-	92500 Rueil-Malmaison
-	France
-
-	ldesoras@club-internet.fr
-
-*****************************************************************************/
-
-
-
-/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
diff --git a/src/mod/applications/mod_stress/FFTReal.h b/src/mod/applications/mod_stress/FFTReal.h
deleted file mode 100644
index 76d1e0ee00..0000000000
--- a/src/mod/applications/mod_stress/FFTReal.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************
-*                                                                            *
-*       DIGITAL SIGNAL PROCESSING TOOLS                                      *
-*       Version 1.03, 2001/06/15                                             *
-*       (c) 1999 - Laurent de Soras                                          *
-*                                                                            *
-*       FFTReal.h                                                            *
-*       Fourier transformation of real number arrays.                        *
-*       Portable ISO C++                                                     *
-*                                                                            *
-* Tab = 3                                                                    *
-*****************************************************************************/
-
-
-
-#if defined (FFTReal_CURRENT_HEADER)
-#error Recursive inclusion of FFTReal header file.
-#endif
-#define	FFTReal_CURRENT_HEADER
-
-#if ! defined (FFTReal_HEADER_INCLUDED)
-#define	FFTReal_HEADER_INCLUDED
-
-
-
-#if defined (_MSC_VER)
-#pragma pack (push, 8)
-#endif // _MSC_VER
-
-
-
-class FFTReal {
-
-/*\\\ PUBLIC \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
-
-  public:
-
-	/* Change this typedef to use a different floating point type in your FFTs
-	   (i.e. float, double or long double). */
-	typedef float flt_t;
-
-	explicit FFTReal(const long length);
-	    ~FFTReal();
-	void do_fft(flt_t f[], const flt_t x[]) const;
-	void do_ifft(const flt_t f[], flt_t x[]) const;
-	void rescale(flt_t x[]) const;
-
-
-
-/*\\\ PRIVATE \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
-
-  private:
-
-	/* Bit-reversed look-up table nested class */
-	      class BitReversedLUT {
-	  public:
-		explicit BitReversedLUT(const int nbr_bits);
-		   ~BitReversedLUT();
-		const long *get_ptr() const {
-			return (_ptr);
-	  } private:
-		long *_ptr;
-	};
-
-	/* Trigonometric look-up table nested class */
-	class TrigoLUT {
-	  public:
-		explicit TrigoLUT(const int nbr_bits);
-		   ~TrigoLUT();
-		const flt_t *get_ptr(const int level) const {
-			return (_ptr + (1L << (level - 1)) - 4);
-		};
-	  private:
-		      flt_t *_ptr;
-	};
-
-	const BitReversedLUT _bit_rev_lut;
-	const TrigoLUT _trigo_lut;
-	const flt_t _sqrt2_2;
-	const long _length;
-	const int _nbr_bits;
-	flt_t *_buffer_ptr;
-
-
-
-/*\\\ FORBIDDEN MEMBER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
-
-  private:
-
-	FFTReal(const FFTReal & other);
-	const FFTReal & operator =(const FFTReal & other);
-	int operator ==(const FFTReal & other);
-	int operator !=(const FFTReal & other);
-};
-
-
-
-#if defined (_MSC_VER)
-#pragma pack (pop)
-#endif // _MSC_VER
-
-
-
-#endif // FFTReal_HEADER_INCLUDED
-
-#undef FFTReal_CURRENT_HEADER
-
-
-
-/*****************************************************************************
-
-	LEGAL
-
-	Source code may be freely used for any purpose, including commercial
-	applications. Programs must display in their "About" dialog-box (or
-	documentation) a text telling they use these routines by Laurent de Soras.
-	Modified source code can be distributed, but modifications must be clearly
-	indicated.
-
-	CONTACT
-
-	Laurent de Soras
-	92 avenue Albert 1er
-	92500 Rueil-Malmaison
-	France
-
-	ldesoras@club-internet.fr
-
-*****************************************************************************/
-
-
-
-/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
diff --git a/src/mod/applications/mod_stress/Makefile.am b/src/mod/applications/mod_stress/Makefile.am
deleted file mode 100644
index 14f7d363c9..0000000000
--- a/src/mod/applications/mod_stress/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_stress
-
-mod_LTLIBRARIES = mod_stress.la
-mod_stress_la_SOURCES  = mod_stress.cpp FFTReal.cpp
-mod_stress_la_CFLAGS   = $(AM_CFLAGS)
-mod_stress_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_stress_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/applications/mod_stress/mod_stress.cpp b/src/mod/applications/mod_stress/mod_stress.cpp
deleted file mode 100644
index 66da2d26dc..0000000000
--- a/src/mod/applications/mod_stress/mod_stress.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- * mod_stress.cpp -- Detect Voice Stress
- *
- */
-
-#include <stdexcept>
-#include <stdio.h>
-#include "FFTReal.h"
-using namespace std;
-
-#include <switch.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_stress_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_stress_shutdown);
-SWITCH_MODULE_DEFINITION(mod_stress, mod_stress_load, mod_stress_shutdown, NULL);
-
-struct stress_helper {
-	switch_core_session_t *session;
-	int read;
-	uint32_t frame_size;
-    FFTReal *fft;
-    float *data;
-    float *result;
-    float *pow_spectrum;
-    float bind;
-    int start;
-    int end;
-    float avg_tremor_pwr;
-    float avg_total_pwr;
-    float total_pwr;
-    float tremor_ratio;
-    float stress;
-    uint32_t rate;
-    switch_buffer_t *audio_buffer;
-    int16_t *audio;
-};
-
-static switch_bool_t stress_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
-{
-	struct stress_helper *sth = (struct stress_helper *) user_data;
-
-	switch (type) {
-	case SWITCH_ABC_TYPE_INIT:
-		{
-			switch_codec_t *read_codec = switch_core_session_get_read_codec(sth->session);
-
-            sth->rate = read_codec->implementation->actual_samples_per_second;
-
-            if (sth->rate == 8000) {
-                sth->frame_size = 8192;
-            } else if (sth->rate == 16000) {
-                sth->frame_size = 16384;
-            } else if (sth->rate == 32000) {
-                sth->frame_size = 32768;
-            } else {
-                return SWITCH_FALSE;
-            }
-
-            sth->data = (float *) switch_core_session_alloc(sth->session, sizeof(*sth->data) * sth->frame_size);
-            sth->result = (float *) switch_core_session_alloc(sth->session, sizeof(*sth->result) * sth->frame_size);
-            sth->pow_spectrum = (float *) switch_core_session_alloc(sth->session, sizeof(*sth->pow_spectrum) * sth->frame_size);
-            sth->audio = (int16_t *) switch_core_session_alloc(sth->session, sizeof(*sth->audio) * sth->frame_size);
-
-            sth->fft = new FFTReal (sth->frame_size);
-            switch_buffer_create_dynamic(&sth->audio_buffer, sth->frame_size, sth->frame_size * 3, 0);
-
-            sth->bind = (float) sth->rate / sth->frame_size;
-            sth->start = (int) (8.0 / sth->bind);
-            sth->end = (int) (14.0 / sth->bind);
-
-		}
-		break;
-	case SWITCH_ABC_TYPE_CLOSE:
-		{
-            switch_buffer_destroy(&sth->audio_buffer);
-            delete sth->fft;
-		}
-		break;
-	case SWITCH_ABC_TYPE_READ:
-	case SWITCH_ABC_TYPE_WRITE:
-		break;
-	case SWITCH_ABC_TYPE_READ_REPLACE:
-	case SWITCH_ABC_TYPE_WRITE_REPLACE:
-		{
-			switch_frame_t *frame;
-
-			if (sth->read) {
-				frame = switch_core_media_bug_get_read_replace_frame(bug);
-			} else {
-				frame = switch_core_media_bug_get_write_replace_frame(bug);
-			}
-
-            if (!switch_test_flag(frame, SFF_CNG)) {
-                switch_buffer_write(sth->audio_buffer, frame->data, frame->datalen);
-            }
-
-            sth->stress = 0.0;
-
-            if (switch_buffer_inuse(sth->audio_buffer) >= sth->frame_size * sizeof(int16_t)) {
-                switch_size_t bytes;
-                uint32_t samples, i;
-                const float threshold = 1.5;
-
-                bytes = switch_buffer_read(sth->audio_buffer, sth->audio, sth->frame_size * sizeof(int16_t));
-                samples = bytes / sizeof(int16_t);
-
-                switch_short_to_float(sth->audio, sth->data, samples);
-                sth->fft->do_fft(sth->result, sth->data);
-
-                for (i = 0; i < samples; ++i) {
-                    sth->pow_spectrum[i] = pow(fabs(sth->result[i]), 2) / (float) samples;
-                }
-
-                sth->avg_tremor_pwr = 0.0;
-                sth->avg_total_pwr = 0.0;
-                sth->total_pwr = 0.0;
-
-                for (i = sth->start; i <= sth->end; ++i) {
-                    sth->avg_tremor_pwr += sth->pow_spectrum[i];
-                }
-                sth->avg_tremor_pwr /= ((sth->end - sth->start) + 1);
-
-                for (i = 0; i < samples; ++i) {
-                    sth->total_pwr += sth->pow_spectrum[i];
-                }
-                sth->avg_total_pwr = sth->total_pwr / samples;
-
-                if (sth->total_pwr < threshold) {
-                    sth->tremor_ratio = 0.0;
-                } else {
-                    sth->tremor_ratio = sth->avg_tremor_pwr / sth->avg_total_pwr;
-                }
-
-                if (sth->total_pwr >= 1.0) {
-                    float d = pow(sth->tremor_ratio, 4);
-                    if (d > 0.0) {
-                        sth->stress = (10.0 / d) / 10000;
-                        if (sth->stress >= 20000.0) {
-                            sth->stress = 20000.0;
-                        }
-                    }
-                }
-            }
-
-            if (sth->stress) {
-                switch_event_t *event, *dup;
-                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_DEBUG, "Stress %0.2f\n", sth->stress);
-
-                if (switch_event_create(&event, SWITCH_EVENT_DETECTED_SPEECH) == SWITCH_STATUS_SUCCESS) {
-                    switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Speech-Type", "stress-level");
-                    switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Stress-Level", "%0.2f", sth->stress);
-		    switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(sth->session));
-                    if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) {
-                        switch_event_fire(&dup);
-                    }
-                    if (switch_core_session_queue_event(sth->session, &event) != SWITCH_STATUS_SUCCESS) {
-                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_ERROR, "Event queue failed!\n");
-                        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true");
-                        switch_event_fire(&event);
-                    }
-                }
-            }
-		}
-	default:
-		break;
-	}
-
-	return SWITCH_TRUE;
-}
-
-SWITCH_STANDARD_APP(stress_start_function)
-{
-	switch_media_bug_t *bug;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	struct stress_helper *sth;
-	char *argv[6];
-	char *lbuf = NULL;
-	int x = 0;
-
-	if ((bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_stress_"))) {
-		if (!zstr(data) && !strcasecmp(data, "stop")) {
-			switch_channel_set_private(channel, "_stress_", NULL);
-			switch_core_media_bug_remove(session, &bug);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
-		}
-		return;
-	}
-
-	sth = (struct stress_helper *) switch_core_session_alloc(session, sizeof(*sth));
-	assert(sth != NULL);
-
-
-	if (data && (lbuf = switch_core_session_strdup(session, data))
-		&& switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) {
-        if (!strncasecmp(argv[x], "read", 4)) {
-            sth->read = 1;
-        }
-	}
-
-	sth->session = session;
-
-	if (switch_core_media_bug_add(session, "stress", NULL, stress_callback, sth, 0, sth->read ? SMBF_READ_REPLACE : SMBF_WRITE_REPLACE, &bug) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failure!\n");
-		return;
-	}
-
-	switch_channel_set_private(channel, "_stress_", bug);
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_stress_load)
-{
-    switch_application_interface_t *app_interface;
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	SWITCH_ADD_APP(app_interface, "stress", "Analyze the stream for voice stress", "Analyze the stream for voice stress",
-                   stress_start_function, "[read|write|stop]", SAF_NONE);
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_stress_shutdown)
-{
-    return SWITCH_STATUS_UNLOAD;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/applications/mod_rss/mod_rss.2017.vcxproj b/src/mod/applications/mod_test/mod_test.2017.vcxproj
similarity index 88%
rename from src/mod/applications/mod_rss/mod_rss.2017.vcxproj
rename to src/mod/applications/mod_test/mod_test.2017.vcxproj
index 5e121057c2..c378c54ec6 100644
--- a/src/mod/applications/mod_rss/mod_rss.2017.vcxproj
+++ b/src/mod/applications/mod_test/mod_test.2017.vcxproj
@@ -1,141 +1,139 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_rss</ProjectName>
-    <ProjectGuid>{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}</ProjectGuid>
-    <RootNamespace>mod_rss</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_rss.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\libs\win32\apr\libapr.2017.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>mod_test</ProjectName>
+    <RootNamespace>mod_test</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{E9FF8127-D5F0-2398-59EB-702CE55F7800}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\w32\module_release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\w32\module_debug.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\w32\module_release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\w32\module_debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <DisableSpecificWarnings>4306;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <DisableSpecificWarnings>4306;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <DisableSpecificWarnings>4306;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <DisableSpecificWarnings>4306;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="mod_test.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
+      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/mod/applications/mod_translate/mod_translate.c b/src/mod/applications/mod_translate/mod_translate.c
index efbcd3f14b..34b1ad54fc 100644
--- a/src/mod/applications/mod_translate/mod_translate.c
+++ b/src/mod/applications/mod_translate/mod_translate.c
@@ -130,6 +130,7 @@ static void translate_number(char *number, char *profile, char **translated, swi
 	hi = switch_core_hash_find_rdlock(globals.translate_profiles, (const char *)profile, globals.profile_hash_rwlock);
 	if (!hi) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "can't find key for profile matching [%s]\n", profile);
+
 		return;
 	}
 
@@ -142,6 +143,7 @@ static void translate_number(char *number, char *profile, char **translated, swi
 				switch_regex_safe_free(re);
 				goto end;
 			}
+
 			memset(substituted, 0, len);
 
 			switch_perform_substitution(re, proceed, rule->replace, number, substituted, len, ovector);
@@ -153,16 +155,21 @@ static void translate_number(char *number, char *profile, char **translated, swi
 				} else if (event) {
 					subbed = switch_event_expand_headers(event, substituted);
 				}
+
+				if (subbed != substituted) {
+					switch_safe_free(substituted);
+				}
+
 				if (session) {
 					substituted = switch_core_session_strdup(session, subbed);
 				} else {
 					substituted = switch_core_strdup(pool, subbed);
 				}
-				if (subbed != substituted) {
-					switch_safe_free(subbed);
-				}
+
+				switch_safe_free(subbed);
 			}
 
+			switch_regex_safe_free(re);
 			break;
 		}
 	}
diff --git a/src/mod/asr_tts/mod_cepstral/Makefile.am b/src/mod/asr_tts/mod_cepstral/Makefile.am
deleted file mode 100644
index 2b62243bc3..0000000000
--- a/src/mod/asr_tts/mod_cepstral/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_cepstral
-
-mod_LTLIBRARIES = mod_cepstral.la
-mod_cepstral_la_SOURCES  = mod_cepstral.c
-mod_cepstral_la_CFLAGS   = $(AM_CFLAGS) -w
-mod_cepstral_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_cepstral_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
-
-if ISMAC
-mod_cepstral_la_LDFLAGS += -framework swift
-mod_cepstral_la_CFLAGS  += -I/Library/Frameworks/swift.framework/Versions/5/Headers/
-else
-mod_cepstral_la_LDFLAGS += -Wl,-rpath -Wl,/opt/swift/lib -L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lm
-mod_cepstral_la_CFLAGS  += -I$(SWIFT_HOME)/include -I/opt/swift/include 
-endif
-
diff --git a/src/mod/asr_tts/mod_cepstral/WinReadme.txt b/src/mod/asr_tts/mod_cepstral/WinReadme.txt
deleted file mode 100644
index 50ca93d3f8..0000000000
--- a/src/mod/asr_tts/mod_cepstral/WinReadme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The Cepstral SDK for Windows should be placed in c:\dev\cepstral
-ex. C:\dev\cepstral\sdk\include
-This SDK can be obtained from http://cepstral.com/
-If you want a prebuilt version you may download one from http://files.freeswitch.org/windows/installer/
\ No newline at end of file
diff --git a/src/mod/asr_tts/mod_cepstral/conf/cepstral.conf.xml b/src/mod/asr_tts/mod_cepstral/conf/cepstral.conf.xml
deleted file mode 100644
index cf431de700..0000000000
--- a/src/mod/asr_tts/mod_cepstral/conf/cepstral.conf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration name="cepstral.conf" description="Cepstral TTS configuration">
-  <settings>
-    <!--
-        Possible encodings:
-        * utf-8
-        * us-ascii
-        * iso8859-1 (default)
-        * iso8859-15
-    -->
-    <param name="encoding" value="utf-8"/>
-  </settings>
-</configuration>
\ No newline at end of file
diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.2017.vcxproj b/src/mod/asr_tts/mod_cepstral/mod_cepstral.2017.vcxproj
deleted file mode 100644
index 6f8d4be870..0000000000
--- a/src/mod/asr_tts/mod_cepstral/mod_cepstral.2017.vcxproj
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_cepstral</ProjectName>
-    <ProjectGuid>{692F6330-4D87-4C82-81DF-40DB5892636E}</ProjectGuid>
-    <RootNamespace>mod_cepstral</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>C:\dev\cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>swift.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\dev\cepstral\sdk\lib\lib-windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>C:\dev\cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>swift.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\dev\cepstral\sdk\lib\lib-windows_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>C:\dev\cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>swift.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\dev\cepstral\sdk\lib\lib-windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>C:\dev\cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>swift.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\dev\cepstral\sdk\lib\lib-windows_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_cepstral.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.c b/src/mod/asr_tts/mod_cepstral/mod_cepstral.c
deleted file mode 100644
index b66581ca2b..0000000000
--- a/src/mod/asr_tts/mod_cepstral/mod_cepstral.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_cepstral.c -- Cepstral Interface
- *
- * Contains some material derived from the Cepstral Swift SDK, by
- * permission.  You are free to copy and modify the source under the
- * terms of FreeSWITCH itself, without additional permission from
- * Cepstral
- *
- *
- */
-#ifdef __ICC
-#pragma warning (disable:188)
-#endif
-#include <swift.h>
-#include <switch.h>
-
-#define MY_BUF_LEN 1024 * 32
-#define MY_BLOCK_SIZE MY_BUF_LEN
-
-#undef SWIFT_FAILED
-#define SWIFT_FAILED(r) ((void *)(r) < (void *)0)
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_cepstral_load);
-SWITCH_MODULE_DEFINITION_EX(mod_cepstral, mod_cepstral_load, NULL, NULL, SMODF_GLOBAL_SYMBOLS);
-
-static swift_engine *engine;
-
-
-typedef struct {
-	swift_background_t tts_stream;
-	swift_port *port;
-	swift_params *params;
-	swift_voice *voice;
-	switch_mutex_t *audio_lock;
-	switch_buffer_t *audio_buffer;
-	int done;
-	int done_gen;
-} cepstral_t;
-
-
-static struct {
-	char *encoding;
-} globals;
-
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_encoding, globals.encoding);
-
-
-
-/* This callback caches the audio in the buffer */
-static swift_result_t write_audio(swift_event * event, swift_event_t type, void *udata)
-{
-	cepstral_t *cepstral;
-	swift_event_t rv = SWIFT_SUCCESS;
-	void *buf = NULL;
-	int len = 0, i = 0;
-
-	cepstral = udata;
-	assert(cepstral != NULL);
-
-	if (!cepstral->port || cepstral->done || cepstral->done_gen) {
-		return SWIFT_UNKNOWN_ERROR;
-	}
-
-	/* Only proceed when we have success */
-	if (!SWIFT_FAILED((rv = swift_event_get_audio(event, &buf, &len)))) {
-		while (!cepstral->done) {
-			switch_mutex_lock(cepstral->audio_lock);
-			if (switch_buffer_write(cepstral->audio_buffer, buf, len) > 0) {
-				switch_mutex_unlock(cepstral->audio_lock);
-				break;
-			}
-			switch_mutex_unlock(cepstral->audio_lock);
-			if (!cepstral->done) {
-				for (i = 0; i < 10; i++) {
-					switch_yield(10000);
-					if (cepstral->done) {
-						break;
-					}
-				}
-			}
-
-		}
-	} else {
-		cepstral->done = 1;
-	}
-
-	if (cepstral->done) {
-		rv = SWIFT_UNKNOWN_ERROR;
-	}
-
-	return rv;
-}
-
-static switch_status_t cepstral_speech_open(switch_speech_handle_t *sh, const char *voice_name, int rate, int channels, switch_speech_flag_t *flags)
-{
-	cepstral_t *cepstral = switch_core_alloc(sh->memory_pool, sizeof(*cepstral));
-	char srate[25];
-
-	if (!cepstral) {
-		return SWITCH_STATUS_MEMERR;
-	}
-
-	if (switch_buffer_create_dynamic(&cepstral->audio_buffer, MY_BLOCK_SIZE, MY_BUF_LEN, 0) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write Buffer Failed!\n");
-		return SWITCH_STATUS_MEMERR;
-	}
-
-
-	switch_mutex_init(&cepstral->audio_lock, SWITCH_MUTEX_NESTED, sh->memory_pool);
-
-
-	cepstral->params = swift_params_new(NULL);
-	swift_params_set_string(cepstral->params, "audio/encoding", "pcm16");
-	switch_snprintf(srate, sizeof(srate), "%d", rate);
-	swift_params_set_string(cepstral->params, "audio/sampling-rate", srate);
-
-
-	/* Open a Swift Port through which to make TTS calls */
-	if (!(cepstral->port = swift_port_open(engine, cepstral->params))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open Swift Port.\n");
-		goto all_done;
-	}
-
-
-	if (voice_name && SWIFT_FAILED(swift_port_set_voice_by_name(cepstral->port, voice_name))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid voice %s!\n", voice_name);
-		voice_name = NULL;
-	}
-
-	if (zstr(voice_name)) {
-		/* Find the first voice on the system */
-		if ((cepstral->voice = swift_port_find_first_voice(cepstral->port, NULL, NULL)) == NULL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find any voices!\n");
-			goto all_done;
-		}
-
-		/* Set the voice found by find_first_voice() as the port's current voice */
-		if (SWIFT_FAILED(swift_port_set_voice(cepstral->port, cepstral->voice))) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to set voice.\n");
-			goto all_done;
-		}
-
-		voice_name = (char *) swift_voice_get_attribute(cepstral->voice, "name");
-	}
-
-	if (voice_name) {
-		switch_copy_string(sh->voice, voice_name, sizeof(sh->voice));
-	}
-
-	swift_port_set_callback(cepstral->port, &write_audio, SWIFT_EVENT_AUDIO, cepstral);
-
-	sh->private_info = cepstral;
-	return SWITCH_STATUS_SUCCESS;
-
-  all_done:
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t cepstral_speech_close(switch_speech_handle_t *sh, switch_speech_flag_t *flags)
-{
-	cepstral_t *cepstral;
-
-	assert(sh != NULL);
-	cepstral = sh->private_info;
-	assert(cepstral != NULL);
-
-
-	cepstral->done = 1;
-	cepstral->done_gen = 1;
-	swift_port_stop(cepstral->port, SWIFT_ASYNC_ANY, SWIFT_EVENT_NOW);
-	/* Close the Swift Port and Engine */
-	if (NULL != cepstral->port)
-		swift_port_close(cepstral->port);
-	//if (NULL != cepstral->engine) swift_engine_close(cepstral->engine);
-
-	cepstral->port = NULL;
-	//cepstral->engine = NULL;
-
-	switch_buffer_destroy(&cepstral->audio_buffer);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t cepstral_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags)
-{
-	cepstral_t *cepstral;
-	const char *fp = "file:";
-	int len = (int) strlen(fp);
-
-	assert(sh != NULL);
-	cepstral = sh->private_info;
-	assert(cepstral != NULL);
-
-	cepstral->done_gen = 0;
-	cepstral->done = 0;
-
-	cepstral->tts_stream = NULL;
-
-	if (zstr(text)) {
-		return SWITCH_STATUS_FALSE;
-	}
-	if (!strncasecmp(text, fp, len)) {
-		text += len;
-		if (zstr(text)) {
-			return SWITCH_STATUS_FALSE;
-		}
-		swift_port_speak_file(cepstral->port, text, globals.encoding, &cepstral->tts_stream, NULL);
-	} else {
-		char *to_say;
-		if (zstr(text)) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if ((to_say = switch_mprintf("<break time=\"1000ms\"/> %s <break time=\"1000ms\"/>", text))) {
-			swift_port_speak_text(cepstral->port, to_say, 0, globals.encoding, &cepstral->tts_stream, NULL);
-			switch_safe_free(to_say);
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static void cepstral_speech_flush_tts(switch_speech_handle_t *sh)
-{
-	cepstral_t *cepstral;
-
-	cepstral = sh->private_info;
-	assert(cepstral != NULL);
-
-	cepstral->done_gen = 1;
-	cepstral->done = 1;
-	if (cepstral->audio_buffer) {
-		switch_mutex_lock(cepstral->audio_lock);
-		switch_buffer_zero(cepstral->audio_buffer);
-		switch_mutex_unlock(cepstral->audio_lock);
-	}
-	swift_port_stop(cepstral->port, SWIFT_ASYNC_ANY, SWIFT_EVENT_NOW);
-}
-
-static switch_status_t cepstral_speech_read_tts(switch_speech_handle_t *sh, void *data, size_t *datalen, switch_speech_flag_t *flags)
-{
-	cepstral_t *cepstral;
-	size_t desired = *datalen;
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	size_t used, padding = 0;
-
-	assert(sh != NULL);
-	cepstral = sh->private_info;
-	assert(cepstral != NULL);
-
-	while (!cepstral->done) {
-		if (!cepstral->done_gen) {
-			int check = swift_port_status(cepstral->port, cepstral->tts_stream);
-
-			if (!check == SWIFT_STATUS_RUNNING) {
-				cepstral->done_gen = 1;
-			}
-		}
-
-		switch_mutex_lock(cepstral->audio_lock);
-		used = switch_buffer_inuse(cepstral->audio_buffer);
-		switch_mutex_unlock(cepstral->audio_lock);
-
-
-		if (!used && cepstral->done_gen) {
-			status = SWITCH_STATUS_BREAK;
-			break;
-		}
-
-		/* wait for the right amount of data (unless there is no blocking flag) */
-		if (used < desired) {
-			if (cepstral->done_gen) {
-				padding = desired - used;
-				desired = used;
-			}
-			if (!(*flags & SWITCH_SPEECH_FLAG_BLOCKING)) {
-				*datalen = 0;
-				status = SWITCH_STATUS_SUCCESS;
-				break;
-			}
-			switch_cond_next();
-			continue;
-		}
-
-		/* There is enough, read it and return */
-		switch_mutex_lock(cepstral->audio_lock);
-		*datalen = switch_buffer_read(cepstral->audio_buffer, data, desired);
-		if (padding) {
-			size_t x = 0;
-			unsigned char *p = data;
-
-			for (x = 0; x < padding; x++) {
-				*(p + x) = 0;
-				(*datalen)++;
-			}
-		}
-
-		switch_mutex_unlock(cepstral->audio_lock);
-		status = SWITCH_STATUS_SUCCESS;
-
-		break;
-	}
-
-	return status;
-}
-
-static void cepstral_text_param_tts(switch_speech_handle_t *sh, char *param, const char *val)
-{
-	cepstral_t *cepstral;
-
-	cepstral = sh->private_info;
-	assert(cepstral != NULL);
-
-	if (!strcasecmp(param, "voice")) {
-		const char *voice_name = val;
-		if (!strcasecmp(voice_name, "next")) {
-			if ((cepstral->voice = swift_port_find_next_voice(cepstral->port))) {
-				if (SWIFT_FAILED(swift_port_set_voice(cepstral->port, cepstral->voice))) {
-					cepstral->done = cepstral->done_gen = 1;
-					return;
-				}
-				voice_name = swift_voice_get_attribute(cepstral->voice, "name");
-			} else {
-				voice_name = NULL;
-			}
-		} else {
-			if (voice_name && SWIFT_FAILED(swift_port_set_voice_by_name(cepstral->port, voice_name))) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid voice %s!\n", voice_name);
-				voice_name = NULL;
-			}
-		}
-
-		if (!voice_name) {
-			/* Find the first voice on the system */
-			if ((cepstral->voice = swift_port_find_first_voice(cepstral->port, NULL, NULL)) == NULL) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find any voices!\n");
-				cepstral->done = cepstral->done_gen = 1;
-				return;
-			}
-
-			/* Set the voice found by find_first_voice() as the port's current voice */
-			if (SWIFT_FAILED(swift_port_set_voice(cepstral->port, cepstral->voice))) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to set voice.\n");
-				cepstral->done = cepstral->done_gen = 1;
-				return;
-			}
-
-			voice_name = swift_voice_get_attribute(cepstral->voice, "name");
-		}
-
-		if (voice_name) {
-			switch_copy_string(sh->voice, voice_name, sizeof(sh->voice));
-		}
-
-		return;
-	}
-
-	swift_port_set_param_string(cepstral->port, param, val, NULL);
-}
-
-static void cepstral_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val)
-{
-	cepstral_t *cepstral;
-
-	cepstral = sh->private_info;
-	assert(cepstral != NULL);
-
-	swift_port_set_param_int(cepstral->port, param, val, NULL);
-
-}
-
-
-static void cepstral_float_param_tts(switch_speech_handle_t *sh, char *param, double val)
-{
-	cepstral_t *cepstral;
-
-	cepstral = sh->private_info;
-	assert(cepstral != NULL);
-
-	swift_port_set_param_float(cepstral->port, param, val, NULL);
-
-}
-
-static switch_status_t load_config(void)
-{
-	char *cf = "cepstral.conf";
-	switch_xml_t cfg, xml = NULL, param, settings;
-
-	/* Init to SWIFT default encoding */
-	set_global_encoding(SWIFT_DEFAULT_ENCODING);
-
-	if (xml = switch_xml_open_cfg(cf, &cfg, NULL)) {
-		if ((settings = switch_xml_child(cfg, "settings"))) {
-			for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-				char *var = (char *) switch_xml_attr_soft(param, "name");
-				char *val = (char *) switch_xml_attr_soft(param, "value");
-				if (!strcasecmp(var, "encoding")) {
-					if (!strcasecmp(val, "utf-8")) {
-						set_global_encoding(SWIFT_UTF8);
-					} else if (!strcasecmp(val, "us-ascii")) {
-						set_global_encoding(SWIFT_ASCII);
-					} else if (!strcasecmp(val, "iso8859-1")) {
-						set_global_encoding(SWIFT_ISO_8859_1);
-					} else if (!strcasecmp(val, "iso8859-15")) {
-						set_global_encoding(SWIFT_ISO_8859_15);
-					} else {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown value \"%s\" for param \"%s\". Setting to default.\n", val, var);
-					}
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Param \"%s\" unknown\n", var);
-				}
-			}
-		}
-        } else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Open of \"%s\" failed. Using default settings.\n", cf);
-	}
-
-	if (xml) {
-		switch_xml_free(xml);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_cepstral_load)
-{
-	switch_speech_interface_t *speech_interface;
-
-	memset(&globals, 0, sizeof(globals));
-	load_config();
-
-	/* Open the Swift TTS Engine */
-	if (!(engine = swift_engine_open(NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open Swift Engine.");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	speech_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SPEECH_INTERFACE);
-	speech_interface->interface_name = "cepstral";
-	speech_interface->speech_open = cepstral_speech_open;
-	speech_interface->speech_close = cepstral_speech_close;
-	speech_interface->speech_feed_tts = cepstral_speech_feed_tts;
-	speech_interface->speech_read_tts = cepstral_speech_read_tts;
-	speech_interface->speech_flush_tts = cepstral_speech_flush_tts;
-	speech_interface->speech_text_param_tts = cepstral_text_param_tts;
-	speech_interface->speech_numeric_param_tts = cepstral_numeric_param_tts;
-	speech_interface->speech_float_param_tts = cepstral_float_param_tts;
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/codecs/mod_amr/mod_amr.c b/src/mod/codecs/mod_amr/mod_amr.c
index e7c45c7aff..0769f62f3a 100644
--- a/src/mod/codecs/mod_amr/mod_amr.c
+++ b/src/mod/codecs/mod_amr/mod_amr.c
@@ -250,6 +250,7 @@ static switch_status_t switch_amr_init(switch_codec_t *codec, switch_codec_flag_
 	int x, i, argc, fmtptmp_pos;
 	char *argv[10];
 	char fmtptmp[128];
+	char *fmtp_dup = NULL;
 
 	encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
 	decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
@@ -283,13 +284,19 @@ static switch_status_t switch_amr_init(switch_codec_t *codec, switch_codec_flag_
 			switch_set_flag(context, AMR_OPT_OCTET_ALIGN);
 		}
 		if (codec->fmtp_in) {
-			argc = switch_separate_string(codec->fmtp_in, ';', argv, (sizeof(argv) / sizeof(argv[0])));
+			fmtp_dup = strdup(codec->fmtp_in);
+			switch_assert(fmtp_dup);
+
+			argc = switch_separate_string(fmtp_dup, ';', argv, (sizeof(argv) / sizeof(argv[0])));
+
 			for (x = 0; x < argc; x++) {
 				char *data = argv[x];
 				char *arg;
+
 				while (*data && *data == ' ') {
 					data++;
 				}
+
 				if ((arg = strchr(data, '='))) {
 					*arg++ = '\0';
 					if (!strcasecmp(data, "octet-align")) {
@@ -325,13 +332,17 @@ static switch_status_t switch_amr_init(switch_codec_t *codec, switch_codec_flag_
 					} else if (!strcasecmp(data, "mode-set")) {
 						int y, m_argc;
 						char *m_argv[SWITCH_AMR_MODES-1];
+
 						m_argc = switch_separate_string(arg, ',', m_argv, (sizeof(m_argv) / sizeof(m_argv[0])));
+
 						for (y = 0; y < m_argc; y++) {
 							context->enc_modes |= (1 << atoi(m_argv[y]));
 						}
 					}
 				}
 			}
+
+			free(fmtp_dup);
 		}
 
 		if (context->enc_modes) {
@@ -475,13 +486,15 @@ static switch_status_t switch_amr_decode(switch_codec_t *codec,
 	return SWITCH_STATUS_FALSE;
 #else
 	struct amr_context *context = codec->private_info;
-	unsigned char *buf = encoded_data;
+	unsigned char buf[SWITCH_AMR_OUT_MAX_SIZE];
 	uint8_t tmp[SWITCH_AMR_OUT_MAX_SIZE];
 
-	if (!context) {
+	if (!context || encoded_data_len > SWITCH_AMR_OUT_MAX_SIZE) {
 		return SWITCH_STATUS_FALSE;
 	}
 
+	memcpy(buf, encoded_data, encoded_data_len);
+
 	if (globals.debug) {
 		switch_amr_info(codec, buf, encoded_data_len, switch_test_flag(context, AMR_OPT_OCTET_ALIGN) ? 1 : 0, "AMR decoder");
 	}
diff --git a/src/mod/codecs/mod_amrwb/amrwb_be.c b/src/mod/codecs/mod_amrwb/amrwb_be.c
index 7b43b2b583..e8f45cf7d7 100644
--- a/src/mod/codecs/mod_amrwb/amrwb_be.c
+++ b/src/mod/codecs/mod_amrwb/amrwb_be.c
@@ -95,23 +95,23 @@ extern switch_bool_t switch_amrwb_pack_be(unsigned char *shift_buf, int n)
 
 extern switch_bool_t switch_amrwb_unpack_be(unsigned char *encoded_buf, uint8_t *tmp, int encoded_len)
 {
-	int framesz, index, ft;
+	int framesz, index;
 	uint8_t shift_tocs[2] = {0x00, 0x00};
 	uint8_t *shift_buf;
 
 	memcpy(shift_tocs, encoded_buf, 2);
 	/* shift for BE */
 	switch_amr_array_lshift(4, shift_tocs, 2);
-	ft = shift_tocs[0] >> 3;
-	ft &= ~(1 << 5); /* Frame Type*/
 	shift_buf = encoded_buf + 1; /* skip CMR */
 	/* shift for BE */
 	switch_amr_array_lshift(2, shift_buf, encoded_len - 1);
 	/* get frame size */
 	index = ((shift_tocs[0] >> 3) & 0x0f);
 	if (index > 10 && index != 0xe && index != 0xf) {
+
 		return SWITCH_FALSE;
 	}
+
 	framesz = switch_amrwb_frame_sizes[index];
 	tmp[0] = shift_tocs[0]; /* save TOC */
 	memcpy(&tmp[1], shift_buf, framesz);
diff --git a/src/mod/codecs/mod_amrwb/mod_amrwb.c b/src/mod/codecs/mod_amrwb/mod_amrwb.c
index 8be5f4d541..d89ec5d62b 100644
--- a/src/mod/codecs/mod_amrwb/mod_amrwb.c
+++ b/src/mod/codecs/mod_amrwb/mod_amrwb.c
@@ -191,6 +191,7 @@ static switch_status_t switch_amrwb_init(switch_codec_t *codec, switch_codec_fla
 	if (codec->fmtp_in) {
 		codec->fmtp_out = switch_core_strdup(codec->memory_pool, codec->fmtp_in);
 	}
+
 	return SWITCH_STATUS_SUCCESS;
 #else
 	struct amrwb_context *context = NULL;
@@ -198,11 +199,13 @@ static switch_status_t switch_amrwb_init(switch_codec_t *codec, switch_codec_fla
 	int x, i, argc, fmtptmp_pos;
 	char *argv[10];
 	char fmtptmp[128];
+	char *fmtp_dup = NULL;
 
 	encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
 	decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
 
 	if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct amrwb_context))))) {
+
 		return SWITCH_STATUS_FALSE;
 	} else {
 
@@ -222,13 +225,19 @@ static switch_status_t switch_amrwb_init(switch_codec_t *codec, switch_codec_fla
 		}
 
 		if (codec->fmtp_in) {
-			argc = switch_separate_string(codec->fmtp_in, ';', argv, (sizeof(argv) / sizeof(argv[0])));
+			fmtp_dup = strdup(codec->fmtp_in);
+			switch_assert(fmtp_dup);
+
+			argc = switch_separate_string(fmtp_dup, ';', argv, (sizeof(argv) / sizeof(argv[0])));
+
 			for (x = 0; x < argc; x++) {
 				char *data = argv[x];
 				char *arg;
+
 				while (*data && *data == ' ') {
 					data++;
 				}
+
 				if ((arg = strchr(data, '='))) {
 					*arg++ = '\0';
 					if (!strcasecmp(data, "octet-align")) {
@@ -264,7 +273,9 @@ static switch_status_t switch_amrwb_init(switch_codec_t *codec, switch_codec_fla
 					} else if (!strcasecmp(data, "mode-set")) {
 						int y, m_argc;
 						char *m_argv[SWITCH_AMRWB_MODES-1]; /* AMRWB has 9 modes */
+
 						m_argc = switch_separate_string(arg, ',', m_argv, (sizeof(m_argv) / sizeof(m_argv[0])));
+
 						for (y = 0; y < m_argc; y++) {
 							context->enc_modes |= (1 << atoi(m_argv[y]));
 							context->enc_mode = atoi(m_argv[y]);
@@ -272,6 +283,8 @@ static switch_status_t switch_amrwb_init(switch_codec_t *codec, switch_codec_fla
 					}
 				}
 			}
+
+			free(fmtp_dup);
 		}
 
 		if (context->enc_modes && !globals.mode_set_overwrite) {
@@ -285,6 +298,7 @@ static switch_status_t switch_amrwb_init(switch_codec_t *codec, switch_codec_fla
 
 			/* re-create mode-set */
 			fmtptmp_pos = switch_snprintf(fmtptmp, sizeof(fmtptmp), "mode-set=");
+
 			for (i = 0; SWITCH_AMRWB_MODES-1 > i; ++i) {
 				if (context->enc_modes & (1 << i)) {
 					fmtptmp_pos += switch_snprintf(fmtptmp + fmtptmp_pos, sizeof(fmtptmp) - fmtptmp_pos, fmtptmp_pos > strlen("mode-set=") ? ",%d" : "%d", i);
@@ -301,12 +315,13 @@ static switch_status_t switch_amrwb_init(switch_codec_t *codec, switch_codec_fla
 		}
 
 		if (!globals.volte) {
-			fmtptmp_pos += switch_snprintf(fmtptmp + fmtptmp_pos, sizeof(fmtptmp) - fmtptmp_pos, ";octet-align=%d",
+			switch_snprintf(fmtptmp + fmtptmp_pos, sizeof(fmtptmp) - fmtptmp_pos, ";octet-align=%d",
 					switch_test_flag(context, AMRWB_OPT_OCTET_ALIGN) ? 1 : 0);
 		} else {
-			fmtptmp_pos += switch_snprintf(fmtptmp + fmtptmp_pos, sizeof(fmtptmp) - fmtptmp_pos, ";octet-align=%d;max-red=0;mode-change-capability=2",
+			switch_snprintf(fmtptmp + fmtptmp_pos, sizeof(fmtptmp) - fmtptmp_pos, ";octet-align=%d;max-red=0;mode-change-capability=2",
 					switch_test_flag(context, AMRWB_OPT_OCTET_ALIGN) ? 1 : 0);
 		}
+
 		codec->fmtp_out = switch_core_strdup(codec->memory_pool, fmtptmp);
 
 		context->encoder_state = NULL;
@@ -401,13 +416,15 @@ static switch_status_t switch_amrwb_decode(switch_codec_t *codec,
 	return SWITCH_STATUS_FALSE;
 #else
 	struct amrwb_context *context = codec->private_info;
-	unsigned char *buf = encoded_data;
+	unsigned char buf[SWITCH_AMRWB_OUT_MAX_SIZE];
 	uint8_t tmp[SWITCH_AMRWB_OUT_MAX_SIZE];
 
-	if (!context) {
+	if (!context || encoded_data_len > SWITCH_AMRWB_OUT_MAX_SIZE) {
 		return SWITCH_STATUS_FALSE;
 	}
 
+	memcpy(buf, encoded_data, encoded_data_len);
+
 	if (globals.debug) {
 		switch_amrwb_info(codec, buf, encoded_data_len, switch_test_flag(context, AMRWB_OPT_OCTET_ALIGN) ? 1 : 0, "AMRWB decoder");
 	}
diff --git a/src/mod/codecs/mod_dahdi_codec/Makefile.am b/src/mod/codecs/mod_dahdi_codec/Makefile.am
deleted file mode 100644
index d4e3287746..0000000000
--- a/src/mod/codecs/mod_dahdi_codec/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_dahdi_codec
-
-mod_LTLIBRARIES = mod_dahdi_codec.la
-mod_dahdi_codec_la_SOURCES  = mod_dahdi_codec.c
-mod_dahdi_codec_la_CFLAGS   = $(AM_CFLAGS)
-mod_dahdi_codec_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_dahdi_codec_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c b/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c
deleted file mode 100644
index 6e7f15428c..0000000000
--- a/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / DAHDI codec module
- *
- * The Initial Developer of the Original Code is
- * Moises Silva <moy@sangoma.com>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Moises Silva <moy@sangoma.com>
- *
- * mod_dahdi_codec -- DAHDI Codecs (G729A 8.0kbit, G723.1 5.3kbit)
- *
- * Thanks to Voiceway for sponsoring this module and Neocenter for providing the DAHDI hardware to test
- *
- */
-
-#include <switch.h>
-#include <g711.h>
-#include <poll.h>
-#include <linux/types.h>		/* __u32 */
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-/*
- * some rules to keep in mind for G729 (the frame size may be different for G723)
- * we cannot write more than SFRAME_SIZE (320) - sizeof(struct rtp_packet) which
- * seems to be 266 bytes
- * if we write less than 160 bytes (1 ulaw frame which is 20 bytes of G729 bytes, a read will block forever)
- * TODO: do buffering ourselves to provide just the fixed amount of samples that the card expects
- * */
-#define DAHDI_G729_INPUT_FRAME_SIZE 160
-#define DAHDI_G729_OUTPUT_FRAME_SIZE 20
-
-/*#define DEBUG_DAHDI_CODEC 1*/
-
-#define CODEC_G729_IANA_CODE 18
-#define CODEC_G723_IANA_CODE 4
-
-switch_mutex_t *transcoder_counter_mutex;
-static uint32_t total_encoders = 0;
-static uint32_t total_encoders_usage = 0;
-static uint32_t total_decoders = 0;
-static uint32_t total_decoders_usage = 0;
-
-/*
-   Zaptel/DAHDI definitions to not require the headers installed
-   Zaptel and DAHDI are binary compatible (at least in the transcoder interface)
- */
-
-#define DAHDI_TC_CODE                   'T'
-#define DAHDI_TC_ALLOCATE               _IOW(DAHDI_TC_CODE, 1, struct dahdi_transcoder_formats)
-#define DAHDI_TC_GETINFO                _IOWR(DAHDI_TC_CODE, 2, struct dahdi_transcoder_info)
-
-#define DAHDI_FORMAT_G723_1  (1 << 0)
-#define DAHDI_FORMAT_ULAW    (1 << 2)
-#define DAHDI_FORMAT_SLINEAR (1 << 6)
-#define DAHDI_FORMAT_G729A   (1 << 8)
-
-struct dahdi_transcoder_formats {
-	__u32 srcfmt;
-	__u32 dstfmt;
-};
-
-struct dahdi_transcoder_info {
-	__u32 tcnum;
-	char name[80];
-	__u32 numchannels;
-	__u32 dstfmts;
-	__u32 srcfmts;
-};
-
-static const char transcoding_device_dahdi[] = "/dev/dahdi/transcode";
-static const char transcoder_name_dahdi[] = "DAHDI";
-static const char transcoding_device_zap[] = "/dev/zap/transcode";
-static const char transcoder_name_zap[] = "Zap";
-static const char *transcoding_device = NULL;
-static const char *transcoder_name = NULL;
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_codec_load);
-SWITCH_MODULE_DEFINITION(mod_dahdi_codec, mod_dahdi_codec_load, NULL, NULL);
-
-struct dahdi_context {
-	int32_t encoding_fd;
-	int32_t decoding_fd;
-	uint8_t codec_r;
-};
-
-static int32_t switch_dahdi_get_transcoder(struct dahdi_transcoder_formats *fmts)
-{
-	int32_t fdflags;
-	int32_t fd = open(transcoding_device, O_RDWR);
-	if (fd < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open %s transcoder device: %s.\n", transcoder_name, strerror(errno));
-		return -1;
-	}
-	if (ioctl(fd, DAHDI_TC_ALLOCATE, fmts)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to attach to transcoder: %s.\n", strerror(errno));
-		close(fd);
-		return -1;
-	}
-	fdflags = fcntl(fd, F_GETFL);
-	if (fdflags > -1) {
-		fdflags |= O_NONBLOCK;
-		if (fcntl(fd, F_SETFL, fdflags)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not set non-block mode in %s transcoder FD: %s\n",
-							  transcoder_name, strerror(errno));
-			/* should we abort? this may cause channels to hangup when overruning the device
-			 * see jira dahdi codec issue MODCODEC-8 (Hung Calls and Codec DAHDI G.729A 8.0k decoder error!)
-			 * */
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not get flags from %s transcoder FD: %s\n", transcoder_name, strerror(errno));
-	}
-
-	if (fmts->srcfmt & DAHDI_FORMAT_ULAW) {
-		switch_mutex_lock(transcoder_counter_mutex);
-		total_encoders_usage++;
-		switch_mutex_unlock(transcoder_counter_mutex);
-	} else {
-		switch_mutex_lock(transcoder_counter_mutex);
-		total_decoders_usage++;
-		switch_mutex_unlock(transcoder_counter_mutex);
-	}
-
-	return fd;
-}
-
-static switch_status_t init_encoder(switch_codec_t *codec)
-{
-	struct dahdi_transcoder_formats fmts;
-	struct dahdi_context *context = codec->private_info;
-
-	fmts.srcfmt = DAHDI_FORMAT_ULAW;
-	fmts.dstfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE)
-		? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1;
-	context->encoding_fd = switch_dahdi_get_transcoder(&fmts);
-	if (context->encoding_fd < 0) {
-#ifdef DEBUG_DAHDI_CODEC
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "encoding requested and denied with %d/%d.\n", fmts.srcfmt, fmts.dstfmt);
-#endif
-		return SWITCH_STATUS_FALSE;
-	}
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoding requested and granted with %d/%d.\n", fmts.srcfmt, fmts.dstfmt);
-#endif
-
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t init_decoder(switch_codec_t *codec)
-{
-	struct dahdi_transcoder_formats fmts;
-	struct dahdi_context *context = codec->private_info;
-
-	fmts.dstfmt = DAHDI_FORMAT_ULAW;
-	fmts.srcfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE)
-		? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1;
-	context->decoding_fd = switch_dahdi_get_transcoder(&fmts);
-	if (context->decoding_fd < 0) {
-#ifdef DEBUG_DAHDI_CODEC
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and denied with %d/%d.\n", fmts.srcfmt, fmts.dstfmt);
-#endif
-		return SWITCH_STATUS_FALSE;
-	}
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and granted with %d/%d.\n", fmts.srcfmt, fmts.dstfmt);
-#endif
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_dahdi_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-	uint32_t encoding, decoding;
-	struct dahdi_context *context = NULL;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI init called.\n");
-
-	encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-	decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-	if (!(encoding || decoding)) {
-#ifdef DEBUG_DAHDI_CODEC
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No encoding or decoding requested for DAHDI transcoder?.\n");
-#endif
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context)))) {
-#ifdef DEBUG_DAHDI_CODEC
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate memory for dahdi codec context.\n");
-#endif
-		return SWITCH_STATUS_FALSE;
-	}
-
-	codec->private_info = context;
-	context->encoding_fd = -1;
-	context->decoding_fd = -1;
-
-	/* ulaw requires 8 times more storage than g729 and 12 times more than G723, right?
-	 * this can be used to calculate the target buffer when encoding and decoding
-	 * */
-	context->codec_r = (codec->implementation->ianacode == CODEC_G729_IANA_CODE)
-		? 8 : 12;
-
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static int wait_for_transcoder(int fd)
-{
-	/* let's wait a bit for the transcoder, if in 20msthe driver does not notify us that its ready to give us something
-	   then just bail out with 0 bytes encoded/decoded as result, I'd expect the card to hold that buffer and return it later */
-	int res = 0;
-	struct pollfd readpoll;
-	memset(&readpoll, 0, sizeof(readpoll));
-	readpoll.fd = fd;
-	readpoll.events = POLLIN;
-	/* my testing shows that it does not take more than 1ms to encode a 160 bytes frame ulaw to g729,
-	   I dont think there is much difference decoding and for g723, waiting 10ms seems more than reasonable */
-	res = poll(&readpoll, 1, 10);
-	return res;
-}
-
-static switch_status_t switch_dahdi_encode(switch_codec_t *codec,
-										   switch_codec_t *other_codec,
-										   void *decoded_data,
-										   uint32_t decoded_data_len,
-										   uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-										   unsigned int *flag)
-{
-	int32_t res;
-	short *dbuf_linear;
-	unsigned char ebuf_ulaw[decoded_data_len / 2];
-	uint32_t i;
-	struct dahdi_context *context = NULL;
-	switch_status_t status;
-
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI encode called to encode %d bytes.\n", decoded_data_len);
-#endif
-	context = codec->private_info;
-
-	if (context->encoding_fd == -1) {
-		if ((status = init_encoder(codec)) != SWITCH_STATUS_SUCCESS) {
-			return status;
-		}
-	}
-
-	dbuf_linear = decoded_data;
-	for (i = 0; i < decoded_data_len / sizeof(short); i++) {
-		ebuf_ulaw[i] = linear_to_ulaw(dbuf_linear[i]);
-	}
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Writing %d bytes of decoded ulaw data.\n", i);
-#endif
-	res = write(context->encoding_fd, ebuf_ulaw, i);
-	if (-1 == res) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to %s encoder device.\n", transcoder_name);
-		return SWITCH_STATUS_FALSE;
-	}
-	if (i != res) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested to write %d bytes to %s encoder device, but only wrote %d bytes.\n", i,
-						  transcoder_name, res);
-		return SWITCH_STATUS_FALSE;
-	}
-	res = wait_for_transcoder(context->encoding_fd);
-	if (-1 == res) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to poll on %s encoder device: %s.\n", transcoder_name, strerror(errno));
-		return SWITCH_STATUS_FALSE;
-	}
-	if (0 == res) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s encoder device.\n", transcoder_name);
-		*encoded_data_len = 0;
-		return SWITCH_STATUS_SUCCESS;
-	}
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to read %d bytes of encoded data.\n", *encoded_data_len);
-#endif
-	res = read(context->encoding_fd, encoded_data, *encoded_data_len);
-	if (-1 == res) {
-		if (EAGAIN == errno || EWOULDBLOCK == errno) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s encoder device (%s).\n", transcoder_name, strerror(errno));
-			*encoded_data_len = 0;
-			return SWITCH_STATUS_SUCCESS;
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from %s encoder device: %s.\n", transcoder_name, strerror(errno));
-		return SWITCH_STATUS_FALSE;
-	}
-	*encoded_data_len = res;
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Read %d bytes of encoded data.\n", res);
-#endif
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_dahdi_decode(switch_codec_t *codec,
-										   switch_codec_t *other_codec,
-										   void *encoded_data,
-										   uint32_t encoded_data_len,
-										   uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-										   unsigned int *flag)
-{
-	int32_t res;
-	short *dbuf_linear;
-	// we only can decode up to half ulaw bytes of whatever their destiny linear buffer is
-	unsigned char dbuf_ulaw[*decoded_data_len / 2];
-	unsigned char *ebuf_g729;
-	uint32_t i;
-	struct dahdi_context *context;
-	switch_status_t status;
-
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode called to decode %d bytes.\n", encoded_data_len);
-#endif
-
-	context = codec->private_info;
-	dbuf_linear = decoded_data;
-	ebuf_g729 = encoded_data;
-
-	if (context->decoding_fd == -1) {
-		if ((status = init_decoder(codec)) != SWITCH_STATUS_SUCCESS) {
-			return status;
-		}
-	}
-
-	if (*flag & SWITCH_CODEC_FLAG_SILENCE) {
-		memset(dbuf_linear, 0, codec->implementation->decoded_bytes_per_packet);
-		*decoded_data_len = codec->implementation->decoded_bytes_per_packet;
-#ifdef DEBUG_DAHDI_CODEC
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode in silence returned %d bytes.\n", *decoded_data_len);
-#endif
-		return SWITCH_STATUS_SUCCESS;
-	}
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Writing %d bytes to decode.\n", encoded_data_len);
-#endif
-	res = write(context->decoding_fd, ebuf_g729, encoded_data_len);
-	if (-1 == res) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to %s decoder device: %s.\n", transcoder_name, strerror(errno));
-		return SWITCH_STATUS_FALSE;
-	}
-	if (encoded_data_len != res) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested to write %d bytes to %s decoder device, but only wrote %d bytes.\n",
-						  encoded_data_len, transcoder_name, res);
-		return SWITCH_STATUS_FALSE;
-	}
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to read from device %d bytes of decoded ulaw data.\n", sizeof(dbuf_ulaw));
-#endif
-	res = wait_for_transcoder(context->decoding_fd);
-	if (-1 == res) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to poll on %s decoder device: %s.\n", transcoder_name, strerror(errno));
-		return SWITCH_STATUS_FALSE;
-	}
-	if (0 == res) {
-		memset(dbuf_linear, 0, codec->implementation->decoded_bytes_per_packet);
-		*decoded_data_len = codec->implementation->decoded_bytes_per_packet;
-#ifdef DEBUG_DAHDI_CODEC
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s decoder device, returning silence frame of %d bytes.\n", transcoder_name,
-						  *decoded_data_len);
-#endif
-		return SWITCH_STATUS_SUCCESS;
-	}
-	res = read(context->decoding_fd, dbuf_ulaw, sizeof(dbuf_ulaw));
-	if (-1 == res) {
-		if (EAGAIN == errno || EWOULDBLOCK == errno) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s decoder device (%s).\n", transcoder_name, strerror(errno));
-			*decoded_data_len = 0;
-			return SWITCH_STATUS_SUCCESS;
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from %s decoder device: %s.\n", transcoder_name, strerror(errno));
-		return SWITCH_STATUS_FALSE;
-	}
-	for (i = 0; i < res; i++) {
-		dbuf_linear[i] = ulaw_to_linear(dbuf_ulaw[i]);
-	}
-	*decoded_data_len = i * 2;
-#ifdef DEBUG_DAHDI_CODEC
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode returned %d bytes.\n", *decoded_data_len);
-#endif
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_dahdi_destroy(switch_codec_t *codec)
-{
-	/* memory pool takes care of the private_info memory */
-	struct dahdi_context *context = codec->private_info;
-	if (context->encoding_fd >= 0) {
-		switch_mutex_lock(transcoder_counter_mutex);
-		total_encoders_usage--;
-		switch_mutex_unlock(transcoder_counter_mutex);
-		close(context->encoding_fd);
-	}
-	if (context->decoding_fd >= 0) {
-		switch_mutex_lock(transcoder_counter_mutex);
-		total_decoders_usage--;
-		switch_mutex_unlock(transcoder_counter_mutex);
-		close(context->decoding_fd);
-	}
-	codec->private_info = NULL;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(dahdi_transcode_usage)
-{
-	if (!total_encoders && !total_decoders) {
-		stream->write_function(stream, "No DAHDI transcoding hardware found.\n");
-		return SWITCH_STATUS_SUCCESS;
-	}
-	switch_mutex_lock(transcoder_counter_mutex);
-	stream->write_function(stream, "Using %d encoders of a total of %d available.\n", total_encoders_usage, total_encoders);
-	stream->write_function(stream, "Using %d decoders of a total of %d available.\n", total_decoders_usage, total_decoders);
-	switch_mutex_unlock(transcoder_counter_mutex);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_codec_load)
-{
-	switch_api_interface_t *api_interface;
-	switch_codec_interface_t *codec_interface;
-	struct stat statbuf;
-	struct dahdi_transcoder_info info = { 0 };
-	int32_t fd;
-	int mpf = 20000;			/* Algorithmic delay of 15ms with 5ms of look-ahead delay */
-	int spf = 160;
-	int bpfd = 320;
-	int bpfc = 20;
-	int fpnp = 20;
-
-	total_encoders = 0;
-	total_encoders_usage = 0;
-	total_decoders = 0;
-	total_decoders_usage = 0;
-
-	/* Let's check if DAHDI or Zaptel device should be used */
-	if (!stat(transcoding_device_dahdi, &statbuf)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DAHDI transcoding device found.\n");
-		transcoding_device = transcoding_device_dahdi;
-		transcoder_name = transcoder_name_dahdi;
-	} else if (!stat(transcoding_device_zap, &statbuf)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Zap transcoding device found.\n");
-		transcoding_device = transcoding_device_zap;
-		transcoder_name = transcoder_name_zap;
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No DAHDI or Zap transcoder device was found in /dev/.\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	fd = open(transcoding_device, O_RDWR);
-	if (fd < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open %s transcoder device: %s.\n", transcoder_name, strerror(errno));
-		return SWITCH_STATUS_FALSE;
-	}
-
-	for (info.tcnum = 0; !ioctl(fd, DAHDI_TC_GETINFO, &info); info.tcnum++) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found dahdi transcoder name: %s\n", info.name);
-		if ((info.srcfmts & DAHDI_FORMAT_ULAW) && (info.dstfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) {
-			total_encoders += info.numchannels;
-			continue;
-		}
-		if ((info.dstfmts & DAHDI_FORMAT_ULAW) && (info.srcfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) {
-			total_decoders += info.numchannels;
-			continue;
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Not using transcoder %s, we just support ULAW and G723.1/G729A", info.name);
-	}
-	close(fd);
-
-	if (!total_encoders && !total_decoders) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No DAHDI transcoders found.\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Found %d ULAW to G729A/G723.1 encoders.\n", total_encoders);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Found %d G729A/G723.1 to ULAW decoders.\n", total_decoders);
-
-	switch_mutex_init(&transcoder_counter_mutex, SWITCH_MUTEX_UNNESTED, pool);
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	SWITCH_ADD_CODEC(codec_interface, "DAHDI G.729A 8.0k");	/* 8.0kbit */
-
-	switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,	/* enumeration defining the type of the codec */
-										 18,	/* the IANA code number */
-										 "G729",	/* the IANA code name */
-										 NULL,	/* default fmtp to send (can be overridden by the init function) */
-										 8000,	/* samples transferred per second */
-										 8000,	/* actual samples transferred per second */
-										 8000,	/* bits transferred per second */
-										 mpf,	/* number of microseconds per frame */
-										 spf,	/* number of samples per frame */
-										 bpfd,	/* number of bytes per frame decompressed */
-										 bpfc,	/* number of bytes per frame compressed */
-										 1,	/* number of channels represented */
-										 fpnp,	/* number of frames per network packet */
-										 switch_dahdi_init,	/* function to initialize a codec handle using this implementation */
-										 switch_dahdi_encode,	/* function to encode raw data into encoded data */
-										 switch_dahdi_decode,	/* function to decode encoded data into raw data */
-										 switch_dahdi_destroy);	/* deinitalize a codec handle using this implementation */
-
-	mpf = 30000;
-	spf = 240;
-	bpfd = 480;
-	bpfc = 30;
-	fpnp = 30;
-	switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,	/* enumeration defining the type of the codec */
-										 18,	/* the IANA code number */
-										 "G729",	/* the IANA code name */
-										 NULL,	/* default fmtp to send (can be overridden by the init function) */
-										 8000,	/* samples transferred per second */
-										 8000,	/* actual samples transferred per second */
-										 8000,	/* bits transferred per second */
-										 mpf,	/* number of microseconds per frame */
-										 spf,	/* number of samples per frame */
-										 bpfd,	/* number of bytes per frame decompressed */
-										 bpfc,	/* number of bytes per frame compressed */
-										 1,	/* number of channels represented */
-										 fpnp,	/* number of frames per network packet */
-										 switch_dahdi_init,	/* function to initialize a codec handle using this implementation */
-										 switch_dahdi_encode,	/* function to encode raw data into encoded data */
-										 switch_dahdi_decode,	/* function to decode encoded data into raw data */
-										 switch_dahdi_destroy);	/* deinitalize a codec handle using this implementation */
-
-	SWITCH_ADD_CODEC(codec_interface, "DAHDI G.723.1 5.3k");	/* 5.3kbit */
-	mpf = 30000;				/* Algorithmic delay of 37.5ms with 7.5ms of look-ahead delay */
-	spf = 240;
-	bpfd = 480;
-	bpfc = 20;
-	fpnp = 10;
-	switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,	/* enumeration defining the type of the codec */
-										 4,	/* the IANA code number */
-										 "G723",	/* the IANA code name */
-										 NULL,	/* default fmtp to send (can be overridden by the init function) */
-										 8000,	/* samples transferred per second */
-										 8000,	/* actual samples transferred per second */
-										 8000,	/* bits transferred per second */
-										 mpf,	/* number of microseconds per frame */
-										 spf,	/* number of samples per frame */
-										 bpfd,	/* number of bytes per frame decompressed */
-										 bpfc,	/* number of bytes per frame compressed */
-										 1,	/* number of channels represented */
-										 fpnp,	/* number of frames per network packet */
-										 switch_dahdi_init,	/* function to initialize a codec handle using this implementation */
-										 switch_dahdi_encode,	/* function to encode raw data into encoded data */
-										 switch_dahdi_decode,	/* function to decode encoded data into raw data */
-										 switch_dahdi_destroy);	/* deinitalize a codec handle using this implementation */
-
-	SWITCH_ADD_API(api_interface, "dahdi_transcode", "DAHDI Transcode", dahdi_transcode_usage, NULL);
-	switch_console_set_complete("add dahdi_transcode");
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/codecs/mod_h26x/Makefile.am b/src/mod/codecs/mod_h26x/Makefile.am
deleted file mode 100644
index 93dd847499..0000000000
--- a/src/mod/codecs/mod_h26x/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_h26x
-
-mod_LTLIBRARIES = mod_h26x.la
-mod_h26x_la_SOURCES  = mod_h26x.c
-mod_h26x_la_CFLAGS   = $(AM_CFLAGS)
-mod_h26x_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_h26x_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/codecs/mod_h26x/mod_h26x.2017.vcxproj b/src/mod/codecs/mod_h26x/mod_h26x.2017.vcxproj
deleted file mode 100644
index 8cfb292c2a..0000000000
--- a/src/mod/codecs/mod_h26x/mod_h26x.2017.vcxproj
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_h26x</ProjectName>
-    <ProjectGuid>{2C3C2423-234B-4772-8899-D3B137E5CA35}</ProjectGuid>
-    <RootNamespace>mod_h26x</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\libresample\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\libresample\win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\libresample\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\libresample\win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\libresample\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\libresample\win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\libresample\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\libresample\win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_h26x.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/codecs/mod_h26x/mod_h26x.c b/src/mod/codecs/mod_h26x/mod_h26x.c
deleted file mode 100644
index 4d82322936..0000000000
--- a/src/mod/codecs/mod_h26x/mod_h26x.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_h26x.c -- H26X Signed Linear Codec
- *
- */
-
-#include <switch.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_h26x_load);
-SWITCH_MODULE_DEFINITION(mod_h26x, mod_h26x_load, NULL, NULL);
-
-static switch_status_t switch_h26x_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-	int encoding, decoding;
-
-	encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-	decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-	if (!(encoding || decoding)) {
-		return SWITCH_STATUS_FALSE;
-	} else {
-		if (codec->fmtp_in) {
-			codec->fmtp_out = switch_core_strdup(codec->memory_pool, codec->fmtp_in);
-		}
-		return SWITCH_STATUS_SUCCESS;
-	}
-}
-
-static switch_status_t switch_h26x_encode(switch_codec_t *codec,
-										  switch_codec_t *other_codec,
-										  void *decoded_data,
-										  uint32_t decoded_data_len,
-										  uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-										  unsigned int *flag)
-{
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t switch_h26x_decode(switch_codec_t *codec,
-										  switch_codec_t *other_codec,
-										  void *encoded_data,
-										  uint32_t encoded_data_len,
-										  uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-										  unsigned int *flag)
-{
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t switch_h26x_destroy(switch_codec_t *codec)
-{
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_h26x_load)
-{
-	switch_codec_interface_t *codec_interface;
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	SWITCH_ADD_CODEC(codec_interface, "H.264 Video (passthru)");
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_VIDEO, 97, "H264", NULL, 90000, 90000, 0,
-										 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy);
-	SWITCH_ADD_CODEC(codec_interface, "H.263 Video (passthru)");
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_VIDEO, 34, "H263", NULL, 90000, 90000, 0,
-										 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy);
-	SWITCH_ADD_CODEC(codec_interface, "H.263+ Video (passthru)");
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_VIDEO, 115, "H263-1998", NULL, 90000, 90000, 0,
-										 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy);
-	SWITCH_ADD_CODEC(codec_interface, "H.263++ Video (passthru)");
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_VIDEO, 121, "H263-2000", NULL, 90000, 90000, 0,
-										 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy);
-	SWITCH_ADD_CODEC(codec_interface, "H.261 Video (passthru)");
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_VIDEO, 31, "H261", NULL, 90000, 90000, 0,
-										 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy);
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/codecs/mod_ilbc/mod_ilbc.c b/src/mod/codecs/mod_ilbc/mod_ilbc.c
index 14d67d372e..2588cdf46b 100644
--- a/src/mod/codecs/mod_ilbc/mod_ilbc.c
+++ b/src/mod/codecs/mod_ilbc/mod_ilbc.c
@@ -48,7 +48,7 @@ static switch_status_t switch_ilbc_fmtp_parse(const char *fmtp, switch_codec_fmt
 
 		memset(codec_fmtp, '\0', sizeof(struct switch_codec_fmtp));
 
-		if (fmtp && (mode = strstr(fmtp, "mode=")) && (mode + 5)) {
+		if (fmtp && (mode = strstr(fmtp, "mode=")) && *(mode + 5)) {
 			codec_ms = atoi(mode + 5);
 		}
 		if (!codec_ms) {
diff --git a/src/mod/codecs/mod_isac/LICENSE b/src/mod/codecs/mod_isac/LICENSE
deleted file mode 100644
index 4c41b7b251..0000000000
--- a/src/mod/codecs/mod_isac/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2011, The WebRTC project authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/mod/codecs/mod_isac/Makefile.am b/src/mod/codecs/mod_isac/Makefile.am
deleted file mode 100644
index fc726f30c1..0000000000
--- a/src/mod/codecs/mod_isac/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_isac
-
-mod_LTLIBRARIES = mod_isac.la
-mod_isac_la_SOURCES  = mod_isac.c arith_routines.c arith_routines_hist.c arith_routines_logist.c auto_correlation.c auto_corr_to_refl_coef.c
-mod_isac_la_SOURCES += bandwidth_estimator.c complex_bit_reverse.c complex_fft.c copy_set_operations.c crc.c cross_correlation.c decode_bwe.c
-mod_isac_la_SOURCES += decode.c division_operations.c dot_product_with_scale.c downsample_fast.c encode.c encode_lpc_swb.c energy.c entropy_coding.c
-mod_isac_la_SOURCES += fft.c filter_ar.c filter_ar_fast_q12.c filterbanks.c filterbank_tables.c filter_functions.c filter_ma_fast_q12.c
-mod_isac_la_SOURCES += get_hanning_window.c get_scaling_square.c ilbc_specific_functions.c intialize.c isac.c lattice.c levinson_durbin.c
-mod_isac_la_SOURCES += lpc_analysis.c lpc_gain_swb_tables.c lpc_shape_swb12_tables.c lpc_shape_swb16_tables.c lpc_tables.c
-mod_isac_la_SOURCES += lpc_to_refl_coef.c min_max_operations.c min_max_operations_neon.c pitch_estimator.c pitch_filter.c pitch_gain_tables.c
-mod_isac_la_SOURCES += pitch_lag_tables.c randomization_functions.c refl_coef_to_lpc.c resample_48khz.c resample_by_2.c resample_by_2_internal.c
-mod_isac_la_SOURCES += resample.c resample_fractional.c spectrum_ar_model_tables.c splitting_filter.c spl_sqrt.c spl_sqrt_floor.c spl_version.c
-mod_isac_la_SOURCES += sqrt_of_one_minus_x_squared.c transform.c vector_scaling_operations.c webrtc_fft_t_1024_8.c webrtc_fft_t_rad.c
-mod_isac_la_CFLAGS   = $(AM_CFLAGS) -w -I.
-mod_isac_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_isac_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/codecs/mod_isac/PATENTS b/src/mod/codecs/mod_isac/PATENTS
deleted file mode 100644
index 190607ac26..0000000000
--- a/src/mod/codecs/mod_isac/PATENTS
+++ /dev/null
@@ -1,24 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the WebRTC code package.
-
-Google hereby grants to you a perpetual, worldwide, non-exclusive,
-no-charge, irrevocable (except as stated in this section) patent
-license to make, have made, use, offer to sell, sell, import,
-transfer, and otherwise run, modify and propagate the contents of this
-implementation of the WebRTC code package, where such license applies
-only to those patent claims, both currently owned by Google and
-acquired in the future, licensable by Google that are necessarily
-infringed by this implementation of the WebRTC code package. This
-grant does not include claims that would be infringed only as a
-consequence of further modification of this implementation. If you or
-your agent or exclusive licensee institute or order or agree to the
-institution of patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that this
-implementation of the WebRTC code package or any code incorporated
-within this implementation of the WebRTC code package constitutes
-direct or contributory patent infringement, or inducement of patent
-infringement, then any patent rights granted to you under this License
-for this implementation of the WebRTC code package shall terminate as
-of the date such litigation is filed.
diff --git a/src/mod/codecs/mod_isac/arith_routines.c b/src/mod/codecs/mod_isac/arith_routines.c
deleted file mode 100644
index 31c441a7af..0000000000
--- a/src/mod/codecs/mod_isac/arith_routines.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "arith_routines.h"
-#include "settings.h"
-
-
-/*
- * terminate and return byte stream;
- * returns the number of bytes in the stream
- */
-int WebRtcIsac_EncTerminate(Bitstr *streamdata) /* in-/output struct containing bitstream */
-{
-  WebRtc_UWord8 *stream_ptr;
-
-
-  /* point to the right place in the stream buffer */
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-
-  /* find minimum length (determined by current interval width) */
-  if ( streamdata->W_upper > 0x01FFFFFF )
-  {
-    streamdata->streamval += 0x01000000;
-    /* add carry to buffer */
-    if (streamdata->streamval < 0x01000000)
-    {
-      /* propagate carry */
-      while ( !(++(*--stream_ptr)) );
-      /* put pointer back to the old value */
-      stream_ptr = streamdata->stream + streamdata->stream_index;
-    }
-    /* write remaining data to bitstream */
-    *stream_ptr++ = (WebRtc_UWord8) (streamdata->streamval >> 24);
-  }
-  else
-  {
-    streamdata->streamval += 0x00010000;
-    /* add carry to buffer */
-    if (streamdata->streamval < 0x00010000)
-    {
-      /* propagate carry */
-      while ( !(++(*--stream_ptr)) );
-      /* put pointer back to the old value */
-      stream_ptr = streamdata->stream + streamdata->stream_index;
-    }
-    /* write remaining data to bitstream */
-    *stream_ptr++ = (WebRtc_UWord8) (streamdata->streamval >> 24);
-    *stream_ptr++ = (WebRtc_UWord8) ((streamdata->streamval >> 16) & 0x00FF);
-  }
-
-  /* calculate stream length */
-  return (int)(stream_ptr - streamdata->stream);
-}
diff --git a/src/mod/codecs/mod_isac/arith_routines.h b/src/mod/codecs/mod_isac/arith_routines.h
deleted file mode 100644
index 8e5f496f98..0000000000
--- a/src/mod/codecs/mod_isac/arith_routines.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * arith_routines.h
- *
- * Functions for arithmetic coding.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_
-
-#include "structs.h"
-
-
-int WebRtcIsac_EncLogisticMulti2(
-    Bitstr *streamdata,              /* in-/output struct containing bitstream */
-    WebRtc_Word16 *dataQ7,           /* input: data vector */
-    const WebRtc_UWord16 *env,       /* input: side info vector defining the width of the pdf */
-    const int N,                     /* input: data vector length */
-    const WebRtc_Word16 isSWB12kHz); /* if the codec is working in 12kHz bandwidth */
-
-/* returns the number of bytes in the stream */
-int WebRtcIsac_EncTerminate(Bitstr *streamdata); /* in-/output struct containing bitstream */
-
-/* returns the number of bytes in the stream so far */
-int WebRtcIsac_DecLogisticMulti2(
-    WebRtc_Word16 *data,             /* output: data vector */
-    Bitstr *streamdata,              /* in-/output struct containing bitstream */
-    const WebRtc_UWord16 *env,       /* input: side info vector defining the width of the pdf */
-    const WebRtc_Word16 *dither,     /* input: dither vector */
-    const int N,                     /* input: data vector length */
-    const WebRtc_Word16 isSWB12kHz); /* if the codec is working in 12kHz bandwidth */
-
-void WebRtcIsac_EncHistMulti(
-    Bitstr *streamdata,         /* in-/output struct containing bitstream */
-    const int *data,            /* input: data vector */
-    const WebRtc_UWord16 **cdf, /* input: array of cdf arrays */
-    const int N);               /* input: data vector length */
-
-int WebRtcIsac_DecHistBisectMulti(
-    int *data,                      /* output: data vector */
-    Bitstr *streamdata,             /* in-/output struct containing bitstream */
-    const WebRtc_UWord16 **cdf,     /* input: array of cdf arrays */
-    const WebRtc_UWord16 *cdf_size, /* input: array of cdf table sizes+1 (power of two: 2^k) */
-    const int N);                   /* input: data vector length */
-
-int WebRtcIsac_DecHistOneStepMulti(
-    int *data,                       /* output: data vector */
-    Bitstr *streamdata,              /* in-/output struct containing bitstream */
-    const WebRtc_UWord16 **cdf,      /* input: array of cdf arrays */
-    const WebRtc_UWord16 *init_index,/* input: vector of initial cdf table search entries */
-    const int N);                    /* input: data vector length */
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_ */
diff --git a/src/mod/codecs/mod_isac/arith_routines_hist.c b/src/mod/codecs/mod_isac/arith_routines_hist.c
deleted file mode 100644
index f4a13d6078..0000000000
--- a/src/mod/codecs/mod_isac/arith_routines_hist.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "settings.h"
-#include "arith_routines.h"
-
-
-/*
- * code symbols into arithmetic bytestream
- */
-void WebRtcIsac_EncHistMulti(Bitstr *streamdata, /* in-/output struct containing bitstream */
-                             const int *data,  /* input: data vector */
-                             const WebRtc_UWord16 **cdf, /* input: array of cdf arrays */
-                             const int N)   /* input: data vector length */
-{
-  WebRtc_UWord32 W_lower, W_upper;
-  WebRtc_UWord32 W_upper_LSB, W_upper_MSB;
-  WebRtc_UWord8 *stream_ptr;
-  WebRtc_UWord8 *stream_ptr_carry;
-  WebRtc_UWord32 cdf_lo, cdf_hi;
-  int k;
-
-
-  /* point to beginning of stream buffer */
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-
-  for (k=N; k>0; k--)
-  {
-    /* fetch cdf_lower and cdf_upper from cdf tables */
-    cdf_lo = (WebRtc_UWord32) *(*cdf + *data);
-    cdf_hi = (WebRtc_UWord32) *(*cdf++ + *data++ + 1);
-
-    /* update interval */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-    W_lower = W_upper_MSB * cdf_lo;
-    W_lower += (W_upper_LSB * cdf_lo) >> 16;
-    W_upper = W_upper_MSB * cdf_hi;
-    W_upper += (W_upper_LSB * cdf_hi) >> 16;
-
-    /* shift interval such that it begins at zero */
-    W_upper -= ++W_lower;
-
-    /* add integer to bitstream */
-    streamdata->streamval += W_lower;
-
-    /* handle carry */
-    if (streamdata->streamval < W_lower)
-    {
-      /* propagate carry */
-      stream_ptr_carry = stream_ptr;
-      while (!(++(*--stream_ptr_carry)));
-    }
-
-    /* renormalize interval, store most significant byte of streamval and update streamval */
-    while ( !(W_upper & 0xFF000000) )      /* W_upper < 2^24 */
-    {
-      W_upper <<= 8;
-      *stream_ptr++ = (WebRtc_UWord8) (streamdata->streamval >> 24);
-      streamdata->streamval <<= 8;
-    }
-  }
-
-  /* calculate new stream_index */
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-
-  return;
-}
-
-
-
-/*
- * function to decode more symbols from the arithmetic bytestream, using method of bisection
- * cdf tables should be of size 2^k-1 (which corresponds to an alphabet size of 2^k-2)
- */
-int WebRtcIsac_DecHistBisectMulti(int *data,     /* output: data vector */
-                                  Bitstr *streamdata,   /* in-/output struct containing bitstream */
-                                  const WebRtc_UWord16 **cdf,  /* input: array of cdf arrays */
-                                  const WebRtc_UWord16 *cdf_size, /* input: array of cdf table sizes+1 (power of two: 2^k) */
-                                  const int N)    /* input: data vector length */
-{
-  WebRtc_UWord32    W_lower, W_upper;
-  WebRtc_UWord32    W_tmp;
-  WebRtc_UWord32    W_upper_LSB, W_upper_MSB;
-  WebRtc_UWord32    streamval;
-  const   WebRtc_UWord8 *stream_ptr;
-  const   WebRtc_UWord16 *cdf_ptr;
-  int     size_tmp;
-  int     k;
-
-  W_lower = 0; //to remove warning -DH
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-  if (W_upper == 0)
-    /* Should not be possible in normal operation */
-    return -2;
-
-  if (streamdata->stream_index == 0)   /* first time decoder is called for this stream */
-  {
-    /* read first word from bytestream */
-    streamval = *stream_ptr << 24;
-    streamval |= *++stream_ptr << 16;
-    streamval |= *++stream_ptr << 8;
-    streamval |= *++stream_ptr;
-  } else {
-    streamval = streamdata->streamval;
-  }
-
-  for (k=N; k>0; k--)
-  {
-    /* find the integer *data for which streamval lies in [W_lower+1, W_upper] */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-
-    /* start halfway the cdf range */
-    size_tmp = *cdf_size++ >> 1;
-    cdf_ptr = *cdf + (size_tmp - 1);
-
-    /* method of bisection */
-    for ( ;; )
-    {
-      W_tmp = W_upper_MSB * *cdf_ptr;
-      W_tmp += (W_upper_LSB * *cdf_ptr) >> 16;
-      size_tmp >>= 1;
-      if (size_tmp == 0) break;
-      if (streamval > W_tmp)
-      {
-        W_lower = W_tmp;
-        cdf_ptr += size_tmp;
-      } else {
-        W_upper = W_tmp;
-        cdf_ptr -= size_tmp;
-      }
-    }
-    if (streamval > W_tmp)
-    {
-      W_lower = W_tmp;
-      *data++ = (int)(cdf_ptr - *cdf++);
-    } else {
-      W_upper = W_tmp;
-      *data++ = (int)(cdf_ptr - *cdf++ - 1);
-    }
-
-    /* shift interval to start at zero */
-    W_upper -= ++W_lower;
-
-    /* add integer to bitstream */
-    streamval -= W_lower;
-
-    /* renormalize interval and update streamval */
-    while ( !(W_upper & 0xFF000000) )    /* W_upper < 2^24 */
-    {
-      /* read next byte from stream */
-      streamval = (streamval << 8) | *++stream_ptr;
-      W_upper <<= 8;
-    }
-
-    if (W_upper == 0)
-      /* Should not be possible in normal operation */
-      return -2;
-
-
-  }
-
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-  streamdata->streamval = streamval;
-
-
-  /* find number of bytes in original stream (determined by current interval width) */
-  if ( W_upper > 0x01FFFFFF )
-    return streamdata->stream_index - 2;
-  else
-    return streamdata->stream_index - 1;
-}
-
-
-
-/*
- * function to decode more symbols from the arithmetic bytestream, taking single step up or
- * down at a time
- * cdf tables can be of arbitrary size, but large tables may take a lot of iterations
- */
-int WebRtcIsac_DecHistOneStepMulti(int *data,        /* output: data vector */
-                                   Bitstr *streamdata,      /* in-/output struct containing bitstream */
-                                   const WebRtc_UWord16 **cdf,   /* input: array of cdf arrays */
-                                   const WebRtc_UWord16 *init_index, /* input: vector of initial cdf table search entries */
-                                   const int N)     /* input: data vector length */
-{
-  WebRtc_UWord32    W_lower, W_upper;
-  WebRtc_UWord32    W_tmp;
-  WebRtc_UWord32    W_upper_LSB, W_upper_MSB;
-  WebRtc_UWord32    streamval;
-  const   WebRtc_UWord8 *stream_ptr;
-  const   WebRtc_UWord16 *cdf_ptr;
-  int     k;
-
-
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-  if (W_upper == 0)
-    /* Should not be possible in normal operation */
-    return -2;
-
-  if (streamdata->stream_index == 0)   /* first time decoder is called for this stream */
-  {
-    /* read first word from bytestream */
-    streamval = *stream_ptr << 24;
-    streamval |= *++stream_ptr << 16;
-    streamval |= *++stream_ptr << 8;
-    streamval |= *++stream_ptr;
-  } else {
-    streamval = streamdata->streamval;
-  }
-
-
-  for (k=N; k>0; k--)
-  {
-    /* find the integer *data for which streamval lies in [W_lower+1, W_upper] */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-
-    /* start at the specified table entry */
-    cdf_ptr = *cdf + (*init_index++);
-    W_tmp = W_upper_MSB * *cdf_ptr;
-    W_tmp += (W_upper_LSB * *cdf_ptr) >> 16;
-    if (streamval > W_tmp)
-    {
-      for ( ;; )
-      {
-        W_lower = W_tmp;
-        if (cdf_ptr[0]==65535)
-          /* range check */
-          return -3;
-        W_tmp = W_upper_MSB * *++cdf_ptr;
-        W_tmp += (W_upper_LSB * *cdf_ptr) >> 16;
-        if (streamval <= W_tmp) break;
-      }
-      W_upper = W_tmp;
-      *data++ = (int)(cdf_ptr - *cdf++ - 1);
-    } else {
-      for ( ;; )
-      {
-        W_upper = W_tmp;
-        --cdf_ptr;
-        if (cdf_ptr<*cdf) {
-          /* range check */
-          return -3;
-        }
-        W_tmp = W_upper_MSB * *cdf_ptr;
-        W_tmp += (W_upper_LSB * *cdf_ptr) >> 16;
-        if (streamval > W_tmp) break;
-      }
-      W_lower = W_tmp;
-      *data++ = (int)(cdf_ptr - *cdf++);
-    }
-
-    /* shift interval to start at zero */
-    W_upper -= ++W_lower;
-    /* add integer to bitstream */
-    streamval -= W_lower;
-
-    /* renormalize interval and update streamval */
-    while ( !(W_upper & 0xFF000000) )    /* W_upper < 2^24 */
-    {
-      /* read next byte from stream */
-      streamval = (streamval << 8) | *++stream_ptr;
-      W_upper <<= 8;
-    }
-  }
-
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-  streamdata->streamval = streamval;
-
-
-  /* find number of bytes in original stream (determined by current interval width) */
-  if ( W_upper > 0x01FFFFFF )
-    return streamdata->stream_index - 2;
-  else
-    return streamdata->stream_index - 1;
-}
diff --git a/src/mod/codecs/mod_isac/arith_routines_logist.c b/src/mod/codecs/mod_isac/arith_routines_logist.c
deleted file mode 100644
index 422855a4ce..0000000000
--- a/src/mod/codecs/mod_isac/arith_routines_logist.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * arith_routines.h
- *
- * This file contains functions for arithmatically encoding and
- * decoding DFT coefficients.
- *
- */
-
-
-#include "arith_routines.h"
-
-
-
-static const WebRtc_Word32 kHistEdgesQ15[51] = {
-  -327680, -314573, -301466, -288359, -275252, -262144, -249037, -235930, -222823, -209716,
-  -196608, -183501, -170394, -157287, -144180, -131072, -117965, -104858, -91751, -78644,
-  -65536, -52429, -39322, -26215, -13108,  0,  13107,  26214,  39321,  52428,
-  65536,  78643,  91750,  104857,  117964,  131072,  144179,  157286,  170393,  183500,
-  196608,  209715,  222822,  235929,  249036,  262144,  275251,  288358,  301465,  314572,
-  327680};
-
-
-static const int kCdfSlopeQ0[51] = {  /* Q0 */
-  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-  5,  5,  13,  23,  47,  87,  154,  315,  700,  1088,
-  2471,  6064,  14221,  21463,  36634,  36924,  19750,  13270,  5806,  2312,
-  1095,  660,  316,  145,  86,  41,  32,  5,  5,  5,
-  5,  5,  5,  5,  5,  5,  5,  5,  5,  2, 0};
-
-
-static const int kCdfQ16[51] = {  /* Q16 */
-  0,  2,  4,  6,  8,  10,  12,  14,  16,  18,
-  20,  22,  24,  29,  38,  57,  92,  153,  279,  559,
-  994,  1983,  4408,  10097,  18682,  33336,  48105,  56005,  61313,  63636,
-  64560,  64998,  65262,  65389,  65447,  65481,  65497,  65510,  65512,  65514,
-  65516,  65518,  65520,  65522,  65524,  65526,  65528,  65530,  65532,  65534,
-  65535};
-
-
-
-/* function to be converted to fixed point */
-static __inline WebRtc_UWord32 piecewise(WebRtc_Word32 xinQ15) {
-
-  WebRtc_Word32 ind, qtmp1, qtmp2, qtmp3;
-  WebRtc_UWord32 tmpUW32;
-
-
-  qtmp2 = xinQ15;
-
-  if (qtmp2 < kHistEdgesQ15[0]) {
-    qtmp2 = kHistEdgesQ15[0];
-  }
-  if (qtmp2 > kHistEdgesQ15[50]) {
-    qtmp2 = kHistEdgesQ15[50];
-  }
-
-  qtmp1 = qtmp2 - kHistEdgesQ15[0];       /* Q15 - Q15 = Q15        */
-  ind = (qtmp1 * 5) >> 16;              /* 2^16 / 5 = 0.4 in Q15  */
-  /* Q15 -> Q0              */
-  qtmp1 = qtmp2 - kHistEdgesQ15[ind];     /* Q15 - Q15 = Q15        */
-  qtmp2 = kCdfSlopeQ0[ind] * qtmp1;      /* Q0 * Q15 = Q15         */
-  qtmp3 = qtmp2>>15;                    /* Q15 -> Q0              */
-
-  tmpUW32 = kCdfQ16[ind] + qtmp3;    /* Q0 + Q0 = Q0           */
-  return tmpUW32;
-}
-
-
-
-int WebRtcIsac_EncLogisticMulti2(
-    Bitstr *streamdata,      /* in-/output struct containing bitstream */
-    WebRtc_Word16 *dataQ7,    /* input: data vector */
-    const WebRtc_UWord16 *envQ8, /* input: side info vector defining the width of the pdf */
-    const int N,       /* input: data vector length / 2 */
-    const WebRtc_Word16 isSWB12kHz)
-{
-  WebRtc_UWord32 W_lower, W_upper;
-  WebRtc_UWord32 W_upper_LSB, W_upper_MSB;
-  WebRtc_UWord8 *stream_ptr;
-  WebRtc_UWord8 *maxStreamPtr;
-  WebRtc_UWord8 *stream_ptr_carry;
-  WebRtc_UWord32 cdf_lo, cdf_hi;
-  int k;
-
-  /* point to beginning of stream buffer */
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-
-  maxStreamPtr = streamdata->stream + STREAM_SIZE_MAX_60 - 1;
-  for (k = 0; k < N; k++)
-  {
-    /* compute cdf_lower and cdf_upper by evaluating the piecewise linear cdf */
-    cdf_lo = piecewise((*dataQ7 - 64) * *envQ8);
-    cdf_hi = piecewise((*dataQ7 + 64) * *envQ8);
-
-    /* test and clip if probability gets too small */
-    while (cdf_lo+1 >= cdf_hi) {
-      /* clip */
-      if (*dataQ7 > 0) {
-        *dataQ7 -= 128;
-        cdf_hi = cdf_lo;
-        cdf_lo = piecewise((*dataQ7 - 64) * *envQ8);
-      } else {
-        *dataQ7 += 128;
-        cdf_lo = cdf_hi;
-        cdf_hi = piecewise((*dataQ7 + 64) * *envQ8);
-      }
-    }
-
-    dataQ7++;
-    // increment only once per 4 iterations for SWB-16kHz or WB
-    // increment only once per 2 iterations for SWB-12kHz
-    envQ8 += (isSWB12kHz)? (k & 1):((k & 1) & (k >> 1));
-
-
-    /* update interval */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-    W_lower = W_upper_MSB * cdf_lo;
-    W_lower += (W_upper_LSB * cdf_lo) >> 16;
-    W_upper = W_upper_MSB * cdf_hi;
-    W_upper += (W_upper_LSB * cdf_hi) >> 16;
-
-    /* shift interval such that it begins at zero */
-    W_upper -= ++W_lower;
-
-    /* add integer to bitstream */
-    streamdata->streamval += W_lower;
-
-    /* handle carry */
-    if (streamdata->streamval < W_lower)
-    {
-      /* propagate carry */
-      stream_ptr_carry = stream_ptr;
-      while (!(++(*--stream_ptr_carry)));
-    }
-
-    /* renormalize interval, store most significant byte of streamval and update streamval */
-    while ( !(W_upper & 0xFF000000) )      /* W_upper < 2^24 */
-    {
-      W_upper <<= 8;
-      *stream_ptr++ = (WebRtc_UWord8) (streamdata->streamval >> 24);
-
-      if(stream_ptr > maxStreamPtr)
-      {
-        return -ISAC_DISALLOWED_BITSTREAM_LENGTH;
-      }
-      streamdata->streamval <<= 8;
-    }
-  }
-
-  /* calculate new stream_index */
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-
-  return 0;
-}
-
-
-
-int WebRtcIsac_DecLogisticMulti2(
-    WebRtc_Word16 *dataQ7,       /* output: data vector */
-    Bitstr *streamdata,      /* in-/output struct containing bitstream */
-    const WebRtc_UWord16 *envQ8, /* input: side info vector defining the width of the pdf */
-    const WebRtc_Word16 *ditherQ7,/* input: dither vector */
-    const int N,         /* input: data vector length */
-    const WebRtc_Word16 isSWB12kHz)
-{
-  WebRtc_UWord32    W_lower, W_upper;
-  WebRtc_UWord32    W_tmp;
-  WebRtc_UWord32    W_upper_LSB, W_upper_MSB;
-  WebRtc_UWord32    streamval;
-  const WebRtc_UWord8 *stream_ptr;
-  WebRtc_UWord32    cdf_tmp;
-  WebRtc_Word16     candQ7;
-  int             k;
-
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-  if (streamdata->stream_index == 0)   /* first time decoder is called for this stream */
-  {
-    /* read first word from bytestream */
-    streamval = *stream_ptr << 24;
-    streamval |= *++stream_ptr << 16;
-    streamval |= *++stream_ptr << 8;
-    streamval |= *++stream_ptr;
-  } else {
-    streamval = streamdata->streamval;
-  }
-
-
-  for (k = 0; k < N; k++)
-  {
-    /* find the integer *data for which streamval lies in [W_lower+1, W_upper] */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-
-    /* find first candidate by inverting the logistic cdf */
-    candQ7 = - *ditherQ7 + 64;
-    cdf_tmp = piecewise(candQ7 * *envQ8);
-
-    W_tmp = W_upper_MSB * cdf_tmp;
-    W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-    if (streamval > W_tmp)
-    {
-      W_lower = W_tmp;
-      candQ7 += 128;
-      cdf_tmp = piecewise(candQ7 * *envQ8);
-
-      W_tmp = W_upper_MSB * cdf_tmp;
-      W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-      while (streamval > W_tmp)
-      {
-        W_lower = W_tmp;
-        candQ7 += 128;
-        cdf_tmp = piecewise(candQ7 * *envQ8);
-
-        W_tmp = W_upper_MSB * cdf_tmp;
-        W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-
-        /* error check */
-        if (W_lower == W_tmp) return -1;
-      }
-      W_upper = W_tmp;
-
-      /* another sample decoded */
-      *dataQ7 = candQ7 - 64;
-    }
-    else
-    {
-      W_upper = W_tmp;
-      candQ7 -= 128;
-      cdf_tmp = piecewise(candQ7 * *envQ8);
-
-      W_tmp = W_upper_MSB * cdf_tmp;
-      W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-      while ( !(streamval > W_tmp) )
-      {
-        W_upper = W_tmp;
-        candQ7 -= 128;
-        cdf_tmp = piecewise(candQ7 * *envQ8);
-
-        W_tmp = W_upper_MSB * cdf_tmp;
-        W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-
-        /* error check */
-        if (W_upper == W_tmp) return -1;
-      }
-      W_lower = W_tmp;
-
-      /* another sample decoded */
-      *dataQ7 = candQ7 + 64;
-    }
-    ditherQ7++;
-    dataQ7++;
-    // increment only once per 4 iterations for SWB-16kHz or WB
-    // increment only once per 2 iterations for SWB-12kHz
-    envQ8 += (isSWB12kHz)? (k & 1):((k & 1) & (k >> 1));
-
-    /* shift interval to start at zero */
-    W_upper -= ++W_lower;
-
-    /* add integer to bitstream */
-    streamval -= W_lower;
-
-    /* renormalize interval and update streamval */
-    while ( !(W_upper & 0xFF000000) )    /* W_upper < 2^24 */
-    {
-      /* read next byte from stream */
-      streamval = (streamval << 8) | *++stream_ptr;
-      W_upper <<= 8;
-    }
-  }
-
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-  streamdata->streamval = streamval;
-
-  /* find number of bytes in original stream (determined by current interval width) */
-  if ( W_upper > 0x01FFFFFF )
-    return streamdata->stream_index - 2;
-  else
-    return streamdata->stream_index - 1;
-}
diff --git a/src/mod/codecs/mod_isac/auto_corr_to_refl_coef.c b/src/mod/codecs/mod_isac/auto_corr_to_refl_coef.c
deleted file mode 100644
index b0ed4605f4..0000000000
--- a/src/mod/codecs/mod_isac/auto_corr_to_refl_coef.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_AutoCorrToReflCoef().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-void WebRtcSpl_AutoCorrToReflCoef(G_CONST WebRtc_Word32 *R, int use_order, WebRtc_Word16 *K)
-{
-    int i, n;
-    WebRtc_Word16 tmp;
-    G_CONST WebRtc_Word32 *rptr;
-    WebRtc_Word32 L_num, L_den;
-    WebRtc_Word16 *acfptr, *pptr, *wptr, *p1ptr, *w1ptr, ACF[WEBRTC_SPL_MAX_LPC_ORDER],
-            P[WEBRTC_SPL_MAX_LPC_ORDER], W[WEBRTC_SPL_MAX_LPC_ORDER];
-
-    // Initialize loop and pointers.
-    acfptr = ACF;
-    rptr = R;
-    pptr = P;
-    p1ptr = &P[1];
-    w1ptr = &W[1];
-    wptr = w1ptr;
-
-    // First loop; n=0. Determine shifting.
-    tmp = WebRtcSpl_NormW32(*R);
-    *acfptr = (WebRtc_Word16)((*rptr++ << tmp) >> 16);
-    *pptr++ = *acfptr++;
-
-    // Initialize ACF, P and W.
-    for (i = 1; i <= use_order; i++)
-    {
-        *acfptr = (WebRtc_Word16)((*rptr++ << tmp) >> 16);
-        *wptr++ = *acfptr;
-        *pptr++ = *acfptr++;
-    }
-
-    // Compute reflection coefficients.
-    for (n = 1; n <= use_order; n++, K++)
-    {
-        tmp = WEBRTC_SPL_ABS_W16(*p1ptr);
-        if (*P < tmp)
-        {
-            for (i = n; i <= use_order; i++)
-                *K++ = 0;
-
-            return;
-        }
-
-        // Division: WebRtcSpl_div(tmp, *P)
-        *K = 0;
-        if (tmp != 0)
-        {
-            L_num = tmp;
-            L_den = *P;
-            i = 15;
-            while (i--)
-            {
-                (*K) <<= 1;
-                L_num <<= 1;
-                if (L_num >= L_den)
-                {
-                    L_num -= L_den;
-                    (*K)++;
-                }
-            }
-            if (*p1ptr > 0)
-                *K = -*K;
-        }
-
-        // Last iteration; don't do Schur recursion.
-        if (n == use_order)
-            return;
-
-        // Schur recursion.
-        pptr = P;
-        wptr = w1ptr;
-        tmp = (WebRtc_Word16)(((WebRtc_Word32)*p1ptr * (WebRtc_Word32)*K + 16384) >> 15);
-        *pptr = WEBRTC_SPL_ADD_SAT_W16( *pptr, tmp );
-        pptr++;
-        for (i = 1; i <= use_order - n; i++)
-        {
-            tmp = (WebRtc_Word16)(((WebRtc_Word32)*wptr * (WebRtc_Word32)*K + 16384) >> 15);
-            *pptr = WEBRTC_SPL_ADD_SAT_W16( *(pptr+1), tmp );
-            pptr++;
-            tmp = (WebRtc_Word16)(((WebRtc_Word32)*pptr * (WebRtc_Word32)*K + 16384) >> 15);
-            *wptr = WEBRTC_SPL_ADD_SAT_W16( *wptr, tmp );
-            wptr++;
-        }
-    }
-}
diff --git a/src/mod/codecs/mod_isac/auto_correlation.c b/src/mod/codecs/mod_isac/auto_correlation.c
deleted file mode 100644
index a00fde4bc3..0000000000
--- a/src/mod/codecs/mod_isac/auto_correlation.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_AutoCorrelation().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-int WebRtcSpl_AutoCorrelation(G_CONST WebRtc_Word16* in_vector,
-                              int in_vector_length,
-                              int order,
-                              WebRtc_Word32* result,
-                              int* scale)
-{
-    WebRtc_Word32 sum;
-    int i, j;
-    WebRtc_Word16 smax; // Sample max
-    G_CONST WebRtc_Word16* xptr1;
-    G_CONST WebRtc_Word16* xptr2;
-    WebRtc_Word32* resultptr;
-    int scaling = 0;
-
-#ifdef _ARM_OPT_
-#pragma message("NOTE: _ARM_OPT_ optimizations are used")
-    WebRtc_Word16 loops4;
-#endif
-
-    if (order < 0)
-        order = in_vector_length;
-
-    // Find the max. sample
-    smax = WebRtcSpl_MaxAbsValueW16(in_vector, in_vector_length);
-
-    // In order to avoid overflow when computing the sum we should scale the samples so that
-    // (in_vector_length * smax * smax) will not overflow.
-
-    if (smax == 0)
-    {
-        scaling = 0;
-    } else
-    {
-        int nbits = WebRtcSpl_GetSizeInBits(in_vector_length); // # of bits in the sum loop
-        int t = WebRtcSpl_NormW32(WEBRTC_SPL_MUL(smax, smax)); // # of bits to normalize smax
-
-        if (t > nbits)
-        {
-            scaling = 0;
-        } else
-        {
-            scaling = nbits - t;
-        }
-
-    }
-
-    resultptr = result;
-
-    // Perform the actual correlation calculation
-    for (i = 0; i < order + 1; i++)
-    {
-        int loops = (in_vector_length - i);
-        sum = 0;
-        xptr1 = in_vector;
-        xptr2 = &in_vector[i];
-#ifndef _ARM_OPT_
-        for (j = loops; j > 0; j--)
-        {
-            sum += WEBRTC_SPL_MUL_16_16_RSFT(*xptr1++, *xptr2++, scaling);
-        }
-#else
-        loops4 = (loops >> 2) << 2;
-
-        if (scaling == 0)
-        {
-            for (j = 0; j < loops4; j = j + 4)
-            {
-                sum += WEBRTC_SPL_MUL_16_16(*xptr1, *xptr2);
-                xptr1++;
-                xptr2++;
-                sum += WEBRTC_SPL_MUL_16_16(*xptr1, *xptr2);
-                xptr1++;
-                xptr2++;
-                sum += WEBRTC_SPL_MUL_16_16(*xptr1, *xptr2);
-                xptr1++;
-                xptr2++;
-                sum += WEBRTC_SPL_MUL_16_16(*xptr1, *xptr2);
-                xptr1++;
-                xptr2++;
-            }
-
-            for (j = loops4; j < loops; j++)
-            {
-                sum += WEBRTC_SPL_MUL_16_16(*xptr1, *xptr2);
-                xptr1++;
-                xptr2++;
-            }
-        }
-        else
-        {
-            for (j = 0; j < loops4; j = j + 4)
-            {
-                sum += WEBRTC_SPL_MUL_16_16_RSFT(*xptr1, *xptr2, scaling);
-                xptr1++;
-                xptr2++;
-                sum += WEBRTC_SPL_MUL_16_16_RSFT(*xptr1, *xptr2, scaling);
-                xptr1++;
-                xptr2++;
-                sum += WEBRTC_SPL_MUL_16_16_RSFT(*xptr1, *xptr2, scaling);
-                xptr1++;
-                xptr2++;
-                sum += WEBRTC_SPL_MUL_16_16_RSFT(*xptr1, *xptr2, scaling);
-                xptr1++;
-                xptr2++;
-            }
-
-            for (j = loops4; j < loops; j++)
-            {
-                sum += WEBRTC_SPL_MUL_16_16_RSFT(*xptr1, *xptr2, scaling);
-                xptr1++;
-                xptr2++;
-            }
-        }
-
-#endif
-        *resultptr++ = sum;
-    }
-
-    *scale = scaling;
-
-    return order + 1;
-}
diff --git a/src/mod/codecs/mod_isac/bandwidth_estimator.c b/src/mod/codecs/mod_isac/bandwidth_estimator.c
deleted file mode 100644
index c84ace38c5..0000000000
--- a/src/mod/codecs/mod_isac/bandwidth_estimator.c
+++ /dev/null
@@ -1,1024 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * BwEstimator.c
- *
- * This file contains the code for the Bandwidth Estimator designed
- * for iSAC.
- *
- */
-
-#include "bandwidth_estimator.h"
-#include "settings.h"
-#include "isac.h"
-
-#include <math.h>
-
-/* array of quantization levels for bottle neck info; Matlab code: */
-/* sprintf('%4.1ff, ', logspace(log10(5000), log10(40000), 12)) */
-static const float kQRateTableWb[12] =
-{
-  10000.0f, 11115.3f, 12355.1f, 13733.1f, 15264.8f, 16967.3f,
-  18859.8f, 20963.3f, 23301.4f, 25900.3f, 28789.0f, 32000.0f};
-
-
-static const float kQRateTableSwb[24] =
-{
-  10000.0f, 11115.3f, 12355.1f, 13733.1f, 15264.8f, 16967.3f,
-  18859.8f, 20963.3f, 23153.1f, 25342.9f, 27532.7f, 29722.5f,
-  31912.3f, 34102.1f, 36291.9f, 38481.7f, 40671.4f, 42861.2f,
-  45051.0f, 47240.8f, 49430.6f, 51620.4f, 53810.2f, 56000.0f,
-};
-
-
-
-
-WebRtc_Word32 WebRtcIsac_InitBandwidthEstimator(
-    BwEstimatorstr*              bwest_str,
-    enum IsacSamplingRate encoderSampRate,
-    enum IsacSamplingRate decoderSampRate)
-{
-  switch(encoderSampRate)
-  {
-    case kIsacWideband:
-      {
-        bwest_str->send_bw_avg       = INIT_BN_EST_WB;
-        break;
-      }
-    case kIsacSuperWideband:
-      {
-        bwest_str->send_bw_avg       = INIT_BN_EST_SWB;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  switch(decoderSampRate)
-  {
-    case kIsacWideband:
-      {
-        bwest_str->prev_frame_length = INIT_FRAME_LEN_WB;
-        bwest_str->rec_bw_inv        = 1.0f /
-            (INIT_BN_EST_WB + INIT_HDR_RATE_WB);
-        bwest_str->rec_bw            = (WebRtc_Word32)INIT_BN_EST_WB;
-        bwest_str->rec_bw_avg_Q      = INIT_BN_EST_WB;
-        bwest_str->rec_bw_avg        = INIT_BN_EST_WB + INIT_HDR_RATE_WB;
-        bwest_str->rec_header_rate   = INIT_HDR_RATE_WB;
-        break;
-      }
-    case kIsacSuperWideband:
-      {
-        bwest_str->prev_frame_length = INIT_FRAME_LEN_SWB;
-        bwest_str->rec_bw_inv        = 1.0f /
-            (INIT_BN_EST_SWB + INIT_HDR_RATE_SWB);
-        bwest_str->rec_bw            = (WebRtc_Word32)INIT_BN_EST_SWB;
-        bwest_str->rec_bw_avg_Q      = INIT_BN_EST_SWB;
-        bwest_str->rec_bw_avg        = INIT_BN_EST_SWB + INIT_HDR_RATE_SWB;
-        bwest_str->rec_header_rate   = INIT_HDR_RATE_SWB;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  bwest_str->prev_rec_rtp_number       = 0;
-  bwest_str->prev_rec_arr_ts           = 0;
-  bwest_str->prev_rec_send_ts          = 0;
-  bwest_str->prev_rec_rtp_rate         = 1.0f;
-  bwest_str->last_update_ts            = 0;
-  bwest_str->last_reduction_ts         = 0;
-  bwest_str->count_tot_updates_rec     = -9;
-  bwest_str->rec_jitter                = 10.0f;
-  bwest_str->rec_jitter_short_term     = 0.0f;
-  bwest_str->rec_jitter_short_term_abs = 5.0f;
-  bwest_str->rec_max_delay             = 10.0f;
-  bwest_str->rec_max_delay_avg_Q       = 10.0f;
-  bwest_str->num_pkts_rec              = 0;
-
-  bwest_str->send_max_delay_avg        = 10.0f;
-
-  bwest_str->hsn_detect_rec = 0;
-
-  bwest_str->num_consec_rec_pkts_over_30k = 0;
-
-  bwest_str->hsn_detect_snd = 0;
-
-  bwest_str->num_consec_snt_pkts_over_30k = 0;
-
-  bwest_str->in_wait_period = 0;
-
-  bwest_str->change_to_WB = 0;
-
-  bwest_str->numConsecLatePkts = 0;
-  bwest_str->consecLatency = 0;
-  bwest_str->inWaitLatePkts = 0;
-  bwest_str->senderTimestamp = 0;
-  bwest_str->receiverTimestamp = 0;
-  return 0;
-}
-
-/* This function updates both bottle neck rates                                                      */
-/* Parameters:                                                                                       */
-/* rtp_number    - value from RTP packet, from NetEq                                                 */
-/* frame length  - length of signal frame in ms, from iSAC decoder                                   */
-/* send_ts       - value in RTP header giving send time in samples                                     */
-/* arr_ts        - value given by timeGetTime() time of arrival in samples of packet from NetEq      */
-/* pksize        - size of packet in bytes, from NetEq                                               */
-/* Index         - integer (range 0...23) indicating bottle neck & jitter as estimated by other side */
-/* returns 0 if everything went fine, -1 otherwise                                                   */
-WebRtc_Word16 WebRtcIsac_UpdateBandwidthEstimator(
-    BwEstimatorstr *bwest_str,
-    const WebRtc_UWord16 rtp_number,
-    const WebRtc_Word32  frame_length,
-    const WebRtc_UWord32 send_ts,
-    const WebRtc_UWord32 arr_ts,
-    const WebRtc_Word32  pksize
-    /*,    const WebRtc_UWord16 Index*/)
-{
-  float weight = 0.0f;
-  float curr_bw_inv = 0.0f;
-  float rec_rtp_rate;
-  float t_diff_proj;
-  float arr_ts_diff;
-  float send_ts_diff;
-  float arr_time_noise;
-  float arr_time_noise_abs;
-
-  float delay_correction_factor = 1;
-  float late_diff = 0.0f;
-  int immediate_set = 0;
-  int num_pkts_expected;
-
-
-  // We have to adjust the header-rate if the first packet has a
-  // frame-size different than the initialized value.
-  if ( frame_length != bwest_str->prev_frame_length )
-  {
-    bwest_str->rec_header_rate = (float)HEADER_SIZE * 8.0f *
-        1000.0f / (float)frame_length;     /* bits/s */
-  }
-
-  /* UPDATE ESTIMATES ON THIS SIDE */
-  /* compute far-side transmission rate */
-  rec_rtp_rate = ((float)pksize * 8.0f * 1000.0f / (float)frame_length) +
-      bwest_str->rec_header_rate;
-  // rec_rtp_rate packet bits/s + header bits/s
-
-  /* check for timer wrap-around */
-  if (arr_ts < bwest_str->prev_rec_arr_ts)
-  {
-    bwest_str->prev_rec_arr_ts   = arr_ts;
-    bwest_str->last_update_ts    = arr_ts;
-    bwest_str->last_reduction_ts = arr_ts + 3*FS;
-    bwest_str->num_pkts_rec      = 0;
-
-    /* store frame length */
-    bwest_str->prev_frame_length = frame_length;
-
-    /* store far-side transmission rate */
-    bwest_str->prev_rec_rtp_rate = rec_rtp_rate;
-
-    /* store far-side RTP time stamp */
-    bwest_str->prev_rec_rtp_number = rtp_number;
-
-    return 0;
-  }
-
-  bwest_str->num_pkts_rec++;
-
-  /* check that it's not one of the first 9 packets */
-  if ( bwest_str->count_tot_updates_rec > 0 )
-  {
-    if(bwest_str->in_wait_period > 0 )
-    {
-      bwest_str->in_wait_period--;
-    }
-
-    bwest_str->inWaitLatePkts -= ((bwest_str->inWaitLatePkts > 0)? 1:0);
-    send_ts_diff = (float)(send_ts - bwest_str->prev_rec_send_ts);
-
-    if (send_ts_diff <= (16 * frame_length)*2)
-      //doesn't allow for a dropped packet, not sure necessary to be
-      // that strict -DH
-    {
-      /* if not been updated for a long time, reduce the BN estimate */
-      if((WebRtc_UWord32)(arr_ts - bwest_str->last_update_ts) *
-         1000.0f / FS > 3000)
-      {
-        //how many frames should have been received since the last
-        // update if too many have been dropped or there have been
-        // big delays won't allow this reduction may no longer need
-        // the send_ts_diff here
-        num_pkts_expected = (int)(((float)(arr_ts -
-                                           bwest_str->last_update_ts) * 1000.0f /(float) FS) /
-                                  (float)frame_length);
-
-        if(((float)bwest_str->num_pkts_rec/(float)num_pkts_expected) >
-           0.9)
-        {
-          float inv_bitrate = (float) pow( 0.99995,
-                                           (double)((WebRtc_UWord32)(arr_ts -
-                                                                     bwest_str->last_reduction_ts)*1000.0f/FS) );
-
-          if ( inv_bitrate )
-          {
-            bwest_str->rec_bw_inv /= inv_bitrate;
-
-            //precautionary, likely never necessary
-            if (bwest_str->hsn_detect_snd &&
-                bwest_str->hsn_detect_rec)
-            {
-              if (bwest_str->rec_bw_inv > 0.000066f)
-              {
-                bwest_str->rec_bw_inv = 0.000066f;
-              }
-            }
-          }
-          else
-          {
-            bwest_str->rec_bw_inv = 1.0f /
-                (INIT_BN_EST_WB + INIT_HDR_RATE_WB);
-          }
-          /* reset time-since-update counter */
-          bwest_str->last_reduction_ts = arr_ts;
-        }
-        else
-          //reset here?
-        {
-          bwest_str->last_reduction_ts = arr_ts + 3*FS;
-          bwest_str->last_update_ts = arr_ts;
-          bwest_str->num_pkts_rec = 0;
-        }
-      }
-    }
-    else
-    {
-      bwest_str->last_reduction_ts = arr_ts + 3*FS;
-      bwest_str->last_update_ts = arr_ts;
-      bwest_str->num_pkts_rec = 0;
-    }
-
-
-    /* temporarily speed up adaptation if frame length has changed */
-    if ( frame_length != bwest_str->prev_frame_length )
-    {
-      bwest_str->count_tot_updates_rec = 10;
-      bwest_str->rec_header_rate = (float)HEADER_SIZE * 8.0f *
-          1000.0f / (float)frame_length;     /* bits/s */
-
-      bwest_str->rec_bw_inv = 1.0f /((float)bwest_str->rec_bw +
-                                     bwest_str->rec_header_rate);
-    }
-
-    ////////////////////////
-    arr_ts_diff = (float)(arr_ts - bwest_str->prev_rec_arr_ts);
-
-    if (send_ts_diff > 0 )
-    {
-      late_diff = arr_ts_diff - send_ts_diff;
-    }
-    else
-    {
-      late_diff = arr_ts_diff - (float)(16 * frame_length);
-    }
-
-    if((late_diff > 0) && !bwest_str->inWaitLatePkts)
-    {
-      bwest_str->numConsecLatePkts++;
-      bwest_str->consecLatency += late_diff;
-    }
-    else
-    {
-      bwest_str->numConsecLatePkts = 0;
-      bwest_str->consecLatency = 0;
-    }
-    if(bwest_str->numConsecLatePkts > 50)
-    {
-      float latencyMs = bwest_str->consecLatency/(FS/1000);
-      float averageLatencyMs = latencyMs / bwest_str->numConsecLatePkts;
-      delay_correction_factor = frame_length / (frame_length + averageLatencyMs);
-      immediate_set = 1;
-      bwest_str->inWaitLatePkts = (WebRtc_Word16)((bwest_str->consecLatency/(FS/1000)) / 30);// + 150;
-      bwest_str->start_wait_period = arr_ts;
-    }
-    ///////////////////////////////////////////////
-
-
-
-    /*   update only if previous packet was not lost */
-    if ( rtp_number == bwest_str->prev_rec_rtp_number + 1 )
-    {
-
-
-      if (!(bwest_str->hsn_detect_snd && bwest_str->hsn_detect_rec))
-      {
-        if ((arr_ts_diff > (float)(16 * frame_length)))
-        {
-          //1/2 second
-          if ((late_diff > 8000.0f) && !bwest_str->in_wait_period)
-          {
-            delay_correction_factor = 0.7f;
-            bwest_str->in_wait_period = 55;
-            bwest_str->start_wait_period = arr_ts;
-            immediate_set = 1;
-          }
-          //320 ms
-          else if (late_diff > 5120.0f && !bwest_str->in_wait_period)
-          {
-            delay_correction_factor = 0.8f;
-            immediate_set = 1;
-            bwest_str->in_wait_period = 44;
-            bwest_str->start_wait_period = arr_ts;
-          }
-        }
-      }
-
-
-      if ((bwest_str->prev_rec_rtp_rate > bwest_str->rec_bw_avg) &&
-          (rec_rtp_rate > bwest_str->rec_bw_avg)                 &&
-          !bwest_str->in_wait_period)
-      {
-        /* test if still in initiation period and increment counter */
-        if (bwest_str->count_tot_updates_rec++ > 99)
-        {
-          /* constant weight after initiation part */
-          weight = 0.01f;
-        }
-        else
-        {
-          /* weight decreases with number of updates */
-          weight = 1.0f / (float) bwest_str->count_tot_updates_rec;
-        }
-        /* Bottle Neck Estimation */
-
-        /* limit outliers */
-        /* if more than 25 ms too much */
-        if (arr_ts_diff > frame_length * FS/1000 + 400.0f)
-        {
-          // in samples,  why 25ms??
-          arr_ts_diff = frame_length * FS/1000 + 400.0f;
-        }
-        if(arr_ts_diff < (frame_length * FS/1000) - 160.0f)
-        {
-          /* don't allow it to be less than frame rate - 10 ms */
-          arr_ts_diff = (float)frame_length * FS/1000 - 160.0f;
-        }
-
-        /* compute inverse receiving rate for last packet */
-        curr_bw_inv = arr_ts_diff / ((float)(pksize + HEADER_SIZE) *
-                                     8.0f * FS); // (180+35)*8*16000 = 27.5 Mbit....
-
-
-        if(curr_bw_inv <
-           (1.0f / (MAX_ISAC_BW + bwest_str->rec_header_rate)))
-        {
-          // don't allow inv rate to be larger than MAX
-          curr_bw_inv = (1.0f /
-                         (MAX_ISAC_BW + bwest_str->rec_header_rate));
-        }
-
-        /* update bottle neck rate estimate */
-        bwest_str->rec_bw_inv = weight * curr_bw_inv +
-            (1.0f - weight) * bwest_str->rec_bw_inv;
-
-        /* reset time-since-update counter */
-        bwest_str->last_update_ts    = arr_ts;
-        bwest_str->last_reduction_ts = arr_ts + 3 * FS;
-        bwest_str->num_pkts_rec = 0;
-
-        /* Jitter Estimation */
-        /* projected difference between arrival times */
-        t_diff_proj = ((float)(pksize + HEADER_SIZE) * 8.0f *
-                       1000.0f) / bwest_str->rec_bw_avg;
-
-
-        // difference between projected and actual
-        //   arrival time differences
-        arr_time_noise = (float)(arr_ts_diff*1000.0f/FS) -
-            t_diff_proj;
-        arr_time_noise_abs = (float) fabs( arr_time_noise );
-
-        /* long term averaged absolute jitter */
-        bwest_str->rec_jitter = weight * arr_time_noise_abs +
-            (1.0f - weight) * bwest_str->rec_jitter;
-        if (bwest_str->rec_jitter > 10.0f)
-        {
-          bwest_str->rec_jitter = 10.0f;
-        }
-        /* short term averaged absolute jitter */
-        bwest_str->rec_jitter_short_term_abs = 0.05f *
-            arr_time_noise_abs + 0.95f *
-            bwest_str->rec_jitter_short_term_abs;
-
-        /* short term averaged jitter */
-        bwest_str->rec_jitter_short_term = 0.05f * arr_time_noise +
-            0.95f * bwest_str->rec_jitter_short_term;
-      }
-    }
-  }
-  else
-  {
-    // reset time-since-update counter when
-    // receiving the first 9 packets
-    bwest_str->last_update_ts    = arr_ts;
-    bwest_str->last_reduction_ts = arr_ts + 3*FS;
-    bwest_str->num_pkts_rec = 0;
-
-    bwest_str->count_tot_updates_rec++;
-  }
-
-  /* limit minimum bottle neck rate */
-  if (bwest_str->rec_bw_inv > 1.0f / ((float)MIN_ISAC_BW +
-                                      bwest_str->rec_header_rate))
-  {
-    bwest_str->rec_bw_inv = 1.0f / ((float)MIN_ISAC_BW +
-                                    bwest_str->rec_header_rate);
-  }
-
-  // limit maximum bitrate
-  if (bwest_str->rec_bw_inv < 1.0f / ((float)MAX_ISAC_BW +
-                                      bwest_str->rec_header_rate))
-  {
-    bwest_str->rec_bw_inv = 1.0f / ((float)MAX_ISAC_BW +
-                                    bwest_str->rec_header_rate);
-  }
-
-  /* store frame length */
-  bwest_str->prev_frame_length = frame_length;
-
-  /* store far-side transmission rate */
-  bwest_str->prev_rec_rtp_rate = rec_rtp_rate;
-
-  /* store far-side RTP time stamp */
-  bwest_str->prev_rec_rtp_number = rtp_number;
-
-  // Replace bwest_str->rec_max_delay by the new
-  // value (atomic operation)
-  bwest_str->rec_max_delay = 3.0f * bwest_str->rec_jitter;
-
-  /* store send and arrival time stamp */
-  bwest_str->prev_rec_arr_ts = arr_ts ;
-  bwest_str->prev_rec_send_ts = send_ts;
-
-  /* Replace bwest_str->rec_bw by the new value (atomic operation) */
-  bwest_str->rec_bw = (WebRtc_Word32)(1.0f / bwest_str->rec_bw_inv -
-                                      bwest_str->rec_header_rate);
-
-  if (immediate_set)
-  {
-    bwest_str->rec_bw = (WebRtc_Word32) (delay_correction_factor *
-                                         (float) bwest_str->rec_bw);
-
-    if (bwest_str->rec_bw < (WebRtc_Word32) MIN_ISAC_BW)
-    {
-      bwest_str->rec_bw = (WebRtc_Word32) MIN_ISAC_BW;
-    }
-
-    bwest_str->rec_bw_avg = bwest_str->rec_bw +
-        bwest_str->rec_header_rate;
-
-    bwest_str->rec_bw_avg_Q = (float) bwest_str->rec_bw;
-
-    bwest_str->rec_jitter_short_term = 0.0f;
-
-    bwest_str->rec_bw_inv = 1.0f / (bwest_str->rec_bw +
-                                    bwest_str->rec_header_rate);
-
-    bwest_str->count_tot_updates_rec = 1;
-
-    immediate_set = 0;
-    bwest_str->consecLatency = 0;
-    bwest_str->numConsecLatePkts = 0;
-  }
-
-  return 0;
-}
-
-
-/* This function updates the send bottle neck rate                                                   */
-/* Index         - integer (range 0...23) indicating bottle neck & jitter as estimated by other side */
-/* returns 0 if everything went fine, -1 otherwise                                                   */
-WebRtc_Word16 WebRtcIsac_UpdateUplinkBwImpl(
-    BwEstimatorstr*           bwest_str,
-    WebRtc_Word16               index,
-    enum IsacSamplingRate encoderSamplingFreq)
-{
-  if((index < 0) || (index > 23))
-  {
-    return -ISAC_RANGE_ERROR_BW_ESTIMATOR;
-  }
-
-  /* UPDATE ESTIMATES FROM OTHER SIDE */
-  if(encoderSamplingFreq == kIsacWideband)
-  {
-    if(index > 11)
-    {
-      index -= 12;
-      /* compute the jitter estimate as decoded on the other side */
-      bwest_str->send_max_delay_avg = 0.9f * bwest_str->send_max_delay_avg +
-          0.1f * (float)MAX_ISAC_MD;
-    }
-    else
-    {
-      /* compute the jitter estimate as decoded on the other side */
-      bwest_str->send_max_delay_avg = 0.9f * bwest_str->send_max_delay_avg +
-          0.1f * (float)MIN_ISAC_MD;
-    }
-
-    /* compute the BN estimate as decoded on the other side */
-    bwest_str->send_bw_avg = 0.9f * bwest_str->send_bw_avg +
-        0.1f * kQRateTableWb[index];
-  }
-  else
-  {
-    /* compute the BN estimate as decoded on the other side */
-    bwest_str->send_bw_avg = 0.9f * bwest_str->send_bw_avg +
-        0.1f * kQRateTableSwb[index];
-  }
-
-  if (bwest_str->send_bw_avg > (float) 28000 && !bwest_str->hsn_detect_snd)
-  {
-    bwest_str->num_consec_snt_pkts_over_30k++;
-
-    if (bwest_str->num_consec_snt_pkts_over_30k >= 66)
-    {
-      //approx 2 seconds with 30ms frames
-      bwest_str->hsn_detect_snd = 1;
-    }
-  }
-  else if (!bwest_str->hsn_detect_snd)
-  {
-    bwest_str->num_consec_snt_pkts_over_30k = 0;
-  }
-  return 0;
-}
-
-// called when there is upper-band bit-stream to update jitter
-// statistics.
-WebRtc_Word16 WebRtcIsac_UpdateUplinkJitter(
-    BwEstimatorstr*              bwest_str,
-    WebRtc_Word32                  index)
-{
-  if((index < 0) || (index > 23))
-  {
-    return -ISAC_RANGE_ERROR_BW_ESTIMATOR;
-  }
-
-  if(index > 0)
-  {
-    /* compute the jitter estimate as decoded on the other side */
-    bwest_str->send_max_delay_avg = 0.9f * bwest_str->send_max_delay_avg +
-        0.1f * (float)MAX_ISAC_MD;
-  }
-  else
-  {
-    /* compute the jitter estimate as decoded on the other side */
-    bwest_str->send_max_delay_avg = 0.9f * bwest_str->send_max_delay_avg +
-        0.1f * (float)MIN_ISAC_MD;
-  }
-
-  return 0;
-}
-
-
-
-// Returns the bandwidth/jitter estimation code (integer 0...23)
-// to put in the sending iSAC payload
-WebRtc_UWord16
-WebRtcIsac_GetDownlinkBwJitIndexImpl(
-    BwEstimatorstr*           bwest_str,
-    WebRtc_Word16*              bottleneckIndex,
-    WebRtc_Word16*              jitterInfo,
-    enum IsacSamplingRate decoderSamplingFreq)
-{
-  float MaxDelay;
-  //WebRtc_UWord16 MaxDelayBit;
-
-  float rate;
-  float r;
-  float e1, e2;
-  const float weight = 0.1f;
-  const float* ptrQuantizationTable;
-  WebRtc_Word16 addJitterInfo;
-  WebRtc_Word16 minInd;
-  WebRtc_Word16 maxInd;
-  WebRtc_Word16 midInd;
-
-  /* Get Max Delay Bit */
-  /* get unquantized max delay */
-  MaxDelay = (float)WebRtcIsac_GetDownlinkMaxDelay(bwest_str);
-
-  if ( ((1.f - weight) * bwest_str->rec_max_delay_avg_Q + weight *
-        MAX_ISAC_MD - MaxDelay) > (MaxDelay - (1.f-weight) *
-                                   bwest_str->rec_max_delay_avg_Q - weight * MIN_ISAC_MD) )
-  {
-    jitterInfo[0] = 0;
-    /* update quantized average */
-    bwest_str->rec_max_delay_avg_Q =
-        (1.f - weight) * bwest_str->rec_max_delay_avg_Q + weight *
-        (float)MIN_ISAC_MD;
-  }
-  else
-  {
-    jitterInfo[0] = 1;
-    /* update quantized average */
-    bwest_str->rec_max_delay_avg_Q =
-        (1.f-weight) * bwest_str->rec_max_delay_avg_Q + weight *
-        (float)MAX_ISAC_MD;
-  }
-
-  // Get unquantized rate.
-  rate = (float)WebRtcIsac_GetDownlinkBandwidth(bwest_str);
-
-  /* Get Rate Index */
-  if(decoderSamplingFreq == kIsacWideband)
-  {
-    ptrQuantizationTable = kQRateTableWb;
-    addJitterInfo = 1;
-    maxInd = 11;
-  }
-  else
-  {
-    ptrQuantizationTable = kQRateTableSwb;
-    addJitterInfo = 0;
-    maxInd = 23;
-  }
-
-  minInd = 0;
-  while(maxInd > minInd + 1)
-  {
-    midInd = (maxInd + minInd) >> 1;
-    if(rate > ptrQuantizationTable[midInd])
-    {
-      minInd = midInd;
-    }
-    else
-    {
-      maxInd = midInd;
-    }
-  }
-  // Chose the index which gives results an average which is closest
-  // to rate
-  r = (1 - weight) * bwest_str->rec_bw_avg_Q - rate;
-  e1 = weight * ptrQuantizationTable[minInd] + r;
-  e2 = weight * ptrQuantizationTable[maxInd] + r;
-  e1 = (e1 > 0)? e1:-e1;
-  e2 = (e2 > 0)? e2:-e2;
-  if(e1 < e2)
-  {
-    bottleneckIndex[0] = minInd;
-  }
-  else
-  {
-    bottleneckIndex[0] = maxInd;
-  }
-
-  bwest_str->rec_bw_avg_Q = (1 - weight) * bwest_str->rec_bw_avg_Q +
-      weight * ptrQuantizationTable[bottleneckIndex[0]];
-  bottleneckIndex[0] += jitterInfo[0] * 12 * addJitterInfo;
-
-  bwest_str->rec_bw_avg = (1 - weight) * bwest_str->rec_bw_avg + weight *
-      (rate + bwest_str->rec_header_rate);
-
-  return 0;
-}
-
-
-
-/* get the bottle neck rate from far side to here, as estimated on this side */
-WebRtc_Word32 WebRtcIsac_GetDownlinkBandwidth( const BwEstimatorstr *bwest_str)
-{
-  WebRtc_Word32  rec_bw;
-  float   jitter_sign;
-  float   bw_adjust;
-
-  /* create a value between -1.0 and 1.0 indicating "average sign" of jitter */
-  jitter_sign = bwest_str->rec_jitter_short_term /
-      bwest_str->rec_jitter_short_term_abs;
-
-  /* adjust bw proportionally to negative average jitter sign */
-  bw_adjust = 1.0f - jitter_sign * (0.15f + 0.15f * jitter_sign * jitter_sign);
-
-  /* adjust Rate if jitter sign is mostly constant */
-  rec_bw = (WebRtc_Word32)(bwest_str->rec_bw * bw_adjust);
-
-  /* limit range of bottle neck rate */
-  if (rec_bw < MIN_ISAC_BW)
-  {
-    rec_bw = MIN_ISAC_BW;
-  }
-  else if (rec_bw > MAX_ISAC_BW)
-  {
-    rec_bw = MAX_ISAC_BW;
-  }
-  return rec_bw;
-}
-
-/* Returns the max delay (in ms) */
-WebRtc_Word32
-WebRtcIsac_GetDownlinkMaxDelay(const BwEstimatorstr *bwest_str)
-{
-  WebRtc_Word32 rec_max_delay;
-
-  rec_max_delay = (WebRtc_Word32)(bwest_str->rec_max_delay);
-
-  /* limit range of jitter estimate */
-  if (rec_max_delay < MIN_ISAC_MD)
-  {
-    rec_max_delay = MIN_ISAC_MD;
-  }
-  else if (rec_max_delay > MAX_ISAC_MD)
-  {
-    rec_max_delay = MAX_ISAC_MD;
-  }
-  return rec_max_delay;
-}
-
-/* get the bottle neck rate from here to far side, as estimated by far side */
-void
-WebRtcIsac_GetUplinkBandwidth(
-    const BwEstimatorstr* bwest_str,
-    WebRtc_Word32*          bitRate)
-{
-  /* limit range of bottle neck rate */
-  if (bwest_str->send_bw_avg < MIN_ISAC_BW)
-  {
-    *bitRate = MIN_ISAC_BW;
-  }
-  else if (bwest_str->send_bw_avg > MAX_ISAC_BW)
-  {
-    *bitRate = MAX_ISAC_BW;
-  }
-  else
-  {
-    *bitRate = (WebRtc_Word32)(bwest_str->send_bw_avg);
-  }
-  return;
-}
-
-/* Returns the max delay value from the other side in ms */
-WebRtc_Word32
-WebRtcIsac_GetUplinkMaxDelay(const BwEstimatorstr *bwest_str)
-{
-  WebRtc_Word32 send_max_delay;
-
-  send_max_delay = (WebRtc_Word32)(bwest_str->send_max_delay_avg);
-
-  /* limit range of jitter estimate */
-  if (send_max_delay < MIN_ISAC_MD)
-  {
-    send_max_delay = MIN_ISAC_MD;
-  }
-  else if (send_max_delay > MAX_ISAC_MD)
-  {
-    send_max_delay = MAX_ISAC_MD;
-  }
-  return send_max_delay;
-}
-
-
-/*
- * update long-term average bitrate and amount of data in buffer
- * returns minimum payload size (bytes)
- */
-int WebRtcIsac_GetMinBytes(
-    RateModel*         State,
-    int                StreamSize,    /* bytes in bitstream */
-    const int          FrameSamples,  /* samples per frame */
-    const double       BottleNeck,    /* bottle neck rate; excl headers (bps) */
-    const double       DelayBuildUp,  /* max delay from bottleneck buffering (ms) */
-    enum ISACBandwidth bandwidth
-    /*,WebRtc_Word16        frequentLargePackets*/)
-{
-  double MinRate = 0.0;
-  int    MinBytes;
-  double TransmissionTime;
-  int    burstInterval = BURST_INTERVAL;
-
-  // first 10 packets @ low rate, then INIT_BURST_LEN packets @
-  // fixed rate of INIT_RATE bps
-  if (State->InitCounter > 0)
-  {
-    if (State->InitCounter-- <= INIT_BURST_LEN)
-    {
-      if(bandwidth == isac8kHz)
-      {
-        MinRate = INIT_RATE_WB;
-      }
-      else
-      {
-        MinRate = INIT_RATE_SWB;
-      }
-    }
-    else
-    {
-      MinRate = 0;
-    }
-  }
-  else
-  {
-    /* handle burst */
-    if (State->BurstCounter)
-    {
-      if (State->StillBuffered < (1.0 - 1.0/BURST_LEN) * DelayBuildUp)
-      {
-        /* max bps derived from BottleNeck and DelayBuildUp values */
-        MinRate = (1.0 + (FS/1000) * DelayBuildUp /
-                   (double)(BURST_LEN * FrameSamples)) * BottleNeck;
-      }
-      else
-      {
-        // max bps derived from StillBuffered and DelayBuildUp
-        // values
-        MinRate = (1.0 + (FS/1000) * (DelayBuildUp -
-                                      State->StillBuffered) / (double)FrameSamples) * BottleNeck;
-        if (MinRate < 1.04 * BottleNeck)
-        {
-          MinRate = 1.04 * BottleNeck;
-        }
-      }
-      State->BurstCounter--;
-    }
-  }
-
-
-  /* convert rate from bits/second to bytes/packet */
-  MinBytes = (int) (MinRate * FrameSamples / (8.0 * FS));
-
-  /* StreamSize will be adjusted if less than MinBytes */
-  if (StreamSize < MinBytes)
-  {
-    StreamSize = MinBytes;
-  }
-
-  /* keep track of when bottle neck was last exceeded by at least 1% */
-  if (StreamSize * 8.0 * FS / FrameSamples > 1.01 * BottleNeck) {
-    if (State->PrevExceed) {
-      /* bottle_neck exceded twice in a row, decrease ExceedAgo */
-      State->ExceedAgo -= /*BURST_INTERVAL*/ burstInterval / (BURST_LEN - 1);
-      if (State->ExceedAgo < 0)
-        State->ExceedAgo = 0;
-    }
-    else
-    {
-      State->ExceedAgo += (FrameSamples * 1000) / FS; /* ms */
-      State->PrevExceed = 1;
-    }
-  }
-  else
-  {
-    State->PrevExceed = 0;
-    State->ExceedAgo += (FrameSamples * 1000) / FS;     /* ms */
-  }
-
-  /* set burst flag if bottle neck not exceeded for long time */
-  if ((State->ExceedAgo > burstInterval) &&
-      (State->BurstCounter == 0))
-  {
-    if (State->PrevExceed)
-    {
-      State->BurstCounter = BURST_LEN - 1;
-    }
-    else
-    {
-      State->BurstCounter = BURST_LEN;
-    }
-  }
-
-
-  /* Update buffer delay */
-  TransmissionTime = StreamSize * 8.0 * 1000.0 / BottleNeck;  /* ms */
-  State->StillBuffered += TransmissionTime;
-  State->StillBuffered -= (FrameSamples * 1000) / FS;     /* ms */
-  if (State->StillBuffered < 0.0)
-  {
-    State->StillBuffered = 0.0;
-  }
-
-  return MinBytes;
-}
-
-
-/*
- * update long-term average bitrate and amount of data in buffer
- */
-void WebRtcIsac_UpdateRateModel(
-    RateModel *State,
-    int StreamSize,                    /* bytes in bitstream */
-    const int FrameSamples,            /* samples per frame */
-    const double BottleNeck)        /* bottle neck rate; excl headers (bps) */
-{
-  double TransmissionTime;
-
-  /* avoid the initial "high-rate" burst */
-  State->InitCounter = 0;
-
-  /* Update buffer delay */
-  TransmissionTime = StreamSize * 8.0 * 1000.0 / BottleNeck;  /* ms */
-  State->StillBuffered += TransmissionTime;
-  State->StillBuffered -= (FrameSamples * 1000) / FS;     /* ms */
-  if (State->StillBuffered < 0.0)
-    State->StillBuffered = 0.0;
-
-}
-
-
-void WebRtcIsac_InitRateModel(
-    RateModel *State)
-{
-  State->PrevExceed      = 0;                        /* boolean */
-  State->ExceedAgo       = 0;                        /* ms */
-  State->BurstCounter    = 0;                        /* packets */
-  State->InitCounter     = INIT_BURST_LEN + 10;    /* packets */
-  State->StillBuffered   = 1.0;                    /* ms */
-}
-
-int WebRtcIsac_GetNewFrameLength(
-    double bottle_neck,
-    int    current_framesamples)
-{
-  int new_framesamples;
-
-  const int Thld_20_30 = 20000;
-
-  //const int Thld_30_20 = 30000;
-  const int Thld_30_20 = 1000000;   // disable 20 ms frames
-
-  const int Thld_30_60 = 18000;
-  //const int Thld_30_60 = 0;      // disable 60 ms frames
-
-  const int Thld_60_30 = 27000;
-
-
-  new_framesamples = current_framesamples;
-
-  /* find new framelength */
-  switch(current_framesamples) {
-    case 320:
-      if (bottle_neck < Thld_20_30)
-        new_framesamples = 480;
-      break;
-    case 480:
-      if (bottle_neck < Thld_30_60)
-        new_framesamples = 960;
-      else if (bottle_neck > Thld_30_20)
-        new_framesamples = 320;
-      break;
-    case 960:
-      if (bottle_neck >= Thld_60_30)
-        new_framesamples = 480;
-      break;
-  }
-
-  return new_framesamples;
-}
-
-double WebRtcIsac_GetSnr(
-    double bottle_neck,
-    int    framesamples)
-{
-  double s2nr;
-
-  const double a_20 = -30.0;
-  const double b_20 = 0.8;
-  const double c_20 = 0.0;
-
-  const double a_30 = -23.0;
-  const double b_30 = 0.48;
-  const double c_30 = 0.0;
-
-  const double a_60 = -23.0;
-  const double b_60 = 0.53;
-  const double c_60 = 0.0;
-
-
-  /* find new SNR value */
-  switch(framesamples) {
-    case 320:
-      s2nr = a_20 + b_20 * bottle_neck * 0.001 + c_20 * bottle_neck *
-          bottle_neck * 0.000001;
-      break;
-    case 480:
-      s2nr = a_30 + b_30 * bottle_neck * 0.001 + c_30 * bottle_neck *
-          bottle_neck * 0.000001;
-      break;
-    case 960:
-      s2nr = a_60 + b_60 * bottle_neck * 0.001 + c_60 * bottle_neck *
-          bottle_neck * 0.000001;
-      break;
-    default:
-      s2nr = 0;
-  }
-
-  return s2nr;
-
-}
diff --git a/src/mod/codecs/mod_isac/bandwidth_estimator.h b/src/mod/codecs/mod_isac/bandwidth_estimator.h
deleted file mode 100644
index 5604d7bbbd..0000000000
--- a/src/mod/codecs/mod_isac/bandwidth_estimator.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * bandwidth_estimator.h
- *
- * This header file contains the API for the Bandwidth Estimator
- * designed for iSAC.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_
-
-#include "structs.h"
-#include "settings.h"
-
-
-#define MIN_ISAC_BW     10000
-#define MIN_ISAC_BW_LB  10000
-#define MIN_ISAC_BW_UB  25000
-
-#define MAX_ISAC_BW     56000
-#define MAX_ISAC_BW_UB  32000
-#define MAX_ISAC_BW_LB  32000
-
-#define MIN_ISAC_MD     5
-#define MAX_ISAC_MD     25
-
-// assumed header size, in bytes; we don't know the exact number
-// (header compression may be used)
-#define HEADER_SIZE        35
-
-// Initial Frame-Size, in ms, for Wideband & Super-Wideband Mode
-#define INIT_FRAME_LEN_WB  60
-#define INIT_FRAME_LEN_SWB 30
-
-// Initial Bottleneck Estimate, in bits/sec, for
-// Wideband & Super-wideband mode
-#define INIT_BN_EST_WB     20e3f
-#define INIT_BN_EST_SWB    56e3f
-
-// Initial Header rate (header rate depends on frame-size),
-// in bits/sec, for Wideband & Super-Wideband mode.
-#define INIT_HDR_RATE_WB                                                \
-  ((float)HEADER_SIZE * 8.0f * 1000.0f / (float)INIT_FRAME_LEN_WB)
-#define INIT_HDR_RATE_SWB                                               \
-  ((float)HEADER_SIZE * 8.0f * 1000.0f / (float)INIT_FRAME_LEN_SWB)
-
-// number of packets in a row for a high rate burst
-#define BURST_LEN       3
-
-// ms, max time between two full bursts
-#define BURST_INTERVAL  500
-
-// number of packets in a row for initial high rate burst
-#define INIT_BURST_LEN  5
-
-// bits/s, rate for the first BURST_LEN packets
-#define INIT_RATE_WB       INIT_BN_EST_WB
-#define INIT_RATE_SWB      INIT_BN_EST_SWB
-
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-  /* This function initializes the struct                    */
-  /* to be called before using the struct for anything else  */
-  /* returns 0 if everything went fine, -1 otherwise         */
-  WebRtc_Word32 WebRtcIsac_InitBandwidthEstimator(
-      BwEstimatorstr*           bwest_str,
-      enum IsacSamplingRate encoderSampRate,
-      enum IsacSamplingRate decoderSampRate);
-
-  /* This function updates the receiving estimate                                                      */
-  /* Parameters:                                                                                       */
-  /* rtp_number    - value from RTP packet, from NetEq                                                 */
-  /* frame length  - length of signal frame in ms, from iSAC decoder                                   */
-  /* send_ts       - value in RTP header giving send time in samples                                   */
-  /* arr_ts        - value given by timeGetTime() time of arrival in samples of packet from NetEq      */
-  /* pksize        - size of packet in bytes, from NetEq                                               */
-  /* Index         - integer (range 0...23) indicating bottle neck & jitter as estimated by other side */
-  /* returns 0 if everything went fine, -1 otherwise                                                   */
-  WebRtc_Word16 WebRtcIsac_UpdateBandwidthEstimator(
-      BwEstimatorstr*    bwest_str,
-      const WebRtc_UWord16 rtp_number,
-      const WebRtc_Word32  frame_length,
-      const WebRtc_UWord32 send_ts,
-      const WebRtc_UWord32 arr_ts,
-      const WebRtc_Word32  pksize);
-
-  /* Update receiving estimates. Used when we only receive BWE index, no iSAC data packet. */
-  WebRtc_Word16 WebRtcIsac_UpdateUplinkBwImpl(
-      BwEstimatorstr*           bwest_str,
-      WebRtc_Word16               Index,
-      enum IsacSamplingRate encoderSamplingFreq);
-
-  /* Returns the bandwidth/jitter estimation code (integer 0...23) to put in the sending iSAC payload */
-  WebRtc_UWord16 WebRtcIsac_GetDownlinkBwJitIndexImpl(
-      BwEstimatorstr*           bwest_str,
-      WebRtc_Word16*              bottleneckIndex,
-      WebRtc_Word16*              jitterInfo,
-      enum IsacSamplingRate decoderSamplingFreq);
-
-  /* Returns the bandwidth estimation (in bps) */
-  WebRtc_Word32 WebRtcIsac_GetDownlinkBandwidth(
-      const BwEstimatorstr *bwest_str);
-
-  /* Returns the max delay (in ms) */
-  WebRtc_Word32 WebRtcIsac_GetDownlinkMaxDelay(
-      const BwEstimatorstr *bwest_str);
-
-  /* Returns the bandwidth that iSAC should send with in bps */
-  void WebRtcIsac_GetUplinkBandwidth(
-      const BwEstimatorstr* bwest_str,
-      WebRtc_Word32*          bitRate);
-
-  /* Returns the max delay value from the other side in ms */
-  WebRtc_Word32 WebRtcIsac_GetUplinkMaxDelay(
-      const BwEstimatorstr *bwest_str);
-
-
-  /*
-   * update amount of data in bottle neck buffer and burst handling
-   * returns minimum payload size (bytes)
-   */
-  int WebRtcIsac_GetMinBytes(
-      RateModel*         State,
-      int                StreamSize,    /* bytes in bitstream */
-      const int          FrameLen,      /* ms per frame */
-      const double       BottleNeck,    /* bottle neck rate; excl headers (bps) */
-      const double       DelayBuildUp,  /* max delay from bottleneck buffering (ms) */
-      enum ISACBandwidth bandwidth
-      /*,WebRtc_Word16        frequentLargePackets*/);
-
-  /*
-   * update long-term average bitrate and amount of data in buffer
-   */
-  void WebRtcIsac_UpdateRateModel(
-      RateModel*   State,
-      int          StreamSize,                /* bytes in bitstream */
-      const int    FrameSamples,        /* samples per frame */
-      const double BottleNeck);       /* bottle neck rate; excl headers (bps) */
-
-
-  void WebRtcIsac_InitRateModel(
-      RateModel *State);
-
-  /* Returns the new framelength value (input argument: bottle_neck) */
-  int WebRtcIsac_GetNewFrameLength(
-      double bottle_neck,
-      int    current_framelength);
-
-  /* Returns the new SNR value (input argument: bottle_neck) */
-  double WebRtcIsac_GetSnr(
-      double bottle_neck,
-      int    new_framelength);
-
-
-  WebRtc_Word16 WebRtcIsac_UpdateUplinkJitter(
-      BwEstimatorstr*              bwest_str,
-      WebRtc_Word32                  index);
-
-#if defined(__cplusplus)
-}
-#endif
-
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_ */
diff --git a/src/mod/codecs/mod_isac/codec.h b/src/mod/codecs/mod_isac/codec.h
deleted file mode 100644
index 6af27ea9e0..0000000000
--- a/src/mod/codecs/mod_isac/codec.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * codec.h
- *
- * This header file contains the calls to the internal encoder
- * and decoder functions.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_
-
-#include "structs.h"
-
-int WebRtcIsac_EstimateBandwidth(
-    BwEstimatorstr*           bwest_str,
-    Bitstr*                   streamdata,
-    WebRtc_Word32               packet_size,
-    WebRtc_UWord16              rtp_seq_number,
-    WebRtc_UWord32              send_ts,
-    WebRtc_UWord32              arr_ts,
-    enum IsacSamplingRate encoderSampRate,
-    enum IsacSamplingRate decoderSampRate);
-
-int WebRtcIsac_DecodeLb(
-    float*           signal_out,
-    ISACLBDecStruct* ISACdec_obj,
-    WebRtc_Word16*     current_framesamples,
-    WebRtc_Word16      isRCUPayload);
-
-int WebRtcIsac_DecodeRcuLb(
-    float*           signal_out,
-    ISACLBDecStruct* ISACdec_obj,
-    WebRtc_Word16*     current_framesamples);
-
-int WebRtcIsac_EncodeLb(
-    float*           in,
-    ISACLBEncStruct* ISACencLB_obj,
-    WebRtc_Word16      codingMode,
-    WebRtc_Word16      bottleneckIndex);
-
-int WebRtcIsac_EncodeStoredDataLb(
-    const ISAC_SaveEncData_t* ISACSavedEnc_obj,
-    Bitstr*                   ISACBitStr_obj,
-    int                       BWnumber,
-    float                     scale);
-
-
-int WebRtcIsac_EncodeStoredDataUb12(
-    const ISACUBSaveEncDataStruct* ISACSavedEnc_obj,
-    Bitstr*                        bitStream,
-    WebRtc_Word32                    jitterInfo,
-    float                          scale);
-
-int WebRtcIsac_EncodeStoredDataUb16(
-    const ISACUBSaveEncDataStruct* ISACSavedEnc_obj,
-    Bitstr*                        bitStream,
-    WebRtc_Word32                    jitterInfo,
-    float                          scale);
-
-
-WebRtc_Word16 WebRtcIsac_GetRedPayloadUb(
-    const ISACUBSaveEncDataStruct* ISACSavedEncObj,
-    Bitstr*                        bitStreamObj,
-    enum ISACBandwidth             bandwidth);
-/******************************************************************************
- * WebRtcIsac_RateAllocation()
- * Internal function to perform a rate-allocation for upper and lower-band,
- * given a total rate.
- *
- * Input:
- *   - inRateBitPerSec           : a total bit-rate in bits/sec.
- *
- * Output:
- *   - rateLBBitPerSec           : a bit-rate allocated to the lower-band
- *                                 in bits/sec.
- *   - rateUBBitPerSec           : a bit-rate allocated to the upper-band
- *                                 in bits/sec.
- *
- * Return value                  : 0 if rate allocation has been successful.
- *                                -1 if failed to allocate rates.
- */
-
-WebRtc_Word16
-WebRtcIsac_RateAllocation(
-    WebRtc_Word32         inRateBitPerSec,
-    double*             rateLBBitPerSec,
-    double*             rateUBBitPerSec,
-    enum ISACBandwidth* bandwidthKHz);
-
-
-/******************************************************************************
- * WebRtcIsac_DecodeUb16()
- *
- * Decode the upper-band if the codec is in 0-16 kHz mode.
- *
- * Input/Output:
- *       -ISACdec_obj        : pointer to the upper-band decoder object. The
- *                             bit-stream is stored inside the decoder object.
- *
- * Output:
- *       -signal_out         : decoded audio, 480 samples 30 ms.
- *
- * Return value              : >0 number of decoded bytes.
- *                             <0 if an error occurred.
- */
-int WebRtcIsac_DecodeUb16(
-    float*           signal_out,
-    ISACUBDecStruct* ISACdec_obj,
-    WebRtc_Word16      isRCUPayload);
-
-
-/******************************************************************************
- * WebRtcIsac_DecodeUb12()
- *
- * Decode the upper-band if the codec is in 0-12 kHz mode.
- *
- * Input/Output:
- *       -ISACdec_obj        : pointer to the upper-band decoder object. The
- *                             bit-stream is stored inside the decoder object.
- *
- * Output:
- *       -signal_out         : decoded audio, 480 samples 30 ms.
- *
- * Return value              : >0 number of decoded bytes.
- *                             <0 if an error occurred.
- */
-int WebRtcIsac_DecodeUb12(
-    float*           signal_out,
-    ISACUBDecStruct* ISACdec_obj,
-    WebRtc_Word16      isRCUPayload);
-
-
-/******************************************************************************
- * WebRtcIsac_EncodeUb16()
- *
- * Encode the upper-band if the codec is in 0-16 kHz mode.
- *
- * Input:
- *       -in                 : upper-band audio, 160 samples (10 ms).
- *
- * Input/Output:
- *       -ISACdec_obj        : pointer to the upper-band encoder object. The
- *                             bit-stream is stored inside the encoder object.
- *
- * Return value              : >0 number of encoded bytes.
- *                             <0 if an error occurred.
- */
-int WebRtcIsac_EncodeUb16(
-    float*           in,
-    ISACUBEncStruct* ISACenc_obj,
-    WebRtc_Word32    jitterInfo);
-
-
-/******************************************************************************
- * WebRtcIsac_EncodeUb12()
- *
- * Encode the upper-band if the codec is in 0-12 kHz mode.
- *
- * Input:
- *       -in                 : upper-band audio, 160 samples (10 ms).
- *
- * Input/Output:
- *       -ISACdec_obj        : pointer to the upper-band encoder object. The
- *                             bit-stream is stored inside the encoder object.
- *
- * Return value              : >0 number of encoded bytes.
- *                             <0 if an error occurred.
- */
-int WebRtcIsac_EncodeUb12(
-    float*           in,
-    ISACUBEncStruct* ISACenc_obj,
-    WebRtc_Word32    jitterInfo);
-
-/************************** initialization functions *************************/
-
-void WebRtcIsac_InitMasking(MaskFiltstr *maskdata);
-
-void WebRtcIsac_InitPreFilterbank(PreFiltBankstr *prefiltdata);
-
-void WebRtcIsac_InitPostFilterbank(PostFiltBankstr *postfiltdata);
-
-void WebRtcIsac_InitPitchFilter(PitchFiltstr *pitchfiltdata);
-
-void WebRtcIsac_InitPitchAnalysis(PitchAnalysisStruct *State);
-
-
-/**************************** transform functions ****************************/
-
-void WebRtcIsac_InitTransform();
-
-void WebRtcIsac_Time2Spec(double *inre1,
-                         double *inre2,
-                         WebRtc_Word16 *outre,
-                         WebRtc_Word16 *outim,
-                         FFTstr *fftstr_obj);
-
-void WebRtcIsac_Spec2time(double *inre,
-                         double *inim,
-                         double *outre1,
-                         double *outre2,
-                         FFTstr *fftstr_obj);
-
-
-/******************************* filter functions ****************************/
-
-void WebRtcIsac_AllPoleFilter(double  *InOut,
-                             double  *Coef,
-                             int     lengthInOut,
-                             int     orderCoef);
-
-void WebRtcIsac_AllZeroFilter(double *In,
-                             double *Coef,
-                             int    lengthInOut,
-                             int    orderCoef,
-                             double *Out);
-
-void WebRtcIsac_ZeroPoleFilter(double *In,
-                              double *ZeroCoef,
-                              double *PoleCoef,
-                              int    lengthInOut,
-                              int     orderCoef,
-                              double *Out);
-
-
-/***************************** filterbank functions **************************/
-
-void WebRtcIsac_SplitAndFilter(double         *in,
-                              double         *LP,
-                              double         *HP,
-                              double         *LP_la,
-                              double         *HP_la,
-                              PreFiltBankstr *prefiltdata);
-
-
-void WebRtcIsac_FilterAndCombine(double          *InLP,
-                                double          *InHP,
-                                double          *Out,
-                                PostFiltBankstr *postfiltdata);
-
-
-
-void WebRtcIsac_SplitAndFilterFloat(float         *in,
-                                    float         *LP,
-                                    float         *HP,
-                                    double         *LP_la,
-                                    double         *HP_la,
-                                    PreFiltBankstr *prefiltdata);
-
-
-void WebRtcIsac_FilterAndCombineFloat(float          *InLP,
-                                      float           *InHP,
-                                      float          *Out,
-                                      PostFiltBankstr *postfiltdata);
-
-
-/************************* normalized lattice filters ************************/
-
-void WebRtcIsac_NormLatticeFilterMa(int    orderCoef,
-                                     float *stateF,
-                                     float *stateG,
-                                     float *lat_in,
-                                     double *filtcoeflo,
-                                     double *lat_out);
-
-void WebRtcIsac_NormLatticeFilterAr(int    orderCoef,
-                                     float  *stateF,
-                                     float *stateG,
-                                     double *lat_in,
-                                     double *lo_filt_coef,
-                                     float *lat_out);
-
-void WebRtcIsac_Dir2Lat(double *a,
-                        int    orderCoef,
-                        float *sth,
-                        float *cth);
-
-void WebRtcIsac_AutoCorr(double *r,
-                        const double *x,
-                        int N,
-                        int order);
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_ */
diff --git a/src/mod/codecs/mod_isac/complex_bit_reverse.c b/src/mod/codecs/mod_isac/complex_bit_reverse.c
deleted file mode 100644
index 85c76f8283..0000000000
--- a/src/mod/codecs/mod_isac/complex_bit_reverse.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_ComplexBitReverse().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-void WebRtcSpl_ComplexBitReverse(WebRtc_Word16 frfi[], int stages)
-{
-    int mr, nn, n, l, m;
-    WebRtc_Word16 tr, ti;
-
-    n = 1 << stages;
-
-    mr = 0;
-    nn = n - 1;
-
-    // decimation in time - re-order data
-    for (m = 1; m <= nn; ++m)
-    {
-        l = n;
-        do
-        {
-            l >>= 1;
-        } while (mr + l > nn);
-        mr = (mr & (l - 1)) + l;
-
-        if (mr <= m)
-            continue;
-
-        tr = frfi[2 * m];
-        frfi[2 * m] = frfi[2 * mr];
-        frfi[2 * mr] = tr;
-
-        ti = frfi[2 * m + 1];
-        frfi[2 * m + 1] = frfi[2 * mr + 1];
-        frfi[2 * mr + 1] = ti;
-    }
-}
diff --git a/src/mod/codecs/mod_isac/complex_fft.c b/src/mod/codecs/mod_isac/complex_fft.c
deleted file mode 100644
index fa09636f7b..0000000000
--- a/src/mod/codecs/mod_isac/complex_fft.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_ComplexFFT().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-#define CFFTSFT 14
-#define CFFTRND 1
-#define CFFTRND2 16384
-
-#define CIFFTSFT 14
-#define CIFFTRND 1
-
-static const WebRtc_Word16 kSinTable1024[] = {
-      0,    201,    402,    603,    804,   1005,   1206,   1406,
-   1607,   1808,   2009,   2209,   2410,   2610,   2811,   3011,
-   3211,   3411,   3611,   3811,   4011,   4210,   4409,   4608,
-   4807,   5006,   5205,   5403,   5601,   5799,   5997,   6195,
-   6392,   6589,   6786,   6982,   7179,   7375,   7571,   7766,
-   7961,   8156,   8351,   8545,   8739,   8932,   9126,   9319,
-   9511,   9703,   9895,  10087,  10278,  10469,  10659,  10849,
-  11038,  11227,  11416,  11604,  11792,  11980,  12166,  12353,
-  12539,  12724,  12909,  13094,  13278,  13462,  13645,  13827,
-  14009,  14191,  14372,  14552,  14732,  14911,  15090,  15268,
-  15446,  15623,  15799,  15975,  16150,  16325,  16499,  16672,
-  16845,  17017,  17189,  17360,  17530,  17699,  17868,  18036,
-  18204,  18371,  18537,  18702,  18867,  19031,  19194,  19357,
-  19519,  19680,  19840,  20000,  20159,  20317,  20474,  20631,
-  20787,  20942,  21096,  21249,  21402,  21554,  21705,  21855,
-  22004,  22153,  22301,  22448,  22594,  22739,  22883,  23027,
-  23169,  23311,  23452,  23592,  23731,  23869,  24006,  24143,
-  24278,  24413,  24546,  24679,  24811,  24942,  25072,  25201,
-  25329,  25456,  25582,  25707,  25831,  25954,  26077,  26198,
-  26318,  26437,  26556,  26673,  26789,  26905,  27019,  27132,
-  27244,  27355,  27466,  27575,  27683,  27790,  27896,  28001,
-  28105,  28208,  28309,  28410,  28510,  28608,  28706,  28802,
-  28897,  28992,  29085,  29177,  29268,  29358,  29446,  29534,
-  29621,  29706,  29790,  29873,  29955,  30036,  30116,  30195,
-  30272,  30349,  30424,  30498,  30571,  30643,  30713,  30783,
-  30851,  30918,  30984,  31049,
-  31113,  31175,  31236,  31297,
-  31356,  31413,  31470,  31525,  31580,  31633,  31684,  31735,
-  31785,  31833,  31880,  31926,  31970,  32014,  32056,  32097,
-  32137,  32176,  32213,  32249,  32284,  32318,  32350,  32382,
-  32412,  32441,  32468,  32495,  32520,  32544,  32567,  32588,
-  32609,  32628,  32646,  32662,  32678,  32692,  32705,  32717,
-  32727,  32736,  32744,  32751,  32757,  32761,  32764,  32766,
-  32767,  32766,  32764,  32761,  32757,  32751,  32744,  32736,
-  32727,  32717,  32705,  32692,  32678,  32662,  32646,  32628,
-  32609,  32588,  32567,  32544,  32520,  32495,  32468,  32441,
-  32412,  32382,  32350,  32318,  32284,  32249,  32213,  32176,
-  32137,  32097,  32056,  32014,  31970,  31926,  31880,  31833,
-  31785,  31735,  31684,  31633,  31580,  31525,  31470,  31413,
-  31356,  31297,  31236,  31175,  31113,  31049,  30984,  30918,
-  30851,  30783,  30713,  30643,  30571,  30498,  30424,  30349,
-  30272,  30195,  30116,  30036,  29955,  29873,  29790,  29706,
-  29621,  29534,  29446,  29358,  29268,  29177,  29085,  28992,
-  28897,  28802,  28706,  28608,  28510,  28410,  28309,  28208,
-  28105,  28001,  27896,  27790,  27683,  27575,  27466,  27355,
-  27244,  27132,  27019,  26905,  26789,  26673,  26556,  26437,
-  26318,  26198,  26077,  25954,  25831,  25707,  25582,  25456,
-  25329,  25201,  25072,  24942,  24811,  24679,  24546,  24413,
-  24278,  24143,  24006,  23869,  23731,  23592,  23452,  23311,
-  23169,  23027,  22883,  22739,  22594,  22448,  22301,  22153,
-  22004,  21855,  21705,  21554,  21402,  21249,  21096,  20942,
-  20787,  20631,  20474,  20317,  20159,  20000,  19840,  19680,
-  19519,  19357,  19194,  19031,  18867,  18702,  18537,  18371,
-  18204,  18036,  17868,  17699,  17530,  17360,  17189,  17017,
-  16845,  16672,  16499,  16325,  16150,  15975,  15799,  15623,
-  15446,  15268,  15090,  14911,  14732,  14552,  14372,  14191,
-  14009,  13827,  13645,  13462,  13278,  13094,  12909,  12724,
-  12539,  12353,  12166,  11980,  11792,  11604,  11416,  11227,
-  11038,  10849,  10659,  10469,  10278,  10087,   9895,   9703,
-   9511,   9319,   9126,   8932,   8739,   8545,   8351,   8156,
-   7961,   7766,   7571,   7375,   7179,   6982,   6786,   6589,
-   6392,   6195,   5997,   5799,   5601,   5403,   5205,   5006,
-   4807,   4608,   4409,   4210,   4011,   3811,   3611,   3411,
-   3211,   3011,   2811,   2610,   2410,   2209,   2009,   1808,
-   1607,   1406,   1206,   1005,    804,    603,    402,    201,
-      0,   -201,   -402,   -603,   -804,  -1005,  -1206,  -1406,
-  -1607,  -1808,  -2009,  -2209,  -2410,  -2610,  -2811,  -3011,
-  -3211,  -3411,  -3611,  -3811,  -4011,  -4210,  -4409,  -4608,
-  -4807,  -5006,  -5205,  -5403,  -5601,  -5799,  -5997,  -6195,
-  -6392,  -6589,  -6786,  -6982,  -7179,  -7375,  -7571,  -7766,
-  -7961,  -8156,  -8351,  -8545,  -8739,  -8932,  -9126,  -9319,
-  -9511,  -9703,  -9895, -10087, -10278, -10469, -10659, -10849,
- -11038, -11227, -11416, -11604, -11792, -11980, -12166, -12353,
- -12539, -12724, -12909, -13094, -13278, -13462, -13645, -13827,
- -14009, -14191, -14372, -14552, -14732, -14911, -15090, -15268,
- -15446, -15623, -15799, -15975, -16150, -16325, -16499, -16672,
- -16845, -17017, -17189, -17360, -17530, -17699, -17868, -18036,
- -18204, -18371, -18537, -18702, -18867, -19031, -19194, -19357,
- -19519, -19680, -19840, -20000, -20159, -20317, -20474, -20631,
- -20787, -20942, -21096, -21249, -21402, -21554, -21705, -21855,
- -22004, -22153, -22301, -22448, -22594, -22739, -22883, -23027,
- -23169, -23311, -23452, -23592, -23731, -23869, -24006, -24143,
- -24278, -24413, -24546, -24679, -24811, -24942, -25072, -25201,
- -25329, -25456, -25582, -25707, -25831, -25954, -26077, -26198,
- -26318, -26437, -26556, -26673, -26789, -26905, -27019, -27132,
- -27244, -27355, -27466, -27575, -27683, -27790, -27896, -28001,
- -28105, -28208, -28309, -28410, -28510, -28608, -28706, -28802,
- -28897, -28992, -29085, -29177, -29268, -29358, -29446, -29534,
- -29621, -29706, -29790, -29873, -29955, -30036, -30116, -30195,
- -30272, -30349, -30424, -30498, -30571, -30643, -30713, -30783,
- -30851, -30918, -30984, -31049, -31113, -31175, -31236, -31297,
- -31356, -31413, -31470, -31525, -31580, -31633, -31684, -31735,
- -31785, -31833, -31880, -31926, -31970, -32014, -32056, -32097,
- -32137, -32176, -32213, -32249, -32284, -32318, -32350, -32382,
- -32412, -32441, -32468, -32495, -32520, -32544, -32567, -32588,
- -32609, -32628, -32646, -32662, -32678, -32692, -32705, -32717,
- -32727, -32736, -32744, -32751, -32757, -32761, -32764, -32766,
- -32767, -32766, -32764, -32761, -32757, -32751, -32744, -32736,
- -32727, -32717, -32705, -32692, -32678, -32662, -32646, -32628,
- -32609, -32588, -32567, -32544, -32520, -32495, -32468, -32441,
- -32412, -32382, -32350, -32318, -32284, -32249, -32213, -32176,
- -32137, -32097, -32056, -32014, -31970, -31926, -31880, -31833,
- -31785, -31735, -31684, -31633, -31580, -31525, -31470, -31413,
- -31356, -31297, -31236, -31175, -31113, -31049, -30984, -30918,
- -30851, -30783, -30713, -30643, -30571, -30498, -30424, -30349,
- -30272, -30195, -30116, -30036, -29955, -29873, -29790, -29706,
- -29621, -29534, -29446, -29358, -29268, -29177, -29085, -28992,
- -28897, -28802, -28706, -28608, -28510, -28410, -28309, -28208,
- -28105, -28001, -27896, -27790, -27683, -27575, -27466, -27355,
- -27244, -27132, -27019, -26905, -26789, -26673, -26556, -26437,
- -26318, -26198, -26077, -25954, -25831, -25707, -25582, -25456,
- -25329, -25201, -25072, -24942, -24811, -24679, -24546, -24413,
- -24278, -24143, -24006, -23869, -23731, -23592, -23452, -23311,
- -23169, -23027, -22883, -22739, -22594, -22448, -22301, -22153,
- -22004, -21855, -21705, -21554, -21402, -21249, -21096, -20942,
- -20787, -20631, -20474, -20317, -20159, -20000, -19840, -19680,
- -19519, -19357, -19194, -19031, -18867, -18702, -18537, -18371,
- -18204, -18036, -17868, -17699, -17530, -17360, -17189, -17017,
- -16845, -16672, -16499, -16325, -16150, -15975, -15799, -15623,
- -15446, -15268, -15090, -14911, -14732, -14552, -14372, -14191,
- -14009, -13827, -13645, -13462, -13278, -13094, -12909, -12724,
- -12539, -12353, -12166, -11980, -11792, -11604, -11416, -11227,
- -11038, -10849, -10659, -10469, -10278, -10087,  -9895,  -9703,
-  -9511,  -9319,  -9126,  -8932,  -8739,  -8545,  -8351,  -8156,
-  -7961,  -7766,  -7571,  -7375,  -7179,  -6982,  -6786,  -6589,
-  -6392,  -6195,  -5997,  -5799,  -5601,  -5403,  -5205,  -5006,
-  -4807,  -4608,  -4409,  -4210,  -4011,  -3811,  -3611,  -3411,
-  -3211,  -3011,  -2811,  -2610,  -2410,  -2209,  -2009,  -1808,
-  -1607,  -1406,  -1206,  -1005,   -804,   -603,   -402,   -201
-};
-
-int WebRtcSpl_ComplexFFT(WebRtc_Word16 frfi[], int stages, int mode)
-{
-    int i, j, l, k, istep, n, m;
-    WebRtc_Word16 wr, wi;
-    WebRtc_Word32 tr32, ti32, qr32, qi32;
-
-    /* The 1024-value is a constant given from the size of kSinTable1024[],
-     * and should not be changed depending on the input parameter 'stages'
-     */
-    n = 1 << stages;
-    if (n > 1024)
-        return -1;
-
-    l = 1;
-    k = 10 - 1; /* Constant for given kSinTable1024[]. Do not change
-         depending on the input parameter 'stages' */
-
-    if (mode == 0)
-    {
-        // mode==0: Low-complexity and Low-accuracy mode
-        while (l < n)
-        {
-            istep = l << 1;
-
-            for (m = 0; m < l; ++m)
-            {
-                j = m << k;
-
-                /* The 256-value is a constant given as 1/4 of the size of
-                 * kSinTable1024[], and should not be changed depending on the input
-                 * parameter 'stages'. It will result in 0 <= j < N_SINE_WAVE/2
-                 */
-                wr = kSinTable1024[j + 256];
-                wi = -kSinTable1024[j];
-
-                for (i = m; i < n; i += istep)
-                {
-                    j = i + l;
-
-                    tr32 = WEBRTC_SPL_RSHIFT_W32((WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j])
-                            - WEBRTC_SPL_MUL_16_16(wi, frfi[2 * j + 1])), 15);
-
-                    ti32 = WEBRTC_SPL_RSHIFT_W32((WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j + 1])
-                            + WEBRTC_SPL_MUL_16_16(wi, frfi[2 * j])), 15);
-
-                    qr32 = (WebRtc_Word32)frfi[2 * i];
-                    qi32 = (WebRtc_Word32)frfi[2 * i + 1];
-                    frfi[2 * j] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(qr32 - tr32, 1);
-                    frfi[2 * j + 1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(qi32 - ti32, 1);
-                    frfi[2 * i] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(qr32 + tr32, 1);
-                    frfi[2 * i + 1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(qi32 + ti32, 1);
-                }
-            }
-
-            --k;
-            l = istep;
-
-        }
-
-    } else
-    {
-        // mode==1: High-complexity and High-accuracy mode
-        while (l < n)
-        {
-            istep = l << 1;
-
-            for (m = 0; m < l; ++m)
-            {
-                j = m << k;
-
-                /* The 256-value is a constant given as 1/4 of the size of
-                 * kSinTable1024[], and should not be changed depending on the input
-                 * parameter 'stages'. It will result in 0 <= j < N_SINE_WAVE/2
-                 */
-                wr = kSinTable1024[j + 256];
-                wi = -kSinTable1024[j];
-
-#ifdef WEBRTC_ARCH_ARM_V7A
-                WebRtc_Word32 wri;
-                WebRtc_Word32 frfi_r;
-                __asm__("pkhbt %0, %1, %2, lsl #16" : "=r"(wri) :
-                    "r"((WebRtc_Word32)wr), "r"((WebRtc_Word32)wi));
-#endif
-
-                for (i = m; i < n; i += istep)
-                {
-                    j = i + l;
-
-#ifdef WEBRTC_ARCH_ARM_V7A
-                    __asm__("pkhbt %0, %1, %2, lsl #16" : "=r"(frfi_r) :
-                        "r"((WebRtc_Word32)frfi[2*j]), "r"((WebRtc_Word32)frfi[2*j +1]));
-                    __asm__("smlsd %0, %1, %2, %3" : "=r"(tr32) :
-                        "r"(wri), "r"(frfi_r), "r"(CFFTRND));
-                    __asm__("smladx %0, %1, %2, %3" : "=r"(ti32) :
-                        "r"(wri), "r"(frfi_r), "r"(CFFTRND));
-
-#else
-                    tr32 = WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j])
-                            - WEBRTC_SPL_MUL_16_16(wi, frfi[2 * j + 1]) + CFFTRND;
-
-                    ti32 = WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j + 1])
-                            + WEBRTC_SPL_MUL_16_16(wi, frfi[2 * j]) + CFFTRND;
-#endif
-
-                    tr32 = WEBRTC_SPL_RSHIFT_W32(tr32, 15 - CFFTSFT);
-                    ti32 = WEBRTC_SPL_RSHIFT_W32(ti32, 15 - CFFTSFT);
-
-                    qr32 = ((WebRtc_Word32)frfi[2 * i]) << CFFTSFT;
-                    qi32 = ((WebRtc_Word32)frfi[2 * i + 1]) << CFFTSFT;
-
-                    frfi[2 * j] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(
-                            (qr32 - tr32 + CFFTRND2), 1 + CFFTSFT);
-                    frfi[2 * j + 1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(
-                            (qi32 - ti32 + CFFTRND2), 1 + CFFTSFT);
-                    frfi[2 * i] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(
-                            (qr32 + tr32 + CFFTRND2), 1 + CFFTSFT);
-                    frfi[2 * i + 1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(
-                            (qi32 + ti32 + CFFTRND2), 1 + CFFTSFT);
-                }
-            }
-
-            --k;
-            l = istep;
-        }
-    }
-    return 0;
-}
-
-int WebRtcSpl_ComplexIFFT(WebRtc_Word16 frfi[], int stages, int mode)
-{
-    int i, j, l, k, istep, n, m, scale, shift;
-    WebRtc_Word16 wr, wi;
-    WebRtc_Word32 tr32, ti32, qr32, qi32;
-    WebRtc_Word32 tmp32, round2;
-
-    /* The 1024-value is a constant given from the size of kSinTable1024[],
-     * and should not be changed depending on the input parameter 'stages'
-     */
-    n = 1 << stages;
-    if (n > 1024)
-        return -1;
-
-    scale = 0;
-
-    l = 1;
-    k = 10 - 1; /* Constant for given kSinTable1024[]. Do not change
-         depending on the input parameter 'stages' */
-
-    while (l < n)
-    {
-        // variable scaling, depending upon data
-        shift = 0;
-        round2 = 8192;
-
-        tmp32 = (WebRtc_Word32)WebRtcSpl_MaxAbsValueW16(frfi, 2 * n);
-        if (tmp32 > 13573)
-        {
-            shift++;
-            scale++;
-            round2 <<= 1;
-        }
-        if (tmp32 > 27146)
-        {
-            shift++;
-            scale++;
-            round2 <<= 1;
-        }
-
-        istep = l << 1;
-
-        if (mode == 0)
-        {
-            // mode==0: Low-complexity and Low-accuracy mode
-            for (m = 0; m < l; ++m)
-            {
-                j = m << k;
-
-                /* The 256-value is a constant given as 1/4 of the size of
-                 * kSinTable1024[], and should not be changed depending on the input
-                 * parameter 'stages'. It will result in 0 <= j < N_SINE_WAVE/2
-                 */
-                wr = kSinTable1024[j + 256];
-                wi = kSinTable1024[j];
-
-                for (i = m; i < n; i += istep)
-                {
-                    j = i + l;
-
-                    tr32 = WEBRTC_SPL_RSHIFT_W32((WEBRTC_SPL_MUL_16_16_RSFT(wr, frfi[2 * j], 0)
-                            - WEBRTC_SPL_MUL_16_16_RSFT(wi, frfi[2 * j + 1], 0)), 15);
-
-                    ti32 = WEBRTC_SPL_RSHIFT_W32(
-                            (WEBRTC_SPL_MUL_16_16_RSFT(wr, frfi[2 * j + 1], 0)
-                                    + WEBRTC_SPL_MUL_16_16_RSFT(wi,frfi[2*j],0)), 15);
-
-                    qr32 = (WebRtc_Word32)frfi[2 * i];
-                    qi32 = (WebRtc_Word32)frfi[2 * i + 1];
-                    frfi[2 * j] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(qr32 - tr32, shift);
-                    frfi[2 * j + 1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(qi32 - ti32, shift);
-                    frfi[2 * i] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(qr32 + tr32, shift);
-                    frfi[2 * i + 1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(qi32 + ti32, shift);
-                }
-            }
-        } else
-        {
-            // mode==1: High-complexity and High-accuracy mode
-
-            for (m = 0; m < l; ++m)
-            {
-                j = m << k;
-
-                /* The 256-value is a constant given as 1/4 of the size of
-                 * kSinTable1024[], and should not be changed depending on the input
-                 * parameter 'stages'. It will result in 0 <= j < N_SINE_WAVE/2
-                 */
-                wr = kSinTable1024[j + 256];
-                wi = kSinTable1024[j];
-
-#ifdef WEBRTC_ARCH_ARM_V7A
-                WebRtc_Word32 wri;
-                WebRtc_Word32 frfi_r;
-                __asm__("pkhbt %0, %1, %2, lsl #16" : "=r"(wri) :
-                    "r"((WebRtc_Word32)wr), "r"((WebRtc_Word32)wi));
-#endif
-
-                for (i = m; i < n; i += istep)
-                {
-                    j = i + l;
-
-#ifdef WEBRTC_ARCH_ARM_V7A
-                    __asm__("pkhbt %0, %1, %2, lsl #16" : "=r"(frfi_r) :
-                        "r"((WebRtc_Word32)frfi[2*j]), "r"((WebRtc_Word32)frfi[2*j +1]));
-                    __asm__("smlsd %0, %1, %2, %3" : "=r"(tr32) :
-                        "r"(wri), "r"(frfi_r), "r"(CIFFTRND));
-                    __asm__("smladx %0, %1, %2, %3" : "=r"(ti32) :
-                        "r"(wri), "r"(frfi_r), "r"(CIFFTRND));
-#else
-
-                    tr32 = WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j])
-                            - WEBRTC_SPL_MUL_16_16(wi, frfi[2 * j + 1]) + CIFFTRND;
-
-                    ti32 = WEBRTC_SPL_MUL_16_16(wr, frfi[2 * j + 1])
-                            + WEBRTC_SPL_MUL_16_16(wi, frfi[2 * j]) + CIFFTRND;
-#endif
-                    tr32 = WEBRTC_SPL_RSHIFT_W32(tr32, 15 - CIFFTSFT);
-                    ti32 = WEBRTC_SPL_RSHIFT_W32(ti32, 15 - CIFFTSFT);
-
-                    qr32 = ((WebRtc_Word32)frfi[2 * i]) << CIFFTSFT;
-                    qi32 = ((WebRtc_Word32)frfi[2 * i + 1]) << CIFFTSFT;
-
-                    frfi[2 * j] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((qr32 - tr32+round2),
-                                                                       shift+CIFFTSFT);
-                    frfi[2 * j + 1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(
-                            (qi32 - ti32 + round2), shift + CIFFTSFT);
-                    frfi[2 * i] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((qr32 + tr32 + round2),
-                                                                       shift + CIFFTSFT);
-                    frfi[2 * i + 1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(
-                            (qi32 + ti32 + round2), shift + CIFFTSFT);
-                }
-            }
-
-        }
-        --k;
-        l = istep;
-    }
-    return scale;
-}
diff --git a/src/mod/codecs/mod_isac/copy_set_operations.c b/src/mod/codecs/mod_isac/copy_set_operations.c
deleted file mode 100644
index 8247337754..0000000000
--- a/src/mod/codecs/mod_isac/copy_set_operations.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the implementation of functions
- * WebRtcSpl_MemSetW16()
- * WebRtcSpl_MemSetW32()
- * WebRtcSpl_MemCpyReversedOrder()
- * WebRtcSpl_CopyFromEndW16()
- * WebRtcSpl_ZerosArrayW16()
- * WebRtcSpl_ZerosArrayW32()
- * WebRtcSpl_OnesArrayW16()
- * WebRtcSpl_OnesArrayW32()
- *
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include <string.h>
-#include "signal_processing_library.h"
-
-
-void WebRtcSpl_MemSetW16(WebRtc_Word16 *ptr, WebRtc_Word16 set_value, int length)
-{
-    int j;
-    WebRtc_Word16 *arrptr = ptr;
-
-    for (j = length; j > 0; j--)
-    {
-        *arrptr++ = set_value;
-    }
-}
-
-void WebRtcSpl_MemSetW32(WebRtc_Word32 *ptr, WebRtc_Word32 set_value, int length)
-{
-    int j;
-    WebRtc_Word32 *arrptr = ptr;
-
-    for (j = length; j > 0; j--)
-    {
-        *arrptr++ = set_value;
-    }
-}
-
-void WebRtcSpl_MemCpyReversedOrder(WebRtc_Word16* dest, WebRtc_Word16* source, int length)
-{
-    int j;
-    WebRtc_Word16* destPtr = dest;
-    WebRtc_Word16* sourcePtr = source;
-
-    for (j = 0; j < length; j++)
-    {
-        *destPtr-- = *sourcePtr++;
-    }
-}
-
-WebRtc_Word16 WebRtcSpl_CopyFromEndW16(G_CONST WebRtc_Word16 *vector_in,
-                                       WebRtc_Word16 length,
-                                       WebRtc_Word16 samples,
-                                       WebRtc_Word16 *vector_out)
-{
-    // Copy the last <samples> of the input vector to vector_out
-    WEBRTC_SPL_MEMCPY_W16(vector_out, &vector_in[length - samples], samples);
-
-    return samples;
-}
-
-WebRtc_Word16 WebRtcSpl_ZerosArrayW16(WebRtc_Word16 *vector, WebRtc_Word16 length)
-{
-    WebRtcSpl_MemSetW16(vector, 0, length);
-    return length;
-}
-
-WebRtc_Word16 WebRtcSpl_ZerosArrayW32(WebRtc_Word32 *vector, WebRtc_Word16 length)
-{
-    WebRtcSpl_MemSetW32(vector, 0, length);
-    return length;
-}
-
-WebRtc_Word16 WebRtcSpl_OnesArrayW16(WebRtc_Word16 *vector, WebRtc_Word16 length)
-{
-    WebRtc_Word16 i;
-    WebRtc_Word16 *tmpvec = vector;
-    for (i = 0; i < length; i++)
-    {
-        *tmpvec++ = 1;
-    }
-    return length;
-}
-
-WebRtc_Word16 WebRtcSpl_OnesArrayW32(WebRtc_Word32 *vector, WebRtc_Word16 length)
-{
-    WebRtc_Word16 i;
-    WebRtc_Word32 *tmpvec = vector;
-    for (i = 0; i < length; i++)
-    {
-        *tmpvec++ = 1;
-    }
-    return length;
-}
diff --git a/src/mod/codecs/mod_isac/crc.c b/src/mod/codecs/mod_isac/crc.c
deleted file mode 100644
index 098e4b7a69..0000000000
--- a/src/mod/codecs/mod_isac/crc.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "crc.h"
-#include <stdlib.h>
-#include "signal_processing_library.h"
-
-#define POLYNOMIAL 0x04c11db7L
-
-
-static const WebRtc_UWord32 kCrcTable[256] = {
-  0,          0x4c11db7,  0x9823b6e,  0xd4326d9,  0x130476dc, 0x17c56b6b,
-  0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
-  0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
-  0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
-  0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
-  0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
-  0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
-  0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
-  0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
-  0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
-  0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
-  0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
-  0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x18aeb13,  0x54bf6a4,
-  0x808d07d,  0xcc9cdca,  0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
-  0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
-  0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
-  0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
-  0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
-  0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
-  0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
-  0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
-  0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
-  0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
-  0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
-  0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
-  0x3f9b762c, 0x3b5a6b9b,  0x315d626, 0x7d4cb91,  0xa97ed48,  0xe56f0ff,
-  0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
-  0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
-  0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
-  0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
-  0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
-  0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
-  0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
-  0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
-  0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
-  0x18197087, 0x1cd86d30, 0x29f3d35,  0x65e2082,  0xb1d065b,  0xfdc1bec,
-  0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
-  0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
-  0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
-  0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
-  0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
-  0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
-  0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
-};
-
-
-
-
-/****************************************************************************
- * WebRtcIsac_GetCrc(...)
- *
- * This function returns a 32 bit CRC checksum of a bit stream
- *
- * Input:
- *  - bitstream              : payload bitstream
- *  - len_bitstream_in_bytes : number of 8-bit words in the bit stream
- *
- * Output:
- *  - crc                    : checksum
- *
- * Return value              :  0 - Ok
- *                             -1 - Error
- */
-
-WebRtc_Word16 WebRtcIsac_GetCrc(const WebRtc_Word16* bitstream,
-                                WebRtc_Word16        len_bitstream_in_bytes,
-                                WebRtc_UWord32*      crc)
-{
-  WebRtc_UWord8* bitstream_ptr_uw8;
-  WebRtc_UWord32 crc_state;
-  int byte_cntr;
-  int crc_tbl_indx;
-
-  /* Sanity Check. */
-  if (bitstream == NULL) {
-    return -1;
-  }
-  /* cast to UWord8 pointer */
-  bitstream_ptr_uw8 = (WebRtc_UWord8 *)bitstream;
-
-  /* initialize */
-  crc_state = 0xFFFFFFFF;
-
-  for (byte_cntr = 0; byte_cntr < len_bitstream_in_bytes; byte_cntr++) {
-    crc_tbl_indx = (WEBRTC_SPL_RSHIFT_U32(crc_state, 24) ^
-                       bitstream_ptr_uw8[byte_cntr]) & 0xFF;
-    crc_state = WEBRTC_SPL_LSHIFT_U32(crc_state, 8) ^ kCrcTable[crc_tbl_indx];
-  }
-
-  *crc = ~crc_state;
-  return 0;
-}
diff --git a/src/mod/codecs/mod_isac/crc.h b/src/mod/codecs/mod_isac/crc.h
deleted file mode 100644
index 015127894b..0000000000
--- a/src/mod/codecs/mod_isac/crc.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * crc.h
- *
- * Checksum functions
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
-
-#include "typedefs.h"
-
-/****************************************************************************
- * WebRtcIsac_GetCrc(...)
- *
- * This function returns a 32 bit CRC checksum of a bit stream
- *
- * Input:
- *  - encoded      : payload bit stream
- *  - no_of_word8s : number of 8-bit words in the bit stream
- *
- * Output:
- *  - crc          : checksum
- *
- * Return value    :  0 - Ok
- *                   -1 - Error
- */
-
-WebRtc_Word16 WebRtcIsac_GetCrc(
-    const WebRtc_Word16* encoded,
-    WebRtc_Word16        no_of_word8s,
-    WebRtc_UWord32*      crc);
-
-
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ */
diff --git a/src/mod/codecs/mod_isac/cross_correlation.c b/src/mod/codecs/mod_isac/cross_correlation.c
deleted file mode 100644
index 936ae6877f..0000000000
--- a/src/mod/codecs/mod_isac/cross_correlation.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_CrossCorrelation().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-/* TODO(kma): Clean up the code in this file, and break it up for
- * various platforms (Xscale, ARM/Neon etc.).
- */
-
-#include "signal_processing_library.h"
-
-void WebRtcSpl_CrossCorrelation(WebRtc_Word32* cross_correlation, WebRtc_Word16* seq1,
-                                WebRtc_Word16* seq2, WebRtc_Word16 dim_seq,
-                                WebRtc_Word16 dim_cross_correlation,
-                                WebRtc_Word16 right_shifts,
-                                WebRtc_Word16 step_seq2)
-{
-    int i, j;
-    WebRtc_Word16* seq1Ptr;
-    WebRtc_Word16* seq2Ptr;
-    WebRtc_Word32* CrossCorrPtr;
-
-#ifdef _XSCALE_OPT_
-
-#ifdef _WIN32
-#pragma message("NOTE: _XSCALE_OPT_ optimizations are used (overrides _ARM_OPT_ and requires /QRxscale compiler flag)")
-#endif
-
-    __int64 macc40;
-
-    int iseq1[250];
-    int iseq2[250];
-    int iseq3[250];
-    int * iseq1Ptr;
-    int * iseq2Ptr;
-    int * iseq3Ptr;
-    int len, i_len;
-
-    seq1Ptr = seq1;
-    iseq1Ptr = iseq1;
-    for(i = 0; i < ((dim_seq + 1) >> 1); i++)
-    {
-        *iseq1Ptr = (unsigned short)*seq1Ptr++;
-        *iseq1Ptr++ |= (WebRtc_Word32)*seq1Ptr++ << 16;
-
-    }
-
-    if(dim_seq%2)
-    {
-        *(iseq1Ptr-1) &= 0x0000ffff;
-    }
-    *iseq1Ptr = 0;
-    iseq1Ptr++;
-    *iseq1Ptr = 0;
-    iseq1Ptr++;
-    *iseq1Ptr = 0;
-
-    if(step_seq2 < 0)
-    {
-        seq2Ptr = seq2 - dim_cross_correlation + 1;
-        CrossCorrPtr = &cross_correlation[dim_cross_correlation - 1];
-    }
-    else
-    {
-        seq2Ptr = seq2;
-        CrossCorrPtr = cross_correlation;
-    }
-
-    len = dim_seq + dim_cross_correlation - 1;
-    i_len = (len + 1) >> 1;
-    iseq2Ptr = iseq2;
-
-    iseq3Ptr = iseq3;
-    for(i = 0; i < i_len; i++)
-    {
-        *iseq2Ptr = (unsigned short)*seq2Ptr++;
-        *iseq3Ptr = (unsigned short)*seq2Ptr;
-        *iseq2Ptr++ |= (WebRtc_Word32)*seq2Ptr++ << 16;
-        *iseq3Ptr++ |= (WebRtc_Word32)*seq2Ptr << 16;
-    }
-
-    if(len % 2)
-    {
-        iseq2[i_len - 1] &= 0x0000ffff;
-        iseq3[i_len - 1] = 0;
-    }
-    else
-    iseq3[i_len - 1] &= 0x0000ffff;
-
-    iseq2[i_len] = 0;
-    iseq3[i_len] = 0;
-    iseq2[i_len + 1] = 0;
-    iseq3[i_len + 1] = 0;
-    iseq2[i_len + 2] = 0;
-    iseq3[i_len + 2] = 0;
-
-    // Set pointer to start value
-    iseq2Ptr = iseq2;
-    iseq3Ptr = iseq3;
-
-    i_len = (dim_seq + 7) >> 3;
-    for (i = 0; i < dim_cross_correlation; i++)
-    {
-
-        iseq1Ptr = iseq1;
-
-        macc40 = 0;
-
-        _WriteCoProcessor(macc40, 0);
-
-        if((i & 1))
-        {
-            iseq3Ptr = iseq3 + (i >> 1);
-            for (j = i_len; j > 0; j--)
-            {
-                _SmulAddPack_2SW_ACC(*iseq1Ptr++, *iseq3Ptr++);
-                _SmulAddPack_2SW_ACC(*iseq1Ptr++, *iseq3Ptr++);
-                _SmulAddPack_2SW_ACC(*iseq1Ptr++, *iseq3Ptr++);
-                _SmulAddPack_2SW_ACC(*iseq1Ptr++, *iseq3Ptr++);
-            }
-        }
-        else
-        {
-            iseq2Ptr = iseq2 + (i >> 1);
-            for (j = i_len; j > 0; j--)
-            {
-                _SmulAddPack_2SW_ACC(*iseq1Ptr++, *iseq2Ptr++);
-                _SmulAddPack_2SW_ACC(*iseq1Ptr++, *iseq2Ptr++);
-                _SmulAddPack_2SW_ACC(*iseq1Ptr++, *iseq2Ptr++);
-                _SmulAddPack_2SW_ACC(*iseq1Ptr++, *iseq2Ptr++);
-            }
-
-        }
-
-        macc40 = _ReadCoProcessor(0);
-        *CrossCorrPtr = (WebRtc_Word32)(macc40 >> right_shifts);
-        CrossCorrPtr += step_seq2;
-    }
-#else // #ifdef _XSCALE_OPT_
-#ifdef _ARM_OPT_
-    WebRtc_Word16 dim_seq8 = (dim_seq >> 3) << 3;
-#endif
-
-    CrossCorrPtr = cross_correlation;
-
-    for (i = 0; i < dim_cross_correlation; i++)
-    {
-        // Set the pointer to the static vector, set the pointer to the sliding vector
-        // and initialize cross_correlation
-        seq1Ptr = seq1;
-        seq2Ptr = seq2 + (step_seq2 * i);
-        (*CrossCorrPtr) = 0;
-
-#ifndef _ARM_OPT_
-#ifdef _WIN32
-#pragma message("NOTE: default implementation is used")
-#endif
-        // Perform the cross correlation
-        for (j = 0; j < dim_seq; j++)
-        {
-            (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr), right_shifts);
-            seq1Ptr++;
-            seq2Ptr++;
-        }
-#else
-#ifdef _WIN32
-#pragma message("NOTE: _ARM_OPT_ optimizations are used")
-#endif
-        if (right_shifts == 0)
-        {
-            // Perform the optimized cross correlation
-            for (j = 0; j < dim_seq8; j = j + 8)
-            {
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16((*seq1Ptr), (*seq2Ptr));
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16((*seq1Ptr), (*seq2Ptr));
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16((*seq1Ptr), (*seq2Ptr));
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16((*seq1Ptr), (*seq2Ptr));
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16((*seq1Ptr), (*seq2Ptr));
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16((*seq1Ptr), (*seq2Ptr));
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16((*seq1Ptr), (*seq2Ptr));
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16((*seq1Ptr), (*seq2Ptr));
-                seq1Ptr++;
-                seq2Ptr++;
-            }
-
-            for (j = dim_seq8; j < dim_seq; j++)
-            {
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16((*seq1Ptr), (*seq2Ptr));
-                seq1Ptr++;
-                seq2Ptr++;
-            }
-        }
-        else // right_shifts != 0
-
-        {
-            // Perform the optimized cross correlation
-            for (j = 0; j < dim_seq8; j = j + 8)
-            {
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr),
-                                                             right_shifts);
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr),
-                                                             right_shifts);
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr),
-                                                             right_shifts);
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr),
-                                                             right_shifts);
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr),
-                                                             right_shifts);
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr),
-                                                             right_shifts);
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr),
-                                                             right_shifts);
-                seq1Ptr++;
-                seq2Ptr++;
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr),
-                                                             right_shifts);
-                seq1Ptr++;
-                seq2Ptr++;
-            }
-
-            for (j = dim_seq8; j < dim_seq; j++)
-            {
-                (*CrossCorrPtr) += WEBRTC_SPL_MUL_16_16_RSFT((*seq1Ptr), (*seq2Ptr),
-                                                             right_shifts);
-                seq1Ptr++;
-                seq2Ptr++;
-            }
-        }
-#endif
-        CrossCorrPtr++;
-    }
-#endif
-}
diff --git a/src/mod/codecs/mod_isac/decode.c b/src/mod/codecs/mod_isac/decode.c
deleted file mode 100644
index 25634b0a89..0000000000
--- a/src/mod/codecs/mod_isac/decode.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * decode_B.c
- *
- * This file contains definition of funtions for decoding.
- * Decoding of lower-band, including normal-decoding and RCU decoding.
- * Decoding of upper-band, including 8-12 kHz, when the bandwidth is
- * 0-12 kHz, and 8-16 kHz, when the bandwidth is 0-16 kHz.
- *
- */
-
-
-#include "codec.h"
-#include "entropy_coding.h"
-#include "pitch_estimator.h"
-#include "bandwidth_estimator.h"
-#include "structs.h"
-#include "settings.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/*
- * function to decode the bitstream
- * returns the total number of bytes in the stream
- */
-int
-WebRtcIsac_DecodeLb(
-    float*          signal_out,
-    ISACLBDecStruct* ISACdecLB_obj,
-    WebRtc_Word16*    current_framesamples,
-    WebRtc_Word16     isRCUPayload)
-{
-  int k, model;
-  int len, err;
-  WebRtc_Word16 bandwidthInd;
-
-  float LP_dec_float[FRAMESAMPLES_HALF];
-  float HP_dec_float[FRAMESAMPLES_HALF];
-
-  double LPw[FRAMESAMPLES_HALF];
-  double HPw[FRAMESAMPLES_HALF];
-  double LPw_pf[FRAMESAMPLES_HALF];
-
-  double lo_filt_coef[(ORDERLO+1)*SUBFRAMES];
-  double hi_filt_coef[(ORDERHI+1)*SUBFRAMES];
-
-  double real_f[FRAMESAMPLES_HALF];
-  double imag_f[FRAMESAMPLES_HALF];
-
-  double PitchLags[4];
-  double PitchGains[4];
-  double AvgPitchGain;
-  WebRtc_Word16 PitchGains_Q12[4];
-  WebRtc_Word16 AvgPitchGain_Q12;
-
-  float gain;
-
-  int frame_nb; /* counter */
-  int frame_mode; /* 0 for 20ms and 30ms, 1 for 60ms */
-  int processed_samples;
-
-  (ISACdecLB_obj->bitstr_obj).W_upper = 0xFFFFFFFF;
-  (ISACdecLB_obj->bitstr_obj).streamval = 0;
-  (ISACdecLB_obj->bitstr_obj).stream_index = 0;
-
-  len = 0;
-
-  /* decode framelength and BW estimation - not used,
-     only for stream pointer*/
-  err = WebRtcIsac_DecodeFrameLen(&ISACdecLB_obj->bitstr_obj,
-                                  current_framesamples);
-  if (err < 0) { // error check
-    return err;
-  }
-
-  /* frame_mode: 0, or 1 */
-  frame_mode = *current_framesamples/MAX_FRAMESAMPLES;
-  /* processed_samples: either 320 (20ms) or 480 (30, 60 ms) */
-  processed_samples = *current_framesamples/(frame_mode+1);
-
-  err = WebRtcIsac_DecodeSendBW(&ISACdecLB_obj->bitstr_obj, &bandwidthInd);
-  if (err < 0) { // error check
-    return err;
-  }
-
-  /* one loop if it's one frame (20 or 30ms), 2 loops if 2 frames
-     bundled together (60ms) */
-  for (frame_nb = 0; frame_nb <= frame_mode; frame_nb++) {
-    /* decode & dequantize pitch parameters */
-    err = WebRtcIsac_DecodePitchGain(&(ISACdecLB_obj->bitstr_obj),
-                                     PitchGains_Q12);
-    if (err < 0) { // error check
-      return err;
-    }
-
-    err = WebRtcIsac_DecodePitchLag(&ISACdecLB_obj->bitstr_obj,
-                                    PitchGains_Q12, PitchLags);
-    if (err < 0) { // error check
-      return err;
-    }
-
-    AvgPitchGain_Q12 = (PitchGains_Q12[0] + PitchGains_Q12[1] +
-                        PitchGains_Q12[2] + PitchGains_Q12[3])>>2;
-
-    /* decode & dequantize FiltCoef */
-    err = WebRtcIsac_DecodeLpc(&ISACdecLB_obj->bitstr_obj,
-                               lo_filt_coef,hi_filt_coef, &model);
-    if (err < 0) { // error check
-      return err;
-    }
-    /* decode & dequantize spectrum */
-    len = WebRtcIsac_DecodeSpecLb(&ISACdecLB_obj->bitstr_obj,
-                                  real_f, imag_f, AvgPitchGain_Q12);
-    if (len < 0) { // error check
-      return len;
-    }
-
-    /* inverse transform */
-    WebRtcIsac_Spec2time(real_f, imag_f, LPw, HPw,
-                        &ISACdecLB_obj->fftstr_obj);
-
-    /* convert PitchGains back to FLOAT for pitchfilter_post */
-    for (k = 0; k < 4; k++) {
-      PitchGains[k] = ((float)PitchGains_Q12[k])/4096;
-    }
-
-    if(isRCUPayload)
-    {
-      for (k = 0; k < 240; k++) {
-        LPw[k] *= RCU_TRANSCODING_SCALE_INVERSE;
-        HPw[k] *= RCU_TRANSCODING_SCALE_INVERSE;
-      }
-    }
-
-    /* inverse pitch filter */
-    WebRtcIsac_PitchfilterPost(LPw, LPw_pf,
-                                &ISACdecLB_obj->pitchfiltstr_obj, PitchLags, PitchGains);
-    /* convert AvgPitchGain back to FLOAT for computation of gain */
-    AvgPitchGain = ((float)AvgPitchGain_Q12)/4096;
-    gain = 1.0f - 0.45f * (float)AvgPitchGain;
-
-    for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-      /* reduce gain to compensate for pitch enhancer */
-      LPw_pf[ k ] *= gain;
-    }
-
-    if(isRCUPayload)
-    {
-      for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-        /* compensation for transcoding gain changes*/
-        LPw_pf[k] *= RCU_TRANSCODING_SCALE;
-        HPw[k]    *= RCU_TRANSCODING_SCALE;
-      }
-    }
-
-    /* perceptual post-filtering (using normalized lattice filter) */
-    WebRtcIsac_NormLatticeFilterAr(ORDERLO,
-                                    ISACdecLB_obj->maskfiltstr_obj.PostStateLoF,
-                                    (ISACdecLB_obj->maskfiltstr_obj).PostStateLoG,
-                                    LPw_pf, lo_filt_coef, LP_dec_float);
-    WebRtcIsac_NormLatticeFilterAr(ORDERHI,
-                                    ISACdecLB_obj->maskfiltstr_obj.PostStateHiF,
-                                    (ISACdecLB_obj->maskfiltstr_obj).PostStateHiG,
-                                    HPw, hi_filt_coef, HP_dec_float);
-
-    /* recombine the 2 bands */
-    WebRtcIsac_FilterAndCombineFloat( LP_dec_float, HP_dec_float,
-                                      signal_out + frame_nb * processed_samples,
-                                      &ISACdecLB_obj->postfiltbankstr_obj);
-  }
-
-  return len;
-}
-
-
-/*
- * This decode function is called when the codec is operating in 16 kHz
- * bandwidth to decode the upperband, i.e. 8-16 kHz.
- *
- * Contrary to lower-band, the upper-band (8-16 kHz) is not split in
- * frequency, but split to 12 sub-frames, i.e. twice as lower-band.
- */
-int
-WebRtcIsac_DecodeUb16(
-    float*           signal_out,
-    ISACUBDecStruct* ISACdecUB_obj,
-    WebRtc_Word16      isRCUPayload)
-{
-  int len, err;
-
-  double halfFrameFirst[FRAMESAMPLES_HALF];
-  double halfFrameSecond[FRAMESAMPLES_HALF];
-
-  double percepFilterParam[(UB_LPC_ORDER+1) * (SUBFRAMES<<1) +
-                           (UB_LPC_ORDER+1)];
-
-  double real_f[FRAMESAMPLES_HALF];
-  double imag_f[FRAMESAMPLES_HALF];
-
-  len = 0;
-
-  /* decode & dequantize FiltCoef */
-  memset(percepFilterParam, 0, sizeof(percepFilterParam));
-  err = WebRtcIsac_DecodeInterpolLpcUb(&ISACdecUB_obj->bitstr_obj,
-                                       percepFilterParam, isac16kHz);
-  if (err < 0) { // error check
-    return err;
-  }
-
-  /* decode & dequantize spectrum */
-  len = WebRtcIsac_DecodeSpecUB16(&ISACdecUB_obj->bitstr_obj, real_f,
-                                    imag_f);
-  if (len < 0) {  // error check
-    return len;
-  }
-  if(isRCUPayload)
-  {
-    int n;
-    for(n = 0; n < 240; n++)
-    {
-      real_f[n] *= RCU_TRANSCODING_SCALE_UB_INVERSE;
-      imag_f[n] *= RCU_TRANSCODING_SCALE_UB_INVERSE;
-    }
-  }
-
-  /* inverse transform */
-  WebRtcIsac_Spec2time(real_f, imag_f, halfFrameFirst, halfFrameSecond,
-                      &ISACdecUB_obj->fftstr_obj);
-
-  /* perceptual post-filtering (using normalized lattice filter) */
-  WebRtcIsac_NormLatticeFilterAr(UB_LPC_ORDER,
-                                  ISACdecUB_obj->maskfiltstr_obj.PostStateLoF,
-                                  (ISACdecUB_obj->maskfiltstr_obj).PostStateLoG, halfFrameFirst,
-                                  &percepFilterParam[(UB_LPC_ORDER+1)], signal_out);
-
-  WebRtcIsac_NormLatticeFilterAr(UB_LPC_ORDER,
-                                  ISACdecUB_obj->maskfiltstr_obj.PostStateLoF,
-                                  (ISACdecUB_obj->maskfiltstr_obj).PostStateLoG, halfFrameSecond,
-                                  &percepFilterParam[(UB_LPC_ORDER + 1) * SUBFRAMES + (UB_LPC_ORDER+1)],
-                                  &signal_out[FRAMESAMPLES_HALF]);
-
-  return len;
-}
-
-/*
- * This decode function is called when the codec operates at 0-12 kHz
- * bandwidth to decode the upperband, i.e. 8-12 kHz.
- *
- * At the encoder the upper-band is split into two band, 8-12 kHz & 12-16
- * kHz, and only 8-12 kHz is encoded. At the decoder, 8-12 kHz band is
- * reconstructed and 12-16 kHz replaced with zeros. Then two bands
- * are combined, to reconstruct the upperband 8-16 kHz.
- */
-int
-WebRtcIsac_DecodeUb12(
-    float*           signal_out,
-    ISACUBDecStruct* ISACdecUB_obj,
-    WebRtc_Word16      isRCUPayload)
-{
-  int len, err;
-
-  float LP_dec_float[FRAMESAMPLES_HALF];
-  float HP_dec_float[FRAMESAMPLES_HALF];
-
-  double LPw[FRAMESAMPLES_HALF];
-  double HPw[FRAMESAMPLES_HALF];
-
-  double percepFilterParam[(UB_LPC_ORDER+1)*SUBFRAMES];
-
-  double real_f[FRAMESAMPLES_HALF];
-  double imag_f[FRAMESAMPLES_HALF];
-
-  len = 0;
-
-  /* decode & dequantize FiltCoef */
-  err = WebRtcIsac_DecodeInterpolLpcUb(&ISACdecUB_obj->bitstr_obj,
-                                       percepFilterParam, isac12kHz);
-  if(err < 0) { // error check
-    return err;
-  }
-
-  /* decode & dequantize spectrum */
-  len = WebRtcIsac_DecodeSpecUB12(&ISACdecUB_obj->bitstr_obj,
-                                    real_f, imag_f);
-  if(len < 0) { // error check
-    return len;
-  }
-
-  if(isRCUPayload)
-  {
-    int n;
-    for(n = 0; n < 240; n++)
-    {
-      real_f[n] *= RCU_TRANSCODING_SCALE_UB_INVERSE;
-      imag_f[n] *= RCU_TRANSCODING_SCALE_UB_INVERSE;
-    }
-  }
-
-  /* inverse transform */
-  WebRtcIsac_Spec2time(real_f, imag_f, LPw, HPw, &ISACdecUB_obj->fftstr_obj);
-
-  /* perceptual post-filtering (using normalized lattice filter) */
-  WebRtcIsac_NormLatticeFilterAr(UB_LPC_ORDER,
-                                  ISACdecUB_obj->maskfiltstr_obj.PostStateLoF,
-                                  (ISACdecUB_obj->maskfiltstr_obj).PostStateLoG, LPw,
-                                  percepFilterParam, LP_dec_float);
-
-  /* Zerro for upper-band */
-  memset(HP_dec_float, 0, sizeof(float) * (FRAMESAMPLES_HALF));
-
-  /* recombine the 2 bands */
-  WebRtcIsac_FilterAndCombineFloat(HP_dec_float, LP_dec_float, signal_out,
-                                   &ISACdecUB_obj->postfiltbankstr_obj);
-
-
-
-  return len;
-}
diff --git a/src/mod/codecs/mod_isac/decode_bwe.c b/src/mod/codecs/mod_isac/decode_bwe.c
deleted file mode 100644
index cdac7fa8bf..0000000000
--- a/src/mod/codecs/mod_isac/decode_bwe.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "structs.h"
-#include "bandwidth_estimator.h"
-#include "entropy_coding.h"
-#include "codec.h"
-
-
-int
-WebRtcIsac_EstimateBandwidth(
-    BwEstimatorstr*           bwest_str,
-    Bitstr*                   streamdata,
-    WebRtc_Word32               packet_size,
-    WebRtc_UWord16              rtp_seq_number,
-    WebRtc_UWord32              send_ts,
-    WebRtc_UWord32              arr_ts,
-    enum IsacSamplingRate encoderSampRate,
-    enum IsacSamplingRate decoderSampRate)
-{
-  WebRtc_Word16  index;
-  WebRtc_Word16  frame_samples;
-  WebRtc_UWord32 sendTimestampIn16kHz;
-  WebRtc_UWord32 arrivalTimestampIn16kHz;
-  WebRtc_UWord32 diffSendTime;
-  WebRtc_UWord32 diffArrivalTime;
-  int err;
-
-  /* decode framelength and BW estimation */
-  err = WebRtcIsac_DecodeFrameLen(streamdata, &frame_samples);
-  if(err < 0)  // error check
-  {
-    return err;
-  }
-  err = WebRtcIsac_DecodeSendBW(streamdata, &index);
-  if(err < 0)  // error check
-  {
-    return err;
-  }
-
-  /* UPDATE ESTIMATES FROM OTHER SIDE */
-  err = WebRtcIsac_UpdateUplinkBwImpl(bwest_str, index, encoderSampRate);
-  if(err < 0)
-  {
-    return err;
-  }
-
-  // We like BWE to work at 16 kHz sampling rate,
-  // therefore, we have to change the timestamps accordingly.
-  // translate the send timestamp if required
-  diffSendTime = (WebRtc_UWord32)((WebRtc_UWord32)send_ts -
-                                  (WebRtc_UWord32)bwest_str->senderTimestamp);
-  bwest_str->senderTimestamp = send_ts;
-
-  diffArrivalTime = (WebRtc_UWord32)((WebRtc_UWord32)arr_ts -
-                                     (WebRtc_UWord32)bwest_str->receiverTimestamp);
-  bwest_str->receiverTimestamp = arr_ts;
-
-  if(decoderSampRate == kIsacSuperWideband)
-  {
-    diffArrivalTime = (WebRtc_UWord32)diffArrivalTime >> 1;
-    diffSendTime = (WebRtc_UWord32)diffSendTime >> 1;
-  }
-  // arrival timestamp in 16 kHz
-  arrivalTimestampIn16kHz = (WebRtc_UWord32)((WebRtc_UWord32)
-                                             bwest_str->prev_rec_arr_ts + (WebRtc_UWord32)diffArrivalTime);
-  // send timestamp in 16 kHz
-  sendTimestampIn16kHz = (WebRtc_UWord32)((WebRtc_UWord32)
-                                          bwest_str->prev_rec_send_ts + (WebRtc_UWord32)diffSendTime);
-
-  err = WebRtcIsac_UpdateBandwidthEstimator(bwest_str, rtp_seq_number,
-                                            (frame_samples * 1000) / FS, sendTimestampIn16kHz,
-                                            arrivalTimestampIn16kHz, packet_size);
-  // error check
-  if(err < 0)
-  {
-    return err;
-  }
-
-  return 0;
-}
diff --git a/src/mod/codecs/mod_isac/division_operations.c b/src/mod/codecs/mod_isac/division_operations.c
deleted file mode 100644
index b143373a2f..0000000000
--- a/src/mod/codecs/mod_isac/division_operations.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains implementations of the divisions
- * WebRtcSpl_DivU32U16()
- * WebRtcSpl_DivW32W16()
- * WebRtcSpl_DivW32W16ResW16()
- * WebRtcSpl_DivResultInQ31()
- * WebRtcSpl_DivW32HiLow()
- *
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-WebRtc_UWord32 WebRtcSpl_DivU32U16(WebRtc_UWord32 num, WebRtc_UWord16 den)
-{
-    // Guard against division with 0
-    if (den != 0)
-    {
-        return (WebRtc_UWord32)(num / den);
-    } else
-    {
-        return (WebRtc_UWord32)0xFFFFFFFF;
-    }
-}
-
-WebRtc_Word32 WebRtcSpl_DivW32W16(WebRtc_Word32 num, WebRtc_Word16 den)
-{
-    // Guard against division with 0
-    if (den != 0)
-    {
-        return (WebRtc_Word32)(num / den);
-    } else
-    {
-        return (WebRtc_Word32)0x7FFFFFFF;
-    }
-}
-
-WebRtc_Word16 WebRtcSpl_DivW32W16ResW16(WebRtc_Word32 num, WebRtc_Word16 den)
-{
-    // Guard against division with 0
-    if (den != 0)
-    {
-        return (WebRtc_Word16)(num / den);
-    } else
-    {
-        return (WebRtc_Word16)0x7FFF;
-    }
-}
-
-WebRtc_Word32 WebRtcSpl_DivResultInQ31(WebRtc_Word32 num, WebRtc_Word32 den)
-{
-    WebRtc_Word32 L_num = num;
-    WebRtc_Word32 L_den = den;
-    WebRtc_Word32 div = 0;
-    int k = 31;
-    int change_sign = 0;
-
-    if (num == 0)
-        return 0;
-
-    if (num < 0)
-    {
-        change_sign++;
-        L_num = -num;
-    }
-    if (den < 0)
-    {
-        change_sign++;
-        L_den = -den;
-    }
-    while (k--)
-    {
-        div <<= 1;
-        L_num <<= 1;
-        if (L_num >= L_den)
-        {
-            L_num -= L_den;
-            div++;
-        }
-    }
-    if (change_sign == 1)
-    {
-        div = -div;
-    }
-    return div;
-}
-
-WebRtc_Word32 WebRtcSpl_DivW32HiLow(WebRtc_Word32 num, WebRtc_Word16 den_hi,
-                                    WebRtc_Word16 den_low)
-{
-    WebRtc_Word16 approx, tmp_hi, tmp_low, num_hi, num_low;
-    WebRtc_Word32 tmpW32;
-
-    approx = (WebRtc_Word16)WebRtcSpl_DivW32W16((WebRtc_Word32)0x1FFFFFFF, den_hi);
-    // result in Q14 (Note: 3FFFFFFF = 0.5 in Q30)
-
-    // tmpW32 = 1/den = approx * (2.0 - den * approx) (in Q30)
-    tmpW32 = (WEBRTC_SPL_MUL_16_16(den_hi, approx) << 1)
-            + ((WEBRTC_SPL_MUL_16_16(den_low, approx) >> 15) << 1);
-    // tmpW32 = den * approx
-
-    tmpW32 = (WebRtc_Word32)0x7fffffffL - tmpW32; // result in Q30 (tmpW32 = 2.0-(den*approx))
-
-    // Store tmpW32 in hi and low format
-    tmp_hi = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(tmpW32, 16);
-    tmp_low = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((tmpW32
-            - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)tmp_hi, 16)), 1);
-
-    // tmpW32 = 1/den in Q29
-    tmpW32 = ((WEBRTC_SPL_MUL_16_16(tmp_hi, approx) + (WEBRTC_SPL_MUL_16_16(tmp_low, approx)
-            >> 15)) << 1);
-
-    // 1/den in hi and low format
-    tmp_hi = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(tmpW32, 16);
-    tmp_low = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((tmpW32
-            - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)tmp_hi, 16)), 1);
-
-    // Store num in hi and low format
-    num_hi = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(num, 16);
-    num_low = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((num
-            - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)num_hi, 16)), 1);
-
-    // num * (1/den) by 32 bit multiplication (result in Q28)
-
-    tmpW32 = (WEBRTC_SPL_MUL_16_16(num_hi, tmp_hi) + (WEBRTC_SPL_MUL_16_16(num_hi, tmp_low)
-            >> 15) + (WEBRTC_SPL_MUL_16_16(num_low, tmp_hi) >> 15));
-
-    // Put result in Q31 (convert from Q28)
-    tmpW32 = WEBRTC_SPL_LSHIFT_W32(tmpW32, 3);
-
-    return tmpW32;
-}
diff --git a/src/mod/codecs/mod_isac/dot_product_with_scale.c b/src/mod/codecs/mod_isac/dot_product_with_scale.c
deleted file mode 100644
index 6e085fdb60..0000000000
--- a/src/mod/codecs/mod_isac/dot_product_with_scale.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_DotProductWithScale().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-WebRtc_Word32 WebRtcSpl_DotProductWithScale(WebRtc_Word16 *vector1, WebRtc_Word16 *vector2,
-                                            int length, int scaling)
-{
-    WebRtc_Word32 sum;
-    int i;
-#ifdef _ARM_OPT_
-#pragma message("NOTE: _ARM_OPT_ optimizations are used")
-    WebRtc_Word16 len4 = (length >> 2) << 2;
-#endif
-
-    sum = 0;
-
-#ifndef _ARM_OPT_
-    for (i = 0; i < length; i++)
-    {
-        sum += WEBRTC_SPL_MUL_16_16_RSFT(*vector1++, *vector2++, scaling);
-    }
-#else
-    if (scaling == 0)
-    {
-        for (i = 0; i < len4; i = i + 4)
-        {
-            sum += WEBRTC_SPL_MUL_16_16(*vector1, *vector2);
-            vector1++;
-            vector2++;
-            sum += WEBRTC_SPL_MUL_16_16(*vector1, *vector2);
-            vector1++;
-            vector2++;
-            sum += WEBRTC_SPL_MUL_16_16(*vector1, *vector2);
-            vector1++;
-            vector2++;
-            sum += WEBRTC_SPL_MUL_16_16(*vector1, *vector2);
-            vector1++;
-            vector2++;
-        }
-
-        for (i = len4; i < length; i++)
-        {
-            sum += WEBRTC_SPL_MUL_16_16(*vector1, *vector2);
-            vector1++;
-            vector2++;
-        }
-    }
-    else
-    {
-        for (i = 0; i < len4; i = i + 4)
-        {
-            sum += WEBRTC_SPL_MUL_16_16_RSFT(*vector1, *vector2, scaling);
-            vector1++;
-            vector2++;
-            sum += WEBRTC_SPL_MUL_16_16_RSFT(*vector1, *vector2, scaling);
-            vector1++;
-            vector2++;
-            sum += WEBRTC_SPL_MUL_16_16_RSFT(*vector1, *vector2, scaling);
-            vector1++;
-            vector2++;
-            sum += WEBRTC_SPL_MUL_16_16_RSFT(*vector1, *vector2, scaling);
-            vector1++;
-            vector2++;
-        }
-
-        for (i = len4; i < length; i++)
-        {
-            sum += WEBRTC_SPL_MUL_16_16_RSFT(*vector1, *vector2, scaling);
-            vector1++;
-            vector2++;
-        }
-    }
-#endif
-
-    return sum;
-}
diff --git a/src/mod/codecs/mod_isac/downsample_fast.c b/src/mod/codecs/mod_isac/downsample_fast.c
deleted file mode 100644
index cce463c5d3..0000000000
--- a/src/mod/codecs/mod_isac/downsample_fast.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_DownsampleFast().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-int WebRtcSpl_DownsampleFast(WebRtc_Word16 *in_ptr, WebRtc_Word16 in_length,
-                             WebRtc_Word16 *out_ptr, WebRtc_Word16 out_length,
-                             WebRtc_Word16 *B, WebRtc_Word16 B_length, WebRtc_Word16 factor,
-                             WebRtc_Word16 delay)
-{
-    WebRtc_Word32 o;
-    int i, j;
-
-    WebRtc_Word16 *downsampled_ptr = out_ptr;
-    WebRtc_Word16 *b_ptr;
-    WebRtc_Word16 *x_ptr;
-    WebRtc_Word16 endpos = delay
-            + (WebRtc_Word16)WEBRTC_SPL_MUL_16_16(factor, (out_length - 1)) + 1;
-
-    if (in_length < endpos)
-    {
-        return -1;
-    }
-
-    for (i = delay; i < endpos; i += factor)
-    {
-        b_ptr = &B[0];
-        x_ptr = &in_ptr[i];
-
-        o = (WebRtc_Word32)2048; // Round val
-
-        for (j = 0; j < B_length; j++)
-        {
-            o += WEBRTC_SPL_MUL_16_16(*b_ptr++, *x_ptr--);
-        }
-
-        o = WEBRTC_SPL_RSHIFT_W32(o, 12);
-
-        // If output is higher than 32768, saturate it. Same with negative side
-
-        *downsampled_ptr++ = WebRtcSpl_SatW32ToW16(o);
-    }
-
-    return 0;
-}
diff --git a/src/mod/codecs/mod_isac/encode.c b/src/mod/codecs/mod_isac/encode.c
deleted file mode 100644
index 66b80244a8..0000000000
--- a/src/mod/codecs/mod_isac/encode.c
+++ /dev/null
@@ -1,1451 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * encode.c
- *
- * This file contains definition of funtions for encoding.
- * Decoding of upper-band, including 8-12 kHz, when the bandwidth is
- * 0-12 kHz, and 8-16 kHz, when the bandwidth is 0-16 kHz.
- *
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "structs.h"
-#include "codec.h"
-#include "pitch_estimator.h"
-#include "entropy_coding.h"
-#include "arith_routines.h"
-#include "pitch_gain_tables.h"
-#include "pitch_lag_tables.h"
-#include "spectrum_ar_model_tables.h"
-#include "lpc_tables.h"
-#include "lpc_analysis.h"
-#include "bandwidth_estimator.h"
-#include "lpc_shape_swb12_tables.h"
-#include "lpc_shape_swb16_tables.h"
-#include "lpc_gain_swb_tables.h"
-
-
-#define UB_LOOKAHEAD 24
-
-/*
-  Rate allocation tables of lower and upper-band bottleneck for
-  12kHz & 16kHz bandwidth.
-
-  12 kHz bandwidth
-  -----------------
-  The overall bottleneck of the coder is between 38 kbps and 45 kbps. We have
-  considered 7 enteries, uniformly distributed in this interval, i.e. 38,
-  39.17, 40.33, 41.5, 42.67, 43.83 and 45. For every entery, the lower-band
-  and the upper-band bottlenecks are specified in
-  'kLowerBandBitRate12' and 'kUpperBandBitRate12'
-  tables, respectively. E.g. the overall rate of 41.5 kbps corresponts to a
-  bottleneck of 31 kbps for lower-band and 27 kbps for upper-band. Given an
-  overall bottleneck of the codec, we use linear interpolation to get
-  lower-band and upper-band bottlenecks.
-
-  16 kHz bandwidth
-  -----------------
-  The overall bottleneck of the coder is between 50 kbps and 56 kbps. We have
-  considered 7 enteries, uniformly distributed in this interval, i.e. 50, 51.2,
-  52.4, 53.6, 54.8 and 56. For every entery, the lower-band and the upper-band
-  bottlenecks are specified in 'kLowerBandBitRate16' and
-  'kUpperBandBitRate16' tables, respectively. E.g. the overall rate
-  of 53.6 kbps corresponts to a bottleneck of 32 kbps for lower-band and 30
-  kbps for upper-band. Given an overall bottleneck of the codec, we use linear
-  interpolation to get lower-band and upper-band bottlenecks.
-
-*/
-
-//     38  39.17  40.33   41.5  42.67  43.83     45
-static const WebRtc_Word16 kLowerBandBitRate12[7] = {
-  29000, 30000, 30000, 31000, 31000, 32000, 32000};
-static const WebRtc_Word16 kUpperBandBitRate12[7] = {
-  25000, 25000, 27000, 27000, 29000, 29000, 32000};
-
-//    50     51.2  52.4   53.6   54.8    56
-static const WebRtc_Word16 kLowerBandBitRate16[6] = {
-  31000, 31000, 32000, 32000, 32000, 32000};
-static const WebRtc_Word16 kUpperBandBitRate16[6] = {
-  28000, 29000, 29000, 30000, 31000, 32000};
-
-/******************************************************************************
- * WebRtcIsac_RateAllocation()
- * Internal function to perform a rate-allocation for upper and lower-band,
- * given a total rate.
- *
- * Input:
- *   - inRateBitPerSec           : a total bottleneck in bits/sec.
- *
- * Output:
- *   - rateLBBitPerSec           : a bottleneck allocated to the lower-band
- *                                 in bits/sec.
- *   - rateUBBitPerSec           : a bottleneck allocated to the upper-band
- *                                 in bits/sec.
- *
- * Return value                  : 0 if rate allocation has been successful.
- *                                -1 if failed to allocate rates.
- */
-
-WebRtc_Word16
-WebRtcIsac_RateAllocation(
-    WebRtc_Word32         inRateBitPerSec,
-    double*             rateLBBitPerSec,
-    double*             rateUBBitPerSec,
-    enum ISACBandwidth* bandwidthKHz)
-{
-  WebRtc_Word16 idx;
-  double idxD;
-  double idxErr;
-  if(inRateBitPerSec < 38000)
-  {
-    // If the given overall bottleneck is less than 38000 then
-    // then codec has to operate in wideband mode, i.e. 8 kHz
-    // bandwidth.
-    *rateLBBitPerSec = (WebRtc_Word16)((inRateBitPerSec > 32000)?
-                                       32000:inRateBitPerSec);
-    *rateUBBitPerSec = 0;
-    *bandwidthKHz = isac8kHz;
-  }
-  else if((inRateBitPerSec >= 38000) && (inRateBitPerSec < 50000))
-  {
-    // At a bottleneck between 38 and 50 kbps the codec is operating
-    // at 12 kHz bandwidth. Using xxxBandBitRate12[] to calculates
-    // upper/lower bottleneck
-
-    // find the bottlenecks by linear interpolation
-    // step is (45000 - 38000)/6.0 we use the inverse of it.
-    const double stepSizeInv = 8.5714286e-4;
-    idxD = (inRateBitPerSec - 38000) * stepSizeInv;
-    idx = (idxD >= 6)? 6:((WebRtc_Word16)idxD);
-    idxErr = idxD - idx;
-    *rateLBBitPerSec = kLowerBandBitRate12[idx];
-    *rateUBBitPerSec = kUpperBandBitRate12[idx];
-
-    if(idx < 6)
-    {
-      *rateLBBitPerSec += (WebRtc_Word16)(idxErr *
-                                          (kLowerBandBitRate12[idx + 1] -
-                                           kLowerBandBitRate12[idx]));
-      *rateUBBitPerSec += (WebRtc_Word16)(idxErr *
-                                          (kUpperBandBitRate12[idx + 1] -
-                                           kUpperBandBitRate12[idx]));
-    }
-
-    *bandwidthKHz = isac12kHz;
-  }
-  else if((inRateBitPerSec >= 50000) && (inRateBitPerSec <= 56000))
-  {
-    // A bottleneck between 50 and 56 kbps corresponds to bandwidth
-    // of 16 kHz. Using xxxBandBitRate16[] to calculates
-    // upper/lower bottleneck
-
-    // find the bottlenecks by linear interpolation
-    // step is (56000 - 50000)/5 we use the inverse of it
-    const double stepSizeInv = 8.3333333e-4;
-    idxD = (inRateBitPerSec - 50000) * stepSizeInv;
-    idx = (idxD >= 5)? 5:((WebRtc_Word16)idxD);
-    idxErr = idxD - idx;
-    *rateLBBitPerSec = kLowerBandBitRate16[idx];
-    *rateUBBitPerSec  = kUpperBandBitRate16[idx];
-
-    if(idx < 5)
-    {
-      *rateLBBitPerSec += (WebRtc_Word16)(idxErr *
-                                          (kLowerBandBitRate16[idx + 1] -
-                                           kLowerBandBitRate16[idx]));
-
-      *rateUBBitPerSec += (WebRtc_Word16)(idxErr *
-                                          (kUpperBandBitRate16[idx + 1] -
-                                           kUpperBandBitRate16[idx]));
-    }
-
-    *bandwidthKHz = isac16kHz;
-  }
-  else
-  {
-    // Out-of-range botlteneck value.
-    return -1;
-  }
-
-  // limit the values.
-  *rateLBBitPerSec = (*rateLBBitPerSec > 32000)? 32000:*rateLBBitPerSec;
-  *rateUBBitPerSec = (*rateUBBitPerSec > 32000)? 32000:*rateUBBitPerSec;
-
-  return 0;
-}
-
-
-
-int
-WebRtcIsac_EncodeLb(
-    float*           in,
-    ISACLBEncStruct* ISACencLB_obj,
-    WebRtc_Word16      codingMode,
-    WebRtc_Word16      bottleneckIndex)
-{
-  int stream_length = 0;
-  int err;
-  int k;
-  int iterCntr;
-
-  double lofilt_coef[(ORDERLO+1)*SUBFRAMES];
-  double hifilt_coef[(ORDERHI+1)*SUBFRAMES];
-  float LP[FRAMESAMPLES_HALF];
-  float HP[FRAMESAMPLES_HALF];
-
-  double LP_lookahead[FRAMESAMPLES_HALF];
-  double HP_lookahead[FRAMESAMPLES_HALF];
-  double LP_lookahead_pf[FRAMESAMPLES_HALF + QLOOKAHEAD];
-  double LPw[FRAMESAMPLES_HALF];
-
-  double HPw[FRAMESAMPLES_HALF];
-  double LPw_pf[FRAMESAMPLES_HALF];
-  WebRtc_Word16 fre[FRAMESAMPLES_HALF];   /* Q7 */
-  WebRtc_Word16 fim[FRAMESAMPLES_HALF];   /* Q7 */
-
-  double PitchLags[4];
-  double PitchGains[4];
-  WebRtc_Word16 PitchGains_Q12[4];
-  WebRtc_Word16 AvgPitchGain_Q12;
-
-  int frame_mode; /* 0 for 30ms, 1 for 60ms */
-  int processed_samples, status = 0;
-
-  double bits_gains;
-  int bmodel;
-
-  transcode_obj transcodingParam;
-  double bytesLeftSpecCoding;
-  WebRtc_UWord16 payloadLimitBytes;
-
-  /* copy new frame length and bottle neck rate only for the first
-     10 ms data */
-  if (ISACencLB_obj->buffer_index == 0) {
-    /* set the framelength for the next packet */
-    ISACencLB_obj->current_framesamples = ISACencLB_obj->new_framelength;
-  }
-  /* frame_mode is 0 (30 ms) or 1 (60 ms)  */
-  frame_mode = ISACencLB_obj->current_framesamples/MAX_FRAMESAMPLES;
-  /* processed_samples: 480 (30, 60 ms) */
-  processed_samples = ISACencLB_obj->current_framesamples/(frame_mode+1);
-
-  /* buffer speech samples (by 10ms packet) until the framelength */
-  /* is reached (30 or 60 ms)                                     */
-  /****************************************************************/
-
-  /* fill the buffer with 10ms input data */
-  for (k = 0; k < FRAMESAMPLES_10ms; k++) {
-    ISACencLB_obj->data_buffer_float[k + ISACencLB_obj->buffer_index] =
-        in[k];
-  }
-
-  /* if buffersize is not equal to current framesize then increase index
-     and return. We do no encoding untill we have enough audio.  */
-  if (ISACencLB_obj->buffer_index + FRAMESAMPLES_10ms != processed_samples) {
-    ISACencLB_obj->buffer_index += FRAMESAMPLES_10ms;
-    return 0;
-  }
-  /* if buffer reached the right size, reset index and continue with
-     encoding the frame */
-  ISACencLB_obj->buffer_index = 0;
-
-  /* end of buffer function */
-  /**************************/
-
-  /* encoding */
-  /************/
-
-  if (frame_mode == 0 || ISACencLB_obj->frame_nb == 0 ) {
-    // This is to avoid Linux warnings until we change 'int' to 'Word32'
-    // at all places.
-    int intVar;
-    /* reset bitstream */
-    ISACencLB_obj->bitstr_obj.W_upper = 0xFFFFFFFF;
-    ISACencLB_obj->bitstr_obj.streamval = 0;
-    ISACencLB_obj->bitstr_obj.stream_index = 0;
-
-    if((codingMode == 0) && (frame_mode == 0) &&
-       (ISACencLB_obj->enforceFrameSize == 0)) {
-      ISACencLB_obj->new_framelength =
-          WebRtcIsac_GetNewFrameLength(ISACencLB_obj->bottleneck,
-                                       ISACencLB_obj->current_framesamples);
-    }
-
-    ISACencLB_obj->s2nr = WebRtcIsac_GetSnr(
-        ISACencLB_obj->bottleneck, ISACencLB_obj->current_framesamples);
-
-    /* encode frame length */
-    status = WebRtcIsac_EncodeFrameLen(
-        ISACencLB_obj->current_framesamples, &ISACencLB_obj->bitstr_obj);
-    if (status < 0) {
-      /* Wrong frame size */
-      return status;
-    }
-    /* Save framelength for multiple packets memory */
-    ISACencLB_obj->SaveEnc_obj.framelength =
-        ISACencLB_obj->current_framesamples;
-
-    /* To be used for Redundant Coding */
-    ISACencLB_obj->lastBWIdx = bottleneckIndex;
-    intVar = (int)bottleneckIndex;
-    WebRtcIsac_EncodeReceiveBw(&intVar, &ISACencLB_obj->bitstr_obj);
-  }
-
-  /* split signal in two bands */
-  WebRtcIsac_SplitAndFilterFloat(ISACencLB_obj->data_buffer_float, LP, HP,
-                                 LP_lookahead, HP_lookahead,    &ISACencLB_obj->prefiltbankstr_obj );
-
-  /* estimate pitch parameters and pitch-filter lookahead signal */
-  WebRtcIsac_PitchAnalysis(LP_lookahead, LP_lookahead_pf,
-                           &ISACencLB_obj->pitchanalysisstr_obj, PitchLags, PitchGains);
-
-  /* encode in FIX Q12 */
-
-  /* convert PitchGain to Fixed point */
-  for (k=0;k<PITCH_SUBFRAMES;k++) {
-    PitchGains_Q12[k] = (WebRtc_Word16)(PitchGains[k] * 4096.0);
-  }
-
-  /* Set where to store data in multiple packets memory */
-  if (frame_mode == 0 || ISACencLB_obj->frame_nb == 0)
-  {
-    ISACencLB_obj->SaveEnc_obj.startIdx = 0;
-  } else {
-    ISACencLB_obj->SaveEnc_obj.startIdx = 1;
-  }
-
-  /* quantize & encode pitch parameters */
-  WebRtcIsac_EncodePitchGain(PitchGains_Q12, &ISACencLB_obj->bitstr_obj,
-                             &ISACencLB_obj->SaveEnc_obj);
-  WebRtcIsac_EncodePitchLag(PitchLags, PitchGains_Q12,
-                            &ISACencLB_obj->bitstr_obj, &ISACencLB_obj->SaveEnc_obj);
-
-  AvgPitchGain_Q12 = (PitchGains_Q12[0] + PitchGains_Q12[1] +
-                      PitchGains_Q12[2] + PitchGains_Q12[3])>>2;
-
-  /* find coefficients for perceptual pre-filters */
-  WebRtcIsac_GetLpcCoefLb(LP_lookahead_pf, HP_lookahead,
-                          &ISACencLB_obj->maskfiltstr_obj, ISACencLB_obj->s2nr,
-                          PitchGains_Q12, lofilt_coef, hifilt_coef);
-
-  /* code LPC model and shape - gains not quantized yet */
-  WebRtcIsac_EncodeLpcLb(lofilt_coef, hifilt_coef,  &bmodel, &bits_gains,
-                         &ISACencLB_obj->bitstr_obj, &ISACencLB_obj->SaveEnc_obj);
-
-  /* convert PitchGains back to FLOAT for pitchfilter_pre */
-  for (k = 0; k < 4; k++) {
-    PitchGains[k] = ((float)PitchGains_Q12[k])/4096;
-  }
-
-  /* Store the state of arithmetic coder before coding LPC gains */
-  transcodingParam.W_upper      = ISACencLB_obj->bitstr_obj.W_upper;
-  transcodingParam.stream_index = ISACencLB_obj->bitstr_obj.stream_index;
-  transcodingParam.streamval    = ISACencLB_obj->bitstr_obj.streamval;
-  transcodingParam.stream[0]    = ISACencLB_obj->bitstr_obj.stream[
-      ISACencLB_obj->bitstr_obj.stream_index - 2];
-  transcodingParam.stream[1]    = ISACencLB_obj->bitstr_obj.stream[
-      ISACencLB_obj->bitstr_obj.stream_index - 1];
-  transcodingParam.stream[2]    = ISACencLB_obj->bitstr_obj.stream[
-      ISACencLB_obj->bitstr_obj.stream_index];
-
-  /* Store LPC Gains before encoding them */
-  for(k = 0; k < SUBFRAMES; k++) {
-    transcodingParam.loFiltGain[k] = lofilt_coef[(LPC_LOBAND_ORDER+1)*k];
-    transcodingParam.hiFiltGain[k] = hifilt_coef[(LPC_HIBAND_ORDER+1)*k];
-  }
-
-  /* Code gains */
-  WebRtcIsac_EncodeLpcGainLb(lofilt_coef, hifilt_coef,  bmodel,
-                             &ISACencLB_obj->bitstr_obj, &ISACencLB_obj->SaveEnc_obj);
-
-  /* Get the correct value for the payload limit and calculate the
-     number of bytes left for coding the spectrum.*/
-  if((frame_mode == 1) && (ISACencLB_obj->frame_nb == 0)) {
-    /* It is a 60ms and we are in the first 30ms then the limit at
-       this point should be half of the assigned value */
-    payloadLimitBytes = ISACencLB_obj->payloadLimitBytes60 >> 1;
-  }
-  else if (frame_mode == 0) {
-    /* It is a 30ms frame */
-    /* Subract 3 because termination process may add 3 bytes */
-    payloadLimitBytes = ISACencLB_obj->payloadLimitBytes30 - 3;
-  } else {
-    /* This is the second half of a 60ms frame. */
-    /* Subract 3 because termination process may add 3 bytes */
-    payloadLimitBytes = ISACencLB_obj->payloadLimitBytes60 - 3;
-  }
-  bytesLeftSpecCoding = payloadLimitBytes - transcodingParam.stream_index;
-
-  /* perceptual pre-filtering (using normalized lattice filter) */
-  /* low-band filtering */
-  WebRtcIsac_NormLatticeFilterMa(ORDERLO,
-                                  ISACencLB_obj->maskfiltstr_obj.PreStateLoF,
-                                  ISACencLB_obj->maskfiltstr_obj.PreStateLoG, LP, lofilt_coef, LPw);
-  /* high-band filtering */
-  WebRtcIsac_NormLatticeFilterMa(ORDERHI,
-                                  ISACencLB_obj->maskfiltstr_obj.PreStateHiF,
-                                  ISACencLB_obj->maskfiltstr_obj.PreStateHiG, HP, hifilt_coef, HPw);
-
-
-  /* pitch filter */
-  WebRtcIsac_PitchfilterPre(LPw, LPw_pf, &ISACencLB_obj->pitchfiltstr_obj,
-                             PitchLags, PitchGains);
-
-  /* transform */
-  WebRtcIsac_Time2Spec(LPw_pf, HPw, fre, fim, &ISACencLB_obj->fftstr_obj);
-
-
-  /* Save data for multiple packets memory */
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    ISACencLB_obj->SaveEnc_obj.fre[k +
-                                   ISACencLB_obj->SaveEnc_obj.startIdx*FRAMESAMPLES_HALF] = fre[k];
-    ISACencLB_obj->SaveEnc_obj.fim[k +
-                                   ISACencLB_obj->SaveEnc_obj.startIdx*FRAMESAMPLES_HALF] = fim[k];
-  }
-  ISACencLB_obj->SaveEnc_obj.AvgPitchGain[
-      ISACencLB_obj->SaveEnc_obj.startIdx] = AvgPitchGain_Q12;
-
-  /* quantization and lossless coding */
-  err = WebRtcIsac_EncodeSpecLb(fre, fim, &ISACencLB_obj->bitstr_obj,
-                                AvgPitchGain_Q12);
-  if ((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    /* There has been an error but it was not too large payload
-       (we can cure too large payload) */
-    if (frame_mode == 1 && ISACencLB_obj->frame_nb == 1) {
-      /* If this is the second 30ms of a 60ms frame reset
-         this such that in the next call encoder starts fresh. */
-      ISACencLB_obj->frame_nb = 0;
-    }
-    return err;
-  }
-  iterCntr = 0;
-  while((ISACencLB_obj->bitstr_obj.stream_index > payloadLimitBytes) ||
-        (err == -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    double bytesSpecCoderUsed;
-    double transcodeScale;
-
-    if(iterCntr >= MAX_PAYLOAD_LIMIT_ITERATION) {
-      /* We were not able to limit the payload size */
-      if((frame_mode == 1) && (ISACencLB_obj->frame_nb == 0)) {
-        /* This was the first 30ms of a 60ms frame. Although
-           the payload is larger than it should be but we let
-           the second 30ms be encoded. Maybe together we
-           won't exceed the limit. */
-        ISACencLB_obj->frame_nb = 1;
-        return 0;
-      } else if((frame_mode == 1) && (ISACencLB_obj->frame_nb == 1)) {
-        ISACencLB_obj->frame_nb = 0;
-      }
-
-      if(err != -ISAC_DISALLOWED_BITSTREAM_LENGTH) {
-        return -ISAC_PAYLOAD_LARGER_THAN_LIMIT;
-      } else {
-        return status;
-      }
-    }
-
-    if(err == -ISAC_DISALLOWED_BITSTREAM_LENGTH) {
-      bytesSpecCoderUsed = STREAM_SIZE_MAX;
-      // being coservative
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed * 0.5;
-    } else {
-      bytesSpecCoderUsed = ISACencLB_obj->bitstr_obj.stream_index -
-          transcodingParam.stream_index;
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed;
-    }
-
-    /* To be safe, we reduce the scale depending on
-       the number of iterations. */
-    transcodeScale *= (1.0 - (0.9 * (double)iterCntr /
-                              (double)MAX_PAYLOAD_LIMIT_ITERATION));
-
-    /* Scale the LPC Gains */
-    for (k = 0; k < SUBFRAMES; k++) {
-      lofilt_coef[(LPC_LOBAND_ORDER+1) * k] =
-          transcodingParam.loFiltGain[k] * transcodeScale;
-      hifilt_coef[(LPC_HIBAND_ORDER+1) * k] =
-          transcodingParam.hiFiltGain[k] * transcodeScale;
-      transcodingParam.loFiltGain[k] =
-          lofilt_coef[(LPC_LOBAND_ORDER+1) * k];
-      transcodingParam.hiFiltGain[k] =
-          hifilt_coef[(LPC_HIBAND_ORDER+1) * k];
-    }
-
-    /* Scale DFT coefficients */
-    for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-      fre[k] = (WebRtc_Word16)(fre[k] * transcodeScale);
-      fim[k] = (WebRtc_Word16)(fim[k] * transcodeScale);
-    }
-
-    /* Save data for multiple packets memory */
-    for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-      ISACencLB_obj->SaveEnc_obj.fre[k +
-                                     ISACencLB_obj->SaveEnc_obj.startIdx * FRAMESAMPLES_HALF] =
-          fre[k];
-      ISACencLB_obj->SaveEnc_obj.fim[k +
-                                     ISACencLB_obj->SaveEnc_obj.startIdx * FRAMESAMPLES_HALF] =
-          fim[k];
-    }
-
-    /* Re-store the state of arithmetic coder before coding LPC gains */
-    ISACencLB_obj->bitstr_obj.W_upper = transcodingParam.W_upper;
-    ISACencLB_obj->bitstr_obj.stream_index = transcodingParam.stream_index;
-    ISACencLB_obj->bitstr_obj.streamval = transcodingParam.streamval;
-    ISACencLB_obj->bitstr_obj.stream[transcodingParam.stream_index - 2] =
-        transcodingParam.stream[0];
-    ISACencLB_obj->bitstr_obj.stream[transcodingParam.stream_index - 1] =
-        transcodingParam.stream[1];
-    ISACencLB_obj->bitstr_obj.stream[transcodingParam.stream_index] =
-        transcodingParam.stream[2];
-
-    /* Code gains */
-    WebRtcIsac_EncodeLpcGainLb(lofilt_coef, hifilt_coef,  bmodel,
-                               &ISACencLB_obj->bitstr_obj, &ISACencLB_obj->SaveEnc_obj);
-
-    /* Update the number of bytes left for encoding the spectrum */
-    bytesLeftSpecCoding = payloadLimitBytes -
-        transcodingParam.stream_index;
-
-    /* Encode the spectrum */
-    err = WebRtcIsac_EncodeSpecLb(fre, fim, &ISACencLB_obj->bitstr_obj,
-                                  AvgPitchGain_Q12);
-    if((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-      /* There has been an error but it was not too large
-         payload (we can cure too large payload) */
-      if (frame_mode == 1 && ISACencLB_obj->frame_nb == 1) {
-        /* If this is the second 30ms of a 60ms frame reset
-           this such that in the next call encoder starts fresh. */
-        ISACencLB_obj->frame_nb = 0;
-      }
-      return err;
-    }
-    iterCntr++;
-  }
-
-  /* i.e. 60 ms framesize and just processed the first 30ms, */
-  /* go back to main function to buffer the other 30ms speech frame */
-  if (frame_mode == 1)
-  {
-    if(ISACencLB_obj->frame_nb == 0)
-    {
-      ISACencLB_obj->frame_nb = 1;
-      return 0;
-    }
-    else if(ISACencLB_obj->frame_nb == 1)
-    {
-      ISACencLB_obj->frame_nb = 0;
-      /* also update the framelength for next packet,
-         in Adaptive mode only */
-      if (codingMode == 0 && (ISACencLB_obj->enforceFrameSize == 0))
-      {
-        ISACencLB_obj->new_framelength =
-            WebRtcIsac_GetNewFrameLength(ISACencLB_obj->bottleneck,
-                                         ISACencLB_obj->current_framesamples);
-      }
-    }
-  }
-  else
-  {
-    ISACencLB_obj->frame_nb = 0;
-  }
-
-  /* complete arithmetic coding */
-  stream_length = WebRtcIsac_EncTerminate(&ISACencLB_obj->bitstr_obj);
-
-  return stream_length;
-}
-
-int
-WebRtcIsac_EncodeUb16(
-    float*           in,
-    ISACUBEncStruct* ISACencUB_obj,
-    WebRtc_Word32      jitterInfo)
-{
-  int err;
-  int k;
-
-  double lpcVecs[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  double percepFilterParams[(1 + UB_LPC_ORDER) * (SUBFRAMES<<1) +
-                            (1 + UB_LPC_ORDER)];
-
-  double LP_lookahead[FRAMESAMPLES];
-  WebRtc_Word16 fre[FRAMESAMPLES_HALF];   /* Q7 */
-  WebRtc_Word16 fim[FRAMESAMPLES_HALF];   /* Q7 */
-
-  int status = 0;
-
-  double varscale[2];
-  double corr[SUBFRAMES<<1][UB_LPC_ORDER + 1];
-  double lpcGains[SUBFRAMES<<1];
-  transcode_obj transcodingParam;
-  double bytesLeftSpecCoding;
-  WebRtc_UWord16 payloadLimitBytes;
-  WebRtc_UWord16 iterCntr;
-  double s2nr;
-
-  /* buffer speech samples (by 10ms packet) until the framelength is   */
-  /* reached (30 or 60 ms)                                             */
-  /*********************************************************************/
-
-  /* fill the buffer with 10ms input data */
-  for (k = 0; k < FRAMESAMPLES_10ms; k++) {
-    ISACencUB_obj->data_buffer_float[k + ISACencUB_obj->buffer_index] =
-        in[k];
-  }
-
-  /* if buffersize is not equal to current framesize, and end of file is
-     not reached yet, we don't do encoding unless we have the whole frame */
-  if (ISACencUB_obj->buffer_index + FRAMESAMPLES_10ms < FRAMESAMPLES) {
-    ISACencUB_obj->buffer_index += FRAMESAMPLES_10ms;
-    return 0;
-  }
-
-  /* end of buffer function */
-  /**************************/
-
-  /* encoding */
-  /************/
-
-  /* reset bitstream */
-  ISACencUB_obj->bitstr_obj.W_upper = 0xFFFFFFFF;
-  ISACencUB_obj->bitstr_obj.streamval = 0;
-  ISACencUB_obj->bitstr_obj.stream_index = 0;
-
-  /* bandwidth estimation and coding */
-  /* To be used for Redundant Coding */
-  WebRtcIsac_EncodeJitterInfo(jitterInfo, &ISACencUB_obj->bitstr_obj);
-
-  status = WebRtcIsac_EncodeBandwidth(isac16kHz,
-                                      &ISACencUB_obj->bitstr_obj);
-  if (status < 0) {
-    return status;
-  }
-
-  s2nr = WebRtcIsac_GetSnr(ISACencUB_obj->bottleneck,
-                                 FRAMESAMPLES);
-
-  memcpy(lpcVecs, ISACencUB_obj->lastLPCVec, UB_LPC_ORDER * sizeof(double));
-
-  for (k = 0; k < FRAMESAMPLES; k++) {
-    LP_lookahead[k] = ISACencUB_obj->data_buffer_float[UB_LOOKAHEAD + k];
-  }
-
-  /* find coefficients for perceptual pre-filters */
-  WebRtcIsac_GetLpcCoefUb(LP_lookahead, &ISACencUB_obj->maskfiltstr_obj,
-                            &lpcVecs[UB_LPC_ORDER], corr, varscale, isac16kHz);
-
-  memcpy(ISACencUB_obj->lastLPCVec,
-         &lpcVecs[(UB16_LPC_VEC_PER_FRAME - 1) * (UB_LPC_ORDER)],
-         sizeof(double) * UB_LPC_ORDER);
-
-  /* code LPC model and shape - gains not quantized yet */
-  WebRtcIsac_EncodeLpcUB(lpcVecs, &ISACencUB_obj->bitstr_obj,
-                           percepFilterParams, isac16kHz, &ISACencUB_obj->SaveEnc_obj);
-
-
-  // the first set of lpc parameters are from the last sub-frame of
-  // the previous frame. so we don't care about them
-  WebRtcIsac_GetLpcGain(s2nr, &percepFilterParams[UB_LPC_ORDER + 1],
-                       (SUBFRAMES<<1), lpcGains, corr, varscale);
-
-  /* Store the state of arithmetic coder before coding LPC gains */
-  transcodingParam.stream_index = ISACencUB_obj->bitstr_obj.stream_index;
-  transcodingParam.W_upper      = ISACencUB_obj->bitstr_obj.W_upper;
-  transcodingParam.streamval    = ISACencUB_obj->bitstr_obj.streamval;
-  transcodingParam.stream[0]    = ISACencUB_obj->bitstr_obj.stream[
-      ISACencUB_obj->bitstr_obj.stream_index - 2];
-  transcodingParam.stream[1]    = ISACencUB_obj->bitstr_obj.stream[
-      ISACencUB_obj->bitstr_obj.stream_index - 1];
-  transcodingParam.stream[2]    = ISACencUB_obj->bitstr_obj.stream[
-      ISACencUB_obj->bitstr_obj.stream_index];
-
-  /* Store LPC Gains before encoding them */
-  for(k = 0; k < SUBFRAMES; k++) {
-    transcodingParam.loFiltGain[k] = lpcGains[k];
-    transcodingParam.hiFiltGain[k] = lpcGains[SUBFRAMES + k];
-  }
-
-  // Store the gains for multiple encoding
-  memcpy(ISACencUB_obj->SaveEnc_obj.lpcGain, lpcGains, (SUBFRAMES << 1) * sizeof(double));
-
-  WebRtcIsac_EncodeLpcGainUb(lpcGains, &ISACencUB_obj->bitstr_obj,
-                             ISACencUB_obj->SaveEnc_obj.lpcGainIndex);
-  WebRtcIsac_EncodeLpcGainUb(&lpcGains[SUBFRAMES], &ISACencUB_obj->bitstr_obj,
-                             &ISACencUB_obj->SaveEnc_obj.lpcGainIndex[SUBFRAMES]);
-
-  /* Get the correct value for the payload limit and calculate the number of
-     bytes left for coding the spectrum. It is a 30ms frame
-     Subract 3 because termination process may add 3 bytes */
-  payloadLimitBytes = ISACencUB_obj->maxPayloadSizeBytes -
-      ISACencUB_obj->numBytesUsed - 3;
-  bytesLeftSpecCoding = payloadLimitBytes -
-      ISACencUB_obj->bitstr_obj.stream_index;
-
-  for (k = 0; k < (SUBFRAMES<<1); k++) {
-    percepFilterParams[k*(UB_LPC_ORDER + 1) + (UB_LPC_ORDER + 1)] =
-        lpcGains[k];
-  }
-
-  /* perceptual pre-filtering (using normalized lattice filter) */
-  /* first half-frame filtering */
-  WebRtcIsac_NormLatticeFilterMa(UB_LPC_ORDER,
-                                  ISACencUB_obj->maskfiltstr_obj.PreStateLoF,
-                                  ISACencUB_obj->maskfiltstr_obj.PreStateLoG,
-                                  &ISACencUB_obj->data_buffer_float[0],
-                                  &percepFilterParams[UB_LPC_ORDER + 1],
-                                  &LP_lookahead[0]);
-
-  /* Second half-frame filtering */
-  WebRtcIsac_NormLatticeFilterMa(UB_LPC_ORDER,
-                                  ISACencUB_obj->maskfiltstr_obj.PreStateLoF,
-                                  ISACencUB_obj->maskfiltstr_obj.PreStateLoG,
-                                  &ISACencUB_obj->data_buffer_float[FRAMESAMPLES_HALF],
-                                  &percepFilterParams[(UB_LPC_ORDER + 1) + SUBFRAMES *
-                                                      (UB_LPC_ORDER + 1)], &LP_lookahead[FRAMESAMPLES_HALF]);
-
-  WebRtcIsac_Time2Spec(&LP_lookahead[0], &LP_lookahead[FRAMESAMPLES_HALF],
-                      fre, fim, &ISACencUB_obj->fftstr_obj);
-
-  //Store FFT coefficients for multiple encoding
-  memcpy(&ISACencUB_obj->SaveEnc_obj.realFFT, fre,
-         FRAMESAMPLES_HALF * sizeof(WebRtc_Word16));
-
-  memcpy(&ISACencUB_obj->SaveEnc_obj.imagFFT, fim,
-         FRAMESAMPLES_HALF * sizeof(WebRtc_Word16));
-
-  // Prepare the audio buffer for the next packet
-  // move the last 3 ms to the beginning of the buffer
-  memcpy(ISACencUB_obj->data_buffer_float,
-         &ISACencUB_obj->data_buffer_float[FRAMESAMPLES],
-         LB_TOTAL_DELAY_SAMPLES * sizeof(float));
-  // start writing with 3 ms delay to compensate for the delay
-  // of the lower-band.
-  ISACencUB_obj->buffer_index = LB_TOTAL_DELAY_SAMPLES;
-
-  // Save the bit-stream object at this point for FEC.
-  memcpy(&ISACencUB_obj->SaveEnc_obj.bitStreamObj,
-         &ISACencUB_obj->bitstr_obj, sizeof(Bitstr));
-
-  /* quantization and lossless coding */
-  err = WebRtcIsac_EncodeSpecUB16(fre, fim, &ISACencUB_obj->bitstr_obj);
-  if ((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    return err;
-  }
-
-  iterCntr = 0;
-  while((ISACencUB_obj->bitstr_obj.stream_index > payloadLimitBytes) ||
-        (err == -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    double bytesSpecCoderUsed;
-    double transcodeScale;
-
-    if (iterCntr >= MAX_PAYLOAD_LIMIT_ITERATION) {
-      /* We were not able to limit the payload size */
-      return -ISAC_PAYLOAD_LARGER_THAN_LIMIT;
-    }
-
-    if (err == -ISAC_DISALLOWED_BITSTREAM_LENGTH) {
-      bytesSpecCoderUsed = STREAM_SIZE_MAX;
-      // being conservative
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed * 0.5;
-    } else {
-      bytesSpecCoderUsed = ISACencUB_obj->bitstr_obj.stream_index -
-          transcodingParam.stream_index;
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed;
-    }
-
-    /* To be safe, we reduce the scale depending on the
-       number of iterations. */
-    transcodeScale *= (1.0 - (0.9 * (double)iterCntr/
-                              (double)MAX_PAYLOAD_LIMIT_ITERATION));
-
-    /* Scale the LPC Gains */
-    for (k = 0; k < SUBFRAMES; k++) {
-      transcodingParam.loFiltGain[k] *= transcodeScale;
-      transcodingParam.hiFiltGain[k] *= transcodeScale;
-    }
-
-    /* Scale DFT coefficients */
-    for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-      fre[k] = (WebRtc_Word16)(fre[k] * transcodeScale + 0.5);
-      fim[k] = (WebRtc_Word16)(fim[k] * transcodeScale + 0.5);
-    }
-
-    //Store FFT coefficients for multiple encoding
-    memcpy(&ISACencUB_obj->SaveEnc_obj.realFFT, fre,
-           FRAMESAMPLES_HALF * sizeof(WebRtc_Word16));
-
-    memcpy(&ISACencUB_obj->SaveEnc_obj.imagFFT, fim,
-           FRAMESAMPLES_HALF * sizeof(WebRtc_Word16));
-
-
-    /* Store the state of arithmetic coder before coding LPC gains */
-    ISACencUB_obj->bitstr_obj.W_upper = transcodingParam.W_upper;
-
-    ISACencUB_obj->bitstr_obj.stream_index = transcodingParam.stream_index;
-
-    ISACencUB_obj->bitstr_obj.streamval = transcodingParam.streamval;
-
-    ISACencUB_obj->bitstr_obj.stream[transcodingParam.stream_index - 2] =
-        transcodingParam.stream[0];
-
-    ISACencUB_obj->bitstr_obj.stream[transcodingParam.stream_index - 1] =
-        transcodingParam.stream[1];
-
-    ISACencUB_obj->bitstr_obj.stream[transcodingParam.stream_index] =
-        transcodingParam.stream[2];
-
-    // Store the gains for multiple encoding
-    memcpy(ISACencUB_obj->SaveEnc_obj.lpcGain, lpcGains,
-           (SUBFRAMES << 1) * sizeof(double));
-
-    WebRtcIsac_EncodeLpcGainUb(transcodingParam.loFiltGain,
-                               &ISACencUB_obj->bitstr_obj,
-                               ISACencUB_obj->SaveEnc_obj.lpcGainIndex);
-    WebRtcIsac_EncodeLpcGainUb(transcodingParam.hiFiltGain,
-                               &ISACencUB_obj->bitstr_obj,
-                               &ISACencUB_obj->SaveEnc_obj.lpcGainIndex[SUBFRAMES]);
-
-    /* Update the number of bytes left for encoding the spectrum */
-    bytesLeftSpecCoding = payloadLimitBytes -
-        ISACencUB_obj->bitstr_obj.stream_index;
-
-    // Save the bit-stream object at this point for FEC.
-    memcpy(&ISACencUB_obj->SaveEnc_obj.bitStreamObj,
-           &ISACencUB_obj->bitstr_obj, sizeof(Bitstr));
-
-    /* Encode the spectrum */
-    err = WebRtcIsac_EncodeSpecUB16(fre, fim, &ISACencUB_obj->bitstr_obj);
-    if ((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-      /* There has been an error but it was not too large payload
-         (we can cure too large payload) */
-      return err;
-    }
-    iterCntr++;
-  }
-
-  /* complete arithmetic coding */
-  return WebRtcIsac_EncTerminate(&ISACencUB_obj->bitstr_obj);
-}
-
-
-int
-WebRtcIsac_EncodeUb12(
-    float*           in,
-    ISACUBEncStruct* ISACencUB_obj,
-    WebRtc_Word32      jitterInfo)
-{
-  int err;
-  int k;
-  int iterCntr;
-
-  double lpcVecs[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME];
-
-  double percepFilterParams[(1 + UB_LPC_ORDER) * SUBFRAMES];
-  float LP[FRAMESAMPLES_HALF];
-  float HP[FRAMESAMPLES_HALF];
-
-  double LP_lookahead[FRAMESAMPLES_HALF];
-  double HP_lookahead[FRAMESAMPLES_HALF];
-  double LPw[FRAMESAMPLES_HALF];
-
-  double HPw[FRAMESAMPLES_HALF];
-  WebRtc_Word16 fre[FRAMESAMPLES_HALF];   /* Q7 */
-  WebRtc_Word16 fim[FRAMESAMPLES_HALF];   /* Q7 */
-
-  int status = 0;
-
-  double varscale[1];
-
-  double corr[UB_LPC_GAIN_DIM][UB_LPC_ORDER + 1];
-  double lpcGains[SUBFRAMES];
-  transcode_obj transcodingParam;
-  double bytesLeftSpecCoding;
-  WebRtc_UWord16 payloadLimitBytes;
-  double s2nr;
-
-  /* buffer speech samples (by 10ms packet) until the framelength is  */
-  /* reached (30 or 60 ms)                                            */
-  /********************************************************************/
-
-  /* fill the buffer with 10ms input data */
-  for (k=0; k<FRAMESAMPLES_10ms; k++) {
-    ISACencUB_obj->data_buffer_float[k + ISACencUB_obj->buffer_index] =
-        in[k];
-  }
-
-  /* if buffer-size is not equal to current frame-size then increase the
-     index and return. We do the encoding when we have enough audio.     */
-  if (ISACencUB_obj->buffer_index + FRAMESAMPLES_10ms < FRAMESAMPLES) {
-    ISACencUB_obj->buffer_index += FRAMESAMPLES_10ms;
-    return 0;
-  }
-  /* if buffer reached the right size, reset index and continue
-     with encoding the frame */
-  ISACencUB_obj->buffer_index = 0;
-
-  /* end of buffer function */
-  /**************************/
-
-  /* encoding */
-  /************/
-
-  /* reset bitstream */
-  ISACencUB_obj->bitstr_obj.W_upper = 0xFFFFFFFF;
-  ISACencUB_obj->bitstr_obj.streamval = 0;
-  ISACencUB_obj->bitstr_obj.stream_index = 0;
-
-  /* bandwidth estimation and coding */
-  /* To be used for Redundant Coding */
-  WebRtcIsac_EncodeJitterInfo(jitterInfo, &ISACencUB_obj->bitstr_obj);
-
-  status = WebRtcIsac_EncodeBandwidth(isac12kHz,
-                                      &ISACencUB_obj->bitstr_obj);
-  if (status < 0) {
-    return status;
-  }
-
-
-  s2nr = WebRtcIsac_GetSnr(ISACencUB_obj->bottleneck,
-                                 FRAMESAMPLES);
-
-  /* split signal in two bands */
-  WebRtcIsac_SplitAndFilterFloat(ISACencUB_obj->data_buffer_float, HP, LP,
-                                 HP_lookahead, LP_lookahead, &ISACencUB_obj->prefiltbankstr_obj);
-
-  /* find coefficients for perceptual pre-filters */
-  WebRtcIsac_GetLpcCoefUb(LP_lookahead, &ISACencUB_obj->maskfiltstr_obj,
-                            lpcVecs, corr, varscale, isac12kHz);
-
-  /* code LPC model and shape - gains not quantized yet */
-  WebRtcIsac_EncodeLpcUB(lpcVecs, &ISACencUB_obj->bitstr_obj,
-                           percepFilterParams, isac12kHz, &ISACencUB_obj->SaveEnc_obj);
-
-  WebRtcIsac_GetLpcGain(s2nr, percepFilterParams, SUBFRAMES, lpcGains,
-                       corr, varscale);
-
-  /* Store the state of arithmetic coder before coding LPC gains */
-  transcodingParam.W_upper = ISACencUB_obj->bitstr_obj.W_upper;
-
-  transcodingParam.stream_index = ISACencUB_obj->bitstr_obj.stream_index;
-
-  transcodingParam.streamval = ISACencUB_obj->bitstr_obj.streamval;
-
-  transcodingParam.stream[0] = ISACencUB_obj->bitstr_obj.stream[
-      ISACencUB_obj->bitstr_obj.stream_index - 2];
-
-  transcodingParam.stream[1] = ISACencUB_obj->bitstr_obj.stream[
-      ISACencUB_obj->bitstr_obj.stream_index - 1];
-
-  transcodingParam.stream[2] = ISACencUB_obj->bitstr_obj.stream[
-      ISACencUB_obj->bitstr_obj.stream_index];
-
-  /* Store LPC Gains before encoding them */
-  for(k = 0; k < SUBFRAMES; k++) {
-    transcodingParam.loFiltGain[k] = lpcGains[k];
-  }
-
-  // Store the gains for multiple encoding
-  memcpy(ISACencUB_obj->SaveEnc_obj.lpcGain, lpcGains, SUBFRAMES *
-         sizeof(double));
-
-  WebRtcIsac_EncodeLpcGainUb(lpcGains, &ISACencUB_obj->bitstr_obj,
-                             ISACencUB_obj->SaveEnc_obj.lpcGainIndex);
-
-  for(k = 0; k < SUBFRAMES; k++) {
-    percepFilterParams[k*(UB_LPC_ORDER + 1)] = lpcGains[k];
-  }
-
-  /* perceptual pre-filtering (using normalized lattice filter) */
-  /* low-band filtering */
-  WebRtcIsac_NormLatticeFilterMa(UB_LPC_ORDER,
-                                  ISACencUB_obj->maskfiltstr_obj.PreStateLoF,
-                                  ISACencUB_obj->maskfiltstr_obj.PreStateLoG, LP, percepFilterParams,
-                                  LPw);
-
-  /* Get the correct value for the payload limit and calculate the number
-     of bytes left for coding the spectrum. It is a 30ms frame Subract 3
-     because termination process may add 3 bytes */
-  payloadLimitBytes = ISACencUB_obj->maxPayloadSizeBytes -
-      ISACencUB_obj->numBytesUsed - 3;
-  bytesLeftSpecCoding = payloadLimitBytes -
-      ISACencUB_obj->bitstr_obj.stream_index;
-
-  memset(HPw, 0, sizeof(double) * FRAMESAMPLES_HALF);
-
-  /* transform */
-  WebRtcIsac_Time2Spec(LPw, HPw, fre, fim, &ISACencUB_obj->fftstr_obj);
-
-  //Store real FFT coefficients for multiple encoding
-  memcpy(&ISACencUB_obj->SaveEnc_obj.realFFT, fre,
-         FRAMESAMPLES_HALF * sizeof(WebRtc_Word16));
-
-  //Store imaginary FFT coefficients for multiple encoding
-  memcpy(&ISACencUB_obj->SaveEnc_obj.imagFFT, fim,
-         FRAMESAMPLES_HALF * sizeof(WebRtc_Word16));
-
-  // Save the bit-stream object at this point for FEC.
-  memcpy(&ISACencUB_obj->SaveEnc_obj.bitStreamObj,
-         &ISACencUB_obj->bitstr_obj, sizeof(Bitstr));
-
-  /* quantization and lossless coding */
-  err = WebRtcIsac_EncodeSpecUB12(fre, fim, &ISACencUB_obj->bitstr_obj);
-  if ((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    /* There has been an error but it was not too large
-       payload (we can cure too large payload) */
-    return err;
-  }
-  iterCntr = 0;
-  while((ISACencUB_obj->bitstr_obj.stream_index > payloadLimitBytes) ||
-        (err == -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    double bytesSpecCoderUsed;
-    double transcodeScale;
-
-    if (iterCntr >= MAX_PAYLOAD_LIMIT_ITERATION) {
-      /* We were not able to limit the payload size */
-      return -ISAC_PAYLOAD_LARGER_THAN_LIMIT;
-    }
-
-    if (err == -ISAC_DISALLOWED_BITSTREAM_LENGTH) {
-      bytesSpecCoderUsed = STREAM_SIZE_MAX;
-      // being coservative
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed * 0.5;
-    } else {
-      bytesSpecCoderUsed = ISACencUB_obj->bitstr_obj.stream_index -
-          transcodingParam.stream_index;
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed;
-    }
-
-    /* To be safe, we reduce the scale depending on the
-       number of iterations. */
-    transcodeScale *= (1.0 - (0.9 * (double)iterCntr/
-                              (double)MAX_PAYLOAD_LIMIT_ITERATION));
-
-    /* Scale the LPC Gains */
-    for (k = 0; k < SUBFRAMES; k++) {
-      transcodingParam.loFiltGain[k] *= transcodeScale;
-    }
-
-    /* Scale DFT coefficients */
-    for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-      fre[k] = (WebRtc_Word16)(fre[k] * transcodeScale + 0.5);
-      fim[k] = (WebRtc_Word16)(fim[k] * transcodeScale + 0.5);
-    }
-
-    //Store real FFT coefficients for multiple encoding
-    memcpy(&ISACencUB_obj->SaveEnc_obj.realFFT, fre,
-           FRAMESAMPLES_HALF * sizeof(WebRtc_Word16));
-
-    //Store imaginary FFT coefficients for multiple encoding
-    memcpy(&ISACencUB_obj->SaveEnc_obj.imagFFT, fim,
-           FRAMESAMPLES_HALF * sizeof(WebRtc_Word16));
-
-
-    /* Re-store the state of arithmetic coder before coding LPC gains */
-    ISACencUB_obj->bitstr_obj.W_upper = transcodingParam.W_upper;
-
-    ISACencUB_obj->bitstr_obj.stream_index = transcodingParam.stream_index;
-
-    ISACencUB_obj->bitstr_obj.streamval = transcodingParam.streamval;
-
-    ISACencUB_obj->bitstr_obj.stream[transcodingParam.stream_index - 2] =
-        transcodingParam.stream[0];
-
-    ISACencUB_obj->bitstr_obj.stream[transcodingParam.stream_index - 1] =
-        transcodingParam.stream[1];
-
-    ISACencUB_obj->bitstr_obj.stream[transcodingParam.stream_index] =
-        transcodingParam.stream[2];
-
-    // Store the gains for multiple encoding
-    memcpy(&ISACencUB_obj->SaveEnc_obj.lpcGain, lpcGains, SUBFRAMES *
-           sizeof(double));
-
-    // encode LPC gain and store quantization indices. HAving quantization
-    // indices reduces transcoding complexity if 'scale factor' is 1.
-    WebRtcIsac_EncodeLpcGainUb(transcodingParam.loFiltGain,
-                               &ISACencUB_obj->bitstr_obj,
-                               ISACencUB_obj->SaveEnc_obj.lpcGainIndex);
-
-    // Save the bit-stream object at this point for FEC.
-    memcpy(&ISACencUB_obj->SaveEnc_obj.bitStreamObj,
-           &ISACencUB_obj->bitstr_obj, sizeof(Bitstr));
-
-    /* Update the number of bytes left for encoding the spectrum */
-    bytesLeftSpecCoding = payloadLimitBytes -
-        ISACencUB_obj->bitstr_obj.stream_index;
-
-    /* Encode the spectrum */
-    err = WebRtcIsac_EncodeSpecUB12(fre, fim,
-                                      &ISACencUB_obj->bitstr_obj);
-    if ((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-      /* There has been an error but it was not too large payload
-         (we can cure too large payload) */
-      return err;
-    }
-    iterCntr++;
-  }
-
-  /* complete arithmetic coding */
-  return WebRtcIsac_EncTerminate(&ISACencUB_obj->bitstr_obj);
-}
-
-
-
-
-
-
-/* This function is used to create a new bitstream with new BWE.
-   The same data as previously encoded with the function WebRtcIsac_Encoder().
-   The data needed is taken from the struct, where it was stored
-   when calling the encoder. */
-
-int WebRtcIsac_EncodeStoredDataLb(
-    const ISAC_SaveEncData_t* ISACSavedEnc_obj,
-    Bitstr*                   ISACBitStr_obj,
-    int                       BWnumber,
-    float                     scale)
-{
-  int ii;
-  int status;
-  int BWno = BWnumber;
-
-  const WebRtc_UWord16 *WebRtcIsac_kQPitchGainCdf_ptr[1];
-  const WebRtc_UWord16 **cdf;
-
-  double tmpLPCcoeffs_lo[(ORDERLO+1)*SUBFRAMES*2];
-  double tmpLPCcoeffs_hi[(ORDERHI+1)*SUBFRAMES*2];
-  int tmpLPCindex_g[12*2];
-  WebRtc_Word16 tmp_fre[FRAMESAMPLES], tmp_fim[FRAMESAMPLES];
-
-  /* Sanity Check - possible values for BWnumber is 0 - 23 */
-  if ((BWnumber < 0) || (BWnumber > 23)) {
-    return -ISAC_RANGE_ERROR_BW_ESTIMATOR;
-  }
-
-  /* reset bitstream */
-  ISACBitStr_obj->W_upper = 0xFFFFFFFF;
-  ISACBitStr_obj->streamval = 0;
-  ISACBitStr_obj->stream_index = 0;
-
-  /* encode frame length */
-  status = WebRtcIsac_EncodeFrameLen(ISACSavedEnc_obj->framelength,
-                                     ISACBitStr_obj);
-  if (status < 0) {
-    /* Wrong frame size */
-    return status;
-  }
-
-  /* Transcoding                                                 */
-  if ((scale > 0.0) && (scale < 1.0)) {
-    /* Compensate LPC gain */
-    for (ii = 0;
-         ii < ((ORDERLO + 1)* SUBFRAMES * (1 + ISACSavedEnc_obj->startIdx));
-         ii++) {
-      tmpLPCcoeffs_lo[ii] = scale *  ISACSavedEnc_obj->LPCcoeffs_lo[ii];
-    }
-    for (ii = 0;
-         ii < ((ORDERHI + 1) * SUBFRAMES *(1 + ISACSavedEnc_obj->startIdx));
-         ii++) {
-      tmpLPCcoeffs_hi[ii] = scale *  ISACSavedEnc_obj->LPCcoeffs_hi[ii];
-    }
-    /* Scale DFT */
-    for (ii = 0;
-         ii < (FRAMESAMPLES_HALF * (1 + ISACSavedEnc_obj->startIdx));
-         ii++) {
-      tmp_fre[ii] = (WebRtc_Word16)((scale) *
-                                    (float)ISACSavedEnc_obj->fre[ii]) ;
-      tmp_fim[ii] = (WebRtc_Word16)((scale) *
-                                    (float)ISACSavedEnc_obj->fim[ii]) ;
-    }
-  } else {
-    for (ii = 0;
-         ii < (KLT_ORDER_GAIN * (1 + ISACSavedEnc_obj->startIdx));
-         ii++) {
-      tmpLPCindex_g[ii] =  ISACSavedEnc_obj->LPCindex_g[ii];
-    }
-    for (ii = 0;
-         ii < (FRAMESAMPLES_HALF * (1 + ISACSavedEnc_obj->startIdx));
-         ii++) {
-      tmp_fre[ii] = ISACSavedEnc_obj->fre[ii];
-      tmp_fim[ii] = ISACSavedEnc_obj->fim[ii];
-    }
-  }
-
-  /* encode bandwidth estimate */
-  WebRtcIsac_EncodeReceiveBw(&BWno, ISACBitStr_obj);
-
-  /* Loop over number of 30 msec */
-  for (ii = 0; ii <= ISACSavedEnc_obj->startIdx; ii++) {
-    /* encode pitch gains */
-    *WebRtcIsac_kQPitchGainCdf_ptr = WebRtcIsac_kQPitchGainCdf;
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj,
-                            &ISACSavedEnc_obj->pitchGain_index[ii], WebRtcIsac_kQPitchGainCdf_ptr, 1);
-
-    /* entropy coding of quantization pitch lags */
-    /* voicing classificiation */
-    if (ISACSavedEnc_obj->meanGain[ii] < 0.2) {
-      cdf = WebRtcIsac_kQPitchLagCdfPtrLo;
-    } else if (ISACSavedEnc_obj->meanGain[ii] < 0.4) {
-      cdf = WebRtcIsac_kQPitchLagCdfPtrMid;
-    } else {
-      cdf = WebRtcIsac_kQPitchLagCdfPtrHi;
-    }
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj,
-                            &ISACSavedEnc_obj->pitchIndex[PITCH_SUBFRAMES*ii], cdf,
-                            PITCH_SUBFRAMES);
-
-    /* LPC */
-    /* entropy coding of model number */
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj,
-                            &ISACSavedEnc_obj->LPCmodel[ii], WebRtcIsac_kQKltModelCdfPtr, 1);
-
-    /* entropy coding of quantization indices - LPC shape only */
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj,
-                            &ISACSavedEnc_obj->LPCindex_s[KLT_ORDER_SHAPE*ii],
-                            WebRtcIsac_kQKltCdfPtrShape[ISACSavedEnc_obj->LPCmodel[ii]],
-                            KLT_ORDER_SHAPE);
-
-    /* If transcoding, get new LPC gain indices */
-    if (scale < 1.0) {
-      WebRtcIsac_TranscodeLPCCoef(&tmpLPCcoeffs_lo[(ORDERLO+1) *
-                                                   SUBFRAMES*ii], &tmpLPCcoeffs_hi[(ORDERHI+1)*SUBFRAMES*ii],
-                                  ISACSavedEnc_obj->LPCmodel[ii],
-                                  &tmpLPCindex_g[KLT_ORDER_GAIN * ii]);
-    }
-
-    /* entropy coding of quantization indices - LPC gain */
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj,
-                            &tmpLPCindex_g[KLT_ORDER_GAIN*ii], WebRtcIsac_kQKltCdfPtrGain[
-                                ISACSavedEnc_obj->LPCmodel[ii]], KLT_ORDER_GAIN);
-
-    /* quantization and lossless coding */
-    status = WebRtcIsac_EncodeSpecLb(&tmp_fre[ii*FRAMESAMPLES_HALF],
-                                     &tmp_fim[ii*FRAMESAMPLES_HALF], ISACBitStr_obj,
-                                     ISACSavedEnc_obj->AvgPitchGain[ii]);
-    if (status < 0) {
-      return status;
-    }
-  }
-
-  /* complete arithmetic coding */
-  return WebRtcIsac_EncTerminate(ISACBitStr_obj);
-}
-
-
-
-
-int WebRtcIsac_EncodeStoredDataUb12(
-    const ISACUBSaveEncDataStruct* ISACSavedEnc_obj,
-    Bitstr*                        bitStream,
-    WebRtc_Word32                    jitterInfo,
-    float                          scale)
-{
-  int n;
-  int err;
-  double lpcGain[SUBFRAMES];
-  WebRtc_Word16 realFFT[FRAMESAMPLES_HALF];
-  WebRtc_Word16 imagFFT[FRAMESAMPLES_HALF];
-
-  /* reset bitstream */
-  bitStream->W_upper = 0xFFFFFFFF;
-  bitStream->streamval = 0;
-  bitStream->stream_index = 0;
-
-  // Encode jitter index
-  WebRtcIsac_EncodeJitterInfo(jitterInfo, bitStream);
-
-  err = WebRtcIsac_EncodeBandwidth(isac12kHz, bitStream);
-  if(err < 0)
-  {
-    return err;
-  }
-
-  // Encode LPC-shape
-  WebRtcIsac_EncHistMulti(bitStream, ISACSavedEnc_obj->indexLPCShape,
-                          WebRtcIsac_kLpcShapeCdfMatUb12, UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME);
-
-
-  // we only consider scales between zero and one.
-  if((scale <= 0.0) || (scale > 1.0))
-  {
-    scale = 1.0f;
-  }
-
-  if(scale == 1.0f)
-  {
-    //memcpy(lpcGain, ISACSavedEnc_obj->lpcGain, SUBFRAMES * sizeof(double));
-    WebRtcIsac_EncHistMulti(bitStream, ISACSavedEnc_obj->lpcGainIndex,
-                            WebRtcIsac_kLpcGainCdfMat, UB_LPC_GAIN_DIM);
-    // store FFT coefficients
-    err = WebRtcIsac_EncodeSpecUB12(ISACSavedEnc_obj->realFFT,
-                                      ISACSavedEnc_obj->imagFFT, bitStream);
-  }
-  else
-  {
-    /* scale lpc gain and FFT coefficients */
-    for(n = 0; n < SUBFRAMES; n++)
-    {
-      lpcGain[n] = scale * ISACSavedEnc_obj->lpcGain[n];
-    }
-    // store lpc gain
-    WebRtcIsac_StoreLpcGainUb(lpcGain, bitStream);
-    for(n = 0; n < FRAMESAMPLES_HALF; n++)
-    {
-      realFFT[n] = (WebRtc_Word16)(scale * (float)ISACSavedEnc_obj->realFFT[n] + 0.5f);
-      imagFFT[n] = (WebRtc_Word16)(scale * (float)ISACSavedEnc_obj->imagFFT[n] + 0.5f);
-    }
-    // store FFT coefficients
-    err = WebRtcIsac_EncodeSpecUB12(realFFT, imagFFT, bitStream);
-  }
-  if(err < 0)
-  {
-    // error happened while encoding FFT coefficients.
-    return err;
-  }
-
-  /* complete arithmetic coding */
-  return WebRtcIsac_EncTerminate(bitStream);
-}
-
-
-int
-WebRtcIsac_EncodeStoredDataUb16(
-    const ISACUBSaveEncDataStruct* ISACSavedEnc_obj,
-    Bitstr*                        bitStream,
-    WebRtc_Word32                    jitterInfo,
-    float                          scale)
-{
-  int n;
-  int err;
-  double lpcGain[SUBFRAMES << 1];
-  WebRtc_Word16 realFFT[FRAMESAMPLES_HALF];
-  WebRtc_Word16 imagFFT[FRAMESAMPLES_HALF];
-
-  /* reset bitstream */
-  bitStream->W_upper = 0xFFFFFFFF;
-  bitStream->streamval = 0;
-  bitStream->stream_index = 0;
-
-  // Encode jitter index
-  WebRtcIsac_EncodeJitterInfo(jitterInfo, bitStream);
-
-  err = WebRtcIsac_EncodeBandwidth(isac16kHz, bitStream);
-  if(err < 0)
-  {
-    return err;
-  }
-
-  WebRtcIsac_EncHistMulti(bitStream, ISACSavedEnc_obj->indexLPCShape,
-                          WebRtcIsac_kLpcShapeCdfMatUb16, UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME);
-
-  // we only consider scales between zero and one.
-  if((scale <= 0.0) || (scale > 1.0))
-  {
-    scale = 1.0f;
-  }
-
-  if(scale == 1.0f)
-  {
-    // store gains
-    WebRtcIsac_EncHistMulti(bitStream, ISACSavedEnc_obj->lpcGainIndex,
-                            WebRtcIsac_kLpcGainCdfMat, UB_LPC_GAIN_DIM);
-    WebRtcIsac_EncHistMulti(bitStream, &ISACSavedEnc_obj->lpcGainIndex[SUBFRAMES],
-                            WebRtcIsac_kLpcGainCdfMat, UB_LPC_GAIN_DIM);
-    // store FFT coefficients
-    err = WebRtcIsac_EncodeSpecUB16(ISACSavedEnc_obj->realFFT,
-                                      ISACSavedEnc_obj->imagFFT, bitStream);
-
-  }
-  else
-  {
-    /* Scale Gain */
-    for(n = 0; n < SUBFRAMES; n++)
-    {
-      lpcGain[n] = scale * ISACSavedEnc_obj->lpcGain[n];
-      lpcGain[n + SUBFRAMES] = scale * ISACSavedEnc_obj->lpcGain[n + SUBFRAMES];
-    }
-    // store lpc gain
-    WebRtcIsac_StoreLpcGainUb(lpcGain, bitStream);
-    WebRtcIsac_StoreLpcGainUb(&lpcGain[SUBFRAMES], bitStream);
-    /* scale FFT coefficients */
-    for(n = 0; n < FRAMESAMPLES_HALF; n++)
-    {
-      realFFT[n] = (WebRtc_Word16)(scale * (float)ISACSavedEnc_obj->realFFT[n] + 0.5f);
-      imagFFT[n] = (WebRtc_Word16)(scale * (float)ISACSavedEnc_obj->imagFFT[n] + 0.5f);
-    }
-    // store FFT coefficients
-    err = WebRtcIsac_EncodeSpecUB16(realFFT, imagFFT, bitStream);
-  }
-
-  if(err < 0)
-  {
-    // error happened while encoding FFT coefficients.
-    return err;
-  }
-
-  /* complete arithmetic coding */
-  return WebRtcIsac_EncTerminate(bitStream);
-}
-
-
-WebRtc_Word16
-WebRtcIsac_GetRedPayloadUb(
-    const ISACUBSaveEncDataStruct* ISACSavedEncObj,
-    Bitstr*                        bitStreamObj,
-    enum ISACBandwidth             bandwidth)
-{
-  int n;
-  WebRtc_Word16 status;
-  WebRtc_Word16 realFFT[FRAMESAMPLES_HALF];
-  WebRtc_Word16 imagFFT[FRAMESAMPLES_HALF];
-
-  // store bit-stream object.
-  memcpy(bitStreamObj, &ISACSavedEncObj->bitStreamObj, sizeof(Bitstr));
-
-  // Scale FFT coefficients.
-  for(n = 0; n < FRAMESAMPLES_HALF; n++)
-  {
-    realFFT[n] = (WebRtc_Word16)((float)ISACSavedEncObj->realFFT[n] *
-                                 RCU_TRANSCODING_SCALE_UB + 0.5);
-    imagFFT[n] = (WebRtc_Word16)((float)ISACSavedEncObj->imagFFT[n] *
-                                 RCU_TRANSCODING_SCALE_UB + 0.5);
-  }
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        status = WebRtcIsac_EncodeSpecUB12(realFFT, imagFFT, bitStreamObj);
-        break;
-      }
-    case isac16kHz:
-      {
-        status = WebRtcIsac_EncodeSpecUB16(realFFT, imagFFT, bitStreamObj);
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  if(status < 0)
-  {
-    // error happened
-    return status;
-  }
-  else
-  {
-    // terminate entropy coding
-    return WebRtcIsac_EncTerminate(bitStreamObj);
-  }
-}
diff --git a/src/mod/codecs/mod_isac/encode_lpc_swb.c b/src/mod/codecs/mod_isac/encode_lpc_swb.c
deleted file mode 100644
index 2bf4c36460..0000000000
--- a/src/mod/codecs/mod_isac/encode_lpc_swb.c
+++ /dev/null
@@ -1,708 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * code_LPC_UB.c
- *
- * This file contains definition of functions used to
- * encode LPC parameters (Shape & gain) of the upper band.
- *
- */
-
-#include "encode_lpc_swb.h"
-#include "typedefs.h"
-#include "settings.h"
-
-#include "lpc_shape_swb12_tables.h"
-#include "lpc_shape_swb16_tables.h"
-#include "lpc_gain_swb_tables.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
-/******************************************************************************
- * WebRtcIsac_RemoveLarMean()
- *
- * Remove the means from LAR coefficients.
- *
- * Input:
- *      -lar                : pointer to lar vectors. LAR vectors are
- *                            concatenated.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -lar                : pointer to mean-removed LAR:s.
- *
- *
- */
-WebRtc_Word16
-WebRtcIsac_RemoveLarMean(
-    double* lar,
-    WebRtc_Word16 bandwidth)
-{
-  WebRtc_Word16 coeffCntr;
-  WebRtc_Word16 vecCntr;
-  WebRtc_Word16 numVec;
-  const double* meanLAR;
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        numVec = UB_LPC_VEC_PER_FRAME;
-        meanLAR = WebRtcIsac_kMeanLarUb12;
-        break;
-      }
-    case isac16kHz:
-      {
-        numVec = UB16_LPC_VEC_PER_FRAME;
-        meanLAR = WebRtcIsac_kMeanLarUb16;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  for(vecCntr = 0; vecCntr < numVec; vecCntr++)
-  {
-    for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-    {
-      // REMOVE MEAN
-      *lar++ -= meanLAR[coeffCntr];
-    }
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateIntraVec()
- *
- * Remove the correlation amonge the components of LAR vectors. If LAR vectors
- * of one frame are put in a matrix where each column is a LAR vector of a
- * sub-frame, then this is equivalent to multiplying the LAR matrix with
- * a decorrelting mtrix from left.
- *
- * Input:
- *      -inLar              : pointer to mean-removed LAR vecrtors.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : decorrelated LAR vectors.
- */
-WebRtc_Word16
-WebRtcIsac_DecorrelateIntraVec(
-    const double* data,
-    double*       out,
-    WebRtc_Word16 bandwidth)
-{
-  const double* ptrData;
-  const double* ptrRow;
-  WebRtc_Word16 rowCntr;
-  WebRtc_Word16 colCntr;
-  WebRtc_Word16 larVecCntr;
-  WebRtc_Word16 numVec;
-  const double* decorrMat;
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        decorrMat = &WebRtcIsac_kIntraVecDecorrMatUb12[0][0];
-        numVec = UB_LPC_VEC_PER_FRAME;
-        break;
-      }
-    case isac16kHz:
-      {
-        decorrMat = &WebRtcIsac_kIintraVecDecorrMatUb16[0][0];
-        numVec = UB16_LPC_VEC_PER_FRAME;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  //
-  // decorrMat * data
-  //
-  // data is assumed to contain 'numVec' of LAR
-  // vectors (mean removed) each of dimension 'UB_LPC_ORDER'
-  // concatenated one after the other.
-  //
-
-  ptrData = data;
-  for(larVecCntr = 0; larVecCntr < numVec; larVecCntr++)
-  {
-    for(rowCntr = 0; rowCntr < UB_LPC_ORDER; rowCntr++)
-    {
-      ptrRow = &decorrMat[rowCntr * UB_LPC_ORDER];
-      *out = 0;
-      for(colCntr = 0; colCntr < UB_LPC_ORDER; colCntr++)
-      {
-        *out += ptrData[colCntr] * ptrRow[colCntr];
-      }
-      out++;
-    }
-    ptrData += UB_LPC_ORDER;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateInterVec()
- *
- * Remover the correlation among mean-removed LAR vectors. If LAR vectors
- * of one frame are put in a matrix where each column is a LAR vector of a
- * sub-frame, then this is equivalent to multiplying the LAR matrix with
- * a decorrelting mtrix from right.
- *
- * Input:
- *      -data               : pointer to matrix of LAR vectors. The matrix
- *                            is stored column-wise.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : decorrelated LAR vectors.
- */
-WebRtc_Word16
-WebRtcIsac_DecorrelateInterVec(
-    const double* data,
-    double* out,
-    WebRtc_Word16 bandwidth)
-{
-  WebRtc_Word16 coeffCntr;
-  WebRtc_Word16 rowCntr;
-  WebRtc_Word16 colCntr;
-  const double* decorrMat;
-  WebRtc_Word16 interVecDim;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        decorrMat = &WebRtcIsac_kInterVecDecorrMatUb12[0][0];
-        interVecDim = UB_LPC_VEC_PER_FRAME;
-        break;
-      }
-    case isac16kHz:
-      {
-        decorrMat = &WebRtcIsac_kInterVecDecorrMatUb16[0][0];
-        interVecDim = UB16_LPC_VEC_PER_FRAME;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  //
-  // data * decorrMat
-  //
-  // data is of size 'interVecDim' * 'UB_LPC_ORDER'
-  // That is 'interVecDim' of LAR vectors (mean removed)
-  // in columns each of dimension 'UB_LPC_ORDER'.
-  // matrix is stored column-wise.
-  //
-
-  for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-  {
-    for(colCntr = 0; colCntr < interVecDim; colCntr++)
-    {
-      out[coeffCntr + colCntr * UB_LPC_ORDER] = 0;
-      for(rowCntr = 0; rowCntr < interVecDim; rowCntr++)
-      {
-        out[coeffCntr + colCntr * UB_LPC_ORDER] +=
-            data[coeffCntr + rowCntr * UB_LPC_ORDER] *
-            decorrMat[rowCntr * interVecDim + colCntr];
-      }
-    }
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_QuantizeUncorrLar()
- *
- * Quantize the uncorrelated parameters.
- *
- * Input:
- *      -data               : uncorrelated LAR vectors.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -data               : quantized version of the input.
- *      -idx                : pointer to quantization indices.
- */
-double
-WebRtcIsac_QuantizeUncorrLar(
-    double* data,
-    int* recIdx,
-    WebRtc_Word16 bandwidth)
-{
-  WebRtc_Word16 cntr;
-  WebRtc_Word32 idx;
-  WebRtc_Word16 interVecDim;
-  const double* leftRecPoint;
-  double quantizationStepSize;
-  const WebRtc_Word16* numQuantCell;
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        leftRecPoint         = WebRtcIsac_kLpcShapeLeftRecPointUb12;
-        quantizationStepSize = WebRtcIsac_kLpcShapeQStepSizeUb12;
-        numQuantCell         = WebRtcIsac_kLpcShapeNumRecPointUb12;
-        interVecDim          = UB_LPC_VEC_PER_FRAME;
-        break;
-      }
-    case isac16kHz:
-      {
-        leftRecPoint         = WebRtcIsac_kLpcShapeLeftRecPointUb16;
-        quantizationStepSize = WebRtcIsac_kLpcShapeQStepSizeUb16;
-        numQuantCell         = WebRtcIsac_kLpcShapeNumRecPointUb16;
-        interVecDim          = UB16_LPC_VEC_PER_FRAME;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  //
-  // Quantize the parametrs.
-  //
-  for(cntr = 0; cntr < UB_LPC_ORDER * interVecDim; cntr++)
-  {
-    idx = (WebRtc_Word32)floor((*data - leftRecPoint[cntr]) /
-                               quantizationStepSize + 0.5);
-    if(idx < 0)
-    {
-      idx = 0;
-    }
-    else if(idx >= numQuantCell[cntr])
-    {
-      idx = numQuantCell[cntr] - 1;
-    }
-
-    *data++ = leftRecPoint[cntr] + idx * quantizationStepSize;
-    *recIdx++ = idx;
-  }
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_DequantizeLpcParam()
- *
- * Get the quantized value of uncorrelated LARs given the quantization indices.
- *
- * Input:
- *      -idx                : pointer to quantiztion indices.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : pointer to quantized values.
- */
-WebRtc_Word16
-WebRtcIsac_DequantizeLpcParam(
-    const int* idx,
-    double*    out,
-    WebRtc_Word16 bandwidth)
-{
-  WebRtc_Word16 cntr;
-  WebRtc_Word16 interVecDim;
-  const double* leftRecPoint;
-  double quantizationStepSize;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        leftRecPoint =         WebRtcIsac_kLpcShapeLeftRecPointUb12;
-        quantizationStepSize = WebRtcIsac_kLpcShapeQStepSizeUb12;
-        interVecDim =          UB_LPC_VEC_PER_FRAME;
-        break;
-      }
-    case isac16kHz:
-      {
-        leftRecPoint =         WebRtcIsac_kLpcShapeLeftRecPointUb16;
-        quantizationStepSize = WebRtcIsac_kLpcShapeQStepSizeUb16;
-        interVecDim =          UB16_LPC_VEC_PER_FRAME;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  //
-  // Dequantize given the quantization indices
-  //
-
-  for(cntr = 0; cntr < UB_LPC_ORDER * interVecDim; cntr++)
-  {
-    *out++ = leftRecPoint[cntr] + *idx++ * quantizationStepSize;
-  }
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_CorrelateIntraVec()
- *
- * This is the inverse of WebRtcIsac_DecorrelateIntraVec().
- *
- * Input:
- *      -data               : uncorrelated parameters.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : correlated parametrs.
- */
-WebRtc_Word16
-WebRtcIsac_CorrelateIntraVec(
-    const double* data,
-    double*       out,
-    WebRtc_Word16 bandwidth)
-{
-  WebRtc_Word16 vecCntr;
-  WebRtc_Word16 rowCntr;
-  WebRtc_Word16 colCntr;
-  WebRtc_Word16 numVec;
-  const double* ptrData;
-  const double* intraVecDecorrMat;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        numVec            = UB_LPC_VEC_PER_FRAME;
-        intraVecDecorrMat = &WebRtcIsac_kIntraVecDecorrMatUb12[0][0];
-        break;
-      }
-    case isac16kHz:
-      {
-        numVec            = UB16_LPC_VEC_PER_FRAME;
-        intraVecDecorrMat = &WebRtcIsac_kIintraVecDecorrMatUb16[0][0];
-        break;
-      }
-    default:
-      return -1;
-  }
-
-
-  ptrData = data;
-  for(vecCntr = 0; vecCntr < numVec; vecCntr++)
-  {
-    for(colCntr = 0; colCntr < UB_LPC_ORDER; colCntr++)
-    {
-      *out = 0;
-      for(rowCntr = 0; rowCntr < UB_LPC_ORDER; rowCntr++)
-      {
-        *out += ptrData[rowCntr] *
-            intraVecDecorrMat[rowCntr * UB_LPC_ORDER + colCntr];
-      }
-      out++;
-    }
-    ptrData += UB_LPC_ORDER;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_CorrelateInterVec()
- *
- * This is the inverse of WebRtcIsac_DecorrelateInterVec().
- *
- * Input:
- *      -data
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : correlated parametrs.
- */
-WebRtc_Word16
-WebRtcIsac_CorrelateInterVec(
-    const double* data,
-    double*       out,
-    WebRtc_Word16 bandwidth)
-{
-  WebRtc_Word16 coeffCntr;
-  WebRtc_Word16 rowCntr;
-  WebRtc_Word16 colCntr;
-  WebRtc_Word16 interVecDim;
-  double myVec[UB16_LPC_VEC_PER_FRAME];
-  const double* interVecDecorrMat;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        interVecDim       = UB_LPC_VEC_PER_FRAME;
-        interVecDecorrMat = &WebRtcIsac_kInterVecDecorrMatUb12[0][0];
-        break;
-      }
-    case isac16kHz:
-      {
-        interVecDim       = UB16_LPC_VEC_PER_FRAME;
-        interVecDecorrMat = &WebRtcIsac_kInterVecDecorrMatUb16[0][0];
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-  {
-    for(rowCntr = 0; rowCntr < interVecDim; rowCntr++)
-    {
-      myVec[rowCntr] = 0;
-      for(colCntr = 0; colCntr < interVecDim; colCntr++)
-      {
-        myVec[rowCntr] += data[coeffCntr + colCntr * UB_LPC_ORDER] * //*ptrData *
-            interVecDecorrMat[rowCntr * interVecDim + colCntr];
-        //ptrData += UB_LPC_ORDER;
-      }
-    }
-
-    for(rowCntr = 0; rowCntr < interVecDim; rowCntr++)
-    {
-      out[coeffCntr + rowCntr * UB_LPC_ORDER] = myVec[rowCntr];
-    }
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_AddLarMean()
- *
- * This is the inverse of WebRtcIsac_RemoveLarMean()
- *
- * Input:
- *      -data               : pointer to mean-removed LAR:s.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -data               : pointer to LARs.
- */
-WebRtc_Word16
-WebRtcIsac_AddLarMean(
-    double* data,
-    WebRtc_Word16 bandwidth)
-{
-  WebRtc_Word16 coeffCntr;
-  WebRtc_Word16 vecCntr;
-  WebRtc_Word16 numVec;
-  const double* meanLAR;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        numVec = UB_LPC_VEC_PER_FRAME;
-        meanLAR = WebRtcIsac_kMeanLarUb12;
-        break;
-      }
-    case isac16kHz:
-      {
-        numVec = UB16_LPC_VEC_PER_FRAME;
-        meanLAR = WebRtcIsac_kMeanLarUb16;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  for(vecCntr = 0; vecCntr < numVec; vecCntr++)
-  {
-    for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-    {
-      *data++ += meanLAR[coeffCntr];
-    }
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_ToLogDomainRemoveMean()
- *
- * Transform the LPC gain to log domain then remove the mean value.
- *
- * Input:
- *      -lpcGain            : pointer to LPC Gain, expecting 6 LPC gains
- *
- * Output:
- *      -lpcGain            : mean-removed in log domain.
- */
-WebRtc_Word16
-WebRtcIsac_ToLogDomainRemoveMean(
-    double* data)
-{
-  WebRtc_Word16 coeffCntr;
-  for(coeffCntr = 0; coeffCntr < UB_LPC_GAIN_DIM; coeffCntr++)
-  {
-    data[coeffCntr] = log(data[coeffCntr]) - WebRtcIsac_kMeanLpcGain;
-  }
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateLPGain()
- *
- * Decorrelate LPC gains. There are 6 LPC Gains per frame. This is like
- * multiplying gain vector with decorrelating matrix.
- *
- * Input:
- *      -data               : LPC gain in log-domain with mean removed.
- *
- * Output:
- *      -out                : decorrelated parameters.
- */
-WebRtc_Word16 WebRtcIsac_DecorrelateLPGain(
-    const double* data,
-    double* out)
-{
-  WebRtc_Word16 rowCntr;
-  WebRtc_Word16 colCntr;
-
-  for(colCntr = 0; colCntr < UB_LPC_GAIN_DIM; colCntr++)
-  {
-    *out = 0;
-    for(rowCntr = 0; rowCntr < UB_LPC_GAIN_DIM; rowCntr++)
-    {
-      *out += data[rowCntr] * WebRtcIsac_kLpcGainDecorrMat[rowCntr][colCntr];
-    }
-    out++;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_QuantizeLpcGain()
- *
- * Quantize the decorrelated log-domain gains.
- *
- * Input:
- *      -lpcGain            : uncorrelated LPC gains.
- *
- * Output:
- *      -idx                : quantization indices
- *      -lpcGain            : quantized value of the inpt.
- */
-double WebRtcIsac_QuantizeLpcGain(
-    double* data,
-    int*    idx)
-{
-  WebRtc_Word16 coeffCntr;
-  for(coeffCntr = 0; coeffCntr < UB_LPC_GAIN_DIM; coeffCntr++)
-  {
-    *idx = (int)floor((*data - WebRtcIsac_kLeftRecPointLpcGain[coeffCntr]) /
-                                WebRtcIsac_kQSizeLpcGain + 0.5);
-
-    if(*idx < 0)
-    {
-      *idx = 0;
-    }
-    else if(*idx >= WebRtcIsac_kNumQCellLpcGain[coeffCntr])
-    {
-      *idx = WebRtcIsac_kNumQCellLpcGain[coeffCntr] - 1;
-    }
-    *data = WebRtcIsac_kLeftRecPointLpcGain[coeffCntr] + *idx *
-        WebRtcIsac_kQSizeLpcGain;
-
-    data++;
-    idx++;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_DequantizeLpcGain()
- *
- * Get the quantized values given the quantization indices.
- *
- * Input:
- *      -idx                : pointer to quantization indices.
- *
- * Output:
- *      -lpcGains           : quantized values of the given parametes.
- */
-WebRtc_Word16 WebRtcIsac_DequantizeLpcGain(
-    const int* idx,
-    double*    out)
-{
-  WebRtc_Word16 coeffCntr;
-  for(coeffCntr = 0; coeffCntr < UB_LPC_GAIN_DIM; coeffCntr++)
-  {
-    *out = WebRtcIsac_kLeftRecPointLpcGain[coeffCntr] + *idx *
-        WebRtcIsac_kQSizeLpcGain;
-    out++;
-    idx++;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_CorrelateLpcGain()
- *
- * This is the inverse of WebRtcIsac_DecorrelateLPGain().
- *
- * Input:
- *      -data               : decorrelated parameters.
- *
- * Output:
- *      -out                : correlated parameters.
- */
-WebRtc_Word16 WebRtcIsac_CorrelateLpcGain(
-    const double* data,
-    double* out)
-{
-  WebRtc_Word16 rowCntr;
-  WebRtc_Word16 colCntr;
-
-  for(rowCntr = 0; rowCntr < UB_LPC_GAIN_DIM; rowCntr++)
-  {
-    *out = 0;
-    for(colCntr = 0; colCntr < UB_LPC_GAIN_DIM; colCntr++)
-    {
-      *out += WebRtcIsac_kLpcGainDecorrMat[rowCntr][colCntr] * data[colCntr];
-    }
-    out++;
-  }
-
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_AddMeanToLinearDomain()
- *
- * This is the inverse of WebRtcIsac_ToLogDomainRemoveMean().
- *
- * Input:
- *      -lpcGain            : LPC gain in log-domain & mean removed
- *
- * Output:
- *      -lpcGain            : LPC gain in normal domain.
- */
-WebRtc_Word16 WebRtcIsac_AddMeanToLinearDomain(
-    double* lpcGains)
-{
-  WebRtc_Word16 coeffCntr;
-  for(coeffCntr = 0; coeffCntr < UB_LPC_GAIN_DIM; coeffCntr++)
-  {
-    lpcGains[coeffCntr] = exp(lpcGains[coeffCntr] + WebRtcIsac_kMeanLpcGain);
-  }
-  return 0;
-}
diff --git a/src/mod/codecs/mod_isac/encode_lpc_swb.h b/src/mod/codecs/mod_isac/encode_lpc_swb.h
deleted file mode 100644
index 84c7ec0d26..0000000000
--- a/src/mod/codecs/mod_isac/encode_lpc_swb.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * encode_lpc_swb.h
- *
- * This file contains declaration of functions used to
- * encode LPC parameters (Shape & gain) of the upper band.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
-
-#include "typedefs.h"
-#include "settings.h"
-#include "structs.h"
-
-
-/******************************************************************************
- * WebRtcIsac_RemoveLarMean()
- *
- * Remove the means from LAR coefficients.
- *
- * Input:
- *      -lar                : pointer to lar vectors. LAR vectors are
- *                            concatenated.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -lar                : pointer to mean-removed LAR:s.
- *
- *
- */
-WebRtc_Word16 WebRtcIsac_RemoveLarMean(
-    double*     lar,
-    WebRtc_Word16 bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateIntraVec()
- *
- * Remove the correlation amonge the components of LAR vectors. If LAR vectors
- * of one frame are put in a matrix where each column is a LAR vector of a
- * sub-frame, then this is equivalent to multiplying the LAR matrix with
- * a decorrelting mtrix from left.
- *
- * Input:
- *      -inLar              : pointer to mean-removed LAR vecrtors.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : decorrelated LAR vectors.
- */
-WebRtc_Word16 WebRtcIsac_DecorrelateIntraVec(
-    const double* inLAR,
-    double*       out,
-    WebRtc_Word16   bandwidth);
-
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateInterVec()
- *
- * Remover the correlation among mean-removed LAR vectors. If LAR vectors
- * of one frame are put in a matrix where each column is a LAR vector of a
- * sub-frame, then this is equivalent to multiplying the LAR matrix with
- * a decorrelting mtrix from right.
- *
- * Input:
- *      -data               : pointer to matrix of LAR vectors. The matrix
- *                            is stored column-wise.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : decorrelated LAR vectors.
- */
-WebRtc_Word16 WebRtcIsac_DecorrelateInterVec(
-    const double* data,
-    double*       out,
-    WebRtc_Word16   bandwidth);
-
-
-/******************************************************************************
- * WebRtcIsac_QuantizeUncorrLar()
- *
- * Quantize the uncorrelated parameters.
- *
- * Input:
- *      -data               : uncorrelated LAR vectors.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -data               : quantized version of the input.
- *      -idx                : pointer to quantization indices.
- */
-double WebRtcIsac_QuantizeUncorrLar(
-    double*     data,
-    int*        idx,
-    WebRtc_Word16 bandwidth);
-
-
-/******************************************************************************
- * WebRtcIsac_CorrelateIntraVec()
- *
- * This is the inverse of WebRtcIsac_DecorrelateIntraVec().
- *
- * Input:
- *      -data               : uncorrelated parameters.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : correlated parametrs.
- */
-WebRtc_Word16 WebRtcIsac_CorrelateIntraVec(
-    const double* data,
-    double*       out,
-    WebRtc_Word16   bandwidth);
-
-
-/******************************************************************************
- * WebRtcIsac_CorrelateInterVec()
- *
- * This is the inverse of WebRtcIsac_DecorrelateInterVec().
- *
- * Input:
- *      -data
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : correlated parametrs.
- */
-WebRtc_Word16 WebRtcIsac_CorrelateInterVec(
-    const double* data,
-    double*       out,
-    WebRtc_Word16   bandwidth);
-
-
-/******************************************************************************
- * WebRtcIsac_AddLarMean()
- *
- * This is the inverse of WebRtcIsac_RemoveLarMean()
- *
- * Input:
- *      -data               : pointer to mean-removed LAR:s.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -data               : pointer to LARs.
- */
-WebRtc_Word16 WebRtcIsac_AddLarMean(
-    double*     data,
-    WebRtc_Word16 bandwidth);
-
-
-/******************************************************************************
- * WebRtcIsac_DequantizeLpcParam()
- *
- * Get the quantized value of uncorrelated LARs given the quantization indices.
- *
- * Input:
- *      -idx                : pointer to quantiztion indices.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : pointer to quantized values.
- */
-WebRtc_Word16 WebRtcIsac_DequantizeLpcParam(
-    const int*  idx,
-    double*     out,
-    WebRtc_Word16 bandwidth);
-
-
-/******************************************************************************
- * WebRtcIsac_ToLogDomainRemoveMean()
- *
- * Transform the LPC gain to log domain then remove the mean value.
- *
- * Input:
- *      -lpcGain            : pointer to LPC Gain, expecting 6 LPC gains
- *
- * Output:
- *      -lpcGain            : mean-removed in log domain.
- */
-WebRtc_Word16 WebRtcIsac_ToLogDomainRemoveMean(
-    double* lpGains);
-
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateLPGain()
- *
- * Decorrelate LPC gains. There are 6 LPC Gains per frame. This is like
- * multiplying gain vector with decorrelating matrix.
- *
- * Input:
- *      -data               : LPC gain in log-domain with mean removed.
- *
- * Output:
- *      -out                : decorrelated parameters.
- */
-WebRtc_Word16 WebRtcIsac_DecorrelateLPGain(
-    const double* data,
-    double*       out);
-
-
-/******************************************************************************
- * WebRtcIsac_QuantizeLpcGain()
- *
- * Quantize the decorrelated log-domain gains.
- *
- * Input:
- *      -lpcGain            : uncorrelated LPC gains.
- *
- * Output:
- *      -idx                : quantization indices
- *      -lpcGain            : quantized value of the inpt.
- */
-double WebRtcIsac_QuantizeLpcGain(
-    double* lpGains,
-    int*    idx);
-
-
-/******************************************************************************
- * WebRtcIsac_DequantizeLpcGain()
- *
- * Get the quantized values given the quantization indices.
- *
- * Input:
- *      -idx                : pointer to quantization indices.
- *
- * Output:
- *      -lpcGains           : quantized values of the given parametes.
- */
-WebRtc_Word16 WebRtcIsac_DequantizeLpcGain(
-    const int* idx,
-    double*    lpGains);
-
-
-/******************************************************************************
- * WebRtcIsac_CorrelateLpcGain()
- *
- * This is the inverse of WebRtcIsac_DecorrelateLPGain().
- *
- * Input:
- *      -data               : decorrelated parameters.
- *
- * Output:
- *      -out                : correlated parameters.
- */
-WebRtc_Word16 WebRtcIsac_CorrelateLpcGain(
-    const double* data,
-    double*       out);
-
-
-/******************************************************************************
- * WebRtcIsac_AddMeanToLinearDomain()
- *
- * This is the inverse of WebRtcIsac_ToLogDomainRemoveMean().
- *
- * Input:
- *      -lpcGain            : LPC gain in log-domain & mean removed
- *
- * Output:
- *      -lpcGain            : LPC gain in normal domain.
- */
-WebRtc_Word16 WebRtcIsac_AddMeanToLinearDomain(
-    double* lpcGains);
-
-
-#endif  // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
diff --git a/src/mod/codecs/mod_isac/energy.c b/src/mod/codecs/mod_isac/energy.c
deleted file mode 100644
index e8fdf94e03..0000000000
--- a/src/mod/codecs/mod_isac/energy.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_Energy().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-WebRtc_Word32 WebRtcSpl_Energy(WebRtc_Word16* vector, int vector_length, int* scale_factor)
-{
-    WebRtc_Word32 en = 0;
-    int i;
-    int scaling = WebRtcSpl_GetScalingSquare(vector, vector_length, vector_length);
-    int looptimes = vector_length;
-    WebRtc_Word16 *vectorptr = vector;
-
-    for (i = 0; i < looptimes; i++)
-    {
-        en += WEBRTC_SPL_MUL_16_16_RSFT(*vectorptr, *vectorptr, scaling);
-        vectorptr++;
-    }
-    *scale_factor = scaling;
-
-    return en;
-}
diff --git a/src/mod/codecs/mod_isac/entropy_coding.c b/src/mod/codecs/mod_isac/entropy_coding.c
deleted file mode 100644
index 13b6cf7e86..0000000000
--- a/src/mod/codecs/mod_isac/entropy_coding.c
+++ /dev/null
@@ -1,2748 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * entropy_coding.c
- *
- * This header file defines all of the functions used to arithmetically
- * encode the iSAC bistream
- *
- */
-
-
-#include "entropy_coding.h"
-#include "settings.h"
-#include "arith_routines.h"
-#include "signal_processing_library.h"
-#include "spectrum_ar_model_tables.h"
-#include "lpc_tables.h"
-#include "pitch_gain_tables.h"
-#include "pitch_lag_tables.h"
-#include "encode_lpc_swb.h"
-#include "lpc_shape_swb12_tables.h"
-#include "lpc_shape_swb16_tables.h"
-#include "lpc_gain_swb_tables.h"
-#include "os_specific_inline.h"
-
-#include <math.h>
-#include <string.h>
-
-static const WebRtc_UWord16 kLpcVecPerSegmentUb12 = 5;
-static const WebRtc_UWord16 kLpcVecPerSegmentUb16 = 4;
-
-/* coefficients for the stepwise rate estimation */
-static const WebRtc_Word32 kRPointsQ10[100] = {
-  14495,  14295,  14112,  13944,  13788,  13643,  13459,  13276,  13195,  13239,
-  13243,  13191,  13133,  13216,  13263,  13330,  13316,  13242,  13191,  13106,
-  12942,  12669,  12291,  11840,  11361,  10795,  10192,  9561,  8934,  8335,
-  7750,  7161,  6589,  6062,  5570,  5048,  4548,  4069,  3587,  3143,
-  2717,  2305,  1915,  1557,  1235,  963,  720,  541,  423,  366,
-  369,  435,  561,  750,  1001,  1304,  1626,  1989,  2381,  2793,
-  3219,  3656,  4134,  4612,  5106,  5629,  6122,  6644,  7216,  7801,
-  8386,  8987,  9630,  10255,  10897,  11490,  11950,  12397,  12752,  12999,
-  13175,  13258,  13323,  13290,  13296,  13335,  13113,  13255,  13347,  13355,
-  13298,  13247,  13313,  13155,  13267,  13313,  13374,  13446,  13525,  13609};
-
-
-/* cdf array for encoder bandwidth (12 vs 16 kHz) indicator */
-static const WebRtc_UWord16 kOneBitEqualProbCdf[3] = {
-  0, 32768, 65535 };
-
-/* pointer to cdf array for encoder bandwidth (12 vs 16 kHz) indicator */
-static const WebRtc_UWord16 *kOneBitEqualProbCdf_ptr[1] = {
-    kOneBitEqualProbCdf };
-
-/* initial cdf index for decoder of encoded bandwidth (12 vs 16 kHz) indicator */
-static const WebRtc_UWord16 kOneBitEqualProbInitIndex[1] = {1};
-
-
-/* coefficients for the stepwise rate estimation */
-
-
-static const WebRtc_Word32 acnQ10 =  426;
-static const WebRtc_Word32 bcnQ10 = -581224;
-static const WebRtc_Word32 ccnQ10 =  722631;
-static const WebRtc_Word32 lbcnQ10 = -402874;
-#define DPMIN_Q10     -10240 // -10.00 in Q10
-#define DPMAX_Q10      10240 // 10.00 in Q10
-#define MINBITS_Q10    10240  /* 10.0 in Q10 */
-#define IS_SWB_12KHZ       1
-
-__inline WebRtc_UWord32 stepwise(WebRtc_Word32 dinQ10) {
-
-  WebRtc_Word32 ind, diQ10, dtQ10;
-
-  diQ10 = dinQ10;
-  if (diQ10 < DPMIN_Q10)
-    diQ10 = DPMIN_Q10;
-  if (diQ10 >= DPMAX_Q10)
-    diQ10 = DPMAX_Q10 - 1;
-
-  dtQ10 = diQ10 - DPMIN_Q10; /* Q10 + Q10 = Q10 */
-  ind = (dtQ10 * 5) >> 10;   /* 2^10 / 5 = 0.2 in Q10  */
-  /* Q10 -> Q0 */
-
-  return kRPointsQ10[ind];
-}
-
-
-__inline short log2_Q10_B( int x )
-{
-  int zeros;
-  short frac;
-
-  zeros = WebRtcSpl_NormU32( x );
-  frac = ((unsigned int)(x << zeros) & 0x7FFFFFFF) >> 21;
-  return (short) (((31 - zeros) << 10) + frac);
-}
-
-
-
-/* compute correlation from power spectrum */
-static void WebRtcIsac_FindCorrelation(WebRtc_Word32 *PSpecQ12, WebRtc_Word32 *CorrQ7)
-{
-  WebRtc_Word32 summ[FRAMESAMPLES/8];
-  WebRtc_Word32 diff[FRAMESAMPLES/8];
-  const WebRtc_Word16 *CS_ptrQ9;
-  WebRtc_Word32 sum;
-  int k, n;
-
-  for (k = 0; k < FRAMESAMPLES/8; k++) {
-    summ[k] = (PSpecQ12[k] + PSpecQ12[FRAMESAMPLES_QUARTER-1 - k] + 16) >> 5;
-    diff[k] = (PSpecQ12[k] - PSpecQ12[FRAMESAMPLES_QUARTER-1 - k] + 16) >> 5;
-  }
-
-  sum = 2;
-  for (n = 0; n < FRAMESAMPLES/8; n++)
-    sum += summ[n];
-  CorrQ7[0] = sum;
-
-  for (k = 0; k < AR_ORDER; k += 2) {
-    sum = 0;
-    CS_ptrQ9 = WebRtcIsac_kCos[k];
-    for (n = 0; n < FRAMESAMPLES/8; n++)
-      sum += (CS_ptrQ9[n] * diff[n] + 256) >> 9;
-    CorrQ7[k+1] = sum;
-  }
-
-  for (k=1; k<AR_ORDER; k+=2) {
-    sum = 0;
-    CS_ptrQ9 = WebRtcIsac_kCos[k];
-    for (n = 0; n < FRAMESAMPLES/8; n++)
-      sum += (CS_ptrQ9[n] * summ[n] + 256) >> 9;
-    CorrQ7[k+1] = sum;
-  }
-}
-
-/* compute inverse AR power spectrum */
-/* Changed to the function used in iSAC FIX for compatibility reasons */
-static void WebRtcIsac_FindInvArSpec(const WebRtc_Word16 *ARCoefQ12,
-                                     const WebRtc_Word32 gainQ10,
-                                     WebRtc_Word32 *CurveQ16)
-{
-  WebRtc_Word32 CorrQ11[AR_ORDER+1];
-  WebRtc_Word32 sum, tmpGain;
-  WebRtc_Word32 diffQ16[FRAMESAMPLES/8];
-  const WebRtc_Word16 *CS_ptrQ9;
-  int k, n;
-  WebRtc_Word16 round, shftVal = 0, sh;
-
-  sum = 0;
-  for (n = 0; n < AR_ORDER+1; n++)
-    sum += WEBRTC_SPL_MUL(ARCoefQ12[n], ARCoefQ12[n]);   /* Q24 */
-  sum = WEBRTC_SPL_RSHIFT_W32(WEBRTC_SPL_MUL(WEBRTC_SPL_RSHIFT_W32(sum, 6), 65) + 32768, 16); /* result in Q8 */
-  CorrQ11[0] = WEBRTC_SPL_RSHIFT_W32(WEBRTC_SPL_MUL(sum, gainQ10) + 256, 9);
-
-  /* To avoid overflow, we shift down gainQ10 if it is large. We will not lose any precision */
-  if(gainQ10>400000){
-    tmpGain = WEBRTC_SPL_RSHIFT_W32(gainQ10, 3);
-    round = 32;
-    shftVal = 6;
-  } else {
-    tmpGain = gainQ10;
-    round = 256;
-    shftVal = 9;
-  }
-
-  for (k = 1; k < AR_ORDER+1; k++) {
-    sum = 16384;
-    for (n = k; n < AR_ORDER+1; n++)
-      sum += WEBRTC_SPL_MUL(ARCoefQ12[n-k], ARCoefQ12[n]); /* Q24 */
-    sum = WEBRTC_SPL_RSHIFT_W32(sum, 15);
-    CorrQ11[k] = WEBRTC_SPL_RSHIFT_W32(WEBRTC_SPL_MUL(sum, tmpGain) + round, shftVal);
-  }
-  sum = WEBRTC_SPL_LSHIFT_W32(CorrQ11[0], 7);
-  for (n = 0; n < FRAMESAMPLES/8; n++)
-    CurveQ16[n] = sum;
-
-  for (k = 1; k < AR_ORDER; k += 2) {
-    //CS_ptrQ9 = WebRtcIsac_kCos[k];
-    for (n = 0; n < FRAMESAMPLES/8; n++)
-      CurveQ16[n] += WEBRTC_SPL_RSHIFT_W32(
-          WEBRTC_SPL_MUL(WebRtcIsac_kCos[k][n], CorrQ11[k+1]) + 2, 2);
-  }
-
-  CS_ptrQ9 = WebRtcIsac_kCos[0];
-
-  /* If CorrQ11[1] too large we avoid getting overflow in the calculation by shifting */
-  sh=WebRtcSpl_NormW32(CorrQ11[1]);
-  if (CorrQ11[1]==0) /* Use next correlation */
-    sh=WebRtcSpl_NormW32(CorrQ11[2]);
-
-  if (sh<9)
-    shftVal = 9 - sh;
-  else
-    shftVal = 0;
-
-  for (n = 0; n < FRAMESAMPLES/8; n++)
-    diffQ16[n] = WEBRTC_SPL_RSHIFT_W32(WEBRTC_SPL_MUL(CS_ptrQ9[n], WEBRTC_SPL_RSHIFT_W32(CorrQ11[1], shftVal)) + 2, 2);
-  for (k = 2; k < AR_ORDER; k += 2) {
-    CS_ptrQ9 = WebRtcIsac_kCos[k];
-    for (n = 0; n < FRAMESAMPLES/8; n++)
-      diffQ16[n] += WEBRTC_SPL_RSHIFT_W32(WEBRTC_SPL_MUL(CS_ptrQ9[n], WEBRTC_SPL_RSHIFT_W32(CorrQ11[k+1], shftVal)) + 2, 2);
-  }
-
-  for (k=0; k<FRAMESAMPLES/8; k++) {
-    CurveQ16[FRAMESAMPLES_QUARTER-1 - k] = CurveQ16[k] - WEBRTC_SPL_LSHIFT_W32(diffQ16[k], shftVal);
-    CurveQ16[k] += WEBRTC_SPL_LSHIFT_W32(diffQ16[k], shftVal);
-  }
-}
-
-/* generate array of dither samples in Q7 */
-static void GenerateDitherQ7Lb(WebRtc_Word16 *bufQ7,
-                               WebRtc_UWord32 seed,
-                               int length,
-                               WebRtc_Word16 AvgPitchGain_Q12)
-{
-  int   k, shft;
-  WebRtc_Word16 dither1_Q7, dither2_Q7, dither_gain_Q14;
-
-  if (AvgPitchGain_Q12 < 614)  /* this threshold should be equal to that in decode_spec() */
-  {
-    for (k = 0; k < length-2; k += 3)
-    {
-      /* new random unsigned int */
-      seed = (seed * 196314165) + 907633515;
-
-      /* fixed-point dither sample between -64 and 64 (Q7) */
-      dither1_Q7 = (WebRtc_Word16)(((int)seed + 16777216)>>25); // * 128/4294967295
-
-      /* new random unsigned int */
-      seed = (seed * 196314165) + 907633515;
-
-      /* fixed-point dither sample between -64 and 64 */
-      dither2_Q7 = (WebRtc_Word16)(((int)seed + 16777216)>>25);
-
-      shft = (seed >> 25) & 15;
-      if (shft < 5)
-      {
-        bufQ7[k]   = dither1_Q7;
-        bufQ7[k+1] = dither2_Q7;
-        bufQ7[k+2] = 0;
-      }
-      else if (shft < 10)
-      {
-        bufQ7[k]   = dither1_Q7;
-        bufQ7[k+1] = 0;
-        bufQ7[k+2] = dither2_Q7;
-      }
-      else
-      {
-        bufQ7[k]   = 0;
-        bufQ7[k+1] = dither1_Q7;
-        bufQ7[k+2] = dither2_Q7;
-      }
-    }
-  }
-  else
-  {
-    dither_gain_Q14 = (WebRtc_Word16)(22528 - 10 * AvgPitchGain_Q12);
-
-    /* dither on half of the coefficients */
-    for (k = 0; k < length-1; k += 2)
-    {
-      /* new random unsigned int */
-      seed = (seed * 196314165) + 907633515;
-
-      /* fixed-point dither sample between -64 and 64 */
-      dither1_Q7 = (WebRtc_Word16)(((int)seed + 16777216)>>25);
-
-      /* dither sample is placed in either even or odd index */
-      shft = (seed >> 25) & 1;     /* either 0 or 1 */
-
-      bufQ7[k + shft] = (((dither_gain_Q14 * dither1_Q7) + 8192)>>14);
-      bufQ7[k + 1 - shft] = 0;
-    }
-  }
-}
-
-
-
-/******************************************************************************
- * GenerateDitherQ7LbUB()
- *
- * generate array of dither samples in Q7 There are less zeros in dither
- * vector compared to GenerateDitherQ7Lb.
- *
- * A uniform random number generator with the range of [-64 64] is employed
- * but the generated dithers are scaled by 0.35, a heuristic scaling.
- *
- * Input:
- *      -seed               : the initial seed for the random number generator.
- *      -length             : the number of dither values to be generated.
- *
- * Output:
- *      -bufQ7              : pointer to a buffer where dithers are written to.
- */
-static void GenerateDitherQ7LbUB(
-    WebRtc_Word16 *bufQ7,
-    WebRtc_UWord32 seed,
-    int length)
-{
-  int k;
-  for (k = 0; k < length; k++) {
-    /* new random unsigned int */
-    seed = (seed * 196314165) + 907633515;
-
-    /* fixed-point dither sample between -64 and 64 (Q7) */
-    // * 128/4294967295
-    bufQ7[k] = (WebRtc_Word16)(((int)seed + 16777216)>>25);
-
-    // scale by 0.35
-    bufQ7[k] = (WebRtc_Word16)WEBRTC_SPL_MUL_16_16_RSFT(bufQ7[k],
-                                                           2048, 13);
-  }
-}
-
-
-
-/*
- * function to decode the complex spectrum from the bit stream
- * returns the total number of bytes in the stream
- */
-int WebRtcIsac_DecodeSpecLb(Bitstr *streamdata,
-                            double *fr,
-                            double *fi,
-                            WebRtc_Word16 AvgPitchGain_Q12)
-{
-  WebRtc_Word16  DitherQ7[FRAMESAMPLES];
-  WebRtc_Word16  data[FRAMESAMPLES];
-  WebRtc_Word32  invARSpec2_Q16[FRAMESAMPLES_QUARTER];
-  WebRtc_UWord16 invARSpecQ8[FRAMESAMPLES_QUARTER];
-  WebRtc_Word16  ARCoefQ12[AR_ORDER+1];
-  WebRtc_Word16  RCQ15[AR_ORDER];
-  WebRtc_Word16  gainQ10;
-  WebRtc_Word32  gain2_Q10, res;
-  WebRtc_Word32  in_sqrt;
-  WebRtc_Word32  newRes;
-  int            k, len, i;
-
-  /* create dither signal */
-  GenerateDitherQ7Lb(DitherQ7, streamdata->W_upper, FRAMESAMPLES, AvgPitchGain_Q12);
-
-  /* decode model parameters */
-  if (WebRtcIsac_DecodeRc(streamdata, RCQ15) < 0)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-  WebRtcSpl_ReflCoefToLpc(RCQ15, AR_ORDER, ARCoefQ12);
-
-  if (WebRtcIsac_DecodeGain2(streamdata, &gain2_Q10) < 0)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-  /* compute inverse AR power spectrum */
-  WebRtcIsac_FindInvArSpec(ARCoefQ12, gain2_Q10, invARSpec2_Q16);
-
-  /* convert to magnitude spectrum, by doing square-roots (modified from SPLIB) */
-  res = 1 << (WebRtcSpl_GetSizeInBits(invARSpec2_Q16[0]) >> 1);
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++)
-  {
-    in_sqrt = invARSpec2_Q16[k];
-    i = 10;
-
-    /* Negative values make no sense for a real sqrt-function. */
-    if (in_sqrt<0)
-      in_sqrt=-in_sqrt;
-
-    newRes = (in_sqrt / res + res) >> 1;
-    do
-    {
-      res = newRes;
-      newRes = (in_sqrt / res + res) >> 1;
-    } while (newRes != res && i-- > 0);
-
-    invARSpecQ8[k] = (WebRtc_Word16)newRes;
-  }
-
-  /* arithmetic decoding of spectrum */
-  if ((len = WebRtcIsac_DecLogisticMulti2(data, streamdata, invARSpecQ8, DitherQ7,
-                                          FRAMESAMPLES, !IS_SWB_12KHZ)) <1)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-  /* subtract dither and scale down spectral samples with low SNR */
-  if (AvgPitchGain_Q12 <= 614)
-  {
-    for (k = 0; k < FRAMESAMPLES; k += 4)
-    {
-      gainQ10 = WebRtcSpl_DivW32W16ResW16(30 << 10,
-                                              (WebRtc_Word16)((invARSpec2_Q16[k>>2] + (32768 + (33 << 16))) >> 16));
-      *fr++ = (double)((data[ k ] * gainQ10 + 512) >> 10) / 128.0;
-      *fi++ = (double)((data[k+1] * gainQ10 + 512) >> 10) / 128.0;
-      *fr++ = (double)((data[k+2] * gainQ10 + 512) >> 10) / 128.0;
-      *fi++ = (double)((data[k+3] * gainQ10 + 512) >> 10) / 128.0;
-    }
-  }
-  else
-  {
-    for (k = 0; k < FRAMESAMPLES; k += 4)
-    {
-      gainQ10 = WebRtcSpl_DivW32W16ResW16(36 << 10,
-                                              (WebRtc_Word16)((invARSpec2_Q16[k>>2] + (32768 + (40 << 16))) >> 16));
-      *fr++ = (double)((data[ k ] * gainQ10 + 512) >> 10) / 128.0;
-      *fi++ = (double)((data[k+1] * gainQ10 + 512) >> 10) / 128.0;
-      *fr++ = (double)((data[k+2] * gainQ10 + 512) >> 10) / 128.0;
-      *fi++ = (double)((data[k+3] * gainQ10 + 512) >> 10) / 128.0;
-    }
-  }
-
-  return len;
-}
-
-/******************************************************************************
- * WebRtcIsac_DecodeSpecUB16()
- * Decode real and imaginary part of the DFT coefficients, given a bit-stream.
- * This function is called when the codec is in 0-16 kHz bandwidth.
- * The decoded DFT coefficient can be transformed to time domain by
- * WebRtcIsac_Time2Spec().
- *
- * Input:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *      -*fr                : pointer to a buffer where the real part of DFT
- *                            coefficients are written to.
- *      -*fi                : pointer to a buffer where the imaginary part
- *                            of DFT coefficients are written to.
- *
- * Return value             : < 0 if an error occures
- *                              0 if succeeded.
- */
-int WebRtcIsac_DecodeSpecUB16(
-    Bitstr*     streamdata,
-    double*     fr,
-    double*     fi)
-{
-  WebRtc_Word16  DitherQ7[FRAMESAMPLES];
-  WebRtc_Word16  data[FRAMESAMPLES];
-  WebRtc_Word32  invARSpec2_Q16[FRAMESAMPLES_QUARTER];
-  WebRtc_UWord16 invARSpecQ8[FRAMESAMPLES_QUARTER];
-  WebRtc_Word16  ARCoefQ12[AR_ORDER+1];
-  WebRtc_Word16  RCQ15[AR_ORDER];
-  WebRtc_Word32  gain2_Q10, res;
-  WebRtc_Word32  in_sqrt;
-  WebRtc_Word32  newRes;
-  int            k, len, i, j;
-
-  /* create dither signal */
-  GenerateDitherQ7LbUB(DitherQ7, streamdata->W_upper, FRAMESAMPLES);
-
-  /* decode model parameters */
-  if (WebRtcIsac_DecodeRc(streamdata, RCQ15) < 0)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-  WebRtcSpl_ReflCoefToLpc(RCQ15, AR_ORDER, ARCoefQ12);
-
-  if (WebRtcIsac_DecodeGain2(streamdata, &gain2_Q10) < 0)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-  /* compute inverse AR power spectrum */
-  WebRtcIsac_FindInvArSpec(ARCoefQ12, gain2_Q10, invARSpec2_Q16);
-
-  /* convert to magnitude spectrum, by doing square-roots (modified from SPLIB) */
-  res = 1 << (WebRtcSpl_GetSizeInBits(invARSpec2_Q16[0]) >> 1);
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++)
-  {
-    in_sqrt = invARSpec2_Q16[k];
-    i = 10;
-
-    /* Negative values make no sense for a real sqrt-function. */
-    if (in_sqrt<0)
-      in_sqrt=-in_sqrt;
-
-    newRes = (in_sqrt / res + res) >> 1;
-    do
-    {
-      res = newRes;
-      newRes = (in_sqrt / res + res) >> 1;
-    } while (newRes != res && i-- > 0);
-
-    invARSpecQ8[k] = (WebRtc_Word16)newRes;
-  }
-
-  /* arithmetic decoding of spectrum */
-  if ((len = WebRtcIsac_DecLogisticMulti2(data, streamdata, invARSpecQ8,
-                                          DitherQ7, FRAMESAMPLES, !IS_SWB_12KHZ)) <1)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-  /* re-arrange DFT coefficients and scale down */
-  for (j = 0, k = 0; k < FRAMESAMPLES; k += 4, j++)
-  {
-    fr[j] = (double)data[ k ] / 128.0;
-    fi[j] = (double)data[k+1] / 128.0;
-    fr[(FRAMESAMPLES_HALF) - 1 - j] = (double)data[k+2] / 128.0;
-    fi[(FRAMESAMPLES_HALF) - 1 - j] = (double)data[k+3] / 128.0;
-
-  }
-  return len;
-}
-
-
-
-
-/******************************************************************************
- * WebRtcIsac_DecodeSpecUB12()
- * Decode real and imaginary part of the DFT coefficients, given a bit-stream.
- * This function is called when the codec is in 0-12 kHz bandwidth.
- * The decoded DFT coefficient can be transformed to time domain by
- * WebRtcIsac_Time2Spec().
- *
- * Input:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *      -*fr                : pointer to a buffer where the real part of DFT
- *                            coefficients are written to.
- *      -*fi                : pointer to a buffer where the imaginary part
- *                            of DFT coefficients are written to.
- *
- * Return value             : < 0 if an error occures
- *                              0 if succeeded.
- */
-int WebRtcIsac_DecodeSpecUB12(
-    Bitstr *streamdata,
-    double *fr,
-    double *fi)
-{
-  WebRtc_Word16  DitherQ7[FRAMESAMPLES];
-  WebRtc_Word16  data[FRAMESAMPLES];
-  WebRtc_Word32  invARSpec2_Q16[FRAMESAMPLES_QUARTER];
-  WebRtc_UWord16 invARSpecQ8[FRAMESAMPLES_QUARTER];
-  WebRtc_Word16  ARCoefQ12[AR_ORDER+1];
-  WebRtc_Word16  RCQ15[AR_ORDER];
-  WebRtc_Word32  gain2_Q10;
-  WebRtc_Word32  res;
-  WebRtc_Word32  in_sqrt;
-  WebRtc_Word32  newRes;
-  int            k, len, i;
-
-  /* create dither signal */
-  GenerateDitherQ7LbUB(DitherQ7, streamdata->W_upper, FRAMESAMPLES);
-
-  /* decode model parameters */
-  if (WebRtcIsac_DecodeRc(streamdata, RCQ15) < 0)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-  WebRtcSpl_ReflCoefToLpc(RCQ15, AR_ORDER, ARCoefQ12);
-
-  if (WebRtcIsac_DecodeGain2(streamdata, &gain2_Q10) < 0)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-
-  /* compute inverse AR power spectrum */
-  WebRtcIsac_FindInvArSpec(ARCoefQ12, gain2_Q10, invARSpec2_Q16);
-
-  /* convert to magnitude spectrum, by doing square-roots (modified from SPLIB) */
-  res = 1 << (WebRtcSpl_GetSizeInBits(invARSpec2_Q16[0]) >> 1);
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++)
-  {
-    in_sqrt = invARSpec2_Q16[k];
-    i = 10;
-
-    /* Negative values make no sense for a real sqrt-function. */
-    if (in_sqrt<0)
-      in_sqrt=-in_sqrt;
-
-    newRes = (in_sqrt / res + res) >> 1;
-    do
-    {
-      res = newRes;
-      newRes = (in_sqrt / res + res) >> 1;
-    } while (newRes != res && i-- > 0);
-
-    invARSpecQ8[k] = (WebRtc_Word16)newRes;
-  }
-
-  /* arithmetic decoding of spectrum */
-  if ((len = WebRtcIsac_DecLogisticMulti2(data, streamdata,
-                                          invARSpecQ8, DitherQ7, (FRAMESAMPLES_HALF), IS_SWB_12KHZ)) < 1)
-  {
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-  }
-
-  for (k = 0, i = 0; k < FRAMESAMPLES_HALF; k += 4)
-  {
-    fr[i] = (double)data[ k ] / 128.0;
-    fi[i] = (double)data[k+1] / 128.0;
-    i++;
-    fr[i] = (double)data[k+2] / 128.0;
-    fi[i] = (double)data[k+3] / 128.0;
-    i++;
-  }
-
-  // The second half of real and imaginary coefficients is zero. This is
-  // due to using the old FFT module which requires two signals as input
-  // while in 0-12 kHz mode we only have 8-12 kHz band, and the second signal
-  // is set to zero
-  memset(&fr[FRAMESAMPLES_QUARTER], 0, FRAMESAMPLES_QUARTER * sizeof(double));
-  memset(&fi[FRAMESAMPLES_QUARTER], 0, FRAMESAMPLES_QUARTER * sizeof(double));
-
-  return len;
-}
-
-
-
-
-
-int WebRtcIsac_EncodeSpecLb(const WebRtc_Word16 *fr,
-                            const WebRtc_Word16 *fi,
-                            Bitstr *streamdata,
-                            WebRtc_Word16 AvgPitchGain_Q12)
-{
-  WebRtc_Word16  ditherQ7[FRAMESAMPLES];
-  WebRtc_Word16  dataQ7[FRAMESAMPLES];
-  WebRtc_Word32  PSpec[FRAMESAMPLES_QUARTER];
-  WebRtc_Word32  invARSpec2_Q16[FRAMESAMPLES_QUARTER];
-  WebRtc_UWord16 invARSpecQ8[FRAMESAMPLES_QUARTER];
-  WebRtc_Word32  CorrQ7[AR_ORDER+1];
-  WebRtc_Word32  CorrQ7_norm[AR_ORDER+1];
-  WebRtc_Word16  RCQ15[AR_ORDER];
-  WebRtc_Word16  ARCoefQ12[AR_ORDER+1];
-  WebRtc_Word32  gain2_Q10;
-  WebRtc_Word16  val;
-  WebRtc_Word32  nrg, res;
-  WebRtc_UWord32 sum;
-  WebRtc_Word32  in_sqrt;
-  WebRtc_Word32  newRes;
-  WebRtc_Word16  err;
-  WebRtc_UWord32  nrg_u32;
-  int            shift_var;
-  int          k, n, j, i;
-
-
-  /* create dither_float signal */
-  GenerateDitherQ7Lb(ditherQ7, streamdata->W_upper, FRAMESAMPLES, AvgPitchGain_Q12);
-
-  /* add dither and quantize, and compute power spectrum */
-  for (k = 0; k < FRAMESAMPLES; k += 4)
-  {
-    val = ((*fr++ + ditherQ7[k]   + 64) & 0xFF80) - ditherQ7[k];
-    dataQ7[k] = val;
-    sum = val * val;
-
-    val = ((*fi++ + ditherQ7[k+1] + 64) & 0xFF80) - ditherQ7[k+1];
-    dataQ7[k+1] = val;
-    sum += val * val;
-
-    val = ((*fr++ + ditherQ7[k+2] + 64) & 0xFF80) - ditherQ7[k+2];
-    dataQ7[k+2] = val;
-    sum += val * val;
-
-    val = ((*fi++ + ditherQ7[k+3] + 64) & 0xFF80) - ditherQ7[k+3];
-    dataQ7[k+3] = val;
-    sum += val * val;
-
-    PSpec[k>>2] = sum >> 2;
-  }
-
-  /* compute correlation from power spectrum */
-  WebRtcIsac_FindCorrelation(PSpec, CorrQ7);
-
-
-  /* find AR coefficients */
-  /* number of bit shifts to 14-bit normalize CorrQ7[0] (leaving room for sign) */
-  shift_var = WebRtcSpl_NormW32(CorrQ7[0]) - 18;
-
-  if (shift_var > 0) {
-    for (k=0; k<AR_ORDER+1; k++) {
-      CorrQ7_norm[k] = CorrQ7[k] << shift_var;
-    }
-  } else {
-    for (k=0; k<AR_ORDER+1; k++) {
-      CorrQ7_norm[k] = CorrQ7[k] >> (-shift_var);
-    }
-  }
-
-  /* find RC coefficients */
-  WebRtcSpl_AutoCorrToReflCoef(CorrQ7_norm, AR_ORDER, RCQ15);
-
-  /* quantize & code RC Coefficient */
-  WebRtcIsac_EncodeRc(RCQ15, streamdata);
-
-  /* RC -> AR coefficients */
-  WebRtcSpl_ReflCoefToLpc(RCQ15, AR_ORDER, ARCoefQ12);
-
-  /* compute ARCoef' * Corr * ARCoef in Q19 */
-  nrg = 0;
-  for (j = 0; j <= AR_ORDER; j++) {
-    for (n = 0; n <= j; n++) {
-      nrg += ( ARCoefQ12[j] * ((CorrQ7_norm[j-n] * ARCoefQ12[n] + 256) >> 9) + 4 ) >> 3;
-    }
-    for (n = j+1; n <= AR_ORDER; n++) {
-      nrg += ( ARCoefQ12[j] * ((CorrQ7_norm[n-j] * ARCoefQ12[n] + 256) >> 9) + 4 ) >> 3;
-    }
-  }
-
-  nrg_u32 = (WebRtc_UWord32)nrg;
-  if (shift_var > 0) {
-    nrg_u32 = nrg_u32 >> shift_var;
-  } else {
-    nrg_u32 = nrg_u32 << (-shift_var);
-  }
-
-  if (nrg_u32 > 0x7FFFFFFF)
-    nrg = 0x7FFFFFFF;
-  else
-    nrg = (WebRtc_Word32)nrg_u32;
-
-  gain2_Q10 = WebRtcSpl_DivResultInQ31(FRAMESAMPLES_QUARTER, nrg);  /* also shifts 31 bits to the left! */
-
-  /* quantize & code gain2_Q10 */
-  if (WebRtcIsac_EncodeGain2(&gain2_Q10, streamdata)) {
-    return -1;
-  }
-
-  /* compute inverse AR power spectrum */
-  WebRtcIsac_FindInvArSpec(ARCoefQ12, gain2_Q10, invARSpec2_Q16);
-
-  /* convert to magnitude spectrum, by doing square-roots (modified from SPLIB) */
-  res = 1 << (WebRtcSpl_GetSizeInBits(invARSpec2_Q16[0]) >> 1);
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++)
-  {
-    in_sqrt = invARSpec2_Q16[k];
-    i = 10;
-
-    /* Negative values make no sense for a real sqrt-function. */
-    if (in_sqrt<0)
-      in_sqrt=-in_sqrt;
-
-    newRes = (in_sqrt / res + res) >> 1;
-    do
-    {
-      res = newRes;
-      newRes = (in_sqrt / res + res) >> 1;
-    } while (newRes != res && i-- > 0);
-
-    invARSpecQ8[k] = (WebRtc_Word16)newRes;
-  }
-
-  /* arithmetic coding of spectrum */
-  err = WebRtcIsac_EncLogisticMulti2(streamdata, dataQ7, invARSpecQ8,
-                                     FRAMESAMPLES, !IS_SWB_12KHZ);
-  if (err < 0)
-  {
-    return (err);
-  }
-
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_EncodeSpecUB16()
- * Quantize and encode real and imaginary part of the DFT coefficients.
- * This function is called when the codec is in 0-16 kHz bandwidth.
- * The real and imaginary part are computed by calling WebRtcIsac_Time2Spec().
- *
- *
- * Input:
- *      -*fr                : pointer to a buffer where the real part of DFT
- *                            coefficients are stored.
- *      -*fi                : pointer to a buffer where the imaginary part
- *                            of DFT coefficients are stored.
- *
- * Output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Return value             : < 0 if an error occures
- *                              0 if succeeded.
- */
-int WebRtcIsac_EncodeSpecUB16(
-    const WebRtc_Word16* fr,
-    const WebRtc_Word16* fi,
-    Bitstr*            streamdata)
-{
-  WebRtc_Word16  ditherQ7[FRAMESAMPLES];
-  WebRtc_Word16  dataQ7[FRAMESAMPLES];
-  WebRtc_Word32  PSpec[FRAMESAMPLES_QUARTER];
-  WebRtc_Word32  invARSpec2_Q16[FRAMESAMPLES_QUARTER];
-  WebRtc_UWord16 invARSpecQ8[FRAMESAMPLES_QUARTER];
-  WebRtc_Word32  CorrQ7[AR_ORDER+1];
-  WebRtc_Word32  CorrQ7_norm[AR_ORDER+1];
-  WebRtc_Word16  RCQ15[AR_ORDER];
-  WebRtc_Word16  ARCoefQ12[AR_ORDER+1];
-  WebRtc_Word32  gain2_Q10;
-  WebRtc_Word16  val;
-  WebRtc_Word32  nrg, res;
-  WebRtc_UWord32 sum;
-  WebRtc_Word32  in_sqrt;
-  WebRtc_Word32  newRes;
-  WebRtc_Word16  err;
-  WebRtc_UWord32 nrg_u32;
-  int            shift_var;
-  int          k, n, j, i;
-
-  /* create dither_float signal */
-  GenerateDitherQ7LbUB(ditherQ7, streamdata->W_upper, FRAMESAMPLES);
-
-  /* add dither and quantize, and compute power spectrum */
-  for (j = 0, k = 0; k < FRAMESAMPLES; k += 4, j++)
-  {
-    val = ((fr[j] + ditherQ7[k]   + 64) & 0xFF80) - ditherQ7[k];
-    dataQ7[k] = val;
-    sum = val * val;
-
-    val = ((fi[j] + ditherQ7[k+1] + 64) & 0xFF80) - ditherQ7[k+1];
-    dataQ7[k+1] = val;
-    sum += val * val;
-
-    val = ((fr[(FRAMESAMPLES_HALF) - 1 - j] + ditherQ7[k+2] + 64) &
-           0xFF80) - ditherQ7[k+2];
-    dataQ7[k+2] = val;
-    sum += val * val;
-
-    val = ((fi[(FRAMESAMPLES_HALF) - 1 - j] + ditherQ7[k+3] + 64) &
-           0xFF80) - ditherQ7[k+3];
-    dataQ7[k+3] = val;
-    sum += val * val;
-
-    PSpec[k>>2] = sum >> 2;
-  }
-
-  /* compute correlation from power spectrum */
-  WebRtcIsac_FindCorrelation(PSpec, CorrQ7);
-
-
-  /* find AR coefficients
-     number of bit shifts to 14-bit normalize CorrQ7[0]
-     (leaving room for sign) */
-  shift_var = WebRtcSpl_NormW32(CorrQ7[0]) - 18;
-
-  if (shift_var > 0) {
-    for (k=0; k<AR_ORDER+1; k++) {
-      CorrQ7_norm[k] = CorrQ7[k] << shift_var;
-    }
-  } else {
-    for (k=0; k<AR_ORDER+1; k++) {
-      CorrQ7_norm[k] = CorrQ7[k] >> (-shift_var);
-    }
-  }
-
-  /* find RC coefficients */
-  WebRtcSpl_AutoCorrToReflCoef(CorrQ7_norm, AR_ORDER, RCQ15);
-
-  /* quantize & code RC Coef */
-  WebRtcIsac_EncodeRc(RCQ15, streamdata);
-
-  /* RC -> AR coefficients */
-  WebRtcSpl_ReflCoefToLpc(RCQ15, AR_ORDER, ARCoefQ12);
-
-  /* compute ARCoef' * Corr * ARCoef in Q19 */
-  nrg = 0;
-  for (j = 0; j <= AR_ORDER; j++) {
-    for (n = 0; n <= j; n++) {
-      nrg += ( ARCoefQ12[j] * ((CorrQ7_norm[j-n] * ARCoefQ12[n] +
-                                256) >> 9) + 4 ) >> 3;
-    }
-    for (n = j+1; n <= AR_ORDER; n++) {
-      nrg += ( ARCoefQ12[j] * ((CorrQ7_norm[n-j] * ARCoefQ12[n] +
-                                256) >> 9) + 4 ) >> 3;
-    }
-  }
-  nrg_u32 = (WebRtc_UWord32)nrg;
-  if (shift_var > 0) {
-    nrg_u32 = nrg_u32 >> shift_var;
-  } else {
-    nrg_u32 = nrg_u32 << (-shift_var);
-  }
-
-  if (nrg_u32 > 0x7FFFFFFF)
-    nrg = 0x7FFFFFFF;
-  else
-    nrg = (WebRtc_Word32)nrg_u32;
-
-  gain2_Q10 = WebRtcSpl_DivResultInQ31(FRAMESAMPLES_QUARTER, nrg);  /* also shifts 31 bits to the left! */
-
-  /* quantize & code gain2_Q10 */
-  if (WebRtcIsac_EncodeGain2(&gain2_Q10, streamdata)) {
-    return -1;
-  }
-
-  /* compute inverse AR power spectrum */
-  WebRtcIsac_FindInvArSpec(ARCoefQ12, gain2_Q10, invARSpec2_Q16);
-
-  /* convert to magnitude spectrum, by doing square-roots (modified from SPLIB) */
-  res = 1 << (WebRtcSpl_GetSizeInBits(invARSpec2_Q16[0]) >> 1);
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++)
-  {
-    in_sqrt = invARSpec2_Q16[k];
-    i = 10;
-
-    /* Negative values make no sense for a real sqrt-function. */
-    if (in_sqrt<0)
-      in_sqrt=-in_sqrt;
-
-    newRes = (in_sqrt / res + res) >> 1;
-    do
-    {
-      res = newRes;
-      newRes = (in_sqrt / res + res) >> 1;
-    } while (newRes != res && i-- > 0);
-
-    invARSpecQ8[k] = (WebRtc_Word16)newRes;
-  }
-
-  /* arithmetic coding of spectrum */
-  err = WebRtcIsac_EncLogisticMulti2(streamdata, dataQ7, invARSpecQ8,
-                                     FRAMESAMPLES, !IS_SWB_12KHZ);
-  if (err < 0)
-  {
-    return (err);
-  }
-
-  return 0;
-}
-
-
-
-
-int WebRtcIsac_EncodeSpecUB12(const WebRtc_Word16 *fr,
-                                const WebRtc_Word16 *fi,
-                                Bitstr *streamdata)
-{
-  WebRtc_Word16  ditherQ7[FRAMESAMPLES];
-  WebRtc_Word16  dataQ7[FRAMESAMPLES];
-  WebRtc_Word32  PSpec[FRAMESAMPLES_QUARTER];
-  WebRtc_Word32  invARSpec2_Q16[FRAMESAMPLES_QUARTER];
-  WebRtc_UWord16 invARSpecQ8[FRAMESAMPLES_QUARTER];
-  WebRtc_Word32  CorrQ7[AR_ORDER+1];
-  WebRtc_Word32  CorrQ7_norm[AR_ORDER+1];
-  WebRtc_Word16  RCQ15[AR_ORDER];
-  WebRtc_Word16  ARCoefQ12[AR_ORDER+1];
-  WebRtc_Word32  gain2_Q10;
-  WebRtc_Word16  val;
-  WebRtc_Word32  nrg, res;
-  WebRtc_UWord32 sum;
-  WebRtc_Word32  in_sqrt;
-  WebRtc_Word32  newRes;
-  WebRtc_Word16  err;
-  int            shift_var;
-  int          k, n, j, i;
-  WebRtc_UWord32 nrg_u32;
-
-  /* create dither_float signal */
-  GenerateDitherQ7LbUB(ditherQ7, streamdata->W_upper, FRAMESAMPLES);
-
-  /* add dither and quantize, and compute power spectrum */
-  for (k = 0, j = 0; k < (FRAMESAMPLES_HALF); k += 4)
-  {
-    val = ((*fr++ + ditherQ7[k]   + 64) & 0xFF80) - ditherQ7[k];
-    dataQ7[k] = val;
-    sum = (val) * (val);
-
-    val = ((*fi++ + ditherQ7[k+1] + 64) & 0xFF80) - ditherQ7[k+1];
-    dataQ7[k+1] = val;
-    sum += (val) * (val);
-
-    if(j < FRAMESAMPLES_QUARTER)
-    {
-      PSpec[j] = sum >> 1;
-      j++;
-    }
-
-    val = ((*fr++ + ditherQ7[k+2] + 64) & 0xFF80) - ditherQ7[k+2];
-    dataQ7[k+2] = val;
-    sum = (val) * (val);
-
-    val = ((*fi++ + ditherQ7[k+3] + 64) & 0xFF80) - ditherQ7[k+3];
-    dataQ7[k+3] = val;
-    sum += (val) * (val);
-
-    if(j < FRAMESAMPLES_QUARTER)
-    {
-      PSpec[j] = sum >> 1;
-      j++;
-    }
-  }
-  /* compute correlation from power spectrum */
-  WebRtcIsac_FindCorrelation(PSpec, CorrQ7);
-
-
-  /* find AR coefficients */
-  /* number of bit shifts to 14-bit normalize CorrQ7[0] (leaving room for sign) */
-  shift_var = WebRtcSpl_NormW32(CorrQ7[0]) - 18;
-
-  if (shift_var > 0) {
-    for (k=0; k<AR_ORDER+1; k++) {
-      CorrQ7_norm[k] = CorrQ7[k] << shift_var;
-    }
-  } else {
-    for (k=0; k<AR_ORDER+1; k++) {
-      CorrQ7_norm[k] = CorrQ7[k] >> (-shift_var);
-    }
-  }
-
-  /* find RC coefficients */
-  WebRtcSpl_AutoCorrToReflCoef(CorrQ7_norm, AR_ORDER, RCQ15);
-
-  /* quantize & code RC Coef */
-  WebRtcIsac_EncodeRc(RCQ15, streamdata);
-
-
-  /* RC -> AR coefficients */
-  WebRtcSpl_ReflCoefToLpc(RCQ15, AR_ORDER, ARCoefQ12);
-
-
-  /* compute ARCoef' * Corr * ARCoef in Q19 */
-  nrg = 0;
-  for (j = 0; j <= AR_ORDER; j++) {
-    for (n = 0; n <= j; n++) {
-      nrg += ( ARCoefQ12[j] * ((CorrQ7_norm[j-n] * ARCoefQ12[n] + 256) >> 9) + 4 ) >> 3;
-    }
-    for (n = j+1; n <= AR_ORDER; n++) {
-      nrg += ( ARCoefQ12[j] * ((CorrQ7_norm[n-j] * ARCoefQ12[n] + 256) >> 9) + 4 ) >> 3;
-    }
-  }
-
-  nrg_u32 = (WebRtc_UWord32)nrg;
-  if (shift_var > 0) {
-    nrg_u32 = nrg_u32 >> shift_var;
-  } else {
-    nrg_u32 = nrg_u32 << (-shift_var);
-  }
-
-  if (nrg_u32 > 0x7FFFFFFF) {
-    nrg = 0x7FFFFFFF;
-  } else {
-    nrg = (WebRtc_Word32)nrg_u32;
-  }
-
-  gain2_Q10 = WebRtcSpl_DivResultInQ31(FRAMESAMPLES_QUARTER, nrg);  /* also shifts 31 bits to the left! */
-
-  /* quantize & code gain2_Q10 */
-  if (WebRtcIsac_EncodeGain2(&gain2_Q10, streamdata)) {
-    return -1;
-  }
-
-  /* compute inverse AR power spectrum */
-  WebRtcIsac_FindInvArSpec(ARCoefQ12, gain2_Q10, invARSpec2_Q16);
-
-  /* convert to magnitude spectrum, by doing square-roots (modified from SPLIB) */
-  res = 1 << (WebRtcSpl_GetSizeInBits(invARSpec2_Q16[0]) >> 1);
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++)
-  {
-    in_sqrt = invARSpec2_Q16[k];
-    i = 10;
-
-    /* Negative values make no sense for a real sqrt-function. */
-    if (in_sqrt<0)
-      in_sqrt=-in_sqrt;
-
-    newRes = (in_sqrt / res + res) >> 1;
-    do
-    {
-      res = newRes;
-      newRes = (in_sqrt / res + res) >> 1;
-    } while (newRes != res && i-- > 0);
-
-    invARSpecQ8[k] = (WebRtc_Word16)newRes;
-  }
-
-  /* arithmetic coding of spectrum */
-  err = WebRtcIsac_EncLogisticMulti2(streamdata, dataQ7, invARSpecQ8,
-                                     (FRAMESAMPLES_HALF), IS_SWB_12KHZ);
-  if (err < 0)
-  {
-    return (err);
-  }
-
-  return 0;
-}
-
-
-
-/* step-up */
-void WebRtcIsac_Rc2Poly(double *RC, int N, double *a)
-{
-  int m, k;
-  double tmp[MAX_AR_MODEL_ORDER];
-
-  a[0] = 1.0;
-  tmp[0] = 1.0;
-  for (m=1; m<=N; m++) {
-    /* copy */
-    for (k=1; k<m; k++)
-      tmp[k] = a[k];
-
-    a[m] = RC[m-1];
-    for (k=1; k<m; k++)
-      a[k] += RC[m-1] * tmp[m-k];
-  }
-  return;
-}
-
-/* step-down */
-void WebRtcIsac_Poly2Rc(double *a, int N, double *RC)
-{
-  int m, k;
-  double tmp[MAX_AR_MODEL_ORDER];
-  double tmp_inv;
-
-  RC[N-1] = a[N];
-  for (m=N-1; m>0; m--) {
-    tmp_inv = 1.0 / (1.0 - RC[m]*RC[m]);
-    for (k=1; k<=m; k++)
-      tmp[k] = (a[k] - RC[m] * a[m-k+1]) * tmp_inv;
-
-    for (k=1; k<m; k++)
-      a[k] = tmp[k];
-
-    RC[m-1] = tmp[m];
-  }
-  return;
-}
-
-
-#define MAX_ORDER 100
-
-
-void WebRtcIsac_Rc2Lar(const double *refc, double *lar, int order) {  /* Matlab's LAR definition */
-
-  int k;
-
-  for (k = 0; k < order; k++) {
-    lar[k] = log((1 + refc[k]) / (1 - refc[k]));
-  }
-
-}
-
-
-void WebRtcIsac_Lar2Rc(const double *lar, double *refc,  int order) {
-
-  int k;
-  double tmp;
-
-  for (k = 0; k < order; k++) {
-    tmp = exp(lar[k]);
-    refc[k] = (tmp - 1) / (tmp + 1);
-  }
-}
-
-void WebRtcIsac_Poly2Lar(double *lowband, int orderLo, double *hiband, int orderHi, int Nsub, double *lars) {
-
-  int k, n, orderTot;
-  double poly[MAX_ORDER], lar[MAX_ORDER], rc[MAX_ORDER], *inpl, *inph, *outp;
-
-  orderTot = (orderLo + orderHi + 2);
-  inpl = lowband;
-  inph = hiband;
-  outp = lars;
-  poly[0] = 1.0;
-  for (k = 0; k < Nsub; k++) {
-    /* gains */
-    outp[0] = inpl[0];
-    outp[1] = inph[0];
-
-    /* Low band */
-    for (n = 1; n <= orderLo; n++)
-      poly[n] = inpl[n];
-    WebRtcIsac_Poly2Rc(poly, orderLo, rc);
-    WebRtcIsac_Rc2Lar(rc, lar, orderLo);
-    for (n = 0; n < orderLo; n++)
-      outp[n + 2] = lar[n];
-
-    /* High band */
-    for (n = 1; n <= orderHi; n++)
-      poly[n] = inph[n];
-    WebRtcIsac_Poly2Rc(poly, orderHi, rc);
-    WebRtcIsac_Rc2Lar(rc, lar, orderHi);
-    for (n = 0; n < orderHi; n++)
-      outp[n + orderLo + 2] = lar[n];
-
-    inpl += orderLo + 1;
-    inph += orderHi + 1;
-    outp += orderTot;
-  }
-}
-
-
-
-WebRtc_Word16
-WebRtcIsac_Poly2LarUB(
-    double* lpcVecs,
-    WebRtc_Word16 bandwidth)
-{
-  double      poly[MAX_ORDER];
-  double      rc[MAX_ORDER];
-  double*     ptrIO;
-  WebRtc_Word16 vecCntr;
-  WebRtc_Word16 vecSize;
-  WebRtc_Word16 numVec;
-
-  vecSize = UB_LPC_ORDER;
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        numVec  = UB_LPC_VEC_PER_FRAME;
-        break;
-      }
-    case isac16kHz:
-      {
-        numVec  = UB16_LPC_VEC_PER_FRAME;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  ptrIO = lpcVecs;
-  poly[0] = 1.0;
-  for(vecCntr = 0; vecCntr < numVec; vecCntr++)
-  {
-    memcpy(&poly[1], ptrIO, sizeof(double) * vecSize);
-    WebRtcIsac_Poly2Rc(poly, vecSize, rc);
-    WebRtcIsac_Rc2Lar(rc, ptrIO, vecSize);
-    ptrIO += vecSize;
-  }
-  return 0;
-}
-
-
-
-void WebRtcIsac_Lar2Poly(double *lars, double *lowband, int orderLo, double *hiband, int orderHi, int Nsub) {
-
-  int k, n, orderTot;
-  double poly[MAX_ORDER], lar[MAX_ORDER], rc[MAX_ORDER], *outpl, *outph, *inp;
-
-  orderTot = (orderLo + orderHi + 2);
-  outpl = lowband;
-  outph = hiband;
-  inp = lars;
-  for (k = 0; k < Nsub; k++) {
-    /* gains */
-    outpl[0] = inp[0];
-    outph[0] = inp[1];
-
-    /* Low band */
-    for (n = 0; n < orderLo; n++)
-      lar[n] = inp[n + 2];
-    WebRtcIsac_Lar2Rc(lar, rc, orderLo);
-    WebRtcIsac_Rc2Poly(rc, orderLo, poly);
-    for (n = 1; n <= orderLo; n++)
-      outpl[n] = poly[n];
-
-    /* High band */
-    for (n = 0; n < orderHi; n++)
-      lar[n] = inp[n + orderLo + 2];
-    WebRtcIsac_Lar2Rc(lar, rc, orderHi);
-    WebRtcIsac_Rc2Poly(rc, orderHi, poly);
-    for (n = 1; n <= orderHi; n++)
-      outph[n] = poly[n];
-
-    outpl += orderLo + 1;
-    outph += orderHi + 1;
-    inp += orderTot;
-  }
-}
-
-// assumes 2 LAR vectors interpolates to 'numPolyVec' A-polynomials
-void
-WebRtcIsac_Lar2PolyInterpolUB(
-    double* larVecs,
-    double* percepFilterParams,
-    int     numPolyVecs) // includes the first and the last point of the interval
-{
-
-  int polyCntr, coeffCntr;
-  double larInterpol[UB_LPC_ORDER];
-  double rc[UB_LPC_ORDER];
-  double delta[UB_LPC_ORDER];
-
-  // calculate the step-size for linear interpolation coefficients
-  for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-  {
-    delta[coeffCntr] = (larVecs[UB_LPC_ORDER + coeffCntr] -
-                        larVecs[coeffCntr]) / (numPolyVecs - 1);
-  }
-
-  for(polyCntr = 0; polyCntr < numPolyVecs; polyCntr++)
-  {
-    for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-    {
-      larInterpol[coeffCntr] = larVecs[coeffCntr] +
-          delta[coeffCntr] * polyCntr;
-    }
-    WebRtcIsac_Lar2Rc(larInterpol, rc, UB_LPC_ORDER);
-
-    // convert to A-polynomial, the following function returns A[0] = 1;
-    // which is written where gains had to be written. Then we write the
-    // gain (outside this function). This way we say a memcpy
-    WebRtcIsac_Rc2Poly(rc, UB_LPC_ORDER, percepFilterParams);
-    percepFilterParams += (UB_LPC_ORDER + 1);
-  }
-}
-
-int WebRtcIsac_DecodeLpc(Bitstr *streamdata, double *LPCCoef_lo, double *LPCCoef_hi, int *outmodel) {
-
-  double lars[KLT_ORDER_GAIN + KLT_ORDER_SHAPE];
-  int err;
-
-  err = WebRtcIsac_DecodeLpcCoef(streamdata, lars, outmodel);
-  if (err<0)  // error check
-    return -ISAC_RANGE_ERROR_DECODE_LPC;
-
-  WebRtcIsac_Lar2Poly(lars, LPCCoef_lo, ORDERLO, LPCCoef_hi, ORDERHI, SUBFRAMES);
-
-  return 0;
-}
-
-WebRtc_Word16
-WebRtcIsac_DecodeInterpolLpcUb(
-    Bitstr*     streamdata,
-    double*     percepFilterParams,
-    WebRtc_Word16 bandwidth)
-{
-
-  double lpcCoeff[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  int err;
-  int interpolCntr;
-  int subframeCntr;
-  WebRtc_Word16 numSegments;
-  WebRtc_Word16 numVecPerSegment;
-  WebRtc_Word16 numGains;
-
-  double percepFilterGains[SUBFRAMES<<1];
-  double* ptrOutParam = percepFilterParams;
-
-  err = WebRtcIsac_DecodeLpcCoefUB(streamdata, lpcCoeff, percepFilterGains,
-                                   bandwidth);
-
-  // error check
-  if (err<0)
-  {
-    return -ISAC_RANGE_ERROR_DECODE_LPC;
-  }
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        numGains = SUBFRAMES;
-        numSegments = UB_LPC_VEC_PER_FRAME - 1;
-        numVecPerSegment = kLpcVecPerSegmentUb12;
-        break;
-      }
-    case isac16kHz:
-      {
-        numGains = SUBFRAMES << 1;
-        numSegments = UB16_LPC_VEC_PER_FRAME - 1;
-        numVecPerSegment = kLpcVecPerSegmentUb16;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-
-
-  for(interpolCntr = 0; interpolCntr < numSegments; interpolCntr++)
-  {
-    WebRtcIsac_Lar2PolyInterpolUB(
-        &lpcCoeff[interpolCntr * UB_LPC_ORDER], ptrOutParam,
-        numVecPerSegment + 1);
-
-    ptrOutParam += ((numVecPerSegment) *
-                    (UB_LPC_ORDER + 1));
-  }
-
-  ptrOutParam = percepFilterParams;
-
-  if(bandwidth == isac16kHz)
-  {
-    ptrOutParam += (1 + UB_LPC_ORDER);
-  }
-
-  for(subframeCntr = 0; subframeCntr < numGains; subframeCntr++)
-  {
-    *ptrOutParam = percepFilterGains[subframeCntr];
-    ptrOutParam += (1 + UB_LPC_ORDER);
-  }
-
-  return 0;
-}
-
-
-/* decode & dequantize LPC Coef */
-int WebRtcIsac_DecodeLpcCoef(Bitstr *streamdata, double *LPCCoef, int *outmodel)
-{
-  int j, k, n, model, pos, pos2, posg, poss, offsg, offss, offs2;
-  int index_g[KLT_ORDER_GAIN], index_s[KLT_ORDER_SHAPE];
-  double tmpcoeffs_g[KLT_ORDER_GAIN],tmpcoeffs_s[KLT_ORDER_SHAPE];
-  double tmpcoeffs2_g[KLT_ORDER_GAIN], tmpcoeffs2_s[KLT_ORDER_SHAPE];
-  double sum;
-  int err;
-
-
-  /* entropy decoding of model number */
-  err = WebRtcIsac_DecHistOneStepMulti(&model, streamdata, WebRtcIsac_kQKltModelCdfPtr, WebRtcIsac_kQKltModelInitIndex, 1);
-  if (err<0)  // error check
-    return err;
-
-  /* entropy decoding of quantization indices */
-  err = WebRtcIsac_DecHistOneStepMulti(index_s, streamdata, WebRtcIsac_kQKltCdfPtrShape[model], WebRtcIsac_kQKltInitIndexShape[model], KLT_ORDER_SHAPE);
-  if (err<0)  // error check
-    return err;
-  err = WebRtcIsac_DecHistOneStepMulti(index_g, streamdata, WebRtcIsac_kQKltCdfPtrGain[model], WebRtcIsac_kQKltInitIndexGain[model], KLT_ORDER_GAIN);
-  if (err<0)  // error check
-    return err;
-
-
-  /* find quantization levels for coefficients */
-  for (k=0; k<KLT_ORDER_SHAPE; k++) {
-    tmpcoeffs_s[WebRtcIsac_kQKltSelIndShape[k]] = WebRtcIsac_kQKltLevelsShape[WebRtcIsac_kQKltOfLevelsShape[model]+WebRtcIsac_kQKltOffsetShape[model][k] + index_s[k]];
-  }
-  for (k=0; k<KLT_ORDER_GAIN; k++) {
-    tmpcoeffs_g[WebRtcIsac_kQKltSelIndGain[k]] = WebRtcIsac_kQKltLevelsGain[WebRtcIsac_kQKltOfLevelsGain[model]+ WebRtcIsac_kQKltOffsetGain[model][k] + index_g[k]];
-  }
-
-
-  /* inverse KLT  */
-
-  /* left transform */  // Transpose matrix!
-  offsg = 0;
-  offss = 0;
-  posg = 0;
-  poss = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    offs2 = 0;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = offsg;
-      pos2 = offs2;
-      for (n=0; n<LPC_GAIN_ORDER; n++)
-        sum += tmpcoeffs_g[pos++] * WebRtcIsac_kKltT1Gain[model][pos2++];
-      tmpcoeffs2_g[posg++] = sum;
-      offs2 += LPC_GAIN_ORDER;
-    }
-    offs2 = 0;
-    for (k=0; k<LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = offss;
-      pos2 = offs2;
-      for (n=0; n<LPC_SHAPE_ORDER; n++)
-        sum += tmpcoeffs_s[pos++] * WebRtcIsac_kKltT1Shape[model][pos2++];
-      tmpcoeffs2_s[poss++] = sum;
-      offs2 += LPC_SHAPE_ORDER;
-    }
-    offsg += LPC_GAIN_ORDER;
-    offss += LPC_SHAPE_ORDER;
-  }
-
-
-  /* right transform */ // Transpose matrix
-  offsg = 0;
-  offss = 0;
-  posg = 0;
-  poss = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    posg = offsg;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = j;
-      for (n=0; n<SUBFRAMES; n++) {
-        sum += tmpcoeffs2_g[pos] * WebRtcIsac_kKltT2Gain[model][pos2];
-        pos += LPC_GAIN_ORDER;
-        pos2 += SUBFRAMES;
-
-      }
-      tmpcoeffs_g[posg++] = sum;
-    }
-    poss = offss;
-    for (k=0; k<LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = j;
-      for (n=0; n<SUBFRAMES; n++) {
-        sum += tmpcoeffs2_s[pos] * WebRtcIsac_kKltT2Shape[model][pos2];
-        pos += LPC_SHAPE_ORDER;
-        pos2 += SUBFRAMES;
-      }
-      tmpcoeffs_s[poss++] = sum;
-    }
-    offsg += LPC_GAIN_ORDER;
-    offss += LPC_SHAPE_ORDER;
-  }
-
-
-  /* scaling, mean addition, and gain restoration */
-  posg = 0;poss = 0;pos=0;
-  for (k=0; k<SUBFRAMES; k++) {
-
-    /* log gains */
-    LPCCoef[pos] = tmpcoeffs_g[posg] / LPC_GAIN_SCALE;
-    LPCCoef[pos] += WebRtcIsac_kLpcMeansGain[model][posg];
-    LPCCoef[pos] = exp(LPCCoef[pos]);
-    pos++;posg++;
-    LPCCoef[pos] = tmpcoeffs_g[posg] / LPC_GAIN_SCALE;
-    LPCCoef[pos] += WebRtcIsac_kLpcMeansGain[model][posg];
-    LPCCoef[pos] = exp(LPCCoef[pos]);
-    pos++;posg++;
-
-    /* lo band LAR coeffs */
-    for (n=0; n<LPC_LOBAND_ORDER; n++, pos++, poss++) {
-      LPCCoef[pos] = tmpcoeffs_s[poss] / LPC_LOBAND_SCALE;
-      LPCCoef[pos] += WebRtcIsac_kLpcMeansShape[model][poss];
-    }
-
-    /* hi band LAR coeffs */
-    for (n=0; n<LPC_HIBAND_ORDER; n++, pos++, poss++) {
-      LPCCoef[pos] = tmpcoeffs_s[poss] / LPC_HIBAND_SCALE;
-      LPCCoef[pos] += WebRtcIsac_kLpcMeansShape[model][poss];
-    }
-  }
-
-
-  *outmodel=model;
-
-  return 0;
-}
-
-/* estimate codel length of LPC Coef */
-void WebRtcIsac_EncodeLar(double *LPCCoef, int *model, double *size, Bitstr *streamdata, ISAC_SaveEncData_t* encData) {
-  int j, k, n, bmodel, pos, pos2, poss, posg, offsg, offss, offs2;
-  int index_g[KLT_ORDER_GAIN], index_s[KLT_ORDER_SHAPE];
-  int index_ovr_g[KLT_ORDER_GAIN], index_ovr_s[KLT_ORDER_SHAPE];
-  double Bits;
-  double tmpcoeffs_g[KLT_ORDER_GAIN], tmpcoeffs_s[KLT_ORDER_SHAPE];
-  double tmpcoeffs2_g[KLT_ORDER_GAIN], tmpcoeffs2_s[KLT_ORDER_SHAPE];
-  double sum;
-
-  /* Only one LPC model remains in iSAC. Tables for other models are saved for compatibility reasons. */
-  bmodel = 0;
-
-  /* log gains, mean removal and scaling */
-  posg = 0;poss = 0;pos=0;
-
-  for (k=0; k<SUBFRAMES; k++) {
-    /* log gains */
-    tmpcoeffs_g[posg] = log(LPCCoef[pos]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[bmodel][posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;pos++;
-
-    tmpcoeffs_g[posg] = log(LPCCoef[pos]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[bmodel][posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;pos++;
-
-    /* lo band LAR coeffs */
-    for (n=0; n<LPC_LOBAND_ORDER; n++, poss++, pos++) {
-      tmpcoeffs_s[poss] = LPCCoef[pos] - WebRtcIsac_kLpcMeansShape[bmodel][poss];
-      tmpcoeffs_s[poss] *= LPC_LOBAND_SCALE;
-    }
-
-    /* hi band LAR coeffs */
-    for (n=0; n<LPC_HIBAND_ORDER; n++, poss++, pos++) {
-      tmpcoeffs_s[poss] = LPCCoef[pos] - WebRtcIsac_kLpcMeansShape[bmodel][poss];
-      tmpcoeffs_s[poss] *= LPC_HIBAND_SCALE;
-    }
-  }
-
-  /* KLT  */
-
-  /* left transform */
-  offsg = 0;
-  offss = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    posg = offsg;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = offsg;
-      pos2 = k;
-      for (n=0; n<LPC_GAIN_ORDER; n++) {
-        sum += tmpcoeffs_g[pos++] * WebRtcIsac_kKltT1Gain[bmodel][pos2];
-        pos2 += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs2_g[posg++] = sum;
-    }
-    poss = offss;
-    for (k=0; k<LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = offss;
-      pos2 = k;
-      for (n=0; n<LPC_SHAPE_ORDER; n++) {
-        sum += tmpcoeffs_s[pos++] * WebRtcIsac_kKltT1Shape[bmodel][pos2];
-        pos2 += LPC_SHAPE_ORDER;
-      }
-      tmpcoeffs2_s[poss++] = sum;
-    }
-    offsg += LPC_GAIN_ORDER;
-    offss += LPC_SHAPE_ORDER;
-  }
-
-  /* right transform */
-  offsg = 0;
-  offss = 0;
-  offs2 = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    posg = offsg;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = offs2;
-      for (n=0; n<SUBFRAMES; n++) {
-        sum += tmpcoeffs2_g[pos] * WebRtcIsac_kKltT2Gain[bmodel][pos2++];
-        pos += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs_g[posg++] = sum;
-    }
-    poss = offss;
-    for (k=0; k<LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = offs2;
-      for (n=0; n<SUBFRAMES; n++) {
-        sum += tmpcoeffs2_s[pos] * WebRtcIsac_kKltT2Shape[bmodel][pos2++];
-        pos += LPC_SHAPE_ORDER;
-      }
-      tmpcoeffs_s[poss++] = sum;
-    }
-    offs2 += SUBFRAMES;
-    offsg += LPC_GAIN_ORDER;
-    offss += LPC_SHAPE_ORDER;
-  }
-
-  /* quantize coefficients */
-
-  Bits = 0.0;
-  for (k=0; k<KLT_ORDER_GAIN; k++) //ATTN: ok?
-  {
-    pos = WebRtcIsac_kQKltSelIndGain[k];
-    pos2= WebRtcIsac_lrint(tmpcoeffs_g[pos] / KLT_STEPSIZE);
-    index_g[k] = (pos2) + WebRtcIsac_kQKltQuantMinGain[k]; //ATTN: ok?
-    if (index_g[k] < 0) {
-      index_g[k] = 0;
-    }
-    else if (index_g[k] > WebRtcIsac_kQKltMaxIndGain[k])
-      index_g[k] = WebRtcIsac_kQKltMaxIndGain[k];
-    index_ovr_g[k] = WebRtcIsac_kQKltOffsetGain[bmodel][k]+index_g[k];
-    pos = WebRtcIsac_kQKltOfLevelsGain[bmodel] + index_ovr_g[k];
-
-    /* determine number of bits */
-    sum = WebRtcIsac_kQKltCodeLenGain[pos];
-    Bits += sum;
-  }
-
-  for (k=0; k<KLT_ORDER_SHAPE; k++) //ATTN: ok?
-  {
-    index_s[k] = (WebRtcIsac_lrint(tmpcoeffs_s[WebRtcIsac_kQKltSelIndShape[k]] / KLT_STEPSIZE)) + WebRtcIsac_kQKltQuantMinShape[k]; //ATTN: ok?
-    if (index_s[k] < 0)
-      index_s[k] = 0;
-    else if (index_s[k] > WebRtcIsac_kQKltMaxIndShape[k])
-      index_s[k] = WebRtcIsac_kQKltMaxIndShape[k];
-    index_ovr_s[k] = WebRtcIsac_kQKltOffsetShape[bmodel][k]+index_s[k];
-    pos = WebRtcIsac_kQKltOfLevelsShape[bmodel] + index_ovr_s[k];
-    sum = WebRtcIsac_kQKltCodeLenShape[pos];
-    Bits += sum;
-  }
-
-
-  /* Only one model remains in this version of the code, model = 0 */
-  *model=bmodel;
-  *size=Bits;
-
-  /* entropy coding of model number */
-  WebRtcIsac_EncHistMulti(streamdata, model, WebRtcIsac_kQKltModelCdfPtr, 1);
-
-  /* entropy coding of quantization indices - shape only */
-  WebRtcIsac_EncHistMulti(streamdata, index_s, WebRtcIsac_kQKltCdfPtrShape[bmodel], KLT_ORDER_SHAPE);
-
-  /* Save data for creation of multiple bit streams */
-  encData->LPCmodel[encData->startIdx] = 0;
-  for (k=0; k<KLT_ORDER_SHAPE; k++)
-  {
-    encData->LPCindex_s[KLT_ORDER_SHAPE*encData->startIdx + k] = index_s[k];
-  }
-
-  /* find quantization levels for shape coefficients */
-  for (k=0; k<KLT_ORDER_SHAPE; k++) {
-    tmpcoeffs_s[WebRtcIsac_kQKltSelIndShape[k]] = WebRtcIsac_kQKltLevelsShape[WebRtcIsac_kQKltOfLevelsShape[bmodel]+index_ovr_s[k]];
-  }
-  /* inverse KLT  */
-  /* left transform */  // Transpose matrix!
-  offss = 0;
-  poss = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    offs2 = 0;
-    for (k=0; k<LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = offss;
-      pos2 = offs2;
-      for (n=0; n<LPC_SHAPE_ORDER; n++)
-        sum += tmpcoeffs_s[pos++] * WebRtcIsac_kKltT1Shape[bmodel][pos2++];
-      tmpcoeffs2_s[poss++] = sum;
-      offs2 += LPC_SHAPE_ORDER;
-    }
-    offss += LPC_SHAPE_ORDER;
-  }
-
-
-  /* right transform */ // Transpose matrix
-  offss = 0;
-  poss = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    poss = offss;
-    for (k=0; k<LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = j;
-      for (n=0; n<SUBFRAMES; n++) {
-        sum += tmpcoeffs2_s[pos] * WebRtcIsac_kKltT2Shape[bmodel][pos2];
-        pos += LPC_SHAPE_ORDER;
-        pos2 += SUBFRAMES;
-      }
-      tmpcoeffs_s[poss++] = sum;
-    }
-    offss += LPC_SHAPE_ORDER;
-  }
-
-  /* scaling, mean addition, and gain restoration */
-  poss = 0;pos=0;
-  for (k=0; k<SUBFRAMES; k++) {
-
-    /* log gains */
-    pos+=2;
-
-    /* lo band LAR coeffs */
-    for (n=0; n<LPC_LOBAND_ORDER; n++, pos++, poss++) {
-      LPCCoef[pos] = tmpcoeffs_s[poss] / LPC_LOBAND_SCALE;
-      LPCCoef[pos] += WebRtcIsac_kLpcMeansShape[bmodel][poss];
-    }
-
-    /* hi band LAR coeffs */
-    for (n=0; n<LPC_HIBAND_ORDER; n++, pos++, poss++) {
-      LPCCoef[pos] = tmpcoeffs_s[poss] / LPC_HIBAND_SCALE;
-      LPCCoef[pos] += WebRtcIsac_kLpcMeansShape[bmodel][poss];
-    }
-
-  }
-
-}
-
-
-void WebRtcIsac_EncodeLpcLb(double *LPCCoef_lo, double *LPCCoef_hi, int *model,
-                            double *size, Bitstr *streamdata, ISAC_SaveEncData_t* encData) {
-
-  double lars[KLT_ORDER_GAIN+KLT_ORDER_SHAPE];
-  int k;
-
-  WebRtcIsac_Poly2Lar(LPCCoef_lo, ORDERLO, LPCCoef_hi, ORDERHI, SUBFRAMES, lars);
-  WebRtcIsac_EncodeLar(lars, model, size, streamdata, encData);
-  WebRtcIsac_Lar2Poly(lars, LPCCoef_lo, ORDERLO, LPCCoef_hi, ORDERHI, SUBFRAMES);
-  /* Save data for creation of multiple bit streams (and transcoding) */
-  for (k=0; k<(ORDERLO+1)*SUBFRAMES; k++) {
-    encData->LPCcoeffs_lo[(ORDERLO+1)*SUBFRAMES*encData->startIdx + k] = LPCCoef_lo[k];
-  }
-  for (k=0; k<(ORDERHI+1)*SUBFRAMES; k++) {
-    encData->LPCcoeffs_hi[(ORDERHI+1)*SUBFRAMES*encData->startIdx + k] = LPCCoef_hi[k];
-  }
-}
-
-
-WebRtc_Word16
-WebRtcIsac_EncodeLpcUB(
-    double*                  lpcVecs,
-    Bitstr*                  streamdata,
-    double*                  interpolLPCCoeff,
-    WebRtc_Word16              bandwidth,
-    ISACUBSaveEncDataStruct* encData)
-{
-
-  double    U[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  int     idx[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  int interpolCntr;
-
-  WebRtcIsac_Poly2LarUB(lpcVecs, bandwidth);
-  WebRtcIsac_RemoveLarMean(lpcVecs, bandwidth);
-  WebRtcIsac_DecorrelateIntraVec(lpcVecs, U, bandwidth);
-  WebRtcIsac_DecorrelateInterVec(U, lpcVecs, bandwidth);
-  WebRtcIsac_QuantizeUncorrLar(lpcVecs, idx, bandwidth);
-
-  WebRtcIsac_CorrelateInterVec(lpcVecs, U, bandwidth);
-  WebRtcIsac_CorrelateIntraVec(U, lpcVecs, bandwidth);
-  WebRtcIsac_AddLarMean(lpcVecs, bandwidth);
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        // Stor the indices to be used for multiple encoding.
-        memcpy(encData->indexLPCShape, idx, UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME *
-               sizeof(int));
-        WebRtcIsac_EncHistMulti(streamdata, idx, WebRtcIsac_kLpcShapeCdfMatUb12,
-                                UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME);
-        for(interpolCntr = 0; interpolCntr < UB_INTERPOL_SEGMENTS; interpolCntr++)
-        {
-          WebRtcIsac_Lar2PolyInterpolUB(lpcVecs,
-                                        interpolLPCCoeff, kLpcVecPerSegmentUb12 + 1);
-          lpcVecs += UB_LPC_ORDER;
-          interpolLPCCoeff += (kLpcVecPerSegmentUb12 * (UB_LPC_ORDER + 1));
-        }
-        break;
-      }
-    case isac16kHz:
-      {
-        // Stor the indices to be used for multiple encoding.
-        memcpy(encData->indexLPCShape, idx, UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME *
-               sizeof(int));
-        WebRtcIsac_EncHistMulti(streamdata, idx, WebRtcIsac_kLpcShapeCdfMatUb16,
-                                UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME);
-        for(interpolCntr = 0; interpolCntr < UB16_INTERPOL_SEGMENTS; interpolCntr++)
-        {
-          WebRtcIsac_Lar2PolyInterpolUB(lpcVecs,
-                                        interpolLPCCoeff, kLpcVecPerSegmentUb16 + 1);
-          lpcVecs += UB_LPC_ORDER;
-          interpolLPCCoeff += (kLpcVecPerSegmentUb16 * (UB_LPC_ORDER + 1));
-        }
-        break;
-      }
-    default:
-      return -1;
-  }
-  return 0;
-}
-
-void WebRtcIsac_EncodeLpcGainLb(double *LPCCoef_lo, double *LPCCoef_hi, int model, Bitstr *streamdata, ISAC_SaveEncData_t* encData) {
-
-  int j, k, n, pos, pos2, posg, offsg, offs2;
-  int index_g[KLT_ORDER_GAIN];
-  int index_ovr_g[KLT_ORDER_GAIN];
-  double tmpcoeffs_g[KLT_ORDER_GAIN];
-  double tmpcoeffs2_g[KLT_ORDER_GAIN];
-  double sum;
-
-  /* log gains, mean removal and scaling */
-  posg = 0;
-  for (k=0; k<SUBFRAMES; k++) {
-    tmpcoeffs_g[posg] = log(LPCCoef_lo[(LPC_LOBAND_ORDER+1)*k]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[model][posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;
-    tmpcoeffs_g[posg] = log(LPCCoef_hi[(LPC_HIBAND_ORDER+1)*k]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[model][posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;
-  }
-
-  /* KLT  */
-
-  /* left transform */
-  offsg = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    posg = offsg;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = offsg;
-      pos2 = k;
-      for (n=0; n<LPC_GAIN_ORDER; n++) {
-        sum += tmpcoeffs_g[pos++] * WebRtcIsac_kKltT1Gain[model][pos2];
-        pos2 += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs2_g[posg++] = sum;
-    }
-    offsg += LPC_GAIN_ORDER;
-  }
-
-  /* right transform */
-  offsg = 0;
-  offs2 = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    posg = offsg;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = offs2;
-      for (n=0; n<SUBFRAMES; n++) {
-        sum += tmpcoeffs2_g[pos] * WebRtcIsac_kKltT2Gain[model][pos2++];
-        pos += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs_g[posg++] = sum;
-    }
-    offs2 += SUBFRAMES;
-    offsg += LPC_GAIN_ORDER;
-  }
-
-
-  /* quantize coefficients */
-  for (k=0; k<KLT_ORDER_GAIN; k++) {
-
-    /* get index */
-    pos = WebRtcIsac_kQKltSelIndGain[k];
-    pos2= WebRtcIsac_lrint(tmpcoeffs_g[pos] / KLT_STEPSIZE);
-    index_g[k] = (pos2) + WebRtcIsac_kQKltQuantMinGain[k];
-    if (index_g[k] < 0) {
-      index_g[k] = 0;
-    }
-    else if (index_g[k] > WebRtcIsac_kQKltMaxIndGain[k]) {
-      index_g[k] = WebRtcIsac_kQKltMaxIndGain[k];
-    }
-    index_ovr_g[k] = WebRtcIsac_kQKltOffsetGain[model][k]+index_g[k];
-
-    /* find quantization levels for coefficients */
-    tmpcoeffs_g[WebRtcIsac_kQKltSelIndGain[k]] = WebRtcIsac_kQKltLevelsGain[WebRtcIsac_kQKltOfLevelsGain[model]+index_ovr_g[k]];
-
-    /* Save data for creation of multiple bit streams */
-    encData->LPCindex_g[KLT_ORDER_GAIN*encData->startIdx + k] = index_g[k];
-  }
-
-
-  /* entropy coding of quantization indices - gain */
-  WebRtcIsac_EncHistMulti(streamdata, index_g, WebRtcIsac_kQKltCdfPtrGain[model], KLT_ORDER_GAIN);
-
-  /* find quantization levels for coefficients */
-
-  /* left transform */
-  offsg = 0;
-  posg = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    offs2 = 0;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = offsg;
-      pos2 = offs2;
-      for (n=0; n<LPC_GAIN_ORDER; n++)
-        sum += tmpcoeffs_g[pos++] * WebRtcIsac_kKltT1Gain[model][pos2++];
-      tmpcoeffs2_g[posg++] = sum;
-      offs2 += LPC_GAIN_ORDER;
-    }
-    offsg += LPC_GAIN_ORDER;
-  }
-
-  /* right transform */ // Transpose matrix
-  offsg = 0;
-  posg = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    posg = offsg;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = j;
-      for (n=0; n<SUBFRAMES; n++) {
-        sum += tmpcoeffs2_g[pos] * WebRtcIsac_kKltT2Gain[model][pos2];
-        pos += LPC_GAIN_ORDER;
-        pos2 += SUBFRAMES;
-      }
-      tmpcoeffs_g[posg++] = sum;
-    }
-    offsg += LPC_GAIN_ORDER;
-  }
-
-
-  /* scaling, mean addition, and gain restoration */
-  posg = 0;
-  for (k=0; k<SUBFRAMES; k++) {
-    sum = tmpcoeffs_g[posg] / LPC_GAIN_SCALE;
-    sum += WebRtcIsac_kLpcMeansGain[model][posg];
-    LPCCoef_lo[k*(LPC_LOBAND_ORDER+1)] = exp(sum);
-    pos++;posg++;
-    sum = tmpcoeffs_g[posg] / LPC_GAIN_SCALE;
-    sum += WebRtcIsac_kLpcMeansGain[model][posg];
-    LPCCoef_hi[k*(LPC_HIBAND_ORDER+1)] = exp(sum);
-    pos++;posg++;
-  }
-
-}
-
-void
-WebRtcIsac_EncodeLpcGainUb(
-    double* lpGains,
-    Bitstr* streamdata,
-    int*    lpcGainIndex)
-{
-  double U[UB_LPC_GAIN_DIM];
-  int idx[UB_LPC_GAIN_DIM];
-  WebRtcIsac_ToLogDomainRemoveMean(lpGains);
-  WebRtcIsac_DecorrelateLPGain(lpGains, U);
-  WebRtcIsac_QuantizeLpcGain(U, idx);
-  // Store the index for re-encoding for FEC.
-  memcpy(lpcGainIndex, idx, UB_LPC_GAIN_DIM * sizeof(int));
-  WebRtcIsac_CorrelateLpcGain(U, lpGains);
-  WebRtcIsac_AddMeanToLinearDomain(lpGains);
-  WebRtcIsac_EncHistMulti(streamdata, idx, WebRtcIsac_kLpcGainCdfMat, UB_LPC_GAIN_DIM);
-}
-
-
-void
-WebRtcIsac_StoreLpcGainUb(
-    double* lpGains,
-    Bitstr* streamdata)
-{
-  double U[UB_LPC_GAIN_DIM];
-  int idx[UB_LPC_GAIN_DIM];
-  WebRtcIsac_ToLogDomainRemoveMean(lpGains);
-  WebRtcIsac_DecorrelateLPGain(lpGains, U);
-  WebRtcIsac_QuantizeLpcGain(U, idx);
-  WebRtcIsac_EncHistMulti(streamdata, idx, WebRtcIsac_kLpcGainCdfMat, UB_LPC_GAIN_DIM);
-}
-
-
-
-WebRtc_Word16
-WebRtcIsac_DecodeLpcGainUb(
-    double* lpGains,
-    Bitstr* streamdata)
-{
-  double U[UB_LPC_GAIN_DIM];
-  int idx[UB_LPC_GAIN_DIM];
-  int err;
-  err = WebRtcIsac_DecHistOneStepMulti(idx, streamdata,
-                                       WebRtcIsac_kLpcGainCdfMat, WebRtcIsac_kLpcGainEntropySearch,
-                                       UB_LPC_GAIN_DIM);
-  if(err < 0)
-  {
-    return -1;
-  }
-  WebRtcIsac_DequantizeLpcGain(idx, U);
-  WebRtcIsac_CorrelateLpcGain(U, lpGains);
-  WebRtcIsac_AddMeanToLinearDomain(lpGains);
-  return 0;
-}
-
-
-
-/* decode & dequantize RC */
-int WebRtcIsac_DecodeRc(Bitstr *streamdata, WebRtc_Word16 *RCQ15)
-{
-  int k, err;
-  int index[AR_ORDER];
-
-  /* entropy decoding of quantization indices */
-  err = WebRtcIsac_DecHistOneStepMulti(index, streamdata, WebRtcIsac_kQArRcCdfPtr,
-                                       WebRtcIsac_kQArRcInitIndex, AR_ORDER);
-  if (err<0)  // error check
-    return err;
-
-  /* find quantization levels for reflection coefficients */
-  for (k=0; k<AR_ORDER; k++)
-  {
-    RCQ15[k] = *(WebRtcIsac_kQArRcLevelsPtr[k] + index[k]);
-  }
-
-  return 0;
-}
-
-
-
-/* quantize & code RC */
-void WebRtcIsac_EncodeRc(WebRtc_Word16 *RCQ15, Bitstr *streamdata)
-{
-  int k;
-  int index[AR_ORDER];
-
-  /* quantize reflection coefficients (add noise feedback?) */
-  for (k=0; k<AR_ORDER; k++)
-  {
-    index[k] = WebRtcIsac_kQArRcInitIndex[k];
-
-    if (RCQ15[k] > WebRtcIsac_kQArBoundaryLevels[index[k]])
-    {
-      while (RCQ15[k] > WebRtcIsac_kQArBoundaryLevels[index[k] + 1])
-        index[k]++;
-    }
-    else
-    {
-      while (RCQ15[k] < WebRtcIsac_kQArBoundaryLevels[--index[k]]) ;
-    }
-
-    RCQ15[k] = *(WebRtcIsac_kQArRcLevelsPtr[k] + index[k]);
-  }
-
-
-  /* entropy coding of quantization indices */
-  WebRtcIsac_EncHistMulti(streamdata, index, WebRtcIsac_kQArRcCdfPtr, AR_ORDER);
-}
-
-
-/* decode & dequantize squared Gain */
-int WebRtcIsac_DecodeGain2(Bitstr *streamdata, WebRtc_Word32 *gainQ10)
-{
-  int index, err;
-
-  /* entropy decoding of quantization index */
-  err = WebRtcIsac_DecHistOneStepMulti(&index, streamdata, WebRtcIsac_kQGainCdf_ptr,
-                                       WebRtcIsac_kQGainInitIndex, 1);
-  if (err<0)  // error check
-    return err;
-
-  /* find quantization level */
-  *gainQ10 = WebRtcIsac_kQGain2Levels[index];
-
-  return 0;
-}
-
-
-
-/* quantize & code squared Gain */
-int WebRtcIsac_EncodeGain2(WebRtc_Word32 *gainQ10, Bitstr *streamdata)
-{
-  int index;
-
-
-  /* find quantization index */
-  index = WebRtcIsac_kQGainInitIndex[0];
-  if (*gainQ10 > WebRtcIsac_kQGain2BoundaryLevels[index])
-  {
-    while (*gainQ10 > WebRtcIsac_kQGain2BoundaryLevels[index + 1])
-      index++;
-  }
-  else
-  {
-    while (*gainQ10 < WebRtcIsac_kQGain2BoundaryLevels[--index]) ;
-  }
-
-  /* dequantize */
-  *gainQ10 = WebRtcIsac_kQGain2Levels[index];
-
-
-  /* entropy coding of quantization index */
-  WebRtcIsac_EncHistMulti(streamdata, &index, WebRtcIsac_kQGainCdf_ptr, 1);
-
-  return 0;
-}
-
-
-/* code and decode Pitch Gains and Lags functions */
-
-/* decode & dequantize Pitch Gains */
-int WebRtcIsac_DecodePitchGain(Bitstr *streamdata, WebRtc_Word16 *PitchGains_Q12)
-{
-  int index_comb, err;
-  const WebRtc_UWord16 *WebRtcIsac_kQPitchGainCdf_ptr[1];
-
-  /* entropy decoding of quantization indices */
-  *WebRtcIsac_kQPitchGainCdf_ptr = WebRtcIsac_kQPitchGainCdf;
-  err = WebRtcIsac_DecHistBisectMulti(&index_comb, streamdata, WebRtcIsac_kQPitchGainCdf_ptr, WebRtcIsac_kQCdfTableSizeGain, 1);
-  /* error check, Q_mean_Gain.. tables are of size 144 */
-  if ((err<0) || (index_comb<0) || (index_comb>143))
-    return -ISAC_RANGE_ERROR_DECODE_PITCH_GAIN;
-
-  /* unquantize back to pitch gains by table look-up */
-  PitchGains_Q12[0] = WebRtcIsac_kQMeanGain1Q12[index_comb];
-  PitchGains_Q12[1] = WebRtcIsac_kQMeanGain2Q12[index_comb];
-  PitchGains_Q12[2] = WebRtcIsac_kQMeanGain3Q12[index_comb];
-  PitchGains_Q12[3] = WebRtcIsac_kQMeanGain4Q12[index_comb];
-
-  return 0;
-}
-
-
-/* quantize & code Pitch Gains */
-void WebRtcIsac_EncodePitchGain(WebRtc_Word16 *PitchGains_Q12, Bitstr *streamdata, ISAC_SaveEncData_t* encData)
-{
-  int k,j;
-  double C;
-  double S[PITCH_SUBFRAMES];
-  int index[3];
-  int index_comb;
-  const WebRtc_UWord16 *WebRtcIsac_kQPitchGainCdf_ptr[1];
-  double PitchGains[PITCH_SUBFRAMES] = {0,0,0,0};
-
-  /* take the asin */
-  for (k=0; k<PITCH_SUBFRAMES; k++)
-  {
-    PitchGains[k] = ((float)PitchGains_Q12[k])/4096;
-    S[k] = asin(PitchGains[k]);
-  }
-
-
-  /* find quantization index; only for the first three transform coefficients */
-  for (k=0; k<3; k++)
-  {
-    /*  transform */
-    C = 0.0;
-    for (j=0; j<PITCH_SUBFRAMES; j++)
-      C += WebRtcIsac_kTransform[k][j] * S[j];
-
-    /* quantize */
-    index[k] = WebRtcIsac_lrint(C / PITCH_GAIN_STEPSIZE);
-
-    /* check that the index is not outside the boundaries of the table */
-    if (index[k] < WebRtcIsac_kIndexLowerLimitGain[k]) index[k] = WebRtcIsac_kIndexLowerLimitGain[k];
-    else if (index[k] > WebRtcIsac_kIndexUpperLimitGain[k]) index[k] = WebRtcIsac_kIndexUpperLimitGain[k];
-    index[k] -= WebRtcIsac_kIndexLowerLimitGain[k];
-  }
-
-  /* calculate unique overall index */
-  index_comb = WebRtcIsac_kIndexMultsGain[0] * index[0] + WebRtcIsac_kIndexMultsGain[1] * index[1] + index[2];
-
-  /* unquantize back to pitch gains by table look-up */
-  PitchGains_Q12[0] = WebRtcIsac_kQMeanGain1Q12[index_comb];
-  PitchGains_Q12[1] = WebRtcIsac_kQMeanGain2Q12[index_comb];
-  PitchGains_Q12[2] = WebRtcIsac_kQMeanGain3Q12[index_comb];
-  PitchGains_Q12[3] = WebRtcIsac_kQMeanGain4Q12[index_comb];
-
-  /* entropy coding of quantization pitch gains */
-  *WebRtcIsac_kQPitchGainCdf_ptr = WebRtcIsac_kQPitchGainCdf;
-  WebRtcIsac_EncHistMulti(streamdata, &index_comb, WebRtcIsac_kQPitchGainCdf_ptr, 1);
-  encData->pitchGain_index[encData->startIdx] = index_comb;
-
-}
-
-
-
-/* Pitch LAG */
-
-
-/* decode & dequantize Pitch Lags */
-int WebRtcIsac_DecodePitchLag(Bitstr *streamdata, WebRtc_Word16 *PitchGain_Q12, double *PitchLags)
-{
-  int k, err;
-  double StepSize;
-  double C;
-  int index[PITCH_SUBFRAMES];
-  double mean_gain;
-  const double *mean_val2, *mean_val3, *mean_val4;
-  const WebRtc_Word16 *lower_limit;
-  const WebRtc_UWord16 *init_index;
-  const WebRtc_UWord16 *cdf_size;
-  const WebRtc_UWord16 **cdf;
-
-  //(Y)
-  double PitchGain[4]={0,0,0,0};
-  //
-
-  /* compute mean pitch gain */
-  mean_gain = 0.0;
-  for (k = 0; k < 4; k++)
-  {
-    //(Y)
-    PitchGain[k] = ((float)PitchGain_Q12[k])/4096;
-    //(Y)
-    mean_gain += PitchGain[k];
-  }
-  mean_gain /= 4.0;
-
-  /* voicing classificiation */
-  if (mean_gain < 0.2) {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeLo;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrLo;
-    cdf_size = WebRtcIsac_kQPitchLagCdfSizeLo;
-    mean_val2 = WebRtcIsac_kQMeanLag2Lo;
-    mean_val3 = WebRtcIsac_kQMeanLag3Lo;
-    mean_val4 = WebRtcIsac_kQMeanLag4Lo;
-    lower_limit = WebRtcIsac_kQIndexLowerLimitLagLo;
-    init_index = WebRtcIsac_kQInitIndexLagLo;
-  } else if (mean_gain < 0.4) {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeMid;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrMid;
-    cdf_size = WebRtcIsac_kQPitchLagCdfSizeMid;
-    mean_val2 = WebRtcIsac_kQMeanLag2Mid;
-    mean_val3 = WebRtcIsac_kQMeanLag3Mid;
-    mean_val4 = WebRtcIsac_kQMeanLag4Mid;
-    lower_limit = WebRtcIsac_kQIndexLowerLimitLagMid;
-    init_index = WebRtcIsac_kQInitIndexLagMid;
-  } else {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeHi;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrHi;
-    cdf_size = WebRtcIsac_kQPitchLagCdfSizeHi;
-    mean_val2 = WebRtcIsac_kQMeanLag2Hi;
-    mean_val3 = WebRtcIsac_kQMeanLag3Hi;
-    mean_val4 = WebRtcIsac_kQMeanLag4Hi;
-    lower_limit = WebRtcIsac_kQindexLowerLimitLagHi;
-    init_index = WebRtcIsac_kQInitIndexLagHi;
-  }
-
-  /* entropy decoding of quantization indices */
-  err = WebRtcIsac_DecHistBisectMulti(index, streamdata, cdf, cdf_size, 1);
-  if ((err<0) || (index[0]<0))  // error check
-    return -ISAC_RANGE_ERROR_DECODE_PITCH_LAG;
-
-  err = WebRtcIsac_DecHistOneStepMulti(index+1, streamdata, cdf+1, init_index, 3);
-  if (err<0)  // error check
-    return -ISAC_RANGE_ERROR_DECODE_PITCH_LAG;
-
-
-  /* unquantize back to transform coefficients and do the inverse transform: S = T'*C */
-  C = (index[0] + lower_limit[0]) * StepSize;
-  for (k=0; k<PITCH_SUBFRAMES; k++)
-    PitchLags[k] = WebRtcIsac_kTransformTranspose[k][0] * C;
-  C = mean_val2[index[1]];
-  for (k=0; k<PITCH_SUBFRAMES; k++)
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][1] * C;
-  C = mean_val3[index[2]];
-  for (k=0; k<PITCH_SUBFRAMES; k++)
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][2] * C;
-  C = mean_val4[index[3]];
-  for (k=0; k<PITCH_SUBFRAMES; k++)
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][3] * C;
-
-  return 0;
-}
-
-
-
-/* quantize & code Pitch Lags */
-void WebRtcIsac_EncodePitchLag(double* PitchLags, WebRtc_Word16* PitchGain_Q12, Bitstr* streamdata, ISAC_SaveEncData_t* encData)
-{
-  int k, j;
-  double StepSize;
-  double C;
-  int index[PITCH_SUBFRAMES];
-  double mean_gain;
-  const double *mean_val2, *mean_val3, *mean_val4;
-  const WebRtc_Word16 *lower_limit, *upper_limit;
-  const WebRtc_UWord16 **cdf;
-
-  //(Y)
-  double PitchGain[4]={0,0,0,0};
-  //
-
-  /* compute mean pitch gain */
-  mean_gain = 0.0;
-  for (k = 0; k < 4; k++)
-  {
-    //(Y)
-    PitchGain[k] = ((float)PitchGain_Q12[k])/4096;
-    //(Y)
-    mean_gain += PitchGain[k];
-  }
-  mean_gain /= 4.0;
-
-  /* Save data for creation of multiple bit streams */
-  encData->meanGain[encData->startIdx] = mean_gain;
-
-  /* voicing classification */
-  if (mean_gain < 0.2) {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeLo;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrLo;
-    mean_val2 = WebRtcIsac_kQMeanLag2Lo;
-    mean_val3 = WebRtcIsac_kQMeanLag3Lo;
-    mean_val4 = WebRtcIsac_kQMeanLag4Lo;
-    lower_limit = WebRtcIsac_kQIndexLowerLimitLagLo;
-    upper_limit = WebRtcIsac_kQIndexUpperLimitLagLo;
-  } else if (mean_gain < 0.4) {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeMid;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrMid;
-    mean_val2 = WebRtcIsac_kQMeanLag2Mid;
-    mean_val3 = WebRtcIsac_kQMeanLag3Mid;
-    mean_val4 = WebRtcIsac_kQMeanLag4Mid;
-    lower_limit = WebRtcIsac_kQIndexLowerLimitLagMid;
-    upper_limit = WebRtcIsac_kQIndexUpperLimitLagMid;
-  } else {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeHi;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrHi;
-    mean_val2 = WebRtcIsac_kQMeanLag2Hi;
-    mean_val3 = WebRtcIsac_kQMeanLag3Hi;
-    mean_val4 = WebRtcIsac_kQMeanLag4Hi;
-    lower_limit = WebRtcIsac_kQindexLowerLimitLagHi;
-    upper_limit = WebRtcIsac_kQindexUpperLimitLagHi;
-  }
-
-
-  /* find quantization index */
-  for (k=0; k<4; k++)
-  {
-    /*  transform */
-    C = 0.0;
-    for (j=0; j<PITCH_SUBFRAMES; j++)
-      C += WebRtcIsac_kTransform[k][j] * PitchLags[j];
-
-    /* quantize */
-    index[k] = WebRtcIsac_lrint(C / StepSize);
-
-    /* check that the index is not outside the boundaries of the table */
-    if (index[k] < lower_limit[k]) index[k] = lower_limit[k];
-    else if (index[k] > upper_limit[k]) index[k] = upper_limit[k];
-    index[k] -= lower_limit[k];
-
-    /* Save data for creation of multiple bit streams */
-    encData->pitchIndex[PITCH_SUBFRAMES*encData->startIdx + k] = index[k];
-  }
-
-  /* unquantize back to transform coefficients and do the inverse transform: S = T'*C */
-  C = (index[0] + lower_limit[0]) * StepSize;
-  for (k=0; k<PITCH_SUBFRAMES; k++)
-    PitchLags[k] = WebRtcIsac_kTransformTranspose[k][0] * C;
-  C = mean_val2[index[1]];
-  for (k=0; k<PITCH_SUBFRAMES; k++)
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][1] * C;
-  C = mean_val3[index[2]];
-  for (k=0; k<PITCH_SUBFRAMES; k++)
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][2] * C;
-  C = mean_val4[index[3]];
-  for (k=0; k<PITCH_SUBFRAMES; k++)
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][3] * C;
-
-
-  /* entropy coding of quantization pitch lags */
-  WebRtcIsac_EncHistMulti(streamdata, index, cdf, PITCH_SUBFRAMES);
-
-}
-
-
-
-/* Routines for in-band signaling of bandwidth estimation */
-/* Histograms based on uniform distribution of indices */
-/* Move global variables later! */
-
-
-/* cdf array for frame length indicator */
-const WebRtc_UWord16 WebRtcIsac_kFrameLengthCdf[4] = {
-  0, 21845, 43690, 65535};
-
-/* pointer to cdf array for frame length indicator */
-const WebRtc_UWord16 *WebRtcIsac_kFrameLengthCdf_ptr[1] = {WebRtcIsac_kFrameLengthCdf};
-
-/* initial cdf index for decoder of frame length indicator */
-const WebRtc_UWord16 WebRtcIsac_kFrameLengthInitIndex[1] = {1};
-
-
-int WebRtcIsac_DecodeFrameLen(Bitstr *streamdata,
-                              WebRtc_Word16 *framesamples)
-{
-
-  int frame_mode, err;
-
-  err = 0;
-  /* entropy decoding of frame length [1:30ms,2:60ms] */
-  err = WebRtcIsac_DecHistOneStepMulti(&frame_mode, streamdata, WebRtcIsac_kFrameLengthCdf_ptr, WebRtcIsac_kFrameLengthInitIndex, 1);
-  if (err<0)  // error check
-    return -ISAC_RANGE_ERROR_DECODE_FRAME_LENGTH;
-
-  switch(frame_mode) {
-    case 1:
-      *framesamples = 480; /* 30ms */
-      break;
-    case 2:
-      *framesamples = 960; /* 60ms */
-      break;
-    default:
-      err = -ISAC_DISALLOWED_FRAME_MODE_DECODER;
-  }
-
-  return err;
-}
-
-int WebRtcIsac_EncodeFrameLen(WebRtc_Word16 framesamples, Bitstr *streamdata) {
-
-  int frame_mode, status;
-
-  status = 0;
-  frame_mode = 0;
-  /* entropy coding of frame length [1:480 samples,2:960 samples] */
-  switch(framesamples) {
-    case 480:
-      frame_mode = 1;
-      break;
-    case 960:
-      frame_mode = 2;
-      break;
-    default:
-      status = - ISAC_DISALLOWED_FRAME_MODE_ENCODER;
-  }
-
-  if (status < 0)
-    return status;
-
-  WebRtcIsac_EncHistMulti(streamdata, &frame_mode, WebRtcIsac_kFrameLengthCdf_ptr, 1);
-
-  return status;
-}
-
-/* cdf array for estimated bandwidth */
-static const WebRtc_UWord16 kBwCdf[25] = {
-  0, 2731, 5461, 8192, 10923, 13653, 16384, 19114, 21845, 24576, 27306, 30037,
-  32768, 35498, 38229, 40959, 43690, 46421, 49151, 51882, 54613, 57343, 60074,
-  62804, 65535};
-
-/* pointer to cdf array for estimated bandwidth */
-static const WebRtc_UWord16 *kBwCdfPtr[1] = { kBwCdf };
-
-/* initial cdf index for decoder of estimated bandwidth*/
-static const WebRtc_UWord16 kBwInitIndex[1] = { 7 };
-
-
-int WebRtcIsac_DecodeSendBW(Bitstr *streamdata, WebRtc_Word16 *BWno) {
-
-  int BWno32, err;
-
-  /* entropy decoding of sender's BW estimation [0..23] */
-  err = WebRtcIsac_DecHistOneStepMulti(&BWno32, streamdata, kBwCdfPtr, kBwInitIndex, 1);
-  if (err<0)  // error check
-    return -ISAC_RANGE_ERROR_DECODE_BANDWIDTH;
-  *BWno = (WebRtc_Word16)BWno32;
-  return err;
-
-}
-
-void WebRtcIsac_EncodeReceiveBw(int *BWno, Bitstr *streamdata) {
-
-  /* entropy encoding of receiver's BW estimation [0..23] */
-  WebRtcIsac_EncHistMulti(streamdata, BWno, kBwCdfPtr, 1);
-
-}
-
-
-/* estimate code length of LPC Coef */
-void WebRtcIsac_TranscodeLPCCoef(double *LPCCoef_lo, double *LPCCoef_hi, int model,
-                                 int *index_g) {
-
-  int j, k, n, pos, pos2, posg, offsg, offs2;
-  int index_ovr_g[KLT_ORDER_GAIN];
-  double tmpcoeffs_g[KLT_ORDER_GAIN];
-  double tmpcoeffs2_g[KLT_ORDER_GAIN];
-  double sum;
-
-  /* log gains, mean removal and scaling */
-  posg = 0;
-  for (k=0; k<SUBFRAMES; k++) {
-    tmpcoeffs_g[posg] = log(LPCCoef_lo[(LPC_LOBAND_ORDER+1)*k]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[model][posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;
-    tmpcoeffs_g[posg] = log(LPCCoef_hi[(LPC_HIBAND_ORDER+1)*k]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[model][posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;
-  }
-
-  /* KLT  */
-
-  /* left transform */
-  offsg = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    posg = offsg;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = offsg;
-      pos2 = k;
-      for (n=0; n<LPC_GAIN_ORDER; n++) {
-        sum += tmpcoeffs_g[pos++] * WebRtcIsac_kKltT1Gain[model][pos2];
-        pos2 += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs2_g[posg++] = sum;
-    }
-    offsg += LPC_GAIN_ORDER;
-  }
-
-  /* right transform */
-  offsg = 0;
-  offs2 = 0;
-  for (j=0; j<SUBFRAMES; j++) {
-    posg = offsg;
-    for (k=0; k<LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = offs2;
-      for (n=0; n<SUBFRAMES; n++) {
-        sum += tmpcoeffs2_g[pos] * WebRtcIsac_kKltT2Gain[model][pos2++];
-        pos += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs_g[posg++] = sum;
-    }
-    offs2 += SUBFRAMES;
-    offsg += LPC_GAIN_ORDER;
-  }
-
-
-  /* quantize coefficients */
-  for (k=0; k<KLT_ORDER_GAIN; k++) {
-
-    /* get index */
-    pos = WebRtcIsac_kQKltSelIndGain[k];
-    pos2= WebRtcIsac_lrint(tmpcoeffs_g[pos] / KLT_STEPSIZE);
-    index_g[k] = (pos2) + WebRtcIsac_kQKltQuantMinGain[k];
-    if (index_g[k] < 0) {
-      index_g[k] = 0;
-    }
-    else if (index_g[k] > WebRtcIsac_kQKltMaxIndGain[k]) {
-      index_g[k] = WebRtcIsac_kQKltMaxIndGain[k];
-    }
-    index_ovr_g[k] = WebRtcIsac_kQKltOffsetGain[model][k]+index_g[k];
-
-    /* find quantization levels for coefficients */
-    tmpcoeffs_g[WebRtcIsac_kQKltSelIndGain[k]] = WebRtcIsac_kQKltLevelsGain[WebRtcIsac_kQKltOfLevelsGain[model]+index_ovr_g[k]];
-  }
-}
-
-
-/* decode & dequantize LPC Coef */
-int
-WebRtcIsac_DecodeLpcCoefUB(
-    Bitstr*     streamdata,
-    double*     lpcVecs,
-    double*     percepFilterGains,
-    WebRtc_Word16 bandwidth)
-{
-  int  index_s[KLT_ORDER_SHAPE];
-
-  double U[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  int err;
-
-  /* entropy decoding of quantization indices */
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        err = WebRtcIsac_DecHistOneStepMulti(index_s, streamdata,
-                                             WebRtcIsac_kLpcShapeCdfMatUb12, WebRtcIsac_kLpcShapeEntropySearchUb12,
-                                             UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME);
-        break;
-      }
-    case isac16kHz:
-      {
-        err = WebRtcIsac_DecHistOneStepMulti(index_s, streamdata,
-                                             WebRtcIsac_kLpcShapeCdfMatUb16, WebRtcIsac_kLpcShapeEntropySearchUb16,
-                                             UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME);
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  if (err<0)  // error check
-  {
-    return err;
-  }
-
-  WebRtcIsac_DequantizeLpcParam(index_s, lpcVecs, bandwidth);
-  WebRtcIsac_CorrelateInterVec(lpcVecs, U, bandwidth);
-  WebRtcIsac_CorrelateIntraVec(U, lpcVecs, bandwidth);
-  WebRtcIsac_AddLarMean(lpcVecs, bandwidth);
-
-
-  WebRtcIsac_DecodeLpcGainUb(percepFilterGains, streamdata);
-
-  if(bandwidth == isac16kHz)
-  {
-    // decode another set of Gains
-    WebRtcIsac_DecodeLpcGainUb(&percepFilterGains[SUBFRAMES], streamdata);
-  }
-
-  return 0;
-}
-
-WebRtc_Word16
-WebRtcIsac_EncodeBandwidth(
-    enum ISACBandwidth bandwidth,
-    Bitstr*            streamData)
-{
-  int bandwidthMode;
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        bandwidthMode = 0;
-        break;
-      }
-    case isac16kHz:
-      {
-        bandwidthMode = 1;
-        break;
-      }
-    default:
-      return -ISAC_DISALLOWED_ENCODER_BANDWIDTH;
-  }
-
-  WebRtcIsac_EncHistMulti(streamData, &bandwidthMode,
-                          kOneBitEqualProbCdf_ptr, 1);
-  return 0;
-}
-
-WebRtc_Word16
-WebRtcIsac_DecodeBandwidth(
-    Bitstr*             streamData,
-    enum ISACBandwidth* bandwidth)
-{
-  int bandwidthMode;
-
-  if(WebRtcIsac_DecHistOneStepMulti(&bandwidthMode, streamData,
-                                    kOneBitEqualProbCdf_ptr,
-                                    kOneBitEqualProbInitIndex, 1) < 0)
-  {
-    // error check
-    return -ISAC_RANGE_ERROR_DECODE_BANDWITH;
-  }
-
-  switch(bandwidthMode)
-  {
-    case 0:
-      {
-        *bandwidth = isac12kHz;
-        break;
-      }
-    case 1:
-      {
-        *bandwidth = isac16kHz;
-        break;
-      }
-    default:
-      return -ISAC_DISALLOWED_BANDWIDTH_MODE_DECODER;
-  }
-  return 0;
-}
-
-WebRtc_Word16
-WebRtcIsac_EncodeJitterInfo(
-    WebRtc_Word32 jitterIndex,
-    Bitstr*     streamData)
-{
-  // This is to avoid LINUX warning until we change 'int' to
-  // 'Word32'
-  int intVar;
-
-  if((jitterIndex < 0) || (jitterIndex > 1))
-  {
-    return -1;
-  }
-  intVar = (int)(jitterIndex);
-  // Use the same CDF table as for bandwidth
-  // both take two values with equal probability
-  WebRtcIsac_EncHistMulti(streamData, &intVar,
-                          kOneBitEqualProbCdf_ptr, 1);
-  return 0;
-
-}
-
-WebRtc_Word16
-WebRtcIsac_DecodeJitterInfo(
-    Bitstr*      streamData,
-    WebRtc_Word32* jitterInfo)
-{
-  int intVar;
-
-  // Use the same CDF table as for bandwidth
-  // both take two values with equal probability
-  if(WebRtcIsac_DecHistOneStepMulti(&intVar, streamData,
-                                    kOneBitEqualProbCdf_ptr,
-                                    kOneBitEqualProbInitIndex, 1) < 0)
-  {
-    // error check
-    return -ISAC_RANGE_ERROR_DECODE_BANDWITH;
-  }
-  *jitterInfo = (WebRtc_Word16)(intVar);
-  return 0;
-}
diff --git a/src/mod/codecs/mod_isac/entropy_coding.h b/src/mod/codecs/mod_isac/entropy_coding.h
deleted file mode 100644
index 8446bcf3e5..0000000000
--- a/src/mod/codecs/mod_isac/entropy_coding.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * entropy_coding.h
- *
- * This header file declares all of the functions used to arithmetically
- * encode the iSAC bistream
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_
-
-#include "structs.h"
-
-/* decode complex spectrum (return number of bytes in stream) */
-int WebRtcIsac_DecodeSpecLb(Bitstr *streamdata,
-                            double *fr,
-                            double *fi,
-                            WebRtc_Word16 AvgPitchGain_Q12);
-
-/******************************************************************************
- * WebRtcIsac_DecodeSpecUB16()
- * Decode real and imaginary part of the DFT coefficients, given a bit-stream.
- * This function is called when the codec is in 0-16 kHz bandwidth.
- * The decoded DFT coefficient can be transformed to time domain by
- * WebRtcIsac_Time2Spec().
- *
- * Input:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *      -*fr                : pointer to a buffer where the real part of DFT
- *                            coefficients are written to.
- *      -*fi                : pointer to a buffer where the imaginary part
- *                            of DFT coefficients are written to.
- *
- * Return value             : < 0 if an error occures
- *                              0 if succeeded.
- */
-int WebRtcIsac_DecodeSpecUB16(
-    Bitstr* streamdata,
-    double* fr,
-    double* fi);
-
-
-/******************************************************************************
- * WebRtcIsac_DecodeSpecUB12()
- * Decode real and imaginary part of the DFT coefficients, given a bit-stream.
- * This function is called when the codec is in 0-12 kHz bandwidth.
- * The decoded DFT coefficient can be transformed to time domain by
- * WebRtcIsac_Time2Spec().
- *
- * Input:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *      -*fr                : pointer to a buffer where the real part of DFT
- *                            coefficients are written to.
- *      -*fi                : pointer to a buffer where the imaginary part
- *                            of DFT coefficients are written to.
- *
- * Return value             : < 0 if an error occures
- *                              0 if succeeded.
- */
-int WebRtcIsac_DecodeSpecUB12(
-    Bitstr* streamdata,
-    double* fr,
-    double* fi);
-
-
-/* encode complex spectrum */
-int WebRtcIsac_EncodeSpecLb(const WebRtc_Word16* fr,
-                            const WebRtc_Word16* fi,
-                            Bitstr* streamdata,
-                            WebRtc_Word16 AvgPitchGain_Q12);
-
-
-/******************************************************************************
- * WebRtcIsac_EncodeSpecUB16()
- * Quantize and encode real and imaginary part of the DFT coefficients.
- * This function is called when the codec is in 0-16 kHz bandwidth.
- * The real and imaginary part are computed by calling WebRtcIsac_Time2Spec().
- *
- *
- * Input:
- *      -*fr                : pointer to a buffer where the real part of DFT
- *                            coefficients are stored.
- *      -*fi                : pointer to a buffer where the imaginary part
- *                            of DFT coefficients are stored.
- *
- * Output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Return value             : < 0 if an error occures
- *                              0 if succeeded.
- */
-int WebRtcIsac_EncodeSpecUB16(
-    const WebRtc_Word16* fr,
-    const WebRtc_Word16* fi,
-    Bitstr*            streamdata);
-
-
-/******************************************************************************
- * WebRtcIsac_EncodeSpecUB12()
- * Quantize and encode real and imaginary part of the DFT coefficients.
- * This function is called when the codec is in 0-12 kHz bandwidth.
- * The real and imaginary part are computed by calling WebRtcIsac_Time2Spec().
- *
- *
- * Input:
- *      -*fr                : pointer to a buffer where the real part of DFT
- *                            coefficients are stored.
- *      -*fi                : pointer to a buffer where the imaginary part
- *                            of DFT coefficients are stored.
- *
- * Output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Return value             : < 0 if an error occures
- *                              0 if succeeded.
- */
-int WebRtcIsac_EncodeSpecUB12(
-    const WebRtc_Word16* fr,
-    const WebRtc_Word16* fi,
-    Bitstr*            streamdata);
-
-
-/* decode & dequantize LPC Coef */
-int WebRtcIsac_DecodeLpcCoef(Bitstr *streamdata, double *LPCCoef, int *outmodel);
-int WebRtcIsac_DecodeLpcCoefUB(
-    Bitstr*     streamdata,
-    double*     lpcVecs,
-    double*     percepFilterGains,
-    WebRtc_Word16 bandwidth);
-
-int WebRtcIsac_DecodeLpc(Bitstr *streamdata, double *LPCCoef_lo, double *LPCCoef_hi, int *outmodel);
-
-/* quantize & code LPC Coef */
-void WebRtcIsac_EncodeLpcLb(double *LPCCoef_lo, double *LPCCoef_hi, int *model, double *size, Bitstr *streamdata, ISAC_SaveEncData_t* encData);
-void WebRtcIsac_EncodeLpcGainLb(double *LPCCoef_lo, double *LPCCoef_hi, int model, Bitstr *streamdata, ISAC_SaveEncData_t* encData);
-
-/******************************************************************************
- * WebRtcIsac_EncodeLpcUB()
- * Encode LPC parameters, given as A-polynomial, of upper-band. The encoding
- * is performed in LAR domain.
- * For the upper-band, we compute and encode LPC of some sub-frames, LPC of
- * other sub-frames are computed by linear interpolation, in LAR domain. This
- * function performs the interpolation and returns the LPC of all sub-frames.
- *
- * Inputs:
- *  - lpcCoef               : a buffer containing A-polynomials of sub-frames
- *                            (excluding first coefficient that is 1).
- *  - bandwidth             : specifies if the codec is operating at 0-12 kHz
- *                            or 0-16 kHz mode.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - interpolLPCCoeff      : Decoded and interpolated LPC (A-polynomial)
- *                            of all sub-frames.
- *                            If LP analysis is of order K, and there are N
- *                            sub-frames then this is a buffer of size
- *                            (k + 1) * N, each vector starts with the LPC gain
- *                            of the corresponding sub-frame. The LPC gains
- *                            are encoded and inserted after this function is
- *                            called. The first A-coefficient which is 1 is not
- *                            included.
- *
- * Return value             : 0 if encoding is successful,
- *                           <0 if failed to encode.
- */
-WebRtc_Word16 WebRtcIsac_EncodeLpcUB(
-    double*                  lpcCoeff,
-    Bitstr*                  streamdata,
-    double*                  interpolLPCCoeff,
-    WebRtc_Word16              bandwidth,
-    ISACUBSaveEncDataStruct* encData);
-
-/******************************************************************************
- * WebRtcIsac_DecodeInterpolLpcUb()
- * Decode LPC coefficients and interpolate to get the coefficients fo all
- * sub-frmaes.
- *
- * Inputs:
- *  - bandwidth             : spepecifies if the codec is in 0-12 kHz or
- *                            0-16 kHz mode.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - percepFilterParam     : Decoded and interpolated LPC (A-polynomial) of
- *                            all sub-frames.
- *                            If LP analysis is of order K, and there are N
- *                            sub-frames then this is a buffer of size
- *                            (k + 1) * N, each vector starts with the LPC gain
- *                            of the corresponding sub-frame. The LPC gains
- *                            are encoded and inserted after this function is
- *                            called. The first A-coefficient which is 1 is not
- *                            included.
- *
- * Return value             : 0 if encoding is successful,
- *                           <0 if failed to encode.
- */
-WebRtc_Word16 WebRtcIsac_DecodeInterpolLpcUb(
-    Bitstr*     streamdata,
-    double*     percepFilterParam,
-    WebRtc_Word16 bandwidth);
-
-/* decode & dequantize RC */
-int WebRtcIsac_DecodeRc(Bitstr *streamdata, WebRtc_Word16 *RCQ15);
-
-/* quantize & code RC */
-void WebRtcIsac_EncodeRc(WebRtc_Word16 *RCQ15, Bitstr *streamdata);
-
-/* decode & dequantize squared Gain */
-int WebRtcIsac_DecodeGain2(Bitstr *streamdata, WebRtc_Word32 *Gain2);
-
-/* quantize & code squared Gain (input is squared gain) */
-int WebRtcIsac_EncodeGain2(WebRtc_Word32 *gain2, Bitstr *streamdata);
-
-void WebRtcIsac_EncodePitchGain(WebRtc_Word16* PitchGains_Q12, Bitstr* streamdata,  ISAC_SaveEncData_t* encData);
-
-void WebRtcIsac_EncodePitchLag(double* PitchLags, WebRtc_Word16* PitchGain_Q12, Bitstr* streamdata, ISAC_SaveEncData_t* encData);
-
-int WebRtcIsac_DecodePitchGain(Bitstr *streamdata, WebRtc_Word16 *PitchGain_Q12);
-int WebRtcIsac_DecodePitchLag(Bitstr *streamdata, WebRtc_Word16 *PitchGain_Q12, double *PitchLag);
-
-int WebRtcIsac_DecodeFrameLen(Bitstr *streamdata, WebRtc_Word16 *framelength);
-int WebRtcIsac_EncodeFrameLen(WebRtc_Word16 framelength, Bitstr *streamdata);
-int WebRtcIsac_DecodeSendBW(Bitstr *streamdata, WebRtc_Word16 *BWno);
-void WebRtcIsac_EncodeReceiveBw(int *BWno, Bitstr *streamdata);
-
-/* step-down */
-void WebRtcIsac_Poly2Rc(double *a, int N, double *RC);
-
-/* step-up */
-void WebRtcIsac_Rc2Poly(double *RC, int N, double *a);
-
-void WebRtcIsac_TranscodeLPCCoef(double *LPCCoef_lo, double *LPCCoef_hi, int model,
-                                 int *index_g);
-
-
-/******************************************************************************
- * WebRtcIsac_EncodeLpcGainUb()
- * Encode LPC gains of sub-Frames.
- *
- * Input/outputs:
- *  - lpGains               : a buffer which contains 'SUBFRAME' number of
- *                            LP gains to be encoded. The input values are
- *                            overwritten by the quantized values.
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - lpcGainIndex          : quantization indices for lpc gains, these will
- *                            be stored to be used  for FEC.
- */
-void WebRtcIsac_EncodeLpcGainUb(
-    double* lpGains,
-    Bitstr* streamdata,
-    int*    lpcGainIndex);
-
-
-/******************************************************************************
- * WebRtcIsac_EncodeLpcGainUb()
- * Store LPC gains of sub-Frames in 'streamdata'.
- *
- * Input:
- *  - lpGains               : a buffer which contains 'SUBFRAME' number of
- *                            LP gains to be encoded.
- * Input/outputs:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- */
-void WebRtcIsac_StoreLpcGainUb(
-    double* lpGains,
-    Bitstr* streamdata);
-
-
-/******************************************************************************
- * WebRtcIsac_DecodeLpcGainUb()
- * Decode the LPC gain of sub-frames.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - lpGains               : a buffer where decoded LPC gians will be stored.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-WebRtc_Word16 WebRtcIsac_DecodeLpcGainUb(
-    double* lpGains,
-    Bitstr* streamdata);
-
-
-/******************************************************************************
- * WebRtcIsac_EncodeBandwidth()
- * Encode if the bandwidth of encoded audio is 0-12 kHz or 0-16 kHz.
- *
- * Input:
- *  - bandwidth             : an enumerator specifying if the codec in is
- *                            0-12 kHz or 0-16 kHz mode.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-WebRtc_Word16 WebRtcIsac_EncodeBandwidth(
-    enum ISACBandwidth bandwidth,
-    Bitstr*            streamData);
-
-
-/******************************************************************************
- * WebRtcIsac_DecodeBandwidth()
- * Decode the bandwidth of the encoded audio, i.e. if the bandwidth is 0-12 kHz
- * or 0-16 kHz.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - bandwidth             : an enumerator specifying if the codec is in
- *                            0-12 kHz or 0-16 kHz mode.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-WebRtc_Word16 WebRtcIsac_DecodeBandwidth(
-    Bitstr*             streamData,
-    enum ISACBandwidth* bandwidth);
-
-
-/******************************************************************************
- * WebRtcIsac_EncodeJitterInfo()
- * Decode the jitter information.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Input:
- *  - jitterInfo            : one bit of info specifying if the channel is
- *                            in high/low jitter. Zero indicates low jitter
- *                            and one indicates high jitter.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-WebRtc_Word16 WebRtcIsac_EncodeJitterInfo(
-    WebRtc_Word32 jitterIndex,
-    Bitstr*     streamData);
-
-
-/******************************************************************************
- * WebRtcIsac_DecodeJitterInfo()
- * Decode the jitter information.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - jitterInfo            : one bit of info specifying if the channel is
- *                            in high/low jitter. Zero indicates low jitter
- *                            and one indicates high jitter.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-WebRtc_Word16 WebRtcIsac_DecodeJitterInfo(
-    Bitstr*      streamData,
-    WebRtc_Word32* jitterInfo);
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_ */
diff --git a/src/mod/codecs/mod_isac/fft.c b/src/mod/codecs/mod_isac/fft.c
deleted file mode 100644
index 4164d3b59b..0000000000
--- a/src/mod/codecs/mod_isac/fft.c
+++ /dev/null
@@ -1,947 +0,0 @@
-/*
- * Copyright(c)1995,97 Mark Olesen <olesen@me.QueensU.CA>
- *    Queen's Univ at Kingston (Canada)
- *
- * Permission to use, copy, modify, and distribute this software for
- * any purpose without fee is hereby granted, provided that this
- * entire notice is included in all copies of any software which is
- * or includes a copy or modification of this software and in all
- * copies of the supporting documentation for such software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR QUEEN'S
- * UNIVERSITY AT KINGSTON MAKES ANY REPRESENTATION OR WARRANTY OF ANY
- * KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS
- * FITNESS FOR ANY PARTICULAR PURPOSE.
- *
- * All of which is to say that you can do what you like with this
- * source code provided you don't try to sell it as your own and you
- * include an unaltered copy of this message (including the
- * copyright).
- *
- * It is also implicitly understood that bug fixes and improvements
- * should make their way back to the general Internet community so
- * that everyone benefits.
- *
- * Changes:
- *   Trivial type modifications by the WebRTC authors.
- */
-
-
-/*
- * File:
- * WebRtcIsac_Fftn.c
- *
- * Public:
- * WebRtcIsac_Fftn / fftnf ();
- *
- * Private:
- * WebRtcIsac_Fftradix / fftradixf ();
- *
- * Descript:
- * multivariate complex Fourier transform, computed in place
- * using mixed-radix Fast Fourier Transform algorithm.
- *
- * Fortran code by:
- * RC Singleton, Stanford Research Institute, Sept. 1968
- *
- * translated by f2c (version 19950721).
- *
- * int WebRtcIsac_Fftn (int ndim, const int dims[], REAL Re[], REAL Im[],
- *     int iSign, double scaling);
- *
- * NDIM = the total number dimensions
- * DIMS = a vector of array sizes
- * if NDIM is zero then DIMS must be zero-terminated
- *
- * RE and IM hold the real and imaginary components of the data, and return
- * the resulting real and imaginary Fourier coefficients.  Multidimensional
- * data *must* be allocated contiguously.  There is no limit on the number
- * of dimensions.
- *
- * ISIGN = the sign of the complex exponential (ie, forward or inverse FFT)
- * the magnitude of ISIGN (normally 1) is used to determine the
- * correct indexing increment (see below).
- *
- * SCALING = normalizing constant by which the final result is *divided*
- * if SCALING == -1, normalize by total dimension of the transform
- * if SCALING <  -1, normalize by the square-root of the total dimension
- *
- * example:
- * tri-variate transform with Re[n1][n2][n3], Im[n1][n2][n3]
- *
- * int dims[3] = {n1,n2,n3}
- * WebRtcIsac_Fftn (3, dims, Re, Im, 1, scaling);
- *
- *-----------------------------------------------------------------------*
- * int WebRtcIsac_Fftradix (REAL Re[], REAL Im[], size_t nTotal, size_t nPass,
- *   size_t nSpan, int iSign, size_t max_factors,
- *   size_t max_perm);
- *
- * RE, IM - see above documentation
- *
- * Although there is no limit on the number of dimensions, WebRtcIsac_Fftradix() must
- * be called once for each dimension, but the calls may be in any order.
- *
- * NTOTAL = the total number of complex data values
- * NPASS  = the dimension of the current variable
- * NSPAN/NPASS = the spacing of consecutive data values while indexing the
- * current variable
- * ISIGN - see above documentation
- *
- * example:
- * tri-variate transform with Re[n1][n2][n3], Im[n1][n2][n3]
- *
- * WebRtcIsac_Fftradix (Re, Im, n1*n2*n3, n1,       n1, 1, maxf, maxp);
- * WebRtcIsac_Fftradix (Re, Im, n1*n2*n3, n2,    n1*n2, 1, maxf, maxp);
- * WebRtcIsac_Fftradix (Re, Im, n1*n2*n3, n3, n1*n2*n3, 1, maxf, maxp);
- *
- * single-variate transform,
- *    NTOTAL = N = NSPAN = (number of complex data values),
- *
- * WebRtcIsac_Fftradix (Re, Im, n, n, n, 1, maxf, maxp);
- *
- * The data can also be stored in a single array with alternating real and
- * imaginary parts, the magnitude of ISIGN is changed to 2 to give correct
- * indexing increment, and data [0] and data [1] used to pass the initial
- * addresses for the sequences of real and imaginary values,
- *
- * example:
- * REAL data [2*NTOTAL];
- * WebRtcIsac_Fftradix ( &data[0], &data[1], NTOTAL, nPass, nSpan, 2, maxf, maxp);
- *
- * for temporary allocation:
- *
- * MAX_FACTORS >= the maximum prime factor of NPASS
- * MAX_PERM >= the number of prime factors of NPASS.  In addition,
- * if the square-free portion K of NPASS has two or more prime
- * factors, then MAX_PERM >= (K-1)
- *
- * storage in FACTOR for a maximum of 15 prime factors of NPASS. if NPASS
- * has more than one square-free factor, the product of the square-free
- * factors must be <= 210 array storage for maximum prime factor of 23 the
- * following two constants should agree with the array dimensions.
- *
- *----------------------------------------------------------------------*/
-#include "fft.h"
-
-#include <stdlib.h>
-#include <math.h>
-
-
-
-/* double precision routine */
-static int
-WebRtcIsac_Fftradix (double Re[], double Im[],
-                    size_t nTotal, size_t nPass, size_t nSpan, int isign,
-                    int max_factors, unsigned int max_perm,
-                    FFTstr *fftstate);
-
-
-
-#ifndef M_PI
-# define M_PI 3.14159265358979323846264338327950288
-#endif
-
-#ifndef SIN60
-# define SIN60 0.86602540378443865 /* sin(60 deg) */
-# define COS72 0.30901699437494742 /* cos(72 deg) */
-# define SIN72 0.95105651629515357 /* sin(72 deg) */
-#endif
-
-# define REAL  double
-# define FFTN  WebRtcIsac_Fftn
-# define FFTNS  "fftn"
-# define FFTRADIX WebRtcIsac_Fftradix
-# define FFTRADIXS "fftradix"
-
-
-int  WebRtcIsac_Fftns(unsigned int ndim, const int dims[],
-                     double Re[],
-                     double Im[],
-                     int iSign,
-                     double scaling,
-                     FFTstr *fftstate)
-{
-
-  size_t nSpan, nPass, nTotal;
-  unsigned int i;
-  int ret, max_factors, max_perm;
-
-  /*
-   * tally the number of elements in the data array
-   * and determine the number of dimensions
-   */
-  nTotal = 1;
-  if (ndim && dims [0])
-  {
-    for (i = 0; i < ndim; i++)
-    {
-      if (dims [i] <= 0)
-      {
-        return -1;
-      }
-      nTotal *= dims [i];
-    }
-  }
-  else
-  {
-    ndim = 0;
-    for (i = 0; dims [i]; i++)
-    {
-      if (dims [i] <= 0)
-      {
-        return -1;
-      }
-      nTotal *= dims [i];
-      ndim++;
-    }
-  }
-
-  /* determine maximum number of factors and permuations */
-#if 1
-  /*
-   * follow John Beale's example, just use the largest dimension and don't
-   * worry about excess allocation.  May be someone else will do it?
-   */
-  max_factors = max_perm = 1;
-  for (i = 0; i < ndim; i++)
-  {
-    nSpan = dims [i];
-    if ((int)nSpan > max_factors)
-    {
-      max_factors = (int)nSpan;
-    }
-    if ((int)nSpan > max_perm)
-    {
-      max_perm = (int)nSpan;
-    }
-  }
-#else
-  /* use the constants used in the original Fortran code */
-  max_factors = 23;
-  max_perm = 209;
-#endif
-  /* loop over the dimensions: */
-  nPass = 1;
-  for (i = 0; i < ndim; i++)
-  {
-    nSpan = dims [i];
-    nPass *= nSpan;
-    ret = FFTRADIX (Re, Im, nTotal, nSpan, nPass, iSign,
-                    max_factors, max_perm, fftstate);
-    /* exit, clean-up already done */
-    if (ret)
-      return ret;
-  }
-
-  /* Divide through by the normalizing constant: */
-  if (scaling && scaling != 1.0)
-  {
-    if (iSign < 0) iSign = -iSign;
-    if (scaling < 0.0)
-    {
-      scaling = (double)nTotal;
-      if (scaling < -1.0)
-        scaling = sqrt (scaling);
-    }
-    scaling = 1.0 / scaling; /* multiply is often faster */
-    for (i = 0; i < nTotal; i += iSign)
-    {
-      Re [i] *= scaling;
-      Im [i] *= scaling;
-    }
-  }
-  return 0;
-}
-
-/*
- * singleton's mixed radix routine
- *
- * could move allocation out to WebRtcIsac_Fftn(), but leave it here so that it's
- * possible to make this a standalone function
- */
-
-static int   FFTRADIX (REAL Re[],
-                       REAL Im[],
-                       size_t nTotal,
-                       size_t nPass,
-                       size_t nSpan,
-                       int iSign,
-                       int max_factors,
-                       unsigned int max_perm,
-                       FFTstr *fftstate)
-{
-  int ii, mfactor, kspan, ispan, inc;
-  int j, jc, jf, jj, k, k1, k2, k3, k4, kk, kt, nn, ns, nt;
-
-
-  REAL radf;
-  REAL c1, c2, c3, cd, aa, aj, ak, ajm, ajp, akm, akp;
-  REAL s1, s2, s3, sd, bb, bj, bk, bjm, bjp, bkm, bkp;
-
-  REAL *Rtmp = NULL; /* temp space for real part*/
-  REAL *Itmp = NULL; /* temp space for imaginary part */
-  REAL *Cos = NULL; /* Cosine values */
-  REAL *Sin = NULL; /* Sine values */
-
-  REAL s60 = SIN60;  /* sin(60 deg) */
-  REAL c72 = COS72;  /* cos(72 deg) */
-  REAL s72 = SIN72;  /* sin(72 deg) */
-  REAL pi2 = M_PI;  /* use PI first, 2 PI later */
-
-
-  fftstate->SpaceAlloced = 0;
-  fftstate->MaxPermAlloced = 0;
-
-
-  // initialize to avoid warnings
-  k3 = c2 = c3 = s2 = s3 = 0.0;
-
-  if (nPass < 2)
-    return 0;
-
-  /*  allocate storage */
-  if (fftstate->SpaceAlloced < max_factors * sizeof (REAL))
-  {
-#ifdef SUN_BROKEN_REALLOC
-    if (!fftstate->SpaceAlloced) /* first time */
-    {
-      fftstate->SpaceAlloced = max_factors * sizeof (REAL);
-    }
-    else
-    {
-#endif
-      fftstate->SpaceAlloced = max_factors * sizeof (REAL);
-#ifdef SUN_BROKEN_REALLOC
-    }
-#endif
-  }
-  else
-  {
-    /* allow full use of alloc'd space */
-    max_factors = fftstate->SpaceAlloced / sizeof (REAL);
-  }
-  if (fftstate->MaxPermAlloced < max_perm)
-  {
-#ifdef SUN_BROKEN_REALLOC
-    if (!fftstate->MaxPermAlloced) /* first time */
-    else
-#endif
-      fftstate->MaxPermAlloced = max_perm;
-  }
-  else
-  {
-    /* allow full use of alloc'd space */
-    max_perm = fftstate->MaxPermAlloced;
-  }
-  if (fftstate->Tmp0 == NULL || fftstate->Tmp1 == NULL || fftstate->Tmp2 == NULL || fftstate->Tmp3 == NULL
-      || fftstate->Perm == NULL) {
-    return -1;
-  }
-
-  /* assign pointers */
-  Rtmp = (REAL *) fftstate->Tmp0;
-  Itmp = (REAL *) fftstate->Tmp1;
-  Cos  = (REAL *) fftstate->Tmp2;
-  Sin  = (REAL *) fftstate->Tmp3;
-
-  /*
-   * Function Body
-   */
-  inc = iSign;
-  if (iSign < 0) {
-    s72 = -s72;
-    s60 = -s60;
-    pi2 = -pi2;
-    inc = -inc;  /* absolute value */
-  }
-
-  /* adjust for strange increments */
-  nt = inc * (int)nTotal;
-  ns = inc * (int)nSpan;
-  kspan = ns;
-
-  nn = nt - inc;
-  jc = ns / (int)nPass;
-  radf = pi2 * (double) jc;
-  pi2 *= 2.0;   /* use 2 PI from here on */
-
-  ii = 0;
-  jf = 0;
-  /*  determine the factors of n */
-  mfactor = 0;
-  k = (int)nPass;
-  while (k % 16 == 0) {
-    mfactor++;
-    fftstate->factor [mfactor - 1] = 4;
-    k /= 16;
-  }
-  j = 3;
-  jj = 9;
-  do {
-    while (k % jj == 0) {
-      mfactor++;
-      fftstate->factor [mfactor - 1] = j;
-      k /= jj;
-    }
-    j += 2;
-    jj = j * j;
-  } while (jj <= k);
-  if (k <= 4) {
-    kt = mfactor;
-    fftstate->factor [mfactor] = k;
-    if (k != 1)
-      mfactor++;
-  } else {
-    if (k - (k / 4 << 2) == 0) {
-      mfactor++;
-      fftstate->factor [mfactor - 1] = 2;
-      k /= 4;
-    }
-    kt = mfactor;
-    j = 2;
-    do {
-      if (k % j == 0) {
-        mfactor++;
-        fftstate->factor [mfactor - 1] = j;
-        k /= j;
-      }
-      j = ((j + 1) / 2 << 1) + 1;
-    } while (j <= k);
-  }
-  if (kt) {
-    j = kt;
-    do {
-      mfactor++;
-      fftstate->factor [mfactor - 1] = fftstate->factor [j - 1];
-      j--;
-    } while (j);
-  }
-
-  /* test that mfactors is in range */
-  if (mfactor > NFACTOR)
-  {
-    return -1;
-  }
-
-  /* compute fourier transform */
-  for (;;) {
-    sd = radf / (double) kspan;
-    cd = sin(sd);
-    cd = 2.0 * cd * cd;
-    sd = sin(sd + sd);
-    kk = 0;
-    ii++;
-
-    switch (fftstate->factor [ii - 1]) {
-      case 2:
-        /* transform for factor of 2 (including rotation factor) */
-        kspan /= 2;
-        k1 = kspan + 2;
-        do {
-          do {
-            k2 = kk + kspan;
-            ak = Re [k2];
-            bk = Im [k2];
-            Re [k2] = Re [kk] - ak;
-            Im [k2] = Im [kk] - bk;
-            Re [kk] += ak;
-            Im [kk] += bk;
-            kk = k2 + kspan;
-          } while (kk < nn);
-          kk -= nn;
-        } while (kk < jc);
-        if (kk >= kspan)
-          goto Permute_Results_Label;  /* exit infinite loop */
-        do {
-          c1 = 1.0 - cd;
-          s1 = sd;
-          do {
-            do {
-              do {
-                k2 = kk + kspan;
-                ak = Re [kk] - Re [k2];
-                bk = Im [kk] - Im [k2];
-                Re [kk] += Re [k2];
-                Im [kk] += Im [k2];
-                Re [k2] = c1 * ak - s1 * bk;
-                Im [k2] = s1 * ak + c1 * bk;
-                kk = k2 + kspan;
-              } while (kk < (nt-1));
-              k2 = kk - nt;
-              c1 = -c1;
-              kk = k1 - k2;
-            } while (kk > k2);
-            ak = c1 - (cd * c1 + sd * s1);
-            s1 = sd * c1 - cd * s1 + s1;
-            c1 = 2.0 - (ak * ak + s1 * s1);
-            s1 *= c1;
-            c1 *= ak;
-            kk += jc;
-          } while (kk < k2);
-          k1 += inc + inc;
-          kk = (k1 - kspan + 1) / 2 + jc - 1;
-        } while (kk < (jc + jc));
-        break;
-
-      case 4:   /* transform for factor of 4 */
-        ispan = kspan;
-        kspan /= 4;
-
-        do {
-          c1 = 1.0;
-          s1 = 0.0;
-          do {
-            do {
-              k1 = kk + kspan;
-              k2 = k1 + kspan;
-              k3 = k2 + kspan;
-              akp = Re [kk] + Re [k2];
-              akm = Re [kk] - Re [k2];
-              ajp = Re [k1] + Re [k3];
-              ajm = Re [k1] - Re [k3];
-              bkp = Im [kk] + Im [k2];
-              bkm = Im [kk] - Im [k2];
-              bjp = Im [k1] + Im [k3];
-              bjm = Im [k1] - Im [k3];
-              Re [kk] = akp + ajp;
-              Im [kk] = bkp + bjp;
-              ajp = akp - ajp;
-              bjp = bkp - bjp;
-              if (iSign < 0) {
-                akp = akm + bjm;
-                bkp = bkm - ajm;
-                akm -= bjm;
-                bkm += ajm;
-              } else {
-                akp = akm - bjm;
-                bkp = bkm + ajm;
-                akm += bjm;
-                bkm -= ajm;
-              }
-              /* avoid useless multiplies */
-              if (s1 == 0.0) {
-                Re [k1] = akp;
-                Re [k2] = ajp;
-                Re [k3] = akm;
-                Im [k1] = bkp;
-                Im [k2] = bjp;
-                Im [k3] = bkm;
-              } else {
-                Re [k1] = akp * c1 - bkp * s1;
-                Re [k2] = ajp * c2 - bjp * s2;
-                Re [k3] = akm * c3 - bkm * s3;
-                Im [k1] = akp * s1 + bkp * c1;
-                Im [k2] = ajp * s2 + bjp * c2;
-                Im [k3] = akm * s3 + bkm * c3;
-              }
-              kk = k3 + kspan;
-            } while (kk < nt);
-
-            c2 = c1 - (cd * c1 + sd * s1);
-            s1 = sd * c1 - cd * s1 + s1;
-            c1 = 2.0 - (c2 * c2 + s1 * s1);
-            s1 *= c1;
-            c1 *= c2;
-            /* values of c2, c3, s2, s3 that will get used next time */
-            c2 = c1 * c1 - s1 * s1;
-            s2 = 2.0 * c1 * s1;
-            c3 = c2 * c1 - s2 * s1;
-            s3 = c2 * s1 + s2 * c1;
-            kk = kk - nt + jc;
-          } while (kk < kspan);
-          kk = kk - kspan + inc;
-        } while (kk < jc);
-        if (kspan == jc)
-          goto Permute_Results_Label;  /* exit infinite loop */
-        break;
-
-      default:
-        /*  transform for odd factors */
-#ifdef FFT_RADIX4
-        return -1;
-        break;
-#else /* FFT_RADIX4 */
-        k = fftstate->factor [ii - 1];
-        ispan = kspan;
-        kspan /= k;
-
-        switch (k) {
-          case 3: /* transform for factor of 3 (optional code) */
-            do {
-              do {
-                k1 = kk + kspan;
-                k2 = k1 + kspan;
-                ak = Re [kk];
-                bk = Im [kk];
-                aj = Re [k1] + Re [k2];
-                bj = Im [k1] + Im [k2];
-                Re [kk] = ak + aj;
-                Im [kk] = bk + bj;
-                ak -= 0.5 * aj;
-                bk -= 0.5 * bj;
-                aj = (Re [k1] - Re [k2]) * s60;
-                bj = (Im [k1] - Im [k2]) * s60;
-                Re [k1] = ak - bj;
-                Re [k2] = ak + bj;
-                Im [k1] = bk + aj;
-                Im [k2] = bk - aj;
-                kk = k2 + kspan;
-              } while (kk < (nn - 1));
-              kk -= nn;
-            } while (kk < kspan);
-            break;
-
-          case 5: /*  transform for factor of 5 (optional code) */
-            c2 = c72 * c72 - s72 * s72;
-            s2 = 2.0 * c72 * s72;
-            do {
-              do {
-                k1 = kk + kspan;
-                k2 = k1 + kspan;
-                k3 = k2 + kspan;
-                k4 = k3 + kspan;
-                akp = Re [k1] + Re [k4];
-                akm = Re [k1] - Re [k4];
-                bkp = Im [k1] + Im [k4];
-                bkm = Im [k1] - Im [k4];
-                ajp = Re [k2] + Re [k3];
-                ajm = Re [k2] - Re [k3];
-                bjp = Im [k2] + Im [k3];
-                bjm = Im [k2] - Im [k3];
-                aa = Re [kk];
-                bb = Im [kk];
-                Re [kk] = aa + akp + ajp;
-                Im [kk] = bb + bkp + bjp;
-                ak = akp * c72 + ajp * c2 + aa;
-                bk = bkp * c72 + bjp * c2 + bb;
-                aj = akm * s72 + ajm * s2;
-                bj = bkm * s72 + bjm * s2;
-                Re [k1] = ak - bj;
-                Re [k4] = ak + bj;
-                Im [k1] = bk + aj;
-                Im [k4] = bk - aj;
-                ak = akp * c2 + ajp * c72 + aa;
-                bk = bkp * c2 + bjp * c72 + bb;
-                aj = akm * s2 - ajm * s72;
-                bj = bkm * s2 - bjm * s72;
-                Re [k2] = ak - bj;
-                Re [k3] = ak + bj;
-                Im [k2] = bk + aj;
-                Im [k3] = bk - aj;
-                kk = k4 + kspan;
-              } while (kk < (nn-1));
-              kk -= nn;
-            } while (kk < kspan);
-            break;
-
-          default:
-            if (k != jf) {
-              jf = k;
-              s1 = pi2 / (double) k;
-              c1 = cos(s1);
-              s1 = sin(s1);
-              if (jf > max_factors){
-                return -1;
-              }
-              Cos [jf - 1] = 1.0;
-              Sin [jf - 1] = 0.0;
-              j = 1;
-              do {
-                Cos [j - 1] = Cos [k - 1] * c1 + Sin [k - 1] * s1;
-                Sin [j - 1] = Cos [k - 1] * s1 - Sin [k - 1] * c1;
-                k--;
-                Cos [k - 1] = Cos [j - 1];
-                Sin [k - 1] = -Sin [j - 1];
-                j++;
-              } while (j < k);
-            }
-            do {
-              do {
-                k1 = kk;
-                k2 = kk + ispan;
-                ak = aa = Re [kk];
-                bk = bb = Im [kk];
-                j = 1;
-                k1 += kspan;
-                do {
-                  k2 -= kspan;
-                  j++;
-                  Rtmp [j - 1] = Re [k1] + Re [k2];
-                  ak += Rtmp [j - 1];
-                  Itmp [j - 1] = Im [k1] + Im [k2];
-                  bk += Itmp [j - 1];
-                  j++;
-                  Rtmp [j - 1] = Re [k1] - Re [k2];
-                  Itmp [j - 1] = Im [k1] - Im [k2];
-                  k1 += kspan;
-                } while (k1 < k2);
-                Re [kk] = ak;
-                Im [kk] = bk;
-                k1 = kk;
-                k2 = kk + ispan;
-                j = 1;
-                do {
-                  k1 += kspan;
-                  k2 -= kspan;
-                  jj = j;
-                  ak = aa;
-                  bk = bb;
-                  aj = 0.0;
-                  bj = 0.0;
-                  k = 1;
-                  do {
-                    k++;
-                    ak += Rtmp [k - 1] * Cos [jj - 1];
-                    bk += Itmp [k - 1] * Cos [jj - 1];
-                    k++;
-                    aj += Rtmp [k - 1] * Sin [jj - 1];
-                    bj += Itmp [k - 1] * Sin [jj - 1];
-                    jj += j;
-                    if (jj > jf) {
-                      jj -= jf;
-                    }
-                  } while (k < jf);
-                  k = jf - j;
-                  Re [k1] = ak - bj;
-                  Im [k1] = bk + aj;
-                  Re [k2] = ak + bj;
-                  Im [k2] = bk - aj;
-                  j++;
-                } while (j < k);
-                kk += ispan;
-              } while (kk < nn);
-              kk -= nn;
-            } while (kk < kspan);
-            break;
-        }
-
-        /*  multiply by rotation factor (except for factors of 2 and 4) */
-        if (ii == mfactor)
-          goto Permute_Results_Label;  /* exit infinite loop */
-        kk = jc;
-        do {
-          c2 = 1.0 - cd;
-          s1 = sd;
-          do {
-            c1 = c2;
-            s2 = s1;
-            kk += kspan;
-            do {
-              do {
-                ak = Re [kk];
-                Re [kk] = c2 * ak - s2 * Im [kk];
-                Im [kk] = s2 * ak + c2 * Im [kk];
-                kk += ispan;
-              } while (kk < nt);
-              ak = s1 * s2;
-              s2 = s1 * c2 + c1 * s2;
-              c2 = c1 * c2 - ak;
-              kk = kk - nt + kspan;
-            } while (kk < ispan);
-            c2 = c1 - (cd * c1 + sd * s1);
-            s1 += sd * c1 - cd * s1;
-            c1 = 2.0 - (c2 * c2 + s1 * s1);
-            s1 *= c1;
-            c2 *= c1;
-            kk = kk - ispan + jc;
-          } while (kk < kspan);
-          kk = kk - kspan + jc + inc;
-        } while (kk < (jc + jc));
-        break;
-#endif /* FFT_RADIX4 */
-    }
-  }
-
-  /*  permute the results to normal order---done in two stages */
-  /*  permutation for square factors of n */
-Permute_Results_Label:
-  fftstate->Perm [0] = ns;
-  if (kt) {
-    k = kt + kt + 1;
-    if (mfactor < k)
-      k--;
-    j = 1;
-    fftstate->Perm [k] = jc;
-    do {
-      fftstate->Perm [j] = fftstate->Perm [j - 1] / fftstate->factor [j - 1];
-      fftstate->Perm [k - 1] = fftstate->Perm [k] * fftstate->factor [j - 1];
-      j++;
-      k--;
-    } while (j < k);
-    k3 = fftstate->Perm [k];
-    kspan = fftstate->Perm [1];
-    kk = jc;
-    k2 = kspan;
-    j = 1;
-    if (nPass != nTotal) {
-      /*  permutation for multivariate transform */
-   Permute_Multi_Label:
-      do {
-        do {
-          k = kk + jc;
-          do {
-            /* swap Re [kk] <> Re [k2], Im [kk] <> Im [k2] */
-            ak = Re [kk]; Re [kk] = Re [k2]; Re [k2] = ak;
-            bk = Im [kk]; Im [kk] = Im [k2]; Im [k2] = bk;
-            kk += inc;
-            k2 += inc;
-          } while (kk < (k-1));
-          kk += ns - jc;
-          k2 += ns - jc;
-        } while (kk < (nt-1));
-        k2 = k2 - nt + kspan;
-        kk = kk - nt + jc;
-      } while (k2 < (ns-1));
-      do {
-        do {
-          k2 -= fftstate->Perm [j - 1];
-          j++;
-          k2 = fftstate->Perm [j] + k2;
-        } while (k2 > fftstate->Perm [j - 1]);
-        j = 1;
-        do {
-          if (kk < (k2-1))
-            goto Permute_Multi_Label;
-          kk += jc;
-          k2 += kspan;
-        } while (k2 < (ns-1));
-      } while (kk < (ns-1));
-    } else {
-      /*  permutation for single-variate transform (optional code) */
-   Permute_Single_Label:
-      do {
-        /* swap Re [kk] <> Re [k2], Im [kk] <> Im [k2] */
-        ak = Re [kk]; Re [kk] = Re [k2]; Re [k2] = ak;
-        bk = Im [kk]; Im [kk] = Im [k2]; Im [k2] = bk;
-        kk += inc;
-        k2 += kspan;
-      } while (k2 < (ns-1));
-      do {
-        do {
-          k2 -= fftstate->Perm [j - 1];
-          j++;
-          k2 = fftstate->Perm [j] + k2;
-        } while (k2 >= fftstate->Perm [j - 1]);
-        j = 1;
-        do {
-          if (kk < k2)
-            goto Permute_Single_Label;
-          kk += inc;
-          k2 += kspan;
-        } while (k2 < (ns-1));
-      } while (kk < (ns-1));
-    }
-    jc = k3;
-  }
-
-  if ((kt << 1) + 1 >= mfactor)
-    return 0;
-  ispan = fftstate->Perm [kt];
-  /* permutation for square-free factors of n */
-  j = mfactor - kt;
-  fftstate->factor [j] = 1;
-  do {
-    fftstate->factor [j - 1] *= fftstate->factor [j];
-    j--;
-  } while (j != kt);
-  kt++;
-  nn = fftstate->factor [kt - 1] - 1;
-  if (nn > (int) max_perm) {
-    return -1;
-  }
-  j = jj = 0;
-  for (;;) {
-    k = kt + 1;
-    k2 = fftstate->factor [kt - 1];
-    kk = fftstate->factor [k - 1];
-    j++;
-    if (j > nn)
-      break;    /* exit infinite loop */
-    jj += kk;
-    while (jj >= k2) {
-      jj -= k2;
-      k2 = kk;
-      k++;
-      kk = fftstate->factor [k - 1];
-      jj += kk;
-    }
-    fftstate->Perm [j - 1] = jj;
-  }
-  /*  determine the permutation cycles of length greater than 1 */
-  j = 0;
-  for (;;) {
-    do {
-      j++;
-      kk = fftstate->Perm [j - 1];
-    } while (kk < 0);
-    if (kk != j) {
-      do {
-        k = kk;
-        kk = fftstate->Perm [k - 1];
-        fftstate->Perm [k - 1] = -kk;
-      } while (kk != j);
-      k3 = kk;
-    } else {
-      fftstate->Perm [j - 1] = -j;
-      if (j == nn)
-        break;  /* exit infinite loop */
-    }
-  }
-  max_factors *= inc;
-  /*  reorder a and b, following the permutation cycles */
-  for (;;) {
-    j = k3 + 1;
-    nt -= ispan;
-    ii = nt - inc + 1;
-    if (nt < 0)
-      break;   /* exit infinite loop */
-    do {
-      do {
-        j--;
-      } while (fftstate->Perm [j - 1] < 0);
-      jj = jc;
-      do {
-        kspan = jj;
-        if (jj > max_factors) {
-          kspan = max_factors;
-        }
-        jj -= kspan;
-        k = fftstate->Perm [j - 1];
-        kk = jc * k + ii + jj;
-        k1 = kk + kspan - 1;
-        k2 = 0;
-        do {
-          k2++;
-          Rtmp [k2 - 1] = Re [k1];
-          Itmp [k2 - 1] = Im [k1];
-          k1 -= inc;
-        } while (k1 != (kk-1));
-        do {
-          k1 = kk + kspan - 1;
-          k2 = k1 - jc * (k + fftstate->Perm [k - 1]);
-          k = -fftstate->Perm [k - 1];
-          do {
-            Re [k1] = Re [k2];
-            Im [k1] = Im [k2];
-            k1 -= inc;
-            k2 -= inc;
-          } while (k1 != (kk-1));
-          kk = k2 + 1;
-        } while (k != j);
-        k1 = kk + kspan - 1;
-        k2 = 0;
-        do {
-          k2++;
-          Re [k1] = Rtmp [k2 - 1];
-          Im [k1] = Itmp [k2 - 1];
-          k1 -= inc;
-        } while (k1 != (kk-1));
-      } while (jj);
-    } while (j != 1);
-  }
-  return 0;   /* exit point here */
-}
-/* ---------------------- end-of-file (c source) ---------------------- */
-
diff --git a/src/mod/codecs/mod_isac/fft.h b/src/mod/codecs/mod_isac/fft.h
deleted file mode 100644
index a42f57bcb5..0000000000
--- a/src/mod/codecs/mod_isac/fft.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*--------------------------------*-C-*---------------------------------*
- * File:
- *       fftn.h
- * ---------------------------------------------------------------------*
- * Re[]:        real value array
- * Im[]:        imaginary value array
- * nTotal:      total number of complex values
- * nPass:       number of elements involved in this pass of transform
- * nSpan:       nspan/nPass = number of bytes to increment pointer
- *              in Re[] and Im[]
- * isign: exponent: +1 = forward  -1 = reverse
- * scaling: normalizing constant by which the final result is *divided*
- * scaling == -1, normalize by total dimension of the transform
- * scaling <  -1, normalize by the square-root of the total dimension
- *
- * ----------------------------------------------------------------------
- * See the comments in the code for correct usage!
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FFT_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FFT_H_
-
-
-#include "structs.h"
-
-
-/* double precision routine */
-
-
-int WebRtcIsac_Fftns (unsigned int ndim, const int dims[], double Re[], double Im[],
-                     int isign, double scaling, FFTstr *fftstate);
-
-
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FFT_H_ */
diff --git a/src/mod/codecs/mod_isac/filter_ar.c b/src/mod/codecs/mod_isac/filter_ar.c
deleted file mode 100644
index 24e83a6b91..0000000000
--- a/src/mod/codecs/mod_isac/filter_ar.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_FilterAR().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-int WebRtcSpl_FilterAR(G_CONST WebRtc_Word16* a,
-                       int a_length,
-                       G_CONST WebRtc_Word16* x,
-                       int x_length,
-                       WebRtc_Word16* state,
-                       int state_length,
-                       WebRtc_Word16* state_low,
-                       int state_low_length,
-                       WebRtc_Word16* filtered,
-                       WebRtc_Word16* filtered_low,
-                       int filtered_low_length)
-{
-    WebRtc_Word32 o;
-    WebRtc_Word32 oLOW;
-    int i, j, stop;
-    G_CONST WebRtc_Word16* x_ptr = &x[0];
-    WebRtc_Word16* filteredFINAL_ptr = filtered;
-    WebRtc_Word16* filteredFINAL_LOW_ptr = filtered_low;
-
-    for (i = 0; i < x_length; i++)
-    {
-        // Calculate filtered[i] and filtered_low[i]
-        G_CONST WebRtc_Word16* a_ptr = &a[1];
-        WebRtc_Word16* filtered_ptr = &filtered[i - 1];
-        WebRtc_Word16* filtered_low_ptr = &filtered_low[i - 1];
-        WebRtc_Word16* state_ptr = &state[state_length - 1];
-        WebRtc_Word16* state_low_ptr = &state_low[state_length - 1];
-
-        o = (WebRtc_Word32)(*x_ptr++) << 12;
-        oLOW = (WebRtc_Word32)0;
-
-        stop = (i < a_length) ? i + 1 : a_length;
-        for (j = 1; j < stop; j++)
-        {
-            o -= WEBRTC_SPL_MUL_16_16(*a_ptr, *filtered_ptr--);
-            oLOW -= WEBRTC_SPL_MUL_16_16(*a_ptr++, *filtered_low_ptr--);
-        }
-        for (j = i + 1; j < a_length; j++)
-        {
-            o -= WEBRTC_SPL_MUL_16_16(*a_ptr, *state_ptr--);
-            oLOW -= WEBRTC_SPL_MUL_16_16(*a_ptr++, *state_low_ptr--);
-        }
-
-        o += (oLOW >> 12);
-        *filteredFINAL_ptr = (WebRtc_Word16)((o + (WebRtc_Word32)2048) >> 12);
-        *filteredFINAL_LOW_ptr++ = (WebRtc_Word16)(o - ((WebRtc_Word32)(*filteredFINAL_ptr++)
-                << 12));
-    }
-
-    // Save the filter state
-    if (x_length >= state_length)
-    {
-        WebRtcSpl_CopyFromEndW16(filtered, x_length, a_length - 1, state);
-        WebRtcSpl_CopyFromEndW16(filtered_low, x_length, a_length - 1, state_low);
-    } else
-    {
-        for (i = 0; i < state_length - x_length; i++)
-        {
-            state[i] = state[i + x_length];
-            state_low[i] = state_low[i + x_length];
-        }
-        for (i = 0; i < x_length; i++)
-        {
-            state[state_length - x_length + i] = filtered[i];
-            state[state_length - x_length + i] = filtered_low[i];
-        }
-    }
-
-    return x_length;
-}
diff --git a/src/mod/codecs/mod_isac/filter_ar_fast_q12.c b/src/mod/codecs/mod_isac/filter_ar_fast_q12.c
deleted file mode 100644
index 6184da3f4c..0000000000
--- a/src/mod/codecs/mod_isac/filter_ar_fast_q12.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_FilterARFastQ12().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-void WebRtcSpl_FilterARFastQ12(WebRtc_Word16 *in, WebRtc_Word16 *out, WebRtc_Word16 *A,
-                               WebRtc_Word16 A_length, WebRtc_Word16 length)
-{
-    WebRtc_Word32 o;
-    int i, j;
-
-    WebRtc_Word16 *x_ptr = &in[0];
-    WebRtc_Word16 *filtered_ptr = &out[0];
-
-    for (i = 0; i < length; i++)
-    {
-        // Calculate filtered[i]
-        G_CONST WebRtc_Word16 *a_ptr = &A[0];
-        WebRtc_Word16 *state_ptr = &out[i - 1];
-
-        o = WEBRTC_SPL_MUL_16_16(*x_ptr++, *a_ptr++);
-
-        for (j = 1; j < A_length; j++)
-        {
-            o -= WEBRTC_SPL_MUL_16_16(*a_ptr++,*state_ptr--);
-        }
-
-        // Saturate the output
-        o = WEBRTC_SPL_SAT((WebRtc_Word32)134215679, o, (WebRtc_Word32)-134217728);
-
-        *filtered_ptr++ = (WebRtc_Word16)((o + (WebRtc_Word32)2048) >> 12);
-    }
-
-    return;
-}
diff --git a/src/mod/codecs/mod_isac/filter_functions.c b/src/mod/codecs/mod_isac/filter_functions.c
deleted file mode 100644
index 33024a3dee..0000000000
--- a/src/mod/codecs/mod_isac/filter_functions.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <memory.h>
-#ifdef WEBRTC_ANDROID
-#include <stdlib.h>
-#endif
-#include "pitch_estimator.h"
-#include "lpc_analysis.h"
-#include "codec.h"
-
-
-
-void WebRtcIsac_AllPoleFilter(double *InOut, double *Coef, int lengthInOut, int orderCoef){
-
-  /* the state of filter is assumed to be in InOut[-1] to InOut[-orderCoef] */
-  double scal;
-  double sum;
-  int n,k;
-
-  //if (fabs(Coef[0]-1.0)<0.001) {
-  if ( (Coef[0] > 0.9999) && (Coef[0] < 1.0001) )
-  {
-    for(n = 0; n < lengthInOut; n++)
-    {
-      sum = Coef[1] * InOut[-1];
-      for(k = 2; k <= orderCoef; k++){
-        sum += Coef[k] * InOut[-k];
-      }
-      *InOut++ -= sum;
-    }
-  }
-  else
-  {
-    scal = 1.0 / Coef[0];
-    for(n=0;n<lengthInOut;n++)
-    {
-      *InOut *= scal;
-      for(k=1;k<=orderCoef;k++){
-        *InOut -= scal*Coef[k]*InOut[-k];
-      }
-      InOut++;
-    }
-  }
-}
-
-
-void WebRtcIsac_AllZeroFilter(double *In, double *Coef, int lengthInOut, int orderCoef, double *Out){
-
-  /* the state of filter is assumed to be in In[-1] to In[-orderCoef] */
-
-  int n, k;
-  double tmp;
-
-  for(n = 0; n < lengthInOut; n++)
-  {
-    tmp = In[0] * Coef[0];
-
-    for(k = 1; k <= orderCoef; k++){
-      tmp += Coef[k] * In[-k];
-    }
-
-    *Out++ = tmp;
-    In++;
-  }
-}
-
-
-
-void WebRtcIsac_ZeroPoleFilter(double *In, double *ZeroCoef, double *PoleCoef, int lengthInOut, int orderCoef, double *Out){
-
-  /* the state of the zero section is assumed to be in In[-1] to In[-orderCoef] */
-  /* the state of the pole section is assumed to be in Out[-1] to Out[-orderCoef] */
-
-  WebRtcIsac_AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out);
-  WebRtcIsac_AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef);
-}
-
-
-void WebRtcIsac_AutoCorr(
-    double *r,
-    const double *x,
-    int N,
-    int order
-                        )
-{
-  int  lag, n;
-  double sum, prod;
-  const double *x_lag;
-
-  for (lag = 0; lag <= order; lag++)
-  {
-    sum = 0.0f;
-    x_lag = &x[lag];
-    prod = x[0] * x_lag[0];
-    for (n = 1; n < N - lag; n++) {
-      sum += prod;
-      prod = x[n] * x_lag[n];
-    }
-    sum += prod;
-    r[lag] = sum;
-  }
-
-}
-
-
-void WebRtcIsac_BwExpand(double *out, double *in, double coef, short length) {
-  int i;
-  double  chirp;
-
-  chirp = coef;
-
-  out[0] = in[0];
-  for (i = 1; i < length; i++) {
-    out[i] = chirp * in[i];
-    chirp *= coef;
-  }
-}
-
-void WebRtcIsac_WeightingFilter(const double *in, double *weiout, double *whiout, WeightFiltstr *wfdata) {
-
-  double  tmpbuffer[PITCH_FRAME_LEN + PITCH_WLPCBUFLEN];
-  double  corr[PITCH_WLPCORDER+1], rc[PITCH_WLPCORDER+1];
-  double apol[PITCH_WLPCORDER+1], apolr[PITCH_WLPCORDER+1];
-  double  rho=0.9, *inp, *dp, *dp2;
-  double  whoutbuf[PITCH_WLPCBUFLEN + PITCH_WLPCORDER];
-  double  weoutbuf[PITCH_WLPCBUFLEN + PITCH_WLPCORDER];
-  double  *weo, *who, opol[PITCH_WLPCORDER+1], ext[PITCH_WLPCWINLEN];
-  int     k, n, endpos, start;
-
-  /* Set up buffer and states */
-  memcpy(tmpbuffer, wfdata->buffer, sizeof(double) * PITCH_WLPCBUFLEN);
-  memcpy(tmpbuffer+PITCH_WLPCBUFLEN, in, sizeof(double) * PITCH_FRAME_LEN);
-  memcpy(wfdata->buffer, tmpbuffer+PITCH_FRAME_LEN, sizeof(double) * PITCH_WLPCBUFLEN);
-
-  dp=weoutbuf;
-  dp2=whoutbuf;
-  for (k=0;k<PITCH_WLPCORDER;k++) {
-    *dp++ = wfdata->weostate[k];
-    *dp2++ = wfdata->whostate[k];
-    opol[k]=0.0;
-  }
-  opol[0]=1.0;
-  opol[PITCH_WLPCORDER]=0.0;
-  weo=dp;
-  who=dp2;
-
-  endpos=PITCH_WLPCBUFLEN + PITCH_SUBFRAME_LEN;
-  inp=tmpbuffer + PITCH_WLPCBUFLEN;
-
-  for (n=0; n<PITCH_SUBFRAMES; n++) {
-    /* Windowing */
-    start=endpos-PITCH_WLPCWINLEN;
-    for (k=0; k<PITCH_WLPCWINLEN; k++) {
-      ext[k]=wfdata->window[k]*tmpbuffer[start+k];
-    }
-
-    /* Get LPC polynomial */
-    WebRtcIsac_AutoCorr(corr, ext, PITCH_WLPCWINLEN, PITCH_WLPCORDER);
-    corr[0]=1.01*corr[0]+1.0; /* White noise correction */
-    WebRtcIsac_LevDurb(apol, rc, corr, PITCH_WLPCORDER);
-    WebRtcIsac_BwExpand(apolr, apol, rho, PITCH_WLPCORDER+1);
-
-    /* Filtering */
-    WebRtcIsac_ZeroPoleFilter(inp, apol, apolr, PITCH_SUBFRAME_LEN, PITCH_WLPCORDER, weo);
-    WebRtcIsac_ZeroPoleFilter(inp, apolr, opol, PITCH_SUBFRAME_LEN, PITCH_WLPCORDER, who);
-
-    inp+=PITCH_SUBFRAME_LEN;
-    endpos+=PITCH_SUBFRAME_LEN;
-    weo+=PITCH_SUBFRAME_LEN;
-    who+=PITCH_SUBFRAME_LEN;
-  }
-
-  /* Export filter states */
-  for (k=0;k<PITCH_WLPCORDER;k++) {
-    wfdata->weostate[k]=weoutbuf[PITCH_FRAME_LEN+k];
-    wfdata->whostate[k]=whoutbuf[PITCH_FRAME_LEN+k];
-  }
-
-  /* Export output data */
-  memcpy(weiout, weoutbuf+PITCH_WLPCORDER, sizeof(double) * PITCH_FRAME_LEN);
-  memcpy(whiout, whoutbuf+PITCH_WLPCORDER, sizeof(double) * PITCH_FRAME_LEN);
-}
-
-
-static const double APupper[ALLPASSSECTIONS] = {0.0347, 0.3826};
-static const double APlower[ALLPASSSECTIONS] = {0.1544, 0.744};
-
-
-
-void WebRtcIsac_AllpassFilterForDec(double *InOut,
-                                   const double *APSectionFactors,
-                                   int lengthInOut,
-                                   double *FilterState)
-{
-  //This performs all-pass filtering--a series of first order all-pass sections are used
-  //to filter the input in a cascade manner.
-  int n,j;
-  double temp;
-  for (j=0; j<ALLPASSSECTIONS; j++){
-    for (n=0;n<lengthInOut;n+=2){
-      temp = InOut[n]; //store input
-      InOut[n] = FilterState[j] + APSectionFactors[j]*temp;
-      FilterState[j] = -APSectionFactors[j]*InOut[n] + temp;
-    }
-  }
-}
-
-void WebRtcIsac_DecimateAllpass(const double *in,
-                                double *state_in,        /* array of size: 2*ALLPASSSECTIONS+1 */
-                                int N,                   /* number of input samples */
-                                double *out)             /* array of size N/2 */
-{
-  int n;
-  double data_vec[PITCH_FRAME_LEN];
-
-  /* copy input */
-  memcpy(data_vec+1, in, sizeof(double) * (N-1));
-
-  data_vec[0] = state_in[2*ALLPASSSECTIONS];   //the z^(-1) state
-  state_in[2*ALLPASSSECTIONS] = in[N-1];
-
-  WebRtcIsac_AllpassFilterForDec(data_vec+1, APupper, N, state_in);
-  WebRtcIsac_AllpassFilterForDec(data_vec, APlower, N, state_in+ALLPASSSECTIONS);
-
-  for (n=0;n<N/2;n++)
-    out[n] = data_vec[2*n] + data_vec[2*n+1];
-
-}
-
-
-
-/* create high-pass filter ocefficients
- * z = 0.998 * exp(j*2*pi*35/8000);
- * p = 0.94 * exp(j*2*pi*140/8000);
- * HP_b = [1, -2*real(z), abs(z)^2];
- * HP_a = [1, -2*real(p), abs(p)^2]; */
-static const double a_coef[2] = { 1.86864659625574, -0.88360000000000};
-static const double b_coef[2] = {-1.99524591718270,  0.99600400000000};
-static const float a_coef_float[2] = { 1.86864659625574f, -0.88360000000000f};
-static const float b_coef_float[2] = {-1.99524591718270f,  0.99600400000000f};
-
-/* second order high-pass filter */
-void WebRtcIsac_Highpass(const double *in, double *out, double *state, int N)
-{
-  int k;
-
-  for (k=0; k<N; k++) {
-    *out = *in + state[1];
-    state[1] = state[0] + b_coef[0] * *in + a_coef[0] * *out;
-    state[0] = b_coef[1] * *in++ + a_coef[1] * *out++;
-  }
-}
-
-void WebRtcIsac_Highpass_float(const float *in, double *out, double *state, int N)
-{
-  int k;
-
-  for (k=0; k<N; k++) {
-    *out = (double)*in + state[1];
-    state[1] = state[0] + b_coef_float[0] * *in + a_coef_float[0] * *out;
-    state[0] = b_coef_float[1] * (double)*in++ + a_coef_float[1] * *out++;
-  }
-}
diff --git a/src/mod/codecs/mod_isac/filter_ma_fast_q12.c b/src/mod/codecs/mod_isac/filter_ma_fast_q12.c
deleted file mode 100644
index 19ad9b166d..0000000000
--- a/src/mod/codecs/mod_isac/filter_ma_fast_q12.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_FilterMAFastQ12().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-void WebRtcSpl_FilterMAFastQ12(WebRtc_Word16* in_ptr,
-                               WebRtc_Word16* out_ptr,
-                               WebRtc_Word16* B,
-                               WebRtc_Word16 B_length,
-                               WebRtc_Word16 length)
-{
-    WebRtc_Word32 o;
-    int i, j;
-    for (i = 0; i < length; i++)
-    {
-        G_CONST WebRtc_Word16* b_ptr = &B[0];
-        G_CONST WebRtc_Word16* x_ptr = &in_ptr[i];
-
-        o = (WebRtc_Word32)0;
-
-        for (j = 0; j < B_length; j++)
-        {
-            o += WEBRTC_SPL_MUL_16_16(*b_ptr++, *x_ptr--);
-        }
-
-        // If output is higher than 32768, saturate it. Same with negative side
-        // 2^27 = 134217728, which corresponds to 32768 in Q12
-
-        // Saturate the output
-        o = WEBRTC_SPL_SAT((WebRtc_Word32)134215679, o, (WebRtc_Word32)-134217728);
-
-        *out_ptr++ = (WebRtc_Word16)((o + (WebRtc_Word32)2048) >> 12);
-    }
-    return;
-}
diff --git a/src/mod/codecs/mod_isac/filterbank_tables.c b/src/mod/codecs/mod_isac/filterbank_tables.c
deleted file mode 100644
index 0f844af9d2..0000000000
--- a/src/mod/codecs/mod_isac/filterbank_tables.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* filterbank_tables.c*/
-/* This file contains variables that are used in filterbanks.c*/
-
-#include "filterbank_tables.h"
-#include "settings.h"
-
-/* The composite all-pass filter factors */
-const float WebRtcIsac_kCompositeApFactorsFloat[4] = {
- 0.03470000000000f,  0.15440000000000f,  0.38260000000000f,  0.74400000000000f};
-
-/* The upper channel all-pass filter factors */
-const float WebRtcIsac_kUpperApFactorsFloat[2] = {
- 0.03470000000000f,  0.38260000000000f};
-
-/* The lower channel all-pass filter factors */
-const float WebRtcIsac_kLowerApFactorsFloat[2] = {
- 0.15440000000000f,  0.74400000000000f};
-
-/* The matrix for transforming the backward composite state to upper channel state */
-const float WebRtcIsac_kTransform1Float[8] = {
-  -0.00158678506084f,  0.00127157815343f, -0.00104805672709f,  0.00084837248079f,
-  0.00134467983258f, -0.00107756549387f,  0.00088814793277f, -0.00071893072525f};
-
-/* The matrix for transforming the backward composite state to lower channel state */
-const float WebRtcIsac_kTransform2Float[8] = {
- -0.00170686041697f,  0.00136780109829f, -0.00112736532350f,  0.00091257055385f,
-  0.00103094281812f, -0.00082615076557f,  0.00068092756088f, -0.00055119165484f};
diff --git a/src/mod/codecs/mod_isac/filterbank_tables.h b/src/mod/codecs/mod_isac/filterbank_tables.h
deleted file mode 100644
index e8fda5e545..0000000000
--- a/src/mod/codecs/mod_isac/filterbank_tables.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * filterbank_tables.h
- *
- * Header file for variables that are defined in
- * filterbank_tables.c.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTERBANK_TABLES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTERBANK_TABLES_H_
-
-#include "structs.h"
-
-/********************* Coefficient Tables ************************/
-/* The number of composite all-pass filter factors */
-#define NUMBEROFCOMPOSITEAPSECTIONS 4
-
-/* The number of all-pass filter factors in an upper or lower channel*/
-#define NUMBEROFCHANNELAPSECTIONS 2
-
-/* The composite all-pass filter factors */
-extern const float WebRtcIsac_kCompositeApFactorsFloat[4];
-
-/* The upper channel all-pass filter factors */
-extern const float WebRtcIsac_kUpperApFactorsFloat[2];
-
-/* The lower channel all-pass filter factors */
-extern const float WebRtcIsac_kLowerApFactorsFloat[2];
-
-/* The matrix for transforming the backward composite state to upper channel state */
-extern const float WebRtcIsac_kTransform1Float[8];
-
-/* The matrix for transforming the backward composite state to lower channel state */
-extern const float WebRtcIsac_kTransform2Float[8];
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTERBANK_TABLES_H_ */
diff --git a/src/mod/codecs/mod_isac/filterbanks.c b/src/mod/codecs/mod_isac/filterbanks.c
deleted file mode 100644
index 671fd321ce..0000000000
--- a/src/mod/codecs/mod_isac/filterbanks.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * filterbanks.c
- *
- * This file contains function WebRtcIsac_AllPassFilter2Float,
- * WebRtcIsac_SplitAndFilter, and WebRtcIsac_FilterAndCombine
- * which implement filterbanks that produce decimated lowpass and
- * highpass versions of a signal, and performs reconstruction.
- *
- */
-
-#include "settings.h"
-#include "filterbank_tables.h"
-#include "codec.h"
-
-/* This function performs all-pass filtering--a series of first order all-pass
- * sections are used to filter the input in a cascade manner.
- * The input is overwritten!!
- */
-static void WebRtcIsac_AllPassFilter2Float(float *InOut, const float *APSectionFactors,
-                                           int lengthInOut, int NumberOfSections,
-                                           float *FilterState)
-{
-  int n, j;
-  float temp;
-  for (j=0; j<NumberOfSections; j++){
-    for (n=0;n<lengthInOut;n++){
-      temp = FilterState[j] + APSectionFactors[j] * InOut[n];
-      FilterState[j] = -APSectionFactors[j] * temp + InOut[n];
-      InOut[n] = temp;
-    }
-  }
-}
-
-/* HPstcoeff_in = {a1, a2, b1 - b0 * a1, b2 - b0 * a2}; */
-static const float kHpStCoefInFloat[4] =
-{-1.94895953203325f, 0.94984516000000f, -0.05101826139794f, 0.05015484000000f};
-
-/* Function WebRtcIsac_SplitAndFilter
- * This function creates low-pass and high-pass decimated versions of part of
- the input signal, and part of the signal in the input 'lookahead buffer'.
-
- INPUTS:
- in: a length FRAMESAMPLES array of input samples
- prefiltdata: input data structure containing the filterbank states
- and lookahead samples from the previous encoding
- iteration.
- OUTPUTS:
- LP: a FRAMESAMPLES_HALF array of low-pass filtered samples that
- have been phase equalized.  The first QLOOKAHEAD samples are
- based on the samples in the two prefiltdata->INLABUFx arrays
- each of length QLOOKAHEAD.
- The remaining FRAMESAMPLES_HALF-QLOOKAHEAD samples are based
- on the first FRAMESAMPLES_HALF-QLOOKAHEAD samples of the input
- array in[].
- HP: a FRAMESAMPLES_HALF array of high-pass filtered samples that
- have been phase equalized.  The first QLOOKAHEAD samples are
- based on the samples in the two prefiltdata->INLABUFx arrays
- each of length QLOOKAHEAD.
- The remaining FRAMESAMPLES_HALF-QLOOKAHEAD samples are based
- on the first FRAMESAMPLES_HALF-QLOOKAHEAD samples of the input
- array in[].
-
- LP_la: a FRAMESAMPLES_HALF array of low-pass filtered samples.
- These samples are not phase equalized. They are computed
- from the samples in the in[] array.
- HP_la: a FRAMESAMPLES_HALF array of high-pass filtered samples
- that are not phase equalized. They are computed from
- the in[] vector.
- prefiltdata: this input data structure's filterbank state and
- lookahead sample buffers are updated for the next
- encoding iteration.
-*/
-void WebRtcIsac_SplitAndFilterFloat(float *pin, float *LP, float *HP,
-                                    double *LP_la, double *HP_la,
-                                    PreFiltBankstr *prefiltdata)
-{
-  int k,n;
-  float CompositeAPFilterState[NUMBEROFCOMPOSITEAPSECTIONS];
-  float ForTransform_CompositeAPFilterState[NUMBEROFCOMPOSITEAPSECTIONS];
-  float ForTransform_CompositeAPFilterState2[NUMBEROFCOMPOSITEAPSECTIONS];
-  float tempinoutvec[FRAMESAMPLES+MAX_AR_MODEL_ORDER];
-  float tempin_ch1[FRAMESAMPLES+MAX_AR_MODEL_ORDER];
-  float tempin_ch2[FRAMESAMPLES+MAX_AR_MODEL_ORDER];
-  float in[FRAMESAMPLES];
-  float ftmp;
-
-
-  /* High pass filter */
-
-  for (k=0;k<FRAMESAMPLES;k++) {
-    in[k] = pin[k] + kHpStCoefInFloat[2] * prefiltdata->HPstates_float[0] +
-        kHpStCoefInFloat[3] * prefiltdata->HPstates_float[1];
-    ftmp = pin[k] - kHpStCoefInFloat[0] * prefiltdata->HPstates_float[0] -
-        kHpStCoefInFloat[1] * prefiltdata->HPstates_float[1];
-    prefiltdata->HPstates_float[1] = prefiltdata->HPstates_float[0];
-    prefiltdata->HPstates_float[0] = ftmp;
-  }
-
-  /*
-    % backwards all-pass filtering to obtain zero-phase
-    [tmp1(N2+LA:-1:LA+1, 1), state1] = filter(Q.coef, Q.coef(end:-1:1), in(N:-2:2));
-    tmp1(LA:-1:1) = filter(Q.coef, Q.coef(end:-1:1), Q.LookAheadBuf1, state1);
-    Q.LookAheadBuf1 = in(N:-2:N-2*LA+2);
-  */
-  /*Backwards all-pass filter the odd samples of the input (upper channel)
-    to eventually obtain zero phase.  The composite all-pass filter (comprised of both
-    the upper and lower channel all-pass filsters in series) is used for the
-    filtering. */
-
-  /* First Channel */
-
-  /*initial state of composite filter is zero */
-  for (k=0;k<NUMBEROFCOMPOSITEAPSECTIONS;k++){
-    CompositeAPFilterState[k] = 0.0;
-  }
-  /* put every other sample of input into a temporary vector in reverse (backward) order*/
-  for (k=0;k<FRAMESAMPLES_HALF;k++) {
-    tempinoutvec[k] = in[FRAMESAMPLES-1-2*k];
-  }
-
-  /* now all-pass filter the backwards vector.  Output values overwrite the input vector. */
-  WebRtcIsac_AllPassFilter2Float(tempinoutvec, WebRtcIsac_kCompositeApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCOMPOSITEAPSECTIONS, CompositeAPFilterState);
-
-  /* save the backwards filtered output for later forward filtering,
-     but write it in forward order*/
-  for (k=0;k<FRAMESAMPLES_HALF;k++) {
-    tempin_ch1[FRAMESAMPLES_HALF+QLOOKAHEAD-1-k] = tempinoutvec[k];
-  }
-
-  /* save the backwards filter state  becaue it will be transformed
-     later into a forward state */
-  for (k=0; k<NUMBEROFCOMPOSITEAPSECTIONS; k++) {
-    ForTransform_CompositeAPFilterState[k] = CompositeAPFilterState[k];
-  }
-
-  /* now backwards filter the samples in the lookahead buffer. The samples were
-     placed there in the encoding of the previous frame.  The output samples
-     overwrite the input samples */
-  WebRtcIsac_AllPassFilter2Float(prefiltdata->INLABUF1_float,
-                                 WebRtcIsac_kCompositeApFactorsFloat, QLOOKAHEAD,
-                                 NUMBEROFCOMPOSITEAPSECTIONS, CompositeAPFilterState);
-
-  /* save the output, but write it in forward order */
-  /* write the lookahead samples for the next encoding iteration. Every other
-     sample at the end of the input frame is written in reverse order for the
-     lookahead length. Exported in the prefiltdata structure. */
-  for (k=0;k<QLOOKAHEAD;k++) {
-    tempin_ch1[QLOOKAHEAD-1-k]=prefiltdata->INLABUF1_float[k];
-    prefiltdata->INLABUF1_float[k]=in[FRAMESAMPLES-1-2*k];
-  }
-
-  /* Second Channel.  This is exactly like the first channel, except that the
-     even samples are now filtered instead (lower channel). */
-  for (k=0;k<NUMBEROFCOMPOSITEAPSECTIONS;k++){
-    CompositeAPFilterState[k] = 0.0;
-  }
-
-  for (k=0;k<FRAMESAMPLES_HALF;k++) {
-    tempinoutvec[k] = in[FRAMESAMPLES-2-2*k];
-  }
-
-  WebRtcIsac_AllPassFilter2Float(tempinoutvec, WebRtcIsac_kCompositeApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCOMPOSITEAPSECTIONS, CompositeAPFilterState);
-
-  for (k=0;k<FRAMESAMPLES_HALF;k++) {
-    tempin_ch2[FRAMESAMPLES_HALF+QLOOKAHEAD-1-k] = tempinoutvec[k];
-  }
-
-  for (k=0; k<NUMBEROFCOMPOSITEAPSECTIONS; k++) {
-    ForTransform_CompositeAPFilterState2[k] = CompositeAPFilterState[k];
-  }
-
-
-  WebRtcIsac_AllPassFilter2Float(prefiltdata->INLABUF2_float,
-                                 WebRtcIsac_kCompositeApFactorsFloat, QLOOKAHEAD,NUMBEROFCOMPOSITEAPSECTIONS,
-                                 CompositeAPFilterState);
-
-  for (k=0;k<QLOOKAHEAD;k++) {
-    tempin_ch2[QLOOKAHEAD-1-k]=prefiltdata->INLABUF2_float[k];
-    prefiltdata->INLABUF2_float[k]=in[FRAMESAMPLES-2-2*k];
-  }
-
-  /* Transform filter states from backward to forward */
-  /*At this point, each of the states of the backwards composite filters for the
-    two channels are transformed into forward filtering states for the corresponding
-    forward channel filters.  Each channel's forward filtering state from the previous
-    encoding iteration is added to the transformed state to get a proper forward state */
-
-  /* So the existing NUMBEROFCOMPOSITEAPSECTIONS x 1 (4x1) state vector is multiplied by a
-     NUMBEROFCHANNELAPSECTIONSxNUMBEROFCOMPOSITEAPSECTIONS (2x4) transform matrix to get the
-     new state that is added to the previous 2x1 input state */
-
-  for (k=0;k<NUMBEROFCHANNELAPSECTIONS;k++){ /* k is row variable */
-    for (n=0; n<NUMBEROFCOMPOSITEAPSECTIONS;n++){/* n is column variable */
-      prefiltdata->INSTAT1_float[k] += ForTransform_CompositeAPFilterState[n]*
-          WebRtcIsac_kTransform1Float[k*NUMBEROFCHANNELAPSECTIONS+n];
-      prefiltdata->INSTAT2_float[k] += ForTransform_CompositeAPFilterState2[n]*
-          WebRtcIsac_kTransform2Float[k*NUMBEROFCHANNELAPSECTIONS+n];
-    }
-  }
-
-  /*obtain polyphase components by forward all-pass filtering through each channel */
-  /* the backward filtered samples are now forward filtered with the corresponding channel filters */
-  /* The all pass filtering automatically updates the filter states which are exported in the
-     prefiltdata structure */
-  WebRtcIsac_AllPassFilter2Float(tempin_ch1,WebRtcIsac_kUpperApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS, prefiltdata->INSTAT1_float);
-  WebRtcIsac_AllPassFilter2Float(tempin_ch2,WebRtcIsac_kLowerApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS, prefiltdata->INSTAT2_float);
-
-  /* Now Construct low-pass and high-pass signals as combinations of polyphase components */
-  for (k=0; k<FRAMESAMPLES_HALF; k++) {
-    LP[k] = 0.5f*(tempin_ch1[k] + tempin_ch2[k]);/* low pass signal*/
-    HP[k] = 0.5f*(tempin_ch1[k] - tempin_ch2[k]);/* high pass signal*/
-  }
-
-  /* Lookahead LP and HP signals */
-  /* now create low pass and high pass signals of the input vector.  However, no
-     backwards filtering is performed, and hence no phase equalization is involved.
-     Also, the input contains some samples that are lookahead samples.  The high pass
-     and low pass signals that are created are used outside this function for analysis
-     (not encoding) purposes */
-
-  /* set up input */
-  for (k=0; k<FRAMESAMPLES_HALF; k++) {
-    tempin_ch1[k]=in[2*k+1];
-    tempin_ch2[k]=in[2*k];
-  }
-
-  /* the input filter states are passed in and updated by the all-pass filtering routine and
-     exported in the prefiltdata structure*/
-  WebRtcIsac_AllPassFilter2Float(tempin_ch1,WebRtcIsac_kUpperApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS, prefiltdata->INSTATLA1_float);
-  WebRtcIsac_AllPassFilter2Float(tempin_ch2,WebRtcIsac_kLowerApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS, prefiltdata->INSTATLA2_float);
-
-  for (k=0; k<FRAMESAMPLES_HALF; k++) {
-    LP_la[k] = (float)(0.5f*(tempin_ch1[k] + tempin_ch2[k])); /*low pass */
-    HP_la[k] = (double)(0.5f*(tempin_ch1[k] - tempin_ch2[k])); /* high pass */
-  }
-
-
-}/*end of WebRtcIsac_SplitAndFilter */
-
-
-/* Combining */
-
-/* HPstcoeff_out_1 = {a1, a2, b1 - b0 * a1, b2 - b0 * a2}; */
-static const float kHpStCoefOut1Float[4] =
-{-1.99701049409000f, 0.99714204490000f, 0.01701049409000f, -0.01704204490000f};
-
-/* HPstcoeff_out_2 = {a1, a2, b1 - b0 * a1, b2 - b0 * a2}; */
-static const float kHpStCoefOut2Float[4] =
-{-1.98645294509837f, 0.98672435560000f, 0.00645294509837f, -0.00662435560000f};
-
-
-/* Function WebRtcIsac_FilterAndCombine */
-/* This is a decoder function that takes the decimated
-   length FRAMESAMPLES_HALF input low-pass and
-   high-pass signals and creates a reconstructed fullband
-   output signal of length FRAMESAMPLES. WebRtcIsac_FilterAndCombine
-   is the sibling function of WebRtcIsac_SplitAndFilter */
-/* INPUTS:
-   inLP: a length FRAMESAMPLES_HALF array of input low-pass
-   samples.
-   inHP: a length FRAMESAMPLES_HALF array of input high-pass
-   samples.
-   postfiltdata: input data structure containing the filterbank
-   states from the previous decoding iteration.
-   OUTPUTS:
-   Out: a length FRAMESAMPLES array of output reconstructed
-   samples (fullband) based on the input low-pass and
-   high-pass signals.
-   postfiltdata: the input data structure containing the filterbank
-   states is updated for the next decoding iteration */
-void WebRtcIsac_FilterAndCombineFloat(float *InLP,
-                                      float *InHP,
-                                      float *Out,
-                                      PostFiltBankstr *postfiltdata)
-{
-  int k;
-  float tempin_ch1[FRAMESAMPLES+MAX_AR_MODEL_ORDER];
-  float tempin_ch2[FRAMESAMPLES+MAX_AR_MODEL_ORDER];
-  float ftmp, ftmp2;
-
-  /* Form the polyphase signals*/
-  for (k=0;k<FRAMESAMPLES_HALF;k++) {
-    tempin_ch1[k]=InLP[k]+InHP[k]; /* Construct a new upper channel signal*/
-    tempin_ch2[k]=InLP[k]-InHP[k]; /* Construct a new lower channel signal*/
-  }
-
-
-  /* all-pass filter the new upper channel signal. HOWEVER, use the all-pass filter factors
-     that were used as a lower channel at the encoding side.  So at the decoder, the
-     corresponding all-pass filter factors for each channel are swapped.*/
-  WebRtcIsac_AllPassFilter2Float(tempin_ch1, WebRtcIsac_kLowerApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS,postfiltdata->STATE_0_UPPER_float);
-
-  /* Now, all-pass filter the new lower channel signal. But since all-pass filter factors
-     at the decoder are swapped from the ones at the encoder, the 'upper' channel
-     all-pass filter factors (WebRtcIsac_kUpperApFactorsFloat) are used to filter this new
-     lower channel signal */
-  WebRtcIsac_AllPassFilter2Float(tempin_ch2, WebRtcIsac_kUpperApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS,postfiltdata->STATE_0_LOWER_float);
-
-
-  /* Merge outputs to form the full length output signal.*/
-  for (k=0;k<FRAMESAMPLES_HALF;k++) {
-    Out[2*k]=tempin_ch2[k];
-    Out[2*k+1]=tempin_ch1[k];
-  }
-
-
-  /* High pass filter */
-
-  for (k=0;k<FRAMESAMPLES;k++) {
-    ftmp2 = Out[k] + kHpStCoefOut1Float[2] * postfiltdata->HPstates1_float[0] +
-        kHpStCoefOut1Float[3] * postfiltdata->HPstates1_float[1];
-    ftmp = Out[k] - kHpStCoefOut1Float[0] * postfiltdata->HPstates1_float[0] -
-        kHpStCoefOut1Float[1] * postfiltdata->HPstates1_float[1];
-    postfiltdata->HPstates1_float[1] = postfiltdata->HPstates1_float[0];
-    postfiltdata->HPstates1_float[0] = ftmp;
-    Out[k] = ftmp2;
-  }
-
-  for (k=0;k<FRAMESAMPLES;k++) {
-    ftmp2 = Out[k] + kHpStCoefOut2Float[2] * postfiltdata->HPstates2_float[0] +
-        kHpStCoefOut2Float[3] * postfiltdata->HPstates2_float[1];
-    ftmp = Out[k] - kHpStCoefOut2Float[0] * postfiltdata->HPstates2_float[0] -
-        kHpStCoefOut2Float[1] * postfiltdata->HPstates2_float[1];
-    postfiltdata->HPstates2_float[1] = postfiltdata->HPstates2_float[0];
-    postfiltdata->HPstates2_float[0] = ftmp;
-    Out[k] = ftmp2;
-  }
-}
diff --git a/src/mod/codecs/mod_isac/get_hanning_window.c b/src/mod/codecs/mod_isac/get_hanning_window.c
deleted file mode 100644
index 6d67e60f7a..0000000000
--- a/src/mod/codecs/mod_isac/get_hanning_window.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_GetHanningWindow().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-// Hanning table with 256 entries
-static const WebRtc_Word16 kHanningTable[] = {
-    1,      2,      6,     10,     15,     22,     30,     39,
-   50,     62,     75,     89,    104,    121,    138,    157,
-  178,    199,    222,    246,    271,    297,    324,    353,
-  383,    413,    446,    479,    513,    549,    586,    624,
-  663,    703,    744,    787,    830,    875,    920,    967,
- 1015,   1064,   1114,   1165,   1218,   1271,   1325,   1381,
- 1437,   1494,   1553,   1612,   1673,   1734,   1796,   1859,
- 1924,   1989,   2055,   2122,   2190,   2259,   2329,   2399,
- 2471,   2543,   2617,   2691,   2765,   2841,   2918,   2995,
- 3073,   3152,   3232,   3312,   3393,   3475,   3558,   3641,
- 3725,   3809,   3895,   3980,   4067,   4154,   4242,   4330,
- 4419,   4509,   4599,   4689,   4781,   4872,   4964,   5057,
- 5150,   5244,   5338,   5432,   5527,   5622,   5718,   5814,
- 5910,   6007,   6104,   6202,   6299,   6397,   6495,   6594,
- 6693,   6791,   6891,   6990,   7090,   7189,   7289,   7389,
- 7489,   7589,   7690,   7790,   7890,   7991,   8091,   8192,
- 8293,   8393,   8494,   8594,   8694,   8795,   8895,   8995,
- 9095,   9195,   9294,   9394,   9493,   9593,   9691,   9790,
- 9889,   9987,  10085,  10182,  10280,  10377,  10474,  10570,
-10666,  10762,  10857,  10952,  11046,  11140,  11234,  11327,
-11420,  11512,  11603,  11695,  11785,  11875,  11965,  12054,
-12142,  12230,  12317,  12404,  12489,  12575,  12659,  12743,
-12826,  12909,  12991,  13072,  13152,  13232,  13311,  13389,
-13466,  13543,  13619,  13693,  13767,  13841,  13913,  13985,
-14055,  14125,  14194,  14262,  14329,  14395,  14460,  14525,
-14588,  14650,  14711,  14772,  14831,  14890,  14947,  15003,
-15059,  15113,  15166,  15219,  15270,  15320,  15369,  15417,
-15464,  15509,  15554,  15597,  15640,  15681,  15721,  15760,
-15798,  15835,  15871,  15905,  15938,  15971,  16001,  16031,
-16060,  16087,  16113,  16138,  16162,  16185,  16206,  16227,
-16246,  16263,  16280,  16295,  16309,  16322,  16334,  16345,
-16354,  16362,  16369,  16374,  16378,  16382,  16383,  16384
-};
-
-void WebRtcSpl_GetHanningWindow(WebRtc_Word16 *v, WebRtc_Word16 size)
-{
-    int jj;
-    WebRtc_Word16 *vptr1;
-
-    WebRtc_Word32 index;
-    WebRtc_Word32 factor = ((WebRtc_Word32)0x40000000);
-
-    factor = WebRtcSpl_DivW32W16(factor, size);
-    if (size < 513)
-        index = (WebRtc_Word32)-0x200000;
-    else
-        index = (WebRtc_Word32)-0x100000;
-    vptr1 = v;
-
-    for (jj = 0; jj < size; jj++)
-    {
-        index += factor;
-        (*vptr1++) = kHanningTable[index >> 22];
-    }
-
-}
diff --git a/src/mod/codecs/mod_isac/get_scaling_square.c b/src/mod/codecs/mod_isac/get_scaling_square.c
deleted file mode 100644
index dccbf334fd..0000000000
--- a/src/mod/codecs/mod_isac/get_scaling_square.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_GetScalingSquare().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-int WebRtcSpl_GetScalingSquare(WebRtc_Word16 *in_vector, int in_vector_length, int times)
-{
-    int nbits = WebRtcSpl_GetSizeInBits(times);
-    int i;
-    WebRtc_Word16 smax = -1;
-    WebRtc_Word16 sabs;
-    WebRtc_Word16 *sptr = in_vector;
-    int t;
-    int looptimes = in_vector_length;
-
-    for (i = looptimes; i > 0; i--)
-    {
-        sabs = (*sptr > 0 ? *sptr++ : -*sptr++);
-        smax = (sabs > smax ? sabs : smax);
-    }
-    t = WebRtcSpl_NormW32(WEBRTC_SPL_MUL(smax, smax));
-
-    if (smax == 0)
-    {
-        return 0; // Since norm(0) returns 0
-    } else
-    {
-        return (t > nbits) ? 0 : nbits - t;
-    }
-}
diff --git a/src/mod/codecs/mod_isac/ilbc_specific_functions.c b/src/mod/codecs/mod_isac/ilbc_specific_functions.c
deleted file mode 100644
index 5a9e5773b3..0000000000
--- a/src/mod/codecs/mod_isac/ilbc_specific_functions.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains implementations of the iLBC specific functions
- * WebRtcSpl_ScaleAndAddVectorsWithRound()
- * WebRtcSpl_ReverseOrderMultArrayElements()
- * WebRtcSpl_ElementwiseVectorMult()
- * WebRtcSpl_AddVectorsAndShift()
- * WebRtcSpl_AddAffineVectorToVector()
- * WebRtcSpl_AffineTransformVector()
- *
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-void WebRtcSpl_ScaleAndAddVectorsWithRound(WebRtc_Word16 *vector1, WebRtc_Word16 scale1,
-                                           WebRtc_Word16 *vector2, WebRtc_Word16 scale2,
-                                           WebRtc_Word16 right_shifts, WebRtc_Word16 *out,
-                                           WebRtc_Word16 vector_length)
-{
-    int i;
-    WebRtc_Word16 roundVal;
-    roundVal = 1 << right_shifts;
-    roundVal = roundVal >> 1;
-    for (i = 0; i < vector_length; i++)
-    {
-        out[i] = (WebRtc_Word16)((WEBRTC_SPL_MUL_16_16(vector1[i], scale1)
-                + WEBRTC_SPL_MUL_16_16(vector2[i], scale2) + roundVal) >> right_shifts);
-    }
-}
-
-void WebRtcSpl_ReverseOrderMultArrayElements(WebRtc_Word16 *out, G_CONST WebRtc_Word16 *in,
-                                             G_CONST WebRtc_Word16 *win,
-                                             WebRtc_Word16 vector_length,
-                                             WebRtc_Word16 right_shifts)
-{
-    int i;
-    WebRtc_Word16 *outptr = out;
-    G_CONST WebRtc_Word16 *inptr = in;
-    G_CONST WebRtc_Word16 *winptr = win;
-    for (i = 0; i < vector_length; i++)
-    {
-        (*outptr++) = (WebRtc_Word16)WEBRTC_SPL_MUL_16_16_RSFT(*inptr++,
-                                                               *winptr--, right_shifts);
-    }
-}
-
-void WebRtcSpl_ElementwiseVectorMult(WebRtc_Word16 *out, G_CONST WebRtc_Word16 *in,
-                                     G_CONST WebRtc_Word16 *win, WebRtc_Word16 vector_length,
-                                     WebRtc_Word16 right_shifts)
-{
-    int i;
-    WebRtc_Word16 *outptr = out;
-    G_CONST WebRtc_Word16 *inptr = in;
-    G_CONST WebRtc_Word16 *winptr = win;
-    for (i = 0; i < vector_length; i++)
-    {
-        (*outptr++) = (WebRtc_Word16)WEBRTC_SPL_MUL_16_16_RSFT(*inptr++,
-                                                               *winptr++, right_shifts);
-    }
-}
-
-void WebRtcSpl_AddVectorsAndShift(WebRtc_Word16 *out, G_CONST WebRtc_Word16 *in1,
-                                  G_CONST WebRtc_Word16 *in2, WebRtc_Word16 vector_length,
-                                  WebRtc_Word16 right_shifts)
-{
-    int i;
-    WebRtc_Word16 *outptr = out;
-    G_CONST WebRtc_Word16 *in1ptr = in1;
-    G_CONST WebRtc_Word16 *in2ptr = in2;
-    for (i = vector_length; i > 0; i--)
-    {
-        (*outptr++) = (WebRtc_Word16)(((*in1ptr++) + (*in2ptr++)) >> right_shifts);
-    }
-}
-
-void WebRtcSpl_AddAffineVectorToVector(WebRtc_Word16 *out, WebRtc_Word16 *in,
-                                       WebRtc_Word16 gain, WebRtc_Word32 add_constant,
-                                       WebRtc_Word16 right_shifts, int vector_length)
-{
-    WebRtc_Word16 *inPtr;
-    WebRtc_Word16 *outPtr;
-    int i;
-
-    inPtr = in;
-    outPtr = out;
-    for (i = 0; i < vector_length; i++)
-    {
-        (*outPtr++) += (WebRtc_Word16)((WEBRTC_SPL_MUL_16_16((*inPtr++), gain)
-                + (WebRtc_Word32)add_constant) >> right_shifts);
-    }
-}
-
-void WebRtcSpl_AffineTransformVector(WebRtc_Word16 *out, WebRtc_Word16 *in,
-                                     WebRtc_Word16 gain, WebRtc_Word32 add_constant,
-                                     WebRtc_Word16 right_shifts, int vector_length)
-{
-    WebRtc_Word16 *inPtr;
-    WebRtc_Word16 *outPtr;
-    int i;
-
-    inPtr = in;
-    outPtr = out;
-    for (i = 0; i < vector_length; i++)
-    {
-        (*outPtr++) = (WebRtc_Word16)((WEBRTC_SPL_MUL_16_16((*inPtr++), gain)
-                + (WebRtc_Word32)add_constant) >> right_shifts);
-    }
-}
diff --git a/src/mod/codecs/mod_isac/intialize.c b/src/mod/codecs/mod_isac/intialize.c
deleted file mode 100644
index 6df034d1c7..0000000000
--- a/src/mod/codecs/mod_isac/intialize.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* encode.c  - Encoding function for the iSAC coder */
-
-#include "structs.h"
-#include "codec.h"
-#include "pitch_estimator.h"
-
-#include <math.h>
-
-void WebRtcIsac_InitMasking(MaskFiltstr *maskdata) {
-
-  int k;
-
-  for (k = 0; k < WINLEN; k++) {
-    maskdata->DataBufferLo[k] = 0.0;
-    maskdata->DataBufferHi[k] = 0.0;
-  }
-  for (k = 0; k < ORDERLO+1; k++) {
-    maskdata->CorrBufLo[k] = 0.0;
-    maskdata->PreStateLoF[k] = 0.0;
-    maskdata->PreStateLoG[k] = 0.0;
-    maskdata->PostStateLoF[k] = 0.0;
-    maskdata->PostStateLoG[k] = 0.0;
-  }
-  for (k = 0; k < ORDERHI+1; k++) {
-    maskdata->CorrBufHi[k] = 0.0;
-    maskdata->PreStateHiF[k] = 0.0;
-    maskdata->PreStateHiG[k] = 0.0;
-    maskdata->PostStateHiF[k] = 0.0;
-    maskdata->PostStateHiG[k] = 0.0;
-  }
-
-  maskdata->OldEnergy = 10.0;
-
-  /* fill tables for transforms */
-  WebRtcIsac_InitTransform();
-
-  return;
-}
-
-void WebRtcIsac_InitPreFilterbank(PreFiltBankstr *prefiltdata)
-{
-  int k;
-
-  for (k = 0; k < QLOOKAHEAD; k++) {
-    prefiltdata->INLABUF1[k] = 0;
-    prefiltdata->INLABUF2[k] = 0;
-
-    prefiltdata->INLABUF1_float[k] = 0;
-    prefiltdata->INLABUF2_float[k] = 0;
-  }
-  for (k = 0; k < 2*(QORDER-1); k++) {
-    prefiltdata->INSTAT1[k] = 0;
-    prefiltdata->INSTAT2[k] = 0;
-    prefiltdata->INSTATLA1[k] = 0;
-    prefiltdata->INSTATLA2[k] = 0;
-
-    prefiltdata->INSTAT1_float[k] = 0;
-    prefiltdata->INSTAT2_float[k] = 0;
-    prefiltdata->INSTATLA1_float[k] = 0;
-    prefiltdata->INSTATLA2_float[k] = 0;
-  }
-
-  /* High pass filter states */
-  prefiltdata->HPstates[0] = 0.0;
-  prefiltdata->HPstates[1] = 0.0;
-
-  prefiltdata->HPstates_float[0] = 0.0f;
-  prefiltdata->HPstates_float[1] = 0.0f;
-
-  return;
-}
-
-void WebRtcIsac_InitPostFilterbank(PostFiltBankstr *postfiltdata)
-{
-  int k;
-
-  for (k = 0; k < 2*POSTQORDER; k++) {
-    postfiltdata->STATE_0_LOWER[k] = 0;
-    postfiltdata->STATE_0_UPPER[k] = 0;
-
-    postfiltdata->STATE_0_LOWER_float[k] = 0;
-    postfiltdata->STATE_0_UPPER_float[k] = 0;
-  }
-
-  /* High pass filter states */
-  postfiltdata->HPstates1[0] = 0.0;
-  postfiltdata->HPstates1[1] = 0.0;
-
-  postfiltdata->HPstates2[0] = 0.0;
-  postfiltdata->HPstates2[1] = 0.0;
-
-  postfiltdata->HPstates1_float[0] = 0.0f;
-  postfiltdata->HPstates1_float[1] = 0.0f;
-
-  postfiltdata->HPstates2_float[0] = 0.0f;
-  postfiltdata->HPstates2_float[1] = 0.0f;
-
-  return;
-}
-
-
-void WebRtcIsac_InitPitchFilter(PitchFiltstr *pitchfiltdata)
-{
-  int k;
-
-  for (k = 0; k < PITCH_BUFFSIZE; k++) {
-    pitchfiltdata->ubuf[k] = 0.0;
-  }
-  pitchfiltdata->ystate[0] = 0.0;
-  for (k = 1; k < (PITCH_DAMPORDER); k++) {
-    pitchfiltdata->ystate[k] = 0.0;
-  }
-  pitchfiltdata->oldlagp[0] = 50.0;
-  pitchfiltdata->oldgainp[0] = 0.0;
-}
-
-void WebRtcIsac_InitWeightingFilter(WeightFiltstr *wfdata)
-{
-  int k;
-  double t, dtmp, dtmp2, denum, denum2;
-
-  for (k=0;k<PITCH_WLPCBUFLEN;k++)
-    wfdata->buffer[k]=0.0;
-
-  for (k=0;k<PITCH_WLPCORDER;k++) {
-    wfdata->istate[k]=0.0;
-    wfdata->weostate[k]=0.0;
-    wfdata->whostate[k]=0.0;
-  }
-
-  /* next part should be in Matlab, writing to a global table */
-  t = 0.5;
-  denum = 1.0 / ((double) PITCH_WLPCWINLEN);
-  denum2 = denum * denum;
-  for (k=0;k<PITCH_WLPCWINLEN;k++) {
-    dtmp = PITCH_WLPCASYM * t * denum + (1-PITCH_WLPCASYM) * t * t * denum2;
-    dtmp *= 3.14159265;
-    dtmp2 = sin(dtmp);
-    wfdata->window[k] = dtmp2 * dtmp2;
-    t++;
-  }
-}
-
-/* clear all buffers */
-void WebRtcIsac_InitPitchAnalysis(PitchAnalysisStruct *State)
-{
-  int k;
-
-  for (k = 0; k < PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2-PITCH_FRAME_LEN/2+2; k++)
-    State->dec_buffer[k] = 0.0;
-  for (k = 0; k < 2*ALLPASSSECTIONS+1; k++)
-    State->decimator_state[k] = 0.0;
-  for (k = 0; k < 2; k++)
-    State->hp_state[k] = 0.0;
-  for (k = 0; k < QLOOKAHEAD; k++)
-    State->whitened_buf[k] = 0.0;
-  for (k = 0; k < QLOOKAHEAD; k++)
-    State->inbuf[k] = 0.0;
-
-  WebRtcIsac_InitPitchFilter(&(State->PFstr_wght));
-
-  WebRtcIsac_InitPitchFilter(&(State->PFstr));
-
-  WebRtcIsac_InitWeightingFilter(&(State->Wghtstr));
-}
diff --git a/src/mod/codecs/mod_isac/isac.c b/src/mod/codecs/mod_isac/isac.c
deleted file mode 100644
index 6c03726fca..0000000000
--- a/src/mod/codecs/mod_isac/isac.c
+++ /dev/null
@@ -1,2797 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * isac.c
- *
- * This C file contains the functions for the ISAC API
- *
- */
-
-#include "isac.h"
-#include "bandwidth_estimator.h"
-#include "crc.h"
-#include "entropy_coding.h"
-#include "codec.h"
-#include "structs.h"
-#include "signal_processing_library.h"
-#include "lpc_shape_swb16_tables.h"
-#include "os_specific_inline.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#define BIT_MASK_DEC_INIT 0x0001
-#define BIT_MASK_ENC_INIT 0x0002
-
-#define LEN_CHECK_SUM_WORD8     4
-#define MAX_NUM_LAYERS         10
-
-
-/****************************************************************************
- * UpdatePayloadSizeLimit()
- *
- * Call this function to update the limit on the payload size. The limit on
- * payload size might change i) if a user ''directly changes the limit by
- * calling xxx_setMaxPayloadSize() or xxx_setMaxRate(), or ii) indirectly
- * when bandwidth is changing. The latter might be the result of bandwidth
- * adaptation, or direct change of the bottleneck in instantaneous mode.
- *
- * This function takes the current overall limit on payload, and translate it
- * to the limits on lower and upper-band. If the codec is in wideband mode
- * then the overall limit and the limit on the lower-band is the same.
- * Otherwise, a fraction of the limit should be allocated to lower-band
- * leaving some room for the upper-band bit-stream. That is why an update
- * of limit is required every time that the bandwidth is changing.
- *
- */
-static void UpdatePayloadSizeLimit(
-				   ISACMainStruct *instISAC)
-{
-  WebRtc_Word16 lim30MsPayloadBytes;
-  WebRtc_Word16 lim60MsPayloadBytes;
-
-  lim30MsPayloadBytes = WEBRTC_SPL_MIN(
-				       (instISAC->maxPayloadSizeBytes),
-				       (instISAC->maxRateBytesPer30Ms));
-
-  lim60MsPayloadBytes = WEBRTC_SPL_MIN(
-				       (instISAC->maxPayloadSizeBytes),
-				       (instISAC->maxRateBytesPer30Ms << 1));
-
-  // The only time that iSAC will have 60 ms
-  // frame-size is when operating in wideband so
-  // there is no upper-band bit-stream
-
-  if(instISAC->bandwidthKHz == isac8kHz)
-    {
-      // at 8 kHz there is no upper-band bit-stream
-      // therefore the lower-band limit is as the overall
-      // limit.
-      instISAC->instLB.ISACencLB_obj.payloadLimitBytes60 =
-        lim60MsPayloadBytes;
-      instISAC->instLB.ISACencLB_obj.payloadLimitBytes30 =
-        lim30MsPayloadBytes;
-    }
-  else
-    {
-      // when in super-wideband, we only have 30 ms frames
-      // Do a rate allocation for the given limit.
-      if(lim30MsPayloadBytes > 250)
-	{
-	  // 4/5 to lower-band the rest for upper-band
-	  instISAC->instLB.ISACencLB_obj.payloadLimitBytes30 =
-	    (lim30MsPayloadBytes << 2) / 5;
-	}
-      else if(lim30MsPayloadBytes > 200)
-	{
-	  // for the interval of 200 to 250 the share of
-	  // upper-band linearly grows from 20 to 50;
-	  instISAC->instLB.ISACencLB_obj.payloadLimitBytes30 =
-	    (lim30MsPayloadBytes << 1) / 5 + 100;
-	}
-      else
-	{
-	  // allocate only 20 for upper-band
-	  instISAC->instLB.ISACencLB_obj.payloadLimitBytes30 =
-	    lim30MsPayloadBytes - 20;
-	}
-      instISAC->instUB.ISACencUB_obj.maxPayloadSizeBytes =
-        lim30MsPayloadBytes;
-    }
-}
-
-
-/****************************************************************************
- * UpdateBottleneck()
- *
- * This function updates the bottleneck only if the codec is operating in
- * channel-adaptive mode. Furthermore, as the update of bottleneck might
- * result in an update of bandwidth, therefore, the bottlenech should be
- * updated just right before the first 10ms of a frame is pushed into encoder.
- *
- */
-static void UpdateBottleneck(
-			     ISACMainStruct *instISAC)
-{
-  // read the bottleneck from bandwidth estimator for the
-  // first 10 ms audio. This way, if there is a change
-  // in bandwidth upper and lower-band will be in sync.
-  if((instISAC->codingMode == 0) &&
-     (instISAC->instLB.ISACencLB_obj.buffer_index == 0) &&
-     (instISAC->instLB.ISACencLB_obj.frame_nb == 0))
-    {
-      WebRtc_Word32 bottleneck;
-      WebRtcIsac_GetUplinkBandwidth(&(instISAC->bwestimator_obj),
-				    &bottleneck);
-
-      // Adding hysteresis when increasing signal bandwidth
-      if((instISAC->bandwidthKHz == isac8kHz)
-	 && (bottleneck > 37000)
-	 && (bottleneck < 41000))
-	{
-	  bottleneck = 37000;
-	}
-
-      // switching from 12 kHz to 16 kHz is not allowed at this revision
-      // If we let this happen, we have to take care of buffer_index and
-      // the last LPC vector.
-      if((instISAC->bandwidthKHz != isac16kHz) &&
-	 (bottleneck > 46000))
-	{
-	  bottleneck = 46000;
-	}
-
-      // we might need a rate allocation.
-      if(instISAC->encoderSamplingRateKHz == kIsacWideband)
-	{
-	  // wideband is the only choise we have here.
-	  instISAC->instLB.ISACencLB_obj.bottleneck =
-	    (bottleneck > 32000)? 32000:bottleneck;
-	  instISAC->bandwidthKHz = isac8kHz;
-	}
-      else
-	{
-	  // do the rate-allosation and get the new bandwidth.
-	  enum ISACBandwidth bandwidth;
-	  WebRtcIsac_RateAllocation(bottleneck,
-				    &(instISAC->instLB.ISACencLB_obj.bottleneck),
-				    &(instISAC->instUB.ISACencUB_obj.bottleneck),
-				    &bandwidth);
-	  if(bandwidth != isac8kHz)
-	    {
-	      instISAC->instLB.ISACencLB_obj.new_framelength = 480;
-	    }
-	  if(bandwidth != instISAC->bandwidthKHz)
-	    {
-	      // bandwidth is changing.
-	      instISAC->bandwidthKHz = bandwidth;
-	      UpdatePayloadSizeLimit(instISAC);
-	      if(bandwidth == isac12kHz)
-		{
-		  instISAC->instLB.ISACencLB_obj.buffer_index = 0;
-		}
-	      // currently we don't let the bandwidth to switch to 16 kHz
-	      // if in adaptive mode. If we let this happen, we have to take
-	      // car of buffer_index and the last LPC vector.
-	    }
-	}
-    }
-}
-
-
-/****************************************************************************
- * GetSendBandwidthInfo()
- *
- * This is called to get the bandwidth info. This info is the bandwidth and
- * and the jitter of 'there-to-here' channel, estimated 'here.' These info
- * is signaled in an in-band fashion to the otherside.
- *
- * The call to the bandwidth estimator trigers a recursive averaging which
- * has to be synchronized between encoder & decoder, therefore. The call to
- * BWE should be once per packet. As the BWE info is inserted into bit-stream
- * we need a valid info right before the encodeLB function is going to
- * generating a bit-stream. That is when lower-band buffer has already 20ms
- * of audio, and the 3rd block of 10ms is going to be injected into encoder.
- *
- * Inputs:
- *         - instISAC          : iSAC instance.
- *
- * Outputs:
- *         - bandwidthIndex    : an index which has to be encoded in
- *                               lower-band bit-stream, indicating the
- *                               bandwidth of there-to-here channel.
- *         - jitterInfo        : this indicates if the jitter is high
- *                               or low and it is encoded in upper-band
- *                               bit-stream.
- *
- */
-static void GetSendBandwidthInfo(
-				 ISACMainStruct* instISAC,
-				 WebRtc_Word16*    bandwidthIndex,
-				 WebRtc_Word16*    jitterInfo)
-{
-  if((instISAC->instLB.ISACencLB_obj.buffer_index ==
-      (FRAMESAMPLES_10ms << 1)) &&
-     (instISAC->instLB.ISACencLB_obj.frame_nb == 0))
-    {
-      /* bandwidth estimation and coding */
-      WebRtcIsac_GetDownlinkBwJitIndexImpl(&(instISAC->bwestimator_obj),
-				       bandwidthIndex, jitterInfo, instISAC->decoderSamplingRateKHz);
-    }
-}
-
-
-/****************************************************************************
- * WebRtcIsac_AssignSize(...)
- *
- * This function returns the size of the ISAC instance, so that the instance
- * can be created out side iSAC.
- *
- * Output:
- *        - sizeinbytes       : number of bytes needed to allocate for the
- *                              instance.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-WebRtc_Word16 WebRtcIsac_AssignSize(
-				   int *sizeInBytes)
-{
-  *sizeInBytes = sizeof(ISACMainStruct) * 2 / sizeof(WebRtc_Word16);
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_Assign(...)
- *
- * This function assignes the memory already created to the ISAC instance.
- *
- * Input:
- *        - ISAC_main_inst    : address of the pointer to the coder instance.
- *        - instISAC_Addr     : the already allocaded memeory, where we put the
- *                              iSAC struct
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-WebRtc_Word16 WebRtcIsac_Assign(
-			       ISACStruct** ISAC_main_inst,
-			       void*        instISAC_Addr)
-{
-  if(instISAC_Addr != NULL)
-    {
-      ISACMainStruct* instISAC = (ISACMainStruct*)instISAC_Addr;
-      instISAC->errorCode = 0;
-      instISAC->initFlag = 0;
-
-      // Assign the address
-      *ISAC_main_inst = (ISACStruct*)instISAC_Addr;
-
-      // Default is wideband.
-      instISAC->encoderSamplingRateKHz = kIsacWideband;
-      instISAC->decoderSamplingRateKHz = kIsacWideband;
-      instISAC->bandwidthKHz           = isac8kHz;
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-
-/****************************************************************************
- * WebRtcIsac_Create(...)
- *
- * This function creates an ISAC instance, which will contain the state
- * information for one coding/decoding channel.
- *
- * Input:
- *        - ISAC_main_inst    : address of the pointer to the coder instance.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-WebRtc_Word16 WebRtcIsac_Create(
-			       ISACStruct** ISAC_main_inst)
-{
-  ISACMainStruct* instISAC;
-
-  instISAC = (ISACMainStruct*)WEBRTC_SPL_VNEW(ISACMainStruct, 1);
-  *ISAC_main_inst = (ISACStruct*)instISAC;
-  if(*ISAC_main_inst != NULL)
-    {
-      instISAC->errorCode = 0;
-      instISAC->initFlag = 0;
-      // Default is wideband
-      instISAC->bandwidthKHz           = isac8kHz;
-      instISAC->encoderSamplingRateKHz = kIsacWideband;
-      instISAC->decoderSamplingRateKHz = kIsacWideband;
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-
-/****************************************************************************
- * WebRtcIsac_Free(...)
- *
- * This function frees the ISAC instance created at the beginning.
- *
- * Input:
- *        - ISAC_main_inst    : a ISAC instance.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-WebRtc_Word16 WebRtcIsac_Free(
-			     ISACStruct* ISAC_main_inst)
-{
-  ISACMainStruct* instISAC;
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-  WEBRTC_SPL_FREE(instISAC);
-  return 0;
-}
-
-
-/****************************************************************************
- * EncoderInitLb(...) - internal function for initialization of
- *                                Lower Band
- * EncoderInitUb(...) - internal function for initialization of
- *                                Upper Band
- * WebRtcIsac_EncoderInit(...) - API function
- *
- * This function initializes a ISAC instance prior to the encoder calls.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - CodingMode        : 0 -> Bit rate and frame length are automatically
- *                                 adjusted to available bandwidth on
- *                                 transmission channel, applicable just to
- *                                 wideband mode.
- *                              1 -> User sets a frame length and a target bit
- *                                 rate which is taken as the maximum
- *                                 short-term average bit rate.
- *
- * Return value               :  0 - Ok
- *                              -1 - Error
- */
-static WebRtc_Word16 EncoderInitLb(
-				   ISACLBStruct*             instLB,
-				   WebRtc_Word16               codingMode,
-				   enum IsacSamplingRate sampRate)
-{
-  WebRtc_Word16 statusInit = 0;
-  int k;
-
-  /* Init stream vector to zero */
-  for(k=0; k < STREAM_SIZE_MAX_60; k++)
-    {
-      instLB->ISACencLB_obj.bitstr_obj.stream[k] = 0;
-    }
-
-  if((codingMode == 1) || (sampRate == kIsacSuperWideband))
-    {
-      // 30 ms frame-size if either in super-wideband or
-      // instanteneous mode (I-mode)
-      instLB->ISACencLB_obj.new_framelength = 480;
-    }
-  else
-    {
-      instLB->ISACencLB_obj.new_framelength = INITIAL_FRAMESAMPLES;
-    }
-
-  WebRtcIsac_InitMasking(&instLB->ISACencLB_obj.maskfiltstr_obj);
-  WebRtcIsac_InitPreFilterbank(&instLB->ISACencLB_obj.prefiltbankstr_obj);
-  WebRtcIsac_InitPitchFilter(&instLB->ISACencLB_obj.pitchfiltstr_obj);
-  WebRtcIsac_InitPitchAnalysis(
-			       &instLB->ISACencLB_obj.pitchanalysisstr_obj);
-
-
-  instLB->ISACencLB_obj.buffer_index         = 0;
-  instLB->ISACencLB_obj.frame_nb             = 0;
-  /* default for I-mode */
-  instLB->ISACencLB_obj.bottleneck           = 32000;
-  instLB->ISACencLB_obj.current_framesamples = 0;
-  instLB->ISACencLB_obj.s2nr                 = 0;
-  instLB->ISACencLB_obj.payloadLimitBytes30  = STREAM_SIZE_MAX_30;
-  instLB->ISACencLB_obj.payloadLimitBytes60  = STREAM_SIZE_MAX_60;
-  instLB->ISACencLB_obj.maxPayloadBytes      = STREAM_SIZE_MAX_60;
-  instLB->ISACencLB_obj.maxRateInBytes       = STREAM_SIZE_MAX_30;
-  instLB->ISACencLB_obj.enforceFrameSize     = 0;
-  /* invalid value prevents getRedPayload to
-     run before encoder is called */
-  instLB->ISACencLB_obj.lastBWIdx            = -1;
-  return statusInit;
-}
-
-static WebRtc_Word16 EncoderInitUb(
-				   ISACUBStruct* instUB,
-				   WebRtc_Word16   bandwidth)
-{
-  WebRtc_Word16 statusInit = 0;
-  int k;
-
-  /* Init stream vector to zero */
-  for(k = 0; k < STREAM_SIZE_MAX_60; k++)
-    {
-      instUB->ISACencUB_obj.bitstr_obj.stream[k] = 0;
-    }
-
-  WebRtcIsac_InitMasking(&instUB->ISACencUB_obj.maskfiltstr_obj);
-  WebRtcIsac_InitPreFilterbank(&instUB->ISACencUB_obj.prefiltbankstr_obj);
-
-  if(bandwidth == isac16kHz)
-    {
-      instUB->ISACencUB_obj.buffer_index = LB_TOTAL_DELAY_SAMPLES;
-    }
-  else
-    {
-      instUB->ISACencUB_obj.buffer_index        = 0;
-    }
-  /* default for I-mode */
-  instUB->ISACencUB_obj.bottleneck            = 32000;
-  // These store the limits for the wideband + super-wideband bit-stream.
-  instUB->ISACencUB_obj.maxPayloadSizeBytes    = STREAM_SIZE_MAX_30 << 1;
-  // This has to be updated after each lower-band encoding to guarantee
-  // a correct payload-limitation.
-  instUB->ISACencUB_obj.numBytesUsed         = 0;
-  memset(instUB->ISACencUB_obj.data_buffer_float, 0,
-         (MAX_FRAMESAMPLES + LB_TOTAL_DELAY_SAMPLES) * sizeof(float));
-
-  memcpy(&(instUB->ISACencUB_obj.lastLPCVec),
-         WebRtcIsac_kMeanLarUb16, sizeof(double) * UB_LPC_ORDER);
-
-  return statusInit;
-}
-
-
-WebRtc_Word16 WebRtcIsac_EncoderInit(
-				    ISACStruct* ISAC_main_inst,
-				    WebRtc_Word16 codingMode)
-{
-  ISACMainStruct *instISAC;
-  WebRtc_Word16 status;
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if((codingMode != 0) && (codingMode != 1))
-    {
-      instISAC->errorCode = ISAC_DISALLOWED_CODING_MODE;
-      return -1;
-    }
-  // default bottleneck
-  instISAC->bottleneck = MAX_ISAC_BW;
-
-  if(instISAC->encoderSamplingRateKHz == kIsacWideband)
-    {
-      instISAC->bandwidthKHz = isac8kHz;
-      instISAC->maxPayloadSizeBytes = STREAM_SIZE_MAX_60;
-      instISAC->maxRateBytesPer30Ms = STREAM_SIZE_MAX_30;
-    }
-  else
-    {
-      instISAC->bandwidthKHz = isac16kHz;
-      instISAC->maxPayloadSizeBytes = STREAM_SIZE_MAX;
-      instISAC->maxRateBytesPer30Ms = STREAM_SIZE_MAX;
-    }
-
-  // Channel-adaptive = 0; Instantaneous (Channel-independent) = 1;
-  instISAC->codingMode = codingMode;
-
-  WebRtcIsac_InitBandwidthEstimator(&instISAC->bwestimator_obj,
-                                    instISAC->encoderSamplingRateKHz,
-                                    instISAC->decoderSamplingRateKHz);
-
-  WebRtcIsac_InitRateModel(&instISAC->rate_data_obj);
-  /* default for I-mode */
-  instISAC->MaxDelay = 10.0;
-
-  status = EncoderInitLb(&instISAC->instLB, codingMode,
-			 instISAC->encoderSamplingRateKHz);
-  if(status < 0)
-    {
-      instISAC->errorCode = -status;
-      return -1;
-    }
-
-  if(instISAC->encoderSamplingRateKHz == kIsacSuperWideband)
-    {
-      // Initialize encoder filter-bank.
-      memset(instISAC->analysisFBState1, 0,
-	     FB_STATE_SIZE_WORD32 * sizeof(WebRtc_Word32));
-      memset(instISAC->analysisFBState2, 0,
-	     FB_STATE_SIZE_WORD32 * sizeof(WebRtc_Word32));
-
-      status = EncoderInitUb(&(instISAC->instUB),
-			     instISAC->bandwidthKHz);
-      if(status < 0)
-	{
-	  instISAC->errorCode = -status;
-	  return -1;
-	}
-    }
-  // Initializtion is successful, set the flag
-  instISAC->initFlag |= BIT_MASK_ENC_INIT;
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_Encode(...)
- *
- * This function encodes 10ms frame(s) and inserts it into a package.
- * Input speech length has to be 160 samples (10ms). The encoder buffers those
- * 10ms frames until it reaches the chosen Framesize (480 or 960 samples
- * corresponding to 30 or 60 ms frames), and then proceeds to the encoding.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - speechIn          : input speech vector.
- *
- * Output:
- *        - encoded           : the encoded data vector
- *
- * Return value:
- *                            : >0 - Length (in bytes) of coded data
- *                            :  0 - The buffer didn't reach the chosen
- *                                  frameSize so it keeps buffering speech
- *                                 samples.
- *                            : -1 - Error
- */
-WebRtc_Word16 WebRtcIsac_Encode(
-			       ISACStruct*        ISAC_main_inst,
-			       const WebRtc_Word16* speechIn,
-			       WebRtc_Word16*       encoded)
-{
-  ISACMainStruct* instISAC;
-  ISACLBStruct*   instLB;
-  ISACUBStruct*   instUB;
-
-  float        inFrame[FRAMESAMPLES_10ms];
-  WebRtc_Word16  speechInLB[FRAMESAMPLES_10ms];
-  WebRtc_Word16  speechInUB[FRAMESAMPLES_10ms];
-  WebRtc_Word16  streamLenLB;
-  WebRtc_Word16  streamLenUB;
-  WebRtc_Word16  streamLen;
-  WebRtc_Word16  k;
-  WebRtc_UWord8* ptrEncodedUW8 = (WebRtc_UWord8*)encoded;
-  int          garbageLen;
-  WebRtc_Word32  bottleneck;
-  WebRtc_Word16  bottleneckIdx = 0;
-  WebRtc_Word16  jitterInfo = 0;
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-  instLB = &(instISAC->instLB);
-  instUB = &(instISAC->instUB);
-
-  /* check if encoder initiated */
-  if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-     BIT_MASK_ENC_INIT)
-    {
-      instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-      return -1;
-    }
-
-  if(instISAC->encoderSamplingRateKHz == kIsacSuperWideband)
-    {
-      WebRtcSpl_AnalysisQMF(speechIn, speechInLB, speechInUB,
-			     instISAC->analysisFBState1, instISAC->analysisFBState2);
-
-      /* convert from fixed to floating point */
-      for(k = 0; k < FRAMESAMPLES_10ms; k++)
-	{
-	  inFrame[k] = (float)speechInLB[k];
-	}
-    }
-  else
-    {
-      for(k = 0; k < FRAMESAMPLES_10ms; k++)
-	{
-	  inFrame[k] = (float) speechIn[k];
-	}
-    }
-
-  /* add some noise to avoid denormal numbers */
-  inFrame[0] += (float)1.23455334e-3;
-  inFrame[1] -= (float)2.04324239e-3;
-  inFrame[2] += (float)1.90854954e-3;
-  inFrame[9] += (float)1.84854878e-3;
-
-
-  // This function will update the bottleneck if required
-  UpdateBottleneck(instISAC);
-
-  // Get the bandwith information which has to be sent to the other side
-  GetSendBandwidthInfo(instISAC, &bottleneckIdx, &jitterInfo);
-
-  //
-  // ENCODE LOWER-BAND
-  //
-  streamLenLB = WebRtcIsac_EncodeLb(inFrame, &instLB->ISACencLB_obj,
-                                    instISAC->codingMode, bottleneckIdx);
-
-  if(streamLenLB < 0)
-    {
-      return -1;
-    }
-
-  if(instISAC->encoderSamplingRateKHz == kIsacSuperWideband)
-    {
-      instUB = &(instISAC->instUB);
-
-      // convert to float
-      for(k = 0; k < FRAMESAMPLES_10ms; k++)
-	{
-	  inFrame[k] = (float) speechInUB[k];
-	}
-
-      /* add some noise to avoid denormal numbers */
-      inFrame[0] += (float)1.23455334e-3;
-      inFrame[1] -= (float)2.04324239e-3;
-      inFrame[2] += (float)1.90854954e-3;
-      inFrame[9] += (float)1.84854878e-3;
-
-      // Tell to upper-band the number of bytes used so far.
-      // This is for payload limitation.
-      instUB->ISACencUB_obj.numBytesUsed = streamLenLB + 1 +
-        LEN_CHECK_SUM_WORD8;
-
-      //
-      // ENCODE UPPER-BAND
-      //
-      switch(instISAC->bandwidthKHz)
-	{
-	case isac12kHz:
-	  {
-	    streamLenUB = WebRtcIsac_EncodeUb12(inFrame,
-						&instUB->ISACencUB_obj,
-						jitterInfo);
-	    break;
-	  }
-	case isac16kHz:
-	  {
-	    streamLenUB = WebRtcIsac_EncodeUb16(inFrame,
-						&instUB->ISACencUB_obj,
-						jitterInfo);
-	    break;
-	  }
-	case isac8kHz:
-	  {
-	    streamLenUB = 0;
-	    break;
-	  }
-	default:
-	  return -1;
-	}
-
-      if((streamLenUB < 0) &&
-	 (streamLenUB != -ISAC_PAYLOAD_LARGER_THAN_LIMIT))
-	{
-	  // an error has happened but this is not the error due to a
-	  // bit-stream larger than the limit
-	  return -1;
-	}
-
-      if(streamLenLB == 0)
-	{
-	  return 0;
-	}
-
-      // One bite is allocated for the length. According to older decoders
-      // so the length bit-stream plus one byte for size and
-      // LEN_CHECK_SUM_WORD8 for the checksum should be less than or equal
-      // to 255.
-      if((streamLenUB > (255 - (LEN_CHECK_SUM_WORD8 + 1))) ||
-	 (streamLenUB == -ISAC_PAYLOAD_LARGER_THAN_LIMIT))
-	{
-	  // we have got a too long bit-stream we skip the upper-band
-	  // bit-stream for this frame.
-	  streamLenUB = 0;
-	}
-
-      memcpy(ptrEncodedUW8, instLB->ISACencLB_obj.bitstr_obj.stream,
-	     streamLenLB);
-      streamLen = streamLenLB;
-      if(streamLenUB > 0)
-	{
-	  ptrEncodedUW8[streamLenLB] = (WebRtc_UWord8)(streamLenUB + 1 +
-						       LEN_CHECK_SUM_WORD8);
-	  memcpy(&ptrEncodedUW8[streamLenLB + 1],
-		 instUB->ISACencUB_obj.bitstr_obj.stream, streamLenUB);
-	  streamLen += ptrEncodedUW8[streamLenLB];
-	}
-      else
-	{
-	  ptrEncodedUW8[streamLenLB] = 0;
-	}
-    }
-  else
-    {
-      if(streamLenLB == 0)
-	{
-	  return 0;
-	}
-      memcpy(ptrEncodedUW8, instLB->ISACencLB_obj.bitstr_obj.stream,
-	     streamLenLB);
-      streamLenUB = 0;
-      streamLen = streamLenLB;
-    }
-
-  // Add Garbage if required.
-  WebRtcIsac_GetUplinkBandwidth(&instISAC->bwestimator_obj, &bottleneck);
-  if(instISAC->codingMode == 0)
-    {
-      int          minBytes;
-      int          limit;
-      WebRtc_UWord8* ptrGarbage;
-
-      instISAC->MaxDelay = (double)WebRtcIsac_GetUplinkMaxDelay(
-								&instISAC->bwestimator_obj);
-
-      /* update rate model and get minimum number of bytes in this packet */
-      minBytes = WebRtcIsac_GetMinBytes(&(instISAC->rate_data_obj),
-					streamLen, instISAC->instLB.ISACencLB_obj.current_framesamples,
-					bottleneck, instISAC->MaxDelay, instISAC->bandwidthKHz);
-
-      /* Make sure MinBytes does not exceed packet size limit */
-      if(instISAC->bandwidthKHz == isac8kHz)
-	{
-	  if(instLB->ISACencLB_obj.current_framesamples == FRAMESAMPLES)
-	    {
-	      limit = instLB->ISACencLB_obj.payloadLimitBytes30;
-	    }
-	  else
-	    {
-	      limit = instLB->ISACencLB_obj.payloadLimitBytes60;
-	    }
-	}
-      else
-	{
-	  limit = instUB->ISACencUB_obj.maxPayloadSizeBytes;
-	}
-      minBytes = (minBytes > limit)? limit:minBytes;
-
-      /* Make sure we don't allow more than 255 bytes of garbage data.
-	 We store the length of the garbage data in 8 bits in the bitstream,
-	 255 is the max garbage length we can signal using 8 bits. */
-      if((instISAC->bandwidthKHz == isac8kHz) ||
-	 (streamLenUB == 0))
-	{
-	  ptrGarbage = &ptrEncodedUW8[streamLenLB];
-	  limit = streamLen + 255;
-	}
-      else
-	{
-	  ptrGarbage = &ptrEncodedUW8[streamLenLB + 1 + streamLenUB];
-	  limit = streamLen + (255 - ptrEncodedUW8[streamLenLB]);
-	}
-      minBytes = (minBytes > limit)? limit:minBytes;
-
-      garbageLen = (minBytes > streamLen)? (minBytes - streamLen):0;
-
-      /* Save data for creation of multiple bitstreams */
-      //ISACencLB_obj->SaveEnc_obj.minBytes = MinBytes;
-
-      /* if bitstream is too short, add garbage at the end */
-      if(garbageLen > 0)
-	{
-	  for(k = 0; k < garbageLen; k++)
-	    {
-	      ptrGarbage[k] = (WebRtc_UWord8)(rand() & 0xFF);
-	    }
-
-	  // for a correct length of the upper-band bit-stream together
-	  // with the garbage. Garbage is embeded in upper-band bit-stream.
-	  //    That is the only way to preserve backward compatibility.
-	  if((instISAC->bandwidthKHz == isac8kHz) ||
-	     (streamLenUB == 0))
-	    {
-	      ptrEncodedUW8[streamLenLB] = (WebRtc_UWord8)garbageLen;
-	    }
-	  else
-	    {
-	      ptrEncodedUW8[streamLenLB] += (WebRtc_UWord8)garbageLen;
-	      // write the length of the garbage at the end of the upper-band
-	      // bit-stream, if exists. This helps for sanity check.
-	      ptrEncodedUW8[streamLenLB + 1 + streamLenUB] = (WebRtc_UWord8)garbageLen;
-
-	    }
-
-	  streamLen += garbageLen;
-	}
-    }
-  else
-    {
-      /* update rate model */
-      WebRtcIsac_UpdateRateModel(&instISAC->rate_data_obj, streamLen,
-				 instISAC->instLB.ISACencLB_obj.current_framesamples, bottleneck);
-      garbageLen = 0;
-    }
-
-  // Generate CRC if required.
-  if((instISAC->bandwidthKHz != isac8kHz) &&
-     (streamLenUB > 0))
-    {
-      WebRtc_UWord32 crc;
-
-      WebRtcIsac_GetCrc((WebRtc_Word16*)(&(ptrEncodedUW8[streamLenLB + 1])),
-			streamLenUB + garbageLen, &crc);
-#ifndef WEBRTC_BIG_ENDIAN
-      for(k = 0; k < LEN_CHECK_SUM_WORD8; k++)
-	{
-	  ptrEncodedUW8[streamLen - LEN_CHECK_SUM_WORD8 + k] =
-	    (WebRtc_UWord8)((crc >> (24 - k * 8)) & 0xFF);
-	}
-#else
-      memcpy(&ptrEncodedUW8[streamLenLB + streamLenUB + 1], &crc,
-	     LEN_CHECK_SUM_WORD8);
-#endif
-    }
-
-  return streamLen;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_GetNewBitStream(...)
- *
- * This function returns encoded data, with the recieved bwe-index in the
- * stream. If the rate is set to a value less than bottleneck of codec
- * the new bistream will be re-encoded with the given target rate.
- * It should always return a complete packet, i.e. only called once
- * even for 60 msec frames.
- *
- * NOTE 1! This function does not write in the ISACStruct, it is not allowed.
- * NOTE 3! Rates larger than the bottleneck of the codec will be limited
- *         to the current bottleneck.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - bweIndex          : Index of bandwidth estimate to put in new
- *                              bitstream
- *        - rate              : target rate of the transcoder is bits/sec.
- *                              Valid values are the accepted rate in iSAC,
- *                              i.e. 10000 to 56000.
- *
- * Output:
- *        - encoded           : The encoded data vector
- *
- * Return value               : >0 - Length (in bytes) of coded data
- *                              -1 - Error  or called in SWB mode
- *                                 NOTE! No error code is written to
- *                                 the struct since it is only allowed to read
- *                                 the struct.
- */
-WebRtc_Word16 WebRtcIsac_GetNewBitStream(
-					ISACStruct*  ISAC_main_inst,
-					WebRtc_Word16  bweIndex,
-					WebRtc_Word16  jitterInfo,
-					WebRtc_Word32  rate,
-					WebRtc_Word16* encoded,
-					WebRtc_Word16  isRCU)
-{
-  Bitstr iSACBitStreamInst;   /* Local struct for bitstream handling */
-  WebRtc_Word16 streamLenLB;
-  WebRtc_Word16 streamLenUB;
-  WebRtc_Word16 totalStreamLen;
-  double gain2;
-  double gain1;
-  float scale;
-  enum ISACBandwidth bandwidthKHz;
-  double rateLB;
-  double rateUB;
-  WebRtc_Word32 currentBN;
-  ISACMainStruct* instISAC;
-  WebRtc_UWord8* encodedPtrUW8 = (WebRtc_UWord8*)encoded;
-  WebRtc_UWord32 crc;
-#ifndef WEBRTC_BIG_ENDIAN
-  WebRtc_Word16  k;
-#endif
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-     BIT_MASK_ENC_INIT)
-    {
-      return -1;
-    }
-
-  // Get the bottleneck of this iSAC and limit the
-  // given rate to the current bottleneck.
-  WebRtcIsac_GetUplinkBw(ISAC_main_inst, &currentBN);
-  if(rate > currentBN)
-    {
-      rate = currentBN;
-    }
-
-  if(WebRtcIsac_RateAllocation(rate, &rateLB, &rateUB, &bandwidthKHz) < 0)
-    {
-      return -1;
-    }
-
-  // Cannot transcode from 16 kHz to 12 kHz
-  if((bandwidthKHz == isac12kHz) &&
-     (instISAC->bandwidthKHz == isac16kHz))
-    {
-      return -1;
-    }
-
-  // These gains are in dB
-  // gain for the given rate.
-  gain1 = WebRtcIsac_GetSnr(rateLB,
-			    instISAC->instLB.ISACencLB_obj.current_framesamples);
-  // gain of this iSAC
-  gain2 = WebRtcIsac_GetSnr(
-			    instISAC->instLB.ISACencLB_obj.bottleneck,
-			    instISAC->instLB.ISACencLB_obj.current_framesamples);
-
-  // scale is the ratio of two gains in normal domain.
-  scale = (float)pow(10, (gain1 - gain2) / 20.0);
-  // change the scale if this is a RCU bit-stream.
-  scale = (isRCU)? (scale * RCU_TRANSCODING_SCALE):scale;
-
-  streamLenLB = WebRtcIsac_EncodeStoredDataLb(
-					      &instISAC->instLB.ISACencLB_obj.SaveEnc_obj, &iSACBitStreamInst,
-					      bweIndex, scale);
-
-  if(streamLenLB < 0)
-    {
-      return -1;
-    }
-
-  /* convert from bytes to WebRtc_Word16 */
-  memcpy(encoded, iSACBitStreamInst.stream, streamLenLB);
-
-  if(bandwidthKHz == isac8kHz)
-    {
-      return streamLenLB;
-    }
-
-  totalStreamLen = streamLenLB;
-  // super-wideband is always at 30ms.
-  // These gains are in dB
-  // gain for the given rate.
-  gain1 = WebRtcIsac_GetSnr(rateUB, FRAMESAMPLES);
-  // gain of this iSAC
-  gain2 = WebRtcIsac_GetSnr(
-			    instISAC->instUB.ISACencUB_obj.bottleneck, FRAMESAMPLES);
-
-  // scale is the ratio of two gains in normal domain.
-  scale = (float)pow(10, (gain1 - gain2) / 20.0);
-
-  // change the scale if this is a RCU bit-stream.
-  scale = (isRCU)? (scale * RCU_TRANSCODING_SCALE_UB):scale;
-
-  switch(instISAC->bandwidthKHz)
-    {
-    case isac12kHz:
-      {
-        streamLenUB = WebRtcIsac_EncodeStoredDataUb12(
-						      &(instISAC->instUB.ISACencUB_obj.SaveEnc_obj),
-						      &iSACBitStreamInst, jitterInfo, scale);
-        break;
-      }
-    case isac16kHz:
-      {
-        streamLenUB = WebRtcIsac_EncodeStoredDataUb16(
-						      &(instISAC->instUB.ISACencUB_obj.SaveEnc_obj),
-						      &iSACBitStreamInst, jitterInfo, scale);
-        break;
-      }
-    default:
-      return -1;
-    }
-
-  if(streamLenUB < 0)
-    {
-      return -1;
-    }
-
-  if(streamLenUB + 1 + LEN_CHECK_SUM_WORD8 > 255)
-    {
-      return streamLenLB;
-    }
-
-  totalStreamLen = streamLenLB + streamLenUB + 1 + LEN_CHECK_SUM_WORD8;
-  encodedPtrUW8[streamLenLB] = streamLenUB + 1 + LEN_CHECK_SUM_WORD8;
-
-  memcpy(&encodedPtrUW8[streamLenLB+1], iSACBitStreamInst.stream,
-         streamLenUB);
-
-  WebRtcIsac_GetCrc((WebRtc_Word16*)(&(encodedPtrUW8[streamLenLB + 1])),
-                    streamLenUB, &crc);
-#ifndef WEBRTC_BIG_ENDIAN
-  for(k = 0; k < LEN_CHECK_SUM_WORD8; k++)
-    {
-      encodedPtrUW8[totalStreamLen - LEN_CHECK_SUM_WORD8 + k] =
-        (WebRtc_UWord8)((crc >> (24 - k * 8)) & 0xFF);
-    }
-#else
-  memcpy(&encodedPtrUW8[streamLenLB + streamLenUB + 1], &crc,
-         LEN_CHECK_SUM_WORD8);
-#endif
-
-
-  return totalStreamLen;
-}
-
-
-/****************************************************************************
- * DecoderInitLb(...) - internal function for initialization of
- *                                Lower Band
- * DecoderInitUb(...) - internal function for initialization of
- *                                Upper Band
- * WebRtcIsac_DecoderInit(...) - API function
- *
- * This function initializes a ISAC instance prior to the decoder calls.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *
- * Return value
- *                            :  0 - Ok
- *                              -1 - Error
- */
-static WebRtc_Word16 DecoderInitLb(
-				   ISACLBStruct* instISAC)
-{
-  int i;
-  /* Init stream vector to zero */
-  for (i=0; i<STREAM_SIZE_MAX_60; i++)
-    {
-      instISAC->ISACdecLB_obj.bitstr_obj.stream[i] = 0;
-    }
-
-  WebRtcIsac_InitMasking(&instISAC->ISACdecLB_obj.maskfiltstr_obj);
-  WebRtcIsac_InitPostFilterbank(
-				&instISAC->ISACdecLB_obj.postfiltbankstr_obj);
-  WebRtcIsac_InitPitchFilter(&instISAC->ISACdecLB_obj.pitchfiltstr_obj);
-
-  return (0);
-}
-
-static WebRtc_Word16 DecoderInitUb(
-				   ISACUBStruct* instISAC)
-{
-  int i;
-  /* Init stream vector to zero */
-  for (i = 0; i < STREAM_SIZE_MAX_60; i++)
-    {
-      instISAC->ISACdecUB_obj.bitstr_obj.stream[i] = 0;
-    }
-
-  WebRtcIsac_InitMasking(&instISAC->ISACdecUB_obj.maskfiltstr_obj);
-  WebRtcIsac_InitPostFilterbank(
-				&instISAC->ISACdecUB_obj.postfiltbankstr_obj);
-  return (0);
-}
-
-WebRtc_Word16 WebRtcIsac_DecoderInit(
-				    ISACStruct *ISAC_main_inst)
-{
-  ISACMainStruct* instISAC;
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if(DecoderInitLb(&instISAC->instLB) < 0)
-    {
-      return -1;
-    }
-
-  if(instISAC->decoderSamplingRateKHz == kIsacSuperWideband)
-    {
-      memset(instISAC->synthesisFBState1, 0,
-	     FB_STATE_SIZE_WORD32 * sizeof(WebRtc_Word32));
-      memset(instISAC->synthesisFBState2, 0,
-	     FB_STATE_SIZE_WORD32 * sizeof(WebRtc_Word32));
-
-      if(DecoderInitUb(&(instISAC->instUB)) < 0)
-	{
-	  return -1;
-	}
-    }
-
-  if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-     BIT_MASK_ENC_INIT)
-    {
-      WebRtcIsac_InitBandwidthEstimator(&instISAC->bwestimator_obj,
-					instISAC->encoderSamplingRateKHz,
-					instISAC->decoderSamplingRateKHz);
-    }
-
-  instISAC->initFlag |= BIT_MASK_DEC_INIT;
-
-  instISAC->resetFlag_8kHz = 0;
-
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_UpdateBwEstimate(...)
- *
- * This function updates the estimate of the bandwidth.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - encoded           : encoded ISAC frame(s).
- *        - packet_size       : size of the packet.
- *        - rtp_seq_number    : the RTP number of the packet.
- *        - arr_ts            : the arrival time of the packet (from NetEq)
- *                              in samples.
- *
- * Return value               :  0 - Ok
- *                              -1 - Error
- */
-WebRtc_Word16 WebRtcIsac_UpdateBwEstimate(
-				  ISACStruct*         ISAC_main_inst,
-				  const WebRtc_UWord16* encoded,
-				  WebRtc_Word32         packet_size,
-				  WebRtc_UWord16        rtp_seq_number,
-				  WebRtc_UWord32        send_ts,
-				  WebRtc_UWord32        arr_ts)
-{
-  ISACMainStruct *instISAC;
-  Bitstr streamdata;
-#ifndef WEBRTC_BIG_ENDIAN
-  int k;
-#endif
-  WebRtc_Word16 err;
-
-  /* typecast pointer to real structure */
-  instISAC = (ISACMainStruct *)ISAC_main_inst;
-
-  /* check if decoder initiated */
-  if((instISAC->initFlag & BIT_MASK_DEC_INIT) !=
-     BIT_MASK_DEC_INIT)
-    {
-      instISAC->errorCode = ISAC_DECODER_NOT_INITIATED;
-      return -1;
-    }
-
-  if(packet_size <= 0)
-    {
-      /* return error code if the packet length is null */
-      instISAC->errorCode = ISAC_EMPTY_PACKET;
-      return -1;
-    }
-
-  streamdata.W_upper = 0xFFFFFFFF;
-  streamdata.streamval = 0;
-  streamdata.stream_index = 0;
-
-#ifndef WEBRTC_BIG_ENDIAN
-  for(k = 0; k < 10; k++)
-    {
-      streamdata.stream[k] = (WebRtc_UWord8) ((encoded[k>>1] >>
-					       ((k&1) << 3)) & 0xFF);
-    }
-#else
-  memcpy(streamdata.stream, encoded, 10);
-#endif
-
-  err = WebRtcIsac_EstimateBandwidth(&instISAC->bwestimator_obj, &streamdata,
-                                     packet_size, rtp_seq_number, send_ts, arr_ts,
-                                     instISAC->encoderSamplingRateKHz,
-                                     instISAC->decoderSamplingRateKHz);
-
-  if(err < 0)
-    {
-      /* return error code if something went wrong */
-      instISAC->errorCode = -err;
-      return -1;
-    }
-
-  return 0;
-}
-
-static WebRtc_Word16 Decode(
-			    ISACStruct*         ISAC_main_inst,
-			    const WebRtc_UWord16* encoded,
-			    WebRtc_Word16         lenEncodedBytes,
-			    WebRtc_Word16*        decoded,
-			    WebRtc_Word16*        speechType,
-			    WebRtc_Word16         isRCUPayload)
-{
-  /* number of samples (480 or 960), output from decoder
-     that were actually used in the encoder/decoder
-     (determined on the fly) */
-  ISACMainStruct* instISAC;
-  ISACUBDecStruct* decInstUB;
-  ISACLBDecStruct*    decInstLB;
-
-  WebRtc_Word16  numSamplesLB;
-  WebRtc_Word16  numSamplesUB;
-  WebRtc_Word16  speechIdx;
-  float        outFrame[MAX_FRAMESAMPLES];
-  WebRtc_Word16  outFrameLB[MAX_FRAMESAMPLES];
-  WebRtc_Word16  outFrameUB[MAX_FRAMESAMPLES];
-  WebRtc_Word16  numDecodedBytesLB;
-  WebRtc_Word16  numDecodedBytesUB;
-  WebRtc_Word16  lenEncodedLBBytes;
-  WebRtc_Word16  validChecksum = 1;
-  WebRtc_Word16  k;
-  WebRtc_UWord8* ptrEncodedUW8 = (WebRtc_UWord8*)encoded;
-  WebRtc_UWord16 numLayer;
-  WebRtc_Word16  totSizeBytes;
-  WebRtc_Word16  err;
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-  decInstUB = &(instISAC->instUB.ISACdecUB_obj);
-  decInstLB = &(instISAC->instLB.ISACdecLB_obj);
-
-  /* check if decoder initiated */
-  if((instISAC->initFlag & BIT_MASK_DEC_INIT) !=
-     BIT_MASK_DEC_INIT)
-    {
-      instISAC->errorCode = ISAC_DECODER_NOT_INITIATED;
-      return -1;
-    }
-
-  if(lenEncodedBytes <= 0)
-    {
-      /* return error code if the packet length is null */
-      instISAC->errorCode = ISAC_EMPTY_PACKET;
-      return -1;
-    }
-
-  // the size of the rncoded lower-band is bounded by
-  // STREAM_SIZE_MAX,
-  // If a payload with the size larger than STREAM_SIZE_MAX
-  // is received, it is not considered erroneous.
-  lenEncodedLBBytes = (lenEncodedBytes > STREAM_SIZE_MAX)
-    ?  STREAM_SIZE_MAX:lenEncodedBytes;
-
-  // Copy to lower-band bit-stream structure
-  memcpy(instISAC->instLB.ISACdecLB_obj.bitstr_obj.stream, ptrEncodedUW8,
-         lenEncodedLBBytes);
-
-  // Regardless of that the current codec is setup to work in
-  // wideband or super-wideband, the decoding of the lower-band
-  // has to be performed.
-  numDecodedBytesLB = WebRtcIsac_DecodeLb(outFrame, decInstLB,
-                                          &numSamplesLB, isRCUPayload);
-
-  // Check for error
-  if((numDecodedBytesLB < 0) ||
-     (numDecodedBytesLB > lenEncodedLBBytes) ||
-     (numSamplesLB > MAX_FRAMESAMPLES))
-    {
-      instISAC->errorCode = ISAC_LENGTH_MISMATCH;
-      return -1;
-    }
-
-  // Error Check, we accept multi-layer bit-stream
-  // This will limit number of iterations of the
-  // while loop. Even withouut this the number of iterations
-  // is limited.
-  numLayer = 1;
-  totSizeBytes = numDecodedBytesLB;
-  while(totSizeBytes != lenEncodedBytes)
-    {
-      if((totSizeBytes > lenEncodedBytes) ||
-	 (ptrEncodedUW8[totSizeBytes] == 0) ||
-	 (numLayer > MAX_NUM_LAYERS))
-	{
-	  instISAC->errorCode = ISAC_LENGTH_MISMATCH;
-	  return -1;
-	}
-      totSizeBytes += ptrEncodedUW8[totSizeBytes];
-      numLayer++;
-    }
-
-  if(instISAC->decoderSamplingRateKHz == kIsacWideband)
-    {
-      for(k = 0; k < numSamplesLB; k++)
-	{
-	  if(outFrame[k] > 32767)
-	    {
-	      decoded[k] = 32767;
-	    }
-	  else if(outFrame[k] < -32768)
-	    {
-	      decoded[k] = -32768;
-	    }
-	  else
-	    {
-              decoded[k] = (WebRtc_Word16)WebRtcIsac_lrint(outFrame[k]);
-	    }
-	}
-      numSamplesUB = 0;
-    }
-  else
-    {
-      WebRtc_UWord32 crc;
-      // We don't accept larger than 30ms (480 samples at lower-band)
-      // frame-size.
-      for(k = 0; k < numSamplesLB; k++)
-	{
-	  if(outFrame[k] > 32767)
-	    {
-	      outFrameLB[k] = 32767;
-	    }
-	  else if(outFrame[k] < -32768)
-	    {
-	      outFrameLB[k] = -32768;
-	    }
-	  else
-	    {
-              outFrameLB[k] = (WebRtc_Word16)WebRtcIsac_lrint(outFrame[k]);
-	    }
-	}
-
-      //numSamplesUB = numSamplesLB;
-
-      // Check for possible error, and if upper-band stream exist.
-      if(numDecodedBytesLB == lenEncodedBytes)
-	{
-	  // Decoding was successful. No super-wideband bitstream
-	  // exists.
-	  numSamplesUB = numSamplesLB;
-	  memset(outFrameUB, 0, sizeof(WebRtc_Word16) *  numSamplesUB);
-
-	  // Prepare for the potential increase of signal bandwidth
-	  instISAC->resetFlag_8kHz = 2;
-	}
-      else
-	{
-	  // this includes the check sum and the bytes that stores the
-	  // length
-	  WebRtc_Word16 lenNextStream = ptrEncodedUW8[numDecodedBytesLB];
-
-	  // Is this garbage or valid super-wideband bit-stream?
-	  // Check if checksum is valid
-	  if(lenNextStream <= (LEN_CHECK_SUM_WORD8 + 1))
-	    {
-	      // such a small second layer cannot be super-wideband layer.
-	      // It must be a short garbage.
-	      validChecksum = 0;
-	    }
-	  else
-	    {
-	      // Run CRC to see if the checksum match.
-	      WebRtcIsac_GetCrc((WebRtc_Word16*)(
-						 &ptrEncodedUW8[numDecodedBytesLB + 1]),
-				lenNextStream - LEN_CHECK_SUM_WORD8 - 1, &crc);
-
-	      validChecksum = 1;
-	      for(k = 0; k < LEN_CHECK_SUM_WORD8; k++)
-		{
-		  validChecksum &= (((crc >> (24 - k * 8)) & 0xFF) ==
-				    ptrEncodedUW8[numDecodedBytesLB + lenNextStream -
-						  LEN_CHECK_SUM_WORD8 + k]);
-		}
-	    }
-
-	  if(!validChecksum)
-	    {
-	      // this is a garbage, we have received a wideband
-	      // bit-stream with garbage
-	      numSamplesUB = numSamplesLB;
-	      memset(outFrameUB, 0, sizeof(WebRtc_Word16) * numSamplesUB);
-	    }
-	  else
-	    {
-	      // A valid super-wideband biststream exists.
-	      enum ISACBandwidth bandwidthKHz;
-	      WebRtc_Word32 maxDelayBit;
-
-	      //instISAC->bwestimator_obj.incomingStreamSampFreq =
-	      //    kIsacSuperWideband;
-	      // If we have super-wideband bit-stream, we cannot
-	      // have 60 ms frame-size.
-	      if(numSamplesLB > FRAMESAMPLES)
-		{
-		  instISAC->errorCode = ISAC_LENGTH_MISMATCH;
-		  return -1;
-		}
-
-	      // the rest of the bit-stream contains the upper-band
-	      // bit-stream curently this is the only thing there,
-	      // however, we might add more layers.
-
-	      // Have to exclude one byte where the length is stored
-	      // and last 'LEN_CHECK_SUM_WORD8' bytes where the
-	      // checksum is stored.
-	      lenNextStream -= (LEN_CHECK_SUM_WORD8 + 1);
-
-	      memcpy(decInstUB->bitstr_obj.stream,
-		     &ptrEncodedUW8[numDecodedBytesLB + 1], lenNextStream);
-
-	      // THIS IS THE FIRST DECODING
-	      decInstUB->bitstr_obj.W_upper      = 0xFFFFFFFF;
-	      decInstUB->bitstr_obj.streamval    = 0;
-	      decInstUB->bitstr_obj.stream_index = 0;
-
-	      // Decode jitter infotmation
-	      err = WebRtcIsac_DecodeJitterInfo(&decInstUB->bitstr_obj,
-						&maxDelayBit);
-	      // error check
-	      if(err < 0)
-		{
-		  instISAC->errorCode = -err;
-		  return -1;
-		}
-
-	      // Update jitter info which is in the upper-band bit-stream
-	      // only if the encoder is in super-wideband. Otherwise,
-	      // the jitter info is already embeded in bandwidth index
-	      // and has been updated.
-	      if(instISAC->encoderSamplingRateKHz == kIsacSuperWideband)
-		{
-		  err = WebRtcIsac_UpdateUplinkJitter(
-						      &(instISAC->bwestimator_obj), maxDelayBit);
-		  if(err < 0)
-		    {
-		      instISAC->errorCode = -err;
-		      return -1;
-		    }
-		}
-
-	      // decode bandwidth information
-	      err = WebRtcIsac_DecodeBandwidth(&decInstUB->bitstr_obj,
-					       &bandwidthKHz);
-	      if(err < 0)
-		{
-		  instISAC->errorCode = -err;
-		  return -1;
-		}
-
-	      switch(bandwidthKHz)
-		{
-		case isac12kHz:
-		  {
-		    numDecodedBytesUB = WebRtcIsac_DecodeUb12(outFrame,
-							      decInstUB, isRCUPayload);
-
-		    // Hang-over for transient alleviation -
-		    // wait two frames to add the upper band going up from 8 kHz
-		    if (instISAC->resetFlag_8kHz > 0)
-		      {
-			if (instISAC->resetFlag_8kHz == 2)
-			  {
-			    // Silence first and a half frame
-			    memset(outFrame, 0, MAX_FRAMESAMPLES *
-				   sizeof(float));
-			  }
-			else
-			  {
-			    const float rampStep = 2.0f / MAX_FRAMESAMPLES;
-			    float rampVal = 0;
-			    memset(outFrame, 0, (MAX_FRAMESAMPLES>>1) *
-				   sizeof(float));
-
-			    // Ramp up second half of second frame
-			    for(k = MAX_FRAMESAMPLES/2; k < MAX_FRAMESAMPLES; k++)
-			      {
-				outFrame[k] *= rampVal;
-				rampVal += rampStep;
-			      }
-			  }
-			instISAC->resetFlag_8kHz -= 1;
-		      }
-
-		    break;
-		  }
-		case isac16kHz:
-		  {
-		    numDecodedBytesUB = WebRtcIsac_DecodeUb16(outFrame,
-							      decInstUB, isRCUPayload);
-		    break;
-		  }
-		default:
-		  return -1;
-		}
-
-	      // it might be less due to garbage.
-	      if((numDecodedBytesUB != lenNextStream) &&
-		 (numDecodedBytesUB != (lenNextStream - ptrEncodedUW8[
-								      numDecodedBytesLB + 1 + numDecodedBytesUB])))
-		{
-		  instISAC->errorCode = ISAC_LENGTH_MISMATCH;
-		  return -1;
-		}
-
-	      // If there is no error Upper-band always decodes
-	      // 30 ms (480 samples)
-	      numSamplesUB = FRAMESAMPLES;
-
-	      // Convert to W16
-	      for(k = 0; k < numSamplesUB; k++)
-		{
-		  if(outFrame[k] > 32767)
-		    {
-		      outFrameUB[k] = 32767;
-		    }
-		  else if(outFrame[k] < -32768)
-		    {
-		      outFrameUB[k] = -32768;
-		    }
-		  else
-		    {
-                      outFrameUB[k] = (WebRtc_Word16)WebRtcIsac_lrint(
-                          outFrame[k]);
-		    }
-		}
-	    }
-	}
-
-      speechIdx = 0;
-      while(speechIdx < numSamplesLB)
-	{
-	  WebRtcSpl_SynthesisQMF(&outFrameLB[speechIdx],
-				  &outFrameUB[speechIdx], &decoded[(speechIdx<<1)],
-				  instISAC->synthesisFBState1, instISAC->synthesisFBState2);
-
-	  speechIdx += FRAMESAMPLES_10ms;
-	}
-    }
-  *speechType = 0;
-  return (numSamplesLB + numSamplesUB);
-}
-
-
-
-
-
-
-
-/****************************************************************************
- * WebRtcIsac_Decode(...)
- *
- * This function decodes a ISAC frame. Output speech length
- * will be a multiple of 480 samples: 480 or 960 samples,
- * depending on the  frameSize (30 or 60 ms).
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - encoded           : encoded ISAC frame(s)
- *        - len               : bytes in encoded vector
- *
- * Output:
- *        - decoded           : The decoded vector
- *
- * Return value               : >0 - number of samples in decoded vector
- *                              -1 - Error
- */
-
-WebRtc_Word16 WebRtcIsac_Decode(
-			       ISACStruct*         ISAC_main_inst,
-			       const WebRtc_UWord16* encoded,
-			       WebRtc_Word16         lenEncodedBytes,
-			       WebRtc_Word16*        decoded,
-			       WebRtc_Word16*        speechType)
-{
-  WebRtc_Word16 isRCUPayload = 0;
-  return Decode(ISAC_main_inst, encoded, lenEncodedBytes, decoded,
-		speechType, isRCUPayload);
-}
-
-/****************************************************************************
- * WebRtcIsac_DecodeRcu(...)
- *
- * This function decodes a redundant (RCU) iSAC frame. Function is called in
- * NetEq with a stored RCU payload i case of packet loss. Output speech length
- * will be a multiple of 480 samples: 480 or 960 samples,
- * depending on the framesize (30 or 60 ms).
- *
- * Input:
- *      - ISAC_main_inst     : ISAC instance.
- *      - encoded            : encoded ISAC RCU frame(s)
- *      - len                : bytes in encoded vector
- *
- * Output:
- *      - decoded            : The decoded vector
- *
- * Return value              : >0 - number of samples in decoded vector
- *                             -1 - Error
- */
-
-
-
-WebRtc_Word16 WebRtcIsac_DecodeRcu(
-				  ISACStruct*         ISAC_main_inst,
-				  const WebRtc_UWord16* encoded,
-				  WebRtc_Word16         lenEncodedBytes,
-				  WebRtc_Word16*        decoded,
-				  WebRtc_Word16*        speechType)
-{
-  WebRtc_Word16 isRCUPayload = 1;
-  return Decode(ISAC_main_inst, encoded, lenEncodedBytes, decoded,
-		speechType, isRCUPayload);
-}
-
-
-/****************************************************************************
- * WebRtcIsac_DecodePlc(...)
- *
- * This function conducts PLC for ISAC frame(s). Output speech length
- * will be a multiple of 480 samples: 480 or 960 samples,
- * depending on the  frameSize (30 or 60 ms).
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - noOfLostFrames    : Number of PLC frames to produce
- *
- * Output:
- *        - decoded           : The decoded vector
- *
- * Return value               : >0 - number of samples in decoded PLC vector
- *                              -1 - Error
- */
-WebRtc_Word16 WebRtcIsac_DecodePlc(
-				  ISACStruct*         ISAC_main_inst,
-				  WebRtc_Word16*        decoded,
-				  WebRtc_Word16         noOfLostFrames)
-{
-  WebRtc_Word16 numSamples;
-  ISACMainStruct* instISAC;
-
-
-  /* typecast pointer to real structure */
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  /* Limit number of frames to two = 60 msec. Otherwise we exceed data vectors */
-  if(noOfLostFrames > 2)
-    {
-      noOfLostFrames = 2;
-    }
-
-  /* Get the number of samples per frame */
-  switch(instISAC->decoderSamplingRateKHz)
-    {
-    case kIsacWideband:
-      {
-        numSamples = 480 * noOfLostFrames;
-        break;
-      }
-    case kIsacSuperWideband:
-      {
-        numSamples = 960 * noOfLostFrames;
-        break;
-      }
-    default:
-      return -1;
-    }
-
-  /* Set output samples to zero */
-  memset(decoded, 0, numSamples * sizeof(WebRtc_Word16));
-  return numSamples;
-}
-
-
-/****************************************************************************
- * ControlLb(...) - Internal function for controling Lower Band
- * ControlUb(...) - Internal function for controling Upper Band
- * WebRtcIsac_Control(...) - API function
- *
- * This function sets the limit on the short-term average bit rate and the
- * frame length. Should be used only in Instantaneous mode.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - rate              : limit on the short-term average bit rate,
- *                              in bits/second (between 10000 and 32000)
- *        -  frameSize         : number of milliseconds per frame (30 or 60)
- *
- * Return value               : 0  - ok
- *                             -1 - Error
- */
-static WebRtc_Word16 ControlLb(
-					  ISACLBStruct* instISAC,
-					  double        rate,
-					  WebRtc_Word16   frameSize)
-{
-  if((rate >= 10000) && (rate <= 32000))
-    {
-      instISAC->ISACencLB_obj.bottleneck = rate;
-    }
-  else
-    {
-      return -ISAC_DISALLOWED_BOTTLENECK;
-    }
-
-  if((frameSize == 30) ||  (frameSize == 60))
-    {
-      instISAC->ISACencLB_obj.new_framelength = (FS/1000) *  frameSize;
-    }
-  else
-    {
-      return -ISAC_DISALLOWED_FRAME_LENGTH;
-    }
-
-  return 0;
-}
-
-static WebRtc_Word16 ControlUb(
-					  ISACUBStruct* instISAC,
-					  double        rate)
-{
-  if((rate >= 10000) && (rate <= 32000))
-    {
-      instISAC->ISACencUB_obj.bottleneck = rate;
-    }
-  else
-    {
-      return -ISAC_DISALLOWED_BOTTLENECK;
-    }
-  return 0;
-}
-
-WebRtc_Word16 WebRtcIsac_Control(
-				ISACStruct* ISAC_main_inst,
-				WebRtc_Word32 bottleneckBPS,
-				WebRtc_Word16 frameSize)
-{
-  ISACMainStruct *instISAC;
-  WebRtc_Word16 status;
-  double rateLB;
-  double rateUB;
-  enum ISACBandwidth bandwidthKHz;
-
-
-  /* Typecast pointer to real structure */
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if(instISAC->codingMode == 0)
-    {
-      /* in adaptive mode */
-      instISAC->errorCode = ISAC_MODE_MISMATCH;
-      return -1;
-    }
-
-  /* check if encoder initiated */
-  if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-     BIT_MASK_ENC_INIT)
-    {
-      instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-      return -1;
-    }
-
-  if(instISAC->encoderSamplingRateKHz == kIsacWideband)
-    {
-      // if the sampling rate is 16kHz then bandwith should be 8kHz,
-      // regardless of bottleneck.
-      bandwidthKHz = isac8kHz;
-      rateLB = (bottleneckBPS > 32000)? 32000:bottleneckBPS;
-      rateUB = 0;
-    }
-  else
-    {
-      if(WebRtcIsac_RateAllocation(bottleneckBPS, &rateLB, &rateUB,
-				   &bandwidthKHz) < 0)
-	{
-	  return -1;
-	}
-    }
-
-  if((instISAC->encoderSamplingRateKHz == kIsacSuperWideband) &&
-     (frameSize != 30)                                      &&
-     (bandwidthKHz != isac8kHz))
-    {
-      // Cannot have 60 ms in super-wideband
-      instISAC->errorCode = ISAC_DISALLOWED_FRAME_LENGTH;
-      return -1;
-    }
-
-  status = ControlLb(&instISAC->instLB, rateLB, frameSize);
-  if(status < 0)
-    {
-      instISAC->errorCode = -status;
-      return -1;
-    }
-  if(bandwidthKHz != isac8kHz)
-    {
-      status = ControlUb(&(instISAC->instUB), rateUB);
-      if(status < 0)
-	{
-	  instISAC->errorCode = -status;
-	  return -1;
-	}
-    }
-
-  //
-  // Check if bandwidth is changing from wideband to super-wideband
-  // then we have to synch data buffer of lower & upper-band. also
-  // clean up the upper-band data buffer.
-  //
-  if((instISAC->bandwidthKHz == isac8kHz) &&
-     (bandwidthKHz != isac8kHz))
-    {
-      memset(instISAC->instUB.ISACencUB_obj.data_buffer_float, 0,
-	     sizeof(float) * (MAX_FRAMESAMPLES + LB_TOTAL_DELAY_SAMPLES));
-
-      if(bandwidthKHz == isac12kHz)
-	{
-	  instISAC->instUB.ISACencUB_obj.buffer_index =
-	    instISAC->instLB.ISACencLB_obj.buffer_index;
-	}
-      else
-	{
-	  instISAC->instUB.ISACencUB_obj.buffer_index = LB_TOTAL_DELAY_SAMPLES +
-	    instISAC->instLB.ISACencLB_obj.buffer_index;
-
-	  memcpy(&(instISAC->instUB.ISACencUB_obj.lastLPCVec),
-            WebRtcIsac_kMeanLarUb16, sizeof(double) * UB_LPC_ORDER);
-	}
-    }
-
-  // update the payload limit it the bandwidth is changing.
-  if(instISAC->bandwidthKHz != bandwidthKHz)
-    {
-      instISAC->bandwidthKHz = bandwidthKHz;
-      UpdatePayloadSizeLimit(instISAC);
-    }
-  instISAC->bottleneck = bottleneckBPS;
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_ControlBwe(...)
- *
- * This function sets the initial values of bottleneck and frame-size if
- * iSAC is used in channel-adaptive mode. Through this API, users can
- * enforce a frame-size for all values of bottleneck. Then iSAC will not
- * automatically change the frame-size.
- *
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - rateBPS           : initial value of bottleneck in bits/second
- *                              10000 <= rateBPS <= 32000 is accepted
- *                              For default bottleneck set rateBPS = 0
- *        - frameSizeMs       : number of milliseconds per frame (30 or 60)
- *        - enforceFrameSize  : 1 to enforce the given frame-size through out
- *                              the adaptation process, 0 to let iSAC change
- *                              the frame-size if required.
- *
- * Return value               : 0  - ok
- *                             -1 - Error
- */
-WebRtc_Word16 WebRtcIsac_ControlBwe(
-				   ISACStruct* ISAC_main_inst,
-				   WebRtc_Word32 bottleneckBPS,
-				   WebRtc_Word16 frameSizeMs,
-				   WebRtc_Word16 enforceFrameSize)
-{
-  ISACMainStruct *instISAC;
-  enum ISACBandwidth bandwidth;
-
-  /* Typecast pointer to real structure */
-  instISAC = (ISACMainStruct *)ISAC_main_inst;
-
-  /* check if encoder initiated */
-  if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-     BIT_MASK_ENC_INIT)
-    {
-      instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-      return -1;
-    }
-
-  /* Check that we are in channel-adaptive mode, otherwise, return (-1) */
-  if(instISAC->codingMode != 0)
-    {
-      instISAC->errorCode = ISAC_MODE_MISMATCH;
-      return -1;
-    }
-  if((frameSizeMs != 30) &&
-     (instISAC->encoderSamplingRateKHz == kIsacSuperWideband))
-    {
-      return -1;
-    }
-
-  /* Set struct variable if enforceFrameSize is set. ISAC will then */
-  /* keep the chosen frame size. */
-  if((enforceFrameSize != 0) /*||
-                               (instISAC->samplingRateKHz == kIsacSuperWideband)*/)
-    {
-      instISAC->instLB.ISACencLB_obj.enforceFrameSize = 1;
-    }
-  else
-    {
-      instISAC->instLB.ISACencLB_obj.enforceFrameSize = 0;
-    }
-
-  /* Set initial rate, if value between 10000 and 32000,                */
-  /* if rateBPS is 0, keep the default initial bottleneck value (15000) */
-  if(bottleneckBPS != 0)
-    {
-      double rateLB;
-      double rateUB;
-      if(WebRtcIsac_RateAllocation(bottleneckBPS, &rateLB, &rateUB, &bandwidth) < 0)
-	{
-	  return -1;
-	}
-      instISAC->bwestimator_obj.send_bw_avg = (float)bottleneckBPS;
-      instISAC->bandwidthKHz = bandwidth;
-    }
-
-  /* Set initial  frameSize. If enforceFrameSize is set the frame size will
-     not change */
-  if(frameSizeMs != 0)
-    {
-      if((frameSizeMs  == 30) || (frameSizeMs == 60))
-	{
-	  instISAC->instLB.ISACencLB_obj.new_framelength = (FS/1000) *
-	    frameSizeMs;
-	  //instISAC->bwestimator_obj.rec_header_rate = ((float)HEADER_SIZE *
-	  //    8.0f * 1000.0f / (float)frameSizeMs);
-	}
-      else
-	{
-	  instISAC->errorCode = ISAC_DISALLOWED_FRAME_LENGTH;
-	  return -1;
-	}
-    }
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_GetDownLinkBwIndex(...)
- *
- * This function returns index representing the Bandwidth estimate from
- * other side to this side.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC struct
- *
- * Output:
- *        - bweIndex         : Bandwidth estimate to transmit to other side.
- *
- */
-WebRtc_Word16 WebRtcIsac_GetDownLinkBwIndex(
-				   ISACStruct*  ISAC_main_inst,
-				   WebRtc_Word16* bweIndex,
-				   WebRtc_Word16* jitterInfo)
-{
-  ISACMainStruct *instISAC;
-
-  /* typecast pointer to real structure */
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  /* check if encoder initiated */
-  if((instISAC->initFlag & BIT_MASK_DEC_INIT) !=
-     BIT_MASK_DEC_INIT)
-    {
-      instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-      return -1;
-    }
-
-  /* Call function to get Bandwidth Estimate */
-  WebRtcIsac_GetDownlinkBwJitIndexImpl(&(instISAC->bwestimator_obj),
-                                   bweIndex, jitterInfo, instISAC->decoderSamplingRateKHz);
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_UpdateUplinkBw(...)
- *
- * This function takes an index representing the Bandwidth estimate from
- * this side to other side and updates BWE.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC struct
- *        - rateIndex         : Bandwidth estimate from other side.
- *
- * Return value               : 0 - ok
- *                             -1 - index out of range
- */
-WebRtc_Word16 WebRtcIsac_UpdateUplinkBw(
-			       ISACStruct*   ISAC_main_inst,
-			       WebRtc_Word16   bweIndex)
-{
-  ISACMainStruct *instISAC;
-  WebRtc_Word16 returnVal;
-
-  /* typecast pointer to real structure */
-  instISAC = (ISACMainStruct *)ISAC_main_inst;
-
-  /* check if encoder initiated */
-  if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-     BIT_MASK_ENC_INIT)
-    {
-      instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-      return -1;
-    }
-
-  /* Call function to get Bandwidth Estimate */
-  returnVal = WebRtcIsac_UpdateUplinkBwImpl(
-					&(instISAC->bwestimator_obj), bweIndex,
-					instISAC->encoderSamplingRateKHz);
-
-  if(returnVal < 0)
-    {
-      instISAC->errorCode = -returnVal;
-      return -1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-
-/****************************************************************************
- * WebRtcIsac_ReadBwIndex(...)
- *
- * This function returns the index of the Bandwidth estimate from the
- * bitstream.
- *
- * Input:
- *        - encoded           : Encoded bitstream
- *
- * Output:
- *        - frameLength       : Length of frame in packet (in samples)
- *        - bweIndex         : Bandwidth estimate in bitstream
- *
- */
-WebRtc_Word16 WebRtcIsac_ReadBwIndex(
-			       const WebRtc_Word16* encoded,
-			       WebRtc_Word16*       bweIndex)
-{
-  Bitstr streamdata;
-#ifndef WEBRTC_BIG_ENDIAN
-  int k;
-#endif
-  WebRtc_Word16 err;
-
-  streamdata.W_upper = 0xFFFFFFFF;
-  streamdata.streamval = 0;
-  streamdata.stream_index = 0;
-
-#ifndef WEBRTC_BIG_ENDIAN
-  for(k = 0; k < 10; k++)
-    {
-      streamdata.stream[k] = (WebRtc_UWord8) ((encoded[k>>1] >>
-					       ((k&1) << 3)) & 0xFF);
-    }
-#else
-  memcpy(streamdata.stream, encoded, 10);
-#endif
-
-  /* decode frame length */
-  err = WebRtcIsac_DecodeFrameLen(&streamdata, bweIndex);
-  if(err < 0)
-    {
-      return err;
-    }
-
-  /* decode BW estimation */
-  err = WebRtcIsac_DecodeSendBW(&streamdata, bweIndex);
-  if(err < 0)
-    {
-      return err;
-    }
-
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_ReadFrameLen(...)
- *
- * This function returns the length of the frame represented in the packet.
- *
- * Input:
- *        - encoded           : Encoded bitstream
- *
- * Output:
- *        - frameLength       : Length of frame in packet (in samples)
- *
- */
-WebRtc_Word16 WebRtcIsac_ReadFrameLen(
-				    ISACStruct*        ISAC_main_inst,
-				    const WebRtc_Word16* encoded,
-				    WebRtc_Word16*       frameLength)
-{
-  Bitstr streamdata;
-#ifndef WEBRTC_BIG_ENDIAN
-  int k;
-#endif
-  WebRtc_Word16 err;
-  ISACMainStruct* instISAC;
-
-  streamdata.W_upper = 0xFFFFFFFF;
-  streamdata.streamval = 0;
-  streamdata.stream_index = 0;
-
-#ifndef WEBRTC_BIG_ENDIAN
-  for (k=0; k<10; k++) {
-    streamdata.stream[k] = (WebRtc_UWord8) ((encoded[k>>1] >>
-                                             ((k&1) << 3)) & 0xFF);
-  }
-#else
-  memcpy(streamdata.stream, encoded, 10);
-#endif
-
-  /* decode frame length */
-  err = WebRtcIsac_DecodeFrameLen(&streamdata, frameLength);
-  if(err < 0) {
-    return -1;
-  }
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if(instISAC->decoderSamplingRateKHz == kIsacSuperWideband)
-    {
-      // the decoded frame length indicates the number of samples in
-      // lower-band in this case, multiply by 2 to get the total number
-      // of samples.
-      *frameLength <<= 1;
-    }
-
-  return 0;
-}
-
-
-/*******************************************************************************
- * WebRtcIsac_GetNewFrameLen(...)
- *
- * returns the frame lenght (in samples) of the next packet. In the case of
- * channel-adaptive mode, iSAC decides on its frame lenght based on the
- * estimated bottleneck this allows a user to prepare for the next packet
- * (at the encoder).
- *
- * The primary usage is in CE to make the iSAC works in channel-adaptive mode
- *
- * Input:
- *        - ISAC_main_inst     : iSAC struct
- *
- * Return Value                : frame lenght in samples
- *
- */
-WebRtc_Word16 WebRtcIsac_GetNewFrameLen(
-				       ISACStruct *ISAC_main_inst)
-{
-  ISACMainStruct *instISAC;
-
-  /* typecast pointer to real structure */
-  instISAC = (ISACMainStruct *)ISAC_main_inst;
-
-  /* Return new frame length */
-  if(instISAC->encoderSamplingRateKHz == kIsacWideband)
-    {
-      return (instISAC->instLB.ISACencLB_obj.new_framelength);
-    }
-  else
-    {
-      return ((instISAC->instLB.ISACencLB_obj.new_framelength) << 1);
-    }
-}
-
-
-/****************************************************************************
- * WebRtcIsac_GetErrorCode(...)
- *
- * This function can be used to check the error code of an iSAC instance.
- * When a function returns -1 a error code will be set for that instance.
- * The function below extract the code of the last error that occured in
- * the specified instance.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance
- *
- * Return value               : Error code
- */
-WebRtc_Word16 WebRtcIsac_GetErrorCode(
-				     ISACStruct *ISAC_main_inst)
-{
-  ISACMainStruct *instISAC;
-  /* typecast pointer to real structure */
-  instISAC = (ISACMainStruct *)ISAC_main_inst;
-
-  return (instISAC->errorCode);
-}
-
-
-/****************************************************************************
- * WebRtcIsac_GetUplinkBw(...)
- *
- * This function outputs the target bottleneck of the codec. In
- * channel-adaptive mode, the target bottleneck is specified through in-band
- * signalling retreived by bandwidth estimator.
- * In channel-independent, also called instantaneous mode, the target
- * bottleneck is provided to the encoder by calling xxx_control(...) (if
- * xxx_control is never called the default values is).
- * Note that the output is the iSAC internal operating bottleneck whch might
- * differ slightly from the one provided through xxx_control().
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *
- * Output:
- *        - *bottleneck       : bottleneck in bits/sec
- *
- * Return value               : -1 if error happens
- *                               0 bit-rates computed correctly.
- */
-WebRtc_Word16 WebRtcIsac_GetUplinkBw(
-				       ISACStruct*  ISAC_main_inst,
-				       WebRtc_Word32* bottleneck)
-{
-  ISACMainStruct* instISAC = (ISACMainStruct *)ISAC_main_inst;
-
-  if(instISAC->codingMode == 0)
-    {
-      // we are in adaptive mode then get the bottleneck from BWE
-      *bottleneck = (WebRtc_Word32)instISAC->bwestimator_obj.send_bw_avg;
-    }
-  else
-    {
-      *bottleneck = instISAC->bottleneck;
-    }
-
-  if((*bottleneck > 32000) && (*bottleneck < 38000))
-    {
-      *bottleneck = 32000;
-    }
-  else if((*bottleneck > 45000) && (*bottleneck < 50000))
-    {
-      *bottleneck = 45000;
-    }
-  else if(*bottleneck > 56000)
-    {
-      *bottleneck = 56000;
-    }
-
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_SetMaxPayloadSize(...)
- *
- * This function sets a limit for the maximum payload size of iSAC. The same
- * value is used both for 30 and 60 ms packets. If the encoder sampling rate
- * is 16 kHz the maximum payload size is between 120 and 400 bytes. If the
- * encoder sampling rate is 32 kHz the maximum payload size is between 120
- * and 600 bytes.
- *
- * ---------------
- * IMPORTANT NOTES
- * ---------------
- * The size of a packet is limited to the minimum of 'max-payload-size' and
- * 'max-rate.' For instance, let's assume the max-payload-size is set to
- * 170 bytes, and max-rate is set to 40 kbps. Note that a limit of 40 kbps
- * translates to 150 bytes for 30ms frame-size & 300 bytes for 60ms
- * frame-size. Then a packet with a frame-size of 30 ms is limited to 150,
- * i.e. min(170, 150), and a packet with 60 ms frame-size is limited to
- * 170 bytes, i.e. min(170, 300).
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - maxPayloadBytes   : maximum size of the payload in bytes
- *                              valid values are between 100 and 400 bytes
- *                              if encoder sampling rate is 16 kHz. For
- *                              32 kHz encoder sampling rate valid values
- *                              are between 100 and 600 bytes.
- *
- * Return value               : 0 if successful
- *                             -1 if error happens
- */
-WebRtc_Word16 WebRtcIsac_SetMaxPayloadSize(
-					  ISACStruct* ISAC_main_inst,
-					  WebRtc_Word16 maxPayloadBytes)
-{
-  ISACMainStruct *instISAC;
-  WebRtc_Word16 status = 0;
-
-  /* typecast pointer to real structure  */
-  instISAC = (ISACMainStruct *)ISAC_main_inst;
-
-  /* check if encoder initiated */
-  if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-     BIT_MASK_ENC_INIT)
-    {
-      instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-      return -1;
-    }
-
-  if(instISAC->encoderSamplingRateKHz == kIsacSuperWideband)
-    {
-      // sanity check
-      if(maxPayloadBytes < 120)
-	{
-	  // maxRate is out of valid range
-	  // set to the acceptable value and return -1.
-	  maxPayloadBytes = 120;
-	  status = -1;
-	}
-
-      /* sanity check */
-      if(maxPayloadBytes > STREAM_SIZE_MAX)
-	{
-	  // maxRate is out of valid range
-	  // set to the acceptable value and return -1.
-	  maxPayloadBytes = STREAM_SIZE_MAX;
-	  status = -1;
-	}
-    }
-  else
-    {
-      if(maxPayloadBytes < 120)
-	{
-	  // max payload-size is out of valid range
-	  // set to the acceptable value and return -1.
-	  maxPayloadBytes = 120;
-	  status = -1;
-	}
-      if(maxPayloadBytes > STREAM_SIZE_MAX_60)
-	{
-	  // max payload-size is out of valid range
-	  // set to the acceptable value and return -1.
-	  maxPayloadBytes = STREAM_SIZE_MAX_60;
-	  status = -1;
-	}
-    }
-  instISAC->maxPayloadSizeBytes = maxPayloadBytes;
-  UpdatePayloadSizeLimit(instISAC);
-  return status;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_SetMaxRate(...)
- *
- * This function sets the maximum rate which the codec may not exceed for
- * any signal packet. The maximum rate is defined and payload-size per
- * frame-size in bits per second.
- *
- * The codec has a maximum rate of 53400 bits per second (200 bytes per 30
- * ms) if the encoder sampling rate is 16kHz, and 160 kbps (600 bytes/30 ms)
- * if the encoder sampling rate is 32 kHz.
- *
- * It is possible to set a maximum rate between 32000 and 53400 bits/sec
- * in wideband mode, and 32000 to 160000 bits/sec in super-wideband mode.
- *
- * ---------------
- * IMPORTANT NOTES
- * ---------------
- * The size of a packet is limited to the minimum of 'max-payload-size' and
- * 'max-rate.' For instance, let's assume the max-payload-size is set to
- * 170 bytes, and max-rate is set to 40 kbps. Note that a limit of 40 kbps
- * translates to 150 bytes for 30ms frame-size & 300 bytes for 60ms
- * frame-size. Then a packet with a frame-size of 30 ms is limited to 150,
- * i.e. min(170, 150), and a packet with 60 ms frame-size is limited to
- * 170 bytes, min(170, 300).
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - maxRate           : maximum rate in bits per second,
- *                              valid values are 32000 to 53400 bits/sec in
- *                              wideband mode, and 32000 to 160000 bits/sec in
- *                              super-wideband mode.
- *
- * Return value               : 0 if successful
- *                             -1 if error happens
- */
-WebRtc_Word16 WebRtcIsac_SetMaxRate(
-				   ISACStruct* ISAC_main_inst,
-				   WebRtc_Word32 maxRate)
-{
-  ISACMainStruct *instISAC;
-  WebRtc_Word16 maxRateInBytesPer30Ms;
-  WebRtc_Word16 status = 0;
-
-  /* typecast pointer to real structure */
-  instISAC = (ISACMainStruct *)ISAC_main_inst;
-
-  /* check if encoder initiated */
-  if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-     BIT_MASK_ENC_INIT)
-    {
-      instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-      return -1;
-    }
-  /*
-    Calculate maximum number of bytes per 30 msec packets for the
-    given maximum rate. Multiply with 30/1000 to get number of
-    bits per 30 ms, divide by 8 to get number of bytes per 30 ms:
-    maxRateInBytes = floor((maxRate * 30/1000) / 8);
-  */
-  maxRateInBytesPer30Ms = (WebRtc_Word16)(maxRate*3/800);
-
-  if(instISAC->encoderSamplingRateKHz == kIsacWideband)
-    {
-      if(maxRate < 32000)
-	{
-	  // max rate is out of valid range
-	  // set to the acceptable value and return -1.
-	  maxRateInBytesPer30Ms = 120;
-	  status = -1;
-	}
-
-      if(maxRate > 53400)
-	{
-	  // max rate is out of valid range
-	  // set to the acceptable value and return -1.
-	  maxRateInBytesPer30Ms = 200;
-	  status = -1;
-	}
-    }
-  else
-    {
-      if(maxRateInBytesPer30Ms < 120)
-	{
-	  // maxRate is out of valid range
-	  // set to the acceptable value and return -1.
-	  maxRateInBytesPer30Ms = 120;
-	  status = -1;
-	}
-
-      if(maxRateInBytesPer30Ms > STREAM_SIZE_MAX)
-	{
-	  // maxRate is out of valid range
-	  // set to the acceptable value and return -1.
-	  maxRateInBytesPer30Ms = STREAM_SIZE_MAX;
-	  status = -1;
-	}
-    }
-  instISAC->maxRateBytesPer30Ms = maxRateInBytesPer30Ms;
-  UpdatePayloadSizeLimit(instISAC);
-  return status;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_GetRedPayload(...)
- *
- * Populates "encoded" with the redundant payload of the recently encoded
- * frame. This function has to be called once that WebRtcIsac_Encode(...)
- * returns a positive value. Regardless of the frame-size this function will
- * be called only once after encoding is completed. The bit-stream is
- * targeted for 16000 bit/sec.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC struct
- *
- * Output:
- *        - encoded           : the encoded data vector
- *
- *
- * Return value               : >0 - Length (in bytes) of coded data
- *                            : -1 - Error
- *
- *
- */
-WebRtc_Word16 WebRtcIsac_GetRedPayload(
-				      ISACStruct*  ISAC_main_inst,
-				      WebRtc_Word16* encoded)
-{
-  ISACMainStruct* instISAC;
-  Bitstr          iSACBitStreamInst;
-  WebRtc_Word16     streamLenLB;
-  WebRtc_Word16     streamLenUB;
-  WebRtc_Word16     streamLen;
-  WebRtc_Word16     totalLenUB;
-  WebRtc_UWord8*    ptrEncodedUW8 = (WebRtc_UWord8*)encoded;
-#ifndef WEBRTC_BIG_ENDIAN
-  int k;
-#endif
-
-  /* typecast pointer to real structure */
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-
-  if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-     BIT_MASK_ENC_INIT)
-    {
-      instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-    }
-
-
-  iSACBitStreamInst.W_upper = 0xFFFFFFFF;
-  iSACBitStreamInst.streamval = 0;
-  iSACBitStreamInst.stream_index = 0;
-
-
-  streamLenLB = WebRtcIsac_EncodeStoredDataLb(
-					      &instISAC->instLB.ISACencLB_obj.SaveEnc_obj,
-					      &iSACBitStreamInst,
-					      instISAC->instLB.ISACencLB_obj.lastBWIdx,
-					      RCU_TRANSCODING_SCALE);
-
-  if(streamLenLB < 0)
-    {
-      return -1;
-    }
-
-  /* convert from bytes to WebRtc_Word16 */
-  memcpy(ptrEncodedUW8, iSACBitStreamInst.stream, streamLenLB);
-
-  streamLen = streamLenLB;
-
-  if(instISAC->bandwidthKHz == isac8kHz)
-    {
-      return streamLenLB;
-    }
-
-  streamLenUB = WebRtcIsac_GetRedPayloadUb(
-					   &instISAC->instUB.ISACencUB_obj.SaveEnc_obj,
-					   &iSACBitStreamInst, instISAC->bandwidthKHz);
-
-  if(streamLenUB < 0)
-    {
-      // an error has happened but this is not the error due to a
-      // bit-stream larger than the limit
-      return -1;
-    }
-
-  // We have one byte to write the total length of the upper band
-  // the length include the bitstream length, check-sum and the
-  // single byte where the length is written to. This is according to
-  // iSAC wideband and how the "garbage" is dealt.
-  totalLenUB = streamLenUB + 1 + LEN_CHECK_SUM_WORD8;
-  if(totalLenUB > 255)
-    {
-      streamLenUB = 0;
-    }
-
-  // Generate CRC if required.
-  if((instISAC->bandwidthKHz != isac8kHz) &&
-     (streamLenUB > 0))
-    {
-      WebRtc_UWord32 crc;
-      streamLen += totalLenUB;
-      ptrEncodedUW8[streamLenLB] = (WebRtc_UWord8)totalLenUB;
-      memcpy(&ptrEncodedUW8[streamLenLB+1], iSACBitStreamInst.stream, streamLenUB);
-
-      WebRtcIsac_GetCrc((WebRtc_Word16*)(&(ptrEncodedUW8[streamLenLB + 1])),
-			streamLenUB, &crc);
-#ifndef WEBRTC_BIG_ENDIAN
-      for(k = 0; k < LEN_CHECK_SUM_WORD8; k++)
-	{
-	  ptrEncodedUW8[streamLen - LEN_CHECK_SUM_WORD8 + k] =
-	    (WebRtc_UWord8)((crc >> (24 - k * 8)) & 0xFF);
-	}
-#else
-      memcpy(&ptrEncodedUW8[streamLenLB + streamLenUB + 1], &crc,
-	     LEN_CHECK_SUM_WORD8);
-#endif
-    }
-
-
-  return streamLen;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_version(...)
- *
- * This function returns the version number.
- *
- * Output:
- *        - version      : Pointer to character string
- *
- */
-void WebRtcIsac_version(char *version)
-{
-  strcpy(version, "4.3.0");
-}
-
-
-/******************************************************************************
- * WebRtcIsac_SetEncSampRate()
- * Set the sampling rate of the encoder. Initialization of the encoder WILL
- * NOT overwrite the sampling rate of the encoder. The default value is 16 kHz
- * which is set when the instance is created. The encoding-mode and the
- * bottleneck remain unchanged by this call, however, the maximum rate and
- * maximum payload-size will reset to their default value.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - sampRate          : enumerator specifying the sampling rate.
- *
- * Return value               : 0 if successful
- *                             -1 if failed.
- */
-WebRtc_Word16 WebRtcIsac_SetEncSampRate(
-				       ISACStruct*               ISAC_main_inst,
-				       enum IsacSamplingRate sampRate)
-{
-  ISACMainStruct* instISAC;
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if((sampRate != kIsacWideband) &&
-     (sampRate != kIsacSuperWideband))
-    {
-      // Sampling Frequency is not supported
-      instISAC->errorCode = ISAC_UNSUPPORTED_SAMPLING_FREQUENCY;
-      return -1;
-    }
-  else if((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-          BIT_MASK_ENC_INIT)
-    {
-      if(sampRate == kIsacWideband)
-      {
-        instISAC->bandwidthKHz = isac8kHz;
-      }
-      else
-      {
-        instISAC->bandwidthKHz = isac16kHz;
-      }
-      instISAC->encoderSamplingRateKHz = sampRate;
-      return 0;
-    }
-  else
-    {
-      ISACUBStruct* instUB = &(instISAC->instUB);
-      ISACLBStruct* instLB = &(instISAC->instLB);
-      double bottleneckLB = 0;
-      double bottleneckUB = 0;
-      WebRtc_Word32 bottleneck = instISAC->bottleneck;
-      WebRtc_Word16 codingMode = instISAC->codingMode;
-      WebRtc_Word16 frameSizeMs = instLB->ISACencLB_obj.new_framelength / (FS / 1000);
-
-      if((sampRate == kIsacWideband) &&
-	 (instISAC->encoderSamplingRateKHz == kIsacSuperWideband))
-	{
-	  // changing from super-wideband to wideband.
-	  // we don't need to re-initialize the encoder of the
-	  // lower-band.
-	  instISAC->bandwidthKHz = isac8kHz;
-	  if(codingMode == 1)
-	    {
-	      ControlLb(instLB,
-				   (bottleneck > 32000)? 32000:bottleneck, FRAMESIZE);
-	    }
-	  instISAC->maxPayloadSizeBytes = STREAM_SIZE_MAX_60;
-	  instISAC->maxRateBytesPer30Ms = STREAM_SIZE_MAX_30;
-	}
-      else if((sampRate == kIsacSuperWideband) &&
-	      (instISAC->encoderSamplingRateKHz == kIsacWideband))
-	{
-	  if(codingMode == 1)
-	    {
-	      WebRtcIsac_RateAllocation(bottleneck, &bottleneckLB, &bottleneckUB,
-					&(instISAC->bandwidthKHz));
-	    }
-
-          instISAC->bandwidthKHz = isac16kHz;
-	  instISAC->maxPayloadSizeBytes = STREAM_SIZE_MAX;
-	  instISAC->maxRateBytesPer30Ms = STREAM_SIZE_MAX;
-
-	  EncoderInitLb(instLB, codingMode, sampRate);
-	  EncoderInitUb(instUB, instISAC->bandwidthKHz);
-
-	  memset(instISAC->analysisFBState1, 0,
-		 FB_STATE_SIZE_WORD32 * sizeof(WebRtc_Word32));
-	  memset(instISAC->analysisFBState2, 0,
-		 FB_STATE_SIZE_WORD32 * sizeof(WebRtc_Word32));
-
-	  if(codingMode == 1)
-	    {
-	      instISAC->bottleneck = bottleneck;
-	      ControlLb(instLB, bottleneckLB,
-				   (instISAC->bandwidthKHz == isac8kHz)? frameSizeMs:FRAMESIZE);
-	      if(instISAC->bandwidthKHz > isac8kHz)
-		{
-		  ControlUb(instUB, bottleneckUB);
-		}
-	    }
-	  else
-	    {
-	      instLB->ISACencLB_obj.enforceFrameSize = 0;
-	      instLB->ISACencLB_obj.new_framelength = FRAMESAMPLES;
-	    }
-	}
-      instISAC->encoderSamplingRateKHz = sampRate;
-      return 0;
-    }
-}
-
-
-/******************************************************************************
- * WebRtcIsac_SetDecSampRate()
- * Set the sampling rate of the decoder.  Initialization of the decoder WILL
- * NOT overwrite the sampling rate of the encoder. The default value is 16 kHz
- * which is set when the instance is created.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - sampRate          : enumerator specifying the sampling rate.
- *
- * Return value               : 0 if successful
- *                             -1 if failed.
- */
-WebRtc_Word16 WebRtcIsac_SetDecSampRate(
-				       ISACStruct*               ISAC_main_inst,
-				       enum IsacSamplingRate sampRate)
-{
-  ISACMainStruct* instISAC;
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if((sampRate != kIsacWideband) &&
-     (sampRate != kIsacSuperWideband))
-    {
-      // Sampling Frequency is not supported
-      instISAC->errorCode = ISAC_UNSUPPORTED_SAMPLING_FREQUENCY;
-      return -1;
-    }
-  else
-    {
-      if((instISAC->decoderSamplingRateKHz == kIsacWideband) &&
-	 (sampRate == kIsacSuperWideband))
-	{
-	  // switching from wideband to super-wideband at the decoder
-	  // we need to reset the filter-bank and initialize
-	  // upper-band decoder.
-	  memset(instISAC->synthesisFBState1, 0,
-		 FB_STATE_SIZE_WORD32 * sizeof(WebRtc_Word32));
-	  memset(instISAC->synthesisFBState2, 0,
-		 FB_STATE_SIZE_WORD32 * sizeof(WebRtc_Word32));
-
-	  if(DecoderInitUb(&(instISAC->instUB)) < 0)
-	    {
-	      return -1;
-	    }
-	}
-      instISAC->decoderSamplingRateKHz = sampRate;
-      return 0;
-    }
-}
-
-
-/******************************************************************************
- * WebRtcIsac_EncSampRate()
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *
- * Return value               : enumerator representing sampling frequency
- *                              associated with the encoder, the input audio
- *                              is expected to be sampled at this rate.
- *
- */
-enum IsacSamplingRate WebRtcIsac_EncSampRate(
-					       ISACStruct*                ISAC_main_inst)
-{
-  ISACMainStruct* instISAC;
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  return instISAC->encoderSamplingRateKHz;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_DecSampRate()
- * Return the sampling rate of the decoded audio.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *
- * Return value               : enumerator representing sampling frequency
- *                              associated with the decoder, i.e. the
- *                              sampling rate of the decoded audio.
- *
- */
-enum IsacSamplingRate WebRtcIsac_DecSampRate(
-					       ISACStruct*                ISAC_main_inst)
-{
-  ISACMainStruct* instISAC;
-
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  return instISAC->decoderSamplingRateKHz;
-}
diff --git a/src/mod/codecs/mod_isac/isac.gypi b/src/mod/codecs/mod_isac/isac.gypi
deleted file mode 100644
index d30be551bd..0000000000
--- a/src/mod/codecs/mod_isac/isac.gypi
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-{
-  'targets': [
-    {
-      'target_name': 'iSAC',
-      'type': '<(library)',
-      'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
-      ],
-      'include_dirs': [
-        '../interface',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../interface',
-        ],
-      },
-      'sources': [
-        '../interface/isac.h',
-        'arith_routines.c',
-        'arith_routines_hist.c',
-        'arith_routines_logist.c',
-        'bandwidth_estimator.c',
-        'crc.c',
-        'decode.c',
-        'decode_bwe.c',
-        'encode.c',
-        'encode_lpc_swb.c',
-        'entropy_coding.c',
-        'fft.c',
-        'filter_functions.c',
-        'filterbank_tables.c',
-        'intialize.c',
-        'isac.c',
-        'filterbanks.c',
-        'pitch_lag_tables.c',
-        'lattice.c',
-        'lpc_gain_swb_tables.c',
-        'lpc_analysis.c',
-        'lpc_shape_swb12_tables.c',
-        'lpc_shape_swb16_tables.c',
-        'lpc_tables.c',
-        'pitch_estimator.c',
-        'pitch_filter.c',
-        'pitch_gain_tables.c',
-        'spectrum_ar_model_tables.c',
-        'transform.c',
-        'arith_routines.h',
-        'bandwidth_estimator.h',
-        'codec.h',
-        'crc.h',
-        'encode_lpc_swb.h',
-        'entropy_coding.h',
-        'fft.h',
-        'filterbank_tables.h',
-        'lpc_gain_swb_tables.h',
-        'lpc_analysis.h',
-        'lpc_shape_swb12_tables.h',
-        'lpc_shape_swb16_tables.h',
-        'lpc_tables.h',
-        'pitch_estimator.h',
-        'pitch_gain_tables.h',
-        'pitch_lag_tables.h',
-        'settings.h',
-        'spectrum_ar_model_tables.h',
-        'structs.h',
-        'os_specific_inline.h',
-     ],
-      'conditions': [
-        ['OS!="win"', {
-          'defines': [
-            'WEBRTC_LINUX',
-          ],
-        }],
-      ],
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/mod/codecs/mod_isac/isac.h b/src/mod/codecs/mod_isac/isac.h
deleted file mode 100644
index 03c260bb8a..0000000000
--- a/src/mod/codecs/mod_isac/isac.h
+++ /dev/null
@@ -1,729 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INTERFACE_ISAC_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INTERFACE_ISAC_H_
-
-/*
- * Define the fixed-point numeric formats
- */
-#include "typedefs.h"
-
-typedef struct WebRtcISACStruct    ISACStruct;
-
-enum IsacSamplingRate {kIsacWideband = 16,  kIsacSuperWideband = 32};
-
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-  /******************************************************************************
-   * WebRtcIsac_AssignSize(...)
-   *
-   * This function returns the size of the ISAC instance, so that the instance
-   * can be created outside iSAC.
-   *
-   * Input:
-   *        - samplingRate      : sampling rate of the input/output audio.
-   *
-   * Output:
-   *        - sizeinbytes       : number of bytes needed to allocate for the
-   *                              instance.
-   *
-   * Return value               : 0 - Ok
-   *                             -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_AssignSize(
-      int* sizeinbytes);
-
-
-  /******************************************************************************
-   * WebRtcIsac_Assign(...)
-   *
-   * This function assignes the memory already created to the ISAC instance.
-   *
-   * Input:
-   *        - *ISAC_main_inst   : a pointer to the coder instance.
-   *        - samplingRate      : sampling rate of the input/output audio.
-   *        - ISAC_inst_Addr    : the already allocated memory, where we put the
-   *                              iSAC structure.
-   *
-   * Return value               : 0 - Ok
-   *                             -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_Assign(
-      ISACStruct** ISAC_main_inst,
-      void*        ISAC_inst_Addr);
-
-
-  /******************************************************************************
-   * WebRtcIsac_Create(...)
-   *
-   * This function creates an ISAC instance, which will contain the state
-   * information for one coding/decoding channel.
-   *
-   * Input:
-   *        - *ISAC_main_inst   : a pointer to the coder instance.
-   *
-   * Return value               : 0 - Ok
-   *                             -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_Create(
-      ISACStruct** ISAC_main_inst);
-
-
-  /******************************************************************************
-   * WebRtcIsac_Free(...)
-   *
-   * This function frees the ISAC instance created at the beginning.
-   *
-   * Input:
-   *        - ISAC_main_inst    : an ISAC instance.
-   *
-   * Return value               : 0 - Ok
-   *                             -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_Free(
-      ISACStruct* ISAC_main_inst);
-
-
-  /******************************************************************************
-   * WebRtcIsac_EncoderInit(...)
-   *
-   * This function initializes an ISAC instance prior to the encoder calls.
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance.
-   *        - CodingMode        : 0 -> Bit rate and frame length are
-   *                                automatically adjusted to available bandwidth
-   *                                on transmission channel, just valid if codec
-   *                                is created to work in wideband mode.
-   *                              1 -> User sets a frame length and a target bit
-   *                                rate which is taken as the maximum
-   *                                short-term average bit rate.
-   *
-   * Return value               : 0 - Ok
-   *                             -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_EncoderInit(
-      ISACStruct* ISAC_main_inst,
-      WebRtc_Word16 CodingMode);
-
-
-  /******************************************************************************
-   * WebRtcIsac_Encode(...)
-   *
-   * This function encodes 10ms audio blocks and inserts it into a package.
-   * Input speech length has 160 samples if operating at 16 kHz sampling
-   * rate, or 320 if operating at 32 kHz sampling rate. The encoder buffers the
-   * input audio until the whole frame is buffered then proceeds with encoding.
-   *
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance.
-   *        - speechIn          : input speech vector.
-   *
-   * Output:
-   *        - encoded           : the encoded data vector
-   *
-   * Return value:
-   *                            : >0 - Length (in bytes) of coded data
-   *                            :  0 - The buffer didn't reach the chosen
-   *                               frame-size so it keeps buffering speech
-   *                               samples.
-   *                            : -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_Encode(
-      ISACStruct*        ISAC_main_inst,
-      const WebRtc_Word16* speechIn,
-      WebRtc_Word16*       encoded);
-
-
-  /******************************************************************************
-   * WebRtcIsac_DecoderInit(...)
-   *
-   * This function initializes an ISAC instance prior to the decoder calls.
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance.
-   *
-   * Return value
-   *                            : 0 - Ok
-   *                             -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_DecoderInit(
-      ISACStruct* ISAC_main_inst);
-
-
-  /******************************************************************************
-   * WebRtcIsac_UpdateBwEstimate(...)
-   *
-   * This function updates the estimate of the bandwidth.
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance.
-   *        - encoded           : encoded ISAC frame(s).
-   *        - packet_size       : size of the packet.
-   *        - rtp_seq_number    : the RTP number of the packet.
-   *        - send_ts           : the RTP send timestamp, given in samples
-   *        - arr_ts            : the arrival time of the packet (from NetEq)
-   *                              in samples.
-   *
-   * Return value               : 0 - Ok
-   *                             -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_UpdateBwEstimate(
-      ISACStruct*         ISAC_main_inst,
-      const WebRtc_UWord16* encoded,
-      WebRtc_Word32         packet_size,
-      WebRtc_UWord16        rtp_seq_number,
-      WebRtc_UWord32        send_ts,
-      WebRtc_UWord32        arr_ts);
-
-
-  /******************************************************************************
-   * WebRtcIsac_Decode(...)
-   *
-   * This function decodes an ISAC frame. At 16 kHz sampling rate, the length
-   * of the output audio could be either 480 or 960 samples, equivalent to
-   * 30 or 60 ms respectively. At 32 kHz sampling rate, the length of the
-   * output audio is 960 samples, which is 30 ms.
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance.
-   *        - encoded           : encoded ISAC frame(s).
-   *        - len               : bytes in encoded vector.
-   *
-   * Output:
-   *        - decoded           : The decoded vector.
-   *
-   * Return value               : >0 - number of samples in decoded vector.
-   *                              -1 - Error.
-   */
-
-  WebRtc_Word16 WebRtcIsac_Decode(
-      ISACStruct*           ISAC_main_inst,
-      const WebRtc_UWord16* encoded,
-      WebRtc_Word16         len,
-      WebRtc_Word16*        decoded,
-      WebRtc_Word16*        speechType);
-
-
-  /******************************************************************************
-   * WebRtcIsac_DecodePlc(...)
-   *
-   * This function conducts PLC for ISAC frame(s). Output speech length
-   * will be a multiple of frames, i.e. multiples of 30 ms audio. Therefore,
-   * the output is multiple of 480 samples if operating at 16 kHz and multiple
-   * of 960 if operating at 32 kHz.
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance.
-   *        - noOfLostFrames    : Number of PLC frames to produce.
-   *
-   * Output:
-   *        - decoded           : The decoded vector.
-   *
-   * Return value               : >0 - number of samples in decoded PLC vector
-   *                              -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_DecodePlc(
-      ISACStruct*  ISAC_main_inst,
-      WebRtc_Word16* decoded,
-      WebRtc_Word16  noOfLostFrames);
-
-
-  /******************************************************************************
-   * WebRtcIsac_Control(...)
-   *
-   * This function sets the limit on the short-term average bit-rate and the
-   * frame length. Should be used only in Instantaneous mode. At 16 kHz sampling
-   * rate, an average bit-rate between 10000 to 32000 bps is valid and a
-   * frame-size of 30 or 60 ms is acceptable. At 32 kHz, an average bit-rate
-   * between 10000 to 56000 is acceptable, and the valid frame-size is 30 ms.
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance.
-   *        - rate              : limit on the short-term average bit rate,
-   *                              in bits/second.
-   *        - framesize         : frame-size in millisecond.
-   *
-   * Return value               : 0  - ok
-   *                             -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_Control(
-      ISACStruct*   ISAC_main_inst,
-      WebRtc_Word32 rate,
-      WebRtc_Word16 framesize);
-
-
-  /******************************************************************************
-   * WebRtcIsac_ControlBwe(...)
-   *
-   * This function sets the initial values of bottleneck and frame-size if
-   * iSAC is used in channel-adaptive mode. Therefore, this API is not
-   * applicable if the codec is created to operate in super-wideband mode.
-   *
-   * Through this API, users can enforce a frame-size for all values of
-   * bottleneck. Then iSAC will not automatically change the frame-size.
-   *
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance.
-   *        - rateBPS           : initial value of bottleneck in bits/second
-   *                              10000 <= rateBPS <= 56000 is accepted
-   *                              For default bottleneck set rateBPS = 0
-   *        - frameSizeMs       : number of milliseconds per frame (30 or 60)
-   *        - enforceFrameSize  : 1 to enforce the given frame-size through
-   *                              out the adaptation process, 0 to let iSAC
-   *                              change the frame-size if required.
-   *
-   * Return value               : 0  - ok
-   *                             -1 - Error
-   */
-
-  WebRtc_Word16 WebRtcIsac_ControlBwe(
-      ISACStruct* ISAC_main_inst,
-      WebRtc_Word32 rateBPS,
-      WebRtc_Word16 frameSizeMs,
-      WebRtc_Word16 enforceFrameSize);
-
-
-  /******************************************************************************
-   * WebRtcIsac_ReadFrameLen(...)
-   *
-   * This function returns the length of the frame represented in the packet.
-   *
-   * Input:
-   *        - encoded           : Encoded bit-stream
-   *
-   * Output:
-   *        - frameLength       : Length of frame in packet (in samples)
-   *
-   */
-
-  WebRtc_Word16 WebRtcIsac_ReadFrameLen(
-      ISACStruct*          ISAC_main_inst,
-      const WebRtc_Word16* encoded,
-      WebRtc_Word16*       frameLength);
-
-
-  /******************************************************************************
-   * WebRtcIsac_version(...)
-   *
-   * This function returns the version number.
-   *
-   * Output:
-   *        - version      : Pointer to character string
-   *
-   */
-
-  void WebRtcIsac_version(
-      char *version);
-
-
-  /******************************************************************************
-   * WebRtcIsac_GetErrorCode(...)
-   *
-   * This function can be used to check the error code of an iSAC instance. When
-   * a function returns -1 a error code will be set for that instance. The
-   * function below extract the code of the last error that occurred in the
-   * specified instance.
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance
-   *
-   * Return value               : Error code
-   */
-
-  WebRtc_Word16 WebRtcIsac_GetErrorCode(
-      ISACStruct* ISAC_main_inst);
-
-
-  /****************************************************************************
-   * WebRtcIsac_GetUplinkBw(...)
-   *
-   * This function outputs the target bottleneck of the codec. In
-   * channel-adaptive mode, the target bottleneck is specified through in-band
-   * signalling retreived by bandwidth estimator.
-   * In channel-independent, also called instantaneous mode, the target
-   * bottleneck is provided to the encoder by calling xxx_control(...). If
-   * xxx_control is never called the default values is returned. The default
-   * value for bottleneck at 16 kHz encoder sampling rate is 32000 bits/sec,
-   * and it is 56000 bits/sec for 32 kHz sampling rate.
-   * Note that the output is the iSAC internal operating bottleneck which might
-   * differ slightly from the one provided through xxx_control().
-   *
-   * Input:
-   *        - ISAC_main_inst    : iSAC instance
-   *
-   * Output:
-   *        - *bottleneck       : bottleneck in bits/sec
-   *
-   * Return value               : -1 if error happens
-   *                               0 bit-rates computed correctly.
-   */
-
-  WebRtc_Word16 WebRtcIsac_GetUplinkBw(
-      ISACStruct*    ISAC_main_inst,
-      WebRtc_Word32* bottleneck);
-
-
-  /******************************************************************************
-   * WebRtcIsac_SetMaxPayloadSize(...)
-   *
-   * This function sets a limit for the maximum payload size of iSAC. The same
-   * value is used both for 30 and 60 ms packets. If the encoder sampling rate
-   * is 16 kHz the maximum payload size is between 120 and 400 bytes. If the
-   * encoder sampling rate is 32 kHz the maximum payload size is between 120
-   * and 600 bytes.
-   *
-   * If an out of range limit is used, the function returns -1, but the closest
-   * valid value will be applied.
-   *
-   * ---------------
-   * IMPORTANT NOTES
-   * ---------------
-   * The size of a packet is limited to the minimum of 'max-payload-size' and
-   * 'max-rate.' For instance, let's assume the max-payload-size is set to
-   * 170 bytes, and max-rate is set to 40 kbps. Note that a limit of 40 kbps
-   * translates to 150 bytes for 30ms frame-size & 300 bytes for 60ms
-   * frame-size. Then a packet with a frame-size of 30 ms is limited to 150,
-   * i.e. min(170, 150), and a packet with 60 ms frame-size is limited to
-   * 170 bytes, i.e. min(170, 300).
-   *
-   * Input:
-   *        - ISAC_main_inst    : iSAC instance
-   *        - maxPayloadBytes   : maximum size of the payload in bytes
-   *                              valid values are between 120 and 400 bytes
-   *                              if encoder sampling rate is 16 kHz. For
-   *                              32 kHz encoder sampling rate valid values
-   *                              are between 120 and 600 bytes.
-   *
-   * Return value               : 0 if successful
-   *                             -1 if error happens
-   */
-
-  WebRtc_Word16 WebRtcIsac_SetMaxPayloadSize(
-      ISACStruct* ISAC_main_inst,
-      WebRtc_Word16 maxPayloadBytes);
-
-
-  /******************************************************************************
-   * WebRtcIsac_SetMaxRate(...)
-   *
-   * This function sets the maximum rate which the codec may not exceed for
-   * any signal packet. The maximum rate is defined and payload-size per
-   * frame-size in bits per second.
-   *
-   * The codec has a maximum rate of 53400 bits per second (200 bytes per 30
-   * ms) if the encoder sampling rate is 16kHz, and 160 kbps (600 bytes/30 ms)
-   * if the encoder sampling rate is 32 kHz.
-   *
-   * It is possible to set a maximum rate between 32000 and 53400 bits/sec
-   * in wideband mode, and 32000 to 160000 bits/sec in super-wideband mode.
-   *
-   * If an out of range limit is used, the function returns -1, but the closest
-   * valid value will be applied.
-   *
-   * ---------------
-   * IMPORTANT NOTES
-   * ---------------
-   * The size of a packet is limited to the minimum of 'max-payload-size' and
-   * 'max-rate.' For instance, let's assume the max-payload-size is set to
-   * 170 bytes, and max-rate is set to 40 kbps. Note that a limit of 40 kbps
-   * translates to 150 bytes for 30ms frame-size & 300 bytes for 60ms
-   * frame-size. Then a packet with a frame-size of 30 ms is limited to 150,
-   * i.e. min(170, 150), and a packet with 60 ms frame-size is limited to
-   * 170 bytes, min(170, 300).
-   *
-   * Input:
-   *        - ISAC_main_inst    : iSAC instance
-   *        - maxRate           : maximum rate in bits per second,
-   *                              valid values are 32000 to 53400 bits/sec in
-   *                              wideband mode, and 32000 to 160000 bits/sec in
-   *                              super-wideband mode.
-   *
-   * Return value               : 0 if successful
-   *                             -1 if error happens
-   */
-
-  WebRtc_Word16 WebRtcIsac_SetMaxRate(
-      ISACStruct* ISAC_main_inst,
-      WebRtc_Word32 maxRate);
-
-
-  /******************************************************************************
-   * WebRtcIsac_DecSampRate()
-   * Return the sampling rate of the decoded audio.
-   *
-   * Input:
-   *        - ISAC_main_inst    : iSAC instance
-   *
-   * Return value               : enumerator representing sampling frequency
-   *                              associated with the decoder, i.e. the
-   *                              sampling rate of the decoded audio.
-   *
-   */
-
-  enum IsacSamplingRate WebRtcIsac_DecSampRate(
-      ISACStruct*                ISAC_main_inst);
-
-
-  /******************************************************************************
-   * WebRtcIsac_EncSampRate()
-   *
-   * Input:
-   *        - ISAC_main_inst    : iSAC instance
-   *
-   * Return value               : enumerator representing sampling frequency
-   *                              associated with the encoder, the input audio
-   *                              is expected to be sampled at this rate.
-   *
-   */
-
-  enum IsacSamplingRate WebRtcIsac_EncSampRate(
-      ISACStruct*                ISAC_main_inst);
-
-
-  /******************************************************************************
-   * WebRtcIsac_SetDecSampRate()
-   * Set the sampling rate of the decoder.  Initialization of the decoder WILL
-   * NOT overwrite the sampling rate of the encoder. The default value is 16 kHz
-   * which is set when the instance is created.
-   *
-   * Input:
-   *        - ISAC_main_inst    : iSAC instance
-   *        - sampRate          : enumerator specifying the sampling rate.
-   *
-   * Return value               : 0 if successful
-   *                             -1 if failed.
-   */
-
-  WebRtc_Word16 WebRtcIsac_SetDecSampRate(
-      ISACStruct*           ISAC_main_inst,
-      enum IsacSamplingRate sampRate);
-
-
-  /******************************************************************************
-   * WebRtcIsac_SetEncSampRate()
-   * Set the sampling rate of the encoder. Initialization of the encoder WILL
-   * NOT overwrite the sampling rate of the encoder. The default value is 16 kHz
-   * which is set when the instance is created. The encoding-mode and the
-   * bottleneck remain unchanged by this call, however, the maximum rate and
-   * maximum payload-size will reset to their default value.
-   *
-   * Input:
-   *        - ISAC_main_inst    : iSAC instance
-   *        - sampRate          : enumerator specifying the sampling rate.
-   *
-   * Return value               : 0 if successful
-   *                             -1 if failed.
-   */
-
-  WebRtc_Word16 WebRtcIsac_SetEncSampRate(
-      ISACStruct*           ISAC_main_inst,
-      enum IsacSamplingRate sampRate);
-
-
-
-  /******************************************************************************
-   * WebRtcIsac_GetNewBitStream(...)
-   *
-   * This function returns encoded data, with the recieved bwe-index in the
-   * stream. If the rate is set to a value less than bottleneck of codec
-   * the new bistream will be re-encoded with the given target rate.
-   * It should always return a complete packet, i.e. only called once
-   * even for 60 msec frames.
-   *
-   * NOTE 1! This function does not write in the ISACStruct, it is not allowed.
-   * NOTE 2! Currently not implemented for SWB mode.
-   * NOTE 3! Rates larger than the bottleneck of the codec will be limited
-   *         to the current bottleneck.
-   *
-   * Input:
-   *        - ISAC_main_inst    : ISAC instance.
-   *        - bweIndex          : Index of bandwidth estimate to put in new
-   *                              bitstream
-   *        - rate              : target rate of the transcoder is bits/sec.
-   *                              Valid values are the accepted rate in iSAC,
-   *                              i.e. 10000 to 56000.
-   *        - isRCU                       : if the new bit-stream is an RCU stream.
-   *                              Note that the rate parameter always indicates
-   *                              the target rate of the main paylaod, regardless
-   *                              of 'isRCU' value.
-   *
-   * Output:
-   *        - encoded           : The encoded data vector
-   *
-   * Return value               : >0 - Length (in bytes) of coded data
-   *                              -1 - Error  or called in SWB mode
-   *                                 NOTE! No error code is written to
-   *                                 the struct since it is only allowed to read
-   *                                 the struct.
-   */
-  WebRtc_Word16 WebRtcIsac_GetNewBitStream(
-      ISACStruct*    ISAC_main_inst,
-      WebRtc_Word16  bweIndex,
-      WebRtc_Word16  jitterInfo,
-      WebRtc_Word32  rate,
-      WebRtc_Word16* encoded,
-      WebRtc_Word16  isRCU);
-
-
-
-  /****************************************************************************
-   * WebRtcIsac_GetDownLinkBwIndex(...)
-   *
-   * This function returns index representing the Bandwidth estimate from
-   * other side to this side.
-   *
-   * Input:
-   *        - ISAC_main_inst    : iSAC struct
-   *
-   * Output:
-   *        - bweIndex          : Bandwidth estimate to transmit to other side.
-   *
-   */
-
-  WebRtc_Word16 WebRtcIsac_GetDownLinkBwIndex(
-      ISACStruct*  ISAC_main_inst,
-      WebRtc_Word16* bweIndex,
-      WebRtc_Word16* jitterInfo);
-
-
-  /****************************************************************************
-   * WebRtcIsac_UpdateUplinkBw(...)
-   *
-   * This function takes an index representing the Bandwidth estimate from
-   * this side to other side and updates BWE.
-   *
-   * Input:
-   *        - ISAC_main_inst    : iSAC struct
-   *        - bweIndex          : Bandwidth estimate from other side.
-   *
-   */
-
-  WebRtc_Word16 WebRtcIsac_UpdateUplinkBw(
-      ISACStruct* ISAC_main_inst,
-      WebRtc_Word16 bweIndex);
-
-
-  /****************************************************************************
-   * WebRtcIsac_ReadBwIndex(...)
-   *
-   * This function returns the index of the Bandwidth estimate from the bitstream.
-   *
-   * Input:
-   *        - encoded           : Encoded bitstream
-   *
-   * Output:
-   *        - frameLength       : Length of frame in packet (in samples)
-   *        - bweIndex         : Bandwidth estimate in bitstream
-   *
-   */
-
-  WebRtc_Word16 WebRtcIsac_ReadBwIndex(
-      const WebRtc_Word16* encoded,
-      WebRtc_Word16*       bweIndex);
-
-
-
-  /*******************************************************************************
-   * WebRtcIsac_GetNewFrameLen(...)
-   *
-   * returns the frame lenght (in samples) of the next packet. In the case of channel-adaptive
-   * mode, iSAC decides on its frame lenght based on the estimated bottleneck
-   * this allows a user to prepare for the next packet (at the encoder)
-   *
-   * The primary usage is in CE to make the iSAC works in channel-adaptive mode
-   *
-   * Input:
-   *        - ISAC_main_inst     : iSAC struct
-   *
-   * Return Value                : frame lenght in samples
-   *
-   */
-
-  WebRtc_Word16 WebRtcIsac_GetNewFrameLen(
-      ISACStruct* ISAC_main_inst);
-
-
-  /****************************************************************************
-   *  WebRtcIsac_GetRedPayload(...)
-   *
-   *  Populates "encoded" with the redundant payload of the recently encoded
-   *  frame. This function has to be called once that WebRtcIsac_Encode(...)
-   *  returns a positive value. Regardless of the frame-size this function will
-   *  be called only once after encoding is completed.
-   *
-   * Input:
-   *      - ISAC_main_inst    : iSAC struct
-   *
-   * Output:
-   *        - encoded            : the encoded data vector
-   *
-   *
-   * Return value:
-   *                              : >0 - Length (in bytes) of coded data
-   *                              : -1 - Error
-   *
-   *
-   */
-  WebRtc_Word16 WebRtcIsac_GetRedPayload(
-      ISACStruct*    ISAC_main_inst,
-      WebRtc_Word16* encoded);
-
-
-  /****************************************************************************
-   * WebRtcIsac_DecodeRcu(...)
-   *
-   * This function decodes a redundant (RCU) iSAC frame. Function is called in
-   * NetEq with a stored RCU payload i case of packet loss. Output speech length
-   * will be a multiple of 480 samples: 480 or 960 samples,
-   * depending on the framesize (30 or 60 ms).
-   *
-   * Input:
-   *      - ISAC_main_inst     : ISAC instance.
-   *      - encoded            : encoded ISAC RCU frame(s)
-   *      - len                : bytes in encoded vector
-   *
-   * Output:
-   *      - decoded            : The decoded vector
-   *
-   * Return value              : >0 - number of samples in decoded vector
-   *                             -1 - Error
-   */
-  WebRtc_Word16 WebRtcIsac_DecodeRcu(
-      ISACStruct*           ISAC_main_inst,
-      const WebRtc_UWord16* encoded,
-      WebRtc_Word16         len,
-      WebRtc_Word16*        decoded,
-      WebRtc_Word16*        speechType);
-
-
-#if defined(__cplusplus)
-}
-#endif
-
-
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INTERFACE_ISAC_H_ */
diff --git a/src/mod/codecs/mod_isac/lattice.c b/src/mod/codecs/mod_isac/lattice.c
deleted file mode 100644
index a46135a3f7..0000000000
--- a/src/mod/codecs/mod_isac/lattice.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lattice.c
- *
- * contains the normalized lattice filter routines (MA and AR) for iSAC codec
- *
- */
-#include "settings.h"
-#include "codec.h"
-
-#include <math.h>
-#include <memory.h>
-#ifdef WEBRTC_ANDROID
-#include <stdlib.h>
-#endif
-
-/* filter the signal using normalized lattice filter */
-/* MA filter */
-void WebRtcIsac_NormLatticeFilterMa(int orderCoef,
-                                     float *stateF,
-                                     float *stateG,
-                                     float *lat_in,
-                                     double *filtcoeflo,
-                                     double *lat_out)
-{
-  int n,k,i,u,temp1;
-  int ord_1 = orderCoef+1;
-  float sth[MAX_AR_MODEL_ORDER];
-  float cth[MAX_AR_MODEL_ORDER];
-  float inv_cth[MAX_AR_MODEL_ORDER];
-  double a[MAX_AR_MODEL_ORDER+1];
-  float f[MAX_AR_MODEL_ORDER+1][HALF_SUBFRAMELEN], g[MAX_AR_MODEL_ORDER+1][HALF_SUBFRAMELEN];
-  float gain1;
-
-  for (u=0;u<SUBFRAMES;u++)
-  {
-    /* set the Direct Form coefficients */
-    temp1 = u*ord_1;
-    a[0] = 1;
-    memcpy(a+1, filtcoeflo+temp1+1, sizeof(double) * (ord_1-1));
-
-    /* compute lattice filter coefficients */
-    WebRtcIsac_Dir2Lat(a,orderCoef,sth,cth);
-
-    /* compute the gain */
-    gain1 = (float)filtcoeflo[temp1];
-    for (k=0;k<orderCoef;k++)
-    {
-      gain1 *= cth[k];
-      inv_cth[k] = 1/cth[k];
-    }
-
-    /* normalized lattice filter */
-    /*****************************/
-
-    /* initial conditions */
-    for (i=0;i<HALF_SUBFRAMELEN;i++)
-    {
-      f[0][i] = lat_in[i + u * HALF_SUBFRAMELEN];
-      g[0][i] = lat_in[i + u * HALF_SUBFRAMELEN];
-    }
-
-    /* get the state of f&g for the first input, for all orders */
-    for (i=1;i<ord_1;i++)
-    {
-      f[i][0] = inv_cth[i-1]*(f[i-1][0] + sth[i-1]*stateG[i-1]);
-      g[i][0] = cth[i-1]*stateG[i-1] + sth[i-1]* f[i][0];
-    }
-
-    /* filtering */
-    for(k=0;k<orderCoef;k++)
-    {
-      for(n=0;n<(HALF_SUBFRAMELEN-1);n++)
-      {
-        f[k+1][n+1] = inv_cth[k]*(f[k][n+1] + sth[k]*g[k][n]);
-        g[k+1][n+1] = cth[k]*g[k][n] + sth[k]* f[k+1][n+1];
-      }
-    }
-
-    for(n=0;n<HALF_SUBFRAMELEN;n++)
-    {
-      lat_out[n + u * HALF_SUBFRAMELEN] = gain1 * f[orderCoef][n];
-    }
-
-    /* save the states */
-    for (i=0;i<ord_1;i++)
-    {
-      stateF[i] = f[i][HALF_SUBFRAMELEN-1];
-      stateG[i] = g[i][HALF_SUBFRAMELEN-1];
-    }
-    /* process next frame */
-  }
-
-  return;
-}
-
-
-/*///////////////////AR filter ///////////////////////////////*/
-/* filter the signal using normalized lattice filter */
-void WebRtcIsac_NormLatticeFilterAr(int orderCoef,
-                                     float *stateF,
-                                     float *stateG,
-                                     double *lat_in,
-                                     double *lo_filt_coef,
-                                     float *lat_out)
-{
-  int n,k,i,u,temp1;
-  int ord_1 = orderCoef+1;
-  float sth[MAX_AR_MODEL_ORDER];
-  float cth[MAX_AR_MODEL_ORDER];
-  double a[MAX_AR_MODEL_ORDER+1];
-  float ARf[MAX_AR_MODEL_ORDER+1][HALF_SUBFRAMELEN], ARg[MAX_AR_MODEL_ORDER+1][HALF_SUBFRAMELEN];
-  float gain1,inv_gain1;
-
-  for (u=0;u<SUBFRAMES;u++)
-  {
-    /* set the denominator and numerator of the Direct Form */
-    temp1 = u*ord_1;
-    a[0] = 1;
-
-    memcpy(a+1, lo_filt_coef+temp1+1, sizeof(double) * (ord_1-1));
-
-    WebRtcIsac_Dir2Lat(a,orderCoef,sth,cth);
-
-    gain1 = (float)lo_filt_coef[temp1];
-    for (k=0;k<orderCoef;k++)
-    {
-      gain1 = cth[k]*gain1;
-    }
-
-    /* initial conditions */
-    inv_gain1 = 1/gain1;
-    for (i=0;i<HALF_SUBFRAMELEN;i++)
-    {
-      ARf[orderCoef][i] = (float)lat_in[i + u * HALF_SUBFRAMELEN]*inv_gain1;
-    }
-
-
-    for (i=orderCoef-1;i>=0;i--) //get the state of f&g for the first input, for all orders
-    {
-      ARf[i][0] = cth[i]*ARf[i+1][0] - sth[i]*stateG[i];
-      ARg[i+1][0] = sth[i]*ARf[i+1][0] + cth[i]* stateG[i];
-    }
-    ARg[0][0] = ARf[0][0];
-
-    for(n=0;n<(HALF_SUBFRAMELEN-1);n++)
-    {
-      for(k=orderCoef-1;k>=0;k--)
-      {
-        ARf[k][n+1] = cth[k]*ARf[k+1][n+1] - sth[k]*ARg[k][n];
-        ARg[k+1][n+1] = sth[k]*ARf[k+1][n+1] + cth[k]* ARg[k][n];
-      }
-      ARg[0][n+1] = ARf[0][n+1];
-    }
-
-    memcpy(lat_out+u * HALF_SUBFRAMELEN, &(ARf[0][0]), sizeof(float) * HALF_SUBFRAMELEN);
-
-    /* cannot use memcpy in the following */
-    for (i=0;i<ord_1;i++)
-    {
-      stateF[i] = ARf[i][HALF_SUBFRAMELEN-1];
-      stateG[i] = ARg[i][HALF_SUBFRAMELEN-1];
-    }
-
-  }
-
-  return;
-}
-
-
-/* compute the reflection coefficients using the step-down procedure*/
-/* converts the direct form parameters to lattice form.*/
-/* a and b are vectors which contain the direct form coefficients,
-   according to
-   A(z) = a(1) + a(2)*z + a(3)*z^2 + ... + a(M+1)*z^M
-   B(z) = b(1) + b(2)*z + b(3)*z^2 + ... + b(M+1)*z^M
-*/
-
-void WebRtcIsac_Dir2Lat(double *a,
-                        int orderCoef,
-                        float *sth,
-                        float *cth)
-{
-  int m, k;
-  float tmp[MAX_AR_MODEL_ORDER];
-  float tmp_inv, cth2;
-
-  sth[orderCoef-1] = (float)a[orderCoef];
-  cth2 = 1.0f - sth[orderCoef-1] * sth[orderCoef-1];
-  cth[orderCoef-1] = (float)sqrt(cth2);
-  for (m=orderCoef-1; m>0; m--)
-  {
-    tmp_inv = 1.0f / cth2;
-    for (k=1; k<=m; k++)
-    {
-      tmp[k] = ((float)a[k] - sth[m] * (float)a[m-k+1]) * tmp_inv;
-    }
-
-    for (k=1; k<m; k++)
-    {
-      a[k] = tmp[k];
-    }
-
-    sth[m-1] = tmp[m];
-    cth2 = 1 - sth[m-1] * sth[m-1];
-    cth[m-1] = (float)sqrt(cth2);
-  }
-}
diff --git a/src/mod/codecs/mod_isac/levinson_durbin.c b/src/mod/codecs/mod_isac/levinson_durbin.c
deleted file mode 100644
index 4e11cdb1fe..0000000000
--- a/src/mod/codecs/mod_isac/levinson_durbin.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_LevinsonDurbin().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-#define SPL_LEVINSON_MAXORDER 20
-
-WebRtc_Word16 WebRtcSpl_LevinsonDurbin(WebRtc_Word32 *R, WebRtc_Word16 *A, WebRtc_Word16 *K,
-                                       WebRtc_Word16 order)
-{
-    WebRtc_Word16 i, j;
-    // Auto-correlation coefficients in high precision
-    WebRtc_Word16 R_hi[SPL_LEVINSON_MAXORDER + 1], R_low[SPL_LEVINSON_MAXORDER + 1];
-    // LPC coefficients in high precision
-    WebRtc_Word16 A_hi[SPL_LEVINSON_MAXORDER + 1], A_low[SPL_LEVINSON_MAXORDER + 1];
-    // LPC coefficients for next iteration
-    WebRtc_Word16 A_upd_hi[SPL_LEVINSON_MAXORDER + 1], A_upd_low[SPL_LEVINSON_MAXORDER + 1];
-    // Reflection coefficient in high precision
-    WebRtc_Word16 K_hi, K_low;
-    // Prediction gain Alpha in high precision and with scale factor
-    WebRtc_Word16 Alpha_hi, Alpha_low, Alpha_exp;
-    WebRtc_Word16 tmp_hi, tmp_low;
-    WebRtc_Word32 temp1W32, temp2W32, temp3W32;
-    WebRtc_Word16 norm;
-
-    // Normalize the autocorrelation R[0]...R[order+1]
-
-    norm = WebRtcSpl_NormW32(R[0]);
-
-    for (i = order; i >= 0; i--)
-    {
-        temp1W32 = WEBRTC_SPL_LSHIFT_W32(R[i], norm);
-        // Put R in hi and low format
-        R_hi[i] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp1W32, 16);
-        R_low[i] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp1W32
-                - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)R_hi[i], 16)), 1);
-    }
-
-    // K = A[1] = -R[1] / R[0]
-
-    temp2W32 = WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)R_hi[1],16)
-            + WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)R_low[1],1); // R[1] in Q31
-    temp3W32 = WEBRTC_SPL_ABS_W32(temp2W32); // abs R[1]
-    temp1W32 = WebRtcSpl_DivW32HiLow(temp3W32, R_hi[0], R_low[0]); // abs(R[1])/R[0] in Q31
-    // Put back the sign on R[1]
-    if (temp2W32 > 0)
-    {
-        temp1W32 = -temp1W32;
-    }
-
-    // Put K in hi and low format
-    K_hi = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp1W32, 16);
-    K_low = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp1W32
-            - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)K_hi, 16)), 1);
-
-    // Store first reflection coefficient
-    K[0] = K_hi;
-
-    temp1W32 = WEBRTC_SPL_RSHIFT_W32(temp1W32, 4); // A[1] in Q27
-
-    // Put A[1] in hi and low format
-    A_hi[1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp1W32, 16);
-    A_low[1] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp1W32
-            - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)A_hi[1], 16)), 1);
-
-    // Alpha = R[0] * (1-K^2)
-
-    temp1W32 = (((WEBRTC_SPL_MUL_16_16(K_hi, K_low) >> 14) + WEBRTC_SPL_MUL_16_16(K_hi, K_hi))
-            << 1); // temp1W32 = k^2 in Q31
-
-    temp1W32 = WEBRTC_SPL_ABS_W32(temp1W32); // Guard against <0
-    temp1W32 = (WebRtc_Word32)0x7fffffffL - temp1W32; // temp1W32 = (1 - K[0]*K[0]) in Q31
-
-    // Store temp1W32 = 1 - K[0]*K[0] on hi and low format
-    tmp_hi = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp1W32, 16);
-    tmp_low = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp1W32
-            - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)tmp_hi, 16)), 1);
-
-    // Calculate Alpha in Q31
-    temp1W32 = ((WEBRTC_SPL_MUL_16_16(R_hi[0], tmp_hi)
-            + (WEBRTC_SPL_MUL_16_16(R_hi[0], tmp_low) >> 15)
-            + (WEBRTC_SPL_MUL_16_16(R_low[0], tmp_hi) >> 15)) << 1);
-
-    // Normalize Alpha and put it in hi and low format
-
-    Alpha_exp = WebRtcSpl_NormW32(temp1W32);
-    temp1W32 = WEBRTC_SPL_LSHIFT_W32(temp1W32, Alpha_exp);
-    Alpha_hi = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp1W32, 16);
-    Alpha_low = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp1W32
-            - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)Alpha_hi, 16)), 1);
-
-    // Perform the iterative calculations in the Levinson-Durbin algorithm
-
-    for (i = 2; i <= order; i++)
-    {
-        /*                    ----
-         temp1W32 =  R[i] + > R[j]*A[i-j]
-         /
-         ----
-         j=1..i-1
-         */
-
-        temp1W32 = 0;
-
-        for (j = 1; j < i; j++)
-        {
-            // temp1W32 is in Q31
-            temp1W32 += ((WEBRTC_SPL_MUL_16_16(R_hi[j], A_hi[i-j]) << 1)
-                    + (((WEBRTC_SPL_MUL_16_16(R_hi[j], A_low[i-j]) >> 15)
-                            + (WEBRTC_SPL_MUL_16_16(R_low[j], A_hi[i-j]) >> 15)) << 1));
-        }
-
-        temp1W32 = WEBRTC_SPL_LSHIFT_W32(temp1W32, 4);
-        temp1W32 += (WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)R_hi[i], 16)
-                + WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)R_low[i], 1));
-
-        // K = -temp1W32 / Alpha
-        temp2W32 = WEBRTC_SPL_ABS_W32(temp1W32); // abs(temp1W32)
-        temp3W32 = WebRtcSpl_DivW32HiLow(temp2W32, Alpha_hi, Alpha_low); // abs(temp1W32)/Alpha
-
-        // Put the sign of temp1W32 back again
-        if (temp1W32 > 0)
-        {
-            temp3W32 = -temp3W32;
-        }
-
-        // Use the Alpha shifts from earlier to de-normalize
-        norm = WebRtcSpl_NormW32(temp3W32);
-        if ((Alpha_exp <= norm) || (temp3W32 == 0))
-        {
-            temp3W32 = WEBRTC_SPL_LSHIFT_W32(temp3W32, Alpha_exp);
-        } else
-        {
-            if (temp3W32 > 0)
-            {
-                temp3W32 = (WebRtc_Word32)0x7fffffffL;
-            } else
-            {
-                temp3W32 = (WebRtc_Word32)0x80000000L;
-            }
-        }
-
-        // Put K on hi and low format
-        K_hi = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp3W32, 16);
-        K_low = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp3W32
-                - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)K_hi, 16)), 1);
-
-        // Store Reflection coefficient in Q15
-        K[i - 1] = K_hi;
-
-        // Test for unstable filter.
-        // If unstable return 0 and let the user decide what to do in that case
-
-        if ((WebRtc_Word32)WEBRTC_SPL_ABS_W16(K_hi) > (WebRtc_Word32)32750)
-        {
-            return 0; // Unstable filter
-        }
-
-        /*
-         Compute updated LPC coefficient: Anew[i]
-         Anew[j]= A[j] + K*A[i-j]   for j=1..i-1
-         Anew[i]= K
-         */
-
-        for (j = 1; j < i; j++)
-        {
-            // temp1W32 = A[j] in Q27
-            temp1W32 = WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)A_hi[j],16)
-                    + WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)A_low[j],1);
-
-            // temp1W32 += K*A[i-j] in Q27
-            temp1W32 += ((WEBRTC_SPL_MUL_16_16(K_hi, A_hi[i-j])
-                    + (WEBRTC_SPL_MUL_16_16(K_hi, A_low[i-j]) >> 15)
-                    + (WEBRTC_SPL_MUL_16_16(K_low, A_hi[i-j]) >> 15)) << 1);
-
-            // Put Anew in hi and low format
-            A_upd_hi[j] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp1W32, 16);
-            A_upd_low[j] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp1W32
-                    - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)A_upd_hi[j], 16)), 1);
-        }
-
-        // temp3W32 = K in Q27 (Convert from Q31 to Q27)
-        temp3W32 = WEBRTC_SPL_RSHIFT_W32(temp3W32, 4);
-
-        // Store Anew in hi and low format
-        A_upd_hi[i] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp3W32, 16);
-        A_upd_low[i] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp3W32
-                - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)A_upd_hi[i], 16)), 1);
-
-        // Alpha = Alpha * (1-K^2)
-
-        temp1W32 = (((WEBRTC_SPL_MUL_16_16(K_hi, K_low) >> 14)
-                + WEBRTC_SPL_MUL_16_16(K_hi, K_hi)) << 1); // K*K in Q31
-
-        temp1W32 = WEBRTC_SPL_ABS_W32(temp1W32); // Guard against <0
-        temp1W32 = (WebRtc_Word32)0x7fffffffL - temp1W32; // 1 - K*K  in Q31
-
-        // Convert 1- K^2 in hi and low format
-        tmp_hi = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp1W32, 16);
-        tmp_low = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp1W32
-                - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)tmp_hi, 16)), 1);
-
-        // Calculate Alpha = Alpha * (1-K^2) in Q31
-        temp1W32 = ((WEBRTC_SPL_MUL_16_16(Alpha_hi, tmp_hi)
-                + (WEBRTC_SPL_MUL_16_16(Alpha_hi, tmp_low) >> 15)
-                + (WEBRTC_SPL_MUL_16_16(Alpha_low, tmp_hi) >> 15)) << 1);
-
-        // Normalize Alpha and store it on hi and low format
-
-        norm = WebRtcSpl_NormW32(temp1W32);
-        temp1W32 = WEBRTC_SPL_LSHIFT_W32(temp1W32, norm);
-
-        Alpha_hi = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(temp1W32, 16);
-        Alpha_low = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp1W32
-                - WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)Alpha_hi, 16)), 1);
-
-        // Update the total normalization of Alpha
-        Alpha_exp = Alpha_exp + norm;
-
-        // Update A[]
-
-        for (j = 1; j <= i; j++)
-        {
-            A_hi[j] = A_upd_hi[j];
-            A_low[j] = A_upd_low[j];
-        }
-    }
-
-    /*
-     Set A[0] to 1.0 and store the A[i] i=1...order in Q12
-     (Convert from Q27 and use rounding)
-     */
-
-    A[0] = 4096;
-
-    for (i = 1; i <= order; i++)
-    {
-        // temp1W32 in Q27
-        temp1W32 = WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)A_hi[i], 16)
-                + WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)A_low[i], 1);
-        // Round and store upper word
-        A[i] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32((temp1W32<<1)+(WebRtc_Word32)32768, 16);
-    }
-    return 1; // Stable filters
-}
diff --git a/src/mod/codecs/mod_isac/lpc_analysis.c b/src/mod/codecs/mod_isac/lpc_analysis.c
deleted file mode 100644
index 854b2d733c..0000000000
--- a/src/mod/codecs/mod_isac/lpc_analysis.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "lpc_analysis.h"
-#include "settings.h"
-#include "codec.h"
-#include "entropy_coding.h"
-
-#include <math.h>
-#include <string.h>
-
-#define LEVINSON_EPS    1.0e-10
-
-
-/* window */
-/* Matlab generation code:
- *  t = (1:256)/257; r = 1-(1-t).^.45; w = sin(r*pi).^3; w = w/sum(w); plot((1:256)/8, w); grid;
- *  for k=1:16, fprintf(1, '%.8f, ', w(k*16 + (-15:0))); fprintf(1, '\n'); end
- */
-static const double kLpcCorrWindow[WINLEN] = {
-  0.00000000, 0.00000001, 0.00000004, 0.00000010, 0.00000020,
-  0.00000035, 0.00000055, 0.00000083, 0.00000118, 0.00000163,
-  0.00000218, 0.00000283, 0.00000361, 0.00000453, 0.00000558, 0.00000679,
-  0.00000817, 0.00000973, 0.00001147, 0.00001342, 0.00001558,
-  0.00001796, 0.00002058, 0.00002344, 0.00002657, 0.00002997,
-  0.00003365, 0.00003762, 0.00004190, 0.00004651, 0.00005144, 0.00005673,
-  0.00006236, 0.00006837, 0.00007476, 0.00008155, 0.00008875,
-  0.00009636, 0.00010441, 0.00011290, 0.00012186, 0.00013128,
-  0.00014119, 0.00015160, 0.00016252, 0.00017396, 0.00018594, 0.00019846,
-  0.00021155, 0.00022521, 0.00023946, 0.00025432, 0.00026978,
-  0.00028587, 0.00030260, 0.00031998, 0.00033802, 0.00035674,
-  0.00037615, 0.00039626, 0.00041708, 0.00043863, 0.00046092, 0.00048396,
-  0.00050775, 0.00053233, 0.00055768, 0.00058384, 0.00061080,
-  0.00063858, 0.00066720, 0.00069665, 0.00072696, 0.00075813,
-  0.00079017, 0.00082310, 0.00085692, 0.00089164, 0.00092728, 0.00096384,
-  0.00100133, 0.00103976, 0.00107914, 0.00111947, 0.00116077,
-  0.00120304, 0.00124630, 0.00129053, 0.00133577, 0.00138200,
-  0.00142924, 0.00147749, 0.00152676, 0.00157705, 0.00162836, 0.00168070,
-  0.00173408, 0.00178850, 0.00184395, 0.00190045, 0.00195799,
-  0.00201658, 0.00207621, 0.00213688, 0.00219860, 0.00226137,
-  0.00232518, 0.00239003, 0.00245591, 0.00252284, 0.00259079, 0.00265977,
-  0.00272977, 0.00280078, 0.00287280, 0.00294582, 0.00301984,
-  0.00309484, 0.00317081, 0.00324774, 0.00332563, 0.00340446,
-  0.00348421, 0.00356488, 0.00364644, 0.00372889, 0.00381220, 0.00389636,
-  0.00398135, 0.00406715, 0.00415374, 0.00424109, 0.00432920,
-  0.00441802, 0.00450754, 0.00459773, 0.00468857, 0.00478001,
-  0.00487205, 0.00496464, 0.00505775, 0.00515136, 0.00524542, 0.00533990,
-  0.00543476, 0.00552997, 0.00562548, 0.00572125, 0.00581725,
-  0.00591342, 0.00600973, 0.00610612, 0.00620254, 0.00629895,
-  0.00639530, 0.00649153, 0.00658758, 0.00668341, 0.00677894, 0.00687413,
-  0.00696891, 0.00706322, 0.00715699, 0.00725016, 0.00734266,
-  0.00743441, 0.00752535, 0.00761540, 0.00770449, 0.00779254,
-  0.00787947, 0.00796519, 0.00804963, 0.00813270, 0.00821431, 0.00829437,
-  0.00837280, 0.00844949, 0.00852436, 0.00859730, 0.00866822,
-  0.00873701, 0.00880358, 0.00886781, 0.00892960, 0.00898884,
-  0.00904542, 0.00909923, 0.00915014, 0.00919805, 0.00924283, 0.00928436,
-  0.00932252, 0.00935718, 0.00938821, 0.00941550, 0.00943890,
-  0.00945828, 0.00947351, 0.00948446, 0.00949098, 0.00949294,
-  0.00949020, 0.00948262, 0.00947005, 0.00945235, 0.00942938, 0.00940099,
-  0.00936704, 0.00932738, 0.00928186, 0.00923034, 0.00917268,
-  0.00910872, 0.00903832, 0.00896134, 0.00887763, 0.00878706,
-  0.00868949, 0.00858478, 0.00847280, 0.00835343, 0.00822653, 0.00809199,
-  0.00794970, 0.00779956, 0.00764145, 0.00747530, 0.00730103,
-  0.00711857, 0.00692787, 0.00672888, 0.00652158, 0.00630597,
-  0.00608208, 0.00584994, 0.00560962, 0.00536124, 0.00510493, 0.00484089,
-  0.00456935, 0.00429062, 0.00400505, 0.00371310, 0.00341532,
-  0.00311238, 0.00280511, 0.00249452, 0.00218184, 0.00186864,
-  0.00155690, 0.00124918, 0.00094895, 0.00066112, 0.00039320, 0.00015881
-};
-
-double WebRtcIsac_LevDurb(double *a, double *k, double *r, int order)
-{
-
-  double  sum, alpha;
-  int     m, m_h, i;
-  alpha = 0; //warning -DH
-  a[0] = 1.0;
-  if (r[0] < LEVINSON_EPS) { /* if r[0] <= 0, set LPC coeff. to zero */
-    for (i = 0; i < order; i++) {
-      k[i] = 0;
-      a[i+1] = 0;
-    }
-  } else {
-    a[1] = k[0] = -r[1]/r[0];
-    alpha = r[0] + r[1] * k[0];
-    for (m = 1; m < order; m++){
-      sum = r[m + 1];
-      for (i = 0; i < m; i++){
-        sum += a[i+1] * r[m - i];
-      }
-      k[m] = -sum / alpha;
-      alpha += k[m] * sum;
-      m_h = (m + 1) >> 1;
-      for (i = 0; i < m_h; i++){
-        sum = a[i+1] + k[m] * a[m - i];
-        a[m - i] += k[m] * a[i+1];
-        a[i+1] = sum;
-      }
-      a[m+1] = k[m];
-    }
-  }
-  return alpha;
-}
-
-
-//was static before, but didn't work with MEX file
-void WebRtcIsac_GetVars(const double *input, const WebRtc_Word16 *pitchGains_Q12,
-                       double *oldEnergy, double *varscale)
-{
-  double nrg[4], chng, pg;
-  int k;
-
-  double pitchGains[4]={0,0,0,0};;
-
-  /* Calculate energies of first and second frame halfs */
-  nrg[0] = 0.0001;
-  for (k = QLOOKAHEAD/2; k < (FRAMESAMPLES_QUARTER + QLOOKAHEAD) / 2; k++) {
-    nrg[0] += input[k]*input[k];
-  }
-  nrg[1] = 0.0001;
-  for ( ; k < (FRAMESAMPLES_HALF + QLOOKAHEAD) / 2; k++) {
-    nrg[1] += input[k]*input[k];
-  }
-  nrg[2] = 0.0001;
-  for ( ; k < (FRAMESAMPLES*3/4 + QLOOKAHEAD) / 2; k++) {
-    nrg[2] += input[k]*input[k];
-  }
-  nrg[3] = 0.0001;
-  for ( ; k < (FRAMESAMPLES + QLOOKAHEAD) / 2; k++) {
-    nrg[3] += input[k]*input[k];
-  }
-
-  /* Calculate average level change */
-  chng = 0.25 * (fabs(10.0 * log10(nrg[3] / nrg[2])) +
-                 fabs(10.0 * log10(nrg[2] / nrg[1])) +
-                 fabs(10.0 * log10(nrg[1] / nrg[0])) +
-                 fabs(10.0 * log10(nrg[0] / *oldEnergy)));
-
-
-  /* Find average pitch gain */
-  pg = 0.0;
-  for (k=0; k<4; k++)
-  {
-    pitchGains[k] = ((float)pitchGains_Q12[k])/4096;
-    pg += pitchGains[k];
-  }
-  pg *= 0.25;
-
-  /* If pitch gain is low and energy constant - increase noise level*/
-  /* Matlab code:
-     pg = 0:.01:.45; plot(pg, 0.0 + 1.0 * exp( -1.0 * exp(-200.0 * pg.*pg.*pg) / (1.0 + 0.4 * 0) ))
-  */
-  *varscale = 0.0 + 1.0 * exp( -1.4 * exp(-200.0 * pg*pg*pg) / (1.0 + 0.4 * chng) );
-
-  *oldEnergy = nrg[3];
-}
-
-void
-WebRtcIsac_GetVarsUB(
-    const double* input,
-    double*       oldEnergy,
-    double*       varscale)
-{
-  double nrg[4], chng;
-  int k;
-
-  /* Calculate energies of first and second frame halfs */
-  nrg[0] = 0.0001;
-  for (k = 0; k < (FRAMESAMPLES_QUARTER) / 2; k++) {
-    nrg[0] += input[k]*input[k];
-  }
-  nrg[1] = 0.0001;
-  for ( ; k < (FRAMESAMPLES_HALF) / 2; k++) {
-    nrg[1] += input[k]*input[k];
-  }
-  nrg[2] = 0.0001;
-  for ( ; k < (FRAMESAMPLES*3/4) / 2; k++) {
-    nrg[2] += input[k]*input[k];
-  }
-  nrg[3] = 0.0001;
-  for ( ; k < (FRAMESAMPLES) / 2; k++) {
-    nrg[3] += input[k]*input[k];
-  }
-
-  /* Calculate average level change */
-  chng = 0.25 * (fabs(10.0 * log10(nrg[3] / nrg[2])) +
-                 fabs(10.0 * log10(nrg[2] / nrg[1])) +
-                 fabs(10.0 * log10(nrg[1] / nrg[0])) +
-                 fabs(10.0 * log10(nrg[0] / *oldEnergy)));
-
-
-  /* If pitch gain is low and energy constant - increase noise level*/
-  /* Matlab code:
-     pg = 0:.01:.45; plot(pg, 0.0 + 1.0 * exp( -1.0 * exp(-200.0 * pg.*pg.*pg) / (1.0 + 0.4 * 0) ))
-  */
-  *varscale = exp( -1.4 / (1.0 + 0.4 * chng) );
-
-  *oldEnergy = nrg[3];
-}
-
-void WebRtcIsac_GetLpcCoefLb(double *inLo, double *inHi, MaskFiltstr *maskdata,
-                             double signal_noise_ratio, const WebRtc_Word16 *pitchGains_Q12,
-                             double *lo_coeff, double *hi_coeff)
-{
-  int k, n, j, pos1, pos2;
-  double varscale;
-
-  double DataLo[WINLEN], DataHi[WINLEN];
-  double corrlo[ORDERLO+2], corrlo2[ORDERLO+1];
-  double corrhi[ORDERHI+1];
-  double k_veclo[ORDERLO], k_vechi[ORDERHI];
-
-  double a_LO[ORDERLO+1], a_HI[ORDERHI+1];
-  double tmp, res_nrg;
-
-  double FwdA, FwdB;
-
-  /* hearing threshold level in dB; higher value gives more noise */
-  const double HearThresOffset = -28.0;
-
-  /* bandwdith expansion factors for low- and high band */
-  const double gammaLo = 0.9;
-  const double gammaHi = 0.8;
-
-  /* less-noise-at-low-frequencies factor */
-  double aa;
-
-
-  /* convert from dB to signal level */
-  const double H_T_H = pow(10.0, 0.05 * HearThresOffset);
-  double S_N_R = pow(10.0, 0.05 * signal_noise_ratio) / 3.46;    /* divide by sqrt(12) */
-
-  /* change quallevel depending on pitch gains and level fluctuations */
-  WebRtcIsac_GetVars(inLo, pitchGains_Q12, &(maskdata->OldEnergy), &varscale);
-
-  /* less-noise-at-low-frequencies factor */
-  aa = 0.35 * (0.5 + 0.5 * varscale);
-
-  /* replace data in buffer by new look-ahead data */
-  for (pos1 = 0; pos1 < QLOOKAHEAD; pos1++)
-    maskdata->DataBufferLo[pos1 + WINLEN - QLOOKAHEAD] = inLo[pos1];
-
-  for (k = 0; k < SUBFRAMES; k++) {
-
-    /* Update input buffer and multiply signal with window */
-    for (pos1 = 0; pos1 < WINLEN - UPDATE/2; pos1++) {
-      maskdata->DataBufferLo[pos1] = maskdata->DataBufferLo[pos1 + UPDATE/2];
-      maskdata->DataBufferHi[pos1] = maskdata->DataBufferHi[pos1 + UPDATE/2];
-      DataLo[pos1] = maskdata->DataBufferLo[pos1] * kLpcCorrWindow[pos1];
-      DataHi[pos1] = maskdata->DataBufferHi[pos1] * kLpcCorrWindow[pos1];
-    }
-    pos2 = k * UPDATE/2;
-    for (n = 0; n < UPDATE/2; n++, pos1++) {
-      maskdata->DataBufferLo[pos1] = inLo[QLOOKAHEAD + pos2];
-      maskdata->DataBufferHi[pos1] = inHi[pos2++];
-      DataLo[pos1] = maskdata->DataBufferLo[pos1] * kLpcCorrWindow[pos1];
-      DataHi[pos1] = maskdata->DataBufferHi[pos1] * kLpcCorrWindow[pos1];
-    }
-
-    /* Get correlation coefficients */
-    WebRtcIsac_AutoCorr(corrlo, DataLo, WINLEN, ORDERLO+1); /* computing autocorrelation */
-    WebRtcIsac_AutoCorr(corrhi, DataHi, WINLEN, ORDERHI);
-
-
-    /* less noise for lower frequencies, by filtering/scaling autocorrelation sequences */
-    corrlo2[0] = (1.0+aa*aa) * corrlo[0] - 2.0*aa * corrlo[1];
-    tmp = (1.0 + aa*aa);
-    for (n = 1; n <= ORDERLO; n++) {
-      corrlo2[n] = tmp * corrlo[n] - aa * (corrlo[n-1] + corrlo[n+1]);
-    }
-    tmp = (1.0+aa) * (1.0+aa);
-    for (n = 0; n <= ORDERHI; n++) {
-      corrhi[n] = tmp * corrhi[n];
-    }
-
-    /* add white noise floor */
-    corrlo2[0] += 1e-6;
-    corrhi[0] += 1e-6;
-
-
-    FwdA = 0.01;
-    FwdB = 0.01;
-
-    /* recursive filtering of correlation over subframes */
-    for (n = 0; n <= ORDERLO; n++) {
-      maskdata->CorrBufLo[n] = FwdA * maskdata->CorrBufLo[n] + corrlo2[n];
-      corrlo2[n] = ((1.0-FwdA)*FwdB) * maskdata->CorrBufLo[n] + (1.0-FwdB) * corrlo2[n];
-    }
-    for (n = 0; n <= ORDERHI; n++) {
-      maskdata->CorrBufHi[n] = FwdA * maskdata->CorrBufHi[n] + corrhi[n];
-      corrhi[n] = ((1.0-FwdA)*FwdB) * maskdata->CorrBufHi[n] + (1.0-FwdB) * corrhi[n];
-    }
-
-    /* compute prediction coefficients */
-    WebRtcIsac_LevDurb(a_LO, k_veclo, corrlo2, ORDERLO);
-    WebRtcIsac_LevDurb(a_HI, k_vechi, corrhi, ORDERHI);
-
-    /* bandwidth expansion */
-    tmp = gammaLo;
-    for (n = 1; n <= ORDERLO; n++) {
-      a_LO[n] *= tmp;
-      tmp *= gammaLo;
-    }
-
-    /* residual energy */
-    res_nrg = 0.0;
-    for (j = 0; j <= ORDERLO; j++) {
-      for (n = 0; n <= j; n++) {
-        res_nrg += a_LO[j] * corrlo2[j-n] * a_LO[n];
-      }
-      for (n = j+1; n <= ORDERLO; n++) {
-        res_nrg += a_LO[j] * corrlo2[n-j] * a_LO[n];
-      }
-    }
-
-    /* add hearing threshold and compute the gain */
-    *lo_coeff++ = S_N_R / (sqrt(res_nrg) / varscale + H_T_H);
-
-    /* copy coefficients to output array */
-    for (n = 1; n <= ORDERLO; n++) {
-      *lo_coeff++ = a_LO[n];
-    }
-
-
-    /* bandwidth expansion */
-    tmp = gammaHi;
-    for (n = 1; n <= ORDERHI; n++) {
-      a_HI[n] *= tmp;
-      tmp *= gammaHi;
-    }
-
-    /* residual energy */
-    res_nrg = 0.0;
-    for (j = 0; j <= ORDERHI; j++) {
-      for (n = 0; n <= j; n++) {
-        res_nrg += a_HI[j] * corrhi[j-n] * a_HI[n];
-      }
-      for (n = j+1; n <= ORDERHI; n++) {
-        res_nrg += a_HI[j] * corrhi[n-j] * a_HI[n];
-      }
-    }
-
-    /* add hearing threshold and compute of the gain */
-    *hi_coeff++ = S_N_R / (sqrt(res_nrg) / varscale + H_T_H);
-
-    /* copy coefficients to output array */
-    for (n = 1; n <= ORDERHI; n++) {
-      *hi_coeff++ = a_HI[n];
-    }
-  }
-}
-
-
-
-/******************************************************************************
- * WebRtcIsac_GetLpcCoefUb()
- *
- * Compute LP coefficients and correlation coefficients. At 12 kHz LP
- * coefficients of the first and the last sub-frame is computed. At 16 kHz
- * LP coefficients of 4th, 8th and 12th sub-frames are computed. We always
- * compute correlation coefficients of all sub-frames.
- *
- * Inputs:
- *       -inSignal           : Input signal
- *       -maskdata           : a structure keeping signal from previous frame.
- *       -bandwidth          : specifies if the codec is in 0-16 kHz mode or
- *                             0-12 kHz mode.
- *
- * Outputs:
- *       -lpCoeff            : pointer to a buffer where A-polynomials are
- *                             written to (first coeff is 1 and it is not
- *                             written)
- *       -corrMat            : a matrix where correlation coefficients of each
- *                             sub-frame are written to one row.
- *       -varscale           : a scale used to compute LPC gains.
- */
-void
-WebRtcIsac_GetLpcCoefUb(
-    double*      inSignal,
-    MaskFiltstr* maskdata,
-    double*      lpCoeff,
-    double       corrMat[][UB_LPC_ORDER + 1],
-    double*      varscale,
-    WebRtc_Word16  bandwidth)
-{
-  int frameCntr, activeFrameCntr, n, pos1, pos2;
-  WebRtc_Word16 criterion1;
-  WebRtc_Word16 criterion2;
-  WebRtc_Word16 numSubFrames = SUBFRAMES * (1 + (bandwidth == isac16kHz));
-  double data[WINLEN];
-  double corrSubFrame[UB_LPC_ORDER+2];
-  double reflecCoeff[UB_LPC_ORDER];
-
-  double aPolynom[UB_LPC_ORDER+1];
-  double tmp;
-
-  /* bandwdith expansion factors */
-  const double gamma = 0.9;
-
-  /* change quallevel depending on pitch gains and level fluctuations */
-  WebRtcIsac_GetVarsUB(inSignal, &(maskdata->OldEnergy), varscale);
-
-  /* replace data in buffer by new look-ahead data */
-  for(frameCntr = 0, activeFrameCntr = 0; frameCntr < numSubFrames;
-      frameCntr++)
-  {
-    if(frameCntr == SUBFRAMES)
-    {
-      // we are in 16 kHz
-      varscale++;
-      WebRtcIsac_GetVarsUB(&inSignal[FRAMESAMPLES_HALF],
-                          &(maskdata->OldEnergy), varscale);
-    }
-    /* Update input buffer and multiply signal with window */
-    for(pos1 = 0; pos1 < WINLEN - UPDATE/2; pos1++)
-    {
-      maskdata->DataBufferLo[pos1] = maskdata->DataBufferLo[pos1 +
-                                                            UPDATE/2];
-      data[pos1] = maskdata->DataBufferLo[pos1] * kLpcCorrWindow[pos1];
-    }
-    pos2 = frameCntr * UPDATE/2;
-    for(n = 0; n < UPDATE/2; n++, pos1++, pos2++)
-    {
-      maskdata->DataBufferLo[pos1] = inSignal[pos2];
-      data[pos1] = maskdata->DataBufferLo[pos1] * kLpcCorrWindow[pos1];
-    }
-
-    /* Get correlation coefficients */
-    /* computing autocorrelation    */
-    WebRtcIsac_AutoCorr(corrSubFrame, data, WINLEN, UB_LPC_ORDER+1);
-    memcpy(corrMat[frameCntr], corrSubFrame,
-           (UB_LPC_ORDER+1)*sizeof(double));
-
-    criterion1 = ((frameCntr == 0) || (frameCntr == (SUBFRAMES - 1))) &&
-        (bandwidth == isac12kHz);
-    criterion2 = (((frameCntr+1) % 4) == 0) &&
-        (bandwidth == isac16kHz);
-    if(criterion1 || criterion2)
-    {
-      /* add noise */
-      corrSubFrame[0] += 1e-6;
-      /* compute prediction coefficients */
-      WebRtcIsac_LevDurb(aPolynom, reflecCoeff, corrSubFrame,
-                        UB_LPC_ORDER);
-
-      /* bandwidth expansion */
-      tmp = gamma;
-      for (n = 1; n <= UB_LPC_ORDER; n++)
-      {
-        *lpCoeff++ = aPolynom[n] * tmp;
-        tmp *= gamma;
-      }
-      activeFrameCntr++;
-    }
-  }
-}
-
-
-
-/******************************************************************************
- * WebRtcIsac_GetLpcGain()
- *
- * Compute the LPC gains for each sub-frame, given the LPC of each sub-frame
- * and the corresponding correlation coefficients.
- *
- * Inputs:
- *       -signal_noise_ratio : the desired SNR in dB.
- *       -numVecs            : number of sub-frames
- *       -corrMat             : a matrix of correlation coefficients where
- *                             each row is a set of correlation coefficients of
- *                             one sub-frame.
- *       -varscale           : a scale computed when WebRtcIsac_GetLpcCoefUb()
- *                             is called.
- *
- * Outputs:
- *       -gain               : pointer to a buffer where LP gains are written.
- *
- */
-void
-WebRtcIsac_GetLpcGain(
-    double        signal_noise_ratio,
-    const double* filtCoeffVecs,
-    int           numVecs,
-    double*       gain,
-    double        corrMat[][UB_LPC_ORDER + 1],
-    const double* varscale)
-{
-  WebRtc_Word16 j, n;
-  WebRtc_Word16 subFrameCntr;
-  double aPolynom[ORDERLO + 1];
-  double res_nrg;
-
-  const double HearThresOffset = -28.0;
-  const double H_T_H = pow(10.0, 0.05 * HearThresOffset);
-  /* divide by sqrt(12) = 3.46 */
-  const double S_N_R = pow(10.0, 0.05 * signal_noise_ratio) / 3.46;
-
-  aPolynom[0] = 1;
-  for(subFrameCntr = 0; subFrameCntr < numVecs; subFrameCntr++)
-  {
-    if(subFrameCntr == SUBFRAMES)
-    {
-      // we are in second half of a SWB frame. use new varscale
-      varscale++;
-    }
-    memcpy(&aPolynom[1], &filtCoeffVecs[(subFrameCntr * (UB_LPC_ORDER + 1)) +
-                                        1], sizeof(double) * UB_LPC_ORDER);
-
-    /* residual energy */
-    res_nrg = 0.0;
-    for(j = 0; j <= UB_LPC_ORDER; j++)
-    {
-      for(n = 0; n <= j; n++)
-      {
-        res_nrg += aPolynom[j] * corrMat[subFrameCntr][j-n] *
-            aPolynom[n];
-      }
-      for(n = j+1; n <= UB_LPC_ORDER; n++)
-      {
-        res_nrg += aPolynom[j] * corrMat[subFrameCntr][n-j] *
-            aPolynom[n];
-      }
-    }
-
-    /* add hearing threshold and compute the gain */
-    gain[subFrameCntr] = S_N_R / (sqrt(res_nrg) / *varscale + H_T_H);
-  }
-}
diff --git a/src/mod/codecs/mod_isac/lpc_analysis.h b/src/mod/codecs/mod_isac/lpc_analysis.h
deleted file mode 100644
index 4eafeac7bc..0000000000
--- a/src/mod/codecs/mod_isac/lpc_analysis.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lpc_analysis.h
- *
- * LPC functions
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYSIS_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYSIS_H_
-
-#include "settings.h"
-#include "structs.h"
-
-double WebRtcIsac_LevDurb(double *a, double *k, double *r, int order);
-
-void WebRtcIsac_GetVars(const double *input, const WebRtc_Word16 *pitchGains_Q12,
-                       double *oldEnergy, double *varscale);
-
-void WebRtcIsac_GetLpcCoefLb(double *inLo, double *inHi, MaskFiltstr *maskdata,
-                             double signal_noise_ratio, const WebRtc_Word16 *pitchGains_Q12,
-                             double *lo_coeff, double *hi_coeff);
-
-
-void WebRtcIsac_GetLpcGain(
-    double         signal_noise_ratio,
-    const double*  filtCoeffVecs,
-    int            numVecs,
-    double*        gain,
-    double         corrLo[][UB_LPC_ORDER + 1],
-    const double*  varscale);
-
-void WebRtcIsac_GetLpcCoefUb(
-    double*      inSignal,
-    MaskFiltstr* maskdata,
-    double*      lpCoeff,
-    double       corr[][UB_LPC_ORDER + 1],
-    double*      varscale,
-    WebRtc_Word16  bandwidth);
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYIS_H_ */
diff --git a/src/mod/codecs/mod_isac/lpc_gain_swb_tables.c b/src/mod/codecs/mod_isac/lpc_gain_swb_tables.c
deleted file mode 100644
index 25c69cbfef..0000000000
--- a/src/mod/codecs/mod_isac/lpc_gain_swb_tables.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * SWB_KLT_Tables_LPCGain.c
- *
- * This file defines tables used for entropy coding of LPC Gain
- * of upper-band.
- *
- */
-
-#include "lpc_gain_swb_tables.h"
-#include "settings.h"
-#include "typedefs.h"
-
-const double WebRtcIsac_kQSizeLpcGain = 0.100000;
-
-const double WebRtcIsac_kMeanLpcGain = -3.3822;
-
-/*
-* The smallest reconstruction points for quantiztion of
-* LPC gains.
-*/
-const double WebRtcIsac_kLeftRecPointLpcGain[SUBFRAMES] =
-{
-   -0.800000, -1.000000, -1.200000, -2.200000, -3.000000, -12.700000
-};
-
-/*
-* Number of reconstruction points of quantizers for LPC Gains.
-*/
-const WebRtc_Word16 WebRtcIsac_kNumQCellLpcGain[SUBFRAMES] =
-{
-    17,  20,  25,  45,  77, 170
-};
-/*
-* Starting index for entropy decoder to search for the right interval,
-* one entry per LAR coefficient
-*/
-const WebRtc_UWord16 WebRtcIsac_kLpcGainEntropySearch[SUBFRAMES] =
-{
-     8,  10,  12,  22,  38,  85
-};
-
-/*
-* The following 6 vectors define CDF of 6 decorrelated LPC
-* gains.
-*/
-const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec0[18] =
-{
-     0,    10,    27,    83,   234,   568,  1601,  4683, 16830, 57534, 63437,
- 64767, 65229, 65408, 65483, 65514, 65527, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec1[21] =
-{
-     0,    15,    33,    84,   185,   385,   807,  1619,  3529,  7850, 19488,
- 51365, 62437, 64548, 65088, 65304, 65409, 65484, 65507, 65522, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec2[26] =
-{
-     0,    15,    29,    54,    89,   145,   228,   380,   652,  1493,  4260,
- 12359, 34133, 50749, 57224, 60814, 62927, 64078, 64742, 65103, 65311, 65418,
- 65473, 65509, 65521, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec3[46] =
-{
-     0,     8,    12,    16,    26,    42,    56,    76,   111,   164,   247,
-   366,   508,   693,  1000,  1442,  2155,  3188,  4854,  7387, 11249, 17617,
- 30079, 46711, 56291, 60127, 62140, 63258, 63954, 64384, 64690, 64891, 65031,
- 65139, 65227, 65293, 65351, 65399, 65438, 65467, 65492, 65504, 65510, 65518,
- 65523, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec4[78] =
-{
-     0,    17,    29,    39,    51,    70,   104,   154,   234,   324,   443,
-   590,   760,   971,  1202,  1494,  1845,  2274,  2797,  3366,  4088,  4905,
-  5899,  7142,  8683, 10625, 12983, 16095, 20637, 28216, 38859, 47237, 51537,
- 54150, 56066, 57583, 58756, 59685, 60458, 61103, 61659, 62144, 62550, 62886,
- 63186, 63480, 63743, 63954, 64148, 64320, 64467, 64600, 64719, 64837, 64939,
- 65014, 65098, 65160, 65211, 65250, 65290, 65325, 65344, 65366, 65391, 65410,
- 65430, 65447, 65460, 65474, 65487, 65494, 65501, 65509, 65513, 65518, 65520,
- 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec5[171] =
-{
-     0,    10,    12,    14,    16,    18,    23,    29,    35,    42,    51,
-    58,    65,    72,    78,    87,    96,   103,   111,   122,   134,   150,
-   167,   184,   202,   223,   244,   265,   289,   315,   346,   379,   414,
-   450,   491,   532,   572,   613,   656,   700,   751,   802,   853,   905,
-   957,  1021,  1098,  1174,  1250,  1331,  1413,  1490,  1565,  1647,  1730,
-  1821,  1913,  2004,  2100,  2207,  2314,  2420,  2532,  2652,  2783,  2921,
-  3056,  3189,  3327,  3468,  3640,  3817,  3993,  4171,  4362,  4554,  4751,
-  4948,  5142,  5346,  5566,  5799,  6044,  6301,  6565,  6852,  7150,  7470,
-  7797,  8143,  8492,  8835,  9181,  9547,  9919, 10315, 10718, 11136, 11566,
- 12015, 12482, 12967, 13458, 13953, 14432, 14903, 15416, 15936, 16452, 16967,
- 17492, 18024, 18600, 19173, 19736, 20311, 20911, 21490, 22041, 22597, 23157,
- 23768, 24405, 25034, 25660, 26280, 26899, 27614, 28331, 29015, 29702, 30403,
- 31107, 31817, 32566, 33381, 34224, 35099, 36112, 37222, 38375, 39549, 40801,
- 42074, 43350, 44626, 45982, 47354, 48860, 50361, 51845, 53312, 54739, 56026,
- 57116, 58104, 58996, 59842, 60658, 61488, 62324, 63057, 63769, 64285, 64779,
- 65076, 65344, 65430, 65500, 65517, 65535
-};
-
-/*
-* An array of pointers to CDFs of decorrelated LPC Gains
-*/
-const WebRtc_UWord16* WebRtcIsac_kLpcGainCdfMat[SUBFRAMES] =
-{
-    WebRtcIsac_kLpcGainCdfVec0, WebRtcIsac_kLpcGainCdfVec1,
-    WebRtcIsac_kLpcGainCdfVec2, WebRtcIsac_kLpcGainCdfVec3,
-    WebRtcIsac_kLpcGainCdfVec4, WebRtcIsac_kLpcGainCdfVec5
-};
-
-/*
-* A matrix to decorrellate LPC gains of subframes.
-*/
-const double WebRtcIsac_kLpcGainDecorrMat[SUBFRAMES][SUBFRAMES] =
-{
-    {-0.150860,  0.327872,  0.367220,  0.504613,  0.559270,  0.409234},
-    { 0.457128, -0.613591, -0.289283, -0.029734,  0.393760,  0.418240},
-    {-0.626043,  0.136489, -0.439118, -0.448323,  0.135987,  0.420869},
-    { 0.526617,  0.480187,  0.242552, -0.488754, -0.158713,  0.411331},
-    {-0.302587, -0.494953,  0.588112, -0.063035, -0.404290,  0.387510},
-    { 0.086378,  0.147714, -0.428875,  0.548300, -0.570121,  0.401391}
-};
diff --git a/src/mod/codecs/mod_isac/lpc_gain_swb_tables.h b/src/mod/codecs/mod_isac/lpc_gain_swb_tables.h
deleted file mode 100644
index 1eba97c8ba..0000000000
--- a/src/mod/codecs/mod_isac/lpc_gain_swb_tables.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * SWB_KLT_Tables_LPCGain.h
- *
- * This file declares tables used for entropy coding of LPC Gain
- * of upper-band.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_
-
-#include "settings.h"
-#include "typedefs.h"
-
-extern const double WebRtcIsac_kQSizeLpcGain;
-
-extern const double WebRtcIsac_kLeftRecPointLpcGain[SUBFRAMES];
-
-extern const WebRtc_Word16 WebRtcIsac_kNumQCellLpcGain[SUBFRAMES];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcGainEntropySearch[SUBFRAMES];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec0[18];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec1[21];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec2[26];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec3[46];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec4[78];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcGainCdfVec5[171];
-
-extern const WebRtc_UWord16* WebRtcIsac_kLpcGainCdfMat[SUBFRAMES];
-
-extern const double WebRtcIsac_kLpcGainDecorrMat[SUBFRAMES][SUBFRAMES];
-
-#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_
diff --git a/src/mod/codecs/mod_isac/lpc_shape_swb12_tables.c b/src/mod/codecs/mod_isac/lpc_shape_swb12_tables.c
deleted file mode 100644
index 695d583277..0000000000
--- a/src/mod/codecs/mod_isac/lpc_shape_swb12_tables.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * SWB_KLT_Tables.c
- *
- * This file defines tables used for entropy coding of LPC shape of
- * upper-band signal if the bandwidth is 12 kHz.
- *
- */
-
-#include "lpc_shape_swb12_tables.h"
-#include "settings.h"
-#include "typedefs.h"
-
-/*
-* Mean value of LAR
-*/
-const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER] =
-{
-  0.03748928306641, 0.09453441192543, -0.01112522344398, 0.03800237516842
-};
-
-/*
-* A rotation matrix to decorrelate intra-vector correlation,
-* i.e. correlation among components of LAR vector.
-*/
-const double WebRtcIsac_kIntraVecDecorrMatUb12[UB_LPC_ORDER][UB_LPC_ORDER] =
-{
-    {-0.00075365493856,  -0.05809964887743,  -0.23397966154116,   0.97050367376411},
-    { 0.00625021257734,  -0.17299965610679,   0.95977735920651,   0.22104179375008},
-    { 0.20543384258374,  -0.96202143495696,  -0.15301870801552,  -0.09432375099565},
-    {-0.97865075648479,  -0.20300322280841,  -0.02581111653779,  -0.01913568980258}
-};
-
-/*
-* A rotation matrix to remove correlation among LAR coefficients
-* of different LAR vectors. One might guess that decorrelation matrix
-* for the first component should differ from the second component
-* but we haven't observed a significant benefit of having different
-* decorrelation matrices for different components.
-*/
-const double WebRtcIsac_kInterVecDecorrMatUb12
-[UB_LPC_VEC_PER_FRAME][UB_LPC_VEC_PER_FRAME] =
-{
-    { 0.70650597970460,  -0.70770707262373},
-    {-0.70770707262373,  -0.70650597970460}
-};
-
-/*
-* LAR quantization step-size.
-*/
-const double WebRtcIsac_kLpcShapeQStepSizeUb12 = 0.150000;
-
-/*
-* The smallest reconstruction points for quantiztion of LAR coefficients.
-*/
-const double WebRtcIsac_kLpcShapeLeftRecPointUb12
-[UB_LPC_ORDER*UB_LPC_VEC_PER_FRAME] =
-{
-    -0.900000, -1.050000, -1.350000, -1.800000, -1.350000, -1.650000,
-    -2.250000, -3.450000
-};
-
-/*
-* Number of reconstruction points of quantizers for LAR coefficients.
-*/
-const WebRtc_Word16 WebRtcIsac_kLpcShapeNumRecPointUb12
-[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME] =
-{
-    13, 15, 19, 27, 19, 24, 32, 48
-};
-
-/*
-* Starting index for entropy decoder to search for the right interval,
-* one entry per LAR coefficient
-*/
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeEntropySearchUb12
-[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME] =
-{
-     6,  7,  9, 13,  9, 12, 16, 24
-};
-
-/*
-* The following 8 vectors define CDF of 8 decorrelated LAR
-* coefficients.
-*/
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec0Ub12[14] =
-{
-     0,    13,    95,   418,  1687,  6498, 21317, 44200, 59029, 63849, 65147,
- 65449, 65525, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec1Ub12[16] =
-{
-     0,    10,    59,   255,   858,  2667,  8200, 22609, 42988, 57202, 62947,
- 64743, 65308, 65476, 65522, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec2Ub12[20] =
-{
-     0,    18,    40,   118,   332,   857,  2017,  4822, 11321, 24330, 41279,
- 54342, 60637, 63394, 64659, 65184, 65398, 65482, 65518, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec3Ub12[28] =
-{
-     0,    21,    38,    90,   196,   398,   770,  1400,  2589,  4650,  8211,
- 14933, 26044, 39592, 50814, 57452, 60971, 62884, 63995, 64621, 65019, 65273,
- 65410, 65480, 65514, 65522, 65531, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec4Ub12[20] =
-{
-     0,     7,    46,   141,   403,   969,  2132,  4649, 10633, 24902, 43254,
- 54665, 59928, 62674, 64173, 64938, 65293, 65464, 65523, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec5Ub12[25] =
-{
-     0,     7,    22,    72,   174,   411,   854,  1737,  3545,  6774, 13165,
- 25221, 40980, 52821, 58714, 61706, 63472, 64437, 64989, 65287, 65430, 65503,
- 65525, 65529, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec6Ub12[33] =
-{
-     0,    11,    21,    36,    65,   128,   228,   401,   707,  1241,  2126,
-  3589,  6060, 10517, 18853, 31114, 42477, 49770, 54271, 57467, 59838, 61569,
- 62831, 63772, 64433, 64833, 65123, 65306, 65419, 65466, 65499, 65519, 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec7Ub12[49] =
-{
-     0,    14,    34,    67,   107,   167,   245,   326,   449,   645,   861,
-  1155,  1508,  2003,  2669,  3544,  4592,  5961,  7583,  9887, 13256, 18765,
- 26519, 34077, 40034, 44349, 47795, 50663, 53262, 55473, 57458, 59122, 60592,
- 61742, 62690, 63391, 63997, 64463, 64794, 65045, 65207, 65309, 65394, 65443,
- 65478, 65504, 65514, 65523, 65535
-};
-
-/*
-* An array of pointers to CDFs of decorrelated LARs
-*/
-const WebRtc_UWord16* WebRtcIsac_kLpcShapeCdfMatUb12
-[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME] =
-{
-    WebRtcIsac_kLpcShapeCdfVec0Ub12, WebRtcIsac_kLpcShapeCdfVec1Ub12,
-    WebRtcIsac_kLpcShapeCdfVec2Ub12, WebRtcIsac_kLpcShapeCdfVec3Ub12,
-    WebRtcIsac_kLpcShapeCdfVec4Ub12, WebRtcIsac_kLpcShapeCdfVec5Ub12,
-    WebRtcIsac_kLpcShapeCdfVec6Ub12, WebRtcIsac_kLpcShapeCdfVec7Ub12
-};
diff --git a/src/mod/codecs/mod_isac/lpc_shape_swb12_tables.h b/src/mod/codecs/mod_isac/lpc_shape_swb12_tables.h
deleted file mode 100644
index 1e93847fae..0000000000
--- a/src/mod/codecs/mod_isac/lpc_shape_swb12_tables.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lpc_shape_swb12_tables.h
- *
- * This file declares tables used for entropy coding of LPC shape of
- * upper-band signal if the bandwidth is 12 kHz.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_
-
-#include "settings.h"
-#include "typedefs.h"
-
-extern const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER];
-
-extern const double WebRtcIsac_kMeanLpcGain;
-
-extern const double WebRtcIsac_kIntraVecDecorrMatUb12[UB_LPC_ORDER][UB_LPC_ORDER];
-
-extern const double WebRtcIsac_kInterVecDecorrMatUb12
-[UB_LPC_VEC_PER_FRAME][UB_LPC_VEC_PER_FRAME];
-
-extern const double WebRtcIsac_kLpcShapeQStepSizeUb12;
-
-extern const double WebRtcIsac_kLpcShapeLeftRecPointUb12
-[UB_LPC_ORDER*UB_LPC_VEC_PER_FRAME];
-
-
-extern const WebRtc_Word16 WebRtcIsac_kLpcShapeNumRecPointUb12
-[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeEntropySearchUb12
-[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec0Ub12[14];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec1Ub12[16];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec2Ub12[20];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec3Ub12[28];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec4Ub12[20];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec5Ub12[25];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec6Ub12[33];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec7Ub12[49];
-
-extern const WebRtc_UWord16* WebRtcIsac_kLpcShapeCdfMatUb12
-[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME];
-
-#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_
diff --git a/src/mod/codecs/mod_isac/lpc_shape_swb16_tables.c b/src/mod/codecs/mod_isac/lpc_shape_swb16_tables.c
deleted file mode 100644
index 89f45233f5..0000000000
--- a/src/mod/codecs/mod_isac/lpc_shape_swb16_tables.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * SWB16_KLT_Tables.c
- *
- * This file defines tables used for entropy coding of LPC shape of
- * upper-band signal if the bandwidth is 16 kHz.
- *
- */
-
-#include "lpc_shape_swb16_tables.h"
-#include "settings.h"
-#include "typedefs.h"
-
-/*
-* Mean value of LAR
-*/
-const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER] =
-{
-0.454978, 0.364747, 0.102999, 0.104523
-};
-
-/*
-* A rotation matrix to decorrelate intra-vector correlation,
-* i.e. correlation among components of LAR vector.
-*/
-const double WebRtcIsac_kIintraVecDecorrMatUb16[UB_LPC_ORDER][UB_LPC_ORDER] =
-{
-    {-0.020528, -0.085858, -0.002431,  0.996093},
-    {-0.033155,  0.036102,  0.998786,  0.004866},
-    { 0.202627,  0.974853, -0.028940,  0.088132},
-    {-0.978479,  0.202454, -0.039785, -0.002811}
-};
-
-/*
-* A rotation matrix to remove correlation among LAR coefficients
-* of different LAR vectors. One might guess that decorrelation matrix
-* for the first component should differ from the second component
-* but we haven't observed a significant benefit of having different
-* decorrelation matrices for different components.
-*/
-const double WebRtcIsac_kInterVecDecorrMatUb16
-[UB16_LPC_VEC_PER_FRAME][UB16_LPC_VEC_PER_FRAME] =
-{
-    { 0.291675, -0.515786,  0.644927,  0.482658},
-    {-0.647220,  0.479712,  0.289556,  0.516856},
-    { 0.643084,  0.485489, -0.289307,  0.516763},
-    {-0.287185, -0.517823, -0.645389,  0.482553}
-};
-
-/*
-* The following 16 vectors define CDF of 16 decorrelated LAR
-* coefficients.
-*/
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub16[14] =
-{
-     0,      2,     20,    159,   1034,   5688,  20892,  44653,
- 59849,  64485,  65383,  65518,  65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec1Ub16[16] =
-{
-     0,      1,      7,     43,    276,   1496,   6681,  21653,
- 43891,  58859,  64022,  65248,  65489,  65529,  65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec2Ub16[18] =
-{
-     0,      1,      9,     54,    238,    933,   3192,   9461,
- 23226,  42146,  56138,  62413,  64623,  65300,  65473,  65521,
- 65533,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec3Ub16[30] =
-{
-     0,      2,      4,      8,     17,     36,     75,    155,
-   329,    683,   1376,   2662,   5047,   9508,  17526,  29027,
- 40363,  48997,  55096,  59180,  61789,  63407,  64400,  64967,
- 65273,  65429,  65497,  65526,  65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec4Ub16[16] =
-{
-     0,      1,     10,     63,    361,   1785,   7407,  22242,
- 43337,  58125,  63729,  65181,  65472,  65527,  65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec5Ub16[17] =
-{
-     0,      1,      7,     29,    134,    599,   2443,   8590,
- 22962,  42635,  56911,  63060,  64940,  65408,  65513,  65531,
- 65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec6Ub16[21] =
-{
-     0,      1,      5,     16,     57,    191,    611,   1808,
-  4847,  11755,  24612,  40910,  53789,  60698,  63729,  64924,
- 65346,  65486,  65523,  65532,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec7Ub16[36] =
-{
-     0,      1,      4,     12,     25,     55,    104,    184,
-   314,    539,    926,   1550,   2479,   3861,   5892,   8845,
- 13281,  20018,  29019,  38029,  45581,  51557,  56057,  59284,
- 61517,  63047,  64030,  64648,  65031,  65261,  65402,  65480,
- 65518,  65530,  65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec8Ub16[21] =
-{
-     0,      1,      2,      7,     26,    103,    351,   1149,
-  3583,  10204,  23846,  41711,  55361,  61917,  64382,  65186,
- 65433,  65506,  65528,  65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub160[21] =
-{
-     0,      6,     19,     63,    205,    638,   1799,   4784,
- 11721,  24494,  40803,  53805,  60886,  63822,  64931,  65333,
- 65472,  65517,  65530,  65533,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub161[28] =
-{
-     0,      1,      3,     11,     31,     86,    221,    506,
-  1101,   2296,   4486,   8477,  15356,  26079,  38941,  49952,
- 57165,  61257,  63426,  64549,  65097,  65351,  65463,  65510,
- 65526,  65532,  65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub162[55] =
-{
-     0,      3,     12,     23,     42,     65,     89,    115,
-   150,    195,    248,    327,    430,    580,    784,   1099,
-  1586,   2358,   3651,   5899,   9568,  14312,  19158,  23776,
- 28267,  32663,  36991,  41153,  45098,  48680,  51870,  54729,
- 57141,  59158,  60772,  62029,  63000,  63761,  64322,  64728,
- 65000,  65192,  65321,  65411,  65463,  65496,  65514,  65523,
- 65527,  65529,  65531,  65532,  65533,  65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub163[26] =
-{
-     0,      2,      4,     10,     21,     48,    114,    280,
-   701,   1765,   4555,  11270,  24267,  41213,  54285,  61003,
- 63767,  64840,  65254,  65421,  65489,  65514,  65526,  65532,
- 65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub164[28] =
-{
-     0,      1,      3,      6,     15,     36,     82,    196,
-   453,   1087,   2557,   5923,  13016,  25366,  40449,  52582,
- 59539,  62896,  64389,  65033,  65316,  65442,  65494,  65519,
- 65529,  65533,  65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub165[34] =
-{
-     0,      2,      4,      8,     18,     35,     73,    146,
-   279,    524,    980,   1789,   3235,   5784,  10040,  16998,
- 27070,  38543,  48499,  55421,  59712,  62257,  63748,  64591,
- 65041,  65278,  65410,  65474,  65508,  65522,  65530,  65533,
- 65534,  65535
-};
-
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub166[71] =
-{
-     0,      1,      2,      6,     13,     26,     55,     92,
-   141,    191,    242,    296,    355,    429,    522,    636,
-   777,    947,   1162,   1428,   1753,   2137,   2605,   3140,
-  3743,   4409,   5164,   6016,   6982,   8118,   9451,  10993,
- 12754,  14810,  17130,  19780,  22864,  26424,  30547,  35222,
- 40140,  44716,  48698,  52056,  54850,  57162,  59068,  60643,
- 61877,  62827,  63561,  64113,  64519,  64807,  65019,  65167,
- 65272,  65343,  65399,  65440,  65471,  65487,  65500,  65509,
- 65518,  65524,  65527,  65531,  65533,  65534,  65535
-};
-
-/*
-* An array of pointers to CDFs of decorrelated LARs
-*/
-const WebRtc_UWord16* WebRtcIsac_kLpcShapeCdfMatUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME] = {
-     WebRtcIsac_kLpcShapeCdfVec01Ub16,
-     WebRtcIsac_kLpcShapeCdfVec1Ub16,
-     WebRtcIsac_kLpcShapeCdfVec2Ub16,
-     WebRtcIsac_kLpcShapeCdfVec3Ub16,
-     WebRtcIsac_kLpcShapeCdfVec4Ub16,
-     WebRtcIsac_kLpcShapeCdfVec5Ub16,
-     WebRtcIsac_kLpcShapeCdfVec6Ub16,
-     WebRtcIsac_kLpcShapeCdfVec7Ub16,
-     WebRtcIsac_kLpcShapeCdfVec8Ub16,
-     WebRtcIsac_kLpcShapeCdfVec01Ub160,
-     WebRtcIsac_kLpcShapeCdfVec01Ub161,
-     WebRtcIsac_kLpcShapeCdfVec01Ub162,
-     WebRtcIsac_kLpcShapeCdfVec01Ub163,
-     WebRtcIsac_kLpcShapeCdfVec01Ub164,
-     WebRtcIsac_kLpcShapeCdfVec01Ub165,
-     WebRtcIsac_kLpcShapeCdfVec01Ub166
-};
-
-/*
-* The smallest reconstruction points for quantiztion of LAR coefficients.
-*/
-const double WebRtcIsac_kLpcShapeLeftRecPointUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME] =
-{
- -0.8250,  -0.9750,  -1.1250,  -2.1750,  -0.9750,  -1.1250,  -1.4250,
- -2.6250,  -1.4250,  -1.2750,  -1.8750,  -3.6750,  -1.7250,  -1.8750,
- -2.3250,  -5.4750
-};
-
-/*
-* Number of reconstruction points of quantizers for LAR coefficients.
-*/
-const WebRtc_Word16 WebRtcIsac_kLpcShapeNumRecPointUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME] =
-{
-   13,    15,    17,    29,    15,    16,    20,    35,    20,
-   20,    27,    54,    25,    27,    33,    70
-};
-
-/*
-* Starting index for entropy decoder to search for the right interval,
-* one entry per LAR coefficient
-*/
-const WebRtc_UWord16 WebRtcIsac_kLpcShapeEntropySearchUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME] =
-{
-    6,     7,     8,    14,     7,     8,    10,    17,    10,
-   10,    13,    27,    12,    13,    16,    35
-};
-
-/*
-* LAR quantization step-size.
-*/
-const double WebRtcIsac_kLpcShapeQStepSizeUb16 = 0.150000;
diff --git a/src/mod/codecs/mod_isac/lpc_shape_swb16_tables.h b/src/mod/codecs/mod_isac/lpc_shape_swb16_tables.h
deleted file mode 100644
index 68d08b2047..0000000000
--- a/src/mod/codecs/mod_isac/lpc_shape_swb16_tables.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lpc_shape_swb16_tables.h
- *
- * This file declares tables used for entropy coding of LPC shape of
- * upper-band signal if the bandwidth is 16 kHz.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
-
-#include "settings.h"
-#include "typedefs.h"
-
-
-extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER];
-
-extern const double WebRtcIsac_kIintraVecDecorrMatUb16[UB_LPC_ORDER][UB_LPC_ORDER];
-
-extern const double WebRtcIsac_kInterVecDecorrMatUb16
-[UB16_LPC_VEC_PER_FRAME][UB16_LPC_VEC_PER_FRAME];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub16[14];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec1Ub16[16];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec2Ub16[18];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec3Ub16[30];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec4Ub16[16];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec5Ub16[17];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec6Ub16[21];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec7Ub16[36];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec8Ub16[21];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub160[21];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub161[28];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub162[55];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub163[26];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub164[28];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub165[34];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeCdfVec01Ub166[71];
-
-extern const WebRtc_UWord16* WebRtcIsac_kLpcShapeCdfMatUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-
-extern const double WebRtcIsac_kLpcShapeLeftRecPointUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-
-extern const WebRtc_Word16 WebRtcIsac_kLpcShapeNumRecPointUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-
-extern const WebRtc_UWord16 WebRtcIsac_kLpcShapeEntropySearchUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-
-extern const double WebRtcIsac_kLpcShapeQStepSizeUb16;
-
-#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
diff --git a/src/mod/codecs/mod_isac/lpc_tables.c b/src/mod/codecs/mod_isac/lpc_tables.c
deleted file mode 100644
index 7df6121462..0000000000
--- a/src/mod/codecs/mod_isac/lpc_tables.c
+++ /dev/null
@@ -1,1129 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* coding tables for the KLT coefficients */
-
-#include "lpc_tables.h"
-#include "settings.h"
-
-/* indices of KLT coefficients used */
-const WebRtc_UWord16 WebRtcIsac_kQKltSelIndGain[12] = {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
- 10,  11};
-
-const WebRtc_UWord16 WebRtcIsac_kQKltSelIndShape[108] = {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
- 10,  11,  12,  13,  14,  15,  16,  17,  18,  19,
- 20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
- 30,  31,  32,  33,  34,  35,  36,  37,  38,  39,
- 40,  41,  42,  43,  44,  45,  46,  47,  48,  49,
- 50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
- 60,  61,  62,  63,  64,  65,  66,  67,  68,  69,
- 70,  71,  72,  73,  74,  75,  76,  77,  78,  79,
- 80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
- 90,  91,  92,  93,  94,  95,  96,  97,  98,  99,
- 100,  101,  102,  103,  104,  105,  106,  107};
-
-/* cdf array for model indicator */
-const WebRtc_UWord16 WebRtcIsac_kQKltModelCdf[4] = {
- 0,  15434,  37548,  65535};
-
-/* pointer to cdf array for model indicator */
-const WebRtc_UWord16 *WebRtcIsac_kQKltModelCdfPtr[1] = {WebRtcIsac_kQKltModelCdf};
-
-/* initial cdf index for decoder of model indicator */
-const WebRtc_UWord16 WebRtcIsac_kQKltModelInitIndex[1] = {1};
-
-/* offset to go from rounded value to quantization index */
-const short WebRtcIsac_kQKltQuantMinGain[12] = {
- 3,  6,  4,  6,  6,  9,  5,  16,  11,  34, 32,  47};
-
-
-const short WebRtcIsac_kQKltQuantMinShape[108] = {
- 0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
- 1,  1,  1,  1,  2,  2,  2,  3,  0,  0,
- 0,  0,  1,  0,  0,  0,  0,  1,  1,  1,
- 1,  1,  1,  2,  2,  3,  0,  0,  0,  0,
- 1,  0,  1,  1,  1,  1,  1,  1,  1,  2,
- 2,  4,  3,  5,  0,  0,  0,  0,  1,  1,
- 1,  1,  1,  1,  2,  1,  2,  2,  3,  4,
- 4,  7,  0,  0,  1,  1,  1,  1,  1,  1,
- 1,  2,  3,  2,  3,  4,  4,  5,  7,  13,
- 0,  1,  1,  2,  3,  2,  2,  2,  4,  4,
- 5,  6,  7,  11,  9,  13,  12,  26};
-
-/* maximum quantization index */
-const WebRtc_UWord16 WebRtcIsac_kQKltMaxIndGain[12] = {
- 6,  12,  8,  14,  10,  19,  12,  31,  22,  56, 52,  138};
-
-const WebRtc_UWord16 WebRtcIsac_kQKltMaxIndShape[108] = {
- 0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
- 2,  2,  2,  2,  4,  4,  5,  6,  0,  0,
- 0,  0,  1,  0,  0,  0,  0,  1,  2,  2,
- 2,  2,  3,  4,  5,  7,  0,  0,  0,  0,
- 2,  0,  2,  2,  2,  2,  3,  2,  2,  4,
- 4,  6,  6,  9,  0,  0,  0,  0,  2,  2,
- 2,  2,  2,  2,  3,  2,  4,  4,  7,  7,
- 9,  13,  0,  0,  2,  2,  2,  2,  2,  2,
- 3,  4,  5,  4,  6,  8,  8,  10,  16,  25,
- 0,  2,  2,  4,  5,  4,  4,  4,  7,  8,
- 9,  10,  13,  19,  17,  23,  25,  49};
-
-/* index offset */
-const WebRtc_UWord16 WebRtcIsac_kQKltOffsetGain[3][12] = {
-{ 0,  7,  20,  29,  44,  55,  75,  88,  120,  143,
- 200,  253},
-{ 0,  7,  19,  27,  42,  53,  73,  86,  117,  140,
- 197,  249},
-{ 0,  7,  20,  28,  44,  55,  75,  89,  121,  145,
- 202,  257}};
-
-const WebRtc_UWord16 WebRtcIsac_kQKltOffsetShape[3][108] = {
-{ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
- 11,  14,  17,  20,  23,  28,  33,  39,  46,  47,
- 48,  49,  50,  52,  53,  54,  55,  56,  58,  61,
- 64,  67,  70,  74,  79,  85,  93,  94,  95,  96,
- 97,  100,  101,  104,  107,  110,  113,  117,  120,  123,
- 128,  133,  140,  147,  157,  158,  159,  160,  161,  164,
- 167,  170,  173,  176,  179,  183,  186,  191,  196,  204,
- 212,  222,  236,  237,  238,  241,  244,  247,  250,  253,
- 256,  260,  265,  271,  276,  283,  292,  301,  312,  329,
- 355,  356,  359,  362,  367,  373,  378,  383,  388,  396,
- 405,  415,  426,  440,  460,  478,  502,  528},
-{ 0,  1,  2,  3,  4,  6,  7,  8,  9,  11,
- 13,  16,  19,  22,  26,  29,  34,  39,  45,  46,
- 47,  48,  49,  50,  51,  52,  53,  55,  57,  60,
- 63,  66,  70,  73,  78,  84,  91,  92,  93,  94,
- 95,  96,  97,  99,  102,  105,  108,  111,  114,  118,
- 123,  128,  134,  141,  151,  152,  153,  154,  156,  159,
- 162,  165,  168,  171,  174,  177,  181,  186,  194,  200,
- 208,  218,  233,  234,  235,  236,  239,  242,  245,  248,
- 251,  254,  258,  263,  270,  277,  288,  297,  308,  324,
- 349,  351,  354,  357,  361,  366,  372,  378,  383,  390,
- 398,  407,  420,  431,  450,  472,  496,  524},
-{ 0,  1,  2,  3,  4,  5,  6,  7,  8,  11,
- 14,  17,  20,  23,  26,  29,  34,  40,  47,  48,
- 49,  50,  51,  52,  53,  54,  55,  58,  61,  64,
- 67,  70,  73,  77,  82,  88,  96,  97,  98,  99,
- 101,  102,  104,  107,  110,  113,  116,  119,  122,  125,
- 129,  134,  141,  150,  160,  161,  162,  163,  166,  168,
- 171,  174,  177,  180,  183,  186,  190,  195,  201,  208,
- 216,  226,  243,  244,  245,  248,  251,  254,  257,  260,
- 263,  268,  273,  278,  284,  291,  299,  310,  323,  340,
- 366,  368,  371,  374,  379,  383,  389,  394,  399,  406,
- 414,  422,  433,  445,  461,  480,  505,  533}};
-
-/* initial cdf index for KLT coefficients */
-const WebRtc_UWord16 WebRtcIsac_kQKltInitIndexGain[3][12] = {
-{ 3,  6,  4,  7,  5,  10,  6,  16,  11,  28,
- 26,  69},
-{ 3,  6,  4,  7,  5,  10,  6,  15,  11,  28,
- 26,  69},
-{ 3,  6,  4,  8,  5,  10,  7,  16,  12,  28,
- 27,  70}};
-
-const WebRtc_UWord16 WebRtcIsac_kQKltInitIndexShape[3][108] = {
-{ 0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
- 1,  1,  1,  1,  2,  2,  3,  3,  0,  0,
- 0,  0,  1,  0,  0,  0,  0,  1,  1,  1,
- 1,  1,  2,  2,  3,  4,  0,  0,  0,  0,
- 1,  0,  1,  1,  1,  1,  2,  1,  1,  2,
- 2,  3,  3,  5,  0,  0,  0,  0,  1,  1,
- 1,  1,  1,  1,  2,  1,  2,  2,  4,  4,
- 5,  7,  0,  0,  1,  1,  1,  1,  1,  1,
- 2,  2,  3,  2,  3,  4,  4,  5,  8,  13,
- 0,  1,  1,  2,  3,  2,  2,  2,  4,  4,
- 5,  5,  7,  10,  9,  12,  13,  25},
-{ 0,  0,  0,  0,  1,  0,  0,  0,  1,  1,
- 1,  1,  1,  2,  1,  2,  2,  3,  0,  0,
- 0,  0,  0,  0,  0,  0,  1,  1,  1,  1,
- 1,  2,  1,  2,  3,  3,  0,  0,  0,  0,
- 0,  0,  1,  1,  1,  1,  1,  1,  2,  2,
- 2,  3,  3,  5,  0,  0,  0,  1,  1,  1,
- 1,  1,  1,  1,  1,  2,  2,  4,  3,  4,
- 5,  7,  0,  0,  0,  1,  1,  1,  1,  1,
- 1,  2,  2,  3,  3,  5,  4,  5,  8,  12,
- 1,  1,  1,  2,  2,  3,  3,  2,  3,  4,
- 4,  6,  5,  9,  11,  12,  14,  25},
-{ 0,  0,  0,  0,  0,  0,  0,  0,  1,  1,
- 1,  1,  1,  1,  1,  2,  3,  3,  0,  0,
- 0,  0,  0,  0,  0,  0,  1,  1,  1,  1,
- 1,  1,  2,  2,  3,  4,  0,  0,  0,  1,
- 0,  1,  1,  1,  1,  1,  1,  1,  1,  2,
- 2,  3,  4,  5,  0,  0,  0,  1,  1,  1,
- 1,  1,  1,  1,  1,  2,  2,  3,  3,  4,
- 5,  8,  0,  0,  1,  1,  1,  1,  1,  1,
- 2,  2,  2,  3,  3,  4,  5,  6,  8,  13,
- 1,  1,  1,  2,  2,  3,  2,  2,  3,  4,
- 4,  5,  6,  8,  9,  12,  14,  25}};
-
-/* offsets for quantizer representation levels*/
-const WebRtc_UWord16 WebRtcIsac_kQKltOfLevelsGain[3] = {
- 0,  392,  779};
-
-const WebRtc_UWord16 WebRtcIsac_kQKltOfLevelsShape[3] = {
- 0,  578,  1152};
-
-/* quantizer representation levels */
-const double WebRtcIsac_kQKltLevelsGain[1176] = {
--2.78127126, -1.76745590, -0.77913790, -0.00437329,  0.79961206,  1.81775776,  2.81389782, -5.78753143, -4.88384084, -3.89320940,
--2.88133610, -1.92859977, -0.86347396,  0.02003888,  0.86140400,  1.89667156,  2.97134967,  3.98781964,  4.91727277,  5.82865898,
--4.11195874, -2.80898424, -1.87547977, -0.80943825, -0.00679084,  0.79573851,  1.83953397,  2.67586037,  3.76274082, -6.10933968,
--4.93034581, -3.89281296, -2.91530625, -1.89684163, -0.85319130, -0.02275767,  0.86862017,  1.91578276,  2.96107339,  3.96543056,
- 4.91369908,  5.91058154,  6.83848343,  8.07136925, -5.87470395, -4.84703049, -3.84284597, -2.86168446, -1.89290192, -0.82798145,
--0.00080013,  0.82594974,  1.85754329,  2.88351798,  3.96172628, -8.85684885, -7.87387461, -6.97811862, -5.93256270, -4.94301439,
--3.95513701, -2.96041544, -1.94031192, -0.87961478, -0.00456201,  0.89911505,  1.91723376,  2.94011511,  3.93302540,  4.97990967,
- 5.93133404,  7.02181199,  7.92407762,  8.80155440,  10.04665814, -4.82396678, -3.85612158, -2.89482244, -1.89558408, -0.90036978,
--0.00677823,  0.90607989,  1.90937981,  2.91175777,  3.91637730,  4.97565723,  5.84771228,  7.11145863, -16.07879840, -15.03776309,
--13.93905670, -12.95671800, -11.89171202, -10.95820934, -9.95923714, -8.94357334, -7.99068299, -6.97481009, -5.94826231, -4.96673988,
--3.97490466, -2.97846970, -1.95130435, -0.94215262, -0.01444043,  0.96770704,  1.95848598,  2.94107862,  3.95666119,  4.97253085,
- 5.97191122,  6.93277360,  7.96608727,  8.87958779,  10.00264269,  10.86560820,  12.07449071,  13.04491775,  13.97507061,  14.91845261,
--10.85696295, -9.83365357, -9.01245635, -7.95915145, -6.95625003, -5.95362618, -4.93468444, -3.98760978, -2.95044407, -1.97041277,
--0.97701799, -0.00840234,  0.97834289,  1.98361415,  2.97802439,  3.96415871,  4.95369042,  5.94101770,  6.92756798,  7.94063998,
- 8.85951828,  9.97077022,  11.00068503, -33.92030406, -32.81426422, -32.00000000, -31.13243639, -30.11886909, -29.06017570, -28.12598824,
--27.22045482, -25.81215858, -25.07849962, -23.93018013, -23.02097643, -21.89529725, -20.99091085, -19.98889048, -18.94327044, -17.96562071,
--16.96126218, -15.95054062, -14.98516200, -13.97101012, -13.02106500, -11.98438006, -11.03216748, -9.95930286, -8.97043946, -7.98085082,
--6.98360995, -5.98998802, -4.98668173, -4.00032906, -3.00420619, -1.98701132, -0.99324682, -0.00609324,  0.98297834,  1.99483076,
- 3.00305044,  3.97142097,  4.97525759,  5.98612258,  6.97448236,  7.97575900,  9.01086211,  9.98665542,  11.00541438,  11.98078628,
- 12.92352471,  14.06849675,  14.99949430,  15.94904834,  16.97440321,  18.04040916,  18.88987609,  20.05312391,  21.00000000,  21.79443341,
--31.98578825, -31.00000000, -29.89060567, -28.98555686, -27.97114102, -26.84935410, -26.02402230, -24.94195278, -23.92336849, -22.95552382,
--21.97932836, -20.96055470, -19.99649553, -19.03436122, -17.96706525, -17.01139515, -16.01363516, -14.99154248, -14.00298333, -12.99630613,
--11.99955519, -10.99000421, -10.00819092, -8.99763648, -7.98431793, -7.01769025, -5.99604690, -4.99980697, -3.99334671, -3.01748192,
--2.02051217, -1.00848371, -0.01942358,  1.00477757,  1.95477872,  2.98593031,  3.98779079,  4.96862849,  6.02694771,  6.93983733,
- 7.89874717,  8.99615862,  10.02367921,  10.96293452,  11.84351528,  12.92207187,  13.85122329,  15.05146877,  15.99371264,  17.00000000,
- 18.00000000,  19.00000000,  19.82763573, -47.00000000, -46.00000000, -44.87138498, -44.00000000, -43.00000000, -42.00000000, -41.00000000,
--39.88966612, -38.98913239, -37.80306486, -37.23584325, -35.94200288, -34.99881301, -34.11361858, -33.06507360, -32.13129135, -30.90891364,
--29.81511907, -28.99250380, -28.04535391, -26.99767800, -26.04418164, -24.95687851, -24.04865595, -23.03392645, -21.89366707, -20.93517364,
--19.99388660, -18.91620943, -18.03749683, -16.99532379, -15.98683813, -15.06421479, -13.99359211, -12.99714098, -11.97022520, -10.98500279,
--9.98834422, -8.95729330, -8.01232284, -7.00253661, -5.99681626, -5.01207817, -3.95914904, -3.01232178, -1.96615919, -0.97687670,
- 0.01228030,  0.98412288,  2.01753544,  3.00580570,  3.97783510,  4.98846894,  6.01321400,  7.00867732,  8.00416375,  9.01771966,
- 9.98637729,  10.98255180,  11.99194163,  13.01807333,  14.00999545,  15.00118556,  16.00089224,  17.00584148,  17.98251763,  18.99942091,
- 19.96917690,  20.97839265,  21.98207297,  23.00171271,  23.99930737,  24.99746061,  26.00936304,  26.98240132,  28.01126868,  29.01395915,
- 29.98153507,  31.01376711,  31.99876818,  33.00475317,  33.99753994,  34.99493913,  35.98933585,  36.95620160,  37.98428461,  38.99317544,
- 40.01832073,  40.98048133,  41.95999283,  42.98232091,  43.96523612,  44.99574268,  45.99524194,  47.05464025,  48.03821548,  48.99354366,
- 49.96400411,  50.98017973,  51.95184408,  52.96291806,  54.00194392,  54.96603783,  55.95623778,  57.03076595,  58.05889901,  58.99081551,
- 59.97928121,  61.05071612,  62.03971580,  63.01286038,  64.01290338,  65.02074503,  65.99454594,  67.00399425,  67.96571257,  68.95305727,
- 69.92030664,  70.95594862,  71.98088567,  73.04764124,  74.00285480,  75.02696330,  75.89837673,  76.93459997,  78.16266309,  78.83317543,
- 80.00000000,  80.87251574,  82.09803524,  83.10671664,  84.00000000,  84.77023523,  86.00000000,  87.00000000,  87.92946897,  88.69159118,
- 90.00000000,  90.90535270, -3.00000000, -2.00000000, -0.77592424, -0.00564307,  0.76727305,  2.00000000,  3.00000000, -6.00000000,
--5.00000000, -4.00000000, -2.92897924, -1.85623684, -0.72445303, -0.00119184,  0.72896652,  2.05710416,  3.17909894,  4.00000000,
- 5.00000000, -3.00000000, -2.00000000, -0.67480586, -0.00028016,  0.66618169,  2.00000000,  3.00000000,  4.00000000, -7.00000000,
--6.00000000, -5.00000000, -3.78336783, -2.84811556, -2.04088844, -0.71114371,  0.03142493,  0.69662772,  1.91417930,  3.00000000,
- 4.01411062,  5.00000000,  6.00000000,  7.00000000, -6.00000000, -5.00000000, -4.00000000, -3.00000000, -2.00000000, -0.63703469,
- 0.00169604,  0.66294191,  1.83808563,  3.00000000,  4.00000000, -8.00000000, -7.00000000, -6.03082300, -5.00000000, -3.88061019,
--2.92670084, -1.99902336, -0.72898996, -0.02880170,  0.73769927,  1.95920233,  2.78356263,  4.08100921,  5.00000000,  6.00000000,
- 6.78771437,  8.00000000,  9.00000000,  10.00000000,  11.00000000, -5.00000000, -4.00000000, -2.88150384, -1.89520024, -0.71479482,
- 0.00962397,  0.72816030,  1.73583550,  3.00000000,  4.00000000,  5.00000000,  6.00000000,  7.00000000, -16.00000000, -15.00000000,
--13.80516401, -13.00000000, -12.00000000, -11.00000000, -10.02723144, -9.11825995, -8.05820112, -7.00000000, -6.17943541, -5.01837980,
--3.97546169, -2.92806857, -1.89778775, -0.81138893, -0.02246016,  0.80528415,  1.85705214,  2.96438524,  3.97540151,  4.79684246,
- 6.00000000,  6.75549513,  8.12185828,  9.00000000,  10.00000000,  11.00000000,  12.00000000,  13.00000000,  14.00000000, -11.00000000,
--10.00000000, -9.00000000, -7.91603344, -6.77865892, -5.85765006, -4.93342332, -3.96679157, -2.84925552, -1.89230732, -0.85384229,
- 0.00579591,  0.84863246,  1.89006713,  2.89483818,  3.87322971,  5.13228411,  6.00000000,  7.00000000,  8.00000000,  9.00000000,
- 10.00000000,  11.00000000, -34.00000000, -33.00000000, -32.00000000, -31.00000000, -30.00000000, -29.00000000, -28.00000000, -27.00000000,
--26.00000000, -25.00000000, -24.00000000, -23.00000000, -22.00000000, -21.00000000, -20.19501953, -19.00000000, -18.00000000, -17.00000000,
--16.00000000, -14.89069633, -14.00000000, -13.00000000, -12.16260304, -11.15418282, -9.83543570, -8.85600407, -7.82712677, -7.05664308,
--5.97007352, -4.89268438, -3.93822771, -2.94975269, -1.92192127, -0.90702480,  0.03974847,  0.92488359,  1.93747579,  2.94500522,
- 3.95181797,  4.95433087,  5.95141808,  7.00212920,  8.02964757,  9.03210585,  9.84644504,  10.82907720,  11.87622530,  12.96908371,
- 14.00000000,  15.16963413,  15.94902025,  17.00000000,  18.00000000,  19.00000000,  20.00000000,  21.00000000,  22.00000000, -29.00000000,
--27.79780781, -27.00757888, -26.01571026, -24.89695568, -23.99946491, -22.98699614, -21.96678139, -20.99883532, -20.00851529, -18.94738054,
--17.98672566, -16.98684787, -15.96917397, -14.99856852, -13.98974852, -12.97786927, -11.96110939, -10.98877093, -9.99875257, -8.99001359,
--8.00799989, -6.99471760, -6.00034670, -4.99936372, -4.00581479, -3.00424577, -2.02047620, -0.99713266, -0.00366397,  1.00803955,
- 1.98452687,  3.00748501,  4.02714611,  4.97661026,  5.99337271,  6.99754716,  8.00713602,  8.97184974,  9.98047901,  10.97685939,
- 11.99533975,  12.96107876,  13.95061478,  15.00756776,  15.94078690,  16.88231059,  17.92069248,  18.78011047,  20.00000000,  21.00000000,
- 22.00000000, -55.76988333, -54.96048193, -53.88411581, -52.94117980, -51.80983449, -50.90359699, -50.00000000, -48.99838741, -47.97685542,
--47.03288597, -45.97820919, -45.02418374, -43.90081897, -42.88832512, -41.98234549, -40.96745512, -39.98148729, -39.06792854, -37.96493755,
--36.98707870, -36.03416079, -35.01192444, -33.95785029, -32.99469087, -31.96633807, -31.01769053, -29.99727691, -28.99329690, -27.98873019,
--27.00344273, -25.97657141, -25.00511074, -23.96689479, -23.01566842, -22.01632643, -21.00076343, -19.97788007, -18.97248680, -17.96076284,
--16.97585453, -15.98345587, -15.01612745, -13.96862118, -12.96622055, -12.02196641, -11.02078103, -9.98445656, -9.00050060, -8.03442387,
--7.00363761, -5.97921358, -4.98886269, -4.00528221, -3.01672947, -1.98599795, -1.00668518, -0.02633490,  1.00794139,  2.00837138,
- 2.99213287,  3.98710216,  4.99064334,  6.01416391,  7.01759708,  7.97878151,  8.99665730,  10.02656114,  11.01863887,  12.01207901,
- 13.00958725,  13.99237829,  15.00954971,  16.00724653,  17.00606559,  17.99886292,  18.99611967,  19.98808171,  21.01871930,  21.97014763,
- 22.99833843,  24.00316842,  24.99949142,  25.98539601,  27.02480733,  27.98075377,  28.98266019,  30.00611445,  30.99409128,  31.94523141,
- 32.97688339,  33.98800206,  35.00177074,  35.98639997,  36.98939428,  37.95644255,  39.00114054,  39.99492439,  40.99338254,  41.97050844,
- 43.03085663,  43.96757668,  44.97800970,  45.95953358,  46.98109551,  47.99368477,  49.00141209,  49.94459923,  50.93298108,  51.99894661,
- 53.06463883,  53.99704669,  55.02037199,  55.98368047,  57.01930954,  58.03813852,  58.96232502,  60.01644186,  61.03254711,  62.01086576,
- 62.87962247,  63.98378413,  65.02189831,  65.93003954,  66.92439900,  68.07051633,  68.95928756,  70.03315022,  71.05579859,  72.00000000,
- 73.00000000,  74.00000000,  75.00000000,  75.93485291,  77.20950456,  78.00000000,  79.00000000,  79.91519960,  81.00000000, -3.00000000,
--2.00000000, -0.65174074, -0.00092112,  0.62967387,  2.00000000,  3.00000000, -6.00000000, -5.00000000, -4.00000000, -2.89861729,
--1.69999061, -0.72632201,  0.00219241,  0.72891750,  1.73257865,  3.00000000,  3.76561508,  5.00000000,  6.00000000, -3.00000000,
--2.00000000, -0.66227013,  0.00389373,  0.66163500,  2.00000000,  3.00000000,  4.00000000, -8.00000000, -7.00000000, -6.00000000,
--4.76421796, -4.04320264, -3.01415201, -1.84346485, -0.77185048,  0.00061977,  0.76274524,  1.84330156,  3.00000000,  4.00000000,
- 5.00000000,  6.00000000,  7.00000000, -6.00000000, -5.00000000, -4.00000000, -3.00000000, -1.75749611, -0.72951347, -0.00104394,
- 0.72040315,  1.72594036,  3.00000000,  4.00000000, -9.00000000, -8.00000000, -7.00000000, -5.90394062, -5.00000000, -3.75562807,
--2.89699407, -1.86696610, -0.79056636, -0.00330943,  0.79744554,  1.85149941,  2.91118681,  3.99520311,  4.96341987,  6.00000000,
- 7.00000000,  8.00000000,  9.00000000,  10.00000000, -6.00000000, -4.80151529, -4.00000000, -2.87442856, -1.85285815, -0.77767592,
--0.02071301,  0.81752572,  1.82503940,  2.79602150,  3.92870203,  5.00000000,  6.00000000,  7.00000000, -17.00000000, -16.00000000,
--15.00000000, -14.00000000, -13.00000000, -12.00000000, -11.00000000, -9.80059874, -9.00000000, -8.00185204, -7.13087808, -5.92942149,
--4.77883243, -3.93417708, -2.88004618, -1.89952522, -0.86239337,  0.00332274,  0.86657548,  1.89479279,  2.89701813,  3.90987417,
- 4.98910145,  6.07676766,  7.00000000,  8.00000000,  9.00000000,  10.00000000,  11.00000000,  12.00000000,  13.00000000,  14.00000000,
--12.00000000, -11.00000000, -9.89996262, -8.85894205, -7.87594823, -6.99685317, -5.94917589, -4.93914916, -3.93317670, -2.93174244,
--1.90737478, -0.90982242,  0.00803316,  0.90111563,  1.90362879,  2.90332432,  3.90654662,  4.94461954,  5.87963665,  6.91988113,
- 7.79514004,  8.98805413,  10.00000000,  11.00000000, -35.00000000, -34.00000000, -33.00000000, -32.00000000, -31.00000000, -30.00000000,
--29.00000000, -28.00000000, -27.00000000, -26.00000000, -25.00000000, -24.00000000, -22.88310970, -22.00000000, -21.00000000, -20.00000000,
--19.00000000, -18.00000000, -17.00000000, -16.11854974, -15.00000000, -14.10507667, -13.04497040, -11.94846700, -10.97432494, -9.94514368,
--8.97311414, -7.94171496, -6.97232122, -5.98590548, -4.97455572, -3.95477903, -2.93935454, -1.95573532, -0.97120273, -0.02084826,
- 0.95689153,  1.96679781,  2.97060165,  3.96660892,  4.96754331,  5.97996089,  6.93822411,  7.96618014,  8.95809791,  9.98891474,
- 10.95713402,  11.85433084,  13.03831696,  13.84035295,  15.00729606,  15.98652872,  17.20557599,  18.00000000,  18.90794805,  20.00000000,
- 21.00000000, -34.00000000, -33.00000000, -32.00000000, -31.00000000, -30.00000000, -28.97280602, -28.00000000, -27.16255057, -26.04078092,
--24.85442050, -24.15783484, -22.78614956, -21.95739865, -21.21844626, -20.03008104, -19.03888543, -17.90460490, -17.02064693, -15.84673652,
--14.87140709, -13.87996048, -12.94907251, -11.96795995, -11.00977925, -9.95103238, -8.96674655, -7.96351667, -6.96886200, -5.99335494,
--4.97515534, -3.98891694, -2.99581150, -1.98758360, -0.99249128, -0.00001403,  0.98807868,  1.99119869,  2.99019366,  3.98612953,
- 5.00312941,  5.98833080,  6.99686651,  7.98373889,  8.97942222,  9.94202752,  10.99671622,  11.94306164,  12.98539825,  13.90728690,
- 14.89907642,  15.94836675,  16.89611342,  17.84084949,  18.74910958,  20.00000000, -67.00000000, -66.00000000, -65.00000000, -64.00000000,
--63.02511977, -62.00000000, -61.06061493, -59.95964043, -59.12824439, -58.00000000, -57.00000000, -56.00000000, -54.87857996, -54.09689334,
--53.00000000, -52.21057366, -50.93867921, -50.03032952, -49.19283867, -47.89439051, -46.99505692, -46.04895543, -44.89687413, -43.78942208,
--42.99025156, -41.88436155, -40.99169704, -40.00320429, -38.90181498, -38.06029271, -37.05030818, -36.07554573, -35.03202233, -33.93117946,
--32.97736655, -31.98942819, -30.99546798, -30.01511004, -28.97296525, -28.02561164, -26.94386985, -25.99632704, -25.00461143, -24.01578192,
--22.99177609, -22.02261094, -20.97939001, -19.96176066, -19.00442980, -18.01529434, -17.00196902, -15.99794828, -14.98675055, -13.97517657,
--12.98676283, -11.99718760, -11.00167809, -9.98872268, -9.02138474, -8.00320338, -6.99542797, -6.00059136, -5.01311763, -4.00336943,
--3.00348281, -1.99365875, -0.98223019,  0.00126343,  0.99699237,  1.99381968,  3.00054436,  3.99898305,  5.00160508,  6.00310399,
- 6.99885096,  8.02740039,  8.99515550,  9.98962151,  11.00642302,  11.98694516,  13.00018933,  13.97726018,  14.99186645,  16.00580131,
- 16.97434224,  17.96982658,  19.00066438,  20.01228749,  21.00741822,  21.94988312,  23.00860212,  23.98801542,  24.97638417,  25.98003521,
- 27.02336188,  27.99667029,  29.01014125,  30.02481912,  31.01415797,  31.97399854,  33.06214485,  33.99929330,  34.94095386,  35.96368372,
- 36.96980925,  37.98389244,  39.01121235,  40.00715026,  41.06382894,  41.96618280,  43.01555590,  43.95430436,  45.01970038,  45.99967821,
- 47.19847394,  48.04852502,  49.10609965,  50.04244122,  50.86051406,  51.92983796,  53.02781107,  54.06248545,  54.89942009,  56.08347165,
- 57.06887956,  58.09671115,  59.07832400,  59.87005277,  61.14778499,  62.00000000,  63.00000000,  64.00000000,  65.00000000,  66.00000000,
- 67.00000000,  68.00000000,  69.00000000,  70.00000000,  71.00000000,  72.00000000};
-
-const double WebRtcIsac_kQKltLevelsShape[1735] = {
- 0.00032397,  0.00008053, -0.00061202, -0.00012620,  0.00030437,  0.00054764, -0.00027902,  0.00069360,  0.00029449, -0.80219239,
- 0.00091089, -0.74514927, -0.00094283,  0.64030631, -0.60509119,  0.00035575,  0.61851665, -0.62129957,  0.00375219,  0.60054900,
--0.61554359,  0.00054977,  0.63362016, -1.73118727, -0.65422341,  0.00524568,  0.66165298,  1.76785515, -1.83182018, -0.65997434,
--0.00011887,  0.67524299,  1.79933938, -1.76344480, -0.72547708, -0.00133017,  0.73104704,  1.75305377,  2.85164534, -2.80423916,
--1.71959639, -0.75419722, -0.00329945,  0.77196760,  1.72211069,  2.87339653,  0.00031089, -0.00015311,  0.00018201, -0.00035035,
--0.77357251,  0.00154647, -0.00047625, -0.00045299,  0.00086590,  0.00044762, -0.83383829,  0.00024787, -0.68526258, -0.00122472,
- 0.64643255, -0.60904942, -0.00448987,  0.62309184, -0.59626442, -0.00574132,  0.62296546, -0.63222115,  0.00013441,  0.63609545,
--0.66911055, -0.00369971,  0.66346095,  2.07281301, -1.77184694, -0.67640425, -0.00010145,  0.64818392,  1.74948973, -1.69420224,
--0.71943894, -0.00004680,  0.75303493,  1.81075983,  2.80610041, -2.80005755, -1.79866753, -0.77409777, -0.00084220,  0.80141293,
- 1.78291081,  2.73954236,  3.82994169,  0.00015140, -0.00012766, -0.00034241, -0.00119125, -0.76113497,  0.00069246,  0.76722027,
- 0.00132862, -0.69107530,  0.00010656,  0.77061578, -0.78012970,  0.00095947,  0.77828502, -0.64787758,  0.00217168,  0.63050167,
--0.58601125,  0.00306596,  0.59466308, -0.58603410,  0.00059779,  0.64257970,  1.76512766, -0.61193600, -0.00259517,  0.59767574,
--0.61026273,  0.00315811,  0.61725479, -1.69169719, -0.65816029,  0.00067575,  0.65576890,  2.00000000, -1.72689193, -0.69780808,
--0.00040990,  0.70668487,  1.74198458, -3.79028154, -3.00000000, -1.73194459, -0.70179341, -0.00106695,  0.71302629,  1.76849782,
--2.89332364, -1.78585007, -0.78731491, -0.00132610,  0.79692976,  1.75247009,  2.97828682, -5.26238694, -3.69559829, -2.87286122,
--1.84908818, -0.84434577, -0.01167975,  0.84641753,  1.84087672,  2.87628156,  3.83556679, -0.00190204,  0.00092642,  0.00354385,
--0.00012982, -0.67742785,  0.00229509,  0.64935672, -0.58444751,  0.00470733,  0.57299534, -0.58456202, -0.00097715,  0.64593607,
--0.64060330, -0.00638534,  0.59680157, -0.59287537,  0.00490772,  0.58919707, -0.60306173, -0.00417464,  0.60562100, -1.75218757,
--0.63018569, -0.00225922,  0.63863300, -0.63949939, -0.00126421,  0.64268914, -1.75851182, -0.68318060,  0.00510418,  0.69049211,
- 1.88178506, -1.71136148, -0.72710534, -0.00815559,  0.73412917,  1.79996711, -2.77111145, -1.73940498, -0.78212945,  0.01074476,
- 0.77688916,  1.76873972,  2.87281379,  3.77554698, -3.75832725, -2.95463235, -1.80451491, -0.80017226,  0.00149902,  0.80729206,
- 1.78265046,  2.89391793, -3.78236148, -2.83640598, -1.82532067, -0.88844327, -0.00620952,  0.88208030,  1.85757631,  2.81712391,
- 3.88430176,  5.16179367, -7.00000000, -5.93805408, -4.87172597, -3.87524433, -2.89399744, -1.92359563, -0.92136341, -0.00172725,
- 0.93087018,  1.90528280,  2.89809686,  3.88085708,  4.89147740,  5.89078692, -0.00239502,  0.00312564, -1.00000000,  0.00178325,
- 1.00000000, -0.62198029,  0.00143254,  0.65344051, -0.59851220, -0.00676987,  0.61510140, -0.58894151,  0.00385055,  0.59794203,
--0.59808568, -0.00038214,  0.57625703, -0.63009713, -0.01107985,  0.61278758, -0.64206758, -0.00154369,  0.65480598,  1.80604162,
--1.80909286, -0.67810514,  0.00205762,  0.68571097,  1.79453891, -3.22682422, -1.73808453, -0.71870305, -0.00738594,  0.71486172,
- 1.73005326, -1.66891897, -0.73689615, -0.00616203,  0.74262409,  1.73807899, -2.92417482, -1.73866741, -0.78133871,  0.00764425,
- 0.80027264,  1.78668732,  2.74992588, -4.00000000, -2.75578740, -1.83697516, -0.83117035, -0.00355191,  0.83527172,  1.82814700,
- 2.77377675,  3.80718693, -3.81667698, -2.83575471, -1.83372350, -0.86579471,  0.00547578,  0.87582281,  1.82858793,  2.87265007,
- 3.91405377, -4.87521600, -3.78999094, -2.86437014, -1.86964365, -0.90618018,  0.00128243,  0.91497811,  1.87374952,  2.83199819,
- 3.91519130,  4.76632822, -6.68713448, -6.01252467, -4.94587936, -3.88795368, -2.91299088, -1.92592211, -0.95504570, -0.00089980,
- 0.94565200,  1.93239633,  2.91832808,  3.91363475,  4.88920034,  5.96471415,  6.83905252,  7.86195009,  8.81571018, -12.96141759,
--11.73039516, -10.96459719, -9.97382433, -9.04414433, -7.89460619, -6.96628608, -5.93236595, -4.93337924, -3.95479990, -2.96451499,
--1.96635876, -0.97271229, -0.00402238,  0.98343930,  1.98348291,  2.96641164,  3.95456471,  4.95517089,  5.98975714,  6.90322073,
- 7.90468849,  8.85639467,  9.97255498,  10.79006309,  11.81988596,  0.04950500, -1.00000000, -0.01226628,  1.00000000, -0.59479469,
--0.10438305,  0.59822144, -2.00000000, -0.67109149, -0.09256692,  0.65171621,  2.00000000, -3.00000000, -1.68391999, -0.76681039,
--0.03354151,  0.71509146,  1.77615472, -2.00000000, -0.68661511, -0.02497881,  0.66478398,  2.00000000, -2.00000000, -0.67032784,
--0.00920582,  0.64892756,  2.00000000, -2.00000000, -0.68561894,  0.03641869,  0.73021611,  1.68293863, -4.00000000, -2.72024184,
--1.80096059, -0.81696185,  0.03604685,  0.79232033,  1.70070730,  3.00000000, -4.00000000, -2.71795670, -1.80482986, -0.86001162,
- 0.03764903,  0.87723968,  1.79970771,  2.72685932,  3.67589143, -5.00000000, -4.00000000, -2.85492548, -1.78996365, -0.83250358,
--0.01376828,  0.84195506,  1.78161105,  2.76754458,  4.00000000, -6.00000000, -5.00000000, -3.82268811, -2.77563624, -1.82608163,
--0.86486114, -0.02671886,  0.86693165,  1.88422879,  2.86248347,  3.95632216, -7.00000000, -6.00000000, -5.00000000, -3.77533988,
--2.86391432, -1.87052039, -0.90513658,  0.06271236,  0.91083620,  1.85734756,  2.86031688,  3.82019418,  4.94420394,  6.00000000,
--11.00000000, -10.00000000, -9.00000000, -8.00000000, -6.91952415, -6.00000000, -4.92044374, -3.87845165, -2.87392362, -1.88413020,
--0.91915740,  0.00318517,  0.91602800,  1.89664838,  2.88925058,  3.84123856,  4.78988651,  5.94526812,  6.81953917,  8.00000000,
--9.00000000, -8.00000000, -7.03319143, -5.94530963, -4.86669720, -3.92438007, -2.88620396, -1.92848070, -0.94365985,  0.01671855,
- 0.97349410,  1.93419878,  2.89740109,  3.89662823,  4.83235583,  5.88106535,  6.80328232,  8.00000000, -13.00000000, -12.00000000,
--11.00000000, -10.00000000, -9.00000000, -7.86033489, -6.83344055, -5.89844215, -4.90811454, -3.94841298, -2.95820490, -1.98627966,
--0.99161468, -0.02286136,  0.96055651,  1.95052433,  2.93969396,  3.94304346,  4.88522624,  5.87434241,  6.78309433,  7.87244101,
- 9.00000000,  10.00000000, -12.09117356, -11.00000000, -10.00000000, -8.84766108, -7.86934236, -6.98544896, -5.94233429, -4.95583292,
--3.95575986, -2.97085529, -1.98955811, -0.99359873, -0.00485413,  0.98298870,  1.98093258,  2.96430203,  3.95540216,  4.96915010,
- 5.96775124,  6.99236918,  7.96503302,  8.99864542,  9.85857723,  10.96541926,  11.91647197,  12.71060069, -26.00000000, -25.00000000,
--24.00585596, -23.11642573, -22.14271284, -20.89800711, -19.87815799, -19.05036354, -17.88555651, -16.86471209, -15.97711073, -14.94012359,
--14.02661226, -12.98243228, -11.97489256, -10.97402777, -9.96425624, -9.01085220, -7.97372506, -6.98795002, -5.97271328, -5.00191694,
--3.98055849, -2.98458048, -1.99470442, -0.99656768, -0.00825666,  1.00272004,  1.99922218,  2.99357669,  4.01407905,  5.01003897,
- 5.98115528,  7.00018958,  8.00338125,  8.98981046,  9.98990318,  10.96341479,  11.96866930,  12.99175139,  13.94580443,  14.95745083,
- 15.98992869,  16.97484646,  17.99630043,  18.93396897,  19.88347741,  20.96532482,  21.92191032,  23.22314702,  0.00006846,  0.00014352,
--0.00056203,  0.00027588, -0.00147678,  1.00000000,  0.00003823,  0.00001975, -0.00033710, -0.00096712,  1.00000000, -1.00000000,
- 0.00067511, -1.00000000,  0.00342065,  1.00000000, -1.00000000,  0.00196254,  1.00000000, -1.00000000,  0.00201173,  1.00000000,
--2.00000000, -1.00000000, -0.00381686,  1.00000000, -1.00000000,  0.00178037,  1.00000000, -2.00000000, -1.00000000, -0.00320274,
- 1.00000000,  2.00000000, -2.00000000, -1.00000000,  0.00426519,  1.00000000,  2.00000000, -3.00000000, -2.00000000, -1.00000000,
--0.00074072,  0.64654602,  2.00000000,  0.00031217,  0.00063348,  0.00020247,  0.00047891,  0.00122893, -0.00150669, -0.00148276,
- 0.00016848,  0.00147085,  1.00000000, -0.00088160,  1.00000000, -1.00000000,  0.00381641,  1.00000000, -1.00000000,  0.00129816,
- 1.00000000, -1.00000000,  0.00074903,  1.00000000, -2.00000000, -0.76230566, -0.00370764,  0.82467977, -0.78769346, -0.00492670,
- 0.84532630, -2.00000000, -0.70943195, -0.01257613,  0.75905385,  2.00000000, -2.00000000, -0.62780445, -0.00408633,  0.60272506,
- 2.00000000,  3.00000000, -3.00000000, -2.00000000, -0.61412985,  0.00102833,  0.61527589,  2.00000000,  3.00000000,  0.00012115,
--0.00080909,  0.00071061, -0.00227957,  0.00179794,  0.00103827, -1.00000000,  0.00444757, -1.00000000,  0.00604068,  1.00000000,
--1.00000000,  0.00427327,  1.00000000, -1.00000000,  0.00086662,  1.00000000, -1.00000000, -0.00837492,  1.00000000, -0.65715934,
--0.00645342,  0.64004630, -2.00000000, -0.64987682, -0.01449567,  0.69893373, -2.00000000, -0.63221961,  0.00421765,  0.62452105,
- 2.00000000, -2.00000000, -0.60027006, -0.00110630,  0.62033821,  2.00000000, -2.00000000, -0.59823932,  0.00928313,  0.62188520,
- 2.00000000,  3.00000000, -3.00000000, -2.00000000, -0.63230286, -0.00248555,  0.62632575,  2.00000000,  3.00000000, -5.00000000,
--4.00000000, -3.00000000, -2.00000000, -0.66521143,  0.00544305,  0.66930486,  2.00000000,  3.00000000,  4.00000000,  0.00077008,
- 0.00061140, -0.00009317, -0.00049643,  1.00000000, -1.00000000, -0.00285084,  1.00000000, -1.00000000,  0.00601784,  1.00000000,
--1.00000000, -0.00091887,  0.75122772, -0.71579859, -0.00043545,  1.00000000, -0.85571363, -0.00227654,  0.63816873, -1.00000000,
--0.00393484,  0.76748004, -0.58223659, -0.01229777,  0.58080322, -0.61945902, -0.00232238,  0.62277938,  2.00000000, -2.00000000,
--0.60595489, -0.00535702,  0.60547736,  2.00000000, -4.00000000, -3.00000000, -2.00000000, -0.62368122,  0.01112097,  0.63997294,
- 2.00000000,  3.00000000, -3.00000000, -2.00000000, -0.64318217,  0.00515139,  0.64781184,  2.00000000, -3.00000000, -1.78031579,
--0.67122588,  0.02153711,  0.67899877,  2.00000000,  3.00000000,  4.00000000, -4.00000000, -3.00000000, -1.80503233, -0.69835727,
--0.00270770,  0.70999554,  1.77332849,  3.00000000,  4.00000000,  5.00000000, -8.00000000, -7.00000000, -6.00000000, -5.00000000,
--4.00000000, -2.81600693, -1.72970368, -0.73779413, -0.01384841,  0.75694606,  1.80042618,  3.00000000,  4.00000000,  5.00000000,
- 6.00000000, -0.00051787,  0.00059593, -0.00023319, -1.00000000,  0.00191861,  0.79547197, -0.75020995,  0.00217840,  0.69165833,
--1.00000000, -0.00304964,  0.67698951, -0.64516943, -0.00657667,  0.59260129, -0.62819301, -0.00456626,  0.59426260, -0.60909519,
- 0.00256476,  0.61660408, -0.66560131, -0.00293463,  0.67477566,  2.00000000, -2.00000000, -0.62484067,  0.00505116,  0.63491494,
- 2.00000000, -3.00000000, -2.00000000, -0.68427246,  0.00924353,  0.68755774,  2.00000000,  3.00000000, -3.00000000, -2.00000000,
--0.65390928,  0.01008025,  0.65849449,  2.00000000,  3.00000000, -5.00000000, -4.00000000, -3.00000000, -1.70848232, -0.72079538,
--0.00007674,  0.71556176,  1.76815351,  3.00000000,  4.00000000,  5.00000000, -4.00000000, -3.00000000, -1.82887466, -0.73529886,
- 0.00033458,  0.73847588,  1.83009515,  3.00000000,  4.00000000, -5.00000000, -4.00000000, -2.83203553, -1.79500085, -0.77452749,
--0.00614320,  0.77416943,  1.82469471,  2.77034612,  4.00000000,  5.00000000, -7.00000000, -6.00000000, -5.00000000, -4.00000000,
--2.76574798, -1.84700836, -0.80822297,  0.00054165,  0.80901445,  1.85687331,  2.75680191,  3.81986695,  5.00000000,  6.00000000,
- 7.00000000,  8.00000000, -13.00000000, -12.00000000, -11.00000000, -10.00000000, -9.00000000, -8.00000000, -7.00000000, -6.00000000,
--5.00000000, -3.88304817, -2.93396067, -1.86645989, -0.84825410,  0.00666207,  0.84853252,  1.88634684,  2.95282618,  3.89813287,
- 4.89189079,  6.00000000,  7.00000000,  8.00000000,  9.00000000,  10.00000000,  11.00000000, -0.00344877,  1.00000000, -0.61413659,
--0.02115630,  0.59438887, -0.60873054,  0.00844993,  0.62510557, -2.00000000, -0.75002947,  0.00120913,  0.66616051, -2.00000000,
--0.72324691,  0.04760499,  0.70532533,  2.00000000, -3.00000000, -1.66577589, -0.78941380, -0.01909714,  0.74993685,  1.70945570,
--1.64422308, -0.70992006, -0.02795108,  0.76990363,  1.79682243,  2.96233315, -1.71686461, -0.76572785, -0.00041846,  0.78174132,
- 1.66217596, -3.00000000, -1.77033369, -0.79475091,  0.03709740,  0.80097076,  1.83947400,  2.85879773, -4.00000000, -3.16528651,
--1.79564411, -0.90078981,  0.02403102,  0.86138856,  1.84207433,  2.74584048, -4.00000000, -2.91249347, -1.87804769, -0.87323549,
- 0.08164382,  0.89037056,  1.82505263,  2.71336163,  4.00000000, -4.81262228, -3.87173565, -2.83424209, -1.87517938, -0.86199960,
- 0.00268598,  0.89547657,  1.90713511,  2.85219071,  3.86417171,  4.80711781,  6.00000000,  7.00000000, -5.00000000, -3.82388480,
--2.82875808, -1.90350457, -0.90795818,  0.03047007,  0.93676836,  1.88844957,  2.83269711,  3.76109686,  5.00000000, -9.00000000,
--8.00000000, -6.88037957, -5.88776398, -4.91209139, -3.93902541, -2.90989221, -1.92281230, -0.98960535, -0.07440511,  0.94023957,
- 1.91666262,  2.83340828,  3.83651295,  4.77839424,  6.12284019,  7.00000000,  8.00000000,  9.00000000, -12.00000000, -11.00000000,
--10.00000000, -9.00000000, -8.00000000, -6.68554513, -5.97994708, -4.98789075, -3.91383581, -2.92952795, -1.91727195, -0.93148075,
--0.00568870,  0.93515148,  1.94580068,  2.93838956,  3.92567644,  4.96573603,  5.95402763,  7.00000000,  8.00000000,  9.00000000,
--11.00000000, -9.90096030, -8.97868124, -7.93663988, -6.98806055, -5.95937864, -4.93473664, -3.95454756, -2.96518446, -1.97711766,
--0.98552111, -0.03317271,  0.95115775,  1.93785086,  2.96310779,  3.93322450,  5.01716212,  5.85909823,  6.89163669,  7.97492693,
- 8.85698897,  9.79802946,  11.09373957,  12.00000000, -13.00000000, -12.00000000, -10.67579109, -9.95079100, -8.90576592, -7.93254656,
--6.96112672, -5.96015798, -4.95493809, -3.98556269, -2.98182856, -1.98150255, -0.96551153, -0.00399791,  0.98644875,  1.98043830,
- 2.97969033,  3.97728257,  4.95173541,  5.95649050,  6.96447378,  7.95591513,  9.07680954,  9.92093070,  10.76496555,  11.97525735,
- 13.00000000,  14.00000000, -25.00000000, -24.00000000, -23.00000000, -22.00072357, -21.00000000, -20.00000000, -19.00000000, -18.20003462,
--17.01648407, -15.78651996, -14.95660266, -13.99167850, -13.28722978, -11.85013840, -10.92025302, -9.87055810, -8.93841040, -7.95329867,
--6.97819441, -6.01593394, -5.00905213, -3.99905285, -2.99171810, -1.99062796, -1.00112466,  0.00140492,  1.00701091,  2.02327185,
- 3.00194633,  3.99188294,  5.00313145,  6.00448038,  6.98904951,  7.98158293,  8.98212774,  10.00363404,  10.98641678,  11.98034311,
- 12.95176779,  13.95383703,  14.99084578,  15.98600642,  16.99406826,  17.98134623,  19.01793961,  19.86072639,  20.88465474,  21.99287082,
- 22.81916620,  23.77946383,  0.00000234,  0.00000298,  0.00000048,  0.00002408, -0.00000165, -0.00001831, -0.00005703, -0.00000184,
--1.00000000,  0.00001977,  1.00000000, -1.00000000,  0.00000010,  1.00000000, -1.00000000, -0.00001152,  1.00000000, -1.00000000,
- 0.00000840,  1.00000000, -1.00000000,  0.00002353,  1.00000000, -0.75455603, -0.00001433,  1.00000000, -0.65859705, -0.00000703,
- 0.62995860, -2.00000000, -0.72724652, -0.00033969,  0.61359174,  2.00000000, -2.00000000, -0.69510998, -0.00031410,  0.66467605,
- 2.00000000,  3.00000000, -3.00000000, -2.00000000, -0.65738683,  0.00039019,  0.66554720,  1.91774106,  3.18089124,  0.00000070,
- 0.00001152, -0.00000795, -0.00000058, -0.00003502, -0.00001508, -0.00004225, -0.00002165, -1.00000000,  0.00004391,  1.00000000,
--1.00000000,  0.00001784,  1.00000000, -1.00000000, -0.00003678,  1.00000000, -0.68878314, -0.00013166,  0.60880149, -0.75291978,
- 0.00006493,  1.00000000, -0.76757316,  0.00003057,  0.67140524, -0.61602267, -0.00014495,  0.63625803,  2.00000000, -2.00000000,
--0.61253314, -0.00116483,  0.65071851,  2.00000000, -3.00000000, -1.71451667, -0.67799909, -0.00048294,  0.65846019,  2.00000000,
--3.02497593, -1.83515395, -0.70317981,  0.00519701,  0.67780009,  1.84218153,  2.88846262,  4.00000000,  0.00001124,  0.00000588,
--0.00000172,  0.00002835,  1.00000000,  0.00001012, -0.00008644,  1.00000000, -0.75115901,  0.00004347,  1.00000000, -1.00000000,
- 0.00002800,  1.00000000, -1.00000000, -0.00006039,  1.00000000, -0.79763258, -0.00011907,  0.71713616, -0.76791870, -0.00007113,
- 0.63583609, -0.62337806,  0.00012891,  0.62242094, -0.60837055,  0.00043216,  0.65515705, -0.63637782, -0.00019749,  0.60423967,
- 2.00000000, -2.00000000, -0.65404827, -0.00089304,  0.64706660,  2.00000000, -1.86334076, -0.66410366,  0.00063219,  0.66968004,
- 2.00000000,  3.00000000,  4.00000000, -4.00000000, -3.00000000, -1.79048834, -0.69451890,  0.00030677,  0.71009333,  1.70591343,
- 3.00000000,  4.00000000, -4.00000000, -2.90176499, -1.78368781, -0.74425178,  0.00234068,  0.74847325,  1.78886822,  2.78478854,
- 3.83608985,  4.95996151,  0.00002170,  0.00001281,  0.00002162, -1.00000000, -0.00007266,  1.00000000, -1.00000000, -0.00003250,
--0.64088804,  0.00015239,  1.00000000, -0.58450370, -0.00008410,  0.60567186, -1.00000000, -0.00010752,  1.00000000, -0.58922508,
--0.00017378,  0.60755779, -0.62797206, -0.00001016,  0.64432847, -0.58497934, -0.00001851,  0.59716791, -0.62642499, -0.00097386,
- 0.63568558,  2.00000000, -2.00000000, -0.63236390, -0.00173361,  0.63142762,  1.75629192, -3.00000000, -2.00000000, -0.65596684,
- 0.00209364,  0.65419742,  2.00000000, -3.00000000, -1.73856625, -0.67767521, -0.00119512,  0.68973603,  1.70985573,  3.00000000,
--3.00000000, -1.81820220, -0.73974134,  0.00695869,  0.72216179,  1.75624461,  3.00000000,  4.00000000, -5.00000000, -4.00000000,
--3.17718593, -1.76857567, -0.76822322,  0.00267400,  0.76414602,  1.84309221,  3.04940652,  4.00000000, -7.08189123, -6.00000000,
--5.22882249, -3.96477958, -2.79653492, -1.81923435, -0.80050253, -0.01086663,  0.82708565,  1.85804900,  2.89996354,  3.76028554,
- 4.80518081,  5.81738096,  7.00000000,  8.00000000,  9.08816091, -0.00002979, -0.00000333, -1.00000000, -0.00011532,  1.00000000,
--0.70921122, -0.00005325,  0.68933188, -0.67581263, -0.00023107,  0.57868212, -0.58388312, -0.00020850,  0.60149012, -0.60912457,
- 0.00001567,  0.60180554, -0.59130091, -0.00038863,  0.59908653, -2.00000000, -0.63697707,  0.00083913,  0.62040514,  2.00000000,
--2.00000000, -0.63216238, -0.00081100,  0.64411071,  2.00000000, -1.76856259, -0.65266989, -0.00243486,  0.66888899,  2.00000000,
--1.75427214, -0.71415385, -0.00226376,  0.71296778,  1.66182947,  3.00000000, -3.00000000, -1.72505821, -0.72920134, -0.00360424,
- 0.73800767,  1.72848281,  3.00000000, -4.00000000, -2.95284408, -1.72025758, -0.76503859,  0.00418761,  0.75297139,  1.73959808,
- 3.00000000, -5.00000000, -3.96232791, -2.74080544, -1.78897123, -0.80233505, -0.00002050,  0.79693417,  1.76182598,  2.78434458,
- 3.85693287,  5.00000000, -6.00000000, -4.78439284, -3.83501790, -2.85203629, -1.84909573, -0.85382658, -0.00181019,  0.84735145,
- 1.83676575,  2.83656843,  3.86722376,  4.79702431,  6.00000000, -9.00000000, -8.00000000, -7.00000000, -6.07957292, -4.84677515,
--3.85093972, -2.88683139, -1.84596391, -0.88058034, -0.00008692,  0.87554746,  1.86933183,  2.84729990,  3.89029797,  4.87311773,
- 5.90844023,  7.00000000, -11.00000000, -9.97745420, -8.90015761, -7.94187517, -6.86987726, -5.84795335, -4.86693435, -3.90601819,
--2.91031804, -1.91620096, -0.90497055,  0.00659199,  0.90926869,  1.90980821,  2.91070850,  3.93685967,  4.85581177,  6.06727337,
- 7.05801043,  8.00000000,  9.00000000,  10.00000000,  10.90825787,  12.00000000,  13.00000000,  14.00000000, -0.00008918,  1.00000000,
--0.54405938,  0.00120348,  0.55781920, -0.59227786, -0.00349602,  0.59777231, -1.63717598, -0.69048065,  0.00999281,  0.65770558,
- 2.00000000, -2.00000000, -0.71013571,  0.00454518,  0.66991065, -3.00000000, -1.73004867, -0.73743921,  0.01162454,  0.69964842,
- 1.83319587, -1.81225491, -0.76806000,  0.00164742,  0.76780397,  1.67168896, -1.64564794, -0.79903361, -0.01522880,  0.84277926,
- 1.68873752, -3.00000000, -1.72063244, -0.83687428,  0.00246724,  0.84618697,  1.79464483,  2.77447025, -3.77118426, -2.75025539,
--1.82050448, -0.90373722, -0.00187780,  0.90102245,  1.85249394,  2.71364180, -2.71720889, -1.79466125, -0.89860801, -0.02725825,
- 0.90877329,  1.90542096,  2.76847902,  3.71496428, -4.70257302, -3.90746659, -2.87078421, -1.88858709, -0.93608993, -0.02157425,
- 0.95181182,  1.91155682,  2.83614575,  3.87820801,  4.72172277, -5.02764544, -3.80066801, -2.87484378, -1.90707477, -0.96326017,
--0.01060091,  0.96558851,  1.92191548,  2.86970759,  3.85655474,  4.83135970,  5.76387469, -9.00000000, -8.00000000, -6.75261776,
--5.86333393, -4.84846871, -3.91871758, -2.93827286, -1.93050320, -0.96359634, -0.00141931,  0.95926312,  1.92541870,  2.93009411,
- 3.86699087,  4.82315929,  5.67815206, -8.76594345, -7.70350451, -6.91784020, -5.81539490, -4.92526872, -3.91513203, -2.92134949,
--1.95465646, -0.97638102, -0.00742564,  0.96948714,  1.96401112,  2.95256722,  3.93146353,  4.90991357,  5.88139022,  6.88640588,
- 7.82610489,  9.00000000, -10.97611369, -9.80036760, -8.91109518, -7.92809404, -6.93865353, -5.91965899, -4.92957669, -3.95206224,
--2.97308718, -1.97778214, -0.98552568, -0.00063212,  0.98686014,  1.97511867,  2.97114218,  3.97854244,  4.96578513,  5.96457765,
- 6.95180187,  7.95163483,  8.93760897,  9.87666900,  10.88024562,  11.96270158,  12.99519291, -15.00000000, -13.76826291, -12.97229116,
--12.00334834, -10.95980884, -9.98190891, -8.93798503, -7.95621309, -6.96109479, -5.96056649, -4.95843419, -3.97688640, -2.98989576,
--1.98533395, -0.99580972,  0.00694370,  0.99421120,  1.99033132,  2.98751217,  3.98549580,  4.96482394,  5.96623233,  6.93564626,
- 7.93772467,  8.92015276,  9.88785129,  10.97606096,  11.79686057, -23.00000000, -22.00000000, -21.00000000, -20.00000000, -19.00000000,
--17.73310977, -16.83574096, -15.90889480, -15.00437366, -13.95007272, -12.99296117, -11.98334751, -10.96970820, -9.97775151, -8.98193840,
--7.98378966, -6.98887770, -5.99059477, -5.00228769, -3.99355850, -2.99947486, -1.99897483, -0.99375857,  0.00324880,  1.00215912,
- 1.99277083,  3.00503747,  3.99390482,  4.98854283,  5.98753219,  6.98245347,  7.98089893,  8.95960522,  9.95663648,  11.00810285,
- 12.01421617,  12.96208687,  13.99227766,  14.97230040,  15.95114804,  16.97347393,  17.97794884,  18.96777118,  19.94446034,  20.94799029,
- 22.14740083,  22.84288347,  23.99212109,  25.00000000,  25.96562658};
-
-/* cdf tables for quantizer indices */
-const WebRtc_UWord16 WebRtcIsac_kQKltCdfGain[1212] = {
- 0,  13,  301,  3730,  61784,  65167,  65489,  65535,  0,  17,
- 142,  314,  929,  2466,  7678,  56450,  63463,  64740,  65204,  65426,
- 65527,  65535,  0,  8,  100,  724,  6301,  60105,  65125,  65510,
- 65531,  65535,  0,  13,  117,  368,  1068,  3010,  11928,  53603,
- 61177,  63404,  64505,  65108,  65422,  65502,  65531,  65535,  0,  4,
- 17,  96,  410,  1859,  12125,  54361,  64103,  65305,  65497,  65535,
- 0,  4,  88,  230,  469,  950,  1746,  3228,  6092,  16592,
- 44756,  56848,  61256,  63308,  64325,  64920,  65309,  65460,  65502,  65522,
- 65535,  0,  88,  352,  1675,  6339,  20749,  46686,  59284,  63525,
- 64949,  65359,  65502,  65527,  65535,  0,  13,  38,  63,  117,
- 234,  381,  641,  929,  1407,  2043,  2809,  4032,  5753,  8792,
- 14407,  24308,  38941,  48947,  55403,  59293,  61411,  62688,  63630,  64329,
- 64840,  65188,  65376,  65472,  65506,  65527,  65531,  65535,  0,  8,
- 29,  75,  222,  615,  1327,  2801,  5623,  9931,  16094,  24966,
- 34419,  43458,  50676,  56186,  60055,  62500,  63936,  64765,  65225,  65435,
- 65514,  65535,  0,  8,  13,  15,  17,  21,  33,  59,
- 71,  92,  151,  243,  360,  456,  674,  934,  1223,  1583,
- 1989,  2504,  3031,  3617,  4354,  5154,  6163,  7411,  8780,  10747,
- 12874,  15591,  18974,  23027,  27436,  32020,  36948,  41830,  46205,  49797,
- 53042,  56094,  58418,  60360,  61763,  62818,  63559,  64103,  64509,  64798,
- 65045,  65162,  65288,  65363,  65447,  65506,  65522,  65531,  65533,  65535,
- 0,  4,  6,  25,  38,  71,  138,  264,  519,  808,
- 1227,  1825,  2516,  3408,  4279,  5560,  7092,  9197,  11420,  14108,
- 16947,  20300,  23926,  27459,  31164,  34827,  38575,  42178,  45540,  48747,
- 51444,  54090,  56426,  58460,  60080,  61595,  62734,  63668,  64275,  64673,
- 64936,  65112,  65217,  65334,  65426,  65464,  65477,  65489,  65518,  65527,
- 65529,  65531,  65533,  65535,  0,  2,  4,  8,  10,  12,
- 14,  16,  21,  33,  50,  71,  84,  92,  105,  138,
- 180,  255,  318,  377,  435,  473,  511,  590,  682,  758,
- 913,  1097,  1256,  1449,  1671,  1884,  2169,  2445,  2772,  3157,
- 3563,  3944,  4375,  4848,  5334,  5820,  6448,  7101,  7716,  8378,
- 9102,  9956,  10752,  11648,  12707,  13670,  14758,  15910,  17187,  18472,
- 19627,  20649,  21951,  23169,  24283,  25552,  26862,  28227,  29391,  30764,
- 31882,  33213,  34432,  35600,  36910,  38116,  39464,  40729,  41872,  43144,
- 44371,  45514,  46762,  47813,  48968,  50069,  51032,  51974,  52908,  53737,
- 54603,  55445,  56282,  56990,  57572,  58191,  58840,  59410,  59887,  60264,
- 60607,  60946,  61269,  61516,  61771,  61960,  62198,  62408,  62558,  62776,
- 62985,  63207,  63408,  63546,  63739,  63906,  64070,  64237,  64371,  64551,
- 64677,  64836,  64999,  65095,  65213,  65284,  65338,  65380,  65426,  65447,
- 65472,  65485,  65487,  65489,  65502,  65510,  65512,  65514,  65516,  65518,
- 65522,  65531,  65533,  65535,  0,  2,  4,  6,  65528,  65531,
- 65533,  65535,  0,  2,  4,  6,  8,  10,  222,  65321,
- 65513,  65528,  65531,  65533,  65535,  0,  2,  4,  50,  65476,
- 65529,  65531,  65533,  65535,  0,  2,  4,  6,  8,  12,
- 38,  544,  64936,  65509,  65523,  65525,  65529,  65531,  65533,  65535,
- 0,  2,  4,  6,  8,  10,  1055,  64508,  65528,  65531,
- 65533,  65535,  0,  2,  4,  6,  8,  10,  12,  123,
- 3956,  62999,  65372,  65495,  65515,  65521,  65523,  65525,  65527,  65529,
- 65531,  65533,  65535,  0,  2,  4,  12,  53,  4707,  59445,
- 65467,  65525,  65527,  65529,  65531,  65533,  65535,  0,  2,  4,
- 6,  8,  10,  12,  14,  16,  38,  40,  50,  67,
- 96,  234,  929,  14345,  55750,  64866,  65389,  65462,  65514,  65517,
- 65519,  65521,  65523,  65525,  65527,  65529,  65531,  65533,  65535,  0,
- 2,  4,  6,  8,  10,  15,  35,  91,  377,  1946,
- 13618,  52565,  63714,  65184,  65465,  65520,  65523,  65525,  65527,  65529,
- 65531,  65533,  65535,  0,  2,  4,  6,  8,  10,  12,
- 14,  16,  18,  20,  22,  24,  26,  28,  30,  32,
- 34,  36,  38,  40,  42,  44,  46,  48,  50,  52,
- 54,  82,  149,  362,  751,  1701,  4239,  12893,  38627,  55072,
- 60875,  63071,  64158,  64702,  65096,  65283,  65412,  65473,  65494,  65505,
- 65508,  65517,  65519,  65521,  65523,  65525,  65527,  65529,  65531,  65533,
- 65535,  0,  2,  15,  23,  53,  143,  260,  418,  698,
- 988,  1353,  1812,  2411,  3144,  4015,  5143,  6401,  7611,  8999,
- 10653,  12512,  14636,  16865,  19404,  22154,  24798,  27521,  30326,  33102,
- 35790,  38603,  41415,  43968,  46771,  49435,  52152,  54715,  57143,  59481,
- 61178,  62507,  63603,  64489,  64997,  65257,  65427,  65473,  65503,  65520,
- 65529,  65531,  65533,  65535,  0,  3,  6,  9,  26,  32,
- 44,  46,  64,  94,  111,  164,  205,  254,  327,  409,
- 506,  608,  733,  885,  1093,  1292,  1482,  1742,  1993,  2329,
- 2615,  3029,  3374,  3798,  4257,  4870,  5405,  5992,  6618,  7225,
- 7816,  8418,  9051,  9761,  10532,  11380,  12113,  13010,  13788,  14594,
- 15455,  16361,  17182,  18088,  18997,  20046,  20951,  21968,  22947,  24124,
- 25296,  26547,  27712,  28775,  29807,  30835,  31709,  32469,  33201,  34014,
- 34876,  35773,  36696,  37620,  38558,  39547,  40406,  41277,  42367,  43290,
- 44445,  45443,  46510,  47684,  48973,  50157,  51187,  52242,  53209,  54083,
- 55006,  55871,  56618,  57293,  57965,  58556,  59222,  59722,  60180,  60554,
- 60902,  61250,  61554,  61837,  62100,  62372,  62631,  62856,  63078,  63324,
- 63557,  63768,  63961,  64089,  64235,  64352,  64501,  64633,  64770,  64887,
- 65001,  65059,  65121,  65188,  65246,  65302,  65346,  65390,  65428,  65463,
- 65477,  65506,  65515,  65517,  65519,  65521,  65523,  65525,  65527,  65529,
- 65531,  65533,  65535,  0,  2,  4,  109,  65332,  65531,  65533,
- 65535,  0,  2,  4,  6,  8,  25,  1817,  63874,  65511,
- 65527,  65529,  65531,  65533,  65535,  0,  2,  4,  907,  65014,
- 65529,  65531,  65533,  65535,  0,  2,  4,  6,  8,  10,
- 12,  132,  2743,  62708,  65430,  65525,  65527,  65529,  65531,  65533,
- 65535,  0,  2,  4,  6,  8,  35,  3743,  61666,  65485,
- 65531,  65533,  65535,  0,  2,  4,  6,  8,  10,  23,
- 109,  683,  6905,  58417,  64911,  65398,  65497,  65518,  65525,  65527,
- 65529,  65531,  65533,  65535,  0,  2,  4,  6,  53,  510,
- 10209,  55212,  64573,  65441,  65522,  65529,  65531,  65533,  65535,  0,
- 2,  4,  6,  8,  10,  12,  14,  16,  18,  20,
- 22,  32,  90,  266,  1037,  3349,  14468,  50488,  62394,  64685,
- 65341,  65480,  65514,  65519,  65521,  65523,  65525,  65527,  65529,  65531,
- 65533,  65535,  0,  2,  4,  6,  9,  16,  37,  106,
- 296,  748,  1868,  5733,  18897,  45553,  60165,  63949,  64926,  65314,
- 65441,  65508,  65524,  65529,  65531,  65533,  65535,  0,  2,  4,
- 6,  8,  10,  12,  14,  16,  18,  20,  22,  24,
- 26,  28,  30,  32,  34,  36,  38,  40,  42,  44,
- 46,  48,  50,  83,  175,  344,  667,  1293,  2337,  4357,
- 8033,  14988,  28600,  43244,  52011,  57042,  59980,  61779,  63065,  63869,
- 64390,  64753,  64988,  65164,  65326,  65422,  65462,  65492,  65506,  65522,
- 65524,  65526,  65531,  65533,  65535,  0,  2,  4,  6,  8,
- 10,  12,  14,  16,  25,  39,  48,  55,  62,  65,
- 85,  106,  139,  169,  194,  252,  323,  485,  688,  1074,
- 1600,  2544,  3863,  5733,  8303,  11397,  15529,  20273,  25734,  31455,
- 36853,  41891,  46410,  50306,  53702,  56503,  58673,  60479,  61880,  62989,
- 63748,  64404,  64852,  65124,  65309,  65424,  65480,  65524,  65528,  65533,
- 65535,  0,  2,  4,  6,  8,  10,  12,  14,  21,
- 23,  25,  27,  29,  31,  39,  41,  43,  48,  60,
- 72,  79,  106,  136,  166,  187,  224,  252,  323,  381,
- 427,  478,  568,  660,  783,  912,  1046,  1175,  1365,  1567,
- 1768,  2024,  2347,  2659,  3049,  3529,  4033,  4623,  5281,  5925,
- 6726,  7526,  8417,  9468,  10783,  12141,  13571,  15222,  16916,  18659,
- 20350,  22020,  23725,  25497,  27201,  29026,  30867,  32632,  34323,  36062,
- 37829,  39466,  41144,  42654,  43981,  45343,  46579,  47759,  49013,  50171,
- 51249,  52283,  53245,  54148,  54938,  55669,  56421,  57109,  57791,  58464,
- 59092,  59674,  60105,  60653,  61083,  61407,  61757,  62095,  62388,  62649,
- 62873,  63157,  63358,  63540,  63725,  63884,  64046,  64155,  64278,  64426,
- 64548,  64654,  64806,  64906,  64994,  65077,  65137,  65215,  65277,  65324,
- 65354,  65409,  65437,  65455,  65462,  65490,  65495,  65499,  65508,  65511,
- 65513,  65515,  65517,  65519,  65521,  65523,  65525,  65527,  65529,  65531,
- 65533,  65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQKltCdfShape[2059] = {
- 0,  65535,  0,  65535,  0,  65535,  0,  65535,  0,  65535,
- 0,  65535,  0,  65535,  0,  65535,  0,  65535,  0,  4,
- 65535,  0,  8,  65514,  65535,  0,  29,  65481,  65535,  0,
- 121,  65439,  65535,  0,  239,  65284,  65535,  0,  8,  779,
- 64999,  65527,  65535,  0,  8,  888,  64693,  65522,  65535,  0,
- 29,  2604,  62843,  65497,  65531,  65535,  0,  25,  176,  4576,
- 61164,  65275,  65527,  65535,  0,  65535,  0,  65535,  0,  65535,
- 0,  65535,  0,  4,  65535,  0,  65535,  0,  65535,  0,
- 65535,  0,  65535,  0,  4,  65535,  0,  33,  65502,  65535,
- 0,  54,  65481,  65535,  0,  251,  65309,  65535,  0,  611,
- 65074,  65535,  0,  1273,  64292,  65527,  65535,  0,  4,  1809,
- 63940,  65518,  65535,  0,  88,  4392,  60603,  65426,  65531,  65535,
- 0,  25,  419,  7046,  57756,  64961,  65514,  65531,  65535,  0,
- 65535,  0,  65535,  0,  65535,  0,  65535,  0,  4,  65531,
- 65535,  0,  65535,  0,  8,  65531,  65535,  0,  4,  65527,
- 65535,  0,  17,  65510,  65535,  0,  42,  65481,  65535,  0,
- 197,  65342,  65531,  65535,  0,  385,  65154,  65535,  0,  1005,
- 64522,  65535,  0,  8,  1985,  63469,  65533,  65535,  0,  38,
- 3119,  61884,  65514,  65535,  0,  4,  6,  67,  4961,  60804,
- 65472,  65535,  0,  17,  565,  9182,  56538,  65087,  65514,  65535,
- 0,  8,  63,  327,  2118,  14490,  52774,  63839,  65376,  65522,
- 65535,  0,  65535,  0,  65535,  0,  65535,  0,  65535,  0,
- 17,  65522,  65535,  0,  59,  65489,  65535,  0,  50,  65522,
- 65535,  0,  54,  65489,  65535,  0,  310,  65179,  65535,  0,
- 615,  64836,  65535,  0,  4,  1503,  63965,  65535,  0,  2780,
- 63383,  65535,  0,  21,  3919,  61051,  65527,  65535,  0,  84,
- 6674,  59929,  65435,  65535,  0,  4,  255,  7976,  55784,  65150,
- 65518,  65531,  65535,  0,  4,  8,  582,  10726,  53465,  64949,
- 65518,  65535,  0,  29,  339,  3006,  17555,  49517,  62956,  65200,
- 65497,  65531,  65535,  0,  2,  33,  138,  565,  2324,  7670,
- 22089,  45966,  58949,  63479,  64966,  65380,  65518,  65535,  0,  65535,
- 0,  65535,  0,  2,  65533,  65535,  0,  46,  65514,  65535,
- 0,  414,  65091,  65535,  0,  540,  64911,  65535,  0,  419,
- 65162,  65535,  0,  976,  64790,  65535,  0,  2977,  62495,  65531,
- 65535,  0,  4,  3852,  61034,  65527,  65535,  0,  4,  29,
- 6021,  60243,  65468,  65535,  0,  84,  6711,  58066,  65418,  65535,
- 0,  13,  281,  9550,  54917,  65125,  65506,  65535,  0,  2,
- 63,  984,  12108,  52644,  64342,  65435,  65527,  65535,  0,  29,
- 251,  2014,  14871,  47553,  62881,  65229,  65518,  65535,  0,  13,
- 142,  749,  4220,  18497,  45200,  60913,  64823,  65426,  65527,  65535,
- 0,  13,  71,  264,  1176,  3789,  10500,  24480,  43488,  56324,
- 62315,  64493,  65242,  65464,  65514,  65522,  65531,  65535,  0,  4,
- 13,  38,  109,  205,  448,  850,  1708,  3429,  6276,  11371,
- 19221,  29734,  40955,  49391,  55411,  59460,  62102,  63793,  64656,  65150,
- 65401,  65485,  65522,  65531,  65535,  0,  65535,  0,  2,  65533,
- 65535,  0,  1160,  65476,  65535,  0,  2,  6640,  64763,  65533,
- 65535,  0,  2,  38,  9923,  61009,  65527,  65535,  0,  2,
- 4949,  63092,  65533,  65535,  0,  2,  3090,  63398,  65533,  65535,
- 0,  2,  2520,  58744,  65510,  65535,  0,  2,  13,  544,
- 8784,  51403,  65148,  65533,  65535,  0,  2,  25,  1017,  10412,
- 43550,  63651,  65489,  65527,  65535,  0,  2,  4,  29,  783,
- 13377,  52462,  64524,  65495,  65533,  65535,  0,  2,  4,  6,
- 100,  1817,  18451,  52590,  63559,  65376,  65531,  65535,  0,  2,
- 4,  6,  46,  385,  2562,  11225,  37416,  60488,  65026,  65487,
- 65529,  65533,  65535,  0,  2,  4,  6,  8,  10,  12,
- 42,  222,  971,  5221,  19811,  45048,  60312,  64486,  65294,  65474,
- 65525,  65529,  65533,  65535,  0,  2,  4,  8,  71,  167,
- 666,  2533,  7875,  19622,  38082,  54359,  62108,  64633,  65290,  65495,
- 65529,  65533,  65535,  0,  2,  4,  6,  8,  10,  13,
- 109,  586,  1930,  4949,  11600,  22641,  36125,  48312,  56899,  61495,
- 63927,  64932,  65389,  65489,  65518,  65531,  65533,  65535,  0,  4,
- 6,  8,  67,  209,  712,  1838,  4195,  8432,  14432,  22834,
- 31723,  40523,  48139,  53929,  57865,  60657,  62403,  63584,  64363,  64907,
- 65167,  65372,  65472,  65514,  65535,  0,  2,  4,  13,  25,
- 42,  46,  50,  75,  113,  147,  281,  448,  657,  909,
- 1185,  1591,  1976,  2600,  3676,  5317,  7398,  9914,  12941,  16169,
- 19477,  22885,  26464,  29851,  33360,  37228,  41139,  44802,  48654,  52058,
- 55181,  57676,  59581,  61022,  62190,  63107,  63676,  64199,  64547,  64924,
- 65158,  65313,  65430,  65481,  65518,  65535,  0,  65535,  0,  65535,
- 0,  65535,  0,  65535,  0,  65533,  65535,  0,  65535,  0,
- 65535,  0,  65535,  0,  65533,  65535,  0,  2,  65535,  0,
- 2,  65533,  65535,  0,  2,  65533,  65535,  0,  2,  65533,
- 65535,  0,  2,  4,  65533,  65535,  0,  2,  65533,  65535,
- 0,  2,  4,  65531,  65533,  65535,  0,  2,  4,  65531,
- 65533,  65535,  0,  2,  4,  6,  65524,  65533,  65535,  0,
- 65535,  0,  65535,  0,  65535,  0,  65535,  0,  65535,  0,
- 65535,  0,  65535,  0,  65535,  0,  65533,  65535,  0,  65533,
- 65535,  0,  2,  65533,  65535,  0,  2,  65533,  65535,  0,
- 2,  65533,  65535,  0,  2,  4,  65532,  65535,  0,  6,
- 65523,  65535,  0,  2,  15,  65530,  65533,  65535,  0,  2,
- 35,  65493,  65531,  65533,  65535,  0,  2,  4,  158,  65382,
- 65531,  65533,  65535,  0,  65535,  0,  65535,  0,  65535,  0,
- 65535,  0,  65535,  0,  65535,  0,  2,  65535,  0,  2,
- 65533,  65535,  0,  2,  65533,  65535,  0,  2,  65533,  65535,
- 0,  2,  65533,  65535,  0,  9,  65512,  65535,  0,  2,
- 12,  65529,  65535,  0,  2,  73,  65434,  65533,  65535,  0,
- 2,  240,  65343,  65533,  65535,  0,  2,  476,  65017,  65531,
- 65533,  65535,  0,  2,  4,  1046,  64686,  65531,  65533,  65535,
- 0,  2,  4,  6,  8,  1870,  63898,  65529,  65531,  65533,
- 65535,  0,  65535,  0,  65535,  0,  65535,  0,  65533,  65535,
- 0,  2,  65533,  65535,  0,  2,  65533,  65535,  0,  2,
- 65532,  65535,  0,  6,  65533,  65535,  0,  6,  65523,  65535,
- 0,  2,  65532,  65535,  0,  137,  65439,  65535,  0,  576,
- 64899,  65533,  65535,  0,  2,  289,  65299,  65533,  65535,  0,
- 2,  4,  6,  880,  64134,  65531,  65533,  65535,  0,  2,
- 4,  1853,  63347,  65533,  65535,  0,  2,  6,  2516,  61762,
- 65529,  65531,  65533,  65535,  0,  2,  4,  9,  3980,  61380,
- 65503,  65529,  65531,  65533,  65535,  0,  2,  4,  6,  8,
- 10,  12,  61,  6393,  59859,  65466,  65527,  65529,  65531,  65533,
- 65535,  0,  65535,  0,  65535,  0,  65535,  0,  2,  65532,
- 65535,  0,  3,  65529,  65535,  0,  2,  65529,  65535,  0,
- 61,  65453,  65535,  0,  234,  65313,  65535,  0,  503,  65138,
- 65535,  0,  155,  65402,  65533,  65535,  0,  2,  1058,  64554,
- 65533,  65535,  0,  2,  4,  3138,  62109,  65531,  65533,  65535,
- 0,  2,  4,  2031,  63339,  65531,  65533,  65535,  0,  2,
- 4,  6,  9,  4155,  60778,  65523,  65529,  65531,  65533,  65535,
- 0,  2,  4,  41,  6189,  59269,  65490,  65531,  65533,  65535,
- 0,  2,  4,  6,  210,  8789,  57043,  65400,  65528,  65531,
- 65533,  65535,  0,  2,  4,  6,  8,  26,  453,  10086,
- 55499,  64948,  65483,  65524,  65527,  65529,  65531,  65533,  65535,  0,
- 2,  4,  6,  8,  10,  12,  14,  16,  18,  20,
- 114,  1014,  11202,  52670,  64226,  65356,  65503,  65514,  65523,  65525,
- 65527,  65529,  65531,  65533,  65535,  0,  65533,  65535,  0,  15,
- 65301,  65535,  0,  152,  64807,  65535,  0,  2,  3328,  63308,
- 65535,  0,  2,  4050,  59730,  65533,  65535,  0,  2,  164,
- 10564,  61894,  65529,  65535,  0,  15,  6712,  59831,  65076,  65532,
- 65535,  0,  32,  7712,  57449,  65459,  65535,  0,  2,  210,
- 7849,  53110,  65021,  65523,  65535,  0,  2,  12,  1081,  13883,
- 48262,  62870,  65477,  65535,  0,  2,  88,  847,  6145,  37852,
- 62012,  65454,  65533,  65535,  0,  9,  47,  207,  1823,  14522,
- 45521,  61069,  64891,  65481,  65528,  65531,  65533,  65535,  0,  2,
- 9,  488,  2881,  12758,  38703,  58412,  64420,  65410,  65533,  65535,
- 0,  2,  4,  6,  61,  333,  1891,  6486,  19720,  43188,
- 57547,  62472,  64796,  65421,  65497,  65523,  65529,  65531,  65533,  65535,
- 0,  2,  4,  6,  8,  10,  12,  29,  117,  447,
- 1528,  6138,  21242,  43133,  56495,  62432,  64746,  65362,  65500,  65529,
- 65531,  65533,  65535,  0,  2,  18,  105,  301,  760,  1490,
- 3472,  7568,  15002,  26424,  40330,  53029,  60048,  62964,  64274,  64890,
- 65337,  65445,  65489,  65513,  65527,  65530,  65533,  65535,  0,  2,
- 4,  6,  41,  102,  409,  853,  2031,  4316,  7302,  11328,
- 16869,  24825,  34926,  43481,  50877,  56126,  59874,  62103,  63281,  63857,
- 64166,  64675,  65382,  65522,  65531,  65533,  65535,  0,  2,  4,
- 6,  8,  10,  12,  14,  16,  18,  29,  38,  53,
- 58,  96,  181,  503,  1183,  2849,  5590,  8600,  11379,  13942,
- 16478,  19453,  22638,  26039,  29411,  32921,  37596,  41433,  44998,  48560,
- 51979,  55106,  57666,  59892,  61485,  62616,  63484,  64018,  64375,  64685,
- 64924,  65076,  65278,  65395,  65471,  65509,  65529,  65535,  0,  65535,
- 0,  65535,  0,  65535,  0,  65535,  0,  65535,  0,  65535,
- 0,  65535,  0,  65535,  0,  2,  65533,  65535,  0,  2,
- 65533,  65535,  0,  2,  65533,  65535,  0,  2,  65533,  65535,
- 0,  2,  65533,  65535,  0,  2,  65533,  65535,  0,  7,
- 65519,  65535,  0,  2,  14,  65491,  65533,  65535,  0,  2,
- 81,  65427,  65531,  65533,  65535,  0,  2,  4,  312,  65293,
- 65528,  65533,  65535,  0,  65535,  0,  65535,  0,  65535,  0,
- 65535,  0,  65535,  0,  65535,  0,  65535,  0,  65535,  0,
- 2,  65533,  65535,  0,  2,  65533,  65535,  0,  2,  65533,
- 65535,  0,  5,  65523,  65535,  0,  2,  65533,  65535,  0,
- 7,  65526,  65535,  0,  46,  65464,  65533,  65535,  0,  2,
- 120,  65309,  65533,  65535,  0,  2,  5,  362,  65097,  65533,
- 65535,  0,  2,  18,  1164,  64785,  65528,  65531,  65533,  65535,
- 0,  65535,  0,  65535,  0,  65535,  0,  65533,  65535,  0,
- 65535,  0,  65533,  65535,  0,  2,  65533,  65535,  0,  2,
- 65533,  65535,  0,  2,  65533,  65535,  0,  2,  65530,  65535,
- 0,  2,  65523,  65535,  0,  69,  65477,  65535,  0,  141,
- 65459,  65535,  0,  194,  65325,  65533,  65535,  0,  2,  543,
- 64912,  65533,  65535,  0,  5,  1270,  64301,  65529,  65531,  65533,
- 65535,  0,  2,  4,  12,  2055,  63538,  65508,  65531,  65533,
- 65535,  0,  2,  7,  102,  3775,  61970,  65429,  65526,  65528,
- 65533,  65535,  0,  65535,  0,  65535,  0,  65535,  0,  2,
- 65533,  65535,  0,  2,  65535,  0,  9,  65533,  65535,  0,
- 25,  65512,  65535,  0,  2,  65533,  65535,  0,  44,  65480,
- 65535,  0,  48,  65475,  65535,  0,  162,  65373,  65535,  0,
- 637,  64806,  65533,  65535,  0,  2,  935,  64445,  65533,  65535,
- 0,  2,  4,  1662,  64083,  65533,  65535,  0,  2,  12,
- 3036,  62469,  65521,  65533,  65535,  0,  2,  120,  5405,  60468,
- 65469,  65531,  65533,  65535,  0,  2,  4,  18,  254,  6663,
- 58999,  65272,  65528,  65533,  65535,  0,  2,  4,  9,  12,
- 67,  591,  8981,  56781,  64564,  65365,  65508,  65524,  65526,  65529,
- 65531,  65533,  65535,  0,  65535,  0,  65535,  0,  2,  65533,
- 65535,  0,  9,  65526,  65535,  0,  14,  65503,  65535,  0,
- 127,  65390,  65535,  0,  517,  64990,  65535,  0,  178,  65330,
- 65535,  0,  2,  1055,  64533,  65533,  65535,  0,  2,  1558,
- 63942,  65533,  65535,  0,  2,  2205,  63173,  65533,  65535,  0,
- 25,  4493,  60862,  65505,  65533,  65535,  0,  2,  48,  5890,
- 59442,  65482,  65533,  65535,  0,  2,  4,  127,  7532,  58191,
- 65394,  65533,  65535,  0,  2,  5,  32,  550,  10388,  54924,
- 65046,  65510,  65531,  65533,  65535,  0,  2,  4,  30,  150,
- 1685,  14340,  51375,  63619,  65288,  65503,  65528,  65533,  65535,  0,
- 2,  4,  6,  8,  28,  97,  473,  2692,  15407,  50020,
- 62880,  65064,  65445,  65508,  65531,  65533,  65535,  0,  2,  4,
- 12,  32,  79,  150,  372,  907,  2184,  5868,  18207,  45431,
- 59856,  64031,  65096,  65401,  65481,  65507,  65521,  65523,  65525,  65527,
- 65529,  65531,  65533,  65535,  0,  65533,  65535,  0,  182,  65491,
- 65535,  0,  877,  64286,  65535,  0,  9,  2708,  63612,  65533,
- 65535,  0,  2,  6038,  59532,  65535,  0,  2,  92,  5500,
- 60539,  65533,  65535,  0,  268,  8908,  56512,  65385,  65535,  0,
- 129,  13110,  52742,  65036,  65535,  0,  2,  806,  14003,  51929,
- 64732,  65523,  65535,  0,  7,  92,  2667,  18159,  47678,  62610,
- 65355,  65535,  0,  32,  1836,  19676,  48237,  61677,  64960,  65526,
- 65535,  0,  21,  159,  967,  5668,  22782,  44709,  58317,  64020,
- 65406,  65528,  65535,  0,  7,  162,  1838,  8328,  23929,  43014,
- 56394,  63374,  65216,  65484,  65521,  65535,  0,  2,  4,  6,
- 28,  268,  1120,  3613,  10688,  24185,  40989,  54917,  61684,  64510,
- 65403,  65530,  65535,  0,  2,  16,  44,  139,  492,  1739,
- 5313,  13558,  26766,  41566,  52446,  58937,  62815,  64480,  65201,  65454,
- 65524,  65533,  65535,  0,  7,  25,  76,  263,  612,  1466,
- 3325,  6832,  12366,  20152,  29466,  39255,  47360,  53506,  57740,  60726,
- 62845,  64131,  64882,  65260,  65459,  65521,  65528,  65530,  65535,  0,
- 2,  4,  14,  48,  136,  312,  653,  1240,  2369,  4327,
- 7028,  10759,  15449,  21235,  28027,  35386,  42938,  49562,  54990,  59119,
- 62086,  63916,  64863,  65249,  65445,  65493,  65523,  65535,  0,  2,
- 4,  6,  8,  10,  12,  21,  83,  208,  409,  723,
- 1152,  1868,  2951,  4463,  6460,  8979,  11831,  15195,  18863,  22657,
- 26762,  30881,  34963,  39098,  43054,  47069,  50620,  53871,  56821,  59386,
- 61340,  62670,  63512,  64023,  64429,  64750,  64944,  65126,  65279,  65366,
- 65413,  65445,  65473,  65505,  65510,  65521,  65528,  65530,  65535};
-
-/* pointers to cdf tables for quantizer indices */
-const WebRtc_UWord16 *WebRtcIsac_kQKltCdfPtrGain[3][12] = {
-{WebRtcIsac_kQKltCdfGain +0 +0, WebRtcIsac_kQKltCdfGain +0 +8, WebRtcIsac_kQKltCdfGain +0 +22, WebRtcIsac_kQKltCdfGain +0 +32, WebRtcIsac_kQKltCdfGain +0 +48, WebRtcIsac_kQKltCdfGain +0 +60, WebRtcIsac_kQKltCdfGain +0 +81, WebRtcIsac_kQKltCdfGain +0 +95, WebRtcIsac_kQKltCdfGain +0 +128, WebRtcIsac_kQKltCdfGain +0 +152,
-WebRtcIsac_kQKltCdfGain +0 +210, WebRtcIsac_kQKltCdfGain +0 +264},
-{WebRtcIsac_kQKltCdfGain +404 +0, WebRtcIsac_kQKltCdfGain +404 +8, WebRtcIsac_kQKltCdfGain +404 +21, WebRtcIsac_kQKltCdfGain +404 +30, WebRtcIsac_kQKltCdfGain +404 +46, WebRtcIsac_kQKltCdfGain +404 +58, WebRtcIsac_kQKltCdfGain +404 +79, WebRtcIsac_kQKltCdfGain +404 +93, WebRtcIsac_kQKltCdfGain +404 +125, WebRtcIsac_kQKltCdfGain +404 +149,
-WebRtcIsac_kQKltCdfGain +404 +207, WebRtcIsac_kQKltCdfGain +404 +260},
-{WebRtcIsac_kQKltCdfGain +803 +0, WebRtcIsac_kQKltCdfGain +803 +8, WebRtcIsac_kQKltCdfGain +803 +22, WebRtcIsac_kQKltCdfGain +803 +31, WebRtcIsac_kQKltCdfGain +803 +48, WebRtcIsac_kQKltCdfGain +803 +60, WebRtcIsac_kQKltCdfGain +803 +81, WebRtcIsac_kQKltCdfGain +803 +96, WebRtcIsac_kQKltCdfGain +803 +129, WebRtcIsac_kQKltCdfGain +803 +154,
-WebRtcIsac_kQKltCdfGain +803 +212, WebRtcIsac_kQKltCdfGain +803 +268}};
-
-const WebRtc_UWord16 *WebRtcIsac_kQKltCdfPtrShape[3][108] = {
-{WebRtcIsac_kQKltCdfShape +0 +0, WebRtcIsac_kQKltCdfShape +0 +2, WebRtcIsac_kQKltCdfShape +0 +4, WebRtcIsac_kQKltCdfShape +0 +6, WebRtcIsac_kQKltCdfShape +0 +8, WebRtcIsac_kQKltCdfShape +0 +10, WebRtcIsac_kQKltCdfShape +0 +12, WebRtcIsac_kQKltCdfShape +0 +14, WebRtcIsac_kQKltCdfShape +0 +16, WebRtcIsac_kQKltCdfShape +0 +18,
-WebRtcIsac_kQKltCdfShape +0 +21, WebRtcIsac_kQKltCdfShape +0 +25, WebRtcIsac_kQKltCdfShape +0 +29, WebRtcIsac_kQKltCdfShape +0 +33, WebRtcIsac_kQKltCdfShape +0 +37, WebRtcIsac_kQKltCdfShape +0 +43, WebRtcIsac_kQKltCdfShape +0 +49, WebRtcIsac_kQKltCdfShape +0 +56, WebRtcIsac_kQKltCdfShape +0 +64, WebRtcIsac_kQKltCdfShape +0 +66,
-WebRtcIsac_kQKltCdfShape +0 +68, WebRtcIsac_kQKltCdfShape +0 +70, WebRtcIsac_kQKltCdfShape +0 +72, WebRtcIsac_kQKltCdfShape +0 +75, WebRtcIsac_kQKltCdfShape +0 +77, WebRtcIsac_kQKltCdfShape +0 +79, WebRtcIsac_kQKltCdfShape +0 +81, WebRtcIsac_kQKltCdfShape +0 +83, WebRtcIsac_kQKltCdfShape +0 +86, WebRtcIsac_kQKltCdfShape +0 +90,
-WebRtcIsac_kQKltCdfShape +0 +94, WebRtcIsac_kQKltCdfShape +0 +98, WebRtcIsac_kQKltCdfShape +0 +102, WebRtcIsac_kQKltCdfShape +0 +107, WebRtcIsac_kQKltCdfShape +0 +113, WebRtcIsac_kQKltCdfShape +0 +120, WebRtcIsac_kQKltCdfShape +0 +129, WebRtcIsac_kQKltCdfShape +0 +131, WebRtcIsac_kQKltCdfShape +0 +133, WebRtcIsac_kQKltCdfShape +0 +135,
-WebRtcIsac_kQKltCdfShape +0 +137, WebRtcIsac_kQKltCdfShape +0 +141, WebRtcIsac_kQKltCdfShape +0 +143, WebRtcIsac_kQKltCdfShape +0 +147, WebRtcIsac_kQKltCdfShape +0 +151, WebRtcIsac_kQKltCdfShape +0 +155, WebRtcIsac_kQKltCdfShape +0 +159, WebRtcIsac_kQKltCdfShape +0 +164, WebRtcIsac_kQKltCdfShape +0 +168, WebRtcIsac_kQKltCdfShape +0 +172,
-WebRtcIsac_kQKltCdfShape +0 +178, WebRtcIsac_kQKltCdfShape +0 +184, WebRtcIsac_kQKltCdfShape +0 +192, WebRtcIsac_kQKltCdfShape +0 +200, WebRtcIsac_kQKltCdfShape +0 +211, WebRtcIsac_kQKltCdfShape +0 +213, WebRtcIsac_kQKltCdfShape +0 +215, WebRtcIsac_kQKltCdfShape +0 +217, WebRtcIsac_kQKltCdfShape +0 +219, WebRtcIsac_kQKltCdfShape +0 +223,
-WebRtcIsac_kQKltCdfShape +0 +227, WebRtcIsac_kQKltCdfShape +0 +231, WebRtcIsac_kQKltCdfShape +0 +235, WebRtcIsac_kQKltCdfShape +0 +239, WebRtcIsac_kQKltCdfShape +0 +243, WebRtcIsac_kQKltCdfShape +0 +248, WebRtcIsac_kQKltCdfShape +0 +252, WebRtcIsac_kQKltCdfShape +0 +258, WebRtcIsac_kQKltCdfShape +0 +264, WebRtcIsac_kQKltCdfShape +0 +273,
-WebRtcIsac_kQKltCdfShape +0 +282, WebRtcIsac_kQKltCdfShape +0 +293, WebRtcIsac_kQKltCdfShape +0 +308, WebRtcIsac_kQKltCdfShape +0 +310, WebRtcIsac_kQKltCdfShape +0 +312, WebRtcIsac_kQKltCdfShape +0 +316, WebRtcIsac_kQKltCdfShape +0 +320, WebRtcIsac_kQKltCdfShape +0 +324, WebRtcIsac_kQKltCdfShape +0 +328, WebRtcIsac_kQKltCdfShape +0 +332,
-WebRtcIsac_kQKltCdfShape +0 +336, WebRtcIsac_kQKltCdfShape +0 +341, WebRtcIsac_kQKltCdfShape +0 +347, WebRtcIsac_kQKltCdfShape +0 +354, WebRtcIsac_kQKltCdfShape +0 +360, WebRtcIsac_kQKltCdfShape +0 +368, WebRtcIsac_kQKltCdfShape +0 +378, WebRtcIsac_kQKltCdfShape +0 +388, WebRtcIsac_kQKltCdfShape +0 +400, WebRtcIsac_kQKltCdfShape +0 +418,
-WebRtcIsac_kQKltCdfShape +0 +445, WebRtcIsac_kQKltCdfShape +0 +447, WebRtcIsac_kQKltCdfShape +0 +451, WebRtcIsac_kQKltCdfShape +0 +455, WebRtcIsac_kQKltCdfShape +0 +461, WebRtcIsac_kQKltCdfShape +0 +468, WebRtcIsac_kQKltCdfShape +0 +474, WebRtcIsac_kQKltCdfShape +0 +480, WebRtcIsac_kQKltCdfShape +0 +486, WebRtcIsac_kQKltCdfShape +0 +495,
-WebRtcIsac_kQKltCdfShape +0 +505, WebRtcIsac_kQKltCdfShape +0 +516, WebRtcIsac_kQKltCdfShape +0 +528, WebRtcIsac_kQKltCdfShape +0 +543, WebRtcIsac_kQKltCdfShape +0 +564, WebRtcIsac_kQKltCdfShape +0 +583, WebRtcIsac_kQKltCdfShape +0 +608, WebRtcIsac_kQKltCdfShape +0 +635},
-{WebRtcIsac_kQKltCdfShape +686 +0, WebRtcIsac_kQKltCdfShape +686 +2, WebRtcIsac_kQKltCdfShape +686 +4, WebRtcIsac_kQKltCdfShape +686 +6, WebRtcIsac_kQKltCdfShape +686 +8, WebRtcIsac_kQKltCdfShape +686 +11, WebRtcIsac_kQKltCdfShape +686 +13, WebRtcIsac_kQKltCdfShape +686 +15, WebRtcIsac_kQKltCdfShape +686 +17, WebRtcIsac_kQKltCdfShape +686 +20,
-WebRtcIsac_kQKltCdfShape +686 +23, WebRtcIsac_kQKltCdfShape +686 +27, WebRtcIsac_kQKltCdfShape +686 +31, WebRtcIsac_kQKltCdfShape +686 +35, WebRtcIsac_kQKltCdfShape +686 +40, WebRtcIsac_kQKltCdfShape +686 +44, WebRtcIsac_kQKltCdfShape +686 +50, WebRtcIsac_kQKltCdfShape +686 +56, WebRtcIsac_kQKltCdfShape +686 +63, WebRtcIsac_kQKltCdfShape +686 +65,
-WebRtcIsac_kQKltCdfShape +686 +67, WebRtcIsac_kQKltCdfShape +686 +69, WebRtcIsac_kQKltCdfShape +686 +71, WebRtcIsac_kQKltCdfShape +686 +73, WebRtcIsac_kQKltCdfShape +686 +75, WebRtcIsac_kQKltCdfShape +686 +77, WebRtcIsac_kQKltCdfShape +686 +79, WebRtcIsac_kQKltCdfShape +686 +82, WebRtcIsac_kQKltCdfShape +686 +85, WebRtcIsac_kQKltCdfShape +686 +89,
-WebRtcIsac_kQKltCdfShape +686 +93, WebRtcIsac_kQKltCdfShape +686 +97, WebRtcIsac_kQKltCdfShape +686 +102, WebRtcIsac_kQKltCdfShape +686 +106, WebRtcIsac_kQKltCdfShape +686 +112, WebRtcIsac_kQKltCdfShape +686 +119, WebRtcIsac_kQKltCdfShape +686 +127, WebRtcIsac_kQKltCdfShape +686 +129, WebRtcIsac_kQKltCdfShape +686 +131, WebRtcIsac_kQKltCdfShape +686 +133,
-WebRtcIsac_kQKltCdfShape +686 +135, WebRtcIsac_kQKltCdfShape +686 +137, WebRtcIsac_kQKltCdfShape +686 +139, WebRtcIsac_kQKltCdfShape +686 +142, WebRtcIsac_kQKltCdfShape +686 +146, WebRtcIsac_kQKltCdfShape +686 +150, WebRtcIsac_kQKltCdfShape +686 +154, WebRtcIsac_kQKltCdfShape +686 +158, WebRtcIsac_kQKltCdfShape +686 +162, WebRtcIsac_kQKltCdfShape +686 +167,
-WebRtcIsac_kQKltCdfShape +686 +173, WebRtcIsac_kQKltCdfShape +686 +179, WebRtcIsac_kQKltCdfShape +686 +186, WebRtcIsac_kQKltCdfShape +686 +194, WebRtcIsac_kQKltCdfShape +686 +205, WebRtcIsac_kQKltCdfShape +686 +207, WebRtcIsac_kQKltCdfShape +686 +209, WebRtcIsac_kQKltCdfShape +686 +211, WebRtcIsac_kQKltCdfShape +686 +214, WebRtcIsac_kQKltCdfShape +686 +218,
-WebRtcIsac_kQKltCdfShape +686 +222, WebRtcIsac_kQKltCdfShape +686 +226, WebRtcIsac_kQKltCdfShape +686 +230, WebRtcIsac_kQKltCdfShape +686 +234, WebRtcIsac_kQKltCdfShape +686 +238, WebRtcIsac_kQKltCdfShape +686 +242, WebRtcIsac_kQKltCdfShape +686 +247, WebRtcIsac_kQKltCdfShape +686 +253, WebRtcIsac_kQKltCdfShape +686 +262, WebRtcIsac_kQKltCdfShape +686 +269,
-WebRtcIsac_kQKltCdfShape +686 +278, WebRtcIsac_kQKltCdfShape +686 +289, WebRtcIsac_kQKltCdfShape +686 +305, WebRtcIsac_kQKltCdfShape +686 +307, WebRtcIsac_kQKltCdfShape +686 +309, WebRtcIsac_kQKltCdfShape +686 +311, WebRtcIsac_kQKltCdfShape +686 +315, WebRtcIsac_kQKltCdfShape +686 +319, WebRtcIsac_kQKltCdfShape +686 +323, WebRtcIsac_kQKltCdfShape +686 +327,
-WebRtcIsac_kQKltCdfShape +686 +331, WebRtcIsac_kQKltCdfShape +686 +335, WebRtcIsac_kQKltCdfShape +686 +340, WebRtcIsac_kQKltCdfShape +686 +346, WebRtcIsac_kQKltCdfShape +686 +354, WebRtcIsac_kQKltCdfShape +686 +362, WebRtcIsac_kQKltCdfShape +686 +374, WebRtcIsac_kQKltCdfShape +686 +384, WebRtcIsac_kQKltCdfShape +686 +396, WebRtcIsac_kQKltCdfShape +686 +413,
-WebRtcIsac_kQKltCdfShape +686 +439, WebRtcIsac_kQKltCdfShape +686 +442, WebRtcIsac_kQKltCdfShape +686 +446, WebRtcIsac_kQKltCdfShape +686 +450, WebRtcIsac_kQKltCdfShape +686 +455, WebRtcIsac_kQKltCdfShape +686 +461, WebRtcIsac_kQKltCdfShape +686 +468, WebRtcIsac_kQKltCdfShape +686 +475, WebRtcIsac_kQKltCdfShape +686 +481, WebRtcIsac_kQKltCdfShape +686 +489,
-WebRtcIsac_kQKltCdfShape +686 +498, WebRtcIsac_kQKltCdfShape +686 +508, WebRtcIsac_kQKltCdfShape +686 +522, WebRtcIsac_kQKltCdfShape +686 +534, WebRtcIsac_kQKltCdfShape +686 +554, WebRtcIsac_kQKltCdfShape +686 +577, WebRtcIsac_kQKltCdfShape +686 +602, WebRtcIsac_kQKltCdfShape +686 +631},
-{WebRtcIsac_kQKltCdfShape +1368 +0, WebRtcIsac_kQKltCdfShape +1368 +2, WebRtcIsac_kQKltCdfShape +1368 +4, WebRtcIsac_kQKltCdfShape +1368 +6, WebRtcIsac_kQKltCdfShape +1368 +8, WebRtcIsac_kQKltCdfShape +1368 +10, WebRtcIsac_kQKltCdfShape +1368 +12, WebRtcIsac_kQKltCdfShape +1368 +14, WebRtcIsac_kQKltCdfShape +1368 +16, WebRtcIsac_kQKltCdfShape +1368 +20,
-WebRtcIsac_kQKltCdfShape +1368 +24, WebRtcIsac_kQKltCdfShape +1368 +28, WebRtcIsac_kQKltCdfShape +1368 +32, WebRtcIsac_kQKltCdfShape +1368 +36, WebRtcIsac_kQKltCdfShape +1368 +40, WebRtcIsac_kQKltCdfShape +1368 +44, WebRtcIsac_kQKltCdfShape +1368 +50, WebRtcIsac_kQKltCdfShape +1368 +57, WebRtcIsac_kQKltCdfShape +1368 +65, WebRtcIsac_kQKltCdfShape +1368 +67,
-WebRtcIsac_kQKltCdfShape +1368 +69, WebRtcIsac_kQKltCdfShape +1368 +71, WebRtcIsac_kQKltCdfShape +1368 +73, WebRtcIsac_kQKltCdfShape +1368 +75, WebRtcIsac_kQKltCdfShape +1368 +77, WebRtcIsac_kQKltCdfShape +1368 +79, WebRtcIsac_kQKltCdfShape +1368 +81, WebRtcIsac_kQKltCdfShape +1368 +85, WebRtcIsac_kQKltCdfShape +1368 +89, WebRtcIsac_kQKltCdfShape +1368 +93,
-WebRtcIsac_kQKltCdfShape +1368 +97, WebRtcIsac_kQKltCdfShape +1368 +101, WebRtcIsac_kQKltCdfShape +1368 +105, WebRtcIsac_kQKltCdfShape +1368 +110, WebRtcIsac_kQKltCdfShape +1368 +116, WebRtcIsac_kQKltCdfShape +1368 +123, WebRtcIsac_kQKltCdfShape +1368 +132, WebRtcIsac_kQKltCdfShape +1368 +134, WebRtcIsac_kQKltCdfShape +1368 +136, WebRtcIsac_kQKltCdfShape +1368 +138,
-WebRtcIsac_kQKltCdfShape +1368 +141, WebRtcIsac_kQKltCdfShape +1368 +143, WebRtcIsac_kQKltCdfShape +1368 +146, WebRtcIsac_kQKltCdfShape +1368 +150, WebRtcIsac_kQKltCdfShape +1368 +154, WebRtcIsac_kQKltCdfShape +1368 +158, WebRtcIsac_kQKltCdfShape +1368 +162, WebRtcIsac_kQKltCdfShape +1368 +166, WebRtcIsac_kQKltCdfShape +1368 +170, WebRtcIsac_kQKltCdfShape +1368 +174,
-WebRtcIsac_kQKltCdfShape +1368 +179, WebRtcIsac_kQKltCdfShape +1368 +185, WebRtcIsac_kQKltCdfShape +1368 +193, WebRtcIsac_kQKltCdfShape +1368 +203, WebRtcIsac_kQKltCdfShape +1368 +214, WebRtcIsac_kQKltCdfShape +1368 +216, WebRtcIsac_kQKltCdfShape +1368 +218, WebRtcIsac_kQKltCdfShape +1368 +220, WebRtcIsac_kQKltCdfShape +1368 +224, WebRtcIsac_kQKltCdfShape +1368 +227,
-WebRtcIsac_kQKltCdfShape +1368 +231, WebRtcIsac_kQKltCdfShape +1368 +235, WebRtcIsac_kQKltCdfShape +1368 +239, WebRtcIsac_kQKltCdfShape +1368 +243, WebRtcIsac_kQKltCdfShape +1368 +247, WebRtcIsac_kQKltCdfShape +1368 +251, WebRtcIsac_kQKltCdfShape +1368 +256, WebRtcIsac_kQKltCdfShape +1368 +262, WebRtcIsac_kQKltCdfShape +1368 +269, WebRtcIsac_kQKltCdfShape +1368 +277,
-WebRtcIsac_kQKltCdfShape +1368 +286, WebRtcIsac_kQKltCdfShape +1368 +297, WebRtcIsac_kQKltCdfShape +1368 +315, WebRtcIsac_kQKltCdfShape +1368 +317, WebRtcIsac_kQKltCdfShape +1368 +319, WebRtcIsac_kQKltCdfShape +1368 +323, WebRtcIsac_kQKltCdfShape +1368 +327, WebRtcIsac_kQKltCdfShape +1368 +331, WebRtcIsac_kQKltCdfShape +1368 +335, WebRtcIsac_kQKltCdfShape +1368 +339,
-WebRtcIsac_kQKltCdfShape +1368 +343, WebRtcIsac_kQKltCdfShape +1368 +349, WebRtcIsac_kQKltCdfShape +1368 +355, WebRtcIsac_kQKltCdfShape +1368 +361, WebRtcIsac_kQKltCdfShape +1368 +368, WebRtcIsac_kQKltCdfShape +1368 +376, WebRtcIsac_kQKltCdfShape +1368 +385, WebRtcIsac_kQKltCdfShape +1368 +397, WebRtcIsac_kQKltCdfShape +1368 +411, WebRtcIsac_kQKltCdfShape +1368 +429,
-WebRtcIsac_kQKltCdfShape +1368 +456, WebRtcIsac_kQKltCdfShape +1368 +459, WebRtcIsac_kQKltCdfShape +1368 +463, WebRtcIsac_kQKltCdfShape +1368 +467, WebRtcIsac_kQKltCdfShape +1368 +473, WebRtcIsac_kQKltCdfShape +1368 +478, WebRtcIsac_kQKltCdfShape +1368 +485, WebRtcIsac_kQKltCdfShape +1368 +491, WebRtcIsac_kQKltCdfShape +1368 +497, WebRtcIsac_kQKltCdfShape +1368 +505,
-WebRtcIsac_kQKltCdfShape +1368 +514, WebRtcIsac_kQKltCdfShape +1368 +523, WebRtcIsac_kQKltCdfShape +1368 +535, WebRtcIsac_kQKltCdfShape +1368 +548, WebRtcIsac_kQKltCdfShape +1368 +565, WebRtcIsac_kQKltCdfShape +1368 +585, WebRtcIsac_kQKltCdfShape +1368 +611, WebRtcIsac_kQKltCdfShape +1368 +640}};
-
-/* code length for all coefficients using different models */
-const double WebRtcIsac_kQKltCodeLenGain[392] = {
- 12.29956028,  7.83007500,  4.25642781,  0.17489215,  4.27591254,  7.66908312,  10.47643804, 11.91253716, 9.03421572,  8.57373525,
- 6.73555740,   5.41409855,  3.65237863,  0.42623449,  3.22418399,  5.68145719,  7.14201900,  8.20558413,  9.34178852,  13.00000000,
- 13.00000000,  9.47643804,  6.71459778,  3.55472644,  0.28457419,  3.70652835,  7.41128536,  11.60768258, 14.00000000, 12.29956028,
- 9.29956028,   8.02845645,  6.54878889,  5.07667251,  2.87749552,  0.65310542,  3.11316029,  4.87911416,  5.89540125,  6.76398581,
- 7.70537925,   9.67807191,  11.14201900, 14.00000000, 14.00000000, 12.29956028, 9.69621925,  7.70537925,  5.49915812,  2.67441345,
- 0.63381441,   2.74999773,  5.76877882,  8.41503750,  10.75207249, 14.00000000, 9.60768258,  8.85025288,  8.09913319,  7.09010692,
- 6.36337538,   5.46667027,  4.51618422,  2.64189829,  1.21843537,  2.43823474,  3.89409149,  4.99718498,  6.00989604,  6.78325414,
- 7.39637366,   8.76159526,  10.60768258, 11.67807191, 12.29956028, 9.54056838,  7.95560588,  5.63040265,  3.81264793,  2.18521728,
- 1.33727600,   2.37909290,  3.94981123,  5.52426657,  7.32051990,  8.84012866,  11.35614381, 13.00000000, 12.29956028, 11.35614381,
- 11.35614381,  10.24511250, 9.12963528,  8.80032766,  7.97763219,  7.83007500,  7.09913319,  6.68711704,  6.41879942,  5.74379131,
- 5.25096862,   4.43061904,  3.54492969,  2.72664147,  2.16306204,  2.71142226,  3.34357514,  4.07444556,  4.95151313,  5.68145719,
- 6.12041675,   6.55085135,  7.00282052,  7.55705650,  8.44541115,  9.41503750,  10.91253716, 11.60768258, 14.00000000, 14.00000000,
- 13.00000000,  11.60768258, 10.47643804, 8.80032766,  7.38161450,  6.52426657,  5.47447919,  4.53749773,  3.92719747,  3.41058292,
- 2.88495635,   2.79344346,  2.85805254,  3.18261657,  3.57216340,  4.08225499,  4.74438125,  5.51215997,  6.30477171,  7.15450995,
- 8.28575448,   9.69621925,  11.60768258, 13.00000000, 13.67807191, 15.00000000, 15.00000000, 14.00000000, 12.41503750, 11.29956028,
- 12.41503750,  11.60768258, 10.11735695, 9.47643804,  9.12963528,  9.41503750,  8.23181568,  7.97763219,  7.82507432,  7.50814690,
- 7.33466408,   6.99157138,  6.95834085,  6.80524315,  6.47447919,  6.35614381,  6.02128954,  5.71459778,  5.58109327,  5.05821876,
- 4.94539568,   4.59220115,  4.27591254,  4.01522554,  3.89376424,  3.83760867,  3.73321346,  3.74674342,  3.90493270,  4.18942837,
- 4.33599724,   4.42446075,  4.81760565,  5.07667251,  5.54570071,  5.95697272,  6.46667027,  6.91253716,  7.33466408,  7.82507432,
- 8.05163277,   9.12963528,  9.02272008,  9.77118131,  9.60768258,  10.11735695, 12.00000000, 12.83007500, 15.00000000, 15.00000000,
- 14.00000000,  15.00000000, 11.75207249, 12.29956028, 10.95560588, 9.93391081,  9.02272008,  8.00564656,  7.82507432,  7.28919357,
- 6.77599833,   6.56745810,  6.19910010,  6.23347109,  5.67694524,  5.41879942,  4.96039548,  4.88170777,  4.60768258,  4.52883287,
- 4.28876323,   4.17583679,  4.21332197,  4.14474217,  4.16119001,  4.12809476,  4.18501706,  4.28489599,  4.35299136,  4.60286019,
- 4.63040265,   4.81017544,  5.00989604,  5.33822190,  5.43489792,  5.84644797,  6.13272126,  6.75444729,  7.36337538,  7.96108101,
- 8.54056838,   9.28575448,  9.12963528,  9.47643804,  10.75207249, 12.29956028, 12.41503750, 11.14201900, 12.83007500, 15.00000000,
- 15.00000000,  15.00000000, 15.00000000, 15.00000000, 15.00000000, 14.00000000, 15.00000000, 15.00000000, 15.00000000, 15.00000000,
- 13.67807191,  12.41503750, 11.91253716, 11.60768258, 12.29956028, 13.00000000, 12.29956028, 10.95560588, 10.60768258, 9.77118131,
- 10.02272008,  10.11735695, 10.14201900, 10.75207249, 10.75207249, 9.69621925,  9.47643804,  9.75207249,  8.72387559,  8.47643804,
- 8.68711704,   8.40754296,  8.20558413,  8.26529038,  7.84518189,  7.89147554,  7.64685317,  7.41128536,  7.33466408,  7.42635281,
- 7.24845594,   7.11430363,  7.07518750,  7.07518750,  6.70537925,  6.64906082,  6.73555740,  6.62931259,  6.50015411,  6.26190774,
- 6.36337538,   6.19264508,  5.95151313,  6.08860801,  5.91253716,  5.83007500,  5.68145719,  5.67244736,  5.82632286,  6.00282052,
- 5.65348627,   5.74970158,  5.87846648,  5.69052365,  5.64464890,  5.58531476,  5.81512466,  5.57688409,  5.87329553,  5.62170514,
- 5.74851759,   5.81017544,  5.64464890,  5.76398581,  5.60339522,  5.69507833,  5.84139031,  5.68711704,  5.73908047,  5.84139031,
- 5.71459778,   5.96245305,  5.82632286,  5.89540125,  6.08860801,  6.12041675,  6.13272126,  6.30477171,  6.24177679,  6.28232358,
- 6.29091619,   6.53239445,  6.81512466,  6.72620440,  6.65792533,  6.84518189,  7.10215454,  7.44157929,  7.57793523,  7.59485854,
- 7.66460965,   8.05163277,  8.00564656,  8.43775758,  8.10518224,  8.28575448,  8.77118131,  8.23181568,  8.29264087,  8.20558413,
- 8.34894831,   8.89147554,  8.40754296,  8.61629571,  8.64244800,  8.61629571,  8.93391081,  8.50814690,  9.02272008,  8.68711704,
- 8.65127185,   9.41503750,  9.11735695,  9.85025288,  10.24511250, 10.60768258, 10.47643804, 11.60768258, 11.35614381, 12.29956028,
- 15.00000000,  15.00000000, 12.29956028, 13.00000000, 15.00000000, 15.00000000, 15.00000000, 15.00000000, 14.00000000, 12.83007500,
- 15.00000000,  15.00000000};
-
-const double WebRtcIsac_kQKltCodeLenShape[578] = {
- 0.00002201,  0.00002201,  0.00002201,  0.00002201,  0.00002201,  0.00002201,  0.00002201,  0.00002201,  0.00002201,  14.00000000,
- 0.00011007,  13.00000000,  0.00066056,  11.60768258,  11.14201900,  0.00185034,  10.24511250,  9.08113676,  0.00480700,  9.41503750,
- 8.09913319,  0.01084946,  8.02845645,  13.00000000,  6.40941295,  0.02926496,  6.95560588,  13.00000000,  13.00000000,  6.21864029,
- 0.03861814,  6.30477171,  12.29956028,  11.14201900,  4.66964328,  0.12158980,  4.62604734,  10.91253716,  14.00000000,  11.35614381,
- 8.76159526,  3.89671219,  0.21179147,  3.99472634,  8.02272008,  13.00000000,  0.00002201,  0.00002201,  0.00002201,  0.00002201,
- 14.00000000,  0.00011007,  0.00002201,  0.00002201,  0.00002201,  0.00002201,  14.00000000,  0.00011007,  10.95560588,  0.00147568,
- 10.95560588,  10.24511250,  0.00240150,  10.24511250,  8.02845645,  0.01056115,  8.17982104,  6.74497143,  0.02381629,  7.15137706,
- 5.68598330,  0.05650076,  5.72970467,  13.00000000,  14.00000000,  5.18221688,  0.07697435,  5.37611851,  11.91253716,  9.54056838,
- 3.92853764,  0.22143514,  3.76428491,  9.28575448,  14.00000000,  11.35614381,  7.37794818,  3.30585980,  0.37001735,  3.18521728,
- 6.88886433,  11.91253716,  14.00000000,  0.00002201,  0.00002201,  0.00002201,  0.00002201,  14.00000000,  0.00019814,  14.00000000,
- 0.00002201,  13.00000000,  0.00028621,  14.00000000,  14.00000000,  0.00028621,  13.00000000,  11.91253716,  0.00094690,  11.35614381,
- 10.60768258,  0.00213692,  10.24511250,  8.37794818,  0.00863317,  8.43775758,  14.00000000,  7.41128536,  0.01698415,  7.42635281,
- 6.02702021,  0.04514485,  6.01558154,  13.00000000,  5.05090284,  0.09207659,  4.98877274,  15.00000000,  10.75207249,  4.41081703,
- 0.15733047,  4.17424617,  11.60768258,  14.00000000,  15.00000000,  10.06926266,  3.74320161,  0.23091117,  3.81141115,  10.02272008,
- 11.91253716,  6.90196792,  2.92703003,  0.46874039,  2.93846004,  7.26190774,  11.60768258,  13.00000000,  10.21864029,  7.95560588,
- 5.19345038,  2.40520888,  0.77554605,  2.56628417,  5.41409855,  8.81017544,  12.29956028,  0.00002201,  0.00002201,  0.00002201,
- 0.00002201,  11.91253716,  0.00068259,  12.29956028,  10.11735695,  0.00233535,  10.47643804,  10.35614381,  0.00140957,  12.29956028,
- 10.24511250,  0.00222511,  10.47643804,  7.72387559,  0.01475842,  7.52426657,  6.73555740,  0.02924249,  6.55085135,  14.00000000,
- 5.45021533,  0.06930886,  5.38345116,  4.55913083,  0.11289841,  4.92853764,  11.60768258,  4.07148162,  0.19798859,  3.87200568,
- 13.00000000,  9.60768258,  3.31393725,  0.29937064,  3.57321111,  9.35614381,  14.00000000,  8.02845645,  3.08542800,  0.45503557,
- 2.80678268,  7.47643804,  12.29956028,  14.00000000,  14.00000000,  14.00000000,  6.83509307,  2.69166097,  0.61673447,  2.51266238,
- 6.84771516,  11.91253716,  11.14201900,  7.72387559,  4.61899789,  2.17136763,  1.03592993,  2.28586183,  4.86814304,  7.78568088,
- 10.91253716,  14.00000000,  15.00000000,  11.04580369,  9.28575448,  7.26190774,  5.21946023,  3.61575588,  2.18431651,  1.45666604,
- 2.33566383,  3.85470467,  5.46181107,  7.30651304,  8.89147554,  11.91253716,  0.00002201,  0.00002201,  15.00000000,  0.00011007,
- 15.00000000,  10.47643804,  0.00149771,  11.60768258,  7.30651304,  0.01903486,  7.20558413,  6.92318440,  0.02587674,  6.71459778,
- 7.28919357,  0.01756340,  7.45696818,  6.06926266,  0.03841465,  6.45890338,  4.46035649,  0.13896157,  4.43204392,  14.00000000,
- 14.00000000,  4.09010692,  0.19672654,  3.86653665,  13.00000000,  14.00000000,  11.35614381,  3.45117809,  0.27340929,  3.64878468,
- 9.93391081,  9.60768258,  3.30585980,  0.35178287,  3.15607895,  9.12963528,  12.29956028,  7.93391081,  2.82180202,  0.53064436,
- 2.68258739,  7.42635281,  11.14201900,  15.00000000,  10.06926266,  6.15294265,  2.55861197,  0.69308389,  2.48602573,  5.90592231,
- 9.47643804,  13.00000000,  11.14201900,  8.20558413,  5.21618324,  2.34973357,  1.00379135,  2.09611815,  4.80278331,  7.82507432,
- 11.91253716,  12.29956028,  8.98877274,  6.75444729,  4.23886435,  2.19859476,  1.29528579,  2.06032897,  4.06704711,  6.76398581,
- 9.34178852,  13.00000000,  12.29956028,  10.14201900,  8.40754296,  6.16710999,  4.64850859,  3.28768796,  2.22892326,  1.78568088,
- 2.35209193,  3.45141888,  4.91121176,  6.45117809,  8.20558413,  10.35614381,  13.00000000,  12.83007500,  14.00000000,  14.00000000,
- 12.83007500,  11.35614381,  9.85025288,  9.41503750,  8.07518750,  7.34894831,  6.25516616,  5.25096862,  4.52477322,  3.68513357,
- 3.06152306,  2.64011320,  2.54608637,  2.95765662,  3.44445223,  4.01665007,  4.63258525,  5.27633906,  6.24678325,  7.05163277,
- 8.02845645,  9.60768258,  10.79054663,  12.83007500,  14.00000000,  0.00002201,  15.00000000,  0.00011007,  15.00000000,  5.82009091,
- 0.02710994,  10.11735695,  15.00000000,  3.30346709,  0.17317845,  6.41128536,  15.00000000,  15.00000000,  10.83007500,  2.72897475,
- 0.35935964,  3.85853144,  13.00000000,  15.00000000,  3.72766182,  0.17268211,  4.74674342,  15.00000000,  15.00000000,  4.40754296,
- 0.11993823,  4.93997965,  15.00000000,  15.00000000,  4.70193743,  0.22110152,  3.27591254,  11.35614381,  15.00000000,  12.54056838,
- 6.94743195,  2.99157138,  0.62079088,  2.25338071,  7.41128536,  15.00000000,  15.00000000,  11.47643804,  6.04580369,  2.80232255,
- 0.98380109,  1.70502034,  5.15607895,  10.75207249,  13.00000000,  15.00000000,  15.00000000,  11.35614381,  6.44157929,  2.37955105,
- 0.74567258,  2.44181848,  6.07667251,  10.75207249,  15.00000000,  15.00000000,  15.00000000,  15.00000000,  9.44541115,  5.25432568,
- 1.97815248,  0.94086682,  2.57885561,  5.17265730,  8.72387559,  14.00000000,  15.00000000,  15.00000000,  15.00000000,  10.67807191,
- 7.59485854,  4.91187431,  2.91934900,  1.32321648,  1.50614455,  3.85215911,  7.15137706,  10.60768258,  14.00000000,  15.00000000,
- 15.00000000,  15.00000000,  15.00000000,  15.00000000,  15.00000000,  15.00000000,  11.09310940,  8.50814690,  6.45117809,  3.94675287,
- 2.16730774,  1.37674720,  2.10215454,  3.97278511,  6.34178852,  8.50814690,  10.32757466,  14.00000000,  14.00000000,  15.00000000,
- 15.00000000,  15.00000000,  14.00000000,  10.02272008,  9.41503750,  7.03710399,  5.13349379,  3.61683574,  2.47999526,  1.82788507,
- 2.00945280,  3.08020557,  4.69793233,  6.64025044,  8.32051990,  10.91253716,  14.00000000,  15.00000000,  15.00000000,  15.00000000,
- 15.00000000,  15.00000000,  15.00000000,  14.41503750,  9.41503750,  7.10215454,  5.60768258,  4.44014496,  3.30064444,  2.56941678,
- 2.28103909,  2.42694459,  2.93206152,  3.83383692,  4.75207249,  6.02702021,  7.16394964,  9.35614381,  11.14201900,  12.29956028,
- 15.00000000,  15.00000000,  14.00000000,  15.00000000,  15.00000000,  10.11735695,  8.85025288,  7.02558541,  5.86300889,  4.79726396,
- 3.95117259,  3.44925321,  2.96348293,  2.88219459,  2.89671219,  3.10518224,  3.50065237,  4.05748549,  4.55291677,  5.23016216,
- 5.79420675,  6.39452048,  6.91253716,  7.97763219,  8.32051990,  9.35614381,  10.60768258,  11.60768258,  15.00000000,  15.00000000,
- 12.83007500,  12.41503750,  11.91253716,  14.00000000,  14.00000000,  11.35614381,  10.75207249,  10.91253716,  8.93391081,  8.61629571,
- 8.29264087,  8.02272008,  7.89147554,  7.33466408,  7.41128536,  6.71459778,  5.92853764,  5.31964048,  4.97693875,  4.70308379,
- 4.43632704,  4.34357514,  4.30825648,  4.26529038,  4.19465917,  4.27420773,  4.22315577,  4.08262792,  4.06667818,  4.16119001,
- 4.08860801,  4.26698468,  4.39128315,  4.71517590,  5.10442472,  5.50714538,  5.81017544,  6.15922208};
-
-/* left KLT transforms */
-const double WebRtcIsac_kKltT1Gain[3][4] = {
-{-0.79742827,  0.60341375,  0.60341375,  0.79742827},
-{-0.81372390,  0.58125159,  0.58125159,  0.81372390},
-{-0.71832547,  0.69570721,  0.69570721,  0.71832547}};
-
-const double WebRtcIsac_kKltT1Shape[3][324] = {
-{ 0.00159597,  0.00049320,  0.00513821,  0.00021066,  0.01338581, -0.00422367, -0.00272072,  0.00935107,  0.02047622,  0.02691189,
- 0.00478236,  0.03969702,  0.00886698,  0.04877604, -0.10898362, -0.05930891, -0.03415047,  0.98889721,  0.00293558, -0.00035282,
- 0.01156321, -0.00195341, -0.00937631,  0.01052213, -0.02551163,  0.01644059,  0.03189927,  0.07754773, -0.08742313, -0.03026338,
- 0.05136248, -0.14395974,  0.17725040,  0.22664856,  0.93380230,  0.07076411,  0.00557890, -0.00222834,  0.01377569,  0.01466808,
- 0.02847361, -0.00603178,  0.02382480, -0.01210452,  0.03797267, -0.02371480,  0.11260335, -0.07366682,  0.00453436, -0.04136941,
--0.07912843, -0.95031418,  0.25295337, -0.05302216, -0.00617554, -0.00044040, -0.00653778,  0.01097838,  0.01529174,  0.01374431,
--0.00748512, -0.00020034,  0.02432713,  0.11101570, -0.08556891,  0.09282249, -0.01029446,  0.67556443, -0.67454300,  0.06910063,
- 0.20866865, -0.10318050,  0.00932175,  0.00524058,  0.00803610, -0.00594676, -0.01082578,  0.01069906,  0.00546768,  0.01565291,
- 0.06816200,  0.10201227,  0.16812734,  0.22984074,  0.58213170, -0.54138651, -0.51379962,  0.06847390, -0.01920037, -0.04592324,
--0.00467394,  0.00328858,  0.00377424, -0.00987448,  0.08222096, -0.00377301,  0.04551941, -0.02592517,  0.16317082,  0.13077530,
- 0.22702921, -0.31215289, -0.69645962, -0.38047101, -0.39339411,  0.11124777,  0.02508035, -0.00708074,  0.00400344,  0.00040331,
- 0.01142402,  0.01725406,  0.01635170,  0.14285366,  0.03949233, -0.05905676,  0.05877154, -0.17497577, -0.32479440,  0.80754464,
--0.38085603, -0.17055430, -0.03168622, -0.07531451,  0.02942002, -0.02148095, -0.00754114, -0.00322372,  0.00567812, -0.01701521,
--0.12358320,  0.11473564,  0.09070136,  0.06533068, -0.22560802,  0.19209022,  0.81605094,  0.36592275, -0.09919829,  0.16667122,
- 0.16300725,  0.04803807,  0.06739263, -0.00156752, -0.01685302, -0.00905240, -0.02297836, -0.00469939,  0.06310613, -0.16391930,
- 0.10919511,  0.12529293,  0.85581322, -0.32145522,  0.24539076,  0.07181839,  0.07289591,  0.14066759,  0.10406711,  0.05815518,
- 0.01072680, -0.00759339,  0.00053486, -0.00044865,  0.03407361,  0.01645348,  0.08758579,  0.27722240,  0.53665485, -0.74853376,
--0.01118192, -0.19805430,  0.06130619, -0.09675299,  0.08978480,  0.03405255, -0.00706867,  0.05102045,  0.03250746,  0.01849966,
--0.01216314, -0.01184187, -0.01579288,  0.00114807,  0.11376166,  0.88342114, -0.36425379,  0.13863190,  0.12524180, -0.13553892,
- 0.04715856, -0.12341103,  0.04531568,  0.01899360, -0.00206897,  0.00567768, -0.01444163,  0.00411946, -0.00855896,  0.00381663,
--0.01664861, -0.05534280,  0.21328278,  0.20161162,  0.72360394,  0.59130708, -0.08043791,  0.08757349, -0.13893918, -0.05147377,
- 0.02680690, -0.01144070,  0.00625162, -0.00634215, -0.01248947, -0.00329455, -0.00609625, -0.00136305, -0.05097048, -0.01029851,
- 0.25065384, -0.16856837, -0.07123372,  0.15992623, -0.39487617, -0.79972301,  0.18118185, -0.04826639, -0.01805578, -0.02927253,
--0.16400618,  0.07472763,  0.10376449,  0.01705406,  0.01065801, -0.01500498,  0.02039914,  0.37776349, -0.84484186,  0.10434286,
- 0.15616990,  0.13474456, -0.00906238, -0.25238368, -0.03820885, -0.10650905, -0.03880833, -0.03660028, -0.09640894,  0.00583314,
- 0.01922097,  0.01489911, -0.02431117, -0.09372217,  0.39404721, -0.84786223, -0.31277121,  0.03193850,  0.01974060,  0.01887901,
- 0.00337911, -0.11359599, -0.02792521, -0.03220184, -0.01533311,  0.00015962, -0.04225043, -0.00933965,  0.00675311,  0.00206060,
- 0.15926771,  0.40199829, -0.80792558, -0.35591604, -0.17169764,  0.02830436,  0.02459982, -0.03438589,  0.00718705, -0.01798329,
--0.01594508, -0.00702430, -0.00952419, -0.00962701, -0.01307212, -0.01749740,  0.01299602,  0.00587270, -0.36103108, -0.82039266,
--0.43092844, -0.08500097, -0.04361674, -0.00333482,  0.01250434, -0.02538295, -0.00921797,  0.01645071, -0.01400872,  0.00317607,
- 0.00003277, -0.01617646, -0.00616863, -0.00882661,  0.00466157,  0.00353237,  0.91803104, -0.39503305, -0.02048964,  0.00060125,
- 0.01980634,  0.00300109,  0.00313880,  0.00657337,  0.00715163,  0.00000261,  0.00854276, -0.00154825, -0.00516128,  0.00909527,
- 0.00095609,  0.00701196, -0.00221867, -0.00156741},
-{-0.00469582, -0.00020403, -0.00587134,  0.00185153, -0.02256479, -0.01185761, -0.02891481, -0.00493792, -0.00182344,  0.00285962,
- 0.01558059, -0.02185140,  0.04639438, -0.04357142,  0.12718613, -0.06756136,  0.05542227,  0.98480184, -0.00374376, -0.00236433,
--0.00607169, -0.00303290, -0.00127243, -0.01794845,  0.00620033, -0.00732704, -0.02837749, -0.00107164,  0.04820548,  0.00713300,
- 0.09784244, -0.16806261, -0.04563341, -0.33406041,  0.91554083, -0.08139655, -0.00415851, -0.00538193, -0.00731198, -0.00534534,
--0.00623075, -0.02016943, -0.05480133, -0.03172290, -0.03879603,  0.01518441,  0.09591688,  0.02238470,  0.08126640,  0.08236821,
--0.24802119,  0.89516402,  0.32029647,  0.07188887, -0.00220366,  0.00344025, -0.00277284,  0.00358963, -0.08668007, -0.02205910,
--0.05289669, -0.03535201, -0.01188017, -0.06456872, -0.09321006, -0.00009617, -0.15804070,  0.24632041,  0.90166119,  0.19250690,
- 0.17264619, -0.09699155, -0.00567329, -0.00897700, -0.01442565, -0.01939390,  0.03702127, -0.02999862, -0.04385696, -0.05232394,
--0.03339177,  0.03905964, -0.00281424, -0.29213275,  0.02892968,  0.90257613, -0.21546058, -0.18070946,  0.09014567,  0.04117230,
--0.01029696, -0.00329116, -0.03354346,  0.02937079,  0.01274208, -0.01260649, -0.03505571, -0.01020645,  0.03787209,  0.12132165,
--0.20826840,  0.81556933, -0.43874351,  0.21518682, -0.14564290, -0.05210031,  0.07124563,  0.06127983, -0.00457321,  0.01740496,
- 0.04185176,  0.00128036, -0.05033693, -0.01890046,  0.06221734,  0.10280078, -0.03738531,  0.04830209, -0.08408293, -0.46409009,
--0.83936263, -0.14817619, -0.13135927,  0.04563506,  0.08340661,  0.04040200,  0.00044396, -0.01365972,  0.01228951,  0.01078273,
- 0.09205406, -0.03791500,  0.07135889,  0.08158339,  0.06298278, -0.22875755, -0.92917558, -0.11248260,  0.17801883, -0.03971674,
--0.07491915,  0.06477287,  0.04635713,  0.01856159,  0.00130895, -0.01991604,  0.02358176, -0.09376056,  0.02782280, -0.04691559,
- 0.13749249,  0.31383132,  0.92274602,  0.04727419,  0.09765196, -0.02108945,  0.00626005,  0.05193322,  0.02009133,  0.03094066,
- 0.04573470,  0.00451733,  0.00240169, -0.00982355, -0.03546208, -0.14156875, -0.02480689,  0.22997442,  0.09778317,  0.88834235,
--0.32797611, -0.00079977,  0.04917079,  0.06977359,  0.06451185,  0.07816204,  0.03119314,  0.01136506,  0.01062006,  0.00632783,
- 0.03241828, -0.03318847, -0.01350502, -0.30055361,  0.07265375,  0.17308022,  0.88795796, -0.23231020, -0.08932700,  0.11759604,
- 0.00590705,  0.03525351,  0.00840466,  0.04389942,  0.04387629,  0.04003275,  0.01772966,  0.02709780, -0.02393282,  0.02766178,
- 0.00342983, -0.33882220,  0.76612668,  0.44061716, -0.28414784, -0.09364014,  0.03694060,  0.01124120,  0.01130268, -0.02869682,
--0.07428963, -0.03504754,  0.05874942,  0.01196795,  0.02003875,  0.00787152, -0.01605561,  0.04501257, -0.06959958, -0.13015784,
--0.05738065,  0.04681625,  0.06668700, -0.04492094,  0.02927765, -0.94404277,  0.19243952,  0.09504337, -0.12540826,  0.05394317,
--0.07972638, -0.02145188,  0.00136427,  0.01964678,  0.06667373,  0.06204535,  0.17302394,  0.22005905,  0.58329964, -0.68440447,
- 0.19628796,  0.15718011, -0.12481840, -0.08222507,  0.11780870,  0.03798206, -0.01818866,  0.00892766,  0.05582263,  0.01126832,
--0.00973589,  0.00697442, -0.09937902,  0.06621185, -0.19452202, -0.80004569, -0.13946094, -0.48990700, -0.17595191, -0.00798873,
--0.06121856,  0.08768040, -0.04507631,  0.00448896,  0.01153941, -0.04711652, -0.01050749, -0.01660047, -0.03007159, -0.01468906,
- 0.12848053,  0.13859838,  0.93863771, -0.22250065, -0.14841278,  0.04666032, -0.06344813, -0.01915105, -0.01840150, -0.02389410,
--0.01245496,  0.05023402,  0.02125840,  0.02467318, -0.01893022, -0.00889647,  0.00551817,  0.00481915, -0.40626968, -0.89028236,
- 0.18261687, -0.03852330,  0.02621926, -0.05420122, -0.01704117, -0.00072893, -0.02694170, -0.04335124,  0.02256467,  0.00642301,
--0.01619484, -0.00871160,  0.00400065, -0.00488820, -0.00752173, -0.00170603,  0.89554989, -0.41825934, -0.08725803, -0.09051404,
--0.00916236, -0.02959065, -0.07268075, -0.00816626, -0.00314215, -0.01941078, -0.00036782, -0.00188655, -0.02107724, -0.00771657,
--0.00448194, -0.00387517,  0.00082998,  0.00202471},
-{ 0.00167296, -0.00647772, -0.00604394,  0.01490810, -0.00837664,  0.00246438,  0.02082153,  0.01216715,  0.01001396, -0.02850860,
--0.01187868, -0.00113289,  0.04140237, -0.11084998,  0.16102260,  0.20084170, -0.28969446, -0.91312256,  0.00087788, -0.00136895,
- 0.00004622,  0.00578894,  0.00524119, -0.00044550,  0.00948906, -0.00396910, -0.03312197, -0.00075487,  0.00987494, -0.02088734,
- 0.09835550, -0.20080342,  0.13687782, -0.16111863, -0.90089988,  0.30312999,  0.00248784, -0.00975419, -0.01617200,  0.00699371,
--0.02151635, -0.01625774, -0.01262800,  0.02588781, -0.05620764, -0.13651454,  0.04242442, -0.02615307,  0.20497288, -0.20422909,
- 0.14184406,  0.89712919,  0.01758042,  0.25447787, -0.00207668, -0.00260329,  0.00724812, -0.01007749,  0.00806242, -0.03089729,
--0.01161934, -0.00618676, -0.10327342, -0.10160272,  0.11919283,  0.20781533,  0.11564869, -0.19072476,  0.86402008, -0.24650846,
- 0.24684161,  0.04775750,  0.00486888, -0.01735569, -0.01868000, -0.01870386, -0.03243262, -0.05883701, -0.03433371,  0.10441236,
--0.22831067, -0.22837988,  0.15082544, -0.21313767,  0.13215611, -0.78096079, -0.32270595, -0.21307018,  0.17339271, -0.05435742,
--0.00940813,  0.00272520,  0.00542917, -0.05232991, -0.01280809, -0.10773627, -0.17626479,  0.03719285, -0.26297104, -0.21780618,
- 0.21406665,  0.15202177,  0.75911044,  0.38627481, -0.16504189, -0.10242997, -0.02394939, -0.06018959,  0.00994733, -0.02617197,
--0.01543723, -0.10320051, -0.03010481, -0.19098072, -0.06893233,  0.12253174, -0.25556092, -0.31989059,  0.09542655,  0.72712041,
--0.43108921, -0.01568072, -0.16532685,  0.06646835, -0.08885408, -0.00050364, -0.01791050,  0.00245405,  0.00204794, -0.17948691,
--0.05193881, -0.16329387, -0.13676259,  0.01214133, -0.30994612, -0.00687734,  0.63254090, -0.47180795, -0.35409214,  0.23658315,
- 0.11170294,  0.05229887, -0.06107035, -0.01094212,  0.01523854, -0.01608284, -0.03739206, -0.23864328, -0.03958494, -0.19305719,
--0.26019058,  0.24108257, -0.55933566,  0.40623396, -0.53367968, -0.08930957, -0.00599383, -0.00050845,  0.06960811,  0.02664961,
- 0.01464197, -0.00486781, -0.01905736,  0.01437578,  0.02379930, -0.26639588,  0.05208876, -0.43525002, -0.63009424,  0.05251889,
- 0.56732782, -0.06731164, -0.03705909, -0.03253946,  0.00950673, -0.07941760,  0.02388267, -0.01258409, -0.00343524,  0.00148711,
--0.00362107,  0.03981813, -0.07235214, -0.46180041, -0.05595288, -0.55699317,  0.61935853, -0.25379716,  0.06796783,  0.01039267,
--0.06329171, -0.02143024,  0.09406929, -0.00799203, -0.01419805, -0.00603024,  0.01313145,  0.00091161, -0.00212107, -0.02405340,
- 0.07146405, -0.76695326, -0.14841817,  0.60372663, -0.01478424,  0.06522462,  0.08580016, -0.05817981,  0.02438942,  0.04840904,
- 0.02934363, -0.02239678, -0.00582247, -0.00091312, -0.00394148, -0.00285276, -0.03435745,  0.05277435,  0.17882781, -0.06194164,
- 0.27321118,  0.01840179, -0.10188148, -0.33168524, -0.03491221,  0.67351789,  0.37017376,  0.32083717,  0.09737800, -0.20998084,
--0.10725041,  0.06379186,  0.02169903, -0.02031584,  0.05623799, -0.18300962, -0.17337803,  0.08915172, -0.53835537, -0.08547263,
- 0.15163321,  0.56732906,  0.21878115,  0.37274266,  0.26206918,  0.13443927,  0.09178695, -0.03276324, -0.01131664, -0.00236369,
- 0.00772568,  0.01008805, -0.17122615,  0.15301569,  0.40135484, -0.06058913,  0.56405128, -0.05176853,  0.24544337,  0.62448073,
- 0.07265009, -0.01198695,  0.05151774, -0.03678498,  0.01886154,  0.03724094,  0.01393667,  0.00758055, -0.00254297,  0.00537118,
- 0.24169707, -0.41735970, -0.67564355, -0.09270478,  0.53106033,  0.06214579,  0.02574404,  0.09943837,  0.03032542,  0.02194476,
- 0.06369772, -0.00133741,  0.01301113,  0.01508494,  0.00036111, -0.00278870,  0.00139205,  0.00015792, -0.43347887,  0.69923146,
--0.55406563, -0.01102231,  0.01347767,  0.07012139, -0.02530164,  0.06803192,  0.01177196,  0.04374491,  0.04073027,  0.04037438,
- 0.00167330, -0.01807065, -0.00425562,  0.00149653, -0.00035119, -0.00172888,  0.84785495,  0.52289580,  0.01067734, -0.00859194,
- 0.01685964,  0.00481442,  0.00434738,  0.07592695,  0.01419942,  0.01005336,  0.03316937,  0.00360465,  0.00435039,  0.00029122,
- 0.00171268,  0.00198919, -0.00046889, -0.00094176}};
-
-/* right KLT transforms */
-const double WebRtcIsac_kKltT2Gain[3][36] = {
-{ 0.14572837, -0.45446306,  0.61990621, -0.52197033,  0.32145074, -0.11026900, -0.20698282,  0.48962182, -0.27127933, -0.33627476,
- 0.65094037, -0.32715751,  0.40262573, -0.47844405, -0.33876075,  0.44130653,  0.37383966, -0.39964662, -0.51730480,  0.06611973,
- 0.49030187,  0.47512886, -0.02141226, -0.51129451, -0.58578569, -0.39132064, -0.13187771,  0.15649421,  0.40735596,  0.54396897,
- 0.40381276,  0.40904942,  0.41179766,  0.41167576,  0.40840251,  0.40468132},
-{-0.11368135,  0.34815515, -0.56434996,  0.61130763, -0.39970336,  0.11795708,  0.28514257, -0.58879243,  0.32775812,  0.27024886,
--0.56251299,  0.27411037,  0.42649186, -0.44080232, -0.36408215,  0.35932457,  0.43592895, -0.41484213, -0.49813030, -0.00012592,
- 0.49865688,  0.47634953,  0.01094246, -0.52552726, -0.56154082, -0.41110686, -0.14170764,  0.15946614,  0.40818082,  0.55094554,
- 0.40051601,  0.41084781,  0.41567800,  0.41450700,  0.40871872,  0.39891823},
-{-0.10719481,  0.34796287, -0.54573957,  0.59521001, -0.43943367,  0.14907223,  0.26554957, -0.59549939,  0.36760692,  0.26040652,
--0.55268701,  0.25778784,  0.38994096, -0.45282773, -0.37975656,  0.40213055,  0.43052647, -0.38937904, -0.52698359,  0.02788094,
- 0.48284286,  0.47792474,  0.02557759, -0.50922240, -0.57699826, -0.39476779, -0.14708238,  0.12742149,  0.37835245,  0.57464021,
- 0.39408127,  0.40327462,  0.40993655,  0.41419345,  0.41506301,  0.41253853}};
-
-const double WebRtcIsac_kKltT2Shape[3][36] = {
-{ 0.13427386, -0.35132558,  0.52506528, -0.59419077,  0.45075085, -0.16312057,  0.29857439, -0.58660147,  0.34265431,  0.20879510,
--0.56063262,  0.30238345,  0.43308283, -0.41186999, -0.35288681,  0.42768996,  0.36094634, -0.45284910, -0.47116680,  0.02893449,
- 0.54326135,  0.45249040, -0.06264420, -0.52283830,  0.57137758,  0.44298139,  0.12617554, -0.20819946, -0.42324603, -0.48876443,
- 0.39597050,  0.40713935,  0.41389880,  0.41512486,  0.41130400,  0.40575001},
-{ 0.16540737, -0.43379435,  0.58165221, -0.55154773,  0.35734028, -0.11935912,  0.29434254, -0.55954817,  0.23549804,  0.33087258,
--0.58848503,  0.29835834,  0.45464789, -0.38316155, -0.41689708,  0.35607296,  0.41260747, -0.41910198, -0.48633899, -0.04144955,
- 0.47824583,  0.51050942,  0.01000345, -0.52184032,  0.53488229,  0.42641051,  0.17049774, -0.15849613, -0.43229355, -0.53945045,
- 0.39582002,  0.41033103,  0.41788713,  0.41688080,  0.41081697,  0.39719658},
-{ 0.13386268, -0.37919915,  0.54989123, -0.57663572,  0.42402636, -0.15362720,  0.29641577, -0.58806770,  0.31381040,  0.26524954,
--0.56271012,  0.28431868,  0.42699898, -0.41058922, -0.40408270,  0.39215865,  0.40788513, -0.40699735, -0.49846482, -0.01521208,
- 0.48756040,  0.49479418, -0.00347672, -0.51841384,  0.55513106,  0.41683793,  0.15131217, -0.15613621, -0.41029341, -0.54996461,
- 0.39402116,  0.40965305,  0.41862791,  0.41730770,  0.41089648,  0.39837262}};
-
-/* means of log gains and LAR coefficients*/
-const double WebRtcIsac_kLpcMeansGain[3][12] = {
-{-6.86881911, -5.35075273, -6.86792680, -5.36200897, -6.86401538, -5.36921533, -6.86802969, -5.36893966, -6.86538097, -5.36315063,
--6.85535304, -5.35155315},
-{-6.12914600, -4.78070092, -6.12971780, -4.78382183, -6.12858525, -4.79362198, -6.12926491, -4.79017481, -6.12102401, -4.78346122,
--6.11441152, -4.78019228},
-{-5.67273484, -3.73876311, -5.65246094, -3.71407895, -5.61716443, -3.68814580, -5.58804560, -3.66334094, -5.54189577, -3.63845640,
--5.49293185, -3.61760203}};
-
-const double WebRtcIsac_kLpcMeansShape[3][108] = {
-{-0.91232981,  0.26258634, -0.33716701,  0.08477430, -0.03378426,  0.14423909,  0.07036185,  0.06155019,  0.01490385,  0.04138740,
- 0.01427317,  0.01288970,  0.83872106,  0.25750199,  0.07988929, -0.01957923,  0.00831390,  0.01770300, -0.90957164,  0.25732216,
--0.33385344,  0.08735740, -0.03715332,  0.14584917,  0.06998990,  0.06131968,  0.01504379,  0.04067339,  0.01428039,  0.01406460,
- 0.83846243,  0.26169862,  0.08109025, -0.01767055,  0.00970539,  0.01954310, -0.90490803,  0.24656405, -0.33578607,  0.08843286,
--0.03749139,  0.14443959,  0.07214669,  0.06170993,  0.01449947,  0.04134309,  0.01314762,  0.01413471,  0.83895203,  0.26748062,
- 0.08197507, -0.01781298,  0.00885967,  0.01922394, -0.90922472,  0.24495889, -0.33921540,  0.08877169, -0.03581332,  0.14199172,
- 0.07444032,  0.06185940,  0.01502054,  0.04185113,  0.01276579,  0.01355457,  0.83645358,  0.26631720,  0.08119697, -0.01835449,
- 0.00788512,  0.01846446, -0.90482253,  0.24658310, -0.34019734,  0.08281090, -0.03486038,  0.14359248,  0.07401336,  0.06001471,
- 0.01528421,  0.04254560,  0.01321472,  0.01240799,  0.83857127,  0.26281654,  0.08174380, -0.02099842,  0.00755176,  0.01699448,
--0.90132307,  0.25174308, -0.33838268,  0.07883863, -0.02877906,  0.14105407,  0.07220290,  0.06000352,  0.01684879,  0.04226844,
- 0.01331331,  0.01269244,  0.83832138,  0.25467485,  0.08118028, -0.02120528,  0.00747832,  0.01567212},
-{-1.11639718,  0.35377266,  0.00798929,  0.20165280,  0.07656104,  0.10629964,  0.04894160,  0.10955305, -0.01806405,  0.05082282,
- 0.01730794,  0.01345957,  0.73717782,  0.05952284,  0.03176204,  0.08195122,  0.01253148,  0.02253385, -1.12053537,  0.35523538,
- 0.00859646,  0.20007706,  0.07715852,  0.10754596,  0.05165976,  0.10927703, -0.01554395,  0.05178866,  0.01752534,  0.01343468,
- 0.73489046,  0.06395167,  0.03287798,  0.07972374,  0.01293550,  0.02300929, -1.11772179,  0.35457623,  0.01205524,  0.19926481,
- 0.08000866,  0.10817921,  0.05052481,  0.11016167, -0.01552091,  0.05155510,  0.01787163,  0.01343778,  0.73142568,  0.06840830,
- 0.03316828,  0.07902608,  0.01525042,  0.02178127, -1.12120164,  0.36405233,  0.00630305,  0.19799738,  0.07829690,  0.10727588,
- 0.04017317,  0.10437949, -0.01844109,  0.05021700,  0.01561726,  0.01226571,  0.73438044,  0.06947982,  0.03396317,  0.07858683,
- 0.01367105,  0.02041955, -1.12146187,  0.35952226,  0.00340090,  0.19700813,  0.07938222,  0.10904137,  0.03921216,  0.10531403,
--0.01833415,  0.04956231,  0.01399539,  0.01323582,  0.74378099,  0.07059589,  0.03367692,  0.08151462,  0.01182040,  0.02075577,
--1.11245254,  0.35234230,  0.00687490,  0.20204252,  0.07813186,  0.11081259,  0.04634665,  0.11073238, -0.01637954,  0.05104577,
- 0.01675122,  0.01448696,  0.74013627,  0.06239059,  0.03129412,  0.08207461,  0.01249475,  0.02189238},
-{-1.27118948,  0.35834331, -0.33499347,  0.13524073,  0.04829079,  0.19542773,  0.05273835,  0.04157974, -0.01755227,  0.01513442,
- 0.00386630,  0.02199463,  1.14439142,  0.21903073,  0.14750213,  0.12743356,  0.08463334,  0.06839691, -1.28367777,  0.35556287,
--0.33809405,  0.13627881,  0.04939309,  0.19642571,  0.05354373,  0.04099247, -0.01787481,  0.01472425,  0.00391474,  0.02150716,
- 1.14739079,  0.21840872,  0.14643624,  0.12724347,  0.08390642,  0.06811938, -1.29007667,  0.35159558, -0.34154267,  0.13295849,
- 0.04883602,  0.19587595,  0.05452759,  0.04174703, -0.01782110,  0.01388270,  0.00374754,  0.02138105,  1.14333767,  0.21690116,
- 0.14544599,  0.12606728,  0.08314168,  0.06771389, -1.29856471,  0.35239315, -0.34238732,  0.13277553,  0.04722712,  0.19233156,
- 0.05366901,  0.04328110, -0.01657749,  0.01444736,  0.00438108,  0.02102563,  1.13548397,  0.21537812,  0.14357377,  0.12525845,
- 0.08230994,  0.06722511, -1.30663540,  0.34366563, -0.34205544,  0.12861679,  0.04655851,  0.18864359,  0.05351285,  0.04358693,
--0.01604498,  0.01431907,  0.00395326,  0.02082299,  1.12207794,  0.21167325,  0.14212491,  0.12418671,  0.08155467,  0.06639789,
--1.31011673,  0.33686271, -0.34379843,  0.12169569,  0.04480323,  0.18637557,  0.05374078,  0.04260827, -0.01588226,  0.01378294,
- 0.00396009,  0.02112406,  1.10466984,  0.20905894,  0.14107033,  0.12303074,  0.08047136,  0.06588031}};
-
diff --git a/src/mod/codecs/mod_isac/lpc_tables.h b/src/mod/codecs/mod_isac/lpc_tables.h
deleted file mode 100644
index 604d963c37..0000000000
--- a/src/mod/codecs/mod_isac/lpc_tables.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lpc_tables.h
- *
- * header file for coding tables for the LPC coefficients
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_
-
-#include "structs.h"
-
-#include "settings.h"
-
-#define KLT_STEPSIZE         1.00000000
-#define KLT_NUM_AVG_GAIN     0
-#define KLT_NUM_AVG_SHAPE    0
-#define KLT_NUM_MODELS  3
-#define LPC_GAIN_SCALE     4.000f
-#define LPC_LOBAND_SCALE   2.100f
-#define LPC_LOBAND_ORDER   ORDERLO
-#define LPC_HIBAND_SCALE   0.450f
-#define LPC_HIBAND_ORDER   ORDERHI
-#define LPC_GAIN_ORDER     2
-
-#define LPC_SHAPE_ORDER    (LPC_LOBAND_ORDER + LPC_HIBAND_ORDER)
-
-#define KLT_ORDER_GAIN     (LPC_GAIN_ORDER * SUBFRAMES)
-#define KLT_ORDER_SHAPE    (LPC_SHAPE_ORDER * SUBFRAMES)
-/* indices of KLT coefficients used */
-extern const WebRtc_UWord16 WebRtcIsac_kQKltSelIndGain[12];
-
-extern const WebRtc_UWord16 WebRtcIsac_kQKltSelIndShape[108];
-
-/* cdf array for model indicator */
-extern const WebRtc_UWord16 WebRtcIsac_kQKltModelCdf[KLT_NUM_MODELS+1];
-
-/* pointer to cdf array for model indicator */
-extern const WebRtc_UWord16 *WebRtcIsac_kQKltModelCdfPtr[1];
-
-/* initial cdf index for decoder of model indicator */
-extern const WebRtc_UWord16 WebRtcIsac_kQKltModelInitIndex[1];
-
-/* offset to go from rounded value to quantization index */
-extern const short WebRtcIsac_kQKltQuantMinGain[12];
-
-extern const short WebRtcIsac_kQKltQuantMinShape[108];
-
-/* maximum quantization index */
-extern const WebRtc_UWord16 WebRtcIsac_kQKltMaxIndGain[12];
-
-extern const WebRtc_UWord16 WebRtcIsac_kQKltMaxIndShape[108];
-
-/* index offset */
-extern const WebRtc_UWord16 WebRtcIsac_kQKltOffsetGain[KLT_NUM_MODELS][12];
-
-extern const WebRtc_UWord16 WebRtcIsac_kQKltOffsetShape[KLT_NUM_MODELS][108];
-
-/* initial cdf index for KLT coefficients */
-extern const WebRtc_UWord16 WebRtcIsac_kQKltInitIndexGain[KLT_NUM_MODELS][12];
-
-extern const WebRtc_UWord16 WebRtcIsac_kQKltInitIndexShape[KLT_NUM_MODELS][108];
-
-/* offsets for quantizer representation levels */
-extern const WebRtc_UWord16 WebRtcIsac_kQKltOfLevelsGain[3];
-
-extern const WebRtc_UWord16 WebRtcIsac_kQKltOfLevelsShape[3];
-
-/* quantizer representation levels */
-extern const double WebRtcIsac_kQKltLevelsGain[1176];
-
-extern const double WebRtcIsac_kQKltLevelsShape[1735];
-
-/* cdf tables for quantizer indices */
-extern const WebRtc_UWord16 WebRtcIsac_kQKltCdfGain[1212];
-
-extern const WebRtc_UWord16 WebRtcIsac_kQKltCdfShape[2059];
-
-/* pointers to cdf tables for quantizer indices */
-extern const WebRtc_UWord16 *WebRtcIsac_kQKltCdfPtrGain[KLT_NUM_MODELS][12];
-
-extern const WebRtc_UWord16 *WebRtcIsac_kQKltCdfPtrShape[KLT_NUM_MODELS][108];
-
-/* code length for all coefficients using different models */
-extern const double WebRtcIsac_kQKltCodeLenGain[392];
-
-extern const double WebRtcIsac_kQKltCodeLenShape[578];
-
-/* left KLT transforms */
-extern const double WebRtcIsac_kKltT1Gain[KLT_NUM_MODELS][4];
-
-extern const double WebRtcIsac_kKltT1Shape[KLT_NUM_MODELS][324];
-
-/* right KLT transforms */
-extern const double WebRtcIsac_kKltT2Gain[KLT_NUM_MODELS][36];
-
-extern const double WebRtcIsac_kKltT2Shape[KLT_NUM_MODELS][36];
-
-/* means of log gains and LAR coefficients */
-extern const double WebRtcIsac_kLpcMeansGain[KLT_NUM_MODELS][12];
-
-extern const double WebRtcIsac_kLpcMeansShape[KLT_NUM_MODELS][108];
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_ */
diff --git a/src/mod/codecs/mod_isac/lpc_to_refl_coef.c b/src/mod/codecs/mod_isac/lpc_to_refl_coef.c
deleted file mode 100644
index 2cb83c2e1d..0000000000
--- a/src/mod/codecs/mod_isac/lpc_to_refl_coef.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_LpcToReflCoef().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-#define SPL_LPC_TO_REFL_COEF_MAX_AR_MODEL_ORDER 50
-
-void WebRtcSpl_LpcToReflCoef(WebRtc_Word16* a16, int use_order, WebRtc_Word16* k16)
-{
-    int m, k;
-    WebRtc_Word32 tmp32[SPL_LPC_TO_REFL_COEF_MAX_AR_MODEL_ORDER];
-    WebRtc_Word32 tmp_inv_denom32;
-    WebRtc_Word16 tmp_inv_denom16;
-
-    k16[use_order - 1] = WEBRTC_SPL_LSHIFT_W16(a16[use_order], 3); //Q12<<3 => Q15
-    for (m = use_order - 1; m > 0; m--)
-    {
-        // (1 - k^2) in Q30
-        tmp_inv_denom32 = ((WebRtc_Word32)1073741823) - WEBRTC_SPL_MUL_16_16(k16[m], k16[m]);
-        // (1 - k^2) in Q15
-        tmp_inv_denom16 = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(tmp_inv_denom32, 15);
-
-        for (k = 1; k <= m; k++)
-        {
-            // tmp[k] = (a[k] - RC[m] * a[m-k+1]) / (1.0 - RC[m]*RC[m]);
-
-            // [Q12<<16 - (Q15*Q12)<<1] = [Q28 - Q28] = Q28
-            tmp32[k] = WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)a16[k], 16)
-                    - WEBRTC_SPL_LSHIFT_W32(WEBRTC_SPL_MUL_16_16(k16[m], a16[m-k+1]), 1);
-
-            tmp32[k] = WebRtcSpl_DivW32W16(tmp32[k], tmp_inv_denom16); //Q28/Q15 = Q13
-        }
-
-        for (k = 1; k < m; k++)
-        {
-            a16[k] = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(tmp32[k], 1); //Q13>>1 => Q12
-        }
-
-        tmp32[m] = WEBRTC_SPL_SAT(8191, tmp32[m], -8191);
-        k16[m - 1] = (WebRtc_Word16)WEBRTC_SPL_LSHIFT_W32(tmp32[m], 2); //Q13<<2 => Q15
-    }
-    return;
-}
diff --git a/src/mod/codecs/mod_isac/min_max_operations.c b/src/mod/codecs/mod_isac/min_max_operations.c
deleted file mode 100644
index 57eaff7b71..0000000000
--- a/src/mod/codecs/mod_isac/min_max_operations.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This file contains the implementation of functions
- * WebRtcSpl_MaxAbsValueW16()
- * WebRtcSpl_MaxAbsIndexW16()
- * WebRtcSpl_MaxAbsValueW32()
- * WebRtcSpl_MaxValueW16()
- * WebRtcSpl_MaxIndexW16()
- * WebRtcSpl_MaxValueW32()
- * WebRtcSpl_MaxIndexW32()
- * WebRtcSpl_MinValueW16()
- * WebRtcSpl_MinIndexW16()
- * WebRtcSpl_MinValueW32()
- * WebRtcSpl_MinIndexW32()
- *
- * The description header can be found in signal_processing_library.h.
- *
- */
-
-#include "signal_processing_library.h"
-
-#if !(defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM_NEON))
-
-// Maximum absolute value of word16 vector.
-WebRtc_Word16 WebRtcSpl_MaxAbsValueW16(const WebRtc_Word16 *vector, WebRtc_Word16 length)
-{
-    WebRtc_Word32 tempMax = 0;
-    WebRtc_Word32 absVal;
-    WebRtc_Word16 totMax;
-    int i;
-    G_CONST WebRtc_Word16 *tmpvector = vector;
-
-    for (i = 0; i < length; i++)
-    {
-        absVal = WEBRTC_SPL_ABS_W32((*tmpvector));
-        if (absVal > tempMax)
-        {
-            tempMax = absVal;
-        }
-        tmpvector++;
-    }
-    totMax = (WebRtc_Word16)WEBRTC_SPL_MIN(tempMax, WEBRTC_SPL_WORD16_MAX);
-    return totMax;
-}
-
-#endif
-
-// Index of maximum absolute value in a  word16 vector.
-WebRtc_Word16 WebRtcSpl_MaxAbsIndexW16(G_CONST WebRtc_Word16* vector, WebRtc_Word16 length)
-{
-    WebRtc_Word16 tempMax;
-    WebRtc_Word16 absTemp;
-    WebRtc_Word16 tempMaxIndex = 0;
-    WebRtc_Word16 i = 0;
-    G_CONST WebRtc_Word16 *tmpvector = vector;
-
-    tempMax = WEBRTC_SPL_ABS_W16(*tmpvector);
-    tmpvector++;
-    for (i = 1; i < length; i++)
-    {
-        absTemp = WEBRTC_SPL_ABS_W16(*tmpvector);
-        tmpvector++;
-        if (absTemp > tempMax)
-        {
-            tempMax = absTemp;
-            tempMaxIndex = i;
-        }
-    }
-    return tempMaxIndex;
-}
-
-// Maximum absolute value of word32 vector.
-WebRtc_Word32 WebRtcSpl_MaxAbsValueW32(G_CONST WebRtc_Word32 *vector, WebRtc_Word16 length)
-{
-    WebRtc_UWord32 tempMax = 0;
-    WebRtc_UWord32 absVal;
-    WebRtc_Word32 retval;
-    int i;
-    G_CONST WebRtc_Word32 *tmpvector = vector;
-
-    for (i = 0; i < length; i++)
-    {
-        absVal = WEBRTC_SPL_ABS_W32((*tmpvector));
-        if (absVal > tempMax)
-        {
-            tempMax = absVal;
-        }
-        tmpvector++;
-    }
-    retval = (WebRtc_Word32)(WEBRTC_SPL_MIN(tempMax, WEBRTC_SPL_WORD32_MAX));
-    return retval;
-}
-
-// Maximum value of word16 vector.
-#ifndef XSCALE_OPT
-WebRtc_Word16 WebRtcSpl_MaxValueW16(G_CONST WebRtc_Word16* vector, WebRtc_Word16 length)
-{
-    WebRtc_Word16 tempMax;
-    WebRtc_Word16 i;
-    G_CONST WebRtc_Word16 *tmpvector = vector;
-
-    tempMax = *tmpvector++;
-    for (i = 1; i < length; i++)
-    {
-        if (*tmpvector++ > tempMax)
-            tempMax = vector[i];
-    }
-    return tempMax;
-}
-#else
-#pragma message(">> WebRtcSpl_MaxValueW16 is excluded from this build")
-#endif
-
-// Index of maximum value in a word16 vector.
-WebRtc_Word16 WebRtcSpl_MaxIndexW16(G_CONST WebRtc_Word16 *vector, WebRtc_Word16 length)
-{
-    WebRtc_Word16 tempMax;
-    WebRtc_Word16 tempMaxIndex = 0;
-    WebRtc_Word16 i = 0;
-    G_CONST WebRtc_Word16 *tmpvector = vector;
-
-    tempMax = *tmpvector++;
-    for (i = 1; i < length; i++)
-    {
-        if (*tmpvector++ > tempMax)
-        {
-            tempMax = vector[i];
-            tempMaxIndex = i;
-        }
-    }
-    return tempMaxIndex;
-}
-
-// Maximum value of word32 vector.
-#ifndef XSCALE_OPT
-WebRtc_Word32 WebRtcSpl_MaxValueW32(G_CONST WebRtc_Word32* vector, WebRtc_Word16 length)
-{
-    WebRtc_Word32 tempMax;
-    WebRtc_Word16 i;
-    G_CONST WebRtc_Word32 *tmpvector = vector;
-
-    tempMax = *tmpvector++;
-    for (i = 1; i < length; i++)
-    {
-        if (*tmpvector++ > tempMax)
-            tempMax = vector[i];
-    }
-    return tempMax;
-}
-#else
-#pragma message(">> WebRtcSpl_MaxValueW32 is excluded from this build")
-#endif
-
-// Index of maximum value in a word32 vector.
-WebRtc_Word16 WebRtcSpl_MaxIndexW32(G_CONST WebRtc_Word32* vector, WebRtc_Word16 length)
-{
-    WebRtc_Word32 tempMax;
-    WebRtc_Word16 tempMaxIndex = 0;
-    WebRtc_Word16 i = 0;
-    G_CONST WebRtc_Word32 *tmpvector = vector;
-
-    tempMax = *tmpvector++;
-    for (i = 1; i < length; i++)
-    {
-        if (*tmpvector++ > tempMax)
-        {
-            tempMax = vector[i];
-            tempMaxIndex = i;
-        }
-    }
-    return tempMaxIndex;
-}
-
-// Minimum value of word16 vector.
-WebRtc_Word16 WebRtcSpl_MinValueW16(G_CONST WebRtc_Word16 *vector, WebRtc_Word16 length)
-{
-    WebRtc_Word16 tempMin;
-    WebRtc_Word16 i;
-    G_CONST WebRtc_Word16 *tmpvector = vector;
-
-    // Find the minimum value
-    tempMin = *tmpvector++;
-    for (i = 1; i < length; i++)
-    {
-        if (*tmpvector++ < tempMin)
-            tempMin = (vector[i]);
-    }
-    return tempMin;
-}
-
-// Index of minimum value in a word16 vector.
-#ifndef XSCALE_OPT
-WebRtc_Word16 WebRtcSpl_MinIndexW16(G_CONST WebRtc_Word16* vector, WebRtc_Word16 length)
-{
-    WebRtc_Word16 tempMin;
-    WebRtc_Word16 tempMinIndex = 0;
-    WebRtc_Word16 i = 0;
-    G_CONST WebRtc_Word16* tmpvector = vector;
-
-    // Find index of smallest value
-    tempMin = *tmpvector++;
-    for (i = 1; i < length; i++)
-    {
-        if (*tmpvector++ < tempMin)
-        {
-            tempMin = vector[i];
-            tempMinIndex = i;
-        }
-    }
-    return tempMinIndex;
-}
-#else
-#pragma message(">> WebRtcSpl_MinIndexW16 is excluded from this build")
-#endif
-
-// Minimum value of word32 vector.
-WebRtc_Word32 WebRtcSpl_MinValueW32(G_CONST WebRtc_Word32 *vector, WebRtc_Word16 length)
-{
-    WebRtc_Word32 tempMin;
-    WebRtc_Word16 i;
-    G_CONST WebRtc_Word32 *tmpvector = vector;
-
-    // Find the minimum value
-    tempMin = *tmpvector++;
-    for (i = 1; i < length; i++)
-    {
-        if (*tmpvector++ < tempMin)
-            tempMin = (vector[i]);
-    }
-    return tempMin;
-}
-
-// Index of minimum value in a word32 vector.
-#ifndef XSCALE_OPT
-WebRtc_Word16 WebRtcSpl_MinIndexW32(G_CONST WebRtc_Word32* vector, WebRtc_Word16 length)
-{
-    WebRtc_Word32 tempMin;
-    WebRtc_Word16 tempMinIndex = 0;
-    WebRtc_Word16 i = 0;
-    G_CONST WebRtc_Word32 *tmpvector = vector;
-
-    // Find index of smallest value
-    tempMin = *tmpvector++;
-    for (i = 1; i < length; i++)
-    {
-        if (*tmpvector++ < tempMin)
-        {
-            tempMin = vector[i];
-            tempMinIndex = i;
-        }
-    }
-    return tempMinIndex;
-}
-#else
-#pragma message(">> WebRtcSpl_MinIndexW32 is excluded from this build")
-#endif
diff --git a/src/mod/codecs/mod_isac/min_max_operations_neon.c b/src/mod/codecs/mod_isac/min_max_operations_neon.c
deleted file mode 100644
index 158bcc1837..0000000000
--- a/src/mod/codecs/mod_isac/min_max_operations_neon.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#if (defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM_NEON))
-
-#include <arm_neon.h>
-
-#include "signal_processing_library.h"
-
-// Maximum absolute value of word16 vector.
-WebRtc_Word16 WebRtcSpl_MaxAbsValueW16(const WebRtc_Word16* vector,
-                                       WebRtc_Word16 length) {
-  WebRtc_Word32 temp_max = 0;
-  WebRtc_Word32 abs_val;
-  WebRtc_Word16 tot_max;
-  int i;
-
-  __asm__("vmov.i16 d25, #0" : : : "d25");
-
-  for (i = 0; i < length - 7; i += 8) {
-    __asm__("vld1.16 {d26, d27}, [%0]" : : "r"(&vector[i]) : "q13");
-    __asm__("vabs.s16 q13, q13" : : : "q13");
-    __asm__("vpmax.s16 d26, d27" : : : "q13");
-    __asm__("vpmax.s16 d25, d26" : : : "d25", "d26");
-  }
-  __asm__("vpmax.s16 d25, d25" : : : "d25");
-  __asm__("vpmax.s16 d25, d25" : : : "d25");
-  __asm__("vmov.s16 %0, d25[0]" : "=r"(temp_max): : "d25");
-
-  for (; i < length; i++) {
-    abs_val = WEBRTC_SPL_ABS_W32((vector[i]));
-    if (abs_val > temp_max) {
-      temp_max = abs_val;
-    }
-  }
-  tot_max = (WebRtc_Word16)WEBRTC_SPL_MIN(temp_max, WEBRTC_SPL_WORD16_MAX);
-  return tot_max;
-}
-
-#endif
diff --git a/src/mod/codecs/mod_isac/mod_iSAC.2017.vcxproj b/src/mod/codecs/mod_isac/mod_iSAC.2017.vcxproj
deleted file mode 100644
index 7014223742..0000000000
--- a/src/mod/codecs/mod_isac/mod_iSAC.2017.vcxproj
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_iSAC</ProjectName>
-    <ProjectGuid>{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}</ProjectGuid>
-    <RootNamespace>mod_iSAC</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4206;4100;4244;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4206;4100;4244;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4206;4100;4244;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4206;4100;4244;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="arith_routines.c" />
-    <ClCompile Include="arith_routines_hist.c" />
-    <ClCompile Include="arith_routines_logist.c" />
-    <ClCompile Include="auto_correlation.c" />
-    <ClCompile Include="auto_corr_to_refl_coef.c" />
-    <ClCompile Include="bandwidth_estimator.c" />
-    <ClCompile Include="complex_bit_reverse.c" />
-    <ClCompile Include="complex_fft.c" />
-    <ClCompile Include="copy_set_operations.c" />
-    <ClCompile Include="crc.c" />
-    <ClCompile Include="cross_correlation.c" />
-    <ClCompile Include="decode.c" />
-    <ClCompile Include="decode_bwe.c" />
-    <ClCompile Include="division_operations.c" />
-    <ClCompile Include="dot_product_with_scale.c" />
-    <ClCompile Include="downsample_fast.c" />
-    <ClCompile Include="encode.c" />
-    <ClCompile Include="encode_lpc_swb.c" />
-    <ClCompile Include="energy.c" />
-    <ClCompile Include="entropy_coding.c" />
-    <ClCompile Include="fft.c" />
-    <ClCompile Include="filterbanks.c" />
-    <ClCompile Include="filterbank_tables.c" />
-    <ClCompile Include="filter_ar.c" />
-    <ClCompile Include="filter_ar_fast_q12.c" />
-    <ClCompile Include="filter_functions.c" />
-    <ClCompile Include="filter_ma_fast_q12.c" />
-    <ClCompile Include="get_hanning_window.c" />
-    <ClCompile Include="get_scaling_square.c" />
-    <ClCompile Include="ilbc_specific_functions.c" />
-    <ClCompile Include="intialize.c" />
-    <ClCompile Include="isac.c" />
-    <ClCompile Include="lattice.c" />
-    <ClCompile Include="levinson_durbin.c" />
-    <ClCompile Include="lpc_analysis.c" />
-    <ClCompile Include="lpc_gain_swb_tables.c" />
-    <ClCompile Include="lpc_shape_swb12_tables.c" />
-    <ClCompile Include="lpc_shape_swb16_tables.c" />
-    <ClCompile Include="lpc_tables.c" />
-    <ClCompile Include="lpc_to_refl_coef.c" />
-    <ClCompile Include="min_max_operations.c" />
-    <ClCompile Include="min_max_operations_neon.c" />
-    <ClCompile Include="mod_iSAC.c" />
-    <ClCompile Include="pitch_estimator.c" />
-    <ClCompile Include="pitch_filter.c" />
-    <ClCompile Include="pitch_gain_tables.c" />
-    <ClCompile Include="pitch_lag_tables.c" />
-    <ClCompile Include="randomization_functions.c" />
-    <ClCompile Include="refl_coef_to_lpc.c" />
-    <ClCompile Include="resample.c" />
-    <ClCompile Include="resample_48khz.c" />
-    <ClCompile Include="resample_by_2.c" />
-    <ClCompile Include="resample_by_2_internal.c" />
-    <ClCompile Include="resample_fractional.c" />
-    <ClCompile Include="spectrum_ar_model_tables.c" />
-    <ClCompile Include="splitting_filter.c" />
-    <ClCompile Include="spl_sqrt.c" />
-    <ClCompile Include="spl_sqrt_floor.c" />
-    <ClCompile Include="spl_version.c" />
-    <ClCompile Include="sqrt_of_one_minus_x_squared.c" />
-    <ClCompile Include="transform.c" />
-    <ClCompile Include="vector_scaling_operations.c" />
-    <ClCompile Include="webrtc_fft_t_1024_8.c" />
-    <ClCompile Include="webrtc_fft_t_rad.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="arith_routines.h" />
-    <ClInclude Include="bandwidth_estimator.h" />
-    <ClInclude Include="codec.h" />
-    <ClInclude Include="crc.h" />
-    <ClInclude Include="encode_lpc_swb.h" />
-    <ClInclude Include="entropy_coding.h" />
-    <ClInclude Include="fft.h" />
-    <ClInclude Include="filterbank_tables.h" />
-    <ClInclude Include="isac.h" />
-    <ClInclude Include="lpc_analysis.h" />
-    <ClInclude Include="lpc_gain_swb_tables.h" />
-    <ClInclude Include="lpc_shape_swb12_tables.h" />
-    <ClInclude Include="lpc_shape_swb16_tables.h" />
-    <ClInclude Include="lpc_tables.h" />
-    <ClInclude Include="os_specific_inline.h" />
-    <ClInclude Include="pitch_estimator.h" />
-    <ClInclude Include="pitch_gain_tables.h" />
-    <ClInclude Include="pitch_lag_tables.h" />
-    <ClInclude Include="resample_by_2_internal.h" />
-    <ClInclude Include="settings.h" />
-    <ClInclude Include="signal_processing_library.h" />
-    <ClInclude Include="spectrum_ar_model_tables.h" />
-    <ClInclude Include="spl_inl.h" />
-    <ClInclude Include="spl_inl_armv7.h" />
-    <ClInclude Include="structs.h" />
-    <ClInclude Include="typedefs.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/codecs/mod_isac/mod_isac.c b/src/mod/codecs/mod_isac/mod_isac.c
deleted file mode 100644
index 5746e62aa7..0000000000
--- a/src/mod/codecs/mod_isac/mod_isac.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / ISAC codec module
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_isac.c -- isac Codec Module
- *
- */
-
-#include <switch.h>
-#include "isac.h"
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_isac_codec_load);
-SWITCH_MODULE_DEFINITION(mod_isac, mod_isac_codec_load, NULL, NULL);
-
-struct isac_context {
-	ISACStruct *ISAC_main_inst;
-};
-
-static switch_status_t switch_isac_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-	uint32_t encoding, decoding;
-	WebRtc_Word16 err;
-	struct isac_context *context = NULL;
-
-	encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-	decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-	if (!(encoding || decoding)) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context)))) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	codec->private_info = context;
-
-	err = WebRtcIsac_Create(&context->ISAC_main_inst);
-
-	if (err < 0) return SWITCH_STATUS_FALSE;
-
-
-	if (encoding) {
-		if (WebRtcIsac_EncoderInit(context->ISAC_main_inst, 0) < 0) {
-			return SWITCH_STATUS_FALSE;
-		}
-		WebRtcIsac_SetEncSampRate(context->ISAC_main_inst, codec->implementation->actual_samples_per_second / 1000);
-	}
-
-	if (decoding) {
-		if (WebRtcIsac_DecoderInit(context->ISAC_main_inst) < 0) {
-			return SWITCH_STATUS_FALSE;
-		}
-		WebRtcIsac_SetDecSampRate(context->ISAC_main_inst, codec->implementation->actual_samples_per_second / 1000);
-	}
-
-	if (codec->implementation->actual_samples_per_second == 16000) {
-		if (WebRtcIsac_ControlBwe(context->ISAC_main_inst, 32000, codec->implementation->microseconds_per_packet / 1000, 1) < 0) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (WebRtcIsac_SetMaxPayloadSize(context->ISAC_main_inst, 400) < 0) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-	} else {
-		if (WebRtcIsac_Control(context->ISAC_main_inst, 32000, codec->implementation->microseconds_per_packet / 1000) < 0) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (WebRtcIsac_SetMaxPayloadSize(context->ISAC_main_inst, 600) < 0) {
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-
-
-	if (WebRtcIsac_SetMaxRate(context->ISAC_main_inst, codec->implementation->bits_per_second) < 0) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_isac_encode(switch_codec_t *codec, switch_codec_t *other_codec,
-										  void *decoded_data,
-										  uint32_t decoded_data_len,
-										  uint32_t decoded_rate,
-										  void *encoded_data,
-										  uint32_t *encoded_data_len,
-										  uint32_t *encoded_rate,
-										  unsigned int *flag)
-{
-	struct isac_context *context = codec->private_info;
-	WebRtc_Word16 len = 0, *in, *out;
-	int rise = (codec->implementation->actual_samples_per_second / 100);
-
-	in = decoded_data;
-	out = encoded_data;
-
-	while(len == 0) {
-		len = WebRtcIsac_Encode(context->ISAC_main_inst, in, out);
-		in += rise;
-	}
-
-	if (len < 0) {
-		return SWITCH_STATUS_GENERR;
-	}
-
-	*encoded_data_len = (uint32_t) len;
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_isac_decode(switch_codec_t *codec,
-										  switch_codec_t *other_codec,
-										  void *encoded_data,
-										  uint32_t encoded_data_len,
-										  uint32_t encoded_rate,
-										  void *decoded_data,
-										  uint32_t *decoded_data_len,
-										  uint32_t *decoded_rate,
-										  unsigned int *flag)
-{
-	struct isac_context *context = codec->private_info;
-	WebRtc_Word16 len, speechType[1];
-
-	if ((*flag & SFF_PLC)) {
-		len = WebRtcIsac_DecodePlc(context->ISAC_main_inst, decoded_data, 1);
-	} else {
-		len = WebRtcIsac_Decode(context->ISAC_main_inst, encoded_data, encoded_data_len, decoded_data, speechType);
-	}
-
-	if (len < 0) {
-		*decoded_data_len = 0;
-		return SWITCH_STATUS_GENERR;
-	}
-
-	*decoded_data_len = (uint32_t) len * 2;
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_isac_destroy(switch_codec_t *codec)
-{
-	struct isac_context *context = codec->private_info;
-
-	WebRtcIsac_Free(context->ISAC_main_inst);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_isac_codec_load)
-{
-	switch_codec_interface_t *codec_interface;
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	SWITCH_ADD_CODEC(codec_interface, "isac");	/* 8.0kbit */
-
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_AUDIO,
-										 99,
-										 "isac",
-										 "ibitrate=32000;maxbitrate=53400",
-										 16000,
-										 16000,
-										 53400,
-										 30000,
-										 480,
-										 960,
-										 0,
-										 1,
-										 3,
-										 switch_isac_init,
-										 switch_isac_encode,
-										 switch_isac_decode,
-										 switch_isac_destroy);
-
-
-
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_AUDIO,
-										 99,
-										 "isac",
-										 "ibitrate=32000;maxbitrate=53400",
-										 16000,
-										 16000,
-										 53400,
-										 60000,
-										 960,
-										 1920,
-										 0,
-										 1,
-										 6,
-										 switch_isac_init,
-										 switch_isac_encode,
-										 switch_isac_decode,
-										 switch_isac_destroy);
-
-
-
-
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_AUDIO,
-										 99,
-										 "isac",
-										 "ibitrate=32000;maxbitrate=160000",
-										 32000,
-										 32000,
-										 160000,
-										 30000,
-										 960,
-										 1920,
-										 0,
-										 1,
-										 6,
-										 switch_isac_init,
-										 switch_isac_encode,
-										 switch_isac_decode,
-										 switch_isac_destroy);
-
-
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_AUDIO,
-										 99,
-										 "isac",
-										 "ibitrate=32000;maxbitrate=160000",
-										 32000,
-										 32000,
-										 160000,
-										 60000,
-										 1920,
-										 3840,
-										 0,
-										 1,
-										 6,
-										 switch_isac_init,
-										 switch_isac_encode,
-										 switch_isac_decode,
-										 switch_isac_destroy);
-
-
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/codecs/mod_isac/os_specific_inline.h b/src/mod/codecs/mod_isac/os_specific_inline.h
deleted file mode 100644
index c469c2ec9c..0000000000
--- a/src/mod/codecs/mod_isac/os_specific_inline.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_
-
-#include <math.h>
-#include "typedefs.h"
-
-// TODO(turaj): switch to WEBRTC_POSIX when available
-#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-#define WebRtcIsac_lrint lrint
-#elif (defined(WEBRTC_ARCH_X86) && defined(WIN32))
-static __inline long int WebRtcIsac_lrint(double x_dbl) {
-  long int x_int;
-
-  __asm {
-    fld x_dbl
-    fistp x_int
-  };
-
-  return x_int;
-}
-#else // Do a slow but correct implementation of lrint
-
-static __inline long int WebRtcIsac_lrint(double x_dbl) {
-  long int x_int;
-  x_int = (long int)floor(x_dbl + 0.499999999999);
-  return x_int;
-}
-
-#endif
-
-#endif  // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_
diff --git a/src/mod/codecs/mod_isac/pitch_estimator.c b/src/mod/codecs/mod_isac/pitch_estimator.c
deleted file mode 100644
index 75525f69d4..0000000000
--- a/src/mod/codecs/mod_isac/pitch_estimator.c
+++ /dev/null
@@ -1,622 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "pitch_estimator.h"
-
-#include <math.h>
-#include <memory.h>
-#ifdef WEBRTC_ANDROID
-#include <stdlib.h>
-#endif
-
-static const double kInterpolWin[8] = {-0.00067556028640,  0.02184247643159, -0.12203175715679,  0.60086484101160,
-                                       0.60086484101160, -0.12203175715679,  0.02184247643159, -0.00067556028640};
-
-/* interpolation filter */
-__inline static void IntrepolFilter(double *data_ptr, double *intrp)
-{
-  *intrp = kInterpolWin[0] * data_ptr[-3];
-  *intrp += kInterpolWin[1] * data_ptr[-2];
-  *intrp += kInterpolWin[2] * data_ptr[-1];
-  *intrp += kInterpolWin[3] * data_ptr[0];
-  *intrp += kInterpolWin[4] * data_ptr[1];
-  *intrp += kInterpolWin[5] * data_ptr[2];
-  *intrp += kInterpolWin[6] * data_ptr[3];
-  *intrp += kInterpolWin[7] * data_ptr[4];
-}
-
-
-/* 2D parabolic interpolation */
-/* probably some 0.5 factors can be eliminated, and the square-roots can be removed from the Cholesky fact. */
-__inline static void Intrpol2D(double T[3][3], double *x, double *y, double *peak_val)
-{
-  double c, b[2], A[2][2];
-  double t1, t2, d;
-  double delta1, delta2;
-
-
-  // double T[3][3] = {{-1.25, -.25,-.25}, {-.25, .75, .75}, {-.25, .75, .75}};
-  // should result in: delta1 = 0.5;  delta2 = 0.0;  peak_val = 1.0
-
-  c = T[1][1];
-  b[0] = 0.5 * (T[1][2] + T[2][1] - T[0][1] - T[1][0]);
-  b[1] = 0.5 * (T[1][0] + T[2][1] - T[0][1] - T[1][2]);
-  A[0][1] = -0.5 * (T[0][1] + T[2][1] - T[1][0] - T[1][2]);
-  t1 = 0.5 * (T[0][0] + T[2][2]) - c;
-  t2 = 0.5 * (T[2][0] + T[0][2]) - c;
-  d = (T[0][1] + T[1][2] + T[1][0] + T[2][1]) - 4.0 * c - t1 - t2;
-  A[0][0] = -t1 - 0.5 * d;
-  A[1][1] = -t2 - 0.5 * d;
-
-  /* deal with singularities or ill-conditioned cases */
-  if ( (A[0][0] < 1e-7) || ((A[0][0] * A[1][1] - A[0][1] * A[0][1]) < 1e-7) ) {
-    *peak_val = T[1][1];
-    return;
-  }
-
-  /* Cholesky decomposition: replace A by upper-triangular factor */
-  A[0][0] = sqrt(A[0][0]);
-  A[0][1] = A[0][1] / A[0][0];
-  A[1][1] = sqrt(A[1][1] - A[0][1] * A[0][1]);
-
-  /* compute [x; y] = -0.5 * inv(A) * b */
-  t1 = b[0] / A[0][0];
-  t2 = (b[1] - t1 * A[0][1]) / A[1][1];
-  delta2 = t2 / A[1][1];
-  delta1 = 0.5 * (t1 - delta2 * A[0][1]) / A[0][0];
-  delta2 *= 0.5;
-
-  /* limit norm */
-  t1 = delta1 * delta1 + delta2 * delta2;
-  if (t1 > 1.0) {
-    delta1 /= t1;
-    delta2 /= t1;
-  }
-
-  *peak_val = 0.5 * (b[0] * delta1 + b[1] * delta2) + c;
-
-  *x += delta1;
-  *y += delta2;
-}
-
-
-static void PCorr(const double *in, double *outcorr)
-{
-  double sum, ysum, prod;
-  const double *x, *inptr;
-  int k, n;
-
-  //ysum = 1e-6;          /* use this with float (i.s.o. double)! */
-  ysum = 1e-13;
-  sum = 0.0;
-  x = in + PITCH_MAX_LAG/2 + 2;
-  for (n = 0; n < PITCH_CORR_LEN2; n++) {
-    ysum += in[n] * in[n];
-    sum += x[n] * in[n];
-  }
-
-  outcorr += PITCH_LAG_SPAN2 - 1;     /* index of last element in array */
-  *outcorr = sum / sqrt(ysum);
-
-  for (k = 1; k < PITCH_LAG_SPAN2; k++) {
-    ysum -= in[k-1] * in[k-1];
-    ysum += in[PITCH_CORR_LEN2 + k - 1] * in[PITCH_CORR_LEN2 + k - 1];
-    sum = 0.0;
-    inptr = &in[k];
-    prod = x[0] * inptr[0];
-    for (n = 1; n < PITCH_CORR_LEN2; n++) {
-      sum += prod;
-      prod = x[n] * inptr[n];
-    }
-    sum += prod;
-    outcorr--;
-    *outcorr = sum / sqrt(ysum);
-  }
-}
-
-
-void WebRtcIsac_InitializePitch(const double *in,
-                                const double old_lag,
-                                const double old_gain,
-                                PitchAnalysisStruct *State,
-                                double *lags)
-{
-  double buf_dec[PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2+2];
-  double ratio, log_lag, gain_bias;
-  double bias;
-  double corrvec1[PITCH_LAG_SPAN2];
-  double corrvec2[PITCH_LAG_SPAN2];
-  int m, k;
-  // Allocating 10 extra entries at the begining of the CorrSurf
-  double corrSurfBuff[10 + (2*PITCH_BW+3)*(PITCH_LAG_SPAN2+4)];
-  double* CorrSurf[2*PITCH_BW+3];
-  double *CorrSurfPtr1, *CorrSurfPtr2;
-  double LagWin[3] = {0.2, 0.5, 0.98};
-  int ind1, ind2, peaks_ind, peak, max_ind;
-  int peaks[PITCH_MAX_NUM_PEAKS];
-  double adj, gain_tmp;
-  double corr, corr_max;
-  double intrp_a, intrp_b, intrp_c, intrp_d;
-  double peak_vals[PITCH_MAX_NUM_PEAKS];
-  double lags1[PITCH_MAX_NUM_PEAKS];
-  double lags2[PITCH_MAX_NUM_PEAKS];
-  double T[3][3];
-  int row;
-
-  for(k = 0; k < 2*PITCH_BW+3; k++)
-  {
-    CorrSurf[k] = &corrSurfBuff[10 + k * (PITCH_LAG_SPAN2+4)];
-  }
-  /* reset CorrSurf matrix */
-  memset(corrSurfBuff, 0, sizeof(double) * (10 + (2*PITCH_BW+3) * (PITCH_LAG_SPAN2+4)));
-
-  //warnings -DH
-  max_ind = 0;
-  peak = 0;
-
-  /* copy old values from state buffer */
-  memcpy(buf_dec, State->dec_buffer, sizeof(double) * (PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2-PITCH_FRAME_LEN/2+2));
-
-  /* decimation; put result after the old values */
-  WebRtcIsac_DecimateAllpass(in, State->decimator_state, PITCH_FRAME_LEN,
-                             &buf_dec[PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2-PITCH_FRAME_LEN/2+2]);
-
-  /* low-pass filtering */
-  for (k = PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2-PITCH_FRAME_LEN/2+2; k < PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2+2; k++)
-    buf_dec[k] += 0.75 * buf_dec[k-1] - 0.25 * buf_dec[k-2];
-
-  /* copy end part back into state buffer */
-  memcpy(State->dec_buffer, buf_dec+PITCH_FRAME_LEN/2, sizeof(double) * (PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2-PITCH_FRAME_LEN/2+2));
-
-  /* compute correlation for first and second half of the frame */
-  PCorr(buf_dec, corrvec1);
-  PCorr(buf_dec + PITCH_CORR_STEP2, corrvec2);
-
-  /* bias towards pitch lag of previous frame */
-  log_lag = log(0.5 * old_lag);
-  gain_bias = 4.0 * old_gain * old_gain;
-  if (gain_bias > 0.8) gain_bias = 0.8;
-  for (k = 0; k < PITCH_LAG_SPAN2; k++)
-  {
-    ratio = log((double) (k + (PITCH_MIN_LAG/2-2))) - log_lag;
-    bias = 1.0 + gain_bias * exp(-5.0 * ratio * ratio);
-    corrvec1[k] *= bias;
-  }
-
-  /* taper correlation functions */
-  for (k = 0; k < 3; k++) {
-    gain_tmp = LagWin[k];
-    corrvec1[k] *= gain_tmp;
-    corrvec2[k] *= gain_tmp;
-    corrvec1[PITCH_LAG_SPAN2-1-k] *= gain_tmp;
-    corrvec2[PITCH_LAG_SPAN2-1-k] *= gain_tmp;
-  }
-
-  corr_max = 0.0;
-  /* fill middle row of correlation surface */
-  ind1 = 0;
-  ind2 = 0;
-  CorrSurfPtr1 = &CorrSurf[PITCH_BW][2];
-  for (k = 0; k < PITCH_LAG_SPAN2; k++) {
-    corr = corrvec1[ind1++] + corrvec2[ind2++];
-    CorrSurfPtr1[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-    }
-  }
-  /* fill first and last rows of correlation surface */
-  ind1 = 0;
-  ind2 = PITCH_BW;
-  CorrSurfPtr1 = &CorrSurf[0][2];
-  CorrSurfPtr2 = &CorrSurf[2*PITCH_BW][PITCH_BW+2];
-  for (k = 0; k < PITCH_LAG_SPAN2-PITCH_BW; k++) {
-    ratio = ((double) (ind1 + 12)) / ((double) (ind2 + 12));
-    adj = 0.2 * ratio * (2.0 - ratio);   /* adjustment factor; inverse parabola as a function of ratio */
-    corr = adj * (corrvec1[ind1] + corrvec2[ind2]);
-    CorrSurfPtr1[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-    }
-    corr = adj * (corrvec1[ind2++] + corrvec2[ind1++]);
-    CorrSurfPtr2[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr2[k] - &CorrSurf[0][0]);
-    }
-  }
-  /* fill second and next to last rows of correlation surface */
-  ind1 = 0;
-  ind2 = PITCH_BW-1;
-  CorrSurfPtr1 = &CorrSurf[1][2];
-  CorrSurfPtr2 = &CorrSurf[2*PITCH_BW-1][PITCH_BW+1];
-  for (k = 0; k < PITCH_LAG_SPAN2-PITCH_BW+1; k++) {
-    ratio = ((double) (ind1 + 12)) / ((double) (ind2 + 12));
-    adj = 0.9 * ratio * (2.0 - ratio);   /* adjustment factor; inverse parabola as a function of ratio */
-    corr = adj * (corrvec1[ind1] + corrvec2[ind2]);
-    CorrSurfPtr1[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-    }
-    corr = adj * (corrvec1[ind2++] + corrvec2[ind1++]);
-    CorrSurfPtr2[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr2[k] - &CorrSurf[0][0]);
-    }
-  }
-  /* fill remainder of correlation surface */
-  for (m = 2; m < PITCH_BW; m++) {
-    ind1 = 0;
-    ind2 = PITCH_BW - m;         /* always larger than ind1 */
-    CorrSurfPtr1 = &CorrSurf[m][2];
-    CorrSurfPtr2 = &CorrSurf[2*PITCH_BW-m][PITCH_BW+2-m];
-    for (k = 0; k < PITCH_LAG_SPAN2-PITCH_BW+m; k++) {
-      ratio = ((double) (ind1 + 12)) / ((double) (ind2 + 12));
-      adj = ratio * (2.0 - ratio);    /* adjustment factor; inverse parabola as a function of ratio */
-      corr = adj * (corrvec1[ind1] + corrvec2[ind2]);
-      CorrSurfPtr1[k] = corr;
-      if (corr > corr_max) {
-        corr_max = corr;  /* update maximum */
-        max_ind = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-      }
-      corr = adj * (corrvec1[ind2++] + corrvec2[ind1++]);
-      CorrSurfPtr2[k] = corr;
-      if (corr > corr_max) {
-        corr_max = corr;  /* update maximum */
-        max_ind = (int)(&CorrSurfPtr2[k] - &CorrSurf[0][0]);
-      }
-    }
-  }
-
-  /* threshold value to qualify as a peak */
-  corr_max *= 0.6;
-
-  peaks_ind = 0;
-  /* find peaks */
-  for (m = 1; m < PITCH_BW+1; m++) {
-    if (peaks_ind == PITCH_MAX_NUM_PEAKS) break;
-    CorrSurfPtr1 = &CorrSurf[m][2];
-    for (k = 2; k < PITCH_LAG_SPAN2-PITCH_BW-2+m; k++) {
-      corr = CorrSurfPtr1[k];
-      if (corr > corr_max) {
-        if ( (corr > CorrSurfPtr1[k - (PITCH_LAG_SPAN2+5)]) && (corr > CorrSurfPtr1[k - (PITCH_LAG_SPAN2+4)]) ) {
-          if ( (corr > CorrSurfPtr1[k + (PITCH_LAG_SPAN2+4)]) && (corr > CorrSurfPtr1[k + (PITCH_LAG_SPAN2+5)]) ) {
-            /* found a peak; store index into matrix */
-            peaks[peaks_ind++] = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-            if (peaks_ind == PITCH_MAX_NUM_PEAKS) break;
-          }
-        }
-      }
-    }
-  }
-  for (m = PITCH_BW+1; m < 2*PITCH_BW; m++) {
-    if (peaks_ind == PITCH_MAX_NUM_PEAKS) break;
-    CorrSurfPtr1 = &CorrSurf[m][2];
-    for (k = 2+m-PITCH_BW; k < PITCH_LAG_SPAN2-2; k++) {
-      corr = CorrSurfPtr1[k];
-      if (corr > corr_max) {
-        if ( (corr > CorrSurfPtr1[k - (PITCH_LAG_SPAN2+5)]) && (corr > CorrSurfPtr1[k - (PITCH_LAG_SPAN2+4)]) ) {
-          if ( (corr > CorrSurfPtr1[k + (PITCH_LAG_SPAN2+4)]) && (corr > CorrSurfPtr1[k + (PITCH_LAG_SPAN2+5)]) ) {
-            /* found a peak; store index into matrix */
-            peaks[peaks_ind++] = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-            if (peaks_ind == PITCH_MAX_NUM_PEAKS) break;
-          }
-        }
-      }
-    }
-  }
-
-  if (peaks_ind > 0) {
-    /* examine each peak */
-    CorrSurfPtr1 = &CorrSurf[0][0];
-    for (k = 0; k < peaks_ind; k++) {
-      peak = peaks[k];
-
-      /* compute four interpolated values around current peak */
-      IntrepolFilter(&CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+5)], &intrp_a);
-      IntrepolFilter(&CorrSurfPtr1[peak - 1            ], &intrp_b);
-      IntrepolFilter(&CorrSurfPtr1[peak                ], &intrp_c);
-      IntrepolFilter(&CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+4)], &intrp_d);
-
-      /* determine maximum of the interpolated values */
-      corr = CorrSurfPtr1[peak];
-      corr_max = intrp_a;
-      if (intrp_b > corr_max) corr_max = intrp_b;
-      if (intrp_c > corr_max) corr_max = intrp_c;
-      if (intrp_d > corr_max) corr_max = intrp_d;
-
-      /* determine where the peak sits and fill a 3x3 matrix around it */
-      row = peak / (PITCH_LAG_SPAN2+4);
-      lags1[k] = (double) ((peak - row * (PITCH_LAG_SPAN2+4)) + PITCH_MIN_LAG/2 - 4);
-      lags2[k] = (double) (lags1[k] + PITCH_BW - row);
-      if ( corr > corr_max ) {
-        T[0][0] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+5)];
-        T[2][0] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+4)];
-        T[1][1] = corr;
-        T[0][2] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+4)];
-        T[2][2] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+5)];
-        T[1][0] = intrp_a;
-        T[0][1] = intrp_b;
-        T[2][1] = intrp_c;
-        T[1][2] = intrp_d;
-      } else {
-        if (intrp_a == corr_max) {
-          lags1[k] -= 0.5;
-          lags2[k] += 0.5;
-          IntrepolFilter(&CorrSurfPtr1[peak - 2*(PITCH_LAG_SPAN2+5)], &T[0][0]);
-          IntrepolFilter(&CorrSurfPtr1[peak - (2*PITCH_LAG_SPAN2+9)], &T[2][0]);
-          T[1][1] = intrp_a;
-          T[0][2] = intrp_b;
-          T[2][2] = intrp_c;
-          T[1][0] = CorrSurfPtr1[peak - (2*PITCH_LAG_SPAN2+9)];
-          T[0][1] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+5)];
-          T[2][1] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+4)];
-          T[1][2] = corr;
-        } else if (intrp_b == corr_max) {
-          lags1[k] -= 0.5;
-          lags2[k] -= 0.5;
-          IntrepolFilter(&CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+6)], &T[0][0]);
-          T[2][0] = intrp_a;
-          T[1][1] = intrp_b;
-          IntrepolFilter(&CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+3)], &T[0][2]);
-          T[2][2] = intrp_d;
-          T[1][0] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+5)];
-          T[0][1] = CorrSurfPtr1[peak - 1];
-          T[2][1] = corr;
-          T[1][2] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+4)];
-        } else if (intrp_c == corr_max) {
-          lags1[k] += 0.5;
-          lags2[k] += 0.5;
-          T[0][0] = intrp_a;
-          IntrepolFilter(&CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+4)], &T[2][0]);
-          T[1][1] = intrp_c;
-          T[0][2] = intrp_d;
-          IntrepolFilter(&CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+5)], &T[2][2]);
-          T[1][0] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+4)];
-          T[0][1] = corr;
-          T[2][1] = CorrSurfPtr1[peak + 1];
-          T[1][2] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+5)];
-        } else {
-          lags1[k] += 0.5;
-          lags2[k] -= 0.5;
-          T[0][0] = intrp_b;
-          T[2][0] = intrp_c;
-          T[1][1] = intrp_d;
-          IntrepolFilter(&CorrSurfPtr1[peak + 2*(PITCH_LAG_SPAN2+4)], &T[0][2]);
-          IntrepolFilter(&CorrSurfPtr1[peak + (2*PITCH_LAG_SPAN2+9)], &T[2][2]);
-          T[1][0] = corr;
-          T[0][1] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+4)];
-          T[2][1] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+5)];
-          T[1][2] = CorrSurfPtr1[peak + (2*PITCH_LAG_SPAN2+9)];
-        }
-      }
-
-      /* 2D parabolic interpolation gives more accurate lags and peak value */
-      Intrpol2D(T, &lags1[k], &lags2[k], &peak_vals[k]);
-    }
-
-    /* determine the highest peak, after applying a bias towards short lags */
-    corr_max = 0.0;
-    for (k = 0; k < peaks_ind; k++) {
-      corr = peak_vals[k] * pow(PITCH_PEAK_DECAY, log(lags1[k] + lags2[k]));
-      if (corr > corr_max) {
-        corr_max = corr;
-        peak = k;
-      }
-    }
-
-    lags1[peak] *= 2.0;
-    lags2[peak] *= 2.0;
-
-    if (lags1[peak] < (double) PITCH_MIN_LAG) lags1[peak] = (double) PITCH_MIN_LAG;
-    if (lags2[peak] < (double) PITCH_MIN_LAG) lags2[peak] = (double) PITCH_MIN_LAG;
-    if (lags1[peak] > (double) PITCH_MAX_LAG) lags1[peak] = (double) PITCH_MAX_LAG;
-    if (lags2[peak] > (double) PITCH_MAX_LAG) lags2[peak] = (double) PITCH_MAX_LAG;
-
-    /* store lags of highest peak in output array */
-    lags[0] = lags1[peak];
-    lags[1] = lags1[peak];
-    lags[2] = lags2[peak];
-    lags[3] = lags2[peak];
-  }
-  else
-  {
-    row = max_ind / (PITCH_LAG_SPAN2+4);
-    lags1[0] = (double) ((max_ind - row * (PITCH_LAG_SPAN2+4)) + PITCH_MIN_LAG/2 - 4);
-    lags2[0] = (double) (lags1[0] + PITCH_BW - row);
-
-    if (lags1[0] < (double) PITCH_MIN_LAG) lags1[0] = (double) PITCH_MIN_LAG;
-    if (lags2[0] < (double) PITCH_MIN_LAG) lags2[0] = (double) PITCH_MIN_LAG;
-    if (lags1[0] > (double) PITCH_MAX_LAG) lags1[0] = (double) PITCH_MAX_LAG;
-    if (lags2[0] > (double) PITCH_MAX_LAG) lags2[0] = (double) PITCH_MAX_LAG;
-
-    /* store lags of highest peak in output array */
-    lags[0] = lags1[0];
-    lags[1] = lags1[0];
-    lags[2] = lags2[0];
-    lags[3] = lags2[0];
-  }
-}
-
-
-
-/* create weighting matrix by orthogonalizing a basis of polynomials of increasing order
- * t = (0:4)';
- * A = [t.^0, t.^1, t.^2, t.^3, t.^4];
- * [Q, dummy] = qr(A);
- * P.Weight = Q * diag([0, .1, .5, 1, 1]) * Q'; */
-static const double kWeight[5][5] = {
-  { 0.29714285714286,  -0.30857142857143,  -0.05714285714286,   0.05142857142857,  0.01714285714286},
-  {-0.30857142857143,   0.67428571428571,  -0.27142857142857,  -0.14571428571429,  0.05142857142857},
-  {-0.05714285714286,  -0.27142857142857,   0.65714285714286,  -0.27142857142857, -0.05714285714286},
-  { 0.05142857142857,  -0.14571428571429,  -0.27142857142857,   0.67428571428571, -0.30857142857143},
-  { 0.01714285714286,   0.05142857142857,  -0.05714285714286,  -0.30857142857143,  0.29714285714286}
-};
-
-
-void WebRtcIsac_PitchAnalysis(const double *in,               /* PITCH_FRAME_LEN samples */
-                              double *out,                    /* PITCH_FRAME_LEN+QLOOKAHEAD samples */
-                              PitchAnalysisStruct *State,
-                              double *lags,
-                              double *gains)
-{
-  double HPin[PITCH_FRAME_LEN];
-  double Weighted[PITCH_FRAME_LEN];
-  double Whitened[PITCH_FRAME_LEN + QLOOKAHEAD];
-  double inbuf[PITCH_FRAME_LEN + QLOOKAHEAD];
-  double out_G[PITCH_FRAME_LEN + QLOOKAHEAD];          // could be removed by using out instead
-  double out_dG[4][PITCH_FRAME_LEN + QLOOKAHEAD];
-  double old_lag, old_gain;
-  double nrg_wht, tmp;
-  double Wnrg, Wfluct, Wgain;
-  double H[4][4];
-  double grad[4];
-  double dG[4];
-  int k, m, n, iter;
-
-  /* high pass filtering using second order pole-zero filter */
-  WebRtcIsac_Highpass(in, HPin, State->hp_state, PITCH_FRAME_LEN);
-
-  /* copy from state into buffer */
-  memcpy(Whitened, State->whitened_buf, sizeof(double) * QLOOKAHEAD);
-
-  /* compute weighted and whitened signals */
-  WebRtcIsac_WeightingFilter(HPin, &Weighted[0], &Whitened[QLOOKAHEAD], &(State->Wghtstr));
-
-  /* copy from buffer into state */
-  memcpy(State->whitened_buf, Whitened+PITCH_FRAME_LEN, sizeof(double) * QLOOKAHEAD);
-
-  old_lag = State->PFstr_wght.oldlagp[0];
-  old_gain = State->PFstr_wght.oldgainp[0];
-
-  /* inital pitch estimate */
-  WebRtcIsac_InitializePitch(Weighted, old_lag, old_gain, State, lags);
-
-
-  /* Iterative optimization of lags - to be done */
-
-  /* compute energy of whitened signal */
-  nrg_wht = 0.0;
-  for (k = 0; k < PITCH_FRAME_LEN + QLOOKAHEAD; k++)
-    nrg_wht += Whitened[k] * Whitened[k];
-
-
-  /* Iterative optimization of gains */
-
-  /* set weights for energy, gain fluctiation, and spectral gain penalty functions */
-  Wnrg = 1.0 / nrg_wht;
-  Wgain = 0.005;
-  Wfluct = 3.0;
-
-  /* set initial gains */
-  for (k = 0; k < 4; k++)
-    gains[k] = PITCH_MAX_GAIN_06;
-
-  /* two iterations should be enough */
-  for (iter = 0; iter < 2; iter++) {
-    /* compute Jacobian of pre-filter output towards gains */
-    WebRtcIsac_PitchfilterPre_gains(Whitened, out_G, out_dG, &(State->PFstr_wght), lags, gains);
-
-    /* gradient and approximate Hessian (lower triangle) for minimizing the filter's output power */
-    for (k = 0; k < 4; k++) {
-      tmp = 0.0;
-      for (n = 0; n < PITCH_FRAME_LEN + QLOOKAHEAD; n++)
-        tmp += out_G[n] * out_dG[k][n];
-      grad[k] = tmp * Wnrg;
-    }
-    for (k = 0; k < 4; k++) {
-      for (m = 0; m <= k; m++) {
-        tmp = 0.0;
-        for (n = 0; n < PITCH_FRAME_LEN + QLOOKAHEAD; n++)
-          tmp += out_dG[m][n] * out_dG[k][n];
-        H[k][m] = tmp * Wnrg;
-      }
-    }
-
-    /* add gradient and Hessian (lower triangle) for dampening fast gain changes */
-    for (k = 0; k < 4; k++) {
-      tmp = kWeight[k+1][0] * old_gain;
-      for (m = 0; m < 4; m++)
-        tmp += kWeight[k+1][m+1] * gains[m];
-      grad[k] += tmp * Wfluct;
-    }
-    for (k = 0; k < 4; k++) {
-      for (m = 0; m <= k; m++) {
-        H[k][m] += kWeight[k+1][m+1] * Wfluct;
-      }
-    }
-
-    /* add gradient and Hessian for dampening gain */
-    for (k = 0; k < 3; k++) {
-      tmp = 1.0 / (1 - gains[k]);
-      grad[k] += tmp * tmp * Wgain;
-      H[k][k] += 2.0 * tmp * (tmp * tmp * Wgain);
-    }
-    tmp = 1.0 / (1 - gains[3]);
-    grad[3] += 1.33 * (tmp * tmp * Wgain);
-    H[3][3] += 2.66 * tmp * (tmp * tmp * Wgain);
-
-
-    /* compute Cholesky factorization of Hessian
-     * by overwritting the upper triangle; scale factors on diagonal
-     * (for non pc-platforms store the inverse of the diagonals seperately to minimize divisions) */
-    H[0][1] = H[1][0] / H[0][0];
-    H[0][2] = H[2][0] / H[0][0];
-    H[0][3] = H[3][0] / H[0][0];
-    H[1][1] -= H[0][0] * H[0][1] * H[0][1];
-    H[1][2] = (H[2][1] - H[0][1] * H[2][0]) / H[1][1];
-    H[1][3] = (H[3][1] - H[0][1] * H[3][0]) / H[1][1];
-    H[2][2] -= H[0][0] * H[0][2] * H[0][2] + H[1][1] * H[1][2] * H[1][2];
-    H[2][3] = (H[3][2] - H[0][2] * H[3][0] - H[1][2] * H[1][1] * H[1][3]) / H[2][2];
-    H[3][3] -= H[0][0] * H[0][3] * H[0][3] + H[1][1] * H[1][3] * H[1][3] + H[2][2] * H[2][3] * H[2][3];
-
-    /* Compute update as  delta_gains = -inv(H) * grad */
-    /* copy and negate */
-    for (k = 0; k < 4; k++)
-      dG[k] = -grad[k];
-    /* back substitution */
-    dG[1] -= dG[0] * H[0][1];
-    dG[2] -= dG[0] * H[0][2] + dG[1] * H[1][2];
-    dG[3] -= dG[0] * H[0][3] + dG[1] * H[1][3] + dG[2] * H[2][3];
-    /* scale */
-    for (k = 0; k < 4; k++)
-      dG[k] /= H[k][k];
-    /* back substitution */
-    dG[2] -= dG[3] * H[2][3];
-    dG[1] -= dG[3] * H[1][3] + dG[2] * H[1][2];
-    dG[0] -= dG[3] * H[0][3] + dG[2] * H[0][2] + dG[1] * H[0][1];
-
-    /* update gains and check range */
-    for (k = 0; k < 4; k++) {
-      gains[k] += dG[k];
-      if (gains[k] > PITCH_MAX_GAIN)
-        gains[k] = PITCH_MAX_GAIN;
-      else if (gains[k] < 0.0)
-        gains[k] = 0.0;
-    }
-  }
-
-  /* update state for next frame */
-  WebRtcIsac_PitchfilterPre(Whitened, out, &(State->PFstr_wght), lags, gains);
-
-  /* concatenate previous input's end and current input */
-  memcpy(inbuf, State->inbuf, sizeof(double) * QLOOKAHEAD);
-  memcpy(inbuf+QLOOKAHEAD, in, sizeof(double) * PITCH_FRAME_LEN);
-
-  /* lookahead pitch filtering for masking analysis */
-  WebRtcIsac_PitchfilterPre_la(inbuf, out, &(State->PFstr), lags, gains);
-
-  /* store last part of input */
-  for (k = 0; k < QLOOKAHEAD; k++)
-    State->inbuf[k] = inbuf[k + PITCH_FRAME_LEN];
-}
diff --git a/src/mod/codecs/mod_isac/pitch_estimator.h b/src/mod/codecs/mod_isac/pitch_estimator.h
deleted file mode 100644
index f5d93564be..0000000000
--- a/src/mod/codecs/mod_isac/pitch_estimator.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * pitch_estimator.h
- *
- * Pitch functions
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_
-
-#include "structs.h"
-
-
-
-void WebRtcIsac_PitchAnalysis(const double *in,               /* PITCH_FRAME_LEN samples */
-                              double *out,                    /* PITCH_FRAME_LEN+QLOOKAHEAD samples */
-                              PitchAnalysisStruct *State,
-                              double *lags,
-                              double *gains);
-
-void WebRtcIsac_InitializePitch(const double *in,
-                                const double old_lag,
-                                const double old_gain,
-                                PitchAnalysisStruct *State,
-                                double *lags);
-
-void WebRtcIsac_PitchfilterPre(double *indat,
-                               double *outdat,
-                               PitchFiltstr *pfp,
-                               double *lags,
-                               double *gains);
-
-void WebRtcIsac_PitchfilterPost(double *indat,
-                                double *outdat,
-                                PitchFiltstr *pfp,
-                                double *lags,
-                                double *gains);
-
-void WebRtcIsac_PitchfilterPre_la(double *indat,
-                                  double *outdat,
-                                  PitchFiltstr *pfp,
-                                  double *lags,
-                                  double *gains);
-
-void WebRtcIsac_PitchfilterPre_gains(double *indat,
-                                     double *outdat,
-                                     double out_dG[][PITCH_FRAME_LEN + QLOOKAHEAD],
-                                     PitchFiltstr *pfp,
-                                     double *lags,
-                                     double *gains);
-
-void WebRtcIsac_WeightingFilter(const double *in, double *weiout, double *whiout, WeightFiltstr *wfdata);
-
-void WebRtcIsac_Highpass(const double *in, double *out, double *state, int N);
-
-void WebRtcIsac_DecimateAllpass(const double *in,
-                                double *state_in,        /* array of size: 2*ALLPASSSECTIONS+1 */
-                                int N,                   /* number of input samples */
-                                double *out);            /* array of size N/2 */
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_ */
diff --git a/src/mod/codecs/mod_isac/pitch_filter.c b/src/mod/codecs/mod_isac/pitch_filter.c
deleted file mode 100644
index ccc8d214da..0000000000
--- a/src/mod/codecs/mod_isac/pitch_filter.c
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "pitch_estimator.h"
-#include "os_specific_inline.h"
-
-#include <stdlib.h>
-#include <memory.h>
-#include <math.h>
-
-static const double kDampFilter[PITCH_DAMPORDER] = {-0.07, 0.25, 0.64, 0.25, -0.07};
-
-/* interpolation coefficients; generated by design_pitch_filter.m */
-static const double kIntrpCoef[PITCH_FRACS][PITCH_FRACORDER] = {
-  {-0.02239172458614,  0.06653315052934, -0.16515880017569,  0.60701333734125, 0.64671399919202, -0.20249000396417,  0.09926548334755, -0.04765933793109,  0.01754159521746},
-  {-0.01985640750434,  0.05816126837866, -0.13991265473714,  0.44560418147643, 0.79117042386876, -0.20266133815188,  0.09585268418555, -0.04533310458084,  0.01654127246314},
-  {-0.01463300534216,  0.04229888475060, -0.09897034715253,  0.28284326017787, 0.90385267956632, -0.16976950138649,  0.07704272393639, -0.03584218578311,  0.01295781500709},
-  {-0.00764851320885,  0.02184035544377, -0.04985561057281,  0.13083306574393, 0.97545011664662, -0.10177807997561,  0.04400901776474, -0.02010737175166,  0.00719783432422},
-  {-0.00000000000000,  0.00000000000000, -0.00000000000001,  0.00000000000001, 0.99999999999999,  0.00000000000001, -0.00000000000001,  0.00000000000000, -0.00000000000000},
-  { 0.00719783432422, -0.02010737175166,  0.04400901776474, -0.10177807997562, 0.97545011664663,  0.13083306574393, -0.04985561057280,  0.02184035544377, -0.00764851320885},
-  { 0.01295781500710, -0.03584218578312,  0.07704272393640, -0.16976950138650, 0.90385267956634,  0.28284326017785, -0.09897034715252,  0.04229888475059, -0.01463300534216},
-  { 0.01654127246315, -0.04533310458085,  0.09585268418557, -0.20266133815190, 0.79117042386878,  0.44560418147640, -0.13991265473712,  0.05816126837865, -0.01985640750433}
-};
-
-
-void WebRtcIsac_PitchfilterPre(double *indat,
-                                double *outdat,
-                                PitchFiltstr *pfp,
-                                double *lags,
-                                double *gains)
-{
-
-  double ubuf[PITCH_INTBUFFSIZE];
-  const double *fracoeff = NULL;
-  double curgain, curlag, gaindelta, lagdelta;
-  double sum, inystate[PITCH_DAMPORDER];
-  double ftmp, oldlag, oldgain;
-  int    k, n, m, pos, ind, pos2, Li, frc;
-
-  Li = 0;
-  /* Set up buffer and states */
-  memcpy(ubuf, pfp->ubuf, sizeof(double) * PITCH_BUFFSIZE);
-  memcpy(inystate, pfp->ystate, sizeof(double) * PITCH_DAMPORDER);
-
-  oldlag = *pfp->oldlagp;
-  oldgain = *pfp->oldgainp;
-
-  /* No interpolation if pitch lag step is big */
-  if ((lags[0] > (PITCH_UPSTEP * oldlag)) || (lags[0] < (PITCH_DOWNSTEP * oldlag))) {
-    oldlag = lags[0];
-    oldgain = gains[0];
-  }
-
-  ind=0;
-  for (k=0;k<PITCH_SUBFRAMES;k++) {
-
-    /* Calculate interpolation steps */
-    lagdelta=(lags[k]-oldlag) / PITCH_GRAN_PER_SUBFRAME;
-    curlag=oldlag ;
-    gaindelta=(gains[k]-oldgain) / PITCH_GRAN_PER_SUBFRAME;
-    curgain=oldgain ;
-    oldlag=lags[k];
-    oldgain=gains[k];
-
-    for (n=0;n<PITCH_SUBFRAME_LEN;n++) {
-      if ((ind % PITCH_UPDATE) == 0) { /* Update parameters */
-        curgain += gaindelta;
-        curlag += lagdelta;
-        Li = WebRtcIsac_lrint(curlag+PITCH_FILTDELAY + 0.5);
-        ftmp = Li - (curlag+PITCH_FILTDELAY);
-        frc = WebRtcIsac_lrint(PITCH_FRACS * ftmp - 0.5);
-        fracoeff = kIntrpCoef[frc];
-      }
-
-      /* shift low pass filter state */
-      for (m=PITCH_DAMPORDER-1;m>0;m--)
-        inystate[m] = inystate[m-1];
-
-      /* Filter to get fractional pitch */
-      pos = ind + PITCH_BUFFSIZE;
-      pos2 = pos - Li;
-      sum=0;
-      for (m=0;m<PITCH_FRACORDER;m++)
-        sum += ubuf[pos2+m] * fracoeff[m];
-      inystate[0] = curgain * sum;  /* Multiply with gain */
-
-      /* Low pass filter */
-      sum=0;
-      for (m=0;m<PITCH_DAMPORDER;m++)
-        sum += inystate[m] * kDampFilter[m];
-
-      /* Subtract from input and update buffer */
-      outdat[ind] = indat[ind] - sum;
-      ubuf[pos] = indat[ind] + outdat[ind];
-      ind++;
-    }
-  }
-
-  /* Export buffer and states */
-  memcpy(pfp->ubuf, ubuf+PITCH_FRAME_LEN, sizeof(double) * PITCH_BUFFSIZE);
-  memcpy(pfp->ystate, inystate, sizeof(double) * PITCH_DAMPORDER);
-
-  *pfp->oldlagp = oldlag;
-  *pfp->oldgainp = oldgain;
-
-}
-
-
-void WebRtcIsac_PitchfilterPre_la(double *indat,
-                                   double *outdat,
-                                   PitchFiltstr *pfp,
-                                   double *lags,
-                                   double *gains)
-{
-  double ubuf[PITCH_INTBUFFSIZE+QLOOKAHEAD];
-  const double *fracoeff = NULL;
-  double curgain, curlag, gaindelta, lagdelta;
-  double sum, inystate[PITCH_DAMPORDER];
-  double ftmp;
-  double oldlag, oldgain;
-  int    k, n, m, pos, ind, pos2, Li, frc;
-
-  Li = 0;
-  /* Set up buffer and states */
-  memcpy(ubuf, pfp->ubuf, sizeof(double) * PITCH_BUFFSIZE);
-  memcpy(inystate, pfp->ystate, sizeof(double) * PITCH_DAMPORDER);
-
-  oldlag = *pfp->oldlagp;
-  oldgain = *pfp->oldgainp;
-
-  /* No interpolation if pitch lag step is big */
-  if ((lags[0] > (PITCH_UPSTEP * oldlag)) || (lags[0] < (PITCH_DOWNSTEP * oldlag))) {
-    oldlag = lags[0];
-    oldgain = gains[0];
-  }
-
-
-  ind=0;
-  for (k=0;k<PITCH_SUBFRAMES;k++) {
-
-    /* Calculate interpolation steps */
-    lagdelta=(lags[k]-oldlag) / PITCH_GRAN_PER_SUBFRAME;
-    curlag=oldlag ;
-    gaindelta=(gains[k]-oldgain) / PITCH_GRAN_PER_SUBFRAME;
-    curgain=oldgain ;
-    oldlag=lags[k];
-    oldgain=gains[k];
-
-    for (n=0;n<PITCH_SUBFRAME_LEN;n++) {
-      if ((ind % PITCH_UPDATE) == 0) {   /* Update parameters */
-        curgain += gaindelta;
-        curlag += lagdelta;
-        Li = WebRtcIsac_lrint(curlag+PITCH_FILTDELAY + 0.5);
-        ftmp = Li - (curlag+PITCH_FILTDELAY);
-        frc = WebRtcIsac_lrint(PITCH_FRACS * ftmp - 0.5);
-        fracoeff = kIntrpCoef[frc];
-      }
-
-      /* shift low pass filter state */
-      for (m=PITCH_DAMPORDER-1;m>0;m--)
-        inystate[m] = inystate[m-1];
-
-      /* Filter to get fractional pitch */
-      pos = ind + PITCH_BUFFSIZE;
-      pos2 = pos - Li;
-      sum=0.0;
-      for (m=0;m<PITCH_FRACORDER;m++)
-        sum += ubuf[pos2+m] * fracoeff[m];
-      inystate[0] = curgain * sum; /* Multiply with gain */
-
-      /* Low pass filter */
-      sum=0.0;
-      for (m=0;m<PITCH_DAMPORDER;m++)
-        sum += inystate[m] * kDampFilter[m];
-
-      /* Subtract from input and update buffer */
-      outdat[ind] = indat[ind] - sum;
-      ubuf[pos] = indat[ind] + outdat[ind];
-      ind++;
-    }
-  }
-
-  /* Export buffer and states */
-  memcpy(pfp->ubuf, ubuf+PITCH_FRAME_LEN, sizeof(double) * PITCH_BUFFSIZE);
-  memcpy(pfp->ystate, inystate, sizeof(double) * PITCH_DAMPORDER);
-
-  *pfp->oldlagp = oldlag;
-  *pfp->oldgainp = oldgain;
-
-
-  /* Filter look-ahead segment */
-  for (n=0;n<QLOOKAHEAD;n++) {
-    /* shift low pass filter state */
-    for (m=PITCH_DAMPORDER-1;m>0;m--)
-      inystate[m] = inystate[m-1];
-
-    /* Filter to get fractional pitch */
-    pos = ind + PITCH_BUFFSIZE;
-    pos2 = pos - Li;
-    sum=0.0;
-    for (m=0;m<PITCH_FRACORDER;m++)
-      sum += ubuf[pos2+m] * fracoeff[m];
-    inystate[0] = curgain * sum; /* Multiply with gain */
-
-    /* Low pass filter */
-    sum=0.0;
-    for (m=0;m<PITCH_DAMPORDER;m++)
-      sum += inystate[m] * kDampFilter[m];
-
-    /* Subtract from input and update buffer */
-    outdat[ind] = indat[ind] - sum;
-    ubuf[pos] = indat[ind] + outdat[ind];
-    ind++;
-  }
-}
-
-
-void WebRtcIsac_PitchfilterPre_gains(double *indat,
-                                      double *outdat,
-                                      double out_dG[][PITCH_FRAME_LEN + QLOOKAHEAD],
-                                      PitchFiltstr *pfp,
-                                      double *lags,
-                                      double *gains)
-{
-  double ubuf[PITCH_INTBUFFSIZE+QLOOKAHEAD];
-  double inystate_dG[4][PITCH_DAMPORDER];
-  double gain_mult[4];
-  const double *fracoeff = NULL;
-  double curgain, curlag, gaindelta, lagdelta;
-  double sum, sum2, inystate[PITCH_DAMPORDER];
-  double ftmp, oldlag, oldgain;
-  int    k, n, m, m_tmp, j, pos, ind, pos2, Li, frc;
-
-  Li = 0;
-
-  /* Set up buffer and states */
-  memcpy(ubuf, pfp->ubuf, sizeof(double) * PITCH_BUFFSIZE);
-  memcpy(inystate, pfp->ystate, sizeof(double) * PITCH_DAMPORDER);
-
-  /* clear some buffers */
-  for (k = 0; k < 4; k++) {
-    gain_mult[k] = 0.0;
-    for (n = 0; n < PITCH_DAMPORDER; n++)
-      inystate_dG[k][n] = 0.0;
-  }
-
-  oldlag = *pfp->oldlagp;
-  oldgain = *pfp->oldgainp;
-
-  /* No interpolation if pitch lag step is big */
-  if ((lags[0] > (PITCH_UPSTEP * oldlag)) || (lags[0] < (PITCH_DOWNSTEP * oldlag))) {
-    oldlag = lags[0];
-    oldgain = gains[0];
-    gain_mult[0] = 1.0;
-  }
-
-
-  ind=0;
-  for (k=0;k<PITCH_SUBFRAMES;k++) {
-
-    /* Calculate interpolation steps */
-    lagdelta=(lags[k]-oldlag) / PITCH_GRAN_PER_SUBFRAME;
-    curlag=oldlag ;
-    gaindelta=(gains[k]-oldgain) / PITCH_GRAN_PER_SUBFRAME;
-    curgain=oldgain ;
-    oldlag=lags[k];
-    oldgain=gains[k];
-
-    for (n=0;n<PITCH_SUBFRAME_LEN;n++) {
-      if ((ind % PITCH_UPDATE) == 0) {   /* Update parameters */
-        curgain += gaindelta;
-        curlag += lagdelta;
-        Li = WebRtcIsac_lrint(curlag+PITCH_FILTDELAY + 0.5);
-        ftmp = Li - (curlag+PITCH_FILTDELAY);
-        frc = WebRtcIsac_lrint(PITCH_FRACS * ftmp - 0.5);
-        fracoeff = kIntrpCoef[frc];
-        gain_mult[k] += 0.2;
-        if (gain_mult[k] > 1.0) gain_mult[k] = 1.0;
-        if (k > 0) gain_mult[k-1] -= 0.2;
-      }
-
-      /* shift low pass filter states */
-      for (m=PITCH_DAMPORDER-1;m>0;m--) {
-        inystate[m] = inystate[m-1];
-        for (j = 0; j < 4; j++)
-          inystate_dG[j][m] = inystate_dG[j][m-1];
-      }
-
-      pos = ind + PITCH_BUFFSIZE;
-      pos2 = pos - Li;
-
-      /* Filter to get fractional pitch */
-      sum=0.0;
-      for (m=0;m<PITCH_FRACORDER;m++)
-        sum += ubuf[pos2+m] * fracoeff[m];
-      inystate[0] = curgain * sum;  /* Multiply with gain */
-      m_tmp = (Li-ind > 0) ? Li-ind : 0;
-      for (j = 0; j < k+1; j++) {
-        /* filter */
-        sum2 = 0.0;
-        for (m = PITCH_FRACORDER-1; m >= m_tmp; m--)
-          sum2 += out_dG[j][ind-Li + m] * fracoeff[m];
-        inystate_dG[j][0] = gain_mult[j] * sum + curgain * sum2;
-      }
-
-      /* Low pass filter */
-      sum=0.0;
-      for (m=0;m<PITCH_DAMPORDER;m++)
-        sum += inystate[m] * kDampFilter[m];
-
-      /* Subtract from input and update buffer */
-      outdat[ind] = indat[ind] - sum;
-      ubuf[pos] = indat[ind] + outdat[ind];
-
-      for (j = 0; j < k+1; j++) {
-        sum = 0.0;
-        for (m=0;m<PITCH_DAMPORDER;m++)
-          sum -= inystate_dG[j][m] * kDampFilter[m];
-        out_dG[j][ind] = sum;
-      }
-      for (j = k+1; j < 4; j++)
-        out_dG[j][ind] = 0.0;
-
-
-      ind++;
-    }
-  }
-
-  /* Filter look-ahead segment */
-  for (n=0;n<QLOOKAHEAD;n++) {
-    /* shift low pass filter states */
-    for (m=PITCH_DAMPORDER-1;m>0;m--) {
-      inystate[m] = inystate[m-1];
-      for (j = 0; j < 4; j++)
-        inystate_dG[j][m] = inystate_dG[j][m-1];
-    }
-
-    pos = ind + PITCH_BUFFSIZE;
-    pos2 = pos - Li;
-
-    /* Filter to get fractional pitch */
-    sum=0.0;
-    for (m=0;m<PITCH_FRACORDER;m++)
-      sum += ubuf[pos2+m] * fracoeff[m];
-    inystate[0] = curgain * sum;  /* Multiply with gain */
-    m_tmp = (Li-ind > 0) ? Li-ind : 0;
-    for (j = 0; (j<k+1)&&(j<4); j++) {
-      /* filter */
-      sum2 = 0.0;
-      for (m = PITCH_FRACORDER-1; m >= m_tmp; m--)
-        sum2 += out_dG[j][ind-Li + m] * fracoeff[m];
-      inystate_dG[j][0] = gain_mult[j] * sum + curgain * sum2;
-    }
-
-    /* Low pass filter */
-    sum=0.0;
-    for (m=0;m<PITCH_DAMPORDER;m++)
-      sum += inystate[m] * kDampFilter[m];
-
-    /* Subtract from input and update buffer */
-    outdat[ind] = indat[ind] - sum;
-    ubuf[pos] = indat[ind] + outdat[ind];
-
-    for (j = 0; (j<k+1)&&(j<4); j++) {
-      sum = 0.0;
-      for (m=0;m<PITCH_DAMPORDER;m++)
-        sum -= inystate_dG[j][m] * kDampFilter[m];
-      out_dG[j][ind] = sum;
-    }
-
-    ind++;
-  }
-}
-
-
-void WebRtcIsac_PitchfilterPost(double *indat,
-                                 double *outdat,
-                                 PitchFiltstr *pfp,
-                                 double *lags,
-                                 double *gains)
-{
-
-  double ubuf[PITCH_INTBUFFSIZE];
-  const double *fracoeff = NULL;
-  double curgain, curlag, gaindelta, lagdelta;
-  double sum, inystate[PITCH_DAMPORDER];
-  double ftmp, oldlag, oldgain;
-  int    k, n, m, pos, ind, pos2, Li, frc;
-
-  Li = 0;
-
-  /* Set up buffer and states */
-  memcpy(ubuf, pfp->ubuf, sizeof(double) * PITCH_BUFFSIZE);
-  memcpy(inystate, pfp->ystate, sizeof(double) * PITCH_DAMPORDER);
-
-  oldlag = *pfp->oldlagp;
-  oldgain = *pfp->oldgainp;
-
-  /* make output more periodic */
-  for (k=0;k<PITCH_SUBFRAMES;k++)
-    gains[k] *= 1.3;
-
-  /* No interpolation if pitch lag step is big */
-  if ((lags[0] > (PITCH_UPSTEP * oldlag)) || (lags[0] < (PITCH_DOWNSTEP * oldlag))) {
-    oldlag = lags[0];
-    oldgain = gains[0];
-  }
-
-
-  ind=0;
-  for (k=0;k<PITCH_SUBFRAMES;k++) {
-
-    /* Calculate interpolation steps */
-    lagdelta=(lags[k]-oldlag) / PITCH_GRAN_PER_SUBFRAME;
-    curlag=oldlag ;
-    gaindelta=(gains[k]-oldgain) / PITCH_GRAN_PER_SUBFRAME;
-    curgain=oldgain ;
-    oldlag=lags[k];
-    oldgain=gains[k];
-
-    for (n=0;n<PITCH_SUBFRAME_LEN;n++) {
-      if ((ind % PITCH_UPDATE) == 0) {   /* Update parameters */
-        curgain += gaindelta;
-        curlag += lagdelta;
-        Li = WebRtcIsac_lrint(curlag+PITCH_FILTDELAY + 0.5);
-        ftmp = Li - (curlag+PITCH_FILTDELAY);
-        frc = WebRtcIsac_lrint(PITCH_FRACS * ftmp - 0.5);
-        fracoeff = kIntrpCoef[frc];
-      }
-
-      /* shift low pass filter state */
-      for (m=PITCH_DAMPORDER-1;m>0;m--)
-        inystate[m] = inystate[m-1];
-
-      /* Filter to get fractional pitch */
-      pos = ind + PITCH_BUFFSIZE;
-      pos2 = pos - Li;
-      sum=0.0;
-      for (m=0;m<PITCH_FRACORDER;m++)
-        sum += ubuf[pos2+m] * fracoeff[m];
-      inystate[0] = curgain * sum; /* Multiply with gain */
-
-      /* Low pass filter */
-      sum=0.0;
-      for (m=0;m<PITCH_DAMPORDER;m++)
-        sum += inystate[m] * kDampFilter[m];
-
-      /* Add to input and update buffer */
-      outdat[ind] = indat[ind] + sum;
-      ubuf[pos] = indat[ind] + outdat[ind];
-      ind++;
-    }
-  }
-
-  /* Export buffer and states */
-  memcpy(pfp->ubuf, ubuf+PITCH_FRAME_LEN, sizeof(double) * PITCH_BUFFSIZE);
-  memcpy(pfp->ystate, inystate, sizeof(double) * PITCH_DAMPORDER);
-
-  *pfp->oldlagp = oldlag;
-  *pfp->oldgainp = oldgain;
-
-}
diff --git a/src/mod/codecs/mod_isac/pitch_gain_tables.c b/src/mod/codecs/mod_isac/pitch_gain_tables.c
deleted file mode 100644
index 5d998a2928..0000000000
--- a/src/mod/codecs/mod_isac/pitch_gain_tables.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "pitch_gain_tables.h"
-
-#include "settings.h"
-
-/* header file for coding tables for the pitch filter side-info in the entropy coder */
-/********************* Pitch Filter Gain Coefficient Tables ************************/
-/* cdf for quantized pitch filter gains */
-const WebRtc_UWord16 WebRtcIsac_kQPitchGainCdf[255] = {
-  0,  2,  4,  6,  64,  901,  903,  905,  16954,  16956,
-  16961,  17360,  17362,  17364,  17366,  17368,  17370,  17372,  17374,  17411,
-  17514,  17516,  17583,  18790,  18796,  18802,  20760,  20777,  20782,  21722,
-  21724,  21728,  21738,  21740,  21742,  21744,  21746,  21748,  22224,  22227,
-  22230,  23214,  23229,  23239,  25086,  25108,  25120,  26088,  26094,  26098,
-  26175,  26177,  26179,  26181,  26183,  26185,  26484,  26507,  26522,  27705,
-  27731,  27750,  29767,  29799,  29817,  30866,  30883,  30885,  31025,  31029,
-  31031,  31033,  31035,  31037,  31114,  31126,  31134,  32687,  32722,  32767,
-  35718,  35742,  35757,  36943,  36952,  36954,  37115,  37128,  37130,  37132,
-  37134,  37136,  37143,  37145,  37152,  38843,  38863,  38897,  47458,  47467,
-  47474,  49040,  49061,  49063,  49145,  49157,  49159,  49161,  49163,  49165,
-  49167,  49169,  49171,  49757,  49770,  49782,  61333,  61344,  61346,  62860,
-  62883,  62885,  62887,  62889,  62891,  62893,  62895,  62897,  62899,  62901,
-  62903,  62905,  62907,  62909,  65496,  65498,  65500,  65521,  65523,  65525,
-  65527,  65529,  65531,  65533,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535};
-
-/* index limits and ranges */
-const WebRtc_Word16 WebRtcIsac_kIndexLowerLimitGain[3] = {
-  -7, -2, -1};
-
-const WebRtc_Word16 WebRtcIsac_kIndexUpperLimitGain[3] = {
-  0,  3,  1};
-
-const WebRtc_UWord16 WebRtcIsac_kIndexMultsGain[2] = {
-  18,  3};
-
-/* size of cdf table */
-const WebRtc_UWord16 WebRtcIsac_kQCdfTableSizeGain[1] = {
-  256};
-
-///////////////////////////FIXED POINT
-/* mean values of pitch filter gains in FIXED point */
-const WebRtc_Word16 WebRtcIsac_kQMeanGain1Q12[144] = {
-   843,    1092,    1336,    1222,    1405,    1656,    1500,    1815,    1843,    1838,    1839,    1843,    1843,    1843,    1843,    1843,
-  1843,    1843,     814,     846,    1092,    1013,    1174,    1383,    1391,    1511,    1584,    1734,    1753,    1843,    1843,    1843,
-  1843,    1843,    1843,    1843,     524,     689,     777,     845,     947,    1069,    1090,    1263,    1380,    1447,    1559,    1676,
-  1645,    1749,    1843,    1843,    1843,    1843,      81,     477,     563,     611,     706,     806,     849,    1012,    1192,    1128,
-  1330,    1489,    1425,    1576,    1826,    1741,    1843,    1843,       0,     290,     305,     356,     488,     575,     602,     741,
-   890,     835,    1079,    1196,    1182,    1376,    1519,    1506,    1680,    1843,       0,      47,      97,      69,     289,     381,
-   385,     474,     617,     664,     803,    1079,     935,    1160,    1269,    1265,    1506,    1741,       0,       0,       0,       0,
-   112,     120,     190,     283,     442,     343,     526,     809,     684,     935,    1134,    1020,    1265,    1506,       0,       0,
-     0,       0,       0,       0,       0,     111,     256,      87,     373,     597,     430,     684,     935,     770,    1020,    1265};
-
-const WebRtc_Word16 WebRtcIsac_kQMeanGain2Q12[144] = {
-  1760,    1525,    1285,    1747,    1671,    1393,    1843,    1826,    1555,    1843,    1784,    1606,    1843,    1843,    1711,    1843,
-  1843,    1814,    1389,    1275,    1040,    1564,    1414,    1252,    1610,    1495,    1343,    1753,    1592,    1405,    1804,    1720,
-  1475,    1843,    1814,    1581,    1208,    1061,    856,    1349,    1148,    994,    1390,    1253,    1111,    1495,    1343,    1178,
-  1770,    1465,    1234,    1814,    1581,    1342,    1040,    793,    713,    1053,    895,    737,    1128,    1003,    861,    1277,
-  1094,    981,    1475,    1192,    1019,    1581,    1342,    1098,    855,    570,    483,    833,    648,    540,    948,    744,
-  572,    1009,    844,    636,    1234,    934,    685,    1342,    1217,    984,    537,    318,    124,    603,    423,    350,
-  687,    479,    322,    791,    581,    430,    987,    671,    488,    1098,    849,    597,    283,    27,        0,    397,
-  222,    38,        513,    271,    124,    624,    325,    157,    737,    484,    233,    849,    597,    343,    27,        0,
-  0,    141,    0,    0,    256,    69,        0,    370,    87,        0,    484,    229,    0,    597,    343,    87};
-
-const WebRtc_Word16 WebRtcIsac_kQMeanGain3Q12[144] = {
-  1843,    1843,    1711,    1843,    1818,    1606,    1843,    1827,    1511,    1814,    1639,    1393,    1760,    1525,    1285,    1656,
-  1419,    1176,    1835,    1718,    1475,    1841,    1650,    1387,    1648,    1498,    1287,    1600,    1411,    1176,    1522,    1299,
-  1040,    1419,    1176,    928,    1773,    1461,    1128,    1532,    1355,    1202,    1429,    1260,    1115,    1398,    1151,    1025,
-  1172,    1080,    790,    1176,    928,    677,    1475,    1147,    1019,    1276,    1096,    922,    1214,    1010,    901,    1057,
-  893,    800,    1040,    796,    734,    928,    677,    424,    1137,    897,    753,    1120,    830,    710,    875,    751,
-  601,    795,    642,    583,    790,    544,    475,    677,    474,    140,    987,    750,    482,    697,    573,    450,
-  691,    487,    303,    661,    394,    332,    537,    303,    220,    424,    168,    0,    737,    484,    229,    624,
-  348,    153,    441,    261,    136,    397,    166,    51,        283,    27,        0,    168,    0,    0,    484,    229,
-  0,    370,    57,        0,    256,    43,        0,    141,    0,        0,    27,        0,    0,    0,    0,    0};
-
-
-const WebRtc_Word16 WebRtcIsac_kQMeanGain4Q12[144] = {
-  1843,    1843,    1843,    1843,    1841,    1843,    1500,    1821,    1843,    1222,    1434,    1656,    843,    1092,    1336,    504,
-  757,    1007,    1843,    1843,    1843,    1838,    1791,    1843,    1265,    1505,    1599,    965,    1219,    1425,    730,    821,
-  1092,    249,    504,    757,    1783,    1819,    1843,    1351,    1567,    1727,    1096,    1268,    1409,    805,    961,    1131,
-  444,    670,    843,    0,        249,    504,    1425,    1655,    1743,    1096,    1324,    1448,    822,    1019,    1199,    490,
-  704,    867,    81,        450,    555,    0,    0,        249,    1247,    1428,    1530,    881,    1073,    1283,    610,    759,
-  939,    278,    464,    645,    0,    200,    270,    0,    0,    0,        935,    1163,    1410,    528,    790,    1068,
-  377,    499,    717,    173,    240,    274,    0,    43,        62,        0,    0,    0,    684,    935,    1182,    343,
-  551,    735,    161,    262,    423,    0,    55,        27,        0,    0,    0,    0,    0,    0,    430,    684,
-  935,    87,        377,    597,    0,    46,        256,    0,    0,    0,    0,    0,    0,    0,    0,    0};
diff --git a/src/mod/codecs/mod_isac/pitch_gain_tables.h b/src/mod/codecs/mod_isac/pitch_gain_tables.h
deleted file mode 100644
index f958f5df45..0000000000
--- a/src/mod/codecs/mod_isac/pitch_gain_tables.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * pitch_gain_tables.h
- *
- * This file contains tables for the pitch filter side-info in the entropy coder.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
-
-#include "typedefs.h"
-
-/* header file for coding tables for the pitch filter side-info in the entropy coder */
-/********************* Pitch Filter Gain Coefficient Tables ************************/
-/* cdf for quantized pitch filter gains */
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchGainCdf[255];
-
-/* index limits and ranges */
-extern const WebRtc_Word16 WebRtcIsac_kIndexLowerLimitGain[3];
-
-extern const WebRtc_Word16 WebRtcIsac_kIndexUpperLimitGain[3];
-extern const WebRtc_UWord16 WebRtcIsac_kIndexMultsGain[2];
-
-/* mean values of pitch filter gains */
-//(Y)
-extern const WebRtc_Word16 WebRtcIsac_kQMeanGain1Q12[144];
-extern const WebRtc_Word16 WebRtcIsac_kQMeanGain2Q12[144];
-extern const WebRtc_Word16 WebRtcIsac_kQMeanGain3Q12[144];
-extern const WebRtc_Word16 WebRtcIsac_kQMeanGain4Q12[144];
-//(Y)
-
-/* size of cdf table */
-extern const WebRtc_UWord16 WebRtcIsac_kQCdfTableSizeGain[1];
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ */
diff --git a/src/mod/codecs/mod_isac/pitch_lag_tables.c b/src/mod/codecs/mod_isac/pitch_lag_tables.c
deleted file mode 100644
index 72a031e227..0000000000
--- a/src/mod/codecs/mod_isac/pitch_lag_tables.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "pitch_lag_tables.h"
-#include "settings.h"
-
-/* header file for coding tables for the pitch filter side-info in the entropy coder */
-/********************* Pitch Filter Gain Coefficient Tables ************************/
-
-/* tables for use with small pitch gain */
-
-/* cdf for quantized pitch filter lags */
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf1Lo[127] = {
- 0,  134,  336,  549,  778,  998,  1264,  1512,  1777,  2070,
- 2423,  2794,  3051,  3361,  3708,  3979,  4315,  4610,  4933,  5269,
- 5575,  5896,  6155,  6480,  6816,  7129,  7477,  7764,  8061,  8358,
- 8718,  9020,  9390,  9783,  10177,  10543,  10885,  11342,  11795,  12213,
- 12680,  13096,  13524,  13919,  14436,  14903,  15349,  15795,  16267,  16734,
- 17266,  17697,  18130,  18632,  19080,  19447,  19884,  20315,  20735,  21288,
- 21764,  22264,  22723,  23193,  23680,  24111,  24557,  25022,  25537,  26082,
- 26543,  27090,  27620,  28139,  28652,  29149,  29634,  30175,  30692,  31273,
- 31866,  32506,  33059,  33650,  34296,  34955,  35629,  36295,  36967,  37726,
- 38559,  39458,  40364,  41293,  42256,  43215,  44231,  45253,  46274,  47359,
- 48482,  49678,  50810,  51853,  53016,  54148,  55235,  56263,  57282,  58363,
- 59288,  60179,  61076,  61806,  62474,  63129,  63656,  64160,  64533,  64856,
- 65152,  65535,  65535,  65535,  65535,  65535,  65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf2Lo[20] = {
- 0,  429,  3558,  5861,  8558,  11639,  15210,  19502,  24773,  31983,
- 42602,  48567,  52601,  55676,  58160,  60172,  61889,  63235,  65383,  65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf3Lo[2] = {
- 0,  65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf4Lo[10] = {
- 0,  2966,  6368,  11182,  19431,  37793,  48532,  55353,  60626,  65535};
-
-const WebRtc_UWord16 *WebRtcIsac_kQPitchLagCdfPtrLo[4] = {WebRtcIsac_kQPitchLagCdf1Lo, WebRtcIsac_kQPitchLagCdf2Lo, WebRtcIsac_kQPitchLagCdf3Lo, WebRtcIsac_kQPitchLagCdf4Lo};
-
-/* size of first cdf table */
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdfSizeLo[1] = {128};
-
-/* index limits and ranges */
-const WebRtc_Word16 WebRtcIsac_kQIndexLowerLimitLagLo[4] = {
--140, -9,  0, -4};
-
-const WebRtc_Word16 WebRtcIsac_kQIndexUpperLimitLagLo[4] = {
--20,  9,  0,  4};
-
-/* initial index for arithmetic decoder */
-const WebRtc_UWord16 WebRtcIsac_kQInitIndexLagLo[3] = {
- 10,  1,  5};
-
-/* mean values of pitch filter lags */
-const double WebRtcIsac_kQMeanLag2Lo[19] = {
--17.21385070, -15.82678944, -14.07123081, -12.03003877, -10.01311864, -8.00794627, -5.91162987, -3.89231876, -1.90220980, -0.01879275,
- 1.89144232,  3.88123171,  5.92146992,  7.96435361,  9.98923648,  11.98266347,  13.96101002,  15.74855713,  17.10976611};
-
-const double WebRtcIsac_kQMeanLag3Lo[1] = {
- 0.00000000};
-
-const double WebRtcIsac_kQMeanLag4Lo[9] = {
--7.76246496, -5.92083980, -3.94095226, -1.89502305,  0.03724681,  1.93054221,  3.96443467,  5.91726366,  7.78434291};
-
-const double WebRtcIsac_kQPitchLagStepsizeLo = 2.000000;
-
-
-/* tables for use with medium pitch gain */
-
-/* cdf for quantized pitch filter lags */
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf1Mid[255] = {
- 0,  28,  61,  88,  121,  149,  233,  331,  475,  559,
- 624,  661,  689,  712,  745,  791,  815,  843,  866,  922,
- 959,  1024,  1061,  1117,  1178,  1238,  1280,  1350,  1453,  1513,
- 1564,  1625,  1671,  1741,  1788,  1904,  2072,  2421,  2626,  2770,
- 2840,  2900,  2942,  3012,  3068,  3115,  3147,  3194,  3254,  3319,
- 3366,  3520,  3678,  3780,  3850,  3911,  3957,  4032,  4106,  4185,
- 4292,  4474,  4683,  4842,  5019,  5191,  5321,  5428,  5540,  5675,
- 5763,  5847,  5959,  6127,  6304,  6564,  6839,  7090,  7263,  7421,
- 7556,  7728,  7872,  7984,  8142,  8361,  8580,  8743,  8938,  9227,
- 9409,  9539,  9674,  9795,  9930,  10060,  10177,  10382,  10614,  10861,
- 11038,  11271,  11415,  11629,  11792,  12044,  12193,  12416,  12574,  12821,
- 13007,  13235,  13445,  13654,  13901,  14134,  14488,  15000,  15703,  16285,
- 16504,  16797,  17086,  17328,  17579,  17807,  17998,  18268,  18538,  18836,
- 19087,  19274,  19474,  19716,  19935,  20270,  20833,  21303,  21532,  21741,
- 21978,  22207,  22523,  22770,  23054,  23613,  23943,  24204,  24399,  24651,
- 24832,  25074,  25270,  25549,  25759,  26015,  26150,  26424,  26713,  27048,
- 27342,  27504,  27681,  27854,  28021,  28207,  28412,  28664,  28859,  29064,
- 29278,  29548,  29748,  30107,  30377,  30656,  30856,  31164,  31452,  31755,
- 32011,  32328,  32626,  32919,  33319,  33789,  34329,  34925,  35396,  35973,
- 36443,  36964,  37551,  38156,  38724,  39357,  40023,  40908,  41587,  42602,
- 43924,  45037,  45810,  46597,  47421,  48291,  49092,  50051,  51448,  52719,
- 53440,  54241,  54944,  55977,  56676,  57299,  57872,  58389,  59059,  59688,
- 60237,  60782,  61094,  61573,  61890,  62290,  62658,  63030,  63217,  63454,
- 63622,  63882,  64003,  64273,  64427,  64529,  64581,  64697,  64758,  64902,
- 65414,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535,  65535,  65535,  65535,  65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf2Mid[36] = {
- 0,  71,  335,  581,  836,  1039,  1323,  1795,  2258,  2608,
- 3005,  3591,  4243,  5344,  7163,  10583,  16848,  28078,  49448,  57007,
- 60357,  61850,  62837,  63437,  63872,  64188,  64377,  64614,  64774,  64949,
- 65039,  65115,  65223,  65360,  65474,  65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf3Mid[2] = {
- 0,  65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf4Mid[20] = {
- 0,  28,  246,  459,  667,  1045,  1523,  2337,  4337,  11347,
- 44231,  56709,  60781,  62243,  63161,  63969,  64608,  65062,  65502,  65535};
-
-const WebRtc_UWord16 *WebRtcIsac_kQPitchLagCdfPtrMid[4] = {WebRtcIsac_kQPitchLagCdf1Mid, WebRtcIsac_kQPitchLagCdf2Mid, WebRtcIsac_kQPitchLagCdf3Mid, WebRtcIsac_kQPitchLagCdf4Mid};
-
-/* size of first cdf table */
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdfSizeMid[1] = {256};
-
-/* index limits and ranges */
-const WebRtc_Word16 WebRtcIsac_kQIndexLowerLimitLagMid[4] = {
--280, -17,  0, -9};
-
-const WebRtc_Word16 WebRtcIsac_kQIndexUpperLimitLagMid[4] = {
--40,  17,  0,  9};
-
-/* initial index for arithmetic decoder */
-const WebRtc_UWord16 WebRtcIsac_kQInitIndexLagMid[3] = {
- 18,  1,  10};
-
-/* mean values of pitch filter lags */
-const double WebRtcIsac_kQMeanLag2Mid[35] = {
--16.89183900, -15.86949778, -15.05476653, -14.00664348, -13.02793036, -12.07324237, -11.00542532, -10.11250602, -8.90792971, -8.02474753,
--7.00426767, -5.94055287, -4.98251338, -3.91053158, -2.98820425, -1.93524245, -0.92978085, -0.01722509,  0.91317387,  1.92973955,
- 2.96908851,  3.93728974,  4.96308471,  5.92244151,  7.08673497,  8.00993708,  9.04656316,  9.98538742,  10.97851694,  11.94772884,
- 13.02426166,  14.00039951,  15.01347042,  15.80758023,  16.94086895};
-
-const double WebRtcIsac_kQMeanLag3Mid[1] = {
- 0.00000000};
-
-const double WebRtcIsac_kQMeanLag4Mid[19] = {
--8.60409403, -7.89198395, -7.03450280, -5.86260421, -4.93822322, -3.93078706, -2.91302322, -1.91824007, -0.87003282,  0.02822649,
- 0.89951758,  1.87495484,  2.91802604,  3.96874074,  5.06571703,  5.93618227,  7.00520185,  7.88497726,  8.64160364};
-
-const double WebRtcIsac_kQPitchLagStepsizeMid = 1.000000;
-
-
-/* tables for use with large pitch gain */
-
-/* cdf for quantized pitch filter lags */
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf1Hi[511] = {
- 0,  7,  18,  33,  69,  105,  156,  228,  315,  612,
- 680,  691,  709,  724,  735,  738,  742,  746,  749,  753,
- 756,  760,  764,  774,  782,  785,  789,  796,  800,  803,
- 807,  814,  818,  822,  829,  832,  847,  854,  858,  869,
- 876,  883,  898,  908,  934,  977,  1010,  1050,  1060,  1064,
- 1075,  1078,  1086,  1089,  1093,  1104,  1111,  1122,  1133,  1136,
- 1151,  1162,  1183,  1209,  1252,  1281,  1339,  1364,  1386,  1401,
- 1411,  1415,  1426,  1430,  1433,  1440,  1448,  1455,  1462,  1477,
- 1487,  1495,  1502,  1506,  1509,  1516,  1524,  1531,  1535,  1542,
- 1553,  1556,  1578,  1589,  1611,  1625,  1639,  1643,  1654,  1665,
- 1672,  1687,  1694,  1705,  1708,  1719,  1730,  1744,  1752,  1759,
- 1791,  1795,  1820,  1867,  1886,  1915,  1936,  1943,  1965,  1987,
- 2041,  2099,  2161,  2175,  2200,  2211,  2226,  2233,  2244,  2251,
- 2266,  2280,  2287,  2298,  2309,  2316,  2331,  2342,  2356,  2378,
- 2403,  2418,  2447,  2497,  2544,  2602,  2863,  2895,  2903,  2935,
- 2950,  2971,  3004,  3011,  3018,  3029,  3040,  3062,  3087,  3127,
- 3152,  3170,  3199,  3243,  3293,  3322,  3340,  3377,  3402,  3427,
- 3474,  3518,  3543,  3579,  3601,  3637,  3659,  3706,  3731,  3760,
- 3818,  3847,  3869,  3901,  3920,  3952,  4068,  4169,  4220,  4271,
- 4524,  4571,  4604,  4632,  4672,  4730,  4777,  4806,  4857,  4904,
- 4951,  5002,  5031,  5060,  5107,  5150,  5212,  5266,  5331,  5382,
- 5432,  5490,  5544,  5610,  5700,  5762,  5812,  5874,  5972,  6022,
- 6091,  6163,  6232,  6305,  6402,  6540,  6685,  6880,  7090,  7271,
- 7379,  7452,  7542,  7625,  7687,  7770,  7843,  7911,  7966,  8024,
- 8096,  8190,  8252,  8320,  8411,  8501,  8585,  8639,  8751,  8842,
- 8918,  8986,  9066,  9127,  9203,  9269,  9345,  9406,  9464,  9536,
- 9612,  9667,  9735,  9844,  9931,  10036,  10119,  10199,  10260,  10358,
- 10441,  10514,  10666,  10734,  10872,  10951,  11053,  11125,  11223,  11324,
- 11516,  11664,  11737,  11816,  11892,  12008,  12120,  12200,  12280,  12392,
- 12490,  12576,  12685,  12812,  12917,  13003,  13108,  13210,  13300,  13384,
- 13470,  13579,  13673,  13771,  13879,  13999,  14136,  14201,  14368,  14614,
- 14759,  14867,  14958,  15030,  15121,  15189,  15280,  15385,  15461,  15555,
- 15653,  15768,  15884,  15971,  16069,  16145,  16210,  16279,  16380,  16463,
- 16539,  16615,  16688,  16818,  16919,  17017,  18041,  18338,  18523,  18649,
- 18790,  18917,  19047,  19167,  19315,  19460,  19601,  19731,  19858,  20068,
- 20173,  20318,  20466,  20625,  20741,  20911,  21045,  21201,  21396,  21588,
- 21816,  22022,  22305,  22547,  22786,  23072,  23322,  23600,  23879,  24168,
- 24433,  24769,  25120,  25511,  25895,  26289,  26792,  27219,  27683,  28077,
- 28566,  29094,  29546,  29977,  30491,  30991,  31573,  32105,  32594,  33173,
- 33788,  34497,  35181,  35833,  36488,  37255,  37921,  38645,  39275,  39894,
- 40505,  41167,  41790,  42431,  43096,  43723,  44385,  45134,  45858,  46607,
- 47349,  48091,  48768,  49405,  49955,  50555,  51167,  51985,  52611,  53078,
- 53494,  53965,  54435,  54996,  55601,  56125,  56563,  56838,  57244,  57566,
- 57967,  58297,  58771,  59093,  59419,  59647,  59886,  60143,  60461,  60693,
- 60917,  61170,  61416,  61634,  61891,  62122,  62310,  62455,  62632,  62839,
- 63103,  63436,  63639,  63805,  63906,  64015,  64192,  64355,  64475,  64558,
- 64663,  64742,  64811,  64865,  64916,  64956,  64981,  65025,  65068,  65115,
- 65195,  65314,  65419,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf2Hi[68] = {
- 0,  7,  11,  22,  37,  52,  56,  59,  81,  85,
- 89,  96,  115,  130,  137,  152,  170,  181,  193,  200,
- 207,  233,  237,  259,  289,  318,  363,  433,  592,  992,
- 1607,  3062,  6149,  12206,  25522,  48368,  58223,  61918,  63640,  64584,
- 64943,  65098,  65206,  65268,  65294,  65335,  65350,  65372,  65387,  65402,
- 65413,  65420,  65428,  65435,  65439,  65450,  65454,  65468,  65472,  65476,
- 65483,  65491,  65498,  65505,  65516,  65520,  65528,  65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf3Hi[2] = {
- 0,  65535};
-
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf4Hi[35] = {
- 0,  7,  19,  30,  41,  48,  63,  74,  82,  96,
- 122,  152,  215,  330,  701,  2611,  10931,  48106,  61177,  64341,
- 65112,  65238,  65309,  65338,  65364,  65379,  65401,  65427,  65453,  65465,
- 65476,  65490,  65509,  65528,  65535};
-
-const WebRtc_UWord16 *WebRtcIsac_kQPitchLagCdfPtrHi[4] = {WebRtcIsac_kQPitchLagCdf1Hi, WebRtcIsac_kQPitchLagCdf2Hi, WebRtcIsac_kQPitchLagCdf3Hi, WebRtcIsac_kQPitchLagCdf4Hi};
-
-/* size of first cdf table */
-const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdfSizeHi[1] = {512};
-
-/* index limits and ranges */
-const WebRtc_Word16 WebRtcIsac_kQindexLowerLimitLagHi[4] = {
--552, -34,  0, -16};
-
-const WebRtc_Word16 WebRtcIsac_kQindexUpperLimitLagHi[4] = {
--80,  32,  0,  17};
-
-/* initial index for arithmetic decoder */
-const WebRtc_UWord16 WebRtcIsac_kQInitIndexLagHi[3] = {
- 34,  1,  18};
-
-/* mean values of pitch filter lags */
-const double WebRtcIsac_kQMeanLag2Hi[67] = {
--17.07263295, -16.50000000, -15.83966081, -15.55613708, -14.96948007, -14.50000000, -14.00000000, -13.48377986, -13.00000000, -12.50000000,
--11.93199636, -11.44530414, -11.04197641, -10.39910301, -10.15202337, -9.51322461, -8.93357741, -8.46456632, -8.10270672, -7.53751847,
--6.98686404, -6.50000000, -6.08463150, -5.46872991, -5.00864717, -4.50163760, -4.01382410, -3.43856708, -2.96898001, -2.46554810,
--1.96861004, -1.47106701, -0.97197237, -0.46561654, -0.00531409,  0.45767857,  0.96777907,  1.47507903,  1.97740425,  2.46695420,
- 3.00695774,  3.47167185,  4.02712538,  4.49280007,  5.01087640,  5.48191963,  6.04916550,  6.51511058,  6.97297819,  7.46565499,
- 8.01489405,  8.39912001,  8.91819757,  9.50000000,  10.11654065,  10.50000000,  11.03712583,  11.50000000,  12.00000000,  12.38964346,
- 12.89466127,  13.43657881,  13.96013840,  14.46279912,  15.00000000,  15.39412269,  15.96662441};
-
-const double WebRtcIsac_kQMeanLag3Hi[1] = {
- 0.00000000};
-
-const double WebRtcIsac_kQMeanLag4Hi[34] = {
--7.98331221, -7.47988769, -7.03626557, -6.52708003, -6.06982173, -5.51856292, -5.05827033, -4.45909878, -3.99125864, -3.45308135,
--3.02328139, -2.47297273, -1.94341995, -1.44699056, -0.93612243, -0.43012406,  0.01120357,  0.44054812,  0.93199883,  1.45669587,
- 1.97218322,  2.50187419,  2.98748690,  3.49343202,  4.01660147,  4.50984306,  5.01402683,  5.58936797,  5.91787793,  6.59998900,
- 6.85034315,  7.53503316,  7.87711194,  8.53631648};
-
-const double WebRtcIsac_kQPitchLagStepsizeHi = 0.500000;
-
-/* transform matrix */
-const double WebRtcIsac_kTransform[4][4] = {
-{-0.50000000, -0.50000000, -0.50000000, -0.50000000},
-{ 0.67082039,  0.22360680, -0.22360680, -0.67082039},
-{ 0.50000000, -0.50000000, -0.50000000,  0.50000000},
-{ 0.22360680, -0.67082039,  0.67082039, -0.22360680}};
-
-/* transpose transform matrix */
-const double WebRtcIsac_kTransformTranspose[4][4] = {
-{-0.50000000,  0.67082039,  0.50000000,  0.22360680},
-{-0.50000000,  0.22360680, -0.50000000, -0.67082039},
-{-0.50000000, -0.22360680, -0.50000000,  0.67082039},
-{-0.50000000, -0.67082039,  0.50000000, -0.22360680}};
-
diff --git a/src/mod/codecs/mod_isac/pitch_lag_tables.h b/src/mod/codecs/mod_isac/pitch_lag_tables.h
deleted file mode 100644
index 67b02e5e4d..0000000000
--- a/src/mod/codecs/mod_isac/pitch_lag_tables.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * pitch_lag_tables.h
- *
- * This file contains tables for the pitch filter side-info in the entropy coder.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
-
-#include "typedefs.h"
-/* header file for coding tables for the pitch filter side-info in the entropy coder */
-/********************* Pitch Filter Lag Coefficient Tables ************************/
-
-/* tables for use with small pitch gain */
-
-/* cdfs for quantized pitch lags */
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf1Lo[127];
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf2Lo[20];
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf3Lo[2];
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf4Lo[10];
-
-extern const WebRtc_UWord16 *WebRtcIsac_kQPitchLagCdfPtrLo[4];
-
-/* size of first cdf table */
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdfSizeLo[1];
-
-/* index limits and ranges */
-extern const WebRtc_Word16 WebRtcIsac_kQIndexLowerLimitLagLo[4];
-extern const WebRtc_Word16 WebRtcIsac_kQIndexUpperLimitLagLo[4];
-
-/* initial index for arithmetic decoder */
-extern const WebRtc_UWord16 WebRtcIsac_kQInitIndexLagLo[3];
-
-/* mean values of pitch filter lags */
-extern const double WebRtcIsac_kQMeanLag2Lo[19];
-extern const double WebRtcIsac_kQMeanLag3Lo[1];
-extern const double WebRtcIsac_kQMeanLag4Lo[9];
-
-extern const double WebRtcIsac_kQPitchLagStepsizeLo;
-
-
-/* tables for use with medium pitch gain */
-
-/* cdfs for quantized pitch lags */
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf1Mid[255];
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf2Mid[36];
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf3Mid[2];
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf4Mid[20];
-
-extern const WebRtc_UWord16 *WebRtcIsac_kQPitchLagCdfPtrMid[4];
-
-/* size of first cdf table */
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdfSizeMid[1];
-
-/* index limits and ranges */
-extern const WebRtc_Word16 WebRtcIsac_kQIndexLowerLimitLagMid[4];
-extern const WebRtc_Word16 WebRtcIsac_kQIndexUpperLimitLagMid[4];
-
-/* initial index for arithmetic decoder */
-extern const WebRtc_UWord16 WebRtcIsac_kQInitIndexLagMid[3];
-
-/* mean values of pitch filter lags */
-extern const double WebRtcIsac_kQMeanLag2Mid[35];
-extern const double WebRtcIsac_kQMeanLag3Mid[1];
-extern const double WebRtcIsac_kQMeanLag4Mid[19];
-
-extern const double WebRtcIsac_kQPitchLagStepsizeMid;
-
-
-/* tables for use with large pitch gain */
-
-/* cdfs for quantized pitch lags */
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf1Hi[511];
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf2Hi[68];
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf3Hi[2];
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdf4Hi[35];
-
-extern const WebRtc_UWord16 *WebRtcIsac_kQPitchLagCdfPtrHi[4];
-
-/* size of first cdf table */
-extern const WebRtc_UWord16 WebRtcIsac_kQPitchLagCdfSizeHi[1];
-
-/* index limits and ranges */
-extern const WebRtc_Word16 WebRtcIsac_kQindexLowerLimitLagHi[4];
-extern const WebRtc_Word16 WebRtcIsac_kQindexUpperLimitLagHi[4];
-
-/* initial index for arithmetic decoder */
-extern const WebRtc_UWord16 WebRtcIsac_kQInitIndexLagHi[3];
-
-/* mean values of pitch filter lags */
-extern const double WebRtcIsac_kQMeanLag2Hi[67];
-extern const double WebRtcIsac_kQMeanLag3Hi[1];
-extern const double WebRtcIsac_kQMeanLag4Hi[34];
-
-extern const double WebRtcIsac_kQPitchLagStepsizeHi;
-
-/* transform matrix */
-extern const double WebRtcIsac_kTransform[4][4];
-
-/* transpose transform matrix */
-extern const double WebRtcIsac_kTransformTranspose[4][4];
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ */
diff --git a/src/mod/codecs/mod_isac/randomization_functions.c b/src/mod/codecs/mod_isac/randomization_functions.c
deleted file mode 100644
index 04271ada4d..0000000000
--- a/src/mod/codecs/mod_isac/randomization_functions.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains implementations of the randomization functions
- * WebRtcSpl_IncreaseSeed()
- * WebRtcSpl_RandU()
- * WebRtcSpl_RandN()
- * WebRtcSpl_RandUArray()
- *
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-static const WebRtc_Word16 kRandNTable[] = {
-    9178,    -7260,       40,    10189,     4894,    -3531,   -13779,    14764,
-   -4008,    -8884,    -8990,     1008,     7368,     5184,     3251,    -5817,
-   -9786,     5963,     1770,     8066,    -7135,    10772,    -2298,     1361,
-    6484,     2241,    -8633,      792,      199,    -3344,     6553,   -10079,
-  -15040,       95,    11608,   -12469,    14161,    -4176,     2476,     6403,
-   13685,   -16005,     6646,     2239,    10916,    -3004,     -602,    -3141,
-    2142,    14144,    -5829,     5305,     8209,     4713,     2697,    -5112,
-   16092,    -1210,    -2891,    -6631,    -5360,   -11878,    -6781,    -2739,
-   -6392,      536,    10923,    10872,     5059,    -4748,    -7770,     5477,
-      38,    -1025,    -2892,     1638,     6304,    14375,   -11028,     1553,
-   -1565,    10762,     -393,     4040,     5257,    12310,     6554,    -4799,
-    4899,    -6354,     1603,    -1048,    -2220,     8247,     -186,    -8944,
-  -12004,     2332,     4801,    -4933,     6371,      131,     8614,    -5927,
-   -8287,   -22760,     4033,   -15162,     3385,     3246,     3153,    -5250,
-    3766,      784,     6494,      -62,     3531,    -1582,    15572,      662,
-   -3952,     -330,    -3196,      669,     7236,    -2678,    -6569,    23319,
-   -8645,     -741,    14830,   -15976,     4903,      315,   -11342,    10311,
-    1858,    -7777,     2145,     5436,     5677,     -113,   -10033,      826,
-   -1353,    17210,     7768,      986,    -1471,     8291,    -4982,     8207,
-  -14911,    -6255,    -2449,   -11881,    -7059,   -11703,    -4338,     8025,
-    7538,    -2823,   -12490,     9470,    -1613,    -2529,   -10092,    -7807,
-    9480,     6970,   -12844,     5123,     3532,     4816,     4803,    -8455,
-   -5045,    14032,    -4378,    -1643,     5756,   -11041,    -2732,   -16618,
-   -6430,   -18375,    -3320,     6098,     5131,    -4269,    -8840,     2482,
-   -7048,     1547,   -21890,    -6505,    -7414,     -424,   -11722,     7955,
-    1653,   -17299,     1823,      473,    -9232,     3337,     1111,      873,
-    4018,    -8982,     9889,     3531,   -11763,    -3799,     7373,    -4539,
-    3231,     7054,    -8537,     7616,     6244,    16635,      447,    -2915,
-   13967,      705,    -2669,    -1520,    -1771,   -16188,     5956,     5117,
-    6371,    -9936,    -1448,     2480,     5128,     7550,    -8130,     5236,
-    8213,    -6443,     7707,    -1950,   -13811,     7218,     7031,    -3883,
-      67,     5731,    -2874,    13480,    -3743,     9298,    -3280,     3552,
-   -4425,      -18,    -3785,    -9988,    -5357,     5477,   -11794,     2117,
-    1416,    -9935,     3376,      802,    -5079,    -8243,    12652,       66,
-    3653,    -2368,     6781,   -21895,    -7227,     2487,     7839,     -385,
-    6646,    -7016,    -4658,     5531,    -1705,      834,      129,     3694,
-   -1343,     2238,   -22640,    -6417,   -11139,    11301,    -2945,    -3494,
-   -5626,      185,    -3615,    -2041,    -7972,    -3106,      -60,   -23497,
-   -1566,    17064,     3519,     2518,      304,    -6805,   -10269,     2105,
-    1936,     -426,     -736,    -8122,    -1467,     4238,    -6939,   -13309,
-     360,     7402,    -7970,    12576,     3287,    12194,    -6289,   -16006,
-    9171,     4042,    -9193,     9123,    -2512,     6388,    -4734,    -8739,
-    1028,    -5406,    -1696,     5889,     -666,    -4736,     4971,     3565,
-    9362,    -6292,     3876,    -3652,   -19666,     7523,    -4061,      391,
-  -11773,     7502,    -3763,     4929,    -9478,    13278,     2805,     4496,
-    7814,    16419,    12455,   -14773,     2127,    -2746,     3763,     4847,
-    3698,     6978,     4751,    -6957,    -3581,      -45,     6252,     1513,
-   -4797,    -7925,    11270,    16188,    -2359,    -5269,     9376,   -10777,
-    7262,    20031,    -6515,    -2208,    -5353,     8085,    -1341,    -1303,
-    7333,     5576,     3625,     5763,    -7931,     9833,    -3371,   -10305,
-    6534,   -13539,    -9971,      997,     8464,    -4064,    -1495,     1857,
-   13624,     5458,     9490,   -11086,    -4524,    12022,     -550,     -198,
-     408,    -8455,    -7068,    10289,     9712,    -3366,     9028,    -7621,
-   -5243,     2362,     6909,     4672,    -4933,    -1799,     4709,    -4563,
-     -62,     -566,     1624,    -7010,    14730,   -17791,    -3697,    -2344,
-   -1741,     7099,    -9509,    -6855,    -1989,     3495,    -2289,     2031,
-   12784,      891,    14189,    -3963,    -5683,      421,   -12575,     1724,
-  -12682,    -5970,    -8169,     3143,    -1824,    -5488,    -5130,     8536,
-   12799,      794,     5738,     3459,   -11689,     -258,    -3738,    -3775,
-   -8742,     2333,     8312,    -9383,    10331,    13119,     8398,    10644,
-  -19433,    -6446,   -16277,   -11793,    16284,     9345,    15222,    15834,
-    2009,    -7349,      130,   -14547,      338,    -5998,     3337,    21492,
-    2406,     7703,     -951,    11196,     -564,     3406,     2217,     4806,
-    2374,    -5797,    11839,     8940,   -11874,    18213,     2855,    10492
-};
-
-WebRtc_UWord32 WebRtcSpl_IncreaseSeed(WebRtc_UWord32 *seed)
-{
-    seed[0] = (seed[0] * ((WebRtc_Word32)69069) + 1) & (WEBRTC_SPL_MAX_SEED_USED - 1);
-    return seed[0];
-}
-
-WebRtc_Word16 WebRtcSpl_RandU(WebRtc_UWord32 *seed)
-{
-    return (WebRtc_Word16)(WebRtcSpl_IncreaseSeed(seed) >> 16);
-}
-
-WebRtc_Word16 WebRtcSpl_RandN(WebRtc_UWord32 *seed)
-{
-    return kRandNTable[WebRtcSpl_IncreaseSeed(seed) >> 23];
-}
-
-// Creates an array of uniformly distributed variables
-WebRtc_Word16 WebRtcSpl_RandUArray(WebRtc_Word16* vector,
-                                   WebRtc_Word16 vector_length,
-                                   WebRtc_UWord32* seed)
-{
-    int i;
-    for (i = 0; i < vector_length; i++)
-    {
-        vector[i] = WebRtcSpl_RandU(seed);
-    }
-    return vector_length;
-}
diff --git a/src/mod/codecs/mod_isac/refl_coef_to_lpc.c b/src/mod/codecs/mod_isac/refl_coef_to_lpc.c
deleted file mode 100644
index d07804dee7..0000000000
--- a/src/mod/codecs/mod_isac/refl_coef_to_lpc.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_ReflCoefToLpc().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-void WebRtcSpl_ReflCoefToLpc(G_CONST WebRtc_Word16 *k, int use_order, WebRtc_Word16 *a)
-{
-    WebRtc_Word16 any[WEBRTC_SPL_MAX_LPC_ORDER + 1];
-    WebRtc_Word16 *aptr, *aptr2, *anyptr;
-    G_CONST WebRtc_Word16 *kptr;
-    int m, i;
-
-    kptr = k;
-    *a = 4096; // i.e., (Word16_MAX >> 3)+1.
-    *any = *a;
-    a[1] = WEBRTC_SPL_RSHIFT_W16((*k), 3);
-
-    for (m = 1; m < use_order; m++)
-    {
-        kptr++;
-        aptr = a;
-        aptr++;
-        aptr2 = &a[m];
-        anyptr = any;
-        anyptr++;
-
-        any[m + 1] = WEBRTC_SPL_RSHIFT_W16((*kptr), 3);
-        for (i = 0; i < m; i++)
-        {
-            *anyptr = (*aptr)
-                    + (WebRtc_Word16)WEBRTC_SPL_MUL_16_16_RSFT((*aptr2), (*kptr), 15);
-            anyptr++;
-            aptr++;
-            aptr2--;
-        }
-
-        aptr = a;
-        anyptr = any;
-        for (i = 0; i < (m + 2); i++)
-        {
-            *aptr = *anyptr;
-            aptr++;
-            anyptr++;
-        }
-    }
-}
diff --git a/src/mod/codecs/mod_isac/resample.c b/src/mod/codecs/mod_isac/resample.c
deleted file mode 100644
index 19d1778558..0000000000
--- a/src/mod/codecs/mod_isac/resample.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the resampling functions for 22 kHz.
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-#include "resample_by_2_internal.h"
-
-// Declaration of internally used functions
-static void WebRtcSpl_32khzTo22khzIntToShort(const WebRtc_Word32 *In, WebRtc_Word16 *Out,
-                                             const WebRtc_Word32 K);
-
-void WebRtcSpl_32khzTo22khzIntToInt(const WebRtc_Word32 *In, WebRtc_Word32 *Out,
-                                    const WebRtc_Word32 K);
-
-// interpolation coefficients
-static const WebRtc_Word16 kCoefficients32To22[5][9] = {
-        {127, -712,  2359, -6333, 23456, 16775, -3695,  945, -154},
-        {-39,  230,  -830,  2785, 32366, -2324,   760, -218,   38},
-        {117, -663,  2222, -6133, 26634, 13070, -3174,  831, -137},
-        {-77,  457, -1677,  5958, 31175, -4136,  1405, -408,   71},
-        { 98, -560,  1900, -5406, 29240,  9423, -2480,  663, -110}
-};
-
-//////////////////////
-// 22 kHz -> 16 kHz //
-//////////////////////
-
-// number of subblocks; options: 1, 2, 4, 5, 10
-#define SUB_BLOCKS_22_16    5
-
-// 22 -> 16 resampler
-void WebRtcSpl_Resample22khzTo16khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                    WebRtcSpl_State22khzTo16khz* state, WebRtc_Word32* tmpmem)
-{
-    int k;
-
-    // process two blocks of 10/SUB_BLOCKS_22_16 ms (to reduce temp buffer size)
-    for (k = 0; k < SUB_BLOCKS_22_16; k++)
-    {
-        ///// 22 --> 44 /////
-        // WebRtc_Word16  in[220/SUB_BLOCKS_22_16]
-        // WebRtc_Word32 out[440/SUB_BLOCKS_22_16]
-        /////
-        WebRtcSpl_UpBy2ShortToInt(in, 220 / SUB_BLOCKS_22_16, tmpmem + 16, state->S_22_44);
-
-        ///// 44 --> 32 /////
-        // WebRtc_Word32  in[440/SUB_BLOCKS_22_16]
-        // WebRtc_Word32 out[320/SUB_BLOCKS_22_16]
-        /////
-        // copy state to and from input array
-        tmpmem[8] = state->S_44_32[0];
-        tmpmem[9] = state->S_44_32[1];
-        tmpmem[10] = state->S_44_32[2];
-        tmpmem[11] = state->S_44_32[3];
-        tmpmem[12] = state->S_44_32[4];
-        tmpmem[13] = state->S_44_32[5];
-        tmpmem[14] = state->S_44_32[6];
-        tmpmem[15] = state->S_44_32[7];
-        state->S_44_32[0] = tmpmem[440 / SUB_BLOCKS_22_16 + 8];
-        state->S_44_32[1] = tmpmem[440 / SUB_BLOCKS_22_16 + 9];
-        state->S_44_32[2] = tmpmem[440 / SUB_BLOCKS_22_16 + 10];
-        state->S_44_32[3] = tmpmem[440 / SUB_BLOCKS_22_16 + 11];
-        state->S_44_32[4] = tmpmem[440 / SUB_BLOCKS_22_16 + 12];
-        state->S_44_32[5] = tmpmem[440 / SUB_BLOCKS_22_16 + 13];
-        state->S_44_32[6] = tmpmem[440 / SUB_BLOCKS_22_16 + 14];
-        state->S_44_32[7] = tmpmem[440 / SUB_BLOCKS_22_16 + 15];
-
-        WebRtcSpl_Resample44khzTo32khz(tmpmem + 8, tmpmem, 40 / SUB_BLOCKS_22_16);
-
-        ///// 32 --> 16 /////
-        // WebRtc_Word32  in[320/SUB_BLOCKS_22_16]
-        // WebRtc_Word32 out[160/SUB_BLOCKS_22_16]
-        /////
-        WebRtcSpl_DownBy2IntToShort(tmpmem, 320 / SUB_BLOCKS_22_16, out, state->S_32_16);
-
-        // move input/output pointers 10/SUB_BLOCKS_22_16 ms seconds ahead
-        in += 220 / SUB_BLOCKS_22_16;
-        out += 160 / SUB_BLOCKS_22_16;
-    }
-}
-
-// initialize state of 22 -> 16 resampler
-void WebRtcSpl_ResetResample22khzTo16khz(WebRtcSpl_State22khzTo16khz* state)
-{
-    int k;
-    for (k = 0; k < 8; k++)
-    {
-        state->S_22_44[k] = 0;
-        state->S_44_32[k] = 0;
-        state->S_32_16[k] = 0;
-    }
-}
-
-//////////////////////
-// 16 kHz -> 22 kHz //
-//////////////////////
-
-// number of subblocks; options: 1, 2, 4, 5, 10
-#define SUB_BLOCKS_16_22    4
-
-// 16 -> 22 resampler
-void WebRtcSpl_Resample16khzTo22khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                    WebRtcSpl_State16khzTo22khz* state, WebRtc_Word32* tmpmem)
-{
-    int k;
-
-    // process two blocks of 10/SUB_BLOCKS_16_22 ms (to reduce temp buffer size)
-    for (k = 0; k < SUB_BLOCKS_16_22; k++)
-    {
-        ///// 16 --> 32 /////
-        // WebRtc_Word16  in[160/SUB_BLOCKS_16_22]
-        // WebRtc_Word32 out[320/SUB_BLOCKS_16_22]
-        /////
-        WebRtcSpl_UpBy2ShortToInt(in, 160 / SUB_BLOCKS_16_22, tmpmem + 8, state->S_16_32);
-
-        ///// 32 --> 22 /////
-        // WebRtc_Word32  in[320/SUB_BLOCKS_16_22]
-        // WebRtc_Word32 out[220/SUB_BLOCKS_16_22]
-        /////
-        // copy state to and from input array
-        tmpmem[0] = state->S_32_22[0];
-        tmpmem[1] = state->S_32_22[1];
-        tmpmem[2] = state->S_32_22[2];
-        tmpmem[3] = state->S_32_22[3];
-        tmpmem[4] = state->S_32_22[4];
-        tmpmem[5] = state->S_32_22[5];
-        tmpmem[6] = state->S_32_22[6];
-        tmpmem[7] = state->S_32_22[7];
-        state->S_32_22[0] = tmpmem[320 / SUB_BLOCKS_16_22];
-        state->S_32_22[1] = tmpmem[320 / SUB_BLOCKS_16_22 + 1];
-        state->S_32_22[2] = tmpmem[320 / SUB_BLOCKS_16_22 + 2];
-        state->S_32_22[3] = tmpmem[320 / SUB_BLOCKS_16_22 + 3];
-        state->S_32_22[4] = tmpmem[320 / SUB_BLOCKS_16_22 + 4];
-        state->S_32_22[5] = tmpmem[320 / SUB_BLOCKS_16_22 + 5];
-        state->S_32_22[6] = tmpmem[320 / SUB_BLOCKS_16_22 + 6];
-        state->S_32_22[7] = tmpmem[320 / SUB_BLOCKS_16_22 + 7];
-
-        WebRtcSpl_32khzTo22khzIntToShort(tmpmem, out, 20 / SUB_BLOCKS_16_22);
-
-        // move input/output pointers 10/SUB_BLOCKS_16_22 ms seconds ahead
-        in += 160 / SUB_BLOCKS_16_22;
-        out += 220 / SUB_BLOCKS_16_22;
-    }
-}
-
-// initialize state of 16 -> 22 resampler
-void WebRtcSpl_ResetResample16khzTo22khz(WebRtcSpl_State16khzTo22khz* state)
-{
-    int k;
-    for (k = 0; k < 8; k++)
-    {
-        state->S_16_32[k] = 0;
-        state->S_32_22[k] = 0;
-    }
-}
-
-//////////////////////
-// 22 kHz ->  8 kHz //
-//////////////////////
-
-// number of subblocks; options: 1, 2, 5, 10
-#define SUB_BLOCKS_22_8     2
-
-// 22 -> 8 resampler
-void WebRtcSpl_Resample22khzTo8khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                   WebRtcSpl_State22khzTo8khz* state, WebRtc_Word32* tmpmem)
-{
-    int k;
-
-    // process two blocks of 10/SUB_BLOCKS_22_8 ms (to reduce temp buffer size)
-    for (k = 0; k < SUB_BLOCKS_22_8; k++)
-    {
-        ///// 22 --> 22 lowpass /////
-        // WebRtc_Word16  in[220/SUB_BLOCKS_22_8]
-        // WebRtc_Word32 out[220/SUB_BLOCKS_22_8]
-        /////
-        WebRtcSpl_LPBy2ShortToInt(in, 220 / SUB_BLOCKS_22_8, tmpmem + 16, state->S_22_22);
-
-        ///// 22 --> 16 /////
-        // WebRtc_Word32  in[220/SUB_BLOCKS_22_8]
-        // WebRtc_Word32 out[160/SUB_BLOCKS_22_8]
-        /////
-        // copy state to and from input array
-        tmpmem[8] = state->S_22_16[0];
-        tmpmem[9] = state->S_22_16[1];
-        tmpmem[10] = state->S_22_16[2];
-        tmpmem[11] = state->S_22_16[3];
-        tmpmem[12] = state->S_22_16[4];
-        tmpmem[13] = state->S_22_16[5];
-        tmpmem[14] = state->S_22_16[6];
-        tmpmem[15] = state->S_22_16[7];
-        state->S_22_16[0] = tmpmem[220 / SUB_BLOCKS_22_8 + 8];
-        state->S_22_16[1] = tmpmem[220 / SUB_BLOCKS_22_8 + 9];
-        state->S_22_16[2] = tmpmem[220 / SUB_BLOCKS_22_8 + 10];
-        state->S_22_16[3] = tmpmem[220 / SUB_BLOCKS_22_8 + 11];
-        state->S_22_16[4] = tmpmem[220 / SUB_BLOCKS_22_8 + 12];
-        state->S_22_16[5] = tmpmem[220 / SUB_BLOCKS_22_8 + 13];
-        state->S_22_16[6] = tmpmem[220 / SUB_BLOCKS_22_8 + 14];
-        state->S_22_16[7] = tmpmem[220 / SUB_BLOCKS_22_8 + 15];
-
-        WebRtcSpl_Resample44khzTo32khz(tmpmem + 8, tmpmem, 20 / SUB_BLOCKS_22_8);
-
-        ///// 16 --> 8 /////
-        // WebRtc_Word32 in[160/SUB_BLOCKS_22_8]
-        // WebRtc_Word32 out[80/SUB_BLOCKS_22_8]
-        /////
-        WebRtcSpl_DownBy2IntToShort(tmpmem, 160 / SUB_BLOCKS_22_8, out, state->S_16_8);
-
-        // move input/output pointers 10/SUB_BLOCKS_22_8 ms seconds ahead
-        in += 220 / SUB_BLOCKS_22_8;
-        out += 80 / SUB_BLOCKS_22_8;
-    }
-}
-
-// initialize state of 22 -> 8 resampler
-void WebRtcSpl_ResetResample22khzTo8khz(WebRtcSpl_State22khzTo8khz* state)
-{
-    int k;
-    for (k = 0; k < 8; k++)
-    {
-        state->S_22_22[k] = 0;
-        state->S_22_22[k + 8] = 0;
-        state->S_22_16[k] = 0;
-        state->S_16_8[k] = 0;
-    }
-}
-
-//////////////////////
-//  8 kHz -> 22 kHz //
-//////////////////////
-
-// number of subblocks; options: 1, 2, 5, 10
-#define SUB_BLOCKS_8_22     2
-
-// 8 -> 22 resampler
-void WebRtcSpl_Resample8khzTo22khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                   WebRtcSpl_State8khzTo22khz* state, WebRtc_Word32* tmpmem)
-{
-    int k;
-
-    // process two blocks of 10/SUB_BLOCKS_8_22 ms (to reduce temp buffer size)
-    for (k = 0; k < SUB_BLOCKS_8_22; k++)
-    {
-        ///// 8 --> 16 /////
-        // WebRtc_Word16  in[80/SUB_BLOCKS_8_22]
-        // WebRtc_Word32 out[160/SUB_BLOCKS_8_22]
-        /////
-        WebRtcSpl_UpBy2ShortToInt(in, 80 / SUB_BLOCKS_8_22, tmpmem + 18, state->S_8_16);
-
-        ///// 16 --> 11 /////
-        // WebRtc_Word32  in[160/SUB_BLOCKS_8_22]
-        // WebRtc_Word32 out[110/SUB_BLOCKS_8_22]
-        /////
-        // copy state to and from input array
-        tmpmem[10] = state->S_16_11[0];
-        tmpmem[11] = state->S_16_11[1];
-        tmpmem[12] = state->S_16_11[2];
-        tmpmem[13] = state->S_16_11[3];
-        tmpmem[14] = state->S_16_11[4];
-        tmpmem[15] = state->S_16_11[5];
-        tmpmem[16] = state->S_16_11[6];
-        tmpmem[17] = state->S_16_11[7];
-        state->S_16_11[0] = tmpmem[160 / SUB_BLOCKS_8_22 + 10];
-        state->S_16_11[1] = tmpmem[160 / SUB_BLOCKS_8_22 + 11];
-        state->S_16_11[2] = tmpmem[160 / SUB_BLOCKS_8_22 + 12];
-        state->S_16_11[3] = tmpmem[160 / SUB_BLOCKS_8_22 + 13];
-        state->S_16_11[4] = tmpmem[160 / SUB_BLOCKS_8_22 + 14];
-        state->S_16_11[5] = tmpmem[160 / SUB_BLOCKS_8_22 + 15];
-        state->S_16_11[6] = tmpmem[160 / SUB_BLOCKS_8_22 + 16];
-        state->S_16_11[7] = tmpmem[160 / SUB_BLOCKS_8_22 + 17];
-
-        WebRtcSpl_32khzTo22khzIntToInt(tmpmem + 10, tmpmem, 10 / SUB_BLOCKS_8_22);
-
-        ///// 11 --> 22 /////
-        // WebRtc_Word32  in[110/SUB_BLOCKS_8_22]
-        // WebRtc_Word16 out[220/SUB_BLOCKS_8_22]
-        /////
-        WebRtcSpl_UpBy2IntToShort(tmpmem, 110 / SUB_BLOCKS_8_22, out, state->S_11_22);
-
-        // move input/output pointers 10/SUB_BLOCKS_8_22 ms seconds ahead
-        in += 80 / SUB_BLOCKS_8_22;
-        out += 220 / SUB_BLOCKS_8_22;
-    }
-}
-
-// initialize state of 8 -> 22 resampler
-void WebRtcSpl_ResetResample8khzTo22khz(WebRtcSpl_State8khzTo22khz* state)
-{
-    int k;
-    for (k = 0; k < 8; k++)
-    {
-        state->S_8_16[k] = 0;
-        state->S_16_11[k] = 0;
-        state->S_11_22[k] = 0;
-    }
-}
-
-// compute two inner-products and store them to output array
-static void WebRtcSpl_DotProdIntToInt(const WebRtc_Word32* in1, const WebRtc_Word32* in2,
-                                      const WebRtc_Word16* coef_ptr, WebRtc_Word32* out1,
-                                      WebRtc_Word32* out2)
-{
-    WebRtc_Word32 tmp1 = 16384;
-    WebRtc_Word32 tmp2 = 16384;
-    WebRtc_Word16 coef;
-
-    coef = coef_ptr[0];
-    tmp1 += coef * in1[0];
-    tmp2 += coef * in2[-0];
-
-    coef = coef_ptr[1];
-    tmp1 += coef * in1[1];
-    tmp2 += coef * in2[-1];
-
-    coef = coef_ptr[2];
-    tmp1 += coef * in1[2];
-    tmp2 += coef * in2[-2];
-
-    coef = coef_ptr[3];
-    tmp1 += coef * in1[3];
-    tmp2 += coef * in2[-3];
-
-    coef = coef_ptr[4];
-    tmp1 += coef * in1[4];
-    tmp2 += coef * in2[-4];
-
-    coef = coef_ptr[5];
-    tmp1 += coef * in1[5];
-    tmp2 += coef * in2[-5];
-
-    coef = coef_ptr[6];
-    tmp1 += coef * in1[6];
-    tmp2 += coef * in2[-6];
-
-    coef = coef_ptr[7];
-    tmp1 += coef * in1[7];
-    tmp2 += coef * in2[-7];
-
-    coef = coef_ptr[8];
-    *out1 = tmp1 + coef * in1[8];
-    *out2 = tmp2 + coef * in2[-8];
-}
-
-// compute two inner-products and store them to output array
-static void WebRtcSpl_DotProdIntToShort(const WebRtc_Word32* in1, const WebRtc_Word32* in2,
-                                        const WebRtc_Word16* coef_ptr, WebRtc_Word16* out1,
-                                        WebRtc_Word16* out2)
-{
-    WebRtc_Word32 tmp1 = 16384;
-    WebRtc_Word32 tmp2 = 16384;
-    WebRtc_Word16 coef;
-
-    coef = coef_ptr[0];
-    tmp1 += coef * in1[0];
-    tmp2 += coef * in2[-0];
-
-    coef = coef_ptr[1];
-    tmp1 += coef * in1[1];
-    tmp2 += coef * in2[-1];
-
-    coef = coef_ptr[2];
-    tmp1 += coef * in1[2];
-    tmp2 += coef * in2[-2];
-
-    coef = coef_ptr[3];
-    tmp1 += coef * in1[3];
-    tmp2 += coef * in2[-3];
-
-    coef = coef_ptr[4];
-    tmp1 += coef * in1[4];
-    tmp2 += coef * in2[-4];
-
-    coef = coef_ptr[5];
-    tmp1 += coef * in1[5];
-    tmp2 += coef * in2[-5];
-
-    coef = coef_ptr[6];
-    tmp1 += coef * in1[6];
-    tmp2 += coef * in2[-6];
-
-    coef = coef_ptr[7];
-    tmp1 += coef * in1[7];
-    tmp2 += coef * in2[-7];
-
-    coef = coef_ptr[8];
-    tmp1 += coef * in1[8];
-    tmp2 += coef * in2[-8];
-
-    // scale down, round and saturate
-    tmp1 >>= 15;
-    if (tmp1 > (WebRtc_Word32)0x00007FFF)
-        tmp1 = 0x00007FFF;
-    if (tmp1 < (WebRtc_Word32)0xFFFF8000)
-        tmp1 = 0xFFFF8000;
-    tmp2 >>= 15;
-    if (tmp2 > (WebRtc_Word32)0x00007FFF)
-        tmp2 = 0x00007FFF;
-    if (tmp2 < (WebRtc_Word32)0xFFFF8000)
-        tmp2 = 0xFFFF8000;
-    *out1 = (WebRtc_Word16)tmp1;
-    *out2 = (WebRtc_Word16)tmp2;
-}
-
-//   Resampling ratio: 11/16
-// input:  WebRtc_Word32 (normalized, not saturated) :: size 16 * K
-// output: WebRtc_Word32 (shifted 15 positions to the left, + offset 16384) :: size 11 * K
-//      K: Number of blocks
-
-void WebRtcSpl_32khzTo22khzIntToInt(const WebRtc_Word32* In,
-                                    WebRtc_Word32* Out,
-                                    const WebRtc_Word32 K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (16 input samples -> 11 output samples);
-    // process in sub blocks of size 16 samples.
-    WebRtc_Word32 m;
-
-    for (m = 0; m < K; m++)
-    {
-        // first output sample
-        Out[0] = ((WebRtc_Word32)In[3] << 15) + (1 << 14);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[0], &In[22], kCoefficients32To22[0], &Out[1], &Out[10]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[2], &In[20], kCoefficients32To22[1], &Out[2], &Out[9]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[3], &In[19], kCoefficients32To22[2], &Out[3], &Out[8]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[5], &In[17], kCoefficients32To22[3], &Out[4], &Out[7]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[6], &In[16], kCoefficients32To22[4], &Out[5], &Out[6]);
-
-        // update pointers
-        In += 16;
-        Out += 11;
-    }
-}
-
-//   Resampling ratio: 11/16
-// input:  WebRtc_Word32 (normalized, not saturated) :: size 16 * K
-// output: WebRtc_Word16 (saturated) :: size 11 * K
-//      K: Number of blocks
-
-void WebRtcSpl_32khzTo22khzIntToShort(const WebRtc_Word32 *In,
-                                      WebRtc_Word16 *Out,
-                                      const WebRtc_Word32 K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (16 input samples -> 11 output samples);
-    // process in sub blocks of size 16 samples.
-    WebRtc_Word32 tmp;
-    WebRtc_Word32 m;
-
-    for (m = 0; m < K; m++)
-    {
-        // first output sample
-        tmp = In[3];
-        if (tmp > (WebRtc_Word32)0x00007FFF)
-            tmp = 0x00007FFF;
-        if (tmp < (WebRtc_Word32)0xFFFF8000)
-            tmp = 0xFFFF8000;
-        Out[0] = (WebRtc_Word16)tmp;
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[0], &In[22], kCoefficients32To22[0], &Out[1], &Out[10]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[2], &In[20], kCoefficients32To22[1], &Out[2], &Out[9]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[3], &In[19], kCoefficients32To22[2], &Out[3], &Out[8]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[5], &In[17], kCoefficients32To22[3], &Out[4], &Out[7]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[6], &In[16], kCoefficients32To22[4], &Out[5], &Out[6]);
-
-        // update pointers
-        In += 16;
-        Out += 11;
-    }
-}
diff --git a/src/mod/codecs/mod_isac/resample_48khz.c b/src/mod/codecs/mod_isac/resample_48khz.c
deleted file mode 100644
index 31cbe6b6a9..0000000000
--- a/src/mod/codecs/mod_isac/resample_48khz.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains resampling functions between 48 kHz and nb/wb.
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include <string.h>
-#include "signal_processing_library.h"
-#include "resample_by_2_internal.h"
-
-////////////////////////////
-///// 48 kHz -> 16 kHz /////
-////////////////////////////
-
-// 48 -> 16 resampler
-void WebRtcSpl_Resample48khzTo16khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                    WebRtcSpl_State48khzTo16khz* state, WebRtc_Word32* tmpmem)
-{
-    ///// 48 --> 48(LP) /////
-    // WebRtc_Word16  in[480]
-    // WebRtc_Word32 out[480]
-    /////
-    WebRtcSpl_LPBy2ShortToInt(in, 480, tmpmem + 16, state->S_48_48);
-
-    ///// 48 --> 32 /////
-    // WebRtc_Word32  in[480]
-    // WebRtc_Word32 out[320]
-    /////
-    // copy state to and from input array
-    memcpy(tmpmem + 8, state->S_48_32, 8 * sizeof(WebRtc_Word32));
-    memcpy(state->S_48_32, tmpmem + 488, 8 * sizeof(WebRtc_Word32));
-    WebRtcSpl_Resample48khzTo32khz(tmpmem + 8, tmpmem, 160);
-
-    ///// 32 --> 16 /////
-    // WebRtc_Word32  in[320]
-    // WebRtc_Word16 out[160]
-    /////
-    WebRtcSpl_DownBy2IntToShort(tmpmem, 320, out, state->S_32_16);
-}
-
-// initialize state of 48 -> 16 resampler
-void WebRtcSpl_ResetResample48khzTo16khz(WebRtcSpl_State48khzTo16khz* state)
-{
-    memset(state->S_48_48, 0, 16 * sizeof(WebRtc_Word32));
-    memset(state->S_48_32, 0, 8 * sizeof(WebRtc_Word32));
-    memset(state->S_32_16, 0, 8 * sizeof(WebRtc_Word32));
-}
-
-////////////////////////////
-///// 16 kHz -> 48 kHz /////
-////////////////////////////
-
-// 16 -> 48 resampler
-void WebRtcSpl_Resample16khzTo48khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                    WebRtcSpl_State16khzTo48khz* state, WebRtc_Word32* tmpmem)
-{
-    ///// 16 --> 32 /////
-    // WebRtc_Word16  in[160]
-    // WebRtc_Word32 out[320]
-    /////
-    WebRtcSpl_UpBy2ShortToInt(in, 160, tmpmem + 16, state->S_16_32);
-
-    ///// 32 --> 24 /////
-    // WebRtc_Word32  in[320]
-    // WebRtc_Word32 out[240]
-    // copy state to and from input array
-    /////
-    memcpy(tmpmem + 8, state->S_32_24, 8 * sizeof(WebRtc_Word32));
-    memcpy(state->S_32_24, tmpmem + 328, 8 * sizeof(WebRtc_Word32));
-    WebRtcSpl_Resample32khzTo24khz(tmpmem + 8, tmpmem, 80);
-
-    ///// 24 --> 48 /////
-    // WebRtc_Word32  in[240]
-    // WebRtc_Word16 out[480]
-    /////
-    WebRtcSpl_UpBy2IntToShort(tmpmem, 240, out, state->S_24_48);
-}
-
-// initialize state of 16 -> 48 resampler
-void WebRtcSpl_ResetResample16khzTo48khz(WebRtcSpl_State16khzTo48khz* state)
-{
-    memset(state->S_16_32, 0, 8 * sizeof(WebRtc_Word32));
-    memset(state->S_32_24, 0, 8 * sizeof(WebRtc_Word32));
-    memset(state->S_24_48, 0, 8 * sizeof(WebRtc_Word32));
-}
-
-////////////////////////////
-///// 48 kHz ->  8 kHz /////
-////////////////////////////
-
-// 48 -> 8 resampler
-void WebRtcSpl_Resample48khzTo8khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                   WebRtcSpl_State48khzTo8khz* state, WebRtc_Word32* tmpmem)
-{
-    ///// 48 --> 24 /////
-    // WebRtc_Word16  in[480]
-    // WebRtc_Word32 out[240]
-    /////
-    WebRtcSpl_DownBy2ShortToInt(in, 480, tmpmem + 256, state->S_48_24);
-
-    ///// 24 --> 24(LP) /////
-    // WebRtc_Word32  in[240]
-    // WebRtc_Word32 out[240]
-    /////
-    WebRtcSpl_LPBy2IntToInt(tmpmem + 256, 240, tmpmem + 16, state->S_24_24);
-
-    ///// 24 --> 16 /////
-    // WebRtc_Word32  in[240]
-    // WebRtc_Word32 out[160]
-    /////
-    // copy state to and from input array
-    memcpy(tmpmem + 8, state->S_24_16, 8 * sizeof(WebRtc_Word32));
-    memcpy(state->S_24_16, tmpmem + 248, 8 * sizeof(WebRtc_Word32));
-    WebRtcSpl_Resample48khzTo32khz(tmpmem + 8, tmpmem, 80);
-
-    ///// 16 --> 8 /////
-    // WebRtc_Word32  in[160]
-    // WebRtc_Word16 out[80]
-    /////
-    WebRtcSpl_DownBy2IntToShort(tmpmem, 160, out, state->S_16_8);
-}
-
-// initialize state of 48 -> 8 resampler
-void WebRtcSpl_ResetResample48khzTo8khz(WebRtcSpl_State48khzTo8khz* state)
-{
-    memset(state->S_48_24, 0, 8 * sizeof(WebRtc_Word32));
-    memset(state->S_24_24, 0, 16 * sizeof(WebRtc_Word32));
-    memset(state->S_24_16, 0, 8 * sizeof(WebRtc_Word32));
-    memset(state->S_16_8, 0, 8 * sizeof(WebRtc_Word32));
-}
-
-////////////////////////////
-/////  8 kHz -> 48 kHz /////
-////////////////////////////
-
-// 8 -> 48 resampler
-void WebRtcSpl_Resample8khzTo48khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                   WebRtcSpl_State8khzTo48khz* state, WebRtc_Word32* tmpmem)
-{
-    ///// 8 --> 16 /////
-    // WebRtc_Word16  in[80]
-    // WebRtc_Word32 out[160]
-    /////
-    WebRtcSpl_UpBy2ShortToInt(in, 80, tmpmem + 264, state->S_8_16);
-
-    ///// 16 --> 12 /////
-    // WebRtc_Word32  in[160]
-    // WebRtc_Word32 out[120]
-    /////
-    // copy state to and from input array
-    memcpy(tmpmem + 256, state->S_16_12, 8 * sizeof(WebRtc_Word32));
-    memcpy(state->S_16_12, tmpmem + 416, 8 * sizeof(WebRtc_Word32));
-    WebRtcSpl_Resample32khzTo24khz(tmpmem + 256, tmpmem + 240, 40);
-
-    ///// 12 --> 24 /////
-    // WebRtc_Word32  in[120]
-    // WebRtc_Word16 out[240]
-    /////
-    WebRtcSpl_UpBy2IntToInt(tmpmem + 240, 120, tmpmem, state->S_12_24);
-
-    ///// 24 --> 48 /////
-    // WebRtc_Word32  in[240]
-    // WebRtc_Word16 out[480]
-    /////
-    WebRtcSpl_UpBy2IntToShort(tmpmem, 240, out, state->S_24_48);
-}
-
-// initialize state of 8 -> 48 resampler
-void WebRtcSpl_ResetResample8khzTo48khz(WebRtcSpl_State8khzTo48khz* state)
-{
-    memset(state->S_8_16, 0, 8 * sizeof(WebRtc_Word32));
-    memset(state->S_16_12, 0, 8 * sizeof(WebRtc_Word32));
-    memset(state->S_12_24, 0, 8 * sizeof(WebRtc_Word32));
-    memset(state->S_24_48, 0, 8 * sizeof(WebRtc_Word32));
-}
diff --git a/src/mod/codecs/mod_isac/resample_by_2.c b/src/mod/codecs/mod_isac/resample_by_2.c
deleted file mode 100644
index ead598d2c6..0000000000
--- a/src/mod/codecs/mod_isac/resample_by_2.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the resampling by two functions.
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-#ifdef WEBRTC_ARCH_ARM_V7A
-
-// allpass filter coefficients.
-static const WebRtc_UWord32 kResampleAllpass1[3] = {3284, 24441, 49528 << 15};
-static const WebRtc_UWord32 kResampleAllpass2[3] =
-  {12199, 37471 << 15, 60255 << 15};
-
-// Multiply two 32-bit values and accumulate to another input value.
-// Return: state + ((diff * tbl_value) >> 16)
-
-static __inline WebRtc_Word32 MUL_ACCUM_1(WebRtc_Word32 tbl_value,
-                                          WebRtc_Word32 diff,
-                                          WebRtc_Word32 state) {
-  WebRtc_Word32 result;
-  __asm__("smlawb %r0, %r1, %r2, %r3": "=r"(result): "r"(diff),
-                                       "r"(tbl_value), "r"(state));
-  return result;
-}
-
-// Multiply two 32-bit values and accumulate to another input value.
-// Return: Return: state + (((diff << 1) * tbl_value) >> 32)
-//
-// The reason to introduce this function is that, in case we can't use smlawb
-// instruction (in MUL_ACCUM_1) due to input value range, we can still use
-// smmla to save some cycles.
-
-static __inline WebRtc_Word32 MUL_ACCUM_2(WebRtc_Word32 tbl_value,
-                                          WebRtc_Word32 diff,
-                                          WebRtc_Word32 state) {
-  WebRtc_Word32 result;
-  __asm__("smmla %r0, %r1, %r2, %r3": "=r"(result): "r"(diff << 1),
-                                      "r"(tbl_value), "r"(state));
-  return result;
-}
-
-#else
-
-// allpass filter coefficients.
-static const WebRtc_UWord16 kResampleAllpass1[3] = {3284, 24441, 49528};
-static const WebRtc_UWord16 kResampleAllpass2[3] = {12199, 37471, 60255};
-
-// Multiply a 32-bit value with a 16-bit value and accumulate to another input:
-#define MUL_ACCUM_1(a, b, c) WEBRTC_SPL_SCALEDIFF32(a, b, c)
-#define MUL_ACCUM_2(a, b, c) WEBRTC_SPL_SCALEDIFF32(a, b, c)
-
-#endif  // WEBRTC_ARCH_ARM_V7A
-
-
-// decimator
-void WebRtcSpl_DownsampleBy2(const WebRtc_Word16* in, const WebRtc_Word16 len,
-                             WebRtc_Word16* out, WebRtc_Word32* filtState) {
-  WebRtc_Word32 tmp1, tmp2, diff, in32, out32;
-  WebRtc_Word16 i;
-
-  register WebRtc_Word32 state0 = filtState[0];
-  register WebRtc_Word32 state1 = filtState[1];
-  register WebRtc_Word32 state2 = filtState[2];
-  register WebRtc_Word32 state3 = filtState[3];
-  register WebRtc_Word32 state4 = filtState[4];
-  register WebRtc_Word32 state5 = filtState[5];
-  register WebRtc_Word32 state6 = filtState[6];
-  register WebRtc_Word32 state7 = filtState[7];
-
-  for (i = (len >> 1); i > 0; i--) {
-    // lower allpass filter
-    in32 = (WebRtc_Word32)(*in++) << 10;
-    diff = in32 - state1;
-    tmp1 = MUL_ACCUM_1(kResampleAllpass2[0], diff, state0);
-    state0 = in32;
-    diff = tmp1 - state2;
-    tmp2 = MUL_ACCUM_2(kResampleAllpass2[1], diff, state1);
-    state1 = tmp1;
-    diff = tmp2 - state3;
-    state3 = MUL_ACCUM_2(kResampleAllpass2[2], diff, state2);
-    state2 = tmp2;
-
-    // upper allpass filter
-    in32 = (WebRtc_Word32)(*in++) << 10;
-    diff = in32 - state5;
-    tmp1 = MUL_ACCUM_1(kResampleAllpass1[0], diff, state4);
-    state4 = in32;
-    diff = tmp1 - state6;
-    tmp2 = MUL_ACCUM_1(kResampleAllpass1[1], diff, state5);
-    state5 = tmp1;
-    diff = tmp2 - state7;
-    state7 = MUL_ACCUM_2(kResampleAllpass1[2], diff, state6);
-    state6 = tmp2;
-
-    // add two allpass outputs, divide by two and round
-    out32 = (state3 + state7 + 1024) >> 11;
-
-    // limit amplitude to prevent wrap-around, and write to output array
-    *out++ = WebRtcSpl_SatW32ToW16(out32);
-  }
-
-  filtState[0] = state0;
-  filtState[1] = state1;
-  filtState[2] = state2;
-  filtState[3] = state3;
-  filtState[4] = state4;
-  filtState[5] = state5;
-  filtState[6] = state6;
-  filtState[7] = state7;
-}
-
-
-void WebRtcSpl_UpsampleBy2(const WebRtc_Word16* in, WebRtc_Word16 len,
-                           WebRtc_Word16* out, WebRtc_Word32* filtState) {
-  WebRtc_Word32 tmp1, tmp2, diff, in32, out32;
-  WebRtc_Word16 i;
-
-  register WebRtc_Word32 state0 = filtState[0];
-  register WebRtc_Word32 state1 = filtState[1];
-  register WebRtc_Word32 state2 = filtState[2];
-  register WebRtc_Word32 state3 = filtState[3];
-  register WebRtc_Word32 state4 = filtState[4];
-  register WebRtc_Word32 state5 = filtState[5];
-  register WebRtc_Word32 state6 = filtState[6];
-  register WebRtc_Word32 state7 = filtState[7];
-
-  for (i = len; i > 0; i--) {
-    // lower allpass filter
-    in32 = (WebRtc_Word32)(*in++) << 10;
-    diff = in32 - state1;
-    tmp1 = MUL_ACCUM_1(kResampleAllpass1[0], diff, state0);
-    state0 = in32;
-    diff = tmp1 - state2;
-    tmp2 = MUL_ACCUM_1(kResampleAllpass1[1], diff, state1);
-    state1 = tmp1;
-    diff = tmp2 - state3;
-    state3 = MUL_ACCUM_2(kResampleAllpass1[2], diff, state2);
-    state2 = tmp2;
-
-    // round; limit amplitude to prevent wrap-around; write to output array
-    out32 = (state3 + 512) >> 10;
-    *out++ = WebRtcSpl_SatW32ToW16(out32);
-
-    // upper allpass filter
-    diff = in32 - state5;
-    tmp1 = MUL_ACCUM_1(kResampleAllpass2[0], diff, state4);
-    state4 = in32;
-    diff = tmp1 - state6;
-    tmp2 = MUL_ACCUM_2(kResampleAllpass2[1], diff, state5);
-    state5 = tmp1;
-    diff = tmp2 - state7;
-    state7 = MUL_ACCUM_2(kResampleAllpass2[2], diff, state6);
-    state6 = tmp2;
-
-    // round; limit amplitude to prevent wrap-around; write to output array
-    out32 = (state7 + 512) >> 10;
-    *out++ = WebRtcSpl_SatW32ToW16(out32);
-  }
-
-  filtState[0] = state0;
-  filtState[1] = state1;
-  filtState[2] = state2;
-  filtState[3] = state3;
-  filtState[4] = state4;
-  filtState[5] = state5;
-  filtState[6] = state6;
-  filtState[7] = state7;
-}
diff --git a/src/mod/codecs/mod_isac/resample_by_2_internal.c b/src/mod/codecs/mod_isac/resample_by_2_internal.c
deleted file mode 100644
index cbd2395803..0000000000
--- a/src/mod/codecs/mod_isac/resample_by_2_internal.c
+++ /dev/null
@@ -1,679 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This header file contains some internal resampling functions.
- *
- */
-
-#include "resample_by_2_internal.h"
-
-// allpass filter coefficients.
-static const WebRtc_Word16 kResampleAllpass[2][3] = {
-        {821, 6110, 12382},
-        {3050, 9368, 15063}
-};
-
-//
-//   decimator
-// input:  WebRtc_Word32 (shifted 15 positions to the left, + offset 16384) OVERWRITTEN!
-// output: WebRtc_Word16 (saturated) (of length len/2)
-// state:  filter state array; length = 8
-
-void WebRtcSpl_DownBy2IntToShort(WebRtc_Word32 *in, WebRtc_Word32 len, WebRtc_Word16 *out,
-                                 WebRtc_Word32 *state)
-{
-    WebRtc_Word32 tmp0, tmp1, diff;
-    WebRtc_Word32 i;
-
-    len >>= 1;
-
-    // lower allpass filter (operates on even input samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // divide by two and store temporarily
-        in[i << 1] = (state[3] >> 1);
-    }
-
-    in++;
-
-    // upper allpass filter (operates on odd input samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // divide by two and store temporarily
-        in[i << 1] = (state[7] >> 1);
-    }
-
-    in--;
-
-    // combine allpass outputs
-    for (i = 0; i < len; i += 2)
-    {
-        // divide by two, add both allpass outputs and round
-        tmp0 = (in[i << 1] + in[(i << 1) + 1]) >> 15;
-        tmp1 = (in[(i << 1) + 2] + in[(i << 1) + 3]) >> 15;
-        if (tmp0 > (WebRtc_Word32)0x00007FFF)
-            tmp0 = 0x00007FFF;
-        if (tmp0 < (WebRtc_Word32)0xFFFF8000)
-            tmp0 = 0xFFFF8000;
-        out[i] = (WebRtc_Word16)tmp0;
-        if (tmp1 > (WebRtc_Word32)0x00007FFF)
-            tmp1 = 0x00007FFF;
-        if (tmp1 < (WebRtc_Word32)0xFFFF8000)
-            tmp1 = 0xFFFF8000;
-        out[i + 1] = (WebRtc_Word16)tmp1;
-    }
-}
-
-//
-//   decimator
-// input:  WebRtc_Word16
-// output: WebRtc_Word32 (shifted 15 positions to the left, + offset 16384) (of length len/2)
-// state:  filter state array; length = 8
-
-void WebRtcSpl_DownBy2ShortToInt(const WebRtc_Word16 *in,
-                                  WebRtc_Word32 len,
-                                  WebRtc_Word32 *out,
-                                  WebRtc_Word32 *state)
-{
-    WebRtc_Word32 tmp0, tmp1, diff;
-    WebRtc_Word32 i;
-
-    len >>= 1;
-
-    // lower allpass filter (operates on even input samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((WebRtc_Word32)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // divide by two and store temporarily
-        out[i] = (state[3] >> 1);
-    }
-
-    in++;
-
-    // upper allpass filter (operates on odd input samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((WebRtc_Word32)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // divide by two and store temporarily
-        out[i] += (state[7] >> 1);
-    }
-
-    in--;
-}
-
-//
-//   interpolator
-// input:  WebRtc_Word16
-// output: WebRtc_Word32 (normalized, not saturated) (of length len*2)
-// state:  filter state array; length = 8
-void WebRtcSpl_UpBy2ShortToInt(const WebRtc_Word16 *in, WebRtc_Word32 len, WebRtc_Word32 *out,
-                               WebRtc_Word32 *state)
-{
-    WebRtc_Word32 tmp0, tmp1, diff;
-    WebRtc_Word32 i;
-
-    // upper allpass filter (generates odd output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((WebRtc_Word32)in[i] << 15) + (1 << 14);
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[7] >> 15;
-    }
-
-    out++;
-
-    // lower allpass filter (generates even output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((WebRtc_Word32)in[i] << 15) + (1 << 14);
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[3] >> 15;
-    }
-}
-
-//
-//   interpolator
-// input:  WebRtc_Word32 (shifted 15 positions to the left, + offset 16384)
-// output: WebRtc_Word32 (shifted 15 positions to the left, + offset 16384) (of length len*2)
-// state:  filter state array; length = 8
-void WebRtcSpl_UpBy2IntToInt(const WebRtc_Word32 *in, WebRtc_Word32 len, WebRtc_Word32 *out,
-                             WebRtc_Word32 *state)
-{
-    WebRtc_Word32 tmp0, tmp1, diff;
-    WebRtc_Word32 i;
-
-    // upper allpass filter (generates odd output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i];
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[7];
-    }
-
-    out++;
-
-    // lower allpass filter (generates even output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i];
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[3];
-    }
-}
-
-//
-//   interpolator
-// input:  WebRtc_Word32 (shifted 15 positions to the left, + offset 16384)
-// output: WebRtc_Word16 (saturated) (of length len*2)
-// state:  filter state array; length = 8
-void WebRtcSpl_UpBy2IntToShort(const WebRtc_Word32 *in, WebRtc_Word32 len, WebRtc_Word16 *out,
-                               WebRtc_Word32 *state)
-{
-    WebRtc_Word32 tmp0, tmp1, diff;
-    WebRtc_Word32 i;
-
-    // upper allpass filter (generates odd output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i];
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // scale down, saturate and store
-        tmp1 = state[7] >> 15;
-        if (tmp1 > (WebRtc_Word32)0x00007FFF)
-            tmp1 = 0x00007FFF;
-        if (tmp1 < (WebRtc_Word32)0xFFFF8000)
-            tmp1 = 0xFFFF8000;
-        out[i << 1] = (WebRtc_Word16)tmp1;
-    }
-
-    out++;
-
-    // lower allpass filter (generates even output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i];
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, saturate and store
-        tmp1 = state[3] >> 15;
-        if (tmp1 > (WebRtc_Word32)0x00007FFF)
-            tmp1 = 0x00007FFF;
-        if (tmp1 < (WebRtc_Word32)0xFFFF8000)
-            tmp1 = 0xFFFF8000;
-        out[i << 1] = (WebRtc_Word16)tmp1;
-    }
-}
-
-//   lowpass filter
-// input:  WebRtc_Word16
-// output: WebRtc_Word32 (normalized, not saturated)
-// state:  filter state array; length = 8
-void WebRtcSpl_LPBy2ShortToInt(const WebRtc_Word16* in, WebRtc_Word32 len, WebRtc_Word32* out,
-                               WebRtc_Word32* state)
-{
-    WebRtc_Word32 tmp0, tmp1, diff;
-    WebRtc_Word32 i;
-
-    len >>= 1;
-
-    // lower allpass filter: odd input -> even output samples
-    in++;
-    // initial state of polyphase delay element
-    tmp0 = state[12];
-    for (i = 0; i < len; i++)
-    {
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[3] >> 1;
-        tmp0 = ((WebRtc_Word32)in[i << 1] << 15) + (1 << 14);
-    }
-    in--;
-
-    // upper allpass filter: even input -> even output samples
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((WebRtc_Word32)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // average the two allpass outputs, scale down and store
-        out[i << 1] = (out[i << 1] + (state[7] >> 1)) >> 15;
-    }
-
-    // switch to odd output samples
-    out++;
-
-    // lower allpass filter: even input -> odd output samples
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((WebRtc_Word32)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[9];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[8] + diff * kResampleAllpass[1][0];
-        state[8] = tmp0;
-        diff = tmp1 - state[10];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[9] + diff * kResampleAllpass[1][1];
-        state[9] = tmp1;
-        diff = tmp0 - state[11];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[11] = state[10] + diff * kResampleAllpass[1][2];
-        state[10] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[11] >> 1;
-    }
-
-    // upper allpass filter: odd input -> odd output samples
-    in++;
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((WebRtc_Word32)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[13];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[12] + diff * kResampleAllpass[0][0];
-        state[12] = tmp0;
-        diff = tmp1 - state[14];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[13] + diff * kResampleAllpass[0][1];
-        state[13] = tmp1;
-        diff = tmp0 - state[15];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[15] = state[14] + diff * kResampleAllpass[0][2];
-        state[14] = tmp0;
-
-        // average the two allpass outputs, scale down and store
-        out[i << 1] = (out[i << 1] + (state[15] >> 1)) >> 15;
-    }
-}
-
-//   lowpass filter
-// input:  WebRtc_Word32 (shifted 15 positions to the left, + offset 16384)
-// output: WebRtc_Word32 (normalized, not saturated)
-// state:  filter state array; length = 8
-void WebRtcSpl_LPBy2IntToInt(const WebRtc_Word32* in, WebRtc_Word32 len, WebRtc_Word32* out,
-                             WebRtc_Word32* state)
-{
-    WebRtc_Word32 tmp0, tmp1, diff;
-    WebRtc_Word32 i;
-
-    len >>= 1;
-
-    // lower allpass filter: odd input -> even output samples
-    in++;
-    // initial state of polyphase delay element
-    tmp0 = state[12];
-    for (i = 0; i < len; i++)
-    {
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[3] >> 1;
-        tmp0 = in[i << 1];
-    }
-    in--;
-
-    // upper allpass filter: even input -> even output samples
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // average the two allpass outputs, scale down and store
-        out[i << 1] = (out[i << 1] + (state[7] >> 1)) >> 15;
-    }
-
-    // switch to odd output samples
-    out++;
-
-    // lower allpass filter: even input -> odd output samples
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[9];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[8] + diff * kResampleAllpass[1][0];
-        state[8] = tmp0;
-        diff = tmp1 - state[10];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[9] + diff * kResampleAllpass[1][1];
-        state[9] = tmp1;
-        diff = tmp0 - state[11];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[11] = state[10] + diff * kResampleAllpass[1][2];
-        state[10] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[11] >> 1;
-    }
-
-    // upper allpass filter: odd input -> odd output samples
-    in++;
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[13];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[12] + diff * kResampleAllpass[0][0];
-        state[12] = tmp0;
-        diff = tmp1 - state[14];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[13] + diff * kResampleAllpass[0][1];
-        state[13] = tmp1;
-        diff = tmp0 - state[15];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[15] = state[14] + diff * kResampleAllpass[0][2];
-        state[14] = tmp0;
-
-        // average the two allpass outputs, scale down and store
-        out[i << 1] = (out[i << 1] + (state[15] >> 1)) >> 15;
-    }
-}
diff --git a/src/mod/codecs/mod_isac/resample_by_2_internal.h b/src/mod/codecs/mod_isac/resample_by_2_internal.h
deleted file mode 100644
index b6ac9f0cb4..0000000000
--- a/src/mod/codecs/mod_isac/resample_by_2_internal.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This header file contains some internal resampling functions.
- *
- */
-
-#ifndef WEBRTC_SPL_RESAMPLE_BY_2_INTERNAL_H_
-#define WEBRTC_SPL_RESAMPLE_BY_2_INTERNAL_H_
-
-#include "typedefs.h"
-
-/*******************************************************************
- * resample_by_2_fast.c
- * Functions for internal use in the other resample functions
- ******************************************************************/
-void WebRtcSpl_DownBy2IntToShort(WebRtc_Word32 *in, WebRtc_Word32 len, WebRtc_Word16 *out,
-                                 WebRtc_Word32 *state);
-
-void WebRtcSpl_DownBy2ShortToInt(const WebRtc_Word16 *in, WebRtc_Word32 len,
-                                 WebRtc_Word32 *out, WebRtc_Word32 *state);
-
-void WebRtcSpl_UpBy2ShortToInt(const WebRtc_Word16 *in, WebRtc_Word32 len,
-                               WebRtc_Word32 *out, WebRtc_Word32 *state);
-
-void WebRtcSpl_UpBy2IntToInt(const WebRtc_Word32 *in, WebRtc_Word32 len, WebRtc_Word32 *out,
-                             WebRtc_Word32 *state);
-
-void WebRtcSpl_UpBy2IntToShort(const WebRtc_Word32 *in, WebRtc_Word32 len,
-                               WebRtc_Word16 *out, WebRtc_Word32 *state);
-
-void WebRtcSpl_LPBy2ShortToInt(const WebRtc_Word16* in, WebRtc_Word32 len,
-                               WebRtc_Word32* out, WebRtc_Word32* state);
-
-void WebRtcSpl_LPBy2IntToInt(const WebRtc_Word32* in, WebRtc_Word32 len, WebRtc_Word32* out,
-                             WebRtc_Word32* state);
-
-#endif // WEBRTC_SPL_RESAMPLE_BY_2_INTERNAL_H_
diff --git a/src/mod/codecs/mod_isac/resample_fractional.c b/src/mod/codecs/mod_isac/resample_fractional.c
deleted file mode 100644
index 51003d45d7..0000000000
--- a/src/mod/codecs/mod_isac/resample_fractional.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the resampling functions between 48, 44, 32 and 24 kHz.
- * The description headers can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-// interpolation coefficients
-static const WebRtc_Word16 kCoefficients48To32[2][8] = {
-        {778, -2050, 1087, 23285, 12903, -3783, 441, 222},
-        {222, 441, -3783, 12903, 23285, 1087, -2050, 778}
-};
-
-static const WebRtc_Word16 kCoefficients32To24[3][8] = {
-        {767, -2362, 2434, 24406, 10620, -3838, 721, 90},
-        {386, -381, -2646, 19062, 19062, -2646, -381, 386},
-        {90, 721, -3838, 10620, 24406, 2434, -2362, 767}
-};
-
-static const WebRtc_Word16 kCoefficients44To32[4][9] = {
-        {117, -669, 2245, -6183, 26267, 13529, -3245, 845, -138},
-        {-101, 612, -2283, 8532, 29790, -5138, 1789, -524, 91},
-        {50, -292, 1016, -3064, 32010, 3933, -1147, 315, -53},
-        {-156, 974, -3863, 18603, 21691, -6246, 2353, -712, 126}
-};
-
-//   Resampling ratio: 2/3
-// input:  WebRtc_Word32 (normalized, not saturated) :: size 3 * K
-// output: WebRtc_Word32 (shifted 15 positions to the left, + offset 16384) :: size 2 * K
-//      K: number of blocks
-
-void WebRtcSpl_Resample48khzTo32khz(const WebRtc_Word32 *In, WebRtc_Word32 *Out,
-                                    const WebRtc_Word32 K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (3 input samples -> 2 output samples);
-    // process in sub blocks of size 3 samples.
-    WebRtc_Word32 tmp;
-    WebRtc_Word32 m;
-
-    for (m = 0; m < K; m++)
-    {
-        tmp = 1 << 14;
-        tmp += kCoefficients48To32[0][0] * In[0];
-        tmp += kCoefficients48To32[0][1] * In[1];
-        tmp += kCoefficients48To32[0][2] * In[2];
-        tmp += kCoefficients48To32[0][3] * In[3];
-        tmp += kCoefficients48To32[0][4] * In[4];
-        tmp += kCoefficients48To32[0][5] * In[5];
-        tmp += kCoefficients48To32[0][6] * In[6];
-        tmp += kCoefficients48To32[0][7] * In[7];
-        Out[0] = tmp;
-
-        tmp = 1 << 14;
-        tmp += kCoefficients48To32[1][0] * In[1];
-        tmp += kCoefficients48To32[1][1] * In[2];
-        tmp += kCoefficients48To32[1][2] * In[3];
-        tmp += kCoefficients48To32[1][3] * In[4];
-        tmp += kCoefficients48To32[1][4] * In[5];
-        tmp += kCoefficients48To32[1][5] * In[6];
-        tmp += kCoefficients48To32[1][6] * In[7];
-        tmp += kCoefficients48To32[1][7] * In[8];
-        Out[1] = tmp;
-
-        // update pointers
-        In += 3;
-        Out += 2;
-    }
-}
-
-//   Resampling ratio: 3/4
-// input:  WebRtc_Word32 (normalized, not saturated) :: size 4 * K
-// output: WebRtc_Word32 (shifted 15 positions to the left, + offset 16384) :: size 3 * K
-//      K: number of blocks
-
-void WebRtcSpl_Resample32khzTo24khz(const WebRtc_Word32 *In, WebRtc_Word32 *Out,
-                                    const WebRtc_Word32 K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (4 input samples -> 3 output samples);
-    // process in sub blocks of size 4 samples.
-    WebRtc_Word32 m;
-    WebRtc_Word32 tmp;
-
-    for (m = 0; m < K; m++)
-    {
-        tmp = 1 << 14;
-        tmp += kCoefficients32To24[0][0] * In[0];
-        tmp += kCoefficients32To24[0][1] * In[1];
-        tmp += kCoefficients32To24[0][2] * In[2];
-        tmp += kCoefficients32To24[0][3] * In[3];
-        tmp += kCoefficients32To24[0][4] * In[4];
-        tmp += kCoefficients32To24[0][5] * In[5];
-        tmp += kCoefficients32To24[0][6] * In[6];
-        tmp += kCoefficients32To24[0][7] * In[7];
-        Out[0] = tmp;
-
-        tmp = 1 << 14;
-        tmp += kCoefficients32To24[1][0] * In[1];
-        tmp += kCoefficients32To24[1][1] * In[2];
-        tmp += kCoefficients32To24[1][2] * In[3];
-        tmp += kCoefficients32To24[1][3] * In[4];
-        tmp += kCoefficients32To24[1][4] * In[5];
-        tmp += kCoefficients32To24[1][5] * In[6];
-        tmp += kCoefficients32To24[1][6] * In[7];
-        tmp += kCoefficients32To24[1][7] * In[8];
-        Out[1] = tmp;
-
-        tmp = 1 << 14;
-        tmp += kCoefficients32To24[2][0] * In[2];
-        tmp += kCoefficients32To24[2][1] * In[3];
-        tmp += kCoefficients32To24[2][2] * In[4];
-        tmp += kCoefficients32To24[2][3] * In[5];
-        tmp += kCoefficients32To24[2][4] * In[6];
-        tmp += kCoefficients32To24[2][5] * In[7];
-        tmp += kCoefficients32To24[2][6] * In[8];
-        tmp += kCoefficients32To24[2][7] * In[9];
-        Out[2] = tmp;
-
-        // update pointers
-        In += 4;
-        Out += 3;
-    }
-}
-
-//
-// fractional resampling filters
-//   Fout = 11/16 * Fin
-//   Fout =  8/11 * Fin
-//
-
-// compute two inner-products and store them to output array
-static void WebRtcSpl_ResampDotProduct(const WebRtc_Word32 *in1, const WebRtc_Word32 *in2,
-                               const WebRtc_Word16 *coef_ptr, WebRtc_Word32 *out1,
-                               WebRtc_Word32 *out2)
-{
-    WebRtc_Word32 tmp1 = 16384;
-    WebRtc_Word32 tmp2 = 16384;
-    WebRtc_Word16 coef;
-
-    coef = coef_ptr[0];
-    tmp1 += coef * in1[0];
-    tmp2 += coef * in2[-0];
-
-    coef = coef_ptr[1];
-    tmp1 += coef * in1[1];
-    tmp2 += coef * in2[-1];
-
-    coef = coef_ptr[2];
-    tmp1 += coef * in1[2];
-    tmp2 += coef * in2[-2];
-
-    coef = coef_ptr[3];
-    tmp1 += coef * in1[3];
-    tmp2 += coef * in2[-3];
-
-    coef = coef_ptr[4];
-    tmp1 += coef * in1[4];
-    tmp2 += coef * in2[-4];
-
-    coef = coef_ptr[5];
-    tmp1 += coef * in1[5];
-    tmp2 += coef * in2[-5];
-
-    coef = coef_ptr[6];
-    tmp1 += coef * in1[6];
-    tmp2 += coef * in2[-6];
-
-    coef = coef_ptr[7];
-    tmp1 += coef * in1[7];
-    tmp2 += coef * in2[-7];
-
-    coef = coef_ptr[8];
-    *out1 = tmp1 + coef * in1[8];
-    *out2 = tmp2 + coef * in2[-8];
-}
-
-//   Resampling ratio: 8/11
-// input:  WebRtc_Word32 (normalized, not saturated) :: size 11 * K
-// output: WebRtc_Word32 (shifted 15 positions to the left, + offset 16384) :: size  8 * K
-//      K: number of blocks
-
-void WebRtcSpl_Resample44khzTo32khz(const WebRtc_Word32 *In, WebRtc_Word32 *Out,
-                                    const WebRtc_Word32 K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (11 input samples -> 8 output samples);
-    // process in sub blocks of size 11 samples.
-    WebRtc_Word32 tmp;
-    WebRtc_Word32 m;
-
-    for (m = 0; m < K; m++)
-    {
-        tmp = 1 << 14;
-
-        // first output sample
-        Out[0] = ((WebRtc_Word32)In[3] << 15) + tmp;
-
-        // sum and accumulate filter coefficients and input samples
-        tmp += kCoefficients44To32[3][0] * In[5];
-        tmp += kCoefficients44To32[3][1] * In[6];
-        tmp += kCoefficients44To32[3][2] * In[7];
-        tmp += kCoefficients44To32[3][3] * In[8];
-        tmp += kCoefficients44To32[3][4] * In[9];
-        tmp += kCoefficients44To32[3][5] * In[10];
-        tmp += kCoefficients44To32[3][6] * In[11];
-        tmp += kCoefficients44To32[3][7] * In[12];
-        tmp += kCoefficients44To32[3][8] * In[13];
-        Out[4] = tmp;
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_ResampDotProduct(&In[0], &In[17], kCoefficients44To32[0], &Out[1], &Out[7]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_ResampDotProduct(&In[2], &In[15], kCoefficients44To32[1], &Out[2], &Out[6]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_ResampDotProduct(&In[3], &In[14], kCoefficients44To32[2], &Out[3], &Out[5]);
-
-        // update pointers
-        In += 11;
-        Out += 8;
-    }
-}
diff --git a/src/mod/codecs/mod_isac/settings.h b/src/mod/codecs/mod_isac/settings.h
deleted file mode 100644
index b7aed77065..0000000000
--- a/src/mod/codecs/mod_isac/settings.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * settings.h
- *
- * Declaration of #defines used in the iSAC codec
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_
-
-/* sampling frequency (Hz) */
-#define FS                                      16000
-
-/* number of samples per frame (either 320 (20ms), 480 (30ms) or 960 (60ms)) */
-#define INITIAL_FRAMESAMPLES     960
-
-
-#define MAXFFTSIZE 2048
-#define NFACTOR 11
-
-
-
-/* do not modify the following; this will have to be modified if we have a 20ms framesize option */
-/*************************************************************************************************/
-/* miliseconds */
-#define FRAMESIZE                               30
-/* number of samples per frame processed in the encoder, 480 */
-#define FRAMESAMPLES                            480 /* ((FRAMESIZE*FS)/1000) */
-#define FRAMESAMPLES_HALF      240
-#define FRAMESAMPLES_QUARTER                    120
-/*************************************************************************************************/
-
-
-
-/* max number of samples per frame (= 60 ms frame) */
-#define MAX_FRAMESAMPLES      960
-#define MAX_SWBFRAMESAMPLES                     (MAX_FRAMESAMPLES * 2)
-/* number of samples per 10ms frame */
-#define FRAMESAMPLES_10ms                       ((10*FS)/1000)
-#define SWBFRAMESAMPLES_10ms                    (FRAMESAMPLES_10ms * 2)
-/* number of samples in 30 ms frame */
-#define FRAMESAMPLES_30ms            480
-/* number of subframes */
-#define SUBFRAMES                               6
-/* length of a subframe */
-#define UPDATE                                  80
-/* length of half a subframe (low/high band) */
-#define HALF_SUBFRAMELEN                        (UPDATE/2)
-/* samples of look ahead (in a half-band, so actually half the samples of look ahead @ FS) */
-#define QLOOKAHEAD                              24    /* 3 ms */
-/* order of AR model in spectral entropy coder */
-#define AR_ORDER                                6
-/* order of LP model in spectral entropy coder */
-#define LP_ORDER                                0
-
-/* window length (masking analysis) */
-#define WINLEN                                  256
-/* order of low-band pole filter used to approximate masking curve */
-#define ORDERLO                                 12
-/* order of hi-band pole filter used to approximate masking curve */
-#define ORDERHI                                 6
-
-#define UB_LPC_ORDER                            4
-#define UB_LPC_VEC_PER_FRAME                    2
-#define UB16_LPC_VEC_PER_FRAME                  4
-#define UB_ACTIVE_SUBFRAMES                     2
-#define UB_MAX_LPC_ORDER                        6
-#define UB_INTERPOL_SEGMENTS                    1
-#define UB16_INTERPOL_SEGMENTS                  3
-#define LB_TOTAL_DELAY_SAMPLES                 48
-enum ISACBandwidth {isac8kHz = 8, isac12kHz = 12, isac16kHz = 16};
-enum ISACBand{isacLowerBand = 0, isacUpperBand = 1};
-#define UB_LPC_GAIN_DIM                 SUBFRAMES
-#define FB_STATE_SIZE_WORD32                    6
-
-
-/* order for post_filter_bank */
-#define POSTQORDER                              3
-/* order for pre-filterbank */
-#define QORDER                                  3
-/* another order */
-#define QORDER_ALL                              (POSTQORDER+QORDER-1)
-/* for decimator */
-#define ALLPASSSECTIONS                         2
-
-
-/* array size for byte stream in number of bytes. */
-#define STREAM_SIZE_MAX     600 /* The old maximum size still needed for the decoding */
-#define STREAM_SIZE_MAX_30  200 /* 200 bytes = 53.4 kbit/s @ 30 ms.framelength */
-#define STREAM_SIZE_MAX_60  400 /* 400 bytes = 53.4 kbit/s @ 60 ms.framelength */
-
-/* storage size for bit counts */
-#define BIT_COUNTER_SIZE                        30
-/* maximum order of any AR model or filter */
-#define MAX_AR_MODEL_ORDER                      12//50
-
-
-/* For pitch analysis */
-#define PITCH_FRAME_LEN                         (FRAMESAMPLES_HALF) /* 30 ms  */
-#define PITCH_MAX_LAG                           140     /* 57 Hz  */
-#define PITCH_MIN_LAG                           20              /* 400 Hz */
-#define PITCH_MAX_GAIN                          0.45
-#define PITCH_MAX_GAIN_06                       0.27                /* PITCH_MAX_GAIN*0.6 */
-#define PITCH_MAX_GAIN_Q12      1843
-#define PITCH_LAG_SPAN2                         (PITCH_MAX_LAG/2-PITCH_MIN_LAG/2+5)
-#define PITCH_CORR_LEN2                         60     /* 15 ms  */
-#define PITCH_CORR_STEP2                        (PITCH_FRAME_LEN/4)
-#define PITCH_BW                 11     /* half the band width of correlation surface */
-#define PITCH_SUBFRAMES                         4
-#define PITCH_GRAN_PER_SUBFRAME                 5
-#define PITCH_SUBFRAME_LEN                      (PITCH_FRAME_LEN/PITCH_SUBFRAMES)
-#define PITCH_UPDATE                            (PITCH_SUBFRAME_LEN/PITCH_GRAN_PER_SUBFRAME)
-/* maximum number of peaks to be examined in correlation surface */
-#define PITCH_MAX_NUM_PEAKS                  10
-#define PITCH_PEAK_DECAY               0.85
-/* For weighting filter */
-#define PITCH_WLPCORDER                   6
-#define PITCH_WLPCWINLEN               PITCH_FRAME_LEN
-#define PITCH_WLPCASYM                   0.3                 /* asymmetry parameter */
-#define PITCH_WLPCBUFLEN               PITCH_WLPCWINLEN
-/* For pitch filter */
-#define PITCH_BUFFSIZE                   (PITCH_MAX_LAG + 50)  /* Extra 50 for fraction and LP filters */
-#define PITCH_INTBUFFSIZE               (PITCH_FRAME_LEN+PITCH_BUFFSIZE)
-/* Max rel. step for interpolation */
-#define PITCH_UPSTEP                1.5
-/* Max rel. step for interpolation */
-#define PITCH_DOWNSTEP                   0.67
-#define PITCH_FRACS                             8
-#define PITCH_FRACORDER                         9
-#define PITCH_DAMPORDER                         5
-#define PITCH_FILTDELAY                         1.5f
-/* stepsize for quantization of the pitch Gain */
-#define PITCH_GAIN_STEPSIZE                     0.125
-
-
-
-/* Order of high pass filter */
-#define HPORDER                                 2
-
-/* some mathematical constants */
-#define LOG2EXP                                 1.44269504088896       /* log2(exp) */
-#define PI                                      3.14159265358979
-
-/* Maximum number of iterations allowed to limit payload size */
-#define MAX_PAYLOAD_LIMIT_ITERATION             5
-
-/* Redundant Coding */
-#define RCU_BOTTLENECK_BPS                      16000
-#define RCU_TRANSCODING_SCALE                   0.40f
-#define RCU_TRANSCODING_SCALE_INVERSE           2.5f
-
-#define RCU_TRANSCODING_SCALE_UB                0.50f
-#define RCU_TRANSCODING_SCALE_UB_INVERSE        2.0f
-
-
-/* Define Error codes */
-/* 6000 General */
-#define ISAC_MEMORY_ALLOCATION_FAILED    6010
-#define ISAC_MODE_MISMATCH       6020
-#define ISAC_DISALLOWED_BOTTLENECK     6030
-#define ISAC_DISALLOWED_FRAME_LENGTH    6040
-#define ISAC_UNSUPPORTED_SAMPLING_FREQUENCY         6050
-
-/* 6200 Bandwidth estimator */
-#define ISAC_RANGE_ERROR_BW_ESTIMATOR    6240
-/* 6400 Encoder */
-#define ISAC_ENCODER_NOT_INITIATED     6410
-#define ISAC_DISALLOWED_CODING_MODE     6420
-#define ISAC_DISALLOWED_FRAME_MODE_ENCODER   6430
-#define ISAC_DISALLOWED_BITSTREAM_LENGTH            6440
-#define ISAC_PAYLOAD_LARGER_THAN_LIMIT              6450
-#define ISAC_DISALLOWED_ENCODER_BANDWIDTH           6460
-/* 6600 Decoder */
-#define ISAC_DECODER_NOT_INITIATED     6610
-#define ISAC_EMPTY_PACKET       6620
-#define ISAC_DISALLOWED_FRAME_MODE_DECODER   6630
-#define ISAC_RANGE_ERROR_DECODE_FRAME_LENGTH  6640
-#define ISAC_RANGE_ERROR_DECODE_BANDWIDTH   6650
-#define ISAC_RANGE_ERROR_DECODE_PITCH_GAIN   6660
-#define ISAC_RANGE_ERROR_DECODE_PITCH_LAG   6670
-#define ISAC_RANGE_ERROR_DECODE_LPC     6680
-#define ISAC_RANGE_ERROR_DECODE_SPECTRUM   6690
-#define ISAC_LENGTH_MISMATCH      6730
-#define ISAC_RANGE_ERROR_DECODE_BANDWITH            6740
-#define ISAC_DISALLOWED_BANDWIDTH_MODE_DECODER      6750
-/* 6800 Call setup formats */
-#define ISAC_INCOMPATIBLE_FORMATS     6810
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_ */
diff --git a/src/mod/codecs/mod_isac/signal_processing_library.h b/src/mod/codecs/mod_isac/signal_processing_library.h
deleted file mode 100644
index 4433bc175f..0000000000
--- a/src/mod/codecs/mod_isac/signal_processing_library.h
+++ /dev/null
@@ -1,1686 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This header file includes all of the fix point signal processing library (SPL) function
- * descriptions and declarations.
- * For specific function calls, see bottom of file.
- */
-
-#ifndef WEBRTC_SPL_SIGNAL_PROCESSING_LIBRARY_H_
-#define WEBRTC_SPL_SIGNAL_PROCESSING_LIBRARY_H_
-
-#include <string.h>
-#include "typedefs.h"
-
-#ifdef ARM_WINM
-#include <Armintr.h> // intrinsic file for windows mobile
-#endif
-
-// Macros specific for the fixed point implementation
-#define WEBRTC_SPL_WORD16_MAX       32767
-#define WEBRTC_SPL_WORD16_MIN       -32768
-#define WEBRTC_SPL_WORD32_MAX       (WebRtc_Word32)0x7fffffff
-#define WEBRTC_SPL_WORD32_MIN       (WebRtc_Word32)0x80000000
-#define WEBRTC_SPL_MAX_LPC_ORDER    14
-#define WEBRTC_SPL_MAX_SEED_USED    0x80000000L
-#define WEBRTC_SPL_MIN(A, B)        (A < B ? A : B) // Get min value
-#define WEBRTC_SPL_MAX(A, B)        (A > B ? A : B) // Get max value
-#define WEBRTC_SPL_ABS_W16(a) \
-    (((WebRtc_Word16)a >= 0) ? ((WebRtc_Word16)a) : -((WebRtc_Word16)a))
-#define WEBRTC_SPL_ABS_W32(a) \
-    (((WebRtc_Word32)a >= 0) ? ((WebRtc_Word32)a) : -((WebRtc_Word32)a))
-
-#if (defined WEBRTC_TARGET_PC)||(defined __TARGET_XSCALE)
-#define WEBRTC_SPL_GET_BYTE(a, nr)  (((WebRtc_Word8 *)a)[nr])
-#define WEBRTC_SPL_SET_BYTE(d_ptr, val, index) \
-    (((WebRtc_Word8 *)d_ptr)[index] = (val))
-#elif defined WEBRTC_BIG_ENDIAN
-#define WEBRTC_SPL_GET_BYTE(a, nr) \
-    ((((WebRtc_Word16 *)a)[nr >> 1]) >> (((nr + 1) & 0x1) * 8) & 0x00ff)
-#define WEBRTC_SPL_SET_BYTE(d_ptr, val, index) \
-    ((WebRtc_Word16 *)d_ptr)[index >> 1] = \
-    ((((WebRtc_Word16 *)d_ptr)[index >> 1]) \
-    & (0x00ff << (8 * ((index) & 0x1)))) | (val << (8 * ((index + 1) & 0x1)))
-#else
-#define WEBRTC_SPL_GET_BYTE(a,nr) \
-    ((((WebRtc_Word16 *)(a))[(nr) >> 1]) >> (((nr) & 0x1) * 8) & 0x00ff)
-#define WEBRTC_SPL_SET_BYTE(d_ptr, val, index) \
-    ((WebRtc_Word16 *)(d_ptr))[(index) >> 1] = \
-    ((((WebRtc_Word16 *)(d_ptr))[(index) >> 1]) \
-    & (0x00ff << (8 * (((index) + 1) & 0x1)))) | \
-    ((val) << (8 * ((index) & 0x1)))
-#endif
-
-#define WEBRTC_SPL_MUL(a, b) \
-    ((WebRtc_Word32) ((WebRtc_Word32)(a) * (WebRtc_Word32)(b)))
-#define WEBRTC_SPL_UMUL(a, b) \
-    ((WebRtc_UWord32) ((WebRtc_UWord32)(a) * (WebRtc_UWord32)(b)))
-#define WEBRTC_SPL_UMUL_RSFT16(a, b) \
-    ((WebRtc_UWord32) ((WebRtc_UWord32)(a) * (WebRtc_UWord32)(b)) >> 16)
-#define WEBRTC_SPL_UMUL_16_16(a, b) \
-    ((WebRtc_UWord32) (WebRtc_UWord16)(a) * (WebRtc_UWord16)(b))
-#define WEBRTC_SPL_UMUL_16_16_RSFT16(a, b) \
-    (((WebRtc_UWord32) (WebRtc_UWord16)(a) * (WebRtc_UWord16)(b)) >> 16)
-#define WEBRTC_SPL_UMUL_32_16(a, b) \
-    ((WebRtc_UWord32) ((WebRtc_UWord32)(a) * (WebRtc_UWord16)(b)))
-#define WEBRTC_SPL_UMUL_32_16_RSFT16(a, b) \
-    ((WebRtc_UWord32) ((WebRtc_UWord32)(a) * (WebRtc_UWord16)(b)) >> 16)
-#define WEBRTC_SPL_MUL_16_U16(a, b) \
-    ((WebRtc_Word32)(WebRtc_Word16)(a) * (WebRtc_UWord16)(b))
-#define WEBRTC_SPL_DIV(a, b) \
-    ((WebRtc_Word32) ((WebRtc_Word32)(a) / (WebRtc_Word32)(b)))
-#define WEBRTC_SPL_UDIV(a, b) \
-    ((WebRtc_UWord32) ((WebRtc_UWord32)(a) / (WebRtc_UWord32)(b)))
-
-#ifndef WEBRTC_ARCH_ARM_V7A
-// For ARMv7 platforms, these are inline functions in spl_inl_armv7.h
-#define WEBRTC_SPL_MUL_16_16(a, b) \
-    ((WebRtc_Word32) (((WebRtc_Word16)(a)) * ((WebRtc_Word16)(b))))
-#define WEBRTC_SPL_MUL_16_32_RSFT16(a, b) \
-    (WEBRTC_SPL_MUL_16_16(a, b >> 16) \
-     + ((WEBRTC_SPL_MUL_16_16(a, (b & 0xffff) >> 1) + 0x4000) >> 15))
-#define WEBRTC_SPL_MUL_32_32_RSFT32(a32a, a32b, b32) \
-    ((WebRtc_Word32)(WEBRTC_SPL_MUL_16_32_RSFT16(a32a, b32) \
-    + (WEBRTC_SPL_MUL_16_32_RSFT16(a32b, b32) >> 16)))
-#define WEBRTC_SPL_MUL_32_32_RSFT32BI(a32, b32) \
-    ((WebRtc_Word32)(WEBRTC_SPL_MUL_16_32_RSFT16(( \
-    (WebRtc_Word16)(a32 >> 16)), b32) + \
-    (WEBRTC_SPL_MUL_16_32_RSFT16(( \
-    (WebRtc_Word16)((a32 & 0x0000FFFF) >> 1)), b32) >> 15)))
-#endif
-
-#define WEBRTC_SPL_MUL_16_32_RSFT11(a, b) \
-    ((WEBRTC_SPL_MUL_16_16(a, (b) >> 16) << 5) \
-    + (((WEBRTC_SPL_MUL_16_U16(a, (WebRtc_UWord16)(b)) >> 1) + 0x0200) >> 10))
-#define WEBRTC_SPL_MUL_16_32_RSFT14(a, b) \
-    ((WEBRTC_SPL_MUL_16_16(a, (b) >> 16) << 2) \
-    + (((WEBRTC_SPL_MUL_16_U16(a, (WebRtc_UWord16)(b)) >> 1) + 0x1000) >> 13))
-#define WEBRTC_SPL_MUL_16_32_RSFT15(a, b) \
-    ((WEBRTC_SPL_MUL_16_16(a, (b) >> 16) << 1) \
-    + (((WEBRTC_SPL_MUL_16_U16(a, (WebRtc_UWord16)(b)) >> 1) + 0x2000) >> 14))
-
-#ifdef ARM_WINM
-#define WEBRTC_SPL_MUL_16_16(a, b) \
-    _SmulLo_SW_SL((WebRtc_Word16)(a), (WebRtc_Word16)(b))
-#endif
-
-#define WEBRTC_SPL_MUL_16_16_RSFT(a, b, c) \
-    (WEBRTC_SPL_MUL_16_16(a, b) >> (c))
-
-#define WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(a, b, c) \
-    ((WEBRTC_SPL_MUL_16_16(a, b) + ((WebRtc_Word32) \
-                                  (((WebRtc_Word32)1) << ((c) - 1)))) >> (c))
-#define WEBRTC_SPL_MUL_16_16_RSFT_WITH_FIXROUND(a, b) \
-    ((WEBRTC_SPL_MUL_16_16(a, b) + ((WebRtc_Word32) (1 << 14))) >> 15)
-
-// C + the 32 most significant bits of A * B
-#define WEBRTC_SPL_SCALEDIFF32(A, B, C) \
-    (C + (B >> 16) * A + (((WebRtc_UWord32)(0x0000FFFF & B) * A) >> 16))
-
-#define WEBRTC_SPL_ADD_SAT_W32(a, b)    WebRtcSpl_AddSatW32(a, b)
-#define WEBRTC_SPL_SAT(a, b, c)         (b > a ? a : b < c ? c : b)
-#define WEBRTC_SPL_MUL_32_16(a, b)      ((a) * (b))
-
-#define WEBRTC_SPL_SUB_SAT_W32(a, b)    WebRtcSpl_SubSatW32(a, b)
-#define WEBRTC_SPL_ADD_SAT_W16(a, b)    WebRtcSpl_AddSatW16(a, b)
-#define WEBRTC_SPL_SUB_SAT_W16(a, b)    WebRtcSpl_SubSatW16(a, b)
-
-// We cannot do casting here due to signed/unsigned problem
-#define WEBRTC_SPL_IS_NEG(a)            ((a) & 0x80000000)
-// Shifting with negative numbers allowed
-// Positive means left shift
-#define WEBRTC_SPL_SHIFT_W16(x, c) \
-    (((c) >= 0) ? ((x) << (c)) : ((x) >> (-(c))))
-#define WEBRTC_SPL_SHIFT_W32(x, c) \
-    (((c) >= 0) ? ((x) << (c)) : ((x) >> (-(c))))
-
-// Shifting with negative numbers not allowed
-// We cannot do casting here due to signed/unsigned problem
-#define WEBRTC_SPL_RSHIFT_W16(x, c)     ((x) >> (c))
-#define WEBRTC_SPL_LSHIFT_W16(x, c)     ((x) << (c))
-#define WEBRTC_SPL_RSHIFT_W32(x, c)     ((x) >> (c))
-#define WEBRTC_SPL_LSHIFT_W32(x, c)     ((x) << (c))
-
-#define WEBRTC_SPL_RSHIFT_U16(x, c)     ((WebRtc_UWord16)(x) >> (c))
-#define WEBRTC_SPL_LSHIFT_U16(x, c)     ((WebRtc_UWord16)(x) << (c))
-#define WEBRTC_SPL_RSHIFT_U32(x, c)     ((WebRtc_UWord32)(x) >> (c))
-#define WEBRTC_SPL_LSHIFT_U32(x, c)     ((WebRtc_UWord32)(x) << (c))
-
-#define WEBRTC_SPL_VNEW(t, n)           (t *) malloc (sizeof (t) * (n))
-#define WEBRTC_SPL_FREE                 free
-
-#define WEBRTC_SPL_RAND(a) \
-    ((WebRtc_Word16)(WEBRTC_SPL_MUL_16_16_RSFT((a), 18816, 7) & 0x00007fff))
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define WEBRTC_SPL_MEMCPY_W8(v1, v2, length) \
-   memcpy(v1, v2, (length) * sizeof(char))
-#define WEBRTC_SPL_MEMCPY_W16(v1, v2, length) \
-   memcpy(v1, v2, (length) * sizeof(WebRtc_Word16))
-
-#define WEBRTC_SPL_MEMMOVE_W16(v1, v2, length) \
-   memmove(v1, v2, (length) * sizeof(WebRtc_Word16))
-
-// inline functions:
-#include "spl_inl.h"
-
-// Get SPL Version
-WebRtc_Word16 WebRtcSpl_get_version(char* version,
-                                    WebRtc_Word16 length_in_bytes);
-
-int WebRtcSpl_GetScalingSquare(WebRtc_Word16* in_vector,
-                               int in_vector_length,
-                               int times);
-
-// Copy and set operations. Implementation in copy_set_operations.c.
-// Descriptions at bottom of file.
-void WebRtcSpl_MemSetW16(WebRtc_Word16* vector,
-                         WebRtc_Word16 set_value,
-                         int vector_length);
-void WebRtcSpl_MemSetW32(WebRtc_Word32* vector,
-                         WebRtc_Word32 set_value,
-                         int vector_length);
-void WebRtcSpl_MemCpyReversedOrder(WebRtc_Word16* out_vector,
-                                   WebRtc_Word16* in_vector,
-                                   int vector_length);
-WebRtc_Word16 WebRtcSpl_CopyFromEndW16(G_CONST WebRtc_Word16* in_vector,
-                                       WebRtc_Word16 in_vector_length,
-                                       WebRtc_Word16 samples,
-                                       WebRtc_Word16* out_vector);
-WebRtc_Word16 WebRtcSpl_ZerosArrayW16(WebRtc_Word16* vector,
-                                      WebRtc_Word16 vector_length);
-WebRtc_Word16 WebRtcSpl_ZerosArrayW32(WebRtc_Word32* vector,
-                                      WebRtc_Word16 vector_length);
-WebRtc_Word16 WebRtcSpl_OnesArrayW16(WebRtc_Word16* vector,
-                                     WebRtc_Word16 vector_length);
-WebRtc_Word16 WebRtcSpl_OnesArrayW32(WebRtc_Word32* vector,
-                                     WebRtc_Word16 vector_length);
-// End: Copy and set operations.
-
-// Minimum and maximum operations. Implementation in min_max_operations.c.
-// Descriptions at bottom of file.
-WebRtc_Word16 WebRtcSpl_MaxAbsValueW16(const WebRtc_Word16* vector,
-                                       WebRtc_Word16 length);
-WebRtc_Word32 WebRtcSpl_MaxAbsValueW32(G_CONST WebRtc_Word32* vector,
-                                       WebRtc_Word16 length);
-WebRtc_Word16 WebRtcSpl_MinValueW16(G_CONST WebRtc_Word16* vector,
-                                    WebRtc_Word16 length);
-WebRtc_Word32 WebRtcSpl_MinValueW32(G_CONST WebRtc_Word32* vector,
-                                    WebRtc_Word16 length);
-WebRtc_Word16 WebRtcSpl_MaxValueW16(G_CONST WebRtc_Word16* vector,
-                                    WebRtc_Word16 length);
-
-WebRtc_Word16 WebRtcSpl_MaxAbsIndexW16(G_CONST WebRtc_Word16* vector,
-                                       WebRtc_Word16 length);
-WebRtc_Word32 WebRtcSpl_MaxValueW32(G_CONST WebRtc_Word32* vector,
-                                    WebRtc_Word16 length);
-WebRtc_Word16 WebRtcSpl_MinIndexW16(G_CONST WebRtc_Word16* vector,
-                                    WebRtc_Word16 length);
-WebRtc_Word16 WebRtcSpl_MinIndexW32(G_CONST WebRtc_Word32* vector,
-                                    WebRtc_Word16 length);
-WebRtc_Word16 WebRtcSpl_MaxIndexW16(G_CONST WebRtc_Word16* vector,
-                                    WebRtc_Word16 length);
-WebRtc_Word16 WebRtcSpl_MaxIndexW32(G_CONST WebRtc_Word32* vector,
-                                    WebRtc_Word16 length);
-// End: Minimum and maximum operations.
-
-// Vector scaling operations. Implementation in vector_scaling_operations.c.
-// Description at bottom of file.
-void WebRtcSpl_VectorBitShiftW16(WebRtc_Word16* out_vector,
-                                 WebRtc_Word16 vector_length,
-                                 G_CONST WebRtc_Word16* in_vector,
-                                 WebRtc_Word16 right_shifts);
-void WebRtcSpl_VectorBitShiftW32(WebRtc_Word32* out_vector,
-                                 WebRtc_Word16 vector_length,
-                                 G_CONST WebRtc_Word32* in_vector,
-                                 WebRtc_Word16 right_shifts);
-void WebRtcSpl_VectorBitShiftW32ToW16(WebRtc_Word16* out_vector,
-                                      WebRtc_Word16 vector_length,
-                                      G_CONST WebRtc_Word32* in_vector,
-                                      WebRtc_Word16 right_shifts);
-
-void WebRtcSpl_ScaleVector(G_CONST WebRtc_Word16* in_vector,
-                           WebRtc_Word16* out_vector,
-                           WebRtc_Word16 gain,
-                           WebRtc_Word16 vector_length,
-                           WebRtc_Word16 right_shifts);
-void WebRtcSpl_ScaleVectorWithSat(G_CONST WebRtc_Word16* in_vector,
-                                  WebRtc_Word16* out_vector,
-                                  WebRtc_Word16 gain,
-                                  WebRtc_Word16 vector_length,
-                                  WebRtc_Word16 right_shifts);
-void WebRtcSpl_ScaleAndAddVectors(G_CONST WebRtc_Word16* in_vector1,
-                                  WebRtc_Word16 gain1, int right_shifts1,
-                                  G_CONST WebRtc_Word16* in_vector2,
-                                  WebRtc_Word16 gain2, int right_shifts2,
-                                  WebRtc_Word16* out_vector,
-                                  int vector_length);
-// End: Vector scaling operations.
-
-// iLBC specific functions. Implementations in ilbc_specific_functions.c.
-// Description at bottom of file.
-void WebRtcSpl_ScaleAndAddVectorsWithRound(WebRtc_Word16* in_vector1,
-                                           WebRtc_Word16 scale1,
-                                           WebRtc_Word16* in_vector2,
-                                           WebRtc_Word16 scale2,
-                                           WebRtc_Word16 right_shifts,
-                                           WebRtc_Word16* out_vector,
-                                           WebRtc_Word16 vector_length);
-void WebRtcSpl_ReverseOrderMultArrayElements(WebRtc_Word16* out_vector,
-                                             G_CONST WebRtc_Word16* in_vector,
-                                             G_CONST WebRtc_Word16* window,
-                                             WebRtc_Word16 vector_length,
-                                             WebRtc_Word16 right_shifts);
-void WebRtcSpl_ElementwiseVectorMult(WebRtc_Word16* out_vector,
-                                     G_CONST WebRtc_Word16* in_vector,
-                                     G_CONST WebRtc_Word16* window,
-                                     WebRtc_Word16 vector_length,
-                                     WebRtc_Word16 right_shifts);
-void WebRtcSpl_AddVectorsAndShift(WebRtc_Word16* out_vector,
-                                  G_CONST WebRtc_Word16* in_vector1,
-                                  G_CONST WebRtc_Word16* in_vector2,
-                                  WebRtc_Word16 vector_length,
-                                  WebRtc_Word16 right_shifts);
-void WebRtcSpl_AddAffineVectorToVector(WebRtc_Word16* out_vector,
-                                       WebRtc_Word16* in_vector,
-                                       WebRtc_Word16 gain,
-                                       WebRtc_Word32 add_constant,
-                                       WebRtc_Word16 right_shifts,
-                                       int vector_length);
-void WebRtcSpl_AffineTransformVector(WebRtc_Word16* out_vector,
-                                     WebRtc_Word16* in_vector,
-                                     WebRtc_Word16 gain,
-                                     WebRtc_Word32 add_constant,
-                                     WebRtc_Word16 right_shifts,
-                                     int vector_length);
-// End: iLBC specific functions.
-
-// Signal processing operations. Descriptions at bottom of this file.
-int WebRtcSpl_AutoCorrelation(G_CONST WebRtc_Word16* vector,
-                              int vector_length, int order,
-                              WebRtc_Word32* result_vector,
-                              int* scale);
-WebRtc_Word16 WebRtcSpl_LevinsonDurbin(WebRtc_Word32* auto_corr,
-                                       WebRtc_Word16* lpc_coef,
-                                       WebRtc_Word16* refl_coef,
-                                       WebRtc_Word16 order);
-void WebRtcSpl_ReflCoefToLpc(G_CONST WebRtc_Word16* refl_coef,
-                             int use_order,
-                             WebRtc_Word16* lpc_coef);
-void WebRtcSpl_LpcToReflCoef(WebRtc_Word16* lpc_coef,
-                             int use_order,
-                             WebRtc_Word16* refl_coef);
-void WebRtcSpl_AutoCorrToReflCoef(G_CONST WebRtc_Word32* auto_corr,
-                                  int use_order,
-                                  WebRtc_Word16* refl_coef);
-void WebRtcSpl_CrossCorrelation(WebRtc_Word32* cross_corr,
-                                WebRtc_Word16* vector1,
-                                WebRtc_Word16* vector2,
-                                WebRtc_Word16 dim_vector,
-                                WebRtc_Word16 dim_cross_corr,
-                                WebRtc_Word16 right_shifts,
-                                WebRtc_Word16 step_vector2);
-void WebRtcSpl_GetHanningWindow(WebRtc_Word16* window, WebRtc_Word16 size);
-void WebRtcSpl_SqrtOfOneMinusXSquared(WebRtc_Word16* in_vector,
-                                      int vector_length,
-                                      WebRtc_Word16* out_vector);
-// End: Signal processing operations.
-
-// Randomization functions. Implementations collected in randomization_functions.c and
-// descriptions at bottom of this file.
-WebRtc_UWord32 WebRtcSpl_IncreaseSeed(WebRtc_UWord32* seed);
-WebRtc_Word16 WebRtcSpl_RandU(WebRtc_UWord32* seed);
-WebRtc_Word16 WebRtcSpl_RandN(WebRtc_UWord32* seed);
-WebRtc_Word16 WebRtcSpl_RandUArray(WebRtc_Word16* vector,
-                                   WebRtc_Word16 vector_length,
-                                   WebRtc_UWord32* seed);
-// End: Randomization functions.
-
-// Math functions
-WebRtc_Word32 WebRtcSpl_Sqrt(WebRtc_Word32 value);
-WebRtc_Word32 WebRtcSpl_SqrtFloor(WebRtc_Word32 value);
-
-// Divisions. Implementations collected in division_operations.c and
-// descriptions at bottom of this file.
-WebRtc_UWord32 WebRtcSpl_DivU32U16(WebRtc_UWord32 num, WebRtc_UWord16 den);
-WebRtc_Word32 WebRtcSpl_DivW32W16(WebRtc_Word32 num, WebRtc_Word16 den);
-WebRtc_Word16 WebRtcSpl_DivW32W16ResW16(WebRtc_Word32 num, WebRtc_Word16 den);
-WebRtc_Word32 WebRtcSpl_DivResultInQ31(WebRtc_Word32 num, WebRtc_Word32 den);
-WebRtc_Word32 WebRtcSpl_DivW32HiLow(WebRtc_Word32 num, WebRtc_Word16 den_hi,
-                                    WebRtc_Word16 den_low);
-// End: Divisions.
-
-WebRtc_Word32 WebRtcSpl_Energy(WebRtc_Word16* vector,
-                               int vector_length,
-                               int* scale_factor);
-
-WebRtc_Word32 WebRtcSpl_DotProductWithScale(WebRtc_Word16* vector1,
-                                            WebRtc_Word16* vector2,
-                                            int vector_length,
-                                            int scaling);
-
-// Filter operations.
-int WebRtcSpl_FilterAR(G_CONST WebRtc_Word16* ar_coef, int ar_coef_length,
-                       G_CONST WebRtc_Word16* in_vector, int in_vector_length,
-                       WebRtc_Word16* filter_state, int filter_state_length,
-                       WebRtc_Word16* filter_state_low,
-                       int filter_state_low_length, WebRtc_Word16* out_vector,
-                       WebRtc_Word16* out_vector_low, int out_vector_low_length);
-
-void WebRtcSpl_FilterMAFastQ12(WebRtc_Word16* in_vector,
-                               WebRtc_Word16* out_vector,
-                               WebRtc_Word16* ma_coef,
-                               WebRtc_Word16 ma_coef_length,
-                               WebRtc_Word16 vector_length);
-void WebRtcSpl_FilterARFastQ12(WebRtc_Word16* in_vector,
-                               WebRtc_Word16* out_vector,
-                               WebRtc_Word16* ar_coef,
-                               WebRtc_Word16 ar_coef_length,
-                               WebRtc_Word16 vector_length);
-int WebRtcSpl_DownsampleFast(WebRtc_Word16* in_vector,
-                             WebRtc_Word16 in_vector_length,
-                             WebRtc_Word16* out_vector,
-                             WebRtc_Word16 out_vector_length,
-                             WebRtc_Word16* ma_coef,
-                             WebRtc_Word16 ma_coef_length,
-                             WebRtc_Word16 factor,
-                             WebRtc_Word16 delay);
-// End: Filter operations.
-
-// FFT operations
-int WebRtcSpl_ComplexFFT(WebRtc_Word16 vector[], int stages, int mode);
-int WebRtcSpl_ComplexIFFT(WebRtc_Word16 vector[], int stages, int mode);
-void WebRtcSpl_ComplexBitReverse(WebRtc_Word16 vector[], int stages);
-// End: FFT operations
-
-/************************************************************
- *
- * RESAMPLING FUNCTIONS AND THEIR STRUCTS ARE DEFINED BELOW
- *
- ************************************************************/
-
-/*******************************************************************
- * resample.c
- *
- * Includes the following resampling combinations
- * 22 kHz -> 16 kHz
- * 16 kHz -> 22 kHz
- * 22 kHz ->  8 kHz
- *  8 kHz -> 22 kHz
- *
- ******************************************************************/
-
-// state structure for 22 -> 16 resampler
-typedef struct
-{
-    WebRtc_Word32 S_22_44[8];
-    WebRtc_Word32 S_44_32[8];
-    WebRtc_Word32 S_32_16[8];
-} WebRtcSpl_State22khzTo16khz;
-
-void WebRtcSpl_Resample22khzTo16khz(const WebRtc_Word16* in,
-                                    WebRtc_Word16* out,
-                                    WebRtcSpl_State22khzTo16khz* state,
-                                    WebRtc_Word32* tmpmem);
-
-void WebRtcSpl_ResetResample22khzTo16khz(WebRtcSpl_State22khzTo16khz* state);
-
-// state structure for 16 -> 22 resampler
-typedef struct
-{
-    WebRtc_Word32 S_16_32[8];
-    WebRtc_Word32 S_32_22[8];
-} WebRtcSpl_State16khzTo22khz;
-
-void WebRtcSpl_Resample16khzTo22khz(const WebRtc_Word16* in,
-                                    WebRtc_Word16* out,
-                                    WebRtcSpl_State16khzTo22khz* state,
-                                    WebRtc_Word32* tmpmem);
-
-void WebRtcSpl_ResetResample16khzTo22khz(WebRtcSpl_State16khzTo22khz* state);
-
-// state structure for 22 -> 8 resampler
-typedef struct
-{
-    WebRtc_Word32 S_22_22[16];
-    WebRtc_Word32 S_22_16[8];
-    WebRtc_Word32 S_16_8[8];
-} WebRtcSpl_State22khzTo8khz;
-
-void WebRtcSpl_Resample22khzTo8khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                   WebRtcSpl_State22khzTo8khz* state,
-                                   WebRtc_Word32* tmpmem);
-
-void WebRtcSpl_ResetResample22khzTo8khz(WebRtcSpl_State22khzTo8khz* state);
-
-// state structure for 8 -> 22 resampler
-typedef struct
-{
-    WebRtc_Word32 S_8_16[8];
-    WebRtc_Word32 S_16_11[8];
-    WebRtc_Word32 S_11_22[8];
-} WebRtcSpl_State8khzTo22khz;
-
-void WebRtcSpl_Resample8khzTo22khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                   WebRtcSpl_State8khzTo22khz* state,
-                                   WebRtc_Word32* tmpmem);
-
-void WebRtcSpl_ResetResample8khzTo22khz(WebRtcSpl_State8khzTo22khz* state);
-
-/*******************************************************************
- * resample_fractional.c
- * Functions for internal use in the other resample functions
- *
- * Includes the following resampling combinations
- * 48 kHz -> 32 kHz
- * 32 kHz -> 24 kHz
- * 44 kHz -> 32 kHz
- *
- ******************************************************************/
-
-void WebRtcSpl_Resample48khzTo32khz(const WebRtc_Word32* In, WebRtc_Word32* Out,
-                                    const WebRtc_Word32 K);
-
-void WebRtcSpl_Resample32khzTo24khz(const WebRtc_Word32* In, WebRtc_Word32* Out,
-                                    const WebRtc_Word32 K);
-
-void WebRtcSpl_Resample44khzTo32khz(const WebRtc_Word32* In, WebRtc_Word32* Out,
-                                    const WebRtc_Word32 K);
-
-/*******************************************************************
- * resample_48khz.c
- *
- * Includes the following resampling combinations
- * 48 kHz -> 16 kHz
- * 16 kHz -> 48 kHz
- * 48 kHz ->  8 kHz
- *  8 kHz -> 48 kHz
- *
- ******************************************************************/
-
-typedef struct
-{
-    WebRtc_Word32 S_48_48[16];
-    WebRtc_Word32 S_48_32[8];
-    WebRtc_Word32 S_32_16[8];
-} WebRtcSpl_State48khzTo16khz;
-
-void WebRtcSpl_Resample48khzTo16khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                    WebRtcSpl_State48khzTo16khz* state,
-                                    WebRtc_Word32* tmpmem);
-
-void WebRtcSpl_ResetResample48khzTo16khz(WebRtcSpl_State48khzTo16khz* state);
-
-typedef struct
-{
-    WebRtc_Word32 S_16_32[8];
-    WebRtc_Word32 S_32_24[8];
-    WebRtc_Word32 S_24_48[8];
-} WebRtcSpl_State16khzTo48khz;
-
-void WebRtcSpl_Resample16khzTo48khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                    WebRtcSpl_State16khzTo48khz* state,
-                                    WebRtc_Word32* tmpmem);
-
-void WebRtcSpl_ResetResample16khzTo48khz(WebRtcSpl_State16khzTo48khz* state);
-
-typedef struct
-{
-    WebRtc_Word32 S_48_24[8];
-    WebRtc_Word32 S_24_24[16];
-    WebRtc_Word32 S_24_16[8];
-    WebRtc_Word32 S_16_8[8];
-} WebRtcSpl_State48khzTo8khz;
-
-void WebRtcSpl_Resample48khzTo8khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                   WebRtcSpl_State48khzTo8khz* state,
-                                   WebRtc_Word32* tmpmem);
-
-void WebRtcSpl_ResetResample48khzTo8khz(WebRtcSpl_State48khzTo8khz* state);
-
-typedef struct
-{
-    WebRtc_Word32 S_8_16[8];
-    WebRtc_Word32 S_16_12[8];
-    WebRtc_Word32 S_12_24[8];
-    WebRtc_Word32 S_24_48[8];
-} WebRtcSpl_State8khzTo48khz;
-
-void WebRtcSpl_Resample8khzTo48khz(const WebRtc_Word16* in, WebRtc_Word16* out,
-                                   WebRtcSpl_State8khzTo48khz* state,
-                                   WebRtc_Word32* tmpmem);
-
-void WebRtcSpl_ResetResample8khzTo48khz(WebRtcSpl_State8khzTo48khz* state);
-
-/*******************************************************************
- * resample_by_2.c
- *
- * Includes down and up sampling by a factor of two.
- *
- ******************************************************************/
-
-void WebRtcSpl_DownsampleBy2(const WebRtc_Word16* in, const WebRtc_Word16 len,
-                             WebRtc_Word16* out, WebRtc_Word32* filtState);
-
-void WebRtcSpl_UpsampleBy2(const WebRtc_Word16* in, WebRtc_Word16 len, WebRtc_Word16* out,
-                           WebRtc_Word32* filtState);
-
-/************************************************************
- * END OF RESAMPLING FUNCTIONS
- ************************************************************/
-void WebRtcSpl_AnalysisQMF(const WebRtc_Word16* in_data,
-                           WebRtc_Word16* low_band,
-                           WebRtc_Word16* high_band,
-                           WebRtc_Word32* filter_state1,
-                           WebRtc_Word32* filter_state2);
-void WebRtcSpl_SynthesisQMF(const WebRtc_Word16* low_band,
-                            const WebRtc_Word16* high_band,
-                            WebRtc_Word16* out_data,
-                            WebRtc_Word32* filter_state1,
-                            WebRtc_Word32* filter_state2);
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-#endif // WEBRTC_SPL_SIGNAL_PROCESSING_LIBRARY_H_
-
-//
-// WebRtcSpl_AddSatW16(...)
-// WebRtcSpl_AddSatW32(...)
-//
-// Returns the result of a saturated 16-bit, respectively 32-bit, addition of
-// the numbers specified by the |var1| and |var2| parameters.
-//
-// Input:
-//      - var1      : Input variable 1
-//      - var2      : Input variable 2
-//
-// Return value     : Added and saturated value
-//
-
-//
-// WebRtcSpl_SubSatW16(...)
-// WebRtcSpl_SubSatW32(...)
-//
-// Returns the result of a saturated 16-bit, respectively 32-bit, subtraction
-// of the numbers specified by the |var1| and |var2| parameters.
-//
-// Input:
-//      - var1      : Input variable 1
-//      - var2      : Input variable 2
-//
-// Returned value   : Subtracted and saturated value
-//
-
-//
-// WebRtcSpl_GetSizeInBits(...)
-//
-// Returns the # of bits that are needed at the most to represent the number
-// specified by the |value| parameter.
-//
-// Input:
-//      - value     : Input value
-//
-// Return value     : Number of bits needed to represent |value|
-//
-
-//
-// WebRtcSpl_NormW32(...)
-//
-// Norm returns the # of left shifts required to 32-bit normalize the 32-bit
-// signed number specified by the |value| parameter.
-//
-// Input:
-//      - value     : Input value
-//
-// Return value     : Number of bit shifts needed to 32-bit normalize |value|
-//
-
-//
-// WebRtcSpl_NormW16(...)
-//
-// Norm returns the # of left shifts required to 16-bit normalize the 16-bit
-// signed number specified by the |value| parameter.
-//
-// Input:
-//      - value     : Input value
-//
-// Return value     : Number of bit shifts needed to 32-bit normalize |value|
-//
-
-//
-// WebRtcSpl_NormU32(...)
-//
-// Norm returns the # of left shifts required to 32-bit normalize the unsigned
-// 32-bit number specified by the |value| parameter.
-//
-// Input:
-//      - value     : Input value
-//
-// Return value     : Number of bit shifts needed to 32-bit normalize |value|
-//
-
-//
-// WebRtcSpl_GetScalingSquare(...)
-//
-// Returns the # of bits required to scale the samples specified in the
-// |in_vector| parameter so that, if the squares of the samples are added the
-// # of times specified by the |times| parameter, the 32-bit addition will not
-// overflow (result in WebRtc_Word32).
-//
-// Input:
-//      - in_vector         : Input vector to check scaling on
-//      - in_vector_length  : Samples in |in_vector|
-//      - times             : Number of additions to be performed
-//
-// Return value             : Number of right bit shifts needed to avoid
-//                            overflow in the addition calculation
-//
-
-//
-// WebRtcSpl_MemSetW16(...)
-//
-// Sets all the values in the WebRtc_Word16 vector |vector| of length
-// |vector_length| to the specified value |set_value|
-//
-// Input:
-//      - vector        : Pointer to the WebRtc_Word16 vector
-//      - set_value     : Value specified
-//      - vector_length : Length of vector
-//
-
-//
-// WebRtcSpl_MemSetW32(...)
-//
-// Sets all the values in the WebRtc_Word32 vector |vector| of length
-// |vector_length| to the specified value |set_value|
-//
-// Input:
-//      - vector        : Pointer to the WebRtc_Word16 vector
-//      - set_value     : Value specified
-//      - vector_length : Length of vector
-//
-
-//
-// WebRtcSpl_MemCpyReversedOrder(...)
-//
-// Copies all the values from the source WebRtc_Word16 vector |in_vector| to a
-// destination WebRtc_Word16 vector |out_vector|. It is done in reversed order,
-// meaning that the first sample of |in_vector| is copied to the last sample of
-// the |out_vector|. The procedure continues until the last sample of
-// |in_vector| has been copied to the first sample of |out_vector|. This
-// creates a reversed vector. Used in e.g. prediction in iLBC.
-//
-// Input:
-//      - in_vector     : Pointer to the first sample in a WebRtc_Word16 vector
-//                        of length |length|
-//      - vector_length : Number of elements to copy
-//
-// Output:
-//      - out_vector    : Pointer to the last sample in a WebRtc_Word16 vector
-//                        of length |length|
-//
-
-//
-// WebRtcSpl_CopyFromEndW16(...)
-//
-// Copies the rightmost |samples| of |in_vector| (of length |in_vector_length|)
-// to the vector |out_vector|.
-//
-// Input:
-//      - in_vector         : Input vector
-//      - in_vector_length  : Number of samples in |in_vector|
-//      - samples           : Number of samples to extract (from right side)
-//                            from |in_vector|
-//
-// Output:
-//      - out_vector        : Vector with the requested samples
-//
-// Return value             : Number of copied samples in |out_vector|
-//
-
-//
-// WebRtcSpl_ZerosArrayW16(...)
-// WebRtcSpl_ZerosArrayW32(...)
-//
-// Inserts the value "zero" in all positions of a w16 and a w32 vector
-// respectively.
-//
-// Input:
-//      - vector_length : Number of samples in vector
-//
-// Output:
-//      - vector        : Vector containing all zeros
-//
-// Return value         : Number of samples in vector
-//
-
-//
-// WebRtcSpl_OnesArrayW16(...)
-// WebRtcSpl_OnesArrayW32(...)
-//
-// Inserts the value "one" in all positions of a w16 and a w32 vector
-// respectively.
-//
-// Input:
-//      - vector_length : Number of samples in vector
-//
-// Output:
-//      - vector        : Vector containing all ones
-//
-// Return value         : Number of samples in vector
-//
-
-//
-// WebRtcSpl_MinValueW16(...)
-// WebRtcSpl_MinValueW32(...)
-//
-// Returns the minimum value of a vector
-//
-// Input:
-//      - vector        : Input vector
-//      - vector_length : Number of samples in vector
-//
-// Return value         : Minimum sample value in vector
-//
-
-//
-// WebRtcSpl_MaxValueW16(...)
-// WebRtcSpl_MaxValueW32(...)
-//
-// Returns the maximum value of a vector
-//
-// Input:
-//      - vector        : Input vector
-//      - vector_length : Number of samples in vector
-//
-// Return value         : Maximum sample value in vector
-//
-
-//
-// WebRtcSpl_MaxAbsValueW16(...)
-// WebRtcSpl_MaxAbsValueW32(...)
-//
-// Returns the largest absolute value of a vector
-//
-// Input:
-//      - vector        : Input vector
-//      - vector_length : Number of samples in vector
-//
-// Return value         : Maximum absolute value in vector
-//
-
-//
-// WebRtcSpl_MaxAbsIndexW16(...)
-//
-// Returns the vector index to the largest absolute value of a vector
-//
-// Input:
-//      - vector        : Input vector
-//      - vector_length : Number of samples in vector
-//
-// Return value         : Index to maximum absolute value in vector
-//
-
-//
-// WebRtcSpl_MinIndexW16(...)
-// WebRtcSpl_MinIndexW32(...)
-//
-// Returns the vector index to the minimum sample value of a vector
-//
-// Input:
-//      - vector        : Input vector
-//      - vector_length : Number of samples in vector
-//
-// Return value         : Index to minimum sample value in vector
-//
-
-//
-// WebRtcSpl_MaxIndexW16(...)
-// WebRtcSpl_MaxIndexW32(...)
-//
-// Returns the vector index to the maximum sample value of a vector
-//
-// Input:
-//      - vector        : Input vector
-//      - vector_length : Number of samples in vector
-//
-// Return value         : Index to maximum sample value in vector
-//
-
-//
-// WebRtcSpl_VectorBitShiftW16(...)
-// WebRtcSpl_VectorBitShiftW32(...)
-//
-// Bit shifts all the values in a vector up or downwards. Different calls for
-// WebRtc_Word16 and WebRtc_Word32 vectors respectively.
-//
-// Input:
-//      - vector_length : Length of vector
-//      - in_vector     : Pointer to the vector that should be bit shifted
-//      - right_shifts  : Number of right bit shifts (negative value gives left
-//                        shifts)
-//
-// Output:
-//      - out_vector    : Pointer to the result vector (can be the same as
-//                        |in_vector|)
-//
-
-//
-// WebRtcSpl_VectorBitShiftW32ToW16(...)
-//
-// Bit shifts all the values in a WebRtc_Word32 vector up or downwards and
-// stores the result as a WebRtc_Word16 vector
-//
-// Input:
-//      - vector_length : Length of vector
-//      - in_vector     : Pointer to the vector that should be bit shifted
-//      - right_shifts  : Number of right bit shifts (negative value gives left
-//                        shifts)
-//
-// Output:
-//      - out_vector    : Pointer to the result vector (can be the same as
-//                        |in_vector|)
-//
-
-//
-// WebRtcSpl_ScaleVector(...)
-//
-// Performs the vector operation:
-//  out_vector[k] = (gain*in_vector[k])>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - gain          : Scaling gain
-//      - vector_length : Elements in the |in_vector|
-//      - right_shifts  : Number of right bit shifts applied
-//
-// Output:
-//      - out_vector    : Output vector (can be the same as |in_vector|)
-//
-
-//
-// WebRtcSpl_ScaleVectorWithSat(...)
-//
-// Performs the vector operation:
-//  out_vector[k] = SATURATE( (gain*in_vector[k])>>right_shifts )
-//
-// Input:
-//      - in_vector     : Input vector
-//      - gain          : Scaling gain
-//      - vector_length : Elements in the |in_vector|
-//      - right_shifts  : Number of right bit shifts applied
-//
-// Output:
-//      - out_vector    : Output vector (can be the same as |in_vector|)
-//
-
-//
-// WebRtcSpl_ScaleAndAddVectors(...)
-//
-// Performs the vector operation:
-//  out_vector[k] = (gain1*in_vector1[k])>>right_shifts1
-//                  + (gain2*in_vector2[k])>>right_shifts2
-//
-// Input:
-//      - in_vector1    : Input vector 1
-//      - gain1         : Gain to be used for vector 1
-//      - right_shifts1 : Right bit shift to be used for vector 1
-//      - in_vector2    : Input vector 2
-//      - gain2         : Gain to be used for vector 2
-//      - right_shifts2 : Right bit shift to be used for vector 2
-//      - vector_length : Elements in the input vectors
-//
-// Output:
-//      - out_vector    : Output vector
-//
-
-//
-// WebRtcSpl_ScaleAndAddVectorsWithRound(...)
-//
-// Performs the vector operation:
-//
-//  out_vector[k] = ((scale1*in_vector1[k]) + (scale2*in_vector2[k])
-//                      + round_value) >> right_shifts
-//
-//      where:
-//
-//  round_value = (1<<right_shifts)>>1
-//
-// Input:
-//      - in_vector1    : Input vector 1
-//      - scale1        : Gain to be used for vector 1
-//      - in_vector2    : Input vector 2
-//      - scale2        : Gain to be used for vector 2
-//      - right_shifts  : Number of right bit shifts to be applied
-//      - vector_length : Number of elements in the input vectors
-//
-// Output:
-//      - out_vector    : Output vector
-//
-
-//
-// WebRtcSpl_ReverseOrderMultArrayElements(...)
-//
-// Performs the vector operation:
-//  out_vector[n] = (in_vector[n]*window[-n])>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - window        : Window vector (should be reversed). The pointer
-//                        should be set to the last value in the vector
-//      - right_shifts  : Number of right bit shift to be applied after the
-//                        multiplication
-//      - vector_length : Number of elements in |in_vector|
-//
-// Output:
-//      - out_vector    : Output vector (can be same as |in_vector|)
-//
-
-//
-// WebRtcSpl_ElementwiseVectorMult(...)
-//
-// Performs the vector operation:
-//  out_vector[n] = (in_vector[n]*window[n])>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - window        : Window vector.
-//      - right_shifts  : Number of right bit shift to be applied after the
-//                        multiplication
-//      - vector_length : Number of elements in |in_vector|
-//
-// Output:
-//      - out_vector    : Output vector (can be same as |in_vector|)
-//
-
-//
-// WebRtcSpl_AddVectorsAndShift(...)
-//
-// Performs the vector operation:
-//  out_vector[k] = (in_vector1[k] + in_vector2[k])>>right_shifts
-//
-// Input:
-//      - in_vector1    : Input vector 1
-//      - in_vector2    : Input vector 2
-//      - right_shifts  : Number of right bit shift to be applied after the
-//                        multiplication
-//      - vector_length : Number of elements in |in_vector1| and |in_vector2|
-//
-// Output:
-//      - out_vector    : Output vector (can be same as |in_vector1|)
-//
-
-//
-// WebRtcSpl_AddAffineVectorToVector(...)
-//
-// Adds an affine transformed vector to another vector |out_vector|, i.e,
-// performs
-//  out_vector[k] += (in_vector[k]*gain+add_constant)>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - gain          : Gain value, used to multiply the in vector with
-//      - add_constant  : Constant value to add (usually 1<<(right_shifts-1),
-//                        but others can be used as well
-//      - right_shifts  : Number of right bit shifts (0-16)
-//      - vector_length : Number of samples in |in_vector| and |out_vector|
-//
-// Output:
-//      - out_vector    : Vector with the output
-//
-
-//
-// WebRtcSpl_AffineTransformVector(...)
-//
-// Affine transforms a vector, i.e, performs
-//  out_vector[k] = (in_vector[k]*gain+add_constant)>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - gain          : Gain value, used to multiply the in vector with
-//      - add_constant  : Constant value to add (usually 1<<(right_shifts-1),
-//                        but others can be used as well
-//      - right_shifts  : Number of right bit shifts (0-16)
-//      - vector_length : Number of samples in |in_vector| and |out_vector|
-//
-// Output:
-//      - out_vector    : Vector with the output
-//
-
-//
-// WebRtcSpl_AutoCorrelation(...)
-//
-// A 32-bit fix-point implementation of auto-correlation computation
-//
-// Input:
-//      - vector        : Vector to calculate autocorrelation upon
-//      - vector_length : Length (in samples) of |vector|
-//      - order         : The order up to which the autocorrelation should be
-//                        calculated
-//
-// Output:
-//      - result_vector : auto-correlation values (values should be seen
-//                        relative to each other since the absolute values
-//                        might have been down shifted to avoid overflow)
-//
-//      - scale         : The number of left shifts required to obtain the
-//                        auto-correlation in Q0
-//
-// Return value         : Number of samples in |result_vector|, i.e., (order+1)
-//
-
-//
-// WebRtcSpl_LevinsonDurbin(...)
-//
-// A 32-bit fix-point implementation of the Levinson-Durbin algorithm that
-// does NOT use the 64 bit class
-//
-// Input:
-//      - auto_corr : Vector with autocorrelation values of length >=
-//                    |use_order|+1
-//      - use_order : The LPC filter order (support up to order 20)
-//
-// Output:
-//      - lpc_coef  : lpc_coef[0..use_order] LPC coefficients in Q12
-//      - refl_coef : refl_coef[0...use_order-1]| Reflection coefficients in
-//                    Q15
-//
-// Return value     : 1 for stable 0 for unstable
-//
-
-//
-// WebRtcSpl_ReflCoefToLpc(...)
-//
-// Converts reflection coefficients |refl_coef| to LPC coefficients |lpc_coef|.
-// This version is a 16 bit operation.
-//
-// NOTE: The 16 bit refl_coef -> lpc_coef conversion might result in a
-// "slightly unstable" filter (i.e., a pole just outside the unit circle) in
-// "rare" cases even if the reflection coefficients are stable.
-//
-// Input:
-//      - refl_coef : Reflection coefficients in Q15 that should be converted
-//                    to LPC coefficients
-//      - use_order : Number of coefficients in |refl_coef|
-//
-// Output:
-//      - lpc_coef  : LPC coefficients in Q12
-//
-
-//
-// WebRtcSpl_LpcToReflCoef(...)
-//
-// Converts LPC coefficients |lpc_coef| to reflection coefficients |refl_coef|.
-// This version is a 16 bit operation.
-// The conversion is implemented by the step-down algorithm.
-//
-// Input:
-//      - lpc_coef  : LPC coefficients in Q12, that should be converted to
-//                    reflection coefficients
-//      - use_order : Number of coefficients in |lpc_coef|
-//
-// Output:
-//      - refl_coef : Reflection coefficients in Q15.
-//
-
-//
-// WebRtcSpl_AutoCorrToReflCoef(...)
-//
-// Calculates reflection coefficients (16 bit) from auto-correlation values
-//
-// Input:
-//      - auto_corr : Auto-correlation values
-//      - use_order : Number of coefficients wanted be calculated
-//
-// Output:
-//      - refl_coef : Reflection coefficients in Q15.
-//
-
-//
-// WebRtcSpl_CrossCorrelation(...)
-//
-// Calculates the cross-correlation between two sequences |vector1| and
-// |vector2|. |vector1| is fixed and |vector2| slides as the pointer is
-// increased with the amount |step_vector2|
-//
-// Input:
-//      - vector1           : First sequence (fixed throughout the correlation)
-//      - vector2           : Second sequence (slides |step_vector2| for each
-//                            new correlation)
-//      - dim_vector        : Number of samples to use in the cross-correlation
-//      - dim_cross_corr    : Number of cross-correlations to calculate (the
-//                            start position for |vector2| is updated for each
-//                            new one)
-//      - right_shifts      : Number of right bit shifts to use. This will
-//                            become the output Q-domain.
-//      - step_vector2      : How many (positive or negative) steps the
-//                            |vector2| pointer should be updated for each new
-//                            cross-correlation value.
-//
-// Output:
-//      - cross_corr        : The cross-correlation in Q(-right_shifts)
-//
-
-//
-// WebRtcSpl_GetHanningWindow(...)
-//
-// Creates (the first half of) a Hanning window. Size must be at least 1 and
-// at most 512.
-//
-// Input:
-//      - size      : Length of the requested Hanning window (1 to 512)
-//
-// Output:
-//      - window    : Hanning vector in Q14.
-//
-
-//
-// WebRtcSpl_SqrtOfOneMinusXSquared(...)
-//
-// Calculates y[k] = sqrt(1 - x[k]^2) for each element of the input vector
-// |in_vector|. Input and output values are in Q15.
-//
-// Inputs:
-//      - in_vector     : Values to calculate sqrt(1 - x^2) of
-//      - vector_length : Length of vector |in_vector|
-//
-// Output:
-//      - out_vector    : Output values in Q15
-//
-
-//
-// WebRtcSpl_IncreaseSeed(...)
-//
-// Increases the seed (and returns the new value)
-//
-// Input:
-//      - seed      : Seed for random calculation
-//
-// Output:
-//      - seed      : Updated seed value
-//
-// Return value     : The new seed value
-//
-
-//
-// WebRtcSpl_RandU(...)
-//
-// Produces a uniformly distributed value in the WebRtc_Word16 range
-//
-// Input:
-//      - seed      : Seed for random calculation
-//
-// Output:
-//      - seed      : Updated seed value
-//
-// Return value     : Uniformly distributed value in the range
-//                    [Word16_MIN...Word16_MAX]
-//
-
-//
-// WebRtcSpl_RandN(...)
-//
-// Produces a normal distributed value in the WebRtc_Word16 range
-//
-// Input:
-//      - seed      : Seed for random calculation
-//
-// Output:
-//      - seed      : Updated seed value
-//
-// Return value     : N(0,1) value in the Q13 domain
-//
-
-//
-// WebRtcSpl_RandUArray(...)
-//
-// Produces a uniformly distributed vector with elements in the WebRtc_Word16
-// range
-//
-// Input:
-//      - vector_length : Samples wanted in the vector
-//      - seed          : Seed for random calculation
-//
-// Output:
-//      - vector        : Vector with the uniform values
-//      - seed          : Updated seed value
-//
-// Return value         : Number of samples in vector, i.e., |vector_length|
-//
-
-//
-// WebRtcSpl_Sqrt(...)
-//
-// Returns the square root of the input value |value|. The precision of this
-// function is integer precision, i.e., sqrt(8) gives 2 as answer.
-// If |value| is a negative number then 0 is returned.
-//
-// Algorithm:
-//
-// A sixth order Taylor Series expansion is used here to compute the square
-// root of a number y^0.5 = (1+x)^0.5
-// where
-// x = y-1
-//   = 1+(x/2)-0.5*((x/2)^2+0.5*((x/2)^3-0.625*((x/2)^4+0.875*((x/2)^5)
-// 0.5 <= x < 1
-//
-// Input:
-//      - value     : Value to calculate sqrt of
-//
-// Return value     : Result of the sqrt calculation
-//
-
-//
-// WebRtcSpl_SqrtFloor(...)
-//
-// Returns the square root of the input value |value|. The precision of this
-// function is rounding down integer precision, i.e., sqrt(8) gives 2 as answer.
-// If |value| is a negative number then 0 is returned.
-//
-// Algorithm:
-//
-// An iterative 4 cylce/bit routine
-//
-// Input:
-//      - value     : Value to calculate sqrt of
-//
-// Return value     : Result of the sqrt calculation
-//
-
-//
-// WebRtcSpl_DivU32U16(...)
-//
-// Divides a WebRtc_UWord32 |num| by a WebRtc_UWord16 |den|.
-//
-// If |den|==0, (WebRtc_UWord32)0xFFFFFFFF is returned.
-//
-// Input:
-//      - num       : Numerator
-//      - den       : Denominator
-//
-// Return value     : Result of the division (as a WebRtc_UWord32), i.e., the
-//                    integer part of num/den.
-//
-
-//
-// WebRtcSpl_DivW32W16(...)
-//
-// Divides a WebRtc_Word32 |num| by a WebRtc_Word16 |den|.
-//
-// If |den|==0, (WebRtc_Word32)0x7FFFFFFF is returned.
-//
-// Input:
-//      - num       : Numerator
-//      - den       : Denominator
-//
-// Return value     : Result of the division (as a WebRtc_Word32), i.e., the
-//                    integer part of num/den.
-//
-
-//
-// WebRtcSpl_DivW32W16ResW16(...)
-//
-// Divides a WebRtc_Word32 |num| by a WebRtc_Word16 |den|, assuming that the
-// result is less than 32768, otherwise an unpredictable result will occur.
-//
-// If |den|==0, (WebRtc_Word16)0x7FFF is returned.
-//
-// Input:
-//      - num       : Numerator
-//      - den       : Denominator
-//
-// Return value     : Result of the division (as a WebRtc_Word16), i.e., the
-//                    integer part of num/den.
-//
-
-//
-// WebRtcSpl_DivResultInQ31(...)
-//
-// Divides a WebRtc_Word32 |num| by a WebRtc_Word16 |den|, assuming that the
-// absolute value of the denominator is larger than the numerator, otherwise
-// an unpredictable result will occur.
-//
-// Input:
-//      - num       : Numerator
-//      - den       : Denominator
-//
-// Return value     : Result of the division in Q31.
-//
-
-//
-// WebRtcSpl_DivW32HiLow(...)
-//
-// Divides a WebRtc_Word32 |num| by a denominator in hi, low format. The
-// absolute value of the denominator has to be larger (or equal to) the
-// numerator.
-//
-// Input:
-//      - num       : Numerator
-//      - den_hi    : High part of denominator
-//      - den_low   : Low part of denominator
-//
-// Return value     : Divided value in Q31
-//
-
-//
-// WebRtcSpl_Energy(...)
-//
-// Calculates the energy of a vector
-//
-// Input:
-//      - vector        : Vector which the energy should be calculated on
-//      - vector_length : Number of samples in vector
-//
-// Output:
-//      - scale_factor  : Number of left bit shifts needed to get the physical
-//                        energy value, i.e, to get the Q0 value
-//
-// Return value         : Energy value in Q(-|scale_factor|)
-//
-
-//
-// WebRtcSpl_FilterAR(...)
-//
-// Performs a 32-bit AR filtering on a vector in Q12
-//
-// Input:
-//  - ar_coef                   : AR-coefficient vector (values in Q12),
-//                                ar_coef[0] must be 4096.
-//  - ar_coef_length            : Number of coefficients in |ar_coef|.
-//  - in_vector                 : Vector to be filtered.
-//  - in_vector_length          : Number of samples in |in_vector|.
-//  - filter_state              : Current state (higher part) of the filter.
-//  - filter_state_length       : Length (in samples) of |filter_state|.
-//  - filter_state_low          : Current state (lower part) of the filter.
-//  - filter_state_low_length   : Length (in samples) of |filter_state_low|.
-//  - out_vector_low_length     : Maximum length (in samples) of
-//                                |out_vector_low|.
-//
-// Output:
-//  - filter_state              : Updated state (upper part) vector.
-//  - filter_state_low          : Updated state (lower part) vector.
-//  - out_vector                : Vector containing the upper part of the
-//                                filtered values.
-//  - out_vector_low            : Vector containing the lower part of the
-//                                filtered values.
-//
-// Return value                 : Number of samples in the |out_vector|.
-//
-
-//
-// WebRtcSpl_FilterMAFastQ12(...)
-//
-// Performs a MA filtering on a vector in Q12
-//
-// Input:
-//      - in_vector         : Input samples (state in positions
-//                            in_vector[-order] .. in_vector[-1])
-//      - ma_coef           : Filter coefficients (in Q12)
-//      - ma_coef_length    : Number of B coefficients (order+1)
-//      - vector_length     : Number of samples to be filtered
-//
-// Output:
-//      - out_vector        : Filtered samples
-//
-
-//
-// WebRtcSpl_FilterARFastQ12(...)
-//
-// Performs a AR filtering on a vector in Q12
-//
-// Input:
-//      - in_vector         : Input samples
-//      - out_vector        : State information in positions
-//                            out_vector[-order] .. out_vector[-1]
-//      - ar_coef           : Filter coefficients (in Q12)
-//      - ar_coef_length    : Number of B coefficients (order+1)
-//      - vector_length     : Number of samples to be filtered
-//
-// Output:
-//      - out_vector        : Filtered samples
-//
-
-//
-// WebRtcSpl_DownsampleFast(...)
-//
-// Performs a MA down sampling filter on a vector
-//
-// Input:
-//      - in_vector         : Input samples (state in positions
-//                            in_vector[-order] .. in_vector[-1])
-//      - in_vector_length  : Number of samples in |in_vector| to be filtered.
-//                            This must be at least
-//                            |delay| + |factor|*(|out_vector_length|-1) + 1)
-//      - out_vector_length : Number of down sampled samples desired
-//      - ma_coef           : Filter coefficients (in Q12)
-//      - ma_coef_length    : Number of B coefficients (order+1)
-//      - factor            : Decimation factor
-//      - delay             : Delay of filter (compensated for in out_vector)
-//
-// Output:
-//      - out_vector        : Filtered samples
-//
-// Return value             : 0 if OK, -1 if |in_vector| is too short
-//
-
-//
-// WebRtcSpl_DotProductWithScale(...)
-//
-// Calculates the dot product between two (WebRtc_Word16) vectors
-//
-// Input:
-//      - vector1       : Vector 1
-//      - vector2       : Vector 2
-//      - vector_length : Number of samples used in the dot product
-//      - scaling       : The number of right bit shifts to apply on each term
-//                        during calculation to avoid overflow, i.e., the
-//                        output will be in Q(-|scaling|)
-//
-// Return value         : The dot product in Q(-scaling)
-//
-
-//
-// WebRtcSpl_ComplexIFFT(...)
-//
-// Complex Inverse FFT
-//
-// Computes an inverse complex 2^|stages|-point FFT on the input vector, which
-// is in bit-reversed order. The original content of the vector is destroyed in
-// the process, since the input is overwritten by the output, normal-ordered,
-// FFT vector. With X as the input complex vector, y as the output complex
-// vector and with M = 2^|stages|, the following is computed:
-//
-//        M-1
-// y(k) = sum[X(i)*[cos(2*pi*i*k/M) + j*sin(2*pi*i*k/M)]]
-//        i=0
-//
-// The implementations are optimized for speed, not for code size. It uses the
-// decimation-in-time algorithm with radix-2 butterfly technique.
-//
-// Input:
-//      - vector    : In pointer to complex vector containing 2^|stages|
-//                    real elements interleaved with 2^|stages| imaginary
-//                    elements.
-//                    [ReImReImReIm....]
-//                    The elements are in Q(-scale) domain, see more on Return
-//                    Value below.
-//
-//      - stages    : Number of FFT stages. Must be at least 3 and at most 10,
-//                    since the table WebRtcSpl_kSinTable1024[] is 1024
-//                    elements long.
-//
-//      - mode      : This parameter gives the user to choose how the FFT
-//                    should work.
-//                    mode==0: Low-complexity and Low-accuracy mode
-//                    mode==1: High-complexity and High-accuracy mode
-//
-// Output:
-//      - vector    : Out pointer to the FFT vector (the same as input).
-//
-// Return Value     : The scale value that tells the number of left bit shifts
-//                    that the elements in the |vector| should be shifted with
-//                    in order to get Q0 values, i.e. the physically correct
-//                    values. The scale parameter is always 0 or positive,
-//                    except if N>1024 (|stages|>10), which returns a scale
-//                    value of -1, indicating error.
-//
-
-//
-// WebRtcSpl_ComplexFFT(...)
-//
-// Complex FFT
-//
-// Computes a complex 2^|stages|-point FFT on the input vector, which is in
-// bit-reversed order. The original content of the vector is destroyed in
-// the process, since the input is overwritten by the output, normal-ordered,
-// FFT vector. With x as the input complex vector, Y as the output complex
-// vector and with M = 2^|stages|, the following is computed:
-//
-//              M-1
-// Y(k) = 1/M * sum[x(i)*[cos(2*pi*i*k/M) + j*sin(2*pi*i*k/M)]]
-//              i=0
-//
-// The implementations are optimized for speed, not for code size. It uses the
-// decimation-in-time algorithm with radix-2 butterfly technique.
-//
-// This routine prevents overflow by scaling by 2 before each FFT stage. This is
-// a fixed scaling, for proper normalization - there will be log2(n) passes, so
-// this results in an overall factor of 1/n, distributed to maximize arithmetic
-// accuracy.
-//
-// Input:
-//      - vector    : In pointer to complex vector containing 2^|stages| real
-//                    elements interleaved with 2^|stages| imaginary elements.
-//                    [ReImReImReIm....]
-//                    The output is in the Q0 domain.
-//
-//      - stages    : Number of FFT stages. Must be at least 3 and at most 10,
-//                    since the table WebRtcSpl_kSinTable1024[] is 1024
-//                    elements long.
-//
-//      - mode      : This parameter gives the user to choose how the FFT
-//                    should work.
-//                    mode==0: Low-complexity and Low-accuracy mode
-//                    mode==1: High-complexity and High-accuracy mode
-//
-// Output:
-//      - vector    : The output FFT vector is in the Q0 domain.
-//
-// Return value     : The scale parameter is always 0, except if N>1024,
-//                    which returns a scale value of -1, indicating error.
-//
-
-//
-// WebRtcSpl_ComplexBitReverse(...)
-//
-// Complex Bit Reverse
-//
-// This function bit-reverses the position of elements in the complex input
-// vector into the output vector.
-//
-// If you bit-reverse a linear-order array, you obtain a bit-reversed order
-// array. If you bit-reverse a bit-reversed order array, you obtain a
-// linear-order array.
-//
-// Input:
-//      - vector    : In pointer to complex vector containing 2^|stages| real
-//                    elements interleaved with 2^|stages| imaginary elements.
-//                    [ReImReImReIm....]
-//      - stages    : Number of FFT stages. Must be at least 3 and at most 10,
-//                    since the table WebRtcSpl_kSinTable1024[] is 1024
-//                    elements long.
-//
-// Output:
-//      - vector    : Out pointer to complex vector in bit-reversed order.
-//                    The input vector is over written.
-//
-
-//
-// WebRtcSpl_AnalysisQMF(...)
-//
-// Splits a 0-2*F Hz signal into two sub bands: 0-F Hz and F-2*F Hz. The
-// current version has F = 8000, therefore, a super-wideband audio signal is
-// split to lower-band 0-8 kHz and upper-band 8-16 kHz.
-//
-// Input:
-//      - in_data       : Wide band speech signal, 320 samples (10 ms)
-//
-// Input & Output:
-//      - filter_state1 : Filter state for first All-pass filter
-//      - filter_state2 : Filter state for second All-pass filter
-//
-// Output:
-//      - low_band      : Lower-band signal 0-8 kHz band, 160 samples (10 ms)
-//      - high_band     : Upper-band signal 8-16 kHz band (flipped in frequency
-//                        domain), 160 samples (10 ms)
-//
-
-//
-// WebRtcSpl_SynthesisQMF(...)
-//
-// Combines the two sub bands (0-F and F-2*F Hz) into a signal of 0-2*F
-// Hz, (current version has F = 8000 Hz). So the filter combines lower-band
-// (0-8 kHz) and upper-band (8-16 kHz) channels to obtain super-wideband 0-16
-// kHz audio.
-//
-// Input:
-//      - low_band      : The signal with the 0-8 kHz band, 160 samples (10 ms)
-//      - high_band     : The signal with the 8-16 kHz band, 160 samples (10 ms)
-//
-// Input & Output:
-//      - filter_state1 : Filter state for first All-pass filter
-//      - filter_state2 : Filter state for second All-pass filter
-//
-// Output:
-//      - out_data      : Super-wideband speech signal, 0-16 kHz
-//
-
-// WebRtc_Word16 WebRtcSpl_SatW32ToW16(...)
-//
-// This function saturates a 32-bit word into a 16-bit word.
-//
-// Input:
-//      - value32   : The value of a 32-bit word.
-//
-// Output:
-//      - out16     : the saturated 16-bit word.
-//
-
-// int32_t WebRtc_MulAccumW16(...)
-//
-// This function multiply a 16-bit word by a 16-bit word, and accumulate this
-// value to a 32-bit integer.
-//
-// Input:
-//      - a    : The value of the first 16-bit word.
-//      - b    : The value of the second 16-bit word.
-//      - c    : The value of an 32-bit integer.
-//
-// Return Value: The value of a * b + c.
-//
-
-// WebRtc_Word16 WebRtcSpl_get_version(...)
-//
-// This function gives the version string of the Signal Processing Library.
-//
-// Input:
-//      - length_in_bytes   : The size of Allocated space (in Bytes) where
-//                            the version number is written to (in string format).
-//
-// Output:
-//      - version           : Pointer to a buffer where the version number is written to.
-//
diff --git a/src/mod/codecs/mod_isac/spectrum_ar_model_tables.c b/src/mod/codecs/mod_isac/spectrum_ar_model_tables.c
deleted file mode 100644
index 92b9c4d626..0000000000
--- a/src/mod/codecs/mod_isac/spectrum_ar_model_tables.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "spectrum_ar_model_tables.h"
-#include "settings.h"
-
-/********************* AR Coefficient Tables ************************/
-/* cdf for quantized reflection coefficient 1 */
-const WebRtc_UWord16 WebRtcIsac_kQArRc1Cdf[12] = {
- 0,  2,  4,  129,  7707,  57485,  65495,  65527,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 2 */
-const WebRtc_UWord16 WebRtcIsac_kQArRc2Cdf[12] = {
- 0,  2,  4,  7,  531,  25298,  64525,  65526,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 3 */
-const WebRtc_UWord16 WebRtcIsac_kQArRc3Cdf[12] = {
- 0,  2,  4,  6,  620,  22898,  64843,  65527,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 4 */
-const WebRtc_UWord16 WebRtcIsac_kQArRc4Cdf[12] = {
- 0,  2,  4,  6,  35,  10034,  60733,  65506,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 5 */
-const WebRtc_UWord16 WebRtcIsac_kQArRc5Cdf[12] = {
- 0,  2,  4,  6,  36,  7567,  56727,  65385,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 6 */
-const WebRtc_UWord16 WebRtcIsac_kQArRc6Cdf[12] = {
- 0,  2,  4,  6,  14,  6579,  57360,  65409,  65529,  65531,
- 65533,  65535};
-
-/* representation levels for quantized reflection coefficient 1 */
-const WebRtc_Word16 WebRtcIsac_kQArRc1Levels[11] = {
- -32104, -29007, -23202, -15496, -9279, -2577, 5934, 17535, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 2 */
-const WebRtc_Word16 WebRtcIsac_kQArRc2Levels[11] = {
- -32104, -29503, -23494, -15261, -7309, -1399, 6158, 16381, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 3 */
-const WebRtc_Word16 WebRtcIsac_kQArRc3Levels[11] = {
--32104, -29503, -23157, -15186, -7347, -1359, 5829, 17535, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 4 */
-const WebRtc_Word16 WebRtcIsac_kQArRc4Levels[11] = {
--32104, -29503, -24512, -15362, -6665, -342, 6596, 14585, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 5 */
-const WebRtc_Word16 WebRtcIsac_kQArRc5Levels[11] = {
--32104, -29503, -24512, -15005, -6564, -106, 7123, 14920, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 6 */
-const WebRtc_Word16 WebRtcIsac_kQArRc6Levels[11] = {
--32104, -29503, -24512, -15096, -6656, -37, 7036, 14847, 24512, 29503, 32104
-};
-
-/* quantization boundary levels for reflection coefficients */
-const WebRtc_Word16 WebRtcIsac_kQArBoundaryLevels[12] = {
--32768, -31441, -27566, -21458, -13612, -4663, 4663, 13612, 21458, 27566, 31441, 32767
-};
-
-/* initial index for AR reflection coefficient quantizer and cdf table search */
-const WebRtc_UWord16 WebRtcIsac_kQArRcInitIndex[6] = {
- 5,  5,  5,  5,  5,  5};
-
-/* pointers to AR cdf tables */
-const WebRtc_UWord16 *WebRtcIsac_kQArRcCdfPtr[AR_ORDER] = {
-  WebRtcIsac_kQArRc1Cdf, WebRtcIsac_kQArRc2Cdf, WebRtcIsac_kQArRc3Cdf,
-  WebRtcIsac_kQArRc4Cdf, WebRtcIsac_kQArRc5Cdf, WebRtcIsac_kQArRc6Cdf
-};
-
-/* pointers to AR representation levels tables */
-const WebRtc_Word16 *WebRtcIsac_kQArRcLevelsPtr[AR_ORDER] = {
-  WebRtcIsac_kQArRc1Levels, WebRtcIsac_kQArRc2Levels, WebRtcIsac_kQArRc3Levels,
-  WebRtcIsac_kQArRc4Levels, WebRtcIsac_kQArRc5Levels, WebRtcIsac_kQArRc6Levels
-};
-
-
-/******************** GAIN Coefficient Tables ***********************/
-/* cdf for Gain coefficient */
-const WebRtc_UWord16 WebRtcIsac_kQGainCdf[19] = {
- 0,  2,  4,  6,  8,  10,  12,  14,  16,  1172,
- 11119,  29411,  51699,  64445,  65527,  65529,  65531,  65533,  65535};
-
-/* representation levels for quantized squared Gain coefficient */
-const WebRtc_Word32 WebRtcIsac_kQGain2Levels[18] = {
-// 17, 28, 46, 76, 128, 215, 364, 709, 1268, 1960, 3405, 6078, 11286, 17827, 51918, 134498, 487432, 2048000};
- 128, 128, 128, 128, 128, 215, 364, 709, 1268, 1960, 3405, 6078, 11286, 17827, 51918, 134498, 487432, 2048000};
-/* quantization boundary levels for squared Gain coefficient */
-const WebRtc_Word32 WebRtcIsac_kQGain2BoundaryLevels[19] = {
-0, 21, 35, 59, 99, 166, 280, 475, 815, 1414, 2495, 4505, 8397, 16405, 34431, 81359, 240497, 921600, 0x7FFFFFFF};
-
-/* pointers to Gain cdf table */
-const WebRtc_UWord16 *WebRtcIsac_kQGainCdf_ptr[1] = {WebRtcIsac_kQGainCdf};
-
-/* Gain initial index for gain quantizer and cdf table search */
-const WebRtc_UWord16 WebRtcIsac_kQGainInitIndex[1] = {11};
-
-/************************* Cosine Tables ****************************/
-/* Cosine table */
-const WebRtc_Word16 WebRtcIsac_kCos[6][60] = {
-{512,  512,  511,  510,  508,  507,  505,  502,  499,  496,  493,  489,  485,  480,  476,  470,  465,  459,  453,  447,
-440,  433,  426,  418,  410,  402,  394,  385,  376,  367,  357,  348,  338,  327,  317,  306,  295,  284,  273,  262,
-250,  238,  226,  214,  202,  190,  177,  165,  152,  139,  126,  113,  100,  87,  73,  60,  47,  33,  20,  7},
-{512,  510,  508,  503,  498,  491,  483,  473,  462,  450,  437,  422,  406,  389,  371,  352,  333,  312,  290,  268,
-244,  220,  196,  171,  145,  120,  93,  67,  40,  13,  -13,  -40,  -67,  -93,  -120,  -145,  -171,  -196,  -220,  -244,
--268,  -290,  -312,  -333,  -352,  -371,  -389,  -406,  -422,  -437,  -450,  -462,  -473,  -483,  -491,  -498,  -503,  -508,  -510,  -512},
-{512,  508,  502,  493,  480,  465,  447,  426,  402,  376,  348,  317,  284,  250,  214,  177,  139,  100,  60,  20,
--20,  -60,  -100,  -139,  -177,  -214,  -250,  -284,  -317,  -348,  -376,  -402,  -426,  -447,  -465,  -480,  -493,  -502,  -508,  -512,
--512,  -508,  -502,  -493,  -480,  -465,  -447,  -426,  -402,  -376,  -348,  -317,  -284,  -250,  -214,  -177,  -139,  -100,  -60,  -20},
-{511,  506,  495,  478,  456,  429,  398,  362,  322,  279,  232,  183,  133,  80,  27,  -27,  -80,  -133,  -183,  -232,
--279,  -322,  -362,  -398,  -429,  -456,  -478,  -495,  -506,  -511,  -511,  -506,  -495,  -478,  -456,  -429,  -398,  -362,  -322,  -279,
--232,  -183,  -133,  -80,  -27,  27,  80,  133,  183,  232,  279,  322,  362,  398,  429,  456,  478,  495,  506,  511},
-{511,  502,  485,  459,  426,  385,  338,  284,  226,  165,  100,  33,  -33,  -100,  -165,  -226,  -284,  -338,  -385,  -426,
--459,  -485,  -502,  -511,  -511,  -502,  -485,  -459,  -426,  -385,  -338,  -284,  -226,  -165,  -100,  -33,  33,  100,  165,  226,
-284,  338,  385,  426,  459,  485,  502,  511,  511,  502,  485,  459,  426,  385,  338,  284,  226,  165,  100,  33},
-{510,  498,  473,  437,  389,  333,  268,  196,  120,  40,  -40,  -120,  -196,  -268,  -333,  -389,  -437,  -473,  -498,  -510,
--510,  -498,  -473,  -437,  -389,  -333,  -268,  -196,  -120,  -40,  40,  120,  196,  268,  333,  389,  437,  473,  498,  510,
-510,  498,  473,  437,  389,  333,  268,  196,  120,  40,  -40,  -120,  -196,  -268,  -333,  -389,  -437,  -473,  -498,  -510}
-};
diff --git a/src/mod/codecs/mod_isac/spectrum_ar_model_tables.h b/src/mod/codecs/mod_isac/spectrum_ar_model_tables.h
deleted file mode 100644
index b6ea85ba77..0000000000
--- a/src/mod/codecs/mod_isac/spectrum_ar_model_tables.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * spectrum_ar_model_tables.h
- *
- * This file contains definitions of tables with AR coefficients,
- * Gain coefficients and cosine tables.
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
-
-#include "structs.h"
-
-/********************* AR Coefficient Tables ************************/
-/* cdf for quantized reflection coefficient 1 */
-extern const WebRtc_UWord16 WebRtcIsac_kQArRc1Cdf[12];
-
-/* cdf for quantized reflection coefficient 2 */
-extern const WebRtc_UWord16 WebRtcIsac_kQArRc2Cdf[12];
-
-/* cdf for quantized reflection coefficient 3 */
-extern const WebRtc_UWord16 WebRtcIsac_kQArRc3Cdf[12];
-
-/* cdf for quantized reflection coefficient 4 */
-extern const WebRtc_UWord16 WebRtcIsac_kQArRc4Cdf[12];
-
-/* cdf for quantized reflection coefficient 5 */
-extern const WebRtc_UWord16 WebRtcIsac_kQArRc5Cdf[12];
-
-/* cdf for quantized reflection coefficient 6 */
-extern const WebRtc_UWord16 WebRtcIsac_kQArRc6Cdf[12];
-
-/* quantization boundary levels for reflection coefficients */
-extern const WebRtc_Word16 WebRtcIsac_kQArBoundaryLevels[12];
-
-/* initial indices for AR reflection coefficient quantizer and cdf table search */
-extern const WebRtc_UWord16 WebRtcIsac_kQArRcInitIndex[AR_ORDER];
-
-/* pointers to AR cdf tables */
-extern const WebRtc_UWord16 *WebRtcIsac_kQArRcCdfPtr[AR_ORDER];
-
-/* pointers to AR representation levels tables */
-extern const WebRtc_Word16 *WebRtcIsac_kQArRcLevelsPtr[AR_ORDER];
-
-
-/******************** GAIN Coefficient Tables ***********************/
-/* cdf for Gain coefficient */
-extern const WebRtc_UWord16 WebRtcIsac_kQGainCdf[19];
-
-/* representation levels for quantized Gain coefficient */
-extern const WebRtc_Word32 WebRtcIsac_kQGain2Levels[18];
-
-/* squared quantization boundary levels for Gain coefficient */
-extern const WebRtc_Word32 WebRtcIsac_kQGain2BoundaryLevels[19];
-
-/* pointer to Gain cdf table */
-extern const WebRtc_UWord16 *WebRtcIsac_kQGainCdf_ptr[1];
-
-/* Gain initial index for gain quantizer and cdf table search */
-extern const WebRtc_UWord16 WebRtcIsac_kQGainInitIndex[1];
-
-/************************* Cosine Tables ****************************/
-/* Cosine table */
-extern const WebRtc_Word16 WebRtcIsac_kCos[6][60];
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ */
diff --git a/src/mod/codecs/mod_isac/spl_inl.h b/src/mod/codecs/mod_isac/spl_inl.h
deleted file mode 100644
index 23b32099a3..0000000000
--- a/src/mod/codecs/mod_isac/spl_inl.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-// This header file includes the inline functions in
-// the fix point signal processing library.
-
-#ifndef WEBRTC_SPL_SPL_INL_H_
-#define WEBRTC_SPL_SPL_INL_H_
-
-#ifdef WEBRTC_ARCH_ARM_V7A
-#include "spl_inl_armv7.h"
-#else
-
-static __inline WebRtc_Word16 WebRtcSpl_SatW32ToW16(WebRtc_Word32 value32) {
-  WebRtc_Word16 out16 = (WebRtc_Word16) value32;
-
-  if (value32 > 32767)
-    out16 = 32767;
-  else if (value32 < -32768)
-    out16 = -32768;
-
-  return out16;
-}
-
-static __inline WebRtc_Word16 WebRtcSpl_AddSatW16(WebRtc_Word16 a,
-                                                  WebRtc_Word16 b) {
-  return WebRtcSpl_SatW32ToW16((WebRtc_Word32) a + (WebRtc_Word32) b);
-}
-
-static __inline WebRtc_Word32 WebRtcSpl_AddSatW32(WebRtc_Word32 l_var1,
-                                                  WebRtc_Word32 l_var2) {
-  WebRtc_Word32 l_sum;
-
-  // perform long addition
-  l_sum = l_var1 + l_var2;
-
-  // check for under or overflow
-  if (WEBRTC_SPL_IS_NEG(l_var1)) {
-    if (WEBRTC_SPL_IS_NEG(l_var2) && !WEBRTC_SPL_IS_NEG(l_sum)) {
-        l_sum = (WebRtc_Word32)0x80000000;
-    }
-  } else {
-    if (!WEBRTC_SPL_IS_NEG(l_var2) && WEBRTC_SPL_IS_NEG(l_sum)) {
-        l_sum = (WebRtc_Word32)0x7FFFFFFF;
-    }
-  }
-
-  return l_sum;
-}
-
-static __inline WebRtc_Word16 WebRtcSpl_SubSatW16(WebRtc_Word16 var1,
-                                                  WebRtc_Word16 var2) {
-  return WebRtcSpl_SatW32ToW16((WebRtc_Word32) var1 - (WebRtc_Word32) var2);
-}
-
-static __inline WebRtc_Word32 WebRtcSpl_SubSatW32(WebRtc_Word32 l_var1,
-                                                  WebRtc_Word32 l_var2) {
-  WebRtc_Word32 l_diff;
-
-  // perform subtraction
-  l_diff = l_var1 - l_var2;
-
-  // check for underflow
-  if ((l_var1 < 0) && (l_var2 > 0) && (l_diff > 0))
-    l_diff = (WebRtc_Word32)0x80000000;
-  // check for overflow
-  if ((l_var1 > 0) && (l_var2 < 0) && (l_diff < 0))
-    l_diff = (WebRtc_Word32)0x7FFFFFFF;
-
-  return l_diff;
-}
-
-static __inline WebRtc_Word16 WebRtcSpl_GetSizeInBits(WebRtc_UWord32 n) {
-  int bits;
-
-  if (0xFFFF0000 & n) {
-    bits = 16;
-  } else {
-    bits = 0;
-  }
-  if (0x0000FF00 & (n >> bits)) bits += 8;
-  if (0x000000F0 & (n >> bits)) bits += 4;
-  if (0x0000000C & (n >> bits)) bits += 2;
-  if (0x00000002 & (n >> bits)) bits += 1;
-  if (0x00000001 & (n >> bits)) bits += 1;
-
-  return bits;
-}
-
-static __inline int WebRtcSpl_NormW32(WebRtc_Word32 a) {
-  int zeros;
-
-  if (a <= 0) a ^= 0xFFFFFFFF;
-
-  if (!(0xFFFF8000 & a)) {
-    zeros = 16;
-  } else {
-    zeros = 0;
-  }
-  if (!(0xFF800000 & (a << zeros))) zeros += 8;
-  if (!(0xF8000000 & (a << zeros))) zeros += 4;
-  if (!(0xE0000000 & (a << zeros))) zeros += 2;
-  if (!(0xC0000000 & (a << zeros))) zeros += 1;
-
-  return zeros;
-}
-
-static __inline int WebRtcSpl_NormU32(WebRtc_UWord32 a) {
-  int zeros;
-
-  if (a == 0) return 0;
-
-  if (!(0xFFFF0000 & a)) {
-    zeros = 16;
-  } else {
-    zeros = 0;
-  }
-  if (!(0xFF000000 & (a << zeros))) zeros += 8;
-  if (!(0xF0000000 & (a << zeros))) zeros += 4;
-  if (!(0xC0000000 & (a << zeros))) zeros += 2;
-  if (!(0x80000000 & (a << zeros))) zeros += 1;
-
-  return zeros;
-}
-
-static __inline int WebRtcSpl_NormW16(WebRtc_Word16 a) {
-  int zeros;
-
-  if (a <= 0) a ^= 0xFFFF;
-
-  if (!(0xFF80 & a)) {
-    zeros = 8;
-  } else {
-    zeros = 0;
-  }
-  if (!(0xF800 & (a << zeros))) zeros += 4;
-  if (!(0xE000 & (a << zeros))) zeros += 2;
-  if (!(0xC000 & (a << zeros))) zeros += 1;
-
-  return zeros;
-}
-
-static __inline int32_t WebRtc_MulAccumW16(int16_t a,
-                                          int16_t b,
-                                          int32_t c) {
-  return (a * b + c);
-}
-
-#endif  // WEBRTC_ARCH_ARM_V7A
-
-#endif  // WEBRTC_SPL_SPL_INL_H_
diff --git a/src/mod/codecs/mod_isac/spl_inl_armv7.h b/src/mod/codecs/mod_isac/spl_inl_armv7.h
deleted file mode 100644
index 689c2baeea..0000000000
--- a/src/mod/codecs/mod_isac/spl_inl_armv7.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-// This header file includes the inline functions for ARM processors in
-// the fix point signal processing library.
-
-#ifndef WEBRTC_SPL_SPL_INL_ARMV7_H_
-#define WEBRTC_SPL_SPL_INL_ARMV7_H_
-
-static __inline WebRtc_Word32 WEBRTC_SPL_MUL_16_32_RSFT16(WebRtc_Word16 a,
-                                                          WebRtc_Word32 b) {
-  WebRtc_Word32 tmp;
-  __asm__("smulwb %0, %1, %2":"=r"(tmp):"r"(b), "r"(a));
-  return tmp;
-}
-
-static __inline WebRtc_Word32 WEBRTC_SPL_MUL_32_32_RSFT32(WebRtc_Word16 a,
-                                                          WebRtc_Word16 b,
-                                                          WebRtc_Word32 c) {
-  WebRtc_Word32 tmp;
-  __asm__("pkhbt %0, %1, %2, lsl #16" : "=r"(tmp) : "r"(b), "r"(a));
-  __asm__("smmul %0, %1, %2":"=r"(tmp):"r"(tmp), "r"(c));
-  return tmp;
-}
-
-static __inline WebRtc_Word32 WEBRTC_SPL_MUL_32_32_RSFT32BI(WebRtc_Word32 a,
-                                                            WebRtc_Word32 b) {
-  WebRtc_Word32 tmp;
-  __asm__("smmul %0, %1, %2":"=r"(tmp):"r"(a), "r"(b));
-  return tmp;
-}
-
-static __inline WebRtc_Word32 WEBRTC_SPL_MUL_16_16(WebRtc_Word16 a,
-                                                   WebRtc_Word16 b) {
-  WebRtc_Word32 tmp;
-  __asm__("smulbb %0, %1, %2":"=r"(tmp):"r"(a), "r"(b));
-  return tmp;
-}
-
-static __inline int32_t WebRtc_MulAccumW16(int16_t a,
-                                          int16_t b,
-                                          int32_t c) {
-  int32_t tmp = 0;
-  __asm__("smlabb %0, %1, %2, %3":"=r"(tmp):"r"(a), "r"(b), "r"(c));
-  return tmp;
-}
-
-static __inline WebRtc_Word16 WebRtcSpl_AddSatW16(WebRtc_Word16 a,
-                                                  WebRtc_Word16 b) {
-  WebRtc_Word32 s_sum;
-
-  __asm__("qadd16 %0, %1, %2":"=r"(s_sum):"r"(a), "r"(b));
-
-  return (WebRtc_Word16) s_sum;
-}
-
-static __inline WebRtc_Word32 WebRtcSpl_AddSatW32(WebRtc_Word32 l_var1,
-                                                  WebRtc_Word32 l_var2) {
-  WebRtc_Word32 l_sum;
-
-  __asm__("qadd %0, %1, %2":"=r"(l_sum):"r"(l_var1), "r"(l_var2));
-
-  return l_sum;
-}
-
-static __inline WebRtc_Word16 WebRtcSpl_SubSatW16(WebRtc_Word16 var1,
-                                                  WebRtc_Word16 var2) {
-  WebRtc_Word32 s_sub;
-
-  __asm__("qsub16 %0, %1, %2":"=r"(s_sub):"r"(var1), "r"(var2));
-
-  return (WebRtc_Word16)s_sub;
-}
-
-static __inline WebRtc_Word32 WebRtcSpl_SubSatW32(WebRtc_Word32 l_var1,
-                                                  WebRtc_Word32 l_var2) {
-  WebRtc_Word32 l_sub;
-
-  __asm__("qsub %0, %1, %2":"=r"(l_sub):"r"(l_var1), "r"(l_var2));
-
-  return l_sub;
-}
-
-static __inline WebRtc_Word16 WebRtcSpl_GetSizeInBits(WebRtc_UWord32 n) {
-  WebRtc_Word32 tmp;
-
-  __asm__("clz %0, %1":"=r"(tmp):"r"(n));
-
-  return (WebRtc_Word16)(32 - tmp);
-}
-
-static __inline int WebRtcSpl_NormW32(WebRtc_Word32 a) {
-  WebRtc_Word32 tmp;
-
-  if (a <= 0) a ^= 0xFFFFFFFF;
-
-  __asm__("clz %0, %1":"=r"(tmp):"r"(a));
-
-  return tmp - 1;
-}
-
-static __inline int WebRtcSpl_NormU32(WebRtc_UWord32 a) {
-  int tmp;
-
-  if (a == 0) return 0;
-
-  __asm__("clz %0, %1":"=r"(tmp):"r"(a));
-
-  return tmp;
-}
-
-static __inline int WebRtcSpl_NormW16(WebRtc_Word16 a) {
-  WebRtc_Word32 tmp;
-
-  if (a <= 0) a ^= 0xFFFFFFFF;
-
-  __asm__("clz %0, %1":"=r"(tmp):"r"(a));
-
-  return tmp - 17;
-}
-
-static __inline WebRtc_Word16 WebRtcSpl_SatW32ToW16(WebRtc_Word32 value32) {
-  WebRtc_Word16 out16;
-
-  __asm__("ssat %r0, #16, %r1" : "=r"(out16) : "r"(value32));
-
-  return out16;
-}
-#endif  // WEBRTC_SPL_SPL_INL_ARMV7_H_
diff --git a/src/mod/codecs/mod_isac/spl_sqrt.c b/src/mod/codecs/mod_isac/spl_sqrt.c
deleted file mode 100644
index cfe2cd3f34..0000000000
--- a/src/mod/codecs/mod_isac/spl_sqrt.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_Sqrt().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-WebRtc_Word32 WebRtcSpl_SqrtLocal(WebRtc_Word32 in);
-
-WebRtc_Word32 WebRtcSpl_SqrtLocal(WebRtc_Word32 in)
-{
-
-    WebRtc_Word16 x_half, t16;
-    WebRtc_Word32 A, B, x2;
-
-    /* The following block performs:
-     y=in/2
-     x=y-2^30
-     x_half=x/2^31
-     t = 1 + (x_half) - 0.5*((x_half)^2) + 0.5*((x_half)^3) - 0.625*((x_half)^4)
-         + 0.875*((x_half)^5)
-     */
-
-    B = in;
-
-    B = WEBRTC_SPL_RSHIFT_W32(B, 1); // B = in/2
-    B = B - ((WebRtc_Word32)0x40000000); // B = in/2 - 1/2
-    x_half = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(B, 16);// x_half = x/2 = (in-1)/2
-    B = B + ((WebRtc_Word32)0x40000000); // B = 1 + x/2
-    B = B + ((WebRtc_Word32)0x40000000); // Add 0.5 twice (since 1.0 does not exist in Q31)
-
-    x2 = ((WebRtc_Word32)x_half) * ((WebRtc_Word32)x_half) * 2; // A = (x/2)^2
-    A = -x2; // A = -(x/2)^2
-    B = B + (A >> 1); // B = 1 + x/2 - 0.5*(x/2)^2
-
-    A = WEBRTC_SPL_RSHIFT_W32(A, 16);
-    A = A * A * 2; // A = (x/2)^4
-    t16 = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(A, 16);
-    B = B + WEBRTC_SPL_MUL_16_16(-20480, t16) * 2; // B = B - 0.625*A
-    // After this, B = 1 + x/2 - 0.5*(x/2)^2 - 0.625*(x/2)^4
-
-    t16 = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(A, 16);
-    A = WEBRTC_SPL_MUL_16_16(x_half, t16) * 2; // A = (x/2)^5
-    t16 = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(A, 16);
-    B = B + WEBRTC_SPL_MUL_16_16(28672, t16) * 2; // B = B + 0.875*A
-    // After this, B = 1 + x/2 - 0.5*(x/2)^2 - 0.625*(x/2)^4 + 0.875*(x/2)^5
-
-    t16 = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(x2, 16);
-    A = WEBRTC_SPL_MUL_16_16(x_half, t16) * 2; // A = x/2^3
-
-    B = B + (A >> 1); // B = B + 0.5*A
-    // After this, B = 1 + x/2 - 0.5*(x/2)^2 + 0.5*(x/2)^3 - 0.625*(x/2)^4 + 0.875*(x/2)^5
-
-    B = B + ((WebRtc_Word32)32768); // Round off bit
-
-    return B;
-}
-
-WebRtc_Word32 WebRtcSpl_Sqrt(WebRtc_Word32 value)
-{
-    /*
-     Algorithm:
-
-     Six term Taylor Series is used here to compute the square root of a number
-     y^0.5 = (1+x)^0.5 where x = y-1
-     = 1+(x/2)-0.5*((x/2)^2+0.5*((x/2)^3-0.625*((x/2)^4+0.875*((x/2)^5)
-     0.5 <= x < 1
-
-     Example of how the algorithm works, with ut=sqrt(in), and
-     with in=73632 and ut=271 (even shift value case):
-
-     in=73632
-     y= in/131072
-     x=y-1
-     t = 1 + (x/2) - 0.5*((x/2)^2) + 0.5*((x/2)^3) - 0.625*((x/2)^4) + 0.875*((x/2)^5)
-     ut=t*(1/sqrt(2))*512
-
-     or:
-
-     in=73632
-     in2=73632*2^14
-     y= in2/2^31
-     x=y-1
-     t = 1 + (x/2) - 0.5*((x/2)^2) + 0.5*((x/2)^3) - 0.625*((x/2)^4) + 0.875*((x/2)^5)
-     ut=t*(1/sqrt(2))
-     ut2=ut*2^9
-
-     which gives:
-
-     in  = 73632
-     in2 = 1206386688
-     y   = 0.56176757812500
-     x   = -0.43823242187500
-     t   = 0.74973506527313
-     ut  = 0.53014274874797
-     ut2 = 2.714330873589594e+002
-
-     or:
-
-     in=73632
-     in2=73632*2^14
-     y=in2/2
-     x=y-2^30
-     x_half=x/2^31
-     t = 1 + (x_half) - 0.5*((x_half)^2) + 0.5*((x_half)^3) - 0.625*((x_half)^4)
-         + 0.875*((x_half)^5)
-     ut=t*(1/sqrt(2))
-     ut2=ut*2^9
-
-     which gives:
-
-     in  = 73632
-     in2 = 1206386688
-     y   = 603193344
-     x   = -470548480
-     x_half =  -0.21911621093750
-     t   = 0.74973506527313
-     ut  = 0.53014274874797
-     ut2 = 2.714330873589594e+002
-
-     */
-
-    WebRtc_Word16 x_norm, nshift, t16, sh;
-    WebRtc_Word32 A;
-
-    WebRtc_Word16 k_sqrt_2 = 23170; // 1/sqrt2 (==5a82)
-
-    A = value;
-
-    if (A == 0)
-        return (WebRtc_Word32)0; // sqrt(0) = 0
-
-    sh = WebRtcSpl_NormW32(A); // # shifts to normalize A
-    A = WEBRTC_SPL_LSHIFT_W32(A, sh); // Normalize A
-    if (A < (WEBRTC_SPL_WORD32_MAX - 32767))
-    {
-        A = A + ((WebRtc_Word32)32768); // Round off bit
-    } else
-    {
-        A = WEBRTC_SPL_WORD32_MAX;
-    }
-
-    x_norm = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(A, 16); // x_norm = AH
-
-    nshift = WEBRTC_SPL_RSHIFT_W16(sh, 1); // nshift = sh>>1
-    nshift = -nshift; // Negate the power for later de-normalization
-
-    A = (WebRtc_Word32)WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)x_norm, 16);
-    A = WEBRTC_SPL_ABS_W32(A); // A = abs(x_norm<<16)
-    A = WebRtcSpl_SqrtLocal(A); // A = sqrt(A)
-
-    if ((-2 * nshift) == sh)
-    { // Even shift value case
-
-        t16 = (WebRtc_Word16)WEBRTC_SPL_RSHIFT_W32(A, 16); // t16 = AH
-
-        A = WEBRTC_SPL_MUL_16_16(k_sqrt_2, t16) * 2; // A = 1/sqrt(2)*t16
-        A = A + ((WebRtc_Word32)32768); // Round off
-        A = A & ((WebRtc_Word32)0x7fff0000); // Round off
-
-        A = WEBRTC_SPL_RSHIFT_W32(A, 15); // A = A>>16
-
-    } else
-    {
-        A = WEBRTC_SPL_RSHIFT_W32(A, 16); // A = A>>16
-    }
-
-    A = A & ((WebRtc_Word32)0x0000ffff);
-    A = (WebRtc_Word32)WEBRTC_SPL_SHIFT_W32(A, nshift); // De-normalize the result
-
-    return A;
-}
diff --git a/src/mod/codecs/mod_isac/spl_sqrt_floor.c b/src/mod/codecs/mod_isac/spl_sqrt_floor.c
deleted file mode 100644
index aa36459ec4..0000000000
--- a/src/mod/codecs/mod_isac/spl_sqrt_floor.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This file contains the function WebRtcSpl_SqrtFloor().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-#define WEBRTC_SPL_SQRT_ITER(N)                 \
-  try1 = root + (1 << (N));                     \
-  if (value >= try1 << (N))                     \
-  {                                             \
-    value -= try1 << (N);                       \
-    root |= 2 << (N);                           \
-  }
-
-// (out) Square root of input parameter
-WebRtc_Word32 WebRtcSpl_SqrtFloor(WebRtc_Word32 value)
-{
-    // new routine for performance, 4 cycles/bit in ARM
-    // output precision is 16 bits
-
-    WebRtc_Word32 root = 0, try1;
-
-    WEBRTC_SPL_SQRT_ITER (15);
-    WEBRTC_SPL_SQRT_ITER (14);
-    WEBRTC_SPL_SQRT_ITER (13);
-    WEBRTC_SPL_SQRT_ITER (12);
-    WEBRTC_SPL_SQRT_ITER (11);
-    WEBRTC_SPL_SQRT_ITER (10);
-    WEBRTC_SPL_SQRT_ITER ( 9);
-    WEBRTC_SPL_SQRT_ITER ( 8);
-    WEBRTC_SPL_SQRT_ITER ( 7);
-    WEBRTC_SPL_SQRT_ITER ( 6);
-    WEBRTC_SPL_SQRT_ITER ( 5);
-    WEBRTC_SPL_SQRT_ITER ( 4);
-    WEBRTC_SPL_SQRT_ITER ( 3);
-    WEBRTC_SPL_SQRT_ITER ( 2);
-    WEBRTC_SPL_SQRT_ITER ( 1);
-    WEBRTC_SPL_SQRT_ITER ( 0);
-
-    return root >> 1;
-}
diff --git a/src/mod/codecs/mod_isac/spl_version.c b/src/mod/codecs/mod_isac/spl_version.c
deleted file mode 100644
index 936925ea14..0000000000
--- a/src/mod/codecs/mod_isac/spl_version.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_get_version().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include <string.h>
-#include "signal_processing_library.h"
-
-WebRtc_Word16 WebRtcSpl_get_version(char* version, WebRtc_Word16 length_in_bytes)
-{
-    strncpy(version, "1.2.0", length_in_bytes);
-    return 0;
-}
diff --git a/src/mod/codecs/mod_isac/splitting_filter.c b/src/mod/codecs/mod_isac/splitting_filter.c
deleted file mode 100644
index f1acf675f9..0000000000
--- a/src/mod/codecs/mod_isac/splitting_filter.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This file contains the splitting filter functions.
- *
- */
-
-#include "signal_processing_library.h"
-
-// Number of samples in a low/high-band frame.
-enum
-{
-    kBandFrameLength = 160
-};
-
-// QMF filter coefficients in Q16.
-static const WebRtc_UWord16 WebRtcSpl_kAllPassFilter1[3] = {6418, 36982, 57261};
-static const WebRtc_UWord16 WebRtcSpl_kAllPassFilter2[3] = {21333, 49062, 63010};
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// WebRtcSpl_AllPassQMF(...)
-//
-// Allpass filter used by the analysis and synthesis parts of the QMF filter.
-//
-// Input:
-//    - in_data             : Input data sequence (Q10)
-//    - data_length         : Length of data sequence (>2)
-//    - filter_coefficients : Filter coefficients (length 3, Q16)
-//
-// Input & Output:
-//    - filter_state        : Filter state (length 6, Q10).
-//
-// Output:
-//    - out_data            : Output data sequence (Q10), length equal to
-//                            |data_length|
-//
-
-void WebRtcSpl_AllPassQMF(WebRtc_Word32* in_data, const WebRtc_Word16 data_length,
-                          WebRtc_Word32* out_data, const WebRtc_UWord16* filter_coefficients,
-                          WebRtc_Word32* filter_state)
-{
-    // The procedure is to filter the input with three first order all pass filters
-    // (cascade operations).
-    //
-    //         a_3 + q^-1    a_2 + q^-1    a_1 + q^-1
-    // y[n] =  -----------   -----------   -----------   x[n]
-    //         1 + a_3q^-1   1 + a_2q^-1   1 + a_1q^-1
-    //
-    // The input vector |filter_coefficients| includes these three filter coefficients.
-    // The filter state contains the in_data state, in_data[-1], followed by
-    // the out_data state, out_data[-1]. This is repeated for each cascade.
-    // The first cascade filter will filter the |in_data| and store the output in
-    // |out_data|. The second will the take the |out_data| as input and make an
-    // intermediate storage in |in_data|, to save memory. The third, and final, cascade
-    // filter operation takes the |in_data| (which is the output from the previous cascade
-    // filter) and store the output in |out_data|.
-    // Note that the input vector values are changed during the process.
-    WebRtc_Word16 k;
-    WebRtc_Word32 diff;
-    // First all-pass cascade; filter from in_data to out_data.
-
-    // Let y_i[n] indicate the output of cascade filter i (with filter coefficient a_i) at
-    // vector position n. Then the final output will be y[n] = y_3[n]
-
-    // First loop, use the states stored in memory.
-    // "diff" should be safe from wrap around since max values are 2^25
-    diff = WEBRTC_SPL_SUB_SAT_W32(in_data[0], filter_state[1]); // = (x[0] - y_1[-1])
-    // y_1[0] =  x[-1] + a_1 * (x[0] - y_1[-1])
-    out_data[0] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[0], diff, filter_state[0]);
-
-    // For the remaining loops, use previous values.
-    for (k = 1; k < data_length; k++)
-    {
-        diff = WEBRTC_SPL_SUB_SAT_W32(in_data[k], out_data[k - 1]); // = (x[n] - y_1[n-1])
-        // y_1[n] =  x[n-1] + a_1 * (x[n] - y_1[n-1])
-        out_data[k] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[0], diff, in_data[k - 1]);
-    }
-
-    // Update states.
-    filter_state[0] = in_data[data_length - 1]; // x[N-1], becomes x[-1] next time
-    filter_state[1] = out_data[data_length - 1]; // y_1[N-1], becomes y_1[-1] next time
-
-    // Second all-pass cascade; filter from out_data to in_data.
-    diff = WEBRTC_SPL_SUB_SAT_W32(out_data[0], filter_state[3]); // = (y_1[0] - y_2[-1])
-    // y_2[0] =  y_1[-1] + a_2 * (y_1[0] - y_2[-1])
-    in_data[0] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[1], diff, filter_state[2]);
-    for (k = 1; k < data_length; k++)
-    {
-        diff = WEBRTC_SPL_SUB_SAT_W32(out_data[k], in_data[k - 1]); // =(y_1[n] - y_2[n-1])
-        // y_2[0] =  y_1[-1] + a_2 * (y_1[0] - y_2[-1])
-        in_data[k] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[1], diff, out_data[k-1]);
-    }
-
-    filter_state[2] = out_data[data_length - 1]; // y_1[N-1], becomes y_1[-1] next time
-    filter_state[3] = in_data[data_length - 1]; // y_2[N-1], becomes y_2[-1] next time
-
-    // Third all-pass cascade; filter from in_data to out_data.
-    diff = WEBRTC_SPL_SUB_SAT_W32(in_data[0], filter_state[5]); // = (y_2[0] - y[-1])
-    // y[0] =  y_2[-1] + a_3 * (y_2[0] - y[-1])
-    out_data[0] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[2], diff, filter_state[4]);
-    for (k = 1; k < data_length; k++)
-    {
-        diff = WEBRTC_SPL_SUB_SAT_W32(in_data[k], out_data[k - 1]); // = (y_2[n] - y[n-1])
-        // y[n] =  y_2[n-1] + a_3 * (y_2[n] - y[n-1])
-        out_data[k] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[2], diff, in_data[k-1]);
-    }
-    filter_state[4] = in_data[data_length - 1]; // y_2[N-1], becomes y_2[-1] next time
-    filter_state[5] = out_data[data_length - 1]; // y[N-1], becomes y[-1] next time
-}
-
-void WebRtcSpl_AnalysisQMF(const WebRtc_Word16* in_data, WebRtc_Word16* low_band,
-                           WebRtc_Word16* high_band, WebRtc_Word32* filter_state1,
-                           WebRtc_Word32* filter_state2)
-{
-    WebRtc_Word16 i;
-    WebRtc_Word16 k;
-    WebRtc_Word32 tmp;
-    WebRtc_Word32 half_in1[kBandFrameLength];
-    WebRtc_Word32 half_in2[kBandFrameLength];
-    WebRtc_Word32 filter1[kBandFrameLength];
-    WebRtc_Word32 filter2[kBandFrameLength];
-
-    // Split even and odd samples. Also shift them to Q10.
-    for (i = 0, k = 0; i < kBandFrameLength; i++, k += 2)
-    {
-        half_in2[i] = WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)in_data[k], 10);
-        half_in1[i] = WEBRTC_SPL_LSHIFT_W32((WebRtc_Word32)in_data[k + 1], 10);
-    }
-
-    // All pass filter even and odd samples, independently.
-    WebRtcSpl_AllPassQMF(half_in1, kBandFrameLength, filter1, WebRtcSpl_kAllPassFilter1,
-                         filter_state1);
-    WebRtcSpl_AllPassQMF(half_in2, kBandFrameLength, filter2, WebRtcSpl_kAllPassFilter2,
-                         filter_state2);
-
-    // Take the sum and difference of filtered version of odd and even
-    // branches to get upper & lower band.
-    for (i = 0; i < kBandFrameLength; i++)
-    {
-        tmp = filter1[i] + filter2[i] + 1024;
-        tmp = WEBRTC_SPL_RSHIFT_W32(tmp, 11);
-        low_band[i] = WebRtcSpl_SatW32ToW16(tmp);
-
-        tmp = filter1[i] - filter2[i] + 1024;
-        tmp = WEBRTC_SPL_RSHIFT_W32(tmp, 11);
-        high_band[i] = WebRtcSpl_SatW32ToW16(tmp);
-    }
-}
-
-void WebRtcSpl_SynthesisQMF(const WebRtc_Word16* low_band, const WebRtc_Word16* high_band,
-                            WebRtc_Word16* out_data, WebRtc_Word32* filter_state1,
-                            WebRtc_Word32* filter_state2)
-{
-    WebRtc_Word32 tmp;
-    WebRtc_Word32 half_in1[kBandFrameLength];
-    WebRtc_Word32 half_in2[kBandFrameLength];
-    WebRtc_Word32 filter1[kBandFrameLength];
-    WebRtc_Word32 filter2[kBandFrameLength];
-    WebRtc_Word16 i;
-    WebRtc_Word16 k;
-
-    // Obtain the sum and difference channels out of upper and lower-band channels.
-    // Also shift to Q10 domain.
-    for (i = 0; i < kBandFrameLength; i++)
-    {
-        tmp = (WebRtc_Word32)low_band[i] + (WebRtc_Word32)high_band[i];
-        half_in1[i] = WEBRTC_SPL_LSHIFT_W32(tmp, 10);
-        tmp = (WebRtc_Word32)low_band[i] - (WebRtc_Word32)high_band[i];
-        half_in2[i] = WEBRTC_SPL_LSHIFT_W32(tmp, 10);
-    }
-
-    // all-pass filter the sum and difference channels
-    WebRtcSpl_AllPassQMF(half_in1, kBandFrameLength, filter1, WebRtcSpl_kAllPassFilter2,
-                         filter_state1);
-    WebRtcSpl_AllPassQMF(half_in2, kBandFrameLength, filter2, WebRtcSpl_kAllPassFilter1,
-                         filter_state2);
-
-    // The filtered signals are even and odd samples of the output. Combine
-    // them. The signals are Q10 should shift them back to Q0 and take care of
-    // saturation.
-    for (i = 0, k = 0; i < kBandFrameLength; i++)
-    {
-        tmp = WEBRTC_SPL_RSHIFT_W32(filter2[i] + 512, 10);
-        out_data[k++] = WebRtcSpl_SatW32ToW16(tmp);
-
-        tmp = WEBRTC_SPL_RSHIFT_W32(filter1[i] + 512, 10);
-        out_data[k++] = WebRtcSpl_SatW32ToW16(tmp);
-    }
-
-}
diff --git a/src/mod/codecs/mod_isac/sqrt_of_one_minus_x_squared.c b/src/mod/codecs/mod_isac/sqrt_of_one_minus_x_squared.c
deleted file mode 100644
index 9fb2c73bc5..0000000000
--- a/src/mod/codecs/mod_isac/sqrt_of_one_minus_x_squared.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_SqrtOfOneMinusXSquared().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-void WebRtcSpl_SqrtOfOneMinusXSquared(WebRtc_Word16 *xQ15, int vector_length,
-                                      WebRtc_Word16 *yQ15)
-{
-    WebRtc_Word32 sq;
-    int m;
-    WebRtc_Word16 tmp;
-
-    for (m = 0; m < vector_length; m++)
-    {
-        tmp = xQ15[m];
-        sq = WEBRTC_SPL_MUL_16_16(tmp, tmp); // x^2 in Q30
-        sq = 1073741823 - sq; // 1-x^2, where 1 ~= 0.99999999906 is 1073741823 in Q30
-        sq = WebRtcSpl_Sqrt(sq); // sqrt(1-x^2) in Q15
-        yQ15[m] = (WebRtc_Word16)sq;
-    }
-}
diff --git a/src/mod/codecs/mod_isac/structs.h b/src/mod/codecs/mod_isac/structs.h
deleted file mode 100644
index 7523ad6e4a..0000000000
--- a/src/mod/codecs/mod_isac/structs.h
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * structs.h
- *
- * This header file contains all the structs used in the ISAC codec
- *
- */
-
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_
-
-
-#include "typedefs.h"
-#include "settings.h"
-#include "isac.h"
-
-typedef struct Bitstreamstruct {
-
-  WebRtc_UWord8   stream[STREAM_SIZE_MAX];
-  WebRtc_UWord32  W_upper;
-  WebRtc_UWord32  streamval;
-  WebRtc_UWord32  stream_index;
-
-} Bitstr;
-
-typedef struct {
-
-  double    DataBufferLo[WINLEN];
-  double    DataBufferHi[WINLEN];
-
-  double    CorrBufLo[ORDERLO+1];
-  double    CorrBufHi[ORDERHI+1];
-
-  float    PreStateLoF[ORDERLO+1];
-  float    PreStateLoG[ORDERLO+1];
-  float    PreStateHiF[ORDERHI+1];
-  float    PreStateHiG[ORDERHI+1];
-  float    PostStateLoF[ORDERLO+1];
-  float    PostStateLoG[ORDERLO+1];
-  float    PostStateHiF[ORDERHI+1];
-  float    PostStateHiG[ORDERHI+1];
-
-  double    OldEnergy;
-
-} MaskFiltstr;
-
-
-typedef struct {
-
-  //state vectors for each of the two analysis filters
-  double    INSTAT1[2*(QORDER-1)];
-  double    INSTAT2[2*(QORDER-1)];
-  double    INSTATLA1[2*(QORDER-1)];
-  double    INSTATLA2[2*(QORDER-1)];
-  double    INLABUF1[QLOOKAHEAD];
-  double    INLABUF2[QLOOKAHEAD];
-
-  float    INSTAT1_float[2*(QORDER-1)];
-  float    INSTAT2_float[2*(QORDER-1)];
-  float    INSTATLA1_float[2*(QORDER-1)];
-  float    INSTATLA2_float[2*(QORDER-1)];
-  float    INLABUF1_float[QLOOKAHEAD];
-  float    INLABUF2_float[QLOOKAHEAD];
-
-  /* High pass filter */
-  double    HPstates[HPORDER];
-  float    HPstates_float[HPORDER];
-
-} PreFiltBankstr;
-
-
-typedef struct {
-
-  //state vectors for each of the two analysis filters
-  double    STATE_0_LOWER[2*POSTQORDER];
-  double    STATE_0_UPPER[2*POSTQORDER];
-
-  /* High pass filter */
-  double    HPstates1[HPORDER];
-  double    HPstates2[HPORDER];
-
-  float    STATE_0_LOWER_float[2*POSTQORDER];
-  float    STATE_0_UPPER_float[2*POSTQORDER];
-
-  float    HPstates1_float[HPORDER];
-  float    HPstates2_float[HPORDER];
-
-} PostFiltBankstr;
-
-typedef struct {
-
-  //data buffer for pitch filter
-  double    ubuf[PITCH_BUFFSIZE];
-
-  //low pass state vector
-  double    ystate[PITCH_DAMPORDER];
-
-  //old lag and gain
-  double    oldlagp[1];
-  double    oldgainp[1];
-
-} PitchFiltstr;
-
-typedef struct {
-
-  //data buffer
-  double    buffer[PITCH_WLPCBUFLEN];
-
-  //state vectors
-  double    istate[PITCH_WLPCORDER];
-  double    weostate[PITCH_WLPCORDER];
-  double    whostate[PITCH_WLPCORDER];
-
-  //LPC window   -> should be a global array because constant
-  double    window[PITCH_WLPCWINLEN];
-
-} WeightFiltstr;
-
-typedef struct {
-
-  //for inital estimator
-  double         dec_buffer[PITCH_CORR_LEN2 + PITCH_CORR_STEP2 +
-                            PITCH_MAX_LAG/2 - PITCH_FRAME_LEN/2+2];
-  double        decimator_state[2*ALLPASSSECTIONS+1];
-  double        hp_state[2];
-
-  double        whitened_buf[QLOOKAHEAD];
-
-  double        inbuf[QLOOKAHEAD];
-
-  PitchFiltstr  PFstr_wght;
-  PitchFiltstr  PFstr;
-  WeightFiltstr Wghtstr;
-
-} PitchAnalysisStruct;
-
-
-
-/* Have instance of struct together with other iSAC structs */
-typedef struct {
-
-  /* Previous frame length (in ms)                                    */
-  WebRtc_Word32    prev_frame_length;
-
-  /* Previous RTP timestamp from received
-     packet (in samples relative beginning)                           */
-  WebRtc_Word32    prev_rec_rtp_number;
-
-  /* Send timestamp for previous packet (in ms using timeGetTime())   */
-  WebRtc_UWord32    prev_rec_send_ts;
-
-  /* Arrival time for previous packet (in ms using timeGetTime())     */
-  WebRtc_UWord32    prev_rec_arr_ts;
-
-  /* rate of previous packet, derived from RTP timestamps (in bits/s) */
-  float   prev_rec_rtp_rate;
-
-  /* Time sinse the last update of the BN estimate (in ms)            */
-  WebRtc_UWord32    last_update_ts;
-
-  /* Time sinse the last reduction (in ms)                            */
-  WebRtc_UWord32    last_reduction_ts;
-
-  /* How many times the estimate was update in the beginning          */
-  WebRtc_Word32    count_tot_updates_rec;
-
-  /* The estimated bottle neck rate from there to here (in bits/s)    */
-  WebRtc_Word32  rec_bw;
-  float   rec_bw_inv;
-  float   rec_bw_avg;
-  float   rec_bw_avg_Q;
-
-  /* The estimated mean absolute jitter value,
-     as seen on this side (in ms)                                     */
-  float   rec_jitter;
-  float   rec_jitter_short_term;
-  float   rec_jitter_short_term_abs;
-  float   rec_max_delay;
-  float   rec_max_delay_avg_Q;
-
-  /* (assumed) bitrate for headers (bps)                              */
-  float   rec_header_rate;
-
-  /* The estimated bottle neck rate from here to there (in bits/s)    */
-  float    send_bw_avg;
-
-  /* The estimated mean absolute jitter value, as seen on
-     the other siee (in ms)                                           */
-  float   send_max_delay_avg;
-
-  // number of packets received since last update
-  int num_pkts_rec;
-
-  int num_consec_rec_pkts_over_30k;
-
-  // flag for marking that a high speed network has been
-  // detected downstream
-  int hsn_detect_rec;
-
-  int num_consec_snt_pkts_over_30k;
-
-  // flag for marking that a high speed network has
-  // been detected upstream
-  int hsn_detect_snd;
-
-  WebRtc_UWord32 start_wait_period;
-
-  int in_wait_period;
-
-  int change_to_WB;
-
-  WebRtc_UWord32                 senderTimestamp;
-  WebRtc_UWord32                 receiverTimestamp;
-  //enum IsacSamplingRate incomingStreamSampFreq;
-  WebRtc_UWord16                 numConsecLatePkts;
-  float                        consecLatency;
-  WebRtc_Word16                  inWaitLatePkts;
-} BwEstimatorstr;
-
-
-typedef struct {
-
-  /* boolean, flags if previous packet exceeded B.N. */
-  int    PrevExceed;
-  /* ms */
-  int    ExceedAgo;
-  /* packets left to send in current burst */
-  int    BurstCounter;
-  /* packets */
-  int    InitCounter;
-  /* ms remaining in buffer when next packet will be sent */
-  double StillBuffered;
-
-} RateModel;
-
-
-typedef struct {
-
-  unsigned int SpaceAlloced;
-  unsigned int MaxPermAlloced;
-  double Tmp0[MAXFFTSIZE];
-  double Tmp1[MAXFFTSIZE];
-  double Tmp2[MAXFFTSIZE];
-  double Tmp3[MAXFFTSIZE];
-  int Perm[MAXFFTSIZE];
-  int factor [NFACTOR];
-
-} FFTstr;
-
-
-/* The following strutc is used to store data from encoding, to make it
-   fast and easy to construct a new bitstream with a different Bandwidth
-   estimate. All values (except framelength and minBytes) is double size to
-   handle 60 ms of data.
-*/
-typedef struct {
-
-  /* Used to keep track of if it is first or second part of 60 msec packet */
-  int         startIdx;
-
-  /* Frame length in samples */
-  WebRtc_Word16 framelength;
-
-  /* Pitch Gain */
-  int         pitchGain_index[2];
-
-  /* Pitch Lag */
-  double      meanGain[2];
-  int         pitchIndex[PITCH_SUBFRAMES*2];
-
-  /* LPC */
-  int         LPCmodel[2];
-  int         LPCindex_s[108*2]; /* KLT_ORDER_SHAPE = 108 */
-  int         LPCindex_g[12*2];  /* KLT_ORDER_GAIN = 12 */
-  double      LPCcoeffs_lo[(ORDERLO+1)*SUBFRAMES*2];
-  double      LPCcoeffs_hi[(ORDERHI+1)*SUBFRAMES*2];
-
-  /* Encode Spec */
-  WebRtc_Word16 fre[FRAMESAMPLES];
-  WebRtc_Word16 fim[FRAMESAMPLES];
-  WebRtc_Word16 AvgPitchGain[2];
-
-  /* Used in adaptive mode only */
-  int         minBytes;
-
-} ISAC_SaveEncData_t;
-
-
-typedef struct {
-
-  int         indexLPCShape[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  double      lpcGain[SUBFRAMES<<1];
-  int         lpcGainIndex[SUBFRAMES<<1];
-
-  Bitstr      bitStreamObj;
-
-  WebRtc_Word16 realFFT[FRAMESAMPLES_HALF];
-  WebRtc_Word16 imagFFT[FRAMESAMPLES_HALF];
-} ISACUBSaveEncDataStruct;
-
-
-
-typedef struct {
-
-  Bitstr              bitstr_obj;
-  MaskFiltstr         maskfiltstr_obj;
-  PreFiltBankstr      prefiltbankstr_obj;
-  PitchFiltstr        pitchfiltstr_obj;
-  PitchAnalysisStruct pitchanalysisstr_obj;
-  FFTstr              fftstr_obj;
-  ISAC_SaveEncData_t  SaveEnc_obj;
-
-  int                 buffer_index;
-  WebRtc_Word16         current_framesamples;
-
-  float               data_buffer_float[FRAMESAMPLES_30ms];
-
-  int                 frame_nb;
-  double              bottleneck;
-  WebRtc_Word16         new_framelength;
-  double              s2nr;
-
-  /* Maximum allowed number of bits for a 30 msec packet */
-  WebRtc_Word16         payloadLimitBytes30;
-  /* Maximum allowed number of bits for a 30 msec packet */
-  WebRtc_Word16         payloadLimitBytes60;
-  /* Maximum allowed number of bits for both 30 and 60 msec packet */
-  WebRtc_Word16         maxPayloadBytes;
-  /* Maximum allowed rate in bytes per 30 msec packet */
-  WebRtc_Word16         maxRateInBytes;
-
-  /*---
-    If set to 1 iSAC will not addapt the frame-size, if used in
-    channel-adaptive mode. The initial value will be used for all rates.
-    ---*/
-  WebRtc_Word16         enforceFrameSize;
-
-  /*-----
-    This records the BWE index the encoder injected into the bit-stream.
-    It will be used in RCU. The same BWE index of main paylaod will be in
-    the redundant payload. We can not retrive it from BWE because it is
-    a recursive procedure (WebRtcIsac_GetDownlinkBwJitIndexImpl) and has to be
-    called only once per each encode.
-    -----*/
-  WebRtc_Word16         lastBWIdx;
-} ISACLBEncStruct;
-
-typedef struct {
-
-  Bitstr                  bitstr_obj;
-  MaskFiltstr             maskfiltstr_obj;
-  PreFiltBankstr          prefiltbankstr_obj;
-  FFTstr                  fftstr_obj;
-  ISACUBSaveEncDataStruct SaveEnc_obj;
-
-  int                     buffer_index;
-  float                   data_buffer_float[MAX_FRAMESAMPLES +
-                                            LB_TOTAL_DELAY_SAMPLES];
-  double                  bottleneck;
-  /* Maximum allowed number of bits for a 30 msec packet */
-  //WebRtc_Word16        payloadLimitBytes30;
-  /* Maximum allowed number of bits for both 30 and 60 msec packet */
-  //WebRtc_Word16        maxPayloadBytes;
-  WebRtc_Word16             maxPayloadSizeBytes;
-
-  double                  lastLPCVec[UB_LPC_ORDER];
-  WebRtc_Word16             numBytesUsed;
-  WebRtc_Word16             lastJitterInfo;
-} ISACUBEncStruct;
-
-
-
-typedef struct {
-
-  Bitstr          bitstr_obj;
-  MaskFiltstr     maskfiltstr_obj;
-  PostFiltBankstr postfiltbankstr_obj;
-  PitchFiltstr    pitchfiltstr_obj;
-  FFTstr          fftstr_obj;
-
-} ISACLBDecStruct;
-
-typedef struct {
-
-  Bitstr          bitstr_obj;
-  MaskFiltstr     maskfiltstr_obj;
-  PostFiltBankstr postfiltbankstr_obj;
-  FFTstr          fftstr_obj;
-
-} ISACUBDecStruct;
-
-
-
-typedef struct {
-
-  ISACLBEncStruct ISACencLB_obj;
-  ISACLBDecStruct ISACdecLB_obj;
-} ISACLBStruct;
-
-
-typedef struct {
-
-  ISACUBEncStruct ISACencUB_obj;
-  ISACUBDecStruct ISACdecUB_obj;
-} ISACUBStruct;
-
-/*
-  This struct is used to take a snapshot of the entropy coder and LPC gains
-  right before encoding LPC gains. This allows us to go back to that state
-  if we like to limit the payload size.
-*/
-typedef struct {
-  /* 6 lower-band & 6 upper-band */
-  double       loFiltGain[SUBFRAMES];
-  double       hiFiltGain[SUBFRAMES];
-  /* Upper boundary of interval W */
-  WebRtc_UWord32 W_upper;
-  WebRtc_UWord32 streamval;
-  /* Index to the current position in bytestream */
-  WebRtc_UWord32 stream_index;
-  WebRtc_UWord8  stream[3];
-} transcode_obj;
-
-
-typedef struct {
-  // lower-band codec instance
-  ISACLBStruct              instLB;
-  // upper-band codec instance
-  ISACUBStruct              instUB;
-
-  // Bandwidth Estimator and model for the rate.
-  BwEstimatorstr            bwestimator_obj;
-  RateModel                 rate_data_obj;
-  double                    MaxDelay;
-
-  /* 0 = adaptive; 1 = instantaneous */
-  WebRtc_Word16               codingMode;
-
-  // overall bottleneck of the codec
-  WebRtc_Word32               bottleneck;
-
-  // QMF Filter state
-  WebRtc_Word32               analysisFBState1[FB_STATE_SIZE_WORD32];
-  WebRtc_Word32               analysisFBState2[FB_STATE_SIZE_WORD32];
-  WebRtc_Word32               synthesisFBState1[FB_STATE_SIZE_WORD32];
-  WebRtc_Word32               synthesisFBState2[FB_STATE_SIZE_WORD32];
-
-  // Error Code
-  WebRtc_Word16               errorCode;
-
-  // bandwidth of the encoded audio 8, 12 or 16 kHz
-  enum ISACBandwidth        bandwidthKHz;
-  // Sampling rate of audio, encoder and decode,  8 or 16 kHz
-  enum IsacSamplingRate encoderSamplingRateKHz;
-  enum IsacSamplingRate decoderSamplingRateKHz;
-  // Flag to keep track of initializations, lower & upper-band
-  // encoder and decoder.
-  WebRtc_Word16               initFlag;
-
-  // Flag to to indicate signal bandwidth switch
-  WebRtc_Word16               resetFlag_8kHz;
-
-  // Maximum allowed rate, measured in Bytes per 30 ms.
-  WebRtc_Word16               maxRateBytesPer30Ms;
-  // Maximum allowed payload-size, measured in Bytes.
-  WebRtc_Word16               maxPayloadSizeBytes;
-} ISACMainStruct;
-
-#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_ */
diff --git a/src/mod/codecs/mod_isac/transform.c b/src/mod/codecs/mod_isac/transform.c
deleted file mode 100644
index 97b801ac49..0000000000
--- a/src/mod/codecs/mod_isac/transform.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "settings.h"
-#include "fft.h"
-#include "codec.h"
-#include "os_specific_inline.h"
-#include <math.h>
-
-static double costab1[FRAMESAMPLES_HALF];
-static double sintab1[FRAMESAMPLES_HALF];
-static double costab2[FRAMESAMPLES_QUARTER];
-static double sintab2[FRAMESAMPLES_QUARTER];
-
-void WebRtcIsac_InitTransform()
-{
-  int k;
-  double fact, phase;
-
-  fact = PI / (FRAMESAMPLES_HALF);
-  phase = 0.0;
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    costab1[k] = cos(phase);
-    sintab1[k] = sin(phase);
-    phase += fact;
-  }
-
-  fact = PI * ((double) (FRAMESAMPLES_HALF - 1)) / ((double) FRAMESAMPLES_HALF);
-  phase = 0.5 * fact;
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++) {
-    costab2[k] = cos(phase);
-    sintab2[k] = sin(phase);
-    phase += fact;
-  }
-}
-
-
-void WebRtcIsac_Time2Spec(double *inre1,
-                         double *inre2,
-                         WebRtc_Word16 *outreQ7,
-                         WebRtc_Word16 *outimQ7,
-                         FFTstr *fftstr_obj)
-{
-
-  int k;
-  int dims[1];
-  double tmp1r, tmp1i, xr, xi, yr, yi, fact;
-  double tmpre[FRAMESAMPLES_HALF], tmpim[FRAMESAMPLES_HALF];
-
-
-  dims[0] = FRAMESAMPLES_HALF;
-
-
-  /* Multiply with complex exponentials and combine into one complex vector */
-  fact = 0.5 / sqrt(FRAMESAMPLES_HALF);
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tmp1r = costab1[k];
-    tmp1i = sintab1[k];
-    tmpre[k] = (inre1[k] * tmp1r + inre2[k] * tmp1i) * fact;
-    tmpim[k] = (inre2[k] * tmp1r - inre1[k] * tmp1i) * fact;
-  }
-
-
-  /* Get DFT */
-  WebRtcIsac_Fftns(1, dims, tmpre, tmpim, -1, 1.0, fftstr_obj);
-
-  /* Use symmetry to separate into two complex vectors and center frames in time around zero */
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++) {
-    xr = tmpre[k] + tmpre[FRAMESAMPLES_HALF - 1 - k];
-    yi = -tmpre[k] + tmpre[FRAMESAMPLES_HALF - 1 - k];
-    xi = tmpim[k] - tmpim[FRAMESAMPLES_HALF - 1 - k];
-    yr = tmpim[k] + tmpim[FRAMESAMPLES_HALF - 1 - k];
-
-    tmp1r = costab2[k];
-    tmp1i = sintab2[k];
-    outreQ7[k] = (WebRtc_Word16)WebRtcIsac_lrint((xr * tmp1r - xi * tmp1i) * 128.0);
-    outimQ7[k] = (WebRtc_Word16)WebRtcIsac_lrint((xr * tmp1i + xi * tmp1r) * 128.0);
-    outreQ7[FRAMESAMPLES_HALF - 1 - k] = (WebRtc_Word16)WebRtcIsac_lrint((-yr * tmp1i - yi * tmp1r) * 128.0);
-    outimQ7[FRAMESAMPLES_HALF - 1 - k] = (WebRtc_Word16)WebRtcIsac_lrint((-yr * tmp1r + yi * tmp1i) * 128.0);
-  }
-}
-
-
-void WebRtcIsac_Spec2time(double *inre, double *inim, double *outre1, double *outre2, FFTstr *fftstr_obj)
-{
-
-  int k;
-  double tmp1r, tmp1i, xr, xi, yr, yi, fact;
-
-  int dims;
-
-  dims = FRAMESAMPLES_HALF;
-
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++) {
-    /* Move zero in time to beginning of frames */
-    tmp1r = costab2[k];
-    tmp1i = sintab2[k];
-    xr = inre[k] * tmp1r + inim[k] * tmp1i;
-    xi = inim[k] * tmp1r - inre[k] * tmp1i;
-    yr = -inim[FRAMESAMPLES_HALF - 1 - k] * tmp1r - inre[FRAMESAMPLES_HALF - 1 - k] * tmp1i;
-    yi = -inre[FRAMESAMPLES_HALF - 1 - k] * tmp1r + inim[FRAMESAMPLES_HALF - 1 - k] * tmp1i;
-
-    /* Combine into one vector,  z = x + j * y */
-    outre1[k] = xr - yi;
-    outre1[FRAMESAMPLES_HALF - 1 - k] = xr + yi;
-    outre2[k] = xi + yr;
-    outre2[FRAMESAMPLES_HALF - 1 - k] = -xi + yr;
-  }
-
-
-  /* Get IDFT */
-  WebRtcIsac_Fftns(1, &dims, outre1, outre2, 1, FRAMESAMPLES_HALF, fftstr_obj);
-
-
-  /* Demodulate and separate */
-  fact = sqrt(FRAMESAMPLES_HALF);
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tmp1r = costab1[k];
-    tmp1i = sintab1[k];
-    xr = (outre1[k] * tmp1r - outre2[k] * tmp1i) * fact;
-    outre2[k] = (outre2[k] * tmp1r + outre1[k] * tmp1i) * fact;
-    outre1[k] = xr;
-  }
-}
diff --git a/src/mod/codecs/mod_isac/typedefs.h b/src/mod/codecs/mod_isac/typedefs.h
deleted file mode 100644
index df0df45723..0000000000
--- a/src/mod/codecs/mod_isac/typedefs.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This file contains platform-specific typedefs and defines.
-
-#ifndef WEBRTC_TYPEDEFS_H_
-#define WEBRTC_TYPEDEFS_H_
-
-// Reserved words definitions
-// TODO(andrew): Look at removing these.
-#define WEBRTC_EXTERN extern
-#define G_CONST const
-#define WEBRTC_INLINE extern __inline
-
-// Define WebRTC preprocessor identifiers based on the current build platform.
-// TODO(andrew): Clean these up. We can probably remove everything in this
-// block.
-//   - TARGET_MAC_INTEL and TARGET_MAC aren't used anywhere.
-//   - In the few places where TARGET_PC is used, it should be replaced by
-//     something more specific.
-//   - Do we really support PowerPC? Probably not. Remove WEBRTC_MAC_INTEL
-//     from build/common.gypi as well.
-#if defined(WIN32)
-    // Windows & Windows Mobile.
-    #if !defined(WEBRTC_TARGET_PC)
-        #define WEBRTC_TARGET_PC
-    #endif
-#elif defined(__APPLE__)
-    // Mac OS X.
-    #if defined(__LITTLE_ENDIAN__ )
-        #if !defined(WEBRTC_TARGET_MAC_INTEL)
-            #define WEBRTC_TARGET_MAC_INTEL
-        #endif
-    #else
-        #if !defined(WEBRTC_TARGET_MAC)
-            #define WEBRTC_TARGET_MAC
-        #endif
-    #endif
-#else
-    // Linux etc.
-    #if !defined(WEBRTC_TARGET_PC)
-        #define WEBRTC_TARGET_PC
-    #endif
-#endif
-
-// Derived from Chromium's build/build_config.h
-// Processor architecture detection.  For more info on what's defined, see:
-//   http://msdn.microsoft.com/en-us/library/b0084kay.aspx
-//   http://www.agner.org/optimize/calling_conventions.pdf
-//   or with gcc, run: "echo | gcc -E -dM -"
-// TODO(andrew): replace WEBRTC_LITTLE_ENDIAN with WEBRTC_ARCH_LITTLE_ENDIAN?
-#if defined(_M_X64) || defined(__x86_64__)
-#define WEBRTC_ARCH_X86_FAMILY
-#define WEBRTC_ARCH_X86_64
-#define WEBRTC_ARCH_64_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__aarch64__)
-#define WEBRTC_ARCH_64_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(_M_IX86) || defined(__i386__)
-#define WEBRTC_ARCH_X86_FAMILY
-#define WEBRTC_ARCH_X86
-#define WEBRTC_ARCH_32_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__ARMEL__)
-// TODO(andrew): We'd prefer to control platform defines here, but this is
-// currently provided by the Android makefiles. Commented to avoid duplicate
-// definition warnings.
-//#define WEBRTC_ARCH_ARM
-// TODO(andrew): Chromium uses the following two defines. Should we switch?
-//#define WEBRTC_ARCH_ARM_FAMILY
-//#define WEBRTC_ARCH_ARMEL
-#define WEBRTC_ARCH_32_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__MIPSEB__)
-#define WEBRTC_ARCH_BIG_ENDIAN
-#elif defined(__MIPSEL__)
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#else
-#error Please add support for your architecture in typedefs.h
-#endif
-
-#if defined(__SSE2__) || defined(_MSC_VER)
-#define WEBRTC_USE_SSE2
-#endif
-
-#if defined(WEBRTC_TARGET_PC)
-
-#if !defined(_MSC_VER)
-  #include <stdint.h>
-#else
-    // Define C99 equivalent types.
-    // Since MSVC doesn't include these headers, we have to write our own
-    // version to provide a compatibility layer between MSVC and the WebRTC
-    // headers.
-    typedef signed char         int8_t;
-    typedef signed short        int16_t;
-    typedef signed int          int32_t;
-    typedef signed long long    int64_t;
-    typedef unsigned char       uint8_t;
-    typedef unsigned short      uint16_t;
-    typedef unsigned int        uint32_t;
-    typedef unsigned long long  uint64_t;
-#endif
-
-#if defined(WIN32)
-    typedef __int64             WebRtc_Word64;
-    typedef unsigned __int64    WebRtc_UWord64;
-#else
-    typedef int64_t             WebRtc_Word64;
-    typedef uint64_t            WebRtc_UWord64;
-#endif
-    typedef int32_t             WebRtc_Word32;
-    typedef uint32_t            WebRtc_UWord32;
-    typedef int16_t             WebRtc_Word16;
-    typedef uint16_t            WebRtc_UWord16;
-    typedef char                WebRtc_Word8;
-    typedef uint8_t             WebRtc_UWord8;
-
-    // Define endian for the platform
-    #define WEBRTC_LITTLE_ENDIAN
-
-#elif defined(WEBRTC_TARGET_MAC_INTEL)
-    #include <stdint.h>
-
-    typedef int64_t             WebRtc_Word64;
-    typedef uint64_t            WebRtc_UWord64;
-    typedef int32_t             WebRtc_Word32;
-    typedef uint32_t            WebRtc_UWord32;
-    typedef int16_t             WebRtc_Word16;
-    typedef char                WebRtc_Word8;
-    typedef uint16_t            WebRtc_UWord16;
-    typedef uint8_t             WebRtc_UWord8;
-
-    // Define endian for the platform
-    #define WEBRTC_LITTLE_ENDIAN
-
-#else
-    #error "No platform defined for WebRTC type definitions (typedefs.h)"
-#endif
-
-#endif  // WEBRTC_TYPEDEFS_H_
diff --git a/src/mod/codecs/mod_isac/vector_scaling_operations.c b/src/mod/codecs/mod_isac/vector_scaling_operations.c
deleted file mode 100644
index 20d239cabe..0000000000
--- a/src/mod/codecs/mod_isac/vector_scaling_operations.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains implementations of the functions
- * WebRtcSpl_VectorBitShiftW16()
- * WebRtcSpl_VectorBitShiftW32()
- * WebRtcSpl_VectorBitShiftW32ToW16()
- * WebRtcSpl_ScaleVector()
- * WebRtcSpl_ScaleVectorWithSat()
- * WebRtcSpl_ScaleAndAddVectors()
- *
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "signal_processing_library.h"
-
-void WebRtcSpl_VectorBitShiftW16(WebRtc_Word16 *res,
-                             WebRtc_Word16 length,
-                             G_CONST WebRtc_Word16 *in,
-                             WebRtc_Word16 right_shifts)
-{
-    int i;
-
-    if (right_shifts > 0)
-    {
-        for (i = length; i > 0; i--)
-        {
-            (*res++) = ((*in++) >> right_shifts);
-        }
-    } else
-    {
-        for (i = length; i > 0; i--)
-        {
-            (*res++) = ((*in++) << (-right_shifts));
-        }
-    }
-}
-
-void WebRtcSpl_VectorBitShiftW32(WebRtc_Word32 *out_vector,
-                             WebRtc_Word16 vector_length,
-                             G_CONST WebRtc_Word32 *in_vector,
-                             WebRtc_Word16 right_shifts)
-{
-    int i;
-
-    if (right_shifts > 0)
-    {
-        for (i = vector_length; i > 0; i--)
-        {
-            (*out_vector++) = ((*in_vector++) >> right_shifts);
-        }
-    } else
-    {
-        for (i = vector_length; i > 0; i--)
-        {
-            (*out_vector++) = ((*in_vector++) << (-right_shifts));
-        }
-    }
-}
-
-void WebRtcSpl_VectorBitShiftW32ToW16(WebRtc_Word16 *res,
-                                  WebRtc_Word16 length,
-                                  G_CONST WebRtc_Word32 *in,
-                                  WebRtc_Word16 right_shifts)
-{
-    int i;
-
-    if (right_shifts >= 0)
-    {
-        for (i = length; i > 0; i--)
-        {
-            (*res++) = (WebRtc_Word16)((*in++) >> right_shifts);
-        }
-    } else
-    {
-        WebRtc_Word16 left_shifts = -right_shifts;
-        for (i = length; i > 0; i--)
-        {
-            (*res++) = (WebRtc_Word16)((*in++) << left_shifts);
-        }
-    }
-}
-
-void WebRtcSpl_ScaleVector(G_CONST WebRtc_Word16 *in_vector, WebRtc_Word16 *out_vector,
-                           WebRtc_Word16 gain, WebRtc_Word16 in_vector_length,
-                           WebRtc_Word16 right_shifts)
-{
-    // Performs vector operation: out_vector = (gain*in_vector)>>right_shifts
-    int i;
-    G_CONST WebRtc_Word16 *inptr;
-    WebRtc_Word16 *outptr;
-
-    inptr = in_vector;
-    outptr = out_vector;
-
-    for (i = 0; i < in_vector_length; i++)
-    {
-        (*outptr++) = (WebRtc_Word16)WEBRTC_SPL_MUL_16_16_RSFT(*inptr++, gain, right_shifts);
-    }
-}
-
-void WebRtcSpl_ScaleVectorWithSat(G_CONST WebRtc_Word16 *in_vector, WebRtc_Word16 *out_vector,
-                                 WebRtc_Word16 gain, WebRtc_Word16 in_vector_length,
-                                 WebRtc_Word16 right_shifts)
-{
-    // Performs vector operation: out_vector = (gain*in_vector)>>right_shifts
-    int i;
-    WebRtc_Word32 tmpW32;
-    G_CONST WebRtc_Word16 *inptr;
-    WebRtc_Word16 *outptr;
-
-    inptr = in_vector;
-    outptr = out_vector;
-
-    for (i = 0; i < in_vector_length; i++)
-    {
-        tmpW32 = WEBRTC_SPL_MUL_16_16_RSFT(*inptr++, gain, right_shifts);
-        (*outptr++) = WebRtcSpl_SatW32ToW16(tmpW32);
-    }
-}
-
-void WebRtcSpl_ScaleAndAddVectors(G_CONST WebRtc_Word16 *in1, WebRtc_Word16 gain1, int shift1,
-                                  G_CONST WebRtc_Word16 *in2, WebRtc_Word16 gain2, int shift2,
-                                  WebRtc_Word16 *out, int vector_length)
-{
-    // Performs vector operation: out = (gain1*in1)>>shift1 + (gain2*in2)>>shift2
-    int i;
-    G_CONST WebRtc_Word16 *in1ptr;
-    G_CONST WebRtc_Word16 *in2ptr;
-    WebRtc_Word16 *outptr;
-
-    in1ptr = in1;
-    in2ptr = in2;
-    outptr = out;
-
-    for (i = 0; i < vector_length; i++)
-    {
-        (*outptr++) = (WebRtc_Word16)WEBRTC_SPL_MUL_16_16_RSFT(gain1, *in1ptr++, shift1)
-                + (WebRtc_Word16)WEBRTC_SPL_MUL_16_16_RSFT(gain2, *in2ptr++, shift2);
-    }
-}
diff --git a/src/mod/codecs/mod_isac/webrtc_fft_t_1024_8.c b/src/mod/codecs/mod_isac/webrtc_fft_t_1024_8.c
deleted file mode 100644
index b587380523..0000000000
--- a/src/mod/codecs/mod_isac/webrtc_fft_t_1024_8.c
+++ /dev/null
@@ -1,704 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the Q14 radix-8 tables used in ARM9e optimizations.
- *
- */
-
-extern const int s_Q14S_8;
-const int s_Q14S_8 = 1024;
-extern const unsigned short t_Q14S_8[2032];
-const unsigned short t_Q14S_8[2032] = {
-  0x4000,0x0000 ,0x4000,0x0000 ,0x4000,0x0000 ,
-  0x22a3,0x187e ,0x3249,0x0c7c ,0x11a8,0x238e ,
-  0x0000,0x2d41 ,0x22a3,0x187e ,0xdd5d,0x3b21 ,
-  0xdd5d,0x3b21 ,0x11a8,0x238e ,0xb4be,0x3ec5 ,
-  0xc000,0x4000 ,0x0000,0x2d41 ,0xa57e,0x2d41 ,
-  0xac61,0x3b21 ,0xee58,0x3537 ,0xb4be,0x0c7c ,
-  0xa57e,0x2d41 ,0xdd5d,0x3b21 ,0xdd5d,0xe782 ,
-  0xac61,0x187e ,0xcdb7,0x3ec5 ,0x11a8,0xcac9 ,
-  0x4000,0x0000 ,0x4000,0x0000 ,0x4000,0x0000 ,
-  0x396b,0x0646 ,0x3cc8,0x0324 ,0x35eb,0x0964 ,
-  0x3249,0x0c7c ,0x396b,0x0646 ,0x2aaa,0x1294 ,
-  0x2aaa,0x1294 ,0x35eb,0x0964 ,0x1e7e,0x1b5d ,
-  0x22a3,0x187e ,0x3249,0x0c7c ,0x11a8,0x238e ,
-  0x1a46,0x1e2b ,0x2e88,0x0f8d ,0x0471,0x2afb ,
-  0x11a8,0x238e ,0x2aaa,0x1294 ,0xf721,0x3179 ,
-  0x08df,0x289a ,0x26b3,0x1590 ,0xea02,0x36e5 ,
-  0x0000,0x2d41 ,0x22a3,0x187e ,0xdd5d,0x3b21 ,
-  0xf721,0x3179 ,0x1e7e,0x1b5d ,0xd178,0x3e15 ,
-  0xee58,0x3537 ,0x1a46,0x1e2b ,0xc695,0x3fb1 ,
-  0xe5ba,0x3871 ,0x15fe,0x20e7 ,0xbcf0,0x3fec ,
-  0xdd5d,0x3b21 ,0x11a8,0x238e ,0xb4be,0x3ec5 ,
-  0xd556,0x3d3f ,0x0d48,0x2620 ,0xae2e,0x3c42 ,
-  0xcdb7,0x3ec5 ,0x08df,0x289a ,0xa963,0x3871 ,
-  0xc695,0x3fb1 ,0x0471,0x2afb ,0xa678,0x3368 ,
-  0xc000,0x4000 ,0x0000,0x2d41 ,0xa57e,0x2d41 ,
-  0xba09,0x3fb1 ,0xfb8f,0x2f6c ,0xa678,0x2620 ,
-  0xb4be,0x3ec5 ,0xf721,0x3179 ,0xa963,0x1e2b ,
-  0xb02d,0x3d3f ,0xf2b8,0x3368 ,0xae2e,0x1590 ,
-  0xac61,0x3b21 ,0xee58,0x3537 ,0xb4be,0x0c7c ,
-  0xa963,0x3871 ,0xea02,0x36e5 ,0xbcf0,0x0324 ,
-  0xa73b,0x3537 ,0xe5ba,0x3871 ,0xc695,0xf9ba ,
-  0xa5ed,0x3179 ,0xe182,0x39db ,0xd178,0xf073 ,
-  0xa57e,0x2d41 ,0xdd5d,0x3b21 ,0xdd5d,0xe782 ,
-  0xa5ed,0x289a ,0xd94d,0x3c42 ,0xea02,0xdf19 ,
-  0xa73b,0x238e ,0xd556,0x3d3f ,0xf721,0xd766 ,
-  0xa963,0x1e2b ,0xd178,0x3e15 ,0x0471,0xd094 ,
-  0xac61,0x187e ,0xcdb7,0x3ec5 ,0x11a8,0xcac9 ,
-  0xb02d,0x1294 ,0xca15,0x3f4f ,0x1e7e,0xc625 ,
-  0xb4be,0x0c7c ,0xc695,0x3fb1 ,0x2aaa,0xc2c1 ,
-  0xba09,0x0646 ,0xc338,0x3fec ,0x35eb,0xc0b1 ,
-  0x4000,0x0000 ,0x4000,0x0000 ,0x4000,0x0000 ,
-  0x3e69,0x0192 ,0x3f36,0x00c9 ,0x3d9a,0x025b ,
-  0x3cc8,0x0324 ,0x3e69,0x0192 ,0x3b1e,0x04b5 ,
-  0x3b1e,0x04b5 ,0x3d9a,0x025b ,0x388e,0x070e ,
-  0x396b,0x0646 ,0x3cc8,0x0324 ,0x35eb,0x0964 ,
-  0x37af,0x07d6 ,0x3bf4,0x03ed ,0x3334,0x0bb7 ,
-  0x35eb,0x0964 ,0x3b1e,0x04b5 ,0x306c,0x0e06 ,
-  0x341e,0x0af1 ,0x3a46,0x057e ,0x2d93,0x1050 ,
-  0x3249,0x0c7c ,0x396b,0x0646 ,0x2aaa,0x1294 ,
-  0x306c,0x0e06 ,0x388e,0x070e ,0x27b3,0x14d2 ,
-  0x2e88,0x0f8d ,0x37af,0x07d6 ,0x24ae,0x1709 ,
-  0x2c9d,0x1112 ,0x36ce,0x089d ,0x219c,0x1937 ,
-  0x2aaa,0x1294 ,0x35eb,0x0964 ,0x1e7e,0x1b5d ,
-  0x28b2,0x1413 ,0x3505,0x0a2b ,0x1b56,0x1d79 ,
-  0x26b3,0x1590 ,0x341e,0x0af1 ,0x1824,0x1f8c ,
-  0x24ae,0x1709 ,0x3334,0x0bb7 ,0x14ea,0x2193 ,
-  0x22a3,0x187e ,0x3249,0x0c7c ,0x11a8,0x238e ,
-  0x2093,0x19ef ,0x315b,0x0d41 ,0x0e61,0x257e ,
-  0x1e7e,0x1b5d ,0x306c,0x0e06 ,0x0b14,0x2760 ,
-  0x1c64,0x1cc6 ,0x2f7b,0x0eca ,0x07c4,0x2935 ,
-  0x1a46,0x1e2b ,0x2e88,0x0f8d ,0x0471,0x2afb ,
-  0x1824,0x1f8c ,0x2d93,0x1050 ,0x011c,0x2cb2 ,
-  0x15fe,0x20e7 ,0x2c9d,0x1112 ,0xfdc7,0x2e5a ,
-  0x13d5,0x223d ,0x2ba4,0x11d3 ,0xfa73,0x2ff2 ,
-  0x11a8,0x238e ,0x2aaa,0x1294 ,0xf721,0x3179 ,
-  0x0f79,0x24da ,0x29af,0x1354 ,0xf3d2,0x32ef ,
-  0x0d48,0x2620 ,0x28b2,0x1413 ,0xf087,0x3453 ,
-  0x0b14,0x2760 ,0x27b3,0x14d2 ,0xed41,0x35a5 ,
-  0x08df,0x289a ,0x26b3,0x1590 ,0xea02,0x36e5 ,
-  0x06a9,0x29ce ,0x25b1,0x164c ,0xe6cb,0x3812 ,
-  0x0471,0x2afb ,0x24ae,0x1709 ,0xe39c,0x392b ,
-  0x0239,0x2c21 ,0x23a9,0x17c4 ,0xe077,0x3a30 ,
-  0x0000,0x2d41 ,0x22a3,0x187e ,0xdd5d,0x3b21 ,
-  0xfdc7,0x2e5a ,0x219c,0x1937 ,0xda4f,0x3bfd ,
-  0xfb8f,0x2f6c ,0x2093,0x19ef ,0xd74e,0x3cc5 ,
-  0xf957,0x3076 ,0x1f89,0x1aa7 ,0xd45c,0x3d78 ,
-  0xf721,0x3179 ,0x1e7e,0x1b5d ,0xd178,0x3e15 ,
-  0xf4ec,0x3274 ,0x1d72,0x1c12 ,0xcea5,0x3e9d ,
-  0xf2b8,0x3368 ,0x1c64,0x1cc6 ,0xcbe2,0x3f0f ,
-  0xf087,0x3453 ,0x1b56,0x1d79 ,0xc932,0x3f6b ,
-  0xee58,0x3537 ,0x1a46,0x1e2b ,0xc695,0x3fb1 ,
-  0xec2b,0x3612 ,0x1935,0x1edc ,0xc40c,0x3fe1 ,
-  0xea02,0x36e5 ,0x1824,0x1f8c ,0xc197,0x3ffb ,
-  0xe7dc,0x37b0 ,0x1711,0x203a ,0xbf38,0x3fff ,
-  0xe5ba,0x3871 ,0x15fe,0x20e7 ,0xbcf0,0x3fec ,
-  0xe39c,0x392b ,0x14ea,0x2193 ,0xbabf,0x3fc4 ,
-  0xe182,0x39db ,0x13d5,0x223d ,0xb8a6,0x3f85 ,
-  0xdf6d,0x3a82 ,0x12bf,0x22e7 ,0xb6a5,0x3f30 ,
-  0xdd5d,0x3b21 ,0x11a8,0x238e ,0xb4be,0x3ec5 ,
-  0xdb52,0x3bb6 ,0x1091,0x2435 ,0xb2f2,0x3e45 ,
-  0xd94d,0x3c42 ,0x0f79,0x24da ,0xb140,0x3daf ,
-  0xd74e,0x3cc5 ,0x0e61,0x257e ,0xafa9,0x3d03 ,
-  0xd556,0x3d3f ,0x0d48,0x2620 ,0xae2e,0x3c42 ,
-  0xd363,0x3daf ,0x0c2e,0x26c1 ,0xacd0,0x3b6d ,
-  0xd178,0x3e15 ,0x0b14,0x2760 ,0xab8e,0x3a82 ,
-  0xcf94,0x3e72 ,0x09fa,0x27fe ,0xaa6a,0x3984 ,
-  0xcdb7,0x3ec5 ,0x08df,0x289a ,0xa963,0x3871 ,
-  0xcbe2,0x3f0f ,0x07c4,0x2935 ,0xa87b,0x374b ,
-  0xca15,0x3f4f ,0x06a9,0x29ce ,0xa7b1,0x3612 ,
-  0xc851,0x3f85 ,0x058d,0x2a65 ,0xa705,0x34c6 ,
-  0xc695,0x3fb1 ,0x0471,0x2afb ,0xa678,0x3368 ,
-  0xc4e2,0x3fd4 ,0x0355,0x2b8f ,0xa60b,0x31f8 ,
-  0xc338,0x3fec ,0x0239,0x2c21 ,0xa5bc,0x3076 ,
-  0xc197,0x3ffb ,0x011c,0x2cb2 ,0xa58d,0x2ee4 ,
-  0xc000,0x4000 ,0x0000,0x2d41 ,0xa57e,0x2d41 ,
-  0xbe73,0x3ffb ,0xfee4,0x2dcf ,0xa58d,0x2b8f ,
-  0xbcf0,0x3fec ,0xfdc7,0x2e5a ,0xa5bc,0x29ce ,
-  0xbb77,0x3fd4 ,0xfcab,0x2ee4 ,0xa60b,0x27fe ,
-  0xba09,0x3fb1 ,0xfb8f,0x2f6c ,0xa678,0x2620 ,
-  0xb8a6,0x3f85 ,0xfa73,0x2ff2 ,0xa705,0x2435 ,
-  0xb74d,0x3f4f ,0xf957,0x3076 ,0xa7b1,0x223d ,
-  0xb600,0x3f0f ,0xf83c,0x30f9 ,0xa87b,0x203a ,
-  0xb4be,0x3ec5 ,0xf721,0x3179 ,0xa963,0x1e2b ,
-  0xb388,0x3e72 ,0xf606,0x31f8 ,0xaa6a,0x1c12 ,
-  0xb25e,0x3e15 ,0xf4ec,0x3274 ,0xab8e,0x19ef ,
-  0xb140,0x3daf ,0xf3d2,0x32ef ,0xacd0,0x17c4 ,
-  0xb02d,0x3d3f ,0xf2b8,0x3368 ,0xae2e,0x1590 ,
-  0xaf28,0x3cc5 ,0xf19f,0x33df ,0xafa9,0x1354 ,
-  0xae2e,0x3c42 ,0xf087,0x3453 ,0xb140,0x1112 ,
-  0xad41,0x3bb6 ,0xef6f,0x34c6 ,0xb2f2,0x0eca ,
-  0xac61,0x3b21 ,0xee58,0x3537 ,0xb4be,0x0c7c ,
-  0xab8e,0x3a82 ,0xed41,0x35a5 ,0xb6a5,0x0a2b ,
-  0xaac8,0x39db ,0xec2b,0x3612 ,0xb8a6,0x07d6 ,
-  0xaa0f,0x392b ,0xeb16,0x367d ,0xbabf,0x057e ,
-  0xa963,0x3871 ,0xea02,0x36e5 ,0xbcf0,0x0324 ,
-  0xa8c5,0x37b0 ,0xe8ef,0x374b ,0xbf38,0x00c9 ,
-  0xa834,0x36e5 ,0xe7dc,0x37b0 ,0xc197,0xfe6e ,
-  0xa7b1,0x3612 ,0xe6cb,0x3812 ,0xc40c,0xfc13 ,
-  0xa73b,0x3537 ,0xe5ba,0x3871 ,0xc695,0xf9ba ,
-  0xa6d3,0x3453 ,0xe4aa,0x38cf ,0xc932,0xf763 ,
-  0xa678,0x3368 ,0xe39c,0x392b ,0xcbe2,0xf50f ,
-  0xa62c,0x3274 ,0xe28e,0x3984 ,0xcea5,0xf2bf ,
-  0xa5ed,0x3179 ,0xe182,0x39db ,0xd178,0xf073 ,
-  0xa5bc,0x3076 ,0xe077,0x3a30 ,0xd45c,0xee2d ,
-  0xa599,0x2f6c ,0xdf6d,0x3a82 ,0xd74e,0xebed ,
-  0xa585,0x2e5a ,0xde64,0x3ad3 ,0xda4f,0xe9b4 ,
-  0xa57e,0x2d41 ,0xdd5d,0x3b21 ,0xdd5d,0xe782 ,
-  0xa585,0x2c21 ,0xdc57,0x3b6d ,0xe077,0xe559 ,
-  0xa599,0x2afb ,0xdb52,0x3bb6 ,0xe39c,0xe33a ,
-  0xa5bc,0x29ce ,0xda4f,0x3bfd ,0xe6cb,0xe124 ,
-  0xa5ed,0x289a ,0xd94d,0x3c42 ,0xea02,0xdf19 ,
-  0xa62c,0x2760 ,0xd84d,0x3c85 ,0xed41,0xdd19 ,
-  0xa678,0x2620 ,0xd74e,0x3cc5 ,0xf087,0xdb26 ,
-  0xa6d3,0x24da ,0xd651,0x3d03 ,0xf3d2,0xd93f ,
-  0xa73b,0x238e ,0xd556,0x3d3f ,0xf721,0xd766 ,
-  0xa7b1,0x223d ,0xd45c,0x3d78 ,0xfa73,0xd59b ,
-  0xa834,0x20e7 ,0xd363,0x3daf ,0xfdc7,0xd3df ,
-  0xa8c5,0x1f8c ,0xd26d,0x3de3 ,0x011c,0xd231 ,
-  0xa963,0x1e2b ,0xd178,0x3e15 ,0x0471,0xd094 ,
-  0xaa0f,0x1cc6 ,0xd085,0x3e45 ,0x07c4,0xcf07 ,
-  0xaac8,0x1b5d ,0xcf94,0x3e72 ,0x0b14,0xcd8c ,
-  0xab8e,0x19ef ,0xcea5,0x3e9d ,0x0e61,0xcc21 ,
-  0xac61,0x187e ,0xcdb7,0x3ec5 ,0x11a8,0xcac9 ,
-  0xad41,0x1709 ,0xcccc,0x3eeb ,0x14ea,0xc983 ,
-  0xae2e,0x1590 ,0xcbe2,0x3f0f ,0x1824,0xc850 ,
-  0xaf28,0x1413 ,0xcafb,0x3f30 ,0x1b56,0xc731 ,
-  0xb02d,0x1294 ,0xca15,0x3f4f ,0x1e7e,0xc625 ,
-  0xb140,0x1112 ,0xc932,0x3f6b ,0x219c,0xc52d ,
-  0xb25e,0x0f8d ,0xc851,0x3f85 ,0x24ae,0xc44a ,
-  0xb388,0x0e06 ,0xc772,0x3f9c ,0x27b3,0xc37b ,
-  0xb4be,0x0c7c ,0xc695,0x3fb1 ,0x2aaa,0xc2c1 ,
-  0xb600,0x0af1 ,0xc5ba,0x3fc4 ,0x2d93,0xc21d ,
-  0xb74d,0x0964 ,0xc4e2,0x3fd4 ,0x306c,0xc18e ,
-  0xb8a6,0x07d6 ,0xc40c,0x3fe1 ,0x3334,0xc115 ,
-  0xba09,0x0646 ,0xc338,0x3fec ,0x35eb,0xc0b1 ,
-  0xbb77,0x04b5 ,0xc266,0x3ff5 ,0x388e,0xc064 ,
-  0xbcf0,0x0324 ,0xc197,0x3ffb ,0x3b1e,0xc02c ,
-  0xbe73,0x0192 ,0xc0ca,0x3fff ,0x3d9a,0xc00b ,
-  0x4000,0x0000 ,0x3f9b,0x0065 ,0x3f36,0x00c9 ,
-  0x3ed0,0x012e ,0x3e69,0x0192 ,0x3e02,0x01f7 ,
-  0x3d9a,0x025b ,0x3d31,0x02c0 ,0x3cc8,0x0324 ,
-  0x3c5f,0x0388 ,0x3bf4,0x03ed ,0x3b8a,0x0451 ,
-  0x3b1e,0x04b5 ,0x3ab2,0x051a ,0x3a46,0x057e ,
-  0x39d9,0x05e2 ,0x396b,0x0646 ,0x38fd,0x06aa ,
-  0x388e,0x070e ,0x381f,0x0772 ,0x37af,0x07d6 ,
-  0x373f,0x0839 ,0x36ce,0x089d ,0x365d,0x0901 ,
-  0x35eb,0x0964 ,0x3578,0x09c7 ,0x3505,0x0a2b ,
-  0x3492,0x0a8e ,0x341e,0x0af1 ,0x33a9,0x0b54 ,
-  0x3334,0x0bb7 ,0x32bf,0x0c1a ,0x3249,0x0c7c ,
-  0x31d2,0x0cdf ,0x315b,0x0d41 ,0x30e4,0x0da4 ,
-  0x306c,0x0e06 ,0x2ff4,0x0e68 ,0x2f7b,0x0eca ,
-  0x2f02,0x0f2b ,0x2e88,0x0f8d ,0x2e0e,0x0fee ,
-  0x2d93,0x1050 ,0x2d18,0x10b1 ,0x2c9d,0x1112 ,
-  0x2c21,0x1173 ,0x2ba4,0x11d3 ,0x2b28,0x1234 ,
-  0x2aaa,0x1294 ,0x2a2d,0x12f4 ,0x29af,0x1354 ,
-  0x2931,0x13b4 ,0x28b2,0x1413 ,0x2833,0x1473 ,
-  0x27b3,0x14d2 ,0x2733,0x1531 ,0x26b3,0x1590 ,
-  0x2632,0x15ee ,0x25b1,0x164c ,0x252f,0x16ab ,
-  0x24ae,0x1709 ,0x242b,0x1766 ,0x23a9,0x17c4 ,
-  0x2326,0x1821 ,0x22a3,0x187e ,0x221f,0x18db ,
-  0x219c,0x1937 ,0x2117,0x1993 ,0x2093,0x19ef ,
-  0x200e,0x1a4b ,0x1f89,0x1aa7 ,0x1f04,0x1b02 ,
-  0x1e7e,0x1b5d ,0x1df8,0x1bb8 ,0x1d72,0x1c12 ,
-  0x1ceb,0x1c6c ,0x1c64,0x1cc6 ,0x1bdd,0x1d20 ,
-  0x1b56,0x1d79 ,0x1ace,0x1dd3 ,0x1a46,0x1e2b ,
-  0x19be,0x1e84 ,0x1935,0x1edc ,0x18ad,0x1f34 ,
-  0x1824,0x1f8c ,0x179b,0x1fe3 ,0x1711,0x203a ,
-  0x1688,0x2091 ,0x15fe,0x20e7 ,0x1574,0x213d ,
-  0x14ea,0x2193 ,0x145f,0x21e8 ,0x13d5,0x223d ,
-  0x134a,0x2292 ,0x12bf,0x22e7 ,0x1234,0x233b ,
-  0x11a8,0x238e ,0x111d,0x23e2 ,0x1091,0x2435 ,
-  0x1005,0x2488 ,0x0f79,0x24da ,0x0eed,0x252c ,
-  0x0e61,0x257e ,0x0dd4,0x25cf ,0x0d48,0x2620 ,
-  0x0cbb,0x2671 ,0x0c2e,0x26c1 ,0x0ba1,0x2711 ,
-  0x0b14,0x2760 ,0x0a87,0x27af ,0x09fa,0x27fe ,
-  0x096d,0x284c ,0x08df,0x289a ,0x0852,0x28e7 ,
-  0x07c4,0x2935 ,0x0736,0x2981 ,0x06a9,0x29ce ,
-  0x061b,0x2a1a ,0x058d,0x2a65 ,0x04ff,0x2ab0 ,
-  0x0471,0x2afb ,0x03e3,0x2b45 ,0x0355,0x2b8f ,
-  0x02c7,0x2bd8 ,0x0239,0x2c21 ,0x01aa,0x2c6a ,
-  0x011c,0x2cb2 ,0x008e,0x2cfa ,0x0000,0x2d41 ,
-  0xff72,0x2d88 ,0xfee4,0x2dcf ,0xfe56,0x2e15 ,
-  0xfdc7,0x2e5a ,0xfd39,0x2e9f ,0xfcab,0x2ee4 ,
-  0xfc1d,0x2f28 ,0xfb8f,0x2f6c ,0xfb01,0x2faf ,
-  0xfa73,0x2ff2 ,0xf9e5,0x3034 ,0xf957,0x3076 ,
-  0xf8ca,0x30b8 ,0xf83c,0x30f9 ,0xf7ae,0x3139 ,
-  0xf721,0x3179 ,0xf693,0x31b9 ,0xf606,0x31f8 ,
-  0xf579,0x3236 ,0xf4ec,0x3274 ,0xf45f,0x32b2 ,
-  0xf3d2,0x32ef ,0xf345,0x332c ,0xf2b8,0x3368 ,
-  0xf22c,0x33a3 ,0xf19f,0x33df ,0xf113,0x3419 ,
-  0xf087,0x3453 ,0xeffb,0x348d ,0xef6f,0x34c6 ,
-  0xeee3,0x34ff ,0xee58,0x3537 ,0xedcc,0x356e ,
-  0xed41,0x35a5 ,0xecb6,0x35dc ,0xec2b,0x3612 ,
-  0xeba1,0x3648 ,0xeb16,0x367d ,0xea8c,0x36b1 ,
-  0xea02,0x36e5 ,0xe978,0x3718 ,0xe8ef,0x374b ,
-  0xe865,0x377e ,0xe7dc,0x37b0 ,0xe753,0x37e1 ,
-  0xe6cb,0x3812 ,0xe642,0x3842 ,0xe5ba,0x3871 ,
-  0xe532,0x38a1 ,0xe4aa,0x38cf ,0xe423,0x38fd ,
-  0xe39c,0x392b ,0xe315,0x3958 ,0xe28e,0x3984 ,
-  0xe208,0x39b0 ,0xe182,0x39db ,0xe0fc,0x3a06 ,
-  0xe077,0x3a30 ,0xdff2,0x3a59 ,0xdf6d,0x3a82 ,
-  0xdee9,0x3aab ,0xde64,0x3ad3 ,0xdde1,0x3afa ,
-  0xdd5d,0x3b21 ,0xdcda,0x3b47 ,0xdc57,0x3b6d ,
-  0xdbd5,0x3b92 ,0xdb52,0x3bb6 ,0xdad1,0x3bda ,
-  0xda4f,0x3bfd ,0xd9ce,0x3c20 ,0xd94d,0x3c42 ,
-  0xd8cd,0x3c64 ,0xd84d,0x3c85 ,0xd7cd,0x3ca5 ,
-  0xd74e,0x3cc5 ,0xd6cf,0x3ce4 ,0xd651,0x3d03 ,
-  0xd5d3,0x3d21 ,0xd556,0x3d3f ,0xd4d8,0x3d5b ,
-  0xd45c,0x3d78 ,0xd3df,0x3d93 ,0xd363,0x3daf ,
-  0xd2e8,0x3dc9 ,0xd26d,0x3de3 ,0xd1f2,0x3dfc ,
-  0xd178,0x3e15 ,0xd0fe,0x3e2d ,0xd085,0x3e45 ,
-  0xd00c,0x3e5c ,0xcf94,0x3e72 ,0xcf1c,0x3e88 ,
-  0xcea5,0x3e9d ,0xce2e,0x3eb1 ,0xcdb7,0x3ec5 ,
-  0xcd41,0x3ed8 ,0xcccc,0x3eeb ,0xcc57,0x3efd ,
-  0xcbe2,0x3f0f ,0xcb6e,0x3f20 ,0xcafb,0x3f30 ,
-  0xca88,0x3f40 ,0xca15,0x3f4f ,0xc9a3,0x3f5d ,
-  0xc932,0x3f6b ,0xc8c1,0x3f78 ,0xc851,0x3f85 ,
-  0xc7e1,0x3f91 ,0xc772,0x3f9c ,0xc703,0x3fa7 ,
-  0xc695,0x3fb1 ,0xc627,0x3fbb ,0xc5ba,0x3fc4 ,
-  0xc54e,0x3fcc ,0xc4e2,0x3fd4 ,0xc476,0x3fdb ,
-  0xc40c,0x3fe1 ,0xc3a1,0x3fe7 ,0xc338,0x3fec ,
-  0xc2cf,0x3ff1 ,0xc266,0x3ff5 ,0xc1fe,0x3ff8 ,
-  0xc197,0x3ffb ,0xc130,0x3ffd ,0xc0ca,0x3fff ,
-  0xc065,0x4000 ,0xc000,0x4000 ,0xbf9c,0x4000 ,
-  0xbf38,0x3fff ,0xbed5,0x3ffd ,0xbe73,0x3ffb ,
-  0xbe11,0x3ff8 ,0xbdb0,0x3ff5 ,0xbd50,0x3ff1 ,
-  0xbcf0,0x3fec ,0xbc91,0x3fe7 ,0xbc32,0x3fe1 ,
-  0xbbd4,0x3fdb ,0xbb77,0x3fd4 ,0xbb1b,0x3fcc ,
-  0xbabf,0x3fc4 ,0xba64,0x3fbb ,0xba09,0x3fb1 ,
-  0xb9af,0x3fa7 ,0xb956,0x3f9c ,0xb8fd,0x3f91 ,
-  0xb8a6,0x3f85 ,0xb84f,0x3f78 ,0xb7f8,0x3f6b ,
-  0xb7a2,0x3f5d ,0xb74d,0x3f4f ,0xb6f9,0x3f40 ,
-  0xb6a5,0x3f30 ,0xb652,0x3f20 ,0xb600,0x3f0f ,
-  0xb5af,0x3efd ,0xb55e,0x3eeb ,0xb50e,0x3ed8 ,
-  0xb4be,0x3ec5 ,0xb470,0x3eb1 ,0xb422,0x3e9d ,
-  0xb3d5,0x3e88 ,0xb388,0x3e72 ,0xb33d,0x3e5c ,
-  0xb2f2,0x3e45 ,0xb2a7,0x3e2d ,0xb25e,0x3e15 ,
-  0xb215,0x3dfc ,0xb1cd,0x3de3 ,0xb186,0x3dc9 ,
-  0xb140,0x3daf ,0xb0fa,0x3d93 ,0xb0b5,0x3d78 ,
-  0xb071,0x3d5b ,0xb02d,0x3d3f ,0xafeb,0x3d21 ,
-  0xafa9,0x3d03 ,0xaf68,0x3ce4 ,0xaf28,0x3cc5 ,
-  0xaee8,0x3ca5 ,0xaea9,0x3c85 ,0xae6b,0x3c64 ,
-  0xae2e,0x3c42 ,0xadf2,0x3c20 ,0xadb6,0x3bfd ,
-  0xad7b,0x3bda ,0xad41,0x3bb6 ,0xad08,0x3b92 ,
-  0xacd0,0x3b6d ,0xac98,0x3b47 ,0xac61,0x3b21 ,
-  0xac2b,0x3afa ,0xabf6,0x3ad3 ,0xabc2,0x3aab ,
-  0xab8e,0x3a82 ,0xab5b,0x3a59 ,0xab29,0x3a30 ,
-  0xaaf8,0x3a06 ,0xaac8,0x39db ,0xaa98,0x39b0 ,
-  0xaa6a,0x3984 ,0xaa3c,0x3958 ,0xaa0f,0x392b ,
-  0xa9e3,0x38fd ,0xa9b7,0x38cf ,0xa98d,0x38a1 ,
-  0xa963,0x3871 ,0xa93a,0x3842 ,0xa912,0x3812 ,
-  0xa8eb,0x37e1 ,0xa8c5,0x37b0 ,0xa89f,0x377e ,
-  0xa87b,0x374b ,0xa857,0x3718 ,0xa834,0x36e5 ,
-  0xa812,0x36b1 ,0xa7f1,0x367d ,0xa7d0,0x3648 ,
-  0xa7b1,0x3612 ,0xa792,0x35dc ,0xa774,0x35a5 ,
-  0xa757,0x356e ,0xa73b,0x3537 ,0xa71f,0x34ff ,
-  0xa705,0x34c6 ,0xa6eb,0x348d ,0xa6d3,0x3453 ,
-  0xa6bb,0x3419 ,0xa6a4,0x33df ,0xa68e,0x33a3 ,
-  0xa678,0x3368 ,0xa664,0x332c ,0xa650,0x32ef ,
-  0xa63e,0x32b2 ,0xa62c,0x3274 ,0xa61b,0x3236 ,
-  0xa60b,0x31f8 ,0xa5fb,0x31b9 ,0xa5ed,0x3179 ,
-  0xa5e0,0x3139 ,0xa5d3,0x30f9 ,0xa5c7,0x30b8 ,
-  0xa5bc,0x3076 ,0xa5b2,0x3034 ,0xa5a9,0x2ff2 ,
-  0xa5a1,0x2faf ,0xa599,0x2f6c ,0xa593,0x2f28 ,
-  0xa58d,0x2ee4 ,0xa588,0x2e9f ,0xa585,0x2e5a ,
-  0xa581,0x2e15 ,0xa57f,0x2dcf ,0xa57e,0x2d88 ,
-  0xa57e,0x2d41 ,0xa57e,0x2cfa ,0xa57f,0x2cb2 ,
-  0xa581,0x2c6a ,0xa585,0x2c21 ,0xa588,0x2bd8 ,
-  0xa58d,0x2b8f ,0xa593,0x2b45 ,0xa599,0x2afb ,
-  0xa5a1,0x2ab0 ,0xa5a9,0x2a65 ,0xa5b2,0x2a1a ,
-  0xa5bc,0x29ce ,0xa5c7,0x2981 ,0xa5d3,0x2935 ,
-  0xa5e0,0x28e7 ,0xa5ed,0x289a ,0xa5fb,0x284c ,
-  0xa60b,0x27fe ,0xa61b,0x27af ,0xa62c,0x2760 ,
-  0xa63e,0x2711 ,0xa650,0x26c1 ,0xa664,0x2671 ,
-  0xa678,0x2620 ,0xa68e,0x25cf ,0xa6a4,0x257e ,
-  0xa6bb,0x252c ,0xa6d3,0x24da ,0xa6eb,0x2488 ,
-  0xa705,0x2435 ,0xa71f,0x23e2 ,0xa73b,0x238e ,
-  0xa757,0x233b ,0xa774,0x22e7 ,0xa792,0x2292 ,
-  0xa7b1,0x223d ,0xa7d0,0x21e8 ,0xa7f1,0x2193 ,
-  0xa812,0x213d ,0xa834,0x20e7 ,0xa857,0x2091 ,
-  0xa87b,0x203a ,0xa89f,0x1fe3 ,0xa8c5,0x1f8c ,
-  0xa8eb,0x1f34 ,0xa912,0x1edc ,0xa93a,0x1e84 ,
-  0xa963,0x1e2b ,0xa98d,0x1dd3 ,0xa9b7,0x1d79 ,
-  0xa9e3,0x1d20 ,0xaa0f,0x1cc6 ,0xaa3c,0x1c6c ,
-  0xaa6a,0x1c12 ,0xaa98,0x1bb8 ,0xaac8,0x1b5d ,
-  0xaaf8,0x1b02 ,0xab29,0x1aa7 ,0xab5b,0x1a4b ,
-  0xab8e,0x19ef ,0xabc2,0x1993 ,0xabf6,0x1937 ,
-  0xac2b,0x18db ,0xac61,0x187e ,0xac98,0x1821 ,
-  0xacd0,0x17c4 ,0xad08,0x1766 ,0xad41,0x1709 ,
-  0xad7b,0x16ab ,0xadb6,0x164c ,0xadf2,0x15ee ,
-  0xae2e,0x1590 ,0xae6b,0x1531 ,0xaea9,0x14d2 ,
-  0xaee8,0x1473 ,0xaf28,0x1413 ,0xaf68,0x13b4 ,
-  0xafa9,0x1354 ,0xafeb,0x12f4 ,0xb02d,0x1294 ,
-  0xb071,0x1234 ,0xb0b5,0x11d3 ,0xb0fa,0x1173 ,
-  0xb140,0x1112 ,0xb186,0x10b1 ,0xb1cd,0x1050 ,
-  0xb215,0x0fee ,0xb25e,0x0f8d ,0xb2a7,0x0f2b ,
-  0xb2f2,0x0eca ,0xb33d,0x0e68 ,0xb388,0x0e06 ,
-  0xb3d5,0x0da4 ,0xb422,0x0d41 ,0xb470,0x0cdf ,
-  0xb4be,0x0c7c ,0xb50e,0x0c1a ,0xb55e,0x0bb7 ,
-  0xb5af,0x0b54 ,0xb600,0x0af1 ,0xb652,0x0a8e ,
-  0xb6a5,0x0a2b ,0xb6f9,0x09c7 ,0xb74d,0x0964 ,
-  0xb7a2,0x0901 ,0xb7f8,0x089d ,0xb84f,0x0839 ,
-  0xb8a6,0x07d6 ,0xb8fd,0x0772 ,0xb956,0x070e ,
-  0xb9af,0x06aa ,0xba09,0x0646 ,0xba64,0x05e2 ,
-  0xbabf,0x057e ,0xbb1b,0x051a ,0xbb77,0x04b5 ,
-  0xbbd4,0x0451 ,0xbc32,0x03ed ,0xbc91,0x0388 ,
-  0xbcf0,0x0324 ,0xbd50,0x02c0 ,0xbdb0,0x025b ,
-  0xbe11,0x01f7 ,0xbe73,0x0192 ,0xbed5,0x012e ,
-  0xbf38,0x00c9 ,0xbf9c,0x0065 };
-
-
-extern const int s_Q14R_8;
-const int s_Q14R_8 = 1024;
-extern const unsigned short t_Q14R_8[2032];
-const unsigned short t_Q14R_8[2032] = {
-  0x4000,0x0000 ,0x4000,0x0000 ,0x4000,0x0000 ,
-  0x3b21,0x187e ,0x3ec5,0x0c7c ,0x3537,0x238e ,
-  0x2d41,0x2d41 ,0x3b21,0x187e ,0x187e,0x3b21 ,
-  0x187e,0x3b21 ,0x3537,0x238e ,0xf384,0x3ec5 ,
-  0x0000,0x4000 ,0x2d41,0x2d41 ,0xd2bf,0x2d41 ,
-  0xe782,0x3b21 ,0x238e,0x3537 ,0xc13b,0x0c7c ,
-  0xd2bf,0x2d41 ,0x187e,0x3b21 ,0xc4df,0xe782 ,
-  0xc4df,0x187e ,0x0c7c,0x3ec5 ,0xdc72,0xcac9 ,
-  0x4000,0x0000 ,0x4000,0x0000 ,0x4000,0x0000 ,
-  0x3fb1,0x0646 ,0x3fec,0x0324 ,0x3f4f,0x0964 ,
-  0x3ec5,0x0c7c ,0x3fb1,0x0646 ,0x3d3f,0x1294 ,
-  0x3d3f,0x1294 ,0x3f4f,0x0964 ,0x39db,0x1b5d ,
-  0x3b21,0x187e ,0x3ec5,0x0c7c ,0x3537,0x238e ,
-  0x3871,0x1e2b ,0x3e15,0x0f8d ,0x2f6c,0x2afb ,
-  0x3537,0x238e ,0x3d3f,0x1294 ,0x289a,0x3179 ,
-  0x3179,0x289a ,0x3c42,0x1590 ,0x20e7,0x36e5 ,
-  0x2d41,0x2d41 ,0x3b21,0x187e ,0x187e,0x3b21 ,
-  0x289a,0x3179 ,0x39db,0x1b5d ,0x0f8d,0x3e15 ,
-  0x238e,0x3537 ,0x3871,0x1e2b ,0x0646,0x3fb1 ,
-  0x1e2b,0x3871 ,0x36e5,0x20e7 ,0xfcdc,0x3fec ,
-  0x187e,0x3b21 ,0x3537,0x238e ,0xf384,0x3ec5 ,
-  0x1294,0x3d3f ,0x3368,0x2620 ,0xea70,0x3c42 ,
-  0x0c7c,0x3ec5 ,0x3179,0x289a ,0xe1d5,0x3871 ,
-  0x0646,0x3fb1 ,0x2f6c,0x2afb ,0xd9e0,0x3368 ,
-  0x0000,0x4000 ,0x2d41,0x2d41 ,0xd2bf,0x2d41 ,
-  0xf9ba,0x3fb1 ,0x2afb,0x2f6c ,0xcc98,0x2620 ,
-  0xf384,0x3ec5 ,0x289a,0x3179 ,0xc78f,0x1e2b ,
-  0xed6c,0x3d3f ,0x2620,0x3368 ,0xc3be,0x1590 ,
-  0xe782,0x3b21 ,0x238e,0x3537 ,0xc13b,0x0c7c ,
-  0xe1d5,0x3871 ,0x20e7,0x36e5 ,0xc014,0x0324 ,
-  0xdc72,0x3537 ,0x1e2b,0x3871 ,0xc04f,0xf9ba ,
-  0xd766,0x3179 ,0x1b5d,0x39db ,0xc1eb,0xf073 ,
-  0xd2bf,0x2d41 ,0x187e,0x3b21 ,0xc4df,0xe782 ,
-  0xce87,0x289a ,0x1590,0x3c42 ,0xc91b,0xdf19 ,
-  0xcac9,0x238e ,0x1294,0x3d3f ,0xce87,0xd766 ,
-  0xc78f,0x1e2b ,0x0f8d,0x3e15 ,0xd505,0xd094 ,
-  0xc4df,0x187e ,0x0c7c,0x3ec5 ,0xdc72,0xcac9 ,
-  0xc2c1,0x1294 ,0x0964,0x3f4f ,0xe4a3,0xc625 ,
-  0xc13b,0x0c7c ,0x0646,0x3fb1 ,0xed6c,0xc2c1 ,
-  0xc04f,0x0646 ,0x0324,0x3fec ,0xf69c,0xc0b1 ,
-  0x4000,0x0000 ,0x4000,0x0000 ,0x4000,0x0000 ,
-  0x3ffb,0x0192 ,0x3fff,0x00c9 ,0x3ff5,0x025b ,
-  0x3fec,0x0324 ,0x3ffb,0x0192 ,0x3fd4,0x04b5 ,
-  0x3fd4,0x04b5 ,0x3ff5,0x025b ,0x3f9c,0x070e ,
-  0x3fb1,0x0646 ,0x3fec,0x0324 ,0x3f4f,0x0964 ,
-  0x3f85,0x07d6 ,0x3fe1,0x03ed ,0x3eeb,0x0bb7 ,
-  0x3f4f,0x0964 ,0x3fd4,0x04b5 ,0x3e72,0x0e06 ,
-  0x3f0f,0x0af1 ,0x3fc4,0x057e ,0x3de3,0x1050 ,
-  0x3ec5,0x0c7c ,0x3fb1,0x0646 ,0x3d3f,0x1294 ,
-  0x3e72,0x0e06 ,0x3f9c,0x070e ,0x3c85,0x14d2 ,
-  0x3e15,0x0f8d ,0x3f85,0x07d6 ,0x3bb6,0x1709 ,
-  0x3daf,0x1112 ,0x3f6b,0x089d ,0x3ad3,0x1937 ,
-  0x3d3f,0x1294 ,0x3f4f,0x0964 ,0x39db,0x1b5d ,
-  0x3cc5,0x1413 ,0x3f30,0x0a2b ,0x38cf,0x1d79 ,
-  0x3c42,0x1590 ,0x3f0f,0x0af1 ,0x37b0,0x1f8c ,
-  0x3bb6,0x1709 ,0x3eeb,0x0bb7 ,0x367d,0x2193 ,
-  0x3b21,0x187e ,0x3ec5,0x0c7c ,0x3537,0x238e ,
-  0x3a82,0x19ef ,0x3e9d,0x0d41 ,0x33df,0x257e ,
-  0x39db,0x1b5d ,0x3e72,0x0e06 ,0x3274,0x2760 ,
-  0x392b,0x1cc6 ,0x3e45,0x0eca ,0x30f9,0x2935 ,
-  0x3871,0x1e2b ,0x3e15,0x0f8d ,0x2f6c,0x2afb ,
-  0x37b0,0x1f8c ,0x3de3,0x1050 ,0x2dcf,0x2cb2 ,
-  0x36e5,0x20e7 ,0x3daf,0x1112 ,0x2c21,0x2e5a ,
-  0x3612,0x223d ,0x3d78,0x11d3 ,0x2a65,0x2ff2 ,
-  0x3537,0x238e ,0x3d3f,0x1294 ,0x289a,0x3179 ,
-  0x3453,0x24da ,0x3d03,0x1354 ,0x26c1,0x32ef ,
-  0x3368,0x2620 ,0x3cc5,0x1413 ,0x24da,0x3453 ,
-  0x3274,0x2760 ,0x3c85,0x14d2 ,0x22e7,0x35a5 ,
-  0x3179,0x289a ,0x3c42,0x1590 ,0x20e7,0x36e5 ,
-  0x3076,0x29ce ,0x3bfd,0x164c ,0x1edc,0x3812 ,
-  0x2f6c,0x2afb ,0x3bb6,0x1709 ,0x1cc6,0x392b ,
-  0x2e5a,0x2c21 ,0x3b6d,0x17c4 ,0x1aa7,0x3a30 ,
-  0x2d41,0x2d41 ,0x3b21,0x187e ,0x187e,0x3b21 ,
-  0x2c21,0x2e5a ,0x3ad3,0x1937 ,0x164c,0x3bfd ,
-  0x2afb,0x2f6c ,0x3a82,0x19ef ,0x1413,0x3cc5 ,
-  0x29ce,0x3076 ,0x3a30,0x1aa7 ,0x11d3,0x3d78 ,
-  0x289a,0x3179 ,0x39db,0x1b5d ,0x0f8d,0x3e15 ,
-  0x2760,0x3274 ,0x3984,0x1c12 ,0x0d41,0x3e9d ,
-  0x2620,0x3368 ,0x392b,0x1cc6 ,0x0af1,0x3f0f ,
-  0x24da,0x3453 ,0x38cf,0x1d79 ,0x089d,0x3f6b ,
-  0x238e,0x3537 ,0x3871,0x1e2b ,0x0646,0x3fb1 ,
-  0x223d,0x3612 ,0x3812,0x1edc ,0x03ed,0x3fe1 ,
-  0x20e7,0x36e5 ,0x37b0,0x1f8c ,0x0192,0x3ffb ,
-  0x1f8c,0x37b0 ,0x374b,0x203a ,0xff37,0x3fff ,
-  0x1e2b,0x3871 ,0x36e5,0x20e7 ,0xfcdc,0x3fec ,
-  0x1cc6,0x392b ,0x367d,0x2193 ,0xfa82,0x3fc4 ,
-  0x1b5d,0x39db ,0x3612,0x223d ,0xf82a,0x3f85 ,
-  0x19ef,0x3a82 ,0x35a5,0x22e7 ,0xf5d5,0x3f30 ,
-  0x187e,0x3b21 ,0x3537,0x238e ,0xf384,0x3ec5 ,
-  0x1709,0x3bb6 ,0x34c6,0x2435 ,0xf136,0x3e45 ,
-  0x1590,0x3c42 ,0x3453,0x24da ,0xeeee,0x3daf ,
-  0x1413,0x3cc5 ,0x33df,0x257e ,0xecac,0x3d03 ,
-  0x1294,0x3d3f ,0x3368,0x2620 ,0xea70,0x3c42 ,
-  0x1112,0x3daf ,0x32ef,0x26c1 ,0xe83c,0x3b6d ,
-  0x0f8d,0x3e15 ,0x3274,0x2760 ,0xe611,0x3a82 ,
-  0x0e06,0x3e72 ,0x31f8,0x27fe ,0xe3ee,0x3984 ,
-  0x0c7c,0x3ec5 ,0x3179,0x289a ,0xe1d5,0x3871 ,
-  0x0af1,0x3f0f ,0x30f9,0x2935 ,0xdfc6,0x374b ,
-  0x0964,0x3f4f ,0x3076,0x29ce ,0xddc3,0x3612 ,
-  0x07d6,0x3f85 ,0x2ff2,0x2a65 ,0xdbcb,0x34c6 ,
-  0x0646,0x3fb1 ,0x2f6c,0x2afb ,0xd9e0,0x3368 ,
-  0x04b5,0x3fd4 ,0x2ee4,0x2b8f ,0xd802,0x31f8 ,
-  0x0324,0x3fec ,0x2e5a,0x2c21 ,0xd632,0x3076 ,
-  0x0192,0x3ffb ,0x2dcf,0x2cb2 ,0xd471,0x2ee4 ,
-  0x0000,0x4000 ,0x2d41,0x2d41 ,0xd2bf,0x2d41 ,
-  0xfe6e,0x3ffb ,0x2cb2,0x2dcf ,0xd11c,0x2b8f ,
-  0xfcdc,0x3fec ,0x2c21,0x2e5a ,0xcf8a,0x29ce ,
-  0xfb4b,0x3fd4 ,0x2b8f,0x2ee4 ,0xce08,0x27fe ,
-  0xf9ba,0x3fb1 ,0x2afb,0x2f6c ,0xcc98,0x2620 ,
-  0xf82a,0x3f85 ,0x2a65,0x2ff2 ,0xcb3a,0x2435 ,
-  0xf69c,0x3f4f ,0x29ce,0x3076 ,0xc9ee,0x223d ,
-  0xf50f,0x3f0f ,0x2935,0x30f9 ,0xc8b5,0x203a ,
-  0xf384,0x3ec5 ,0x289a,0x3179 ,0xc78f,0x1e2b ,
-  0xf1fa,0x3e72 ,0x27fe,0x31f8 ,0xc67c,0x1c12 ,
-  0xf073,0x3e15 ,0x2760,0x3274 ,0xc57e,0x19ef ,
-  0xeeee,0x3daf ,0x26c1,0x32ef ,0xc493,0x17c4 ,
-  0xed6c,0x3d3f ,0x2620,0x3368 ,0xc3be,0x1590 ,
-  0xebed,0x3cc5 ,0x257e,0x33df ,0xc2fd,0x1354 ,
-  0xea70,0x3c42 ,0x24da,0x3453 ,0xc251,0x1112 ,
-  0xe8f7,0x3bb6 ,0x2435,0x34c6 ,0xc1bb,0x0eca ,
-  0xe782,0x3b21 ,0x238e,0x3537 ,0xc13b,0x0c7c ,
-  0xe611,0x3a82 ,0x22e7,0x35a5 ,0xc0d0,0x0a2b ,
-  0xe4a3,0x39db ,0x223d,0x3612 ,0xc07b,0x07d6 ,
-  0xe33a,0x392b ,0x2193,0x367d ,0xc03c,0x057e ,
-  0xe1d5,0x3871 ,0x20e7,0x36e5 ,0xc014,0x0324 ,
-  0xe074,0x37b0 ,0x203a,0x374b ,0xc001,0x00c9 ,
-  0xdf19,0x36e5 ,0x1f8c,0x37b0 ,0xc005,0xfe6e ,
-  0xddc3,0x3612 ,0x1edc,0x3812 ,0xc01f,0xfc13 ,
-  0xdc72,0x3537 ,0x1e2b,0x3871 ,0xc04f,0xf9ba ,
-  0xdb26,0x3453 ,0x1d79,0x38cf ,0xc095,0xf763 ,
-  0xd9e0,0x3368 ,0x1cc6,0x392b ,0xc0f1,0xf50f ,
-  0xd8a0,0x3274 ,0x1c12,0x3984 ,0xc163,0xf2bf ,
-  0xd766,0x3179 ,0x1b5d,0x39db ,0xc1eb,0xf073 ,
-  0xd632,0x3076 ,0x1aa7,0x3a30 ,0xc288,0xee2d ,
-  0xd505,0x2f6c ,0x19ef,0x3a82 ,0xc33b,0xebed ,
-  0xd3df,0x2e5a ,0x1937,0x3ad3 ,0xc403,0xe9b4 ,
-  0xd2bf,0x2d41 ,0x187e,0x3b21 ,0xc4df,0xe782 ,
-  0xd1a6,0x2c21 ,0x17c4,0x3b6d ,0xc5d0,0xe559 ,
-  0xd094,0x2afb ,0x1709,0x3bb6 ,0xc6d5,0xe33a ,
-  0xcf8a,0x29ce ,0x164c,0x3bfd ,0xc7ee,0xe124 ,
-  0xce87,0x289a ,0x1590,0x3c42 ,0xc91b,0xdf19 ,
-  0xcd8c,0x2760 ,0x14d2,0x3c85 ,0xca5b,0xdd19 ,
-  0xcc98,0x2620 ,0x1413,0x3cc5 ,0xcbad,0xdb26 ,
-  0xcbad,0x24da ,0x1354,0x3d03 ,0xcd11,0xd93f ,
-  0xcac9,0x238e ,0x1294,0x3d3f ,0xce87,0xd766 ,
-  0xc9ee,0x223d ,0x11d3,0x3d78 ,0xd00e,0xd59b ,
-  0xc91b,0x20e7 ,0x1112,0x3daf ,0xd1a6,0xd3df ,
-  0xc850,0x1f8c ,0x1050,0x3de3 ,0xd34e,0xd231 ,
-  0xc78f,0x1e2b ,0x0f8d,0x3e15 ,0xd505,0xd094 ,
-  0xc6d5,0x1cc6 ,0x0eca,0x3e45 ,0xd6cb,0xcf07 ,
-  0xc625,0x1b5d ,0x0e06,0x3e72 ,0xd8a0,0xcd8c ,
-  0xc57e,0x19ef ,0x0d41,0x3e9d ,0xda82,0xcc21 ,
-  0xc4df,0x187e ,0x0c7c,0x3ec5 ,0xdc72,0xcac9 ,
-  0xc44a,0x1709 ,0x0bb7,0x3eeb ,0xde6d,0xc983 ,
-  0xc3be,0x1590 ,0x0af1,0x3f0f ,0xe074,0xc850 ,
-  0xc33b,0x1413 ,0x0a2b,0x3f30 ,0xe287,0xc731 ,
-  0xc2c1,0x1294 ,0x0964,0x3f4f ,0xe4a3,0xc625 ,
-  0xc251,0x1112 ,0x089d,0x3f6b ,0xe6c9,0xc52d ,
-  0xc1eb,0x0f8d ,0x07d6,0x3f85 ,0xe8f7,0xc44a ,
-  0xc18e,0x0e06 ,0x070e,0x3f9c ,0xeb2e,0xc37b ,
-  0xc13b,0x0c7c ,0x0646,0x3fb1 ,0xed6c,0xc2c1 ,
-  0xc0f1,0x0af1 ,0x057e,0x3fc4 ,0xefb0,0xc21d ,
-  0xc0b1,0x0964 ,0x04b5,0x3fd4 ,0xf1fa,0xc18e ,
-  0xc07b,0x07d6 ,0x03ed,0x3fe1 ,0xf449,0xc115 ,
-  0xc04f,0x0646 ,0x0324,0x3fec ,0xf69c,0xc0b1 ,
-  0xc02c,0x04b5 ,0x025b,0x3ff5 ,0xf8f2,0xc064 ,
-  0xc014,0x0324 ,0x0192,0x3ffb ,0xfb4b,0xc02c ,
-  0xc005,0x0192 ,0x00c9,0x3fff ,0xfda5,0xc00b ,
-  0x4000,0x0000 ,0x4000,0x0065 ,0x3fff,0x00c9 ,
-  0x3ffd,0x012e ,0x3ffb,0x0192 ,0x3ff8,0x01f7 ,
-  0x3ff5,0x025b ,0x3ff1,0x02c0 ,0x3fec,0x0324 ,
-  0x3fe7,0x0388 ,0x3fe1,0x03ed ,0x3fdb,0x0451 ,
-  0x3fd4,0x04b5 ,0x3fcc,0x051a ,0x3fc4,0x057e ,
-  0x3fbb,0x05e2 ,0x3fb1,0x0646 ,0x3fa7,0x06aa ,
-  0x3f9c,0x070e ,0x3f91,0x0772 ,0x3f85,0x07d6 ,
-  0x3f78,0x0839 ,0x3f6b,0x089d ,0x3f5d,0x0901 ,
-  0x3f4f,0x0964 ,0x3f40,0x09c7 ,0x3f30,0x0a2b ,
-  0x3f20,0x0a8e ,0x3f0f,0x0af1 ,0x3efd,0x0b54 ,
-  0x3eeb,0x0bb7 ,0x3ed8,0x0c1a ,0x3ec5,0x0c7c ,
-  0x3eb1,0x0cdf ,0x3e9d,0x0d41 ,0x3e88,0x0da4 ,
-  0x3e72,0x0e06 ,0x3e5c,0x0e68 ,0x3e45,0x0eca ,
-  0x3e2d,0x0f2b ,0x3e15,0x0f8d ,0x3dfc,0x0fee ,
-  0x3de3,0x1050 ,0x3dc9,0x10b1 ,0x3daf,0x1112 ,
-  0x3d93,0x1173 ,0x3d78,0x11d3 ,0x3d5b,0x1234 ,
-  0x3d3f,0x1294 ,0x3d21,0x12f4 ,0x3d03,0x1354 ,
-  0x3ce4,0x13b4 ,0x3cc5,0x1413 ,0x3ca5,0x1473 ,
-  0x3c85,0x14d2 ,0x3c64,0x1531 ,0x3c42,0x1590 ,
-  0x3c20,0x15ee ,0x3bfd,0x164c ,0x3bda,0x16ab ,
-  0x3bb6,0x1709 ,0x3b92,0x1766 ,0x3b6d,0x17c4 ,
-  0x3b47,0x1821 ,0x3b21,0x187e ,0x3afa,0x18db ,
-  0x3ad3,0x1937 ,0x3aab,0x1993 ,0x3a82,0x19ef ,
-  0x3a59,0x1a4b ,0x3a30,0x1aa7 ,0x3a06,0x1b02 ,
-  0x39db,0x1b5d ,0x39b0,0x1bb8 ,0x3984,0x1c12 ,
-  0x3958,0x1c6c ,0x392b,0x1cc6 ,0x38fd,0x1d20 ,
-  0x38cf,0x1d79 ,0x38a1,0x1dd3 ,0x3871,0x1e2b ,
-  0x3842,0x1e84 ,0x3812,0x1edc ,0x37e1,0x1f34 ,
-  0x37b0,0x1f8c ,0x377e,0x1fe3 ,0x374b,0x203a ,
-  0x3718,0x2091 ,0x36e5,0x20e7 ,0x36b1,0x213d ,
-  0x367d,0x2193 ,0x3648,0x21e8 ,0x3612,0x223d ,
-  0x35dc,0x2292 ,0x35a5,0x22e7 ,0x356e,0x233b ,
-  0x3537,0x238e ,0x34ff,0x23e2 ,0x34c6,0x2435 ,
-  0x348d,0x2488 ,0x3453,0x24da ,0x3419,0x252c ,
-  0x33df,0x257e ,0x33a3,0x25cf ,0x3368,0x2620 ,
-  0x332c,0x2671 ,0x32ef,0x26c1 ,0x32b2,0x2711 ,
-  0x3274,0x2760 ,0x3236,0x27af ,0x31f8,0x27fe ,
-  0x31b9,0x284c ,0x3179,0x289a ,0x3139,0x28e7 ,
-  0x30f9,0x2935 ,0x30b8,0x2981 ,0x3076,0x29ce ,
-  0x3034,0x2a1a ,0x2ff2,0x2a65 ,0x2faf,0x2ab0 ,
-  0x2f6c,0x2afb ,0x2f28,0x2b45 ,0x2ee4,0x2b8f ,
-  0x2e9f,0x2bd8 ,0x2e5a,0x2c21 ,0x2e15,0x2c6a ,
-  0x2dcf,0x2cb2 ,0x2d88,0x2cfa ,0x2d41,0x2d41 ,
-  0x2cfa,0x2d88 ,0x2cb2,0x2dcf ,0x2c6a,0x2e15 ,
-  0x2c21,0x2e5a ,0x2bd8,0x2e9f ,0x2b8f,0x2ee4 ,
-  0x2b45,0x2f28 ,0x2afb,0x2f6c ,0x2ab0,0x2faf ,
-  0x2a65,0x2ff2 ,0x2a1a,0x3034 ,0x29ce,0x3076 ,
-  0x2981,0x30b8 ,0x2935,0x30f9 ,0x28e7,0x3139 ,
-  0x289a,0x3179 ,0x284c,0x31b9 ,0x27fe,0x31f8 ,
-  0x27af,0x3236 ,0x2760,0x3274 ,0x2711,0x32b2 ,
-  0x26c1,0x32ef ,0x2671,0x332c ,0x2620,0x3368 ,
-  0x25cf,0x33a3 ,0x257e,0x33df ,0x252c,0x3419 ,
-  0x24da,0x3453 ,0x2488,0x348d ,0x2435,0x34c6 ,
-  0x23e2,0x34ff ,0x238e,0x3537 ,0x233b,0x356e ,
-  0x22e7,0x35a5 ,0x2292,0x35dc ,0x223d,0x3612 ,
-  0x21e8,0x3648 ,0x2193,0x367d ,0x213d,0x36b1 ,
-  0x20e7,0x36e5 ,0x2091,0x3718 ,0x203a,0x374b ,
-  0x1fe3,0x377e ,0x1f8c,0x37b0 ,0x1f34,0x37e1 ,
-  0x1edc,0x3812 ,0x1e84,0x3842 ,0x1e2b,0x3871 ,
-  0x1dd3,0x38a1 ,0x1d79,0x38cf ,0x1d20,0x38fd ,
-  0x1cc6,0x392b ,0x1c6c,0x3958 ,0x1c12,0x3984 ,
-  0x1bb8,0x39b0 ,0x1b5d,0x39db ,0x1b02,0x3a06 ,
-  0x1aa7,0x3a30 ,0x1a4b,0x3a59 ,0x19ef,0x3a82 ,
-  0x1993,0x3aab ,0x1937,0x3ad3 ,0x18db,0x3afa ,
-  0x187e,0x3b21 ,0x1821,0x3b47 ,0x17c4,0x3b6d ,
-  0x1766,0x3b92 ,0x1709,0x3bb6 ,0x16ab,0x3bda ,
-  0x164c,0x3bfd ,0x15ee,0x3c20 ,0x1590,0x3c42 ,
-  0x1531,0x3c64 ,0x14d2,0x3c85 ,0x1473,0x3ca5 ,
-  0x1413,0x3cc5 ,0x13b4,0x3ce4 ,0x1354,0x3d03 ,
-  0x12f4,0x3d21 ,0x1294,0x3d3f ,0x1234,0x3d5b ,
-  0x11d3,0x3d78 ,0x1173,0x3d93 ,0x1112,0x3daf ,
-  0x10b1,0x3dc9 ,0x1050,0x3de3 ,0x0fee,0x3dfc ,
-  0x0f8d,0x3e15 ,0x0f2b,0x3e2d ,0x0eca,0x3e45 ,
-  0x0e68,0x3e5c ,0x0e06,0x3e72 ,0x0da4,0x3e88 ,
-  0x0d41,0x3e9d ,0x0cdf,0x3eb1 ,0x0c7c,0x3ec5 ,
-  0x0c1a,0x3ed8 ,0x0bb7,0x3eeb ,0x0b54,0x3efd ,
-  0x0af1,0x3f0f ,0x0a8e,0x3f20 ,0x0a2b,0x3f30 ,
-  0x09c7,0x3f40 ,0x0964,0x3f4f ,0x0901,0x3f5d ,
-  0x089d,0x3f6b ,0x0839,0x3f78 ,0x07d6,0x3f85 ,
-  0x0772,0x3f91 ,0x070e,0x3f9c ,0x06aa,0x3fa7 ,
-  0x0646,0x3fb1 ,0x05e2,0x3fbb ,0x057e,0x3fc4 ,
-  0x051a,0x3fcc ,0x04b5,0x3fd4 ,0x0451,0x3fdb ,
-  0x03ed,0x3fe1 ,0x0388,0x3fe7 ,0x0324,0x3fec ,
-  0x02c0,0x3ff1 ,0x025b,0x3ff5 ,0x01f7,0x3ff8 ,
-  0x0192,0x3ffb ,0x012e,0x3ffd ,0x00c9,0x3fff ,
-  0x0065,0x4000 ,0x0000,0x4000 ,0xff9b,0x4000 ,
-  0xff37,0x3fff ,0xfed2,0x3ffd ,0xfe6e,0x3ffb ,
-  0xfe09,0x3ff8 ,0xfda5,0x3ff5 ,0xfd40,0x3ff1 ,
-  0xfcdc,0x3fec ,0xfc78,0x3fe7 ,0xfc13,0x3fe1 ,
-  0xfbaf,0x3fdb ,0xfb4b,0x3fd4 ,0xfae6,0x3fcc ,
-  0xfa82,0x3fc4 ,0xfa1e,0x3fbb ,0xf9ba,0x3fb1 ,
-  0xf956,0x3fa7 ,0xf8f2,0x3f9c ,0xf88e,0x3f91 ,
-  0xf82a,0x3f85 ,0xf7c7,0x3f78 ,0xf763,0x3f6b ,
-  0xf6ff,0x3f5d ,0xf69c,0x3f4f ,0xf639,0x3f40 ,
-  0xf5d5,0x3f30 ,0xf572,0x3f20 ,0xf50f,0x3f0f ,
-  0xf4ac,0x3efd ,0xf449,0x3eeb ,0xf3e6,0x3ed8 ,
-  0xf384,0x3ec5 ,0xf321,0x3eb1 ,0xf2bf,0x3e9d ,
-  0xf25c,0x3e88 ,0xf1fa,0x3e72 ,0xf198,0x3e5c ,
-  0xf136,0x3e45 ,0xf0d5,0x3e2d ,0xf073,0x3e15 ,
-  0xf012,0x3dfc ,0xefb0,0x3de3 ,0xef4f,0x3dc9 ,
-  0xeeee,0x3daf ,0xee8d,0x3d93 ,0xee2d,0x3d78 ,
-  0xedcc,0x3d5b ,0xed6c,0x3d3f ,0xed0c,0x3d21 ,
-  0xecac,0x3d03 ,0xec4c,0x3ce4 ,0xebed,0x3cc5 ,
-  0xeb8d,0x3ca5 ,0xeb2e,0x3c85 ,0xeacf,0x3c64 ,
-  0xea70,0x3c42 ,0xea12,0x3c20 ,0xe9b4,0x3bfd ,
-  0xe955,0x3bda ,0xe8f7,0x3bb6 ,0xe89a,0x3b92 ,
-  0xe83c,0x3b6d ,0xe7df,0x3b47 ,0xe782,0x3b21 ,
-  0xe725,0x3afa ,0xe6c9,0x3ad3 ,0xe66d,0x3aab ,
-  0xe611,0x3a82 ,0xe5b5,0x3a59 ,0xe559,0x3a30 ,
-  0xe4fe,0x3a06 ,0xe4a3,0x39db ,0xe448,0x39b0 ,
-  0xe3ee,0x3984 ,0xe394,0x3958 ,0xe33a,0x392b ,
-  0xe2e0,0x38fd ,0xe287,0x38cf ,0xe22d,0x38a1 ,
-  0xe1d5,0x3871 ,0xe17c,0x3842 ,0xe124,0x3812 ,
-  0xe0cc,0x37e1 ,0xe074,0x37b0 ,0xe01d,0x377e ,
-  0xdfc6,0x374b ,0xdf6f,0x3718 ,0xdf19,0x36e5 ,
-  0xdec3,0x36b1 ,0xde6d,0x367d ,0xde18,0x3648 ,
-  0xddc3,0x3612 ,0xdd6e,0x35dc ,0xdd19,0x35a5 ,
-  0xdcc5,0x356e ,0xdc72,0x3537 ,0xdc1e,0x34ff ,
-  0xdbcb,0x34c6 ,0xdb78,0x348d ,0xdb26,0x3453 ,
-  0xdad4,0x3419 ,0xda82,0x33df ,0xda31,0x33a3 ,
-  0xd9e0,0x3368 ,0xd98f,0x332c ,0xd93f,0x32ef ,
-  0xd8ef,0x32b2 ,0xd8a0,0x3274 ,0xd851,0x3236 ,
-  0xd802,0x31f8 ,0xd7b4,0x31b9 ,0xd766,0x3179 ,
-  0xd719,0x3139 ,0xd6cb,0x30f9 ,0xd67f,0x30b8 ,
-  0xd632,0x3076 ,0xd5e6,0x3034 ,0xd59b,0x2ff2 ,
-  0xd550,0x2faf ,0xd505,0x2f6c ,0xd4bb,0x2f28 ,
-  0xd471,0x2ee4 ,0xd428,0x2e9f ,0xd3df,0x2e5a ,
-  0xd396,0x2e15 ,0xd34e,0x2dcf ,0xd306,0x2d88 ,
-  0xd2bf,0x2d41 ,0xd278,0x2cfa ,0xd231,0x2cb2 ,
-  0xd1eb,0x2c6a ,0xd1a6,0x2c21 ,0xd161,0x2bd8 ,
-  0xd11c,0x2b8f ,0xd0d8,0x2b45 ,0xd094,0x2afb ,
-  0xd051,0x2ab0 ,0xd00e,0x2a65 ,0xcfcc,0x2a1a ,
-  0xcf8a,0x29ce ,0xcf48,0x2981 ,0xcf07,0x2935 ,
-  0xcec7,0x28e7 ,0xce87,0x289a ,0xce47,0x284c ,
-  0xce08,0x27fe ,0xcdca,0x27af ,0xcd8c,0x2760 ,
-  0xcd4e,0x2711 ,0xcd11,0x26c1 ,0xccd4,0x2671 ,
-  0xcc98,0x2620 ,0xcc5d,0x25cf ,0xcc21,0x257e ,
-  0xcbe7,0x252c ,0xcbad,0x24da ,0xcb73,0x2488 ,
-  0xcb3a,0x2435 ,0xcb01,0x23e2 ,0xcac9,0x238e ,
-  0xca92,0x233b ,0xca5b,0x22e7 ,0xca24,0x2292 ,
-  0xc9ee,0x223d ,0xc9b8,0x21e8 ,0xc983,0x2193 ,
-  0xc94f,0x213d ,0xc91b,0x20e7 ,0xc8e8,0x2091 ,
-  0xc8b5,0x203a ,0xc882,0x1fe3 ,0xc850,0x1f8c ,
-  0xc81f,0x1f34 ,0xc7ee,0x1edc ,0xc7be,0x1e84 ,
-  0xc78f,0x1e2b ,0xc75f,0x1dd3 ,0xc731,0x1d79 ,
-  0xc703,0x1d20 ,0xc6d5,0x1cc6 ,0xc6a8,0x1c6c ,
-  0xc67c,0x1c12 ,0xc650,0x1bb8 ,0xc625,0x1b5d ,
-  0xc5fa,0x1b02 ,0xc5d0,0x1aa7 ,0xc5a7,0x1a4b ,
-  0xc57e,0x19ef ,0xc555,0x1993 ,0xc52d,0x1937 ,
-  0xc506,0x18db ,0xc4df,0x187e ,0xc4b9,0x1821 ,
-  0xc493,0x17c4 ,0xc46e,0x1766 ,0xc44a,0x1709 ,
-  0xc426,0x16ab ,0xc403,0x164c ,0xc3e0,0x15ee ,
-  0xc3be,0x1590 ,0xc39c,0x1531 ,0xc37b,0x14d2 ,
-  0xc35b,0x1473 ,0xc33b,0x1413 ,0xc31c,0x13b4 ,
-  0xc2fd,0x1354 ,0xc2df,0x12f4 ,0xc2c1,0x1294 ,
-  0xc2a5,0x1234 ,0xc288,0x11d3 ,0xc26d,0x1173 ,
-  0xc251,0x1112 ,0xc237,0x10b1 ,0xc21d,0x1050 ,
-  0xc204,0x0fee ,0xc1eb,0x0f8d ,0xc1d3,0x0f2b ,
-  0xc1bb,0x0eca ,0xc1a4,0x0e68 ,0xc18e,0x0e06 ,
-  0xc178,0x0da4 ,0xc163,0x0d41 ,0xc14f,0x0cdf ,
-  0xc13b,0x0c7c ,0xc128,0x0c1a ,0xc115,0x0bb7 ,
-  0xc103,0x0b54 ,0xc0f1,0x0af1 ,0xc0e0,0x0a8e ,
-  0xc0d0,0x0a2b ,0xc0c0,0x09c7 ,0xc0b1,0x0964 ,
-  0xc0a3,0x0901 ,0xc095,0x089d ,0xc088,0x0839 ,
-  0xc07b,0x07d6 ,0xc06f,0x0772 ,0xc064,0x070e ,
-  0xc059,0x06aa ,0xc04f,0x0646 ,0xc045,0x05e2 ,
-  0xc03c,0x057e ,0xc034,0x051a ,0xc02c,0x04b5 ,
-  0xc025,0x0451 ,0xc01f,0x03ed ,0xc019,0x0388 ,
-  0xc014,0x0324 ,0xc00f,0x02c0 ,0xc00b,0x025b ,
-  0xc008,0x01f7 ,0xc005,0x0192 ,0xc003,0x012e ,
-  0xc001,0x00c9 ,0xc000,0x0065 };
diff --git a/src/mod/codecs/mod_isac/webrtc_fft_t_rad.c b/src/mod/codecs/mod_isac/webrtc_fft_t_rad.c
deleted file mode 100644
index 13fbd9f53e..0000000000
--- a/src/mod/codecs/mod_isac/webrtc_fft_t_rad.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the Q14 radix-2 tables used in ARM9E optimization routines.
- *
- */
-
-extern const unsigned short t_Q14S_rad8[2];
-const unsigned short t_Q14S_rad8[2] = {  0x0000,0x2d41 };
-
-//extern const int t_Q30S_rad8[2];
-//const int t_Q30S_rad8[2] = {  0x00000000,0x2d413ccd };
-
-extern const unsigned short t_Q14R_rad8[2];
-const unsigned short t_Q14R_rad8[2] = {  0x2d41,0x2d41 };
-
-//extern const int t_Q30R_rad8[2];
-//const int t_Q30R_rad8[2] = {  0x2d413ccd,0x2d413ccd };
diff --git a/src/mod/codecs/mod_mp4v/Makefile.am b/src/mod/codecs/mod_mp4v/Makefile.am
deleted file mode 100644
index 59f9fa41ef..0000000000
--- a/src/mod/codecs/mod_mp4v/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_mp4v
-
-mod_LTLIBRARIES = mod_mp4v.la
-mod_mp4v_la_SOURCES  = mod_mp4v.c
-mod_mp4v_la_CFLAGS   = $(AM_CFLAGS)
-mod_mp4v_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_mp4v_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/codecs/mod_mp4v/mod_mp4v.c b/src/mod/codecs/mod_mp4v/mod_mp4v.c
deleted file mode 100644
index 685e6756c7..0000000000
--- a/src/mod/codecs/mod_mp4v/mod_mp4v.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_mp4v.c -- MP4V Video Codec
- *
- */
-
-#include <switch.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_mp4v_load);
-SWITCH_MODULE_DEFINITION(mod_mp4v, mod_mp4v_load, NULL, NULL);
-
-static switch_status_t switch_mp4v_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-	int encoding, decoding;
-
-	encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-	decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-	if (!(encoding || decoding)) {
-		return SWITCH_STATUS_FALSE;
-	} else {
-		if (codec->fmtp_in) {
-			codec->fmtp_out = switch_core_strdup(codec->memory_pool, codec->fmtp_in);
-		}
-		return SWITCH_STATUS_SUCCESS;
-	}
-}
-
-static switch_status_t switch_mp4v_encode(switch_codec_t *codec,
-										  switch_codec_t *other_codec,
-										  void *decoded_data,
-										  uint32_t decoded_data_len,
-										  uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-										  unsigned int *flag)
-{
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t switch_mp4v_decode(switch_codec_t *codec,
-										  switch_codec_t *other_codec,
-										  void *encoded_data,
-										  uint32_t encoded_data_len,
-										  uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-										  unsigned int *flag)
-{
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t switch_mp4v_destroy(switch_codec_t *codec)
-{
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_mp4v_load)
-{
-	switch_codec_interface_t *codec_interface;
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	SWITCH_ADD_CODEC(codec_interface, "MP4V Video (passthru)");
-	switch_core_codec_add_implementation(pool, codec_interface,
-										 SWITCH_CODEC_TYPE_VIDEO, 99, "MP4V-ES", NULL, 90000, 90000, 0,
-										 0, 0, 0, 0, 1, 1, switch_mp4v_init, switch_mp4v_encode, switch_mp4v_decode, switch_mp4v_destroy);
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/codecs/mod_opus/Makefile.am b/src/mod/codecs/mod_opus/Makefile.am
index 690c5fa471..70710898e7 100644
--- a/src/mod/codecs/mod_opus/Makefile.am
+++ b/src/mod/codecs/mod_opus/Makefile.am
@@ -4,7 +4,7 @@ MODNAME=mod_opus
 if HAVE_OPUS
 
 mod_LTLIBRARIES = mod_opus.la
-mod_opus_la_SOURCES  = mod_opus.c
+mod_opus_la_SOURCES  = mod_opus.c opus_parse.c
 mod_opus_la_CFLAGS   = $(AM_CFLAGS) $(OPUS_CFLAGS)
 mod_opus_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(OPUS_LIBS)
 mod_opus_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lm -lz
diff --git a/src/mod/codecs/mod_opus/mod_opus.2017.vcxproj b/src/mod/codecs/mod_opus/mod_opus.2017.vcxproj
index 3b73a6c42f..18478701c8 100644
--- a/src/mod/codecs/mod_opus/mod_opus.2017.vcxproj
+++ b/src/mod/codecs/mod_opus/mod_opus.2017.vcxproj
@@ -130,6 +130,10 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="mod_opus.c" />
+    <ClCompile Include="opus_parse.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="opus_parse.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\libs\win32\opus\opus.2017.vcxproj">
diff --git a/src/mod/codecs/mod_opus/mod_opus.c b/src/mod/codecs/mod_opus/mod_opus.c
index 04850a672e..96933e6ea5 100644
--- a/src/mod/codecs/mod_opus/mod_opus.c
+++ b/src/mod/codecs/mod_opus/mod_opus.c
@@ -33,6 +33,7 @@
 
 #include "switch.h"
 #include "opus.h"
+#include "opus_parse.h"
 
 #define SWITCH_OPUS_MIN_BITRATE 6000
 #define SWITCH_OPUS_MAX_BITRATE 510000
@@ -142,25 +143,26 @@ struct opus_context {
 	dec_stats_t decoder_stats;
 	enc_stats_t encoder_stats;
 	codec_control_state_t control_state;
+	switch_bool_t recreate_decoder;
 };
 
 struct {
-	int use_vbr;
-	int use_dtx;
+	switch_bool_t use_vbr;
+	switch_bool_t use_dtx;
 	int complexity;
 	int maxaveragebitrate;
 	int maxplaybackrate;
 	int sprop_maxcapturerate;
 	int plpct;
-	int asymmetric_samplerates;
-	int bitrate_negotiation;
-	int keep_fec;
-	int fec_decode;
-	int adjust_bitrate;
+	switch_bool_t asymmetric_samplerates;
+	switch_bool_t bitrate_negotiation;
+	switch_bool_t keep_fec;
+	switch_bool_t fec_decode;
+	switch_bool_t adjust_bitrate;
 	int debuginfo;
-	uint32_t use_jb_lookahead;
+	switch_bool_t use_jb_lookahead;
 	switch_mutex_t *mutex;
-	int mono;
+	switch_bool_t mono;
 } opus_prefs;
 
 static struct {
@@ -272,10 +274,12 @@ static switch_status_t switch_opus_fmtp_parse(const char *fmtp, switch_codec_fmt
 
 					if (!strcasecmp(data, "maxptime")) {
 						codec_settings->maxptime = atoi(arg);
+						codec_fmtp->max_ptime = codec_settings->maxptime;
 					}
 
 					if (!strcasecmp(data, "minptime")) {
 						codec_settings->minptime = atoi(arg);
+						codec_fmtp->min_ptime = codec_settings->minptime;
 					}
 
 					if (!strcasecmp(data, "ptime")) {
@@ -290,6 +294,7 @@ static switch_status_t switch_opus_fmtp_parse(const char *fmtp, switch_codec_fmt
 
 					if (!strcasecmp(data, "sprop-stereo")) {
 						codec_settings->sprop_stereo = atoi(arg);
+						codec_fmtp->sprop_stereo = codec_settings->sprop_stereo;
 					}
 
 					if (!strcasecmp(data, "maxaveragebitrate")) {
@@ -310,6 +315,10 @@ static switch_status_t switch_opus_fmtp_parse(const char *fmtp, switch_codec_fmt
 						if (!switch_opus_acceptable_rate(codec_settings->sprop_maxcapturerate)) {
 							codec_settings->sprop_maxcapturerate = 0; /* value not supported */
 						}
+
+						if (codec_settings->sprop_maxcapturerate) {
+							codec_fmtp->actual_samples_per_second = codec_settings->sprop_maxcapturerate;
+						}
 					}
 				}
 			}
@@ -471,7 +480,7 @@ static int switch_opus_get_fec_bitrate(int fs, int loss)
 	return SWITCH_STATUS_FALSE ;
 }
 
-static switch_status_t switch_opus_info(void * encoded_data, uint32_t len, uint32_t samples_per_second, char *print_text)
+static switch_status_t switch_opus_info(switch_core_session_t *session, void * encoded_data, uint32_t len, uint32_t samples_per_second, char *print_text)
 {
 	int nb_samples, nb_opus_frames, nb_channels;
 	int audiobandwidth;
@@ -483,18 +492,18 @@ static switch_status_t switch_opus_info(void * encoded_data, uint32_t len, uint3
 
 	if (!encoded_data) {
 		/* print stuff, even if encoded_data is NULL. eg: "PLC correction" */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s", print_text);
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s", print_text);
 		return SWITCH_STATUS_FALSE;
 	}
 
 	audiobandwidth = opus_packet_get_bandwidth(encoded_data);
 
 	if (!switch_opus_show_audio_bandwidth(audiobandwidth,audiobandwidth_str)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s: OPUS_INVALID_PACKET !\n", print_text);
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s: OPUS_INVALID_PACKET !\n", print_text);
 	}
 
 	if ((nb_opus_frames = opus_packet_parse(encoded_data, len, NULL, frame_data, frame_sizes, NULL)) <= 0 ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s: OPUS_INVALID_PACKET ! frames: %d\n", print_text, nb_opus_frames);
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s: OPUS_INVALID_PACKET ! frames: %d\n", print_text, nb_opus_frames);
 		return SWITCH_STATUS_FALSE;
 	}
 
@@ -504,7 +513,7 @@ static switch_status_t switch_opus_info(void * encoded_data, uint32_t len, uint3
 
 	nb_channels = opus_packet_get_nb_channels(payload);
 
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s: opus_frames [%d] samples [%d] audio bandwidth [%s] bytes [%d] FEC[%s] channels[%d]\n",
+	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s: opus_frames [%d] samples [%d] audio bandwidth [%s] bytes [%d] FEC[%s] channels[%d]\n",
 							print_text, nb_opus_frames, nb_samples, audiobandwidth_str, len, has_fec ? "yes" : "no", nb_channels);
 
 	return SWITCH_STATUS_SUCCESS;
@@ -518,6 +527,7 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
 	switch_codec_fmtp_t codec_fmtp, codec_fmtp_only_remote = { 0 };
 	opus_codec_settings_t opus_codec_settings = { 0 };
 	opus_codec_settings_t opus_codec_settings_remote = { 0 };
+	switch_core_session_t *session = codec->session;
 
 	if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) {
 		return SWITCH_STATUS_FALSE;
@@ -591,7 +601,7 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
 					if (settings && settings->maxplaybackrate < enc_samplerate && settings->maxplaybackrate) {
 						enc_samplerate = settings->maxplaybackrate; /*R1*/
 						context->enc_frame_size = enc_samplerate * (codec->implementation->microseconds_per_packet / 1000) / 1000;
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder will be created at sample rate %d hz\n",enc_samplerate);
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Opus encoder will be created at sample rate %d hz\n",enc_samplerate);
 					} else {
 						enc_samplerate = codec->implementation->actual_samples_per_second;
 					}
@@ -604,19 +614,19 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
 													  codec->implementation->number_of_channels == 1 ? OPUS_APPLICATION_VOIP : OPUS_APPLICATION_AUDIO, &err);
 
 		if (err != OPUS_OK) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create encoder: %s\n", opus_strerror(err));
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot create encoder: %s\n", opus_strerror(err));
 			return SWITCH_STATUS_GENERR;
 		}
 
 		/* https://tools.ietf.org/html/rfc7587  */
 		if (opus_codec_settings.maxaveragebitrate) {
 			opus_encoder_ctl(context->encoder_object, OPUS_SET_BITRATE(opus_codec_settings.maxaveragebitrate));
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: set bitrate based on maxaveragebitrate value found in SDP or local config [%dbps]\n", opus_codec_settings.maxaveragebitrate);
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Opus encoder: set bitrate based on maxaveragebitrate value found in SDP or local config [%dbps]\n", opus_codec_settings.maxaveragebitrate);
 		} else {
 			opus_encoder_ctl(context->encoder_object, OPUS_SET_BANDWIDTH(OPUS_AUTO));
 			opus_encoder_ctl(context->encoder_object, OPUS_SET_BITRATE(bitrate_bps)); /* OPUS_AUTO */
 			opus_encoder_ctl(context->encoder_object, OPUS_GET_BITRATE(&bitrate_bps)); /* return average bps for this audio bandwidth */
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: set bitrate to local settings [%dbps]\n", bitrate_bps);
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Opus encoder: set bitrate to local settings [%dbps]\n", bitrate_bps);
 		}
 		/* Another fmtp setting from https://tools.ietf.org/html/rfc7587 - "RTP Payload Format for the Opus Speech and Audio Codec" */
 		if (opus_codec_settings.maxplaybackrate) {
@@ -627,14 +637,14 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
 			if (!switch_opus_show_audio_bandwidth(audiobandwidth,audiobandwidth_str)) {
 				snprintf(audiobandwidth_str, sizeof(audiobandwidth_str), "%s", "OPUS_AUTO");
 			}
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: set audio bandwidth to [%s] based on maxplaybackrate value found in SDP or local config [%dHz]\n",audiobandwidth_str,opus_codec_settings.maxplaybackrate);
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Opus encoder: set audio bandwidth to [%s] based on maxplaybackrate value found in SDP or local config [%dHz]\n",audiobandwidth_str,opus_codec_settings.maxplaybackrate);
 		}
 
 		if (use_vbr) {
 			/* VBR is default*/
 			opus_encoder_ctl(context->encoder_object, OPUS_SET_VBR(use_vbr));
 		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: CBR mode enabled\n");
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Opus encoder: CBR mode enabled\n");
 			opus_encoder_ctl(context->encoder_object, OPUS_SET_VBR(0));
 		}
 
@@ -684,7 +694,7 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
 					if (settings && dec_samplerate > settings->sprop_maxcapturerate && settings->sprop_maxcapturerate) {
 						dec_samplerate = settings->sprop_maxcapturerate; /* R2 */
 						context->dec_frame_size = dec_samplerate*(codec->implementation->microseconds_per_packet / 1000) / 1000;
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus decoder will be created at sample rate %d hz\n",dec_samplerate);
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Opus decoder will be created at sample rate %d hz\n",dec_samplerate);
 					} else {
 						dec_samplerate = codec->implementation->actual_samples_per_second;
 					}
@@ -697,7 +707,7 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
 		switch_set_flag(codec, SWITCH_CODEC_FLAG_HAS_PLC);
 
 		if (err != OPUS_OK) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create decoder: %s\n", opus_strerror(err));
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot create decoder: %s\n", opus_strerror(err));
 
 			if (context->encoder_object) {
 				opus_encoder_destroy(context->encoder_object);
@@ -774,7 +784,7 @@ static switch_status_t switch_opus_encode(switch_codec_t *codec,
 
 	if (globals.debug || context->debug > 1) {
 		int samplerate = context->enc_frame_size * 1000 / (codec->implementation->microseconds_per_packet / 1000);
-		switch_opus_info(encoded_data, bytes, samplerate, "encode");
+		switch_opus_info(codec->session, encoded_data, bytes, samplerate, "encode");
 	}
 
 	if (bytes > 0) {
@@ -796,7 +806,7 @@ static switch_status_t switch_opus_encode(switch_codec_t *codec,
 		return SWITCH_STATUS_SUCCESS;
 	}
 
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
+	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_ERROR,
 					  "Encoder Error: %s Decoded Datalen %u Codec NumberChans %u Len %u DecodedDate %p EncodedData %p ContextEncoderObject %p!\n",
 					  opus_strerror(bytes),decoded_data_len,codec->implementation->number_of_channels,len,(void *) decoded_data,
 					  (void *) encoded_data,(void *) context->encoder_object);
@@ -818,6 +828,7 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
 	int32_t frame_size = 0, last_frame_size = 0;
 	uint32_t frame_samples;
 	uint8_t buf[SWITCH_RTP_MAX_BUF_LEN];
+	switch_core_session_t *session = codec->session;
 
 	if (!context) {
 		return SWITCH_STATUS_FALSE;
@@ -827,7 +838,6 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
 	frame_size = frame_samples - (frame_samples % (codec->implementation->actual_samples_per_second / 400));
 
 	if (*flag & SFF_PLC) {
-		switch_core_session_t *session = codec->session;
 		switch_jb_t *jb = NULL;
 
 		plc = 1;
@@ -856,12 +866,12 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
 				frame.buflen = sizeof(buf);
 
 				if (globals.debug || context->debug) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Missing %s %u Checking JB\n", seq ? "SEQ" : "TS", seq ? seq : ts);
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Missing %s %u Checking JB\n", seq ? "SEQ" : "TS", seq ? seq : ts);
 				}
 
 				if (switch_jb_peek_frame(jb, ts, seq, 1, &frame) == SWITCH_STATUS_SUCCESS) {
 					if (globals.debug || context->debug) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lookahead frame found: %u:%u\n",
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Lookahead frame found: %u:%u\n",
 										  frame.timestamp, frame.seq);
 					}
 
@@ -873,10 +883,10 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
 
 					if (globals.debug || context->debug) {
 						if (fec) {
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FEC info available in packet with SEQ: %d LEN: %d\n",
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "FEC info available in packet with SEQ: %d LEN: %d\n",
 											  frame.seq, frame.datalen);
 						} else {
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NO FEC info in this packet with SEQ: %d LEN: %d\n",
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "NO FEC info in this packet with SEQ: %d LEN: %d\n",
 											  frame.seq, frame.datalen);
 						}
 					}
@@ -890,9 +900,9 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
 
 		if (globals.debug || context->debug) {
 			if (opus_prefs.use_jb_lookahead || context->use_jb_lookahead) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "MISSING FRAME: %s\n", fec ? "Look-ahead FEC" : "PLC");
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "MISSING FRAME: %s\n", fec ? "Look-ahead FEC" : "PLC");
 			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "MISSING FRAME: OPUS_PLC\n");
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "MISSING FRAME: OPUS_PLC\n");
 			}
 		}
 
@@ -901,7 +911,7 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
 
 	if (globals.debug || context->debug > 1) {
 		int samplerate = context->dec_frame_size * 1000 / (codec->implementation->microseconds_per_packet / 1000);
-		switch_opus_info(encoded_data, encoded_data_len,
+		switch_opus_info(codec->session, encoded_data, encoded_data_len,
 						 samplerate ? samplerate : codec->implementation->actual_samples_per_second,
 						 !encoded_data ? "PLC correction" : fec ?  "FEC correction" : "decode");
 	}
@@ -918,9 +928,9 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
 	samples = opus_decode(context->decoder_object, encoded_data, encoded_data_len, decoded_data, frame_size, fec);
 
 	if (samples < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Decoder Error: %s fs:%u plc:%s!\n",
-						  opus_strerror(samples), frame_size, plc ? "true" : "false");
-		return SWITCH_STATUS_NOOP;
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Decoder Error: %s fs:%u plc:%s!\n",
+							  opus_strerror(samples), frame_size, plc ? "true" : "false");
+		return SWITCH_STATUS_FALSE;
 	}
 
 	*decoded_data_len = samples * 2 * (!context->codec_settings.sprop_stereo ? codec->implementation->number_of_channels : 2);
@@ -962,7 +972,7 @@ static switch_status_t switch_opus_encode_repacketize(switch_codec_t *codec,
 	}
 	frame_size = (decoded_data_len / 2) / nb_frames;
 	if((frame_size * nb_frames) != context->enc_frame_size) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Encoder Error: Decoded Datalen %u Number of frames: %u Encoder frame size: %u\n",decoded_data_len,nb_frames,context->enc_frame_size);
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_ERROR,"Encoder Error: Decoded Datalen %u Number of frames: %u Encoder frame size: %u\n",decoded_data_len,nb_frames,context->enc_frame_size);
 		switch_goto_status(SWITCH_STATUS_GENERR, end);
 	}
 	opus_repacketizer_init(rp);
@@ -982,7 +992,7 @@ static switch_status_t switch_opus_encode_repacketize(switch_codec_t *codec,
 		bytes = opus_encode(context->encoder_object, (opus_int16 *) dec_ptr_buf, frame_size, enc_ptr_buf, len);
 
 		if (bytes < 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Encoder Error: %s Decoded Datalen %u Codec NumberChans %u" \
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_ERROR, "Encoder Error: %s Decoded Datalen %u Codec NumberChans %u" \
 							  "Len %u DecodedDate %p EncodedData %p ContextEncoderObject %p enc_frame_size: %d\n",
 							  opus_strerror(bytes), decoded_data_len, codec->implementation->number_of_channels, len,
 							  (void *) decoded_data, (void *) encoded_data, (void *) context->encoder_object, context->enc_frame_size);
@@ -991,7 +1001,7 @@ static switch_status_t switch_opus_encode_repacketize(switch_codec_t *codec,
 		/* enc_ptr_buf : Opus API manual:  "The application must ensure this pointer remains valid until the next call to opus_repacketizer_init() or opus_repacketizer_destroy()." */
 		ret = opus_repacketizer_cat(rp, enc_ptr_buf, bytes);
 		if (ret != OPUS_OK) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Opus encoder: error while repacketizing (cat) : %s !\n",opus_strerror(ret));
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_ERROR, "Opus encoder: error while repacketizing (cat) : %s !\n",opus_strerror(ret));
 			switch_goto_status(SWITCH_STATUS_GENERR, end);
 		}
 		enc_ptr_buf += bytes;
@@ -1000,18 +1010,18 @@ static switch_status_t switch_opus_encode_repacketize(switch_codec_t *codec,
 	}
 	/* this will never happen, unless there is a huge and unsupported number of frames */
 	if (total_len + opus_repacketizer_get_nb_frames(rp) > len / 2) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Opus encoder: error while repacketizing: not enough buffer space\n");
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_ERROR, "Opus encoder: error while repacketizing: not enough buffer space\n");
 		switch_goto_status(SWITCH_STATUS_GENERR, end);
 	}
 	ret = opus_repacketizer_out(rp, encoded_data, total_len+opus_repacketizer_get_nb_frames(rp));
 
 	if (globals.debug || context->debug) {
 		int samplerate = context->enc_frame_size * 1000 / (codec->implementation->microseconds_per_packet / 1000);
-		switch_opus_info(encoded_data, ret, samplerate, "encode_repacketize");
+		switch_opus_info(codec->session, encoded_data, ret, samplerate, "encode_repacketize");
 	}
 
 	if (ret <= 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Opus encoder: error while repacketizing (out) : %s ! packed nb_frames: %d\n", opus_strerror(ret), opus_repacketizer_get_nb_frames(rp));
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_ERROR, "Opus encoder: error while repacketizing (out) : %s ! packed nb_frames: %d\n", opus_strerror(ret), opus_repacketizer_get_nb_frames(rp));
 		switch_goto_status(SWITCH_STATUS_GENERR, end);
 	}
 	if (want_fec) {
@@ -1052,25 +1062,25 @@ static switch_status_t opus_load_config(switch_bool_t reload)
 			char *val = (char *) switch_xml_attr_soft(param, "value");
 
 			if (!strcasecmp(key, "use-vbr") && !zstr(val)) {
-				opus_prefs.use_vbr = atoi(val);
+				opus_prefs.use_vbr = switch_true(val);
 			} else if (!strcasecmp(key, "use-dtx")) {
-				opus_prefs.use_dtx = atoi(val);
+				opus_prefs.use_dtx =  switch_true(val);
 			} else if (!strcasecmp(key, "complexity")) {
 				opus_prefs.complexity = atoi(val);
 			} else if (!strcasecmp(key, "packet-loss-percent")) {
 				opus_prefs.plpct = atoi(val);
 			} else if (!strcasecmp(key, "asymmetric-sample-rates")) {
-				opus_prefs.asymmetric_samplerates = atoi(val);
+				opus_prefs.asymmetric_samplerates = switch_true(val);
 			} else if (!strcasecmp(key, "bitrate-negotiation")) {
-				opus_prefs.bitrate_negotiation = atoi(val);
+				opus_prefs.bitrate_negotiation = switch_true(val);
 			} else if (!strcasecmp(key, "use-jb-lookahead")) {
 				opus_prefs.use_jb_lookahead = switch_true(val);
 			} else if (!strcasecmp(key, "keep-fec-enabled")) { /* encoder */
-				opus_prefs.keep_fec = atoi(val);
+				opus_prefs.keep_fec = switch_true(val);
 			} else if (!strcasecmp(key, "advertise-useinbandfec")) { /*decoder, has meaning only for FMTP: useinbandfec=1 by default */
-				opus_prefs.fec_decode = atoi(val);
+				opus_prefs.fec_decode = switch_true(val);
 			} else if (!strcasecmp(key, "adjust-bitrate")) { /* encoder, this setting will make the encoder adjust its bitrate based on a feedback loop (RTCP). This is not "VBR".*/
-				opus_prefs.adjust_bitrate = atoi(val);
+				opus_prefs.adjust_bitrate = switch_true(val);
 			} else if (!strcasecmp(key, "maxaveragebitrate")) {
 				opus_prefs.maxaveragebitrate = atoi(val);
 				if (opus_prefs.maxaveragebitrate < SWITCH_OPUS_MIN_BITRATE || opus_prefs.maxaveragebitrate > SWITCH_OPUS_MAX_BITRATE) {
@@ -1087,7 +1097,7 @@ static switch_status_t opus_load_config(switch_bool_t reload)
 					opus_prefs.sprop_maxcapturerate = 0; /* value not supported */
 				}
 			} else if (!strcasecmp(key, "mono")) {
-				opus_prefs.mono = atoi(val);
+				opus_prefs.mono = switch_true(val);
 			}
 		}
 	}
@@ -1132,7 +1142,7 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec)
 	LBRR_threshold_bitrate =  (a32 >> 16) * (opus_int32)((opus_int16)b32) + (((a32 & 0x0000FFFF) * (opus_int32)((opus_int16)b32)) >> 16);
 
 	if (!real_target_bitrate || !LBRR_threshold_bitrate) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Opus encoder: error while controlling FEC params\n");
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_ERROR, "Opus encoder: error while controlling FEC params\n");
 
 		return SWITCH_STATUS_FALSE;
 	}
@@ -1141,7 +1151,7 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec)
 	if (real_target_bitrate > LBRR_threshold_bitrate) {
 		/*FEC is already enabled, do nothing*/
 		if (globals.debug || context->debug) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: FEC is enabled\n");
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_DEBUG, "Opus encoder: FEC is enabled\n");
 		}
 		return SWITCH_STATUS_SUCCESS;
 	} else {
@@ -1153,13 +1163,40 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec)
 		opus_encoder_ctl(context->encoder_object,OPUS_SET_BITRATE(current_bitrate));
 
 		if (globals.debug || context->debug) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: increased bitrate to [%d] to keep FEC enabled\n", current_bitrate);
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_DEBUG, "Opus encoder: increased bitrate to [%d] to keep FEC enabled\n", current_bitrate);
 		}
 
 		return SWITCH_STATUS_SUCCESS;
 	}
 }
 
+static switch_bool_t switch_opus_vad(struct opus_context *context, void *encoded_data, uint32_t encoded_data_len)
+{
+	const uint8_t *payload = (const uint8_t *)encoded_data;
+	opus_packet_info_t opus_packet_info;
+	switch_bool_t debug = (globals.debug || context->debug > 1);
+
+	if (!switch_opus_packet_parse(payload, encoded_data_len, &opus_packet_info, debug)) {
+		if (debug) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "OPUS PACKET PARSING ERROR len:%d bytes:%02x %02x\n",
+							  (int)encoded_data_len, payload[0], payload[1]);
+		}
+
+		return SWITCH_TRUE;
+	}
+
+	if (debug) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "OPUS EXTRACT PAYLOAD VAD len:%d vad_ms:%d bytes:%02x %02x\n",
+						  (int)encoded_data_len, opus_packet_info.vad_ms, payload[0], payload[1]);
+	}
+
+	if (opus_packet_info.vad_ms == 0) {
+		return SWITCH_FALSE;
+	}
+
+	return SWITCH_TRUE;
+}
+
 static switch_status_t switch_opus_control(switch_codec_t *codec,
 										   switch_codec_control_command_t cmd,
 										   switch_codec_control_type_t ctype,
@@ -1229,7 +1266,7 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
 				}
 
 				if (globals.debug || context->debug) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: Adjusting packet loss percent from %d%% to %d%%!\n",
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_DEBUG, "Opus encoder: Adjusting packet loss percent from %d%% to %d%%!\n",
 									  context->old_plpct, plpct);
 				}
 			}
@@ -1243,7 +1280,7 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
 				float steps = (float)((float)(range / 100) / base_step);
 				int br_step = (int)(round(steps) * base_step) * plpct;
 				if (globals.debug || context->debug) {
-					switch_log_printf(SWITCH_CHANNEL_LOG,
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session),
 							SWITCH_LOG_DEBUG, "Opus encoder: bitrate increase/decrease step now is: %d bps, range:%d\n", br_step, range);
 				}
 				context->control_state.increase_step = context->control_state.decrease_step = br_step;
@@ -1251,6 +1288,15 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
 			context->old_plpct = plpct;
 		}
 		break;
+	case SCC_AUDIO_VAD:
+		{
+			void *encoded_data = (void *)cmd_data;
+			uint16_t *encoded_data_len = (uint16_t *)cmd_arg;
+			switch_bool_t *ret = (switch_bool_t *)*ret_data;
+
+			*ret = switch_opus_vad(context, encoded_data, *encoded_data_len);
+		}
+		break;
 	case SCC_AUDIO_ADJUST_BITRATE:
 		{
 			const char *cmd = (const char *)cmd_data;
@@ -1269,7 +1315,7 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
 							opus_prefs.keep_fec = 1; /* enable back FEC if it was disabled by SCC_AUDIO_ADJUST_BITRATE, we have enough network bandwidth now */
 						}
 						if (globals.debug || context->debug) {
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: Adjusting bitrate to %d (increase)\n", current_bitrate+br_step);
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_DEBUG, "Opus encoder: Adjusting bitrate to %d (increase)\n", current_bitrate+br_step);
 						}
 					}
 				} else if (!strcasecmp(cmd, "decrease")) {
@@ -1283,7 +1329,7 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
 						}
 						opus_encoder_ctl(context->encoder_object, OPUS_SET_BITRATE(current_bitrate-br_step));
 						if (globals.debug || context->debug) {
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: Adjusting bitrate to %d (decrease)\n", current_bitrate-br_step);
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_DEBUG, "Opus encoder: Adjusting bitrate to %d (decrease)\n", current_bitrate-br_step);
 						}
 					}
 				} else if (!strcasecmp(cmd, "default")) {
@@ -1293,7 +1339,7 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
 						opus_prefs.keep_fec = 1; /* enable back FEC, we have enough network bandwidth now */
 					}
 					if (globals.debug || context->debug) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: Adjusting bitrate to %d (configured maxaveragebitrate)\n", opus_prefs.maxaveragebitrate);
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_DEBUG, "Opus encoder: Adjusting bitrate to %d (configured maxaveragebitrate)\n", opus_prefs.maxaveragebitrate);
 					}
 				} else {
 					/* set Opus minimum bitrate */
@@ -1302,7 +1348,7 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
 						opus_prefs.keep_fec = 0; /* do not enforce FEC anymore, we're low on network bandwidth */
 					}
 					if (globals.debug || context->debug) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder: Adjusting bitrate to %d (minimum)\n", SWITCH_OPUS_MIN_BITRATE);
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_DEBUG, "Opus encoder: Adjusting bitrate to %d (minimum)\n", SWITCH_OPUS_MIN_BITRATE);
 					}
 				}
 			}
@@ -1340,7 +1386,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_opus_load)
 {
 	switch_codec_interface_t *codec_interface;
 	switch_api_interface_t *commands_api_interface;
-	int samples = 480;
+	int samples = 480; /* start with 10 ms ptime */
 	int bytes = 960;
 	int mss = 10000;
 	int x = 0;
@@ -1441,7 +1487,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_opus_load)
 	}
 
 	/* 16 khz */
-	samples = 480;
+	samples = 160;
 	bytes = 320;
 	mss = 10000;
 	rate = 16000;
@@ -1538,7 +1584,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_opus_load)
 	}
 
 	/* 8 khz */
-	samples = 480;
+	samples = 80;
 	bytes = 160;
 	mss = 10000;
 	rate = 8000;
diff --git a/src/mod/codecs/mod_opus/opus_parse.c b/src/mod/codecs/mod_opus/opus_parse.c
new file mode 100644
index 0000000000..48f596836a
--- /dev/null
+++ b/src/mod/codecs/mod_opus/opus_parse.c
@@ -0,0 +1,401 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2023, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Claude Lamblin
+ * Julien Chavanton <jchavanton@gmail.com>
+ *
+ */
+
+#include "switch.h"
+#include "opus.h"
+#include "opus_parse.h"
+/* Tables for LBRR_sympbol decoding */
+
+static const opus_int16 silk_LBRR_flags_2_PDFCum[3] = { 53, 106, 256 }; 				  /* 256 - silk_LBRR_flags_2_iCDF[i] ; silk_LBRR_flags_2_iCDF[ 3 ] = { 203, 150, 0 }; */
+static const opus_int16 silk_LBRR_flags_3_PDFCum[7] = { 41, 61, 90, 131, 146, 174, 256 }; /* 256 - silk_LBRR_flags_3_iCDF[i] ; silk_LBRR_flags_3_iCDF[ 7 ] = { 215, 195, 166, 125, 110, 82, 0 }; */
+
+/* Get the number of VAD flags - i.e. number of 20 ms frame - from the config
+ * in a silk-only  or hybrid opus frame  mono or stereo
+ * 5 MSB TOC byte (see table 2 of IETF RFC6716  clause 3.1)
+ * if 10 ms frame (config=0, 4, 8, 12, 14) : return 1
+ * if CELT_only frame no VAD flag =>return 0 */
+static opus_int16 switch_opus_get_nb_flags_in_silk_frame(int16_t config)
+{
+	opus_int16 silk_frame_nb_flags;
+
+	if (config > 15) {
+		/* CELT_only frame no VAD flag nor LBRR flag */
+		silk_frame_nb_flags = 0;
+	} else {
+		silk_frame_nb_flags = 1;  /* default */
+
+		if (config < 12) {
+			/* silk-only NB, MB or WB
+			 * The least two significant bits give the number of VAD flags inside the silk frame 1, 2 or 3 */
+			silk_frame_nb_flags = config & 0x3;
+
+			if (silk_frame_nb_flags == 0) { /* 0  => 10ms frame : one  VAD flag */
+				silk_frame_nb_flags++;
+			}
+		}
+	}
+
+	return silk_frame_nb_flags;
+}
+
+/* Get the time in ms corresponding to one VAD flag from the config
+ * in a silk-only  or hybrid opus frame  mono or stereo
+ * 5 MSB TOC byte (see table 2 of IETF RFC6716  clause 3.1)
+ * if CELT_only frame (config >15) no VAD flag =>return FALSE
+ * if 10 ms frame (config=0, 4, 8, 12, 14) : return 10
+ * otherwise return 20 */
+static opus_int16 switch_opus_get_silk_frame_ms_per_flag(int16_t config, opus_int16 silk_frame_nb_flags)
+{
+	opus_int16 silk_size_frame_ms_per_flag;
+
+	if (config > 15) {
+		/* CELT_only frame no VAD flag nor LBRR flag */
+		/* switch_opus_get_silk_frame_ms_per_flag: code not written for CELT-only mode */
+
+		return 0;
+	}
+
+	silk_size_frame_ms_per_flag = 20;  /* default*/
+	if (silk_frame_nb_flags == 1) {    /* could be 10 or 20 ms */
+		if ((config & 0x01) == 0) {
+			silk_size_frame_ms_per_flag = 10;
+		}
+	}
+
+	return silk_size_frame_ms_per_flag;
+}
+
+/* Code written only for mono, silk-only or hybrid mode
+ * for CELT-only frame no vad flags for LBRR flag the routine must not be called
+ * for stereo : the mid frame VAD_flags and the LBRR_flag could be obtained
+ * yet, to get the LBRR_flags of the mid frame the routine should be modified
+ * to skip the side VAD flags and the side LBRR flag and to get the mid LBRR_symbol */
+static void switch_opus_get_VAD_LBRR_flags(const uint8_t *buf, opus_int16 silk_frame_nb_flags,
+										   opus_int16 *VAD_flags, opus_int16 *LBRR_flags, opus_int16 *nb_VAD1, opus_int16 *nb_FEC)
+{
+	const opus_int16 *ptr_pdf_cum;
+	opus_int nb_pdf_symbol;
+	opus_uint16 LBRR_symbol;
+	opus_int16 val, nb_bit, compl_nb_bit, mask, mask2;
+	opus_int16 *ptr_flags;
+	opus_int16 LBRR_flag;
+	opus_int16 nb_vad, nb_fec;
+	int i;
+
+	nb_vad = 0;
+	nb_fec = 0;
+
+	/* Get VAD_FLAGS & LBRR_FLAG
+	 * silk_frame_nb_flags  = 1  (10 or 20 ms), the two MSB of the first byte are the VAD flag and the LBRR flag
+	 * silk_frame_nb_flags  = 2  (40 ms), the three MSB of the first byte are the two VAD flags and the LBRR flag
+	 * silk_frame_nb_flags  = 3  (60 ms), the four MSB of the first byte are the three VAD flags and the LBRR flag
+	 * compute the number of MSB to analyze */
+	nb_bit = silk_frame_nb_flags + 1;
+
+	/* number of right shifts to apply to the first byte to only have the bits of LBRR flag and of the VAD flags */
+	compl_nb_bit = 8 - nb_bit;
+	mask = (1 << nb_bit) - 1;
+
+	/* The bits of the silk_frame_nb_flags VAD flags and the LBRR flag are the MSB of the first byte
+	 * silk_frame_nb_flags  = 1  (10 or 20 ms),  VAD_flags(0) | LBRR_flag
+	 * silk_frame_nb_flags  = 2  (40 ms), VAD_flags(0) | VAD_flags(1) | LBRR_flag
+	 * silk_frame_nb_flags  = 3  (60 ms), VAD_flags(0) | VAD_flags(1) | VAD_flags(2) |LBRR_flag */
+	val = (buf[0] >> compl_nb_bit) & mask;
+
+	LBRR_flag = val & 0x1; /* LBRR_FLAG LSB */
+
+	/* get VAD_flags  */
+	ptr_flags = VAD_flags + silk_frame_nb_flags;
+	for (i = 0; i < silk_frame_nb_flags; i++) {
+		LBRR_flags[i] = 0; /* init */
+		val >>= 1;
+		*(--ptr_flags) = val & 0x1;
+	}
+
+	if (LBRR_flag != 0) { /* there is at least one LBRR frame */
+		if (silk_frame_nb_flags == 1) {
+			LBRR_flags[0] = 1;
+			nb_fec = 1;
+		} else { /* get LBRR_symbol  then LBRR_flags */
+			/* LBRR symbol is encoded with range encoder : range on 8 bits
+			 * silk_frame_nb_flags  = 2  ; 3 possible values for LBRR_flags(1) | LBRR_flags(0))=  01, 10, 11
+			 * silk_frame_nb_flags  = 3  ; 7 possible values for LBRR_flags(2) | LBRR_flags(1) | LBRR_flags(0))=  001, 010, 011, 100, 101, 110, 111 */
+			mask2 = (1 << compl_nb_bit) - 1;
+			/* get next 8 bits: (8-nb_bit) LSB of the first byte  and nb_bit MSB of the second byte */
+			val = (((buf[0]) & mask2) << nb_bit) | ((buf[1] >> compl_nb_bit) & mask);
+
+			if (silk_frame_nb_flags == 2) {
+				nb_pdf_symbol = 3;
+				ptr_pdf_cum = silk_LBRR_flags_2_PDFCum;
+			} else {
+				nb_pdf_symbol = 7;
+				ptr_pdf_cum = silk_LBRR_flags_3_PDFCum;
+			}
+
+			LBRR_symbol = 0;
+			for (i = 1; i <= nb_pdf_symbol; i++) {
+				if (val < *ptr_pdf_cum++) {
+					LBRR_symbol = i;
+					break;
+				}
+			}
+
+			for (i = 0; i < silk_frame_nb_flags; i++) {
+				LBRR_flags[i] = LBRR_symbol & 0x01;
+				LBRR_symbol >>= 1;
+				nb_fec += LBRR_flags[i];
+			}
+		}
+	}
+
+	for (i = 0; i < silk_frame_nb_flags; i++) {
+		nb_vad += VAD_flags[i];
+	}
+
+	*nb_VAD1 = nb_vad;
+	*nb_FEC = nb_fec;
+
+	return;
+}
+
+/* Parse the packet to retrieve informations about its content
+ * RFC6716: Definition of the Opus Audio Codec
+ * return: SWITCH_FALSE if there was a problem found parsing the packet, the info returned should be ignored.
+ * */
+switch_bool_t switch_opus_packet_parse(const uint8_t *payload, int payload_length_bytes, opus_packet_info_t *packet_info, switch_bool_t debug)
+{
+	int f;
+	int32_t samplerate;
+	int i, shift_silk, silk_frame_packet;
+	int16_t vad_flags_per_silk_frame, fec_flags_per_silk_frame;
+	opus_int16 frame_sizes[48];
+	const unsigned char *frame_data[48];
+	opus_int16 packet_LBBR_FLAGS[3 * 48], packet_VAD_FLAGS[3 * 48];
+	opus_int16 *ptr_LBBR_FLAGS, *ptr_VAD_FLAGS;
+	opus_int16 silk_frame_nb_flags, silk_size_frame_ms_per_flag;
+	opus_int16 silk_frame_nb_fec, silk_frame_nb_vad1;
+	opus_int sample_per_frame;
+
+	packet_info->config = 0;
+	packet_info->fec = 0;
+	packet_info->fec_ms = 0;
+	packet_info->vad = 0;
+	packet_info->vad_ms = 0;
+	packet_info->stereo = FALSE;
+	packet_info->frames = 0;
+	packet_info->channels = 1; /* as stereo is set to FALSE */
+	packet_info->ms_per_frame = 0;
+	packet_info->ptime_ts = 0;
+
+	if (payload == NULL || payload_length_bytes <= 0) {
+		if (debug) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "opus_packet_parse: payload null.");
+		}
+
+		return SWITCH_FALSE;
+	}
+
+	/* In CELT_ONLY mode, packets should not have FEC. */
+	if (payload[0] & 0x80) {
+		/* opus_packet_parse: CELT_ONLY mode, we do not support this mode. */
+		return SWITCH_FALSE;
+	} else {
+		int mode = (payload[0] >> 3);
+
+		if (mode <= 3) {
+			samplerate = 8000;
+		} else if (mode <= 7) {
+			samplerate = 12000;
+		} else if (mode <= 11) {
+			samplerate = 16000;
+		} else if (mode <= 13) {
+			samplerate = 24000;
+		} else if (mode <= 15) {
+			samplerate = 48000;
+		} else {
+			/* opus_packet_parse: CELT_ONLY mode, we do not support this mode. */
+			return SWITCH_FALSE;
+		}
+		if (debug) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "opus_packet_parse: mode[%d]s[%d]c[%d] [%d]Hz\n", mode, (payload[0] >> 2) & 0x1, (payload[0]) & 0x3, samplerate);
+		}
+	}
+
+	if (payload[0] & 0x04) {
+		packet_info->stereo = TRUE;
+		packet_info->channels = 2;
+	}
+
+	packet_info->config = payload[0] >> 3;
+	sample_per_frame = opus_packet_get_samples_per_frame(payload, samplerate);
+	packet_info->ms_per_frame = sample_per_frame * 1000 / samplerate;
+	if (packet_info->ms_per_frame < 10 || packet_info->ms_per_frame > 120) {
+		if (debug) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "opus_packet_parse: invalid packet.");
+		}
+
+		return SWITCH_FALSE;
+	}
+
+	packet_info->frames = opus_packet_parse(payload, payload_length_bytes, NULL, frame_data, frame_sizes, NULL);
+	if (packet_info->frames < 0) {
+		packet_info->frames = 0;
+		if (debug) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "opus_packet_parse: opus_packet_parse found no frame.\n");
+		}
+
+		return SWITCH_FALSE;
+	}
+
+	packet_info->ptime_ts = packet_info->frames * sample_per_frame;
+
+	if (frame_sizes[0] <= 1) {
+		if (debug) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "opus_packet_parse: opus_packet_parse frame size too small.\n");
+		}
+
+		return SWITCH_FALSE;
+	}
+
+	/* +---------------+-----------+-----------+-------------------+
+	   | Configuration | Mode      | Bandwidth | Frame Sizes       |
+	   | Number(s)     |           |           |                   |
+	   +---------------+-----------+-----------+-------------------+
+	   | 0...3         | SILK-only | NB        | 10, 20, 40, 60 ms |
+	   | 4...7         | SILK-only | MB        | 10, 20, 40, 60 ms |
+	   | 8...11        | SILK-only | WB        | 10, 20, 40, 60 ms |
+	   | 12...13       | Hybrid    | SWB       | 10, 20 ms         |
+	   | 14...15       | Hybrid    | FB        | 10, 20 ms         |
+	   | 16...19       | CELT-only | NB        | 2.5, 5, 10, 20 ms |
+	   | 20...23       | CELT-only | WB        | 2.5, 5, 10, 20 ms |
+	   | 24...27       | CELT-only | SWB       | 2.5, 5, 10, 20 ms |
+	   | 28...31       | CELT-only | FB        | 2.5, 5, 10, 20 ms |
+	   +---------------+-----------+-----------+-------------------+ */
+
+	if (!packet_info->stereo) {
+		/* The routines opus_get_nb_flags_in_silk_frame and opus_get_silk_frame_ms_per_flag are also valid for stereo frames
+		 * yet the routine opus_get_VAD_LBRR_flags is currently only for mono frame */
+		silk_frame_nb_flags = switch_opus_get_nb_flags_in_silk_frame(packet_info->config); /* =1 for 10 or 20 ms frame;  = 2 for 40 ms; = 3 for 60 ms */
+		if (!silk_frame_nb_flags) {
+			/* We should not go there as CELT_ONLY is already tested above */
+			return SWITCH_FALSE;
+		}
+
+		packet_info->frames_silk = silk_frame_nb_flags;
+		silk_size_frame_ms_per_flag = switch_opus_get_silk_frame_ms_per_flag(packet_info->config, silk_frame_nb_flags); /* 10 or 20 ms frame*/
+		if (!silk_size_frame_ms_per_flag) {
+			/* we should not go there as CELT_ONLY is already tested above */
+			return SWITCH_FALSE;
+		}
+
+		ptr_LBBR_FLAGS = packet_LBBR_FLAGS;
+		ptr_VAD_FLAGS = packet_VAD_FLAGS;
+
+		for (f = 0; f < packet_info->frames; f++) {
+			switch_opus_get_VAD_LBRR_flags(frame_data[f], silk_frame_nb_flags, ptr_VAD_FLAGS, ptr_LBBR_FLAGS,
+										   &silk_frame_nb_vad1, &silk_frame_nb_fec);
+			packet_info->vad += silk_frame_nb_vad1;
+			packet_info->fec += silk_frame_nb_fec;
+			packet_info->vad_ms += silk_frame_nb_vad1 * silk_size_frame_ms_per_flag;
+			packet_info->fec_ms += silk_frame_nb_fec * silk_size_frame_ms_per_flag;
+
+			ptr_VAD_FLAGS += silk_frame_nb_flags;
+			ptr_LBBR_FLAGS += silk_frame_nb_flags;
+		}
+
+		/* store the VAD & LBRR flags of all 20 ms silk-frames of the packet; LSB the first frame, MSB: the last */
+		vad_flags_per_silk_frame = 0;
+		fec_flags_per_silk_frame = 0;
+		silk_frame_packet = packet_info->frames * packet_info->frames_silk;
+		if (silk_frame_packet > 15) {
+			if (debug) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "opus_packet_parse: more than %d 20-ms frames in the packet ; only first 15 silk-frames data will be stored (pb silkFastAccelerate)\n", silk_frame_packet);
+			}
+
+			silk_frame_packet = 15;
+		}
+
+		ptr_LBBR_FLAGS = packet_LBBR_FLAGS;
+		ptr_VAD_FLAGS = packet_VAD_FLAGS;
+		shift_silk = 0;
+		for (i = 0; i < silk_frame_packet; i++) {
+			vad_flags_per_silk_frame += (*ptr_VAD_FLAGS) << shift_silk;
+			fec_flags_per_silk_frame += (*ptr_LBBR_FLAGS) << shift_silk;
+			shift_silk++;
+			ptr_LBBR_FLAGS++; ptr_VAD_FLAGS++;
+		}
+
+		packet_info->vad_flags_per_silk_frame = vad_flags_per_silk_frame;
+		packet_info->fec_flags_per_silk_frame = fec_flags_per_silk_frame;
+
+		return SWITCH_TRUE;
+	}
+
+	if (packet_info->config != 1 && packet_info->config != 5 && packet_info->config != 9) {
+		if (debug) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "opus_packet_parse: the current parser implementation does not support muliple SILK frames for VAD or FEC detection.\n");
+		}
+
+		return SWITCH_FALSE;
+	}
+
+	/*
+	 *  Parse the VAD and LBRR flags in each Opus frame
+	 * */
+	for (f = 0; f < packet_info->frames; f++) {
+		if (frame_data[f][0] & 0x80) {
+			packet_info->vad++;
+		}
+
+		if (frame_data[f][0] & 0x40) {
+			packet_info->fec++;
+		}
+
+		if (debug) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "opus_packet_parse: LP layer opus_frame[%d] VAD[%d] FEC[%d]\n", f + 1, (frame_data[f][0] & 0x80) >> 7, (frame_data[f][0] & 0x40) >> 6);
+		}
+	}
+
+	packet_info->vad_ms = packet_info->vad * packet_info->ms_per_frame;
+	packet_info->fec_ms = packet_info->fec * packet_info->ms_per_frame;
+
+	return SWITCH_TRUE;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
diff --git a/src/mod/codecs/mod_opus/opus_parse.h b/src/mod/codecs/mod_opus/opus_parse.h
new file mode 100644
index 0000000000..7f1d144754
--- /dev/null
+++ b/src/mod/codecs/mod_opus/opus_parse.h
@@ -0,0 +1,69 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2023, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Julien Chavanton <jchavanton@gmail.com>
+ *
+ */
+
+#ifndef SWITCH_OPUS_PARSE_H
+#define SWITCH_OPUS_PARSE_H
+
+typedef enum { false, true } bool_t;
+
+typedef struct opus_packet_info {
+	int16_t vad;
+	int16_t vad_ms;
+	int16_t fec;
+	int16_t fec_ms;
+	bool_t stereo;
+	/* number of opus frames in the packet */
+	int16_t frames;
+	int16_t config;
+	int16_t channels;
+	int16_t ms_per_frame;
+	int32_t ptime_ts;
+	bool_t valid;
+	/* number of silk_frames in an opus frame */
+	int16_t frames_silk;
+	/* VAD flag of all 20 ms silk-frames of the packet; LSB the first frame, MSB: the last */
+	int16_t vad_flags_per_silk_frame;
+	/* LBRR (FEC) flag of all 20 ms silk-frames of the packet; LSB the first frame, MSB: the last */
+	int16_t fec_flags_per_silk_frame;
+} opus_packet_info_t;
+
+switch_bool_t switch_opus_packet_parse(const uint8_t *payload, int payload_length_bytes, opus_packet_info_t *packet_info, switch_bool_t debug);
+
+#endif /* SWITCH_OPUS_PARSE_H */
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
diff --git a/src/mod/codecs/mod_sangoma_codec/Makefile.am b/src/mod/codecs/mod_sangoma_codec/Makefile.am
deleted file mode 100644
index eff90fe297..0000000000
--- a/src/mod/codecs/mod_sangoma_codec/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_sangoma_codec
-
-mod_LTLIBRARIES = mod_sangoma_codec.la
-mod_sangoma_codec_la_SOURCES  = mod_sangoma_codec.c
-mod_sangoma_codec_la_CFLAGS   = $(AM_CFLAGS)
-mod_sangoma_codec_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_sangoma_codec_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lsngtc_node
diff --git a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c b/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
deleted file mode 100644
index 0eb9eac2fe..0000000000
--- a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
+++ /dev/null
@@ -1,1536 +0,0 @@
-/*
- * Copyright (c) 2010, Sangoma Technologies
- * Moises Silva <moy@sangoma.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of the original author; nor the names of any contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "switch.h"
-
-#include <sng_tc/sngtc_node.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sangoma_codec_shutdown);
-SWITCH_MODULE_DEFINITION(mod_sangoma_codec, mod_sangoma_codec_load, mod_sangoma_codec_shutdown, NULL);
-
-#define SANGOMA_SESS_HASH_KEY_FORMAT "sngtc%lu"
-
-/* it seemed we need higher PTIME than the calling parties, so we assume nobody will use higher ptime than 40 */
-#define SANGOMA_DEFAULT_SAMPLING_RATE 80
-#define SANGOMA_TRANSCODE_CONFIG "sangoma_codec.conf"
-
-/* \brief vocallos configuration */
-static sngtc_init_cfg_t g_init_cfg;
-
-/* configured RTP IP */
-static int g_rtpip = 0;
-
-static char g_soap_url[255] = "";
-
-/* \brief protect vocallo session creation and destroy */
-static switch_mutex_t *g_sessions_lock = NULL;
-
-/* \brief next unique session id (protected by g_sessions_lock) */
-unsigned long long g_next_session_id = 0;
-
-/* hash of sessions (I think a linked list suits better here, but FS does not have the data type) */
-static switch_hash_t *g_sessions_hash = NULL;
-
-typedef struct vocallo_codec_s {
-	int codec_id; /* vocallo codec ID */
-	int iana; /* IANA code to register in FS */
-	const char *iana_name; /* IANA name to register in FS */
-	const char *fs_name;
-	int maxms; /* max supported ms (WARNING: codec impl from 10ms up to this value will be registered if autoinit=1) */
-	int bps; /* bits per second */
-
-	/* following values must be set assuming frames of 10ms */
-	int mpf; /* microseconds per frame */
-	int spf; /* samples per frame */
-	int bpfd; /* bytes per frame decompressed */
-	int bpfc; /* bytes per frame compressed */
-
-	int sampling_rate; /* declared sampling rate */
-	int actual_sampling_rate; /* true sampling rate */
-	int autoinit; /* initialize on start loop or manually */
-} vocallo_codec_t;
-
-vocallo_codec_t g_codec_map[] =
-{
-	/* auto-init codecs */
-	{ SNGTC_CODEC_PCMU,      IANA_PCMU_A_8000_1,  "PCMU",    "Sangoma PCMU",      40, 64000,  10000, 80,  160, 80,  8000,  8000,  1 },
-	{ SNGTC_CODEC_PCMA,      IANA_PCMA_A_8000_1,  "PCMA",    "Sangoma PCMA",      40, 64000,  10000, 80,  160, 80,  8000,  8000,  1 },
-	{ SNGTC_CODEC_L16_1,     IANA_L16_A_8000_1,   "L16",     "Sangoma L16",       40, 120000, 10000, 80,  160, 160, 8000,  8000,  0 },
-	{ SNGTC_CODEC_L16_2,     IANA_L16_A_16000_1,  "L16",     "Sangoma L16 2",     40, 320000, 10000, 160, 320, 320, 16000, 16000, 0 },
-	{ SNGTC_CODEC_G726_32,   IANA_G726_32_8000_1, "G726-32", "Sangoma G.726 32k", 40, 32000,  10000, 80,  160, 40,  8000,  8000,  1 },
-	{ SNGTC_CODEC_G722,      IANA_G722_A_8000_1,  "G722",    "Sangoma G722",      20, 64000,  10000, 80,  160, 80,  8000,  8000, 1  },
-
-	/* manually initialized */
-	{ SNGTC_CODEC_GSM_FR,    IANA_GSM_A_8000_1,    "GSM",   "Sangoma GSM",    20, 13200, 20000, 160, 320, 33, 8000,  8000,  0 },
-	{ SNGTC_CODEC_G723_1_63, IANA_G723_A_8000_1,   "G723",  "Sangoma G723",   90, 6300,  30000, 240, 480, 24, 8000,  8000,  0 },
-	{ SNGTC_CODEC_G729AB,    IANA_G729_AB_8000_1,  "G729",  "Sangoma G729",   50, 8000,  10000, 80,  160, 10, 8000,  8000,  0 },
-	{ SNGTC_CODEC_AMR_1220,  IANA_AMR_A_8000_1,    "AMR",   "Sangoma AMR",    20, 12200, 20000, 160, 320, 0,  8000,  8000,  0 },
-	{ SNGTC_CODEC_SIREN7_24, IANA_SIREN7,          "G7221", "Sangoma G722.1", 20, 24000, 20000, 320, 640, 60, 16000, 16000, 0 },
-	{ SNGTC_CODEC_SIREN7_32, IANA_SIREN7,          "G7221", "Sangoma G722.1", 20, 32000, 20000, 320, 640, 80, 16000, 16000, 0 },
-	{ SNGTC_CODEC_ILBC_133,  IANA_ILBC_133_8000_1, "iLBC",  "Sangoma iLBC",   30, 13330, 30000, 240, 480, 50, 8000,  8000,  0 },
-	{ SNGTC_CODEC_ILBC_152,  IANA_ILBC_152_8000_1, "iLBC",  "Sangoma iLBC",   20, 15200, 20000, 160, 320, 38, 8000,  8000,  0 },
-	{ -1,                    -1,                   NULL,    NULL,             -1, -1,    -1,    -1,  -1,  -1, -1,    -1,    0 },
-};
-
-/* RFC3389 RTP Payload for Comfort Noise */
-#define IANACODE_CN 13
-
-/* default codec list to load, users may override, special codec 'all' registers everything available unless listed in noregister */
-static char g_codec_register_list[1024] = "G729";
-
-/* default codec list to NOT load, users may override */
-static char g_codec_noregister_list[1024] = "";
-
-#define SANGOMA_RTP_QUEUE_SIZE 4
-struct sangoma_rtp_payload {
-	uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	int32_t datalen;
-};
-
-struct codec_data {
-	/* sngtc request and reply */
-	sngtc_codec_request_t request;
-	sngtc_codec_reply_t reply;
-
-	/* rtp streams */
-	void *txrtp;
-	void *rxrtp;
-
-	/* packet counters */
-	unsigned long tx;
-	unsigned long rx;
-	unsigned long ticks;
-
-	/* Lost packets */
-  	long lastrxseqno;
-	unsigned long rxlost;
-
-	/* discarded silence packets */
-	unsigned long rxdiscarded;
-
-	/* avg Rx time */
-	switch_time_t avgrxus;
-	switch_time_t last_rx_time;
-	switch_time_t last_func_call_time;
-
-	/* RTP queue. The bigger the queue, the bigger the possible delay */
-	struct sangoma_rtp_payload rtp_queue[SANGOMA_RTP_QUEUE_SIZE];
-	uint8_t queue_windex;
-	uint8_t queue_rindex;
-	uint8_t queue_size;
-	uint8_t queue_max_ever;
-	unsigned debug_timing:1;
-};
-
-struct sangoma_transcoding_session {
-	/* unique session id */
-	unsigned long sessid;
-	char hashkey[25];
-
-	/* encoder and decoder */
-	struct codec_data encoder;
-	struct codec_data decoder;
-
-	/* codec implementation */
-	const switch_codec_implementation_t *impl;
-
-	/* memory pool */
-	switch_memory_pool_t *pool;
-};
-
-static int codec_id_to_iana(int codec_id)
-{
-	int i;
-	for (i = 0; g_codec_map[i].codec_id != -1; i++) {
-		if (codec_id == g_codec_map[i].codec_id) {
-			return g_codec_map[i].iana;
-		}
-	}
-	return -1;
-}
-
-static vocallo_codec_t *get_codec_from_iana(int iana, int bitrate)
-{
-	int i;
-	for (i = 0; g_codec_map[i].codec_id != -1; i++) {
-		if (iana == g_codec_map[i].iana && !bitrate) {
-			return &g_codec_map[i];
-		}
-		if (iana == g_codec_map[i].iana && bitrate == g_codec_map[i].bps) {
-			return &g_codec_map[i];
-		}
-	}
-	return NULL;
-}
-
-static vocallo_codec_t *get_codec_from_id(int id)
-{
-	int i;
-	for (i = 0; g_codec_map[i].codec_id != -1; i++) {
-		if (id == g_codec_map[i].codec_id) {
-			return &g_codec_map[i];
-		}
-	}
-	return NULL;
-}
-
-static int sangoma_create_rtp_port(void *usr_priv, uint32_t host_ip, uint32_t *p_rtp_port, void **rtp_fd)
-{
-	struct in_addr local_ip_addr = { 0 };
-	char local_ip[255];
-	switch_port_t rtp_port;
-
-	local_ip_addr.s_addr = htonl(host_ip);
-
-	switch_inet_ntop(AF_INET, &local_ip_addr, local_ip, sizeof(local_ip));
-
-	/* request a port */
-	if (!(rtp_port = switch_rtp_request_port(local_ip))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate RTP port for IP %s\n", local_ip);
-		return -1;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New allocated port %d for IP %s/%d.%d.%d.%d\n", rtp_port, local_ip,
-			SNGTC_NIPV4(host_ip));
-	*p_rtp_port = rtp_port;
-	*rtp_fd = NULL;
-	return 0;
-}
-
-static int sangoma_release_rtp_port(void *usr_priv, uint32_t host_ip, uint32_t p_rtp_port, void *rtp_fd)
-{
-	struct in_addr local_ip_addr = { 0 };
-	char local_ip[255];
-	switch_port_t rtp_port = p_rtp_port;
-
-	local_ip_addr.s_addr = htonl(host_ip);
-
-	switch_inet_ntop(AF_INET, &local_ip_addr, local_ip, sizeof(local_ip));
-
-	/* release the port */
-	switch_rtp_release_port(local_ip, rtp_port);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Released port %d for IP %s/%d.%d.%d.%d\n", rtp_port, local_ip,
-			SNGTC_NIPV4(host_ip));
-	return 0;
-}
-
-static int sangoma_create_rtp(void *usr_priv, sngtc_codec_request_leg_t *codec_req_leg, sngtc_codec_reply_leg_t* codec_reply_leg, void **rtp_fd)
-{
-	switch_status_t status;
-	switch_memory_pool_t *sesspool = NULL;
-	switch_rtp_t *rtp_session = NULL;
-	char codec_ip[255];
-	switch_rtp_flag_t flags[SWITCH_RTP_FLAG_INVALID] = {0};
-	int iana = 0;
-	const char *err = NULL;
-	struct in_addr local_ip_addr = { 0 };
-	char local_ip[255];
-	switch_port_t rtp_port;
-	struct sangoma_transcoding_session *sess = usr_priv;
-
-	rtp_port = codec_req_leg->host_udp_port;
-	*rtp_fd = NULL;
-
-	/*
-	 * We *MUST* use a new pool
-	 * Do not use the session pool since the session may go away while the RTP socket should linger around
-	 * until sangoma_transcode decides to kill it (possibly because the same RTP session is used for a different call)
-	 * also do not use the module pool otherwise memory would keep growing because switch_rtp_destroy does not
-	 * free the memory used (is assumed it'll be freed when the pool is destroyed)
-	 */
-	status = switch_core_new_memory_pool(&sesspool);
-	if (status != SWITCH_STATUS_SUCCESS) {
-		return -1;
-	}
-
-	local_ip_addr.s_addr = htonl(codec_req_leg->host_ip);
-	switch_inet_ntop(AF_INET, &local_ip_addr, local_ip, sizeof(local_ip));
-	sngtc_codec_ipv4_hex_to_str(codec_reply_leg->codec_ip, codec_ip);
-
-	iana = codec_id_to_iana(codec_req_leg->codec_id);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Creating RTP session for host (%s/%d)  vocallo(%s/%d) Iana=%d CodecId=%d ms=%d idx=%lu\n",
-					  local_ip, rtp_port, codec_ip, codec_reply_leg->codec_udp_port, iana, codec_req_leg->codec_id,
-					  codec_req_leg->ms*1000, sess->sessid);
-
-	/* create the RTP socket */
-	rtp_session = switch_rtp_new(local_ip, rtp_port,
-			codec_ip, codec_reply_leg->codec_udp_port,
-			iana,
-			sess->impl->samples_per_packet,
-			codec_req_leg->ms * 1000, /* microseconds per packet */
-								 flags, NULL, &err, sesspool, 0, 0);
-
-	if (!rtp_session) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to create switch rtp session: %s\n", err);
-		switch_core_destroy_memory_pool(&sesspool);
-		return -1;
-	}
-	switch_rtp_set_private(rtp_session, sesspool);
-	*rtp_fd = rtp_session;
-
-	return 0;
-}
-
-static int sangoma_destroy_rtp(void *usr_priv, void *fd)
-{
-	switch_memory_pool_t *sesspool;
-	switch_rtp_t *rtp = fd;
-	if (!rtp) {
-		return 0;
-	}
-	sesspool = switch_rtp_get_private(rtp);
-	switch_rtp_destroy(&rtp);
-	switch_core_destroy_memory_pool(&sesspool);
-	return 0;
-}
-
-static switch_status_t switch_sangoma_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-	uint32_t encoding, decoding;
-	struct sangoma_transcoding_session *sess = NULL;
-	vocallo_codec_t *vcodec;
-
-	encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-	decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sangoma init called (encoding = %d, decoding = %d, iana = %d)\n", encoding ? 1 : 0, decoding ? 1 : 0, codec->implementation->ianacode);
-
-	if (!(encoding || decoding)) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (!(sess = switch_core_alloc(codec->memory_pool, sizeof(*sess)))) {
-		return SWITCH_STATUS_FALSE;
-	}
-	sess->encoder.lastrxseqno = -1;
-	sess->decoder.lastrxseqno = -1;
-
-	sess->pool = codec->memory_pool;
-	sess->impl = codec->implementation;
-	switch_assert(sess->pool);
-	switch_assert(sess->impl);
-
-	vcodec = get_codec_from_iana(codec->implementation->ianacode, codec->implementation->bits_per_second);
-
-	if (encoding) {
-		sess->encoder.request.usr_priv = sess;
-		sess->encoder.request.a.host_ip = g_rtpip;
-		sess->encoder.request.a.codec_id = vcodec->actual_sampling_rate == 16000
-			                         ? SNGTC_CODEC_L16_2 : SNGTC_CODEC_L16_1;
-		sess->encoder.request.a.ms = codec->implementation->microseconds_per_packet/1000;
-
-		sess->encoder.request.b.host_ip = g_rtpip;
-		sess->encoder.request.b.codec_id = vcodec->codec_id;
-		sess->encoder.request.b.ms = codec->implementation->microseconds_per_packet/1000;
-	}
-
-	if (decoding) {
-		sess->decoder.request.usr_priv = sess;
-		sess->decoder.request.a.host_ip = g_rtpip;
-		sess->decoder.request.a.codec_id = vcodec->codec_id;
-		sess->decoder.request.a.ms = codec->implementation->microseconds_per_packet/1000;
-
-		sess->decoder.request.b.host_ip = g_rtpip;
-		sess->decoder.request.b.codec_id = vcodec->actual_sampling_rate == 16000
-			                         ? SNGTC_CODEC_L16_2 : SNGTC_CODEC_L16_1;
-		sess->decoder.request.b.ms = codec->implementation->microseconds_per_packet/1000;
-
-	}
-
-	switch_mutex_lock(g_sessions_lock);
-
-	sess->sessid = g_next_session_id++;
-	switch_snprintf(sess->hashkey, sizeof(sess->hashkey), SANGOMA_SESS_HASH_KEY_FORMAT, sess->sessid);
-	switch_core_hash_insert(g_sessions_hash, sess->hashkey, sess);
-
-	switch_mutex_unlock(g_sessions_lock);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sangoma init done for codec %s/%s, iana = %d\n", codec->implementation->iananame, vcodec->fs_name, codec->implementation->ianacode);
-	codec->private_info = sess;
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_sangoma_init_ilbc(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-	int mode = codec->implementation->microseconds_per_packet / 1000;
-	if (codec->fmtp_in) {
-		int x, argc;
-		char *argv[10];
-		argc = switch_separate_string(codec->fmtp_in, ';', argv, (sizeof(argv) / sizeof(argv[0])));
-		for (x = 0; x < argc; x++) {
-			char *data = argv[x];
-			char *arg;
-			switch_assert(data);
-			while (*data == ' ') {
-				data++;
-			}
-			if ((arg = strchr(data, '='))) {
-				*arg++ = '\0';
-				if (!strcasecmp(data, "mode")) {
-					mode = atoi(arg);
-				}
-			}
-		}
-	}
-	codec->fmtp_out = switch_core_sprintf(codec->memory_pool, "mode=%d", mode);
-	return switch_sangoma_init(codec, flags, codec_settings);
-}
-
-static switch_status_t switch_sangoma_init_siren7(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-	int bit_rate = codec->implementation->bits_per_second;
-	codec->fmtp_out = switch_core_sprintf(codec->memory_pool, "bitrate=%d", bit_rate);
-	return switch_sangoma_init(codec, flags, codec_settings);
-}
-
-static switch_status_t switch_sangoma_init_g729(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-	if (codec->fmtp_in) {
-		codec->fmtp_out = switch_core_strdup(codec->memory_pool, codec->fmtp_in);
-	}
-
-	return switch_sangoma_init(codec, flags, codec_settings);
-}
-
-static void flush_rtp(switch_rtp_t *rtp)
-{
-	switch_status_t sres;
-	switch_frame_t read_frame;
-	int flushed = 0;
-	int sanity = 1000;
-	while (sanity--) {
-		sres = switch_rtp_zerocopy_read_frame(rtp, &read_frame, SWITCH_IO_FLAG_NOBLOCK);
-		if (sres == SWITCH_STATUS_GENERR) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read on Sangoma encoder RTP session while flushing: %d\n", sres);
-			return;
-		}
-		if (!read_frame.datalen) {
-			break;
-		}
-		flushed++;
-	}
-	if (!sanity) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Insanely big UDP queue!\n");
-	}
-}
-
-#define SAFE_INDEX_INC(array, index) \
-		(index)++; \
-		if ((index) == switch_arraylen((array))) { \
-			(index) = 0; \
-		}
-
-static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec_t *other_codec,	/* codec that was used by the other side */
-										  void *decoded_data,	/* decoded data that we must encode */
-										  uint32_t decoded_data_len /* decoded data length */ ,
-										  uint32_t decoded_rate /* rate of the decoded data */ ,
-										  void *encoded_data,	/* here we will store the encoded data */
-										  uint32_t *encoded_data_len,	/* here we will set the length of the encoded data */
-										  uint32_t *encoded_rate /* here we will set the rate of the encoded data */ ,
-										  unsigned int *flag /* frame flag, see switch_frame_flag_enum_t */ )
-{
-	/* FS core checks the actual samples per second and microseconds per packet to determine the buffer size in the worst case scenario, no need to check
-	 * whether the buffer passed in by the core (encoded_data) will be big enough */
-	switch_frame_t linear_frame;
-	switch_frame_t encoded_frame;
-	switch_status_t sres = SWITCH_STATUS_FALSE;
-	uint16_t decoded_byteswapped_data[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	uint16_t *decoded_data_linear = decoded_data;
-	switch_time_t now_time = 0, difftime = 0;
-	switch_time_t func_start_time = 0, func_end_time = 0;
-	int i = 0;
-	int res = 0;
-	int linear_payload = codec->implementation->actual_samples_per_second == 8000 ? IANA_L16_A_8000_1 : IANA_L16_A_16000_1;
-	struct sangoma_transcoding_session *sess = codec->private_info;
-
-	if (sess->encoder.debug_timing) {
-		func_start_time =  switch_micro_time_now();
-	}
-
-	sess->encoder.ticks++;
-
-	/* start assuming we will not encode anything */
-	*encoded_data_len = 0;
-
-	/* initialize on first use */
-	if (!sess->encoder.txrtp) {
-		int err = 0;
-		switch_mutex_lock(g_sessions_lock);
-		err = sngtc_create_transcoding_session(&sess->encoder.request, &sess->encoder.reply, 0);
-		if (err) {
-			memset(&sess->encoder, 0, sizeof(sess->encoder));
-			switch_mutex_unlock(g_sessions_lock);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create Sangoma encoding session.\n");
-			return SWITCH_STATUS_FALSE;
-		}
-		sess->encoder.txrtp = sess->encoder.reply.tx_fd;
-		sess->encoder.rxrtp = sess->encoder.reply.rx_fd;
-		switch_mutex_unlock(g_sessions_lock);
-		flush_rtp(sess->encoder.rxrtp);
-	}
-
-	if (sess->encoder.debug_timing && sess->encoder.last_func_call_time) {
-		difftime = func_start_time - sess->encoder.last_func_call_time;
-		if (difftime > 25000 || difftime < 15000) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%ldus since last read on encoding session %lu\n", (long)difftime, sess->sessid);
-		}
-	}
-
-	/* do the writing */
-	memset(&linear_frame, 0, sizeof(linear_frame));
-	linear_frame.source = __SWITCH_FUNC__;
-	linear_frame.data = decoded_byteswapped_data;
-	linear_frame.datalen = decoded_data_len;
-	linear_frame.payload = linear_payload;
-
-	/* copy and byte-swap */
-	for (i = 0; i < decoded_data_len/2; i++) {
-		decoded_byteswapped_data[i] = (decoded_data_linear[i] << 8) | (decoded_data_linear[i] >> 8);
-	}
-
-
-	res = switch_rtp_write_frame(sess->encoder.txrtp, &linear_frame);
-	if (-1 == res) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to Sangoma encoder RTP session.\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (res < i) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-				"Requested to write %d bytes to Sangoma encoder RTP session, but wrote %d bytes.\n", i, res);
-		return SWITCH_STATUS_FALSE;
-	}
-	sess->encoder.tx++;
-
-	/* do the reading */
-	for ( ; ; ) {
-#if 0
-		prevread_time = switch_micro_time_now();
-#endif
-		sres = switch_rtp_zerocopy_read_frame(sess->encoder.rxrtp, &encoded_frame, SWITCH_IO_FLAG_NOBLOCK);
-		if (sres == SWITCH_STATUS_GENERR) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read on Sangoma encoder RTP session: %d\n", sres);
-			return SWITCH_STATUS_FALSE;
-		}
-
-#if 0
-		afterread_time = switch_micro_time_now();
-		difftime = afterread_time - prevread_time;
-		if (difftime > 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%ldus to read on encoding session %lu.\n", (long)difftime, sess->sessid);
-		}
-#endif
-		if (0 == encoded_frame.datalen) {
-			break;
-		}
-
-		if (encoded_frame.payload == IANACODE_CN) {
-			/* confort noise is treated as silence by us */
-			continue;
-		}
-
-		if (codec->implementation->encoded_bytes_per_packet && encoded_frame.datalen != codec->implementation->encoded_bytes_per_packet) {
-			/* seen when silence suppression is enabled */
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ignoring encoded frame of %d bytes intead of %d bytes\n", encoded_frame.datalen, codec->implementation->encoded_bytes_per_packet);
-			continue;
-		}
-
-		if (encoded_frame.payload != codec->implementation->ianacode) {
-			if (sess->encoder.request.b.codec_id == SNGTC_CODEC_ILBC_152 || sess->encoder.request.b.codec_id == SNGTC_CODEC_ILBC_133) {
-				/* since we moved to SOAP based communications, the mapping between vocallo IANA and our IANA does not work,
-				 * some codecs checks cannot be completely done, like iLBC */
-				if (encoded_frame.payload != IANA_ILBC_152_8000_1 && encoded_frame.payload != IANA_ILBC_133_8000_1) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma encoder RTP session, expecting either %d or %d\n",
-							encoded_frame.payload, IANA_ILBC_152_8000_1, IANA_ILBC_133_8000_1);
-					break;
-				}
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma encoder RTP session, expecting %d\n",
-						encoded_frame.payload, codec->implementation->ianacode);
-				break;
-			}
-		}
-
-		if (sess->encoder.queue_windex == sess->encoder.queue_rindex) {
-			if (sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen) {
-				/* if there is something where we want to write, we're dropping it */
-				sess->encoder.rxdiscarded++;
-#if 0
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding encoded frame of %d bytes from RTP session %lu, windex = %d, rindex = %d\n",
-						sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen, sess->sessid, sess->encoder.queue_windex, sess->encoder.queue_rindex);
-#endif
-				SAFE_INDEX_INC(sess->encoder.rtp_queue, sess->encoder.queue_rindex);
-				sess->encoder.queue_size--;
-			}
-		}
-
-		memcpy(sess->encoder.rtp_queue[sess->encoder.queue_windex].data, encoded_frame.data, encoded_frame.datalen);
-		sess->encoder.rtp_queue[sess->encoder.queue_windex].datalen = encoded_frame.datalen;
-		SAFE_INDEX_INC(sess->encoder.rtp_queue, sess->encoder.queue_windex);
-
-		/* monitor the queue size */
-		sess->encoder.queue_size++;
-		if (sess->encoder.queue_size > sess->encoder.queue_max_ever) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoder Rx queue for RTP session %lu is now %d, windex = %d, rindex = %d\n", sess->sessid, sess->encoder.queue_size,
-					sess->encoder.queue_windex, sess->encoder.queue_rindex);
-			sess->encoder.queue_max_ever = sess->encoder.queue_size;
-		}
-	}
-
-	/* update encoding stats if we have a frame to give */
-	if (sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen) {
-		sess->encoder.rx++;
-		now_time = switch_micro_time_now();
-		if (!sess->encoder.last_rx_time) {
-			sess->encoder.last_rx_time = now_time;
-		} else {
-			difftime = now_time - sess->encoder.last_rx_time;
-			sess->encoder.avgrxus = sess->encoder.avgrxus ? ((sess->encoder.avgrxus + difftime)/2) : difftime;
-			sess->encoder.last_rx_time  = now_time;
-		}
-
-		/* check sequence and bump lost rx packets count if needed */
-		if (sess->encoder.lastrxseqno >= 0) {
-			if (encoded_frame.seq > (sess->encoder.lastrxseqno + 2) ) {
-				sess->encoder.rxlost += encoded_frame.seq - sess->encoder.lastrxseqno - 1;
-			}
-		}
-		sess->encoder.lastrxseqno = encoded_frame.seq;
-
-		/* pop the data from the queue */
-		*encoded_data_len = sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen;
-		memcpy(encoded_data, sess->encoder.rtp_queue[sess->encoder.queue_rindex].data, *encoded_data_len);
-		sess->encoder.rtp_queue[sess->encoder.queue_rindex].datalen = 0;
-		SAFE_INDEX_INC(sess->encoder.rtp_queue, sess->encoder.queue_rindex);
-		sess->encoder.queue_size--;
-		if (codec->implementation->encoded_bytes_per_packet && *encoded_data_len != codec->implementation->encoded_bytes_per_packet) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Returning odd encoded frame of %d bytes intead of %d bytes\n", *encoded_data_len, codec->implementation->encoded_bytes_per_packet);
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output from sangoma encoder\n");
-	}
-
-	if (sess->encoder.debug_timing) {
-		func_end_time = switch_micro_time_now();
-		difftime = func_end_time - func_start_time;
-		if (difftime > 5000) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%ldus to execute encoding function in session %lu.\n", (long)difftime, sess->sessid);
-		}
-		sess->encoder.last_func_call_time = func_end_time;
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_sangoma_decode(switch_codec_t *codec,	/* codec session handle */
-										  switch_codec_t *other_codec,	/* what is this? */
-										  void *encoded_data,	/* data that we must decode into slinear and put it in decoded_data */
-										  uint32_t encoded_data_len,	/* length in bytes of the encoded data */
-										  uint32_t encoded_rate,	/* at which rate was the data encoded */
-										  void *decoded_data,	/* buffer where we must put the decoded data */
-										  uint32_t *decoded_data_len,	/* we must set this value to the size of the decoded data */
-										  uint32_t *decoded_rate,	/* rate of the decoded data */
-										  unsigned int *flag /* frame flag, see switch_frame_flag_enum_t */ )
-{
-	/* FS core checks the actual samples per second and microseconds per packet to determine the buffer size in the worst case scenario, no need to check
-	 * whether the buffer passed in by the core will be enough */
-	switch_frame_t encoded_frame;
-	switch_frame_t linear_frame;
-	switch_status_t sres = SWITCH_STATUS_FALSE;
-	switch_time_t now_time = 0, difftime = 0;
-	switch_time_t func_start_time = 0, func_end_time = 0;
-	uint16_t *dbuf_linear;
-	uint16_t *linear_frame_data;
-	uint16_t *rtp_data_linear;
-	int res = 0;
-	int i = 0;
-	int linear_payload = codec->implementation->actual_samples_per_second == 8000 ? IANA_L16_A_8000_1 : IANA_L16_A_16000_1;
-	struct sangoma_transcoding_session *sess = codec->private_info;
-
-	if (sess->decoder.debug_timing) {
-		func_start_time =  switch_micro_time_now();
-	}
-
-	dbuf_linear = decoded_data;
-	sess->decoder.ticks++;
-
-	/* start assuming we will not decode anything */
-	*decoded_data_len = 0;
-	if (*flag & SWITCH_CODEC_FLAG_SILENCE) {
-		memset(dbuf_linear, 0, codec->implementation->decoded_bytes_per_packet);
-		*decoded_data_len = codec->implementation->decoded_bytes_per_packet;
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Returned silence on request\n");
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	/* initialize on first use */
-	if (!sess->decoder.txrtp) {
-		int err = 0;
-		switch_mutex_lock(g_sessions_lock);
-		err = sngtc_create_transcoding_session(&sess->decoder.request, &sess->decoder.reply, 0);
-		if (err) {
-			memset(&sess->decoder, 0, sizeof(sess->decoder));
-			switch_mutex_unlock(g_sessions_lock);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create Sangoma decoding session.\n");
-			return SWITCH_STATUS_FALSE;
-		}
-		sess->decoder.txrtp = sess->decoder.reply.tx_fd;
-		sess->decoder.rxrtp = sess->decoder.reply.rx_fd;
-		switch_mutex_unlock(g_sessions_lock);
-		flush_rtp(sess->decoder.rxrtp);
-	}
-
-	if (sess->decoder.debug_timing && sess->decoder.last_func_call_time) {
-		difftime = func_start_time - sess->decoder.last_func_call_time;
-		if (difftime > 25000 || difftime < 15000) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%ldms since last read on decoding session %lu.\n", (long)difftime, sess->sessid);
-		}
-	}
-
-	/* do the writing */
-	memset(&encoded_frame, 0, sizeof(encoded_frame));
-	encoded_frame.source = __SWITCH_FUNC__;
-	encoded_frame.data = encoded_data;
-	encoded_frame.datalen = encoded_data_len;
-	encoded_frame.payload = codec->implementation->ianacode;
-
-	res = switch_rtp_write_frame(sess->decoder.txrtp, &encoded_frame);
-	if (-1 == res) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to Sangoma decoder RTP session.\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (res < encoded_data_len) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-				"Requested to write %d bytes to Sangoma decoder RTP session, but wrote %d bytes.\n",
-			       	encoded_data_len, res);
-		return SWITCH_STATUS_FALSE;
-	}
-	sess->decoder.tx++;
-
-	/* do the reading */
-	for ( ; ; ) {
-#if 0
-		prevread_time = switch_micro_time_now();
-#endif
-		sres = switch_rtp_zerocopy_read_frame(sess->decoder.rxrtp, &linear_frame, SWITCH_IO_FLAG_NOBLOCK);
-		if (sres == SWITCH_STATUS_GENERR) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read on Sangoma decoder RTP session: %d\n", sres);
-			return SWITCH_STATUS_FALSE;
-		}
-
-#if 0
-		afterread_time = switch_micro_time_now();
-		difftime = afterread_time - prevread_time;
-		if (difftime > 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%ldus to read on decoding session %lu.\n", (long)difftime, sess->sessid);
-		}
-#endif
-		if (0 == linear_frame.datalen) {
-			break;
-		}
-
-		if (linear_frame.payload == IANACODE_CN) {
-			/* confort noise is treated as silence by us */
-			continue;
-		}
-
-		if (linear_frame.payload != linear_payload) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma decoder RTP session, expecting %d\n",
-					linear_frame.payload, linear_payload);
-			break;
-		}
-
-
-		if (sess->decoder.queue_windex == sess->decoder.queue_rindex) {
-			if (sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen) {
-				/* if there is something where we want to write, we're dropping it */
-				sess->decoder.rxdiscarded++;
-#if 0
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding decoded frame of %d bytes from RTP session %lu, windex = %d, rindex = %d\n",
-						sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen, sess->sessid, sess->decoder.queue_windex, sess->decoder.queue_rindex);
-#endif
-				SAFE_INDEX_INC(sess->decoder.rtp_queue, sess->decoder.queue_rindex);
-				sess->decoder.queue_size--;
-			}
-		}
-
-		/* byteswap the received data */
-		rtp_data_linear = (unsigned short *)sess->decoder.rtp_queue[sess->decoder.queue_windex].data;
-		linear_frame_data = linear_frame.data;
-		for (i = 0; i < linear_frame.datalen/2; i++) {
-			rtp_data_linear[i] = (linear_frame_data[i] << 8) | (linear_frame_data[i] >> 8);
-		}
-		sess->decoder.rtp_queue[sess->decoder.queue_windex].datalen = linear_frame.datalen;
-
-		SAFE_INDEX_INC(sess->decoder.rtp_queue, sess->decoder.queue_windex);
-
-		/* monitor the queue size */
-		sess->decoder.queue_size++;
-		if (sess->decoder.queue_size > sess->decoder.queue_max_ever) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoder Rx queue for RTP session %lu is now %d, windex = %d, rindex = %d\n", sess->sessid, sess->decoder.queue_size,
-					sess->decoder.queue_windex, sess->decoder.queue_rindex);
-			sess->decoder.queue_max_ever = sess->decoder.queue_size;
-		}
-	}
-
-	if (sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen) {
-		/* update decoding stats */
-		sess->decoder.rx++;
-
-		now_time = switch_micro_time_now();
-		if (!sess->decoder.last_rx_time) {
-			sess->decoder.last_rx_time = now_time;
-		} else {
-			difftime = now_time - sess->decoder.last_rx_time;
-			sess->decoder.avgrxus = sess->decoder.avgrxus ? ((sess->decoder.avgrxus + difftime)/2) : difftime;
-			sess->decoder.last_rx_time = now_time;
-		}
-
-		/* check sequence and bump lost rx packets count if needed */
-		if (sess->decoder.lastrxseqno >= 0) {
-			if (linear_frame.seq > (sess->decoder.lastrxseqno + 2) ) {
-				sess->decoder.rxlost += linear_frame.seq - sess->decoder.lastrxseqno - 1;
-			}
-		}
-		sess->decoder.lastrxseqno = linear_frame.seq;
-
-		/* pop the data from the queue */
-		memcpy(dbuf_linear, sess->decoder.rtp_queue[sess->decoder.queue_rindex].data, sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen);
-		*decoded_data_len = sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen;
-		sess->decoder.rtp_queue[sess->decoder.queue_rindex].datalen = 0;
-		SAFE_INDEX_INC(sess->decoder.rtp_queue, sess->decoder.queue_rindex);
-		sess->decoder.queue_size--;
-
-		if (*decoded_data_len != codec->implementation->decoded_bytes_per_packet) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Returning odd decoded frame of %d bytes intead of %d bytes\n", *decoded_data_len, codec->implementation->decoded_bytes_per_packet);
-		}
-	} else {
-		*decoded_data_len = codec->implementation->decoded_bytes_per_packet;
-		memset(dbuf_linear, 0, *decoded_data_len);
-	}
-
-	if (sess->decoder.debug_timing) {
-		func_end_time = switch_micro_time_now();
-		difftime = func_end_time - func_start_time;
-		if (difftime > 5000) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%ldus to execute decoding function in session %lu.\n", (long)difftime, sess->sessid);
-		}
-		sess->decoder.last_func_call_time = func_end_time;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_sangoma_destroy(switch_codec_t *codec)
-{
-	struct sangoma_transcoding_session *sess = codec->private_info;
-	/* things that you may do here is closing files, sockets or other resources used during the codec session
-	 * no need to free memory allocated from the pool though, the owner of the pool takes care of that */
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sangoma destroy called.\n");
-
-	switch_mutex_lock(g_sessions_lock);
-
-	if (sess->encoder.txrtp) {
-		sngtc_free_transcoding_session(&sess->encoder.reply);
-	}
-	if (sess->decoder.txrtp) {
-		sngtc_free_transcoding_session(&sess->decoder.reply);
-	}
-
-	switch_core_hash_delete(g_sessions_hash, sess->hashkey);
-	memset(sess, 0, sizeof(*sess));
-
-	switch_mutex_unlock(g_sessions_lock);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static struct sangoma_transcoding_session *sangoma_find_session(unsigned long sessid)
-{
-	char hashkey[50];
-	snprintf(hashkey, sizeof(hashkey), SANGOMA_SESS_HASH_KEY_FORMAT, sessid);
-	return switch_core_hash_find(g_sessions_hash, hashkey);
-}
-
-static void sangoma_print_stats(switch_stream_handle_t *stream, switch_rtp_numbers_t *stats)
-{
-	stream->write_function(stream, "Raw bytes: %lu\n", stats->raw_bytes);
-	stream->write_function(stream, "Media bytes: %lu\n", stats->media_bytes);
-	stream->write_function(stream, "Packet count: %lu\n", stats->packet_count);
-	stream->write_function(stream, "Media packet count: %lu\n", stats->media_packet_count);
-	stream->write_function(stream, "Skip packet count: %lu\n", stats->skip_packet_count);
-	stream->write_function(stream, "Jitter buffer packet count: %lu\n", stats->jb_packet_count);
-	stream->write_function(stream, "DTMF packet count: %lu\n", stats->dtmf_packet_count);
-	stream->write_function(stream, "CNG packet count: %lu\n", stats->cng_packet_count);
-	stream->write_function(stream, "Flush packet count: %lu\n\n\n", stats->flush_packet_count);
-}
-
-#define SANGOMA_SYNTAX "settings|sessions|stats <session>|debug <session>|nodebug <session>"
-SWITCH_STANDARD_API(sangoma_function)
-{
-	char *argv[10] = { 0 };
-	int argc = 0;
-	char *mycmd = NULL;
-	switch_bool_t locked = SWITCH_FALSE;
-
-	if (zstr(cmd)) {
-		stream->write_function(stream, "%s", SANGOMA_SYNTAX);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (!(mycmd = strdup(cmd))) {
-		return SWITCH_STATUS_MEMERR;
-	}
-
-	if (!(argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) || !argv[0]) {
-		stream->write_function(stream, "%s", SANGOMA_SYNTAX);
-		switch_safe_free(mycmd);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	/* Most operations in this API require the global session lock anyways since sessions can disappear at any moment ... */
-	switch_mutex_lock(g_sessions_lock);
-	locked = SWITCH_TRUE;
-
-	if (!strcasecmp(argv[0], "settings")) {
-		char addrbuff[50];
-		int addr;
-		addr = htonl(g_rtpip);
-		stream->write_function(stream, "\tRTP IP Address: %s\n",
-				switch_inet_ntop(AF_INET, &addr, addrbuff, sizeof(addrbuff)));
-	} else if (!strcasecmp(argv[0], "sessions")) {
-		/* iterate over sessions hash */
-		switch_hash_index_t *hi;
-		const void *var;
-		void *val;
-		unsigned totalsess = 0;
-#define STATS_FORMAT "%-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-15.15s %-15.15s\n"
-		stream->write_function(stream, STATS_FORMAT,
-				"Session", "Codec", "Enc", "Dec", "Enc Tx", "Enc Rx", "Dec Tx", "Dec Rx", "Enc Lost", "Dec Lost", "Enc AvgRxMs", "Dec AvgRxMs");
-		for (hi = switch_core_hash_first(g_sessions_hash); hi; hi = switch_core_hash_next(&hi)) {
-			struct sangoma_transcoding_session *sess;
-			char sessid_str[25];
-			char encoder_tx_str[25];
-			char encoder_rx_str[25];
-			char decoder_tx_str[25];
-			char decoder_rx_str[25];
-			char encoder_lostrx_str[25];
-			char decoder_lostrx_str[25];
-			char encoder_avgrxus_str[25];
-			char decoder_avgrxus_str[25];
-
-			switch_core_hash_this(hi, &var, NULL, &val);
-			sess = val;
-
-			snprintf(sessid_str, sizeof(sessid_str), "%lu", sess->sessid);
-			snprintf(encoder_tx_str, sizeof(encoder_tx_str), "%lu", sess->encoder.tx);
-			snprintf(encoder_rx_str, sizeof(encoder_rx_str), "%lu", sess->encoder.rx);
-			snprintf(decoder_tx_str, sizeof(decoder_tx_str), "%lu", sess->decoder.tx);
-			snprintf(decoder_rx_str, sizeof(decoder_rx_str), "%lu", sess->decoder.rx);
-			snprintf(encoder_lostrx_str, sizeof(encoder_lostrx_str), "%lu", sess->encoder.rxlost);
-			snprintf(decoder_lostrx_str, sizeof(decoder_lostrx_str), "%lu", sess->decoder.rxlost);
-			snprintf(encoder_avgrxus_str, sizeof(encoder_avgrxus_str), "%ld", (long)(sess->encoder.avgrxus/1000));
-			snprintf(decoder_avgrxus_str, sizeof(encoder_avgrxus_str), "%ld", (long)(sess->decoder.avgrxus/1000));
-
-
-			stream->write_function(stream, STATS_FORMAT,
-					sessid_str,
-					sess->impl->iananame,
-					sess->encoder.txrtp ? "Yes" : "No",
-					sess->decoder.txrtp ? "Yes" : "No",
-					encoder_tx_str,
-					encoder_rx_str,
-					decoder_tx_str,
-					decoder_rx_str,
-					encoder_lostrx_str,
-					decoder_lostrx_str,
-					encoder_avgrxus_str,
-					decoder_avgrxus_str);
-			totalsess++;
-		}
-		stream->write_function(stream, "Total sessions: %d\n", totalsess);
-	} else if (!strcasecmp(argv[0], "stats")) {
-		struct sangoma_transcoding_session *sess;
-		unsigned long sessid = 0;
-		switch_rtp_stats_t *stats = NULL;
-		int ret = 0;
-		if (argc < 2) {
-			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
-			goto done;
-		}
-		ret = sscanf(argv[1], "%lu", &sessid);
-		if (ret != 1) {
-			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
-			goto done;
-		}
-
-		sess = sangoma_find_session(sessid);
-		if (!sess) {
-			stream->write_function(stream, "Failed to find session %lu\n", sessid);
-			goto done;
-		}
-		stream->write_function(stream, "Stats for transcoding session: %lu\n", sessid);
-
-		if (sess->encoder.rxrtp) {
-			stats = switch_rtp_get_stats(sess->encoder.rxrtp, NULL);
-			stream->write_function(stream, "=== %s Encoder ===\n", sess->impl->iananame);
-
-			stream->write_function(stream, "Tx L16 from %d.%d.%d.%d:%d to %d.%d.%d.%d:%d\n\n", SNGTC_NIPV4(sess->encoder.reply.a.host_ip), sess->encoder.reply.a.host_udp_port,
-					SNGTC_NIPV4(sess->encoder.reply.a.codec_ip), sess->encoder.reply.a.codec_udp_port);
-			stream->write_function(stream, "Rx %s at %d.%d.%d.%d:%d from %d.%d.%d.%d:%d\n\n", sess->impl->iananame, SNGTC_NIPV4(sess->encoder.reply.b.host_ip), sess->encoder.reply.b.host_udp_port,
-					SNGTC_NIPV4(sess->encoder.reply.b.codec_ip), sess->encoder.reply.b.codec_udp_port);
-
-			stream->write_function(stream, "Ticks: %lu\n", sess->encoder.ticks);
-
-			stream->write_function(stream, "-- Inbound Stats --\n");
-			stream->write_function(stream, "Rx Discarded: %lu\n", sess->encoder.rxdiscarded);
-			sangoma_print_stats(stream, &stats->inbound);
-
-
-			stats = switch_rtp_get_stats(sess->encoder.txrtp, NULL);
-			stream->write_function(stream, "-- Outbound Stats --\n");
-			sangoma_print_stats(stream, &stats->outbound);
-		}
-
-		if (sess->decoder.rxrtp) {
-			stats = switch_rtp_get_stats(sess->decoder.rxrtp, NULL);
-
-			stream->write_function(stream, "=== %s Decoder ===\n", sess->impl->iananame);
-			stream->write_function(stream, "Tx %s from %d.%d.%d.%d:%d to %d.%d.%d.%d:%d\n\n", sess->impl->iananame, SNGTC_NIPV4(sess->decoder.reply.a.host_ip), sess->decoder.reply.a.host_udp_port,
-					SNGTC_NIPV4(sess->decoder.reply.a.codec_ip), sess->decoder.reply.a.codec_udp_port);
-			stream->write_function(stream, "Rx L16 at %d.%d.%d.%d:%d from %d.%d.%d.%d:%d\n\n", SNGTC_NIPV4(sess->decoder.reply.b.host_ip), sess->decoder.reply.b.host_udp_port,
-					SNGTC_NIPV4(sess->decoder.reply.b.codec_ip), sess->decoder.reply.b.codec_udp_port);
-			stream->write_function(stream, "Ticks: %lu\n", sess->decoder.ticks);
-
-			stream->write_function(stream, "-- Inbound Stats --\n");
-			stream->write_function(stream, "Rx Discarded: %lu\n", sess->decoder.rxdiscarded);
-			sangoma_print_stats(stream, &stats->inbound);
-
-			stats = switch_rtp_get_stats(sess->decoder.txrtp, NULL);
-			stream->write_function(stream, "-- Outbound Stats --\n");
-			sangoma_print_stats(stream, &stats->outbound);
-		}
-	} else if (!strcasecmp(argv[0], "debug")) {
-		struct sangoma_transcoding_session *sess;
-		unsigned long sessid = 0;
-		int ret = 0;
-		if (argc < 2) {
-			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
-			goto done;
-		}
-		ret = sscanf(argv[1], "%lu", &sessid);
-		if (ret != 1) {
-			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
-			goto done;
-		}
-		sess = sangoma_find_session(sessid);
-		if (!sess) {
-			stream->write_function(stream, "Failed to find session %lu\n", sessid);
-			goto done;
-		}
-		sess->encoder.debug_timing = 1;
-		sess->decoder.debug_timing = 1;
-		stream->write_function(stream, "Debug enabled for transcoding session: %lu\n", sessid);
-	} else if (!strcasecmp(argv[0], "nodebug")) {
-		struct sangoma_transcoding_session *sess;
-		unsigned long sessid = 0;
-		int ret = 0;
-		if (argc < 2) {
-			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
-			goto done;
-		}
-		ret = sscanf(argv[1], "%lu", &sessid);
-		if (ret != 1) {
-			stream->write_function(stream, "%s", SANGOMA_SYNTAX);
-			goto done;
-		}
-		sess = sangoma_find_session(sessid);
-		if (!sess) {
-			stream->write_function(stream, "Failed to find session %lu\n", sessid);
-			goto done;
-		}
-		sess->encoder.debug_timing = 0;
-		sess->decoder.debug_timing = 0;
-		stream->write_function(stream, "Debug disabled for transcoding session: %lu\n", sessid);
-	} else {
-		stream->write_function(stream, "Unknown Command [%s]\n", argv[0]);
-	}
-
-done:
-	if (locked) {
-		switch_mutex_unlock(g_sessions_lock);
-	}
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static int sangoma_logger(int level, char *fmt, ...)
-{
-	char *data;
-	int ret = 0;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = switch_vasprintf(&data, fmt, ap);
-	if (ret == -1) {
-		return -1;
-	}
-	va_end(ap);
-
-	switch (level) {
-	case SNGTC_LOGLEVEL_DEBUG:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", data);
-		break;
-	case SNGTC_LOGLEVEL_WARN:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s\n", data);
-		break;
-	case SNGTC_LOGLEVEL_INFO:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s\n", data);
-		break;
-	case SNGTC_LOGLEVEL_STATS:
-		break;
-	case SNGTC_LOGLEVEL_ERROR:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s\n", data);
-		break;
-	case SNGTC_LOGLEVEL_CRIT:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s\n", data);
-		break;
-	default:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unexpected msg with loglevel %d: %s\n", level, data);
-	}
-
-	free(data);
-	return 0;
-}
-
-static int sangoma_parse_config(void)
-{
-	switch_xml_t cfg, settings, param, xml;
-	struct in_addr rtpaddr;
-	char localip[255];
-	int mask = 0;
-	int rc = 0;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Reading sangoma codec configuration\n");
-	if (!(xml = switch_xml_open_cfg(SANGOMA_TRANSCODE_CONFIG, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to open sangoma codec configuration %s\n", SANGOMA_TRANSCODE_CONFIG);
-		return -1;
-	}
-
-	memset(&g_init_cfg, 0, sizeof(g_init_cfg));
-
-	if ((settings = switch_xml_child(cfg, "settings"))) {
-		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-				char *var = (char *)switch_xml_attr_soft(param, "name");
-				char *val = (char *)switch_xml_attr_soft(param, "value");
-
-				/* this parameter overrides the default list of codecs to load */
-				if (!strcasecmp(var, "register")) {
-					strncpy(g_codec_register_list, val, sizeof(g_codec_register_list)-1);
-					g_codec_register_list[sizeof(g_codec_register_list)-1] = 0;
-				} else if (!strcasecmp(var, "noregister")) {
-					strncpy(g_codec_noregister_list, val, sizeof(g_codec_noregister_list)-1);
-					g_codec_noregister_list[sizeof(g_codec_noregister_list)-1] = 0;
-				} else if (!strcasecmp(var, "soapserver")) {
-					strncpy(g_soap_url, val, sizeof(g_soap_url)-1);
-					g_soap_url[sizeof(g_soap_url)-1] = 0;
-				} else if (!strcasecmp(var, "rtpip")) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found Sangoma RTP IP %s\n", val);
-					if (switch_inet_pton(AF_INET, val, &rtpaddr) <= 0) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid Sangoma RTP IP %s\n", val);
-						break;
-					}
-					g_rtpip = ntohl(rtpaddr.s_addr);
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignored unknown Sangoma codec setting %s\n", var);
-				}
-		}
-	}
-
-	if (!g_rtpip) {
-		if (SWITCH_STATUS_SUCCESS != switch_find_local_ip(localip, sizeof(localip), &mask, AF_INET)) {
-			rc = -1;
-			goto done;
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "No RTP IP specified, using %s\n", localip);
-		switch_inet_pton(AF_INET, localip, &rtpaddr);
-		g_rtpip = ntohl(rtpaddr.s_addr);
-	}
-
-done:
-	switch_xml_free(xml);
-
-	g_init_cfg.host_nic_vocallo_sz = 0;
-
-	return rc;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sangoma_codec_shutdown)
-{
-	switch_core_hash_destroy(&g_sessions_hash);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
-{
-	/* the codec interface that will be registered with the core */
-	switch_codec_interface_t *codec_interface = NULL;
-	switch_api_interface_t *api_interface = NULL;
-	int i = 0, c = 0;
-	int ilbc_done = 0;
-	int siren_done = 0;
-	vocallo_codec_t *ilbc_codec = NULL;
-	vocallo_codec_t *siren_codec = NULL;
-	int detected = 0, activated = 0;
-
-	/* make sure we have valid configuration */
-	if (sangoma_parse_config()) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	g_init_cfg.log = sangoma_logger;
-	g_init_cfg.create_rtp = sangoma_create_rtp;
-	g_init_cfg.create_rtp_port = sangoma_create_rtp_port;
-	g_init_cfg.destroy_rtp = sangoma_destroy_rtp;
-	g_init_cfg.release_rtp_port = sangoma_release_rtp_port;
-
-	if (sngtc_detect_init_modules(&g_init_cfg, &detected)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to detect vocallo modules\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (sngtc_activate_modules(&g_init_cfg, &activated)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to activate vocallo modules\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Detected %d and activated %d Sangoma codec vocallo modules\n", detected, activated);
-
-	if (strlen(g_soap_url)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Using %s SOAP server\n", g_soap_url);
-		sngtc_set_soap_server_url(g_soap_url);
-	}
-
-	switch_mutex_init(&g_sessions_lock, SWITCH_MUTEX_UNNESTED, pool);
-
-	switch_core_hash_init(&g_sessions_hash);
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading codecs, register='%s', noregister='%s'\n", g_codec_register_list, g_codec_noregister_list);
-	for (c = 0; g_codec_map[c].codec_id != -1; c++) {
-
-		if (g_codec_map[c].codec_id == SNGTC_CODEC_L16_1 || g_codec_map[c].codec_id == SNGTC_CODEC_L16_2) {
-			/* registering L16 does not make any sense */
-			continue;
-		}
-
-		/* check if the codec is in the load list, otherwise skip it */
-		if (strcasecmp(g_codec_register_list, "all") && !strcasestr(g_codec_register_list, g_codec_map[c].iana_name)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not loading codec %s because was not found in the load list\n",
-					g_codec_map[c].iana_name);
-			continue;
-		}
-
-		/* load it unless is named in the noload list */
-		if (strcasestr(g_codec_noregister_list, g_codec_map[c].iana_name)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not loading codec %s because was not found in the noload list\n",
-					g_codec_map[c].iana_name);
-			continue;
-		}
-
-		/* special check for iLBC to add a single codec interface for both ILBC bitrate versions */
-		if ((g_codec_map[c].codec_id == SNGTC_CODEC_ILBC_152 || g_codec_map[c].codec_id == SNGTC_CODEC_ILBC_133) && ilbc_done) {
-			continue;
-		}
-
-		/* special check for siren to add a single codec interface for all siren bitrate versions */
-		if ((g_codec_map[c].codec_id == SNGTC_CODEC_SIREN7_24 || g_codec_map[c].codec_id == SNGTC_CODEC_SIREN7_32) && siren_done) {
-			continue;
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Registering implementations for codec %s\n", g_codec_map[c].iana_name);
-
-		/* SWITCH_ADD_CODEC allocates a codec interface structure from the pool the core gave us and adds it to the internal interface
-		 * list the core keeps, gets a codec id and set the given codec name to it.
-		 * At this point there is an empty shell codec interface registered, but not yet implementations */
-		SWITCH_ADD_CODEC(codec_interface, g_codec_map[c].fs_name);
-
-		/* Now add as many codec implementations as needed, just up to 200ms for now */
-		if (g_codec_map[c].autoinit) {
-			int ms = 0;
-			for (i = 1; i <= 20; i++) {
-				ms = i * 10;
-				if (g_codec_map[c].maxms < ms) {
-					break;
-				}
-
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding %dms implementation of codec %s\n", ms, g_codec_map[c].fs_name);
-				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
-								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-								 g_codec_map[c].iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-								 g_codec_map[c].iana_name, /* the IANA code name */
-								 NULL,	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
-								 g_codec_map[c].sampling_rate,	/* samples transferred per second */
-								 g_codec_map[c].actual_sampling_rate, /* actual samples transferred per second */
-								 g_codec_map[c].bps,	/* bits transferred per second */
-								 g_codec_map[c].mpf * i, /* microseconds per frame */
-								 g_codec_map[c].spf * i, /* samples per frame */
-								 g_codec_map[c].bpfd * i, /* number of bytes per frame decompressed */
-								 g_codec_map[c].bpfc * i, /* number of bytes per frame compressed */
-								 1,	/* number of channels represented */
-								 g_codec_map[c].spf * i, /* number of frames per network packet (I dont think this is used at all) */
-								 switch_sangoma_init,	/* function to initialize a codec session using this implementation */
-								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
-								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
-								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-
-			}
-		} else {
-
-			/* custom implementation for some codecs */
-			switch (g_codec_map[c].codec_id) {
-			case SNGTC_CODEC_GSM_FR:
-				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
-								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-								 g_codec_map[c].iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-								 g_codec_map[c].iana_name, /* the IANA code name */
-								 NULL,	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
-								 8000,	/* samples transferred per second */
-								 8000,	/* actual samples transferred per second */
-								 g_codec_map[c].bps,	/* bits transferred per second */
-								 g_codec_map[c].mpf, /* microseconds per frame */
-								 g_codec_map[c].spf, /* samples per frame */
-								 g_codec_map[c].bpfd, /* number of bytes per frame decompressed */
-								 g_codec_map[c].bpfc, /* number of bytes per frame compressed */
-								 1,	/* number of channels represented */
-								 g_codec_map[c].spf, /* number of frames per network packet (I dont think this is used at all) */
-								 switch_sangoma_init,	/* function to initialize a codec session using this implementation */
-								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
-								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
-								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-
-				break;
-			case SNGTC_CODEC_ILBC_133:
-			case SNGTC_CODEC_ILBC_152:
-				ilbc_codec = get_codec_from_id(SNGTC_CODEC_ILBC_152);
-				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
-								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-								 ilbc_codec->iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-								 ilbc_codec->iana_name, /* the IANA code name */
-								 "mode=20",	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
-								 8000,	/* samples transferred per second */
-								 8000,	/* actual samples transferred per second */
-								 15200,	/* bits transferred per second */
-								 20000, /* microseconds per frame */
-								 160, /* samples per frame */
-								 320, /* number of bytes per frame decompressed */
-								 38, /* number of bytes per frame compressed */
-								 1,	/* number of channels represented */
-								 1, /* number of frames per network packet (I dont think this is used at all) */
-								 switch_sangoma_init_ilbc,	/* function to initialize a codec session using this implementation */
-								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
-								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
-								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-
-				ilbc_codec = get_codec_from_id(SNGTC_CODEC_ILBC_133);
-				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
-								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-								 ilbc_codec->iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-								 ilbc_codec->iana_name, /* the IANA code name */
-								 "mode=30",	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
-								 8000,	/* samples transferred per second */
-								 8000,	/* actual samples transferred per second */
-								 13330,	/* bits transferred per second */
-								 30000, /* microseconds per frame */
-								 240, /* samples per frame */
-								 480, /* number of bytes per frame decompressed */
-								 50, /* number of bytes per frame compressed */
-								 1,	/* number of channels represented */
-								 1, /* number of frames per network packet (I dont think this is used at all) */
-								 switch_sangoma_init_ilbc, /* function to initialize a codec session using this implementation */
-								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
-								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
-								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-				ilbc_done = 1;
-				break;
-
-			case SNGTC_CODEC_G723_1_63:
-
-				for (i = 1; i <= 3; i++) {
-					switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
-									 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-									 g_codec_map[c].iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-									 g_codec_map[c].iana_name, /* the IANA code name */
-									 NULL,	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
-									 g_codec_map[c].sampling_rate, /* samples transferred per second */
-									 g_codec_map[c].actual_sampling_rate, /* actual samples transferred per second */
-									 g_codec_map[c].bps, /* bits transferred per second */
-									 g_codec_map[c].mpf * i, /* microseconds per frame */
-									 g_codec_map[c].spf * i, /* samples per frame */
-									 g_codec_map[c].bpfd * i, /* number of bytes per frame decompressed */
-									 g_codec_map[c].bpfc * i, /* number of bytes per frame compressed */
-									 1,	/* number of channels represented */
-									 g_codec_map[c].spf * i, /* number of frames per network packet (I dont think this is used at all) */
-									 switch_sangoma_init,	/* function to initialize a codec session using this implementation */
-									 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
-									 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
-									 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-				}
-
-				break;
-
-			case SNGTC_CODEC_AMR_1220:
-				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
-								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-								 g_codec_map[c].iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-								 g_codec_map[c].iana_name, /* the IANA code name */
-								 NULL,	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
-								 g_codec_map[c].sampling_rate,	/* samples transferred per second */
-								 g_codec_map[c].actual_sampling_rate, /* actual samples transferred per second */
-								 g_codec_map[c].bps,	/* bits transferred per second */
-								 g_codec_map[c].mpf, /* microseconds per frame */
-								 g_codec_map[c].spf, /* samples per frame */
-								 g_codec_map[c].bpfd, /* number of bytes per frame decompressed */
-								 g_codec_map[c].bpfc, /* number of bytes per frame compressed */
-								 1,	/* number of channels represented */
-								 g_codec_map[c].spf, /* number of frames per network packet (I dont think this is used at all) */
-								 switch_sangoma_init,	/* function to initialize a codec session using this implementation */
-								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
-								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
-								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-				break;
-
-			case SNGTC_CODEC_SIREN7_24:
-			case SNGTC_CODEC_SIREN7_32:
-
-				siren_codec = get_codec_from_id(SNGTC_CODEC_SIREN7_24);
-				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
-								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-								 siren_codec->iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-								 siren_codec->iana_name, /* the IANA code name */
-								 "bitrate=24000",	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
-								 siren_codec->sampling_rate,	/* samples transferred per second */
-								 siren_codec->actual_sampling_rate, /* actual samples transferred per second */
-								 siren_codec->bps,	/* bits transferred per second */
-								 siren_codec->mpf, /* microseconds per frame */
-								 siren_codec->spf, /* samples per frame */
-								 siren_codec->bpfd, /* number of bytes per frame decompressed */
-								 siren_codec->bpfc, /* number of bytes per frame compressed */
-								 1,	/* number of channels represented */
-								 siren_codec->spf, /* number of frames per network packet (I dont think this is used at all) */
-								 switch_sangoma_init_siren7,	/* function to initialize a codec session using this implementation */
-								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
-								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
-								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-
-				siren_codec = get_codec_from_id(SNGTC_CODEC_SIREN7_32);
-				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
-								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-								 siren_codec->iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-								 siren_codec->iana_name, /* the IANA code name */
-								 "bitrate=32000",	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
-								 siren_codec->sampling_rate,	/* samples transferred per second */
-								 siren_codec->actual_sampling_rate, /* actual samples transferred per second */
-								 siren_codec->bps,	/* bits transferred per second */
-								 siren_codec->mpf, /* microseconds per frame */
-								 siren_codec->spf, /* samples per frame */
-								 siren_codec->bpfd, /* number of bytes per frame decompressed */
-								 siren_codec->bpfc, /* number of bytes per frame compressed */
-								 1,	/* number of channels represented */
-								 siren_codec->spf, /* number of frames per network packet (I dont think this is used at all) */
-								 switch_sangoma_init_siren7,	/* function to initialize a codec session using this implementation */
-								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
-								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
-								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-				siren_done = 1;
-				break;
-
-			case SNGTC_CODEC_G729AB:
-				for (i = 1; i <= 20; i++) {
-					if (g_codec_map[c].maxms < (i * 10)) {
-						break;
-					}
-
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding %dms implementation of codec %s\n", (i * 10), g_codec_map[c].fs_name);
-					switch_core_codec_add_implementation(pool, codec_interface, /* the codec interface we allocated and we want to register with the core */
-									SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
-									g_codec_map[c].iana, /* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
-									g_codec_map[c].iana_name, /* the IANA code name */
-									NULL, /* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
-									g_codec_map[c].sampling_rate, /* samples transferred per second */
-									g_codec_map[c].actual_sampling_rate, /* actual samples transferred per second */
-									g_codec_map[c].bps, /* bits transferred per second */
-									g_codec_map[c].mpf * i, /* microseconds per frame */
-									g_codec_map[c].spf * i, /* samples per frame */
-									g_codec_map[c].bpfd * i, /* number of bytes per frame decompressed */
-									g_codec_map[c].bpfc * i, /* number of bytes per frame compressed */
-									1, /* number of channels represented */
-									g_codec_map[c].spf * i, /* number of frames per network packet (I dont think this is used at all) */
-									switch_sangoma_init_g729, /* function to initialize a codec session using this implementation */
-									switch_sangoma_encode, /* function to encode slinear data into encoded data */
-									switch_sangoma_decode, /* function to decode encoded data into slinear data */
-									switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
-				}
-				break;
-
-			default:
-				break;
-			}
-		}
-	}
-
-
-	SWITCH_ADD_API(api_interface, "sangoma_codec", "Sangoma Codec Commands", sangoma_function, SANGOMA_SYNTAX);
-	switch_console_set_complete("add sangoma_codec");
-	switch_console_set_complete("add sangoma_codec settings");
-	switch_console_set_complete("add sangoma_codec sessions");
-	switch_console_set_complete("add sangoma_codec stats");
-	switch_console_set_complete("add sangoma_codec debug");
-	switch_console_set_complete("add sangoma_codec nodebug");
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/databases/mod_mariadb/mariadb_dsn.cpp b/src/mod/databases/mod_mariadb/mariadb_dsn.cpp
index eb7bfeedbd..aa7fb89412 100644
--- a/src/mod/databases/mod_mariadb/mariadb_dsn.cpp
+++ b/src/mod/databases/mod_mariadb/mariadb_dsn.cpp
@@ -81,13 +81,13 @@ public:
 					std::string value = pair[1];
 
 					if ("server" == key || "host" == key) {
-						_host = value;
+						_host = std::move(value);
 					} else if ("uid" == key || "user" == key || "username" == key) {
-						_user = value;
+						_user = std::move(value);
 					} else if ("pwd" == key || "passwd" == key || "password" == key) {
-						_passwd = value;
+						_passwd = std::move(value);
 					} else if ("database" == key || "db" == key) {
-						_db = value;
+						_db = std::move(value);
 					} else if ("port" == key) {
 						_port = std::stoi(value);
 					} else if ("option" == key || "options" == key) {
diff --git a/src/mod/databases/mod_mariadb/mod_mariadb.c b/src/mod/databases/mod_mariadb/mod_mariadb.c
index 7926ec0c3f..c39c2ce818 100644
--- a/src/mod/databases/mod_mariadb/mod_mariadb.c
+++ b/src/mod/databases/mod_mariadb/mod_mariadb.c
@@ -411,7 +411,7 @@ switch_status_t mariadb_finish_results_real(const char* file, const char* func,
 				if ((status = mysql_next_result(&handle->con))) {
 					if (status > 0) {
 						err_str = mariadb_handle_get_error(handle);
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "An error occurred trying to get next for query (%s): %s\n", handle->sql, err_str);
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "An error occurred trying to get next for query (%s): %s\n", handle->sql, switch_str_nil(err_str));
 						switch_safe_free(err_str);
 
 						break;
@@ -627,13 +627,27 @@ switch_status_t mariadb_send_query(mariadb_handle_t *handle, const char* sql)
 {
 	char *err_str;
 	int ret;
+	unsigned retries = 60; /* 60 tries, will take 30 to 60 seconds at worst */
 
 	switch_safe_free(handle->sql);
 	handle->sql = strdup(sql);
+    again:
 	handle->stored_results = 0;
 	ret = mysql_real_query(&handle->con, sql, (unsigned long)strlen(sql));	
 	if (ret) {
 		err_str = mariadb_handle_get_error(handle);
+		if (strstr(err_str, "Deadlock found when trying to get lock; try restarting transaction")) {
+			if (--retries > 0) {
+				switch_safe_free(err_str);
+				/* We are waiting for 500 ms and random time is not more than 500 ms.
+				  This is necessary so that the delay on the primary and secondary servers does not coincide and deadlock does not occur again. */
+				switch_yield(500 + (switch_rand() & 511));
+				goto again;
+			}
+
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "DeadLock. The retries are over.\n");
+		}
+
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to send query (%s) to database: %s\n", sql, err_str);
 		switch_safe_free(err_str);
 		mariadb_finish_results(handle);
diff --git a/src/mod/databases/mod_pgsql/mod_pgsql.c b/src/mod/databases/mod_pgsql/mod_pgsql.c
index 0308f1f1fd..89fdd710f6 100644
--- a/src/mod/databases/mod_pgsql/mod_pgsql.c
+++ b/src/mod/databases/mod_pgsql/mod_pgsql.c
@@ -113,7 +113,7 @@ static int db_is_up(switch_pgsql_handle_t *handle)
 	char *err_str = NULL;
 	int max_tries = DEFAULT_PGSQL_RETRIES;
 	int code = 0;
-	int recon = 0;
+	switch_status_t recon = SWITCH_STATUS_FALSE;
 	switch_byte_t sanity = 255;
 
 	if (handle) {
@@ -128,6 +128,7 @@ top:
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No DB Handle\n");
 		goto done;
 	}
+
 	if (!handle->con) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No DB Connection\n");
 		goto done;
@@ -141,6 +142,7 @@ top:
 			switch_yield(1);
 			continue;
 		}
+
 		break;
 	}
 
@@ -158,6 +160,7 @@ reset:
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "PQstatus returned bad connection -- reconnection failed!\n");
 			goto error;
 		}
+
 		handle->state = SWITCH_PGSQL_STATE_CONNECTED;
 		handle->sock = PQsocket(handle->con);
 	}
@@ -193,6 +196,7 @@ error:
 			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Additional-Info", "The connection could not be re-established");
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "The connection could not be re-established\n");
 		}
+
 		if (!max_tries) {
 			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Additional-Info", "Giving up!");
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Giving up!\n");
@@ -601,6 +605,10 @@ switch_status_t database_handle_exec_string(switch_database_interface_handle_t *
 #if PG_VERSION_NUM >= 90002
 		case PGRES_SINGLE_TUPLE:
 			/* Added in PostgreSQL 9.2 */
+#endif
+#if PG_VERSION_NUM >= 170000
+		case PGRES_TUPLES_CHUNK:
+			/* Added in PostgreSQL 17 */
 #endif
 		case PGRES_COMMAND_OK:
 		case PGRES_TUPLES_OK:
@@ -762,6 +770,10 @@ switch_status_t pgsql_next_result_timed(switch_pgsql_handle_t *handle, switch_pg
 #if PG_VERSION_NUM >= 90002
 		case PGRES_SINGLE_TUPLE:
 			/* Added in PostgreSQL 9.2 */
+#endif
+#if PG_VERSION_NUM >= 170000
+		case PGRES_TUPLES_CHUNK:
+			/* Added in PostgreSQL 17 */
 #endif
 		case PGRES_TUPLES_OK:
 		{
diff --git a/src/mod/endpoints/mod_gsmopen/.gitignore b/src/mod/endpoints/mod_gsmopen/.gitignore
deleted file mode 100644
index 9fdeeb1412..0000000000
--- a/src/mod/endpoints/mod_gsmopen/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-!/gsmlib/gsmlib-*/aclocal.m4
-!/gsmlib/gsmlib-*/configure
diff --git a/src/mod/endpoints/mod_gsmopen/FREEBSD_README.txt b/src/mod/endpoints/mod_gsmopen/FREEBSD_README.txt
deleted file mode 100644
index 4cbedeae63..0000000000
--- a/src/mod/endpoints/mod_gsmopen/FREEBSD_README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-This patch (updated to be applied today) was sent via Jira by royj@yandex.ru, with Jira issue FS-4338.
-
-Apply in this way:
-# patch -p6 < FREEBSD_patch.diff
-
-I have not tested it, but it works for him.
-Please open another Jira issue if anything wrong.
-
--giovanni
diff --git a/src/mod/endpoints/mod_gsmopen/FREEBSD_patch.diff b/src/mod/endpoints/mod_gsmopen/FREEBSD_patch.diff
deleted file mode 100644
index cd5613a2d7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/FREEBSD_patch.diff
+++ /dev/null
@@ -1,171 +0,0 @@
-diff --git a/src/mod/endpoints/mod_gsmopen/Makefile b/src/mod/endpoints/mod_gsmopen/Makefile
-index 18943c8..5324c52 100644
---- a/src/mod/endpoints/mod_gsmopen/Makefile
-+++ b/src/mod/endpoints/mod_gsmopen/Makefile
-@@ -1,5 +1,5 @@
- MODNAME=mod_gsmopen
--LOCAL_CFLAGS += -I../../../../libs/spandsp/src -I../../../..//libs/tiff-4.0.2/libtiff -DGSMOPEN_C_VER=\"`git log -1 --format="%h" gsmopen_protocol.cpp`\" -DMODGSMOPEN_C_VER=\"`git log -1 --format="%h" mod_gsmopen.cpp`\"
-+LOCAL_CFLAGS += -I/usr/local/include -I../../../../libs/spandsp/src -I../../../..//libs/tiff-4.0.2/libtiff -DGSMOPEN_C_VER=\"`git log -1 --format="%h" gsmopen_protocol.cpp`\" -DMODGSMOPEN_C_VER=\"`git log -1 --format="%h" mod_gsmopen.cpp`\"
- LOCAL_LDFLAGS=-L../../../../libs/spandsp/src -lspandsp -lctb-0.16 -lgsmme
- LOCAL_OBJS=gsmopen_protocol.o
- include ../../../../build/modmake.rules
-diff --git a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
-index 5bdda08..73ef93d 100644
---- a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
-+++ b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
-@@ -2356,7 +2356,7 @@ int ucs2_to_utf8(private_t *tech_pvt, char *ucs2_in, char *utf8_out, size_t outb
- 	iconv_t iconv_format;
- 	int iconv_res;
- 	char *outbuf;
--	char *inbuf;
-+	//char *inbuf;
- 	size_t inbytesleft;
- 	int c;
- 	char stringa[5];
-@@ -2376,9 +2376,10 @@ int ucs2_to_utf8(private_t *tech_pvt, char *ucs2_in, char *utf8_out, size_t outb
- 	}
- 
- 	outbuf = utf8_out;
--	inbuf = converted;
-+	const char *inbuf = converted;
- 
--	iconv_format = iconv_open("UTF8", "UCS-2BE");
-+	//iconv_format = iconv_open("UTF8", "UCS-2BE");
-+	iconv_format = iconv_open("UTF-8", "UCS-2BE");
- 	//iconv_format = iconv_open("UTF8", "UCS2");
- 	if (iconv_format == (iconv_t) -1) {
- 		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
-@@ -2417,12 +2418,12 @@ int utf8_to_iso_8859_1(private_t *tech_pvt, char *utf8_in, size_t inbytesleft, c
- 	iconv_t iconv_format;
- 	int iconv_res;
- 	char *outbuf;
--	char *inbuf;
-+	//char *inbuf;
- 
- 	outbuf = iso_8859_1_out;
--	inbuf = utf8_in;
-+	const char *inbuf = utf8_in;
- 
--	iconv_format = iconv_open("ISO_8859-1", "UTF8");
-+	iconv_format = iconv_open("ISO_8859-1", "UTF-8");
- 	if (iconv_format == (iconv_t) -1) {
- 		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
- 		return -1;
-@@ -2467,7 +2468,7 @@ int iso_8859_1_to_utf8(private_t *tech_pvt, char *iso_8859_1_in, char *utf8_out,
- 	iconv_t iconv_format;
- 	int iconv_res;
- 	char *outbuf;
--	char *inbuf;
-+	//char *inbuf;
- 	size_t inbytesleft;
- 	//int c;
- 	//char stringa[5];
-@@ -2477,9 +2478,9 @@ int iso_8859_1_to_utf8(private_t *tech_pvt, char *iso_8859_1_in, char *utf8_out,
- 	DEBUGA_GSMOPEN("iso_8859_1_in=%s\n", GSMOPEN_P_LOG, iso_8859_1_in);
- 
- 	outbuf = utf8_out;
--	inbuf = iso_8859_1_in;
-+	const char *inbuf = iso_8859_1_in;
- 
--	iconv_format = iconv_open("UTF8", "ISO_8859-1");
-+	iconv_format = iconv_open("UTF-8", "ISO_8859-1");
- 	if (iconv_format == (iconv_t) -1) {
- 		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
- 		return -1;
-@@ -2514,7 +2515,7 @@ int utf8_to_ucs2(private_t *tech_pvt, char *utf8_in, size_t inbytesleft, char *u
- 	iconv_t iconv_format;
- 	int iconv_res;
- 	char *outbuf;
--	char *inbuf;
-+	//char *inbuf;
- 	char converted[16000];
- 	int i;
- 	char stringa[16];
-@@ -2523,9 +2524,9 @@ int utf8_to_ucs2(private_t *tech_pvt, char *utf8_in, size_t inbytesleft, char *u
- 	memset(converted, '\0', sizeof(converted));
- 
- 	outbuf = converted;
--	inbuf = utf8_in;
-+	const char *inbuf = utf8_in;
- 
--	iconv_format = iconv_open("UCS-2BE", "UTF8");
-+	iconv_format = iconv_open("UCS-2BE", "UTF-8");
- 	if (iconv_format == (iconv_t) -1) {
- 		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
- 		return -1;
-diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/serport.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/serport.h
-index d88528b..f8851cc 100644
---- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/serport.h
-+++ b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/serport.h
-@@ -10,7 +10,7 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- #include "ctb-0.16/serportx.h"
--#include <linux/serial.h>
-+//#include <linux/serial.h>
- #include <termios.h>
- 
- namespace ctb {
-@@ -40,7 +40,7 @@ namespace ctb {
- 		need the errors during a active connection, we must save the actual
- 		error numbers in this separate structurs.
- 	   */
--	   struct serial_icounter_struct save_info, last_info;
-+	   //struct serial_icounter_struct save_info, last_info;
- 
- 	   /*!
- 		\brief adaptor member function, to convert the plattform independent
-diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/serport.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/serport.cpp
-index a369abc..d190567 100644
---- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/serport.cpp
-+++ b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/serport.cpp
-@@ -136,7 +136,7 @@ namespace ctb {
- //
-     int SerialPort::Ioctl(int cmd, void* args)
-     {
--	   int count = 0;
-+	  /* int count = 0;
- 	   int err = 0;
- 	   struct serial_icounter_struct info;
- 	   SerialPort_EINFO einfo;
-@@ -184,7 +184,8 @@ namespace ctb {
- 		  return -1;
- 	   }
- 	   last_info = info;
--	   return 0;
-+	   return 0;*/
-+	   return -1;
-     };
- 
-     int SerialPort::IsOpen()
-@@ -292,9 +293,9 @@ namespace ctb {
- 		  // request the actual numbers of breaks, framing, overrun
- 		  // and parity errors (because Linux summing all of them during
- 		  // system lifetime, not only while serial port is open.
--		  ioctl(fd,TIOCGICOUNT,&save_info);
-+		  //ioctl(fd,TIOCGICOUNT,&save_info);
- 		  // it's also careless, but we assume, that there was no error
--		  last_info = save_info;
-+		  //last_info = save_info;
- 
- 		  // in case of a non-standard rate, the termios struct have to set
- 		  // with the B38400 rate, see above!
-@@ -359,7 +360,7 @@ namespace ctb {
- 
-     int SerialPort::SetBaudrateAny( int baudrate )
-     {
--	   struct serial_struct ser_info; 
-+	/*   struct serial_struct ser_info; 
- 
- 	   int result = ioctl( fd, TIOCGSERIAL, &ser_info ); 
- 
-@@ -369,7 +370,8 @@ namespace ctb {
- 
- 	   result = ioctl( fd, TIOCSSERIAL, &ser_info );
- 
--	   return result;
-+	   return result;*/
-+	   return -1;
-     }
- 
-     int SerialPort::SetBaudrateStandard( int baudrate )
diff --git a/src/mod/endpoints/mod_gsmopen/Makefile.am b/src/mod/endpoints/mod_gsmopen/Makefile.am
deleted file mode 100644
index e7c20f257c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_gsmopen
-
-mod_LTLIBRARIES = mod_gsmopen.la
-mod_gsmopen_la_SOURCES  = mod_gsmopen.cpp gsmopen_protocol.cpp 
-mod_gsmopen_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
-mod_gsmopen_la_CPPFLAGS = $(SPANDSP_CFLAGS) -I.
-mod_gsmopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LIBS)
-mod_gsmopen_la_LDFLAGS  = -avoid-version -module -no-undefined -lctb-0.16 -lgsmme
diff --git a/src/mod/endpoints/mod_gsmopen/README b/src/mod/endpoints/mod_gsmopen/README
deleted file mode 100644
index 30955a2157..0000000000
--- a/src/mod/endpoints/mod_gsmopen/README
+++ /dev/null
@@ -1,14 +0,0 @@
-GSMopen, GSM Endpoint and Trunk
-
-All documentation on compiling, using, configuring, 
-tricks and tweaks, possible problems at: 
-
-http://wiki.freeswitch.org/wiki/Gsmopen
-
-Enjoy
-
--giovanni
-
-
-< gmaruzz at gmail dot com >
-
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/Makefile b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/Makefile
deleted file mode 100644
index 15e3388bd2..0000000000
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-MODNAME=mod_gsmopen
-SVNDEF := -D'GSMOPEN_SVN_VERSION="$(shell svnversion -n .)"'
-#LOCAL_CFLAGS += $(SVNDEF) -Wno-error=address -DNO_GSMLIB -I../../../../../../libs/spandsp/src -I../../../../../..//libs/tiff-4.0.2/libtiff
-LOCAL_CFLAGS += $(SVNDEF) -DNO_GSMLIB -I../../../../../../libs/spandsp/src -I../../../../../..//libs/tiff-4.0.2/libtiff
-LOCAL_LDFLAGS=-lasound  -L../../../../../../libs/spandsp/src -lspandsp
-LOCAL_OBJS=gsmopen_protocol.o 
-include ../../../../../../build/modmake.rules
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/asound.conf b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/asound.conf
deleted file mode 100644
index c3a8068e9c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/asound.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-defaults.pcm.rate_converter "linear"
-#defaults.pcm.rate_converter "speexrate"
-#defaults.pcm.dmix.rate 16000
-#defaults.pcm.dsnoop.rate 16000
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/gsmopen.conf.xml b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/gsmopen.conf.xml
deleted file mode 100644
index d21a4c1969..0000000000
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/gsmopen.conf.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<configuration name="gsmopen.conf" description="GSMopen Configuration">
-  <global_settings>
-    <param name="debug" value="8"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="default"/>
-    <param name="hold-music" value="$${moh_uri}"/>
-    <param name="destination" value="9999"/>
-  </global_settings>
-  <!-- one entry here per gsmopen interface -->
-  <per_interface_settings>
-    <interface id="1" name="interface1">
-	<param name="hold-music" value="$${moh_uri}"/>
-	<param name="dialplan" value="XML"/>
-	<param name="context" value="default"/>
-    	<param name="destination" value="5000"/>
-    	<param name="alsacname" value="plughw:1"/>
-    	<param name="alsapname" value="plughw:1"/>
-    	<param name="controldevice_name" value="/dev/ttyACM0"/>
-    </interface>
-    <!-- following interfaces are commented out!
-    -->
-  </per_interface_settings>
-</configuration>
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/gsmopen.conf.xml.motorola b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/gsmopen.conf.xml.motorola
deleted file mode 100644
index a38257ef1c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/gsmopen.conf.xml.motorola
+++ /dev/null
@@ -1,110 +0,0 @@
-<configuration name="gsmopen.conf" description="GSMopen Configuration">
-  <global_settings>
-    <param name="debug" value="8"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="default"/>
-    <param name="hold-music" value="$${moh_uri}"/>
-    <param name="destination" value="9999"/>
-  </global_settings>
-  <!-- one entry here per gsmopen interface -->
-  <per_interface_settings>
-
-    <!-- following interfaces are commented out!
-    -->
-    <interface id="1" name="interface2001">
-	<param name="hold-music" value="$${moh_uri}"/>
-	<param name="dialplan" value="XML"/>
-	<param name="context" value="default"/>
-    	<param name="destination" value="2000"/>
-    	<param name="alsacname" value="plughw:2"/>
-    	<param name="alsapname" value="plughw:2"/>
-    	<param name="controldevice_name" value="/dev/ttyACM2"/>
-    	<param name="no_sound" value="0"/>
-    </interface>
-    <interface id="2" name="interface4001">
-	<param name="hold-music" value="$${moh_uri}"/>
-	<param name="dialplan" value="XML"/>
-	<param name="context" value="default"/>
-    	<param name="destination" value="2000"/>
-    	<param name="alsacname" value="plughw:1"/>
-    	<param name="alsapname" value="plughw:1"/>
-    	<param name="controldevice_name" value="/dev/ttyACM1"/>
-    	<param name="no_sound" value="0"/>
-    </interface>
- 
-    <interface id="3" name="interface3">
-	<param name="hold-music" value="$${moh_uri}"/>
-	<param name="dialplan" value="XML"/>
-	<param name="context" value="default"/>
-    	<param name="destination" value="2000"/>
-    	<param name="alsacname" value="plughw:3"/>
-    	<param name="alsapname" value="plughw:3"/>
-    	<param name="controldevice_name" value="/dev/ttyACM0"/>
-    	<param name="no_sound" value="0"/>
-
-<param name="playback_boost" value="0" />
-<param name="capture_boost" value="0" />
-
-<param name="at_dial_pre_number" value="AT+CKPD=&quot;EEE" />
-<param name="at_dial_post_number" value="S&quot;" />
-<param name="at_dial_expect" value="OK" />
-
-<param name="at_hangup" value="AT+CKPD=&quot;EEE&quot;" />
-<param name="at_hangup_expect" value="OK" />
-
-<param name="at_answer" value="ATA" />
-<param name="at_answer_expect" value="OK" />
-
-<param name="at_initial_pause" value="1000000" />
-<param name="at_preinit_1" value="atciapa" />
-<param name="at_preinit_1_expect" value="OK" />
-<param name="at_preinit_2" value="" />
-<param name="at_preinit_2_expect" value="" />
-<param name="at_preinit_3" value="" />
-<param name="at_preinit_3_expect" value="" />
-<param name="at_preinit_4" value="" />
-<param name="at_preinit_4_expect" value="" />
-<param name="at_preinit_5" value="" />
-<param name="at_preinit_5_expect" value="" />
-<param name="at_after_preinit_pause" value="1000000" />
-<param name="at_postinit_1" value="atcucu" />
-<param name="at_postinit_1_expect" value="OK" />
-<param name="at_postinit_2" value="AT+CKPD=&quot;EEE&quot;" />
-<param name="at_postinit_2_expect" value="OK" />
-<param name="at_postinit_3" value="" />
-<param name="at_postinit_3_expect" value="" />
-<param name="at_postinit_4" value="" />
-<param name="at_postinit_4_expect" value="" />
-<param name="at_postinit_5" value="" />
-<param name="at_postinit_5_expect" value="" />
-
-<param name="at_query_battchg" value="AT+CBC" />
-<param name="at_query_battchg_expect" value="OK" />
-<param name="at_query_signal" value="AT+CSQ" />
-<param name="at_query_signal_expect" value="OK" />
-
-<param name="at_indicator_noservice_string" value="+CIEV: 2,0" />
-<param name="at_indicator_nosignal_string" value="+CIEV: 5,0" />
-<param name="at_indicator_lowsignal_string" value="+CIEV: 5,1" />
-<param name="at_indicator_lowbattchg_string" value="+CIEV: 0,1" />
-<param name="at_indicator_nobattchg_string" value="+CIEV: 0,0" />
-<param name="at_indicator_callactive_string" value="+CIEV: 3,1" />
-<param name="at_indicator_nocallactive_string" value="+CIEV: 3,0" />
-<param name="at_indicator_nocallsetup_string" value="+CIEV: 6,0" />
-<param name="at_indicator_callsetupincoming_string" value="+CIEV: 6,1" />
-<param name="at_indicator_callsetupoutgoing_string" value="+CIEV: 6,2" />
-<param name="at_indicator_callsetupremoteringing_string" value="+CIEV: 6,3" />
-
-<param name="at_call_idle" value="+MCST: 1" />
-<param name="at_call_incoming" value="+MCST: 2" />
-<param name="at_call_active" value="+MCST: 3" />
-<param name="at_call_failed" value="+MCST: 65" />
-<param name="at_call_calling" value="+MCST: 64" />
-
-
-
-
-
-    </interface>
-  </per_interface_settings>
-</configuration>
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/setmixers b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/setmixers
deleted file mode 100755
index 063904b9cf..0000000000
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/configs/setmixers
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# ALSA can manage a max of 8 cards
-CARD_LIST="0 1 2 3 4 5 6 7"
-
-for i in $CARD_LIST; do
-
-#amixer -c ${i}  -q set Mic 0% mute
-amixer -c ${i}  -q set Speaker 70% unmute >/dev/null 2>&1
-amixer -c ${i}  -q set Mic cap mute 70%	>/dev/null 2>&1
-amixer -c ${i}  -q set "Auto Gain Control" off	>/dev/null 2>&1
-
-done
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen.h b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen.h
deleted file mode 100644
index cf8561a683..0000000000
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen.h
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005/2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * This module (mod_gsmopen) has been contributed by:
- *
- * Giovanni Maruzzelli (gmaruzz@gmail.com)
- *
- *
- * Further Contributors:
- *
- *
- *
- * mod_gsmopen.c -- GSM compatible Endpoint Module
- *
- */
-
-#define __STDC_LIMIT_MACROS
-
-#ifdef WIN32
-#define HAVE_VSNPRINTF
-#pragma warning(disable: 4290)
-#endif //WIN32
-
-#define MY_EVENT_INCOMING_SMS "gsmopen::incoming_sms"
-#define MY_EVENT_DUMP "gsmopen::dump_event"
-#define MY_EVENT_ALARM "gsmopen::alarm"
-
-#define ALARM_FAILED_INTERFACE 0
-#define ALARM_NO_NETWORK_REGISTRATION 1
-#define ALARM_ROAMING_NETWORK_REGISTRATION 2
-#define ALARM_NETWORK_NO_SERVICE 3
-#define ALARM_NETWORK_NO_SIGNAL 4
-#define ALARM_NETWORK_LOW_SIGNAL 5
-
-
-
-
-
-#undef GIOVA48
-
-#ifndef GIOVA48
-#define SAMPLES_PER_FRAME 160
-#else // GIOVA48
-#define SAMPLES_PER_FRAME 960
-#endif // GIOVA48
-
-
-#ifndef GIOVA48
-#define     GSMOPEN_FRAME_SIZE   160
-#else //GIOVA48
-#define     GSMOPEN_FRAME_SIZE   960
-#endif //GIOVA48
-#define     SAMPLERATE_GSMOPEN   8000
-
-#ifndef NO_ALSA
-#define GSMOPEN_ALSA
-#endif // NO_ALSA
-#include <switch.h>
-#ifndef WIN32
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <iconv.h>
-#endif //WIN32
-//#include <libteletone.h>
-
-#ifdef GSMOPEN_ALSA
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#define ALSA_PCM_NEW_SW_PARAMS_API
-#include <alsa/asoundlib.h>
-#endif /* GSMOPEN_ALSA */
-
-#ifdef GSMOPEN_PORTAUDIO
-#include "pablio.h"
-#undef WANT_SPEEX
-#ifdef WANT_SPEEX
-#include "speex/speex_preprocess.h"
-#include "speex/speex_echo.h"
-#endif                          /* WANT_SPEEX */
-#endif// GSMOPEN_PORTAUDIO
-
-//#include "celliax_spandsp.h"
-#ifndef WIN32
-#include <sys/time.h>
-//#include <X11/Xlib.h>
-//#include <X11/Xlibint.h>
-//#include <X11/Xatom.h>
-#endif //WIN32
-
-#define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
-#include <spandsp.h>
-#include <spandsp/version.h>
-
-#ifdef _MSC_VER
-//Windows macro  for FD_SET includes a warning C4127: conditional expression is constant
-#pragma warning(push)
-#pragma warning(disable:4127)
-#endif
-
-#define 	PROTOCOL_ALSA_VOICEMODEM   4
-#define 	PROTOCOL_AT   2
-#define 	PROTOCOL_FBUS2   1
-#define 	PROTOCOL_NO_SERIAL   3
-
-#define		AT_BUFSIZ 8192
-//FIXME FIXME FIXME #define AT_MESG_MAX_LENGTH 2048 /* much more than 10 SMSs */
-#define AT_MESG_MAX_LENGTH 2048	/* much more than 10 SMSs */
-//FIXME FIXME FIXME #define AT_MESG_MAX_LINES 256   /* 256 lines, so it can contains the results of AT+CLAC, that gives all the AT commands the phone supports */
-#define AT_MESG_MAX_LINES 20	/* 256 lines, so it can contains the results of AT+CLAC, that gives all the AT commands the phone supports */
-
-//#define SAMPLERATE_GSMOPEN 16000
-//#define SAMPLES_PER_FRAME SAMPLERATE_GSMOPEN/50
-
-#ifndef GSMOPEN_SVN_VERSION
-#define GSMOPEN_SVN_VERSION switch_version_full()
-#endif /* GSMOPEN_SVN_VERSION */
-
-typedef enum {
-	TFLAG_IO = (1 << 0),
-	TFLAG_INBOUND = (1 << 1),
-	TFLAG_OUTBOUND = (1 << 2),
-	TFLAG_DTMF = (1 << 3),
-	TFLAG_VOICE = (1 << 4),
-	TFLAG_HANGUP = (1 << 5),
-	TFLAG_LINEAR = (1 << 6),
-	TFLAG_CODEC = (1 << 7),
-	TFLAG_BREAK = (1 << 8)
-} TFLAGS;
-
-typedef enum {
-	GFLAG_MY_CODEC_PREFS = (1 << 0)
-} GFLAGS;
-
-#define DEBUGA_GSMOPEN(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"rev "GSMOPEN_SVN_VERSION "[%p|%-7lx][DEBUG_GSMOPEN  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_CALL(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"rev "GSMOPEN_SVN_VERSION "[%p|%-7lx][DEBUG_CALL  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_PBX(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"rev "GSMOPEN_SVN_VERSION "[%p|%-7lx][DEBUG_PBX  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define ERRORA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 		"rev "GSMOPEN_SVN_VERSION "[%p|%-7lx][ERRORA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define WARNINGA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 		"rev "GSMOPEN_SVN_VERSION "[%p|%-7lx][WARNINGA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define NOTICA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, 		"rev "GSMOPEN_SVN_VERSION "[%p|%-7lx][NOTICA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-
-#define GSMOPEN_P_LOG (void *)NULL, (unsigned long)55, __LINE__, tech_pvt ? tech_pvt->name ? tech_pvt->name : "none" : "none", -1, tech_pvt ? tech_pvt->interface_state : -1, tech_pvt ? tech_pvt->phone_callflow : -1
-
-/*********************************/
-#define GSMOPEN_CAUSE_NORMAL		1
-#define GSMOPEN_CAUSE_FAILURE		2
-#define GSMOPEN_CAUSE_NO_ANSWER		3
-/*********************************/
-#define GSMOPEN_FRAME_DTMF		1
-/*********************************/
-#define GSMOPEN_CONTROL_RINGING		1
-#define GSMOPEN_CONTROL_ANSWER		2
-#define GSMOPEN_CONTROL_HANGUP		3
-#define GSMOPEN_CONTROL_BUSY		4
-
-/*********************************/
-#define		GSMOPEN_STATE_IDLE				0
-#define		GSMOPEN_STATE_DOWN				1
-#define		GSMOPEN_STATE_RING				2
-#define		GSMOPEN_STATE_DIALING				3
-#define		GSMOPEN_STATE_BUSY				4
-#define		GSMOPEN_STATE_UP				5
-#define		GSMOPEN_STATE_RINGING				6
-#define		GSMOPEN_STATE_PRERING				7
-#define		GSMOPEN_STATE_ERROR_DOUBLE_CALL			8
-#define		GSMOPEN_STATE_SELECTED				9
-#define 	GSMOPEN_STATE_HANGUP_REQUESTED			10
-#define		GSMOPEN_STATE_PREANSWER				11
-/*********************************/
-/* call flow from the device */
-#define 	CALLFLOW_CALL_IDLE				0
-#define 	CALLFLOW_CALL_DOWN				1
-#define 	CALLFLOW_INCOMING_RING				2
-#define 	CALLFLOW_CALL_DIALING				3
-#define 	CALLFLOW_CALL_LINEBUSY				4
-#define 	CALLFLOW_CALL_ACTIVE				5
-#define 	CALLFLOW_INCOMING_HANGUP			6
-#define 	CALLFLOW_CALL_RELEASED				7
-#define 	CALLFLOW_CALL_NOCARRIER				8
-#define 	CALLFLOW_CALL_INFLUX				9
-#define 	CALLFLOW_CALL_INCOMING				10
-#define 	CALLFLOW_CALL_FAILED				11
-#define 	CALLFLOW_CALL_NOSERVICE				12
-#define 	CALLFLOW_CALL_OUTGOINGRESTRICTED		13
-#define 	CALLFLOW_CALL_SECURITYFAIL			14
-#define 	CALLFLOW_CALL_NOANSWER				15
-#define 	CALLFLOW_STATUS_FINISHED			16
-#define 	CALLFLOW_STATUS_CANCELLED			17
-#define 	CALLFLOW_STATUS_FAILED				18
-#define 	CALLFLOW_STATUS_REFUSED				19
-#define 	CALLFLOW_STATUS_RINGING				20
-#define 	CALLFLOW_STATUS_INPROGRESS			21
-#define 	CALLFLOW_STATUS_UNPLACED			22
-#define 	CALLFLOW_STATUS_ROUTING				23
-#define 	CALLFLOW_STATUS_EARLYMEDIA			24
-#define 	CALLFLOW_INCOMING_CALLID			25
-#define 	CALLFLOW_STATUS_REMOTEHOLD			26
-#define 	CALLFLOW_CALL_REMOTEANSWER			27
-#define 	CALLFLOW_CALL_HANGUP_REQUESTED			28
-
-/*********************************/
-
-#define 	AT_OK   0
-#define 	AT_ERROR   1
-
-#define GSMOPEN_MAX_INTERFACES 64
-
-#ifndef WIN32
-struct GSMopenHandles {
-	//Window gsmopen_win;
-	//Display *disp;
-	//Window win;
-	int currentuserhandle;
-	int api_connected;
-	int fdesc[2];
-};
-#else //WIN32
-
-struct GSMopenHandles {
-	HWND win32_hInit_MainWindowHandle;
-	HWND win32_hGlobal_GSMAPIWindowHandle;
-	HINSTANCE win32_hInit_ProcessHandle;
-	char win32_acInit_WindowClassName[128];
-	UINT win32_uiGlobal_MsgID_GSMControlAPIAttach;
-	UINT win32_uiGlobal_MsgID_GSMControlAPIDiscover;
-	int currentuserhandle;
-	int api_connected;
-	switch_file_t *fdesc[2];
-};
-
-#endif //WIN32
-
-/*! 
- * \brief structure for storing the results of AT commands, in an array of AT_MESG_MAX_LINES * AT_MESG_MAX_LENGTH chars
- */
-struct s_result {
-	int elemcount;
-	char result[AT_MESG_MAX_LINES][AT_MESG_MAX_LENGTH];
-};
-
-struct ciapa_struct {
-	int state;
-	int hangupcause;
-};
-typedef struct ciapa_struct ciapa_t;
-
-struct private_object {
-	unsigned int flags;
-	switch_codec_t read_codec;
-	switch_codec_t write_codec;
-	switch_frame_t read_frame;
-	unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	char session_uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	switch_caller_profile_t *caller_profile;
-	switch_mutex_t *mutex;
-	switch_mutex_t *flag_mutex;
-
-	char id[80];
-	char name[80];
-	char dialplan[80];
-	char context[80];
-	char dial_regex[256];
-	char fail_dial_regex[256];
-	char hold_music[256];
-	char type[256];
-	char X11_display[256];
-#ifdef WIN32
-	unsigned short tcp_cli_port;
-	unsigned short tcp_srv_port;
-#else
-	int tcp_cli_port;
-	int tcp_srv_port;
-#endif
-	struct GSMopenHandles GSMopenHandles;
-
-	int interface_state;		/*!< \brief 'state' of the interface (channel) */
-	char language[80];			/*!< \brief default Asterisk dialplan language for this interface */
-	char exten[80];				/*!< \brief default Asterisk dialplan extension for this interface */
-	int gsmopen_sound_rate;		/*!< \brief rate of the sound device, in Hz, eg: 8000 */
-	char callid_name[50];
-	char callid_number[50];
-	double playback_boost;
-	double capture_boost;
-	int stripmsd;
-	char gsmopen_call_id[512];
-	int gsmopen_call_ongoing;
-	char gsmopen_friends[4096];
-	char gsmopen_fullname[512];
-	char gsmopen_displayname[512];
-	int phone_callflow;			/*!< \brief 'callflow' of the gsmopen interface (as opposed to phone interface) */
-	int gsmopen;				/*!< \brief config flag, bool, GSM support on this interface (0 if false, -1 if true) */
-	int control_to_send;
-#ifdef WIN32
-	switch_file_t *audiopipe[2];
-	switch_file_t *audiogsmopenpipe[2];
-	switch_file_t *gsmopen_sound_capt_fd;	/*!< \brief file descriptor for sound capture dev */
-#else							/* WIN32 */
-	int audiopipe[2];
-	int audiogsmopenpipe[2];
-	int gsmopen_sound_capt_fd;	/*!< \brief file descriptor for sound capture dev */
-#endif							/* WIN32 */
-	switch_thread_t *tcp_srv_thread;
-	switch_thread_t *tcp_cli_thread;
-	switch_thread_t *gsmopen_signaling_thread;
-	switch_thread_t *gsmopen_api_thread;
-	//short audiobuf[SAMPLES_PER_FRAME];
-	//int audiobuf_is_loaded;
-
-	//int phonebook_listing;
-	//int phonebook_querying;
-	//int phonebook_listing_received_calls;
-
-	//int phonebook_first_entry;
-	//int phonebook_last_entry;
-	//int phonebook_number_lenght;
-	//int phonebook_text_lenght;
-	int gsmopen_dir_entry_extension_prefix;
-	char gsmopen_user[256];
-	char gsmopen_password[256];
-	char destination[256];
-	struct timeval answer_time;
-
-	struct timeval transfer_time;
-	char transfer_callid_number[50];
-	char gsmopen_transfer_call_id[512];
-	int running;
-	unsigned long ib_calls;
-	unsigned long ob_calls;
-	unsigned long ib_failed_calls;
-	unsigned long ob_failed_calls;
-
-
-	char controldevice_name[50];	/*!< \brief name of the serial device controlling the interface, possibly none */
-	int controldevprotocol;		/*!< \brief which protocol is used for serial control of this interface */
-	char controldevprotocolname[50];	/*!< \brief name of the serial device controlling protocol, one of "at" "fbus2" "no_serial" "alsa_voicemodem" */
-	int controldevfd;			/*!< \brief serial controlling file descriptor for this interface */
-	//pthread_t controldev_thread;  /*!< \brief serial control thread for this interface, running during the call */
-#ifdef WIN32
-	int controldevice_speed;
-#else
-	speed_t controldevice_speed;
-#endif// WIN32
-	int controldev_dead;
-
-	char at_dial_pre_number[64];
-	char at_dial_post_number[64];
-	char at_dial_expect[64];
-	unsigned int at_early_audio;
-	char at_hangup[64];
-	char at_hangup_expect[64];
-	char at_answer[64];
-	char at_answer_expect[64];
-	unsigned int at_initial_pause;
-	char at_preinit_1[64];
-	char at_preinit_1_expect[64];
-	char at_preinit_2[64];
-	char at_preinit_2_expect[64];
-	char at_preinit_3[64];
-	char at_preinit_3_expect[64];
-	char at_preinit_4[64];
-	char at_preinit_4_expect[64];
-	char at_preinit_5[64];
-	char at_preinit_5_expect[64];
-	unsigned int at_after_preinit_pause;
-
-	char at_postinit_1[64];
-	char at_postinit_1_expect[64];
-	char at_postinit_2[64];
-	char at_postinit_2_expect[64];
-	char at_postinit_3[64];
-	char at_postinit_3_expect[64];
-	char at_postinit_4[64];
-	char at_postinit_4_expect[64];
-	char at_postinit_5[64];
-	char at_postinit_5_expect[64];
-
-	char at_send_dtmf[64];
-
-	char at_query_battchg[64];
-	char at_query_battchg_expect[64];
-	char at_query_signal[64];
-	char at_query_signal_expect[64];
-	char at_call_idle[64];
-	char at_call_incoming[64];
-	char at_call_active[64];
-	char at_call_failed[64];
-	char at_call_calling[64];
-
-#define CIEV_STRING_SIZE 64
-	char at_indicator_noservice_string[64];
-	char at_indicator_nosignal_string[64];
-	char at_indicator_lowsignal_string[64];
-	char at_indicator_lowbattchg_string[64];
-	char at_indicator_nobattchg_string[64];
-	char at_indicator_callactive_string[64];
-	char at_indicator_nocallactive_string[64];
-	char at_indicator_nocallsetup_string[64];
-	char at_indicator_callsetupincoming_string[64];
-	char at_indicator_callsetupoutgoing_string[64];
-	char at_indicator_callsetupremoteringing_string[64];
-
-	int at_indicator_callp;
-	int at_indicator_callsetupp;
-	int at_indicator_roamp;
-	int at_indicator_battchgp;
-	int at_indicator_servicep;
-	int at_indicator_signalp;
-
-	int at_has_clcc;
-	int at_has_ecam;
-
-	char at_cmgw[16];
-	int no_ucs2;
-	time_t gsmopen_serial_sync_period;
-
-	time_t gsmopen_serial_synced_timestamp;
-	struct s_result line_array;
-
-
-	int unread_sms_msg_id;
-	int reading_sms_msg;
-	char sms_message[4800];
-	char sms_sender[256];
-	char sms_date[256];
-	char sms_userdataheader[256];
-	char sms_body[4800];
-	char sms_datacodingscheme[256];
-	char sms_servicecentreaddress[256];
-	int sms_messagetype;
-	int sms_cnmi_not_supported;
-	int sms_pdu_not_supported;
-	//char sms_receiving_program[256];
-
-
-	struct timeval call_incoming_time;
-	switch_mutex_t *controldev_lock;
-
-	int phonebook_listing;
-	int phonebook_querying;
-	int phonebook_listing_received_calls;
-
-	int phonebook_first_entry;
-	int phonebook_last_entry;
-	int phonebook_number_lenght;
-	int phonebook_text_lenght;
-	FILE *phonebook_writing_fp;
-
-	struct timeval ringtime;
-	ciapa_t *owner;
-#ifdef GSMOPEN_ALSA
-	snd_pcm_t *alsac;			/*!< \brief handle of the ALSA capture audio device */
-	snd_pcm_t *alsap;			/*!< \brief handle of the ALSA playback audio device */
-	char alsacname[50];			/*!< \brief name of the ALSA capture audio device */
-	char alsapname[50];			/*!< \brief name of the ALSA playback audio device */
-	int alsa_period_size;		/*!< \brief ALSA period_size, in byte */
-	int alsa_periods_in_buffer;	/*!< \brief how many periods in ALSA buffer, to calculate buffer_size */
-	unsigned long int alsa_buffer_size;	/*!< \brief ALSA buffer_size, in byte */
-	int alsawrite_filled;
-	int alsa_capture_is_mono;
-	int alsa_play_is_mono;
-	struct pollfd pfd;
-#endif							// GSMOPEN_ALSA
-
-	time_t audio_play_reset_timestamp;
-	int audio_play_reset_period;
-
-	switch_timer_t timer_read;
-	switch_timer_t timer_write;
-	teletone_dtmf_detect_state_t dtmf_detect;
-	switch_time_t old_dtmf_timestamp;
-
-	int no_sound;
-
-#ifdef GSMOPEN_PORTAUDIO
-	 int speexecho;
-	   int speexpreprocess;
-	     int portaudiocindex;          /*!< \brief Index of the Portaudio capture audio device */
-	       int portaudiopindex;          /*!< \brief Index of the Portaudio playback audio device */
-	         PABLIO_Stream *stream;
-
-#ifdef WANT_SPEEX
-    SpeexPreprocessState *preprocess;
-    SpeexEchoState *echo_state;
-#endif// WANT_SPEEX
-#endif// GSMOPEN_PORTAUDIO
-		 dtmf_rx_state_t dtmf_state;
-		 int active;
-		 int home_network_registered;
-		 int roaming_registered;
-		 int not_registered;
-		 int got_signal;
-		 char imei[128];
-		 int requesting_imei;
-		 char imsi[128];
-		 int requesting_imsi;
-		 int network_creg_not_supported;
-		 char creg[128];
-
-};
-
-typedef struct private_object private_t;
-
-void *SWITCH_THREAD_FUNC gsmopen_api_thread_func(switch_thread_t * thread, void *obj);
-int gsmopen_audio_read(private_t * tech_pvt);
-int gsmopen_audio_init(private_t * tech_pvt);
-int gsmopen_signaling_read(private_t * tech_pvt);
-
-int gsmopen_call(private_t * tech_pvt, char *idest, int timeout);
-int gsmopen_senddigit(private_t * tech_pvt, char digit);
-
-void *gsmopen_do_tcp_srv_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC gsmopen_do_tcp_srv_thread(switch_thread_t * thread, void *obj);
-
-void *gsmopen_do_tcp_cli_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC gsmopen_do_tcp_cli_thread(switch_thread_t * thread, void *obj);
-
-void *gsmopen_do_gsmopenapi_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC gsmopen_do_gsmopenapi_thread(switch_thread_t * thread, void *obj);
-int dtmf_received(private_t * tech_pvt, char *value);
-int start_audio_threads(private_t * tech_pvt);
-int new_inbound_channel(private_t * tech_pvt);
-int outbound_channel_answered(private_t * tech_pvt);
-//int gsmopen_signaling_write(private_t * tech_pvt, char *msg_to_gsmopen);
-#if defined(WIN32) && !defined(__CYGWIN__)
-int gsmopen_pipe_read(switch_file_t * pipe, short *buf, int howmany);
-int gsmopen_pipe_write(switch_file_t * pipe, short *buf, int howmany);
-/* Visual C do not have strsep ? */
-char *strsep(char **stringp, const char *delim);
-#else
-int gsmopen_pipe_read(int pipe, short *buf, int howmany);
-int gsmopen_pipe_write(int pipe, short *buf, int howmany);
-#endif /* WIN32 */
-int gsmopen_close_socket(unsigned int fd);
-private_t *find_available_gsmopen_interface_rr(private_t * tech_pvt_calling);
-int remote_party_is_ringing(private_t * tech_pvt);
-int remote_party_is_early_media(private_t * tech_pvt);
-//int gsmopen_answer(private_t * tech_pvt, char *id, char *value);
-#if 0
-int gsmopen_transfer(private_t * tech_pvt, char *id, char *value);
-#endif //0
-int gsmopen_socket_create_and_bind(private_t * tech_pvt, int *which_port);
-
-
-
-
-
-void *gsmopen_do_controldev_thread(void *data);
-#ifdef WIN32
-int gsmopen_serial_init(private_t * tech_pvt, int controldevice_speed);
-#else
-int gsmopen_serial_init(private_t * tech_pvt, speed_t controldevice_speed);
-#endif //WIN32
-int gsmopen_serial_monitor(private_t * tech_pvt);
-int gsmopen_serial_sync(private_t * tech_pvt);
-int gsmopen_serial_sync_AT(private_t * tech_pvt);
-int gsmopen_serial_config(private_t * tech_pvt);
-int gsmopen_serial_config_AT(private_t * tech_pvt);
-
-#define gsmopen_serial_write_AT_expect(P, D, S) gsmopen_serial_write_AT_expect1(P, D, S, 1, 2)
-#define gsmopen_serial_write_AT_expect_noexpcr(P, D, S) gsmopen_serial_write_AT_expect1(P, D, S, 0, 2)
-#define gsmopen_serial_write_AT_expect_noexpcr_tout(P, D, S, T) gsmopen_serial_write_AT_expect1(P, D, S, 0, T)
-// 20.5 sec timeout, used for querying the SIM and sending SMSs
-#define gsmopen_serial_write_AT_expect_longtime(P, D, S) gsmopen_serial_write_AT_expect1(P, D, S, 1, 20)
-#define gsmopen_serial_write_AT_expect_longtime_noexpcr(P, D, S) gsmopen_serial_write_AT_expect1(P, D, S, 0, 20)
-int gsmopen_serial_write_AT(private_t * tech_pvt, const char *data);
-int gsmopen_serial_write_AT_nocr(private_t * tech_pvt, const char *data);
-int gsmopen_serial_write_AT_ack(private_t * tech_pvt, const char *data);
-int gsmopen_serial_write_AT_ack_nocr_longtime(private_t * tech_pvt, const char *data);
-int gsmopen_serial_write_AT_noack(private_t * tech_pvt, const char *data);
-int gsmopen_serial_write_AT_expect1(private_t * tech_pvt, const char *data, const char *expected_string, int expect_crlf, int seconds);
-int gsmopen_serial_AT_expect(private_t * tech_pvt, const char *expected_string, int expect_crlf, int seconds);
-int gsmopen_serial_read_AT(private_t * tech_pvt, int look_for_ack, int timeout_usec, int timeout_sec, const char *expected_string, int expect_crlf);
-int gsmopen_serial_read(private_t * tech_pvt);
-#ifdef NOTDEF
-int gsmopen_serial_getstatus(private_t * tech_pvt);
-int gsmopen_serial_hangup(private_t * tech_pvt);
-int gsmopen_serial_answer(private_t * tech_pvt);
-int gsmopen_serial_answer_AT(private_t * tech_pvt);
-int gsmopen_serial_hangup_AT(private_t * tech_pvt);
-int gsmopen_serial_call_AT(private_t * tech_pvt, char *dstr);
-int gsmopen_serial_getstatus_AT(private_t * tech_pvt);
-#endif // NOTDEF
-#define RESULT_FAILURE 0
-#define RESULT_SUCCESS 1
-int utf_to_ucs2(private_t * tech_pvt, char *utf_in, size_t inbytesleft, char *ucs2_out, size_t outbytesleft);
-int ucs2_to_utf8(private_t * tech_pvt, char *ucs2_in, char *utf8_out, size_t outbytesleft);
-//#define PUSHA_UNLOCKA(x)    pthread_cleanup_push(gsmopen_unlocka_log, (void *) x);
-//#define POPPA_UNLOCKA(x)    pthread_cleanup_pop(0);
-
-#define PUSHA_UNLOCKA(x)    if(option_debug > 100) ERRORA("PUSHA_UNLOCKA: %p\n", GSMOPEN_P_LOG, (void *)x);
-#define POPPA_UNLOCKA(x)    if(option_debug > 100) ERRORA("POPPA_UNLOCKA: %p\n", GSMOPEN_P_LOG, (void *)x);
-//#define LOKKA(x)    if(option_debug > 100) ERRORA("LOKKA: %p\n", GSMOPEN_P_LOG, (void *)x);
-#define LOKKA(x)    switch_mutex_lock(x);
-#define UNLOCKA(x)  switch_mutex_unlock(x);
-//#define UNLOCKA(x)    if(option_debug > 100) ERRORA("UNLOCKA: %p\n", GSMOPEN_P_LOG, (void *)x);
-
-#define gsmopen_queue_control(x, y) ERRORA("gsmopen_queue_control: %p, %d\n", GSMOPEN_P_LOG, (void *)x, y);
-
-#define ast_setstate(x, y) ERRORA("ast_setstate: %p, %d\n", GSMOPEN_P_LOG, (void *)x, y);
-
-int gsmopen_serial_read(private_t * tech_pvt);
-int gsmopen_answer(private_t * tech_pvt);
-int gsmopen_serial_answer(private_t * tech_pvt);
-int gsmopen_serial_answer_AT(private_t * tech_pvt);
-int gsmopen_serial_hangup(private_t * tech_pvt);
-int gsmopen_serial_hangup_AT(private_t * tech_pvt);
-int gsmopen_hangup(private_t * tech_pvt);
-int gsmopen_serial_call(private_t * tech_pvt, char *dstr);
-int gsmopen_serial_call_AT(private_t * tech_pvt, char *dstr);
-int gsmopen_sendsms(private_t * tech_pvt, char *dest, char *text);
-
-#ifdef GSMOPEN_ALSA
-int alsa_init(private_t * tech_pvt);
-int alsa_shutdown(private_t * tech_pvt);
-snd_pcm_t *alsa_open_dev(private_t * tech_pvt, snd_pcm_stream_t stream);
-int alsa_write(private_t * tech_pvt, short *data, int datalen);
-int alsa_read(private_t * tech_pvt, short *data, int datalen);
-
-#endif /* GSMOPEN_ALSA */
-
-
-void gsmopen_store_boost(char *s, double *boost);
-int gsmopen_sound_boost(void *data, int samples_num, double boost);
-int sms_incoming(private_t * tech_pvt);
-int gsmopen_ring(private_t * tech_pvt);
-
-int iso_8859_1_to_utf8(private_t * tech_pvt, char *iso_8859_1_in, char *utf8_out, size_t outbytesleft);
-int gsmopen_serial_getstatus_AT(private_t * tech_pvt);
-
-
-#ifdef GSMOPEN_PORTAUDIO
-
-int gsmopen_portaudio_devlist(private_t *tech_pvt);
-
-int gsmopen_portaudio_init(private_t *tech_pvt);
-
-int gsmopen_portaudio_write(private_t * tech_pvt, short *data, int datalen);
-
-int gsmopen_portaudio_read(private_t * tech_pvt, short *data, int datalen);
-
-
-int gsmopen_portaudio_shutdown(private_t *tech_pvt);
-
-#endif // GSMOPEN_PORTAUDIO
-int dump_event(private_t *tech_pvt);
-int alarm_event(private_t * tech_pvt, int alarm_code, const char *alarm_message);
-int dump_event_full(private_t * tech_pvt, int is_alarm, int alarm_code, const char *alarm_message);
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen_protocol.c b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen_protocol.c
deleted file mode 100644
index 5a97ffa873..0000000000
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen_protocol.c
+++ /dev/null
@@ -1,4009 +0,0 @@
-#include "gsmopen.h"
-//#include <iostream.h>
-
-#ifndef NO_GSMLIB
-#include <gsmlib/gsm_sms.h>
-#ifdef WIN32
-#include <gsmlib/gsm_win32_serial.h>
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#endif
-#include <gsmlib/gsm_me_ta.h>
-#include <iostream>
-
-
-using namespace std;
-using namespace gsmlib;
-#endif// NO_GSMLIB
-
-#ifdef ASTERISK
-#define gsmopen_sleep usleep
-#define gsmopen_strncpy strncpy
-#define tech_pvt p
-extern int gsmopen_debug;
-extern char *gsmopen_console_active;
-#else /* FREESWITCH */
-#define gsmopen_sleep switch_sleep
-#define gsmopen_strncpy switch_copy_string
-extern switch_memory_pool_t *gsmopen_module_pool;
-extern switch_endpoint_interface_t *gsmopen_endpoint_interface;
-#endif /* ASTERISK */
-//int samplerate_gsmopen = SAMPLERATE_GSMOPEN;
-
-extern int running;
-int gsmopen_dir_entry_extension = 1;
-
-int option_debug = 100;
-
-
-#ifdef WIN32
-#define GSMLIBGIO
-#else //WIN32
-#undef GSMLIBGIO
-#endif //WIN32
-
-#ifdef WIN32
-/***************/
-// from http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/
-
-#include <time.h>
-
-#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
-#else /*  */
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
-#endif /*  */
-struct sk_timezone {
-	int tz_minuteswest;			/* minutes W of Greenwich */
-	int tz_dsttime;				/* type of dst correction */
-};
-int gettimeofday(struct timeval *tv, struct sk_timezone *tz)
-{
-	FILETIME ft;
-	unsigned __int64 tmpres = 0;
-	static int tzflag;
-	if (NULL != tv) {
-		GetSystemTimeAsFileTime(&ft);
-		tmpres |= ft.dwHighDateTime;
-		tmpres <<= 32;
-		tmpres |= ft.dwLowDateTime;
-
-		/*converting file time to unix epoch */
-		tmpres /= 10;			/*convert into microseconds */
-		tmpres -= DELTA_EPOCH_IN_MICROSECS;
-		tv->tv_sec = (long) (tmpres / 1000000UL);
-		tv->tv_usec = (long) (tmpres % 1000000UL);
-	}
-	if (NULL != tz) {
-		if (!tzflag) {
-			_tzset();
-			tzflag++;
-		}
-		tz->tz_minuteswest = _timezone / 60;
-		tz->tz_dsttime = _daylight;
-	}
-	return 0;
-}
-
-/***************/
-#endif /* WIN32 */
-
-#ifdef GSMOPEN_PORTAUDIO
-#include "pablio.h"
-
-#ifndef GIOVA48
-#define SAMPLES_PER_FRAME 160
-#else // GIOVA48
-#define SAMPLES_PER_FRAME 960
-#endif // GIOVA48
-
-int gsmopen_portaudio_devlist(private_t *tech_pvt)
-{
-  int i, numDevices;
-  const PaDeviceInfo *deviceInfo;
-
-  numDevices = Pa_GetDeviceCount();
-  if (numDevices < 0) {
-    return 0;
-  }
-  for (i = 0; i < numDevices; i++) {
-    deviceInfo = Pa_GetDeviceInfo(i);
-    NOTICA
-      ("Found PORTAUDIO device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-       GSMOPEN_P_LOG, i, deviceInfo->name, deviceInfo->maxInputChannels,
-       deviceInfo->maxOutputChannels);
-  }
-
-  return numDevices;
-}
-
-int gsmopen_portaudio_init(private_t *tech_pvt)
-{
-  PaError err;
-  int c;
-  PaStreamParameters inputParameters, outputParameters;
-  int numdevices;
-  const PaDeviceInfo *deviceInfo;
-
-#ifndef GIOVA48
-  setenv("PA_ALSA_PLUGHW", "1", 1);
-#endif // GIOVA48
-
-  err = Pa_Initialize();
-  if (err != paNoError)
-    return err;
-
-  numdevices = gsmopen_portaudio_devlist(tech_pvt);
-
-  if (tech_pvt->portaudiocindex > (numdevices - 1)) {
-    ERRORA("Portaudio Capture id=%d is out of range: valid id are from 0 to %d\n",
-           GSMOPEN_P_LOG, tech_pvt->portaudiocindex, (numdevices - 1));
-    return -1;
-  }
-
-  if (tech_pvt->portaudiopindex > (numdevices - 1)) {
-    ERRORA("Portaudio Playback id=%d is out of range: valid id are from 0 to %d\n",
-           GSMOPEN_P_LOG, tech_pvt->portaudiopindex, (numdevices - 1));
-    return -1;
-  }
-  //inputParameters.device = 0;
-  if (tech_pvt->portaudiocindex != -1) {
-    inputParameters.device = tech_pvt->portaudiocindex;
-  } else {
-    inputParameters.device = Pa_GetDefaultInputDevice();
-  }
-  deviceInfo = Pa_GetDeviceInfo(inputParameters.device);
-  NOTICA
-    ("Using INPUT PORTAUDIO device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-     GSMOPEN_P_LOG, inputParameters.device, deviceInfo->name,
-     deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
-  if (deviceInfo->maxInputChannels == 0) {
-    ERRORA
-      ("No INPUT channels on device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-       GSMOPEN_P_LOG, inputParameters.device, deviceInfo->name,
-       deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
-    return -1;
-  }
-  inputParameters.channelCount = 1;
-  inputParameters.sampleFormat = paInt16;
-  //inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultHighInputLatency;
-  inputParameters.suggestedLatency = 0.1;
-  inputParameters.hostApiSpecificStreamInfo = NULL;
-
-  //outputParameters.device = 3;
-  if (tech_pvt->portaudiopindex != -1) {
-    outputParameters.device = tech_pvt->portaudiopindex;
-  } else {
-    outputParameters.device = Pa_GetDefaultOutputDevice();
-  }
-  deviceInfo = Pa_GetDeviceInfo(outputParameters.device);
-  NOTICA
-    ("Using OUTPUT PORTAUDIO device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-     GSMOPEN_P_LOG, outputParameters.device, deviceInfo->name,
-     deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
-  if (deviceInfo->maxOutputChannels == 0) {
-    ERRORA
-      ("No OUTPUT channels on device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-       GSMOPEN_P_LOG, inputParameters.device, deviceInfo->name,
-       deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
-    return -1;
-  }
-#ifndef GIOVA48
-  outputParameters.channelCount = 1;
-#else // GIOVA48
-  outputParameters.channelCount = 2;
-#endif // GIOVA48
-  outputParameters.sampleFormat = paInt16;
-  //outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultHighOutputLatency;
-  outputParameters.suggestedLatency = 0.1;
-  outputParameters.hostApiSpecificStreamInfo = NULL;
-
-/* build the pipe that will be polled on by pbx */
-  c = pipe(tech_pvt->audiopipe);
-  if (c) {
-    ERRORA("Unable to create audio pipe\n", GSMOPEN_P_LOG);
-    return -1;
-  }
-  fcntl(tech_pvt->audiopipe[0], F_SETFL, O_NONBLOCK);
-  fcntl(tech_pvt->audiopipe[1], F_SETFL, O_NONBLOCK);
-
-  err =
-#ifndef GIOVA48
-    OpenAudioStream(&tech_pvt->stream, &inputParameters, &outputParameters, 8000,
-                    paClipOff|paDitherOff, SAMPLES_PER_FRAME, 0);
-                    //&tech_pvt->speexecho, &tech_pvt->speexpreprocess, &tech_pvt->owner);
-
-#else // GIOVA48
-    OpenAudioStream(&tech_pvt->stream, &inputParameters, &outputParameters, 48000,
-                    paDitherOff | paClipOff, SAMPLES_PER_FRAME, tech_pvt->audiopipe[1],
-                    &tech_pvt->speexecho, &tech_pvt->speexpreprocess, &tech_pvt->owner);
-
-
-#endif// GIOVA48
-  if (err != paNoError) {
-    ERRORA("Unable to open audio stream: %s\n", GSMOPEN_P_LOG, Pa_GetErrorText(err));
-    return -1;
-  }
-
-/* the pipe is our audio fd for pbx to poll on */
-  tech_pvt->gsmopen_sound_capt_fd = tech_pvt->audiopipe[0];
-
-  return 0;
-}
-//int gsmopen_portaudio_write(private_t *tech_pvt, struct ast_frame *f)
-int gsmopen_portaudio_write(private_t * tech_pvt, short *data, int datalen)
-{
-  int samples;
-#ifdef GIOVA48
-	//short buf[GSMOPEN_FRAME_SIZE * 2];
-	short buf[3840];
-	short *buf2;
-
-    //ERRORA("1 f->datalen=: %d\n", GSMOPEN_P_LOG, f->datalen);
-
-
-
-
-	memset(buf, '\0', GSMOPEN_FRAME_SIZE *2);
-
-	buf2 = f->data;
-
-	  int i=0, a=0;
-
-	  for(i=0; i< f->datalen / sizeof(short); i++){
-//stereo, 2 chan 48 -> mono 8
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  buf[a] = buf2[i];
-		  a++;
-		  /*
-		  */
-	  }
-	  f->data = &buf;
-	  f->datalen = f->datalen * 6;
-    //ERRORA("2 f->datalen=: %d\n", GSMOPEN_P_LOG, f->datalen);
-	  //f->datalen = f->datalen;
-#endif // GIOVA48
-
-
-  samples =
-    WriteAudioStream(tech_pvt->stream, (short *) data, (int) (datalen / sizeof(short)), &tech_pvt->timer_write);
-
-  if (samples != (int) (datalen / sizeof(short)))
-    ERRORA("WriteAudioStream wrote: %d of %d\n", GSMOPEN_P_LOG, samples,
-           (int) (datalen / sizeof(short)));
-
-  return samples;
-}
-//struct ast_frame *gsmopen_portaudio_read(private_t *tech_pvt)
-#define AST_FRIENDLY_OFFSET 0
-int gsmopen_portaudio_read(private_t * tech_pvt, short *data, int datalen)
-{
-#if 0
-  //static struct ast_frame f;
-  static short __buf[GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
-  short *buf;
-  static short __buf2[GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
-  short *buf2;
-  int samples;
-  //char c;
-
-  memset(__buf, '\0', (GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2));
-
-  buf = __buf + AST_FRIENDLY_OFFSET / 2;
-
-  memset(__buf2, '\0', (GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2));
-
-  buf2 = __buf2 + AST_FRIENDLY_OFFSET / 2;
-
-#if 0
-  f.frametype = AST_FRAME_NULL;
-  f.subclass = 0;
-  f.samples = 0;
-  f.datalen = 0;
-
-#ifdef ASTERISK_VERSION_1_6_1
-  f.data.ptr = NULL;
-#else
-  f.data = NULL;
-#endif /* ASTERISK_VERSION_1_6_1 */
-  f.offset = 0;
-  f.src = gsmopen_type;
-  f.mallocd = 0;
-  f.delivery.tv_sec = 0;
-  f.delivery.tv_usec = 0;
-#endif //0
-
-  //if ((samples = ReadAudioStream(tech_pvt->stream, buf, SAMPLES_PER_FRAME)) == 0) 
-  //if ((samples = ReadAudioStream(tech_pvt->stream, data, datalen/sizeof(short))) == 0) 
-  if (samples = ReadAudioStream(tech_pvt->stream, (short *)data, datalen, &tech_pvt->timer_read) == 0) {
-    //do nothing
-  } else {
-#ifdef GIOVA48
-	  int i=0, a=0;
-
-	  samples = samples / 6;
-	  for(i=0; i< samples; i++){
-		  buf2[i] = buf[a];
-		  a = a + 6; //mono, 1 chan 48 -> 8
-	  }
-	  buf = buf2;
-
-#if 0
-    /* A real frame */
-    f.frametype = AST_FRAME_VOICE;
-    f.subclass = AST_FORMAT_SLINEAR;
-    f.samples = GSMOPEN_FRAME_SIZE/6;
-    f.datalen = GSMOPEN_FRAME_SIZE * 2/6;
-#endif //0
-#else// GIOVA48
-#if 0
-    /* A real frame */
-    f.frametype = AST_FRAME_VOICE;
-    f.subclass = AST_FORMAT_SLINEAR;
-    f.samples = GSMOPEN_FRAME_SIZE;
-    f.datalen = GSMOPEN_FRAME_SIZE * 2;
-#endif //0
-#endif// GIOVA48
-
-#if 0
-#ifdef ASTERISK_VERSION_1_6_1
-    f.data.ptr = buf;
-#else
-    f.data = buf;
-#endif /* ASTERISK_VERSION_1_6_1 */
-    f.offset = AST_FRIENDLY_OFFSET;
-    f.src = gsmopen_type;
-    f.mallocd = 0;
-#endif //0
-  }
-
-#if 0
-  read(tech_pvt->audiopipe[0], &c, 1);
-
-  return &f;
-#endif //0
-#endif //0
-
-  int samples;
-  samples = ReadAudioStream(tech_pvt->stream, (short *)data, datalen, &tech_pvt->timer_read);
-    //WARNINGA("samples=%d\n", GSMOPEN_P_LOG, samples);
-
-  return samples;
-}
-int gsmopen_portaudio_shutdown(private_t *tech_pvt)
-{
-  PaError err;
-
-  err = CloseAudioStream(tech_pvt->stream);
-
-  if (err != paNoError)
-    ERRORA("not able to CloseAudioStream\n", GSMOPEN_P_LOG);
-
-  Pa_Terminate();
-  return 0;
-}
-
-
-
-
-#endif // GSMOPEN_PORTAUDIO
-#ifndef GSMLIBGIO
-int gsmopen_serial_init(private_t * tech_pvt, speed_t controldevice_speed)
-{
-	int fd;
-	int rt;
-	struct termios tp;
-	unsigned int status = 0;
-	unsigned int flags = TIOCM_DTR;
-
-/* if there is a file descriptor, close it. But it is probably just an old value, so don't check for close success*/
-	fd = tech_pvt->controldevfd;
-	if (fd) {
-		close(fd);
-	}
-/*  open the serial port */
-//#ifdef __CYGWIN__
-	fd = open(tech_pvt->controldevice_name, O_RDWR | O_NOCTTY | O_NONBLOCK);
-	sleep(1);
-	close(fd);
-//#endif /* __CYGWIN__ */
-	fd = open(tech_pvt->controldevice_name, O_RDWR | O_NOCTTY | O_NONBLOCK);
-	if (fd == -1) {
-		perror("open error ");
-		DEBUGA_GSMOPEN("serial error: %s\n", GSMOPEN_P_LOG, strerror(errno));
-		tech_pvt->controldevfd = fd;
-		return -1;
-	}
-/*  flush it */
-	rt = tcflush(fd, TCIFLUSH);
-	if (rt == -1) {
-		ERRORA("serial error: %s", GSMOPEN_P_LOG, strerror(errno));
-	}
-/*  attributes */
-	tp.c_cflag = B0 | CS8 | CLOCAL | CREAD | HUPCL;
-	tp.c_iflag = IGNPAR;
-	tp.c_cflag &= ~CRTSCTS;
-	tp.c_oflag = 0;
-	tp.c_lflag = 0;
-	tp.c_cc[VMIN] = 1;
-	tp.c_cc[VTIME] = 0;
-/*  set controldevice_speed */
-	rt = cfsetispeed(&tp, tech_pvt->controldevice_speed);
-	if (rt == -1) {
-		ERRORA("serial error: %s, speed was: %d", GSMOPEN_P_LOG, strerror(errno), tech_pvt->controldevice_speed);
-	}
-	rt = cfsetospeed(&tp, tech_pvt->controldevice_speed);
-	if (rt == -1) {
-		ERRORA("serial error: %s", GSMOPEN_P_LOG, strerror(errno));
-	}
-/*  set port attributes */
-	if (tcsetattr(fd, TCSADRAIN, &tp) == -1) {
-		ERRORA("serial error: %s", GSMOPEN_P_LOG, strerror(errno));
-	}
-	rt = tcsetattr(fd, TCSANOW, &tp);
-	if (rt == -1) {
-		ERRORA("serial error: %s", GSMOPEN_P_LOG, strerror(errno));
-	}
-#ifndef __CYGWIN__
-	ioctl(fd, TIOCMGET, &status);
-	status |= TIOCM_DTR;		/*  Set DTR high */
-	status &= ~TIOCM_RTS;		/*  Set RTS low */
-	ioctl(fd, TIOCMSET, &status);
-	ioctl(fd, TIOCMGET, &status);
-	ioctl(fd, TIOCMBIS, &flags);
-	flags = TIOCM_RTS;
-	ioctl(fd, TIOCMBIC, &flags);
-	ioctl(fd, TIOCMGET, &status);
-#else /* __CYGWIN__ */
-	ioctl(fd, TIOCMGET, &status);
-	status |= TIOCM_DTR;		/*  Set DTR high */
-	status &= ~TIOCM_RTS;		/*  Set RTS low */
-	ioctl(fd, TIOCMSET, &status);
-#endif /* __CYGWIN__ */
-	tech_pvt->controldevfd = fd;
-	DEBUGA_GSMOPEN("Syncing Serial, fd=%d, protocol=%d\n", GSMOPEN_P_LOG, fd, tech_pvt->controldevprotocol);
-	rt = gsmopen_serial_sync(tech_pvt);
-	if (rt == -1) {
-		ERRORA("Serial init error\n", GSMOPEN_P_LOG);
-		return -1;
-	}
-	return (fd);
-}
-#else //GSMLIBGIO
-#ifdef WIN32
-int gsmopen_serial_init(private_t * tech_pvt, int controldevice_speed)
-#else 
-int gsmopen_serial_init(private_t * tech_pvt, speed_t controldevice_speed)
-#endif //WIN32
-{
-	int i;
-	string ciapa;
-	SMSMessageRef sms;
-	char content2[1000];
-	int size;
-
-#ifdef WIN32
-	Ref <Port> port = new Win32SerialPort((string) tech_pvt->controldevice_name, 38400);
-#else
-	//Ref<Port> port = new UnixSerialPort((string)argv[1], B38400);
-	Ref < Port > port = new UnixSerialPort((string) tech_pvt->controldevice_name, B115200);
-#endif
-	MeTa m(port);
-
-	//cout << "Creating GsmAt object" << endl;
-	Ref <GsmAt> gsmat = new GsmAt(m);
-
-	//cout << "Using GsmAt object" << endl;
-	//cout << gsmat->chat("AT", "OK", false, false) << endl;
-	//cout << gsmat->chat("D3472665618;") << endl;
-	gsmat->putLine("AT+cgmm", true);
-	for (i = 0; i < 4; i++) {
-		ciapa = gsmat->getLine();
-		//cout << "PRESO: |||" << ciapa << "|||" << endl;
-		NOTICA("PRESO %d |||%s|||\n", GSMOPEN_P_LOG, i, ciapa.c_str());
-		//gsmopen_sleep(5000);
-	}
-
-		sms = SMSMessage::decode("079194710167120004038571F1390099406180904480A0D41631067296EF7390383D07CD622E58CD95CB81D6EF39BDEC66BFE7207A794E2FBB4320AFB82C07E56020A8FC7D9687DBED32285C9F83A06F769A9E5EB340D7B49C3E1FA3C3663A0B24E4CBE76516680A7FCBE920725A5E5ED341F0B21C346D4E41E1BA790E4286DDE4BC0BD42CA3E5207258EE1797E5A0BA9B5E9683C86539685997EBEF61341B249BC966"); // dataCodingScheme = 0
-		NOTICA("SMS=\n%s\n", GSMOPEN_P_LOG, sms->toString().c_str());
-		sms = SMSMessage::decode("0791934329002000040C9193432766658100009001211133318004D4F29C0E"); // dataCodingScheme = 0
-		NOTICA("SMS=\n%s\n", GSMOPEN_P_LOG, sms->toString().c_str());
-		sms = SMSMessage::decode("0791934329002000040C919343276665810008900121612521801600CC00E800E900F900F200E00020006300690061006F"); // dataCodingScheme = 8
-		NOTICA("SMS=\n%s\n", GSMOPEN_P_LOG, sms->toString().c_str());
-		sms = SMSMessage::decode("0791934329002000040C919343276665810008900172002293404C006300690061006F0020003100320033002000620065006C00E80020043D043E0432043E044104420438002005DC05E7002005E805D005EA0020FE8EFEE0FEA0FEE4FECBFE9300204EBA5927");	// dataCodingScheme = 8 , text=ciao 123 belè новости לק ראת ﺎﻠﺠﻤﻋﺓ 人大
-		NOTICA("SMS=\n%s\n", GSMOPEN_P_LOG, sms->toString().c_str());
-		sms = SMSMessage::decode("07911497941902F00414D0E474989D769F5DE4320839001040122151820000"); // dataCodingScheme = 0
-		NOTICA("SMS=\n%s\n", GSMOPEN_P_LOG, sms->toString().c_str());
-
-#if 0
-            size = MultiByteToWideChar(CP_OEMCP, 0, username, strlen(username)+1, UserName, 0);
-            UserName=(wchar_t*)GlobalAlloc(GME­ M_ZEROINIT, size);
-            ret = MultiByteToWideChar(CP_OEMCP, 0, username, strlen(username)+1, UserName, size);
-            if(ret == 0)
-                getError(GetLastError());
-#endif //0
-	return (-1);
-}
-
-#endif //GSMLIBGIO
-
-
-int gsmopen_serial_read(private_t * tech_pvt)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_read_AT(tech_pvt, 0, 100000, 0, NULL, 1);	// a 10th of a second timeout
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_read_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_read_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-	return -1;
-}
-
-
-int gsmopen_serial_sync(private_t * tech_pvt)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_sync_AT(tech_pvt);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_sync_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_sync_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-
-	return -1;
-}
-
-int gsmopen_serial_config(private_t * tech_pvt)
-{
-#ifndef NO_GSMLIB
-		SMSMessageRef sms;
-		char content2[1000];
-		//sms = SMSMessage::decode("079194710167120004038571F1390099406180904480A0D41631067296EF7390383D07CD622E58CD95CB81D6EF39BDEC66BFE7207A794E2FBB4320AFB82C07E56020A8FC7D9687DBED32285C9F83A06F769A9E5EB340D7B49C3E1FA3C3663A0B24E4CBE76516680A7FCBE920725A5E5ED341F0B21C346D4E41E1BA790E4286DDE4BC0BD42CA3E5207258EE1797E5A0BA9B5E9683C86539685997EBEF61341B249BC966"); // dataCodingScheme = 0
-		//sms = SMSMessage::decode("0791934329002000040C9193432766658100009001211133318004D4F29C0E"); // dataCodingScheme = 0
-		//sms = SMSMessage::decode("0791934329002000040C919343276665810008900121612521801600CC00E800E900F900F200E00020006300690061006F"); // dataCodingScheme = 8
-		sms = SMSMessage::decode("0791934329002000040C919343276665810008900172002293404C006300690061006F0020003100320033002000620065006C00E80020043D043E0432043E044104420438002005DC05E7002005E805D005EA0020FE8EFEE0FEA0FEE4FECBFE9300204EBA5927");	// dataCodingScheme = 8 , text=ciao 123 belè новости לק ראת ﺎﻠﺠﻤﻋﺓ 人大
-		//sms = SMSMessage::decode("07911497941902F00414D0E474989D769F5DE4320839001040122151820000"); // dataCodingScheme = 0
-		//NOTICA("SMS=\n%s\n", GSMOPEN_P_LOG, sms->toString().c_str());
-
-		memset(content2, '\0', sizeof(content2));
-		if (sms->dataCodingScheme().getAlphabet() == DCS_DEFAULT_ALPHABET) {
-			iso_8859_1_to_utf8(tech_pvt, (char *) sms->userData().c_str(), content2, sizeof(content2));
-		} else if (sms->dataCodingScheme().getAlphabet() == DCS_SIXTEEN_BIT_ALPHABET) {
-			ucs2_to_utf8(tech_pvt, (char *) bufToHex((unsigned char *) sms->userData().data(), sms->userData().length()).c_str(), content2,
-					sizeof(content2));
-		} else {
-			ERRORA("dataCodingScheme not supported=%d\n", GSMOPEN_P_LOG, sms->dataCodingScheme().getAlphabet());
-
-		}
-		//NOTICA("dataCodingScheme=%d\n", GSMOPEN_P_LOG, sms->dataCodingScheme().getAlphabet());
-		//NOTICA("userData= |||%s|||\n", GSMOPEN_P_LOG, content2);
-#endif// NO_GSMLIB
-
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_config_AT(tech_pvt);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_config_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_config_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-
-	return -1;
-}
-
-int gsmopen_serial_config_AT(private_t * tech_pvt)
-{
-	int res;
-	char at_command[5];
-	int i;
-
-/* initial_pause? */
-	if (tech_pvt->at_initial_pause) {
-		DEBUGA_GSMOPEN("sleeping for %d usec\n", GSMOPEN_P_LOG, tech_pvt->at_initial_pause);
-		gsmopen_sleep(tech_pvt->at_initial_pause);
-	}
-
-/* go until first empty preinit string, or last preinit string */
-	while (1) {
-
-		if (strlen(tech_pvt->at_preinit_1)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_1, tech_pvt->at_preinit_1_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_1, tech_pvt->at_preinit_1_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_preinit_2)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_2, tech_pvt->at_preinit_2_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_2, tech_pvt->at_preinit_2_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_preinit_3)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_3, tech_pvt->at_preinit_3_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_3, tech_pvt->at_preinit_3_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_preinit_4)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_4, tech_pvt->at_preinit_4_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_4, tech_pvt->at_preinit_4_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_preinit_5)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_5, tech_pvt->at_preinit_5_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_5, tech_pvt->at_preinit_5_expect);
-			}
-		} else {
-			break;
-		}
-
-		break;
-	}
-
-/* after_preinit_pause? */
-	if (tech_pvt->at_after_preinit_pause) {
-		DEBUGA_GSMOPEN("sleeping for %d usec\n", GSMOPEN_P_LOG, tech_pvt->at_after_preinit_pause);
-		gsmopen_sleep(tech_pvt->at_after_preinit_pause);
-	}
-
-	/* phone, brother, art you alive? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT");
-	if (res) {
-		ERRORA("no response to AT\n", GSMOPEN_P_LOG);
-		return -1;
-	}
-	/* for motorola, bring it back to "normal" mode if it happens to be in another mode */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+mode=0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+mode=0 does not get OK from the phone. If it is NOT Motorola," " no problem.\n", GSMOPEN_P_LOG);
-	}
-	gsmopen_sleep(50000);
-	/* for motorola end */
-
-	/* reset AT configuration to phone default */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "ATZ");
-	if (res) {
-		DEBUGA_GSMOPEN("ATZ failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* disable AT command echo */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "ATE0");
-	if (res) {
-		DEBUGA_GSMOPEN("ATE0 failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* disable extended error reporting */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMEE=0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CMEE failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* various phone manufacturer identifier */
-	for (i = 0; i < 10; i++) {
-		memset(at_command, 0, sizeof(at_command));
-		sprintf(at_command, "ATI%d", i);
-		res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-		if (res) {
-			DEBUGA_GSMOPEN("ATI%d command failed, continue\n", GSMOPEN_P_LOG, i);
-		}
-	}
-
-	/* phone manufacturer */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CGMI");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CGMI failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* phone model */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CGMM");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CGMM failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* signal network registration with a +CREG unsolicited msg */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CREG=1");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CREG=1 failed\n", GSMOPEN_P_LOG);
-		tech_pvt->network_creg_not_supported = 1;
-	}
-	if(!tech_pvt->network_creg_not_supported){
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CREG?");
-		if (res) {
-			DEBUGA_GSMOPEN("AT+CREG? failed\n", GSMOPEN_P_LOG);
-		}
-	}
-	/* query signal strength */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSQ");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CSQ failed\n", GSMOPEN_P_LOG);
-	}
-	/* IMEI */
-	tech_pvt->requesting_imei = 1;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+GSN");
-	tech_pvt->requesting_imei = 0;
-	if (res) {
-		DEBUGA_GSMOPEN("AT+GSN failed\n", GSMOPEN_P_LOG);
-		tech_pvt->requesting_imei = 1;
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CGSN");
-		tech_pvt->requesting_imei = 0;
-		if (res) {
-			DEBUGA_GSMOPEN("AT+CGSN failed\n", GSMOPEN_P_LOG);
-		}
-	}
-	/* IMSI */
-	tech_pvt->requesting_imsi = 1;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CIMI");
-	tech_pvt->requesting_imsi = 0;
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CIMI failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* signal incoming SMS with a +CMTI unsolicited msg */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CNMI=3,1,0,0,0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CNMI=3,1,0,0,0 failed, continue\n", GSMOPEN_P_LOG);
-		tech_pvt->sms_cnmi_not_supported = 1;
-		tech_pvt->gsmopen_serial_sync_period = 30;	//FIXME in config
-	}
-	/* what is the Message Center address (number) to which the SMS has to be sent? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCA?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CSCA? failed, continue\n", GSMOPEN_P_LOG);
-	}
-	/* what is the Message Format of SMSs? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CMGF? failed, continue\n", GSMOPEN_P_LOG);
-	}
-#ifdef NO_GSMLIB
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=1");
-	if (res) {
-		ERRORA("Error setting SMS sending mode to TEXT on the cellphone, let's hope is TEXT by default. Continuing\n", GSMOPEN_P_LOG);
-	}
-	tech_pvt->sms_pdu_not_supported = 1;
-#else // NO_GSMLIB
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=0");
-	if (res) {
-		WARNINGA("Error setting SMS sending mode to PDU on the cellphone, falling back to TEXT mode. Continuing\n", GSMOPEN_P_LOG);
-		tech_pvt->sms_pdu_not_supported = 1;
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=1");
-		if (res) {
-			ERRORA("Error setting SMS sending mode to TEXT on the cellphone, let's hope is TEXT by default. Continuing\n", GSMOPEN_P_LOG);
-		}
-	}
-#endif // NO_GSMLIB
-	/* what is the Charset of SMSs? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CSCS? failed, continue\n", GSMOPEN_P_LOG);
-	}
-
-	tech_pvt->no_ucs2 = 0;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS=\"UCS2\"");
-	if (res) {
-		WARNINGA("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  do not got OK from the phone, let's try with 'GSM'\n", GSMOPEN_P_LOG);
-		tech_pvt->no_ucs2 = 1;
-	}
-
-	if (tech_pvt->no_ucs2) {
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS=\"GSM\"");
-		if (res) {
-			WARNINGA("AT+CSCS=\"GSM\" (set TE messages to GSM)  do not got OK from the phone\n", GSMOPEN_P_LOG);
-		}
-		//res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSMP=17,167,0,16"); //"flash", class 0  sms 7 bit
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSMP=17,167,0,0");	//normal, 7 bit message
-		if (res) {
-			WARNINGA("AT+CSMP do not got OK from the phone, continuing\n", GSMOPEN_P_LOG);
-		}
-	} else {
-		//res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSMP=17,167,0,20"); //"flash", class 0 sms 16 bit unicode
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSMP=17,167,0,8");	//unicode, 16 bit message
-		if (res) {
-			WARNINGA("AT+CSMP do not got OK from the phone, continuing\n", GSMOPEN_P_LOG);
-		}
-	}
-
-	/* is the unsolicited reporting of mobile equipment event supported? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMER=?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CMER=? failed, continue\n", GSMOPEN_P_LOG);
-	}
-	/* request unsolicited reporting of mobile equipment indicators' events, to be screened by categories reported by +CIND=? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMER=3,0,0,1");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CMER=? failed, continue\n", GSMOPEN_P_LOG);
-	}
-
-	/* is the solicited reporting of mobile equipment indications supported? */
-
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CIND=?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CIND=? failed, continue\n", GSMOPEN_P_LOG);
-	}
-
-	/* is the unsolicited reporting of call monitoring supported? sony-ericsson specific */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT*ECAM=?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT*ECAM=? failed, continue\n", GSMOPEN_P_LOG);
-	}
-	/* enable the unsolicited reporting of call monitoring. sony-ericsson specific */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT*ECAM=1");
-	if (res) {
-		DEBUGA_GSMOPEN("AT*ECAM=1 failed, continue\n", GSMOPEN_P_LOG);
-		tech_pvt->at_has_ecam = 0;
-	} else {
-		tech_pvt->at_has_ecam = 1;
-	}
-
-	/* disable unsolicited signaling of call list */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CLCC=0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CLCC=0 failed, continue\n", GSMOPEN_P_LOG);
-		tech_pvt->at_has_clcc = 0;
-	} else {
-		tech_pvt->at_has_clcc = 1;
-	}
-
-	/* give unsolicited caller id when incoming call */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CLIP=1");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CLIP failed, continue\n", GSMOPEN_P_LOG);
-	}
-	/* for motorola */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+MCST=1");	/* motorola call control codes
-																   (to know when call is disconnected (they
-																   don't give you "no carrier") */
-	if (res) {
-		DEBUGA_GSMOPEN("AT+MCST=1 does not get OK from the phone. If it is NOT Motorola," " no problem.\n", GSMOPEN_P_LOG);
-	}
-	/* for motorola end */
-
-/* go until first empty postinit string, or last postinit string */
-	while (1) {
-
-		if (strlen(tech_pvt->at_postinit_1)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_1, tech_pvt->at_postinit_1_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_1, tech_pvt->at_postinit_1_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_postinit_2)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_2, tech_pvt->at_postinit_2_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_2, tech_pvt->at_postinit_2_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_postinit_3)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_3, tech_pvt->at_postinit_3_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_3, tech_pvt->at_postinit_3_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_postinit_4)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_4, tech_pvt->at_postinit_4_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_4, tech_pvt->at_postinit_4_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_postinit_5)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_5, tech_pvt->at_postinit_5_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_5, tech_pvt->at_postinit_5_expect);
-			}
-		} else {
-			break;
-		}
-
-		break;
-	}
-
-	return 0;
-}
-
-
-int gsmopen_serial_sync_AT(private_t * tech_pvt)
-{
-	gsmopen_sleep(10000);				/* 10msec */
-	time(&tech_pvt->gsmopen_serial_synced_timestamp);
-	return 0;
-}
-int gsmopen_serial_read_AT(private_t * tech_pvt, int look_for_ack, int timeout_usec, int timeout_sec, const char *expected_string, int expect_crlf)
-{
-	int select_err = 1;
-	int res;
-	fd_set read_fds;
-	struct timeval timeout;
-	char tmp_answer[AT_BUFSIZ];
-	char tmp_answer2[AT_BUFSIZ];
-	char *tmp_answer_ptr;
-	char *last_line_ptr;
-	int i = 0;
-	int read_count = 0;
-	int la_counter = 0;
-	int at_ack = -1;
-	int la_read = 0;
-
-	if(!running || !tech_pvt->running){
-		return -1;
-	}
-
-	FD_ZERO(&read_fds);
-	FD_SET(tech_pvt->controldevfd, &read_fds);
-
-	//NOTICA (" INSIDE this gsmopen_serial_device %s \n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-	tmp_answer_ptr = tmp_answer;
-	memset(tmp_answer, 0, sizeof(char) * AT_BUFSIZ);
-
-	timeout.tv_sec = timeout_sec;
-	timeout.tv_usec = timeout_usec;
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-
-	while ((!tech_pvt->controldev_dead) && ((select_err = select(tech_pvt->controldevfd + 1, &read_fds, NULL, NULL, &timeout)) > 0)) {
-		char *token_ptr;
-		timeout.tv_sec = timeout_sec;	//reset the timeout, linux modify it
-		timeout.tv_usec = timeout_usec;	//reset the timeout, linux modify it
-		read_count = read(tech_pvt->controldevfd, tmp_answer_ptr, AT_BUFSIZ - (tmp_answer_ptr - tmp_answer));
-
-		if (read_count == 0) {
-			ERRORA
-				("read 0 bytes!!! Nenormalno! Marking this gsmopen_serial_device %s as dead, andif it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, power down or battery exhausted\n",
-				 GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-			tech_pvt->controldev_dead = 1;
-			close(tech_pvt->controldevfd);
-			ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-			tech_pvt->running=0;
-			alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-			tech_pvt->active=0;
-			tech_pvt->name[0]='\0';
-
-			UNLOCKA(tech_pvt->controldev_lock);
-			if (tech_pvt->owner) {
-				tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-				gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-			}
-			switch_sleep(1000000);
-			return -1;
-		}
-
-		if (option_debug > 90) {
-			//DEBUGA_GSMOPEN("1 read %d bytes, --|%s|--\n", GSMOPEN_P_LOG, read_count, tmp_answer_ptr);
-			//DEBUGA_GSMOPEN("2 read %d bytes, --|%s|--\n", GSMOPEN_P_LOG, read_count, tmp_answer);
-		}
-		tmp_answer_ptr = tmp_answer_ptr + read_count;
-
-
-		la_counter = 0;
-		memset(tmp_answer2, 0, sizeof(char) * AT_BUFSIZ);
-		strcpy(tmp_answer2, tmp_answer);
-		if ((token_ptr = strtok(tmp_answer2, "\n\r"))) {
-			last_line_ptr = token_ptr;
-			strncpy(tech_pvt->line_array.result[la_counter], token_ptr, AT_MESG_MAX_LENGTH);
-			if (strlen(token_ptr) > AT_MESG_MAX_LENGTH) {
-				WARNINGA
-					("AT mesg longer than buffer, original message was: |%s|, in buffer only: |%s|\n",
-					 GSMOPEN_P_LOG, token_ptr, tech_pvt->line_array.result[la_counter]);
-			}
-			la_counter++;
-			while ((token_ptr = strtok(NULL, "\n\r"))) {
-				last_line_ptr = token_ptr;
-				strncpy(tech_pvt->line_array.result[la_counter], token_ptr, AT_MESG_MAX_LENGTH);
-				if (strlen(token_ptr) > AT_MESG_MAX_LENGTH) {
-					WARNINGA
-						("AT mesg longer than buffer, original message was: |%s|, in buffer only: |%s|\n",
-						 GSMOPEN_P_LOG, token_ptr, tech_pvt->line_array.result[la_counter]);
-				}
-				la_counter++;
-			}
-		} else {
-			last_line_ptr = tmp_answer;
-		}
-
-		if (expected_string && !expect_crlf) {
-			DEBUGA_GSMOPEN
-				("last_line_ptr=|%s|, expected_string=|%s|, expect_crlf=%d, memcmp(last_line_ptr, expected_string, strlen(expected_string)) = %d\n",
-				 GSMOPEN_P_LOG, last_line_ptr, expected_string, expect_crlf, memcmp(last_line_ptr, expected_string, strlen(expected_string)));
-		}
-
-		if (expected_string && !expect_crlf && !memcmp(last_line_ptr, expected_string, strlen(expected_string))
-			) {
-			strncpy(tech_pvt->line_array.result[la_counter], last_line_ptr, AT_MESG_MAX_LENGTH);
-			// match expected string -> accept it withtout CRLF
-			la_counter++;
-
-		}
-		/* if the last line read was not a complete line, we'll read the rest in the future */
-		else if (tmp_answer[strlen(tmp_answer) - 1] != '\r' && tmp_answer[strlen(tmp_answer) - 1] != '\n')
-			la_counter--;
-
-		/* let's list the complete lines read so far, without re-listing the lines that has yet been listed */
-		if (option_debug > 1) {
-			for (i = la_read; i < la_counter; i++)
-				DEBUGA_GSMOPEN("Read line %d: |%s|\n", GSMOPEN_P_LOG, i, tech_pvt->line_array.result[i]);
-		}
-
-		/* let's interpret the complete lines read so far (WITHOUT looking for OK, ERROR, and EXPECTED_STRING), without re-interpreting the lines that has been yet interpreted, so we're sure we don't miss anything */
-		for (i = la_read; i < la_counter; i++) {
-
-			if ((strcmp(tech_pvt->line_array.result[i], "RING") == 0)) {
-				/* with first RING we wait for callid */
-				gettimeofday(&(tech_pvt->ringtime), NULL);
-				/* give CALLID (+CLIP) a chance, wait for the next RING before answering */
-				if (tech_pvt->phone_callflow == CALLFLOW_INCOMING_RING) {
-					/* we're at the second ring, set the interface state, will be answered by gsmopen_do_monitor */
-					DEBUGA_GSMOPEN("|%s| got second RING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					tech_pvt->interface_state = GSMOPEN_STATE_RING;
-				} else {
-					/* we're at the first ring, so there is no CALLID yet thus clean the previous one 
-					   just in case we don't receive the caller identification in this new call */
-					memset(tech_pvt->callid_name, 0, sizeof(tech_pvt->callid_name));
-					memset(tech_pvt->callid_number, 0, sizeof(tech_pvt->callid_number));
-					/* only send AT+CLCC? if the device previously reported its support */
-					if (tech_pvt->at_has_clcc != 0) {
-						/* we're at the first ring, try to get CALLID (with +CLCC) */
-						DEBUGA_GSMOPEN("|%s| got first RING, sending AT+CLCC?\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						res = gsmopen_serial_write_AT_noack(tech_pvt, "AT+CLCC?");
-						if (res) {
-							ERRORA("AT+CLCC? (call list) was not correctly sent to the phone\n", GSMOPEN_P_LOG);
-						}
-					} else {
-						DEBUGA_GSMOPEN("|%s| got first RING, but not sending AT+CLCC? as this device "
-									   "seems not to support\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					}
-				}
-				tech_pvt->phone_callflow = CALLFLOW_INCOMING_RING;
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CLCC", 5) == 0)) {
-				int commacount = 0;
-				int a = 0;
-				int b = 0;
-				int c = 0;
-				/* with clcc we wait for clip */
-				memset(tech_pvt->callid_name, 0, sizeof(tech_pvt->callid_name));
-				memset(tech_pvt->callid_number, 0, sizeof(tech_pvt->callid_number));
-
-				for (a = 0; a < strlen(tech_pvt->line_array.result[i]); a++) {
-
-					if (tech_pvt->line_array.result[i][a] == ',') {
-						commacount++;
-					}
-					if (commacount == 5) {
-						if (tech_pvt->line_array.result[i][a] != ',' && tech_pvt->line_array.result[i][a] != '"') {
-							tech_pvt->callid_number[b] = tech_pvt->line_array.result[i][a];
-							b++;
-						}
-					}
-					if (commacount == 7) {
-						if (tech_pvt->line_array.result[i][a] != ',' && tech_pvt->line_array.result[i][a] != '"') {
-							tech_pvt->callid_name[c] = tech_pvt->line_array.result[i][a];
-							c++;
-						}
-					}
-				}
-
-				tech_pvt->phone_callflow = CALLFLOW_INCOMING_RING;
-				DEBUGA_GSMOPEN("|%s| CLCC CALLID: name is %s, number is %s\n", GSMOPEN_P_LOG,
-							   tech_pvt->line_array.result[i],
-							   tech_pvt->callid_name[0] ? tech_pvt->callid_name : "not available",
-							   tech_pvt->callid_number[0] ? tech_pvt->callid_number : "not available");
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CLIP", 5) == 0)) {
-				int commacount = 0;
-				int a = 0;
-				int b = 0;
-				int c = 0;
-				/* with CLIP, we want to answer right away */
-				memset(tech_pvt->callid_name, 0, sizeof(tech_pvt->callid_name));
-				memset(tech_pvt->callid_number, 0, sizeof(tech_pvt->callid_number));
-
-
-				for (a = 7; a < strlen(tech_pvt->line_array.result[i]); a++) {
-					if (tech_pvt->line_array.result[i][a] == ',') {
-						commacount++;
-					}
-					if (commacount == 0) {
-						if (tech_pvt->line_array.result[i][a] != ',' && tech_pvt->line_array.result[i][a] != '"') {
-							tech_pvt->callid_number[b] = tech_pvt->line_array.result[i][a];
-							b++;
-						}
-					}
-					if (commacount == 4) {
-						if (tech_pvt->line_array.result[i][a] != ',' && tech_pvt->line_array.result[i][a] != '"') {
-							tech_pvt->callid_name[c] = tech_pvt->line_array.result[i][a];
-							c++;
-						}
-					}
-				}
-
-				if (tech_pvt->interface_state != GSMOPEN_STATE_RING) {
-					gettimeofday(&(tech_pvt->call_incoming_time), NULL);
-					DEBUGA_GSMOPEN("GSMOPEN_STATE_RING call_incoming_time.tv_sec=%ld\n", GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec);
-
-				}
-
-				tech_pvt->interface_state = GSMOPEN_STATE_RING;
-				tech_pvt->phone_callflow = CALLFLOW_INCOMING_RING;
-				DEBUGA_GSMOPEN("|%s| CLIP INCOMING CALLID: name is %s, number is %s\n", GSMOPEN_P_LOG,
-							   tech_pvt->line_array.result[i],
-							   (strlen(tech_pvt->callid_name) && tech_pvt->callid_name[0] != 1) ? tech_pvt->callid_name : "not available",
-							   strlen(tech_pvt->callid_number) ? tech_pvt->callid_number : "not available");
-
-				if (!strlen(tech_pvt->callid_number)) {
-					strcpy(tech_pvt->callid_number, "not available");
-				}
-
-				if (!strlen(tech_pvt->callid_name) && tech_pvt->callid_name[0] != 1) {
-					strncpy(tech_pvt->callid_name, tech_pvt->callid_number, sizeof(tech_pvt->callid_name));
-					//strncpy(tech_pvt->callid_name, tech_pvt->callid_number, sizeof(tech_pvt->callid_name)) ;
-					snprintf(tech_pvt->callid_name, sizeof(tech_pvt->callid_name), "GSMopen: %s", tech_pvt->callid_number);
-				}
-
-				DEBUGA_GSMOPEN("|%s| CLIP INCOMING CALLID: NOW name is %s, number is %s\n", GSMOPEN_P_LOG,
-							   tech_pvt->line_array.result[i], tech_pvt->callid_name, tech_pvt->callid_number);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], "BUSY") == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_LINEBUSY;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_LINEBUSY\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				//if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner && tech_pvt->phone_callflow != CALLFLOW_CALL_DOWN) {
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->phone_callflow != CALLFLOW_CALL_DOWN) {
-					//ast_setstate(tech_pvt->owner, GSMOPEN_STATE_BUSY);
-					//gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_BUSY);
-					//cicopet
-					switch_core_session_t *session = NULL;
-					switch_channel_t *channel = NULL;
-
-					tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-
-					session = switch_core_session_locate(tech_pvt->session_uuid_str);
-					if (session) {
-						channel = switch_core_session_get_channel(session);
-						//gsmopen_hangup(tech_pvt);
-						switch_core_session_rwunlock(session);
-						switch_channel_hangup(channel, SWITCH_CAUSE_NONE);
-					}
-					//
-					//tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					//gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-
-				} else {
-					ERRORA("Why BUSY now?\n", GSMOPEN_P_LOG);
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "NO ANSWER") == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_NOANSWER;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_NOANSWER\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_NO_ANSWER;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				} else {
-					ERRORA("Why NO ANSWER now?\n", GSMOPEN_P_LOG);
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "NO CARRIER") == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_NOCARRIER;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_NOCARRIER\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-					//cicopet
-					switch_core_session_t *session = NULL;
-					switch_channel_t *channel = NULL;
-
-					tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-
-					session = switch_core_session_locate(tech_pvt->session_uuid_str);
-					if (session) {
-						channel = switch_core_session_get_channel(session);
-						//gsmopen_hangup(tech_pvt);
-						switch_core_session_rwunlock(session);
-						switch_channel_hangup(channel, SWITCH_CAUSE_NONE);
-					}
-					//
-					//tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					//gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				} else {
-					ERRORA("Why NO CARRIER now?\n", GSMOPEN_P_LOG);
-				}
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CBC:", 5) == 0)) {
-				int power_supply, battery_strenght, err;
-
-				power_supply = battery_strenght = 0;
-
-				err = sscanf(&tech_pvt->line_array.result[i][6], "%d,%d", &power_supply, &battery_strenght);
-				if (err < 2) {
-					DEBUGA_GSMOPEN("|%s| is not formatted as: |+CBC: xx,yy| now trying  |+CBC:xx,yy|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-					err = sscanf(&tech_pvt->line_array.result[i][5], "%d,%d", &power_supply, &battery_strenght);
-					DEBUGA_GSMOPEN("|%s| +CBC: Powered by %s, battery strenght=%d\n", GSMOPEN_P_LOG,
-								   tech_pvt->line_array.result[i], power_supply ? "power supply" : "battery", battery_strenght);
-
-				}
-
-				if (err < 2) {
-					DEBUGA_GSMOPEN("|%s| is not formatted as: |+CBC:xx,yy| giving up\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				}
-
-				else {
-					if (option_debug > 1)
-						DEBUGA_GSMOPEN("|%s| +CBC: Powered by %s, battery strenght=%d\n", GSMOPEN_P_LOG,
-									   tech_pvt->line_array.result[i], power_supply ? "power supply" : "battery", battery_strenght);
-					if (!power_supply) {
-						if (battery_strenght < 10) {
-							ERRORA("|%s| BATTERY ALMOST EXHAUSTED\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						} else if (battery_strenght < 20) {
-							WARNINGA("|%s| BATTERY LOW\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-						}
-
-					}
-				}
-
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CSQ:", 5) == 0)) {
-				int signal_quality, ber, err;
-
-				signal_quality = ber = 0;
-
-				err = sscanf(&tech_pvt->line_array.result[i][6], "%d,%d", &signal_quality, &ber);
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| +CSQ: Signal Quality: %d, Error Rate=%d\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], signal_quality, ber);
-				if (err < 2) {
-					ERRORA("|%s| is not formatted as: |+CSQ: xx,yy|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				} else {
-					if (signal_quality < 11 || signal_quality == 99) {
-						ERRORA
-							("|%s| CELLPHONE GETS ALMOST NO SIGNAL, consider to move it or additional antenna\n",
-							 GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						tech_pvt->got_signal=0;
-				alarm_event(tech_pvt, ALARM_NETWORK_NO_SIGNAL, "CELLPHONE GETS ALMOST NO SIGNAL, consider to move it or additional antenna");
-					} else if (signal_quality < 15) {
-						WARNINGA("|%s| CELLPHONE GETS SIGNAL LOW\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						tech_pvt->got_signal=1;
-				alarm_event(tech_pvt, ALARM_NETWORK_LOW_SIGNAL, "CELLPHONE GETS SIGNAL LOW");
-					} else {
-						tech_pvt->got_signal=2;
-					}
-
-				}
-
-			}
-			if ((strncmp(tech_pvt->line_array.result[i], "+CREG:", 6) == 0)) {
-				int n, stat, err;
-
-				n = stat = 0;
-
-				err = sscanf(&tech_pvt->line_array.result[i][6], "%d,%d", &n, &stat);
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| +CREG: Display: %d, Registration=%d\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], n, stat);
-				if (err < 2) {
-					WARNINGA("|%s| is not formatted as: |+CREG: xx,yy|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				} 
-				if (stat==0) {
-					ERRORA
-						("|%s| CELLPHONE is not registered to network, consider to move it or additional antenna\n",
-						 GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					tech_pvt->not_registered=1;
-					tech_pvt->home_network_registered=0;
-					tech_pvt->roaming_registered=0;
-					alarm_event(tech_pvt, ALARM_NO_NETWORK_REGISTRATION, "CELLPHONE is not registered to network, consider to move it or additional antenna");
-				} else if (stat==1) {
-					DEBUGA_GSMOPEN("|%s| CELLPHONE is registered to the HOME network\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					tech_pvt->not_registered=0;
-					tech_pvt->home_network_registered=1;
-					tech_pvt->roaming_registered=0;
-				}else {
-					ERRORA("|%s| CELLPHONE is registered to a ROAMING network\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					tech_pvt->not_registered=0;
-					tech_pvt->home_network_registered=0;
-					tech_pvt->roaming_registered=1;
-					alarm_event(tech_pvt, ALARM_ROAMING_NETWORK_REGISTRATION, "CELLPHONE is registered to a ROAMING network");
-				}
-
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMGW:", 6) == 0)) {
-				int err;
-
-				err = sscanf(&tech_pvt->line_array.result[i][7], "%s", tech_pvt->at_cmgw);
-				DEBUGA_GSMOPEN("|%s| +CMGW: %s\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], tech_pvt->at_cmgw);
-				if (err < 1) {
-					ERRORA("|%s| is not formatted as: |+CMGW: xxxx|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				}
-
-			}
-
-			/* at_call_* are unsolicited messages sent by the modem to signal us about call processing activity and events */
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_idle) == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_IDLE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					DEBUGA_GSMOPEN("just received a remote HANGUP\n", GSMOPEN_P_LOG);
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_NORMAL;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-					DEBUGA_GSMOPEN("just sent GSMOPEN_CONTROL_HANGUP\n", GSMOPEN_P_LOG);
-				}
-
-				tech_pvt->phone_callflow = CALLFLOW_CALL_NOCARRIER;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_NOCARRIER\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-					//cicopet
-					switch_core_session_t *session = NULL;
-					switch_channel_t *channel = NULL;
-
-					tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-
-					session = switch_core_session_locate(tech_pvt->session_uuid_str);
-					if (session) {
-						channel = switch_core_session_get_channel(session);
-						//gsmopen_hangup(tech_pvt);
-						switch_core_session_rwunlock(session);
-						switch_channel_hangup(channel, SWITCH_CAUSE_NONE);
-					}
-					//
-					//tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					//gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				} else {
-					ERRORA("Why NO CARRIER now?\n", GSMOPEN_P_LOG);
-				}
-
-
-
-
-
-
-
-
-
-
-
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_incoming) == 0)) {
-
-				//char list_command[64];
-
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_INCOMING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-				if (tech_pvt->phone_callflow != CALLFLOW_CALL_INCOMING && tech_pvt->phone_callflow != CALLFLOW_INCOMING_RING) {
-					//mark the time of CALLFLOW_CALL_INCOMING
-					gettimeofday(&(tech_pvt->call_incoming_time), NULL);
-					tech_pvt->phone_callflow = CALLFLOW_CALL_INCOMING;
-					DEBUGA_GSMOPEN("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld\n", GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec);
-
-				}
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_active) == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
-				DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_ACTIVE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-				if (tech_pvt->interface_state == CALLFLOW_CALL_DIALING || tech_pvt->interface_state == CALLFLOW_STATUS_EARLYMEDIA) {
-					DEBUGA_PBX("just received a remote ANSWER\n", GSMOPEN_P_LOG);
-					if (tech_pvt->phone_callflow == GSMOPEN_STATE_UP) {
-						//gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_RINGING);
-						DEBUGA_PBX("just sent GSMOPEN_CONTROL_RINGING\n", GSMOPEN_P_LOG);
-						DEBUGA_PBX("going to send GSMOPEN_CONTROL_ANSWER\n", GSMOPEN_P_LOG);
-						//gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_ANSWER);
-						tech_pvt->interface_state = CALLFLOW_CALL_REMOTEANSWER;
-						DEBUGA_PBX("just sent GSMOPEN_CONTROL_ANSWER\n", GSMOPEN_P_LOG);
-					}
-				} else {
-				}
-				//tech_pvt->interface_state = GSMOPEN_STATE_UP;
-				//DEBUGA_PBX("just interface_state UP\n", GSMOPEN_P_LOG);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_calling) == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_DIALING;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_DIALING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_failed) == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_FAILED;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_FAILED\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CSCA:", 6) == 0)) {	//TODO SMS FIXME in config!
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| +CSCA: Message Center Address!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMGF:", 6) == 0)) {	//TODO SMS FIXME in config!
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| +CMGF: Message Format!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMTI:", 6) == 0)) {	//TODO SMS FIXME in config!
-				int err;
-				int pos;
-
-				//FIXME all the following commands in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMTI: Incoming SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-				err = sscanf(&tech_pvt->line_array.result[i][12], "%d", &pos);
-				if (err < 1) {
-					ERRORA("|%s| is not formatted as: |+CMTI: \"MT\",xx|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				} else {
-					DEBUGA_GSMOPEN("|%s| +CMTI: Incoming SMS in position: %d!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], pos);
-					tech_pvt->unread_sms_msg_id = pos;
-					gsmopen_sleep(1000);
-
-					if (tech_pvt->unread_sms_msg_id) {
-						char at_command[256];
-
-						if (tech_pvt->no_ucs2 == 0) {
-							res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS=\"UCS2\"");
-							if (res) {
-								ERRORA("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  do not got OK from the phone, continuing\n", GSMOPEN_P_LOG);
-								//memset(tech_pvt->sms_message, 0, sizeof(tech_pvt->sms_message));
-							}
-						}
-
-						memset(at_command, 0, sizeof(at_command));
-						sprintf(at_command, "AT+CMGR=%d", tech_pvt->unread_sms_msg_id);
-						//memset(tech_pvt->sms_message, 0, sizeof(tech_pvt->sms_message));
-
-						tech_pvt->reading_sms_msg = 1;
-						res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-						tech_pvt->reading_sms_msg = 0;
-						if (res) {
-							ERRORA("AT+CMGR (read SMS) do not got OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
-						}
-						res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS=\"GSM\"");
-						if (res) {
-							ERRORA("AT+CSCS=\"GSM\" (set TE messages to GSM) do not got OK from the phone\n", GSMOPEN_P_LOG);
-						}
-						memset(at_command, 0, sizeof(at_command));
-						sprintf(at_command, "AT+CMGD=%d", tech_pvt->unread_sms_msg_id);	/* delete the message */
-						tech_pvt->unread_sms_msg_id = 0;
-						res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-						if (res) {
-							ERRORA("AT+CMGD (Delete SMS) do not got OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
-						}
-
-						res = sms_incoming(tech_pvt);
-
-#if 0
-						if (strlen(tech_pvt->sms_message)) {
-							//FIXME manager_event(EVENT_FLAG_SYSTEM, "GSMOPENincomingsms",
-							//FIXME "Interface: %s\r\nSMS_Message: %s\r\n", tech_pvt->name,
-							//FIXME tech_pvt->sms_message);
-
-							res = sms_incoming(tech_pvt, tech_pvt->sms_message);
-
-							if (strlen(tech_pvt->sms_receiving_program)) {
-								int fd1[2];
-								pid_t pid1;
-								char *arg1[] = { tech_pvt->sms_receiving_program, (char *) NULL };
-								int i;
-
-								DEBUGA_GSMOPEN("incoming SMS message:>>>%s<<<\n", GSMOPEN_P_LOG, tech_pvt->sms_message);
-								res = pipe(fd1);
-								pid1 = fork();
-
-								if (pid1 == 0) {	//child
-									int err;
-
-									dup2(fd1[0], 0);	// Connect stdin to pipe output
-									close(fd1[1]);	// close input pipe side
-									close(tech_pvt->controldevfd);
-									setsid();	//session id
-									err = execvp(arg1[0], arg1);	//exec our program, with stdin connected to pipe output
-									if (err) {
-										ERRORA
-											("'sms_receiving_program' is set in config file to '%s', and it gave us back this error: %d, (%s). SMS received was:---%s---\n",
-											 GSMOPEN_P_LOG, tech_pvt->sms_receiving_program, err, strerror(errno), tech_pvt->sms_message);
-									}
-									close(fd1[0]);	// close output pipe side
-								}
-//starting here continue the parent
-								close(fd1[0]);	// close output pipe side
-								// write the msg on the pipe input
-								for (i = 0; i < strlen(tech_pvt->sms_message); i++) {
-									res = write(fd1[1], &tech_pvt->sms_message[i], 1);
-								}
-								close(fd1[1]);	// close pipe input, let our program know we've finished
-							} else {
-								ERRORA
-									("got SMS incoming message, but 'sms_receiving_program' is not set in config file. SMS received was:---%s---\n",
-									 GSMOPEN_P_LOG, tech_pvt->sms_message);
-							}
-						}
-#endif //0
-#if 1							//is this one needed? maybe it can interrupt an incoming call that is just to announce itself
-						if (tech_pvt->phone_callflow == CALLFLOW_CALL_IDLE && tech_pvt->interface_state == GSMOPEN_STATE_DOWN && tech_pvt->owner == NULL) {
-							/* we're not in a call, neither calling */
-							res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CKPD=\"EEE\"");
-							if (res) {
-								ERRORA("AT+CKPD=\"EEE\" (cellphone screen back to user) do not got OK from the phone\n", GSMOPEN_P_LOG);
-							}
-						}
-#endif
-					}			//unread_msg_id
-
-				}				//CMTI well formatted
-
-			}					//CMTI
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+MMGL:", 6) == 0)) {	//TODO MOTOROLA SMS FIXME in config!
-				int err = 0;
-				//int unread_msg_id=0;
-
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +MMGL: Listing Motorola SMSs!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-				err = sscanf(&tech_pvt->line_array.result[i][7], "%d", &tech_pvt->unread_sms_msg_id);
-				if (err < 1) {
-					ERRORA("|%s| is not formatted as: |+MMGL: xx|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				}
-			}
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMGL:", 6) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGL: Listing SMSs!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-			if ((strncmp(tech_pvt->line_array.result[i], "+MMGR:", 6) == 0)) {	//TODO MOTOROLA SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +MMGR: Reading Motorola SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->reading_sms_msg)
-					tech_pvt->reading_sms_msg++;
-			}
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: \"STO U", 13) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading stored UNSENT SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			} else if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: \"STO S", 13) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading stored SENT SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			} else if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: \"REC R", 13) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading received READ SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			} else if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: \"REC U", 13) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading received UNREAD SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->reading_sms_msg)
-					tech_pvt->reading_sms_msg++;
-			} else if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: ", 6) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->reading_sms_msg)
-					tech_pvt->reading_sms_msg++;
-			}
-
-
-			if ((strcmp(tech_pvt->line_array.result[i], "+MCST: 17") == 0)) {	/* motorola call processing unsolicited messages */
-				tech_pvt->phone_callflow = CALLFLOW_CALL_INFLUX;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_INFLUX\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], "+MCST: 68") == 0)) {	/* motorola call processing unsolicited messages */
-				tech_pvt->phone_callflow = CALLFLOW_CALL_NOSERVICE;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_NOSERVICE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "+MCST: 70") == 0)) {	/* motorola call processing unsolicited messages */
-				tech_pvt->phone_callflow = CALLFLOW_CALL_OUTGOINGRESTRICTED;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_OUTGOINGRESTRICTED\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "+MCST: 72") == 0)) {	/* motorola call processing unsolicited messages */
-				tech_pvt->phone_callflow = CALLFLOW_CALL_SECURITYFAIL;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_SECURITYFAIL\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CPBR", 5) == 0)) {	/* phonebook stuff begins */
-
-				if (tech_pvt->phonebook_querying) {	/* probably phonebook struct begins */
-					int err, first_entry, last_entry, number_lenght, text_lenght;
-
-					if (option_debug)
-						DEBUGA_GSMOPEN("phonebook struct: |%s|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-					err = sscanf(&tech_pvt->line_array.result[i][8], "%d-%d),%d,%d", &first_entry, &last_entry, &number_lenght, &text_lenght);
-					if (err < 4) {
-
-						err = sscanf(&tech_pvt->line_array.result[i][7], "%d-%d,%d,%d", &first_entry, &last_entry, &number_lenght, &text_lenght);
-					}
-
-					if (err < 4) {
-						ERRORA
-							("phonebook struct: |%s| is nor formatted as: |+CPBR: (1-750),40,14| neither as: |+CPBR: 1-750,40,14|\n",
-							 GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					} else {
-
-						if (option_debug)
-							DEBUGA_GSMOPEN
-								("First entry: %d, last entry: %d, phone number max lenght: %d, text max lenght: %d\n",
-								 GSMOPEN_P_LOG, first_entry, last_entry, number_lenght, text_lenght);
-						tech_pvt->phonebook_first_entry = first_entry;
-						tech_pvt->phonebook_last_entry = last_entry;
-						tech_pvt->phonebook_number_lenght = number_lenght;
-						tech_pvt->phonebook_text_lenght = text_lenght;
-					}
-
-				} else {		/* probably phonebook entry begins */
-
-					if (tech_pvt->phonebook_listing) {
-						int err, entry_id, entry_type;
-
-						char entry_number[256];
-						char entry_text[256];
-
-						if (option_debug)
-							DEBUGA_GSMOPEN("phonebook entry: |%s|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-						err =
-							sscanf(&tech_pvt->line_array.result[i][7], "%d,\"%255[0-9+]\",%d,\"%255[^\"]\"", &entry_id, entry_number, &entry_type,
-								   entry_text);
-						if (err < 4) {
-							ERRORA
-								("err=%d, phonebook entry: |%s| is not formatted as: |+CPBR: 504,\"+39025458068\",145,\"ciao a tutti\"|\n",
-								 GSMOPEN_P_LOG, err, tech_pvt->line_array.result[i]);
-						} else {
-							//TODO: sanitize entry_text
-							if (option_debug)
-								DEBUGA_GSMOPEN("Number: %s, Text: %s, Type: %d\n", GSMOPEN_P_LOG, entry_number, entry_text, entry_type);
-							/* write entry in phonebook file */
-							if (tech_pvt->phonebook_writing_fp) {
-								gsmopen_dir_entry_extension++;
-
-								fprintf(tech_pvt->phonebook_writing_fp,
-										"%s  => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcell=%s|phonebook_entry_owner=%s\n",
-										entry_number, entry_text, "no",
-										tech_pvt->gsmopen_dir_entry_extension_prefix, "2", gsmopen_dir_entry_extension, "yes", "not_specified");
-								fprintf(tech_pvt->phonebook_writing_fp,
-										"%s  => ,%sDO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcell=%s|phonebook_entry_owner=%s\n",
-										entry_number, entry_text, "no",
-										tech_pvt->gsmopen_dir_entry_extension_prefix, "3", gsmopen_dir_entry_extension, "yes", "not_specified");
-							}
-						}
-
-					}
-
-					if (tech_pvt->phonebook_listing_received_calls) {
-						int err, entry_id, entry_type;
-
-						char entry_number[256] = "";
-						char entry_text[256] = "";
-
-						if (option_debug)
-							DEBUGA_GSMOPEN("phonebook entry: |%s|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-						err =
-							sscanf(&tech_pvt->line_array.result[i][7], "%d,\"%255[0-9+]\",%d,\"%255[^\"]\"", &entry_id, entry_number, &entry_type,
-								   entry_text);
-						if (err < 1) {	//we match only on the progressive id, maybe the remote party has not sent its number, and/or there is no corresponding text entry in the phone directory
-							ERRORA
-								("err=%d, phonebook entry: |%s| is not formatted as: |+CPBR: 504,\"+39025458068\",145,\"ciao a tutti\"|\n",
-								 GSMOPEN_P_LOG, err, tech_pvt->line_array.result[i]);
-						} else {
-							//TODO: sanitize entry_text
-
-							if (option_debug)
-								DEBUGA_GSMOPEN("Number: %s, Text: %s, Type: %d\n", GSMOPEN_P_LOG, entry_number, entry_text, entry_type);
-							memset(tech_pvt->callid_name, 0, sizeof(tech_pvt->callid_name));
-							memset(tech_pvt->callid_number, 0, sizeof(tech_pvt->callid_number));
-							strncpy(tech_pvt->callid_name, entry_text, sizeof(tech_pvt->callid_name));
-							strncpy(tech_pvt->callid_number, entry_number, sizeof(tech_pvt->callid_number));
-							if (option_debug)
-								DEBUGA_GSMOPEN("incoming callid: Text: %s, Number: %s\n", GSMOPEN_P_LOG, tech_pvt->callid_name, tech_pvt->callid_number);
-
-							DEBUGA_GSMOPEN("|%s| CPBR INCOMING CALLID: name is %s, number is %s\n",
-										   GSMOPEN_P_LOG, tech_pvt->line_array.result[i],
-										   tech_pvt->callid_name[0] != 1 ? tech_pvt->callid_name : "not available",
-										   tech_pvt->callid_number[0] ? tech_pvt->callid_number : "not available");
-
-							/* mark the time of RING */
-							gettimeofday(&(tech_pvt->ringtime), NULL);
-							tech_pvt->interface_state = GSMOPEN_STATE_RING;
-							tech_pvt->phone_callflow = CALLFLOW_INCOMING_RING;
-
-						}
-
-					}
-
-					else {
-						DEBUGA_GSMOPEN("phonebook entry: |%s|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-					}
-				}
-
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "*ECAV", 5) == 0) || (strncmp(tech_pvt->line_array.result[i], "*ECAM", 5) == 0)) {	/* sony-ericsson call processing unsolicited messages */
-				int res, ccid, ccstatus, calltype, processid, exitcause, number, type;
-				res = ccid = ccstatus = calltype = processid = exitcause = number = type = 0;
-				res =
-					sscanf(&tech_pvt->line_array.result[i][6], "%d,%d,%d,%d,%d,%d,%d", &ccid, &ccstatus, &calltype, &processid, &exitcause, &number,
-						   &type);
-				/* only changes the phone_callflow if enought parameters were parsed */
-				if (res >= 3) {
-					switch (ccstatus) {
-					case 0:
-						if (tech_pvt->owner) {
-							ast_setstate(tech_pvt->owner, GSMOPEN_STATE_DOWN);
-							tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_NORMAL;
-							gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-						}
-						tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-						tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: IDLE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 1:
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: CALLING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 2:
-						if (tech_pvt->owner) {
-							ast_setstate(tech_pvt->owner, GSMOPEN_STATE_DIALING);
-						}
-						tech_pvt->interface_state = CALLFLOW_CALL_DIALING;
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: CONNECTING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 3:
-						if (tech_pvt->owner) {
-							ast_setstate(tech_pvt->owner, GSMOPEN_STATE_UP);
-							gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_ANSWER);
-						}
-						tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
-						tech_pvt->interface_state = GSMOPEN_STATE_UP;
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: ACTIVE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 4:
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN
-								("|%s| Sony-Ericsson *ECAM/*ECAV: don't know how to handle HOLD event\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 5:
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN
-								("|%s| Sony-Ericsson *ECAM/*ECAV: don't know how to handle WAITING event\n", GSMOPEN_P_LOG,
-								 tech_pvt->line_array.result[i]);
-						break;
-					case 6:
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN
-								("|%s| Sony-Ericsson *ECAM/*ECAV: don't know how to handle ALERTING event\n", GSMOPEN_P_LOG,
-								 tech_pvt->line_array.result[i]);
-						break;
-					case 7:
-						if (tech_pvt->owner) {
-							ast_setstate(tech_pvt->owner, GSMOPEN_STATE_BUSY);
-							gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_BUSY);
-						}
-						tech_pvt->phone_callflow = CALLFLOW_CALL_LINEBUSY;
-						tech_pvt->interface_state = GSMOPEN_STATE_BUSY;
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: BUSY\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					}
-				} else {
-					if (option_debug > 1)
-						DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: could not parse parameters\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				}
-
-			}
-
-			/* at_indicator_* are unsolicited messages sent by the phone to signal us that some of its visual indicators on its screen has changed, based on CIND CMER ETSI docs */
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_noservice_string) == 0)) {
-					ERRORA("|%s| at_indicator_noservice_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						alarm_event(tech_pvt, ALARM_NETWORK_NO_SERVICE, "at_indicator_noservice_string");
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nosignal_string) == 0)) {
-					ERRORA("|%s| at_indicator_nosignal_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						alarm_event(tech_pvt, ALARM_NETWORK_NO_SIGNAL, "at_indicator_nosignal_string");
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_lowsignal_string) == 0)) {
-					WARNINGA("|%s| at_indicator_lowsignal_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						alarm_event(tech_pvt, ALARM_NETWORK_LOW_SIGNAL, "at_indicator_lowsignal_string");
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_lowbattchg_string) == 0)) {
-					WARNINGA("|%s| at_indicator_lowbattchg_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nobattchg_string) == 0)) {
-					ERRORA("|%s| at_indicator_nobattchg_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callactive_string) == 0)) {
-					DEBUGA_GSMOPEN("|%s| at_indicator_callactive_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nocallactive_string) == 0)) {
-					DEBUGA_GSMOPEN("|%s| at_indicator_nocallactive_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nocallsetup_string) == 0)) {
-					DEBUGA_GSMOPEN("|%s| at_indicator_nocallsetup_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callsetupincoming_string) == 0)) {
-					DEBUGA_GSMOPEN("|%s| at_indicator_callsetupincoming_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callsetupoutgoing_string) == 0)) {
-					DEBUGA_GSMOPEN("|%s| at_indicator_callsetupoutgoing_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callsetupremoteringing_string)
-				 == 0)) {
-					DEBUGA_GSMOPEN("|%s| at_indicator_callsetupremoteringing_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-		}
-
-		/* let's look for OK, ERROR and EXPECTED_STRING in the complete lines read so far, without re-looking at the lines that has been yet looked at */
-		for (i = la_read; i < la_counter; i++) {
-			if (expected_string) {
-				if ((strncmp(tech_pvt->line_array.result[i], expected_string, strlen(expected_string))
-					 == 0)) {
-					if (option_debug > 1)
-						DEBUGA_GSMOPEN("|%s| got what EXPECTED\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					at_ack = AT_OK;
-				}
-			} else {
-				if ((strcmp(tech_pvt->line_array.result[i], "OK") == 0)) {
-					if (option_debug > 1)
-						DEBUGA_GSMOPEN("got OK\n", GSMOPEN_P_LOG);
-					at_ack = AT_OK;
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "ERROR") == 0)) {
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("got ERROR\n", GSMOPEN_P_LOG);
-				at_ack = AT_ERROR;
-			}
-
-			/* if we are requesting IMEI, put the line into the imei buffer if the line is not "OK" or "ERROR" */
-			if (tech_pvt->requesting_imei && at_ack == -1) {
-				if (strlen(tech_pvt->line_array.result[i])) {	/* we are reading the IMEI */
-					strncpy(tech_pvt->imei, tech_pvt->line_array.result[i], sizeof(tech_pvt->imei));
-				}
-			}
-
-			/* if we are requesting IMSI, put the line into the imei buffer if the line is not "OK" or "ERROR" */
-			if (tech_pvt->requesting_imsi && at_ack == -1) {
-				if (strlen(tech_pvt->line_array.result[i])) {	/* we are reading the IMSI */
-					strncpy(tech_pvt->imsi, tech_pvt->line_array.result[i], sizeof(tech_pvt->imsi));
-				}
-			}
-			/* if we are reading an sms message from memory, put the line into the sms buffer if the line is not "OK" or "ERROR" */
-			if (tech_pvt->reading_sms_msg > 1 && at_ack == -1) {
-				int c;
-				char sms_body[16000];
-				//int err = 0;
-				memset(sms_body, '\0', sizeof(sms_body));
-
-				if (strncmp(tech_pvt->line_array.result[i], "+CMGR", 5) == 0) {	/* we are reading the "header" of an SMS */
-#if 1
-					char content[512];
-					char content2[512];
-					int inside_comma = 0;
-					int inside_quote = 0;
-					int which_field = 0;
-					int d = 0;
-
-					DEBUGA_GSMOPEN("HERE\n", GSMOPEN_P_LOG);
-
-					memset(content, '\0', sizeof(content));
-
-
-					for (c = 0; c < strlen(tech_pvt->line_array.result[i]); c++) {
-						if (tech_pvt->line_array.result[i][c] == ',' && tech_pvt->line_array.result[i][c - 1] != '\\' && inside_quote == 0) {
-							if (inside_comma) {
-								inside_comma = 0;
-								DEBUGA_GSMOPEN("inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote,
-									   &tech_pvt->line_array.result[i][c]);
-							} else {
-								inside_comma = 1;
-								DEBUGA_GSMOPEN("inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote,
-									   &tech_pvt->line_array.result[i][c]);
-							}
-						}
-						if (tech_pvt->line_array.result[i][c] == '"' && tech_pvt->line_array.result[i][c - 1] != '\\') {
-							if (inside_quote) {
-								inside_quote = 0;
-								DEBUGA_GSMOPEN("END_CONTENT inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote,
-									   &tech_pvt->line_array.result[i][c]);
-								DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content);
-
-								//strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-								//strncat(tech_pvt->sms_message, content, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-								//strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-
-								memset(content2, '\0', sizeof(content2));
-								if (which_field == 1) {
-									//FIXME why this? err = ucs2_to_utf8(tech_pvt, content, content2, sizeof(content2));
-									//err = ucs2_to_utf8(tech_pvt, content, content2, sizeof(content2));
-									//err = 0;
-									strncpy(content2, content, sizeof(content2));
-								} else {
-									//err = 0;
-									strncpy(content2, content, sizeof(content2));
-								}
-								DEBUGA_GSMOPEN("%d content2=%s\n", GSMOPEN_P_LOG, which_field, content2);
-								DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content2);
-
-								//strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-								//if (!err)
-								//strncat(tech_pvt->sms_message, content2, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-								//strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-								memset(content, '\0', sizeof(content));
-								d = 0;
-								if (which_field == 1) {
-									strncpy(tech_pvt->sms_sender, content2, sizeof(tech_pvt->sms_sender));
-									DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content2);
-
-								} else if (which_field == 2) {
-									strncpy(tech_pvt->sms_date, content2, sizeof(tech_pvt->sms_date));
-									DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content2);
-								} else if (which_field > 2) {
-									WARNINGA("WHY which_field is > 2 ? (which_field is %d)\n", GSMOPEN_P_LOG, which_field);
-								}
-								which_field++;
-							} else {
-								inside_quote = 1;
-								DEBUGA_GSMOPEN("START_CONTENT inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote,
-										 &tech_pvt->line_array.result[i][c]);
-							}
-						}
-						if (inside_quote && tech_pvt->line_array.result[i][c] != '"') {
-
-							content[d] = tech_pvt->line_array.result[i][c];
-							d++;
-
-						}
-
-					}
-#endif //0
-				}				//it was the +CMGR answer from the cellphone
-				else {
-					DEBUGA_GSMOPEN("body=%s\n", GSMOPEN_P_LOG, sms_body);
-					DEBUGA_GSMOPEN("tech_pvt->line_array.result[i]=%s\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					if (tech_pvt->sms_pdu_not_supported) {
-						char content3[1000];
-						strncpy(tech_pvt->sms_message, tech_pvt->line_array.result[i], sizeof(tech_pvt->sms_message));
-
-						//int howmanyleft;
-
-
-						DEBUGA_GSMOPEN("sms_message=%s\n", GSMOPEN_P_LOG, tech_pvt->sms_message);
-						ucs2_to_utf8(tech_pvt, tech_pvt->sms_message, content3, sizeof(content3));
-						DEBUGA_GSMOPEN("content3=%s\n", GSMOPEN_P_LOG, content3);
-						strncpy(tech_pvt->sms_body, content3, sizeof(tech_pvt->sms_body));
-						//sleep(10);
-						//cicopet
-						if (tech_pvt->sms_cnmi_not_supported) {
-							sms_incoming(tech_pvt);
-							DEBUGA_GSMOPEN("2 content3=%s\n", GSMOPEN_P_LOG, content3);
-						}
-					} else {
-#ifndef NO_GSMLIB
-						char content2[1000];
-						SMSMessageRef sms;
-//MessageType messagetype;
-//Address servicecentreaddress;
-//Timestamp servicecentretimestamp;
-//Address sender_recipient_address;
-
-						sms = SMSMessage::decode(tech_pvt->line_array.result[i]);	// dataCodingScheme = 8 , text=ciao 123 belè новости לק ראת ﺎﻠﺠﻤﻋﺓ 人大
-
-						DEBUGA_GSMOPEN("SMS=\n%s\n", GSMOPEN_P_LOG, sms->toString().c_str());
-
-						memset(content2, '\0', sizeof(content2));
-						if (sms->dataCodingScheme().getAlphabet() == DCS_DEFAULT_ALPHABET) {
-							iso_8859_1_to_utf8(tech_pvt, (char *) sms->userData().c_str(), content2, sizeof(content2));
-						} else if (sms->dataCodingScheme().getAlphabet() == DCS_SIXTEEN_BIT_ALPHABET) {
-							ucs2_to_utf8(tech_pvt, (char *) bufToHex((unsigned char *) sms->userData().data(), sms->userData().length()).c_str(), content2,
-										 sizeof(content2));
-						} else {
-							ERRORA("dataCodingScheme not supported=%d\n", GSMOPEN_P_LOG, sms->dataCodingScheme().getAlphabet());
-
-						}
-						DEBUGA_GSMOPEN("dataCodingScheme=%d\n", GSMOPEN_P_LOG, sms->dataCodingScheme().getAlphabet());
-						DEBUGA_GSMOPEN("dataCodingScheme=%s\n", GSMOPEN_P_LOG, sms->dataCodingScheme().toString().c_str());
-						DEBUGA_GSMOPEN("address=%s\n", GSMOPEN_P_LOG, sms->address().toString().c_str());
-						DEBUGA_GSMOPEN("serviceCentreAddress=%s\n", GSMOPEN_P_LOG, sms->serviceCentreAddress().toString().c_str());
-						DEBUGA_GSMOPEN("serviceCentreTimestamp=%s\n", GSMOPEN_P_LOG, sms->serviceCentreTimestamp().toString().c_str());
-						DEBUGA_GSMOPEN("UserDataHeader=%s\n", GSMOPEN_P_LOG, (char *)bufToHex((unsigned char *)
-						                                ((string) sms->userDataHeader()).data(), sms->userDataHeader().length()).c_str());
-						DEBUGA_GSMOPEN("messageType=%d\n", GSMOPEN_P_LOG, sms->messageType());
-						DEBUGA_GSMOPEN("userData= |||%s|||\n", GSMOPEN_P_LOG, content2);
-
-
-						memset(sms_body, '\0', sizeof(sms_body));
-						strncpy(sms_body, content2, sizeof(sms_body));
-						DEBUGA_GSMOPEN("body=%s\n", GSMOPEN_P_LOG, sms_body);
-						strncpy(tech_pvt->sms_body, sms_body, sizeof(tech_pvt->sms_body));
-						strncpy(tech_pvt->sms_sender, sms->address().toString().c_str(), sizeof(tech_pvt->sms_sender));
-						strncpy(tech_pvt->sms_date, sms->serviceCentreTimestamp().toString().c_str(), sizeof(tech_pvt->sms_date));
-						strncpy(tech_pvt->sms_userdataheader, (char *)
-						                        bufToHex((unsigned char *)((string) sms->userDataHeader()).data(), sms->userDataHeader().length()).c_str(),
-						                        sizeof(tech_pvt->sms_userdataheader));
-						strncpy(tech_pvt->sms_datacodingscheme, sms->dataCodingScheme().toString().c_str(), sizeof(tech_pvt->sms_datacodingscheme));
-						strncpy(tech_pvt->sms_servicecentreaddress, sms->serviceCentreAddress().toString().c_str(),
-								sizeof(tech_pvt->sms_servicecentreaddress));
-						tech_pvt->sms_messagetype = sms->messageType();
-//messagetype = sms->messageType();
-//servicecentreaddress = sms->serviceCentreAddress();
-//servicecentretimestamp = sms->serviceCentreTimestamp();
-//sender_recipient_address = sms->address();
-
-#endif// NO_GSMLIB
-					}
-
-#if 0
-					//strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-					//strncat(tech_pvt->sms_message, tech_pvt->line_array.result[i], ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-					//strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-
-					memset(sms_body, '\0', sizeof(sms_body));
-					err = ucs2_to_utf8(tech_pvt, tech_pvt->line_array.result[i], sms_body, sizeof(sms_body));
-					DEBUGA_GSMOPEN("body=%s\n", GSMOPEN_P_LOG, sms_body);
-					strncpy(tech_pvt->sms_body, sms_body, sizeof(tech_pvt->sms_body));
-
-					//strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-					//if (!err)
-					//strncat(tech_pvt->sms_message, sms_body, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-					//strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-
-					//DEBUGA_GSMOPEN("sms_message=%s\n", GSMOPEN_P_LOG, tech_pvt->sms_message);
-#endif //0
-				}				//it was the UCS2 from cellphone
-
-			}					//we were reading the SMS
-
-		}
-
-		la_read = la_counter;
-
-		if (look_for_ack && at_ack > -1)
-			break;
-
-		if (la_counter > AT_MESG_MAX_LINES) {
-			ERRORA("Too many lines in result (>%d). Stopping reader.\n", GSMOPEN_P_LOG, AT_MESG_MAX_LINES);
-			at_ack = AT_ERROR;
-			break;
-		}
-	}
-
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-	if (select_err == -1) {
-		ERRORA("select returned -1 on %s, setting controldev_dead, error was: %s\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name, strerror(errno));
-		tech_pvt->controldev_dead = 1;
-		close(tech_pvt->controldevfd);
-
-				tech_pvt->running=0;
-				alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "select returned -1 on interface, setting controldev_dead");
-				tech_pvt->active=0;
-				tech_pvt->name[0]='\0';
-		if (tech_pvt->owner)
-			gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				switch_sleep(1000000);
-		return -1;
-	}
-
-	if (tech_pvt->phone_callflow == CALLFLOW_CALL_INCOMING && tech_pvt->call_incoming_time.tv_sec) {	//after three sec of CALLFLOW_CALL_INCOMING, we assume the phone is incapable of notifying RING (eg: motorola c350), so we try to answer
-		char list_command[64];
-		struct timeval call_incoming_timeout;
-		gettimeofday(&call_incoming_timeout, NULL);
-		call_incoming_timeout.tv_sec -= 3;
-		DEBUGA_GSMOPEN
-			("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-			 GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-		if (call_incoming_timeout.tv_sec > tech_pvt->call_incoming_time.tv_sec) {
-
-			tech_pvt->call_incoming_time.tv_sec = 0;
-			tech_pvt->call_incoming_time.tv_usec = 0;
-			DEBUGA_GSMOPEN
-				("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-				 GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-			res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CPBS=RC");
-			if (res) {
-				ERRORA("AT+CPBS=RC (select memory of received calls) was not answered by the phone\n", GSMOPEN_P_LOG);
-			}
-			tech_pvt->phonebook_querying = 1;
-			res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CPBR=?");
-			if (res) {
-				ERRORA("AT+CPBS=RC (select memory of received calls) was not answered by the phone\n", GSMOPEN_P_LOG);
-			}
-			tech_pvt->phonebook_querying = 0;
-			sprintf(list_command, "AT+CPBR=%d,%d", tech_pvt->phonebook_first_entry, tech_pvt->phonebook_last_entry);
-			tech_pvt->phonebook_listing_received_calls = 1;
-			res = gsmopen_serial_write_AT_expect_longtime(tech_pvt, list_command, "OK");
-			if (res) {
-				WARNINGA("AT+CPBR=%d,%d failed, continue\n", GSMOPEN_P_LOG, tech_pvt->phonebook_first_entry, tech_pvt->phonebook_last_entry);
-			}
-			tech_pvt->phonebook_listing_received_calls = 0;
-		}
-	}
-
-	if (tech_pvt->phone_callflow == CALLFLOW_INCOMING_RING) {
-		struct timeval call_incoming_timeout;
-		gettimeofday(&call_incoming_timeout, NULL);
-		call_incoming_timeout.tv_sec -= 10;
-		// DEBUGA_GSMOPEN ("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n", GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-		if (call_incoming_timeout.tv_sec > tech_pvt->ringtime.tv_sec) {
-			ERRORA("Ringing stopped and I have not answered. Why?\n", GSMOPEN_P_LOG);
-			DEBUGA_GSMOPEN
-				("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-				 GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-			if (tech_pvt->owner) {
-				gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-			}
-		}
-	}
-	tech_pvt->line_array.elemcount = la_counter;
-	//NOTICA (" OUTSIDE this gsmopen_serial_device %s \n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-	if (look_for_ack)
-		return at_ack;
-	else
-		return 0;
-}
-
-int gsmopen_serial_write_AT(private_t * tech_pvt, const char *data)
-{
-	int howmany;
-	int i;
-	int res;
-	int count;
-
-	howmany = strlen(data);
-
-	for (i = 0; i < howmany; i++) {
-		res = write(tech_pvt->controldevfd, &data[i], 1);
-
-		if (res != 1) {
-			DEBUGA_GSMOPEN("Error sending (%.1s): %d (%s)\n", GSMOPEN_P_LOG, &data[i], res, strerror(errno));
-			gsmopen_sleep(100000);
-			for (count = 0; count < 10; count++) {
-				res = write(tech_pvt->controldevfd, &data[i], 1);
-				if (res == 1) {
-					DEBUGA_GSMOPEN("Successfully RE-sent (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &data[i], count, res, strerror(errno));
-					break;
-				} else
-					DEBUGA_GSMOPEN("Error RE-sending (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &data[i], count, res, strerror(errno));
-				gsmopen_sleep(100000);
-
-			}
-			if (res != 1) {
-				ERRORA("Error RE-sending (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &data[i], count, res, strerror(errno));
-				return -1;
-			}
-		}
-		if (option_debug > 1)
-			DEBUGA_GSMOPEN("sent data... (%.1s)\n", GSMOPEN_P_LOG, &data[i]);
-		gsmopen_sleep(1000);			/* release the cpu */
-	}
-
-	res = write(tech_pvt->controldevfd, "\r", 1);
-
-	if (res != 1) {
-		DEBUGA_GSMOPEN("Error sending (carriage return): %d (%s)\n", GSMOPEN_P_LOG, res, strerror(errno));
-		gsmopen_sleep(100000);
-		for (count = 0; count < 10; count++) {
-			res = write(tech_pvt->controldevfd, "\r", 1);
-
-			if (res == 1) {
-				DEBUGA_GSMOPEN("Successfully RE-sent carriage return: %d %d (%s)\n", GSMOPEN_P_LOG, count, res, strerror(errno));
-				break;
-			} else
-				DEBUGA_GSMOPEN("Error RE-sending (carriage return): %d %d (%s)\n", GSMOPEN_P_LOG, count, res, strerror(errno));
-			gsmopen_sleep(100000);
-
-		}
-		if (res != 1) {
-			ERRORA("Error RE-sending (carriage return): %d %d (%s)\n", GSMOPEN_P_LOG, count, res, strerror(errno));
-			return -1;
-		}
-	}
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("sent (carriage return)\n", GSMOPEN_P_LOG);
-	gsmopen_sleep(1000);				/* release the cpu */
-
-	return howmany;
-}
-
-int gsmopen_serial_write_AT_nocr(private_t * tech_pvt, const char *data)
-{
-	int howmany;
-	int i;
-	int res;
-	int count;
-
-	howmany = strlen(data);
-
-	for (i = 0; i < howmany; i++) {
-		res = write(tech_pvt->controldevfd, &data[i], 1);
-
-		if (res != 1) {
-			DEBUGA_GSMOPEN("Error sending (%.1s): %d (%s)\n", GSMOPEN_P_LOG, &data[i], res, strerror(errno));
-			gsmopen_sleep(100000);
-			for (count = 0; count < 10; count++) {
-				res = write(tech_pvt->controldevfd, &data[i], 1);
-				if (res == 1)
-					break;
-				else
-					DEBUGA_GSMOPEN("Error RE-sending (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &data[i], count, res, strerror(errno));
-				gsmopen_sleep(100000);
-
-			}
-			if (res != 1) {
-				ERRORA("Error RE-sending (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &data[i], count, res, strerror(errno));
-				return -1;
-			}
-		}
-		if (option_debug > 1)
-			DEBUGA_GSMOPEN("sent data... (%.1s)\n", GSMOPEN_P_LOG, &data[i]);
-		gsmopen_sleep(1000);			/* release the cpu */
-	}
-
-	gsmopen_sleep(1000);				/* release the cpu */
-
-	return howmany;
-}
-
-int gsmopen_serial_write_AT_noack(private_t * tech_pvt, const char *data)
-{
-
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("gsmopen_serial_write_AT_noack: %s\n", GSMOPEN_P_LOG, data);
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (gsmopen_serial_write_AT(tech_pvt, data) != strlen(data)) {
-
-		ERRORA("Error sending data... (%s)\n", GSMOPEN_P_LOG, strerror(errno));
-		UNLOCKA(tech_pvt->controldev_lock);
-		return -1;
-	}
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return 0;
-}
-
-int gsmopen_serial_write_AT_ack(private_t * tech_pvt, const char *data)
-{
-	int at_result = AT_ERROR;
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("sending: %s\n", GSMOPEN_P_LOG, data);
-	if (gsmopen_serial_write_AT(tech_pvt, data) != strlen(data)) {
-		ERRORA("Error sending data... (%s) \n", GSMOPEN_P_LOG, strerror(errno));
-		UNLOCKA(tech_pvt->controldev_lock);
-		return -1;
-	}
-
-	at_result = gsmopen_serial_read_AT(tech_pvt, 1, 500000, 2, NULL, 1);	// 2.5 sec timeout
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return at_result;
-
-}
-
-int gsmopen_serial_write_AT_ack_nocr_longtime(private_t * tech_pvt, const char *data)
-{
-	int at_result = AT_ERROR;
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("sending: %s\n", GSMOPEN_P_LOG, data);
-	if (gsmopen_serial_write_AT_nocr(tech_pvt, data) != strlen(data)) {
-		ERRORA("Error sending data... (%s) \n", GSMOPEN_P_LOG, strerror(errno));
-		UNLOCKA(tech_pvt->controldev_lock);
-		return -1;
-	}
-
-	at_result = gsmopen_serial_read_AT(tech_pvt, 1, 500000, 20, NULL, 1);	// 20.5 sec timeout
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return at_result;
-
-}
-
-int gsmopen_serial_write_AT_expect1(private_t * tech_pvt, const char *data, const char *expected_string, int expect_crlf, int seconds)
-{
-	int at_result = AT_ERROR;
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("sending: %s, expecting: %s\n", GSMOPEN_P_LOG, data, expected_string);
-	if (gsmopen_serial_write_AT(tech_pvt, data) != strlen(data)) {
-		ERRORA("Error sending data... (%s) \n", GSMOPEN_P_LOG, strerror(errno));
-		UNLOCKA(tech_pvt->controldev_lock);
-		return -1;
-	}
-
-	at_result = gsmopen_serial_read_AT(tech_pvt, 1, 500000, seconds, expected_string, expect_crlf);	// 20.5 sec timeout, used for querying the SIM and sending SMSs
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return at_result;
-
-}
-
-int gsmopen_serial_AT_expect(private_t * tech_pvt, const char *expected_string, int expect_crlf, int seconds)
-{
-	int at_result = AT_ERROR;
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("expecting: %s\n", GSMOPEN_P_LOG, expected_string);
-
-	at_result = gsmopen_serial_read_AT(tech_pvt, 1, 500000, seconds, expected_string, expect_crlf);	// 20.5 sec timeout, used for querying the SIM and sending SMSs
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return at_result;
-
-}
-
-int gsmopen_serial_answer(private_t * tech_pvt)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_answer_AT(tech_pvt);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_answer_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_answer_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-	return -1;
-}
-
-
-int gsmopen_serial_answer_AT(private_t * tech_pvt)
-{
-	int res;
-
-	res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_answer, tech_pvt->at_answer_expect);
-	if (res) {
-		DEBUGA_GSMOPEN
-			("at_answer command failed, command used: %s, expecting: %s, trying with AT+CKPD=\"S\"\n",
-			 GSMOPEN_P_LOG, tech_pvt->at_answer, tech_pvt->at_answer_expect);
-
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CKPD=\"S\"");
-		if (res) {
-			ERRORA("at_answer command failed, command used: 'AT+CKPD=\"S\"', giving up\n", GSMOPEN_P_LOG);
-			return -1;
-		}
-	}
-	//tech_pvt->interface_state = GSMOPEN_STATE_UP;
-	//tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
-	DEBUGA_GSMOPEN("AT: call answered\n", GSMOPEN_P_LOG);
-	return 0;
-}
-
-int gsmopen_serial_hangup(private_t * tech_pvt)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_hangup_AT(tech_pvt);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_hangup_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_hangup_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-	return -1;
-}
-
-
-int gsmopen_serial_hangup_AT(private_t * tech_pvt)
-{
-	int res;
-
-	if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-		res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_hangup, tech_pvt->at_hangup_expect);
-		if (res) {
-			DEBUGA_GSMOPEN("at_hangup command failed, command used: %s, trying to use AT+CKPD=\"EEE\"\n", GSMOPEN_P_LOG, tech_pvt->at_hangup);
-			res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CKPD=\"EEE\"");
-			if (res) {
-				ERRORA("at_hangup command failed, command used: 'AT+CKPD=\"EEE\"'\n", GSMOPEN_P_LOG);
-				return -1;
-			}
-		}
-	}
-	tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-	tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-	return 0;
-}
-
-
-int gsmopen_serial_call(private_t * tech_pvt, char *dstr)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_call_AT(tech_pvt, dstr);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_call_FBUS2(tech_pvt, dstr);
-#endif /* GSMOPEN_FBUS2 */
-	if (tech_pvt->controldevprotocol == PROTOCOL_NO_SERIAL)
-		return 0;
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_call_CVM_BUSMAIL(tech_pvt, dstr);
-#endif /* GSMOPEN_CVM */
-	return -1;
-}
-
-int gsmopen_serial_call_AT(private_t * tech_pvt, char *dstr)
-{
-	int res;
-	char at_command[256];
-
-	if (option_debug)
-		DEBUGA_PBX("Dialing %s\n", GSMOPEN_P_LOG, dstr);
-	memset(at_command, 0, sizeof(at_command));
-	tech_pvt->phone_callflow = CALLFLOW_CALL_DIALING;
-	tech_pvt->interface_state = GSMOPEN_STATE_DIALING;
-	//ast_uri_decode(dstr);
-/*
-  size_t fixdstr = strspn(dstr, AST_DIGIT_ANYDIG);
-  if (fixdstr == 0) {
-    ERRORA("dial command failed because of invalid dial number. dial string was: %s\n",
-           GSMOPEN_P_LOG, dstr);
-    return -1;
-  }
-*/
-	//dstr[fixdstr] = '\0';
-	sprintf(at_command, "%s%s%s", tech_pvt->at_dial_pre_number, dstr, tech_pvt->at_dial_post_number);
-	DEBUGA_PBX("Dialstring %s\n", GSMOPEN_P_LOG, at_command);
-	res = gsmopen_serial_write_AT_expect(tech_pvt, at_command, tech_pvt->at_dial_expect);
-	if (res) {
-		ERRORA("dial command failed, dial string was: %s\n", GSMOPEN_P_LOG, at_command);
-		return -1;
-	}
-	// jet - early audio
-	//if (tech_pvt->at_early_audio) {
-	//ast_queue_control(tech_pvt->owner, AST_CONTROL_ANSWER);
-	//}
-
-	return 0;
-}
-
-int ucs2_to_utf8(private_t * tech_pvt, char *ucs2_in, char *utf8_out, size_t outbytesleft)
-{
-	char converted[16000];
-#ifndef WIN32
-	iconv_t iconv_format;
-	int iconv_res;
-	char *outbuf;
-	char *inbuf;
-	size_t inbytesleft;
-	int c;
-	char stringa[5];
-	double hexnum;
-	int i = 0;
-
-	memset(converted, '\0', sizeof(converted));
-
-	DEBUGA_GSMOPEN("ucs2_in=%s\n", GSMOPEN_P_LOG, ucs2_in);
-	/* cicopet */
-	for (c = 0; c < strlen(ucs2_in); c++) {
-		sprintf(stringa, "0x%c%c", ucs2_in[c], ucs2_in[c + 1]);
-		c++;
-		hexnum = strtod(stringa, NULL);
-		converted[i] = (char) hexnum;
-		i++;
-	}
-
-	outbuf = utf8_out;
-	inbuf = converted;
-
-	iconv_format = iconv_open("UTF8", "UCS-2BE");
-	if (iconv_format == (iconv_t) - 1) {
-		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
-		return -1;
-	}
-
-	inbytesleft = i;
-	DEBUGA_GSMOPEN("1 ciao in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
-				   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
-
-	iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-	if (iconv_res == (size_t) -1) {
-		DEBUGA_GSMOPEN("2 ciao in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
-					   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
-		DEBUGA_GSMOPEN("3 error: %s %d\n", GSMOPEN_P_LOG, strerror(errno), errno);
-		iconv_close(iconv_format);
-		return -1;
-	}
-	DEBUGA_GSMOPEN
-		("iconv_res=%d,  in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
-		 GSMOPEN_P_LOG, iconv_res, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
-	iconv_close(iconv_format);
-
-#endif //WIN32
-	return 0;
-}
-
-int iso_8859_1_to_utf8(private_t * tech_pvt, char *iso_8859_1_in, char *utf8_out, size_t outbytesleft)
-{
-	char converted[16000];
-#ifndef WIN32
-	iconv_t iconv_format;
-	int iconv_res;
-	char *outbuf;
-	char *inbuf;
-	size_t inbytesleft;
-	//int c;
-	//char stringa[5];
-	//double hexnum;
-	//int i = 0;
-
-	memset(converted, '\0', sizeof(converted));
-
-	DEBUGA_GSMOPEN("iso_8859_1_in=%s\n", GSMOPEN_P_LOG, iso_8859_1_in);
-
-	outbuf = utf8_out;
-	inbuf = iso_8859_1_in;
-
-	iconv_format = iconv_open("UTF8", "ISO_8859-1");
-	if (iconv_format == (iconv_t) - 1) {
-		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
-		return -1;
-	}
-
-
-	inbytesleft = strlen(iso_8859_1_in) * 2;
-	iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-	if (iconv_res == (size_t) -1) {
-		DEBUGA_GSMOPEN("ciao in=%s, inleft=%d, out=%s, outleft=%d, utf8_out=%s\n",
-					   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_out);
-		DEBUGA_GSMOPEN("error: %s %d\n", GSMOPEN_P_LOG, strerror(errno), errno);
-		return -1;
-	}
-	DEBUGA_GSMOPEN
-		(" strlen(iso_8859_1_in)=%d, iconv_res=%d,  inbuf=%s, inleft=%d, out=%s, outleft=%d, utf8_out=%s\n",
-		 GSMOPEN_P_LOG, (int) strlen(iso_8859_1_in), iconv_res, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_out);
-
-
-
-	iconv_close(iconv_format);
-
-#endif //WIN32
-	return 0;
-}
-
-
-int utf_to_ucs2(private_t * tech_pvt, char *utf_in, size_t inbytesleft, char *ucs2_out, size_t outbytesleft)
-{
-	/* cicopet */
-#ifndef WIN32
-	iconv_t iconv_format;
-	int iconv_res;
-	char *outbuf;
-	char *inbuf;
-	char converted[16000];
-	int i;
-	char stringa[16];
-	char stringa2[16];
-
-	memset(converted, '\0', sizeof(converted));
-
-	outbuf = converted;
-	inbuf = utf_in;
-
-	iconv_format = iconv_open("UCS-2BE", "UTF8");
-	if (iconv_format == (iconv_t) - 1) {
-		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
-		return -1;
-	}
-	outbytesleft = 16000;
-
-	DEBUGA_GSMOPEN("in=%s, inleft=%d, out=%s, outleft=%d, utf_in=%s, converted=%s\n",
-				   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf_in, converted);
-	iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-	if (iconv_res == (size_t) -1) {
-		ERRORA("error: %s %d\n", GSMOPEN_P_LOG, strerror(errno), errno);
-		return -1;
-	}
-	DEBUGA_GSMOPEN
-		("iconv_res=%d,  in=%s, inleft=%d, out=%s, outleft=%d, utf_in=%s, converted=%s\n",
-		 GSMOPEN_P_LOG, iconv_res, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf_in, converted);
-	iconv_close(iconv_format);
-
-	for (i = 0; i < 16000 - outbytesleft; i++) {
-		memset(stringa, '\0', sizeof(stringa));
-		memset(stringa2, '\0', sizeof(stringa2));
-		sprintf(stringa, "%02X", converted[i]);
-		DEBUGA_GSMOPEN("character is |%02X|\n", GSMOPEN_P_LOG, converted[i]);
-		stringa2[0] = stringa[strlen(stringa) - 2];
-		stringa2[1] = stringa[strlen(stringa) - 1];
-		strncat(ucs2_out, stringa2, ((outbytesleft - strlen(ucs2_out)) - 1));	//add the received line to the buffer
-		DEBUGA_GSMOPEN("stringa=%s, stringa2=%s, ucs2_out=%s\n", GSMOPEN_P_LOG, stringa, stringa2, ucs2_out);
-	}
-#endif //WIN32
-	return 0;
-}
-
-
-/*! \brief  Answer incoming call,
- * Part of PBX interface */
-int gsmopen_answer(private_t * tech_pvt)
-{
-	int res;
-
-	if (option_debug) {
-		DEBUGA_PBX("ENTERING FUNC\n", GSMOPEN_P_LOG);
-	}
-	/* do something to actually answer the call, if needed (eg. pick up the phone) */
-	if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
-		if (gsmopen_serial_answer(tech_pvt)) {
-			ERRORA("gsmopen_answer FAILED\n", GSMOPEN_P_LOG);
-			if (option_debug) {
-				DEBUGA_PBX("EXITING FUNC\n", GSMOPEN_P_LOG);
-			}
-			return -1;
-		}
-	}
-	tech_pvt->interface_state = GSMOPEN_STATE_UP;
-	tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
-
-	while (tech_pvt->interface_state == GSMOPEN_STATE_RING) {
-		gsmopen_sleep(10000);			//10msec
-	}
-	if (tech_pvt->interface_state != GSMOPEN_STATE_UP) {
-		ERRORA("call answering failed\n", GSMOPEN_P_LOG);
-		res = -1;
-	} else {
-		if (option_debug)
-			DEBUGA_PBX("call answered\n", GSMOPEN_P_LOG);
-		res = 0;
-#ifdef GSMOPEN_PORTAUDIO
-		//speex_echo_state_reset(tech_pvt->stream->echo_state);
-#endif // GSMOPEN_PORTAUDIO
-
-		new_inbound_channel(tech_pvt);
-		if (tech_pvt->owner) {
-			DEBUGA_PBX("going to send GSMOPEN_STATE_UP\n", GSMOPEN_P_LOG);
-			ast_setstate(tech_pvt->owner, GSMOPEN_STATE_UP);
-			//ast_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_ANSWER);
-			//gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_ANSWER);
-			DEBUGA_PBX("just sent GSMOPEN_STATE_UP\n", GSMOPEN_P_LOG);
-		}
-	}
-	if (option_debug) {
-		DEBUGA_PBX("EXITING FUNC\n", GSMOPEN_P_LOG);
-	}
-	return res;
-}
-
-int gsmopen_ring(private_t * tech_pvt)
-{
-	int res = 0;
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (option_debug) {
-		//DEBUGA_PBX("ENTERING FUNC\n", GSMOPEN_P_LOG);
-	}
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	if (session) {
-		switch_core_session_rwunlock(session);
-		return 0;
-	}
-
-	new_inbound_channel(tech_pvt);
-
-	gsmopen_sleep(10000);
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-
-		switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING);
-		if (channel) {
-			switch_channel_mark_ring_ready(channel);
-		} else {
-			ERRORA("no session\n", GSMOPEN_P_LOG);
-		}
-		switch_core_session_rwunlock(session);
-	} else {
-		ERRORA("no session\n", GSMOPEN_P_LOG);
-
-	}
-
-
-	if (option_debug) {
-		DEBUGA_PBX("EXITING FUNC\n", GSMOPEN_P_LOG);
-	}
-	return res;
-}
-
-
-/*! \brief  Hangup gsmopen call
- * Part of PBX interface, called from ast_hangup */
-
-int gsmopen_hangup(private_t * tech_pvt)
-{
-
-	/* if there is not gsmopen pvt why we are here ? */
-	if (!tech_pvt) {
-		ERRORA("Asked to hangup channel not connected\n", GSMOPEN_P_LOG);
-		return 0;
-	}
-
-	DEBUGA_GSMOPEN("ENTERING FUNC\n", GSMOPEN_P_LOG);
-
-
-	if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
-		if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-			/* actually hangup through the serial port */
-			if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
-				int res;
-				res = gsmopen_serial_hangup(tech_pvt);
-				if (res) {
-					ERRORA("gsmopen_serial_hangup error: %d\n", GSMOPEN_P_LOG, res);
-					if (option_debug) {
-						DEBUGA_PBX("EXITING FUNC\n", GSMOPEN_P_LOG);
-					}
-					return -1;
-				}
-			}
-
-			while (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-				gsmopen_sleep(10000);	//10msec
-			}
-			if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-				ERRORA("call hangup failed\n", GSMOPEN_P_LOG);
-				return -1;
-			} else {
-				DEBUGA_GSMOPEN("call hungup\n", GSMOPEN_P_LOG);
-			}
-		}
-	} else {
-		tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-		tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-	}
-
-	switch_set_flag(tech_pvt, TFLAG_HANGUP);
-	if (option_debug) {
-		DEBUGA_PBX("EXITING FUNC\n", GSMOPEN_P_LOG);
-	}
-	return 0;
-}
-
-
-
-#ifdef GSMOPEN_ALSA
-/*! \brief ALSA pcm format, according to endianess  */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-snd_pcm_format_t gsmopen_format = SND_PCM_FORMAT_S16_LE;
-#else
-snd_pcm_format_t gsmopen_format = SND_PCM_FORMAT_S16_BE;
-#endif
-
-/*!
- * \brief Initialize the ALSA soundcard channels (capture AND playback) used by one interface (a multichannel soundcard can be used by multiple interfaces) 
- * \param p the gsmopen_pvt of the interface
- *
- * This function call alsa_open_dev to initialize the ALSA soundcard for each channel (capture AND playback) used by one interface (a multichannel soundcard can be used by multiple interfaces). Called by sound_init
- *
- * \return zero on success, -1 on error.
- */
-int alsa_init(private_t * tech_pvt)
-{
-	tech_pvt->alsac = alsa_open_dev(tech_pvt, SND_PCM_STREAM_CAPTURE);
-	if (!tech_pvt->alsac) {
-		ERRORA("Failed opening ALSA capture device: %s\n", GSMOPEN_P_LOG, tech_pvt->alsacname);
-		if (alsa_shutdown(tech_pvt)) {
-			ERRORA("alsa_shutdown failed\n", GSMOPEN_P_LOG);
-			return -1;
-		}
-		return -1;
-	}
-	tech_pvt->alsap = alsa_open_dev(tech_pvt, SND_PCM_STREAM_PLAYBACK);
-	if (!tech_pvt->alsap) {
-		ERRORA("Failed opening ALSA playback device: %s\n", GSMOPEN_P_LOG, tech_pvt->alsapname);
-		if (alsa_shutdown(tech_pvt)) {
-			ERRORA("alsa_shutdown failed\n", GSMOPEN_P_LOG);
-			return -1;
-		}
-		return -1;
-	}
-
-	/* make valgrind very happy */
-	snd_config_update_free_global();
-	return 0;
-}
-
-/*!
- * \brief Shutdown the ALSA soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces) 
- * \param p the gsmopen_pvt of the interface
- *
- * This function shutdown the ALSA soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces). Called by sound_init
- *
- * \return zero on success, -1 on error.
- */
-
-int alsa_shutdown(private_t * tech_pvt)
-{
-
-	int err;
-
-	if (tech_pvt->alsap) {
-		err = snd_pcm_drop(tech_pvt->alsap);
-		if (err < 0) {
-			ERRORA("device [%s], snd_pcm_drop failed with error '%s'\n", GSMOPEN_P_LOG, tech_pvt->alsapname, snd_strerror(err));
-			return -1;
-		}
-		err = snd_pcm_close(tech_pvt->alsap);
-		if (err < 0) {
-			ERRORA("device [%s], snd_pcm_close failed with error '%s'\n", GSMOPEN_P_LOG, tech_pvt->alsapname, snd_strerror(err));
-			return -1;
-		}
-		tech_pvt->alsap = NULL;
-	}
-	if (tech_pvt->alsac) {
-		err = snd_pcm_drop(tech_pvt->alsac);
-		if (err < 0) {
-			ERRORA("device [%s], snd_pcm_drop failed with error '%s'\n", GSMOPEN_P_LOG, tech_pvt->alsacname, snd_strerror(err));
-			return -1;
-		}
-		err = snd_pcm_close(tech_pvt->alsac);
-		if (err < 0) {
-			ERRORA("device [%s], snd_pcm_close failed with error '%s'\n", GSMOPEN_P_LOG, tech_pvt->alsacname, snd_strerror(err));
-			return -1;
-		}
-		tech_pvt->alsac = NULL;
-	}
-
-	return 0;
-}
-
-/*!
- * \brief Setup and open the ALSA device (capture OR playback) 
- * \param p the gsmopen_pvt of the interface
- * \param stream the ALSA capture/playback definition
- *
- * This function setup and open the ALSA device (capture OR playback). Called by alsa_init
- *
- * \return zero on success, -1 on error.
- */
-snd_pcm_t *alsa_open_dev(private_t * tech_pvt, snd_pcm_stream_t stream)
-{
-
-	snd_pcm_t *handle = NULL;
-	snd_pcm_hw_params_t *params;
-	snd_pcm_sw_params_t *swparams;
-	snd_pcm_uframes_t buffer_size;
-	int err;
-	size_t n;
-	//snd_pcm_uframes_t xfer_align;
-	unsigned int rate;
-	snd_pcm_uframes_t start_threshold, stop_threshold;
-	snd_pcm_uframes_t period_size = 0;
-	snd_pcm_uframes_t chunk_size = 0;
-	int start_delay = 0;
-	int stop_delay = 0;
-	snd_pcm_state_t state;
-	snd_pcm_info_t *info;
-	unsigned int chan_num;
-
-	period_size = tech_pvt->alsa_period_size;
-
-	snd_pcm_hw_params_alloca(&params);
-	snd_pcm_sw_params_alloca(&swparams);
-
-	if (stream == SND_PCM_STREAM_CAPTURE) {
-		err = snd_pcm_open(&handle, tech_pvt->alsacname, stream, 0 | SND_PCM_NONBLOCK);
-	} else {
-		err = snd_pcm_open(&handle, tech_pvt->alsapname, stream, 0 | SND_PCM_NONBLOCK);
-	}
-	if (err < 0) {
-		ERRORA
-			("snd_pcm_open failed with error '%s' on device '%s', if you are using a plughw:n device please change it to be a default:n device (so to allow it to be shared with other concurrent programs), or maybe you are using an ALSA voicemodem and slmodemd"
-			 " is running?\n", GSMOPEN_P_LOG, snd_strerror(err), stream == SND_PCM_STREAM_CAPTURE ? tech_pvt->alsacname : tech_pvt->alsapname);
-		return NULL;
-	}
-
-	snd_pcm_info_alloca(&info);
-
-	if ((err = snd_pcm_info(handle, info)) < 0) {
-		ERRORA("info error: %s", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-
-	err = snd_pcm_nonblock(handle, 1);
-	if (err < 0) {
-		ERRORA("nonblock setting error: %s", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-
-	err = snd_pcm_hw_params_any(handle, params);
-	if (err < 0) {
-		ERRORA("Broken configuration for this PCM, no configurations available: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-
-	err = snd_pcm_hw_params_set_access(handle, params, SND_PCM_ACCESS_RW_INTERLEAVED);
-	if (err < 0) {
-		ERRORA("Access type not available: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-	err = snd_pcm_hw_params_set_format(handle, params, gsmopen_format);
-	if (err < 0) {
-		ERRORA("Sample format non available: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-	err = snd_pcm_hw_params_set_channels(handle, params, 1);
-	if (err < 0) {
-		DEBUGA_GSMOPEN("Channels count set failed: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-	}
-#if 1
-	err = snd_pcm_hw_params_get_channels(params, &chan_num);
-	if (err < 0) {
-		ERRORA("Channels count non available: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-	if (chan_num < 1 || chan_num > 2) {
-		ERRORA("Channels count MUST BE 1 or 2, it is: %d\n", GSMOPEN_P_LOG, chan_num);
-		ERRORA("Channels count MUST BE 1 or 2, it is: %d on %s %s\n", GSMOPEN_P_LOG, chan_num, tech_pvt->alsapname, tech_pvt->alsacname);
-		return NULL;
-	} else {
-		if (chan_num == 1) {
-			if (stream == SND_PCM_STREAM_CAPTURE)
-				tech_pvt->alsa_capture_is_mono = 1;
-			else
-				tech_pvt->alsa_play_is_mono = 1;
-		} else {
-			if (stream == SND_PCM_STREAM_CAPTURE)
-				tech_pvt->alsa_capture_is_mono = 0;
-			else
-				tech_pvt->alsa_play_is_mono = 0;
-		}
-	}
-#else
-	tech_pvt->alsa_capture_is_mono = 1;
-	tech_pvt->alsa_play_is_mono = 1;
-#endif
-
-#if 1
-	rate = tech_pvt->gsmopen_sound_rate;
-	err = snd_pcm_hw_params_set_rate_near(handle, params, &rate, 0);
-	if ((float) tech_pvt->gsmopen_sound_rate * 1.05 < rate || (float) tech_pvt->gsmopen_sound_rate * 0.95 > rate) {
-		WARNINGA("Rate is not accurate (requested = %iHz, got = %iHz)\n", GSMOPEN_P_LOG, tech_pvt->gsmopen_sound_rate, rate);
-	}
-
-	if (err < 0) {
-		ERRORA("Error setting rate: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-	tech_pvt->gsmopen_sound_rate = rate;
-
-	err = snd_pcm_hw_params_set_period_size_near(handle, params, &period_size, 0);
-
-	if (err < 0) {
-		ERRORA("Error setting period_size: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-
-	tech_pvt->alsa_period_size = period_size;
-
-	tech_pvt->alsa_buffer_size = tech_pvt->alsa_period_size * tech_pvt->alsa_periods_in_buffer;
-
-	err = snd_pcm_hw_params_set_buffer_size_near(handle, params, &tech_pvt->alsa_buffer_size);
-
-	if (err < 0) {
-		ERRORA("Error setting buffer_size: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-#endif
-
-	err = snd_pcm_hw_params(handle, params);
-	if (err < 0) {
-		ERRORA("Unable to install hw params: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-
-	snd_pcm_hw_params_get_period_size(params, &chunk_size, 0);
-	snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
-	if (chunk_size == buffer_size) {
-		ERRORA("Can't use period equal to buffer size (%lu == %lu)\n", GSMOPEN_P_LOG, chunk_size, buffer_size);
-		return NULL;
-	}
-
-	snd_pcm_sw_params_current(handle, swparams);
-
-	/*
-	   if (sleep_min)
-	   xfer_align = 1;
-	   err = snd_pcm_sw_params_set_sleep_min(handle, swparams,
-	   0);
-
-	   if (err < 0) {
-	   ERRORA("Error setting slep_min: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-	   }
-	 */
-	n = chunk_size;
-	err = snd_pcm_sw_params_set_avail_min(handle, swparams, n);
-	if (err < 0) {
-		ERRORA("Error setting avail_min: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-	}
-	if (stream == SND_PCM_STREAM_CAPTURE) {
-		start_delay = 1;
-	}
-	if (start_delay <= 0) {
-		start_threshold = n + (snd_pcm_uframes_t) rate *start_delay / 1000000;
-	} else {
-		start_threshold = (snd_pcm_uframes_t) rate *start_delay / 1000000;
-	}
-	if (start_threshold < 1)
-		start_threshold = 1;
-	if (start_threshold > n)
-		start_threshold = n;
-	err = snd_pcm_sw_params_set_start_threshold(handle, swparams, start_threshold);
-	if (err < 0) {
-		ERRORA("Error setting start_threshold: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-	}
-
-	if (stop_delay <= 0)
-		stop_threshold = buffer_size + (snd_pcm_uframes_t) rate *stop_delay / 1000000;
-	else
-		stop_threshold = (snd_pcm_uframes_t) rate *stop_delay / 1000000;
-
-	if (stream == SND_PCM_STREAM_CAPTURE) {
-		stop_threshold = -1;
-	}
-
-	err = snd_pcm_sw_params_set_stop_threshold(handle, swparams, stop_threshold);
-
-	if (err < 0) {
-		ERRORA("Error setting stop_threshold: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-	}
-
-	if (snd_pcm_sw_params(handle, swparams) < 0) {
-		ERRORA("Error installing software parameters: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-	}
-
-	err = snd_pcm_poll_descriptors_count(handle);
-	if (err <= 0) {
-		ERRORA("Unable to get a poll descriptors count, error is %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-
-	if (err != 1) {				//number of poll descriptors
-		DEBUGA_GSMOPEN("Can't handle more than one device\n", GSMOPEN_P_LOG);
-		return NULL;
-	}
-
-	err = snd_pcm_poll_descriptors(handle, &tech_pvt->pfd, err);
-	if (err != 1) {
-		ERRORA("snd_pcm_poll_descriptors failed, %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		return NULL;
-	}
-	DEBUGA_GSMOPEN("Acquired fd %d from the poll descriptor\n", GSMOPEN_P_LOG, tech_pvt->pfd.fd);
-
-	if (stream == SND_PCM_STREAM_CAPTURE) {
-		tech_pvt->gsmopen_sound_capt_fd = tech_pvt->pfd.fd;
-	}
-
-	state = snd_pcm_state(handle);
-
-	if (state != SND_PCM_STATE_RUNNING) {
-		if (state != SND_PCM_STATE_PREPARED) {
-			err = snd_pcm_prepare(handle);
-			if (err) {
-				ERRORA("snd_pcm_prepare failed, %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-				return NULL;
-			}
-			DEBUGA_GSMOPEN("prepared!\n", GSMOPEN_P_LOG);
-		}
-		if (stream == SND_PCM_STREAM_CAPTURE) {
-			err = snd_pcm_start(handle);
-			if (err) {
-				ERRORA("snd_pcm_start failed, %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-				return NULL;
-			}
-			DEBUGA_GSMOPEN("started!\n", GSMOPEN_P_LOG);
-		}
-	}
-	if (option_debug > 1) {
-		snd_output_t *output = NULL;
-		err = snd_output_stdio_attach(&output, stdout, 0);
-		if (err < 0) {
-			ERRORA("snd_output_stdio_attach failed: %s\n", GSMOPEN_P_LOG, snd_strerror(err));
-		}
-		snd_pcm_dump(handle, output);
-
-#ifndef NO_GSMLIB
-		SMSMessageRef sms;
-		char content2[1000];
-		//sms = SMSMessage::decode("079194710167120004038571F1390099406180904480A0D41631067296EF7390383D07CD622E58CD95CB81D6EF39BDEC66BFE7207A794E2FBB4320AFB82C07E56020A8FC7D9687DBED32285C9F83A06F769A9E5EB340D7B49C3E1FA3C3663A0B24E4CBE76516680A7FCBE920725A5E5ED341F0B21C346D4E41E1BA790E4286DDE4BC0BD42CA3E5207258EE1797E5A0BA9B5E9683C86539685997EBEF61341B249BC966"); // dataCodingScheme = 0
-		//sms = SMSMessage::decode("0791934329002000040C9193432766658100009001211133318004D4F29C0E"); // dataCodingScheme = 0
-		//sms = SMSMessage::decode("0791934329002000040C919343276665810008900121612521801600CC00E800E900F900F200E00020006300690061006F"); // dataCodingScheme = 8
-		sms = SMSMessage::decode("0791934329002000040C919343276665810008900172002293404C006300690061006F0020003100320033002000620065006C00E80020043D043E0432043E044104420438002005DC05E7002005E805D005EA0020FE8EFEE0FEA0FEE4FECBFE9300204EBA5927");	// dataCodingScheme = 8 , text=ciao 123 belè новости לק ראת ﺎﻠﺠﻤﻋﺓ 人大
-		//sms = SMSMessage::decode("07911497941902F00414D0E474989D769F5DE4320839001040122151820000"); // dataCodingScheme = 0
-		//NOTICA("SMS=\n%s\n", GSMOPEN_P_LOG, sms->toString().c_str());
-
-		memset(content2, '\0', sizeof(content2));
-		if (sms->dataCodingScheme().getAlphabet() == DCS_DEFAULT_ALPHABET) {
-			iso_8859_1_to_utf8(tech_pvt, (char *) sms->userData().c_str(), content2, sizeof(content2));
-		} else if (sms->dataCodingScheme().getAlphabet() == DCS_SIXTEEN_BIT_ALPHABET) {
-			ucs2_to_utf8(tech_pvt, (char *) bufToHex((unsigned char *) sms->userData().data(), sms->userData().length()).c_str(), content2,
-						 sizeof(content2));
-		} else {
-			ERRORA("dataCodingScheme not supported=%d\n", GSMOPEN_P_LOG, sms->dataCodingScheme().getAlphabet());
-
-		}
-		//NOTICA("dataCodingScheme=%d\n", GSMOPEN_P_LOG, sms->dataCodingScheme().getAlphabet());
-		//NOTICA("userData= |||%s|||\n", GSMOPEN_P_LOG, content2);
-#endif// NO_GSMLIB
-
-	}
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("ALSA handle = %ld\n", GSMOPEN_P_LOG, (long int) handle);
-	return handle;
-
-}
-
-/*! \brief Write audio frames to interface */
-#endif /* GSMOPEN_ALSA */
-
-int gsmopen_call(private_t * tech_pvt, char *rdest, int timeout)
-{
-
-	//gsmopen_sleep(5000);
-	DEBUGA_GSMOPEN("Calling GSM, rdest is: %s\n", GSMOPEN_P_LOG, rdest);
-	//gsmopen_signaling_write(tech_pvt, "SET AGC OFF");
-	//gsmopen_sleep(10000);
-	//gsmopen_signaling_write(tech_pvt, "SET AEC OFF");
-	//gsmopen_sleep(10000);
-
-	gsmopen_serial_call(tech_pvt, rdest);
-	//ERRORA("failed to communicate with GSM client, now exit\n", GSMOPEN_P_LOG);
-	//return -1;
-	//}
-	return 0;
-}
-
-
-int gsmopen_senddigit(private_t * tech_pvt, char digit)
-{
-
-	DEBUGA_GSMOPEN("DIGIT received: %c\n", GSMOPEN_P_LOG, digit);
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT && tech_pvt->at_send_dtmf[0]) {
-		int res = 0;
-		char at_command[256];
-
-		memset(at_command, '\0', 256);
-		sprintf(at_command, "%s=\"%c\"", tech_pvt->at_send_dtmf, digit);
-		res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-		if (res) {
-			ERRORA("senddigit command failed, command used: '%s=\"%c\"', giving up\n", GSMOPEN_P_LOG, tech_pvt->at_send_dtmf, digit);
-		}
-	}
-
-	return 0;
-}
-
-#ifdef GSMOPEN_ALSA
-/*! \brief Write audio frames to interface */
-int alsa_write(private_t * tech_pvt, short *data, int datalen)
-{
-	static char sizbuf[8000];
-	static char sizbuf2[16000];
-	static char silencebuf[8000];
-	static int sizpos = 0;
-	int len = sizpos;
-	//int pos;
-	int res = 0;
-	time_t now_timestamp;
-	/* size_t frames = 0; */
-	snd_pcm_state_t state;
-	snd_pcm_sframes_t delayp1=0;
-	snd_pcm_sframes_t delayp2=0;
-
-	if(tech_pvt->no_sound==1){
-		return res;
-	}
-
-
-	memset(sizbuf, 255, sizeof(sizbuf));
-	memset(sizbuf2, 255, sizeof(sizbuf));
-	memset(silencebuf, 255, sizeof(sizbuf));
-
-	//ERRORA("data=%p, datalen=%d\n", GSMOPEN_P_LOG, (void *)data, datalen);
-	/* We have to digest the frame in 160-byte portions */
-	if (datalen > sizeof(sizbuf) - sizpos) {
-		ERRORA("Frame too large\n", GSMOPEN_P_LOG);
-		res = -1;
-	} else {
-		memcpy(sizbuf + sizpos, data, datalen);
-		memset(data, 255, datalen);
-		len += datalen;
-		//pos = 0;
-
-
-#ifdef ALSA_MONITOR
-		alsa_monitor_write(sizbuf, len);
-#endif
-		state = snd_pcm_state(tech_pvt->alsap);
-		if (state == SND_PCM_STATE_XRUN) {
-			int i;
-
-			DEBUGA_GSMOPEN
-				("You've got an ALSA write XRUN in the past (gsmopen can't fill the soundcard buffer fast enough). If this happens often (not after silence or after a pause in the speech, that's OK), and appear to damage the sound quality, first check if you have some IRQ problem, maybe sharing the soundcard IRQ with a broken or heavy loaded ethernet or graphic card. Then consider to increase the alsa_periods_in_buffer (now is set to %d) for this interface in the config file\n",
-				 GSMOPEN_P_LOG, tech_pvt->alsa_periods_in_buffer);
-			res = snd_pcm_prepare(tech_pvt->alsap);
-			if (res) {
-				ERRORA("audio play prepare failed: %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-			} else {
-				res = snd_pcm_format_set_silence(gsmopen_format, silencebuf, len / 2);
-				if (res < 0) {
-					DEBUGA_GSMOPEN("Silence error %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-					res = -1;
-				}
-				for (i = 0; i < (tech_pvt->alsa_periods_in_buffer - 1); i++) {
-					res = snd_pcm_writei(tech_pvt->alsap, silencebuf, len / 2);
-					if (res != len / 2) {
-						DEBUGA_GSMOPEN("Write returned a different quantity: %d\n", GSMOPEN_P_LOG, res);
-						res = -1;
-					} else if (res < 0) {
-						DEBUGA_GSMOPEN("Write error %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-						res = -1;
-					}
-				}
-			}
-
-		}
-
-		res = snd_pcm_delay(tech_pvt->alsap, &delayp1);
-		if (res < 0) {
-			DEBUGA_GSMOPEN("Error %d on snd_pcm_delay: \"%s\"\n", GSMOPEN_P_LOG, res, snd_strerror(res));
-			res = snd_pcm_prepare(tech_pvt->alsap);
-			if (res) {
-				DEBUGA_GSMOPEN("snd_pcm_prepare failed: '%s'\n", GSMOPEN_P_LOG, snd_strerror(res));
-			}
-			res = snd_pcm_delay(tech_pvt->alsap, &delayp1);
-		}
-
-		delayp2 = snd_pcm_avail_update(tech_pvt->alsap);
-		if (delayp2 < 0) {
-			DEBUGA_GSMOPEN("Error %d on snd_pcm_avail_update: \"%s\"\n", GSMOPEN_P_LOG, (int) delayp2, snd_strerror(delayp2));
-
-			res = snd_pcm_prepare(tech_pvt->alsap);
-			if (res) {
-				DEBUGA_GSMOPEN("snd_pcm_prepare failed: '%s'\n", GSMOPEN_P_LOG, snd_strerror(res));
-			}
-			delayp2 = snd_pcm_avail_update(tech_pvt->alsap);
-		}
-
-		if (					/* delayp1 != 0 && delayp1 != 160 */
-			   delayp1 < 160 || delayp2 > tech_pvt->alsa_buffer_size) {
-
-			res = snd_pcm_prepare(tech_pvt->alsap);
-			if (res) {
-				DEBUGA_GSMOPEN
-					("snd_pcm_prepare failed while trying to prevent an ALSA write XRUN: %s, delayp1=%d, delayp2=%d\n",
-					 GSMOPEN_P_LOG, snd_strerror(res), (int) delayp1, (int) delayp2);
-			} else {
-
-				int i;
-				for (i = 0; i < (tech_pvt->alsa_periods_in_buffer - 1); i++) {
-					res = snd_pcm_format_set_silence(gsmopen_format, silencebuf, len / 2);
-					if (res < 0) {
-						DEBUGA_GSMOPEN("Silence error %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-						res = -1;
-					}
-					res = snd_pcm_writei(tech_pvt->alsap, silencebuf, len / 2);
-					if (res < 0) {
-						DEBUGA_GSMOPEN("Write error %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-						res = -1;
-					} else if (res != len / 2) {
-						DEBUGA_GSMOPEN("Write returned a different quantity: %d\n", GSMOPEN_P_LOG, res);
-						res = -1;
-					}
-				}
-
-				DEBUGA_GSMOPEN
-					("PREVENTING an ALSA write XRUN (gsmopen can't fill the soundcard buffer fast enough). If this happens often (not after silence or after a pause in the speech, that's OK), and appear to damage the sound quality, first check if you have some IRQ problem, maybe sharing the soundcard IRQ with a broken or heavy loaded ethernet or graphic card. Then consider to increase the alsa_periods_in_buffer (now is set to %d) for this interface in the config file. delayp1=%d, delayp2=%d\n",
-					 GSMOPEN_P_LOG, tech_pvt->alsa_periods_in_buffer, (int) delayp1, (int) delayp2);
-			}
-
-		}
-
-		memset(sizbuf2, 0, sizeof(sizbuf2));
-		if (tech_pvt->alsa_play_is_mono) {
-			res = snd_pcm_writei(tech_pvt->alsap, sizbuf, len / 2);
-		} else {
-			int a = 0;
-			int i = 0;
-			for (i = 0; i < 8000;) {
-				sizbuf2[a] = sizbuf[i];
-				a++;
-				i++;
-				sizbuf2[a] = sizbuf[i];
-				a++;
-				i--;
-				sizbuf2[a] = sizbuf[i];	// comment out this line to use only left 
-				a++;
-				i++;
-				sizbuf2[a] = sizbuf[i];	// comment out this line to use only left
-				a++;
-				i++;
-			}
-			res = snd_pcm_writei(tech_pvt->alsap, sizbuf2, len);
-		}
-		if (res == -EPIPE) {
-			DEBUGA_GSMOPEN
-				("ALSA write EPIPE (XRUN) (gsmopen can't fill the soundcard buffer fast enough). If this happens often (not after silence or after a pause in the speech, that's OK), and appear to damage the sound quality, first check if you have some IRQ problem, maybe sharing the soundcard IRQ with a broken or heavy loaded ethernet or graphic card. Then consider to increase the alsa_periods_in_buffer (now is set to %d) for this interface in the config file. delayp1=%d, delayp2=%d\n",
-				 GSMOPEN_P_LOG, tech_pvt->alsa_periods_in_buffer, (int) delayp1, (int) delayp2);
-			res = snd_pcm_prepare(tech_pvt->alsap);
-			if (res) {
-				ERRORA("audio play prepare failed: %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-			} else {
-
-				if (tech_pvt->alsa_play_is_mono) {
-					res = snd_pcm_writei(tech_pvt->alsap, sizbuf, len / 2);
-				} else {
-					int a = 0;
-					int i = 0;
-					for (i = 0; i < 8000;) {
-						sizbuf2[a] = sizbuf[i];
-						a++;
-						i++;
-						sizbuf2[a] = sizbuf[i];
-						a++;
-						i--;
-						sizbuf2[a] = sizbuf[i];
-						a++;
-						i++;
-						sizbuf2[a] = sizbuf[i];
-						a++;
-						i++;
-					}
-					res = snd_pcm_writei(tech_pvt->alsap, sizbuf2, len);
-				}
-
-			}
-
-		} else {
-			if (res == -ESTRPIPE) {
-				ERRORA("You've got some big problems\n", GSMOPEN_P_LOG);
-			} else if (res == -EAGAIN) {
-				DEBUGA_GSMOPEN("Momentarily busy\n", GSMOPEN_P_LOG);
-				res = 0;
-			} else if (res < 0) {
-				ERRORA("Error %d on audio write: \"%s\"\n", GSMOPEN_P_LOG, res, snd_strerror(res));
-			}
-		}
-	}
-
-	if (tech_pvt->audio_play_reset_period) {
-		time(&now_timestamp);
-		if ((now_timestamp - tech_pvt->audio_play_reset_timestamp) > tech_pvt->audio_play_reset_period) {
-			if (option_debug)
-				DEBUGA_GSMOPEN("reset audio play\n", GSMOPEN_P_LOG);
-			res = snd_pcm_wait(tech_pvt->alsap, 1000);
-			if (res < 0) {
-				ERRORA("audio play wait failed: %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-			}
-			res = snd_pcm_drop(tech_pvt->alsap);
-			if (res) {
-				ERRORA("audio play drop failed: %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-			}
-			res = snd_pcm_prepare(tech_pvt->alsap);
-			if (res) {
-				ERRORA("audio play prepare failed: %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-			}
-			res = snd_pcm_wait(tech_pvt->alsap, 1000);
-			if (res < 0) {
-				ERRORA("audio play wait failed: %s\n", GSMOPEN_P_LOG, snd_strerror(res));
-			}
-			time(&tech_pvt->audio_play_reset_timestamp);
-		}
-	}
-	//res = 0;
-	//if (res > 0)
-	//res = 0;
-	return res;
-}
-
-#define AST_FRIENDLY_OFFSET 0
-int alsa_read(private_t * tech_pvt, short *data, int datalen)
-{
-	//static struct ast_frame f;
-	static short __buf[GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
-	static short __buf2[(GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2) * 2];
-	short *buf;
-	short *buf2;
-	static int readpos = 0;
-	//static int left = GSMOPEN_FRAME_SIZE;
-	static int left;
-	snd_pcm_state_t state;
-	int r = 0;
-	int off = 0;
-	int error = 0;
-	//time_t now_timestamp;
-
-	//DEBUGA_GSMOPEN("buf=%p, datalen=%d, left=%d\n", GSMOPEN_P_LOG, (void *)buf, datalen, left);
-	//memset(&f, 0, sizeof(struct ast_frame)); //giova
-
-
-
-	if(tech_pvt->no_sound==1){
-		return r;
-	}
-
-	left = datalen;
-
-
-	state = snd_pcm_state(tech_pvt->alsac);
-	if (state != SND_PCM_STATE_RUNNING) {
-		DEBUGA_GSMOPEN("ALSA read state is not SND_PCM_STATE_RUNNING\n", GSMOPEN_P_LOG);
-
-		if (state != SND_PCM_STATE_PREPARED) {
-			error = snd_pcm_prepare(tech_pvt->alsac);
-			if (error) {
-				ERRORA("snd_pcm_prepare failed, %s\n", GSMOPEN_P_LOG, snd_strerror(error));
-				return r;
-			}
-			DEBUGA_GSMOPEN("prepared!\n", GSMOPEN_P_LOG);
-		}
-		gsmopen_sleep(1000);
-		error = snd_pcm_start(tech_pvt->alsac);
-		if (error) {
-			ERRORA("snd_pcm_start failed, %s\n", GSMOPEN_P_LOG, snd_strerror(error));
-			return r;
-		}
-		DEBUGA_GSMOPEN("started!\n", GSMOPEN_P_LOG);
-		gsmopen_sleep(1000);
-	}
-
-	buf = __buf + AST_FRIENDLY_OFFSET / 2;
-	buf2 = __buf2 + ((AST_FRIENDLY_OFFSET / 2) * 2);
-
-	if (tech_pvt->alsa_capture_is_mono) {
-		r = snd_pcm_readi(tech_pvt->alsac, buf + readpos, left);
-		//DEBUGA_GSMOPEN("r=%d, buf=%p, buf+readpos=%p, datalen=%d, left=%d\n", GSMOPEN_P_LOG, r, (void *)buf, (void *)(buf + readpos), datalen, left);
-	} else {
-		int a = 0;
-		int i = 0;
-		r = snd_pcm_readi(tech_pvt->alsac, buf2 + (readpos * 2), left);
-
-		for (i = 0; i < (GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2) * 2;) {
-			__buf[a] = (__buf2[i] + __buf2[i + 1]) / 2;	//comment out this line to use only left
-			//__buf[a] = __buf2[i]; // enable this line to use only left
-			a++;
-			i++;
-			i++;
-		}
-	}
-
-	if (r == -EPIPE) {
-		DEBUGA_GSMOPEN("ALSA XRUN on read\n", GSMOPEN_P_LOG);
-		return r;
-	} else if (r == -ESTRPIPE) {
-		ERRORA("-ESTRPIPE\n", GSMOPEN_P_LOG);
-		return r;
-
-	} else if (r == -EAGAIN) {
-		int count=0;
-		while (r == -EAGAIN) {
-			gsmopen_sleep(10000);
-			DEBUGA_GSMOPEN("%d ALSA read -EAGAIN, the soundcard is not ready to be read by gsmopen\n", GSMOPEN_P_LOG, count);
-			count++;
-
-			if (tech_pvt->alsa_capture_is_mono) {
-				r = snd_pcm_readi(tech_pvt->alsac, buf + readpos, left);
-			} else {
-				int a = 0;
-				int i = 0;
-				r = snd_pcm_readi(tech_pvt->alsac, buf2 + (readpos * 2), left);
-
-				for (i = 0; i < (GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2) * 2;) {
-					__buf[a] = (__buf2[i] + __buf2[i + 1]) / 2;
-					a++;
-					i++;
-					i++;
-				}
-			}
-
-		}
-	} else if (r < 0) {
-		WARNINGA("ALSA Read error: %s\n", GSMOPEN_P_LOG, snd_strerror(r));
-	} else if (r >= 0) {
-		//DEBUGA_GSMOPEN("read: r=%d, readpos=%d, left=%d, off=%d\n", GSMOPEN_P_LOG, r, readpos, left, off);
-		off -= r;				//what is the meaning of this? a leftover, probably
-	}
-	/* Update positions */
-	readpos += r;
-	left -= r;
-
-	if (readpos >= GSMOPEN_FRAME_SIZE) {
-		int i;
-		/* A real frame */
-		readpos = 0;
-		left = GSMOPEN_FRAME_SIZE;
-		for (i = 0; i < r; i++)
-			data[i] = buf[i];
-
-	}
-	return r;
-}
-
-#endif // GSMOPEN_ALSA
-
-
-
-
-
-int gsmopen_sendsms(private_t * tech_pvt, char *dest, char *text)
-{
-	//char *idest = data;
-	//char rdest[256];
-	//private_t *p = NULL;
-	//char *device;
-	//char *dest;
-	//char *text;
-	//char *stringp = NULL;
-	//int found = 0;
-	int failed = 0;
-	int err = 0;
-
-	//strncpy(rdest, idest, sizeof(rdest) - 1);
-	DEBUGA_GSMOPEN("GSMopenSendsms: dest=%s text=%s\n", GSMOPEN_P_LOG, dest, text);
-	DEBUGA_GSMOPEN("START\n", GSMOPEN_P_LOG);
-	/* we can use gsmopen_request to get the channel, but gsmopen_request would look for onowned channels, and probably we can send SMSs while a call is ongoing
-	 *
-	 */
-
-	if (tech_pvt->controldevprotocol != PROTOCOL_AT) {
-		ERRORA(", GSMOPEN_P_LOGGSMopenSendsms supports only AT command cellphones at the moment :-( !\n", GSMOPEN_P_LOG);
-		return RESULT_FAILURE;
-	}
-
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT) {
-		char smscommand[16000];
-		memset(smscommand, '\0', sizeof(smscommand));
-
-		PUSHA_UNLOCKA(&tech_pvt->controldev_lock);
-		LOKKA(tech_pvt->controldev_lock);
-
-		err = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=1");
-		if (err) {
-			ERRORA("AT+CMGF=1 (set message sending to TEXT (as opposed to PDU)  do not got OK from the phone\n", GSMOPEN_P_LOG);
-		}
-
-
-		if (tech_pvt->no_ucs2) {
-			sprintf(smscommand, "AT+CMGS=\"%s\"", dest);	//TODO: support phones that only accept pdu mode
-		} else {
-			char dest2[1048];
-
-			err = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS=\"UCS2\"");
-			if (err) {
-				ERRORA("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  do not got OK from the phone\n", GSMOPEN_P_LOG);
-			}
-
-			memset(dest2, '\0', sizeof(dest2));
-			utf_to_ucs2(tech_pvt, dest, strlen(dest), dest2, sizeof(dest2));
-			sprintf(smscommand, "AT+CMGS=\"%s\"", dest2);	//TODO: support phones that only accept pdu mode
-		}
-		//TODO: support phones that only accept pdu mode
-		//TODO would be better to lock controldev here
-			//sprintf(smscommand, "AT+CMGS=\"%s\"", dest);	//FIXME: nokia e63 want this
-		err = gsmopen_serial_write_AT_noack(tech_pvt, smscommand);
-		if (err) {
-			ERRORA("Error sending SMS\n", GSMOPEN_P_LOG);
-			failed = 1;
-			goto uscita;
-		}
-		err = gsmopen_serial_AT_expect(tech_pvt, "> ", 0, 1);	// wait 1.5s for the prompt, no  crlf
-#if 1
-		if (err) {
-			DEBUGA_GSMOPEN
-				("Error or timeout getting prompt '> ' for sending sms directly to the remote party. BTW, seems that we cannot do that with Motorola c350, so we'll write to cellphone memory, then send from memory\n",
-				 GSMOPEN_P_LOG);
-
-			err = gsmopen_serial_write_AT_ack(tech_pvt, "ATE1");	//motorola (at least c350) do not echo the '>' prompt when in ATE0... go figure!!!!
-			if (err) {
-				ERRORA("Error activating echo from modem\n", GSMOPEN_P_LOG);
-			}
-			tech_pvt->at_cmgw[0] = '\0';
-			sprintf(smscommand, "AT+CMGW=\"%s\"", dest);	//TODO: support phones that only accept pdu mode
-			err = gsmopen_serial_write_AT_noack(tech_pvt, smscommand);
-			if (err) {
-				ERRORA("Error writing SMS destination to the cellphone memory\n", GSMOPEN_P_LOG);
-				failed = 1;
-				goto uscita;
-			}
-			err = gsmopen_serial_AT_expect(tech_pvt, "> ", 0, 1);	// wait 1.5s for the prompt, no  crlf
-			if (err) {
-				ERRORA("Error or timeout getting prompt '> ' for writing sms text in cellphone memory\n", GSMOPEN_P_LOG);
-				failed = 1;
-				goto uscita;
-			}
-		}
-#endif
-
-		//sprintf(text,"ciao 123 belè новости לק ראת ﺎﻠﺠﻤﻋﺓ 人大"); //let's test the beauty of utf
-		memset(smscommand, '\0', sizeof(smscommand));
-		if (tech_pvt->no_ucs2) {
-			sprintf(smscommand, "%s", text);
-		} else {
-			utf_to_ucs2(tech_pvt, text, strlen(text), smscommand, sizeof(smscommand));
-		}
-
-		smscommand[strlen(smscommand)] = 0x1A;
-		DEBUGA_GSMOPEN("smscommand len is: %d, text is:|||%s|||\n", GSMOPEN_P_LOG, (int) strlen(smscommand), smscommand);
-
-		err = gsmopen_serial_write_AT_ack_nocr_longtime(tech_pvt, smscommand);
-		//TODO would be better to unlock controldev here
-		if (err) {
-			ERRORA("Error writing SMS text to the cellphone memory\n", GSMOPEN_P_LOG);
-			//return RESULT_FAILURE;
-			failed = 1;
-			goto uscita;
-		}
-		if (tech_pvt->at_cmgw[0]) {
-			sprintf(smscommand, "AT+CMSS=%s", tech_pvt->at_cmgw);
-			err = gsmopen_serial_write_AT_expect_longtime(tech_pvt, smscommand, "OK");
-			if (err) {
-				ERRORA("Error sending SMS from the cellphone memory\n", GSMOPEN_P_LOG);
-				//return RESULT_FAILURE;
-				failed = 1;
-				goto uscita;
-			}
-
-			err = gsmopen_serial_write_AT_ack(tech_pvt, "ATE0");	//motorola (at least c350) do not echo the '>' prompt when in ATE0... go figure!!!!
-			if (err) {
-				ERRORA("Error de-activating echo from modem\n", GSMOPEN_P_LOG);
-			}
-		}
-	  uscita:
-		gsmopen_sleep(1000);
-
-		if (tech_pvt->at_cmgw[0]) {
-
-			/* let's see what we've sent, just for check TODO: Motorola it's not reliable! Motorola c350 tells that all was sent, but is not true! It just sends how much it fits into one SMS FIXME: need an algorithm to calculate how many ucs2 chars fits into an SMS. It make difference based, probably, on the GSM alphabet translation, or so */
-			sprintf(smscommand, "AT+CMGR=%s", tech_pvt->at_cmgw);
-			err = gsmopen_serial_write_AT_ack(tech_pvt, smscommand);
-			if (err) {
-				ERRORA("Error reading SMS back from the cellphone memory\n", GSMOPEN_P_LOG);
-			}
-
-			/* let's delete from cellphone memory what we've sent */
-			sprintf(smscommand, "AT+CMGD=%s", tech_pvt->at_cmgw);
-			err = gsmopen_serial_write_AT_ack(tech_pvt, smscommand);
-			if (err) {
-				ERRORA("Error deleting SMS from the cellphone memory\n", GSMOPEN_P_LOG);
-			}
-
-			tech_pvt->at_cmgw[0] = '\0';
-		}
-		//gsmopen_sleep(500000);             //.5 secs
-		UNLOCKA(tech_pvt->controldev_lock);
-		POPPA_UNLOCKA(&tech_pvt->controldev_lock);
-	}
-
-	err = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=0");
-	if (err) {
-		DEBUGA_GSMOPEN("AT+CMGF=0 (set message sending to PDU (as opposed to TEXT)  do not got OK from the phone, continuing\n", GSMOPEN_P_LOG);
-	}
-
-
-	DEBUGA_GSMOPEN("FINISH\n", GSMOPEN_P_LOG);
-	if (failed)
-		return -1;
-	else
-		return RESULT_SUCCESS;
-}
-
-/************************************************/
-
-/* LUIGI RIZZO's magic */
-/* boost support. BOOST_SCALE * 10 ^(BOOST_MAX/20) must
- * be representable in 16 bits to avoid overflows.
- */
-#define BOOST_SCALE     (1<<9)
-#define BOOST_MAX       40		/* slightly less than 7 bits */
-
-/*
- * store the boost factor
- */
-void gsmopen_store_boost(char *s, double *boost)
-{
-	private_t *tech_pvt = NULL;
-
-	if (sscanf(s, "%lf", boost) != 1) {
-		ERRORA("invalid boost <%s>\n", GSMOPEN_P_LOG, s);
-		return;
-	}
-	if (*boost < -BOOST_MAX) {
-		WARNINGA("boost %s too small, using %d\n", GSMOPEN_P_LOG, s, -BOOST_MAX);
-		*boost = -BOOST_MAX;
-	} else if (*boost > BOOST_MAX) {
-		WARNINGA("boost %s too large, using %d\n", GSMOPEN_P_LOG, s, BOOST_MAX);
-		*boost = BOOST_MAX;
-	}
-#ifdef WIN32
-	*boost = exp(log ((double)10) * *boost / 20) * BOOST_SCALE;
-#else
-	*boost = exp(log(10) * *boost / 20) * BOOST_SCALE;
-#endif //WIN32
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("setting boost %s to %f\n", GSMOPEN_P_LOG, s, *boost);
-}
-
-
-int gsmopen_sound_boost(void *data, int samples_num, double boost)
-{
-/* LUIGI RIZZO's magic */
-	if (boost != 0 && (boost < 511 || boost > 513)) {		/* scale and clip values */
-		int i, x;
-
-		int16_t *ptr = (int16_t *) data;
-
-		for (i = 0; i < samples_num; i++) {
-			x = (int) (ptr[i] * boost) / BOOST_SCALE;
-			if (x > 32767) {
-				x = 32767;
-			} else if (x < -32768) {
-				x = -32768;
-			}
-			ptr[i] = x;
-		}
-	} else {
-		//printf("BOOST=%f\n", boost);
-	}
-
-	return 0;
-}
-
-
-int gsmopen_serial_getstatus_AT(private_t * tech_pvt)
-{
-	int res;
-	private_t *p = tech_pvt;
-
-#if 0
-	if (p->owner) {
-		if (p->owner->_state != AST_STATE_UP && p->owner->_state != AST_STATE_DOWN) {
-			DEBUGA_AT("No getstatus, we're neither UP nor DOWN\n", GSMOPEN_P_LOG);
-			return 0;
-		}
-	}
-#endif
-
-
-	PUSHA_UNLOCKA(p->controldev_lock);
-	LOKKA(p->controldev_lock);
-	res = gsmopen_serial_write_AT_ack(p, "AT");
-	if (res) {
-		ERRORA("AT was not acknowledged, continuing but maybe there is a problem\n", GSMOPEN_P_LOG);
-	}
-	gsmopen_sleep(1000);
-
-	if (strlen(p->at_query_battchg)) {
-		res = gsmopen_serial_write_AT_expect(p, p->at_query_battchg, p->at_query_battchg_expect);
-		if (res) {
-			WARNINGA("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, p->at_query_battchg, p->at_query_battchg_expect);
-		}
-		gsmopen_sleep(1000);
-	}
-
-	if (strlen(p->at_query_signal)) {
-		res = gsmopen_serial_write_AT_expect(p, p->at_query_signal, p->at_query_signal_expect);
-		if (res) {
-			WARNINGA("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, p->at_query_signal, p->at_query_signal_expect);
-		}
-		gsmopen_sleep(1000);
-	}
-
-	if (!p->network_creg_not_supported) {
-		res = gsmopen_serial_write_AT_ack(p, "AT+CREG?");
-		if (res) {
-			WARNINGA("%s does not get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, "AT+CREG?", "OK");
-		}
-		gsmopen_sleep(1000);
-	}
-
-	//FIXME all the following commands in config!
-
-	if (p->sms_cnmi_not_supported) {
-		res = gsmopen_serial_write_AT_ack(p, "AT+MMGL=\"HEADER ONLY\"");
-		if (res) {
-			WARNINGA
-				("%s does not get %s from the phone. If your phone is not Motorola, please contact the gsmopen developers. Else, if your phone IS a Motorola, probably a long msg was incoming and ther first part was read and then deleted. The second part is now orphan. If you got this warning  repeatedly, and you cannot correctly receive SMSs from this interface, please manually clean all messages (and the residual parts of them) from the cellphone/SIM. Continuing.\n",
-				 GSMOPEN_P_LOG, "AT+MMGL=\"HEADER ONLY\"", "OK");
-		} else {
-			gsmopen_sleep(1000);
-			if (p->unread_sms_msg_id) {
-				char at_command[256];
-
-				res = gsmopen_serial_write_AT_ack(p, "AT+CSCS=\"UCS2\"");
-				if (res) {
-					ERRORA("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  do not got OK from the phone\n", GSMOPEN_P_LOG);
-					memset(p->sms_message, 0, sizeof(p->sms_message));
-				}
-
-				memset(at_command, 0, sizeof(at_command));
-				sprintf(at_command, "AT+CMGR=%d", p->unread_sms_msg_id);
-				memset(p->sms_message, 0, sizeof(p->sms_message));
-
-				p->reading_sms_msg = 1;
-				res = gsmopen_serial_write_AT_ack(p, at_command);
-				p->reading_sms_msg = 0;
-				if (res) {
-					ERRORA("AT+CMGR (read SMS) do not got OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
-				}
-				res = gsmopen_serial_write_AT_ack(p, "AT+CSCS=\"GSM\"");
-				if (res) {
-					ERRORA("AT+CSCS=\"GSM\" (set TE messages to GSM) do not got OK from the phone\n", GSMOPEN_P_LOG);
-				}
-				memset(at_command, 0, sizeof(at_command));
-				sprintf(at_command, "AT+CMGD=%d", p->unread_sms_msg_id);	/* delete the message */
-				p->unread_sms_msg_id = 0;
-				res = gsmopen_serial_write_AT_ack(p, at_command);
-				if (res) {
-					ERRORA("AT+CMGD (Delete SMS) do not got OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
-				}
-
-				if (strlen(p->sms_message)) {
-#if 0
-
-					manager_event(EVENT_FLAG_SYSTEM, "GSMOPENincomingsms", "Interface: %s\r\nSMS_Message: %s\r\n", p->name, p->sms_message);
-
-					if (strlen(p->sms_receiving_program)) {
-						int fd1[2];
-						pid_t pid1;
-						char *arg1[] = { p->sms_receiving_program, (char *) NULL };
-						int i;
-
-						DEBUGA_AT("incoming SMS message:---%s---\n", GSMOPEN_P_LOG, p->sms_message);
-						pipe(fd1);
-						pid1 = fork();
-
-						if (pid1 == 0) {	//child
-							int err;
-
-							dup2(fd1[0], 0);	// Connect stdin to pipe output
-							close(fd1[1]);	// close input pipe side
-							setsid();	//session id
-							err = execvp(arg1[0], arg1);	//exec our program, with stdin connected to pipe output
-							if (err) {
-								ERRORA
-									("'sms_receiving_program' is set in config file to '%s', and it gave us back this error: %d, (%s). SMS received was:---%s---\n",
-									 GSMOPEN_P_LOG, p->sms_receiving_program, err, strerror(errno), p->sms_message);
-							}
-							close(fd1[0]);	// close output pipe side
-						}		//starting here continue the parent
-						close(fd1[0]);	// close output pipe side
-						// write the msg on the pipe input
-						for (i = 0; i < strlen(p->sms_message); i++) {
-							write(fd1[1], &p->sms_message[i], 1);
-						}
-						close(fd1[1]);	// close pipe input, let our program know we've finished
-					} else {
-						ERRORA
-							("got SMS incoming message, but 'sms_receiving_program' is not set in config file. SMS received was:---%s---\n",
-							 GSMOPEN_P_LOG, p->sms_message);
-					}
-#endif //0
-					DEBUGA_GSMOPEN("got SMS incoming message. SMS received was:---%s---\n", GSMOPEN_P_LOG, p->sms_message);
-				}
-#if 0							//is this one needed? maybe it can interrupt an incoming call that is just to announce itself
-				if (p->phone_callflow == CALLFLOW_CALL_IDLE && p->interface_state == AST_STATE_DOWN && p->owner == NULL) {
-					/* we're not in a call, neither calling */
-					res = gsmopen_serial_write_AT_ack(p, "AT+CKPD=\"EEE\"");
-					if (res) {
-						ERRORA("AT+CKPD=\"EEE\" (cellphone screen back to user) do not got OK from the phone\n", GSMOPEN_P_LOG);
-					}
-				}
-#endif
-			}
-		}
-	}
-
-	UNLOCKA(p->controldev_lock);
-	POPPA_UNLOCKA(p->controldev_lock);
-	return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/mod_gsmopen.c b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/mod_gsmopen.c
deleted file mode 100644
index 16c83fa29c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/mod_gsmopen.c
+++ /dev/null
@@ -1,3474 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005/2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * This module (mod_gsmopen) has been contributed by:
- *
- * Giovanni Maruzzelli (gmaruzz@gmail.com)
- *
- *
- * Further Contributors:
- *
- *
- *
- * mod_gsmopen.c -- GSM compatible Endpoint Module
- *
- */
-
-#include "gsmopen.h"
-
-#if 0
-#ifdef WIN32
-/***************/
-// from http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/
-
-#include <time.h>
-
-#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
-#else /*  */
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
-#endif /*  */
-struct sk_timezone {
-	int tz_minuteswest;			/* minutes W of Greenwich */
-	int tz_dsttime;				/* type of dst correction */
-};
-int gettimeofday(struct timeval *tv, struct sk_timezone *tz)
-{
-	FILETIME ft;
-	unsigned __int64 tmpres = 0;
-	static int tzflag;
-	if (NULL != tv) {
-		GetSystemTimeAsFileTime(&ft);
-		tmpres |= ft.dwHighDateTime;
-		tmpres <<= 32;
-		tmpres |= ft.dwLowDateTime;
-
-		/*converting file time to unix epoch */
-		tmpres /= 10;			/*convert into microseconds */
-		tmpres -= DELTA_EPOCH_IN_MICROSECS;
-		tv->tv_sec = (long) (tmpres / 1000000UL);
-		tv->tv_usec = (long) (tmpres % 1000000UL);
-	}
-	if (NULL != tz) {
-		if (!tzflag) {
-			_tzset();
-			tzflag++;
-		}
-		tz->tz_minuteswest = _timezone / 60;
-		tz->tz_dsttime = _daylight;
-	}
-	return 0;
-}
-
-/***************/
-#endif /* WIN32 */
-#endif //0
-SWITCH_BEGIN_EXTERN_C
-SWITCH_MODULE_LOAD_FUNCTION(mod_gsmopen_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_gsmopen_shutdown);
-SWITCH_MODULE_DEFINITION(mod_gsmopen, mod_gsmopen_load, mod_gsmopen_shutdown, NULL);
-SWITCH_END_EXTERN_C
-#define GSMOPEN_CHAT_PROTO "sms"
-#if 1
-SWITCH_STANDARD_API(gsm_function);
-/* BEGIN: Changes here */
-#define GSM_SYNTAX "list [full] || console || AT_command || remove < interface_name | interface_id > || reload"
-/* END: Changes heres */
-SWITCH_STANDARD_API(gsmopen_function);
-#define GSMOPEN_SYNTAX "interface_name AT_command"
-#endif //0
-
-SWITCH_STANDARD_API(gsmopen_boost_audio_function);
-#define GSMOPEN_BOOST_AUDIO_SYNTAX "interface_name [<play|capt> <in decibels: -40 ... 0 ... +40>]"
-SWITCH_STANDARD_API(sendsms_function);
-#define SENDSMS_SYNTAX "gsmopen_sendsms interface_name destination_number SMS_text"
-SWITCH_STANDARD_API(gsmopen_dump_function);
-#define GSMOPEN_DUMP_SYNTAX "gsmopen_dump <interface_name|list>"
-/* BEGIN: Changes here */
-#define FULL_RELOAD 0
-#define SOFT_RELOAD 1
-/* END: Changes heres */
-
-const char *interface_status[] = {	/* should match GSMOPEN_STATE_xxx in gsmopen.h */
-	"IDLE",
-	"DOWN",
-	"RING",
-	"DIALING",
-	"BUSY",
-	"UP",
-	"RINGING",
-	"PRERING",
-	"DOUBLE",
-	"SELECTD",
-	"HANG_RQ",
-	"PREANSW"
-};
-const char *phone_callflow[] = {	/* should match CALLFLOW_XXX in gsmopen.h */
-	"CALL_IDLE",
-	"CALL_DOWN",
-	"INCOMING_RNG",
-	"CALL_DIALING",
-	"CALL_LINEBUSY",
-	"CALL_ACTIVE",
-	"INCOMING_HNG",
-	"CALL_RLEASD",
-	"CALL_NOCARR",
-	"CALL_INFLUX",
-	"CALL_INCOMING",
-	"CALL_FAILED",
-	"CALL_NOSRVC",
-	"CALL_OUTRESTR",
-	"CALL_SECFAIL",
-	"CALL_NOANSWER",
-	"STATUS_FNSHED",
-	"STATUS_CANCLED",
-	"STATUS_FAILED",
-	"STATUS_REFUSED",
-	"STATUS_RINGING",
-	"STATUS_INPROGRS",
-	"STATUS_UNPLACD",
-	"STATUS_ROUTING",
-	"STATUS_EARLYMD",
-	"INCOMING_CLID",
-	"STATUS_RMTEHOLD"
-};
-
-
-static struct {
-	int debug;
-	char *ip;
-	int port;
-	char *dialplan;
-	char *destination;
-	char *context;
-	char *codec_string;
-	char *codec_order[SWITCH_MAX_CODECS];
-	int codec_order_last;
-	char *codec_rates_string;
-	char *codec_rates[SWITCH_MAX_CODECS];
-	int codec_rates_last;
-	unsigned int flags;
-	int fd;
-	int calls;
-	int real_interfaces;
-	int next_interface;
-	char hold_music[256];
-	private_t GSMOPEN_INTERFACES[GSMOPEN_MAX_INTERFACES];
-	switch_mutex_t *mutex;
-	private_t *gsm_console;
-} globals;
-
-switch_endpoint_interface_t *gsmopen_endpoint_interface;
-switch_memory_pool_t *gsmopen_module_pool = NULL;
-int running = 0;
-
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_context, globals.context);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_destination, globals.destination);
-//SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string);
-//SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string);
-
-/* BEGIN: Changes here */
-static switch_status_t interface_exists(char *the_interface);
-#if 1
-static switch_status_t remove_interface(char *the_interface);
-#endif //0
-/* END: Changes here */
-
-static switch_status_t channel_on_init(switch_core_session_t *session);
-static switch_status_t channel_on_hangup(switch_core_session_t *session);
-static switch_status_t channel_on_destroy(switch_core_session_t *session);
-static switch_status_t channel_on_routing(switch_core_session_t *session);
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
-static switch_status_t channel_on_consume_media(switch_core_session_t *session);
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
-													switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-													switch_call_cause_t *cancel_cause);
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
-static switch_status_t gsmopen_tech_init(private_t * tech_pvt, switch_core_session_t *session);
-
-static switch_status_t gsmopen_codec(private_t * tech_pvt, int sample_rate, int codec_ms)
-{
-	switch_core_session_t *session = NULL;
-
-	if (switch_core_codec_init
-		(&tech_pvt->read_codec, "L16", NULL, NULL, sample_rate, codec_ms, 1,
-		 SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("Can't load codec?\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_core_codec_init
-		(&tech_pvt->write_codec, "L16", NULL, NULL, sample_rate, codec_ms, 1,
-		 SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("Can't load codec?\n", GSMOPEN_P_LOG);
-		switch_core_codec_destroy(&tech_pvt->read_codec);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	tech_pvt->read_frame.rate = sample_rate;
-	tech_pvt->read_frame.codec = &tech_pvt->read_codec;
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-
-	if (session) {
-		switch_core_session_set_read_codec(session, &tech_pvt->read_codec);
-		switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
-		switch_core_session_rwunlock(session);
-	} else {
-		ERRORA("no session\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-switch_status_t gsmopen_tech_init(private_t * tech_pvt, switch_core_session_t *session)
-{
-
-#ifdef WANT_SPEEX
-	int ciapa;
-	long level;
-	int tmp;
-#endif// WANT_SPEEX
-	switch_assert(tech_pvt != NULL);
-	switch_assert(session != NULL);
-	tech_pvt->read_frame.data = tech_pvt->databuf;
-	tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
-	switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-	switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-	switch_core_session_set_private(session, tech_pvt);
-	switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), sizeof(tech_pvt->session_uuid_str));
-	if (!strlen(tech_pvt->session_uuid_str)) {
-		ERRORA("no tech_pvt->session_uuid_str\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-	if (gsmopen_codec(tech_pvt, SAMPLERATE_GSMOPEN, 20) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("gsmopen_codec FAILED\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-	//teletone_dtmf_detect_init(&tech_pvt->dtmf_detect, tech_pvt->read_codec.implementation->actual_samples_per_second);
-	//teletone_dtmf_detect_init(&tech_pvt->dtmf_detect, 8000);
-    dtmf_rx_init(&tech_pvt->dtmf_state, NULL, NULL);
-    dtmf_rx_parms(&tech_pvt->dtmf_state, 0, 10, 10, -99);
-
-#ifdef GSMOPEN_ALSA
-	if(tech_pvt->no_sound==0){
-		if (alsa_init(tech_pvt)) {
-			ERRORA("alsa_init failed\n", GSMOPEN_P_LOG);
-			return SWITCH_STATUS_FALSE;
-
-		}
-	}
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-	if(tech_pvt->no_sound==0){
-		if (gsmopen_portaudio_init(tech_pvt)) {
-			ERRORA("gsmopen_portaudio_init failed\n", GSMOPEN_P_LOG);
-			return SWITCH_STATUS_FALSE;
-
-		}
-	}
-#endif// GSMOPEN_PORTAUDIO
-
-	if (switch_core_timer_init(&tech_pvt->timer_read, "soft", 20, tech_pvt->read_codec.implementation->samples_per_packet, gsmopen_module_pool) !=
-		SWITCH_STATUS_SUCCESS) {
-		ERRORA("setup timer failed\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_core_timer_sync(&tech_pvt->timer_read);
-
-	if (switch_core_timer_init(&tech_pvt->timer_write, "soft", 20, tech_pvt->write_codec.implementation->samples_per_packet, gsmopen_module_pool) !=
-		SWITCH_STATUS_SUCCESS) {
-		ERRORA("setup timer failed\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_core_timer_sync(&tech_pvt->timer_write);
-
-#ifdef WANT_SPEEX
-  /* Echo canceller with 100 ms tail length */
-#ifndef GIOVA48
-  tech_pvt->echo_state = speex_echo_state_init(160, 1024);
-  ciapa = 8000;
-#else// GIOVA48
-  tech_pvt->echo_state = speex_echo_state_init(960, 4800);
-  ciapa = 48000;
-#endif // GIOVA48
-  speex_echo_ctl(tech_pvt->echo_state, SPEEX_ECHO_SET_SAMPLING_RATE, &ciapa);
-
-#if 1 //NO MORE
-  /* Setup preprocessor and associate with echo canceller for residual echo suppression */
-#ifndef GIOVA48
-  tech_pvt->preprocess = speex_preprocess_state_init(160, 8000);
-#else// GIOVA48
-  tech_pvt->preprocess = speex_preprocess_state_init(960, 48000);
-#endif // GIOVA48
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_SET_ECHO_STATE,
-                       tech_pvt->echo_state);
-
-#if 0
-  /* Setup preprocessor various other goodies */
-  tmp = 0;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_SET_AGC, &tmp);
-  //level=8000.1; 
-  //speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_SET_AGC_LEVEL, &level);
-
-  // Let's turn off all of the 'denoisers' (eg denoise and dereverb, and vad too) because they start automatic gain on mic input on cm108 usb, also if it (the agc on usb) disbled through mixer
-  tmp = 0;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_SET_DENOISE, &tmp);
-  tmp = 0;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_SET_DEREVERB, &tmp);
-  tmp = 0;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_SET_VAD, &tmp);
-#endif
-
-  tmp = 0;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_SET_DENOISE, &tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_AGC, &tmp);
-  fprintf(stderr, "AGC is: %d\n", tmp);
-  level = 1.0;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_AGC_LEVEL, &level);
-  fprintf(stderr, "AGC_LEVEL is: %f\n", level);
-  //tmp=1;
-  //speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_AGC_TARGET, &tmp);
-  //fprintf( stderr, "AGC_TARGET is: %d\n", tmp );
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_DENOISE, &tmp);
-  fprintf(stderr, "DENOISE is: %d\n", tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_DEREVERB, &tmp);
-  fprintf(stderr, "DEREVERB is: %d\n", tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_VAD, &tmp);
-  fprintf(stderr, "VAD is: %d\n", tmp);
-
-#if 0
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_NOISE_SUPPRESS, &tmp);
-  fprintf(stderr, "SPEEX_PREPROCESS_GET_NOISE_SUPPRESS is: %d\n", tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_ECHO_SUPPRESS, &tmp);
-  fprintf(stderr, "SPEEX_PREPROCESS_GET_ECHO_SUPPRESS is: %d\n", tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_ECHO_SUPPRESS_ACTIVE,
-                       &tmp);
-  fprintf(stderr, "SPEEX_PREPROCESS_GET_ECHO_SUPPRESS_ACTIVE is: %d\n", tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_AGC_MAX_GAIN, &tmp);
-  fprintf(stderr, "SPEEX_PREPROCESS_GET_AGC_MAX_GAIN is: %d\n", tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_AGC_INCREMENT, &tmp);
-  fprintf(stderr, "SPEEX_PREPROCESS_GET_AGC_INCREMENT is: %d\n", tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_AGC_DECREMENT, &tmp);
-  fprintf(stderr, "SPEEX_PREPROCESS_GET_AGC_DECREMENT is: %d\n", tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_PROB_START, &tmp);
-  fprintf(stderr, "SPEEX_PREPROCESS_GET_PROB_START is: %d\n", tmp);
-  tmp = 1;
-  speex_preprocess_ctl(tech_pvt->preprocess, SPEEX_PREPROCESS_GET_PROB_CONTINUE, &tmp);
-  fprintf(stderr, "SPEEX_PREPROCESS_GET_PROB_CONTINUE is: %d\n", tmp);
-#endif //0
-#endif// 0 //NO MORE
-
-#endif // WANT_SPEEX
-
-
-
-	switch_clear_flag(tech_pvt, TFLAG_HANGUP);
-	DEBUGA_GSMOPEN("gsmopen_codec SUCCESS\n", GSMOPEN_P_LOG);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* BEGIN: Changes here */
-static switch_status_t interface_exists(char *the_interface)
-{
-	int i;
-	int interface_id;
-
-	if (*the_interface == '#') {	/* look by interface id or interface name */
-		the_interface++;
-		switch_assert(the_interface);
-		interface_id = atoi(the_interface);
-
-		/* take a number as interface id */
-		if (interface_id > 0 || (interface_id == 0 && strcmp(the_interface, "0") == 0)) {
-			if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
-				return SWITCH_STATUS_SUCCESS;
-			}
-		} else {
-			/* interface name */
-			for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
-				if (strcmp(globals.GSMOPEN_INTERFACES[interface_id].name, the_interface) == 0) {
-					return SWITCH_STATUS_SUCCESS;
-					break;
-				}
-			}
-		}
-	} else {					/* look by gsmopen_user */
-
-
-		for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-			if (strlen(globals.GSMOPEN_INTERFACES[i].gsmopen_user)) {
-				if (strcmp(globals.GSMOPEN_INTERFACES[i].gsmopen_user, the_interface) == 0) {
-					return SWITCH_STATUS_SUCCESS;
-				}
-			}
-		}
-	}
-	return SWITCH_STATUS_FALSE;
-}
-
-#if 1
-static switch_status_t remove_interface(char *the_interface)
-{
-	int x = 10;
-	unsigned int howmany = 8;
-	int interface_id = -1;
-	private_t *tech_pvt = NULL;
-	switch_status_t status;
-
-	//running = 0;
-
-
-	//XXX if (*the_interface == '#') {	/* remove by interface id or interface name */
-		//XXX the_interface++;
-		switch_assert(the_interface);
-		interface_id = atoi(the_interface);
-
-		if (interface_id > 0 || (interface_id == 0 && strcmp(the_interface, "0") == 0)) {
-			/* take a number as interface id */
-			tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-		} else {
-
-			for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
-				if (strcmp(globals.GSMOPEN_INTERFACES[interface_id].name, the_interface) == 0) {
-					tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-					break;
-				}
-			}
-		}
-	//XXX } //else {					/* remove by gsmopen_user */
-		//for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
-			//if (strcmp(globals.GSMOPEN_INTERFACES[interface_id].gsmopen_user, the_interface) == 0) {
-				//tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-				//break;
-			//}
-		//}
-	//}
-
-	if (!tech_pvt) {
-		DEBUGA_GSMOPEN("interface '%s' does not exist\n", GSMOPEN_P_LOG, the_interface);
-		goto end;
-	}
-
-	if (strlen(globals.GSMOPEN_INTERFACES[interface_id].session_uuid_str)) {
-		DEBUGA_GSMOPEN("interface '%s' is busy\n", GSMOPEN_P_LOG, the_interface);
-		goto end;
-	}
-
-	globals.GSMOPEN_INTERFACES[interface_id].running = 0;
-
-	if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
-#if 1
-#ifdef WIN32
-		switch_file_write(tech_pvt->GSMopenHandles.fdesc[1], "sciutati", &howmany);	// let's the controldev_thread die
-#else /* WIN32 */
-		howmany = write(tech_pvt->GSMopenHandles.fdesc[1], "sciutati", howmany);
-#endif /* WIN32 */
-#endif //0
-		DEBUGA_GSMOPEN("HERE will shutdown gsmopen_signaling_thread of '%s'\n", GSMOPEN_P_LOG, the_interface);
-	}
-
-	if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread) {
-#if 0
-#ifdef WIN32
-		if (SendMessage(tech_pvt->GSMopenHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) {	// let's the gsmopen_api_thread_func die
-			DEBUGA_GSMOPEN("got FALSE here, thread probably was already dead. GetLastError returned: %d\n", GSMOPEN_P_LOG, GetLastError());
-			globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread = NULL;
-		}
-#else
-		XEvent e;
-		Atom atom1 = XInternAtom(tech_pvt->GSMopenHandles.disp, "GSMOPENCONTROLAPI_MESSAGE_BEGIN", False);
-		memset(&e, 0, sizeof(e));
-		e.xclient.type = ClientMessage;
-		e.xclient.message_type = atom1;	/*  leading message */
-		e.xclient.display = tech_pvt->GSMopenHandles.disp;
-		e.xclient.window = tech_pvt->GSMopenHandles.gsmopen_win;
-		e.xclient.format = 8;
-
-		XSendEvent(tech_pvt->GSMopenHandles.disp, tech_pvt->GSMopenHandles.win, False, 0, &e);
-		XSync(tech_pvt->GSMopenHandles.disp, False);
-#endif //WIN32
-#endif //0
-
-		DEBUGA_GSMOPEN("HERE will shutdown gsmopen_api_thread of '%s'\n", GSMOPEN_P_LOG, the_interface);
-	}
-
-	while (x) {
-		x--;
-		switch_yield(50000);
-	}
-
-	if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
-		switch_thread_join(&status, globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread);
-	}
-
-	if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread) {
-		switch_thread_join(&status, globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread);
-	}
-
-	switch_mutex_lock(globals.mutex);
-	if (globals.gsm_console == &globals.GSMOPEN_INTERFACES[interface_id]) {
-		DEBUGA_GSMOPEN("interface '%s' no more console\n", GSMOPEN_P_LOG, the_interface);
-		globals.gsm_console = NULL;
-	} else {
-		DEBUGA_GSMOPEN("interface '%s' STILL console\n", GSMOPEN_P_LOG, the_interface);
-	}
-	memset(&globals.GSMOPEN_INTERFACES[interface_id], '\0', sizeof(private_t));
-	globals.real_interfaces--;
-	switch_mutex_unlock(globals.mutex);
-
-	DEBUGA_GSMOPEN("interface '%s' deleted successfully\n", GSMOPEN_P_LOG, the_interface);
-	globals.GSMOPEN_INTERFACES[interface_id].running = 1;
-  end:
-	//running = 1;
-	return SWITCH_STATUS_SUCCESS;
-}
-#endif //0
-
-/* END: Changes here */
-
-/* 
-   State methods they get called when the state changes to the specific state 
-   returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
-   so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
-*/
-static switch_status_t channel_on_init(switch_core_session_t *session)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt = NULL;
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-	//ERRORA("%s CHANNEL INIT\n", GSMOPEN_P_LOG, tech_pvt->name);
-	switch_set_flag(tech_pvt, TFLAG_IO);
-
-	switch_mutex_lock(globals.mutex);
-	globals.calls++;
-
-	switch_mutex_unlock(globals.mutex);
-	DEBUGA_GSMOPEN("%s CHANNEL INIT %s\n", GSMOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_destroy(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-
-
-	if (tech_pvt) {
-		DEBUGA_GSMOPEN("%s CHANNEL DESTROY %s\n", GSMOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
-
-		if (switch_core_codec_ready(&tech_pvt->read_codec)) {
-			switch_core_codec_destroy(&tech_pvt->read_codec);
-		}
-
-		if (switch_core_codec_ready(&tech_pvt->write_codec)) {
-			switch_core_codec_destroy(&tech_pvt->write_codec);
-		}
-
-		switch_core_timer_destroy(&tech_pvt->timer_read);
-		switch_core_timer_destroy(&tech_pvt->timer_write);
-
-#ifdef GSMOPEN_ALSA
-	if(tech_pvt->no_sound==0){
-		alsa_shutdown(tech_pvt);
-	}
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-	if(tech_pvt->no_sound==0){
-		if (gsmopen_portaudio_shutdown(tech_pvt)) {
-			ERRORA("gsmopen_portaudio_shutdown failed\n", GSMOPEN_P_LOG);
-
-		}
-	}
-#endif// GSMOPEN_PORTAUDIO
-
-
-		*tech_pvt->session_uuid_str = '\0';
-		tech_pvt->interface_state = GSMOPEN_STATE_IDLE;
-		if (tech_pvt->phone_callflow == CALLFLOW_STATUS_FINISHED) {
-			tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-		}
-		switch_core_session_set_private(session, NULL);
-	} else {
-		DEBUGA_GSMOPEN("!!!!!!NO tech_pvt!!!! CHANNEL DESTROY %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(session));
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_hangup(switch_core_session_t *session)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	tech_pvt->phone_callflow = CALLFLOW_CALL_HANGUP_REQUESTED;
-
-	if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
-		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-			tech_pvt->ob_failed_calls++;
-		} else {
-			tech_pvt->ib_failed_calls++;
-		}
-	}
-
-
-	DEBUGA_GSMOPEN("%s CHANNEL HANGUP\n", GSMOPEN_P_LOG, tech_pvt->name);
-	switch_clear_flag(tech_pvt, TFLAG_IO);
-	switch_clear_flag(tech_pvt, TFLAG_VOICE);
-	switch_set_flag(tech_pvt, TFLAG_HANGUP);
-
-	gsmopen_hangup(tech_pvt);
-
-	//memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str));
-	//*tech_pvt->session_uuid_str = '\0';
-	DEBUGA_GSMOPEN("%s CHANNEL HANGUP\n", GSMOPEN_P_LOG, tech_pvt->name);
-	switch_mutex_lock(globals.mutex);
-	globals.calls--;
-	if (globals.calls < 0) {
-		globals.calls = 0;
-	}
-
-	tech_pvt->interface_state = GSMOPEN_STATE_IDLE;
-	//FIXME if (tech_pvt->phone_callflow == CALLFLOW_STATUS_FINISHED) {
-	tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-	//FIXME }
-	switch_mutex_unlock(globals.mutex);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_routing(switch_core_session_t *session)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_GSMOPEN("%s CHANNEL ROUTING\n", GSMOPEN_P_LOG, tech_pvt->name);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_execute(switch_core_session_t *session)
-{
-
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_GSMOPEN("%s CHANNEL EXECUTE\n", GSMOPEN_P_LOG, tech_pvt->name);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_GSMOPEN("%s CHANNEL KILL_CHANNEL\n", GSMOPEN_P_LOG, tech_pvt->name);
-	switch (sig) {
-	case SWITCH_SIG_KILL:
-		DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_SIG_KILL\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		//switch_mutex_lock(tech_pvt->flag_mutex);
-		switch_clear_flag(tech_pvt, TFLAG_IO);
-		switch_clear_flag(tech_pvt, TFLAG_VOICE);
-		switch_set_flag(tech_pvt, TFLAG_HANGUP);
-		//switch_mutex_unlock(tech_pvt->flag_mutex);
-		break;
-	case SWITCH_SIG_BREAK:
-		DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_SIG_BREAK\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		//switch_set_flag(tech_pvt, TFLAG_BREAK);
-		//switch_mutex_lock(tech_pvt->flag_mutex);
-		switch_set_flag(tech_pvt, TFLAG_BREAK);
-		//switch_mutex_unlock(tech_pvt->flag_mutex);
-		break;
-	default:
-		break;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-static switch_status_t channel_on_consume_media(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-
-	DEBUGA_GSMOPEN("%s CHANNEL CONSUME_MEDIA\n", GSMOPEN_P_LOG, tech_pvt->name);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	DEBUGA_GSMOPEN("%s CHANNEL EXCHANGE_MEDIA\n", GSMOPEN_P_LOG, tech_pvt->name);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	DEBUGA_GSMOPEN("%s CHANNEL SOFT_EXECUTE\n", GSMOPEN_P_LOG, tech_pvt->name);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
-{
-	private_t *tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_GSMOPEN("%s CHANNEL SEND_DTMF\n", GSMOPEN_P_LOG, tech_pvt->name);
-	DEBUGA_GSMOPEN("DTMF: %c\n", GSMOPEN_P_LOG, dtmf->digit);
-
-	gsmopen_senddigit(tech_pvt, dtmf->digit);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-	switch_byte_t *data;
-#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-	int samples;
-	char digit_str[256];
-#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-#ifdef GSMOPEN_PORTAUDIO
-#ifdef WANT_SPEEX
-  spx_int16_t *speexptr;
-  spx_int16_t pcm2[160];
-  int i;
-#endif// GSMOPEN_ALSA
-#endif// WANT_SPEEX
-
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	if (!switch_channel_ready(channel) || !switch_test_flag(tech_pvt, TFLAG_IO)) {
-		ERRORA("channel not ready \n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-		return SWITCH_STATUS_FALSE;
-	}
-
-
-	tech_pvt->read_frame.flags = SFF_NONE;
-	*frame = NULL;
-
-	if (switch_test_flag(tech_pvt, TFLAG_HANGUP)) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-#ifndef GSMOPEN_PORTAUDIO
-	switch_core_timer_next(&tech_pvt->timer_read);
-#endif// GSMOPEN_PORTAUDIO
-
-		if(tech_pvt->no_sound==1){
-		goto cng;
-		}
-#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-#ifdef GSMOPEN_ALSA
-	//if ((samples = snd_pcm_readi(tech_pvt->alsac, tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_packet)) > 0) 
-	if ((samples = alsa_read(tech_pvt, (short *) tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_packet)) > 0) 
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-	if ((samples = gsmopen_portaudio_read(tech_pvt, (short *) tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_packet)) > 0) 
-#endif// GSMOPEN_PORTAUDIO
-	{
-
-#ifdef GSMOPEN_PORTAUDIO
-#ifdef WANT_SPEEX
-
-  if (tech_pvt->speexecho) {
-  speexptr = ((spx_int16_t *) tech_pvt->read_frame.data);
-    /* Perform echo cancellation */
-    speex_echo_capture(tech_pvt->echo_state, speexptr, pcm2);
-#ifndef GIOVA48
-    for (i = 0; i < 160; i++)
-#else //GIOVA48
-    for (i = 0; i < 960; i++)
-#endif //GIOVA48
-      speexptr[i] = pcm2[i];
-  }
-  /* Apply noise/echo residual suppression */
-  if (tech_pvt->speexpreprocess) {
-    speex_preprocess_run(tech_pvt->preprocess, speexptr);
-  }
-
-		DEBUGA_GSMOPEN("read\n", GSMOPEN_P_LOG);
-#endif //WANT_SPEEX
-#endif // GSMOPEN_PORTAUDIO
-
-
-
-
-
-		tech_pvt->read_frame.datalen = samples * 2;
-		tech_pvt->read_frame.samples = samples;
-
-#ifndef GSMOPEN_PORTAUDIO
-		tech_pvt->read_frame.timestamp = tech_pvt->timer_read.samplecount;
-#endif// GSMOPEN_PORTAUDIO
-
-		*frame = &tech_pvt->read_frame;
-
-		//status = SWITCH_STATUS_SUCCESS;
-		switch_set_flag(tech_pvt, TFLAG_VOICE);
-	}
-
-		//WARNINGA("samples=%d\n", GSMOPEN_P_LOG, samples);
-	if (samples != 160) {
-		ERRORA("samples=%d\n", GSMOPEN_P_LOG, samples);
-		goto cng;
-	}
-//DEBUGA_GSMOPEN("samples=%d tech_pvt->read_frame.timestamp=%d\n", GSMOPEN_P_LOG, samples, tech_pvt->read_frame.timestamp);
-
-//usleep(17000);
-//usleep(17000);
-
-
-
-
-
-	memset(digit_str, 0, sizeof(digit_str));
-	//teletone_dtmf_detect(&tech_pvt->dtmf_detect, (int16_t *) tech_pvt->read_frame.data, tech_pvt->read_frame.samples);
-	//teletone_dtmf_get(&tech_pvt->dtmf_detect, digit_str, sizeof(digit_str));
-    dtmf_rx(&tech_pvt->dtmf_state, (int16_t *) tech_pvt->read_frame.data, tech_pvt->read_frame.samples);
-    dtmf_rx_get(&tech_pvt->dtmf_state, digit_str, sizeof(digit_str));
-
-		gsmopen_sound_boost(tech_pvt->read_frame.data, tech_pvt->read_frame.samples, tech_pvt->capture_boost);
-
-	if (digit_str[0]) {
-		switch_time_t new_dtmf_timestamp = switch_time_now();
-		if ((new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp) > 350000) {	//FIXME: make it configurable
-			char *p = digit_str;
-			switch_channel_t *channel = switch_core_session_get_channel(session);
-
-			while (p && *p) {
-				switch_dtmf_t dtmf = {0};
-				dtmf.digit = *p;
-				dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION;
-				switch_channel_queue_dtmf(channel, &dtmf);
-				p++;
-			}
-			NOTICA("DTMF DETECTED: [%s] new_dtmf_timestamp: %u, delta_t: %u\n", GSMOPEN_P_LOG, digit_str, (unsigned int) new_dtmf_timestamp,
-				   (unsigned int) (new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp));
-			tech_pvt->old_dtmf_timestamp = new_dtmf_timestamp;
-		}
-	}
-	while (switch_test_flag(tech_pvt, TFLAG_IO)) {
-		if (switch_test_flag(tech_pvt, TFLAG_BREAK)) {
-			switch_clear_flag(tech_pvt, TFLAG_BREAK);
-			DEBUGA_GSMOPEN("CHANNEL READ FRAME goto CNG\n", GSMOPEN_P_LOG);
-			goto cng;
-		}
-
-		if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
-			DEBUGA_GSMOPEN("CHANNEL READ FRAME not IO\n", GSMOPEN_P_LOG);
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) {
-			switch_clear_flag(tech_pvt, TFLAG_VOICE);
-			if (!tech_pvt->read_frame.datalen) {
-				DEBUGA_GSMOPEN("CHANNEL READ CONTINUE\n", GSMOPEN_P_LOG);
-				continue;
-			}
-			*frame = &tech_pvt->read_frame;
-#ifdef BIGENDIAN
-			if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
-				switch_swap_linear((*frame)->data, (int) (*frame)->datalen / 2);
-			}
-#endif
-			//WARNINGA("HERE\n", GSMOPEN_P_LOG);
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		WARNINGA("HERE\n", GSMOPEN_P_LOG);
-		DEBUGA_GSMOPEN("CHANNEL READ no TFLAG_VOICE\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-
-	}
-
-	DEBUGA_GSMOPEN("CHANNEL READ FALSE\n", GSMOPEN_P_LOG);
-	return SWITCH_STATUS_FALSE;
-#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-  cng:
-	data = (switch_byte_t *) tech_pvt->read_frame.data;
-	data[0] = 65;
-	data[1] = 0;
-	tech_pvt->read_frame.datalen = 2;
-	tech_pvt->read_frame.flags = SFF_CNG;
-	*frame = &tech_pvt->read_frame;
-#ifdef GSMOPEN_PORTAUDIO
-		//speex_echo_state_reset(tech_pvt->stream->echo_state);
-#endif // GSMOPEN_PORTAUDIO
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-	unsigned int sent;
-#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-#ifdef GSMOPEN_PORTAUDIO
-#ifdef WANT_SPEEX
-  spx_int16_t *speexptr;
-#endif// GSMOPEN_ALSA
-#endif// WANT_SPEEX
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	if (!switch_channel_ready(channel) || !switch_test_flag(tech_pvt, TFLAG_IO)) {
-		ERRORA("channel not ready \n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-		return SWITCH_STATUS_FALSE;
-	}
-#ifdef BIGENDIAN
-	if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
-#ifdef WIN32
-		switch_swap_linear((int16_t *)frame->data, (int) frame->datalen / 2);
-#else
-		switch_swap_linear(frame->data, (int) frame->datalen / 2);
-#endif //WIN32
-	}
-#endif
-
-	//switch_core_timer_next(&tech_pvt->timer_write);
-	//sent = frame->datalen;
-
-	//ERRORA("PLAY \n", GSMOPEN_P_LOG);
-	//snd_pcm_writei(tech_pvt->alsap, (short *) frame->data, (int) (frame->datalen / 2));
-
-	gsmopen_sound_boost(frame->data, frame->samples, tech_pvt->playback_boost);
-#ifdef GSMOPEN_ALSA
- 
-	switch_core_timer_next(&tech_pvt->timer_write);
-	sent = alsa_write(tech_pvt, (short *) frame->data, (int) (frame->datalen));
-//DEBUGA_GSMOPEN("sent=%d \n", GSMOPEN_P_LOG, sent);
-
-	if (sent && sent != frame->datalen / 2 && sent != -1) {
-		DEBUGA_GSMOPEN("sent %d\n", GSMOPEN_P_LOG, sent);
-	}
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-	sent = gsmopen_portaudio_write(tech_pvt, (short *) frame->data, (int) (frame->datalen));
-//DEBUGA_GSMOPEN("sent=%d \n", GSMOPEN_P_LOG, sent);
-
-	if (sent && sent != frame->datalen / 2 && sent != -1) {
-		DEBUGA_GSMOPEN("sent %d\n", GSMOPEN_P_LOG, sent);
-	}
-
-#ifdef WANT_SPEEX
-  if (tech_pvt->speexecho) {
-  speexptr = (spx_int16_t *) frame->data;
-    /* Put frame into playback buffer */
-    speex_echo_playback(tech_pvt->echo_state, speexptr);
-		DEBUGA_GSMOPEN("write\n", GSMOPEN_P_LOG);
-  }
-#endif //WANT_SPEEX
-#endif // GSMOPEN_PORTAUDIO
-	//NOTICA("sent=%d\n", GSMOPEN_P_LOG, sent);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_answer_channel(switch_core_session_t *session)
-{
-	private_t *tech_pvt;
-	switch_channel_t *channel = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	//ERRORA("%s CHANNEL INIT\n", GSMOPEN_P_LOG, tech_pvt->name);
-	switch_set_flag(tech_pvt, TFLAG_IO);
-	gsmopen_serial_answer(tech_pvt);
-
-	/* Move channel's state machine to ROUTING. This means the call is trying
-	   to get from the initial start where the call because, to the point
-	   where a destination has been identified. If the channel is simply
-	   left in the initial state, nothing will happen. */
-	switch_channel_set_state(channel, CS_ROUTING);
-	switch_mutex_lock(globals.mutex);
-	globals.calls++;
-
-	switch_mutex_unlock(globals.mutex);
-	DEBUGA_GSMOPEN("%s CHANNEL ANSWER %s\n", GSMOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	DEBUGA_GSMOPEN("ANSWERED! \n", GSMOPEN_P_LOG);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-#if defined(GSMOPEN_ALSA) 
-	int samples;
-	short tmp_buffer[1280];
-#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	switch (msg->message_id) {
-	case SWITCH_MESSAGE_INDICATE_ANSWER:
-		{
-			DEBUGA_GSMOPEN("MSG_ID=%d, TO BE ANSWERED!\n", GSMOPEN_P_LOG, msg->message_id);
-			channel_answer_channel(session);
-		}
-		break;
-	case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC:
-
-		DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_MESSAGE_INDICATE_AUDIO_SYNC\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		switch_core_timer_sync(&tech_pvt->timer_read);
-		switch_core_timer_sync(&tech_pvt->timer_write);
-
-#ifdef GSMOPEN_ALSA
-		while ((samples = alsa_read(tech_pvt, tmp_buffer, tech_pvt->read_codec.implementation->samples_per_packet * 4)) > 160) {
-			//WARNINGA("read %d samples\n", GSMOPEN_P_LOG, samples);
-		}
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-		//while ((samples = gsmopen_portaudio_read(tech_pvt, tmp_buffer, tech_pvt->read_codec.implementation->samples_per_packet * 2)) > 160) {
-			//WARNINGA("read %d samples\n", GSMOPEN_P_LOG, samples);
-		//}
-#ifdef WANT_SPEEX
-		speex_echo_state_reset(tech_pvt->echo_state);
-#endif// WANT_SPEEX
-#endif// GSMOPEN_PORTAUDIO
-		break;
-
-
-	default:
-		{
-			DEBUGA_GSMOPEN("MSG_ID=%d\n", GSMOPEN_P_LOG, msg->message_id);
-		}
-		break;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_receive_event(switch_core_session_t *session, switch_event_t *event)
-{
-	struct private_object *tech_pvt = (struct private_object *) switch_core_session_get_private(session);
-	char *body = switch_event_get_body(event);
-	switch_assert(tech_pvt != NULL);
-
-	if (!body) {
-		body = (char *) "";
-	}
-
-	WARNINGA("event: |||%s|||\n", GSMOPEN_P_LOG, body);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_state_handler_table_t gsmopen_state_handlers = {
-	/*.on_init */ channel_on_init,
-	/*.on_routing */ channel_on_routing,
-	/*.on_execute */ channel_on_execute,
-	/*.on_hangup */ channel_on_hangup,
-	/*.on_exchange_media */ channel_on_exchange_media,
-	/*.on_soft_execute */ channel_on_soft_execute,
-	/*.on_consume_media */ channel_on_consume_media,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ NULL,
-	/*.on_destroy */ channel_on_destroy
-};
-
-switch_io_routines_t gsmopen_io_routines = {
-	/*.outgoing_channel */ channel_outgoing_channel,
-	/*.read_frame */ channel_read_frame,
-	/*.write_frame */ channel_write_frame,
-	/*.kill_channel */ channel_kill_channel,
-	/*.send_dtmf */ channel_send_dtmf,
-	/*.receive_message */ channel_receive_message,
-	/*.receive_event */ channel_receive_event
-};
-
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
-													switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-													switch_call_cause_t *cancel_cause)
-{
-	private_t *tech_pvt = NULL;
-	if ((*new_session = switch_core_session_request(gsmopen_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool)) != 0) {
-		switch_channel_t *channel = NULL;
-		switch_caller_profile_t *caller_profile;
-		char *rdest;
-		int found = 0;
-		char interface_name[256];
-
-		DEBUGA_GSMOPEN("1 SESSION_REQUEST %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(*new_session));
-		switch_core_session_add_stream(*new_session, NULL);
-
-
-		if (!zstr(outbound_profile->destination_number)) {
-			int i;
-			char *slash;
-
-			switch_copy_string(interface_name, outbound_profile->destination_number, 255);
-			slash = strrchr(interface_name, '/');
-			*slash = '\0';
-
-			switch_mutex_lock(globals.mutex);
-			if (strncmp("ANY", interface_name, strlen(interface_name)) == 0 || strncmp("RR", interface_name, strlen(interface_name)) == 0) {
-				/* we've been asked for the "ANY" interface, let's find the first idle interface */
-				//DEBUGA_GSMOPEN("Finding one available gsmopen interface\n", GSMOPEN_P_LOG);
-				//tech_pvt = find_available_gsmopen_interface(NULL);
-				//if (tech_pvt)
-				//found = 1;
-				//} else if (strncmp("RR", interface_name, strlen(interface_name)) == 0) {
-				/* Find the first idle interface using Round Robin */
-				DEBUGA_GSMOPEN("Finding one available gsmopen interface RR\n", GSMOPEN_P_LOG);
-				tech_pvt = find_available_gsmopen_interface_rr(NULL);
-				if (tech_pvt) {
-					found = 1;
-					DEBUGA_GSMOPEN("FOUND one available gsmopen interface RR\n", GSMOPEN_P_LOG);
-				}
-			}
-
-			for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-				/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-				if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, interface_name, strlen(interface_name)) == 0)) {
-					if (strlen(globals.GSMOPEN_INTERFACES[i].session_uuid_str)) {
-						DEBUGA_GSMOPEN
-							("globals.GSMOPEN_INTERFACES[%d].name=|||%s||| session_uuid_str=|||%s||| is BUSY\n",
-							 GSMOPEN_P_LOG, i, globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].session_uuid_str);
-						DEBUGA_GSMOPEN("1 SESSION_DESTROY %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(*new_session));
-						switch_core_session_destroy(new_session);
-						switch_mutex_unlock(globals.mutex);
-						return SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-					}
-
-					DEBUGA_GSMOPEN("globals.GSMOPEN_INTERFACES[%d].name=|||%s|||?\n", GSMOPEN_P_LOG, i, globals.GSMOPEN_INTERFACES[i].name);
-					tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-					found = 1;
-					break;
-				}
-
-			}
-
-		} else {
-			ERRORA("Doh! no destination number?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-
-		if (!found) {
-			DEBUGA_GSMOPEN("Doh! no available interface for |||%s|||?\n", GSMOPEN_P_LOG, interface_name);
-			DEBUGA_GSMOPEN("2 SESSION_DESTROY %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(*new_session));
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			//return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-			return SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-		}
-
-		channel = switch_core_session_get_channel(*new_session);
-		if (!channel) {
-			ERRORA("Doh! no channel?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-		if (gsmopen_tech_init(tech_pvt, *new_session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Doh! no tech_init?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-
-
-		if (outbound_profile) {
-			char name[128];
-
-			snprintf(name, sizeof(name), "gsmopen/%s", outbound_profile->destination_number);
-			//snprintf(name, sizeof(name), "gsmopen/%s", tech_pvt->name);
-			switch_channel_set_name(channel, name);
-			caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
-			switch_channel_set_caller_profile(channel, caller_profile);
-			tech_pvt->caller_profile = caller_profile;
-		} else {
-			ERRORA("Doh! no caller profile\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-
-		tech_pvt->ob_calls++;
-
-		rdest = strchr(caller_profile->destination_number, '/');
-		*rdest++ = '\0';
-
-		//gsmopen_call(tech_pvt, rdest, 30);
-
-		switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(*new_session), sizeof(tech_pvt->session_uuid_str));
-		caller_profile = tech_pvt->caller_profile;
-		caller_profile->destination_number = rdest;
-
-		switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
-		switch_channel_set_state(channel, CS_INIT);
-		gsmopen_call(tech_pvt, rdest, 30);
-		switch_mutex_unlock(globals.mutex);
-		return SWITCH_CAUSE_SUCCESS;
-	}
-
-	ERRORA("Doh! no new_session\n", GSMOPEN_P_LOG);
-	return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-}
-
-/*!
- * \brief This thread runs during a call, and monitor the interface for signaling, like hangup, caller id, etc most of signaling is handled inside the gsmopen_signaling_read function
- *
- */
-
-static switch_status_t load_config(int reload_type)
-{
-	const char *cf = "gsmopen.conf";
-	switch_xml_t cfg, xml, global_settings, param, interfaces, myinterface;
-	private_t *tech_pvt = NULL;
-
-	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, gsmopen_module_pool);
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		ERRORA("open of %s failed\n", GSMOPEN_P_LOG, cf);
-		running = 0;
-		switch_xml_free(xml);
-		return SWITCH_STATUS_TERM;
-	}
-
-	switch_mutex_lock(globals.mutex);
-	if ((global_settings = switch_xml_child(cfg, "global_settings"))) {
-		for (param = switch_xml_child(global_settings, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!strcasecmp(var, "debug")) {
-				DEBUGA_GSMOPEN("globals.debug=%d\n", GSMOPEN_P_LOG, globals.debug);
-				globals.debug = atoi(val);
-				DEBUGA_GSMOPEN("globals.debug=%d\n", GSMOPEN_P_LOG, globals.debug);
-			} else if (!strcasecmp(var, "hold-music")) {
-				switch_set_string(globals.hold_music, val);
-				DEBUGA_GSMOPEN("globals.hold_music=%s\n", GSMOPEN_P_LOG, globals.hold_music);
-			} else if (!strcmp(var, "dialplan")) {
-				set_global_dialplan(val);
-				DEBUGA_GSMOPEN("globals.dialplan=%s\n", GSMOPEN_P_LOG, globals.dialplan);
-			} else if (!strcmp(var, "destination")) {
-				set_global_destination(val);
-				DEBUGA_GSMOPEN("globals.destination=%s\n", GSMOPEN_P_LOG, globals.destination);
-			} else if (!strcmp(var, "context")) {
-				set_global_context(val);
-				DEBUGA_GSMOPEN("globals.context=%s\n", GSMOPEN_P_LOG, globals.context);
-
-			}
-
-		}
-	}
-
-	if ((interfaces = switch_xml_child(cfg, "per_interface_settings"))) {
-		int i = 0;
-
-		for (myinterface = switch_xml_child(interfaces, "interface"); myinterface; myinterface = myinterface->next) {
-			char *id = (char *) switch_xml_attr(myinterface, "id");
-			char *name = (char *) switch_xml_attr(myinterface, "name");
-			const char *context = "default";
-			const char *dialplan = "XML";
-			const char *destination = "5000";
-			const char *controldevice_name = "/dev/ttyACM0";
-			//char *digit_timeout;
-			//char *max_digits;
-			//char *hotline;
-			char *dial_regex = NULL;
-			char *hold_music = NULL;
-			char *fail_dial_regex = NULL;
-			//const char *enable_callerid ;
-
-
-			const char *at_dial_pre_number = "ATD";
-			const char *at_dial_post_number = ";";
-			const char *at_dial_expect = "OK";
-			const char *at_hangup = "ATH";
-			const char *at_hangup_expect = "OK";
-			const char *at_answer = "ATA";
-			const char *at_answer_expect = "OK";
-			const char *at_send_dtmf = "AT+VTS";
-			const char *at_preinit_1 = "";
-			const char *at_preinit_1_expect = "";
-			const char *at_preinit_2 = "";
-			const char *at_preinit_2_expect = "";
-			const char *at_preinit_3 = "";
-			const char *at_preinit_3_expect = "";
-			const char *at_preinit_4 = "";
-			const char *at_preinit_4_expect = "";
-			const char *at_preinit_5 = "";
-			const char *at_preinit_5_expect = "";
-			const char *at_postinit_1 = "at+cmic=0,9";
-			const char *at_postinit_1_expect = "OK";
-			const char *at_postinit_2 = "AT+CKPD=\"EEE\"";
-			const char *at_postinit_2_expect = "OK";
-			const char *at_postinit_3 = "AT+CSSN=1,0";
-			const char *at_postinit_3_expect = "OK";
-			const char *at_postinit_4 = "at+sidet=0";
-			const char *at_postinit_4_expect = "OK";
-			const char *at_postinit_5 = "at+clvl=99";
-			const char *at_postinit_5_expect = "OK";
-			const char *at_query_battchg = "AT+CBC";
-			const char *at_query_battchg_expect = "OK";
-			const char *at_query_signal = "AT+CSQ";
-			const char *at_query_signal_expect = "OK";
-			const char *at_call_idle = "+MCST: 1";
-			const char *at_call_incoming = "+MCST: 2";
-			const char *at_call_active = "+CSSI: 7";
-			const char *at_call_failed = "+MCST: 65";
-			const char *at_call_calling = "+CSSI: 1";
-			const char *at_indicator_noservice_string = "CIEV: 2;0";
-			const char *at_indicator_nosignal_string = "CIEV: 5;0";
-			const char *at_indicator_lowsignal_string = "CIEV: 5;1";
-			const char *at_indicator_lowbattchg_string = "CIEV: 0;1";
-			const char *at_indicator_nobattchg_string = "CIEV: 0;0";
-			const char *at_indicator_callactive_string = "CIEV: 3;1";
-			const char *at_indicator_nocallactive_string = "CIEV: 3;0";
-			const char *at_indicator_nocallsetup_string = "CIEV: 6;0";
-			const char *at_indicator_callsetupincoming_string = "CIEV: 6;1";
-			const char *at_indicator_callsetupoutgoing_string = "CIEV: 6;2";
-			const char *at_indicator_callsetupremoteringing_string = "CIEV: 6;3";
-			//const char *sms_receiving_program = "/usr/local/bin/ciapalo";
-			const char *alsacname = "plughw:1";
-			const char *alsapname = "plughw:1";
-			const char *at_early_audio = "0";
-			const char *at_after_preinit_pause = "500000";
-			const char *at_initial_pause = "500000";
-			const char *at_has_clcc = "0";
-			const char *at_has_ecam = "0";
-			const char *alsa_period_size = "160";
-			const char *alsa_periods_in_buffer = "4";
-			const char *gsmopen_sound_rate = "8000";
-			const char *alsa_play_is_mono = "1";
-			const char *alsa_capture_is_mono = "1";
-			const char *capture_boost = "5";
-			const char *playback_boost = "10";
-#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-			const char *no_sound = "0";
-#else 
-			const char *no_sound = "1";
-#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-#ifdef GSMOPEN_PORTAUDIO
-			const char *portaudiocindex;
-			const char *portaudiopindex;
-			const char *speexecho;
-			const char *speexpreprocess;
-#endif// GSMOPEN_PORTAUDIO
-
-			uint32_t interface_id = 0;
-#ifdef WIN32
-			int controldevice_speed = 115200;	//FIXME TODO
-#else
-			uint32_t controldevice_speed = B115200;	//FIXME TODO
-#endif //WIN32
-			uint32_t controldevprotocol = PROTOCOL_AT;	//FIXME TODO
-			uint32_t running = 1;	//FIXME TODO
-			const char *gsmopen_serial_sync_period = "300";	//FIXME TODO
-
-
-
-			tech_pvt = NULL;
-
-			for (param = switch_xml_child(myinterface, "param"); param; param = param->next) {
-				char *var = (char *) switch_xml_attr_soft(param, "name");
-				char *val = (char *) switch_xml_attr_soft(param, "value");
-
-				if (!strcasecmp(var, "id")) {
-					id = val;
-				} else if (!strcasecmp(var, "name")) {
-					name = val;
-				} else if (!strcasecmp(var, "context")) {
-					context = val;
-				} else if (!strcasecmp(var, "dialplan")) {
-					dialplan = val;
-				} else if (!strcasecmp(var, "destination")) {
-					destination = val;
-				} else if (!strcasecmp(var, "controldevice_name")) {
-					controldevice_name = val;
-				//} else if (!strcasecmp(var, "digit_timeout")) {
-					//digit_timeout = val;
-				//} else if (!strcasecmp(var, "max_digits")) {
-					//max_digits = val;
-				//} else if (!strcasecmp(var, "hotline")) {
-					//hotline = val;
-				} else if (!strcasecmp(var, "dial_regex")) {
-					dial_regex = val;
-				} else if (!strcasecmp(var, SWITCH_HOLD_MUSIC_VARIABLE)) {
-					hold_music = val;
-				} else if (!strcasecmp(var, "fail_dial_regex")) {
-					fail_dial_regex = val;
-				//} else if (!strcasecmp(var, "enable_callerid")) {
-					//enable_callerid = val;
-				} else if (!strcasecmp(var, "at_dial_pre_number")) {
-					at_dial_pre_number = val;
-				} else if (!strcasecmp(var, "at_dial_post_number")) {
-					at_dial_post_number = val;
-				} else if (!strcasecmp(var, "at_dial_expect")) {
-					at_dial_expect = val;
-				} else if (!strcasecmp(var, "at_hangup")) {
-					at_hangup = val;
-				} else if (!strcasecmp(var, "at_hangup_expect")) {
-					at_hangup_expect = val;
-				} else if (!strcasecmp(var, "at_answer")) {
-					at_answer = val;
-				} else if (!strcasecmp(var, "at_answer_expect")) {
-					at_answer_expect = val;
-				} else if (!strcasecmp(var, "at_send_dtmf")) {
-					at_send_dtmf = val;
-				} else if (!strcasecmp(var, "at_preinit_1")) {
-					at_preinit_1 = val;
-				} else if (!strcasecmp(var, "at_preinit_1_expect")) {
-					at_preinit_1_expect = val;
-				} else if (!strcasecmp(var, "at_preinit_2")) {
-					at_preinit_2 = val;
-				} else if (!strcasecmp(var, "at_preinit_2_expect")) {
-					at_preinit_2_expect = val;
-				} else if (!strcasecmp(var, "at_preinit_3")) {
-					at_preinit_3 = val;
-				} else if (!strcasecmp(var, "at_preinit_3_expect")) {
-					at_preinit_3_expect = val;
-				} else if (!strcasecmp(var, "at_preinit_4")) {
-					at_preinit_4 = val;
-				} else if (!strcasecmp(var, "at_preinit_4_expect")) {
-					at_preinit_4_expect = val;
-				} else if (!strcasecmp(var, "at_preinit_5")) {
-					at_preinit_5 = val;
-				} else if (!strcasecmp(var, "at_preinit_5_expect")) {
-					at_preinit_5_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_1")) {
-					at_postinit_1 = val;
-				} else if (!strcasecmp(var, "at_postinit_1_expect")) {
-					at_postinit_1_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_2")) {
-					at_postinit_2 = val;
-				} else if (!strcasecmp(var, "at_postinit_2_expect")) {
-					at_postinit_2_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_3")) {
-					at_postinit_3 = val;
-				} else if (!strcasecmp(var, "at_postinit_3_expect")) {
-					at_postinit_3_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_4")) {
-					at_postinit_4 = val;
-				} else if (!strcasecmp(var, "at_postinit_4_expect")) {
-					at_postinit_4_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_5")) {
-					at_postinit_5 = val;
-				} else if (!strcasecmp(var, "at_postinit_5_expect")) {
-					at_postinit_5_expect = val;
-				} else if (!strcasecmp(var, "at_query_battchg")) {
-					at_query_battchg = val;
-				} else if (!strcasecmp(var, "at_query_battchg_expect")) {
-					at_query_battchg_expect = val;
-				} else if (!strcasecmp(var, "at_query_signal")) {
-					at_query_signal = val;
-				} else if (!strcasecmp(var, "at_query_signal_expect")) {
-					at_query_signal_expect = val;
-				} else if (!strcasecmp(var, "at_call_idle")) {
-					at_call_idle = val;
-				} else if (!strcasecmp(var, "at_call_incoming")) {
-					at_call_incoming = val;
-				} else if (!strcasecmp(var, "at_call_active")) {
-					at_call_active = val;
-				} else if (!strcasecmp(var, "at_call_failed")) {
-					at_call_failed = val;
-				} else if (!strcasecmp(var, "at_call_calling")) {
-					at_call_calling = val;
-				} else if (!strcasecmp(var, "at_indicator_noservice_string")) {
-					at_indicator_noservice_string = val;
-				} else if (!strcasecmp(var, "at_indicator_nosignal_string")) {
-					at_indicator_nosignal_string = val;
-				} else if (!strcasecmp(var, "at_indicator_lowsignal_string")) {
-					at_indicator_lowsignal_string = val;
-				} else if (!strcasecmp(var, "at_indicator_lowbattchg_string")) {
-					at_indicator_lowbattchg_string = val;
-				} else if (!strcasecmp(var, "at_indicator_nobattchg_string")) {
-					at_indicator_nobattchg_string = val;
-				} else if (!strcasecmp(var, "at_indicator_callactive_string")) {
-					at_indicator_callactive_string = val;
-				} else if (!strcasecmp(var, "at_indicator_nocallactive_string")) {
-					at_indicator_nocallactive_string = val;
-				} else if (!strcasecmp(var, "at_indicator_nocallsetup_string")) {
-					at_indicator_nocallsetup_string = val;
-				} else if (!strcasecmp(var, "at_indicator_callsetupincoming_string")) {
-					at_indicator_callsetupincoming_string = val;
-				} else if (!strcasecmp(var, "at_indicator_callsetupoutgoing_string")) {
-					at_indicator_callsetupoutgoing_string = val;
-				} else if (!strcasecmp(var, "at_indicator_callsetupremoteringing_string")) {
-					at_indicator_callsetupremoteringing_string = val;
-					//} else if (!strcasecmp(var, "sms_receiving_program")) {
-					//sms_receiving_program = val;
-				} else if (!strcasecmp(var, "alsacname")) {
-					alsacname = val;
-				} else if (!strcasecmp(var, "alsapname")) {
-					alsapname = val;
-#ifdef GSMOPEN_PORTAUDIO
-				} else if (!strcasecmp(var, "portaudiocindex")) {
-					portaudiocindex = val;
-				} else if (!strcasecmp(var, "portaudiopindex")) {
-					portaudiopindex = val;
-				} else if (!strcasecmp(var, "speexecho")) {
-					speexecho = val;
-				} else if (!strcasecmp(var, "speexpreprocess")) {
-					speexpreprocess = val;
-#endif// GSMOPEN_PORTAUDIO
-				} else if (!strcasecmp(var, "at_early_audio")) {
-					at_early_audio = val;
-				} else if (!strcasecmp(var, "at_after_preinit_pause")) {
-					at_after_preinit_pause = val;
-				} else if (!strcasecmp(var, "at_initial_pause")) {
-					at_initial_pause = val;
-				} else if (!strcasecmp(var, "at_has_clcc")) {
-					at_has_clcc = val;
-				} else if (!strcasecmp(var, "at_has_ecam")) {
-					at_has_ecam = val;
-				} else if (!strcasecmp(var, "alsa_period_size")) {
-					alsa_period_size = val;
-				} else if (!strcasecmp(var, "alsa_periods_in_buffer")) {
-					alsa_periods_in_buffer = val;
-				} else if (!strcasecmp(var, "gsmopen_sound_rate")) {
-					gsmopen_sound_rate = val;
-				} else if (!strcasecmp(var, "alsa_play_is_mono")) {
-					alsa_play_is_mono = val;
-				} else if (!strcasecmp(var, "alsa_capture_is_mono")) {
-					alsa_capture_is_mono = val;
-				} else if (!strcasecmp(var, "capture_boost")) {
-					capture_boost = val;
-				} else if (!strcasecmp(var, "playback_boost")) {
-					playback_boost = val;
-				} else if (!strcasecmp(var, "no_sound")) {
-					no_sound = val;
-				} else if (!strcasecmp(var, "gsmopen_serial_sync_period")) {
-					gsmopen_serial_sync_period = val;
-				}
-
-
-			}
-
-			/* BEGIN: Changes here */
-			if (reload_type == SOFT_RELOAD) {
-				char the_interface[256];
-				sprintf(the_interface, "#%s", name);
-
-				if (interface_exists(the_interface) == SWITCH_STATUS_SUCCESS) {
-					continue;
-				}
-			}
-			/* END: Changes here */
-
-			if (!id) {
-				ERRORA("interface missing REQUIRED param 'id'\n", GSMOPEN_P_LOG);
-				continue;
-			}
-
-			if (switch_is_number(id)) {
-				interface_id = atoi(id);
-			} else {
-				ERRORA("interface param 'id' MUST be a number, now id='%s'\n", GSMOPEN_P_LOG, id);
-				continue;
-			}
-
-			if (!switch_is_number(at_early_audio)) {
-				ERRORA("interface param 'at_early_audio' MUST be a number, now at_early_audio='%s'\n", GSMOPEN_P_LOG, at_early_audio);
-				continue;
-			}
-			if (!switch_is_number(at_after_preinit_pause)) {
-				ERRORA("interface param 'at_after_preinit_pause' MUST be a number, now at_after_preinit_pause='%s'\n", GSMOPEN_P_LOG,
-					   at_after_preinit_pause);
-				continue;
-			}
-			if (!switch_is_number(at_initial_pause)) {
-				ERRORA("interface param 'at_initial_pause' MUST be a number, now at_initial_pause='%s'\n", GSMOPEN_P_LOG, at_initial_pause);
-				continue;
-			}
-			if (!switch_is_number(at_has_clcc)) {
-				ERRORA("interface param 'at_has_clcc' MUST be a number, now at_has_clcc='%s'\n", GSMOPEN_P_LOG, at_has_clcc);
-				continue;
-			}
-			if (!switch_is_number(at_has_ecam)) {
-				ERRORA("interface param 'at_has_ecam' MUST be a number, now at_has_ecam='%s'\n", GSMOPEN_P_LOG, at_has_ecam);
-				continue;
-			}
-			if (!switch_is_number(alsa_period_size)) {
-				ERRORA("interface param 'alsa_period_size' MUST be a number, now alsa_period_size='%s'\n", GSMOPEN_P_LOG, alsa_period_size);
-				continue;
-			}
-			if (!switch_is_number(alsa_periods_in_buffer)) {
-				ERRORA("interface param 'alsa_periods_in_buffer' MUST be a number, now alsa_periods_in_buffer='%s'\n", GSMOPEN_P_LOG,
-					   alsa_periods_in_buffer);
-				continue;
-			}
-			if (!switch_is_number(gsmopen_sound_rate)) {
-				ERRORA("interface param 'gsmopen_sound_rate' MUST be a number, now gsmopen_sound_rate='%s'\n", GSMOPEN_P_LOG, gsmopen_sound_rate);
-				continue;
-			}
-			if (!switch_is_number(alsa_play_is_mono)) {
-				ERRORA("interface param 'alsa_play_is_mono' MUST be a number, now alsa_play_is_mono='%s'\n", GSMOPEN_P_LOG, alsa_play_is_mono);
-				continue;
-			}
-			if (!switch_is_number(alsa_capture_is_mono)) {
-				ERRORA("interface param 'alsa_capture_is_mono' MUST be a number, now alsa_capture_is_mono='%s'\n", GSMOPEN_P_LOG, alsa_capture_is_mono);
-				continue;
-			}
-			if (!switch_is_number(capture_boost)) {
-				ERRORA("interface param 'capture_boost' MUST be a number, now capture_boost='%s'\n", GSMOPEN_P_LOG, capture_boost);
-				continue;
-			}
-			if (!switch_is_number(playback_boost)) {
-				ERRORA("interface param 'playback_boost' MUST be a number, now playback_boost='%s'\n", GSMOPEN_P_LOG, playback_boost);
-				continue;
-			}
-			if (!switch_is_number(no_sound)) {
-				ERRORA("interface param 'no_sound' MUST be a number, now no_sound='%s'\n", GSMOPEN_P_LOG, no_sound);
-				continue;
-			}
-			if (!switch_is_number(gsmopen_serial_sync_period)) {
-				ERRORA("interface param 'gsmopen_serial_sync_period' MUST be a number, now gsmopen_serial_sync_period='%s'\n", GSMOPEN_P_LOG, gsmopen_serial_sync_period);
-				continue;
-			}
-
-
-			if (interface_id && interface_id < GSMOPEN_MAX_INTERFACES) {
-				private_t newconf;
-				switch_threadattr_t *gsmopen_api_thread_attr = NULL;
-				int res = 0;
-
-				memset(&newconf, '\0', sizeof(newconf));
-				globals.GSMOPEN_INTERFACES[interface_id] = newconf;
-
-
-				tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-
-				switch_mutex_init(&globals.GSMOPEN_INTERFACES[interface_id].controldev_lock, SWITCH_MUTEX_NESTED, gsmopen_module_pool);
-
-
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].id, id);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].name, name);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].context, context);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].dialplan, dialplan);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].destination, destination);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].controldevice_name, controldevice_name);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].dial_regex, dial_regex);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].hold_music, hold_music);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].fail_dial_regex, fail_dial_regex);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_dial_pre_number, at_dial_pre_number);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_dial_post_number, at_dial_post_number);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_dial_expect, at_dial_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_hangup, at_hangup);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_hangup_expect, at_hangup_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_answer, at_answer);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_answer_expect, at_answer_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_send_dtmf, at_send_dtmf);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_1, at_preinit_1);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_1_expect, at_preinit_1_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_2, at_preinit_2);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_2_expect, at_preinit_2_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_3, at_preinit_3);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_3_expect, at_preinit_3_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_4, at_preinit_4);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_4_expect, at_preinit_4_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_5, at_preinit_5);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_5_expect, at_preinit_5_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_1, at_postinit_1);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_1_expect, at_postinit_1_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_2, at_postinit_2);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_2_expect, at_postinit_2_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_3, at_postinit_3);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_3_expect, at_postinit_3_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_4, at_postinit_4);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_4_expect, at_postinit_4_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_5, at_postinit_5);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_5_expect, at_postinit_5_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_query_battchg, at_query_battchg);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_query_battchg_expect, at_query_battchg_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_query_signal, at_query_signal);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_query_signal_expect, at_query_signal_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_idle, at_call_idle);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_incoming, at_call_incoming);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_active, at_call_active);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_failed, at_call_failed);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_calling, at_call_calling);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_noservice_string, at_indicator_noservice_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_nosignal_string, at_indicator_nosignal_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_lowsignal_string, at_indicator_lowsignal_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_lowbattchg_string, at_indicator_lowbattchg_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_nobattchg_string, at_indicator_nobattchg_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callactive_string, at_indicator_callactive_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_nocallactive_string, at_indicator_nocallactive_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_nocallsetup_string, at_indicator_nocallsetup_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupincoming_string, at_indicator_callsetupincoming_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupoutgoing_string, at_indicator_callsetupoutgoing_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupremoteringing_string,
-								  at_indicator_callsetupremoteringing_string);
-				//switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].sms_receiving_program, sms_receiving_program);
-#ifdef GSMOPEN_ALSA
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].alsacname, alsacname);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].alsapname, alsapname);
-#endif// GSMOPEN_ALSA
-
-#ifdef GSMOPEN_PORTAUDIO
-				globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex = atoi(portaudiocindex);
-				globals.GSMOPEN_INTERFACES[interface_id].portaudiopindex = atoi(portaudiopindex);
-				globals.GSMOPEN_INTERFACES[interface_id].speexecho = atoi(speexecho);
-				globals.GSMOPEN_INTERFACES[interface_id].speexpreprocess = atoi(speexpreprocess);
-#endif// GSMOPEN_PORTAUDIO
-				globals.GSMOPEN_INTERFACES[interface_id].at_early_audio = atoi(at_early_audio);
-				globals.GSMOPEN_INTERFACES[interface_id].at_after_preinit_pause = atoi(at_after_preinit_pause);
-				globals.GSMOPEN_INTERFACES[interface_id].at_initial_pause = atoi(at_initial_pause);
-				globals.GSMOPEN_INTERFACES[interface_id].at_has_clcc = atoi(at_has_clcc);
-				globals.GSMOPEN_INTERFACES[interface_id].at_has_ecam = atoi(at_has_ecam);
-#ifdef GSMOPEN_ALSA
-				globals.GSMOPEN_INTERFACES[interface_id].alsa_period_size = atoi(alsa_period_size);
-				globals.GSMOPEN_INTERFACES[interface_id].alsa_periods_in_buffer = atoi(alsa_periods_in_buffer);
-				globals.GSMOPEN_INTERFACES[interface_id].gsmopen_sound_rate = atoi(gsmopen_sound_rate);
-				globals.GSMOPEN_INTERFACES[interface_id].alsa_play_is_mono = atoi(alsa_play_is_mono);
-				globals.GSMOPEN_INTERFACES[interface_id].alsa_capture_is_mono = atoi(alsa_capture_is_mono);
-#endif// GSMOPEN_ALSA
-				globals.GSMOPEN_INTERFACES[interface_id].capture_boost = atoi(capture_boost);
-				globals.GSMOPEN_INTERFACES[interface_id].playback_boost = atoi(playback_boost);
-#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-				globals.GSMOPEN_INTERFACES[interface_id].no_sound = atoi(no_sound);
-#else 
-				globals.GSMOPEN_INTERFACES[interface_id].no_sound = 1;
-#endif //  defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
-				globals.GSMOPEN_INTERFACES[interface_id].gsmopen_serial_sync_period = atoi(gsmopen_serial_sync_period);	
-
-
-
-				globals.GSMOPEN_INTERFACES[interface_id].controldevice_speed = controldevice_speed;	//FIXME
-				globals.GSMOPEN_INTERFACES[interface_id].controldevprotocol = controldevprotocol;	//FIXME
-				globals.GSMOPEN_INTERFACES[interface_id].running = running;	//FIXME
-
-
-
-				WARNINGA("STARTING interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
-				DEBUGA_GSMOPEN("id=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].id);
-				DEBUGA_GSMOPEN("name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].name);
-				DEBUGA_GSMOPEN("hold-music=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].hold_music);
-				DEBUGA_GSMOPEN("context=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].context);
-				DEBUGA_GSMOPEN("dialplan=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].dialplan);
-				DEBUGA_GSMOPEN("destination=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].destination);
-				DEBUGA_GSMOPEN("controldevice_name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].controldevice_name);
-#ifdef GSMOPEN_ALSA
-				DEBUGA_GSMOPEN("alsacname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].alsacname);
-				DEBUGA_GSMOPEN("alsapname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].alsapname);
-#endif// GSMOPEN_ALSA
-
-
-#ifdef GSMOPEN_PORTAUDIO
-				//FIXME
-				//globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex = 1;
-				//globals.GSMOPEN_INTERFACES[interface_id].portaudiopindex = 1;
-				//globals.GSMOPEN_INTERFACES[interface_id].speexecho = 1;
-				//globals.GSMOPEN_INTERFACES[interface_id].speexpreprocess = 1;
-				DEBUGA_GSMOPEN("portaudiocindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex);
-				DEBUGA_GSMOPEN("portaudiocindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex);
-				DEBUGA_GSMOPEN("speexecho=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].speexecho);
-				DEBUGA_GSMOPEN("speexpreprocess=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].speexpreprocess);
-#endif// GSMOPEN_PORTAUDIO
-				DEBUGA_GSMOPEN("gsmopen_serial_sync_period=%d\n", GSMOPEN_P_LOG, (int)globals.GSMOPEN_INTERFACES[interface_id].gsmopen_serial_sync_period);
-				/* init the serial port */
-				if (globals.GSMOPEN_INTERFACES[interface_id].controldevprotocol != PROTOCOL_NO_SERIAL) {
-					globals.GSMOPEN_INTERFACES[interface_id].controldevfd =
-						gsmopen_serial_init(&globals.GSMOPEN_INTERFACES[interface_id], globals.GSMOPEN_INTERFACES[interface_id].controldevice_speed);
-					if (globals.GSMOPEN_INTERFACES[interface_id].controldevfd == -1) {
-						ERRORA("gsmopen_serial_init failed\n", GSMOPEN_P_LOG);
-						ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
-						//return SWITCH_STATUS_FALSE;
-						globals.GSMOPEN_INTERFACES[interface_id].running=0;
-						alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_serial_init failed");
-						globals.GSMOPEN_INTERFACES[interface_id].active=0;
-						globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
-						continue;
-					}
-				}
-
-				/* config the phone/modem on the serial port */
-				if (globals.GSMOPEN_INTERFACES[interface_id].controldevprotocol != PROTOCOL_NO_SERIAL) {
-					res = gsmopen_serial_config(&globals.GSMOPEN_INTERFACES[interface_id]);
-					if (res) {
-						int count = 0;
-						ERRORA("gsmopen_serial_config failed, let's try again\n", GSMOPEN_P_LOG);
-						while(res && count < 5){
-							switch_sleep(100000); //0.1 seconds
-							res = gsmopen_serial_config(&globals.GSMOPEN_INTERFACES[interface_id]);
-							count++;
-							if (res) {
-								ERRORA("%d: gsmopen_serial_config failed, let's try again\n", GSMOPEN_P_LOG, count);
-							}
-						}
-						if (res) {
-							ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
-							//return SWITCH_STATUS_FALSE;
-							globals.GSMOPEN_INTERFACES[interface_id].running=0;
-							alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_serial_config failed");
-							globals.GSMOPEN_INTERFACES[interface_id].active=0;
-							globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
-							continue;
-						}
-					}
-				}
-
-				if(globals.GSMOPEN_INTERFACES[interface_id].no_sound==0){
-#ifdef GSMOPEN_ALSA
-					if (alsa_init(&globals.GSMOPEN_INTERFACES[interface_id])) {
-						ERRORA("alsa_init failed\n", GSMOPEN_P_LOG);
-						ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
-						//return SWITCH_STATUS_FALSE;
-						globals.GSMOPEN_INTERFACES[interface_id].running=0;
-						alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "alsa_init failed");
-						globals.GSMOPEN_INTERFACES[interface_id].active=0;
-						globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
-						continue;
-
-					}
-
-					if (alsa_shutdown(&globals.GSMOPEN_INTERFACES[interface_id])) {
-						ERRORA("alsa_shutdown failed\n", GSMOPEN_P_LOG);
-						ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
-						//return SWITCH_STATUS_FALSE;
-						globals.GSMOPEN_INTERFACES[interface_id].running=0;
-						alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "alsa_shutdown failed");
-						globals.GSMOPEN_INTERFACES[interface_id].active=0;
-						globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
-						continue;
-
-					}
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-					if (gsmopen_portaudio_init(&globals.GSMOPEN_INTERFACES[interface_id])) {
-						ERRORA("gsmopen_portaudio_init failed\n", GSMOPEN_P_LOG);
-						ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
-						//return SWITCH_STATUS_FALSE;
-						globals.GSMOPEN_INTERFACES[interface_id].running=0;
-						alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_portaudio_init failed");
-						globals.GSMOPEN_INTERFACES[interface_id].active=0;
-						globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
-						continue;
-
-					}
-
-					if (gsmopen_portaudio_shutdown(&globals.GSMOPEN_INTERFACES[interface_id])) {
-						ERRORA("gsmopen_portaudio_shutdown failed\n", GSMOPEN_P_LOG);
-						ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
-						//return SWITCH_STATUS_FALSE;
-						globals.GSMOPEN_INTERFACES[interface_id].running=0;
-						alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_portaudio_shutdown failed");
-						globals.GSMOPEN_INTERFACES[interface_id].active=0;
-						globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
-						continue;
-
-					}
-#endif// GSMOPEN_PORTAUDIO
-				}
-
-				globals.GSMOPEN_INTERFACES[interface_id].active=1;
-
-				//gsmopen_store_boost((char *)"5", &globals.GSMOPEN_INTERFACES[interface_id].capture_boost);    //FIXME
-				//gsmopen_store_boost((char *)"10", &globals.GSMOPEN_INTERFACES[interface_id].playback_boost);  //FIXME
-				gsmopen_store_boost((char *) capture_boost, &globals.GSMOPEN_INTERFACES[interface_id].capture_boost);	//FIXME
-				gsmopen_store_boost((char *) playback_boost, &globals.GSMOPEN_INTERFACES[interface_id].playback_boost);	//FIXME
-
-				switch_sleep(100000);
-				switch_threadattr_create(&gsmopen_api_thread_attr, gsmopen_module_pool);
-				switch_threadattr_stacksize_set(gsmopen_api_thread_attr, SWITCH_THREAD_STACKSIZE);
-				switch_thread_create(&globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread, gsmopen_api_thread_attr, gsmopen_do_gsmopenapi_thread,
-									 &globals.GSMOPEN_INTERFACES[interface_id], gsmopen_module_pool);
-
-				switch_sleep(100000);
-				WARNINGA("STARTED interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
-
-			} else {
-				ERRORA("interface id %d is higher than GSMOPEN_MAX_INTERFACES (%d)\n", GSMOPEN_P_LOG, interface_id, GSMOPEN_MAX_INTERFACES);
-				alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "interface id is higher than GSMOPEN_MAX_INTERFACES");
-				continue;
-			}
-
-		}
-
-		for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)) {
-				/* How many real intterfaces */
-				globals.real_interfaces = i + 1;
-
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-
-				DEBUGA_GSMOPEN("id=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].id);
-				DEBUGA_GSMOPEN("name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].name);
-				DEBUGA_GSMOPEN("context=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].context);
-				DEBUGA_GSMOPEN("hold-music=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].hold_music);
-				DEBUGA_GSMOPEN("dialplan=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].dialplan);
-				DEBUGA_GSMOPEN("destination=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].destination);
-				DEBUGA_GSMOPEN("controldevice_name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].controldevice_name);
-#ifdef GSMOPEN_ALSA
-				DEBUGA_GSMOPEN("alsacname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].alsacname);
-				DEBUGA_GSMOPEN("alsapname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].alsapname);
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-				DEBUGA_GSMOPEN("portaudiocindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].portaudiocindex);
-				DEBUGA_GSMOPEN("portaudiopindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].portaudiopindex);
-				DEBUGA_GSMOPEN("speexecho=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].speexecho);
-				DEBUGA_GSMOPEN("speexpreprocess=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].speexpreprocess);
-#endif// GSMOPEN_PORTAUDIO
-				DEBUGA_GSMOPEN("gsmopen_serial_sync_period=%d\n", GSMOPEN_P_LOG, (int)globals.GSMOPEN_INTERFACES[i].gsmopen_serial_sync_period);
-
-			}
-		}
-	}
-
-	switch_mutex_unlock(globals.mutex);
-	switch_xml_free(xml);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-//static switch_status_t chat_send(const char *proto, const char *from, const char *to, const char *subject, const char *body, const char *type, const char *hint)
-static switch_status_t chat_send(switch_event_t *message_event)
-{
-	char *user, *host, *f_user = NULL, *f_host = NULL, *f_resource = NULL;
-	private_t *tech_pvt = NULL;
-	int i = 0, found = 0;
-
-        const char *proto;
-        const char *from;
-        const char *to;
-        const char *subject;
-        const char *body;
-        //const char *type;
-	const char *hint;
-
-	proto = switch_event_get_header(message_event, "proto");
-	from = switch_event_get_header(message_event, "from");
-	to = switch_event_get_header(message_event, "to");
-	subject = switch_event_get_header(message_event, "subject");
-	body = switch_event_get_body(message_event);
-	//type = switch_event_get_header(message_event, "type");
-	hint = switch_event_get_header(message_event, "hint");
-
-	switch_assert(proto != NULL);
-
-	DEBUGA_GSMOPEN("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, hint=%s)\n", GSMOPEN_P_LOG, proto, from, to, subject, body, 
-				   hint ? hint : "NULL");
-
-	if (!to || !strlen(to)) {
-		ERRORA("Missing To: header.\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if ((!from && !hint) || (!strlen(from) && !strlen(hint))) {
-		ERRORA("Missing From: AND Hint: headers.\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (from && (f_user = strdup(from))) {
-		if ((f_host = strchr(f_user, '@'))) {
-			*f_host++ = '\0';
-			if ((f_resource = strchr(f_host, '/'))) {
-				*f_resource++ = '\0';
-			}
-		}
-	}
-
-	if (!strlen(hint)) {		//FIXME FIXME FIXME
-		hint = from;
-	}
-	if (to && (user = strdup(to))) {
-		if ((host = strchr(user, '@'))) {
-			*host++ = '\0';
-		}
-
-		DEBUGA_GSMOPEN("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, hint=%s)\n", GSMOPEN_P_LOG, proto, from, to, subject, body,
-					   hint ? hint : "NULL");
-		if (hint && strlen(hint)) {
-			//in hint we receive the interface name to use
-			for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-				if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, hint, strlen(hint)) == 0)) {
-					tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-					DEBUGA_GSMOPEN("Using interface: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", GSMOPEN_P_LOG, i,
-								   globals.GSMOPEN_INTERFACES[i].name);
-					found = 1;
-					break;
-				}
-			}
-		}						/* FIXME add a tech_pvt member for the SIM telephone number //else {
-								   //we have no a predefined interface name to use (hint is NULL), so let's choose an interface from the username (from)
-								   for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-								   if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-								   && (strncmp(globals.GSMOPEN_INTERFACES[i].skype_user, from, strlen(from)) == 0)) {
-								   tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-								   DEBUGA_GSMOPEN("Using interface: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", GSMOPEN_P_LOG, i, globals.GSMOPEN_INTERFACES[i].name);
-								   found = 1;
-								   break;
-								   }
-								   }
-								   }
-								 */
-		if (!found) {
-			ERRORA("ERROR: A GSMopen interface with name='%s' or one with SIM_number='%s' was not found\n", GSMOPEN_P_LOG, hint ? hint : "NULL",
-				   from ? from : "NULL");
-			goto end;
-		} else {
-			gsmopen_sendsms(tech_pvt, (char *) to, (char *) body);
-		}
-	}
-  end:
-	switch_safe_free(user);
-	switch_safe_free(f_user);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t compat_chat_send(const char *proto, const char *from, const char *to,
-                                                                                const char *subject, const char *body, const char *type, const char *hint)
-{
-        switch_event_t *message_event;
-        switch_status_t status;
-
-        if (switch_event_create(&message_event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-                switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "proto", proto);
-                switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "from", from);
-                switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "to", to);
-                switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "subject", subject);
-                switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "type", type);
-                switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "hint", hint);
-
-                if (body) {
-                        switch_event_add_body(message_event, "%s", body);
-                }
-        } else {
-                abort();
-        }
-
-        status = chat_send(message_event);
-        switch_event_destroy(&message_event);
-
-        return status;
-
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_gsmopen_load)
-{
-	switch_api_interface_t *commands_api_interface;
-	switch_chat_interface_t *chat_interface;
-
-	gsmopen_module_pool = pool;
-	memset(&globals, '\0', sizeof(globals));
-
-	running = 1;
-
-	if (load_config(FULL_RELOAD) != SWITCH_STATUS_SUCCESS) {
-		running = 0;
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_event_reserve_subclass(MY_EVENT_INCOMING_SMS) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	gsmopen_endpoint_interface = (switch_endpoint_interface_t *) switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-	gsmopen_endpoint_interface->interface_name = "gsmopen";
-	gsmopen_endpoint_interface->io_routines = &gsmopen_io_routines;
-	gsmopen_endpoint_interface->state_handler = &gsmopen_state_handlers;
-
-	if (running) {
-
-#if 1
-		SWITCH_ADD_API(commands_api_interface, "gsm", "gsm console AT_command", gsm_function, GSM_SYNTAX);
-		SWITCH_ADD_API(commands_api_interface, "gsmopen", "gsmopen interface AT_command", gsmopen_function, GSMOPEN_SYNTAX);
-#endif //0
-		SWITCH_ADD_API(commands_api_interface, "gsmopen_boost_audio", "gsmopen_boost_audio interface AT_command", gsmopen_boost_audio_function, GSMOPEN_BOOST_AUDIO_SYNTAX);
-		SWITCH_ADD_API(commands_api_interface, "gsmopen_dump", "gsmopen_dump interface", gsmopen_dump_function, GSMOPEN_DUMP_SYNTAX);
-		SWITCH_ADD_API(commands_api_interface, "gsmopen_sendsms", "gsmopen_sendsms interface destination_number SMS_text", sendsms_function,
-					   SENDSMS_SYNTAX);
-		SWITCH_ADD_CHAT(chat_interface, GSMOPEN_CHAT_PROTO, chat_send);
-
-		/* indicate that the module should continue to be loaded */
-		return SWITCH_STATUS_SUCCESS;
-	} else
-		return SWITCH_STATUS_FALSE;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_gsmopen_shutdown)
-{
-	int x;
-	private_t *tech_pvt = NULL;
-	switch_status_t status;
-	unsigned int howmany = 8;
-	int interface_id;
-	int fd;
-
-	running = 0;
-
-	for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
-		tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-
-		if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
-			WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
-			globals.GSMOPEN_INTERFACES[interface_id].running = 0;
-			if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
-#ifdef WIN32
-				switch_file_write(tech_pvt->GSMopenHandles.fdesc[1], "sciutati", &howmany);	// let's the controldev_thread die
-#else /* WIN32 */
-				howmany = write(tech_pvt->GSMopenHandles.fdesc[1], "sciutati", howmany);
-#endif /* WIN32 */
-			}
-			x = 10;
-			while (x) {			//FIXME 0.5 seconds?
-				x--;
-				switch_yield(50000);
-			}
-			if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
-				switch_thread_join(&status, globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread);
-			}
-			if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread) {
-				switch_thread_join(&status, globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread);
-			}
-
-			x = 10;
-			while (x) {			//FIXME 0.5 seconds?
-				x--;
-				switch_yield(50000);
-			}
-			fd = tech_pvt->controldevfd;
-			//DEBUGA_GSMOPEN("SHUTDOWN tech_pvt->controldevfd=%d\n", GSMOPEN_P_LOG, tech_pvt->controldevfd);
-			if (fd) {
-				//close(fd);
-				//tech_pvt->controldevfd = -1;
-				DEBUGA_GSMOPEN("SHUTDOWN tech_pvt->controldevfd=%d\n", GSMOPEN_P_LOG, tech_pvt->controldevfd);
-			}
-#ifndef WIN32
-			shutdown(tech_pvt->audiogsmopenpipe[0], 2);
-			close(tech_pvt->audiogsmopenpipe[0]);
-			shutdown(tech_pvt->audiogsmopenpipe[1], 2);
-			close(tech_pvt->audiogsmopenpipe[1]);
-			shutdown(tech_pvt->audiopipe[0], 2);
-			close(tech_pvt->audiopipe[0]);
-			shutdown(tech_pvt->audiopipe[1], 2);
-			close(tech_pvt->audiopipe[1]);
-			shutdown(tech_pvt->GSMopenHandles.fdesc[0], 2);
-			close(tech_pvt->GSMopenHandles.fdesc[0]);
-			shutdown(tech_pvt->GSMopenHandles.fdesc[1], 2);
-			close(tech_pvt->GSMopenHandles.fdesc[1]);
-#endif /* WIN32 */
-		}
-
-	}
-
-	switch_event_free_subclass(MY_EVENT_INCOMING_SMS);
-
-	switch_safe_free(globals.dialplan);
-	switch_safe_free(globals.context);
-	switch_safe_free(globals.destination);
-	switch_safe_free(globals.codec_string);
-	switch_safe_free(globals.codec_rates_string);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-void *SWITCH_THREAD_FUNC gsmopen_do_gsmopenapi_thread(switch_thread_t * thread, void *obj)
-{
-	return gsmopen_do_gsmopenapi_thread_func(obj);
-}
-
-int dtmf_received(private_t * tech_pvt, char *value)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	channel = switch_core_session_get_channel(session);
-
-	if (channel) {
-
-		if (!switch_channel_test_flag(channel, CF_BRIDGED)) {
-
-			switch_dtmf_t dtmf = { (char) value[0], switch_core_default_dtmf_duration(0) };
-			DEBUGA_GSMOPEN("received DTMF %c on channel %s\n", GSMOPEN_P_LOG, dtmf.digit, switch_channel_get_name(channel));
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			//FIXME: why sometimes DTMFs from here do not seems to be get by FS?
-			switch_channel_queue_dtmf(channel, &dtmf);
-			switch_set_flag(tech_pvt, TFLAG_DTMF);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-		} else {
-			DEBUGA_GSMOPEN
-				("received a DTMF on channel %s, but we're BRIDGED, so let's NOT relay it out of band\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		}
-	} else {
-		WARNINGA("received %c DTMF, but no channel?\n", GSMOPEN_P_LOG, value[0]);
-	}
-	switch_core_session_rwunlock(session);
-
-	return 0;
-}
-
-int new_inbound_channel(private_t * tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	switch_assert(tech_pvt != NULL);
-	tech_pvt->ib_calls++;
-	if ((session = switch_core_session_request(gsmopen_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) != 0) {
-		DEBUGA_GSMOPEN("2 SESSION_REQUEST %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(session));
-		switch_core_session_add_stream(session, NULL);
-		channel = switch_core_session_get_channel(session);
-		if (!channel) {
-			ERRORA("Doh! no channel?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(&session);
-			return 0;
-		}
-		if (gsmopen_tech_init(tech_pvt, session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Doh! no tech_init?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(&session);
-			return 0;
-		}
-
-		if ((tech_pvt->caller_profile =
-			 switch_caller_profile_new(switch_core_session_get_pool(session), "gsmopen",
-									   tech_pvt->dialplan, tech_pvt->callid_name,
-									   tech_pvt->callid_number, NULL, NULL, NULL, NULL, "mod_gsmopen", tech_pvt->context, tech_pvt->destination)) != 0) {
-			char name[128];
-			//switch_snprintf(name, sizeof(name), "gsmopen/%s/%s", tech_pvt->name, tech_pvt->caller_profile->destination_number);
-			switch_snprintf(name, sizeof(name), "gsmopen/%s", tech_pvt->name);
-			switch_channel_set_name(channel, name);
-			switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
-		}
-		switch_channel_set_state(channel, CS_INIT);
-		if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Error spawning thread\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(&session);
-			return 0;
-		}
-	}
-	if (channel) {
-		//switch_channel_mark_answered(channel);
-	}
-
-	DEBUGA_GSMOPEN("new_inbound_channel\n", GSMOPEN_P_LOG);
-
-	return 0;
-}
-
-int remote_party_is_ringing(private_t * tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	} else {
-		ERRORA("No session???\n", GSMOPEN_P_LOG);
-		goto done;
-	}
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-	} else {
-		ERRORA("No session???\n", GSMOPEN_P_LOG);
-		goto done;
-	}
-	if (channel) {
-		switch_channel_mark_ring_ready(channel);
-		DEBUGA_GSMOPEN("gsmopen_call: REMOTE PARTY RINGING\n", GSMOPEN_P_LOG);
-	} else {
-		ERRORA("No channel???\n", GSMOPEN_P_LOG);
-	}
-
-	switch_core_session_rwunlock(session);
-
-  done:
-	return 0;
-}
-
-int remote_party_is_early_media(private_t * tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	} else {
-		ERRORA("No session???\n\n\n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-		goto done;
-	}
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-		switch_core_session_add_stream(session, NULL);
-	} else {
-		ERRORA("No session???\n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-		goto done;
-	}
-	if (channel) {
-		switch_channel_mark_pre_answered(channel);
-		DEBUGA_GSMOPEN("gsmopen_call: REMOTE PARTY EARLY MEDIA\n", GSMOPEN_P_LOG);
-	} else {
-		ERRORA("No channel???\n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-	}
-
-	switch_core_session_rwunlock(session);
-
-  done:
-	return 0;
-}
-
-int outbound_channel_answered(private_t * tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	} else {
-		ERRORA("No session???\n", GSMOPEN_P_LOG);
-		goto done;
-	}
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-	} else {
-		ERRORA("No channel???\n", GSMOPEN_P_LOG);
-		goto done;
-	}
-	if (channel) {
-		switch_channel_mark_answered(channel);
-		tech_pvt->phone_callflow = GSMOPEN_STATE_UP;
-		tech_pvt->interface_state = GSMOPEN_STATE_UP;
-		//DEBUGA_GSMOPEN("gsmopen_call: %s, answered\n", GSMOPEN_P_LOG, id);
-	} else {
-		ERRORA("No channel???\n", GSMOPEN_P_LOG);
-	}
-
-	switch_core_session_rwunlock(session);
-
-  done:
-	DEBUGA_GSMOPEN("outbound_channel_answered!\n", GSMOPEN_P_LOG);
-
-	return 0;
-}
-
-private_t *find_available_gsmopen_interface_rr(private_t * tech_pvt_calling)
-{
-	private_t *tech_pvt = NULL;
-	int i;
-	//int num_interfaces = GSMOPEN_MAX_INTERFACES; 
-	//int num_interfaces = globals.real_interfaces;
-
-	switch_mutex_lock(globals.mutex);
-
-	/* Fact is the real interface start from 1 */
-	//XXX no, is just a convention, but you can have it start from 0. I do not, for aestetic reasons :-)  
-	//if (globals.next_interface == 0) globals.next_interface = 1;
-
-	for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-		int interface_id;
-
-		interface_id = globals.next_interface;
-		//interface_id = interface_id < GSMOPEN_MAX_INTERFACES ? interface_id : interface_id - GSMOPEN_MAX_INTERFACES + 1;
-		globals.next_interface = interface_id + 1 < GSMOPEN_MAX_INTERFACES ? interface_id + 1 : 0;
-
-		if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
-			int gsmopen_state = 0;
-
-			tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-			gsmopen_state = tech_pvt->interface_state;
-			DEBUGA_GSMOPEN("gsmopen interface: %d, name: %s, state: %d\n", GSMOPEN_P_LOG, interface_id, globals.GSMOPEN_INTERFACES[interface_id].name,
-						   gsmopen_state);
-			if ((tech_pvt_calling ? strcmp(tech_pvt->gsmopen_user, tech_pvt_calling->gsmopen_user) : 1)
-				&& (GSMOPEN_STATE_DOWN == gsmopen_state || 0 == gsmopen_state) && (tech_pvt->phone_callflow == CALLFLOW_STATUS_FINISHED
-																				   || 0 == tech_pvt->phone_callflow)) {
-				DEBUGA_GSMOPEN("returning as available gsmopen interface name: %s, state: %d callflow: %d\n", GSMOPEN_P_LOG, tech_pvt->name, gsmopen_state,
-							   tech_pvt->phone_callflow);
-				/*set to Dialing state to avoid other thread fint it, don't know if it is safe */
-				//XXX no, it's not safe 
-				if (tech_pvt_calling == NULL) {
-					tech_pvt->interface_state = GSMOPEN_STATE_SELECTED;
-				}
-
-				switch_mutex_unlock(globals.mutex);
-				return tech_pvt;
-			}
-		}						// else {
-		//DEBUGA_GSMOPEN("GSM interface: %d blank!! A hole here means we cannot hunt the last interface.\n", GSMOPEN_P_LOG, interface_id);
-		//}
-	}
-
-	switch_mutex_unlock(globals.mutex);
-	return NULL;
-}
-
-#if 1
-SWITCH_STANDARD_API(gsm_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-
-	if (globals.gsm_console)
-		stream->write_function(stream, "gsm console is: |||%s|||\n", globals.gsm_console->name);
-	else
-		stream->write_function(stream, "gsm console is NOT yet assigned\n");
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc || !argv[0]) {
-		stream->write_function(stream, "%s", GSM_SYNTAX);
-		goto end;
-	}
-
-	if (!strcasecmp(argv[0], "list")) {
-		int i;
-		char next_flag_char = ' ';
-
-		stream->write_function(stream, "F ID\t    Name    \tIB (F/T)    OB (F/T)\tState\tCallFlw\t\tUUID\n");
-		stream->write_function(stream, "= ====\t  ========  \t=======     =======\t======\t============\t======\n");
-
-		for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-			next_flag_char = i == globals.next_interface ? '*' : ' ';
-
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)) {
-				stream->write_function(stream,
-									   "%c %d\t[%s]\t%3ld/%ld\t%6ld/%ld\t%s\t%s\t%s\n",
-									   next_flag_char,
-									   i, globals.GSMOPEN_INTERFACES[i].name,
-									   globals.GSMOPEN_INTERFACES[i].ib_failed_calls,
-									   globals.GSMOPEN_INTERFACES[i].ib_calls,
-									   globals.GSMOPEN_INTERFACES[i].ob_failed_calls,
-									   globals.GSMOPEN_INTERFACES[i].ob_calls,
-									   interface_status[globals.GSMOPEN_INTERFACES[i].interface_state],
-									   phone_callflow[globals.GSMOPEN_INTERFACES[i].phone_callflow], globals.GSMOPEN_INTERFACES[i].session_uuid_str);
-			} else if (argc > 1 && !strcasecmp(argv[1], "full")) {
-				stream->write_function(stream, "%c\t%d\n", next_flag_char, i);
-			}
-
-		}
-		stream->write_function(stream, "\nTotal: %d\n", globals.real_interfaces - 1);
-
-	} else if (!strcasecmp(argv[0], "console")) {
-		int i;
-		int found = 0;
-
-		if (argc == 2) {
-			for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-				/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-				if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[1], strlen(argv[1])) == 0)) {
-					globals.gsm_console = &globals.GSMOPEN_INTERFACES[i];
-					stream->write_function(stream, "gsm console is now: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", i,
-										   globals.GSMOPEN_INTERFACES[i].name);
-					stream->write_function(stream, "gsm console is: |||%s|||\n", globals.gsm_console->name);
-					found = 1;
-					break;
-				}
-
-			}
-			if (!found)
-				stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[1]);
-		} else {
-
-			stream->write_function(stream, "-ERR Usage: gsm console interface_name\n");
-			goto end;
-		}
-
-	} else if (!strcasecmp(argv[0], "ciapalino")) {
-
-/* BEGIN: Changes heres */
-	} else if (!strcasecmp(argv[0], "reload")) {
-		if (load_config(SOFT_RELOAD) != SWITCH_STATUS_SUCCESS) {
-			stream->write_function(stream, "gsm reload failed\n");
-		} else {
-			stream->write_function(stream, "gsm reload success\n");
-		}
-	} else if (!strcasecmp(argv[0], "remove")) {
-		if (argc == 2) {
-			if (remove_interface(argv[1]) == SWITCH_STATUS_SUCCESS) {
-				if (interface_exists(argv[1]) == SWITCH_STATUS_SUCCESS) {
-					stream->write_function(stream, "gsm remove '%s' failed\n", argv[1]);
-				} else {
-					stream->write_function(stream, "gsm remove '%s' success\n", argv[1]);
-				}
-			}
-		} else {
-			stream->write_function(stream, "-ERR Usage: gsm remove interface_name\n");
-			goto end;
-		}
-/* END: Changes heres */
-
-	} else {
-		if (globals.gsm_console)
-			gsmopen_serial_write_AT_noack(globals.gsm_console, (char *) cmd);
-		else
-			stream->write_function(stream, "gsm console is NOT yet assigned\n");
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(gsmopen_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_SYNTAX);
-		goto end;
-	}
-
-	if (argc < 2) {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_SYNTAX);
-		goto end;
-	}
-
-	if (argv[0]) {
-		int i;
-		int found = 0;
-
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				stream->write_function(stream, "Using interface: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", i, globals.GSMOPEN_INTERFACES[i].name);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
-			switch_safe_free(mycmd);
-
-			return SWITCH_STATUS_SUCCESS;
-		} else {
-			gsmopen_serial_write_AT_noack(tech_pvt, (char *) &cmd[strlen(argv[0]) + 1]);
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_SYNTAX);
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-#endif //0
-SWITCH_STANDARD_API(gsmopen_dump_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-	char value[512];
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_DUMP_SYNTAX);
-		goto end;
-	}
-	if (argc == 1) {
-		int i;
-		int found = 0;
-
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				//stream->write_function(stream, "Using interface: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", i, globals.GSMOPEN_INTERFACES[i].name);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found && (strcmp("list", argv[0]) == 0)) {
-			int i;
-			stream->write_function(stream, "gsmopen_dump LIST\n\n");
-			for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-				if (strlen(globals.GSMOPEN_INTERFACES[i].name)) {
-					stream->write_function(stream, "dumping interface '%s'\n\n", globals.GSMOPEN_INTERFACES[i].name);
-					tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-
-
-					stream->write_function(stream, "interface_name = %s\n", tech_pvt->name);
-					stream->write_function(stream, "interface_id = %s\n", tech_pvt->id);
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->active);
-					stream->write_function(stream, "active = %s\n", value);
-					if(!tech_pvt->network_creg_not_supported){
-						snprintf(value, sizeof(value)-1, "%d", tech_pvt->not_registered);
-						stream->write_function(stream, "not_registered = %s\n", value);
-						snprintf(value, sizeof(value)-1, "%d", tech_pvt->home_network_registered);
-						stream->write_function(stream, "home_network_registered = %s\n", value);
-						snprintf(value, sizeof(value)-1, "%d", tech_pvt->roaming_registered);
-						stream->write_function(stream, "roaming_registered = %s\n", value);
-					}else{
-						stream->write_function(stream, "not_registered = %s\n", "N/A");
-						stream->write_function(stream, "home_network_registered = %s\n", "N/A");
-						stream->write_function(stream, "roaming_registered = %s\n", "N/A");
-					}
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->got_signal);
-					stream->write_function(stream, "got_signal = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->running);
-					stream->write_function(stream, "running = %s\n", value);
-					stream->write_function(stream, "imei = %s\n", tech_pvt->imei);
-					stream->write_function(stream, "imsi = %s\n", tech_pvt->imsi);
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->controldev_dead);
-					stream->write_function(stream, "controldev_dead = %s\n", value);
-					stream->write_function(stream, "controldevice_name = %s\n", tech_pvt->controldevice_name);
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->no_sound);
-					stream->write_function(stream, "no_sound = %s\n", value);
-#ifdef GSMOPEN_ALSA
-					stream->write_function(stream, "alsacname = %s\n", tech_pvt->alsacname);
-					stream->write_function(stream, "alsapname = %s\n", tech_pvt->alsapname);
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiocindex);
-					stream->write_function(stream, "portaudiocindex = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiopindex);
-					stream->write_function(stream, "portaudiopindex = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->speexecho);
-					stream->write_function(stream, "speexecho = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->speexpreprocess);
-					stream->write_function(stream, "speexpreprocess = %s\n", value);
-#endif// GSMOPEN_PORTAUDIO
-					snprintf(value, sizeof(value)-1, "%f", tech_pvt->playback_boost);
-					stream->write_function(stream, "playback_boost = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%f", tech_pvt->capture_boost);
-					stream->write_function(stream, "capture_boost = %s\n", value);
-					stream->write_function(stream, "dialplan = %s\n", tech_pvt->dialplan);
-					stream->write_function(stream, "context = %s\n", tech_pvt->context);
-					stream->write_function(stream, "destination = %s\n", tech_pvt->destination);
-					snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ib_calls);
-					stream->write_function(stream, "ib_calls = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ob_calls);
-					stream->write_function(stream, "ob_calls = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ib_failed_calls);
-					stream->write_function(stream, "ib_failed_calls = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ob_failed_calls);
-					stream->write_function(stream, "ob_failed_calls = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->interface_state);
-					stream->write_function(stream, "interface_state = %s\n", value);
-					snprintf(value, sizeof(value)-1, "%d", tech_pvt->phone_callflow);
-					stream->write_function(stream, "phone_callflow = %s\n", value);
-					stream->write_function(stream, "session_uuid_str = %s\n", tech_pvt->session_uuid_str);
-					stream->write_function(stream, "\n");
-
-					dump_event(tech_pvt);
-				}
-
-			}
-
-		} else if(found){
-			stream->write_function(stream, "dumping interface '%s'\n\n", argv[0]);
-			tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-
-
-			stream->write_function(stream, "interface_name = %s\n", tech_pvt->name);
-			stream->write_function(stream, "interface_id = %s\n", tech_pvt->id);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->active);
-			stream->write_function(stream, "active = %s\n", value);
-			if(!tech_pvt->network_creg_not_supported){
-				snprintf(value, sizeof(value)-1, "%d", tech_pvt->not_registered);
-				stream->write_function(stream, "not_registered = %s\n", value);
-				snprintf(value, sizeof(value)-1, "%d", tech_pvt->home_network_registered);
-				stream->write_function(stream, "home_network_registered = %s\n", value);
-				snprintf(value, sizeof(value)-1, "%d", tech_pvt->roaming_registered);
-				stream->write_function(stream, "roaming_registered = %s\n", value);
-			}else{
-				stream->write_function(stream, "not_registered = %s\n", "N/A");
-				stream->write_function(stream, "home_network_registered = %s\n", "N/A");
-				stream->write_function(stream, "roaming_registered = %s\n", "N/A");
-			}
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->got_signal);
-			stream->write_function(stream, "got_signal = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->running);
-			stream->write_function(stream, "running = %s\n", value);
-			stream->write_function(stream, "imei = %s\n", tech_pvt->imei);
-			stream->write_function(stream, "imsi = %s\n", tech_pvt->imsi);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->controldev_dead);
-			stream->write_function(stream, "controldev_dead = %s\n", value);
-			stream->write_function(stream, "controldevice_name = %s\n", tech_pvt->controldevice_name);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->no_sound);
-			stream->write_function(stream, "no_sound = %s\n", value);
-#ifdef GSMOPEN_ALSA
-			stream->write_function(stream, "alsacname = %s\n", tech_pvt->alsacname);
-			stream->write_function(stream, "alsapname = %s\n", tech_pvt->alsapname);
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiocindex);
-			stream->write_function(stream, "portaudiocindex = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiopindex);
-			stream->write_function(stream, "portaudiopindex = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->speexecho);
-			stream->write_function(stream, "speexecho = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->speexpreprocess);
-			stream->write_function(stream, "speexpreprocess = %s\n", value);
-#endif// GSMOPEN_PORTAUDIO
-			snprintf(value, sizeof(value)-1, "%f", tech_pvt->playback_boost);
-			stream->write_function(stream, "playback_boost = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%f", tech_pvt->capture_boost);
-			stream->write_function(stream, "capture_boost = %s\n", value);
-			stream->write_function(stream, "dialplan = %s\n", tech_pvt->dialplan);
-			stream->write_function(stream, "context = %s\n", tech_pvt->context);
-			stream->write_function(stream, "destination = %s\n", tech_pvt->destination);
-			snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ib_calls);
-			stream->write_function(stream, "ib_calls = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ob_calls);
-			stream->write_function(stream, "ob_calls = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ib_failed_calls);
-			stream->write_function(stream, "ib_failed_calls = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ob_failed_calls);
-			stream->write_function(stream, "ob_failed_calls = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->interface_state);
-			stream->write_function(stream, "interface_state = %s\n", value);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->phone_callflow);
-			stream->write_function(stream, "phone_callflow = %s\n", value);
-			stream->write_function(stream, "session_uuid_str = %s\n", tech_pvt->session_uuid_str);
-			stream->write_function(stream, "\n");
-
-			dump_event(tech_pvt);
-		} else{
-			stream->write_function(stream, "interface '%s' was not found\n", argv[0]);
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_DUMP_SYNTAX);
-	}
-end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-SWITCH_STANDARD_API(gsmopen_boost_audio_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	//private_t *tech_pvt;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (argc == 1 || argc==3) {
-		int i;
-		int found = 0;
-
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				//tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				stream->write_function(stream, "Using interface: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", i, globals.GSMOPEN_INTERFACES[i].name);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
-
-		} else {
-			if (argc == 1) {
-				stream->write_function(stream,"[%s] capture boost is %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].capture_boost);
-				stream->write_function(stream,"[%s] playback boost is %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].playback_boost);
-				stream->write_function(stream, "%s usage: %s", argv[0], GSMOPEN_BOOST_AUDIO_SYNTAX);
-				goto end;
-			} else if ((strncmp("play", argv[1], strlen(argv[1])) == 0)) {
-				if (switch_is_number(argv[2])) {
-					stream->write_function(stream,"[%s] playback boost was %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].playback_boost);
-					gsmopen_store_boost(argv[2], &globals.GSMOPEN_INTERFACES[i].playback_boost);	//FIXME
-					stream->write_function(stream,"[%s] playback boost is now %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].playback_boost);
-				}
-			}else if ((strncmp("capt", argv[1], strlen(argv[1])) == 0)) {
-				if (switch_is_number(argv[2])) {
-					stream->write_function(stream,"[%s] capture boost was %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].capture_boost);
-					gsmopen_store_boost(argv[2], &globals.GSMOPEN_INTERFACES[i].capture_boost);	//FIXME
-					stream->write_function(stream,"[%s] capture boost is now %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].capture_boost);
-				}
-			} else {
-				stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_BOOST_AUDIO_SYNTAX);
-			}
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_BOOST_AUDIO_SYNTAX);
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-#if 0
-int gsmopen_transfer(private_t * tech_pvt, char *id, char *value)
-{
-	char msg_to_gsmopen[1024];
-	int i;
-	int found = 0;
-	private_t *giovatech;
-	struct timeval timenow;
-
-	switch_mutex_lock(globals.mutex);
-
-	gettimeofday(&timenow, NULL);
-	for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-		if (strlen(globals.GSMOPEN_INTERFACES[i].name)) {
-
-			giovatech = &globals.GSMOPEN_INTERFACES[i];
-			//NOTICA("gsmopen interface: %d, name: %s, state: %d, value=%s, giovatech->callid_number=%s, giovatech->gsmopen_user=%s\n", GSMOPEN_P_LOG, i, giovatech->name, giovatech->interface_state, value, giovatech->callid_number, giovatech->gsmopen_user);
-			//FIXME check a timestamp here
-			if (strlen(giovatech->gsmopen_call_id) && (giovatech->interface_state != GSMOPEN_STATE_DOWN) && (!strcmp(giovatech->gsmopen_user, tech_pvt->gsmopen_user)) && (!strcmp(giovatech->callid_number, value)) && ((((timenow.tv_sec - giovatech->answer_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->answer_time.tv_usec)) < 500000)) {	//0.5sec
-				found = 1;
-				DEBUGA_GSMOPEN
-					("FOUND  (name=%s, giovatech->interface_state=%d != GSMOPEN_STATE_DOWN) && (giovatech->gsmopen_user=%s == tech_pvt->gsmopen_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
-					 GSMOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->gsmopen_user, tech_pvt->gsmopen_user, giovatech->callid_number,
-					 value)
-					break;
-			}
-		}
-	}
-
-	if (found) {
-		//tech_pvt->callid_number[0]='\0';
-		//sprintf(msg_to_gsmopen, "ALTER CALL %s END HANGUP", id);
-		//gsmopen_signaling_write(tech_pvt, msg_to_gsmopen);
-		switch_mutex_unlock(globals.mutex);
-		return 0;
-	}
-	DEBUGA_GSMOPEN("NOT FOUND\n", GSMOPEN_P_LOG);
-
-	if (!tech_pvt || !tech_pvt->gsmopen_call_id || !strlen(tech_pvt->gsmopen_call_id)) {
-		/* we are not inside an active call */
-		DEBUGA_GSMOPEN("We're NO MORE in a call now %s\n", GSMOPEN_P_LOG, (tech_pvt && tech_pvt->gsmopen_call_id) ? tech_pvt->gsmopen_call_id : "");
-		switch_mutex_unlock(globals.mutex);
-
-	} else {
-
-		/* we're owned, we're in a call, let's try to transfer */
-		/************************** TODO
-		  Checking here if it is possible to transfer this call to Test2
-		  -> GET CALL 288 CAN_TRANSFER Test2
-		  <- CALL 288 CAN_TRANSFER test2 TRUE
-		 **********************************/
-
-		private_t *available_gsmopen_interface = NULL;
-
-		gettimeofday(&timenow, NULL);
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)) {
-
-				giovatech = &globals.GSMOPEN_INTERFACES[i];
-				//NOTICA("gsmopen interface: %d, name: %s, state: %d, value=%s, giovatech->callid_number=%s, giovatech->gsmopen_user=%s\n", GSMOPEN_P_LOG, i, giovatech->name, giovatech->interface_state, value, giovatech->callid_number, giovatech->gsmopen_user);
-				//FIXME check a timestamp here
-				if (strlen(giovatech->gsmopen_transfer_call_id) && (giovatech->interface_state != GSMOPEN_STATE_DOWN) && (!strcmp(giovatech->gsmopen_user, tech_pvt->gsmopen_user)) && (!strcmp(giovatech->transfer_callid_number, value)) && ((((timenow.tv_sec - giovatech->transfer_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->transfer_time.tv_usec)) < 1000000)) {	//1.0 sec
-					found = 1;
-					DEBUGA_GSMOPEN
-						("FOUND  (name=%s, giovatech->interface_state=%d != GSMOPEN_STATE_DOWN) && (giovatech->gsmopen_user=%s == tech_pvt->gsmopen_user=%s) && (giovatech->transfer_callid_number=%s == value=%s)\n",
-						 GSMOPEN_P_LOG, giovatech->name, giovatech->interface_state,
-						 giovatech->gsmopen_user, tech_pvt->gsmopen_user, giovatech->transfer_callid_number, value)
-						break;
-				}
-			}
-		}
-
-		if (found) {
-			//tech_pvt->callid_number[0]='\0';
-			//sprintf(msg_to_gsmopen, "ALTER CALL %s END HANGUP", id);
-			//gsmopen_signaling_write(tech_pvt, msg_to_gsmopen);
-			switch_mutex_unlock(globals.mutex);
-			return 0;
-		}
-		DEBUGA_GSMOPEN("NOT FOUND\n", GSMOPEN_P_LOG);
-
-		available_gsmopen_interface = find_available_gsmopen_interface_rr(tech_pvt);
-		if (available_gsmopen_interface) {
-			/* there is a gsmopen interface idle, let's transfer the call to it */
-
-			//FIXME write a timestamp here
-			gettimeofday(&tech_pvt->transfer_time, NULL);
-			switch_copy_string(tech_pvt->gsmopen_transfer_call_id, id, sizeof(tech_pvt->gsmopen_transfer_call_id) - 1);
-
-			switch_copy_string(tech_pvt->transfer_callid_number, value, sizeof(tech_pvt->transfer_callid_number) - 1);
-
-			DEBUGA_GSMOPEN
-				("Let's transfer the gsmopen_call %s to %s interface (with gsmopen_user: %s), because we are already in a gsmopen call(%s)\n",
-				 GSMOPEN_P_LOG, tech_pvt->gsmopen_call_id, available_gsmopen_interface->name, available_gsmopen_interface->gsmopen_user, id);
-
-			//FIXME why this? the inbound call will come, eventually, on that other interface
-			//available_gsmopen_interface->ib_calls++;
-
-			sprintf(msg_to_gsmopen, "ALTER CALL %s TRANSFER %s", id, available_gsmopen_interface->gsmopen_user);
-			//gsmopen_signaling_write(tech_pvt, msg_to_gsmopen);
-			if (tech_pvt->interface_state == GSMOPEN_STATE_SELECTED) {
-				tech_pvt->interface_state = GSMOPEN_STATE_IDLE;	//we marked it GSMOPEN_STATE_SELECTED just in case it has to make an outbound call
-			}
-		} else {
-			/* no gsmopen interfaces idle, do nothing */
-			DEBUGA_GSMOPEN
-				("Not answering the gsmopen_call %s, because we are already in a gsmopen call(%s) and not transferring, because no other gsmopen interfaces are available\n",
-				 GSMOPEN_P_LOG, id, tech_pvt->gsmopen_call_id);
-			sprintf(msg_to_gsmopen, "ALTER CALL %s END HANGUP", id);
-			//gsmopen_signaling_write(tech_pvt, msg_to_gsmopen);
-		}
-		switch_sleep(10000);
-		DEBUGA_GSMOPEN
-			("We have NOT answered a GSM RING from gsmopen_call %s, because we are already in a gsmopen call (%s)\n",
-			 GSMOPEN_P_LOG, id, tech_pvt->gsmopen_call_id);
-
-		switch_mutex_unlock(globals.mutex);
-	}
-	return 0;
-}
-#endif //0
-
-void *gsmopen_do_gsmopenapi_thread_func(void *obj)
-{
-
-	private_t *tech_pvt = (private_t *) obj;
-	time_t now_timestamp;
-
-	//if (gsmopen_present(GSMopenHandles)) 
-		while (running && tech_pvt->running) {
-			int res;
-			//gsmopen_sleep(1000000); //1 sec
-			//DEBUGA_GSMOPEN("ciao!\n", GSMOPEN_P_LOG);
-			res = gsmopen_serial_read(tech_pvt);
-			if (res == -1) {	//manage the graceful interface shutdown
-				tech_pvt->controldev_dead = 1;
-				close(tech_pvt->controldevfd);
-				ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-				tech_pvt->running=0;
-				alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-				tech_pvt->active=0;
-				tech_pvt->name[0]='\0';
-				switch_sleep(1000000);
-			} else if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL && tech_pvt->interface_state == GSMOPEN_STATE_RING
-					   && tech_pvt->phone_callflow != CALLFLOW_CALL_HANGUP_REQUESTED) {
-				//WARNINGA("INCOMING RING\n", GSMOPEN_P_LOG);
-
-				gsmopen_ring(tech_pvt);
-
-				//FIXME gsmopen_answer(tech_pvt);
-				//new_inbound_channel(tech_pvt);
-				//FIXME if (!gsmopen_new(p, AST_STATE_RING, tech_pvt->context)) {
-				//FIXME ERRORA("gsmopen_new failed! BAD BAD BAD\n", GSMOPEN_P_LOG);
-				//FIXME }
-
-
-			} else if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL && tech_pvt->interface_state == GSMOPEN_STATE_DIALING) {
-				WARNINGA("WE'RE DIALING, let's take the earlymedia\n", GSMOPEN_P_LOG);
-				tech_pvt->interface_state = CALLFLOW_STATUS_EARLYMEDIA;
-				remote_party_is_early_media(tech_pvt);
-				//new_inbound_channel(tech_pvt);
-				//FIXME if (!gsmopen_new(p, AST_STATE_RING, tech_pvt->context)) {
-				//FIXME ERRORA("gsmopen_new failed! BAD BAD BAD\n", GSMOPEN_P_LOG);
-				//FIXME }
-
-
-
-
-			} else if (tech_pvt->interface_state == CALLFLOW_CALL_REMOTEANSWER) {
-				WARNINGA("REMOTE PARTY ANSWERED\n", GSMOPEN_P_LOG);
-				outbound_channel_answered(tech_pvt);
-				//new_inbound_channel(tech_pvt);
-				//FIXME if (!gsmopen_new(p, AST_STATE_RING, tech_pvt->context)) {
-				//FIXME ERRORA("gsmopen_new failed! BAD BAD BAD\n", GSMOPEN_P_LOG);
-				//FIXME }
-			}
-			switch_sleep(100);		//give other threads a chance
-			time(&now_timestamp);
-
-			if ((now_timestamp - tech_pvt->gsmopen_serial_synced_timestamp) > tech_pvt->gsmopen_serial_sync_period) {	//TODO find a sensible period. 5min? in config?
-				gsmopen_serial_sync(tech_pvt);
-				gsmopen_serial_getstatus_AT(tech_pvt);
-			}
-		}
-	DEBUGA_GSMOPEN("EXIT\n", GSMOPEN_P_LOG);
-	//running = 0;
-	return NULL;
-
-}
-
-
-SWITCH_STANDARD_API(sendsms_function)
-{
-	char *mycmd = NULL, *argv[3] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
-		goto end;
-	}
-
-	if (argc < 3) {
-		stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
-		goto end;
-	}
-
-	if (argv[0]) {
-		int i;
-		int found = 0;
-
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				stream->write_function(stream, "Trying to send your SMS: interface=%s, dest=%s, text=%s\n", argv[0], argv[1], argv[2]);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
-			switch_safe_free(mycmd);
-
-			return SWITCH_STATUS_SUCCESS;
-		} else {
-			//gsmopen_sendsms(tech_pvt, (char *) argv[1], (char *) argv[2]);
-			NOTICA("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, type=NULL, hint=%s)\n", GSMOPEN_P_LOG, GSMOPEN_CHAT_PROTO, tech_pvt->name,
-				   argv[1], "SIMPLE MESSAGE", switch_str_nil(argv[2]), tech_pvt->name);
-
-			compat_chat_send(GSMOPEN_CHAT_PROTO, tech_pvt->name, argv[1], "SIMPLE MESSAGE", switch_str_nil(argv[2]), NULL, tech_pvt->name);
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-int dump_event_full(private_t * tech_pvt, int is_alarm, int alarm_code, const char *alarm_message)
-{
-	switch_event_t *event;
-	char value[512];
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-	switch_status_t status;
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	if(session){
-		channel = switch_core_session_get_channel(session);
-	}
-
-	if (is_alarm){
-		ERRORA("ALARM on interface %s: \n", GSMOPEN_P_LOG, tech_pvt->name );
-		status = switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_ALARM);
-	}else{
-		DEBUGA_GSMOPEN("DUMP on interface %s: \n", GSMOPEN_P_LOG, tech_pvt->name );
-		status = switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_DUMP);
-	}
-	if (status == SWITCH_STATUS_SUCCESS) {
-		if (is_alarm){
-			snprintf(value, sizeof(value)-1, "%d", alarm_code);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm_code", value);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm_message", alarm_message);
-		}
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_name", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_id", tech_pvt->id);
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->active);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "active", value);
-		if(!tech_pvt->network_creg_not_supported){
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->not_registered);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "not_registered", value);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->home_network_registered);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "home_network_registered", value);
-			snprintf(value, sizeof(value)-1, "%d", tech_pvt->roaming_registered);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "roaming_registered", value);
-		}else{
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "not_registered", "N/A");
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "home_network_registered", "N/A");
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "roaming_registered", "N/A");
-		}
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->got_signal);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "got_signal", value);
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->running);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "running", value);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "imei", tech_pvt->imei);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "imsi", tech_pvt->imsi);
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->controldev_dead);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldev_dead", value);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldevice_name", tech_pvt->controldevice_name);
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->no_sound);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "no_sound", value);
-#ifdef GSMOPEN_ALSA
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alsacname", tech_pvt->alsacname);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alsapname", tech_pvt->alsapname);
-#endif// GSMOPEN_ALSA
-#ifdef GSMOPEN_PORTAUDIO
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiocindex);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "portaudiocindex", value);
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiopindex);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "portaudiopindex", value);
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->speexecho);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "speexecho", value);
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->speexpreprocess);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "speexpreprocess", value);
-#endif// GSMOPEN_PORTAUDIO
-		snprintf(value, sizeof(value)-1, "%f", tech_pvt->playback_boost);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "playback_boost", value);
-		snprintf(value, sizeof(value)-1, "%f", tech_pvt->capture_boost);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "capture_boost", value);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialplan", tech_pvt->dialplan);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "context", tech_pvt->context);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "destination", tech_pvt->destination);
-		snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ib_calls);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "ib_calls", value);
-		snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ob_calls);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "ob_calls", value);
-		snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ib_failed_calls);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "ib_failed_calls", value);
-		snprintf(value, sizeof(value)-1, "%lu", tech_pvt->ob_failed_calls);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "ob_failed_calls", value);
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->interface_state);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_state", value);
-		snprintf(value, sizeof(value)-1, "%d", tech_pvt->phone_callflow);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "phone_callflow", value);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "session_uuid_str", tech_pvt->session_uuid_str);
-		if (strlen(tech_pvt->session_uuid_str)) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "true");
-		} else {				//no session
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "false");
-		}
-		if (channel) {
-			switch_channel_event_set_data(channel, event);
-		}
-		switch_event_fire(&event);
-	} else {
-		ERRORA("cannot create event on interface %s. WHY?????\n", GSMOPEN_P_LOG, tech_pvt->name);
-	}
-
-	if (session) {
-		switch_core_session_rwunlock(session);
-	}
-	return 0;
-}
-
-int dump_event(private_t * tech_pvt)
-{
-	return dump_event_full(tech_pvt, 0, 0, NULL);
-}
-
-
-int alarm_event(private_t * tech_pvt, int alarm_code, const char *alarm_message)
-{
-	return dump_event_full(tech_pvt, 1, alarm_code, alarm_message);
-}
-
-int sms_incoming(private_t * tech_pvt)
-{
-	switch_event_t *event;
-	switch_core_session_t *session = NULL;
-	int event_sent_to_esl = 0;
-
-	//DEBUGA_GSMOPEN("received SMS on interface %s: %s\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_message);
-	DEBUGA_GSMOPEN("received SMS on interface %s: DATE=%s, SENDER=%s, BODY=%s|\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_date, tech_pvt->sms_sender,
-				   tech_pvt->sms_body);
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	}
-	if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", GSMOPEN_CHAT_PROTO);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", tech_pvt->name);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->chatmessages[which].from_dispname);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->sms_sender);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "date", tech_pvt->sms_date);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "userdataheader", tech_pvt->sms_userdataheader);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "datacodingscheme", tech_pvt->sms_datacodingscheme);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "servicecentreaddress", tech_pvt->sms_servicecentreaddress);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "messagetype", "%d", tech_pvt->sms_messagetype);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "chatname", tech_pvt->chatmessages[which].chatname);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "id", tech_pvt->chatmessages[which].id);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE");
-		switch_event_add_body(event, "%s\n", tech_pvt->sms_body);
-		if (session) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "true");
-			if (switch_core_session_queue_event(session, &event) != SWITCH_STATUS_SUCCESS) {
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true");
-				switch_event_fire(&event);
-			}
-		} else {				//no session
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "false");
-			switch_event_fire(&event);
-			event_sent_to_esl = 1;
-		}
-
-	} else {
-		ERRORA("cannot create event on interface %s. WHY?????\n", GSMOPEN_P_LOG, tech_pvt->name);
-	}
-
-	if (!event_sent_to_esl) {
-
-		if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", GSMOPEN_CHAT_PROTO);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", tech_pvt->name);
-			//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->chatmessages[which].from_dispname);
-			//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->chatmessages[which].from_handle);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->sms_sender);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "date", tech_pvt->sms_date);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "datacodingscheme", tech_pvt->sms_datacodingscheme);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "servicecentreaddress", tech_pvt->sms_servicecentreaddress);
-			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "messagetype", "%d", tech_pvt->sms_messagetype);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE");
-			//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "chatname", tech_pvt->chatmessages[which].chatname);
-			//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "id", tech_pvt->chatmessages[which].id);
-			switch_event_add_body(event, "%s\n", tech_pvt->sms_body);
-			if (session) {
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "true");
-			} else {			//no session
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "false");
-			}
-			switch_event_fire(&event);
-		} else {
-			ERRORA("cannot create event on interface %s. WHY?????\n", GSMOPEN_P_LOG, tech_pvt->name);
-		}
-	}
-
-	if (session) {
-		switch_core_session_rwunlock(session);
-	}
-	//memset(&tech_pvt->chatmessages[which], '\0', sizeof(&tech_pvt->chatmessages[which]) );
-	//memset(tech_pvt->sms_message, '\0', sizeof(tech_pvt->sms_message));
-	return 0;
-}
-
-
-#ifdef NOTDEF
-SWITCH_STANDARD_API(gsmopen_chat_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-	//int tried =0;
-	int i;
-	int found = 0;
-	//char skype_msg[1024];
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_CHAT_SYNTAX);
-		goto end;
-	}
-
-	if (argc < 3) {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_CHAT_SYNTAX);
-		goto end;
-	}
-
-	if (argv[0]) {
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				stream->write_function(stream, "Using interface: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", i, globals.GSMOPEN_INTERFACES[i].name);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
-			goto end;
-		} else {
-
-			//chat_send(const char *proto, const char *from, const char *to, const char *subject, const char *body, const char *type, const char *hint);
-			//chat_send(p*roto, const char *from, const char *to, const char *subject, const char *body, const char *type, const char *hint);
-			//chat_send(GSMOPEN_CHAT_PROTO, tech_pvt->skype_user, argv[1], "SIMPLE MESSAGE", switch_str_nil((char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1]), NULL, hint);
-
-			NOTICA("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, type=NULL, hint=%s)\n", GSMOPEN_P_LOG, GSMOPEN_CHAT_PROTO, tech_pvt->skype_user,
-				   argv[1], "SIMPLE MESSAGE", switch_str_nil((char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1]), tech_pvt->name);
-
-			chat_send(GSMOPEN_CHAT_PROTO, tech_pvt->skype_user, argv[1], "SIMPLE MESSAGE",
-					  switch_str_nil((char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1]), NULL, tech_pvt->name);
-
-			//NOTICA("TEXT is: %s\n", GSMOPEN_P_LOG, (char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1] );
-			//snprintf(skype_msg, sizeof(skype_msg), "CHAT CREATE %s", argv[1]);
-			//gsmopen_signaling_write(tech_pvt, skype_msg);
-			//switch_sleep(100);
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_CHAT_SYNTAX);
-		goto end;
-	}
-
-#ifdef NOTDEF
-
-	found = 0;
-
-	while (!found) {
-		for (i = 0; i < MAX_CHATS; i++) {
-			if (!strcmp(tech_pvt->chats[i].dialog_partner, argv[1])) {
-				snprintf(skype_msg, sizeof(skype_msg), "CHATMESSAGE %s %s", tech_pvt->chats[i].chatname,
-						 (char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1]);
-				gsmopen_signaling_write(tech_pvt, skype_msg);
-				found = 1;
-				break;
-			}
-		}
-		if (found) {
-			break;
-		}
-		if (tried > 1000) {
-			stream->write_function(stream, "ERROR: no chat with dialog_partner='%s' was found\n", argv[1]);
-			break;
-		}
-		switch_sleep(1000);
-	}
-#endif //NOTDEF
-
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-#endif // NOTDEF
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet expandtab:
- */
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/usb-cm-108-2.txt b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/usb-cm-108-2.txt
deleted file mode 100644
index 551f42bab6..0000000000
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/usb-cm-108-2.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-state.default {
-	control.1 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Mic Playback Switch'
-		value false
-	}
-	control.2 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 32'
-		iface MIXER
-		name 'Mic Playback Volume'
-		value 0
-	}
-	control.3 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Speaker Playback Switch'
-		value true
-	}
-	control.4 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 151'
-		iface MIXER
-		name 'Speaker Playback Volume'
-		value.0 6
-		value.1 6
-	}
-	control.5 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Mic Capture Switch'
-		value true
-	}
-	control.6 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 16'
-		iface MIXER
-		name 'Mic Capture Volume'
-		value 5
-	}
-	control.7 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Auto Gain Control'
-		value false
-	}
-}
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/Makefile b/src/mod/endpoints/mod_gsmopen/asterisk/Makefile
deleted file mode 100644
index 6aed86266e..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Asterisk -- A telephony toolkit for Linux.
-# 
-# Makefile for channel drivers
-#
-# Copyright (C) 1999-2005, Mark Spencer
-#
-# Mark Spencer <markster@digium.com>
-#
-# Edited By Belgarath <> Aug 28 2004
-# Added bare bones ultrasparc-linux support.
-#
-# This program is free software, distributed under the terms of
-# the GNU General Public License
-#
-
-#ASTERISK INCLUDE FILES
-#The directory that contains the Asterisk include files (eg: /usr/include or /usr/include/asterisk or /usr/src/asterisk/include or ...)
-#AST_INCLUDE_DIR=/usr/src/off_dev/asterisk-1.2.rev137401/include
-AST_INCLUDE_DIR=/usr/src/asterisk-1.4.27.1/include
-#AST_INCLUDE_DIR=/usr/src/asterisk-1.6.0.10/include
-
-#ASTERISK VERSION
-#Uncomment one of the following lines to match your Asterisk series
-#CFLAGS+=-DASTERISK_VERSION_1_2
-CFLAGS+=-DASTERISK_VERSION_1_4
-#CFLAGS+=-DASTERISK_VERSION_1_6_0
-
-CFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-CFLAGS+=-g3
-
-
-
-CFLAGS+=-I$(AST_INCLUDE_DIR) -I.
-CFLAGS+=-D_REENTRANT -D_GNU_SOURCE
-#CFLAGS+=-O6
-#CFLAGS+=-march=i586
-CFLAGS+=-fomit-frame-pointer
-ifeq ($(shell uname -m),x86_64)
-CFLAGS+=-fPIC
-endif
-
-SVNDEF := -D'CELLIAX_SVN_VERSION="$(shell svnversion -n .)"'
-CFLAGS += $(SVNDEF)
-
-
-SOLINK=-shared -Xlinker -x 
-CHANNEL_LIBS=chan_celliax.so
-CC=gcc
-
-OSARCH=$(shell uname -s)
-
-ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-# definition of pthread_kill as a printf (or as a noop) is required for Asterisk (and celliax) to run on Cygwin
-# without it, each time (often) pthread_kill is called (by any thread, with any signal, URG included), bad things happen 
-CC=gcc -D pthread_kill=cyg_no_pthreadkill
-AST_DLL_DIR=/home/maruzz/devel/svn_asterisk_branches_12
-CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols cyg_no_pthread_kill.o
-CYGSOLIB=-L/usr/lib/w32api -lrpcrt4 -L/lib/mingw -lwinmm -L$(AST_DLL_DIR) -lasterisk.dll -L$(AST_DLL_DIR)/res -lres_features.so 
-CHANNEL_LIBS=cyg_no_pthread_kill.o chan_celliax.so
-endif
-
-all: $(CHANNEL_LIBS) 
-
-clean:
-	rm -f *.so *.o *.so.a
-
-
-#chan_celliax section begins
-
-#to debug threads and lock on 1.4 uncomment the following
-#CFLAGS+=-include /usr/src/asterisk/include/asterisk/autoconfig.h
-
-cyg_no_pthread_kill.o: cyg_no_pthread_kill.c
-	$(CC) $(CFLAGS) -c -o cyg_no_pthread_kill.o cyg_no_pthread_kill.c
-chan_celliax.o: chan_celliax.c
-	$(CC) $(CFLAGS) -c -o chan_celliax.o chan_celliax.c
-chan_celliax.so: chan_celliax.o celliax_spandsp.o celliax_libcsv.o celliax_additional.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_celliax.o celliax_spandsp.o celliax_libcsv.o celliax_additional.o -lm -ldl -lasound ${CYGSOLIB}
-#chan_celliax section ends
-
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/README b/src/mod/endpoints/mod_gsmopen/asterisk/README
deleted file mode 100644
index c5921ca6b3..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/README
+++ /dev/null
@@ -1,96 +0,0 @@
-**************************************************************
-* CHAN_CELLIAX DRIVER FOR AN EXISTING ASTERISK INSTALLATION
-*   (works for Asterisk 1.2.xx 1.4.xx 1.6.0.xx series)
-*      (do NOT works for Asterisk 1.6.1.xx series)
-**************************************************************
-==============================================================
-1) To build celliax you need the ALSA development libraries
-==============================================================
-
-To build celliax on Linux you need to install ALSA-dev libs
-
-You can do it on Debian/Ubuntu with:
-# apt-get install libasound2-dev
-
-You can do it on Fedora/CentOS with:
-# yum --nogpgcheck -y install alsa-lib-devel
-
-===============================================================
-2) build chan_celliax
-===============================================================
-
-go into the celliax source directory, edit the Makefile, 
-insert the asterisk version (1.2.x or 1.4.x or 1.6.0.x, 
-NOT 1.6.1.x), the location of your asterisk sources, then
-
-# make clean
-# make
-
-copy chan_celliax.so in the asterisk modules directory
-
-===============================================================
-2) configure chan_celliax and asterisk
-===============================================================
-
-edit and copy celliax.conf in the asterisk configuration 
-directory
-
-copy ciapalo (or your program that accepts text in stdini) in 
-the location defined in celliax.conf (sms_receiving_program)
-
-edit modules.conf and put noload in front of *BOTH* chan_oss.so
-AND chan_alsa.so AND chan_console.so
-
-copy asound.conf in /etc/asound.conf
-
-if you enable debug in logger.conf and "set debug 100" on 
-Asterisk, you'll get *a lot* of info on celliax inner workings
-
-===============================================================
-3) Troubleshooting
-===============================================================
-Check that you set the correct serial device in celliax.conf
-You can check how the device is called on your platform with:
-dmesg | grep ttyU
-dmesg | grep ttyA
-
-Check that you set the correct audio device in celliax.conf
-You can check how the device is called on your platform with:
-aplay -l
-it will give you the number to put on "plughw:N" in celliax.conf
-
-Check the volume for both play and capture, and that capture 
-is activated (press spacebar when alsamixer in capture mode)
-alsamixer -c[soundcard_number] -Vplay
-alsamixer -c[soundcard_number] -Vcapture
-we found good results with capt(31) autogain(on) speaker(75)
-
-If you get double digits (bounces) on DTMFs, check if the capture
-volume is too high
-
-The SMSs are managed in Unicode (UTF8) for international characters
-compatibility. Check that your console and/or text editor displays
-UTF8 characters
-
-If you have bad sound, it's a timing problem. Use a 1000HZ kernel,
-or add a timing device (ztdummy or zaptel interfaces)
-***************************************************************
-* END CHAN_CELLIAX DRIVER FOR AN EXISTING ASTERISK INSTALLATION
-***************************************************************
-
-
-
-chan_celliax adds to Asterisk the DIALPLAN application:
-
-          CelliaxSendsms
-
-You can type at the Asterisk CLI 'show application [application]' 
-to obtain more specific info on usage.
-
-
-
-Enjoy!
-
--giovanni
-
-< gmaruzz at gmail dot com >
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/asound.conf b/src/mod/endpoints/mod_gsmopen/asterisk/asound.conf
deleted file mode 100644
index 71d6119670..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/asound.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-#defaults.pcm.rate_converter "speexrate"
-defaults.pcm.rate_converter "linear"
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/celliax.conf b/src/mod/endpoints/mod_gsmopen/asterisk/celliax.conf
deleted file mode 100644
index 1b84c577d8..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/celliax.conf
+++ /dev/null
@@ -1,205 +0,0 @@
-;; 
-;; 
-; Celliax Asterisk Driver 
-; 
-; Configuration file 
-; lines beginning with semicolon (" are ignored (commented out)
-;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;
-; The first interface (named line0)
-[line0] 
-;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; general settings, valid on all platforms
-;
-; 
-; Default language 
-; 
-language=en 
-; 
-; Default context (is overridden with @context syntax) 
-; 
-context=default 
-; 
-; Default extension (in extensions.conf) where incoming calls land
-; 
-extension=s 
-; 
-;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Debugging settings, valid globally for all interfaces on all platforms
-;
-; the debug values are global for all the interfaces.
-;
-; default is no celliax debugging output, you **have** to activate debugging here to obtain debugging from celliax
-;
-; To see the debugging output you have to "set debug 100" from the Asterisk CLI or launch
-; Asterisk with -ddddddddddd option, and have the logger.conf file activating debug info for console and messages
-;
-; You can activate each of the following separately, but you can't disactivate. Eg: debug_at=no does not subtract debug_at from debug_all
-; debug_all activate all possible debugging info
-;
-;debug_all=yes
-debug_at=yes
-;debug_fbus2=yes
-debug_serial=yes
-debug_pbx=yes
-debug_sound=yes
-;debug_locks=yes
-debug_call=yes
-;debug_monitorlocks=yes
-;debug_cvm=yes
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; This is the program that will receive in stdin the incoming SMSs
-sms_receiving_program=/usr/local/asterisk/usr/sbin/ciapalo
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; serial settings, valid for all platforms
-;
-;control_device_protocol can be AT or FBUS2 or NO_SERIAL (with NO_SERIAL the speed and name of the port are ignored)
-control_device_protocol=at 
-
-;speed of the serial port
-control_device_speed=115200
-
-;name of the serial port device
-control_device_name=/dev/ttyACM0 ; this is a Celliax Official Device, recognized as a modem by Linux
-;control_device_name=/dev/ttyUSB0 ; this is an alternative form of a Celliax Official Device, recognized as a modem by Linux
-
-;watch the soundcard for noise (ring), because the serial port do not tell us about incoming calls (eg 3310nokia), NO_SERIAL protocol watch for acoustic ring in any case
-need_acoustic_ring=0
-
-;audio noise threshold beyond which we declare there is a ring (512 is default, put it to 1024 or 2048 if you have false positive), ignored if not watching for ring
-dsp_silence_threshold=1024
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; audio boost settings, valid for all platforms, to compensate for different soundcard/phone input/output signal levels
-; tweak it if you get horrible (or not hearable) sound
-;
-;boost can be positive or negative (-40 to +40) in db
-;experiment to find which values are best for your soundcard
-playback_boost=0 ; 
-capture_boost=0 ; 
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; which audio device to use
-;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;names of the sound devices in linux
-;if you don't use skype on this interface (eg don't need to share the audio device with other applications while celliax is running), use the plughw:n devices (plughw:0 is the first, plughw:1 is the second soundcard, etc). They have the best latency
-;if you use skype on this interface use the default:n devices (default:0 is the first, default:1 is the second soundcard, etc). They have worst latency, but you can share them
-
-alsa_capture_device_name=plughw:1
-alsa_playback_device_name=plughw:1
-
-alsa_period_size=160
-alsa_periods_in_buffer=4
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; at "modem" commands settings for this interface (if controldevice_protocol is not AT they are ignored)
-;
-;what the modem is expecting in the part of the dial command before the number to be dialed (eg: ATD)
-;at_dial_pre_number=AT+CKPD="EEE
-at_dial_pre_number=ATD
-;what the modem is expecting in the part of the dial command after the number to be dialed. If you want it to wait for a semicolon (;), just comment out the followin line. Wait for semicolon is the default
-;at_dial_post_number=S"
-;what the modem will answer after succesful execution of the dial command
-at_dial_expect=OK
-
-;command to hangup the current call
-;at_hangup=AT+CKPD="EEE"
-at_hangup=ATH
-;what the modem will answer after succesful execution of the hangup command
-at_hangup_expect=OK
-
-;command to answer an incoming call
-at_answer=ATA
-;what the modem will answer after succesful execution of the answer command
-at_answer_expect=OK
-
-;pause right after serial port opening, before any command is sent, in usecs (1million usec= 1sec)
-at_initial_pause=500000
-;custom commands to be sent after the initial pause and before the "built in" initialization commands, and what the modem is expected to send as reply
-;the first empty string stop the preinit sending
-at_preinit_1=atciapa ; nonsense entry, just to show the preinit
-at_preinit_1_expect=OK
-at_preinit_2=
-at_preinit_2_expect=
-at_preinit_3=
-at_preinit_3_expect=
-at_preinit_4=
-at_preinit_4_expect=
-at_preinit_5=
-at_preinit_5_expect=
-;pause right after the custom preinit commands, before any "built in" command is sent, in usecs (1million usec= 1sec)
-at_after_preinit_pause=500000
-;custom commands to be sent after the "built in" initialization commands, and what the modem is expected to send as reply
-;the first empty string stop the postinit sending
-;at_postinit_1=atcucu ; nonsense entry, just to show the postinit
-at_postinit_1=at+cmic=0,9 ; modem's microphone sensitivity (our spk)
-at_postinit_1_expect=OK
-at_postinit_2=AT+CKPD="EEE" ;send three "end" buttonpress, to have the phone in a sane state, ready to dialing with furter CKPDs ***THIS IS IMPORTANT, needed on c650***
-at_postinit_2_expect=OK
-at_postinit_3=AT+CSSN=1,0
-at_postinit_3_expect=OK
-at_postinit_4=at+sidet=0 ; no sidetone in modem, please
-at_postinit_4_expect=OK
-at_postinit_5=at+clvl=99 ; modem's speaker level, out mic
-at_postinit_5_expect=OK
-
-;what command to query the battery status, and what the modem is expected to send as reply
-at_query_battchg=AT+CBC
-at_query_battchg_expect=OK
-;what command to query the signal status, and what the modem is expected to send as reply
-at_query_signal=AT+CSQ
-at_query_signal_expect=OK
-
-;what command to send a DTMF
-at_send_dtmf=AT+VTS 
-
-;the modem will send us the following messages to signal that the visual indicators on the phone has changed because of events (without us to ask for them), loosely based on ETSI standard (see CIND/CIEV/CMER in ETSI). Variable by manufacturer and phone model
-; no service
-at_indicator_noservice_string=+CIEV: 2,0
-; no signal
-at_indicator_nosignal_string=+CIEV: 5,0
-; low signal
-at_indicator_lowsignal_string=+CIEV: 5,1
-; low battery
-at_indicator_lowbattchg_string=+CIEV: 0,1
-; no battery battery
-at_indicator_nobattchg_string=+CIEV: 0,0
-; call is up
-at_indicator_callactive_string=+CIEV: 3,1
-; call is down
-at_indicator_nocallactive_string=+CIEV: 3,0
-; call is no more in process
-at_indicator_nocallsetup_string=+CIEV: 6,0
-; call incoming is in process
-at_indicator_callsetupincoming_string=+CIEV: 6,1
-; call outgoing is in process
-at_indicator_callsetupoutgoing_string=+CIEV: 6,2
-; remote party is ringing because of our call outgoing 
-at_indicator_callsetupremoteringing_string=+CIEV: 6,3
-
-;call processing unsolicited messages, proprietary for each phone manufacturer
-;the modem will send us the following mesage to signal that the line is idle (eg. after an outgoing call has failed, or after hangup)
-at_call_idle=+MCST: 1
-;the modem will send us the following mesage to signal that there is an incoming voice call
-at_call_incoming=+MCST: 2
-;the modem will send us the following mesage to signal that there is an active call (eg. the remote party has answered us, or we answered them)
-;at_call_active=+MCST: 3
-at_call_active=+CSSI: 7
-;the modem will send us the following mesage to signal that our outgoing call has failed
-at_call_failed=+MCST: 65
-;the modem will send us the following mesage to signal that our outgoing call is in the calling phase
-;at_call_calling=+MCST: 64
-at_call_calling=+CSSI: 1
-
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/celliax.h b/src/mod/endpoints/mod_gsmopen/asterisk/celliax.h
deleted file mode 100644
index ed8c2b122c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/celliax.h
+++ /dev/null
@@ -1,909 +0,0 @@
-//indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90 
-#undef GIOVA48
-#define CELLIAX_ALSA
-#ifndef _CELLIAX_H_
-#define _CELLIAX_H_
-
-#ifndef CELLIAX_SVN_VERSION
-#define CELLIAX_SVN_VERSION "????NO_REVISION???"
-#endif
-
-#include <asterisk/version.h>   /* needed here for conditional compilation on version.h */
-  /* the following #defs are for LINUX */
-#ifndef __CYGWIN__
-#ifndef ASTERISK_VERSION_1_6_0
-#ifndef ASTERISK_VERSION_1_4
-#ifndef ASTERISK_VERSION_1_2
-#define ASTERISK_VERSION_1_4
-#if(ASTERISK_VERSION_NUM == 999999)
-#undef ASTERISK_VERSION_1_4
-#elif(ASTERISK_VERSION_NUM < 10400)
-#undef ASTERISK_VERSION_1_4
-#endif /* ASTERISK_VERSION_NUM == 999999 || ASTERISK_VERSION_NUM < 10400 */
-#endif /* ASTERISK_VERSION_1_2 */
-#endif /* ASTERISK_VERSION_1_4 */
-#endif /* ASTERISK_VERSION_1_6_0 */
-#ifdef ASTERISK_VERSION_1_2
-#undef ASTERISK_VERSION_1_4
-#endif /* ASTERISK_VERSION_1_2 */
-#ifdef ASTERISK_VERSION_1_6_0
-#define ASTERISK_VERSION_1_4
-#endif /* ASTERISK_VERSION_1_6_0 */
-#define CELLIAX_DIR
-#undef CELLIAX_LIBCSV
-#endif /* NOT __CYGWIN__ */
-  /* the following #defs are for WINDOWS */
-#ifdef __CYGWIN__
-#undef ASTERISK_VERSION_1_4
-#undef ASTERISK_VERSION_1_6_0
-#define CELLIAX_DIR
-#undef CELLIAX_LIBCSV
-#endif /* __CYGWIN__ */
-
-/* CELLIAX_CVM */
-#undef CELLIAX_CVM
-/* CELLIAX_CVM */
-
-#undef CELLIAX_FBUS2
-#define CELLIAX_DIR
-#define CELLIAX_LIBCSV
-
-/* INCLUDES */
-#ifdef ASTERISK_VERSION_1_6_0
-#include <asterisk.h>           /* some asterisk-devel package do not contains asterisk.h, but seems that is needed for the 1.6 series, at least from trunk */
-#endif /* ASTERISK_VERSION_1_6_0 */
-#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <math.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <string.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <ctype.h>
-#ifndef ASTERISK_VERSION_1_4
-#include <stdlib.h>
-#include <stdio.h>
-#endif /* ASTERISK_VERSION_1_4 */
-#ifndef CELLIAX_ALSA
-#include "pablio.h"
-#endif /* CELLIAX_ALSA */
-//#include <asterisk/frame.h>
-#include <asterisk/channel.h>
-#include <asterisk/module.h>
-#include <asterisk/pbx.h>
-#include <asterisk/causes.h>
-#include <asterisk/cli.h>
-#include <asterisk/options.h>
-#include <asterisk/config.h>
-#include <asterisk/endian.h>
-#include <asterisk/dsp.h>
-#include <asterisk/lock.h>
-#include <asterisk/devicestate.h>
-#include <asterisk/file.h>
-#include <asterisk/say.h>
-#include <asterisk/manager.h>
-#ifdef ASTERISK_VERSION_1_6_0
-#include <asterisk/astobj2.h>
-#include <asterisk/paths.h>
-#endif /* ASTERISK_VERSION_1_6_0 */
-#ifdef ASTERISK_VERSION_1_4
-#include <asterisk/stringfields.h>
-#include <asterisk/abstract_jb.h>
-#include <asterisk/logger.h>
-#include <asterisk/utils.h>
-#endif /* ASTERISK_VERSION_1_4 */
-#ifdef ASTERISK_VERSION_1_2
-#include <asterisk/utils.h>
-#include <asterisk/logger.h>
-#endif /* ASTERISK_VERSION_1_2 */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "celliax_spandsp.h"
-#ifdef CELLIAX_LIBCSV
-#include "celliax_libcsv.h"
-#endif /* CELLIAX_LIBCSV */
-#ifdef __CYGWIN__
-#include <windows.h>
-#endif /* __CYGWIN__ */
-#ifndef AST_DIGIT_ANYDIG
-#define AST_DIGIT_ANYDIG "0123456789*#"
-#else
-#warning Please review Celliax AST_DIGIT_ANYDIG
-#endif
-#ifndef _ASTERISK_H
-#define AST_CONFIG_MAX_PATH 255 /* defined in asterisk.h, but some asterisk-devel package do not contains asterisk.h */
-extern char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];
-int ast_register_atexit(void (*func) (void));   /* in asterisk.h, but some asterisk-devel package do not contains asterisk.h */
-void ast_unregister_atexit(void (*func) (void));    /* in asterisk.h, but some asterisk-devel package do not contains asterisk.h */
-#endif
-#ifdef CELLIAX_ALSA
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#define ALSA_PCM_NEW_SW_PARAMS_API
-#include <alsa/asoundlib.h>
-#endif /* CELLIAX_ALSA */
-
-/* DEFINITIONS */
-/* LUIGI RIZZO's magic */
-/* boost support. BOOST_SCALE * 10 ^(BOOST_MAX/20) must
- * be representable in 16 bits to avoid overflows.
- */
-#define	BOOST_SCALE	(1<<9)
-#define	BOOST_MAX	40          /* slightly less than 7 bits */
-/* call flow from the device */
-#define 	FBUS2_OUTGOING_ACK   999
-#define 	FBUS2_SECURITY_COMMAND_ON   444
-#define 	CALLFLOW_CALL_IDLE  AST_STATE_DOWN
-#define 	CALLFLOW_INCOMING_RING  AST_STATE_RING
-#define 	CALLFLOW_CALL_DIALING   AST_STATE_DIALING
-#define 	CALLFLOW_CALL_LINEBUSY   AST_STATE_BUSY
-#define 	CALLFLOW_CALL_ACTIVE   300
-#define 	CALLFLOW_INCOMING_HANGUP   100
-#define 	CALLFLOW_CALL_RELEASED   101
-#define 	CALLFLOW_CALL_NOCARRIER   102
-#define 	CALLFLOW_CALL_INFLUX   103
-#define 	CALLFLOW_CALL_INCOMING   104
-#define 	CALLFLOW_CALL_FAILED   105
-#define 	CALLFLOW_CALL_NOSERVICE   106
-#define 	CALLFLOW_CALL_OUTGOINGRESTRICTED   107
-#define 	CALLFLOW_CALL_SECURITYFAIL   108
-#define 	CALLFLOW_CALL_NOANSWER   109
-#define 	CALLFLOW_CALL_HANGUP_REQUESTED   110
-  //fixme CALLFLOW_GOT_IMEI to be removed
-#define 	CALLFLOW_GOT_IMEI   1009
-  //fixme CALLFLOW_INCOMING_CALLID to be removed
-#define 	CALLFLOW_INCOMING_CALLID   1019
-#define 	AT_OK   0
-#define 	AT_ERROR   1
-/* FBUS2 (old Nokia phones) undocumented proprietary protocol */
-#define 	FBUS2_ACK_BYTE   0x7f
-#define 	FBUS2_CALL_CALLID   0x05
-#define 	FBUS2_CALL_HANGUP   0x04
-#define 	FBUS2_CALL_STATUS_OFF   0x01
-#define 	FBUS2_CALL_STATUS_ON   0x02
-#define 	FBUS2_COMMAND_BYTE_1   0x00
-#define 	FBUS2_COMMAND_BYTE_2   0x01
-#define 	FBUS2_DEVICE_PC   0x0c
-#define 	FBUS2_DEVICE_PHONE   0x00
-#define 	FBUS2_IRDA_FRAME_ID   0x1c
-#define 	FBUS2_IS_LAST_FRAME   0x01
-#define 	FBUS2_MAX_TRANSMIT_LENGTH   120
-#define 	FBUS2_NETWORK_STATUS_REGISTERED   0x71
-#define 	FBUS2_SECURIY_CALL_COMMAND_ANSWER   0x02
-#define 	FBUS2_SECURIY_CALL_COMMAND_CALL   0x01
-#define 	FBUS2_SECURIY_CALL_COMMAND_RELEASE   0x03
-#define 	FBUS2_SECURIY_CALL_COMMANDS   0x7c
-#define 	FBUS2_SECURIY_EXTENDED_COMMAND_ON   0x01
-#define 	FBUS2_SECURIY_EXTENDED_COMMANDS   0x64
-#define 	FBUS2_SECURIY_IMEI_COMMAND_GET   0x00
-#define 	FBUS2_SECURIY_IMEI_COMMANDS   0x66
-#define 	FBUS2_SEQNUM_MAX   0x47
-#define 	FBUS2_SEQNUM_MIN   0x40
-#define 	FBUS2_SERIAL_FRAME_ID   0x1e
-#define 	FBUS2_SMS_INCOMING   0x10
-#define 	FBUS2_TYPE_CALL   0x01
-#define 	FBUS2_TYPE_CALL_DIVERT   0x06
-#define 	FBUS2_TYPE_CALL_STATUS   0x0d
-#define 	FBUS2_TYPE_NETWORK_STATUS   0x0a
-#define 	FBUS2_TYPE_SECURITY   0x40
-#define 	FBUS2_TYPE_SMS   0x02
-#define 	FBUS2_TYPE_MODEL_ASK   0xd1
-#define   FBUS2_TYPE_MODEL_ANSWER   0xd2
-//#define   FBUS2_TYPE_MODEL_ANSWER   0xffffffd2
-#ifdef CELLIAX_CVM
-#define   CVM_BUSMAIL_SEQNUM_MAX   0x7
-#endif /* CELLIAX_CVM */
-/* debugging bitmask */
-#define DEBUG_SOUND 1
-#define DEBUG_SERIAL 2
-#define DEBUG_SKYPE 4
-#define DEBUG_AT 8
-#define DEBUG_FBUS2 16
-#define DEBUG_CALL 32
-#define DEBUG_LOCKS 64
-#define DEBUG_PBX 128
-#define DEBUG_MONITORLOCKS 256
-#ifndef CELLIAX_CVM
-#define DEBUG_ALL DEBUG_SOUND|DEBUG_SERIAL|DEBUG_SKYPE|DEBUG_AT|DEBUG_FBUS2|DEBUG_CALL|DEBUG_PBX|DEBUG_LOCKS|DEBUG_MONITORLOCKS
-#else
-#define DEBUG_CVM 512
-#define DEBUG_ALL DEBUG_SOUND|DEBUG_SERIAL|DEBUG_SKYPE|DEBUG_AT|DEBUG_FBUS2|DEBUG_CALL|DEBUG_PBX|DEBUG_LOCKS|DEBUG_MONITORLOCKS|DEBUG_CVM
-#endif /* CELLIAX_CVM */
-/* wrappers for ast_log */
-#define DEBUGA_SOUND(...)  if (celliax_debug & DEBUG_SOUND) ast_log(LOG_DEBUG, 		"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SOUND  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_SERIAL(...)  if (celliax_debug & DEBUG_SERIAL) ast_log(LOG_DEBUG, 	"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SERIAL %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_SKYPE(...)  if (celliax_debug & DEBUG_SKYPE) ast_log(LOG_DEBUG, 		"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SKYPE  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_AT(...)  if (celliax_debug & DEBUG_AT) ast_log(LOG_DEBUG, 		"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_AT     %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_FBUS2(...)  if (celliax_debug & DEBUG_FBUS2) ast_log(LOG_DEBUG, 		"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_FBUS2  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_CALL(...)  if (celliax_debug & DEBUG_CALL) ast_log(LOG_DEBUG, 		"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_CALL   %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_PBX(...)  if (celliax_debug & DEBUG_PBX) ast_log(LOG_DEBUG, 		"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_PBX    %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#ifdef CELLIAX_CVM
-#define DEBUGA_CVM(...)  if (celliax_debug & DEBUG_CVM) ast_log(LOG_DEBUG,  "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_CVM    %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#endif /* CELLIAX_CVM */
-#define ERRORA(...)  ast_log(LOG_ERROR, 						"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][ERROR        %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define NOTICA(...)  ast_log(LOG_NOTICE, 						"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][NOTICE      %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define WARNINGA(...)  ast_log(LOG_WARNING, 						"rev "CELLIAX_SVN_VERSION "[%p|%-7lx][WARNING    %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-/* macros for logging */
-#define CELLIAX_P_LOG p ? p->owner : NULL, (unsigned long)pthread_self(), __LINE__, p ? p->name ? p->name : "none" : "none", p ? p->owner ? p->owner->_state : -1 : -1,  p ? p->interface_state : -1, p ? p->phone_callflow : -1
-#define CELLIAX_TMP_LOG tmp ? tmp->owner : NULL, (unsigned long)pthread_self(), __LINE__, tmp ? tmp->name ? tmp->name : "none" : "none", tmp ? tmp->owner ? tmp->owner->_state : -1 : -1,  tmp ? tmp->interface_state : -1, tmp ? tmp->phone_callflow : -1
-/* logging wrappers for ast_mutex_lock and ast_mutex_unlock */
-#define LOKKA(x)  if (celliax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] going to lock %p (%s)\n", CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" :  x == &p->fbus2_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????"); if (ast_mutex_lock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (celliax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] locked %p (%s)\n", CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" : x == &p->fbus2_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????");
-#define UNLOCKA(x)  if (celliax_debug & DEBUG_LOCKS)  ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] going to unlock %p (%s)\n",  CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" : x == &p->fbus2_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????"); if (ast_mutex_unlock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (celliax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] unlocked %p (%s)\n", CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" : x == &p->fbus2_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????");
-#define CVM_LOKKA(x)  if (celliax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] going to lock %p (%s)\n", CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" :  x == &p->cvm_busmail_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????"); if (ast_mutex_lock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (celliax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] locked %p (%s)\n", CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" : x == &p->cvm_busmail_outgoing_list_lock ? "CVM_BUSMAIL_OUTGOING_LIST_LOCK" : "?????");
-#define CVM_UNLOCKA(x)  if (celliax_debug & DEBUG_LOCKS)  ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] going to unlock %p (%s)\n",  CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" : x == &p->cvm_busmail_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????"); if (ast_mutex_unlock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (celliax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] unlocked %p (%s)\n", CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" : x == &p->cvm_busmail_outgoing_list_lock ? "CVM_BUSMAIL_OUTGOING_LIST_LOCK" : "?????");
-#define PUSHA_UNLOCKA(x)    pthread_cleanup_push(celliax_unlocka_log, (void *) x);
-#define POPPA_UNLOCKA(x)    pthread_cleanup_pop(0);
-#define MONITORLOKKA(x)  if (celliax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS  %-5d][%-10s][%2d,%2d,%2d] going to lock %p (%s)\n", CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" :  x == &p->fbus2_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????"); if (ast_mutex_lock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (celliax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS  %-5d][%-10s][%2d,%2d,%2d] locked %p (%s)\n", CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" : x == &p->fbus2_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????");
-#define MONITORUNLOCKA(x)  if (celliax_debug & DEBUG_MONITORLOCKS)  ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS  %-5d][%-10s][%2d,%2d,%2d] going to unlock %p (%s)\n",  CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" : x == &p->fbus2_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????"); if (ast_mutex_unlock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (celliax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "CELLIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS  %-5d][%-10s][%2d,%2d,%2d] unlocked %p (%s)\n", CELLIAX_P_LOG, x, x == &celliax_monlock ? "MONLOCK" : x == &celliax_iflock ? "IFLOCK" : x == &celliax_usecnt_lock ? "USECNT_LOCK" : x == &p->controldev_lock ? "CONTROLDEV_LOCK" : x == &p->fbus2_outgoing_list_lock ? "FBUS2_OUTGOING_LIST_LOCK" : "?????");
-/* macros used for config file parsing */
-#define 	M_BOOL(tag, dst)   M_F(tag, (dst) = ast_true(__val) )
-#define 	M_END(x)   x;
-#define 	M_F(tag, f)   if (!strcasecmp((__s), tag)) { f; } else
-#ifdef ASTERISK_VERSION_1_6_0
-#define 	M_START(var, val)   const char *__s = var; const char *__val = val;
-#else
-#define 	M_START(var, val)   char *__s = var; char *__val = val;
-#endif /* ASTERISK_VERSION_1_6_0 */
-#define 	M_STR(tag, dst)   M_F(tag, ast_copy_string(dst, __val, sizeof(dst)))
-#define 	M_UINT(tag, dst)   M_F(tag, (dst) = strtoul(__val, NULL, 0) )
-/* which protocol we use to control the phone through serial device */
-#ifdef CELLIAX_CVM
-#define   PROTOCOL_CVM_BUSMAIL   5
-#endif /* CELLIAX_CVM */
-#define 	PROTOCOL_ALSA_VOICEMODEM   4
-#define 	PROTOCOL_AT   2
-#define 	PROTOCOL_FBUS2   1
-#define 	PROTOCOL_NO_SERIAL   3
-#ifndef GIOVA48
-#define 	CELLIAX_FRAME_SIZE   160
-#else //GIOVA48
-#define 	CELLIAX_FRAME_SIZE   960
-#endif //GIOVA48
-#define		AT_BUFSIZ 8192
-#define AT_MESG_MAX_LENGTH 2048 /* much more than 10 SMSs */
-#define AT_MESG_MAX_LINES 256   /* 256 lines, so it can contains the results of AT+CLAC, that gives all the AT commands the phone supports */
-
-#ifdef CELLIAX_CVM
-/* MAIL PRIMITIVES */
-/* CVM -> CELLIAX */
-#define API_PP_LOCKED_IND 0x8558    //PP locked with FP
-#define API_PP_UNLOCKED_IND 0x8559  //PP out of service, unlocked from FP
-
-#define API_PP_SETUP_IND 0x8574 //Incoming call to PP
-
-#define API_PP_SETUP_IND_CALL_TYPE_OFFSET 0x0
-#define API_PP_SETUP_IND_RING_TYPE_OFFSET 0x1
-
-#define API_PP_SETUP_IND_CALL_EXT 0x0
-#define API_PP_SETUP_IND_CALL_INT 0x1
-
-#define API_PP_SETUP_IND_RING_INT_CALL 0x40
-#define API_PP_SETUP_IND_RING_PAGE_ALL 0x46
-
-#define API_PP_SETUP_ACK_IND 0x857F //internal connection established with FPs, waiting for handsetnumber
-
-#define API_PP_CONNECT_IND 0x8576   //air-link established with FPs
-#define API_PP_CONNECT_CFM 0x8578   //PP answered incoming call
-
-#define API_PP_ALERT_IND 0x8581
-#define API_PP_ALERT_ON_IND 0x857D
-#define API_PP_ALERT_OFF_IND 0x857E
-
-#define API_PP_SIGNAL_ON_IND 0x2F9C
-#define API_PP_SIGNAL_OFF_IND 0x2F9D
-
-#define API_PP_RELEASE_IND 0x857B
-#define API_PP_RELEASE_CFM 0x857A
-#define API_PP_REJECT_IND 0x8564
-
-#define API_PP_ACCESS_RIGHTS_CFM 0x8568
-#define API_PP_ACCESS_RIGHTS_REJ 0x8569
-
-#define API_PP_DELETE_SUBS_CFM 0x8561
-#define API_PP_REMOTE_DELETE_SUBS_CFM 0x2F9F
-
-#define API_PP_CLIP_IND 0x2F93
-#define API_PP_SW_STATUS_IND 0x2FC2
-#define API_PP_MESSAGE_WAITING_IND 0x2FA1
-
-#define CVM_PP_PLUG_STATUS_IND 0x2F4F
-#define CVM_PP_LINE_STATUS_IND 0x2F53
-#define CVM_PP_ON_KEY_IND 0x2F64
-
-#define API_PP_READ_RSSI_CFM 0x2FC7
-#define API_PP_ALERT_BROADCAST_IND 0x2FA3
-
-/* CELLIAX -> CVM */
-#define API_PP_LOCK_REQ 0x8554  //select FP to lock once
-#define API_PP_SETUP_REQ 0x8571 //setup air-link PP<->FP
-
-#define API_PP_KEYPAD_REQ 0x858A    //send string for dialing
-
-#define API_PP_CONNECT_REQ 0x8577   //answer incoming call
-
-#define API_PP_ALERT_REQ 0x2F8D //inform FP that alering is started
-
-#define API_PP_RELEASE_REQ 0x8579   //release connection
-#define API_PP_RELEASE_RES 0x857C   //confirm FP initiated release of connection
-#define API_PP_REJECT_REQ 0x8565    //PP reject incoming call
-
-#define API_PP_ACCESS_RIGHTS_REQ 0x8566 //init registration to FP
-#define API_PP_DELETE_SUBS_REQ 0x8560   //deregister from FP (locally only in PP)
-#define API_PP_REMOTE_DELETE_SUBS_REQ 0x2F9E    //remotly deregister from FP
-
-#define API_PP_STOP_PROTOCOL_REQ 0x2FC4 //stop protocol from running  (even registration)
-
-#define API_PP_READ_RSSI_REQ 0x2FC6 //RSSI readout request
-#define API_PP_READ_RSSI_CFM 0x2FC7 //RSSI readout result
-
-#define CVM_PP_AUDIO_OPEN_REQ 0x2F0E    //Enable audio
-#define CVM_PP_AUDIO_CLOSE_REQ 0x2F0F   //Disable audio
-
-#define CVM_PP_AUDIO_SET_VOLUME_REQ 0x2F1D  //set volume
-
-#define CVM_PP_AUDIO_UNMUTE_MIC_REQ 0x2F1A  //unmute mic
-#define CVM_PP_AUDIO_MUTE_MIC_REQ 0x2F19    //mute mic
-
-#define CVM_PP_AUDIO_HS_PLUG_IND 0x2F1C //mute mic
-
-#define CVM_PP_AUDIO_OPEN_ADPCM_OFF_REQ 0x2F68  //open audio even before making connection
-
-/* END OF MAIL PRIMITIVES */
-
-enum CvmLockState {
-  CVM_UNKNOWN_LOCK_STATE = 0,
-  CVM_UNLOCKED_TO_FP,
-  CVM_LOCKED_TO_FP
-};
-
-enum CvmRegisterState {
-  CVM_UNKNOWN_REGISTER_STATE = 0,
-  CVM_UNREGISTERED_TO_FP,
-  CVM_REGISTERED_TO_FP
-};
-
-#define BUSMAIL_MAIL_MAX_PARAMS_LENGTH 128
-#define BUSMAIL_MAX_FRAME_LENGTH (BUSMAIL_MAIL_MAX_PARAMS_LENGTH + 9)
-
-#define BUSMAIL_OFFSET_SOF 0
-#define BUSMAIL_OFFSET_LEN_MSB 1
-#define BUSMAIL_OFFSET_LEN_LSB 2
-#define BUSMAIL_OFFSET_HEADER 3
-#define BUSMAIL_OFFSET_MAIL BUSMAIL_OFFSET_MAIL_PROGRAM_ID
-#define BUSMAIL_OFFSET_MAIL_PROGRAM_ID 4
-#define BUSMAIL_OFFSET_MAIL_TASK_ID 5
-#define BUSMAIL_OFFSET_MAIL_PRIMITIVE_MSB 7
-#define BUSMAIL_OFFSET_MAIL_PRIMITIVE_LSB 6
-#define BUSMAIL_OFFSET_MAIL_PARAMS 8
-
-#define BUSMAIL_MAIL_PRIMITIVE_MSB 1
-#define BUSMAIL_MAIL_PRIMITIVE_LSB 0
-#define BUSMAIL_LEN_MSB 0
-#define BUSMAIL_LEN_LSB 1
-
-#define BUSMAIL_SOF 0x10
-
-#define BUSMAIL_MAIL_PROGRAM_ID 0x0
-#define BUSMAIL_MAIL_USERTASK_TASK_ID 0x0f
-#define BUSMAIL_MAIL_TBHANDLE_TASK_ID 0x0
-#define BUSMAIL_MAIL_TASK_ID BUSMAIL_MAIL_USERTASK_TASK_ID
-
-#define BUSMAIL_HEADER_IC_BIT_MASK 0x80
-#define BUSMAIL_HEADER_SU_BIT_MASK 0x40
-#define BUSMAIL_HEADER_PF_BIT_MASK 0x08
-#define BUSMAIL_HEADER_TXSEQ_MASK 0x70
-#define BUSMAIL_HEADER_RXSEQ_MASK 0x07
-#define BUSMAIL_HEADER_SUID_MASK 0x30
-#define BUSMAIL_HEADER_UNID_MASK BUSMAIL_HEADER_SUID_MASK
-
-#define BUSMAIL_HEADER_INFO_FRAME 0x0
-#define BUSMAIL_HEADER_CTRL_FRAME 0x80
-#define BUSMAIL_HEADER_CTRL_SU_FRAME 0x0
-#define BUSMAIL_HEADER_CTRL_UN_FRAME 0x40
-
-#define BUSMAIL_HEADER_UNID_SABM 0x0
-#define BUSMAIL_HEADER_SUID_RR 0x0
-#define BUSMAIL_HEADER_SUID_REJ 0x10
-#define BUSMAIL_HEADER_SUID_RNR 0x20
-
-#define BUSMAIL_HEADER_SABM_MASK (BUSMAIL_HEADER_IC_BIT_MASK | BUSMAIL_HEADER_SU_BIT_MASK | BUSMAIL_HEADER_UNID_MASK)
-#define BUSMAIL_HEADER_SABM (BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_UN_FRAME | BUSMAIL_HEADER_UNID_SABM)
-
-#define BUSMAIL_HEADER_REJ_MASK (BUSMAIL_HEADER_IC_BIT_MASK | BUSMAIL_HEADER_SU_BIT_MASK | BUSMAIL_HEADER_SUID_MASK)
-#define BUSMAIL_HEADER_REJ (BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_SU_FRAME | BUSMAIL_HEADER_SUID_REJ)
-
-#define BUSMAIL_HEADER_SU_FRAME_MASK (BUSMAIL_HEADER_IC_BIT_MASK | BUSMAIL_HEADER_SU_BIT_MASK)
-#define BUSMAIL_HEADER_SU_FRAME (BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_SU_FRAME)
-
-/*! 
- * \brief structure holding raw data to be send throught serial
- */
-struct cvm_busmail_msg {
-  int valid;
-  unsigned char busmail_msg_buffer[BUSMAIL_MAX_FRAME_LENGTH];
-  unsigned int busmail_msg_len;
-
-  unsigned int tv_sec;
-  unsigned int tv_usec;
-
-  unsigned char txseqno;
-  int acknowledged;
-  int how_many_sent;
-  int sent;
-
-  struct cvm_busmail_msg *next;
-  struct cvm_busmail_msg *previous;
-};
-
-/*! 
- * \brief structure holding busmail frame, for internal use
- */
-struct cvm_busmail_frame {
-  unsigned char busmail_sof;
-  unsigned char busmail_len[2];
-  unsigned char busmail_header;
-  unsigned char busmail_mail_program_id;
-  unsigned char busmail_mail_task_id;
-  unsigned char busmail_mail_primitive[2];
-  unsigned char busmail_mail_params_buffer[BUSMAIL_MAIL_MAX_PARAMS_LENGTH];
-  unsigned int busmail_mail_params_buffer_len;
-  unsigned char busmail_crc;
-};
-#endif /* CELLIAX_CVM */
-
-/* CELLIAX INTERNAL STRUCTS */
-
-/*! 
- * \brief structure for the linked list of FBUS2 Nokia proprietary protocol messages
- */
-struct fbus2_msg {
-  int msg;
-  int seqnum;
-  int len;
-  int acknowledged;
-  int how_many_sent;
-  int sent;
-  unsigned int tv_sec;
-  unsigned int tv_usec;
-  unsigned char buffer[FBUS2_MAX_TRANSMIT_LENGTH + 10];
-  struct fbus2_msg *next;
-  struct fbus2_msg *previous;
-};
-
-/*! 
- * \brief structure for storing the results of AT commands, in an array of AT_MESG_MAX_LINES * AT_MESG_MAX_LENGTH chars
- */
-struct s_result {
-  int elemcount;
-  char result[AT_MESG_MAX_LINES][AT_MESG_MAX_LENGTH];
-};
-
-/*! 
- * \brief PVT structure for a celliax interface (channel), created by celliax_mkif
- */
-struct celliax_pvt {
-  char *name;                   /*!< \brief 'name' of the interface (channel) */
-  int interface_state;          /*!< \brief 'state' of the interface (channel) */
-  int phone_callflow;           /*!< \brief 'callflow' of the phone interface (as opposed to skype interface) */
-  struct ast_channel *owner;    /*!< \brief channel we belong to, possibly NULL */
-  struct celliax_pvt *next;     /*!< \brief Next interface (channel) in list */
-  int readpos;                  /*!< \brief read position above */
-  struct ast_frame read_f;      /*!< \brief returned by oss_read */
-  char context[AST_MAX_EXTENSION];  /*!< \brief default Asterisk dialplan context for this interface */
-  char language[MAX_LANGUAGE];  /*!< \brief default Asterisk dialplan language for this interface */
-  char exten[AST_MAX_EXTENSION];    /*!< \brief default Asterisk dialplan extension for this interface */
-  struct ast_dsp *dsp;          /*!< \brief Used for in-band DTMF detection */
-  int celliax_sound_rate;       /*!< \brief rate of the sound device, in Hz, eg: 8000 */
-  int celliax_sound_capt_fd;    /*!< \brief file descriptor for sound capture dev */
-  char controldevice_name[50];  /*!< \brief name of the serial device controlling the interface, possibly none */
-  int controldevprotocol;       /*!< \brief which protocol is used for serial control of this interface */
-  char controldevprotocolname[50];  /*!< \brief name of the serial device controlling protocol, one of "at" "fbus2" "no_serial" "alsa_voicemodem" */
-  int controldevfd;             /*!< \brief serial controlling file descriptor for this interface */
-  char callid_name[50];
-  char callid_number[50];
-  unsigned char rxm[255];       /*!< \brief read buffer for FBUS2 serial protocol controlling Nokia phones */
-  unsigned char array[255];     /*!< \brief read buffer for FBUS2 serial protocol controlling Nokia phones */
-  int arraycounter;             /*!< \brief position in the 'array' read buffer for FBUS2 serial protocol controlling Nokia phones */
-  int seqnumfbus;               /*!< \brief sequential number of FBUS2 messages, hex, revolving */
-  pthread_t controldev_thread;  /*!< \brief serial control thread for this interface, running during the call */
-  struct fbus2_msg *fbus2_outgoing_list;    /*!< \brief list used to track FBUS2 traffic acknowledgement and resending */
-  ast_mutex_t fbus2_outgoing_list_lock;
-  int dsp_silence_threshold;
-  int need_acoustic_ring;       /*!< \brief bool, this interface get the incoming ring from soundcard, not serial */
-  char oss_write_buf[CELLIAX_FRAME_SIZE * 2];
-  int oss_write_dst;
-  char oss_read_buf[CELLIAX_FRAME_SIZE * 2 + AST_FRIENDLY_OFFSET];  /*!< in bytes */
-  time_t celliax_serial_synced_timestamp;
-  time_t celliax_serial_sync_period;
-  time_t audio_play_reset_timestamp;
-  time_t audio_capture_reset_timestamp;
-  speed_t controldevice_speed;
-  struct s_result line_array;
-  struct timeval ringtime;
-  struct timeval call_incoming_time;
-  int at_result;
-
-  char at_dial_pre_number[64];
-  char at_dial_post_number[64];
-  char at_dial_expect[64];
-  unsigned int at_early_audio;
-  char at_hangup[64];
-  char at_hangup_expect[64];
-  char at_answer[64];
-  char at_answer_expect[64];
-  unsigned int at_initial_pause;
-  char at_preinit_1[64];
-  char at_preinit_1_expect[64];
-  char at_preinit_2[64];
-  char at_preinit_2_expect[64];
-  char at_preinit_3[64];
-  char at_preinit_3_expect[64];
-  char at_preinit_4[64];
-  char at_preinit_4_expect[64];
-  char at_preinit_5[64];
-  char at_preinit_5_expect[64];
-  unsigned int at_after_preinit_pause;
-
-  char at_postinit_1[64];
-  char at_postinit_1_expect[64];
-  char at_postinit_2[64];
-  char at_postinit_2_expect[64];
-  char at_postinit_3[64];
-  char at_postinit_3_expect[64];
-  char at_postinit_4[64];
-  char at_postinit_4_expect[64];
-  char at_postinit_5[64];
-  char at_postinit_5_expect[64];
-
-  char at_send_dtmf[64];
-
-  char at_query_battchg[64];
-  char at_query_battchg_expect[64];
-  char at_query_signal[64];
-  char at_query_signal_expect[64];
-  char at_call_idle[64];
-  char at_call_incoming[64];
-  char at_call_active[64];
-  char at_call_failed[64];
-  char at_call_calling[64];
-
-#define CIEV_STRING_SIZE 64
-  char at_indicator_noservice_string[64];
-  char at_indicator_nosignal_string[64];
-  char at_indicator_lowsignal_string[64];
-  char at_indicator_lowbattchg_string[64];
-  char at_indicator_nobattchg_string[64];
-  char at_indicator_callactive_string[64];
-  char at_indicator_nocallactive_string[64];
-  char at_indicator_nocallsetup_string[64];
-  char at_indicator_callsetupincoming_string[64];
-  char at_indicator_callsetupoutgoing_string[64];
-  char at_indicator_callsetupremoteringing_string[64];
-
-  int at_indicator_callp;
-  int at_indicator_callsetupp;
-  int at_indicator_roamp;
-  int at_indicator_battchgp;
-  int at_indicator_servicep;
-  int at_indicator_signalp;
-
-  int at_has_clcc;
-  int at_has_ecam;
-
-  double playback_boost;
-  double capture_boost;
-  int stripmsd;
-  int controldev_dead;
-  ast_mutex_t controldev_lock;
-  struct timeval fbus2_list_tv;
-  struct timezone fbus2_list_tz;
-  dtmf_rx_state_t dtmf_state;
-  int dtmf_inited;
-  pthread_t sync_thread;
-  pthread_t celliax_sound_monitor_thread;
-  pthread_t celliax_serial_monitor_thread;
-  int celliax_serial_monitoring;
-  int skype;                    /*!< \brief config flag, bool, Skype support on this interface (0 if false, -1 if true) */
-  int phonebook_listing;
-  int phonebook_querying;
-  int phonebook_listing_received_calls;
-
-  int phonebook_first_entry;
-  int phonebook_last_entry;
-  int phonebook_number_lenght;
-  int phonebook_text_lenght;
-  FILE *phonebook_writing_fp;
-  int celliax_dir_entry_extension_prefix;
-#ifdef CELLIAX_CVM
-  char cvm_subsc_1_pin[20];
-  char cvm_subsc_2_pin[20];
-  int cvm_subsc_no;
-  int cvm_lock_state;
-  int cvm_register_state;
-  int cvm_volume_level;
-  int cvm_celliax_serial_delay;
-  unsigned char cvm_handset_no;
-  unsigned char cvm_fp_is_cvm;
-  unsigned char cvm_rssi;
-
-  unsigned char busmail_rxseq_cvm_last; /*!< \brief sequential number of BUSMAIL messages, (0-7) */
-  unsigned char busmail_txseq_celliax_last; /*!< \brief sequential number of BUSMAIL messages, (0-7) */
-
-  struct cvm_busmail_msg *cvm_busmail_outgoing_list;    /*!< \brief list used to track CVM BUSMAIL traffic acknowledgement and resending */
-  ast_mutex_t cvm_busmail_outgoing_list_lock;
-
-  struct timeval cvm_busmail_list_tv;
-  struct timezone cvm_busmail_list_tz;
-#endif                          /* CELLIAX_CVM */
-#ifdef CELLIAX_LIBCSV
-  int csv_separator_is_semicolon;
-  int csv_complete_name_pos;
-  int csv_email_pos;
-  int csv_home_phone_pos;
-  int csv_mobile_phone_pos;
-  int csv_business_phone_pos;
-  int csv_first_row_is_title;
-  int csv_fields;
-  int csv_rows;
-  char csv_complete_name[256];
-  char csv_email[256];
-  char csv_home_phone[256];
-  char csv_mobile_phone[256];
-  char csv_business_phone[256];
-#endif                          /* CELLIAX_LIBCSV */
-  int audio_play_reset_period;
-
-  char at_cmgw[16];
-
-  int isInputInterleaved;
-  int isOutputInterleaved;
-  int numInputChannels;
-  int numOutputChannels;
-  int framesPerCallback;
-#ifndef CELLIAX_ALSA
-  PABLIO_Stream *stream;
-#endif /* CELLIAX_ALSA */
-  int audiopipe[2];
-  int speexecho;
-  int speexpreprocess;
-  int portaudiocindex;          /*!< \brief Index of the Portaudio capture audio device */
-  int portaudiopindex;          /*!< \brief Index of the Portaudio playback audio device */
-  int control_to_send;
-  int unread_sms_msg_id;
-  int reading_sms_msg;
-  char sms_message[4800];
-  int sms_cnmi_not_supported;
-  char sms_receiving_program[256];
-  int celliax_dir_prefix;
-  int no_ucs2;
-#ifdef CELLIAX_ALSA
-  snd_pcm_t *alsac;             /*!< \brief handle of the ALSA capture audio device */
-  snd_pcm_t *alsap;             /*!< \brief handle of the ALSA playback audio device */
-  char alsacname[50];           /*!< \brief name of the ALSA capture audio device */
-  char alsapname[50];           /*!< \brief name of the ALSA playback audio device */
-  int alsa_period_size;         /*!< \brief ALSA period_size, in byte */
-  int alsa_periods_in_buffer;   /*!< \brief how many periods in ALSA buffer, to calculate buffer_size */
-  unsigned long int alsa_buffer_size;   /*!< \brief ALSA buffer_size, in byte */
-  int alsawrite_filled;
-  int alsa_capture_is_mono;
-  int alsa_play_is_mono;
-  struct pollfd pfd;
-#endif                          /* CELLIAX_ALSA */
-
-  struct timeval dtmf_timestamp;
-};
-
-/* LOCKS */
-/*! \brief Protect the celliax_usecnt */
-AST_MUTEX_DEFINE_STATIC(celliax_usecnt_lock);
-/*! \brief Protect the monitoring thread, so only one process can kill or start it, and not
- *    when it's doing something critical. */
-AST_MUTEX_DEFINE_STATIC(celliax_monlock);
-/*! \brief Protect the interfaces list */
-AST_MUTEX_DEFINE_STATIC(celliax_iflock);
-
-/* FUNCTIONS */
-
-/* module helpers functions */
-int load_module(void);
-int unload_module(void);
-int usecount(void);
-char *description(void);
-char *key(void);
-
-/* chan_celliax internal functions */
-void celliax_unlocka_log(void *x);
-#ifdef CELLIAX_FBUS2
-int celliax_serial_sync_FBUS2(struct celliax_pvt *p);
-int celliax_serial_answer_FBUS2(struct celliax_pvt *p);
-int celliax_serial_call_FBUS2(struct celliax_pvt *p, char *dstr);
-int celliax_serial_hangup_FBUS2(struct celliax_pvt *p);
-int celliax_serial_config_FBUS2(struct celliax_pvt *p);
-int celliax_serial_read_FBUS2(struct celliax_pvt *p);
-int celliax_serial_getstatus_FBUS2(struct celliax_pvt *p);
-int celliax_serial_get_seqnum_FBUS2(struct celliax_pvt *p);
-int celliax_serial_security_command_FBUS2(struct celliax_pvt *p);
-int celliax_serial_send_FBUS2(struct celliax_pvt *p, int len, unsigned char *buffer2);
-int celliax_serial_list_acknowledge_FBUS2(struct celliax_pvt *p, int seqnum);
-int celliax_serial_send_if_time_FBUS2(struct celliax_pvt *p);
-int celliax_serial_write_FBUS2(struct celliax_pvt *p, unsigned char *MsgBuffer,
-                               int MsgLength, unsigned char MsgType);
-int celliax_serial_send_ack_FBUS2(struct celliax_pvt *p, unsigned char MsgType,
-                                  unsigned char MsgSequence);
-struct fbus2_msg *celliax_serial_list_init_FBUS2(struct celliax_pvt *p);
-int celliax_serial_list_print_FBUS2(struct celliax_pvt *p, struct fbus2_msg *list);
-
-#endif /* CELLIAX_FBUS2 */
-
-#ifdef CELLIAX_CVM
-int celliax_serial_sync_CVM_BUSMAIL(struct celliax_pvt *p);
-int celliax_serial_answer_CVM_BUSMAIL(struct celliax_pvt *p);
-int celliax_serial_call_CVM_BUSMAIL(struct celliax_pvt *p, char *dstr);
-int celliax_serial_hangup_CVM_BUSMAIL(struct celliax_pvt *p);
-int celliax_serial_config_CVM_BUSMAIL(struct celliax_pvt *p);
-int celliax_serial_read_CVM_BUSMAIL(struct celliax_pvt *p);
-int celliax_serial_getstatus_CVM_BUSMAIL(struct celliax_pvt *p);
-int celliax_serial_send_CVM_BUSMAIL(struct celliax_pvt *p, int len,
-                                    unsigned char *mesg_ptr);
-int celliax_serial_list_acknowledge_CVM_BUSMAIL(struct celliax_pvt *p,
-                                                unsigned char TxSeqNo);
-int celliax_serial_send_if_time_CVM_BUSMAIL(struct celliax_pvt *p);
-int celliax_serial_write_CVM_BUSMAIL(struct celliax_pvt *p,
-                                     struct cvm_busmail_frame *busmail_frame);
-int celliax_serial_send_ctrl_frame_CVM_BUSMAIL(struct celliax_pvt *p,
-                                               unsigned char FrameType);
-int celliax_serial_send_info_frame_CVM_BUSMAIL(struct celliax_pvt *p, int FrameType,
-                                               unsigned char ParamsLen,
-                                               unsigned char *Params);
-struct cvm_busmail_msg *celliax_serial_list_init_CVM_BUSMAIL(struct celliax_pvt *p);
-int celliax_serial_list_print_CVM_BUSMAIL(struct celliax_pvt *p,
-                                          struct cvm_busmail_msg *list);
-int celliax_serial_lists_free_CVM_BUSMAIL(struct celliax_pvt *p);
-
-#endif /* CELLIAX_CVM */
-
-/* CHAN_CELLIAX.C */
-int celliax_queue_control(struct ast_channel *chan, int control);
-struct celliax_pvt *celliax_console_find_desc(char *dev);
-int celliax_serial_call(struct celliax_pvt *p, char *dstr);
-
-/* FUNCTIONS */
-/* PBX interface functions */
-struct ast_channel *celliax_request(const char *type, int format, void *data, int *cause);
-int celliax_answer(struct ast_channel *c);
-int celliax_hangup(struct ast_channel *c);
-int celliax_call(struct ast_channel *c, char *idest, int timeout);
-struct ast_frame *celliax_read(struct ast_channel *chan);
-int celliax_write(struct ast_channel *c, struct ast_frame *f);
-int celliax_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
-#ifndef ASTERISK_VERSION_1_4
-int celliax_indicate(struct ast_channel *c, int cond);
-#else
-int celliax_indicate(struct ast_channel *c, int cond, const void *data, size_t datalen);
-#endif
-int celliax_devicestate(void *data);
-#ifdef ASTERISK_VERSION_1_4
-int celliax_senddigit_begin(struct ast_channel *ast, char digit);
-int celliax_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration);
-#else /* ASTERISK_VERSION_1_4 */
-int celliax_senddigit(struct ast_channel *ast, char digit);
-#endif /* ASTERISK_VERSION_1_4 */
-
-/* chan_celliax internal functions */
-
-struct celliax_pvt *celliax_mkif(struct ast_config *cfg, char *ctg,
-                                 int is_first_category);
-struct ast_channel *celliax_new(struct celliax_pvt *p, int state, char *context);
-int celliax_restart_monitor(void);
-void *celliax_do_monitor(void *data);
-void *celliax_do_audio_monitor(void *data);
-int celliax_sound_boost(struct ast_frame *f, double boost);
-int celliax_sound_init(struct celliax_pvt *p);
-int celliax_sound_shutdown(struct celliax_pvt *p);
-struct ast_frame *celliax_sound_dsp_analize(struct celliax_pvt *p, struct ast_frame *f,
-                                            int dsp_silence_threshold);
-int celliax_sound_dsp_set(struct celliax_pvt *p, int dsp_silence_threshold,
-                          int silence_suppression);
-struct ast_frame *celliax_sound_read(struct celliax_pvt *p);
-int celliax_sound_write(struct celliax_pvt *p, struct ast_frame *f);
-int celliax_sound_monitor(struct celliax_pvt *p);
-void *celliax_do_controldev_thread(void *data);
-int celliax_serial_init(struct celliax_pvt *p, speed_t controldevice_speed);
-int celliax_serial_monitor(struct celliax_pvt *p);
-int celliax_serial_read(struct celliax_pvt *p);
-int celliax_serial_sync(struct celliax_pvt *p);
-int celliax_serial_getstatus(struct celliax_pvt *p);
-int celliax_serial_config(struct celliax_pvt *p);
-int celliax_serial_hangup(struct celliax_pvt *p);
-int celliax_serial_answer(struct celliax_pvt *p);
-
-#define celliax_serial_write_AT_expect(P, D, S) celliax_serial_write_AT_expect1(P, D, S, 1, 2)
-#define celliax_serial_write_AT_expect_noexpcr(P, D, S) celliax_serial_write_AT_expect1(P, D, S, 0, 2)
-#define celliax_serial_write_AT_expect_noexpcr_tout(P, D, S, T) celliax_serial_write_AT_expect1(P, D, S, 0, T)
-// 20.5 sec timeout, used for querying the SIM and sending SMSs
-#define celliax_serial_write_AT_expect_longtime(P, D, S) celliax_serial_write_AT_expect1(P, D, S, 1, 20)
-#define celliax_serial_write_AT_expect_longtime_noexpcr(P, D, S) celliax_serial_write_AT_expect1(P, D, S, 0, 20)
-int celliax_serial_write_AT(struct celliax_pvt *p, const char *data);
-int celliax_serial_write_AT_nocr(struct celliax_pvt *p, const char *data);
-int celliax_serial_write_AT_ack(struct celliax_pvt *p, const char *data);
-int celliax_serial_write_AT_ack_nocr_longtime(struct celliax_pvt *p, const char *data);
-int celliax_serial_write_AT_noack(struct celliax_pvt *p, const char *data);
-int celliax_serial_write_AT_expect1(struct celliax_pvt *p, const char *data,
-                                    const char *expected_string, int expect_crlf,
-                                    int seconds);
-int celliax_serial_AT_expect(struct celliax_pvt *p, const char *expected_string,
-                             int expect_crlf, int seconds);
-int celliax_serial_read_AT(struct celliax_pvt *p, int look_for_ack, int timeout_usec,
-                           int timeout_sec, const char *expected_string, int expect_crlf);
-int celliax_serial_answer_AT(struct celliax_pvt *p);
-int celliax_serial_hangup_AT(struct celliax_pvt *p);
-int celliax_serial_config_AT(struct celliax_pvt *p);
-int celliax_serial_call_AT(struct celliax_pvt *p, char *dstr);
-int celliax_serial_sync_AT(struct celliax_pvt *p);
-int celliax_serial_getstatus_AT(struct celliax_pvt *p);
-
-#ifdef ASTERISK_VERSION_1_6_0
-void celliax_store_boost(const char *s, double *boost);
-#else
-void celliax_store_boost(char *s, double *boost);
-#endif /* ASTERISK_VERSION_1_6_0 */
-int celliax_console_set_active(int fd, int argc, char *argv[]);
-#ifndef ASTERISK_VERSION_1_6_0
-int celliax_console_hangup(int fd, int argc, char *argv[]);
-#else /* ASTERISK_VERSION_1_6_0 */
-char *celliax_console_hangup(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
-#endif /*  ASTERISK_VERSION_1_6_0 */
-int celliax_console_playback_boost(int fd, int argc, char *argv[]);
-int celliax_console_capture_boost(int fd, int argc, char *argv[]);
-int celliax_console_celliax(int fd, int argc, char *argv[]);
-#ifdef CELLIAX_DIR
-int celliax_console_celliax_dir_import(int fd, int argc, char *argv[]);
-int celliax_console_celliax_dir_export(int fd, int argc, char *argv[]);
-#endif /* CELLIAX_DIR */
-int celliax_console_dial(int fd, int argc, char *argv[]);
-int celliax_console_sendsms(int fd, int argc, char *argv[]);
-int celliax_portaudio_init(struct celliax_pvt *p);
-int celliax_portaudio_shutdown(struct celliax_pvt *p);
-struct ast_frame *celliax_portaudio_read(struct celliax_pvt *p);
-int celliax_portaudio_write(struct celliax_pvt *p, struct ast_frame *f);
-int celliax_portaudio_devlist(struct celliax_pvt *p);
-#ifdef CELLIAX_DIR
-int celliax_dir_exec(struct ast_channel *chan, void *data);
-int celliax_dir_create_extensions(void);
-int celliax_dir_play_mailbox_owner(struct ast_channel *chan, char *context,
-                                   char *dialcontext, char *ext, char *name);
-struct ast_config *celliax_dir_realtime(char *context);
-int celliax_dir_do(struct ast_channel *chan, struct ast_config *cfg, char *context,
-                   char *dialcontext, char digit, int last);
-#endif /* CELLIAX_DIR */
-#ifdef CELLIAX_LIBCSV
-void celliax_cb1(char *s, size_t len, void *data);
-void celliax_cb2(char c, void *data);
-#endif /* CELLIAX_LIBCSV */
-int celliax_sendsms(struct ast_channel *c, void *data);
-int celliax_console_echo(int fd, int argc, char *argv[]);
-int celliax_console_at(int fd, int argc, char *argv[]);
-#ifdef ASTERISK_VERSION_1_2
-int celliax_manager_sendsms(struct mansession *s, struct message *m);
-#endif //ASTERISK_VERSION_1_2
-#ifdef ASTERISK_VERSION_1_4
-int celliax_manager_sendsms(struct mansession *s, const struct message *m);
-#endif //ASTERISK_VERSION_1_4
-int utf_to_ucs2(struct celliax_pvt *p, char *utf_in, size_t inbytesleft, char *ucs2_out,
-                size_t outbytesleft);
-int ucs2_to_utf8(struct celliax_pvt *p, char *ucs2_in, char *utf8_out,
-                 size_t outbytesleft);
-#endif /* _CELLIAX_H_ */
-#ifdef CELLIAX_ALSA
-int console_alsa_period(int fd, int argc, char *argv[]);
-#endif /* CELLIAX_ALSA */
-#ifdef CELLIAX_ALSA
-int alsa_init(struct celliax_pvt *p);
-int alsa_shutdown(struct celliax_pvt *p);
-snd_pcm_t *alsa_open_dev(struct celliax_pvt *p, snd_pcm_stream_t stream);
-struct ast_frame *alsa_read(struct celliax_pvt *p);
-int alsa_write(struct celliax_pvt *p, struct ast_frame *f);
-#endif /* CELLIAX_ALSA */
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_additional.c b/src/mod/endpoints/mod_gsmopen/asterisk/celliax_additional.c
deleted file mode 100644
index efae699ab7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_additional.c
+++ /dev/null
@@ -1,7027 +0,0 @@
-//indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90 
-#include "celliax.h"
-#include "iconv.h"
-
-extern int celliax_debug;
-extern char *celliax_console_active;
-extern char celliax_type[];
-extern struct celliax_pvt *celliax_iflist;
-extern int celliax_dir_entry_extension;
-
-#ifndef GIOVA48
-#define SAMPLES_PER_FRAME 160
-#else // GIOVA48
-#define SAMPLES_PER_FRAME 960
-#endif // GIOVA48
-
-#ifdef CELLIAX_ALSA
-/*! \brief ALSA pcm format, according to endianess  */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-snd_pcm_format_t celliax_format = SND_PCM_FORMAT_S16_LE;
-#else
-snd_pcm_format_t celliax_format = SND_PCM_FORMAT_S16_BE;
-#endif
-
-/*!
- * \brief Initialize the ALSA soundcard channels (capture AND playback) used by one interface (a multichannel soundcard can be used by multiple interfaces) 
- * \param p the celliax_pvt of the interface
- *
- * This function call alsa_open_dev to initialize the ALSA soundcard for each channel (capture AND playback) used by one interface (a multichannel soundcard can be used by multiple interfaces). Called by sound_init
- *
- * \return zero on success, -1 on error.
- */
-int alsa_init(struct celliax_pvt *p)
-{
-  p->alsac = alsa_open_dev(p, SND_PCM_STREAM_CAPTURE);
-  if (!p->alsac) {
-    ERRORA("Failed opening ALSA capture device: %s\n", CELLIAX_P_LOG, p->alsacname);
-    if (alsa_shutdown(p)) {
-      ERRORA("alsa_shutdown failed\n", CELLIAX_P_LOG);
-      return -1;
-    }
-    return -1;
-  }
-  p->alsap = alsa_open_dev(p, SND_PCM_STREAM_PLAYBACK);
-  if (!p->alsap) {
-    ERRORA("Failed opening ALSA playback device: %s\n", CELLIAX_P_LOG, p->alsapname);
-    if (alsa_shutdown(p)) {
-      ERRORA("alsa_shutdown failed\n", CELLIAX_P_LOG);
-      return -1;
-    }
-    return -1;
-  }
-
-  /* make valgrind very happy */
-  snd_config_update_free_global();
-  return 0;
-}
-
-/*!
- * \brief Shutdown the ALSA soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces) 
- * \param p the celliax_pvt of the interface
- *
- * This function shutdown the ALSA soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces). Called by sound_init
- *
- * \return zero on success, -1 on error.
- */
-
-int alsa_shutdown(struct celliax_pvt *p)
-{
-
-  int err;
-
-  if (p->alsap) {
-    err = snd_pcm_drop(p->alsap);
-    if (err < 0) {
-      ERRORA("device [%s], snd_pcm_drop failed with error '%s'\n", CELLIAX_P_LOG,
-             p->alsapname, snd_strerror(err));
-      return -1;
-    }
-    err = snd_pcm_close(p->alsap);
-    if (err < 0) {
-      ERRORA("device [%s], snd_pcm_close failed with error '%s'\n", CELLIAX_P_LOG,
-             p->alsapname, snd_strerror(err));
-      return -1;
-    }
-  }
-  if (p->alsac) {
-    err = snd_pcm_drop(p->alsac);
-    if (err < 0) {
-      ERRORA("device [%s], snd_pcm_drop failed with error '%s'\n", CELLIAX_P_LOG,
-             p->alsacname, snd_strerror(err));
-      return -1;
-    }
-    err = snd_pcm_close(p->alsac);
-    if (err < 0) {
-      ERRORA("device [%s], snd_pcm_close failed with error '%s'\n", CELLIAX_P_LOG,
-             p->alsacname, snd_strerror(err));
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-/*!
- * \brief Setup and open the ALSA device (capture OR playback) 
- * \param p the celliax_pvt of the interface
- * \param stream the ALSA capture/playback definition
- *
- * This function setup and open the ALSA device (capture OR playback). Called by alsa_init
- *
- * \return zero on success, -1 on error.
- */
-snd_pcm_t *alsa_open_dev(struct celliax_pvt * p, snd_pcm_stream_t stream)
-{
-
-  snd_pcm_t *handle = NULL;
-  snd_pcm_hw_params_t *params;
-  snd_pcm_sw_params_t *swparams;
-  snd_pcm_uframes_t buffer_size;
-  int err;
-  size_t n;
-  //snd_pcm_uframes_t xfer_align;
-  unsigned int rate;
-  snd_pcm_uframes_t start_threshold, stop_threshold;
-  snd_pcm_uframes_t period_size = 0;
-  snd_pcm_uframes_t chunk_size = 0;
-  int start_delay = 0;
-  int stop_delay = 0;
-  snd_pcm_state_t state;
-  snd_pcm_info_t *info;
-
-  period_size = p->alsa_period_size;
-
-  snd_pcm_hw_params_alloca(&params);
-  snd_pcm_sw_params_alloca(&swparams);
-
-  if (stream == SND_PCM_STREAM_CAPTURE) {
-    err = snd_pcm_open(&handle, p->alsacname, stream, 0 | SND_PCM_NONBLOCK);
-  } else {
-    err = snd_pcm_open(&handle, p->alsapname, stream, 0 | SND_PCM_NONBLOCK);
-  }
-  if (err < 0) {
-    ERRORA
-      ("snd_pcm_open failed with error '%s' on device '%s', if you are using a plughw:n device please change it to be a default:n device (so to allow it to be shared with other concurrent programs), or maybe you are using an ALSA voicemodem and slmodemd"
-       " is running?\n", CELLIAX_P_LOG, snd_strerror(err),
-       stream == SND_PCM_STREAM_CAPTURE ? p->alsacname : p->alsapname);
-    return NULL;
-  }
-
-  snd_pcm_info_alloca(&info);
-
-  if ((err = snd_pcm_info(handle, info)) < 0) {
-    ERRORA("info error: %s", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-
-  err = snd_pcm_nonblock(handle, 1);
-  if (err < 0) {
-    ERRORA("nonblock setting error: %s", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-
-  err = snd_pcm_hw_params_any(handle, params);
-  if (err < 0) {
-    ERRORA("Broken configuration for this PCM, no configurations available: %s\n",
-           CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-
-  err = snd_pcm_hw_params_set_access(handle, params, SND_PCM_ACCESS_RW_INTERLEAVED);
-  if (err < 0) {
-    ERRORA("Access type not available: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-  err = snd_pcm_hw_params_set_format(handle, params, celliax_format);
-  if (err < 0) {
-    ERRORA("Sample format non available: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-  err = snd_pcm_hw_params_set_channels(handle, params, 1);
-  if (err < 0) {
-    DEBUGA_SOUND("Channels count set failed: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-  }
-#if 1
-  unsigned int chan_num;
-  err = snd_pcm_hw_params_get_channels(params, &chan_num);
-  if (err < 0) {
-    ERRORA("Channels count non available: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-  if (chan_num < 1 || chan_num > 2) {
-    ERRORA("Channels count MUST BE 1 or 2, it is: %d\n", CELLIAX_P_LOG, chan_num);
-    ERRORA("Channels count MUST BE 1 or 2, it is: %d on %s %s\n", CELLIAX_P_LOG, chan_num,
-           p->alsapname, p->alsacname);
-    return NULL;
-  } else {
-    if (chan_num == 1) {
-      if (stream == SND_PCM_STREAM_CAPTURE)
-        p->alsa_capture_is_mono = 1;
-      else
-        p->alsa_play_is_mono = 1;
-    } else {
-      if (stream == SND_PCM_STREAM_CAPTURE)
-        p->alsa_capture_is_mono = 0;
-      else
-        p->alsa_play_is_mono = 0;
-    }
-  }
-#else
-  p->alsa_capture_is_mono = 1;
-  p->alsa_play_is_mono = 1;
-#endif
-
-#if 0
-  unsigned int buffer_time = 0;
-  unsigned int period_time = 0;
-  snd_pcm_uframes_t period_frames = 0;
-  snd_pcm_uframes_t buffer_frames = 0;
-
-  if (buffer_time == 0 && buffer_frames == 0) {
-    err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, 0);
-    assert(err >= 0);
-    if (buffer_time > 500000)
-      buffer_time = 500000;
-  }
-  if (period_time == 0 && period_frames == 0) {
-    if (buffer_time > 0)
-      period_time = buffer_time / 4;
-    else
-      period_frames = buffer_frames / 4;
-  }
-  if (period_time > 0)
-    err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, 0);
-  else
-    err = snd_pcm_hw_params_set_period_size_near(handle, params, &period_frames, 0);
-  assert(err >= 0);
-  if (buffer_time > 0) {
-    err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, 0);
-  } else {
-    err = snd_pcm_hw_params_set_buffer_size_near(handle, params, &buffer_frames);
-  }
-#endif
-
-#if 1
-  rate = p->celliax_sound_rate;
-  err = snd_pcm_hw_params_set_rate_near(handle, params, &rate, 0);
-  if ((float) p->celliax_sound_rate * 1.05 < rate
-      || (float) p->celliax_sound_rate * 0.95 > rate) {
-    WARNINGA("Rate is not accurate (requested = %iHz, got = %iHz)\n", CELLIAX_P_LOG,
-             p->celliax_sound_rate, rate);
-  }
-
-  if (err < 0) {
-    ERRORA("Error setting rate: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-  p->celliax_sound_rate = rate;
-
-  err = snd_pcm_hw_params_set_period_size_near(handle, params, &period_size, 0);
-
-  if (err < 0) {
-    ERRORA("Error setting period_size: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-
-  p->alsa_period_size = period_size;
-
-  p->alsa_buffer_size = p->alsa_period_size * p->alsa_periods_in_buffer;
-
-  err = snd_pcm_hw_params_set_buffer_size_near(handle, params, &p->alsa_buffer_size);
-
-  if (err < 0) {
-    ERRORA("Error setting buffer_size: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-#endif
-
-  err = snd_pcm_hw_params(handle, params);
-  if (err < 0) {
-    ERRORA("Unable to install hw params: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-
-  snd_pcm_hw_params_get_period_size(params, &chunk_size, 0);
-  snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
-  if (chunk_size == buffer_size) {
-    ERRORA("Can't use period equal to buffer size (%lu == %lu)\n", CELLIAX_P_LOG,
-           chunk_size, buffer_size);
-    return NULL;
-  }
-
-  snd_pcm_sw_params_current(handle, swparams);
-
-#if 0
-  err = snd_pcm_sw_params_get_xfer_align(swparams, &xfer_align);
-  if (err < 0) {
-    ERRORA("Unable to obtain xfer align: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-  }
-  NOTICA("xfer_align: %d\n", CELLIAX_P_LOG, xfer_align);
-  /* for some reason, on some platforms, xfer_align here is zero, that gives a floating point exception later. So, let's try to force it to 160, the frame size used by celliax */
-  xfer_align = p->alsa_period_size;
-  NOTICA("xfer_align: %d\n", CELLIAX_P_LOG, xfer_align);
-
-  err = snd_pcm_sw_params_set_xfer_align(handle, swparams, xfer_align);
-  if (err < 0) {
-    ERRORA("Error setting xfer_align: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-  }
-  NOTICA("xfer_align: %d\n", CELLIAX_P_LOG, xfer_align);
-
-  err = snd_pcm_sw_params_get_xfer_align(swparams, &xfer_align);
-  if (err < 0) {
-    ERRORA("Unable to obtain xfer align: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-  }
-  NOTICA("xfer_align: %d\n", CELLIAX_P_LOG, xfer_align);
-#endif
-
-  /*
-     if (sleep_min)
-     xfer_align = 1;
-     err = snd_pcm_sw_params_set_sleep_min(handle, swparams,
-     0);
-
-     if (err < 0) {
-     ERRORA("Error setting slep_min: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-     }
-   */
-  n = chunk_size;
-  err = snd_pcm_sw_params_set_avail_min(handle, swparams, n);
-  if (err < 0) {
-    ERRORA("Error setting avail_min: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-  }
-#if 0
-  /* round up to closest transfer boundary */
-  if (xfer_align == 0) {        //so to avoid floating point exception ????
-    xfer_align = 160;
-  }
-  //original n = (buffer_size / xfer_align) * xfer_align;
-  n = (chunk_size / xfer_align) * xfer_align;
-#endif
-  if (stream == SND_PCM_STREAM_CAPTURE) {
-    start_delay = 1;
-  }
-  if (start_delay <= 0) {
-    start_threshold = n + (double) rate *start_delay / 1000000;
-  } else {
-    start_threshold = (double) rate *start_delay / 1000000;
-  }
-  if (start_threshold < 1)
-    start_threshold = 1;
-  if (start_threshold > n)
-    start_threshold = n;
-  err = snd_pcm_sw_params_set_start_threshold(handle, swparams, start_threshold);
-  if (err < 0) {
-    ERRORA("Error setting start_threshold: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-  }
-
-  if (stop_delay <= 0)
-    stop_threshold = buffer_size + (double) rate *stop_delay / 1000000;
-  else
-    stop_threshold = (double) rate *stop_delay / 1000000;
-
-  if (stream == SND_PCM_STREAM_CAPTURE) {
-    stop_threshold = -1;
-  }
-
-  err = snd_pcm_sw_params_set_stop_threshold(handle, swparams, stop_threshold);
-
-  if (err < 0) {
-    ERRORA("Error setting stop_threshold: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-  }
-#if 0
-  err = snd_pcm_sw_params_set_xfer_align(handle, swparams, xfer_align);
-
-  if (err < 0) {
-    ERRORA("Error setting xfer_align: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-  }
-#endif
-
-  if (snd_pcm_sw_params(handle, swparams) < 0) {
-    ERRORA("Error installing software parameters: %s\n", CELLIAX_P_LOG,
-           snd_strerror(err));
-  }
-
-  err = snd_pcm_poll_descriptors_count(handle);
-  if (err <= 0) {
-    ERRORA("Unable to get a poll descriptors count, error is %s\n", CELLIAX_P_LOG,
-           snd_strerror(err));
-    return NULL;
-  }
-
-  if (err != 1) {               //number of poll descriptors
-    DEBUGA_SOUND("Can't handle more than one device\n", CELLIAX_P_LOG);
-    return NULL;
-  }
-
-  err = snd_pcm_poll_descriptors(handle, &p->pfd, err);
-  if (err != 1) {
-    ERRORA("snd_pcm_poll_descriptors failed, %s\n", CELLIAX_P_LOG, snd_strerror(err));
-    return NULL;
-  }
-  DEBUGA_SOUND("Acquired fd %d from the poll descriptor\n", CELLIAX_P_LOG, p->pfd.fd);
-
-  if (stream == SND_PCM_STREAM_CAPTURE) {
-    p->celliax_sound_capt_fd = p->pfd.fd;
-  }
-
-  state = snd_pcm_state(handle);
-
-  if (state != SND_PCM_STATE_RUNNING) {
-    if (state != SND_PCM_STATE_PREPARED) {
-      err = snd_pcm_prepare(handle);
-      if (err) {
-        ERRORA("snd_pcm_prepare failed, %s\n", CELLIAX_P_LOG, snd_strerror(err));
-        return NULL;
-      }
-      DEBUGA_SOUND("prepared!\n", CELLIAX_P_LOG);
-    }
-    if (stream == SND_PCM_STREAM_CAPTURE) {
-      err = snd_pcm_start(handle);
-      if (err) {
-        ERRORA("snd_pcm_start failed, %s\n", CELLIAX_P_LOG, snd_strerror(err));
-        return NULL;
-      }
-      DEBUGA_SOUND("started!\n", CELLIAX_P_LOG);
-    }
-  }
-  if (option_debug > 1) {
-    snd_output_t *output = NULL;
-    err = snd_output_stdio_attach(&output, stdout, 0);
-    if (err < 0) {
-      ERRORA("snd_output_stdio_attach failed: %s\n", CELLIAX_P_LOG, snd_strerror(err));
-    }
-    snd_pcm_dump(handle, output);
-  }
-  if (option_debug > 1)
-    DEBUGA_SOUND("ALSA handle = %ld\n", CELLIAX_P_LOG, (long int) handle);
-  return handle;
-
-}
-
-/*! \brief Read audio frames from interface */
-
-struct ast_frame *alsa_read(struct celliax_pvt *p)
-{
-  static struct ast_frame f;
-  static short __buf[CELLIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
-  static short __buf2[(CELLIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2) * 2];
-  short *buf;
-  short *buf2;
-  static int readpos = 0;
-  static int left = CELLIAX_FRAME_SIZE;
-  snd_pcm_state_t state;
-  int r = 0;
-  int off = 0;
-  int error = 0;
-  //time_t now_timestamp;
-
-  //memset(&f, 0, sizeof(struct ast_frame)); //giova
-
-  f.frametype = AST_FRAME_NULL;
-  f.subclass = 0;
-  f.samples = 0;
-  f.datalen = 0;
-  f.data = NULL;
-  f.offset = 0;
-  f.src = celliax_type;
-  f.mallocd = 0;
-  f.delivery.tv_sec = 0;
-  f.delivery.tv_usec = 0;
-
-  state = snd_pcm_state(p->alsac);
-  if (state != SND_PCM_STATE_RUNNING) {
-    DEBUGA_SOUND("ALSA read state is not SND_PCM_STATE_RUNNING\n", CELLIAX_P_LOG);
-
-    if (state != SND_PCM_STATE_PREPARED) {
-      error = snd_pcm_prepare(p->alsac);
-      if (error) {
-        ERRORA("snd_pcm_prepare failed, %s\n", CELLIAX_P_LOG, snd_strerror(error));
-        return &f;
-      }
-      DEBUGA_SOUND("prepared!\n", CELLIAX_P_LOG);
-    }
-    usleep(1000);
-    error = snd_pcm_start(p->alsac);
-    if (error) {
-      ERRORA("snd_pcm_start failed, %s\n", CELLIAX_P_LOG, snd_strerror(error));
-      return &f;
-    }
-    DEBUGA_SOUND("started!\n", CELLIAX_P_LOG);
-    usleep(1000);
-  }
-
-  buf = __buf + AST_FRIENDLY_OFFSET / 2;
-  buf2 = __buf2 + ((AST_FRIENDLY_OFFSET / 2) * 2);
-
-  if (p->alsa_capture_is_mono) {
-    r = snd_pcm_readi(p->alsac, buf + readpos, left);
-  } else {
-    r = snd_pcm_readi(p->alsac, buf2 + (readpos * 2), left);
-
-    int a = 0;
-    int i = 0;
-    for (i = 0; i < (CELLIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2) * 2;) {
-      __buf[a] = (__buf2[i] + __buf2[i + 1]) / 2;   //comment out this line to use only left
-      //__buf[a] = __buf2[i]; // enable this line to use only left
-      a++;
-      i++;
-      i++;
-    }
-  }
-
-  if (r == -EPIPE) {
-    ERRORA("XRUN read\n\n\n\n\n", CELLIAX_P_LOG);
-    return &f;
-  } else if (r == -ESTRPIPE) {
-    ERRORA("-ESTRPIPE\n", CELLIAX_P_LOG);
-    return &f;
-
-  } else if (r == -EAGAIN) {
-    DEBUGA_SOUND("ALSA read -EAGAIN, the soundcard is not ready to be read by celliax\n",
-                 CELLIAX_P_LOG);
-    while (r == -EAGAIN) {
-      usleep(1000);
-
-      if (p->alsa_capture_is_mono) {
-        r = snd_pcm_readi(p->alsac, buf + readpos, left);
-      } else {
-        r = snd_pcm_readi(p->alsac, buf2 + (readpos * 2), left);
-
-        int a = 0;
-        int i = 0;
-        for (i = 0; i < (CELLIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2) * 2;) {
-          __buf[a] = (__buf2[i] + __buf2[i + 1]) / 2;
-          a++;
-          i++;
-          i++;
-        }
-      }
-
-    }
-  } else if (r < 0) {
-    WARNINGA("ALSA Read error: %s\n", CELLIAX_P_LOG, snd_strerror(r));
-  } else if (r >= 0) {
-    //DEBUGA_SOUND("read: r=%d, readpos=%d, left=%d, off=%d\n", CELLIAX_P_LOG, r, readpos, left, off);
-    off -= r;                   //what is the meaning of this? a leftover, probably
-  }
-  /* Update positions */
-  readpos += r;
-  left -= r;
-
-  if (readpos >= CELLIAX_FRAME_SIZE) {
-    /* A real frame */
-    readpos = 0;
-    left = CELLIAX_FRAME_SIZE;
-
-    f.frametype = AST_FRAME_VOICE;
-    f.subclass = AST_FORMAT_SLINEAR;
-    f.samples = CELLIAX_FRAME_SIZE;
-    f.datalen = CELLIAX_FRAME_SIZE * 2;
-    f.data = buf;
-    f.offset = AST_FRIENDLY_OFFSET;
-    f.src = celliax_type;
-    f.mallocd = 0;
-#ifdef ALSA_MONITOR
-    alsa_monitor_read((char *) buf, CELLIAX_FRAME_SIZE * 2);
-#endif
-
-  }
-  return &f;
-}
-
-/*! \brief Write audio frames to interface */
-int alsa_write(struct celliax_pvt *p, struct ast_frame *f)
-{
-  static char sizbuf[8000];
-  static char sizbuf2[16000];
-  static char silencebuf[8000];
-  static int sizpos = 0;
-  int len = sizpos;
-  int pos;
-  int res = 0;
-  time_t now_timestamp;
-  /* size_t frames = 0; */
-  snd_pcm_state_t state;
-  snd_pcm_sframes_t delayp1;
-  snd_pcm_sframes_t delayp2;
-
-  /* We have to digest the frame in 160-byte portions */
-  if (f->datalen > sizeof(sizbuf) - sizpos) {
-    ERRORA("Frame too large\n", CELLIAX_P_LOG);
-    res = -1;
-  } else {
-    memcpy(sizbuf + sizpos, f->data, f->datalen);
-    len += f->datalen;
-    pos = 0;
-#ifdef ALSA_MONITOR
-    alsa_monitor_write(sizbuf, len);
-#endif
-    state = snd_pcm_state(p->alsap);
-    if (state == SND_PCM_STATE_XRUN) {
-      int i;
-
-      DEBUGA_SOUND
-        ("You've got an ALSA write XRUN in the past (celliax can't fill the soundcard buffer fast enough). If this happens often (not after silence or after a pause in the speech, that's OK), and appear to damage the sound quality, first check if you have some IRQ problem, maybe sharing the soundcard IRQ with a broken or heavy loaded ethernet or graphic card. Then consider to increase the alsa_periods_in_buffer (now is set to %d) for this interface in the config file\n",
-         CELLIAX_P_LOG, p->alsa_periods_in_buffer);
-      res = snd_pcm_prepare(p->alsap);
-      if (res) {
-        ERRORA("audio play prepare failed: %s\n", CELLIAX_P_LOG, snd_strerror(res));
-      } else {
-        res = snd_pcm_format_set_silence(celliax_format, silencebuf, len / 2);
-        if (res < 0) {
-          DEBUGA_SOUND("Silence error %s\n", CELLIAX_P_LOG, snd_strerror(res));
-          res = -1;
-        }
-        for (i = 0; i < (p->alsa_periods_in_buffer - 1); i++) {
-          res = snd_pcm_writei(p->alsap, silencebuf, len / 2);
-          if (res != len / 2) {
-            DEBUGA_SOUND("Write returned a different quantity: %d\n", CELLIAX_P_LOG, res);
-            res = -1;
-          } else if (res < 0) {
-            DEBUGA_SOUND("Write error %s\n", CELLIAX_P_LOG, snd_strerror(res));
-            res = -1;
-          }
-        }
-      }
-
-    }
-
-    res = snd_pcm_delay(p->alsap, &delayp1);
-    if (res < 0) {
-      DEBUGA_SOUND("Error %d on snd_pcm_delay: \"%s\"\n", CELLIAX_P_LOG, res,
-                   snd_strerror(res));
-      res = snd_pcm_prepare(p->alsap);
-      if (res) {
-        DEBUGA_SOUND("snd_pcm_prepare failed: '%s'\n", CELLIAX_P_LOG, snd_strerror(res));
-      }
-      res = snd_pcm_delay(p->alsap, &delayp1);
-    }
-
-    delayp2 = snd_pcm_avail_update(p->alsap);
-    if (delayp2 < 0) {
-      DEBUGA_SOUND("Error %d on snd_pcm_avail_update: \"%s\"\n", CELLIAX_P_LOG,
-                   (int) delayp2, snd_strerror(delayp2));
-
-      res = snd_pcm_prepare(p->alsap);
-      if (res) {
-        DEBUGA_SOUND("snd_pcm_prepare failed: '%s'\n", CELLIAX_P_LOG, snd_strerror(res));
-      }
-      delayp2 = snd_pcm_avail_update(p->alsap);
-    }
-
-    if (                        /* delayp1 != 0 && delayp1 != 160 */
-         delayp1 < 160 || delayp2 > p->alsa_buffer_size) {
-
-      res = snd_pcm_prepare(p->alsap);
-      if (res) {
-        DEBUGA_SOUND
-          ("snd_pcm_prepare failed while trying to prevent an ALSA write XRUN: %s, delayp1=%d, delayp2=%d\n",
-           CELLIAX_P_LOG, snd_strerror(res), (int) delayp1, (int) delayp2);
-      } else {
-
-        int i;
-        for (i = 0; i < (p->alsa_periods_in_buffer - 1); i++) {
-          res = snd_pcm_format_set_silence(celliax_format, silencebuf, len / 2);
-          if (res < 0) {
-            DEBUGA_SOUND("Silence error %s\n", CELLIAX_P_LOG, snd_strerror(res));
-            res = -1;
-          }
-          res = snd_pcm_writei(p->alsap, silencebuf, len / 2);
-          if (res < 0) {
-            DEBUGA_SOUND("Write error %s\n", CELLIAX_P_LOG, snd_strerror(res));
-            res = -1;
-          } else if (res != len / 2) {
-            DEBUGA_SOUND("Write returned a different quantity: %d\n", CELLIAX_P_LOG, res);
-            res = -1;
-          }
-        }
-
-        DEBUGA_SOUND
-          ("PREVENTING an ALSA write XRUN (celliax can't fill the soundcard buffer fast enough). If this happens often (not after silence or after a pause in the speech, that's OK), and appear to damage the sound quality, first check if you have some IRQ problem, maybe sharing the soundcard IRQ with a broken or heavy loaded ethernet or graphic card. Then consider to increase the alsa_periods_in_buffer (now is set to %d) for this interface in the config file. delayp1=%d, delayp2=%d\n",
-           CELLIAX_P_LOG, p->alsa_periods_in_buffer, (int) delayp1, (int) delayp2);
-      }
-
-    }
-
-    memset(sizbuf2, 0, sizeof(sizbuf2));
-    if (p->alsa_play_is_mono) {
-      res = snd_pcm_writei(p->alsap, sizbuf, len / 2);
-    } else {
-      int a = 0;
-      int i = 0;
-      for (i = 0; i < 8000;) {
-        sizbuf2[a] = sizbuf[i];
-        a++;
-        i++;
-        sizbuf2[a] = sizbuf[i];
-        a++;
-        i--;
-        sizbuf2[a] = sizbuf[i]; // comment out this line to use only left 
-        a++;
-        i++;
-        sizbuf2[a] = sizbuf[i]; // comment out this line to use only left
-        a++;
-        i++;
-      }
-      res = snd_pcm_writei(p->alsap, sizbuf2, len);
-    }
-    if (res == -EPIPE) {
-      DEBUGA_SOUND
-        ("ALSA write EPIPE (XRUN) (celliax can't fill the soundcard buffer fast enough). If this happens often (not after silence or after a pause in the speech, that's OK), and appear to damage the sound quality, first check if you have some IRQ problem, maybe sharing the soundcard IRQ with a broken or heavy loaded ethernet or graphic card. Then consider to increase the alsa_periods_in_buffer (now is set to %d) for this interface in the config file. delayp1=%d, delayp2=%d\n",
-         CELLIAX_P_LOG, p->alsa_periods_in_buffer, (int) delayp1, (int) delayp2);
-      res = snd_pcm_prepare(p->alsap);
-      if (res) {
-        ERRORA("audio play prepare failed: %s\n", CELLIAX_P_LOG, snd_strerror(res));
-      } else {
-
-        if (p->alsa_play_is_mono) {
-          res = snd_pcm_writei(p->alsap, sizbuf, len / 2);
-        } else {
-          int a = 0;
-          int i = 0;
-          for (i = 0; i < 8000;) {
-            sizbuf2[a] = sizbuf[i];
-            a++;
-            i++;
-            sizbuf2[a] = sizbuf[i];
-            a++;
-            i--;
-            sizbuf2[a] = sizbuf[i];
-            a++;
-            i++;
-            sizbuf2[a] = sizbuf[i];
-            a++;
-            i++;
-          }
-          res = snd_pcm_writei(p->alsap, sizbuf2, len);
-        }
-
-      }
-
-    } else {
-      if (res == -ESTRPIPE) {
-        ERRORA("You've got some big problems\n", CELLIAX_P_LOG);
-      } else if (res == -EAGAIN) {
-        res = 0;
-      } else if (res < 0) {
-        ERRORA("Error %d on audio write: \"%s\"\n", CELLIAX_P_LOG, res,
-               snd_strerror(res));
-      }
-    }
-  }
-
-  if (p->audio_play_reset_period) {
-    time(&now_timestamp);
-    if ((now_timestamp - p->audio_play_reset_timestamp) > p->audio_play_reset_period) {
-      if (option_debug)
-        DEBUGA_SOUND("reset audio play\n", CELLIAX_P_LOG);
-      res = snd_pcm_wait(p->alsap, 1000);
-      if (res < 0) {
-        ERRORA("audio play wait failed: %s\n", CELLIAX_P_LOG, snd_strerror(res));
-      }
-      res = snd_pcm_drop(p->alsap);
-      if (res) {
-        ERRORA("audio play drop failed: %s\n", CELLIAX_P_LOG, snd_strerror(res));
-      }
-      res = snd_pcm_prepare(p->alsap);
-      if (res) {
-        ERRORA("audio play prepare failed: %s\n", CELLIAX_P_LOG, snd_strerror(res));
-      }
-      res = snd_pcm_wait(p->alsap, 1000);
-      if (res < 0) {
-        ERRORA("audio play wait failed: %s\n", CELLIAX_P_LOG, snd_strerror(res));
-      }
-      time(&p->audio_play_reset_timestamp);
-    }
-  }
-  res = 0;
-  if (res > 0)
-    res = 0;
-  return res;
-}
-
-
-/*! \brief Write audio frames to interface */
-#endif /* CELLIAX_ALSA */
-
-#ifdef CELLIAX_PORTAUDIO
-int celliax_portaudio_devlist(struct celliax_pvt *p)
-{
-  int i, numDevices;
-  const PaDeviceInfo *deviceInfo;
-
-  numDevices = Pa_GetDeviceCount();
-  if (numDevices < 0) {
-    return 0;
-  }
-  for (i = 0; i < numDevices; i++) {
-    deviceInfo = Pa_GetDeviceInfo(i);
-    NOTICA
-      ("Found PORTAUDIO device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-       CELLIAX_P_LOG, i, deviceInfo->name, deviceInfo->maxInputChannels,
-       deviceInfo->maxOutputChannels);
-  }
-
-  return numDevices;
-}
-
-int celliax_portaudio_init(struct celliax_pvt *p)
-{
-  PaError err;
-  int c;
-  PaStreamParameters inputParameters, outputParameters;
-  int numdevices;
-  const PaDeviceInfo *deviceInfo;
-
-#ifndef GIOVA48
-  setenv("PA_ALSA_PLUGHW", "1", 1);
-#endif // GIOVA48
-
-  err = Pa_Initialize();
-  if (err != paNoError)
-    return err;
-
-  numdevices = celliax_portaudio_devlist(p);
-
-  if (p->portaudiocindex > (numdevices - 1)) {
-    ERRORA("Portaudio Capture id=%d is out of range: valid id are from 0 to %d\n",
-           CELLIAX_P_LOG, p->portaudiocindex, (numdevices - 1));
-    return -1;
-  }
-
-  if (p->portaudiopindex > (numdevices - 1)) {
-    ERRORA("Portaudio Playback id=%d is out of range: valid id are from 0 to %d\n",
-           CELLIAX_P_LOG, p->portaudiopindex, (numdevices - 1));
-    return -1;
-  }
-  //inputParameters.device = 0;
-  if (p->portaudiocindex != -1) {
-    inputParameters.device = p->portaudiocindex;
-  } else {
-    inputParameters.device = Pa_GetDefaultInputDevice();
-  }
-  deviceInfo = Pa_GetDeviceInfo(inputParameters.device);
-  NOTICA
-    ("Using INPUT PORTAUDIO device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-     CELLIAX_P_LOG, inputParameters.device, deviceInfo->name,
-     deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
-  if (deviceInfo->maxInputChannels == 0) {
-    ERRORA
-      ("No INPUT channels on device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-       CELLIAX_P_LOG, inputParameters.device, deviceInfo->name,
-       deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
-    return -1;
-  }
-  inputParameters.channelCount = 1;
-  inputParameters.sampleFormat = paInt16;
-  //inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultHighInputLatency;
-  inputParameters.suggestedLatency = 0.1;
-  inputParameters.hostApiSpecificStreamInfo = NULL;
-
-  //outputParameters.device = 3;
-  if (p->portaudiopindex != -1) {
-    outputParameters.device = p->portaudiopindex;
-  } else {
-    outputParameters.device = Pa_GetDefaultOutputDevice();
-  }
-  deviceInfo = Pa_GetDeviceInfo(outputParameters.device);
-  NOTICA
-    ("Using OUTPUT PORTAUDIO device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-     CELLIAX_P_LOG, outputParameters.device, deviceInfo->name,
-     deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
-  if (deviceInfo->maxOutputChannels == 0) {
-    ERRORA
-      ("No OUTPUT channels on device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
-       CELLIAX_P_LOG, inputParameters.device, deviceInfo->name,
-       deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
-    return -1;
-  }
-#ifndef GIOVA48
-  outputParameters.channelCount = 1;
-#else // GIOVA48
-  outputParameters.channelCount = 2;
-#endif // GIOVA48
-  outputParameters.sampleFormat = paInt16;
-  //outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultHighOutputLatency;
-  outputParameters.suggestedLatency = 0.1;
-  outputParameters.hostApiSpecificStreamInfo = NULL;
-
-/* build the pipe that will be polled on by pbx */
-  c = pipe(p->audiopipe);
-  if (c) {
-    ERRORA("Unable to create audio pipe\n", CELLIAX_P_LOG);
-    return -1;
-  }
-  fcntl(p->audiopipe[0], F_SETFL, O_NONBLOCK);
-  fcntl(p->audiopipe[1], F_SETFL, O_NONBLOCK);
-
-  err =
-#ifndef GIOVA48
-    OpenAudioStream(&p->stream, &inputParameters, &outputParameters, 8000,
-                    paDitherOff | paClipOff, SAMPLES_PER_FRAME, p->audiopipe[1],
-                    &p->speexecho, &p->speexpreprocess, &p->owner);
-
-#else // GIOVA48
-    OpenAudioStream(&p->stream, &inputParameters, &outputParameters, 48000,
-                    paDitherOff | paClipOff, SAMPLES_PER_FRAME, p->audiopipe[1],
-                    &p->speexecho, &p->speexpreprocess, &p->owner);
-
-#endif // GIOVA48
-  if (err != paNoError) {
-    ERRORA("Unable to open audio stream: %s\n", CELLIAX_P_LOG, Pa_GetErrorText(err));
-    return -1;
-  }
-
-/* the pipe is our audio fd for pbx to poll on */
-  p->celliax_sound_capt_fd = p->audiopipe[0];
-
-  return 0;
-}
-
-int celliax_portaudio_write(struct celliax_pvt *p, struct ast_frame *f)
-{
-  int samples;
-#ifdef GIOVA48
-  //short buf[CELLIAX_FRAME_SIZE * 2];
-  short buf[3840];
-  short *buf2;
-
-  //ERRORA("1 f->datalen=: %d\n", CELLIAX_P_LOG, f->datalen);
-
-  memset(buf, '\0', CELLIAX_FRAME_SIZE * 2);
-
-  buf2 = f->data;
-
-  int i = 0, a = 0;
-
-  for (i = 0; i < f->datalen / sizeof(short); i++) {
-//stereo, 2 chan 48 -> mono 8
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    buf[a] = buf2[i];
-    a++;
-    /*
-     */
-  }
-  f->data = &buf;
-  f->datalen = f->datalen * 6;
-  //ERRORA("2 f->datalen=: %d\n", CELLIAX_P_LOG, f->datalen);
-  //f->datalen = f->datalen;
-#endif // GIOVA48
-
-#ifdef ASTERISK_VERSION_1_6_0_1
-  samples =
-    WriteAudioStream(p->stream, (short *) f->data.ptr,
-                     (int) (f->datalen / sizeof(short)));
-#else
-  samples =
-    WriteAudioStream(p->stream, (short *) f->data, (int) (f->datalen / sizeof(short)));
-#endif /* ASTERISK_VERSION_1_6_0_1 */
-
-  if (samples != (int) (f->datalen / sizeof(short)))
-    ERRORA("WriteAudioStream wrote: %d of %d\n", CELLIAX_P_LOG, samples,
-           (int) (f->datalen / sizeof(short)));
-
-  return 0;
-}
-
-struct ast_frame *celliax_portaudio_read(struct celliax_pvt *p)
-{
-  static struct ast_frame f;
-  static short __buf[CELLIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
-  short *buf;
-  static short __buf2[CELLIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
-  short *buf2;
-  int samples;
-  char c;
-
-  memset(__buf, '\0', (CELLIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2));
-
-  buf = __buf + AST_FRIENDLY_OFFSET / 2;
-
-  memset(__buf2, '\0', (CELLIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2));
-
-  buf2 = __buf2 + AST_FRIENDLY_OFFSET / 2;
-
-  f.frametype = AST_FRAME_NULL;
-  f.subclass = 0;
-  f.samples = 0;
-  f.datalen = 0;
-
-#ifdef ASTERISK_VERSION_1_6_0_1
-  f.data.ptr = NULL;
-#else
-  f.data = NULL;
-#endif /* ASTERISK_VERSION_1_6_0_1 */
-  f.offset = 0;
-  f.src = celliax_type;
-  f.mallocd = 0;
-  f.delivery.tv_sec = 0;
-  f.delivery.tv_usec = 0;
-
-  if ((samples = ReadAudioStream(p->stream, buf, SAMPLES_PER_FRAME)) == 0) {
-    //do nothing
-  } else {
-#ifdef GIOVA48
-    int i = 0, a = 0;
-
-    samples = samples / 6;
-    for (i = 0; i < samples; i++) {
-      buf2[i] = buf[a];
-      a = a + 6;                //mono, 1 chan 48 -> 8
-    }
-    buf = buf2;
-
-    /* A real frame */
-    f.frametype = AST_FRAME_VOICE;
-    f.subclass = AST_FORMAT_SLINEAR;
-    f.samples = CELLIAX_FRAME_SIZE / 6;
-    f.datalen = CELLIAX_FRAME_SIZE * 2 / 6;
-#else // GIOVA48
-    /* A real frame */
-    f.frametype = AST_FRAME_VOICE;
-    f.subclass = AST_FORMAT_SLINEAR;
-    f.samples = CELLIAX_FRAME_SIZE;
-    f.datalen = CELLIAX_FRAME_SIZE * 2;
-#endif // GIOVA48
-
-#ifdef ASTERISK_VERSION_1_6_0_1
-    f.data.ptr = buf;
-#else
-    f.data = buf;
-#endif /* ASTERISK_VERSION_1_6_0_1 */
-    f.offset = AST_FRIENDLY_OFFSET;
-    f.src = celliax_type;
-    f.mallocd = 0;
-  }
-
-  read(p->audiopipe[0], &c, 1);
-
-  return &f;
-}
-
-int celliax_portaudio_shutdown(struct celliax_pvt *p)
-{
-  PaError err;
-
-  err = CloseAudioStream(p->stream);
-
-  if (err != paNoError)
-    ERRORA("not able to CloseAudioStream\n", CELLIAX_P_LOG);
-
-  Pa_Terminate();
-  return 0;
-}
-#endif // CELLIAX_PORTAUDIO
-
-int celliax_serial_sync_AT(struct celliax_pvt *p)
-{
-  usleep(10000);                /* 10msec */
-  time(&p->celliax_serial_synced_timestamp);
-  return 0;
-}
-
-int celliax_serial_getstatus_AT(struct celliax_pvt *p)
-{
-  int res;
-
-  if (p->owner) {
-    if (p->owner->_state != AST_STATE_UP && p->owner->_state != AST_STATE_DOWN) {
-      DEBUGA_AT("No getstatus, we're neither UP nor DOWN\n", CELLIAX_P_LOG);
-      return 0;
-    }
-  }
-
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-  res = celliax_serial_write_AT_ack(p, "AT");
-  if (res) {
-    ERRORA("AT was not acknowledged, continuing but maybe there is a problem\n",
-           CELLIAX_P_LOG);
-  }
-  usleep(1000);
-
-  if (strlen(p->at_query_battchg)) {
-    res =
-      celliax_serial_write_AT_expect(p, p->at_query_battchg, p->at_query_battchg_expect);
-    if (res) {
-      WARNINGA("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-               p->at_query_battchg, p->at_query_battchg_expect);
-    }
-    usleep(1000);
-  }
-
-  if (strlen(p->at_query_signal)) {
-    res =
-      celliax_serial_write_AT_expect(p, p->at_query_signal, p->at_query_signal_expect);
-    if (res) {
-      WARNINGA("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-               p->at_query_signal, p->at_query_signal_expect);
-    }
-    usleep(1000);
-  }
-  //FIXME all the following commands in config!
-
-  if (p->sms_cnmi_not_supported) {
-    res = celliax_serial_write_AT_ack(p, "AT+MMGL=\"HEADER ONLY\"");
-    if (res) {
-      WARNINGA
-        ("%s does not get %s from the modem, maybe a long msg is incoming. If this cellmodem is not a Motorola, you are arriving here because your cellmodem do not supports CNMI kind of incoming SMS alert; please let it know to the developers of Celliax. If this cellmodem is a Motorola and this message keeps repeating, and you cannot correctly receive SMSs from this interface, please manually clean all messages from the cellmodem/SIM. Continuing.\n",
-         CELLIAX_P_LOG, "AT+MMGL=\"HEADER ONLY\"", "OK");
-    } else {
-      usleep(1000);
-      if (p->unread_sms_msg_id) {
-        char at_command[256];
-
-        if (p->no_ucs2 == 0) {
-          res = celliax_serial_write_AT_ack(p, "AT+CSCS=\"UCS2\"");
-          if (res) {
-            ERRORA
-              ("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  do not got OK from the phone\n",
-               CELLIAX_P_LOG);
-            memset(p->sms_message, 0, sizeof(p->sms_message));
-          }
-        }
-
-        memset(at_command, 0, sizeof(at_command));
-        sprintf(at_command, "AT+CMGR=%d", p->unread_sms_msg_id);
-        memset(p->sms_message, 0, sizeof(p->sms_message));
-
-        p->reading_sms_msg = 1;
-        res = celliax_serial_write_AT_ack(p, at_command);
-        p->reading_sms_msg = 0;
-        if (res) {
-          ERRORA
-            ("AT+CMGR (read SMS) do not got OK from the phone, message sent was:|||%s|||\n",
-             CELLIAX_P_LOG, at_command);
-        }
-        res = celliax_serial_write_AT_ack(p, "AT+CSCS=\"GSM\"");
-        if (res) {
-          ERRORA
-            ("AT+CSCS=\"GSM\" (set TE messages to GSM) do not got OK from the phone\n",
-             CELLIAX_P_LOG);
-        }
-        memset(at_command, 0, sizeof(at_command));
-        sprintf(at_command, "AT+CMGD=%d", p->unread_sms_msg_id);    /* delete the message */
-        p->unread_sms_msg_id = 0;
-        res = celliax_serial_write_AT_ack(p, at_command);
-        if (res) {
-          ERRORA
-            ("AT+CMGD (Delete SMS) do not got OK from the phone, message sent was:|||%s|||\n",
-             CELLIAX_P_LOG, at_command);
-        }
-
-        if (strlen(p->sms_message)) {
-
-          manager_event(EVENT_FLAG_SYSTEM, "CELLIAXincomingsms",
-                        "Interface: %s\r\nSMS_Message: %s\r\n", p->name, p->sms_message);
-
-          if (strlen(p->sms_receiving_program)) {
-            int fd1[2];
-            pid_t pid1;
-            char *arg1[] = { p->sms_receiving_program, (char *) NULL };
-            int i;
-
-            NOTICA("incoming SMS message:>>>%s<<<\n", CELLIAX_P_LOG, p->sms_message);
-            pipe(fd1);
-            pid1 = switch_fork();
-
-            if (pid1 == 0) {    //child
-              int err;
-
-              dup2(fd1[0], 0);  // Connect stdin to pipe output
-              close(fd1[1]);    // close input pipe side
-              setsid();         //session id
-              err = execvp(arg1[0], arg1);  //exec our program, with stdin connected to pipe output
-              if (err) {
-                ERRORA
-                  ("'sms_receiving_program' is set in config file to '%s', and it gave us back this error: %d, (%s). SMS received was:---%s---\n",
-                   CELLIAX_P_LOG, p->sms_receiving_program, err, strerror(errno),
-                   p->sms_message);
-              }
-              close(fd1[0]);    // close output pipe side
-            }                   //starting here continue the parent
-            close(fd1[0]);      // close output pipe side
-            // write the msg on the pipe input
-            for (i = 0; i < strlen(p->sms_message); i++) {
-              write(fd1[1], &p->sms_message[i], 1);
-            }
-            close(fd1[1]);      // close pipe input, let our program know we've finished
-          } else {
-            ERRORA
-              ("got SMS incoming message, but 'sms_receiving_program' is not set in config file. SMS received was:---%s---\n",
-               CELLIAX_P_LOG, p->sms_message);
-          }
-        }
-#if 1                           //is this one needed? maybe it can interrupt an incoming call that is just to announce itself
-        if (p->phone_callflow == CALLFLOW_CALL_IDLE
-            && p->interface_state == AST_STATE_DOWN && p->owner == NULL) {
-          /* we're not in a call, neither calling */
-          res = celliax_serial_write_AT_ack(p, "AT+CKPD=\"EEE\"");
-          if (res) {
-            ERRORA
-              ("AT+CKPD=\"EEE\" (cellphone screen back to user) do not got OK from the phone\n",
-               CELLIAX_P_LOG);
-          }
-        }
-#endif
-      }
-    }
-  }
-
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-  return 0;
-}
-
-int celliax_serial_read_AT(struct celliax_pvt *p, int look_for_ack, int timeout_usec,
-                           int timeout_sec, const char *expected_string, int expect_crlf)
-{
-  int select_err;
-  int res;
-  fd_set read_fds;
-  struct timeval timeout;
-  char tmp_answer[AT_BUFSIZ];
-  char tmp_answer2[AT_BUFSIZ];
-  char *tmp_answer_ptr;
-  char *last_line_ptr;
-  int i = 0;
-  int read_count = 0;
-  int la_counter = 0;
-  int at_ack = -1;
-  int la_read = 0;
-
-  FD_ZERO(&read_fds);
-  FD_SET(p->controldevfd, &read_fds);
-
-  //NOTICA (" INSIDE this celliax_serial_device %s \n", CELLIAX_P_LOG, p->controldevice_name);
-  tmp_answer_ptr = tmp_answer;
-  memset(tmp_answer, 0, sizeof(char) * AT_BUFSIZ);
-
-  timeout.tv_sec = timeout_sec;
-  timeout.tv_usec = timeout_usec;
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-
-  while ((select_err = select(p->controldevfd + 1, &read_fds, NULL, NULL, &timeout)) > 0) {
-    timeout.tv_sec = timeout_sec;   //reset the timeout, linux modify it
-    timeout.tv_usec = timeout_usec; //reset the timeout, linux modify it
-    read_count =
-      read(p->controldevfd, tmp_answer_ptr, AT_BUFSIZ - (tmp_answer_ptr - tmp_answer));
-
-    if (read_count == 0) {
-      ERRORA
-        ("read 0 bytes!!! Nenormalno! Marking this celliax_serial_device %s as dead, andif it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, power down or battery exhausted\n",
-         CELLIAX_P_LOG, p->controldevice_name);
-      p->controldev_dead = 1;
-      close(p->controldevfd);
-      UNLOCKA(&p->controldev_lock);
-      if (p->owner) {
-        p->owner->hangupcause = AST_CAUSE_FAILURE;
-        celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-      }
-      return -1;
-    }
-
-    if (option_debug > 90) {
-      //DEBUGA_AT("1 read %d bytes, --|%s|--\n", CELLIAX_P_LOG, read_count, tmp_answer_ptr);
-      //DEBUGA_AT("2 read %d bytes, --|%s|--\n", CELLIAX_P_LOG, read_count, tmp_answer);
-    }
-    tmp_answer_ptr = tmp_answer_ptr + read_count;
-
-    char *token_ptr;
-
-    la_counter = 0;
-    memset(tmp_answer2, 0, sizeof(char) * AT_BUFSIZ);
-    strcpy(tmp_answer2, tmp_answer);
-    if ((token_ptr = strtok(tmp_answer2, "\n\r"))) {
-      last_line_ptr = token_ptr;
-      strncpy(p->line_array.result[la_counter], token_ptr, AT_MESG_MAX_LENGTH);
-      if (strlen(token_ptr) > AT_MESG_MAX_LENGTH) {
-        WARNINGA
-          ("AT mesg longer than buffer, original message was: |%s|, in buffer only: |%s|\n",
-           CELLIAX_P_LOG, token_ptr, p->line_array.result[la_counter]);
-      }
-      la_counter++;
-      while ((token_ptr = strtok(NULL, "\n\r"))) {
-        last_line_ptr = token_ptr;
-        strncpy(p->line_array.result[la_counter], token_ptr, AT_MESG_MAX_LENGTH);
-        if (strlen(token_ptr) > AT_MESG_MAX_LENGTH) {
-          WARNINGA
-            ("AT mesg longer than buffer, original message was: |%s|, in buffer only: |%s|\n",
-             CELLIAX_P_LOG, token_ptr, p->line_array.result[la_counter]);
-        }
-        la_counter++;
-      }
-    } else {
-      last_line_ptr = tmp_answer;
-    }
-
-    if (expected_string && !expect_crlf) {
-      DEBUGA_AT
-        ("last_line_ptr=|%s|, expected_string=|%s|, expect_crlf=%d, memcmp(last_line_ptr, expected_string, strlen(expected_string)) = %d\n",
-         CELLIAX_P_LOG, last_line_ptr, expected_string, expect_crlf, memcmp(last_line_ptr,
-                                                                            expected_string,
-                                                                            strlen
-                                                                            (expected_string)));
-    }
-
-    if (expected_string && !expect_crlf
-        && !memcmp(last_line_ptr, expected_string, strlen(expected_string))
-      ) {
-      strncpy(p->line_array.result[la_counter], last_line_ptr, AT_MESG_MAX_LENGTH);
-      // match expected string -> accept it withtout CRLF
-      la_counter++;
-
-    }
-    /* if the last line read was not a complete line, we'll read the rest in the future */
-    else if (tmp_answer[strlen(tmp_answer) - 1] != '\r'
-             && tmp_answer[strlen(tmp_answer) - 1] != '\n')
-      la_counter--;
-
-    /* let's list the complete lines read so far, without re-listing the lines that has yet been listed */
-    if (option_debug > 1) {
-      for (i = la_read; i < la_counter; i++)
-        DEBUGA_AT("Read line %d: |%s|\n", CELLIAX_P_LOG, i, p->line_array.result[i]);
-    }
-
-    /* let's interpret the complete lines read so far (WITHOUT looking for OK, ERROR, and EXPECTED_STRING), without re-interpreting the lines that has been yet interpreted, so we're sure we don't miss anything */
-    for (i = la_read; i < la_counter; i++) {
-
-      if ((strcmp(p->line_array.result[i], "RING") == 0)) {
-        /* with first RING we wait for callid */
-        gettimeofday(&(p->ringtime), NULL);
-        /* give CALLID (+CLIP) a chance, wait for the next RING before answering */
-        if (p->phone_callflow == CALLFLOW_INCOMING_RING) {
-          /* we're at the second ring, set the interface state, will be answered by celliax_do_monitor */
-          DEBUGA_AT("|%s| got second RING\n", CELLIAX_P_LOG, p->line_array.result[i]);
-          p->interface_state = AST_STATE_RING;
-        } else {
-          /* we're at the first ring, so there is no CALLID yet thus clean the previous one 
-             just in case we don't receive the caller identification in this new call */
-          memset(p->callid_name, 0, sizeof(p->callid_name));
-          memset(p->callid_number, 0, sizeof(p->callid_number));
-          /* only send AT+CLCC? if the device previously reported its support */
-          if (p->at_has_clcc != 0) {
-            /* we're at the first ring, try to get CALLID (with +CLCC) */
-            DEBUGA_AT("|%s| got first RING, sending AT+CLCC?\n", CELLIAX_P_LOG,
-                      p->line_array.result[i]);
-            res = celliax_serial_write_AT_noack(p, "AT+CLCC?");
-            if (res) {
-              ERRORA("AT+CLCC? (call list) was not correctly sent to the phone\n",
-                     CELLIAX_P_LOG);
-            }
-          } else {
-            DEBUGA_AT("|%s| got first RING, but not sending AT+CLCC? as this device "
-                      "seems not to support\n", CELLIAX_P_LOG, p->line_array.result[i]);
-          }
-        }
-        p->phone_callflow = CALLFLOW_INCOMING_RING;
-      }
-
-      if ((strncmp(p->line_array.result[i], "+CLCC", 5) == 0)) {
-        /* with clcc we wait for clip */
-        memset(p->callid_name, 0, sizeof(p->callid_name));
-        memset(p->callid_number, 0, sizeof(p->callid_number));
-        int commacount = 0;
-        int a = 0;
-        int b = 0;
-        int c = 0;
-
-        for (a = 0; a < strlen(p->line_array.result[i]); a++) {
-
-          if (p->line_array.result[i][a] == ',') {
-            commacount++;
-          }
-          if (commacount == 5) {
-            if (p->line_array.result[i][a] != ',' && p->line_array.result[i][a] != '"') {
-              p->callid_number[b] = p->line_array.result[i][a];
-              b++;
-            }
-          }
-          if (commacount == 7) {
-            if (p->line_array.result[i][a] != ',' && p->line_array.result[i][a] != '"') {
-              p->callid_name[c] = p->line_array.result[i][a];
-              c++;
-            }
-          }
-        }
-
-        p->phone_callflow = CALLFLOW_INCOMING_RING;
-        DEBUGA_AT("|%s| CLCC CALLID: name is %s, number is %s\n", CELLIAX_P_LOG,
-                  p->line_array.result[i],
-                  p->callid_name[0] ? p->callid_name : "not available",
-                  p->callid_number[0] ? p->callid_number : "not available");
-      }
-
-      if ((strncmp(p->line_array.result[i], "+CLIP", 5) == 0)) {
-        /* with CLIP, we want to answer right away */
-        memset(p->callid_name, 0, sizeof(p->callid_name));
-        memset(p->callid_number, 0, sizeof(p->callid_number));
-
-        int commacount = 0;
-        int a = 0;
-        int b = 0;
-        int c = 0;
-
-        for (a = 7; a < strlen(p->line_array.result[i]); a++) {
-          if (p->line_array.result[i][a] == ',') {
-            commacount++;
-          }
-          if (commacount == 0) {
-            if (p->line_array.result[i][a] != ',' && p->line_array.result[i][a] != '"') {
-              p->callid_number[b] = p->line_array.result[i][a];
-              b++;
-            }
-          }
-          if (commacount == 4) {
-            if (p->line_array.result[i][a] != ',' && p->line_array.result[i][a] != '"') {
-              p->callid_name[c] = p->line_array.result[i][a];
-              c++;
-            }
-          }
-        }
-
-        if (p->interface_state != AST_STATE_RING) {
-          gettimeofday(&(p->call_incoming_time), NULL);
-          DEBUGA_AT("AST_STATE_RING call_incoming_time.tv_sec=%ld\n",
-                    CELLIAX_P_LOG, p->call_incoming_time.tv_sec);
-
-        }
-
-        p->interface_state = AST_STATE_RING;
-        p->phone_callflow = CALLFLOW_INCOMING_RING;
-        DEBUGA_AT("|%s| CLIP INCOMING CALLID: name is %s, number is %s\n", CELLIAX_P_LOG,
-                  p->line_array.result[i],
-                  p->callid_name[0] != 1 ? p->callid_name : "not available",
-                  p->callid_number[0] ? p->callid_number : "not available");
-      }
-
-      if ((strcmp(p->line_array.result[i], "BUSY") == 0)) {
-        p->phone_callflow = CALLFLOW_CALL_LINEBUSY;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_LINEBUSY\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-        if (p->interface_state != AST_STATE_DOWN && p->owner) {
-          ast_setstate(p->owner, AST_STATE_BUSY);
-          celliax_queue_control(p->owner, AST_CONTROL_BUSY);
-        } else {
-          ERRORA("Why BUSY now?\n", CELLIAX_P_LOG);
-        }
-      }
-      if ((strcmp(p->line_array.result[i], "NO ANSWER") == 0)) {
-        p->phone_callflow = CALLFLOW_CALL_NOANSWER;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_NOANSWER\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-        if (p->interface_state != AST_STATE_DOWN && p->owner) {
-          p->owner->hangupcause = AST_CAUSE_NO_ANSWER;
-          celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-        } else {
-          ERRORA("Why NO ANSWER now?\n", CELLIAX_P_LOG);
-        }
-      }
-      if ((strcmp(p->line_array.result[i], "NO CARRIER") == 0)) {
-	      if (p->phone_callflow != CALLFLOW_CALL_HANGUP_REQUESTED) {
-		      p->phone_callflow = CALLFLOW_CALL_NOCARRIER;
-		      if (option_debug > 1)
-			      DEBUGA_AT("|%s| CALLFLOW_CALL_NOCARRIER\n", CELLIAX_P_LOG,
-					      p->line_array.result[i]);
-		      p->control_to_send = 0;
-		      usleep(20000);
-		      if (p->interface_state != AST_STATE_DOWN && p->owner) {
-			      p->owner->hangupcause = AST_CAUSE_FAILURE;
-			      celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-		      } else {
-			      ERRORA("Why NO CARRIER now?\n", CELLIAX_P_LOG);
-		      }
-	      }
-      }
-
-      if ((strncmp(p->line_array.result[i], "+CBC:", 5) == 0)) {
-        int power_supply, battery_strenght, err;
-
-        power_supply = battery_strenght = 0;
-
-        err =
-          sscanf(&p->line_array.result[i][6], "%d,%d", &power_supply, &battery_strenght);
-        if (err < 2) {
-          DEBUGA_AT("|%s| is not formatted as: |+CBC: xx,yy| now trying  |+CBC:xx,yy|\n",
-                    CELLIAX_P_LOG, p->line_array.result[i]);
-
-          err =
-            sscanf(&p->line_array.result[i][5], "%d,%d", &power_supply,
-                   &battery_strenght);
-          DEBUGA_AT("|%s| +CBC: Powered by %s, battery strenght=%d\n", CELLIAX_P_LOG,
-                    p->line_array.result[i], power_supply ? "power supply" : "battery",
-                    battery_strenght);
-
-        }
-
-        if (err < 2) {
-          DEBUGA_AT("|%s| is not formatted as: |+CBC:xx,yy| giving up\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-        }
-
-        else {
-          if (option_debug > 1)
-            DEBUGA_AT("|%s| +CBC: Powered by %s, battery strenght=%d\n", CELLIAX_P_LOG,
-                      p->line_array.result[i], power_supply ? "power supply" : "battery",
-                      battery_strenght);
-          if (!power_supply) {
-            if (battery_strenght < 10) {
-              ERRORA("|%s| BATTERY ALMOST EXHAUSTED\n", CELLIAX_P_LOG,
-                     p->line_array.result[i]);
-            } else if (battery_strenght < 20) {
-              WARNINGA("|%s| BATTERY LOW\n", CELLIAX_P_LOG, p->line_array.result[i]);
-
-            }
-
-          }
-        }
-
-      }
-
-      if ((strncmp(p->line_array.result[i], "+CSQ:", 5) == 0)) {
-        int signal_quality, ber, err;
-
-        signal_quality = ber = 0;
-
-        err = sscanf(&p->line_array.result[i][6], "%d,%d", &signal_quality, &ber);
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| +CSQ: Signal Quality: %d, Error Rate=%d\n", CELLIAX_P_LOG,
-                    p->line_array.result[i], signal_quality, ber);
-        if (err < 2) {
-          ERRORA("|%s| is not formatted as: |+CSQ: xx,yy|\n", CELLIAX_P_LOG,
-                 p->line_array.result[i]);
-        } else {
-          if (signal_quality < 11 || signal_quality == 99) {
-            WARNINGA
-              ("|%s| CELLPHONE GETS ALMOST NO SIGNAL, consider to move it or additional antenna\n",
-               CELLIAX_P_LOG, p->line_array.result[i]);
-          } else if (signal_quality < 15) {
-            WARNINGA("|%s| CELLPHONE GETS SIGNAL LOW\n", CELLIAX_P_LOG,
-                     p->line_array.result[i]);
-
-          }
-
-        }
-
-      }
-      if ((strncmp(p->line_array.result[i], "+CMGW:", 6) == 0)) {
-        int err;
-
-        err = sscanf(&p->line_array.result[i][7], "%s", p->at_cmgw);
-        DEBUGA_AT("|%s| +CMGW: %s\n", CELLIAX_P_LOG, p->line_array.result[i], p->at_cmgw);
-        if (err < 1) {
-          ERRORA("|%s| is not formatted as: |+CMGW: xxxx|\n", CELLIAX_P_LOG,
-                 p->line_array.result[i]);
-        }
-
-      }
-
-      /* at_call_* are unsolicited messages sent by the modem to signal us about call processing activity and events */
-      if ((strcmp(p->line_array.result[i], p->at_call_idle) == 0)) {
-        p->phone_callflow = CALLFLOW_CALL_IDLE;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_IDLE\n", CELLIAX_P_LOG, p->line_array.result[i]);
-        if (p->interface_state != AST_STATE_DOWN && p->owner) {
-          DEBUGA_AT("just received a remote HANGUP\n", CELLIAX_P_LOG);
-          p->owner->hangupcause = AST_CAUSE_NORMAL;
-          celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-          DEBUGA_AT("just sent AST_CONTROL_HANGUP\n", CELLIAX_P_LOG);
-        }
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_call_incoming) == 0)) {
-
-        //char list_command[64];
-
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_INCOMING\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-
-        if (p->phone_callflow != CALLFLOW_CALL_INCOMING
-            && p->phone_callflow != CALLFLOW_INCOMING_RING) {
-          //mark the time of CALLFLOW_CALL_INCOMING
-          gettimeofday(&(p->call_incoming_time), NULL);
-          p->phone_callflow = CALLFLOW_CALL_INCOMING;
-          DEBUGA_AT("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld\n",
-                    CELLIAX_P_LOG, p->call_incoming_time.tv_sec);
-
-        }
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_call_active) == 0)) {
-        p->phone_callflow = CALLFLOW_CALL_ACTIVE;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_ACTIVE\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-
-        if (p->owner && p->interface_state == CALLFLOW_CALL_DIALING) {
-          DEBUGA_PBX("just received a remote ANSWER\n", CELLIAX_P_LOG);
-          if (p->owner->_state != AST_STATE_UP) {
-            celliax_queue_control(p->owner, AST_CONTROL_RINGING);
-            DEBUGA_PBX("just sent AST_CONTROL_RINGING\n", CELLIAX_P_LOG);
-            DEBUGA_PBX("going to send AST_CONTROL_ANSWER\n", CELLIAX_P_LOG);
-            celliax_queue_control(p->owner, AST_CONTROL_ANSWER);
-            DEBUGA_PBX("just sent AST_CONTROL_ANSWER\n", CELLIAX_P_LOG);
-          }
-        } else {
-        }
-        p->interface_state = AST_STATE_UP;
-        DEBUGA_PBX("just interface_state UP\n", CELLIAX_P_LOG);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_call_calling) == 0)) {
-        p->phone_callflow = CALLFLOW_CALL_DIALING;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_DIALING\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-      if ((strcmp(p->line_array.result[i], p->at_call_failed) == 0)) {
-        p->phone_callflow = CALLFLOW_CALL_FAILED;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_FAILED\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-        if (p->interface_state != AST_STATE_DOWN && p->owner) {
-          p->owner->hangupcause = AST_CAUSE_FAILURE;
-          celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-        }
-      }
-
-      if ((strncmp(p->line_array.result[i], "+CSCA:", 6) == 0)) {   //TODO SMS FIXME in config!
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| +CSCA: Message Center Address!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-
-      if ((strncmp(p->line_array.result[i], "+CMGF:", 6) == 0)) {   //TODO SMS FIXME in config!
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| +CMGF: Message Format!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-
-      if ((strncmp(p->line_array.result[i], "+CMTI:", 6) == 0)) {   //TODO SMS FIXME in config!
-        int err;
-        int pos;
-
-        //FIXME all the following commands in config!
-        if (option_debug)
-          DEBUGA_AT("|%s| +CMTI: Incoming SMS!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-
-        err = sscanf(&p->line_array.result[i][12], "%d", &pos);
-        if (err < 1) {
-          ERRORA("|%s| is not formatted as: |+CMTI: \"MT\",xx|\n", CELLIAX_P_LOG,
-                 p->line_array.result[i]);
-        } else {
-          DEBUGA_AT("|%s| +CMTI: Incoming SMS in position: %d!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i], pos);
-          p->unread_sms_msg_id = pos;
-          usleep(1000);
-
-          if (p->unread_sms_msg_id) {
-            char at_command[256];
-
-            if (p->no_ucs2 == 0) {
-              res = celliax_serial_write_AT_ack(p, "AT+CSCS=\"UCS2\"");
-              if (res) {
-                ERRORA
-                  ("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  do not got OK from the phone, continuing\n",
-                   CELLIAX_P_LOG);
-                //memset(p->sms_message, 0, sizeof(p->sms_message));
-              }
-            }
-
-            memset(at_command, 0, sizeof(at_command));
-            sprintf(at_command, "AT+CMGR=%d", p->unread_sms_msg_id);
-            memset(p->sms_message, 0, sizeof(p->sms_message));
-
-            p->reading_sms_msg = 1;
-            res = celliax_serial_write_AT_ack(p, at_command);
-            p->reading_sms_msg = 0;
-            if (res) {
-              ERRORA
-                ("AT+CMGR (read SMS) do not got OK from the phone, message sent was:|||%s|||\n",
-                 CELLIAX_P_LOG, at_command);
-            }
-            res = celliax_serial_write_AT_ack(p, "AT+CSCS=\"GSM\"");
-            if (res) {
-              ERRORA
-                ("AT+CSCS=\"GSM\" (set TE messages to GSM) do not got OK from the phone\n",
-                 CELLIAX_P_LOG);
-            }
-            memset(at_command, 0, sizeof(at_command));
-            sprintf(at_command, "AT+CMGD=%d", p->unread_sms_msg_id);    /* delete the message */
-            p->unread_sms_msg_id = 0;
-            res = celliax_serial_write_AT_ack(p, at_command);
-            if (res) {
-              ERRORA
-                ("AT+CMGD (Delete SMS) do not got OK from the phone, message sent was:|||%s|||\n",
-                 CELLIAX_P_LOG, at_command);
-            }
-
-            if (strlen(p->sms_message)) {
-              manager_event(EVENT_FLAG_SYSTEM, "CELLIAXincomingsms",
-                            "Interface: %s\r\nSMS_Message: %s\r\n", p->name,
-                            p->sms_message);
-              if (strlen(p->sms_receiving_program)) {
-                int fd1[2];
-                pid_t pid1;
-                char *arg1[] = { p->sms_receiving_program, (char *) NULL };
-                int i;
-
-                NOTICA("incoming SMS message:>>>%s<<<\n", CELLIAX_P_LOG, p->sms_message);
-                pipe(fd1);
-                pid1 = switch_fork();
-
-                if (pid1 == 0) {    //child
-                  int err;
-
-                  dup2(fd1[0], 0);  // Connect stdin to pipe output
-                  close(fd1[1]);    // close input pipe side
-		close(p->controldevfd);
-                  setsid();     //session id
-                  err = execvp(arg1[0], arg1);  //exec our program, with stdin connected to pipe output
-                  if (err) {
-                    ERRORA
-                      ("'sms_receiving_program' is set in config file to '%s', and it gave us back this error: %d, (%s). SMS received was:---%s---\n",
-                       CELLIAX_P_LOG, p->sms_receiving_program, err, strerror(errno),
-                       p->sms_message);
-                  }
-                  close(fd1[0]);    // close output pipe side
-                }
-//starting here continue the parent
-                close(fd1[0]);  // close output pipe side
-                // write the msg on the pipe input
-                for (i = 0; i < strlen(p->sms_message); i++) {
-                  write(fd1[1], &p->sms_message[i], 1);
-                }
-                close(fd1[1]);  // close pipe input, let our program know we've finished
-              } else {
-                ERRORA
-                  ("got SMS incoming message, but 'sms_receiving_program' is not set in config file. SMS received was:---%s---\n",
-                   CELLIAX_P_LOG, p->sms_message);
-              }
-            }
-#if 1                           //is this one needed? maybe it can interrupt an incoming call that is just to announce itself
-            if (p->phone_callflow == CALLFLOW_CALL_IDLE
-                && p->interface_state == AST_STATE_DOWN && p->owner == NULL) {
-              /* we're not in a call, neither calling */
-              res = celliax_serial_write_AT_ack(p, "AT+CKPD=\"EEE\"");
-              if (res) {
-                ERRORA
-                  ("AT+CKPD=\"EEE\" (cellphone screen back to user) do not got OK from the phone\n",
-                   CELLIAX_P_LOG);
-              }
-            }
-#endif
-          }                     //unread_msg_id
-
-        }                       //CMTI well formatted
-
-      }                         //CMTI
-
-      if ((strncmp(p->line_array.result[i], "+MMGL:", 6) == 0)) {   //TODO MOTOROLA SMS FIXME in config!
-        int err = 0;
-        //int unread_msg_id=0;
-
-        if (option_debug)
-          DEBUGA_AT("|%s| +MMGL: Listing Motorola SMSs!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-
-        err = sscanf(&p->line_array.result[i][7], "%d", &p->unread_sms_msg_id);
-        if (err < 1) {
-          ERRORA("|%s| is not formatted as: |+MMGL: xx|\n", CELLIAX_P_LOG,
-                 p->line_array.result[i]);
-        }
-      }
-      if ((strncmp(p->line_array.result[i], "+CMGL:", 6) == 0)) {   //TODO  SMS FIXME in config!
-        if (option_debug)
-          DEBUGA_AT("|%s| +CMGL: Listing SMSs!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-      if ((strncmp(p->line_array.result[i], "+MMGR:", 6) == 0)) {   //TODO MOTOROLA SMS FIXME in config!
-        if (option_debug)
-          DEBUGA_AT("|%s| +MMGR: Reading Motorola SMS!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-        if (p->reading_sms_msg)
-          p->reading_sms_msg++;
-      }
-      if ((strncmp(p->line_array.result[i], "+CMGR: \"STO U", 13) == 0)) {  //TODO  SMS FIXME in config!
-        if (option_debug)
-          DEBUGA_AT("|%s| +CMGR: Reading stored UNSENT SMS!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      } else if ((strncmp(p->line_array.result[i], "+CMGR: \"STO S", 13) == 0)) {   //TODO  SMS FIXME in config!
-        if (option_debug)
-          DEBUGA_AT("|%s| +CMGR: Reading stored SENT SMS!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      } else if ((strncmp(p->line_array.result[i], "+CMGR: \"REC R", 13) == 0)) {   //TODO  SMS FIXME in config!
-        if (option_debug)
-          DEBUGA_AT("|%s| +CMGR: Reading received READ SMS!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      } else if ((strncmp(p->line_array.result[i], "+CMGR: \"REC U", 13) == 0)) {   //TODO  SMS FIXME in config!
-        if (option_debug)
-          DEBUGA_AT("|%s| +CMGR: Reading received UNREAD SMS!\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-        if (p->reading_sms_msg)
-          p->reading_sms_msg++;
-      }
-
-      if ((strcmp(p->line_array.result[i], "+MCST: 17") == 0)) {    /* motorola call processing unsolicited messages */
-        p->phone_callflow = CALLFLOW_CALL_INFLUX;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_INFLUX\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], "+MCST: 68") == 0)) {    /* motorola call processing unsolicited messages */
-        p->phone_callflow = CALLFLOW_CALL_NOSERVICE;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_NOSERVICE\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-        if (p->interface_state != AST_STATE_DOWN && p->owner) {
-          p->owner->hangupcause = AST_CAUSE_FAILURE;
-          celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-        }
-      }
-      if ((strcmp(p->line_array.result[i], "+MCST: 70") == 0)) {    /* motorola call processing unsolicited messages */
-        p->phone_callflow = CALLFLOW_CALL_OUTGOINGRESTRICTED;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_OUTGOINGRESTRICTED\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-        if (p->interface_state != AST_STATE_DOWN && p->owner) {
-          p->owner->hangupcause = AST_CAUSE_FAILURE;
-          celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-        }
-      }
-      if ((strcmp(p->line_array.result[i], "+MCST: 72") == 0)) {    /* motorola call processing unsolicited messages */
-        p->phone_callflow = CALLFLOW_CALL_SECURITYFAIL;
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| CALLFLOW_CALL_SECURITYFAIL\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-        if (p->interface_state != AST_STATE_DOWN && p->owner) {
-          p->owner->hangupcause = AST_CAUSE_FAILURE;
-          celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-        }
-      }
-
-      if ((strncmp(p->line_array.result[i], "+CPBR", 5) == 0)) {    /* phonebook stuff begins */
-
-        if (p->phonebook_querying) {    /* probably phonebook struct begins */
-          int err, first_entry, last_entry, number_lenght, text_lenght;
-
-          if (option_debug)
-            DEBUGA_AT("phonebook struct: |%s|\n", CELLIAX_P_LOG, p->line_array.result[i]);
-
-          err =
-            sscanf(&p->line_array.result[i][8], "%d-%d),%d,%d", &first_entry, &last_entry,
-                   &number_lenght, &text_lenght);
-          if (err < 4) {
-
-            err =
-              sscanf(&p->line_array.result[i][7], "%d-%d,%d,%d", &first_entry,
-                     &last_entry, &number_lenght, &text_lenght);
-          }
-
-          if (err < 4) {
-            ERRORA
-              ("phonebook struct: |%s| is nor formatted as: |+CPBR: (1-750),40,14| neither as: |+CPBR: 1-750,40,14|\n",
-               CELLIAX_P_LOG, p->line_array.result[i]);
-          } else {
-
-            if (option_debug)
-              DEBUGA_AT
-                ("First entry: %d, last entry: %d, phone number max lenght: %d, text max lenght: %d\n",
-                 CELLIAX_P_LOG, first_entry, last_entry, number_lenght, text_lenght);
-            p->phonebook_first_entry = first_entry;
-            p->phonebook_last_entry = last_entry;
-            p->phonebook_number_lenght = number_lenght;
-            p->phonebook_text_lenght = text_lenght;
-          }
-
-        } else {                /* probably phonebook entry begins */
-
-          if (p->phonebook_listing) {
-            int err, entry_id, entry_type;
-
-            char entry_number[256];
-            char entry_text[256];
-
-            if (option_debug)
-              DEBUGA_AT("phonebook entry: |%s|\n", CELLIAX_P_LOG,
-                        p->line_array.result[i]);
-
-            err =
-              sscanf(&p->line_array.result[i][7], "%d,\"%255[0-9+]\",%d,\"%255[^\"]\"",
-                     &entry_id, entry_number, &entry_type, entry_text);
-            if (err < 4) {
-              ERRORA
-                ("err=%d, phonebook entry: |%s| is not formatted as: |+CPBR: 504,\"+39025458068\",145,\"ciao a tutti\"|\n",
-                 CELLIAX_P_LOG, err, p->line_array.result[i]);
-            } else {
-              //TODO: sanitize entry_text
-              if (option_debug)
-                DEBUGA_AT("Number: %s, Text: %s, Type: %d\n", CELLIAX_P_LOG, entry_number,
-                          entry_text, entry_type);
-              /* write entry in phonebook file */
-              if (p->phonebook_writing_fp) {
-                celliax_dir_entry_extension++;
-
-                fprintf(p->phonebook_writing_fp,
-                        "%s  => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcell=%s|phonebook_entry_owner=%s\n",
-                        entry_number, entry_text, "no",
-                        p->celliax_dir_entry_extension_prefix, "2",
-                        celliax_dir_entry_extension, "yes", "not_specified");
-                fprintf(p->phonebook_writing_fp,
-                        "%s  => ,%sDO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcell=%s|phonebook_entry_owner=%s\n",
-                        entry_number, entry_text, "no",
-                        p->celliax_dir_entry_extension_prefix, "3",
-                        celliax_dir_entry_extension, "yes", "not_specified");
-              }
-            }
-
-          }
-
-          if (p->phonebook_listing_received_calls) {
-            int err, entry_id, entry_type;
-
-            char entry_number[256] = "";
-            char entry_text[256] = "";
-
-            if (option_debug)
-              DEBUGA_AT("phonebook entry: |%s|\n", CELLIAX_P_LOG,
-                        p->line_array.result[i]);
-
-            err =
-              sscanf(&p->line_array.result[i][7], "%d,\"%255[0-9+]\",%d,\"%255[^\"]\"",
-                     &entry_id, entry_number, &entry_type, entry_text);
-            if (err < 1) {      //we match only on the progressive id, maybe the remote party has not sent its number, and/or there is no corresponding text entry in the phone directory
-              ERRORA
-                ("err=%d, phonebook entry: |%s| is not formatted as: |+CPBR: 504,\"+39025458068\",145,\"ciao a tutti\"|\n",
-                 CELLIAX_P_LOG, err, p->line_array.result[i]);
-            } else {
-              //TODO: sanitize entry_text
-
-              if (option_debug)
-                DEBUGA_AT("Number: %s, Text: %s, Type: %d\n", CELLIAX_P_LOG, entry_number,
-                          entry_text, entry_type);
-              memset(p->callid_name, 0, sizeof(p->callid_name));
-              memset(p->callid_number, 0, sizeof(p->callid_number));
-              strncpy(p->callid_name, entry_text, sizeof(p->callid_name));
-              strncpy(p->callid_number, entry_number, sizeof(p->callid_number));
-              if (option_debug)
-                DEBUGA_AT("incoming callid: Text: %s, Number: %s\n", CELLIAX_P_LOG,
-                          p->callid_name, p->callid_number);
-
-              DEBUGA_AT("|%s| CPBR INCOMING CALLID: name is %s, number is %s\n",
-                        CELLIAX_P_LOG, p->line_array.result[i],
-                        p->callid_name[0] != 1 ? p->callid_name : "not available",
-                        p->callid_number[0] ? p->callid_number : "not available");
-
-              /* mark the time of RING */
-              gettimeofday(&(p->ringtime), NULL);
-              p->interface_state = AST_STATE_RING;
-              p->phone_callflow = CALLFLOW_INCOMING_RING;
-
-            }
-
-          }
-
-          else {
-            DEBUGA_AT("phonebook entry: |%s|\n", CELLIAX_P_LOG, p->line_array.result[i]);
-
-          }
-        }
-
-      }
-
-      if ((strncmp(p->line_array.result[i], "*ECAV", 5) == 0) || (strncmp(p->line_array.result[i], "*ECAM", 5) == 0)) { /* sony-ericsson call processing unsolicited messages */
-        int res, ccid, ccstatus, calltype, processid, exitcause, number, type;
-        res = ccid = ccstatus = calltype = processid = exitcause = number = type = 0;
-        res =
-          sscanf(&p->line_array.result[i][6], "%d,%d,%d,%d,%d,%d,%d", &ccid, &ccstatus,
-                 &calltype, &processid, &exitcause, &number, &type);
-        /* only changes the phone_callflow if enought parameters were parsed */
-        if (res >= 3) {
-          switch (ccstatus) {
-          case 0:
-            if (p->owner) {
-              ast_setstate(p->owner, AST_STATE_DOWN);
-              p->owner->hangupcause = AST_CAUSE_NORMAL;
-              celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-            }
-            p->phone_callflow = CALLFLOW_CALL_IDLE;
-            p->interface_state = AST_STATE_DOWN;
-            if (option_debug > 1)
-              DEBUGA_AT("|%s| Sony-Ericsson *ECAM/*ECAV: IDLE\n", CELLIAX_P_LOG,
-                        p->line_array.result[i]);
-            break;
-          case 1:
-            if (option_debug > 1)
-              DEBUGA_AT("|%s| Sony-Ericsson *ECAM/*ECAV: CALLING\n", CELLIAX_P_LOG,
-                        p->line_array.result[i]);
-            break;
-          case 2:
-            if (p->owner) {
-              ast_setstate(p->owner, AST_STATE_DIALING);
-            }
-            p->interface_state = CALLFLOW_CALL_DIALING;
-            if (option_debug > 1)
-              DEBUGA_AT("|%s| Sony-Ericsson *ECAM/*ECAV: CONNECTING\n", CELLIAX_P_LOG,
-                        p->line_array.result[i]);
-            break;
-          case 3:
-            if (p->owner) {
-              ast_setstate(p->owner, AST_STATE_UP);
-              celliax_queue_control(p->owner, AST_CONTROL_ANSWER);
-            }
-            p->phone_callflow = CALLFLOW_CALL_ACTIVE;
-            p->interface_state = AST_STATE_UP;
-            if (option_debug > 1)
-              DEBUGA_AT("|%s| Sony-Ericsson *ECAM/*ECAV: ACTIVE\n", CELLIAX_P_LOG,
-                        p->line_array.result[i]);
-            break;
-          case 4:
-            if (option_debug > 1)
-              DEBUGA_AT
-                ("|%s| Sony-Ericsson *ECAM/*ECAV: don't know how to handle HOLD event\n",
-                 CELLIAX_P_LOG, p->line_array.result[i]);
-            break;
-          case 5:
-            if (option_debug > 1)
-              DEBUGA_AT
-                ("|%s| Sony-Ericsson *ECAM/*ECAV: don't know how to handle WAITING event\n",
-                 CELLIAX_P_LOG, p->line_array.result[i]);
-            break;
-          case 6:
-            if (option_debug > 1)
-              DEBUGA_AT
-                ("|%s| Sony-Ericsson *ECAM/*ECAV: don't know how to handle ALERTING event\n",
-                 CELLIAX_P_LOG, p->line_array.result[i]);
-            break;
-          case 7:
-            if (p->owner) {
-              ast_setstate(p->owner, AST_STATE_BUSY);
-              celliax_queue_control(p->owner, AST_CONTROL_BUSY);
-            }
-            p->phone_callflow = CALLFLOW_CALL_LINEBUSY;
-            p->interface_state = AST_STATE_BUSY;
-            if (option_debug > 1)
-              DEBUGA_AT("|%s| Sony-Ericsson *ECAM/*ECAV: BUSY\n", CELLIAX_P_LOG,
-                        p->line_array.result[i]);
-            break;
-          }
-        } else {
-          if (option_debug > 1)
-            DEBUGA_AT("|%s| Sony-Ericsson *ECAM/*ECAV: could not parse parameters\n",
-                      CELLIAX_P_LOG, p->line_array.result[i]);
-        }
-
-      }
-
-      /* at_indicator_* are unsolicited messages sent by the phone to signal us that some of its visual indicators on its screen has changed, based on CIND CMER ETSI docs */
-      if ((strcmp(p->line_array.result[i], p->at_indicator_noservice_string) == 0)) {
-        if (option_debug > 1)
-          ERRORA("|%s| at_indicator_noservice_string\n", CELLIAX_P_LOG,
-                 p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_nosignal_string) == 0)) {
-        if (option_debug > 1)
-          ERRORA("|%s| at_indicator_nosignal_string\n", CELLIAX_P_LOG,
-                 p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_lowsignal_string) == 0)) {
-        if (option_debug > 1)
-          WARNINGA("|%s| at_indicator_lowsignal_string\n", CELLIAX_P_LOG,
-                   p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_lowbattchg_string) == 0)) {
-        if (option_debug > 1)
-          WARNINGA("|%s| at_indicator_lowbattchg_string\n", CELLIAX_P_LOG,
-                   p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_nobattchg_string) == 0)) {
-        if (option_debug > 1)
-          ERRORA("|%s| at_indicator_nobattchg_string\n", CELLIAX_P_LOG,
-                 p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_callactive_string) == 0)) {
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| at_indicator_callactive_string\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_nocallactive_string) == 0)) {
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| at_indicator_nocallactive_string\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_nocallsetup_string) == 0)) {
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| at_indicator_nocallsetup_string\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_callsetupincoming_string) ==
-           0)) {
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| at_indicator_callsetupincoming_string\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_callsetupoutgoing_string) ==
-           0)) {
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| at_indicator_callsetupoutgoing_string\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-
-      if ((strcmp(p->line_array.result[i], p->at_indicator_callsetupremoteringing_string)
-           == 0)) {
-        if (option_debug > 1)
-          DEBUGA_AT("|%s| at_indicator_callsetupremoteringing_string\n", CELLIAX_P_LOG,
-                    p->line_array.result[i]);
-      }
-
-    }
-
-    /* let's look for OK, ERROR and EXPECTED_STRING in the complete lines read so far, without re-looking at the lines that has been yet looked at */
-    for (i = la_read; i < la_counter; i++) {
-      if (expected_string) {
-        if ((strncmp(p->line_array.result[i], expected_string, strlen(expected_string))
-             == 0)) {
-          if (option_debug > 1)
-            DEBUGA_AT("|%s| got what EXPECTED\n", CELLIAX_P_LOG, p->line_array.result[i]);
-          at_ack = AT_OK;
-        }
-      } else {
-        //if ((strcmp(p->line_array.result[i], "OK") == 0)) {
-        if ((strcmp(p->line_array.result[i], "OK") == 0) || (strcmp(p->line_array.result[i], "NO CARRIER") == 0) ) {
-          if (option_debug > 1)
-            DEBUGA_AT("got OK\n", CELLIAX_P_LOG);
-          at_ack = AT_OK;
-        }
-      }
-      if ((strcmp(p->line_array.result[i], "ERROR") == 0)) {
-        if (option_debug > 1)
-          DEBUGA_AT("got ERROR\n", CELLIAX_P_LOG);
-        at_ack = AT_ERROR;
-      }
-
-      /* if we are reading an sms message from memory, put the line into the sms buffer if the line is not "OK" or "ERROR" */
-      if (p->reading_sms_msg > 1 && at_ack == -1) {
-        int c;
-        char sms_body[16000];
-        int err;
-
-        if (strncmp(p->line_array.result[i], "+CMGR", 5) == 0) {    /* we are reading the "header" of an SMS */
-          char content[512];
-          char content2[512];
-
-          memset(content, '\0', sizeof(content));
-
-          int inside_comma = 0;
-          int inside_quote = 0;
-          int d = 0;
-
-          for (c = 0; c < strlen(p->line_array.result[i]); c++) {
-            if (p->line_array.result[i][c] == ','
-                && p->line_array.result[i][c - 1] != '\\' && inside_quote == 0) {
-              if (inside_comma) {
-                inside_comma = 0;
-                //NOTICA("inside_comma=%d, inside_quote=%d, we're at=%s\n", CELLIAX_P_LOG, inside_comma, inside_quote, &p->line_array.result[i][c]);
-              } else {
-                inside_comma = 1;
-                //NOTICA("inside_comma=%d, inside_quote=%d, we're at=%s\n", CELLIAX_P_LOG, inside_comma, inside_quote, &p->line_array.result[i][c]);
-              }
-            }
-            if (p->line_array.result[i][c] == '"'
-                && p->line_array.result[i][c - 1] != '\\') {
-              if (inside_quote) {
-                inside_quote = 0;
-                //ERRORA("END_CONTENT inside_comma=%d, inside_quote=%d, we're at=%s\n", CELLIAX_P_LOG, inside_comma, inside_quote, &p->line_array.result[i][c]);
-                DEBUGA_AT("content=%s\n", CELLIAX_P_LOG, content);
-
-                strncat(p->sms_message, "---",
-                        ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-                strncat(p->sms_message, content,
-                        ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-                strncat(p->sms_message, "|||",
-                        ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-
-                memset(content2, '\0', sizeof(content2));
-                err = ucs2_to_utf8(p, content, content2, sizeof(content2));
-
-                strncat(p->sms_message, "---",
-                        ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-                if (!err)
-                  strncat(p->sms_message, content2,
-                          ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-                strncat(p->sms_message, "|||",
-                        ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-                memset(content, '\0', sizeof(content));
-                d = 0;
-              } else {
-                inside_quote = 1;
-                //WARNINGA("START_CONTENT inside_comma=%d, inside_quote=%d, we're at=%s\n", CELLIAX_P_LOG, inside_comma, inside_quote, &p->line_array.result[i][c]);
-              }
-            }
-            if (inside_quote && p->line_array.result[i][c] != '"') {
-
-              content[d] = p->line_array.result[i][c];
-              d++;
-
-            }
-
-          }
-        }                       //it was the +CMGR answer from the cellphone
-        else {
-          strncat(p->sms_message, "---",
-                  ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-          strncat(p->sms_message, p->line_array.result[i],
-                  ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-          strncat(p->sms_message, "|||",
-                  ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-
-          memset(sms_body, '\0', sizeof(sms_body));
-          err = ucs2_to_utf8(p, p->line_array.result[i], sms_body, sizeof(sms_body));
-
-          strncat(p->sms_message, "---",
-                  ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-          if (!err)
-            strncat(p->sms_message, sms_body,
-                    ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-          strncat(p->sms_message, "|||",
-                  ((sizeof(p->sms_message) - strlen(p->sms_message)) - 1));
-
-          DEBUGA_AT("sms_message=%s\n", CELLIAX_P_LOG, p->sms_message);
-
-        }                       //it was the UCS2 from cellphone
-
-      }                         //we were reading the SMS
-
-    }
-
-    la_read = la_counter;
-
-    if (look_for_ack && at_ack > -1)
-      break;
-
-    if (la_counter > AT_MESG_MAX_LINES) {
-      ERRORA("Too many lines in result (>%d). Stopping reader.\n", CELLIAX_P_LOG,
-             AT_MESG_MAX_LINES);
-      at_ack = AT_ERROR;
-      break;
-    }
-  }
-
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-  if (select_err == -1) {
-    ERRORA("select returned -1 on %s, setting controldev_dead, error was: %s\n",
-           CELLIAX_P_LOG, p->controldevice_name, strerror(errno));
-    p->controldev_dead = 1;
-    close(p->controldevfd);
-    if (p->owner)
-      celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-    return -1;
-  }
-
-  if (p->phone_callflow == CALLFLOW_CALL_INCOMING && p->call_incoming_time.tv_sec) {    //after three sec of CALLFLOW_CALL_INCOMING, we assume the phone is incapable of notifying RING (eg: motorola c350), so we try to answer
-    char list_command[64];
-    struct timeval call_incoming_timeout;
-    gettimeofday(&call_incoming_timeout, NULL);
-    call_incoming_timeout.tv_sec -= 3;
-    DEBUGA_AT
-      ("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-       CELLIAX_P_LOG, p->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-    if (call_incoming_timeout.tv_sec > p->call_incoming_time.tv_sec) {
-
-      p->call_incoming_time.tv_sec = 0;
-      p->call_incoming_time.tv_usec = 0;
-      DEBUGA_AT
-        ("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-         CELLIAX_P_LOG, p->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-      res = celliax_serial_write_AT_ack(p, "AT+CPBS=RC");
-      if (res) {
-        ERRORA
-          ("AT+CPBS=RC (select memory of received calls) was not answered by the phone\n",
-           CELLIAX_P_LOG);
-      }
-      p->phonebook_querying = 1;
-      res = celliax_serial_write_AT_ack(p, "AT+CPBR=?");
-      if (res) {
-        ERRORA
-          ("AT+CPBS=RC (select memory of received calls) was not answered by the phone\n",
-           CELLIAX_P_LOG);
-      }
-      p->phonebook_querying = 0;
-      sprintf(list_command, "AT+CPBR=%d,%d", p->phonebook_first_entry,
-              p->phonebook_last_entry);
-      p->phonebook_listing_received_calls = 1;
-      res = celliax_serial_write_AT_expect_longtime(p, list_command, "OK");
-      if (res) {
-        WARNINGA("AT+CPBR=%d,%d failed, continue\n", CELLIAX_P_LOG,
-                 p->phonebook_first_entry, p->phonebook_last_entry);
-      }
-      p->phonebook_listing_received_calls = 0;
-    }
-  }
-
-  if (p->phone_callflow == CALLFLOW_INCOMING_RING) {
-    struct timeval call_incoming_timeout;
-    gettimeofday(&call_incoming_timeout, NULL);
-    call_incoming_timeout.tv_sec -= 10;
-    DEBUGA_AT
-      ("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-       CELLIAX_P_LOG, p->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-    if (call_incoming_timeout.tv_sec > p->ringtime.tv_sec) {
-      ERRORA("Ringing stopped and I have not answered. Why?\n", CELLIAX_P_LOG);
-      DEBUGA_AT
-        ("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-         CELLIAX_P_LOG, p->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-      if (p->owner) {
-        celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-        p->owner->hangupcause = AST_CAUSE_FAILURE;
-      }
-    }
-  }
-  p->line_array.elemcount = la_counter;
-  //NOTICA (" OUTSIDE this celliax_serial_device %s \n", CELLIAX_P_LOG, p->controldevice_name);
-  if (look_for_ack)
-    return at_ack;
-  else
-    return 0;
-}
-
-int celliax_serial_write_AT(struct celliax_pvt *p, const char *data)
-{
-  int howmany;
-  int i;
-  int res;
-  int count;
-
-  howmany = strlen(data);
-
-  for (i = 0; i < howmany; i++) {
-    res = write(p->controldevfd, &data[i], 1);
-
-    if (res != 1) {
-      DEBUGA_AT("Error sending (%.1s): %d (%s)\n", CELLIAX_P_LOG, &data[i], res,
-                strerror(errno));
-      usleep(100000);
-      for (count = 0; count < 10; count++) {
-        res = write(p->controldevfd, &data[i], 1);
-        if (res == 1) {
-          DEBUGA_AT("Successfully RE-sent (%.1s): %d %d (%s)\n", CELLIAX_P_LOG, &data[i],
-                    count, res, strerror(errno));
-          break;
-        } else
-          DEBUGA_AT("Error RE-sending (%.1s): %d %d (%s)\n", CELLIAX_P_LOG, &data[i],
-                    count, res, strerror(errno));
-        usleep(100000);
-
-      }
-      if (res != 1) {
-        ERRORA("Error RE-sending (%.1s): %d %d (%s)\n", CELLIAX_P_LOG, &data[i], count,
-               res, strerror(errno));
-        return -1;
-      }
-    }
-    if (option_debug > 1)
-      DEBUGA_AT("sent data... (%.1s)\n", CELLIAX_P_LOG, &data[i]);
-    usleep(1000);               /* release the cpu */
-  }
-
-  res = write(p->controldevfd, "\r", 1);
-
-  if (res != 1) {
-    DEBUGA_AT("Error sending (carriage return): %d (%s)\n", CELLIAX_P_LOG, res,
-              strerror(errno));
-    usleep(100000);
-    for (count = 0; count < 10; count++) {
-      res = write(p->controldevfd, "\r", 1);
-
-      if (res == 1) {
-        DEBUGA_AT("Successfully RE-sent carriage return: %d %d (%s)\n", CELLIAX_P_LOG,
-                  count, res, strerror(errno));
-        break;
-      } else
-        DEBUGA_AT("Error RE-sending (carriage return): %d %d (%s)\n", CELLIAX_P_LOG,
-                  count, res, strerror(errno));
-      usleep(100000);
-
-    }
-    if (res != 1) {
-      ERRORA("Error RE-sending (carriage return): %d %d (%s)\n", CELLIAX_P_LOG, count,
-             res, strerror(errno));
-      return -1;
-    }
-  }
-  if (option_debug > 1)
-    DEBUGA_AT("sent (carriage return)\n", CELLIAX_P_LOG);
-  usleep(1000);                 /* release the cpu */
-
-  return howmany;
-}
-
-int celliax_serial_write_AT_nocr(struct celliax_pvt *p, const char *data)
-{
-  int howmany;
-  int i;
-  int res;
-  int count;
-
-  howmany = strlen(data);
-
-  for (i = 0; i < howmany; i++) {
-    res = write(p->controldevfd, &data[i], 1);
-
-    if (res != 1) {
-      DEBUGA_AT("Error sending (%.1s): %d (%s)\n", CELLIAX_P_LOG, &data[i], res,
-                strerror(errno));
-      usleep(100000);
-      for (count = 0; count < 10; count++) {
-        res = write(p->controldevfd, &data[i], 1);
-        if (res == 1)
-          break;
-        else
-          DEBUGA_AT("Error RE-sending (%.1s): %d %d (%s)\n", CELLIAX_P_LOG, &data[i],
-                    count, res, strerror(errno));
-        usleep(100000);
-
-      }
-      if (res != 1) {
-        ERRORA("Error RE-sending (%.1s): %d %d (%s)\n", CELLIAX_P_LOG, &data[i], count,
-               res, strerror(errno));
-        return -1;
-      }
-    }
-    if (option_debug > 1)
-      DEBUGA_AT("sent data... (%.1s)\n", CELLIAX_P_LOG, &data[i]);
-    usleep(1000);               /* release the cpu */
-  }
-
-  usleep(1000);                 /* release the cpu */
-
-  return howmany;
-}
-
-int celliax_serial_write_AT_noack(struct celliax_pvt *p, const char *data)
-{
-
-  if (option_debug > 1)
-    DEBUGA_AT("celliax_serial_write_AT_noack: %s\n", CELLIAX_P_LOG, data);
-
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-  if (celliax_serial_write_AT(p, data) != strlen(data)) {
-
-    ERRORA("Error sending data... (%s)\n", CELLIAX_P_LOG, strerror(errno));
-    UNLOCKA(&p->controldev_lock);
-    return -1;
-  }
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-
-  return 0;
-}
-
-int celliax_serial_write_AT_ack(struct celliax_pvt *p, const char *data)
-{
-  int at_result = AT_ERROR;
-
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-  if (option_debug > 1)
-    DEBUGA_AT("sending: %s\n", CELLIAX_P_LOG, data);
-  if (celliax_serial_write_AT(p, data) != strlen(data)) {
-    ERRORA("Error sending data... (%s) \n", CELLIAX_P_LOG, strerror(errno));
-    UNLOCKA(&p->controldev_lock);
-    return -1;
-  }
-
-  at_result = celliax_serial_read_AT(p, 1, 500000, 2, NULL, 1); // 2.5 sec timeout
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-
-  return at_result;
-
-}
-
-int celliax_serial_write_AT_ack_nocr_longtime(struct celliax_pvt *p, const char *data)
-{
-  int at_result = AT_ERROR;
-
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-  if (option_debug > 1)
-    DEBUGA_AT("sending: %s\n", CELLIAX_P_LOG, data);
-  if (celliax_serial_write_AT_nocr(p, data) != strlen(data)) {
-    ERRORA("Error sending data... (%s) \n", CELLIAX_P_LOG, strerror(errno));
-    UNLOCKA(&p->controldev_lock);
-    return -1;
-  }
-
-  at_result = celliax_serial_read_AT(p, 1, 500000, 20, NULL, 1);    // 20.5 sec timeout
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-
-  return at_result;
-
-}
-
-int celliax_serial_write_AT_expect1(struct celliax_pvt *p, const char *data,
-                                    const char *expected_string, int expect_crlf,
-                                    int seconds)
-{
-  int at_result = AT_ERROR;
-
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-  if (option_debug > 1)
-    DEBUGA_AT("sending: %s, expecting: %s\n", CELLIAX_P_LOG, data, expected_string);
-  if (celliax_serial_write_AT(p, data) != strlen(data)) {
-    ERRORA("Error sending data... (%s) \n", CELLIAX_P_LOG, strerror(errno));
-    UNLOCKA(&p->controldev_lock);
-    return -1;
-  }
-
-  at_result = celliax_serial_read_AT(p, 1, 500000, seconds, expected_string, expect_crlf);  // 20.5 sec timeout, used for querying the SIM and sending SMSs
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-
-  return at_result;
-
-}
-
-int celliax_serial_AT_expect(struct celliax_pvt *p, const char *expected_string,
-                             int expect_crlf, int seconds)
-{
-  int at_result = AT_ERROR;
-
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-  if (option_debug > 1)
-    DEBUGA_AT("expecting: %s\n", CELLIAX_P_LOG, expected_string);
-
-  at_result = celliax_serial_read_AT(p, 1, 500000, seconds, expected_string, expect_crlf);  // 20.5 sec timeout, used for querying the SIM and sending SMSs
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-
-  return at_result;
-
-}
-
-int celliax_serial_answer_AT(struct celliax_pvt *p)
-{
-  int res;
-
-  res = celliax_serial_write_AT_expect(p, p->at_answer, p->at_answer_expect);
-  if (res) {
-    DEBUGA_AT
-      ("at_answer command failed, command used: %s, expecting: %s, trying with AT+CKPD=\"S\"\n",
-       CELLIAX_P_LOG, p->at_answer, p->at_answer_expect);
-
-    res = celliax_serial_write_AT_ack(p, "AT+CKPD=\"S\"");
-    if (res) {
-      ERRORA("at_answer command failed, command used: 'AT+CKPD=\"S\"', giving up\n",
-             CELLIAX_P_LOG);
-      return -1;
-    }
-  }
-  //p->interface_state = AST_STATE_UP;
-  //p->phone_callflow = CALLFLOW_CALL_ACTIVE;
-  DEBUGA_AT("AT: call answered\n", CELLIAX_P_LOG);
-  return 0;
-}
-
-int celliax_serial_hangup_AT(struct celliax_pvt *p)
-{
-  int res;
-
-  if (p->interface_state != AST_STATE_DOWN) {
-    res = celliax_serial_write_AT_expect(p, p->at_hangup, p->at_hangup_expect);
-    if (res) {
-      DEBUGA_AT
-        ("at_hangup command failed, command used: %s, trying to use AT+CKPD=\"EEE\"\n",
-         CELLIAX_P_LOG, p->at_hangup);
-      res = celliax_serial_write_AT_ack(p, "AT+CKPD=\"EEE\"");
-      if (res) {
-        ERRORA("at_hangup command failed, command used: 'AT+CKPD=\"EEE\"'\n",
-               CELLIAX_P_LOG);
-        return -1;
-      }
-    }
-  }
-  p->interface_state = AST_STATE_DOWN;
-  p->phone_callflow = CALLFLOW_CALL_IDLE;
-  return 0;
-}
-
-int celliax_serial_config_AT(struct celliax_pvt *p)
-{
-  int res;
-
-/* initial_pause? */
-  if (p->at_initial_pause) {
-    DEBUGA_AT("sleeping for %d usec\n", CELLIAX_P_LOG, p->at_initial_pause);
-    usleep(p->at_initial_pause);
-  }
-
-/* go until first empty preinit string, or last preinit string */
-  while (1) {
-
-    if (strlen(p->at_preinit_1)) {
-      res = celliax_serial_write_AT_expect(p, p->at_preinit_1, p->at_preinit_1_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_preinit_1, p->at_preinit_1_expect);
-      }
-    } else {
-      break;
-    }
-
-    if (strlen(p->at_preinit_2)) {
-      res = celliax_serial_write_AT_expect(p, p->at_preinit_2, p->at_preinit_2_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_preinit_2, p->at_preinit_2_expect);
-      }
-    } else {
-      break;
-    }
-
-    if (strlen(p->at_preinit_3)) {
-      res = celliax_serial_write_AT_expect(p, p->at_preinit_3, p->at_preinit_3_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_preinit_3, p->at_preinit_3_expect);
-      }
-    } else {
-      break;
-    }
-
-    if (strlen(p->at_preinit_4)) {
-      res = celliax_serial_write_AT_expect(p, p->at_preinit_4, p->at_preinit_4_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_preinit_4, p->at_preinit_4_expect);
-      }
-    } else {
-      break;
-    }
-
-    if (strlen(p->at_preinit_5)) {
-      res = celliax_serial_write_AT_expect(p, p->at_preinit_5, p->at_preinit_5_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_preinit_5, p->at_preinit_5_expect);
-      }
-    } else {
-      break;
-    }
-
-    break;
-  }
-
-/* after_preinit_pause? */
-  if (p->at_after_preinit_pause) {
-    DEBUGA_AT("sleeping for %d usec\n", CELLIAX_P_LOG, p->at_after_preinit_pause);
-    usleep(p->at_after_preinit_pause);
-  }
-
-  /* phone, brother, art you alive? */
-  res = celliax_serial_write_AT_ack(p, "AT");
-  if (res) {
-    ERRORA("no response to AT\n", CELLIAX_P_LOG);
-    return -1;
-  }
-  /* for motorola, bring it back to "normal" mode if it happens to be in another mode */
-  res = celliax_serial_write_AT_ack(p, "AT+mode=0");
-  if (res) {
-    DEBUGA_AT("AT+mode=0 does not get OK from the phone. If it is NOT Motorola,"
-              " no problem.\n", CELLIAX_P_LOG);
-  }
-  usleep(50000);
-  /* for motorola end */
-
-  /* reset AT configuration to phone default */
-  res = celliax_serial_write_AT_ack(p, "ATZ");
-  if (res) {
-    DEBUGA_AT("ATZ failed\n", CELLIAX_P_LOG);
-  }
-
-  /* disable AT command echo */
-  res = celliax_serial_write_AT_ack(p, "ATE0");
-  if (res) {
-    DEBUGA_AT("ATE0 failed\n", CELLIAX_P_LOG);
-  }
-
-  /* disable extended error reporting */
-  res = celliax_serial_write_AT_ack(p, "AT+CMEE=0");
-  if (res) {
-    DEBUGA_AT("AT+CMEE failed\n", CELLIAX_P_LOG);
-  }
-
-  /* various phone manufacturer identifier */
-  char at_command[5];
-  int i;
-  for (i = 0; i < 10; i++) {
-    memset(at_command, 0, sizeof(at_command));
-    sprintf(at_command, "ATI%d", i);
-    res = celliax_serial_write_AT_ack(p, at_command);
-    if (res) {
-      DEBUGA_AT("ATI%d command failed, continue\n", CELLIAX_P_LOG, i);
-    }
-  }
-
-  /* phone manufacturer */
-  res = celliax_serial_write_AT_ack(p, "AT+CGMI");
-  if (res) {
-    DEBUGA_AT("AT+CGMI failed\n", CELLIAX_P_LOG);
-  }
-
-  /* phone model */
-  res = celliax_serial_write_AT_ack(p, "AT+CGMM");
-  if (res) {
-    DEBUGA_AT("AT+CGMM failed\n", CELLIAX_P_LOG);
-  }
-
-  res = celliax_serial_write_AT_ack(p, "AT+CGSN");
-  if (res) {
-    DEBUGA_AT("AT+CGSN failed\n", CELLIAX_P_LOG);
-  }
-
-/* this take a lot of time to complete on devices with slow serial link (eg.: 9600bps) */
-#if 0
-  /* ask for the list of supported AT commands, useful to implement new models and debugging */
-  res = celliax_serial_write_AT_ack(p, "AT+CLAC");
-  if (res) {
-    DEBUGA_AT("AT+CLAC failed, continue\n", CELLIAX_P_LOG);
-  }
-#endif
-  /* signal incoming SMS with a +CMTI unsolicited msg */
-  res = celliax_serial_write_AT_ack(p, "AT+CNMI=3,1,0,0,0");
-  if (res) {
-    DEBUGA_AT("AT+CNMI=3,1,0,0,0 failed, continue\n", CELLIAX_P_LOG);
-    p->sms_cnmi_not_supported = 1;
-    p->celliax_serial_sync_period = 30;
-  }
-  /* what is the Message Center address (number) to which the SMS has to be sent? */
-  res = celliax_serial_write_AT_ack(p, "AT+CSCA?");
-  if (res) {
-    DEBUGA_AT("AT+CSCA? failed, continue\n", CELLIAX_P_LOG);
-  }
-  /* what is the Message Format of SMSs? */
-  res = celliax_serial_write_AT_ack(p, "AT+CMGF?");
-  if (res) {
-    DEBUGA_AT("AT+CMGF? failed, continue\n", CELLIAX_P_LOG);
-  }
-  res = celliax_serial_write_AT_ack(p, "AT+CMGF=1");    //TODO: support phones that only accept pdu mode
-  if (res) {
-    ERRORA("Error setting SMS sending mode to TEXT on the cellphone\n", CELLIAX_P_LOG);
-    return RESULT_FAILURE;
-  }
-  /* what is the Charset of SMSs? */
-  res = celliax_serial_write_AT_ack(p, "AT+CSCS?");
-  if (res) {
-    DEBUGA_AT("AT+CSCS? failed, continue\n", CELLIAX_P_LOG);
-  }
-
-  p->no_ucs2 = 0;
-  res = celliax_serial_write_AT_ack(p, "AT+CSCS=\"UCS2\"");
-  if (res) {
-    WARNINGA
-      ("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  do not got OK from the phone, let's try with 'GSM'\n",
-       CELLIAX_P_LOG);
-    p->no_ucs2 = 1;
-  }
-
-  if (p->no_ucs2) {
-    res = celliax_serial_write_AT_ack(p, "AT+CSCS=\"GSM\"");
-    if (res) {
-      WARNINGA("AT+CSCS=\"GSM\" (set TE messages to GSM)  do not got OK from the phone\n",
-               CELLIAX_P_LOG);
-    }
-    //res = celliax_serial_write_AT_ack(p, "AT+CSMP=17,167,0,16"); //"flash", class 0  sms 7 bit
-    res = celliax_serial_write_AT_ack(p, "AT+CSMP=17,167,0,0"); //normal, 7 bit message
-    if (res) {
-      WARNINGA("AT+CSMP do not got OK from the phone, continuing\n", CELLIAX_P_LOG);
-    }
-  } else {
-    //res = celliax_serial_write_AT_ack(p, "AT+CSMP=17,167,0,20"); //"flash", class 0 sms 16 bit unicode
-    res = celliax_serial_write_AT_ack(p, "AT+CSMP=17,167,0,8"); //unicode, 16 bit message
-    if (res) {
-      WARNINGA("AT+CSMP do not got OK from the phone, continuing\n", CELLIAX_P_LOG);
-    }
-  }
-
-  /* is the unsolicited reporting of mobile equipment event supported? */
-  res = celliax_serial_write_AT_ack(p, "AT+CMER=?");
-  if (res) {
-    DEBUGA_AT("AT+CMER=? failed, continue\n", CELLIAX_P_LOG);
-  }
-  /* request unsolicited reporting of mobile equipment indicators' events, to be screened by categories reported by +CIND=? */
-  res = celliax_serial_write_AT_ack(p, "AT+CMER=3,0,0,1");
-  if (res) {
-    DEBUGA_AT("AT+CMER=? failed, continue\n", CELLIAX_P_LOG);
-  }
-
-  /* is the solicited reporting of mobile equipment indications supported? */
-
-  res = celliax_serial_write_AT_ack(p, "AT+CIND=?");
-  if (res) {
-    DEBUGA_AT("AT+CIND=? failed, continue\n", CELLIAX_P_LOG);
-  }
-
-  /* is the unsolicited reporting of call monitoring supported? sony-ericsson specific */
-  res = celliax_serial_write_AT_ack(p, "AT*ECAM=?");
-  if (res) {
-    DEBUGA_AT("AT*ECAM=? failed, continue\n", CELLIAX_P_LOG);
-  }
-  /* enable the unsolicited reporting of call monitoring. sony-ericsson specific */
-  res = celliax_serial_write_AT_ack(p, "AT*ECAM=1");
-  if (res) {
-    DEBUGA_AT("AT*ECAM=1 failed, continue\n", CELLIAX_P_LOG);
-    p->at_has_ecam = 0;
-  } else {
-    p->at_has_ecam = 1;
-  }
-
-  /* disable unsolicited signaling of call list */
-  res = celliax_serial_write_AT_ack(p, "AT+CLCC=0");
-  if (res) {
-    DEBUGA_AT("AT+CLCC=0 failed, continue\n", CELLIAX_P_LOG);
-    p->at_has_clcc = 0;
-  } else {
-    p->at_has_clcc = 1;
-  }
-
-  /* give unsolicited caller id when incoming call */
-  res = celliax_serial_write_AT_ack(p, "AT+CLIP=1");
-  if (res) {
-    DEBUGA_AT("AT+CLIP failed, continue\n", CELLIAX_P_LOG);
-  }
-  /* for motorola */
-  res = celliax_serial_write_AT_ack(p, "AT+MCST=1");    /* motorola call control codes
-                                                           (to know when call is disconnected (they
-                                                           don't give you "no carrier") */
-  if (res) {
-    DEBUGA_AT("AT+MCST=1 does not get OK from the phone. If it is NOT Motorola,"
-              " no problem.\n", CELLIAX_P_LOG);
-  }
-  /* for motorola end */
-
-/* go until first empty postinit string, or last postinit string */
-  while (1) {
-
-    if (strlen(p->at_postinit_1)) {
-      res = celliax_serial_write_AT_expect(p, p->at_postinit_1, p->at_postinit_1_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_postinit_1, p->at_postinit_1_expect);
-      }
-    } else {
-      break;
-    }
-
-    if (strlen(p->at_postinit_2)) {
-      res = celliax_serial_write_AT_expect(p, p->at_postinit_2, p->at_postinit_2_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_postinit_2, p->at_postinit_2_expect);
-      }
-    } else {
-      break;
-    }
-
-    if (strlen(p->at_postinit_3)) {
-      res = celliax_serial_write_AT_expect(p, p->at_postinit_3, p->at_postinit_3_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_postinit_3, p->at_postinit_3_expect);
-      }
-    } else {
-      break;
-    }
-
-    if (strlen(p->at_postinit_4)) {
-      res = celliax_serial_write_AT_expect(p, p->at_postinit_4, p->at_postinit_4_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_postinit_4, p->at_postinit_4_expect);
-      }
-    } else {
-      break;
-    }
-
-    if (strlen(p->at_postinit_5)) {
-      res = celliax_serial_write_AT_expect(p, p->at_postinit_5, p->at_postinit_5_expect);
-      if (res) {
-        DEBUGA_AT("%s does not get %s from the phone. Continuing.\n", CELLIAX_P_LOG,
-                  p->at_postinit_5, p->at_postinit_5_expect);
-      }
-    } else {
-      break;
-    }
-
-    break;
-  }
-
-  return 0;
-}
-
-int celliax_serial_call_AT(struct celliax_pvt *p, char *dstr)
-{
-  int res;
-  char at_command[256];
-
-  if (option_debug)
-    DEBUGA_PBX("Dialing %s\n", CELLIAX_P_LOG, dstr);
-  memset(at_command, 0, sizeof(at_command));
-  p->phone_callflow = CALLFLOW_CALL_DIALING;
-  p->interface_state = AST_STATE_DIALING;
-  ast_uri_decode(dstr);
-  size_t fixdstr = strspn(dstr, AST_DIGIT_ANYDIG);
-  if (fixdstr == 0) {
-    ERRORA("dial command failed because of invalid dial number. dial string was: %s\n",
-           CELLIAX_P_LOG, dstr);
-    return -1;
-  }
-  dstr[fixdstr] = '\0';
-  sprintf(at_command, "%s%s%s", p->at_dial_pre_number, dstr, p->at_dial_post_number);
-  res = celliax_serial_write_AT_expect(p, at_command, p->at_dial_expect);
-  if (res) {
-    ERRORA("dial command failed, dial string was: %s\n", CELLIAX_P_LOG, at_command);
-    return -1;
-  }
-  // jet - early audio
-  if (p->at_early_audio) {
-    ast_queue_control(p->owner, AST_CONTROL_ANSWER);
-  }
-
-  return 0;
-}
-
-int celliax_console_at(int fd, int argc, char *argv[])
-{
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-  char at_cmd[1024];
-  int i, a, c;
-
-  if (argc == 1)
-    return RESULT_SHOWUSAGE;
-  if (!p) {
-    ast_cli(fd,
-            "No \"current\" console for celliax_at, please enter 'help celliax_console'\n");
-    return RESULT_SUCCESS;
-  }
-  if (p->controldevprotocol != PROTOCOL_AT) {
-    ast_cli(fd,
-            "The \"current\" console is not connected to an 'AT modem' (cellphone)\n");
-    return RESULT_SUCCESS;
-  }
-
-  memset(at_cmd, 0, sizeof(at_cmd));
-  c = 0;
-  for (i = 1; i < argc; i++) {
-    for (a = 0; a < strlen(argv[i]); a++) {
-      at_cmd[c] = argv[i][a];
-      c++;
-      if (c == 1022)
-        break;
-    }
-    if (i != argc - 1) {
-      at_cmd[c] = ' ';
-      c++;
-    }
-    if (c == 1023)
-      break;
-  }
-  celliax_serial_write_AT_noack(p, at_cmd);
-  return RESULT_SUCCESS;
-}
-
-#ifdef ASTERISK_VERSION_1_2
-int celliax_manager_sendsms(struct mansession *s, struct message *m)
-#endif //ASTERISK_VERSION_1_2
-#ifdef ASTERISK_VERSION_1_4
-int celliax_manager_sendsms(struct mansession *s, const struct message *m)
-#endif //ASTERISK_VERSION_1_4
-{
-  int ret;
-  char command[512];
-  const char *interfacename = astman_get_header(m, "Interface");
-  const char *destinationnumber = astman_get_header(m, "Number");
-  const char *text = astman_get_header(m, "Text");
-  const char *action_id = astman_get_header(m, "ActionID");
-
-  if (ast_strlen_zero(interfacename)) {
-    astman_send_error(s, m, "Interface: missing.\n");
-    return 0;
-  }
-  if (ast_strlen_zero(destinationnumber)) {
-    astman_send_error(s, m, "Number: missing.\n");
-    return 0;
-  }
-  if (ast_strlen_zero(text)) {
-    astman_send_error(s, m, "Text: missing.\n");
-    return 0;
-  }
-  if (ast_strlen_zero(action_id)) {
-    astman_send_error(s, m, "ActionID: missing.\n");
-    return 0;
-  }
-
-  memset(command, 0, sizeof(command));
-
-  sprintf(command, "%s/%s|%s|", interfacename, destinationnumber, text);
-
-  ret = celliax_sendsms(NULL, (void *) &command);
-
-#ifndef ASTERISK_VERSION_1_4
-  if (!ret) {
-    ast_cli(s->fd, "Response: Success\r\n");
-    if (!ast_strlen_zero(action_id))
-      ast_cli(s->fd, "ActionID: %s\r\n", action_id);
-    ast_cli(s->fd, "\r\n");
-    return RESULT_SUCCESS;
-  } else {
-    ast_cli(s->fd, "Response: Error\r\n");
-    if (!ast_strlen_zero(action_id))
-      ast_cli(s->fd, "ActionID: %s\r\n", action_id);
-    ast_cli(s->fd, "Message: celliax_manager_sendsms failed\r\n");
-    ast_cli(s->fd, "\r\n");
-    return 0;
-  }
-#else /* ASTERISK_VERSION_1_4 */
-  if (!ret) {
-    astman_append(s, "Response: Success\r\n");
-    if (!ast_strlen_zero(action_id))
-      astman_append(s, "ActionID: %s\r\n", action_id);
-    astman_append(s, "\r\n");
-    return RESULT_SUCCESS;
-  } else {
-    astman_append(s, "Response: Error\r\n");
-    if (!ast_strlen_zero(action_id))
-      astman_append(s, "ActionID: %s\r\n", action_id);
-    astman_append(s, "Message: celliax_manager_sendsms failed\r\n");
-    astman_append(s, "\r\n");
-    return 0;
-  }
-#endif /* ASTERISK_VERSION_1_4 */
-
-  return RESULT_SUCCESS;        //never reached
-}
-
-int ucs2_to_utf8(struct celliax_pvt *p, char *ucs2_in, char *utf8_out,
-                 size_t outbytesleft)
-{
-  char converted[16000];
-  iconv_t iconv_format;
-  int iconv_res;
-  char *outbuf;
-  char *inbuf;
-  size_t inbytesleft;
-  int c;
-  char stringa[5];
-  double hexnum;
-  int i = 0;
-
-  memset(converted, '\0', sizeof(converted));
-
-  DEBUGA_AT("ucs2_in=%s\n", CELLIAX_P_LOG, ucs2_in);
-  /* cicopet */
-  for (c = 0; c < strlen(ucs2_in); c++) {
-    sprintf(stringa, "0x%c%c", ucs2_in[c], ucs2_in[c + 1]);
-    c++;
-    hexnum = strtod(stringa, NULL);
-    converted[i] = hexnum;
-    i++;
-  }
-
-  outbuf = utf8_out;
-  inbuf = converted;
-
-  iconv_format = iconv_open("UTF8", "UCS-2BE");
-  if (iconv_format == (iconv_t) - 1) {
-    ERRORA("error: %s\n", CELLIAX_P_LOG, strerror(errno));
-    return -1;
-  }
-
-  inbytesleft = i;
-  iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-  if (iconv_res == (size_t) - 1) {
-    DEBUGA_AT("ciao in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
-              CELLIAX_P_LOG, inbuf, inbytesleft, outbuf, outbytesleft, converted,
-              utf8_out);
-    DEBUGA_AT("error: %s %d\n", CELLIAX_P_LOG, strerror(errno), errno);
-    return -1;
-  }
-  DEBUGA_AT
-    ("iconv_res=%d,  in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
-     CELLIAX_P_LOG, iconv_res, inbuf, inbytesleft, outbuf, outbytesleft, converted,
-     utf8_out);
-  iconv_close(iconv_format);
-
-  return 0;
-}
-
-int utf_to_ucs2(struct celliax_pvt *p, char *utf_in, size_t inbytesleft, char *ucs2_out,
-                size_t outbytesleft)
-{
-  /* cicopet */
-  iconv_t iconv_format;
-  int iconv_res;
-  char *outbuf;
-  char *inbuf;
-  char converted[16000];
-  int i;
-  char stringa[16];
-  char stringa2[16];
-
-  memset(converted, '\0', sizeof(converted));
-
-  outbuf = converted;
-  inbuf = utf_in;
-
-  iconv_format = iconv_open("UCS-2BE", "UTF8");
-  if (iconv_format == (iconv_t) - 1) {
-    ERRORA("error: %s\n", CELLIAX_P_LOG, strerror(errno));
-    return -1;
-  }
-  outbytesleft = 16000;
-
-  DEBUGA_AT("in=%s, inleft=%d, out=%s, outleft=%d, utf_in=%s, converted=%s\n",
-            CELLIAX_P_LOG, inbuf, inbytesleft, outbuf, outbytesleft, utf_in, converted);
-  iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-  if (iconv_res == (size_t) - 1) {
-    ERRORA("error: %s %d\n", CELLIAX_P_LOG, strerror(errno), errno);
-    return -1;
-  }
-  DEBUGA_AT
-    ("iconv_res=%d,  in=%s, inleft=%d, out=%s, outleft=%d, utf_in=%s, converted=%s\n",
-     CELLIAX_P_LOG, iconv_res, inbuf, inbytesleft, outbuf, outbytesleft, utf_in,
-     converted);
-  iconv_close(iconv_format);
-
-  for (i = 0; i < 16000 - outbytesleft; i++) {
-    memset(stringa, '\0', sizeof(stringa));
-    memset(stringa2, '\0', sizeof(stringa2));
-    sprintf(stringa, "%02X", converted[i]);
-    DEBUGA_AT("character is |%02X|\n", CELLIAX_P_LOG, converted[i]);
-    stringa2[0] = stringa[strlen(stringa) - 2];
-    stringa2[1] = stringa[strlen(stringa) - 1];
-    strncat(ucs2_out, stringa2, ((outbytesleft - strlen(ucs2_out)) - 1));   //add the received line to the buffer
-    DEBUGA_AT("stringa=%s, stringa2=%s, ucs2_out=%s\n", CELLIAX_P_LOG, stringa, stringa2,
-              ucs2_out);
-  }
-  return 0;
-}
-
-int celliax_sendsms(struct ast_channel *c, void *data)
-{
-  char *idest = data;
-  char rdest[256];
-  struct celliax_pvt *p = NULL;
-  char *device;
-  char *dest;
-  char *text;
-  char *stringp = NULL;
-  int found = 0;
-  int failed = 0;
-
-  strncpy(rdest, idest, sizeof(rdest) - 1);
-  ast_log(LOG_DEBUG, "CelliaxSendsms: %s\n", rdest);
-  ast_log(LOG_DEBUG, "START\n");
-  /* we can use celliax_request to get the channel, but celliax_request would look for onowned channels, and probably we can send SMSs while a call is ongoing
-   *
-   */
-
-  stringp = rdest;
-  device = strsep(&stringp, "/");
-  dest = strsep(&stringp, "|");
-  text = strsep(&stringp, "|");
-
-  if (!device) {
-    ast_log(LOG_ERROR,
-            "CelliaxSendsms app do not recognize '%s'. Requires a destination with slashes (interfacename/destinationnumber, TEXT)\n",
-            idest);
-    return -1;
-  }
-
-  if (!dest) {
-    ast_log(LOG_ERROR,
-            "CelliaxSendsms app do not recognize '%s'. Requires a destination with slashes (interfacename/destinationnumber, TEXT)\n",
-            idest);
-    return -1;
-  }
-
-  if (!text) {
-    ast_log(LOG_ERROR,
-            "CelliaxSendsms app do not recognize '%s'. Requires a destination with slashes (interfacename/destinationnumber, TEXT)\n",
-            idest);
-    return -1;
-  }
-
-  ast_log(LOG_DEBUG, "interfacename:%s, destinationnumber:%s, text:%s\n", device, dest,
-          text);
-
-  /* lock the interfaces' list */
-  LOKKA(&celliax_iflock);
-  /* make a pointer to the first interface in the interfaces list */
-  p = celliax_iflist;
-  /* Search for the requested interface and verify if is unowned */
-  //TODO implement groups a la chan_zap
-  while (p) {
-    size_t length = strlen(p->name);
-    /* is this the requested interface? */
-    if (strncmp(device, p->name, length) == 0) {
-      /* this is the requested interface! */
-      if (option_debug)
-        DEBUGA_AT("FOUND! interfacename:%s, destinationnumber:%s, text:%s, p->name=%s\n",
-                  CELLIAX_P_LOG, device, dest, text, p->name);
-      found = 1;
-      break;
-
-    }
-    /* not yet found, next please */
-    p = p->next;
-  }
-  /* unlock the interfaces' list */
-  UNLOCKA(&celliax_iflock);
-
-  if (!found) {
-    ast_log(LOG_ERROR, "Interface '%s' requested by CelliaxSendsms NOT FOUND\n", device);
-    return RESULT_FAILURE;
-  }
-
-  if (p->controldevprotocol != PROTOCOL_AT) {
-    ERRORA("CelliaxSendsms supports only AT command cellphones at the moment :-( !\n",
-           CELLIAX_P_LOG);
-    return RESULT_FAILURE;
-  }
-
-  if (p->controldevprotocol == PROTOCOL_AT) {
-    int err = 0;
-    char smscommand[16000];
-    memset(smscommand, '\0', sizeof(smscommand));
-
-    PUSHA_UNLOCKA(&p->controldev_lock);
-    LOKKA(&p->controldev_lock);
-
-    if (p->no_ucs2) {
-      sprintf(smscommand, "AT+CMGS=\"%s\"", dest);  //TODO: support phones that only accept pdu mode
-    } else {
-      char dest2[1048];
-
-          err = celliax_serial_write_AT_ack(p, "AT+CSCS=\"UCS2\"");
-          if (err) {
-            ERRORA
-              ("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  do not got OK from the phone\n",
-               CELLIAX_P_LOG);
-          }
-
-      memset(dest2, '\0', sizeof(dest2));
-      utf_to_ucs2(p, dest, strlen(dest), dest2, sizeof(dest2));
-      sprintf(smscommand, "AT+CMGS=\"%s\"", dest2); //TODO: support phones that only accept pdu mode
-    }
-    //TODO: support phones that only accept pdu mode
-    //TODO would be better to lock controldev here
-    err = celliax_serial_write_AT_noack(p, smscommand);
-    if (err) {
-      ERRORA("Error sending SMS\n", CELLIAX_P_LOG);
-      failed = 1;
-      goto uscita;
-    }
-    err = celliax_serial_AT_expect(p, "> ", 0, 1);  // wait 1.5s for the prompt, no  crlf
-#if 1
-    if (err) {
-      DEBUGA_AT
-        ("Error or timeout getting prompt '> ' for sending sms directly to the remote party. BTW, seems that we cannot do that with Motorola c350, so we'll write to cellphone memory, then send from memory\n",
-         CELLIAX_P_LOG);
-
-      err = celliax_serial_write_AT_ack(p, "ATE1"); //motorola (at least c350) do not echo the '>' prompt when in ATE0... go figure!!!!
-      if (err) {
-        ERRORA("Error activating echo from modem\n", CELLIAX_P_LOG);
-      }
-      p->at_cmgw[0] = '\0';
-      sprintf(smscommand, "AT+CMGW=\"%s\"", dest);  //TODO: support phones that only accept pdu mode
-      err = celliax_serial_write_AT_noack(p, smscommand);
-      if (err) {
-        ERRORA("Error writing SMS destination to the cellphone memory\n", CELLIAX_P_LOG);
-        failed = 1;
-        goto uscita;
-      }
-      err = celliax_serial_AT_expect(p, "> ", 0, 1);    // wait 1.5s for the prompt, no  crlf
-      if (err) {
-        ERRORA
-          ("Error or timeout getting prompt '> ' for writing sms text in cellphone memory\n",
-           CELLIAX_P_LOG);
-        failed = 1;
-        goto uscita;
-      }
-    }
-#endif
-
-    //sprintf(text,"ciao 123 belè новости לק ראת ﺎﻠﺠﻤﻋﺓ 人大"); //let's test the beauty of utf
-    memset(smscommand, '\0', sizeof(smscommand));
-    if (p->no_ucs2) {
-      sprintf(smscommand, "%s", text);
-    } else {
-      utf_to_ucs2(p, text, strlen(text), smscommand, sizeof(smscommand));
-    }
-
-    smscommand[strlen(smscommand)] = 0x1A;
-    DEBUGA_AT("smscommand len is: %d, text is:|||%s|||\n", CELLIAX_P_LOG,
-              strlen(smscommand), smscommand);
-
-    err = celliax_serial_write_AT_ack_nocr_longtime(p, smscommand);
-    //TODO would be better to unlock controldev here
-    if (err) {
-      ERRORA("Error writing SMS text to the cellphone memory\n", CELLIAX_P_LOG);
-      //return RESULT_FAILURE;
-      failed = 1;
-      goto uscita;
-    }
-    if (p->at_cmgw[0]) {
-      sprintf(smscommand, "AT+CMSS=%s", p->at_cmgw);
-      err = celliax_serial_write_AT_expect_longtime(p, smscommand, "OK");
-      if (err) {
-        ERRORA("Error sending SMS from the cellphone memory\n", CELLIAX_P_LOG);
-        //return RESULT_FAILURE;
-        failed = 1;
-        goto uscita;
-      }
-
-      err = celliax_serial_write_AT_ack(p, "ATE0"); //motorola (at least c350) do not echo the '>' prompt when in ATE0... go figure!!!!
-      if (err) {
-        ERRORA("Error de-activating echo from modem\n", CELLIAX_P_LOG);
-      }
-    }
-  uscita:
-    usleep(1000);
-
-    if (p->at_cmgw[0]) {
-
-      /* let's see what we've sent, just for check TODO: Motorola it's not reliable! Motorola c350 tells that all was sent, but is not true! It just sends how much it fits into one SMS FIXME: need an algorithm to calculate how many ucs2 chars fits into an SMS. It make difference based, probably, on the GSM alphabet translation, or so */
-      sprintf(smscommand, "AT+CMGR=%s", p->at_cmgw);
-      err = celliax_serial_write_AT_ack(p, smscommand);
-      if (err) {
-        ERRORA("Error reading SMS back from the cellphone memory\n", CELLIAX_P_LOG);
-      }
-
-      /* let's delete from cellphone memory what we've sent */
-      sprintf(smscommand, "AT+CMGD=%s", p->at_cmgw);
-      err = celliax_serial_write_AT_ack(p, smscommand);
-      if (err) {
-        ERRORA("Error deleting SMS from the cellphone memory\n", CELLIAX_P_LOG);
-      }
-
-      p->at_cmgw[0] = '\0';
-    }
-    //usleep(500000);             //.5 secs
-    UNLOCKA(&p->controldev_lock);
-    POPPA_UNLOCKA(&p->controldev_lock);
-  }
-
-  ast_log(LOG_DEBUG, "FINISH\n");
-  if (failed)
-    return -1;
-  else
-    return RESULT_SUCCESS;
-}
-
-#ifdef CELLIAX_DIR
-/* For simplicity, I'm keeping the format compatible with the voicemail config,
-   but i'm open to suggestions for isolating it */
-#define CELLIAX_DIR_CONFIG "directoriax.conf"
-
-/* How many digits to read in */
-#define CELLIAX_DIR_NUMDIGITS 3
-
-struct ast_config *celliax_dir_realtime(char *context)
-{
-  //TODO: all the realtime stuff has to be re-made
-  struct ast_config *cfg;
-  struct celliax_pvt *p = NULL;
-#ifdef ASTERISK_VERSION_1_6_0
-  struct ast_flags config_flags = { 0 };
-#endif /* ASTERISK_VERSION_1_6_0 */
-
-  /* Load flat file config. */
-#ifdef ASTERISK_VERSION_1_6_0
-  cfg = ast_config_load(CELLIAX_DIR_CONFIG, config_flags);
-#else
-  cfg = ast_config_load(CELLIAX_DIR_CONFIG);
-#endif /* ASTERISK_VERSION_1_6_0 */
-
-  if (!cfg) {
-    /* Loading config failed. */
-    WARNINGA
-      ("Loading directoriax.conf config file failed. It's not necessary, continuing.\n",
-       CELLIAX_P_LOG);
-    return NULL;
-  }
-  return cfg;
-}
-
-static char *celliax_dir_convert(char *lastname)
-{
-  char *tmp;
-  int lcount = 0;
-  tmp = malloc(CELLIAX_DIR_NUMDIGITS + 1);
-  if (tmp) {
-    while ((*lastname > 32) && lcount < CELLIAX_DIR_NUMDIGITS) {
-      switch (toupper(*lastname)) {
-      case '1':
-        tmp[lcount++] = '1';
-        break;
-      case '2':
-      case 'A':
-      case 'B':
-      case 'C':
-        tmp[lcount++] = '2';
-        break;
-      case '3':
-      case 'D':
-      case 'E':
-      case 'F':
-        tmp[lcount++] = '3';
-        break;
-      case '4':
-      case 'G':
-      case 'H':
-      case 'I':
-        tmp[lcount++] = '4';
-        break;
-      case '5':
-      case 'J':
-      case 'K':
-      case 'L':
-        tmp[lcount++] = '5';
-        break;
-      case '6':
-      case 'M':
-      case 'N':
-      case 'O':
-        tmp[lcount++] = '6';
-        break;
-      case '7':
-      case 'P':
-      case 'Q':
-      case 'R':
-      case 'S':
-        tmp[lcount++] = '7';
-        break;
-      case '8':
-      case 'T':
-      case 'U':
-      case 'V':
-        tmp[lcount++] = '8';
-        break;
-      case '9':
-      case 'W':
-      case 'X':
-      case 'Y':
-      case 'Z':
-        tmp[lcount++] = '9';
-        break;
-      }
-      lastname++;
-    }
-    tmp[lcount] = '\0';
-  }
-  return tmp;
-}
-
-int celliax_console_celliax_dir_export(int fd, int argc, char *argv[])
-{
-  struct ast_config *cfg;
-
-  struct ast_variable *v;
-  char *start, *pos, *stringp, *space, *options = NULL, *conv = NULL;
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-  char *context = "default";
-  char *s;
-  char *var, *value;
-  int fromcell = 0;
-  int fromskype = 0;
-  char name[256] = "";
-  char phonebook_direct_calling_ext[7] = "";
-  char write_entry_command[256] = "";
-  char entry_number[256] = "";
-  char entry_text[256] = "";
-  char final_entry_text[256] = "";
-  int res;
-  int tocell = 0;
-#ifdef CELLIAX_LIBCSV
-  int tocsv = 0;
-  int tovcf = 0;
-#endif /* CELLIAX_LIBCSV */
-
-  if (argc < 3 || argc > 4)
-    return RESULT_SHOWUSAGE;
-  if (!p) {
-    ast_cli(fd, "No \"current\" console ???, please enter 'help celliax_console'\n");
-    return RESULT_SUCCESS;
-  }
-
-  if (!strcasecmp(argv[1], "tocell"))
-    tocell = 1;
-#ifdef CELLIAX_LIBCSV
-  else if (!strcasecmp(argv[1], "tocsv"))
-    tocsv = 1;
-  else if (!strcasecmp(argv[1], "tovcf"))
-    tovcf = 1;
-#endif /* CELLIAX_LIBCSV */
-  else {
-    ast_cli(fd,
-#ifdef CELLIAX_LIBCSV
-            "\n\nYou have neither specified 'tocell' nor 'tocsv'\n\n");
-#else /* CELLIAX_LIBCSV */
-            "\n\nYou have not specified 'tocell'\n\n");
-#endif /* CELLIAX_LIBCSV */
-    return RESULT_SHOWUSAGE;
-  }
-  if (tocell)
-    if (p->controldevprotocol != PROTOCOL_AT) {
-      ast_cli(fd,
-              "Exporting to the cellphone phonebook is currently supported only on \"AT\" cellphones :( !\n");
-      return RESULT_SUCCESS;
-    }
-#ifdef CELLIAX_LIBCSV
-  if (tocsv || tovcf)
-    if (argc != 4) {
-      ast_cli(fd, "\n\nYou have to specify a filename with 'tocsv'\n\n");
-      return RESULT_SHOWUSAGE;
-    }
-#endif /* CELLIAX_LIBCSV */
-
-  if (option_debug)
-    NOTICA("celliax_cellphonenumber is: %s\n", CELLIAX_P_LOG, argv[2]);
-
-#ifdef CELLIAX_LIBCSV
-  if (tocsv) {
-    if (option_debug)
-      NOTICA("filename is: %s\n", CELLIAX_P_LOG, argv[3]);
-    //ast_cli(fd, "\n\nnot yet implemented :P \n");
-    //return RESULT_SUCCESS;
-  }
-  if (tovcf) {
-    if (option_debug)
-      NOTICA("filename is: %s\n", CELLIAX_P_LOG, argv[3]);
-    ast_cli(fd, "\n\nnot yet implemented :P \n");
-    return RESULT_SUCCESS;
-  }
-#endif /* CELLIAX_LIBCSV */
-
-  cfg = celliax_dir_realtime(context);
-  if (!cfg) {
-    return -1;
-  }
-
-  if (tocell) {
-    /* which phonebook to use, use the SIM  */
-    res = celliax_serial_write_AT_ack(p, "AT+CPBS=SM");
-    if (res) {
-      WARNINGA("AT+CPBS=SM failed, continue\n", CELLIAX_P_LOG);
-    }
-    /* which phonebook to use, trying to use phone, not SIM  */
-    res = celliax_serial_write_AT_ack(p, "AT+CPBS=ME");
-    if (res) {
-      WARNINGA("AT+CPBS=ME failed, continue\n", CELLIAX_P_LOG);
-    }
-    /* retrieve the fields lenght in the selected phonebook  */
-    p->phonebook_querying = 1;
-    res = celliax_serial_write_AT_ack(p, "AT+CPBR=?");
-    if (res) {
-      WARNINGA("AT+CPBR=? failed, continue\n", CELLIAX_P_LOG);
-    }
-    p->phonebook_querying = 0;
-
-    v = ast_variable_browse(cfg, context);
-    /* Find all candidate extensions */
-    while (v) {
-      /* Find a candidate extension */
-      start = strdup(v->value);
-      if (strcasestr(start, "fromcell=yes")) {
-        fromcell = 1;
-        fromskype = 0;
-
-      }
-      if (strcasestr(start, "fromskype=yes")) {
-        fromcell = 0;
-        fromskype = 1;
-
-      }
-
-      if (start && !strcasestr(start, "hidefromdir=yes")) {
-        memset(name, 0, sizeof(name));
-        memset(phonebook_direct_calling_ext, 0, sizeof(phonebook_direct_calling_ext));
-        memset(write_entry_command, 0, sizeof(write_entry_command));
-        memset(entry_number, 0, sizeof(entry_number));
-        memset(entry_text, 0, sizeof(entry_text));
-        memset(final_entry_text, 0, sizeof(final_entry_text));
-
-        DEBUGA_AT("v->name=%s\n", CELLIAX_P_LOG, v->name);
-        DEBUGA_AT("v->value=%s\n", CELLIAX_P_LOG, v->value);
-
-        stringp = start;
-        strsep(&stringp, ",");
-        pos = strsep(&stringp, ",");
-        if (pos) {
-          ast_copy_string(name, pos, sizeof(name));
-          if (strchr(pos, ' ')) {
-            space = strchr(pos, ' ');
-            *space = '\0';
-          }
-          if (pos) {
-            conv = celliax_dir_convert(pos);
-            DEBUGA_AT("<pos=>%s<conv=>%s<\n", CELLIAX_P_LOG, pos, conv);
-
-            options = strdup(v->value);
-            strsep(&options, ",");
-            strsep(&options, ",");
-            strsep(&options, ",");
-            strsep(&options, ",");
-            DEBUGA_AT("options=%s\n", CELLIAX_P_LOG, options);
-
-            while ((s = strsep(&options, "|"))) {
-              value = s;
-              if ((var = strsep(&value, "=")) && value) {
-                DEBUGA_AT("var=%s value=%s\n", CELLIAX_P_LOG, var, value);
-                if (!strcmp(var, "phonebook_direct_calling_ext"))
-                  strncpy(phonebook_direct_calling_ext, value, 6);
-              }
-            }
-
-            res =
-              snprintf(entry_number, p->phonebook_number_lenght + 1, "%s%s%d%s%s",
-                       argv[2], "p", p->celliax_dir_prefix, "p",
-                       phonebook_direct_calling_ext);
-            if (res == (p->phonebook_number_lenght + 1)
-                || res > (p->phonebook_number_lenght + 1)) {
-              ERRORA("entry_number truncated, was: '%s%s%d%s%s', now is: '%s'\n",
-                     CELLIAX_P_LOG, argv[2], "p", p->celliax_dir_prefix, "p",
-                     phonebook_direct_calling_ext, entry_number);
-              //FIXME: abort ???
-
-            }
-
-            res = snprintf(final_entry_text, p->phonebook_text_lenght + 1, "%s", name); //FIXME result not checked
-
-            res =
-              snprintf(write_entry_command, sizeof(write_entry_command) - 1,
-                       "AT+CPBW=,\"%s\",,\"%s\"", entry_number, final_entry_text);
-            if (res == (sizeof(write_entry_command) - 1)
-                || res > (sizeof(write_entry_command) - 1)) {
-              WARNINGA
-                ("write_entry_command truncated, was supposed: 'AT+CPBW=,\"%s\",,\"%s\"', now is: '%s'\n",
-                 CELLIAX_P_LOG, entry_number, final_entry_text, write_entry_command);
-            }
-            //if (option_debug)
-            NOTICA("%s\n", CELLIAX_P_LOG, write_entry_command);
-          }
-        }
-        if (conv)
-          free(conv);
-        if (start)
-          free(start);
-        if (options)
-          free(options);
-      }
-      v = v->next;
-    }
-  }
-#ifdef CELLIAX_LIBCSV
-  if (tocsv) {
-
-    v = ast_variable_browse(cfg, context);
-    /* Find all candidate extensions */
-    while (v) {
-      /* Find a candidate extension */
-      start = strdup(v->value);
-      if (strcasestr(start, "fromcell=yes")) {
-        fromcell = 1;
-        fromskype = 0;
-
-      }
-      if (strcasestr(start, "fromskype=yes")) {
-        fromcell = 0;
-        fromskype = 1;
-
-      }
-
-      if (start && !strcasestr(start, "hidefromdir=yes")) {
-        memset(name, 0, sizeof(name));
-        memset(phonebook_direct_calling_ext, 0, sizeof(phonebook_direct_calling_ext));
-        memset(write_entry_command, 0, sizeof(write_entry_command));
-        memset(entry_number, 0, sizeof(entry_number));
-        memset(entry_text, 0, sizeof(entry_text));
-        memset(final_entry_text, 0, sizeof(final_entry_text));
-
-        DEBUGA_AT("v->name=%s\n", CELLIAX_P_LOG, v->name);
-        DEBUGA_AT("v->value=%s\n", CELLIAX_P_LOG, v->value);
-
-        stringp = start;
-        strsep(&stringp, ",");
-        pos = strsep(&stringp, ",");
-        if (pos) {
-          ast_copy_string(name, pos, sizeof(name));
-          if (strchr(pos, ' ')) {
-            space = strchr(pos, ' ');
-            *space = '\0';
-          }
-          if (pos) {
-            conv = celliax_dir_convert(pos);
-            DEBUGA_AT("<pos=>%s<conv=>%s<\n", CELLIAX_P_LOG, pos, conv);
-
-            options = strdup(v->value);
-            strsep(&options, ",");
-            strsep(&options, ",");
-            strsep(&options, ",");
-            strsep(&options, ",");
-            DEBUGA_AT("options=%s\n", CELLIAX_P_LOG, options);
-
-            while ((s = strsep(&options, "|"))) {
-              value = s;
-              if ((var = strsep(&value, "=")) && value) {
-                DEBUGA_AT("var=%s value=%s\n", CELLIAX_P_LOG, var, value);
-                if (!strcmp(var, "phonebook_direct_calling_ext"))
-                  strncpy(phonebook_direct_calling_ext, value, 6);
-              }
-            }
-
-            //FIXME choose a logic for fields maximum lenght
-            res =
-              snprintf(entry_number, sizeof(entry_number) - 1, "%s%s%d%s%s", argv[2], "p",
-                       p->celliax_dir_prefix, "p", phonebook_direct_calling_ext);
-            if (res == (sizeof(entry_number) - 1)
-                || res > (sizeof(entry_number) - 1)) {
-              ERRORA("entry_number truncated, was: '%s%s%d%s%s', now is: '%s'\n",
-                     CELLIAX_P_LOG, argv[2], "p", p->celliax_dir_prefix, "p",
-                     phonebook_direct_calling_ext, entry_number);
-              //FIXME: abort ???
-
-            }
-
-            res = snprintf(final_entry_text, sizeof(final_entry_text) - 1, "%s", name); //FIXME result not checked
-
-            int i, a;
-
-            a = 0;
-            for (i = 0; i < p->csv_complete_name_pos - 1; i++) {
-              if (p->csv_separator_is_semicolon)
-                write_entry_command[a] = ';';
-              else
-                write_entry_command[a] = ',';
-              a++;
-            }
-            //NOTICA("i=%d a=%d\n", CELLIAX_P_LOG, i, a);
-
-            write_entry_command[a] = '"';
-            a++;
-            //NOTICA("i=%d a=%d\n", CELLIAX_P_LOG, i, a);
-            for (i = 0; i < strlen(final_entry_text); i++) {
-              write_entry_command[a] = final_entry_text[i];
-              a++;
-            }
-            //NOTICA("i=%d a=%d\n", CELLIAX_P_LOG, i, a);
-            write_entry_command[a] = '"';
-            a++;
-            //NOTICA("i=%d a=%d\n", CELLIAX_P_LOG, i, a);
-            for (i = 0; i < (p->csv_business_phone_pos - p->csv_complete_name_pos); i++) {
-              if (p->csv_separator_is_semicolon)
-                write_entry_command[a] = ';';
-              else
-                write_entry_command[a] = ',';
-              a++;
-            }
-
-            //NOTICA("i=%d a=%d\n", CELLIAX_P_LOG, i, a);
-
-            write_entry_command[a] = '"';
-            a++;
-            //NOTICA("i=%d a=%d\n", CELLIAX_P_LOG, i, a);
-            for (i = 0; i < strlen(entry_number); i++) {
-              write_entry_command[a] = entry_number[i];
-              a++;
-            }
-            //NOTICA("i=%d a=%d\n", CELLIAX_P_LOG, i, a);
-            write_entry_command[a] = '"';
-            a++;
-            //NOTICA("i=%d a=%d\n", CELLIAX_P_LOG, i, a);
-
-            if (option_debug)
-              NOTICA("%s\n", CELLIAX_P_LOG, write_entry_command);
-          }
-        }
-        if (conv)
-          free(conv);
-        if (start)
-          free(start);
-        if (options)
-          free(options);
-      }
-      v = v->next;
-    }
-
-  }
-  if (tovcf) {
-//TODO implementation here
-  }
-#endif /*  CELLIAX_LIBCSV */
-  ast_config_destroy(cfg);
-  return 0;
-}
-
-#ifdef CELLIAX_LIBCSV
-
-void celliax_cb1(char *s, size_t len, void *data)
-{
-  struct celliax_pvt *p = data;
-  char field_content[256];
-
-  p->csv_fields++;
-  memset(field_content, 0, sizeof(field_content));
-  strncpy(field_content, s,
-          sizeof(field_content) > (len + 1) ? len : (sizeof(field_content) - 1));
-  if (p->csv_fields == p->csv_complete_name_pos) {
-    strncpy(p->csv_complete_name, field_content, sizeof(p->csv_complete_name) - 1);
-  }
-  if (p->csv_fields == p->csv_email_pos) {
-    strncpy(p->csv_email, field_content, sizeof(p->csv_email) - 1);
-  }
-  if (p->csv_fields == p->csv_home_phone_pos) {
-    strncpy(p->csv_home_phone, field_content, sizeof(p->csv_home_phone) - 1);
-  }
-  if (p->csv_fields == p->csv_mobile_phone_pos) {
-    strncpy(p->csv_mobile_phone, field_content, sizeof(p->csv_mobile_phone) - 1);
-  }
-  if (p->csv_fields == p->csv_business_phone_pos) {
-    strncpy(p->csv_business_phone, field_content, sizeof(p->csv_business_phone) - 1);
-  }
-}
-
-void celliax_cb2(char c, void *data)
-{
-  struct celliax_pvt *p = data;
-
-  p->csv_rows++;
-  p->csv_fields = 0;
-
-  if (p->csv_first_row_is_title && p->csv_rows == 1) {
-    //do nothing
-  } else {
-    if (strlen(p->csv_complete_name)) {
-      if (option_debug)
-        NOTICA
-          ("ROW %d ENDED, complete_name=%s, email=%s, home_phone=%s, mobile_phone=%s, business_phone=%s\n",
-           CELLIAX_P_LOG, p->csv_rows,
-           strlen(p->csv_complete_name) ? p->csv_complete_name : "N/A",
-           strlen(p->csv_email) ? p->csv_email : "N/A",
-           strlen(p->csv_home_phone) ? p->csv_home_phone : "N/A",
-           strlen(p->csv_mobile_phone) ? p->csv_mobile_phone : "N/A",
-           strlen(p->csv_business_phone) ? p->csv_business_phone : "N/A");
-    }
-
-    /* write entries in phonebook file */
-    if (p->phonebook_writing_fp) {
-      celliax_dir_entry_extension++;
-
-      if (strlen(p->csv_complete_name)) {
-        /* let's start with home_phone */
-        if (strlen(p->csv_home_phone)) {
-          fprintf(p->phonebook_writing_fp,
-                  "%s  => ,%s %sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcsv=%s|phonebook_entry_owner=%s\n",
-                  p->csv_home_phone, p->csv_complete_name, "HOME", "no",
-                  p->celliax_dir_entry_extension_prefix, "2", celliax_dir_entry_extension,
-                  "yes", "not_specified");
-          fprintf(p->phonebook_writing_fp,
-                  "%s  => ,%s %sDO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcsv=%s|phonebook_entry_owner=%s\n",
-                  p->csv_home_phone, p->csv_complete_name, "HOME", "no",
-                  p->celliax_dir_entry_extension_prefix, "3", celliax_dir_entry_extension,
-                  "yes", "not_specified");
-        }
-
-        /* now business_phone */
-        if (strlen(p->csv_business_phone)) {
-          fprintf(p->phonebook_writing_fp,
-                  "%s  => ,%s %sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcsv=%s|phonebook_entry_owner=%s\n",
-                  p->csv_business_phone, p->csv_complete_name, "BIZ", "no",
-                  p->celliax_dir_entry_extension_prefix, "2", celliax_dir_entry_extension,
-                  "yes", "not_specified");
-          fprintf(p->phonebook_writing_fp,
-                  "%s  => ,%s %sDO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcsv=%s|phonebook_entry_owner=%s\n",
-                  p->csv_business_phone, p->csv_complete_name, "BIZ", "no",
-                  p->celliax_dir_entry_extension_prefix, "3", celliax_dir_entry_extension,
-                  "yes", "not_specified");
-        }
-
-        /* let's end with mobile_phone */
-        if (strlen(p->csv_mobile_phone)) {
-          fprintf(p->phonebook_writing_fp,
-                  "%s  => ,%s %sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcsv=%s|phonebook_entry_owner=%s\n",
-                  p->csv_mobile_phone, p->csv_complete_name, "CELL", "no",
-                  p->celliax_dir_entry_extension_prefix, "2", celliax_dir_entry_extension,
-                  "yes", "not_specified");
-          fprintf(p->phonebook_writing_fp,
-                  "%s  => ,%s %sDO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcsv=%s|phonebook_entry_owner=%s\n",
-                  p->csv_mobile_phone, p->csv_complete_name, "CELL", "no",
-                  p->celliax_dir_entry_extension_prefix, "3", celliax_dir_entry_extension,
-                  "yes", "not_specified");
-        }
-      }
-
-    }
-
-  }
-}
-
-#endif /* CELLIAX_LIBCSV */
-
-int celliax_console_celliax_dir_import(int fd, int argc, char *argv[])
-{
-  int res;
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-  char list_command[64];
-  char fn[256];
-  char date[256] = "";
-  time_t t;
-  char *configfile = CELLIAX_DIR_CONFIG;
-  int add_to_celliax_dir_conf = 1;
-  //int fromskype = 0;
-  int fromcell = 0;
-#ifdef CELLIAX_LIBCSV
-  int fromcsv = 0;
-  int fromvcf = 0;
-#endif /* CELLIAX_LIBCSV */
-
-  if (argc < 3 || argc > 4)
-    return RESULT_SHOWUSAGE;
-  if (!p) {
-    ast_cli(fd, "No \"current\" console ???, please enter 'help celliax_console'\n");
-    return RESULT_SUCCESS;
-  }
-
-  if (!strcasecmp(argv[1], "add"))
-    add_to_celliax_dir_conf = 1;
-  else if (!strcasecmp(argv[1], "replace"))
-    add_to_celliax_dir_conf = 0;
-  else {
-    ast_cli(fd, "\n\nYou have neither specified 'add' nor 'replace'\n\n");
-    return RESULT_SHOWUSAGE;
-  }
-
-  //if (!strcasecmp(argv[2], "fromskype"))
-  //fromskype = 1;
-  //else 
-
-  if (!strcasecmp(argv[2], "fromcell"))
-    fromcell = 1;
-#ifdef CELLIAX_LIBCSV
-  else if (!strcasecmp(argv[2], "fromcsv"))
-    fromcsv = 1;
-  else if (!strcasecmp(argv[2], "fromvcf"))
-    fromvcf = 1;
-#endif /* CELLIAX_LIBCSV */
-  else {
-    ast_cli(fd, "\n\nYou have neither specified 'fromcell' neither 'fromcsv'\n\n");
-    return RESULT_SHOWUSAGE;
-  }
-
-#ifdef CELLIAX_LIBCSV
-  if (fromcsv || fromvcf)
-    if (argc != 4) {
-      ast_cli(fd,
-              "\n\nYou have to specify a filename with 'fromcsv' or with 'fromvcf'\n\n");
-      return RESULT_SHOWUSAGE;
-    }
-#endif /* CELLIAX_LIBCSV */
-  if (fromcell)
-    if (p->controldevprotocol != PROTOCOL_AT) {
-      ast_cli(fd,
-              "Importing from cellphone is currently supported only on \"AT\" cellphones :( !\n");
-      //fclose(p->phonebook_writing_fp);
-      //celliax_dir_create_extensions();
-      return RESULT_SUCCESS;
-    }
-
-  if (fromcell)
-    if (argc != 3) {
-      ast_cli(fd, "\n\nYou don't have to specify a filename with 'fromcell'\n\n");
-      return RESULT_SHOWUSAGE;
-    }
-#ifdef CELLIAX_LIBCSV
-  if (fromvcf) {
-    if (option_debug)
-      NOTICA("filename is: %s\n", CELLIAX_P_LOG, argv[3]);
-    ast_cli(fd, "\n\nnot yet implemented :P \n");
-    return RESULT_SUCCESS;
-  }
-#endif /* CELLIAX_LIBCSV */
-
-  /*******************************************************************************************/
-
-  if (configfile[0] == '/') {
-    ast_copy_string(fn, configfile, sizeof(fn));
-  } else {
-    snprintf(fn, sizeof(fn), "%s/%s", ast_config_AST_CONFIG_DIR, configfile);
-  }
-  if (option_debug)
-    NOTICA("Opening '%s'\n", CELLIAX_P_LOG, fn);
-  time(&t);
-  ast_copy_string(date, ctime(&t), sizeof(date));
-
-  if (add_to_celliax_dir_conf)
-    p->phonebook_writing_fp = fopen(fn, "a+");
-  else
-    p->phonebook_writing_fp = fopen(fn, "w+");
-
-  if (p->phonebook_writing_fp) {
-    if (add_to_celliax_dir_conf) {
-      if (option_debug)
-        NOTICA("Opened '%s' for appending \n", CELLIAX_P_LOG, fn);
-      fprintf(p->phonebook_writing_fp, ";!\n");
-      fprintf(p->phonebook_writing_fp, ";! Update Date: %s", date);
-      fprintf(p->phonebook_writing_fp, ";! Updated by: %s, %d\n", __FILE__, __LINE__);
-      fprintf(p->phonebook_writing_fp, ";!\n");
-    } else {
-      if (option_debug)
-        NOTICA("Opened '%s' for writing \n", CELLIAX_P_LOG, fn);
-      fprintf(p->phonebook_writing_fp, ";!\n");
-      fprintf(p->phonebook_writing_fp, ";! Automatically generated configuration file\n");
-      fprintf(p->phonebook_writing_fp, ";! Filename: %s (%s)\n", configfile, fn);
-      fprintf(p->phonebook_writing_fp, ";! Creation Date: %s", date);
-      fprintf(p->phonebook_writing_fp, ";! Generated by: %s, %d\n", __FILE__, __LINE__);
-      fprintf(p->phonebook_writing_fp, ";!\n");
-      fprintf(p->phonebook_writing_fp, "[general]\n\n");
-      fprintf(p->phonebook_writing_fp, "[default]\n");
-    }
-
-#ifdef CELLIAX_LIBCSV
-    //FIXME: if add_to_celliax_dir_conf parse the "old" config file, so to have the correct next entry id-exten
-    if (fromcsv) {
-      if (option_debug)
-        NOTICA("filename is: %s\n", CELLIAX_P_LOG, argv[3]);
-
-/************************/
-      FILE *fp;
-      struct csv_parser *csvp;
-      char buf[1024];
-      size_t bytes_read;
-      unsigned char options = 0;
-
-      p->csv_rows = 0;
-      p->csv_fields = 0;
-
-      if (p->csv_separator_is_semicolon) {
-        if (csv_init(&csvp, options | CSV_USE_SEMICOLON_SEPARATOR) != 0) {
-          ERRORA("Failed to initialize csv parser\n", CELLIAX_P_LOG);
-          return RESULT_SUCCESS;
-        }
-      } else {
-        if (csv_init(&csvp, options) != 0) {
-          ERRORA("Failed to initialize csv parser\n", CELLIAX_P_LOG);
-          return RESULT_SUCCESS;
-        }
-
-      }
-
-      fp = fopen(argv[3], "rb");
-      if (!fp) {
-        ERRORA("Failed to open %s: %s\n", CELLIAX_P_LOG, argv[3], strerror(errno));
-        return RESULT_SUCCESS;
-      }
-      while ((bytes_read = fread(buf, 1, 1024, fp)) > 0) {
-        if (csv_parse(csvp, buf, bytes_read, celliax_cb1, celliax_cb2, p) != bytes_read) {
-          ERRORA("Error while parsing file: %s\n", CELLIAX_P_LOG,
-                 csv_strerror(csv_error(csvp)));
-        }
-      }
-
-      csv_fini(csvp, celliax_cb1, celliax_cb2, p);
-
-      if (ferror(fp)) {
-        ERRORA("Error while reading file %s\n", CELLIAX_P_LOG, argv[3]);
-        fclose(fp);
-        return RESULT_SUCCESS;
-      }
-
-      fclose(fp);
-      if (option_debug)
-        NOTICA("%s: %d fields, %d rows\n", CELLIAX_P_LOG, argv[3], p->csv_fields,
-               p->csv_rows);
-
-      csv_free(csvp);
-
-    /**************************/
-    }
-#endif /* CELLIAX_LIBCSV */
-
-  /*******************************************************************************************/
-    //if (fromskype) {
-    //ast_cli(fd,
-    //"Skype not supported in celliax_dir. Load chan_skypiax and use skypiax_dir!\n");
-    //}
-
-  /*******************************************************************************************/
-    if (fromcell) {
-      /* which phonebook to use, use the SIM  */
-      res = celliax_serial_write_AT_ack(p, "AT+CPBS=SM");
-      if (res) {
-        WARNINGA("AT+CPBS=SM failed, continue\n", CELLIAX_P_LOG);
-      }
-      /* which phonebook to use, trying to use combined phone+SIM  */
-      res = celliax_serial_write_AT_ack(p, "AT+CPBS=MT");
-      if (res) {
-        WARNINGA("AT+CPBS=MT failed, continue\n", CELLIAX_P_LOG);
-      }
-      /* How many entries in phonebook  */
-      p->phonebook_querying = 1;
-      res = celliax_serial_write_AT_ack(p, "AT+CPBR=?");
-      if (res) {
-        WARNINGA("AT+CPBR=? failed, continue\n", CELLIAX_P_LOG);
-      }
-      p->phonebook_querying = 0;
-      /* list entries in phonebook, give the SIM the time to answer  */
-      WARNINGA
-        ("About to querying the cellphone phonebook, if the SIM do not answer may stuck here for 20 seconds... Don't worry.\n",
-         CELLIAX_P_LOG);
-      sprintf(list_command, "AT+CPBR=%d,%d", p->phonebook_first_entry,
-              p->phonebook_last_entry);
-      p->phonebook_listing = 1;
-      res = celliax_serial_write_AT_expect_longtime(p, list_command, "OK");
-      if (res) {
-        WARNINGA("AT+CPBR=%d,%d failed, continue\n", CELLIAX_P_LOG,
-                 p->phonebook_first_entry, p->phonebook_last_entry);
-      }
-      p->phonebook_listing = 0;
-    }
-  /*******************************************************************************************/
-#ifdef CELLIAX_LIBCSV
-    if (fromvcf) {
-      //TODO implementation here
-    }
-#endif /* CELLIAX_LIBCSV */
-
-  } else {
-    ast_cli(fd, "\n\nfailed to open the directoriax.conf configuration file: %s\n", fn);
-    ERRORA("failed to open the directoriax.conf configuration file: %s\n", CELLIAX_P_LOG,
-           fn);
-    return RESULT_FAILURE;
-  }
-
-  fclose(p->phonebook_writing_fp);
-  //celliax_dir_create_extensions();
-
-  return RESULT_SUCCESS;
-}
-
-#endif /* CELLIAX_DIR */
-
-#ifdef CELLIAX_FBUS2
-
-int celliax_serial_getstatus_FBUS2(struct celliax_pvt *p)
-{
-  unsigned char MsgBuffer[7];
-  int res;
-  int how_many_reads = 0;
-
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-
-  MsgBuffer[0] = FBUS2_COMMAND_BYTE_1;
-  MsgBuffer[1] = FBUS2_COMMAND_BYTE_2;
-  MsgBuffer[2] = 0x00;
-  MsgBuffer[3] = 0x03;
-  MsgBuffer[4] = 0x00;
-  MsgBuffer[5] = FBUS2_IS_LAST_FRAME;
-  MsgBuffer[6] = celliax_serial_get_seqnum_FBUS2(p);
-
-  if (option_debug > 1)
-    DEBUGA_FBUS2("asking model, outseqnum %.2X \n", CELLIAX_P_LOG, MsgBuffer[6]);
-  celliax_serial_write_FBUS2(p, MsgBuffer, 7, FBUS2_TYPE_MODEL_ASK);
-  usleep(1000);
-  res = celliax_serial_read_FBUS2(p);   //we don't have no monitor neither do_controldev_thread
-  if (res == -1) {
-    ERRORA("failed celliax_serial_read_FBUS2\n", CELLIAX_P_LOG);
-    UNLOCKA(&p->controldev_lock);
-    return -1;
-  }
-  while (res != MsgBuffer[6] && res != FBUS2_TYPE_MODEL_ANSWER) {
-    usleep(1000);
-    res = celliax_serial_read_FBUS2(p);
-    how_many_reads++;
-    if (res == -1) {
-      ERRORA("failed celliax_serial_read_FBUS2\n", CELLIAX_P_LOG);
-      UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-    if (how_many_reads > 10) {
-      ERRORA("no expected results in %d celliax_serial_read_FBUS2\n", CELLIAX_P_LOG,
-             how_many_reads);
-      UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-  }
-
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-  return 0;
-}
-
-int celliax_serial_sync_FBUS2(struct celliax_pvt *p)
-{
-  unsigned char initc = 0x55;   /* FBUS2 initialization char */
-  int c, rt;
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-  /*  init the link (sync receive uart) */
-  for (c = 0; c < 55; c++) {    /* 55 times */
-    usleep(10000);
-    rt = write(p->controldevfd, &initc, 1);
-    if (rt != 1) {
-      ERRORA("serial error: %s", CELLIAX_P_LOG, strerror(errno));
-      UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-  }
-  time(&p->celliax_serial_synced_timestamp);
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-  return 0;
-}
-
-int celliax_serial_answer_FBUS2(struct celliax_pvt *p)
-{
-  unsigned char MsgBuffer[6];
-
-  celliax_serial_security_command_FBUS2(p);
-
-  MsgBuffer[0] = FBUS2_COMMAND_BYTE_1;
-  MsgBuffer[1] = FBUS2_COMMAND_BYTE_2;
-  MsgBuffer[2] = FBUS2_SECURIY_CALL_COMMANDS;
-  MsgBuffer[3] = FBUS2_SECURIY_CALL_COMMAND_ANSWER;
-  MsgBuffer[4] = FBUS2_IS_LAST_FRAME;
-  MsgBuffer[5] = celliax_serial_get_seqnum_FBUS2(p);
-  if (option_debug > 1)
-    DEBUGA_FBUS2("celliax_serial_answer_FBUS2, outseqnum %.2X \n", CELLIAX_P_LOG,
-                 MsgBuffer[5]);
-  celliax_serial_write_FBUS2(p, MsgBuffer, 6, FBUS2_TYPE_SECURITY);
-  DEBUGA_FBUS2("FBUS2: sent commands to answer the call\n", CELLIAX_P_LOG);
-  p->interface_state = AST_STATE_UP;    //FIXME
-
-  return 0;
-}
-
-int celliax_serial_call_FBUS2(struct celliax_pvt *p, char *dstr)
-{
-  unsigned char MsgBufferNum[255];
-  int i;
-
-  celliax_serial_security_command_FBUS2(p);
-
-  MsgBufferNum[0] = FBUS2_COMMAND_BYTE_1;
-  MsgBufferNum[1] = FBUS2_COMMAND_BYTE_2;
-  MsgBufferNum[2] = FBUS2_SECURIY_CALL_COMMANDS;
-  MsgBufferNum[3] = FBUS2_SECURIY_CALL_COMMAND_CALL;
-  for (i = 0; i < strlen(dstr); i++) {
-    MsgBufferNum[4 + i] = dstr[i];
-  }
-  MsgBufferNum[4 + strlen(dstr)] = 0x00;    /* required by FBUS2 prot */
-  MsgBufferNum[4 + strlen(dstr) + 1] = FBUS2_IS_LAST_FRAME;
-  MsgBufferNum[4 + strlen(dstr) + 2] = celliax_serial_get_seqnum_FBUS2(p);
-  if (option_debug > 1)
-    DEBUGA_FBUS2("celliax_serial_call_FBUS2, outseqnum %.2X \n", CELLIAX_P_LOG,
-                 MsgBufferNum[4 + strlen(dstr) + 2]);
-  celliax_serial_write_FBUS2(p, MsgBufferNum, 5 + strlen(dstr) + 2, FBUS2_TYPE_SECURITY);
-
-  p->phone_callflow = CALLFLOW_CALL_DIALING;
-  p->interface_state = AST_STATE_DIALING;
-  if (option_debug)
-    DEBUGA_FBUS2("FBUS2: sent commands to call\n", CELLIAX_P_LOG);
-  return 0;
-}
-
-int celliax_serial_hangup_FBUS2(struct celliax_pvt *p)
-{
-  unsigned char MsgBuffer[6];
-
-  if (p->interface_state != AST_STATE_DOWN) {
-    celliax_serial_security_command_FBUS2(p);
-
-    MsgBuffer[0] = FBUS2_COMMAND_BYTE_1;
-    MsgBuffer[1] = FBUS2_COMMAND_BYTE_2;
-    MsgBuffer[2] = FBUS2_SECURIY_CALL_COMMANDS;
-    MsgBuffer[3] = FBUS2_SECURIY_CALL_COMMAND_RELEASE;
-    MsgBuffer[4] = FBUS2_IS_LAST_FRAME;
-    MsgBuffer[5] = celliax_serial_get_seqnum_FBUS2(p);
-
-    if (option_debug > 1)
-      DEBUGA_FBUS2("celliax_serial_hangup_FBUS2, outseqnum %.2X \n", CELLIAX_P_LOG,
-                   MsgBuffer[5]);
-    celliax_serial_write_FBUS2(p, MsgBuffer, 6, FBUS2_TYPE_SECURITY);
-
-    DEBUGA_FBUS2("FBUS2: sent commands to hangup the call\n", CELLIAX_P_LOG);
-
-  }
-  p->interface_state = AST_STATE_DOWN;  //FIXME
-  p->phone_callflow = CALLFLOW_CALL_IDLE;   //FIXME
-  return 0;
-}
-
-int celliax_serial_config_FBUS2(struct celliax_pvt *p)
-{
-  unsigned char MsgBuffer[6];
-  int res;
-  int how_many_reads = 0;
-
-  MsgBuffer[0] = FBUS2_COMMAND_BYTE_1;
-  MsgBuffer[1] = FBUS2_COMMAND_BYTE_2;
-  MsgBuffer[2] = FBUS2_SECURIY_EXTENDED_COMMANDS;
-  MsgBuffer[3] = FBUS2_SECURIY_EXTENDED_COMMAND_ON;
-  MsgBuffer[4] = FBUS2_IS_LAST_FRAME;
-  MsgBuffer[5] = celliax_serial_get_seqnum_FBUS2(p);
-
-  if (option_debug > 1)
-    DEBUGA_FBUS2("activating security commands for getting IMEI, outseqnum %.2X \n",
-                 CELLIAX_P_LOG, MsgBuffer[5]);
-  celliax_serial_write_FBUS2(p, MsgBuffer, 6, FBUS2_TYPE_SECURITY);
-  res = celliax_serial_read_FBUS2(p);   //we don't have no monitor neither do_controldev_thread
-  if (res == -1) {
-    ERRORA("failed celliax_serial_read_FBUS2\n", CELLIAX_P_LOG);
-    return -1;
-  }
-  while (res != MsgBuffer[5] && res != FBUS2_SECURIY_EXTENDED_COMMAND_ON) {
-    usleep(1000);
-    res = celliax_serial_read_FBUS2(p);
-    how_many_reads++;
-    if (res == -1) {
-      ERRORA("failed celliax_serial_read_FBUS2\n", CELLIAX_P_LOG);
-      return -1;
-    }
-    if (how_many_reads > 10) {
-      ERRORA("no expected results in %d celliax_serial_read_FBUS2\n", CELLIAX_P_LOG,
-             how_many_reads);
-      return -1;
-    }
-  }
-
-  MsgBuffer[0] = FBUS2_COMMAND_BYTE_1;
-  MsgBuffer[1] = FBUS2_COMMAND_BYTE_2;
-  MsgBuffer[2] = FBUS2_SECURIY_IMEI_COMMANDS;
-  MsgBuffer[3] = FBUS2_SECURIY_IMEI_COMMAND_GET;
-  MsgBuffer[4] = FBUS2_IS_LAST_FRAME;
-  MsgBuffer[5] = celliax_serial_get_seqnum_FBUS2(p);
-  if (option_debug > 1)
-    DEBUGA_FBUS2("celliax_serial_get_IMEI_init_FBUS2, outseqnum %.2X \n", CELLIAX_P_LOG,
-                 MsgBuffer[5]);
-  celliax_serial_write_FBUS2(p, MsgBuffer, 6, FBUS2_TYPE_SECURITY);
-  res = celliax_serial_read_FBUS2(p);   //we don't have no monitor neither do_controldev_thread
-  if (res == -1) {
-    ERRORA("failed celliax_serial_read_FBUS2\n", CELLIAX_P_LOG);
-    return -1;
-  }
-  how_many_reads = 0;
-  while (res != MsgBuffer[5] && res != CALLFLOW_GOT_IMEI) {
-    usleep(1000);
-    res = celliax_serial_read_FBUS2(p);
-    how_many_reads++;
-    if (res == -1) {
-      ERRORA("failed celliax_serial_read_FBUS2\n", CELLIAX_P_LOG);
-      return -1;
-    }
-    if (how_many_reads > 10) {
-      ERRORA("no expected results in %d celliax_serial_read_FBUS2\n", CELLIAX_P_LOG,
-             how_many_reads);
-      //FIXME return -1;
-      return 0;
-    }
-  }
-
-  if (option_debug > 1)
-    DEBUGA_FBUS2("xxxxx GOT IMEI xxxxx res=%d %.2X \n", CELLIAX_P_LOG, res, res);
-
-  return 0;
-}
-
-int celliax_serial_get_seqnum_FBUS2(struct celliax_pvt *p)
-{
-  if (p->seqnumfbus > FBUS2_SEQNUM_MAX || p->seqnumfbus < FBUS2_SEQNUM_MIN) {
-    ERRORA("p->seqnumfbus: %2.X\n", CELLIAX_P_LOG, p->seqnumfbus);
-    p->seqnumfbus = FBUS2_SEQNUM_MIN;
-  }
-
-  if (p->seqnumfbus == FBUS2_SEQNUM_MAX) {
-    p->seqnumfbus = FBUS2_SEQNUM_MIN;
-  } else {
-    p->seqnumfbus++;
-  }
-  if (option_debug > 10)
-    DEBUGA_FBUS2("sqnum: %2.X\n", CELLIAX_P_LOG, p->seqnumfbus);
-  return p->seqnumfbus;
-}
-
-int celliax_serial_security_command_FBUS2(struct celliax_pvt *p)
-{
-  unsigned char MsgBuffer[6];
-
-  MsgBuffer[0] = FBUS2_COMMAND_BYTE_1;
-  MsgBuffer[1] = FBUS2_COMMAND_BYTE_2;
-  MsgBuffer[2] = FBUS2_SECURIY_EXTENDED_COMMANDS;
-  MsgBuffer[3] = FBUS2_SECURIY_EXTENDED_COMMAND_ON;
-  MsgBuffer[4] = FBUS2_IS_LAST_FRAME;
-  MsgBuffer[5] = celliax_serial_get_seqnum_FBUS2(p);
-
-  if (option_debug > 1)
-    DEBUGA_FBUS2("activating security commands, outseqnum %.2X \n", CELLIAX_P_LOG,
-                 MsgBuffer[5]);
-  celliax_serial_write_FBUS2(p, MsgBuffer, 6, FBUS2_TYPE_SECURITY);
-  return 0;
-}
-
-/*!
- * \brief Write on the serial port for all the FBUS2 (old Nokia) functions
- * \param p celliax_pvt
- * \param len lenght of buffer2
- * \param buffer2 chars to be written
- *
- * Write on the serial port for all the FBUS2 (old Nokia) functions
- *
- * \return the number of chars written on the serial, 
- * that can be different from len (or negative) in case of errors.
- */
-int celliax_serial_send_FBUS2(struct celliax_pvt *p, int len, unsigned char *mesg_ptr)
-{
-  int ret;
-  size_t actual = 0;
-  unsigned char *mesg_ptr2 = mesg_ptr;
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  LOKKA(&p->controldev_lock);
-  do {
-    ret = write(p->controldevfd, mesg_ptr, len - actual);
-    if (ret < 0 && errno == EAGAIN)
-      continue;
-    if (ret < 0) {
-      if (actual != len)
-        ERRORA("celliax_serial_write error: %s", CELLIAX_P_LOG, strerror(errno));
-      UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-    actual += ret;
-    mesg_ptr += ret;
-    usleep(10000);
-  } while (actual < len);
-
-  UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-  if (option_debug > 10) {
-    int i;
-    char debug_buf[1024];
-    char *debug_buf_pos;
-
-    memset(debug_buf, 0, 1024);
-    debug_buf_pos = debug_buf;
-
-    for (i = 0; i < len; i++) {
-      debug_buf_pos += sprintf(debug_buf_pos, "[%.2X] ", mesg_ptr2[i]);
-      if (debug_buf_pos > ((char *) &debug_buf + 1000))
-        break;
-    }
-    DEBUGA_FBUS2("%s was sent down the wire\n", CELLIAX_P_LOG, debug_buf);
-  }
-
-  return 0;
-}
-
-/*!
- * \brief Flags as acknowledged an FBUS2 message previously sent
- * \param p celliax_pvt
- * \param seqnum identifier of the message to be acknowledged
- *
- * Called upon receiving an FBUS2 acknoledgement message, browse the fbus2_outgoing_list 
- * looking for the seqnum sent FBUS2 message, and flags it as acknowledged.
- * (if an outgoing FBUS2 message is not aknowledged by the cellphone in a while,
- * it will be retransmitted)
- *
- * \return 0 on error, 1 otherwise
- */
-int celliax_serial_list_acknowledge_FBUS2(struct celliax_pvt *p, int seqnum)
-{
-  struct fbus2_msg *ptr;
-
-  ptr = p->fbus2_outgoing_list;
-  if (ptr == NULL) {
-    ERRORA("fbus2_outgoing_list is NULL ?\n", CELLIAX_P_LOG);
-    return -1;
-  }
-  PUSHA_UNLOCKA(&p->fbus2_outgoing_list_lock);
-  LOKKA(&p->fbus2_outgoing_list_lock);
-  while (ptr->next != NULL)
-    ptr = ptr->next;
-  while (ptr->acknowledged == 0) {
-    if (ptr->seqnum == seqnum) {
-      ptr->acknowledged = 1;
-      if (option_debug > 1)
-        DEBUGA_FBUS2("Acknowledgment to %.2X\n", CELLIAX_P_LOG, seqnum);
-
-      DEBUGA_FBUS2("PREFREE OUTGOING list:\n", CELLIAX_P_LOG);
-      celliax_serial_list_print_FBUS2(p, p->fbus2_outgoing_list);
-      if (ptr->previous) {
-        if (ptr->next) {
-          ptr->previous->next = ptr->next;
-        } else {
-          ptr->previous->next = NULL;
-        }
-      }
-      if (ptr->next) {
-        if (ptr->previous) {
-          ptr->next->previous = ptr->previous;
-        } else {
-          ptr->next->previous = NULL;
-        }
-      }
-
-      if ((NULL == ptr->next) && (NULL == ptr->previous)) { /* bug catched by Wojciech Andralojc */
-        if (option_debug > 1)
-          DEBUGA_FBUS2("FREEING LAST\n", CELLIAX_P_LOG);
-        p->fbus2_outgoing_list = NULL;
-        p->fbus2_outgoing_list = celliax_serial_list_init_FBUS2(p);
-      }
-
-      free(ptr);
-      DEBUGA_FBUS2("POSTFREE OUTGOING list:\n", CELLIAX_P_LOG);
-      celliax_serial_list_print_FBUS2(p, p->fbus2_outgoing_list);
-
-      break;
-    }
-    if (ptr->previous != NULL) {
-      ptr = ptr->previous;
-    } else {
-      ERRORA
-        ("The phone sent us an acknowledgement referring to a msg with a seqnum that is not in our sent list: %.2X\n",
-         CELLIAX_P_LOG, seqnum);
-      break;
-    }
-  }
-  UNLOCKA(&p->fbus2_outgoing_list_lock);
-  POPPA_UNLOCKA(&p->fbus2_outgoing_list_lock);
-  return 0;
-}
-
-/*!
- * \brief Sends an FBUS2 message or resends it if it was not acknowledged
- * \param p celliax_pvt
- *
- * Called by celliax_serial_read_FBUS2, browse the fbus2_outgoing_list looking for FBUS2 messages to be sent, 
- * or for FBUS2 messages previously sent but not yet acknoledged.
- * (if an outgoing FBUS2 message is not aknowledged by the cellphone in a while,
- * it will be retransmitted)
- *
- * \return 0 on error, 1 otherwise
- */
-int celliax_serial_send_if_time_FBUS2(struct celliax_pvt *p)
-{
-  struct fbus2_msg *ptr;
-  struct timeval tv;
-  struct timezone tz;
-
-  gettimeofday(&tv, &tz);
-  ptr = p->fbus2_outgoing_list;
-  if (ptr == NULL) {
-    ERRORA("fbus2_outgoing_list is NULL ?\n", CELLIAX_P_LOG);
-    return -1;
-  }
-  while (ptr->next != NULL) {
-    WARNINGA("fbus2_outgoing_list->next is not null ?\n", CELLIAX_P_LOG);
-    ptr = ptr->next;            //FIXME what to do?
-  }
-  while (ptr->sent == 0 && ptr->acknowledged == 0) {
-    if (ptr->previous != NULL) {
-      ptr = ptr->previous;
-    } else
-      break;
-  }
-  while (ptr->sent == 1 && ptr->acknowledged == 0) {
-    if (ptr->previous != NULL) {
-      ptr = ptr->previous;
-    } else
-      break;
-  }
-  if (ptr->sent == 1 && ptr->acknowledged == 1) {
-    if (ptr->next != NULL) {
-      ptr = ptr->next;
-    }
-  }
-  if (ptr->sent == 1 && ptr->acknowledged == 0 && ptr->msg > 0) {
-    if ((tv.tv_sec * 1000 + tv.tv_usec / 1000) >
-        ((ptr->tv_sec * 1000 + ptr->tv_usec / 1000) + 1000)) {
-
-      PUSHA_UNLOCKA(&p->fbus2_outgoing_list_lock);
-      LOKKA(&p->fbus2_outgoing_list_lock);
-
-      if (ptr->sent == 1 && ptr->acknowledged == 0 && ptr->msg > 0) {   //retest, maybe has been changed?
-        if ((tv.tv_sec * 1000 + tv.tv_usec / 1000) > ((ptr->tv_sec * 1000 + ptr->tv_usec / 1000) + 1000)) { //retest, maybe has been changed?
-
-          if (option_debug > 1)
-            DEBUGA_FBUS2("RESEND %.2X, passed %ld ms, sent %d times\n", CELLIAX_P_LOG,
-                         ptr->seqnum,
-                         ((tv.tv_sec * 1000 + tv.tv_usec / 1000) -
-                          (ptr->tv_sec * 1000 + ptr->tv_usec / 1000)),
-                         ptr->how_many_sent);
-          if (ptr->how_many_sent > 9) {
-            ERRORA("RESEND %.2X, passed %ld ms, sent %d times\n", CELLIAX_P_LOG,
-                   ptr->seqnum,
-                   ((tv.tv_sec * 1000 + tv.tv_usec / 1000) -
-                    (ptr->tv_sec * 1000 + ptr->tv_usec / 1000)), ptr->how_many_sent);
-
-            UNLOCKA(&p->fbus2_outgoing_list_lock);
-            return -1;
-          }
-
-          celliax_serial_send_FBUS2(p, ptr->len, ptr->buffer);
-          if (ptr->buffer[3] == FBUS2_ACK_BYTE) {
-            if (option_debug > 1)
-              DEBUGA_FBUS2("RESEND ACK, passed %ld ms, sent %d times\n", CELLIAX_P_LOG,
-                           ((tv.tv_sec * 1000 + tv.tv_usec / 1000) -
-                            (ptr->tv_sec * 1000 + ptr->tv_usec / 1000)),
-                           ptr->how_many_sent);
-            ptr->acknowledged = 1;
-            ptr->msg = FBUS2_OUTGOING_ACK;
-          }
-          ptr->tv_sec = tv.tv_sec;
-          ptr->tv_usec = tv.tv_usec;
-          ptr->sent = 1;
-          ptr->how_many_sent++;
-          if (option_debug > 1) {
-            DEBUGA_FBUS2("OUTGOING list:\n", CELLIAX_P_LOG);
-            celliax_serial_list_print_FBUS2(p, p->fbus2_outgoing_list);
-            DEBUGA_FBUS2("OUTGOING list END\n", CELLIAX_P_LOG);
-          }
-
-        }
-      }
-
-      UNLOCKA(&p->fbus2_outgoing_list_lock);
-      POPPA_UNLOCKA(&p->fbus2_outgoing_list_lock);
-    }
-  }
-  if (ptr->sent == 0 && ptr->acknowledged == 0 && ptr->msg > 0) {
-
-    PUSHA_UNLOCKA(&p->fbus2_outgoing_list_lock);
-    LOKKA(&p->fbus2_outgoing_list_lock);
-
-    if (ptr->sent == 0 && ptr->acknowledged == 0 && ptr->msg > 0) { //retest, maybe has been changed?
-
-      if (option_debug > 1)
-        DEBUGA_FBUS2("SENDING 1st TIME %.2X\n", CELLIAX_P_LOG, ptr->seqnum);
-      celliax_serial_send_FBUS2(p, ptr->len, ptr->buffer);
-      if (ptr->buffer[3] == FBUS2_ACK_BYTE) {
-        if (option_debug > 1)
-          DEBUGA_FBUS2("SENDING 1st TIME ACK\n", CELLIAX_P_LOG);
-        ptr->acknowledged = 1;
-        ptr->msg = FBUS2_OUTGOING_ACK;
-      }
-      ptr->tv_sec = tv.tv_sec;
-      ptr->tv_usec = tv.tv_usec;
-      ptr->sent = 1;
-      ptr->how_many_sent++;
-      if (option_debug > 1) {
-        DEBUGA_FBUS2("OUTGOING list:\n", CELLIAX_P_LOG);
-        celliax_serial_list_print_FBUS2(p, p->fbus2_outgoing_list);
-        DEBUGA_FBUS2("OUTGOING list END\n", CELLIAX_P_LOG);
-      }
-
-    }
-
-    UNLOCKA(&p->fbus2_outgoing_list_lock);
-    POPPA_UNLOCKA(&p->fbus2_outgoing_list_lock);
-
-  }
-  return 0;
-}
-
-int celliax_serial_write_FBUS2(struct celliax_pvt *p, unsigned char *MsgBuffer,
-                               int MsgLength, unsigned char MsgType)
-{
-  unsigned char buffer2[FBUS2_MAX_TRANSMIT_LENGTH + 10];
-  unsigned char checksum = 0;
-  int i, len;
-  struct timeval tv;
-  struct timezone tz;
-
-  buffer2[0] = FBUS2_SERIAL_FRAME_ID;
-  buffer2[1] = FBUS2_DEVICE_PHONE;  /* destination */
-  buffer2[2] = FBUS2_DEVICE_PC; /* source */
-  buffer2[3] = MsgType;
-  buffer2[4] = 0x00;            /* required by protocol */
-  buffer2[5] = MsgLength;
-
-  memcpy(buffer2 + 6, MsgBuffer, MsgLength);
-  len = MsgLength + 6;
-
-  /* Odd messages require additional padding 0x00 byte */
-  if (MsgLength % 2)
-    buffer2[len++] = 0x00;      /* optional PaddingByte */
-
-  checksum = 0;
-  for (i = 0; i < len; i += 2)
-    checksum ^= buffer2[i];
-  buffer2[len++] = checksum;    /* ChkSum1 */
-
-  checksum = 0;
-  for (i = 1; i < len; i += 2)
-    checksum ^= buffer2[i];
-  buffer2[len++] = checksum;    /* ChkSum2 */
-
-  if (option_debug > 10) {
-    int i;
-    char debug_buf[1024];
-    char *debug_buf_pos;
-
-    memset(debug_buf, 0, 1024);
-    debug_buf_pos = debug_buf;
-
-    for (i = 0; i < len; i++) {
-      debug_buf_pos += sprintf(debug_buf_pos, "[%.2X] ", buffer2[i]);
-      if (debug_buf_pos > (char *) (&debug_buf + 1000))
-        break;
-    }
-    if (buffer2[3] == FBUS2_ACK_BYTE) {
-      DEBUGA_FBUS2("%s to be written, ACK\n", CELLIAX_P_LOG, debug_buf);
-    } else {
-      DEBUGA_FBUS2("%s to be written\n", CELLIAX_P_LOG, debug_buf);
-    }
-  }
-
-  gettimeofday(&tv, &tz);
-
-  if (buffer2[3] != FBUS2_ACK_BYTE) {
-    p->fbus2_outgoing_list = celliax_serial_list_init_FBUS2(p);
-    p->fbus2_outgoing_list->msg = 11;
-
-    p->fbus2_outgoing_list->len = len;
-    for (i = 0; i < len; i++) {
-      p->fbus2_outgoing_list->buffer[i] = buffer2[i];
-    }
-    p->fbus2_outgoing_list->seqnum = MsgBuffer[MsgLength - 1];
-    if (option_debug > 1) {
-      DEBUGA_FBUS2("OUTGOING LIST seqnum is %2.X\n", CELLIAX_P_LOG,
-                   MsgBuffer[MsgLength - 1]);
-
-      DEBUGA_FBUS2("OUTGOING list:\n", CELLIAX_P_LOG);
-      celliax_serial_list_print_FBUS2(p, p->fbus2_outgoing_list);
-      DEBUGA_FBUS2("OUTGOING list END\n", CELLIAX_P_LOG);
-    }
-  } else {
-    usleep(100);
-    celliax_serial_send_FBUS2(p, len, buffer2);
-  }
-
-  return 0;
-}
-
-int celliax_serial_send_ack_FBUS2(struct celliax_pvt *p, unsigned char MsgType,
-                                  unsigned char MsgSequence)
-{
-  unsigned char buffer2[2];
-
-  buffer2[0] = MsgType;
-  buffer2[1] = (MsgSequence - FBUS2_SEQNUM_MIN);
-
-  if (option_debug > 1)
-    DEBUGA_FBUS2("SENDING ACK to %2.X, seqack %2.X \n", CELLIAX_P_LOG, MsgSequence,
-                 (MsgSequence - FBUS2_SEQNUM_MIN));
-  /* Sending to phone */
-  return celliax_serial_write_FBUS2(p, buffer2, 2, FBUS2_ACK_BYTE);
-}
-
-struct fbus2_msg *celliax_serial_list_init_FBUS2(struct celliax_pvt *p)
-{
-  struct fbus2_msg *list;
-  list = p->fbus2_outgoing_list;
-
-  PUSHA_UNLOCKA(&p->fbus2_outgoing_list_lock);
-  LOKKA(&p->fbus2_outgoing_list_lock);
-  if (list == NULL) {
-    list = malloc(sizeof(*(list)));
-    list->msg = 0;
-    list->seqnum = 0;
-    list->len = 0;
-    list->acknowledged = 0;
-    list->how_many_sent = 0;
-    list->sent = 0;
-    list->tv_sec = 0;
-    list->tv_usec = 0;
-    list->next = NULL;
-    list->previous = NULL;
-  }
-  if (list->msg != 0) {
-    struct fbus2_msg *new;
-    new = malloc(sizeof(*new));
-    new->msg = 0;
-    new->seqnum = 0;
-    new->len = 0;
-    new->acknowledged = 0;
-    new->how_many_sent = 0;
-    new->sent = 0;
-    new->tv_sec = 0;
-    new->tv_usec = 0;
-    new->next = NULL;
-    new->previous = list;
-    list->next = new;
-    list = new;
-  }
-  UNLOCKA(&p->fbus2_outgoing_list_lock);
-  POPPA_UNLOCKA(&p->fbus2_outgoing_list_lock);
-  return list;
-}
-
-int celliax_serial_list_print_FBUS2(struct celliax_pvt *p, struct fbus2_msg *list)
-{
-  struct fbus2_msg *ptr;
-  ptr = list;
-  while (ptr) {
-    if (option_debug > 3)
-      DEBUGA_FBUS2
-        ("PTR msg is: %d, seqnum is %.2X, tv_sec is %d, tv_usec is %d, acknowledged is: %d,"
-         " sent is:%d, how_many_sent is: %d\n", CELLIAX_P_LOG, ptr->msg, ptr->seqnum,
-         ptr->tv_sec, ptr->tv_usec, ptr->acknowledged, ptr->sent, ptr->how_many_sent);
-    ptr = ptr->previous;
-  }
-  return 0;
-}
-
-int celliax_serial_read_FBUS2(struct celliax_pvt *p)
-{
-  int read_count;
-  int select_err;
-  fd_set read_fds;
-  struct timeval timeout;
-  int fbus_mesg = 0;
-  int i;
-
-  FD_ZERO(&read_fds);
-  FD_SET(p->controldevfd, &read_fds);
-  timeout.tv_sec = 0;
-  timeout.tv_usec = 50000;
-
-  if ((select_err = select(p->controldevfd + 1, &read_fds, NULL, NULL, &timeout)) > 0) {
-    timeout.tv_sec = 0;         //reset the timeout, linux modify it
-    timeout.tv_usec = 50000;    //reset the timeout, linux modify it
-    PUSHA_UNLOCKA(&p->controldev_lock);
-    LOKKA(&p->controldev_lock);
-    while ((select_err =
-            select(p->controldevfd + 1, &read_fds, NULL, NULL, &timeout)) > 0) {
-      gettimeofday(&p->fbus2_list_tv, &p->fbus2_list_tz);
-      read_count = read(p->controldevfd, p->rxm, 255);
-
-      if (read_count == 0) {
-        ERRORA
-          ("read 0 bytes!!! Nenormalno! Marking this celliax_serial_device %s as dead, andif it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, power down or battery exhausted\n",
-           CELLIAX_P_LOG, p->controldevice_name);
-        p->controldev_dead = 1;
-        close(p->controldevfd);
-        UNLOCKA(&p->controldev_lock);
-        if (p->owner) {
-          celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-          p->owner->hangupcause = AST_CAUSE_FAILURE;
-        }
-        return -1;
-      }
-      if (option_debug > 10) {
-        int c;
-        char debug_buf[1024];
-        char *debug_buf_pos;
-
-        memset(debug_buf, 0, 1024);
-        debug_buf_pos = debug_buf;
-        for (c = 0; c < read_count; c++) {
-          debug_buf_pos += sprintf(debug_buf_pos, "[%.2X] ", p->rxm[c]);
-          if (debug_buf_pos > (char *) (&debug_buf + 1000))
-            break;
-        }
-        DEBUGA_FBUS2("%s READ AT seconds=%ld usec=%6ld read_count=%d\n", CELLIAX_P_LOG,
-                     debug_buf, p->fbus2_list_tv.tv_sec, p->fbus2_list_tv.tv_usec,
-                     read_count);
-      }
-
-      for (i = 0; i < read_count; i++) {
-        if (p->rxm[i] == FBUS2_DEVICE_PHONE && p->rxm[i - 1] == FBUS2_DEVICE_PC
-            && p->rxm[i - 2] == FBUS2_SERIAL_FRAME_ID) {
-          /* if we have identified the start of an fbus2 frame sent to us by the phone */
-          /* clean the array, copy into it the beginning of the frame, move the counter in the array after the last byte copied */
-          memset(p->array, 0, 255);
-          p->array[0] = FBUS2_SERIAL_FRAME_ID;
-          p->array[1] = FBUS2_DEVICE_PC;
-          p->arraycounter = 2;
-        }
-        if (p->rxm[i] == FBUS2_SERIAL_FRAME_ID && read_count == 1) {    /* quick hack to try to identify the lone char 
-                                                                           at the beginning a frame, often returned by 
-                                                                           ark3116 based datacables */
-          /* if we have identified the start of an fbus2 frame sent to us by the phone */
-          /* clean the array, copy into it the beginning of the frame, move the counter in the array after the last byte copied */
-          memset(p->array, 0, 255);
-          p->arraycounter = 0;
-        }
-
-        /* continue copying into the array, until... */
-        p->array[p->arraycounter] = p->rxm[i];
-        /* we reach the end of the incoming frame, its lenght is in the p->array[5] byte, plus overhead */
-        if (p->arraycounter == p->array[5] + 7) {
-          /* start categorizing frames */
-          int seqnum;
-          int known = 0;
-
-          /* ACK frames are always of lenght 10, without padding */
-          seqnum = p->array[p->arraycounter - 2];
-          /* first step in categorizing frames, look at the general kind of frame, in p->array[3] */
-          switch (p->array[3]) {
-/****************************************************************/
-          case FBUS2_ACK_BYTE:
-            /* this is an ACKnowledgement frame sent to us in reply to an item we sent, take note we were ACKnowledged, no need to resend the item */
-            if (option_debug > 1)
-              DEBUGA_FBUS2("INCOMING ACK, seqack %.2X \n", CELLIAX_P_LOG, seqnum);
-            if (seqnum == 0x80) {   /* reset */
-              seqnum = 0x00;
-              DEBUGA_FBUS2
-                ("seqack was 0x80, interpreting as 0x00, first acknowledgement (session begin?) of our first sent item 0x40\n",
-                 CELLIAX_P_LOG);
-            }
-            /* an ACK frame has the same seqnum as the item it acknowledge, minus 0x40, so here we obtain the seqnum of the item that has been ACKnowledged */
-            fbus_mesg = seqnum + FBUS2_SEQNUM_MIN;
-            /* take note that the item sent was ACKnowledged, so no need to resend it */
-            celliax_serial_list_acknowledge_FBUS2(p, fbus_mesg);
-            /* this frame has been categorized, bail out from the loop */
-            known = 1;
-            break;
-/****************************************************************/
-          case FBUS2_TYPE_CALL_DIVERT:
-            if (option_debug > 1)
-              DEBUGA_FBUS2("CALL DIVERT SIGNALING seqnum %.2X \n", CELLIAX_P_LOG, seqnum);
-            fbus_mesg = FBUS2_TYPE_CALL_DIVERT;
-            /* this signal us that we have some settings in line divert, let's use it as activation of the line when we call */
-            if (p->interface_state == AST_STATE_DIALING) {
-              p->interface_state = AST_STATE_UP;
-              p->phone_callflow = CALLFLOW_CALL_ACTIVE;
-              ast_setstate(p->owner, AST_STATE_RINGING);
-              celliax_queue_control(p->owner, AST_CONTROL_ANSWER);
-              if (option_debug)
-                DEBUGA_FBUS2
-                  ("call is active, I know it's not yet true, but 3310 do not give us remote answer signaling\n",
-                   CELLIAX_P_LOG);
-            }
-            /* this frame has been categorized, bail out from the loop */
-            known = 1;
-            break;
-
-/****************************************************************/
-            /* this kind of frames is an answer to "ask model" actions */
-          case FBUS2_TYPE_MODEL_ANSWER:
-            if (1) {
-              int newline = 0;
-              int c = i = 0;
-              unsigned char model[10];
-              for (i = 10; i < p->arraycounter; i++) {
-                if (p->array[i] == '\n')
-                  newline++;
-                if (newline == 2) {
-                  if (p->array[i] != '\n') {
-                    model[c] = p->array[i];
-                    c++;
-                  }
-                }
-                if (newline == 3) {
-                  break;
-                }
-                if (c == 9)
-                  break;
-              }
-              model[c] = '\0';
-              DEBUGA_FBUS2("FBUS2 PHONE MODEL is: %s, inseqnum %.2X \n", CELLIAX_P_LOG,
-                           model, seqnum);
-            }
-            known = 1;
-            fbus_mesg = FBUS2_TYPE_MODEL_ANSWER;
-            break;
-/****************************************************************/
-            /* this kind of frames is an answer to "security enabled" actions */
-          case FBUS2_TYPE_SECURITY:
-            switch (p->array[8]) {
-              /* this subkind of frames is an answer to "security enabled" CALL actions */
-            case FBUS2_SECURIY_CALL_COMMANDS:
-              switch (p->array[9]) {
-                /* this sub-subkind of frames tell us that we answered the call */
-              case FBUS2_SECURIY_CALL_COMMAND_ANSWER:
-                p->interface_state = AST_STATE_UP;
-                p->phone_callflow = CALLFLOW_CALL_ACTIVE;
-
-                /* set the channel state to UP, we've answered */
-                if (ast_setstate(p->owner, AST_STATE_UP)) {
-                  ERRORA("ast_setstate failed, BAD\n", CELLIAX_P_LOG);
-                }
-
-                if (option_debug > 1)
-                  DEBUGA_FBUS2("ANSWERED CALL, inseqnum %.2X \n", CELLIAX_P_LOG, seqnum);
-                known = 1;
-                break;
-                /* this sub-subkind of frames tell us that we released the call */
-              case FBUS2_SECURIY_CALL_COMMAND_RELEASE:
-                p->interface_state = AST_STATE_DOWN;
-                p->phone_callflow = CALLFLOW_CALL_IDLE;
-                if (option_debug > 1)
-                  DEBUGA_FBUS2("RELEASED CALL, inseqnum %.2X \n", CELLIAX_P_LOG, seqnum);
-                fbus_mesg = CALLFLOW_CALL_RELEASED;
-                known = 1;
-                break;
-              }
-              break;
-              /* this subkind of frames is an answer to "enable security commands" action */
-            case FBUS2_SECURIY_EXTENDED_COMMANDS:
-              if (option_debug > 1)
-                DEBUGA_FBUS2("SECURITY EXTENDED COMMANDS ON, inseqnum %.2X \n",
-                             CELLIAX_P_LOG, seqnum);
-              fbus_mesg = FBUS2_SECURIY_EXTENDED_COMMAND_ON;
-              known = 1;
-              break;
-              /* this subkind of frames is an answer to "get IMEI" action */
-            case FBUS2_SECURIY_IMEI_COMMANDS:
-              if (option_debug > 1)
-                DEBUGA_FBUS2("CALLFLOW_GOT_IMEI, inseqnum %.2X \n", CELLIAX_P_LOG,
-                             seqnum);
-              fbus_mesg = CALLFLOW_GOT_IMEI;
-              known = 1;
-              break;
-            }
-            break;
-/****************************************************************/
-            /* this kind of frames is about SMSs */
-          case FBUS2_TYPE_SMS:
-            switch (p->array[9]) {
-              /* this subkind of frames is about an INCOMING SMS */
-            case FBUS2_SMS_INCOMING:
-              if (option_debug > 1)
-                DEBUGA_FBUS2("SMS, inseqnum %.2X \n", CELLIAX_P_LOG, seqnum);
-              known = 1;
-              break;
-            }
-            break;
-/****************************************************************/
-            /* this kind of frames is about PHONE CALLs */
-          case FBUS2_TYPE_CALL:
-            switch (p->array[9]) {
-              int a;
-              /* this subkind of frame is about the CALL has been HUNGUP */
-            case FBUS2_CALL_HANGUP:
-              p->interface_state = AST_STATE_DOWN;
-              p->phone_callflow = CALLFLOW_CALL_IDLE;
-              if (option_debug > 1)
-                DEBUGA_FBUS2("REMOTE PARTY HANG UP, inseqnum %.2X \n", CELLIAX_P_LOG,
-                             seqnum);
-              fbus_mesg = CALLFLOW_INCOMING_HANGUP;
-              known = 1;
-              break;
-              /* this subkind of frame is about the remote CALLID (not signaled by 3310) */
-            case FBUS2_CALL_CALLID:
-              if (option_debug > 1)
-                DEBUGA_FBUS2("CALLID, inseqnum %.2X \n", CELLIAX_P_LOG, seqnum);
-              memset(p->callid_name, 0, sizeof(p->callid_name));
-              memset(p->callid_number, 0, sizeof(p->callid_number));
-              for (a = 0; a < p->array[12]; a++) {
-                p->callid_number[a] = p->array[12 + a + 1];
-              }
-              for (a = 0; a < p->array[12 + 1 + p->array[12]] + 1; a++) {
-                p->callid_name[a] = p->array[12 + 1 + a + p->array[12] + 1];
-              }
-              if (option_debug > 1)
-                DEBUGA_FBUS2("CALLFLOW_INCOMING_CALLID: name is %s, number is %s\n",
-                             CELLIAX_P_LOG,
-                             p->callid_name[0] != 1 ? p->callid_name : "not available",
-                             p->callid_number[0] ? p->callid_number : "not available");
-              fbus_mesg = CALLFLOW_INCOMING_CALLID;
-              p->phone_callflow = CALLFLOW_INCOMING_RING;
-              p->interface_state = AST_STATE_RING;
-              known = 1;
-              break;
-            }
-            break;
-/****************************************************************/
-            /* this kind of frames is about NETWORK STATUS */
-          case FBUS2_TYPE_NETWORK_STATUS:
-            switch (p->array[9]) {
-              /* this subkind of frames is NETWORK STATUS REGISTERED */
-            case FBUS2_NETWORK_STATUS_REGISTERED:
-              if (option_debug > 1)
-                DEBUGA_FBUS2("NETWORK STATUS REGISTERED, inseqnum %.2X \n", CELLIAX_P_LOG,
-                             seqnum);
-              if (p->callid_name[0] == 0 && p->owner
-                  && p->interface_state != AST_STATE_DOWN) {
-                p->interface_state = AST_STATE_DOWN;
-                p->phone_callflow = CALLFLOW_CALL_IDLE;
-                if (option_debug)
-                  NOTICA("We think we are using a nokia3310, so NETWORK STATUS REGISTERED"
-                         " is interpreted as REMOTE PARTY HANG UP during a call, because"
-                         " Nokia 3310 give no hint about remote hangup. Nokia 3310"
-                         " does not signal the CALLID, while other nokias at least put"
-                         " callid_name[0]=1 (also if no callid was transmitted by remote"
-                         " party), we use this lack of CALLID as a sign of 3310nness."
-                         " Outside a call, or when CALLID has been signaled, NETWORK STATUS"
-                         " REGISTERED is ignored.\n", CELLIAX_P_LOG);
-                fbus_mesg = CALLFLOW_INCOMING_HANGUP;
-              }
-              known = 1;
-              break;
-            }
-            break;
-/****************************************************************/
-            /* this kind of frames is about CALL STATUS */
-          case FBUS2_TYPE_CALL_STATUS:
-            switch (p->array[12]) {
-              /* this subkind of frames is about CALL STATUS OFF */
-            case FBUS2_CALL_STATUS_OFF:
-              p->interface_state = AST_STATE_DOWN;
-              p->phone_callflow = CALLFLOW_CALL_IDLE;
-              if (option_debug > 1)
-                DEBUGA_FBUS2("STATUS call in progress OFF, inseqnum %.2X \n",
-                             CELLIAX_P_LOG, seqnum);
-              fbus_mesg = CALLFLOW_INCOMING_HANGUP;
-              known = 1;
-              break;
-              /* this subkind of frames is about CALL STATUS ON */
-            case FBUS2_CALL_STATUS_ON:
-              if (option_debug > 1)
-                DEBUGA_FBUS2("STATUS call in progress ON, inseqnum %.2X \n",
-                             CELLIAX_P_LOG, seqnum);
-              known = 1;
-              break;
-            }
-/****************************************************************/
-            break;
-          }
-
-          /* categorization of frame is ended, if it has not been recognized, whine */
-          if (!known) {
-            WARNINGA("FBUS2 MSG UNKNOWN, inseqnum %.2X\n", CELLIAX_P_LOG, seqnum);
-          }
-
-          /* let's print our frame */
-          if (option_debug > 1) {
-            int i;
-            char debug_buf[1024];
-            char *debug_buf_pos;
-
-            memset(debug_buf, 0, 1024);
-            debug_buf_pos = debug_buf;
-            for (i = 0; i < p->arraycounter + 1; i++) {
-              debug_buf_pos += sprintf(debug_buf_pos, "[%.2X] ", p->array[i]);
-              if (debug_buf_pos > (char *) (&debug_buf + 1000))
-                break;
-            }
-            DEBUGA_FBUS2("%s is the RECEIVED FRAME inseqnum %.2X\n", CELLIAX_P_LOG,
-                         debug_buf, seqnum);
-          }
-
-          /* if the frame we received is not an ACK frame, let's ACKnowledge it */
-          if (p->array[0] == FBUS2_SERIAL_FRAME_ID && p->array[3] != FBUS2_ACK_BYTE) {
-            celliax_serial_send_ack_FBUS2(p, p->array[3], seqnum);
-          }
-        }
-        p->arraycounter++;
-      }
-    }
-    UNLOCKA(&p->controldev_lock);
-    POPPA_UNLOCKA(&p->controldev_lock);
-  }
-  /* oooops, select returned error, got a kill/cancel or problems with the serial file descriptor */
-  if (select_err == -1) {
-    if (errno != EINTR) {
-      ERRORA
-        ("select returned -1 on %s, marking controldev as dead, errno was: %d, error was: %s\n",
-         CELLIAX_P_LOG, p->controldevice_name, errno, strerror(errno));
-      p->controldev_dead = 1;
-      close(p->controldevfd);
-      if (p->owner)
-        celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-      return -1;
-    } else {
-      WARNINGA("select returned -1 on %s, errno was: %d, EINTR, error was: %s\n",
-               CELLIAX_P_LOG, p->controldevice_name, errno, strerror(errno));
-      return 0;
-    }
-  }
-  /* OK, reading done, let's browse the list of pending frames to be sent, and act on it */
-  if (celliax_serial_send_if_time_FBUS2(p)) {
-    ERRORA("celliax_serial_send_if_time_FBUS2 failed!\n", CELLIAX_P_LOG);
-    return -1;
-  }
-
-  if (fbus_mesg == CALLFLOW_INCOMING_HANGUP) {
-    if (p->owner) {
-      celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-      DEBUGA_FBUS2("phone call ended\n", CELLIAX_P_LOG);
-    }
-  }
-
-  return fbus_mesg;             //FIXME breaks the convention of returning 0 on success
-}
-
-#endif /* CELLIAX_FBUS2 */
-
-#ifdef CELLIAX_CVM
-
-int celliax_serial_sync_CVM_BUSMAIL(struct celliax_pvt *p)
-{
-  usleep(1000);                 /* 1msec */
-  time(&p->celliax_serial_synced_timestamp);
-  return 0;
-}
-
-int celliax_serial_answer_CVM_BUSMAIL(struct celliax_pvt *p)
-{
-  if (AST_STATE_RING == p->interface_state) {
-    DEBUGA_CVM("Sending commands to answer an incomming call...\n", CELLIAX_P_LOG);
-    celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_CONNECT_REQ, 0, NULL);
-
-  } else {
-    DEBUGA_CVM
-      ("SKIPPING Sending commands to answer an incomming call, because: !AST_STATE_RING\n",
-       CELLIAX_P_LOG);
-  }
-
-  return 0;
-}
-
-int celliax_serial_call_CVM_BUSMAIL(struct celliax_pvt *p, char *dstr)
-{
-  unsigned char bCallType = 0x01;   /* INTERNAL */
-
-  unsigned char DialReqBuff[2];
-
-  celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_SETUP_REQ, sizeof(bCallType),
-                                             &bCallType);
-
-  while (AST_STATE_DOWN == p->interface_state) {
-    usleep(10000);              //10msec
-  }
-
-  if (AST_STATE_DIALING == p->interface_state) {
-    /* as for now, we only support internal calls */
-    /* "0" - call speaker phone */
-    /* "1" - call handset #1 */
-    /* "2" - call handset #2 */
-    /* ... */
-
-    DialReqBuff[0] = 1;         /* number of digits to send */
-    DialReqBuff[1] = dstr[0];   /* digit to send */
-
-    celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_KEYPAD_REQ, 2, DialReqBuff);
-  }
-
-  if (option_debug)
-    NOTICA("CVM_BUSMAIL: sent commands to call\n", CELLIAX_P_LOG);
-  return 0;
-}
-
-int celliax_serial_hangup_CVM_BUSMAIL(struct celliax_pvt *p)
-{
-  unsigned char bReason = 0x0;  /* Normal hang-up */
-
-  if (p->interface_state != AST_STATE_DOWN) {
-    celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_RELEASE_REQ, sizeof(bReason),
-                                               &bReason);
-
-    DEBUGA_CVM("CVM_BUSMAIL: sent commands to hangup the call\n", CELLIAX_P_LOG);
-
-  } else {
-    DEBUGA_CVM("CVM_BUSMAIL: sent commands to hangup skipped because: AST_STATE_DOWN\n",
-               CELLIAX_P_LOG);
-  }
-
-  return 0;
-}
-
-int celliax_serial_config_CVM_BUSMAIL(struct celliax_pvt *p)
-{
-  int res;
-  int how_many_reads = 0;
-  unsigned char SubcriptionNo = p->cvm_subsc_no;
-  unsigned char RegistartionData[5];
-
-  p->cvm_lock_state = CVM_UNKNOWN_LOCK_STATE;
-  p->cvm_register_state = CVM_UNKNOWN_REGISTER_STATE;
-
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  CVM_LOKKA(&p->controldev_lock);
-
-  if (option_debug > 1)
-    DEBUGA_CVM("Try to init communication with CVM...\n", CELLIAX_P_LOG);
-
-  /* CVM after reset sends SABM CTRL frame, let's assume that CVM already sent it, that's the reply... */
-  celliax_serial_send_ctrl_frame_CVM_BUSMAIL(p,
-                                             BUSMAIL_HEADER_CTRL_FRAME |
-                                             BUSMAIL_HEADER_CTRL_UN_FRAME |
-                                             BUSMAIL_HEADER_UNID_SABM);
-  /*  usleep(10000);   *//* 10ms */
-
-  /* Now we are sending SABM CTRL frame, if CVM is out there, it should reply... */
-  celliax_serial_send_ctrl_frame_CVM_BUSMAIL(p,
-                                             BUSMAIL_HEADER_CTRL_FRAME |
-                                             BUSMAIL_HEADER_CTRL_UN_FRAME |
-                                             BUSMAIL_HEADER_UNID_SABM |
-                                             (BUSMAIL_HEADER_PF_BIT_MASK & 0xFF));
-//  usleep(1000);
-
-  res = celliax_serial_read_CVM_BUSMAIL(p); //we don't have no monitor neither do_controldev_thread
-
-  DEBUGA_CVM("celliax_serial_read_CVM_BUSMAIL res= %X, expected %X\n", CELLIAX_P_LOG, res,
-             (BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_UN_FRAME |
-              BUSMAIL_HEADER_SABM));
-
-  if (res == -1) {
-    ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-    CVM_UNLOCKA(&p->controldev_lock);
-    return -1;
-  }
-
-  how_many_reads = 0;
-
-  while ((res & 0xF0) !=
-         (BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_UN_FRAME | BUSMAIL_HEADER_SABM))
-  {
-
-    usleep(1000);
-    res = celliax_serial_read_CVM_BUSMAIL(p);
-    how_many_reads++;
-
-    if (res == -1) {
-      ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-      CVM_UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-
-    if (how_many_reads > 10) {
-      ERRORA("no expected results in %d celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG,
-             how_many_reads);
-
-      ERRORA("Unable to initialize cmmunication with CVM...\n", CELLIAX_P_LOG);
-
-      CVM_UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-  }
-
-  DEBUGA_CVM("Communication with CVM initialized successfully...\n", CELLIAX_P_LOG);
-
-  DEBUGA_CVM("Attempt to lock to FP...\n", CELLIAX_P_LOG);
-
-  /* Try to connect to FP, try to lock to FP, maybe we registered with it in the past... */
-  /* CVM can hold up to 2 subscriptions in its EEPROM, celliax.conf contains number we should try */
-  /* eg. cvm_subscription_no = 1 */
-
-  celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_LOCK_REQ, sizeof(SubcriptionNo),
-                                             &SubcriptionNo);
-
-  usleep(10000);
-
-  res = celliax_serial_read_CVM_BUSMAIL(p); //we don't have no monitor neither do_controldev_thread
-
-  if (res == -1) {
-    ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-    CVM_UNLOCKA(&p->controldev_lock);
-    return -1;
-  }
-
-  how_many_reads = 0;
-
-  while (CVM_UNKNOWN_LOCK_STATE == p->cvm_lock_state) {
-
-/*    
-    if (0 == (how_many_reads % 10))
-    {
-      DEBUGA_CVM("Attempt to lock to FP... %d\n", CELLIAX_P_LOG, how_many_reads/10 );
-      celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_LOCK_REQ, sizeof(SubcriptionNo) ,&SubcriptionNo);
-    }
-*/
-
-    usleep(100000);
-
-    res = celliax_serial_read_CVM_BUSMAIL(p);
-    how_many_reads++;
-
-    if (res == -1) {
-      ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-      CVM_UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-
-    if (how_many_reads > 50) {
-      ERRORA("no expected results in %d celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG,
-             how_many_reads);
-
-      ERRORA("Unable to lock to FP...\n", CELLIAX_P_LOG);
-      break;
-    }
-  }
-
-  if (CVM_LOCKED_TO_FP == p->cvm_lock_state) {
-    DEBUGA_CVM("CVM locked to FP successfully...\n", CELLIAX_P_LOG);
-  } else {
-    DEBUGA_CVM("Lock to FP failed, Attempt to register to FP...\n", CELLIAX_P_LOG);
-
-    RegistartionData[0] = SubcriptionNo;
-    RegistartionData[1] = 0xFF;
-    RegistartionData[2] = 0xFF;
-
-    if (1 == SubcriptionNo) {
-      RegistartionData[3] =
-        (((p->cvm_subsc_1_pin[3] - 0x30) & 0x0F) << 4) | ((p->cvm_subsc_1_pin[2] -
-                                                           0x30) & 0x0F);
-      RegistartionData[4] =
-        (((p->cvm_subsc_1_pin[1] - 0x30) & 0x0F) << 4) | ((p->cvm_subsc_1_pin[0] -
-                                                           0x30) & 0x0F);
-    } else {
-      RegistartionData[3] =
-        (((p->cvm_subsc_2_pin[3] - 0x30) & 0x0F) << 4) | ((p->cvm_subsc_2_pin[2] -
-                                                           0x30) & 0x0F);
-      RegistartionData[4] =
-        (((p->cvm_subsc_2_pin[1] - 0x30) & 0x0F) << 4) | ((p->cvm_subsc_2_pin[0] -
-                                                           0x30) & 0x0F);
-    }
-
-    celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_ACCESS_RIGHTS_REQ,
-                                               sizeof(RegistartionData),
-                                               RegistartionData);
-
-    usleep(100000);
-
-    res = celliax_serial_read_CVM_BUSMAIL(p);   //we don't have no monitor neither do_controldev_thread
-
-    if (res == -1) {
-      ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-      CVM_UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-
-    how_many_reads = 0;
-
-    while (CVM_UNKNOWN_REGISTER_STATE == p->cvm_register_state) {
-
-      if (0 == (how_many_reads % 50)) {
-        DEBUGA_CVM("Attempt to register to FP... %d\n", CELLIAX_P_LOG,
-                   how_many_reads / 10);
-        celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_ACCESS_RIGHTS_REQ,
-                                                   sizeof(RegistartionData),
-                                                   RegistartionData);
-      }
-
-      /* up to 5 minutes for registration.... */
-      usleep(1000000);
-      res = celliax_serial_read_CVM_BUSMAIL(p);
-      how_many_reads++;
-
-      if (res == -1) {
-        ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-        CVM_UNLOCKA(&p->controldev_lock);
-        return -1;
-      }
-
-      if (how_many_reads > 300) {
-        ERRORA("no expected results in %d celliax_serial_read_CVM_BUSMAIL\n",
-               CELLIAX_P_LOG, how_many_reads);
-
-        ERRORA("Unable to communication with CVM...\n", CELLIAX_P_LOG);
-
-        CVM_UNLOCKA(&p->controldev_lock);
-        return -1;
-      }
-    }
-
-    if (CVM_REGISTERED_TO_FP != p->cvm_register_state) {
-      ERRORA("Unable to register to FP...\n", CELLIAX_P_LOG);
-
-      CVM_UNLOCKA(&p->controldev_lock);
-      return -1;
-
-    } else {
-      DEBUGA_CVM("CVM registered to FP successfully...\n", CELLIAX_P_LOG);
-      DEBUGA_CVM("Attempt to lock to FP...\n", CELLIAX_P_LOG);
-
-      /* Try to connect to FP, try to lock to FP, maybe we registered with it in the past... */
-      /* CVM can hold up to 2 subscriptions in its EEPROM, celliax.conf contains number we should try */
-      /* eg. cvm_subscription_no = 1 */
-
-      celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_LOCK_REQ,
-                                                 sizeof(SubcriptionNo), &SubcriptionNo);
-
-      usleep(10000);
-
-      res = celliax_serial_read_CVM_BUSMAIL(p); //we don't have no monitor neither do_controldev_thread
-
-      if (res == -1) {
-        ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-        CVM_UNLOCKA(&p->controldev_lock);
-        return -1;
-      }
-
-      how_many_reads = 0;
-
-      while (CVM_UNKNOWN_LOCK_STATE == p->cvm_lock_state) {
-
-        if (0 == (how_many_reads % 10)) {
-          DEBUGA_CVM("Attempt to lock to FP... %d\n", CELLIAX_P_LOG, how_many_reads / 10);
-          celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_ACCESS_RIGHTS_REQ,
-                                                     sizeof(RegistartionData),
-                                                     RegistartionData);
-        }
-
-        usleep(10000);
-        res = celliax_serial_read_CVM_BUSMAIL(p);
-        how_many_reads++;
-
-        if (res == -1) {
-          ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-          CVM_UNLOCKA(&p->controldev_lock);
-          return -1;
-        }
-
-        if (how_many_reads > 100) {
-          ERRORA("no expected results in %d celliax_serial_read_CVM_BUSMAIL\n",
-                 CELLIAX_P_LOG, how_many_reads);
-
-          ERRORA("Unable to communication with CVM...\n", CELLIAX_P_LOG);
-
-          CVM_UNLOCKA(&p->controldev_lock);
-          return -1;
-        }
-      }
-
-      if (CVM_LOCKED_TO_FP != p->cvm_lock_state) {
-        ERRORA("Unable to lock to FP...\n", CELLIAX_P_LOG);
-
-        CVM_UNLOCKA(&p->controldev_lock);
-        return -1;
-      } else {
-        DEBUGA_CVM("CVM locked to FP successfully...\n", CELLIAX_P_LOG);
-      }
-    }
-  }
-
-  usleep(100000);
-
-  CVM_UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-  return 0;
-
-}
-
-int celliax_serial_read_CVM_BUSMAIL(struct celliax_pvt *p)
-{
-  int read_count;
-  int select_err;
-  fd_set read_fds;
-  struct timeval timeout;
-  int cvm_busmail_mesg = 0;
-  unsigned char busmail_crc = 0;
-  unsigned char MsgCrc = 0;
-  unsigned char MsgHeader = 0;
-  unsigned char MsgTxSeqNo = 0;
-  unsigned char MsgRxSeqNo = 0;
-  unsigned char MsgTaskId = 0;
-  unsigned char MsgProgId = 0;
-  unsigned char MsgPrimitiveLSB = 0;
-  unsigned char MsgPrimitiveMSB = 0;
-  unsigned int MsgPrimitive = 0;
-
-  int i = 0;
-
-  FD_ZERO(&read_fds);
-  FD_SET(p->controldevfd, &read_fds);
-  timeout.tv_sec = 0;
-  timeout.tv_usec = 10000;
-
-  if ((select_err = select(p->controldevfd + 1, &read_fds, NULL, NULL, &timeout)) > 0) {
-    timeout.tv_sec = 0;         //reset the timeout, linux modify it
-    timeout.tv_usec = 10000;    //reset the timeout, linux modify it
-    PUSHA_UNLOCKA(&p->controldev_lock);
-    CVM_LOKKA(&p->controldev_lock);
-
-    while ((select_err =
-            select(p->controldevfd + 1, &read_fds, NULL, NULL, &timeout)) > 0) {
-      gettimeofday(&p->cvm_busmail_list_tv, &p->cvm_busmail_list_tz);
-      read_count = read(p->controldevfd, p->rxm, 255);
-
-      if (read_count == 0) {
-        ERRORA
-          ("read 0 bytes!!! Nenormalno! Marking this celliax_serial_device %s as dead, andif it is owned by a channel, hanging up. Maybe the CVM is stuck, switched off or power down.\n",
-           CELLIAX_P_LOG, p->controldevice_name);
-
-        p->controldev_dead = 1;
-        close(p->controldevfd);
-        CVM_UNLOCKA(&p->controldev_lock);
-
-        if (p->owner)
-          celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-        return -1;
-      }
-
-      if (option_debug > 10) {
-        char debug_buf[1024];
-        char *debug_buf_pos;
-
-        memset(debug_buf, 0, 1024);
-        debug_buf_pos = debug_buf;
-        for (i = 0; i < read_count; i++) {
-          debug_buf_pos += sprintf(debug_buf_pos, "[%.2X] ", p->rxm[i]);
-          if (debug_buf_pos > (char *) (&debug_buf + 1000))
-            break;
-        }
-
-        DEBUGA_CVM("%s READ AT seconds=%ld usec=%6ld read_count=%d\n", CELLIAX_P_LOG,
-                   debug_buf, p->cvm_busmail_list_tv.tv_sec,
-                   p->cvm_busmail_list_tv.tv_usec, read_count);
-      }
-
-      for (i = 0; i < read_count; i++) {
-        if (p->rxm[i] == BUSMAIL_SOF) {
-          /* if we have identified the start of an busmail frame sent to us by the CVM */
-          /* clean the array, copy into it the beginning of the frame, move the counter in the array after the last byte copied */
-          memset(p->array, 0, 255);
-          p->array[0] = p->rxm[i];
-          p->arraycounter = 1;
-        }
-
-        /* buffer overload protection */
-        if (255 == p->arraycounter) {
-          p->arraycounter = 1;
-        }
-
-        /* continue copying into the array, until... */
-        p->array[p->arraycounter - 1] = p->rxm[i];
-
-        /* we reach the end of the incoming frame, its lenght is in the p->array[BUSMAIL_OFFSET_LEN_LSB] byte, plus overhead */
-        if (p->arraycounter == p->array[BUSMAIL_OFFSET_LEN_LSB] + 4) {
-
-          tcflush(p->controldevfd, TCIFLUSH);   /* PL2303HX bug? */
-          /* start categorizing frames */
-
-          if (option_debug > 10) {
-            char debug_buf[1024];
-            char *debug_buf_pos;
-
-            memset(debug_buf, 0, 1024);
-            debug_buf_pos = debug_buf;
-
-            for (i = 0; i < p->arraycounter; i++) {
-              debug_buf_pos += sprintf(debug_buf_pos, "[%.2X] ", p->array[i]);
-              if (debug_buf_pos > (char *) (&debug_buf + 1000))
-                break;
-            }
-
-            DEBUGA_CVM("%s was received, Starting to categorize this frame\n",
-                       CELLIAX_P_LOG, debug_buf);
-          }
-
-          int known = 0;
-          int j = 0;
-
-          busmail_crc = 0;
-          MsgCrc = p->array[p->arraycounter - 1];
-
-          busmail_crc = (unsigned char) (p->array[BUSMAIL_OFFSET_HEADER] + busmail_crc);
-
-          for (j = BUSMAIL_OFFSET_MAIL; j < (p->arraycounter - 1); j++) {
-            busmail_crc = (unsigned char) (p->array[j] + busmail_crc);
-          }
-
-          if (busmail_crc != MsgCrc) {
-            WARNINGA("BUSMAIL MSG CRC FAILED!, MsgCrc %.2X, calcd %.2X, dropping frame\n",
-                     CELLIAX_P_LOG, MsgCrc, busmail_crc);
-          } else {
-            /* first step in categorizing frames, look at the general kind of frame, in p->array[BUSMAIL_OFFSET_HEADER] */
-            if (option_debug > 1)
-              DEBUGA_CVM("BUSMAIL MSG CRC, MsgCrc %.2X, calcd %.2X...\n", CELLIAX_P_LOG,
-                         MsgCrc, busmail_crc);
-
-            MsgHeader = p->array[BUSMAIL_OFFSET_HEADER];
-            cvm_busmail_mesg = MsgHeader;
-
-            switch (MsgHeader & BUSMAIL_HEADER_IC_BIT_MASK) {
-            case BUSMAIL_HEADER_INFO_FRAME:
-              /* analyzis of frame header */
-              MsgTxSeqNo = ((MsgHeader & BUSMAIL_HEADER_TXSEQ_MASK) >> 4);
-              MsgRxSeqNo = ((MsgHeader & BUSMAIL_HEADER_RXSEQ_MASK));
-
-              if (option_debug > 1)
-                DEBUGA_CVM("BUSMAIL_HEADER_INFO_FRAME TxSeq %X, RxSeq %X\n",
-                           CELLIAX_P_LOG, MsgTxSeqNo, MsgRxSeqNo);
-
-              if (((p->busmail_rxseq_cvm_last + 1) & 0x7) != MsgTxSeqNo) {
-                /* some CVM frames are missing, TxSeq of this frame is higher then expected */
-                /* reject, I expected p->busmail_rxseq_cvm_last + 1, resend it to me, please */
-
-                WARNINGA("CVM TxSeq %X, does not match expected value %X\n",
-                         CELLIAX_P_LOG, MsgTxSeqNo,
-                         (p->busmail_rxseq_cvm_last + 1) & 0x7);
-
-//                celliax_serial_send_ctrl_frame_CVM_BUSMAIL(p, BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_SU_FRAME | BUSMAIL_HEADER_SUID_REJ);
-
-                if (((p->busmail_rxseq_cvm_last) & 0x7) == MsgTxSeqNo) {
-
-                  WARNINGA
-                    ("It looks like our ACK to this frame was MIA :), lets ACK the frame one more time...\n",
-                     CELLIAX_P_LOG);
-
-                  /* if the frame we received informs us that other side is waiting for ACK, let's ACK it */
-                  /* even if it is unknown to us */
-                  if (p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_PF_BIT_MASK) {
-                    if (BUSMAIL_HEADER_SABM ==
-                        (p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_SABM_MASK)) {
-                      celliax_serial_send_ctrl_frame_CVM_BUSMAIL(p, (unsigned char)
-                                                                 (BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_UN_FRAME | BUSMAIL_HEADER_UNID_SABM));
-                    } else {
-                      celliax_serial_send_ctrl_frame_CVM_BUSMAIL(p, (unsigned char)
-                                                                 (BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_SU_FRAME | BUSMAIL_HEADER_SUID_RR));
-                    }
-                  }
-                }
-
-                break;
-              } else {
-                /* we expected packet with this seq no. */
-                /* CVM ACKed our frames with info frame */
-                celliax_serial_list_acknowledge_CVM_BUSMAIL(p, MsgRxSeqNo);
-
-                /* save it but limit it to 3 bits only (valid values: 0-7) */
-                p->busmail_rxseq_cvm_last = MsgTxSeqNo;
-                p->busmail_rxseq_cvm_last &= 0x7;
-
-                /* if the frame we received informs us that other side is waiting for ACK, let's ACK it */
-                /* even if it is unknown to us */
-                if (p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_PF_BIT_MASK) {
-                  if (BUSMAIL_HEADER_SABM ==
-                      (p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_SABM_MASK)) {
-                    celliax_serial_send_ctrl_frame_CVM_BUSMAIL(p, (unsigned char)
-                                                               (BUSMAIL_HEADER_CTRL_FRAME
-                                                                |
-                                                                BUSMAIL_HEADER_CTRL_UN_FRAME
-                                                                |
-                                                                BUSMAIL_HEADER_UNID_SABM));
-                  } else {
-                    celliax_serial_send_ctrl_frame_CVM_BUSMAIL(p, (unsigned char)
-                                                               (BUSMAIL_HEADER_CTRL_FRAME
-                                                                |
-                                                                BUSMAIL_HEADER_CTRL_SU_FRAME
-                                                                |
-                                                                BUSMAIL_HEADER_SUID_RR));
-                  }
-                }
-
-              }
-
-              /* frame header OK, let's see what's inside mail field */
-              MsgTaskId = p->array[BUSMAIL_OFFSET_MAIL_TASK_ID];
-              MsgProgId = p->array[BUSMAIL_OFFSET_MAIL_PROGRAM_ID];
-              MsgPrimitiveLSB = p->array[BUSMAIL_OFFSET_MAIL_PRIMITIVE_LSB];
-              MsgPrimitiveMSB = p->array[BUSMAIL_OFFSET_MAIL_PRIMITIVE_MSB];
-              MsgPrimitive = MsgPrimitiveMSB << 8 | MsgPrimitiveLSB;
-
-              if (option_debug > 1)
-                DEBUGA_CVM
-                  ("BUSMAIL_HEADER_INFO_FRAME ProgId %X, TaskId %X, Primitive %X %X\n",
-                   CELLIAX_P_LOG, MsgProgId, MsgTaskId, MsgPrimitiveMSB, MsgPrimitiveLSB);
-
-              switch (MsgPrimitive) {
-
-              case API_PP_ACCESS_RIGHTS_REJ:
-                /* FP rejected our registration... */
-                WARNINGA("API_PP_ACCESS_RIGHTS_REJ, FP rejected our registration...\n",
-                         CELLIAX_P_LOG);
-
-                p->cvm_register_state = CVM_UNREGISTERED_TO_FP;
-                p->cvm_lock_state = CVM_UNKNOWN_LOCK_STATE;
-                known = 1;
-                break;
-
-              case API_PP_ACCESS_RIGHTS_CFM:
-                /* FP accepted our registration... */
-                if (option_debug > 1)
-                  DEBUGA_CVM
-                    ("API_PP_ACCESS_RIGHTS_CFM, FP accepted our registration...\n",
-                     CELLIAX_P_LOG);
-
-                p->cvm_register_state = CVM_REGISTERED_TO_FP;
-                p->cvm_lock_state = CVM_UNKNOWN_LOCK_STATE;
-                p->cvm_handset_no = p->array[BUSMAIL_OFFSET_MAIL_PARAMS + 0];
-                p->cvm_fp_is_cvm = p->array[BUSMAIL_OFFSET_MAIL_PARAMS + 1];
-
-                if (option_debug > 1)
-                  DEBUGA_CVM
-                    ("API_PP_ACCESS_RIGHTS_CFM, FP accepted our registration, Our handset no. is %d, CVM? %X\n",
-                     CELLIAX_P_LOG, p->cvm_handset_no, p->cvm_fp_is_cvm);
-
-                known = 1;
-                break;
-
-              case API_PP_LOCKED_IND:
-                /* CVM is connected to FP */
-                if (option_debug > 1)
-                  DEBUGA_CVM("API_PP_LOCKED_IND, Connection to FP completed...\n",
-                             CELLIAX_P_LOG);
-
-                p->cvm_register_state = CVM_REGISTERED_TO_FP;
-                p->cvm_lock_state = CVM_LOCKED_TO_FP;
-                known = 1;
-                break;
-
-              case API_PP_UNLOCKED_IND:
-                /* CVM is unlocked with FP, Out of service */
-                WARNINGA
-                  ("API_PP_UNLOCKED_IND, CVM is unlocked with FP, Out of service !!!\n",
-                   CELLIAX_P_LOG);
-
-                p->cvm_lock_state = CVM_UNLOCKED_TO_FP;
-                known = 1;
-                break;
-
-              case API_PP_SETUP_ACK_IND:
-                /* Outgoing call, connection to FP established, FP is waiting for a number to dial */
-                if (option_debug > 1)
-                  DEBUGA_CVM
-                    ("API_PP_SETUP_ACK_IND, connection to FP established, FP is waiting for a numer to dial...\n",
-                     CELLIAX_P_LOG);
-
-                if (AST_STATE_DOWN == p->interface_state) {
-                  p->interface_state = AST_STATE_DIALING;
-                }
-
-                known = 1;
-                break;
-
-              case API_PP_ALERT_IND:
-                /* Outgoing call, Remote end is ringing */
-                if (option_debug > 1)
-                  DEBUGA_CVM("API_PP_ALERT_IND, remote end is ringing...\n",
-                             CELLIAX_P_LOG);
-
-                if (AST_STATE_DIALING == p->interface_state) {
-                  p->interface_state = AST_STATE_RINGING;
-                }
-
-                known = 1;
-                break;
-
-              case API_PP_CONNECT_IND:
-                /* Outgoing call, the remote end answered our call */
-                if (option_debug > 1)
-                  DEBUGA_CVM("API_PP_CONNECT_IND, our call was answered...\n",
-                             CELLIAX_P_LOG);
-
-                if (AST_STATE_RINGING == p->interface_state) {
-
-                  /* let's open audio and have a chat */
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p, CVM_PP_AUDIO_OPEN_REQ, 0,
-                                                             NULL);
-
-                  unsigned char volume = (unsigned char) p->cvm_volume_level;
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p,
-                                                             CVM_PP_AUDIO_SET_VOLUME_REQ,
-                                                             sizeof(volume), &volume);
-
-                  /* let's unmute mic and have a chat */
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p,
-                                                             CVM_PP_AUDIO_UNMUTE_MIC_REQ,
-                                                             0, NULL);
-
-                  /* let's switch to headset, because we fried normal output.... */
-/*                  unsigned char headset_on = (unsigned char) 1;
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p, CVM_PP_AUDIO_HS_PLUG_IND, sizeof(headset_on), &headset_on);
-*/
-                  p->interface_state = AST_STATE_UP;
-                  ast_setstate(p->owner, AST_STATE_RINGING);
-                  celliax_queue_control(p->owner, AST_CONTROL_ANSWER);
-                }
-
-                known = 1;
-                break;
-
-              case API_PP_REJECT_IND:
-                /* Outgoing/Incoming call, FP rejected our connection... */
-                if (option_debug > 1)
-                  DEBUGA_CVM
-                    ("API_PP_REJECT_IND, FP or ther PP rejected our connection...\n",
-                     CELLIAX_P_LOG);
-
-                if (AST_STATE_RING == p->interface_state && p->owner) {
-                  /* Attempt to answer incoming call rejected by FP or PP */
-                  if (option_debug > 1)
-                    DEBUGA_CVM("Was it PAGE_ALL CALL, that we should not answered?\n",
-                               CELLIAX_P_LOG);
-
-                  p->interface_state = AST_STATE_DOWN;
-                  celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-
-                } else if (AST_STATE_DOWN != p->interface_state && p->owner) {
-                  /* Outgoing call rejected by other PP or FP */
-                  p->interface_state = AST_STATE_BUSY;
-                  ast_setstate(p->owner, AST_STATE_BUSY);
-                  celliax_queue_control(p->owner, AST_CONTROL_BUSY);
-                }
-
-                known = 1;
-                break;
-
-              case API_PP_SIGNAL_ON_IND:
-                /* Ringback, ignore it... */
-                if (option_debug > 1)
-                  DEBUGA_CVM("API_PP_SIGNAL_ON_IND, Ringback, ignore it...\n",
-                             CELLIAX_P_LOG);
-
-                known = 1;
-                break;
-
-              case API_PP_SIGNAL_OFF_IND:
-                /* Ringback, ignore it... */
-                if (option_debug > 1)
-                  DEBUGA_CVM("API_PP_SIGNAL_OFF_IND, Ringback, ignore it...\n",
-                             CELLIAX_P_LOG);
-
-                known = 1;
-                break;
-
-              case API_PP_SETUP_IND:
-                /* Incoming call, Somebody is calling us */
-
-                if (option_debug > 1)
-                  DEBUGA_CVM("API_PP_SETUP_IND, somebody is calling us...\n",
-                             CELLIAX_P_LOG);
-
-                if (AST_STATE_DOWN == p->interface_state) {
-
-                  if (API_PP_SETUP_IND_CALL_INT ==
-                      p->array[BUSMAIL_OFFSET_MAIL_PARAMS +
-                               API_PP_SETUP_IND_CALL_TYPE_OFFSET]) {
-                    DEBUGA_CVM("INTERNAL CALL, receive it...\n", CELLIAX_P_LOG);
-
-                    p->interface_state = AST_STATE_RING;
-
-                    /* inform calling end, that we know about his call, and that we are alerting */
-                    celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_ALERT_REQ, 0,
-                                                               NULL);
-
-                    /* let's open audio before valid mac, to remove noise... */
-                    celliax_serial_send_info_frame_CVM_BUSMAIL(p,
-                                                               CVM_PP_AUDIO_OPEN_ADPCM_OFF_REQ,
-                                                               0, NULL);
-
-                  } else {
-                    DEBUGA_CVM("NOT an INTERNAL CALL, CALL TYPE %X, just ignore it...\n",
-                               CELLIAX_P_LOG,
-                               p->array[BUSMAIL_OFFSET_MAIL_PARAMS +
-                                        API_PP_SETUP_IND_CALL_TYPE_OFFSET]);
-
-                    /* inform calling end, that we know about his call, and that we are alerting OR not :) */
-                    /* probably it is needed so FP does not remove us from PP list :) */
-                    celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_ALERT_REQ, 0,
-                                                               NULL);
-                  }
-
-                } else {
-                  WARNINGA
-                    ("Ignore incoming call, Wrong interface state, current state %X\n",
-                     CELLIAX_P_LOG, p->interface_state);
-                }
-
-                known = 1;
-                break;
-
-              case API_PP_ALERT_OFF_IND:
-                /* Incoming call, We should stop alerting about incoming call... */
-                if (option_debug > 1)
-                  DEBUGA_CVM
-                    ("API_PP_ALERT_OFF_IND, Ringback, stop alerting about incoming call...\n",
-                     CELLIAX_P_LOG);
-
-                known = 1;
-                break;
-
-              case API_PP_ALERT_ON_IND:
-                /* Incoming call, We should stop alerting about incoming call... */
-                if (option_debug > 1)
-                  DEBUGA_CVM
-                    ("API_PP_ALERT_ON_IND, Ringback, start alerting about incoming call...\n",
-                     CELLIAX_P_LOG);
-/*
-                if (AST_STATE_DOWN == p->interface_state) {
-                  DEBUGA_CVM("Somebody is calling us, we see a PP_ALERT_ON_IND, receive it...\n", CELLIAX_P_LOG);
-                  p->interface_state = AST_STATE_RING;
-                }
-*/
-                known = 1;
-                break;
-
-              case API_PP_CONNECT_CFM:
-                /* Incoming call, Confirmation for request to answer incoming call... */
-                if (option_debug > 1)
-                  DEBUGA_CVM
-                    ("API_PP_CONNECT_CFM, Confirmation for request to answer incoming call...\n",
-                     CELLIAX_P_LOG);
-
-                if (AST_STATE_RING == p->interface_state && p->owner) {
-
-                  p->interface_state = AST_STATE_UP;
-                  ast_setstate(p->owner, AST_STATE_UP);
-
-                  /* let's open audio and have a chat */
-//                  celliax_serial_send_info_frame_CVM_BUSMAIL(p, CVM_PP_AUDIO_OPEN_ADPCM_OFF_REQ, 0, NULL);
-
-                  /* let's open audio and have a chat */
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p, CVM_PP_AUDIO_OPEN_REQ, 0,
-                                                             NULL);
-
-                  unsigned char volume = (unsigned char) p->cvm_volume_level;
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p,
-                                                             CVM_PP_AUDIO_SET_VOLUME_REQ,
-                                                             sizeof(volume), &volume);
-
-                  /* let's unmute mic and have a chat */
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p,
-                                                             CVM_PP_AUDIO_UNMUTE_MIC_REQ,
-                                                             0, NULL);
-
-                  /* let's switch to headset, because we fried normal output.... */
-/*                  unsigned char headset_on = (unsigned char) 1;
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p, CVM_PP_AUDIO_HS_PLUG_IND, sizeof(headset_on), &headset_on);
-*/
-                } else {
-                  WARNINGA
-                    ("Ignore connection cfm, Wrong interface state, current state %X\n",
-                     CELLIAX_P_LOG, p->interface_state);
-                }
-
-                known = 1;
-                break;
-
-              case API_PP_RELEASE_CFM:
-                /* Confirmation for request to hangup a call... */
-                if (option_debug > 1)
-                  DEBUGA_CVM
-                    ("API_PP_RELEASE_CFM, Confirmation for request to hangup a call..\n",
-                     CELLIAX_P_LOG);
-
-                if (AST_STATE_UP == p->interface_state) {
-                  /* let's close audio */
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p, CVM_PP_AUDIO_CLOSE_REQ, 0,
-                                                             NULL);
-
-                  /* let's unmute mic and have a chat */
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p, CVM_PP_AUDIO_MUTE_MIC_REQ,
-                                                             0, NULL);
-                }
-
-                p->interface_state = AST_STATE_DOWN;
-
-                known = 1;
-                break;
-
-              case API_PP_RELEASE_IND:
-                /* FP releases connection to CVM... */
-                if (option_debug > 1)
-                  DEBUGA_CVM("API_PP_RELEASE_IND, FP releases connection to CVM...\n",
-                             CELLIAX_P_LOG);
-
-                if (AST_STATE_UP == p->interface_state && p->owner) {
-                  /* let's close audio */
-                  celliax_serial_send_info_frame_CVM_BUSMAIL(p, CVM_PP_AUDIO_CLOSE_REQ, 0,
-                                                             NULL);
-                  p->interface_state = AST_STATE_DOWN;
-                  celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-
-                } else if (AST_STATE_RING == p->interface_state && p->owner) {
-                  /* workaround for PAGE ALL CALL, FIXME!!!! */
-                  if (option_debug > 1)
-                    DEBUGA_CVM("WAS IT A PAGE ALL ???...\n", CELLIAX_P_LOG);
-
-                  p->interface_state = AST_STATE_UP;
-                  usleep(100000);
-
-                  p->interface_state = AST_STATE_DOWN;
-                  celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-                }
-
-                /* we need to ACK release */
-                celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_RELEASE_RES, 0,
-                                                           NULL);
-
-                known = 1;
-                break;
-
-              case API_PP_READ_RSSI_CFM:
-                if (option_debug > 1)
-                  DEBUGA_CVM("API_PP_READ_RSSI_CFM, RSSI readout...\n", CELLIAX_P_LOG);
-
-                p->cvm_rssi = p->array[BUSMAIL_OFFSET_MAIL_PARAMS + 0];
-                int rssi_percent = p->cvm_rssi * 100 / 0x3F;
-                if (option_debug > 1)
-                  DEBUGA_CVM("RSSI is %X, %d%%...\n", CELLIAX_P_LOG, p->cvm_rssi,
-                             rssi_percent);
-
-                known = 1;
-                break;
-              default:
-                WARNINGA("UNKNOWN MsgPrimitive!!! %X\n", CELLIAX_P_LOG, MsgPrimitive);
-                break;
-              }
-
-              break;
-
-            case BUSMAIL_HEADER_CTRL_FRAME:
-              if (option_debug > 1)
-                DEBUGA_CVM("BUSMAIL_HEADER_CTRL_FRAME\n", CELLIAX_P_LOG);
-
-              switch (p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_SU_BIT_MASK) {
-              case BUSMAIL_HEADER_CTRL_SU_FRAME:
-                if (option_debug > 1)
-                  DEBUGA_CVM("BUSMAIL_HEADER_CTRL_SU_FRAME\n", CELLIAX_P_LOG);
-
-                switch (p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_SUID_MASK) {
-                case BUSMAIL_HEADER_SUID_REJ:
-                  /* CVM Reject, CVM missed one of our packets, it will be resend, do nothing */
-                  MsgRxSeqNo =
-                    ((p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_RXSEQ_MASK));
-
-                  if (option_debug > 1)
-                    DEBUGA_CVM("BUSMAIL_HEADER_SUID_REJ, RxSeq %X\n", CELLIAX_P_LOG,
-                               MsgRxSeqNo);
-
-                  /* Even that it is CVM Reject packet, it still ACKs some packets */
-                  celliax_serial_list_acknowledge_CVM_BUSMAIL(p, MsgRxSeqNo);
-
-                  known = 1;
-                  break;
-                case BUSMAIL_HEADER_SUID_RNR:
-                  /* CVM Receiver Not Ready, answer to packet that we sent, do nothing, it will be resend later */
-                  MsgRxSeqNo =
-                    ((p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_RXSEQ_MASK));
-
-                  if (option_debug > 1)
-                    DEBUGA_CVM("BUSMAIL_HEADER_SUID_RNR, RxSeq %X\n", CELLIAX_P_LOG,
-                               MsgRxSeqNo);
-
-                  known = 1;
-                  break;
-                case BUSMAIL_HEADER_SUID_RR:
-                  /* CVM ACKs our packets */
-                  MsgRxSeqNo =
-                    ((p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_RXSEQ_MASK));
-
-                  if (option_debug > 1)
-                    DEBUGA_CVM("BUSMAIL_HEADER_SUID_RR, RxSeq %X\n", CELLIAX_P_LOG,
-                               MsgRxSeqNo);
-
-                  /* CVM ACKed our frames with RR frame */
-                  celliax_serial_list_acknowledge_CVM_BUSMAIL(p, MsgRxSeqNo);
-
-                  known = 1;
-                  break;
-
-                default:
-                  WARNINGA("BUSMAIL_HEADER_SUID_UNKNOWN!!!\n", CELLIAX_P_LOG);
-                  break;
-                }
-                break;
-
-              case BUSMAIL_HEADER_CTRL_UN_FRAME:
-                if (option_debug > 1)
-                  DEBUGA_CVM("BUSMAIL_HEADER_CTRL_UN_FRAME\n", CELLIAX_P_LOG);
-
-                switch (p->array[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_UNID_MASK) {
-
-                case BUSMAIL_HEADER_UNID_SABM:
-                  if (option_debug > 1)
-                    DEBUGA_CVM("BUSMAIL_HEADER_UNID_SABM\n", CELLIAX_P_LOG);
-                  /* reset seq counters */
-                  p->busmail_txseq_celliax_last = 0xFF;
-                  p->busmail_rxseq_cvm_last = 0xFF;
-
-                  celliax_serial_lists_free_CVM_BUSMAIL(p);
-                  /* if needed, reply will be send by code at the end of switch statements */
-                  known = 1;
-                  break;
-
-                default:
-                  WARNINGA("BUSMAIL_HEADER_UNID_UNKNOWN!!!\n", CELLIAX_P_LOG);
-                  break;
-                }
-                break;
-
-              default:
-                WARNINGA("BUSMAIL_HEADER_CTRL_UNKNOWN!!!\n", CELLIAX_P_LOG);
-                break;
-              }
-              break;
-
-            default:
-              WARNINGA("BUSMAIL_HEADER_UNKNOWN!!!\n", CELLIAX_P_LOG);
-              break;
-            }
-
-          }
-
-          /* categorization of frame is ended, if it has not been recognized, whine */
-          if (!known) {
-            WARNINGA("BUSMAIL MSG UNKNOWN or REJECTED!\n", CELLIAX_P_LOG);
-          }
-        }
-        p->arraycounter++;
-      }
-    }
-    CVM_UNLOCKA(&p->controldev_lock);
-    POPPA_UNLOCKA(&p->controldev_lock);
-  }
-
-  /* oooops, select returned error, got a kill/cancel or problems with the serial file descriptor */
-  if (select_err == -1) {
-    if (errno != EINTR) {
-      ERRORA
-        ("select returned -1 on %s, marking controldev as dead, errno was: %d, error was: %s\n",
-         CELLIAX_P_LOG, p->controldevice_name, errno, strerror(errno));
-
-      p->controldev_dead = 1;
-      close(p->controldevfd);
-
-      if (p->owner)
-        celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-      return -1;
-
-    } else {
-      WARNINGA("select returned -1 on %s, errno was: %d, EINTR, error was: %s\n",
-               CELLIAX_P_LOG, p->controldevice_name, errno, strerror(errno));
-      return 0;
-    }
-  }
-  /* OK, reading done, let's browse the list of pending frames to be sent, and act on it */
-  if (celliax_serial_send_if_time_CVM_BUSMAIL(p)) {
-    ERRORA("celliax_serial_send_if_time_CVM_BUSMAIL failed!\n", CELLIAX_P_LOG);
-    return -1;
-  }
-
-  return cvm_busmail_mesg;      //FIXME breaks the convention of returning 0 on success
-}
-
-int celliax_serial_getstatus_CVM_BUSMAIL(struct celliax_pvt *p)
-{
-  int res;
-  int how_many_reads = 0;
-
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  CVM_LOKKA(&p->controldev_lock);
-
-  if (option_debug > 1)
-    DEBUGA_CVM("Sending RR CTRL frame wit PF bit set\n", CELLIAX_P_LOG);
-
-  /* this ctrl frame can be used as low level keep alive */
-  celliax_serial_send_ctrl_frame_CVM_BUSMAIL(p,
-                                             BUSMAIL_HEADER_CTRL_FRAME |
-                                             BUSMAIL_HEADER_CTRL_SU_FRAME |
-                                             BUSMAIL_HEADER_SUID_RR |
-                                             (BUSMAIL_HEADER_PF_BIT_MASK & 0xFF));
-
-  //usleep(1000);
-
-  res = celliax_serial_read_CVM_BUSMAIL(p); //we don't have no monitor neither do_controldev_thread
-
-  if (res == -1) {
-    ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-    CVM_UNLOCKA(&p->controldev_lock);
-    return -1;
-  }
-
-  while ((res & 0xF0) !=
-         (BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_SU_FRAME |
-          BUSMAIL_HEADER_SUID_RR)) {
-
-    usleep(1000);
-    res = celliax_serial_read_CVM_BUSMAIL(p);
-    how_many_reads++;
-
-    if (res == -1) {
-      ERRORA("failed celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG);
-      CVM_UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-
-    if (how_many_reads > 10) {
-      ERRORA("no expected results in %d celliax_serial_read_CVM_BUSMAIL\n", CELLIAX_P_LOG,
-             how_many_reads);
-      CVM_UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-  }
-
-  //celliax_serial_send_info_frame_CVM_BUSMAIL(p, API_PP_READ_RSSI_REQ, 0, NULL);
-
-  CVM_UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-
-  return 0;
-
-}
-
-/*!
- * \brief Write on the serial port for all the CVM_BUSMAIL functions
- * \param p celliax_pvt
- * \param len lenght of buffer2
- * \param buffer2 chars to be written
- *
- * Write on the serial port for all the CVM_BUSMAIL functions
- *
- * \return the number of chars written on the serial, 
- * that can be different from len (or negative) in case of errors.
- */
-int celliax_serial_send_CVM_BUSMAIL(struct celliax_pvt *p, int len,
-                                    unsigned char *mesg_ptr)
-{
-  int ret;
-  size_t actual = 0;
-  unsigned char *mesg_ptr2 = mesg_ptr;
-  PUSHA_UNLOCKA(&p->controldev_lock);
-  CVM_LOKKA(&p->controldev_lock);
-  do {
-    ret = write(p->controldevfd, mesg_ptr, len - actual);
-    if (ret < 0 && errno == EAGAIN)
-      continue;
-    if (ret < 0) {
-      if (actual != len)
-        ERRORA("celliax_serial_write error: %s", CELLIAX_P_LOG, strerror(errno));
-      CVM_UNLOCKA(&p->controldev_lock);
-      return -1;
-    }
-    actual += ret;
-    mesg_ptr += ret;
-    usleep(10000);
-//    usleep(p->cvm_celliax_serial_delay*1000);
-  } while (actual < len);
-
-  usleep(p->cvm_celliax_serial_delay * 1000);
-
-//  tcdrain(p->controldevfd);
-
-  CVM_UNLOCKA(&p->controldev_lock);
-  POPPA_UNLOCKA(&p->controldev_lock);
-
-  if (option_debug > 10) {
-    int i;
-    char debug_buf[1024];
-    char *debug_buf_pos;
-
-    memset(debug_buf, 0, 1024);
-    debug_buf_pos = debug_buf;
-
-    for (i = 0; i < len; i++) {
-      debug_buf_pos += sprintf(debug_buf_pos, "[%.2X] ", mesg_ptr2[i]);
-      if (debug_buf_pos > ((char *) &debug_buf + 1000))
-        break;
-    }
-    DEBUGA_CVM("%s was sent down the wire\n", CELLIAX_P_LOG, debug_buf);
-  }
-
-  return 0;
-}
-
-/*!
- * \brief Flags as acknowledged an BUSMAIL message previously sent
- * \param p celliax_pvt
- * \param seqnum identifier of the message to be acknowledged
- *
- * Called upon receiving an BUSMAIL acknoledgement message, browse the cvm_busmail_outgoing_list 
- * looking for the seqnum sent BUSMAIL message, and flags it as acknowledged.
- * (if an outgoing BUSMAIL message is not aknowledged by the cellphone in a while,
- * it will be retransmitted)
- *
- * \return 0 on error, 1 otherwise
- */
-int celliax_serial_list_acknowledge_CVM_BUSMAIL(struct celliax_pvt *p,
-                                                unsigned char AckTxSeqNo)
-{
-  struct cvm_busmail_msg *ptr = NULL;
-  struct cvm_busmail_msg *old = NULL;
-
-  unsigned char MsgTxSeqNo;
-  unsigned char MsgRxSeqNo;
-
-  ptr = p->cvm_busmail_outgoing_list;
-
-  if (ptr == NULL) {
-    ERRORA("cvm_busmail_outgoing_list is NULL ?\n", CELLIAX_P_LOG);
-    return -1;
-  }
-
-  PUSHA_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-  CVM_LOKKA(&p->cvm_busmail_outgoing_list_lock);
-/*
-  DEBUGA_CVM("PREFREE OUTGOING list:\n", CELLIAX_P_LOG);
-  celliax_serial_list_print_CVM_BUSMAIL(p, p->cvm_busmail_outgoing_list);
-*/
-  while (ptr->next != NULL)
-    ptr = ptr->next;
-
-  while (ptr) {
-
-    if ((1 == ptr->valid) && (0 == ptr->acknowledged) && (0 != ptr->sent)) {
-      MsgTxSeqNo =
-        ((ptr->busmail_msg_buffer[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_TXSEQ_MASK) >>
-         4);
-      MsgRxSeqNo =
-        ((ptr->busmail_msg_buffer[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_RXSEQ_MASK));
-
-/*
-    if (option_debug > 1) 
-      DEBUGA_CVM("OUTGOING LIST TxSeq is %X, RxSeq is %X\n", CELLIAX_P_LOG, MsgTxSeqNo, MsgRxSeqNo);
-*/
-      unsigned char TxToAck = 0;
-
-      if (0 == AckTxSeqNo) {
-        TxToAck = 7;
-      } else {
-        TxToAck = AckTxSeqNo - 1;
-      }
-
-      if (MsgTxSeqNo <= TxToAck) {
-
-        if (option_debug > 1)
-          DEBUGA_CVM("Msg with TxSeq=%X ACKed with CvmRxSeq=%X\n", CELLIAX_P_LOG,
-                     MsgTxSeqNo, AckTxSeqNo);
-
-        old = ptr;
-        old->acknowledged = 1;
-        old->valid = 0;
-        ptr = old->previous;
-
-        if (old->previous) {
-          if (old->next) {
-            old->previous->next = old->next;
-          } else {
-            old->previous->next = NULL;
-          }
-        }
-
-        if (old->next) {
-          if (old->previous) {
-            old->next->previous = old->previous;
-          } else {
-            old->next->previous = NULL;
-          }
-        }
-
-        if ((NULL == old->next) && (NULL == old->previous)) {
-          if (option_debug > 1) {
-            DEBUGA_CVM("FREEING LAST\n", CELLIAX_P_LOG);
-          }
-
-          p->cvm_busmail_outgoing_list = NULL;
-          p->cvm_busmail_outgoing_list = celliax_serial_list_init_CVM_BUSMAIL(p);
-        }
-
-/*
-      if (option_debug > 1)
-        DEBUGA_CVM("FREEING TxSeq is %X, RxSeq is %X\n", CELLIAX_P_LOG, MsgTxSeqNo, MsgRxSeqNo);
-*/
-
-        free(old);
-
-      } else {
-        ptr = ptr->previous;
-      }
-
-    } else {
-      ptr = ptr->previous;
-    }
-  }
-
-/*
-  DEBUGA_CVM("POSTFREE OUTGOING list:\n", CELLIAX_P_LOG);
-  celliax_serial_list_print_CVM_BUSMAIL(p, p->cvm_busmail_outgoing_list);
-*/
-
-  CVM_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-  POPPA_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-  return 0;
-}
-
-/*!
- * \brief Sends an FBUS2 message or resends it if it was not acknowledged
- * \param p celliax_pvt
- *
- * Called by celliax_serial_read_CVM_BUSMAIL, browse the fbus2_outgoing_list looking for FBUS2 messages to be sent, 
- * or for FBUS2 messages previously sent but not yet acknoledged.
- * (if an outgoing FBUS2 message is not aknowledged by the cellphone in a while,
- * it will be retransmitted)
- *
- * \return 0 on error, 1 otherwise
- */
-int celliax_serial_send_if_time_CVM_BUSMAIL(struct celliax_pvt *p)
-{
-  struct cvm_busmail_msg *ptr;
-  struct timeval tv;
-  struct timezone tz;
-
-  gettimeofday(&tv, &tz);
-  ptr = p->cvm_busmail_outgoing_list;
-
-  if (ptr == NULL) {
-/*    ERRORA("cvm_busmail_outgoing_list is NULL ?\n", CELLIAX_P_LOG); */
-    WARNINGA("cvm_busmail_outgoing_list is NULL, nothing to send...\n", CELLIAX_P_LOG);
-
-/*    return -1; */
-    return 0;
-
-  }
-
-  while (ptr->next != NULL) {
-    WARNINGA("cvm_busmail_outgoing_list->next is not null ?\n", CELLIAX_P_LOG);
-    ptr = ptr->next;            //FIXME what to do?
-  }
-
-  while (ptr->sent == 0 && ptr->acknowledged == 0) {
-    if (ptr->previous != NULL) {
-      ptr = ptr->previous;
-    } else
-      break;
-  }
-
-  while (ptr->sent == 1 && ptr->acknowledged == 0) {
-    if (ptr->previous != NULL) {
-      ptr = ptr->previous;
-    } else
-      break;
-  }
-
-  if (ptr->sent == 1 && ptr->acknowledged == 1) {
-    if (ptr->next != NULL) {
-      ptr = ptr->next;
-    }
-  }
-
-  if (ptr->sent == 1 && ptr->acknowledged == 0 && ptr->valid == 1) {
-    if ((tv.tv_sec * 1000 + tv.tv_usec / 1000) >
-        ((ptr->tv_sec * 1000 + ptr->tv_usec / 1000) + 1000)) {
-
-      PUSHA_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-      CVM_LOKKA(&p->cvm_busmail_outgoing_list_lock);
-
-      if (ptr->sent == 1 && ptr->acknowledged == 0 && ptr->valid == 1) {    //retest, maybe has been changed?
-        if ((tv.tv_sec * 1000 + tv.tv_usec / 1000) > ((ptr->tv_sec * 1000 + ptr->tv_usec / 1000) + 1000)) { //retest, maybe has been changed?
-
-          if (option_debug > 1)
-            DEBUGA_CVM("RESEND TxSeq=%X, passed %ld ms, sent %d times\n", CELLIAX_P_LOG,
-                       ptr->txseqno,
-                       ((tv.tv_sec * 1000 + tv.tv_usec / 1000) -
-                        (ptr->tv_sec * 1000 + ptr->tv_usec / 1000)), ptr->how_many_sent);
-
-          if (ptr->how_many_sent > 9) {
-            ERRORA("RESEND TxSeq=%X, passed %ld ms, sent %d times\n", CELLIAX_P_LOG,
-                   ptr->txseqno,
-                   ((tv.tv_sec * 1000 + tv.tv_usec / 1000) -
-                    (ptr->tv_sec * 1000 + ptr->tv_usec / 1000)), ptr->how_many_sent);
-
-            CVM_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-            return -1;
-          }
-
-          celliax_serial_send_CVM_BUSMAIL(p, ptr->busmail_msg_len,
-                                          ptr->busmail_msg_buffer);
-
-          ptr->tv_sec = tv.tv_sec;
-          ptr->tv_usec = tv.tv_usec;
-          ptr->sent = 1;
-          ptr->how_many_sent++;
-/*
-          if (option_debug > 1) {
-            DEBUGA_CVM("OUTGOING list:\n", CELLIAX_P_LOG);
-            celliax_serial_list_print_CVM_BUSMAIL(p, p->cvm_busmail_outgoing_list);
-            DEBUGA_CVM("OUTGOING list END\n", CELLIAX_P_LOG);
-          }
-*/
-        }
-      }
-
-      CVM_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-      POPPA_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-    }
-  }
-
-  if (ptr->sent == 0 && ptr->acknowledged == 0 && ptr->valid == 1) {
-
-    PUSHA_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-    CVM_LOKKA(&p->cvm_busmail_outgoing_list_lock);
-
-    if (ptr->sent == 0 && ptr->acknowledged == 0 && ptr->valid == 1) {  //retest, maybe has been changed?
-
-      if (option_debug > 1)
-        DEBUGA_CVM("SENDING 1st TIME TxSeq=%X\n", CELLIAX_P_LOG, ptr->txseqno);
-
-      celliax_serial_send_CVM_BUSMAIL(p, ptr->busmail_msg_len, ptr->busmail_msg_buffer);
-
-      ptr->tv_sec = tv.tv_sec;
-      ptr->tv_usec = tv.tv_usec;
-      ptr->sent = 1;
-      ptr->how_many_sent++;
-/*
-      if (option_debug > 1) {
-        DEBUGA_CVM("OUTGOING list:\n", CELLIAX_P_LOG);
-        celliax_serial_list_print_CVM_BUSMAIL(p, p->cvm_busmail_outgoing_list);
-        DEBUGA_CVM("OUTGOING list END\n", CELLIAX_P_LOG);	
-      }
-*/
-    }
-
-    CVM_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-    POPPA_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-
-  }
-  return 0;
-}
-
-int celliax_serial_write_CVM_BUSMAIL(struct celliax_pvt *p,
-                                     struct cvm_busmail_frame *busmail_frame)
-{
-  unsigned char buffer2[BUSMAIL_MAX_FRAME_LENGTH];
-  int i = 0;
-  int len = 0;
-  unsigned int busmail_len_total = 0;
-
-  busmail_frame->busmail_sof = BUSMAIL_SOF;
-  busmail_frame->busmail_crc = 0;
-
-/* because of Rx Tx SEQ HEADER fields problem, update when these fields are filled with correct data
-  busmail_frame->busmail_crc = (unsigned char)(busmail_frame->busmail_header + busmail_frame->busmail_crc);
-*/
-
-  buffer2[BUSMAIL_OFFSET_SOF] = busmail_frame->busmail_sof;
-  buffer2[BUSMAIL_OFFSET_HEADER] = busmail_frame->busmail_header;
-
-  if ((buffer2[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_IC_BIT_MASK) ==
-      BUSMAIL_HEADER_INFO_FRAME) {
-    len =
-      BUSMAIL_OFFSET_MAIL_PARAMS + busmail_frame->busmail_mail_params_buffer_len +
-      sizeof(busmail_frame->busmail_crc);
-    busmail_len_total =
-      busmail_frame->busmail_mail_params_buffer_len +
-      sizeof(busmail_frame->busmail_header)
-      + sizeof(busmail_frame->busmail_mail_program_id) +
-      sizeof(busmail_frame->busmail_mail_task_id) + 2;
-
-    if (option_debug > 1)
-      DEBUGA_CVM("INFO frame to send\n", CELLIAX_P_LOG);
-
-    buffer2[BUSMAIL_OFFSET_MAIL_PROGRAM_ID] = busmail_frame->busmail_mail_program_id;
-    buffer2[BUSMAIL_OFFSET_MAIL_TASK_ID] = busmail_frame->busmail_mail_task_id;
-    buffer2[BUSMAIL_OFFSET_MAIL_PRIMITIVE_LSB] =
-      busmail_frame->busmail_mail_primitive[BUSMAIL_MAIL_PRIMITIVE_LSB];
-    buffer2[BUSMAIL_OFFSET_MAIL_PRIMITIVE_MSB] =
-      busmail_frame->busmail_mail_primitive[BUSMAIL_MAIL_PRIMITIVE_MSB];
-
-    if (busmail_frame->busmail_mail_params_buffer_len) {
-      memcpy(buffer2 + BUSMAIL_OFFSET_MAIL_PARAMS,
-             busmail_frame->busmail_mail_params_buffer,
-             busmail_frame->busmail_mail_params_buffer_len);
-    }
-
-    for (i = 0; i < busmail_frame->busmail_mail_params_buffer_len; i++) {
-      busmail_frame->busmail_crc =
-        (unsigned char) (busmail_frame->busmail_mail_params_buffer[i] +
-                         busmail_frame->busmail_crc);
-    }
-
-    busmail_frame->busmail_crc += busmail_frame->busmail_mail_program_id;
-    busmail_frame->busmail_crc += busmail_frame->busmail_mail_task_id;
-    busmail_frame->busmail_crc +=
-      busmail_frame->busmail_mail_primitive[BUSMAIL_MAIL_PRIMITIVE_LSB];
-    busmail_frame->busmail_crc +=
-      busmail_frame->busmail_mail_primitive[BUSMAIL_MAIL_PRIMITIVE_MSB];
-  } else {
-    busmail_len_total = sizeof(busmail_frame->busmail_header);
-    len = BUSMAIL_OFFSET_MAIL + sizeof(busmail_frame->busmail_crc);
-
-    if (option_debug > 1)
-      DEBUGA_CVM("CTRL frame to send\n", CELLIAX_P_LOG);
-  }
-
-/*
-  DEBUGA_CVM("Its len=%d\n", CELLIAX_P_LOG, len);      
-*/
-
-  busmail_frame->busmail_len[BUSMAIL_LEN_LSB] =
-    (unsigned char) (busmail_len_total & 0xFF);
-  busmail_frame->busmail_len[BUSMAIL_LEN_MSB] = (unsigned char) (busmail_len_total >> 8);
-  buffer2[BUSMAIL_OFFSET_LEN_MSB] = busmail_frame->busmail_len[BUSMAIL_LEN_MSB];
-  buffer2[BUSMAIL_OFFSET_LEN_LSB] = busmail_frame->busmail_len[BUSMAIL_LEN_LSB];
-
-/*
-  buffer2[len-1] = busmail_frame->busmail_crc;
-*/
-  buffer2[len - 1] = 0xFF;
-
-  if ((buffer2[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_IC_BIT_MASK) ==
-      BUSMAIL_HEADER_INFO_FRAME) {
-    /* if it is INFO frame, queue it */
-
-    /* update TxSeq and RxSeq bits */
-    /* clear TxSeq and RxSeq bits */
-    buffer2[BUSMAIL_OFFSET_HEADER] &=
-      ~(BUSMAIL_HEADER_RXSEQ_MASK | BUSMAIL_HEADER_TXSEQ_MASK);
-
-    buffer2[BUSMAIL_OFFSET_HEADER] |=
-      (p->busmail_rxseq_cvm_last + 1) & BUSMAIL_HEADER_RXSEQ_MASK;
-
-    p->busmail_txseq_celliax_last++;
-    p->busmail_txseq_celliax_last &= 0x07;
-
-    buffer2[BUSMAIL_OFFSET_HEADER] |=
-      ((p->busmail_txseq_celliax_last) << 4) & BUSMAIL_HEADER_TXSEQ_MASK;
-
-    /* update CRC */
-    busmail_frame->busmail_crc += buffer2[BUSMAIL_OFFSET_HEADER];
-    buffer2[len - 1] = busmail_frame->busmail_crc;
-
-    p->cvm_busmail_outgoing_list = celliax_serial_list_init_CVM_BUSMAIL(p);
-    p->cvm_busmail_outgoing_list->busmail_msg_len = len;
-
-    for (i = 0; i < len; i++) {
-      p->cvm_busmail_outgoing_list->busmail_msg_buffer[i] = buffer2[i];
-    }
-
-    if (option_debug > 10) {
-      char debug_buf[1024];
-      char *debug_buf_pos;
-
-      memset(debug_buf, 0, 1024);
-      debug_buf_pos = debug_buf;
-
-      for (i = 0; i < len; i++) {
-        debug_buf_pos += sprintf(debug_buf_pos, "[%.2X] ", buffer2[i]);
-        if (debug_buf_pos > (char *) (&debug_buf + 1000))
-          break;
-      }
-
-      if (option_debug > 1)
-        DEBUGA_CVM("INFO: %s was prepared to send\n", CELLIAX_P_LOG, debug_buf);
-    }
-
-    if (option_debug > 1) {
-      DEBUGA_CVM("OUTGOING INFO Frame TxSeq is %X, RxSeq is %X\n", CELLIAX_P_LOG,
-                 (buffer2[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_TXSEQ_MASK) >> 4,
-                 buffer2[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_RXSEQ_MASK);
-/*
-      DEBUGA_CVM("OUTGOING list:\n", CELLIAX_P_LOG);
-      celliax_serial_list_print_CVM_BUSMAIL(p, p->cvm_busmail_outgoing_list);
-      DEBUGA_CVM("OUTGOING list END\n", CELLIAX_P_LOG); */
-    }
-    p->cvm_busmail_outgoing_list->txseqno =
-      (unsigned char) (buffer2[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_TXSEQ_MASK) >> 4;
-    p->cvm_busmail_outgoing_list->valid = 1;    /* ready to send (?) */
-
-  } else {
-    /* if it is CTRL frame, send it straight to the wire */
-    if (BUSMAIL_HEADER_SABM !=
-        (buffer2[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_SABM_MASK)) {
-      /*SABM ctrl frames have no RxSeq bits */
-
-      buffer2[BUSMAIL_OFFSET_HEADER] &= ~BUSMAIL_HEADER_RXSEQ_MASK;
-
-      if (BUSMAIL_HEADER_REJ ==
-          (buffer2[BUSMAIL_OFFSET_HEADER] & BUSMAIL_HEADER_REJ_MASK)) {
-
-        if (option_debug > 1)
-          DEBUGA_CVM("CTRL REJ frame...\n", CELLIAX_P_LOG);
-
-        if (0xFF != p->busmail_rxseq_cvm_last) {
-          buffer2[BUSMAIL_OFFSET_HEADER] |=
-            (p->busmail_rxseq_cvm_last + 1) & BUSMAIL_HEADER_RXSEQ_MASK;
-        } else {
-          if (option_debug > 1)
-            DEBUGA_CVM
-              ("Skipping sending REJ, because we just cleared RxSeq counter, and probably it was a packet that is invalid now...\n",
-               CELLIAX_P_LOG);
-          return 0;
-        }
-
-      } else {
-        buffer2[BUSMAIL_OFFSET_HEADER] |=
-          (p->busmail_rxseq_cvm_last + 1) & BUSMAIL_HEADER_RXSEQ_MASK;
-      }
-    }
-
-    /* update CRC */
-    busmail_frame->busmail_crc += buffer2[BUSMAIL_OFFSET_HEADER];
-    buffer2[len - 1] = busmail_frame->busmail_crc;
-
-    if (option_debug > 10) {
-      char debug_buf[1024];
-      char *debug_buf_pos;
-
-      memset(debug_buf, 0, 1024);
-      debug_buf_pos = debug_buf;
-
-      for (i = 0; i < len; i++) {
-        debug_buf_pos += sprintf(debug_buf_pos, "[%.2X] ", buffer2[i]);
-        if (debug_buf_pos > (char *) (&debug_buf + 1000))
-          break;
-      }
-
-      if (option_debug > 1)
-        DEBUGA_CVM("CTRL: %s was prepared to send\n", CELLIAX_P_LOG, debug_buf);
-    }
-//    usleep(100);
-    celliax_serial_send_CVM_BUSMAIL(p, len, buffer2);
-  }
-
-  return 0;
-}
-
-int celliax_serial_send_ctrl_frame_CVM_BUSMAIL(struct celliax_pvt *p,
-                                               unsigned char FrameType)
-{
-  /*FrameType parameter is really a busmail header with info neeeded to tell the frame type to send */
-  struct cvm_busmail_frame busmail_frame;
-
-  switch (FrameType & 0xF0) {
-    /* only higher nibble is important for us, do not take PF bit into considration */
-
-  case BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_SU_FRAME | BUSMAIL_HEADER_SUID_RR:
-  case BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_SU_FRAME | BUSMAIL_HEADER_SUID_REJ:
-  case BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_SU_FRAME | BUSMAIL_HEADER_SUID_RNR:
-  case BUSMAIL_HEADER_CTRL_FRAME | BUSMAIL_HEADER_CTRL_UN_FRAME | BUSMAIL_HEADER_UNID_SABM:
-
-    busmail_frame.busmail_header =
-      (FrameType & 0xF8);
-
-    break;
-
-  default:
-    WARNINGA("UNKNOWN CTRL TYPE specified, sending nothing!!!\n", CELLIAX_P_LOG);
-    return -1;
-    break;
-  }
-
-  busmail_frame.busmail_mail_params_buffer_len = 0;
-
-  /* Sending to CVM */
-  return celliax_serial_write_CVM_BUSMAIL(p, &busmail_frame);
-}
-
-int celliax_serial_send_info_frame_CVM_BUSMAIL(struct celliax_pvt *p, int FrameType,
-                                               unsigned char ParamsLen,
-                                               unsigned char *Params)
-{
-  /*FrameType parameter is really a Primitive ID */
-  struct cvm_busmail_frame busmail_frame;
-  int i = 0;
-  busmail_frame.busmail_header =
-    (BUSMAIL_HEADER_PF_BIT_MASK & 0xFF) | BUSMAIL_HEADER_INFO_FRAME;
-
-  busmail_frame.busmail_mail_primitive[BUSMAIL_MAIL_PRIMITIVE_LSB] = FrameType & 0xFF;
-  busmail_frame.busmail_mail_primitive[BUSMAIL_MAIL_PRIMITIVE_MSB] =
-    (FrameType >> 8) & 0xFF;
-
-  busmail_frame.busmail_mail_program_id = BUSMAIL_MAIL_PROGRAM_ID;
-  busmail_frame.busmail_mail_task_id = BUSMAIL_MAIL_TASK_ID;
-
-  for (i = 0; i < ParamsLen; i++) {
-    busmail_frame.busmail_mail_params_buffer[i] = Params[i];
-  }
-
-  busmail_frame.busmail_mail_params_buffer_len = ParamsLen;
-
-  /* Sending to CVM */
-  return celliax_serial_write_CVM_BUSMAIL(p, &busmail_frame);
-}
-
-int celliax_serial_lists_free_CVM_BUSMAIL(struct celliax_pvt *p)
-{
-  struct cvm_busmail_msg *ptr, *prev;
-/*
-  if (option_debug > 1) {
-    DEBUGA_CVM("START FREEING OUTGOING\n", CELLIAX_P_LOG);
-    DEBUGA_CVM("OUTGOING list:\n", CELLIAX_P_LOG);
-    celliax_serial_list_print_CVM_BUSMAIL(p, p->cvm_busmail_outgoing_list);
-    DEBUGA_CVM("OUTGOING list END\n", CELLIAX_P_LOG);
-  }
-*/
-  ptr = p->cvm_busmail_outgoing_list;
-
-  if (ptr) {
-    while (ptr->next != NULL)
-      ptr = ptr->next;
-
-    while (ptr->previous != NULL) {
-
-      if (option_debug > 1)
-        DEBUGA_CVM("FREED \n", CELLIAX_P_LOG);
-
-      prev = ptr->previous;
-      free(ptr);
-      ptr = prev;
-    }
-
-    free(ptr);
-  }
-
-  if (option_debug > 1)
-    DEBUGA_CVM("LAST FREED \n", CELLIAX_P_LOG);
-
-  p->cvm_busmail_outgoing_list = NULL;
-  p->cvm_busmail_outgoing_list = celliax_serial_list_init_CVM_BUSMAIL(p);
-
-  if (option_debug > 1) {
-    DEBUGA_CVM("OUTGOING list:\n", CELLIAX_P_LOG);
-    celliax_serial_list_print_CVM_BUSMAIL(p, p->cvm_busmail_outgoing_list);
-    DEBUGA_CVM("OUTGOING list END\n", CELLIAX_P_LOG);
-    DEBUGA_CVM("STARTING FREE INGOING\n", CELLIAX_P_LOG);
-  }
-
-  return 0;
-}
-
-struct cvm_busmail_msg *celliax_serial_list_init_CVM_BUSMAIL(struct celliax_pvt *p)
-{
-  struct cvm_busmail_msg *list;
-  list = p->cvm_busmail_outgoing_list;
-
-  PUSHA_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-  CVM_LOKKA(&p->cvm_busmail_outgoing_list_lock);
-
-  if (list == NULL) {
-    list = malloc(sizeof(*(list)));
-    list->valid = 0;
-    list->busmail_msg_len = 0;
-    list->acknowledged = 0;
-    list->how_many_sent = 0;
-    list->sent = 0;
-    list->tv_sec = 0;
-    list->tv_usec = 0;
-    list->next = NULL;
-    list->previous = NULL;
-  }
-
-  if (list->valid != 0) {
-    struct cvm_busmail_msg *new;
-    new = malloc(sizeof(*new));
-    new->valid = 0;
-    new->busmail_msg_len = 0;
-    new->acknowledged = 0;
-    new->how_many_sent = 0;
-    new->sent = 0;
-    new->tv_sec = 0;
-    new->tv_usec = 0;
-    new->next = NULL;
-    new->previous = list;
-    list->next = new;
-    list = new;
-  }
-
-  CVM_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-  POPPA_UNLOCKA(&p->cvm_busmail_outgoing_list_lock);
-
-  return list;
-}
-
-int celliax_serial_list_print_CVM_BUSMAIL(struct celliax_pvt *p,
-                                          struct cvm_busmail_msg *list)
-{
-  struct cvm_busmail_msg *ptr;
-  ptr = list;
-
-  if (ptr) {
-    while (ptr->next != NULL)
-      ptr = ptr->next;
-
-    while (ptr) {
-
-      if (option_debug > 3)
-        DEBUGA_CVM
-          ("PTR msg is: %d, seqnum is %.2X, tv_sec is %d, tv_usec is %d, acknowledged is: %d,"
-           " sent is:%d, how_many_sent is: %d\n", CELLIAX_P_LOG, ptr->valid,
-           /*ptr->seqnum */ 44,
-           ptr->tv_sec, ptr->tv_usec, ptr->acknowledged, ptr->sent, ptr->how_many_sent);
-
-      ptr = ptr->previous;
-    }
-  }
-
-  return 0;
-}
-
-#endif /* CELLIAX_CVM */
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_libcsv.c b/src/mod/endpoints/mod_gsmopen/asterisk/celliax_libcsv.c
deleted file mode 100644
index 6b5dc3fe4b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_libcsv.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
-libcsv - parse and write csv data
-Copyright (C) 2007  Robert Gamble
-
-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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#if ___STDC_VERSION__ >= 199901L
-#  include <stdint.h>
-#else
-#  define SIZE_MAX ((size_t)-1) /* C89 doesn't have stdint.h or SIZE_MAX */
-#endif
-
-#include "celliax_libcsv.h"
-
-#define VERSION "1.0.0"
-
-#define ROW_NOT_BEGUN           0
-#define FIELD_NOT_BEGUN         1
-#define FIELD_BEGUN             2
-#define FIELD_MIGHT_HAVE_ENDED  3
-
-/*
-  Explanation of states
-  ROW_NOT_BEGUN    There have not been any fields encountered for this row
-  FIELD_NOT_BEGUN  There have been fields but we are currently not in one
-  FIELD_BEGUN      We are in a field
-  FIELD_MIGHT_HAVE_ENDED
-                   We encountered a double quote inside a quoted field, the
-                   field is either ended or the quote is literal
-*/
-
-#define MEM_BLK_SIZE 128
-
-#define SUBMIT_FIELD(p) \
-  do { \
-   if (!(p)->quoted) \
-     (p)->entry_pos -= (p)->spaces; \
-   if (cb1) \
-     cb1(p->entry_buf, (p)->entry_pos, data); \
-   (p)->pstate = FIELD_NOT_BEGUN; \
-   (p)->entry_pos = (p)->quoted = (p)->spaces = 0; \
- } while (0)
-
-#define SUBMIT_ROW(p, c) \
-  do { \
-    if (cb2) \
-      cb2(c, data); \
-    (p)->pstate = ROW_NOT_BEGUN; \
-    (p)->entry_pos = (p)->quoted = (p)->spaces = 0; \
-  } while (0)
-
-#define SUBMIT_CHAR(p, c) ((p)->entry_buf[(p)->entry_pos++] = (c))
-
-static char *csv_errors[] = {"success",
-                             "error parsing data while strict checking enabled",
-                             "memory exhausted while increasing buffer size",
-                             "data size too large",
-                             "invalid status code"};
-
-int
-csv_error(struct csv_parser *p)
-{
-  return p->status;
-}
-
-char *
-csv_strerror(int status)
-{
-  if (status >= CSV_EINVALID || status < 0)
-    return csv_errors[CSV_EINVALID];
-  else
-    return csv_errors[status];
-}
-
-int
-csv_opts(struct csv_parser *p, unsigned char options)
-{
-  if (p == NULL)
-    return -1;
-
-  p->options = options;
-  return 0;
-}
-
-int
-csv_init(struct csv_parser **p, unsigned char options)
-{
-  /* Initialize a csv_parser object returns 0 on success, -1 on error */
-  if (p == NULL)
-    return -1;
-
-  if ((*p = malloc(sizeof(struct csv_parser))) == NULL)
-    return -1;
-
-  if ( ((*p)->entry_buf = malloc(MEM_BLK_SIZE)) == NULL ) {
-    free(*p);
-    return -1;
-  }
-  (*p)->pstate = ROW_NOT_BEGUN;
-  (*p)->quoted = 0;
-  (*p)->spaces = 0;
-  (*p)->entry_pos = 0;
-  (*p)->entry_size = MEM_BLK_SIZE;
-  (*p)->status = 0;
-  (*p)->options = options;
-
-  return 0;
-}
-
-void
-csv_free(struct csv_parser *p)
-{
-  /* Free the entry_buffer and the csv_parser object */
-  if (p == NULL)
-    return;
-
-  if (p->entry_buf)
-    free(p->entry_buf);
-
-  free(p);
-  return;
-}
-
-int
-csv_fini(struct csv_parser *p, void (*cb1)(char *, size_t, void *), void (*cb2)(char c, void *), void *data)
-{
-  /* Finalize parsing.  Needed, for example, when file does not end in a newline */
-  if (p == NULL)
-    return -1;
-
-  switch (p->pstate) {
-    case FIELD_MIGHT_HAVE_ENDED:
-      p->entry_pos -= p->spaces + 1;  /* get rid of spaces and original quote */
-    case FIELD_NOT_BEGUN:
-    case FIELD_BEGUN:
-      SUBMIT_FIELD(p);
-      SUBMIT_ROW(p, 0);
-    case ROW_NOT_BEGUN: /* Already ended properly */
-      ;
-  }
-
-  p->spaces = p->quoted = p->entry_pos = p->status = 0;
-  p->pstate = ROW_NOT_BEGUN;
-
-  return 0;
-}
-  
-size_t
-csv_parse(struct csv_parser *p, const char *s, size_t len, void (*cb1)(char *, size_t, void *), void (*cb2)(char c, void *), void *data)
-{
-  char c;  /* The character we are currently processing */
-  size_t pos = 0;  /* The number of characters we have processed in this call */
-
-  while (pos < len) {
-    /* Check memory usage */
-    if (p->entry_pos == p->entry_size) {
-      size_t to_add = MEM_BLK_SIZE;
-      void *vp;
-      while ( p->entry_size >= SIZE_MAX - to_add )
-        to_add /= 2;
-      if (!to_add) {
-        p->status = CSV_ETOOBIG;
-        return pos;
-      }
-      while ((vp = realloc(p->entry_buf, p->entry_size + to_add)) == NULL) {
-        to_add /= 2;
-        if (!to_add) {
-          p->status = CSV_ENOMEM;
-          return pos;
-        }
-      }
-      p->entry_buf = vp;
-      p->entry_size += to_add;
-    }
-
-    c = s[pos++];
-    switch (p->pstate) {
-      case ROW_NOT_BEGUN:
-      case FIELD_NOT_BEGUN:
-        if (c == CSV_SPACE || c == CSV_TAB) { /* Space or Tab */
-          continue;
-        } else if (c == CSV_CR || c == CSV_LF) { /* Carriage Return or Line Feed */
-          if (p->pstate == FIELD_NOT_BEGUN) {
-            SUBMIT_FIELD(p);
-            SUBMIT_ROW(p, c); 
-          } else {  /* ROW_NOT_BEGUN */
-            /* Don't submit empty rows by default */
-            if (p->options & CSV_REPALL_NL) {
-              SUBMIT_ROW(p, c);
-            }
-          }
-          continue;
-        } else if ( (!(p->options & CSV_USE_SEMICOLON_SEPARATOR) && (c == CSV_COMMA)) || ((p->options & CSV_USE_SEMICOLON_SEPARATOR) && (c == CSV_SEMICOLON)) ) { /* Comma or SemiColon */
-          SUBMIT_FIELD(p);
-          break;
-        } else if (c == CSV_QUOTE) { /* Quote */
-          p->pstate = FIELD_BEGUN;
-          p->quoted = 1;
-        } else {               /* Anything else */
-          p->pstate = FIELD_BEGUN;
-          p->quoted = 0;
-          SUBMIT_CHAR(p, c);
-        }
-        break;
-      case FIELD_BEGUN:
-        if (c == CSV_QUOTE) {         /* Quote */
-          if (p->quoted) {
-            SUBMIT_CHAR(p, c);
-            p->pstate = FIELD_MIGHT_HAVE_ENDED;
-          } else {
-            /* STRICT ERROR - double quote inside non-quoted field */
-            if (p->options & CSV_STRICT) {
-              p->status = CSV_EPARSE;
-              return pos-1;
-            }
-            SUBMIT_CHAR(p, c);
-            p->spaces = 0;
-          }
-        } else if ((!(p->options & CSV_USE_SEMICOLON_SEPARATOR) && (c == CSV_COMMA)) || ((p->options & CSV_USE_SEMICOLON_SEPARATOR) && (c == CSV_SEMICOLON))) {  /* Comma or SemiColon */
-          if (p->quoted) {
-            SUBMIT_CHAR(p, c);
-          } else {
-            SUBMIT_FIELD(p);
-          }
-        } else if (c == CSV_CR || c == CSV_LF) {  /* Carriage Return or Line Feed */
-          if (!p->quoted) {
-            SUBMIT_FIELD(p);
-            SUBMIT_ROW(p, c);
-          } else {
-            SUBMIT_CHAR(p, c);
-          }
-        } else if (!p->quoted && (c == CSV_SPACE || c == CSV_TAB)) { /* Tab or space for non-quoted field */
-            SUBMIT_CHAR(p, c);
-            p->spaces++;
-        } else {  /* Anything else */
-          SUBMIT_CHAR(p, c);
-          p->spaces = 0;
-        }
-        break;
-      case FIELD_MIGHT_HAVE_ENDED:
-        /* This only happens when a quote character is encountered in a quoted field */
-        if ((!(p->options & CSV_USE_SEMICOLON_SEPARATOR) && (c == CSV_COMMA)) || ((p->options & CSV_USE_SEMICOLON_SEPARATOR) && (c == CSV_SEMICOLON))) {  /* Comma or SemiColon */
-          p->entry_pos -= p->spaces + 1;  /* get rid of spaces and original quote */
-          SUBMIT_FIELD(p);
-        } else if (c == CSV_CR || c == CSV_LF) {  /* Carriage Return or Line Feed */
-          p->entry_pos -= p->spaces + 1;  /* get rid of spaces and original quote */
-          SUBMIT_FIELD(p);
-          SUBMIT_ROW(p, c);
-        } else if (c == CSV_SPACE || c == CSV_TAB) {  /* Space or Tab */
-          SUBMIT_CHAR(p, c);
-          p->spaces++;
-        } else if (c == CSV_QUOTE) {  /* Quote */
-          if (p->spaces) {
-            /* STRICT ERROR - unescaped double quote */
-            if (p->options & CSV_STRICT) {
-              p->status = CSV_EPARSE;
-              return pos-1;
-            }
-            p->spaces = 0;
-            SUBMIT_CHAR(p, c);
-          } else {
-            /* Two quotes in a row */
-            p->pstate = FIELD_BEGUN;
-          }
-        } else {  /* Anything else */
-          /* STRICT ERROR - unescaped double quote */
-          if (p->options & CSV_STRICT) {
-            p->status = CSV_EPARSE;
-            return pos-1;
-          }
-          p->pstate = FIELD_BEGUN;
-          p->spaces = 0;
-          SUBMIT_CHAR(p, c);
-        }
-        break;
-     default:
-       break;
-    }
-  }
-  return pos;
-}
-
-size_t
-csv_write (char *dest, size_t dest_size, const char *src, size_t src_size)
-{
-  size_t chars = 0;
-
-  if (src == NULL)
-    return 0;
-
-  if (dest == NULL)
-    dest_size = 0;
-
-  if (dest_size > 0)
-    *dest++ = '"';
-  chars++;
-
-  while (src_size) {
-    if (*src == '"') {
-      if (dest_size > chars)
-        *dest++ = '"';
-      if (chars < SIZE_MAX) chars++;
-    }
-    if (dest_size > chars)
-      *dest++ = *src;
-    if (chars < SIZE_MAX) chars++;
-    src_size--;
-    src++;
-  }
-
-  if (dest_size > chars)
-    *dest = '"';
-  if (chars < SIZE_MAX) chars++;
-
-  return chars;
-}
-
-int
-csv_fwrite (FILE *fp, const char *src, size_t src_size)
-{
-  if (fp == NULL || src == NULL)
-    return 0;
-
-  if (fputc('"', fp) == EOF)
-    return EOF;
-
-  while (src_size) {
-    if (*src == '"') {
-      if (fputc('"', fp) == EOF)
-        return EOF;
-    }
-    if (fputc(*src, fp) == EOF)
-      return EOF;
-    src_size--;
-    src++;
-  }
-
-  if (fputc('"', fp) == EOF) {
-    return EOF;
-  }
-
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_libcsv.h b/src/mod/endpoints/mod_gsmopen/asterisk/celliax_libcsv.h
deleted file mode 100644
index 2a2e4465a9..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_libcsv.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef LIBCSV_H__
-#define LIBCSV_H__
-#include <stdlib.h>
-#include <stdio.h>
-
-/* Error Codes */
-#define CSV_SUCCESS 0
-#define CSV_EPARSE 1   /* Parse error in strict mode */
-#define CSV_ENOMEM 2   /* Out of memory while increasing buffer size */
-#define CSV_ETOOBIG 3  /* Buffer larger than SIZE_MAX needed */
-#define CSV_EINVALID 4 /* Invalid code, should never receive this from csv_error */
-
-/* parser options */
-#define CSV_STRICT 1    /* enable strict mode */
-#define CSV_REPALL_NL 2 /* report all unquoted carriage returns and linefeeds */
-#define CSV_USE_SEMICOLON_SEPARATOR 4 /* use CSV_SEMICOLON as separator instead of CSV_COMMA */
-
-/* Character values */
-#define CSV_TAB    0x09
-#define CSV_SPACE  0x20
-#define CSV_CR     0x0d
-#define CSV_LF     0x0a
-#define CSV_COMMA  0x2c
-#define CSV_SEMICOLON  0x3b /* ; */
-#define CSV_QUOTE  0x22
-
-struct csv_parser {
-  int pstate;         /* Parser state */
-  int quoted;         /* Is the current field a quoted field? */
-  size_t spaces;      /* Number of continious spaces after quote or in a non-quoted field */
-  char * entry_buf;   /* Entry buffer */
-  size_t entry_pos;   /* Current position in entry_buf (and current size of entry) */
-  size_t entry_size;  /* Size of buffer */
-  int status;         /* Operation status */
-  unsigned char options;
-};
-
-int csv_init(struct csv_parser **p, unsigned char options);
-int csv_fini(struct csv_parser *p, void (*cb1)(char *, size_t, void *), void (*cb2)(char, void *), void *data);
-void csv_free(struct csv_parser *p);
-int csv_error(struct csv_parser *p);
-char * csv_strerror(int error);
-size_t csv_parse(struct csv_parser *p, const char *s, size_t len, void (*cb1)(char *, size_t, void *), void (*cb2)(char, void *), void *data);
-size_t csv_write(char *dest, size_t dest_size, const char *src, size_t src_size);
-int csv_fwrite(FILE *fp, const char *src, size_t src_size);
-int csv_opts(struct csv_parser *p, unsigned char options);
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.c b/src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.c
deleted file mode 100644
index b18a498e8d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.c
+++ /dev/null
@@ -1,1059 +0,0 @@
-/*
- * SpanDSP - a series of DSP components for telephony
- *
- * echo.c - An echo cancellor, suitable for electrical and acoustic
- *          cancellation. This code does not currently comply with
- *          any relevant standards (e.g. G.164/5/7/8). One day....
- *
- * Written by Steve Underwood <steveu@coppice.org>
- *
- * Copyright (C) 2001, 2003 Steve Underwood
- *
- * Based on a bit from here, a bit from there, eye of toad,
- * ear of bat, etc - plus, of course, my own 2 cents.
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- * This program 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: echo.c,v 1.20 2006/12/01 18:00:48 steveu Exp $
- */
-
-/*! \file */
-
-/* TODO:
-   Finish the echo suppressor option, however nasty suppression may be.
-   Add an option to reintroduce side tone at -24dB under appropriate conditions.
-   Improve double talk detector (iterative!)
-*/
-
-/* We need to differentiate between transmitted energy which will train the echo
-   canceller well (voice, white noise, and other broadband sources) and energy
-   which will train it badly (supervisory tones, DTMF, whistles, and other
-   narrowband sources). There are many ways this might be done. This canceller uses
-   a method based on the autocorrelation qualities of the transmitted signal. A rather
-   peaky autocorrelation function is a clear sign of a narrowband signal. We only need
-   perform the autocorrelation at well spaced intervals, so the compute load is not too
-   great. Multiple successive autocorrelation functions with a similar peaky shape are a
-   clear indication of a stationary narrowband signal. Using TKEO, it should be possible to
-   greatly reduce the compute requirement for narrowband detection. */
-
-/* The FIR taps must be adapted as 32 bit values, to get the necessary finesse
-   in the adaption process. However, they are applied as 16 bit values (bits 30-15
-   of the 32 bit values) in the FIR. For the working 16 bit values, we need 4 sets.
-   
-   3 of the 16 bit sets are used on a rotating basis. Normally the canceller steps
-   round these 3 sets at regular intervals. Any time we detect double talk, we can go
-   back to the set from two steps ago with reasonable assurance it is a well adapted
-   set. We cannot just go back one step, as we may have rotated the sets just before
-   double talk or tone was detected, and that set may already be somewhat corrupted.
-   
-   When narrowband energy is detected we need to continue adapting to it, to echo
-   cancel it. However, the adaption will almost certainly be going astray. Broadband
-   (or even complex sequences of narrowband) energy will normally lead to a well
-   trained cancellor, with taps matching the impulse response of the channel.
-   For stationary narrowband energy, there is usually has an infinite number of
-   alternative tap sets which will cancel it well. A previously well trained set of
-   taps will tend to drift amongst the alternatives. When broadband energy resumes, the
-   taps may be a total mismatch for the signal, and could even amplify rather than
-   attenuate the echo. The solution is to use a fourth set of 16 bit taps. When we first
-   detect the narrowband energy we save the oldest of the group of three sets, but do
-   not change back to an older set. We let the canceller cancel, and it adaption drift
-   while the narrowband energy is present. When we detect the narrowband energy has ceased,
-   we switch to using the fourth set of taps which was saved.
-
-   When we revert to an older set of taps, we must replace both the 16 bit and 32 bit
-   working tap sets. The saved 16 bit values are good enough to also be used as a replacement
-   for the 32 bit values. We loose the fractions, but they should soon settle down in a
-   reasonable way. */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <inttypes.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "celliax_spandsp.h"
-
-//#include "spandsp/telephony.h"
-//#include "spandsp/logging.h"
-//#include "spandsp/bit_operations.h"
-//#include "spandsp/echo.h"
-
-//#include "bit_operations.h"
-//#include "giova.h"
-
-#if !defined(NULL)
-#define NULL (void *) 0
-#endif
-#if !defined(FALSE)
-#define FALSE 0
-#endif
-#if !defined(TRUE)
-#define TRUE (!FALSE)
-#endif
-
-#if 0
-#define MIN_TX_POWER_FOR_ADAPTION   64*64
-#define MIN_RX_POWER_FOR_ADAPTION   64*64
-
-static int narrowband_detect(echo_can_state_t * ec)
-{
-  int k;
-  int i;
-  float temp;
-  float scale;
-  float sf[128];
-  float f_acf[128];
-  int32_t acf[28];
-  int score;
-  int len = 32;
-  int alen = 9;
-
-  k = ec->curr_pos;
-  for (i = 0; i < len; i++) {
-    sf[i] = ec->fir_state.history[k++];
-    if (k >= 256)
-      k = 0;
-  }
-  for (k = 0; k < alen; k++) {
-    temp = 0;
-    for (i = k; i < len; i++)
-      temp += sf[i] * sf[i - k];
-    f_acf[k] = temp;
-  }
-  scale = 0x1FFFFFFF / f_acf[0];
-  for (k = 0; k < alen; k++)
-    acf[k] = (int32_t) (f_acf[k] * scale);
-  score = 0;
-  for (i = 0; i < 9; i++) {
-    if (ec->last_acf[i] >= 0 && acf[i] >= 0) {
-      if ((ec->last_acf[i] >> 1) < acf[i] && acf[i] < (ec->last_acf[i] << 1))
-        score++;
-    } else if (ec->last_acf[i] < 0 && acf[i] < 0) {
-      if ((ec->last_acf[i] >> 1) > acf[i] && acf[i] > (ec->last_acf[i] << 1))
-        score++;
-    }
-  }
-  memcpy(ec->last_acf, acf, alen * sizeof(ec->last_acf[0]));
-  return score;
-}
-
-static __inline__ void lms_adapt(echo_can_state_t * ec, int factor)
-{
-  int i;
-
-#if 0
-  mmx_t *mmx_taps;
-  mmx_t *mmx_coeffs;
-  mmx_t *mmx_hist;
-  mmx_t mmx;
-
-  mmx.w[0] = mmx.w[1] = mmx.w[2] = mmx.w[3] = factor;
-  mmx_hist = (mmx_t *) & fir->history[fir->curr_pos];
-  mmx_taps = (mmx_t *) & fir->taps;
-  mmx_coeffs = (mmx_t *) fir->coeffs;
-  i = fir->taps;
-  movq_m2r(mmx, mm0);
-  while (i > 0) {
-    movq_m2r(mmx_hist[0], mm1);
-    movq_m2r(mmx_taps[0], mm0);
-    movq_m2r(mmx_taps[1], mm1);
-    movq_r2r(mm1, mm2);
-    pmulhw(mm0, mm1);
-    pmullw(mm0, mm2);
-
-    pmaddwd_r2r(mm1, mm0);
-    pmaddwd_r2r(mm3, mm2);
-    paddd_r2r(mm0, mm4);
-    paddd_r2r(mm2, mm4);
-    movq_r2m(mm0, mmx_taps[0]);
-    movq_r2m(mm1, mmx_taps[0]);
-    movq_r2m(mm2, mmx_coeffs[0]);
-    mmx_taps += 2;
-    mmx_coeffs += 1;
-    mmx_hist += 1;
-    i -= 4;
-    )
-      emms();
-#elif 0
-  /* Update the FIR taps */
-  for (i = ec->taps - 1; i >= 0; i--) {
-    /* Leak to avoid the coefficients drifting beyond the ability of the
-       adaption process to bring them back under control. */
-    ec->fir_taps32[i] -= (ec->fir_taps32[i] >> 23);
-    ec->fir_taps32[i] += (ec->fir_state.history[i + ec->curr_pos] * factor);
-    ec->latest_correction = (ec->fir_state.history[i + ec->curr_pos] * factor);
-    ec->fir_taps16[ec->tap_set][i] = ec->fir_taps32[i] >> 15;
-  }
-#else
-  int offset1;
-  int offset2;
-
-  /* Update the FIR taps */
-  offset2 = ec->curr_pos;
-  offset1 = ec->taps - offset2;
-  for (i = ec->taps - 1; i >= offset1; i--) {
-    ec->fir_taps32[i] += (ec->fir_state.history[i - offset1] * factor);
-    ec->fir_taps16[ec->tap_set][i] = (int16_t) (ec->fir_taps32[i] >> 15);
-  }
-  for (; i >= 0; i--) {
-    ec->fir_taps32[i] += (ec->fir_state.history[i + offset2] * factor);
-    ec->fir_taps16[ec->tap_set][i] = (int16_t) (ec->fir_taps32[i] >> 15);
-  }
-#endif
-}
-
-/*- End of function --------------------------------------------------------*/
-
-#ifdef NOT_NEEDED
-echo_can_state_t *echo_can_create(int len, int adaption_mode)
-{
-  echo_can_state_t *ec;
-  int i;
-  int j;
-
-  ec = (echo_can_state_t *) malloc(sizeof(*ec));
-  if (ec == NULL)
-    return NULL;
-  memset(ec, 0, sizeof(*ec));
-  ec->taps = len;
-  ec->curr_pos = ec->taps - 1;
-  ec->tap_mask = ec->taps - 1;
-  if ((ec->fir_taps32 = (int32_t *) malloc(ec->taps * sizeof(int32_t))) == NULL) {
-    free(ec);
-    return NULL;
-  }
-  memset(ec->fir_taps32, 0, ec->taps * sizeof(int32_t));
-  for (i = 0; i < 4; i++) {
-    if ((ec->fir_taps16[i] = (int16_t *) malloc(ec->taps * sizeof(int16_t))) == NULL) {
-      for (j = 0; j < i; j++)
-        free(ec->fir_taps16[j]);
-      free(ec->fir_taps32);
-      free(ec);
-      return NULL;
-    }
-    memset(ec->fir_taps16[i], 0, ec->taps * sizeof(int16_t));
-  }
-  fir16_create(&ec->fir_state, ec->fir_taps16[0], ec->taps);
-  ec->rx_power_threshold = 10000000;
-  ec->geigel_max = 0;
-  ec->geigel_lag = 0;
-  ec->dtd_onset = FALSE;
-  ec->tap_set = 0;
-  ec->tap_rotate_counter = 1600;
-  ec->cng_level = 1000;
-  echo_can_adaption_mode(ec, adaption_mode);
-  return ec;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-void echo_can_free(echo_can_state_t * ec)
-{
-  int i;
-
-  fir16_free(&ec->fir_state);
-  free(ec->fir_taps32);
-  for (i = 0; i < 4; i++)
-    free(ec->fir_taps16[i]);
-  free(ec);
-}
-
-/*- End of function --------------------------------------------------------*/
-
-void echo_can_adaption_mode(echo_can_state_t * ec, int adaption_mode)
-{
-  ec->adaption_mode = adaption_mode;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-void echo_can_flush(echo_can_state_t * ec)
-{
-  int i;
-
-  for (i = 0; i < 4; i++)
-    ec->tx_power[i] = 0;
-  for (i = 0; i < 3; i++)
-    ec->rx_power[i] = 0;
-  ec->clean_rx_power = 0;
-  ec->nonupdate_dwell = 0;
-
-  fir16_flush(&ec->fir_state);
-  ec->fir_state.curr_pos = ec->taps - 1;
-  memset(ec->fir_taps32, 0, ec->taps * sizeof(int32_t));
-  for (i = 0; i < 4; i++)
-    memset(ec->fir_taps16[i], 0, ec->taps * sizeof(int16_t));
-
-  ec->curr_pos = ec->taps - 1;
-
-  ec->supp_test1 = 0;
-  ec->supp_test2 = 0;
-  ec->supp1 = 0;
-  ec->supp2 = 0;
-  ec->vad = 0;
-  ec->cng_level = 1000;
-  ec->cng_filter = 0;
-
-  ec->geigel_max = 0;
-  ec->geigel_lag = 0;
-  ec->dtd_onset = FALSE;
-  ec->tap_set = 0;
-  ec->tap_rotate_counter = 1600;
-
-  ec->latest_correction = 0;
-
-  memset(ec->last_acf, 0, sizeof(ec->last_acf));
-  ec->narrowband_count = 0;
-  ec->narrowband_score = 0;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-int sample_no = 0;
-
-int16_t echo_can_update(echo_can_state_t * ec, int16_t tx, int16_t rx)
-{
-  int32_t echo_value;
-  int clean_rx;
-  int nsuppr;
-  int score;
-  int i;
-
-  sample_no++;
-  ec->latest_correction = 0;
-  /* Evaluate the echo - i.e. apply the FIR filter */
-  /* Assume the gain of the FIR does not exceed unity. Exceeding unity
-     would seem like a rather poor thing for an echo cancellor to do :)
-     This means we can compute the result with a total disregard for
-     overflows. 16bits x 16bits -> 31bits, so no overflow can occur in
-     any multiply. While accumulating we may overflow and underflow the
-     32 bit scale often. However, if the gain does not exceed unity,
-     everything should work itself out, and the final result will be
-     OK, without any saturation logic. */
-  /* Overflow is very much possible here, and we do nothing about it because
-     of the compute costs */
-  /* 16 bit coeffs for the LMS give lousy results (maths good, actual sound
-     bad!), but 32 bit coeffs require some shifting. On balance 32 bit seems
-     best */
-  echo_value = fir16(&ec->fir_state, tx);
-
-  /* And the answer is..... */
-  clean_rx = rx - echo_value;
-//printf("echo is %" PRId32 "\n", echo_value);
-  /* That was the easy part. Now we need to adapt! */
-  if (ec->nonupdate_dwell > 0)
-    ec->nonupdate_dwell--;
-
-  /* Calculate short term power levels using very simple single pole IIRs */
-  /* TODO: Is the nasty modulus approach the fastest, or would a real
-     tx*tx power calculation actually be faster? Using the squares
-     makes the numbers grow a lot! */
-  ec->tx_power[3] += ((abs(tx) - ec->tx_power[3]) >> 5);
-  ec->tx_power[2] += ((tx * tx - ec->tx_power[2]) >> 8);
-  ec->tx_power[1] += ((tx * tx - ec->tx_power[1]) >> 5);
-  ec->tx_power[0] += ((tx * tx - ec->tx_power[0]) >> 3);
-  ec->rx_power[1] += ((rx * rx - ec->rx_power[1]) >> 6);
-  ec->rx_power[0] += ((rx * rx - ec->rx_power[0]) >> 3);
-  ec->clean_rx_power += ((clean_rx * clean_rx - ec->clean_rx_power) >> 6);
-
-  score = 0;
-  /* If there is very little being transmitted, any attempt to train is
-     futile. We would either be training on the far end's noise or signal,
-     the channel's own noise, or our noise. Either way, this is hardly good
-     training, so don't do it (avoid trouble). */
-  if (ec->tx_power[0] > MIN_TX_POWER_FOR_ADAPTION) {
-    /* If the received power is very low, either we are sending very little or
-       we are already well adapted. There is little point in trying to improve
-       the adaption under these circumstances, so don't do it (reduce the
-       compute load). */
-    if (ec->tx_power[1] > ec->rx_power[0]) {
-      /* There is no (or little) far-end speech. */
-      if (ec->nonupdate_dwell == 0) {
-        if (++ec->narrowband_count >= 160) {
-          ec->narrowband_count = 0;
-          score = narrowband_detect(ec);
-//printf("Do the narrowband test %d at %d\n", score, ec->curr_pos);
-          if (score > 6) {
-            if (ec->narrowband_score == 0)
-              memcpy(ec->fir_taps16[3], ec->fir_taps16[(ec->tap_set + 1) % 3],
-                     ec->taps * sizeof(int16_t));
-            ec->narrowband_score += score;
-          } else {
-            if (ec->narrowband_score > 200) {
-//printf("Revert to %d at %d\n", (ec->tap_set + 1)%3, sample_no);
-              memcpy(ec->fir_taps16[ec->tap_set], ec->fir_taps16[3],
-                     ec->taps * sizeof(int16_t));
-              memcpy(ec->fir_taps16[(ec->tap_set - 1) % 3], ec->fir_taps16[3],
-                     ec->taps * sizeof(int16_t));
-              for (i = 0; i < ec->taps; i++)
-                ec->fir_taps32[i] = ec->fir_taps16[3][i] << 15;
-              ec->tap_rotate_counter = 1600;
-            }
-            ec->narrowband_score = 0;
-          }
-        }
-        ec->dtd_onset = FALSE;
-        if (--ec->tap_rotate_counter <= 0) {
-//printf("Rotate to %d at %d\n", ec->tap_set, sample_no);
-          ec->tap_rotate_counter = 1600;
-          ec->tap_set++;
-          if (ec->tap_set > 2)
-            ec->tap_set = 0;
-          ec->fir_state.coeffs = ec->fir_taps16[ec->tap_set];
-        }
-        /* ... and we are not in the dwell time from previous speech. */
-        if ((ec->adaption_mode & ECHO_CAN_USE_ADAPTION) && ec->narrowband_score == 0) {
-          //nsuppr = saturate((clean_rx << 16)/ec->tx_power[1]);
-          //nsuppr = clean_rx/ec->tx_power[1];
-          /* If a sudden surge in signal level (e.g. the onset of a tone
-             burst) cause an abnormally high instantaneous to average
-             signal power ratio, we could kick the adaption badly in the
-             wrong direction. This is because the tx_power takes too long
-             to react and rise. We need to stop too rapid adaption to the
-             new signal. We normalise to a value derived from the
-             instantaneous signal if it exceeds the peak by too much. */
-          nsuppr = clean_rx;
-          /* Divide isn't very quick, but the "where is the top bit" and shift
-             instructions are single cycle. */
-          if (tx > 4 * ec->tx_power[3])
-            i = top_bit(tx) - 8;
-          else
-            i = top_bit(ec->tx_power[3]) - 8;
-          if (i > 0)
-            nsuppr >>= i;
-          lms_adapt(ec, nsuppr);
-        }
-      }
-      //printf("%10d %10d %10d %10d %10d\n", rx, clean_rx, nsuppr, ec->tx_power[1], ec->rx_power[1]);
-      //printf("%.4f\n", (float) ec->rx_power[1]/(float) ec->clean_rx_power);
-    } else {
-      if (!ec->dtd_onset) {
-//printf("Revert to %d at %d\n", (ec->tap_set + 1)%3, sample_no);
-        memcpy(ec->fir_taps16[ec->tap_set], ec->fir_taps16[(ec->tap_set + 1) % 3],
-               ec->taps * sizeof(int16_t));
-        memcpy(ec->fir_taps16[(ec->tap_set - 1) % 3],
-               ec->fir_taps16[(ec->tap_set + 1) % 3], ec->taps * sizeof(int16_t));
-        for (i = 0; i < ec->taps; i++)
-          ec->fir_taps32[i] = ec->fir_taps16[(ec->tap_set + 1) % 3][i] << 15;
-        ec->tap_rotate_counter = 1600;
-        ec->dtd_onset = TRUE;
-      }
-      ec->nonupdate_dwell = NONUPDATE_DWELL_TIME;
-    }
-  }
-
-  if (ec->rx_power[1])
-    ec->vad = (8000 * ec->clean_rx_power) / ec->rx_power[1];
-  else
-    ec->vad = 0;
-  if (ec->rx_power[1] > 2048 * 2048 && ec->clean_rx_power > 4 * ec->rx_power[1]) {
-    /* The EC seems to be making things worse, instead of better. Zap it! */
-    memset(ec->fir_taps32, 0, ec->taps * sizeof(int32_t));
-    for (i = 0; i < 4; i++)
-      memset(ec->fir_taps16[i], 0, ec->taps * sizeof(int16_t));
-  }
-#if defined(XYZZY)
-  if ((ec->adaption_mode & ECHO_CAN_USE_SUPPRESSOR)) {
-    ec->supp_test1 +=
-      (ec->fir_state.history[ec->curr_pos] -
-       ec->fir_state.history[(ec->curr_pos - 7) & ec->tap_mask]);
-    ec->supp_test2 +=
-      (ec->fir_state.history[(ec->curr_pos - 24) & ec->tap_mask] -
-       ec->fir_state.history[(ec->curr_pos - 31) & ec->tap_mask]);
-    if (ec->supp_test1 > 42 && ec->supp_test2 > 42)
-      supp_change = 25;
-    else
-      supp_change = 50;
-    supp = supp_change + k1 * ec->supp1 + k2 * ec->supp2;
-    ec->supp2 = ec->supp1;
-    ec->supp1 = supp;
-    clean_rx *= (1 - supp);
-  }
-#endif
-
-  if ((ec->adaption_mode & ECHO_CAN_USE_NLP)) {
-    /* Non-linear processor - a fancy way to say "zap small signals, to avoid
-       residual echo due to (uLaw/ALaw) non-linearity in the channel.". */
-    if (ec->rx_power[1] < 30000000) {
-      if (!ec->cng) {
-        ec->cng_level = ec->clean_rx_power;
-        ec->cng = TRUE;
-      }
-      if ((ec->adaption_mode & ECHO_CAN_USE_CNG)) {
-        /* Very elementary comfort noise generation */
-        /* Just random numbers rolled off very vaguely Hoth-like */
-        ec->cng_rndnum = 1664525U * ec->cng_rndnum + 1013904223U;
-        ec->cng_filter = ((ec->cng_rndnum & 0xFFFF) - 32768 + 5 * ec->cng_filter) >> 3;
-        clean_rx = (ec->cng_filter * ec->cng_level) >> 17;
-        /* TODO: A better CNG, with more accurate (tracking) spectral shaping! */
-      } else {
-        clean_rx = 0;
-      }
-//clean_rx = -16000;
-    } else {
-      ec->cng = FALSE;
-    }
-  } else {
-    ec->cng = FALSE;
-  }
-
-//printf("Narrowband score %4d %5d at %d\n", ec->narrowband_score, score, sample_no);
-  /* Roll around the rolling buffer */
-  if (ec->curr_pos <= 0)
-    ec->curr_pos = ec->taps;
-  ec->curr_pos--;
-  return (int16_t) clean_rx;
-}
-
-#endif //NOT_NEEDED
-/*- End of function --------------------------------------------------------*/
-/*- End of file ------------------------------------------------------------*/
-#endif
-
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include <fcntl.h>
-#include <math.h>
-
-//#include "spandsp/telephony.h"
-//#include "spandsp/tone_detect.h"
-//#include "spandsp/tone_generate.h"
-//#include "spandsp/super_tone_rx.h"
-//#include "giova.h"
-
-#if !defined(M_PI)
-/* C99 systems may not define M_PI */
-#define M_PI 3.14159265358979323846264338327
-#endif
-
-//#define USE_3DNOW
-
-#define DEFAULT_DTMF_TX_LEVEL       -10
-#define DEFAULT_DTMF_TX_ON_TIME     50
-#define DEFAULT_DTMF_TX_OFF_TIME    55
-
-#define DTMF_THRESHOLD              8.0e7f
-#define DTMF_NORMAL_TWIST           6.3f    /* 8dB */
-#define DTMF_REVERSE_TWIST          2.5f    /* 4dB */
-#define DTMF_RELATIVE_PEAK_ROW      6.3f    /* 8dB */
-#define DTMF_RELATIVE_PEAK_COL      6.3f    /* 8dB */
-#define DTMF_TO_TOTAL_ENERGY        42.0f
-
-static const float dtmf_row[] = {
-  697.0f, 770.0f, 852.0f, 941.0f
-};
-static const float dtmf_col[] = {
-  1209.0f, 1336.0f, 1477.0f, 1633.0f
-};
-
-static const char dtmf_positions[] = "123A" "456B" "789C" "*0#D";
-
-static goertzel_descriptor_t dtmf_detect_row[4];
-static goertzel_descriptor_t dtmf_detect_col[4];
-
-//
-//static int dtmf_tx_inited = 0;
-//static tone_gen_descriptor_t dtmf_digit_tones[16];
-
-#if defined(USE_3DNOW)
-static __inline__ void _dtmf_goertzel_update(goertzel_state_t * s, float x[], int samples)
-{
-  int n;
-  float v;
-  int i;
-  float vv[16];
-
-  vv[4] = s[0].v2;
-  vv[5] = s[1].v2;
-  vv[6] = s[2].v2;
-  vv[7] = s[3].v2;
-  vv[8] = s[0].v3;
-  vv[9] = s[1].v3;
-  vv[10] = s[2].v3;
-  vv[11] = s[3].v3;
-  vv[12] = s[0].fac;
-  vv[13] = s[1].fac;
-  vv[14] = s[2].fac;
-  vv[15] = s[3].fac;
-
-  //v1 = s->v2;
-  //s->v2 = s->v3;
-  //s->v3 = s->fac*s->v2 - v1 + x[0];
-
-  __asm__ __volatile__(" femms;\n" " movq        16(%%edx),%%mm2;\n"
-                       " movq        24(%%edx),%%mm3;\n" " movq        32(%%edx),%%mm4;\n"
-                       " movq        40(%%edx),%%mm5;\n" " movq        48(%%edx),%%mm6;\n"
-                       " movq        56(%%edx),%%mm7;\n" " jmp         1f;\n"
-                       " .align 32;\n" " 1: ;\n" " prefetch    (%%eax);\n"
-                       " movq        %%mm3,%%mm1;\n" " movq        %%mm2,%%mm0;\n"
-                       " movq        %%mm5,%%mm3;\n" " movq        %%mm4,%%mm2;\n"
-                       " pfmul       %%mm7,%%mm5;\n" " pfmul       %%mm6,%%mm4;\n"
-                       " pfsub       %%mm1,%%mm5;\n" " pfsub       %%mm0,%%mm4;\n"
-                       " movq        (%%eax),%%mm0;\n" " movq        %%mm0,%%mm1;\n"
-                       " punpckldq   %%mm0,%%mm1;\n" " add         $4,%%eax;\n"
-                       " pfadd       %%mm1,%%mm5;\n" " pfadd       %%mm1,%%mm4;\n"
-                       " dec         %%ecx;\n" " jnz         1b;\n"
-                       " movq        %%mm2,16(%%edx);\n" " movq        %%mm3,24(%%edx);\n"
-                       " movq        %%mm4,32(%%edx);\n" " movq        %%mm5,40(%%edx);\n"
-                       " femms;\n"::"c"(samples), "a"(x), "d"(vv)
-                       :"memory", "eax", "ecx");
-
-  s[0].v2 = vv[4];
-  s[1].v2 = vv[5];
-  s[2].v2 = vv[6];
-  s[3].v2 = vv[7];
-  s[0].v3 = vv[8];
-  s[1].v3 = vv[9];
-  s[2].v3 = vv[10];
-  s[3].v3 = vv[11];
-}
-
-/*- End of function --------------------------------------------------------*/
-#endif
-
-int dtmf_rx(dtmf_rx_state_t * s, const int16_t amp[], int samples)
-{
-  float row_energy[4];
-  float col_energy[4];
-  float famp;
-  float v1;
-  int i;
-  int j;
-  int sample;
-  int best_row;
-  int best_col;
-  int limit;
-  uint8_t hit;
-
-  hit = 0;
-  for (sample = 0; sample < samples; sample = limit) {
-    /* The block length is optimised to meet the DTMF specs. */
-    if ((samples - sample) >= (102 - s->current_sample))
-      limit = sample + (102 - s->current_sample);
-    else
-      limit = samples;
-#if defined(USE_3DNOW)
-    _dtmf_goertzel_update(s->row_out, amp + sample, limit - sample);
-    _dtmf_goertzel_update(s->col_out, amp + sample, limit - sample);
-#else
-    /* The following unrolled loop takes only 35% (rough estimate) of the 
-       time of a rolled loop on the machine on which it was developed */
-    for (j = sample; j < limit; j++) {
-      famp = amp[j];
-      if (s->filter_dialtone) {
-        /* Sharp notches applied at 350Hz and 440Hz - the two common dialtone frequencies.
-           These are rather high Q, to achieve the required narrowness, without using lots of
-           sections. */
-        v1 = 0.98356f * famp + 1.8954426f * s->z350_1 - 0.9691396f * s->z350_2;
-        famp = v1 - 1.9251480f * s->z350_1 + s->z350_2;
-        s->z350_2 = s->z350_1;
-        s->z350_1 = v1;
-
-        v1 = 0.98456f * famp + 1.8529543f * s->z440_1 - 0.9691396f * s->z440_2;
-        famp = v1 - 1.8819938f * s->z440_1 + s->z440_2;
-        s->z440_2 = s->z440_1;
-        s->z440_1 = v1;
-      }
-      s->energy += famp * famp;
-      /* With GCC 2.95, the following unrolled code seems to take about 35%
-         (rough estimate) as long as a neat little 0-3 loop */
-      v1 = s->row_out[0].v2;
-      s->row_out[0].v2 = s->row_out[0].v3;
-      s->row_out[0].v3 = s->row_out[0].fac * s->row_out[0].v2 - v1 + famp;
-
-      v1 = s->col_out[0].v2;
-      s->col_out[0].v2 = s->col_out[0].v3;
-      s->col_out[0].v3 = s->col_out[0].fac * s->col_out[0].v2 - v1 + famp;
-
-      v1 = s->row_out[1].v2;
-      s->row_out[1].v2 = s->row_out[1].v3;
-      s->row_out[1].v3 = s->row_out[1].fac * s->row_out[1].v2 - v1 + famp;
-
-      v1 = s->col_out[1].v2;
-      s->col_out[1].v2 = s->col_out[1].v3;
-      s->col_out[1].v3 = s->col_out[1].fac * s->col_out[1].v2 - v1 + famp;
-
-      v1 = s->row_out[2].v2;
-      s->row_out[2].v2 = s->row_out[2].v3;
-      s->row_out[2].v3 = s->row_out[2].fac * s->row_out[2].v2 - v1 + famp;
-
-      v1 = s->col_out[2].v2;
-      s->col_out[2].v2 = s->col_out[2].v3;
-      s->col_out[2].v3 = s->col_out[2].fac * s->col_out[2].v2 - v1 + famp;
-
-      v1 = s->row_out[3].v2;
-      s->row_out[3].v2 = s->row_out[3].v3;
-      s->row_out[3].v3 = s->row_out[3].fac * s->row_out[3].v2 - v1 + famp;
-
-      v1 = s->col_out[3].v2;
-      s->col_out[3].v2 = s->col_out[3].v3;
-      s->col_out[3].v3 = s->col_out[3].fac * s->col_out[3].v2 - v1 + famp;
-    }
-#endif
-    s->current_sample += (limit - sample);
-    if (s->current_sample < 102)
-      continue;
-
-    /* We are at the end of a DTMF detection block */
-    /* Find the peak row and the peak column */
-    row_energy[0] = goertzel_result(&s->row_out[0]);
-    best_row = 0;
-    col_energy[0] = goertzel_result(&s->col_out[0]);
-    best_col = 0;
-
-    for (i = 1; i < 4; i++) {
-      row_energy[i] = goertzel_result(&s->row_out[i]);
-      if (row_energy[i] > row_energy[best_row])
-        best_row = i;
-      col_energy[i] = goertzel_result(&s->col_out[i]);
-      if (col_energy[i] > col_energy[best_col])
-        best_col = i;
-    }
-    hit = 0;
-    /* Basic signal level test and the twist test */
-    if (row_energy[best_row] >= DTMF_THRESHOLD && col_energy[best_col] >= DTMF_THRESHOLD
-        && col_energy[best_col] < row_energy[best_row] * s->reverse_twist
-        && col_energy[best_col] * s->normal_twist > row_energy[best_row]) {
-      /* Relative peak test ... */
-      for (i = 0; i < 4; i++) {
-        if ((i != best_col
-             && col_energy[i] * DTMF_RELATIVE_PEAK_COL > col_energy[best_col])
-            || (i != best_row
-                && row_energy[i] * DTMF_RELATIVE_PEAK_ROW > row_energy[best_row])) {
-          break;
-        }
-      }
-      /* ... and fraction of total energy test */
-      if (i >= 4
-          && (row_energy[best_row] + col_energy[best_col]) >
-          DTMF_TO_TOTAL_ENERGY * s->energy) {
-        hit = dtmf_positions[(best_row << 2) + best_col];
-      }
-    }
-    /* The logic in the next test should ensure the following for different successive hit patterns:
-       -----ABB = start of digit B.
-       ----B-BB = start of digit B
-       ----A-BB = start of digit B
-       BBBBBABB = still in digit B.
-       BBBBBB-- = end of digit B
-       BBBBBBC- = end of digit B
-       BBBBACBB = B ends, then B starts again.
-       BBBBBBCC = B ends, then C starts.
-       BBBBBCDD = B ends, then D starts.
-       This can work with:
-       - Back to back differing digits. Back-to-back digits should
-       not happen. The spec. says there should be a gap between digits.
-       However, many real phones do not impose a gap, and rolling across
-       the keypad can produce little or no gap.
-       - It tolerates nasty phones that give a very wobbly start to a digit.
-       - VoIP can give sample slips. The phase jumps that produces will cause
-       the block it is in to give no detection. This logic will ride over a
-       single missed block, and not falsely declare a second digit. If the
-       hiccup happens in the wrong place on a minimum length digit, however
-       we would still fail to detect that digit. Could anything be done to
-       deal with that? Packet loss is clearly a no-go zone.
-       Note this is only relevant to VoIP using A-law, u-law or similar.
-       Low bit rate codecs scramble DTMF too much for it to be recognised,
-       and often slip in units larger than a sample. */
-    if (hit != s->in_digit) {
-      if (s->last_hit != s->in_digit) {
-        /* We have two successive indications that something has changed. */
-        /* To declare digit on, the hits must agree. Otherwise we declare tone off. */
-        hit = (hit && hit == s->last_hit) ? hit : 0;
-#if 0
-        if (s->realtime_callback) {
-          /* Avoid reporting multiple no digit conditions on flaky hits */
-          if (s->in_digit || hit) {
-            i = (s->in_digit
-                 && !hit) ? -99 : rint(log10f(s->energy) * 10.0f - 20.08f - 90.30F +
-                                       DBM0_MAX_POWER);
-            s->realtime_callback(s->realtime_callback_data, hit, i);
-          }
-        } else {
-#endif
-          if (hit) {
-            if (s->current_digits < MAX_DTMF_DIGITS) {
-              s->digits[s->current_digits++] = (char) hit;
-              s->digits[s->current_digits] = '\0';
-              if (s->callback) {
-                s->callback(s->callback_data, s->digits, s->current_digits);
-                s->current_digits = 0;
-              }
-            } else {
-              s->lost_digits++;
-            }
-          }
-#if 0
-        }
-#endif
-        s->in_digit = hit;
-      }
-    }
-    s->last_hit = hit;
-    /* Reinitialise the detector for the next block */
-    for (i = 0; i < 4; i++) {
-      goertzel_reset(&s->row_out[i]);
-      goertzel_reset(&s->col_out[i]);
-    }
-    s->energy = 0.0f;
-    s->current_sample = 0;
-  }
-  if (s->current_digits && s->callback) {
-    s->callback(s->callback_data, s->digits, s->current_digits);
-    s->digits[0] = '\0';
-    s->current_digits = 0;
-  }
-  return 0;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-size_t dtmf_rx_get(dtmf_rx_state_t * s, char *buf, int max)
-{
-  if (max > s->current_digits)
-    max = s->current_digits;
-  if (max > 0) {
-    memcpy(buf, s->digits, max);
-    memmove(s->digits, s->digits + max, s->current_digits - max);
-    s->current_digits -= max;
-  }
-  buf[max] = '\0';
-  return max;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-#if 0
-void dtmf_rx_set_realtime_callback(dtmf_rx_state_t * s, tone_report_func_t callback,
-                                   void *user_data)
-{
-  s->realtime_callback = callback;
-  s->realtime_callback_data = user_data;
-}
-#endif
-/*- End of function --------------------------------------------------------*/
-
-void dtmf_rx_parms(dtmf_rx_state_t * s, int filter_dialtone, int twist, int reverse_twist)
-{
-  if (filter_dialtone >= 0) {
-    s->z350_1 = 0.0f;
-    s->z350_2 = 0.0f;
-    s->z440_1 = 0.0f;
-    s->z440_2 = 0.0f;
-    s->filter_dialtone = filter_dialtone;
-  }
-  if (twist >= 0)
-    s->normal_twist = powf(10.0f, twist / 10.0f);
-  if (reverse_twist >= 0)
-    s->reverse_twist = powf(10.0f, reverse_twist / 10.0f);
-}
-
-/*- End of function --------------------------------------------------------*/
-
-dtmf_rx_state_t *dtmf_rx_init(dtmf_rx_state_t * s, dtmf_rx_callback_t callback,
-                              void *user_data)
-{
-  int i;
-  static int initialised = 0;
-
-  s->callback = callback;
-  s->callback_data = user_data;
-  s->realtime_callback = NULL;
-  s->realtime_callback_data = NULL;
-  s->filter_dialtone = 0;
-  s->normal_twist = DTMF_NORMAL_TWIST;
-  s->reverse_twist = DTMF_REVERSE_TWIST;
-
-  s->in_digit = 0;
-  s->last_hit = 0;
-
-  if (!initialised) {
-    for (i = 0; i < 4; i++) {
-      make_goertzel_descriptor(&dtmf_detect_row[i], dtmf_row[i], 102);
-      make_goertzel_descriptor(&dtmf_detect_col[i], dtmf_col[i], 102);
-    }
-    initialised = 1;
-  }
-  for (i = 0; i < 4; i++) {
-    goertzel_init(&s->row_out[i], &dtmf_detect_row[i]);
-    goertzel_init(&s->col_out[i], &dtmf_detect_col[i]);
-  }
-  s->energy = 0.0f;
-  s->current_sample = 0;
-  s->lost_digits = 0;
-  s->current_digits = 0;
-  s->digits[0] = '\0';
-  return s;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-#if 0
-static void dtmf_tx_initialise(void)
-{
-  int row;
-  int col;
-
-  if (dtmf_tx_inited)
-    return;
-  for (row = 0; row < 4; row++) {
-    for (col = 0; col < 4; col++) {
-      make_tone_gen_descriptor(&dtmf_digit_tones[row * 4 + col], (int) dtmf_row[row],
-                               DEFAULT_DTMF_TX_LEVEL, (int) dtmf_col[col],
-                               DEFAULT_DTMF_TX_LEVEL, DEFAULT_DTMF_TX_ON_TIME,
-                               DEFAULT_DTMF_TX_OFF_TIME, 0, 0, FALSE);
-    }
-  }
-  dtmf_tx_inited = TRUE;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-int dtmf_tx(dtmf_tx_state_t * s, int16_t amp[], int max_samples)
-{
-  int len;
-  size_t dig;
-  char *cp;
-
-  len = 0;
-  if (s->tones.current_section >= 0) {
-    /* Deal with the fragment left over from last time */
-    len = tone_gen(&(s->tones), amp, max_samples);
-  }
-  dig = 0;
-  while (dig < s->current_digits && len < max_samples) {
-    /* Step to the next digit */
-    if ((cp = strchr(dtmf_positions, s->digits[dig++])) == NULL)
-      continue;
-    tone_gen_init(&(s->tones), &(s->tone_descriptors[cp - dtmf_positions]));
-    len += tone_gen(&(s->tones), amp + len, max_samples - len);
-  }
-  if (dig) {
-    /* Shift out the consumed digits */
-    s->current_digits -= dig;
-    memmove(s->digits, s->digits + dig, s->current_digits);
-  }
-  return len;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-size_t dtmf_tx_put(dtmf_tx_state_t * s, const char *digits)
-{
-  size_t len;
-
-  /* This returns the number of characters that would not fit in the buffer.
-     The buffer will only be loaded if the whole string of digits will fit,
-     in which case zero is returned. */
-  if ((len = strlen(digits)) > 0) {
-    if (s->current_digits + len <= MAX_DTMF_DIGITS) {
-      memcpy(s->digits + s->current_digits, digits, len);
-      s->current_digits += len;
-      len = 0;
-    } else {
-      len = MAX_DTMF_DIGITS - s->current_digits;
-    }
-  }
-  return len;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-dtmf_tx_state_t *dtmf_tx_init(dtmf_tx_state_t * s)
-{
-  if (!dtmf_tx_inited)
-    dtmf_tx_initialise();
-  s->tone_descriptors = dtmf_digit_tones;
-  tone_gen_init(&(s->tones), &dtmf_digit_tones[0]);
-  s->current_sample = 0;
-  s->current_digits = 0;
-  s->tones.current_section = -1;
-  return s;
-}
-#endif //NO TX
-/*- End of function --------------------------------------------------------*/
-/*- End of file ------------------------------------------------------------*/
-
-void make_goertzel_descriptor(goertzel_descriptor_t * t, float freq, int samples)
-{
-  //t->fac = 2.0f*cosf(2.0f*M_PI*(freq/(float) SAMPLE_RATE));
-  t->fac = 2.0f * cosf(2.0f * M_PI * (freq / (float) 8000));
-  t->samples = samples;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-goertzel_state_t *goertzel_init(goertzel_state_t * s, goertzel_descriptor_t * t)
-{
-  if (s || (s = malloc(sizeof(goertzel_state_t)))) {
-    s->v2 = s->v3 = 0.0;
-    s->fac = t->fac;
-    s->samples = t->samples;
-    s->current_sample = 0;
-  }
-  return s;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-void goertzel_reset(goertzel_state_t * s)
-{
-  s->v2 = s->v3 = 0.0;
-  s->current_sample = 0;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-int goertzel_update(goertzel_state_t * s, const int16_t amp[], int samples)
-{
-  int i;
-  float v1;
-
-  if (samples > s->samples - s->current_sample)
-    samples = s->samples - s->current_sample;
-  for (i = 0; i < samples; i++) {
-    v1 = s->v2;
-    s->v2 = s->v3;
-    s->v3 = s->fac * s->v2 - v1 + amp[i];
-  }
-  s->current_sample += samples;
-  return samples;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-float goertzel_result(goertzel_state_t * s)
-{
-  float v1;
-
-  /* Push a zero through the process to finish things off. */
-  v1 = s->v2;
-  s->v2 = s->v3;
-  s->v3 = s->fac * s->v2 - v1;
-  /* Now calculate the non-recursive side of the filter. */
-  /* The result here is not scaled down to allow for the magnification
-     effect of the filter (the usual DFT magnification effect). */
-  return s->v3 * s->v3 + s->v2 * s->v2 - s->v2 * s->v3 * s->fac;
-}
-
-/*- End of function --------------------------------------------------------*/
-/*- End of file ------------------------------------------------------------*/
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.h b/src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.h
deleted file mode 100644
index 2fed42d089..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.h
+++ /dev/null
@@ -1,1028 +0,0 @@
-
-/*
- * SpanDSP - a series of DSP components for telephony
- *
- * bit_operations.h - Various bit level operations, such as bit reversal
- *
- * Written by Steve Underwood <steveu@coppice.org>
- *
- * Copyright (C) 2006 Steve Underwood
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- * This program 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: bit_operations.h,v 1.15 2007/02/23 13:16:13 steveu Exp $
- */
-
-/*! \file */
-
-#ifndef _CELLIAX_SPANDSP_H
-#define _CELLIAX_SPANDSP_H
-
-#include <math.h>
-
-/*! \brief Find the bit position of the highest set bit in a word
-    \param bits The word to be searched
-    \return The bit number of the highest set bit, or -1 if the word is zero. */
-static __inline__ int top_bit(unsigned int bits)
-{
-  int res;
-
-#if defined(__i386__)  ||  defined(__x86_64__)
-__asm__(" xorl %[res],%[res];\n" " decl %[res];\n" " bsrl %[bits],%[res]\n":[res] "=&r"
-          (res)
-:        [bits] "rm"(bits));
-  return res;
-#elif defined(__ppc__)  ||   defined(__powerpc__)
-__asm__("cntlzw %[res],%[bits];\n":[res] "=&r"(res)
-:        [bits] "r"(bits));
-  return 31 - res;
-#else
-  if (bits == 0)
-    return -1;
-  res = 0;
-  if (bits & 0xFFFF0000) {
-    bits &= 0xFFFF0000;
-    res += 16;
-  }
-  if (bits & 0xFF00FF00) {
-    bits &= 0xFF00FF00;
-    res += 8;
-  }
-  if (bits & 0xF0F0F0F0) {
-    bits &= 0xF0F0F0F0;
-    res += 4;
-  }
-  if (bits & 0xCCCCCCCC) {
-    bits &= 0xCCCCCCCC;
-    res += 2;
-  }
-  if (bits & 0xAAAAAAAA) {
-    bits &= 0xAAAAAAAA;
-    res += 1;
-  }
-  return res;
-#endif
-}
-
-/*- End of function --------------------------------------------------------*/
-
-/*! \brief Find the bit position of the lowest set bit in a word
-    \param bits The word to be searched
-    \return The bit number of the lowest set bit, or -1 if the word is zero. */
-static __inline__ int bottom_bit(unsigned int bits)
-{
-  int res;
-
-#if defined(__i386__)  ||  defined(__x86_64__)
-__asm__(" xorl %[res],%[res];\n" " decl %[res];\n" " bsfl %[bits],%[res]\n":[res] "=&r"
-          (res)
-:        [bits] "rm"(bits));
-  return res;
-#else
-  if (bits == 0)
-    return -1;
-  res = 31;
-  if (bits & 0x0000FFFF) {
-    bits &= 0x0000FFFF;
-    res -= 16;
-  }
-  if (bits & 0x00FF00FF) {
-    bits &= 0x00FF00FF;
-    res -= 8;
-  }
-  if (bits & 0x0F0F0F0F) {
-    bits &= 0x0F0F0F0F;
-    res -= 4;
-  }
-  if (bits & 0x33333333) {
-    bits &= 0x33333333;
-    res -= 2;
-  }
-  if (bits & 0x55555555) {
-    bits &= 0x55555555;
-    res -= 1;
-  }
-  return res;
-#endif
-}
-
-/*- End of function --------------------------------------------------------*/
-
-/*! \brief Bit reverse a byte.
-    \param data The byte to be reversed.
-    \return The bit reversed version of data. */
-static __inline__ uint8_t bit_reverse8(uint8_t x)
-{
-#if defined(__i386__)  ||  defined(__x86_64__)  ||  defined(__ppc__)  ||  defined(__powerpc__)
-  /* If multiply is fast */
-  return ((x * 0x0802U & 0x22110U) | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
-#else
-  /* If multiply is slow, but we have a barrel shifter */
-  x = (x >> 4) | (x << 4);
-  x = ((x & 0xCC) >> 2) | ((x & 0x33) << 2);
-  return ((x & 0xAA) >> 1) | ((x & 0x55) << 1);
-#endif
-}
-
-/*- End of function --------------------------------------------------------*/
-
-/*! \brief Bit reverse a 16 bit word.
-    \param data The word to be reversed.
-    \return The bit reversed version of data. */
-uint16_t bit_reverse16(uint16_t data);
-
-/*! \brief Bit reverse a 32 bit word.
-    \param data The word to be reversed.
-    \return The bit reversed version of data. */
-uint32_t bit_reverse32(uint32_t data);
-
-/*! \brief Bit reverse each of the four bytes in a 32 bit word.
-    \param data The word to be reversed.
-    \return The bit reversed version of data. */
-uint32_t bit_reverse_4bytes(uint32_t data);
-
-#if defined(__x86_64__)
-/*! \brief Bit reverse each of the eight bytes in a 64 bit word.
-    \param data The word to be reversed.
-    \return The bit reversed version of data. */
-uint64_t bit_reverse_8bytes(uint64_t data);
-#endif
-
-/*! \brief Bit reverse each bytes in a buffer.
-    \param to The buffer to place the reversed data in.
-    \param from The buffer containing the data to be reversed.
-    \param The length of the data in the buffer. */
-void bit_reverse(uint8_t to[], const uint8_t from[], int len);
-
-/*! \brief Find the number of set bits in a 32 bit word.
-    \param x The word to be searched.
-    \return The number of set bits. */
-int one_bits32(uint32_t x);
-
-/*! \brief Create a mask as wide as the number in a 32 bit word.
-    \param x The word to be searched.
-    \return The mask. */
-uint32_t make_mask32(uint32_t x);
-
-/*! \brief Create a mask as wide as the number in a 16 bit word.
-    \param x The word to be searched.
-    \return The mask. */
-uint16_t make_mask16(uint16_t x);
-
-/*! \brief Find the least significant one in a word, and return a word
-           with just that bit set.
-    \param x The word to be searched.
-    \return The word with the single set bit. */
-static __inline__ uint32_t least_significant_one32(uint32_t x)
-{
-  return (x & (-(int32_t) x));
-}
-
-/*- End of function --------------------------------------------------------*/
-
-/*! \brief Find the most significant one in a word, and return a word
-           with just that bit set.
-    \param x The word to be searched.
-    \return The word with the single set bit. */
-static __inline__ uint32_t most_significant_one32(uint32_t x)
-{
-#if defined(__i386__)  ||  defined(__x86_64__)  ||  defined(__ppc__)  ||  defined(__powerpc__)
-  return 1 << top_bit(x);
-#else
-  x = make_mask32(x);
-  return (x ^ (x >> 1));
-#endif
-}
-
-/*- End of function --------------------------------------------------------*/
-
-/*! \brief Find the parity of a byte.
-    \param x The byte to be checked.
-    \return 1 for odd, or 0 for even. */
-static __inline__ int parity8(uint8_t x)
-{
-  x = (x ^ (x >> 4)) & 0x0F;
-  return (0x6996 >> x) & 1;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-/*! \brief Find the parity of a 16 bit word.
-    \param x The word to be checked.
-    \return 1 for odd, or 0 for even. */
-static __inline__ int parity16(uint16_t x)
-{
-  x ^= (x >> 8);
-  x = (x ^ (x >> 4)) & 0x0F;
-  return (0x6996 >> x) & 1;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-/*! \brief Find the parity of a 32 bit word.
-    \param x The word to be checked.
-    \return 1 for odd, or 0 for even. */
-static __inline__ int parity32(uint32_t x)
-{
-  x ^= (x >> 16);
-  x ^= (x >> 8);
-  x = (x ^ (x >> 4)) & 0x0F;
-  return (0x6996 >> x) & 1;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-/*- End of file ------------------------------------------------------------*/
-/*
- * SpanDSP - a series of DSP components for telephony
- *
- * fir.h - General telephony FIR routines
- *
- * Written by Steve Underwood <steveu@coppice.org>
- *
- * Copyright (C) 2002 Steve Underwood
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- * This program 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: fir.h,v 1.8 2006/10/24 13:45:28 steveu Exp $
- */
-
-/*! \page fir_page FIR filtering
-\section fir_page_sec_1 What does it do?
-???.
-
-\section fir_page_sec_2 How does it work?
-???.
-*/
-
-#if 0
-#if defined(USE_MMX)  ||  defined(USE_SSE2)
-#include "mmx.h"
-#endif
-
-/*!
-    16 bit integer FIR descriptor. This defines the working state for a single
-    instance of an FIR filter using 16 bit integer coefficients.
-*/
-typedef struct {
-  int taps;
-  int curr_pos;
-  const int16_t *coeffs;
-  int16_t *history;
-} fir16_state_t;
-
-/*!
-    32 bit integer FIR descriptor. This defines the working state for a single
-    instance of an FIR filter using 32 bit integer coefficients, and filtering
-    16 bit integer data.
-*/
-typedef struct {
-  int taps;
-  int curr_pos;
-  const int32_t *coeffs;
-  int16_t *history;
-} fir32_state_t;
-
-/*!
-    Floating point FIR descriptor. This defines the working state for a single
-    instance of an FIR filter using floating point coefficients and data.
-*/
-typedef struct {
-  int taps;
-  int curr_pos;
-  const float *coeffs;
-  float *history;
-} fir_float_state_t;
-
-static __inline__ const int16_t *fir16_create(fir16_state_t * fir, const int16_t * coeffs,
-                                              int taps)
-{
-  fir->taps = taps;
-  fir->curr_pos = taps - 1;
-  fir->coeffs = coeffs;
-#if defined(USE_MMX)  ||  defined(USE_SSE2)
-  if ((fir->history = malloc(2 * taps * sizeof(int16_t))))
-    memset(fir->history, 0, 2 * taps * sizeof(int16_t));
-#else
-  if ((fir->history = (int16_t *) malloc(taps * sizeof(int16_t))))
-    memset(fir->history, 0, taps * sizeof(int16_t));
-#endif
-  return fir->history;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ void fir16_flush(fir16_state_t * fir)
-{
-#if defined(USE_MMX)  ||  defined(USE_SSE2)
-  memset(fir->history, 0, 2 * fir->taps * sizeof(int16_t));
-#else
-  memset(fir->history, 0, fir->taps * sizeof(int16_t));
-#endif
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ void fir16_free(fir16_state_t * fir)
-{
-  free(fir->history);
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ int16_t fir16(fir16_state_t * fir, int16_t sample)
-{
-  int i;
-  int32_t y;
-#if defined(USE_MMX)
-  mmx_t *mmx_coeffs;
-  mmx_t *mmx_hist;
-
-  fir->history[fir->curr_pos] = sample;
-  fir->history[fir->curr_pos + fir->taps] = sample;
-
-  mmx_coeffs = (mmx_t *) fir->coeffs;
-  mmx_hist = (mmx_t *) & fir->history[fir->curr_pos];
-  i = fir->taps;
-  pxor_r2r(mm4, mm4);
-  /* 8 samples per iteration, so the filter must be a multiple of 8 long. */
-  while (i > 0) {
-    movq_m2r(mmx_coeffs[0], mm0);
-    movq_m2r(mmx_coeffs[1], mm2);
-    movq_m2r(mmx_hist[0], mm1);
-    movq_m2r(mmx_hist[1], mm3);
-    mmx_coeffs += 2;
-    mmx_hist += 2;
-    pmaddwd_r2r(mm1, mm0);
-    pmaddwd_r2r(mm3, mm2);
-    paddd_r2r(mm0, mm4);
-    paddd_r2r(mm2, mm4);
-    i -= 8;
-  }
-  movq_r2r(mm4, mm0);
-  psrlq_i2r(32, mm0);
-  paddd_r2r(mm0, mm4);
-  movd_r2m(mm4, y);
-  emms();
-#elif defined(USE_SSE2)
-  xmm_t *xmm_coeffs;
-  xmm_t *xmm_hist;
-
-  fir->history[fir->curr_pos] = sample;
-  fir->history[fir->curr_pos + fir->taps] = sample;
-
-  xmm_coeffs = (xmm_t *) fir->coeffs;
-  xmm_hist = (xmm_t *) & fir->history[fir->curr_pos];
-  i = fir->taps;
-  pxor_r2r(xmm4, xmm4);
-  /* 16 samples per iteration, so the filter must be a multiple of 16 long. */
-  while (i > 0) {
-    movdqu_m2r(xmm_coeffs[0], xmm0);
-    movdqu_m2r(xmm_coeffs[1], xmm2);
-    movdqu_m2r(xmm_hist[0], xmm1);
-    movdqu_m2r(xmm_hist[1], xmm3);
-    xmm_coeffs += 2;
-    xmm_hist += 2;
-    pmaddwd_r2r(xmm1, xmm0);
-    pmaddwd_r2r(xmm3, xmm2);
-    paddd_r2r(xmm0, xmm4);
-    paddd_r2r(xmm2, xmm4);
-    i -= 16;
-  }
-  movdqa_r2r(xmm4, xmm0);
-  psrldq_i2r(8, xmm0);
-  paddd_r2r(xmm0, xmm4);
-  movdqa_r2r(xmm4, xmm0);
-  psrldq_i2r(4, xmm0);
-  paddd_r2r(xmm0, xmm4);
-  movd_r2m(xmm4, y);
-#else
-  int offset1;
-  int offset2;
-
-  fir->history[fir->curr_pos] = sample;
-
-  offset2 = fir->curr_pos;
-  offset1 = fir->taps - offset2;
-  y = 0;
-  for (i = fir->taps - 1; i >= offset1; i--)
-    y += fir->coeffs[i] * fir->history[i - offset1];
-  for (; i >= 0; i--)
-    y += fir->coeffs[i] * fir->history[i + offset2];
-#endif
-  if (fir->curr_pos <= 0)
-    fir->curr_pos = fir->taps;
-  fir->curr_pos--;
-  return (int16_t) (y >> 15);
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ const int16_t *fir32_create(fir32_state_t * fir, const int32_t * coeffs,
-                                              int taps)
-{
-  fir->taps = taps;
-  fir->curr_pos = taps - 1;
-  fir->coeffs = coeffs;
-  fir->history = (int16_t *) malloc(taps * sizeof(int16_t));
-  if (fir->history)
-    memset(fir->history, '\0', taps * sizeof(int16_t));
-  return fir->history;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ void fir32_flush(fir32_state_t * fir)
-{
-  memset(fir->history, 0, fir->taps * sizeof(int16_t));
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ void fir32_free(fir32_state_t * fir)
-{
-  free(fir->history);
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ int16_t fir32(fir32_state_t * fir, int16_t sample)
-{
-  int i;
-  int32_t y;
-  int offset1;
-  int offset2;
-
-  fir->history[fir->curr_pos] = sample;
-  offset2 = fir->curr_pos;
-  offset1 = fir->taps - offset2;
-  y = 0;
-  for (i = fir->taps - 1; i >= offset1; i--)
-    y += fir->coeffs[i] * fir->history[i - offset1];
-  for (; i >= 0; i--)
-    y += fir->coeffs[i] * fir->history[i + offset2];
-  if (fir->curr_pos <= 0)
-    fir->curr_pos = fir->taps;
-  fir->curr_pos--;
-  return (int16_t) (y >> 15);
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ const float *fir_float_create(fir_float_state_t * fir,
-                                                const float *coeffs, int taps)
-{
-  fir->taps = taps;
-  fir->curr_pos = taps - 1;
-  fir->coeffs = coeffs;
-  fir->history = (float *) malloc(taps * sizeof(float));
-  if (fir->history)
-    memset(fir->history, '\0', taps * sizeof(float));
-  return fir->history;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ void fir_float_free(fir_float_state_t * fir)
-{
-  free(fir->history);
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static __inline__ int16_t fir_float(fir_float_state_t * fir, int16_t sample)
-{
-  int i;
-  float y;
-  int offset1;
-  int offset2;
-
-  fir->history[fir->curr_pos] = sample;
-
-  offset2 = fir->curr_pos;
-  offset1 = fir->taps - offset2;
-  y = 0;
-  for (i = fir->taps - 1; i >= offset1; i--)
-    y += fir->coeffs[i] * fir->history[i - offset1];
-  for (; i >= 0; i--)
-    y += fir->coeffs[i] * fir->history[i + offset2];
-  if (fir->curr_pos <= 0)
-    fir->curr_pos = fir->taps;
-  fir->curr_pos--;
-  return (int16_t) y;
-}
-
-/*- End of function --------------------------------------------------------*/
-#endif
-
-/*- End of file ------------------------------------------------------------*/
-
-/*
- * SpanDSP - a series of DSP components for telephony
- *
- * echo.h - An echo cancellor, suitable for electrical and acoustic
- *	    cancellation. This code does not currently comply with
- *	    any relevant standards (e.g. G.164/5/7/8).
- *
- * Written by Steve Underwood <steveu@coppice.org>
- *
- * Copyright (C) 2001 Steve Underwood
- *
- * Based on a bit from here, a bit from there, eye of toad,
- * ear of bat, etc - plus, of course, my own 2 cents.
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- * This program 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: echo.h,v 1.9 2006/10/24 13:45:28 steveu Exp $
- */
-
-/*! \file */
-
-/*! \page echo_can_page Line echo cancellation for voice
-
-\section echo_can_page_sec_1 What does it do?
-This module aims to provide G.168-2002 compliant echo cancellation, to remove
-electrical echoes (e.g. from 2-4 wire hybrids) from voice calls.
-
-\section echo_can_page_sec_2 How does it work?
-The heart of the echo cancellor is FIR filter. This is adapted to match the echo
-impulse response of the telephone line. It must be long enough to adequately cover
-the duration of that impulse response. The signal transmitted to the telephone line
-is passed through the FIR filter. Once the FIR is properly adapted, the resulting
-output is an estimate of the echo signal received from the line. This is subtracted
-from the received signal. The result is an estimate of the signal which originated
-at the far end of the line, free from echos of our own transmitted signal. 
-
-The least mean squares (LMS) algorithm is attributed to Widrow and Hoff, and was
-introduced in 1960. It is the commonest form of filter adaption used in things
-like modem line equalisers and line echo cancellers. There it works very well.
-However, it only works well for signals of constant amplitude. It works very poorly
-for things like speech echo cancellation, where the signal level varies widely.
-This is quite easy to fix. If the signal level is normalised - similar to applying
-AGC - LMS can work as well for a signal of varying amplitude as it does for a modem
-signal. This normalised least mean squares (NLMS) algorithm is the commonest one used
-for speech echo cancellation. Many other algorithms exist - e.g. RLS (essentially
-the same as Kalman filtering), FAP, etc. Some perform significantly better than NLMS.
-However, factors such as computational complexity and patents favour the use of NLMS.
-
-A simple refinement to NLMS can improve its performance with speech. NLMS tends
-to adapt best to the strongest parts of a signal. If the signal is white noise,
-the NLMS algorithm works very well. However, speech has more low frequency than
-high frequency content. Pre-whitening (i.e. filtering the signal to flatten
-its spectrum) the echo signal improves the adapt rate for speech, and ensures the
-final residual signal is not heavily biased towards high frequencies. A very low
-complexity filter is adequate for this, so pre-whitening adds little to the
-compute requirements of the echo canceller.
-
-An FIR filter adapted using pre-whitened NLMS performs well, provided certain
-conditions are met: 
-
-    - The transmitted signal has poor self-correlation.
-    - There is no signal being generated within the environment being cancelled.
-
-The difficulty is that neither of these can be guaranteed.
-
-If the adaption is performed while transmitting noise (or something fairly noise
-like, such as voice) the adaption works very well. If the adaption is performed
-while transmitting something highly correlative (typically narrow band energy
-such as signalling tones or DTMF), the adaption can go seriously wrong. The reason
-is there is only one solution for the adaption on a near random signal - the impulse
-response of the line. For a repetitive signal, there are any number of solutions
-which converge the adaption, and nothing guides the adaption to choose the generalised
-one. Allowing an untrained canceller to converge on this kind of narrowband
-energy probably a good thing, since at least it cancels the tones. Allowing a well
-converged canceller to continue converging on such energy is just a way to ruin
-its generalised adaption. A narrowband detector is needed, so adapation can be
-suspended at appropriate times.
-
-The adaption process is based on trying to eliminate the received signal. When
-there is any signal from within the environment being cancelled it may upset the
-adaption process. Similarly, if the signal we are transmitting is small, noise
-may dominate and disturb the adaption process. If we can ensure that the
-adaption is only performed when we are transmitting a significant signal level,
-and the environment is not, things will be OK. Clearly, it is easy to tell when
-we are sending a significant signal. Telling, if the environment is generating a
-significant signal, and doing it with sufficient speed that the adaption will
-not have diverged too much more we stop it, is a little harder. 
-
-The key problem in detecting when the environment is sourcing significant energy
-is that we must do this very quickly. Given a reasonably long sample of the
-received signal, there are a number of strategies which may be used to assess
-whether that signal contains a strong far end component. However, by the time
-that assessment is complete the far end signal will have already caused major
-mis-convergence in the adaption process. An assessment algorithm is needed which
-produces a fairly accurate result from a very short burst of far end energy. 
-
-\section echo_can_page_sec_3 How do I use it?
-The echo cancellor processes both the transmit and receive streams sample by
-sample. The processing function is not declared inline. Unfortunately,
-cancellation requires many operations per sample, so the call overhead is only a
-minor burden. 
-*/
-
-#define NONUPDATE_DWELL_TIME	600 /* 600 samples, or 75ms */
-
-#if 0
-/* Mask bits for the adaption mode */
-#define ECHO_CAN_USE_NLP            0x01
-#define ECHO_CAN_USE_SUPPRESSOR     0x02
-#define ECHO_CAN_USE_CNG            0x04
-#define ECHO_CAN_USE_ADAPTION       0x08
-
-/*!
-    G.168 echo canceller descriptor. This defines the working state for a line
-    echo canceller.
-*/
-typedef struct {
-  int tx_power[4];
-  int rx_power[3];
-  int clean_rx_power;
-
-  int rx_power_threshold;
-  int nonupdate_dwell;
-
-  fir16_state_t fir_state;
-  /*! Echo FIR taps (16 bit version) */
-  int16_t *fir_taps16[4];
-  /*! Echo FIR taps (32 bit version) */
-  int32_t *fir_taps32;
-
-  int curr_pos;
-
-  int taps;
-  int tap_mask;
-  int adaption_mode;
-
-  int32_t supp_test1;
-  int32_t supp_test2;
-  int32_t supp1;
-  int32_t supp2;
-  int vad;
-  int cng;
-  /* Parameters for the Hoth noise generator */
-  int cng_level;
-  int cng_rndnum;
-  int cng_filter;
-
-  int16_t geigel_max;
-  int geigel_lag;
-  int dtd_onset;
-  int tap_set;
-  int tap_rotate_counter;
-
-  int32_t latest_correction;    /* Indication of the magnitude of the latest
-                                   adaption, or a code to indicate why adaption
-                                   was skipped, for test purposes */
-  int32_t last_acf[28];
-  int narrowband_count;
-  int narrowband_score;
-} echo_can_state_t;
-
-/*! Create a voice echo canceller context.
-    \param len The length of the canceller, in samples.
-    \return The new canceller context, or NULL if the canceller could not be created.
-*/
-echo_can_state_t *echo_can_create(int len, int adaption_mode);
-
-/*! Free a voice echo canceller context.
-    \param ec The echo canceller context.
-*/
-void echo_can_free(echo_can_state_t * ec);
-
-/*! Flush (reinitialise) a voice echo canceller context.
-    \param ec The echo canceller context.
-*/
-void echo_can_flush(echo_can_state_t * ec);
-
-/*! Set the adaption mode of a voice echo canceller context.
-    \param ec The echo canceller context.
-    \param adapt The mode.
-*/
-void echo_can_adaption_mode(echo_can_state_t * ec, int adaption_mode);
-
-/*! Process a sample through a voice echo canceller.
-    \param ec The echo canceller context.
-    \param tx The transmitted audio sample.
-    \param rx The received audio sample.
-    \return The clean (echo cancelled) received sample.
-*/
-int16_t echo_can_update(echo_can_state_t * ec, int16_t tx, int16_t rx);
-
-#endif
-/*- End of file ------------------------------------------------------------*/
-
-/*!
-    Floating point Goertzel filter descriptor.
-*/
-typedef struct {
-  float fac;
-  int samples;
-} goertzel_descriptor_t;
-
-/*!
-    Floating point Goertzel filter state descriptor.
-*/
-typedef struct {
-  float v2;
-  float v3;
-  float fac;
-  int samples;
-  int current_sample;
-} goertzel_state_t;
-
-/*! \brief Create a descriptor for use with either a Goertzel transform */
-void make_goertzel_descriptor(goertzel_descriptor_t * t, float freq, int samples);
-
-/*! \brief Initialise the state of a Goertzel transform.
-    \param s The Goertzel context. If NULL, a context is allocated with malloc.
-    \param t The Goertzel descriptor.
-    \return A pointer to the Goertzel state. */
-goertzel_state_t *goertzel_init(goertzel_state_t * s, goertzel_descriptor_t * t);
-
-/*! \brief Reset the state of a Goertzel transform.
-    \param s The Goertzel context.
-    \param t The Goertzel descriptor.
-    \return A pointer to the Goertzel state. */
-void goertzel_reset(goertzel_state_t * s);
-
-/*! \brief Update the state of a Goertzel transform.
-    \param s The Goertzel context
-    \param amp The samples to be transformed
-    \param samples The number of samples
-    \return The number of samples unprocessed */
-int goertzel_update(goertzel_state_t * s, const int16_t amp[], int samples);
-
-/*! \brief Evaluate the final result of a Goertzel transform.
-    \param s The Goertzel context
-    \return The result of the transform. */
-float goertzel_result(goertzel_state_t * s);
-
-/*! \brief Update the state of a Goertzel transform.
-    \param s The Goertzel context
-    \param amp The sample to be transformed. */
-static __inline__ void goertzel_sample(goertzel_state_t * s, int16_t amp)
-{
-  float v1;
-
-  v1 = s->v2;
-  s->v2 = s->v3;
-  s->v3 = s->fac * s->v2 - v1 + amp;
-  s->current_sample++;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-/*
- * SpanDSP - a series of DSP components for telephony
- *
- * tone_detect.c - General telephony tone detection.
- *
- * Written by Steve Underwood <steveu@coppice.org>
- *
- * Copyright (C) 2001-2003, 2005 Steve Underwood
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- * This program 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: tone_detect.c,v 1.31 2007/03/03 10:40:33 steveu Exp $
- */
-
-/*! \file tone_detect.h */
-
-#if !defined(M_PI)
-/* C99 systems may not define M_PI */
-#define M_PI 3.14159265358979323846264338327
-#endif
-/*! \page dtmf_rx_page DTMF receiver
-\section dtmf_rx_page_sec_1 What does it do?
-The DTMF receiver detects the standard DTMF digits. It is compliant with
-ITU-T Q.23, ITU-T Q.24, and the local DTMF specifications of most administrations.
-Its passes the test suites. It also scores *very* well on the standard
-talk-off tests. 
-
-The current design uses floating point extensively. It is not tolerant of DC.
-It is expected that a DC restore stage will be placed before the DTMF detector.
-Unless the dial tone filter is switched on, the detector has poor tolerance
-of dial tone. Whether this matter depends on your application. If you are using
-the detector in an IVR application you will need proper echo cancellation to
-get good performance in the presence of speech prompts, so dial tone will not
-exist. If you do need good dial tone tolerance, a dial tone filter can be
-enabled in the detector.
-
-\section dtmf_rx_page_sec_2 How does it work?
-Like most other DSP based DTMF detector's, this one uses the Goertzel algorithm
-to look for the DTMF tones. What makes each detector design different is just how
-that algorithm is used.
-
-Basic DTMF specs:
-    - Minimum tone on = 40ms
-    - Minimum tone off = 50ms
-    - Maximum digit rate = 10 per second
-    - Normal twist <= 8dB accepted
-    - Reverse twist <= 4dB accepted
-    - S/N >= 15dB will detect OK
-    - Attenuation <= 26dB will detect OK
-    - Frequency tolerance +- 1.5% will detect, +-3.5% will reject
-
-TODO:
-*/
-
-/*! \page dtmf_tx_page DTMF tone generation
-\section dtmf_tx_page_sec_1 What does it do?
-
-The DTMF tone generation module provides for the generation of the
-repertoire of 16 DTMF dual tones. 
-
-\section dtmf_tx_page_sec_2 How does it work?
-*/
-
-#define MAX_DTMF_DIGITS 128
-
-typedef void (*dtmf_rx_callback_t) (void *user_data, const char *digits, int len);
-
-/*!
-    DTMF generator state descriptor. This defines the state of a single
-    working instance of a DTMF generator.
-*/
-#if 0
-typedef struct {
-  tone_gen_descriptor_t *tone_descriptors;
-  tone_gen_state_t tones;
-  char digits[MAX_DTMF_DIGITS + 1];
-  int current_sample;
-  size_t current_digits;
-} dtmf_tx_state_t;
-
-#endif
-
-/*!
-    DTMF digit detector descriptor.
-*/
-typedef struct {
-  /*! Optional callback funcion to deliver received digits. */
-  dtmf_rx_callback_t callback;
-  /*! An opaque pointer passed to the callback function. */
-  void *callback_data;
-  /*! Optional callback funcion to deliver real time digit state changes. */
-  //tone_report_func_t realtime_callback;
-  void *realtime_callback;
-  /*! An opaque pointer passed to the real time callback function. */
-  void *realtime_callback_data;
-  /*! TRUE if dialtone should be filtered before processing */
-  int filter_dialtone;
-  /*! Maximum acceptable "normal" (lower bigger than higher) twist ratio */
-  float normal_twist;
-  /*! Maximum acceptable "reverse" (higher bigger than lower) twist ratio */
-  float reverse_twist;
-
-  /*! 350Hz filter state for the optional dialtone filter */
-  float z350_1;
-  float z350_2;
-  /*! 440Hz filter state for the optional dialtone filter */
-  float z440_1;
-  float z440_2;
-
-  /*! Tone detector working states */
-  goertzel_state_t row_out[4];
-  goertzel_state_t col_out[4];
-  /*! The accumlating total energy on the same period over which the Goertzels work. */
-  float energy;
-  /*! The result of the last tone analysis. */
-  uint8_t last_hit;
-  /*! The confirmed digit we are currently receiving */
-  uint8_t in_digit;
-  /*! The current sample number within a processing block. */
-  int current_sample;
-
-  /*! The received digits buffer. This is a NULL terminated string. */
-  char digits[MAX_DTMF_DIGITS + 1];
-  /*! The number of digits currently in the digit buffer. */
-  int current_digits;
-  /*! The number of digits which have been lost due to buffer overflows. */
-  int lost_digits;
-} dtmf_rx_state_t;
-
-#if 0
-/*! \brief Generate a buffer of DTMF tones.
-    \param s The DTMF generator context.
-    \param amp The buffer for the generated signal.
-    \param max_samples The required number of generated samples.
-    \return The number of samples actually generated. This may be less than 
-            samples if the input buffer empties. */
-int dtmf_tx(dtmf_tx_state_t * s, int16_t amp[], int max_samples);
-
-/*! \brief Put a string of digits in a DTMF generator's input buffer.
-    \param s The DTMF generator context.
-    \param digits The string of digits to be added.
-    \return The number of digits actually added. This may be less than the
-            length of the digit string, if the buffer fills up. */
-size_t dtmf_tx_put(dtmf_tx_state_t * s, const char *digits);
-
-/*! \brief Initialise a DTMF tone generator context.
-    \param s The DTMF generator context.
-    \return A pointer to the DTMF generator context. */
-dtmf_tx_state_t *dtmf_tx_init(dtmf_tx_state_t * s);
-#endif
-
-/*! Set a optional realtime callback for a DTMF receiver context. This function
-    is called immediately a confirmed state change occurs in the received DTMF. It
-    is called with the ASCII value for a DTMF tone pair, or zero to indicate no tone
-    is being received.
-    \brief Set a realtime callback for a DTMF receiver context.
-    \param s The DTMF receiver context.
-    \param callback Callback routine used to report the start and end of digits.
-    \param user_data An opaque pointer which is associated with the context,
-           and supplied in callbacks. */
-void dtmf_rx_set_realtime_callback(dtmf_rx_state_t * s,
-                                   //tone_report_func_t callback,
-                                   void *callback, void *user_data);
-
-/*! \brief Adjust a DTMF receiver context.
-    \param s The DTMF receiver context.
-    \param filter_dialtone TRUE to enable filtering of dialtone, FALSE
-           to disable, < 0 to leave unchanged.
-    \param twist Acceptable twist, in dB. < 0 to leave unchanged.
-    \param reverse_twist Acceptable reverse twist, in dB. < 0 to leave unchanged. */
-void dtmf_rx_parms(dtmf_rx_state_t * s, int filter_dialtone, int twist,
-                   int reverse_twist);
-
-/*! Process a block of received DTMF audio samples.
-    \brief Process a block of received DTMF audio samples.
-    \param s The DTMF receiver context.
-    \param amp The audio sample buffer.
-    \param samples The number of samples in the buffer.
-    \return The number of samples unprocessed. */
-int dtmf_rx(dtmf_rx_state_t * s, const int16_t amp[], int samples);
-
-/*! \brief Get a string of digits from a DTMF receiver's output buffer.
-    \param s The DTMF receiver context.
-    \param digits The buffer for the received digits.
-    \param max The maximum  number of digits to be returned,
-    \return The number of digits actually returned. */
-size_t dtmf_rx_get(dtmf_rx_state_t * s, char *digits, int max);
-
-/*! \brief Initialise a DTMF receiver context.
-    \param s The DTMF receiver context.
-    \param callback An optional callback routine, used to report received digits. If
-           no callback routine is set, digits may be collected, using the dtmf_rx_get()
-           function.
-    \param user_data An opaque pointer which is associated with the context,
-           and supplied in callbacks.
-    \return A pointer to the DTMF receiver context. */
-dtmf_rx_state_t *dtmf_rx_init(dtmf_rx_state_t * s, dtmf_rx_callback_t callback,
-                              void *user_data);
-
-/*- End of file ------------------------------------------------------------*/
-
-#endif /* _CELLIAX_SPANDSP_H */
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/chan_celliax.c b/src/mod/endpoints/mod_gsmopen/asterisk/chan_celliax.c
deleted file mode 100644
index 32c6fef4b8..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/chan_celliax.c
+++ /dev/null
@@ -1,3094 +0,0 @@
-//indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90 
-#include "celliax.h"
-
-/* GLOBAL VARIABLES */
-char celliax_console_active_array[50] = "";
-char *celliax_console_active = celliax_console_active_array;
-/*! \brief Count of active channels for this module */
-int celliax_usecnt = 0;
-int celliax_debug = 0;
-/*! \brief This is the thread for the monitor which checks for input on the channels
- *    which are not currently in use.  */
-pthread_t celliax_monitor_thread = AST_PTHREADT_NULL;
-pthread_t celliax_monitor_audio_thread = AST_PTHREADT_NULL;
-int celliax_dir_entry_extension = 0;
-
-/* CONSTANTS */
-/*! \brief Name of configuration file for this module */
-const char celliax_config[] = "celliax.conf";
-
-/*! \brief Textual description for this module */
-const char celliax_desc[] = "Celliax, Audio-Serial Driver";
-/*! \brief Textual type for this module */
-const char celliax_type[] = "Celliax";
-
-/*! \brief Definition of this channel for PBX channel registration */
-const struct ast_channel_tech celliax_tech = {
-  .type = celliax_type,
-  .description = celliax_desc,
-  .capabilities = AST_FORMAT_SLINEAR,
-  .requester = celliax_request,
-  .hangup = celliax_hangup,
-  .answer = celliax_answer,
-  .read = celliax_read,
-  .call = celliax_call,
-  .write = celliax_write,
-  .indicate = celliax_indicate,
-  .fixup = celliax_fixup,
-  .devicestate = celliax_devicestate,
-#ifdef ASTERISK_VERSION_1_4
-  .send_digit_begin = celliax_senddigit_begin,
-  .send_digit_end = celliax_senddigit_end,
-#else /* ASTERISK_VERSION_1_4 */
-  .send_digit = celliax_senddigit,
-#endif /* ASTERISK_VERSION_1_4 */
-};
-
-#ifdef ASTERISK_VERSION_1_4
-#include "asterisk/abstract_jb.h"
-/*! Global jitterbuffer configuration - by default, jb is disabled */
-static struct ast_jb_conf default_jbconf = {
-	.flags = 0,
-	.max_size = -1,
-	.resync_threshold = -1,
-	.impl = ""
-};
-static struct ast_jb_conf global_jbconf;
-#endif /* ASTERISK_VERSION_1_4 */
-
-
-#ifdef CELLIAX_ALSA
-char celliax_console_alsa_period_usage[] =
-  "Usage: celliax_alsa_period [alsa_period_size, in bytes] [alsa_periods_in_buffer, how many]\n"
-  "       Shows or set the values of the period and the buffer used by the ALSA subsistem. Standard values are 160 for alsa_period_size and 4 for alsa_periods_in_buffer. Without specifying a value, it just shows the current values. The values are for the  \"current\" console (Celliax) channel.\n"
-  "       Enter 'help console' on how to change the \"current\" console\n";
-#endif /* CELLIAX_ALSA */
-
-char mandescr_celliax_sendsms[] =
-  "Description: Send an SMS through the designated Celliax interface.\n" "Variables: \n"
-  "  Interface: <name>  The Celliax interface name you want to use.\n"
-  "  Number: <number>   The recipient number you want to send the SMS to.\n"
-  "  Text: <text>       The text of the SMS to be sent.\n"
-  "  ActionID: <id>     The Action ID for this AMI transaction.\n";
-
-char celliax_console_celliax_usage[] =
-  "       \n" "chan_celliax commands info\n" "       \n"
-  "       chan_celliax adds to Asterisk the following CLI commands and DIALPLAN applications:\n"
-  "       \n" "       CLI COMMANDS:\n" "          celliax_hangup\n"
-  "          celliax_dial\n" "          celliax_console\n"
-#ifdef CELLIAX_DIR
-  "          celliax_dir_import\n" "          celliax_dir_export\n"
-#endif /* CELLIAX_DIR */
-  "          celliax_playback_boost\n" "          celliax_capture_boost\n"
-  "          celliax_sendsms\n" "          celliax_echo\n" "          celliax_at\n"
-  "       \n" "       DIALPLAN APPLICATIONS:\n" "          CelliaxSendsms\n" "       \n"
-  "       You can type 'help [command]' or 'show application [application]' to obtain more specific info on usage.\n"
-  "       \n";
-char celliax_console_hangup_usage[] =
-  "Usage: celliax_hangup\n"
-  "       Hangs up any call currently placed on the \"current\" celliax_console (Celliax) channel.\n"
-  "       Enter 'help celliax_console' on how to change the \"current\" celliax_console\n";
-char celliax_console_playback_boost_usage[] =
-  "Usage: celliax_playback_boost [value]\n"
-  "       Shows or set the value of boost applied to the outgoing sound (voice). Possible values are: 0 (no boost applied), -40 to 40 (negative to positive range, in db). Without specifying a value, it just shows the current value. The value is for the  \"current\" celliax_console (Celliax) channel.\n"
-  "       Enter 'help celliax_console' on how to change the \"current\" celliax_console\n";
-char celliax_console_capture_boost_usage[] =
-  "Usage: celliax_capture_boost [value]\n"
-  "       Shows or set the value of boost applied to the incoming sound (voice). Possible values are: 0 (no boost applied), -40 to 40 (negative to positive range, in db). Without specifying a value, it just shows the current value. The value is for the  \"current\" celliax_console (Celliax) channel.\n"
-  "       Enter 'help celliax_console' on how to change the \"current\" celliax_console\n";
-
-#ifdef CELLIAX_DIR
-char celliax_console_celliax_dir_import_usage[] =
-  "Usage: celliax_dir_import [add | replace] fromcell\n"
-  "       Write in the celliax_dir.conf config file all the entries found in the phonebook of the cellphone connected on the \"current\" celliax_console (Celliax) channel or in the 'Contacts' list of the Skype client.\n"
-  "       Enter 'help celliax_console' on how to change the \"current\" celliax_console\n";
-char celliax_console_celliax_dir_export_usage[] =
-#ifdef CELLIAX_LIBCSV
-  "Usage: celliax_dir_export tocell|tocsv celliax_cellphonenumber [csv_filename]\n"
-#else /* CELLIAX_LIBCSV */
-  "Usage: celliax_dir_export tocell celliax_cellphonenumber\n"
-#endif /* CELLIAX_LIBCSV */
-  "       With 'tocell' modifier, write in the cellphone connected on the \"current\" celliax_console (Celliax) all the entries found in directoriax.conf, in the form: [celliax_cellphonenumber]wait_for_answer celliax_dir_prefix celliax_dir_entry. So, you can choose the new entry from the cellphone phonebook, dial it, and be directly connected to celliax_dir extension chosen, without having to pass through the voice menu.\n"
-#ifdef CELLIAX_LIBCSV
-  "       With 'tocsv' modifier, write in a file (Comma Separated Values, suitable to be imported by various software (eg Outlook) and smartphones) all the entries found in directoriax.conf, in the form: [celliax_cellphonenumber]wait_for_answer celliax_dir_prefix celliax_dir_entry. So, you can choose the new entry from the imported phonebook, dial it, and be directly connected to celliax_dir extension chosen, without having to pass through the voice menu.\n"
-#endif /* CELLIAX_LIBCSV */
-  "       Enter 'help celliax_console' on how to change the \"current\" celliax_console\n";
-
-#endif /* CELLIAX_DIR */
-
-char celliax_console_dial_usage[] =
-  "Usage: celliax_dial [DTMFs]\n"
-  "       Dials a given DTMF string in the call currently placed on the\n"
-  "       \"current\" celliax_console (Celliax) channel.\n"
-  "       Enter 'help celliax_console' on how to change the \"current\" celliax_console\n";
-char celliax_console_sendsms_usage[] =
-  "Usage: celliax_sendsms interfacename/number_to_send_sms_to SMS_TEXT\n"
-  "  This CLI command will use the specified Celliax interface to send an SMS with content SMS_TEXT to the number_to_send_sms_to\n"
-  "  Eg:\n" "  celliax_sendsms nicephone/3472665618 \"ciao bello\"\n";
-
-char celliax_console_celliax_console_usage[] =
-  "Usage: celliax_console [interface] | show\n"
-  "       If used without a parameter, displays which interface is the \"current\"\n"
-  "       celliax_console.  If a device is specified, the \"current\" celliax_console is changed to\n"
-  "       the interface specified.\n"
-  "       If the parameter is \"show\", the available interfaces are listed\n";
-char *celliax_sendsmsapp = "CelliaxSendsms";
-
-char *celliax_sendsmssynopsis = "CelliaxSendsms sends an SMS through the cellphone";
-char *celliax_sendsmsdescrip =
-  "  CelliaxSendsms(interface_name / number_to_send_sms_to , SMS_TEXT):\n"
-  "  This application will use the specified Celliax interface to send an SMS with content SMS_TEXT to the number_to_send_sms_to\n"
-  "  Eg:\n" "  CelliaxSendsms(nicephone/3472665618,\"ciao bello\")\n" "  or\n"
-  "  CelliaxSendsms(nicephone/3472665618,${DATETIME}\"ciao bello\")\n" "\n";
-char celliax_console_echo_usage[] =
-  "Usage: celliax_echo [0|1] [0|1]\n"
-  "       Shows or set the values (0 meaning OFF and 1 meaning ON) of the echo suppression options: speexecho and speexpreprocess. Without specifying a value, it just shows the current values. The values are for the  \"current\" celliax_console (Celliax) channel.\n"
-  "       Enter 'help celliax_console' on how to change the \"current\" celliax_console\n";
-char celliax_console_at_usage[] =
-  "Usage: celliax_at [command string]\n"
-  "       Send the 'command string' to the 'AT modem' (cellphone) connected to the  \"current\" celliax_console (Celliax) channel.\n"
-  "       Enter 'help celliax_console' on how to change the \"current\" celliax_console\n";
-/*! \brief fake celliax_pvt structure values, 
- * just for logging purposes */
-struct celliax_pvt celliax_log_struct = {
-  .name = "none",
-};
-
-/*! \brief Default celliax_pvt structure values, 
- * used by celliax_mkif to initialize the interfaces */
-struct celliax_pvt celliax_default = {
-  .readpos = AST_FRIENDLY_OFFSET,   /* start here on reads */
-  .oss_write_dst = 0,           /* start here on reads */
-  .interface_state = AST_STATE_DOWN,
-  .phone_callflow = CALLFLOW_CALL_IDLE,
-  .dsp_silence_threshold = 512,
-  .context = "default",
-  .language = "en",
-  .exten = "s",
-  .controldevice_name = "none",
-  .controldevfd = 0,
-  .next = NULL,
-  .owner = NULL,
-  .dsp = NULL,
-  .fbus2_outgoing_list = NULL,
-  .seqnumfbus = FBUS2_SEQNUM_MAX,
-  .controldev_thread = AST_PTHREADT_NULL,
-  .arraycounter = 0,
-#ifndef GIOVA48
-  .celliax_sound_rate = 8000,
-#else // GIOVA48
-  .celliax_sound_rate = 48000,
-#endif // GIOVA48
-  .celliax_sound_capt_fd = -1,
-  .need_acoustic_ring = 0,
-  .celliax_serial_synced_timestamp = 0,
-  .celliax_serial_sync_period = 300,
-  .audio_play_reset_timestamp = 0,
-  .audio_capture_reset_timestamp = 0,
-  .controldevice_speed = B38400,
-  .capture_boost = 0,
-  .playback_boost = 0,
-  .stripmsd = 0,
-  .controldev_dead = 0,
-  .dtmf_inited = 0,
-  .at_dial_pre_number = "AT+CKPD=\"",
-  //.at_dial_post_number = "S\"",
-  .at_dial_post_number = ";",
-  .at_dial_expect = "OK",
-  .at_early_audio = 0,
-  .at_hangup = "AT+CKPD=\"E\"",
-  .at_hangup_expect = "OK",
-  .at_answer = "ATA",
-  .at_answer_expect = "OK",
-  .at_send_dtmf = "AT+CKPD",
-  .at_initial_pause = 0,
-  .at_preinit_1 = "",
-  .at_preinit_1_expect = "",
-  .at_preinit_2 = "",
-  .at_preinit_2_expect = "",
-  .at_preinit_3 = "",
-  .at_preinit_3_expect = "",
-  .at_preinit_4 = "",
-  .at_preinit_4_expect = "",
-  .at_preinit_5 = "",
-  .at_preinit_5_expect = "",
-  .at_after_preinit_pause = 0,
-  .at_postinit_1 = "",
-  .at_postinit_1_expect = "",
-  .at_postinit_2 = "",
-  .at_postinit_2_expect = "",
-  .at_postinit_3 = "",
-  .at_postinit_3_expect = "",
-  .at_postinit_4 = "",
-  .at_postinit_4_expect = "",
-  .at_postinit_5 = "",
-  .at_postinit_5_expect = "",
-  .at_query_battchg = "",
-  .at_query_battchg_expect = "",
-  .at_query_signal = "",
-  .at_query_signal_expect = "",
-  .at_call_idle = "",
-  .at_call_incoming = "",
-  .at_call_active = "",
-  .at_call_failed = "",
-  .at_call_calling = "",
-  .at_indicator_noservice_string = "CIEV: 2,0",
-  .at_indicator_nosignal_string = "CIEV: 5,0",
-  .at_indicator_lowsignal_string = "CIEV: 5,1",
-  .at_indicator_lowbattchg_string = "CIEV: 0,1",
-  .at_indicator_nobattchg_string = "CIEV: 0,0",
-  .at_indicator_callactive_string = "CIEV: 3,1",
-  .at_indicator_nocallactive_string = "CIEV: 3,0",
-  .at_indicator_nocallsetup_string = "CIEV: 6,0",
-  .at_indicator_callsetupincoming_string = "CIEV: 6,1",
-  .at_indicator_callsetupoutgoing_string = "CIEV: 6,2",
-  .at_indicator_callsetupremoteringing_string = "CIEV: 6,3",
-  .at_has_clcc = 0,
-  .at_has_ecam = 0,
-
-  .skype = 0,
-  .celliax_dir_entry_extension_prefix = 5,
-
-#ifdef CELLIAX_CVM
-  .cvm_subsc_1_pin = "0000",
-  .cvm_subsc_2_pin = "0000",
-  .cvm_subsc_no = 1,
-  .cvm_lock_state = CVM_UNKNOWN_LOCK_STATE,
-  .cvm_register_state = CVM_UNKNOWN_REGISTER_STATE,
-  .cvm_busmail_outgoing_list = NULL,
-  .busmail_rxseq_cvm_last = 0xFF,   /*!< \brief sequential number of BUSMAIL messages, (0-7) */
-  .busmail_txseq_celliax_last = 0xFF,   /*!< \brief sequential number of BUSMAIL messages, (0-7) */
-  .cvm_volume_level = 5,
-  .cvm_celliax_serial_delay = 200,  /* 200ms delay after sending down the wire, fix for a bug ? */
-  .cvm_handset_no = 0,
-  .cvm_fp_is_cvm = 0,
-  .cvm_rssi = 0,
-
-#endif /* CELLIAX_CVM */
-#ifdef CELLIAX_LIBCSV
-  .csv_separator_is_semicolon = 0,  //FIXME as option
-  .csv_complete_name_pos = 4,   //FIXME as option was 4 for outlook express and some outlook, other outlook 2
-  .csv_email_pos = 6,           //FIXME as option for outlook express
-  .csv_home_phone_pos = 32,     //FIXME as option was 12 for outlook express
-  .csv_mobile_phone_pos = 33,   //FIXME as option was 14 for outlook express
-  .csv_business_phone_pos = 41, //FIXME as option was 22 for outlook express
-  .csv_first_row_is_title = 1,  //FIXME as option
-#endif /* CELLIAX_LIBCSV */
-
-  .audio_play_reset_period = 0, //do not reset
-
-  .isInputInterleaved = 1,
-  .isOutputInterleaved = 1,
-  .numInputChannels = 1,
-  .numOutputChannels = 1,
-#ifndef GIOVA48
-  .framesPerCallback = 160,
-#else // GIOVA48
-  .framesPerCallback = 960,
-#endif // GIOVA48
-  .speexecho = 1,
-  .speexpreprocess = 1,
-  .portaudiocindex = -1,
-  .portaudiopindex = -1,
-#ifdef CELLIAX_ALSA
-  .alsa_period_size = 160,
-  .alsa_periods_in_buffer = 4,
-  .alsac = NULL,
-  .alsap = NULL,
-  .alsawrite_filled = 0,
-#endif /* CELLIAX_ALSA */
-
-};
-
-/*! 
- * \brief PVT structure for a celliax interface (channel), created by celliax_mkif
- */
-struct celliax_pvt *celliax_iflist = NULL;
-
-#ifdef ASTERISK_VERSION_1_6_0
-struct ast_cli_entry myclis[] = {
-  AST_CLI_DEFINE(celliax_console_hangup, "Hangup a call on the console"),
-  //AST_CLI_DEFINE(celliax_console_dial, "Dial an extension on the console"),
-  //AST_CLI_DEFINE(celliax_console_playback_boost, "Sets/displays spk boost in dB"),
-  //AST_CLI_DEFINE(celliax_console_capture_boost, "Sets/displays mic boost in dB"),
-  //AST_CLI_DEFINE(celliax_console_set_active, "Sets/displays active console"),
-  //AST_CLI_DEFINE(celliax_console_at, "Sends an AT command"),
-  //AST_CLI_DEFINE(celliax_console_echo, "Echo suppression"),
-#ifdef CELLIAX_DIR
-  //AST_CLI_DEFINE(celliax_console_celliax_dir_import, "imports entries from cellphone"),
-  //AST_CLI_DEFINE(celliax_console_celliax_dir_export, "exports entries to cellphone"),
-#endif /* CELLIAX_DIR */
-  //AST_CLI_DEFINE(celliax_console_celliax, "all things celliax"),
-  //AST_CLI_DEFINE(celliax_console_sendsms, "Send an SMS from a Celliax interface"),
-};
-#else
-struct ast_cli_entry myclis[] = {
-  {{"celliax_hangup", NULL}, celliax_console_hangup,
-   "Hangup a call on the celliax_console",
-   celliax_console_hangup_usage},
-  {{"celliax_playback_boost", NULL}, celliax_console_playback_boost, "playback boost",
-   celliax_console_playback_boost_usage},
-  {{"celliax_capture_boost", NULL}, celliax_console_capture_boost, "capture boost",
-   celliax_console_capture_boost_usage},
-  {{"celliax_usage", NULL}, celliax_console_celliax, "chan_celliax commands info",
-   celliax_console_celliax_usage},
-
-  {{"celliax_at", NULL}, celliax_console_at, "AT command",
-   celliax_console_at_usage},
-  {{"celliax_echo", NULL}, celliax_console_echo, "echo suppression",
-   celliax_console_echo_usage},
-#ifdef CELLIAX_DIR
-  {{"celliax_dir_import", NULL}, celliax_console_celliax_dir_import,
-   "Write the celliax_dir.conf file, used by celliax_dir app",
-   celliax_console_celliax_dir_import_usage},
-  {{"celliax_dir_export", NULL}, celliax_console_celliax_dir_export,
-   "Write in the cellphone the contents of the celliax_dir.conf file, used by celliax_dir app",
-   celliax_console_celliax_dir_export_usage},
-#endif /* CELLIAX_DIR */
-#ifdef CELLIAX_ALSA
-  {{"celliax_alsa_period", NULL}, console_alsa_period, "alsa_period",
-   celliax_console_alsa_period_usage},
-#endif /* CELLIAX_ALSA */
-
-  {{"celliax_dial", NULL}, celliax_console_dial,
-   "Dial an extension on the celliax_console",
-   celliax_console_dial_usage},
-  {{"celliax_sendsms", NULL}, celliax_console_sendsms,
-   "Send an SMS from a Celliax interface",
-   celliax_console_sendsms_usage},
-  {{"celliax_console", NULL}, celliax_console_set_active,
-   "Sets/displays active celliax_console",
-   celliax_console_celliax_console_usage},
-};
-#endif /* ASTERISK_VERSION_1_6_0 */
-
-/* IMPLEMENTATION */
-
-#ifdef CELLIAX_ALSA
-int console_alsa_period(int fd, int argc, char *argv[])
-{
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-
-  if (argc > 3 || argc == 2)
-    return RESULT_SHOWUSAGE;
-  if (!p) {
-    ast_cli(fd,
-            "No \"current\" console for alsa_period_size, please enter 'help console'\n");
-    return RESULT_SUCCESS;
-  }
-
-  if (argc == 1) {
-    ast_cli(fd,
-            "On the active console, that is [%s], alsa_period_size and alsa_periods_in_buffer are: %d and %d\n",
-            celliax_console_active, p->alsa_period_size, p->alsa_periods_in_buffer);
-  } else if (argc == 3) {
-
-    if (p->owner) {
-      ast_cli(fd,
-              "CANNOT SET alsa_period_size and alsa_periods_in_buffer on the active console, that is [%s], because there is a call ongoing\n",
-              celliax_console_active);
-      return RESULT_SUCCESS;
-    }
-    sscanf(argv[1], "%d", &p->alsa_period_size);
-    sscanf(argv[2], "%d", &p->alsa_periods_in_buffer);
-    ast_cli(fd,
-            "alsa_period_size and alsa_periods_in_buffer on the active console, that is [%s], are now: %d and %d\n",
-            celliax_console_active, p->alsa_period_size, p->alsa_periods_in_buffer);
-
-    if (celliax_monitor_audio_thread
-        && (celliax_monitor_audio_thread != AST_PTHREADT_NULL)
-        && (celliax_monitor_audio_thread != AST_PTHREADT_STOP)) {
-
-      if (pthread_cancel(celliax_monitor_audio_thread)) {
-        ERRORA("pthread_cancel celliax_monitor_audio_thread failed, BAD\n",
-               CELLIAX_P_LOG);
-      }
-      if (pthread_kill(celliax_monitor_audio_thread, SIGURG)) {
-        DEBUGA_PBX("pthread_kill celliax_monitor_audio_thread failed, no problem\n", CELLIAX_P_LOG);    //maybe it just died
-      }
-
-      if (pthread_join(celliax_monitor_audio_thread, NULL)) {
-        ERRORA("pthread_join failed, BAD\n", CELLIAX_P_LOG);
-      }
-    }
-
-    alsa_shutdown(p);
-    //sleep(5);
-    alsa_init(p);
-
-    if (ast_pthread_create
-        (&celliax_monitor_audio_thread, NULL, celliax_do_audio_monitor, NULL) < 0) {
-      ERRORA("Unable to start audio_monitor thread.\n", CELLIAX_P_LOG);
-      return -1;
-    }
-
-    ast_cli(fd,
-            "ACTIVATED alsa_period_size and alsa_periods_in_buffer on the active console\n");
-  }
-
-  return RESULT_SUCCESS;
-}
-#endif /* CELLIAX_ALSA */
-
-void celliax_unlocka_log(void *x)
-{
-  ast_mutex_t *y;
-  y = x;
-  int i;
-
-  for (i = 0; i < 5; i++) {     //let's be generous
-
-    ast_log(LOG_DEBUG,
-            CELLIAX_SVN_VERSION
-            "[%-7lx] I'm a dying thread, and I'm to go unlocking mutex %p for the %dth time\n",
-            (unsigned long int) pthread_self(), y, i);
-
-    ast_mutex_unlock(y);
-  }
-  ast_log(LOG_DEBUG,
-          CELLIAX_SVN_VERSION
-          "[%-7lx] I'm a dying thread, I've finished unlocking mutex %p\n",
-          (unsigned long int) pthread_self(), y);
-}
-
-int celliax_queue_control(struct ast_channel *c, int control)
-{
-  struct celliax_pvt *p = c->tech_pvt;
-  int times;
-
-/* queue the frame */
-  if (p)
-    p->control_to_send = control;
-  else
-    return 0;
-  DEBUGA_PBX("Queued CONTROL FRAME %d\n", CELLIAX_P_LOG, control);
-
-/* wait for the frame to be sent */
-  while (p->control_to_send){
-    usleep(1000);
-    times++;
-    if(times == 1000){
-	    ERRORA("Queued CONTROL FRAME %d FAILED to be sent\n", CELLIAX_P_LOG, control);
-	    p->control_to_send = 0;
-	    break;
-    }
-  }
-
-  return 0;
-}
-
-int celliax_devicestate(void *data)
-{
-  struct celliax_pvt *p = NULL;
-  char *name = data;
-  int res = AST_DEVICE_INVALID;
-
-  if (!data) {
-    ERRORA("Devicestate requested with no data\n", CELLIAX_P_LOG);
-    return res;
-  }
-
-  /* lock the interfaces' list */
-  LOKKA(&celliax_iflock);
-  /* make a pointer to the first interface in the interfaces list */
-  p = celliax_iflist;
-  /* Search for the requested interface and verify if is unowned */
-  while (p) {
-    size_t length = strlen(p->name);
-    /* is this the requested interface? */
-    if (strncmp(name, p->name, length) == 0) {
-      /* is this interface unowned? */
-      if (!p->owner) {
-        res = AST_DEVICE_NOT_INUSE;
-        DEBUGA_PBX("Interface is NOT OWNED by a channel\n", CELLIAX_P_LOG);
-      } else {
-        /* interface owned by a channel */
-        res = AST_DEVICE_INUSE;
-        DEBUGA_PBX("Interface is OWNED by a channel\n", CELLIAX_P_LOG);
-      }
-
-      /* we found the requested interface, bail out from the while loop */
-      break;
-    }
-    /* not yet found, next please */
-    p = p->next;
-  }
-  /* unlock the interfaces' list */
-  UNLOCKA(&celliax_iflock);
-
-  if (res == AST_DEVICE_INVALID) {
-    ERRORA("Checking device state for interface [%s] returning AST_DEVICE_INVALID\n",
-           CELLIAX_P_LOG, name);
-  }
-  return res;
-}
-
-#ifndef ASTERISK_VERSION_1_4
-int celliax_indicate(struct ast_channel *c, int cond)
-#else
-int celliax_indicate(struct ast_channel *c, int cond, const void *data, size_t datalen)
-#endif
-{
-  struct celliax_pvt *p = c->tech_pvt;
-  int res = 0;
-
-  switch (cond) {
-  case AST_CONTROL_BUSY:
-  case AST_CONTROL_CONGESTION:
-  case AST_CONTROL_RINGING:
-  case -1:
-    NOTICA("Let's INDICATE %d\n", CELLIAX_P_LOG, cond);
-    res = -1;                   /* Ask for inband indications */
-    break;
-  case AST_CONTROL_PROGRESS:
-  case AST_CONTROL_PROCEEDING:
-  case AST_CONTROL_VIDUPDATE:
-  case AST_CONTROL_HOLD:
-  case AST_CONTROL_UNHOLD:
-#ifdef ASTERISK_VERSION_1_4
-    //FIXME case AST_CONTROL_SRCUPDATE:
-#endif /* ASTERISK_VERSION_1_4 */
-    NOTICA("Let's NOT INDICATE %d\n", CELLIAX_P_LOG, cond);
-    break;
-  default:
-    WARNINGA("Don't know how to display condition %d on %s\n", CELLIAX_P_LOG, cond,
-             c->name);
-    /* The core will play inband indications for us if appropriate */
-    res = -1;
-  }
-
-  return res;
-}
-
-/*! \brief PBX interface function -build celliax pvt structure 
- *         celliax calls initiated by the PBX arrive here */
-struct ast_channel *celliax_request(const char *type, int format, void *data, int *cause)
-{
-  struct celliax_pvt *p = NULL;
-  struct ast_channel *tmp = NULL;
-  char *name = data;
-
-  if (option_debug) {
-    DEBUGA_PBX("ENTERING FUNC\n", CELLIAX_P_LOG);
-  }
-
-  DEBUGA_PBX("Try to request type: %s, name: %s, cause: %d," " format: %d\n",
-             CELLIAX_P_LOG, type, name, *cause, format);
-
-  if (!data) {
-    ERRORA("Channel requested with no data\n", CELLIAX_P_LOG);
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return NULL;
-  }
-
-  /* lock the interfaces' list */
-  LOKKA(&celliax_iflock);
-  /* make a pointer to the first interface in the interfaces list */
-  p = celliax_iflist;
-  /* Search for the requested interface and verify if is unowned and format compatible */
-  //TODO implement groups a la chan_zap
-  while (p) {
-    size_t length = strlen(p->name);
-    /* is this the requested interface? */
-    if (strncmp(name, p->name, length) == 0) {
-      /* is the requested format supported by this interface? */
-      if ((format & AST_FORMAT_SLINEAR) != 0) {
-        /* is this interface unowned? */
-        if (!p->owner) {
-          DEBUGA_PBX("Requesting: %s, name: %s, format: %d\n", CELLIAX_P_LOG, type, name,
-                     format);
-          /* create a new channel owning this interface */
-          tmp = celliax_new(p, AST_STATE_DOWN, p->context);
-          if (!tmp) {
-            /* the channel was not created, probable memory allocation error */
-            *cause = AST_CAUSE_SWITCH_CONGESTION;
-          }
-        } else {
-          /* interface owned by another channel */
-          WARNINGA("owned by another channel\n", CELLIAX_P_LOG);
-          *cause = AST_CAUSE_REQUESTED_CHAN_UNAVAIL;
-        }
-      } else {
-        /* requested format not supported */
-        WARNINGA("format %d not supported\n", CELLIAX_P_LOG, format);
-        *cause = AST_CAUSE_BEARERCAPABILITY_NOTAVAIL;
-      }
-      /* we found the requested interface, bail out from the while loop */
-      break;
-    }
-    /* not yet found, next please */
-    p = p->next;
-  }
-  /* unlock the interfaces' list */
-  UNLOCKA(&celliax_iflock);
-  /* restart the monitor so it will watch only the remaining unowned interfaces  */
-  celliax_restart_monitor();
-  if (tmp == NULL) {
-    /* new channel was not created */
-    WARNINGA("Unable to create new Celliax channel %s\n", CELLIAX_P_LOG, name);
-  }
-  if (option_debug) {
-    DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-  }
-  /* return the newly created channel */
-  return tmp;
-}
-
-/*! \brief  Hangup celliax call
- * Part of PBX interface, called from ast_hangup */
-
-int celliax_hangup(struct ast_channel *c)
-{
-  struct celliax_pvt *p;
-        int res;
-
-  /* get our celliax pvt interface from channel */
-  p = c->tech_pvt;
-  /* if there is not celliax pvt why we are here ? */
-  if (!p) {
-    ERRORA("Asked to hangup channel not connected\n", CELLIAX_P_LOG);
-    return 0;
-  }
-
-  if (option_debug) {
-    DEBUGA_PBX("ENTERING FUNC\n", CELLIAX_P_LOG);
-  }
-
-    p->phone_callflow = CALLFLOW_CALL_HANGUP_REQUESTED;
-  /* shutdown the serial monitoring thread */
-  if (p->controldev_thread && (p->controldev_thread != AST_PTHREADT_NULL)
-      && (p->controldev_thread != AST_PTHREADT_STOP)) {
-    if (pthread_cancel(p->controldev_thread)) {
-      ERRORA("controldev_thread pthread_cancel failed, maybe he killed himself?\n",
-             CELLIAX_P_LOG);
-    }
-    /* push it, maybe is stuck in a select or so */
-    if (pthread_kill(p->controldev_thread, SIGURG)) {
-      DEBUGA_SERIAL("controldev_thread pthread_kill failed, no problem\n", CELLIAX_P_LOG);
-    }
-#ifndef __CYGWIN__              /* under cygwin, this seems to be not reliable, get stuck at times */
-    /* wait for it to die */
-    if (pthread_join(p->controldev_thread, NULL)) {
-      ERRORA("controldev_thread pthread_join failed, BAD\n", CELLIAX_P_LOG);
-    }
-#else /* __CYGWIN__ */
-/* allow the serial thread to die */
-    usleep(300000);             //300msecs
-#endif /* __CYGWIN__ */
-  }
-  p->controldev_thread = AST_PTHREADT_NULL;
-
-  if (p->controldevprotocol != PROTOCOL_NO_SERIAL) {
-    if (p->interface_state != AST_STATE_DOWN) {
-      /* actually hangup through the serial port */
-      if (p->controldevprotocol != PROTOCOL_NO_SERIAL) {
-        res = celliax_serial_hangup(p);
-        if (res) {
-          ERRORA("celliax_serial_hangup error: %d\n", CELLIAX_P_LOG, res);
-          if (option_debug) {
-            DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-          }
-          return -1;
-        }
-      }
-
-      while (p->interface_state != AST_STATE_DOWN) {
-        usleep(10000);          //10msec
-      }
-      if (p->interface_state != AST_STATE_DOWN) {
-        ERRORA("call hangup failed\n", CELLIAX_P_LOG);
-        return -1;
-      } else {
-        DEBUGA_SERIAL("call hungup\n", CELLIAX_P_LOG);
-      }
-    }
-  } else {
-    p->interface_state = AST_STATE_DOWN;
-    p->phone_callflow = CALLFLOW_CALL_IDLE;
-  }
-  /* if there is a dsp struct alloced, free it */
-  if (p->dsp) {
-    ast_dsp_free(p->dsp);
-    p->dsp = NULL;
-  }
-#ifndef __CYGWIN__
-#ifdef CELLIAX_ALSA
-/* restart alsa */
-  snd_pcm_drop(p->alsap);
-  snd_pcm_prepare(p->alsap);
-
-  snd_pcm_prepare(p->alsac);
-  snd_pcm_start(p->alsac);
-
-    /* shutdown the sound system, close sound fds, and if exist shutdown the sound managing threads */
-    DEBUGA_SOUND("shutting down sound\n", CELLIAX_P_LOG);
-    res = celliax_sound_shutdown(p);
-    if (res == -1) {
-      ERRORA("Failed to shutdown sound\n", CELLIAX_P_LOG);
-    }
-
-
-#endif /* CELLIAX_ALSA */
-
-#endif /* __CYGWIN__ */
-#ifdef CELLIAX_PORTAUDIO
-  speex_echo_state_reset(p->stream->echo_state);
-#endif // CELLIAX_PORTAUDIO
-
-  /* re-init the serial port, be paranoid */
-  if (p->controldevprotocol != PROTOCOL_NO_SERIAL) {
-    p->controldevfd = celliax_serial_init(p, p->controldevice_speed);
-    if (p->controldevfd < 1) {
-      ERRORA("bad, bad, bad\n", CELLIAX_P_LOG);
-      if (option_debug) {
-        DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-      }
-      return -1;
-    }
-  }
-#ifndef ASTERISK_VERSION_1_4
-  /* subtract one to the usage count of Celliax-type channels */
-  LOKKA(&celliax_usecnt_lock);
-  celliax_usecnt--;
-  if (celliax_usecnt < 0)
-    ERRORA("Usecnt < 0???\n", CELLIAX_P_LOG);
-  UNLOCKA(&celliax_usecnt_lock);
-  ast_update_use_count();
-#else /* ASTERISK_VERSION_1_4 */
-	ast_module_unref(ast_module_info->self);
-#endif /* ASTERISK_VERSION_1_4 */
-
-  /* our celliax pvt interface is no more part of a channel */
-  p->owner = NULL;
-  /* our channel has no more this celliax pvt interface to manage */
-  c->tech_pvt = NULL;
-  /* set the channel state to DOWN, eg. available, not in active use */
-  if (ast_setstate(c, AST_STATE_DOWN)) {
-    ERRORA("ast_setstate failed, BAD\n", CELLIAX_P_LOG);
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return -1;
-  }
-
-  if (option_debug)
-    DEBUGA_PBX("Hanged Up\n", CELLIAX_P_LOG);
-  /* restart the monitor thread, so it can recheck which interfaces it have to watch during its loop (the interfaces that are not owned by channels) */
-  if (celliax_restart_monitor()) {
-    ERRORA("celliax_restart_monitor failed, BAD\n", CELLIAX_P_LOG);
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return -1;
-  }
-
-  if (option_debug) {
-    DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-  }
-  return 0;
-}
-
-/*! \brief  Answer incoming call,
- * Part of PBX interface */
-int celliax_answer(struct ast_channel *c)
-{
-  struct celliax_pvt *p = c->tech_pvt;
-  int res;
-
-  if (option_debug) {
-    DEBUGA_PBX("ENTERING FUNC\n", CELLIAX_P_LOG);
-  }
-  /* do something to actually answer the call, if needed (eg. pick up the phone) */
-  if (p->controldevprotocol != PROTOCOL_NO_SERIAL) {
-    if (celliax_serial_answer(p)) {
-      ERRORA("celliax_answer FAILED\n", CELLIAX_P_LOG);
-      if (option_debug) {
-        DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-      }
-      return -1;
-    }
-  }
-  p->interface_state = AST_STATE_UP;
-  p->phone_callflow = CALLFLOW_CALL_ACTIVE;
-
-  while (p->interface_state == AST_STATE_RING) {
-    usleep(10000);              //10msec
-  }
-  if (p->interface_state != AST_STATE_UP) {
-    ERRORA("call answering failed\n", CELLIAX_P_LOG);
-    res = -1;
-  } else {
-    if (option_debug)
-      DEBUGA_PBX("call answered\n", CELLIAX_P_LOG);
-    res = 0;
-#ifdef CELLIAX_PORTAUDIO
-    speex_echo_state_reset(p->stream->echo_state);
-#endif // CELLIAX_PORTAUDIO
-
-    if (p->owner) {
-      DEBUGA_PBX("going to send AST_STATE_UP\n", CELLIAX_P_LOG);
-      ast_setstate(p->owner, AST_STATE_UP);
-      //ast_queue_control(p->owner, AST_CONTROL_ANSWER);
-      //celliax_queue_control(p->owner, AST_CONTROL_ANSWER);
-      DEBUGA_PBX("just sent AST_STATE_UP\n", CELLIAX_P_LOG);
-    }
-  }
-  if (option_debug) {
-    DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-  }
-  return res;
-}
-
-#ifdef ASTERISK_VERSION_1_4
-int celliax_senddigit_begin(struct ast_channel *c, char digit)
-{
-  struct celliax_pvt *p = c->tech_pvt;
-
-  DEBUGA_PBX("DIGIT BEGIN received: %c\n", CELLIAX_P_LOG, digit);
-
-  return 0;
-}
-
-int celliax_senddigit_end(struct ast_channel *c, char digit, unsigned int duration)
-{
-  struct celliax_pvt *p = c->tech_pvt;
-
-  NOTICA("DIGIT END received: %c %d\n", CELLIAX_P_LOG, digit, duration);
-
-  if (p->controldevprotocol == PROTOCOL_AT && p->at_send_dtmf[0]) {
-    int res = 0;
-    char at_command[256];
-
-    memset(at_command, '\0', 256);
-    sprintf(at_command, "%s=\"%c\"", p->at_send_dtmf, digit);
-    res = celliax_serial_write_AT_ack(p, at_command);
-    if (res) {
-      ERRORA("senddigit command failed, command used: '%s=\"%c\"', giving up\n",
-             CELLIAX_P_LOG, p->at_send_dtmf, digit);
-    }
-  }
-  return 0;
-}
-#else /* ASTERISK_VERSION_1_4 */
-int celliax_senddigit(struct ast_channel *c, char digit)
-{
-  struct celliax_pvt *p = c->tech_pvt;
-
-  NOTICA("DIGIT received: %c\n", CELLIAX_P_LOG, digit);
-
-  if (p->controldevprotocol == PROTOCOL_AT && p->at_send_dtmf[0]) {
-    int res = 0;
-    char at_command[256];
-
-    memset(at_command, '\0', 256);
-    sprintf(at_command, "%s=\"%c\"", p->at_send_dtmf, digit);
-    res = celliax_serial_write_AT_ack(p, at_command);
-    if (res) {
-      ERRORA("senddigit command failed, command used: '%s=\"%c\"', giving up\n",
-             CELLIAX_P_LOG, p->at_send_dtmf, digit);
-    }
-  }
-  return 0;
-}
-
-#endif /* ASTERISK_VERSION_1_4 */
-
-/*! \brief Read audio frames from channel */
-struct ast_frame *celliax_read(struct ast_channel *c)
-{
-  struct ast_frame *f;
-  struct celliax_pvt *p = c->tech_pvt;
-  int actual;
-  char buf[128 + 1];
-
-  if (p->dtmf_inited == 0) {
-    dtmf_rx_init(&p->dtmf_state, NULL, NULL);
-    p->dtmf_inited = 1;
-    dtmf_rx_parms(&p->dtmf_state, 0, 10, 10);
-    p->dtmf_timestamp.tv_sec=0;
-    p->dtmf_timestamp.tv_usec=0;
-    DEBUGA_SOUND("DTMF recognition inited\n", CELLIAX_P_LOG);
-  }
-
-/* if there are control frames queued to be sent by celliax_queue_control, send it the first */
-//FIXME maybe better a real queue?
-  if (p && p->owner && p->control_to_send) {
-    ast_queue_control(p->owner, p->control_to_send);
-    DEBUGA_PBX("Sent CONTROL FRAME %d\n", CELLIAX_P_LOG, p->control_to_send);
-    p->control_to_send = 0;
-  }
-
-#ifdef CELLIAX_PORTAUDIO
-/* if the call is not active (ie: answered), do not send audio frames, they would pile up in a lag queue */
-  if (!p->owner || p->owner->_state != AST_STATE_UP) 
-#else /* CELLIAX_PORTAUDIO */
-  if (!p->owner ) 
-#endif /* CELLIAX_PORTAUDIO */
-  {
-    static struct ast_frame f;
-#ifdef CELLIAX_PORTAUDIO
-    char c;
-#endif /* CELLIAX_PORTAUDIO */
-
-    f.frametype = AST_FRAME_NULL;
-    f.subclass = 0;
-    f.samples = 0;
-    f.datalen = 0;
-#ifdef ASTERISK_VERSION_1_6_0_1
-    f.data.ptr = NULL;
-#else
-    f.data = NULL;
-#endif /* ASTERISK_VERSION_1_6_0_1 */
-    f.offset = 0;
-    f.src = celliax_type;
-    f.mallocd = 0;
-    f.delivery.tv_sec = 0;
-    f.delivery.tv_usec = 0;
-/* read the char that was written by the audio thread in this pipe, this pipe is the fd monitored by asterisk, asterisk then has called the function we are inside) */
-#ifdef CELLIAX_PORTAUDIO
-    read(p->audiopipe[0], &c, 1);
-#endif /* CELLIAX_PORTAUDIO */
-
-    return &f;
-  }
-
-  /* read one asterisk frame of audio from sound interface */
-  f = celliax_sound_read(p);
-  if (f) {
-  struct timeval now_timestamp;
-#ifndef __CYGWIN__
-#ifdef CELLIAX_PORTAUDIO
-    char c[1000];
-    int letti = 2;
-
-    while (letti > 1) {
-      letti = read(p->audiopipe[0], &c, 1000);
-      if (letti > 0)
-        DEBUGA_SOUND("READ from audiopipe: %d\n", CELLIAX_P_LOG, letti);
-      //usleep(1);
-    }
-    //if(letti == -1)
-    //ERRORA("error: %s\n", CELLIAX_P_LOG, strerror(errno));
-#endif /* CELLIAX_PORTAUDIO */
-#endif /* __CYGWIN__ */
-
-    /* scale sound samples volume up or down */
-    celliax_sound_boost(f, p->capture_boost);
-
-  gettimeofday(&now_timestamp, NULL);
-
-  if( (((now_timestamp.tv_sec - p->dtmf_timestamp.tv_sec) * 1000000) < 0) || ( ((now_timestamp.tv_sec - p->dtmf_timestamp.tv_sec) * 1000000) + (now_timestamp.tv_usec - p->dtmf_timestamp.tv_usec) ) > 300000) { // if more than 0.3 seconds from last DTMF, or never got DTMFs before
-
-#ifdef ASTERISK_VERSION_1_6_0_1
-    dtmf_rx(&p->dtmf_state, f->data.ptr, f->samples);
-#else
-    dtmf_rx(&p->dtmf_state, f->data, f->samples);
-#endif /* ASTERISK_VERSION_1_6_0_1 */
-    actual = dtmf_rx_get(&p->dtmf_state, buf, 128);
-    if (actual) {
-      //if (option_debug)
-        NOTICA("delta_usec=%ld, inband audio DTMF: %s\n", CELLIAX_P_LOG, ( (now_timestamp.tv_sec - p->dtmf_timestamp.tv_sec) * 1000000) + (now_timestamp.tv_usec - p->dtmf_timestamp.tv_usec), buf);
-      struct ast_frame f2 = { AST_FRAME_DTMF, buf[0], };
-      ast_queue_frame(p->owner, &f2);
-  	gettimeofday(&p->dtmf_timestamp, NULL);
-    }
-  }
-    return f;
-  }
-  return NULL;
-}
-
-/*! \brief Initiate celliax call from PBX 
- * used from the dial() application
- */
-int celliax_call(struct ast_channel *c, char *idest, int timeout)
-{
-  struct celliax_pvt *p = NULL;
-  p = c->tech_pvt;
-  char rdest[80], *where, dstr[100] = "";
-  char *stringp = NULL;
-  int status;
-
-  if (option_debug) {
-    DEBUGA_PBX("ENTERING FUNC\n", CELLIAX_P_LOG);
-  }
-  if ((c->_state != AST_STATE_DOWN)
-      && (c->_state != AST_STATE_RESERVED)) {
-    ERRORA("celliax_call called on %s, neither down nor reserved\n", CELLIAX_P_LOG,
-           c->name);
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return -1;
-  }
-
-  if (option_debug > 1)
-    DEBUGA_PBX("celliax_call to call idest: %s, timeout: %d!\n", CELLIAX_P_LOG, idest,
-               timeout);
-
-  strncpy(rdest, idest, sizeof(rdest) - 1);
-  // try '/' as separator
-  stringp = rdest;
-  strsep(&stringp, "/");
-  where = strsep(&stringp, "/");
-
-  if (!where) {
-    ERRORA
-      ("Destination %s is not recognized. Chan_celliax requires a standard destination with slashes (Celliax/device/destination, eg: 'Celliax/nicephone/3472665618')\n",
-       CELLIAX_P_LOG, idest);
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return -1;
-  }
-
-  strncpy(dstr, where + p->stripmsd, sizeof(dstr) - 1);
-  if (option_debug > 1)
-    DEBUGA_PBX("celliax_call dialing idest: %s, timeout: %d, dstr: %s!\n", CELLIAX_P_LOG,
-               idest, timeout, dstr);
-
-  if (p->controldev_dead) {
-    WARNINGA("celliax_call: device is dead, cannot call!\n", CELLIAX_P_LOG);
-    status = -1;
-  } else {
-    ast_setstate(c, AST_STATE_DIALING);
-    status = celliax_serial_call(p, dstr);
-  }
-
-  if (status) {
-    WARNINGA("celliax_call dialing failed: %d!\n", CELLIAX_P_LOG, status);
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return -1;
-  } else {
-    if (option_debug)
-      DEBUGA_PBX("call ongoing\n", CELLIAX_P_LOG);
-    ast_queue_control(p->owner, AST_CONTROL_RINGING);
-  }
-
-  if (option_debug > 1)
-    DEBUGA_PBX("celliax_call dialed idest: %s, timeout: %d, dstr: %s!\n", CELLIAX_P_LOG,
-               idest, timeout, dstr);
-
-  if (option_debug) {
-    DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-  }
-#ifdef CELLIAX_PORTAUDIO
-  speex_echo_state_reset(p->stream->echo_state);
-#endif // CELLIAX_PORTAUDIO
-  return 0;
-}
-
-/*! \brief Send audio frame to channel */
-int celliax_write(struct ast_channel *c, struct ast_frame *f)
-{
-  struct celliax_pvt *p = c->tech_pvt;
-  if (p->owner && p->owner->_state != AST_STATE_UP) {
-    return 0;
-  }
-
-  celliax_sound_boost(f, p->playback_boost);
-
-  return celliax_sound_write(p, f);
-}
-
-/*! \brief  Fix up a channel:  If a channel is consumed, this is called.
- * Basically update any ->owner links */
-int celliax_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
-{
-  struct celliax_pvt *p = newchan->tech_pvt;
-
-  if (!p) {
-    ERRORA("No pvt after masquerade. Strange things may happen\n", CELLIAX_P_LOG);
-    return -1;
-  }
-
-  if (p->owner != oldchan) {
-    ERRORA("old channel wasn't %p but was %p\n", CELLIAX_P_LOG, oldchan, p->owner);
-    return -1;
-  }
-
-  p->owner = newchan;
-  return 0;
-}
-
-int celliax_sound_boost(struct ast_frame *f, double boost)
-{
-/* LUIGI RIZZO's magic */
-  if (boost != 0) {             /* scale and clip values */
-    int i, x;
-
-#ifdef ASTERISK_VERSION_1_6_0_1
-    int16_t *ptr = (int16_t *) f->data.ptr;
-#else
-    int16_t *ptr = (int16_t *) f->data;
-#endif /* ASTERISK_VERSION_1_6_0_1 */
-    for (i = 0; i < f->samples; i++) {
-      x = (ptr[i] * boost) / BOOST_SCALE;
-      if (x > 32767) {
-        x = 32767;
-      } else if (x < -32768) {
-        x = -32768;
-      }
-      ptr[i] = x;
-    }
-  }
-  return 0;
-}
-
-struct ast_channel *celliax_new(struct celliax_pvt *p, int state, char *context)
-{
-  struct ast_channel *tmp;
-
-  if (option_debug) {
-    DEBUGA_PBX("ENTERING FUNC\n", CELLIAX_P_LOG);
-  }
-  /* alloc a generic channel struct */
-#ifndef ASTERISK_VERSION_1_4
-  tmp = ast_channel_alloc(1);
-#else
-  //tmp = ast_channel_alloc(1, state, 0, 0, "", p->exten, p->context, 0, "");
-  tmp =
-    ast_channel_alloc(1, state, 0, 0, "", p->exten, p->context, 0, "Celliax/%s", p->name);
-
-#endif /* ASTERISK_VERSION_1_4 */
-  if (tmp) {
-int res;
-
-/* initialize the soundcard channels (input and output) used by this interface (a multichannel soundcard can be used by multiple interfaces), optionally starting the sound managing threads */
-  res = celliax_sound_init(p);
-  if (res == -1) {
-    ERRORA("Failed initializing sound device\n", CELLIAX_P_LOG);
-    /* we failed, free the PVT */
-    if (tmp)
-      free(tmp);
-    return NULL;
-  }
-
-    /* give a name to the newly created channel */
-#ifndef ASTERISK_VERSION_1_4
-    snprintf(tmp->name, sizeof(tmp->name), "Celliax/%s", p->name);
-    tmp->type = celliax_type;
-#else /* ASTERISK_VERSION_1_4 */
-    ast_string_field_build(tmp, name, "Celliax/%s", p->name);
-#endif /* ASTERISK_VERSION_1_4 */
-
-    DEBUGA_PBX("new channel: name=%s requested_state=%d\n", CELLIAX_P_LOG, tmp->name,
-               state);
-
-    /* fd for the channel to poll for incoming audio */
-    tmp->fds[0] = p->celliax_sound_capt_fd;
-
-    /* audio formats managed */
-    tmp->nativeformats = AST_FORMAT_SLINEAR;
-    tmp->readformat = AST_FORMAT_SLINEAR;
-    tmp->writeformat = AST_FORMAT_SLINEAR;
-    /* the technology description (eg. the interface type) of the newly created channel is the Celliax's one */
-    tmp->tech = &celliax_tech;
-    /* the technology pvt (eg. the interface) of the newly created channel is this interface pvt */
-    tmp->tech_pvt = p;
-
-    /* copy this interface default context, extension, language to the newly created channel */
-    if (strlen(p->context))
-      strncpy(tmp->context, p->context, sizeof(tmp->context) - 1);
-    if (strlen(p->exten))
-      strncpy(tmp->exten, p->exten, sizeof(tmp->exten) - 1);
-#ifndef ASTERISK_VERSION_1_4
-    if (strlen(p->language))
-      strncpy(tmp->language, p->language, sizeof(tmp->language) - 1);
-#else
-    if (strlen(p->language))
-      ast_string_field_set(tmp, language, p->language);
-#endif /* ASTERISK_VERSION_1_4 */
-    /* copy the requested context (not necessarily the interface default) to the newly created channel */
-    if (strlen(context))
-      strncpy(tmp->context, context, sizeof(tmp->context) - 1);
-
-    /* copy this interface default callerid in the newly created channel */
-    ast_set_callerid(tmp, !ast_strlen_zero(p->callid_number) ? p->callid_number : NULL,
-                     !ast_strlen_zero(p->callid_name) ? p->callid_name : NULL,
-                     !ast_strlen_zero(p->callid_number) ? p->callid_number : NULL);
-
-    /* the owner of this interface pvt is the newly created channel */
-    p->owner = tmp;
-    /* if this interface pvt has an initialized dsp struct, free it */
-    if (p->dsp) {
-      DEBUGA_SOUND("freeing dsp\n", CELLIAX_P_LOG);
-      ast_dsp_free(p->dsp);
-      p->dsp = NULL;
-    }
-#ifndef ASTERISK_VERSION_1_4
-    /* set the newly created channel state to the requested state */
-    if (ast_setstate(tmp, state)) {
-      ERRORA("ast_setstate failed, BAD\n", CELLIAX_P_LOG);
-      ast_dsp_free(p->dsp);
-      ast_channel_free(tmp);
-      if (option_debug) {
-        DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-      }
-      return NULL;
-    }
-#endif /* ASTERISK_VERSION_1_4 */
-
-#ifdef AST_VERION_1_4
-	ast_module_ref(ast_module_info->self);
-	ast_jb_configure(tmp, &global_jbconf);
-#endif /* AST_VERION_1_4 */
-
-    /* if the requested state is different from DOWN, let the pbx manage this interface (now part of the newly created channel) */
-    if (state != AST_STATE_DOWN) {
-      DEBUGA_PBX("Try to start PBX on %s, state=%d\n", CELLIAX_P_LOG, tmp->name, state);
-      if (ast_pbx_start(tmp)) {
-        ERRORA("Unable to start PBX on %s\n", CELLIAX_P_LOG, tmp->name);
-        ast_dsp_free(p->dsp);
-        ast_channel_free(tmp);
-        if (option_debug) {
-          DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-        }
-        return NULL;
-      }
-    }
-    /* let's start the serial monitoring thread too, so we can have serial signaling */
-    if (ast_pthread_create(&p->controldev_thread, NULL, celliax_do_controldev_thread, p) <
-        0) {
-      ERRORA("Unable to start controldev thread.\n", CELLIAX_P_LOG);
-      ast_dsp_free(p->dsp);
-      ast_channel_free(tmp);
-      tmp = NULL;
-    }
-    DEBUGA_SERIAL("STARTED controldev_thread=%lu STOP=%lu NULL=%lu\n", CELLIAX_P_LOG,
-                  (unsigned long) p->controldev_thread, (unsigned long) AST_PTHREADT_STOP,
-                  (unsigned long) AST_PTHREADT_NULL);
-
-#ifndef ASTERISK_VERSION_1_4
-    /* add one to the usage count of Celliax-type channels */
-    LOKKA(&celliax_usecnt_lock);
-    celliax_usecnt++;
-    UNLOCKA(&celliax_usecnt_lock);
-    ast_update_use_count();
-#endif /* ASTERISK_VERSION_1_4 */
-
-    /* return the newly created channel */
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return tmp;
-  }
-  ERRORA("failed memory allocation for Celliax channel\n", CELLIAX_P_LOG);
-  if (option_debug) {
-    DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-  }
-  return NULL;
-}
-
-/*!
- * \brief Load the module into Asterisk and start its threads
- *
- * This function register the module into Asterisk,
- * create the interfaces for the channels, 
- * start the auxiliary threads for the interfaces,
- * then start a monitor thread. The monitor thread
- * will signal Asterisk when an interface receive a call.
- *
- *
- * \return zero on success, -1 on error.
- */
-int load_module(void)
-{
-  int i;
-  struct ast_config *cfg;
-  struct celliax_pvt *tmp;
-  struct celliax_pvt *p = NULL;
-#ifdef ASTERISK_VERSION_1_6_0
-  struct ast_flags config_flags = { 0 };
-#endif /* ASTERISK_VERSION_1_6_0 */
-
-
-
-#ifdef ASTERISK_VERSION_1_4
-	/* Copy the default jb config over global_jbconf */
-	memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
-#endif /* ASTERISK_VERSION_1_4 */
-
-  if (option_debug) {
-    DEBUGA_PBX("ENTERING FUNC\n", CELLIAX_P_LOG);
-  }
-  ast_register_application(celliax_sendsmsapp, celliax_sendsms, celliax_sendsmssynopsis,
-                           celliax_sendsmsdescrip);
-
-  ast_manager_register2("CELLIAXsendsms", EVENT_FLAG_SYSTEM, celliax_manager_sendsms,
-                        "Send an SMS", mandescr_celliax_sendsms);
-  /* make sure we can register our channel type with Asterisk */
-  i = ast_channel_register(&celliax_tech);
-  if (i < 0) {
-    ERRORA("Unable to register channel type '%s'\n", CELLIAX_P_LOG, celliax_type);
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return -1;
-  }
-  /* load celliax.conf config file */
-#ifdef ASTERISK_VERSION_1_6_0
-  cfg = ast_config_load(celliax_config, config_flags);
-#else
-  cfg = ast_config_load(celliax_config);
-#endif /* ASTERISK_VERSION_1_6_0 */
-  if (cfg != NULL) {
-    char *ctg = NULL;
-    int is_first_category = 1;
-    while ((ctg = ast_category_browse(cfg, ctg)) != NULL) {
-      /* create one interface for each category in celliax.conf config file, first one set the defaults */
-      tmp = celliax_mkif(cfg, ctg, is_first_category);
-      if (tmp) {
-        NOTICA("Created channel Celliax: celliax.conf category '[%s]', channel name '%s'"
-               " control_device_name '%s'\n", CELLIAX_P_LOG, ctg, tmp->name,
-               tmp->controldevice_name);
-        /* add interface to celliax_iflist */
-        tmp->next = celliax_iflist;
-        celliax_iflist = tmp;
-        /* next one will not be the first ;) */
-        if (is_first_category == 1) {
-          is_first_category = 0;
-          celliax_console_active = tmp->name;
-        }
-      } else {
-        ERRORA("Unable to create channel Celliax from celliax.conf category '[%s]'\n",
-               CELLIAX_P_LOG, ctg);
-        /* if error, unload config from memory and return */
-        ast_config_destroy(cfg);
-        ast_channel_unregister(&celliax_tech);
-        if (option_debug) {
-          DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-        }
-        return -1;
-      }
-      /* do it for each category described in config */
-    }
-
-    /* we finished, unload config from memory */
-    ast_config_destroy(cfg);
-  } else {
-    ERRORA("Unable to load celliax_config celliax.conf\n", CELLIAX_P_LOG);
-    ast_channel_unregister(&celliax_tech);
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return -1;
-  }
-#ifndef ASTERISK_VERSION_1_6_0
-  ast_cli_register_multiple(myclis, sizeof(myclis) / sizeof(struct ast_cli_entry));
-#endif /* ASTERISK_VERSION_1_6_0 */
-  /* start to monitor the interfaces (celliax_iflist) for the first time */
-  if (celliax_restart_monitor()) {
-    ERRORA("celliax_restart_monitor failed, BAD\n", CELLIAX_P_LOG);
-    if (option_debug) {
-      DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-    }
-    return -1;
-  }
-#ifdef CELLIAX_DIR
-  //celliax_dir_create_extensions();
-#endif /* CELLIAX_DIR */
-  if (option_debug) {
-    DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-  }
-  return 0;
-}
-
-/*!
- * \brief Unload the module from Asterisk and shutdown its threads
- *
- * This function unregister the module from Asterisk,
- * destroy the interfaces for the channels, 
- * shutdown the auxiliary threads for the interfaces,
- * then shutdown its monitor thread.
- *
- * \return zero on success, -1 on error.
- */
-int unload_module(void)
-{
-  struct celliax_pvt *p = NULL, *p2 = NULL;
-  int res;
-
-  if (option_debug) {
-    DEBUGA_PBX("ENTERING FUNC\n", CELLIAX_P_LOG);
-  }
-
-  /* unregister our channel type with Asterisk */
-  ast_channel_unregister(&celliax_tech);
-  ast_cli_unregister_multiple(myclis, sizeof(myclis) / sizeof(struct ast_cli_entry));
-
-  ast_unregister_application(celliax_sendsmsapp);
-
-  /* lock the celliax_monlock, kill the monitor thread, unlock the celliax_monlock */
-  LOKKA(&celliax_monlock);
-  if (celliax_monitor_thread && (celliax_monitor_thread != AST_PTHREADT_NULL)
-      && (celliax_monitor_thread != AST_PTHREADT_STOP)) {
-    if (pthread_cancel(celliax_monitor_thread)) {
-      ERRORA("pthread_cancel failed, BAD\n", CELLIAX_P_LOG);
-      if (option_debug) {
-        DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-      }
-      return -1;
-    }
-    if (pthread_kill(celliax_monitor_thread, SIGURG)) {
-      DEBUGA_PBX("pthread_kill failed\n", CELLIAX_P_LOG);   //maybe it just died
-    }
-#ifndef __CYGWIN__              /* under cygwin, this seems to be not reliable, get stuck at times */
-    if (pthread_join(celliax_monitor_thread, NULL)) {
-      ERRORA("pthread_join failed, BAD\n", CELLIAX_P_LOG);
-      if (option_debug) {
-        DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-      }
-      return -1;
-    }
-#endif /* __CYGWIN__ */
-  }
-  celliax_monitor_thread = AST_PTHREADT_STOP;
-  UNLOCKA(&celliax_monlock);
-
-  if (celliax_monitor_audio_thread && (celliax_monitor_audio_thread != AST_PTHREADT_NULL)
-      && (celliax_monitor_audio_thread != AST_PTHREADT_STOP)) {
-
-    if (pthread_cancel(celliax_monitor_audio_thread)) {
-      ERRORA("pthread_cancel celliax_monitor_audio_thread failed, BAD\n", CELLIAX_P_LOG);
-    }
-    if (pthread_kill(celliax_monitor_audio_thread, SIGURG)) {
-      DEBUGA_PBX("pthread_kill celliax_monitor_audio_thread failed, no problem\n", CELLIAX_P_LOG);  //maybe it just died
-    }
-
-    if (pthread_join(celliax_monitor_audio_thread, NULL)) {
-      ERRORA("pthread_join failed, BAD\n", CELLIAX_P_LOG);
-    }
-  }
-  /* lock the celliax_iflock, and go through the interfaces list (celliax_iflist) */
-  LOKKA(&celliax_iflock);
-  p = celliax_iflist;
-  while (p) {
-    /* for each interface in list */
-    p2 = p->next;
-    /* shutdown the sound system, close sound fds, and if exist shutdown the sound managing threads */
-    DEBUGA_SOUND("shutting down sound\n", CELLIAX_P_LOG);
-    res = celliax_sound_shutdown(p);
-    if (res == -1) {
-      ERRORA("Failed to shutdown sound\n", CELLIAX_P_LOG);
-    }
-
-    /* if a serial port has been opened, close it */
-    if (p->controldevprotocol != PROTOCOL_NO_SERIAL)
-      if (p->controldevfd)
-        close(p->controldevfd);
-
-    /* if a dsp struct has been allocated, free it */
-    if (p->dsp) {
-      ast_dsp_free(p->dsp);
-      p->dsp = NULL;
-    }
-    DEBUGA_PBX("freeing PVT\n", CELLIAX_P_LOG);
-    /* free the pvt allocated memory */
-    free(p);
-    /* next one, please */
-    p = p2;
-  }
-  /* finished with the interfaces list, unlock the celliax_iflock */
-  UNLOCKA(&celliax_iflock);
-
-#ifdef __CYGWIN__
-  NOTICA("Sleping 5 secs, please wait...\n", CELLIAX_P_LOG);
-  sleep(5);                     /* without this pause, for some unknown (to me) reason it crashes on cygwin */
-#endif /* __CYGWIN__ */
-  NOTICA("Unloaded Celliax Module\n", CELLIAX_P_LOG);
-  if (option_debug) {
-    DEBUGA_PBX("EXITING FUNC\n", CELLIAX_P_LOG);
-  }
-  return 0;
-}
-
-/*!
- * \brief Return the count of active channels for this module
- *
- * \return the count of active channels for this module
- */
-int usecount()
-{
-  int res;
-  static struct celliax_pvt *p = &celliax_log_struct;
-/* lock the celliax_usecnt lock */
-  LOKKA(&celliax_usecnt_lock);
-  /* retrieve the celliax_usecnt */
-  res = celliax_usecnt;
-/* unlock the celliax_usecnt lock */
-  UNLOCKA(&celliax_usecnt_lock);
-  /* return the celliax_usecnt */
-  return res;
-}
-
-/*!
- * \brief Return the textual description of the module
- *
- * \return the textual description of the module
- */
-char *description()
-{
-  return (char *) celliax_desc;
-}
-
-/*!
- * \brief Return the ASTERISK_GPL_KEY
- *
- * \return the ASTERISK_GPL_KEY
- */
-char *key()
-{
-  struct celliax_pvt *p = NULL;
-
-  if (option_debug)
-    NOTICA("Returning Key\n", CELLIAX_P_LOG);
-
-  return ASTERISK_GPL_KEY;
-}
-
-/*!
- * \brief Create and initialize one interface for the module
- * \param cfg pointer to configuration data from celliax.conf
- * \param ctg pointer to a category name to be found in cfg
- * \param is_first_category is this the first category in cfg
- *
- * This function create and initialize one interface for the module
- *
- * \return a pointer to the PVT structure of interface on success, NULL on error.
- */
-struct celliax_pvt *celliax_mkif(struct ast_config *cfg, char *ctg, int is_first_category)
-{
-  struct celliax_pvt *tmp;
-  struct ast_variable *v;
-  int res;
-
-  int debug_all = 0;
-  int debug_at = 0;
-  int debug_fbus2 = 0;
-  int debug_serial = 0;
-  int debug_sound = 0;
-  int debug_pbx = 0;
-  int debug_skype = 0;
-  int debug_call = 0;
-  int debug_locks = 0;
-  int debug_monitorlocks = 0;
-#ifdef CELLIAX_CVM
-  int debug_cvm = 0;
-#endif /* CELLIAX_CVM */
-
-  /* alloc memory for PVT */
-  tmp = malloc(sizeof(struct celliax_pvt));
-  if (tmp == NULL)              /* fail */
-    return NULL;
-  /* clear memory for PVT */
-  memset(tmp, 0, sizeof(struct celliax_pvt));
-
-  //NOTICA("malloced %d bytes\n", CELLIAX_TMP_LOG, sizeof(struct celliax_pvt));
-
-  /* if we are reading the "first" category of the config file, take SELECTED values as defaults, overriding the values in celliax_default */
-  if (is_first_category == 1) {
-    /* for each variable in category, copy it in the celliax_default struct */
-    for (v = ast_variable_browse(cfg, ctg); v; v = v->next) {
-      M_START(v->name, v->value);
-
-      M_STR("control_device_protocol", celliax_default.controldevprotocolname)
-        M_STR("context", celliax_default.context)
-        M_STR("language", celliax_default.language)
-        M_STR("extension", celliax_default.exten)
-        M_UINT("dsp_silence_threshold", celliax_default.dsp_silence_threshold)
-        M_UINT("audio_play_reset_period", celliax_default.audio_play_reset_period)
-#ifdef CELLIAX_ALSA
-        M_UINT("alsa_period_size", celliax_default.alsa_period_size)
-        M_UINT("alsa_periods_in_buffer", celliax_default.alsa_periods_in_buffer)
-#endif /* CELLIAX_ALSA */
-        M_F("playback_boost",
-            celliax_store_boost(v->value, &celliax_default.playback_boost))
-        M_F("capture_boost",
-            celliax_store_boost(v->value, &celliax_default.capture_boost))
-        M_UINT("celliax_dir_entry_extension_prefix",
-               celliax_default.celliax_dir_entry_extension_prefix)
-        M_UINT("celliax_dir_prefix", celliax_default.celliax_dir_prefix)
-        M_STR("sms_receiving_program", tmp->sms_receiving_program)
-        M_END(;
-        );
-    }
-  }
-
-  /* initialize the newly created PVT from the celliax_default values */
-  *tmp = celliax_default;
-
-  /* initialize the mutexes */
-  ast_mutex_init(&tmp->controldev_lock);
-  ast_mutex_init(&tmp->fbus2_outgoing_list_lock);
-#ifdef CELLIAX_CVM
-  ast_mutex_init(&tmp->cvm_busmail_outgoing_list_lock);
-#endif /* CELLIAX_CVM */
-
-  /* the category name becomes the interface name */
-  tmp->name = strdup(ctg);
-
-  /* for each category in config file, "first" included, read in ALL the values */
-  for (v = ast_variable_browse(cfg, ctg); v; v = v->next) {
-    M_START(v->name, v->value);
-
-    M_BOOL("debug_all", debug_all)
-      M_BOOL("debug_at", debug_at)
-      M_BOOL("debug_fbus2", debug_fbus2)
-      M_BOOL("debug_serial", debug_serial)
-      M_BOOL("debug_sound", debug_sound)
-      M_BOOL("debug_pbx", debug_pbx)
-      M_BOOL("debug_skype", debug_skype)
-      M_BOOL("debug_call", debug_call)
-      M_BOOL("debug_locks", debug_locks)
-      M_BOOL("debug_monitorlocks", debug_monitorlocks)
-#ifdef CELLIAX_CVM
-      M_BOOL("debug_cvm", debug_cvm)
-      M_STR("cvm_subscription_1_pin", tmp->cvm_subsc_1_pin)
-      M_STR("cvm_subscription_2_pin", tmp->cvm_subsc_2_pin)
-      M_UINT("cvm_subscription_no", tmp->cvm_subsc_no)
-      M_UINT("cvm_volume_level", tmp->cvm_volume_level)
-      M_UINT("cvm_celliax_serial_delay", tmp->cvm_celliax_serial_delay)
-#endif /* CELLIAX_CVM */
-      M_BOOL("skype", tmp->skype)
-      M_BOOL("need_acoustic_ring", tmp->need_acoustic_ring)
-      M_STR("control_device_name", tmp->controldevice_name)
-      M_UINT("control_device_speed", tmp->controldevice_speed)
-      M_STR("control_device_protocol", tmp->controldevprotocolname)
-      M_STR("context", tmp->context)
-      M_STR("language", tmp->language)
-      M_STR("extension", tmp->exten)
-      M_UINT("dsp_silence_threshold", tmp->dsp_silence_threshold)
-      M_UINT("audio_play_reset_period", tmp->audio_play_reset_period)
-      M_UINT("portaudio_capture_device_id", tmp->portaudiocindex)
-      M_UINT("portaudio_playback_device_id", tmp->portaudiopindex)
-      M_F("playback_boost", celliax_store_boost(v->value, &tmp->playback_boost))
-      M_F("capture_boost", celliax_store_boost(v->value, &tmp->capture_boost))
-#ifdef CELLIAX_ALSA
-      M_STR("alsa_capture_device_name", tmp->alsacname)
-      M_STR("alsa_playback_device_name", tmp->alsapname)
-      M_UINT("alsa_period_size", tmp->alsa_period_size)
-      M_UINT("alsa_periods_in_buffer", tmp->alsa_periods_in_buffer)
-#endif /* CELLIAX_WINMM */
-      M_STR("at_dial_pre_number", tmp->at_dial_pre_number)
-      M_STR("at_dial_post_number", tmp->at_dial_post_number)
-
-      M_STR("at_dial_expect", tmp->at_dial_expect)
-      M_UINT("at_early_audio", tmp->at_early_audio)
-      M_STR("at_hangup", tmp->at_hangup)
-      M_STR("at_hangup_expect", tmp->at_hangup_expect)
-      M_STR("at_answer", tmp->at_answer)
-      M_STR("at_answer_expect", tmp->at_answer_expect)
-      M_STR("at_send_dtmf", tmp->at_send_dtmf)
-
-      M_UINT("at_initial_pause", tmp->at_initial_pause)
-      M_STR("at_preinit_1", tmp->at_preinit_1)
-      M_STR("at_preinit_1_expect", tmp->at_preinit_1_expect)
-      M_STR("at_preinit_2", tmp->at_preinit_2)
-      M_STR("at_preinit_2_expect", tmp->at_preinit_2_expect)
-      M_STR("at_preinit_3", tmp->at_preinit_3)
-      M_STR("at_preinit_3_expect", tmp->at_preinit_3_expect)
-      M_STR("at_preinit_4", tmp->at_preinit_4)
-      M_STR("at_preinit_4_expect", tmp->at_preinit_4_expect)
-      M_STR("at_preinit_5", tmp->at_preinit_5)
-      M_STR("at_preinit_5_expect", tmp->at_preinit_5_expect)
-      M_UINT("at_after_preinit_pause", tmp->at_after_preinit_pause)
-
-      M_STR("at_postinit_1", tmp->at_postinit_1)
-      M_STR("at_postinit_1_expect", tmp->at_postinit_1_expect)
-      M_STR("at_postinit_2", tmp->at_postinit_2)
-      M_STR("at_postinit_2_expect", tmp->at_postinit_2_expect)
-      M_STR("at_postinit_3", tmp->at_postinit_3)
-      M_STR("at_postinit_3_expect", tmp->at_postinit_3_expect)
-      M_STR("at_postinit_4", tmp->at_postinit_4)
-      M_STR("at_postinit_4_expect", tmp->at_postinit_4_expect)
-      M_STR("at_postinit_5", tmp->at_postinit_5)
-      M_STR("at_postinit_5_expect", tmp->at_postinit_5_expect)
-
-      M_STR("at_query_battchg", tmp->at_query_battchg)
-      M_STR("at_query_battchg_expect", tmp->at_query_battchg_expect)
-      M_STR("at_query_signal", tmp->at_query_signal)
-      M_STR("at_query_signal_expect", tmp->at_query_signal_expect)
-      M_STR("at_call_idle", tmp->at_call_idle)
-      M_STR("at_call_incoming", tmp->at_call_incoming)
-      M_STR("at_call_active", tmp->at_call_active)
-      M_STR("at_call_failed", tmp->at_call_failed)
-      M_STR("at_call_calling", tmp->at_call_calling)
-      M_STR("at_indicator_noservice_string", tmp->at_indicator_noservice_string)
-      M_STR("at_indicator_nosignal_string", tmp->at_indicator_nosignal_string)
-      M_STR("at_indicator_lowsignal_string", tmp->at_indicator_lowsignal_string)
-      M_STR("at_indicator_lowbattchg_string", tmp->at_indicator_lowbattchg_string)
-      M_STR("at_indicator_nobattchg_string", tmp->at_indicator_nobattchg_string)
-      M_STR("at_indicator_callactive_string", tmp->at_indicator_callactive_string)
-      M_STR("at_indicator_nocallactive_string", tmp->at_indicator_nocallactive_string)
-      M_STR("at_indicator_nocallsetup_string", tmp->at_indicator_nocallsetup_string)
-      M_STR("at_indicator_callsetupincoming_string",
-            tmp->at_indicator_callsetupincoming_string)
-      M_STR("at_indicator_callsetupoutgoing_string",
-            tmp->at_indicator_callsetupoutgoing_string)
-      M_STR("at_indicator_callsetupremoteringing_string",
-            tmp->at_indicator_callsetupremoteringing_string)
-      M_UINT("celliax_dir_entry_extension_prefix",
-             tmp->celliax_dir_entry_extension_prefix)
-      M_UINT("celliax_dir_prefix", tmp->celliax_dir_prefix)
-#ifdef CELLIAX_LIBCSV
-      M_UINT("csv_separator_is_semicolon", tmp->csv_separator_is_semicolon)
-      M_UINT("csv_complete_name_pos", tmp->csv_complete_name_pos)
-      M_UINT("csv_email_pos", tmp->csv_email_pos)
-      M_UINT("csv_home_phone_pos", tmp->csv_home_phone_pos)
-      M_UINT("csv_mobile_phone_pos", tmp->csv_mobile_phone_pos)
-      M_UINT("csv_business_phone_pos", tmp->csv_business_phone_pos)
-      M_UINT("csv_first_row_is_title", tmp->csv_first_row_is_title)
-#endif /* CELLIAX_LIBCSV */
-      M_STR("sms_receiving_program", tmp->sms_receiving_program)
-      M_BOOL("speexecho", tmp->speexecho)
-      M_BOOL("speexpreprocess", tmp->speexpreprocess)
-      M_END(;
-      );
-  }
-
-  if (debug_all) {
-    celliax_debug = celliax_debug | DEBUG_ALL;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_ALL activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_ALL debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_ALL activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-  if (debug_at) {
-    celliax_debug = celliax_debug | DEBUG_AT;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_AT activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_AT debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_AT activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-
-  if (debug_fbus2) {
-    celliax_debug = celliax_debug | DEBUG_FBUS2;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_FBUS2 activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_FBUS2 debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_FBUS2 activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-
-  if (debug_serial) {
-    celliax_debug = celliax_debug | DEBUG_SERIAL;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_SERIAL activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_SERIAL debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_SERIAL activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-
-  if (debug_sound) {
-    celliax_debug = celliax_debug | DEBUG_SOUND;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_SOUND activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_SOUND debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_SOUND activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-
-  if (debug_pbx) {
-    celliax_debug = celliax_debug | DEBUG_PBX;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_PBX activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_PBX debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_PBX activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-
-  if (debug_call) {
-    celliax_debug = celliax_debug | DEBUG_CALL;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_CALL activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_CALL debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_CALL activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-
-  if (debug_locks) {
-    celliax_debug = celliax_debug | DEBUG_LOCKS;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_LOCKS activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_LOCKS debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_LOCKS activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-
-  if (debug_monitorlocks) {
-    celliax_debug = celliax_debug | DEBUG_MONITORLOCKS;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_MONITORLOCKS activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_MONITORLOCKS debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_MONITORLOCKS activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-#ifdef CELLIAX_CVM
-  if (debug_cvm) {
-    celliax_debug = celliax_debug | DEBUG_CVM;
-    if (!option_debug) {
-      WARNINGA
-        ("DEBUG_CVM activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_CVM debugging output.\n",
-         CELLIAX_TMP_LOG);
-    } else {
-      NOTICA("DEBUG_CVM activated. \n", CELLIAX_TMP_LOG);
-    }
-  }
-#endif /* CELLIAX_CVM */
-
-  if (option_debug > 1) {
-    DEBUGA_SOUND("playback_boost is %f\n", CELLIAX_TMP_LOG, tmp->playback_boost);
-    DEBUGA_SOUND("capture_boost is %f\n", CELLIAX_TMP_LOG, tmp->capture_boost);
-  }
-
-  /* serial protocols are named in config with a string, but as int in this software */
-  if (strcasecmp(tmp->controldevprotocolname, "fbus2") == 0)
-    tmp->controldevprotocol = PROTOCOL_FBUS2;
-  else if (strcasecmp(tmp->controldevprotocolname, "at") == 0)
-    tmp->controldevprotocol = PROTOCOL_AT;
-  else if (strcasecmp(tmp->controldevprotocolname, "no_serial") == 0)
-    tmp->controldevprotocol = PROTOCOL_NO_SERIAL;
-  else if (strcasecmp(tmp->controldevprotocolname, "alsa_voicemodem") == 0)
-    tmp->controldevprotocol = PROTOCOL_ALSA_VOICEMODEM;
-#ifdef CELLIAX_CVM
-  else if (strcasecmp(tmp->controldevprotocolname, "cvm_busmail") == 0)
-    tmp->controldevprotocol = PROTOCOL_CVM_BUSMAIL;
-#endif /* CELLIAX_CVM */
-  else {
-#ifndef CELLIAX_CVM
-    ERRORA
-      ("control_device_protocol in celliax.conf MUST be = fbus2|at|no_serial|alsa_voicemodem, but is = '%s'\n",
-       CELLIAX_TMP_LOG,
-       tmp->controldevprotocolname ? tmp->controldevprotocolname : "NULL");
-#else
-    ERRORA
-      ("control_device_protocol in celliax.conf MUST be = fbus2|at|no_serial|alsa_voicemodem|cvm_busmail, but is = '%s'\n",
-       CELLIAX_TMP_LOG,
-       tmp->controldevprotocolname ? tmp->controldevprotocolname : "NULL");
-#endif /* CELLIAX_CVM */
-
-    /* we failed, free the PVT */
-    free(tmp);
-    return NULL;
-  }
-
-  if (tmp->controldevice_speed != celliax_default.controldevice_speed) {
-    /* serial speeds are numbers in config file, but we needs definitions in this software */
-    if (tmp->controldevice_speed == 9600)
-      tmp->controldevice_speed = B9600;
-    else if (tmp->controldevice_speed == 19200)
-      tmp->controldevice_speed = B19200;
-    else if (tmp->controldevice_speed == 38400)
-      tmp->controldevice_speed = B38400;
-    else if (tmp->controldevice_speed == 57600)
-      tmp->controldevice_speed = B57600;
-    else if (tmp->controldevice_speed == 115200)
-      tmp->controldevice_speed = B115200;
-    else {
-      ERRORA
-        ("controldevice_speed has to be given one of the following values: 9600|19200|38400|57600|115200. In the config file, was given: %d\n",
-         CELLIAX_TMP_LOG, tmp->controldevice_speed);
-      free(tmp);
-      return NULL;
-    }
-  }
-
-/* CVM PP DECT modules supports registration to two DECT FPs (bases), but CVM can be only connected to one DECT FP at the time, so we need two PINs (for registration) and info to which DECT FP connect*/
-#ifdef CELLIAX_CVM
-  if (tmp->cvm_subsc_no != celliax_default.cvm_subsc_no) {
-    if ((tmp->cvm_subsc_no != 1) && (tmp->cvm_subsc_no != 2)) {
-      ERRORA
-        ("cvm_subscription_no has to be given one of the following values: 1|2. In the config file, was given: %d\n",
-         CELLIAX_TMP_LOG, tmp->cvm_subsc_no);
-      free(tmp);
-      return NULL;
-    }
-  }
-
-  if (tmp->cvm_subsc_1_pin != celliax_default.cvm_subsc_1_pin) {
-    if (4 != strlen(tmp->cvm_subsc_1_pin)) {
-      ERRORA
-        ("cvm_subscription_1_pin has to be 4 digits long. In the config file, was given: %s\n",
-         CELLIAX_TMP_LOG, tmp->cvm_subsc_1_pin);
-      free(tmp);
-      return NULL;
-    }
-  }
-
-  if (tmp->cvm_subsc_2_pin != celliax_default.cvm_subsc_2_pin) {
-    if (4 != strlen(tmp->cvm_subsc_2_pin)) {
-      ERRORA
-        ("cvm_subscription_2_pin has to be 4 digits long. In the config file, was given: %s\n",
-         CELLIAX_TMP_LOG, tmp->cvm_subsc_2_pin);
-      free(tmp);
-      return NULL;
-    }
-  }
-
-  if (tmp->cvm_volume_level != celliax_default.cvm_volume_level) {
-    if ((0 > tmp->cvm_volume_level) && (9 < tmp->cvm_volume_level)) {
-      ERRORA("cvm_volume_level has to be 0-9. In the config file, was given: %d\n",
-             CELLIAX_TMP_LOG, tmp->cvm_volume_level);
-      free(tmp);
-      return NULL;
-    }
-  }
-
-  if (tmp->cvm_celliax_serial_delay != celliax_default.cvm_celliax_serial_delay) {
-    if ((0 > tmp->cvm_celliax_serial_delay) && (65535 < tmp->cvm_celliax_serial_delay)) {
-      ERRORA
-        ("cvm_celliax_serial_dealy has to be 0-65535. In the config file, was given: %d\n",
-         CELLIAX_TMP_LOG, tmp->cvm_celliax_serial_delay);
-      free(tmp);
-      return NULL;
-    }
-  }
-#endif /* CELLIAX_CVM */
-  if (tmp->need_acoustic_ring) {
-    /* alloc and initialize a new dsp struct for this interface pvt, WITH silence suppression */
-    if (celliax_sound_dsp_set(tmp, tmp->dsp_silence_threshold, 1)) {
-      ERRORA("celliax_sound_dsp_set failed\n", CELLIAX_TMP_LOG);
-      celliax_sound_shutdown(tmp);
-      if (tmp)
-        free(tmp);
-      return NULL;
-    }
-
-/* initialize the soundcard channels (input and output) used by this interface (a multichannel soundcard can be used by multiple interfaces), optionally starting the sound managing threads */
-  res = celliax_sound_init(tmp);
-  if (res == -1) {
-    ERRORA("Failed initializing sound device\n", CELLIAX_TMP_LOG);
-    /* we failed, free the PVT */
-    if (tmp)
-      free(tmp);
-    return NULL;
-  }
-
-  }
-
-  /* init the serial port */
-  if (tmp->controldevprotocol != PROTOCOL_NO_SERIAL) {
-    tmp->controldevfd = celliax_serial_init(tmp, tmp->controldevice_speed);
-    if (tmp->controldevfd < 1) {
-      ERRORA("celliax_serial_init failed\n", CELLIAX_TMP_LOG);
-      celliax_sound_shutdown(tmp);
-      if (tmp)
-        free(tmp);
-      return NULL;
-    }
-  }
-
-  /* config the phone/modem on the serial port */
-  if (tmp->controldevprotocol != PROTOCOL_NO_SERIAL) {
-    //int res;
-    res = celliax_serial_config(tmp);
-    if (res) {
-      ERRORA("celliax_serial_config failed\n", CELLIAX_TMP_LOG);
-      celliax_sound_shutdown(tmp);
-      if (tmp)
-        free(tmp);
-      return NULL;
-    }
-  }
-
-  /* return the newly created celliax_pvt */
-  return tmp;
-}
-
-/*! \brief (Re)Start the module main monitor thread, watching for incoming calls on the interfaces */
-int celliax_restart_monitor(void)
-{
-  static struct celliax_pvt *p = &celliax_log_struct;
-  /* If we're supposed to be stopped -- stay stopped */
-  if (celliax_monitor_thread == AST_PTHREADT_STOP)
-    return 0;
-  LOKKA(&celliax_monlock);
-  /* Do not seems possible to me that this function can be called by the very same monitor thread, but let's be paranoid */
-  if (celliax_monitor_thread == pthread_self()) {
-    UNLOCKA(&celliax_monlock);
-    ERRORA("Cannot kill myself\n", CELLIAX_P_LOG);
-    return -1;
-  }
-  /* if the monitor thread exists */
-  if (celliax_monitor_thread != AST_PTHREADT_NULL) {
-    /* Wake up the thread, it can be stuck waiting in a select or so */
-    pthread_kill(celliax_monitor_thread, SIGURG);
-    pthread_kill(celliax_monitor_audio_thread, SIGURG);
-  } else {
-    /* the monitor thread does not exists, start a new monitor */
-    if (ast_pthread_create(&celliax_monitor_thread, NULL, celliax_do_monitor, NULL) < 0) {
-      UNLOCKA(&celliax_monlock);
-      ERRORA("Unable to start monitor thread.\n", CELLIAX_P_LOG);
-      return -1;
-    }
-
-    if (ast_pthread_create
-        (&celliax_monitor_audio_thread, NULL, celliax_do_audio_monitor, NULL) < 0) {
-      ERRORA("Unable to start audio_monitor thread.\n", CELLIAX_P_LOG);
-      return -1;
-    }
-
-  }
-  UNLOCKA(&celliax_monlock);
-  return 0;
-}
-
-/*! \brief The celliax monitoring thread 
- * \note   This thread monitors all the celliax interfaces that are not in a call
- *         (and thus do not have a separate thread) indefinitely 
- *         */
-void *celliax_do_monitor(void *data)
-{
-  fd_set rfds;
-  int res;
-  struct celliax_pvt *p = NULL;
-  int max = -1;
-  struct timeval to;
-  time_t now_timestamp;
-
-  if (pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL)) {
-    ERRORA("Unable to set cancel type to deferred\n", CELLIAX_P_LOG);
-    return NULL;
-  }
-
-  for (;;) {
-    pthread_testcancel();
-    /* Don't let anybody kill us right away.  Nobody should lock the interface list
-       and wait for the monitor list, but the other way around is okay. */
-    PUSHA_UNLOCKA(&celliax_monlock);
-    MONITORLOKKA(&celliax_monlock);
-    /* Lock the interface list */
-    PUSHA_UNLOCKA(&celliax_iflock);
-    MONITORLOKKA(&celliax_iflock);
-    /* Build the stuff we're going to select on, that is the celliax_serial_fd of every
-       celliax_pvt that does not have an associated owner channel. In the case of FBUS2 3310
-       and in the case of PROTOCOL_NO_SERIAL we add the audio_fd as well, because there is not serial signaling of incoming calls */
-    FD_ZERO(&rfds);
-
-    time(&now_timestamp);
-    p = celliax_iflist;
-    while (p) {
-      if (!p->owner) {
-        /* This interface needs to be watched, as it lacks an owner */
-
-        if (p->controldevprotocol != PROTOCOL_NO_SERIAL && !p->controldev_dead) {
-          /* This interface needs its serial connection to be watched, nokia 3310 and compatibles needs sounds as well */
-          if (FD_ISSET(p->controldevfd, &rfds)) {
-            ERRORA("Bizarre! Descriptor %d (controldevfd) appears twice ?\n",
-                   CELLIAX_P_LOG, p->controldevfd);
-          }
-          if (p->controldevfd > 0) {
-
-            //time(&now_timestamp);
-            if ((now_timestamp - p->celliax_serial_synced_timestamp) > p->celliax_serial_sync_period) { //TODO find a sensible period. 5min? in config?
-              int rt;
-              if (option_debug > 1)
-                DEBUGA_SERIAL("Syncing Serial\n", CELLIAX_P_LOG);
-              rt = celliax_serial_sync(p);
-              if (rt) {
-                p->controldev_dead = 1;
-                close(p->controldevfd);
-                ERRORA("serial sync failed, declaring %s dead\n", CELLIAX_P_LOG,
-                       p->controldevice_name);
-              }
-              rt = celliax_serial_getstatus(p);
-              if (rt) {
-                p->controldev_dead = 1;
-                close(p->controldevfd);
-                ERRORA("serial getstatus failed, declaring %s dead\n", CELLIAX_P_LOG,
-                       p->controldevice_name);
-              }
-
-            }
-
-            if (!p->controldev_dead) {
-              /* add this file descriptor to the set watched by the select */
-              FD_SET(p->controldevfd, &rfds);
-              if (p->controldevfd > max) {
-                /* adjust the maximum file descriptor value the select has to watch for */
-                max = p->controldevfd;
-              }
-            }
-          }
-        }
-
-      }
-      /* next interface, please */
-      p = p->next;
-    }
-    /* Okay, now that we know what to do, release the interface lock */
-    MONITORUNLOCKA(&celliax_iflock);
-    POPPA_UNLOCKA(&celliax_iflock);
-    /* And from now on, we're okay to be killed, so release the monitor lock as well */
-    MONITORUNLOCKA(&celliax_monlock);
-    POPPA_UNLOCKA(&celliax_monlock);
-
-    /* you want me to die? */
-    pthread_testcancel();
-
-    /* Wait for something to happen */
-    to.tv_sec = 0;
-    to.tv_usec = 500000;        /* we select with this timeout because under cygwin we avoid the signal usage, so there is no way to end the thread if it is stuck waiting for select */
-    res = ast_select(max + 1, &rfds, NULL, NULL, &to);
-
-    /* you want me to die? */
-    pthread_testcancel();
-
-    /* Okay, select has finished.  Let's see what happened.  */
-
-    /* If there are errors...  */
-    if (res < 0) {
-      if (errno == EINTR)       /* EINTR is just the select 
-                                   being interrupted by a SIGURG, or so */
-        continue;
-      else {
-        ERRORA("select returned %d: %s\n", CELLIAX_P_LOG, res, strerror(errno));
-//FIXME what to do here? is the interface that failed signaled? which interface we have to disable?
-        return NULL;
-      }
-    }
-
-    /* must not be killed while celliax_iflist is locked */
-    PUSHA_UNLOCKA(&celliax_monlock);
-    MONITORLOKKA(&celliax_monlock);
-    /* Alright, lock the interface list again, and let's look and see what has
-       happened */
-    PUSHA_UNLOCKA(&celliax_iflock);
-    MONITORLOKKA(&celliax_iflock);
-
-    p = celliax_iflist;
-    for (; p; p = p->next) {
-
-      if (p->controldevprotocol != PROTOCOL_NO_SERIAL && !p->controldev_dead) {
-        if (!p->owner) {        //give all the serial channels that have no owner a read, so we can have the timers clicking
-
-          if (!p->celliax_serial_monitoring) {
-            p->celliax_serial_monitoring = 1;
-            res = celliax_serial_monitor(p);
-            if (res == -1) {    //manage the graceful interface shutdown
-              p->controldev_dead = 1;
-              close(p->controldevfd);
-              ERRORA("celliax_serial_monitor failed, declaring %s dead\n", CELLIAX_P_LOG,
-                     p->controldevice_name);
-            } else if (!p->need_acoustic_ring
-                       && p->controldevprotocol != PROTOCOL_NO_SERIAL
-                       && p->interface_state == AST_STATE_RING) {
-              if (option_debug)
-                DEBUGA_PBX("INCOMING RING\n", CELLIAX_P_LOG);
-              if (!celliax_new(p, AST_STATE_RING, p->context)) {
-                //FIXME what to do here?
-                ERRORA("celliax_new failed! BAD BAD BAD\n", CELLIAX_P_LOG);
-              }
-            }
-            p->celliax_serial_monitoring = 0;
-          }
-        }
-      }
-
-      if (p->controldevprotocol != PROTOCOL_NO_SERIAL && p->controldev_dead) {
-
-        /* init the serial port */
-        p->controldevfd = celliax_serial_init(p, p->controldevice_speed);
-        if (p->controldevfd < 1) {
-          DEBUGA_SERIAL("celliax_serial_init failed\n", CELLIAX_P_LOG);
-        } else {
-
-          /* config the phone/modem on the serial port */
-          res = celliax_serial_config(p);
-          if (res) {
-            DEBUGA_SERIAL("celliax_serial_config failed\n", CELLIAX_P_LOG);
-            close(p->controldevfd);
-          } else {
-
-            NOTICA("Wow, the serial port has come back! Let's see if it will work\n",
-                   CELLIAX_P_LOG);
-            p->controldev_dead = 0;
-          }
-
-        }
-
-      }
-
-    }
-    MONITORUNLOCKA(&celliax_iflock);
-    POPPA_UNLOCKA(&celliax_iflock);
-    MONITORUNLOCKA(&celliax_monlock);
-    POPPA_UNLOCKA(&celliax_monlock);
-    pthread_testcancel();
-  }
-/* Never reached */
-  return NULL;
-
-}
-
-void *celliax_do_audio_monitor(void *data)
-{
-  fd_set rfds;
-  int res;
-  struct celliax_pvt *p = NULL;
-  int max = -1;
-  struct timeval to;
-
-  if (pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL)) {
-    ERRORA("Unable to set cancel type to deferred\n", CELLIAX_P_LOG);
-    return NULL;
-  }
-
-  for (;;) {
-    pthread_testcancel();
-    /* Lock the interface list */
-    PUSHA_UNLOCKA(&celliax_iflock);
-    MONITORLOKKA(&celliax_iflock);
-
-    FD_ZERO(&rfds);
-
-    p = celliax_iflist;
-    while (p) {
-      if (!p->owner) {
-        /* This interface needs to be watched, as it lacks an owner */
-
-        if (p->controldevprotocol == PROTOCOL_NO_SERIAL || p->need_acoustic_ring) {
-          /* This interface needs its incoming sound to be watched, because it cannot signal incoming ring from serial (eg nokia 3310 and compatibles) */
-          if (p->celliax_sound_capt_fd > 0) {
-            /* if fd exist */
-            if (FD_ISSET(p->celliax_sound_capt_fd, &rfds)) {
-              ERRORA("Bizarre! Descriptor %d (celliax_sound_capt_fd) appears twice ?\n",
-                     CELLIAX_P_LOG, p->celliax_sound_capt_fd);
-            }
-            /* add this file descriptor to the set watched by the select */
-            FD_SET(p->celliax_sound_capt_fd, &rfds);
-            if (p->celliax_sound_capt_fd > max) {
-              /* adjust the maximum file descriptor value the select has to watch for */
-              max = p->celliax_sound_capt_fd;
-            }
-          }
-        }
-
-      }
-      /* next interface, please */
-      p = p->next;
-    }
-    /* Okay, now that we know what to do, release the interface lock */
-
-    MONITORUNLOCKA(&celliax_iflock);
-    POPPA_UNLOCKA(&celliax_iflock);
-    /* you want me to die? */
-    pthread_testcancel();
-
-    /* Wait for something to happen */
-    to.tv_sec = 0;
-    to.tv_usec = 500000;        /* we select with this timeout because under cygwin we avoid the signal usage, so there is no way to end the thread if it is stuck waiting for select */
-    res = ast_select(max + 1, &rfds, NULL, NULL, &to);
-
-    /* you want me to die? */
-    pthread_testcancel();
-
-    /* Okay, select has finished.  Let's see what happened.  */
-
-    /* If there are errors...  */
-    if (res < 0) {
-      if (errno == EINTR) {     /* EINTR is just the select 
-                                   being interrupted by a SIGURG, or so */
-        usleep(100);
-        continue;
-      } else {
-        ERRORA("select returned %d: %s\n", CELLIAX_P_LOG, res, strerror(errno));
-//FIXME what to do here? is the interface that failed signaled? which interface we have to disable?
-        return NULL;
-      }
-    }
-    /* If there are no file descriptors changed, just continue  */
-
-    if (res == 0) {
-      usleep(100);              //let's breath
-      continue;
-    }
-//usleep(10); //let's breath
-
-    /* Lock the interface list */
-    PUSHA_UNLOCKA(&celliax_iflock);
-    MONITORLOKKA(&celliax_iflock);
-
-    p = celliax_iflist;
-    for (; p; p = p->next) {
-
-      if (FD_ISSET(p->celliax_sound_capt_fd, &rfds)) {
-        res = celliax_sound_monitor(p);
-        if (res < 0) {
-          ERRORA("celliax_sound_monitor ERROR %d\n", CELLIAX_P_LOG, res);
-        } else if (res == CALLFLOW_INCOMING_RING) {
-          p->phone_callflow = CALLFLOW_INCOMING_RING;
-          p->interface_state = AST_STATE_RING;
-          if (option_debug)
-            DEBUGA_PBX("INCOMING RING\n", CELLIAX_P_LOG);
-          if (!celliax_new(p, AST_STATE_RING, p->context))
-            ERRORA("celliax_new failed! BAD BAD BAD\n", CELLIAX_P_LOG);
-        } else {
-        }
-
-      }
-
-    }
-/* Okay, now that we know what to do, release the interface lock */
-
-    MONITORUNLOCKA(&celliax_iflock);
-    POPPA_UNLOCKA(&celliax_iflock);
-
-    pthread_testcancel();
-  }
-/* Never reached */
-  return NULL;
-}
-
-/*!
- * \brief Initialize the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces) 
- * \param p the celliax_pvt of the interface
- *
- * This function initialize the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces). It simply pass its parameters to the right function for the sound system for which has been compiled, eg. alsa_init for ALSA, oss_init for OSS, winmm_init for Windows Multimedia, etc and return the result 
- *
- * \return zero on success, -1 on error.
- */
-
-int celliax_sound_init(struct celliax_pvt *p)
-{
-#ifdef CELLIAX_ALSA
-  return alsa_init(p);
-#endif /* CELLIAX_ALSA */
-#ifdef CELLIAX_PORTAUDIO
-  return celliax_portaudio_init(p);
-#endif /* CELLIAX_PORTAUDIO */
-
-  return -1;
-}
-
-/*!
- * \brief Shutdown the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces) 
- * \param p the celliax_pvt of the interface
- *
- * This function shutdown the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces). It simply pass its parameters to the right function for the sound system for which has been compiled, eg. alsa_shutdown for ALSA, oss_shutdown for OSS, winmm_shutdown for Windows Multimedia, etc and return the result
- *
- * \return zero on success, -1 on error.
- */
-
-int celliax_sound_shutdown(struct celliax_pvt *p)
-{
-
-#ifdef CELLIAX_ALSA
-  return alsa_shutdown(p);
-#endif /* CELLIAX_ALSA */
-#ifdef CELLIAX_PORTAUDIO
-  return celliax_portaudio_shutdown(p);
-#endif /* CELLIAX_PORTAUDIO */
-
-  return -1;
-}
-
-/*! \brief returns an asterisk frame categorized by dsp algorithms */
-struct ast_frame *celliax_sound_dsp_analize(struct celliax_pvt *p, struct ast_frame *f,
-                                            int dsp_silence_threshold)
-{
-  if (!p->dsp) {
-    DEBUGA_SOUND("no dsp, initializing it \n", CELLIAX_P_LOG);
-    if (celliax_sound_dsp_set(p, dsp_silence_threshold, 1)) {
-      ERRORA("celliax_sound_dsp_set failed\n", CELLIAX_P_LOG);
-      return NULL;
-    }
-  }
-
-  /* process with dsp */
-  if (p->dsp) {
-    if (f->frametype == AST_FRAME_VOICE) {
-      f = ast_dsp_process(p->owner, p->dsp, f);
-    } else {
-      //WARNINGA("not a VOICE frame ! \n", CELLIAX_P_LOG);
-    }
-  }
-  return f;
-}
-
-/*! \brief initialize the dsp algorithms and structures */
-int celliax_sound_dsp_set(struct celliax_pvt *p, int dsp_silence_threshold,
-                          int silence_suppression)
-{
-
-/*  let asterisk dsp algorithms detect dtmf */
-  if (p->dsp) {
-    return 0;
-  }
-  if (option_debug > 1)
-    DEBUGA_SOUND("alloc dsp \n", CELLIAX_P_LOG);
-  p->dsp = ast_dsp_new();
-  if (p->dsp) {
-    if (silence_suppression) {
-      ast_dsp_set_threshold(p->dsp, dsp_silence_threshold);
-      DEBUGA_SOUND("set dsp_silence_threshold=%d\n", CELLIAX_P_LOG,
-                   dsp_silence_threshold);
-      if (option_debug > 1)
-        DEBUGA_SOUND("Detecting silence, I mean, voice\n", CELLIAX_P_LOG);
-      ast_dsp_set_features(p->dsp, 0 | DSP_FEATURE_SILENCE_SUPPRESS);
-    } else {
-      if (option_debug > 1)
-        DEBUGA_SOUND("WITHOUT SILENCE_SUPPRESS, Detecting inband dtmf with sw DSP\n",
-                     CELLIAX_P_LOG);
-
-#ifdef ASTERISK_VERSION_1_6_0_1
-      ast_dsp_set_features(p->dsp, 0 | DSP_FEATURE_DIGIT_DETECT);
-#else
-      ast_dsp_set_features(p->dsp, 0 | DSP_FEATURE_DTMF_DETECT);
-#endif /* ASTERISK_VERSION_1_6_0_1 */
-    }
-
-    /*
-       if (ast_dsp_digitmode(p->dsp, DSP_DIGITMODE_DTMF | DSP_DIGITMODE_RELAXDTMF)) {
-       ERRORA("ast_dsp_digitmode failed\n", CELLIAX_P_LOG);
-       return -1;
-       }
-     */
-  } else {
-    ERRORA("ast_dsp_new failed\n", CELLIAX_P_LOG);
-    return -1;
-  }
-  return 0;
-}
-
-/*! \brief Read audio frames from interface */
-struct ast_frame *celliax_sound_read(struct celliax_pvt *p)
-{
-  struct ast_frame *f = NULL;
-#ifdef CELLIAX_ALSA
-  f = alsa_read(p);
-#endif /* CELLIAX_ALSA */
-#ifdef CELLIAX_PORTAUDIO
-  f = celliax_portaudio_read(p);
-#endif /* CELLIAX_PORTAUDIO */
-
-  return f;
-}
-
-/*! \brief Send audio frame to interface */
-int celliax_sound_write(struct celliax_pvt *p, struct ast_frame *f)
-{
-  int ret = -1;
-
-#ifdef CELLIAX_ALSA
-  ret = alsa_write(p, f);
-#endif /* CELLIAX_ALSA */
-#ifdef CELLIAX_PORTAUDIO
-  ret = celliax_portaudio_write(p, f);
-#endif /* CELLIAX_PORTAUDIO */
-
-  return ret;
-}
-
-/*! \brief read an audio frame and tell if is "voice" (interpreted as incoming RING) */
-int celliax_sound_monitor(struct celliax_pvt *p)
-{
-  struct ast_frame *f;
-  f = celliax_sound_read(p);
-  if (f) {
-    f = celliax_sound_dsp_analize(p, f, p->dsp_silence_threshold);
-    if (f) {
-      if (f->frametype == AST_FRAME_VOICE) {
-        DEBUGA_SOUND("VOICE\n", CELLIAX_P_LOG);
-        return CALLFLOW_INCOMING_RING;
-      } else {
-        return AST_STATE_DOWN;
-      }
-    }
-  }
-  return -1;
-}
-
-/*!
- * \brief This thread runs during a call, and monitor the interface serial port for signaling, like hangup, caller id, etc
- *
- */
-void *celliax_do_controldev_thread(void *data)
-{
-  struct celliax_pvt *p = data;
-  int res;
-
-  DEBUGA_SERIAL("In celliax_do_controldev_thread: started, p=%p\n", CELLIAX_P_LOG, p);
-
-  if (pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL)) {
-    ERRORA("Unable to set cancel type to deferred\n", CELLIAX_P_LOG);
-    return NULL;
-  }
-
-  while (1) {
-    int rt;
-    time_t now_timestamp;
-
-    if (p->controldevprotocol == PROTOCOL_NO_SERIAL) {
-      while (1) {
-        usleep(10000);
-        pthread_testcancel();
-      }
-    }
-#ifdef CELLIAX_CVM
-    if (p->controldevprotocol == PROTOCOL_CVM_BUSMAIL) {
-      usleep(p->cvm_celliax_serial_delay * 1000);   //to get msecs
-    } else {
-      usleep(1000);
-    }
-
-#else
-    usleep(1000);
-#endif /* CELLIAX_CVM */
-
-    pthread_testcancel();
-    /* do not read from a dead controldev */
-    if (p->controldev_dead) {
-      DEBUGA_SERIAL("celliax_do_controldev_thread: device %s is dead\n", CELLIAX_P_LOG,
-                    p->controldevice_name);
-      if (p->owner)
-        celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
-      return NULL;
-    } else {
-      pthread_testcancel();
-      res = celliax_serial_read(p);
-      pthread_testcancel();
-      if (res == -1) {
-        p->controldev_dead = 1;
-        close(p->controldevfd);
-        ERRORA("serial read failed, declaring %s dead\n", CELLIAX_P_LOG,
-               p->controldevice_name);
-      }
-    }
-
-    pthread_testcancel();
-    time(&now_timestamp);
-    if ((now_timestamp - p->celliax_serial_synced_timestamp) > p->celliax_serial_synced_timestamp && !p->controldev_dead) { //TODO find a sensible period. 5min? in config?
-      DEBUGA_SERIAL("Syncing Serial\n", CELLIAX_P_LOG);
-      pthread_testcancel();
-      rt = celliax_serial_sync(p);
-      pthread_testcancel();
-      if (rt) {
-        p->controldev_dead = 1;
-        close(p->controldevfd);
-        ERRORA("serial sync failed, declaring %s dead\n", CELLIAX_P_LOG,
-               p->controldevice_name);
-      }
-      pthread_testcancel();
-      rt = celliax_serial_getstatus(p);
-      pthread_testcancel();
-      if (rt) {
-        p->controldev_dead = 1;
-        close(p->controldevfd);
-        ERRORA("serial getstatus failed, declaring %s dead\n", CELLIAX_P_LOG,
-               p->controldevice_name);
-      }
-
-    }
-    pthread_testcancel();
-  }
-  return NULL;
-
-}
-
-int celliax_serial_init(struct celliax_pvt *p, speed_t controldevice_speed)
-{
-  int fd;
-  int rt;
-  struct termios tp;
-
-/* if there is a file descriptor, close it. But it is probably just an old value, so don't check for close success*/
-  fd = p->controldevfd;
-  if (fd) {
-    close(fd);
-  }
-/*  open the serial port */
-#ifdef __CYGWIN__
-  fd = open(p->controldevice_name, O_RDWR | O_NOCTTY | O_NONBLOCK);
-  sleep(1);
-  close(fd);
-#endif /* __CYGWIN__ */
-  fd = open(p->controldevice_name, O_RDWR | O_NOCTTY | O_NONBLOCK);
-  if (fd == -1) {
-    DEBUGA_SERIAL("serial error: %s\n", CELLIAX_P_LOG, strerror(errno));
-    p->controldevfd = fd;
-    return -1;
-  }
-/*  flush it */
-  rt = tcflush(fd, TCIFLUSH);
-  if (rt == -1) {
-    ERRORA("serial error: %s", CELLIAX_P_LOG, strerror(errno));
-  }
-/*  attributes */
-  tp.c_cflag = B0 | CS8 | CLOCAL | CREAD | HUPCL;
-  tp.c_iflag = IGNPAR;
-  tp.c_cflag &= ~CRTSCTS;
-  tp.c_oflag = 0;
-  tp.c_lflag = 0;
-  tp.c_cc[VMIN] = 1;
-  tp.c_cc[VTIME] = 0;
-/*  set controldevice_speed */
-  rt = cfsetispeed(&tp, p->controldevice_speed);
-  if (rt == -1) {
-    ERRORA("serial error: %s", CELLIAX_P_LOG, strerror(errno));
-  }
-  rt = cfsetospeed(&tp, p->controldevice_speed);
-  if (rt == -1) {
-    ERRORA("serial error: %s", CELLIAX_P_LOG, strerror(errno));
-  }
-/*  set port attributes */
-  if (tcsetattr(fd, TCSADRAIN, &tp) == -1) {
-    ERRORA("serial error: %s", CELLIAX_P_LOG, strerror(errno));
-  }
-  rt = tcsetattr(fd, TCSANOW, &tp);
-  if (rt == -1) {
-    ERRORA("serial error: %s", CELLIAX_P_LOG, strerror(errno));
-  }
-  unsigned int status = 0;
-#ifndef __CYGWIN__
-  ioctl(fd, TIOCMGET, &status);
-  status |= TIOCM_DTR;          /*  Set DTR high */
-  status &= ~TIOCM_RTS;         /*  Set RTS low */
-  ioctl(fd, TIOCMSET, &status);
-  ioctl(fd, TIOCMGET, &status);
-  unsigned int flags = TIOCM_DTR;
-  ioctl(fd, TIOCMBIS, &flags);
-  flags = TIOCM_RTS;
-  ioctl(fd, TIOCMBIC, &flags);
-  ioctl(fd, TIOCMGET, &status);
-#else /* __CYGWIN__ */
-  ioctl(fd, TIOCMGET, &status);
-  status |= TIOCM_DTR;          /*  Set DTR high */
-  status &= ~TIOCM_RTS;         /*  Set RTS low */
-  ioctl(fd, TIOCMSET, &status);
-#endif /* __CYGWIN__ */
-  p->controldevfd = fd;
-  DEBUGA_SERIAL("Syncing Serial\n", CELLIAX_P_LOG);
-  rt = celliax_serial_sync(p);
-  if (rt == -1) {
-    ERRORA("Serial init error\n", CELLIAX_P_LOG);
-    return -1;
-  }
-  return (fd);
-}
-
-int celliax_serial_sync(struct celliax_pvt *p)
-{
-  if (p->controldevprotocol == PROTOCOL_AT)
-    return celliax_serial_sync_AT(p);
-#ifdef CELLIAX_FBUS2
-  if (p->controldevprotocol == PROTOCOL_FBUS2)
-    return celliax_serial_sync_FBUS2(p);
-#endif /* CELLIAX_FBUS2 */
-#ifdef CELLIAX_CVM
-  if (p->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-    return celliax_serial_sync_CVM_BUSMAIL(p);
-#endif /* CELLIAX_CVM */
-
-  return -1;
-}
-
-int celliax_serial_getstatus(struct celliax_pvt *p)
-{
-  if (p->controldevprotocol == PROTOCOL_AT)
-    return celliax_serial_getstatus_AT(p);
-#ifdef CELLIAX_FBUS2
-  if (p->controldevprotocol == PROTOCOL_FBUS2)
-    return celliax_serial_getstatus_FBUS2(p);
-#endif /* CELLIAX_FBUS2 */
-
-#ifdef CELLIAX_CVM
-  if (p->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-    return celliax_serial_getstatus_CVM_BUSMAIL(p);
-#endif /* CELLIAX_CVM */
-  return -1;
-}
-
-int celliax_serial_read(struct celliax_pvt *p)
-{
-  if (p->controldevprotocol == PROTOCOL_AT)
-    return celliax_serial_read_AT(p, 0, 100000, 0, NULL, 1);    // a 10th of a second timeout
-#ifdef CELLIAX_FBUS2
-  if (p->controldevprotocol == PROTOCOL_FBUS2)
-    return celliax_serial_read_FBUS2(p);
-#endif /* CELLIAX_FBUS2 */
-#ifdef CELLIAX_CVM
-  if (p->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-    return celliax_serial_read_CVM_BUSMAIL(p);
-#endif /* CELLIAX_CVM */
-  return -1;
-}
-
-int celliax_serial_hangup(struct celliax_pvt *p)
-{
-  if (p->controldevprotocol == PROTOCOL_AT)
-    return celliax_serial_hangup_AT(p);
-#ifdef CELLIAX_FBUS2
-  if (p->controldevprotocol == PROTOCOL_FBUS2)
-    return celliax_serial_hangup_FBUS2(p);
-#endif /* CELLIAX_FBUS2 */
-#ifdef CELLIAX_CVM
-  if (p->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-    return celliax_serial_hangup_CVM_BUSMAIL(p);
-#endif /* CELLIAX_CVM */
-  return -1;
-}
-
-int celliax_serial_answer(struct celliax_pvt *p)
-{
-  if (p->controldevprotocol == PROTOCOL_AT)
-    return celliax_serial_answer_AT(p);
-#ifdef CELLIAX_FBUS2
-  if (p->controldevprotocol == PROTOCOL_FBUS2)
-    return celliax_serial_answer_FBUS2(p);
-#endif /* CELLIAX_FBUS2 */
-#ifdef CELLIAX_CVM
-  if (p->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-    return celliax_serial_answer_CVM_BUSMAIL(p);
-#endif /* CELLIAX_CVM */
-  return -1;
-}
-
-int celliax_serial_config(struct celliax_pvt *p)
-{
-  if (p->controldevprotocol == PROTOCOL_AT)
-    return celliax_serial_config_AT(p);
-#ifdef CELLIAX_FBUS2
-  if (p->controldevprotocol == PROTOCOL_FBUS2)
-    return celliax_serial_config_FBUS2(p);
-#endif /* CELLIAX_FBUS2 */
-#ifdef CELLIAX_CVM
-  if (p->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-    return celliax_serial_config_CVM_BUSMAIL(p);
-#endif /* CELLIAX_CVM */
-  return -1;
-}
-
-int celliax_serial_monitor(struct celliax_pvt *p)
-{
-  if (p->controldevprotocol == PROTOCOL_AT)
-    return celliax_serial_read_AT(p, 0, 100000, 0, NULL, 1);    // a 10th of a second timeout
-#ifdef CELLIAX_FBUS2
-  if (p->controldevprotocol == PROTOCOL_FBUS2)
-    return celliax_serial_read_FBUS2(p);
-#endif /* CELLIAX_FBUS2 */
-#ifdef CELLIAX_CVM
-  if (p->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-    return celliax_serial_read_CVM_BUSMAIL(p);
-#endif /* CELLIAX_CVM */
-  return -1;
-}
-
-/************************************************/
-
-/* LUIGI RIZZO's magic */
-/*
- * store the boost factor
- */
-#ifdef ASTERISK_VERSION_1_6_0
-void celliax_store_boost(const char *s, double *boost)
-#else
-void celliax_store_boost(char *s, double *boost)
-#endif                          /* ASTERISK_VERSION_1_6_0 */
-{
-  struct celliax_pvt *p = NULL;
-
-  if (sscanf(s, "%lf", boost) != 1) {
-    ERRORA("invalid boost <%s>\n", CELLIAX_P_LOG, s);
-    return;
-  }
-  if (*boost < -BOOST_MAX) {
-    WARNINGA("boost %s too small, using %d\n", CELLIAX_P_LOG, s, -BOOST_MAX);
-    *boost = -BOOST_MAX;
-  } else if (*boost > BOOST_MAX) {
-    WARNINGA("boost %s too large, using %d\n", CELLIAX_P_LOG, s, BOOST_MAX);
-    *boost = BOOST_MAX;
-  }
-  *boost = exp(log(10) * *boost / 20) * BOOST_SCALE;
-  if (option_debug > 1)
-    DEBUGA_SOUND("setting boost %s to %f\n", CELLIAX_P_LOG, s, *boost);
-}
-
-int celliax_serial_call(struct celliax_pvt *p, char *dstr)
-{
-  if (p->controldevprotocol == PROTOCOL_AT)
-    return celliax_serial_call_AT(p, dstr);
-#ifdef CELLIAX_FBUS2
-  if (p->controldevprotocol == PROTOCOL_FBUS2)
-    return celliax_serial_call_FBUS2(p, dstr);
-#endif /* CELLIAX_FBUS2 */
-  if (p->controldevprotocol == PROTOCOL_NO_SERIAL)
-    return 0;
-#ifdef CELLIAX_CVM
-  if (p->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-    return celliax_serial_call_CVM_BUSMAIL(p, dstr);
-#endif /* CELLIAX_CVM */
-  return -1;
-}
-
-/*
- * returns a pointer to the descriptor with the given name
- */
-struct celliax_pvt *celliax_console_find_desc(char *dev)
-{
-  struct celliax_pvt *p;
-
-  for (p = celliax_iflist; p && strcmp(p->name, dev) != 0; p = p->next);
-  if (p == NULL)
-    WARNINGA("could not find <%s>\n", CELLIAX_P_LOG, dev);
-
-  return p;
-}
-
-int celliax_console_playback_boost(int fd, int argc, char *argv[])
-{
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-
-  if (argc > 2)
-    return RESULT_SHOWUSAGE;
-  if (!p) {
-    ast_cli(fd,
-            "No \"current\" celliax_console for playback_boost, please enter 'help celliax_console'\n");
-    return RESULT_SUCCESS;
-  }
-
-  if (argc == 1) {
-    ast_cli(fd, "playback_boost on the active celliax_console, that is [%s], is: %5.1f\n",
-            celliax_console_active,
-            20 * log10(((double) p->playback_boost / (double) BOOST_SCALE)));
-  } else if (argc == 2) {
-    celliax_store_boost(argv[1], &p->playback_boost);
-
-    ast_cli(fd,
-            "playback_boost on the active celliax_console, that is [%s], is now: %5.1f\n",
-            celliax_console_active,
-            20 * log10(((double) p->playback_boost / (double) BOOST_SCALE)));
-  }
-
-  return RESULT_SUCCESS;
-}
-
-int celliax_console_capture_boost(int fd, int argc, char *argv[])
-{
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-
-  if (argc > 2)
-    return RESULT_SHOWUSAGE;
-  if (!p) {
-    ast_cli(fd,
-            "No \"current\" celliax_console for capture_boost, please enter 'help celliax_console'\n");
-    return RESULT_SUCCESS;
-  }
-
-  if (argc == 1) {
-    ast_cli(fd, "capture_boost on the active celliax_console, that is [%s], is: %5.1f\n",
-            celliax_console_active,
-            20 * log10(((double) p->capture_boost / (double) BOOST_SCALE)));
-  } else if (argc == 2) {
-    celliax_store_boost(argv[1], &p->capture_boost);
-
-    ast_cli(fd,
-            "capture_boost on the active celliax_console, that is [%s], is now: %5.1f\n",
-            celliax_console_active,
-            20 * log10(((double) p->capture_boost / (double) BOOST_SCALE)));
-  }
-
-  return RESULT_SUCCESS;
-}
-
-int celliax_console_echo(int fd, int argc, char *argv[])
-{
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-
-  if (argc != 3 && argc != 1)
-    return RESULT_SHOWUSAGE;
-  if (!p) {
-    ast_cli(fd,
-            "No \"current\" celliax_console for celliax_echo, please enter 'help celliax_console'\n");
-    return RESULT_SUCCESS;
-  }
-
-  if (argc == 1) {
-    ast_cli(fd,
-            "On the active celliax_console, that is [%s], speexecho and speexpreprocess are: %d and %d\n",
-            celliax_console_active, p->speexecho, p->speexpreprocess);
-  } else if (argc == 3) {
-    sscanf(argv[1], "%d", &p->speexecho);
-    sscanf(argv[2], "%d", &p->speexpreprocess);
-    ast_cli(fd,
-            "On the active celliax_console, that is [%s], speexecho and speexpreprocess are NOW: %d and %d\n",
-            celliax_console_active, p->speexecho, p->speexpreprocess);
-  }
-
-  return RESULT_SUCCESS;
-}
-
-#ifndef ASTERISK_VERSION_1_6_0
-int celliax_console_hangup(int fd, int argc, char *argv[])
-{
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-
-  if (argc != 1)
-    return RESULT_SHOWUSAGE;
-  if (!p) {
-    ast_cli(fd,
-            "No \"current\" celliax_console for hanging up, please enter 'help celliax_console'\n");
-    return RESULT_SUCCESS;
-  }
-  if (!p->owner) {
-    ast_cli(fd, "No call to hangup on the active celliax_console, that is [%s]\n",
-            celliax_console_active);
-    return RESULT_FAILURE;
-  }
-  if (p->owner)
-    ast_queue_hangup(p->owner);
-  return RESULT_SUCCESS;
-}
-#else /* ASTERISK_VERSION_1_6_0 */
-char *celliax_console_hangup(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-
-
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "celliax hangup";
-		e->usage =
-			"Usage: celliax hangup\n"
-			"       Hangup a call on the celliax channel.\n";
-
-		return NULL;
-	case CLI_GENERATE:
-		return NULL; 
-	}
-
-  if (a->argc != 2)
-    return CLI_SHOWUSAGE;
-  if (!p) {
-    ast_cli(a->fd,
-            "No \"current\" celliax_console for hanging up, please enter 'help celliax_console'\n");
-    return CLI_SUCCESS;
-  }
-  if (!p->owner) {
-    ast_cli(a->fd, "No call to hangup on the active celliax_console, that is [%s]\n",
-            celliax_console_active);
-    return CLI_FAILURE;
-  }
-  if (p->owner)
-    ast_queue_hangup(p->owner);
-  return CLI_SUCCESS;
-}
-
-#endif /* ASTERISK_VERSION_1_6_0 */
-int celliax_console_sendsms(int fd, int argc, char *argv[])
-{
-  char *s = NULL;
-  char *s1 = NULL;
-  char command[512];
-
-  if (argc != 3)
-    return RESULT_SHOWUSAGE;
-
-  s = argv[1];
-  s1 = argv[2];
-
-  memset(command, 0, sizeof(command));
-
-  sprintf(command, "%s|%s|", s, s1);
-
-  celliax_sendsms(NULL, (void *) &command);
-
-  return RESULT_SUCCESS;
-}
-
-int celliax_console_dial(int fd, int argc, char *argv[])
-{
-  char *s = NULL;
-  struct celliax_pvt *p = celliax_console_find_desc(celliax_console_active);
-
-  if (argc != 2)
-    return RESULT_SHOWUSAGE;
-  if (!p) {
-    ast_cli(fd,
-            "No \"current\" celliax_console for dialing, please enter 'help celliax_console'\n");
-    return RESULT_SUCCESS;
-  }
-
-  if (p->owner) {               /* already in a call */
-    int i;
-    struct ast_frame f = { AST_FRAME_DTMF, 0 };
-
-    s = argv[1];
-    /* send the string one char at a time */
-    for (i = 0; i < strlen(s); i++) {
-      f.subclass = s[i];
-      ast_queue_frame(p->owner, &f);
-    }
-    return RESULT_SUCCESS;
-  } else
-    ast_cli(fd,
-            "No call in which to dial on the \"current\" celliax_console, that is [%s]\n",
-            celliax_console_active);
-  if (s)
-    free(s);
-  return RESULT_SUCCESS;
-}
-
-int celliax_console_set_active(int fd, int argc, char *argv[])
-{
-  if (argc == 1)
-    ast_cli(fd,
-            "\"current\" celliax_console is [%s]\n    Enter 'celliax_console show' to see the available interfaces.\n    Enter 'celliax_console interfacename' to change the \"current\" celliax_console.\n",
-            celliax_console_active);
-  else if (argc != 2)
-    return RESULT_SHOWUSAGE;
-  else {
-    struct celliax_pvt *p;
-    if (strcmp(argv[1], "show") == 0) {
-      ast_cli(fd, "Available interfaces:\n");
-      for (p = celliax_iflist; p; p = p->next)
-        ast_cli(fd, "     [%s]\n", p->name);
-      return RESULT_SUCCESS;
-    }
-    p = celliax_console_find_desc(argv[1]);
-    if (p == NULL)
-      ast_cli(fd, "Interface [%s] do not exists!\n", argv[1]);
-    else {
-      celliax_console_active = p->name;
-      ast_cli(fd, "\"current\" celliax_console is now: [%s]\n", argv[1]);
-    }
-  }
-  return RESULT_SUCCESS;
-}
-
-int celliax_console_celliax(int fd, int argc, char *argv[])
-{
-  return RESULT_SHOWUSAGE;
-}
-
-#ifdef ASTERISK_VERSION_1_4
-#ifndef AST_MODULE
-#define AST_MODULE "chan_celliax"
-#endif
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Celliax, Audio-Serial Driver");
-#endif /* ASTERISK_VERSION_1_4 */
diff --git a/src/mod/endpoints/mod_gsmopen/asterisk/ciapalo b/src/mod/endpoints/mod_gsmopen/asterisk/ciapalo
deleted file mode 100755
index aa9ea7f4dd..0000000000
--- a/src/mod/endpoints/mod_gsmopen/asterisk/ciapalo
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-open(FILEOUT, ">> /tmp/smses_received");
-while(<>){
-       print FILEOUT  $_ ;
-       printf FILEOUT  "\n" ;
-}
-close(FILEOUT);
-
diff --git a/src/mod/endpoints/mod_gsmopen/configs/gsmopen.conf.xml b/src/mod/endpoints/mod_gsmopen/configs/gsmopen.conf.xml
deleted file mode 100644
index 0647f53168..0000000000
--- a/src/mod/endpoints/mod_gsmopen/configs/gsmopen.conf.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<configuration name="gsmopen.conf" description="GSMopen Configuration">
-  <global_settings>
-    <param name="debug" value="8"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="default"/>
-    <param name="hold-music" value="$${moh_uri}"/>
-    <param name="destination" value="5000"/>
-  </global_settings>
-  <!-- one entry here per gsmopen interface -->
-  <per_interface_settings>
-    <interface id="1" name="gsm01">
-      <param name="controldevice_name" value="/dev/ttyUSB3"/>
-      <param name="controldevice_audio_name" value="/dev/ttyUSB2"/>
-    <!-- in windowz would be, eg: -->
-      <!--
-      <param name="controldevice_name" value="COM4"/>
-      -->
-      <!-- 3G PC UI Interface is controldevice_name -->
-      <!--
-      <param name="controldevice_audio_name" value="COM2"/>
-      -->
-      <!-- 3G Application Interface is controldevice_audio_name -->
-    </interface>
-    <!-- following interfaces are commented out!
-    -->
-  </per_interface_settings>
-</configuration>
diff --git a/src/mod/endpoints/mod_gsmopen/driver_usb_dongle/Makefile b/src/mod/endpoints/mod_gsmopen/driver_usb_dongle/Makefile
deleted file mode 100644
index f87fe778f5..0000000000
--- a/src/mod/endpoints/mod_gsmopen/driver_usb_dongle/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Comment/uncomment the following line to disable/enable debugging
-#DEBUG = y
-#LDDINC=
-
-# Add your debugging flag (or not) to CFLAGS
-ifeq ($(DEBUG),y)
-  DEBFLAGS = -O -g -DSKYPOPEN_DEBUG # "-O" is needed to expand inlines
-else
-  DEBFLAGS = -O2 -Wall
-endif
-
-EXTRA_CFLAGS += $(DEBFLAGS)
-EXTRA_CFLAGS += -I$(LDDINC)
-
-ifneq ($(KERNELRELEASE),)
-# call from kernel build system
-
-option-objs := main.o
-
-obj-m	:= option.o
-
-else
-
-KERNELDIR ?= /lib/modules/$(shell uname -r)/build
-PWD       := $(shell pwd)
-
-modules:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) LDDINC=$(PWD)/../include modules
-
-endif
-
-
-
-clean:
-	rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions *.order *.symvers
-
-depend .depend dep:
-	$(CC) $(EXTRA_CFLAGS) -M *.c > .depend
-
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
diff --git a/src/mod/endpoints/mod_gsmopen/driver_usb_dongle/README b/src/mod/endpoints/mod_gsmopen/driver_usb_dongle/README
deleted file mode 100644
index c89411760d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/driver_usb_dongle/README
+++ /dev/null
@@ -1,9 +0,0 @@
-On kernels < 2.6.34 the option modem driver, needed by your dongle, is unstable.
-
-In this directory you can build an option.ko module for kernels 2.6.32.* (eg: Proxmox, OpenVZ) and 2.6.34.*
-
-To install it:
-
-make clean ; make
-cp /lib/modules/$(uname -r)/kernel/drivers/usb/serial/option.ko /lib/modules/$(uname -r)/kernel/drivers/usb/serial/option.ko-backup
-cp option.ko /lib/modules/$(uname -r)/kernel/drivers/usb/serial/
diff --git a/src/mod/endpoints/mod_gsmopen/driver_usb_dongle/main.c b/src/mod/endpoints/mod_gsmopen/driver_usb_dongle/main.c
deleted file mode 100644
index c626fdaeec..0000000000
--- a/src/mod/endpoints/mod_gsmopen/driver_usb_dongle/main.c
+++ /dev/null
@@ -1,1817 +0,0 @@
-/*
-  USB Driver for GSM modems
-
-  Copyright (C) 2005  Matthias Urlichs <smurf@smurf.noris.de>
-
-  This driver is free software; you can redistribute it and/or modify
-  it under the terms of Version 2 of the GNU General Public License as
-  published by the Free Software Foundation.
-
-  Portions copied from the Keyspan driver by Hugh Blemings <hugh@blemings.org>
-
-  History: see the git log.
-
-  Work sponsored by: Sigos GmbH, Germany <info@sigos.de>
-
-  This driver exists because the "normal" serial driver doesn't work too well
-  with GSM modems. Issues:
-  - data loss -- one single Receive URB is not nearly enough
-  - nonstandard flow (Option devices) control
-  - controlling the baud rate doesn't make sense
-
-  This driver is named "option" because the most common device it's
-  used for is a PC-Card (with an internal OHCI-USB interface, behind
-  which the GSM interface sits), made by Option Inc.
-
-  Some of the "one port" devices actually exhibit multiple USB instances
-  on the USB bus. This is not a bug, these ports are used for different
-  device features.
-*/
-
-#define DRIVER_VERSION "v0.7.2"
-#define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>"
-#define DRIVER_DESC "USB Driver for GSM modems"
-
-#include <linux/kernel.h>
-#include <linux/jiffies.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/bitops.h>
-#include <linux/usb.h>
-#include <linux/usb/serial.h>
-
-/* Function prototypes */
-static int  option_probe(struct usb_serial *serial,
-			const struct usb_device_id *id);
-static int  option_open(struct tty_struct *tty, struct usb_serial_port *port);
-static void option_close(struct usb_serial_port *port);
-static void option_dtr_rts(struct usb_serial_port *port, int on);
-
-static int  option_startup(struct usb_serial *serial);
-static void option_disconnect(struct usb_serial *serial);
-static void option_release(struct usb_serial *serial);
-static int  option_write_room(struct tty_struct *tty);
-
-static void option_instat_callback(struct urb *urb);
-
-static int option_write(struct tty_struct *tty, struct usb_serial_port *port,
-			const unsigned char *buf, int count);
-static int  option_chars_in_buffer(struct tty_struct *tty);
-static void option_set_termios(struct tty_struct *tty,
-			struct usb_serial_port *port, struct ktermios *old);
-static int  option_tiocmget(struct tty_struct *tty, struct file *file);
-static int  option_tiocmset(struct tty_struct *tty, struct file *file,
-				unsigned int set, unsigned int clear);
-static int  option_send_setup(struct usb_serial_port *port);
-#ifdef CONFIG_PM
-static int  option_suspend(struct usb_serial *serial, pm_message_t message);
-static int  option_resume(struct usb_serial *serial);
-#endif
-
-/* Vendor and product IDs */
-#define OPTION_VENDOR_ID			0x0AF0
-#define OPTION_PRODUCT_COLT			0x5000
-#define OPTION_PRODUCT_RICOLA			0x6000
-#define OPTION_PRODUCT_RICOLA_LIGHT		0x6100
-#define OPTION_PRODUCT_RICOLA_QUAD		0x6200
-#define OPTION_PRODUCT_RICOLA_QUAD_LIGHT	0x6300
-#define OPTION_PRODUCT_RICOLA_NDIS		0x6050
-#define OPTION_PRODUCT_RICOLA_NDIS_LIGHT	0x6150
-#define OPTION_PRODUCT_RICOLA_NDIS_QUAD		0x6250
-#define OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT	0x6350
-#define OPTION_PRODUCT_COBRA			0x6500
-#define OPTION_PRODUCT_COBRA_BUS		0x6501
-#define OPTION_PRODUCT_VIPER			0x6600
-#define OPTION_PRODUCT_VIPER_BUS		0x6601
-#define OPTION_PRODUCT_GT_MAX_READY		0x6701
-#define OPTION_PRODUCT_FUJI_MODEM_LIGHT		0x6721
-#define OPTION_PRODUCT_FUJI_MODEM_GT		0x6741
-#define OPTION_PRODUCT_FUJI_MODEM_EX		0x6761
-#define OPTION_PRODUCT_KOI_MODEM		0x6800
-#define OPTION_PRODUCT_SCORPION_MODEM		0x6901
-#define OPTION_PRODUCT_ETNA_MODEM		0x7001
-#define OPTION_PRODUCT_ETNA_MODEM_LITE		0x7021
-#define OPTION_PRODUCT_ETNA_MODEM_GT		0x7041
-#define OPTION_PRODUCT_ETNA_MODEM_EX		0x7061
-#define OPTION_PRODUCT_ETNA_KOI_MODEM		0x7100
-#define OPTION_PRODUCT_GTM380_MODEM		0x7201
-
-#define HUAWEI_VENDOR_ID			0x12D1
-#define HUAWEI_PRODUCT_E600			0x1001
-#define HUAWEI_PRODUCT_E220			0x1003
-#define HUAWEI_PRODUCT_E220BIS			0x1004
-#define HUAWEI_PRODUCT_E1401			0x1401
-#define HUAWEI_PRODUCT_E1402			0x1402
-#define HUAWEI_PRODUCT_E1403			0x1403
-#define HUAWEI_PRODUCT_E1404			0x1404
-#define HUAWEI_PRODUCT_E1405			0x1405
-#define HUAWEI_PRODUCT_E1406			0x1406
-#define HUAWEI_PRODUCT_E1407			0x1407
-#define HUAWEI_PRODUCT_E1408			0x1408
-#define HUAWEI_PRODUCT_E1409			0x1409
-#define HUAWEI_PRODUCT_E140A			0x140A
-#define HUAWEI_PRODUCT_E140B			0x140B
-#define HUAWEI_PRODUCT_E140C			0x140C
-#define HUAWEI_PRODUCT_E140D			0x140D
-#define HUAWEI_PRODUCT_E140E			0x140E
-#define HUAWEI_PRODUCT_E140F			0x140F
-#define HUAWEI_PRODUCT_E1410			0x1410
-#define HUAWEI_PRODUCT_E1411			0x1411
-#define HUAWEI_PRODUCT_E1412			0x1412
-#define HUAWEI_PRODUCT_E1413			0x1413
-#define HUAWEI_PRODUCT_E1414			0x1414
-#define HUAWEI_PRODUCT_E1415			0x1415
-#define HUAWEI_PRODUCT_E1416			0x1416
-#define HUAWEI_PRODUCT_E1417			0x1417
-#define HUAWEI_PRODUCT_E1418			0x1418
-#define HUAWEI_PRODUCT_E1419			0x1419
-#define HUAWEI_PRODUCT_E141A			0x141A
-#define HUAWEI_PRODUCT_E141B			0x141B
-#define HUAWEI_PRODUCT_E141C			0x141C
-#define HUAWEI_PRODUCT_E141D			0x141D
-#define HUAWEI_PRODUCT_E141E			0x141E
-#define HUAWEI_PRODUCT_E141F			0x141F
-#define HUAWEI_PRODUCT_E1420			0x1420
-#define HUAWEI_PRODUCT_E1421			0x1421
-#define HUAWEI_PRODUCT_E1422			0x1422
-#define HUAWEI_PRODUCT_E1423			0x1423
-#define HUAWEI_PRODUCT_E1424			0x1424
-#define HUAWEI_PRODUCT_E1425			0x1425
-#define HUAWEI_PRODUCT_E1426			0x1426
-#define HUAWEI_PRODUCT_E1427			0x1427
-#define HUAWEI_PRODUCT_E1428			0x1428
-#define HUAWEI_PRODUCT_E1429			0x1429
-#define HUAWEI_PRODUCT_E142A			0x142A
-#define HUAWEI_PRODUCT_E142B			0x142B
-#define HUAWEI_PRODUCT_E142C			0x142C
-#define HUAWEI_PRODUCT_E142D			0x142D
-#define HUAWEI_PRODUCT_E142E			0x142E
-#define HUAWEI_PRODUCT_E142F			0x142F
-#define HUAWEI_PRODUCT_E1430			0x1430
-#define HUAWEI_PRODUCT_E1431			0x1431
-#define HUAWEI_PRODUCT_E1432			0x1432
-#define HUAWEI_PRODUCT_E1433			0x1433
-#define HUAWEI_PRODUCT_E1434			0x1434
-#define HUAWEI_PRODUCT_E1435			0x1435
-#define HUAWEI_PRODUCT_E1436			0x1436
-#define HUAWEI_PRODUCT_E1437			0x1437
-#define HUAWEI_PRODUCT_E1438			0x1438
-#define HUAWEI_PRODUCT_E1439			0x1439
-#define HUAWEI_PRODUCT_E143A			0x143A
-#define HUAWEI_PRODUCT_E143B			0x143B
-#define HUAWEI_PRODUCT_E143C			0x143C
-#define HUAWEI_PRODUCT_E143D			0x143D
-#define HUAWEI_PRODUCT_E143E			0x143E
-#define HUAWEI_PRODUCT_E143F			0x143F
-#define HUAWEI_PRODUCT_K4505			0x1464
-#define HUAWEI_PRODUCT_K3765			0x1465
-#define HUAWEI_PRODUCT_E14AC			0x14AC
-#define HUAWEI_PRODUCT_ETS1220			0x1803
-
-#define QUANTA_VENDOR_ID			0x0408
-#define QUANTA_PRODUCT_Q101			0xEA02
-#define QUANTA_PRODUCT_Q111			0xEA03
-#define QUANTA_PRODUCT_GLX			0xEA04
-#define QUANTA_PRODUCT_GKE			0xEA05
-#define QUANTA_PRODUCT_GLE			0xEA06
-
-#define NOVATELWIRELESS_VENDOR_ID		0x1410
-
-/* YISO PRODUCTS */
-
-#define YISO_VENDOR_ID				0x0EAB
-#define YISO_PRODUCT_U893			0xC893
-
-/* MERLIN EVDO PRODUCTS */
-#define NOVATELWIRELESS_PRODUCT_V640		0x1100
-#define NOVATELWIRELESS_PRODUCT_V620		0x1110
-#define NOVATELWIRELESS_PRODUCT_V740		0x1120
-#define NOVATELWIRELESS_PRODUCT_V720		0x1130
-
-/* MERLIN HSDPA/HSPA PRODUCTS */
-#define NOVATELWIRELESS_PRODUCT_U730		0x1400
-#define NOVATELWIRELESS_PRODUCT_U740		0x1410
-#define NOVATELWIRELESS_PRODUCT_U870		0x1420
-#define NOVATELWIRELESS_PRODUCT_XU870		0x1430
-#define NOVATELWIRELESS_PRODUCT_X950D		0x1450
-
-/* EXPEDITE PRODUCTS */
-#define NOVATELWIRELESS_PRODUCT_EV620		0x2100
-#define NOVATELWIRELESS_PRODUCT_ES720		0x2110
-#define NOVATELWIRELESS_PRODUCT_E725		0x2120
-#define NOVATELWIRELESS_PRODUCT_ES620		0x2130
-#define NOVATELWIRELESS_PRODUCT_EU730		0x2400
-#define NOVATELWIRELESS_PRODUCT_EU740		0x2410
-#define NOVATELWIRELESS_PRODUCT_EU870D		0x2420
-
-/* OVATION PRODUCTS */
-#define NOVATELWIRELESS_PRODUCT_MC727		0x4100
-#define NOVATELWIRELESS_PRODUCT_MC950D		0x4400
-#define NOVATELWIRELESS_PRODUCT_U727		0x5010
-#define NOVATELWIRELESS_PRODUCT_MC727_NEW	0x5100
-#define NOVATELWIRELESS_PRODUCT_MC760		0x6000
-#define NOVATELWIRELESS_PRODUCT_OVMC760		0x6002
-
-/* FUTURE NOVATEL PRODUCTS */
-#define NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED	0X6001
-#define NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED	0X7000
-#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED	0X7001
-#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED	0X8000
-#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED	0X8001
-#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED	0X9000
-#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED	0X9001
-#define NOVATELWIRELESS_PRODUCT_GLOBAL		0XA001
-
-/* AMOI PRODUCTS */
-#define AMOI_VENDOR_ID				0x1614
-#define AMOI_PRODUCT_H01			0x0800
-#define AMOI_PRODUCT_H01A			0x7002
-#define AMOI_PRODUCT_H02			0x0802
-#define AMOI_PRODUCT_SKYPEPHONE_S2		0x0407
-
-#define DELL_VENDOR_ID				0x413C
-
-/* Dell modems */
-#define DELL_PRODUCT_5700_MINICARD		0x8114
-#define DELL_PRODUCT_5500_MINICARD		0x8115
-#define DELL_PRODUCT_5505_MINICARD		0x8116
-#define DELL_PRODUCT_5700_EXPRESSCARD		0x8117
-#define DELL_PRODUCT_5510_EXPRESSCARD		0x8118
-
-#define DELL_PRODUCT_5700_MINICARD_SPRINT	0x8128
-#define DELL_PRODUCT_5700_MINICARD_TELUS	0x8129
-
-#define DELL_PRODUCT_5720_MINICARD_VZW		0x8133
-#define DELL_PRODUCT_5720_MINICARD_SPRINT	0x8134
-#define DELL_PRODUCT_5720_MINICARD_TELUS	0x8135
-#define DELL_PRODUCT_5520_MINICARD_CINGULAR	0x8136
-#define DELL_PRODUCT_5520_MINICARD_GENERIC_L	0x8137
-#define DELL_PRODUCT_5520_MINICARD_GENERIC_I	0x8138
-
-#define DELL_PRODUCT_5730_MINICARD_SPRINT	0x8180
-#define DELL_PRODUCT_5730_MINICARD_TELUS	0x8181
-#define DELL_PRODUCT_5730_MINICARD_VZW		0x8182
-
-#define KYOCERA_VENDOR_ID			0x0c88
-#define KYOCERA_PRODUCT_KPC650			0x17da
-#define KYOCERA_PRODUCT_KPC680			0x180a
-
-#define ANYDATA_VENDOR_ID			0x16d5
-#define ANYDATA_PRODUCT_ADU_620UW		0x6202
-#define ANYDATA_PRODUCT_ADU_E100A		0x6501
-#define ANYDATA_PRODUCT_ADU_500A		0x6502
-
-#define AXESSTEL_VENDOR_ID			0x1726
-#define AXESSTEL_PRODUCT_MV110H			0x1000
-
-#define BANDRICH_VENDOR_ID			0x1A8D
-#define BANDRICH_PRODUCT_C100_1			0x1002
-#define BANDRICH_PRODUCT_C100_2			0x1003
-#define BANDRICH_PRODUCT_1004			0x1004
-#define BANDRICH_PRODUCT_1005			0x1005
-#define BANDRICH_PRODUCT_1006			0x1006
-#define BANDRICH_PRODUCT_1007			0x1007
-#define BANDRICH_PRODUCT_1008			0x1008
-#define BANDRICH_PRODUCT_1009			0x1009
-#define BANDRICH_PRODUCT_100A			0x100a
-
-#define BANDRICH_PRODUCT_100B			0x100b
-#define BANDRICH_PRODUCT_100C			0x100c
-#define BANDRICH_PRODUCT_100D			0x100d
-#define BANDRICH_PRODUCT_100E			0x100e
-
-#define BANDRICH_PRODUCT_100F			0x100f
-#define BANDRICH_PRODUCT_1010			0x1010
-#define BANDRICH_PRODUCT_1011			0x1011
-#define BANDRICH_PRODUCT_1012			0x1012
-
-#define AMOI_VENDOR_ID			0x1614
-#define AMOI_PRODUCT_9508			0x0800
-
-#define QUALCOMM_VENDOR_ID			0x05C6
-
-#define CMOTECH_VENDOR_ID			0x16d8
-#define CMOTECH_PRODUCT_6008			0x6008
-#define CMOTECH_PRODUCT_6280			0x6280
-
-#define TELIT_VENDOR_ID				0x1bc7
-#define TELIT_PRODUCT_UC864E			0x1003
-#define TELIT_PRODUCT_UC864G			0x1004
-
-/* ZTE PRODUCTS */
-#define ZTE_VENDOR_ID				0x19d2
-#define ZTE_PRODUCT_MF622			0x0001
-#define ZTE_PRODUCT_MF628			0x0015
-#define ZTE_PRODUCT_MF626			0x0031
-#define ZTE_PRODUCT_CDMA_TECH			0xfffe
-#define ZTE_PRODUCT_AC8710			0xfff1
-#define ZTE_PRODUCT_AC2726			0xfff5
-#define ZTE_PRODUCT_AC8710T			0xffff
-
-/* ZTE PRODUCTS -- alternate vendor ID */
-#define ZTE_VENDOR_ID2				0x1d6b
-#define ZTE_PRODUCT_MF_330			0x0002
-
-#define BENQ_VENDOR_ID				0x04a5
-#define BENQ_PRODUCT_H10			0x4068
-
-#define DLINK_VENDOR_ID				0x1186
-#define DLINK_PRODUCT_DWM_652			0x3e04
-#define DLINK_PRODUCT_DWM_652_U5		0xce16
-#define DLINK_PRODUCT_DWM_652_U5A		0xce1e
-
-#define QISDA_VENDOR_ID				0x1da5
-#define QISDA_PRODUCT_H21_4512			0x4512
-#define QISDA_PRODUCT_H21_4523			0x4523
-#define QISDA_PRODUCT_H20_4515			0x4515
-#define QISDA_PRODUCT_H20_4518			0x4518
-#define QISDA_PRODUCT_H20_4519			0x4519
-
-/* TLAYTECH PRODUCTS */
-#define TLAYTECH_VENDOR_ID			0x20B9
-#define TLAYTECH_PRODUCT_TEU800			0x1682
-
-/* TOSHIBA PRODUCTS */
-#define TOSHIBA_VENDOR_ID			0x0930
-#define TOSHIBA_PRODUCT_HSDPA_MINICARD		0x1302
-#define TOSHIBA_PRODUCT_G450			0x0d45
-
-#define ALINK_VENDOR_ID				0x1e0e
-#define ALINK_PRODUCT_3GU			0x9200
-
-/* ALCATEL PRODUCTS */
-#define ALCATEL_VENDOR_ID			0x1bbb
-#define ALCATEL_PRODUCT_X060S			0x0000
-
-#define PIRELLI_VENDOR_ID			0x1266
-#define PIRELLI_PRODUCT_C100_1			0x1002
-#define PIRELLI_PRODUCT_C100_2			0x1003
-#define PIRELLI_PRODUCT_1004			0x1004
-#define PIRELLI_PRODUCT_1005			0x1005
-#define PIRELLI_PRODUCT_1006			0x1006
-#define PIRELLI_PRODUCT_1007			0x1007
-#define PIRELLI_PRODUCT_1008			0x1008
-#define PIRELLI_PRODUCT_1009			0x1009
-#define PIRELLI_PRODUCT_100A			0x100a
-#define PIRELLI_PRODUCT_100B			0x100b
-#define PIRELLI_PRODUCT_100C			0x100c
-#define PIRELLI_PRODUCT_100D			0x100d
-#define PIRELLI_PRODUCT_100E			0x100e
-#define PIRELLI_PRODUCT_100F			0x100f
-#define PIRELLI_PRODUCT_1011			0x1011
-#define PIRELLI_PRODUCT_1012			0x1012
-
-/* Airplus products */
-#define AIRPLUS_VENDOR_ID			0x1011
-#define AIRPLUS_PRODUCT_MCD650			0x3198
-
-/* Longcheer/Longsung vendor ID; makes whitelabel devices that
- * many other vendors like 4G Systems, Alcatel, ChinaBird,
- * Mobidata, etc sell under their own brand names.
- */
-#define LONGCHEER_VENDOR_ID			0x1c9e
-
-/* 4G Systems products */
-/* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick *
- * It seems to contain a Qualcomm QSC6240/6290 chipset            */
-#define FOUR_G_SYSTEMS_PRODUCT_W14		0x9603
-
-/* Haier products */
-#define HAIER_VENDOR_ID				0x201e
-#define HAIER_PRODUCT_CE100			0x2009
-
-/* Cinterion (formerly Siemens) products */
-#define SIEMENS_VENDOR_ID				0x0681
-#define CINTERION_VENDOR_ID				0x1e2d
-#define CINTERION_PRODUCT_HC25_MDM		0x0047
-#define CINTERION_PRODUCT_HC25_MDMNET	0x0040
-#define CINTERION_PRODUCT_HC28_MDM		0x004C
-#define CINTERION_PRODUCT_HC28_MDMNET	0x004A /* same for HC28J */
-#define CINTERION_PRODUCT_EU3_E			0x0051
-#define CINTERION_PRODUCT_EU3_P			0x0052
-#define CINTERION_PRODUCT_PH8			0x0053
-
-/* Olivetti products */
-#define OLIVETTI_VENDOR_ID			0x0b3c
-#define OLIVETTI_PRODUCT_OLICARD100		0xc000
-
-/* Celot products */
-#define CELOT_VENDOR_ID				0x211f
-#define CELOT_PRODUCT_CT680M			0x6801
-
-/* ONDA Communication vendor id */
-#define ONDA_VENDOR_ID       0x1ee8
-
-/* ONDA MT825UP HSDPA 14.2 modem */
-#define ONDA_MT825UP         0x000b
-
-/* Samsung products */
-#define SAMSUNG_VENDOR_ID                       0x04e8
-#define SAMSUNG_PRODUCT_GT_B3730                0x6889
-
-/* some devices interfaces need special handling due to a number of reasons */
-enum option_blacklist_reason {
-		OPTION_BLACKLIST_NONE = 0,
-		OPTION_BLACKLIST_SENDSETUP = 1,
-		OPTION_BLACKLIST_RESERVED_IF = 2
-};
-
-struct option_blacklist_info {
-	const u32 infolen;	/* number of interface numbers on blacklist */
-	const u8  *ifaceinfo;	/* pointer to the array holding the numbers */
-	enum option_blacklist_reason reason;
-};
-
-static const u8 four_g_w14_no_sendsetup[] = { 0, 1 };
-static const struct option_blacklist_info four_g_w14_blacklist = {
-	.infolen = ARRAY_SIZE(four_g_w14_no_sendsetup),
-	.ifaceinfo = four_g_w14_no_sendsetup,
-	.reason = OPTION_BLACKLIST_SENDSETUP
-};
-
-static const struct usb_device_id option_ids[] = {
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD_LIGHT) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_LIGHT) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA_BUS) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER_BUS) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX_READY) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_LIGHT) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_GT) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_EX) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_MODEM) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_MODEM) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_LITE) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },
-	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTM380_MODEM) },
-	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_Q101) },
-	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_Q111) },
-	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) },
-	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
-	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1401, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1402, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1403, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1404, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1405, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1406, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1407, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1408, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1409, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140A, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140B, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140C, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140D, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140E, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140F, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1410, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1411, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1412, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1413, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1414, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1415, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1416, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1417, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1418, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1419, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141A, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141B, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141C, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141D, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141E, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141F, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1420, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1421, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1422, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1423, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1424, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1425, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1426, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1427, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1428, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1429, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142A, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142B, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142C, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142D, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142E, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142F, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1430, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1431, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1432, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1433, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1434, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1435, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1436, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1437, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1438, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1439, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143A, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143B, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143C, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V720) }, /* Novatel Merlin V720/S720/PC720 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U730) }, /* Novatel U730/U740 (VF version) */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U740) }, /* Novatel U740 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U870) }, /* Novatel U870 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_XU870) }, /* Novatel Merlin XU870 HSDPA/3G */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_X950D) }, /* Novatel X950D */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) }, /* Novatel EV620/ES620 CDMA/EV-DO */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) }, /* Novatel ES620/ES720/U720/USB720 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) }, /* Novatel E725/E726 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES620) }, /* Novatel Merlin ES620 SM Bus */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) }, /* Novatel EU730 and Vodafone EU740 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) }, /* Novatel non-Vodafone EU740 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727_NEW) }, /* Novatel MC727/U727/USB727 refresh */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel MC727/U727/USB727 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC760) }, /* Novatel MC760/U760/USB760 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_OVMC760) }, /* Novatel Ovation MC760 */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) }, /* Novatel HSPA Embedded product */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) }, /* Novatel EVDO product */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) }, /* Novatel HSPA product */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, /* Novatel EVDO Embedded product */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, /* Novatel HSPA Embedded product */
-	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL) }, /* Novatel Global product */
-
-	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },
-	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
-	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H02) },
-	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_SKYPEPHONE_S2) },
-
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD) },		/* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5500_MINICARD) },		/* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5505_MINICARD) },		/* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_EXPRESSCARD) },		/* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5510_EXPRESSCARD) },		/* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_SPRINT) },	/* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_TELUS) },	/* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite ET620 CDMA/EV-DO */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_VZW) }, 	/* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_SPRINT) }, 	/* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_TELUS) }, 	/* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) },	/* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) },	/* Dell Wireless HSDPA 5520 */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) },	/* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) },	/* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) },	/* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, 	/* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
-	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },	/* ADU-E100, ADU-310 */
-	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
-	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },
-	{ USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) },
-	{ USB_DEVICE(YISO_VENDOR_ID, YISO_PRODUCT_U893) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1004) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1005) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1006) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1007) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1008) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1009) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100A) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100B) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100C) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100D) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100E) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100F) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1010) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1011) },
-	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1012) },
-	{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) },
-	{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
-	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */
-	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
-	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */
-	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6280) }, /* BP3-USB & BP3-EXT HSDPA */
-	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6008) },
-	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
-	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0003, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0004, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0005, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0006, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0007, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0008, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0009, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000a, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000b, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000c, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000d, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000e, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000f, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0010, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0011, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0013, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0016, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0018, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0020, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0022, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0023, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0024, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff) },
-	/* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0026, 0xff, 0xff, 0xff) }, */
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0038, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0040, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0043, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0044, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0048, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0049, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0050, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0051, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff) },
-	/* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0053, 0xff, 0xff, 0xff) }, */
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0054, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0056, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0057, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0059, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0061, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0062, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0064, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0065, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0066, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0067, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0069, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0070, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0076, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0077, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0078, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0079, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0082, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0083, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0086, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0087, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0105, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0106, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0108, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0113, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0117, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0118, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0121, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0122, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0123, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0124, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0125, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0126, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0128, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0142, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0143, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0144, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0145, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0146, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0147, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0148, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0149, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0150, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0151, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0152, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0153, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0154, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0155, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0156, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0157, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0158, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0159, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0160, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0161, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0162, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1058, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1059, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1060, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1061, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1062, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1063, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1064, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1065, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1066, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1067, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1068, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1069, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1070, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1071, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1072, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1073, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1074, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1075, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1076, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1077, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1078, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1079, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1080, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1081, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1082, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1083, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1084, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1085, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1086, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1087, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1088, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1089, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1090, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1091, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1092, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1093, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1094, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1095, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1096, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1097, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1098, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1099, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1100, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1101, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1102, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1103, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1104, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1105, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1106, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1107, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1108, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1109, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1110, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1111, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1112, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1113, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1114, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1115, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1116, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1117, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1118, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1119, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1120, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1121, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1122, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1123, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1124, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1125, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1126, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1127, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1128, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1129, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1130, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1131, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1132, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1133, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1134, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1135, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1136, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1137, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1138, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1139, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1140, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1141, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1142, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1143, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1144, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1145, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1146, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1147, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1148, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1149, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1150, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1151, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1152, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1153, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1154, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1155, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1156, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1157, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1158, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1159, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1160, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1161, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1162, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1163, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1164, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1165, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1166, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1167, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1168, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1169, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1170, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1244, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1245, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1246, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1247, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1248, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1249, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1250, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1251, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1252, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1253, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1254, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1255, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1256, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1257, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1258, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1259, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1260, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1261, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1262, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1263, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1264, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1265, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1266, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1267, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1268, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1269, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1270, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1271, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1272, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1273, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1274, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1275, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1276, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1277, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1278, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1279, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1280, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1281, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1282, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1283, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1284, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1285, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1286, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1287, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1288, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1289, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1290, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1291, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1292, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1293, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1294, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1295, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1296, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1297, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1298, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1299, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1300, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) }, /* ZTE CDMA products */
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0027, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0059, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0060, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0070, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0130, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0141, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE(ZTE_VENDOR_ID2, ZTE_PRODUCT_MF_330) },
-	{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
-	{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
-	{ USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */
-	{ USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5A) },
-	{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4512) },
-	{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4523) },
-	{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4515) },
-	{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4518) },
-	{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4519) },
-	{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_G450) },
-	{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */
-	{ USB_DEVICE(ALINK_VENDOR_ID, 0x9000) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) },
-	{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
-	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
-	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
-  	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-  	},
-	{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
-	/* Pirelli  */
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_1)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_2)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1004)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1005)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1006)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1007)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1008)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1009)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100A)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100B) },
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100C) },
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100D) },
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100E) },
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100F) },
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)},
-	{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)},
-	/* Cinterion */
-	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) },
-	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) },
-	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) },
-	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },
-	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
-	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },
-	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) },
-	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */
-	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
-
-	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
-	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
-	{ USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */
-	{ USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730/GT-B3710 LTE USB modem.*/
-	{ } /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(usb, option_ids);
-
-static struct usb_driver option_driver = {
-	.name       = "option",
-	.probe      = usb_serial_probe,
-	.disconnect = usb_serial_disconnect,
-#ifdef CONFIG_PM
-	.suspend    = usb_serial_suspend,
-	.resume     = usb_serial_resume,
-	.supports_autosuspend =	1,
-#endif
-	.id_table   = option_ids,
-	.no_dynamic_id = 	1,
-};
-
-/* The card has three separate interfaces, which the serial driver
- * recognizes separately, thus num_port=1.
- */
-
-static struct usb_serial_driver option_1port_device = {
-	.driver = {
-		.owner =	THIS_MODULE,
-		.name =		"option1",
-	},
-	.description       = "GSM modem (1-port)",
-	.usb_driver        = &option_driver,
-	.id_table          = option_ids,
-	.num_ports         = 1,
-	.probe             = option_probe,
-	.open              = option_open,
-	.close             = option_close,
-	.dtr_rts	   = option_dtr_rts,
-	.write             = option_write,
-	.write_room        = option_write_room,
-	.chars_in_buffer   = option_chars_in_buffer,
-	.set_termios       = option_set_termios,
-	.tiocmget          = option_tiocmget,
-	.tiocmset          = option_tiocmset,
-	.attach            = option_startup,
-	.disconnect        = option_disconnect,
-	.release           = option_release,
-	.read_int_callback = option_instat_callback,
-#ifdef CONFIG_PM
-	.suspend           = option_suspend,
-	.resume            = option_resume,
-#endif
-};
-
-static int debug;
-
-/* per port private data */
-
-#define N_IN_URB 4
-#define N_OUT_URB 4
-#define IN_BUFLEN 4096
-#define OUT_BUFLEN 4096
-
-struct option_intf_private {
-	spinlock_t susp_lock;
-	unsigned int suspended:1;
-	int in_flight;
-	struct option_blacklist_info *blacklist_info;
-};
-
-struct option_port_private {
-	/* Input endpoints and buffer for this port */
-	struct urb *in_urbs[N_IN_URB];
-	u8 *in_buffer[N_IN_URB];
-	/* Output endpoints and buffer for this port */
-	struct urb *out_urbs[N_OUT_URB];
-	u8 *out_buffer[N_OUT_URB];
-	unsigned long out_busy;		/* Bit vector of URBs in use */
-	int opened;
-	struct usb_anchor delayed;
-
-	/* Settings for the port */
-	int rts_state;	/* Handshaking pins (outputs) */
-	int dtr_state;
-	int cts_state;	/* Handshaking pins (inputs) */
-	int dsr_state;
-	int dcd_state;
-	int ri_state;
-
-	unsigned long tx_start_time[N_OUT_URB];
-};
-
-/* Functions used by new usb-serial code. */
-static int __init option_init(void)
-{
-	int retval;
-	retval = usb_serial_register(&option_1port_device);
-	if (retval)
-		goto failed_1port_device_register;
-	retval = usb_register(&option_driver);
-	if (retval)
-		goto failed_driver_register;
-
-	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-	       DRIVER_DESC "\n");
-
-	return 0;
-
-failed_driver_register:
-	usb_serial_deregister(&option_1port_device);
-failed_1port_device_register:
-	return retval;
-}
-
-static void __exit option_exit(void)
-{
-	usb_deregister(&option_driver);
-	usb_serial_deregister(&option_1port_device);
-}
-
-module_init(option_init);
-module_exit(option_exit);
-
-static int option_probe(struct usb_serial *serial,
-			const struct usb_device_id *id)
-{
-	struct option_intf_private *data;
-
-	/* D-Link DWM 652 still exposes CD-Rom emulation interface in modem mode */
-	if (serial->dev->descriptor.idVendor == DLINK_VENDOR_ID &&
-		serial->dev->descriptor.idProduct == DLINK_PRODUCT_DWM_652 &&
-		serial->interface->cur_altsetting->desc.bInterfaceClass == 0x8)
-		return -ENODEV;
-
-	/* Bandrich modem and AT command interface is 0xff */
-	if ((serial->dev->descriptor.idVendor == BANDRICH_VENDOR_ID ||
-		serial->dev->descriptor.idVendor == PIRELLI_VENDOR_ID) &&
-		serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff)
-		return -ENODEV;
-
-	/* Don't bind network interfaces on Huawei K3765 & K4505 */
-	if (serial->dev->descriptor.idVendor == HUAWEI_VENDOR_ID &&
-		(serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K3765 ||
-			serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4505) &&
-		serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
-		return -ENODEV;
-
-	data = serial->private = kzalloc(sizeof(struct option_intf_private), GFP_KERNEL);
-	if (!data)
-		return -ENOMEM;
-	spin_lock_init(&data->susp_lock);
-	data->blacklist_info = (struct option_blacklist_info*) id->driver_info;
-	return 0;
-}
-
-static enum option_blacklist_reason is_blacklisted(const u8 ifnum,
-				const struct option_blacklist_info *blacklist)
-{
-	const u8  *info;
-	int i;
-
-	if (blacklist) {
-		info = blacklist->ifaceinfo;
-
-		for (i = 0; i < blacklist->infolen; i++) {
-			if (info[i] == ifnum)
-				return blacklist->reason;
-		}
-	}
-	return OPTION_BLACKLIST_NONE;
-}
-
-static void option_set_termios(struct tty_struct *tty,
-		struct usb_serial_port *port, struct ktermios *old_termios)
-{
-	dbg("%s", __func__);
-	/* Doesn't support option setting */
-	tty_termios_copy_hw(tty->termios, old_termios);
-	option_send_setup(port);
-}
-
-static int option_tiocmget(struct tty_struct *tty, struct file *file)
-{
-	struct usb_serial_port *port = tty->driver_data;
-	unsigned int value;
-	struct option_port_private *portdata;
-
-	portdata = usb_get_serial_port_data(port);
-
-	value = ((portdata->rts_state) ? TIOCM_RTS : 0) |
-		((portdata->dtr_state) ? TIOCM_DTR : 0) |
-		((portdata->cts_state) ? TIOCM_CTS : 0) |
-		((portdata->dsr_state) ? TIOCM_DSR : 0) |
-		((portdata->dcd_state) ? TIOCM_CAR : 0) |
-		((portdata->ri_state) ? TIOCM_RNG : 0);
-
-	return value;
-}
-
-static int option_tiocmset(struct tty_struct *tty, struct file *file,
-			unsigned int set, unsigned int clear)
-{
-	struct usb_serial_port *port = tty->driver_data;
-	struct option_port_private *portdata;
-
-	portdata = usb_get_serial_port_data(port);
-
-	/* FIXME: what locks portdata fields ? */
-	if (set & TIOCM_RTS)
-		portdata->rts_state = 1;
-	if (set & TIOCM_DTR)
-		portdata->dtr_state = 1;
-
-	if (clear & TIOCM_RTS)
-		portdata->rts_state = 0;
-	if (clear & TIOCM_DTR)
-		portdata->dtr_state = 0;
-	return option_send_setup(port);
-}
-
-/* Write */
-static int option_write(struct tty_struct *tty, struct usb_serial_port *port,
-			const unsigned char *buf, int count)
-{
-	struct option_port_private *portdata;
-	struct option_intf_private *intfdata;
-	int i;
-	int left, todo;
-	struct urb *this_urb = NULL; /* spurious */
-	int err;
-	unsigned long flags;
-
-	portdata = usb_get_serial_port_data(port);
-	intfdata = port->serial->private;
-
-	dbg("%s: write (%d chars)", __func__, count);
-
-	i = 0;
-	left = count;
-	for (i = 0; left > 0 && i < N_OUT_URB; i++) {
-		todo = left;
-		if (todo > OUT_BUFLEN)
-			todo = OUT_BUFLEN;
-
-		this_urb = portdata->out_urbs[i];
-		if (test_and_set_bit(i, &portdata->out_busy)) {
-			if (time_before(jiffies,
-					portdata->tx_start_time[i] + 10 * HZ))
-				continue;
-			usb_unlink_urb(this_urb);
-			continue;
-		}
-		dbg("%s: endpoint %d buf %d", __func__,
-			usb_pipeendpoint(this_urb->pipe), i);
-
-		err = usb_autopm_get_interface_async(port->serial->interface);
-		if (err < 0)
-			break;
-
-		/* send the data */
-		memcpy(this_urb->transfer_buffer, buf, todo);
-		this_urb->transfer_buffer_length = todo;
-
-		spin_lock_irqsave(&intfdata->susp_lock, flags);
-		if (intfdata->suspended) {
-			usb_anchor_urb(this_urb, &portdata->delayed);
-			spin_unlock_irqrestore(&intfdata->susp_lock, flags);
-		} else {
-			intfdata->in_flight++;
-			spin_unlock_irqrestore(&intfdata->susp_lock, flags);
-			err = usb_submit_urb(this_urb, GFP_ATOMIC);
-			if (err) {
-				dbg("usb_submit_urb %p (write bulk) failed "
-					"(%d)", this_urb, err);
-				clear_bit(i, &portdata->out_busy);
-				spin_lock_irqsave(&intfdata->susp_lock, flags);
-				intfdata->in_flight--;
-				spin_unlock_irqrestore(&intfdata->susp_lock, flags);
-				continue;
-			}
-		}
-
-		portdata->tx_start_time[i] = jiffies;
-		buf += todo;
-		left -= todo;
-	}
-
-	count -= left;
-	dbg("%s: wrote (did %d)", __func__, count);
-	return count;
-}
-
-static void option_indat_callback(struct urb *urb)
-{
-	int err;
-	int endpoint;
-	struct usb_serial_port *port;
-	struct tty_struct *tty;
-	unsigned char *data = urb->transfer_buffer;
-	int status = urb->status;
-
-	dbg("%s: %p", __func__, urb);
-
-	endpoint = usb_pipeendpoint(urb->pipe);
-	port =  urb->context;
-
-	if (status) {
-		dbg("%s: nonzero status: %d on endpoint %02x.",
-		    __func__, status, endpoint);
-	} else {
-		tty = tty_port_tty_get(&port->port);
-		if (urb->actual_length) {
-			tty_insert_flip_string(tty, data, urb->actual_length);
-			tty_flip_buffer_push(tty);
-		} else 
-			dbg("%s: empty read urb received", __func__);
-		tty_kref_put(tty);
-
-		/* Resubmit urb so we continue receiving */
-		if (status != -ESHUTDOWN) {
-			err = usb_submit_urb(urb, GFP_ATOMIC);
-			if (err && err != -EPERM)
-				printk(KERN_ERR "%s: resubmit read urb failed. "
-					"(%d)", __func__, err);
-			else
-				usb_mark_last_busy(port->serial->dev);
-		}
-
-	}
-	return;
-}
-
-static void option_outdat_callback(struct urb *urb)
-{
-	struct usb_serial_port *port;
-	struct option_port_private *portdata;
-	struct option_intf_private *intfdata;
-	int i;
-
-	dbg("%s", __func__);
-
-	port =  urb->context;
-	intfdata = port->serial->private;
-
-	usb_serial_port_softint(port);
-	usb_autopm_put_interface_async(port->serial->interface);
-	portdata = usb_get_serial_port_data(port);
-	spin_lock(&intfdata->susp_lock);
-	intfdata->in_flight--;
-	spin_unlock(&intfdata->susp_lock);
-
-	for (i = 0; i < N_OUT_URB; ++i) {
-		if (portdata->out_urbs[i] == urb) {
-			smp_mb__before_clear_bit();
-			clear_bit(i, &portdata->out_busy);
-			break;
-		}
-	}
-}
-
-static void option_instat_callback(struct urb *urb)
-{
-	int err;
-	int status = urb->status;
-	struct usb_serial_port *port =  urb->context;
-	struct option_port_private *portdata = usb_get_serial_port_data(port);
-
-	dbg("%s", __func__);
-	dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
-
-	if (status == 0) {
-		struct usb_ctrlrequest *req_pkt =
-				(struct usb_ctrlrequest *)urb->transfer_buffer;
-
-		if (!req_pkt) {
-			dbg("%s: NULL req_pkt", __func__);
-			return;
-		}
-		if ((req_pkt->bRequestType == 0xA1) &&
-				(req_pkt->bRequest == 0x20)) {
-			int old_dcd_state;
-			unsigned char signals = *((unsigned char *)
-					urb->transfer_buffer +
-					sizeof(struct usb_ctrlrequest));
-
-			dbg("%s: signal x%x", __func__, signals);
-
-			old_dcd_state = portdata->dcd_state;
-			portdata->cts_state = 1;
-			portdata->dcd_state = ((signals & 0x01) ? 1 : 0);
-			portdata->dsr_state = ((signals & 0x02) ? 1 : 0);
-			portdata->ri_state = ((signals & 0x08) ? 1 : 0);
-
-			if (old_dcd_state && !portdata->dcd_state) {
-				struct tty_struct *tty =
-						tty_port_tty_get(&port->port);
-				if (tty && !C_CLOCAL(tty))
-					tty_hangup(tty);
-				tty_kref_put(tty);
-			}
-		} else {
-			dbg("%s: type %x req %x", __func__,
-				req_pkt->bRequestType, req_pkt->bRequest);
-		}
-	} else
-		err("%s: error %d", __func__, status);
-
-	/* Resubmit urb so we continue receiving IRQ data */
-	if (status != -ESHUTDOWN && status != -ENOENT) {
-		err = usb_submit_urb(urb, GFP_ATOMIC);
-		if (err)
-			dbg("%s: resubmit intr urb failed. (%d)",
-				__func__, err);
-	}
-}
-
-static int option_write_room(struct tty_struct *tty)
-{
-	struct usb_serial_port *port = tty->driver_data;
-	struct option_port_private *portdata;
-	int i;
-	int data_len = 0;
-	struct urb *this_urb;
-
-	portdata = usb_get_serial_port_data(port);
-
-	for (i = 0; i < N_OUT_URB; i++) {
-		this_urb = portdata->out_urbs[i];
-		if (this_urb && !test_bit(i, &portdata->out_busy))
-			data_len += OUT_BUFLEN;
-	}
-
-	dbg("%s: %d", __func__, data_len);
-	return data_len;
-}
-
-static int option_chars_in_buffer(struct tty_struct *tty)
-{
-	struct usb_serial_port *port = tty->driver_data;
-	struct option_port_private *portdata;
-	int i;
-	int data_len = 0;
-	struct urb *this_urb;
-
-	portdata = usb_get_serial_port_data(port);
-
-	for (i = 0; i < N_OUT_URB; i++) {
-		this_urb = portdata->out_urbs[i];
-		/* FIXME: This locking is insufficient as this_urb may
-		   go unused during the test */
-		if (this_urb && test_bit(i, &portdata->out_busy))
-			data_len += this_urb->transfer_buffer_length;
-	}
-	dbg("%s: %d", __func__, data_len);
-	return data_len;
-}
-
-static int option_open(struct tty_struct *tty, struct usb_serial_port *port)
-{
-	struct option_port_private *portdata;
-	struct option_intf_private *intfdata;
-	struct usb_serial *serial = port->serial;
-	int i, err;
-	struct urb *urb;
-
-	portdata = usb_get_serial_port_data(port);
-	intfdata = serial->private;
-
-	dbg("%s", __func__);
-
-	/* Start reading from the IN endpoint */
-	for (i = 0; i < N_IN_URB; i++) {
-		urb = portdata->in_urbs[i];
-		if (!urb)
-			continue;
-		err = usb_submit_urb(urb, GFP_KERNEL);
-		if (err) {
-			dbg("%s: submit urb %d failed (%d) %d",
-				__func__, i, err,
-				urb->transfer_buffer_length);
-		}
-	}
-
-	option_send_setup(port);
-
-	serial->interface->needs_remote_wakeup = 1;
-	spin_lock_irq(&intfdata->susp_lock);
-	portdata->opened = 1;
-	spin_unlock_irq(&intfdata->susp_lock);
-	usb_autopm_put_interface(serial->interface);
-
-	return 0;
-}
-
-static void option_dtr_rts(struct usb_serial_port *port, int on)
-{
-	struct usb_serial *serial = port->serial;
-	struct option_port_private *portdata;
-
-	dbg("%s", __func__);
-	portdata = usb_get_serial_port_data(port);
-	mutex_lock(&serial->disc_mutex);
-	portdata->rts_state = on;
-	portdata->dtr_state = on;
-	if (serial->dev)
-		option_send_setup(port);
-	mutex_unlock(&serial->disc_mutex);
-}
-
-
-static void option_close(struct usb_serial_port *port)
-{
-	int i;
-	struct usb_serial *serial = port->serial;
-	struct option_port_private *portdata;
-	struct option_intf_private *intfdata = port->serial->private;
-
-	dbg("%s", __func__);
-	portdata = usb_get_serial_port_data(port);
-
-	if (serial->dev) {
-		/* Stop reading/writing urbs */
-		spin_lock_irq(&intfdata->susp_lock);
-		portdata->opened = 0;
-		spin_unlock_irq(&intfdata->susp_lock);
-
-		for (i = 0; i < N_IN_URB; i++)
-			usb_kill_urb(portdata->in_urbs[i]);
-		for (i = 0; i < N_OUT_URB; i++)
-			usb_kill_urb(portdata->out_urbs[i]);
-		usb_autopm_get_interface(serial->interface);
-		serial->interface->needs_remote_wakeup = 0;
-	}
-}
-
-/* Helper functions used by option_setup_urbs */
-static struct urb *option_setup_urb(struct usb_serial *serial, int endpoint,
-		int dir, void *ctx, char *buf, int len,
-		void (*callback)(struct urb *))
-{
-	struct urb *urb;
-
-	if (endpoint == -1)
-		return NULL;		/* endpoint not needed */
-
-	urb = usb_alloc_urb(0, GFP_KERNEL);		/* No ISO */
-	if (urb == NULL) {
-		dbg("%s: alloc for endpoint %d failed.", __func__, endpoint);
-		return NULL;
-	}
-
-		/* Fill URB using supplied data. */
-	usb_fill_bulk_urb(urb, serial->dev,
-		      usb_sndbulkpipe(serial->dev, endpoint) | dir,
-		      buf, len, callback, ctx);
-
-	return urb;
-}
-
-/* Setup urbs */
-static void option_setup_urbs(struct usb_serial *serial)
-{
-	int i, j;
-	struct usb_serial_port *port;
-	struct option_port_private *portdata;
-
-	dbg("%s", __func__);
-
-	for (i = 0; i < serial->num_ports; i++) {
-		port = serial->port[i];
-		portdata = usb_get_serial_port_data(port);
-
-		/* Do indat endpoints first */
-		for (j = 0; j < N_IN_URB; ++j) {
-			portdata->in_urbs[j] = option_setup_urb(serial,
-					port->bulk_in_endpointAddress,
-					USB_DIR_IN, port,
-					portdata->in_buffer[j],
-					IN_BUFLEN, option_indat_callback);
-		}
-
-		/* outdat endpoints */
-		for (j = 0; j < N_OUT_URB; ++j) {
-			portdata->out_urbs[j] = option_setup_urb(serial,
-					port->bulk_out_endpointAddress,
-					USB_DIR_OUT, port,
-					portdata->out_buffer[j],
-					OUT_BUFLEN, option_outdat_callback);
-		}
-	}
-}
-
-
-/** send RTS/DTR state to the port.
- *
- * This is exactly the same as SET_CONTROL_LINE_STATE from the PSTN
- * CDC.
-*/
-static int option_send_setup(struct usb_serial_port *port)
-{
-	struct usb_serial *serial = port->serial;
-	struct option_intf_private *intfdata =
-		(struct option_intf_private *) serial->private;
-	struct option_port_private *portdata;
-	int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
-	int val = 0;
-	dbg("%s", __func__);
-
-	if (is_blacklisted(ifNum, intfdata->blacklist_info) ==
-						OPTION_BLACKLIST_SENDSETUP) {
-		dbg("No send_setup on blacklisted interface #%d\n", ifNum);
-		return -EIO;
-	}
-
-	portdata = usb_get_serial_port_data(port);
-
-	if (portdata->dtr_state)
-		val |= 0x01;
-	if (portdata->rts_state)
-		val |= 0x02;
-
-	return usb_control_msg(serial->dev,
-		usb_rcvctrlpipe(serial->dev, 0),
-		0x22, 0x21, val, ifNum, NULL, 0, USB_CTRL_SET_TIMEOUT);
-}
-
-static int option_startup(struct usb_serial *serial)
-{
-	int i, j, err;
-	struct usb_serial_port *port;
-	struct option_port_private *portdata;
-	u8 *buffer;
-
-	dbg("%s", __func__);
-
-	/* Now setup per port private data */
-	for (i = 0; i < serial->num_ports; i++) {
-		port = serial->port[i];
-		portdata = kzalloc(sizeof(*portdata), GFP_KERNEL);
-		if (!portdata) {
-			dbg("%s: kmalloc for option_port_private (%d) failed!.",
-					__func__, i);
-			return 1;
-		}
-		init_usb_anchor(&portdata->delayed);
-
-		for (j = 0; j < N_IN_URB; j++) {
-			buffer = (u8 *)__get_free_page(GFP_KERNEL);
-			if (!buffer)
-				goto bail_out_error;
-			portdata->in_buffer[j] = buffer;
-		}
-
-		for (j = 0; j < N_OUT_URB; j++) {
-			buffer = kmalloc(OUT_BUFLEN, GFP_KERNEL);
-			if (!buffer)
-				goto bail_out_error2;
-			portdata->out_buffer[j] = buffer;
-		}
-
-		usb_set_serial_port_data(port, portdata);
-
-		if (!port->interrupt_in_urb)
-			continue;
-		err = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
-		if (err)
-			dbg("%s: submit irq_in urb failed %d",
-				__func__, err);
-	}
-	option_setup_urbs(serial);
-	return 0;
-
-bail_out_error2:
-	for (j = 0; j < N_OUT_URB; j++)
-		kfree(portdata->out_buffer[j]);
-bail_out_error:
-	for (j = 0; j < N_IN_URB; j++)
-		if (portdata->in_buffer[j])
-			free_page((unsigned long)portdata->in_buffer[j]);
-	kfree(portdata);
-	return 1;
-}
-
-static void stop_read_write_urbs(struct usb_serial *serial)
-{
-	int i, j;
-	struct usb_serial_port *port;
-	struct option_port_private *portdata;
-
-	/* Stop reading/writing urbs */
-	for (i = 0; i < serial->num_ports; ++i) {
-		port = serial->port[i];
-		portdata = usb_get_serial_port_data(port);
-		for (j = 0; j < N_IN_URB; j++)
-			usb_kill_urb(portdata->in_urbs[j]);
-		for (j = 0; j < N_OUT_URB; j++)
-			usb_kill_urb(portdata->out_urbs[j]);
-	}
-}
-
-static void option_disconnect(struct usb_serial *serial)
-{
-	dbg("%s", __func__);
-
-	stop_read_write_urbs(serial);
-}
-
-static void option_release(struct usb_serial *serial)
-{
-	int i, j;
-	struct usb_serial_port *port;
-	struct option_port_private *portdata;
-
-	dbg("%s", __func__);
-
-	/* Now free them */
-	for (i = 0; i < serial->num_ports; ++i) {
-		port = serial->port[i];
-		portdata = usb_get_serial_port_data(port);
-
-		for (j = 0; j < N_IN_URB; j++) {
-			if (portdata->in_urbs[j]) {
-				usb_free_urb(portdata->in_urbs[j]);
-				free_page((unsigned long)
-					portdata->in_buffer[j]);
-				portdata->in_urbs[j] = NULL;
-			}
-		}
-		for (j = 0; j < N_OUT_URB; j++) {
-			if (portdata->out_urbs[j]) {
-				usb_free_urb(portdata->out_urbs[j]);
-				kfree(portdata->out_buffer[j]);
-				portdata->out_urbs[j] = NULL;
-			}
-		}
-	}
-
-	/* Now free per port private data */
-	for (i = 0; i < serial->num_ports; i++) {
-		port = serial->port[i];
-		kfree(usb_get_serial_port_data(port));
-	}
-}
-
-#ifdef CONFIG_PM
-static int option_suspend(struct usb_serial *serial, pm_message_t message)
-{
-	struct option_intf_private *intfdata = serial->private;
-	int b;
-
-	dbg("%s entered", __func__);
-
-	if (message.event & PM_EVENT_AUTO) {
-		spin_lock_irq(&intfdata->susp_lock);
-		b = intfdata->in_flight;
-		spin_unlock_irq(&intfdata->susp_lock);
-
-		if (b)
-			return -EBUSY;
-	}
-
-	spin_lock_irq(&intfdata->susp_lock);
-	intfdata->suspended = 1;
-	spin_unlock_irq(&intfdata->susp_lock);
-	stop_read_write_urbs(serial);
-
-	return 0;
-}
-
-static void play_delayed(struct usb_serial_port *port)
-{
-	struct option_intf_private *data;
-	struct option_port_private *portdata;
-	struct urb *urb;
-	int err;
-
-	portdata = usb_get_serial_port_data(port);
-	data = port->serial->private;
-	while ((urb = usb_get_from_anchor(&portdata->delayed))) {
-		err = usb_submit_urb(urb, GFP_ATOMIC);
-		if (!err)
-			data->in_flight++;
-	}
-}
-
-static int option_resume(struct usb_serial *serial)
-{
-	int i, j;
-	struct usb_serial_port *port;
-	struct option_intf_private *intfdata = serial->private;
-	struct option_port_private *portdata;
-	struct urb *urb;
-	int err = 0;
-
-	dbg("%s entered", __func__);
-	/* get the interrupt URBs resubmitted unconditionally */
-	for (i = 0; i < serial->num_ports; i++) {
-		port = serial->port[i];
-		if (!port->interrupt_in_urb) {
-			dbg("%s: No interrupt URB for port %d", __func__, i);
-			continue;
-		}
-		err = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
-		dbg("Submitted interrupt URB for port %d (result %d)", i, err);
-		if (err < 0) {
-			err("%s: Error %d for interrupt URB of port%d",
-				 __func__, err, i);
-			goto err_out;
-		}
-	}
-
-	for (i = 0; i < serial->num_ports; i++) {
-		/* walk all ports */
-		port = serial->port[i];
-		portdata = usb_get_serial_port_data(port);
-
-		/* skip closed ports */
-		spin_lock_irq(&intfdata->susp_lock);
-		if (!portdata->opened) {
-			spin_unlock_irq(&intfdata->susp_lock);
-			continue;
-		}
-
-		for (j = 0; j < N_IN_URB; j++) {
-			urb = portdata->in_urbs[j];
-			err = usb_submit_urb(urb, GFP_ATOMIC);
-			if (err < 0) {
-				err("%s: Error %d for bulk URB %d",
-					 __func__, err, i);
-				spin_unlock_irq(&intfdata->susp_lock);
-				goto err_out;
-			}
-		}
-		play_delayed(port);
-		spin_unlock_irq(&intfdata->susp_lock);
-	}
-	spin_lock_irq(&intfdata->susp_lock);
-	intfdata->suspended = 0;
-	spin_unlock_irq(&intfdata->susp_lock);
-err_out:
-	return err;
-}
-#endif
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");
-
-module_param(debug, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "Debug messages");
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/README b/src/mod/endpoints/mod_gsmopen/gsmlib/README
deleted file mode 100644
index 9dbb65daa8..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/README
+++ /dev/null
@@ -1,8 +0,0 @@
-For Linux distros without gsmlib (eg: CentOS):
-
-In the directory gsmlib-1.10-patched-13ubuntu is the source for gsmlib
-as patched by Ubuntu for modern compilers:
-
-	./configure
-	make
-	make install
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ABOUT-NLS b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ABOUT-NLS
deleted file mode 100644
index 28d38c76fd..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ABOUT-NLS
+++ /dev/null
@@ -1,226 +0,0 @@
-Notes on the Free Translation Project
-*************************************
-
-   Free software is going international!  The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
-
-   If you found this `ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU `gettext' internally,
-itself available at your nearest GNU archive site.  But you do *not*
-need to install GNU `gettext' prior to configuring, installing or using
-this package with messages translated.
-
-   Installers will find here some useful hints.  These notes also
-explain how users should proceed for getting the programs to use the
-available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
-
-   When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used.  The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-One advise in advance
-=====================
-
-   If you want to exploit the full power of internationalization, you
-should configure it using
-
-     ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed.  So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias or message inheritance) as the
-implementation here.  It is also not possible to offer this additional
-functionality on top of a `catgets' implementation.  Future versions of
-GNU `gettext' will very likely convey even more functionality.  So it
-might be a good idea to change to GNU `gettext' as soon as possible.
-
-   So you need not provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-
-INSTALL Matters
-===============
-
-   Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'.  Other packages have their own
-ways to internationalization, predating GNU `gettext'.
-
-   By default, this package will be installed to allow translation of
-messages.  It will automatically detect whether the system provides
-usable `catgets' (if using this is selected by the installer) or
-`gettext' functions.  If neither is available, the GNU `gettext' own
-library will be used.  This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is *not* required.  Installers may use
-special options at configuration time for changing the default
-behaviour.  The commands:
-
-     ./configure --with-included-gettext
-     ./configure --with-catgets
-     ./configure --disable-nls
-
-will respectively bypass any pre-existing `catgets' or `gettext' to use
-the internationalizing routines provided within this package, enable
-the use of the `catgets' functions (if found on the locale system), or
-else, *totally* disable translation of messages.
-
-   When you already have GNU `gettext' installed on your system and run
-configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might be not what is desirable.  You
-should use the more recent version of the GNU `gettext' library.  I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
-
-     ./configure --with-included-gettext
-
-to prevent auto-detection.
-
-   By default the configuration process will not test for the `catgets'
-function and therefore they will not be used.  The reasons are already
-given above: the emulation on top of `catgets' cannot provide all the
-extensions provided by the GNU `gettext' library.  If you nevertheless
-want to use the `catgets' functions use
-
-     ./configure --with-catgets
-
-to enable the test for `catgets' (this causes no harm if `catgets' is
-not available on your system).  If you really select this option we
-would like to hear about the reasons because we cannot think of any
-good one ourself.
-
-   Internationalized packages have usually many `po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at `configure' time by using the
-`--disable-nls' switch, all available translations are installed
-together with the package.  However, the environment variable `LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-`LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-Using This Package
-==================
-
-   As a user, if your language has been installed for this package, you
-only have to set the `LANG' environment variable to the appropriate
-ISO 639 `LL' two-letter code prior to using the programs in the
-package.  For example, let's suppose that you speak German.  At the
-shell prompt, merely execute `setenv LANG de' (in `csh'),
-`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash').  This
-can be done from your `.login' or `.profile' file, once and for all.
-
-   An operating system might already offer message localization for
-many of its programs, while other programs have been installed locally
-with the full capabilities of GNU `gettext'.  Just using `gettext'
-extended syntax for `LANG' would break proper localization of already
-available operating system programs.  In this case, users should set
-both `LANGUAGE' and `LANG' variables in their environment, as programs
-using GNU `gettext' give preference to `LANGUAGE'.  For example, some
-Swedish users would rather read translations in German than English for
-when Swedish is not available.  This is easily accomplished by setting
-`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
-
-Translating Teams
-=================
-
-   For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list, courtesy of Linux
-International.  You may reach your translation team at the address
-`LL@li.org', replacing LL by the two-letter ISO 639 code for your
-language.  Language codes are *not* the same as the country codes given
-in ISO 3166.  The following translation teams exist, as of December
-1997:
-
-     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
-     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
-     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
-     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
-     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
-     Swedish `sv', and Turkish `tr'.
-
-For example, you may reach the Chinese translation team by writing to
-`zh@li.org'.
-
-   If you'd like to volunteer to *work* at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is *not* the same as the list itself, it has
-`-request' appended.  For example, speakers of Swedish can send a
-message to `sv-request@li.org', having this message body:
-
-     subscribe
-
-   Keep in mind that team members are expected to participate
-*actively* in translations, or at solving translational difficulties,
-rather than merely lurking around.  If your team does not exist yet and
-you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@iro.umontreal.ca' to reach the
-coordinator for all translator teams.
-
-   The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
-
-Available Packages
-==================
-
-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of December
-1997.  The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination.
-
-     Ready PO files    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
-                     .----------------------------------------------------.
-     bash            |       []          []          []                   |  3
-     bison           |       []          []          []                   |  3
-     clisp           |       [] [] []    []                               |  4
-     cpio            |       []    []    []       [] []    []             |  6
-     diffutils       |       []    []    []                []          [] |  5
-     enscript        |       []    [] [] []          []             []    |  6
-     fileutils       | []    []    []    []       [] []    [] []    [] [] | 10
-     findutils       |       []    []    [] []    [] []    []    []    [] |  9
-     flex            |             []    []       []                   [] |  4
-     gcal            |       []          []          []    []          [] |  5
-     gettext         |    [] []    []    []       [] [] [] [] []    [] [] | 12
-     grep            |       []    []    []       [] [] [] []    [] [] [] | 10
-     hello           |    [] []    []    []       [] [] [] [] []    [] [] | 11
-     id-utils        |       []          []                []             |  3
-     indent          |    [] []                   []       []    []       |  5
-     libc            |       []    []    []       [] []    []          [] |  7
-     m4              |       []          []    []    []          []    [] |  6
-     make            |       []    []    []       [] []    []             |  6
-     music           |                   []                []             |  2
-     ptx             |       []    []    []          [] [] [] []       [] |  8
-     recode          |    [] []    []    []          []    [] []    [] [] |  9
-     sh-utils        |       []    []    []          [] [] [] []       [] |  8
-     sharutils       | []    []    []    []          []                [] |  6
-     tar             | []    []          [] []    [] [] [] [] []    [] [] | 11
-     texinfo         | []    []          []                               |  3
-     textutils       | []    []    []    []       [] [] [] []          [] |  9
-     wdiff           | []    []    []    []          [] [] []          [] |  8
-                     `----------------------------------------------------'
-       17 languages    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
-       27 packages      6  4 25  1 18  1 26  2  1 12 20  9 19  7  4  7 17  179
-
-   Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect.  This is because a few extra PO files are
-used for implementing regional variants of languages, or language
-dialects.
-
-   For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and
-distributed as such by its maintainer.  There might be an observable
-lag between the mere existence a PO file and its wide availability in a
-distribution.
-
-   If December 1997 seems to be old, you may fetch a more recent copy
-of this `ABOUT-NLS' file on most GNU archive sites.
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/AUTHORS b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/AUTHORS
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/COPYING b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/COPYING
deleted file mode 100644
index bf50f20de6..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/COPYING
+++ /dev/null
@@ -1,482 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 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
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the 
-    Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
-    Boston, MA  02111-1307  USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ChangeLog b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ChangeLog
deleted file mode 100644
index bdd64ab61c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ChangeLog
+++ /dev/null
@@ -1,386 +0,0 @@
-gsmlib-1.10
-     - reactivated code in gsm_at to retry sending PDU after
-       unsolicited result code 
-
-     - added description of unicode handling to FAQ
-
-     - compilation fixes for gcc-3.0.4
-
-     - added quick exit for ATZ in UnixSerialPort constructor
-       if phone gives ERROR
-
-     - added fix for phones that return +CLIP: "Number not available."
-       instead of giving caller ID
-
-     - added get/setCLIRPresentation() functions to MeTa (contribution by
-       ivan)
-
-     - added "NO CARRIER" event to the event mechanism (contribution by
-       clock)
-
-     - added Win32 port of gsmsmsd (thanks to Konstantin Forostyan)
-
-     - further extented Win32 port of gsmsmsd to handle outgoing messages
-
-     - fixed problem with Ericsson T39m SMS sending (zero bytes in handshake)
-
-     - added capability to send concatenated SMSs in gsmsmsd and gsmsendsms
-
-     - fixed unsigned/signed char problems in Unix/Win32 serial port
-       implementations
-
-     - added capability to send multiple SMSs to gsmsendsms/gsmsmsd
-
-gsmlib-1.9
-     - fixed decoding of alphanumeric addresses in gsm_sms_codec.
-
-     - fixed bug in gsm_event when checking whether to send an
-       acknowledgment for a received SMS
-
-     - More Siemens-specific patches, some extensions to the AT
-       command parser
-
-     - New code to print PIN status and set the PIN in gsmctl, setPIN
-       function in MeTa class (Andreas Roedl <flood@flood-net.de>)
-
-     - Missing virtual destructor in Port class caused destructors of
-       UnixSerialPort and Win32SerialPort not to be called - fixed
-
-     - Added new code to set functionality level on or off (thanks to
-       David Woodhouse)
-
-     - found bug in SMS store implementation that caused the now
-       obsolete _capacity member to be set to a too low value
-
-     - Added changes contributed by Frediano Ziglio to enable compilation
-       on Windows
-
-     - Added call waiting functions contributed by Ivan
-
-gsmlib-1.8
-     - added workaround for Nokia Cellular Card Phone RPE-1 GSM900
-       that reports a CDS event that actually is an CDSI and sends a spurious
-       CR when waiting for a PDU
-
-     - SMS are stored without index in files now
-
-     - tested compilation with gcc-3.0.2
-
-     - added workaround for gsmlib getting confused when receiving SMS
-       and echo cannot be switched off - echos of the AT command are
-       filtered out in chat() now
-
-     - extended gsm_phonebook preload mechanism to batch-load phonebooks
-       where the index does not start with 1
-     
-     - Added workaround for Motorola Timeport 260 to write back
-       deliver messages to the ME
-
-     - added workaround for compilation with libstdc++-v2
-
-     - private members of MeTa made protected
-
-     - new ext directory for phone-specific extensions
-
-gsmlib-1.7
-     - fixed bug with calculation of userData length if userDataHeader
-       is present (octet count was subtracted, not septet count)
-
-     - fixed problem with string erase() at end of PDU for Falcom A2-1
-
-     - -t/--charset option of gsmpb did not work due to missing parameter
-       of getopt_long, fixed
-
-     - The SMS decoder/encoder can now handle alphanumeric addresses
-       in the GSM default alphabet
-
-     - set only those SMS stores that are actually needed to perform
-       SMS store operation
-
-     - Fixed signalling error 321 (Invalid memory index) when trying to
-       read from empty SMS store entry
-
-     - Fixed parsing error when reading current network operator if no
-       network connection
-
-     - Added capability to parse cell broadcast messages to gsmlib and
-       the gsmsmsd program
-
-     - Added workaround for Motorola Timeport 260 bug that doesn't correctly
-       report the message status when retrieving SMS messages from the
-       store
-
-     - Added workaround for Motorola Timeport 260 that allocates index
-       numbers to SMS messages linearly so that index number can be
-       be larger than capacity reported by AT command
-
-gsmlib-1.6
-     - more fixes for the COPS=? return format
-
-     - fixed putBack() behaviour in gsm_parser (don't put back if end-of-
-       stream is reached)
-
-     - added toString() function to gsm_sms_codec's Address class
-
-     - SMS dates and times are now output in a locale-specific manner
-
-     - fixed bug in Parser::getEol() (_eos was accidentally set to true)
-
-     - added gsm_win32_serial module, Win32 project (VC++),  and
-       Option FirstFone changes contributed by Frediano Ziglio
-       <freddy77@angelfire.com>
-
-     - fix in COM port recognition for Win32 (gsm_util)
-
-     - renamed library files libgsm.* to libgsmme.* (now starting with
-       version 1.0) because of conflict with another Debian package
-
-     - in gsm_phonebook and gsm_store the caching of entries can now
-       be disabled
-
-     - added facilities to use other character sets for phonebooks
-
-     - fixed workaround for Ericcson SH888 (missing service centre address)
-
-     - fixed bug in gsm_phonebook that prevented texts with the
-       character '@' to be written to to the phonebook
-
-     - fixed nasty memory allocation bug in gsmpb/gsmsmsstore
-       (automatic MeTa variable went out of scope even though used
-       later)
-
-     - fixed Y2K problem in timestamp printing
-
-     - fixed "make dist" to include win32 files
-
-     - added workarounds for Falcom A2-1 (autodetection and enabling by
-       "export GSMLIB_FALCOM_A2_1_FIX=1", zero after PDU)
-
-     - fixed bug that caused gsmlib to abort with an assert if a malformed
-       PDU was read
-
-gsmlib-1.5
-     - adapted MeTa::getCurrentOPInfo() and MeTa::getAvailableOPInfo()
-       to handle Nokia 8290 quirks
-
-     - code to set line speed in gsm_unix_serial reinserted (it was
-       accidentally removed in previous version)
-
-     - minor changes to initialization sequence in gsm_unix_serial
-
-     - bugfix in gsm_unix_serial.cc: readByte() == 0 does not mean no
-       more bytes, but is legal value
-
-     - additionally allowed characters "*#pwPW" and '+' at any
-       position in telephone numbers
-
-     - added environment variable GSMLIB_SH888_FIX that (if set)
-       enables the gsmlib workaround for Ericsson SH888's broken SMS TPDUs
-
-     - fixed command line parameter handling bug in gsmsmsstore
-
-     - fixed %files section .spec file to correctly include manual pages
-
-     - fixed some bugs in terminal line setup (gsm_unix_serial) regarding
-       software/hardware handshake 
-
-     - added new "--sca" option to SMS-related apps to set the SMS
-       service centre address on the command line (useful if default is not
-       set correctly in the phone)
-
-     - removed tcflush() call in UnixSerialPort::putLine that broke
-       the event system needed for gsmsmsd
-
-gsmlib-1.4
-     - more attempts to fix UNIX serial port access
-
-     - allow custom backends for sorted phonebooks to be integrated
-       into gsmlib (eg. for RDBMS or LDAP storage). Introduced a new
-       module gsm_sorted_phonebook_base that contains the infrastructure for
-       this.
-
-     - Now gsmlib needs at least gcc-2.95.2 to compile correctly.
-
-     - Implemented option to open device with software handshaking (XON/XOFF).
-       The applications now have an -X option to turn this on.
-
-     - gsmlib now contains a facility to interrupt ongoing activity in a
-       controlled way. gsm_unix_serial now blocks for one second
-       maximum until it checks whether it was interrupted.
-
-     - various small bugfixes
-
-     - added workaround for phones that omit ':' in AT command responses
-
-     - all debugging output is now printed to stderr
-
-     - gsm_unix_serial: new attempt to initialize modem in a more
-       robust way (contributed)
-
-     - gsm_sms: fixed handling of user data header (contributed)
-
-gsmlib-1.3
-     - fixed bug that caused gsmlib to hang if TAs don't respond
-       to AT inquiries for serial number etc.
-
-     - fixed bug with handling of CB mode AT command construction in
-       gsm_me_ta.cc, setSMSRoutingToTA()
-
-     - allow '+' as the first character of phonenumbers
-
-     - implemented reading and writing from/to stdin/stdout in
-       gsm_sorted_[sms_store|phonebook] and gsmpb/gsmsmsstore
-
-     - fixed (hopefully) the intermittent hangup problem in
-       gsm_unix_serial_port
-
-     - Some mobile phones cannot report the status of some facility
-       locks. The gsmctl program now prints out "unknown" in the
-       corresponding result line from the FLSTAT
-       operation if this problem occurs (instead of terminating).
-
-     - switched off non-blocking access to serial device
-
-gsmlib-1.2
-     - gsmlib now also works with TAs that can not switch off echo
-
-     - fixed bug that prevented gsmlib from copying SMS_DELIVER and 
-       SMS_STATUS_REPORT back to the ME
-
-     - introduced -I (--init) parameter to all command line apps to
-       allow for device-specific initialization
-
-     - made SMS decoding routines more robust against bad SMS (especially
-       premature end of PDU)
-
-     - New debugging feature: If compiled without NDEBUG, the
-       environment variable GSMLIB_DEBUG determines the verbosity of
-       debugging messages (0 = none, 1 = many, 2 = extreme)
-
-gsmlib-1.1
-
-     - Parse multiple COPS (operator info) lines returned by some phones
-
-     - accept string as numeric value when interpreting COPS=? response
-       (Ericsson phone + GSM12 GSM module)
-
-     - accept string as numeric value when interpreting COPS? response
-       (Ericsson phone + GSM12 GSM module)
-
-     - retry when initializing TA (ATZ/ATE0 sequences)
-
-     - Set SMS routing:
-       allow mode 3 (special in-band technique) when setting routing
-       to TA (gsmlib should not be active when phone is switched to data mode
-       anyway) 
-
-    -  Set SMS routing:
-       handle buffer mode but only if it was reported by the +CNMI=? command
-       (the Ericsson GM12 GSM modem does not like it otherwise)
-
-     - Determine CPMS number of parameters for CPMS command (better
-       compability with some mobile phones / GSM modems)
-
-     - handle missing service centre address in incoming SMS for Ericsson
-       model 6050102
-
-     - add new RING event to gsm_event.h/.cc, gsmsmsd now handles RING
-       indications properly
-
-     - defined default event handler mostly to handle unexpected RING
-       indications that might otherwise confuse gsmlib
-
-     - gsmsmsd: can now be cleanly terminated using the SIGINT or SIGTERM
-       signals
-
-     - gsmsmsd: now handles multiple incoming SMS messages cleanly, before
-       there was a chance that some SMS messages coming in rapid succession
-       might have been lost
-
-     - gsmsmsd: flush option implemented that dispatches and erases
-       existing messages in SMS store
-
-     - gsmsmsd: added sending of SMS messages. gsmsmsd now accepts a
-       spool directory options where it expects to find SMS message file in a 
-       simple format, these are dispatched every 5 seconds
-
-gsmlib-1.0
-
-     - RPM support (spec file)
-
-     - the "+" is at least for the Siemens S10 and S25 a valid char in 
-       telephone numbers (inserts a pause of 3 seconds), therefore it is now
-       allowed as part of telephone numbers
-
-     - fixed incorrect analysis of facility class parameters in gsmctl.cc
-
-     - restricted call forward time to 0..30 seconds in gsm_me_ta.cc
-
-gsmlib-0.3
-
-     - implemented timeout for accessing the mobile phone in order
-       to avoid hangs
-
-     - upgraded to BETA status
-
-     - written glossary for abbreviations (gsminfo(7))
-
-     - implemented NLS support, added German translations
-
-     - implemented preserving the index position of phonebook entries in 
-       gsmpb.cc and gsm_sorted_phonebook
-
-     - cleaned up manual pages (alphabetic ordering of options etc.)
-
-     - gsmsmstore program and gsm_sorted_sms_store./.cc completed and
-       tested
-
-     - gsmpb and gsmsmsstore now have --verbose (-V) options for detailed
-       progress reporting
-
-     - now check for getopt_long in configure (can be compiled on non-GNU
-       systems)
-
-     - removed asserts regarding lengths of numeric data types, put them
-       into configure script
-
-     - sorted options in apps/*.cc alphabetically (--help option)
-
-     - in gsm_sorted_sms_store compare telephone numbers more sensibly
-
-     - introduced -v option to gsmpb and gsmsmsstore to report execution
-       statistics 
-
-     - tested new synchronization function in gsmpb program
-
-     - implemented operations in the gsmctl program
-
-     - rewrote test cases (compare output)
-
-     - completed gsmsmsstore program
-
-     - first changes for compilation with VC++ 6.0 on WIN32
-
-gsmlib-0.2
-
-     - gsmsmstore program and gsm_sorted_sms_store./.cc mostly
-       completed but not yet much tested
-
-     - Fixed problem with some mobiles/TAs not giving prefixes after
-       certain AT sequences (reported for SIEMENS S25/IrDA, Nokia
-       8810/IrDA)
-
-     - Fixed problem with Xircom REM56G.100/Nokia 6150 that give
-       "CABLE: GSM" instead of "OK" after ATZ
-
-     - Mobiles that return nothing when empty phonebook entries are
-       requested are now handled correctly (reported for SIEMENS S25/IrDA)
-
-     - optimizations in gsm_*_phonebook modules (less AT commands necessary)
-
-     - new synchronization function in gsmpb program that is (hopefully)
-       more sensible (see man page for details)
-
-gsmlib-0.1
-
-     - Initial release
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/INSTALL b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/INSTALL
deleted file mode 100644
index 6242d6f388..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/INSTALL
+++ /dev/null
@@ -1,198 +0,0 @@
-GSMLIB Installation
-===================
-
-     This distribution uses autoconf/automake/libtool. See below
-     for generic installation instructions. The default commands would be:
-
-       ./configure
-       make
-       make install
-
-     See also the section INSTALLATION in the README file in this
-     directory. For questions regarding the internationalization of this
-     package refer to doc/README.NLS and ./ABOUT-NLS.
-
-     Developers: See also the file doc/README.developers.
-
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/Makefile.am b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/Makefile.am
deleted file mode 100644
index daf1ea0047..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: Toplevel Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 21.5.1999
-# *************************************************************************
-
-SUBDIRS_ =	po gsmlib apps tests doc scripts win32 ext
-
-EXTRA_DIST =	gsmlib.spec
-
-if COMPILE_INTL
-SUBDIRS =	intl $(SUBDIRS_) # po - make automake happy
-else
-SUBDIRS =	$(SUBDIRS_) # po intl - make automake happy
-endif
-
-all:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/Makefile.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/Makefile.in
deleted file mode 100644
index e9676cc981..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/Makefile.in
+++ /dev/null
@@ -1,423 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: Toplevel Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 21.5.1999
-# *************************************************************************
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AR = @AR@
-AS = @AS@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DATADIRNAME = @DATADIRNAME@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GENCAT = @GENCAT@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GSM_VERSION = @GSM_VERSION@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_LIB = @HAVE_LIB@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LIB = @LIB@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-RC = @RC@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-
-SUBDIRS_ = po gsmlib apps tests doc scripts win32 ext
-
-EXTRA_DIST = gsmlib.spec
-@COMPILE_INTL_TRUE@SUBDIRS = intl $(SUBDIRS_) # po - make automake happy
-@COMPILE_INTL_FALSE@SUBDIRS = $(SUBDIRS_) # po intl - make automake happy
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = gsm_config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
-INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \
-aclocal.m4 configure configure.in gsm_config.h.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-DIST_SUBDIRS =  intl po gsmlib apps tests doc scripts win32 ext po \
-gsmlib apps tests doc scripts win32 ext
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-gsm_config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/gsm_config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=gsm_config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/gsm_config.h.in: $(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f gsm_config.h
-
-maintainer-clean-hdr:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) gsm_config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)gsm_config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags gsm_config.h.in $$unique $(LISP))
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(DIST_SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: gsm_config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile gsm_config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-all:
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/NEWS b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/NEWS
deleted file mode 100644
index 1efffa7d86..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/NEWS
+++ /dev/null
@@ -1,11 +0,0 @@
-NEWS - 9.1.2000
-
-     Version 1.0 - first release with RPM support and binary packages
-
-NEWS - 15.11.1999
-
-     BETA version (details see ChangeLog)
-
-NEWS - 16.7.1999
-
-     initial release
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/README b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/README
deleted file mode 100644
index 2f5db9eb27..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/README
+++ /dev/null
@@ -1,166 +0,0 @@
-INTRODUCTION
-
-     This distribution contains a library to access GSM mobile phones
-     through GSM modems or IrDA devices. Features include:
-
-     * modification of phonebooks stored in the mobile phone or on the 
-       SIM card
-
-     * reading and writing of SMS messages stored in the mobile phone
-
-     * sending and reception of SMS messages
-
-     Additionally, some simple command line programs are provided to
-     use these functionalities.
-
-
-REQUIREMENTS
-
-     You need a mobile phone that conforms to the GSM
-     standards ETSI GSM 07.07, ETSI GSM 07.05, and others.
-     Non-GSM mobile phones will not work! Additionally,
-     to access the mobile phone from the computer you will probably need an 
-     GSM modem (that would be a PC-CARD, usually). There might be some
-     mobile phones, however, that incorporate directly terminal
-     adapter (TA) functionality. Access via IrDA interfaces is also
-     reported to work.
-
-     If you want to compile the library yourself please also read
-     doc/README.developers.
-
-
-INSTALLATION
-
-     This distribution uses autoconf/automake/libtool. See the file
-     INSTALL for generic installation instructions. The default
-     commands for installation under /usr/local would be:
-
-       ./configure
-       make
-       make install
-
-     If there are any problems you can generate a debug version. See
-     doc/README.developers for details.
-
-
-AVAILABLE DOCUMENTATION
-
-     For the command line tools UNIX manual pages are available in the 
-     doc subdirectory of this distribution. These are installed by
-     default in the directories /usr/local/man1, man7, and man8.
-
-     See also the files doc/README.developers, doc/README.NLS and doc/FAQ.
-
-
-HARDWARE
-     
-     The following mobile phone/GSM modem combinations are reported to
-     be compatible in varying degrees with the current release:
-  
-     - Nokia 6150/Xircom REM56G.100
-     - Nokia 6150/Options "GSM-Ready(R) Cellular-Only" modem
-       from Option International
-     - Nokia 6210/- (Linux IrDA serial device)
-     - Nokia 8810/- (Linux IrDA serial device)
-     - Siemens S10D/Dr Neuhaus Gipsy Card GSM
-     - Siemens S25/- (Linux IrDA serial device)
-     - Siemens S35i/- (Linux IrDA serial device)
-     - Siemens S45
-     - Ericcson SH888/- (Linux IrDA serial device)
-     - Ericsson 6050102/GM 12 GSM module
-     - Ericsson T28s (firmware 000809 1106)
-     - Ericsson T20e (firmware R3A007)
-     - -/Siemens M20T (stand-alone GSM module)
-     - -/Wavecom WM02 GSM (stand-alone GSM module)
-     - Nokia 7110 (firware rev 4.80)/- (Linux IrDA serial device)
-     - Nokia 8290 (USA GSM 1900MHz)/- (Linux IrDA serial device)
-     - Falcom A2-1/- (stand-alone GSM module)
-     - Ericsson R320s/- (Linux IrDA serial device)
-     - Motorola Timeport 260/- (Serial cable and Linux IrDA serial device)
-     - Motorola Timeport 250/- (Linux IrDA serial device)
-     - Motorola Timeport P7389/- (Linux IrDA serial device)
-     - Nokia Cellular Card Phone RPE-1 GSM900 and
-     - Nokia Card Phone RPM-1 GSM900/1800
-     - Nokia Cardphone/Compaq iPAQ
-     - Omnipoint technologies Redhawk 2000 GSM modem
-     - Ericsson T28 (but one firmware revision is reported to have problems)
-     - Ericcson T65
-     - Ericcson T39m/Bluetooth
-     - Option International GlobeTrotter PCMCIA
-
-     Note 1: Some of the mobile phones have an integrated GSM modem
-     that can be accessed via the Linux IrDA drivers.
-
-     Note 2: Some of the abovementioned phones have still some glitches
-     with gsmlib (and I haven't tested them myself).
-
-     For the following phones I receive a lot of errors reports:
-
-     - Ericcson SH888: SMS function don't work with many firmware releases
-
-     This list is not exhaustive, there are probably many other types of
-     phone or GSM modem that work with gsmlib. Just try it and report back
-     to me!
-
-
-DISCLAIMER
-
-     Even though care has been taken in the design and implementation
-     of this software it can not be excluded that this software could
-     destroy data in your mobile phone or may even render your mobile
-     phone useless (by erroneous PIN settings, for example). The
-     author will not be held responsible legally, financially, or in any
-     other form for any kind of damage that might occur from using
-     this software.
-
-     This software is provided "as is" and without any expressed or implied
-     warranties, including, without limitation, the implied warranties of
-     merchantibility and fitness for any particular purpose.
-
-     If you are not ready to accept these conditions please don't use
-     this software.
- 
-
-COPYING
-
-     This software is available on the LGPL (GNU LIBRARY GENERAL
-     PUBLIC LICENSE), ie. it is allowed to link 
-     the library to commercial programs.
-
-     See the file COPYING for details on the license.
-
-
-BUGS
-
-     There still seem to be some problems with IrDA devices under
-     Linux. There have been reports of gsmlib-based applications
-     (eg. gsmctl) hanging upon startup after initializing the serial port
-     /dev/ircomm. I would be thankful for any input on this problem.
-
-     If something does not work with your OS platform or the mobile/TA
-     combination please send a complete trace of the compilation or the
-     program execution that did fail. Make sure to compile with debugging 
-     information enabled. Otherwise it will not be possible for me to do
-     much about the problem. Send bug reports to the mailing list or
-     to software@pxh.de. I promise not to publish telephone numbers or other 
-     private information that might be contained in the execution traces
-     that you send me.
-
-
-MAILING LISTS
-
-     There are now two mailings lists available for announcements and
-     discussion of gsmlib-related issues (hosted on lists.over.net).
-     Refer to these pages for information on subscription procedures
-     and an archive of previous postings:
-
-       http://lists.over.net/mailman/listinfo/gsmlib-announce/
-         for announcements regarding GSMLIB
-
-       http://lists.over.net/mailman/listinfo/gsmlib-devel/
-         the GSMLIB development list
-
-
-AUTHOR
-
-     Peter Hofmann <software@pxh.de>.
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/TODO b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/TODO
deleted file mode 100644
index 3ea3aa3fd5..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/TODO
+++ /dev/null
@@ -1,289 +0,0 @@
-This is my list of TODOs for development of this software (not
-necessarily in order of importance):
-
-("+" = DONE)
-
-+ handle:
-  > --> AT+COPS=?
-  > <-- 
-  > <-- +COPS: (1,"AMENA",,"21403"),(3,"MOVISTAR",,"21407"),
-  > <-- (3,"E VODAFONE",,"21401"),,(0,1),(2)
-  > <-- 
-  > <-- OK
-  > gsmctl[ERROR]: expected comma (at position 45 of string '(1,"AMENA",,"21403"),(3,"MOVISTAR",,"21407"),')
-
-+ extend README and web site with names of working phones (Siemens S45,...)
-
-+ add workaround:
-  > <ME0>  Manufacturer: Nokia Mobile Phones
-  > <ME1>  Model: 8290
-  > <ME2>  Revision: SW5.22
-  > <ME3>  Serial Number: 010070303406434
-  > <FUN>  Functionality Level: 1
-  > gsmctl[ERROR]: expected number, got '(2)'
-
-- add fork to gsmsmsd
-
-+ document "on" and "off" operations of gsmctl
-
-- Just assume full functionality and issue AT+CGMF=0 if we haven't already 
-  done so for this MeTa.
-
-+ make update po
-
-+ add find function
-
-+ specify exact location of manual files in /usr/man/man* in spec
-  file, so that erase does not try to delete these directories
-
-+ update PO
-
-+ add option to gsmsendsms/gsmsmsd to request delivery reports
-
-+ Fix CBM reception in gsmsmsd, see testcb.cc program
-
-+ fix gsmsmsd:
-  --> AT+CNMI=?
-  <-- 
-  <-- +CNMI: (1),(1),(0),(0),(0)
-  <-- 
-  <-- OK
-  --> AT+CNMI=1,0,0,0,0
-  <-- 
-  <-- +CME ERROR: 003
-  ./gsmsmsd[ERROR]: ME/TA error 'operation not allowed' (code 003)
-
-+ Wenn ich den SMS-Speicher auslesen m�chte, bricht gsmlib ab, weil der
-  Speicherplatz 1 auf der SIM-Karte nicht belegt ist. Das kann z.B.
-  passieren, wenn man Nachrichten im Handy l�scht. Es kommt der Fehlercode
-  321 (Invalid memory index). Wie w�re es, in der Leseroutine alle
-  ung�ltigen Pl�tze zu ignorieren und solange zu lesen, bis die Anzahl der
-   vorhandenen Nachrichten im Speicher eingelesen ist?
-
-+ document --charset option of gsmpb
-
-+ Problems with PDUs with alphanumeric SCA, e.g.:
-  07911497941902F00414D0E474989D769F5DE4320839001040122151820000
-
-+ > 2. Ich kann mit meinem Nokia 6210 nicht den Telefon-SMS-Speicher
-    auslesen. Dies liegt an der Speicherwahl, die vor dem Auslesen
-    an das Telefon �bermittelt wird. Von der gsmlib wird anscheinend
-    immer die Anzahl der Speicher aus dem "CPMS=?"-Befehl genommen 
-    (z.B. "SM","SM","SM"). Notwendig ist es aber nur, die erste
-    Position (zum Lesen und L�schen) bzw. die ersten beiden 
-    Positionen (zum Schreiben) zu benutzen. 
-    Das Nokia 6210 unterst�tzt aber an der ritten Stelle nur "SM",
-    nicht "ME". So kann ich die SMS im Telefon leider nicht
-    auslesen :-(
-
-- add option to gsmpb/gsmssmstore deletion to delete ALL entries
-
-- recheck Solaris port
-
-+ cache character set settings in MeTa
-
-+ add documentation for new gsmctl and gsmpb charset parameters
-
-+ support characters sets other than GSM default alphabet for phone books
-
-+ create non-existent files (gsmpb and gsmsmsstore)
-
-+ rename libgsm to libgsmme, new major version 1
-
-+ document sca/setsca operations/parameters in gsmctl
-
-+ document option to set SCA in SMS-related apps
-
-+ implement option to set SCA in SMS-related apps
-
-+ convert NDEBUG test output from cout to cerr
-
-+ test new gsm_unix_serial behaviour
-
-+ apply checks for telephone number in gsm_sorted_phonebook
-
-+ add interrupted() checks
-
-+ check for gcc-2.95.2 in configure
-
-- document custom backend options of gsmpb (and gsmsmsstore)
-
-- /var/lock/LCK..modem
-
-+ make gsmctl all continue even if there are some failures
-
-+ CPIN thing
-
-+ bring German translations up-to-date
-
-+ document -I parameter
-
-+ make chat routines robust against TAs that insist on echoing AT commands
-
-+ ericsson sh 888:
-  <-- AT+CLCK="P2",2,,1
-  <-- 
-  +CME ERROR: 4
-  gsmctl[ERROR]: ME/TA error 'operation not supported' (code 4)
-
-+ put README etc. into gsmlib package (not only devel)
-
-+ make SMS decoding routines more robust against bad SMS (especially
-  premature end of PDU)
-
-+ stop gsm_sorted_sms_store.cc from copying back SMS that came from
-  the SC (SMS_DELIVER, SMS_STATUS_REPORT, SMS_SUBMIT_REPORT). Their
-  message type is ambiguous and the ME may misinterpret them.
-
-+ gsmsmsd: reinitialize modem every hour or so (signal termination implemented)
-
-+ implement store, flush and spool options of gsmsmsd,
-  document them in man pages
-
-+ test case for COPS answer numeric operator name in quotation marks
-  (testparser.cc)
-
-+ retry when initializing TA (ATZ/ATE0 sequences)
-
-+ correctly parse malformed SMS PDUs without SCA with Ericsson phone,
-  introduce Capability object for that. Ericsson ID:
-  <ME0>  Manufacturer: ERICSSON
-  <ME1>  Model: 6050102
-  <ME2>  Revision: 990225 1852 CXC112143
-  <ME3>  Serial Number: 520001690279310
-
-+ Determine CPMS number of parameters for CPMS command (Ericsson
-  phone/GM12 GSM modem):
-  AT+CPMS?                                                                     
-  +CPMS: "ME",0,10,"ME",0,10         
-  AT+CPMS=?                               
-  +CPMS: ("ME","SM"),("ME","SM")          
-
-+ accept string as numeric value when interpreting COPS=? response
-  (Ericsson phone + GSM12 GSM module)
-
-+ accept string as numeric value when interpreting COPS? response
-  (Ericsson phone + GSM12 GSM module)
-
-+ It would be nice if it was possible to send sms:es
-  via gsmsmsd as well, via a spool directory or a socket (or stdin, in which
-  case one can put another program in front of this program and then
-  feed it with outgoing messages any way one wants). That way the program
-  could be the gateway between programs and the sms network.  Now one has
-  to stop gsmsmsd to send an sms and that's not so elegant or write
-  ones own program.
-
-+ gsmsmsd geht davon aus, das ein platz frei ist und benutzt nur diesen....
-  Wenn also eine SMS kommt, dann zieht es Sie raus, und l�scht den
-  Speicherplatz.
-  Wenn aber die Karte voll ist, passiert gar nichts. F�r eine automatisierte
-  umgebung ist das schlecht. besser w�re es, bei startup von gsmsmsd alle
-  Speicherpl�tze abzufr�hst�cken, und die Action aufzurufen.
-
-+ Ein RING bringt den gsmsmsd ziemlich heftig aus dem Tritt. Hab jetzt �ne
-  Rufumleitung eingebaut.
-
-+ Links section in homepage
-
-+ AT+CNMI=? liefert bei mir folgendes zur�ck:
-  +CNMI: (0-3),(0-3),(0-2),0,(0-1)
-  Parameter 4 (<ds>) liefert also keine Liste sondern nur ein Int zur�ck, du
-  versuchts aber ein ( zu parsen.
-  Was sagt die ETSI-spec. dazu ?? Ist das konform ??
-
-+ give name of command at beginning of synopsis in man pages
-
-+ list combinations of mobiles phones/GSM modems in the README
-
-+ test ALARM in case of timeout when writing or reading to TA
-
-+ install headers in gsmlib subdirectory
-
-+ RPM spec file
-
-+ test index changes for sorted phonebook -> write second test case
-
-+ sort phone numbers the same way in gsm_sorted_sms_store and
-  gsm_sorted_phonebook
-
-+ write glossary for all these nice abbreviations (TA, ME, SC, SME, TE)
-
-+ HAVE_VSNPRINTF instead of HAVE_VPRINTF
-
-+ internationalization of messages with GNU gettext. Files:
-  +gsm_at.cc               +gsm_parser.cc           +gsm_sorted_phonebook.cc
-  +gsm_error.cc            +gsm_phonebook.cc        +gsm_sorted_sms_store.cc
-  +gsm_event.cc            +gsm_sms.cc              +gsm_unix_serial.cc
-  +gsm_me_ta.cc            +gsm_sms_codec.cc        +gsm_util.cc
-  +gsm_nls.cc              +gsm_sms_store.cc
-  +gsmctl.cc               +gsmpb.cc                +gsmsendsms.cc
-  +gsmsmsd.cc              +gsmsmsstore.cc
-
-+ implement indexed phonebook ops in gsmpb.cc
-
-+ describe phonebook file format in gsmpb.man
-
-+ update list of compatible hardware in README
-
-+ all #include <gsm_config.h> must be enclosed in #ifdef's
-
-+ check for getopt_long in configure
-
-+ remove asserts regarding lengths of numeric data types, put them
-into configure script
-(string)
-
-+ sort options in apps/*.cc alphabetically
-
-+ in gsm_sorted_sms_store compare telephone numbers numerically
-
-+ introduce -v option to gsmpb and gsmsmsstore to report execution
-statistics (gives a nicer feeling to users)
-
-+ test new synchronization function in gsmpb program
-
-+ implement equality operator for SMSSToreEntry
-
-+ test 'make install'
-
-+ implement operations in the gsmctl program
-
-+ test operations in the gsmctl program
-
-+ document operations in the gsmctl program
-
-+ rewrite test cases (compare output)
-
-+ write gsm_sorted_sms_store module (along the lines of gsm_sorted_phonebook)
-
-+ complete gsmsmsstore program (using abovementioned modules)
-
-TODO low priority:
-
-- implement SMS text mode
-
-- The action command of gsmsmsd would be easier to make, if the program
-  sent the values in environment variables instead (except the user data
-  which could be sent on stdin).
-
-+ Upgrade to latest autoheader, autoconf, libtool
-
-- provide German translations for manual pages
-
-- organize doc subdirectory for translated READMEs, manual pages
-
-+ Win32 port
-
-- test: optimization when accessing phonebooks: use size information
-available via AT command to stop reading entries known to be empty (I
-cannot test this with my hardware since CPBS? is not fully supported)
-
-- make apps accept stdin or stdout
-
-+ maybe strip leading and trailing whitespace from phonebook entries
-when reading them from ME/TA or file? (not done, perhaps users want to 
-achieve special effects with white space)
-
-- support international character sets (8-bit, 16-bit) in phonebook
-operations (I'd like to have input from users who need this)
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/acconfig.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/acconfig.h
deleted file mode 100644
index 14ce58fbc3..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/acconfig.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* used by libtool*/
-#define PACKAGE 0
-
-/* used by libtool*/
-#define VERSION 0
-
-/* Define if getopt_long() available */
-#undef HAVE_GETOPT_LONG
-
-/* Define if alarm() available */
-#undef HAVE_ALARM
-
-/* Define if netinet/in.h header available */
-#undef HAVE_NETINET_IN_H
-
-/* Define if string.h header available */
-#undef HAVE_STRING_H
-
-/* Define for NLS */
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-
-/* Define LOCALEDIR */
-#define LOCALEDIR "/usr/share/locale"
-
-/* Define if libintl.h header available */
-#undef HAVE_LIBINTL_H
-
-/* Define if vsnprintf() function available */
-#undef HAVE_VSNPRINTF
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/acinclude.m4 b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/acinclude.m4
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/aclocal.m4 b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/aclocal.m4
deleted file mode 100644
index 8d27d03353..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/aclocal.m4
+++ /dev/null
@@ -1,9704 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
-
-# gettext.m4 serial 37 (gettext-0.14.4)
-dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
-  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AM_NLS
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
-
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);],
-              [bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
-            dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);],
-                [bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INTLOBJS=
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST(INTLOBJS)
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
-])
-
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([gt_GLIBC2])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([bh_C_SIGNED])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
-  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  AC_REQUIRE([gt_TYPE_INTMAX_T])
-  AC_REQUIRE([gt_PRINTF_POSIX])
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([gl_GLIBC21])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-  AC_REQUIRE([gl_XSIZE])dnl
-  AC_REQUIRE([gt_INTL_MACOSX])dnl
-
-  AC_CHECK_TYPE([ptrdiff_t], ,
-    [AC_DEFINE([ptrdiff_t], [long],
-       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
-    ])
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking])
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
-  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST([HAVE_POSIX_PRINTF])
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-  AC_SUBST([HAVE_ASPRINTF])
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-  AC_SUBST([HAVE_SNPRINTF])
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-  AC_SUBST([HAVE_WPRINTF])
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    gt_LC_MESSAGES
-  fi
-
-  if test -n "$INTL_MACOSX_LIBS"; then
-    CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
-
-
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in MacOS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    gt_cv_func_CFPreferencesCopyAppValue,
-    [gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
-     AC_TRY_LINK([#include <CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     CPPFLAGS="$gt_save_CPPFLAGS"
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
-      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Check for API introduced in MacOS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
-    [gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
-     AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     CPPFLAGS="$gt_save_CPPFLAGS"
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
-      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
-
-
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN([gt_CHECK_DECL],
-[
-  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
-    [AC_TRY_COMPILE([$2], [
-#ifndef $1
-  char *p = (char *) $1;
-#endif
-], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
-  if test $ac_cv_have_decl_$1 = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
-    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-# glibc2.m4 serial 1
-dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# Test for the GNU C Library, version 2.0 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([gt_GLIBC2],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
-      ac_cv_gnu_library_2,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2=yes,
-	ac_cv_gnu_library_2=no)
-      ]
-    )
-    AC_SUBST(GLIBC2)
-    GLIBC2="$ac_cv_gnu_library_2"
-  ]
-)
-
-# glibc21.m4 serial 3
-dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([gl_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
-
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
-])
-
-AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-])
-
-# intdiv0.m4 serial 1 (gettext-0.11.3)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gt_INTDIV0],
-[
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-    gt_cv_int_divbyzero_sigfpe,
-    [
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (1);
-}
-], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-        [
-          # Guess based on the CPU.
-          case "$host_cpu" in
-            alpha* | i[34567]86 | m68k | s390*)
-              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-            *)
-              gt_cv_int_divbyzero_sigfpe="guessing no";;
-          esac
-        ])
-    ])
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-    [Define if integer division by zero raises signal SIGFPE.])
-])
-
-# intmax.m4 serial 2 (gettext-0.14.2)
-dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the system has the 'intmax_t' type, but don't attempt to
-dnl find a replacement if it is lacking.
-
-AC_DEFUN([gt_TYPE_INTMAX_T],
-[
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
-    [AC_TRY_COMPILE([
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
-  if test $gt_cv_c_intmax_t = yes; then
-    AC_DEFINE(HAVE_INTMAX_T, 1,
-      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
-
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values.  This is the case on AIX 4.3.3.
-
-AC_DEFUN([gt_INTTYPES_PRI],
-[
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-      gt_cv_inttypes_pri_broken,
-      [
-        AC_TRY_COMPILE([#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-      ])
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-  fi
-])
-
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-  [
-    AC_TRY_COMPILE(
-      [#include <sys/types.h>
-#include <inttypes.h>],
-      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-  ])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-  fi
-])
-
-# inttypes_h.m4 serial 6
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    gl_cv_header_inttypes_h=yes,
-    gl_cv_header_inttypes_h=no)])
-  if test $gl_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
-
-# lcmessage.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN([gt_LC_MESSAGES],
-[
-  AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
-    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
-  if test $gt_cv_val_LC_MESSAGES = yes; then
-    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-      [Define if your <locale.h> file defines LC_MESSAGES.])
-  fi
-])
-
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
-*)
-  acl_cv_prog_gnu_ld=no ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
-      *)
-	test "$with_gnu_ld" != yes && break ;;
-      esac
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
-
-# lib-link.m4 serial 6 (gettext-0.14.3)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ(2.50)
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
-
-# lib-prefix.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-       $SED '/^$/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# --------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_unknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-#- set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
-	  break
-	  ;;
-	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	  ;;
-	esac
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ---------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# --------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-    ;;
-  esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
-  else
-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-# Report which librarie types wil actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
-      output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
-      fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      case $host_cpu in
-      hppa*64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-        ;;
-      ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        ;;
-      *)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    ia64*|hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC*)
-        # Portland Group C++ compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    fi
-    output_verbose_link_cmd='echo'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sco*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-solaris*)
-  case $cc_basename in
-  CC*)
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-    ;;
-  esac
-esac
-])
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program 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.
-#
-# This program 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris* | sysv5*)
-  symcode='[[BDRT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC*)
-	    # Portland Group C++ compiler.
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      sco*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      unixware*)
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux*)
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    sco3.2v5*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv5*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_MSG_RESULT([$SED])
-])
-
-# longdouble.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the compiler supports the 'long double' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_LONGDOUBLE],
-[
-  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
-    [if test "$GCC" = yes; then
-       gt_cv_c_long_double=yes
-     else
-       AC_TRY_COMPILE([
-         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
-         long double foo = 0.0;
-         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
-         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
-         ], ,
-         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
-     fi])
-  if test $gt_cv_c_long_double = yes; then
-    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
-  fi
-])
-
-# longlong.m4 serial 5
-dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_LONG_LONG if 'long long' works.
-
-AC_DEFUN([gl_AC_TYPE_LONG_LONG],
-[
-  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
-  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
-    [long long llmax = (long long) -1;
-     return ll << i | ll >> i | llmax / ll | llmax % ll;],
-    ac_cv_type_long_long=yes,
-    ac_cv_type_long_long=no)])
-  if test $ac_cv_type_long_long = yes; then
-    AC_DEFINE(HAVE_LONG_LONG, 1,
-      [Define if you have the 'long long' type.])
-  fi
-])
-
-# nls.m4 serial 2 (gettext-0.14.3)
-dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ(2.50)
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-])
-
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
-  dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate it.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
-])
-
-# po.m4 serial 7 (gettext-0.14.3)
-dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ(2.50)
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
-    fi
-  fi
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
-
-  AC_OUTPUT_COMMANDS([
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
-
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^[	 ]*VARIABLE[	 ]*=/{
-  # Seen the first line of the variable definition.
-  s/^[	 ]*VARIABLE[	 ]*=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
-
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
-    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Hide the ALL_LINGUAS assigment from automake.
-  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      fi
-      for desiredlang in $desiredlanguages; do
-        # Use the presentlang catalog if desiredlang is
-        #   a. equal to presentlang, or
-        #   b. a variant of presentlang (because in this case,
-        #      presentlang can be used as a fallback for messages
-        #      which are not translated in the desiredlang catalog).
-        case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
-
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-])
-
-# printf-posix.m4 serial 2 (gettext-0.13.1)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the printf() function supports POSIX/XSI format strings with
-dnl positions.
-
-AC_DEFUN([gt_PRINTF_POSIX],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
-    gt_cv_func_printf_posix,
-    [
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
-}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
-      [
-        AC_EGREP_CPP(notposix, [
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
-  notposix
-#endif
-        ], gt_cv_func_printf_posix="guessing no",
-           gt_cv_func_printf_posix="guessing yes")
-      ])
-    ])
-  case $gt_cv_func_printf_posix in
-    *yes)
-      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
-        [Define if your printf() function supports format strings with positions.])
-      ;;
-  esac
-])
-
-# progtest.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ(2.50)
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-    ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# signed.m4 serial 1 (gettext-0.10.40)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([bh_C_SIGNED],
-[
-  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
-   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
-  if test $bh_cv_c_signed = no; then
-    AC_DEFINE(signed, ,
-              [Define to empty if the C compiler doesn't support this keyword.])
-  fi
-])
-
-# size_max.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gl_SIZE_MAX],
-[
-  AC_CHECK_HEADERS(stdint.h)
-  dnl First test whether the system already has SIZE_MAX.
-  AC_MSG_CHECKING([for SIZE_MAX])
-  result=
-  AC_EGREP_CPP([Found it], [
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-], result=yes)
-  if test -z "$result"; then
-    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
-    dnl than the type 'unsigned long'.
-    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
-    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
-    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
-      [#include <stddef.h>], result=?)
-    if test "$fits_in_uint" = 1; then
-      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-      AC_TRY_COMPILE([#include <stddef.h>
-        extern size_t foo;
-        extern unsigned long foo;
-        ], [], fits_in_uint=0)
-    fi
-    if test -z "$result"; then
-      if test "$fits_in_uint" = 1; then
-        result="$res_hi$res_lo"U
-      else
-        result="$res_hi$res_lo"UL
-      fi
-    else
-      dnl Shouldn't happen, but who knows...
-      result='~(size_t)0'
-    fi
-  fi
-  AC_MSG_RESULT([$result])
-  if test "$result" != yes; then
-    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
-      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
-  fi
-])
-
-# stdint_h.m4 serial 5
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([gl_AC_HEADER_STDINT_H],
-[
-  AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    gl_cv_header_stdint_h=yes,
-    gl_cv_header_stdint_h=no)])
-  if test $gl_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
-
-# uintmax_t.m4 serial 9
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.13)
-
-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-    AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-      [Define to unsigned long or unsigned long long
-       if <stdint.h> and <inttypes.h> don't define.])
-  else
-    AC_DEFINE(HAVE_UINTMAX_T, 1,
-      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
-
-# ulonglong.m4 serial 4
-dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
-
-AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
-[
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
-  if test $ac_cv_type_unsigned_long_long = yes; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-      [Define if you have the 'unsigned long long' type.])
-  fi
-])
-
-# wchar_t.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether <stddef.h> has the 'wchar_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_WCHAR_T],
-[
-  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
-    [AC_TRY_COMPILE([#include <stddef.h>
-       wchar_t foo = (wchar_t)'\0';], ,
-       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
-  if test $gt_cv_c_wchar_t = yes; then
-    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
-  fi
-])
-
-# wint_t.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether <wchar.h> has the 'wint_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_WINT_T],
-[
-  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
-    [AC_TRY_COMPILE([#include <wchar.h>
-       wint_t foo = (wchar_t)'\0';], ,
-       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
-  if test $gt_cv_c_wint_t = yes; then
-    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
-  fi
-])
-
-# xsize.m4 serial 3
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_XSIZE],
-[
-  dnl Prerequisites of lib/xsize.h.
-  AC_REQUIRE([gl_SIZE_MAX])
-  AC_REQUIRE([AC_C_INLINE])
-  AC_CHECK_HEADERS(stdint.h)
-])
-
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([acinclude.m4])
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/Makefile.am b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/Makefile.am
deleted file mode 100644
index eff2f893fc..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: apps Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 5.6.1999
-# *************************************************************************
-
-INCLUDES =		-I..
-
-bin_PROGRAMS =		gsmsmsstore gsmctl gsmsmsd gsmpb gsmsendsms
-
-# build gsmsmsd from gsmsmsd.cc and libgsmme.la
-gsmsmsd_SOURCES =	gsmsmsd.cc
-gsmsmsd_LDADD =		../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build gsmpb from gsmpb.cc and libgsmme.la
-gsmpb_SOURCES =		gsmpb.cc
-gsmpb_LDADD =		../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build gsmctl from gsmctl.cc and libgsmme.la
-gsmctl_SOURCES =	gsmctl.cc
-gsmctl_LDADD =		../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build gsmsendsms from gsmsendsms.cc and libgsmme.la
-gsmsendsms_SOURCES =	gsmsendsms.cc
-gsmsendsms_LDADD =	../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build gsmsmsstore from gsmsmsstore.cc and libgsmme.la
-gsmsmsstore_SOURCES =	gsmsmsstore.cc
-gsmsmsstore_LDADD =	../gsmlib/libgsmme.la $(INTLLIBS)
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/Makefile.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/Makefile.in
deleted file mode 100644
index c18e2df06b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/Makefile.in
+++ /dev/null
@@ -1,442 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: apps Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 5.6.1999
-# *************************************************************************
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AS = @AS@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-DATADIRNAME = @DATADIRNAME@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GSM_VERSION = @GSM_VERSION@
-HAVE_LIB = @HAVE_LIB@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIB = @LIB@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-
-INCLUDES = -I..
-
-bin_PROGRAMS = gsmsmsstore gsmctl gsmsmsd gsmpb gsmsendsms
-
-# build gsmsmsd from gsmsmsd.cc and libgsmme.la
-gsmsmsd_SOURCES = gsmsmsd.cc
-gsmsmsd_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build gsmpb from gsmpb.cc and libgsmme.la
-gsmpb_SOURCES = gsmpb.cc
-gsmpb_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build gsmctl from gsmctl.cc and libgsmme.la
-gsmctl_SOURCES = gsmctl.cc
-gsmctl_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build gsmsendsms from gsmsendsms.cc and libgsmme.la
-gsmsendsms_SOURCES = gsmsendsms.cc
-gsmsendsms_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build gsmsmsstore from gsmsmsstore.cc and libgsmme.la
-gsmsmsstore_SOURCES = gsmsmsstore.cc
-gsmsmsstore_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-subdir = apps
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/gsm_config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = gsmsmsstore$(EXEEXT) gsmctl$(EXEEXT) gsmsmsd$(EXEEXT) \
-	gsmpb$(EXEEXT) gsmsendsms$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_gsmctl_OBJECTS = gsmctl.$(OBJEXT)
-gsmctl_OBJECTS = $(am_gsmctl_OBJECTS)
-gsmctl_DEPENDENCIES = ../gsmlib/libgsmme.la
-gsmctl_LDFLAGS =
-am_gsmpb_OBJECTS = gsmpb.$(OBJEXT)
-gsmpb_OBJECTS = $(am_gsmpb_OBJECTS)
-gsmpb_DEPENDENCIES = ../gsmlib/libgsmme.la
-gsmpb_LDFLAGS =
-am_gsmsendsms_OBJECTS = gsmsendsms.$(OBJEXT)
-gsmsendsms_OBJECTS = $(am_gsmsendsms_OBJECTS)
-gsmsendsms_DEPENDENCIES = ../gsmlib/libgsmme.la
-gsmsendsms_LDFLAGS =
-am_gsmsmsd_OBJECTS = gsmsmsd.$(OBJEXT)
-gsmsmsd_OBJECTS = $(am_gsmsmsd_OBJECTS)
-gsmsmsd_DEPENDENCIES = ../gsmlib/libgsmme.la
-gsmsmsd_LDFLAGS =
-am_gsmsmsstore_OBJECTS = gsmsmsstore.$(OBJEXT)
-gsmsmsstore_OBJECTS = $(am_gsmsmsstore_OBJECTS)
-gsmsmsstore_DEPENDENCIES = ../gsmlib/libgsmme.la
-gsmsmsstore_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gsmctl.Po ./$(DEPDIR)/gsmpb.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/gsmsendsms.Po ./$(DEPDIR)/gsmsmsd.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/gsmsmsstore.Po
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(gsmctl_SOURCES) $(gsmpb_SOURCES) $(gsmsendsms_SOURCES) \
-	$(gsmsmsd_SOURCES) $(gsmsmsstore_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(gsmctl_SOURCES) $(gsmpb_SOURCES) $(gsmsendsms_SOURCES) $(gsmsmsd_SOURCES) $(gsmsmsstore_SOURCES)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  apps/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-gsmctl$(EXEEXT): $(gsmctl_OBJECTS) $(gsmctl_DEPENDENCIES) 
-	@rm -f gsmctl$(EXEEXT)
-	$(CXXLINK) $(gsmctl_LDFLAGS) $(gsmctl_OBJECTS) $(gsmctl_LDADD) $(LIBS)
-gsmpb$(EXEEXT): $(gsmpb_OBJECTS) $(gsmpb_DEPENDENCIES) 
-	@rm -f gsmpb$(EXEEXT)
-	$(CXXLINK) $(gsmpb_LDFLAGS) $(gsmpb_OBJECTS) $(gsmpb_LDADD) $(LIBS)
-gsmsendsms$(EXEEXT): $(gsmsendsms_OBJECTS) $(gsmsendsms_DEPENDENCIES) 
-	@rm -f gsmsendsms$(EXEEXT)
-	$(CXXLINK) $(gsmsendsms_LDFLAGS) $(gsmsendsms_OBJECTS) $(gsmsendsms_LDADD) $(LIBS)
-gsmsmsd$(EXEEXT): $(gsmsmsd_OBJECTS) $(gsmsmsd_DEPENDENCIES) 
-	@rm -f gsmsmsd$(EXEEXT)
-	$(CXXLINK) $(gsmsmsd_LDFLAGS) $(gsmsmsd_OBJECTS) $(gsmsmsd_LDADD) $(LIBS)
-gsmsmsstore$(EXEEXT): $(gsmsmsstore_OBJECTS) $(gsmsmsstore_DEPENDENCIES) 
-	@rm -f gsmsmsstore$(EXEEXT)
-	$(CXXLINK) $(gsmsmsstore_LDFLAGS) $(gsmsmsstore_OBJECTS) $(gsmsmsstore_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmctl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmpb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmsendsms.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmsmsd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmsmsstore.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cc.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cc.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-
-.cc.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool distclean distclean-compile \
-	distclean-depend distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmctl.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmctl.cc
deleted file mode 100644
index df6fd28e1d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmctl.cc
+++ /dev/null
@@ -1,635 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsmctl.cc
-// *
-// * Purpose: GSM mobile phone control program
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 11.7.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <string>
-#if defined(HAVE_GETOPT_LONG) || defined(WIN32)
-#include <getopt.h>
-#endif
-#include <strstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_sysdep.h>
-#ifdef WIN32
-#include <gsmlib/gsm_win32_serial.h>
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#include <unistd.h>
-#endif
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-// my ME
-
-static MeTa *m;
-
-// information parameters
-
-enum InfoParameter {AllInfo, // print all info
-                    MeInfo,     // MeInfo must be first!
-                    FunctionalityInfo,
-                    OperatorInfo,
-                    CurrentOperatorInfo,
-                    FacilityLockStateInfo,
-                    FacilityLockCapabilityInfo,
-                    PasswordInfo,
-                    PINInfo,
-                    CLIPInfo,
-                    CallForwardingInfo,
-                    BatteryInfo,
-                    BitErrorInfo,
-                    SCAInfo,
-                    CharSetInfo,
-                    SignalInfo}; // SignalInfo must be last!
-
-// operation parameters
-
-// FIXME operations not implemented yet
-
-// options
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longOpts[] =
-{
-  {"xonxoff", no_argument, (int*)NULL, 'X'},
-  {"operation", required_argument, (int*)NULL, 'o'},
-  {"device", required_argument, (int*)NULL, 'd'},
-  {"baudrate", required_argument, (int*)NULL, 'b'},
-  {"init", required_argument, (int*)NULL, 'I'},
-  {"help", no_argument, (int*)NULL, 'h'},
-  {"version", no_argument, (int*)NULL, 'v'},
-  {(char*)NULL, 0, (int*)NULL, 0}
-};
-#else
-#define getopt_long(argc, argv, options, longopts, indexptr) \
-  getopt(argc, argv, options)
-#endif
-
-// helper function, prints forwarding info
-
-void printForwardReason(string s, ForwardInfo &info)
-{
-  cout << s << "  "
-       << (info._active ? _("active ") : _("inactive "))
-       << _("number: ") << info._number
-       << _("  subaddr: ") << info._subAddr
-       << _("  time: ") << info._time << endl;
-}
-
-// print information
-
-static void printInfo(InfoParameter ip)
-{
-  switch (ip)
-  {
-  case MeInfo:
-  {
-    MEInfo mei = m->getMEInfo();
-    cout << _("<ME0>  Manufacturer: ") << mei._manufacturer << endl
-         << _("<ME1>  Model: ") << mei._model << endl
-         << _("<ME2>  Revision: ") << mei._revision << endl
-         << _("<ME3>  Serial Number: ") << mei._serialNumber << endl;
-    break;
-  }
-  case FunctionalityInfo:
-  {
-    try {
-      int fun;
-      fun = m->getFunctionalityLevel();
-      cout << _("<FUN>  Functionality Level: ") << fun << endl;
-    } catch (GsmException &x) { 
-      cout << _("<FUN>  Functionality Level: ") << _("unsupported") << endl;
-    }
-    break;
-  }
-  case OperatorInfo:
-  {
-    int count = 0;
-    vector<OPInfo> opis = m->getAvailableOPInfo();
-    for (vector<OPInfo>::iterator i = opis.begin(); i != opis.end(); ++i)
-    {
-      cout << "<OP" << count << _(">  Status: ");
-      switch (i->_status)
-      {
-      case UnknownOPStatus: cout << _("unknown"); break;
-      case CurrentOPStatus: cout << _("current"); break;
-      case AvailableOPStatus: cout << _("available"); break;
-      case ForbiddenOPStatus: cout << _("forbidden"); break;
-      }
-      cout << _("  Long name: '") << i->_longName << "' "
-           << _("  Short name: '") << i->_shortName << "' "
-           << _("  Numeric name: ") << i->_numericName << endl;
-      ++count;
-    }
-    break;
-  }
-  case CurrentOperatorInfo:
-  {
-    OPInfo opi = m->getCurrentOPInfo();
-    cout << "<CURROP0>"
-         << _("  Long name: '") << opi._longName << "' "
-         << _("  Short name: '") << opi._shortName << "' "
-         << _("  Numeric name: ") << opi._numericName
-         << _("  Mode: ");
-    switch (opi._mode)
-    {
-    case AutomaticOPMode: cout << _("automatic"); break;
-    case ManualOPMode: cout << _("manual"); break;
-    case DeregisterOPMode: cout << _("deregister"); break;
-    case ManualAutomaticOPMode: cout << _("manual/automatic"); break;
-    }
-    cout << endl;
-    break;
-  }
-  case FacilityLockStateInfo:
-  {
-    int count = 0;
-    vector<string> fclc = m->getFacilityLockCapabilities();
-    for (vector<string>::iterator i = fclc.begin(); i != fclc.end(); ++i)
-      if (*i != "AB" && *i != "AG" && *i != "AC")
-      {
-        cout << "<FLSTAT" << count <<  ">  '" << *i << "'";
-        try
-        {
-          if (m->getFacilityLockStatus(*i, VoiceFacility))
-            cout << _("  Voice");
-        }
-        catch (GsmException &e)
-        {
-          cout << _("  unknown");
-        }
-        try
-        {
-        if (m->getFacilityLockStatus(*i, DataFacility))
-          cout << _("  Data");
-        }
-        catch (GsmException &e)
-        {
-          cout << _("  unknown");
-        }
-        try
-        {
-        if (m->getFacilityLockStatus(*i, FaxFacility))
-          cout << _("  Fax");
-        }
-        catch (GsmException &e)
-        {
-          cout << _("  unknown");
-        }
-        cout << endl;
-        ++count;
-      }
-    break;
-  }
-  case FacilityLockCapabilityInfo:
-  {
-    cout << "<FLCAP0>  ";
-    vector<string> fclc = m->getFacilityLockCapabilities();
-    for (vector<string>::iterator i = fclc.begin(); i != fclc.end(); ++i)
-      cout << "'" << *i << "' ";
-    cout << endl;
-    break;
-  }
-  case PasswordInfo:
-  {
-    vector<PWInfo> pwi = m->getPasswords();
-    int count = 0;
-    for (vector<PWInfo>::iterator i = pwi.begin(); i != pwi.end(); ++i)
-    {
-      cout << "<PW" << count <<  ">  '"
-           << i->_facility << "' " << i->_maxPasswdLen << endl;
-      ++count;
-    }
-    break;
-  }
-  case PINInfo:
-  {
-    cout << "<PIN0> " << m->getPINStatus() << endl;
-    break;
-  }
-  case CLIPInfo:
-  {
-    cout << "<CLIP0>  " << (m->getNetworkCLIP() ? _("on") : _("off")) << endl;
-    break;
-  }
-  case CallForwardingInfo:
-  {
-    for (int r = 0; r < 4; ++r)
-    {
-      string text;
-      switch (r)
-      {
-      case 0: text = _("UnconditionalReason"); break;
-      case 1: text = _("MobileBusyReason"); break;
-      case 2: text = _("NoReplyReason"); break;
-      case 3: text = _("NotReachableReason"); break;
-      }
-      ForwardInfo voice, fax, data;
-      m->getCallForwardInfo((ForwardReason)r, voice, fax, data);
-      cout << "<FORW" << r << ".";
-      printForwardReason("0>  " + text + _("  Voice"), voice);
-      cout << "<FORW" << r << ".";
-      printForwardReason("1>  " + text + _("  Data"), data);
-      cout << "<FORW" << r << ".";
-      printForwardReason("2>  " + text + _("  Fax"), fax);
-    }
-    break;
-  }
-  case BatteryInfo:
-  {
-    cout << "<BATT0>  ";
-    int bcs = m->getBatteryChargeStatus();
-    switch (bcs)
-    {
-    case 0: cout << _("0 ME is powered by the battery") << endl; break;
-    case 1: cout << _("1 ME has a battery connected, but is not powered by it")
-                 << endl; break;
-    case 2: cout << _("2 ME does not have a battery connected") << endl; break;
-    case 3:
-      cout << _("3 Recognized power fault, calls inhibited") << endl;
-      break;
-    }
-    cout << "<BATT1>  " << m->getBatteryCharge() << endl;
-    break;
-  }
-  case BitErrorInfo:
-  {
-    cout << "<BITERR0>  " << m->getBitErrorRate() << endl;
-    break;
-  }
-  case SCAInfo:
-  {
-    cout << "<SCA0>  " << m->getServiceCentreAddress() << endl;
-    break;
-  }
-  case CharSetInfo:
-  {
-    cout << "<CSET0>  ";
-    vector<string> cs = m->getSupportedCharSets();
-    for (vector<string>::iterator i = cs.begin(); i != cs.end(); ++i)
-      cout << "'" << *i << "' ";
-    cout << endl;
-    cout << "<CSET1>  '" << m->getCurrentCharSet() << "'" << endl;
-    break;
-  }
-  case SignalInfo:
-  {
-    cout << "<SIG0>  " << m->getSignalStrength() << endl;
-    break;
-  }
-  default:
-    assert(0);
-    break;
-  }
-}
-
-// convert facility class string of the form "", "all", or any combination
-// of "v" (voice), "d" (data), or "f" (fax) to numeric form
-
-FacilityClass strToFacilityClass(string facilityClassS)
-{
-  facilityClassS = lowercase(facilityClassS);
-  FacilityClass facilityClass = (FacilityClass)0;
-  if (facilityClassS == "all" || facilityClassS == "")
-    return (FacilityClass)ALL_FACILITIES;
-
-  // OR in facility class bits
-  for (unsigned int i = 0; i < facilityClassS.length(); ++i)
-    if (facilityClassS[i] == 'v')
-      facilityClass = (FacilityClass)(facilityClass | VoiceFacility);
-    else if (facilityClassS[i] == 'd')
-      facilityClass = (FacilityClass)(facilityClass | DataFacility);
-    else if (facilityClassS[i] == 'f')
-      facilityClass = (FacilityClass)(facilityClass | FaxFacility);
-    else
-      throw GsmException(
-        stringPrintf(_("unknown facility class parameter '%c'"),
-                     facilityClassS[i]), ParameterError);
-
-  return facilityClass;
-}
-
-// check if argc - optind is in range min..max
-// throw exception otherwise
-
-void checkParamCount(int optind, int argc, int min, int max)
-{
-  int paramCount = argc - optind;
-  if (paramCount < min)
-    throw GsmException(stringPrintf(_("not enough parameters, minimum number "
-                                      "of parameters is %d"), min),
-                       ParameterError);
-  else if (paramCount > max)
-    throw GsmException(stringPrintf(_("too many parameters, maximum number "
-                                      "of parameters is %d"), max),
-                       ParameterError);
-}
-
-// *** main program
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    // handle command line options
-    string device = "/dev/mobilephone";
-    string operation;
-    string baudrate;
-    string initString = DEFAULT_INIT_STRING;
-    bool swHandshake = false;
-
-    int opt;
-    int dummy;
-    while((opt = getopt_long(argc, argv, "I:o:d:b:hvX", longOpts, &dummy))
-          != -1)
-      switch (opt)
-      {
-      case 'X':
-        swHandshake = true;
-        break;
-      case 'I':
-        initString = optarg;
-        break;
-      case 'd':
-        device = optarg;
-        break;
-      case 'o':
-        operation = optarg;
-        break;
-      case 'b':
-        baudrate = optarg;
-        break;
-      case 'v':
-        cerr << argv[0] << stringPrintf(_(": version %s [compiled %s]"),
-                                        VERSION, __DATE__) << endl;
-        exit(0);
-        break;
-      case 'h':
-        cerr << argv[0] << _(": [-b baudrate][-d device][-h]"
-                             "[-I init string][-o operation]\n"
-                             "  [-v][-X]{parameters}") << endl
-             << endl
-             << _("  -b, --baudrate    baudrate to use for device "
-                  "(default: 38400)")
-             << endl
-             << _("  -d, --device      sets the destination device to "
-                  "connect to") << endl
-             << _("  -h, --help        prints this message") << endl
-             << _("  -I, --init        device AT init sequence") << endl
-             << _("  -o, --operation   operation to perform on the mobile \n"
-                  "                    phone with the specified parameters")
-             << endl
-             << _("  -v, --version     prints version and exits") << endl
-             << _("  -X, --xonxoff     switch on software handshake") << endl
-             << endl
-             << _("  parameters        parameters to use for the operation\n"
-                  "                    (if an operation is given) or\n"
-                  "                    a specification which kind of\n"
-                  "                    information to read from the mobile "
-                  "phone")
-             << endl << endl
-             << _("Refer to gsmctl(1) for details on the available parameters"
-                  " and operations.")
-             << endl << endl;
-        exit(0);
-        break;
-      case '?':
-        throw GsmException(_("unknown option"), ParameterError);
-        break;
-      }
-
-    // open the port and ME/TA
-    m = new MeTa(new
-#ifdef WIN32
-                 Win32SerialPort
-#else
-                 UnixSerialPort
-#endif
-                 (device,
-                  baudrate == "" ?
-                  DEFAULT_BAUD_RATE :
-                  baudRateStrToSpeed(baudrate),
-                  initString, swHandshake));
-    
-    if (operation == "")
-    {                           // process info parameters
-      for (int i = optind; i < argc; ++i)
-      {
-        string param = lowercase(argv[i]);
-        if (param == "all")
-          for (int ip = MeInfo; ip <= SignalInfo; ++ip)
-            printInfo((InfoParameter)ip);
-        else if (param == "me")
-          printInfo(MeInfo);
-        else if (param == "fun")
-          printInfo(FunctionalityInfo);
-        else if (param == "op")
-          printInfo(OperatorInfo);
-        else if (param == "currop")
-          printInfo(CurrentOperatorInfo);
-        else if (param == "flstat")
-          printInfo(FacilityLockStateInfo);
-        else if (param == "flcap")
-          printInfo(FacilityLockCapabilityInfo);
-        else if (param == "pw")
-          printInfo(PasswordInfo);
-        else if (param == "pin")
-          printInfo(PINInfo);
-        else if (param == "clip")
-          printInfo(CLIPInfo);
-        else if (param == "forw")
-          printInfo(CallForwardingInfo);
-        else if (param == "batt")
-          printInfo(BatteryInfo);
-        else if (param == "biterr")
-          printInfo(BitErrorInfo);
-        else if (param == "sig")
-          printInfo(SignalInfo);
-        else if (param == "sca")
-          printInfo(SCAInfo);
-        else if (param == "cset")
-          printInfo(CharSetInfo);
-        else
-          throw GsmException(
-            stringPrintf(_("unknown information parameter '%s'"),
-                         param.c_str()),
-            ParameterError);
-      }
-    }
-    else
-    {                           // process operation
-      operation = lowercase(operation);
-      if (operation == "dial")
-      {
-        // dial: number
-        checkParamCount(optind, argc, 1, 1);
-
-        m->dial(argv[optind]);
-        
-        // wait for keypress from stdin
-        char c;
-        read(1, &c, 1);
-      }
-      else if (operation == "on")
-      {
-	  m->setFunctionalityLevel(1);
-      }
-      else if (operation == "off")
-      {
-	  m->setFunctionalityLevel(0);
-      }
-      else if (operation == "pin")
-      {
-        // pin: PIN
-        checkParamCount(optind, argc, 1, 1);
-
-        m->setPIN(argv[optind]);
-      }
-      else if (operation == "setop")
-      {
-        // setop: opmode numeric FIXME allow long and numeric too
-        checkParamCount(optind, argc, 2, 2);
-        string opmodeS = lowercase(argv[optind]);
-        OPModes opmode;
-        if (opmodeS == "automatic")
-          opmode = AutomaticOPMode;
-        else if (opmodeS == "manual")
-          opmode = ManualOPMode;
-        else if (opmodeS == "deregister")
-          opmode = DeregisterOPMode;
-        else if (opmodeS == "manualautomatic")
-          opmode = ManualAutomaticOPMode;
-        else
-          throw GsmException(stringPrintf(_("unknown opmode parameter '%s'"),
-                                          opmodeS.c_str()), ParameterError);
-
-        m->setCurrentOPInfo(opmode, "" , "", checkNumber(argv[optind + 1]));
-      }
-      else if (operation == "lock")
-      {
-        // lock: facility [facilityclass] [passwd]
-        checkParamCount(optind, argc, 1, 3);
-        string passwd = (argc - optind == 3) ?
-          (string)argv[optind + 2] : (string)"";
-        
-        m->lockFacility(argv[optind],
-                        (argc - optind >= 2) ?
-                        strToFacilityClass(argv[optind + 1]) :
-                        (FacilityClass)ALL_FACILITIES,
-                        passwd);
-      }
-      else if (operation == "unlock")
-      {
-        // unlock: facility [facilityclass] [passwd]
-        checkParamCount(optind, argc, 1, 3);
-        string passwd = argc - optind == 3 ? argv[optind + 2] : "";
-        
-        m->unlockFacility(argv[optind],
-                          (argc - optind >= 2) ?
-                          strToFacilityClass(argv[optind + 1]) :
-                          (FacilityClass)ALL_FACILITIES,
-                          passwd);
-      }
-      else if (operation == "setpw")
-      {
-        // set password: facility oldpasswd newpasswd
-        checkParamCount(optind, argc, 1, 3);
-        string oldPasswd = argc - optind >= 2 ? argv[optind + 1] : "";
-        string newPasswd = argc - optind == 3 ? argv[optind + 2] : "";
-
-        m->setPassword(argv[optind], oldPasswd, newPasswd);
-      }
-      else if (operation == "forw")
-      {
-        // call forwarding: mode reason number [facilityclass] [forwardtime]
-        checkParamCount(optind, argc, 2, 5);
-
-        // get optional parameters facility class and forwardtime
-        int forwardTime = argc - optind == 5 ? checkNumber(argv[optind + 4]) :
-          NOT_SET;
-        FacilityClass facilityClass =
-          argc - optind >= 4 ? strToFacilityClass(argv[optind + 3]) :
-          (FacilityClass)ALL_FACILITIES;
-        
-        // get forward reason
-        string reasonS = lowercase(argv[optind + 1]);
-        ForwardReason reason;
-        if (reasonS == "unconditional")
-          reason = UnconditionalReason;
-        else if (reasonS == "mobilebusy")
-          reason = MobileBusyReason;
-        else if (reasonS == "noreply")
-          reason = NoReplyReason;
-        else if (reasonS == "notreachable")
-          reason = NotReachableReason;
-        else if (reasonS == "all")
-          reason = AllReasons;
-        else if (reasonS == "allconditional")
-          reason = AllConditionalReasons;
-        else
-          throw GsmException(
-            stringPrintf(_("unknown forward reason parameter '%s'"),
-                         reasonS.c_str()), ParameterError);
-        
-        // get mode
-        string modeS = lowercase(argv[optind]);
-        ForwardMode mode;
-        if (modeS == "disable")
-          mode = DisableMode;
-        else if (modeS == "enable")
-          mode = EnableMode;
-        else if (modeS == "register")
-          mode = RegistrationMode;
-        else if (modeS == "erase")
-          mode = ErasureMode;
-        else
-          throw GsmException(
-            stringPrintf(_("unknown forward mode parameter '%s'"),
-                         modeS.c_str()), ParameterError);
-
-        m->setCallForwarding(reason, mode,
-                             (argc - optind >= 3) ? argv[optind + 2] : "",
-                             "", // subaddr
-                             facilityClass, forwardTime);
-      }
-      else if (operation == "setsca")
-      {
-        // set sca: number
-        checkParamCount(optind, argc, 1, 1);
-        m->setServiceCentreAddress(argv[optind]);
-      }
-      else if (operation == "cset")
-      {
-        // set charset: string
-        checkParamCount(optind, argc, 1, 1);
-        m->setCharSet(argv[optind]);
-      }
-      else
-         throw GsmException(stringPrintf(_("unknown operation '%s'"),
-                                         operation.c_str()), ParameterError);
-    }
-  }
-  catch (GsmException &ge)
-  {
-    cerr << argv[0] << _("[ERROR]: ") << ge.what() << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmpb.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmpb.cc
deleted file mode 100644
index 6196b717c2..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmpb.cc
+++ /dev/null
@@ -1,507 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsmpb.cc
-// *
-// * Purpose: phonebook management program
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 24.6.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <string>
-#ifdef WIN32
-#include <gsmlib/gsm_win32_serial.h>
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#include <unistd.h>
-#endif
-#if defined(HAVE_GETOPT_LONG) || defined(WIN32)
-#include <getopt.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_sorted_phonebook.h>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longOpts[] =
-{
-  {"xonxoff", no_argument, (int*)NULL, 'X'},
-  {"phonebook", required_argument, (int*)NULL, 'p'},
-  {"init", required_argument, (int*)NULL, 'I'},
-  {"destination", required_argument, (int*)NULL, 'd'},
-  {"source", required_argument, (int*)NULL, 's'},
-  {"destination-backend", required_argument, (int*)NULL, 'D'},
-  {"source-backend", required_argument, (int*)NULL, 'S'},
-  {"baudrate", required_argument, (int*)NULL, 'b'},
-  {"charset", required_argument, (int*)NULL, 't'},
-  {"copy", no_argument, (int*)NULL, 'c'},
-  {"synchronize", no_argument, (int*)NULL, 'y'},
-  {"help", no_argument, (int*)NULL, 'h'},
-  {"version", no_argument, (int*)NULL, 'v'},
-  {"verbose", no_argument, (int*)NULL, 'V'},
-  {"indexed", no_argument, (int*)NULL, 'i'},
-  {(char*)NULL, 0, (int*)NULL, 0}
-};
-#else
-#define getopt_long(argc, argv, options, longopts, indexptr) \
-  getopt(argc, argv, options)
-#endif
-
-// insert those entries from sourcePhonebook into destPhonebook
-// that are not already present in destPhonebook
-
-void insertNotPresent(SortedPhonebookRef sourcePhonebook,
-                      SortedPhonebookRef destPhonebook,
-                      bool indexed, bool verbose)
-{
-  for (SortedPhonebookBase::iterator i = sourcePhonebook->begin();
-       i != sourcePhonebook->end(); ++i)
-  {
-    pair<SortedPhonebookBase::iterator, SortedPhonebookBase::iterator> range;
-    if (indexed)
-    {
-      int index = i->index();
-      range = destPhonebook->equal_range(index);
-    }
-    else
-    {
-      string text = i->text();
-      range = destPhonebook->equal_range(text);
-    }
-
-    // do nothing if the entry is already present in the destination
-    bool alreadyPresent = false;
-    for (SortedPhonebookBase::iterator j = range.first;
-         j != range.second; ++j)
-    {
-      i->setUseIndex(indexed);
-      if (i->telephone() == j->telephone())
-      {
-        alreadyPresent = true;
-        break;
-      }
-    }
-    // ... else insert it
-    if (! alreadyPresent)
-    {
-      if (verbose)
-      {
-        cout << stringPrintf(_("inserting '%s' tel# %s"),
-                             i->text().c_str(), i->telephone().c_str());
-        if (indexed)
-          cout << stringPrintf(_(" (index #%d)"), i->index());
-        cout << endl;
-      }
-      i->setUseIndex(indexed);
-      destPhonebook->insert(*i); // insert
-    }
-  }
-}
-
-// update those entries in destPhonebook, that
-// - have the same name as one entry in destPhonebook
-// - but have a different telephone number
-// this is only done if the name in question is unique in the destPhonebook
-// the case of several entries having the same in the sourcePhonebook
-// is handled - only the first is considered for updating
-
-void updateEntries(SortedPhonebookRef sourcePhonebook,
-                   SortedPhonebookRef destPhonebook,
-                   bool verbose)
-{
-  bool firstLoop = true;
-  string lastText;
-
-  for (SortedPhonebookBase::iterator i = sourcePhonebook->begin();
-       i != sourcePhonebook->end(); ++i)
-  {
-    string text = i->text();
-    if (! firstLoop && text != lastText)
-    {
-      pair<SortedPhonebookBase::iterator,
-        SortedPhonebookBase::iterator> range =
-        destPhonebook->equal_range(text);
-      
-      SortedPhonebookBase::iterator first = range.first;
-      if (first != destPhonebook->end() && range.second == ++first)
-      {                         // just one text in the destPhonebook
-        if (! (*range.first == *i)) // overwrite if different in destination
-        {
-          if (verbose)
-            cout << stringPrintf(_("updating '%s' tel# %s to new tel# %s"),
-                                 range.first->text().c_str(),
-                                 range.first->telephone().c_str(),
-                                 i->telephone().c_str())
-                 << endl;
-          
-          *range.first = *i;
-        }
-      }
-      lastText = text;
-    }
-    firstLoop = false;
-  }
-}
-
-// the same but for indexed phonebooks
-
-void updateEntriesIndexed(SortedPhonebookRef sourcePhonebook,
-                          SortedPhonebookRef destPhonebook,
-                          bool verbose)
-{
-  for (SortedPhonebookBase::iterator i = sourcePhonebook->begin();
-       i != sourcePhonebook->end(); ++i)
-  {
-    int index = i->index();
-    
-    SortedPhonebookBase::iterator j = destPhonebook->find(index);
-    
-    if (j != destPhonebook->end())
-    {                           // index present in the destPhonebook
-      if (! (*j == *i))         // overwrite if different in destination
-      {
-        if (verbose)
-          cout << stringPrintf(_("updating '%s' tel# %s to new tel# %s"
-                                 "(index %d)"),
-                               j->text().c_str(),
-                               j->telephone().c_str(),
-                               i->telephone().c_str(), i->index())
-               << endl;
-        
-        *j = *i;
-      }
-    }
-  }
-}
-
-// delete those entries from destPhonebook, that are not present
-// in sourcePhonebook
-
-void deleteNotPresent(SortedPhonebookRef sourcePhonebook,
-                      SortedPhonebookRef destPhonebook,
-                      bool indexed, bool verbose)
-{
-  for (SortedPhonebookBase::iterator i = destPhonebook->begin();
-       i != destPhonebook->end(); ++i)
-  {
-    pair<SortedPhonebookBase::iterator, SortedPhonebookBase::iterator> range;
-    if (indexed)
-    {
-      int index = i->index();
-      range = sourcePhonebook->equal_range(index);
-    }
-    else
-    {
-      string text = i->text();
-      range = sourcePhonebook->equal_range(text);
-    }
-        
-    bool found = false;
-    for (SortedPhonebookBase::iterator j = range.first;
-         j != range.second; ++j)
-    {
-      i->setUseIndex(indexed);
-      if (j->telephone() == i->telephone())
-      {
-        found = true;
-        break;
-      }
-    }
-    if (! found)
-    {
-      if (verbose)
-      {
-        cout << stringPrintf(_("deleting '%s' tel# %s"),
-                             i->text().c_str(), i->telephone().c_str());
-        if (indexed)
-          cout << stringPrintf(_(" (index #%d)"), i->index());
-        cout << endl;
-      }
-      destPhonebook->erase(i);
-#ifdef BUGGY_MAP_ERASE
-	  deleteNotPresent(sourcePhonebook, destPhonebook, indexed, verbose);
-	  return;
-#endif
-    }
-  }
-}
-
-// *** main program
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    // handle command line options
-    string destination;
-    string source;
-    string destinationBackend;
-    string sourceBackend;
-    string baudrate;
-    bool doSynchronize = true;
-    string phonebook;
-    SortedPhonebookRef sourcePhonebook, destPhonebook;
-    bool verbose = false;
-    bool indexed = false;
-    string initString = DEFAULT_INIT_STRING;
-    bool swHandshake = false;
-    string charSet;
-    Ref<MeTa> sourceMeTa, destMeTa;
-
-    int opt;
-    int dummy;
-    while((opt = getopt_long(argc, argv, "I:p:s:d:b:cyhvViD:S:Xt:", longOpts,
-                             &dummy))
-          != -1)
-      switch (opt)
-      {
-      case 'X':
-        swHandshake = true;
-        break;
-      case 'I':
-        initString = optarg;
-        break;
-      case 'V':
-        verbose = true;
-        break;
-      case 'p':
-        phonebook = optarg;
-        break;
-      case 'd':
-        destination = optarg;
-        break;
-      case 's':
-        source = optarg;
-        break;
-      case 'D':
-        destinationBackend = optarg;
-        break;
-      case 'S':
-        sourceBackend = optarg;
-        break;
-      case 'b':
-        baudrate = optarg;
-        break;
-      case 't':
-        charSet = optarg;
-        break;
-      case 'c':
-        doSynchronize = false;
-        break;
-      case 'i':
-        indexed = true;
-        break;
-      case 'y':
-        doSynchronize = true;
-        break;
-      case 'v':
-        cerr << argv[0] << stringPrintf(_(": version %s [compiled %s]"),
-                                        VERSION, __DATE__) << endl;
-        exit(0);
-        break;
-      case 'h':
-        cerr << argv[0] << _(": [-b baudrate][-c][-d device or file][-h]"
-                             "[-I init string]\n"
-                             "  [-p phonebook name][-s device or file]"
-                             "[-t charset][-v]"
-                             "[-V][-y][-X]") << endl
-             << endl
-             << _("  -b, --baudrate    baudrate to use for device "
-                  "(default: 38400)")
-             << endl
-             << _("  -c, --copy        copy source entries to destination")
-             << endl
-             << _("  -d, --destination sets the destination device to "
-                  "connect \n"
-                  "                    to, or the file to write") << endl
-             << _("  -D, --destination-backend sets the destination backend")
-             << endl
-             << _("  -h, --help        prints this message") << endl
-             << _("  -i, --index       takes index positions into account")
-             << endl
-             << _("  -I, --init        device AT init sequence") << endl
-             << _("  -p, --phonebook   name of phonebook to use") << endl
-             << _("  -s, --source      sets the source device to connect to,\n"
-                  "                    or the file to read") << endl
-             << _("  -t, --charset     sets the character set to use for\n"
-                  "                    phonebook entries") << endl
-             << _("  -S, --source-backend sets the source backend")
-             << endl
-             << _("  -v, --version     prints version and exits") << endl
-             << _("  -V, --verbose     print detailed progress messages")
-             << endl
-             << _("  -X, --xonxoff     switch on software handshake") << endl
-             << _("  -y, --synchronize synchronize destination with source\n"
-                  "                    entries (destination is overwritten)\n"
-                  "                    (see gsmpb(1) for details)")
-             << endl << endl;
-        exit(0);
-        break;
-      case '?':
-        throw GsmException(_("unknown option"), ParameterError);
-        break;
-      }
-
-    // check if all parameters all present
-    if (destination == "" || source == "")
-      throw GsmException(_("both source and destination must be given"),
-                         ParameterError);
-
-    // start accessing source mobile phone or file
-    if (sourceBackend != "")
-      sourcePhonebook =
-        CustomPhonebookRegistry::createPhonebook(sourceBackend, source);
-    else if (source == "-")
-      sourcePhonebook = new SortedPhonebook(true, indexed);
-    else if (isFile(source))
-      sourcePhonebook = new SortedPhonebook(source, indexed);
-    else
-    {
-      if (phonebook == "")
-        throw GsmException(_("phonebook name must be given"), ParameterError);
-
-      sourceMeTa = new MeTa(new
-#ifdef WIN32
-                            Win32SerialPort
-#else
-                            UnixSerialPort
-#endif
-                            (source,
-                             baudrate == "" ? DEFAULT_BAUD_RATE :
-                             baudRateStrToSpeed(baudrate), initString,
-                             swHandshake));
-      if (charSet != "")
-        sourceMeTa->setCharSet(charSet);
-      sourcePhonebook =
-        new SortedPhonebook(sourceMeTa->getPhonebook(phonebook));
-    }
-
-    // make sure destination.c_str file exists
-	if (destination != "")
-	{
-      try
-	  {
-        ofstream f(destination.c_str(), ios::out | ios::app);
-	  }
-      catch (exception)
-	  {
-	  }
-	}
-
-    // start accessing destination mobile phone or file
-    if (destinationBackend != "")
-      destPhonebook =
-        CustomPhonebookRegistry::createPhonebook(destinationBackend,
-                                                 destination);
-    else if (destination == "-")
-      destPhonebook = new SortedPhonebook(false, indexed);
-    else if (isFile(destination))
-      destPhonebook = new SortedPhonebook(destination, indexed);
-    else
-    {
-      if (phonebook == "")
-        throw GsmException(_("phonebook name must be given"), ParameterError);
-
-      destMeTa = new MeTa(new 
-#ifdef WIN32
-                          Win32SerialPort
-#else
-                          UnixSerialPort
-#endif
-                          (destination,
-                           baudrate == "" ? DEFAULT_BAUD_RATE :
-                           baudRateStrToSpeed(baudrate), initString,
-                           swHandshake));
-      if (charSet != "")
-        destMeTa->setCharSet(charSet);
-      PhonebookRef destPb = destMeTa->getPhonebook(phonebook);
-
-      // check maximum lengths of source text and phonenumber when writing to
-      // mobile phone
-      unsigned int maxTextLen = destPb->getMaxTextLen();
-      unsigned int maxTelLen = destPb->getMaxTelephoneLen();
-
-      for (SortedPhonebookBase::iterator i = sourcePhonebook->begin();
-           i != sourcePhonebook->end(); ++i)
-        if (i->text().length() > maxTextLen)
-          throw GsmException(
-            stringPrintf(_("text '%s' is too large to fit into destination "
-                           "(maximum size %d characters)"),
-                         i->text().c_str(), maxTextLen),
-            ParameterError);
-        else if (i->telephone().length() > maxTelLen)
-          throw GsmException(
-            stringPrintf(_("phone number '%s' is too large to fit into "
-                           "destination (maximum size %d characters)"),
-                         i->telephone().c_str(), maxTelLen),
-            ParameterError);
-
-      // read phonebook
-      destPhonebook = new SortedPhonebook(destPb);      
-    }
-
-    // now do the actual work
-    if (doSynchronize)
-    {                           // synchronizing
-      if (indexed)
-      {
-        sourcePhonebook->setSortOrder(ByIndex);
-        destPhonebook->setSortOrder(ByIndex);
-        // for an explanation see below
-        updateEntriesIndexed(sourcePhonebook, destPhonebook, verbose);
-        deleteNotPresent(sourcePhonebook, destPhonebook, true, verbose);
-        insertNotPresent(sourcePhonebook, destPhonebook, true, verbose);
-      }
-      else
-      {
-        sourcePhonebook->setSortOrder(ByText);
-        destPhonebook->setSortOrder(ByText);
-        // the following is done to avoid superfluous writes to the TA
-        // (that takes time) and keep updated (ie. telephone number changed)
-        // entries at the same place
-        // 1. update entries in place where just the number changed
-        updateEntries(sourcePhonebook, destPhonebook, verbose);
-        // 2. delete those that are not present anymore
-        deleteNotPresent(sourcePhonebook, destPhonebook, false, verbose);
-        // 3. insert the new ones
-        insertNotPresent(sourcePhonebook, destPhonebook, false, verbose);
-      }
-    }
-    else
-    {                           // copying
-      destPhonebook->clear();
-      for (SortedPhonebookBase::iterator i = sourcePhonebook->begin();
-           i != sourcePhonebook->end(); ++i)
-      {
-        if (verbose)
-        {
-          cout << stringPrintf(_("inserting '%s' tel# %s"),
-                               i->text().c_str(), i->telephone().c_str());
-          if (indexed)
-            cout << stringPrintf(_(" (index #%d)"), i->index());
-          cout << endl;
-        }
-        destPhonebook->insert(*i);
-      }
-    }
-  }
-  catch (GsmException &ge)
-  {
-    cerr << argv[0] << _("[ERROR]: ") << ge.what() << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmsendsms.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmsendsms.cc
deleted file mode 100644
index f6418842ac..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmsendsms.cc
+++ /dev/null
@@ -1,257 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsmsendsms.cc
-// *
-// * Purpose: GSM sms send program
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 16.7.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <string>
-#ifdef WIN32
-#include <gsmlib/gsm_win32_serial.h>
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#include <unistd.h>
-#endif
-#if defined(HAVE_GETOPT_LONG) || defined(WIN32)
-#include <getopt.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_util.h>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-// options
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longOpts[] =
-{
-  {"requeststat", no_argument, (int*)NULL, 'r'},
-  {"xonxoff", no_argument, (int*)NULL, 'X'},
-  {"sca", required_argument, (int*)NULL, 'C'},
-  {"device", required_argument, (int*)NULL, 'd'},
-  {"init", required_argument, (int*)NULL, 'I'},
-  {"concatenate", required_argument, (int*)NULL, 'c'},
-  {"baudrate", required_argument, (int*)NULL, 'b'},
-  {"test", no_argument, (int*)NULL, 't'},
-  {"help", no_argument, (int*)NULL, 'h'},
-  {"version", no_argument, (int*)NULL, 'v'},
-  {(char*)NULL, 0, (int*)NULL, 0}
-};
-#else
-#define getopt_long(argc, argv, options, longopts, indexptr) \
-  getopt(argc, argv, options)
-#endif
-
-// convert /r and /n to CR and LF
-
-static string unescapeString(char *line)
-{
-  string result;
-  bool escaped = false;
-  int index = 0;
-
-  while (line[index] != 0 &&
-         line[index] != CR && line[index] != LF)
-  {
-    if (escaped)
-    {
-      escaped = false;
-      if (line[index] == 'r')
-        result += CR;
-      else if (line[index] == 'n')
-        result += LF;
-      else if (line[index] == '\\')
-        result += '\\';
-      else
-        result += line[index];
-    }
-    else
-      if (line[index] == '\\')
-        escaped = true;
-      else
-        result += line[index];
-
-    ++index;
-  }
-  return result;
-}
-
-// *** main program
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    // handle command line options
-    string device = "/dev/mobilephone";
-    bool test = false;
-    string baudrate;
-    Ref<GsmAt> at;
-    string initString = DEFAULT_INIT_STRING;
-    bool swHandshake = false;
-    bool requestStatusReport = false;
-    // service centre address (set on command line)
-    string serviceCentreAddress;
-    MeTa *m = NULL;
-    string concatenatedMessageIdStr;
-    int concatenatedMessageId = -1;
-
-    int opt;
-    int dummy;
-    while((opt = getopt_long(argc, argv, "c:C:I:d:b:thvXr", longOpts, &dummy))
-          != -1)
-      switch (opt)
-      {
-      case 'c':
-        concatenatedMessageIdStr = optarg;
-        break;
-      case 'C':
-        serviceCentreAddress = optarg;
-        break;
-      case 'X':
-        swHandshake = true;
-        break;
-      case 'I':
-        initString = optarg;
-        break;
-      case 'd':
-        device = optarg;
-        break;
-      case 'b':
-        baudrate = optarg;
-        break;
-      case 't':
-        test = true;
-        break;
-      case 'r':
-        requestStatusReport = true;
-        break;
-      case 'v':
-        cerr << argv[0] << stringPrintf(_(": version %s [compiled %s]"),
-                                        VERSION, __DATE__) << endl;
-        exit(0);
-        break;
-      case 'h':
-        cerr << argv[0] << _(": [-b baudrate][-c concatenatedID]"
-                             "[-C sca][-d device][-h][-I init string]\n"
-                             "  [-t][-v][-X] phonenumber [text]") << endl
-             << endl
-             << _("  -b, --baudrate    baudrate to use for device "
-                  "(default: 38400)")
-             << endl
-             << _("  -c, --concatenate ID for concatenated SMS messages")
-             << endl
-             << _("  -C, --sca         SMS service centre address") << endl
-             << _("  -d, --device      sets the destination device to connect "
-                  "to") << endl
-             << _("  -h, --help        prints this message") << endl
-             << _("  -I, --init        device AT init sequence") << endl
-             << _("  -r, --requeststat request SMS status report") << endl
-             << _("  -t, --test        convert text to GSM alphabet and "
-                  "vice\n"
-                  "                    versa, no SMS message is sent") << endl
-             << _("  -v, --version     prints version and exits")
-             << endl
-             << _("  -X, --xonxoff     switch on software handshake") << endl
-             << endl
-             << _("  phonenumber       recipient's phone number") << endl
-             << _("  text              optional text of the SMS message\n"
-                  "                    if omitted: read from stdin")
-             << endl << endl;
-        exit(0);
-        break;
-      case '?':
-        throw GsmException(_("unknown option"), ParameterError);
-        break;
-      }
-
-    if (! test)
-    {
-      // open the port and ME/TA
-      Ref<Port> port = new
-#ifdef WIN32
-             Win32SerialPort
-#else
-             UnixSerialPort
-#endif
-        (device,
-         baudrate == "" ? DEFAULT_BAUD_RATE :
-         baudRateStrToSpeed(baudrate),
-         initString, swHandshake);
-      // switch message service level to 1
-      // this enables acknowledgement PDUs
-      m = new MeTa(port);
-      m->setMessageService(1);
-
-      at = new GsmAt(*m);
-    }
-
-    // check parameters
-    if (optind == argc)
-      throw GsmException(_("phone number and text missing"), ParameterError);
-
-    if (optind + 2 < argc)
-      throw GsmException(_("more than two parameters given"), ParameterError);
-    
-    if (concatenatedMessageIdStr != "")
-      concatenatedMessageId = checkNumber(concatenatedMessageIdStr);
-
-    // get phone number
-    string phoneNumber = argv[optind];
-
-    // get text
-    string text;
-    if (optind + 1 == argc)
-    {                           // read from stdin
-      char s[1000];
-      cin.get(s, 1000);
-      text = unescapeString(s);
-      if (text.length() > 160)
-        throw GsmException(_("text is larger than 160 characters"),
-                           ParameterError);
-    }
-    else
-      text = argv[optind + 1];
-
-    if (test)
-      cout << gsmToLatin1(latin1ToGsm(text)) << endl;
-    else
-    {
-      // send SMS
-      Ref<SMSSubmitMessage> submitSMS = new SMSSubmitMessage();
-      // set service centre address in new submit PDU if requested by user
-      if (serviceCentreAddress != "")
-      {
-        Address sca(serviceCentreAddress);
-        submitSMS->setServiceCentreAddress(sca);
-      }
-      submitSMS->setStatusReportRequest(requestStatusReport);
-      Address destAddr(phoneNumber);
-      submitSMS->setDestinationAddress(destAddr);
-      if (concatenatedMessageId == -1)
-        m->sendSMSs(submitSMS, text, true);
-      else
-        m->sendSMSs(submitSMS, text, false, concatenatedMessageId);
-    }
-  }
-  catch (GsmException &ge)
-  {
-    cerr << argv[0] << _("[ERROR]: ") << ge.what() << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmsmsd.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmsmsd.cc
deleted file mode 100644
index ffb2db0739..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmsmsd.cc
+++ /dev/null
@@ -1,723 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsmsmsd.cc
-// *
-// * Purpose: SMS receiver daemon
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 5.6.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <string>
-
-#ifdef WIN32
-#include <io.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_win32_serial.h>
-#define popen _popen
-#define pclose _pclose
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <syslog.h>
-#endif
-#if defined(HAVE_GETOPT_LONG) || defined(WIN32)
-#include <getopt.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <fstream>
-#include <iostream>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_event.h>
-#include <cstring>
-
-using namespace std;
-using namespace gsmlib;
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longOpts[] =
-{
-  {"requeststat", no_argument, (int*)NULL, 'r'},
-  {"direct", no_argument, (int*)NULL, 'D'},
-  {"xonxoff", no_argument, (int*)NULL, 'X'},
-  {"init", required_argument, (int*)NULL, 'I'},
-  {"store", required_argument, (int*)NULL, 't'},
-  {"device", required_argument, (int*)NULL, 'd'},
-  {"spool", required_argument, (int*)NULL, 's'},
-  {"sent", required_argument, (int*)NULL, 'S'},
-  {"failed", required_argument, (int*)NULL, 'F'},
-  {"priorities", required_argument, (int*)NULL, 'P'},
-#ifndef WIN32
-  {"syslog", no_argument, (int*)NULL, 'L'},
-#endif
-  {"sca", required_argument, (int*)NULL, 'C'},
-  {"flush", no_argument, (int*)NULL, 'f'},
-  {"concatenate", required_argument, (int*)NULL, 'c'},
-  {"action", required_argument, (int*)NULL, 'a'},
-  {"baudrate", required_argument, (int*)NULL, 'b'},
-  {"help", no_argument, (int*)NULL, 'h'},
-  {"version", no_argument, (int*)NULL, 'v'},
-  {(char*)NULL, 0, (int*)NULL, 0}
-};
-#else
-#define getopt_long(argc, argv, options, longopts, indexptr) \
-  getopt(argc, argv, options)
-#endif
-
-// my ME
-
-static MeTa *me = NULL;
-string receiveStoreName;        // store name for received SMSs
-
-// service centre address (set on command line)
-
-static string serviceCentreAddress;
-
-// ID if concatenated messages should be sent
-
-static int concatenatedMessageId = -1;
-
-// signal handler for terminate signal
-
-bool terminateSent = false;
-
-void terminateHandler(int signum)
-{
-  terminateSent = true;
-}
-
-// local class to handle SMS events
-
-struct IncomingMessage
-{
-  // used if new message is put into store
-  int _index;                   // -1 means message want send directly
-  string _storeName;
-  // used if SMS message was sent directly to TA
-  SMSMessageRef _newSMSMessage;
-  // used if CB message was sent directly to TA
-  CBMessageRef _newCBMessage;
-  // used in both cases
-  GsmEvent::SMSMessageType _messageType;
-
-  IncomingMessage() : _index(-1) {}
-};
-
-vector<IncomingMessage> newMessages;
-
-class EventHandler : public GsmEvent
-{
-public:
-  // inherited from GsmEvent
-  void SMSReception(SMSMessageRef newMessage,
-                    SMSMessageType messageType);
-  void CBReception(CBMessageRef newMessage);
-  void SMSReceptionIndication(string storeName, unsigned int index,
-                              SMSMessageType messageType);
-
-  virtual ~EventHandler() {}
-};
-
-void EventHandler::SMSReception(SMSMessageRef newMessage,
-                                SMSMessageType messageType)
-{
-  IncomingMessage m;
-  m._messageType = messageType;
-  m._newSMSMessage = newMessage;
-  newMessages.push_back(m);
-}
-
-void EventHandler::CBReception(CBMessageRef newMessage)
-{
-  IncomingMessage m;
-  m._messageType = GsmEvent::CellBroadcastSMS;
-  m._newCBMessage = newMessage;
-  newMessages.push_back(m);
-}
-
-void EventHandler::SMSReceptionIndication(string storeName, unsigned int index,
-                                          SMSMessageType messageType)
-{
-  IncomingMessage m;
-  m._index = index;
-
-  if (receiveStoreName != "" && ( storeName == "MT" || storeName == "mt"))
-    m._storeName = receiveStoreName;
-  else
-    m._storeName = storeName;
-
-  m._messageType = messageType;
-  newMessages.push_back(m);
-}
-
-// execute action on string
-
-void doAction(string action, string result)
-{
-  if (action != "")
-  {
-    FILE *fd = popen(action.c_str(), "w");
-    if (fd == NULL)
-      throw GsmException(stringPrintf(_("could not execute '%s'"),
-                                      action.c_str()), OSError);
-    fputs(result.c_str(), fd);
-    if (ferror(fd))
-      throw GsmException(stringPrintf(_("error writing to '%s'"),
-                                      action.c_str()), OSError);
-    pclose(fd);
-  }
-  else
-    // default if no action: output on stdout
-    cout << result << endl;
-}
-
-// send all SMS messages in spool dir
-
-bool requestStatusReport = false;
-
-void sendSMS(string spoolDirBase, string sentDirBase, string failedDirBase,
-             unsigned int priority, bool enableSyslog, Ref<GsmAt> at)
-{
-  string spoolDir = spoolDirBase;
-  string sentDir = sentDirBase;
-  string failedDir = failedDirBase;
-  if ( priority >= 1 )
-  {
-    spoolDir = spoolDirBase + stringPrintf(_("%d"),priority);
-    sentDir = sentDirBase + stringPrintf(_("%d"),priority);
-    failedDir = failedDirBase + stringPrintf(_("%d"),priority);
-  }
-  if ( priority > 1 )
-    sendSMS(spoolDirBase, sentDirBase, failedDirBase, priority-1, enableSyslog, at);
-  if (spoolDirBase != "")
-  {
-    // look into spoolDir for any outgoing SMS that should be sent
-#ifdef WIN32
-    struct _finddata_t fileInfo;
-	long fileHandle;
-	string pattern = spoolDir + "\\*";
-    fileHandle = _findfirst(pattern.c_str(), &fileInfo);
-	bool moreFiles = fileHandle != -1L;
-#else
-    DIR *dir = opendir(spoolDir.c_str());
-    if (dir == (DIR*)NULL)
-      throw GsmException(
-        stringPrintf(_("error when calling opendir('%s')"
-                       "(errno: %d/%s)"), 
-                     spoolDir.c_str(), errno, strerror(errno)),
-        OSError);
-#endif
-
-#ifdef WIN32
-    while (moreFiles)
-	{
-      if (strcmp(fileInfo.name, ".") != 0 &&
-          strcmp(fileInfo.name, "..") != 0)
-#else
-    struct dirent *entry;
-    while ((entry = readdir(dir)) != (struct dirent*)NULL)
-      if (strcmp(entry->d_name, ".") != 0 &&
-          strcmp(entry->d_name, "..") != 0)
-#endif
-      {
-        if ( priority > 1 )
-          sendSMS(spoolDirBase, sentDirBase, failedDirBase, priority-1, enableSyslog, at);
-        // read in file
-        // the first line is interpreted as the phone number
-        // the rest is the message
-#ifdef WIN32
-        string filename = spoolDir + "\\" + fileInfo.name;
-#else
-        string filename = spoolDir + "/" + entry->d_name;
-#endif
-        ifstream ifs(filename.c_str());
-        if (! ifs)
-#ifndef WIN32
-          if (enableSyslog)
-          {
-            syslog(LOG_WARNING, "Could not open SMS spool file %s",
-                   filename.c_str());
-            if (failedDirBase != "") {
-              string failedfilename = failedDir + "/" + entry->d_name;
-              rename(filename.c_str(),failedfilename.c_str());
-            }
-            continue;
-          }
-          else
-#endif
-          throw GsmException(
-            stringPrintf(_("count not open SMS spool file %s"),
-                         filename.c_str()), ParameterError);
-        char phoneBuf[1001];
-        ifs.getline(phoneBuf, 1000);
-        for(int i=0;i<1000;i++)
-          if(phoneBuf[i]=='\t' || phoneBuf[i]==0)
-          { // ignore everything after a <TAB> in the phone number
-            phoneBuf[i]=0;
-            break;
-          }
-        string text;
-        while (! ifs.eof())
-        {
-          char c;
-          ifs.get(c);
-          text += c;
-        }
-        ifs.close();
-        
-        // remove trailing newline/linefeed
-        while (text[text.length() - 1] == '\n' ||
-               text[text.length() - 1] == '\r')
-          text = text.substr(0, text.length() - 1);
-
-        // send the message
-        string phoneNumber(phoneBuf);
-        Ref<SMSSubmitMessage> submitSMS = new SMSSubmitMessage();
-        // set service centre address in new submit PDU if requested by user
-        if (serviceCentreAddress != "")
-        {
-          Address sca(serviceCentreAddress);
-          submitSMS->setServiceCentreAddress(sca);
-        }
-        submitSMS->setStatusReportRequest(requestStatusReport);
-        Address destAddr(phoneNumber);
-        submitSMS->setDestinationAddress(destAddr);
-        try
-        {
-          if (concatenatedMessageId == -1)
-            me->sendSMSs(submitSMS, text, true);
-          else
-          {
-            // maximum for concatenatedMessageId is 255
-            if (concatenatedMessageId > 256)
-              concatenatedMessageId = 0;
-            me->sendSMSs(submitSMS, text, false, concatenatedMessageId++);
-          }
-#ifndef WIN32
-          if (enableSyslog)
-            syslog(LOG_NOTICE, "Sent SMS to %s from file %s", phoneBuf, filename.c_str());
-#endif
-          if (sentDirBase != "") {
-#ifdef WIN32
-          string sentfilename = sentDir + "\\" + fileInfo.name;
-#else
-          string sentfilename = sentDir + "/" + entry->d_name;
-#endif
-            rename(filename.c_str(),sentfilename.c_str());
-          } else {
-            unlink(filename.c_str());
-          }
-        }
-        catch (GsmException &me)
-        {
-#ifndef WIN32
-          if (enableSyslog)
-            syslog(LOG_WARNING, "Failed sending SMS to %s from file %s: %s", phoneBuf,
-                   filename.c_str(), me.what());
-          else
-#endif
-            cerr << "Failed sending SMS to " << phoneBuf << " from "
-                 << filename << ": " << me.what() << endl;
-          if (failedDirBase != "") {
-#ifdef WIN32
-            string failedfilename = failedDir + "\\" + fileInfo.name;
-#else
-            string failedfilename = failedDir + "/" + entry->d_name;
-#endif
-            rename(filename.c_str(),failedfilename.c_str());
-          }
-        }
-#ifdef WIN32
-      }
-      moreFiles = _findnext(fileHandle, &fileInfo) == 0; 
-#endif
-    }
-#ifdef WIN32
-    _findclose(fileHandle);
-#else
-    closedir(dir);
-#endif
-  }
-}
-
-#ifndef WIN32
-void syslogExit(int exitcode, int *dummy)
-{
-  syslog(LOG_NOTICE, "exited (exit %d)",exitcode);
-}
-#endif
-
-// *** main program
-
-int main(int argc, char *argv[])
-{
-  bool enableSyslog = false;
-  try
-  {
-    string device = "/dev/mobilephone";
-    string action;
-    string baudrate;
-    bool enableSMS = true;
-    bool enableCB = true;
-    bool enableStat = true;
-    bool flushSMS = false;
-    bool onlyReceptionIndication = true;
-    string spoolDir;
-    string sentDir = "";
-    string failedDir = "";
-    unsigned int priorities = 0;
-    string initString = DEFAULT_INIT_STRING;
-    bool swHandshake = false;
-    string concatenatedMessageIdStr;
-
-    int opt;
-    int dummy;
-    while((opt = getopt_long(argc, argv, "c:C:I:t:fd:a:b:hvs:S:F:P:LXDr",
-                             longOpts, &dummy)) != -1)
-      switch (opt)
-      {
-      case 'c':
-        concatenatedMessageIdStr = optarg;
-        break;
-      case 'r':
-        requestStatusReport = true;
-        break;
-      case 'D':
-        onlyReceptionIndication = false;
-        break;
-      case 'X':
-        swHandshake = true;
-        break;
-      case 'I':
-        initString = optarg;
-        break;
-      case 't':
-        receiveStoreName = optarg;
-        break;
-      case 'd':
-        device = optarg;
-        break;
-      case 'C':
-        serviceCentreAddress = optarg;
-        break;
-      case 's':
-        spoolDir = optarg;
-        break;
-      case 'L':
-        enableSyslog = true;
-        break;
-      case 'S':
-        sentDir = optarg;
-        break;
-      case 'F':
-        failedDir = optarg;
-        break;
-      case 'P':
-        priorities = abs(atoi(optarg));
-        break;
-      case 'f':
-        flushSMS = true;
-        break;
-      case 'a':
-        action = optarg;
-        break;
-      case 'b':
-        baudrate = optarg;
-        break;
-      case 'v':
-        cerr << argv[0] << stringPrintf(_(": version %s [compiled %s]"),
-                                        VERSION, __DATE__) << endl;
-        exit(0);
-        break;
-      case 'h':
-        cerr << argv[0] << _(": [-a action][-b baudrate][-C sca][-d device]"
-                             "[-f][-h][-I init string]\n"
-                             "  [-s spool dir][-t][-v]{sms_type}")
-             << endl << endl
-             << _("  -a, --action      the action to execute when an SMS "
-                  "arrives\n"
-                  "                    (SMS is send to stdin of action)")
-             << endl
-             << _("  -b, --baudrate    baudrate to use for device "
-                  "(default: 38400)")
-             << endl
-             << _("  -c, --concatenate start ID for concatenated SMS messages")
-             << endl
-             << _("  -C, --sca         SMS service centre address") << endl
-             << _("  -d, --device      sets the device to connect to") << endl
-             << _("  -D, --direct      enable direct routing of SMSs") << endl
-             << _("  -f, --flush       flush SMS from store") << endl
-             << _("  -F, --failed      directory to move failed SMS to,") << endl
-             << _("                    if unset, the SMS will be deleted") << endl
-             << _("  -h, --help        prints this message") << endl
-             << _("  -I, --init        device AT init sequence") << endl
-#ifndef WIN32
-             << _("  -L, --syslog      log errors and information to syslog")
-             << endl
-#endif
-             << _("  -P, --priorities  number of priority levels to use,") << endl
-             << _("                    (default: none)") << endl
-             << _("  -r, --requeststat request SMS status report") << endl
-             << _("  -s, --spool       spool directory for outgoing SMS")
-             << endl
-             << _("  -S, --sent        directory to move sent SMS to,") << endl
-             << _("                    if unset, the SMS will be deleted") << endl
-             << _("  -t, --store       name of SMS store to use for flush\n"
-                  "                    and/or temporary SMS storage") << endl
-             << endl
-             << _("  -v, --version     prints version and exits") << endl
-             << _("  -X, --xonxoff     switch on software handshake") << endl
-             << endl
-             << _("  sms_type may be any combination of") << endl << endl
-             << _("    sms, no_sms     controls reception of normal SMS")
-             << endl
-             << _("    cb, no_cb       controls reception of cell broadcast"
-                  " messages") << endl
-             << _("    stat, no_stat   controls reception of status reports")
-             << endl << endl
-             << _("  default is \"sms cb stat\"") << endl << endl
-             << _("If no action is given, the SMS is printed to stdout")
-             << endl << endl
-             << _("If -P is given, it activates the priority system and sets the") << endl
-             << _("number or levels to use. For every level, there must be directories") << endl
-             << _("named <spool directory>+<priority level>.") << endl
-             << _("For example \"-P 2 -s queue -S send -F failed\" needs the following") <<endl
-             << _("directories: queue1/ queue2/ send1/ send2/ failed1/ failed2/") <<endl
-             << _("Before sending one SMS from queue2, all pending SMS from queue1") <<endl
-             << _("will be sent.") <<endl
-             << endl << endl;
-        exit(0);
-        break;
-      case '?':
-        throw GsmException(_("unknown option"), ParameterError);
-        break;
-      }
-  
-    // find out which kind of message to route
-    for (int i = optind; i < argc; ++i)
-    {
-      string s = lowercase(argv[i]);
-      if (s == "sms")
-        enableSMS = true;
-      else if (s == "no_sms")
-        enableSMS = false;
-      else if (s == "cb")
-        enableCB = true;
-      else if (s == "no_cb")
-        enableCB = false;
-      else if (s == "stat")
-        enableStat = true;
-      else if (s == "no_stat")
-        enableStat = false;
-    }
-
-    // check parameters
-    if (concatenatedMessageIdStr != "")
-      concatenatedMessageId = checkNumber(concatenatedMessageIdStr);
-    
-    // register signal handler for terminate signal
-#ifndef WIN32
-    struct sigaction terminateAction;
-    terminateAction.sa_handler = terminateHandler;
-    sigemptyset(&terminateAction.sa_mask);
-    terminateAction.sa_flags = SA_RESTART;
-    if (sigaction(SIGINT, &terminateAction, NULL) != 0 ||
-        sigaction(SIGTERM, &terminateAction, NULL) != 0)
-#else
-    if(signal(SIGINT, terminateHandler) == SIG_ERR ||
-        signal(SIGTERM, terminateHandler) == SIG_ERR)
-#endif
-      throw GsmException(
-        stringPrintf(_("error when calling sigaction() (errno: %d/%s)"), 
-                     errno, strerror(errno)),
-        OSError);
-
-    // open GSM device
-    me = new MeTa(new
-#ifdef WIN32
-                  Win32SerialPort
-#else
-                  UnixSerialPort
-#endif
-                  (device,
-                   baudrate == "" ? DEFAULT_BAUD_RATE :
-                   baudRateStrToSpeed(baudrate), initString,
-                   swHandshake));
-
-    // if flush option is given get all SMS from store and dispatch them
-    if (flushSMS)
-    {
-      if (receiveStoreName == "")
-        throw GsmException(_("store name must be given for flush option"),
-                           ParameterError);
-      
-      SMSStoreRef store = me->getSMSStore(receiveStoreName);
-
-      for (SMSStore::iterator s = store->begin(); s != store->end(); ++s)
-        if (! s->empty())
-        {
-          string result = _("Type of message: ");
-          switch (s->message()->messageType())
-          {
-          case SMSMessage::SMS_DELIVER:
-            result += _("SMS message\n");
-            break;
-          case SMSMessage::SMS_SUBMIT_REPORT:
-            result += _("submit report message\n");
-            break;
-          case SMSMessage::SMS_STATUS_REPORT:
-            result += _("status report message\n");
-            break;
-          }
-          result += s->message()->toString();
-          doAction(action, result);
-          store->erase(s);
-        }
-    }
-
-    // set default SMS store if -t option was given or
-    // read from ME otherwise
-    if (receiveStoreName == "")
-    {
-      string dummy1, dummy2;
-      me->getSMSStore(dummy1, dummy2, receiveStoreName );
-    }
-    else
-      me->setSMSStore(receiveStoreName, 3);
-
-    // switch message service level to 1
-    // this enables SMS routing to TA
-    me->setMessageService(1);
-
-    // switch on SMS routing
-    me->setSMSRoutingToTA(enableSMS, enableCB, enableStat,
-                        onlyReceptionIndication);
-
-    // register event handler to handle routed SMSs, CBMs, and status reports
-    me->setEventHandler(new EventHandler());
-    
-    // wait for new messages
-    bool exitScheduled = false;
-    while (1)
-    {
-#ifdef WIN32
-      ::timeval timeoutVal;
-      timeoutVal.tv_sec = 5;
-      timeoutVal.tv_usec = 0;
-      me->waitEvent((gsmlib::timeval *)&timeoutVal);
-#else
-      struct timeval timeoutVal;
-      timeoutVal.tv_sec = 5;
-      timeoutVal.tv_usec = 0;
-      me->waitEvent(&timeoutVal);
-#endif
-      // if it returns, there was an event or a timeout
-      while (newMessages.size() > 0)
-      {
-        // get first new message and remove it from the vector
-        SMSMessageRef newSMSMessage = newMessages.begin()->_newSMSMessage;
-        CBMessageRef newCBMessage = newMessages.begin()->_newCBMessage;
-        GsmEvent::SMSMessageType messageType =
-          newMessages.begin()->_messageType;
-        int index = newMessages.begin()->_index;
-        string storeName = newMessages.begin()->_storeName;
-        newMessages.erase(newMessages.begin());
-
-        // process the new message
-        string result = _("Type of message: ");
-        switch (messageType)
-        {
-        case GsmEvent::NormalSMS:
-          result += _("SMS message\n");
-          break;
-        case GsmEvent::CellBroadcastSMS:
-          result += _("cell broadcast message\n");
-          break;
-        case GsmEvent::StatusReportSMS:
-          result += _("status report message\n");
-          break;
-        }
-        if (! newSMSMessage.isnull())
-          result += newSMSMessage->toString();
-        else if (! newCBMessage.isnull())
-          result += newCBMessage->toString();
-        else
-        {
-          SMSStoreRef store = me->getSMSStore(storeName);
-          store->setCaching(false);
-
-          if (messageType == GsmEvent::CellBroadcastSMS)
-            result += (*store.getptr())[index].cbMessage()->toString();
-          else
-            result += (*store.getptr())[index].message()->toString();
-            
-          store->erase(store->begin() + index);
-        }
-        
-        // call the action
-        doAction(action, result);
-      }
-
-      // if no new SMS came in and program exit was scheduled, then exit
-      if (exitScheduled)
-        exit(0);
-      
-      // handle terminate signal
-      if (terminateSent)
-      {
-        exitScheduled = true;
-        // switch off SMS routing
-        try
-        {
-          me->setSMSRoutingToTA(false, false, false);
-        }
-        catch (GsmException &ge)
-        {
-          // some phones (e.g. Motorola Timeport 260) don't allow to switch
-          // off SMS routing which results in an error. Just ignore this.
-        }
-        // the AT sequences involved in switching of SMS routing
-        // may yield more SMS events, so go round the loop one more time
-      }
-
-      // send spooled SMS
-      if (! terminateSent)
-        sendSMS(spoolDir, sentDir, failedDir, priorities, enableSyslog, me->getAt());
-    }
-  }
-  catch (GsmException &ge)
-  {
-    cerr << argv[0] << _("[ERROR]: ") << ge.what() << endl;
-    if (ge.getErrorClass() == MeTaCapabilityError)
-      cerr << argv[0] << _("[ERROR]: ")
-           << _("(try setting sms_type, please refer to gsmsmsd manpage)")
-           << endl;
-    // switch off message routing, so that following invocations of gsmsmd
-    // are not swamped with message deliveries while they start up
-    if (me != NULL)
-    {
-      try
-      {
-        me->setSMSRoutingToTA(false, false, false);
-      }
-      catch (GsmException &ge)
-      {
-        // some phones (e.g. Motorola Timeport 260) don't allow to switch
-        // off SMS routing which results in an error. Just ignore this.
-      }
-    }
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmsmsstore.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmsmsstore.cc
deleted file mode 100644
index 2bb50a0c76..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/apps/gsmsmsstore.cc
+++ /dev/null
@@ -1,434 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsmsmsstore.cc
-// *
-// * Purpose: SMS store management program
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 4.8.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <string>
-#include <ctype.h>
-#ifdef WIN32
-#include <gsmlib/gsm_win32_serial.h>
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#include <unistd.h>
-#endif
-#if defined(HAVE_GETOPT_LONG) || defined(WIN32)
-#include <getopt.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_sorted_sms_store.h>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longOpts[] =
-{
-  {"xonxoff", no_argument, (int*)NULL, 'X'},
-  {"init", required_argument, (int*)NULL, 'I'},
-  {"store", required_argument, (int*)NULL, 't'},
-  {"erase", no_argument, (int*)NULL, 'e'},
-  {"add", no_argument, (int*)NULL, 'a'},
-  {"list", no_argument, (int*)NULL, 'l'},
-  {"destination", required_argument, (int*)NULL, 'd'},
-  {"source", required_argument, (int*)NULL, 's'},
-  {"baudrate", required_argument, (int*)NULL, 'b'},
-  {"sca", required_argument, (int*)NULL, 'C'},
-  {"copy", no_argument, (int*)NULL, 'c'},
-  {"delete", no_argument, (int*)NULL, 'x'},
-  {"backup", no_argument, (int*)NULL, 'k'},
-  {"help", no_argument, (int*)NULL, 'h'},
-  {"version", no_argument, (int*)NULL, 'v'},
-  {"verbose", no_argument, (int*)NULL, 'V'},
-  {(char*)NULL, 0, (int*)NULL, 0}
-};
-#else
-#define getopt_long(argc, argv, options, longopts, indexptr) \
-  getopt(argc, argv, options)
-#endif
-
-bool verbose = false;           // true if --verbose option given
-
-// type of operation to perform
-
-enum Operation {CopyOp = 'c', BackupOp = 'k', DeleteOp = 'x',
-                AddOp = 'a', ListOp = 'l', NoOp = 0};
-
-// aux function, insert entry only if not already present in dest
-
-void backup(SortedSMSStoreRef destStore, SMSStoreEntry &entry)
-{
-  // the following only works because we know that the default sort order
-  // is by date
-  assert(destStore->sortOrder() == ByDate);
-
-  Timestamp date = entry.message()->serviceCentreTimestamp();
-  pair<SortedSMSStore::iterator, SortedSMSStore::iterator> range =
-    destStore->equal_range(date);
-          
-  for (SortedSMSStore::iterator j = range.first;
-       j != range.second; ++j)
-    if (entry == *j)
-      // do nothing if the entry is already present in the destination
-      return;
-
-  if (verbose)
-    cout << stringPrintf(_("inserting entry #%d from source into destination"),
-                         entry.index()) << endl
-         << entry.message()->toString();
-  destStore->insert(entry);     // insert
-}
-
-// aux function, throw exception if operation != NoOp
-
-void checkNoOp(Operation operation, int opt)
-{
-  if (operation != NoOp)
-    throw GsmException(stringPrintf(_("incompatible options '%c' and '%c'"),
-                                    (char)operation, (char)opt),
-                       ParameterError);
-}
-
-// *** main program
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    // handle command line options
-    string destination;
-    string source;
-    string baudrate;
-    string storeName;
-    char operation = NoOp;
-    SortedSMSStoreRef sourceStore, destStore;
-    bool useIndices = false;    // use indices in delete, copy, backup op
-    string initString = DEFAULT_INIT_STRING;
-    bool swHandshake = false;
-    // service centre address (set on command line)
-    string serviceCentreAddress;
-    Ref<MeTa> sourceMeTa, destMeTa;
-
-    int opt;
-    int dummy;
-    while((opt = getopt_long(argc, argv, "I:t:s:d:b:cxlakhvVXC:",
-                             longOpts, &dummy))
-          != -1)
-      switch (opt)
-      {
-      case 'C':
-        serviceCentreAddress = optarg;
-        break;
-      case 'X':
-        swHandshake = true;
-        break;
-      case 'I':
-        initString = optarg;
-        break;
-      case 'V':
-        verbose = true;
-        break;
-      case 't':
-        storeName = optarg;
-        break;
-      case 'd':
-        destination = optarg;
-        break;
-      case 's':
-        source = optarg;
-        break;
-      case 'b':
-        baudrate = optarg;
-        break;
-      case 'c':
-        checkNoOp((Operation)operation, opt);
-        operation = CopyOp;
-        break;
-      case 'x':
-        checkNoOp((Operation)operation, opt);
-        operation = DeleteOp;
-        break;
-      case 'l':
-        checkNoOp((Operation)operation, opt);
-        operation = ListOp;
-        break;
-      case 'a':
-        checkNoOp((Operation)operation, opt);
-        operation = AddOp;
-        break;
-      case 'k':
-        checkNoOp((Operation)operation, opt);
-        operation = BackupOp;
-        break;
-      case 'v':
-        cerr << argv[0] << stringPrintf(_(": version %s [compiled %s]"),
-                                        VERSION, __DATE__) << endl;
-        exit(0);
-        break;
-      case 'h':
-        cerr << argv[0] << _(": [-a][-b baudrate][-c][-C sca]"
-                             "[-d device or file]\n"
-                             "  [-h][-I init string][-k][-l]"
-                             "[-s device or file]"
-                             "[-t SMS store name]\n  [-v][-V][-x][-X]"
-                             "{indices}|[phonenumber text]") << endl
-             << endl
-             << _("  -a, --add         add new SMS submit message\n"
-                  "                    (phonenumber and text) to destination")
-             << endl
-             << _("  -b, --baudrate    baudrate to use for device "
-                  "(default: 38400)")
-             << endl
-             << _("  -c, --copy        copy source entries to destination\n"
-                  "                    (if indices are given, "
-                  "copy only these entries)") << endl
-             << _("  -C, --sca         SMS service centre address") << endl
-             << _("  -d, --destination sets the destination device to\n"
-                  "                    connect to, or the file to write to")
-             << endl
-             << _("  -h, --help        prints this message") << endl
-             << _("  -I, --init        device AT init sequence") << endl
-             << _("  -k, --backup      backup new entries to destination\n"
-                  "                    (if indices are given, "
-                  "copy only these entries)") << endl
-             << _("  -l, --list        list source to stdout") << endl
-             << _("  -s, --source      sets the source device to connect to,\n"
-                  "                    or the file to read") << endl
-             << _("  -t, --store       name of SMS store to use") << endl
-             << _("  -v, --version     prints version and exits") << endl
-             << _("  -V, --verbose     print detailed progress messages")
-             << endl
-             << _("  -x, --delete      delete entries denoted by indices")
-             << endl
-             << _("  -X, --xonxoff     switch on software handshake") << endl
-             << endl;
-        exit(0);
-        break;
-      case '?':
-        throw GsmException(_("unknown option"), ParameterError);
-        break;
-      }
-
-    // check if parameters are complete
-    if (operation == NoOp)
-      throw GsmException(_("no operation option given"), ParameterError);
-    if (operation == BackupOp || operation == CopyOp)
-      if (destination.length() == 0 || source.length() == 0)
-        throw GsmException(_("both source and destination required"),
-                           ParameterError);
-    if (operation == ListOp)
-    {
-      if (destination.length() != 0)
-        throw GsmException(_("destination must not be given"), ParameterError);
-      if (source.length() == 0)
-        throw GsmException(_("source required"), ParameterError);
-    }
-    if (operation == AddOp || operation == DeleteOp)
-    {
-      if (source.length() != 0)
-        throw GsmException(_("source must not be given"), ParameterError);
-      if (destination.length() == 0)
-        throw GsmException(_("destination required"), ParameterError);
-    }
-    if (operation == CopyOp || operation == DeleteOp || operation == BackupOp)
-    {
-      // check if all indices are numbers
-      for (int i = optind; i < argc; ++i)
-        for (char *pp = argv[i]; *pp != 0; ++pp)
-          if (! isdigit(*pp))
-            throw GsmException(stringPrintf(_("expected number, got '%s'"),
-                                            argv[i]), ParameterError);
-      useIndices = optind != argc;
-    }
-    else if (operation == AddOp)
-    {
-      if (optind + 2 < argc)
-        throw GsmException(_("more than two parameters given"),
-                           ParameterError);
-      if (optind + 2 > argc)
-        throw GsmException(_("not enough parameters given"),
-                           ParameterError);
-    }
-    else
-      if (optind != argc)
-        throw GsmException(_("unexpected parameters"), ParameterError);
-    
-    // start accessing source store or file if required by operation
-    if (operation == CopyOp || operation == BackupOp || operation == ListOp)
-      if (source == "-")
-        sourceStore = new SortedSMSStore(true);
-      else if (isFile(source))
-        sourceStore = new SortedSMSStore(source);
-      else
-      {
-        if (storeName == "")
-          throw GsmException(_("store name must be given"), ParameterError);
-        
-        sourceMeTa = new MeTa(new
-#ifdef WIN32
-                              Win32SerialPort
-#else
-                              UnixSerialPort
-#endif
-                              (source,
-                               baudrate == "" ? DEFAULT_BAUD_RATE :
-                               baudRateStrToSpeed(baudrate), initString,
-                               swHandshake));
-        sourceStore = new SortedSMSStore(sourceMeTa->getSMSStore(storeName));
-      }
-      
-    // make sure destination file exists if specified
-    // Use isFile() for its exception-throwing properties, and discard
-    // return value cos we don't care (yet) whether it's a device or a
-    // regular file.
-    if (destination != "")
-      isFile(destination);
-
-    // start accessing destination store or file
-    if (operation == CopyOp || operation == BackupOp || operation == AddOp ||
-        operation == DeleteOp)
-      if (destination == "-")
-        destStore = new SortedSMSStore(false);
-      else if (isFile(destination))
-        destStore = new SortedSMSStore(destination);
-      else
-      {
-        if (storeName == "")
-          throw GsmException(_("store name must be given"), ParameterError);
-        
-        destMeTa = new MeTa(new
-#ifdef WIN32
-                            Win32SerialPort
-#else
-                            UnixSerialPort
-#endif
-                            (destination,
-                             baudrate == "" ? DEFAULT_BAUD_RATE :
-                             baudRateStrToSpeed(baudrate), initString,
-                             swHandshake));
-        destStore = new SortedSMSStore(destMeTa->getSMSStore(storeName));      
-      }
-
-    // now do the actual work
-    switch (operation)
-    {
-    case BackupOp:
-    {
-      sourceStore->setSortOrder(ByIndex); // needed in loop
-
-      if (useIndices)
-        for (int i = optind; i < argc; ++i)
-        {
-          SortedSMSStore::iterator j = sourceStore->find(atoi(argv[i]));
-          if (j == sourceStore->end())
-            throw GsmException(stringPrintf(_("no index '%s' in source"),
-                                            argv[i]), ParameterError);
-          backup(destStore, *j);
-        }
-      else
-        for (SortedSMSStore::iterator i = sourceStore->begin();
-             i != sourceStore->end(); ++i)
-          backup(destStore, *i);
-      break;
-    }
-    case CopyOp:
-    {                        
-      destStore->clear();
-      if (! useIndices)         // copy all entries
-      {
-        for (SortedSMSStore::iterator i = sourceStore->begin();
-             i != sourceStore->end(); ++i)
-        {
-          if (verbose)
-            cout << stringPrintf(_("inserting entry #%d from source "
-                                   "into destination"), i->index()) << endl
-                 << i->message()->toString();
-          destStore->insert(*i);
-        }
-      }
-      else                      // copy indexed entries
-      {
-        sourceStore->setSortOrder(ByIndex); // needed in loop
-
-        for (int i = optind; i < argc; ++i)
-        {
-          SortedSMSStore::iterator j = sourceStore->find(atoi(argv[i]));
-          if (j == sourceStore->end())
-            throw GsmException(stringPrintf(_("no index '%s' in source"),
-                                            argv[i]), ParameterError);
-          if (verbose)
-            cout << stringPrintf(_("inserting entry #%d from source into "
-                                   "destination"), j->index()) << endl
-                 << j->message()->toString();
-          destStore->insert(*j);
-        }
-      }
-      break;
-    }
-    case ListOp:
-    {
-      for (SortedSMSStore::iterator i = sourceStore->begin();
-           i != sourceStore->end(); ++i)
-        cout << stringPrintf(_("index #%d"), i->index()) << endl
-             << i->message()->toString();
-      break;
-    }
-    case AddOp:
-    {
-      SMSMessageRef sms = new SMSSubmitMessage(argv[optind + 1], argv[optind]);
-      // set service centre address in new submit PDU if requested by user
-      if (serviceCentreAddress != "")
-      {
-        Address sca(serviceCentreAddress);
-        sms->setServiceCentreAddress(sca);
-      }
-      if (verbose)
-        cout << _("inserting new entry into destination") << endl
-             << sms->toString();
-      destStore->insert(sms);
-      break;
-    }
-    case DeleteOp:
-    {
-      destStore->setSortOrder(ByIndex);
-      for (int i = optind; i < argc; ++i)
-      {
-        int index = atoi(argv[i]);
-        if (verbose)
-        {
-          SortedSMSStore::iterator e = destStore->find(index);
-          if (e != destStore->end())
-            cout << stringPrintf(_("deleting entry #%d from destination"),
-                                 index) << endl
-                 << e->message()->toString();
-        }
-        if (destStore->erase(index) != 1)
-          throw GsmException(stringPrintf(_("no index '%s' in destination"),
-                                          argv[i]), ParameterError);
-      }
-      break;
-    }
-    }
-  }
-  catch (GsmException &ge)
-  {
-    cerr << argv[0] << _("[ERROR]: ") << ge.what() << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure
deleted file mode 100755
index 5918af81fb..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure
+++ /dev/null
@@ -1,30623 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="gsmlib/gsm_error.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA GSM_VERSION MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB COMPILE_INTL_TRUE COMPILE_INTL_FALSE LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-shared[=PKGS]
-                          build shared libraries [default=yes]
-  --enable-static[=PKGS]
-                          build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-nls           do not use Native Language Support
-  --disable-rpath         do not hardcode runtime library paths
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-tags[=TAGS]
-                          include additional configurations [automatic]
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
-  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
-  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
-  --with-included-gettext use the GNU gettext library included here
-  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
-  --without-libintl-prefix     don't search for libintl in includedir and libdir
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd "$ac_popdir"
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in scripts $srcdir/scripts; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts $srcdir/scripts" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in scripts $srcdir/scripts" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5
-echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6
-if test "${ac_cv_lib_intl_textdomain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char textdomain ();
-int
-main ()
-{
-textdomain ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_intl_textdomain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_intl_textdomain=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_textdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_textdomain" >&6
-if test $ac_cv_lib_intl_textdomain = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBINTL 1
-_ACEOF
-
-  LIBS="-lintl $LIBS"
-
-fi
-
-
-          ac_config_headers="$ac_config_headers gsm_config.h"
-
-
-am__api_version="1.9"
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$AWK" && break
-done
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-DEPDIR="${am__leading_dot}deps"
-
-          ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
-
-fi;
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE=gsmlib
- VERSION=1.10
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi;
-
-
-if test "$CXXFLAGS" = ""; then
-   CXXFLAGS="-O2"
-fi
-
-
-
-if test x"`egrep _REENTRANT /usr/include/features.h`" != x; then
-  CXXFLAGS="-D_REENTRANT $CXXFLAGS"
-  CFLAGS="-D_REENTRANT $CFLAGS"
-fi
-
-CXXFLAGS="-Wall $CXXFLAGS"
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi;
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi;
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-
-fi
-
-SED=$lt_cv_path_SED
-echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
-
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
-	  break
-	  ;;
-	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	  ;;
-	esac
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
-NM="$lt_cv_path_NM"
-
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
-fi
-
-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-
-fi;
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 3740 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  lt_cv_cc_needs_belf=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-lt_cv_cc_needs_belf=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
-  CXX=$ac_ct_CXX
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-fi
-
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_F77" && break
-done
-
-  F77=$ac_ct_F77
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:5311:" \
-     "checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_f77_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_f77_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
-
-G77=`test $ac_compiler_gnu = yes && echo yes`
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-else
-  echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
-fi
-
-
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDGIRSTW]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris* | sysv5*)
-  symcode='[BDRT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-else
-  echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
-fi
-
-echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6
-objdir=$lt_cv_objdir
-
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  AR=$ac_ct_AR
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-enable_dlopen=no
-enable_win32_dll=no
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-
-fi;
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi;
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    lt_prog_cc_shlib='-belf'
-    ;;
-  esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-    lt_cv_prog_cc_can_build_shared=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-       $SED '/^$/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works=yes
-       fi
-     else
-       lt_prog_compiler_static_works=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6407: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:6411: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic='-qnocommon'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic='-Kpic'
-      lt_prog_compiler_static='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6669: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:6673: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
-
-if test x"$lt_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6731: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:6735: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag=
-  enable_shared_with_static_runtimes=no
-  archive_cmds=
-  archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
-  export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_direct=no
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  link_all_deplibs=unknown
-  hardcode_automatic=no
-  module_cmds=
-  module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-	link_all_deplibs=no
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L=yes
-  	  hardcode_libdir_flag_spec='-L$libdir'
-  	  hardcode_libdir_separator=
-	  fi
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec=' '
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc=no
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec=''
-      link_all_deplibs=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      link_all_deplibs=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      hardcode_shlibpath_var=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec=
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6
-test "$ld_shlibs" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var" || \
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 8983 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 9081 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# Report which librarie types wil actually be built
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    exclude_expsyms \
-    include_expsyms; do
-
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
-
-  cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program 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.
-#
-# This program 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
-
-
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-# Check whether --with-tags or --without-tags was given.
-if test "${with_tags+set}" = set; then
-  withval="$with_tags"
-  tagnames="$withval"
-fi;
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-    else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    fi
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-    "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_automatic_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
-  lt_prog_compiler_no_builtin_flag_CXX=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_CXX=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-ld_shlibs_CXX=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    archive_cmds_CXX=''
-    hardcode_direct_CXX=yes
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
-	else
-	  # We have old collect2
-	  hardcode_direct_CXX=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L_CXX=yes
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  hardcode_libdir_separator_CXX=
-	fi
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    always_export_symbols_CXX=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag_CXX='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	no_undefined_flag_CXX=' ${wl}-bernotok'
-	allow_undefined_flag_CXX=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	always_export_symbols_CXX=yes
-	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX=' '
-	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=unsupported
-    always_export_symbols_CXX=no
-    enable_shared_with_static_runtimes_CXX=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
-      archive_cmds_need_lc_CXX=no
-      hardcode_direct_CXX=no
-      hardcode_automatic_CXX=yes
-      hardcode_shlibpath_var_CXX=unsupported
-      whole_archive_flag_spec_CXX=''
-      link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
-      output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
-      fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_CXX=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  freebsd[12]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    ld_shlibs_CXX=no
-    ;;
-  freebsd-elf*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    hardcode_direct_CXX=yes
-    hardcode_minus_L_CXX=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      ld_shlibs_CXX=no
-      ;;
-    aCC*)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      case $host_cpu in
-      hppa*64*)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-	hardcode_libdir_separator_CXX=:
-        ;;
-      ia64*)
-	hardcode_libdir_flag_spec_CXX='-L$libdir'
-        ;;
-      *)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-	export_dynamic_flag_spec_CXX='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    *)
-      hardcode_direct_CXX=yes
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    ia64*|hppa*64*)
-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	      ;;
-	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	link_all_deplibs_CXX=yes
-	;;
-    esac
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	archive_cmds_need_lc_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC*)
-        # Portland Group C++ compiler
-	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      hardcode_libdir_flag_spec_CXX='-R$libdir'
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    ld_shlibs_CXX=no
-    ;;
-  openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    fi
-    output_verbose_link_cmd='echo'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  sco*)
-    archive_cmds_need_lc_CXX=no
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        archive_cmds_need_lc_CXX=yes
-	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-R$libdir'
-	hardcode_shlibpath_var_CXX=no
-	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	link_all_deplibs_CXX=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-GCC_CXX="$GXX"
-LD_CXX="$LD"
-
-
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$rm -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-case $host_os in
-solaris*)
-  case $cc_basename in
-  CC*)
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
-    ;;
-  esac
-esac
-
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
-
-lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           lt_prog_compiler_pic_CXX='-qnocommon'
-           lt_prog_compiler_wl_CXX='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC*)
-	    # Portland Group C++ compiler.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      sco*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      unixware*)
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11334: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:11338: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11396: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:11400: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux*)
-    link_all_deplibs_CXX=no
-  ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var_CXX" || \
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
-
-if test "$hardcode_action_CXX" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12781 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12879 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
-
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-GCC_F77="$G77"
-LD_F77="$LD"
-
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_F77=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_F77=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      else
-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_F77='-qnocommon'
-         lt_prog_compiler_wl_F77='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-KPIC'
-	lt_prog_compiler_static_F77='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-fpic'
-	lt_prog_compiler_static_F77='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic_F77='-Kpic'
-      lt_prog_compiler_static_F77='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_F77='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_F77='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_F77='-Kconform_pic'
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13764: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:13768: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_F77=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13826: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:13830: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_F77=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_F77=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_F77=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_F77=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_F77=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=no
-      enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-	link_all_deplibs_F77=no
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_F77" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_F77=
-      export_dynamic_flag_spec_F77=
-      whole_archive_flag_spec_F77=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_F77=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_F77=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_F77=yes
-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-  	  hardcode_libdir_separator_F77=
-	  fi
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_F77=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_F77=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77=' '
-	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_F77=no
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77=''
-      link_all_deplibs_F77=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_F77=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_F77=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_F77='-L$libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      link_all_deplibs_F77=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-	  hardcode_direct_F77=no
-        ;;
-	motorola)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_F77=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_F77=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag_F77=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_F77=
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var_F77" || \
-   test "X$hardcode_automatic_F77" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
-
-if test "$hardcode_action_F77" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
-
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
-
-old_archive_cmds_GCJ=$old_archive_cmds
-
-
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15967: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:15971: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_GCJ=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_GCJ=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_GCJ='-qnocommon'
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-KPIC'
-	lt_prog_compiler_static_GCJ='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-fpic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic_GCJ='-Kpic'
-      lt_prog_compiler_static_GCJ='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_GCJ='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16229: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:16233: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16291: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:16295: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_GCJ=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_GCJ=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_GCJ=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_GCJ=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_GCJ=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=no
-      enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-	link_all_deplibs_GCJ=no
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_GCJ" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_GCJ=
-      export_dynamic_flag_spec_GCJ=
-      whole_archive_flag_spec_GCJ=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_GCJ=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_GCJ=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_GCJ=yes
-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-  	  hardcode_libdir_separator_GCJ=
-	  fi
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_GCJ=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
-	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_GCJ=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ=' '
-	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_GCJ='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_GCJ=no
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ=''
-      link_all_deplibs_GCJ=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_GCJ=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_GCJ=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=yes
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-	  hardcode_direct_GCJ=no
-        ;;
-	motorola)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_GCJ=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_GCJ=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag_GCJ=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_GCJ=
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_GCJ
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_GCJ=no
-        else
-	  archive_cmds_need_lc_GCJ=yes
-        fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var_GCJ" || \
-   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 18543 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 18641 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	;;
-
-      *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
-  CXX=$ac_ct_CXX
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-
-if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <unistd.h>
-main()
-{
-#if defined(__GNUC__) && \
-    ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
-    return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-echo "need at least gcc 2.95 to compile correctly"
-exit 1
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_working_alloca_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_working_alloca_h=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_alloca_works=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_alloca_works=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-
-if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=alloca.$ac_objext
-
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
-
-  done
-fi
-
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-
-int
-main ()
-{
-  exit (find_stack_direction () < 0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_stack_direction=1
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-
-echo "$as_me:$LINENO: checking for getopt_long in -lc" >&5
-echo $ECHO_N "checking for getopt_long in -lc... $ECHO_C" >&6
-if test "${ac_cv_lib_c_getopt_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char getopt_long ();
-int
-main ()
-{
-getopt_long ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_c_getopt_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_getopt_long=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_getopt_long" >&5
-echo "${ECHO_T}$ac_cv_lib_c_getopt_long" >&6
-if test $ac_cv_lib_c_getopt_long = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETOPT_LONG 1
-_ACEOF
-
-fi
-
-
-echo "$as_me:$LINENO: checking for alarm in -lc" >&5
-echo $ECHO_N "checking for alarm in -lc... $ECHO_C" >&6
-if test "${ac_cv_lib_c_alarm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char alarm ();
-int
-main ()
-{
-alarm ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_c_alarm=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_alarm=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_alarm" >&5
-echo "${ECHO_T}$ac_cv_lib_c_alarm" >&6
-if test $ac_cv_lib_c_alarm = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALARM 1
-_ACEOF
-
-fi
-
-
-
-for ac_header in netinet/in.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in string.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in libintl.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset x;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-  }
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "vsnprintf" >/dev/null 2>&1; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_VSNPRINTF 1
-_ACEOF
-
-fi
-rm -f conftest*
-
-
-echo "$as_me:$LINENO: checking for unsigned short int" >&5
-echo $ECHO_N "checking for unsigned short int... $ECHO_C" >&6
-if test "${ac_cv_type_unsigned_short_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((unsigned short int *) 0)
-  return 0;
-if (sizeof (unsigned short int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_unsigned_short_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_unsigned_short_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_short_int" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_short_int" >&6
-
-echo "$as_me:$LINENO: checking size of unsigned short int" >&5
-echo $ECHO_N "checking size of unsigned short int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_unsigned_short_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_unsigned_short_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned short int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned short int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned short int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned short int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned short int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_unsigned_short_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned short int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (unsigned short int)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned short int)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (unsigned short int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (unsigned short int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (unsigned short int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_unsigned_short_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned short int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_unsigned_short_int=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_short_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_short_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_SHORT_INT $ac_cv_sizeof_unsigned_short_int
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for unsigned long int" >&5
-echo $ECHO_N "checking for unsigned long int... $ECHO_C" >&6
-if test "${ac_cv_type_unsigned_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((unsigned long int *) 0)
-  return 0;
-if (sizeof (unsigned long int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_unsigned_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_unsigned_long_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long_int" >&6
-
-echo "$as_me:$LINENO: checking size of unsigned long int" >&5
-echo $ECHO_N "checking size of unsigned long int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_unsigned_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_unsigned_long_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_unsigned_long_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (unsigned long int)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned long int)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (unsigned long int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (unsigned long int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (unsigned long int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_unsigned_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_unsigned_long_int=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_LONG_INT $ac_cv_sizeof_unsigned_long_int
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for unsigned int" >&5
-echo $ECHO_N "checking for unsigned int... $ECHO_C" >&6
-if test "${ac_cv_type_unsigned_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((unsigned int *) 0)
-  return 0;
-if (sizeof (unsigned int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_unsigned_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_unsigned_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6
-
-echo "$as_me:$LINENO: checking size of unsigned int" >&5
-echo $ECHO_N "checking size of unsigned int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_unsigned_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_unsigned_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_unsigned_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (unsigned int)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned int)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (unsigned int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (unsigned int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (unsigned int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_unsigned_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_unsigned_int=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
-_ACEOF
-
-
-
-GSM_VERSION="1:4:0"
-
-
-LINGUAS="de"
-ALL_LINGUAS=$LINGUAS
-
-
-        MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-
-
-
-  echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-    # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-  USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi;
-  echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
-
-
-
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$MSGFMT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-    ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-
-if test -n "$GMSGFMT"; then
-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$XGETTEXT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-    ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    rm -f messages.po
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$MSGMERGE" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
-            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-    ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-      if test "$GMSGFMT" != ":"; then
-            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
-      GMSGFMT=":"
-    fi
-  fi
-
-      if test "$XGETTEXT" != ":"; then
-            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
-      XGETTEXT=":"
-    fi
-        rm -f messages.po
-  fi
-
-            ac_config_commands="$ac_config_commands default-1"
-
-
-
-    echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2 or newer" >&5
-echo $ECHO_N "checking whether we are using the GNU C Library 2 or newer... $ECHO_C" >&6
-if test "${ac_cv_gnu_library_2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2)
-  Lucky GNU user
- #endif
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1; then
-  ac_cv_gnu_library_2=yes
-else
-  ac_cv_gnu_library_2=no
-fi
-rm -f conftest*
-
-
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2" >&5
-echo "${ECHO_T}$ac_cv_gnu_library_2" >&6
-
-    GLIBC2="$ac_cv_gnu_library_2"
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-if test "${ac_cv_search_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6
-if test "$ac_cv_search_strerror" != no; then
-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
-
-fi
-
-
-  echo "$as_me:$LINENO: checking for signed" >&5
-echo $ECHO_N "checking for signed... $ECHO_C" >&6
-if test "${bh_cv_c_signed+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-signed char x;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  bh_cv_c_signed=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-bh_cv_c_signed=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
-echo "${ECHO_T}$bh_cv_c_signed" >&6
-  if test $bh_cv_c_signed = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define signed
-_ACEOF
-
-  fi
-
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((off_t *) 0)
-  return 0;
-if (sizeof (off_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_off_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_off_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6
-if test $ac_cv_type_off_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
-_ACEOF
-
-fi
-
-
-  echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-long long ll = 1LL; int i = 63;
-int
-main ()
-{
-long long llmax = (long long) -1;
-     return ll << i | ll >> i | llmax / ll | llmax % ll;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_long=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
-  if test $ac_cv_type_long_long = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG 1
-_ACEOF
-
-  fi
-
-
-  echo "$as_me:$LINENO: checking for long double" >&5
-echo $ECHO_N "checking for long double... $ECHO_C" >&6
-if test "${gt_cv_c_long_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$GCC" = yes; then
-       gt_cv_c_long_double=yes
-     else
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
-         long double foo = 0.0;
-         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
-         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_c_long_double=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_c_long_double=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-     fi
-fi
-echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
-echo "${ECHO_T}$gt_cv_c_long_double" >&6
-  if test $gt_cv_c_long_double = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_DOUBLE 1
-_ACEOF
-
-  fi
-
-
-  echo "$as_me:$LINENO: checking for wchar_t" >&5
-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
-if test "${gt_cv_c_wchar_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-       wchar_t foo = (wchar_t)'\0';
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_c_wchar_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_c_wchar_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
-echo "${ECHO_T}$gt_cv_c_wchar_t" >&6
-  if test $gt_cv_c_wchar_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WCHAR_T 1
-_ACEOF
-
-  fi
-
-
-  echo "$as_me:$LINENO: checking for wint_t" >&5
-echo $ECHO_N "checking for wint_t... $ECHO_C" >&6
-if test "${gt_cv_c_wint_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <wchar.h>
-       wint_t foo = (wchar_t)'\0';
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_c_wint_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_c_wint_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
-echo "${ECHO_T}$gt_cv_c_wint_t" >&6
-  if test $gt_cv_c_wint_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINT_T 1
-_ACEOF
-
-  fi
-
-
-  echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
-if test "${gl_cv_header_inttypes_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <inttypes.h>
-int
-main ()
-{
-uintmax_t i = (uintmax_t) -1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gl_cv_header_inttypes_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gl_cv_header_inttypes_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6
-  if test $gl_cv_header_inttypes_h = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-_ACEOF
-
-  fi
-
-
-  echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
-if test "${gl_cv_header_stdint_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <stdint.h>
-int
-main ()
-{
-uintmax_t i = (uintmax_t) -1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gl_cv_header_stdint_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gl_cv_header_stdint_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
-echo "${ECHO_T}$gl_cv_header_stdint_h" >&6
-  if test $gl_cv_header_stdint_h = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-_ACEOF
-
-  fi
-
-
-
-
-  echo "$as_me:$LINENO: checking for intmax_t" >&5
-echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6
-if test "${gt_cv_c_intmax_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-
-int
-main ()
-{
-intmax_t x = -1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_c_intmax_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_c_intmax_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
-echo "${ECHO_T}$gt_cv_c_intmax_t" >&6
-  if test $gt_cv_c_intmax_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INTMAX_T 1
-_ACEOF
-
-  fi
-
-
-
-  echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
-echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6
-if test "${gt_cv_func_printf_posix+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-      if test "$cross_compiling" = yes; then
-
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
-  notposix
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "notposix" >/dev/null 2>&1; then
-  gt_cv_func_printf_posix="guessing no"
-else
-  gt_cv_func_printf_posix="guessing yes"
-fi
-rm -f conftest*
-
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_printf_posix=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_func_printf_posix=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-fi
-echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
-echo "${ECHO_T}$gt_cv_func_printf_posix" >&6
-  case $gt_cv_func_printf_posix in
-    *yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_PRINTF 1
-_ACEOF
-
-      ;;
-  esac
-
-
-
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_func in getpagesize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the file system buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propagated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !STDC_HEADERS && !HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#if !HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h.  */
-# if !HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  if HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
-  char *data, *data2, *data3;
-  int i, pagesize;
-  int fd;
-
-  pagesize = getpagesize ();
-
-  /* First, make a file with some known garbage in it. */
-  data = (char *) malloc (pagesize);
-  if (!data)
-    exit (1);
-  for (i = 0; i < pagesize; ++i)
-    *(data + i) = rand ();
-  umask (0);
-  fd = creat ("conftest.mmap", 0600);
-  if (fd < 0)
-    exit (1);
-  if (write (fd, data, pagesize) != pagesize)
-    exit (1);
-  close (fd);
-
-  /* Next, try to mmap the file at a fixed address which already has
-     something else allocated at it.  If we can, also make sure that
-     we see the same garbage.  */
-  fd = open ("conftest.mmap", O_RDWR);
-  if (fd < 0)
-    exit (1);
-  data2 = (char *) malloc (2 * pagesize);
-  if (!data2)
-    exit (1);
-  data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
-  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
-    exit (1);
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data2 + i))
-      exit (1);
-
-  /* Finally, make sure that changes to the mapped area do not
-     percolate back to the file as seen by read().  (This is a bug on
-     some variants of i386 svr4.0.)  */
-  for (i = 0; i < pagesize; ++i)
-    *(data2 + i) = *(data2 + i) + 1;
-  data3 = (char *) malloc (pagesize);
-  if (!data3)
-    exit (1);
-  if (read (fd, data3, pagesize) != pagesize)
-    exit (1);
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data3 + i))
-      exit (1);
-  close (fd);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
-
-fi
-rm -f conftest.mmap
-
-
-    echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
-echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1; then
-  ac_cv_gnu_library_2_1=yes
-else
-  ac_cv_gnu_library_2_1=no
-fi
-rm -f conftest*
-
-
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
-
-    GLIBC21="$ac_cv_gnu_library_2_1"
-
-
-
-
-  echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
-echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6
-if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-      if test "$cross_compiling" = yes; then
-
-          # Guess based on the CPU.
-          case "$host_cpu" in
-            alpha* | i3456786 | m68k | s390*)
-              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-            *)
-              gt_cv_int_divbyzero_sigfpe="guessing no";;
-          esac
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (1);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_int_divbyzero_sigfpe=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_int_divbyzero_sigfpe=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-fi
-echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
-echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-
-cat >>confdefs.h <<_ACEOF
-#define INTDIV0_RAISES_SIGFPE $value
-_ACEOF
-
-
-
-  echo "$as_me:$LINENO: checking for unsigned long long" >&5
-echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
-if test "${ac_cv_type_unsigned_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-unsigned long long ull = 1ULL; int i = 63;
-int
-main ()
-{
-unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_unsigned_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_unsigned_long_long=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
-  if test $ac_cv_type_unsigned_long_long = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG 1
-_ACEOF
-
-  fi
-
-
-
-
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-
-cat >>confdefs.h <<_ACEOF
-#define uintmax_t $ac_type
-_ACEOF
-
-  else
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTMAX_T 1
-_ACEOF
-
-  fi
-
-
-  echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
-if test "${gt_cv_header_inttypes_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <inttypes.h>
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_header_inttypes_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_header_inttypes_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6
-  if test $gt_cv_header_inttypes_h = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H 1
-_ACEOF
-
-  fi
-
-
-
-  if test $gt_cv_header_inttypes_h = yes; then
-    echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
-echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6
-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_inttypes_pri_broken=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_inttypes_pri_broken=yes
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
-echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define PRI_MACROS_BROKEN 1
-_ACEOF
-
-  fi
-
-
-
-for ac_header in stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
-echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6
-  result=
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Found it" >/dev/null 2>&1; then
-  result=yes
-fi
-rm -f conftest*
-
-  if test -z "$result"; then
-                    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) res_hi=$ac_lo;;
-'') result=? ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-long longval () { return ~(size_t)0 / 10; }
-unsigned long ulongval () { return ~(size_t)0 / 10; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((~(size_t)0 / 10) < 0)
-    {
-      long i = longval ();
-      if (i != (~(size_t)0 / 10))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (~(size_t)0 / 10))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  res_hi=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) res_lo=$ac_lo;;
-'') result=? ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-long longval () { return ~(size_t)0 % 10; }
-unsigned long ulongval () { return ~(size_t)0 % 10; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((~(size_t)0 % 10) < 0)
-    {
-      long i = longval ();
-      if (i != (~(size_t)0 % 10))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (~(size_t)0 % 10))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  res_lo=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-    if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) fits_in_uint=$ac_lo;;
-'') result=? ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-long longval () { return sizeof (size_t) <= sizeof (unsigned int); }
-unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
-    {
-      long i = longval ();
-      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  fits_in_uint=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-    if test "$fits_in_uint" = 1; then
-                  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-        extern size_t foo;
-        extern unsigned long foo;
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  fits_in_uint=0
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test -z "$result"; then
-      if test "$fits_in_uint" = 1; then
-        result="$res_hi$res_lo"U
-      else
-        result="$res_hi$res_lo"UL
-      fi
-    else
-            result='~(size_t)0'
-    fi
-  fi
-  echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
-  if test "$result" != yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define SIZE_MAX $result
-_ACEOF
-
-  fi
-
-
-
-
-
-for ac_header in stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-    echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
-echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <CFPreferences.h>
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_CFPreferencesCopyAppValue=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-     CPPFLAGS="$gt_save_CPPFLAGS"
-     LIBS="$gt_save_LIBS"
-fi
-echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
-echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_CFLocaleCopyCurrent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_CFLocaleCopyCurrent=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-     CPPFLAGS="$gt_save_CPPFLAGS"
-     LIBS="$gt_save_LIBS"
-fi
-echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFLOCALECOPYCURRENT 1
-_ACEOF
-
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${acl_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
-      *)
-	test "$with_gnu_ld" != yes && break ;;
-      esac
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
-*)
-  acl_cv_prog_gnu_ld=no ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
-with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-
-                                                echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
-if test "${acl_cv_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-
-fi
-echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-    # Check whether --enable-rpath or --disable-rpath was given.
-if test "${enable_rpath+set}" = set; then
-  enableval="$enable_rpath"
-  :
-else
-  enable_rpath=yes
-fi;
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
-  withval="$with_libiconv_prefix"
-
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-
-fi;
-      LIBICONV=
-  LTLIBICONV=
-  INCICONV=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='iconv '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$hardcode_direct" = yes; then
-                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
-              else
-                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
-                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
-    done
-  fi
-
-
-
-
-
-
-
-
-  echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((ptrdiff_t *) 0)
-  return 0;
-if (sizeof (ptrdiff_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_ptrdiff_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_ptrdiff_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
-if test $ac_cv_type_ptrdiff_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define ptrdiff_t long
-_ACEOF
-
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-  echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
-echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl__snprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef _snprintf
-  char *p = (char *) _snprintf;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl__snprintf=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl__snprintf=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6
-  if test $ac_cv_have_decl__snprintf = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNPRINTF $gt_value
-_ACEOF
-
-
-
-  echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
-echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl__snwprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef _snwprintf
-  char *p = (char *) _snwprintf;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl__snwprintf=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl__snwprintf=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6
-  if test $ac_cv_have_decl__snwprintf = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SNWPRINTF $gt_value
-_ACEOF
-
-
-
-
-  echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
-echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef feof_unlocked
-  char *p = (char *) feof_unlocked;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_feof_unlocked=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl_feof_unlocked=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6
-  if test $ac_cv_have_decl_feof_unlocked = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FEOF_UNLOCKED $gt_value
-_ACEOF
-
-
-
-  echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
-echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef fgets_unlocked
-  char *p = (char *) fgets_unlocked;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_fgets_unlocked=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl_fgets_unlocked=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6
-  if test $ac_cv_have_decl_fgets_unlocked = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FGETS_UNLOCKED $gt_value
-_ACEOF
-
-
-
-  echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
-echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-
-#ifndef getc_unlocked
-  char *p = (char *) getc_unlocked;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_getc_unlocked=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl_getc_unlocked=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6
-  if test $ac_cv_have_decl_getc_unlocked = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED $gt_value
-_ACEOF
-
-
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-
-
-
-
-
-
-
-          am_save_CPPFLAGS="$CPPFLAGS"
-
-  for element in $INCICONV; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-
-  echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-if test "${am_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  am_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
-    fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6
-  if test "$am_cv_func_iconv" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
-
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6
-  else
-            CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-
-
-
-  if test "$am_cv_func_iconv" = yes; then
-    echo "$as_me:$LINENO: checking for iconv declaration" >&5
-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
-    if test "${am_cv_proto_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  am_cv_proto_iconv_arg1=""
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_proto_iconv_arg1="const"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
-fi
-
-    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    echo "$as_me:$LINENO: result: ${ac_t:-
-         }$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
-         }$am_cv_proto_iconv" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define ICONV_CONST $am_cv_proto_iconv_arg1
-_ACEOF
-
-  fi
-
-
-  echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-if test "${am_cv_langinfo_codeset+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <langinfo.h>
-int
-main ()
-{
-char* cs = nl_langinfo(CODESET);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  am_cv_langinfo_codeset=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_langinfo_codeset=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
-  if test $am_cv_langinfo_codeset = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
-
-  fi
-
-  if test $ac_cv_header_locale_h = yes; then
-
-  echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
-if test "${gt_cv_val_LC_MESSAGES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <locale.h>
-int
-main ()
-{
-return LC_MESSAGES
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_val_LC_MESSAGES=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_val_LC_MESSAGES=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$gt_cv_val_LC_MESSAGES" >&6
-  if test $gt_cv_val_LC_MESSAGES = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
-
-  fi
-
-  fi
-
-  if test -n "$INTL_MACOSX_LIBS"; then
-    CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-  fi
-
-                      for ac_prog in bison
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_INTLBISON+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$INTLBISON"; then
-  ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_INTLBISON="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-INTLBISON=$ac_cv_prog_INTLBISON
-if test -n "$INTLBISON"; then
-  echo "$as_me:$LINENO: result: $INTLBISON" >&5
-echo "${ECHO_T}$INTLBISON" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$INTLBISON" && break
-done
-
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-        echo "$as_me:$LINENO: checking version of bison" >&5
-echo $ECHO_N "checking version of bison... $ECHO_C" >&6
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    echo "$as_me:$LINENO: result: $ac_prog_version" >&5
-echo "${ECHO_T}$ac_prog_version" >&6
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
-echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <CFPreferences.h>
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_CFPreferencesCopyAppValue=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-     CPPFLAGS="$gt_save_CPPFLAGS"
-     LIBS="$gt_save_LIBS"
-fi
-echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
-_ACEOF
-
-  fi
-    echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
-echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
-     gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -framework CoreFoundation"
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_CFLocaleCopyCurrent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_CFLocaleCopyCurrent=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-     CPPFLAGS="$gt_save_CPPFLAGS"
-     LIBS="$gt_save_LIBS"
-fi
-echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFLOCALECOPYCURRENT 1
-_ACEOF
-
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-
-
-
-
-  echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-    # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-  USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi;
-  echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
-
-
-
-
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-    if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-
-      echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
-echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
-
-# Check whether --with-included-gettext or --without-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
-  withval="$with_included_gettext"
-  nls_cv_force_use_gnu_gettext=$withval
-else
-  nls_cv_force_use_gnu_gettext=no
-fi;
-      echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
-echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-
-
-
-
-
-
-        echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_gnugettext1_libc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_gnugettext1_libc=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
-
-        if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then
-  withval="$with_libintl_prefix"
-
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-
-fi;
-      LIBINTL=
-  LTLIBINTL=
-  INCINTL=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='intl '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$hardcode_direct" = yes; then
-                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
-              else
-                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
-                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
-    done
-  fi
-
-          echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_gnugettext1_libintl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_gnugettext1_libintl=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-                        if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext1_libintl=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"
-fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
-        fi
-
-                                        if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-                    LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-                              nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-                BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
-        LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-                CATOBJEXT=.gmo
-      fi
-
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
-
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  echo "$as_me:$LINENO: checking whether to use NLS" >&5
-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
-  echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
-  if test "$USE_NLS" = "yes"; then
-    echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    echo "$as_me:$LINENO: result: $gt_source" >&5
-echo "${ECHO_T}$gt_source" >&6
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        echo "$as_me:$LINENO: checking how to link with libintl" >&5
-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
-        echo "$as_me:$LINENO: result: $LIBINTL" >&5
-echo "${ECHO_T}$LIBINTL" >&6
-
-  for element in $INCINTL; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-      fi
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DCGETTEXT 1
-_ACEOF
-
-    fi
-
-        POSUB=po
-  fi
-
-
-            if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-
-
-
-
-        nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-        DATADIRNAME=share
-
-
-        INSTOBJEXT=.mo
-
-
-        GENCAT=gencat
-
-
-        INTLOBJS=
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-
-
-        INTL_LIBTOOL_SUFFIX_PREFIX=
-
-
-
-    INTLLIBS="$LIBINTL"
-
-
-
-
-
-
-
-_localedir=`eval "echo $datadir/locale"`
-if test "$_localedir" = "NONE/share/locale"; then
-   cat >>confdefs.h <<_ACEOF
-#define LOCALEDIR "/usr/local/share/locale"
-_ACEOF
-
-else
-   _localedir=`echo \"$_localedir\"`
-   cat >>confdefs.h <<_ACEOF
-#define LOCALEDIR $_localedir
-_ACEOF
-
-fi
-
-
-
-if test x$USE_INCLUDED_LIBINTL = xyes; then
-  COMPILE_INTL_TRUE=
-  COMPILE_INTL_FALSE='#'
-else
-  COMPILE_INTL_TRUE='#'
-  COMPILE_INTL_FALSE=
-fi
-
-
-                                                                                                    ac_config_files="$ac_config_files Makefile gsmlib/Makefile tests/Makefile apps/Makefile win32/Makefile doc/Makefile scripts/Makefile intl/Makefile po/Makefile.in ext/Makefile"
-          ac_config_commands="$ac_config_commands default"
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${COMPILE_INTL_TRUE}" && test -z "${COMPILE_INTL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"COMPILE_INTL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"COMPILE_INTL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-
-
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "gsmlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES gsmlib/Makefile" ;;
-  "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-  "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
-  "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
-  "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
-  "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-  "ext/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-  "gsm_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS gsm_config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@ECHO@,$ECHO,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@CPP@,$CPP,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@ALLOCA@,$ALLOCA,;t t
-s,@GSM_VERSION@,$GSM_VERSION,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@MSGMERGE@,$MSGMERGE,;t t
-s,@GLIBC2@,$GLIBC2,;t t
-s,@GLIBC21@,$GLIBC21,;t t
-s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
-s,@HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF,;t t
-s,@HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t
-s,@HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t
-s,@HAVE_WPRINTF@,$HAVE_WPRINTF,;t t
-s,@LIBICONV@,$LIBICONV,;t t
-s,@LTLIBICONV@,$LTLIBICONV,;t t
-s,@INTLBISON@,$INTLBISON,;t t
-s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
-s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
-s,@CATOBJEXT@,$CATOBJEXT,;t t
-s,@DATADIRNAME@,$DATADIRNAME,;t t
-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
-s,@GENCAT@,$GENCAT,;t t
-s,@INTLOBJS@,$INTLOBJS,;t t
-s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t
-s,@LTLIBINTL@,$LTLIBINTL,;t t
-s,@POSUB@,$POSUB,;t t
-s,@COMPILE_INTL_TRUE@,$COMPILE_INTL_TRUE,;t t
-s,@COMPILE_INTL_FALSE@,$COMPILE_INTL_FALSE,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-    default-1 )
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done ;;
-    default ) echo timestamp > stamp-h ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in
deleted file mode 100644
index d586c4e35d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in
+++ /dev/null
@@ -1,131 +0,0 @@
-dnl *************************************************************************
-dnl * GSM TA/ME library
-dnl *
-dnl * File:    configure.in
-dnl *
-dnl * Purpose: autoconf configure script template
-dnl *
-dnl * Author:  Peter Hofmann (software@pxh.de)
-dnl *
-dnl * Created: 11.11.1999
-dnl *************************************************************************
-
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gsmlib/gsm_error.h)
-
-dnl Other
-AC_CONFIG_AUX_DIR(scripts)
-AC_PROG_INSTALL
-
-dnl check for libintl
-AC_CHECK_LIB(intl, textdomain)
-
-dnl use config header
-AM_CONFIG_HEADER(gsm_config.h)
-
-dnl use automake
-AM_INIT_AUTOMAKE(gsmlib, 1.10)
-
-dnl change to no if you want no shared libraries for debugging purposes
-AM_ENABLE_SHARED(yes)
-
-dnl use -O2 optimization by default
-if test "$CXXFLAGS" = ""; then
-   CXXFLAGS="-O2"
-fi
-
-dnl comment out this line to get extensive debugging output and asserts
-dnl CXXFLAGS="-DNDEBUG $CXXFLAGS"
-
-dnl uncomment to get translations without installing gsmlib
-dnl CXXFLAGS="-DLOCAL_TRANSLATIONS $CXXFLAGS"
-
-dnl check _REENTRANT in header files
-if test x"`egrep _REENTRANT /usr/include/features.h`" != x; then
-  CXXFLAGS="-D_REENTRANT $CXXFLAGS"
-  CFLAGS="-D_REENTRANT $CFLAGS"
-fi
-
-dnl output all warnings
-CXXFLAGS="-Wall $CXXFLAGS"
-
-dnl use libtool
-AM_PROG_LIBTOOL
-
-dnl Checks for programs.
-AC_PROG_CPP
-AC_PROG_CXX
-
-dnl check for gcc 2.95.x
-AC_TRY_RUN([
-#include <unistd.h>
-main()
-{
-#if defined(__GNUC__) && \
-    ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
-    return 1;
-#endif
-  return 0;
-}
-],,
-[echo "need at least gcc 2.95 to compile correctly"
-exit 1])
-
-dnl check for alloca
-AC_FUNC_ALLOCA
-
-dnl check for getopt_long in the C library
-AC_CHECK_LIB(c, getopt_long, AC_DEFINE(HAVE_GETOPT_LONG))
-
-dnl check for alarm in the C library
-AC_CHECK_LIB(c, alarm, AC_DEFINE(HAVE_ALARM))
-
-dnl check for netinet/in.h header
-AC_CHECK_HEADERS(netinet/in.h)
-
-dnl check for string.h header
-AC_CHECK_HEADERS(string.h)
-
-dnl check for libintl.h header
-AC_CHECK_HEADERS(libintl.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-dnl check for vsnprintf()
-dnl AC_FUNC_VPRINTF
-AC_EGREP_HEADER(vsnprintf, stdio.h, AC_DEFINE(HAVE_VSNPRINTF))
-
-dnl checks for builtin data type sizes
-AC_CHECK_SIZEOF(unsigned short int, 2)
-AC_CHECK_SIZEOF(unsigned long int, 4)
-AC_CHECK_SIZEOF(unsigned int, 4)
-
-dnl Project-specific settings
-GSM_VERSION="1:4:0"
-AC_SUBST(GSM_VERSION)
-
-dnl national language support (NLS)
-LINGUAS="de"
-ALL_LINGUAS=$LINGUAS
-AM_GNU_GETTEXT
-
-dnl set locale dir (FIXME there must be a better way)
-_localedir=`eval "echo $datadir/locale"`
-if test "$_localedir" = "NONE/share/locale"; then
-   AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/local/share/locale")
-else
-   _localedir=`echo \"$_localedir\"`
-   AC_DEFINE_UNQUOTED(LOCALEDIR, $_localedir)
-fi
-
-dnl whether to compile the intl directory
-AM_CONDITIONAL(COMPILE_INTL, test x$USE_INCLUDED_LIBINTL = xyes)
-
-AC_OUTPUT(Makefile gsmlib/Makefile tests/Makefile apps/Makefile win32/Makefile
-          doc/Makefile scripts/Makefile intl/Makefile po/Makefile.in
-          ext/Makefile,
-          echo timestamp > stamp-h)
-
-dnl repair Makefile in po subdir
-dnl sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsm-utils.cron.d b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsm-utils.cron.d
deleted file mode 100644
index 7974513ccc..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsm-utils.cron.d
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/cron.d/gsm-utils: crontab fragment for gsm-utils
-
-*/5 * * * *	root	if [ -x /usr/bin/gsmsmsrequeue ]; then /usr/bin/gsmsmsrequeue; fi
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsm-utils.default b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsm-utils.default
deleted file mode 100644
index 8ab73a9530..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsm-utils.default
+++ /dev/null
@@ -1,13 +0,0 @@
-PHONEDEV=/dev/mobilephone  # or /dev/ttyS0 or /dev/ircomm0
-BAUDRATE=9600
-PIN=""  # or 1234
-
-SPOOLDIR=/var/spool/sms
-PRIORITIES=3
-
-SMSADMIN=root
-SUBJECT="SMS delivery report:"
-
-SMSPROCESSOR=""  # or /usr/bin/gsmsmsprocessor
-
-do_accounting () { true; }  # it's your turn
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsm-utils.init b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsm-utils.init
deleted file mode 100644
index 7bb3ac0cd1..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsm-utils.init
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          gsm-utils
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start daemon at boot time
-# Description:       Enable service provided by daemon.
-### END INIT INFO
-#
-# /etc/init.d/gsm-utils: Controls the GSM SMS send daemon
-#
-# written by Matthias Goebl <matthias@goebl.net>
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/gsmsmsd
-NAME=gsmsmsd
-DESC="GSM SMS send daemon"
-
-test -x $DAEMON || exit 0
-
-PHONEDEV=/dev/mobilephone  # or /dev/ttyS0 or /dev/ircomm0
-BAUDRATE=9600
-PIN=""  # or 1234
-SMSPROCESSOR=""  # or /usr/bin/gsmsmsprocessor
-SPOOLDIR=/var/spool/sms
-PRIORITIES=3
-STARTOPTS=""
-SMSUSER="gsmsms:gsmsms"
-test -r /etc/default/gsm-utils && . /etc/default/gsm-utils  # for overwriting some parameters
-
-OPTIONS="-d $PHONEDEV -b $BAUDRATE -L -P $PRIORITIES"
-OPTIONS="$OPTIONS -s $SPOOLDIR/queue -S $SPOOLDIR/sent -F $SPOOLDIR/failed"
-test -n "$SMSPROCESSOR" && OPTIONS="$OPTIONS -a $SMSPROCESSOR"
-test -n "$SMSUSER" && STARTOPTS="$STARTOPTS --chuid $SMSUSER"
-test -r /etc/default/gsm-utils && . /etc/default/gsm-utils  # for overwriting OPTIONS
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	if [ -n "$PIN" ];then
-		echo -n "entering PIN.. "
-		(
-		# This is ugly.. But if the PIN is already entered, the ME returns
-		# "ERROR" and makes gsmctl retrying..
-		/usr/bin/gsmctl -d $PHONEDEV -b $BAUDRATE -I "+cpin=$PIN" &
-		PID=$!
-		sleep 3
-		kill $PID 2>/dev/null
-		) >/dev/null 2>&1
-	fi
-	echo -n "$NAME"
-	start-stop-daemon --start --quiet --pidfile /var/run/gsm-utils/$NAME.pid \
-		--make-pidfile --background $STARTOPTS --exec $DAEMON -- $OPTIONS
-	echo "."
-	;;
-  stop)
-	echo -n "Stopping $DESC: $NAME "
-	start-stop-daemon --stop --quiet --pidfile /var/run/gsm-utils/$NAME.pid \
-		--exec $DAEMON
-	sleep 5
-	echo "."
-	;;
-  restart|force-reload)
-	echo -n "Restarting $DESC: $NAME"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gsm-utils/$NAME.pid \
-		--make-pidfile --background $STARTOPTS --exec $DAEMON -- $OPTIONS
-	sleep 5
-	start-stop-daemon --start --quiet --pidfile /var/run/gsm-utils/$NAME.pid \
-		--make-pidfile --background --exec $DAEMON -- $OPTIONS
-	echo "."
-	;;
-  *)
-	N=/etc/init.d/gsm-utils
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsmsmsrequeue b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsmsmsrequeue
deleted file mode 100644
index 88b65c15bf..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsmsmsrequeue
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/bash
-#
-# /usr/bin/gsmsmsrequeue: Re-queues failed SMS
-#
-# written by Matthias Goebl <matthias@goebl.net>
-
-SPOOLDIR=/var/spool/sms
-PRIORITIES=3
-SMSADMIN=root
-SUBJECT="SMS delivery report:"
-
-send_notify()
-{
-  tmpfile="$SPOOLDIR/tmp/"`basename "$1"`
-  status="$2"
-  if mv "$1" "$tmpfile" 2>/dev/null; then
-    # extract the first tab-separated field after the phone number as
-    # email-address to send the notification to
-    mailto=` cat "$tmpfile" | sed -ne '1s/^[^	]*	\([^	]*\).*/\1/p' `
-    test -z "$mailto" && mailto="$SMSADMIN"
-    cat "$tmpfile" | mail -s "$SUBJECT $status" "$mailto"
-    rm "$tmpfile"
-  fi
-}
-do_accounting()
-{
-  true;
-}
-
-test -r /etc/default/gsm-utils && . /etc/default/gsm-utils
-
-for p in `seq 1 $PRIORITIES`; do
-  ls "$SPOOLDIR/failed$p" | while read file; do
-    if expr "$file" : ".*rrrrrrrrrrrr" >/dev/null; then
-      send_notify "$SPOOLDIR/failed$p/$file" "failed"
-    else
-      # re-queue SMS
-      mv "$SPOOLDIR/failed$p/$file" "$SPOOLDIR/queue$p/${file}r" 2>/dev/null
-    fi
-  done
-done
-
-for p in `seq 1 $PRIORITIES`; do
-  ls "$SPOOLDIR/sent$p" | while read file; do
-    do_accounting "$SPOOLDIR/sent$p/$file" "sent"
-    send_notify "$SPOOLDIR/sent$p/$file" "sent"
-  done
-done
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsmsmsspool b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsmsmsspool
deleted file mode 100644
index 75bc1f9b79..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/contrib/gsmsmsspool
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/bash
-#
-# /usr/bin/gsmsmsspool: Queues SMS for sending
-#
-# written by Matthias Goebl <matthias@goebl.net>
-
-SPOOLDIR=/var/spool/sms
-PRIORITIES=3
-test -r /etc/default/gsm-utils && . /etc/default/gsm-utils
-
-if [ -z "$1" ]; then
-  echo "Usage: gsmsmsspool NUMBER [MESSAGE]"
-  exit 1
-fi
-
-priority=$PRIORITIES  # default priority
-test -n "$GSMSMS_PRIORITY" && priority="$GSMSMS_PRIORITY"
-mailto=`id -un`
-test -n "$GSMSMS_NOTIFY" && mailto="$GSMSMS_NOTIFY"
-
-tmpfile="$SPOOLDIR/tmp/`date +%s`.$$"
-umask 022
-echo "$1	$mailto" > "$tmpfile"
-if [ -n "$2" ]; then
-  echo "$2" | head -c 160 >> "$tmpfile"
-else
-  head -c 160 >> "$tmpfile"
-fi
-
-if [ "`id -un`" = "root" ]; then
-  chown gsmsms:gsmsms "$tmpfile"
-fi
-
-mv "$tmpfile" "$SPOOLDIR/queue$priority/"
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/changelog b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/changelog
deleted file mode 100644
index 86bca0b277..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/changelog
+++ /dev/null
@@ -1,284 +0,0 @@
-gsmlib (1.10-13) unstable; urgency=low
-
-  * Ack NMU, Thanks Michael, Christoph & Petter
-  * debian/control add Homepage:
-  * Update debian/copyright; gsm-lib/COPYING actually specifies LGPL: 
-    - fixes lintian:copyright-without-copyright-notice
-  * Update manpages fixes lintian:hyphen-used-as-minus-sign
-  * Update debian/gsm-utils.init 
-    - fixes lintian:init.d-script-missing-lsb-short-description
-  * Bug fixes from ubuntu
-    - Don't install contrib/gsm-utils.init dh_installinit debian/gsm-utils.init
-    - Create /var/run/gsm-utils
-  * Add case 'L' to apps/gsmsmsd.cc - thks to Andrew Suffield
-    - syslog support does not work (Closes: #346240)
-  * gsm-utils.init really call restart with --stop first
-    - init script calls --start twice (Closes: #377448)
-  * Explictly set /bin/bash: gsmsmsspool & gsmsmsrequeue
-    - bashism in /bin/sh script (Closes: #464981)
-    - gsmsmsrequeue contains bashism or function error (Closes: #459396)
-  * Patch apps/gsmsmsstore.cc - thks Isaac Wilcox
-    - gsmsmsstore device existence check causes problems with RFCOMM
-    devices (Closes: #340179)
-  * Only start gsmsmsd if set in /etc/default/gsm-utils. crontab -> examples
-    - gsmsmsd should be optional / start only if told so in
-    /etc/default/gsm-utils (Closes: #474093)
-  * Apply patch from Stefan Katerkamp & Jacob Nevins
-    - Gsmsendsms fails with SonyEricsson W880 (fix included) (Closes:
-    #413341)
-
- -- Mark Purcell <msp@debian.org>  Mon, 06 Oct 2008 15:01:49 +1100
-
-gsmlib (1.10-12.5) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Yet another bashism that was later on reported on the old bug report, thus
-    again closes: #464981
-  * Also found a shell related problem in debian/rules and fixed it.
-  * Bumped standard to 3.7.3.
-
- -- Michael Meskes <meskes@debian.org>  Mon, 14 Apr 2008 10:48:19 +0200
-
-gsmlib (1.10-12.4) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Argh, somehow I mananged to upload without fixing the bug completely,
-    sorry. Added those missing braces, closes: #464981.
-
- -- Michael Meskes <meskes@debian.org>  Wed, 09 Apr 2008 14:46:08 +0200
-
-gsmlib (1.10-12.3) unstable; urgency=high
-
-  * Non-maintainer upload.
-  * Removed bashism in contrib/gsmsmsrequeue (Closes: #464981).
-
- -- Michael Meskes <meskes@debian.org>  Sun, 06 Apr 2008 15:37:35 +0200
-
-gsmlib (1.10-12.2) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Fix FTBFS with GCC 4.3: 'strerror' was not declared in this scope, thanks
-    to Cyril Brulebois for the patch (Closes: #455402).
-
- -- Christoph Berg <myon@debian.org>  Fri, 04 Apr 2008 18:01:05 +0200
-
-gsmlib (1.10-12.1) unstable; urgency=low
-
-  * Non-maintainer upload to solve release goal.
-  * Add LSB dependency header to init.d scripts (Closes: #464061).
-
- -- Petter Reinholdtsen <pere@debian.org>  Fri, 28 Mar 2008 11:39:20 +0100
-
-gsmlib (1.10-12) unstable; urgency=low
-
-  * addgroup --system gsmsms works better.  Thanks Jon
-  * only delete gsmsms on purge
-     - gsm-utils: deletes and recreates the gsmsms user on each upgrade
-     (Closes: #346238)
-     - gsm-utils fails installation / addgroup: The user gsmsms; does
-     not exist (Closes: #445404)
-  * lintian cleanup: debian-rules-ignores-make-clean-error substvar-
-    source-version-is-deprecated
-  * Scripts are installed +x
-    - gsm-utils: uselessly installs non-executable scripts into /usr/bin
-    (Closes: #346230)
-  * Remove bogus symlink
-    - gsm-utils: wrong symlink for manpage gsmsiectl.1 (Closes: #322382)
-    - gsm-utils: gsmsiectl.1 dangling symlink (Closes: #399582)
-  * debian/gsm-utils.init reload/restart was not calling --stop. Thanks
-    Barry
-    - init script calls --start twice (Closes: #377448)
-
- -- Mark Purcell <msp@debian.org>  Mon, 08 Oct 2007 21:44:00 +0100
-
-gsmlib (1.10-11) unstable; urgency=low
-
-  * Create system group gsmsms - Thanks Emmanuel
-     - gsm-utils: creates group in non-system gid range (Closes: #353967)
-     - gsm-utils: postinst should create system grp gsmsms (Closes:
-    #390266)
-  * Upgrade to compat 4
-  * Apply gcc-4.3 patch from Martin
-    - FTBFS with GCC 4.3: missing #includes (Closes: #417222)
-
- -- Mark Purcell <msp@debian.org>  Sat, 29 Sep 2007 18:22:56 +0100
-
-gsmlib (1.10-10) unstable; urgency=low
-
-  * FTBFS with G++ 4.1: extra qualifications (Closes: #356109)
-
- -- Mark Purcell <msp@debian.org>  Sat, 20 May 2006 21:54:42 +0100
-
-gsmlib (1.10-9) unstable; urgency=low
-
-  * library package needs to be renamed (libstdc++ allocator change)
-    (Closes: #339179)
-
- -- Mark Purcell <msp@debian.org>  Mon, 21 Nov 2005 21:19:51 +0000
-
-gsmlib (1.10-8) unstable; urgency=low
-
-  * removal of automake1.6 (Closes: #335123)
-  * fails with dash [bashisms in scripts] (Closes: #309834)
-  * Update libtool Fixes: gsmlib(GNU/k*BSD): FTBFS: out of date libtool scripts (Closes:
-    #319688)
-  * [INTL:de] German PO file corrections (Closes: #314060)
-  * Fix: old-fsf-address-in-copyright-file
-
- -- Mark Purcell <msp@debian.org>  Thu,  3 Nov 2005 22:40:19 +0000
-
-gsmlib (1.10-7) unstable; urgency=low
-
-  * C++ 4.0 transition
-  * Closes: #315864: Missing manpages
-  * gsm-utils: maintainer-script-needs-depends-on-adduser postinst
-
- -- Mark Purcell <msp@debian.org>  Sat, 23 Jul 2005 00:46:31 +1000
-
-gsmlib (1.10-6) unstable; urgency=low
-
-  * Rebuild for invalid dependancies
-  * Closes: #258056: libgsmme 99% cpu usage
-    - Patch from Emard
-  * Closes: #274382: FTBFS with gcc-3.4: template-id `operator&lt;
-    &lt;&gt;' for `bool gsmlib::operator&lt;(const
-    gsmlib::MapKey&lt;gsmlib::SortedPhonebookBase&gt;&amp;, const
-    gsmlib::MapKey&lt;gsmlib::SortedPhonebookBase&gt;&amp;)' does not
-    match any template declaration
-    - Patch from Andreas Jochens
-  * Closes: #294251: FTBFS (amd64/gcc-4.0): explicit qualification in
-    declaration of `bool gsmlib::operator&lt;(const
-    gsmlib::MapKey&lt;SortedStore&gt;&amp;, const
-    gsmlib::MapKey&lt;SortedStore&gt;&amp;)'
-    - Patch from Andreas Jochens
-  * Closes: #200189: Patch and contribution 
-    +  Added multi-queue-priority-system and syslog patch (Matthias Goebl)
-    +  Included init, spool and requeue scripts for gsmsmsd (Matthias Goebl)
-    +  gsmsmsd runs with own user and group (gsmsms:gsmsms) (Matthias Goebl)
-
- -- Mark Purcell <msp@debian.org>  Tue, 17 May 2005 11:34:45 +0100
-
-gsmlib (1.10-5) unstable; urgency=low
-
-  * Change Section: libdevel
-  * gsm_unix_serial.cc patch from Daniel Schepler to fix g++-3.3
-    compliation. Thanks. (Closes: Bug#195151)
-
- -- Mark Purcell <msp@debian.org>  Sat, 19 Jul 2003 15:57:28 +1000
-
-gsmlib (1.10-4) unstable; urgency=low
-
-  * Include file descriptor leak patch from Edd Dumbill (Closes:
-    Bug#168475)
-  * lintian cleanup: description-synopsis-might-not-be-phrased-properly
-  * lintian cleanup: configure-generated-file-in-source
-
- -- Mark Purcell <msp@debian.org>  Sun,  9 Feb 2003 14:04:54 +1100
-
-gsmlib (1.10-3) unstable; urgency=low
-
-  * New Maintainer (Closes: Bug#180061). Thanks Mikael for your work.
-
- -- Mark Purcell <msp@debian.org>  Sat,  8 Feb 2003 16:55:26 +1100
-
-gsmlib (1.10-2) unstable; urgency=low
-
-  * Rebuild to use the new c++ ABI (GCC 3.2)
-
- -- Mikael Hedin <micce@debian.org>  Thu, 23 Jan 2003 20:57:50 +0100
-
-gsmlib (1.10-1) unstable; urgency=low
-
-  * New upstrem release.
-
- -- Mikael Hedin <micce@debian.org>  Wed,  6 Nov 2002 17:44:17 +0100
-
-gsmlib (1.9-2) unstable; urgency=low
-
-  * Made new rules for the config.guess/sub update thing (closes: #146865,
-    #146867).
-
- -- Mikael Hedin <micce@debian.org>  Tue, 14 May 2002 09:28:03 +0200
-
-gsmlib (1.9-1) unstable; urgency=low
-
-  * New upstream version.
-  * Use chrpath to get rid of rpaths.
-  * Add mini-manpage for gsmsiexfer.
-  * Remove b-d on auto-stuff, we don't use them.
-
- -- Mikael Hedin <micce@debian.org>  Mon, 13 May 2002 22:10:28 +0200
-
-gsmlib (1.8-2) unstable; urgency=low
-
-  * Removed b-d on gcc 3.0, as they are no longer nessecary.
-
- -- Mikael Hedin <micce@debian.org>  Thu, 24 Jan 2002 12:59:07 +0100
-
-gsmlib (1.8-1) unstable; urgency=low
-
-  * New upstream version.
-  * Revert the arch hack, now it should compile with either g++.
-  * Include the new lib in libgsmme1.  Run dh_makeshlibs -V because of this.
-  * Added info for gsmsiectl in gsmctl(1).
-
- -- Mikael Hedin <micce@debian.org>  Wed,  9 Jan 2002 22:38:45 +0100
-
-gsmlib (1.7-2) unstable; urgency=low
-
-  * gsm-utils: Added shlibs:Depends (closes: #126127). 
-  * Spelling correction (closes: #124705, #124972)
-  * Rm libgsmme1.postins, and let dh_makeshlibs take care of ldconfig.
-  * Made explicit arch list without sparc and arm, they cannot use g++-3.0
-    right now.
-
- -- Mikael Hedin <micce@debian.org>  Sat, 22 Dec 2001 20:27:54 +0100
-
-gsmlib (1.7-1) unstable; urgency=low
-
-  * New upstream
-  * Use gcc-3.0 and g++-3.0, 2.95 doesn't compile.
-
- -- Mikael Hedin <micce@debian.org>  Thu,  1 Nov 2001 10:24:33 +0100
-
-gsmlib (1.6-5) unstable; urgency=low
-
-  * Updated manpage (closes: #110973)
-  * Corrected problem with OP status (closes: #110970)
-
- -- Mikael Hedin <micce@debian.org>  Sat,  8 Sep 2001 18:12:17 +0200
-
-gsmlib (1.6-4) unstable; urgency=low
-
-  * Support DEB_BUILD_OPTIONS
-  * Changed libgsmme-dev to section devel.
-  * Reran libtoolize.
-  * Lots of small patches to compile with g++-3.0. (Closes: #104411) 
-  * Removed dh_testversion.
-
- -- Mikael Hedin <micce@debian.org>  Thu, 12 Jul 2001 16:06:23 +0200
-
-gsmlib (1.6-3) unstable; urgency=low
-
-  * Various minor corrections.
-
- -- Mikael Hedin <mikael.hedin@irf.se>  Thu,  8 Mar 2001 16:24:07 +0100
-
-gsmlib (1.6-2) unstable; urgency=low
-
-  * Dont install INSTALL.  Correct indentation for libgsmme1 description.
-
- -- Mikael Hedin <mikael.hedin@irf.se>  Tue,  6 Mar 2001 14:55:05 +0100
-
-gsmlib (1.6-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- Mikael Hedin <mikael.hedin@irf.se>  Mon, 29 Jan 2001 17:57:21 +0100
-
-gsmlib (1.5-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Mikael Hedin <mikael.hedin@irf.se>  Thu, 14 Dec 2000 01:06:40 +0100
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/compat b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/compat
deleted file mode 100644
index b8626c4cff..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/control b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/control
deleted file mode 100644
index b230b8b838..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/control
+++ /dev/null
@@ -1,45 +0,0 @@
-Source: gsmlib
-Section: comm
-Priority: extra
-Maintainer: Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 3.0.0), chrpath
-Standards-Version: 3.7.3
-Homepage: http://www.pxh.de/fs/gsmlib/
-
-Package: libgsmme-dev
-Section: libdevel
-Architecture: any
-Depends: libgsmme1c2a (= ${binary:Version}), libc6-dev
-Description: Header files and static libraries for gsmlib
- Headers and static libraries for use when compiling programs with 
- gsmlib.  
- .
- gsmlib is a library for access to a GSM mobile phone using the
- standards ETSI GSM 07.07, ETSI GSM 07.05, and others. 
-
-Package: libgsmme1c2a
-Conflicts: libgsmme1, libgsmme1c102, libgsmme1c2
-Replaces: libgsmme1c102, libgsmme1c2
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: GSM mobile phone access library
- Library to access GSM mobile phones through GSM modems or IrDA devices. 
- Features include:
- .
-  * modification of phone books stored in the mobile phone or on the 
-   SIM card
-  * reading and writing of SMS messages stored in the mobile phone
-  * sending and reception of SMS messages
- .
- gsmlib uses standard ETSI GSM 07.07, ETSI GSM 07.05, and others.
-
-Package: gsm-utils
-Section: comm
-Architecture: any
-Depends: ${shlibs:Depends}, adduser
-Description: GSM mobile phone access applications
- Some simple command line programs to access a GSM mobile phone via
- GSM modem or IrDA.  Functions include: modification of phone books and
- reading, writing, sending and receiving SMS messages.  Uses the GSM
- standards ETSI GSM 07.07, ETSI GSM 07.05, and others.  
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/copyright b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/copyright
deleted file mode 100644
index dcb44c32cd..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-This package was debianized by Mikael Hedin <mikael.hedin@irf.se> on
-Thu, 14 Dec 2000 01:06:40 +0100.
-
-It was downloaded from http://www.pxh.de/fs/gsmlib/index.html
-
-Upstream Author: Peter Hofmann <software@pxh.de>
-
-ext/gsmsiexfer.cc:// * Author:  Christian W. Zuckschwerdt  <zany@triq.net>
-
-Copyright:
-
-    Copyright (C) 1999-2002 Peter Hofmann <software@pxh.de>
-
-License:
-
-    This package 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 of the License, or (at your option) any later version.
-
-    This package 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 package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-The Debian packaging is (C) 2000, Mikael Hedin <mikael.hedin@irf.se> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/dirs b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/dirs
deleted file mode 100644
index a39a14c5cf..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-/var/run/gsm-utils
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.cron.d b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.cron.d
deleted file mode 100644
index 7974513ccc..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.cron.d
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/cron.d/gsm-utils: crontab fragment for gsm-utils
-
-*/5 * * * *	root	if [ -x /usr/bin/gsmsmsrequeue ]; then /usr/bin/gsmsmsrequeue; fi
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.default b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.default
deleted file mode 100644
index 11901da54a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.default
+++ /dev/null
@@ -1,18 +0,0 @@
-PHONEDEV=/dev/mobilephone  # or /dev/ttyS0 or /dev/ircomm0
-BAUDRATE=9600
-PIN=""  # or 1234
-
-# RUNGSMSMS: If set to anything other that 'yes', the asterisk init.d script
-#              will not run. The default is 'yes'.
-# You should probaly also install the crontab from /usr/share/doc/gsm-utils/examples
-RUNGSMSMS=no
-
-SPOOLDIR=/var/spool/sms
-PRIORITIES=3
-
-SMSADMIN=root
-SUBJECT="SMS delivery report:"
-
-SMSPROCESSOR=""  # or /usr/bin/gsmsmsprocessor
-
-do_accounting () { true; }  # it's your turn
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.dirs b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.dirs
deleted file mode 100644
index 7bc765edd6..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.dirs
+++ /dev/null
@@ -1,11 +0,0 @@
-var/spool/sms/queue1
-var/spool/sms/queue2
-var/spool/sms/queue3
-var/spool/sms/sent1
-var/spool/sms/sent2
-var/spool/sms/sent3
-var/spool/sms/failed1
-var/spool/sms/failed2
-var/spool/sms/failed3
-var/spool/sms/tmp
-var/run/gsm-utils
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.docs b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.docs
deleted file mode 100644
index d4f3801ab1..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-NEWS
-README
-TODO
-doc/FAQ
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.examples b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.examples
deleted file mode 100644
index bd892f97be..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-contrib/gsm-utils.cron.d
-contrib/gsm-utils.init
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.init b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.init
deleted file mode 100644
index bc51002f65..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.init
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          gsm-utils
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start daemon at boot time
-# Description:       Enable service provided by daemon.
-### END INIT INFO
-#
-# /etc/init.d/gsm-utils: Controls the GSM SMS send daemon
-#
-# written by Matthias Goebl <matthias@goebl.net>
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/gsmsmsd
-NAME=gsmsmsd
-DESC="GSM SMS send daemon"
-
-test -x $DAEMON || exit 0
-
-if [ "$RUNGSMSMS" != "yes" ];then
-        echo "GSM SMS deamon not yet configured. Edit /etc/default/gsm-utils first."
-        exit 0
-fi
-
-
-PHONEDEV=/dev/mobilephone  # or /dev/ttyS0 or /dev/ircomm0
-BAUDRATE=9600
-PIN=""  # or 1234
-SMSPROCESSOR=""  # or /usr/bin/gsmsmsprocessor
-SPOOLDIR=/var/spool/sms
-PRIORITIES=3
-STARTOPTS=""
-SMSUSER="gsmsms:gsmsms"
-test -r /etc/default/gsm-utils && . /etc/default/gsm-utils  # for overwriting some parameters
-
-OPTIONS="-d $PHONEDEV -b $BAUDRATE -L -P $PRIORITIES"
-OPTIONS="$OPTIONS -s $SPOOLDIR/queue -S $SPOOLDIR/sent -F $SPOOLDIR/failed"
-test -n "$SMSPROCESSOR" && OPTIONS="$OPTIONS -a $SMSPROCESSOR"
-test -n "$SMSUSER" && STARTOPTS="$STARTOPTS --chuid $SMSUSER"
-test -r /etc/default/gsm-utils && . /etc/default/gsm-utils  # for overwriting OPTIONS
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	if [ -n "$PIN" ];then
-		echo -n "entering PIN.. "
-		(
-		# This is ugly.. But if the PIN is already entered, the ME returns
-		# "ERROR" and makes gsmctl retrying..
-		/usr/bin/gsmctl -d $PHONEDEV -b $BAUDRATE -I "+cpin=$PIN" &
-		PID=$!
-		sleep 3
-		kill $PID 2>/dev/null
-		) >/dev/null 2>&1
-	fi
-	echo -n "$NAME"
-	start-stop-daemon --start --quiet --pidfile /var/run/gsm-utils/$NAME.pid \
-		--make-pidfile --background $STARTOPTS --exec $DAEMON -- $OPTIONS
-	echo "."
-	;;
-  stop)
-	echo -n "Stopping $DESC: $NAME "
-	start-stop-daemon --stop --quiet --pidfile /var/run/gsm-utils/$NAME.pid \
-		--exec $DAEMON
-	sleep 5
-	echo "."
-	;;
-  restart|force-reload)
-	echo -n "Restarting $DESC: $NAME"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gsm-utils/$NAME.pid \
-		--make-pidfile --background --exec $DAEMON -- $OPTIONS
-	sleep 5
-	start-stop-daemon --start --quiet --pidfile /var/run/gsm-utils/$NAME.pid \
-		--make-pidfile --background $STARTOPTS --exec $DAEMON -- $OPTIONS
-	echo "."
-	;;
-  *)
-	N=/etc/init.d/gsm-utils
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.postinst b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.postinst
deleted file mode 100644
index 2954c4a400..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.postinst
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-
-# create gsmsms group if necessary.
-if ! grep -q ^gsmsms: /etc/group; then
-#      echo Adding system group: gsmsms.
-       addgroup --system gsmsms
-fi
-
-# create gsmsms user if necessary.
-if ! grep -q ^gsmsms: /etc/passwd; then
-#        echo Adding system user: gsmsms.
-        adduser --system --ingroup gsmsms \
-                --no-create-home --home /var/spool/sms gsmsms
-fi
-
-# allow gsmsms to use serial lines
-if ! groups gsmsms | grep -q dialout ; then
-        adduser gsmsms dialout
-fi
-
-# echo Updating spool directory structure: /var/spool/sms
-chown -R gsmsms:gsmsms /var/spool/sms /var/run/gsm-utils
-chmod 700 /var/spool/sms/*
-chmod 750 /var/spool/sms
-chmod 730 /var/spool/sms/queue* /var/spool/sms/tmp
-
-# Add the rest automatically..
-#DEBHELPER#
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.postrm b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.postrm
deleted file mode 100644
index cba60a894c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsm-utils.postrm
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# postrm script for #PACKAGE#
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    purge)
-       deluser gsmsms  
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsmsiexfer.1 b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsmsiexfer.1
deleted file mode 100644
index 4dc996578a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/gsmsiexfer.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.\" -*- eval: (nroff-mode) -*-
-.de TQ
-.br
-.ns
-.TP \\$1
-..
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
-.TH GSMSIEXFER 1 "" "gsmsiexfer"
-.SH NAME
-gsmsiexfer \-  Siemens ME file transfer program for Siemens phones S25, S35, S45, ME45, SL45
-.SH SYNOPSIS
-.B gsmsiexfer \-\-help
-.PP
-.SH DESCRIPTION
-\fIgsmsiexer\fP comes with no man page.  Try gsmsiexfer \-\-help, or
-read the source.
-.PP
-.SH "SEE ALSO"
-.BR gsminfo(7),
-.BR gsmctl(1),
-.BR gsmsendsms(1),
-.BR gsmsmsd(8),
-.BR gsmsmsstore(1).
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/libgsmme-dev.docs b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/libgsmme-dev.docs
deleted file mode 100644
index 8c378905c5..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/libgsmme-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/README.developers
-doc/README.NLS
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/rules b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/rules
deleted file mode 100644
index a615ea02d4..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/rules
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# shared library versions, option 1
-#version=2.0.5
-#major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-me_version=`ls gsmlib/.libs/libgsmme*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-me_major=`ls gsmlib/.libs/libgsmme*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-ex_version=`ls ext/.libs/libgsmext*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-ex_major=`ls ext/.libs/libgsmext*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-# FOR AUTOCONF 2.13 ONLY
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
-endif
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -g
-CXXFLAGS += -g
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" INSTALL_PROGRAM=$(INSTALL_PROGRAM) \
-	./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man \
-	--infodir=\$${prefix}/share/info
-
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f build-stamp configure-stamp config.log config.status po/de.gmo
-
-	-test -r /usr/share/misc/config.sub && \
-	   cp -f /usr/share/misc/config.sub scripts/config.sub
-	-test -r /usr/share/misc/config.guess && \
-	   cp -f /usr/share/misc/config.guess scripts/config.guess
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_installdirs -pgsm-utils
-
-	# Add here commands to install the package into debian/gsmlib.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	chrpath -d debian/tmp/usr/bin/*
-	cp contrib/gsmsmsspool contrib/gsmsmsrequeue debian/tmp/usr/bin
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	#
-	# build libgsmlib${major} package by moving files from gsmlib-dev
-	#
-	dh_movefiles -plibgsmme$(me_major)c2a  \
-	usr/lib/libgsmme.so.$(me_major)        \
-	usr/lib/libgsmme.so.$(me_version)    \
-	usr/lib/libgsmext.so.$(ex_major)        \
-	usr/lib/libgsmext.so.$(ex_version)    \
-	usr/share/locale
-
-	dh_movefiles -plibgsmme-dev     \
-	usr/include                   \
-	usr/lib
-
-	dh_movefiles -pgsm-utils \
-	usr/bin
-
-
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installinit
-	dh_installcron
-	dh_installman -pgsm-utils debian/*.1 debian/tmp/usr/share/man/man*/*
-	dh_installinfo
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -ldebian/libgsmme1c2a/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/watch b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/watch
deleted file mode 100644
index 530c7916ca..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=2
-http://www.pxh.de/fs/gsmlib/download/content.html gsmlib-(.*)\.tar\.gz
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/FAQ b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/FAQ
deleted file mode 100644
index 303ab14555..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/FAQ
+++ /dev/null
@@ -1,101 +0,0 @@
-*** 1. I get the error
-       /usr/local/bin/gsmsmsd [ERROR]: cannot route status report message to TE
-
-Some phones/modems cannot route all kinds of SMS to the TE
-(computer). Please try
-
-  gsmsmsd no_stat
-
-This is documented in the gsmsmsd manual page.
-
-
-*** 2. Siemens M20T expects an initial PIN.
-
-For the Siemens M20T an initial PIN must be send once (probably when
-it is switched on or the computer is powered on). This PIN is used for
-all subsequent invocations of gsmlib-based programs. The trick is to
-issue the following program (eg. in the rc-scripts of the operating system):
-
-  gsmctl -I "+cpin=<MY PIN>"
-
-
-*** 3. Sending SMS with or retrieving SMS from my Ericsson SH888 does
-not work.
-
-Set the environment variable GSMLIB_SH888_FIX:
-
-export GSMLIB_SH888_FIX=1     (bash)
-setenv GSMLIB_SH888_FIX 1     (tcsh)
-
-If it works now, I need your model number. You could just enter
-"AT+CGMM" in a terminal program and send me the results. Alternatively 
-set the environment variable GSMLIB_DEBUG=2 and me the dump.
-
-*** 4. I get the error "ME/TA error 'Unidentified subscriber' (code
-28)" when trying to send SMS using gsmsendsms or gsmsmsd.
-
-The SMS service centre address (SCA, the phone number of the centre that is
-accepting SMS for delivery) is not set correctly in your phone. There
-are three ways to correct this:
-
-1. set the default SCA (example is for Germany T-D1):
-
-  gsmctl -o setsca "+491710760000"
-
-2. Use the menus of your phone to set the SMS SCA.
-
-3. Use the option "--sca 1234567" for the gsmsmsd, gsmsmsstore, and
-gsmsendsms programs. This tries to set the SCA in the SMS itself (does
-not change default SCA) and might not work with all phones.
-
-*** 5. gsmlib works unreliably with my phone.
-
-Try another baudrate, even higher baudrates sometimes work better then
-lower ones.
-
-*** 6. On Win32 accessing the COM device fails.
-
-Use COMx: (x is the number of the COM device) instead of the UNIX
-device name. If this doesn't work use "\\.\COMx:".
-
-*** 7. Windows 2000 Does Not Support Mapping Virtual COM Ports to
-       Infrared Ports.
-
-Windows 2000 users should follow the instructions in
-support.microsoft.com article Q252795 in order to connect with their
-mobile.
-
-*** 8. gcc-compiled shared C++ libraries do not work properly on some
-       commercial UNIX systems and with older version of gcc.
-
-The symptoms may be that the program dumps core on exceptions (AIX) or that
-global constructors are not called (Solaris).
-
-Try to compile gsmlib with
-
-  ./configure --disable-shared --enable-static
-
-if you encounter strange problems.
-
-*** 9. How to support unicode? 
-
-You need 6 steps:
-
-1. set datacodingschema to DCS_SIXTEEN_BIT_ALPHABET
-
-2. set your locale correctly, for example, my locale, china. 
-    setlocale(LC_ALL, "chs");
-
-3. translate MBCS(multiple byte character set) string to unicode string.
-    wchar_t wstr[ 1000 ];
-    memset(wstr, 0, 2000);
-    mbstowcs(wstr, data.c_str(), data.length());
-
-4. get unicode string length.
-    int wcs_len = wcslen(wstr);
-
-5. change unicode string to net order.
-    for (int i = 0; i < wcs_len; i++)
-        wstr[ i ] = htons(wstr[ i ]);
-
-6. put unicode string into pdu.
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/Makefile.am b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/Makefile.am
deleted file mode 100644
index f194f8d496..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: doc Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 11.6.1999
-# *************************************************************************
-
-man_MANS =	gsmsmsd.8 gsmctl.1 gsmpb.1 gsmsendsms.1 gsmsmsstore.1 gsminfo.7
-
-EXTRA_DIST =	gsmsmsd.man gsmctl.man gsmpb.man gsmsendsms.man \
-		gsmsmsstore.man gsmlib.lsm gsminfo.man \
-		README.NLS README.developers FAQ
-
-%.1: %.man
-		sed -e "s/##VERSION##/$(VERSION)/g;s/##DATE##/`date`/g" \
-		$< > $@
-
-%.7: %.man
-		sed -e "s/##VERSION##/$(VERSION)/g;s/##DATE##/`date`/g" \
-		$< > $@
-
-%.8: %.man
-		sed -e "s/##VERSION##/$(VERSION)/g;s/##DATE##/`date`/g" \
-		$< > $@
-
-clean-local:
-		rm -f *.1 *.7 *.8
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/Makefile.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/Makefile.in
deleted file mode 100644
index f0f33528e3..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/Makefile.in
+++ /dev/null
@@ -1,412 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: doc Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 11.6.1999
-# *************************************************************************
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AS = @AS@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-DATADIRNAME = @DATADIRNAME@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GSM_VERSION = @GSM_VERSION@
-HAVE_LIB = @HAVE_LIB@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIB = @LIB@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-
-man_MANS = gsmsmsd.8 gsmctl.1 gsmpb.1 gsmsendsms.1 gsmsmsstore.1 gsminfo.7
-
-EXTRA_DIST = gsmsmsd.man gsmctl.man gsmpb.man gsmsendsms.man \
-		gsmsmsstore.man gsmlib.lsm gsminfo.man \
-		README.NLS README.developers FAQ
-
-subdir = doc
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/gsm_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-NROFF = nroff
-MANS = $(man_MANS)
-DIST_COMMON = Makefile.am Makefile.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-man1dir = $(mandir)/man1
-install-man1: $(man1_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-	done
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-	done
-
-man7dir = $(mandir)/man7
-install-man7: $(man7_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(man7dir)
-	@list='$(man7_MANS) $(dist_man7_MANS) $(nodist_man7_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.7*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    7*) ;; \
-	    *) ext='7' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man7dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man7dir)/$$inst; \
-	done
-uninstall-man7:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man7_MANS) $(dist_man7_MANS) $(nodist_man7_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.7*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man7dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man7dir)/$$inst; \
-	done
-
-man8dir = $(mandir)/man8
-install-man8: $(man8_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(man8dir)
-	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.8*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-	done
-uninstall-man8:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.8*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
-	done
-tags: TAGS
-TAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(MANS)
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) $(DESTDIR)$(man8dir)
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man: install-man1 install-man7 install-man8
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-uninstall-am: uninstall-info-am uninstall-man
-
-uninstall-man: uninstall-man1 uninstall-man7 uninstall-man8
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-man1 install-man7 \
-	install-man8 install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool uninstall \
-	uninstall-am uninstall-info-am uninstall-man uninstall-man1 \
-	uninstall-man7 uninstall-man8
-
-
-%.1: %.man
-		sed -e "s/##VERSION##/$(VERSION)/g;s/##DATE##/`date`/g" \
-		$< > $@
-
-%.7: %.man
-		sed -e "s/##VERSION##/$(VERSION)/g;s/##DATE##/`date`/g" \
-		$< > $@
-
-%.8: %.man
-		sed -e "s/##VERSION##/$(VERSION)/g;s/##DATE##/`date`/g" \
-		$< > $@
-
-clean-local:
-		rm -f *.1 *.7 *.8
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/README.NLS b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/README.NLS
deleted file mode 100644
index a5381f6104..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/README.NLS
+++ /dev/null
@@ -1,72 +0,0 @@
-0 Introduction
---------------
-
-This version of gsmlib contains national language support (NLS) using
-the GNU (or OS-supplied) gettext library. gettext eases the handling
-of translations of (usually english) output messages to other
-languages by introducing the concept of message catalogs.
-
-Message catalogs can exist in various formats. The human-readable and
--editable format is the PO file format. I have written a PO-file for
-the german language (de.po). These human-readable files are then
-translated to MO files which can be used by the gettext library.
-
-Please refer to the GNU gettext documentation (at the time of this
-writing gettext-0.10) for further details.
-
-
-1 Compiling gsmlib with localized messages
-------------------------------------------
-
-Gsmlib is compiled by default with NLS enabled. If you don't want
-NLS invoke configure with the option
-
-./configure --disable-nls
-
-
-2 Adding new message dialogs
-----------------------------
-
-1. Edit the ALL_LINGUAS line in "source/configure.in" and add your
-   language, eg. French:
-
-   ALL_LINGUAS="de fr"
-
-2. Execute "autoconf" to create a new "configure" script (possible
-   problem: incompatible "autoconf")
-
-3. Now issue "./configure" in the "sources" directory.
-
-4. go to the "po" subdirectory
-
-5. do a "touch fr.po" to create an initially empty PO-file.
-
-6. do a "make update-po". This extracts all the strings from the files 
-   listed in "POTFILES" and puts them with empty translations into "fr.po"
-   (it also updates existing po-Files such as "de.po").
-
-7. Now use the editor of your choice to provide translations in
-   "fr.po". There is an emacs major mode (po-mode) that eases this
-   process.
-
-8. now issue "make". This causes an "fr.mo" to be created.
-
-
-3 Adding new strings to gsmlib source code
-------------------------------------------
-
-1. If you add new strings to the gsmlib source code that need
-   translation enclose them with "_(" and ")" (see gettext documentation
-   for special cases).
-
-2. go to the "po" directory.
-
-3. do a "make update-po". This updates all existing PO-files (removing 
-   obsolete translations, providing new, emptry entries).
-
-4. Provide translations for the new, empty entries (ideally using
-   emacs po-mode)
-
-5. now issue "make". This causes up-to-date MO-files to be created.
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/README.developers b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/README.developers
deleted file mode 100644
index 7fdcc11940..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/README.developers
+++ /dev/null
@@ -1,138 +0,0 @@
-OVERVIEW
-
-     The GSM library is written in C++ and uses the latest C++
-     features: namespaces, exceptions, the standard template library.
-
-     The actual library source code is in the gsmlib subdirectory of
-     this distribution. The following modules are available:
-
-     gsm_alloca.h      OS-specific alloca defines
-     gsm_at.h          Utility classes for AT command sequence handling
-     gsm_error.h       Error codes and error handling functions
-     gsm_event.h       Event handler interface
-     gsm_me_ta.h       Mobile Equipment/Terminal Adapter and SMS functions
-                       (ETSI GSM 07.07 and 07.05)
-     gsm_parser.h      Parser to parse MA/TA result strings
-     gsm_phonebook.h   Phonebook management functions
-     gsm_port.h        Abstract port definition
-     gsm_sms.h         SMS functions (ETSI GSM 07.05)
-     gsm_sms_codec.h   Coder and Encoder for SMS TPDUs
-     gsm_sms_store.h   SMS functions, SMS store (ETSI GSM 07.05)
-     gsm_sorted_phonebook.h Alphabetically sorted phonebook
-                            (residing in files or in the ME)
-     gsm_sorted_sms_store.h Sorted SMS store
-			    (sorted by address, time or type)
-                            (residing in files or in the ME)
-     gsm_unix_serial.h UNIX serial port implementation
-     gsm_util.h        Various utilities
-
-
-REQUIREMENTS
-
-     I have used egcs-1.1.2 and libstdc++.so.2.8.0 for compiling the
-     library and all programs. Older probably don't work because of
-     missing features.
-
-
-AVAILABLE DOCUMENTATION
-
-     If you want to do your own programming using the GSM library please
-     refer to the extensively documented header files or to the example
-     programs in the test or apps subdirectory.
-
-     I have used the following documentation to develop this software:
-
-       gts_gsm_02.30_v5.2.0.pdf
-       gts_gsm_03.40_v5.3.0.pdf
-       gts_gsm_04.11_v5.1.0.pdf
-       gts_gsm_02.82_v5.0.0.pdf
-       gts_gsm_03.41_v5.2.0.pdf
-       gts_gsm_07.05_v5.3.0.pdf
-       gts_gsm_03.38_v5.3.0.pdf
-       gts_gsm_04.08_v5.1.0.pdf
-       gts_gsm_07.07_v5.0.0.pdf
-
-    Due to copyright reasons I cannot include this documentation in
-    this distribution. You can download it from the ETSI website
-    (www.etsi.org) for free, though.
-
-
-COMPILATION
-
-    The code is automatically compiled without debugging code enabled
-    (mostly assert()'s). 
-
-     If there are any problems you can generate a debug version
-     by issuing
-
-       CXXFLAGS="-g" ./configure --disable-shared
-
-     To switch on asserts and additional debugging output change the line
-
-       CXXFLAGS="-DNEBUG $CXXFLAGS"
-
-     in configure.in do
-
-       dnl CXXFLAGS="-DNEBUG $CXXFLAGS"
-
-     Then regenerate configure by executing autoconf.
-
-     You must use at least gcc-2.95.2 to compile gsmlib successfully.
-
-
-TESTS
-
-    The tests directory contains a number of software tests. Two kinds 
-    of test programs are provided: Those, that run without a mobile
-    phone and those that require a mobile phone to be connected to a
-    serial port.
-
-    No access to mobile phone needed:
-    runparser.sh      Test the parser for AT responses
-    runsms.sh         Test SMS message encoding and decoding routines
-    runspb.sh         Test sorted phonebook module
-    runssms.sh        Test sorted SMS store module
-
-    Give mobile phone device as argument:
-    testsms2          Manipulate SMS store in the mobile phone (read/write)
-    testgsmlib        Test the gsm_me_ta module (readonly)
-    testpb            Dump all phonebooks in the mobile phone to the stdout
-                      (readonly)
-    testpb2           Manipulate phonebook in the mobile phone (read/write)
-
-    The tests that do not require a mobile phone can be executed by
-    issuing "make check" in the tests subdirectory. The others must be 
-    invoked manually. WARNING: These tests alter the contents of the
-    mobile phone's phonebook or SMS message memory!!! Make sure, that
-    you understand what the test does and be prepared for loss of data in
-    the mobile phone.
-
-HINTS
-
-    - By default gsmlib is compiled with NDEBUG set. There are lots
-      of assert()s all over the library that may help to find problems
-      in programs that use the library. Disable NDEBUG to get best
-      debugging support.
-
-CUSTOM BACKENDS
-
-    gsmlib now allows custom backends to be defined for sorted phonebooks
-    and sorted SMS stores. This can be used to store phonebook entries in
-    relational databases or LDAP servers. The interfaces are defined in
-    gsm_sorted_phonebook_base.h and gsm_sorted_sms_store_base.h,
-    respectively.
-
-    To register a custom backend (eg. for sorted phonebooks) follow
-    these steps:
-
-    1. Define a subclass of CustomPhonebookFactory.
-
-    2. Define a static initializer class in your module that uses the
-       interface CustomPhonebookRegistry::registerCustomPhonebookFactory()
-       to make your custom backend available.
-
-    3. Link your module to any application that should use your custom 
-       backend. The gsmpb and gsmsmsstore programs are prepared to use the
-       CustomPhonebookRegistry class to obtain your custom backend
-       objects.
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmctl.man b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmctl.man
deleted file mode 100644
index fdd48d3377..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmctl.man
+++ /dev/null
@@ -1,683 +0,0 @@
-.TH GSMCTL 8 "##DATE##" "gsmctl v##VERSION##"
-.SH NAME
-gsmctl, gsmsiectl \- GSM mobile phone control program
-.SH SYNOPSIS
-.B gsmctl
-.RB [\| \-b
-.IR  baudrate \|]
-.RB [\| \-\-baudrate
-.IR baudrate\| ]
-.RB [ \|\-d
-.IR device\| ]
-.RB [ \|\-\-device
-.IR device\fP ]
-.RB [ \|\-h\| ]
-.RB [ \|\-\-help\| ]
-.RB [ \|\-I
-.IR "init string" \|]
-.RB [ \|\-\-init
-.IR "init string" \|]
-.RB [ \|\-v\| ]
-.RB [ \|\-\-version\| ]
-.RB [ \|\-X\| ]
-.RB [ \|\-\-xonxoff\| ]
-.BI \-o \ operation
-.RB  | \ \-\-operation
-.IR operation \ |
-.I parameters
-.PP
-.B gsmsiectl
-.RB [\| \-b
-.IR  baudrate \|]
-.RB [\| \-\-baudrate
-.IR baudrate\| ]
-.RB [ \|\-d
-.IR device\| ]
-.RB [ \|\-\-device
-.IR device\fP ]
-.RB [ \|\-h\| ]
-.RB [ \|\-\-help\| ]
-.RB [ \|\-I
-.IR "init string" \|]
-.RB [ \|\-\-init
-.IR "init string" \|]
-.RB [ \|\-v\| ]
-.RB [ \|\-\-version\| ]
-.RB [ \|\-X\| ]
-.RB [ \|\-\-xonxoff\| ]
-.BI \-o \ operation
-.RB  | \ \-\-operation
-.IR operation \ |
-.I parameters
-.SH DESCRIPTION
-.B gsmctl
-can request information from or perform operations on an GSM mobile
-phone.
-.PP
-.B gsmctl 
-attaches itself to the 
-.I device
-given on the command line (usually an GSM modem) using the specified
-.IR baudrate .  
-If no
-.I device
-is given, the device
-.I /dev/mobilephone
-is used. If no 
-.I baudrate
-is given, a default baud rate of 38400 is used.
-.PP
-.B gsmctl
-can be used in to modes: If no 
-.B \-\-operation
-option is given the
-.I parameters
-specify the status information to be retrieved from
-the mobile phone. See the section 
-.B STATUS INFORMATION
-for more details. If an 
-.B \-\-operation
-option is given the requested
-.I operation
-is performed on the mobile using the
-.IR parameters . 
-See the section 
-.B OPERATIONS
-for more details.
-.PP
-.B gsmsiectl
-is the same program with some extension for Siemens mobile phones.
-Some extra 
-.B OPERATIONS
-are available in this case.
-.PP
-Error messages are printed to the standard error output.  If the
-program terminates on error the error code 1 is returned.
-.SH OPTIONS
-.TP
-.BI \-b\  baudrate ,\ \-\-baudrate\  baudrate
-The baud rate to use.  Defaults to 38400.
-.TP
-.BI \-d\  device ,\ \-\-device\  device
-The device to which the GSM modem is connected. The default is
-.IR /dev/mobilephone .
-.TP
-.B \-h,\ \-\-help
-Prints an option summary.
-.TP
-.BI \-I\  "init string" ,\ \-\-init\  "init string"
-Initialization string to send to the TA (default: "E0"). Note that the
-sequence "ATZ" is sent first.
-.TP
-.BI \-o\  operation ,\ \-\-operation\  operation
-This option is used to perform an operation on the mobile phone. Refer
-to the section 
-.B OPERATIONS
-for more information on the available
-operations and the 
-.I parameters
-required for each operation.
-.TP
-.B \-v,\ \-\-version
-Prints the program version.
-.TP
-.B \-X,\ \-\-xonxoff
-Uses software handshaking (XON/XOFF) for accessing the device.
-.SH STATUS INFORMATION
-If called without the 
-.B \-\-operation
-option 
-.B gsmctl
-prints out default mobile phone status information as specified by the
-.I parameters
-described below:
-.TP 7
-.B ALL
-Prints all available information.
-.TP 7
-.B BATT
-Prints out information about the current battery status. Two lines of
-the form "<BATT0> text" and "<BATT1>  charge" are printed. Text may be 
-of "0 ME is powered by the battery", "1 ME has a battery connected,
-but is not powered by it", "2 ME does not have a battery connected",
-or  "3 Recognized power fault, calls inhibited". Charge is a number in 
-the range 0..100 where 0 means that the battery is empty or not
-connected and 100 means full charge.
-.TP 7
-.B BITERR
-Prints information about the current bit error rate. The output is of
-form "<BITERR0>  value" where value can be of 0..7, 99 (99 means not
-available or not detectable).
-.TP 7
-.B CLIP
-This option prints a line of the form "<CLIP0> on" if caller line
-identification is turned on in the network, "<CLIP0> off" otherwise.
-.TP 7
-.B CSET
-Display info about charsets.  The output is in the form "<CSET0>
-available" and "<CSET1> current", which describes the charsets
-available and which is current.
-.TP 7
-.B CURROP
-Prints information about the current operator. The output line has the
-form "<CURROP0> Long name: \'xxxx\' Short name: \'yyyy\' Numeric Name: zzzz".
-.TP 7
-.B FLCAP
-Prints out the two-letter names of available facility locks. The
-meaning of standardized facility lock names is as follows:
-.RS
-.TP 3
-.I CS
-Lock control surface (eg. phone keyboard)
-.TP 3
-.I PS
-Lock phone to SIM card (mobile phone asks password when other than
-current SIM card inserted)
-.TP 3
-.I SC
-Lock SIM card (SIM asks password in mobile phone power-up and when
-this lock command issued)
-.TP 3
-.I AO
-Barr all outgoing calls
-.TP 3
-.I OI
-Barr outgoing international calls
-.TP 3
-.I OX
-Barr outgoing international calls except to home country
-.TP 3
-.I AI
-Barr all incoming calls
-.TP 3
-.I IR
-Barr incoming calls when roaming outside the home country
-.TP 3
-.I NT
-Barr incoming calls from numbers not stored to TA memory
-.TP 3
-.I NM
-Barr incoming calls from numbers not stored to mobile phone memory
-.TP 3
-.I NS
-Barr incoming calls from numbers not stored to SIM memory
-.TP 3
-.I NA
-Barr incoming calls from numbers not stored in Any memory
-.TP 3
-.I AB
-All Barring services (FIXME)
-.TP 3
-.I AG
-All outGoing barring services (FIXME)
-.TP 3
-.I AC
-All inComing barring services (FIXME)
-.TP 3
-.I FD
-SIM fixed dialling memory feature (if PIN2 authentication has not been
-done during the current session, PIN2 is required as <passwd>)
-.PP
-Note that mobile phones may implement facility locks not documented
-here.
-.RE
-.TP 7
-.B FLSTAT
-Prints information about the status of facility locking in the mobile
-phone. For each facility a line of the form "<FLSTATn> \'facilityname\'
-classes" is printed. The classes may be "Voice", "Data", and/or "Fax"
-depending on the class for which the facility is enabled. If "unknown"
-is printed out this means that the TA is not able to report the
-status. If the facility is not enabled for any class, no class
-identifier is printed. See 
-.B FLCAP
-for information about the available two-letter names of facility
-locks.
-.TP 7
-.B FORW
-Prints information about call forwarding enabled in the mobile
-phone. For each combination of reason (UnconditionalReason,
-MobileBusyReason, NoReplyReason, and NotReachableReason) and class
-(Voice, Data, and Fax) a line of the form "<FORWn.m> reason class
-number: xxx subaddr: yyy time: zzz" is printed. The time is the number 
-of seconds to wait before forwarding in case of NoReplyReason.
-.TP 7
-.B ME
-Prints manufacturer, model, revision, and serial number of
-the mobile phone (ME = mobile equipment). Output lines are numbered from 
-"<ME0>" to "<ME3>".
-.TP 7
-.B OP
-Prints information about the currently available mobile network
-operators. For each operator an output line of the form "<OPn> status 
-Long name: \'xxxx\' Short name: \'yyyy\' Numeric name: zzz" is returned
-where status may be of:
-.RS
-.TP 10
-.I unknown
-The status of the operator is unknown.
-.TP
-.I current
-This is the currently selected operator.
-.TP
-.I available
-This operator is available for selection.
-.TP
-.I forbidden
-This operator is not available for selection, ie. not
-accessible with this SIM card.
-.RE
-.TP 7
-.B PIN
-Prints information about the current PIN status. The output is of
-form "<PIN0>  status". Where status can be one of the following lines:
-.RS
-.TP 10
-.I READY
-ME is not pending for any password.
-.TP
-.I SIM PIN
-ME is waiting SIM PIN to be given.
-.TP
-.I SIM PUK
-ME is waiting SIM PUK to be given.
-.TP
-.I PH\-SIM PIN
-ME is waiting phone/-to/-SIM card password to be given.
-.TP
-.I PH/-FSIM PIN
-ME is waiting phone/-to/-very first SIM card password to be given.
-.TP
-.I PH/-FSIM PUK
-ME is waiting phone/-to/-very first SIM card unblocking password to be
-given.
-.TP
-.I SIM PIN2
-ME is waiting SIM PIN2 to be given.
-.TP
-.I SIM PUK2
-ME is waiting SIM PUK2 to be given.
-.TP
-.I PH/-NET PIN
-ME is waiting network personalisation password to be given.
-.TP
-.I PH/-NET PUK
-ME is waiting network personalisation unblocking password to be given.
-.TP
-.I PH/-NETSUB PIN
-ME is waiting network subset personalisation password to be given.
-.RE
-.TP 7
-.B PW
-Facilities in the mobile phone may be protected by passwords (ie. PINs 
-or PUKs). This option prints out lines of the form "<PWn>
-\'facilityname\' len" for each facility for which a facility lock
-password exists. See 
-.B FLCAP
-for information about the available two-letter names of facility
-locks.
-.TP 7
-.B SCA
-Reports the default SMS service centre address currently set in the
-mobile phone.
-.TP 7
-.B SIG
-Prints information about the current network signal
-strength. The output is of the form "<SIG0> value". Following values
-are possible:
-.TP
-.po +7
-.I 0
--113 dBm or less
-.TP
-.I 1
--111 dBm
-.TP
-.I 2...30
--109... -53 dBm (in steps of 2 dBm)
-.TP
-.I 31
--51 dBm or greater
-.TP
-.I 99
-not known or not detectable
-.PP
-.po 
-.SH OPERATIONS
-.TP
-.BI dial\  number
-Dials 
-.IR number .
-After dialling 
-.B gsmctl
-waits for a <CR> keypress to terminate.
-.PP
-.B forw
-.IR mode\ reason\ number\  [\| facilityclass\| ]\ [ forwardtime ]
-.RS
-Changes the call forwarding behaviour in the network. 
-.I mode
-can be any of:
-.RS 3
-.I disable
-Call forwarding is disabled.
-.PP
-.I enable
-Call forwarding is enabled. The call forwarding reason, number, and
-(optionally) forwardtime must be registered beforehand.
-.PP
-.I register
-This registers the call forwarding reason, number, and forwardtime in
-the network.
-.PP
-.I erase
-This is the counterpart to register. It erase the call forwarding info 
-in the network.
-.RE
-.PP
-.I reason
-can be any of:
-.RS 3
-.I unconditional
-This applies to every call.
-.PP
-.I mobilebusy
-The mobile phone is busy.
-.PP
-.I noreply
-The call is not answered in \fIforwardtime\fP seconds.
-.PP
-.I notreachable
-Mobile phone cannot be reached (ie. switched off).
-.PP
-.I all
-This refers to all forwarding reasons.
-.PP
-.I allconditional
-This refers to all conditional forward reasons 
-.RI ( mobilebusy ,\  noreply ,\  notreachable ).
-.RE
-.PP
-.I number
-is the number the incoming call is forwarded to. See the explanation
-for 
-.I lock
-operation for the meaning of 
-.IR facilityclass .
-The default for 
-.I forwardtime
-is 20 seconds if omitted. 
-.I forwardtime
-can be in the range 1..30.
-.RE
-.PP
-.TP
-.BI off
-Sets functionality level of the phone to 0 (low functionality). The
-effects of this command depend on the phone (eg. sets low power
-consumption).
-.PP
-.TP
-.BI on
-Sets functionality level of the phone to 1 (high functionality). The
-effects of this command depend on the phone.
-.PP
-.TP
-.BI pin\  pin
-Sets PIN code. Use
-.BI gsmctl\ pin
-to get the current pin status.
-.PP
-.B lock
-.IR facility\  [\| facilityclass \|]\ [\| passwd \|]
-.RS 
-Locks the named facility. Use 
-.BI gsmctl\  flcap
-to get a list of supported facilities. The 
-.I facilityclass
-can be any of:
-.RS 3
-.I all
-Voice, data, and fax.
-.PP
-.I v\ vf\ vd\ f\ fd\ d
-Any combination of voice, data and fax.
-.RE
-.PP
-The default is \fIall\fP if \fIfacilityclass\fP is omitted. The
-\fIpasswd\fP is password for the facility. If no password is given
-this parameter can be omitted.
-.RE
-.PP
-.BI setop\  opmode\ numericname
-.RS
-Sets the current operator to 
-.IR numericname . 
-Use 
-.BI gsmctl\  op
-to get a list of operators with their numeric codes. 
-.I opmode
-can be any of:
-.RS 3
-.I automatic
-.PP
-.I manual
-.PP
-.I deregister
-Deregister from network.
-.PP
-.I manualautomatic
-If manual selection fails, automatic mode is entered.
-.RE
-.RE
-.PP
-.B setpw
-.IR facility\  [\| oldpasswd\| ]\ [\| newpasswd\| ]
-.RS
-Sets the password for the facility. If one of the passwords is omitted 
-this means that the facility has no password protection. Passwords are 
-PIN1, PIN2, PUK etc.
-.RE
-.TP
-.BI setsca\  service\ centre\ address
-Sets the default SMS service centre address.
-.PP
-.B unlock
-.IR facility\  [\| facilityclass\| ]\ [ \|passwd\| ]
-.RS
-This is the reverse operation to \fBlock\fP. See above for a
-description of the parameters.
-.RE
-.PP
-.B Extra operators for gsmsiectl:
-.PP
-.B cset
-.RS 
-Charset info.
-.RE
-.PP
-.B pbook
-.RS 
-Phone book info.
-.RE
-.PP
-.B signal
-.RS 
-Signal tone info.
-.RE
-.PP
-.B ring
-.RS 
-Ringing tone info.
-.RE
-.PP
-.B binary
-.RS 
-Binary info.
-.RE
-.SH EXAMPLES
-The following invocation of 
-.I gsmctl
-prints out all available status information for the mobile phone
-connected to
-.B /dev/mobilephone
-.PP
-.nf
-.IP "" 3 
-gsmctl all
-.fi
-.PP
-The output could look like (lines edited to fit):
-.RS 3
-.PP
-.PD 0
-<ME0>  Manufacturer: SIEMENS
-.HP
-<ME1>  Model: S10
-.HP
-<ME2>  Revision: 06
-.HP
-<ME3>  Serial Number: 448058511817585
-.HP
-<OP0>  Status: available  Long name: 'D1/-TELEKOM' Short name: '' Numeric name: 26201
-.HP
-<OP1>  Status: forbidden  Long name: 'D2  PRIVAT' Short name: '' Numeric name: 26202
-.HP
-<CURROP0>  Long name: 'D1/-TELEKOM'   Short name: '' Numeric name: 26201 Mode: automatic
-.HP
-<FLSTAT0>  'CS'
-.HP
-<FLSTAT1>  'PS'
-.HP
-<FLSTAT2>  'SC'  Voice  Data  Fax
-.HP
-<FLSTAT3>  'AO'
-.HP
-<FLSTAT4>  'OI'
-.HP
-<FLSTAT5>  'OX'
-.HP
-<FLSTAT6>  'AI'
-.HP
-<FLSTAT7>  'IR'
-.HP
-<FLCAP0>  'CS' 'PS' 'SC' 'AO' 'OI' 'OX' 'AI' 'IR' 'AB' 'AG' 'AC' 
-.HP
-<PW0>  'PS' 8
-.HP
-<PW1>  'SC' 8
-.HP
-<PW2>  'AO' 4
-.HP
-<PW3>  'OI' 4
-.HP
-<PW4>  'OX' 4
-.HP
-<PW5>  'AI' 4
-.HP
-<PW6>  'IR' 4
-.HP
-<PW7>  'AB' 4
-.HP
-<PW8>  'AG' 4
-.HP
-<PW9>  'AC' 4
-.HP
-<CLIP0>  on
-.HP
-<FORW0.0>  UnconditionalReason  Voice  inactive number:   subaddr:  time: -1
-.HP
-<FORW0.1>  UnconditionalReason  Data  inactive number:   subaddr:  time: -1
-.HP
-<FORW0.2>  UnconditionalReason  Fax  inactive number:   subaddr:  time: -1
-.HP
-<FORW1.0>  MobileBusyReason  Voice  active number: +494012345678  subaddr:   time: -1
-.HP
-<FORW1.1>  MobileBusyReason  Data  inactive number:   subaddr:  time: -1
-.HP
-<FORW1.2>  MobileBusyReason  Fax  inactive number:   subaddr:  time: -1
-.HP
-<FORW2.0>  NoReplyReason  Voice  active number: +494012345678  subaddr:   time: 20
-.HP
-<FORW2.1>  NoReplyReason  Data  inactive number:   subaddr:  time: -1
-.HP
-<FORW2.2>  NoReplyReason  Fax  inactive number:   subaddr:  time: -1
-.HP
-<FORW3.0>  NotReachableReason  Voice  active number: +494012345678  subaddr:  time: -1
-.HP
-<FORW3.1>  NotReachableReason  Data  inactive number:  subaddr:  time: -1
-.HP
-<FORW3.2>  NotReachableReason  Fax  inactive number:  subaddr:  time: -1
-.HP
-<BATT0>   0 ME is powered by the battery
-.HP
-<BATT1>  100
-.HP
-<BITERR0>  0
-.HP
-<SIG0>  19
-.RE
-.PD
-.PP
-The following locks the keys on the mobile phone:
-.nf
-.IP "" 3
-gsmctl -o lock cs
-.fi
-.PP
-This changes the SIM card PIN from 1234 to 2345:
-.nf
-.IP "" 3
-gsmctl -o setpw sc 1234 2345
-.fi
-.PP
-Switch off all call forwarding (actually erase the numbers):
-.nf
-.IP "" 3
-gsmctl -o forw erase all
-.fi
-.PP
-Switch on call forwarding to German D1 voice box:
-.nf
-.IP "" 3
-gsmctl -o forw register notreachable 3313
-gsmctl -o forw enable notreachable
-.fi
-.PP
-.SH FILES
-.TP
-.B /dev/mobilephone
-Default mobile phone device.
-.SH AUTHOR
-Peter Hofmann <software@pxh.de>
-.SH BUGS
-Report bugs to software@pxh.de.  Include a complete, self-ncontained
-example that will allow the bug to be reproduced, and say which
-version of \fIgsmctl\fP you are using.
-.SH COPYRIGHT
-Copyright \(co 1999 Peter Hofmann
-.PP
-.B gsmctl
-is free software; you can redistribute it and/or modify it under the
-terms of the GNU Library General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-.PP
-.B gsmctl
-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 Library General Public
-License for more details.
-.PP
-You should have received a copy of the GNU Library General Public
-License along with 
-.BR gsmctl ; 
-see the file COPYING.  If not, write to the Free Software Foundation,
-675 Mass Ave, Cambridge, MA 02139, USA.
-.SH "SEE ALSO"
-.BR gsminfo (7),
-.BR gsmpb (1),
-.BR gsmsendsms (1),
-.BR gsmsmsd (8),
-.BR gsmsmsstore (1).
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsminfo.man b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsminfo.man
deleted file mode 100644
index 7939502779..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsminfo.man
+++ /dev/null
@@ -1,56 +0,0 @@
-.\" -*- eval: (nroff-mode) -*-
-.de TQ
-.br
-.ns
-.TP \\$1
-..
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
-.TH GSMINFO 7 "##DATE##" "gsmctl v##VERSION##"
-.PP
-.SH NAME
-gsminfo \- GSM general information
-.PP
-.SH DESCRIPTION
-\fIgsmlib\fP is a library to access GSM mobile phones through GSM
-modems or via IrDA devices. In the \fIgsmlib\fP documentation and error
-messages the following abbreviations are used:
-.TP .7i
-\fBME\fP
-Mobile Equipment. The mobile phone, usually.
-.TP .7i
-\fBSC\fP
-Service Centre. In the context of this documentation, the center
-responsible for sending and relaying SMs.
-.TP .7i
-\fBSM\fP
-Short Message.
-.TP .7i
-\fBSME\fP
-Short Message Equipment. Usually the mobile phone.
-.TP .7i
-\fBTA\fP
-Terminal Adapter. This can be a GSM modem PC card or it can be
-integrated into the ME.
-.TP .7i
-\fBTE\fP
-Terminal Equipment. This is the device to which the TA is connected,
-usually the computer.
-.PP
-.SH AUTHOR
-Peter Hofmann <software@pxh.de>
-.PP
-.SH COPYRIGHT
-Copyright \(co 1999 Peter Hofmann
-.PP
-.SH "SEE ALSO"
-.BR gsmctl(1),
-.BR gsmpb(1),
-.BR gsmsendsms(1),
-.BR gsmsmsd(8),
-.BR gsmsmsstore(1).
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmlib.lsm b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmlib.lsm
deleted file mode 100644
index 6056b88eed..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmlib.lsm
+++ /dev/null
@@ -1,20 +0,0 @@
-Begin3
-Title:			gsmlib          
-Version:        	1.0
-Entered-date:   	29JUL99
-Description:    	This distribution contains a library to access
-			GSM mobile phones through GSM modems. Features include:
-                        * modification of phonebooks stored in the
-                          mobile phone or on the SIM card
-                        * reading and writing of SMS messages stored in
-                          the mobile phone
-                        * sending and reception of SMS messages
-                        Additionally, some simple command line programs are
-                        provided to use these functionalities.
-Keywords:       	gsm mobile phone modem sms
-Author:         	Peter Hofmann <software@pxh.de>
-Maintained-by:  	Peter Hofmann <software@pxh.de>
-Primary-site:   	http://www.pxh.de/fs/gsmlib/
-Platforms:      	Linux
-Copying-policy: 	LGPL
-End
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmpb.man b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmpb.man
deleted file mode 100644
index fef171e0aa..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmpb.man
+++ /dev/null
@@ -1,245 +0,0 @@
-.\" -*- eval: (nroff-mode) -*-
-.de TQ
-.br
-.ns
-.TP \\$1
-..
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
-.TH GSMPB 8 "##DATE##" "gsmpb v##VERSION##"
-.SH NAME
-gsmpb \- GSM mobile phone phonebook manipulation program
-.SH SYNOPSIS
-.B gsmpb
-[ \fB\-b\fP \fIbaudrate\fP ]
-[ \fB\-\-baudrate\fP \fIbaudrate\fP ]
-[ \fB\-c\fP ]
-[ \fB\-\-copy\fP ]
-[ \fB\-d\fP \fIdestination device or file\fP ]
-[ \fB\-\-destination\fP \fIdestination device or file\fP ]
-[ \fB\-h\fP ]
-[ \fB\-\-help\fP ]
-[ \fB\-i\fP ]
-[ \fB\-\-index\fP ]
-[ \fB\-I\fP \fIinit string\fP ]
-[ \fB\-\-init\fP \fIinit string\fP ]
-[ \fB\-p\fP \fIphonebook name\fP ]
-[ \fB\-\-phonebook\fP \fIphonebook name\fP ]
-[ \fB\-s\fP \fIsource device or file\fP ]
-[ \fB\-\-source\fP \fIsource device or file\fP ]
-[ \fB\-t\fP \fIcharacter set\fP ]
-[ \fB\-\-charset\fP \fIcharacter set\fP ]
-[ \fB\-v\fP ]
-[ \fB\-\-version\fP ]
-[ \fB\-V\fP ]
-[ \fB\-\-verbose\fP ]
-[ \fB\-X\fP ]
-[ \fB\-\-xonxoff\fP ]
-[ \fB\-y\fP ]
-[ \fB\-\-synchronize\fP ]
-.PP
-.SH DESCRIPTION
-\fIgsmpb\fP can store or retrieve phonebook entries residing in a GSM
-mobile phone's phonebook to or from a file. A synchronization mode is
-also available.
-.PP
-\fIgsmpb\fP reads entries from the source which can be a mobile phone
-(if a serial device file is given) or a file (if a file name is
-given). The source is never modified. \fIgsmpb\fP writes phonebook
-entries to a destination file or device.  Depending on the mode the
-source is copied to the destination file, thus overwriting the
-destination, or the destination is synchronized with regard to the
-source which is the default (details see below).
-.PP
-If "\-" is given as the parameter for the \fB\-\-source\fP or
-\fB\-\-destination\fP options, the phonebook is read from standard input 
-and/or written to standard output, respectively.
-.PP
-Phonebook entries names are encoded using the GSM default alphabet in
-the mobile phone, whereas they are stored using the Latin\-1 encoding
-in phonebook files. When reading phonebook entries from a mobile phone 
-entry names are converted from the GSM default to Latin\-1. Characters
-that can not be converted to Latin\-1 are encoded as character code
-172 (Latin\-1 boolean "not"). When writing file-based phonebook entries 
-to a mobile phone a conversion to the GSM default alphabet takes
-place. Characters that can not be converted are encoded as GSM delta
-(code 16). If the default character set has been changed using the
-\fB\-\-charset\fP option no conversion takes place.
-.PP
-Error messages are printed to the standard error output. If the program
-terminates on error the error code 1 is returned.
-.PP
-.SH OPTIONS
-.TP .7i
-\fB\-b\fP \fIbaudrate\fP, \fB\-\-baudrate\fP \fIbaudrate\fP
-The baud rate to use. The default baudrate is 38400.
-.TP .7i
-\fB\-c\fP, \fB\-\-copy\fP
-This causes the contents of the source to be copied to the
-destination. After this operation the destination has exactly the same 
-contents as the source.
-.TP .7i
-\fB\-d\fP \fIdestination\fP, \fB\-\-destination\fP \fIdestination\fP
-The destination device or file.
-.TP .7i
-\fB\-h\fP, \fB\-\-help\fP
-Prints an option summary.
-.TP .7i
-\fB\-I\fP \fIinit string\fP, \fB\-\-init\fP \fIinit string\fP
-Initialization string to send to the TA (default: "E0"). Note that the
-sequence "ATZ" is sent first.
-.TP .7i
-\fB\-i\fP, \fB\-\-index\fP
-If the index position is given, \fIgsmpb\fP preserves the assignment
-of entries to memory slots in the mobile phone's phonebook. This can
-be used to backup phonebook entries with their position into a
-phonebook file or to change the position of entries by editing a
-phonebook file and writing them back to the mobile phone.
-If this option is given the phonebook file used as the source
-must contain indices for every entry. Additionally, these indices must 
-be unique, ie. it is not allowed to assign one entry twice to a
-specific position in the mobile phone's phonebook.
-.TP .7i
-\fB\-p\fP \fIphonebook\fP, \fB\-\-phonebook\fP \fIphonebook\fP
-The name of the phonebook to read from or write to. This is only used
-for device sources and destinations. Commonly available phonebooks
-are:
-.TP .3i
-.po +0.7i
-.ll 5.8i
-\fIFD\fP
-SIM fixdialling\-phonebook
-.TP .3i
-\fILD\fP
-SIM last\-dialling\-phonebook
-.TP .3i
-\fIME\fP
-ME phonebook
-.TP .3i
-\fIMT\fP
-combined ME and SIM phonebook
-.TP .3i
-\fISM\fP
-SIM phonebook
-.TP .3i
-\fITA\fP
-TA phonebook
-.TP .7i
-.po -0.7i
-.ll 6.5i
-\fB\-s\fP \fIsource\fP, \fB\-\-source\fP \fIsource\fP
-The source device or file.
-.TP
-\fB\-t\fP \fIcharacter set\fP, \fB\-\-charset\fP \fIcharacter set\fP
-Set the character set to use for phonebook operations (default is the
-GSM default alphabet).
-.TP
-\fB\-v\fP, \fB\-\-version\fP
-Prints the program version.
-.TP .7i
-\fB\-V\fP, \fB\-\-verbose\fP
-Prints out a detailed progress report.
-.TP .7i
-\fB\-X\fP, \fB\-\-xonxoff\fP
-Uses software handshaking (XON/XOFF) for accessing the device.
-.TP .7i
-\fB\-y\fP, \fB\-\-synchronize\fP
-This causes the contents of the source to be synchronized with the
-destination (default). Synchronization in this context means:
-.TP .2i
-.po +0.7i
-.ll 5.8i
-\-
-If the source contains an entry with a name that does not exist in the 
-destination this entry is added to the destination.
-.TP .2i
-\-
-If the source contains an entry with a name that can also be found in
-the destination, the entry in the destination is overwritten (ie. the
-telephone number is updated). Exception: More then one entry with the
-name exists in the destination. In this case the new entry ist just added.
-.TP .2i
-\-
-Entries in the destination that do not exist in the source are
-deleted.
-.PP
-Note that synchronization has the following properties that differ
-from copying: This algorithm does not change the location of unchanged
-entries in the destination phonebook. The synchronization function
-is not case-sensitive when comparing names.
-.PP
-.po -0.7i
-.ll 6.5i
-.SH PHONEBOOK FILE FORMAT 
-Phonebook entries are stored in phonebook files that are meant to be
-human-readable and -editable. There is one phonebook entry per line,
-and each line has the format:
-.PP
-.nf
-index|text|phone number
-.fi
-.PP
-The fields have the following meanings:
-.TP .7i
-\fIindex\fP
-The index of the entry which must be a positive number. The index may
-also be empty. Indices can be used in conjunction with the
-\fB\-\-index\fP option to store the entry into a specific position in
-the mobile phone.
-.TP .7i
-\fItext\fP
-Descriptive text for the entry. The text may contain the special
-characters '\\', '|', carriage return (ASCII code 13), or line feed
-(ASCII code 10). These must be written "\\\\", "\\|", "\\r", "\\n",
-respectively. The text should only contain characters that can be
-encoded using the GSM default alphabet (see comments above).
-.TP .7i
-\fIphone number\fP
-Phone numbers can only contains the digits 0\-9 and the '+' sign. A '+' 
-sign denotes an international number.
-.PP
-.SH EXAMPLES
-The following invocation of \fIgsmpb\fP synchronizes the mobile phone's
-SIM phonebook with the file $HOME/.phonebook:
-.PP
-.nf
-gsmpb \-\-synchronize \-b 19200 \-d /dev/mobilephone \\
-      \-s $HOME/.phonebook \-p "SM"
-.fi
-.PP
-.SH AUTHOR
-Peter Hofmann <software@pxh.de>
-.PP
-.SH BUGS
-Report bugs to software@pxh.de.  Include a complete, self-contained
-example that will allow the bug to be reproduced, and say which
-version of \fIgsmpb\fP you are using.
-.PP
-.SH COPYRIGHT
-Copyright \(co 1999 Peter Hofmann
-.LP
-\fIgsmpb\fP is free software; you can redistribute it and/or modify it under
-the terms of the GNU Library General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-.LP
-\fIgsmpb\fP 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 Library General Public License
-for more details.
-.LP
-You should have received a copy of the GNU Library General Public License along
-with \fIgsmpb\fP; see the file COPYING.  If not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-.PP
-.SH "SEE ALSO"
-.BR gsminfo(7),
-.BR gsmctl(1),
-.BR gsmsendsms(1),
-.BR gsmsmsd(8),
-.BR gsmsmsstore(1).
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmsendsms.man b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmsendsms.man
deleted file mode 100644
index d3c8a9c395..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmsendsms.man
+++ /dev/null
@@ -1,154 +0,0 @@
-.\" -*- eval: (nroff-mode) -*-
-.de TQ
-.br
-.ns
-.TP \\$1
-..
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
-.TH GSMSENDSMS 8 "##DATE##" "gsmsendsms v##VERSION##"
-.PP
-.SH NAME
-gsmsendsms \- SMS message sender utility
-.PP
-.SH SYNOPSIS
-.B gsmsendsms
-[ \fB\-b\fP \fIbaudrate\fP ]
-[ \fB\-\-baudrate\fP \fIbaudrate\fP ]
-[ \fB\-c\fP \fIconcatenatedID\fP ]
-[ \fB\-\-concatenate\fP \fIconcatenatedID\fP ]
-[ \fB\-C\fP \fIservice centre address\fP ]
-[ \fB\-\-sca\fP \fIservice centre address\fP ]
-[ \fB\-d\fP \fIdevice\fP ]
-[ \fB\-\-device\fP \fIdevice\fP ]
-[ \fB\-h\fP ]
-[ \fB\-\-help\fP ]
-[ \fB\-I\fP \fIinit string\fP ]
-[ \fB\-\-init\fP \fIinit string\fP ]
-[ \fB\-r\fP ]
-[ \fB\-\-requeststat\fP ]
-[ \fB\-t\fP ]
-[ \fB\-\-test\fP ]
-[ \fB\-v\fP ]
-[ \fB\-\-version\fP ]
-[ \fB\-X\fP ]
-[ \fB\-\-xonxoff\fP ]
-\fIphonenumber\fP
-[ \fItext\fP ]
-.PP
-.SH DESCRIPTION
-\fIgsmsendsms\fP sends SMS short messages using an GSM mobile phone.
-.PP
-\fIgsmsendsms\fP attaches itself to the \fIdevice\fP given on the command
-line (usually an GSM modem) using the specified \fIbaudrate\fP.  If no
-\fIdevice\fP is given, the device \fI/dev/mobilephone\fP is used. If
-no \fIbaudrate\fP is given, a default baud rate of 38400 is used.
-.PP
-\fIgsmsendsms\fP accepts a phone number (recipient address) and the
-short message text as parameters. The text may have a maximum length
-of 160 characters which is the maximum SMS message length. The GSM
-default alphabet is used for encoding. ASCII and Latin\-1 characters
-that can not be encoded using the GSM default alphabet are converted
-to the GSM delta character (GSM code 16).
-.PP
-Error messages are printed to the standard error output.  If the program
-terminates on error the error code 1 is returned.
-.PP
-.SH OPTIONS
-.TP
-\fB\-b\fP \fIbaudrate\fP, \fB\-\-baudrate\fP \fIbaudrate\fP
-The baud rate to use.
-.TP
-\fB\-c\fP \fIconcatenatedID\fP, \fB\-\-concatenate\fP \fIconcatenatedID\fP
-If an ID is given, large SMSs are split into several, concatenated
-SMSs. All SMSs have the same ID and are numbered consecutively so that 
-the receiving phone can assemble them in the correct order. IDs must
-be in the range 0..255. Not all receiving phones will support
-concatenated SMSs (and display them as separate SMSs),
-since all the numbering and ID information is
-carried in the user data header element at the beginning of the SMS
-user data. This information may show up as garbage in such phones.
-.TP
-\fB\-C\fP \fIservice centre address\fP, \fB\-\-sca\fP \fIservice centre address\fP
-Sets the service centre address to use for all SUBMIT SMSs (may not
-work with some phones).
-.TP
-\fB\-d\fP \fIdevice\fP, \fB\-\-device\fP \fIdevice\fP
-The device to which the GSM modem is connected. The default is
-\fI/dev/mobilephone\fP.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Prints an option summary.
-.TP
-\fB-I\fP \fIinit string\fP, \fB\-\-init\fP \fIinit string\fP
-Initialization string to send to the TA (default: "E0"). Note that the
-sequence "ATZ" is sent first.
-.TP
-\fB\-r\fP, \fB\-\-requeststat\fP
-Request status reports for sent SMS.
-.TP
-\fB\-t\fP, \fB\-\-test\fP
-If this option is given the text is converted
-to the GSM default alphabet and back to Latin\-1. This option can be
-used to find out how ASCII or Latin\-1 texts are converted to the GSM
-default alphabet. Characters that can not be converted to the GSM default
-alphabet are reported as ASCII code 172 (Latin\-1 boolean "not")
-after this double conversion. No SMS messages are sent, a connection
-to a mobile phone is not established.
-.TP
-\fB\-v\fP, \fB\-\-version\fP
-Prints the program version.
-.TP
-\fB\-X\fP, \fB\-\-xonxoff\fP
-Uses software handshaking (XON/XOFF) for accessing the device.
-.PP
-.SH EXAMPLES
-The following two invocations of \fIgsmsendsms\fP each send the same
-SMS message to the number "1234":
-.PP
-.nf
-gsmsendsms \-d /dev/ttyS2 \-b 19200  1234 "This is a test."
-echo "This is a test." | gsmsendsms \-d /dev/ttyS2 \-b 19200  1234
-.fi
-.PP
-.SH FILES
-.TP 1.4i
-.B /dev/mobilephone
-Default mobile phone device.
-.PP
-.SH AUTHOR
-Peter Hofmann <software@pxh.de>
-.PP
-.SH BUGS
-Report bugs to software@pxh.de.  Include a complete, self-contained
-example that will allow the bug to be reproduced, and say which
-version of \fIgsmsendsms\fP you are using.
-.PP
-.SH COPYRIGHT
-Copyright \(co 1999 Peter Hofmann
-.LP
-\fIgsmsendsms\fP is free software; you can redistribute it and/or modify it under
-the terms of the GNU Library General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-.LP
-\fIgsmsendsms\fP 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
-Library General Public License for more details.
-.LP
-You should have received a copy of the GNU Library General Public License along
-with \fIgsmsendsms\fP; see the file COPYING.  If not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-.PP
-.SH "SEE ALSO"
-.BR gsminfo(7),
-.BR gsmpb(1),
-.BR gsmctl(1),
-.BR gsmsmsd(8),
-.BR gsmsmsstore(1).
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmsmsd.man b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmsmsd.man
deleted file mode 100644
index 89e9c95f39..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmsmsd.man
+++ /dev/null
@@ -1,269 +0,0 @@
-.\" -*- eval: (nroff-mode) -*-
-.de TQ
-.br
-.ns
-.TP \\$1
-..
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
-.TH GSMSMSD 8 "##DATE##" "gsmsmsd v##VERSION##"
-.PP
-.SH NAME
-gsmsmsd \- SMS message reception daemon
-.PP
-.SH SYNOPSIS
-.B gsmsmsd
-[ \fB\-a\fP \fIaction\fP ]
-[ \fB\-\-action\fP \fIaction\fP ]
-[ \fB\-b\fP \fIbaudrate\fP ]
-[ \fB\-\-baudrate\fP \fIbaudrate\fP ]
-[ \fB\-c\fP \fIconcatenatedID\fP ]
-[ \fB\-\-concatenate\fP \fIconcatenatedID\fP ]
-[ \fB\-C\fP \fIservice centre address\fP ]
-[ \fB\-\-sca\fP \fIservice centre address\fP ]
-[ \fB\-d\fP \fIdevice\fP ]
-[ \fB\-\-device\fP \fIdevice\fP ]
-[ \fB\-D\fP ]
-[ \fB\-\-direct\fP ]
-[ \fB\-f\fP ]
-[ \fB\-\-flush\fP ]
-[ \fB\-h\fP ]
-[ \fB\-\-help\fP ]
-[ \fB\-I\fP \fIinit string\fP ]
-[ \fB\-\-init\fP \fIinit string\fP ]
-[ \fB\-r\fP ]
-[ \fB\-\-requeststat\fP ]
-[ \fB\-s\fP \fIspool directory\fP ]
-[ \fB\-\-spool\fP \fIspool directory\fP ]
-[ \fB\-t\fP \fISMS store name\fP ]
-[ \fB\-\-store\fP \fISMS store name\fP ]
-[ \fB\-v\fP ]
-[ \fB\-\-version\fP ]
-[ \fB\-X\fP ]
-[ \fB\-\-xonxoff\fP ]
-{ \fIsms_type\fP }
-.PP
-.SH DESCRIPTION
-\fIgsmsmsd\fP reads new incoming SMS from the mobile phone and
-dispatches them to a user-defined action. Additionally it can send SMS 
-message that it reads from a spooldir.
-.PP
-\fIgsmsmsd\fP attaches itself to the \fIdevice\fP given on the command
-line (usually an GSM modem) using the specified \fIbaudrate\fP and
-waits for incoming SMS messages. If no \fIdevice\fP is given, the
-device \fI/dev/mobilephone\fP is used. If no \fIbaudrate\fP is given, a
-default baud rate of 38400 is used.
-.PP
-If no action is given, the SMS message is printed to the standard
-output. If an \fIaction\fP is specified the \fIaction\fP is excecuted using the
-shell and the SMS message is written to the standard input of the action.
-.PP
-\fIgsmsmsd\fP needs one empty storage slot for SMS messages in the
-mobile phone, otherwise SMS reception will not work. The SMS store to
-use for temporary storage of incoming SMS can be selected using the
-\fB\-\-store\fP option, otherwise the ME default store is used.
-.PP
-To terminate \fIgsmsmsd\fP cleanly (without losing SMS messages) one
-should send either SIGINT (CTRL\-C on the command line) or SIGTERM to
-the process.
-.PP
-Error messages are printed to the standard error output.  If the program
-terminates on error the error code 1 is returned.
-.PP
-\fIsms_type\fP may be any combination of:
-.TP
-\fIsms\fP, \fIno_sms\fP
-Controls reception of normal SMS messages.
-.TP
-\fIcb\fP, \fIno_cb\fP
-Controls reception of cell broadcast messages.
-.TP
-\fIstat\fP, \fIno_stat\fP
-Controls reception of status reports.
-.PP
-The default is \fIsms\fP, \fIcb\fP, and \fIstat\fP.
-.PP
-.SH OPTIONS
-.TP
-\fB\-a\fP \fIaction\fP, \fB\-\-action\fP \fIaction\fP
-The action to execute for each incoming SMS message. If no action 
-is given the SMS is written to the standard output.
-.TP
-\fB\-b\fP \fIbaudrate\fP, \fB\-\-baudrate\fP \fIbaudrate\fP
-The baud rate to use.
-.TP
-\fB\-c\fP \fIconcatenatedID\fP, \fB\-\-concatenate\fP \fIconcatenatedID\fP
-If an ID is given, large SMSs are split into several, concatenated
-SMSs. All SMSs have the same ID and are numbered consecutively so that 
-the receiving phone can assemble them in the correct order. IDs must
-be in the range 0..255. This number is increased by one for every
-outgoing concatenated SMS and wraps around after 255.
-Not all receiving phones will support
-concatenated SMSs (and display them as separate SMSs),
-since all the numbering and ID information is
-carried in the user data header element at the beginning of the SMS
-user data. This information may show up as garbage in such phones.
-.TP
-\fB\-C\fP \fIservice centre address\fP, \fB\-\-sca\fP \fIservice centre address\fP
-Sets the service centre address to use for all SUBMIT SMSs (may not
-work with some phones).
-.TP
-\fB\-d\fP \fIdevice\fP, \fB\-\-device\fP \fIdevice\fP
-The device to which the GSM modem is connected. The default is
-\fI/dev/mobilephone\fP.
-.TP
-\fB\-D\fP, \fB\-\-direct\fP
-Enables direct routing of incoming SMS messages to the TE. This is not
-supported by many mobile phone/GSM modem combinations. Therefore, the
-default is to store incoming SMS temporarily before processing them in 
-the indicated store.
-.TP
-\fB\-f\fP, \fB\-\-flush\fP
-This option causes \fIgsmsmsd\fP to flush (ie. read and erase)
-existing SMS messages from
-the SMS store selected by the \fB\-\-store\fP option. The action given
-by the \fB\-\-action\fP option is executed on each of the flushed
-SMS. This option should be used to ensure that enough space is
-available in the SMS store for temporary storage of incoming SMS,
-otherwise incoming SMS might be ignored silently by the ME.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Prints an option summary.
-.TP
-\fB\-I\fP \fIinit string\fP, \fB\-\-init\fP \fIinit string\fP
-Initialization string to send to the TA (default: "E0"). Note that the
-sequence "ATZ" is sent first.
-.TP
-\fB\-r\fP, \fB\-\-requeststat\fP
-Request status reports for sent SMS. Note: This option only makes
-sense if the phone supports routing of status reports to the
-TE. Otherwise the status reports might show on the phone's display or
-get lost.
-.TP
-\fB\-s\fP \fIspool directory\fP, \fB\-\-spool\fP \fIspool directory\fP
-This option sets the spool directory where \fIgsmsmsd\fP expects SMS
-messages to send. The format of SMS files is very simple: The first
-line contains the phone number of the recipient. Everything else after 
-the first line is interpreted as the SMS text. Please refer to 
-.BR gsmsendsms(1)
-for details on the SMS text character set and maximum length.
-\fIgsmsmsd\fP polls the spool directory every 5 seconds. Sent
-SMS message files are removed.
-.TP
-\fB\-t\fP \fISMS store name\fP, \fB\-\-store\fP \fISMS store name\fP
-The name of the SMS store to read from (for the \fB\-\-flush\fP option)
-or write to (for temporary SMS storage). This option must
-be must be used in conjunction with the \fB\-\-flush\fP option. If this
-option is omitted the ME uses it's default SMS store for temporary
-storage of incoming SMS. A commonly available message
-store is "SM" (SIM card).
-.TP
-\fB\-v\fP, \fB\-\-version\fP
-Prints the program version.
-.TP
-\fB\-X\fP, \fB\-\-xonxoff\fP
-Uses software handshaking (XON/XOFF) for accessing the device.
-.PP
-.SH EXAMPLES
-The following invocation of \fIgsmsmsd\fP sends each incoming SMS message
-as a mail to the user "smsadmin":
-.PP
-.nf
-gsmsmsd \-d /dev/ttyS2 \-b 19200 \-a "mail smsadmin"
-.fi
-.PP
-This is the format of SMS deliver messages as output from \fIgsmsmsd\fP:
-.PP
-.nf
-----------------------------------------------------------------
-Message type: SMS\-DELIVER
-SC address: '491710762100'
-More messages to send: 1
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: '01805000102'
-Protocol identifier: 0x39
-Data coding scheme: default alphabet
-SC timestamp: 17.12.98 14:10:55(+0100)
-User data length: 159
-User data header: 0x
-User data: 'Nicht vergessen! Die XtraWeihnachtsverlosung lauft
-noch bis zum 24.12. Nutzen Sie jetzt Ihre Gewinnchance und faxen
-Sie Ihren Teiln.-Gutschein an 0180/5000 056'
-----------------------------------------------------------------
-.fi
-.PP
-This is the format of SMS status report messages as output from \fIgsmsmsd\fP:
-.PP
-.nf
-----------------------------------------------------------------
-Message type: SMS\-STATUS\-REPORT
-SC address: ''
-More messages to send: 0
-Status report qualifier: 0
-Message reference: 0
-Recipient address: ''
-SC timestamp: 00.00.00 00:00:00(+0000)
-Discharge time: 00.00.00 00:00:00(+0000)
-Status: 0x0 'Short message received by the SME'
-----------------------------------------------------------------
-.fi
-.PP
-The following invocation of \fIgsmsmsd\fP flushes all existing
-messages from the "SM" SMS store and looks in the "/tmp/spooldir"
-directory for SMS to send:
-.PP
-.nf
-gsmsmsd \-d /dev/ttyS2 \-\-spool /tmp/spooldir \-f \-\-store sm \\
-\-\-action 'mail smsadmin'
-.fi
-.PP
-.SH FILES
-.TP 1.4i
-.B /dev/mobilephone
-Default mobile phone device.
-.PP
-.SH AUTHOR
-Peter Hofmann <software@pxh.de>
-.PP
-.SH BUGS
-Cell broadcast SMS message reception has not been tested, but it has
-been enabled in the \fIgsmsmsd\fP daemon.
-.PP
-The mobile phone device is blocked when the \fIgsmsmsd\fP daemon is
-running, ie. it cannot be used for data transfer or from the other
-programs of this suite (\fIgsmpb\fP, \fIgsmsms\fP).
-.PP
-Report bugs to software@pxh.de.  Include a complete, self-contained
-example that will allow the bug to be reproduced, and say which
-version of \fIgsmsmsd\fP you are using.
-.PP
-.SH COPYRIGHT
-Copyright \(co 1999 Peter Hofmann
-.LP
-\fIgsmsmsd\fP is free software; you can redistribute it and/or modify it under
-the terms of the GNU Library General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-.LP
-\fIgsmsmsd\fP 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
-Library General Public License for more details.
-.LP
-You should have received a copy of the GNU Library General Public License along
-with \fIgsmsmsd\fP; see the file COPYING.  If not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-.PP
-.SH "SEE ALSO"
-.BR gsminfo(7),
-.BR gsmpb(1),
-.BR gsmctl(1),
-.BR gsmsendsms(1),
-.BR gsmsmsstore(1).
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmsmsstore.man b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmsmsstore.man
deleted file mode 100644
index fb3fb9bc7f..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/doc/gsmsmsstore.man
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" -*- eval: (nroff-mode) -*-
-.de TQ
-.br
-.ns
-.TP \\$1
-..
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
-.TH GSMSMSSTORE 8 "##DATE##" "gsmsmsstore v##VERSION##"
-.SH NAME
-gsmsmsstore \- SMS store manipulation program
-.SH SYNOPSIS
-.B gsmsmsstore
-[ \fB\-a\fP ]
-[ \fB\-\-add\fP ]
-[ \fB\-b\fP \fIbaudrate\fP ]
-[ \fB\-\-baudrate\fP \fIbaudrate\fP ]
-[ \fB\-c\fP ]
-[ \fB\-\-copy\fP ]
-[ \fB\-C\fP \fIservice centre address\fP ]
-[ \fB\-\-sca\fP \fIservice centre address\fP ]
-[ \fB\-d\fP \fIdestination device or file\fP ]
-[ \fB\-\-destination\fP \fIdestination device or file\fP ]
-[ \fB\-h\fP ]
-[ \fB\-\-help\fP ]
-[ \fB\-I\fP \fIinit string\fP ]
-[ \fB\-\-init\fP \fIinit string\fP ]
-[ \fB\-k\fP ]
-[ \fB\-\-backup\fP ]
-[ \fB\-l\fP ]
-[ \fB\-\-list\fP ]
-[ \fB\-s\fP \fIsource device or file\fP ]
-[ \fB\-\-source\fP \fIsource device or file\fP ]
-[ \fB\-t\fP \fISMS store name\fP ]
-[ \fB\-\-store\fP \fISMS store name\fP ]
-[ \fB\-v\fP ]
-[ \fB\-\-version\fP ]
-[ \fB\-V\fP ]
-[ \fB\-\-verbose\fP ]
-[ \fB\-x\fP ]
-[ \fB\-\-delete\fP ]
-[ \fB\-X\fP ]
-[ \fB\-\-xonxoff\fP ]
-{ \fIindices\fP }
-[ \fIphonenumber\fP \fItext\fP ]
-.PP
-.SH DESCRIPTION
-\fIgsmsmsstore\fP can store or retrieve SMS messages entries residing
-in a GSM mobile phone's SMS store to or from a file, add SMS messages
-to a store, or list the store's contents. Additionally, it is possible
-to add SMS submit messages to a store.
-.PP
-\fIgsmsmsstore\fP reads entries from the source which can be a mobile
-phone (if a serial device file is given) or a file (if a file name is
-given). The source is never modified. \fIgsmsmsstore\fP writes SMS
-messages to a destination file or device in the case of \fB\-\-copy\fP,
-\fB\-\-backup\fP, and \fB\-\-add\fP.
-.PP
-The \fB\-\-list\fP option does not change any file but just lists the
-contents to standard output.
-.PP
-The \fB\-\-backup\fP and \fB\-\-copy\fP options require both source and
-destination files or devices. The \fB\-\-list\fP option requires a
-source. The \fB\-\-add\fP and \fB\-\-delete\fP options require a
-destination file or device.
-.PP
-If "\-" is given as the parameter for the \fB\-\-source\fP or
-\fB\-\-destination\fP options, the SMS store is read from standard input 
-and/or written to standard output, respectively.
-.PP
-SMS message files are not human-readable.
-.PP
-Error messages are printed to the standard error output. If the program
-terminates on error the error code 1 is returned.
-.PP
-.SH OPTIONS
-.TP
-\fB\-a\fP, \fB\-\-add\fP
-Adds an SMS submit message with recipient address \fIphonenumber\fP and 
-text \fItext\fP to the destination.
-.TP
-\fB\-b\fP \fIbaudrate\fP, \fB\-\-baudrate\fP \fIbaudrate\fP
-The baud rate to use. The default baudrate is 38400.
-.TP
-\fB\-c\fP, \fB\-\-copy\fP
-This causes the contents of the source to be copied to the
-destination. After this operation the destination has exactly the same
-contents as the source.  If \fIindices\fP are given on the command
-line only those SMS messages denoted by the indices are copied to the
-destination.
-.TP
-\fB\-C\fP \fIservice centre address\fP, \fB\-\-sca\fP \fIservice centre address\fP
-Sets the service centre address to use for all SUBMIT SMSs (may not
-work with some phones).
-.TP
-\fB\-d\fP \fIdestination\fP, \fB\-\-destination\fP \fIdestination\fP
-The destination device or file.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Prints an option summary.
-.TP
-\fB\-I\fP \fIinit string\fP, \fB\-\-init\fP \fIinit string\fP
-Initialization string to send to the TA (default: "E0"). Note that the
-sequence "ATZ" is sent first.
-.TP
-\fB\-k\fP, \fB\-\-backup\fP
-This causes those entries to be added from the source to the
-destination that are not already present in the destination.  If
-\fIindices\fP are given on the command line only those SMS messages
-denoted by the indices are backed up (ie. added) to the destination.
-.TP
-\fB\-l\fP, \fB\-\-list\fP
-Prints out the entire contents of the source in human-readable form.
-.TP
-\fB\-s\fP \fIsource\fP, \fB\-\-source\fP \fIsource\fP
-The source device or file.
-.TP
-\fB\-t\fP \fISMS store name\fP, \fB\-\-store\fP \fISMS store name\fP
-The name of the SMS store to read from or write to. This information is
-only used for device sources and destinations. A commonly available message
-store is "SM" (SIM card).
-.TP
-\fB\-v\fP, \fB\-\-version\fP
-Prints the program version.
-.TP
-\fB\-V\fP, \fB\-\-verbose\fP
-Prints out a detailed progress report.
-.TP
-\fB\-x\fP, \fB\-\-delete\fP
-Delete the SMS messages as denoted by the \fIindices\fP from the destination.
-.TP
-\fB\-X\fP, \fB\-\-xonxoff\fP
-Uses software handshaking (XON/XOFF) for accessing the device.
-.PP
-.SH EXAMPLES
-The following command lists all entries in the mobile phone connected
-to \fI/dev/mobilephone\fP to the standard output:
-.PP
-.nf
-gsmsmsstore \-b 19200 \-s /dev/mobilephone \-t SM \-l
-.fi
-.PP
-The following adds entries 4, 7, and 10 from the device
-\fI/dev/mobilephone\fP to the file \fIsmsstore\fP:
-.PP
-.nf
-gsmsmsstore \-s /dev/mobilephone \-d /home/fred/smsstore
-    \-t SM \-b 4 7 10
-.fi
-.PP
-.SH AUTHOR
-Peter Hofmann <software@pxh.de>
-.PP
-.SH BUGS
-Report bugs to software@pxh.de.  Include a complete, self-contained
-example that will allow the bug to be reproduced, and say which
-version of \fIgsmsmsstore\fP you are using.
-.PP
-.SH COPYRIGHT
-Copyright \(co 1999 Peter Hofmann
-.LP
-\fIgsmsmsstore\fP is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2, or (at
-your option) any later version.
-.LP
-\fIgsmsmsstore\fP 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
-Library General Public License for more details.
-.LP
-You should have received a copy of the GNU Library General Public License
-along with \fIgsmsmsstore\fP; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-.PP
-.SH "SEE ALSO"
-.BR gsminfo(7),
-.BR gsmctl(1),
-.BR gsmpb(1),
-.BR gsmsendsms(1),
-.BR gsmsmsd(8).
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/Makefile.am b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/Makefile.am
deleted file mode 100644
index 1c1d2fc3ce..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: Makefile for phone-specific extensions
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 16.12.2001
-# *************************************************************************
-
-INCLUDES =		-I..
-
-EXTRA_DIST =		README.sieme
-
-# build addon library
-lib_LTLIBRARIES =	libgsmext.la
-
-libgsmext_la_SOURCES =	gsm_sie_me.cc
-
-libgsmext_la_LDFLAGS =	-version-info $(GSM_VERSION)
-
-gsmincludedir =		$(includedir)/gsmlib
-
-gsminclude_HEADERS =	gsm_sie_me.h
-
-# build programs
-bin_PROGRAMS =		gsmsiectl gsmsiexfer
-
-# build gsmsiectl from gsmsiectl.cc and libgsmme.la
-gsmsiectl_SOURCES =	gsmsiectl.cc
-gsmsiectl_LDADD =	../gsmlib/libgsmme.la libgsmext.la $(INTLLIBS)
-
-# build gsmsiexfer from gsmsiexfer.cc and libgsmme.la
-gsmsiexfer_SOURCES =	gsmsiexfer.cc
-gsmsiexfer_LDADD =	../gsmlib/libgsmme.la libgsmext.la $(INTLLIBS)
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/Makefile.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/Makefile.in
deleted file mode 100644
index 42240fb530..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/Makefile.in
+++ /dev/null
@@ -1,480 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: Makefile for phone-specific extensions
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 16.12.2001
-# *************************************************************************
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AS = @AS@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-DATADIRNAME = @DATADIRNAME@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GSM_VERSION = @GSM_VERSION@
-HAVE_LIB = @HAVE_LIB@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIB = @LIB@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-
-INCLUDES = -I..
-
-EXTRA_DIST = README.sieme
-
-# build addon library
-lib_LTLIBRARIES = libgsmext.la
-
-libgsmext_la_SOURCES = gsm_sie_me.cc
-
-libgsmext_la_LDFLAGS = -version-info $(GSM_VERSION)
-
-gsmincludedir = $(includedir)/gsmlib
-
-gsminclude_HEADERS = gsm_sie_me.h
-
-# build programs
-bin_PROGRAMS = gsmsiectl gsmsiexfer
-
-# build gsmsiectl from gsmsiectl.cc and libgsmme.la
-gsmsiectl_SOURCES = gsmsiectl.cc
-gsmsiectl_LDADD = ../gsmlib/libgsmme.la libgsmext.la $(INTLLIBS)
-
-# build gsmsiexfer from gsmsiexfer.cc and libgsmme.la
-gsmsiexfer_SOURCES = gsmsiexfer.cc
-gsmsiexfer_LDADD = ../gsmlib/libgsmme.la libgsmext.la $(INTLLIBS)
-subdir = ext
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/gsm_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libgsmext_la_LIBADD =
-am_libgsmext_la_OBJECTS = gsm_sie_me.lo
-libgsmext_la_OBJECTS = $(am_libgsmext_la_OBJECTS)
-bin_PROGRAMS = gsmsiectl$(EXEEXT) gsmsiexfer$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_gsmsiectl_OBJECTS = gsmsiectl.$(OBJEXT)
-gsmsiectl_OBJECTS = $(am_gsmsiectl_OBJECTS)
-gsmsiectl_DEPENDENCIES = ../gsmlib/libgsmme.la libgsmext.la
-gsmsiectl_LDFLAGS =
-am_gsmsiexfer_OBJECTS = gsmsiexfer.$(OBJEXT)
-gsmsiexfer_OBJECTS = $(am_gsmsiexfer_OBJECTS)
-gsmsiexfer_DEPENDENCIES = ../gsmlib/libgsmme.la libgsmext.la
-gsmsiexfer_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gsm_sie_me.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsmsiectl.Po ./$(DEPDIR)/gsmsiexfer.Po
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(libgsmext_la_SOURCES) $(gsmsiectl_SOURCES) \
-	$(gsmsiexfer_SOURCES)
-HEADERS = $(gsminclude_HEADERS)
-
-DIST_COMMON = $(gsminclude_HEADERS) Makefile.am Makefile.in
-SOURCES = $(libgsmext_la_SOURCES) $(gsmsiectl_SOURCES) $(gsmsiexfer_SOURCES)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  ext/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libgsmext.la: $(libgsmext_la_OBJECTS) $(libgsmext_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libgsmext_la_LDFLAGS) $(libgsmext_la_OBJECTS) $(libgsmext_la_LIBADD) $(LIBS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-gsmsiectl$(EXEEXT): $(gsmsiectl_OBJECTS) $(gsmsiectl_DEPENDENCIES) 
-	@rm -f gsmsiectl$(EXEEXT)
-	$(CXXLINK) $(gsmsiectl_LDFLAGS) $(gsmsiectl_OBJECTS) $(gsmsiectl_LDADD) $(LIBS)
-gsmsiexfer$(EXEEXT): $(gsmsiexfer_OBJECTS) $(gsmsiexfer_DEPENDENCIES) 
-	@rm -f gsmsiexfer$(EXEEXT)
-	$(CXXLINK) $(gsmsiexfer_LDFLAGS) $(gsmsiexfer_OBJECTS) $(gsmsiexfer_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_sie_me.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmsiectl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmsiexfer.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cc.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cc.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-
-.cc.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-gsmincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-install-gsmincludeHEADERS: $(gsminclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(gsmincludedir)
-	@list='$(gsminclude_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(gsmincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gsmincludedir)/$$f"; \
-	  $(gsmincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gsmincludedir)/$$f; \
-	done
-
-uninstall-gsmincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(gsminclude_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(gsmincludedir)/$$f"; \
-	  rm -f $(DESTDIR)$(gsmincludedir)/$$f; \
-	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(gsmincludedir)
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-gsmincludeHEADERS
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-uninstall-am: uninstall-binPROGRAMS uninstall-gsmincludeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES
-
-.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am \
-	install-gsmincludeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-gsmincludeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/README.sieme b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/README.sieme
deleted file mode 100644
index 4305ae33a2..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/README.sieme
+++ /dev/null
@@ -1,75 +0,0 @@
-Extended support for Siemens mobile phones via gsmlib
------------------------------------------------------
-
-* Hardware:
-
-Supported phones: S25, S35, S45, ME45, SL45
-Tested phones: S45, ME45
-
-* Feature list:
-
- - ACM: Output ACM (accumulated call meter) and ACMmax	=> maybe not
-
- - BNR/BNW: Binary read and write			=> yes, xfer
-
- - CID: Output card ID					=> maybe
-
- - CKS: Output SIM card status				=> maybe
-
- - CNI: Output call number information			=> maybe
-
- - DBR: Database Read					=> yes, phonebook
-
- - DLD: Delete the "last number redial" memory		=> maybe dangerous?
-
- - GAUTH: Select Type of Authentication for PPP		=> no
-
- - ICO: Icon control					=> no
-
- - LCK: Switch locks on and off				=> yes, lock/unlock
-
- - LNG: Language settings				=> maybe
-
- - MGL: List SMS					=> no
-
- - MGO: SMS overflow indicator				=> no
-
- - MGR: Read SMS (same as AT+CMGR)			=> no
-
- - MSO: Switch device off				=> maybe not
-
- - NFS: Select NF hardware				=> maybe
-
- - NFV: Set the volume					=> maybe
-
- - PBC: Seek in telephone book				=> no
-
- - PBG: Sorted telephone book				=> yes
-
- - PBS: Select a telephone book				=> yes
-
- - PIC: Output PIN counter				=> maybe
-
- - PLM: Read the PLMN list				=> yes
-
- - PLR/PLW: read/write preferred-operator list		=> yes
-
- - PST: Play Signal Tone				=> yes
-
- - PWD: Change password to a lock			=> maybe
-
- - RTC: Set the ringing tone				=> yes
-
- - STK: SIM toolkit					=> no
-
-
-* Additional References
-
-http://www.s45-world.net/vissie.htm
-
-
-* Author and contact
-
-Christian W. Zuckschwerdt <zany@triq.net>
-http://triq.net/gsm.html
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsm_sie_me.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsm_sie_me.cc
deleted file mode 100644
index fb22260836..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsm_sie_me.cc
+++ /dev/null
@@ -1,258 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sie_me.cc
-// *
-// * Purpose: Mobile Equipment/Terminal Adapter and SMS functions
-// *          (According to "AT command set for S45 Siemens mobile phones"
-// *           v1.8, 26. July 2001 - Common AT prefix is "^S")
-// *
-// * Author:  Christian W. Zuckschwerdt  <zany@triq.net>
-// *
-// * Created: 2001-12-15
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_parser.h>
-#include <gsmlib/gsm_util.h>
-#include <gsm_sie_me.h>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-// SieMe members
-
-void SieMe::init() throw(GsmException)
-{
-}
-
-SieMe::SieMe(Ref<Port> port) throw(GsmException) : MeTa::MeTa(port)
-{
-  // initialize Siemens ME
-
-  init();
-}
-
-vector<string> SieMe::getSupportedPhonebooks() throw(GsmException)
-{
-  Parser p(_at->chat("^SPBS=?", "^SPBS:"));
-  return p.parseStringList();
-}
-
-string SieMe::getCurrentPhonebook() throw(GsmException)
-{
-  if (_lastPhonebookName == "")
-  {
-    Parser p(_at->chat("^SPBS?", "^SPBS:"));
-    // answer is e.g. ^SPBS: "SM",41,250
-    _lastPhonebookName = p.parseString();
-    p.parseComma();
-    int _currentNumberOfEntries = p.parseInt();
-    p.parseComma();
-    int _maxNumberOfEntries = p.parseInt();
-  }
-  return _lastPhonebookName;
-}
-
-void SieMe::setPhonebook(string phonebookName) throw(GsmException)
-{
-  if (phonebookName != _lastPhonebookName)
-  {
-    _at->chat("^SPBS=\"" + phonebookName + "\"");
-    _lastPhonebookName = phonebookName;
-  }
-}
-
-
-IntRange SieMe:: getSupportedSignalTones() throw(GsmException)
-{
-  Parser p(_at->chat("^SPST=?", "^SPST:"));
-  // ^SPST: (0-4),(0,1)
-  IntRange typeRange = p.parseRange();
-  p.parseComma();
-  vector<bool> volumeList = p.parseIntList();
-  return typeRange;
-}
-
-void SieMe:: playSignalTone(int tone) throw(GsmException)
-{
-  _at->chat("^SPST=" + intToStr(tone) + ",1");
-}
-
-void SieMe:: stopSignalTone(int tone) throw(GsmException)
-{
-  _at->chat("^SPST=" + intToStr(tone) + ",0");
-}
-
-
-IntRange SieMe::getSupportedRingingTones() throw(GsmException) // (AT^SRTC=?)
-{
-  Parser p(_at->chat("^SRTC=?", "^SRTC:"));
-  // ^SRTC: (0-42),(1-5)
-  IntRange typeRange = p.parseRange();
-  p.parseComma();
-  IntRange volumeRange = p.parseRange();
-  return typeRange;
-}
-
-int SieMe::getCurrentRingingTone() throw(GsmException) // (AT^SRTC?)
-{
-  Parser p(_at->chat("^SRTC?", "^SRTC:"));
-  // ^SRTC: 41,2,0
-  int type = p.parseInt();
-  p.parseComma();
-  int volume = p.parseInt();
-  p.parseComma();
-  int ringing = p.parseInt();
-  return type;
-}
-
-void SieMe::setRingingTone(int tone, int volume) throw(GsmException)
-{
-  _at->chat("^SRTC=" + intToStr(tone) + "," + intToStr(volume));
-}
-
-void SieMe:: playRingingTone() throw(GsmException)
-{
-  // get ringing bool
-  Parser p(_at->chat("^SRTC?", "^SRTC:"));
-  // ^SRTC: 41,2,0
-  int type = p.parseInt();
-  p.parseComma();
-  int volume = p.parseInt();
-  p.parseComma();
-  int ringing = p.parseInt();
-
-  if (ringing == 0)
-    toggleRingingTone();
-}
-
-void SieMe::stopRingingTone() throw(GsmException)
-{
-  // get ringing bool
-  Parser p(_at->chat("^SRTC?", "^SRTC:"));
-  // ^SRTC: 41,2,0
-  int type = p.parseInt();
-  p.parseComma();
-  int volume = p.parseInt();
-  p.parseComma();
-  int ringing = p.parseInt();
-
-  if (ringing == 1)
-    toggleRingingTone();
-}
-
-void SieMe::toggleRingingTone() throw(GsmException) // (AT^SRTC)
-{
-  _at->chat("^SRTC");
-}
-
-// Siemens get supported binary read
-vector<ParameterRange> SieMe::getSupportedBinaryReads() throw(GsmException)
-{
-  Parser p(_at->chat("^SBNR=?", "^SBNR:"));
-  // ^SBNR: ("bmp",(0-3)),("mid",(0-4)),("vcf",(0-500)),("vcs",(0-50))
-
-  return p.parseParameterRangeList();
-}
-
-// Siemens get supported binary write
-vector<ParameterRange> SieMe::getSupportedBinaryWrites() throw(GsmException)
-{
-  Parser p(_at->chat("^SBNW=?", "^SBNW:"));
-  // ^SBNW: ("bmp",(0-3)),("mid",(0-4)),("vcf",(0-500)),("vcs",(0-50)),("t9d",(0))
-
-  return p.parseParameterRangeList();
-}
-
-// Siemens Binary Read
-BinaryObject SieMe::getBinary(string type, int subtype) throw(GsmException)
-{
-  // expect several response lines
-  vector<string> result;
-  result = _at->chatv("^SBNR=\"" + type + "\"," + intToStr(subtype), "^SBNR:");
-  // "bmp",0,1,5 <CR><LF> pdu <CR><LF> "bmp",0,2,5 <CR><LF> ...
-  // most likely to be PDUs of 382 chars (191 * 2)
-  string pdu;
-  int fragmentCount = 0;
-  for (vector<string>::iterator i = result.begin(); i != result.end(); ++i)
-  {
-    ++fragmentCount;
-    // parse header
-    Parser p(*i);
-    string fragmentType = p.parseString();
-    if (fragmentType != type)
-      throw GsmException(_("bad PDU type"), ChatError);
-    p.parseComma();
-    int fragmentSubtype = p.parseInt();
-    if (fragmentSubtype != subtype)
-      throw GsmException(_("bad PDU subtype"), ChatError);
-    p.parseComma();
-    int fragmentNumber = p.parseInt();
-    if (fragmentNumber != fragmentCount)
-      throw GsmException(_("bad PDU number"), ChatError);
-    p.parseComma();
-    int numberOfFragments = p.parseInt();
-    if (fragmentNumber > numberOfFragments)
-      throw GsmException(_("bad PDU number"), ChatError);
-
-    // concat pdu fragment
-    ++i;
-    pdu += *i;
-  }
-
-  BinaryObject bnr;
-  bnr._type = type;
-  bnr._subtype = subtype;
-  bnr._size = pdu.length() / 2;
-  bnr._data = new unsigned char[pdu.length() / 2];
-  if (! hexToBuf(pdu, bnr._data))
-    throw GsmException(_("bad hexadecimal PDU format"), ChatError);
-
-  return bnr;
-}
-
-// Siemens Binary Write
-void SieMe::setBinary(string type, int subtype, BinaryObject obj)
-  throw(GsmException)
-{
-  if (obj._size <= 0)
-    throw GsmException(_("bad object"), ParameterError);
-
-  // Limitation: The maximum pdu size is 176 bytes (or 352 characters)
-  // this should be a configurable field 
-  int maxPDUsize = 176;
-  int numberOfPDUs = (obj._size + maxPDUsize - 1) / maxPDUsize;
-  unsigned char *p = obj._data;
-
-  for (int i = 1; i <= numberOfPDUs; ++i)
-  {
-    // construct pdu
-    int size = maxPDUsize;
-    if (i == numberOfPDUs)
-      size = obj._size - (numberOfPDUs - 1) * maxPDUsize;
-    string pdu = bufToHex(p, size);
-    p += size;
-
-    cout << "processing " << i << " of " << numberOfPDUs
-	 << " of " << size << " bytes." << endl;
-    cout << "^SBNW=\"" + type + "\"," + intToStr(subtype) + ","
-	+ intToStr(i) + "," + intToStr(numberOfPDUs) << endl;
-    cout << pdu << endl;
-
-    _at->sendPdu("^SBNW=\"" + type + "\"," + intToStr(subtype) + ","
-		 + intToStr(i) + "," + intToStr(numberOfPDUs), "",
-		 pdu, true);
-    cout << "OK" << endl;
-  }
-}
-
-
-
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsm_sie_me.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsm_sie_me.h
deleted file mode 100644
index 2c827a0379..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsm_sie_me.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sie_me.h
-// *
-// * Purpose: Mobile Equipment/Terminal Adapter and SMS functions
-// *          (According to "AT command set for S45 Siemens mobile phones"
-// *           v1.8, 26. July 2001 - Common AT prefix is "^S")
-// *
-// * Author:  Christian W. Zuckschwerdt  <zany@triq.net>
-// *
-// * Created: 2001-12-15
-// *************************************************************************
-
-#ifndef GSM_SIE_ME_H
-#define GSM_SIE_ME_H
-
-#include <gsmlib/gsm_error.h>
-#include <gsmlib/gsm_at.h>
-#include <string>
-#include <vector>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // *** Siemens mobile phone binary objects (bitmap, midi, vcal, vcard)
-
-  struct BinaryObject
-  {
-    string _type;               // Object type
-    int _subtype;               // Object subtype (storage number)
-    unsigned char *_data;       // Object binary data
-    int _size;                  // Object data size
-  };
-
-  // *** this class allows extended access to Siemens moblie phones
-
-  class SieMe : public MeTa
-  {
-  private:
-    // init ME/TA to sensible defaults
-    void init() throw(GsmException);
-
-  public:
-    // initialize a new MeTa object given the port
-    SieMe(Ref<Port> port) throw(GsmException);
-
-
-    // get the current phonebook in the Siemens ME
-    vector<string> getSupportedPhonebooks() throw(GsmException);// (AT^SPBS=?)
-
-    // get the current phonebook in the Siemens ME
-    string getCurrentPhonebook() throw(GsmException); // (AT^SPBS?)
-
-    // set the current phonebook in the Siemens ME
-    // remember the last phonebook set for optimisation
-    void setPhonebook(string phonebookName) throw(GsmException); // (AT^SPBS=)
-
-
-    // Siemens get supported signal tones
-    IntRange getSupportedSignalTones() throw(GsmException); // (AT^SPST=?)
-
-    // Siemens set ringing tone
-    void playSignalTone(int tone) throw(GsmException); // (AT^SRTC=x,1)
-
-    // Siemens set ringing tone
-    void stopSignalTone(int tone) throw(GsmException); // (AT^SRTC=x,0)
-
-
-    // Siemens get ringing tone
-    IntRange getSupportedRingingTones() throw(GsmException); // (AT^SRTC=?)
-    // Siemens get ringing tone
-    int getCurrentRingingTone() throw(GsmException); // (AT^SRTC?)
-    // Siemens set ringing tone
-    void setRingingTone(int tone, int volume) throw(GsmException);// (AT^SRTC=)
-    // Siemens set ringing tone on
-    void playRingingTone() throw(GsmException);
-    // Siemens set ringing tone of
-    void stopRingingTone() throw(GsmException);
-    // Siemens toggle ringing tone
-    void toggleRingingTone() throw(GsmException); // (AT^SRTC)
-
-    // Siemens get supported binary read
-    vector<ParameterRange> getSupportedBinaryReads() throw(GsmException);
-
-    // Siemens get supported binary write
-    vector<ParameterRange> getSupportedBinaryWrites() throw(GsmException);
-
-    // Siemens Binary Read
-    BinaryObject getBinary(string type, int subtype) throw(GsmException);
-
-    // Siemens Binary Write
-    void setBinary(string type, int subtype, BinaryObject obj)
-      throw(GsmException);
-  };
-};
-
-#endif // GSM_ME_TA_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsmsiectl.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsmsiectl.cc
deleted file mode 100644
index 4ea92edfea..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsmsiectl.cc
+++ /dev/null
@@ -1,698 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsmsiectl.cc
-// *
-// * Purpose: GSM Siemens mobile phone control program
-// *
-// * Author:  Christian W. Zuckschwerdt  <zany@triq.net>
-// *
-// * Created: 2001-12-15
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <string>
-#if defined(HAVE_GETOPT_LONG) || defined(WIN32)
-#include <getopt.h>
-#endif
-#include <strstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsm_sie_me.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_sysdep.h>
-#ifdef WIN32
-#include <gsmlib/gsm_win32_serial.h>
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#include <unistd.h>
-#endif
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-// my ME
-
-static SieMe *m;
-
-// information parameters
-
-enum InfoParameter {AllInfo, // print all info
-                    MeInfo,     // MeInfo must be first!
-                    OperatorInfo,
-                    CurrentOperatorInfo,
-                    FacilityLockStateInfo,
-                    FacilityLockCapabilityInfo,
-                    PasswordInfo,
-                    CLIPInfo,
-                    CallForwardingInfo,
-                    BatteryInfo,
-                    BitErrorInfo,
-                    SCAInfo,
-                    CharSetInfo,
-                    PhonebookInfo, // extended Siemens info
-		    SignalToneInfo,
-		    RingingToneInfo,
-		    BinaryInfo,
-                    SignalInfo}; // SignalInfo must be last!
-
-// operation parameters
-
-// FIXME operations not implemented yet
-
-// options
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longOpts[] =
-{
-  {"xonxoff", no_argument, (int*)NULL, 'X'},
-  {"operation", required_argument, (int*)NULL, 'o'},
-  {"device", required_argument, (int*)NULL, 'd'},
-  {"baudrate", required_argument, (int*)NULL, 'b'},
-  {"init", required_argument, (int*)NULL, 'I'},
-  {"help", no_argument, (int*)NULL, 'h'},
-  {"version", no_argument, (int*)NULL, 'v'},
-  {(char*)NULL, 0, (int*)NULL, 0}
-};
-#else
-#define getopt_long(argc, argv, options, longopts, indexptr) \
-  getopt(argc, argv, options)
-#endif
-
-// helper function, prints forwarding info
-
-void printForwardReason(string s, ForwardInfo &info)
-{
-  cout << s << "  "
-       << (info._active ? _("active ") : _("inactive "))
-       << _("number: ") << info._number
-       << _("  subaddr: ") << info._subAddr
-       << _("  time: ") << info._time << endl;
-}
-
-// helper function, prints integer range
-
-void printIntRange(IntRange ir)
-{
-  cout << "(" << ir._low;
-  if (ir._high != NOT_SET)
-    cout << "-" << ir._high;
-  cout << ")";
-}
-
-// helper function, prints parameter range
-
-void printParameterRange(ParameterRange pr)
-{
-  cout << "(\"" << pr._parameter << "\",";
-  printIntRange(pr._range);
-  cout << ")";
-}
-
-// print information
-
-static void printInfo(InfoParameter ip)
-{
-  switch (ip)
-  {
-  case MeInfo:
-  {
-    MEInfo mei = m->getMEInfo();
-    cout << _("<ME0>  Manufacturer: ") << mei._manufacturer << endl
-         << _("<ME1>  Model: ") << mei._model << endl
-         << _("<ME2>  Revision: ") << mei._revision << endl
-         << _("<ME3>  Serial Number: ") << mei._serialNumber << endl;
-    break;
-  }
-  case OperatorInfo:
-  {
-    int count = 0;
-    vector<OPInfo> opis = m->getAvailableOPInfo();
-    for (vector<OPInfo>::iterator i = opis.begin(); i != opis.end(); ++i)
-    {
-      cout << "<OP" << count << _(">  Status: ");
-      switch (i->_status)
-      {
-      case UnknownOPStatus: cout << _("unknown"); break;
-      case CurrentOPStatus: cout << _("current"); break;
-      case AvailableOPStatus: cout << _("available"); break;
-      case ForbiddenOPStatus: cout << _("forbidden"); break;
-      }
-      cout << _("  Long name: '") << i->_longName << "' "
-           << _("  Short name: '") << i->_shortName << "' "
-           << _("  Numeric name: ") << i->_numericName << endl;
-      ++count;
-    }
-    break;
-  }
-  case CurrentOperatorInfo:
-  {
-    OPInfo opi = m->getCurrentOPInfo();
-    cout << "<CURROP0>"
-         << _("  Long name: '") << opi._longName << "' "
-         << _("  Short name: '") << opi._shortName << "' "
-         << _("  Numeric name: ") << opi._numericName
-         << _("  Mode: ");
-    switch (opi._mode)
-    {
-    case AutomaticOPMode: cout << _("automatic"); break;
-    case ManualOPMode: cout << _("manual"); break;
-    case DeregisterOPMode: cout << _("deregister"); break;
-    case ManualAutomaticOPMode: cout << _("manual/automatic"); break;
-    }
-    cout << endl;
-    break;
-  }
-  case FacilityLockStateInfo:
-  {
-    int count = 0;
-    vector<string> fclc = m->getFacilityLockCapabilities();
-    for (vector<string>::iterator i = fclc.begin(); i != fclc.end(); ++i)
-      if (*i != "AB" && *i != "AG" && *i != "AC")
-      {
-        cout << "<FLSTAT" << count <<  ">  '" << *i << "'";
-        try
-        {
-          if (m->getFacilityLockStatus(*i, VoiceFacility))
-            cout << _("  Voice");
-        }
-        catch (GsmException &e)
-        {
-          cout << _("  unknown");
-        }
-        try
-        {
-        if (m->getFacilityLockStatus(*i, DataFacility))
-          cout << _("  Data");
-        }
-        catch (GsmException &e)
-        {
-          cout << _("  unknown");
-        }
-        try
-        {
-        if (m->getFacilityLockStatus(*i, FaxFacility))
-          cout << _("  Fax");
-        }
-        catch (GsmException &e)
-        {
-          cout << _("  unknown");
-        }
-        cout << endl;
-        ++count;
-      }
-    break;
-  }
-  case FacilityLockCapabilityInfo:
-  {
-    cout << "<FLCAP0>  ";
-    vector<string> fclc = m->getFacilityLockCapabilities();
-    for (vector<string>::iterator i = fclc.begin(); i != fclc.end(); ++i)
-      cout << "'" << *i << "' ";
-    cout << endl;
-    break;
-  }
-  case PasswordInfo:
-  {
-    vector<PWInfo> pwi = m->getPasswords();
-    int count = 0;
-    for (vector<PWInfo>::iterator i = pwi.begin(); i != pwi.end(); ++i)
-    {
-      cout << "<PW" << count <<  ">  '"
-           << i->_facility << "' " << i->_maxPasswdLen << endl;
-      ++count;
-    }
-    break;
-  }
-  case CLIPInfo:
-  {
-    cout << "<CLIP0>  " << (m->getNetworkCLIP() ? _("on") : _("off")) << endl;
-    break;
-  }
-  case CallForwardingInfo:
-  {
-    for (int r = 0; r < 4; ++r)
-    {
-      string text;
-      switch (r)
-      {
-      case 0: text = _("UnconditionalReason"); break;
-      case 1: text = _("MobileBusyReason"); break;
-      case 2: text = _("NoReplyReason"); break;
-      case 3: text = _("NotReachableReason"); break;
-      }
-      ForwardInfo voice, fax, data;
-      m->getCallForwardInfo((ForwardReason)r, voice, fax, data);
-      cout << "<FORW" << r << ".";
-      printForwardReason("0>  " + text + _("  Voice"), voice);
-      cout << "<FORW" << r << ".";
-      printForwardReason("1>  " + text + _("  Data"), data);
-      cout << "<FORW" << r << ".";
-      printForwardReason("2>  " + text + _("  Fax"), fax);
-    }
-    break;
-  }
-  case BatteryInfo:
-  {
-    cout << "<BATT0>  ";
-    int bcs = m->getBatteryChargeStatus();
-    switch (bcs)
-    {
-    case 0: cout << _("0 ME is powered by the battery") << endl; break;
-    case 1: cout << _("1 ME has a battery connected, but is not powered by it")
-                 << endl; break;
-    case 2: cout << _("2 ME does not have a battery connected") << endl; break;
-    case 3:
-      cout << _("3 Recognized power fault, calls inhibited") << endl;
-      break;
-    }
-    cout << "<BATT1>  " << m->getBatteryCharge() << endl;
-    break;
-  }
-  case BitErrorInfo:
-  {
-    cout << "<BITERR0>  " << m->getBitErrorRate() << endl;
-    break;
-  }
-  case SCAInfo:
-  {
-    cout << "<SCA0>  " << m->getServiceCentreAddress() << endl;
-    break;
-  }
-  case CharSetInfo:
-  {
-    cout << "<CSET0>  ";
-    vector<string> cs = m->getSupportedCharSets();
-    for (vector<string>::iterator i = cs.begin(); i != cs.end(); ++i)
-      cout << "'" << *i << "' ";
-    cout << endl;
-    cout << "<CSET1>  '" << m->getCurrentCharSet() << "'" << endl;
-    break;
-  }
-  case SignalInfo:
-  {
-    cout << "<SIG0>  " << m->getSignalStrength() << endl;
-    break;
-  }
-  case PhonebookInfo:
-  {
-    cout << "<PBOOK0>  ";
-    vector<string> pb = m->getSupportedPhonebooks();
-    for (vector<string>::iterator i = pb.begin(); i != pb.end(); ++i)
-      cout << "'" << *i << "' ";
-    cout << endl;
-    cout << "<PBOOK1>  '" << m->getCurrentPhonebook() << "'" << endl;
-    break;
-  }
-  case SignalToneInfo:
-  {
-    cout << "<SIGNAL0>  ";
-    IntRange st = m->getSupportedSignalTones();
-    printIntRange(st);
-    cout << endl;
-//    cout << "<SIGT1>  '" << m->getCurrentSignalTone() << "'" << endl;
-    break;
-  }
-  case RingingToneInfo:
-  {
-    cout << "<RING0>  ";
-    IntRange rt = m->getSupportedRingingTones();
-    printIntRange(rt);
-    cout << endl;
-    cout << "<RING1>  " << m->getCurrentRingingTone() << endl;
-    break;
-  }
-  case BinaryInfo:
-  {
-    cout << "<BIN0>  ";
-    vector<ParameterRange> bnr = m->getSupportedBinaryReads();
-    for (vector<ParameterRange>::iterator i = bnr.begin(); i != bnr.end(); ++i)
-    {
-      printParameterRange(*i);
-      cout << " ";
-    }
-    cout << endl;
-    cout << "<BIN1>  ";
-    vector<ParameterRange> bnw = m->getSupportedBinaryWrites();
-    for (vector<ParameterRange>::iterator i = bnw.begin(); i != bnw.end(); ++i)
-    {
-      printParameterRange(*i);
-      cout << " ";
-    }
-    cout << endl;
-    break;
-  }
-  default:
-    assert(0);
-    break;
-  }
-}
-
-// convert facility class string of the form "", "all", or any combination
-// of "v" (voice), "d" (data), or "f" (fax) to numeric form
-
-FacilityClass strToFacilityClass(string facilityClassS)
-{
-  facilityClassS = lowercase(facilityClassS);
-  FacilityClass facilityClass = (FacilityClass)0;
-  if (facilityClassS == "all" || facilityClassS == "")
-    return (FacilityClass)ALL_FACILITIES;
-
-  // OR in facility class bits
-  for (unsigned int i = 0; i < facilityClassS.length(); ++i)
-    if (facilityClassS[i] == 'v')
-      facilityClass = (FacilityClass)(facilityClass | VoiceFacility);
-    else if (facilityClassS[i] == 'd')
-      facilityClass = (FacilityClass)(facilityClass | DataFacility);
-    else if (facilityClassS[i] == 'f')
-      facilityClass = (FacilityClass)(facilityClass | FaxFacility);
-    else
-      throw GsmException(
-        stringPrintf(_("unknown facility class parameter '%c'"),
-                     facilityClassS[i]), ParameterError);
-
-  return facilityClass;
-}
-
-// check if argc - optind is in range min..max
-// throw exception otherwise
-
-void checkParamCount(int optind, int argc, int min, int max)
-{
-  int paramCount = argc - optind;
-  if (paramCount < min)
-    throw GsmException(stringPrintf(_("not enough parameters, minimum number "
-                                      "of parameters is %d"), min),
-                       ParameterError);
-  else if (paramCount > max)
-    throw GsmException(stringPrintf(_("too many parameters, maximum number "
-                                      "of parameters is %d"), max),
-                       ParameterError);
-}
-
-// *** main program
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    // handle command line options
-    string device = "/dev/mobilephone";
-    string operation;
-    string baudrate;
-    string initString = DEFAULT_INIT_STRING;
-    bool swHandshake = false;
-
-    int opt;
-    int dummy;
-    while((opt = getopt_long(argc, argv, "I:o:d:b:hvX", longOpts, &dummy))
-          != -1)
-      switch (opt)
-      {
-      case 'X':
-        swHandshake = true;
-        break;
-      case 'I':
-        initString = optarg;
-        break;
-      case 'd':
-        device = optarg;
-        break;
-      case 'o':
-        operation = optarg;
-        break;
-      case 'b':
-        baudrate = optarg;
-        break;
-      case 'v':
-        cerr << argv[0] << stringPrintf(_(": version %s [compiled %s]"),
-                                        VERSION, __DATE__) << endl;
-        exit(0);
-        break;
-      case 'h':
-        cerr << argv[0] << _(": [-b baudrate][-d device][-h]"
-                             "[-I init string][-o operation]\n"
-                             "  [-v][-X]{parameters}") << endl
-             << endl
-             << _("  -b, --baudrate    baudrate to use for device "
-                  "(default: 38400)")
-             << endl
-             << _("  -d, --device      sets the destination device to "
-                  "connect to") << endl
-             << _("  -h, --help        prints this message") << endl
-             << _("  -I, --init        device AT init sequence") << endl
-             << _("  -o, --operation   operation to perform on the mobile \n"
-                  "                    phone with the specified parameters")
-             << endl
-             << _("  -v, --version     prints version and exits") << endl
-             << _("  -X, --xonxoff     switch on software handshake") << endl
-             << endl
-             << _("  parameters        parameters to use for the operation\n"
-                  "                    (if an operation is given) or\n"
-                  "                    a specification which kind of\n"
-                  "                    information to read from the mobile "
-                  "phone")
-             << endl << endl
-             << _("Refer to gsmctl(1) for details on the available parameters"
-                  " and operations.")
-             << endl << endl;
-        exit(0);
-        break;
-      case '?':
-        throw GsmException(_("unknown option"), ParameterError);
-        break;
-      }
-
-    // open the port and ME/TA
-    m = new SieMe(new
-#ifdef WIN32
-                 Win32SerialPort
-#else
-                 UnixSerialPort
-#endif
-                 (device,
-                  baudrate == "" ?
-                  DEFAULT_BAUD_RATE :
-                  baudRateStrToSpeed(baudrate),
-                  initString, swHandshake));
-    
-    if (operation == "")
-    {                           // process info parameters
-      for (int i = optind; i < argc; ++i)
-      {
-        string param = lowercase(argv[i]);
-        if (param == "all")
-          for (int ip = MeInfo; ip <= SignalInfo; ++ip)
-            printInfo((InfoParameter)ip);
-        else if (param == "me")
-          printInfo(MeInfo);
-        else if (param == "op")
-          printInfo(OperatorInfo);
-        else if (param == "currop")
-          printInfo(CurrentOperatorInfo);
-        else if (param == "flstat")
-          printInfo(FacilityLockStateInfo);
-        else if (param == "flcap")
-          printInfo(FacilityLockCapabilityInfo);
-        else if (param == "pw")
-          printInfo(PasswordInfo);
-        else if (param == "clip")
-          printInfo(CLIPInfo);
-        else if (param == "forw")
-          printInfo(CallForwardingInfo);
-        else if (param == "batt")
-          printInfo(BatteryInfo);
-        else if (param == "biterr")
-          printInfo(BitErrorInfo);
-        else if (param == "sig")
-          printInfo(SignalInfo);
-        else if (param == "sca")
-          printInfo(SCAInfo);
-        else if (param == "cset")
-          printInfo(CharSetInfo);
-        else if (param == "pbook")
-          printInfo(PhonebookInfo);
-        else if (param == "signal")
-          printInfo(SignalToneInfo);
-        else if (param == "ring")
-          printInfo(RingingToneInfo);
-        else if (param == "binary")
-          printInfo(BinaryInfo);
-        else
-          throw GsmException(
-            stringPrintf(_("unknown information parameter '%s'"),
-                         param.c_str()),
-            ParameterError);
-      }
-    }
-    else
-    {                           // process operation
-      operation = lowercase(operation);
-      if (operation == "dial")
-      {
-        // dial: number
-        checkParamCount(optind, argc, 1, 1);
-
-        m->dial(argv[optind]);
-        
-        // wait for keypress from stdin
-        char c;
-        read(1, &c, 1);
-      }
-      else if (operation == "setop")
-      {
-        // setop: opmode numeric FIXME allow long and numeric too
-        checkParamCount(optind, argc, 2, 2);
-        string opmodeS = lowercase(argv[optind]);
-        OPModes opmode;
-        if (opmodeS == "automatic")
-          opmode = AutomaticOPMode;
-        else if (opmodeS == "manual")
-          opmode = ManualOPMode;
-        else if (opmodeS == "deregister")
-          opmode = DeregisterOPMode;
-        else if (opmodeS == "manualautomatic")
-          opmode = ManualAutomaticOPMode;
-        else
-          throw GsmException(stringPrintf(_("unknown opmode parameter '%s'"),
-                                          opmodeS.c_str()), ParameterError);
-
-        m->setCurrentOPInfo(opmode, "" , "", checkNumber(argv[optind + 1]));
-      }
-      else if (operation == "lock")
-      {
-        // lock: facility [facilityclass] [passwd]
-        checkParamCount(optind, argc, 1, 3);
-        string passwd = (argc - optind == 3) ?
-          (string)argv[optind + 2] : (string)"";
-        
-        m->lockFacility(argv[optind],
-                        (argc - optind >= 2) ?
-                        strToFacilityClass(argv[optind + 1]) :
-                        (FacilityClass)ALL_FACILITIES,
-                        passwd);
-      }
-      else if (operation == "unlock")
-      {
-        // unlock: facility [facilityclass] [passwd]
-        checkParamCount(optind, argc, 1, 3);
-        string passwd = argc - optind == 3 ? argv[optind + 2] : "";
-        
-        m->unlockFacility(argv[optind],
-                          (argc - optind >= 2) ?
-                          strToFacilityClass(argv[optind + 1]) :
-                          (FacilityClass)ALL_FACILITIES,
-                          passwd);
-      }
-      else if (operation == "setpw")
-      {
-        // set password: facility oldpasswd newpasswd
-        checkParamCount(optind, argc, 1, 3);
-        string oldPasswd = argc - optind >= 2 ? argv[optind + 1] : "";
-        string newPasswd = argc - optind == 3 ? argv[optind + 2] : "";
-
-        m->setPassword(argv[optind], oldPasswd, newPasswd);
-      }
-      else if (operation == "forw")
-      {
-        // call forwarding: mode reason number [facilityclass] [forwardtime]
-        checkParamCount(optind, argc, 2, 5);
-
-        // get optional parameters facility class and forwardtime
-        int forwardTime = argc - optind == 5 ? checkNumber(argv[optind + 4]) :
-          NOT_SET;
-        FacilityClass facilityClass =
-          argc - optind >= 4 ? strToFacilityClass(argv[optind + 3]) :
-          (FacilityClass)ALL_FACILITIES;
-        
-        // get forward reason
-        string reasonS = lowercase(argv[optind + 1]);
-        ForwardReason reason;
-        if (reasonS == "unconditional")
-          reason = UnconditionalReason;
-        else if (reasonS == "mobilebusy")
-          reason = MobileBusyReason;
-        else if (reasonS == "noreply")
-          reason = NoReplyReason;
-        else if (reasonS == "notreachable")
-          reason = NotReachableReason;
-        else if (reasonS == "all")
-          reason = AllReasons;
-        else if (reasonS == "allconditional")
-          reason = AllConditionalReasons;
-        else
-          throw GsmException(
-            stringPrintf(_("unknown forward reason parameter '%s'"),
-                         reasonS.c_str()), ParameterError);
-        
-        // get mode
-        string modeS = lowercase(argv[optind]);
-        ForwardMode mode;
-        if (modeS == "disable")
-          mode = DisableMode;
-        else if (modeS == "enable")
-          mode = EnableMode;
-        else if (modeS == "register")
-          mode = RegistrationMode;
-        else if (modeS == "erase")
-          mode = ErasureMode;
-        else
-          throw GsmException(
-            stringPrintf(_("unknown forward mode parameter '%s'"),
-                         modeS.c_str()), ParameterError);
-
-        m->setCallForwarding(reason, mode,
-                             (argc - optind >= 3) ? argv[optind + 2] : "",
-                             "", // subaddr
-                             facilityClass, forwardTime);
-      }
-      else if (operation == "setsca")
-      {
-        // set sca: number
-        checkParamCount(optind, argc, 1, 1);
-        m->setServiceCentreAddress(argv[optind]);
-      }
-      else if (operation == "cset")
-      {
-        // set charset: string
-        checkParamCount(optind, argc, 1, 1);
-        m->setCharSet(argv[optind]);
-      }
-      else if (operation == "signal")
-      {
-        // play signal tone: int
-        checkParamCount(optind, argc, 1, 1);
-        int tone = atoi(argv[optind]);
-        m->playSignalTone(tone);
-      }
-      else if (operation == "setrt")
-      {
-        // set ringing tone: int int
-        checkParamCount(optind, argc, 2, 2);
-        int tone = atoi(argv[optind]);
-        int volume = atoi(argv[optind + 1]);
-        m->setRingingTone(tone, volume);
-      }
-      else if (operation == "playrt")
-      {
-        // play/stop ringing tone
-        m->toggleRingingTone();
-      }
-      else
-         throw GsmException(stringPrintf(_("unknown operation '%s'"),
-                                         operation.c_str()), ParameterError);
-    }
-  }
-  catch (GsmException &ge)
-  {
-    cerr << argv[0] << _("[ERROR]: ") << ge.what() << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsmsiexfer.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsmsiexfer.cc
deleted file mode 100644
index 90fce1f471..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/ext/gsmsiexfer.cc
+++ /dev/null
@@ -1,292 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsmsiexfer.cc
-// *
-// * Purpose: Siemens ME file transfer program
-// *
-// * Author:  Christian W. Zuckschwerdt  <zany@triq.net>
-// *
-// * Created: 2001-12-16
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <string>
-#ifdef WIN32
-#include <gsmlib/gsm_win32_serial.h>
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#include <unistd.h>
-#endif
-#if defined(HAVE_GETOPT_LONG) || defined(WIN32)
-#include <getopt.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsm_sie_me.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_sorted_phonebook.h>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-#ifdef HAVE_GETOPT_LONG
-static struct option longOpts[] =
-{
-  {"xonxoff", no_argument, (int*)NULL, 'X'},
-  {"init", required_argument, (int*)NULL, 'I'},
-  {"destination", required_argument, (int*)NULL, 'd'},
-  {"source", required_argument, (int*)NULL, 's'},
-  {"baudrate", required_argument, (int*)NULL, 'b'},
-  {"type", required_argument, (int*)NULL, 't'},
-  {"subtype", required_argument, (int*)NULL, 'i'},
-  {"help", no_argument, (int*)NULL, 'h'},
-  {"version", no_argument, (int*)NULL, 'v'},
-  {"verbose", no_argument, (int*)NULL, 'V'},
-  {(char*)NULL, 0, (int*)NULL, 0}
-};
-#else
-#define getopt_long(argc, argv, options, longopts, indexptr) \
-  getopt(argc, argv, options)
-#endif
-
-// I f*ck up this file IO thing.
-
-// read binary object from stdin
-BinaryObject readBinaryFile(istream &ifs, string filename)
-{
-  size_t size = 10000; // Bad coder, no biscuits!
-  BinaryObject bnr;
-  bnr._data = new unsigned char[size];
-  ifs.read((char*)bnr._data, size);
-  bnr._size = ifs.gcount();
-  return bnr;
-}
-
-// read binary object from file
-BinaryObject readFile(string filename)
-{
-  // open the file
-  ifstream ifs(filename.c_str());
-  if (ifs.bad())
-    throw GsmException(stringPrintf(_("cannot open file '%s'"),
-                                    filename.c_str()),
-                       OSError);
-  // and read the file
-  return readBinaryFile(ifs, filename);
-}
-
-// read binary object from stdin
-BinaryObject readFile(bool fromStdin)
-{
-  // read from stdin
-//  if (fromStdin)
-  return readBinaryFile(cin, (string)_("<STDIN>"));
-}
-
-// write binary object to file
-void writeBinaryFile(ostream &ofs, string filename, BinaryObject bnw)
-{
-  // well just dump the data
-  ofs.write((char*)bnw._data, bnw._size);
-}
-
-// write binary object
-void writeFile(string filename, BinaryObject obj)
-{
-  // open the file
-  ofstream ofs(filename.c_str());
-  if (ofs.bad())
-    throw GsmException(stringPrintf(_("cannot open file '%s'"),
-                                    filename.c_str()),
-                       OSError);
-  // and read the file
-  writeBinaryFile(ofs, filename, obj);
-}
-
-// write binary object to stdout
-void writeFile(bool toStdout, BinaryObject obj)
-{
-//  if (toStdout)
-  writeBinaryFile(cout, (string)_("<STDIN>"), obj);
-}
-
-// *** main program
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    // handle command line options
-    string destination;
-    string source;
-    string baudrate;
-    string type;
-    string subtype;
-    int subtypeN;
-    bool verbose = false;
-    string initString = DEFAULT_INIT_STRING;
-    bool swHandshake = false;
-    Ref<SieMe> sourceMeTa, destMeTa;
-    BinaryObject sourceObject;
-
-    int opt;
-    int dummy;
-    while((opt = getopt_long(argc, argv, "XI:s:d:b:hvVt:i:", longOpts,
-                             &dummy))
-          != -1)
-      switch (opt)
-      {
-      case 'X':
-        swHandshake = true;
-        break;
-      case 'I':
-        initString = optarg;
-        break;
-      case 'V':
-        verbose = true;
-        break;
-      case 't':
-        type = optarg;
-        break;
-      case 'i':
-        subtype = optarg;
-	subtypeN = atoi(optarg);
-        break;
-      case 'd':
-        destination = optarg;
-        break;
-      case 's':
-        source = optarg;
-        break;
-      case 'b':
-        baudrate = optarg;
-        break;
-      case 'v':
-        cerr << argv[0] << stringPrintf(_(": version %s [compiled %s]"),
-                                        VERSION, __DATE__) << endl;
-        exit(0);
-        break;
-      case 'h':
-        cerr << argv[0] << _(": [-b baudrate][-c][-d device or file][-h]"
-                             "[-I init string]\n"
-                             "  [-p phonebook name][-s device or file]"
-                             "[-t charset][-v]"
-                             "[-V][-y][-X]") << endl
-             << endl
-             << _("  -b, --baudrate    baudrate to use for device "
-                  "(default: 38400)")
-             << endl
-             << _("  -c, --copy        copy source entries to destination")
-             << endl
-             << _("  -d, --destination sets the destination device to "
-                  "connect \n"
-                  "                    to, or the file to write") << endl
-             << _("  -D, --destination-backend sets the destination backend")
-             << endl
-             << _("  -h, --help        prints this message") << endl
-             << _("  -i, --index       takes index positions into account")
-             << endl
-             << _("  -I, --init        device AT init sequence") << endl
-             << _("  -p, --phonebook   name of phonebook to use") << endl
-             << _("  -s, --source      sets the source device to connect to,\n"
-                  "                    or the file to read") << endl
-             << _("  -t, --charset     sets the character set to use for\n"
-                  "                    phonebook entries") << endl
-             << _("  -S, --source-backend sets the source backend")
-             << endl
-             << _("  -v, --version     prints version and exits") << endl
-             << _("  -V, --verbose     print detailed progress messages")
-             << endl
-             << _("  -X, --xonxoff     switch on software handshake") << endl
-             << _("  -y, --synchronize synchronize destination with source\n"
-                  "                    entries (destination is overwritten)\n"
-                  "                    (see gsmpb(1) for details)")
-             << endl << endl;
-        exit(0);
-        break;
-      case '?':
-        throw GsmException(_("unknown option"), ParameterError);
-        break;
-      }
-
-    // check if all parameters all present
-    if (destination == "" || source == "")
-      throw GsmException(_("both source and destination must be given"),
-                         ParameterError);
-
-    // start accessing source mobile phone or file
-    if (source == "-")
-      sourceObject = readFile(true);
-    else if (isFile(source))
-      sourceObject = readFile(source);
-    else
-    {
-      if (type == "")
-        throw GsmException(_("type be given"), ParameterError);
-      if (subtype == "")
-        throw GsmException(_("subtype be given"), ParameterError);
-
-      sourceMeTa = new SieMe(new
-#ifdef WIN32
-                            Win32SerialPort
-#else
-                            UnixSerialPort
-#endif
-                            (source,
-                             baudrate == "" ? DEFAULT_BAUD_RATE :
-                             baudRateStrToSpeed(baudrate), initString,
-                             swHandshake));
-      sourceObject = sourceMeTa->getBinary(type, subtypeN);
-    }
-
-    // make sure destination.c_str file exists
-    if (destination != "")
-    {
-      try
-      {
-        ofstream f(destination.c_str(), ios::out | ios::app);
-      }
-      catch (exception)
-      {
-      }
-    }
-
-    // start accessing destination mobile phone or file
-    if (destination == "-")
-      writeFile(true, sourceObject);
-    else if (isFile(destination))
-      writeFile(destination, sourceObject);
-    else
-    {
-      if (type == "")
-        throw GsmException(_("type must be given"), ParameterError);
-      if (subtype == "")
-        throw GsmException(_("subtype must be given"), ParameterError);
-
-      destMeTa = new SieMe(new 
-#ifdef WIN32
-                          Win32SerialPort
-#else
-                          UnixSerialPort
-#endif
-                          (destination,
-                           baudrate == "" ? DEFAULT_BAUD_RATE :
-                           baudRateStrToSpeed(baudrate), initString,
-                           swHandshake));
-      destMeTa->setBinary(type, subtypeN, sourceObject);
-    }
-  }
-  catch (GsmException &ge)
-  {
-    cerr << argv[0] << _("[ERROR]: ") << ge.what() << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/g41.patch b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/g41.patch
deleted file mode 100644
index 4c33e6a7d2..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/g41.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./gsmlib/gsm_me_ta.h~       2006-03-09 19:15:59.000000000 +0000
-+++ ./gsmlib/gsm_me_ta.h        2006-03-09 19:16:31.000000000 +0000
-@@ -291,8 +291,8 @@
-     // 3 disable phone receive RF circuits only
-     // 4 disable phone both transmit and receive RF circuits
-     // 5...127 implementation-defined
--    int MeTa::getFunctionalityLevel() throw(GsmException);
--    void MeTa::setFunctionalityLevel(int level) throw(GsmException);
-+    int getFunctionalityLevel() throw(GsmException);
-+    void setFunctionalityLevel(int level) throw(GsmException);
- 
-     // return battery charge status (+CBC):
-     // 0 ME is powered by the battery
-@@ -386,13 +386,13 @@
-     void setCallWaitingLockStatus(FacilityClass cl,
-                                   bool lock)throw(GsmException);
- 
--    void MeTa::setCLIRPresentation(bool enable) throw(GsmException);
-+    void setCLIRPresentation(bool enable) throw(GsmException);
-     //(+CLIR)
-     
-     // 0:according to the subscription of the CLIR service
-     // 1:CLIR invocation
-     // 2:CLIR suppression
--    int MeTa::getCLIRPresentation() throw(GsmException);
-+    int getCLIRPresentation() throw(GsmException);
- 
-     friend class Phonebook;
-     friend class SMSStore;
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsm_config.h.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsm_config.h.in
deleted file mode 100644
index 4ed31e1464..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsm_config.h.in
+++ /dev/null
@@ -1,344 +0,0 @@
-/* gsm_config.h.in.  Generated from configure.in by autoheader.  */
-/* used by libtool*/
-#define PACKAGE 0
-
-/* used by libtool*/
-#define VERSION 0
-
-/* Define if getopt_long() available */
-#undef HAVE_GETOPT_LONG
-
-/* Define if alarm() available */
-#undef HAVE_ALARM
-
-/* Define if netinet/in.h header available */
-#undef HAVE_NETINET_IN_H
-
-/* Define if string.h header available */
-#undef HAVE_STRING_H
-
-/* Define for NLS */
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-
-/* Define LOCALEDIR */
-#define LOCALEDIR "/usr/share/locale"
-
-/* Define if libintl.h header available */
-#undef HAVE_LIBINTL_H
-
-/* Define if vsnprintf() function available */
-#undef HAVE_VSNPRINTF
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#undef ENABLE_NLS
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
-
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#undef HAVE_DCGETTEXT
-
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-   don't. */
-#undef HAVE_DECL_FEOF_UNLOCKED
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-   you don't. */
-#undef HAVE_DECL_FGETS_UNLOCKED
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-   don't. */
-#undef HAVE_DECL_GETC_UNLOCKED
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-   don't. */
-#undef HAVE_DECL__SNPRINTF
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-   don't. */
-#undef HAVE_DECL__SNWPRINTF
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the `fwprintf' function. */
-#undef HAVE_FWPRINTF
-
-/* Define to 1 if you have the `getcwd' function. */
-#undef HAVE_GETCWD
-
-/* Define to 1 if you have the `getegid' function. */
-#undef HAVE_GETEGID
-
-/* Define to 1 if you have the `geteuid' function. */
-#undef HAVE_GETEUID
-
-/* Define to 1 if you have the `getgid' function. */
-#undef HAVE_GETGID
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define to 1 if you have the `getuid' function. */
-#undef HAVE_GETUID
-
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_INTMAX_T
-
-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
-#undef HAVE_INTTYPES_H
-
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-#undef HAVE_INTTYPES_H_WITH_UINTMAX
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if you have the `intl' library (-lintl). */
-#undef HAVE_LIBINTL
-
-/* Define to 1 if you have the <libintl.h> header file. */
-#undef HAVE_LIBINTL_H
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define if you have the 'long double' type. */
-#undef HAVE_LONG_DOUBLE
-
-/* Define if you have the 'long long' type. */
-#undef HAVE_LONG_LONG
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mempcpy' function. */
-#undef HAVE_MEMPCPY
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the `munmap' function. */
-#undef HAVE_MUNMAP
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define to 1 if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
-/* Define if your printf() function supports format strings with positions. */
-#undef HAVE_POSIX_PRINTF
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
-/* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#undef HAVE_STDINT_H_WITH_UINTMAX
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `stpcpy' function. */
-#undef HAVE_STPCPY
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the `tsearch' function. */
-#undef HAVE_TSEARCH
-
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
-/* Define if you have the 'wchar_t' type. */
-#undef HAVE_WCHAR_T
-
-/* Define to 1 if you have the `wcslen' function. */
-#undef HAVE_WCSLEN
-
-/* Define if you have the 'wint_t' type. */
-#undef HAVE_WINT_T
-
-/* Define to 1 if you have the `__argz_count' function. */
-#undef HAVE___ARGZ_COUNT
-
-/* Define to 1 if you have the `__argz_next' function. */
-#undef HAVE___ARGZ_NEXT
-
-/* Define to 1 if you have the `__argz_stringify' function. */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define to 1 if you have the `__fsetlocking' function. */
-#undef HAVE___FSETLOCKING
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#undef INTDIV0_RAISES_SIGFPE
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-#undef PRI_MACROS_BROKEN
-
-/* The size of a `unsigned int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_INT
-
-/* The size of a `unsigned long int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG_INT
-
-/* The size of a `unsigned short int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_SHORT_INT
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#undef SIZE_MAX
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define as the type of the result of subtracting two pointers, if the system
-   doesn't define it. */
-#undef ptrdiff_t
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-#undef signed
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-#undef uintmax_t
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.dirs b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.dirs
deleted file mode 100644
index 7bc765edd6..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.dirs
+++ /dev/null
@@ -1,11 +0,0 @@
-var/spool/sms/queue1
-var/spool/sms/queue2
-var/spool/sms/queue3
-var/spool/sms/sent1
-var/spool/sms/sent2
-var/spool/sms/sent3
-var/spool/sms/failed1
-var/spool/sms/failed2
-var/spool/sms/failed3
-var/spool/sms/tmp
-var/run/gsm-utils
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.postinst b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.postinst
deleted file mode 100644
index cc623b611b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.postinst
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-
-# create gsmsms group if necessary.
-if ! grep -q ^gsmsms: /etc/group; then
-#      echo Adding system group: gsmsms.
-       addgroup gsmsms 
-fi
-
-# create gsmsms user if necessary.
-if ! grep -q ^gsmsms: /etc/passwd; then
-#        echo Adding system user: gsmsms.
-        adduser --system --ingroup gsmsms \
-                --no-create-home --home /var/spool/sms gsmsms
-fi
-
-# allow gsmsms to use serial lines
-if ! groups gsmsms | grep -q dialout ; then
-        adduser gsmsms dialout
-fi
-
-# echo Updating spool directory structure: /var/spool/sms
-chown -R gsmsms:gsmsms /var/spool/sms /var/run/gsm-utils
-chmod 700 /var/spool/sms/*
-chmod 750 /var/spool/sms
-chmod 730 /var/spool/sms/queue* /var/spool/sms/tmp
-
-# Add the rest automatically..
-#DEBHELPER#
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.prerm b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.prerm
deleted file mode 100644
index 34c947e93e..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-deluser gsmsms  || true
-delgroup gsmsms || true
-
-# Add the rest automatically..
-#DEBHELPER#
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.undocumented b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.undocumented
deleted file mode 100644
index 62d096021d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib-1.10.debmg/debian/gsm-utils.undocumented
+++ /dev/null
@@ -1,2 +0,0 @@
-gsmsmsspool.1  
-gsmsmsrequeue.8
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib.spec b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib.spec
deleted file mode 100644
index c262954cc5..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib.spec
+++ /dev/null
@@ -1,92 +0,0 @@
-%define LIBVER 1.0.4
-Summary: Library to access GSM mobile phones through GSM modems
-Name: gsmlib
-Version: 1.10
-Release: 1
-Source: gsmlib-%{version}.tar.gz
-Group: System Environment/Libraries
-Copyright: GNU LIBRARY GENERAL PUBLIC LICENSE
-URL: http://www.pxh.de/fs/gsmlib/
-Vendor: Peter Hofmann <software@pxh.de>
-Buildroot: /var/tmp/gsmlib-root
-
-%package devel
-Summary: Development tools for programs which will use the gsmlib library.
-Group: Development/Libraries
-Requires: gsmlib
-
-%package ext
-Summary: Extensions to gsmlib to support non-standard phone features.
-Group:  Development/Libraries
-Requires: gsmlib
-
-%description
-This distribution contains a library to access
-GSM mobile phones through GSM modems. Features include:
- * modification of phonebooks stored in the
-   mobile phone or on the SIM card
- * reading and writing of SMS messages stored in
-   the mobile phone
- * sending and reception of SMS messages
-Additionally, some simple command line programs are
-provided to use these functionalities.
-
-%description devel
-The gsmlib-devel package includes the header files and static libraries
-necessary for developing programs which use the gsmlib library.
-
-%description ext
-The extension package of gsmlib contains programs, libraries, and
-documentation to support non-standard features of GSM phones. The
-following phones/phone types are currently supported:
- * Siemens GSM phones
-
-%prep
-%setup
-
-%build
-CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
-make
-
-%install
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-/usr/lib/libgsmme.so
-/usr/lib/libgsmme.so.%{LIBVER}
-/usr/bin/gsmsmsstore
-/usr/bin/gsmctl
-/usr/bin/gsmsmsd
-/usr/bin/gsmpb
-/usr/bin/gsmsendsms
-/usr/man/man1/gsmctl.1.gz
-/usr/man/man7/gsminfo.7.gz
-/usr/man/man1/gsmpb.1.gz
-/usr/man/man1/gsmsendsms.1.gz
-/usr/man/man8/gsmsmsd.8.gz
-/usr/man/man1/gsmsmsstore.1.gz
-/usr/share/locale/de/LC_MESSAGES/gsmlib.mo
-
-%doc README INSTALL ABOUT-NLS AUTHORS COPYING NEWS TODO
-%doc doc/README.NLS doc/README.developers doc/FAQ ChangeLog
-
-%files devel
-%defattr(-,root,root)
-/usr/lib/libgsmme.a
-/usr/include/gsmlib
-
-%files ext
-/usr/bin/gsmsiectl
-/usr/bin/gsmsiexfer
-/usr/lib/libgsmext.so
-/usr/lib/libgsmext.so.%{LIBVER}
-
-%doc ext/README.sieme
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/Makefile.am b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/Makefile.am
deleted file mode 100644
index 12d6948c52..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: GSM library Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 5.5.1999
-# *************************************************************************
-
-INCLUDES =		-I..
-
-lib_LTLIBRARIES =	libgsmme.la
-
-libgsmme_la_SOURCES =	gsm_phonebook.cc gsm_util.cc gsm_unix_serial.cc \
-			gsm_me_ta.cc gsm_at.cc gsm_error.cc gsm_parser.cc \
-			gsm_sms.cc gsm_sms_codec.cc gsm_sms_store.cc \
-			gsm_event.cc gsm_sorted_phonebook.cc \
-			gsm_sorted_sms_store.cc gsm_nls.cc \
-			gsm_sorted_phonebook_base.cc gsm_cb.cc
-
-gsmincludedir =		$(includedir)/gsmlib
-
-gsminclude_HEADERS =	gsm_at.h gsm_parser.h gsm_sms.h gsm_unix_serial.h \
-			gsm_error.h gsm_phonebook.h gsm_sms_codec.h \
-			gsm_util.h gsm_me_ta.h gsm_port.h gsm_sms_store.h \
-			gsm_event.h gsm_sorted_phonebook.h \
-			gsm_sorted_sms_store.h gsm_map_key.h \
-			gsm_sorted_phonebook_base.h gsm_cb.h
-
-noinst_HEADERS =	gsm_nls.h gsm_sysdep.h
-
-libgsmme_la_LDFLAGS =	-version-info $(GSM_VERSION)
-
-EXTRA_DIST =		gsm_win32_serial.h gsm_win32_serial.cc
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/Makefile.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/Makefile.in
deleted file mode 100644
index 5e1f2477cb..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/Makefile.in
+++ /dev/null
@@ -1,461 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: GSM library Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 5.5.1999
-# *************************************************************************
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AS = @AS@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-DATADIRNAME = @DATADIRNAME@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GSM_VERSION = @GSM_VERSION@
-HAVE_LIB = @HAVE_LIB@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIB = @LIB@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-
-INCLUDES = -I..
-
-lib_LTLIBRARIES = libgsmme.la
-
-libgsmme_la_SOURCES = gsm_phonebook.cc gsm_util.cc gsm_unix_serial.cc \
-			gsm_me_ta.cc gsm_at.cc gsm_error.cc gsm_parser.cc \
-			gsm_sms.cc gsm_sms_codec.cc gsm_sms_store.cc \
-			gsm_event.cc gsm_sorted_phonebook.cc \
-			gsm_sorted_sms_store.cc gsm_nls.cc \
-			gsm_sorted_phonebook_base.cc gsm_cb.cc
-
-
-gsmincludedir = $(includedir)/gsmlib
-
-gsminclude_HEADERS = gsm_at.h gsm_parser.h gsm_sms.h gsm_unix_serial.h \
-			gsm_error.h gsm_phonebook.h gsm_sms_codec.h \
-			gsm_util.h gsm_me_ta.h gsm_port.h gsm_sms_store.h \
-			gsm_event.h gsm_sorted_phonebook.h \
-			gsm_sorted_sms_store.h gsm_map_key.h \
-			gsm_sorted_phonebook_base.h gsm_cb.h
-
-
-noinst_HEADERS = gsm_nls.h gsm_sysdep.h
-
-libgsmme_la_LDFLAGS = -version-info $(GSM_VERSION)
-
-EXTRA_DIST = gsm_win32_serial.h gsm_win32_serial.cc
-subdir = gsmlib
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/gsm_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libgsmme_la_LIBADD =
-am_libgsmme_la_OBJECTS = gsm_phonebook.lo gsm_util.lo gsm_unix_serial.lo \
-	gsm_me_ta.lo gsm_at.lo gsm_error.lo gsm_parser.lo gsm_sms.lo \
-	gsm_sms_codec.lo gsm_sms_store.lo gsm_event.lo \
-	gsm_sorted_phonebook.lo gsm_sorted_sms_store.lo gsm_nls.lo \
-	gsm_sorted_phonebook_base.lo gsm_cb.lo
-libgsmme_la_OBJECTS = $(am_libgsmme_la_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gsm_at.Plo ./$(DEPDIR)/gsm_cb.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_error.Plo ./$(DEPDIR)/gsm_event.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_me_ta.Plo ./$(DEPDIR)/gsm_nls.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_parser.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_phonebook.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_sms.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_sms_codec.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_sms_store.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_sorted_phonebook.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_sorted_phonebook_base.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_sorted_sms_store.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_unix_serial.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gsm_util.Plo
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(libgsmme_la_SOURCES)
-HEADERS = $(gsminclude_HEADERS) $(noinst_HEADERS)
-
-DIST_COMMON = $(gsminclude_HEADERS) $(noinst_HEADERS) Makefile.am \
-	Makefile.in
-SOURCES = $(libgsmme_la_SOURCES)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  gsmlib/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libgsmme.la: $(libgsmme_la_OBJECTS) $(libgsmme_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libgsmme_la_LDFLAGS) $(libgsmme_la_OBJECTS) $(libgsmme_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_at.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_cb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_error.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_event.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_me_ta.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_nls.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_phonebook.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_sms.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_sms_codec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_sms_store.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_sorted_phonebook.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_sorted_phonebook_base.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_sorted_sms_store.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_unix_serial.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_util.Plo@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cc.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cc.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-
-.cc.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-gsmincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-install-gsmincludeHEADERS: $(gsminclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(gsmincludedir)
-	@list='$(gsminclude_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(gsmincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gsmincludedir)/$$f"; \
-	  $(gsmincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gsmincludedir)/$$f; \
-	done
-
-uninstall-gsmincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(gsminclude_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(gsmincludedir)/$$f"; \
-	  rm -f $(DESTDIR)$(gsmincludedir)/$$f; \
-	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(gsmincludedir)
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-gsmincludeHEADERS
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-uninstall-am: uninstall-gsmincludeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
-	distclean-depend distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-gsmincludeHEADERS install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	tags uninstall uninstall-am uninstall-gsmincludeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_at.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_at.cc
deleted file mode 100644
index 1c163d06e1..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_at.cc
+++ /dev/null
@@ -1,444 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_at.cc
-// *
-// * Purpose: Utility classes for AT command sequence handling
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 3.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_at.h>
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_error.h>
-#include <gsmlib/gsm_event.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <ctype.h>
-#include <strstream>
-
-using namespace std;
-using namespace gsmlib;
-
-// GsmAt members
-
-bool GsmAt::matchResponse(string answer, string responseToMatch)
-{
-  if (answer.substr(0, responseToMatch.length()) == responseToMatch)
-    return true;
-  else
-    // some TAs omit the ':' at the end of the response
-    if (_meTa.getCapabilities()._omitsColon &&
-        responseToMatch[responseToMatch.length() - 1] == ':' &&
-        answer.substr(0, responseToMatch.length() - 1) == 
-        responseToMatch.substr(0, responseToMatch.length() - 1))
-      return true;
-  return false;
-}
-
-string GsmAt::cutResponse(string answer, string responseToMatch)
-{
-  if (answer.substr(0, responseToMatch.length()) == responseToMatch)
-    return normalize(answer.substr(responseToMatch.length(),
-                                   answer.length() -
-                                   responseToMatch.length()));
-  else
-    // some TAs omit the ':' at the end of the response
-    if (_meTa.getCapabilities()._omitsColon &&
-        responseToMatch[responseToMatch.length() - 1] == ':' &&
-        answer.substr(0, responseToMatch.length() - 1) == 
-        responseToMatch.substr(0, responseToMatch.length() - 1))
-      return normalize(answer.substr(responseToMatch.length() - 1,
-                                     answer.length() -
-                                     responseToMatch.length() + 1));
-  assert(0);
-  return "";
-}
-
-void GsmAt::throwCmeException(string s) throw(GsmException)
-{
-  if (matchResponse(s, "ERROR"))
-    throw GsmException(_("unspecified ME/TA error"), ChatError);
-
-  bool meError = matchResponse(s, "+CME ERROR:");
-  if (meError)
-    s = cutResponse(s, "+CME ERROR:");
-  else
-    s = cutResponse(s, "+CMS ERROR:");
-  istrstream is(s.c_str());
-  int error;
-  is >> error;
-  throw GsmException(_("ME/TA error '") +
-                     (meError ? getMEErrorText(error) :
-                      getSMSErrorText(error)) +
-                     "' " +
-                     stringPrintf(_("(code %s)"), s.c_str()),
-                     ChatError, error);
-}
-
-GsmAt::GsmAt(MeTa &meTa) :
-  _meTa(meTa), _port(meTa.getPort()), _eventHandler(NULL)
-{
-}
-
-string GsmAt::chat(string atCommand, string response,
-                   bool ignoreErrors, bool acceptEmptyResponse)
-  throw(GsmException)
-{
-  string dummy;
-  return chat(atCommand, response, dummy, ignoreErrors, false,
-              acceptEmptyResponse);
-}
-
-string GsmAt::chat(string atCommand, string response, string &pdu,
-                   bool ignoreErrors, bool expectPdu,
-                   bool acceptEmptyResponse) throw(GsmException)
-{
-  string s;
-  bool gotOk = false;           // special handling for empty SMS entries
-
-  // send AT command
-  putLine("AT" + atCommand);
-  // and gobble up CR/LF (and possibly echoed characters if echo can't be
-  // switched off)
-  // Also, some mobiles (e.g., Sony Ericsson K800i) respond to commands
-  // like "at+cmgf=0" with "+CMGF: 0" on success as well as the "OK"
-  // status -- so gobble that (but not if that sort of response was expected)
-  // FIXME: this is a gross hack, should be done via capabilities or sth
-  #include <string>
-  string::size_type loc = atCommand.find( "=", 1 );
-  string expect;
-  if (loc != string::npos) {
-      expect = atCommand;
-      expect.replace(loc, 1, " ");
-      expect.insert(loc, ":");
-  } else {
-      expect = "";
-  }
-  do
-  {
-    s = normalize(getLine());
-  }
-  while (s.length() == 0 || s == "AT" + atCommand || 
-         ((response.length() == 0 || !matchResponse(s, response)) &&
-          (expect.length() > 0 && matchResponse(s, expect))));
-
-  // handle errors
-  if (matchResponse(s, "+CME ERROR:") || matchResponse(s, "+CMS ERROR:"))
-    if (ignoreErrors)
-      return "";
-    else
-      throwCmeException(s);
-  if (matchResponse(s, "ERROR"))
-    if (ignoreErrors)
-      return "";
-    else
-      throw GsmException(_("ME/TA error '<unspecified>' (code not known)"), 
-                         ChatError, -1);
-
-  // return if response is "OK" and caller says this is OK
-  if (acceptEmptyResponse && s == "OK")
-    return "";
-
-  // handle PDU if one is expected
-  if (expectPdu)
-  {
-    string ps;
-    do
-    {
-      ps = normalize(getLine());
-    }
-    while (ps.length() == 0 && ps != "OK");
-    if (ps == "OK")
-      gotOk = true;
-    else
-    {
-      pdu = ps;
-      // remove trailing zero added by some devices (e.g. Falcom A2-1)
-      if (pdu.length() > 0 && pdu[pdu.length() - 1] == 0)
-        pdu.erase(pdu.length() - 1);
-    }
-  }
-
-  // handle expected response
-  if (response.length() == 0)   // no response expected
-  {
-    if (s == "OK") return "";
-    // else fall through to error
-  }
-  else
-  {
-    string result;
-    // some TA/TEs don't prefix their response with the response string
-    // as proscribed by the standard: just handle either case
-    if (matchResponse(s, response))
-      result = cutResponse(s, response);
-    else
-      result = s;
-
-    if (gotOk)
-      return result;
-    else
-    {
-      // get the final "OK"
-      do
-      {
-        s = normalize(getLine());
-      }
-      while (s.length() == 0);
-
-      if (s == "OK") return result;
-      // else fall through to error
-    }
-  }
-  throw GsmException(
-    stringPrintf(_("unexpected response '%s' when sending 'AT%s'"),
-                 s.c_str(), atCommand.c_str()),
-    ChatError);
-}
-
-vector<string> GsmAt::chatv(string atCommand, string response,
-                            bool ignoreErrors) throw(GsmException)
-{
-  string s;
-  vector<string> result;
-
-  // send AT command
-  putLine("AT" + atCommand);
-  // and gobble up CR/LF (and possibly echoed characters if echo can't be
-  // switched off)
-  do
-  {
-    s = normalize(getLine());
-  }
-  while (s.length() == 0 || s == "AT" + atCommand);
-
-  // handle errors
-  if (matchResponse(s, "+CME ERROR:") || matchResponse(s, "+CMS ERROR:"))
-    if (ignoreErrors)
-      return result;
-    else
-      throwCmeException(s);
-  if (matchResponse(s, "ERROR"))
-    if (ignoreErrors)
-      return result;
-    else
-      throw GsmException(_("ME/TA error '<unspecified>' (code not known)"), 
-                         ChatError, -1);
-
-  // push all lines that are not empty
-  // cut response prefix if it is there
-  // stop when an OK line is read
-  while (1)
-  {
-    if (s == "OK")
-      return result;
-    // some TA/TEs don't prefix their response with the response string
-    // as proscribed by the standard: just handle either case
-    if (response.length() != 0 && matchResponse(s, response))
-      result.push_back(cutResponse(s, response));
-    else
-      result.push_back(s);
-    // get next line
-    do
-    {
-      s = normalize(getLine());
-    }
-    while (s.length() == 0);
-    reportProgress();
-  }
-
-  // never reached
-  assert(0);
-  return result;
-}
-
-string GsmAt::normalize(string s)
-{
-  size_t start = 0, end = s.length();
-  bool changed = true;
-
-  while (start < end && changed)
-  {
-    changed = false;
-    if (isspace(s[start]))
-    {
-      ++start;
-      changed = true;
-    }
-    else
-      if (isspace(s[end - 1]))
-      {
-        --end;
-        changed = true;
-      }
-  }
-  return s.substr(start, end - start);
-}
-
-string GsmAt::sendPdu(string atCommand, string response, string pdu,
-                      bool acceptEmptyResponse) throw(GsmException)
-{
-  string s;
-  bool errorCondition;
-  bool retry = false;
-  int tries = 5;                // How many error conditions do we accept
-
-  int c;
-  do
-  {
-    errorCondition = false;
-    putLine("AT" + atCommand);
-    do
-    {
-      retry = false;
-      try
-      {
-        do
-        {
-          // read first of two bytes "> "
-          c = readByte();
-	}
-        // there have been reports that some phones give spurious CRs
-	// LF separates CDSI messages if there are more than one
-	while (c == CR || c == LF);
-      }
-      catch (GsmException &e)
-      {
-        c = '-';
-        errorCondition = true;  // TA does not expect PDU anymore, retry
-      }
-
-      if (c == '+' || c == 'E') // error or unsolicited result code
-      {
-        _port->putBack(c);
-        s = normalize(getLine());
-        errorCondition = (s != "");
-      
-        retry = ! errorCondition;
-      }
-    }
-    while (retry);
-  }
-  while (errorCondition && tries--);
-
-  if (! errorCondition)
-  {
-    
-    if (c != '>' || readByte() != ' ')
-      throw GsmException(_("unexpected character in PDU handshake"),
-                         ChatError);
-    
-    putLine(pdu + "\032", false); // write pdu followed by CTRL-Z
-
-    // some phones (Ericcson T68, T39) send spurious zero characters after
-    // accepting the PDU
-    c = readByte();
-    if (c != 0)
-      _port->putBack(c);
-
-    // loop while empty lines (maybe with a zero, Ericsson T39m)
-    // or an echo of the pdu (with or without CTRL-Z)
-    // is read
-    do
-    {
-      s = normalize(getLine());
-    }
-    while (s.length() == 0 || s == pdu || s == (pdu + "\032") ||
-           (s.length() == 1 && s[0] == 0));
-  }
-
-  // handle errors
-  if (matchResponse(s, "+CME ERROR:") || matchResponse(s, "+CMS ERROR:"))
-    throwCmeException(s);
-  if (matchResponse(s, "ERROR"))
-    throw GsmException(_("ME/TA error '<unspecified>' (code not known)"), 
-                       ChatError, -1);
-
-  // return if response is "OK" and caller says this is OK
-  if (acceptEmptyResponse && s == "OK")
-    return "";
-
-  if (matchResponse(s, response))
-  {
-    string result = cutResponse(s, response);
-    // get the final "OK"
-    do
-    {
-      s = normalize(getLine());
-    }
-    while (s.length() == 0);
-
-    if (s == "OK") return result;
-    // else fall through to error
-  }
-  throw GsmException(
-    stringPrintf(_("unexpected response '%s' when sending 'AT%s'"),
-                 s.c_str(), atCommand.c_str()),
-    ChatError);
-}
-
-string GsmAt::getLine() throw(GsmException)
-{
-  if (_eventHandler == (GsmEvent*)NULL)
-    return _port->getLine();
-  else
-  {
-    bool eventOccurred;
-    string result;
-    do
-    {
-      eventOccurred = false;
-      result = _port->getLine();
-      string s = normalize(result);
-      if (matchResponse(s, "+CMT:") ||
-          matchResponse(s, "+CBM:") ||
-          matchResponse(s, "+CDS:") ||
-          matchResponse(s, "+CMTI:") ||
-          matchResponse(s, "+CBMI:") ||
-          matchResponse(s, "+CDSI:") ||
-          matchResponse(s, "RING") ||
-	  matchResponse(s, "NO CARRIER") ||
-          // hack: the +CLIP? sequence returns +CLIP: n,m
-          // which is NOT an unsolicited result code
-          (matchResponse(s, "+CLIP:") && s.length() > 10))
-      {
-        _eventHandler->dispatch(s, *this);
-        eventOccurred = true;
-      }
-    }
-    while (eventOccurred);
-    return result;
-  }
-}
-
-void GsmAt::putLine(string line,
-                    bool carriageReturn) throw(GsmException)
-{
-  _port->putLine(line, carriageReturn);
-  // remove empty echo line
-  if (carriageReturn)
-    getLine();
-}
-
-bool GsmAt::wait(GsmTime timeout) throw(GsmException)
-{
-  return _port->wait(timeout);
-}
-
-int GsmAt::readByte() throw(GsmException)
-{
-  return _port->readByte();
-}
-
-GsmEvent *GsmAt::setEventHandler(GsmEvent *newHandler)
-{
-  GsmEvent *result = _eventHandler;
-  _eventHandler = newHandler;
-  return result;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_at.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_at.h
deleted file mode 100644
index 96c3359425..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_at.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_at.h
-// *
-// * Purpose: Utility classes for AT command sequence handling
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 3.5.1999
-// *************************************************************************
-
-#ifndef GSM_AT_H
-#define GSM_AT_H
-
-#include <gsmlib/gsm_port.h>
-#include <string>
-#include <vector>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // forward declarations
-  
-  class GsmEvent;
-  class MeTa;
-
-  // utiliy class to handle AT sequences
-
-  class GsmAt : public RefBase
-  {
-  protected:
-    MeTa &_meTa;
-    Ref<Port> _port;
-    GsmEvent *_eventHandler;
-    
-    // return true if response matches
-    bool matchResponse(string answer, string responseToMatch);
-
-    // cut response and normalize
-    string cutResponse(string answer, string responseToMatch);
-
-    // parse CME error contained in string and throw MeTaException
-    void throwCmeException(string s) throw(GsmException);
-
-  public:
-    GsmAt(MeTa &meTa);
-
-    // return MeTa object for this AT object
-    MeTa &getMeTa() {return _meTa;}
-
-    // the following sequence functions recognize asynchronous messages
-    // from the TA and return the appropriate event
-
-    // send AT command, wait for response response, returns response line
-    // without response match
-    // if response == "" only an OK is expected
-    // white space at beginning or end are removed
-    // +CME ERROR or ERROR raises exception (if ignoreErrors == true)
-    // additionally, accept empty responses (just an OK)
-    //   if acceptEmptyResponse == true
-    //   in this case an empty string is returned
-    string chat(string atCommand = "",
-                string response = "",
-                bool ignoreErrors = false,
-                bool acceptEmptyResponse = false) throw(GsmException);
-
-    // same as chat() above but also get pdu if expectPdu == true
-    string chat(string atCommand,
-                string response,
-                string &pdu,
-                bool ignoreErrors = false,
-                bool expectPdu = true,
-                bool acceptEmptyResponse = false) throw(GsmException);
-
-    // same as above, but expect several response lines
-    vector<string> chatv(string atCommand = "",
-                         string response = "",
-                         bool ignoreErrors = false)
-      throw(GsmException);
-
-    // removes whitespace at beginning and end of string
-    string normalize(string s);
-
-    // send pdu (wait for <CR><LF><greater_than><space> and send <CTRL-Z>
-    // at the end
-    // return text after response
-    string sendPdu(string atCommand, string response, string pdu,
-		   bool acceptEmptyResponse = false) throw(GsmException);
-
-    // functions from class Port
-    string getLine() throw(GsmException);
-    void putLine(string line,
-                 bool carriageReturn = true) throw(GsmException);
-    bool wait(GsmTime timeout) throw(GsmException);
-    int readByte() throw(GsmException);
-
-    // set event handler class, return old one
-    GsmEvent *setEventHandler(GsmEvent *newHandler);
-  };
-};
-
-#endif // GSM_AT_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_cb.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_cb.cc
deleted file mode 100644
index 37c0e4aae7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_cb.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_cb.cc
-// *
-// * Purpose: Cell Broadcast Message Implementation
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 4.8.2001
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_sysdep.h>
-#include <gsmlib/gsm_cb.h>
-#include <gsmlib/gsm_nls.h>
-#include <strstream>
-
-using namespace std;
-using namespace gsmlib;
-
-// local constants
-
-static const string dashes =
-"---------------------------------------------------------------------------";
-
-// CBDataCodingScheme members
-
-CBDataCodingScheme::CBDataCodingScheme(unsigned char dcs) : _dcs(dcs)
-{
-  if ((_dcs & 0xf0) <= 0x30)    // bits 7..4 in the range 0000..0011
-    if ((_dcs & 0x30) == 0)
-      _language = (Language)_dcs;
-  else
-    _language = Unknown;
-}
-
-string CBDataCodingScheme::toString() const
-{
-  string result;
-  if (compressed()) result += _("compressed   ");
-  switch (getLanguage())
-  {
-  case German:
-    result += _("German");
-    break;
-  case English:
-    result += _("English");
-    break;
-  case Italian:
-    result += _("Italian");
-    break;
-  case French:
-    result += _("French");
-    break;
-  case Spanish:
-    result += _("Spanish");
-    break;
-  case Dutch:
-    result += _("Dutch");
-    break;
-  case Swedish:
-    result += _("Swedish");
-    break;
-  case Danish:
-    result += _("Danish");
-    break;
-  case Portuguese:
-    result += _("Portuguese");
-    break;
-  case Finnish:
-    result += _("Finnish");
-    break;
-  case Norwegian:
-    result += _("Norwegian");
-    break;
-  case Greek:
-    result += _("Greek");
-    break;
-  case Turkish:
-    result += _("Turkish");
-    break;
-  }
-  result += "   ";
-  switch (getAlphabet())
-  {
-  case DCS_DEFAULT_ALPHABET:
-    result += _("default alphabet");
-    break;
-  case DCS_EIGHT_BIT_ALPHABET:
-    result += _("8-bit alphabet");
-      break;
-  case DCS_SIXTEEN_BIT_ALPHABET:
-    result += _("16-bit alphabet");
-    break;
-  case DCS_RESERVED_ALPHABET:
-    result += _("reserved alphabet");
-    break;
-  }
-  return result;
-}
-
-// CBMessage members
-
-CBMessage::CBMessage(string pdu) throw(GsmException)
-{
-  SMSDecoder d(pdu);
-  _messageCode = d.getInteger(6) << 4;
-  _geographicalScope = (GeographicalScope)d.get2Bits();
-  _updateNumber = d.getInteger(4);
-  _messageCode |= d.getInteger(4);
-  _messageIdentifier = d.getInteger(8) << 8;
-  _messageIdentifier |= d.getInteger(8);
-  _dataCodingScheme = CBDataCodingScheme(d.getOctet());
-  _totalPageNumber = d.getInteger(4);
-  _currentPageNumber = d.getInteger(4);
-
-  // the values 82 and 93 come from ETSI GSM 03.41, section 9.3
-  d.markSeptet();
-  if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-  {
-    _data = d.getString(93);
-    _data = gsmToLatin1(_data);
-  }
-  else
-  {
-    unsigned char *s = 
-      (unsigned char*)alloca(sizeof(unsigned char) * 82);
-    d.getOctets(s, 82);
-    _data.assign((char*)s, (unsigned int)82);
-  }
-}
-
-string CBMessage::toString() const
-{
-  ostrstream os;
-  os << dashes << endl
-     << _("Message type: CB") << endl
-     << _("Geographical scope: ");
-  switch (_geographicalScope)
-  {
-  case CellWide:
-    os << "Cell wide" << endl;
-    break;
-  case PLMNWide:
-    os << "PLMN wide" << endl;
-    break;
-  case LocationAreaWide:
-    os << "Location area wide" << endl;
-    break;
-  case CellWide2:
-    os << "Cell wide (2)" << endl;
-    break;
-  }
-  // remove trailing \r characters for output
-  string data = _data;
-  string::iterator i;
-  for (i = data.end(); i > data.begin() && *(i - 1) == '\r';
-       --i);
-  data.erase(i, data.end());
-
-  os << _("Message Code: ") << _messageCode << endl
-     << _("Update Number: ") << _updateNumber << endl
-     << _("Message Identifer: ") << _messageIdentifier << endl
-     << _("Data coding scheme: ") << _dataCodingScheme.toString() << endl
-     << _("Total page number: ") << _totalPageNumber << endl
-     << _("Current page number: ") << _currentPageNumber << endl
-     << _("Data: '") << data << "'" << endl
-     << dashes << endl << endl << ends;
-  char *ss = os.str();
-  string result(ss);
-  delete[] ss;
-  return result;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_cb.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_cb.h
deleted file mode 100644
index 3457c8105c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_cb.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_cb.h
-// *
-// * Purpose: Cell Broadcast Message Implementation
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 4.8.2001
-// *************************************************************************
-
-#ifndef GSM_CB_H
-#define GSM_CB_H
-
-#include <gsmlib/gsm_sms_codec.h>
-#include <gsmlib/gsm_util.h>
-#include <string>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // representation of DataCodingScheme
-  // The data coding scheme is described in detail in ETSI GSM 03.38, section 5
-  // This class reuses the DCS_* constants from DataCodingScheme in 
-  // gsm_sms_codec
-
-  class CBDataCodingScheme
-  {
-  public:
-    enum Language {German = 0, English = 1, Italian = 2, French = 3,
-                   Spanish = 4, Dutch = 5, Swedish = 6, Danish = 7,
-                   Portuguese = 8, Finnish = 9, Norwegian = 10, Greek = 11,
-                   Turkish = 12, Unknown = 1000};
-
-  private:
-    unsigned char _dcs;
-    Language _language;
-
-  public:
-    // initialize with data coding scheme octet
-    CBDataCodingScheme(unsigned char dcs);
-    
-    // default constructor
-    CBDataCodingScheme() : _dcs(DCS_DEFAULT_ALPHABET), _language(English) {}
-
-    // return language of CBM
-    Language getLanguage() const {return _language;}
-
-    // return compression level (if language == Unknown)
-    bool compressed() const {return (_dcs & DCS_COMPRESSED) == DCS_COMPRESSED;}
-
-    // return type of alphabet used
-    // (DCS_DEFAULT_ALPHABET, DCS_EIGHT_BIT_ALPHABET, DCS_SIXTEEN_BIT_ALPHABET,
-    // DCS_RESERVED_ALPHABET)
-    unsigned char getAlphabet() const
-      {return _language == Unknown ? _dcs & (3 << 2) : DCS_DEFAULT_ALPHABET;}
-
-    // create textual representation of CB data coding scheme
-    string toString() const;
-  };
-
-  // representation of Cell Broadcast message (CBM)
-  // The CBM format is described in detail in ETSI GSM 03.41, section 9.3
-  
-  class CBMessage : public RefBase
-  {
-  public:
-    enum GeographicalScope {CellWide, PLMNWide, LocationAreaWide,
-                            CellWide2};
-
-  private:
-    // fields parsed from the CB TPDU
-    GeographicalScope _geographicalScope;
-    int _messageCode;
-    int _updateNumber;
-    int _messageIdentifier;
-    CBDataCodingScheme _dataCodingScheme;
-    int _totalPageNumber;
-    int _currentPageNumber;
-    string _data;
-
-  public:
-    // constructor with given pdu
-    CBMessage(string pdu) throw(GsmException);
-
-    // accessor functions
-    GeographicalScope getGeographicalScope() const {return _geographicalScope;}
-    int getMessageCode() const {return _messageCode;}
-    int getUpdateNumber() const {return _updateNumber;}
-    int getMessageIdentifier() const {return _messageIdentifier;}
-    CBDataCodingScheme getDataCodingScheme() const {return _dataCodingScheme;}
-    int getTotalPageNumber() const {return _totalPageNumber;}
-    int getCurrentPageNumber() const {return _currentPageNumber;}
-    string getData() const {return _data;}
-
-    // create textual representation of CBM
-    string toString() const;
-  };
-
-  // some useful typdefs
-  typedef Ref<CBMessage> CBMessageRef;
-};
-
-#endif // GSM_CB_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_error.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_error.cc
deleted file mode 100644
index 2cf9179ede..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_error.cc
+++ /dev/null
@@ -1,424 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_error.cc
-// *
-// * Purpose: Error codes and error handling functions
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 11.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_error.h>
-#include <gsmlib/gsm_util.h>
-#include <strstream>
-
-using namespace std;
-using namespace gsmlib;
-
-string gsmlib::getMEErrorText(const int errorCode) throw(GsmException)
-{
-  switch (errorCode)
-  {
-  case ME_PHONE_FAILURE:
-    return _("phone failure");
-    break;
-  case ME_NO_CONNECTION_TO_PHONE:
-    return _("no connection to phone");
-    break;
-  case ME_PHONE_ADAPTOR_LINK_RESERVED:
-    return _("phone adaptor link reserved");
-    break;
-  case ME_OPERATION_NOT_ALLOWED:
-    return _("operation not allowed");
-    break;
-  case ME_OPERATION_NOT_SUPPORTED:
-    return _("operation not supported");
-    break;
-  case ME_PH_SIM_PIN_REQUIRED:
-    return _("ph SIM PIN required");
-    break;
-  case ME_SIM_NOT_INSERTED:
-    return _("SIM not inserted");
-    break;
-  case ME_SIM_PIN_REQUIRED:
-    return _("SIM PIN required");
-    break;
-  case ME_SIM_PUK_REQUIRED:
-    return _("SIM PUK required");
-    break;
-  case ME_SIM_FAILURE:
-    return _("SIM failure");
-    break;
-  case ME_SIM_BUSY:
-    return _("SIM busy");
-    break;
-  case ME_SIM_WRONG:
-    return _("SIM wrong");
-    break;
-  case ME_INCORRECT_PASSWORD:
-    return _("incorrect password");
-    break;
-  case ME_SIM_PIN2_REQUIRED:
-    return _("SIM PIN2 required");
-    break;
-  case ME_SIM_PUK2_REQUIRED:
-    return _("SIM PUK2 required");
-    break;
-  case ME_MEMORY_FULL:
-    return _("memory full");
-    break;
-  case ME_INVALID_INDEX:
-    return _("invalid index");
-    break;
-  case ME_NOT_FOUND:
-    return _("not found");
-    break;
-  case ME_MEMORY_FAILURE:
-    return _("memory failure");
-    break;
-  case ME_TEXT_STRING_TOO_LONG:
-    return _("text string too long");
-    break;
-  case ME_INVALID_CHARACTERS_IN_TEXT_STRING:
-    return _("invalid characters in text string");
-    break;
-  case ME_DIAL_STRING_TOO_LONG:
-    return _("dial string too long");
-    break;
-  case ME_INVALID_CHARACTERS_IN_DIAL_STRING:
-    return _("invalid characters in dial string");
-    break;
-  case ME_NO_NETWORK_SERVICE:
-    return _("no network service");
-    break;
-  case ME_NETWORK_TIMEOUT:
-    return _("network timeout");
-    break;
-  case ME_UNKNOWN:
-    return _("unknown");
-    break;
-  default:
-    throw GsmException(stringPrintf(_("invalid ME error %d"), errorCode),
-                       OtherError);
-  }
-}
-
-string gsmlib::getSMSErrorText(const int errorCode) throw(GsmException)
-{
-  switch (errorCode)
-  {
-  case SMS_UNASSIGNED_OR_UNALLOCATED_NUMBER:
-    return _("Unassigned (unallocated) number");
-    break;
-  case SMS_OPERATOR_DETERMINED_BARRING:
-    return _("Operator determined barring");
-    break;
-  case SMS_CALL_BARRED:
-    return _("Call barred");
-    break;
-  case SMS_NETWORK_FAILURE:
-    return _("Network failure");
-    break;
-  case SMS_SHORT_MESSAGE_TRANSFER_REJECTED:
-    return _("Short message transfer rejected");
-    break;
-  case SMS_CONGESTION:
-  case SMS_CONGESTION2:
-    return _("Congestion");
-    break;
-  case SMS_DESTINATION_OUT_OF_SERVICE:
-    return _("Destination out of service");
-    break;
-  case SMS_UNIDENTIFIED_SUBSCRIBER:
-    return _("Unidentified subscriber");
-    break;
-  case SMS_FACILITY_REJECTED:
-    return _("Facility rejected");
-    break;
-  case SMS_UNKNOWN_SUBSCRIBER:
-    return _("Unknown subscriber");
-    break;
-  case SMS_NETWORK_OUT_OF_ORDER:
-    return _("Network out of order");
-    break;
-  case SMS_TEMPORARY_FAILURE:
-    return _("Temporary failure");
-    break;
-  case SMS_RESOURCES_UNAVAILABLE_UNSPECIFIED:
-    return _("Resources unavailable, unspecified");
-    break;
-  case SMS_REQUESTED_FACILITY_NOT_SUBSCRIBED:
-    return _("Requested facility not subscribed");
-    break;
-  case SMS_REQUESTED_FACILITY_NOT_IMPLEMENTED:
-    return _("Requested facility not implemented");
-    break;
-  case SMS_INVALID_TRANSACTION_IDENTIFIER:
-    return _("Invalid Transaction Identifier");
-    break;
-  case SMS_SEMANTICALLY_INCORRECT_MESSAGE:
-    return _("Semantically incorrect message");
-    break;
-  case SMS_INVALID_MANDATORY_INFORMATION:
-    return _("Invalid mandatory information");
-    break;
-  case SMS_MESSAGE_TYPE_NONEXISTENT_OR_NOT_IMPLEMENTED:
-    return _("Message type non-existent or not implemented");
-    break;
-  case SMS_MESSAGE_NOT_COMPATIBLE_WITH_SHORT_MESSAGE_PROTOCOL_STATE:
-    return _("Message not compatible with short message protocol state");
-    break;
-  case SMS_INFORMATION_ELEMENT_NONEXISTENT_OR_NOT_IMPLEMENTED:
-    return _("Information element non-existent or not implemented");
-    break;
-  case SMS_UNSPECIFIED_PROTOCOL_ERROR:
-    return _("Protocol error, unspecified");
-    break;
-  case SMS_UNSPECIFIED_INTERWORKING_ERROR:
-    return _("Interworking, unspecified");
-    break;
-  case SMS_TELEMATIC_INTERWORKING_NOT_SUPPORTED:
-    return _("Telematic interworking not supported");
-    break;
-  case SMS_SHORT_MESSAGE_TYPE_0_NOT_SUPPORTED:
-    return _("Short message Type 0 not supported");
-    break;
-  case SMS_CANNOT_REPLACE_SHORT_MESSAGE:
-    return _("Cannot replace short message");
-    break;
-  case SMS_UNSPECIFIED_TP_PID_ERROR:
-    return _("Unspecified TP-PID error");
-    break;
-  case SMS_DATA_CODING_SCHEME_NOT_SUPPORTED:
-    return _("Data coding scheme (alphabet) not supported");
-    break;
-  case SMS_MESSAGE_CLASS_NOT_SUPPORTED:
-    return _("Message class not supported");
-    break;
-  case SMS_UNSPECIFIEC_TP_DCS_ERROR:
-    return _("Unspecifiec TP-DCS error");
-    break;
-  case SMS_COMMAND_CANNOT_BE_ACTIONED:
-    return _("Command cannot be actioned");
-    break;
-  case SMS_COMMAND_UNSUPPORTED:
-    return _("Command unsupported");
-    break;
-  case SMS_UNSPECIFIED_TP_COMMAND_ERROR:
-    return _("Unspecified TP-Command error");
-    break;
-  case SMS_TPDU_NOT_SUPPORTED:
-    return _("TPDU not supported");
-    break;
-  case SMS_SC_BUSY:
-    return _("SC busy");
-    break;
-  case SMS_NO_SC_SUBSCRIPTION:
-    return _("No SC subscription");
-    break;
-  case SMS_SC_SYSTEM_FAILURE:
-    return _("SC system failure");
-    break;
-  case SMS_INVALID_SME_ADDRESS:
-    return _("Invalid SME address");
-    break;
-  case SMS_DESTINATION_SME_BARRED:
-    return _("Destination SME barred");
-    break;
-  case SMS_SM_REJECTED_DUPLICATED_SM:
-    return _("SM Rejected-Duplicated SM");
-    break;
-  case SMS_SIM_SMS_STORAGE_FULL:
-    return _("SIM SMS storage full");
-    break;
-  case SMS_NO_SMS_STORAGE_CAPABILITY_IN_SIM:
-    return _("No SMS storage capability in SIM");
-    break;
-  case SMS_ERROR_IN_MS:
-    return _("Error in MS");
-    break;
-  case SMS_MEMORY_CAPACITY_EXCEED:
-    return _("Memory Capacity Exceed");
-    break;
-  case SMS_UNSPECIFIED_ERROR_CAUSE:
-    return _("Unspecified error cause");
-    break;
-  case SMS_ME_FAILURE:
-    return _("ME failure");
-    break;
-  case SMS_SMS_SERVICE_OF_ME_RESERVED:
-    return _("SMS service of ME reserved");
-    break;
-  case SMS_OPERATION_NOT_ALLOWED:
-    return _("operation not allowed");
-    break;
-  case SMS_OPERATION_NOT_SUPPORTED:
-    return _("operation not supported");
-    break;
-  case SMS_INVALID_PDU_MODE_PARAMETER:
-    return _("invalid PDU mode parameter");
-    break;
-  case SMS_INVALID_TEXT_MODE_PARAMETER:
-    return _("invalid text mode parameter");
-    break;
-  case SMS_SIM_NOT_INSERTED:
-    return _("SIM not inserted");
-    break;
-  case SMS_SIM_PIN_REQUIRED:
-    return _("SIM PIN required");
-    break;
-  case SMS_PH_SIM_PIN_REQUIRED:
-    return _("PH-SIM PIN required");
-    break;
-  case SMS_SIM_FAILURE:
-    return _("SIM failure");
-    break;
-  case SMS_SIM_BUSY:
-    return _("SIM busy");
-    break;
-  case SMS_SIM_WRONG:
-    return _("SIM wrong");
-    break;
-  case SMS_SIM_PUK_REQUIRED:
-    return _("SIM PUK required");
-    break;
-  case SMS_SIM_PIN2_REQUIRED:
-    return _("SIM PIN2 required");
-    break;
-  case SMS_SIM_PUK2_REQUIRED:
-    return _("SIM PUK2 required");
-    break;
-  case SMS_MEMORY_FAILURE:
-    return _("memory failure");
-    break;
-  case SMS_INVALID_MEMORY_INDEX:
-    return _("invalid memory index");
-    break;
-  case SMS_MEMORY_FULL:
-    return _("memory full");
-    break;
-  case SMS_SMSC_ADDRESS_UNKNOWN:
-    return _("SMSC address unknown");
-    break;
-  case SMS_NO_NETWORK_SERVICE:
-    return _("no network service");
-    break;
-  case SMS_NETWORK_TIMEOUT:
-    return _("network timeout");
-    break;
-  case SMS_NO_CNMA_ACKNOWLEDGEMENT_EXPECTED:
-    return _("no +CNMA acknowledgement expected");
-    break;
-  case SMS_UNKNOWN_ERROR:
-    return _("unknown error");
-    break;
-  default:
-    throw GsmException(stringPrintf(_("invalid SMS error %d"), errorCode),
-                       OtherError);
-  }
-}
-
-string gsmlib::getSMSStatusString(unsigned char status)
-{
-  string result;
-  if (status < SMS_STATUS_TEMPORARY_BIT)
-  {
-    switch (status)
-    {
-    case SMS_STATUS_RECEIVED:
-      result = _("Short message received by the SME");
-      break;
-    case SMS_STATUS_FORWARDED:
-      result = _("Short message forwarded by the SC to the SME but the SC "
-                 "is unable to confirm delivery");
-      break;
-    case SMS_STATUS_SM_REPLACES:
-      result = _("Short message replaced by the SC");
-      break;
-    default:
-      result = _("reserved");
-      break;
-    }
-    return result;
-  }
-  else if (status & SMS_STATUS_TEMPORARY_BIT)
-  {
-    switch (status & ~(SMS_STATUS_TEMPORARY_BIT | SMS_STATUS_PERMANENT_BIT))
-    {
-    case SMS_STATUS_CONGESTION:
-      result = _("Congestion");
-      break;
-    case SMS_STATUS_SME_BUSY:
-      result = _("SME busy");
-      break;
-    case SMS_STATUS_NO_RESPONSE_FROM_SME:
-      result = _("No response from SME");
-      break;
-    case SMS_STATUS_SERVICE_REJECTED:
-      result = _("Service rejected");
-      break;
-    case SMS_STATUS_QUALITY_OF_SERVICE_UNAVAILABLE:
-      result = _("Quality of service not available");
-      break;
-    case SMS_STATUS_ERROR_IN_SME:
-      result = _("Error in SME");
-      break;
-    default:
-      result = _("reserved");
-      break;
-    }
-    if (status & SMS_STATUS_PERMANENT_BIT)
-      return result + _(" (Temporary error, SC is not making any "
-                        "more transfer attempts)");
-    else
-      return result + _(" (Temporary error, SC still trying to "
-                        "transfer SM)");
-  }
-  else
-  {
-    switch (status & ~SMS_STATUS_PERMANENT_BIT)
-    {
-    case SMS_STATUS_REMOTE_PROCECURE_ERROR:
-      result = _("Remote Procedure Error");
-      break;
-    case SMS_STATUS_INCOMPATIBLE_DESTINATION:
-      result = _("Incompatible destination");
-      break;
-    case SMS_STATUS_CONNECTION_REJECTED_BY_SME:
-      result = _("Connection rejected by SME");
-      break;
-    case SMS_STATUS_NOT_OBTAINABLE:
-      result = _("Not obtainable");
-      break;
-    case SMS_STATUS_QUALITY_OF_SERVICE_UNAVAILABLE:
-      result = _("Quality of service not available");
-      break;
-    case SMS_STATUS_NO_INTERWORKING_AVAILABLE:
-      result = _("No interworking available");
-      break;
-    case SMS_STATUS_SM_VALIDITY_PERDIOD_EXPIRED:
-      result = _("SM validity period expired");
-      break;
-    case SMS_STATUS_SM_DELETED_BY_ORIGINATING_SME:
-      result = _("SM deleted by originating SME");
-      break;
-    case SMS_STATUS_SM_DELETED_BY_ADMINISTRATION:
-      result = _("SM deleted by SC administration");
-      break;
-    case SMS_STATUS_SM_DOES_NOT_EXIST:
-      result = _("SM does not exit");
-      break;
-    default:
-      result = _("reserved");
-      break;
-    }
-    return result + _(" (Permanent Error, SC is not making any "
-                      "more transfer attempts)");
-  }
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_error.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_error.h
deleted file mode 100644
index 5dc96538e3..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_error.h
+++ /dev/null
@@ -1,209 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_error.h
-// *
-// * Purpose: Error codes and error handling functions
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 4.5.1999
-// *************************************************************************
-
-#ifndef GSM_ERROR_H
-#define GSM_ERROR_H
-
-#include <string>
-#include <stdexcept>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // different classes of GSM errors
-  enum GsmErrorClass{OSError,   // error caused by OS call (eg. file handling)
-                     ParserError, // error when parsing AT response
-                     ChatError, // error in chat sequence (ME/TA/SMS error)
-                     ParameterError, // gsmlib function called with bad params
-                     NotImplementedError, // feature not implemented
-                     MeTaCapabilityError, // non-existent capability in ME
-                     SMSFormatError, // SMS format error
-                     InterruptException, // gsmlib was interrupted()
-                     OtherError}; // all other errors
-
-  // all gsmlib exceptions
-
-  class GsmException : public runtime_error
-  {
-  private:
-    GsmErrorClass _errorClass;
-    int _errorCode;
-
-  public:
-    GsmException(string errorText, GsmErrorClass errorClass) :
-      runtime_error(errorText), _errorClass(errorClass), _errorCode(-1) {}
-
-    GsmException(string errorText, GsmErrorClass errorClass, int errorCode) :
-      runtime_error(errorText), _errorClass(errorClass),
-      _errorCode(errorCode) {}
-
-    int getErrorCode() const {return _errorCode;}
-    
-    GsmErrorClass getErrorClass() const {return _errorClass;}
-  };
-
-  // error codes returned by TA/ME (+CMEE)
-
-  const int ME_PHONE_FAILURE = 0;
-  const int ME_NO_CONNECTION_TO_PHONE = 1;
-  const int ME_PHONE_ADAPTOR_LINK_RESERVED = 2;
-  const int ME_OPERATION_NOT_ALLOWED = 3;
-  const int ME_OPERATION_NOT_SUPPORTED = 4;
-  const int ME_PH_SIM_PIN_REQUIRED = 5;
-  const int ME_SIM_NOT_INSERTED = 10;
-  const int ME_SIM_PIN_REQUIRED = 11;
-  const int ME_SIM_PUK_REQUIRED = 12;
-  const int ME_SIM_FAILURE = 13;
-  const int ME_SIM_BUSY = 14;
-  const int ME_SIM_WRONG = 15;
-  const int ME_INCORRECT_PASSWORD = 16;
-  const int ME_SIM_PIN2_REQUIRED = 17;
-  const int ME_SIM_PUK2_REQUIRED = 18;
-  const int ME_MEMORY_FULL = 20;
-  const int ME_INVALID_INDEX = 21;
-  const int ME_NOT_FOUND = 22;
-  const int ME_MEMORY_FAILURE = 23;
-  const int ME_TEXT_STRING_TOO_LONG = 24;
-  const int ME_INVALID_CHARACTERS_IN_TEXT_STRING = 25;
-  const int ME_DIAL_STRING_TOO_LONG = 26;
-  const int ME_INVALID_CHARACTERS_IN_DIAL_STRING = 27;
-  const int ME_NO_NETWORK_SERVICE = 30;
-  const int ME_NETWORK_TIMEOUT = 31;
-  const int ME_UNKNOWN = 100;
-
-  // return descriptive text for the given error code
-  // the text is already translated
-  extern string getMEErrorText(const int errorCode) throw(GsmException);
-
-  // SMS error codes
-
-  // error codes from ETSI GSM 04.11, Annex E
-  const int SMS_UNASSIGNED_OR_UNALLOCATED_NUMBER = 1;
-  const int SMS_OPERATOR_DETERMINED_BARRING = 8;
-  const int SMS_CALL_BARRED = 10;
-  const int SMS_NETWORK_FAILURE = 17;
-  const int SMS_SHORT_MESSAGE_TRANSFER_REJECTED = 21;
-  const int SMS_CONGESTION = 22;
-  const int SMS_DESTINATION_OUT_OF_SERVICE = 27;
-  const int SMS_UNIDENTIFIED_SUBSCRIBER = 28;
-  const int SMS_FACILITY_REJECTED = 29;
-  const int SMS_UNKNOWN_SUBSCRIBER = 30;
-  const int SMS_NETWORK_OUT_OF_ORDER = 38;
-  const int SMS_TEMPORARY_FAILURE = 41;
-  const int SMS_CONGESTION2 = 42;
-  const int SMS_RESOURCES_UNAVAILABLE_UNSPECIFIED = 47;
-  const int SMS_REQUESTED_FACILITY_NOT_SUBSCRIBED = 50;
-  const int SMS_REQUESTED_FACILITY_NOT_IMPLEMENTED = 69;
-  const int SMS_INVALID_TRANSACTION_IDENTIFIER = 81;
-  const int SMS_SEMANTICALLY_INCORRECT_MESSAGE = 95;
-  const int SMS_INVALID_MANDATORY_INFORMATION = 96;
-  const int SMS_MESSAGE_TYPE_NONEXISTENT_OR_NOT_IMPLEMENTED = 97;
-  const int SMS_MESSAGE_NOT_COMPATIBLE_WITH_SHORT_MESSAGE_PROTOCOL_STATE = 98;
-  const int SMS_INFORMATION_ELEMENT_NONEXISTENT_OR_NOT_IMPLEMENTED = 99;
-  const int SMS_UNSPECIFIED_PROTOCOL_ERROR = 111;
-  const int SMS_UNSPECIFIED_INTERWORKING_ERROR = 127;
-
-  // error codes from ETSI GSM 03.40, section 9.2.3.22
-  const int SMS_TELEMATIC_INTERWORKING_NOT_SUPPORTED = 0x80;
-  const int SMS_SHORT_MESSAGE_TYPE_0_NOT_SUPPORTED = 0x81;
-  const int SMS_CANNOT_REPLACE_SHORT_MESSAGE = 0x82;
-  const int SMS_UNSPECIFIED_TP_PID_ERROR = 0x8f;
-  const int SMS_DATA_CODING_SCHEME_NOT_SUPPORTED = 0x90;
-  const int SMS_MESSAGE_CLASS_NOT_SUPPORTED = 0x91;
-  const int SMS_UNSPECIFIEC_TP_DCS_ERROR = 0x9f;
-  const int SMS_COMMAND_CANNOT_BE_ACTIONED = 0xa0;
-  const int SMS_COMMAND_UNSUPPORTED = 0xa1;
-  const int SMS_UNSPECIFIED_TP_COMMAND_ERROR = 0xaf;
-  const int SMS_TPDU_NOT_SUPPORTED = 0xb0;
-  const int SMS_SC_BUSY = 0xc0;
-  const int SMS_NO_SC_SUBSCRIPTION = 0xc1;
-  const int SMS_SC_SYSTEM_FAILURE = 0xc2;
-  const int SMS_INVALID_SME_ADDRESS = 0xc3;
-  const int SMS_DESTINATION_SME_BARRED = 0xc4;
-  const int SMS_SM_REJECTED_DUPLICATED_SM = 0xc5;
-  const int SMS_SIM_SMS_STORAGE_FULL = 0xd0;
-  const int SMS_NO_SMS_STORAGE_CAPABILITY_IN_SIM = 0xd1;
-  const int SMS_ERROR_IN_MS = 0xd2;
-  const int SMS_MEMORY_CAPACITY_EXCEED = 0xd3;
-  const int SMS_UNSPECIFIED_ERROR_CAUSE = 0xff;
-
-  // error codes from ETSI GSM 07.05, section 3.2.5
-  const int SMS_ME_FAILURE = 300;
-  const int SMS_SMS_SERVICE_OF_ME_RESERVED = 301;
-  const int SMS_OPERATION_NOT_ALLOWED = 302;
-  const int SMS_OPERATION_NOT_SUPPORTED = 303;
-  const int SMS_INVALID_PDU_MODE_PARAMETER = 304;
-  const int SMS_INVALID_TEXT_MODE_PARAMETER = 305;
-  const int SMS_SIM_NOT_INSERTED = 310;
-  const int SMS_SIM_PIN_REQUIRED = 311;
-  const int SMS_PH_SIM_PIN_REQUIRED = 312;
-  const int SMS_SIM_FAILURE = 313;
-  const int SMS_SIM_BUSY = 314;
-  const int SMS_SIM_WRONG = 315;
-  const int SMS_SIM_PUK_REQUIRED = 316;
-  const int SMS_SIM_PIN2_REQUIRED = 317;
-  const int SMS_SIM_PUK2_REQUIRED = 318;
-  const int SMS_MEMORY_FAILURE = 320;
-  const int SMS_INVALID_MEMORY_INDEX = 321;
-  const int SMS_MEMORY_FULL = 322;
-  const int SMS_SMSC_ADDRESS_UNKNOWN = 330;
-  const int SMS_NO_NETWORK_SERVICE = 331;
-  const int SMS_NETWORK_TIMEOUT = 332;
-  const int SMS_NO_CNMA_ACKNOWLEDGEMENT_EXPECTED = 340;
-  const int SMS_UNKNOWN_ERROR = 500;
-
-  // return descriptive text for the given error code
-  // the text is already translated
-  extern string getSMSErrorText(const int errorCode) throw(GsmException);
-
-  // SMS status handling
-  // success codes
-  const int SMS_STATUS_RECEIVED = 0;
-  const int SMS_STATUS_FORWARDED = 1;
-  const int SMS_STATUS_SM_REPLACES = 2;
-
-  // if this bit is set, the error is only temporary and
-  // the SC is still trying to transfer the SM
-  const int SMS_STATUS_TEMPORARY_BIT = 32;
-
-  // if this bit is set, the error is only temporary and
-  // the SC is still trying to transfer the SM
-  const int SMS_STATUS_PERMANENT_BIT = 64;
-  // both bits may be set at once
-
-  // temporary errors (both bits may be set)
-  const int SMS_STATUS_CONGESTION = 0;
-  const int SMS_STATUS_SME_BUSY = 1;
-  const int SMS_STATUS_NO_RESPONSE_FROM_SME = 2;
-  const int SMS_STATUS_SERVICE_REJECTED = 3;
-  const int SMS_STATUS_QUALITY_OF_SERVICE_UNAVAILABLE = 4;
-  const int SMS_STATUS_ERROR_IN_SME = 5;
-
-  // permanent errors (SMS_STATUS_PERMANENT_BIT is set)
-  const int SMS_STATUS_REMOTE_PROCECURE_ERROR = 0;
-  const int SMS_STATUS_INCOMPATIBLE_DESTINATION = 1;
-  const int SMS_STATUS_CONNECTION_REJECTED_BY_SME = 2;
-  const int SMS_STATUS_NOT_OBTAINABLE = 3;
-  // const int SMS_STATUS_QUALITY_OF_SERVICE_UNAVAILABLE = 4;
-  const int SMS_STATUS_NO_INTERWORKING_AVAILABLE = 5;
-  const int SMS_STATUS_SM_VALIDITY_PERDIOD_EXPIRED = 6;
-  const int SMS_STATUS_SM_DELETED_BY_ORIGINATING_SME = 7;
-  const int SMS_STATUS_SM_DELETED_BY_ADMINISTRATION = 8;
-  const int SMS_STATUS_SM_DOES_NOT_EXIST = 9;
-
-  // return text for SMS status code
-  // the text is already translated
-  string getSMSStatusString(unsigned char status);
-};
-
-#endif // GSM_ERROR_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_event.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_event.cc
deleted file mode 100644
index a608b04f62..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_event.cc
+++ /dev/null
@@ -1,174 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_event.cc
-// *
-// * Purpose: Event handler interface
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 7.6.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_event.h>
-#include <gsmlib/gsm_parser.h>
-#include <gsmlib/gsm_at.h>
-#include <gsmlib/gsm_me_ta.h>
-
-using namespace std;
-using namespace gsmlib;
-
-// GsmEvent members
-
-void GsmEvent::dispatch(string s, GsmAt &at) throw(GsmException)
-{
-  SMSMessageType messageType;
-  bool indication = false;
-  if (s.substr(0, 5) == "+CMT:")
-    messageType = NormalSMS;
-  else if (s.substr(0, 5) == "+CBM:")
-    messageType = CellBroadcastSMS;
-  else if (s.substr(0, 5) == "+CDS:")
-  {
-    // workaround for phones that report CDS when they actually mean CDSI
-    indication = at.getMeTa().getCapabilities()._CDSmeansCDSI;
-    messageType = StatusReportSMS;
-  }
-  else if (s.substr(0, 6) == "+CMTI:")
-  {
-    indication = true;
-    messageType = NormalSMS;
-  }
-  else if (s.substr(0, 6) == "+CBMI:")
-  {
-    indication = true;
-    messageType = CellBroadcastSMS;
-  }
-  else if (s.substr(0, 6) == "+CDSI:")
-  {
-    indication = true;
-    messageType = StatusReportSMS;
-  }
-  else if (s.substr(0, 4) == "RING")
-  {
-    ringIndication();
-    return;
-  }
-  // handling  NO CARRIER
-  else if (s.substr(0, 10) == "NO CARRIER")
-  {
-    noAnswer();
-    return;
-  }
-  
-  else if (s.substr(0, 6) == "+CLIP:")
-  {
-    //    <number>,<type>[,<subaddr>,<satype>[,<alpha>]]
-    s = s.substr(6);
-    Parser p(s);
-    string num = p.parseString();
-    if (p.parseComma(true))
-    {
-      unsigned int numberFormat;
-      if ((numberFormat = p.parseInt()) == InternationalNumberFormat)
-        num = "+" + num;
-      else if (numberFormat != UnknownNumberFormat)
-        throw GsmException(stringPrintf(_("unexpected number format %d"),
-                                        numberFormat), OtherError);
-    }
-    string subAddr;
-    string alpha;
-    if (p.parseComma(true))
-    {
-      subAddr = p.parseString(true);
-      p.parseComma();
-      p.parseInt(true);         // FIXME subaddr type ignored
-
-      if (p.parseComma(true))
-        alpha = p.parseString(true);
-    }
-    
-    // call the event handler
-    callerLineID(num, subAddr, alpha);
-    return;
-  }
-  else
-    throw GsmException(stringPrintf(_("unexpected unsolicited event '%s'"),
-                                    s.c_str()), OtherError);
-
-  if (indication)
-  {
-    // handle SMS storage indication
-    s = s.substr(6);
-    Parser p(s);
-    string storeName = p.parseString();
-    p.parseComma();
-    unsigned int index = p.parseInt();
-    SMSReceptionIndication(storeName, index - 1, messageType);
-  }
-  else
-    if (messageType == CellBroadcastSMS)
-    {
-      // handle CB message
-      string pdu = at.getLine();
-
-      CBMessageRef cb = new CBMessage(pdu);
-
-      // call the event handler
-      CBReception(cb);
-    }
-    else
-    {
-      // handle SMS
-      string pdu = at.getLine();
-      
-      // add missing service centre address if required by ME
-      if (! at.getMeTa().getCapabilities()._hasSMSSCAprefix)
-      pdu = "00" + pdu;
-      
-      SMSMessageRef sms = SMSMessage::decode(pdu);
-      
-      // send acknowledgement if necessary
-      if (at.getMeTa().getCapabilities()._sendAck)
-        at.chat("+CNMA");
-      
-      // call the event handler
-      SMSReception(sms, messageType);
-    }
-}
-
-void GsmEvent::callerLineID(string number, string subAddr, string alpha)
-{
-  // ignore event
-}
-
-void GsmEvent::SMSReception(SMSMessageRef newMessage,
-                            SMSMessageType messageType)
-{
-  // ignore event
-}
-
-void GsmEvent::CBReception(CBMessageRef newMessage)
-{
-  // ignore event
-}
-
-void GsmEvent::SMSReceptionIndication(string storeName, unsigned int index,
-                                      SMSMessageType messageType)
-{
-  // ignore event
-}
-
-void GsmEvent::ringIndication()
-{
-  // ignore event
-}
-
-void GsmEvent::noAnswer()
-{
-  // ignore event
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_event.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_event.h
deleted file mode 100644
index b2b986cd15..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_event.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_event.h
-// *
-// * Purpose: Event handler interface
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 7.6.1999
-// *************************************************************************
-
-#ifndef GSM_EVENT_H
-#define GSM_EVENT_H
-
-#include <gsmlib/gsm_sms.h>
-#include <gsmlib/gsm_cb.h>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // forward declarations
-
-  class GsmAt;
-
-  // event handler interface
-
-  class GsmEvent
-  {
-  private:
-    // dispatch CMT/CBR/CDS/CLIP etc.
-    void dispatch(string s, GsmAt &at) throw(GsmException);
-
-  public:
-    // for SMSReception, type of SMS
-    enum SMSMessageType {NormalSMS, CellBroadcastSMS, StatusReportSMS};
-
-    // caller line identification presentation
-    // only called if setCLIPEvent(true) is set
-    virtual void callerLineID(string number, string subAddr, string alpha);
-
-    // called if the string NO CARRIER is read
-    virtual void noAnswer();
-
-    // SMS reception
-    // only called if setSMSReceptionEvent(...true...) is set
-    virtual void SMSReception(SMSMessageRef newMessage,
-                              SMSMessageType messageType);
-
-    // CB reception
-    // only called if setSMSReceptionEvent(...true...) is set
-    // storage of CBM in ME is not supported by the standard
-    virtual void CBReception(CBMessageRef newMessage);
-
-    // SMS reception indication (called when SMS is not delivered to TE
-    // but stored in ME memory)
-    virtual void SMSReceptionIndication(string storeName, unsigned int index,
-                                        SMSMessageType messageType);
-
-    // RING indication
-    virtual void ringIndication();
-
-    friend class gsmlib::GsmAt;
-  };
-};
-
-#endif // GSM_EVENT_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_map_key.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_map_key.h
deleted file mode 100644
index d47b7e0cd9..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_map_key.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_map_key.h
-// *
-// * Purpose: Common MapKey implementation for the multimaps in
-// *          gsm_sorted_sms_store and gsm_sorted_phonebook
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 5.11.1999
-// *************************************************************************
-
-#ifndef GSM_MAP_KEY_H
-#define GSM_MAP_KEY_H
-
-#include <gsmlib/gsm_sms_codec.h>
-
-namespace gsmlib
-{
-  // sort order for MapKeys
-
-  enum SortOrder {ByText = 0, ByTelephone = 1, ByIndex = 2, ByDate = 3,
-                  ByType = 4, ByAddress = 5};
-
-  // wrapper for map key, can access Sortedtore to get sortOrder()
-
-  template <class SortedStore> class MapKey
-  {
-  public:
-    SortedStore &_myStore;   // my store
-    // different type keys
-    Address _addressKey;
-    Timestamp _timeKey;
-    int _intKey;
-    string _strKey;
-
-  public:
-    // constructors for the different sort keys
-    MapKey(SortedStore &myStore, Address key) :
-      _myStore(myStore), _addressKey(key) {}
-    MapKey(SortedStore &myStore, Timestamp key) :
-      _myStore(myStore), _timeKey(key) {}
-    MapKey(SortedStore &myStore, int key) :
-      _myStore(myStore), _intKey(key) {}
-    MapKey(SortedStore &myStore, string key) :
-      _myStore(myStore), _strKey(key) {}
-
-/*
-    friend
-    bool operator< 
-#ifndef WIN32
-	<>
-#endif
-	                 (const MapKey<SortedStore> &x,
-                      const MapKey<SortedStore> &y);
-    friend
-    bool operator==
-#ifndef WIN32
-	<>
-#endif
-	                  (const MapKey<SortedStore> &x,
-                       const MapKey<SortedStore> &y);
-*/
-  };
-
-  // compare two keys
-  template <class SortedStore>
-    extern bool operator<(const MapKey<SortedStore> &x,
-                          const MapKey<SortedStore> &y);
-  template <class SortedStore>
-    extern bool operator==(const MapKey<SortedStore> &x,
-                           const MapKey<SortedStore> &y);
-  
-  // MapKey members
-  
-  template <class SortedStore>
-    bool operator<(const MapKey<SortedStore> &x,
-                           const MapKey<SortedStore> &y)
-    {
-      assert(&x._myStore == &y._myStore);
-
-      switch (x._myStore.sortOrder())
-      {
-      case ByDate:
-        return x._timeKey < y._timeKey;
-      case ByAddress:
-        return x._addressKey < y._addressKey;
-      case ByIndex:
-      case ByType:
-        return x._intKey < y._intKey;
-      case ByTelephone:
-        return Address(x._strKey) < Address(y._strKey);
-      case ByText:
-        return x._strKey < y._strKey;
-      default:
-        assert(0);
-        return true;
-      }
-    }
-
-  template <class SortedStore>
-    bool operator==(const MapKey<SortedStore> &x,
-                            const MapKey<SortedStore> &y)
-    {
-      assert(&x._myStore == &y._myStore);
-
-      switch (x._myStore.sortOrder())
-      {
-      case ByDate:
-        return x._timeKey == y._timeKey;
-      case ByAddress:
-        return x._addressKey == y._addressKey;
-      case ByIndex:
-      case ByType:
-        return x._intKey == y._intKey;
-      case ByTelephone:
-        return Address(x._strKey) == Address(y._strKey);
-      case ByText:
-        return x._strKey == y._strKey;
-      default:
-        assert(0);
-        return true;
-      }
-    }
-};
-
-#endif // GSM_MAP_KEY_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_me_ta.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_me_ta.cc
deleted file mode 100644
index 1f9e84581a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_me_ta.cc
+++ /dev/null
@@ -1,1254 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_me_ta.cc
-// *
-// * Purpose: Mobile Equipment/Terminal Adapter functions
-// *          (ETSI GSM 07.07)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 10.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_parser.h>
-#include <gsmlib/gsm_sysdep.h>
-
-#include <cstdlib>
-
-using namespace std;
-using namespace gsmlib;
-
-// Capabilities members
-
-Capabilities::Capabilities() :
-  _hasSMSSCAprefix(true),
-  _cpmsParamCount(-1),          // initialize to -1, must be set later by
-                                // setSMSStore() function
-  _omitsColon(true),            // FIXME
-  _veryShortCOPSanswer(false),  // Falcom A2-1
-  _wrongSMSStatusCode(false),   // Motorola Timeport 260
-  _CDSmeansCDSI(false),         // Nokia Cellular Card Phone RPE-1 GSM900 and
-                                // Nokia Card Phone RPM-1 GSM900/1800
-  _sendAck(false)               // send ack for directly routed SMS
-{
-}
-
-// MeTa members
-
-void MeTa::init() throw(GsmException)
-{
-  // switch on extended error codes
-  // caution: may be ignored by some TAs, so allow it to fail
-  _at->chat("+CMEE=1", "", true, true);
-  
-  // select SMS pdu mode
-  _at->chat("+CMGF=0");
-
-  // now fill in capability object
-  MEInfo info = getMEInfo();
-  
-  // Ericsson model 6050102
-  if ((info._manufacturer == "ERICSSON" &&
-      (info._model == "1100801" ||
-       info._model == "1140801")) ||
-      getenv("GSMLIB_SH888_FIX") != NULL)
-  {
-    // the Ericsson leaves out the service centre address
-    _capabilities._hasSMSSCAprefix = false;
-  }
-
-  // handle Falcom strangeness
-  if ((info._manufacturer == "Funkanlagen Leipoldt OHG" &&
-      info._revision == "01.95.F2") ||
-      getenv("GSMLIB_FALCOM_A2_1_FIX") != NULL)
-  {
-    _capabilities._veryShortCOPSanswer = true;
-  }
-
-  // handle Motorola SMS store bug - wrong status code
-  if ((info._manufacturer == "Motorola" &&
-       info._model == "L Series"))
-  {
-    _capabilities._wrongSMSStatusCode = true;
-  } 
- 
-  // handle Nokia Cellular Card Phone RPE-1 GSM900 and
-  // Nokia Card Phone RPM-1 GSM900/1800 bug - CDS means CDSI
-  if ((info._manufacturer == "Nokia Mobile Phones" &&
-       (info._model == "Nokia Cellular Card Phone RPE-1 GSM900" ||
-        info._model == "Nokia Card Phone RPM-1 GSM900/1800")))
-  {
-    _capabilities._CDSmeansCDSI = true;
-  } 
-
-  // find out whether we are supposed to send an acknowledgment
-  Parser p(_at->chat("+CSMS?", "+CSMS:"));
-  _capabilities._sendAck = p.parseInt() >= 1;
-      
-  // set GSM default character set
-  try
-  {
-    setCharSet("GSM");
-  }
-  catch (GsmException)
-  {
-    // ignore errors, some devices don't support this
-  }
-
-  // set default event handler
-  // necessary to handle at least RING indications that might
-  // otherwise confuse gsmlib
-  _at->setEventHandler(&_defaultEventHandler);
-}
-
-MeTa::MeTa(Ref<Port> port) throw(GsmException) : _port(port)
-{
-  // initialize AT handling
-  _at = new GsmAt(*this);
-
-  init();
-}
-
-// MeTa::MeTa(Ref<GsmAt> at) throw(GsmException) :
-//   _at(at)
-// {
-//   init();
-// }
-
-void MeTa::setPIN(string pin) throw(GsmException)
-{
-  _at->chat("+CPIN=\"" + pin + "\"");
-}
-
-string MeTa::getPINStatus() throw(GsmException)
-{
-  Parser p(_at->chat("+CPIN?", "+CPIN:"));
-  return p.parseString();
-}
-
-void MeTa::setPhonebook(string phonebookName) throw(GsmException)
-{
-  if (phonebookName != _lastPhonebookName)
-  {
-    _at->chat("+CPBS=\"" + phonebookName + "\"");
-    _lastPhonebookName = phonebookName;
-  }
-}
-
-string MeTa::setSMSStore(string smsStore, int storeTypes, bool needResultCode)
-  throw(GsmException)
-{
-  if (_capabilities._cpmsParamCount == -1)
-  {
-    // count the number of parameters for the CPMS AT sequences
-    _capabilities._cpmsParamCount = 1;
-    Parser p(_at->chat("+CPMS=?", "+CPMS:"));
-    p.parseStringList();
-    while (p.parseComma(true))
-    {
-      ++_capabilities._cpmsParamCount;
-      p.parseStringList();
-    }
-  }
-
-  // optimatization: only set current SMS store if different from last call
-  // or the result code is needed
-  if (needResultCode || _lastSMSStoreName != smsStore)
-  {
-    _lastSMSStoreName = smsStore;
-
-    // build chat string
-    string chatString = "+CPMS=\"" + smsStore + "\"";
-    for (int i = 1; i < min(_capabilities._cpmsParamCount, storeTypes); ++i)
-      chatString += ",\"" + smsStore + "\"";
-
-    return _at->chat(chatString, "+CPMS:");
-  }
-  return "";
-}
-
-void MeTa::getSMSStore(string &readDeleteStore,
-                       string &writeSendStore,
-                       string &receiveStore) throw(GsmException)
-{
-  Parser p(_at->chat("+CPMS?", "+CPMS:"));
-  writeSendStore = receiveStore = "";
-  readDeleteStore = p.parseString();
-  p.parseComma();
-  p.parseInt();
-  p.parseComma();
-  p.parseInt();
-  if (p.parseComma(true))
-  {
-    writeSendStore = p.parseString();
-    p.parseComma();
-    p.parseInt();
-    p.parseComma();
-    p.parseInt();
-    if (p.parseComma(true))
-    {
-      receiveStore = p.parseString();
-    }
-  }
-}
-
-void MeTa::waitEvent(GsmTime timeout) throw(GsmException)
-{
-  if (_at->wait(timeout))
-    _at->chat();                // send AT, wait for OK, handle events
-}
-
-// aux function for MeTa::getMEInfo()
-
-static string stringVectorToString(const vector<string>& v,
-                                   char separator = '\n')
-{
-  if (v.empty())
-    return "";
-
-  // concatenate string in vector as rows
-  string result;
-  for (vector<string>::const_iterator i = v.begin();;)
-  {
-    string s = *i;
-    // remove leading and trailing "s
-    if (s.length() > 0 && s[0] == '"')
-      s.erase(s.begin());
-    if (s.length() > 0 && s[s.length() - 1] == '"')
-      s.erase(s.end() - 1);
-
-    result += s;
-    // don't add end line to last
-    if ( ++i == v.end() || !separator)
-      break;
-    result += separator;
-  }
-  return result;
-}
-
-MEInfo MeTa::getMEInfo() throw(GsmException)
-{
-  MEInfo result;
-  // some TAs just return OK and no info line
-  // leave the info empty in this case
-  // some TAs return multirows with info like address, firmware version
-  result._manufacturer =
-    stringVectorToString(_at->chatv("+CGMI", "+CGMI:", false));
-  result._model = stringVectorToString(_at->chatv("+CGMM", "+CGMM:", false));
-  result._revision =
-    stringVectorToString(_at->chatv("+CGMR", "+CGMR:", false));
-  result._serialNumber =
-    stringVectorToString(_at->chatv("+CGSN", "+CGSN:", false),0);
-  return result;
-}
-
-vector<string> MeTa::getSupportedCharSets() throw(GsmException)
-{
-  Parser p(_at->chat("+CSCS=?", "+CSCS:"));
-  return p.parseStringList();
-}
-    
-string MeTa::getCurrentCharSet() throw(GsmException)
-{
-  if (_lastCharSet == "")
-  {
-    Parser p(_at->chat("+CSCS?", "+CSCS:"));
-    _lastCharSet = p.parseString();
-  }
-  return _lastCharSet;
-}
-
-void MeTa::setCharSet(string charSetName) throw(GsmException)
-{
-  _at->chat("+CSCS=\"" + charSetName + "\"");
-  _lastCharSet = "";
-}
-
-string MeTa::getExtendedErrorReport() throw(GsmException)
-{
-  return _at->chat("+CEER", "+CEER:");
-}
-
-void MeTa::dial(string number) throw(GsmException)
-{
-  _at->chat("D" + number + ";");
-}
-
-void MeTa::answer() throw(GsmException)
-{
-  _at->chat("A");
-}
-
-void MeTa::hangup() throw(GsmException)
-{
-  _at->chat("H");
-
-}
-
-vector<OPInfo> MeTa::getAvailableOPInfo() throw(GsmException)
-{
-  vector<OPInfo> result;
-  vector<string> responses = _at->chatv("+COPS=?", "+COPS:");
-
-  // special treatment for Falcom A2-1, answer looks like
-  //   responses.push_back("(1,29341),(3,29340)");
-  if (_capabilities._veryShortCOPSanswer)
-  {
-    if (responses.size() == 1)
-    {
-      Parser p(responses[0]);
-      while (p.parseChar('(', true))
-      {
-        OPInfo opi;
-        opi._status = (OPStatus)p.parseInt();
-        p.parseComma();
-        opi._numericName = p.parseInt();
-        p.parseChar(')');
-        p.parseComma(true);
-        result.push_back(opi);
-      }
-    }
-  }
-  else
-    // some formats I have encountered...
-    //responses.push_back("2,,,31017,,(0,1),(2)");
-    //responses.push_back("(3,\"UK CELLNET\",\"CLNET\",\"23410\")," 
-    //                    "(3,\"ONE2 ONE\",\"ONE2ONE\",\"23430\"),"
-    //                    "(3,\"ORANGE\",\"ORANGE\",\"23433\")");
-    //responses.push_back("(2,\"D1-TELEKOM\",,26201),"
-    //                    "(3,\"D2  PRIVAT\",,26202),,(0,1,3,4),(0,2)");
-    // some phones arbitrarily split the response into several lines
-    //responses.push_back("(1,\"AMENA\",,\"21403\"),"
-    //                    "(3,\"MOVISTAR\",,\"21407\"),");
-    //responses.push_back("(3,\"E VODAFONE\",,\"21401\"),,(0,1),(2)");
-
-    // GSM modems might return
-    // 1. quadruplets of info enclosed in brackets separated by comma
-    // 2. several lines of quadruplets of info enclosed in brackets
-    // 3. several lines of quadruplets without brackets and additional
-    //    info at EOL (e.g. Nokia 8290)
-    for (vector<string>::iterator i = responses.begin();
-         i != responses.end(); ++i)
-    {
-//       while (i->length() > 0 && ! isprint((*i)[i->length() - 1]))
-//         i->erase(i->length() - 1, 1);
-
-      bool expectClosingBracket = false;
-      Parser p(*i);
-      while (1)
-      {
-        OPInfo opi;
-        expectClosingBracket = p.parseChar('(', true);
-        int status = p.parseInt(true);
-        opi._status = (status == NOT_SET ? UnknownOPStatus : (OPStatus)status);
-        p.parseComma();
-        opi._longName = p.parseString(true);
-        p.parseComma();
-        opi._shortName = p.parseString(true);
-        p.parseComma();
-        try
-        {
-          opi._numericName = p.parseInt(true);
-        }
-        catch (GsmException &e)
-        {
-          if (e.getErrorClass() == ParserError)
-          {
-            // the Ericsson GM12 GSM modem returns the numeric ID as string
-            string s = p.parseString();
-            opi._numericName = checkNumber(s);
-          }
-          else
-            throw e;
-        }
-        if (expectClosingBracket) p.parseChar(')');
-        result.push_back(opi);
-        if (! p.parseComma(true)) break;
-        // two commas ",," mean the list is finished
-        if (p.getEol() == "" || p.parseComma(true)) break;
-      }
-      // without brackets, the ME/TA must use format 3.
-      if (! expectClosingBracket) break;
-    }
-  return result;
-}
-
-OPInfo MeTa::getCurrentOPInfo() throw(GsmException)
-{
-  OPInfo result;
-
-  // 1. This exception thing is necessary because not all ME/TA combinations
-  // might support all the formats and then return "ERROR".
-  // 2. Additionally some modems return "ERROR" for all "COPS=3,n" command
-  // and report only one format with the "COPS?" command (e.g. Nokia 8290).
-
-  // get long format
-  try
-  {
-    try
-    {
-      _at->chat("+COPS=3,0");
-    }
-    catch (GsmException &e)
-    {
-      if (e.getErrorClass() != ChatError) throw;
-    }
-    Parser p(_at->chat("+COPS?", "+COPS:"));
-    result._mode = (OPModes)p.parseInt();
-    // some phones (e.g. Nokia Card Phone 2.0) just return "+COPS: 0"
-    // if no network connection
-    if (p.parseComma(true))
-    {
-      if (p.parseInt() == 0)
-      {
-        p.parseComma();
-        result._longName = p.parseString();
-      }
-    }
-  }
-  catch (GsmException &e)
-  {
-    if (e.getErrorClass() != ChatError) throw;
-  }
-
-  // get short format
-  try
-  {
-    try
-    {
-      _at->chat("+COPS=3,1");
-    }
-    catch (GsmException &e)
-    {
-      if (e.getErrorClass() != ChatError) throw;
-    }
-    Parser p(_at->chat("+COPS?", "+COPS:"));
-    result._mode = (OPModes)p.parseInt();
-    // some phones (e.g. Nokia Card Phone 2.0) just return "+COPS: 0"
-    // if no network connection
-    if (p.parseComma(true))
-    {
-      if (p.parseInt() == 1)
-      {
-        p.parseComma();
-        result._shortName = p.parseString();
-      }
-    }
-  }
-  catch (GsmException &e)
-  {
-    if (e.getErrorClass() != ChatError) throw;
-  }
-
-  // get numeric format
-  try
-  {
-    try
-    {
-      _at->chat("+COPS=3,2");
-    }
-    catch (GsmException &e)
-    {
-      if (e.getErrorClass() != ChatError) throw;
-    }
-    Parser p(_at->chat("+COPS?", "+COPS:"));
-    result._mode = (OPModes)p.parseInt();
-    // some phones (e.g. Nokia Card Phone 2.0) just return "+COPS: 0"
-    // if no network connection
-    if (p.parseComma(true))
-    {
-      if (p.parseInt() == 2)
-      {
-        p.parseComma();
-        try
-        {
-          result._numericName = p.parseInt();
-        }
-        catch (GsmException &e)
-        {
-          if (e.getErrorClass() == ParserError)
-          {
-            // the Ericsson GM12 GSM modem returns the numeric ID as string
-            string s = p.parseString();
-            result._numericName = checkNumber(s);
-          }
-          else
-            throw e;
-        }
-      }
-    }
-  }
-  catch (GsmException &e)
-  {
-    if (e.getErrorClass() != ChatError) throw;
-  }
-  return result;
-}
-
-void MeTa::setCurrentOPInfo(OPModes mode,
-                            string longName,
-                            string shortName,
-                            int numericName) throw(GsmException)
-{
-  bool done = false;
-  if (longName != "")
-  {
-    try
-    {
-      _at->chat("+COPS=" + intToStr((int)mode) + ",0,\"" + longName + "\"");
-      done = true;
-    }
-    catch (GsmException &e)
-    {
-      if (e.getErrorClass() != ChatError) throw;
-    }
-  }
-  if (shortName != "" && ! done)
-  {
-    try
-    {
-      _at->chat("+COPS=" + intToStr((int)mode) + ",1,\"" + shortName + "\"");
-      done = true;
-    }
-    catch (GsmException &e)
-    {
-      if (e.getErrorClass() != ChatError) throw;
-    }
-  }
-  if (numericName != NOT_SET && ! done)
-  {
-    try
-    {
-      _at->chat("+COPS=" + intToStr((int)mode) + ",2," +
-                intToStr(numericName));
-      done = true;
-    }
-    catch (GsmException &e)
-    {
-      if (e.getErrorClass() != ChatError) throw;
-    }
-  }
-  if (! done)
-    throw GsmException(_("unable to set operator"), OtherError);
-}
-
-vector<string> MeTa::getFacilityLockCapabilities() throw(GsmException)
-{
-  string locks = _at->chat("+CLCK=?", "+CLCK:");
-  // some TA don't add '(' and ')' (Option FirstFone)
-  if (locks.length() && locks[0] != '(')
-  {
-    locks.insert(locks.begin(),'(');
-    locks += ')';
-  }
-  Parser p(locks);
-  return p.parseStringList();
-}
-
-bool MeTa::getFacilityLockStatus(string facility, FacilityClass cl)
-  throw(GsmException)
-{
-  // some TA return always multiline response with all classes
-  // (Option FirstFone)
-  // !!! errors handling is correct (responses.empty() true) ?
-  vector<string> responses = 
-    _at->chatv("+CLCK=\"" + facility + "\",2,," + intToStr((int)cl),"+CLCK:",true);
-  for (vector<string>::iterator i = responses.begin();
-       i != responses.end(); ++i)
-  {
-    Parser p(*i);
-    int enabled = p.parseInt();
-
-    // if the first time and there is no comma this 
-    // return direct state of classes
-    // else return all classes
-    if (i == responses.begin())
-    {
-      if (!p.parseComma(true))
-        return enabled == 1;
-    }
-    else
-      p.parseComma();
-
-    if ( p.parseInt() == (int)cl )
-      return enabled == 1;
-  }
-  return false;
-
-//  Parser p(_at->chat("+CLCK=\"" + facility + "\",2,," + intToStr((int)cl),
-//                     "+CLCK:"));
-//  return p.parseInt() == 1;
-}
-
-void MeTa::lockFacility(string facility, FacilityClass cl, string passwd)
-  throw(GsmException)
-{
-  if (passwd == "")
-    _at->chat("+CLCK=\"" + facility + "\",1,," + intToStr((int)cl));
-  else
-    _at->chat("+CLCK=\"" + facility + "\",1,\"" + passwd + "\","
-              + intToStr((int)cl));
-}
-
-void MeTa::unlockFacility(string facility, FacilityClass cl, string passwd)
-  throw(GsmException)
-{
-  if (passwd == "")
-    _at->chat("+CLCK=\"" + facility + "\",0,," + intToStr((int)cl));
-  else
-    _at->chat("+CLCK=\"" + facility + "\",0,\"" + passwd + "\","
-              + intToStr((int)cl));
-}
-
-vector<PWInfo> MeTa::getPasswords() throw(GsmException)
-{
-  vector<PWInfo> result;
-  Parser p(_at->chat("+CPWD=?", "+CPWD:"));
-  while (1)
-  {
-    PWInfo pwi;
-    if (!p.parseChar('(', true)) break; // exit if no new tuple
-    pwi._facility = p.parseString();
-    p.parseComma();
-    pwi._maxPasswdLen = p.parseInt();
-    p.parseChar(')');
-    p.parseComma(true);
-    result.push_back(pwi);
-  }
-  return result;
-}
-
-void MeTa::setPassword(string facility, string oldPasswd, string newPasswd)
-  throw(GsmException)
-{
-  _at->chat("+CPWD=\"" + facility + "\",\"" + oldPasswd + "\",\"" +
-            newPasswd + "\"");
-}
-
-bool MeTa::getNetworkCLIP() throw(GsmException)
-{
-  Parser p(_at->chat("+CLIP?", "+CLIP:"));
-  p.parseInt();                 // ignore result code presentation
-  p.parseComma();
-  return p.parseInt() == 1;
-}
-
-void MeTa::setCLIPPresentation(bool enable) throw(GsmException)
-{
-  if (enable)
-    _at->chat("+CLIP=1");
-  else
-    _at->chat("+CLIP=0");
-}
-
-bool MeTa::getCLIPPresentation() throw(GsmException)
-{
-  Parser p(_at->chat("+CLIP?", "+CLIP:"));
-  return p.parseInt() == 1;     // ignore rest of line
-}
-
-void MeTa::setCallForwarding(ForwardReason reason,
-                             ForwardMode mode,
-                             string number,
-                             string subaddr,
-                             FacilityClass cl,
-                             int forwardTime) throw(GsmException)
-{
-  // FIXME subaddr is currently ignored
-  if (forwardTime != NOT_SET && (forwardTime < 0 || forwardTime > 30))
-    throw GsmException(_("call forward time must be in the range 0..30"),
-                       ParameterError);
-  
-  int numberType;
-  number = removeWhiteSpace(number);
-  if (number.length() > 0 && number[0] == '+')
-  {
-    numberType = InternationalNumberFormat;
-    number = number.substr(1);  // skip the '+' at the beginning
-  }
-  else
-    numberType = UnknownNumberFormat;
-  _at->chat("+CCFC=" + intToStr(reason) + "," +  intToStr(mode) + "," 
-            "\"" + number + "\"," +
-            (number.length() > 0 ? intToStr(numberType) : "") +
-            "," +  intToStr(cl) +
-                                // FIXME subaddr and type
-            (forwardTime == NOT_SET ? "" :
-             (",,," + intToStr(forwardTime))));
-}
-                           
-void MeTa::getCallForwardInfo(ForwardReason reason,
-                              ForwardInfo &voice,
-                              ForwardInfo &fax,
-                              ForwardInfo &data) throw(GsmException)
-{
-  // Initialize to some sensible values:
-  voice._active = false;
-  voice._cl = VoiceFacility;
-  voice._time = -1;
-  voice._reason = NoReason;
-  data._active = false;
-  data._cl = DataFacility;
-  data._time = -1;
-  data._reason = NoReason;
-  fax._active = false;
-  fax._cl = FaxFacility;
-  fax._time = -1;
-  fax._reason = NoReason;
-
-  vector<string> responses =
-    _at->chatv("+CCFC=" + intToStr(reason) + ",2", "+CCFC:");
-  if (responses.size() == 1)
-  {
-    // only one line was returned. We have to ask for all three classes
-    // (voice, data, fax) separately
-    responses.clear();
-    responses.push_back(_at->chat("+CCFC=" + intToStr(reason) +
-                                  ",2,,,1", "+CCFC:"));
-    responses.push_back(_at->chat("+CCFC=" + intToStr(reason) +
-                                  ",2,,,2", "+CCFC:"));
-    responses.push_back(_at->chat("+CCFC=" + intToStr(reason) +
-                                  ",2,,,4", "+CCFC:"));
-  }
-
-  for (vector<string>::iterator i = responses.begin();
-       i != responses.end(); ++i)
-  {
-    Parser p(*i);
-    int status = p.parseInt();
-    p.parseComma();
-    FacilityClass cl = (FacilityClass)p.parseInt();
-    string number;
-    string subAddr;
-    int forwardTime = NOT_SET;
-      
-    // parse number
-    if (p.parseComma(true))
-    {
-      number = p.parseString();
-      p.parseComma();
-      unsigned int numberType = p.parseInt();
-      if (numberType == InternationalNumberFormat) number = "+" + number;
-
-      // parse subaddr
-      if (p.parseComma(true))
-      {
-        // FIXME subaddr type not handled
-        subAddr = p.parseString(true);
-        p.parseComma();
-        p.parseInt(true);
-          
-        // parse forwardTime
-        if (p.parseComma(true))
-        {
-          forwardTime = p.parseInt();
-        }
-      }
-    }
-    switch (cl)
-    {
-    case VoiceFacility:
-      voice._active = (status == 1);
-      voice._cl = VoiceFacility;
-      voice._number = number;
-      voice._subAddr = subAddr;
-      voice._time = forwardTime;
-      voice._reason = reason;
-      break;
-    case DataFacility:
-      data._active = (status == 1);
-      data._cl = DataFacility;
-      data._number = number;
-      data._subAddr = subAddr;
-      data._time = forwardTime;
-      data._reason =  reason;
-      break;
-    case FaxFacility:
-      fax._active = (status == 1);
-      fax._cl = FaxFacility;
-      fax._number = number;
-      fax._subAddr = subAddr;
-      fax._time = forwardTime;
-      fax._reason = reason;
-      break;
-    }
-  }
-}
-
-int MeTa::getBatteryChargeStatus() throw(GsmException)
-{
-  Parser p(_at->chat("+CBC", "+CBC:"));
-  return p.parseInt();
-}
-
-int MeTa::getBatteryCharge() throw(GsmException)
-{
-  Parser p(_at->chat("+CBC", "+CBC:"));
-  p.parseInt();
-  p.parseComma();
-  return p.parseInt();
-}
-
-int MeTa::getFunctionalityLevel() throw(GsmException)
-{
-  try {
-    Parser p(_at->chat("+CFUN?", "+CFUN:"));
-    // some phones return functionality level like "(2)"
-    bool expectClosingParen = p.parseChar('(', true);
-    int result = p.parseInt();
-    if (expectClosingParen)
-      p.parseChar(')');
-    return result;
-  }
-  catch (GsmException &x)
-  {
-    if (x.getErrorClass() == ChatError)
-    {
-      throw GsmException(_("Functionality Level commands not supported by ME"),
-			 MeTaCapabilityError);
-    } else {
-      throw;
-    }
-  }
-}
-
-void MeTa::setFunctionalityLevel(int level) throw(GsmException)
-{
-  try {
-    Parser p(_at->chat("+CFUN="  + intToStr(level)));
-  } catch (GsmException &x) {
-    if (x.getErrorClass() == ChatError)
-    {
-      // If the command AT+CFUN commands really aren't supported by the ME,
-      // then this will throw an appropriate exception for us.
-      getFunctionalityLevel();
-      // If the number was just out of range, we get here.
-      throw GsmException(_("Requested Functionality Level out of range"),
-			 ParameterError);
-    }
-    throw;
-  }
-}
-
-int MeTa::getSignalStrength() throw(GsmException)
-{
-  Parser p(_at->chat("+CSQ", "+CSQ:"));
-  return p.parseInt();
-}
-
-int MeTa::getBitErrorRate() throw(GsmException)
-{
-  Parser p(_at->chat("+CSQ", "+CSQ:"));
-  p.parseInt();
-  p.parseComma();
-  return p.parseInt();
-}
-
-vector<string> MeTa::getPhoneBookStrings() throw(GsmException)
-{
-  Parser p(_at->chat("+CPBS=?", "+CPBS:"));
-  return p.parseStringList();
-}
-
-PhonebookRef MeTa::getPhonebook(string phonebookString,
-                                bool preload) throw(GsmException)
-{
-  for (PhonebookVector::iterator i = _phonebookCache.begin();
-       i !=  _phonebookCache.end(); ++i)
-  {
-    if ((*i)->name() == phonebookString)
-      return *i;
-  }
-  PhonebookRef newPb(new Phonebook(phonebookString, _at, *this, preload));
-  _phonebookCache.push_back(newPb);
-  return newPb;
-}
-
-string MeTa::getServiceCentreAddress() throw(GsmException)
-{
-  Parser p(_at->chat("+CSCA?", "+CSCA:"));
-  return p.parseString();
-}
-
-void MeTa::setServiceCentreAddress(string sca) throw(GsmException)
-{
-  int type;
-  sca = removeWhiteSpace(sca);
-  if (sca.length() > 0 && sca[0] == '+')
-  {
-    type = InternationalNumberFormat;
-    sca = sca.substr(1, sca.length() - 1);
-  }
-  else
-    type = UnknownNumberFormat;
-  Parser p(_at->chat("+CSCA=\"" + sca + "\"," + intToStr(type)));
-}
-
-vector<string> MeTa::getSMSStoreNames() throw(GsmException)
-{
-  Parser p(_at->chat("+CPMS=?", "+CPMS:"));
-  // only return <mem1> values
-  return p.parseStringList();
-}
-
-SMSStoreRef MeTa::getSMSStore(string storeName) throw(GsmException)
-{
-  for (SMSStoreVector::iterator i = _smsStoreCache.begin();
-       i !=  _smsStoreCache.end(); ++i)
-  {
-    if ((*i)->name() == storeName)
-      return *i;
-  }
-  SMSStoreRef newSs(new SMSStore(storeName, _at, *this));
-  _smsStoreCache.push_back(newSs);
-  return newSs;
-}
-
-void MeTa::sendSMS(Ref<SMSSubmitMessage> smsMessage) throw(GsmException)
-{
-  smsMessage->setAt(_at);
-  smsMessage->send();
-}
-
-void MeTa::sendSMSs(Ref<SMSSubmitMessage> smsTemplate, string text,
-                    bool oneSMS,
-                    int concatenatedMessageId)
-  throw(GsmException)
-{
-  assert(! smsTemplate.isnull());
-
-  // compute maximum text length for normal SMSs and concatenated SMSs
-  unsigned int maxTextLength, concMaxTextLength;
-  switch (smsTemplate->dataCodingScheme().getAlphabet())
-  {
-  case DCS_DEFAULT_ALPHABET:
-    maxTextLength = 160;
-    concMaxTextLength = 152;
-    break;
-  case DCS_EIGHT_BIT_ALPHABET:
-    maxTextLength = 140;
-    concMaxTextLength = 134;
-    break;
-  case DCS_SIXTEEN_BIT_ALPHABET:
-    maxTextLength = 70;
-    concMaxTextLength = 67;
-    break;
-  default:
-    throw GsmException(_("unsupported alphabet for SMS"),
-                       ParameterError);
-    break;
-  }
-
-  // simple case, only send one SMS
-  if (oneSMS || text.length() <= maxTextLength)
-  {
-    if (text.length() > maxTextLength)
-      throw GsmException(_("SMS text is larger than allowed"),
-                         ParameterError);
-    smsTemplate->setUserData(text);
-    sendSMS(smsTemplate);
-  }
-  else                          // send multiple SMSs
-  {
-    if (concatenatedMessageId != -1)
-      maxTextLength = concMaxTextLength;
-
-    int numMessages = (text.length() + maxTextLength - 1) / maxTextLength;
-    if (numMessages > 255)
-      throw GsmException(_("not more than 255 concatenated SMSs allowed"),
-                         ParameterError);
-    unsigned char numMessage = 0;
-    while (true)
-    {
-      if (concatenatedMessageId != -1)
-      {
-        unsigned char udhs[] = {0x00, 0x03, concatenatedMessageId,
-                                numMessages, ++numMessage};
-        UserDataHeader udh(string((char*)udhs, 5));
-        smsTemplate->setUserDataHeader(udh);
-      }
-      smsTemplate->setUserData(text.substr(0, maxTextLength));
-      sendSMS(smsTemplate);
-      if (text.length() < maxTextLength)
-        break;
-      text.erase(0, maxTextLength);
-    }
-  }
-}
-
-void MeTa::setMessageService(int serviceLevel) throw(GsmException)
-{
-  string s;
-  switch (serviceLevel)
-  {
-  case 0:
-    s = "0";
-    break;
-  case 1:
-    s = "1";
-    break;
-  default:
-    throw GsmException(_("only serviceLevel 0 or 1 supported"),
-                       ParameterError);
-  }
-  // some devices (eg. Origo 900) don't support service level setting
-  _at->chat("+CSMS=" + s, "+CSMS:", true);
-}
-
-unsigned int MeTa::getMessageService() throw(GsmException)
-{
-  Parser p(_at->chat("+CSMS?", "+CSMS:"));
-  return p.parseInt();
-}
-
-void MeTa::getSMSRoutingToTA(bool &smsRouted,
-                             bool &cbsRouted,
-                             bool &statusReportsRouted) throw(GsmException)
-{
-  Parser p(_at->chat("+CNMI?", "+CNMI:"));
-  p.parseInt();
-  int smsMode = 0;
-  int cbsMode = 0;
-  int statMode = 0;
-  int bufferMode = 0;
-
-  if (p.parseComma(true))
-  {
-    smsMode = p.parseInt();
-    if (p.parseComma(true))
-    {
-      cbsMode = p.parseInt();
-      if (p.parseComma(true))
-      {
-        statMode = p.parseInt();
-        if (p.parseComma(true))
-        {
-          bufferMode = p.parseInt();
-        }
-      }
-    }
-  }
-  
-  smsRouted = (smsMode == 2) || (smsMode == 3);
-  cbsRouted = (cbsMode == 2) || (cbsMode == 3);
-  statusReportsRouted = (statMode == 1);
-}
-
-void MeTa::setSMSRoutingToTA(bool enableSMS, bool enableCBS,
-                             bool enableStatReport,
-                             bool onlyReceptionIndication)
-  throw(GsmException)
-{
-  bool smsModesSet = false;
-  bool cbsModesSet = false;
-  bool statModesSet = false;
-  bool bufferModesSet = false;
-
-  // find out capabilities
-  Parser p(_at->chat("+CNMI=?", "+CNMI:"));
-  vector<bool> modes = p.parseIntList();
-  vector<bool> smsModes(1);
-  vector<bool> cbsModes(1);
-  vector<bool> statModes(1);
-  vector<bool> bufferModes(1);
-  if (p.parseComma(true))
-  {
-    smsModes = p.parseIntList();
-    smsModesSet = true;
-    if (p.parseComma(true))
-    {
-      cbsModes = p.parseIntList();
-      cbsModesSet = true;
-      if (p.parseComma(true))
-      {
-        statModes = p.parseIntList();
-        statModesSet = true;
-        if (p.parseComma(true))
-        {
-          bufferModes = p.parseIntList();
-          bufferModesSet = true;
-        }
-      }
-    }
-  }
-
-  // now set the mode vectors to the default if not set
-  if (! smsModesSet) smsModes[0] = true;
-  if (! cbsModesSet) cbsModes[0] = true;
-  if (! statModesSet) statModes[0] = true;
-  if (! bufferModesSet) bufferModes[0] = true;
-  
-  string chatString;
-    
-  // now try to set some optimal combination depending on
-  // ME/TA's capabilities
-
-  // handle modes
-  if (isSet(modes, 2))
-    chatString = "2";
-  else if (isSet(modes, 1))
-    chatString = "1";
-  else if (isSet(modes, 0))
-    chatString = "0";
-  else if (isSet(modes, 3))
-    chatString = "3";
-
-  if (onlyReceptionIndication)
-  {
-    // handle sms mode
-    if (enableSMS)
-    {
-      if (isSet(smsModes, 1))
-        chatString += ",1";
-      else 
-        throw GsmException(_("cannot route SMS messages to TE"),
-                           MeTaCapabilityError);
-    }
-    else
-      chatString += ",0";
-      
-    // handle cbs mode
-    if (enableCBS)
-    {
-      if (isSet(cbsModes, 1))
-        chatString += ",1";
-      else if (isSet(cbsModes, 2))
-        chatString += ",2";
-      else 
-        throw GsmException(_("cannot route cell broadcast messages to TE"),
-                           MeTaCapabilityError);
-    }
-    else
-      chatString += ",0";
-
-    // handle stat mode
-    if (enableStatReport)
-    {
-      if (isSet(statModes, 2))
-        chatString += ",2";
-      else 
-        throw GsmException(_("cannot route status reports messages to TE"),
-                           MeTaCapabilityError);
-    }
-    else
-      chatString += ",0";
-  }
-  else
-  {
-    // handle sms mode
-    if (enableSMS)
-    {
-      if (isSet(smsModes, 2))
-        chatString += ",2";
-      else if (isSet(smsModes, 3))
-        chatString += ",3";
-      else 
-        throw GsmException(_("cannot route SMS messages to TE"),
-                           MeTaCapabilityError);
-    }
-    else
-      chatString += ",0";
-      
-    // handle cbs mode
-    if (enableCBS)
-    {
-      if (isSet(cbsModes, 2))
-        chatString += ",2";
-      else if (isSet(cbsModes, 3))
-        chatString += ",3";
-      else 
-        throw GsmException(_("cannot route cell broadcast messages to TE"),
-                           MeTaCapabilityError);
-    }
-    else
-      chatString += ",0";
-
-    // handle stat mode
-    if (enableStatReport)
-    {
-      if (isSet(statModes, 1))
-        chatString += ",1";
-      else if (isSet(statModes, 2))
-        chatString += ",2";
-      else 
-        throw GsmException(_("cannot route status report messages to TE"),
-                           MeTaCapabilityError);
-    }
-    else
-      chatString += ",0";
-  }
-
-  // handle buffer mode but only if it was reported by the +CNMI=? command
-  // the Ericsson GM12 GSM modem does not like it otherwise
-  if (bufferModesSet)
-    if (isSet(bufferModes, 1))
-      chatString += ",1";
-    else
-      chatString += ",0";
-
-  _at->chat("+CNMI=" + chatString);
-}
-
-bool MeTa::getCallWaitingLockStatus(FacilityClass cl)
-  throw(GsmException)
-{
-  // some TA return always multiline response with all classes
-  // (Option FirstFone)
-  // !!! errors handling is correct (responses.empty() true) ?
-  vector<string> responses = 
-    _at->chatv("+CCWA=0,2," + intToStr((int)cl),"+CCWA:",true);
-  for (vector<string>::iterator i = responses.begin();
-       i != responses.end(); ++i)
-  {
-    Parser p(*i);
-    int enabled = p.parseInt();
-
-    // if the first time and there is no comma this 
-    // return direct state of classes
-    // else return all classes
-    if (i == responses.begin())
-    {
-      if (! p.parseComma(true))
-        return enabled == 1;
-    }
-    else
-      p.parseComma();
-
-    if (p.parseInt() == (int)cl)
-      return enabled == 1;
-  }
-  return false;
-
-}
-void MeTa::setCallWaitingLockStatus(FacilityClass cl, bool lock)
-  throw(GsmException)
-{
-  if(lock)
-    _at->chat("+CCWA=0,1," + intToStr((int)cl));
-  else
-    _at->chat("+CCWA=0,0," + intToStr((int)cl));
-}
-
-void MeTa::setCLIRPresentation(bool enable) throw(GsmException)
-{
-  if (enable)
-    _at->chat("+CLIR=1");
-  else
-    _at->chat("+CLIR=0");
-}
-
-int MeTa::getCLIRPresentation() throw(GsmException)
-{
-  // 0:according to the subscription of the CLIR service
-  // 1:CLIR invocation
-  // 2:CLIR suppression
-  Parser p(_at->chat("+CLIR?", "+CLIR:"));
-  return p.parseInt();
-}
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_me_ta.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_me_ta.h
deleted file mode 100644
index f397e84695..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_me_ta.h
+++ /dev/null
@@ -1,402 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_me_ta.h
-// *
-// * Purpose: Mobile Equipment/Terminal Adapter and SMS functions
-// *          (ETSI GSM 07.07 and 07.05)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 3.5.1999
-// *************************************************************************
-
-#ifndef GSM_ME_TA_H
-#define GSM_ME_TA_H
-
-#include <gsmlib/gsm_error.h>
-#include <gsmlib/gsm_event.h>
-#include <gsmlib/gsm_phonebook.h>
-#include <gsmlib/gsm_sms_store.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_at.h>
-#include <gsmlib/gsm_sms.h>
-#include <string>
-#include <vector>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // *** phone capability description (you could also call it phone quirks)
-
-  struct Capabilities
-  {
-    bool _hasSMSSCAprefix;      // SMS have service centre address prefix
-    int _cpmsParamCount;        // number of SMS store parameters to
-                                // CPMS command
-    bool _omitsColon;           // omits trailing ':' in AT responses
-    bool _veryShortCOPSanswer;  // Falcom A2-1
-    bool _wrongSMSStatusCode;   // Motorola Timeport 260
-    bool _CDSmeansCDSI;         // Nokia Cellular Card Phone RPE-1 GSM900
-    bool _sendAck;              // send ack for directly routed SMS
-    Capabilities();             // constructor, set default behaviours
-  };
-  
-  // *** auxiliary structs
-
-  // Static ME information (AT command sequences given in brackets)
-  struct MEInfo
-  {
-    string _manufacturer;       // (+CGMI)
-    string _model;              // (+CGMM)
-    string _revision;           // (+CGMR)
-    string _serialNumber;       // (+CGSN), IMEI
-  };
-
-  // modes for network operation selection
-  enum OPModes {AutomaticOPMode = 0, ManualOPMode = 1,
-                DeregisterOPMode = 2, ManualAutomaticOPMode = 4};
-
-  // status codes or network operaton selection
-  enum OPStatus {UnknownOPStatus = 0, AvailableOPStatus = 1,
-                 CurrentOPStatus = 2, ForbiddenOPStatus = 3};
-
-  // network operator info
-  struct OPInfo
-  {
-    OPModes _mode;
-    OPStatus _status;
-    string _longName;
-    string _shortName;
-    int _numericName;           // may be NOT_SET
-
-    OPInfo() : _status(UnknownOPStatus), _numericName(NOT_SET) {}
-  };
-
-  // facility classes
-  enum FacilityClass {VoiceFacility = 1, DataFacility = 2, FaxFacility = 4};
-  const int ALL_FACILITIES = VoiceFacility | DataFacility | FaxFacility;
-
-  // struct to hold password info
-  struct PWInfo
-  {
-    string _facility;
-    int _maxPasswdLen;
-  };
-
-  // call forward reasons
-  // AllReasons encompasses 0..3
-  // AllConditionalReasons encompasses 1..3
-  enum ForwardReason {UnconditionalReason = 0, MobileBusyReason = 1,
-                      NoReplyReason = 2, NotReachableReason = 3,
-                      AllReasons = 4, AllConditionalReasons = 5, NoReason = 6};
-
-  // call forward modes
-  enum ForwardMode {DisableMode = 0, EnableMode = 1,
-                    RegistrationMode = 3, ErasureMode = 4};
-
-  // call forward info
-  struct ForwardInfo
-  {
-    bool _active;               // status in the network
-    FacilityClass _cl;          // voice, fax, or data
-    string _number;             // telephone number
-    string _subAddr;            // subaddress
-    int _time;                  // time in the range 1..30 (for NoReplyReason)
-    ForwardReason _reason;      // reason for the forwarding
-  };
-
-  // SMS types
-  typedef Ref<SMSStore> SMSStoreRef;
-  typedef vector<SMSStoreRef> SMSStoreVector;
-
-  // this class allows access to all functions of a ME/TA as described
-  // in sections 5-8 of ETSI GSM 07.07
-  // Note: If the ME is changed (ie. disconnected an another one connected
-  // to the TA), a new ME object must be created
-  // (Mobile equipment = ME, terminal adapter = TA)
-  class MeTa : public RefBase
-  {
-  protected:
-    Ref<Port> _port;            // port the ME/TA is connected to
-    Ref<GsmAt> _at;             // chat object for the port
-    PhonebookVector _phonebookCache; // cache of all used phonebooks
-    SMSStoreVector _smsStoreCache; // cache of all used phonebooks
-    string _lastPhonebookName;  // remember last phonebook set on ME/TA
-    string _lastSMSStoreName;   // remember last SMS store set on ME/TA
-    Capabilities _capabilities; // ME/TA quirks
-    GsmEvent _defaultEventHandler; // default event handler
-                                // see comments in MeTa::init()
-    string _lastCharSet;        // remember last character set
-
-    // init ME/TA to sensible defaults
-    void init() throw(GsmException);
-
-  public:
-    // initialize a new MeTa object given the port
-    MeTa(Ref<Port> port) throw(GsmException);
-
-    // initialize a new MeTa object given the AT handler
-    //MeTa(Ref<GsmAt> at) throw(GsmException);
-
-    // set the current phonebook in the ME
-    // remember the last phonebook set for optimisation
-    void setPhonebook(string phonebookName) throw(GsmException);
-
-    // set the current SMS store in the ME
-    // set storeTypes to
-    //   1 to set store for reading and deleting
-    //   2 to set store for writing and sending (includes type 1)
-    //   3 to preferred store for receiving SMS (includes types 1 and 2)
-    // remember the last SMS store set for optimisation
-    // if needResultCode is set this optimisation is not done
-    string setSMSStore(string smsStore, int storeTypes,
-                       bool needResultCode = false)
-      throw(GsmException);
-
-    // get current SMS store settings
-    void getSMSStore(string &readDeleteStore,
-                     string &writeSendStore,
-                     string &receiveStore) throw(GsmException);
-
-    // get capabilities of this ME/TA
-    Capabilities getCapabilities() const {return _capabilities;}
-
-    // return my port
-    Ref<Port> getPort() {return _port;}
-
-    // return my at handler
-    Ref<GsmAt> getAt() {return _at;}
-
-    // set event handler for unsolicited result codes
-    GsmEvent *setEventHandler(GsmEvent *newHandler)
-      {return _at->setEventHandler(newHandler);}
-
-    // wait for an event
-    void waitEvent(GsmTime timeout) throw(GsmException);
-
-    // *** ETSI GSM 07.07 Section 5: "General Commands"
-
-    // return ME information
-    MEInfo getMEInfo() throw(GsmException);
-
-    // return available character sets
-    vector<string> getSupportedCharSets() throw(GsmException);// (+CSCS=?)
-    
-    // return current character set (default: GSM)
-    string getCurrentCharSet() throw(GsmException);// (+CSCS?)
-
-    // set character set to use
-    void setCharSet(string charSetName) throw(GsmException);// (+CSCS=)
-    
-    // *** ETSI GSM 07.07 Section 6: "Call control commands and methods"
-    
-    // get extended error report
-    string getExtendedErrorReport() throw(GsmException);// (+CEER)
-
-    // dial a number, CLI presentation as defined in network
-    void dial(string number) throw(GsmException);// (ATD)
-
-    // answer
-    void answer() throw(GsmException); // (ATA)
-
-    // hangup
-    void hangup() throw(GsmException); // (ATH)
-    
-    // set Personal Identification Number
-    void setPIN(string number) throw(GsmException);// (+CPIN)
-
-    // get PIN Status
-    string getPINStatus() throw(GsmException);// (+CPIN?)
-
-    // *** ETSI GSM 07.07 Section 7: "Network service related commands"
-    
-    // return available network operators
-    // this fills in all fields of OPInfo with the exception of _mode
-    vector<OPInfo> getAvailableOPInfo() throw(GsmException); // (+COPS=?)
-
-    // return current network operators
-    // this fills in all the fields of OPInfo with the exception of _status
-    OPInfo getCurrentOPInfo() throw(GsmException);
-
-    // set network operator
-    // caller must fill in ALL names it has read from previous calls
-    // of getCurrentOPInfo() or getAvailableOPInfo()
-    // (because ME/TA might not implement all names)
-    void setCurrentOPInfo(OPModes mode,
-                          string longName = "",
-                          string shortName = "",
-                          int numericName = NOT_SET) throw(GsmException);
-
-    // get facility lock capabilities (+CLCK)
-    vector<string> getFacilityLockCapabilities() throw(GsmException);
-
-    // query facility lock status for named facility
-    bool getFacilityLockStatus(string facility, FacilityClass cl)
-      throw(GsmException);
-
-    // lock facility
-    void lockFacility(string facility, FacilityClass cl, string passwd = "")
-      throw(GsmException);
-
-    // unlock facility
-    void unlockFacility(string facility, FacilityClass cl, string passwd = "")
-      throw(GsmException);
-
-    // return names of facility for which a password can be set
-    // and the maximum length of the respective password
-    vector<PWInfo> getPasswords() throw(GsmException);// (+CPWD=?)
-
-    // set password for the given facility
-    void setPassword(string facility, string oldPasswd, string newPasswd)
-      throw(GsmException);
-    // (+CPWD=)
-
-    // get CLIP (caller line identification presentation) in the network
-    bool getNetworkCLIP() throw(GsmException);// (+CLIP?)
-
-    // set CLIP presentation on or off
-    // enables GsmEvent::callerLineID
-    void setCLIPPresentation(bool enable) throw(GsmException);// (+CLIP=)
-
-    // returns if the above is enable
-    bool getCLIPPresentation() throw(GsmException);// (+CLIP?)
-
-    // set call forwarding
-    void setCallForwarding(ForwardReason reason,
-                           ForwardMode mode,
-                           string number,
-                           string subaddr,
-                           FacilityClass cl = (FacilityClass)ALL_FACILITIES,
-                           int forwardTime = NOT_SET)
-      throw(GsmException); // (+CCFC=)
-
-    // get Information of currently set CF in the network
-    // the caller must give the reason to query
-    void getCallForwardInfo(ForwardReason reason,
-                            ForwardInfo &voice,
-                            ForwardInfo &fax,
-                            ForwardInfo &data)
-      throw(GsmException); // (+CCFC=)
-
-
-    // *** ETSI GSM 07.07 Section 8: "Mobile Equipment control
-    //                                and status commands"
-
-    // return/set ME functionality level (+CFUN):
-    // 0 Minimum functionality
-    // 1 full functionality
-    // 2 disable phone transmit RF circuits only
-    // 3 disable phone receive RF circuits only
-    // 4 disable phone both transmit and receive RF circuits
-    // 5...127 implementation-defined
-    int getFunctionalityLevel() throw(GsmException);
-    void setFunctionalityLevel(int level) throw(GsmException);
-
-    // return battery charge status (+CBC):
-    // 0 ME is powered by the battery
-    // 1 ME has a battery connected, but is not powered by it
-    // 2 ME does not have a battery connected
-    // 3 Recognized power fault, calls inhibited
-    int getBatteryChargeStatus() throw(GsmException);
-
-    // return battery charge (range 0..100) (+CBC)
-    int getBatteryCharge() throw(GsmException);
-
-    // get signal strength indication (+CSQ):
-    // 0 -113 dBm or less
-    // 1 -111 dBm
-    // 2...30 -109... -53 dBm
-    // 31 -51 dBm or greater
-    // 99 not known or not detectable
-    int getSignalStrength() throw(GsmException);
-
-    // get channel bit error rate (+CSQ):
-    // 0...7 as RXQUAL values in the table in GSM 05.08 [20] subclause 8.2.4
-    // 99 not known or not detectable
-    int getBitErrorRate() throw(GsmException);
-
-    // get available phone book memory storage strings (+CPBS=?)
-    vector<string> getPhoneBookStrings() throw(GsmException);
-
-    // get phone book given the phone book memory storage string
-    PhonebookRef getPhonebook(string phonebookString,
-                              bool preload = false) throw(GsmException);
-
-
-    // *** ETSI GSM 07.05 SMS functions
-
-    // return service centre address (+CSCA?)
-    string getServiceCentreAddress() throw(GsmException);
-
-    // set service centre address (+CSCA=)
-    void setServiceCentreAddress(string sca) throw(GsmException);
-    
-    // return names of available message stores (<mem1>, +CPMS=?)
-    vector<string> getSMSStoreNames() throw(GsmException);
-
-    // return SMS store given the name
-    SMSStoreRef getSMSStore(string storeName) throw(GsmException);
-
-    // send a single SMS message
-    void sendSMS(Ref<SMSSubmitMessage> smsMessage) throw(GsmException);
-
-    // send one or several (concatenated) SMS messages
-    // The SUBMIT message template must have all options set, only
-    // the userData and the userDataHeader are changed.
-    // If oneSMS is true, only one SMS is sent. Otherwise several SMSs
-    // are sent. If concatenatedMessageId is != -1 this is used as the message
-    // ID for concatenated SMS (for this a user data header as defined in
-    // GSM GTS 3.40 is used, the old UDH in the template is overwritten).
-    void sendSMSs(Ref<SMSSubmitMessage> smsTemplate, string text,
-                  bool oneSMS = false,
-                  int concatenatedMessageId = -1)
-      throw(GsmException);
-
-    // set SMS service level
-    // if set to 1 send commands return ACK PDU, 0 is the default
-    void setMessageService(int serviceLevel) throw(GsmException);
-
-    // return SMS service level
-    unsigned int getMessageService() throw(GsmException);
-
-    // return true if any of the thre message types GsmEvent::SMSMessageType
-    // is routed directly to the TA and not stored in the ME
-    void getSMSRoutingToTA(bool &smsRouted, // (+CNMI?)
-                           bool &cbsRouted,
-                           bool &statusReportsRouted) throw(GsmException);
-
-    // sets routing of SMS to TA to true for all supported SMSMessageTypes
-    // if onlyReceptionIndication is set to true
-    // only GsmEvent::SMSReceptionIndication is called
-    // this has two reasons: GSM 07.05 section 3.4.1 does not recommend
-    // direct routing of new SMS to the TA
-    // I cannot test direct routing of SMS because it does not work with
-    // my hardware
-    void setSMSRoutingToTA(bool enableSMS, bool enableCBS,
-                           bool enableStatReport,
-                           bool onlyReceptionIndication = true)
-      throw(GsmException);
-    // (+CNMI=)
-
-    bool getCallWaitingLockStatus(FacilityClass cl)
-      throw(GsmException);
-	
-    void setCallWaitingLockStatus(FacilityClass cl,
-                                  bool lock)throw(GsmException);
-
-    void setCLIRPresentation(bool enable) throw(GsmException);
-    //(+CLIR)
-    
-    // 0:according to the subscription of the CLIR service
-    // 1:CLIR invocation
-    // 2:CLIR suppression
-    int getCLIRPresentation() throw(GsmException);
-
-    friend class Phonebook;
-    friend class SMSStore;
-  };
-};
-
-#endif // GSM_ME_TA_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_nls.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_nls.cc
deleted file mode 100644
index 5eb205bf81..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_nls.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_nls.cc
-// *
-// * Purpose: Groups macros, initialization and includes
-// *          for National Language Support (NLS)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 3.11.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <string>
-
-using namespace std;
-
-#ifdef ENABLE_NLS
-
-using namespace gsmlib;
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-bool InitNLS::initialized = false;
-
-#endif // ENABLE_NLS
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_nls.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_nls.h
deleted file mode 100644
index 6bfa6eb2f7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_nls.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_nls.h
-// *
-// * Purpose: Groups macros, initialization and includes
-// *          for National Language Support (NLS)
-// *
-// * Warning: Only include this header from gsmlib .cc-files
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 3.11.1999
-// *************************************************************************
-
-#ifndef GSM_NLS_H
-#define GSM_NLS_H
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-
-#ifdef ENABLE_NLS
-
-#ifdef HAVE_LIBINTL_H
-#include <libintl.h>
-#else
-#include "../intl/libintl.h"
-#endif
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#define _(String) dgettext(PACKAGE, String)
-
-// this causes automatic NLS initialization if one file of the library
-// includes gsm_nls.h
-
-namespace gsmlib
-{
-  const class InitNLS
-  {
-  static bool initialized;
-    
-  public:
-    InitNLS()
-      {
-        if (! initialized)      // do only once
-        {
-          setlocale(LC_ALL, "");
-#ifdef LOCAL_TRANSLATIONS
-          bindtextdomain(PACKAGE, "../po");
-#else
-          bindtextdomain(PACKAGE, LOCALEDIR);
-#endif
-          textdomain(PACKAGE);
-          initialized = true;
-        }
-      }
-  } initNLS;
-};
-
-#else
-
-#define _(String) (String)
-
-#endif // ENABLE_NLS
-
-#define N_(String) (String)
-
-#endif // GSM_NLS_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_parser.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_parser.cc
deleted file mode 100644
index 38a21cd515..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_parser.cc
+++ /dev/null
@@ -1,381 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_parser.cc
-// *
-// * Purpose: Parser to parse MA/TA result strings
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 13.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_parser.h>
-#include <gsmlib/gsm_nls.h>
-#include <ctype.h>
-#include <assert.h>
-#include <strstream>
-
-using namespace std;
-using namespace gsmlib;
-
-// Parser members
-
-int Parser::nextChar(bool skipWhiteSpace)
-{
-  if (skipWhiteSpace)
-    while (_i < _s.length() && isspace(_s[_i])) ++_i;
-
-  if (_i == _s.length())
-  {
-    _eos = true;
-    return -1;
-  }
-
-  return _s[_i++];
-}
-    
-bool Parser::checkEmptyParameter(bool allowNoParameter) throw(GsmException)
-{
-  int c = nextChar();
-  if (c == ',' || c == -1)
-    if (allowNoParameter)
-    {
-      putBackChar();
-      return true;
-    }
-    else
-      throwParseException(_("expected parameter"));
-
-  putBackChar();
-  return false;
-}
-    
-string Parser::parseString2(bool stringWithQuotationMarks)
-  throw(GsmException)
-{
-  int c;
-  string result;
-  if (parseChar('"', true))  // OK, string starts and ends with quotation mark
-    if (stringWithQuotationMarks)
-    {
-      // read till end of line
-      while ((c = nextChar(false)) != -1)
-        result += c;
-      
-      // check for """ at end of line
-      if (result.length() == 0 || result[result.length() - 1]  != '"')
-        throwParseException(_("expected '\"'"));
-      
-      // remove """ at the end
-      result.resize(result.length() - 1);
-    }
-    else
-    {
-      // read till next """
-      while ((c = nextChar(false)) != '"')
-        if (c == -1)
-          throwParseException();
-        else
-          result += c;
-    }
-  else                          // string ends with "," or EOL
-  {
-    c = nextChar(false);
-    while (c != ',' && c != -1)
-    {
-      result += c;
-      c = nextChar(false);
-    }
-    if (c == ',') putBackChar();
-  }
-    
-  return result;
-}
-
-int Parser::parseInt2() throw(GsmException)
-{
-  string s;
-  int c;
-  int result;
-
-  while (isdigit(c = nextChar())) s += c;
-
-  putBackChar();
-  if (s.length() == 0)
-    throwParseException(_("expected number"));
-
-  istrstream is(s.c_str());
-  is >> result;
-  return result;
-}
-
-void Parser::throwParseException(string message) throw(GsmException)
-{
-  ostrstream os;
-  if (message.length() == 0)
-    throw GsmException(stringPrintf(_("unexpected end of string '%s'"),
-                                    _s.c_str()), ParserError);
-  else
-    throw GsmException(message +
-                       stringPrintf(_(" (at position %d of string '%s')"), _i,
-                                    _s.c_str()), ParserError);
-}
-
-Parser::Parser(string s) : _i(0), _s(s), _eos(false)
-{
-}
-
-bool Parser::parseChar(char c, bool allowNoChar) throw(GsmException)
-{
-  if (nextChar() != c)
-    if (allowNoChar)
-    {
-      putBackChar();
-      return false;
-    }
-    else
-      throwParseException(stringPrintf(_("expected '%c'"), c));
-  return true;
-}
-
-vector<string> Parser::parseStringList(bool allowNoList)
-  throw(GsmException)
-{
-  // handle case of empty parameter
-  vector<string> result;
-  if (checkEmptyParameter(allowNoList)) return result;
-
-  parseChar('(');
-  if (nextChar() != ')')
-  {
-    putBackChar();
-    while (1)
-    {
-      result.push_back(parseString());
-      int c = nextChar();
-      if (c == ')')
-      break;
-      if (c == -1)
-        throwParseException();
-      if (c != ',')
-        throwParseException(_("expected ')' or ','"));
-    }
-  }
-  
-  return result;
-}
-
-vector<bool> Parser::parseIntList(bool allowNoList)
-  throw(GsmException)
-{
-  // handle case of empty parameter
-  bool isRange = false;
-  vector<bool> result;
-  int resultCapacity = 0;
-  unsigned int saveI = _i;
-
-  if (checkEmptyParameter(allowNoList)) return result;
-
-  // check for the case of a integer list consisting of only one parameter
-  // some TAs omit the parentheses in this case
-  if (isdigit(nextChar()))
-  {
-    putBackChar();
-    int num = parseInt();
-    result.resize(num + 1, false);
-    result[num] = true;
-    return result;
-  }
-  putBackChar();
-
-  // run in two passes
-  // pass 0: find capacity needed for result
-  // pass 1: resize result and fill it in
-  for (int pass = 0; pass < 2; ++pass)
-  {
-    if (pass == 1)
-    {
-      _i = saveI;
-      result.resize(resultCapacity + 1, false);
-    }
-
-    parseChar('(');
-    if (nextChar() != ')')
-    {
-      putBackChar();
-      int lastInt = -1;
-      while (1)
-      {
-        int thisInt = parseInt();
-
-        if (isRange)
-        {
-          assert(lastInt != -1);
-          if (lastInt <= thisInt)
-            for (int i = lastInt; i < thisInt; ++i)
-            {
-              if (i > resultCapacity)
-                resultCapacity = i;
-              if (pass == 1)
-                result[i] = true;
-            }
-          else
-            for (int i = thisInt; i < lastInt; ++i)
-            {
-              if (i > resultCapacity)
-                resultCapacity = i;
-              if (pass == 1)
-                result[i] = true;
-            }
-          isRange = false;
-        }
-
-        if (thisInt > resultCapacity)
-          resultCapacity = thisInt;
-        if (pass == 1)
-          result[thisInt] = true;
-        lastInt = thisInt;
-      
-        int c = nextChar();
-        if (c == ')')
-          break;
-
-        if (c == -1)
-          throwParseException();
-
-        if (c != ',' && c != '-')
-          throwParseException(_("expected ')', ',' or '-'"));
-
-        if (c == ',')
-          isRange = false;
-        else                      // is '-'
-          if (isRange)
-            throwParseException(_("range of the form a-b-c not allowed"));
-          else
-            isRange = true;
-      }
-    }
-  }
-  if (isRange)
-    throwParseException(_("range of the form a- no allowed"));
-  return result;
-}
-
-vector<ParameterRange> Parser::parseParameterRangeList(bool allowNoList)
-  throw(GsmException)
-{
-  // handle case of empty parameter
-  vector<ParameterRange> result;
-  if (checkEmptyParameter(allowNoList)) return result;
-
-  result.push_back(parseParameterRange());
-  while (parseComma(true))
-  {
-    result.push_back(parseParameterRange());
-  }
-  
-  return result;
-}
-
-ParameterRange Parser::parseParameterRange(bool allowNoParameterRange)
-  throw(GsmException)
-{
-  // handle case of empty parameter
-  ParameterRange result;
-  if (checkEmptyParameter(allowNoParameterRange)) return result;
-
-  parseChar('(');
-  result._parameter = parseString();
-  parseComma();
-  result._range = parseRange(false, true);
-  parseChar(')');
-
-  return result;
-}
-
-IntRange Parser::parseRange(bool allowNoRange, bool allowNonRange)
-  throw(GsmException)
-{
-  // handle case of empty parameter
-  IntRange result;
-  if (checkEmptyParameter(allowNoRange)) return result;
-
-  parseChar('(');
-  result._low = parseInt();
-  // allow non-ranges is allowNonRange == true
-  if (parseChar('-', allowNonRange))
-    result._high = parseInt();
-  parseChar(')');
-
-  return result;
-}
-
-int Parser::parseInt(bool allowNoInt) throw(GsmException)
-{
-  // handle case of empty parameter
-  int result = NOT_SET;
-  if (checkEmptyParameter(allowNoInt)) return result;
-
-  result = parseInt2();
-
-  return result;
-}
-
-string Parser::parseString(bool allowNoString,
-                           bool stringWithQuotationMarks)
-  throw(GsmException)
-{
-  // handle case of empty parameter
-  string result;
-  if (checkEmptyParameter(allowNoString)) return result;
-
-  result = parseString2(stringWithQuotationMarks);
-
-  return result;
-}
-
-bool Parser::parseComma(bool allowNoComma) throw(GsmException)
-{
-  if (nextChar() != ',')
-    if(allowNoComma)
-    {
-      putBackChar();
-      return false;
-    }
-    else
-      throwParseException(_("expected comma"));
-  return true;
-}
-
-string Parser::parseEol() throw(GsmException)
-{
-  string result;
-  int c;
-  while ((c = nextChar()) != -1) result += c;
-  return result;
-}
-
-void Parser::checkEol() throw(GsmException)
-{
-  if (nextChar() != -1)
-  {
-    putBackChar();
-    throwParseException(_("expected end of line"));
-  }
-}
-
-string Parser::getEol()
-{
-  string result;
-  int c;
-  unsigned int saveI = _i;
-  bool saveEos = _eos;
-  while ((c = nextChar()) != -1) result += c;
-  _i = saveI;
-  _eos = saveEos;
-  return result;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_parser.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_parser.h
deleted file mode 100644
index 8404f9f1cb..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_parser.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_parser.h
-// *
-// * Purpose: Parser to parse MA/TA result strings
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 13.5.1999
-// *************************************************************************
-
-#ifndef GSM_PARSER_H
-#define GSM_PARSER_H
-
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_error.h>
-#include <string>
-#include <vector>
-
-using namespace std;
-
-namespace gsmlib
-{
-  class Parser : public RefBase
-  {
-  private:
-    unsigned int _i;            // index into _s, next character
-    string _s;                  // string to parse
-    bool _eos;                  // true if end-of-string reached in nextChar()
-
-    // return next character or -1 if end of string
-    int nextChar(bool skipWhiteSpace = true);
-    
-    // "puts back" a character
-    void putBackChar() {if (! _eos) --_i;}
-
-    // check for empty parameter (ie. "," or end of string)
-    // skips white space
-    // returns true if no parameter
-    // or throw an GsmException if allowNoParameter == false
-    bool checkEmptyParameter(bool allowNoParameter) throw(GsmException);
-    
-    // parse a string (like "string")
-    // throw an exception if not well-formed
-    string parseString2(bool stringWithQuotationMarks) throw(GsmException);
-
-    // parse a int (like 1234)
-    // throw an exception if not well-formed
-    int parseInt2() throw(GsmException);
-
-    // throw a parser exception
-    void throwParseException(string message = "") throw(GsmException);
-
-  public:
-    Parser(string s);
-    
-    // the following functions skip white space
-    // parse a character, if absent throw a GsmException
-    // return false if allowNoChar == true and character not encountered
-    bool parseChar(char c, bool allowNoChar = false) throw(GsmException);
-
-    // parse a list of the form "("ABC", DEF")"
-    // the list can be empty (ie. == "" ) if allowNoList == true
-    vector<string> parseStringList(bool allowNoList = false)
-      throw(GsmException);
-
-    // parse a list of the form "(12, 14)" or "(1-4, 10)"
-    // the result is returned as a bit vector where for each integer
-    // in the list and/or range(s) a bit is set
-    // the list can be empty (ie. == "") if allowNoList == true
-    vector<bool> parseIntList(bool allowNoList = false)
-      throw(GsmException);
-
-    // parse a list of parameter ranges (see below)
-    // the list can be empty (ie. == "" ) if allowNoList == true
-    vector<ParameterRange> parseParameterRangeList(bool allowNoList = false)
-      throw(GsmException);
-
-    // parse a string plus its valid integer range of the
-    // form "("string",(1-125))"
-    // the parameter range may be absent if allowNoParameterRange == true
-    ParameterRange parseParameterRange(bool allowNoParameterRange = false)
-      throw(GsmException);
-
-    // parse an integer range of the form "(1-125)"
-    // the range may be absent if allowNoRange == true
-    // then IntRange::_high and _low are set to NOT_SET
-    // the range may be short if allowNonRange == true
-    // then IntRange::_high is set to NOT_SET
-    IntRange parseRange(bool allowNoRange = false, bool allowNonRange = false)
-      throw(GsmException);
-    
-    // parse an integer of the form "1234"
-    // allow absent int if allowNoInt == true
-    // then it returns NOT_SET
-    int parseInt(bool allowNoInt = false) throw(GsmException);
-
-    // parse a string of the form ""string""
-    // allow absent string if allowNoString == true
-    // then it returns ""
-    // if stringWithQuotationMarks == true the string may contain """
-    // the string is then parsed till the end of the line
-    string parseString(bool allowNoString = false,
-                       bool stringWithQuotationMarks = false)
-      throw(GsmException);
-
-    // parse a single ","
-    // the comma may be absent if allowNoComma == true
-    // returns true if there was a comma
-    bool parseComma(bool allowNoComma = false) throw(GsmException);
-    
-    // parse till end of line, return result without whitespace
-    string parseEol() throw(GsmException);
-
-    // check that end of line is reached
-    void checkEol() throw(GsmException);
-
-    // return string till end of line without whitespace
-    // (does not change internal state)
-    string getEol();
-  };
-};
-
-#endif // GSM_PARSER_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_phonebook.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_phonebook.cc
deleted file mode 100644
index 24d89e805d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_phonebook.cc
+++ /dev/null
@@ -1,585 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_phonebook.cc
-// *
-// * Purpose: Phonebook management functions
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 6.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_sysdep.h>
-#include <gsmlib/gsm_phonebook.h>
-#include <gsmlib/gsm_parser.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <strstream>
-#include <iostream>
-#include <assert.h>
-#include <ctype.h>
-
-using namespace std;
-using namespace gsmlib;
-
-// PhonebookEntry members
-
-PhonebookEntry::PhonebookEntry(const PhonebookEntryBase &e)
-  throw(GsmException) : _cached(true), _myPhonebook(NULL)
-{
-  set(e.telephone(), e.text(), e.index(), e.useIndex());
-}
-
-void PhonebookEntry::set(string telephone, string text, int index,
-                         bool useIndex)
-  throw(GsmException)
-{
-  checkTextAndTelephone(text, telephone);
-
-  if (_myPhonebook != NULL)
-  {
-    if (text.length() > _myPhonebook->getMaxTextLen())
-      throw GsmException(
-        stringPrintf(_("length of text '%s' exceeds maximum text "
-                       "length (%d characters) of phonebook '%s'"),
-                     text.c_str(), _myPhonebook->getMaxTextLen(),
-                     _myPhonebook->name().c_str()),
-        ParameterError);
-    
-    if (telephone.length() > _myPhonebook->getMaxTelephoneLen())
-      throw GsmException(
-        stringPrintf(_("length of telephone number '%s' " 
-                       "exceeds maximum telephone number "
-                       "length (%d characters) of phonebook '%s'"),
-                     telephone.c_str(), _myPhonebook->getMaxTelephoneLen(),
-                     _myPhonebook->name().c_str()),
-        ParameterError);
-
-    _myPhonebook->writeEntry(_index, telephone, text);
-  }
-  else
-    _index = index;
-
-  _useIndex = useIndex;
-  _cached = true;
-  _telephone = telephone;
-  _text = text;
-  _changed = true;
-}
-
-string PhonebookEntry::text() const throw(GsmException)
-{
-  if (! cached())
-  {
-    assert(_myPhonebook != NULL);
-    // these operations are at least "logically const"
-    PhonebookEntry *thisEntry = const_cast<PhonebookEntry*>(this);
-    _myPhonebook->readEntry(_index, thisEntry->_telephone, thisEntry->_text);
-    thisEntry->_cached = true;
-  }
-  return _text;
-}
-
-string PhonebookEntry::telephone() const throw(GsmException)
-{
-  if (! cached())
-  {
-    assert(_myPhonebook != NULL);
-    // these operations are at least "logically const"
-    PhonebookEntry *thisEntry = const_cast<PhonebookEntry*>(this);
-    _myPhonebook->readEntry(_index, thisEntry->_telephone, thisEntry->_text);
-    thisEntry->_cached = true;
-  }
-  return _telephone;
-}
-
-bool PhonebookEntry::cached() const
-{
-  if (_myPhonebook == NULL)
-    return _cached;
-  else
-    return _cached && _myPhonebook->_useCache;
-}
-
-PhonebookEntry::PhonebookEntry(const PhonebookEntry &e) throw(GsmException)
-{
-  set(e._telephone, e._text, e._index, e._useIndex);
-}
-
-PhonebookEntry &PhonebookEntry::operator=(const PhonebookEntry &e)
-  throw(GsmException)
-{
-  set(e._telephone, e._text, e._index, e._useIndex);
-  return *this;
-}
-
-// Phonebook members
-
-int Phonebook::parsePhonebookEntry(string response,
-                                   string &telephone, string &text)
-{
-  // this is a workaround for a bug that occurs with my ME/TA combination
-  // some texts are truncated and don't have a trailing "
-  if (response.length() > 0 && response[response.length() - 1] != '"')
-    response += '"';
-  Parser p(response);
-
-  int index = p.parseInt();
-  p.parseComma();
-
-  // handle case of empty entry
-  if (p.getEol().substr(0, 5) == "EMPTY")
-  {
-    telephone = "";
-    text = "";
-    return index;
-  }
-
-  telephone = p.parseString();
-  p.parseComma();
-  unsigned int numberFormat = p.parseInt();
-  if (numberFormat != UnknownNumberFormat &&
-      numberFormat != InternationalNumberFormat)
-    cerr << "*** GSMLIB WARNING: Unexpected number format when reading from "
-         << "phonebook: " << numberFormat << " ***" << endl;
-  p.parseComma();
-  text = p.parseString(false, true);
-  if (lowercase(_myMeTa.getCurrentCharSet()) == "gsm")
-    text = gsmToLatin1(text);
-  if (numberFormat == InternationalNumberFormat)
-  {
-    // skip leading "+" signs that may already exist
-    while (telephone.length() > 0 && telephone[0] == '+')
-      telephone = telephone.substr(1);
-    telephone = "+" + telephone;
-  }
-
-  return index;
-}
-
-void Phonebook::readEntry(int index, string &telephone, string &text)
-  throw(GsmException)
-{
-  // select phonebook
-  _myMeTa.setPhonebook(_phonebookName);
-
-  // read entry
-  string response = _at->chat("+CPBR=" + intToStr(index), "+CPBR:",
-                              false, // dont't ignore errors
-                              true); // but accept empty responses
-  // (the latter is necessary for some mobile phones that return nothing
-  // if the entry is empty)
-
-  if (response.length() == 0)   // OK phone returned empty response
-  {
-    telephone = text = "";      // then the entry is empty as well
-  }
-  else
-    parsePhonebookEntry(response, telephone, text);
-
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "*** Reading PB entry " << index << " number " << telephone 
-         << " text " << text << endl;
-#endif
-}
-
-void Phonebook::findEntry(string text, int &index, string &telephone)
-  throw(GsmException)
-{
-  // select phonebook
-  _myMeTa.setPhonebook(_phonebookName);
-
-  // read entry
-  string response = _at->chat("+CPBF=\"" + text + "\"", "+CPBF:",
-                              false, // dont't ignore errors
-                              true); // but accept empty responses
-  // (the latter is necessary for some mobile phones that return nothing
-  // if the entry is empty)
-
-  if (response.length() == 0)   // OK phone returned empty response
-  {
-    telephone = "";      // then the entry is empty as well
-    index = 0;
-  }
-  else
-    index=parsePhonebookEntry(response, telephone, text);
-
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "*** Finding PB entry " << text << " number " << telephone 
-         << " index " << index << endl;
-#endif
-}
-
-void Phonebook::writeEntry(int index, string telephone, string text)
-  throw(GsmException)
-{
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "*** Writing PB entry #" << index << " number '" << telephone
-         << "' text '" << text << "'" << endl;
-#endif
-  // select phonebook
-  _myMeTa.setPhonebook(_phonebookName);
-
-  // write entry
-  string s;
-  if (telephone == "" && text == "")
-  {
-    ostrstream os;
-    os << "+CPBW=" << index;
-    os << ends;
-    char *ss = os.str();
-    s = string(ss);
-    delete[] ss;
-  }
-  else
-  {
-    int type;
-    if (telephone.find('+') == string::npos)
-      type = UnknownNumberFormat;
-    else
-      type = InternationalNumberFormat;
-    string gsmText = text;
-    if (lowercase(_myMeTa.getCurrentCharSet()) == "gsm")
-      gsmText = latin1ToGsm(gsmText);
-    ostrstream os;
-    os << "+CPBW=" << index << ",\"" << telephone << "\"," << type
-       << ",\"";
-    os << ends;
-    char *ss = os.str();
-    s = string(ss);
-    delete[] ss;
-    // this cannot be added with ostrstream because the gsmText can
-    // contain a zero (GSM default alphabet for '@')
-    s +=  gsmText + "\"";
-  }
-  _at->chat(s);
-}
-
-Phonebook::iterator Phonebook::insertFirstEmpty(string telephone, string text)
-  throw(GsmException)
-{
-  for (int i = 0; i < _maxSize; i++)
-    if (_phonebook[i].empty())
-    {
-      _phonebook[i].set(telephone, text);
-      adjustSize(1);
-      return begin() + i;
-    }
-  throw GsmException(_("phonebook full"), OtherError);
-}
-
-Phonebook::iterator Phonebook::insert(const string telephone,
-                                      const string text,
-                                      const int index)
-{
-  for (int i = 0; i < _maxSize; i++)
-    if (_phonebook[i].index() == index)
-      if (_phonebook[i].empty())
-      {
-        _phonebook[i].set(telephone, text);
-        adjustSize(1);
-        return begin() + i;
-      }
-      else
-        throw GsmException(_("attempt to overwrite phonebook entry"),
-                           OtherError);
-  return end();
-}
-
-Phonebook::Phonebook(string phonebookName, Ref<GsmAt> at, MeTa &myMeTa,
-                     bool preload) throw(GsmException) :
-  _phonebookName(phonebookName), _at(at), _myMeTa(myMeTa), _useCache(true)
-{
-  // select phonebook
-  _myMeTa.setPhonebook(_phonebookName);
-
-  // query size and maximum capacity of phonebook
-  _size = -1;                   // -1 means not known yet
-  _maxSize = -1;
-  Parser q(_at->chat("+CPBS?", "+CPBS:"));
-  string dummy = q.parseString();
-  if (q.parseComma(true))       // this means that
-  {                             // used and total result is supported by ME
-    _size = q.parseInt();
-    q.parseComma();
-    _maxSize = q.parseInt();
-  }
-  
-  // get basic phonebook info from ME
-  Parser p(_at->chat("+CPBR=?", "+CPBR:"));
-
-  // get index of actually available entries in the phonebook
-  vector<bool> availablePositions = p.parseIntList();
-  p.parseComma();
-  _maxNumberLength = p.parseInt();
-  p.parseComma();
-  _maxTextLength = p.parseInt();
-  
-  // find out capacity of phonebook in ME
-  // Note: The phonebook in the ME may be sparse, eg. the range of
-  // allowed index numbers may be something like (3-4, 20-100, 120).
-  // The standard allows this, even though it is unlikely to be 
-  // implemented like that by anyone.
-  // In memory we store only phonebook entries that may actually be
-  // used, ie. the phonebook in memory is not sparse.
-  // Each entry has a member _index that corresponds to the index in the ME.
-  if (_maxSize == -1)
-  {
-    _maxSize = 0;
-    for (vector<bool>::iterator i = availablePositions.begin();
-         i != availablePositions.end(); ++i)
-      if (*i) ++_maxSize;
-  }
-
-  // for use with preload below
-  int *meToPhonebookIndexMap =
-    (int*)alloca(sizeof(int) * (availablePositions.size() + 1));
-
-  // initialize phone book entries
-  if (_maxSize == 0)
-    _phonebook = NULL;
-  else
-    _phonebook = new PhonebookEntry[_maxSize];
-  int nextAvailableIndex = 0;
-  int i;
-  for (i = 0; i < _maxSize; i++)
-  {
-    while (! availablePositions[nextAvailableIndex])
-      nextAvailableIndex++;
-    _phonebook[i]._index = nextAvailableIndex;
-    _phonebook[i]._cached = false;
-    _phonebook[i]._myPhonebook = this;
-    meToPhonebookIndexMap[nextAvailableIndex++] = i;
-  }
-
-  // find out first index number of phonebook
-  int firstIndex = -1;
-  for (i = 0; i < _maxSize; i++)
-    if (availablePositions[i])
-    {
-      firstIndex = i;
-      break;
-    }
-
-  // preload phonebook
-  // Note: this contains a workaround for the bug that
-  // some MEs can not return the entire phonebook with one AT command
-  // To detect this condition, _size must be known
-  // also, this code only handles non-sparse phonebooks
-  if (preload && _size != -1 && 
-      (int)availablePositions.size() == _maxSize + firstIndex)
-  {
-    int entriesRead = 0;
-    int startIndex = firstIndex;
-
-    while (entriesRead < _size)
-    {
-      reportProgress(0, _maxSize); // chatv also calls reportProgress()
-      vector<string> responses =
-        _at->chatv("+CPBR=" + intToStr(startIndex) +
-                   "," + intToStr(_maxSize + firstIndex - 1),
-                   "+CPBR:", true);
-
-      // this means that we have read nothing even though not all
-      // entries have been retrieved (entriesRead < _size)
-      // this could be due to a malfunction of the ME...
-      // anyway, missing entries can be read later by readEntry()
-      if (responses.size() == 0)
-      {
-#ifndef NDEBUG
-        if (debugLevel() >= 1)
-          cerr << "*** error when preloading phonebook: "
-            "not all entries returned" << endl;
-#endif
-        break;
-      }
-
-      for (vector<string>::iterator i = responses.begin();
-           i != responses.end(); ++i)
-      {
-        string telephone, text;
-        int meIndex = parsePhonebookEntry(*i, telephone, text);
-        _phonebook[meToPhonebookIndexMap[meIndex]]._cached = true;
-        _phonebook[meToPhonebookIndexMap[meIndex]]._telephone = telephone;
-        _phonebook[meToPhonebookIndexMap[meIndex]]._text = text;
-        assert(_phonebook[meToPhonebookIndexMap[meIndex]]._index == meIndex);
-
-        ++entriesRead;
-        startIndex = meIndex + 1;
-#ifndef NDEBUG
-        if (debugLevel() >= 1)
-          cerr << "*** Preloading PB entry " << meIndex
-               << " number " << telephone 
-               << " text " << text << endl;
-#endif
-      }
-    }
-  }
-}
-
-Phonebook::iterator Phonebook::begin()
-{
-  return &_phonebook[0];
-}
-
-Phonebook::const_iterator Phonebook::begin() const
-{
-  return &_phonebook[0];
-}
-
-Phonebook::iterator Phonebook::end()
-{
-  return &_phonebook[_maxSize];
-}
-
-Phonebook::const_iterator Phonebook::end() const
-{
-  return &_phonebook[_maxSize];
-}
-
-Phonebook::reference Phonebook::operator[](int n)
-{
-  return _phonebook[n];
-}
-
-Phonebook::const_reference Phonebook::operator[](int n) const
-{
-  return _phonebook[n];
-}
-
-Phonebook::reference Phonebook::front()
-{
-  return _phonebook[0];
-}
-
-Phonebook::const_reference Phonebook::front() const
-{
-  return _phonebook[0];
-}
-
-Phonebook::reference Phonebook::back()
-{
-  return _phonebook[_maxSize - 1];
-}
-
-Phonebook::const_reference Phonebook::back() const
-{
-  return _phonebook[_maxSize - 1];
-}
-
-int Phonebook::size() const throw(GsmException)
-{
-  if (_size != -1)
-    return _size;
-  else
-  {
-    int result = 0;
-    for (int i = 0; i < _maxSize; i++)
-      if (! _phonebook[i].empty())
-        result++;
-    Phonebook *thisPhonebook = const_cast<Phonebook*>(this);
-    thisPhonebook->_size = result;
-    return result;
-  }
-}
-
-Phonebook::iterator Phonebook::insert(iterator position,
-                                      const PhonebookEntry& x)
-  throw(GsmException)
-{
-  if (x.useIndex() && x.index() != -1)
-    return insert(x.telephone(), x.text(), x.index());
-  else
-    return insertFirstEmpty(x.telephone(), x.text());
-}
-
-void Phonebook::insert (iterator pos, int n, const PhonebookEntry& x)
-  throw(GsmException)
-{
-  for (int i = 0; i < n; i++)
-    if (x.useIndex() && x.index() != -1)
-      insert(x.telephone(), x.text(), x.index());
-    else
-      insertFirstEmpty(x.telephone(), x.text());
-}
-
-void Phonebook::insert (iterator pos, long n, const PhonebookEntry& x)
-  throw(GsmException)
-{
-  for (long i = 0; i < n; i++)
-    if (x.useIndex() && x.index() != -1)
-      insert(x.telephone(), x.text(), x.index());
-    else
-      insertFirstEmpty(x.telephone(), x.text());
-}
-
-Phonebook::iterator Phonebook::erase(iterator position)
-  throw(GsmException)
-{
-  if (! position->empty())
-  {
-    position->set("", "");
-    adjustSize(-1);
-  }
-  return position + 1;
-}
-
-Phonebook::iterator Phonebook::erase(iterator first, iterator last)
-  throw(GsmException)
-{
-  iterator i;
-  for (i = first; i != last; ++i)
-    erase(i);
-  return i;
-}
-
-void Phonebook::clear() throw(GsmException)
-{
-  for (iterator i = begin(); i != end(); ++i)
-    erase(i);
-}
-
-Phonebook::iterator Phonebook::find(string text) throw(GsmException)
-{
-  int index;
-  string telephone;
-
-  int i;
-  for (i = 0; i < _maxSize; i++)
-    if (_phonebook[i].text() == text)
-      return begin() + i;
-
-  findEntry(text, index, telephone);
-  
-  for (i = 0; i < _maxSize; i++)
-    if (_phonebook[i].index() == index)
-      if (_phonebook[i].cached())
-      {
-        // if entry was already (= cached) and is now different
-        // the SIM card or it's contents were changed
-        if (_phonebook[i]._telephone != telephone ||
-            _phonebook[i]._text != text)
-          throw GsmException(_("SIM card changed while accessing phonebook"),
-                             OtherError);
-      }
-      else
-      {
-        _phonebook[i]._cached = true;
-        _phonebook[i]._telephone = telephone;
-        _phonebook[i]._text = text;
-        return begin() + i;
-      }
-  return end();
-}
-
-Phonebook::~Phonebook()
-{
-  delete []_phonebook;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_phonebook.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_phonebook.h
deleted file mode 100644
index 4999da532e..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_phonebook.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_phonebook.h
-// *
-// * Purpose: Phonebook management functions
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 4.5.1999
-// *************************************************************************
-
-#ifndef GSM_PHONEBOOK_H
-#define GSM_PHONEBOOK_H
-
-#include <gsmlib/gsm_sorted_phonebook_base.h>
-#include <gsmlib/gsm_at.h>
-#include <gsmlib/gsm_util.h>
-#include <string>
-#include <iterator>
-#include <vector>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // forward declarations
-  class Phonebook;
-
-  // a single entry in the phonebook that corresponds to an ME entry
-
-  class PhonebookEntry : public PhonebookEntryBase
-  {
-  private:
-    // this constructor is only used by Phonebook
-    PhonebookEntry() {}
-    bool _cached;               // true, if this entry corresponds to info
-                                // in the ME
-    Phonebook *_myPhonebook;
-
-  public:
-    PhonebookEntry(string telephone, string text) :
-      PhonebookEntryBase(telephone, text),
-      _cached(true), _myPhonebook(NULL) {}
-    PhonebookEntry(const PhonebookEntryBase &e) throw(GsmException);
-
-    // accessor functions, inherited from PhonebookEntryBase
-    // set() does not use the index argument
-    void set(string telephone, string text, int index = -1,
-             bool useIndex = false)
-      throw(GsmException);
-    string text() const throw(GsmException);
-    string telephone() const throw(GsmException);
-
-    // return true if entry is cached (and caching is enabled)
-    bool cached() const;
-
-    PhonebookEntry(const PhonebookEntry &e) throw(GsmException);
-    PhonebookEntry &operator=(const PhonebookEntry &e) throw(GsmException);
-
-    virtual ~PhonebookEntry() {}
-
-    friend class Phonebook;
-  };
-
-  // this class corresponds to a phonebook in the ME
-  // all functions directly update storage in the ME
-  // if the ME is exchanged, the storage may become corrupted because
-  // of internal buffering in the Phonebook class
-
-  class Phonebook : public RefBase, public NoCopy
-  {
-  public:
-    // iterator defs
-    typedef PhonebookEntry *iterator;
-    typedef const PhonebookEntry *const_iterator;
-    typedef PhonebookEntry &reference;
-    typedef const PhonebookEntry &const_reference;
-
-  private:
-    PhonebookEntry *_phonebook; // array of size _maxSize of entries
-    int _maxSize;               // maximum size of pb (-1 == not known yet)
-    int _size;                  // current size of pb (-1 == not known yet)
-    string _phonebookName;      // name of the phonebook, 2-byte like "ME"
-    unsigned int _maxNumberLength; // maximum length of telephone number
-    unsigned int _maxTextLength; // maximum length of descriptive text
-    Ref<GsmAt> _at;             // my GsmAt class
-    vector<int> _positionMap;   // maps in-memory index to ME index
-    MeTa &_myMeTa;              // the MeTa object that created this Phonebook
-    bool _useCache;             // true if entries should be cached
-
-    // helper function, parse phonebook response returned by ME/TA
-    // returns index of entry
-    int parsePhonebookEntry(string response, string &telephone, string &text);
-
-    // internal access functions
-    // read/write/find entry from/to ME
-    void readEntry(int index, string &telephone, string &text)
-      throw(GsmException);
-    void writeEntry(int index, string telephone, string text)
-      throw(GsmException);
-    void findEntry(string text, int &index, string &telephone)
-      throw(GsmException);
-
-    // adjust size only if it was set once
-    void adjustSize(int sizeAdjust)
-      {
-        if (_size != -1) _size += sizeAdjust;
-      }
-
-    // insert into first empty position and return position where inserted
-    iterator insertFirstEmpty(const string telephone, const string text)
-      throw(GsmException);
-
-    // insert into specified index position
-    iterator insert(const string telephone, const string text,
-                    const int index);
-
-    // used my class MeTa
-    // load phonebook name phonebookName, use AT handler at
-    // preload entire phonebook if preload == true
-    Phonebook(string phonebookName, Ref<GsmAt> at,
-              MeTa &myMeTa, bool preload = false) throw(GsmException);
-
-  public:
-    // set cache mode on or off
-    void setCaching(bool useCache) {_useCache = useCache;}
-
-    // return name of this phonebook (2-character string)
-    string name() const {return _phonebookName;}
-
-    // return maximum telephone number length
-    unsigned int getMaxTelephoneLen() const {return _maxNumberLength;}
-
-    // return maximum entry description length
-    unsigned int getMaxTextLen() const { return _maxTextLength;}
-
-    // phonebook traversal commands
-    // these are suitable to use stdc++ lib algorithms and iterators
-    // ME have fixed storage space implemented as memory slots
-    // that may either be empty or used
-    
-    // traversal commands
-    iterator begin();
-    const_iterator begin() const;
-    iterator end();
-    const_iterator end() const;
-    reference front();
-    const_reference front() const;
-    reference back();
-    const_reference back() const;
-    reference operator[](int n);
-    const_reference operator[](int n) const;
-
-    // the size macros return the number of used entries
-    int size() const throw(GsmException);
-    int max_size() const {return _maxSize;}
-    int capacity() const {return _maxSize;}
-    bool empty() const throw(GsmException) {return size() == 0;}
-
-    // insert iterators insert into the first empty cell regardless of position
-    // - existing iterators are not invalidated after an insert operation
-    // - return position where it was actually inserted (may be != position)
-    // - insert only writes to available positions
-    // - throw an exception if size() == max_size() (ie. not empty slots)
-    iterator insert(iterator position, const PhonebookEntry& x)
-      throw(GsmException);
-
-    // insert n times, same procedure as above
-    void insert(iterator pos, int n, const PhonebookEntry& x)
-      throw(GsmException);
-    void insert(iterator pos, long n, const PhonebookEntry& x)
-      throw(GsmException);
-
-    // erase operators set used slots to "empty"
-    iterator erase(iterator position) throw(GsmException);
-    iterator erase(iterator first, iterator last) throw(GsmException);
-    void clear() throw(GsmException);
-
-    // finds an entry given the text
-    iterator find(string text) throw(GsmException);
-    
-    // destructor
-    virtual ~Phonebook();
-
-    friend class PhonebookEntry;
-    friend class MeTa;
-  };
-
-  // useful phonebook types
-  typedef Ref<Phonebook> PhonebookRef;
-  typedef vector<PhonebookRef> PhonebookVector;
-};
-
-#endif // GSM_PHONEBOOK_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_port.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_port.h
deleted file mode 100644
index 83c4edf60e..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_port.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_port.h
-// *
-// * Purpose: Abstract port definition
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 3.5.1999
-// *************************************************************************
-
-#ifndef GSM_PORT_H
-#define GSM_PORT_H
-
-#include <gsmlib/gsm_error.h>
-#include <gsmlib/gsm_util.h>
-#include <string>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // TA defaults
-  const int TIMEOUT_SECS = 60;
-  const char DEFAULT_INIT_STRING[] = "E0";
-  const int DEFAULT_BAUD_RATE = 38400;
-
-  class Port : public RefBase
-  {
-  public:
-    // read line from port(including eol characters)
-    virtual string getLine() throw(GsmException) =0;
-    
-    // write line to port
-    virtual void putLine(string line,
-                         bool carriageReturn = true) throw(GsmException) =0;
-
-    // wait for new data to become available, return after timeout
-    // if timeout == 0, wait forever
-    // return true if data available
-    virtual bool wait(GsmTime timeout) throw(GsmException) =0;
-
-    // put back one byte that can be read by a subsequent call to readByte()
-    virtual void putBack(unsigned char c) =0;
-
-    // read a single byte, return -1 if error or file closed
-    virtual int readByte() throw(GsmException) =0;
-
-    // set timeout for the readByte(), getLine(), and putLine() functions
-    // (globally for ALL ports)
-    virtual void setTimeOut(unsigned int timeout) =0;
-
-    virtual ~Port() {}
-  };
-};
-
-#endif // GSM_PORT_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms.cc
deleted file mode 100644
index e150423add..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms.cc
+++ /dev/null
@@ -1,863 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sms.cc
-// *
-// * Purpose: SMS functions
-// *          (ETSI GSM 07.05)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 16.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_sysdep.h>
-#include <gsmlib/gsm_sms.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_parser.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <strstream>
-#include <string>
-
-using namespace std;
-using namespace gsmlib;
-
-// local constants
-
-static const string dashes =
-"---------------------------------------------------------------------------";
-
-// SMSMessage members
-
-Ref<SMSMessage> SMSMessage::decode(string pdu,
-                                   bool SCtoMEdirection,
-                                   GsmAt *at) throw(GsmException)
-{
-  Ref<SMSMessage> result;
-  SMSDecoder d(pdu);
-  d.getAddress(true);
-  MessageType messageTypeIndicator = (MessageType)d.get2Bits(); // bits 0..1
-  if (SCtoMEdirection)
-    // TPDUs from SC to ME
-    switch (messageTypeIndicator)
-    {
-    case SMS_DELIVER:
-      result = new SMSDeliverMessage(pdu);
-      break;
-
-    case SMS_STATUS_REPORT:
-      result = new SMSStatusReportMessage(pdu);
-      break;
-
-    case SMS_SUBMIT_REPORT:
-      // observed with Motorola Timeport 260, the SCtoMEdirection can
-      // be wrong in this case
-      if (at != NULL && at->getMeTa().getCapabilities()._wrongSMSStatusCode)
-        result = new SMSSubmitMessage(pdu);
-      else
-        result = new SMSSubmitReportMessage(pdu);
-      break;
-
-    default:
-      throw GsmException(_("unhandled SMS TPDU type"), OtherError);
-    }
-  else
-    // TPDUs from ME to SC
-    switch (messageTypeIndicator)
-    {
-    case SMS_SUBMIT:
-      result = new SMSSubmitMessage(pdu);
-      break;
-
-    case SMS_DELIVER_REPORT:
-      result = new SMSDeliverReportMessage(pdu);
-      break;
-
-    case SMS_COMMAND:
-      result = new SMSCommandMessage(pdu);
-      break;
-
-    default:
-      throw GsmException(_("unhandled SMS TPDU type"), OtherError);
-    }
-  result->_at = at;
-  return result;
-}
-
-Ref<SMSMessage> SMSMessage::decode(istream& s) throw(gsmlib::GsmException)
-{
-  string pdu;
-  unsigned char ScToMe; 
-	
-  s >> ScToMe;
-  s >> pdu;
-
-  return decode(pdu,ScToMe=='S');
-}
-
-unsigned char SMSMessage::send(Ref<SMSMessage> &ackPdu)
-  throw(GsmException)
-{
-  if (_messageTypeIndicator != SMS_SUBMIT &&
-      _messageTypeIndicator != SMS_COMMAND)
-    throw GsmException(_("can only send SMS-SUBMIT and SMS-COMMAND TPDUs"),
-                       ParameterError);
-
-  if (_at.isnull())
-    throw GsmException(_("no device given for sending SMS"), ParameterError);
-
-  string pdu = encode();
-  Parser p(_at->sendPdu("+CMGS=" +
-                        intToStr(pdu.length() / 2 - getSCAddressLen()),
-                        "+CMGS:", pdu));
-  unsigned char messageReference = p.parseInt();
-
-  if (p.parseComma(true))
-  {
-    string pdu = p.parseEol();
-
-    // add missing service centre address if required by ME
-    if (! _at->getMeTa().getCapabilities()._hasSMSSCAprefix)
-      pdu = "00" + pdu;
-
-    ackPdu = SMSMessage::decode(pdu);
-  }
-  else
-    ackPdu = SMSMessageRef();
-
-  return messageReference;
-}
-
-unsigned char SMSMessage::send() throw(GsmException)
-{
-  SMSMessageRef mref;
-  return send(mref);
-}
-
-unsigned int SMSMessage::getSCAddressLen()
-{
-  SMSEncoder e;
-  e.setAddress(_serviceCentreAddress, true);
-  return e.getLength();
-}
-
-unsigned char SMSMessage::userDataLength() const
-{
-  unsigned int udhl = _userDataHeader.length();
-  if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-    return _userData.length() + (udhl ? ((1 + udhl) * 8 + 6) / 7 : 0);
-  else
-    return _userData.length() + (udhl ? (1 + udhl) : 0);
-}
-
-ostream& SMSMessage::operator<<(ostream& s)
-{
-  unsigned char ScToMe;
-	
-  if (dynamic_cast<SMSDeliverMessage*>(this) || 
-      dynamic_cast<SMSStatusReportMessage*>(this) || 
-      dynamic_cast<SMSSubmitReportMessage*>(this))
-  {
-    ScToMe = 'S';
-  }
-  else if (dynamic_cast<SMSSubmitMessage*>(this) || 
-           dynamic_cast<SMSCommandMessage*>(this) || 
-           dynamic_cast<SMSDeliverReportMessage*>(this))
-  {
-    ScToMe = 'M';
-  }
-  else
-  {
-    throw GsmException(_("unhandled SMS TPDU type"), OtherError);
-  }
-
-  s << ScToMe;
-  return s << encode();
-}
-
-// SMSMessage::SMSMessage(SMSMessage &m)
-// {
-//   _at = m._at;
-  
-// }
-
-// SMSMessage &SMSMessage::operator=(SMSMessage &m)
-// {
-// }
-
-SMSMessage::~SMSMessage() {}
-
-// SMSDeliverMessage members
-
-void SMSDeliverMessage::init()
-{
-  _messageTypeIndicator = SMS_DELIVER;
-  _moreMessagesToSend = false;
-  _replyPath = false;
-  _statusReportIndication = false;
-  _protocolIdentifier = 0;
-}
-
-SMSDeliverMessage::SMSDeliverMessage()
-{
-  init();
-}
-
-SMSDeliverMessage::SMSDeliverMessage(string pdu) throw(GsmException)
-{
-  SMSDecoder d(pdu);
-  _serviceCentreAddress = d.getAddress(true);
-  _messageTypeIndicator = (MessageType)d.get2Bits(); // bits 0..1
-  assert(_messageTypeIndicator == SMS_DELIVER);
-  _moreMessagesToSend = d.getBit(); // bit 2
-  d.getBit();                   // bit 3
-  d.getBit();                   // bit 4
-  _statusReportIndication = d.getBit(); // bit 5
-  bool userDataHeaderIndicator = d.getBit(); // bit 6
-  _replyPath = d.getBit();      // bit 7
-  _originatingAddress = d.getAddress();
-  _protocolIdentifier = d.getOctet();
-  _dataCodingScheme = d.getOctet();
-  _serviceCentreTimestamp = d.getTimestamp();
-  unsigned char userDataLength = d.getOctet();
-  d.markSeptet();
-
-  if (userDataHeaderIndicator)
-  {
-    _userDataHeader.decode(d);
-    if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-      userDataLength -= ((_userDataHeader.length() + 1) * 8 + 6) / 7;
-    else
-      userDataLength -= ((string)_userDataHeader).length() + 1;
-  }
-  else
-    _userDataHeader = UserDataHeader();
-
-  if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-  {                             // userDataLength is length in septets
-    _userData = d.getString(userDataLength);
-    _userData = gsmToLatin1(_userData);
-  }
-  else
-  {                             // userDataLength is length in octets
-    unsigned char *s = 
-      (unsigned char*)alloca(sizeof(unsigned char) * userDataLength);
-    d.getOctets(s, userDataLength);
-    _userData.assign((char*)s, (unsigned int)userDataLength);
-  }
-}
-
-string SMSDeliverMessage::encode()
-{
-  SMSEncoder e;
-  e.setAddress(_serviceCentreAddress, true);
-  e.set2Bits(_messageTypeIndicator); // bits 0..1
-  e.setBit(_moreMessagesToSend); // bit 2
-  e.setBit();                   // bit 3
-  e.setBit();                   // bit 4
-  e.setBit(_statusReportIndication); // bit 5
-  e.setBit(_userDataHeader.length() != 0); // bit 6
-  e.setBit(_replyPath);         // bit 7
-  e.setAddress(_originatingAddress);
-  e.setOctet(_protocolIdentifier);
-  e.setOctet(_dataCodingScheme);
-  e.setTimestamp(_serviceCentreTimestamp);
-  e.setOctet(userDataLength());
-  e.markSeptet();
-  if (_userDataHeader.length()) _userDataHeader.encode(e);
-  if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-    e.setString(latin1ToGsm(_userData));
-  else
-    e.setOctets((unsigned char*)_userData.data(), _userData.length());
-  return e.getHexString();
-}
-
-string SMSDeliverMessage::toString() const
-{
-  ostrstream os;
-  os << dashes << endl
-     << _("Message type: SMS-DELIVER") << endl
-     << _("SC address: '") << _serviceCentreAddress._number << "'" << endl
-     << _("More messages to send: ") << _moreMessagesToSend << endl
-     << _("Reply path: ") << _replyPath << endl
-     << _("User data header indicator: ")
-     << (_userDataHeader.length()!=0) << endl
-     << _("Status report indication: ") << _statusReportIndication << endl
-     << _("Originating address: '") << _originatingAddress._number 
-     << "'" << endl
-     << _("Protocol identifier: 0x") << hex
-     << (unsigned int)_protocolIdentifier << dec << endl
-     << _("Data coding scheme: ") << _dataCodingScheme.toString() << endl
-     << _("SC timestamp: ") << _serviceCentreTimestamp.toString() << endl
-     << _("User data length: ") << (int)userDataLength() << endl
-     << _("User data header: 0x")
-     << bufToHex((unsigned char*)
-                 ((string)_userDataHeader).data(),
-                 ((string)_userDataHeader).length())
-     << endl
-     << _("User data: '") << _userData << "'" << endl
-     << dashes << endl << endl
-     << ends;
-  char *ss = os.str();
-  string result(ss);
-  delete[] ss;
-  return result;
-}
-
-Address SMSDeliverMessage::address() const
-{
-  return _originatingAddress;
-}
-
-Ref<SMSMessage> SMSDeliverMessage::clone()
-{
-  Ref<SMSMessage> result = new SMSDeliverMessage(*this);
-  return result;
-}
-
-// SMSSubmitMessage members
-
-void SMSSubmitMessage::init()
-{
-  // set everything to sensible default values
-  _messageTypeIndicator = SMS_SUBMIT;
-  _validityPeriodFormat = TimePeriod::Relative; 
-  _validityPeriod._format = TimePeriod::Relative;
-  _validityPeriod._relativeTime = 168; // 2 days
-  _statusReportRequest = false;
-  _replyPath = false;
-  _rejectDuplicates = true;
-  _messageReference = 0;
-  _protocolIdentifier = 0;
-}
-
-SMSSubmitMessage::SMSSubmitMessage()
-{
-  init();
-}
-
-SMSSubmitMessage::SMSSubmitMessage(string pdu) throw(GsmException)
-{ 
-  SMSDecoder d(pdu);
-  _serviceCentreAddress = d.getAddress(true);
-  _messageTypeIndicator = (MessageType)d.get2Bits(); // bits 0..1
-  assert(_messageTypeIndicator == SMS_SUBMIT);
-  _rejectDuplicates = d.getBit(); // bit 2
-  _validityPeriodFormat = (TimePeriod::Format)d.get2Bits(); // bits 3..4
-  _statusReportRequest = d.getBit(); // bit 5
-  bool userDataHeaderIndicator = d.getBit(); // bit 6
-  _replyPath = d.getBit();      // bit 7
-  _messageReference = d.getOctet();
-  _destinationAddress = d.getAddress();
-  _protocolIdentifier = d.getOctet();
-  _dataCodingScheme = d.getOctet();
-  if (_validityPeriodFormat != TimePeriod::NotPresent)
-    _validityPeriod = d.getTimePeriod(_validityPeriodFormat);
-  unsigned char userDataLength = d.getOctet();
-  d.markSeptet();
-
-  if (userDataHeaderIndicator)
-  {
-    _userDataHeader.decode(d);
-    if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-      userDataLength -= ((_userDataHeader.length() + 1) * 8 + 6) / 7;
-    else
-      userDataLength -= ((string)_userDataHeader).length() + 1;
-  }
-  else
-    _userDataHeader = UserDataHeader();
-
-  if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-  {                             // userDataLength is length in septets
-    _userData = d.getString(userDataLength);
-    _userData = gsmToLatin1(_userData);
-  }
-  else
-  {                             // _userDataLength is length in octets
-    unsigned char *s =
-      (unsigned char*)alloca(sizeof(unsigned char) * userDataLength);
-    d.getOctets(s, userDataLength);
-    _userData.assign((char*)s, userDataLength);
-  }
-}
-
-SMSSubmitMessage::SMSSubmitMessage(string text, string number)
-{
-  init();
-  _destinationAddress = Address(number);
-  _userData = text;
-}
-
-string SMSSubmitMessage::encode()
-{
-  SMSEncoder e;
-  e.setAddress(_serviceCentreAddress, true);
-  e.set2Bits(_messageTypeIndicator); // bits 0..1
-  e.setBit(_rejectDuplicates); // bit 2
-  e.set2Bits(_validityPeriodFormat); // bits 3..4
-  e.setBit(_statusReportRequest); // bit 5
-  bool userDataHeaderIndicator = _userDataHeader.length() != 0;
-  e.setBit(userDataHeaderIndicator); // bit 6
-  e.setBit(_replyPath);       // bit 7
-  e.setOctet(_messageReference);
-  e.setAddress(_destinationAddress);
-  e.setOctet(_protocolIdentifier);
-  e.setOctet(_dataCodingScheme);
-  e.setTimePeriod(_validityPeriod);
-  e.setOctet(userDataLength());
-  e.markSeptet();
-  if (userDataHeaderIndicator) _userDataHeader.encode(e);
-  if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-    e.setString(latin1ToGsm(_userData));
-  else
-    e.setOctets((unsigned char*)_userData.data(), _userData.length());
-  return e.getHexString();
-}
-
-string SMSSubmitMessage::toString() const
-{
-  ostrstream os;
-  os << dashes << endl
-     << _("Message type: SMS-SUBMIT") << endl
-     << _("SC address: '") << _serviceCentreAddress._number << "'" << endl
-     << _("Reject duplicates: ") << _rejectDuplicates << endl
-     << _("Validity period format: ");
-  switch (_validityPeriodFormat)
-  {
-  case TimePeriod::NotPresent:
-    os << _("not present");
-    break;
-  case TimePeriod::Relative:
-    os << _("relative");
-    break;
-  case TimePeriod::Absolute:
-    os << _("absolute");
-    break;
-  default:
-    os << _("unknown");
-    break;
-  }
-  os << endl
-     << _("Reply path: ") << _replyPath << endl
-     << _("User data header indicator: ")
-     << (_userDataHeader.length()!=0) << endl
-     << _("Status report request: ") << _statusReportRequest << endl
-     << _("Message reference: ") << (unsigned int)_messageReference << endl
-     << _("Destination address: '") << _destinationAddress._number 
-     << "'" << endl
-     << _("Protocol identifier: 0x") << hex 
-     << (unsigned int)_protocolIdentifier << dec << endl
-     << _("Data coding scheme: ") << _dataCodingScheme.toString() << endl
-     << _("Validity period: ") << _validityPeriod.toString() << endl
-     << _("User data length: ") << (int)userDataLength() << endl
-     << _("User data header: 0x") << bufToHex((unsigned char*)
-                                              ((string)_userDataHeader).data(),
-                                              _userDataHeader.length())
-     << endl
-     << _("User data: '") << _userData << "'" << endl
-     << dashes << endl << endl
-     << ends;
-  char *ss = os.str();
-  string result(ss);
-  delete[] ss;
-  return result; 
-}
-
-Address SMSSubmitMessage::address() const
-{
-  return _destinationAddress;
-}
-
-Ref<SMSMessage> SMSSubmitMessage::clone()
-{
-  Ref<SMSMessage> result = new SMSSubmitMessage(*this);
-  return result;
-}
-
-// SMSStatusReportMessage members
-
-void SMSStatusReportMessage::init()
-{
-  _messageTypeIndicator = SMS_STATUS_REPORT;
-  _moreMessagesToSend = false;
-  _statusReportQualifier = false;
-  _messageReference = 0;
-  _status = SMS_STATUS_RECEIVED;
-}
-
-SMSStatusReportMessage::SMSStatusReportMessage(string pdu) throw(GsmException)
-{
-  SMSDecoder d(pdu);
-  _serviceCentreAddress = d.getAddress(true);
-  _messageTypeIndicator = (MessageType)d.get2Bits(); // bits 0..1
-  assert(_messageTypeIndicator == SMS_STATUS_REPORT);
-  _moreMessagesToSend = d.getBit(); // bit 2
-  d.getBit();                   // bit 3
-  d.getBit();                   // bit 4
-  _statusReportQualifier = d.getBit(); // bit 5
-  _messageReference = d.getOctet();
-  _recipientAddress = d.getAddress();
-  _serviceCentreTimestamp = d.getTimestamp();
-  _dischargeTime = d.getTimestamp();
-  _status = d.getOctet();
-}
-
-string SMSStatusReportMessage::encode()
-{
-  SMSEncoder e;
-  e.setAddress(_serviceCentreAddress, true);
-  e.set2Bits(_messageTypeIndicator); // bits 0..1
-  e.setBit(_moreMessagesToSend); // bit 2
-  e.setBit();                   // bit 3
-  e.setBit();                   // bit 4
-  e.setBit(_statusReportQualifier); // bit 5
-  e.setOctet(_messageReference);
-  e.setAddress(_recipientAddress);
-  e.setTimestamp(_serviceCentreTimestamp);
-  e.setTimestamp(_dischargeTime);
-  e.setOctet(_status);
-  return e.getHexString();
-}
-
-string SMSStatusReportMessage::toString() const
-{
-  ostrstream os;
-  os << dashes << endl
-     << _("Message type: SMS-STATUS-REPORT") << endl
-     << _("SC address: '") << _serviceCentreAddress._number << "'" << endl
-     << _("More messages to send: ") << _moreMessagesToSend << endl
-     << _("Status report qualifier: ") << _statusReportQualifier << endl
-     << _("Message reference: ") << (unsigned int)_messageReference << endl
-     << _("Recipient address: '") << _recipientAddress._number << "'" << endl
-     << _("SC timestamp: ") << _serviceCentreTimestamp.toString() << endl
-     << _("Discharge time: ") << _dischargeTime.toString() << endl
-     << _("Status: 0x") << hex << (unsigned int)_status << dec
-     << " '" << getSMSStatusString(_status) << "'" << endl
-     << dashes << endl << endl
-     << ends;
-  char *ss = os.str();
-  string result(ss);
-  delete[] ss;
-  return result; 
-}
-
-Address SMSStatusReportMessage::address() const
-{
-  return _recipientAddress;
-}
-
-Ref<SMSMessage> SMSStatusReportMessage::clone()
-{
-  Ref<SMSMessage> result = new SMSStatusReportMessage(*this);
-  return result;
-}
-
-// SMSCommandMessage members
-
-void SMSCommandMessage::init()
-{
-  _messageTypeIndicator = SMS_COMMAND;
-  _messageReference = 0;
-  _statusReportRequest = true;
-  _protocolIdentifier = 0;
-  _commandType = EnquireSM;
-  _messageNumber = 0;
-  _commandDataLength = 0; 
-}
-
-SMSCommandMessage::SMSCommandMessage(string pdu) throw(GsmException)
-{
-  SMSDecoder d(pdu);
-  _serviceCentreAddress = d.getAddress(true);
-  _messageTypeIndicator = (MessageType)d.get2Bits(); // bits 0..1
-  assert(_messageTypeIndicator == SMS_COMMAND);
-  d.getBit();                   // bit 2
-  d.getBit();                   // bit 3
-  d.getBit();                   // bit 4
-  _statusReportRequest = d.getBit(); // bit 5
-  _messageReference = d.getOctet();
-  _protocolIdentifier = d.getOctet();
-  _commandType = d.getOctet();
-  _messageNumber = d.getOctet();
-  _destinationAddress = d.getAddress();
-  _commandDataLength = d.getOctet();
-  unsigned char *s = 
-      (unsigned char*)alloca(sizeof(unsigned char) * _commandDataLength);
-  d.getOctets(s, _commandDataLength);
-}
-
-string SMSCommandMessage::encode()
-{
-  SMSEncoder e;
-  e.setAddress(_serviceCentreAddress, true);
-  e.set2Bits(_messageTypeIndicator); // bits 0..1
-  e.setBit();                   // bit 2
-  e.setBit();                   // bit 3
-  e.setBit();                   // bit 4
-  e.setBit(_statusReportRequest); // bit 5
-  e.setOctet(_messageReference);
-  e.setOctet(_protocolIdentifier);
-  e.setOctet(_commandType);
-  e.setOctet(_messageNumber);
-  e.setAddress(_destinationAddress);
-  e.setOctet(_commandData.length());
-  e.setOctets((const unsigned char*)_commandData.data(),
-              (short unsigned int)_commandData.length());
-  return e.getHexString();
-}
-
-string SMSCommandMessage::toString() const
-{
-  ostrstream os;
-  os << dashes << endl
-     << _("Message type: SMS-COMMAND") << endl
-     << _("SC address: '") << _serviceCentreAddress._number << "'" << endl
-     << _("Message reference: ") << (unsigned int)_messageReference << endl
-     << _("Status report request: ") << _statusReportRequest << endl
-     << _("Protocol identifier: 0x") << hex 
-     << (unsigned int)_protocolIdentifier << dec << endl
-     << _("Command type: 0x") << hex << (unsigned int)_commandType
-     << dec << endl
-     << _("Message number: ") << (unsigned int)_messageNumber << endl
-     << _("Destination address: '") << _destinationAddress._number 
-     << "'" << endl
-     << _("Command data length: ") << (unsigned int)_commandDataLength << endl
-     << _("Command data: '") << _commandData << "'" << endl
-     << dashes << endl << endl
-     << ends;
-  char *ss = os.str();
-  string result(ss);
-  delete[] ss;
-  return result; 
-}
-
-Address SMSCommandMessage::address() const
-{
-  return _destinationAddress;
-}
-
-Ref<SMSMessage> SMSCommandMessage::clone()
-{
-  Ref<SMSMessage> result = new SMSCommandMessage(*this);
-  return result;
-}
-
-// SMSDeliverReportMessage members
-
-void SMSDeliverReportMessage::init()
-{
-  _messageTypeIndicator = SMS_DELIVER_REPORT;
-  _protocolIdentifierPresent = false;
-  _dataCodingSchemePresent = false;
-  _userDataLengthPresent = false;
-}
-
-SMSDeliverReportMessage::SMSDeliverReportMessage(string pdu)
-  throw(GsmException)
-{
-  SMSDecoder d(pdu);
-  _serviceCentreAddress = d.getAddress(true);
-  _messageTypeIndicator = (MessageType)d.get2Bits(); // bits 0..1
-  assert(_messageTypeIndicator == SMS_DELIVER_REPORT);
-  d.alignOctet();               // skip to parameter indicator
-  _protocolIdentifierPresent = d.getBit(); // bit 0
-  _dataCodingSchemePresent = d.getBit(); // bit 1
-  _userDataLengthPresent = d.getBit(); // bit 2
-  if (_protocolIdentifierPresent)
-    _protocolIdentifier = d.getOctet();
-  if (_dataCodingSchemePresent)
-    _dataCodingScheme = d.getOctet();
-  if (_userDataLengthPresent)
-  {
-    unsigned char userDataLength = d.getOctet();
-    d.markSeptet();
-    if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-    {
-      _userData = d.getString(userDataLength);
-      _userData = gsmToLatin1(_userData);
-    }
-    else
-    {                           // userDataLength is length in octets
-      unsigned char *s =
-        (unsigned char*)alloca(sizeof(unsigned char) * userDataLength);
-      d.getOctets(s, userDataLength);
-      _userData.assign((char*)s, userDataLength);
-    }
-  }
-}
-
-string SMSDeliverReportMessage::encode()
-{
-  SMSEncoder e;
-  e.setAddress(_serviceCentreAddress, true);
-  e.set2Bits(_messageTypeIndicator); // bits 0..1
-  e.alignOctet();               // skip to parameter indicator
-  e.setBit(_protocolIdentifierPresent); // bit 0
-  e.setBit(_dataCodingSchemePresent); // bit 1
-  e.setBit(_userDataLengthPresent); // bit 2
-  if (_protocolIdentifierPresent)
-    e.setOctet(_protocolIdentifier);
-  if (_dataCodingSchemePresent)
-    e.setOctet(_dataCodingScheme);
-  if (_userDataLengthPresent)
-  {
-    unsigned char userDataLength = _userData.length();
-    e.setOctet(userDataLength);
-    if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-      e.setString(latin1ToGsm(_userData));
-    else
-      e.setOctets((unsigned char*)_userData.data(), userDataLength);
-  }
-  return e.getHexString();
-}
-
-string SMSDeliverReportMessage::toString() const
-{
-  ostrstream os;
-  os << dashes << endl
-     << _("Message type: SMS-DELIVER-REPORT") << endl
-     << _("SC address: '") << _serviceCentreAddress._number << "'" << endl
-     << _("Protocol identifier present: ") << _protocolIdentifierPresent
-     << endl
-     << _("Data coding scheme present: ") << _dataCodingSchemePresent << endl
-     << _("User data length present: ") << _userDataLengthPresent << endl;
-  if (_protocolIdentifierPresent)
-    os << _("Protocol identifier: 0x") << hex
-       << (unsigned int)_protocolIdentifier
-       << dec << endl;
-  if (_dataCodingSchemePresent)
-    os << _("Data coding scheme: ") << _dataCodingScheme.toString() << endl;
-  if (_userDataLengthPresent)
-    os << _("User data length: ") << (int)userDataLength() << endl
-       << _("User data: '") << _userData << "'" << endl;
-  os << dashes << endl << endl
-     << ends;
-  char *ss = os.str();
-  string result(ss);
-  delete[] ss;
-  return result; 
-}
-
-Address SMSDeliverReportMessage::address() const
-{
-  assert(0);                    // not address, should not be in SMS store
-  return Address();
-}
-
-Ref<SMSMessage> SMSDeliverReportMessage::clone()
-{
-  Ref<SMSMessage> result = new SMSDeliverReportMessage(*this);
-  return result;
-}
-
-// SMSSubmitReportMessage members
-
-void SMSSubmitReportMessage::init()
-{
-  _messageTypeIndicator = SMS_SUBMIT_REPORT;
-  _protocolIdentifierPresent = false;
-  _dataCodingSchemePresent = false;
-  _userDataLengthPresent = false;
-}
-
-SMSSubmitReportMessage::SMSSubmitReportMessage(string pdu) throw(GsmException)
-{
-  SMSDecoder d(pdu);
-  _serviceCentreAddress = d.getAddress(true);
-  _messageTypeIndicator = (MessageType)d.get2Bits(); // bits 0..1
-  assert(_messageTypeIndicator == SMS_SUBMIT_REPORT);
-  _serviceCentreTimestamp = d.getTimestamp();
-  _protocolIdentifierPresent = d.getBit(); // bit 0
-  _dataCodingSchemePresent = d.getBit(); // bit 1
-  _userDataLengthPresent = d.getBit(); // bit 2
-  if (_protocolIdentifierPresent)
-    _protocolIdentifier = d.getOctet();
-  if (_dataCodingSchemePresent)
-    _dataCodingScheme = d.getOctet();
-  if (_userDataLengthPresent)
-  {
-    unsigned char userDataLength = d.getOctet();
-    d.markSeptet();
-    if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-    {
-      _userData = d.getString(userDataLength);
-      _userData = gsmToLatin1(_userData);
-    }
-    else
-    {                           // _userDataLength is length in octets
-      unsigned char *s =
-        (unsigned char*)alloca(sizeof(unsigned char) * userDataLength);
-      d.getOctets(s, userDataLength);
-      _userData.assign((char*)s, userDataLength);
-    }
-  }
-}
-
-string SMSSubmitReportMessage::encode()
-{
-  SMSEncoder e;
-  e.setAddress(_serviceCentreAddress, true);
-  e.set2Bits(_messageTypeIndicator); // bits 0..1
-  e.setTimestamp(_serviceCentreTimestamp);
-  e.setBit(_protocolIdentifierPresent); // bit 0
-  e.setBit(_dataCodingSchemePresent); // bit 1
-  e.setBit(_userDataLengthPresent); // bit 2
-  if (_protocolIdentifierPresent)
-    e.setOctet(_protocolIdentifier);
-  if (_dataCodingSchemePresent)
-    e.setOctet(_dataCodingScheme);
-  if (_userDataLengthPresent)
-  {
-    e.setOctet(userDataLength());
-    if (_dataCodingScheme.getAlphabet() == DCS_DEFAULT_ALPHABET)
-      e.setString(latin1ToGsm(_userData));
-    else
-      e.setOctets((unsigned char*)_userData.data(), _userData.length());
-  }
-  return e.getHexString();
-}
-
-string SMSSubmitReportMessage::toString() const
-{
-  ostrstream os;
-  os << dashes << endl
-     << _("Message type: SMS-SUBMIT-REPORT") << endl
-     << _("SC address: '") << _serviceCentreAddress._number << "'" << endl
-     << _("SC timestamp: ") << _serviceCentreTimestamp.toString() << endl
-     << _("Protocol identifier present: ") << _protocolIdentifierPresent
-     << endl
-     << _("Data coding scheme present: ") << _dataCodingSchemePresent << endl
-     << _("User data length present: ") << _userDataLengthPresent << endl;
-  if (_protocolIdentifierPresent)
-    os << _("Protocol identifier: 0x") << hex
-       << (unsigned int)_protocolIdentifier
-       << dec << endl;
-  if (_dataCodingSchemePresent)
-    os << _("Data coding scheme: ") << _dataCodingScheme.toString() << endl;
-  if (_userDataLengthPresent)
-    os << _("User data length: ") << (int)userDataLength() << endl
-       << _("User data: '") << _userData << "'" << endl;
-  os << dashes << endl << endl
-     << ends;
-  char *ss = os.str();
-  string result(ss);
-  delete[] ss;
-  return result; 
-}
-
-Address SMSSubmitReportMessage::address() const
-{
-  assert(0);                    // not address, should not be in SMS store
-  return Address();
-}
-
-Ref<SMSMessage> SMSSubmitReportMessage::clone()
-{
-  Ref<SMSMessage> result = new SMSSubmitReportMessage(*this);
-  return result;
-}
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms.h
deleted file mode 100644
index bd871391bb..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms.h
+++ /dev/null
@@ -1,480 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sms.h
-// *
-// * Purpose: SMS functions
-// *          (ETSI GSM 07.05)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 16.5.1999
-// *************************************************************************
-
-#ifndef GSM_SMS_H
-#define GSM_SMS_H
-
-#include <gsmlib/gsm_sms_codec.h>
-#include <gsmlib/gsm_error.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_at.h>
-#include <string>
-#include <vector>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // forward declarations
-  class SMSStore;
-  class SMSMessage;
-
-  // this class represents a single SMS message
-  class SMSMessage : public RefBase
-  {
-  private:
-    Ref<GsmAt> _at;             // connection to the device
-
-  public:
-    // possible values for message type indicator
-    enum MessageType {SMS_DELIVER = 0, SMS_DELIVER_REPORT = 0,
-                      SMS_STATUS_REPORT = 2, SMS_COMMAND = 2,
-                      SMS_SUBMIT = 1, SMS_SUBMIT_REPORT = 1};
-
-  protected:
-    // fields of the different TPDUs
-    // all PDUs
-    string _userData;
-    UserDataHeader _userDataHeader;
-    Address _serviceCentreAddress;
-    MessageType _messageTypeIndicator;// 2 bits
-    DataCodingScheme _dataCodingScheme;
-
-  public:
-    // decode hexadecimal pdu string
-    // return SMSMessage of the appropriate type
-    // differentiate between SMS transfer directions SC to ME, ME to SC
-    // also give GsmAt object for send()
-    static Ref<SMSMessage> decode(string pdu,
-                                  bool SCtoMEdirection = true,
-                                  GsmAt *at = NULL)
-      throw(GsmException);
-
-    static Ref<SMSMessage> decode(istream& s) throw(GsmException);
-
-    // encode pdu, return hexadecimal pdu string
-    virtual string encode() = 0;
-
-    // send this PDU
-    // returns message reference and ACK-PDU (if requested)
-    // only applicate to SMS-SUBMIT and SMS-COMMAND
-    unsigned char send(Ref<SMSMessage> &ackPdu) throw(GsmException);
-    
-    // same as above, but ACK-PDU is discarded
-    unsigned char send() throw(GsmException);
-
-    // create textual representation of SMS
-    virtual string toString() const = 0;
-
-    // return deep copy of this message
-    virtual Ref<SMSMessage> clone() = 0;
-
-    // return length of SC address when encoded
-    unsigned int getSCAddressLen();
-
-    // accessor functions
-    MessageType messageType() const {return _messageTypeIndicator;}
-    Address serviceCentreAddress() const {return _serviceCentreAddress;}
-
-    // provided for sorting messages by timestamp
-    virtual Timestamp serviceCentreTimestamp() const {return Timestamp();}
-    
-    // return recipient, destination etc. address (for sorting by address)
-    virtual Address address() const = 0;
-
-    virtual void setUserData(string x) {_userData = x;}
-    virtual string userData() const {return _userData;}
-    
-    // return the size of user data (including user data header)
-    unsigned char userDataLength() const;
-
-    // accessor functions
-    virtual void setUserDataHeader(UserDataHeader x) {_userDataHeader = x;}
-    virtual UserDataHeader userDataHeader() const {return _userDataHeader;}
-    
-    virtual DataCodingScheme dataCodingScheme() const
-      {return _dataCodingScheme;}
-    virtual void setDataCodingScheme(DataCodingScheme x)
-      {_dataCodingScheme = x;}
-
-    void setServiceCentreAddress(Address &x) {_serviceCentreAddress = x;}
-    void setAt(Ref<GsmAt> at) {_at = at;}
-
-    virtual ~SMSMessage();
-
-    // print ASCII hex representation of message
-    ostream& operator<<(ostream& s);
-
-    // copy constructor and assignment
-//     SMSMessage(SMSMessage &m);
-//     SMSMessage &operator=(SMSMessage &m);
-
-    friend class SMSStore;
-  };
-
-  // SMS-DELIVER TPDU
-  class SMSDeliverMessage : public SMSMessage
-  {
-  private:
-    // SMS-DELIVER PDU members (see GSM 03.40 section 9.2.2.1)
-    bool _moreMessagesToSend;
-    bool _replyPath;
-    bool _statusReportIndication;
-    Address _originatingAddress;
-    unsigned char _protocolIdentifier; // octet
-    Timestamp _serviceCentreTimestamp;
-
-    // initialize members to sensible values
-    void init();
-    
-  public:
-    // constructor, sets sensible default values
-    SMSDeliverMessage();
-
-    // constructor with given pdu
-    SMSDeliverMessage(string pdu) throw(GsmException);
-
-    // encode pdu, return hexadecimal pdu string
-    virtual string encode();
-
-    // create textual representation of SMS
-    virtual string toString() const;
-
-    // inherited from SMSMessage
-    Address address() const;
-    Ref<SMSMessage> clone();
-
-    // accessor functions
-    bool moreMessagesToSend() const {return _moreMessagesToSend;}
-    bool replyPath() const {return _replyPath;}
-    bool statusReportIndication() const {return _statusReportIndication;}
-    Address originatingAddress() const {return _originatingAddress;}
-    unsigned char protocolIdentifier() const {return _protocolIdentifier;}
-    Timestamp serviceCentreTimestamp() const {return _serviceCentreTimestamp;}
-
-    void setMoreMessagesToSend(bool x) {_moreMessagesToSend = x;}
-    void setReplyPath(bool x) {_replyPath = x;}
-    void setStatusReportIndication(bool x) {_statusReportIndication = x;}
-    void setOriginatingAddress(Address &x) {_originatingAddress = x;}
-    void setProtocolIdentifier(unsigned char x) {_protocolIdentifier = x;}
-    void setServiceCentreTimestamp(Timestamp &x) {_serviceCentreTimestamp = x;}
-
-    virtual ~SMSDeliverMessage() {}
-  };
-
-  // SMS-SUBMIT TPDU
-  class SMSSubmitMessage : public SMSMessage
-  {
-  private:
-    // SMS-SUBMIT PDU (see GSM 03.40 section 9.2.2.2)
-    bool _rejectDuplicates;
-    TimePeriod::Format _validityPeriodFormat; // 2 bits
-    bool _replyPath;
-    bool _statusReportRequest;
-    unsigned char _messageReference; // integer
-    Address _destinationAddress;
-    unsigned char _protocolIdentifier;
-    TimePeriod _validityPeriod;
-
-    // initialize members to sensible values
-    void init();
-    
-  public:
-    // constructor, sets sensible default values
-    SMSSubmitMessage();
-
-    // constructor with given pdu
-    SMSSubmitMessage(string pdu) throw(GsmException);
-
-    // convenience constructor
-    // given the text and recipient telephone number
-    SMSSubmitMessage(string text, string number);
-
-    // encode pdu, return hexadecimal pdu string
-    virtual string encode();
-
-    // create textual representation of SMS
-    virtual string toString() const;
-
-    // inherited from SMSMessage
-    Address address() const;
-    Ref<SMSMessage> clone();
-
-    // accessor functions
-    bool rejectDuplicates() const {return _rejectDuplicates;}
-    TimePeriod::Format validityPeriodFormat() const
-      {return _validityPeriodFormat;}
-    bool replyPath() const {return _replyPath;}
-    bool statusReportRequest() const {return _statusReportRequest;}
-    unsigned char messageReference() const {return _messageReference;}
-    Address destinationAddress() const {return _destinationAddress;}
-    unsigned char protocolIdentifier() const {return _protocolIdentifier;}
-    TimePeriod validityPeriod() const {return _validityPeriod;}
-
-    void setRejectDuplicates(bool x) {_rejectDuplicates = x;}
-    void setValidityPeriodFormat(TimePeriod::Format &x)
-      {_validityPeriodFormat = x;}
-    void setReplyPath(bool x) {_replyPath = x;}
-    void setStatusReportRequest(bool x) {_statusReportRequest = x;}
-    void setMessageReference(unsigned char x) {_messageReference = x;}
-    void setDestinationAddress(Address &x) {_destinationAddress = x;}
-    void setProtocolIdentifier(unsigned char x) {_protocolIdentifier = x;}
-    void setValidityPeriod(TimePeriod &x) {_validityPeriod = x;}
-    
-    virtual ~SMSSubmitMessage() {}
-  };
-
-  // SMS-STATUS-REPORT TPDU
-  class SMSStatusReportMessage : public SMSMessage
-  {
-  private:
-    // SMS-STATUS-REPORT PDU (see GSM 03.40 section 9.2.2.3)
-    bool _moreMessagesToSend;
-    bool _statusReportQualifier;
-    unsigned char _messageReference;
-    Address _recipientAddress;
-    Timestamp _serviceCentreTimestamp;
-    Timestamp _dischargeTime;
-    unsigned char _status;      // octet
-    
-    // initialize members to sensible values
-    void init();
-    
-  public:
-    // constructor, sets sensible default values
-    SMSStatusReportMessage() {init();}
-
-    // constructor with given pdu
-    SMSStatusReportMessage(string pdu) throw(GsmException);
-
-    // encode pdu, return hexadecimal pdu string
-    virtual string encode();
-
-    // create textual representation of SMS
-    virtual string toString() const;
-
-    // inherited from SMSMessage
-    Address address() const;
-    Ref<SMSMessage> clone();
-
-    // accessor functions
-    bool moreMessagesToSend() const {return _moreMessagesToSend;}
-    bool statusReportQualifier() const {return _statusReportQualifier;}
-    unsigned char messageReference() const {return _messageReference;}
-    Address recipientAddress() const {return _recipientAddress;}
-    Timestamp serviceCentreTimestamp() const {return _serviceCentreTimestamp;}
-    Timestamp dischargeTime() const {return _dischargeTime;}
-    unsigned char status() const {return _status;}
-    
-    void setMoreMessagesToSend(bool x) {_moreMessagesToSend = x;}
-    void setStatusReportQualifier(bool x) {_statusReportQualifier = x;}
-    void setMessageReference(unsigned char x) {_messageReference = x;}
-    void setRecipientAddress(Address x) {_recipientAddress = x;}
-    void setServiceCentreTimestamp(Timestamp x) {_serviceCentreTimestamp = x;}
-    void setDischargeTime(Timestamp x) {_serviceCentreTimestamp = x;}
-    void setStatus(unsigned char x) {_status = x;}
-
-    virtual ~SMSStatusReportMessage() {}
-  };
-
-  // SMS-COMMAND TPDU
-  class SMSCommandMessage : public SMSMessage
-  {
-  public:
-    // command types, other values are reserved or SC-specific
-    enum CommandType {EnquireSM = 0, CancelStatusReportRequest = 1,
-                      DeleteSubmittedSM = 2, EnalbeStatusReportRequest = 3};
-
-  private:
-    // SMS-COMMAND PDU (see GSM 03.40 section 9.2.2.4)
-    unsigned char _messageReference;
-    bool _statusReportRequest;
-    unsigned char _protocolIdentifier;
-    unsigned char _commandType;
-    unsigned char _messageNumber;
-    Address _destinationAddress;
-    unsigned char _commandDataLength;
-    string _commandData;
-
-    // initialize members to sensible values
-    void init();
-    
-  public:
-    // constructor, sets sensible default values
-    SMSCommandMessage() {init();}
-
-    // constructor with given pdu
-    SMSCommandMessage(string pdu) throw(GsmException);
-
-    // encode pdu, return hexadecimal pdu string
-    virtual string encode();
-
-    // create textual representation of SMS
-    virtual string toString() const;
-
-    // inherited from SMSMessage
-    Address address() const;
-    Ref<SMSMessage> clone();
-
-    // accessor functions
-    unsigned char messageReference() const {return _messageReference;}
-    bool statusReportRequest() const {return _statusReportRequest;}
-    unsigned char protocolIdentifier() const {return _protocolIdentifier;}
-    unsigned char commandType() const {return _commandType;}
-    unsigned char messageNumber() const {return _messageNumber;}
-    Address destinationAddress() const {return _destinationAddress;}
-    unsigned char commandDataLength() const {return _commandDataLength;}
-    string commandData() const {return _commandData;}
-
-    void setMessageReference(unsigned char x) {_messageReference = x;}
-    void setStatusReportRequest(bool x) {_statusReportRequest = x;}
-    void setProtocolIdentifier(unsigned char x) {_protocolIdentifier = x;}
-    void setCommandType(unsigned char x) {_commandType = x;}
-    void setMessageNumber(unsigned char x) {_messageNumber = x;}
-    void setDestinationAddress(Address &x) {_destinationAddress = x;}
-    void setCommandDataLength(unsigned char x) {_commandDataLength = x;}
-    void setCommandData(string x) {_commandData = x;}
-
-    virtual ~SMSCommandMessage() {}
-  };
-
-  // SMS-DELIVER-REPORT TPDU for RP-ACK
-  class SMSDeliverReportMessage : public SMSMessage
-  {
-  private:
-    // SMS-DELIVER-REPORT PDU (see GSM 03.40 section 9.2.2.1a (II))
-    bool _protocolIdentifierPresent; // parameter indicator
-    bool _dataCodingSchemePresent;
-    bool _userDataLengthPresent;
-    unsigned char _protocolIdentifier;
-    
-    // initialize members to sensible values
-    void init();
-    
-  public:
-    // constructor, sets sensible default values
-    SMSDeliverReportMessage() {init();}
-
-    // constructor with given pdu
-    SMSDeliverReportMessage(string pdu) throw(GsmException);
-
-    // encode pdu, return hexadecimal pdu string
-    virtual string encode();
-
-    // create textual representation of SMS
-    virtual string toString() const;
-
-    // inherited from SMSMessage
-    Address address() const;
-    Ref<SMSMessage> clone();
-
-    // accessor functions
-    bool protocolIdentifierPresent() const {return _protocolIdentifierPresent;}
-    bool dataCodingSchemePresent() const {return _dataCodingSchemePresent;}
-    bool userDataLengthPresent() const {return _userDataLengthPresent;}
-    unsigned char protocolIdentifier() const
-      {assert(_protocolIdentifierPresent); return _protocolIdentifier;}
-    DataCodingScheme dataCodingScheme() const
-      {assert(_dataCodingSchemePresent); return _dataCodingScheme;}
-    UserDataHeader userDataHeader() const
-      {assert(_userDataLengthPresent); return _userDataHeader;}
-    string userData() const
-      {assert(_userDataLengthPresent); return _userData;}
-    
-    void setProtocolIdentifier(unsigned char x)
-      {_protocolIdentifierPresent = true; _protocolIdentifier = x;}
-    void setDataCodingScheme(DataCodingScheme x)
-      {_dataCodingSchemePresent = true; _dataCodingScheme = x;}
-    void setUserDataHeader(UserDataHeader x)
-    {
-      _userDataLengthPresent = true;
-      _userDataHeader = x;
-    }
-    void setUserData(string x)
-    {
-      _userDataLengthPresent = true;
-      _userData = x;
-    }
-    
-    virtual ~SMSDeliverReportMessage() {}
-  };
-
-  // SMS-SUBMIT-REPORT TPDU for RP-ACK
-  class SMSSubmitReportMessage : public SMSMessage
-  {
-  private:
-    // SMS-SUBMIT-REPORT PDU (see GSM 03.40 section 9.2.2.2a (II))
-    Timestamp _serviceCentreTimestamp;
-    bool _protocolIdentifierPresent; // parameter indicator
-    bool _dataCodingSchemePresent;
-    bool _userDataLengthPresent;
-    unsigned char _protocolIdentifier;
-    DataCodingScheme _dataCodingScheme;
-
-    // initialize members to sensible values
-    void init();
-    
-  public:
-    // constructor, sets sensible default values
-    SMSSubmitReportMessage() {init();}
-
-    // constructor with given pdu
-    SMSSubmitReportMessage(string pdu) throw(GsmException);
-
-    // encode pdu, return hexadecimal pdu string
-    virtual string encode();
-
-    // create textual representation of SMS
-    virtual string toString() const;
-
-    // inherited from SMSMessage
-    Address address() const;
-    Ref<SMSMessage> clone();
-
-    // accessor functions
-    Timestamp serviceCentreTimestamp() const {return _serviceCentreTimestamp;}
-    bool protocolIdentifierPresent() const {return _protocolIdentifierPresent;}
-    bool dataCodingSchemePresent() const {return _dataCodingSchemePresent;}
-    bool userDataLengthPresent() const {return _userDataLengthPresent;}
-    unsigned char protocolIdentifier() const
-      {assert(_protocolIdentifierPresent); return _protocolIdentifier;}
-    DataCodingScheme dataCodingScheme() const
-      {assert(_dataCodingSchemePresent); return _dataCodingScheme;}
-    UserDataHeader userDataHeader() const
-      {assert(_userDataLengthPresent); return _userDataHeader;}
-    string userData() const
-      {assert(_userDataLengthPresent); return _userData;}
-
-    void setServiceCentreTimestamp(Timestamp &x) {_serviceCentreTimestamp = x;}
-    void setProtocolIdentifier(unsigned char x)
-      {_protocolIdentifierPresent = true; _protocolIdentifier = x;}
-    void setDataCodingScheme(DataCodingScheme x)
-      {_dataCodingSchemePresent = true; _dataCodingScheme = x;}
-    void setUserDataHeader(UserDataHeader x)
-    {
-      _userDataLengthPresent = true;
-      _userDataHeader = x;
-    }
-    void setUserData(string x)
-    {
-      _userDataLengthPresent = true;
-      _userData = x;
-    }
-    virtual ~SMSSubmitReportMessage() {}
-  };
-
-  // some useful typdefs
-  typedef Ref<SMSMessage> SMSMessageRef;
-};
-
-#endif // GSM_SMS_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_codec.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_codec.cc
deleted file mode 100644
index cdcb0032bc..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_codec.cc
+++ /dev/null
@@ -1,702 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sms_codec.cc
-// *
-// * Purpose: Coder and Encoder for SMS TPDUs
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 17.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_sysdep.h>
-#include <gsmlib/gsm_sms_codec.h>
-#include <gsmlib/gsm_util.h>
-#include <time.h>
-#include <strstream>
-#include <iomanip>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#include <climits>
-#include <string>
-using namespace std;
-using namespace gsmlib;
-
-// Address members
-
-Address::Address(string number) : _plan(ISDN_Telephone)
-{
-  number = removeWhiteSpace(number);
-  if (number.length() > 0 && number[0] == '+')
-  {
-    _type = International;
-    _number = number.substr(1, number.length() - 1);
-  }
-  else
-  {
-    _type = Unknown;
-    _number = number;
-  }
-}
-
-string Address::toString() const
-{
-  if (_type == International)
-    return "+" + _number;
-  else
-    return _number;
-}
-
-bool gsmlib::operator<(const Address &x, const Address &y)
-{
-  // normalize numbers according to the following two rules:
-  // - prepend "+" if international number
-  // - append 0s to the shorter number so that both numbers have equal length
-  string xnumber = x._number;
-  string ynumber = y._number;
-  static string twenty0s = "00000000000000000000";
-
-  if (x._type == Address::International) xnumber = "+" + xnumber;
-  if (y._type == Address::International) ynumber = "+" + ynumber;
-  
-  while (xnumber.length() != ynumber.length())
-    if (xnumber.length() < ynumber.length())
-    {
-      int diff = ynumber.length() - xnumber.length();
-      xnumber += twenty0s.substr(0, (diff > 20 ? 20 : diff));
-    }
-    else
-    {
-      int diff = xnumber.length() - ynumber.length();
-      ynumber += twenty0s.substr(0, (diff > 20 ? 20 : diff));
-    }
-
-  return xnumber < ynumber;
-}
-
-bool gsmlib::operator==(const Address &x, const Address &y)
-{
-  return x._number == y._number && x._plan == y._plan;
-}
-
-// Timestamp members
-
-bool Timestamp::empty() const
-{
-  return _year == 0 && _month == 0 && _day == 0 && _hour == 0 && 
-    _minute == 0 && _seconds == 0 && _timeZoneMinutes == 0;
-}
-
-string Timestamp::toString(bool appendTimeZone) const
-{
-  short timeZoneMinutes = _timeZoneMinutes;
-  short timeZoneHours = timeZoneMinutes / 60;
-  timeZoneMinutes %= 60;
-
-  // format date and time in a locale-specific way
-  struct tm t;
-  t.tm_sec = _seconds;
-  t.tm_min = _minute;
-  t.tm_hour = _hour;
-  t.tm_mon = _month - 1;
-  // year 2000 heuristics, SMSs cannot be older than start of GSM network
-  t.tm_year = _year < 80 ? _year + 100 : _year;
-  t.tm_mday = _day;
-  t.tm_isdst = -1;
-  t.tm_yday = 0;
-  t.tm_wday = 0;
-  
-#ifdef BROKEN_STRFTIME
-  char formattedTime[1024];
-  strftime(formattedTime, 1024, "%x %X", &t);
-#else
-  int formattedTimeSize = strftime(NULL, INT_MAX, "%x %X", &t) + 1;
-  char *formattedTime = (char*)alloca(sizeof(char) * formattedTimeSize);
-  strftime(formattedTime, formattedTimeSize, "%x %X", &t);
-#endif
-
-  if (! appendTimeZone)
-    return formattedTime;
-
-  ostrstream os;
-  os << formattedTime << " (" << (_negativeTimeZone ? '-' : '+')
-     << setfill('0') << setw(2) << timeZoneHours 
-     << setw(2) << timeZoneMinutes << ')' << ends;
-  char *ss = os.str();
-  string result(ss);
-  delete[] ss;
-  return result;
-}
-
-bool gsmlib::operator<(const Timestamp &x, const Timestamp &y)
-{
-  // we don't take time zone info into account because
-  // - it's more complicated to compute
-  // - it might confuse the user for whom it's also too complicated
-  if (x._year < y._year)
-    return true;
-  else if (x._year > y._year)
-    return false;
-
-  if (x._month < y._month)
-    return true;
-  else if (x._month > y._month)
-    return false;
-
-  if (x._day < y._day)
-    return true;
-  else if (x._day > y._day)
-    return false;
-
-  if (x._hour < y._hour)
-    return true;
-  else if (x._hour > y._hour)
-    return false;
-
-  if (x._minute < y._minute)
-    return true;
-  else if (x._minute > y._minute)
-    return false;
-
-  return x._seconds < y._seconds;
-}
-
-bool gsmlib::operator==(const Timestamp &x, const Timestamp &y)
-{
-  // we don't take time zone info in order to be consistent with operator<
-  return x._year == y._year && x._month == y._month && x._day == y._day &&
-    x._hour == y._hour && x._minute == y._minute && x._seconds == y._seconds;
-}
-
-// TimePeriod members
-
-string TimePeriod::toString() const
-{
-  switch (_format)
-  {
-  case NotPresent:
-    return _("not present");
-  case Relative:
-  {
-    ostrstream os;
-    if (_relativeTime <= 143)
-      os << ((int)_relativeTime + 1) * 5 << _(" minutes");
-    else if (_relativeTime <= 167)
-      os << 12 * 60 + ((int)_relativeTime - 143) * 30 << _(" minutes");
-    else if (_relativeTime <= 196)
-      os << (int)_relativeTime - 166 << _(" days");
-    else if (_relativeTime <= 143)
-      os << (int)_relativeTime - 192 << _(" weeks");
-    os << ends;
-    char *ss = os.str();
-    string result(ss);
-    delete[] ss;
-    return result;
-  }
-  case Absolute:
-    return _absoluteTime.toString();
-  default:
-    return _("unknown");
-  }
-}
-
-// DataCodingScheme members
-
-string DataCodingScheme::toString() const
-{
-  string result;
-  if (compressed()) result += _("compressed   ");
-  if (messageWaitingIndication())
-    switch (getMessageWaitingType())
-    {
-    case DCS_VOICEMAIL_MESSAGE_WAITING:
-      result += _("voicemail message waiting");
-      break;
-    case DCS_FAX_MESSAGE_WAITING:
-      result += _("fax message waiting");
-      break;
-    case DCS_ELECTRONIC_MAIL_MESSAGE_WAITING:
-      result += _("electronic mail message waiting");
-      break;
-    case DCS_OTHER_MESSAGE_WAITING:
-      result += _("other message waiting");
-      break;
-    }
-  else
-    switch (getAlphabet())
-    {
-    case DCS_DEFAULT_ALPHABET:
-      result += _("default alphabet");
-      break;
-    case DCS_EIGHT_BIT_ALPHABET:
-      result += _("8-bit alphabet");
-      break;
-    case DCS_SIXTEEN_BIT_ALPHABET:
-      result += _("16-bit alphabet");
-      break;
-    case DCS_RESERVED_ALPHABET:
-      result += _("reserved alphabet");
-      break;
-    }
-  return result;
-}
-
-// SMSDecoder members
-
-SMSDecoder::SMSDecoder(string pdu) : _bi(0), _septetStart(NULL)
-{
-  _p = new unsigned char[pdu.length() / 2];
-  _op = _p;
-  if (! hexToBuf(pdu, _p))
-    throw GsmException(_("bad hexadecimal PDU format"), SMSFormatError);
-  _maxop = _op + pdu.length() / 2;
-}
-
-void SMSDecoder::alignOctet()
-{
-  if (_bi != 0)
-  {
-    _bi = 0;
-    ++_op;
-  }
-}
-    
-void SMSDecoder::alignSeptet()
-{
-  assert(_septetStart != NULL);
-  while (((_op - _septetStart) * 8 + _bi) % 7 != 0) getBit();
-}
-    
-unsigned char SMSDecoder::get2Bits()
-{
-  unsigned char result = getBit();
-  return result | (getBit() << 1);
-}
-
-unsigned char SMSDecoder::getOctet()
-{
-  alignOctet();
-  if (_op >= _maxop)
-    throw GsmException(_("premature end of PDU"), SMSFormatError);
-  return *_op++;
-}
-
-void SMSDecoder::getOctets(unsigned char* octets, unsigned short length)
-{
-  alignOctet();
-  for (unsigned short i = 0; i < length; ++i)
-  {
-    if (_op >= _maxop)
-      throw GsmException(_("premature end of PDU"), SMSFormatError);
-    *octets++ = *_op++;
-  }
-}
-
-string SMSDecoder::getSemiOctets(unsigned short length)
-{
-  string result;
-  result.reserve(length);
-  alignOctet();
-  for (unsigned short i = 0; i < length; ++i)
-  {
-    if (_bi == 0)
-    {
-      if (_op >= _maxop)
-        throw GsmException(_("premature end of PDU"), SMSFormatError);
-      // bits 0..3 are most significant
-      result += '0' + (*_op & 0xf);
-      _bi = 4;
-    }
-    else
-    {
-      if (_op >= _maxop)
-        throw GsmException(_("premature end of PDU"), SMSFormatError);
-      // bits 4..7 are least significant, skip 0xf digit
-      if ((*_op & 0xf0) != 0xf0)
-        result += '0' + (*_op >> 4);
-      _bi = 0;
-      ++_op;
-    }
-  }
-  alignOctet();
-  return result;
-}
-
-unsigned long SMSDecoder::getSemiOctetsInteger(unsigned short length)
-{
-  unsigned long result = 0;
-  alignOctet();
-  for (unsigned short i = 0; i < length; ++i)
-  {
-    if (_bi == 0)
-    {
-      if (_op >= _maxop)
-        throw GsmException(_("premature end of PDU"), SMSFormatError);
-      // bits 0..3 are most significant
-      result = result * 10 + (*_op & 0xf);
-      _bi = 4;
-    }
-    else
-    {
-      if (_op >= _maxop)
-        throw GsmException(_("premature end of PDU"), SMSFormatError);
-      // bits 4..7 are least significant, skip 0xf digit
-      if ((*_op & 0xf0) != 0xf0)
-        result = result * 10 + (*_op >> 4);
-      _bi = 0;
-      ++_op;
-    }
-  }
-  alignOctet();
-  return result;
-}
-
-unsigned long SMSDecoder::getTimeZone(bool &negativeTimeZone)
-{
-  unsigned long result = 0;
-  alignOctet();
-  for (unsigned short i = 0; i < 2; ++i)
-  {
-    if (_bi == 0)
-    {
-      if (_op >= _maxop)
-        throw GsmException(_("premature end of PDU"), SMSFormatError);
-      // bits 0..3 are most significant
-      if (i == 0)
-      {                         // get sign
-        result = result * 10 + (*_op & 0x7);
-        negativeTimeZone = (*_op & 0x8 == 0);
-      }
-      else
-        result = result * 10 + (*_op & 0xf);
-      _bi = 4;
-    }
-    else
-    {
-      if (_op >= _maxop)
-        throw GsmException(_("premature end of PDU"), SMSFormatError);
-      // bits 4..7 are least significant
-      result = result * 10 + (*_op >> 4);
-      _bi = 0;
-      ++_op;
-    }
-  }
-  alignOctet();
-  return result * 15;           // compute minutes
-}
-
-unsigned long SMSDecoder::getInteger(unsigned short length)
-{
-  unsigned long result = 0;
-  for (unsigned short i = 0; i < length; ++i)
-    result |= (getBit() << i);
-  return result;
-}
-
-string SMSDecoder::getString(unsigned short length)
-{
-  string result;
-  alignSeptet();
-  for (unsigned short i = 0; i < length; ++i)
-  {
-    unsigned char c = 0;
-    for (unsigned short j = 0; j < 7; ++j)
-      c |= getBit() << j;
-    result += c;
-  }
-  return result;
-}
-
-Address SMSDecoder::getAddress(bool scAddressFormat)
-{
-  Address result;
-  alignOctet();
-
-  unsigned char addressLength = getOctet();
-  if (addressLength == 0 && scAddressFormat)
-    return result; // special case for SUBMIT-PDUs
-
-  // parse Type-of-Address
-  result._plan = (Address::NumberingPlan)getInteger(4);
-  result._type = (Address::Type)getInteger(3);
-
-  // get address
-  if (result._type == Address::Alphanumeric)
-  {
-    markSeptet();
-    // addressLength is number of semi-octets
-    // (addressLength / 2) * 8 is number of available bits
-    // divided by 7 is number of 7-bit characters
-    result._number = gsmToLatin1(getString(addressLength * 4 / 7));
-    alignOctet();
-  }
-  else
-    result._number = getSemiOctets(scAddressFormat ?
-                                   (addressLength - 1) * 2 : addressLength);
-  return result;
-}
-
-Timestamp SMSDecoder::getTimestamp()
-{
-  Timestamp result;
-
-  result._year = getSemiOctetsInteger(2);
-  result._month = getSemiOctetsInteger(2);
-  result._day = getSemiOctetsInteger(2);
-  result._hour = getSemiOctetsInteger(2);
-  result._minute = getSemiOctetsInteger(2);
-  result._seconds = getSemiOctetsInteger(2);
-  result._timeZoneMinutes = getTimeZone(result._negativeTimeZone);
-  return result;
-}
-
-TimePeriod SMSDecoder::getTimePeriod(TimePeriod::Format format)
-{
-  TimePeriod result;
-  result._format = format;
-  switch (format)
-  {
-  case TimePeriod::NotPresent:
-    break;
-  case TimePeriod::Relative:
-    result._relativeTime = getOctet();
-    break;
-  case TimePeriod::Absolute:
-    result._absoluteTime = getTimestamp();
-    break;
-  default:
-    throw GsmException(_("unknown time period format"), SMSFormatError);
-    break;
-  }
-  return result;
-}
-
-SMSDecoder::~SMSDecoder()
-{
-  delete _p;
-}
-
-// SMSEncoder members
-
-SMSEncoder::SMSEncoder() : _bi(0), _op(_p)
-{
-  memset((void*)_p, 0, sizeof(_p));
-}
-
-void SMSEncoder::alignOctet()
-{
-  if (_bi != 0)
-  {
-    _bi = 0;
-    ++_op;
-  }
-}
-    
-void SMSEncoder::alignSeptet()
-{
-  while (((_op - _septetStart) * 8 + _bi) % 7 != 0) setBit();
-}
-    
-void SMSEncoder::set2Bits(unsigned char twoBits)
-{
-  setBit(twoBits & 1);
-  setBit((twoBits & 2) == 2);
-}
-
-void SMSEncoder::setOctet(unsigned char octet)
-{
-  alignOctet();
-  *_op++ = octet;
-}
-
-void SMSEncoder::setOctets(const unsigned char* octets, unsigned short length)
-{
-  alignOctet();
-  for (unsigned short i = 0; i < length; ++i)
-    *_op++ = octets[i];
-}
-
-void SMSEncoder::setSemiOctets(string semiOctets)
-{
-  alignOctet();
-  for (unsigned int i = 0; i < semiOctets.length(); ++i)
-  {
-    if (_bi == 0)
-    {
-      *_op = semiOctets[i] - '0';
-      _bi = 4;
-    }
-    else
-    {
-      *_op++ |= (semiOctets[i] - '0') << 4;
-      _bi = 0;
-    }
-  }
-  if (_bi == 4)
-    *_op++ |= 0xf0;
-  _bi = 0;
-}
-
-void SMSEncoder::setSemiOctetsInteger(unsigned long intValue,
-                                      unsigned short length)
-{
-  ostrstream os;
-  os << intValue << ends;
-  char *ss = os.str();
-  string s(ss);
-  delete[] ss;
-  assert(s.length() <= length);
-  while (s.length() < length) s = '0' + s;
-  setSemiOctets(s);
-}
-
-void SMSEncoder::setTimeZone(bool negativeTimeZone, unsigned long timeZone)
-{
-  setSemiOctetsInteger(timeZone / 15, 2);
-  if (!negativeTimeZone)
-    *(_op - 1) |= 8;
-}
-
-void SMSEncoder::setInteger(unsigned long intvalue, unsigned short length)
-{
-  for (unsigned short i = 0; i < length; ++i)
-    setBit((intvalue & (1 << i)) != 0);
-}
-
-void SMSEncoder::setString(string stringValue)
-{
-  alignSeptet();
-  for (unsigned int i = 0; i < stringValue.length(); ++i)
-  {
-    unsigned char c = stringValue[i];
-    for (unsigned short j = 0; j < 7; ++j)
-      setBit(((1 << j) & c) != 0);
-  }
-}
-
-void SMSEncoder::setAddress(Address &address, bool scAddressFormat)
-{
-  alignOctet();
-  if (scAddressFormat)
-  {
-    unsigned int numberLen = address._number.length();
-    if (numberLen == 0)
-    {
-      setOctet(0);              // special case: use default SC address
-      return;                   // (set by +CSCA=)
-    }
-    setOctet(numberLen / 2 + numberLen % 2 + 1);
-    // not supported for SCA format
-    assert(address._type != Address::Alphanumeric);
-  }
-  else
-    if (address._type == Address::Alphanumeric)
-      // address in GSM default encoding, see also comment in getAddress()
-      setOctet((address._number.length() * 7 + 6) / 8 * 2);
-    else
-      setOctet(address._number.length());
-
-  setInteger(address._plan, 4);
-  setInteger(address._type, 3);
-  setBit(1);
-  
-  if (address._number.length() > 0)
-    if (address._type == Address::Alphanumeric)
-    {
-      markSeptet();
-      setString(latin1ToGsm(address._number));
-    }
-    else
-      setSemiOctets(address._number);
-  alignOctet();
-}
-
-void SMSEncoder::setTimestamp(Timestamp timestamp)
-{
-  setSemiOctetsInteger(timestamp._year, 2);
-  setSemiOctetsInteger(timestamp._month, 2);
-  setSemiOctetsInteger(timestamp._day, 2);
-  setSemiOctetsInteger(timestamp._hour, 2);
-  setSemiOctetsInteger(timestamp._minute, 2);
-  setSemiOctetsInteger(timestamp._seconds, 2);
-  setTimeZone(timestamp._negativeTimeZone, timestamp._timeZoneMinutes);
-}
-
-void SMSEncoder::setTimePeriod(TimePeriod period)
-{
-  switch (period._format)
-  {
-  case TimePeriod::NotPresent:
-    break;
-  case TimePeriod::Relative:
-    setOctet(period._relativeTime);
-    break;
-  case TimePeriod::Absolute:
-    setTimestamp(period._absoluteTime);
-    break;
-  default:
-    assert(0);
-    break;
-  }
-}
-
-string SMSEncoder::getHexString()
-{
-  short bi = _bi;
-  unsigned char *op = _op;
-  alignOctet();
-  string result = bufToHex(_p, _op - _p);
-  _bi = bi;
-  _op = op;
-  return result;
-}
-
-unsigned int SMSEncoder::getLength()
-{
-  short bi = _bi;
-  unsigned char *op = _op;
-  alignOctet();
-  unsigned int result = _op - _p;
-  _bi = bi;
-  _op = op;
-  return result;
-}
-
-// UserDataHeader members
-
-void UserDataHeader::encode(SMSEncoder &e)
-{
-  e.setOctet(_udh.length());
-  e.setOctets((unsigned char*)_udh.data(), _udh.length());
-}
-
-void UserDataHeader::decode(SMSDecoder &d)
-{
-  unsigned char udhLen = d.getOctet();
-  unsigned char *s =
-    (unsigned char*)alloca(sizeof(unsigned char) * udhLen);
-  d.getOctets(s, udhLen);
-  string ss((char*)s, (unsigned int)udhLen);
-  _udh = ss;
-}
-
-string UserDataHeader::getIE(unsigned char id)
-{
-  int udhl, pos = 0;
-	
-  udhl = _udh.length();
-  while (pos < udhl)
-  {
-    unsigned char iei = _udh[pos++];
-    unsigned char ieidl = _udh[pos++];
-    if (iei == id) return _udh.substr(pos, ieidl);
-    pos += ieidl;
-  }
-  return "";
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_codec.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_codec.h
deleted file mode 100644
index 692b424561..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_codec.h
+++ /dev/null
@@ -1,329 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sms_codec.h
-// *
-// * Purpose: Coder and Encoder for SMS TPDUs
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 16.5.1999
-// *************************************************************************
-
-#ifndef GSM_SMS_CODEC_H
-#define GSM_SMS_CODEC_H
-
-#include <string>
-#include <assert.h>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // this struct represents a telephone number
-  // usually _type == Unknown or International
-  // and _number == ISDN_Telephone
-  struct Address
-  {
-    enum Type {Unknown = 0, International = 1, National = 2,
-               NetworkSpecific = 3, Subscriber = 4,
-               Alphanumeric = 5, Abbreviated = 6, Reserved = 7};
-    enum NumberingPlan {UnknownPlan = 0, ISDN_Telephone = 1,
-                        Data = 3, Telex = 4, NationalPlan = 8,
-                        PrivatePlan = 9, Ermes = 10, ReservedPlan = 15};
-    Type _type;
-    NumberingPlan _plan;
-    string _number;    
-
-    Address() : _type(Unknown), _plan(UnknownPlan) {}
-    // the constructor sets _type and _plan to defaults
-    // _plan == ISDN_Telephone
-    // _type == International if number starts with "+"
-    // _type == unknown otherwise
-    // number must be of the form "+123456" or "123456"
-    Address(string number);
-
-    // return string representation
-    string toString() const;
-
-    friend bool operator<(const Address &x, const Address &y);
-    friend bool operator==(const Address &x, const Address &y);
-  };
-
-  // compare two addresses
-  extern bool operator<(const Address &x, const Address &y);
-  extern bool operator==(const Address &x, const Address &y);
-
-  // representation of a SMS timestamp
-  struct Timestamp
-  {
-    short _year, _month, _day, _hour, _minute, _seconds, _timeZoneMinutes;
-    bool _negativeTimeZone;
-
-    Timestamp() : _year(0), _month(0), _day(0), _hour(0),
-      _minute(0), _seconds(0), _timeZoneMinutes(0), _negativeTimeZone(false) {}
-
-    // return true if the time stamp is empty (ie. contains only zeroes)
-    bool empty() const;
-
-    // return string representation
-    string toString(bool appendTimeZone = true) const;
-
-    friend bool operator<(const Timestamp &x, const Timestamp &y);
-    friend bool operator==(const Timestamp &x, const Timestamp &y);
-  };
-
-  // compare two timestamps
-  extern bool operator<(const Timestamp &x, const Timestamp &y);
-  extern bool operator==(const Timestamp &x, const Timestamp &y);
-
-  // representation of time period
-  struct TimePeriod
-  {
-    // possible values for validity period format
-    enum Format {NotPresent = 0, Relative = 2, Absolute = 3};
-    Format _format;
-    Timestamp _absoluteTime;
-    unsigned char _relativeTime;
-
-    TimePeriod() : _format(NotPresent), _relativeTime(0) {}
-
-    // return string representation (already translated)
-    string toString() const;
-  };
-
-  // representation of DataCodingScheme
-  // the data coding scheme is described in detail in ETSI GSM 03.38, section 4
-  const unsigned char DCS_COMPRESSED = 0x20; // bit 5
-  
-  const unsigned char DCS_DEFAULT_ALPHABET = 0 << 2; // bit 2..3 == 0
-  const unsigned char DCS_EIGHT_BIT_ALPHABET = 1 << 2; // bit 2..3 == 01
-  const unsigned char DCS_SIXTEEN_BIT_ALPHABET = 2 << 2; // bit 2..3 == 10
-  const unsigned char DCS_RESERVED_ALPHABET = 3 << 2; // bit 2..3 == 11
-  
-  const unsigned char DCS_MESSAGE_WAITING_INDICATION = 0xc0; // bit 7..6 == 11
-  const unsigned char DCS_VOICEMAIL_MESSAGE_WAITING = 0;
-  const unsigned char DCS_FAX_MESSAGE_WAITING = 1;
-  const unsigned char DCS_ELECTRONIC_MAIL_MESSAGE_WAITING = 2;
-  const unsigned char DCS_OTHER_MESSAGE_WAITING = 3;
-
-  class DataCodingScheme
-  {
-  private:
-    unsigned char _dcs;
-
-  public:
-    // initialize with data coding scheme octet
-    DataCodingScheme(unsigned char dcs) : _dcs(dcs) {}
-    
-    // set to default values (no message waiting, no message class indication,
-    // default 7-bit alphabet)
-    DataCodingScheme() : _dcs(DCS_DEFAULT_ALPHABET) {}
-
-    // return type of alphabet used (if messageWaitingIndication == false)
-    unsigned char getAlphabet() const {return _dcs & (3 << 2);}
-    
-    // return true if message compressed
-    // (if messageWaitingIndication == false)
-    bool compressed() const {return _dcs & DCS_COMPRESSED == DCS_COMPRESSED;}
-
-    // return true if message waiting indication
-    bool messageWaitingIndication() const
-      {return _dcs & DCS_MESSAGE_WAITING_INDICATION == 
-         DCS_MESSAGE_WAITING_INDICATION;}
-
-    // return type of waiting message (if messageWaitingIndication == true)
-    unsigned char getMessageWaitingType() const {return _dcs & 3;}
-
-    // return string representation (already translated)
-    string toString() const;
-
-    operator unsigned char() const {return _dcs;}
-  };
-
-  // utility class facilitate SMS TPDU decoding
-  class SMSDecoder
-  {
-  private:
-    unsigned char *_p;          // buffer to hold pdu
-    short _bi;                  // bit index (0..7)
-    unsigned char *_op;         // current octet pointer
-    unsigned char *_septetStart; // start of septet string
-
-    unsigned char *_maxop;      // pointer to last byte after _p
-
-  public:
-    // initialize with a hexadecimal octet string containing SMS TPDU
-    SMSDecoder(string pdu);
-
-    // align to octet border
-    void alignOctet();
-    
-    // remember starting point of septets (important for alignSeptet())
-    void markSeptet() {alignOctet(); _septetStart = _op;}
-
-    // align to septet border
-    void alignSeptet();
-    
-    // get single bit
-    bool getBit()
-    {
-      assert(_op < _maxop);
-      bool result = ((*_op >> _bi) & 1);
-      if (_bi == 7)
-      {
-        _bi = 0;
-        ++_op;
-      }
-      else
-        ++_bi;
-      return result;
-    }
-
-    // get two bits
-    unsigned char get2Bits();
-
-    // get one octet
-    unsigned char getOctet();
-
-    // get string of octets of specified length
-    void getOctets(unsigned char* octets, unsigned short length);
-
-    // get length semi-octets (bcd-coded number) as ASCII string of numbers
-    string getSemiOctets(unsigned short length);
-
-    // get length semi-octets (bcd-coded number) as integer
-    unsigned long getSemiOctetsInteger(unsigned short length);
-
-    // get time zone (in minutes) and time zone sign
-    unsigned long getTimeZone(bool &negativeTimeZone);
-
-    // get integer with length number of bits
-    unsigned long getInteger(unsigned short length);
-
-    // get length number of alphanumeric 7-bit characters
-    // markSeptet() must be called before this function
-    string getString(unsigned short length);
-
-    // get address/telephone number
-    // service centre address has special format
-    Address getAddress(bool scAddressFormat = false);
-
-    // get Timestamp
-    Timestamp getTimestamp();
-
-    // get TimePeriod of given format
-    TimePeriod getTimePeriod(TimePeriod::Format format);
-
-    // destructor
-    ~SMSDecoder();
-  };
-
-  // utility class for SMS TPDU encoding
-  class SMSEncoder
-  {
-  private:
-    unsigned char _p[2000];     // buffer to hold pdu (2000 should be enough)
-    short _bi;                  // bit index (0..7)
-    unsigned char *_op;         // current octet pointer
-    unsigned char *_septetStart; // start of septet string
-
-  public:
-    // constructor
-    SMSEncoder();
-
-    // align to octet border
-    void alignOctet();
-
-    // remember starting point of septets (important for alignSeptet())
-    void markSeptet() {alignOctet(); _septetStart = _op;}
-
-    // align to septet border
-    void alignSeptet();
-    
-    // set single bit
-    void setBit(bool bit = false)
-    {
-      if (bit)
-        *_op |= (1 << _bi);
-      if (_bi == 7)
-      {
-        _bi = 0;
-        ++_op;
-      }
-      else
-        ++_bi;
-    }
-
-    // set two bits
-    void set2Bits(unsigned char twoBits);
-
-    // set one octet
-    void setOctet(unsigned char octet);
-
-    // set string of octets of specified length
-    void setOctets(const unsigned char* octets, unsigned short length);
-
-    // set semi-octets semiOctets (given as ASCII string of numbers)
-    void setSemiOctets(string semiOctets);
-
-    // set semi-octets (given as integer)
-    void setSemiOctetsInteger(unsigned long intValue, unsigned short length);
-
-    // set time zone (in minutes) and time zone sign
-    void setTimeZone(bool negativeTimeZone, unsigned long timeZone);
-
-    // set integer with length number of bits
-    void setInteger(unsigned long intvalue, unsigned short length);
-
-    // set alphanumeric 7-bit characters
-    void setString(string stringValue);
-
-    // set address/telephone number
-    // service centre address has special format
-    void setAddress(Address &address, bool scAddressFormat = false);
-
-    // set Timestamp
-    void setTimestamp(Timestamp timestamp);
-
-    // set TimePeriod
-    void setTimePeriod(TimePeriod period);
-
-    // return constructed TPDU as hex-encoded string
-    string getHexString();
-
-    // return current length of TPDU 
-    unsigned int getLength();
-  };
-
-  // class to handle user data header
-  class UserDataHeader
-  {
-  private:
-    string _udh;
-    
-  public:
-    // empty user data header
-    UserDataHeader() {}
-
-    // initialize with user data header
-    UserDataHeader (string udh) : _udh(udh) {}
-
-    // encode header
-    void encode(SMSEncoder &e);
-
-    // decode header
-    void decode(SMSDecoder &d);
-
-    // return a given information element, if present, or an empty string
-    string getIE(unsigned char id);
-    
-    // return the size of the header
-    unsigned int length() const {return _udh.length();}
-
-    // return user data header as octet string
-    operator string() const {return _udh;}
-  };
-};
-
-#endif // GSM_SMS_CODEC_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_store.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_store.cc
deleted file mode 100644
index 91e15ce3a8..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_store.cc
+++ /dev/null
@@ -1,489 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sms_store.cc
-// *
-// * Purpose: SMS functions, SMS store
-// *          (ETSI GSM 07.05)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 20.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_sms_store.h>
-#include <gsmlib/gsm_parser.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-// SMSStoreEntry members
-
-SMSStoreEntry::SMSStoreEntry() :
-   _status(Unknown), _cached(false), _mySMSStore(NULL), _index(0)
-{
-}
-
-
-SMSMessageRef SMSStoreEntry::message() const throw(GsmException)
-{
-  if (! cached())
-  {
-    assert(_mySMSStore != NULL);
-    // these operations are at least "logically const"
-    SMSStoreEntry *thisEntry = const_cast<SMSStoreEntry*>(this);
-    _mySMSStore->readEntry(_index, thisEntry->_message, thisEntry->_status);
-    thisEntry->_cached = true;
-  }
-  return _message;
-}
-
-CBMessageRef SMSStoreEntry::cbMessage() const throw(GsmException)
-{
-  assert(_mySMSStore != NULL);
-
-  // these operations are at least "logically const"
-  SMSStoreEntry *thisEntry = const_cast<SMSStoreEntry*>(this);
-  // don't cache CB message for now
-  thisEntry->_cached = false;
-
-  CBMessageRef result;
-  _mySMSStore->readEntry(_index, result);
-  return result;
-}
-
-SMSStoreEntry::SMSMemoryStatus SMSStoreEntry::status() const
-  throw(GsmException)
-{
-  if (! cached())
-  {
-    assert(_mySMSStore != NULL);
-    // these operations are at least "logically const"
-    SMSStoreEntry *thisEntry = const_cast<SMSStoreEntry*>(this);
-    _mySMSStore->readEntry(_index, thisEntry->_message, thisEntry->_status);
-    thisEntry->_cached = true;
-  }
-  return _status;
-}
-
-bool SMSStoreEntry::empty() const throw(GsmException)
-{
-  return message().isnull();
-}
-
-unsigned char SMSStoreEntry::send(Ref<SMSMessage> &ackPdu)
-  throw(GsmException)
-{
-  return _mySMSStore->send(_index, ackPdu);
-}
-
-unsigned char SMSStoreEntry::send() throw(GsmException)
-{
-  SMSMessageRef mref;
-  return send(mref);
-}
-
-bool SMSStoreEntry::cached() const
-{
-  if (_mySMSStore == NULL)
-    return _cached;
-  else
-    return _cached && _mySMSStore->_useCache;
-}
-
-Ref<SMSStoreEntry> SMSStoreEntry::clone()
-{
-  Ref<SMSStoreEntry> result = new SMSStoreEntry(_message->clone());
-  result->_status = _status;
-  result->_index = _index;
-  return result;
-}
-
-bool SMSStoreEntry::operator==(const SMSStoreEntry &e) const
-{
-  if (_message.isnull() || e._message.isnull())
-    return _message.isnull() && e._message.isnull();
-  else
-    return _message->encode() == e._message->encode();
-}
-
-SMSStoreEntry::SMSStoreEntry(const SMSStoreEntry &e)
-{
- _message = e._message;
- _status = e._status;
- _cached = e._cached;
- _mySMSStore = e._mySMSStore;
- _index = e._index;
-}
-
-SMSStoreEntry &SMSStoreEntry::operator=(const SMSStoreEntry &e)
-{
- _message = e._message;
- _status = e._status;
- _cached = e._cached;
- _mySMSStore = e._mySMSStore;
- _index = e._index;
- return *this;
-}
-
-// iterator members
-
-SMSStoreEntry &SMSStoreIterator::operator*()
-{
-  return (*_store)[_index];
-}
-  
-SMSStoreEntry *SMSStoreIterator::operator->()
-{
-  return &(*_store)[_index];
-}
-
-SMSStoreIterator::operator SMSStoreEntry*()
-{
-  return &(*_store)[_index];
-}
-
-SMSStoreIterator &SMSStoreIterator::operator=(const SMSStoreIterator &i)
-{
-  _index = i._index;
-  _store = i._store;
-  return *this;
-}
-
-const SMSStoreEntry &SMSStoreConstIterator::operator*()
-{
-  return (*_store)[_index];
-}
-  
-const SMSStoreEntry *SMSStoreConstIterator::operator->()
-{
-  return &(*_store)[_index];
-}
-
-// SMSStore members
-
-void SMSStore::readEntry(int index, SMSMessageRef &message,
-                         SMSStoreEntry::SMSMemoryStatus &status)
-  throw(GsmException)
-{
-  // select SMS store
-  _meTa.setSMSStore(_storeName, 1);
-
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "*** Reading SMS entry " << index << endl;
-#endif // NDEBUG
-
-  string pdu;
-  Ref<Parser> p;
-  try
-  {
-    p = new Parser(_at->chat("+CMGR=" + intToStr(index + 1), "+CMGR:",
-                             pdu, false, true, true));
-  }
-  catch (GsmException &ge)
-  {
-    if (ge.getErrorCode() != SMS_INVALID_MEMORY_INDEX)
-      throw ge;
-    else
-    {
-      message = SMSMessageRef();
-      status = SMSStoreEntry::Unknown;
-      return;
-    }
-  }
-
-  if (pdu.length() == 0)
-  {
-    message = SMSMessageRef();
-    status = SMSStoreEntry::Unknown;
-  }
-  else
-  {
-    // add missing service centre address if required by ME
-    if (! _at->getMeTa().getCapabilities()._hasSMSSCAprefix)
-      pdu = "00" + pdu;
-
-    status = (SMSStoreEntry::SMSMemoryStatus)p->parseInt();
-
-    // ignore the rest of the line
-    message = SMSMessageRef(
-      SMSMessage::decode(pdu,
-                         !(status == SMSStoreEntry::StoredUnsent ||
-                           status == SMSStoreEntry::StoredSent),
-                         _at.getptr()));
-  }
-}
-
-void SMSStore::readEntry(int index, CBMessageRef &message)
-  throw(GsmException)
-{
-  // select SMS store
-  _meTa.setSMSStore(_storeName, 1);
-
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "*** Reading CB entry " << index << endl;
-#endif // NDEBUG
-
-  string pdu;
-  Ref<Parser> p;
-  try
-  {
-    // this is just one row splitted in two part
-    // (msvc6 fail with internal compiler error)
-    string s = _at->chat("+CMGR=" + intToStr(index + 1), "+CMGR:",
-                         pdu, false, true, true);
-    p = new Parser(s);
-  }
-  catch (GsmException &ge)
-  {
-    if (ge.getErrorCode() != SMS_INVALID_MEMORY_INDEX)
-      throw ge;
-    else
-    {
-      message = CBMessageRef();
-      return;
-    }
-  }
-
-  if (pdu.length() == 0)
-    message = CBMessageRef();
-  else
-    message = CBMessageRef(new CBMessage(pdu));
-}
-
-void SMSStore::writeEntry(int &index, SMSMessageRef message)
-  throw(GsmException)
-{
-  // select SMS store
-  _meTa.setSMSStore(_storeName, 2);
-
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "*** Writing SMS entry " << index << endl;
-#endif
-  
-  // compute length of pdu
-  string pdu = message->encode();
-
-  // set message status to "RECEIVED READ" for SMS_DELIVER, SMS_STATUS_REPORT
-  string statusString;
-
-  // Normally the ",1" sets the message status to "REC READ" (received read)
-  // which is appropriate for all non-submit messages
-  // Motorola Timeport 260 does not like this code, though
-  // DELIVER messages are magically recognized anyway
-  if (message->messageType() != SMSMessage::SMS_SUBMIT &&
-      ! _at->getMeTa().getCapabilities()._wrongSMSStatusCode)
-    statusString = ",1";
-
-  Parser p(_at->sendPdu("+CMGW=" +
-                        intToStr(pdu.length() / 2 -
-                                 message->getSCAddressLen()) + statusString,
-                        "+CMGW:", pdu));
-  index = p.parseInt() - 1;
-}
-
-void SMSStore::eraseEntry(int index) throw(GsmException)
-{
-  // Select SMS store
-  _meTa.setSMSStore(_storeName, 1);
-
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "*** Erasing SMS entry " << index << endl;
-#endif
-  
-  _at->chat("+CMGD=" + intToStr(index + 1));
-}
-
-unsigned char SMSStore::send(int index, Ref<SMSMessage> &ackPdu)
- throw(GsmException)
-{
-  Parser p(_at->chat("+CMSS=" + intToStr(index + 1), "+CMSS:"));
-  unsigned char messageReference = p.parseInt();
-
-  if (p.parseComma(true))
-  {
-    string pdu = p.parseEol();
-
-    // add missing service centre address if required by ME
-    if (! _at->getMeTa().getCapabilities()._hasSMSSCAprefix)
-      pdu = "00" + pdu;
-
-    ackPdu = SMSMessage::decode(pdu);
-  }
-  else
-    ackPdu = SMSMessageRef();
-
-  return messageReference;
-}
-
-int SMSStore::doInsert(SMSMessageRef message)
-  throw(GsmException)
-{
-  int index;
-  writeEntry(index, message);
-  // it is safer to force reading back the SMS from the ME
-  resizeStore(index + 1);
-  _store[index]->_cached = false;
-  return index;
-}
-
-SMSStore::SMSStore(string storeName, Ref<GsmAt> at, MeTa &meTa)
-  throw(GsmException) :
-  _storeName(storeName), _at(at), _meTa(meTa), _useCache(true)
-{
-  // select SMS store
-  Parser p(_meTa.setSMSStore(_storeName, true, true));
-  
-  p.parseInt();                 // skip number of used mems
-  p.parseComma();
-
-  resizeStore(p.parseInt());    // ignore rest of line
-}
-
-void SMSStore::resizeStore(int newSize)
-{
-  int oldSize = _store.size();
-  if (newSize > oldSize)
-  {
-    //    cout << "*** Resizing from " << oldSize << " to " << newSize << endl;
-    _store.resize(newSize);
-    
-    // initialize store entries
-    for (int i = oldSize; i < newSize; i++)
-    {
-      _store[i] = new SMSStoreEntry();
-      _store[i]->_index = i;
-      _store[i]->_cached = false;
-      _store[i]->_mySMSStore = this;
-    }
-  }
-}
-
-SMSStore::iterator SMSStore::begin()
-{
-  return SMSStoreIterator(0, this);
-}
-
-SMSStore::const_iterator SMSStore::begin() const
-{
-  return SMSStoreConstIterator(0, this);
-}
-
-SMSStore::iterator SMSStore::end()
-{
-  return SMSStoreIterator(_store.size(), this);
-}
-
-SMSStore::const_iterator SMSStore::end() const
-{
-  return SMSStoreConstIterator(_store.size(), this);
-}
-
-SMSStore::reference SMSStore::operator[](int n)
-{
-  resizeStore(n + 1);
-  return *_store[n];
-}
-
-SMSStore::const_reference SMSStore::operator[](int n) const
-{
-  const_cast<SMSStore*>(this)->resizeStore(n + 1);
-  return *_store[n];
-}
-
-SMSStore::reference SMSStore::front()
-{
-  return *_store[0];
-}
-
-SMSStore::const_reference SMSStore::front() const
-{
-  return *_store[0];
-}
-
-SMSStore::reference SMSStore::back()
-{
-  return *_store.back();
-}
-
-SMSStore::const_reference SMSStore::back() const
-{
-  return *_store.back();
-}
-
-int SMSStore::size() const throw(GsmException)
-{
-  // select SMS store
-  Parser p(_meTa.setSMSStore(_storeName, 1, true));
-  
-  return p.parseInt();  
-}
-
-SMSStore::iterator SMSStore::insert(iterator position,
-                                    const SMSStoreEntry& x)
-  throw(GsmException)
-{
-  int index = doInsert(x.message());
-  return SMSStoreIterator(index, this);
-}
-
-SMSStore::iterator SMSStore::insert(const SMSStoreEntry& x)
-  throw(GsmException)
-{
-  int index = doInsert(x.message());
-  return SMSStoreIterator(index, this);
-}
-
-void SMSStore::insert (iterator pos, int n, const SMSStoreEntry& x)
-  throw(GsmException)
-{
-  for (int i = 0; i < n; i++)
-    doInsert(x.message());
-}
-
-void SMSStore::insert (iterator pos, long n, const SMSStoreEntry& x)
-  throw(GsmException)
-{
-  for (long i = 0; i < n; i++)
-    doInsert(x.message());
-}
-
-SMSStore::iterator SMSStore::erase(iterator position)
-  throw(GsmException)
-{
-  eraseEntry(position->_index);
-  position->_cached = false;
-  return position + 1;
-}
-
-SMSStore::iterator SMSStore::erase(iterator first, iterator last)
-  throw(GsmException)
-{
-  iterator i(0, this);
-  for (i = first; i != last; ++i)
-    erase(i);
-  return i;
-}
-
-void SMSStore::clear() throw(GsmException)
-{
-  for (iterator i = begin(); i != end(); ++i)
-    erase(i);
-}
-
-SMSStore::~SMSStore()
-{
-  for (vector<SMSStoreEntry*>::iterator i = _store.begin();
-       i != _store.end(); ++i)
-    delete *i;
-}
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_store.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_store.h
deleted file mode 100644
index 59d0ec8eac..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sms_store.h
+++ /dev/null
@@ -1,295 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sms_store.h
-// *
-// * Purpose: SMS functions, SMS store
-// *          (ETSI GSM 07.05)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 20.5.1999
-// *************************************************************************
-
-#ifndef GSM_SMS_STORE_H
-#define GSM_SMS_STORE_H
-
-#include <string>
-#include <iterator>
-#include <gsmlib/gsm_at.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_sms.h>
-#include <gsmlib/gsm_cb.h>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // forward declarations
-  class SMSStore;
-  class MeTa;
-
-  // a single entry in the SMS store
-
-  class SMSStoreEntry : public RefBase
-  {
-  public:
-    // status in ME memory
-    enum SMSMemoryStatus {ReceivedUnread = 0, ReceivedRead = 1,
-                          StoredUnsent = 2, StoredSent = 3,
-                          All = 4, Unknown = 5};
-
-  private:
-    SMSMessageRef _message;
-    SMSMemoryStatus _status;
-    bool _cached;
-    SMSStore *_mySMSStore;
-    int _index;
-
-  public:
-    // this constructor is only used by SMSStore
-    SMSStoreEntry();
-
-    // create new entry given a SMS message
-    SMSStoreEntry(SMSMessageRef message) :
-      _message(message), _status(Unknown), _cached(true), _mySMSStore(NULL),
-      _index(0) {}
-
-    // create new entry given a SMS message and an index
-    // only to be used for file-based stores (see gsm_sorted_sms_store)
-    SMSStoreEntry(SMSMessageRef message, int index) :
-      _message(message), _status(Unknown), _cached(true), _mySMSStore(NULL),
-      _index(index) {}
-   
-    // clear cached flag
-    void clearCached() { _cached = false; }
-
-    // return SMS message stored in the entry
-    SMSMessageRef message() const throw(GsmException);
-
-    // return CB message stored in the entry
-    CBMessageRef cbMessage() const throw(GsmException);
-
-    // return message status in store
-    SMSMemoryStatus status() const throw(GsmException);
-
-    // return true if empty, ie. no SMS in this entry
-    bool empty() const throw(GsmException);
-
-    // send this PDU from store
-    // returns message reference and ACK-PDU (if requested)
-    // only applicate to SMS-SUBMIT and SMS-COMMAND
-    unsigned char send(Ref<SMSMessage> &ackPdu) throw(GsmException);
-    
-    // same as above, but ACK-PDU is discarded
-    unsigned char send() throw(GsmException);
-
-    // return index (guaranteed to be unique,
-    // can be used for identification in store)
-    int index() const {return _index;}
-
-    // return true if entry is cached (and caching is enabled)
-    bool cached() const;
-
-    // return deep copy of this entry
-    Ref<SMSStoreEntry> clone();
-
-    // equality operator
-    bool operator==(const SMSStoreEntry &e) const;
-
-    // return store reference
-    SMSStore *getStore() {return _mySMSStore;}
-
-    // copy constructor and assignment
-    SMSStoreEntry(const SMSStoreEntry &e);
-    SMSStoreEntry &operator=(const SMSStoreEntry &e);
-
-    friend class SMSStore;
-  };
-
-  // iterator for the SMSStore class
-
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
-  class SMSStoreIterator : public random_access_iterator<SMSStoreEntry,
-                           int>
-#else
-  class SMSStoreIterator : public iterator<random_access_iterator_tag,
-                           SMSStoreEntry, int>
-#endif
-  {
-    int _index;
-    SMSStore *_store;
-
-    SMSStoreIterator(int index, SMSStore *store) :
-      _index(index), _store(store) {}
-
-  public:
-    SMSStoreIterator(SMSStoreEntry *entry) :
-      _index(entry->index()), _store(entry->getStore()) {}
-
-    SMSStoreEntry &operator*();
-    SMSStoreEntry *operator->();
-    SMSStoreIterator &operator+(int i)
-      {_index += i; return *this;}
-    operator SMSStoreEntry*();
-    SMSStoreIterator &operator=(const SMSStoreIterator &i);
-    SMSStoreIterator &operator++()
-      {++_index; return *this;}
-    SMSStoreIterator &operator--()
-      {--_index; return *this;}
-    SMSStoreIterator &operator++(int i)
-      {_index += i; return *this;}
-    SMSStoreIterator &operator--(int i)
-      {_index -= i; return *this;}
-    bool operator<(SMSStoreIterator &i)
-      {return _index < i._index;}
-    bool operator==(const SMSStoreIterator &i) const
-      {return _index == i._index;}
-    bool operator!=(const SMSStoreIterator &i) const
-      {return _index != i._index;}
-
-    friend class SMSStore;
-  };
-
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
-  class SMSStoreConstIterator : public random_access_iterator<SMSStoreEntry,
-                                int>
-#else
-  class SMSStoreConstIterator : public iterator<random_access_iterator_tag,
-                                SMSStoreEntry, int>
-#endif
-  {
-    int _index;
-    const SMSStore *_store;
-
-    SMSStoreConstIterator(int index, const SMSStore *store) :
-      _index(index), _store(store) {}
-
-  public:
-    const SMSStoreEntry &operator*();
-    const SMSStoreEntry *operator->();
-    SMSStoreConstIterator &operator++()
-      {++_index; return *this;}
-    SMSStoreConstIterator &operator--()
-      {--_index; return *this;}
-    SMSStoreConstIterator &operator++(int i)
-      {_index += i; return *this;}
-    SMSStoreConstIterator &operator--(int i)
-      {_index -= i; return *this;}
-    bool operator<(SMSStoreConstIterator &i)
-      {return _index < i._index;}
-    bool operator==(const SMSStoreConstIterator &i) const
-      {return _index == i._index;}
-
-    friend class SMSStore;
-  };
-
-  // this class corresponds to a SMS store in the ME
-  // all functions directly update storage in the ME
-  // if the ME is exchanged, the storage may become corrupted because
-  // of internal buffering in the SMSStore class
-
-  class SMSStore : public RefBase, public NoCopy
-  {
-  private:
-    vector<SMSStoreEntry*> _store; // vector of store entries
-    string _storeName;          // name of the store, 2-byte like "SM"
-    Ref<GsmAt> _at;             // my GsmAt class
-    MeTa &_meTa;                // my MeTa class
-    bool _useCache;             // true if entries should be cached
-
-    // internal access functions
-    // read/write entry from/to ME
-    void readEntry(int index, SMSMessageRef &message,
-                   SMSStoreEntry::SMSMemoryStatus &status) throw(GsmException);
-    void readEntry(int index, CBMessageRef &message) throw(GsmException);
-    void writeEntry(int &index, SMSMessageRef message)
-      throw(GsmException);
-    // erase entry
-    void eraseEntry(int index) throw(GsmException);
-    // send PDU index from store
-    // returns message reference and ACK-PDU (if requested)
-    // only applicate to SMS-SUBMIT and SMS-COMMAND
-    unsigned char send(int index, Ref<SMSMessage> &ackPdu) throw(GsmException);
-    
-
-    // do the actual insertion, return index of new element
-    int doInsert(SMSMessageRef message) throw(GsmException);
-
-    // used by class MeTa
-    SMSStore(string storeName, Ref<GsmAt> at, MeTa &meTa) throw(GsmException);
-
-    // resize store entry vector if necessary
-    void resizeStore(int newSize);
-
-  public:
-    // iterator defs
-    typedef SMSStoreIterator iterator;
-    typedef SMSStoreConstIterator const_iterator;
-    typedef SMSStoreEntry &reference;
-    typedef const SMSStoreEntry &const_reference;
-
-    // set cache mode on or off
-    void setCaching(bool useCache) {_useCache = useCache;}
-
-    // return name of this store (2-character string)
-    string name() const {return _storeName;}
-
-    // SMS store traversal commands
-    // these are suitable to use stdc++ lib algorithms and iterators
-    // ME have fixed storage space implemented as memory slots
-    // that may either be empty or used
-    
-    // traversal commands
-    iterator begin();
-    const_iterator begin() const;
-    iterator end();
-    const_iterator end() const;
-    reference front();
-    const_reference front() const;
-    reference back();
-    const_reference back() const;
-    reference operator[](int n);
-    const_reference operator[](int n) const;
-
-    // The size macros return the number of used entries
-    // Warning: indices may be _larger_ than size() because of this
-    // (perhaps this should be changed, because it is unexpected behavior)
-
-    int size() const throw(GsmException);
-    int max_size() const {return _store.size();}
-    int capacity() const {return _store.size();}
-    bool empty() const throw(GsmException) {return size() == 0;}
-
-    // insert iterators insert into the first empty cell regardless of position
-    // existing iterators may be invalidated after an insert operation
-    // return position
-    // insert only writes to available positions
-    // warning: insert fails silently if size() == max_size()
-    iterator insert(iterator position, const SMSStoreEntry& x)
-      throw(GsmException);
-    iterator insert(const SMSStoreEntry& x) throw(GsmException);
-
-    // insert n times, same procedure as above
-    void insert (iterator pos, int n, const SMSStoreEntry& x)
-      throw(GsmException);
-    void insert (iterator pos, long n, const SMSStoreEntry& x)
-      throw(GsmException);
-
-    // erase operators set used slots to "empty"
-    iterator erase(iterator position) throw(GsmException);
-    iterator erase(iterator first, iterator last) throw(GsmException);
-    void clear() throw(GsmException);
-
-    // destructor
-    ~SMSStore();
-
-    friend class SMSStoreEntry;
-    friend class MeTa;
-  };
-
-  typedef Ref<SMSStore> SMSStoreRef;
-
-};
-
-#endif // GSM_SMS_STORE_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook.cc
deleted file mode 100644
index e1b265c3f7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook.cc
+++ /dev/null
@@ -1,503 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sorted_phonebook.cc
-// *
-// * Purpose: Alphabetically sorted phonebook
-// *          (residing in files or in the ME)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 25.6.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_sorted_phonebook.h>
-#include <gsmlib/gsm_nls.h>
-#include <iostream>
-#include <fstream>
-#include <limits.h>
-#include <cstring>
-
-const int MAX_LINE_SIZE = 1000;
-
-using namespace std;
-using namespace gsmlib;
-
-string SortedPhonebook::escapeString(string s)
-{
-  string result;
-  
-  for (const char *pp = s.c_str(); *pp != 0; ++pp)
-  {
-    if (*pp == CR)
-      result += "\\r";
-    else if (*pp == LF)
-      result += "\\n";
-    else if (*pp == '\\')
-      result += "\\\\";
-    else if (*pp == '|')
-      result += "\\|";
-    else
-      result += *pp;
-  }
-  return result;
-}
-
-string SortedPhonebook::unescapeString(char *line, unsigned int &pos)
-{
-  string result;
-  bool escaped = false;
-
-  while (! (line[pos] == '|' && ! escaped) && line[pos] != 0 &&
-         line[pos] != CR && line[pos] != LF)
-  {
-    if (escaped)
-    {
-      escaped = false;
-      if (line[pos] == 'r')
-        result += CR;
-      else if (line[pos] == 'n')
-        result += LF;
-      else if (line[pos] == '\\')
-        result += '\\';
-      else if (line[pos] == '|')
-        result += '|';
-      else
-        result += line[pos];
-    }
-    else
-      if (line[pos] == '\\')
-        escaped = true;
-      else
-        result += line[pos];
-
-    ++pos;
-  }
-  return result;
-}
-
-void SortedPhonebook::readPhonebookFile(istream &pbs, string filename)
-  throw(GsmException)
-{
-  // read entries
-  while (! pbs.eof())
-  {
-    char line[MAX_LINE_SIZE];
-    pbs.getline(line, MAX_LINE_SIZE);
-
-    if (strlen(line) == 0)
-      continue;                 // skip empty lines
-
-    if (pbs.bad())
-      throw GsmException(stringPrintf(_("error reading from file '%s"),
-                                      filename.c_str()),
-                         OSError);
-
-    // convert line to newEntry (line format : [index] '|' text '|' number
-    string text, telephone;
-    unsigned int pos = 0;
-
-    // parse index
-    string indexS = unescapeString(line, pos);
-    int index = -1;
-    if (indexS.length() == 0)
-    {
-      if (_useIndices)
-        throw GsmException(stringPrintf(_("entry '%s' lacks index"), line),
-                           ParserError);
-    }
-    else
-    {
-      index = checkNumber(indexS);
-      _useIndices = true;
-    }
-    if (line[pos++] != '|')
-      throw GsmException(stringPrintf(_("line '%s' has invalid format"), line),
-                         ParserError);
-
-    // parse text
-    text = unescapeString(line, pos);
-    if (line[pos++] != '|')
-      throw GsmException(stringPrintf(_("line '%s' has invalid format"), line),
-                         ParserError);
-
-    // parse telephone number
-    telephone = unescapeString(line, pos);
-
-    insert(PhonebookEntryBase(telephone, text, index));
-  }
-}
-
-void SortedPhonebook::sync(bool fromDestructor) throw(GsmException)
-{
-  // if not in file it already is stored in ME/TA
-  if (! _fromFile) return;
-
-  // if writing to stdout and not called from destructor ignore
-  // (avoids writing to stdout multiple times)
-  if (_filename == "" && ! fromDestructor) return;
-
-  // find out if any of the entries have been updated
-  if (! _changed)    // only look if we're not writing the file anyway
-    for (iterator i = begin(); i != end(); i++)
-      if (i->changed())
-      {
-        _changed = true;
-        break;
-      }
-
-  if (_changed)
-  {
-    checkReadonly();
-    // create backup file - but only once
-    if (! _madeBackupFile && _filename != "") // don't make backup of stdout
-    {
-      renameToBackupFile(_filename);
-      _madeBackupFile = true;
-    }
-
-    // open stream
-    ostream *pbs = NULL;
-    try
-    {
-      if (_filename == "")
-        pbs = &cout;
-      else
-        pbs = new ofstream(_filename.c_str());
-      
-      if (pbs->bad())
-        throw GsmException(
-          stringPrintf(_("error opening file '%s' for writing"),
-                       (_filename == "" ? _("<STDOUT>") :
-                        _filename.c_str())),
-          OSError);
-    
-      // and write the entries
-      for (PhonebookMap::iterator i = _sortedPhonebook.begin();
-           i != _sortedPhonebook.end(); ++i)
-      {
-        // convert entry to output line
-        string line =
-          (_useIndices ? intToStr(i->second->index()) : "") + "|" +
-          escapeString(i->second->text()) + "|" +
-          escapeString(i->second->telephone());
-      
-        // write out the line
-        *pbs << line << endl;
-        if (pbs->bad())
-          throw GsmException(
-            stringPrintf(_("error writing to file '%s'"),
-                         (_filename == "" ? _("<STDOUT>") :
-                          _filename.c_str())),
-            OSError);
-      }
-    }
-    catch(GsmException &e)
-    {
-      if (pbs != &cout) delete pbs;
-      throw;
-    }
-    // close file
-    if (pbs != &cout) delete pbs;
-
-    // reset all changed states
-    _changed = false;
-    for (iterator j = begin(); j != end(); j++)
-      j->resetChanged();
-  }
-}
-
-void SortedPhonebook::checkReadonly() throw(GsmException)
-{
-  if (_readonly) throw GsmException(
-    _("attempt to change phonebook read from <STDIN>"),
-    ParameterError);
-}
-
-SortedPhonebook::SortedPhonebook(string filename, bool useIndices)
-  throw(GsmException) :
-  _changed(false), _fromFile(true), _madeBackupFile(false),
-  _sortOrder(ByIndex), _useIndices(useIndices), _readonly(false),
-  _filename(filename)
-{
-  // open the file
-  ifstream pbs(filename.c_str());
-  if (pbs.bad())
-    throw GsmException(stringPrintf(_("cannot open file '%s'"),
-                                    filename.c_str()),
-                       OSError);
-  // and read the file
-  readPhonebookFile(pbs, filename);
-}
-
-SortedPhonebook::SortedPhonebook(bool fromStdin, bool useIndices)
-  throw(GsmException) :
-  _changed(false), _fromFile(true), _madeBackupFile(false),
-  _sortOrder(ByIndex), _useIndices(useIndices), _readonly(fromStdin)
-  // _filename is "" - this means stdout
-{
-  // read from stdin
-  if (fromStdin)
-    readPhonebookFile(cin, (string)_("<STDIN>"));
-}
-
-SortedPhonebook::SortedPhonebook(PhonebookRef mePhonebook)
-  throw(GsmException) :
-  _changed(false), _fromFile(false), _madeBackupFile(false),
-  _sortOrder(ByIndex), _readonly(false), _mePhonebook(mePhonebook)
-{
-  int entriesRead = 0;
-  reportProgress(0, _mePhonebook->end() - _mePhonebook->begin());
-
-  for (Phonebook::iterator i = _mePhonebook->begin();
-       i != _mePhonebook->end(); ++i)
-  {
-    if (! i->empty())
-    {
-      _sortedPhonebook.insert(
-        PhonebookMap::value_type(PhoneMapKey(*this, lowercase(i->text())), i));
-      ++entriesRead;
-      if (entriesRead == _mePhonebook->size())
-        return;                 // ready
-    }
-    reportProgress(i - _mePhonebook->begin());
-  }
-}
-
-void SortedPhonebook::setSortOrder(SortOrder newOrder)
-{
-  if (newOrder == _sortOrder) return; // nothing to do
-
-  PhonebookMap savedPhonebook = _sortedPhonebook; // save phonebook
-  _sortedPhonebook = PhonebookMap(); // empty old phonebook
-  _sortOrder = newOrder;
-
-  // re-insert entries
-  switch (newOrder)
-  {
-  case ByTelephone:
-  {
-    for (PhonebookMap::iterator i = savedPhonebook.begin();
-         i != savedPhonebook.end(); ++i)
-      _sortedPhonebook.
-        insert(PhonebookMap::value_type(
-          PhoneMapKey(*this, lowercase(i->second->telephone())), i->second));
-    break;
-  }
-  case ByText:
-  {
-    for (PhonebookMap::iterator i = savedPhonebook.begin();
-         i != savedPhonebook.end(); ++i)
-      _sortedPhonebook.
-        insert(PhonebookMap::value_type(
-          PhoneMapKey(*this, lowercase(i->second->text())), i->second));
-    break;
-  }
-  case ByIndex:
-  {
-    for (PhonebookMap::iterator i = savedPhonebook.begin();
-         i != savedPhonebook.end(); ++i)
-      _sortedPhonebook.
-        insert(PhonebookMap::value_type(
-          PhoneMapKey(*this, i->second->index()), i->second));
-    break;
-  }
-  default:
-    assert(0);
-    break;
-  }
-}
-
-unsigned int SortedPhonebook::getMaxTelephoneLen() const
-{
-  if (_fromFile)
-    return UINT_MAX;
-  else
-    return _mePhonebook->getMaxTelephoneLen();
-}
-
-unsigned int SortedPhonebook::getMaxTextLen() const
-{
-  if (_fromFile)
-    return UINT_MAX;
-  else
-    return _mePhonebook->getMaxTextLen();
-}
-
-int SortedPhonebook::max_size() const
-{
-  if (_fromFile)
-    return _sortedPhonebook.max_size();
-  else
-    return _mePhonebook->max_size();
-}
-
-int SortedPhonebook::capacity() const
-{
-  if (_fromFile)
-    return _sortedPhonebook.max_size();
-  else
-    return _mePhonebook->capacity();
-}
-
-SortedPhonebook::iterator
-SortedPhonebook::insert(const PhonebookEntryBase& x) throw(GsmException)
-{
-  checkReadonly();
-  _changed = true;
-  PhonebookEntryBase *newEntry;
-
-  if (_fromFile)
-    if (_useIndices)
-    {
-      if (x.index() != -1)      // check that index is unique
-      {
-        for (PhonebookMap::iterator i = _sortedPhonebook.begin();
-             i != _sortedPhonebook.end(); ++i)
-          if (i->second->index() == x.index())
-            throw GsmException(_("indices must be unique in phonebook"),
-                               ParameterError);
-        newEntry = new PhonebookEntryBase(x);
-      }
-      else                      // set index
-      {
-        SortOrder saveSortOrder = _sortOrder;
-        setSortOrder(ByIndex);
-        int index = 0;
-        for (PhonebookMap::iterator i = _sortedPhonebook.begin();
-             i != _sortedPhonebook.end(); ++i, ++index)
-          if (i->second->index() != index)
-            break;
-        setSortOrder(saveSortOrder);
-        newEntry = new PhonebookEntryBase();
-        newEntry->set(x.telephone(), x.text(), index, true);
-      }
-    }
-    else                        // index info in x is ignored
-      newEntry = new PhonebookEntryBase(x);
-  else
-  {
-    PhonebookEntry newMEEntry(x);
-    newEntry = _mePhonebook->insert((PhonebookEntry*)NULL, newMEEntry);
-  }
-  switch (_sortOrder)
-  {
-  case ByTelephone:
-    return
-      _sortedPhonebook.
-      insert(PhonebookMap::value_type(
-        PhoneMapKey(*this, lowercase(newEntry->telephone())), newEntry));
-  case ByText:
-    return
-      _sortedPhonebook.
-      insert(PhonebookMap::value_type(
-        PhoneMapKey(*this, lowercase(newEntry->text())), newEntry));
-  case ByIndex:
-    return
-      _sortedPhonebook.
-      insert(PhonebookMap::value_type(
-        PhoneMapKey(*this, newEntry->index()), newEntry));
-  default:
-    assert(0);
-    break;
-  }
-  return SortedPhonebook::iterator();
-}
-
-SortedPhonebook::iterator
-SortedPhonebook::insert(iterator position, const PhonebookEntryBase& x)
-  throw(GsmException)
-{
-  return insert(x);
-}
-
-SortedPhonebook::size_type SortedPhonebook::erase(string &key)
-  throw(GsmException)
-{
-  // deallocate memory or remove from underlying ME phonebook
-  for (PhonebookMap::iterator i =
-         _sortedPhonebook.find(PhoneMapKey(*this, lowercase(key)));
-       i != _sortedPhonebook.end() &&
-         i->first == PhoneMapKey(*this, lowercase(key));
-       ++i)
-  {
-    checkReadonly();
-    _changed = true;
-    if (_fromFile)
-      delete i->second;
-    else
-      _mePhonebook->erase((Phonebook::iterator)i->second);
-  }
-
-  return _sortedPhonebook.erase(PhoneMapKey(*this, lowercase(key)));
-}
-
-SortedPhonebook::size_type SortedPhonebook::erase(int key)
-  throw(GsmException)
-{
-  // deallocate memory or remove from underlying ME phonebook
-  for (PhonebookMap::iterator i =
-         _sortedPhonebook.find(PhoneMapKey(*this, key));
-       i != _sortedPhonebook.end() && i->first == PhoneMapKey(*this, key);
-       ++i)
-  {
-    checkReadonly();
-    _changed = true;
-    if (_fromFile)
-      delete i->second;
-    else
-      _mePhonebook->erase((Phonebook::iterator)i->second);
-  }
-
-  return _sortedPhonebook.erase(PhoneMapKey(*this, key));
-}
-
-void SortedPhonebook::erase(iterator position)
-  throw(GsmException)
-{
-  checkReadonly();
-  _changed = true;
-  // deallocate memory or remove from underlying ME phonebook
-  if (_fromFile)
-    delete ((PhonebookMap::iterator)position)->second;
-  else
-    _mePhonebook->erase((Phonebook::iterator)
-                        ((PhonebookMap::iterator)position)->second);
-  _sortedPhonebook.erase(position);
-}
-
-void SortedPhonebook::erase(iterator first, iterator last)
-  throw(GsmException)
-{
-  checkReadonly();
-  _changed = true;
-  for (PhonebookMap::iterator i = first; i != last; ++i)
-    if (_fromFile)
-      delete i->second;
-    else
-      _mePhonebook->erase((Phonebook::iterator)i->second);
-  _sortedPhonebook.erase(first, last);
-}
-
-void SortedPhonebook::clear() throw(GsmException)
-{
-  checkReadonly();
-  _changed = true;
-  for (iterator i = begin(); i != end(); i++)
-    erase(i);
-}
-
-SortedPhonebook::~SortedPhonebook()
-{
-  if (_fromFile)
-  {
-    sync(true);
-    for (PhonebookMap::iterator i = _sortedPhonebook.begin();
-         i != _sortedPhonebook.end(); ++i)
-      delete i->second;
-  }
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook.h
deleted file mode 100644
index c0d3b787fe..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sorted_phonebook.h
-// *
-// * Purpose: Alphabetically sorted phonebook
-// *          (residing in files or in the ME)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 25.6.1999
-// *************************************************************************
-
-#ifndef GSM_SORTED_PHONEBOOK_H
-#define GSM_SORTED_PHONEBOOK_H
-
-#include <gsmlib/gsm_sorted_phonebook_base.h>
-#include <gsmlib/gsm_phonebook.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_map_key.h>
-#include <string>
-#include <map>
-#include <fstream>
-
-using namespace std;
-
-namespace gsmlib
-{
-
-  // The class SortedPhonebook makes the phonebook more manageable:
-  // - empty slots in the ME phonebook are hidden by the API
-  // - the class transparently handles phonebooks that reside in files
-
-  class SortedPhonebook : public SortedPhonebookBase
-  {
-  private:
-    bool _changed;              // true if file has changed after last save
-    bool _fromFile;             // true if phonebook read from file
-    bool _madeBackupFile;       // true if backup file was created
-    SortOrder _sortOrder;       // sort order for the phonebook
-    bool _useIndices;           // if phonebook from file: input file had
-                                // indices; will write indices, too
-    bool _readonly;             // =true if read from stdin
-    string _filename;           // name of the file if phonebook from file
-    PhonebookMap _sortedPhonebook; // phonebook from file
-    PhonebookRef _mePhonebook;  // phonebook if from ME
-
-    // convert CR and LF in string to "\r" and "\n" respectively
-    string escapeString(string s);
-
-    // convert "\r" and "\n" to CR and LF respectively
-    // start parsing with pos, stop when CR, LF, 0, or '|' is encountered
-    string unescapeString(char *line, unsigned int &pos);
-
-    // initial read of phonebook file
-    void readPhonebookFile(istream &pbs, string filename) throw(GsmException);
-
-    // synchronize SortedPhonebook with file (no action if in ME)
-    void sync(bool fromDestructor) throw(GsmException);
-    
-    // throw an exception if _readonly is set
-    void checkReadonly() throw(GsmException);
-
-  public:
-    // iterator defs
-    typedef SortedPhonebookIterator iterator;
-    typedef PhonebookMap::size_type size_type;
-
-    // constructor for file-based phonebook
-    // expect indices in file if useIndices == true
-    // read from file
-    SortedPhonebook(string filename, bool useIndices)
-      throw(GsmException);
-    // read from stdin or start empty and write to stdout
-    SortedPhonebook(bool fromStdin, bool useIndices)
-      throw(GsmException);
-
-    // constructor for ME-based phonebook
-    SortedPhonebook(PhonebookRef mePhonebook) throw(GsmException);
-
-    // return maximum telephone number length
-    unsigned int getMaxTelephoneLen() const;
-
-    // return maximum entry description length
-    unsigned int getMaxTextLen() const;
-
-    // handle sorting
-    void setSortOrder(SortOrder newOrder);
-    SortOrder sortOrder() const {return _sortOrder;}
-    
-    // phonebook traversal commands
-    // these are suitable to use stdc++ lib algorithms and iterators
-    // ME have fixed storage space implemented as memory slots
-    // that may either be empty or used
-    
-    // traversal commands
-    iterator begin() {return _sortedPhonebook.begin();}
-    iterator end() {return _sortedPhonebook.end();}
-
-    // the size macros return the number of used entries
-    int size() const {return _sortedPhonebook.size();}
-    int max_size() const;
-    int capacity() const;
-    bool empty() const throw(GsmException) {return size() == 0;}
-
-    // existing iterators remain valid after an insert or erase operation
-    // note: inserting many entries in indexed mode is inefficient
-    // if the sort order is not set to indexed before
-
-    // return position
-    // insert only writes to available positions
-    // warning: insert fails silently if size() == max_size()
-    iterator insert(const PhonebookEntryBase& x) throw(GsmException);
-    iterator insert(iterator position, const PhonebookEntryBase& x)
-      throw(GsmException);
-
-    PhonebookMap::size_type count(string &key)
-      {return _sortedPhonebook.count(PhoneMapKey(*this, lowercase(key)));}
-    iterator find(string &key)
-      {return _sortedPhonebook.find(PhoneMapKey(*this, lowercase(key)));}
-    iterator lower_bound(string &key)
-      {return _sortedPhonebook.lower_bound(PhoneMapKey(*this,
-                                                       lowercase(key)));}
-    iterator upper_bound(string &key)
-      {return _sortedPhonebook.upper_bound(PhoneMapKey(*this,
-                                                       lowercase(key)));}
-    pair<iterator, iterator> equal_range(string &key)
-      {return _sortedPhonebook.equal_range(PhoneMapKey(*this,
-                                                       lowercase(key)));}
-
-    PhonebookMap::size_type count(int key)
-      {return _sortedPhonebook.count(PhoneMapKey(*this, key));}
-    iterator find(int key)
-      {return _sortedPhonebook.find(PhoneMapKey(*this, key));}
-    iterator lower_bound(int key)
-      {return _sortedPhonebook.lower_bound(PhoneMapKey(*this, key));}
-    iterator upper_bound(int key)
-      {return _sortedPhonebook.upper_bound(PhoneMapKey(*this, key));}
-    pair<iterator, iterator> equal_range(int key)
-      {return _sortedPhonebook.equal_range(PhoneMapKey(*this, key));}
-
-    size_type erase(string &key) throw(GsmException);
-    size_type erase(int key) throw(GsmException);
-    void erase(iterator position) throw(GsmException);
-    void erase(iterator first, iterator last) throw(GsmException);
-    void clear() throw(GsmException);
-
-    // synchronize SortedPhonebook with file (no action if in ME)
-    void sync() throw(GsmException) {sync(false);}
-    
-    // destructor
-    // writes back change to file if phonebook is in file
-    virtual ~SortedPhonebook();
-  };
-
-  //  typedef Ref<SortedPhonebook> SortedPhonebookRef;
-};
-
-#endif // GSM_SORTED_PHONEBOOK_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook_base.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook_base.cc
deleted file mode 100644
index 1061dc60b9..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook_base.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sorted_phonebook_base.cc
-// *
-// * Purpose: Virtual base class for alphabetically sorted phonebook
-// *          The infrastructure in this module allows custom backends for
-// *          storing phonebook entries to be integrated into gsmlib
-// *          (eg. LDAP- or RDBMS-based phonebook stores).
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 5.6.2000
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_sorted_phonebook_base.h>
-#include <gsmlib/gsm_error.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_nls.h>
-
-#include <assert.h>
-
-using namespace std;
-using namespace gsmlib;
-
-// PhonebookEntryBase members
-
-void PhonebookEntryBase::set(string telephone, string text, int index,
-                             bool useIndex)
-  throw(GsmException)
-{
-  checkTextAndTelephone(text, telephone);
-
-  _changed = true;
-  _telephone = telephone;
-  _text = text;
-  _useIndex = useIndex;
-  if (index != -1)
-    _index = index;
-}
-
-bool PhonebookEntryBase::operator==(const PhonebookEntryBase &e) const
-{
-  assert(! ((_useIndex || e._useIndex) &&
-            (_index == -1 || e._index == -1)));
-  return _telephone == e._telephone && _text == e._text &&
-    (! (_useIndex || e._useIndex) || _index == e._index);
-}
-
-string PhonebookEntryBase::text() const throw(GsmException)
-{
-  return _text;
-}
-
-string PhonebookEntryBase::telephone() const throw(GsmException)
-{
-  return _telephone;
-}
-
-bool PhonebookEntryBase::empty() const throw(GsmException)
-{
-  return (text() == "") && (telephone() == "");
-}
-
-Ref<PhonebookEntryBase> PhonebookEntryBase::clone()
-{
-  Ref<PhonebookEntryBase> result = new PhonebookEntryBase(*this);
-  return result;
-}
-
-PhonebookEntryBase::PhonebookEntryBase(const PhonebookEntryBase &e)
-  throw(GsmException)
-{
-  set(e._telephone, e._text, e._index, e._useIndex);
-}
-
-PhonebookEntryBase &PhonebookEntryBase::operator=(const PhonebookEntryBase &e)
-  throw(GsmException)
-{
-  set(e._telephone, e._text, e._index, e._useIndex);
-  return *this;
-}
-
-// CustomPhonebookRegistry members
-
-map<string, CustomPhonebookFactory*>
-*CustomPhonebookRegistry::_factoryList = NULL;
-
-void CustomPhonebookRegistry::
-registerCustomPhonebookFactory(string backendName,
-                               CustomPhonebookFactory *factory)
-  throw(GsmException)
-{
-  if (_factoryList == NULL)
-    _factoryList = new map<string, CustomPhonebookFactory*>;
-  backendName = lowercase(backendName);
-  if (_factoryList->find(backendName) != _factoryList->end())
-    throw GsmException(stringPrintf(_("backend '%s' already registered"),
-                                    backendName.c_str()), ParameterError);
-}
-      
-SortedPhonebookRef CustomPhonebookRegistry::
-createPhonebook(string backendName, string source) throw(GsmException)
-{
-  if (_factoryList == NULL)
-    _factoryList = new map<string, CustomPhonebookFactory*>;
-  backendName = lowercase(backendName);
-  if (_factoryList->find(backendName) == _factoryList->end())
-    throw GsmException(stringPrintf(_("backend '%s' not registered"),
-                                    backendName.c_str()), ParameterError);
-  return (*_factoryList)[backendName]->createPhonebook(source);
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook_base.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook_base.h
deleted file mode 100644
index 166f81f45a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_phonebook_base.h
+++ /dev/null
@@ -1,220 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sorted_phonebook_base.h
-// *
-// * Purpose: Virtual base class for alphabetically sorted phonebook
-// *          The infrastructure in this module allows custom backends for
-// *          storing phonebook entries to be integrated into gsmlib
-// *          (eg. LDAP- or RDBMS-based phonebook stores).
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 5.6.2000
-// *************************************************************************
-
-#ifndef GSM_SORTED_PHONEBOOK_BASE_H
-#define GSM_SORTED_PHONEBOOK_BASE_H
-
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_map_key.h>
-#include <string>
-#include <map>
-#include <fstream>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // a single entry in a phonebook
-
-  class PhonebookEntryBase : public RefBase
-  {
-  protected:
-    bool _changed;              // set to true if _telephone or _text changed
-    string _telephone;
-    string _text;
-    int _index;                 // my position in the phonebook
-                                // == -1 if not used (can only happen if
-                                // phonebook is read from file)
-    bool _useIndex;             // compare indices in operator==,
-                                // use _index for inserting into
-                                // Phonebook
-
-  public:
-    PhonebookEntryBase() :
-      _changed(false), _index(-1), _useIndex(false) {}
-
-    // convenience constructor
-    PhonebookEntryBase(string telephone, string text, int index = -1) :
-      _changed(false), _telephone(telephone), _text(text),
-      _index(index), _useIndex(false) {}
-
-    // accessor functions
-    virtual void set(string telephone, string text, int index = -1,
-                     bool useIndex = false)
-      throw(GsmException);
-    virtual string text() const throw(GsmException);
-    virtual string telephone() const throw(GsmException);
-
-    // return true if both telephone and text are empty
-    bool empty() const throw(GsmException);
-
-    // set to true if operator== should compare the _index as well
-    void setUseIndex(bool useIndex)
-      {_useIndex = useIndex;}
-    bool useIndex() const {return _useIndex;}
-    
-    // equality operator
-    // if one of the operands has _useIndex == true
-    // takes _index and e._index into account
-    bool operator==(const PhonebookEntryBase &e) const;
-
-    // return index
-    int index() const {return _index;}
-
-    // return true if entry changed
-    bool changed() const {return _changed;}
-
-    // reset the changed status (ie. if synced to file)
-    void resetChanged() {_changed = false;}
-
-    // return deep copy of this entry
-    virtual Ref<PhonebookEntryBase> clone();
-    
-    PhonebookEntryBase(const PhonebookEntryBase &e) throw(GsmException);
-    PhonebookEntryBase &operator=(const PhonebookEntryBase &e)
-      throw(GsmException);
-
-    virtual ~PhonebookEntryBase() {}
-  };
-
-  // MapKey for sortedPhonebook
-  
-  class SortedPhonebookBase;
-  typedef MapKey<SortedPhonebookBase> PhoneMapKey;
-
-  // maps text or telephone to entry
-  
-  typedef multimap<PhoneMapKey, PhonebookEntryBase*> PhonebookMap;
-
-  // iterator for SortedPhonebook that hides the "second" member of the map
-  
-  typedef PhonebookMap::iterator PhonebookMapIterator;
-  class SortedPhonebookIterator : public PhonebookMapIterator
-  {
-  public:
-    SortedPhonebookIterator() {}
-    SortedPhonebookIterator(PhonebookMap::iterator i) :
-      PhonebookMapIterator(i) {}
-
-    PhonebookEntryBase &operator*()
-      {return *((PhonebookMap::iterator)*this)->second;}
-
-    PhonebookEntryBase *operator->()
-      {return ((PhonebookMap::iterator)*this)->second;}
-  };
-
-  // virtual base class for sorted phonebooks
-
-  class SortedPhonebookBase : public RefBase, public NoCopy
-  {
-  public:
-    // iterator defs
-    typedef SortedPhonebookIterator iterator;
-    typedef PhonebookMap::size_type size_type;
-
-    // return maximum telephone number length
-    virtual unsigned int getMaxTelephoneLen() const = 0;
-
-    // return maximum entry description length
-    virtual unsigned int getMaxTextLen() const = 0;
-
-    // handle sorting
-    virtual void setSortOrder(SortOrder newOrder) = 0;
-    virtual SortOrder sortOrder() const = 0;
-    
-    // phonebook traversal commands
-    // these are suitable to use stdc++ lib algorithms and iterators
-    
-    // traversal commands
-    virtual iterator begin() = 0;
-    virtual iterator end() = 0;
-
-    // the size macros return the number of used entries
-    virtual int size() const = 0;
-    virtual int max_size() const = 0;
-    virtual int capacity() const = 0;
-    virtual bool empty() const throw(GsmException) = 0;
-
-    // existing iterators remain valid after an insert or erase operation
-
-    // return position
-    // insert only writes to available positions
-    // warning: insert fails silently if size() == max_size()
-    virtual iterator insert(const PhonebookEntryBase& x) throw(GsmException)
-      = 0;
-    virtual iterator insert(iterator position, const PhonebookEntryBase& x)
-      throw(GsmException) = 0;
-
-    virtual PhonebookMap::size_type count(string &key) = 0;
-    virtual iterator find(string &key) = 0;
-    virtual iterator lower_bound(string &key) = 0;
-    virtual iterator upper_bound(string &key) = 0;
-    virtual pair<iterator, iterator> equal_range(string &key) = 0;
-
-    virtual PhonebookMap::size_type count(int key) = 0;
-    virtual iterator find(int key) = 0;
-    virtual iterator lower_bound(int key) = 0;
-    virtual iterator upper_bound(int key) = 0;
-    virtual pair<iterator, iterator> equal_range(int key) = 0;
-
-    virtual size_type erase(string &key) throw(GsmException) = 0;
-    virtual size_type erase(int key) throw(GsmException) = 0;
-    virtual void erase(iterator position) throw(GsmException) = 0;
-    virtual void erase(iterator first, iterator last) throw(GsmException) = 0;
-    virtual void clear() throw(GsmException) = 0;
-
-    // synchronize SortedPhonebookBase with storage
-    virtual void sync() throw(GsmException) = 0;
-
-    virtual ~SortedPhonebookBase() {}
-  };
-
-  typedef Ref<SortedPhonebookBase> SortedPhonebookRef;
-
-
-  // base factory class for custom backends
-  class CustomPhonebookFactory
-  {
-  public:
-    // return sorted phonebook object given the source specification
-    // (eg. database name, URL, etc.)
-    virtual SortedPhonebookRef createPhonebook(string source)
-      throw(GsmException) = 0;
-  };
-
-  // registry for custom backends
-  
-  class CustomPhonebookRegistry
-  {
-    // registered factories
-    static map<string, CustomPhonebookFactory*> *_factoryList;
-
-  public:
-    // register a factory class for a specific backend
-    // (case does not matter for backend name)
-    static void registerCustomPhonebookFactory(string backendName,
-                                        CustomPhonebookFactory *factory)
-      throw(GsmException);
-      
-    
-    // return a phonebook object given the backend name and the source
-    // specification
-    static SortedPhonebookRef
-    createPhonebook(string backendName, string source) throw(GsmException);
-  };
-
-};
-
-#endif // GSM_SORTED_PHONEBOOK_BASE_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_sms_store.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_sms_store.cc
deleted file mode 100644
index 7ca9f9f160..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_sms_store.cc
+++ /dev/null
@@ -1,499 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sorted_sms_store.cc
-// *
-// * Purpose: Sorted SMS store (residing in files or in the ME)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 14.8.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_sysdep.h>
-#include <gsmlib/gsm_sorted_sms_store.h>
-#include <iostream>
-#include <fstream>
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-using namespace std;
-using namespace gsmlib;
-
-// SMS message file format:
-// version number of file format, unsigned short int, 2 bytes in network byte
-// order
-// then comes the message:
-// 1. length of PDU (see 4. below): unsigned short int,
-//    2 bytes in network byte order
-// 2. index of message, unique for this file: unsigned long,
-//    4 bytes in network byte order
-// 3. MessageType (1 byte), any of:
-//    0 SMS_DELIVER
-//    1 SMS_SUBMIT
-//    2 SMS_STATUS_REPORT
-// 4. PDU in hexadecimal format
-
-static const unsigned short int SMS_STORE_FILE_FORMAT_VERSION = 1;
-
-// SortedSMSStore members
-
-// aux function read bytes with error handling
-// return false if EOF
-static bool readnbytes(string &filename,
-                       istream &is, int len, char *buf,
-                       bool eofIsError = true) throw(GsmException)
-{
-  is.read(buf, len);
-  if (is.bad() || (is.eof() && eofIsError))
-    throw GsmException(stringPrintf(_("error reading from file '%s'"),
-                                    (filename == "" ? _("<STDIN>") :
-                                     filename.c_str())), OSError);
-  return ! is.eof();
-}
-
-// aux function write bytes with error handling
-static void writenbytes(string &filename, ostream &os,
-                        int len, const char *buf) throw(GsmException)
-{
-  os.write(buf, len);
-  if (os.bad())
-    throw GsmException(stringPrintf(_("error writing to file '%s'"),
-                                    (filename == "" ? _("<STDOUT>") :
-                                     filename.c_str())), OSError);
-}
-
-void SortedSMSStore::readSMSFile(istream &pbs, string filename)
-  throw(GsmException)
-{
-  char numberBuf[4];
-
-  // check the version
-  try
-  {
-    readnbytes(filename, pbs, 2, numberBuf);
-  }
-  catch (GsmException &ge)
-  {
-    // ignore error, file might be empty initially
-  }
-  unsigned_int_2 version = ntohs(*((unsigned_int_2*)numberBuf));
-  if (! pbs.eof() && version != SMS_STORE_FILE_FORMAT_VERSION)
-    throw GsmException(stringPrintf(_("file '%s' has wrong version"),
-                                    filename.c_str()), ParameterError);
-
-  // read entries
-  while (1)
-  {
-    // read PDU length and exit loop if EOF
-    if (! readnbytes(filename, pbs, 2, numberBuf, false))
-      break;
-
-    unsigned_int_2 pduLen = ntohs(*((unsigned_int_2*)numberBuf));
-    if (pduLen > 500)
-      throw GsmException(stringPrintf(_("corrupt SMS store file '%s'"),
-                                      filename.c_str()), ParameterError);
-
-    // read reserved integer field of message (was formerly index)
-    readnbytes(filename, pbs, 4, numberBuf);
-    //unsigned_int_4 reserved = ntohl(*((unsigned_int_4*)numberBuf));
-    
-    // read message type
-    readnbytes(filename, pbs, 1, numberBuf);
-    SMSMessage::MessageType messageType =
-      (SMSMessage::MessageType)numberBuf[0];
-    if (messageType > 2)
-      throw GsmException(stringPrintf(_("corrupt SMS store file '%s'"),
-                                      filename.c_str()), ParameterError);
-
-    char *pduBuf = (char*)alloca(sizeof(char) * pduLen);
-
-    // read pdu
-    readnbytes(filename, pbs, pduLen, pduBuf);
-    SMSMessageRef message =
-      SMSMessage::decode(string(pduBuf, pduLen),
-                         (messageType != SMSMessage::SMS_SUBMIT));
-    
-    SMSStoreEntry *newEntry = new SMSStoreEntry(message, _nextIndex++);
-    _sortedSMSStore.insert(
-      SMSStoreMap::value_type(
-        SMSMapKey(*this, message->serviceCentreTimestamp()),
-        newEntry)
-      );
-  }
-}
-
-void SortedSMSStore::sync(bool fromDestructor) throw(GsmException)
-{
-  if (_fromFile && _changed)
-  {
-    checkReadonly();
-
-    // if writing to stdout and not called from destructor ignore
-    // (avoids writing to stdout multiple times)
-    if (_filename == "" && ! fromDestructor) return;
-
-    // create backup file - but only once
-    if (! _madeBackupFile && _filename != "") // don't make backup of stdout
-    {
-      renameToBackupFile(_filename);
-      _madeBackupFile = true;
-    }
-
-    // open stream
-    ostream *pbs = NULL;
-    try
-    {
-      if (_filename == "")
-        pbs = &cout;
-      else
-		pbs = new ofstream(_filename.c_str(), ios::out | ios::binary);
-      
-      if (pbs->bad())
-        throw GsmException(
-          stringPrintf(_("error opening file '%s' for writing"),
-                       (_filename == "" ? _("<STDOUT>") :
-                        _filename.c_str())),
-          OSError);
-
-      // write version number
-      unsigned_int_2 version = htons(SMS_STORE_FILE_FORMAT_VERSION);
-      writenbytes(_filename, *pbs, 2, (char*)&version);
-
-      // and write the entries
-      for (SMSStoreMap::iterator i = _sortedSMSStore.begin();
-           i != _sortedSMSStore.end(); ++i)
-      {
-        // create PDU and write length
-        string pdu = i->second->message()->encode();
-        unsigned_int_2 pduLen = htons(pdu.length());
-        writenbytes(_filename, *pbs, 2, (char*)&pduLen);
-
-        // write reserved field (was formerly index)
-        unsigned_int_4 reserved = htonl(0);
-        writenbytes(_filename, *pbs, 4, (char*)&reserved);
-        
-        // write message type
-        char messageType = i->second->message()->messageType();
-        writenbytes(_filename, *pbs, 1, (char*)&messageType);
-
-        // write PDU
-        writenbytes(_filename, *pbs, pdu.length(), pdu.data());
-      }
-    }
-    catch(GsmException &e)
-    {
-      if (pbs != &cout) delete pbs;
-      throw;
-    }
-    // close file
-    if (pbs != &cout) delete pbs;
-
-    _changed = false;
-  }
-}
-
-void SortedSMSStore::checkReadonly() throw(GsmException)
-{
-  if (_readonly) throw GsmException(
-    _("attempt to change SMS store read from <STDIN>"),
-    ParameterError);
-}
-
-SortedSMSStore::SortedSMSStore(string filename) throw(GsmException) :
-  _changed(false), _fromFile(true), _madeBackupFile(false),
-  _sortOrder(ByDate), _readonly(false), _filename(filename), _nextIndex(0)
-{
-  // open the file
-  ifstream pbs(filename.c_str(), ios::in | ios::binary);
-  if (pbs.bad())
-    throw GsmException(stringPrintf(_("cannot open file '%s'"),
-                                    filename.c_str()), OSError);
-  // and read the file
-  readSMSFile(pbs, filename);
-}
-
-SortedSMSStore::SortedSMSStore(bool fromStdin) throw(GsmException) :
-  _changed(false), _fromFile(true), _madeBackupFile(false),
-  _sortOrder(ByDate), _readonly(fromStdin), _nextIndex(0)
-  // _filename is "" - this means stdout
-{
-  // read from stdin
-  if (fromStdin)
-    readSMSFile(cin, (string)_("<STDIN>"));
-}
-
-SortedSMSStore::SortedSMSStore(SMSStoreRef meSMSStore)
-  throw(GsmException) :
-  _changed(false), _fromFile(false), _madeBackupFile(false),
-  _sortOrder(ByDate), _readonly(false), _meSMSStore(meSMSStore)
-{
-  // It is necessary to count the entries read because
-  // the maximum index into the SMS store may be larger than smsStore.size()
-  int entriesRead = 0;
-  reportProgress(0, _meSMSStore->size());
-
-  for (int i = 0;; ++i)
-  {
-    if (entriesRead == _meSMSStore->size())
-      break;                 // ready
-    if (! _meSMSStore()[i].empty())
-    {
-      _sortedSMSStore.insert(
-        SMSStoreMap::value_type(
-          SMSMapKey(*this,
-                    _meSMSStore()[i].message()->serviceCentreTimestamp()),
-          &_meSMSStore()[i])
-        );
-      ++entriesRead;
-      reportProgress(entriesRead);
-    }
-  }
-}
-
-void SortedSMSStore::setSortOrder(SortOrder newOrder)
-{
-  if (_sortOrder == newOrder) return; // nothing to be done
-
-  SMSStoreMap savedSMSStore = _sortedSMSStore;
-  _sortedSMSStore = SMSStoreMap();
-  _sortOrder = newOrder;
-
-  switch (newOrder)
-  {
-  case ByIndex:
-  {
-    for (SMSStoreMap::iterator i = savedSMSStore.begin();
-         i != savedSMSStore.end(); ++i)
-      _sortedSMSStore.insert(
-        SMSStoreMap::value_type(SMSMapKey(*this, (i->second->index())),
-                                i->second));
-    break;
-  }
-  case ByDate:
-  {
-    for (SMSStoreMap::iterator i = savedSMSStore.begin();
-         i != savedSMSStore.end(); ++i)
-      _sortedSMSStore.insert(
-        SMSStoreMap::value_type(
-          SMSMapKey(*this, (i->second->message()->serviceCentreTimestamp())),
-          i->second));
-    break;
-  }
-  case ByAddress:
-  {
-    for (SMSStoreMap::iterator i = savedSMSStore.begin();
-         i != savedSMSStore.end(); ++i)
-      _sortedSMSStore.insert(
-        SMSStoreMap::value_type(
-          SMSMapKey(*this, (i->second->message()->address())),
-          i->second));
-    break;
-  }
-  case ByType:
-  {
-    for (SMSStoreMap::iterator i = savedSMSStore.begin();
-         i != savedSMSStore.end(); ++i)
-      _sortedSMSStore.insert(
-        SMSStoreMap::value_type(
-          SMSMapKey(*this, (i->second->message()->messageType())),
-          i->second));
-    break;
-  }
-  default:
-    assert(0);
-    break;
-  }
-}
-
-int SortedSMSStore::max_size() const
-{
-  if (_fromFile)
-    return _sortedSMSStore.max_size();
-  else
-    return _meSMSStore->max_size();
-}
-
-int SortedSMSStore::capacity() const
-{
-  if (_fromFile)
-    return _sortedSMSStore.max_size();
-  else
-    return _meSMSStore->capacity();
-}
-
-SortedSMSStore::iterator
-SortedSMSStore::insert(const SMSStoreEntry& x) throw(GsmException)
-{
-  checkReadonly();
-  _changed = true;
-  SMSStoreEntry *newEntry;
-
-  if (_fromFile)
-    newEntry = new SMSStoreEntry(x.message(), _nextIndex++);
-  else
-  {
-    SMSStoreEntry newMEEntry(x.message());
-    newEntry = _meSMSStore->insert(newMEEntry);
-  }
-  
-  switch (_sortOrder)
-  {
-  case ByIndex:
-    return
-      _sortedSMSStore.
-      insert(SMSStoreMap::value_type(SMSMapKey(*this, newEntry->index()),
-                                     newEntry));
-    break;
-  case ByDate:
-    return
-      _sortedSMSStore.
-      insert(SMSStoreMap::value_type(
-        SMSMapKey(*this, newEntry->message()->serviceCentreTimestamp()),
-        newEntry));
-    break;
-  case ByAddress:
-    return
-      _sortedSMSStore.
-      insert(SMSStoreMap::value_type(
-        SMSMapKey(*this, newEntry->message()->address()),
-        newEntry));
-    break;
-  case ByType:
-    return
-      _sortedSMSStore.
-      insert(SMSStoreMap::value_type(
-        SMSMapKey(*this, newEntry->message()->messageType()),
-        newEntry));
-    break;
-  default:
-    assert(0);
-    break;
-  }
-  return SortedSMSStore::iterator();
-}
-
-SortedSMSStore::iterator
-SortedSMSStore::insert(iterator position, const SMSStoreEntry& x)
-  throw(GsmException)
-{
-  return insert(x);
-}
-
-SortedSMSStore::size_type SortedSMSStore::erase(Address &key)
-  throw(GsmException)
-{
-  assert(_sortOrder == ByAddress);
-
-  SMSMapKey mapKey(*this, key);
-
-  // deallocate memory or remove from underlying ME SMS store
-  for (SMSStoreMap::iterator i = _sortedSMSStore.find(mapKey);
-       i != _sortedSMSStore.end() && i->first == mapKey; ++i)
-  {
-    checkReadonly();
-    _changed = true;
-    if (_fromFile)
-      delete i->second;
-    else
-      _meSMSStore->erase((SMSStore::iterator)i->second);
-  }
-
-  return _sortedSMSStore.erase(mapKey);
-}
-
-SortedSMSStore::size_type SortedSMSStore::erase(int key)
-  throw(GsmException)
-{
-  assert(_sortOrder == ByIndex || _sortOrder == ByType);
-
-  SMSMapKey mapKey(*this, key);
-
-  // deallocate memory or remove from underlying ME SMS store
-  for (SMSStoreMap::iterator i = _sortedSMSStore.find(mapKey);
-       i != _sortedSMSStore.end() && i->first == mapKey; ++i)
-  {
-    checkReadonly();
-    _changed = true;
-    if (_fromFile)
-      delete i->second;
-    else
-      _meSMSStore->erase((SMSStore::iterator)i->second);
-  }
-
-  return _sortedSMSStore.erase(mapKey);
-}
-
-SortedSMSStore::size_type SortedSMSStore::erase(Timestamp &key)
-  throw(GsmException)
-{
-  assert(_sortOrder == ByDate);
-
-  SMSMapKey mapKey(*this, key);
-
-  // deallocate memory or remove from underlying ME SMS store
-  for (SMSStoreMap::iterator i = _sortedSMSStore.find(mapKey);
-       i != _sortedSMSStore.end() && i->first == mapKey; ++i)
-  {
-    checkReadonly();
-    _changed = true;
-    if (_fromFile)
-      delete i->second;
-    else
-      _meSMSStore->erase((SMSStore::iterator)i->second);
-  }
-
-  return _sortedSMSStore.erase(mapKey);
-}
-
-void SortedSMSStore::erase(iterator position)
-  throw(GsmException)
-{
-  checkReadonly();
-  _changed = true;
-  // deallocate memory or remove from underlying ME SMS store
-  if (_fromFile)
-    delete ((SMSStoreMap::iterator)position)->second;
-  else
-    _meSMSStore->erase((SMSStore::iterator)
-                       ((SMSStoreMap::iterator)position)->second);
-  _sortedSMSStore.erase(position);
-}
-
-void SortedSMSStore::erase(iterator first, iterator last)
-  throw(GsmException)
-{
-  checkReadonly();
-  _changed = true;
-  for (SMSStoreMap::iterator i = first; i != last; ++i)
-    if (_fromFile)
-      delete i->second;
-    else
-      _meSMSStore->erase((SMSStore::iterator)i->second);
-  _sortedSMSStore.erase(first, last);
-}
-
-void SortedSMSStore::clear() throw(GsmException)
-{
-  checkReadonly();
-  _changed = true;
-  for (iterator i = begin(); i != end(); i++)
-    erase(i);
-}
-
-SortedSMSStore::~SortedSMSStore()
-{
-  if (_fromFile)
-  {
-    sync(true);
-    for (SMSStoreMap::iterator i = _sortedSMSStore.begin();
-         i != _sortedSMSStore.end(); ++i)
-      delete i->second;
-  }
-}
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_sms_store.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_sms_store.h
deleted file mode 100644
index 126c5856bd..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sorted_sms_store.h
+++ /dev/null
@@ -1,217 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sorted_sms_store.h
-// *
-// * Purpose: Sorted SMS store (residing in files or in the ME)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 14.8.1999
-// *************************************************************************
-
-#ifndef GSM_SORTED_SMS_STORE_H
-#define GSM_SORTED_SMS_STORE_H
-
-#include <gsmlib/gsm_sms_store.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_map_key.h>
-#include <string>
-#include <map>
-#include <assert.h>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // MapKey for SortedSMSStore
-  
-  class SortedSMSStore;
-  typedef MapKey<SortedSMSStore> SMSMapKey;
-
-  // maps key (see SortedSMSStore::SortOrder) to entry
-  
-  typedef multimap<SMSMapKey, SMSStoreEntry*> SMSStoreMap;
-
-  // iterator for SortedSMSStore that hides the "second" member of the map
-  
-  typedef SMSStoreMap::iterator SMSStoreMapIterator;
-  class SortedSMSStoreIterator : public SMSStoreMapIterator
-  {
-  public:
-    SortedSMSStoreIterator() {}
-    SortedSMSStoreIterator(SMSStoreMap::iterator i) :
-      SMSStoreMapIterator(i) {}
-
-    SMSStoreEntry &operator*()
-      {return *((SMSStoreMap::iterator)*this)->second;}
-
-    SMSStoreEntry *operator->()
-      {return ((SMSStoreMap::iterator)*this)->second;}
-  };
-
-  // The class SortedSMSStore makes the SMS store more manageable:
-  // - empty slots in the ME phonebook are hidden by the API
-  // - the class transparently handles stores that reside in files
-
-  class SortedSMSStore : public RefBase, public NoCopy
-  {
-  private:
-
-    bool _changed;              // true if file has changed after last save
-    bool _fromFile;             // true if store read from file
-    bool _madeBackupFile;       // true if backup file was created
-    SortOrder _sortOrder;       // sort order of the _sortedSMSStore
-                                // (default is ByDate)
-    bool _readonly;             // =true if read from stdin
-    string _filename;           // name of the file if store from file
-    SMSStoreMap _sortedSMSStore; // store from file
-    SMSStoreRef _meSMSStore;    // store if from ME
-
-    unsigned int _nextIndex;    // next index to use for file-based store
-
-    // initial read of SMS file
-    void readSMSFile(istream &pbs, string filename) throw(GsmException);
-    
-    // synchronize SortedSMSStore with file (no action if in ME)
-    void sync(bool fromDestructor) throw(GsmException);
-    
-    // throw an exception if _readonly is set
-    void checkReadonly() throw(GsmException);
-
-  public:
-    // iterator defs
-    typedef SortedSMSStoreIterator iterator;
-    typedef SMSStoreMap::size_type size_type;
-
-    // constructor for file-based store
-    // read from file
-    SortedSMSStore(string filename) throw(GsmException);
-    // read from stdin or start empty and write to stdout
-    SortedSMSStore(bool fromStdin) throw(GsmException);
-
-    // constructor for ME-based store
-    SortedSMSStore(SMSStoreRef meSMSStore) throw(GsmException);
-
-    // handle sorting
-    void setSortOrder(SortOrder newOrder);
-    SortOrder sortOrder() const {return _sortOrder;}
-    
-    // store traversal commands
-    // these are suitable to use stdc++ lib algorithms and iterators
-    
-    // traversal commands
-    iterator begin() {return _sortedSMSStore.begin();}
-    iterator end() {return _sortedSMSStore.end();}
-
-    // the size macros return the number of used entries
-    int size() const {return _sortedSMSStore.size();}
-    int max_size() const;
-    int capacity() const;
-    bool empty() const throw(GsmException) {return size() == 0;}
-
-    // existing iterators may be invalidated after an insert operation
-    // return position
-    // insert only writes to available positions
-    // warning: insert fails silently if size() == max_size()
-    iterator insert(const SMSStoreEntry& x) throw(GsmException);
-    iterator insert(iterator position, const SMSStoreEntry& x)
-      throw(GsmException);
-
-    SMSStoreMap::size_type count(Address &key)
-      {
-        assert(_sortOrder == ByAddress);
-        return _sortedSMSStore.count(SMSMapKey(*this, key));
-      }
-    iterator find(Address &key)
-      {
-        assert(_sortOrder == ByAddress);
-        return _sortedSMSStore.find(SMSMapKey(*this, key));
-      }
-    iterator lower_bound(Address &key)
-      {
-        assert(_sortOrder == ByAddress);
-        return _sortedSMSStore.lower_bound(SMSMapKey(*this, key));
-      }
-    iterator upper_bound(Address &key)
-      {
-        assert(_sortOrder == ByAddress);
-        return _sortedSMSStore.upper_bound(SMSMapKey(*this, key));
-      }
-    pair<iterator, iterator> equal_range(Address &key)
-      {
-        assert(_sortOrder == ByAddress);
-        return _sortedSMSStore.equal_range(SMSMapKey(*this, key));
-      }
-
-    SMSStoreMap::size_type count(Timestamp &key)
-      {
-        assert(_sortOrder == ByDate);
-        return _sortedSMSStore.count(SMSMapKey(*this, key));
-      }
-    iterator find(Timestamp &key)
-      {
-        assert(_sortOrder == ByDate);
-        return _sortedSMSStore.find(SMSMapKey(*this, key));
-      }
-    iterator lower_bound(Timestamp &key)
-      {
-        assert(_sortOrder == ByDate);
-        return _sortedSMSStore.lower_bound(SMSMapKey(*this, key));
-      }
-    iterator upper_bound(Timestamp &key)
-      {
-        assert(_sortOrder == ByDate);
-        return _sortedSMSStore.upper_bound(SMSMapKey(*this, key));
-      }
-    pair<iterator, iterator> equal_range(Timestamp &key)
-      {
-        assert(_sortOrder == ByDate);
-        return _sortedSMSStore.equal_range(SMSMapKey(*this, key));
-      }
-
-    SMSStoreMap::size_type count(int key)
-      {
-        assert(_sortOrder == ByIndex || _sortOrder == ByType);
-        return _sortedSMSStore.count(SMSMapKey(*this, key));
-      }
-    iterator find(int key)
-      {
-        assert(_sortOrder == ByIndex || _sortOrder == ByType);
-        return _sortedSMSStore.find(SMSMapKey(*this, key));
-      }
-    iterator lower_bound(int key)
-      {
-        assert(_sortOrder == ByIndex || _sortOrder == ByType);
-        return _sortedSMSStore.lower_bound(SMSMapKey(*this, key));
-      }
-    iterator upper_bound(int key)
-      {
-        assert(_sortOrder == ByIndex || _sortOrder == ByType);
-        return _sortedSMSStore.upper_bound(SMSMapKey(*this, key));
-      }
-    pair<iterator, iterator> equal_range(int key)
-      {
-        assert(_sortOrder == ByIndex || _sortOrder == ByType);
-        return _sortedSMSStore.equal_range(SMSMapKey(*this, key));
-      }
-
-    size_type erase(Address &key) throw(GsmException);
-    size_type erase(int key) throw(GsmException);
-    size_type erase(Timestamp &key) throw(GsmException);
-    void erase(iterator position) throw(GsmException);
-    void erase(iterator first, iterator last) throw(GsmException);
-    void clear() throw(GsmException);
-
-    // synchronize SortedPhonebook with file (no action if in ME)
-    void sync() throw(GsmException) {sync(false);}
-    
-    // destructor
-    // writes back change to file if store is in file
-    ~SortedSMSStore();
-  };
-
-  typedef Ref<SortedSMSStore> SortedSMSStoreRef;
-};
-
-#endif // GSM_SORTED_SMS_STORE_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sysdep.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sysdep.h
deleted file mode 100644
index 864fcf99ff..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_sysdep.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_sysdep.h
-// *
-// * Purpose: Some magic to make alloca work on different platforms plus
-// *          other system-dependent stuff
-// *
-// * Warning: Only include this header from gsmlib .cc-files
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 28.10.1999
-// *************************************************************************
-
-#ifndef GSM_SYSDEP_H
-#define GSM_SYSDEP_H
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-
-extern "C" {
-
-  // this is mostly taken from the autoconf documentation (WIN32 added)
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifdef WIN32
-#     include <malloc.h>
-#     define alloca _alloca
-#   else
-#     ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#     endif
-#   endif
-#  endif
-# endif
-#endif
-
-}
-
-// Windows-specific stuff
-#if defined(WIN32) && ! defined(__GNUC__)
-#define NOMINMAX
-#include <winsock.h>
-#include <io.h>
-
-#ifdef _MSC_VER
-#define min __min
-#endif
-
-#define S_ISREG(mode) (((mode) & _S_IFREG) == _S_IFREG)
-#define S_ISCHR(mode) (((mode) & _S_IFCHR) == _S_IFCHR)
-
-#define read _read
-#endif
-
-// define common data types with fixed sizes
-
-#if SIZEOF_UNSIGNED_SHORT_INT == 2
-  typedef unsigned short int unsigned_int_2;
-#else
-#error "no suitable 2 byte unsigned int available"
-#endif
-#if SIZEOF_UNSIGNED_LONG_INT == 4
-  typedef unsigned long int unsigned_int_4;
-#else
-#if SIZEOF_UNSIGNED_INT == 4
-  typedef unsigned int unsigned_int_4;
-#else
-#error "no suitable 4 byte unsigned int available"
-#endif
-#endif
-
-#endif // GSM_SYSDEP_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_unix_serial.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_unix_serial.cc
deleted file mode 100644
index feea2a24d9..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_unix_serial.cc
+++ /dev/null
@@ -1,456 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_unix_port.cc
-// *
-// * Purpose: UNIX serial port implementation
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 10.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_unix_serial.h>
-#include <gsmlib/gsm_util.h>
-#include <termios.h>
-#include <fcntl.h>
-#include <iostream>
-#include <strstream>
-#include <cassert>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <signal.h>
-#include <pthread.h>
-#include <cstring>
-
-using namespace std;
-using namespace gsmlib;
-
-static const int holdoff[] = {2000000, 1000000, 400000};
-static const int holdoffArraySize = sizeof(holdoff)/sizeof(int);
-  
-// alarm handling for socket read/write
-// the timerMtx is necessary since several threads cannot use the
-// timer indepently of each other
-
-static pthread_mutex_t timerMtx = PTHREAD_MUTEX_INITIALIZER;
-
-// for non-GNU systems, define alarm()
-#ifndef HAVE_ALARM
-unsigned int alarm(unsigned int seconds)
-{
-  struct itimerval old, newt;
-  newt.it_interval.tv_usec = 0;
-  newt.it_interval.tv_sec = 0;
-  newt.it_value.tv_usec = 0;
-  newt.it_value.tv_sec = (long int)seconds;
-  if (setitimer(ITIMER_REAL, &newt, &old) < 0)
-    return 0;
-  else
-    return old.it_value.tv_sec;
-}
-#endif
-
-// this routine is called in case of a timeout
-static void catchAlarm(int)
-{
-  // do nothing
-}
-
-// start timer
-static void startTimer()
-{
-  pthread_mutex_lock(&timerMtx);
-  struct sigaction newAction;
-  newAction.sa_handler = catchAlarm;
-  newAction.sa_flags = 0;
-  sigaction(SIGALRM, &newAction, NULL);
-  alarm(1);
-}
-
-// reset timer
-static void stopTimer()
-{
-  alarm(0);
-  sigaction(SIGALRM, NULL, NULL);
-  pthread_mutex_unlock(&timerMtx);
-}
-
-// UnixSerialPort members
-
-void UnixSerialPort::throwModemException(string message) throw(GsmException)
-{
-  ostrstream os;
-  os << message << " (errno: " << errno << "/" << strerror(errno) << ")"
-     << ends;
-  char *ss = os.str();
-  string s(ss);
-  delete[] ss;
-  throw GsmException(s, OSError, errno);
-}
-
-void UnixSerialPort::putBack(unsigned char c)
-{
-  assert(_oldChar == -1);
-  _oldChar = c;
-}
-
-int UnixSerialPort::readByte() throw(GsmException)
-{
-  if (_oldChar != -1)
-  {
-    int result = _oldChar;
-    _oldChar = -1;
-    return result;
-  }
-
-  unsigned char c;
-  int timeElapsed = 0;
-  struct timeval oneSecond;
-  bool readDone = false;
-
-  while (! readDone && timeElapsed < _timeoutVal)
-  {
-    if (interrupted())
-      throwModemException(_("interrupted when reading from TA"));
-
-    // setup fd_set data structure for select()
-    fd_set fdSet;
-    oneSecond.tv_sec = 1;
-    oneSecond.tv_usec = 0;
-    FD_ZERO(&fdSet);
-    FD_SET(_fd, &fdSet);
-
-    switch (select(FD_SETSIZE, &fdSet, NULL, NULL, &oneSecond))
-    {
-    case 1:
-    {
-      int res = read(_fd, &c, 1);
-      if (res != 1)
-        throwModemException(_("end of file when reading from TA"));
-      else
-        readDone = true;
-      break;
-    }
-    case 0:
-      ++timeElapsed;
-      break;
-    default:
-      if (errno != EINTR)
-        throwModemException(_("reading from TA"));
-      break;
-    }
-  }
-  if (! readDone)
-    throwModemException(_("timeout when reading from TA"));
-
-#ifndef NDEBUG
-  if (debugLevel() >= 2)
-  {
-    // some useful debugging code
-    if (c == LF)
-      cerr << "<LF>";
-    else if (c == CR)
-      cerr << "<CR>";
-    else cerr << "<'" << (char) c << "'>";
-    cerr.flush();
-  }
-#endif
-  return c;
-}
-
-UnixSerialPort::UnixSerialPort(string device, speed_t lineSpeed,
-                               string initString, bool swHandshake)
-  throw(GsmException) :
-  _oldChar(-1), _timeoutVal(TIMEOUT_SECS)
-{
-  struct termios t;
-
-  // open device
-  _fd = open(device.c_str(), O_RDWR | O_NOCTTY | O_NONBLOCK);
-  if (_fd == -1)
-    throwModemException(stringPrintf(_("opening device '%s'"),
-                                     device.c_str()));
-
-  // switch off non-blocking mode
-  int fdFlags;
-  if ((fdFlags = fcntl(_fd, F_GETFL)) == -1) {
-    close(_fd);
-    throwModemException(_("getting file status flags failed"));
-  }
-  fdFlags &= ~O_NONBLOCK;
-  if (fcntl(_fd, F_SETFL, fdFlags) == -1) {
-    close(_fd);
-    throwModemException(_("switching of non-blocking mode failed"));
-  }
-
-  long int saveTimeoutVal = _timeoutVal;
-  _timeoutVal = 3;
-  int initTries = holdoffArraySize;
-  while (initTries-- > 0)
-  {
-    // flush all pending output
-    tcflush(_fd, TCOFLUSH);
-
-    // toggle DTR to reset modem
-    int mctl = TIOCM_DTR;
-    if (ioctl(_fd, TIOCMBIC, &mctl) < 0) {
-      close(_fd);
-      throwModemException(_("clearing DTR failed"));
-    }
-    // the waiting time for DTR toggling is increased with each loop
-    usleep(holdoff[initTries]);
-    if (ioctl(_fd, TIOCMBIS, &mctl) < 0) {
-      close(_fd);
-      throwModemException(_("setting DTR failed"));
-    }
-    // get line modes
-    if (tcgetattr(_fd, &t) < 0) {
-      close(_fd);
-      throwModemException(stringPrintf(_("tcgetattr device '%s'"),
-                                       device.c_str()));
-    }
-
-    // set line speed
-    cfsetispeed(&t, lineSpeed);
-    cfsetospeed(&t, lineSpeed);
-
-    // set the device to a sane state
-    t.c_iflag |= IGNPAR | (swHandshake ? IXON | IXOFF : 0);
-    t.c_iflag &= ~(INPCK | ISTRIP | IMAXBEL |
-                   (swHandshake ? 0 : IXON |  IXOFF)
-                   | IXANY | IGNCR | ICRNL | IMAXBEL | INLCR | IGNBRK);
-    t.c_oflag &= ~(OPOST);
-    // be careful, only touch "known" flags
-    t.c_cflag &= ~(CSIZE | CSTOPB | PARENB | PARODD |
-                  (swHandshake ? CRTSCTS : 0 ));
-    t.c_cflag |= CS8 | CREAD | HUPCL | (swHandshake ? 0 : CRTSCTS) | CLOCAL;
-    t.c_lflag &= ~(ECHO | ECHOE | ECHOPRT | ECHOK | ECHOKE | ECHONL |
-                   ECHOCTL | ISIG | IEXTEN | TOSTOP | FLUSHO | ICANON);
-    t.c_lflag |= NOFLSH;
-    t.c_cc[VMIN] = 1;
-    t.c_cc[VTIME] = 0;
-
-    t.c_cc[VSUSP] = 0;
-
-    // write back
-    if(tcsetattr (_fd, TCSANOW, &t) < 0) {
-      close(_fd);
-      throwModemException(stringPrintf(_("tcsetattr device '%s'"),
-                                       device.c_str()));
-    }
-    // the waiting time for writing to the ME/TA is increased with each loop
-    usleep(holdoff[initTries]);
-
-    // flush all pending input
-    tcflush(_fd, TCIFLUSH);
-
-    try
-    {
-      // reset modem
-      putLine("ATZ");
-      bool foundOK = false;
-      int readTries = 5;
-      while (readTries-- > 0)
-      {
-        // for the first call getLine() waits only 3 seconds
-        // because of _timeoutVal = 3
-        string s = getLine();
-        if (s.find("OK") != string::npos ||
-            s.find("CABLE: GSM") != string::npos)
-        {
-          foundOK = true;
-          readTries = 0;        // found OK, exit loop
-        }
-        else if (s.find("ERROR") != string::npos)
-          readTries = 0;        // error, exit loop
-      }
-
-      // set getLine/putLine timeout back to old value
-      _timeoutVal = saveTimeoutVal;
-
-      if (foundOK)
-      {
-        // init modem
-        readTries = 5;
-        putLine("AT" + initString);
-        while (readTries-- > 0)
-        {
-          string s = getLine();
-          if (s.find("OK") != string::npos ||
-              s.find("CABLE: GSM") != string::npos)
-            return;                 // found OK, return
-        }
-      }
-    }
-    catch (GsmException &e)
-    {
-      _timeoutVal = saveTimeoutVal;
-      if (initTries == 0) {
-        close(_fd);
-        throw e;
-      }
-    }
-  }
-  // no response after 3 tries
-  close(_fd);
-  throw GsmException(stringPrintf(_("reset modem failed '%s'"),
-                                  device.c_str()), OtherError);
-}
-
-string UnixSerialPort::getLine() throw(GsmException)
-{
-  string result;
-  int c;
-  while ((c = readByte()) >= 0)
-  {
-    while (c == CR)
-    {
-      c = readByte();
-    }
-    if (c == LF)
-      break;
-    result += c;
-  }
-
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "<-- " << result << endl;
-#endif
-
-  return result;
-}
-
-void UnixSerialPort::putLine(string line,
-                             bool carriageReturn) throw(GsmException)
-{
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "--> " << line << endl;
-#endif
-
-  if (carriageReturn) line += CR;
-  const char *l = line.c_str();
-  
-  int timeElapsed = 0;
-  struct timeval oneSecond;
-
-  ssize_t bytesWritten = 0;
-  while (bytesWritten < (ssize_t)line.length() && timeElapsed < _timeoutVal)
-  {
-    if (interrupted())
-      throwModemException(_("interrupted when writing to TA"));
-
-    // setup fd_set data structure for select()
-    fd_set fdSet;
-    oneSecond.tv_sec = 1;
-    oneSecond.tv_usec = 0;
-    FD_ZERO(&fdSet);
-    FD_SET(_fd, &fdSet);
-
-    switch (select(FD_SETSIZE, NULL, &fdSet, NULL, &oneSecond))
-    {
-    case 1:
-    {
-      ssize_t bw = write(_fd, l + bytesWritten, line.length() - bytesWritten);
-      if (bw < 0)
-        throwModemException(_("writing to TA"));
-      bytesWritten += bw;
-      break;
-    }
-    case 0:
-      ++timeElapsed;
-      break;
-    default:
-      if (errno != EINTR)
-        throwModemException(_("writing to TA"));
-      break;
-    }
-  }
-  
-  while (timeElapsed < _timeoutVal)
-  {
-    if (interrupted())
-      throwModemException(_("interrupted when writing to TA"));
-    startTimer();
-    int res = tcdrain(_fd);     // wait for output to be read by TA
-    stopTimer();
-    if (res == 0)
-      break;
-    else
-    {
-      assert(errno == EINTR);
-      ++timeElapsed;
-    }
-  }
-  if (timeElapsed >= _timeoutVal)
-    throwModemException(_("timeout when writing to TA"));
-
-  // echo CR LF must be removed by higher layer functions in gsm_at because
-  // in order to properly handle unsolicited result codes from the ME/TA
-}
-
-bool UnixSerialPort::wait(GsmTime timeout) throw(GsmException)
-{
-  fd_set fds;
-  FD_ZERO(&fds);
-  FD_SET(_fd, &fds);
-  return select(FD_SETSIZE, &fds, NULL, NULL, timeout) != 0;
-}
-
-// set timeout for read or write in seconds.
-void UnixSerialPort::setTimeOut(unsigned int timeout)
-{
-  _timeoutVal = timeout;
-}
-
-UnixSerialPort::~UnixSerialPort()
-{
-  if (_fd != -1)
-    close(_fd);
-}
-
-speed_t gsmlib::baudRateStrToSpeed(string baudrate) throw(GsmException)
-{
-  if (baudrate == "300")
-    return B300;
-  else if (baudrate == "600")
-    return B600;
-  else if (baudrate == "1200")
-    return B1200;
-  else if (baudrate == "2400")
-    return B2400;
-  else if (baudrate == "4800")
-    return B4800;
-  else if (baudrate == "9600")
-    return B9600;
-  else if (baudrate == "19200")
-    return B19200;
-  else if (baudrate == "38400")
-    return B38400;
-#ifdef B57600
-  else if (baudrate == "57600")
-    return B57600;
-#endif
-#ifdef B115200
-  else if (baudrate == "115200")
-    return B115200;
-#endif
-#ifdef B230400
-  else if (baudrate == "230400")
-    return B230400;
-#endif
-#ifdef B460800
-  else if (baudrate == "460800")
-    return B460800;
-#endif
-  else
-    throw GsmException(stringPrintf(_("unknown baudrate '%s'"),
-                                    baudrate.c_str()), ParameterError);
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_unix_serial.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_unix_serial.h
deleted file mode 100644
index 29b1800b6c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_unix_serial.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_unix_port.h
-// *
-// * Purpose: UNIX serial port implementation
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 4.5.1999
-// *************************************************************************
-
-#ifndef GSM_UNIX_SERIAL_H
-#define GSM_UNIX_SERIAL_H
-
-#include <string>
-#include <gsmlib/gsm_error.h>
-#include <gsmlib/gsm_port.h>
-#include <gsmlib/gsm_util.h>
-#include <sys/types.h>
-#include <termios.h>
-
-using namespace std;
-
-namespace gsmlib
-{
-  class UnixSerialPort : public Port
-  {
-  private:
-    int _fd;                    // file descriptor for device
-    int _debug;                 // debug level (set by environment variable
-                                // GSM_DEBUG
-    int _oldChar;               // character set by putBack() (-1 == none)
-    long int _timeoutVal;       // timeout for getLine/readByte
-
-    // throw GsmException include UNIX errno
-    void throwModemException(string message) throw(GsmException);
-    
-  public:
-    // create Port given the UNIX device name
-    UnixSerialPort(string device, speed_t lineSpeed = DEFAULT_BAUD_RATE,
-                   string initString = DEFAULT_INIT_STRING,
-                   bool swHandshake = false)
-      throw(GsmException);
-
-    // inherited from Port
-    void putBack(unsigned char c);
-    int readByte() throw(GsmException);
-    string getLine() throw(GsmException);
-    void putLine(string line,
-                         bool carriageReturn = true) throw(GsmException);
-    bool wait(GsmTime timeout) throw(GsmException);
-    void setTimeOut(unsigned int timeout);
-
-    virtual ~UnixSerialPort();
-  };
-
-  // convert baudrate string ("300" .. "460800") to speed_t
-  extern speed_t baudRateStrToSpeed(string baudrate) throw(GsmException);
-};
-
-#endif // GSM_UNIX_SERIAL_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_util.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_util.cc
deleted file mode 100755
index bfcb4e9858..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_util.cc
+++ /dev/null
@@ -1,381 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_util.h
-// *
-// * Purpose: Various utilities
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 4.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_util.h>
-#include <gsmlib/gsm_sysdep.h>
-#include <sys/stat.h>
-#include <assert.h>
-#include <string.h>
-#include <strstream>
-#include <ctype.h>
-#include <errno.h>
-#if !defined(HAVE_CONFIG_H) || defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#if !defined(HAVE_CONFIG_H) || defined(HAVE_MALLOC_H)
-#include <malloc.h>
-#endif
-#include <stdarg.h>
-#ifdef HAVE_VSNPRINTF
-// switch on vsnprintf() prototype in stdio.h
-#define __USE_GNU
-#define _GNU_SOURCE
-#endif
-#include <cstdlib>
-#include <stdio.h>
-#include <sys/stat.h>
-
-using namespace std;
-using namespace gsmlib;
-
-// Latin-1 undefined character (code 172 (Latin-1 boolean not, "�"))
-const int NOP = 172;
-
-// GSM undefined character (code 16 (GSM Delta))
-const int GSM_NOP = 16;
-
-// conversion tables, Latin1 to GSM and GSM to Latin1
-
-static unsigned char gsmToLatin1Table[] =
-{
-  //  0 '@', '�', '$', '�', '�', '�', '�', '�', 
-        '@', 163, '$', 165, 232, 233, 249, 236,
-  //  8 '�', '�',  LF, '�', '�',  CR, '�', '�', 
-        242, 199,  10, 216, 248,  13, 197, 229,
-  // 16 '�', '_', '�', '�', '�', '�', '�', '�',
-        NOP, '_', NOP, NOP, NOP, NOP, NOP, NOP, 
-  // 24 '�', '�', '�', '�', '�', '�', '�', '�',
-        NOP, NOP, NOP, NOP, 198, 230, 223, 201, 
-  // 32 ' ', '!', '"', '#', '�', '%', '&', ''',
-        ' ', '!', '"', '#', 164, '%', '&', '\'',
-  // 40 '(', ')', '*', '+', ',', '-', '.', '/',
-        '(', ')', '*', '+', ',', '-', '.', '/',
-  // 48 '0', '1', '2', '3', '4', '5', '6', '7',
-         '0', '1', '2', '3', '4', '5', '6', '7',
-  // 56 '8', '9', ':', ';', '<', '=', '>', '?', 
-        '8', '9', ':', ';', '<', '=', '>', '?', 
-  // 64 '�', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 
-        161, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 
-  // 72 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 
-        'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-  // 80 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-         'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-  // 88 'X', 'Y', 'Z', '�', '�', '�', '�', '�', 
-        'X', 'Y', 'Z', 196, 214, 209, 220, 167,
-  // 96 '�', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-        191, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-  // 104 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 
-         'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 
-  // 112 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 
-         'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 
-  // 120 'x', 'y', 'z', '�', '�', '�', '�', '�', 
-         'x', 'y', 'z', 228, 246, 241, 252, 224
-};
-
-static unsigned char latin1ToGsmTable[256];
-
-static class Latin1ToGsmTableInit
-{
-public:
-  Latin1ToGsmTableInit()
-  {
-    memset((void*)latin1ToGsmTable, GSM_NOP, 256);
-    for (int i = 0; i < 128; i++)
-      if (gsmToLatin1Table[i] != NOP)
-        latin1ToGsmTable[gsmToLatin1Table[i]] = i;
-  }
-} latin1ToGsmTableInit;
-
-string gsmlib::gsmToLatin1(string s)
-{
-  string result(s.length(), 0);
-  for (string::size_type i = 0; i < s.length(); i++)
-    result[i] = (unsigned char)s[i] > 127 ? NOP : gsmToLatin1Table[s[i]];
-  return result;
-}
-
-string gsmlib::latin1ToGsm(string s)
-{
-  string result(s.length(), 0);
-  for (string::size_type i = 0; i < s.length(); i++)
-    result[i] = latin1ToGsmTable[(unsigned char)s[i]];
-  return result;
-}
-
-static unsigned char byteToHex[] =
-{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
- 'A', 'B', 'C', 'D', 'E', 'F'};
-
-string gsmlib::bufToHex(const unsigned char *buf, unsigned long length)
-{
-  const unsigned char *bb = buf;
-  string result;
-  result.reserve(length * 2);
-
-  for (unsigned long i = 0; i < length; ++i)
-  {
-    result += byteToHex[*bb >> 4];
-    result += byteToHex[*bb++ & 0xf];
-  }
-  return result;
-}
-
-bool gsmlib::hexToBuf(const string &hexString, unsigned char *buf)
-{
-  if (hexString.length() % 2 != 0)
-    return false;
-
-  unsigned char *bb = buf;
-  for (unsigned int i = 0; i < hexString.length(); i += 2)
-  {
-    unsigned char c = hexString[i];
-    if (! isdigit(c) && ! ('a' <= c && c <= 'f') && ! ('A' <= c && c <= 'F'))
-      return false;
-    *bb = (isdigit(c) ? c - '0' :
-           ((('a' <= c && c <= 'f') ? c - 'a' : c - 'A')) + 10) << 4;
-    c = hexString[i + 1];
-    if (! isdigit(c) && ! ('a' <= c && c <= 'f') && ! ('A' <= c && c <= 'F'))
-      return false;
-    *bb++ |= isdigit(c) ? c - '0' :
-      ((('a' <= c && c <= 'f') ? c - 'a' : c - 'A') + 10);
-  }
-  return true;
-}
-
-string gsmlib::intToStr(int i)
-{
-  ostrstream os;
-  os << i << ends;
-  char *ss = os.str();
-  string s(ss);
-  delete[] ss;
-  return s;
-}
-
-string gsmlib::removeWhiteSpace(string s)
-{
-  string result;
-  for (unsigned int i = 0; i < s.length(); ++i)
-    if (! isspace(s[i]))
-      result += s[i];
-  return result;
-}
-
-#ifdef WIN32
-
-// helper routine, find out whether filename starts with "COM"
-static bool isCom(string filename)
-{
-  filename = removeWhiteSpace(lowercase(filename));
-  // remove UNC begin
-  if ( filename.compare(0, 4, "\\\\.\\") == 0 )
-    filename.erase(0, 4);
-  return filename.length() < 3 || filename.substr(0, 3) == "com";
-}
-#endif
-
-bool gsmlib::isFile(string filename)
-{
-#ifdef WIN32
-  // stat does not work reliably under Win32 to indicate devices
-  if (isCom(filename))
-    return false;
-#endif
-
-  struct stat statBuf;
-  int retries = 0;
-
-  while (retries < 10)
-  {
-    if (stat(filename.c_str(), &statBuf) != 0)
-      throw GsmException(
-        stringPrintf(_("error when calling stat('%s') (errno: %d/%s)"), 
-                     filename.c_str(), errno, strerror(errno)),
-        OSError);
-    
-#ifndef WIN32
-    if (S_ISLNK(statBuf.st_mode))
-    {
-      int size = 100;
-      while (1)
-      {
-        char *buffer = (char*)malloc(size);
-        int nchars = readlink(filename.c_str(), buffer, size);
-        if (nchars < size)
-        {
-          filename.assign(buffer, nchars);
-          free(buffer);
-          break;
-        }
-        free(buffer);
-        size *= 2;
-      }
-      ++retries;
-    }
-    else if (S_ISCHR(statBuf.st_mode))
-      return false;
-    else 
-#endif
-    if (S_ISREG(statBuf.st_mode))
-      return true;
-    else
-      throw GsmException(
-        stringPrintf(_("file '%s' is neither file nor character device"),
-                     filename.c_str()),
-        ParameterError);
-  }
-  throw GsmException(_("maxmimum number of symbolic links exceeded"),
-                     ParameterError);
-}
-
-void gsmlib::renameToBackupFile(string filename) throw(GsmException)
-{
-  string backupFilename = filename + "~";
-  unlink(backupFilename.c_str());
-  if (rename(filename.c_str(), backupFilename.c_str()) < 0)
-    throw GsmException(
-      stringPrintf(_("error renaming '%s' to '%s'"),
-                   filename.c_str(), backupFilename.c_str()),
-      OSError, errno);
-}
-
-// NoCopy members
-
-#ifndef NDEBUG
-
-NoCopy::NoCopy(NoCopy &n)
-{
-  cerr << "ABORT: NoCopy copy constructor used" << endl;
-  abort();
-}
-
-NoCopy &NoCopy::operator=(NoCopy &n)
-{
-  cerr << "ABORT: NoCopy::operator= used" << endl;
-  abort();
-#ifdef WIN32
-  return n;
-#endif //WIN32
-}
-
-#endif // NDEBUG
-
-string gsmlib::lowercase(string s)
-{
-  string result;
-  for (unsigned int i = 0; i < s.length(); ++i)
-    result += tolower(s[i]);
-  return result;
-}
-
-int gsmlib::checkNumber(string s) throw(GsmException)
-{
-  for (unsigned int i = 0; i < s.length(); ++i)
-    if (! isdigit(s[i]))
-      throw GsmException(stringPrintf(_("expected number, got '%s'"),
-                                      s.c_str()), ParameterError);
-  int result;
-  istrstream is(s.c_str());
-  is >> result;
-  return result;
-}
-
-#ifdef HAVE_VSNPRINTF
-string gsmlib::stringPrintf(const char *format, ...)
-{
-  va_list args;
-  va_start(args, format);
-  int size = 1024;
-  while (1)
-  {
-    char *buf = (char*)alloca(sizeof(char) * size);
-    int nchars = vsnprintf(buf, size, format, args);
-    if (nchars < size)
-    {
-      va_end(args);
-      return string(buf, nchars);
-    }
-    size *= 2;
-  }
-  return "";
-}
-
-#else
-char gsmlib::__s[20000];        // buffer for the replacement macro
-#endif // HAVE_VSNPRINTF
-
-#ifndef NDEBUG
-int gsmlib::debugLevel()
-{
-  char *s = getenv("GSMLIB_DEBUG");
-  if (s == NULL) return 0;
-  return checkNumber(s);
-}
-#endif
-
-// interrupt interface
-
-namespace gsmlib
-{
-  static InterruptBase *interruptObject = NULL;
-}
-
-void gsmlib::setInterruptObject(InterruptBase *intObject)
-{
-  interruptObject = intObject;
-}
-  
-bool gsmlib::interrupted()
-{
-  return interruptObject != NULL && interruptObject->interrupted();
-}
-
-void gsmlib::checkTextAndTelephone(string text, string telephone)
-  throw(GsmException)
-{
-  if (text.find('"') != string::npos)
-    throw GsmException(
-      stringPrintf(_("text '%s' contains illegal character '\"'"),
-                   text.c_str()),
-      ParameterError);
-
-  for (unsigned int i = 0; i < telephone.length(); ++i)
-    if (! isdigit(telephone[i]) && ! (telephone[i] == '+') &&
-        ! (telephone[i] == '*') && ! (telephone[i] == '#') &&
-        ! (telephone[i] == 'p') && ! (telephone[i] == 'w') &&
-        ! (telephone[i] == 'P') && ! (telephone[i] == 'W'))
-      throw GsmException(
-        stringPrintf(_("illegal character in telephone number '%s'"),
-                     telephone.c_str()), ParameterError);
-}
-
-// progress interface
-
-namespace gsmlib
-{
-  static ProgressBase *progressObject = NULL;
-}
-
-void gsmlib::setProgressObject(ProgressBase *progObject)
-{
-  progressObject = progObject;
-}
-
-void gsmlib::reportProgress(int part, int total)
-{
-  if (progressObject != NULL)
-    progressObject->reportProgress(part, total);
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_util.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_util.h
deleted file mode 100644
index e4cee34372..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_util.h
+++ /dev/null
@@ -1,233 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_util.h
-// *
-// * Purpose: Various utilities
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 4.5.1999
-// *************************************************************************
-
-#ifndef GSM_UTIL_H
-#define GSM_UTIL_H
-
-#include <string>
-#include <vector>
-#include <iostream> 
-#include <gsmlib/gsm_error.h>
-#ifndef WIN32
-#include <sys/time.h>
-#endif
-#include <stdio.h>
-
-using namespace std;
-
-namespace gsmlib
-{
-  // time type
-  typedef struct timeval *GsmTime;
-
-  // some constants
-  const char CR = 13;             // ASCII carriage return
-  const char LF = 10;             // ASCII line feed
-
-  // common number formats
-  const unsigned int UnknownNumberFormat = 129;
-  const unsigned int InternationalNumberFormat = 145;
-
-  // convert gsm to Latin-1
-  // characters that have no counterpart in Latin-1 are converted to
-  // code 172 (Latin-1 boolean not, "�")
-  string gsmToLatin1(string s);
-
-  // convert Latin-1 to gsm
-  // characters that have no counterpart in GSM are converted to
-  // code 16 (GSM Delta)
-  string latin1ToGsm(string s);
-
-  // convert byte buffer of length to hexadecimal string
-  string bufToHex(const unsigned char *buf, unsigned long length);
-
-  // convert hexString to byte buffer, return false if no hexString
-  bool hexToBuf(const string &hexString, unsigned char *buf);
-
-  // indicate that a value is not set
-  const int NOT_SET = -1;
-
-  // An integer range
-  struct IntRange
-  {
-    int _high, _low;
-
-    IntRange() : _high(NOT_SET), _low(NOT_SET) {}
-  };
-
-  // A valid integer range for a given parameter
-  struct ParameterRange
-  {
-    string _parameter;
-    IntRange _range;
-  };
-
-  // *** general-purpose pointer wrapper with reference counting
-
-  class RefBase
-  {
-  private:
-    int _refCount;
-
-  public:
-    RefBase() : _refCount(0) {}
-    int ref() {return _refCount++;}
-    int unref() {return --_refCount;}
-    int refCount() const {return _refCount;}
-  };
-
-  template <class T>
-    class Ref
-    {
-    private:
-      T *_rep;
-    public:
-      T *operator->() const {return _rep;}
-      T &operator()() {return *_rep;}
-      T *getptr() {return _rep;}
-      bool isnull() const {return _rep == (T*)NULL;}
-      Ref() : _rep((T*)NULL) {}
-      Ref(T *pp) : _rep(pp) {if (pp != (T*)NULL) pp->ref();}
-      Ref(const Ref &r);
-      Ref &operator=(const Ref &r);
-      ~Ref();
-      bool operator==(const Ref &r) const
-        {
-          return _rep == r._rep;
-        }
-    };
-
-  template <class T>
-    Ref<T>::Ref(const Ref<T> &r) : _rep(r._rep)
-    {
-      if (_rep != (T*)NULL) _rep->ref();
-    }
-
-  template <class T>
-    Ref<T> &Ref<T>::operator=(const Ref<T> &r)
-    {
-      if (r._rep != (T*)NULL) r._rep->ref();
-      if (_rep != (T*)NULL && _rep->unref() == 0) delete _rep;
-      _rep = r._rep;
-      return *this;
-    }
-
-  template <class T>
-    Ref<T>::~Ref()
-    {
-      if (_rep != (T*)NULL && _rep->unref() == 0) delete _rep;
-    }
-
-  // utility function return string given an int
-  string intToStr(int i);
-
-  // remove white space from the string
-  string removeWhiteSpace(string s);
-
-  // return true if bit is set in vector<bool>
-  inline bool isSet(vector<bool> &b, unsigned int bit)
-    {
-      return b.size() > bit && b[bit];
-    }
-
-  // return true if filename refers to a file
-  // throws exception if filename is neither file nor device
-  bool isFile(string filename);
-
-  // make backup file adequate for this operating system
-  void renameToBackupFile(string filename) throw(GsmException);
-
-  // Base class for class for which copying is not allow
-  // only used for debugging
-
-  class NoCopy
-  {
-  public:
-    NoCopy() {}
-
-#ifndef NDEBUG
-    NoCopy(NoCopy &n);
-
-    NoCopy &operator=(NoCopy &n);
-#endif
-  };
-
-  // convert string to lower case
-  string lowercase(string s);
-
-  // convert string to number and check for all digits
-  int checkNumber(string s) throw(GsmException);
-
-  // like printf, but return C++ string
-#ifdef HAVE_VSNPRINTF
-  string stringPrintf(const char *format, ...)
-#if	__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-     __attribute__((format (printf, 1, 2)))
-#endif
-    ;
-#else
-  // WARNING: This replacement code is
-  // - not threadsafe
-  // - subject to buffer overruns
-#define stringPrintf(format, args...)                   \
-        (sprintf(__s, format, ## args), string(__s))
-
-  extern char __s[];
-#endif // HAVE_VSNPRINTF
-
-  // return debug level
-#ifndef NDEBUG
-  extern int debugLevel();
-#endif
-
-  // interface for interrupting gsmlib activity
-
-  class InterruptBase
-  {
-  public:
-    // this member should return true if gsmlib is to be interrupted
-    virtual bool interrupted() = 0;
-  };
-
-  // set global interrupt object
-  extern void setInterruptObject(InterruptBase *intObject);
-  
-  // return true if interrupted
-  extern bool interrupted();
-
-  // interface for reporting progress
-  
-  class ProgressBase
-  {
-  public:
-    // override this to receive progress reports
-    virtual void reportProgress(int part, int total) = 0;
-  };
-
-  // set global progress object
-  extern void setProgressObject(ProgressBase *progObject);
-
-  // report progress (part/total * 100 is meant to be the percentage)
-  // this function is called by
-  // - GsmAt::chatv() without arguments, used by Phonebook::Phonebook()
-  // - Phonebook::Phonebook()
-  // - SortedPhonebook::SortedPhonebook()
-  // - SortedSMSStore::SortedSMSStore()
-  extern void reportProgress(int part = -1, int total = -1);
-
-  // check for valid text and telephone number
-  // throw exception if error
-  extern void checkTextAndTelephone(string text, string telephone)
-    throw(GsmException);
-};
-
-#endif // GSM_UTIL_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_win32_serial.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_win32_serial.cc
deleted file mode 100644
index dda1d74587..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_win32_serial.cc
+++ /dev/null
@@ -1,507 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_win32_port.cc
-// *
-// * Purpose: WIN32 serial port implementation
-// *
-// * Author:  Frediano Ziglio (freddy77@angelfire.com)
-// *
-// * Created: 25.10.2000
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <winsock.h>
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_win32_serial.h>
-#include <gsmlib/gsm_util.h>
-#include <fcntl.h>
-#include <iostream>
-#include <strstream>
-#include <errno.h>
-#include <stdio.h>
-#include <assert.h>
-#include <signal.h>
-
-using namespace std;
-using namespace gsmlib;
-
-static long int timeoutVal = TIMEOUT_SECS;
-
-struct ExceptionSafeOverlapped: public OVERLAPPED
-{
-  ExceptionSafeOverlapped()
-  {
-    memset((OVERLAPPED*)this,0,sizeof(OVERLAPPED));
-    hEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); 
-    if (hEvent == INVALID_HANDLE_VALUE) 
-      throw GsmException(_("error creating event"),OSError,GetLastError());
-  }
-  ~ExceptionSafeOverlapped()
-  { CloseHandle(hEvent); }
-};
-
-typedef BOOL (WINAPI *TCancelIoProc)(HANDLE file);
-TCancelIoProc CancelIoProc = NULL;
-BOOL CancelIoHook(HANDLE file)
-{
-  if (CancelIoProc)
-    return CancelIoProc(file);
-
-  HMODULE hmodule = GetModuleHandle("KERNEL32");
-  if (hmodule)
-  {
-    CancelIoProc = (TCancelIoProc)GetProcAddress(hmodule,"CancelIo");
-    if (CancelIoProc)
-      return CancelIoProc(file);
-  }
-                         
-  return TRUE;
-}
-#define CancelIo CancelIoHook
-
-// Win32SerialPort members
-
-void Win32SerialPort::throwModemException(string message) throw(GsmException)
-{
-  ostrstream os;
-  os << message << " (errno: " << errno << "/" << strerror(errno) << ")"
-     << ends;
-  char *ss = os.str();
-  string s(ss);
-  delete[] ss;
-  throw GsmException(s, OSError, errno);
-}
-
-void Win32SerialPort::putBack(unsigned char c)
-{
-  assert(_oldChar == -1);
-  _oldChar = c;
-}
-
-int Win32SerialPort::readByte() throw(GsmException)
-{
-  if (_oldChar != -1)
-  {
-    int result = _oldChar;
-    _oldChar = -1;
-    return result;
-  }
-
-  unsigned char c;
-  int timeElapsed = 0;
-  bool readDone = true;
-  ExceptionSafeOverlapped  over;
-
-  DWORD initTime = GetTickCount();
-  DWORD dwReaded;
-  if (!ReadFile(_file,&c,1,&dwReaded,&over))
-  {
-    readDone = false;
-    if (GetLastError() != ERROR_IO_PENDING)
-    {
-      throwModemException(_("reading from TA"));
-    }
-
-    while(!readDone)
-    {
-      if (interrupted())
-        throwModemException(_("interrupted when reading from TA"));
-
-      // wait another second
-      switch(WaitForSingleObject(over.hEvent,1000))
-      {
-      case WAIT_TIMEOUT:
-        break;
-      case WAIT_OBJECT_0:
-      case WAIT_ABANDONED:
-	      // !!! do a infinite loop if (bytesWritten < lenght) ?
-        GetOverlappedResult(_file,&over,&dwReaded,TRUE);
-        readDone = true;
-        break;
-      case WAIT_FAILED:
-        throwModemException(_("reading from TA"));
-      }
-
-      timeElapsed = (GetTickCount() - initTime)/1000U;
-
-      // timeout elapsed ?
-      if (timeElapsed >= timeoutVal)
-      {
-        CancelIo(_file);
-        break;
-      }
-
-    }
-  }
-  
-  if (! readDone)
-    throwModemException(_("timeout when reading from TA"));
-
-#ifndef NDEBUG
-  if (debugLevel() >= 2)
-  {
-    // some useful debugging code
-    if (c == LF)
-      cerr << "<LF>";
-    else if (c == CR)
-      cerr << "<CR>";
-    else cerr << "<'" << (char) c << "'>";
-    cerr.flush();
-  }
-#endif
-  return c;
-}
-
-Win32SerialPort::Win32SerialPort(string device, int lineSpeed,
-                               string initString, bool swHandshake)
-  throw(GsmException) :
-  _oldChar(-1)
-{
- try
- {
-  int holdoff[] = {2000, 1000, 400};
-
-  // open device
-  _file = CreateFile(device.c_str(),GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL );
-  if (_file == INVALID_HANDLE_VALUE)
-    throwModemException(stringPrintf(_("opening device '%s'"),
-                                     device.c_str()));
-
-  int initTries = 3;
-  while (initTries-- > 0)
-  {
-    // flush all pending output
-    FlushFileBuffers(_file);
-
-    // toggle DTR to reset modem
-    if (!EscapeCommFunction(_file,CLRDTR))
-      throwModemException(_("clearing DTR failed"));
-    Sleep(holdoff[initTries]);
-    if (!EscapeCommFunction(_file,SETDTR))
-      throwModemException(_("setting DTR failed"));
-
-    DCB dcb;
-    // get line modes
-    if (!GetCommState(_file,&dcb))
-      throwModemException(stringPrintf(_("GetCommState device '%s'"),
-                                       device.c_str()));
-
-//    if (tcgetattr(_fd, &t) < 0)
-//      throwModemException(stringPrintf(_("tcgetattr device '%s'"),
-//                                       device.c_str()));
-
-    // set the device to a sane state
-    dcb.fBinary = TRUE;
-    dcb.BaudRate = lineSpeed;
-
-    // n,8,1
-    dcb.fParity = FALSE;
-    dcb.Parity = 0;
-    dcb.ByteSize = 8;
-    dcb.StopBits = 0;
-
-    if (!swHandshake)
-    {
-      dcb.fInX = FALSE;
-      dcb.fOutX = FALSE;
-      dcb.fOutxDsrFlow = FALSE;
-      dcb.fOutxCtsFlow = FALSE;
-    }
-    else
-    {
-      dcb.fInX  = TRUE;
-      dcb.fOutX = TRUE;
-      dcb.fOutxDsrFlow = FALSE;
-      dcb.fOutxCtsFlow = FALSE;
-    }
-    dcb.fDtrControl = DTR_CONTROL_ENABLE;
-    dcb.fRtsControl = RTS_CONTROL_ENABLE;
-    
-//    t.c_iflag |= IGNPAR;
-//    t.c_iflag &= ~(INPCK | ISTRIP | IMAXBEL |
-//                   (swHandshake ? CRTSCTS : IXON |  IXOFF)
-//                   | IXANY | IGNCR | ICRNL | IMAXBEL | INLCR | IGNBRK);
-//    t.c_oflag &= ~(OPOST);
-//    // be careful, only touch "known" flags
-//    t.c_cflag&= ~(CSIZE | CSTOPB | PARENB | PARODD);
-//    t.c_cflag|= CS8 | CREAD | HUPCL |
-//      (swHandshake ? IXON |  IXOFF : CRTSCTS) |
-//      CLOCAL;
-//    t.c_lflag &= ~(ECHO | ECHOE | ECHOPRT | ECHOK | ECHOKE | ECHONL |
-//                   ECHOCTL | ISIG | IEXTEN | TOSTOP | FLUSHO | ICANON);
-//    t.c_lflag |= NOFLSH;
-//
-//    t.c_cc[VMIN] = 1;
-//    t.c_cc[VTIME] = 0;
-//
-//    t.c_cc[VSUSP] = 0;
-
-    // write back
-    if (!SetCommState(_file,&dcb))
-      throwModemException(stringPrintf(_("SetCommState device '%s'"),
-                                       device.c_str()));
-
-    Sleep(holdoff[initTries]);
-
-    if (!SetupComm(_file,1024,1024))
-      throwModemException(stringPrintf(_("SetupComm device '%s'"),
-                                       device.c_str()));
- 
-
-    // flush all pending input
-    PurgeComm(_file,PURGE_RXABORT|PURGE_RXCLEAR);
-
-    try
-    {
-      // reset modem
-      putLine("ATZ");
-      bool foundOK = false;
-      int readTries = 5;
-      while (readTries-- > 0)
-      {
-        string s = getLine();
-        if (s.find("OK") != string::npos ||
-            s.find("CABLE: GSM") != string::npos)
-        {
-          foundOK = true;
-          readTries = 0;           // found OK, exit loop
-        }
-      }
-
-      if (foundOK)
-      {
-        // init modem
-        readTries = 5;
-        // !!! no not declare this in loop, compiler error on Visual C++
-        // (without SP and with SP4)
-        string s; 
-        putLine("AT" + initString);
-        do
-        {
-          s = getLine();
-          if (s.find("OK") != string::npos ||
-              s.find("CABLE: GSM") != string::npos)
-            return;                 // found OK, return
-        } while(--readTries);
-      }
-    }
-    catch (GsmException &e)
-    {
-      if (initTries == 0)
-        throw e;
-    }
-  }
-  // no response after 3 tries
-  throw GsmException(stringPrintf(_("reset modem failed '%s'"),
-                                  device.c_str()), OtherError);
- }
- catch (GsmException &e)
- {
-  if ( _file != INVALID_HANDLE_VALUE)
-   CloseHandle(_file);  
-  throw e;
- }
-}
-
-string Win32SerialPort::getLine() throw(GsmException)
-{
-  string result;
-  int c;
-  while ((c = readByte()) > 0)
-  {
-    while (c == CR)
-    {
-      c = readByte();
-    }
-    if (c == LF)
-      break;
-    result += c;
-  }
-
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "<-- " << result << endl;
-#endif
-
-  return result;
-}
-
-void Win32SerialPort::putLine(string line,
-                             bool carriageReturn) throw(GsmException)
-{
-#ifndef NDEBUG
-  if (debugLevel() >= 1)
-    cerr << "--> " << line << endl;
-#endif
-
-  if (carriageReturn) line += CR;
-  // !!! BUG, mantain this pointer isn't corrent, use iterator !!!
-  const char *l = line.c_str();
-  
-  FlushFileBuffers(_file);      // flush all pending input and output
-
-  int timeElapsed = 0;
-
-  DWORD bytesWritten = 0;
-
-  ExceptionSafeOverlapped over;
-
-  DWORD initTime = GetTickCount();
-  if (!WriteFile(_file,l,line.length(),&bytesWritten,&over))
-  {
-    if (GetLastError() != ERROR_IO_PENDING)
-    {
-      throwModemException(_("writing to TA"));
-    }
-
-    while(bytesWritten < (DWORD)line.length())
-    {
-      if (interrupted())
-        throwModemException(_("interrupted when writing to TA"));
-
-      // wait another second
-      switch(WaitForSingleObject(over.hEvent,1000))
-      {
-      case WAIT_TIMEOUT:
-        break;
-      case WAIT_OBJECT_0:
-      case WAIT_ABANDONED:
-	// !!! do a infinite loop if (bytesWritten < lenght) ?
-        GetOverlappedResult(_file,&over,&bytesWritten,TRUE);
-        break;
-      case WAIT_FAILED:
-        throwModemException(_("writing to TA"));
-      }
-
-      timeElapsed = (GetTickCount() - initTime)/1000U;
-
-      // timeout elapsed ?
-      if (timeElapsed >= timeoutVal)
-      {
-        CancelIo(_file);
-        throwModemException(_("timeout when writing to TA"));
-      }
-
-    }
-  }
-
-  return;
-/*
-  // empty buffer
-  SetCommMask(_file,EV_TXEMPTY);
-  DWORD dwEvent;
-  ResetEvent(over.hEvent);
-  if( WaitCommEvent(_file,&dwEvent,&over) )
-    return; // already empty
-
-  // check true errors
-  if (GetLastError() != ERROR_IO_PENDING)
-    throwModemException(_("error comm waiting"));
-
-  while(timeElapsed < timeoutVal)
-  {
-    if (interrupted())
-      throwModemException(_("interrupted when flushing to TA"));
-
-    switch( WaitForSingleObject( over.hEvent, 1000 ) ) 
-    {
-    case WAIT_TIMEOUT:
-      break;
-
-    // successfully flushed
-    case WAIT_ABANDONED:
-    case WAIT_OBJECT_0:
-      return;
-
-    default:
-      throwModemException(_("error waiting"));
-    }
-    timeElapsed = (GetTickCount() - initTime)/1000U;
-  }
-
-  CancelIo(_file);
-  throwModemException(_("timeout when writing to TA"));
-*/
-
-  // echo CR LF must be removed by higher layer functions in gsm_at because
-  // in order to properly handle unsolicited result codes from the ME/TA
-}
-
-bool Win32SerialPort::wait(GsmTime timeout) throw(GsmException)
-{
-  // See differences from UNIX
-  // Why do I use Windows ?
-  DWORD dwEvent;
-  SetCommMask(_file,EV_RXCHAR);
-  if (!timeout)
-  {
-    if( !WaitCommEvent(_file,&dwEvent,NULL) )
-      throwModemException(_("error comm waiting"));
-    return true;
-  }
-  
-  ExceptionSafeOverlapped over;
-  if( !WaitCommEvent(_file,&dwEvent,&over) )
-  {
-    // check true errors
-    if (GetLastError() != ERROR_IO_PENDING)
-      throwModemException(_("error comm waiting"));
-
-    switch( WaitForSingleObject( over.hEvent, timeout->tv_sec*1000U+(timeout->tv_usec/1000U) ) ) 
-    {
-    case WAIT_TIMEOUT:
-      CancelIo(_file);
-      return false;
-
-    case WAIT_ABANDONED:
-    case WAIT_OBJECT_0:
-      return true;
-
-    default:
-      throwModemException(_("error waiting"));
-    }
-  }
-
-  return true;
-}
-
-void Win32SerialPort::setTimeOut(unsigned int timeout)
-{
-  timeoutVal = timeout;
-}
-
-Win32SerialPort::~Win32SerialPort()
-{
-  if ( _file != INVALID_HANDLE_VALUE)
-    CloseHandle(_file);
-}
-
-int gsmlib::baudRateStrToSpeed(string baudrate) throw(GsmException)
-{
-  if (baudrate == "300")
-    return 300;
-  else if (baudrate == "600")
-    return 600;
-  else if (baudrate == "1200")
-    return 1200;
-  else if (baudrate == "2400")
-    return 2400;
-  else if (baudrate == "4800")
-    return 4800;
-  else if (baudrate == "9600")
-    return 9600;
-  else if (baudrate == "19200")
-    return 19200;
-  else if (baudrate == "38400")
-    return 38400;
-  else if (baudrate == "57600")
-    return 57600;
-  else if (baudrate == "115200")
-    return 115200;
-  else
-    throw GsmException(stringPrintf(_("unknown baudrate '%s'"),
-                                    baudrate.c_str()), ParameterError);
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_win32_serial.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_win32_serial.h
deleted file mode 100644
index 627bd09354..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/gsmlib/gsm_win32_serial.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    gsm_win32_port.h
-// *
-// * Purpose: WIN32 serial port implementation
-// *
-// * Author:  Frediano Ziglio (freddy77@angelfire.com)
-// *
-// * Created: 25.10.2000
-// *************************************************************************
-
-#ifndef GSM_WIN32_SERIAL_H
-#define GSM_WIN32_SERIAL_H
-
-#include <string>
-#include <gsmlib/gsm_error.h>
-#include <gsmlib/gsm_port.h>
-#include <gsmlib/gsm_util.h>
-#define WIN32_MEAN_AND_LEAN
-#include <windows.h>
-
-using namespace std;
-
-namespace gsmlib
-{
-  class Win32SerialPort : public Port
-  {
-  private:
-    HANDLE _file;               // file handle for device
-    int _oldChar;               // character set by putBack() (-1 == none)
-//    OVERLAPPED _overIn;         // overlapped structure for wait
-
-    // throw GsmException include UNIX errno
-    void throwModemException(string message) throw(GsmException);
-    
-  public:
-    // create Port given the UNIX device name
-    Win32SerialPort(string device, int lineSpeed = DEFAULT_BAUD_RATE,
-                   string initString = DEFAULT_INIT_STRING,
-                   bool swHandshake = false)
-      throw(GsmException);
-
-    // inherited from Port
-    void putBack(unsigned char c);
-    int readByte() throw(GsmException);
-    string getLine() throw(GsmException);
-    void putLine(string line,
-                         bool carriageReturn = true) throw(GsmException);
-    bool wait(GsmTime timeout) throw(GsmException);
-    void setTimeOut(unsigned int timeout);
-
-    virtual ~Win32SerialPort();
-  };
-
-  // convert baudrate string ("300" .. "460800") to speed_t
-  extern int baudRateStrToSpeed(string baudrate) throw(GsmException);
-};
-
-#endif // GSM_UNIX_SERIAL_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/ChangeLog b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/ChangeLog
deleted file mode 100644
index 198950159d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/ChangeLog
+++ /dev/null
@@ -1,1086 +0,0 @@
-1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intl/localealias.c (read_alias_file): Use unsigned char for
-	local variables.  Remove unused variable tp.
-	* intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
-	for type of codeset.  For loosing Solaris systems.
-	* intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
-	* intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
-	len if not needed.
-	Patches by Jim Meyering.
-
-1998-04-28  Ulrich Drepper  <drepper@cygnus.com>
-
-	* loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if
-	mmap is not supported.
-
-	* hash-string.h: Don't include <values.h>.
-
-1998-04-27  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Use strdup is available.
-
-	* localealias.c: Define HAVE_MEMPCPY so that we can use this
-	function.  Define and use semapahores to protect modfication of
-	global objects when compiling for glibc.  Add code to allow
-	freeing alias table.
-
-	* l10nflist.c: Don't assume stpcpy not being a macro.
-
-	* gettextP.h: Define internal_function macri if not already done.
-	Use glibc byte-swap macros instead of defining SWAP when compiled
-	for glibc.
-	(struct loaded_domain): Add elements to allow unloading.
-
-	* Makefile.in (distclean): Don't remove libintl.h here.
-
-	* bindtextdomain.c: Carry over changes from glibc.  Use strdup if
-	available.
-
-	* dcgettext.c: Don't assume stpcpy not being a macro.  Mark internal
-	functions.  Add memory freeing code for glibc.
-
-	* dgettext.c: Update copyright.
-
-	* explodename.c: Include stdlib.h and string.h only if they exist.
-	Use strings.h eventually.
-
-	* finddomain.c: Mark internal functions.  Use strdup if available.
-	Add memory freeing code for glibc.
-
-1997-10-10 20:00  Ulrich Drepper  <drepper@cygnus.com>
-
-	* libgettext.h: Fix dummy textdomain and bindtextdomain macros.
-	They should return reasonable values.
-	Reported by Tom Tromey <tromey@cygnus.com>.
-
-1997-09-16 03:33  Ulrich Drepper  <drepper@cygnus.com>
-
-	* libgettext.h: Define PARAMS also to `args' if __cplusplus is defined.
-	* intlh.inst.in: Likewise.
-	Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>.
-
-	* libintl.glibc: Update from current glibc version.
-
-1997-09-06 02:10  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in: Reformat copyright.
-
-1997-08-19 15:22  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (DCGETTEXT): Remove wrong comment.
-
-1997-08-16 00:13  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install-data): Don't change directory to install.
-
-1997-08-01 14:30  Ulrich Drepper  <drepper@cygnus.com>
-
-	* cat-compat.c: Fix copyright.
-
-	* localealias.c: Don't define strchr unless !HAVE_STRCHR.
-
-	* loadmsgcat.c: Update copyright.  Fix typos.
-
-	* l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
-	(_nl_make_l10nflist): Handle sponsor and revision correctly.
-
-	* gettext.c: Update copyright.
-	* gettext.h: Likewise.
-	* hash-string.h: Likewise.
-
-	* finddomain.c: Remoave dead code.  Define strchr only if
-	!HAVE_STRCHR.
-
-	* explodename.c: Include <sys/types.h>.
-
-	* explodename.c: Reformat copyright text.
-	(_nl_explode_name): Fix typo.
-
-	* dcgettext.c: Define and use __set_errno.
-	(guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
-	not defined.
-
-	* bindtextdom.c: Pretty printing.
-
-1997-05-01 02:25  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (guess_category_value): Don't depend on
-	HAVE_LC_MESSAGES.  We don't need the macro here.
-	Patch by Bruno Haible <haible@ilog.fr>.
-
-	* cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
-	macro.  Instead use HAVE_LOCALE_NULL and define it when using
-	glibc, as in dcgettext.c.
-	Patch by Bruno Haible <haible@ilog.fr>.
-
-	* Makefile.in (CPPFLAGS): New variable.  Reported by Franc,ois
-	Pinard.
-
-Mon Mar 10 06:51:17 1997  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in: Implement handling of libtool.
-
-	* gettextP.h: Change data structures for use of generic lowlevel
-	i18n file handling.
-
-Wed Dec  4 20:21:18 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Put parentheses around arguments of memcpy macro
-	definition.
-	* localealias.c: Likewise.
-	* l10nflist.c: Likewise.
-	* finddomain.c: Likewise.
-	* bindtextdom.c: Likewise.
-	Reported by Thomas Esken.
-
-Mon Nov 25 22:57:51 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Move definition of `memcpy` macro to right
-	position.
-
-Fri Nov 22 04:01:58 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using
- 	bcopy if not already defined.  Reported by Thomas Esken.
-	* bindtextdom.c: Likewise.
-	* l10nflist.c: Likewise.
-	* localealias.c: Likewise.
-	* textdomain.c: Likewise.
-
-Tue Oct 29 11:10:27 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (libdir): Change to use exec_prefix instead of
- 	prefix.  Reported by Knut-H�vardAksnes <etokna@eto.ericsson.se>.
-
-Sat Aug 31 03:07:09 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c (_nl_normalize_codeset): We convert to lower case,
-	so don't prepend uppercase `ISO' for only numeric arg.
-
-Fri Jul 19 00:15:46 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after
-	definition of _GNU_SOURCE.  Patch by Roland McGrath.
-
-	* Makefile.in (uninstall): Fix another bug with `for' loop and
-	empty arguments.  Patch by Jim Meyering.  Correct name os
-	uninstalled files: no intl- prefix anymore.
-
-	* Makefile.in (install-data): Again work around shells which
-	cannot handle mpty for list.  Reported by Jim Meyering.
-
-Sat Jul 13 18:11:35 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Split goal.  Now depend on install-exec
-        and install-data.
-	(install-exec, install-data): New goals.  Created from former
-	install goal.
-	Reported by Karl Berry.
-
-Sat Jun 22 04:58:14 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (MKINSTALLDIRS): New variable.  Path to
-        mkinstalldirs script.
-	(install): use MKINSTALLDIRS variable or if the script is not present
-	try to find it in the $top_scrdir).
-
-Wed Jun 19 02:56:56 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Linux libc *partly* includes the argz_* functions.
-	Grr.  Work around by renaming the static version and use macros
-	for renaming.
-
-Tue Jun 18 20:11:17 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Correct presence test macros of __argz_* functions.
-
-	* l10nflist.c: Include <argz.h> based on test of it instead when
-	__argz_* functions are available.
-	Reported by Andreas Schwab.
-
-Thu Jun 13 15:17:44 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* explodename.c, l10nflist.c: Define NULL for dumb systems.
-
-Tue Jun 11 17:05:13 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in, libgettext.h (dcgettext): Rename local variable
-	result to __result to prevent name clash.
-
-	* l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
-        get prototype for stpcpy and strcasecmp.
-
-	* intlh.inst.in, libgettext.h: Move declaration of
-	`_nl_msg_cat_cntr' outside __extension__ block to prevent warning
-	from gcc's -Wnested-extern option.
-
-Fri Jun  7 01:58:00 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Remove comment.
-
-Thu Jun  6 17:28:17 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Work around for another Buglix stupidity.
-	Always use an `else' close for `if's.  Reported by Nelson Beebe.
-
-	* Makefile.in (intlh.inst): Correct typo in phony rule.
-	Reported by Nelson Beebe.
-
-Thu Jun  6 01:49:52 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (read_alias_file): Rename variable alloca_list to
-	block_list as the macro calls assume.
-	Patch by Eric Backus.
-
-	* localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
-        malloc.
-	(read_alias_file): Rename varriabe alloca_list to block_list as the
-	macro calls assume.
-	Patch by Eric Backus.
-
-	* l10nflist.c: Correct conditional for <argz.h> inclusion.
-	Reported by Roland McGrath.
-
-	* Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
-        all-@USE_NLS@.
-
-	* Makefile.in (install): intlh.inst comes from local dir, not
-        $(srcdir).
-
-	* Makefile.in (intlh.inst): Special handling of this goal.  If
-	used in gettext, this is really a rul to construct this file.  If
-	used in any other package it is defined as a .PHONY rule with
-	empty body.
-
-	* finddomain.c: Extract locale file information handling into
-	l10nfile.c.  Rename local stpcpy__ function to stpcpy.
-
-	* dcgettext.c (stpcpy): Add local definition.
-
-	* l10nflist.c: Solve some portability problems.  Patches partly by
-	Thomas Esken.  Add local definition of stpcpy.
-
-Tue Jun  4 02:47:49 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in: Don't depend including <locale.h> on
-	HAVE_LOCALE_H.  Instead configure must rewrite this fiile
-	depending on the result of the configure run.
-
-	* Makefile.in (install): libintl.inst is now called intlh.inst.
-	Add rules for updating intlh.inst from intlh.inst.in.
-
-	* libintl.inst: Renamed to intlh.inst.in.
-
-	* localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
-        because gcc has __buitlin_alloca.
-	Reported by Roland McGrath.
-
-Mon Jun  3 00:32:16 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (installcheck): New goal to fulfill needs of
-        automake's distcheck.
-
-	* Makefile.in (install): Reorder commands so that VERSION is
-        found.
-
-	* Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
-        @datadir@/gettext.
-	(COMSRCS): Add l10nfile.c.
-	(OBJECTS): Add l10nfile.o.
-	(DISTFILES): Rename to DISTFILE.normal.  Remove $(DISTFILES.common).
-	(DISTFILE.gettext): Remove $(DISTFILES.common).
-	(all-gettext): Remove goal.
-	(install): If $(PACKAGE) = gettext install, otherwose do nothing.  No
-	package but gettext itself should install libintl.h + headers.
-	(dist): Extend goal to work for gettext, too.
-	(dist-gettext): Remove goal.
-
-	* dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc.
-
-Sun Jun  2 17:33:06 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* loadmsgcat.c (_nl_load_domain): Parameter is now comes from
-        find_l10nfile.
-
-Sat Jun  1 02:23:03 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c (__argz_next): Add definition.
-
-	* dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca
-	code.  Use new l10nfile handling.
-
-	* localealias.c [!HAVE_ALLOCA]: Add code for handling missing
-        alloca code.
-
-	* l10nflist.c: Initial revision.
-
-Tue Apr  2 18:51:18 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all-gettext): New goal.  Same as all-yes.
-
-Thu Mar 28 23:01:22 1996  Karl Eichwalder  <ke@ke.central.de>
-
-	* Makefile.in (gettextsrcdir): Define using @datadir@.
-
-Tue Mar 26 12:39:14 1996  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Include <ctype.h>.  Reported by Roland McGrath.
-
-Sat Mar 23 02:00:35 1996  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
-        with external declaration.
-
-Sat Mar  2 00:47:09 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all-no): Rename from all_no.
-
-Sat Feb 17 00:25:59 1996  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h [loaded_domain]: Array `successor' must now contain up
-        to 63 elements (because of codeset name normalization).
-
-	* finddomain.c: Implement codeset name normalization.
-
-Thu Feb 15 04:39:09 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all): Define to `all-@USE_NLS@'.
-	(all-yes, all_no): New goals.  `all-no' is noop, `all-yes'
-	is former all.
-
-Mon Jan 15 21:46:01 1996  Howard Gayle  <howard@hal.com>
-
-	* localealias.c (alias_compare): Increment string pointers in loop
-        of strcasecmp replacement.
-
-Fri Dec 29 21:16:34 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src): Who commented this goal out ? :-)
-
-Fri Dec 29 15:08:16 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (DCGETTEXT): Save `errno'.  Failing system calls
-	should not effect it because a missing catalog is no error.
-	Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>.
-
-Tue Dec 19 22:09:13 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (Makefile): Explicitly use $(SHELL) for running
-        shell scripts.
-
-Fri Dec 15 17:34:59 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* Makefile.in (install-src): Only install library and header when
-	we use the own implementation.  Don't do it when using the
-	system's gettext or catgets functions.
-
-	* dcgettext.c (find_msg): Must not swap domain->hash_size here.
-
-Sat Dec  9 16:24:37 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c, libintl.inst, libgettext.h, hash-string.h,
-	gettextP.h, finddomain.c, dcgettext.c, cat-compat.c:
-	Use PARAMS instead of __P.  Suggested by Roland McGrath.
-
-Tue Dec  5 11:39:14 1995  Larry Schwimmer  <rosebud@cyclone.stanford.edu>
-
-	* libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if
-	!_LIBINTL_H' because Solaris defines _LIBINTL_H as empty.
-
-Mon Dec  4 15:42:07 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src):
-	Install libintl.inst instead of libintl.h.install.
-
-Sat Dec  2 22:51:38 1995  Marcus Daniels  <marcus@sysc.pdx.edu>
-
-	* cat-compat.c (textdomain):
-	Reverse order in which files are tried you load.  First
-	try local file, when this failed absolute path.
-
-Wed Nov 29 02:03:53 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
-
-	* cat-compat.c (bindtextdomain): Add missing { }.
-
-Sun Nov 26 18:21:41 1995  Ulrich Drepper  <drepper@myware>
-
-	* libintl.inst: Add missing __P definition.  Reported by Nelson Beebe.
-
-	* Makefile.in:
-	Add dummy `all' and `dvi' goals.  Reported by Tom Tromey.
-
-Sat Nov 25 16:12:01 1995  Franc,ois Pinard  <pinard@iro.umontreal.ca>
-
-	* hash-string.h: Capitalize arguments of macros.
-
-Sat Nov 25 12:01:36 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Prevent files names longer than 13
-	characters.  libintl.h.glibc->libintl.glibc,
-	libintl.h.install->libintl.inst.  Reported by Joshua R. Poulson.
-
-Sat Nov 25 11:31:12 1995  Eric Backus  <ericb@lsid.hp.com>
-
-	* dcgettext.c: Fix bug in preprocessor conditionals.
-
-Sat Nov 25 02:35:27 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
-
-	* libgettext.h: Solaris cc does not understand
-	 #if !SYMBOL1 && !SYMBOL2.  Sad	but true.
-
-Thu Nov 23 16:22:14 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h (hash_string):
-	Fix for machine with >32 bit `unsigned long's.
-
-	* dcgettext.c (DCGETTEXT):
-	Fix horrible bug in loop for alternative translation.
-
-Thu Nov 23 01:45:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in, linux-msg.sed, xopen-msg.sed:
-	Some further simplifications in message number generation.
-
-Mon Nov 20 21:08:43 1995  Ulrich Drepper  <drepper@myware>
-
-	* libintl.h.glibc: Use __const instead of const in prototypes.
-
-	* Makefile.in (install-src):
-	Install libintl.h.install instead of libintl.h.  This
-	is a stripped-down version.  Suggested by Peter Miller.
-
-	* libintl.h.install, libintl.h.glibc: Initial revision.
-
-	* localealias.c (_nl_expand_alias, read_alias_file):
-	Protect prototypes in type casts by __P.
-
-Tue Nov 14 16:43:58 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h: Correct prototype for hash_string.
-
-Sun Nov 12 12:42:30 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h (hash_string): Add prototype.
-
-	* gettextP.h: Fix copyright.
-	(SWAP): Add prototype.
-
-Wed Nov  8 22:56:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (read_alias_file): Forgot sizeof.
-	Avoid calling *printf function.  This introduces a big overhead.
-	Patch by Roland McGrath.
-
-Tue Nov  7 14:21:08 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy.
-
-	* finddomain.c (stpcpy):
-	Define substitution function local.  The macro was to flaky.
-
-	* cat-compat.c: Fix typo.
-
-	* xopen-msg.sed, linux-msg.sed:
-	While bringing message number to right place only accept digits.
-
-	* linux-msg.sed, xopen-msg.sed: Now that the counter does not have
-	leading 0s we don't need to remove them.  Reported by Marcus
-	Daniels.
-
-	* Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in
-	dependency.  Reported by Marcus Daniels.
-
-	* cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement.
-	Generally cleanup using #if instead of #ifndef.
-
-	* Makefile.in: Correct typos in comment.  By Franc,ois Pinard.
-
-Mon Nov  6 00:27:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src): Don't install libintl.h and libintl.a
-	if we use an available gettext implementation.
-
-Sun Nov  5 22:02:08 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS.  Reported
-	by Franc,ois Pinard.
-
-	* libgettext.h: Use #if instead of #ifdef/#ifndef.
-
-	* finddomain.c:
-	Comments describing what has to be done should start with FIXME.
-
-Sun Nov  5 19:38:01 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Split.  Use DISTFILES with normal meaning.
-	DISTFILES.common names the files common to both dist goals.
-	DISTFILES.gettext are the files only distributed in GNU gettext.
-
-Sun Nov  5 17:32:54 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (DCGETTEXT): Correct searching in derived locales.
-	This was necessary since a change in _nl_find_msg several weeks
-	ago.  I really don't know this is still not fixed.
-
-Sun Nov  5 12:43:12 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL.  This
-	might mark a special condition.
-
-	* finddomain.c (make_entry_rec): Don't make illegal entry as decided.
-
-	* Makefile.in (dist): Suppress error message when ln failed.
-	Get files from $(srcdir) explicitly.
-
-	* libgettext.h (gettext_const): Rename to gettext_noop.
-
-Fri Nov  3 07:36:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (make_entry_rec):
-	Protect against wrong locale names by testing mask.
-
-	* libgettext.h (gettext_const): Add macro definition.
-	Capitalize macro arguments.
-
-Thu Nov  2 23:15:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Test for pointer != NULL before accessing value.
-	Reported by Tom Tromey.
-
-	* gettext.c (NULL):
-	Define as (void*)0 instad of 0.  Reported by Franc,ois Pinard.
-
-Mon Oct 30 21:28:52 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in: Serious typo bug fixed by Jim Meyering.
-
-Sat Oct 28 23:20:47 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h: Disable dcgettext optimization for Solaris 2.3.
-
-	* localealias.c (alias_compare):
-	Peter Miller reported that tolower in some systems is
-	even dumber than I thought.  Protect call by `isupper'.
-
-Fri Oct 27 22:22:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (libdir, includedir): New variables.
-	(install-src): Install libintl.a and libintl.h in correct dirs.
-
-Fri Oct 27 22:07:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c.
-
-	* po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques.
-
-	* localealias.c:
-	Fix typo and superflous test.  Reported by Christian von Roques.
-
-Fri Oct  6 11:52:05 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Correct some remainder from the pre-CEN syntax.  Now
-	we don't have a constant number of successors anymore.
-
-Wed Sep 27 21:41:13 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Add libintl.h.glibc.
-
-	* Makefile.in (dist-libc): Add goal for packing sources for glibc.
-	(COMSRCS, COMHDRS): Splitted to separate sources shared with glibc.
-
-	* loadmsgcat.c: Forget to continue #if line.
-
-	* localealias.c:
-	[_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name
-	space clean.
-
-	* dcgettext.c, finddomain.c: Better comment to last change.
-
-	* loadmsgcat.c:
-	[_LIBC]: Rename fstat, open, close, read, mmap, and munmap to
-	__fstat, __open, __close, __read, __mmap, and __munmap resp
-	to keep ANSI C name space clean.
-
-	* finddomain.c:
-	[_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean.
-
-	* dcgettext.c:
-	[_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to
-	keep ANSI C name space clean.
-
-	* libgettext.h:
-	Include sys/types.h for those old SysV systems out there.
-	Reported by Francesco Potorti`.
-
-	* loadmsgcat.c (use_mmap): Define if compiled for glibc.
-
-	* bindtextdom.c: Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* finddomain.c: Fix 2 times defiend -> defined.
-
-	* textdomain.c: Include libintl.h instead of libgettext.h when
-	compiling for glibc.  Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* localealias.c, loadmsgcat.c: Prepare to be compiled in glibc.
-
-	* gettext.c:
-	Include libintl.h instead of libgettext.h when compiling for glibc.
-	Get NULL from stddef.h if we compile for glibc.
-
-	* finddomain.c: Include libintl.h instead of libgettext.h when
-	compiling for glibc.  Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* dcgettext.c: Include all those standard headers unconditionally
-	if _LIBC is defined.
-
-	* dgettext.c: If compiled in glibc include libintl.h instead of
-	libgettext.h.
-	(locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc.
-
-	* dcgettext.c: If compiled in glibc include libintl.h instead of
-	libgettext.h.
-	(getcwd): Don't rely on HAVE_GETCWD when compiling for glibc.
-
-	* bindtextdom.c:
-	If compiled in glibc include libintl.h instead of libgettext.h.
-
-Mon Sep 25 22:23:06 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0.
-	Reported by Marcus Daniels.
-
-	* cat-compat.c (bindtextdomain):
-	String used in putenv must not be recycled.
-	Reported by Marcus Daniels.
-
-	* libgettext.h (__USE_GNU_GETTEXT):
-	Additional symbol to signal that we use GNU gettext
-	library.
-
-	* cat-compat.c (bindtextdomain):
-	Fix bug with the strange stpcpy replacement.
-	Reported by Nelson Beebe.
-
-Sat Sep 23 08:23:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* cat-compat.c: Include <string.h> for stpcpy prototype.
-
-	* localealias.c (read_alias_file):
-	While expand strdup code temporary variable `cp' hided
-	higher level variable with same name.  Rename to `tp'.
-
-	* textdomain.c (textdomain):
-	Avoid warning by using temporary variable in strdup code.
-
-	* finddomain.c (_nl_find_domain): Remove unused variable `application'.
-
-Thu Sep 21 15:51:44 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (alias_compare):
-	Use strcasecmp() only if available.  Else use
-	implementation in place.
-
-	* intl-compat.c:
-	Wrapper functions now call *__ functions instead of __*.
-
-	* libgettext.h: Declare prototypes for *__ functions instead for __*.
-
-	* cat-compat.c, loadmsgcat.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-
-	* bindtextdom.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-	Rename to bindtextdomain__ if not used in GNU C Library.
-
-	* dgettext.c:
-	Rename function to dgettext__ if not used in GNU C Library.
-
-	* gettext.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-	Functions now called gettext__ if not used in GNU C Library.
-
-	* dcgettext.c, localealias.c, textdomain.c, finddomain.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-
-Sun Sep 17 23:14:49 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Correct some bugs in handling of CEN standard
- 	locale definitions.
-
-Thu Sep  7 01:49:28 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Implement CEN syntax.
-
-	* gettextP.h (loaded_domain): Extend number of successors to 31.
-
-Sat Aug 19 19:25:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (aliaspath): Remove path to X11 locale dir.
-
-	* Makefile.in: Make install-src depend on install.  This helps
- 	gettext to install the sources and other packages can use the
- 	install goal.
-
-Sat Aug 19 15:19:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (uninstall): Remove stuff installed by install-src.
-
-Tue Aug 15 13:13:53 1995  Ulrich Drepper  <drepper@myware>
-
-	* VERSION.in: Initial revision.
-
-	* Makefile.in (DISTFILES):
-	Add VERSION file.  This is not necessary for gettext, but
-	for other packages using this library.
-
-Tue Aug 15 06:16:44 1995  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h (_nl_find_domain):
-	New prototype after changing search strategy.
-
-	* finddomain.c (_nl_find_domain):
-	We now try only to find a specified catalog.  Fall back to other
-	catalogs listed in the locale list is now done in __dcgettext.
-
-	* dcgettext.c (__dcgettext):
-	Now we provide message fall back even to different languages.
-	I.e. if a message is not available in one language all the other
- 	in the locale list a tried.  Formerly fall back was only possible
- 	within one language.  Implemented by moving one loop from
- 	_nl_find_domain to here.
-
-Mon Aug 14 23:45:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (gettextsrcdir):
-	Directory where source of GNU gettext library are made
-	available.
-	(INSTALL, INSTALL_DATA): Programs used for installing sources.
-	(gettext-src): New.  Rule to install GNU gettext sources for use in
-	gettextize shell script.
-
-Sun Aug 13 14:40:48 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c (_nl_load_domain):
-	Use mmap for loading only when munmap function is
-	also available.
-
-	* Makefile.in (install): Depend on `all' goal.
-
-Wed Aug  9 11:04:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (read_alias_file):
-	Do not overwrite '\n' when terminating alias value string.
-
-	* localealias.c (read_alias_file):
-	Handle long lines.  Ignore the rest not fitting in
-	the buffer after the initial `fgets' call.
-
-Wed Aug  9 00:54:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h (_nl_load_domain):
-	Add prototype, replacing prototype for _nl_load_msg_cat.
-
-	* finddomain.c (_nl_find_domain):
-	Remove unneeded variable filename and filename_len.
-	(expand_alias): Remove prototype because functions does not
- 	exist anymore.
-
-	* localealias.c (read_alias_file):
-	Change type of fname_len parameter to int.
-	(xmalloc): Add prototype.
-
-	* loadmsgcat.c: Better prototypes for xmalloc.
-
-Tue Aug  8 22:30:39 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Allow alias name to be constructed from the four components.
-
-	* Makefile.in (aliaspath): New variable.  Set to preliminary value.
-	(SOURCES): Add localealias.c.
-	(OBJECTS): Add localealias.o.
-
-	* gettextP.h: Add prototype for _nl_expand_alias.
-
-	* finddomain.c: Aliasing handled in intl/localealias.c.
-
-	* localealias.c: Aliasing for locale names.
-
-	* bindtextdom.c: Better prototypes for xmalloc and xstrdup.
-
-Mon Aug  7 23:47:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): gettext.perl is now found in misc/.
-
-	* cat-compat.c (bindtextdomain):
-	Correct implementation.  dirname parameter was not used.
-	Reported by Marcus Daniels.
-
-	* gettextP.h (loaded_domain):
-	New fields `successor' and `decided' for oo, lazy
-	message handling implementation.
-
-	* dcgettext.c:
-	Adopt for oo, lazy message handliing.
-  	Now we can inherit translations from less specific locales.
-	(find_msg): New function.
-
-	* loadmsgcat.c, finddomain.c:
-	Complete rewrite.  Implement oo, lazy message handling :-).
-  	We now have an additional environment variable `LANGUAGE' with
- 	a higher priority than LC_ALL for the LC_MESSAGE locale.
-  	Here we can set a colon separated list of specifications each
- 	of the form `language[_territory[.codeset]][@modifier]'.
-
-Sat Aug  5 09:55:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (unistd.h):
-	Include to get _PC_PATH_MAX defined on system having it.
-
-Fri Aug  4 22:42:00 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (stpcpy): Include prototype.
-
-	* Makefile.in (dist): Remove `copying instead' message.
-
-Wed Aug  2 18:52:03 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (ID, TAGS): Do not use $^.
-
-Tue Aug  1 20:07:11 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (TAGS, ID): Use $^ as command argument.
-	(TAGS): Give etags -o option t write to current directory,
- 	not $(srcdir).
-	(ID): Use $(srcdir) instead os $(top_srcdir)/src.
-	(distclean): Remove ID.
-
-Sun Jul 30 11:51:46 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (gnulocaledir):
-	New variable, always using share/ for data directory.
-	(DEFS): Add GNULOCALEDIR, used in finddomain.c.
-
-	* finddomain.c (_nl_default_dirname):
-	Set to GNULOCALEDIR, because it always has to point
-	to the directory where GNU gettext Library writes it to.
-
-	* intl-compat.c (textdomain, bindtextdomain):
-	Undefine macros before function definition.
-
-Sat Jul 22 01:10:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h (_LIBINTL_H):
-	Protect definition in case where this file is included as
-	libgettext.h on Solaris machines.  Add comment about this.
-
-Wed Jul 19 02:36:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* intl-compat.c (textdomain): Correct typo.
-
-Wed Jul 19 01:51:35 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (dcgettext): Function now called __dcgettext.
-
-	* dgettext.c (dgettext): Now called __dgettext and calls
- 	__dcgettext.
-
-	* gettext.c (gettext):
-	Function now called __gettext and calls __dgettext.
-
-	* textdomain.c (textdomain): Function now called __textdomain.
-
-	* bindtextdom.c (bindtextdomain): Function now called
- 	__bindtextdomain.
-
-	* intl-compat.c: Initial revision.
-
-	* Makefile.in (SOURCES): Add intl-compat.c.
-	(OBJECTS): We always compile the GNU gettext library functions.
-  	OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o,
- 	and intl-compat.o.
-  	(GETTOBJS): Contains now only intl-compat.o.
-
-	* libgettext.h:
-	Re-include protection matches dualistic character of libgettext.h.
-	For all functions in GNU gettext library define __ counter part.
-
-	* finddomain.c (strchr): Define as index if not found in C library.
-	(_nl_find_domain): For relative paths paste / in between.
-
-Tue Jul 18 16:37:45 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h.
-
-	* xopen-msg.sed: Fix bug with `msgstr ""' lines.
-	A little bit better comments.
-
-Tue Jul 18 01:18:27 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in:
-	po-mode.el, makelinks, combine-sh are now found in ../misc.
-
-	* po-mode.el, makelinks, combine-sh, elisp-comp:
-	Moved to ../misc/.
-
-	* libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__.
-
-Sun Jul 16 22:33:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (INSTALL, INSTALL_DATA): New variables.
-	(install-data, uninstall): Install/uninstall .elc file.
-
-	* po-mode.el (Installation comment):
-	Add .pox as possible extension of .po files.
-
-Sun Jul 16 13:23:27 1995  Ulrich Drepper  <drepper@myware>
-
-	* elisp-comp: Complete new version by Franc,ois: This does not
- 	fail when not compiling in the source directory.
-
-Sun Jul 16 00:12:17 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (../po/cat-id-tbl.o):
-	Use $(MAKE) instead of make for recursive make.
-
-	* Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh.
-	(install-exec): Add missing dummy goal.
-	(install-data, uninstall): @ in multi-line shell command at
- 	beginning, not in front of echo.  Reported by Eric Backus.
-
-Sat Jul 15 00:21:28 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES):
-	Rename libgettext.perl to gettext.perl to fit in 14 chars
-	file systems.
-
-	* gettext.perl:
- 	Rename to gettext.perl to fit in 14 chars file systems.
-
-Thu Jul 13 23:17:20 1995  Ulrich Drepper  <drepper@myware>
-
-	* cat-compat.c: If !STDC_HEADERS try to include malloc.h.
-
-Thu Jul 13 20:55:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in: Pretty printing.
-
-	* linux-msg.sed, xopen-msg.sed:
-	Correct bugs with handling substitute flags in branches.
-
-	* hash-string.h (hash_string):
-	Old K&R compilers don't under stand `unsigned char'.
-
-	* gettext.h (nls_uint32):
-	Some old K&R compilers (eg HP) don't understand `unsigned int'.
-
-	* cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes.
-
-Thu Jul 13 01:34:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (ELCFILES): New variable.
-	(DISTFILES): Add elisp-comp.
-	Add implicit rule for .el -> .elc compilation.
-	(install-data): install $ELCFILES
-	(clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp.
-
-	* elisp-comp: Initial revision
-
-Wed Jul 12 16:14:52 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in:
-	cat-id-tbl.c is now found in po/.  This enables us to use an identical
-	intl/ directory in all packages.
-
-	* dcgettext.c (dcgettext): hashing does not work for table size <= 2.
-
-	* textdomain.c: fix typo (#if def -> #if defined)
-
-Tue Jul 11 18:44:43 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (stamp-cat-id): use top_srcdir to address source files
-	(DISTFILES,distclean): move tupdate.perl to src/
-
-	* po-to-tbl.sed.in:
-	add additional jump to clear change flag to recognize multiline strings
-
-Tue Jul 11 01:32:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* textdomain.c: Protect inclusion of stdlib.h and string.h.
-
-	* loadmsgcat.c: Protect inclusion of stdlib.h.
-
-	* libgettext.h: Protect inclusion of locale.h.
-	Allow use in C++ programs.
-	Define NULL is not happened already.
-
-	* Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of
-	po-to-tbl.sed.
-	(distclean): remove po-to-tbl.sed and tupdate.perl.
-
-	* tupdate.perl.in: Substitute Perl path even in exec line.
-	Don't include entries without translation from old .po file.
-
-Tue Jul  4 00:41:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* tupdate.perl.in: use "Updated: " in msgid "".
-
-	* cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR).
- 	Define getenv if !__STDC__.
-
-	* bindtextdom.c: Protect stdlib.h and string.h inclusion.
- 	Define free if !__STDC__.
-
-	* finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
- 	Define free if !__STDC__.
-
-	* cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
-
-Mon Jul  3 23:56:30 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR.
-	Remove unneeded $(srcdir) from Makefile.in dependency.
-
-	* makelinks: Add copyright and short description.
-
-	* po-mode.el: Last version for 0.7.
-
-	* tupdate.perl.in: Fix die message.
-
-	* dcgettext.c: Protect include of string.h.
-
-	* gettext.c: Protect include of stdlib.h and further tries to get NULL.
-
-	* finddomain.c: Some corrections in includes.
-
-	* Makefile.in (INCLUDES): Prune list correct path to Makefile.in.
-
-	* po-to-tbl.sed: Adopt for new .po file format.
-
-	* linux-msg.sed, xopen-msg.sed: Adopt for new .po file format.
-
-Sun Jul  2 23:55:03 1995  Ulrich Drepper  <drepper@myware>
-
-	* tupdate.perl.in: Complete rewrite for new .po file format.
-
-Sun Jul  2 02:06:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* First official release.  This directory contains all the code
-	needed to internationalize own packages.  It provides functions
-	which allow to use the X/Open catgets function with an interface
-	like the Uniforum gettext function.  For system which does not
-	have neither of those a complete implementation is provided.
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/Makefile b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/Makefile
deleted file mode 100644
index 37585e769e..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/Makefile
+++ /dev/null
@@ -1,214 +0,0 @@
-# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-#
-# This program 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, or (at your option)
-# any later version.
-#
-# This program 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.
-
-PACKAGE = gsmlib
-VERSION = 1.10
-
-SHELL = /bin/sh
-
-srcdir = .
-top_srcdir = ..
-top_builddir = ..
-
-
-prefix = /usr
-exec_prefix = ${prefix}
-transform = s,x,x,
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-datadir = $(prefix)/share
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = ${prefix}/share/gettext/intl
-aliaspath = $(localedir):.
-subdir = intl
-
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-MKINSTALLDIRS = $(top_builddir)/scripts/mkinstalldirs
-
-l = @l@
-
-AR = ar
-CC = i486-linux-gnu-gcc
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-RANLIB = ranlib
-
-DEFS = -DGNULOCALEDIR=\"$(gnulocaledir)\" \
--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DHAVE_CONFIG_H
-CPPFLAGS = 
-CFLAGS = -D_REENTRANT -g -O2
-LDFLAGS = 
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
-COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c
-OBJECTS =  bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
-GETTOBJS = intl-compat.$lo
-DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
-xopen-msg.sed $(HEADERS) $(SOURCES)
-DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc intlh.inst.in
-
-.SUFFIXES:
-.SUFFIXES: .c .o .lo
-.c.o:
-	$(COMPILE) $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) $<
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
-
-all: all-no
-
-all-yes: libintl.$la intlh.inst
-all-no:
-
-libintl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cru $@ $(OBJECTS)
-	$(RANLIB) $@
-
-libintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
-		   -version-info 1:0 -rpath $(libdir)
-
-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
-	cd ../po && $(MAKE) cat-id-tbl.$lo
-
-check: all
-
-# This installation goal is only used in GNU gettext.  Packages which
-# only use the library should use install instead.
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the gettext() function in its C library or in a
-# separate library or use the catgets interface.  A special case is
-# where configure found a previously installed GNU gettext library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '' = '$(GETTOBJS)'; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
-	  fi; \
-	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
-	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-	else \
-	  : ; \
-	fi
-install-data: all
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
-	  dists="$(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	dists="$(DISTFILES.common)"; \
-	for file in $$dists; do \
-	  rm -f $(gettextsrcdir)/$$file; \
-	done
-
-info dvi:
-
-$(OBJECTS): ../gsm_config.h libgettext.h
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
-	rm -f *.a *.o *.lo core core.*
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile ID TAGS po2msg.sed po2tbl.sed
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile $(DISTFILES)
-	if test "$(PACKAGE)" = gettext; then \
-	  additional="$(DISTFILES.gettext)"; \
-	else \
-	  additional="$(DISTFILES.normal)"; \
-	fi; \
-	for file in $(DISTFILES.common) $$additional; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-dist-libc:
-	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
-
-Makefile: Makefile.in ../config.status
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-# The dependency for intlh.inst is different in gettext and all other
-# packages.  Because we cannot you GNU make features we have to solve
-# the problem while rewriting Makefile.in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@	cd .. \
-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@	  $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/Makefile.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/Makefile.in
deleted file mode 100644
index fc1e9e3ff1..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/Makefile.in
+++ /dev/null
@@ -1,214 +0,0 @@
-# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-#
-# This program 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, or (at your option)
-# any later version.
-#
-# This program 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.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-transform = @program_transform_name@
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = @datadir@/gettext/intl
-aliaspath = $(localedir):.
-subdir = intl
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-
-l = @l@
-
-AR = ar
-CC = @CC@
-LIBTOOL = @LIBTOOL@
-RANLIB = @RANLIB@
-
-DEFS = -DGNULOCALEDIR=\"$(gnulocaledir)\" \
--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
-COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
-GETTOBJS = intl-compat.$lo
-DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
-xopen-msg.sed $(HEADERS) $(SOURCES)
-DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc intlh.inst.in
-
-.SUFFIXES:
-.SUFFIXES: .c .o .lo
-.c.o:
-	$(COMPILE) $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) $<
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
-
-all: all-@USE_INCLUDED_LIBINTL@
-
-all-yes: libintl.$la intlh.inst
-all-no:
-
-libintl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cru $@ $(OBJECTS)
-	$(RANLIB) $@
-
-libintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
-		   -version-info 1:0 -rpath $(libdir)
-
-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
-	cd ../po && $(MAKE) cat-id-tbl.$lo
-
-check: all
-
-# This installation goal is only used in GNU gettext.  Packages which
-# only use the library should use install instead.
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the gettext() function in its C library or in a
-# separate library or use the catgets interface.  A special case is
-# where configure found a previously installed GNU gettext library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
-	  fi; \
-	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
-	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-	else \
-	  : ; \
-	fi
-install-data: all
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
-	  dists="$(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	dists="$(DISTFILES.common)"; \
-	for file in $$dists; do \
-	  rm -f $(gettextsrcdir)/$$file; \
-	done
-
-info dvi:
-
-$(OBJECTS): ../gsm_config.h libgettext.h
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
-	rm -f *.a *.o *.lo core core.*
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile ID TAGS po2msg.sed po2tbl.sed
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile $(DISTFILES)
-	if test "$(PACKAGE)" = gettext; then \
-	  additional="$(DISTFILES.gettext)"; \
-	else \
-	  additional="$(DISTFILES.normal)"; \
-	fi; \
-	for file in $(DISTFILES.common) $$additional; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-dist-libc:
-	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
-
-Makefile: Makefile.in ../config.status
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-# The dependency for intlh.inst is different in gettext and all other
-# packages.  Because we cannot you GNU make features we have to solve
-# the problem while rewriting Makefile.in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@	cd .. \
-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@	  $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/VERSION b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/VERSION
deleted file mode 100644
index ee66b0612b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-GNU gettext library from gettext-0.10.35
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/bindtextdom.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/bindtextdom.c
deleted file mode 100644
index 42b11aaddb..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/bindtextdom.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-/* Contains the default location of the message catalogs.  */
-extern const char _nl_default_dirname[];
-
-/* List with bindings of specific domains.  */
-extern struct binding *_nl_domain_bindings;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define BINDTEXTDOMAIN __bindtextdomain
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define BINDTEXTDOMAIN bindtextdomain__
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  struct binding *binding;
-
-  /* Some sanity checks.  */
-  if (domainname == NULL || domainname[0] == '\0')
-    return NULL;
-
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (dirname == NULL)
-    /* The current binding has be to returned.  */
-    return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
-
-  if (binding != NULL)
-    {
-      /* The domain is already bound.  If the new value and the old
-	 one are equal we simply do nothing.  Otherwise replace the
-	 old binding.  */
-      if (strcmp (dirname, binding->dirname) != 0)
-	{
-	  char *new_dirname;
-
-	  if (strcmp (dirname, _nl_default_dirname) == 0)
-	    new_dirname = (char *) _nl_default_dirname;
-	  else
-	    {
-#if defined _LIBC || defined HAVE_STRDUP
-	      new_dirname = strdup (dirname);
-	      if (new_dirname == NULL)
-		return NULL;
-#else
-	      size_t len = strlen (dirname) + 1;
-	      new_dirname = (char *) malloc (len);
-	      if (new_dirname == NULL)
-		return NULL;
-
-	      memcpy (new_dirname, dirname, len);
-#endif
-	    }
-
-	  if (binding->dirname != _nl_default_dirname)
-	    free (binding->dirname);
-
-	  binding->dirname = new_dirname;
-	}
-    }
-  else
-    {
-      /* We have to create a new binding.  */
-#if !defined _LIBC && !defined HAVE_STRDUP
-      size_t len;
-#endif
-      struct binding *new_binding =
-	(struct binding *) malloc (sizeof (*new_binding));
-
-      if (new_binding == NULL)
-	return NULL;
-
-#if defined _LIBC || defined HAVE_STRDUP
-      new_binding->domainname = strdup (domainname);
-      if (new_binding->domainname == NULL)
-	return NULL;
-#else
-      len = strlen (domainname) + 1;
-      new_binding->domainname = (char *) malloc (len);
-      if (new_binding->domainname == NULL)
-	return NULL;
-      memcpy (new_binding->domainname, domainname, len);
-#endif
-
-      if (strcmp (dirname, _nl_default_dirname) == 0)
-	new_binding->dirname = (char *) _nl_default_dirname;
-      else
-	{
-#if defined _LIBC || defined HAVE_STRDUP
-	  new_binding->dirname = strdup (dirname);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
-#else
-	  len = strlen (dirname) + 1;
-	  new_binding->dirname = (char *) malloc (len);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
-	  memcpy (new_binding->dirname, dirname, len);
-#endif
-	}
-
-      /* Now enqueue it.  */
-      if (_nl_domain_bindings == NULL
-	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
-	{
-	  new_binding->next = _nl_domain_bindings;
-	  _nl_domain_bindings = new_binding;
-	}
-      else
-	{
-	  binding = _nl_domain_bindings;
-	  while (binding->next != NULL
-		 && strcmp (domainname, binding->next->domainname) > 0)
-	    binding = binding->next;
-
-	  new_binding->next = binding->next;
-	  binding->next = new_binding;
-	}
-
-      binding = new_binding;
-    }
-
-  return binding->dirname;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__bindtextdomain, bindtextdomain);
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/cat-compat.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/cat-compat.c
deleted file mode 100644
index 4eb0e068f1..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/cat-compat.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* Compatibility code for gettext-using-catgets interface.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# endif
-#endif
-
-#ifdef HAVE_NL_TYPES_H
-# include <nl_types.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  And even worse: POSIX
-   defines this not at all.  So we can use this feature only on selected
-   system (e.g. those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* The catalog descriptor.  */
-static nl_catd catalog = (nl_catd) -1;
-
-/* Name of the default catalog.  */
-static const char default_catalog_name[] = "messages";
-
-/* Name of currently used catalog.  */
-static const char *catalog_name = default_catalog_name;
-
-/* Get ID for given string.  If not found return -1.  */
-static int msg_to_cat_id PARAMS ((const char *msg));
-
-/* Substitution for systems lacking this function in their C library.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-#endif
-
-
-/* Set currently used domain/catalog.  */
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  nl_catd new_catalog;
-  char *new_name;
-  size_t new_name_len;
-  char *lang;
-
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
-    && defined HAVE_LOCALE_NULL
-  lang = setlocale (LC_MESSAGES, NULL);
-#else
-  lang = getenv ("LC_ALL");
-  if (lang == NULL || lang[0] == '\0')
-    {
-      lang = getenv ("LC_MESSAGES");
-      if (lang == NULL || lang[0] == '\0')
-	lang = getenv ("LANG");
-    }
-#endif
-  if (lang == NULL || lang[0] == '\0')
-    lang = "C";
-
-  /* See whether name of currently used domain is asked.  */
-  if (domainname == NULL)
-    return (char *) catalog_name;
-
-  if (domainname[0] == '\0')
-    domainname = default_catalog_name;
-
-  /* Compute length of added path element.  */
-  new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
-		 + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
-		 + sizeof (".cat");
-
-  new_name = (char *) malloc (new_name_len);
-  if (new_name == NULL)
-    return NULL;
-
-  strcpy (new_name, PACKAGE);
-  new_catalog = catopen (new_name, 0);
-
-  if (new_catalog == (nl_catd) -1)
-    {
-      /* NLSPATH search didn't work, try absolute path */
-      sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
-	       PACKAGE);
-      new_catalog = catopen (new_name, 0);
-
-      if (new_catalog == (nl_catd) -1)
-	{
-	  free (new_name);
-	  return (char *) catalog_name;
-	}
-    }
-
-  /* Close old catalog.  */
-  if (catalog != (nl_catd) -1)
-    catclose (catalog);
-  if (catalog_name != default_catalog_name)
-    free ((char *) catalog_name);
-
-  catalog = new_catalog;
-  catalog_name = new_name;
-
-  return (char *) catalog_name;
-}
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-#if HAVE_SETENV || HAVE_PUTENV
-  char *old_val, *new_val, *cp;
-  size_t new_val_len;
-
-  /* This does not make much sense here but to be compatible do it.  */
-  if (domainname == NULL)
-    return NULL;
-
-  /* Compute length of added path element.  If we use setenv we don't need
-     the first byts for NLSPATH=, but why complicate the code for this
-     peanuts.  */
-  new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
-		+ sizeof ("/%L/LC_MESSAGES/%N.cat");
-
-  old_val = getenv ("NLSPATH");
-  if (old_val == NULL || old_val[0] == '\0')
-    {
-      old_val = NULL;
-      new_val_len += 1 + sizeof (LOCALEDIR) - 1
-	             + sizeof ("/%L/LC_MESSAGES/%N.cat");
-    }
-  else
-    new_val_len += strlen (old_val);
-
-  new_val = (char *) malloc (new_val_len);
-  if (new_val == NULL)
-    return NULL;
-
-# if HAVE_SETENV
-  cp = new_val;
-# else
-  cp = stpcpy (new_val, "NLSPATH=");
-# endif
-
-  cp = stpcpy (cp, dirname);
-  cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
-
-  if (old_val == NULL)
-    {
-# if __STDC__
-      stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
-# else
-
-      cp = stpcpy (cp, LOCALEDIR);
-      stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
-# endif
-    }
-  else
-    stpcpy (cp, old_val);
-
-# if HAVE_SETENV
-  setenv ("NLSPATH", new_val, 1);
-  free (new_val);
-# else
-  putenv (new_val);
-  /* Do *not* free the environment entry we just entered.  It is used
-     from now on.   */
-# endif
-
-#endif
-
-  return (char *) domainname;
-}
-
-#undef gettext
-char *
-gettext (msg)
-     const char *msg;
-{
-  int msgid;
-
-  if (msg == NULL || catalog == (nl_catd) -1)
-    return (char *) msg;
-
-  /* Get the message from the catalog.  We always use set number 1.
-     The message ID is computed by the function `msg_to_cat_id'
-     which works on the table generated by `po-to-tbl'.  */
-  msgid = msg_to_cat_id (msg);
-  if (msgid == -1)
-    return (char *) msg;
-
-  return catgets (catalog, 1, msgid, (char *) msg);
-}
-
-/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
-   for the one equal to msg.  If it is found return the ID.  In case when
-   the string is not found return -1.  */
-static int
-msg_to_cat_id (msg)
-     const char *msg;
-{
-  int cnt;
-
-  for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
-    if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
-      return _msg_tbl[cnt]._msg_number;
-
-  return -1;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/dcgettext.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/dcgettext.c
deleted file mode 100644
index ed697f371b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/dcgettext.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-#include "hash-string.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define getcwd __getcwd
-# ifndef stpcpy
-#  define stpcpy __stpcpy
-# endif
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-#  define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try.  */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h.  */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
-   PATH_MAX but might cause redefinition warnings when sys/param.h is
-   later included (as on MORE/BSD 4.3).  */
-#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been.  */
-#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
-# include <sys/param.h>
-#endif
-
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  And even worse: POSIX
-   defines this not at all.  So we can use this feature only on selected
-   system (e.g. those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
-
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs.  */
-const char _nl_default_dirname[] = GNULOCALEDIR;
-
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions.  */
-static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			       const char *msgid)) internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
-						 const char *categoryname))
-     internal_function;
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCGETTEXT __dcgettext
-#else
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCGETTEXT (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  struct loaded_l10nfile *domain;
-  struct binding *binding;
-  const char *categoryname;
-  const char *categoryvalue;
-  char *dirname, *xdomainname;
-  char *single_locale;
-  char *retval;
-  int saved_errno = errno;
-
-  /* If no real MSGID is given return NULL.  */
-  if (msgid == NULL)
-    return NULL;
-
-  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-     CATEGORY is not LC_MESSAGES this might not make much sense but the
-     defintion left this undefined.  */
-  if (domainname == NULL)
-    domainname = _nl_current_default_domain;
-
-  /* First find matching binding.  */
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding == NULL)
-    dirname = (char *) _nl_default_dirname;
-  else if (binding->dirname[0] == '/')
-    dirname = binding->dirname;
-  else
-    {
-      /* We have a relative path.  Make it absolute now.  */
-      size_t dirname_len = strlen (binding->dirname) + 1;
-      size_t path_max;
-      char *ret;
-
-      path_max = (unsigned) PATH_MAX;
-      path_max += 2;		/* The getcwd docs say to do this.  */
-
-      dirname = (char *) alloca (path_max + dirname_len);
-      ADD_BLOCK (block_list, dirname);
-
-      __set_errno (0);
-      while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
-	{
-	  path_max += PATH_INCR;
-	  dirname = (char *) alloca (path_max + dirname_len);
-	  ADD_BLOCK (block_list, dirname);
-	  __set_errno (0);
-	}
-
-      if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
-    }
-
-  /* Now determine the symbolic name of CATEGORY and its value.  */
-  categoryname = category_to_name (category);
-  categoryvalue = guess_category_value (category, categoryname);
-
-  xdomainname = (char *) alloca (strlen (categoryname)
-				 + strlen (domainname) + 5);
-  ADD_BLOCK (block_list, xdomainname);
-
-  stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
-		  domainname),
-	  ".mo");
-
-  /* Creating working area.  */
-  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-  ADD_BLOCK (block_list, single_locale);
-
-
-  /* Search for the given string.  This is a loop because we perhaps
-     got an ordered list of languages to consider for th translation.  */
-  while (1)
-    {
-      /* Make CATEGORYVALUE point to the next element of the list.  */
-      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
-	++categoryvalue;
-      if (categoryvalue[0] == '\0')
-	{
-	  /* The whole contents of CATEGORYVALUE has been searched but
-	     no valid entry has been found.  We solve this situation
-	     by implicitly appending a "C" entry, i.e. no translation
-	     will take place.  */
-	  single_locale[0] = 'C';
-	  single_locale[1] = '\0';
-	}
-      else
-	{
-	  char *cp = single_locale;
-	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
-	    *cp++ = *categoryvalue++;
-	  *cp = '\0';
-	}
-
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
-	  || strcmp (single_locale, "POSIX") == 0)
-	{
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-
-      /* Find structure describing the message catalog matching the
-	 DOMAINNAME and CATEGORY.  */
-      domain = _nl_find_domain (dirname, single_locale, xdomainname);
-
-      if (domain != NULL)
-	{
-	  retval = find_msg (domain, msgid);
-
-	  if (retval == NULL)
-	    {
-	      int cnt;
-
-	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
-		{
-		  retval = find_msg (domain->successor[cnt], msgid);
-
-		  if (retval != NULL)
-		    break;
-		}
-	    }
-
-	  if (retval != NULL)
-	    {
-	      FREE_BLOCKS (block_list);
-	      __set_errno (saved_errno);
-	      return retval;
-	    }
-	}
-    }
-  /* NOTREACHED */
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcgettext, dcgettext);
-#endif
-
-
-static char *
-internal_function
-find_msg (domain_file, msgid)
-     struct loaded_l10nfile *domain_file;
-     const char *msgid;
-{
-  size_t top, act, bottom;
-  struct loaded_domain *domain;
-
-  if (domain_file->decided == 0)
-    _nl_load_domain (domain_file);
-
-  if (domain_file->data == NULL)
-    return NULL;
-
-  domain = (struct loaded_domain *) domain_file->data;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab != NULL)
-    {
-      /* Use the hashing table.  */
-      nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = hash_string (msgid);
-      nls_uint32 idx = hash_val % domain->hash_size;
-      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-      nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
-
-      if (nstr == 0)
-	/* Hash table entry is empty.  */
-	return NULL;
-
-      if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	  && strcmp (msgid,
-		     domain->data + W (domain->must_swap,
-				       domain->orig_tab[nstr - 1].offset)) == 0)
-	return (char *) domain->data + W (domain->must_swap,
-					  domain->trans_tab[nstr - 1].offset);
-
-      while (1)
-	{
-	  if (idx >= domain->hash_size - incr)
-	    idx -= domain->hash_size - incr;
-	  else
-	    idx += incr;
-
-	  nstr = W (domain->must_swap, domain->hash_tab[idx]);
-	  if (nstr == 0)
-	    /* Hash table entry is empty.  */
-	    return NULL;
-
-	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	      && strcmp (msgid,
-			 domain->data + W (domain->must_swap,
-					   domain->orig_tab[nstr - 1].offset))
-	         == 0)
-	    return (char *) domain->data
-	      + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
-	}
-      /* NOTREACHED */
-    }
-
-  /* Now we try the default method:  binary search in the sorted
-     array of messages.  */
-  bottom = 0;
-  top = domain->nstrings;
-  while (bottom < top)
-    {
-      int cmp_val;
-
-      act = (bottom + top) / 2;
-      cmp_val = strcmp (msgid, domain->data
-			       + W (domain->must_swap,
-				    domain->orig_tab[act].offset));
-      if (cmp_val < 0)
-	top = act;
-      else if (cmp_val > 0)
-	bottom = act + 1;
-      else
-	break;
-    }
-
-  /* If an translation is found return this.  */
-  return bottom >= top ? NULL : (char *) domain->data
-                                + W (domain->must_swap,
-				     domain->trans_tab[act].offset);
-}
-
-
-/* Return string representation of locale CATEGORY.  */
-static const char *
-internal_function
-category_to_name (category)
-     int category;
-{
-  const char *retval;
-
-  switch (category)
-  {
-#ifdef LC_COLLATE
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-#endif
-#ifdef LC_CTYPE
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-#endif
-#ifdef LC_MONETARY
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-#endif
-#ifdef LC_NUMERIC
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-#endif
-#ifdef LC_TIME
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-#endif
-#ifdef LC_MESSAGES
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-#endif
-#ifdef LC_RESPONSE
-  case LC_RESPONSE:
-    retval = "LC_RESPONSE";
-    break;
-#endif
-#ifdef LC_ALL
-  case LC_ALL:
-    /* This might not make sense but is perhaps better than any other
-       value.  */
-    retval = "LC_ALL";
-    break;
-#endif
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-/* Guess value of current locale from value of the environment variables.  */
-static const char *
-internal_function
-guess_category_value (category, categoryname)
-     int category;
-     const char *categoryname;
-{
-  const char *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  This is a GNU extension.  */
-  retval = getenv ("LANGUAGE");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
-     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
-     systems this can be done by the `setlocale' function itself.  */
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  return setlocale (category, NULL);
-#else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Next comes the name of the desired category.  */
-  retval = getenv (categoryname);
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Last possibility is the LANG environment variable.  */
-  retval = getenv ("LANG");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* We use C as the default domain.  POSIX says this is implementation
-     defined.  */
-  return "C";
-#endif
-}
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
-   program's end.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct binding *runp;
-
-  for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
-    {
-      free (runp->domainname);
-      if (runp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (runp->dirname);
-    }
-
-  if (_nl_current_default_domain != _nl_default_default_domain)
-    /* Yes, again a pointer comparison.  */
-    free ((char *) _nl_current_default_domain);
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/dgettext.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/dgettext.c
deleted file mode 100644
index 6525d83293..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/dgettext.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implementation of the dgettext(3) function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DGETTEXT __dgettext
-# define DCGETTEXT __dcgettext
-#else
-# define DGETTEXT dgettext__
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale.  */
-char *
-DGETTEXT (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return DCGETTEXT (domainname, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dgettext, dgettext);
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/explodename.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/explodename.c
deleted file mode 100644
index b80aa79ae2..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/explodename.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#include <sys/types.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-int
-_nl_explode_name (name, language, modifier, territory, codeset,
-		  normalized_codeset, special, sponsor, revision)
-     char *name;
-     const char **language;
-     const char **modifier;
-     const char **territory;
-     const char **codeset;
-     const char **normalized_codeset;
-     const char **special;
-     const char **sponsor;
-     const char **revision;
-{
-  enum { undecided, xpg, cen } syntax;
-  char *cp;
-  int mask;
-
-  *modifier = NULL;
-  *territory = NULL;
-  *codeset = NULL;
-  *normalized_codeset = NULL;
-  *special = NULL;
-  *sponsor = NULL;
-  *revision = NULL;
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = 0;
-  syntax = undecided;
-  *language = cp = name;
-  while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@'
-	 && cp[0] != '+' && cp[0] != ',')
-    ++cp;
-
-  if (*language == cp)
-    /* This does not make sense: language has to be specified.  Use
-       this entry as it is without exploding.  Perhaps it is an alias.  */
-    cp = strchr (*language, '\0');
-  else if (cp[0] == '_')
-    {
-      /* Next is the territory.  */
-      cp[0] = '\0';
-      *territory = ++cp;
-
-      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
-	     && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= TERRITORY;
-
-      if (cp[0] == '.')
-	{
-	  /* Next is the codeset.  */
-	  syntax = xpg;
-	  cp[0] = '\0';
-	  *codeset = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_CODESET;
-
-	  if (*codeset != cp && (*codeset)[0] != '\0')
-	    {
-	      *normalized_codeset = _nl_normalize_codeset (*codeset,
-							   cp - *codeset);
-	      if (strcmp (*codeset, *normalized_codeset) == 0)
-		free ((char *) *normalized_codeset);
-	      else
-		mask |= XPG_NORM_CODESET;
-	    }
-	}
-    }
-
-  if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
-    {
-      /* Next is the modifier.  */
-      syntax = cp[0] == '@' ? xpg : cen;
-      cp[0] = '\0';
-      *modifier = ++cp;
-
-      while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
-	     && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= XPG_MODIFIER | CEN_AUDIENCE;
-    }
-
-  if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
-    {
-      syntax = cen;
-
-      if (cp[0] == '+')
-	{
- 	  /* Next is special application (CEN syntax).  */
-	  cp[0] = '\0';
-	  *special = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPECIAL;
-	}
-
-      if (cp[0] == ',')
-	{
- 	  /* Next is sponsor (CEN syntax).  */
-	  cp[0] = '\0';
-	  *sponsor = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPONSOR;
-	}
-
-      if (cp[0] == '_')
-	{
- 	  /* Next is revision (CEN syntax).  */
-	  cp[0] = '\0';
-	  *revision = ++cp;
-
-	  mask |= CEN_REVISION;
-	}
-    }
-
-  /* For CEN syntax values it might be important to have the
-     separator character in the file name, not for XPG syntax.  */
-  if (syntax == xpg)
-    {
-      if (*territory != NULL && (*territory)[0] == '\0')
-	mask &= ~TERRITORY;
-
-      if (*codeset != NULL && (*codeset)[0] == '\0')
-	mask &= ~XPG_CODESET;
-
-      if (*modifier != NULL && (*modifier)[0] == '\0')
-	mask &= ~XPG_MODIFIER;
-    }
-
-  return mask;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/finddomain.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/finddomain.c
deleted file mode 100644
index 9588532f3d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/finddomain.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-/* List of already loaded domains.  */
-static struct loaded_l10nfile *_nl_loaded_domains;
-
-
-/* Return a data structure describing the message catalog described by
-   the DOMAINNAME and CATEGORY parameters with respect to the currently
-   established bindings.  */
-struct loaded_l10nfile *
-internal_function
-_nl_find_domain (dirname, locale, domainname)
-     const char *dirname;
-     char *locale;
-     const char *domainname;
-{
-  struct loaded_l10nfile *retval;
-  const char *language;
-  const char *modifier;
-  const char *territory;
-  const char *codeset;
-  const char *normalized_codeset;
-  const char *special;
-  const char *sponsor;
-  const char *revision;
-  const char *alias_value;
-  int mask;
-
-  /* LOCALE can consist of up to four recognized parts for the XPG syntax:
-
-		language[_territory[.codeset]][@modifier]
-
-     and six parts for the CEN syntax:
-
-	language[_territory][+audience][+special][,[sponsor][_revision]]
-
-     Beside the first part all of them are allowed to be missing.  If
-     the full specified locale is not found, the less specific one are
-     looked for.  The various parts will be stripped off according to
-     the following order:
-		(1) revision
-		(2) sponsor
-		(3) special
-		(4) codeset
-		(5) normalized codeset
-		(6) territory
-		(7) audience/modifier
-   */
-
-  /* If we have already tested for this locale entry there has to
-     be one data set in the list of loaded domains.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, 0, locale, NULL, NULL,
-			       NULL, NULL, NULL, NULL, NULL, domainname, 0);
-  if (retval != NULL)
-    {
-      /* We know something about this locale.  */
-      int cnt;
-
-      if (retval->decided == 0)
-	_nl_load_domain (retval);
-
-      if (retval->data != NULL)
-	return retval;
-
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
-
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-      return cnt >= 0 ? retval : NULL;
-      /* NOTREACHED */
-    }
-
-  /* See whether the locale value is an alias.  If yes its value
-     *overwrites* the alias name.  No test for the original value is
-     done.  */
-  alias_value = _nl_expand_alias (locale);
-  if (alias_value != NULL)
-    {
-#if defined _LIBC || defined HAVE_STRDUP
-      locale = strdup (alias_value);
-      if (locale == NULL)
-	return NULL;
-#else
-      size_t len = strlen (alias_value) + 1;
-      locale = (char *) malloc (len);
-      if (locale == NULL)
-	return NULL;
-
-      memcpy (locale, alias_value, len);
-#endif
-    }
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = _nl_explode_name (locale, &language, &modifier, &territory,
-			   &codeset, &normalized_codeset, &special,
-			   &sponsor, &revision);
-
-  /* Create all possible locale entries which might be interested in
-     generalization.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, mask, language, territory,
-			       codeset, normalized_codeset, modifier, special,
-			       sponsor, revision, domainname, 1);
-  if (retval == NULL)
-    /* This means we are out of core.  */
-    return NULL;
-
-  if (retval->decided == 0)
-    _nl_load_domain (retval);
-  if (retval->data == NULL)
-    {
-      int cnt;
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-    }
-
-  /* The room for an alias was dynamically allocated.  Free it now.  */
-  if (alias_value != NULL)
-    free (locale);
-
-  return retval;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct loaded_l10nfile *runp = _nl_loaded_domains;
-
-  while (runp != NULL)
-    {
-      struct loaded_l10nfile *here = runp;
-      if (runp->data != NULL)
-	_nl_unload_domain ((struct loaded_domain *) runp->data);
-      runp = runp->next;
-      free (here);
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/gettext.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/gettext.c
deleted file mode 100644
index c3c64bf8c5..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/gettext.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# ifdef STDC_HEADERS
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define GETTEXT __gettext
-# define DGETTEXT __dgettext
-#else
-# define GETTEXT gettext__
-# define DGETTEXT dgettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-GETTEXT (msgid)
-     const char *msgid;
-{
-  return DGETTEXT (NULL, msgid);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__gettext, gettext);
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/gettext.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/gettext.h
deleted file mode 100644
index 3cd23d7d6a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/gettext.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Internal header for GNU gettext internationalization functions.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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 Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#include <stdio.h>
-
-#if HAVE_LIMITS_H || _LIBC
-# include <limits.h>
-#endif
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format.  */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   doing that would require that the configure script compile and *run*
-   the resulting executable.  Locally running cross-compiled executables
-   is usually not possible.  */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-#  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
-#  endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.  */
-  nls_uint32 magic;
-  /* The revision number of the file format.  */
-  nls_uint32 revision;
-  /* The number of strings pairs.  */
-  nls_uint32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
-  nls_uint32 trans_tab_offset;
-  /* Size of hashing table.  */
-  nls_uint32 hash_tab_size;
-  /* Offset of first hashing entry.  */
-  nls_uint32 hash_tab_offset;
-};
-
-struct string_desc
-{
-  /* Length of addressed string.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* @@ begin of epilog @@ */
-
-#endif	/* gettext.h  */
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/gettextP.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/gettextP.h
deleted file mode 100644
index 00c5203197..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/gettextP.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Header describing internals of gettext library
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifndef _GETTEXTP_H
-#define _GETTEXTP_H
-
-#include "loadinfo.h"
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef W
-# define W(flag, data) ((flag) ? SWAP (data) : (data))
-#endif
-
-
-#ifdef _LIBC
-# include <byteswap.h>
-# define SWAP(i) bswap_32 (i)
-#else
-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
-
-static inline nls_uint32
-SWAP (i)
-     nls_uint32 i;
-{
-  return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
-}
-#endif
-
-
-struct loaded_domain
-{
-  const char *data;
-  int use_mmap;
-  size_t mmap_size;
-  int must_swap;
-  nls_uint32 nstrings;
-  struct string_desc *orig_tab;
-  struct string_desc *trans_tab;
-  nls_uint32 hash_size;
-  nls_uint32 *hash_tab;
-};
-
-struct binding
-{
-  struct binding *next;
-  char *domainname;
-  char *dirname;
-};
-
-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
-						 char *__locale,
-						 const char *__domainname))
-     internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
-     internal_function;
-void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettextP.h  */
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/hash-string.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/hash-string.h
deleted file mode 100644
index cacb38e479..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/hash-string.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implements a string hashing function.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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 Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long hash_string PARAMS ((const char *__str_param));
-
-static inline unsigned long
-hash_string (str_param)
-     const char *str_param;
-{
-  unsigned long int hval, g;
-  const char *str = str_param;
-
-  /* Compute the hash value for the given string.  */
-  hval = 0;
-  while (*str != '\0')
-    {
-      hval <<= 4;
-      hval += (unsigned long) *str++;
-      g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-  return hval;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/intl-compat.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/intl-compat.c
deleted file mode 100644
index 21ffc60c19..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/intl-compat.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
-   Library.
-   Copyright (C) 1995 Software Foundation, Inc.
-
-This program 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, or (at your option)
-any later version.
-
-This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-
-#undef gettext
-#undef dgettext
-#undef dcgettext
-#undef textdomain
-#undef bindtextdomain
-
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  return bindtextdomain__ (domainname, dirname);
-}
-
-
-char *
-dcgettext (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-  return dcgettext__ (domainname, msgid, category);
-}
-
-
-char *
-dgettext (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return dgettext__ (domainname, msgid);
-}
-
-
-char *
-gettext (msgid)
-     const char *msgid;
-{
-  return gettext__ (msgid);
-}
-
-
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  return textdomain__ (domainname);
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/l10nflist.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/l10nflist.c
deleted file mode 100644
index 174794201c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/l10nflist.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined _LIBC || defined HAVE_ARGZ_H
-# include <argz.h>
-#endif
-#include <ctype.h>
-#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# ifndef stpcpy
-#  define stpcpy(dest, src) __stpcpy(dest, src)
-# endif
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Define function which are usually not available.  */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
-/* Returns the number of strings in ARGZ.  */
-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
-
-static size_t
-argz_count__ (argz, len)
-     const char *argz;
-     size_t len;
-{
-  size_t count = 0;
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len + 1;
-      len -= part_len + 1;
-      count++;
-    }
-  return count;
-}
-# undef __argz_count
-# define __argz_count(argz, len) argz_count__ (argz, len)
-#endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
-
-static void
-argz_stringify__ (argz, len, sep)
-     char *argz;
-     size_t len;
-     int sep;
-{
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len;
-      len -= part_len + 1;
-      if (len > 0)
-	*argz++ = sep;
-    }
-}
-# undef __argz_stringify
-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
-				  const char *entry));
-
-static char *
-argz_next__ (argz, argz_len, entry)
-     char *argz;
-     size_t argz_len;
-     const char *entry;
-{
-  if (entry)
-    {
-      if (entry < argz + argz_len)
-        entry = strchr (entry, '\0') + 1;
-
-      return entry >= argz + argz_len ? NULL : (char *) entry;
-    }
-  else
-    if (argz_len > 0)
-      return argz;
-    else
-      return 0;
-}
-# undef __argz_next
-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
-#endif	/* !_LIBC && !HAVE___ARGZ_NEXT */
-
-
-/* Return number of bits set in X.  */
-static int pop PARAMS ((int x));
-
-static inline int
-pop (x)
-     int x;
-{
-  /* We assume that no more than 16 bits are used.  */
-  x = ((x & ~0x5555) >> 1) + (x & 0x5555);
-  x = ((x & ~0x3333) >> 2) + (x & 0x3333);
-  x = ((x >> 4) + x) & 0x0f0f;
-  x = ((x >> 8) + x) & 0xff;
-
-  return x;
-}
-
-
-struct loaded_l10nfile *
-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
-		    territory, codeset, normalized_codeset, modifier, special,
-		    sponsor, revision, filename, do_allocate)
-     struct loaded_l10nfile **l10nfile_list;
-     const char *dirlist;
-     size_t dirlist_len;
-     int mask;
-     const char *language;
-     const char *territory;
-     const char *codeset;
-     const char *normalized_codeset;
-     const char *modifier;
-     const char *special;
-     const char *sponsor;
-     const char *revision;
-     const char *filename;
-     int do_allocate;
-{
-  char *abs_filename;
-  struct loaded_l10nfile *last = NULL;
-  struct loaded_l10nfile *retval;
-  char *cp;
-  size_t entries;
-  int cnt;
-
-  /* Allocate room for the full file name.  */
-  abs_filename = (char *) malloc (dirlist_len
-				  + strlen (language)
-				  + ((mask & TERRITORY) != 0
-				     ? strlen (territory) + 1 : 0)
-				  + ((mask & XPG_CODESET) != 0
-				     ? strlen (codeset) + 1 : 0)
-				  + ((mask & XPG_NORM_CODESET) != 0
-				     ? strlen (normalized_codeset) + 1 : 0)
-				  + (((mask & XPG_MODIFIER) != 0
-				      || (mask & CEN_AUDIENCE) != 0)
-				     ? strlen (modifier) + 1 : 0)
-				  + ((mask & CEN_SPECIAL) != 0
-				     ? strlen (special) + 1 : 0)
-				  + (((mask & CEN_SPONSOR) != 0
-				      || (mask & CEN_REVISION) != 0)
-				     ? (1 + ((mask & CEN_SPONSOR) != 0
-					     ? strlen (sponsor) + 1 : 0)
-					+ ((mask & CEN_REVISION) != 0
-					   ? strlen (revision) + 1 : 0)) : 0)
-				  + 1 + strlen (filename) + 1);
-
-  if (abs_filename == NULL)
-    return NULL;
-
-  retval = NULL;
-  last = NULL;
-
-  /* Construct file name.  */
-  memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, ':');
-  cp = abs_filename + (dirlist_len - 1);
-  *cp++ = '/';
-  cp = stpcpy (cp, language);
-
-  if ((mask & TERRITORY) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, territory);
-    }
-  if ((mask & XPG_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, codeset);
-    }
-  if ((mask & XPG_NORM_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, normalized_codeset);
-    }
-  if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
-    {
-      /* This component can be part of both syntaces but has different
-	 leading characters.  For CEN we use `+', else `@'.  */
-      *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
-      cp = stpcpy (cp, modifier);
-    }
-  if ((mask & CEN_SPECIAL) != 0)
-    {
-      *cp++ = '+';
-      cp = stpcpy (cp, special);
-    }
-  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
-    {
-      *cp++ = ',';
-      if ((mask & CEN_SPONSOR) != 0)
-	cp = stpcpy (cp, sponsor);
-      if ((mask & CEN_REVISION) != 0)
-	{
-	  *cp++ = '_';
-	  cp = stpcpy (cp, revision);
-	}
-    }
-
-  *cp++ = '/';
-  stpcpy (cp, filename);
-
-  /* Look in list of already loaded domains whether it is already
-     available.  */
-  last = NULL;
-  for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
-    if (retval->filename != NULL)
-      {
-	int compare = strcmp (retval->filename, abs_filename);
-	if (compare == 0)
-	  /* We found it!  */
-	  break;
-	if (compare < 0)
-	  {
-	    /* It's not in the list.  */
-	    retval = NULL;
-	    break;
-	  }
-
-	last = retval;
-      }
-
-  if (retval != NULL || do_allocate == 0)
-    {
-      free (abs_filename);
-      return retval;
-    }
-
-  retval = (struct loaded_l10nfile *)
-    malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
-				* (1 << pop (mask))
-				* sizeof (struct loaded_l10nfile *)));
-  if (retval == NULL)
-    return NULL;
-
-  retval->filename = abs_filename;
-  retval->decided = (__argz_count (dirlist, dirlist_len) != 1
-		     || ((mask & XPG_CODESET) != 0
-			 && (mask & XPG_NORM_CODESET) != 0));
-  retval->data = NULL;
-
-  if (last == NULL)
-    {
-      retval->next = *l10nfile_list;
-      *l10nfile_list = retval;
-    }
-  else
-    {
-      retval->next = last->next;
-      last->next = retval;
-    }
-
-  entries = 0;
-  /* If the DIRLIST is a real list the RETVAL entry corresponds not to
-     a real file.  So we have to use the DIRLIST separation mechanism
-     of the inner loop.  */
-  cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
-  for (; cnt >= 0; --cnt)
-    if ((cnt & ~mask) == 0
-	&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
-	&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
-      {
-	/* Iterate over all elements of the DIRLIST.  */
-	char *dir = NULL;
-
-	while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
-	       != NULL)
-	  retval->successor[entries++]
-	    = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
-				  language, territory, codeset,
-				  normalized_codeset, modifier, special,
-				  sponsor, revision, filename, 1);
-      }
-  retval->successor[entries] = NULL;
-
-  return retval;
-}
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  */
-const char *
-_nl_normalize_codeset (codeset, name_len)
-     const unsigned char *codeset;
-     size_t name_len;
-{
-  int len = 0;
-  int only_digit = 1;
-  char *retval;
-  char *wp;
-  size_t cnt;
-
-  for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum (codeset[cnt]))
-      {
-	++len;
-
-	if (isalpha (codeset[cnt]))
-	  only_digit = 0;
-      }
-
-  retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
-
-  if (retval != NULL)
-    {
-      if (only_digit)
-	wp = stpcpy (retval, "iso");
-      else
-	wp = retval;
-
-      for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha (codeset[cnt]))
-	  *wp++ = tolower (codeset[cnt]);
-	else if (isdigit (codeset[cnt]))
-	  *wp++ = codeset[cnt];
-
-      *wp = '\0';
-    }
-
-  return (const char *) retval;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/libgettext.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/libgettext.h
deleted file mode 100644
index 3a92960ae3..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/libgettext.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-/* Because on some systems (e.g. Solaris) we sometimes have to include
-   the systems libintl.h as well as this file we have more complex
-   include protection above.  But the systems header might perhaps also
-   define _LIBINTL_H and therefore we have to protect the definition here.  */
-
-#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
-#ifndef _LIBINTL_H
-# define _LIBINTL_H	1
-#endif
-#define _LIBGETTEXT_H	1
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-#include <sys/types.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef NULL
-# if !defined __cplusplus || defined __GNUC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL (0)
-# endif
-#endif
-
-#if !HAVE_LC_MESSAGES
-/* This value determines the behaviour of the gettext() and dgettext()
-   function.  But some system does not have this defined.  Define it
-   to a default value.  */
-# define LC_MESSAGES (-1)
-#endif
-
-
-/* Declarations for gettext-using-catgets interface.  Derived from
-   Jim Meyering's libintl.h.  */
-struct _msg_ent
-{
-  const char *_msg;
-  int _msg_number;
-};
-
-
-#if HAVE_CATGETS
-/* These two variables are defined in the automatically by po-to-tbl.sed
-   generated file `cat-id-tbl.c'.  */
-extern const struct _msg_ent _msg_tbl[];
-extern int _msg_tbl_length;
-#endif
-
-
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-extern char *gettext__ PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				  const char *__dirname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				    const char *__dirname));
-
-#if ENABLE_NLS
-
-/* Solaris 2.3 has the gettext function but dcgettext is missing.
-   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
-   has dcgettext.  */
-# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
-
-#  define gettext(Msgid)						      \
-     dgettext (NULL, Msgid)
-
-#  define dgettext(Domainname, Msgid)					      \
-     dcgettext (Domainname, Msgid, LC_MESSAGES)
-
-#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-/* This global variable is defined in loadmsgcat.c.  We need a sign,
-   whether a new catalog was loaded, which can be associated with all
-   translations.  */
-extern int _nl_msg_cat_cntr;
-
-#   define dcgettext(Domainname, Msgid, Category)			      \
-  (__extension__							      \
-   ({									      \
-     char *__result;							      \
-     if (__builtin_constant_p (Msgid))					      \
-       {								      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       dcgettext__ (Domainname, Msgid, Category);		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 __result = __translation__;					      \
-       }								      \
-     else								      \
-       __result = dcgettext__ (Domainname, Msgid, Category);		      \
-     __result;								      \
-    }))
-#  endif
-# endif
-
-#else
-
-# define gettext(Msgid) (Msgid)
-# define dgettext(Domainname, Msgid) (Msgid)
-# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) ((char *) Domainname)
-# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
-
-#endif
-
-/* @@ begin of epilog @@ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/linux-msg.sed b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/linux-msg.sed
deleted file mode 100755
index 5918e720a9..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/linux-msg.sed
+++ /dev/null
@@ -1,100 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program 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, or (at your option)
-# any later version.
-#
-# This program 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.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# Mitch's old catalog format does not allow comments.
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-  s/msgid[ 	]*"//
-#
-# This does not work now with the new format.
-# /"$/! {
-#   s/\\$//
-#   s/$/ ... (more lines following)"/
-# }
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/# \1/
-# Clear substitution flag.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that D includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/loadinfo.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/loadinfo.h
deleted file mode 100644
index f4ebf6d811..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/loadinfo.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-/* Encoding of locale name parts.  */
-#define CEN_REVISION		1
-#define CEN_SPONSOR		2
-#define CEN_SPECIAL		4
-#define XPG_NORM_CODESET	8
-#define XPG_CODESET		16
-#define TERRITORY		32
-#define CEN_AUDIENCE		64
-#define XPG_MODIFIER		128
-
-#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
-
-
-struct loaded_l10nfile
-{
-  const char *filename;
-  int decided;
-
-  const void *data;
-
-  struct loaded_l10nfile *next;
-  struct loaded_l10nfile *successor[1];
-};
-
-
-extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
-						  size_t name_len));
-
-extern struct loaded_l10nfile *
-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
-			    const char *dirlist, size_t dirlist_len, int mask,
-			    const char *language, const char *territory,
-			    const char *codeset,
-			    const char *normalized_codeset,
-			    const char *modifier, const char *special,
-			    const char *sponsor, const char *revision,
-			    const char *filename, int do_allocate));
-
-
-extern const char *_nl_expand_alias PARAMS ((const char *name));
-
-extern int _nl_explode_name PARAMS ((char *name, const char **language,
-				     const char **modifier,
-				     const char **territory,
-				     const char **codeset,
-				     const char **normalized_codeset,
-				     const char **special,
-				     const char **sponsor,
-				     const char **revision));
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/loadmsgcat.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/loadmsgcat.c
deleted file mode 100644
index e74a2f77f5..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/loadmsgcat.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Load needed message catalogs.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
-# include <sys/mman.h>
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ISO C functions.  This is required by the standard
-   because some ISO C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define open   __open
-# define close  __close
-# define read   __read
-# define mmap   __mmap
-# define munmap __munmap
-#endif
-
-/* We need a sign, whether a new catalog was loaded, which can be associated
-   with all translations.  This is important if the translations are
-   cached by one of GCC's features.  */
-int _nl_msg_cat_cntr = 0;
-
-
-/* Load the message catalogs specified by FILENAME.  If it is no valid
-   message catalog do nothing.  */
-void
-internal_function
-_nl_load_domain (domain_file)
-     struct loaded_l10nfile *domain_file;
-{
-  int fd;
-  size_t size;
-  struct stat st;
-  struct mo_file_header *data = (struct mo_file_header *) -1;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-  int use_mmap = 0;
-#endif
-  struct loaded_domain *domain;
-
-  domain_file->decided = 1;
-  domain_file->data = NULL;
-
-  /* If the record does not represent a valid locale the FILENAME
-     might be NULL.  This can happen when according to the given
-     specification the locale file name is different for XPG and CEN
-     syntax.  */
-  if (domain_file->filename == NULL)
-    return;
-
-  /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY);
-  if (fd == -1)
-    return;
-
-  /* We must know about the size of the file.  */
-  if (fstat (fd, &st) != 0
-      || (size = (size_t) st.st_size) != st.st_size
-      || size < sizeof (struct mo_file_header))
-    {
-      /* Something went wrong.  */
-      close (fd);
-      return;
-    }
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-  /* Now we are ready to load the file.  If mmap() is available we try
-     this first.  If not available or it failed we try to load it.  */
-  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
-					 MAP_PRIVATE, fd, 0);
-
-  if (data != (struct mo_file_header *) -1)
-    {
-      /* mmap() call was successful.  */
-      close (fd);
-      use_mmap = 1;
-    }
-#endif
-
-  /* If the data is not yet available (i.e. mmap'ed) we try to load
-     it manually.  */
-  if (data == (struct mo_file_header *) -1)
-    {
-      size_t to_read;
-      char *read_ptr;
-
-      data = (struct mo_file_header *) malloc (size);
-      if (data == NULL)
-	return;
-
-      to_read = size;
-      read_ptr = (char *) data;
-      do
-	{
-	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb == -1)
-	    {
-	      close (fd);
-	      return;
-	    }
-
-	  read_ptr += nb;
-	  to_read -= nb;
-	}
-      while (to_read > 0);
-
-      close (fd);
-    }
-
-  /* Using the magic number we can test whether it really is a message
-     catalog file.  */
-  if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
-    {
-      /* The magic number is wrong: not a message catalog file.  */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      return;
-    }
-
-  domain_file->data
-    = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain_file->data == NULL)
-    return;
-
-  domain = (struct loaded_domain *) domain_file->data;
-  domain->data = (char *) data;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-  domain->use_mmap = use_mmap;
-#endif
-  domain->mmap_size = size;
-  domain->must_swap = data->magic != _MAGIC;
-
-  /* Fill in the information about the available tables.  */
-  switch (W (domain->must_swap, data->revision))
-    {
-    case 0:
-      domain->nstrings = W (domain->must_swap, data->nstrings);
-      domain->orig_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->orig_tab_offset));
-      domain->trans_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->trans_tab_offset));
-      domain->hash_size = W (domain->must_swap, data->hash_tab_size);
-      domain->hash_tab = (nls_uint32 *)
-	((char *) data + W (domain->must_swap, data->hash_tab_offset));
-      break;
-    default:
-      /* This is an illegal revision.  */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      free (domain);
-      domain_file->data = NULL;
-      return;
-    }
-
-  /* Show that one domain is changed.  This might make some cached
-     translations invalid.  */
-  ++_nl_msg_cat_cntr;
-}
-
-
-#ifdef _LIBC
-void
-internal_function
-_nl_unload_domain (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->use_mmap)
-    munmap ((caddr_t) domain->data, domain->mmap_size);
-  else
-    free ((void *) domain->data);
-
-  free (domain);
-}
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/localealias.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/localealias.c
deleted file mode 100644
index 18cc68886b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/localealias.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/* Handle aliases for locale names.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define strcasecmp __strcasecmp
-
-# define mempcpy __mempcpy
-# define HAVE_MEMPCPY	1
-
-/* We need locking here since we can be called from different places.  */
-# include <bits/libc-lock.h>
-
-__libc_lock_define_initialized (static, lock);
-#endif
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-struct alias_map
-{
-  const char *alias;
-  const char *value;
-};
-
-
-static char *string_space = NULL;
-static size_t string_space_act = 0;
-static size_t string_space_max = 0;
-static struct alias_map *map;
-static size_t nmap = 0;
-static size_t maxmap = 0;
-
-
-/* Prototypes for local functions.  */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
-     internal_function;
-static void extend_alias_table PARAMS ((void));
-static int alias_compare PARAMS ((const struct alias_map *map1,
-				  const struct alias_map *map2));
-
-
-const char *
-_nl_expand_alias (name)
-    const char *name;
-{
-  static const char *locale_alias_path = LOCALE_ALIAS_PATH;
-  struct alias_map *retval;
-  const char *result = NULL;
-  size_t added;
-
-#ifdef _LIBC
-  __libc_lock_lock (lock);
-#endif
-
-  do
-    {
-      struct alias_map item;
-
-      item.alias = name;
-
-      if (nmap > 0)
-	retval = (struct alias_map *) bsearch (&item, map, nmap,
-					       sizeof (struct alias_map),
-					       (int (*) PARAMS ((const void *,
-								 const void *))
-						) alias_compare);
-      else
-	retval = NULL;
-
-      /* We really found an alias.  Return the value.  */
-      if (retval != NULL)
-	{
-	  result = retval->value;
-	  break;
-	}
-
-      /* Perhaps we can find another alias file.  */
-      added = 0;
-      while (added == 0 && locale_alias_path[0] != '\0')
-	{
-	  const char *start;
-
-	  while (locale_alias_path[0] == ':')
-	    ++locale_alias_path;
-	  start = locale_alias_path;
-
-	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
-	    ++locale_alias_path;
-
-	  if (start < locale_alias_path)
-	    added = read_alias_file (start, locale_alias_path - start);
-	}
-    }
-  while (added != 0);
-
-#ifdef _LIBC
-  __libc_lock_unlock (lock);
-#endif
-
-  return result;
-}
-
-
-static size_t
-internal_function
-read_alias_file (fname, fname_len)
-     const char *fname;
-     int fname_len;
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  FILE *fp;
-  char *full_fname;
-  size_t added;
-  static const char aliasfile[] = "/locale.alias";
-
-  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-  ADD_BLOCK (block_list, full_fname);
-#ifdef HAVE_MEMPCPY
-  mempcpy (mempcpy (full_fname, fname, fname_len),
-	   aliasfile, sizeof aliasfile);
-#else
-  memcpy (full_fname, fname, fname_len);
-  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
-
-  fp = fopen (full_fname, "r");
-  if (fp == NULL)
-    {
-      FREE_BLOCKS (block_list);
-      return 0;
-    }
-
-  added = 0;
-  while (!feof (fp))
-    {
-      /* It is a reasonable approach to use a fix buffer here because
-	 a) we are only interested in the first two fields
-	 b) these fields must be usable as file names and so must not
-	    be that long
-       */
-      unsigned char buf[BUFSIZ];
-      unsigned char *alias;
-      unsigned char *value;
-      unsigned char *cp;
-
-      if (fgets (buf, sizeof buf, fp) == NULL)
-	/* EOF reached.  */
-	break;
-
-      /* Possibly not the whole line fits into the buffer.  Ignore
-	 the rest of the line.  */
-      if (strchr (buf, '\n') == NULL)
-	{
-	  char altbuf[BUFSIZ];
-	  do
-	    if (fgets (altbuf, sizeof altbuf, fp) == NULL)
-	      /* Make sure the inner loop will be left.  The outer loop
-		 will exit at the `feof' test.  */
-	      break;
-	  while (strchr (altbuf, '\n') == NULL);
-	}
-
-      cp = buf;
-      /* Ignore leading white space.  */
-      while (isspace (cp[0]))
-	++cp;
-
-      /* A leading '#' signals a comment line.  */
-      if (cp[0] != '\0' && cp[0] != '#')
-	{
-	  alias = cp++;
-	  while (cp[0] != '\0' && !isspace (cp[0]))
-	    ++cp;
-	  /* Terminate alias name.  */
-	  if (cp[0] != '\0')
-	    *cp++ = '\0';
-
-	  /* Now look for the beginning of the value.  */
-	  while (isspace (cp[0]))
-	    ++cp;
-
-	  if (cp[0] != '\0')
-	    {
-	      size_t alias_len;
-	      size_t value_len;
-
-	      value = cp++;
-	      while (cp[0] != '\0' && !isspace (cp[0]))
-		++cp;
-	      /* Terminate value.  */
-	      if (cp[0] == '\n')
-		{
-		  /* This has to be done to make the following test
-		     for the end of line possible.  We are looking for
-		     the terminating '\n' which do not overwrite here.  */
-		  *cp++ = '\0';
-		  *cp = '\n';
-		}
-	      else if (cp[0] != '\0')
-		*cp++ = '\0';
-
-	      if (nmap >= maxmap)
-		extend_alias_table ();
-
-	      alias_len = strlen (alias) + 1;
-	      value_len = strlen (value) + 1;
-
-	      if (string_space_act + alias_len + value_len > string_space_max)
-		{
-		  /* Increase size of memory pool.  */
-		  size_t new_size = (string_space_max
-				     + (alias_len + value_len > 1024
-					? alias_len + value_len : 1024));
-		  char *new_pool = (char *) realloc (string_space, new_size);
-		  if (new_pool == NULL)
-		    {
-		      FREE_BLOCKS (block_list);
-		      return added;
-		    }
-		  string_space = new_pool;
-		  string_space_max = new_size;
-		}
-
-	      map[nmap].alias = memcpy (&string_space[string_space_act],
-					alias, alias_len);
-	      string_space_act += alias_len;
-
-	      map[nmap].value = memcpy (&string_space[string_space_act],
-					value, value_len);
-	      string_space_act += value_len;
-
-	      ++nmap;
-	      ++added;
-	    }
-	}
-    }
-
-  /* Should we test for ferror()?  I think we have to silently ignore
-     errors.  --drepper  */
-  fclose (fp);
-
-  if (added > 0)
-    qsort (map, nmap, sizeof (struct alias_map),
-	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
-
-  FREE_BLOCKS (block_list);
-  return added;
-}
-
-
-static void
-extend_alias_table ()
-{
-  size_t new_size;
-  struct alias_map *new_map;
-
-  new_size = maxmap == 0 ? 100 : 2 * maxmap;
-  new_map = (struct alias_map *) realloc (map, (new_size
-						* sizeof (struct alias_map)));
-  if (new_map == NULL)
-    /* Simply don't extend: we don't have any more core.  */
-    return;
-
-  map = new_map;
-  maxmap = new_size;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (string_space != NULL)
-    free (string_space);
-  if (map != NULL)
-    free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
-static int
-alias_compare (map1, map2)
-     const struct alias_map *map1;
-     const struct alias_map *map2;
-{
-#if defined _LIBC || defined HAVE_STRCASECMP
-  return strcasecmp (map1->alias, map2->alias);
-#else
-  const unsigned char *p1 = (const unsigned char *) map1->alias;
-  const unsigned char *p2 = (const unsigned char *) map2->alias;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      /* I know this seems to be odd but the tolower() function in
-	 some systems libc cannot handle nonalpha characters.  */
-      c1 = isupper (*p1) ? tolower (*p1) : *p1;
-      c2 = isupper (*p2) ? tolower (*p2) : *p2;
-      if (c1 == '\0')
-	break;
-      ++p1;
-      ++p2;
-    }
-  while (c1 == c2);
-
-  return c1 - c2;
-#endif
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/po2tbl.sed.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/po2tbl.sed.in
deleted file mode 100755
index b3bcca4d73..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/po2tbl.sed.in
+++ /dev/null
@@ -1,102 +0,0 @@
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program 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, or (at your option)
-# any later version.
-#
-# This program 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.
-#
-1 {
-  i\
-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
-\
-#if HAVE_CONFIG_H\
-# include <config.h>\
-#endif\
-\
-#include "libgettext.h"\
-\
-const struct _msg_ent _msg_tbl[] = {
-  h
-  s/.*/0/
-  x
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
-  s/msgid[ 	]*\(".*"\)/  {\1/
-  tb
-# Append the next line
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
-  ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line.  So it's safe to ignore
-# it.
-  s/\(.*\)\n.*/\1/
-  bc
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
-  tb
-# Not reached
-  :c
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-  s/\(.*\)"$/\1/
-  p
-}
-#
-# Last line.
-#
-$ {
-  i\
-};\
-
-  g
-  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/textdomain.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/textdomain.c
deleted file mode 100644
index 2e8facb1f8..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/textdomain.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Implementation of the textdomain(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program 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, or (at your option)
-   any later version.
-
-   This program 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.  */
-
-#ifdef HAVE_CONFIG_H
-# include <gsm_config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Name of the default text domain.  */
-extern const char _nl_default_default_domain[];
-
-/* Default text domain in which entries for gettext(3) are to be found.  */
-extern const char *_nl_current_default_domain;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define TEXTDOMAIN __textdomain
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define TEXTDOMAIN textdomain__
-#endif
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-char *
-TEXTDOMAIN (domainname)
-     const char *domainname;
-{
-  char *old;
-
-  /* A NULL pointer requests the current setting.  */
-  if (domainname == NULL)
-    return (char *) _nl_current_default_domain;
-
-  old = (char *) _nl_current_default_domain;
-
-  /* If domain name is the null string set to default domain "messages".  */
-  if (domainname[0] == '\0'
-      || strcmp (domainname, _nl_default_default_domain) == 0)
-    _nl_current_default_domain = _nl_default_default_domain;
-  else
-    {
-      /* If the following malloc fails `_nl_current_default_domain'
-	 will be NULL.  This value will be returned and so signals we
-	 are out of core.  */
-#if defined _LIBC || defined HAVE_STRDUP
-      _nl_current_default_domain = strdup (domainname);
-#else
-      size_t len = strlen (domainname) + 1;
-      char *cp = (char *) malloc (len);
-      if (cp != NULL)
-	memcpy (cp, domainname, len);
-      _nl_current_default_domain = cp;
-#endif
-    }
-
-  if (old != _nl_default_default_domain)
-    free (old);
-
-  return (char *) _nl_current_default_domain;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__textdomain, textdomain);
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/xopen-msg.sed b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/xopen-msg.sed
deleted file mode 100755
index b19c0bbd0e..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/intl/xopen-msg.sed
+++ /dev/null
@@ -1,104 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program 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, or (at your option)
-# any later version.
-#
-# This program 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.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# We copy all comments into the .msg file.  Perhaps they can help.
-#
-/^#/ s/^#[ 	]*/$ /p
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-# Does not work now
-#  /"$/! {
-#    s/\\$//
-#    s/$/ ... (more lines following)"/
-#  }
-  s/^msgid[ 	]*"\(.*\)"$/$ Original Message: \1/
-  p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/\1/
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-# Bring the line in the format `<number> <message>'
-  G
-  s/^[^\n]*$/& /
-  s/\(.*\)\n\([0-9]*\)/\2 \1/
-# Clear flag from last substitution.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is a continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that `D' includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use the sed command `D' here
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/Makefile.in.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/Makefile.in.in
deleted file mode 100644
index 629f3d4b46..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/Makefile.in.in
+++ /dev/null
@@ -1,250 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-DESTDIR =
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = $(DESTDIR)@prefix@
-exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
-subdir = po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = ../scripts/mkinstalldirs
-
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = cat-id-tbl.c
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
-
-.po.pox:
-	$(MAKE) $(PACKAGE).pot
-	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: cat-id-tbl.c $(CATALOGS)
-all-no:
-
-$(srcdir)/$(PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ \
-	  --files-from=$(srcdir)/POTFILES.in \
-	&& test ! -f $(PACKAGE).po \
-	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
-		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
-
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
-	rm -f cat-id-tbl.tmp
-	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
-		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
-	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f $(srcdir)/cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
-	fi
-	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(datadir); \
-	else \
-	  $(SHELL) ../scripts/mkinstalldirs $(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) ../scripts/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(SHELL) ../scripts/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	done
-	rm -f $(gettextsrcdir)/po-Makefile.in.in
-
-check: all
-
-cat-id-tbl.o: ../intl/libgettext.h
-
-dvi info tags TAGS ID:
-
-mostlyclean:
-	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
-	rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir) || echo ignore; \
-	done
-
-update-po: Makefile
-	$(MAKE) $(PACKAGE).pot
-	PATH=`pwd`/../src:$$PATH; \
-	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
-	    rm -f $$lang.old.po; \
-	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
-	  fi; \
-	done
-
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/POTFILES.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/POTFILES.in
deleted file mode 100644
index 8b9106da56..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/POTFILES.in
+++ /dev/null
@@ -1,19 +0,0 @@
-apps/gsmsmsd.cc
-apps/gsmsendsms.cc
-apps/gsmpb.cc
-apps/gsmctl.cc
-apps/gsmsmsstore.cc
-gsmlib/gsm_at.cc
-gsmlib/gsm_error.cc
-gsmlib/gsm_event.cc
-gsmlib/gsm_me_ta.cc
-gsmlib/gsm_nls.cc
-gsmlib/gsm_parser.cc
-gsmlib/gsm_phonebook.cc
-gsmlib/gsm_sms.cc
-gsmlib/gsm_sms_codec.cc
-gsmlib/gsm_sms_store.cc
-gsmlib/gsm_unix_serial.cc
-gsmlib/gsm_util.cc
-gsmlib/gsm_sorted_phonebook.cc
-gsmlib/gsm_sorted_sms_store.cc
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/cat-id-tbl.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/cat-id-tbl.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/de.gmo b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/de.gmo
deleted file mode 100644
index 7ac755ac73..0000000000
Binary files a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/de.gmo and /dev/null differ
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/de.po b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/de.po
deleted file mode 100644
index 4d21ec7011..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/de.po
+++ /dev/null
@@ -1,1758 +0,0 @@
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    de.po
-# *
-# * Purpose: German translations
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 11.11.1999
-# *************************************************************************
-# , fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: gsmlib 1.5\n"
-"POT-Creation-Date: 2002-10-22 22:48+0200\n"
-"PO-Revision-Date: 2002-10-16 23:21+0200\n"
-"Last-Translator: Peter Hofmann <software@pxh.de>\n"
-"Language-Team: Peter Hofmann\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-# , c-format
-#: apps/gsmsmsd.cc:164
-#, c-format
-msgid "could not execute '%s'"
-msgstr "konnte '%s' nicht ausf�hren"
-
-# , c-format
-#: apps/gsmsmsd.cc:168
-#, c-format
-msgid "error writing to '%s'"
-msgstr "Fehler beim Schreiben zu '%s'"
-
-# , c-format
-#: apps/gsmsmsd.cc:196
-#, c-format
-msgid "error when calling opendir('%s')(errno: %d/%s)"
-msgstr "Fehler beim Aufruf von opendir('%s') (errno: %d/%s)"
-
-# , c-format
-#: apps/gsmsmsd.cc:225
-#, c-format
-msgid "count not open SMS spool file %s"
-msgstr "kann SMS Spool-Datei '%s' nicht �ffnen"
-
-# , c-format
-#: apps/gsmsmsd.cc:341 apps/gsmsendsms.cc:144 apps/gsmpb.cc:311
-#: apps/gsmctl.cc:380 apps/gsmsmsstore.cc:179
-#, c-format
-msgid ": version %s [compiled %s]"
-msgstr ": Version %s [kompiliert am %s]"
-
-#: apps/gsmsmsd.cc:346
-msgid ""
-": [-a action][-b baudrate][-C sca][-d device][-f][-h][-I init string]\n"
-"  [-s spool dir][-t][-v]{sms_type}"
-msgstr ""
-": [-a Aktion][-b Baud-Rate][-C sca][-d Ger�t][-f][-h][-I Init String]\n"
-"  [-s Spoolverzeichnis][-t][-v]{SMS-Typ}"
-
-#: apps/gsmsmsd.cc:350
-msgid ""
-"  -a, --action      the action to execute when an SMS arrives\n"
-"                    (SMS is send to stdin of action)"
-msgstr ""
-"  -a, --action      die auszuf�hrende Aktion, wenn eine SMS eintrifft\n"
-"                    (Kurznachricht wird zur Standardeingabe der Aktion\n"
-"                    geschrieben)"
-
-#: apps/gsmsmsd.cc:354 apps/gsmsendsms.cc:153 apps/gsmpb.cc:322
-#: apps/gsmctl.cc:389 apps/gsmsmsstore.cc:194
-msgid "  -b, --baudrate    baudrate to use for device (default: 38400)"
-msgstr ""
-"  -b, --baudrate    f�r das Ger�t zu verwendende Baud-Rate\n"
-"                    (Voreinstellung: 38400)"
-
-#: apps/gsmsmsd.cc:357
-msgid "  -c, --concatenate start ID for concatenated SMS messages"
-msgstr "  -c, --concatenate Start-ID f�r verbundene SMS-Nachrichten"
-
-#: apps/gsmsmsd.cc:359 apps/gsmsendsms.cc:158 apps/gsmsmsstore.cc:200
-msgid "  -C, --sca         SMS service centre address"
-msgstr "  -C, --sca         SMS service centre address"
-
-#: apps/gsmsmsd.cc:360
-msgid "  -d, --device      sets the device to connect to"
-msgstr "  -d, --device      stellt das Ziel-Ger�t ein"
-
-#: apps/gsmsmsd.cc:361
-msgid "  -D, --direct      enable direct routing of SMSs"
-msgstr ""
-"  -D, --direct      direkte Weiterleitung von SMSs ohne Zwischenspeicherung"
-
-#: apps/gsmsmsd.cc:362
-msgid "  -f, --flush       flush SMS from store"
-msgstr "  -f, --flush       l�sche und bearbeite SMS im Speicher"
-
-#: apps/gsmsmsd.cc:363 apps/gsmsendsms.cc:161 apps/gsmpb.cc:332
-#: apps/gsmctl.cc:394 apps/gsmsmsstore.cc:204
-msgid "  -h, --help        prints this message"
-msgstr "  -h, --help        gibt diesen Hilfetext aus"
-
-#: apps/gsmsmsd.cc:364 apps/gsmsendsms.cc:162 apps/gsmpb.cc:335
-#: apps/gsmctl.cc:395 apps/gsmsmsstore.cc:205
-msgid "  -I, --init        device AT init sequence"
-msgstr "  -I, --init        AT-Initialisierungssequenz"
-
-#: apps/gsmsmsd.cc:365 apps/gsmsendsms.cc:163
-msgid "  -r, --requeststat request SMS status report"
-msgstr "  -r, --requeststat fordert SMS-Statusreport an"
-
-#: apps/gsmsmsd.cc:366
-msgid "  -s, --spool       spool directory for outgoing SMS"
-msgstr "  -s, --spool       Spool-Verzeichnis f�r zu sendende SMS"
-
-#: apps/gsmsmsd.cc:368
-msgid ""
-"  -t, --store       name of SMS store to use for flush\n"
-"                    and/or temporary SMS storage"
-msgstr ""
-"  -t, --store       gibt den zu verwendenden SMS-Speicher an (f�r flush-\n"
-"                    Option und/oder tempor�ren SMS-Speicher)"
-
-#: apps/gsmsmsd.cc:371 apps/gsmsendsms.cc:167 apps/gsmpb.cc:343
-#: apps/gsmctl.cc:399 apps/gsmsmsstore.cc:213
-msgid "  -v, --version     prints version and exits"
-msgstr "  -v, --version     gibt Versionsnummer aus und terminiert"
-
-#: apps/gsmsmsd.cc:372 apps/gsmsendsms.cc:169 apps/gsmpb.cc:346
-#: apps/gsmctl.cc:400 apps/gsmsmsstore.cc:218
-msgid "  -X, --xonxoff     switch on software handshake"
-msgstr "  -X, --xonxoff     Software Handshake anschalten"
-
-#: apps/gsmsmsd.cc:374
-msgid "  sms_type may be any combination of"
-msgstr "  SMS-Typ kann aus den folgenden Parametern kombiniert werden:"
-
-#: apps/gsmsmsd.cc:375
-msgid "    sms, no_sms     controls reception of normal SMS"
-msgstr "    sms, no_sms     schaltet Empfang von normalen SMS an bzw. aus"
-
-#: apps/gsmsmsd.cc:377
-msgid "    cb, no_cb       controls reception of cell broadcast messages"
-msgstr ""
-"    cb, no_cb       schaltet Empfang von Zellen-weiten Nachrichten an bzw. "
-"aus"
-
-#: apps/gsmsmsd.cc:379
-msgid "    stat, no_stat   controls reception of status reports"
-msgstr "    stat, no_stat   schaltet Empfang von Status-Reports an bzw. aus"
-
-#: apps/gsmsmsd.cc:381
-msgid "  default is \"sms cb stat\""
-msgstr "  Die Voreinstellung ist \"sms cb stat\"."
-
-#: apps/gsmsmsd.cc:382
-msgid "If no action is given, the SMS is printed to stdout"
-msgstr ""
-"Wenn keine Aktion angegeben ist, wird die SMS auf der Standardausgabe\n"
-"angezeigt."
-
-#: apps/gsmsmsd.cc:387 apps/gsmsendsms.cc:178 apps/gsmpb.cc:354
-#: apps/gsmctl.cc:414 apps/gsmsmsstore.cc:223
-msgid "unknown option"
-msgstr "unbekannte Option"
-
-# , c-format
-#: apps/gsmsmsd.cc:426
-#, c-format
-msgid "error when calling sigaction() (errno: %d/%s)"
-msgstr "Fehler beim Aufruf von sigaction() (errno: %d/%s)"
-
-#: apps/gsmsmsd.cc:446
-msgid "store name must be given for flush option"
-msgstr "Speichername mu� angegeben werden f�r flush-Option"
-
-#. process the new message
-#: apps/gsmsmsd.cc:454 apps/gsmsmsd.cc:522
-msgid "Type of message: "
-msgstr "Typ der Nachricht: "
-
-#: apps/gsmsmsd.cc:458 apps/gsmsmsd.cc:526
-msgid "SMS message\n"
-msgstr "SMS Nachricht\n"
-
-#: apps/gsmsmsd.cc:461
-msgid "submit report message\n"
-msgstr "Submit-Report-Nachricht\n"
-
-#: apps/gsmsmsd.cc:464 apps/gsmsmsd.cc:532
-msgid "status report message\n"
-msgstr "Status-Report-Nachricht\n"
-
-#: apps/gsmsmsd.cc:529
-msgid "cell broadcast message\n"
-msgstr "Zellen-weite Nachricht\n"
-
-#: apps/gsmsmsd.cc:585 apps/gsmsmsd.cc:587 apps/gsmsendsms.cc:253
-#: apps/gsmpb.cc:503 apps/gsmctl.cc:631 apps/gsmsmsstore.cc:435
-msgid "[ERROR]: "
-msgstr "[FEHLER]: "
-
-#: apps/gsmsmsd.cc:588
-msgid "(try setting sms_type, please refer to gsmsmsd manpage)"
-msgstr ""
-"(versuchen Sie, den sms_type zu setzen; siehe auch gsmsmsd Manual-Seite)"
-
-#: apps/gsmsendsms.cc:149
-msgid ""
-": [-b baudrate][-c concatenatedID][-C sca][-d device][-h][-I init string]\n"
-"  [-t][-v][-X] phonenumber [text]"
-msgstr ""
-": [-b Baud-Rate][-c concatenatedID][-C sca][-d Ger�t][-h][-I Init String]\n"
-"  [-t][-v][-X]  Telefonnummer [Text]"
-
-#: apps/gsmsendsms.cc:156
-msgid "  -c, --concatenate ID for concatenated SMS messages"
-msgstr "  -c, --concatenate ID f�r verbundene SMS-Nachrichten"
-
-#: apps/gsmsendsms.cc:159 apps/gsmctl.cc:392
-msgid "  -d, --device      sets the destination device to connect to"
-msgstr "  -d, --device      stellt das Ziel-Ger�t ein"
-
-#: apps/gsmsendsms.cc:164
-msgid ""
-"  -t, --test        convert text to GSM alphabet and vice\n"
-"                    versa, no SMS message is sent"
-msgstr ""
-"  -t, --test        konvertiert den Text in das GSM-Alphabet und\n"
-"                    wieder zur�ck. Es wird keine SMS-Nachricht versendet."
-
-#: apps/gsmsendsms.cc:171
-msgid "  phonenumber       recipient's phone number"
-msgstr "  Telefonummer      die Telefonnummer des Empf�ngers"
-
-#: apps/gsmsendsms.cc:172
-msgid ""
-"  text              optional text of the SMS message\n"
-"                    if omitted: read from stdin"
-msgstr ""
-"  text              Text der SMS-Nachricht (optional),\n"
-"                    wenn nicht angegeben: lese von der Standardeingabe"
-
-#: apps/gsmsendsms.cc:205
-msgid "phone number and text missing"
-msgstr "weder Telefonnummer noch Text angegeben"
-
-#: apps/gsmsendsms.cc:208 apps/gsmsmsstore.cc:261
-msgid "more than two parameters given"
-msgstr "mehr als zwei Parameter angegeben"
-
-#: apps/gsmsendsms.cc:224
-msgid "text is larger than 160 characters"
-msgstr "der Text ist l�nger als 160 Zeichen"
-
-# , c-format
-#: apps/gsmpb.cc:102 apps/gsmpb.cc:491
-#, c-format
-msgid "inserting '%s' tel# %s"
-msgstr "f�ge ein '%s' Tel# %s"
-
-# , c-format
-#: apps/gsmpb.cc:105 apps/gsmpb.cc:230 apps/gsmpb.cc:494
-#, c-format
-msgid " (index #%d)"
-msgstr " (Index #%d)"
-
-# , c-format
-#: apps/gsmpb.cc:144
-#, c-format
-msgid "updating '%s' tel# %s to new tel# %s"
-msgstr "�berschreibe '%s' Tel# %s mit neuer Tel# %s"
-
-# , c-format
-#: apps/gsmpb.cc:177
-#, c-format
-msgid "updating '%s' tel# %s to new tel# %s(index %d)"
-msgstr "�berschreibe '%s' Tel# %s mit neuer Tel# %s (Index %d)"
-
-# , c-format
-#: apps/gsmpb.cc:227
-#, c-format
-msgid "deleting '%s' tel# %s"
-msgstr "l�sche '%s' Tel# %s"
-
-#: apps/gsmpb.cc:316
-msgid ""
-": [-b baudrate][-c][-d device or file][-h][-I init string]\n"
-"  [-p phonebook name][-s device or file][-t charset][-v][-V][-y][-X]"
-msgstr ""
-": [-b Baud-Rate][-c][-d Ger�t oder Datei][-h][-I Init String]\n"
-"  [-p Telefonbuchname][-s Ger�t oder Datei][-t Zeichensatz][-v][-V][-y][-X]"
-
-#: apps/gsmpb.cc:325
-msgid "  -c, --copy        copy source entries to destination"
-msgstr "  -c, --copy        kopiere Quell-Eintr�ge zum Zielger�t/-datei"
-
-#: apps/gsmpb.cc:327
-msgid ""
-"  -d, --destination sets the destination device to connect \n"
-"                    to, or the file to write"
-msgstr "  -d, --destination setzt das Zielger�t bzw. die Zieldatei"
-
-#: apps/gsmpb.cc:330
-msgid "  -D, --destination-backend sets the destination backend"
-msgstr "  -D, --destination-backend stellt den Typ des Ziel-Backends ein"
-
-#: apps/gsmpb.cc:333
-msgid "  -i, --index       takes index positions into account"
-msgstr "  -i, --index       ber�cksichtige die Indexpositionen der Eintr�ge"
-
-#: apps/gsmpb.cc:336
-msgid "  -p, --phonebook   name of phonebook to use"
-msgstr "  -p, --phonebook   Name des zu verwendenden Telefonbuchs"
-
-#: apps/gsmpb.cc:337 apps/gsmsmsstore.cc:210
-msgid ""
-"  -s, --source      sets the source device to connect to,\n"
-"                    or the file to read"
-msgstr "  -s, --source      setzt das Quellger�t bzw. die Quelldatei"
-
-#: apps/gsmpb.cc:339
-msgid ""
-"  -t, --charset     sets the character set to use for\n"
-"                    phonebook entries"
-msgstr "  -t, --charset     setzt den Zeichensatz f�r Telefonbucheintr�ge"
-
-#: apps/gsmpb.cc:341
-msgid "  -S, --source-backend sets the source backend"
-msgstr "  -S, --source-backend stellt den Typ des Ziel-Backends ein"
-
-#: apps/gsmpb.cc:344 apps/gsmsmsstore.cc:214
-msgid "  -V, --verbose     print detailed progress messages"
-msgstr "  -V, --verbose     gibt detaillierte Fortschrittsmeldungen aus"
-
-#: apps/gsmpb.cc:347
-msgid ""
-"  -y, --synchronize synchronize destination with source\n"
-"                    entries (destination is overwritten)\n"
-"                    (see gsmpb(1) for details)"
-msgstr ""
-"  -y, --synchronize synchronisiere das Zielger�t/-datei mit der Quelle\n"
-"                    (Zieleintr�ge werden eventuell �berschrieben)\n"
-"                    (siehe gsmpb(1) f�r weitere Details)"
-
-#: apps/gsmpb.cc:360
-msgid "both source and destination must be given"
-msgstr "sowohl Quellger�t/-datei als auch Zielger�t/-datei erforderlich"
-
-#: apps/gsmpb.cc:374 apps/gsmpb.cc:416
-msgid "phonebook name must be given"
-msgstr "ein Telefonbuchname mu� angegeben werden"
-
-# , c-format
-#: apps/gsmpb.cc:441
-#, c-format
-msgid ""
-"text '%s' is too large to fit into destination (maximum size %d characters)"
-msgstr ""
-"Text '%s' ist zu gro� f�r das Zielger�t (maximale Textl�nge %d Zeichen)"
-
-# , c-format
-#: apps/gsmpb.cc:447
-#, c-format
-msgid ""
-"phone number '%s' is too large to fit into destination (maximum size %d "
-"characters)"
-msgstr ""
-"Telefonnummer '%s' ist zu gro� f�r das Zielger�t (maximale L�nge %d Zeichen)"
-
-#: apps/gsmctl.cc:90
-msgid "active "
-msgstr "aktiv"
-
-#: apps/gsmctl.cc:90
-msgid "inactive "
-msgstr "inaktiv"
-
-#: apps/gsmctl.cc:91
-msgid "number: "
-msgstr "Telefonnummer: "
-
-#: apps/gsmctl.cc:92
-msgid "  subaddr: "
-msgstr "  Unteradresse: "
-
-#: apps/gsmctl.cc:93
-msgid "  time: "
-msgstr "  Zeit: "
-
-#: apps/gsmctl.cc:105
-msgid "<ME0>  Manufacturer: "
-msgstr "<ME0>  Hersteller: "
-
-#: apps/gsmctl.cc:106
-msgid "<ME1>  Model: "
-msgstr "<ME1>  Modell: "
-
-#: apps/gsmctl.cc:107
-msgid "<ME2>  Revision: "
-msgstr "<ME2>  Revision: "
-
-#: apps/gsmctl.cc:108
-msgid "<ME3>  Serial Number: "
-msgstr "<ME3>  Seriennummer: "
-
-#: apps/gsmctl.cc:116 apps/gsmctl.cc:118
-msgid "<FUN>  Functionality Level: "
-msgstr "<FUN>  Funktionalit�ts-Level: "
-
-#: apps/gsmctl.cc:118
-msgid "unsupported"
-msgstr "Kommando nicht unterst�tzt"
-
-#: apps/gsmctl.cc:128
-msgid ">  Status: "
-msgstr ">  Status: "
-
-#: apps/gsmctl.cc:131 gsmlib/gsm_error.cc:104 gsmlib/gsm_sms.cc:441
-#: gsmlib/gsm_sms_codec.cc:204
-msgid "unknown"
-msgstr "unbekannt"
-
-#: apps/gsmctl.cc:132
-msgid "current"
-msgstr "aktuell"
-
-#: apps/gsmctl.cc:133
-msgid "available"
-msgstr "verf�gbar"
-
-#: apps/gsmctl.cc:134
-msgid "forbidden"
-msgstr "nicht w�hlbar"
-
-#: apps/gsmctl.cc:136 apps/gsmctl.cc:147
-msgid "  Long name: '"
-msgstr "  Langname: '"
-
-#: apps/gsmctl.cc:137 apps/gsmctl.cc:148
-msgid "  Short name: '"
-msgstr "  Kurzname: '"
-
-#: apps/gsmctl.cc:138 apps/gsmctl.cc:149
-msgid "  Numeric name: "
-msgstr "  Numerischer Name: "
-
-#: apps/gsmctl.cc:150
-msgid "  Mode: "
-msgstr "  Modus: "
-
-#: apps/gsmctl.cc:153
-msgid "automatic"
-msgstr "automatisch"
-
-#: apps/gsmctl.cc:154
-msgid "manual"
-msgstr "manuell"
-
-#: apps/gsmctl.cc:155
-msgid "deregister"
-msgstr "abmelden"
-
-#: apps/gsmctl.cc:156
-msgid "manual/automatic"
-msgstr "manuell/automatisch"
-
-#: apps/gsmctl.cc:172 apps/gsmctl.cc:247
-msgid "  Voice"
-msgstr "  Sprache"
-
-#: apps/gsmctl.cc:176 apps/gsmctl.cc:185 apps/gsmctl.cc:194
-msgid "  unknown"
-msgstr "  unbekannt"
-
-#: apps/gsmctl.cc:181 apps/gsmctl.cc:249
-msgid "  Data"
-msgstr "  Daten"
-
-#: apps/gsmctl.cc:190 apps/gsmctl.cc:251
-msgid "  Fax"
-msgstr "  Fax"
-
-#: apps/gsmctl.cc:229
-msgid "on"
-msgstr "an"
-
-#: apps/gsmctl.cc:229
-msgid "off"
-msgstr "aus"
-
-#: apps/gsmctl.cc:239
-msgid "UnconditionalReason"
-msgstr "\"Alle Anrufe\""
-
-#: apps/gsmctl.cc:240
-msgid "MobileBusyReason"
-msgstr "\"Mobiltelefon besetzt\""
-
-#: apps/gsmctl.cc:241
-msgid "NoReplyReason"
-msgstr "\"Keine Antwort\""
-
-#: apps/gsmctl.cc:242
-msgid "NotReachableReason"
-msgstr "\"Nicht erreichbar\""
-
-#: apps/gsmctl.cc:261
-msgid "0 ME is powered by the battery"
-msgstr "0 ME wird von der Batterie gespeist"
-
-#: apps/gsmctl.cc:262
-msgid "1 ME has a battery connected, but is not powered by it"
-msgstr "1 ME-Batterie ist vorhanden, liefert aber keinen Strom"
-
-#: apps/gsmctl.cc:264
-msgid "2 ME does not have a battery connected"
-msgstr "2 ME-Batterie nicht angeschlossen"
-
-#: apps/gsmctl.cc:266
-msgid "3 Recognized power fault, calls inhibited"
-msgstr "3 Problem mit der Energieversorgung, keine Anrufe m�glich"
-
-# , c-format
-#: apps/gsmctl.cc:323
-#, c-format
-msgid "unknown facility class parameter '%c'"
-msgstr "unbekannter Dienstmerkmal-Parameter '%c'"
-
-# , c-format
-#: apps/gsmctl.cc:336
-#, c-format
-msgid "not enough parameters, minimum number of parameters is %d"
-msgstr "nicht gen�gend Parameter, die Mindestanzahl der Parameter ist %d"
-
-# , c-format
-#: apps/gsmctl.cc:340
-#, c-format
-msgid "too many parameters, maximum number of parameters is %d"
-msgstr "zu viele Parameter, die Maximalanzahl der Parameter ist %d"
-
-#: apps/gsmctl.cc:385
-msgid ""
-": [-b baudrate][-d device][-h][-I init string][-o operation]\n"
-"  [-v][-X]{parameters}"
-msgstr ""
-": [-b Baud-Rate][-d Ger�t][-h][-I Init String][-o Operation]\n"
-"  [-v][-X]{Parameter}"
-
-#: apps/gsmctl.cc:396
-msgid ""
-"  -o, --operation   operation to perform on the mobile \n"
-"                    phone with the specified parameters"
-msgstr ""
-"  -o, --operation   gibt die Operation an, die auf dem Mobiltelefon\n"
-"                    mit den angegebenen Parametern ausgef�hrt werden soll"
-
-#: apps/gsmctl.cc:402
-msgid ""
-"  parameters        parameters to use for the operation\n"
-"                    (if an operation is given) or\n"
-"                    a specification which kind of\n"
-"                    information to read from the mobile phone"
-msgstr ""
-"  Parameter         die f�r die Operation zu verwendenden Parameter\n"
-"                    (wenn eine Operation ausgef�hrt werden soll) oder\n"
-"                    die Spezifikation der vom Mobiltelefon zu lesenden\n"
-"                    Informationen"
-
-#: apps/gsmctl.cc:408
-msgid ""
-"Refer to gsmctl(1) for details on the available parameters and operations."
-msgstr ""
-"Bitte beziehen Sie sich auf die Manual-Seite gsmctl(1) f�r weitere Details\n"
-"�ber die unterst�tzten Parameter und Operationen."
-
-# , c-format
-#: apps/gsmctl.cc:471
-#, c-format
-msgid "unknown information parameter '%s'"
-msgstr "unbekannter Informations-Parameter '%s'"
-
-# , c-format
-#: apps/gsmctl.cc:520
-#, c-format
-msgid "unknown opmode parameter '%s'"
-msgstr "Unbekannter (Operations-)Modus-Parameter '%s'"
-
-# , c-format
-#: apps/gsmctl.cc:588
-#, c-format
-msgid "unknown forward reason parameter '%s'"
-msgstr "unbekannter Weiterleitungsgrund-Parameter '%s'"
-
-# , c-format
-#: apps/gsmctl.cc:604
-#, c-format
-msgid "unknown forward mode parameter '%s'"
-msgstr "unbekannter Weiterleitungs-Modus-Parameter '%s'"
-
-# , c-format
-#: apps/gsmctl.cc:625
-#, c-format
-msgid "unknown operation '%s'"
-msgstr "unbekannte Operation '%s'"
-
-# , c-format
-#: apps/gsmsmsstore.cc:91 apps/gsmsmsstore.cc:363 apps/gsmsmsstore.cc:380
-#, c-format
-msgid "inserting entry #%d from source into destination"
-msgstr "f�ge Eintrag #%d von Quellger�t/-datei in Zielger�t/-datei ein"
-
-# , c-format
-#: apps/gsmsmsstore.cc:102
-#, c-format
-msgid "incompatible options '%c' and '%c'"
-msgstr "inkompatible Optionen '%c' und '%c'"
-
-#: apps/gsmsmsstore.cc:184
-msgid ""
-": [-a][-b baudrate][-c][-C sca][-d device or file]\n"
-"  [-h][-I init string][-k][-l][-s device or file][-t SMS store name]\n"
-"  [-v][-V][-x][-X]{indices}|[phonenumber text]"
-msgstr ""
-": [-a][-b Baud-Rate][-c][-C sca][-d Ger�t oder Datei]\n"
-"  [-h][-I Init String][-k][-l][-s Ger�t oder Datei][-t SMS Speichername]\n"
-"  [-v][-V][-x][-X]{Indices}|[Telefonnummer Text]"
-
-#: apps/gsmsmsstore.cc:191
-msgid ""
-"  -a, --add         add new SMS submit message\n"
-"                    (phonenumber and text) to destination"
-msgstr ""
-"  -a, --add         f�ge neue SMS-Submit-Nachricht (Telefonnummer und\n"
-"                    Text) in das Zielger�t/-datei ein"
-
-#: apps/gsmsmsstore.cc:197
-msgid ""
-"  -c, --copy        copy source entries to destination\n"
-"                    (if indices are given, copy only these entries)"
-msgstr ""
-"  -c, --copy        kopiere Quell-Eintr�ge in das Zielger�t/-datei\n"
-"                    (wenn Indices angegeben sind, kopiere nur diese Eintr�ge)"
-
-#: apps/gsmsmsstore.cc:201
-msgid ""
-"  -d, --destination sets the destination device to\n"
-"                    connect to, or the file to write to"
-msgstr "  -d, --destination setzt das Zielger�t bzw. die Zieldatei"
-
-#: apps/gsmsmsstore.cc:206
-msgid ""
-"  -k, --backup      backup new entries to destination\n"
-"                    (if indices are given, copy only these entries)"
-msgstr ""
-"  -k, --backup      sichert alle neuen Eintr�ge in die Zieldatei/-ger�t\n"
-"                    (wenn Indices angegeben sind, sichere nur diese Eintr�ge)"
-
-#: apps/gsmsmsstore.cc:209
-msgid "  -l, --list        list source to stdout"
-msgstr ""
-"  -l, --list        schreibe Liste der Quelleintr�ge auf die Standardausgabe"
-
-#: apps/gsmsmsstore.cc:212
-msgid "  -t, --store       name of SMS store to use"
-msgstr "  -t, --store       gibt den zu verwendenden SMS-Speicher an"
-
-#: apps/gsmsmsstore.cc:216
-msgid "  -x, --delete      delete entries denoted by indices"
-msgstr ""
-"  -x, --delete      l�sche die durch die Indices spezifizierten Eintr�ge"
-
-#: apps/gsmsmsstore.cc:229
-msgid "no operation option given"
-msgstr "keine Operations-Option angegeben"
-
-#: apps/gsmsmsstore.cc:232
-msgid "both source and destination required"
-msgstr "sowohl Quellger�t/-datei als auch Zielger�t/-datei erforderlich"
-
-#: apps/gsmsmsstore.cc:237
-msgid "destination must not be given"
-msgstr "Zielger�t/-datei darf nicht angegeben werden"
-
-#: apps/gsmsmsstore.cc:239
-msgid "source required"
-msgstr "Quellger�t/-datei erforderlich"
-
-#: apps/gsmsmsstore.cc:244
-msgid "source must not be given"
-msgstr "Quellger�t/-datei darf nicht angegeben werden"
-
-#: apps/gsmsmsstore.cc:246
-msgid "destination required"
-msgstr "Zielger�t/-datei erforderlich"
-
-# , c-format
-#: apps/gsmsmsstore.cc:254 gsmlib/gsm_util.cc:285
-#, c-format
-msgid "expected number, got '%s'"
-msgstr "Zahl erwartet, nicht '%s'"
-
-#: apps/gsmsmsstore.cc:264
-msgid "not enough parameters given"
-msgstr "nicht gen�gend Parameter angegeben"
-
-#: apps/gsmsmsstore.cc:269
-msgid "unexpected parameters"
-msgstr "unerwartete Parameter"
-
-#: apps/gsmsmsstore.cc:280 apps/gsmsmsstore.cc:317
-msgid "store name must be given"
-msgstr "Speichername mu� angegeben werden"
-
-# , c-format
-#: apps/gsmsmsstore.cc:344 apps/gsmsmsstore.cc:377
-#, c-format
-msgid "no index '%s' in source"
-msgstr "kein Index '%s' in der Quelldatei/-ger�t"
-
-# , c-format
-#: apps/gsmsmsstore.cc:392
-#, c-format
-msgid "index #%d"
-msgstr "Index #%d"
-
-#: apps/gsmsmsstore.cc:406
-msgid "inserting new entry into destination"
-msgstr "f�ge neuen Eintrag in das Zielger�t/-datei ein"
-
-# , c-format
-#: apps/gsmsmsstore.cc:421
-#, c-format
-msgid "deleting entry #%d from destination"
-msgstr "l�sche Eintrag #%d von Zielger�t/-datei"
-
-# , c-format
-#: apps/gsmsmsstore.cc:426
-#, c-format
-msgid "no index '%s' in destination"
-msgstr "kein Index '%s' in Zielger�t/-datei"
-
-#: gsmlib/gsm_at.cc:66
-msgid "unspecified ME/TA error"
-msgstr "unspezifizierter ME/TA-Fehler"
-
-#: gsmlib/gsm_at.cc:76
-msgid "ME/TA error '"
-msgstr "ME/TA-Fehler '"
-
-# , c-format
-#: gsmlib/gsm_at.cc:80
-#, c-format
-msgid "(code %s)"
-msgstr "(Code %s)"
-
-#: gsmlib/gsm_at.cc:125 gsmlib/gsm_at.cc:215 gsmlib/gsm_at.cc:344
-msgid "ME/TA error '<unspecified>' (code not known)"
-msgstr "ME/TA-Fehler '<unspezifiziert>' (Code nicht bekannt)"
-
-# , c-format
-#: gsmlib/gsm_at.cc:184 gsmlib/gsm_at.cc:365
-#, c-format
-msgid "unexpected response '%s' when sending 'AT%s'"
-msgstr "unerwartete Antwort '%s' beim Senden von 'AT%s'"
-
-#: gsmlib/gsm_at.cc:318
-msgid "unexpected character in PDU handshake"
-msgstr "unerwartetes Zeichen im PDU-Handshake"
-
-#: gsmlib/gsm_error.cc:29
-msgid "phone failure"
-msgstr "Telefon-Fehler"
-
-#: gsmlib/gsm_error.cc:32
-msgid "no connection to phone"
-msgstr "keine Verbindung zum Telefon"
-
-#: gsmlib/gsm_error.cc:35
-msgid "phone adaptor link reserved"
-msgstr "Telefonadapter-Verbindung reserviert"
-
-#: gsmlib/gsm_error.cc:38 gsmlib/gsm_error.cc:259
-msgid "operation not allowed"
-msgstr "Operation nicht erlaubt"
-
-#: gsmlib/gsm_error.cc:41 gsmlib/gsm_error.cc:262
-msgid "operation not supported"
-msgstr "Operation nicht unterst�tzt"
-
-#: gsmlib/gsm_error.cc:44
-msgid "ph SIM PIN required"
-msgstr "ph SIM PIN erforderlich"
-
-#: gsmlib/gsm_error.cc:47 gsmlib/gsm_error.cc:271
-msgid "SIM not inserted"
-msgstr "SIM nicht eingesteckt"
-
-#: gsmlib/gsm_error.cc:50 gsmlib/gsm_error.cc:274
-msgid "SIM PIN required"
-msgstr "SIM PIN erforderlich"
-
-#: gsmlib/gsm_error.cc:53 gsmlib/gsm_error.cc:289
-msgid "SIM PUK required"
-msgstr "SIM PUK erforderlich"
-
-#: gsmlib/gsm_error.cc:56 gsmlib/gsm_error.cc:280
-msgid "SIM failure"
-msgstr "SIM-Fehler"
-
-#: gsmlib/gsm_error.cc:59 gsmlib/gsm_error.cc:283
-msgid "SIM busy"
-msgstr "SIM besch�ftigt"
-
-#: gsmlib/gsm_error.cc:62 gsmlib/gsm_error.cc:286
-msgid "SIM wrong"
-msgstr "falsche SIM"
-
-#: gsmlib/gsm_error.cc:65
-msgid "incorrect password"
-msgstr "falsches Pa�wort"
-
-#: gsmlib/gsm_error.cc:68 gsmlib/gsm_error.cc:292
-msgid "SIM PIN2 required"
-msgstr "SIM PIN2 erforderlich"
-
-#: gsmlib/gsm_error.cc:71 gsmlib/gsm_error.cc:295
-msgid "SIM PUK2 required"
-msgstr "SIM PUK2 erforderlich"
-
-#: gsmlib/gsm_error.cc:74 gsmlib/gsm_error.cc:304
-msgid "memory full"
-msgstr "Speicher voll"
-
-#: gsmlib/gsm_error.cc:77
-msgid "invalid index"
-msgstr "ung�ltiger Index"
-
-#: gsmlib/gsm_error.cc:80
-msgid "not found"
-msgstr "nicht gefunden"
-
-#: gsmlib/gsm_error.cc:83 gsmlib/gsm_error.cc:298
-msgid "memory failure"
-msgstr "Speicher-Fehler"
-
-#: gsmlib/gsm_error.cc:86
-msgid "text string too long"
-msgstr "Zeichenkette zu lang"
-
-#: gsmlib/gsm_error.cc:89
-msgid "invalid characters in text string"
-msgstr "ung�ltige Zeichen in der Zeichenkette"
-
-#: gsmlib/gsm_error.cc:92
-msgid "dial string too long"
-msgstr "zu w�hlende Telefonnummer zu lang"
-
-#: gsmlib/gsm_error.cc:95
-msgid "invalid characters in dial string"
-msgstr "ung�ltige Zeichen in zu w�hlender Telefonnummer"
-
-#: gsmlib/gsm_error.cc:98 gsmlib/gsm_error.cc:310
-msgid "no network service"
-msgstr "kein Netz"
-
-#: gsmlib/gsm_error.cc:101 gsmlib/gsm_error.cc:313
-msgid "network timeout"
-msgstr "Netz-Zeit�berschreitung"
-
-# , c-format
-#: gsmlib/gsm_error.cc:107
-#, c-format
-msgid "invalid ME error %d"
-msgstr "ung�ltiger ME-Fehler %d"
-
-#: gsmlib/gsm_error.cc:117
-msgid "Unassigned (unallocated) number"
-msgstr "nicht zugewiesene Nummer"
-
-#: gsmlib/gsm_error.cc:120
-msgid "Operator determined barring"
-msgstr "vom Operator geschaltete Sperre"
-
-#: gsmlib/gsm_error.cc:123
-msgid "Call barred"
-msgstr "Rufsperre"
-
-#: gsmlib/gsm_error.cc:126
-msgid "Network failure"
-msgstr "Netz-Fehler"
-
-#: gsmlib/gsm_error.cc:129
-msgid "Short message transfer rejected"
-msgstr "Kurznachrichten-�bertragung zur�ckgewiesen"
-
-#: gsmlib/gsm_error.cc:133 gsmlib/gsm_error.cc:355
-msgid "Congestion"
-msgstr "Netz�berlastung"
-
-#: gsmlib/gsm_error.cc:136
-msgid "Destination out of service"
-msgstr "Ziel au�er Betrieb"
-
-#: gsmlib/gsm_error.cc:139
-msgid "Unidentified subscriber"
-msgstr "unidentifizierter Teilnehmer"
-
-#: gsmlib/gsm_error.cc:142
-msgid "Facility rejected"
-msgstr "Dienstmerkmal zur�ckgewiesen"
-
-#: gsmlib/gsm_error.cc:145
-msgid "Unknown subscriber"
-msgstr "unbekannter Teilnehmer"
-
-#: gsmlib/gsm_error.cc:148
-msgid "Network out of order"
-msgstr "Netz au�er Betrieb"
-
-#: gsmlib/gsm_error.cc:151
-msgid "Temporary failure"
-msgstr "tempor�rer Fehler"
-
-#: gsmlib/gsm_error.cc:154
-msgid "Resources unavailable, unspecified"
-msgstr "Ressourcen nicht verf�gbar, nicht spezifiziert"
-
-#: gsmlib/gsm_error.cc:157
-msgid "Requested facility not subscribed"
-msgstr "angefordertes Dienstmerkmal nicht freigeschaltet"
-
-#: gsmlib/gsm_error.cc:160
-msgid "Requested facility not implemented"
-msgstr "angefordertes Dienstmerkmal nicht implementiert"
-
-#: gsmlib/gsm_error.cc:163
-msgid "Invalid Transaction Identifier"
-msgstr "ung�ltiger Transaktionsbezeichner"
-
-#: gsmlib/gsm_error.cc:166
-msgid "Semantically incorrect message"
-msgstr "semantisch fehlerhafte Nachricht"
-
-#: gsmlib/gsm_error.cc:169
-msgid "Invalid mandatory information"
-msgstr "ung�ltige, obligatorische Information"
-
-#: gsmlib/gsm_error.cc:172
-msgid "Message type non-existent or not implemented"
-msgstr "Nachrichtentyp nicht existent bzw. nicht implementiert"
-
-#: gsmlib/gsm_error.cc:175
-msgid "Message not compatible with short message protocol state"
-msgstr "Nachricht nicht vereinbar mit Kurznachrichten-Protokollstatus"
-
-#: gsmlib/gsm_error.cc:178
-msgid "Information element non-existent or not implemented"
-msgstr "Informationselement nicht existent oder nicht implementiert"
-
-#: gsmlib/gsm_error.cc:181
-msgid "Protocol error, unspecified"
-msgstr "Protokollfehler, nicht spezifiziert"
-
-#: gsmlib/gsm_error.cc:184
-msgid "Interworking, unspecified"
-msgstr "Interworking, nicht spezifiziert"
-
-#: gsmlib/gsm_error.cc:187
-msgid "Telematic interworking not supported"
-msgstr "Telematisches Interworking nicht unterst�tzt"
-
-#: gsmlib/gsm_error.cc:190
-msgid "Short message Type 0 not supported"
-msgstr "Kurznachrichtentyp 0 nicht unterst�tzt"
-
-#: gsmlib/gsm_error.cc:193
-msgid "Cannot replace short message"
-msgstr "kann Kurznachricht nicht ersetzen"
-
-#: gsmlib/gsm_error.cc:196
-msgid "Unspecified TP-PID error"
-msgstr "unspezifizierter TP-PID-Fehler"
-
-#: gsmlib/gsm_error.cc:199
-msgid "Data coding scheme (alphabet) not supported"
-msgstr "Datenkodierungsschema (Alphabet) nicht unterst�tzt"
-
-#: gsmlib/gsm_error.cc:202
-msgid "Message class not supported"
-msgstr "Nachrichtenklasse nicht unterst�tzt"
-
-#: gsmlib/gsm_error.cc:205
-msgid "Unspecifiec TP-DCS error"
-msgstr "unspezifizierter TP-DCS-Fehler"
-
-#: gsmlib/gsm_error.cc:208
-msgid "Command cannot be actioned"
-msgstr "Kommando kann nicht ausgef�hrt werden"
-
-#: gsmlib/gsm_error.cc:211
-msgid "Command unsupported"
-msgstr "Kommando nicht unterst�tzt"
-
-#: gsmlib/gsm_error.cc:214
-msgid "Unspecified TP-Command error"
-msgstr "unspezifizierter TP-Kommando-Fehler"
-
-#: gsmlib/gsm_error.cc:217
-msgid "TPDU not supported"
-msgstr "TPDU nicht unterst�tzt"
-
-#: gsmlib/gsm_error.cc:220
-msgid "SC busy"
-msgstr "SC besetzt"
-
-#: gsmlib/gsm_error.cc:223
-msgid "No SC subscription"
-msgstr "SC nicht freigeschaltet"
-
-#: gsmlib/gsm_error.cc:226
-msgid "SC system failure"
-msgstr "SC-Systemfehler"
-
-#: gsmlib/gsm_error.cc:229
-msgid "Invalid SME address"
-msgstr "ung�ltige SME-Adresse"
-
-#: gsmlib/gsm_error.cc:232
-msgid "Destination SME barred"
-msgstr "Ziel-SME gesperrt"
-
-#: gsmlib/gsm_error.cc:235
-msgid "SM Rejected-Duplicated SM"
-msgstr "Kurznachricht zur�ckgewiesen - doppelte Kurznachricht"
-
-#: gsmlib/gsm_error.cc:238
-msgid "SIM SMS storage full"
-msgstr "SIM-SMS-Speicher voll"
-
-#: gsmlib/gsm_error.cc:241
-msgid "No SMS storage capability in SIM"
-msgstr "Keine SMS-Speicherf�higkeit in SIM"
-
-#: gsmlib/gsm_error.cc:244
-msgid "Error in MS"
-msgstr "Fehler im MS"
-
-#: gsmlib/gsm_error.cc:247
-msgid "Memory Capacity Exceed"
-msgstr "Speicherkapazit�t �berschritten"
-
-#: gsmlib/gsm_error.cc:250
-msgid "Unspecified error cause"
-msgstr "unspezifizierter Fehlergrund"
-
-#: gsmlib/gsm_error.cc:253
-msgid "ME failure"
-msgstr "ME-Fehler"
-
-#: gsmlib/gsm_error.cc:256
-msgid "SMS service of ME reserved"
-msgstr "SMS-Dienst im ME reserviert"
-
-#: gsmlib/gsm_error.cc:265
-msgid "invalid PDU mode parameter"
-msgstr "ung�ltiger PDU-Modus-Parameter"
-
-#: gsmlib/gsm_error.cc:268
-msgid "invalid text mode parameter"
-msgstr "ung�ltiger Text-Modus-Parameter"
-
-#: gsmlib/gsm_error.cc:277
-msgid "PH-SIM PIN required"
-msgstr "PH-SIM PIN erforderlich"
-
-#: gsmlib/gsm_error.cc:301
-msgid "invalid memory index"
-msgstr "ung�ltiger Speicherindex"
-
-#: gsmlib/gsm_error.cc:307
-msgid "SMSC address unknown"
-msgstr "SMSC-Adresse nicht bekannt"
-
-#: gsmlib/gsm_error.cc:316
-msgid "no +CNMA acknowledgement expected"
-msgstr "keine +CNMA-Best�tigung erwartet"
-
-#: gsmlib/gsm_error.cc:319
-msgid "unknown error"
-msgstr "unbekannter Fehler"
-
-# , c-format
-#: gsmlib/gsm_error.cc:322
-#, c-format
-msgid "invalid SMS error %d"
-msgstr "ung�ltiger SMS-Fehler %d"
-
-#: gsmlib/gsm_error.cc:335
-msgid "Short message received by the SME"
-msgstr "Kurznachricht von der SME empfangen"
-
-#: gsmlib/gsm_error.cc:338
-msgid ""
-"Short message forwarded by the SC to the SME but the SC is unable to confirm "
-"delivery"
-msgstr ""
-"die Kurznachricht wurde vom SC zur SME weitergeleitet, aber das SC ist nicht "
-"in der Lage, den Empfang zu best�tigen"
-
-#: gsmlib/gsm_error.cc:342
-msgid "Short message replaced by the SC"
-msgstr "Kurznachricht wurde vom SC ersetzt"
-
-#: gsmlib/gsm_error.cc:345 gsmlib/gsm_error.cc:373 gsmlib/gsm_error.cc:418
-msgid "reserved"
-msgstr "reserviert"
-
-#: gsmlib/gsm_error.cc:358
-msgid "SME busy"
-msgstr "SME besetzt"
-
-#: gsmlib/gsm_error.cc:361
-msgid "No response from SME"
-msgstr "keine Antwort vom SME"
-
-#: gsmlib/gsm_error.cc:364
-msgid "Service rejected"
-msgstr "Dienst zur�ckgewiesen"
-
-#: gsmlib/gsm_error.cc:367 gsmlib/gsm_error.cc:400
-msgid "Quality of service not available"
-msgstr "Dienstqualit�t nicht verf�gbar"
-
-#: gsmlib/gsm_error.cc:370
-msgid "Error in SME"
-msgstr "Fehler im SME"
-
-#: gsmlib/gsm_error.cc:377
-msgid " (Temporary error, SC is not making any more transfer attempts)"
-msgstr " (tempor�rer Fehler, SC macht keine weiteren �bertragungsversuche)"
-
-#: gsmlib/gsm_error.cc:380
-msgid " (Temporary error, SC still trying to transfer SM)"
-msgstr " (tempor�rer Fehler, SC versucht weiterhin die SM zu �bertragen)"
-
-#: gsmlib/gsm_error.cc:388
-msgid "Remote Procedure Error"
-msgstr "Fern-Prozedur-Aufrufs-Fehler"
-
-#: gsmlib/gsm_error.cc:391
-msgid "Incompatible destination"
-msgstr "inkompatibles Ziel"
-
-#: gsmlib/gsm_error.cc:394
-msgid "Connection rejected by SME"
-msgstr "Verbindung vom SME zur�ckgewiesen"
-
-#: gsmlib/gsm_error.cc:397
-msgid "Not obtainable"
-msgstr "nicht verf�gbar"
-
-#: gsmlib/gsm_error.cc:403
-msgid "No interworking available"
-msgstr "kein Interworking verf�gbar"
-
-#: gsmlib/gsm_error.cc:406
-msgid "SM validity period expired"
-msgstr "SM-G�ltigkeitszeitraum �berschritten"
-
-#: gsmlib/gsm_error.cc:409
-msgid "SM deleted by originating SME"
-msgstr "SM von der sendenden SME gel�scht"
-
-#: gsmlib/gsm_error.cc:412
-msgid "SM deleted by SC administration"
-msgstr "SM von der SC-Administration gel�scht"
-
-#: gsmlib/gsm_error.cc:415
-msgid "SM does not exit"
-msgstr "SM macht keinen Exit"
-
-#: gsmlib/gsm_error.cc:421
-msgid " (Permanent Error, SC is not making any more transfer attempts)"
-msgstr " (permanenter Fehler, SC macht keine weiteren �bertragungsversuche)"
-
-# , c-format
-#: gsmlib/gsm_event.cc:80
-#, c-format
-msgid "unexpected number format %d"
-msgstr "unerwartetes Telefonnummernformat %d"
-
-# , c-format
-#: gsmlib/gsm_event.cc:100
-#, c-format
-msgid "unexpected unsolicited event '%s'"
-msgstr "unerwartetes asynchrones Ereignis '%s'"
-
-#: gsmlib/gsm_me_ta.cc:536
-msgid "unable to set operator"
-msgstr "kann den Netzbetreiber nicht setzen"
-
-#: gsmlib/gsm_me_ta.cc:663
-msgid "call forward time must be in the range 0..30"
-msgstr "Rufumleitungszeit muss im Bereich 0..30 sein"
-
-#: gsmlib/gsm_me_ta.cc:811
-msgid "Functionality Level commands not supported by ME"
-msgstr ""
-"Funktionalit�ts-Level-Kommandos werden vom Ger�t (ME) nicht unterst�tzt"
-
-#. If the number was just out of range, we get here.
-#: gsmlib/gsm_me_ta.cc:830
-msgid "Requested Functionality Level out of range"
-msgstr "Angeforderter Funktionalit�ts-Level au�erhalb des erlaubten Bereichs"
-
-#: gsmlib/gsm_me_ta.cc:941
-msgid "unsupported alphabet for SMS"
-msgstr "nicht unterst�tztes Alphabet f�r SMS"
-
-#: gsmlib/gsm_me_ta.cc:950
-msgid "SMS text is larger than allowed"
-msgstr "SMS-Text ist l�nger als erlaubt"
-
-#: gsmlib/gsm_me_ta.cc:962
-msgid "not more than 255 concatenated SMSs allowed"
-msgstr "nicht mehr als 255 verbundene SMSs erlaubt"
-
-#: gsmlib/gsm_me_ta.cc:995
-msgid "only serviceLevel 0 or 1 supported"
-msgstr "nur Dienst-Level 0 oder 1 unterst�tzt"
-
-#: gsmlib/gsm_me_ta.cc:1108 gsmlib/gsm_me_ta.cc:1150
-msgid "cannot route SMS messages to TE"
-msgstr "kann keine Kurznachrichten zum TE weiterleiten"
-
-#: gsmlib/gsm_me_ta.cc:1122 gsmlib/gsm_me_ta.cc:1164
-msgid "cannot route cell broadcast messages to TE"
-msgstr "kann keine Zellen-weiten Nachrichten zum TE weiterleiten"
-
-#: gsmlib/gsm_me_ta.cc:1134
-msgid "cannot route status reports messages to TE"
-msgstr "kann keine Status-Report-Nachrichten zum TE weiterleiten"
-
-#: gsmlib/gsm_me_ta.cc:1178
-msgid "cannot route status report messages to TE"
-msgstr "kann keine Status-Report-Nachrichten zum TE weiterleiten"
-
-#: gsmlib/gsm_parser.cc:51
-msgid "expected parameter"
-msgstr "Parameter erwartet"
-
-#: gsmlib/gsm_parser.cc:71
-msgid "expected '\"'"
-msgstr "'\"' erwartet"
-
-#: gsmlib/gsm_parser.cc:109
-msgid "expected number"
-msgstr "Zahl erwartet"
-
-# , c-format
-#: gsmlib/gsm_parser.cc:120
-#, c-format
-msgid "unexpected end of string '%s'"
-msgstr "unerwartetes Ende der Zeichenkette '%s'"
-
-# , c-format
-#: gsmlib/gsm_parser.cc:124
-#, c-format
-msgid " (at position %d of string '%s')"
-msgstr " (an Position %d der Zeichenkette '%s')"
-
-# , c-format
-#: gsmlib/gsm_parser.cc:141
-#, c-format
-msgid "expected '%c'"
-msgstr "'%c' erwartet"
-
-#: gsmlib/gsm_parser.cc:165
-msgid "expected ')' or ','"
-msgstr "')' oder ',' erwartet"
-
-#: gsmlib/gsm_parser.cc:251
-msgid "expected ')', ',' or '-'"
-msgstr "')', ',' oder '-' erwartet"
-
-#: gsmlib/gsm_parser.cc:257
-msgid "range of the form a-b-c not allowed"
-msgstr "Bereich der Form a-b-c nicht erlaubt"
-
-#: gsmlib/gsm_parser.cc:264
-msgid "range of the form a- no allowed"
-msgstr "Bereich der Form a- nicht erlaubt"
-
-#: gsmlib/gsm_parser.cc:350
-msgid "expected comma"
-msgstr "Komma erwartet"
-
-#: gsmlib/gsm_parser.cc:367
-msgid "expected end of line"
-msgstr "Zeilenende erwartet"
-
-# , c-format
-#: gsmlib/gsm_phonebook.cc:47
-#, c-format
-msgid ""
-"length of text '%s' exceeds maximum text length (%d characters) of phonebook "
-"'%s'"
-msgstr ""
-"die L�nge des Texts '%s' �berschreitet die maximale Textl�nge (%d Zeichen) "
-"des Telefonbuchs '%s'"
-
-# , c-format
-#: gsmlib/gsm_phonebook.cc:55
-#, c-format
-msgid ""
-"length of telephone number '%s' exceeds maximum telephone number length (%d "
-"characters) of phonebook '%s'"
-msgstr ""
-"die L�nge der Telefonnummer '%s' �berschreitet die maximale "
-"Telefonnummernl�nge (%d Zeichen) des Telefonbuchs '%s'"
-
-#: gsmlib/gsm_phonebook.cc:275
-msgid "phonebook full"
-msgstr "Telefonbuch voll"
-
-#: gsmlib/gsm_phonebook.cc:291
-msgid "attempt to overwrite phonebook entry"
-msgstr "Versuch, einen Telefonbucheintrag zu �berschreiben"
-
-#: gsmlib/gsm_phonebook.cc:569
-msgid "SIM card changed while accessing phonebook"
-msgstr "SIM-Karte wurde gewechselt beim Zugriff auf Telefonbuch"
-
-#: gsmlib/gsm_sms.cc:66 gsmlib/gsm_sms.cc:85 gsmlib/gsm_sms.cc:175
-msgid "unhandled SMS TPDU type"
-msgstr "unerwarteter SMS TPDU-Typ"
-
-#: gsmlib/gsm_sms.cc:107
-msgid "can only send SMS-SUBMIT and SMS-COMMAND TPDUs"
-msgstr "kann nur SMS-SUBMIT und SMS-COMMAND TPDUs senden"
-
-#: gsmlib/gsm_sms.cc:111
-msgid "no device given for sending SMS"
-msgstr "kein Ger�t zum Versenden von SMS angegeben"
-
-#: gsmlib/gsm_sms.cc:283
-msgid "Message type: SMS-DELIVER"
-msgstr "Nachrichtentyp: SMS-DELIVER"
-
-#: gsmlib/gsm_sms.cc:284 gsmlib/gsm_sms.cc:426 gsmlib/gsm_sms.cc:531
-#: gsmlib/gsm_sms.cc:618 gsmlib/gsm_sms.cc:723 gsmlib/gsm_sms.cc:829
-msgid "SC address: '"
-msgstr "SC-Adresse: '"
-
-#: gsmlib/gsm_sms.cc:285 gsmlib/gsm_sms.cc:532
-msgid "More messages to send: "
-msgstr "Mehr Nachrichten zu versenden: "
-
-#: gsmlib/gsm_sms.cc:286 gsmlib/gsm_sms.cc:445
-msgid "Reply path: "
-msgstr "Antwortpfad: "
-
-#: gsmlib/gsm_sms.cc:287 gsmlib/gsm_sms.cc:446
-msgid "User data header indicator: "
-msgstr "Benutzerdatenvorspann (Indikation): "
-
-#: gsmlib/gsm_sms.cc:289
-msgid "Status report indication: "
-msgstr "Status-Report-Indikation: "
-
-#: gsmlib/gsm_sms.cc:290
-msgid "Originating address: '"
-msgstr "Senderadresse: '"
-
-#: gsmlib/gsm_sms.cc:292 gsmlib/gsm_sms.cc:452 gsmlib/gsm_sms.cc:621
-#: gsmlib/gsm_sms.cc:729 gsmlib/gsm_sms.cc:836
-msgid "Protocol identifier: 0x"
-msgstr "Protokollbezeichner: 0x"
-
-#: gsmlib/gsm_sms.cc:294 gsmlib/gsm_sms.cc:454 gsmlib/gsm_sms.cc:733
-#: gsmlib/gsm_sms.cc:840
-msgid "Data coding scheme: "
-msgstr "Datenkodierungsschema: "
-
-#: gsmlib/gsm_sms.cc:295 gsmlib/gsm_sms.cc:536 gsmlib/gsm_sms.cc:830
-msgid "SC timestamp: "
-msgstr "SC-Zeitstempel: "
-
-#: gsmlib/gsm_sms.cc:296 gsmlib/gsm_sms.cc:456 gsmlib/gsm_sms.cc:735
-#: gsmlib/gsm_sms.cc:842
-msgid "User data length: "
-msgstr "Benutzerdatenl�nge: "
-
-#: gsmlib/gsm_sms.cc:297 gsmlib/gsm_sms.cc:457
-msgid "User data header: 0x"
-msgstr "Benutzerdatenvorspann: 0x"
-
-#: gsmlib/gsm_sms.cc:302 gsmlib/gsm_sms.cc:461 gsmlib/gsm_sms.cc:736
-#: gsmlib/gsm_sms.cc:843
-msgid "User data: '"
-msgstr "Benutzerdaten: '"
-
-#: gsmlib/gsm_sms.cc:425
-msgid "Message type: SMS-SUBMIT"
-msgstr "Nachrichtentyp: SMS-SUBMIT"
-
-#: gsmlib/gsm_sms.cc:427
-msgid "Reject duplicates: "
-msgstr "Duplikate zur�ckweisen: "
-
-#: gsmlib/gsm_sms.cc:428
-msgid "Validity period format: "
-msgstr "G�ltigkeitszeitraum-Format: "
-
-#: gsmlib/gsm_sms.cc:432 gsmlib/gsm_sms_codec.cc:183
-msgid "not present"
-msgstr "nicht vorhanden"
-
-#: gsmlib/gsm_sms.cc:435
-msgid "relative"
-msgstr "relativ"
-
-#: gsmlib/gsm_sms.cc:438
-msgid "absolute"
-msgstr "absolut"
-
-#: gsmlib/gsm_sms.cc:448 gsmlib/gsm_sms.cc:620
-msgid "Status report request: "
-msgstr "Status-Report-Anforderung: "
-
-#: gsmlib/gsm_sms.cc:449 gsmlib/gsm_sms.cc:534 gsmlib/gsm_sms.cc:619
-msgid "Message reference: "
-msgstr "Nachrichtenreferenz: "
-
-#: gsmlib/gsm_sms.cc:450 gsmlib/gsm_sms.cc:626
-msgid "Destination address: '"
-msgstr "Zieladresse: '"
-
-#: gsmlib/gsm_sms.cc:455
-msgid "Validity period: "
-msgstr "G�ltigkeitszeitraum: "
-
-#: gsmlib/gsm_sms.cc:530
-msgid "Message type: SMS-STATUS-REPORT"
-msgstr "Nachrichtentyp: SMS-STATUS-REPORT"
-
-#: gsmlib/gsm_sms.cc:533
-msgid "Status report qualifier: "
-msgstr "Status-Report-Attribut: "
-
-#: gsmlib/gsm_sms.cc:535
-msgid "Recipient address: '"
-msgstr "Empf�ngeradresse: '"
-
-#: gsmlib/gsm_sms.cc:537
-msgid "Discharge time: "
-msgstr "Aussendezeit: "
-
-#: gsmlib/gsm_sms.cc:538
-msgid "Status: 0x"
-msgstr "Status: 0x"
-
-#: gsmlib/gsm_sms.cc:617
-msgid "Message type: SMS-COMMAND"
-msgstr "Nachrichtentyp: SMS-COMMAND"
-
-#: gsmlib/gsm_sms.cc:623
-msgid "Command type: 0x"
-msgstr "Kommandotyp: 0x"
-
-#: gsmlib/gsm_sms.cc:625
-msgid "Message number: "
-msgstr "Nachrichtennummer: "
-
-#: gsmlib/gsm_sms.cc:628
-msgid "Command data length: "
-msgstr "Kommandodatenl�nge: "
-
-#: gsmlib/gsm_sms.cc:629
-msgid "Command data: '"
-msgstr "Kommandodaten: '"
-
-#: gsmlib/gsm_sms.cc:722
-msgid "Message type: SMS-DELIVER-REPORT"
-msgstr "Nachrichtentyp: SMS-DELIVER-REPORT"
-
-#: gsmlib/gsm_sms.cc:724 gsmlib/gsm_sms.cc:831
-msgid "Protocol identifier present: "
-msgstr "Protokollbezeichner pr�sent: "
-
-#: gsmlib/gsm_sms.cc:726 gsmlib/gsm_sms.cc:833
-msgid "Data coding scheme present: "
-msgstr "Datenkodierungsschema pr�sent:  "
-
-#: gsmlib/gsm_sms.cc:727 gsmlib/gsm_sms.cc:834
-msgid "User data length present: "
-msgstr "Benutzerdatenl�nge pr�sent: "
-
-#: gsmlib/gsm_sms.cc:828
-msgid "Message type: SMS-SUBMIT-REPORT"
-msgstr "Nachrichtentyp: SMS-SUBMIT-REPORT"
-
-#: gsmlib/gsm_sms_codec.cc:188 gsmlib/gsm_sms_codec.cc:190
-msgid " minutes"
-msgstr " Minuten"
-
-#: gsmlib/gsm_sms_codec.cc:192
-msgid " days"
-msgstr " Tage"
-
-#: gsmlib/gsm_sms_codec.cc:194
-msgid " weeks"
-msgstr " Wochen"
-
-#: gsmlib/gsm_sms_codec.cc:213
-msgid "compressed   "
-msgstr "komprimiert   "
-
-#: gsmlib/gsm_sms_codec.cc:218
-msgid "voicemail message waiting"
-msgstr "Sprachnachricht abrufbar"
-
-#: gsmlib/gsm_sms_codec.cc:221
-msgid "fax message waiting"
-msgstr "Faxnachricht abrufbar"
-
-#: gsmlib/gsm_sms_codec.cc:224
-msgid "electronic mail message waiting"
-msgstr "E-Mail-Nachricht abrufbar"
-
-#: gsmlib/gsm_sms_codec.cc:227
-msgid "other message waiting"
-msgstr "andere Nachricht abrufbar"
-
-#: gsmlib/gsm_sms_codec.cc:234
-msgid "default alphabet"
-msgstr "Standardalphabet"
-
-#: gsmlib/gsm_sms_codec.cc:237
-msgid "8-bit alphabet"
-msgstr "8-Bit Alphabet"
-
-#: gsmlib/gsm_sms_codec.cc:240
-msgid "16-bit alphabet"
-msgstr "16-bit Alphabet"
-
-#: gsmlib/gsm_sms_codec.cc:243
-msgid "reserved alphabet"
-msgstr "reserviertes Alphabet"
-
-#: gsmlib/gsm_sms_codec.cc:256
-msgid "bad hexadecimal PDU format"
-msgstr "fehlerhaftes hexadezimales PDU-Format"
-
-#: gsmlib/gsm_sms_codec.cc:285 gsmlib/gsm_sms_codec.cc:295
-#: gsmlib/gsm_sms_codec.cc:310 gsmlib/gsm_sms_codec.cc:318
-#: gsmlib/gsm_sms_codec.cc:339 gsmlib/gsm_sms_codec.cc:347
-#: gsmlib/gsm_sms_codec.cc:368 gsmlib/gsm_sms_codec.cc:382
-msgid "premature end of PDU"
-msgstr "Vorzeitiges Ende der PDU"
-
-#: gsmlib/gsm_sms_codec.cc:473
-msgid "unknown time period format"
-msgstr "Unbekanntes Zeitperiodenformat"
-
-#: gsmlib/gsm_unix_serial.cc:119
-msgid "interrupted when reading from TA"
-msgstr "Unterbrechung beim Lesen vom TA"
-
-#: gsmlib/gsm_unix_serial.cc:144
-msgid "reading from TA"
-msgstr "beim Lesen vom TA"
-
-#: gsmlib/gsm_unix_serial.cc:149
-msgid "timeout when reading from TA"
-msgstr "Zeit�berschreitung beim Lesen vom TA"
-
-# , c-format
-#: gsmlib/gsm_unix_serial.cc:176
-#, c-format
-msgid "opening device '%s'"
-msgstr "beim �ffnen von Ger�t '%s'"
-
-#: gsmlib/gsm_unix_serial.cc:182
-msgid "getting file status flags failed"
-msgstr "Lesen der Dateistatus-Flags fehlgeschlagen"
-
-#: gsmlib/gsm_unix_serial.cc:185
-msgid "switching of non-blocking mode failed"
-msgstr "Abschalten des Non-Blocking Mode fehlgeschlagen"
-
-#: gsmlib/gsm_unix_serial.cc:198
-msgid "clearing DTR failed"
-msgstr "Zur�cksetzen von DTR fehlgeschlagen"
-
-#: gsmlib/gsm_unix_serial.cc:202
-msgid "setting DTR failed"
-msgstr "Setzen von DTR fehlgeschlagen"
-
-# , c-format
-#: gsmlib/gsm_unix_serial.cc:206
-#, c-format
-msgid "tcgetattr device '%s'"
-msgstr "tcgetattr Ger�t '%s'"
-
-# , c-format
-#: gsmlib/gsm_unix_serial.cc:233
-#, c-format
-msgid "tcsetattr device '%s'"
-msgstr "tcsetattr Ger�t '%s'"
-
-# , c-format
-#. no response after 3 tries
-#: gsmlib/gsm_unix_serial.cc:287
-#, c-format
-msgid "reset modem failed '%s'"
-msgstr "Zur�cksetzen des Modems '%s' fehlgeschlagen"
-
-#: gsmlib/gsm_unix_serial.cc:332 gsmlib/gsm_unix_serial.cc:364
-msgid "interrupted when writing to TA"
-msgstr "Unterbrechnung beim Schreiben auf den TA"
-
-#: gsmlib/gsm_unix_serial.cc:347 gsmlib/gsm_unix_serial.cc:356
-msgid "writing to TA"
-msgstr "beim Schreiben auf den TA"
-
-#: gsmlib/gsm_unix_serial.cc:377
-msgid "timeout when writing to TA"
-msgstr "Zeit�berschreitung beim Schreiben auf den TA"
-
-# , c-format
-#: gsmlib/gsm_unix_serial.cc:438
-#, c-format
-msgid "unknown baudrate '%s'"
-msgstr "unbekannte Baud-Rate '%s'"
-
-# , c-format
-#: gsmlib/gsm_util.cc:205
-#, c-format
-msgid "error when calling stat('%s') (errno: %d/%s)"
-msgstr "Fehler beim Aufruf von stat('%s') (errno: %d/%s)"
-
-# , c-format
-#: gsmlib/gsm_util.cc:236
-#, c-format
-msgid "file '%s' is neither file nor character device"
-msgstr "Datei '%s' ist weder eine regul�re Datei noch einen Zeichenger�t"
-
-#: gsmlib/gsm_util.cc:240
-msgid "maxmimum number of symbolic links exceeded"
-msgstr "maximale Anzahl der symbolischen Links �berschritten"
-
-# , c-format
-#: gsmlib/gsm_util.cc:250
-#, c-format
-msgid "error renaming '%s' to '%s'"
-msgstr "Fehler beim Umbenennen von '%s' zu '%s'"
-
-# , c-format
-#: gsmlib/gsm_util.cc:348
-#, c-format
-msgid "text '%s' contains illegal character '\"'"
-msgstr "der Text '%s' enth�lt das illegale Zeichen '\"'"
-
-# , c-format
-#: gsmlib/gsm_util.cc:358
-#, c-format
-msgid "illegal character in telephone number '%s'"
-msgstr "ung�ltiges Zeichen in der Telefonnummer '%s'"
-
-# , c-format
-#: gsmlib/gsm_sorted_phonebook.cc:95
-#, c-format
-msgid "error reading from file '%s"
-msgstr "Fehler beim Lesen von Datei '%s'"
-
-# , c-format
-#: gsmlib/gsm_sorted_phonebook.cc:109
-#, c-format
-msgid "entry '%s' lacks index"
-msgstr "Eintrag '%s' hat keinen Index"
-
-# , c-format
-#: gsmlib/gsm_sorted_phonebook.cc:118 gsmlib/gsm_sorted_phonebook.cc:124
-#, c-format
-msgid "line '%s' has invalid format"
-msgstr "Zeile '%s' hat ung�ltiges Format"
-
-# , c-format
-#: gsmlib/gsm_sorted_phonebook.cc:173 gsmlib/gsm_sorted_sms_store.cc:159
-#, c-format
-msgid "error opening file '%s' for writing"
-msgstr "Fehler beim �ffnen der Datei '%s' zum Schreiben"
-
-#: gsmlib/gsm_sorted_phonebook.cc:174 gsmlib/gsm_sorted_phonebook.cc:193
-#: gsmlib/gsm_sorted_sms_store.cc:67 gsmlib/gsm_sorted_sms_store.cc:160
-msgid "<STDOUT>"
-msgstr "<Standardausgabe>"
-
-# , c-format
-#: gsmlib/gsm_sorted_phonebook.cc:192 gsmlib/gsm_sorted_sms_store.cc:66
-#, c-format
-msgid "error writing to file '%s'"
-msgstr "Fehler beim Schreiben in die Datei '%s'"
-
-#: gsmlib/gsm_sorted_phonebook.cc:216
-msgid "attempt to change phonebook read from <STDIN>"
-msgstr "Versuch, von der Standardeingabe gelesenes Telefonbuch zu ver�ndern"
-
-# , c-format
-#: gsmlib/gsm_sorted_phonebook.cc:229 gsmlib/gsm_sorted_sms_store.cc:215
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "kann Datei '%s' nicht �ffnen"
-
-#: gsmlib/gsm_sorted_phonebook.cc:244 gsmlib/gsm_sorted_sms_store.cc:55
-#: gsmlib/gsm_sorted_sms_store.cc:228
-msgid "<STDIN>"
-msgstr "<Standardeingabe>"
-
-#: gsmlib/gsm_sorted_phonebook.cc:361
-msgid "indices must be unique in phonebook"
-msgstr "Indices im Telefonbuch m�ssen eindeutig sein"
-
-# , c-format
-#: gsmlib/gsm_sorted_sms_store.cc:54
-#, c-format
-msgid "error reading from file '%s'"
-msgstr "Fehler beim Lesen aus der Datei '%s'"
-
-# , c-format
-#: gsmlib/gsm_sorted_sms_store.cc:87
-#, c-format
-msgid "file '%s' has wrong version"
-msgstr "Datei '%s' hat die falsche Version"
-
-# , c-format
-#: gsmlib/gsm_sorted_sms_store.cc:99 gsmlib/gsm_sorted_sms_store.cc:111
-#, c-format
-msgid "corrupt SMS store file '%s'"
-msgstr "besch�digte SMS-Speicherdatei '%s'"
-
-#: gsmlib/gsm_sorted_sms_store.cc:204
-msgid "attempt to change SMS store read from <STDIN>"
-msgstr ""
-"Versuch, SMS-Speicher zu ver�ndern, der von der Standardeingabe gelesen wurde"
-
-#~ msgid "cannot read current network operator"
-#~ msgstr "kann den aktuellen Netzbetreiber nicht lesen"
-
-#~ msgid "Message type: SMS"
-#~ msgstr "Nachrichtentyp: SMS"
-
-#~ msgid "(no further information available)"
-#~ msgstr "(keine weitere Information verf�gbar)"
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/gsmlib.pot b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/gsmlib.pot
deleted file mode 100644
index 1d0385cf4f..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/gsmlib.pot
+++ /dev/null
@@ -1,1689 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-06 14:36+1100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: apps/gsmsmsd.cc:172
-#, c-format
-msgid "could not execute '%s'"
-msgstr ""
-
-#: apps/gsmsmsd.cc:176
-#, c-format
-msgid "error writing to '%s'"
-msgstr ""
-
-#: apps/gsmsmsd.cc:197 apps/gsmsmsd.cc:198 apps/gsmsmsd.cc:199
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: apps/gsmsmsd.cc:216
-#, c-format
-msgid "error when calling opendir('%s')(errno: %d/%s)"
-msgstr ""
-
-#: apps/gsmsmsd.cc:260
-#, c-format
-msgid "count not open SMS spool file %s"
-msgstr ""
-
-#: apps/gsmsmsd.cc:439 apps/gsmsendsms.cc:144 apps/gsmpb.cc:311
-#: apps/gsmctl.cc:380 apps/gsmsmsstore.cc:179
-#, c-format
-msgid ": version %s [compiled %s]"
-msgstr ""
-
-#: apps/gsmsmsd.cc:444
-msgid ""
-": [-a action][-b baudrate][-C sca][-d device][-f][-h][-I init string]\n"
-"  [-s spool dir][-t][-v]{sms_type}"
-msgstr ""
-
-#: apps/gsmsmsd.cc:448
-msgid ""
-"  -a, --action      the action to execute when an SMS arrives\n"
-"                    (SMS is send to stdin of action)"
-msgstr ""
-
-#: apps/gsmsmsd.cc:452 apps/gsmsendsms.cc:153 apps/gsmpb.cc:322
-#: apps/gsmctl.cc:389 apps/gsmsmsstore.cc:194
-msgid "  -b, --baudrate    baudrate to use for device (default: 38400)"
-msgstr ""
-
-#: apps/gsmsmsd.cc:455
-msgid "  -c, --concatenate start ID for concatenated SMS messages"
-msgstr ""
-
-#: apps/gsmsmsd.cc:457 apps/gsmsendsms.cc:158 apps/gsmsmsstore.cc:200
-msgid "  -C, --sca         SMS service centre address"
-msgstr ""
-
-#: apps/gsmsmsd.cc:458
-msgid "  -d, --device      sets the device to connect to"
-msgstr ""
-
-#: apps/gsmsmsd.cc:459
-msgid "  -D, --direct      enable direct routing of SMSs"
-msgstr ""
-
-#: apps/gsmsmsd.cc:460
-msgid "  -f, --flush       flush SMS from store"
-msgstr ""
-
-#: apps/gsmsmsd.cc:461
-msgid "  -F, --failed      directory to move failed SMS to,"
-msgstr ""
-
-#: apps/gsmsmsd.cc:462 apps/gsmsmsd.cc:475
-msgid "                    if unset, the SMS will be deleted"
-msgstr ""
-
-#: apps/gsmsmsd.cc:463 apps/gsmsendsms.cc:161 apps/gsmpb.cc:332
-#: apps/gsmctl.cc:394 apps/gsmsmsstore.cc:204
-msgid "  -h, --help        prints this message"
-msgstr ""
-
-#: apps/gsmsmsd.cc:464 apps/gsmsendsms.cc:162 apps/gsmpb.cc:335
-#: apps/gsmctl.cc:395 apps/gsmsmsstore.cc:205
-msgid "  -I, --init        device AT init sequence"
-msgstr ""
-
-#: apps/gsmsmsd.cc:466
-msgid "  -L, --syslog      log errors and information to syslog"
-msgstr ""
-
-#: apps/gsmsmsd.cc:469
-msgid "  -P, --priorities  number of priority levels to use,"
-msgstr ""
-
-#: apps/gsmsmsd.cc:470
-msgid "                    (default: none)"
-msgstr ""
-
-#: apps/gsmsmsd.cc:471 apps/gsmsendsms.cc:163
-msgid "  -r, --requeststat request SMS status report"
-msgstr ""
-
-#: apps/gsmsmsd.cc:472
-msgid "  -s, --spool       spool directory for outgoing SMS"
-msgstr ""
-
-#: apps/gsmsmsd.cc:474
-msgid "  -S, --sent        directory to move sent SMS to,"
-msgstr ""
-
-#: apps/gsmsmsd.cc:476
-msgid ""
-"  -t, --store       name of SMS store to use for flush\n"
-"                    and/or temporary SMS storage"
-msgstr ""
-
-#: apps/gsmsmsd.cc:479 apps/gsmsendsms.cc:167 apps/gsmpb.cc:343
-#: apps/gsmctl.cc:399 apps/gsmsmsstore.cc:213
-msgid "  -v, --version     prints version and exits"
-msgstr ""
-
-#: apps/gsmsmsd.cc:480 apps/gsmsendsms.cc:169 apps/gsmpb.cc:346
-#: apps/gsmctl.cc:400 apps/gsmsmsstore.cc:218
-msgid "  -X, --xonxoff     switch on software handshake"
-msgstr ""
-
-#: apps/gsmsmsd.cc:482
-msgid "  sms_type may be any combination of"
-msgstr ""
-
-#: apps/gsmsmsd.cc:483
-msgid "    sms, no_sms     controls reception of normal SMS"
-msgstr ""
-
-#: apps/gsmsmsd.cc:485
-msgid "    cb, no_cb       controls reception of cell broadcast messages"
-msgstr ""
-
-#: apps/gsmsmsd.cc:487
-msgid "    stat, no_stat   controls reception of status reports"
-msgstr ""
-
-#: apps/gsmsmsd.cc:489
-msgid "  default is \"sms cb stat\""
-msgstr ""
-
-#: apps/gsmsmsd.cc:490
-msgid "If no action is given, the SMS is printed to stdout"
-msgstr ""
-
-#: apps/gsmsmsd.cc:492
-msgid "If -P is given, it activates the priority system and sets the"
-msgstr ""
-
-#: apps/gsmsmsd.cc:493
-msgid "number or levels to use. For every level, there must be directories"
-msgstr ""
-
-#: apps/gsmsmsd.cc:494
-msgid "named <spool directory>+<priority level>."
-msgstr ""
-
-#: apps/gsmsmsd.cc:495
-msgid "For example \"-P 2 -s queue -S send -F failed\" needs the following"
-msgstr ""
-
-#: apps/gsmsmsd.cc:496
-msgid "directories: queue1/ queue2/ send1/ send2/ failed1/ failed2/"
-msgstr ""
-
-#: apps/gsmsmsd.cc:497
-msgid "Before sending one SMS from queue2, all pending SMS from queue1"
-msgstr ""
-
-#: apps/gsmsmsd.cc:498
-msgid "will be sent."
-msgstr ""
-
-#: apps/gsmsmsd.cc:503 apps/gsmsendsms.cc:178 apps/gsmpb.cc:354
-#: apps/gsmctl.cc:414 apps/gsmsmsstore.cc:223
-msgid "unknown option"
-msgstr ""
-
-#: apps/gsmsmsd.cc:542
-#, c-format
-msgid "error when calling sigaction() (errno: %d/%s)"
-msgstr ""
-
-#: apps/gsmsmsd.cc:562
-msgid "store name must be given for flush option"
-msgstr ""
-
-#. process the new message
-#: apps/gsmsmsd.cc:570 apps/gsmsmsd.cc:638
-msgid "Type of message: "
-msgstr ""
-
-#: apps/gsmsmsd.cc:574 apps/gsmsmsd.cc:642
-msgid "SMS message\n"
-msgstr ""
-
-#: apps/gsmsmsd.cc:577
-msgid "submit report message\n"
-msgstr ""
-
-#: apps/gsmsmsd.cc:580 apps/gsmsmsd.cc:648
-msgid "status report message\n"
-msgstr ""
-
-#: apps/gsmsmsd.cc:645
-msgid "cell broadcast message\n"
-msgstr ""
-
-#: apps/gsmsmsd.cc:701 apps/gsmsmsd.cc:703 apps/gsmsendsms.cc:253
-#: apps/gsmpb.cc:503 apps/gsmctl.cc:631 apps/gsmsmsstore.cc:430
-msgid "[ERROR]: "
-msgstr ""
-
-#: apps/gsmsmsd.cc:704
-msgid "(try setting sms_type, please refer to gsmsmsd manpage)"
-msgstr ""
-
-#: apps/gsmsendsms.cc:149
-msgid ""
-": [-b baudrate][-c concatenatedID][-C sca][-d device][-h][-I init string]\n"
-"  [-t][-v][-X] phonenumber [text]"
-msgstr ""
-
-#: apps/gsmsendsms.cc:156
-msgid "  -c, --concatenate ID for concatenated SMS messages"
-msgstr ""
-
-#: apps/gsmsendsms.cc:159 apps/gsmctl.cc:392
-msgid "  -d, --device      sets the destination device to connect to"
-msgstr ""
-
-#: apps/gsmsendsms.cc:164
-msgid ""
-"  -t, --test        convert text to GSM alphabet and vice\n"
-"                    versa, no SMS message is sent"
-msgstr ""
-
-#: apps/gsmsendsms.cc:171
-msgid "  phonenumber       recipient's phone number"
-msgstr ""
-
-#: apps/gsmsendsms.cc:172
-msgid ""
-"  text              optional text of the SMS message\n"
-"                    if omitted: read from stdin"
-msgstr ""
-
-#: apps/gsmsendsms.cc:205
-msgid "phone number and text missing"
-msgstr ""
-
-#: apps/gsmsendsms.cc:208 apps/gsmsmsstore.cc:261
-msgid "more than two parameters given"
-msgstr ""
-
-#: apps/gsmsendsms.cc:224
-msgid "text is larger than 160 characters"
-msgstr ""
-
-#: apps/gsmpb.cc:102 apps/gsmpb.cc:491
-#, c-format
-msgid "inserting '%s' tel# %s"
-msgstr ""
-
-#: apps/gsmpb.cc:105 apps/gsmpb.cc:230 apps/gsmpb.cc:494
-#, c-format
-msgid " (index #%d)"
-msgstr ""
-
-#: apps/gsmpb.cc:144
-#, c-format
-msgid "updating '%s' tel# %s to new tel# %s"
-msgstr ""
-
-#: apps/gsmpb.cc:177
-#, c-format
-msgid "updating '%s' tel# %s to new tel# %s(index %d)"
-msgstr ""
-
-#: apps/gsmpb.cc:227
-#, c-format
-msgid "deleting '%s' tel# %s"
-msgstr ""
-
-#: apps/gsmpb.cc:316
-msgid ""
-": [-b baudrate][-c][-d device or file][-h][-I init string]\n"
-"  [-p phonebook name][-s device or file][-t charset][-v][-V][-y][-X]"
-msgstr ""
-
-#: apps/gsmpb.cc:325
-msgid "  -c, --copy        copy source entries to destination"
-msgstr ""
-
-#: apps/gsmpb.cc:327
-msgid ""
-"  -d, --destination sets the destination device to connect \n"
-"                    to, or the file to write"
-msgstr ""
-
-#: apps/gsmpb.cc:330
-msgid "  -D, --destination-backend sets the destination backend"
-msgstr ""
-
-#: apps/gsmpb.cc:333
-msgid "  -i, --index       takes index positions into account"
-msgstr ""
-
-#: apps/gsmpb.cc:336
-msgid "  -p, --phonebook   name of phonebook to use"
-msgstr ""
-
-#: apps/gsmpb.cc:337 apps/gsmsmsstore.cc:210
-msgid ""
-"  -s, --source      sets the source device to connect to,\n"
-"                    or the file to read"
-msgstr ""
-
-#: apps/gsmpb.cc:339
-msgid ""
-"  -t, --charset     sets the character set to use for\n"
-"                    phonebook entries"
-msgstr ""
-
-#: apps/gsmpb.cc:341
-msgid "  -S, --source-backend sets the source backend"
-msgstr ""
-
-#: apps/gsmpb.cc:344 apps/gsmsmsstore.cc:214
-msgid "  -V, --verbose     print detailed progress messages"
-msgstr ""
-
-#: apps/gsmpb.cc:347
-msgid ""
-"  -y, --synchronize synchronize destination with source\n"
-"                    entries (destination is overwritten)\n"
-"                    (see gsmpb(1) for details)"
-msgstr ""
-
-#: apps/gsmpb.cc:360
-msgid "both source and destination must be given"
-msgstr ""
-
-#: apps/gsmpb.cc:374 apps/gsmpb.cc:416
-msgid "phonebook name must be given"
-msgstr ""
-
-#: apps/gsmpb.cc:441
-#, c-format
-msgid ""
-"text '%s' is too large to fit into destination (maximum size %d characters)"
-msgstr ""
-
-#: apps/gsmpb.cc:447
-#, c-format
-msgid ""
-"phone number '%s' is too large to fit into destination (maximum size %d "
-"characters)"
-msgstr ""
-
-#: apps/gsmctl.cc:90
-msgid "active "
-msgstr ""
-
-#: apps/gsmctl.cc:90
-msgid "inactive "
-msgstr ""
-
-#: apps/gsmctl.cc:91
-msgid "number: "
-msgstr ""
-
-#: apps/gsmctl.cc:92
-msgid "  subaddr: "
-msgstr ""
-
-#: apps/gsmctl.cc:93
-msgid "  time: "
-msgstr ""
-
-#: apps/gsmctl.cc:105
-msgid "<ME0>  Manufacturer: "
-msgstr ""
-
-#: apps/gsmctl.cc:106
-msgid "<ME1>  Model: "
-msgstr ""
-
-#: apps/gsmctl.cc:107
-msgid "<ME2>  Revision: "
-msgstr ""
-
-#: apps/gsmctl.cc:108
-msgid "<ME3>  Serial Number: "
-msgstr ""
-
-#: apps/gsmctl.cc:116 apps/gsmctl.cc:118
-msgid "<FUN>  Functionality Level: "
-msgstr ""
-
-#: apps/gsmctl.cc:118
-msgid "unsupported"
-msgstr ""
-
-#: apps/gsmctl.cc:128
-msgid ">  Status: "
-msgstr ""
-
-#: apps/gsmctl.cc:131 gsmlib/gsm_error.cc:104 gsmlib/gsm_sms.cc:441
-#: gsmlib/gsm_sms_codec.cc:205
-msgid "unknown"
-msgstr ""
-
-#: apps/gsmctl.cc:132
-msgid "current"
-msgstr ""
-
-#: apps/gsmctl.cc:133
-msgid "available"
-msgstr ""
-
-#: apps/gsmctl.cc:134
-msgid "forbidden"
-msgstr ""
-
-#: apps/gsmctl.cc:136 apps/gsmctl.cc:147
-msgid "  Long name: '"
-msgstr ""
-
-#: apps/gsmctl.cc:137 apps/gsmctl.cc:148
-msgid "  Short name: '"
-msgstr ""
-
-#: apps/gsmctl.cc:138 apps/gsmctl.cc:149
-msgid "  Numeric name: "
-msgstr ""
-
-#: apps/gsmctl.cc:150
-msgid "  Mode: "
-msgstr ""
-
-#: apps/gsmctl.cc:153
-msgid "automatic"
-msgstr ""
-
-#: apps/gsmctl.cc:154
-msgid "manual"
-msgstr ""
-
-#: apps/gsmctl.cc:155
-msgid "deregister"
-msgstr ""
-
-#: apps/gsmctl.cc:156
-msgid "manual/automatic"
-msgstr ""
-
-#: apps/gsmctl.cc:172 apps/gsmctl.cc:247
-msgid "  Voice"
-msgstr ""
-
-#: apps/gsmctl.cc:176 apps/gsmctl.cc:185 apps/gsmctl.cc:194
-msgid "  unknown"
-msgstr ""
-
-#: apps/gsmctl.cc:181 apps/gsmctl.cc:249
-msgid "  Data"
-msgstr ""
-
-#: apps/gsmctl.cc:190 apps/gsmctl.cc:251
-msgid "  Fax"
-msgstr ""
-
-#: apps/gsmctl.cc:229
-msgid "on"
-msgstr ""
-
-#: apps/gsmctl.cc:229
-msgid "off"
-msgstr ""
-
-#: apps/gsmctl.cc:239
-msgid "UnconditionalReason"
-msgstr ""
-
-#: apps/gsmctl.cc:240
-msgid "MobileBusyReason"
-msgstr ""
-
-#: apps/gsmctl.cc:241
-msgid "NoReplyReason"
-msgstr ""
-
-#: apps/gsmctl.cc:242
-msgid "NotReachableReason"
-msgstr ""
-
-#: apps/gsmctl.cc:261
-msgid "0 ME is powered by the battery"
-msgstr ""
-
-#: apps/gsmctl.cc:262
-msgid "1 ME has a battery connected, but is not powered by it"
-msgstr ""
-
-#: apps/gsmctl.cc:264
-msgid "2 ME does not have a battery connected"
-msgstr ""
-
-#: apps/gsmctl.cc:266
-msgid "3 Recognized power fault, calls inhibited"
-msgstr ""
-
-#: apps/gsmctl.cc:323
-#, c-format
-msgid "unknown facility class parameter '%c'"
-msgstr ""
-
-#: apps/gsmctl.cc:336
-#, c-format
-msgid "not enough parameters, minimum number of parameters is %d"
-msgstr ""
-
-#: apps/gsmctl.cc:340
-#, c-format
-msgid "too many parameters, maximum number of parameters is %d"
-msgstr ""
-
-#: apps/gsmctl.cc:385
-msgid ""
-": [-b baudrate][-d device][-h][-I init string][-o operation]\n"
-"  [-v][-X]{parameters}"
-msgstr ""
-
-#: apps/gsmctl.cc:396
-msgid ""
-"  -o, --operation   operation to perform on the mobile \n"
-"                    phone with the specified parameters"
-msgstr ""
-
-#: apps/gsmctl.cc:402
-msgid ""
-"  parameters        parameters to use for the operation\n"
-"                    (if an operation is given) or\n"
-"                    a specification which kind of\n"
-"                    information to read from the mobile phone"
-msgstr ""
-
-#: apps/gsmctl.cc:408
-msgid ""
-"Refer to gsmctl(1) for details on the available parameters and operations."
-msgstr ""
-
-#: apps/gsmctl.cc:471
-#, c-format
-msgid "unknown information parameter '%s'"
-msgstr ""
-
-#: apps/gsmctl.cc:520
-#, c-format
-msgid "unknown opmode parameter '%s'"
-msgstr ""
-
-#: apps/gsmctl.cc:588
-#, c-format
-msgid "unknown forward reason parameter '%s'"
-msgstr ""
-
-#: apps/gsmctl.cc:604
-#, c-format
-msgid "unknown forward mode parameter '%s'"
-msgstr ""
-
-#: apps/gsmctl.cc:625
-#, c-format
-msgid "unknown operation '%s'"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:91 apps/gsmsmsstore.cc:358 apps/gsmsmsstore.cc:375
-#, c-format
-msgid "inserting entry #%d from source into destination"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:102
-#, c-format
-msgid "incompatible options '%c' and '%c'"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:184
-msgid ""
-": [-a][-b baudrate][-c][-C sca][-d device or file]\n"
-"  [-h][-I init string][-k][-l][-s device or file][-t SMS store name]\n"
-"  [-v][-V][-x][-X]{indices}|[phonenumber text]"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:191
-msgid ""
-"  -a, --add         add new SMS submit message\n"
-"                    (phonenumber and text) to destination"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:197
-msgid ""
-"  -c, --copy        copy source entries to destination\n"
-"                    (if indices are given, copy only these entries)"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:201
-msgid ""
-"  -d, --destination sets the destination device to\n"
-"                    connect to, or the file to write to"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:206
-msgid ""
-"  -k, --backup      backup new entries to destination\n"
-"                    (if indices are given, copy only these entries)"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:209
-msgid "  -l, --list        list source to stdout"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:212
-msgid "  -t, --store       name of SMS store to use"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:216
-msgid "  -x, --delete      delete entries denoted by indices"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:229
-msgid "no operation option given"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:232
-msgid "both source and destination required"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:237
-msgid "destination must not be given"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:239
-msgid "source required"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:244
-msgid "source must not be given"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:246
-msgid "destination required"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:254 gsmlib/gsm_util.cc:286
-#, c-format
-msgid "expected number, got '%s'"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:264
-msgid "not enough parameters given"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:269
-msgid "unexpected parameters"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:280 apps/gsmsmsstore.cc:312
-msgid "store name must be given"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:339 apps/gsmsmsstore.cc:372
-#, c-format
-msgid "no index '%s' in source"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:387
-#, c-format
-msgid "index #%d"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:401
-msgid "inserting new entry into destination"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:416
-#, c-format
-msgid "deleting entry #%d from destination"
-msgstr ""
-
-#: apps/gsmsmsstore.cc:421
-#, c-format
-msgid "no index '%s' in destination"
-msgstr ""
-
-#: gsmlib/gsm_at.cc:66
-msgid "unspecified ME/TA error"
-msgstr ""
-
-#: gsmlib/gsm_at.cc:76
-msgid "ME/TA error '"
-msgstr ""
-
-#: gsmlib/gsm_at.cc:80
-#, c-format
-msgid "(code %s)"
-msgstr ""
-
-#: gsmlib/gsm_at.cc:125 gsmlib/gsm_at.cc:215 gsmlib/gsm_at.cc:344
-msgid "ME/TA error '<unspecified>' (code not known)"
-msgstr ""
-
-#: gsmlib/gsm_at.cc:184 gsmlib/gsm_at.cc:365
-#, c-format
-msgid "unexpected response '%s' when sending 'AT%s'"
-msgstr ""
-
-#: gsmlib/gsm_at.cc:318
-msgid "unexpected character in PDU handshake"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:29
-msgid "phone failure"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:32
-msgid "no connection to phone"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:35
-msgid "phone adaptor link reserved"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:38 gsmlib/gsm_error.cc:259
-msgid "operation not allowed"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:41 gsmlib/gsm_error.cc:262
-msgid "operation not supported"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:44
-msgid "ph SIM PIN required"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:47 gsmlib/gsm_error.cc:271
-msgid "SIM not inserted"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:50 gsmlib/gsm_error.cc:274
-msgid "SIM PIN required"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:53 gsmlib/gsm_error.cc:289
-msgid "SIM PUK required"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:56 gsmlib/gsm_error.cc:280
-msgid "SIM failure"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:59 gsmlib/gsm_error.cc:283
-msgid "SIM busy"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:62 gsmlib/gsm_error.cc:286
-msgid "SIM wrong"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:65
-msgid "incorrect password"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:68 gsmlib/gsm_error.cc:292
-msgid "SIM PIN2 required"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:71 gsmlib/gsm_error.cc:295
-msgid "SIM PUK2 required"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:74 gsmlib/gsm_error.cc:304
-msgid "memory full"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:77
-msgid "invalid index"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:80
-msgid "not found"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:83 gsmlib/gsm_error.cc:298
-msgid "memory failure"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:86
-msgid "text string too long"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:89
-msgid "invalid characters in text string"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:92
-msgid "dial string too long"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:95
-msgid "invalid characters in dial string"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:98 gsmlib/gsm_error.cc:310
-msgid "no network service"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:101 gsmlib/gsm_error.cc:313
-msgid "network timeout"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:107
-#, c-format
-msgid "invalid ME error %d"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:117
-msgid "Unassigned (unallocated) number"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:120
-msgid "Operator determined barring"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:123
-msgid "Call barred"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:126
-msgid "Network failure"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:129
-msgid "Short message transfer rejected"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:133 gsmlib/gsm_error.cc:355
-msgid "Congestion"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:136
-msgid "Destination out of service"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:139
-msgid "Unidentified subscriber"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:142
-msgid "Facility rejected"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:145
-msgid "Unknown subscriber"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:148
-msgid "Network out of order"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:151
-msgid "Temporary failure"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:154
-msgid "Resources unavailable, unspecified"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:157
-msgid "Requested facility not subscribed"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:160
-msgid "Requested facility not implemented"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:163
-msgid "Invalid Transaction Identifier"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:166
-msgid "Semantically incorrect message"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:169
-msgid "Invalid mandatory information"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:172
-msgid "Message type non-existent or not implemented"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:175
-msgid "Message not compatible with short message protocol state"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:178
-msgid "Information element non-existent or not implemented"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:181
-msgid "Protocol error, unspecified"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:184
-msgid "Interworking, unspecified"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:187
-msgid "Telematic interworking not supported"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:190
-msgid "Short message Type 0 not supported"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:193
-msgid "Cannot replace short message"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:196
-msgid "Unspecified TP-PID error"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:199
-msgid "Data coding scheme (alphabet) not supported"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:202
-msgid "Message class not supported"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:205
-msgid "Unspecifiec TP-DCS error"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:208
-msgid "Command cannot be actioned"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:211
-msgid "Command unsupported"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:214
-msgid "Unspecified TP-Command error"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:217
-msgid "TPDU not supported"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:220
-msgid "SC busy"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:223
-msgid "No SC subscription"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:226
-msgid "SC system failure"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:229
-msgid "Invalid SME address"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:232
-msgid "Destination SME barred"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:235
-msgid "SM Rejected-Duplicated SM"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:238
-msgid "SIM SMS storage full"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:241
-msgid "No SMS storage capability in SIM"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:244
-msgid "Error in MS"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:247
-msgid "Memory Capacity Exceed"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:250
-msgid "Unspecified error cause"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:253
-msgid "ME failure"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:256
-msgid "SMS service of ME reserved"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:265
-msgid "invalid PDU mode parameter"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:268
-msgid "invalid text mode parameter"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:277
-msgid "PH-SIM PIN required"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:301
-msgid "invalid memory index"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:307
-msgid "SMSC address unknown"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:316
-msgid "no +CNMA acknowledgement expected"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:319
-msgid "unknown error"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:322
-#, c-format
-msgid "invalid SMS error %d"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:335
-msgid "Short message received by the SME"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:338
-msgid ""
-"Short message forwarded by the SC to the SME but the SC is unable to confirm "
-"delivery"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:342
-msgid "Short message replaced by the SC"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:345 gsmlib/gsm_error.cc:373 gsmlib/gsm_error.cc:418
-msgid "reserved"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:358
-msgid "SME busy"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:361
-msgid "No response from SME"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:364
-msgid "Service rejected"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:367 gsmlib/gsm_error.cc:400
-msgid "Quality of service not available"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:370
-msgid "Error in SME"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:377
-msgid " (Temporary error, SC is not making any more transfer attempts)"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:380
-msgid " (Temporary error, SC still trying to transfer SM)"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:388
-msgid "Remote Procedure Error"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:391
-msgid "Incompatible destination"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:394
-msgid "Connection rejected by SME"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:397
-msgid "Not obtainable"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:403
-msgid "No interworking available"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:406
-msgid "SM validity period expired"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:409
-msgid "SM deleted by originating SME"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:412
-msgid "SM deleted by SC administration"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:415
-msgid "SM does not exit"
-msgstr ""
-
-#: gsmlib/gsm_error.cc:421
-msgid " (Permanent Error, SC is not making any more transfer attempts)"
-msgstr ""
-
-#: gsmlib/gsm_event.cc:80
-#, c-format
-msgid "unexpected number format %d"
-msgstr ""
-
-#: gsmlib/gsm_event.cc:100
-#, c-format
-msgid "unexpected unsolicited event '%s'"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:538
-msgid "unable to set operator"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:665
-msgid "call forward time must be in the range 0..30"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:813
-msgid "Functionality Level commands not supported by ME"
-msgstr ""
-
-#. If the number was just out of range, we get here.
-#: gsmlib/gsm_me_ta.cc:832
-msgid "Requested Functionality Level out of range"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:943
-msgid "unsupported alphabet for SMS"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:952
-msgid "SMS text is larger than allowed"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:964
-msgid "not more than 255 concatenated SMSs allowed"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:997
-msgid "only serviceLevel 0 or 1 supported"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:1110 gsmlib/gsm_me_ta.cc:1152
-msgid "cannot route SMS messages to TE"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:1124 gsmlib/gsm_me_ta.cc:1166
-msgid "cannot route cell broadcast messages to TE"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:1136
-msgid "cannot route status reports messages to TE"
-msgstr ""
-
-#: gsmlib/gsm_me_ta.cc:1180
-msgid "cannot route status report messages to TE"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:51
-msgid "expected parameter"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:71
-msgid "expected '\"'"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:109
-msgid "expected number"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:120
-#, c-format
-msgid "unexpected end of string '%s'"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:124
-#, c-format
-msgid " (at position %d of string '%s')"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:141
-#, c-format
-msgid "expected '%c'"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:165
-msgid "expected ')' or ','"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:251
-msgid "expected ')', ',' or '-'"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:257
-msgid "range of the form a-b-c not allowed"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:264
-msgid "range of the form a- no allowed"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:350
-msgid "expected comma"
-msgstr ""
-
-#: gsmlib/gsm_parser.cc:367
-msgid "expected end of line"
-msgstr ""
-
-#: gsmlib/gsm_phonebook.cc:47
-#, c-format
-msgid ""
-"length of text '%s' exceeds maximum text length (%d characters) of phonebook "
-"'%s'"
-msgstr ""
-
-#: gsmlib/gsm_phonebook.cc:55
-#, c-format
-msgid ""
-"length of telephone number '%s' exceeds maximum telephone number length (%d "
-"characters) of phonebook '%s'"
-msgstr ""
-
-#: gsmlib/gsm_phonebook.cc:275
-msgid "phonebook full"
-msgstr ""
-
-#: gsmlib/gsm_phonebook.cc:291
-msgid "attempt to overwrite phonebook entry"
-msgstr ""
-
-#: gsmlib/gsm_phonebook.cc:569
-msgid "SIM card changed while accessing phonebook"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:66 gsmlib/gsm_sms.cc:85 gsmlib/gsm_sms.cc:175
-msgid "unhandled SMS TPDU type"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:107
-msgid "can only send SMS-SUBMIT and SMS-COMMAND TPDUs"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:111
-msgid "no device given for sending SMS"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:283
-msgid "Message type: SMS-DELIVER"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:284 gsmlib/gsm_sms.cc:426 gsmlib/gsm_sms.cc:531
-#: gsmlib/gsm_sms.cc:618 gsmlib/gsm_sms.cc:723 gsmlib/gsm_sms.cc:829
-msgid "SC address: '"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:285 gsmlib/gsm_sms.cc:532
-msgid "More messages to send: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:286 gsmlib/gsm_sms.cc:445
-msgid "Reply path: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:287 gsmlib/gsm_sms.cc:446
-msgid "User data header indicator: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:289
-msgid "Status report indication: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:290
-msgid "Originating address: '"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:292 gsmlib/gsm_sms.cc:452 gsmlib/gsm_sms.cc:621
-#: gsmlib/gsm_sms.cc:729 gsmlib/gsm_sms.cc:836
-msgid "Protocol identifier: 0x"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:294 gsmlib/gsm_sms.cc:454 gsmlib/gsm_sms.cc:733
-#: gsmlib/gsm_sms.cc:840
-msgid "Data coding scheme: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:295 gsmlib/gsm_sms.cc:536 gsmlib/gsm_sms.cc:830
-msgid "SC timestamp: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:296 gsmlib/gsm_sms.cc:456 gsmlib/gsm_sms.cc:735
-#: gsmlib/gsm_sms.cc:842
-msgid "User data length: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:297 gsmlib/gsm_sms.cc:457
-msgid "User data header: 0x"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:302 gsmlib/gsm_sms.cc:461 gsmlib/gsm_sms.cc:736
-#: gsmlib/gsm_sms.cc:843
-msgid "User data: '"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:425
-msgid "Message type: SMS-SUBMIT"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:427
-msgid "Reject duplicates: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:428
-msgid "Validity period format: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:432 gsmlib/gsm_sms_codec.cc:184
-msgid "not present"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:435
-msgid "relative"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:438
-msgid "absolute"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:448 gsmlib/gsm_sms.cc:620
-msgid "Status report request: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:449 gsmlib/gsm_sms.cc:534 gsmlib/gsm_sms.cc:619
-msgid "Message reference: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:450 gsmlib/gsm_sms.cc:626
-msgid "Destination address: '"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:455
-msgid "Validity period: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:530
-msgid "Message type: SMS-STATUS-REPORT"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:533
-msgid "Status report qualifier: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:535
-msgid "Recipient address: '"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:537
-msgid "Discharge time: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:538
-msgid "Status: 0x"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:617
-msgid "Message type: SMS-COMMAND"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:623
-msgid "Command type: 0x"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:625
-msgid "Message number: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:628
-msgid "Command data length: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:629
-msgid "Command data: '"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:722
-msgid "Message type: SMS-DELIVER-REPORT"
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:724 gsmlib/gsm_sms.cc:831
-msgid "Protocol identifier present: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:726 gsmlib/gsm_sms.cc:833
-msgid "Data coding scheme present: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:727 gsmlib/gsm_sms.cc:834
-msgid "User data length present: "
-msgstr ""
-
-#: gsmlib/gsm_sms.cc:828
-msgid "Message type: SMS-SUBMIT-REPORT"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:189 gsmlib/gsm_sms_codec.cc:191
-msgid " minutes"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:193
-msgid " days"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:195
-msgid " weeks"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:214
-msgid "compressed   "
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:219
-msgid "voicemail message waiting"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:222
-msgid "fax message waiting"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:225
-msgid "electronic mail message waiting"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:228
-msgid "other message waiting"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:235
-msgid "default alphabet"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:238
-msgid "8-bit alphabet"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:241
-msgid "16-bit alphabet"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:244
-msgid "reserved alphabet"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:257
-msgid "bad hexadecimal PDU format"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:286 gsmlib/gsm_sms_codec.cc:296
-#: gsmlib/gsm_sms_codec.cc:311 gsmlib/gsm_sms_codec.cc:319
-#: gsmlib/gsm_sms_codec.cc:340 gsmlib/gsm_sms_codec.cc:348
-#: gsmlib/gsm_sms_codec.cc:369 gsmlib/gsm_sms_codec.cc:383
-msgid "premature end of PDU"
-msgstr ""
-
-#: gsmlib/gsm_sms_codec.cc:474
-msgid "unknown time period format"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:121
-msgid "interrupted when reading from TA"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:136
-msgid "end of file when reading from TA"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:146
-msgid "reading from TA"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:151
-msgid "timeout when reading from TA"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:178
-#, c-format
-msgid "opening device '%s'"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:185
-msgid "getting file status flags failed"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:190
-msgid "switching of non-blocking mode failed"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:205
-msgid "clearing DTR failed"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:211
-msgid "setting DTR failed"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:216
-#, c-format
-msgid "tcgetattr device '%s'"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:245
-#, c-format
-msgid "tcsetattr device '%s'"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:303
-#, c-format
-msgid "reset modem failed '%s'"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:348 gsmlib/gsm_unix_serial.cc:380
-msgid "interrupted when writing to TA"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:363 gsmlib/gsm_unix_serial.cc:372
-msgid "writing to TA"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:393
-msgid "timeout when writing to TA"
-msgstr ""
-
-#: gsmlib/gsm_unix_serial.cc:454
-#, c-format
-msgid "unknown baudrate '%s'"
-msgstr ""
-
-#: gsmlib/gsm_util.cc:206
-#, c-format
-msgid "error when calling stat('%s') (errno: %d/%s)"
-msgstr ""
-
-#: gsmlib/gsm_util.cc:237
-#, c-format
-msgid "file '%s' is neither file nor character device"
-msgstr ""
-
-#: gsmlib/gsm_util.cc:241
-msgid "maxmimum number of symbolic links exceeded"
-msgstr ""
-
-#: gsmlib/gsm_util.cc:251
-#, c-format
-msgid "error renaming '%s' to '%s'"
-msgstr ""
-
-#: gsmlib/gsm_util.cc:349
-#, c-format
-msgid "text '%s' contains illegal character '\"'"
-msgstr ""
-
-#: gsmlib/gsm_util.cc:359
-#, c-format
-msgid "illegal character in telephone number '%s'"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:96
-#, c-format
-msgid "error reading from file '%s"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:110
-#, c-format
-msgid "entry '%s' lacks index"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:119 gsmlib/gsm_sorted_phonebook.cc:125
-#, c-format
-msgid "line '%s' has invalid format"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:174 gsmlib/gsm_sorted_sms_store.cc:159
-#, c-format
-msgid "error opening file '%s' for writing"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:175 gsmlib/gsm_sorted_phonebook.cc:194
-#: gsmlib/gsm_sorted_sms_store.cc:67 gsmlib/gsm_sorted_sms_store.cc:160
-msgid "<STDOUT>"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:193 gsmlib/gsm_sorted_sms_store.cc:66
-#, c-format
-msgid "error writing to file '%s'"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:217
-msgid "attempt to change phonebook read from <STDIN>"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:230 gsmlib/gsm_sorted_sms_store.cc:215
-#, c-format
-msgid "cannot open file '%s'"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:245 gsmlib/gsm_sorted_sms_store.cc:55
-#: gsmlib/gsm_sorted_sms_store.cc:228
-msgid "<STDIN>"
-msgstr ""
-
-#: gsmlib/gsm_sorted_phonebook.cc:362
-msgid "indices must be unique in phonebook"
-msgstr ""
-
-#: gsmlib/gsm_sorted_sms_store.cc:54
-#, c-format
-msgid "error reading from file '%s'"
-msgstr ""
-
-#: gsmlib/gsm_sorted_sms_store.cc:87
-#, c-format
-msgid "file '%s' has wrong version"
-msgstr ""
-
-#: gsmlib/gsm_sorted_sms_store.cc:99 gsmlib/gsm_sorted_sms_store.cc:111
-#, c-format
-msgid "corrupt SMS store file '%s'"
-msgstr ""
-
-#: gsmlib/gsm_sorted_sms_store.cc:204
-msgid "attempt to change SMS store read from <STDIN>"
-msgstr ""
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/stamp-cat-id b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/stamp-cat-id
deleted file mode 100644
index 9788f70238..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/po/stamp-cat-id
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/Makefile.am b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/Makefile.am
deleted file mode 100644
index 53f51ac19a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: scripts Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 5.6.1999
-# *************************************************************************
-
-EXTRA_DIST =	config.sub ltconfig missing \
-		config.guess install-sh ltmain.sh mkinstalldirs debugconfig.sh
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/Makefile.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/Makefile.in
deleted file mode 100644
index 6129036172..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/Makefile.in
+++ /dev/null
@@ -1,259 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: scripts Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 5.6.1999
-# *************************************************************************
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AS = @AS@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-DATADIRNAME = @DATADIRNAME@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GSM_VERSION = @GSM_VERSION@
-HAVE_LIB = @HAVE_LIB@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIB = @LIB@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-
-EXTRA_DIST = config.sub ltconfig missing \
-		config.guess install-sh ltmain.sh mkinstalldirs debugconfig.sh
-
-subdir = scripts
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/gsm_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in config.guess config.rpath \
-	config.sub depcomp install-sh ltconfig ltmain.sh missing \
-	mkinstalldirs
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  scripts/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool uninstall uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/config.guess b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/config.guess
deleted file mode 100755
index 1f5c50c0d1..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/config.guess
+++ /dev/null
@@ -1,1420 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
-
-timestamp='2014-03-23'
-
-# This file 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 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-#
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-	;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-esac
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/config.rpath b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/config.rpath
deleted file mode 100755
index 5ead7586a7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/config.rpath
+++ /dev/null
@@ -1,513 +0,0 @@
-#! /bin/sh
-# Output a system dependent set of variables, describing how to set the
-# run time search path of shared libraries in an executable.
-#
-#   Copyright 1996-2002 Free Software Foundation, Inc.
-#   Taken from GNU libtool, 2001
-#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-#   This program 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.
-#
-#   This program 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.
-#
-#   As a special exception to the GNU General Public License, if you
-#   distribute this file as part of a program that contains a
-#   configuration script generated by Autoconf, you may include it under
-#   the same distribution terms that you use for the rest of that program.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-# should be set by the caller.
-#
-# The set of defined variables is at the end of this script.
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-shlibext=
-
-host="$1"
-host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-wl=
-if test "$GCC" = yes; then
-  wl='-Wl,'
-else
-  case "$host_os" in
-    aix3* | aix4* | aix5*)
-      wl='-Wl,'
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      wl='-Wl,'
-      ;;
-    irix5* | irix6*)
-      wl='-Wl,'
-      ;;
-    linux*)
-      echo '__INTEL_COMPILER' > conftest.$ac_ext
-      if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
-      then
-        :
-      else
-        # Intel icc
-        wl='-Qoption,ld,'
-      fi
-      ;;
-    osf3* | osf4* | osf5*)
-      wl='-Wl,'
-      ;;
-    solaris*)
-      wl='-Wl,'
-      ;;
-    sunos4*)
-      wl='-Qoption ld '
-      ;;
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      if test "x$host_vendor" = xsni; then
-        wl='-LD'
-      else
-        wl='-Wl,'
-      fi
-      ;;
-  esac
-fi
-
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-
-case "$host_os" in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  case "$host_os" in
-    aix3* | aix4* | aix5*)
-      # On AIX, the GNU linker is very broken
-      ld_shlibs=no
-      ;;
-    amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can use
-      # them.
-      ld_shlibs=no
-      ;;
-    beos*)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    cygwin* | mingw* | pw32*)
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-        ld_shlibs=no
-      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    sunos4*)
-      hardcode_direct=yes
-      ;;
-    *)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-  esac
-  if test "$ld_shlibs" = yes; then
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-  fi
-else
-  case "$host_os" in
-    aix3*)
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes; then
-        # Neither direct hardcoding nor static linking is supported with a
-        # broken collect2.
-        hardcode_direct=unsupported
-      fi
-      ;;
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-        # On IA64, the linker does run time linking by default, so we don't
-        # have to do anything special.
-        aix_use_runtimelinking=no
-      else
-        aix_use_runtimelinking=no
-        # Test if we are trying to use run time linking or normal
-        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-        # need to do runtime linking.
-        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-          for ld_flag in $LDFLAGS; do
-            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-              aix_use_runtimelinking=yes
-              break
-            fi
-          done
-        esac
-      fi
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      if test "$GCC" = yes; then
-        case $host_os in aix4.[012]|aix4.[012].*)
-          collect2name=`${CC} -print-prog-name=collect2`
-          if test -f "$collect2name" && \
-            strings "$collect2name" | grep resolve_lib_name >/dev/null
-          then
-            # We have reworked collect2
-            hardcode_direct=yes
-          else
-            # We have old collect2
-            hardcode_direct=unsupported
-            hardcode_minus_L=yes
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_libdir_separator=
-          fi
-        esac
-      fi
-      if test "$aix_use_runtimelinking" = yes; then
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-      else
-        if test "$host_cpu" = ia64; then
-          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-        else
-          hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-        fi
-      fi
-      ;;
-    amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      libext=lib
-      ;;
-    darwin* | rhapsody*)
-      hardcode_direct=yes
-      ;;
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-    freebsd2.2*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    freebsd2*)
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    freebsd*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-      hardcode_minus_L=yes # Not in the search PATH, but as the default
-                           # location of the library.
-      ;;
-    irix5* | irix6*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    netbsd*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    newsos6)
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    openbsd*)
-      hardcode_direct=yes
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      else
-        case "$host_os" in
-          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-            hardcode_libdir_flag_spec='-R$libdir'
-            ;;
-          *)
-            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-            ;;
-        esac
-      fi
-      ;;
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      ;;
-    osf3*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    osf4* | osf5*)
-      if test "$GCC" = yes; then
-        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-        # Both cc and cxx compiler support -rpath directly
-        hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-    sco3.2v5*)
-      ;;
-    solaris*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      ;;
-    sunos4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    sysv4)
-      if test "x$host_vendor" = xsno; then
-        hardcode_direct=yes # is this really true???
-      else
-        hardcode_direct=no # Motorola manual says yes, but my tests say they lie
-      fi
-      ;;
-    sysv4.3*)
-      ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
-      ;;
-    uts4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    dgux*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-        ld_shlibs=yes
-      fi
-      ;;
-    sysv4.2uw2*)
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      ;;
-    sysv5uw7* | unixware7*)
-      ;;
-    *)
-      ld_shlibs=no
-      ;;
-  esac
-fi
-
-# Check dynamic linker characteristics
-libname_spec='lib$name'
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-case "$host_os" in
-  aix3*)
-    shlibext=so
-    ;;
-  aix4* | aix5*)
-    shlibext=so
-    ;;
-  amigaos*)
-    shlibext=ixlibrary
-    ;;
-  beos*)
-    shlibext=so
-    ;;
-  bsdi4*)
-    shlibext=so
-    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-    ;;
-  cygwin* | mingw* | pw32*)
-    case $GCC,$host_os in
-      yes,cygwin*)
-        shlibext=dll.a
-        ;;
-      yes,mingw*)
-        shlibext=dll
-        sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
-        ;;
-      yes,pw32*)
-        shlibext=dll
-        ;;
-      *)
-        shlibext=dll
-        ;;
-    esac
-    ;;
-  darwin* | rhapsody*)
-    shlibext=dylib
-    ;;
-  freebsd1*)
-    ;;
-  freebsd*)
-    shlibext=so
-    ;;
-  gnu*)
-    shlibext=so
-    ;;
-  hpux9* | hpux10* | hpux11*)
-    shlibext=sl
-    ;;
-  irix5* | irix6*)
-    shlibext=so
-    case "$host_os" in
-      irix5*)
-        libsuff= shlibsuff=
-        ;;
-      *)
-        case $LD in
-          *-32|*"-32 ") libsuff= shlibsuff= ;;
-          *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;;
-          *-64|*"-64 ") libsuff=64 shlibsuff=64 ;;
-          *) libsuff= shlibsuff= ;;
-        esac
-        ;;
-    esac
-    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-    ;;
-  linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-    ;;
-  linux-gnu*)
-    shlibext=so
-    ;;
-  netbsd*)
-    shlibext=so
-    ;;
-  newsos6)
-    shlibext=so
-    ;;
-  openbsd*)
-    shlibext=so
-    ;;
-  os2*)
-    libname_spec='$name'
-    shlibext=dll
-    ;;
-  osf3* | osf4* | osf5*)
-    shlibext=so
-    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-    ;;
-  sco3.2v5*)
-    shlibext=so
-    ;;
-  solaris*)
-    shlibext=so
-    ;;
-  sunos4*)
-    shlibext=so
-    ;;
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-    shlibext=so
-    case "$host_vendor" in
-      motorola)
-        sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-        ;;
-    esac
-    ;;
-  uts4*)
-    shlibext=so
-    ;;
-  dgux*)
-    shlibext=so
-    ;;
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      shlibext=so
-    fi
-    ;;
-esac
-
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-
-sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
-
-# How to pass a linker flag through the compiler.
-wl="$escaped_wl"
-
-# Static library suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally "so").
-shlibext="$shlibext"
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator="$hardcode_libdir_separator"
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct="$hardcode_direct"
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L="$hardcode_minus_L"
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
-
-EOF
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/config.sub b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/config.sub
deleted file mode 100755
index bba4efb805..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/config.sub
+++ /dev/null
@@ -1,1799 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
-
-timestamp='2014-09-11'
-
-# This file 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 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2014 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/debugconfig.sh b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/debugconfig.sh
deleted file mode 100755
index c9f597fed4..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/debugconfig.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-CXXFLAGS="-g -Wall" ./configure --disable-shared
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/depcomp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/depcomp
deleted file mode 100755
index 807b991f4a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/depcomp
+++ /dev/null
@@ -1,423 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-# This program 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, or (at your option)
-# any later version.
-
-# This program 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.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
-
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.  We will use -o /dev/null later,
-  # however we can't do the remplacement now because
-  # `-o $object' might simply not be used
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    -*)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/install-sh b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/install-sh
deleted file mode 100755
index e8436696c1..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/install-sh
+++ /dev/null
@@ -1,250 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/ltconfig b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/ltconfig
deleted file mode 100755
index e3afc39777..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/ltconfig
+++ /dev/null
@@ -1,3115 +0,0 @@
-#! /bin/sh
-
-# ltconfig - Create a system-specific libtool.
-# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This file 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.
-#
-# This program 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.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A lot of this script is taken from autoconf-2.10.
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-echo=echo
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) PATH_SEPARATOR=';' ;;
-    *)     PATH_SEPARATOR=':' ;;
-  esac
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test "X${echo_test_string+set}" != Xset; then
-  # find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
-   test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for dir in $PATH /usr/ucb; do
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running ltconfig again with it.
-      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf "%s\n"'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-	   test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-	CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-	   test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# The name of this program.
-progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
-
-# Constants:
-PROGRAM=ltconfig
-PACKAGE=libtool
-VERSION=1.3.5
-TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-rm="rm -f"
-
-help="Try \`$progname --help' for more information."
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-enable_shared=yes
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-enable_static=yes
-enable_fast_install=yes
-enable_dlopen=unknown
-enable_win32_dll=no
-ltmain=
-silent=
-srcdir=
-ac_config_guess=
-ac_config_sub=
-host=
-nonopt=
-ofile="$default_ofile"
-verify_host=yes
-with_gcc=no
-with_gnu_ld=no
-need_locks=yes
-ac_ext=c
-objext=o
-libext=a
-exeext=
-cache_file=
-
-old_AR="$AR"
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-old_CPPFLAGS="$CPPFLAGS"
-old_LDFLAGS="$LDFLAGS"
-old_LD="$LD"
-old_LN_S="$LN_S"
-old_LIBS="$LIBS"
-old_NM="$NM"
-old_RANLIB="$RANLIB"
-old_DLLTOOL="$DLLTOOL"
-old_OBJDUMP="$OBJDUMP"
-old_AS="$AS"
-
-# Parse the command line options.
-args=
-prev=
-for option
-do
-  case "$option" in
-  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    eval "$prev=\$option"
-    prev=
-    continue
-  fi
-
-  case "$option" in
-  --help) cat <<EOM
-Usage: $progname [OPTION]... [HOST [LTMAIN]]
-
-Generate a system-specific libtool script.
-
-    --debug                enable verbose shell tracing
-    --disable-shared       do not build shared libraries
-    --disable-static       do not build static libraries
-    --disable-fast-install do not optimize for fast installation
-    --enable-dlopen        enable dlopen support
-    --enable-win32-dll     enable building dlls on win32 hosts
-    --help                 display this help and exit
-    --no-verify            do not verify that HOST is a valid host type
--o, --output=FILE          specify the output file [default=$default_ofile]
-    --quiet                same as \`--silent'
-    --silent               do not print informational messages
-    --srcdir=DIR           find \`config.guess' in DIR
-    --version              output version information and exit
-    --with-gcc             assume that the GNU C compiler will be used
-    --with-gnu-ld          assume that the C compiler uses the GNU linker
-    --disable-lock         disable file locking
-    --cache-file=FILE      configure cache file
-
-LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
-that provides basic libtool functionality.
-
-HOST is the canonical host system name [default=guessed].
-EOM
-  exit 0
-  ;;
-
-  --debug)
-    echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  --disable-shared) enable_shared=no ;;
-
-  --disable-static) enable_static=no ;;
-
-  --disable-fast-install) enable_fast_install=no ;;
-
-  --enable-dlopen) enable_dlopen=yes ;;
-
-  --enable-win32-dll) enable_win32_dll=yes ;;
-
-  --quiet | --silent) silent=yes ;;
-
-  --srcdir) prev=srcdir ;;
-  --srcdir=*) srcdir="$optarg" ;;
-
-  --no-verify) verify_host=no ;;
-
-  --output | -o) prev=ofile ;;
-  --output=*) ofile="$optarg" ;;
-
-  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
-
-  --with-gcc) with_gcc=yes ;;
-  --with-gnu-ld) with_gnu_ld=yes ;;
-
-  --disable-lock) need_locks=no ;;
-
-  --cache-file=*) cache_file="$optarg" ;;
-
-  -*)
-    echo "$progname: unrecognized option \`$option'" 1>&2
-    echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    if test -z "$ltmain"; then
-      ltmain="$option"
-    elif test -z "$host"; then
-# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
-#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
-#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
-#      fi
-      host="$option"
-    else
-      echo "$progname: too many arguments" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-done
-
-if test -z "$ltmain"; then
-  echo "$progname: you must specify a LTMAIN file" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-if test ! -f "$ltmain"; then
-  echo "$progname: \`$ltmain' does not exist" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-# Quote any args containing shell metacharacters.
-ltconfig_args=
-for arg
-do
-  case "$arg" in
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ltconfig_args="$ltconfig_args '$arg'" ;;
-  *) ltconfig_args="$ltconfig_args $arg" ;;
-  esac
-done
-
-# A relevant subset of AC_INIT.
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 compiler messages saved in config.log
-# 6 checking for... messages and results
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>>./config.log
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
-if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi
-
-if test -n "$cache_file" && test -r "$cache_file"; then
-  echo "loading cache $cache_file within ltconfig"
-  . $cache_file
-fi
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-if test -z "$srcdir"; then
-  # Assume the source directory is the same one as the path to LTMAIN.
-  srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
-  test "$srcdir" = "$ltmain" && srcdir=.
-fi
-
-trap "$rm conftest*; exit 1" 1 2 15
-if test "$verify_host" = yes; then
-  # Check for config.guess and config.sub.
-  ac_aux_dir=
-  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-    if test -f $ac_dir/config.guess; then
-      ac_aux_dir=$ac_dir
-      break
-    fi
-  done
-  if test -z "$ac_aux_dir"; then
-    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-  ac_config_guess=$ac_aux_dir/config.guess
-  ac_config_sub=$ac_aux_dir/config.sub
-
-  # Make sure we can run config.sub.
-  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
-  else
-    echo "$progname: cannot run $ac_config_sub" 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-
-  echo $ac_n "checking host system type""... $ac_c" 1>&6
-
-  host_alias=$host
-  case "$host_alias" in
-  "")
-    if host_alias=`$SHELL $ac_config_guess`; then :
-    else
-      echo "$progname: cannot guess host type; you must specify one" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-  host=`$SHELL $ac_config_sub $host_alias`
-  echo "$ac_t$host" 1>&6
-
-  # Make sure the host verified.
-  test -z "$host" && exit 1
-
-elif test -z "$host"; then
-  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
-  echo "$help" 1>&2
-  exit 1
-else
-  host_alias=$host
-fi
-
-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-case "$host_os" in
-linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-esac
-
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-case "$host_os" in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR cru $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-# Set a sane default for `AR'.
-test -z "$AR" && AR=ar
-
-# Set a sane default for `OBJDUMP'.
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-# If RANLIB is not set, then run the test.
-if test "${RANLIB+set}" != "set"; then
-  result=no
-
-  echo $ac_n "checking for ranlib... $ac_c" 1>&6
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for dir in $PATH; do
-    test -z "$dir" && dir=.
-    if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
-      RANLIB="ranlib"
-      result="ranlib"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  echo "$ac_t$result" 1>&6
-fi
-
-if test -n "$RANLIB"; then
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-fi
-
-# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$AS" && AS=as
-
-# Check to see if we are using GCC.
-if test "$with_gcc" != yes || test -z "$CC"; then
-  # If CC is not set, then try to find GCC or a usable CC.
-  if test -z "$CC"; then
-    echo $ac_n "checking for gcc... $ac_c" 1>&6
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-    for dir in $PATH; do
-      test -z "$dir" && dir=.
-      if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
-	CC="gcc"
-	break
-      fi
-    done
-    IFS="$save_ifs"
-
-    if test -n "$CC"; then
-      echo "$ac_t$CC" 1>&6
-    else
-      echo "$ac_t"no 1>&6
-    fi
-  fi
-
-  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
-  if test -z "$CC"; then
-    echo $ac_n "checking for cc... $ac_c" 1>&6
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-    cc_rejected=no
-    for dir in $PATH; do
-      test -z "$dir" && dir=.
-      if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
-	if test "$dir/cc" = "/usr/ucb/cc"; then
-	  cc_rejected=yes
-	  continue
-	fi
-	CC="cc"
-	break
-      fi
-    done
-    IFS="$save_ifs"
-    if test $cc_rejected = yes; then
-      # We found a bogon in the path, so make sure we never use it.
-      set dummy $CC
-      shift
-      if test $# -gt 0; then
-	# We chose a different compiler from the bogus one.
-	# However, it has the same name, so the bogon will be chosen
-	# first if we set CC to just the name; use the full file name.
-	shift
-	set dummy "$dir/cc" "$@"
-	shift
-	CC="$@"
-      fi
-    fi
-
-    if test -n "$CC"; then
-      echo "$ac_t$CC" 1>&6
-    else
-      echo "$ac_t"no 1>&6
-    fi
-
-    if test -z "$CC"; then
-      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
-      exit 1
-    fi
-  fi
-
-  # Now see if the compiler is really GCC.
-  with_gcc=no
-  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
-  echo "$progname:581: checking whether we are using GNU C" >&5
-
-  $rm conftest.c
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-    with_gcc=yes
-  fi
-  $rm conftest.c
-  echo "$ac_t$with_gcc" 1>&6
-fi
-
-# Allow CC to be a program name with arguments.
-set dummy $CC
-compiler="$2"
-
-echo $ac_n "checking for object suffix... $ac_c" 1>&6
-$rm conftest*
-echo 'int i = 1;' > conftest.c
-echo "$progname:603: checking for object suffix" >& 5
-if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
-  # Append any warnings to the config.log.
-  cat conftest.err 1>&5
-
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  cat conftest.err 1>&5
-  echo "$progname: failed program was:" >&5
-  cat conftest.c >&5
-fi
-$rm conftest*
-echo "$ac_t$objext" 1>&6
-
-echo $ac_n "checking for executable suffix... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_exeext="no"
-  $rm conftest*
-  echo 'main () { return 0; }' > conftest.c
-  echo "$progname:629: checking for executable suffix" >& 5
-  if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
-    # Append any warnings to the config.log.
-    cat conftest.err 1>&5
-
-    for ac_file in conftest.*; do
-      case $ac_file in
-      *.c | *.err | *.$objext ) ;;
-      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
-      esac
-    done
-  else
-    cat conftest.err 1>&5
-    echo "$progname: failed program was:" >&5
-    cat conftest.c >&5
-  fi
-  $rm conftest*
-fi
-if test "X$ac_cv_exeext" = Xno; then
-  exeext=""
-else
-  exeext="$ac_cv_exeext"
-fi
-echo "$ac_t$ac_cv_exeext" 1>&6
-
-echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
-pic_flag=
-special_shlib_compile_flags=
-wl=
-link_static_flag=
-no_builtin_flag=
-
-if test "$with_gcc" = yes; then
-  wl='-Wl,'
-  link_static_flag='-static'
-
-  case "$host_os" in
-  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-    # PIC is the default for these OSes.
-    ;;
-  aix*)
-    # Below there is a dirty hack to force normal static linking with -ldl
-    # The problem is because libdl dynamically linked with both libc and
-    # libC (AIX C++ library), which obviously doesn't included in libraries
-    # list by gcc. This cause undefined symbols with -static flags.
-    # This hack allows C programs to be linked with "-static -ldl", but
-    # we not sure about C++ programs.
-    link_static_flag="$link_static_flag ${wl}-lC"
-    ;;
-  cygwin* | mingw* | os2*)
-    # We can build DLLs from non-PIC.
-    ;;
-  amigaos*)
-    # FIXME: we need at least 68020 code to build shared libraries, but
-    # adding the `-m68020' flag to GCC prevents building anything better,
-    # like `-m68040'.
-    pic_flag='-m68020 -resident32 -malways-restore-a4'
-    ;;
-  sysv4*MP*)
-    if test -d /usr/nec; then
-       pic_flag=-Kconform_pic
-    fi
-    ;;
-  *)
-    pic_flag='-fPIC'
-    ;;
-  esac
-else
-  # PORTME Check for PIC flags for the system compiler.
-  case "$host_os" in
-  aix3* | aix4*)
-    # All AIX code is PIC.
-    link_static_flag='-bnso -bI:/lib/syscalls.exp'
-    ;;
-
-  hpux9* | hpux10* | hpux11*)
-    # Is there a better link_static_flag that works with the bundled CC?
-    wl='-Wl,'
-    link_static_flag="${wl}-a ${wl}archive"
-    pic_flag='+Z'
-    ;;
-
-  irix5* | irix6*)
-    wl='-Wl,'
-    link_static_flag='-non_shared'
-    # PIC (with -KPIC) is the default.
-    ;;
-
-  cygwin* | mingw* | os2*)
-    # We can build DLLs from non-PIC.
-    ;;
-
-  osf3* | osf4* | osf5*)
-    # All OSF/1 code is PIC.
-    wl='-Wl,'
-    link_static_flag='-non_shared'
-    ;;
-
-  sco3.2v5*)
-    pic_flag='-Kpic'
-    link_static_flag='-dn'
-    special_shlib_compile_flags='-belf'
-    ;;
-
-  solaris*)
-    pic_flag='-KPIC'
-    link_static_flag='-Bstatic'
-    wl='-Wl,'
-    ;;
-
-  sunos4*)
-    pic_flag='-PIC'
-    link_static_flag='-Bstatic'
-    wl='-Qoption ld '
-    ;;
-
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-    pic_flag='-KPIC'
-    link_static_flag='-Bstatic'
-    wl='-Wl,'
-    ;;
-
-  uts4*)
-    pic_flag='-pic'
-    link_static_flag='-Bstatic'
-    ;;
-  sysv4*MP*)
-    if test -d /usr/nec ;then
-      pic_flag='-Kconform_pic'
-      link_static_flag='-Bstatic'
-    fi
-    ;;
-  *)
-    can_build_shared=no
-    ;;
-  esac
-fi
-
-if test -n "$pic_flag"; then
-  echo "$ac_t$pic_flag" 1>&6
-
-  # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
-  $rm conftest*
-  echo "int some_variable = 0;" > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $pic_flag -DPIC"
-  echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
-  if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
-    # Append any warnings to the config.log.
-    cat conftest.err 1>&5
-    
-    case "$host_os" in
-    hpux9* | hpux10* | hpux11*)
-      # On HP-UX, both CC and GCC only warn that PIC is supported... then they
-      # create non-PIC objects.  So, if there were any warnings, we assume that
-      # PIC is not supported.
-      if test -s conftest.err; then
-	echo "$ac_t"no 1>&6
-	can_build_shared=no
-	pic_flag=
-      else
-	echo "$ac_t"yes 1>&6
-	pic_flag=" $pic_flag"
-      fi
-      ;;
-    *)
-      echo "$ac_t"yes 1>&6
-      pic_flag=" $pic_flag"
-      ;;
-    esac
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    can_build_shared=no
-    pic_flag=
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-else
-  echo "$ac_t"none 1>&6
-fi
-
-# Check to see if options -o and -c are simultaneously supported by compiler
-echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
-$rm -r conftest 2>/dev/null
-mkdir conftest
-cd conftest
-$rm conftest*
-echo "int some_variable = 0;" > conftest.c
-mkdir out
-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-# that will create temporary files in the current directory regardless of
-# the output directory.  Thus, making CWD read-only will cause this test
-# to fail, enabling locking or at least warning the user not to do parallel
-# builds.
-chmod -w .
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -o out/conftest2.o"
-echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
-if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
-
-  # The compiler can only warn and ignore the option if not recognized
-  # So say no if there are warnings
-    if test -s out/conftest.err; then
-      echo "$ac_t"no 1>&6
-      compiler_c_o=no
-    else
-      echo "$ac_t"yes 1>&6
-      compiler_c_o=yes
-    fi
-else
-  # Append any errors to the config.log.
-  cat out/conftest.err 1>&5
-  compiler_c_o=no
-  echo "$ac_t"no 1>&6
-fi
-CFLAGS="$save_CFLAGS"
-chmod u+w .
-$rm conftest* out/*
-rmdir out
-cd ..
-rmdir conftest
-$rm -r conftest 2>/dev/null
-
-if test x"$compiler_c_o" = x"yes"; then
-  # Check to see if we can write to a .lo
-  echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
-  $rm conftest*
-  echo "int some_variable = 0;" > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -c -o conftest.lo"
-  echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
-if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s conftest.err; then
-	echo "$ac_t"no 1>&6
-	compiler_o_lo=no
-      else
-	echo "$ac_t"yes 1>&6
-	compiler_o_lo=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    compiler_o_lo=no
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-else
-  compiler_o_lo=no
-fi
-
-# Check to see if we can do hard links to lock some files if needed
-hard_links="nottested"
-if test "$compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$ac_t$hard_links" 1>&6
-  $rm conftest*
-  if test "$hard_links" = no; then
-    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-if test "$with_gcc" = yes; then
-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
-  $rm conftest*
-  echo "int some_variable = 0;" > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
-  echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-  if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s conftest.err; then
-	echo "$ac_t"no 1>&6
-	compiler_rtti_exceptions=no
-      else
-	echo "$ac_t"yes 1>&6
-	compiler_rtti_exceptions=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    compiler_rtti_exceptions=no
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-
-  if test "$compiler_rtti_exceptions" = "yes"; then
-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-  else
-    no_builtin_flag=' -fno-builtin'
-  fi
-  
-fi
-
-# Check for any special shared library compilation flags.
-if test -n "$special_shlib_compile_flags"; then
-  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
-  else
-    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
-    can_build_shared=no
-  fi
-fi
-
-echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
-$rm conftest*
-echo 'main(){return(0);}' > conftest.c
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $link_static_flag"
-echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
-if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  echo "$ac_t$link_static_flag" 1>&6
-else
-  echo "$ac_t"none 1>&6
-  link_static_flag=
-fi
-LDFLAGS="$save_LDFLAGS"
-$rm conftest*
-
-if test -z "$LN_S"; then
-  # Check to see if we can use ln -s, or we need hard links.
-  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
-  $rm conftest.dat
-  if ln -s X conftest.dat 2>/dev/null; then
-    $rm conftest.dat
-    LN_S="ln -s"
-  else
-    LN_S=ln
-  fi
-  if test "$LN_S" = "ln -s"; then
-    echo "$ac_t"yes 1>&6
-  else
-    echo "$ac_t"no 1>&6
-  fi
-fi
-
-# Make sure LD is an absolute path.
-if test -z "$LD"; then
-  ac_prog=ld
-  if test "$with_gcc" = yes; then
-    # Check if gcc -print-prog-name=ld gives a path.
-    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
-    echo "$progname:991: checking for ld used by GCC" >&5
-    ac_prog=`($CC -print-prog-name=ld) 2>&5`
-    case "$ac_prog" in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-    "")
-      # If it fails, then pretend we are not using GCC.
-      ac_prog=ld
-      ;;
-    *)
-      # If it is relative, then search for the first ld in PATH.
-      with_gnu_ld=unknown
-      ;;
-    esac
-  elif test "$with_gnu_ld" = yes; then
-    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
-    echo "$progname:1015: checking for GNU ld" >&5
-  else
-    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-    echo "$progname:1018: checking for non-GNU ld" >&5
-  fi
-
-  if test -z "$LD"; then
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-    for ac_dir in $PATH; do
-      test -z "$ac_dir" && ac_dir=.
-      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-	LD="$ac_dir/$ac_prog"
-	# Check to see if the program is GNU ld.  I'd rather use --version,
-	# but apparently some GNU ld's only accept -v.
-	# Break only if it was the GNU/non-GNU ld that we prefer.
-	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	  test "$with_gnu_ld" != no && break
-	else
-	  test "$with_gnu_ld" != yes && break
-	fi
-      fi
-    done
-    IFS="$ac_save_ifs"
-  fi
-
-  if test -n "$LD"; then
-    echo "$ac_t$LD" 1>&6
-  else
-    echo "$ac_t"no 1>&6
-  fi
-
-  if test -z "$LD"; then
-    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
-    exit 1
-  fi
-fi
-
-# Check to see if it really is or is not GNU ld.
-echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
-# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-echo "$ac_t$with_gnu_ld" 1>&6
-
-# See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
-
-allow_undefined_flag=
-no_undefined_flag=
-need_lib_prefix=unknown
-need_version=unknown
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-archive_cmds=
-archive_expsym_cmds=
-old_archive_from_new_cmds=
-export_dynamic_flag_spec=
-whole_archive_flag_spec=
-thread_safe_flag_spec=
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-hardcode_shlibpath_var=unsupported
-runpath_var=
-always_export_symbols=no
-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-# include_expsyms should be a list of space-separated symbols to be *always*
-# included in the symbol list
-include_expsyms=
-# exclude_expsyms can be an egrep regular expression of symbols to exclude
-# it will be wrapped by ` (' and `)$', so one must not match beginning or
-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-# as well as any symbol that contains `d'.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-# platforms (ab)use it in PIC code, but their linkers get confused if
-# the symbol is explicitly referenced.  Since portable code cannot
-# rely on this symbol name, it's probably fine to never include it in
-# preloaded symbol tables.
-
-case "$host_os" in
-cygwin* | mingw*)
-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-  # When not using gcc, we currently assume that we are using
-  # Microsoft Visual C++.
-  if test "$with_gcc" != yes; then
-    with_gnu_ld=no
-  fi
-  ;;
-
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # If archive_cmds runs LD, not CC, wlarc should be empty
-  wlarc='${wl}'
-
-  # See if GNU ld supports shared libraries.
-  case "$host_os" in
-  aix3* | aix4*)
-    # On AIX, the GNU linker is very broken
-    ld_shlibs=no
-    cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-    ;;
-
-  amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-
-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-    # that the semantics of dynamic libraries on AmigaOS, at least up
-    # to version 4, is to share data among multiple programs linked
-    # with the same dynamic library.  Since this doesn't match the
-    # behavior of shared libraries on other platforms, we can use
-    # them.
-    ld_shlibs=no
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      allow_undefined_flag=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-  cygwin* | mingw*)
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec='-L$libdir'
-    allow_undefined_flag=unsupported
-    always_export_symbols=yes
-
-    # Extract the symbol export list from an `--export-all' def file,
-    # then regenerate the def file from the symbol export list, so that
-    # the compiled dll only exports the symbol export list.
-    # Be careful not to strip the DATA tag left by newer dlltools.
-    export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
-      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
-      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
-      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols'
-
-    # If DATA tags from a recent dlltool are present, honour them!
-    archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
-      _lt_hint=1;
-      cat $export_symbols | while read symbol; do
-        set dummy \$symbol;
-        case \$# in
-          2) echo "	\$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
-          *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
-        esac;
-	_lt_hint=`expr 1 + \$_lt_hint`;
-      done~
-      test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
-      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
-      $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-      $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
-
-      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
-    ;;
-
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-      # can we support soname and/or expsyms with a.out? -oliva
-    fi
-    ;;
-
-  solaris* | sysv5*)
-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-      ld_shlibs=no
-      cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;      
-
-  sunos4*)
-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
-    wlarc=
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-  esac
-
-  if test "$ld_shlibs" = yes; then
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    case $host_os in
-    cygwin* | mingw*)
-      # dlltool doesn't understand --whole-archive et. al.
-      whole_archive_flag_spec=
-      ;;
-    *)
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-        whole_archive_flag_spec=
-      fi
-      ;;
-    esac
-  fi
-else
-  # PORTME fill in a description of your system's linker (not GNU ld)
-  case "$host_os" in
-  aix3*)
-    allow_undefined_flag=unsupported
-    always_export_symbols=yes
-    archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
-    # Note: this linker hardcodes the directories in LIBPATH if there
-    # are no directories specified by -L.
-    hardcode_minus_L=yes
-    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
-      # Neither direct hardcoding nor static linking is supported with a
-      # broken collect2.
-      hardcode_direct=unsupported
-    fi
-    ;;
-
-  aix4*)
-    hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
-    hardcode_libdir_separator=':'
-    if test "$with_gcc" = yes; then
-      collect2name=`${CC} -print-prog-name=collect2`
-      if test -f "$collect2name" && \
-	 strings "$collect2name" | grep resolve_lib_name >/dev/null
-      then
-	# We have reworked collect2
-	hardcode_direct=yes
-      else
-	# We have old collect2
-	hardcode_direct=unsupported
-	# It fails to find uninstalled libraries when the uninstalled
-	# path is not listed in the libpath.  Setting hardcode_minus_L
-	# to unsupported forces relinking
-	hardcode_minus_L=yes
-	hardcode_libdir_flag_spec='-L$libdir'
-	hardcode_libdir_separator=
-      fi
-      shared_flag='-shared'
-    else
-      shared_flag='${wl}-bM:SRE'
-      hardcode_direct=yes
-    fi
-    allow_undefined_flag=' ${wl}-berok'
-    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
-    archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
-    case "$host_os" in aix4.[01]|aix4.[01].*)
-      # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
-      always_export_symbols=yes ;;
-    esac
-   ;;
-
-  amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    # see comment about different semantics on the GNU ld section
-    ld_shlibs=no
-    ;;
-
-  cygwin* | mingw*)
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec=' '
-    allow_undefined_flag=unsupported
-    # Tell ltmain to make .lib files, not .a files.
-    libext=lib
-    # FIXME: Setting linknames here is a bad hack.
-    archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-    # The linker will automatically build a .lib file if we build a DLL.
-    old_archive_from_new_cmds='true'
-    # FIXME: Should let the user specify the lib program.
-    old_archive_cmds='lib /OUT:$oldlib$oldobjs'
-    fix_srcfile_path='`cygpath -w $srcfile`'
-    ;;
-
-  freebsd1*)
-    ld_shlibs=no
-    ;;
-
-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-  # support.  Future versions do this automatically, but an explicit c++rt0.o
-  # does not break anything, and helps significantly (at the cost of a little
-  # extra space).
-  freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-  freebsd2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-  freebsd*)
-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  hpux9* | hpux10* | hpux11*)
-    case "$host_os" in
-    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
-    esac
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_direct=yes
-    hardcode_minus_L=yes # Not in the search PATH, but as the default
-			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  irix5* | irix6*)
-    if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-    else
-      archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
-
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'  # a.out
-    else
-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts'      # ELF
-    fi
-    hardcode_libdir_flag_spec='${wl}-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  os2*)
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
-    ;;
-
-  osf3*)
-    if test "$with_gcc" = yes; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-    else
-      allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
-
-  osf4* | osf5*)  # As osf3* with the addition of the -msym flag
-    if test "$with_gcc" = yes; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-    else
-      allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
-  rhapsody*)
-    archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flags_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-                                       
-  sco3.2v5*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    hardcode_shlibpath_var=no
-    runpath_var=LD_RUN_PATH
-    hardcode_runpath_var=yes
-    ;;
-
-  solaris*)
-    no_undefined_flag=' -z text'
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_shlibpath_var=no
-    case "$host_os" in
-    solaris2.[0-5] | solaris2.[0-5].*) ;;
-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-    esac
-    ;;
-
-  sunos4*)
-    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4)
-    if test "x$host_vendor" = xsequent; then
-      # Use $CC to link under sequent, because it throws in some extra .o 
-      # files that make .init and .fini sections work.
-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts'
-    else
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    fi
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    hardcode_direct=no #Motorola manual says yes, but my tests say they lie 
-    ;;  
-
-  sysv4.3*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    hardcode_shlibpath_var=no
-    export_dynamic_flag_spec='-Bexport'
-    ;;
-
-  sysv5*)
-    no_undefined_flag=' -z text'
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
-    hardcode_libdir_flag_spec=
-    hardcode_shlibpath_var=no
-    runpath_var='LD_RUN_PATH'
-    ;;
-
-  uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  dgux*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-      hardcode_shlibpath_var=no
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ld_shlibs=yes
-    fi
-    ;;
-
-  sysv4.2uw2*)
-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
-    hardcode_direct=yes
-    hardcode_minus_L=no
-    hardcode_shlibpath_var=no
-    hardcode_runpath_var=yes
-    runpath_var=LD_RUN_PATH
-    ;;
-
-  unixware7*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    ld_shlibs=no
-    ;;
-  esac
-fi
-echo "$ac_t$ld_shlibs" 1>&6
-test "$ld_shlibs" = no && can_build_shared=no
-
-if test -z "$NM"; then
-  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
-  case "$NM" in
-  [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
-  *)
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-    for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
-      test -z "$ac_dir" && ac_dir=.
-      if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	  NM="$ac_dir/nm -B"
-	  break
-	elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	  NM="$ac_dir/nm -p"
-	  break
-	else
-	  NM=${NM="$ac_dir/nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	fi
-      fi
-    done
-    IFS="$ac_save_ifs"
-    test -z "$NM" && NM=nm
-    ;;
-  esac
-  echo "$ac_t$NM" 1>&6
-fi
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-
-# Define system-specific variables.
-case "$host_os" in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
-  ;;
-irix*)
-  symcode='[BCDEGRST]'
-  ;;
-solaris*)
-  symcode='[BDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  symcode='[ABCDGISTW]'
-fi
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-  global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode\)[ 	][ 	]*\($ac_symprfx\)$sympat$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-  $rm conftest*
-  cat > conftest.c <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  echo "$progname:1653: checking if global_symbol_pipe works" >&5
-  if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
-
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.c
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c'
-
-	  cat <<EOF >> conftest.c
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c
-	  cat <<\EOF >> conftest.c
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$objext conftstm.$objext
-	  save_LIBS="$LIBS"
-	  save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$objext"
-	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-	    pipe_works=yes
-	  else
-	    echo "$progname: failed program was:" >&5
-	    cat conftest.c >&5
-	  fi
-	  LIBS="$save_LIBS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.c >&5
-  fi
-  $rm conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    global_symbol_pipe=
-  fi
-done
-if test "$pipe_works" = yes; then
-  echo "${ac_t}ok" 1>&6
-else
-  echo "${ac_t}failed" 1>&6
-fi
-
-if test -z "$global_symbol_pipe"; then
-  global_symbol_to_cdecl=
-fi
-
-# Check hardcoding attributes.
-echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var"; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$hardcode_shlibpath_var" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-echo "$ac_t$hardcode_action" 1>&6
-
-
-reload_flag=
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
-# PORTME Some linkers may need a different reload flag.
-reload_flag='-r'
-echo "$ac_t$reload_flag" 1>&6
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-# PORTME Fill in your ld.so characteristics
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-file_magic_cmd=
-file_magic_test_file=
-deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-case "$host_os" in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}.so$major'
-  ;;
-
-aix4*)
-  version_type=linux
-  # AIX has no versioning support, so currently we can not hardcode correct
-  # soname into executable. Probably we can add versioning support to
-  # collect2, so additional links can be useful in future.
-  # We preserve .a as extension for shared libraries though AIX4.2
-  # and later linker supports .so
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
-  shlibpath_var=LIBPATH
-  deplibs_check_method=pass_all
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}.so'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  deplibs_check_method=pass_all
-  lt_cv_dlopen="load_add_on"
-  lt_cv_dlopen_libs=
-  lt_cv_dlopen_self=yes
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  file_magic_cmd=/usr/bin/file
-  file_magic_test_file=/shlib/libc.so
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  export_dynamic_flag_spec=-rdynamic
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw*)
-  version_type=windows
-  need_version=no
-  need_lib_prefix=no
-  if test "$with_gcc" = yes; then
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
-  else
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-  fi
-  dynamic_linker='Win32 ld.exe'
-  deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  file_magic_cmd='${OBJDUMP} -f'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  lt_cv_dlopen="LoadLibrary"
-  lt_cv_dlopen_libs=
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-  
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case "$version_type" in
-    freebsd-elf*)
-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-      file_magic_cmd=/usr/bin/file
-      file_magic_test_file=`echo /usr/lib/libc.so*`
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      deplibs_check_method=unknown
-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case "$host_os" in
-  freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  deplibs_check_method=pass_all
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  dynamic_linker="$host_os dld.sl"
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  shlibpath_var=SHLIB_PATH
-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-  soname_spec='${libname}${release}.sl$major'
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  case "$host_os" in
-  hpux10.20*)
-    # TODO:  Does this work for hpux-11 too?
-    deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    file_magic_cmd=/usr/bin/file
-    file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  version_type=irix
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}.so.$major'
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
-  case "$host_os" in
-  irix5*)
-    libsuff= shlibsuff=
-    # this will be overridden with pass_all, but let us keep it just in case
-    deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case "$LD" in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  file_magic_cmd=/usr/bin/file
-  file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  deplibs_check_method='pass_all'
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  deplibs_check_method=pass_all
-
-  if test -f /lib/ld.so.1; then
-    dynamic_linker='GNU ld.so'
-  else
-    # Only the GNU ld.so supports shared libraries on MkLinux.
-    case "$host_cpu" in
-    powerpc*) dynamic_linker=no ;;
-    *) dynamic_linker='Linux ld.so' ;;
-    esac
-  fi
-  ;;
-
-netbsd*)
-  version_type=sunos
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-    soname_spec='${libname}${release}.so$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-openbsd*)
-  version_type=sunos
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-    need_version=no
-  fi
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-os2*)
-  libname_spec='$name'
-  need_lib_prefix=no
-  library_names_spec='$libname.dll $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_version=no
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  # this will be overridden with pass_all, but let us keep it just in case
-  deplibs_check_method='file_magic COFF format alpha shared library'
-  file_magic_cmd=/usr/bin/file
-  file_magic_test_file=/shlib/libc.so
-  deplibs_check_method='pass_all'
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rhapsody*)
-  version_type=sunos
-  library_names_spec='${libname}.so'
-  soname_spec='${libname}.so'
-  shlibpath_var=DYLD_LIBRARY_PATH
-  deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
-  file_magic_cmd=/usr/bin/file
-  file_magic_test_file=/lib/libc.so
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case "$host_vendor" in
-    sequent)
-      file_magic_cmd='/bin/file'
-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-      ;;
-    ncr)
-      deplibs_check_method='pass_all'
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-      file_magic_cmd=/usr/bin/file
-      file_magic_test_file=`echo /usr/lib/libc.so*`
-      ;;
-  esac
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-    soname_spec='$libname.so.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$ac_t$dynamic_linker" 1>&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-# Report the final consequences.
-echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
-
-# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
-# configure.in, otherwise build static only libraries.
-case "$host_os" in
-cygwin* | mingw* | os2*)
-  if test x$can_build_shared = xyes; then
-    test x$enable_win32_dll = xno && can_build_shared=no
-    echo "checking if package supports dlls... $can_build_shared" 1>&6
-  fi
-;;
-esac
-
-if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
-  case "$deplibs_check_method" in
-  "file_magic "*)
-    file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-    if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-       egrep "$file_magic_regex" > /dev/null; then
-      :
-    else
-      cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-    fi ;;
-  esac
-fi
-
-echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-
-echo "$ac_t$enable_shared" 1>&6
-
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-
-echo "checking whether to build static libraries... $enable_static" 1>&6
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-echo $ac_n "checking for objdir... $ac_c" 1>&6
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-echo "$ac_t$objdir" 1>&6
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
-  lt_cv_dlopen=no lt_cv_dlopen_libs=
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "$progname:2248: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2256 "ltconfig"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "$progname:2288: checking for dlopen" >&5
-if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2293 "ltconfig"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-dlopen();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "$progname:2335: checking for dld_link in -ldld" >&5
-ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2343 "ltconfig"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link();
-
-int main() {
-dld_link()
-; return 0; }
-EOF
-if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "$progname:2375: checking for shl_load" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2380 "ltconfig"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-shl_load();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="shl_load"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "$progname:2423: checking for shl_load in -ldld" >&5
-ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2431 "ltconfig"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load();
-
-int main() {
-shl_load()
-; return 0; }
-EOF
-if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-fi
-
-    
-fi
-
-  
-fi
-
-
-fi
-
-fi
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  fi
-
-  case "$lt_cv_dlopen" in
-  dlopen)
-for ac_hdr in dlfcn.h; do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "$progname:2488: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2493 "ltconfig"
-#include <$ac_hdr>
-int fnord = 0;
-EOF
-ac_try="$ac_compile >/dev/null 2>conftest.out"
-{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-    if test "x$ac_cv_header_dlfcn_h" = xyes; then
-      CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-    fi
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-  echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:2526: checking whether a program can dlopen itself" >&5
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    lt_cv_dlopen_self=cross
-  else
-    cat > conftest.c <<EOF
-#line 2534 "ltconfig"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LTDL_GLOBAL	RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-#  define LTDL_GLOBAL	DL_GLOBAL
-# else
-#  define LTDL_GLOBAL	0
-# endif
-#endif
-
-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LTDL_LAZY_OR_NOW
-# ifdef RTLD_LAZY
-#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-# else
-#  ifdef DL_LAZY
-#   define LTDL_LAZY_OR_NOW	DL_LAZY
-#  else
-#   ifdef RTLD_NOW
-#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-#   else
-#    ifdef DL_NOW
-#     define LTDL_LAZY_OR_NOW	DL_NOW
-#    else
-#     define LTDL_LAZY_OR_NOW	0
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-fnord() { int i=42;}
-main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
-
-EOF
-if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  lt_cv_dlopen_self=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  lt_cv_dlopen_self=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$lt_cv_dlopen_self" 1>&6
-
-  if test "$lt_cv_dlopen_self" = yes; then
-    LDFLAGS="$LDFLAGS $link_static_flag"
-  echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    lt_cv_dlopen_self_static=cross
-  else
-    cat > conftest.c <<EOF
-#line 2607 "ltconfig"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LTDL_GLOBAL	RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-#  define LTDL_GLOBAL	DL_GLOBAL
-# else
-#  define LTDL_GLOBAL	0
-# endif
-#endif
-
-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LTDL_LAZY_OR_NOW
-# ifdef RTLD_LAZY
-#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-# else
-#  ifdef DL_LAZY
-#   define LTDL_LAZY_OR_NOW	DL_LAZY
-#  else
-#   ifdef RTLD_NOW
-#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-#   else
-#    ifdef DL_NOW
-#     define LTDL_LAZY_OR_NOW	DL_NOW
-#    else
-#     define LTDL_LAZY_OR_NOW	0
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-fnord() { int i=42;}
-main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
-
-EOF
-if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  lt_cv_dlopen_self_static=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  lt_cv_dlopen_self_static=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
-fi
-    ;;
-  esac
-
-  case "$lt_cv_dlopen_self" in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case "$lt_cv_dlopen_self_static" in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-# Copy echo and quote the copy, instead of the original, because it is
-# used later.
-ltecho="$echo"
-if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
-fi
-LTSHELL="$SHELL"
-
-LTCONFIG_VERSION="$VERSION"
-
-# Only quote variables if we're using ltmain.sh.
-case "$ltmain" in
-*.sh)
-  # Now quote all the things that may contain metacharacters.
-  for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \
-    old_LD old_LDFLAGS old_LIBS \
-    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \
-    AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \
-    reload_flag reload_cmds wl \
-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-    library_names_spec soname_spec \
-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \
-    file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \
-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-
-    case "$var" in
-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case "$ltecho" in
-  *'\$0 --fallback-echo"')
-    ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-  trap "$rm \"$ofile\"; exit 1" 1 2 15
-  echo "creating $ofile"
-  $rm "$ofile"
-  cat <<EOF > "$ofile"
-#! $SHELL
-
-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-#
-# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program 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.
-#
-# This program 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.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="sed -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-### BEGIN LIBTOOL CONFIG
-EOF
-  cfgfile="$ofile"
-  ;;
-
-*)
-  # Double-quote the variables that need it (for aesthetics).
-  for var in old_CC old_CFLAGS old_CPPFLAGS \
-    old_LD old_LDFLAGS old_LIBS \
-    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do
-    eval "$var=\\\"\$var\\\""
-  done
-
-  # Just create a config file.
-  cfgfile="$ofile.cfg"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  echo "creating $cfgfile"
-  $rm "$cfgfile"
-  cat <<EOF > "$cfgfile"
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-EOF
-  ;;
-esac
-
-cat <<EOF >> "$cfgfile"
-# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
-# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
-# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
-# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\
-#   $0$ltconfig_args
-#
-# Compiler and other test output produced by $progname, useful for
-# debugging $progname, is in ./config.log if it exists.
-
-# The version of $progname that generated this script.
-LTCONFIG_VERSION=$LTCONFIG_VERSION
-
-# Shell to use when invoking shell scripts.
-SHELL=$LTSHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$ltecho
-
-# The archiver.
-AR=$AR
-
-# The default C compiler.
-CC=$CC
-
-# The linker used to build libraries.
-LD=$LD
-
-# Whether we need hard or soft links.
-LN_S=$LN_S
-
-# A BSD-compatible nm program.
-NM=$NM
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$reload_flag
-reload_cmds=$reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$wl
-
-# Object file suffix (normally "o").
-objext="$objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$pic_flag
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$compiler_c_o
-
-# Can we write directly to a .lo ?
-compiler_o_lo=$compiler_o_lo
-
-# Must we lock files when doing compilation ?
-need_locks=$need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$link_static_flag
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$RANLIB
-old_archive_cmds=$old_archive_cmds
-old_postinstall_cmds=$old_postinstall_cmds
-old_postuninstall_cmds=$old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$old_archive_from_new_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$archive_cmds
-archive_expsym_cmds=$archive_expsym_cmds
-postinstall_cmds=$postinstall_cmds
-postuninstall_cmds=$postuninstall_cmds
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$global_symbol_to_cdecl
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$include_expsyms
-
-EOF
-
-case "$ltmain" in
-*.sh)
-  echo '### END LIBTOOL CONFIG' >> "$ofile"
-  echo >> "$ofile"
-  case "$host_os" in
-  aix3*)
-    cat <<\EOF >> "$ofile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # Append the ltmain.sh script.
-  sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-
-  chmod +x "$ofile"
-  ;;
-
-*)
-  # Compile the libtool program.
-  echo "FIXME: would compile $ltmain"
-  ;;
-esac
-
-test -n "$cache_file" || exit 0
-
-# AC_CACHE_SAVE
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-exit 0
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/ltmain.sh b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/ltmain.sh
deleted file mode 100644
index db4982d8a9..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/ltmain.sh
+++ /dev/null
@@ -1,6538 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program 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.
-#
-# This program 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION="1.5.20 Debian 1.5.20-2"
-TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
-  setopt NO_GLOB_SUBST
-fi
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-        darwin_framework)
-	  compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework|-arch)
-        prev=darwin_framework
-        compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-        continue
-        ;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
-		;;
-	      pass_all)
-		valid_a_lib=yes
-		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  *)
-	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	  fi
-	fi
-	
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char *
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      save_umask=`umask`
-	      umask 0077
-	      if $mkdir "$tmpdir"; then
-	        umask $save_umask
-	      else
-	        umask $save_umask
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/missing b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/missing
deleted file mode 100755
index 6a37006e8f..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/missing
+++ /dev/null
@@ -1,336 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program 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, or (at your option)
-# any later version.
-
-# This program 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.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/mkinstalldirs b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/mkinstalldirs
deleted file mode 100755
index 4324e052bb..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/scripts/mkinstalldirs
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.1 1999/06/27 07:45:05 cvs Exp $
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/stamp-h.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/stamp-h.in
deleted file mode 100644
index 9788f70238..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/Makefile.am b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/Makefile.am
deleted file mode 100644
index 5213164a76..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: tests Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 21.5.1999
-# *************************************************************************
-
-INCLUDES =		-I..
-
-noinst_PROGRAMS =	testsms testsms2 testparser testgsmlib testpb testpb2 \
-			testspb testssms testcb
-
-TESTS =			runspb.sh runspb2.sh runssms.sh runsms.sh \
-			runparser.sh runspbi.sh
-
-# test files used for file-based phonebook and SMS testing
-EXTRA_DIST =		spb.pb runspb.sh runspb2.sh runssms.sh runsms.sh \
-			runparser.sh \
-			spb.pb spb2.pb \
-			testparser-output.txt testspb-output.txt \
-			testssms-output.txt testsms-output.txt \
-			testspb2-output.txt \
-			runspbi.sh spbi2-orig.pb spbi1.pb testspbi-output.txt
-
-# build testsms from testsms.cc and libgsmme.la
-testsms_SOURCES =	testsms.cc
-testsms_LDADD =		../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testsms2 from testsms2.cc and libgsmme.la
-testsms2_SOURCES =	testsms2.cc
-testsms2_LDADD =	../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testparser from testparser.cc and libgsmme.la
-testparser_SOURCES =	testparser.cc
-testparser_LDADD =	../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testgsmlib from testgsmlib.cc and libgsmme.la
-testgsmlib_SOURCES =	testgsmlib.cc
-testgsmlib_LDADD =	../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testpb from testpb.cc and libgsmme.la
-testpb_SOURCES =	testpb.cc
-testpb_LDADD =	../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testpb2 from testpb2.cc and libgsmme.la
-testpb2_SOURCES =	testpb2.cc
-testpb2_LDADD =	../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testspb from testspb.cc and libgsmme.la
-testspb_SOURCES =	testspb.cc
-testspb_LDADD =	../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testssms from testssms.cc and libgsmme.la
-testssms_SOURCES = testssms.cc
-testssms_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testcb from testcb.cc and libgsmme.la
-testcb_SOURCES = testcb.cc
-testcb_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/Makefile.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/Makefile.in
deleted file mode 100644
index e949e268ff..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/Makefile.in
+++ /dev/null
@@ -1,544 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: tests Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 21.5.1999
-# *************************************************************************
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AS = @AS@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-DATADIRNAME = @DATADIRNAME@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GSM_VERSION = @GSM_VERSION@
-HAVE_LIB = @HAVE_LIB@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIB = @LIB@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-
-INCLUDES = -I..
-
-noinst_PROGRAMS = testsms testsms2 testparser testgsmlib testpb testpb2 \
-			testspb testssms testcb
-
-
-TESTS = runspb.sh runspb2.sh runssms.sh runsms.sh \
-			runparser.sh runspbi.sh
-
-
-# test files used for file-based phonebook and SMS testing
-EXTRA_DIST = spb.pb runspb.sh runspb2.sh runssms.sh runsms.sh \
-			runparser.sh \
-			spb.pb spb2.pb \
-			testparser-output.txt testspb-output.txt \
-			testssms-output.txt testsms-output.txt \
-			testspb2-output.txt \
-			runspbi.sh spbi2-orig.pb spbi1.pb testspbi-output.txt
-
-
-# build testsms from testsms.cc and libgsmme.la
-testsms_SOURCES = testsms.cc
-testsms_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testsms2 from testsms2.cc and libgsmme.la
-testsms2_SOURCES = testsms2.cc
-testsms2_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testparser from testparser.cc and libgsmme.la
-testparser_SOURCES = testparser.cc
-testparser_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testgsmlib from testgsmlib.cc and libgsmme.la
-testgsmlib_SOURCES = testgsmlib.cc
-testgsmlib_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testpb from testpb.cc and libgsmme.la
-testpb_SOURCES = testpb.cc
-testpb_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testpb2 from testpb2.cc and libgsmme.la
-testpb2_SOURCES = testpb2.cc
-testpb2_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testspb from testspb.cc and libgsmme.la
-testspb_SOURCES = testspb.cc
-testspb_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testssms from testssms.cc and libgsmme.la
-testssms_SOURCES = testssms.cc
-testssms_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-
-# build testcb from testcb.cc and libgsmme.la
-testcb_SOURCES = testcb.cc
-testcb_LDADD = ../gsmlib/libgsmme.la $(INTLLIBS)
-subdir = tests
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/gsm_config.h
-CONFIG_CLEAN_FILES =
-noinst_PROGRAMS = testsms$(EXEEXT) testsms2$(EXEEXT) testparser$(EXEEXT) \
-	testgsmlib$(EXEEXT) testpb$(EXEEXT) testpb2$(EXEEXT) \
-	testspb$(EXEEXT) testssms$(EXEEXT) testcb$(EXEEXT)
-PROGRAMS = $(noinst_PROGRAMS)
-
-am_testcb_OBJECTS = testcb.$(OBJEXT)
-testcb_OBJECTS = $(am_testcb_OBJECTS)
-testcb_DEPENDENCIES = ../gsmlib/libgsmme.la
-testcb_LDFLAGS =
-am_testgsmlib_OBJECTS = testgsmlib.$(OBJEXT)
-testgsmlib_OBJECTS = $(am_testgsmlib_OBJECTS)
-testgsmlib_DEPENDENCIES = ../gsmlib/libgsmme.la
-testgsmlib_LDFLAGS =
-am_testparser_OBJECTS = testparser.$(OBJEXT)
-testparser_OBJECTS = $(am_testparser_OBJECTS)
-testparser_DEPENDENCIES = ../gsmlib/libgsmme.la
-testparser_LDFLAGS =
-am_testpb_OBJECTS = testpb.$(OBJEXT)
-testpb_OBJECTS = $(am_testpb_OBJECTS)
-testpb_DEPENDENCIES = ../gsmlib/libgsmme.la
-testpb_LDFLAGS =
-am_testpb2_OBJECTS = testpb2.$(OBJEXT)
-testpb2_OBJECTS = $(am_testpb2_OBJECTS)
-testpb2_DEPENDENCIES = ../gsmlib/libgsmme.la
-testpb2_LDFLAGS =
-am_testsms_OBJECTS = testsms.$(OBJEXT)
-testsms_OBJECTS = $(am_testsms_OBJECTS)
-testsms_DEPENDENCIES = ../gsmlib/libgsmme.la
-testsms_LDFLAGS =
-am_testsms2_OBJECTS = testsms2.$(OBJEXT)
-testsms2_OBJECTS = $(am_testsms2_OBJECTS)
-testsms2_DEPENDENCIES = ../gsmlib/libgsmme.la
-testsms2_LDFLAGS =
-am_testspb_OBJECTS = testspb.$(OBJEXT)
-testspb_OBJECTS = $(am_testspb_OBJECTS)
-testspb_DEPENDENCIES = ../gsmlib/libgsmme.la
-testspb_LDFLAGS =
-am_testssms_OBJECTS = testssms.$(OBJEXT)
-testssms_OBJECTS = $(am_testssms_OBJECTS)
-testssms_DEPENDENCIES = ../gsmlib/libgsmme.la
-testssms_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/testcb.Po ./$(DEPDIR)/testgsmlib.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testparser.Po ./$(DEPDIR)/testpb.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testpb2.Po ./$(DEPDIR)/testsms.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testsms2.Po ./$(DEPDIR)/testspb.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testssms.Po
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(testcb_SOURCES) $(testgsmlib_SOURCES) \
-	$(testparser_SOURCES) $(testpb_SOURCES) $(testpb2_SOURCES) \
-	$(testsms_SOURCES) $(testsms2_SOURCES) $(testspb_SOURCES) \
-	$(testssms_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(testcb_SOURCES) $(testgsmlib_SOURCES) $(testparser_SOURCES) $(testpb_SOURCES) $(testpb2_SOURCES) $(testsms_SOURCES) $(testsms2_SOURCES) $(testspb_SOURCES) $(testssms_SOURCES)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  tests/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-testcb$(EXEEXT): $(testcb_OBJECTS) $(testcb_DEPENDENCIES) 
-	@rm -f testcb$(EXEEXT)
-	$(CXXLINK) $(testcb_LDFLAGS) $(testcb_OBJECTS) $(testcb_LDADD) $(LIBS)
-testgsmlib$(EXEEXT): $(testgsmlib_OBJECTS) $(testgsmlib_DEPENDENCIES) 
-	@rm -f testgsmlib$(EXEEXT)
-	$(CXXLINK) $(testgsmlib_LDFLAGS) $(testgsmlib_OBJECTS) $(testgsmlib_LDADD) $(LIBS)
-testparser$(EXEEXT): $(testparser_OBJECTS) $(testparser_DEPENDENCIES) 
-	@rm -f testparser$(EXEEXT)
-	$(CXXLINK) $(testparser_LDFLAGS) $(testparser_OBJECTS) $(testparser_LDADD) $(LIBS)
-testpb$(EXEEXT): $(testpb_OBJECTS) $(testpb_DEPENDENCIES) 
-	@rm -f testpb$(EXEEXT)
-	$(CXXLINK) $(testpb_LDFLAGS) $(testpb_OBJECTS) $(testpb_LDADD) $(LIBS)
-testpb2$(EXEEXT): $(testpb2_OBJECTS) $(testpb2_DEPENDENCIES) 
-	@rm -f testpb2$(EXEEXT)
-	$(CXXLINK) $(testpb2_LDFLAGS) $(testpb2_OBJECTS) $(testpb2_LDADD) $(LIBS)
-testsms$(EXEEXT): $(testsms_OBJECTS) $(testsms_DEPENDENCIES) 
-	@rm -f testsms$(EXEEXT)
-	$(CXXLINK) $(testsms_LDFLAGS) $(testsms_OBJECTS) $(testsms_LDADD) $(LIBS)
-testsms2$(EXEEXT): $(testsms2_OBJECTS) $(testsms2_DEPENDENCIES) 
-	@rm -f testsms2$(EXEEXT)
-	$(CXXLINK) $(testsms2_LDFLAGS) $(testsms2_OBJECTS) $(testsms2_LDADD) $(LIBS)
-testspb$(EXEEXT): $(testspb_OBJECTS) $(testspb_DEPENDENCIES) 
-	@rm -f testspb$(EXEEXT)
-	$(CXXLINK) $(testspb_LDFLAGS) $(testspb_OBJECTS) $(testspb_LDADD) $(LIBS)
-testssms$(EXEEXT): $(testssms_OBJECTS) $(testssms_DEPENDENCIES) 
-	@rm -f testssms$(EXEEXT)
-	$(CXXLINK) $(testssms_LDFLAGS) $(testssms_OBJECTS) $(testssms_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testcb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testgsmlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testparser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpb2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testsms.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testsms2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testspb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testssms.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cc.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cc.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-
-.cc.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
-	        xpass=`expr $$xpass + 1`; \
-	        failed=`expr $$failed + 1`; \
-	        echo "XPASS: $$tst"; \
-	      ;; \
-	      *) \
-	        echo "PASS: $$tst"; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
-	        xfail=`expr $$xfail + 1`; \
-	        echo "XFAIL: $$tst"; \
-	      ;; \
-	      *) \
-	        failed=`expr $$failed + 1`; \
-	        echo "FAIL: $$tst"; \
-	      ;; \
-	      esac; \
-	    fi; \
-	  done; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
-	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
-	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-	    fi; \
-	  fi; \
-	  dashes=`echo "$$banner" | sed s/./=/g`; \
-	  echo "$$dashes"; \
-	  echo "$$banner"; \
-	  echo "$$dashes"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(PROGRAMS)
-
-installdirs:
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-uninstall-am: uninstall-info-am
-
-.PHONY: GTAGS all all-am check check-TESTS check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS distclean distclean-compile \
-	distclean-depend distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	tags uninstall uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runparser.sh b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runparser.sh
deleted file mode 100755
index 9ee9d312f5..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runparser.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-errorexit() {
-    echo $1
-    exit 1
-}
-
-# run the test
-./testparser > testparser.log
-
-# check if output differs from what it should be
-diff testparser.log testparser-output.txt
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runsms.sh b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runsms.sh
deleted file mode 100755
index f027544ee7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runsms.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-errorexit() {
-    echo $1
-    exit 1
-}
-
-# prepare locales to make date format reproducible
-LC_ALL=en_US
-LANG=en
-LINGUAS=en
-export LC_ALL LANG LINGUAS
-
-# run the test
-./testsms > testsms.log
-
-# check if output differs from what it should be
-diff testsms.log testsms-output.txt
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runspb.sh b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runspb.sh
deleted file mode 100755
index fb8c6200f8..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runspb.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-errorexit() {
-    echo $1
-    exit 1
-}
-
-cp spb.pb spb-copy.pb || errorexit "could not copy spb.pb to spb-copy.pb"
-
-# run the test
-./testspb > testspb.log
-
-# add new contents of phonebook file to the test log
-cat spb-copy.pb >> testspb.log
-
-# check if output differs from what it should be
-diff testspb.log testspb-output.txt
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runspb2.sh b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runspb2.sh
deleted file mode 100755
index df8f123cae..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runspb2.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-errorexit() {
-    echo $1
-    exit 1
-}
-
-cp spb2.pb spb-copy.pb || errorexit "could not copy spb2.pb to spb2-copy.pb"
-
-# run the test
-./testspb > testspb2.log
-
-# add new contents of phonebook file to the test log
-cat spb-copy.pb >> testspb2.log
-
-# check if output differs from what it should be
-diff testspb2.log testspb2-output.txt
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runspbi.sh b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runspbi.sh
deleted file mode 100755
index 94b5b459a4..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runspbi.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-errorexit() {
-    echo $1
-    exit 1
-}
-
-cp spbi2-orig.pb spbi2.pb ||
-    errorexit "could not copy spbi2-orig.pb to spbi2.pb"
-    
-# run the test
-../apps/gsmpb -V -i -s spbi1.pb -d spbi2.pb > testspbi.log
-
-# add new contents of phonebook file to the test log
-cat spbi2.pb >> testspbi.log
-
-# check if output differs from what it should be
-diff testspbi.log testspbi-output.txt
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runssms.sh b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runssms.sh
deleted file mode 100755
index 5b11442189..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/runssms.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-errorexit() {
-    echo $1
-    exit 1
-}
-
-rm -f sms.sms || errorexit "could not delete sms.sms"
-touch sms.sms || errorexit "could not create sms.sms"
-
-# prepare locales to make date format reproducible
-LC_ALL=en_US
-LANG=en
-LINGUAS=en
-export LC_ALL LANG LINGUAS
-
-# run the test
-./testssms > testssms.log
-
-# check if output differs from what it should be
-diff testssms.log testssms-output.txt
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spb.pb b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spb.pb
deleted file mode 100644
index debd672369..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spb.pb
+++ /dev/null
@@ -1,11 +0,0 @@
-|Dieter Meier|793045
-|Edgar Hofmann|42345
-|Goethe|847159
-|Hans Hofmann|12345
-|Hans-Dieter Schmidt|82345
-|Hans-Dieter Schmidt|13333345
-|Heiner M�ller|7890
-|line with \||0815
-|line with\\|0815
-|One line\rback to start|0815
-|two\nline|0815
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spb2.pb b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spb2.pb
deleted file mode 100644
index ed0c16cc73..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spb2.pb
+++ /dev/null
@@ -1,11 +0,0 @@
-|Dieter Meier|017793045
-|Edgar Hofmann|+4942345
-|Goethe|847159
-|Hans Hofmann|0171
-|Hans-Dieter Schmidt|82345
-|Hans-Dieter Schmidt|13333345
-|Heiner M�ller|7890
-|line with \||0815
-|line with\\|0815
-|One line\rback to start|0815
-|two\nline|0815
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spbi1.pb b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spbi1.pb
deleted file mode 100644
index 11b913f254..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spbi1.pb
+++ /dev/null
@@ -1,3 +0,0 @@
-1|Nummer 4|4444444
-3|Nummer 3|3333333
-5|same name|12345
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spbi2-orig.pb b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spbi2-orig.pb
deleted file mode 100644
index 90f2337bbd..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/spbi2-orig.pb
+++ /dev/null
@@ -1,4 +0,0 @@
-2|Nummer 3|3333333
-4|Nummer 4|4444444
-5|same name|23456
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testcb.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testcb.cc
deleted file mode 100644
index 59617d864f..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testcb.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    testcb.cc
-// *
-// * Purpose: Test cell broadcast SMS
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 3.8.2001
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_cb.h>
-#include <gsmlib/gsm_nls.h>
-#include <gsmlib/gsm_error.h>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    CBMessageRef cbm = new CBMessage("001000320111C3343D0F82C51A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D100");
-    
-    cout << cbm->toString();
-    
-    cbm = new CBMessage("001000320111C4EAB3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D100");
-    
-    cout << cbm->toString();
-  }
-  catch (GsmException &ge)
-  {
-    cerr << argv[0] << _("[ERROR]: ") << ge.what() << endl;
-  }
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testgsmlib.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testgsmlib.cc
deleted file mode 100755
index a40e74178d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testgsmlib.cc
+++ /dev/null
@@ -1,179 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    testgsmlib.cc
-// *
-// * Purpose: Test general gsm functions (without SMS/phonebook)
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 17.5.1999
-// *************************************************************************
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#ifdef WIN32
-#include <gsm_config.h>
-#include <gsmlib/gsm_win32_serial.h>
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#endif
-#include <gsmlib/gsm_me_ta.h>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-// some time-consuming tests can be switched off by commenting out the
-// following macros
-#define TEST_OPERATOR_INFO
-
-void printForwardReason(string s, ForwardInfo &info)
-{
-  cout << "  " << s << ": "
-       << (info._active ? "active " : "inactive ")
-       << "number: " << info._number
-       << "  subaddr: " << info._subAddr
-       << "  time: " << info._time << endl;
-}
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    cout << (string)"Opening device " + argv[1] << endl;
-#ifdef WIN32
-    Ref<Port> port = new Win32SerialPort((string)argv[1], 38400);
-#else
-	Ref<Port> port = new UnixSerialPort((string)argv[1], B38400);
-#endif
-
-    cout << "Creating MeTa object" << endl;
-    MeTa m(port);
-
-    cout << "Getting ME info" << endl;
-    MEInfo mei = m.getMEInfo();
-
-    cout << "  Manufacturer: " << mei._manufacturer << endl
-         << "  Model: " << mei._model << endl
-         << "  Revision: " << mei._revision << endl
-         << "  Serial Number: " << mei._serialNumber << endl << endl;
-
-#ifdef TEST_OPERATOR_INFO
-    try
-    {
-      cout << "Getting operator info" << endl;
-      vector<OPInfo> opis = m.getAvailableOPInfo();
-      for (vector<OPInfo>::iterator i = opis.begin(); i != opis.end(); ++i)
-      {
-        cout << "  Status: ";
-        switch (i->_status)
-        {
-        case 0: cout << "unknown"; break;
-        case 1: cout << "current"; break;
-        case 2: cout << "available"; break;
-        case 3: cout << "forbidden"; break;
-        }
-        cout << endl
-             << "  Long name: '" << i->_longName << "' "
-             << "  Short name: '" << i->_shortName << "' "
-             << "  Numeric name: " << i->_numericName << endl;
-      }
-    }
-    catch (GsmException &ge)
-    {
-      if (ge.getErrorCode() == 0)
-        cout << "phone failure ignored" << endl;
-      else
-        throw;
-    }
-    cout << endl;
-#endif // TEST_OPERATOR_INFO
-
-    cout << "Current operator info" << endl;
-    OPInfo opi = m.getCurrentOPInfo();
-    cout << "  Long name: '" << opi._longName << "' "
-         << "  Short name: '" << opi._shortName << "' "
-         << "  Numeric name: " << opi._numericName << endl
-         << "  Mode: ";
-    switch (opi._mode)
-    {
-    case 0: cout << "automatic"; break;
-    case 1: cout << "manual"; break;
-    case 2: cout << "deregister"; break;
-    case 4: cout << "manual/automatic"; break;
-    }
-    cout << endl;
-
-    cout << "Facility lock capabilities" << endl << "  ";
-    vector<string> fclc = m.getFacilityLockCapabilities();
-    for (vector<string>::iterator i = fclc.begin(); i != fclc.end(); ++i)
-      cout << *i << " ";
-    cout << endl << endl;
-
-    cout << "Facility lock states" << endl;
-    for (vector<string>::iterator k = fclc.begin(); k != fclc.end(); ++k)
-      if (*k != "AB" && *k != "AG" && *k != "AC")
-      {
-        cout << "  " << *k;
-        if (m.getFacilityLockStatus(*k, VoiceFacility))
-          cout << "  Voice";
-        if (m.getFacilityLockStatus(*k, DataFacility))
-          cout << "  Data";
-        if (m.getFacilityLockStatus(*k, FaxFacility))
-          cout << "  Fax";
-      }
-    cout << endl;
-    
-    cout << "Facilities with password" << endl;
-    vector<PWInfo> pwi = m.getPasswords();
-    for (vector<PWInfo>::iterator j = pwi.begin(); j != pwi.end(); ++j)
-      cout << "  " << j->_facility << " len " << j->_maxPasswdLen << endl;
-    cout << endl;
-
-    cout << "Network caller line identification identification: "
-         << (m.getNetworkCLIP() ? "on" : "off") << endl << endl;
-
-    cout << "Call forwarding information" << endl;
-    for (int r = 0; r < 4; ++r)
-    {
-      switch (r)
-      {
-      case 0: cout << "UnconditionalReason" << endl; break;
-      case 1: cout << "MobileBusyReason" << endl; break;
-      case 2: cout << "NoReplyReason" << endl; break;
-      case 3: cout << "NotReachableReason" << endl; break;
-      }
-      ForwardInfo voice, fax, data;
-      m.getCallForwardInfo((ForwardReason)r, voice, fax, data);
-      printForwardReason("Voice", voice);
-      printForwardReason("Data", data);
-      printForwardReason("Fax", fax);
-    }
-    cout << endl;
-
-    cout << "Battery charge status" << endl;
-    int bcs = m.getBatteryChargeStatus();
-    switch (bcs)
-    {
-    case 0: cout << "ME is powered by the battery" << endl; break;
-    case 1: cout << "ME has a battery connected, but is not powered by it"
-                 << endl; break;
-    case 2: cout << "ME does not have a battery connected" << endl; break;
-    case 3: cout << "Recognized power fault, calls inhibited" << endl; break;
-    }
-    cout << endl;
-
-    cout << "Battery charge: " << m.getBatteryCharge() << endl << endl;
-
-    cout << "Signal strength: " << m.getSignalStrength() << endl << endl;
-
-    cout << "Bit error rate: " << m.getBitErrorRate() << endl << endl;
-  }
-  catch (GsmException &ge)
-  {
-    cerr << "GsmException '" << ge.what() << "'" << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testparser-output.txt b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testparser-output.txt
deleted file mode 100644
index a5b16e7fb3..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testparser-output.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 1
-(),("ME","SM","Which of the three items does not belong here?")
-
-Test 2
-(1-5),425,"+abcd"efgh"
-
-Test 3
-(1,2,3,4,5,7,11,12,25),425,Thisisatest."+a"ef"andsoforth
-
-Test 4
-(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125),(20),16
-
-Test 5
-SM,7
-
-Test 6
-(2,"S TELIA MOBITEL","S TELIA",24001)
-
-Error 1: expected ')' (at position 4 of string '(4-5')
-
-Error 3: expected end of line (at position 5 of string '"bla"bla"')
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testparser.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testparser.cc
deleted file mode 100644
index 99b178d197..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testparser.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    testparser.cc
-// *
-// * Purpose: Test AT result code parser
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 17.5.1999
-// *************************************************************************
-
-#include <gsmlib/gsm_parser.h>
-#include <assert.h>
-#include <algorithm>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-void printIntList(vector<bool> &vb)
-{
-  cout << "(";
-  int j = 0;
-  bool first = true;
-  for (vector<bool>::iterator i = vb.begin();
-       i != vb.end(); ++i)
-  {
-    if (*i)
-    {
-      if (! first) cout << ",";
-      cout << j;
-      first = false;
-    }
-    ++j;
-  }
-  cout << ")";
-}
-
-void printIntRange(IntRange ir)
-{
-  cout << "(" << ir._low << "-" << ir._high << ")";
-}
-
-void printStringList(vector<string> vs)
-{
-  bool first = true;
-  cout << "(";
-  for (vector<string>::iterator i = vs.begin();
-       i != vs.end(); ++i)
-  {
-    if (! first) cout << ",";
-    cout << "\"" << *i << "\"";
-    first = false;
-  }
-  cout << ")";
-}
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    {
-      cout << "Test 1" << endl;
-      Parser p((string)",(\"ME\", \"SM\"," +
-               "\"Which of the three items does not belong here?\")");
-
-      vector<string> vs1 = p.parseStringList(true);
-      p.parseComma();
-      vector<string> vs2 = p.parseStringList();
-      bool comma = p.parseComma(true);
-
-      printStringList(vs1);
-      cout << ",";
-      printStringList(vs2);
-      if (comma) cout << ",";
-      cout << endl << endl;
-    }
-    {
-      cout << "Test 2" << endl;
-      Parser p("(1-5),425,\"+abcd\"efgh\"");
-
-      IntRange ir = p.parseRange();
-      p.parseComma();
-      int i = p.parseInt();
-      p.parseComma();
-      string s = p.parseString(false, true);
-
-      printIntRange(ir);
-      cout << "," << i << ",\"" << s << "\"" << endl << endl;
-    }
-    {
-      cout << "Test 3" << endl;
-      Parser p("(7,1-5,12-11,25),425,This is a test.\"+a\"ef\" and so forth");
-
-      vector<bool> vb = p.parseIntList();
-      p.parseComma();
-      int i = p.parseInt();
-      p.parseComma();
-      string s = p.parseEol();
-
-      printIntList(vb);
-      cout << "," << i << "," << s << endl << endl;
-    }
-    {
-      cout << "Test 4" << endl;
-      Parser p("(1-125),20,16");
-
-      vector<bool> vb = p.parseIntList();
-      p.parseComma();
-      vector<bool> vb2 = p.parseIntList();
-      p.parseComma();
-      int j = p.parseInt();
-
-      printIntList(vb);
-      cout << ",";
-      printIntList(vb2);
-      cout << "," << j << endl << endl;
-    }
-    {
-      cout << "Test 5" << endl;
-      Parser p("SM,7");
-
-      string s = p.parseString();
-      p.parseComma();
-      int i = p.parseInt();
-
-      cout << s << "," << i << endl << endl;
-    }
-    {
-      cout << "Test 6" << endl;
-      Parser p("(2,\"S TELIA MOBITEL\",\"S TELIA\",\"24001\")");
-
-      p.parseChar('(');
-      int status = p.parseInt();
-      p.parseComma();
-      string longName = p.parseString(true);
-      p.parseComma();
-      string shortName = p.parseString(true);
-      p.parseComma();
-      int numericName;
-      try
-      {
-        numericName = p.parseInt(true);
-      }
-      catch (GsmException &e)
-      {
-        if (e.getErrorClass() == ParserError)
-        {
-          // the Ericsson GM12 GSM modem returns the numeric ID as string
-          string s = p.parseString();
-          numericName = checkNumber(s);
-        }
-        else
-          throw e;
-      }
-      p.parseChar(')');
-      
-      cout << "(" << status << ",\"" << longName << "\",\""
-           << shortName << "\","
-           << numericName << ")" << endl << endl;
-    }
-  }
-  catch (GsmException &p)
-  {
-    // these tests shouldn't throw exceptions
-    assert(0);
-  }
-
-  // Now some tests that should provoke an error
-  try
-  {
-    Parser p("(4-5");
-    p.parseRange();
-  }
-  catch (GsmException &p)
-  {
-    cout << "Error 1: " << p.what() << endl << endl;
-  }
-  try
-  {
-    Parser p("(4-5,3-4-5)");
-    p.parseIntList();
-  }
-  catch (GsmException &p)
-  {
-    cout << "Error 2: " << p.what() << endl << endl;
-  }
-  try
-  {
-    Parser p("\"bla\"bla\"");
-    p.parseString();
-    p.checkEol();
-  }
-  catch (GsmException &p)
-  {
-    cout << "Error 3: " << p.what() << endl << endl;
-  }
-
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testpb.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testpb.cc
deleted file mode 100644
index 6f161349ef..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testpb.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <gsmlib/gsm_unix_serial.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_phonebook.h>
-#include <algorithm>
-#include <iostream>
-#include <strstream>
-
-using namespace std;
-using namespace gsmlib;
-
-void printPb(PhonebookEntry &e)
-{
-  cout << "number: " << e.telephone()
-       << " text: " << e.text() << endl;
-}
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    cout << (string)"Opening device " + argv[1] << endl;
-    Ref<Port> port = new UnixSerialPort((string)argv[1], B38400);
-
-    cout << "Creating MeTa object" << endl;
-    MeTa m(port);
-
-    cout << "Getting phonebook entries" << endl;
-    vector<string> pbs = m.getPhoneBookStrings();
-    for (vector<string>::iterator i = pbs.begin(); i != pbs.end(); ++i)
-    {
-      PhonebookRef pb = m.getPhonebook(*i);
-
-      cout << "Phonebook \"" << *i << "\" " << endl
-           << "  Max number length: " << pb->getMaxTelephoneLen() << endl
-           << "  Max text length: " << pb->getMaxTextLen() << endl
-           << "  Capacity: " << pb->capacity() << endl
-           << "  Size: " << pb->size() << endl;
-
-      for (Phonebook::iterator j = pb->begin(); j != pb->end(); ++j)
-        if (! j->empty())
-          cout << "  Entry #" << j - pb->begin()
-               << "Number: \"" << j->telephone() << "\""
-               << "Text: \"" << j->text() << "\"" << endl;
-    }
-  }
-  catch (GsmException &ge)
-  {
-    cerr << "GsmException '" << ge.what() << "'" << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testpb2.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testpb2.cc
deleted file mode 100644
index f9769f9bfc..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testpb2.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <gsmlib/gsm_unix_serial.h>
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_phonebook.h>
-#include <algorithm>
-#include <strstream>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-bool isbla(PhonebookEntry &e)
-{
-  //  cerr << "****'" << e.text() << "'" << endl;
-  return e.text() == "blabla";
-}
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    cout << (string)"Opening device " + argv[1] << endl;
-    Ref<Port> port = new UnixSerialPort((string)argv[1], B38400);
-
-    cout << "Creating MeTa object" << endl;
-    MeTa m(port);
-
-    cout << "Getting phonebook entries" << endl;
-    vector<string> pbs = m.getPhoneBookStrings();
-    if (pbs.begin() == pbs.end())
-    {
-      cerr << "no phonebooks available" << endl;
-      exit(1);
-    }
-    
-    PhonebookRef pb = m.getPhonebook(*pbs.begin());
-
-    cout << "Phonebook \"" << pb->name() << "\" " << endl
-         << "  Max number length: " << pb->getMaxTelephoneLen() << endl
-         << "  Max text length: " << pb->getMaxTextLen() << endl
-         << "  Capacity: " << pb->capacity() << endl;
-
-    cout << "Inserting entry 'blabla'" << endl;
-    PhonebookEntry e("123456", "blabla");
-    pb->insert(pb->end(), e);
-
-    int j = -1;
-    for (int i = 50; i < 60; ++i)
-      if (pb()[i].empty())
-      {
-        pb()[i].set("23456", "blabla");
-        j = i;
-        break;
-      }
-    
-    pb->erase(pb->begin() + j);
-
-    Phonebook::iterator k;
-    do
-    {
-      k = find_if(pb->begin(), pb->end(), isbla);
-      if (k != pb->end())
-      {
-        cerr << "Erasing #" << k - pb->begin() << endl;
-        pb->erase(k, k + 1);
-      }
-    }
-    while (k != pb->end());
-  }
-  catch (GsmException &ge)
-  {
-    cerr << "GsmException '" << ge.what() << "'" << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testsms-output.txt b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testsms-output.txt
deleted file mode 100644
index bee3c53bac..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testsms-output.txt
+++ /dev/null
@@ -1,167 +0,0 @@
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: '491710762100'
-More messages to send: 1
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: '171'
-Protocol identifier: 0x39
-Data coding scheme: default alphabet
-SC timestamp: 04/16/1999 08:09:44 AM (+0200)
-User data length: 160
-User data header: 0x
-User data: 'T-D1 News bis 31.05.99 kostenlos testen! �ber 90 Programme aus Politik, Wirtschaft, B�rse, Sport direkt per SMS aufs Handy. Mehr dar�ber unter der Kurzwahl 2323'
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: '491710762100'
-More messages to send: 1
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: '01805000102'
-Protocol identifier: 0x39
-Data coding scheme: default alphabet
-SC timestamp: 12/17/1998 02:10:55 PM (+0100)
-User data length: 159
-User data header: 0x
-User data: 'Nicht vergessen! Die XtraWeihnachtsverlosung l�uft noch bis zum 24.12. Nutzen Sie jetzt Ihre Gewinnchance und faxen Sie Ihren Teiln.-Gutschein an 0180/5000 056'
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: '41794991200'
-More messages to send: 1
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: 'dialing.de '
-Protocol identifier: 0x39
-Data coding scheme: default alphabet
-SC timestamp: 04/21/2001 12:15:28 PM (+0000)
-User data length: 0
-User data header: 0x
-User data: ''
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: '41794991200'
-More messages to send: 1
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: 'dialing.de '
-Protocol identifier: 0x39
-Data coding scheme: default alphabet
-SC timestamp: 04/21/2001 12:15:28 PM (+0000)
-User data length: 0
-User data header: 0x
-User data: ''
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: ''
-More messages to send: 0
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: ''
-Protocol identifier: 0x0
-Data coding scheme: default alphabet
-SC timestamp: 00/00/2000 12:00:00 AM (+0000)
-User data length: 0
-User data header: 0x
-User data: ''
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: ''
-More messages to send: 0
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: ''
-Protocol identifier: 0x0
-Data coding scheme: default alphabet
-SC timestamp: 00/00/2000 12:00:00 AM (+0000)
-User data length: 0
-User data header: 0x
-User data: ''
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-DELIVER-REPORT
-SC address: ''
-Protocol identifier present: 0
-Data coding scheme present: 0
-User data length present: 0
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-STATUS-REPORT
-SC address: ''
-More messages to send: 0
-Status report qualifier: 0
-Message reference: 0
-Recipient address: ''
-SC timestamp: 00/00/2000 12:00:00 AM (+0000)
-Discharge time: 00/00/2000 12:00:00 AM (+0000)
-Status: 0x0 'Short message received by the SME'
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-COMMAND
-SC address: ''
-Message reference: 0
-Status report request: 1
-Protocol identifier: 0x0
-Command type: 0x0
-Message number: 0
-Destination address: ''
-Command data length: 0
-Command data: ''
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-SUBMIT
-SC address: ''
-Reject duplicates: 1
-Validity period format: relative
-Reply path: 0
-User data header indicator: 0
-Status report request: 0
-Message reference: 0
-Destination address: ''
-Protocol identifier: 0x0
-Data coding scheme: default alphabet
-Validity period: 2 days
-User data length: 35
-User data header: 0x
-User data: 'This is a submit message, isn't it?'
----------------------------------------------------------------------------
-
-
----------------------------------------------------------------------------
-Message type: SMS-SUBMIT-REPORT
-SC address: ''
-SC timestamp: 00/00/2000 12:00:00 AM (+0000)
-Protocol identifier present: 0
-Data coding scheme present: 0
-User data length present: 0
----------------------------------------------------------------------------
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testsms.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testsms.cc
deleted file mode 100644
index bf5423b057..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testsms.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-// *************************************************************************
-// * GSM TA/ME library
-// *
-// * File:    testsms.cc
-// *
-// * Purpose: Test coder and encoder for SMS TPDUs
-// *
-// * Author:  Peter Hofmann (software@pxh.de)
-// *
-// * Created: 17.5.1999
-// *************************************************************************
-
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_sms.h>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-int main(int argc, char *argv[])
-{
-  string pdu;
-  SMSMessageRef sms;
-  // test two SMS message I have received
-  sms = SMSMessage::decode("079194710167120004038571F1390099406180904480A0D41631067296EF7390383D07CD622E58CD95CB81D6EF39BDEC66BFE7207A794E2FBB4320AFB82C07E56020A8FC7D9687DBED32285C9F83A06F769A9E5EB340D7B49C3E1FA3C3663A0B24E4CBE76516680A7FCBE920725A5E5ED341F0B21C346D4E41E1BA790E4286DDE4BC0BD42CA3E5207258EE1797E5A0BA9B5E9683C86539685997EBEF61341B249BC966");
-  cout << sms->toString() << endl;
-
-  sms = SMSMessage::decode("0791947101671200040B851008050001F23900892171410155409FCEF4184D07D9CBF273793E2FBB432062BA0CC2D2E5E16B398D7687C768FADC5E96B3DFF3BAFB0C62EFEB663AC8FD1EA341E2F41CA4AFB741329A2B2673819C75BABEEC064DD36590BA4CD7D34149B4BC0C3A96EF69B77B8C0EBBC76550DD4D0699C3F8B21B344D974149B4BCEC0651CB69B6DBD53AD6E9F331BA9C7683C26E102C8683BD6A30180C04ABD900");
-  cout << sms->toString() << endl;
-
-  // test SMS decoding and encoding for messages with alphanumeric
-  // destination address
-  sms = SMSMessage::decode("07911497941902F00414D0E474989D769F5DE4320839001040122151820000");
-  cout << sms->toString() << endl;
-  pdu = sms->encode();
-  sms = SMSMessage::decode(pdu);
-  cout << sms->toString() << endl;
-
-  // test all message types
-  sms = new SMSDeliverMessage();
-  cout << sms->toString() << endl;
-  pdu = sms->encode();
-  sms = SMSMessage::decode(pdu);
-  cout << sms->toString() << endl;
-
-  // test all message types
-  sms = new SMSDeliverReportMessage();
-  pdu = sms->encode();
-  sms = SMSMessage::decode(pdu, false);
-  cout << sms->toString() << endl;
-
-  // test all message types
-  sms = new SMSStatusReportMessage();
-  pdu = sms->encode();
-  sms = SMSMessage::decode(pdu);
-  cout << sms->toString() << endl;
-
-  // test all message types
-  sms = new SMSCommandMessage();
-  pdu = sms->encode();
-  sms = SMSMessage::decode(pdu, false);
-  cout << sms->toString() << endl;
-
-  // test all message types
-  SMSSubmitMessage *subsms = new SMSSubmitMessage();
-  subsms->setUserData("This is a submit message, isn't it?");
-  sms = subsms;
-  pdu = sms->encode();
-  sms = SMSMessage::decode(pdu, false);
-  cout << sms->toString() << endl;
-  
-  // test all message types
-  sms = new SMSSubmitReportMessage();
-  pdu = sms->encode();
-  sms = SMSMessage::decode(pdu);
-  cout << sms->toString() << endl;
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testsms2.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testsms2.cc
deleted file mode 100644
index cb9b395a86..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testsms2.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#ifdef WIN32
-#include <gsmlib/gsm_win32_serial.h>
-#else
-#include <gsmlib/gsm_unix_serial.h>
-#endif
-#include <gsmlib/gsm_me_ta.h>
-#include <gsmlib/gsm_phonebook.h>
-#include <algorithm>
-#include <strstream>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    cout << (string)"Opening device " + argv[1] << endl;
-#ifdef WIN32
-    Ref<Port> port = new Win32SerialPort((string)argv[1], 38400);
-#else
-	Ref<Port> port = new UnixSerialPort((string)argv[1], B38400);
-#endif
-
-    cout << "Creating MeTa object" << endl;
-    MeTa m(port);
-
-    cout << "Setting message service level to 1" << endl;
-    m.setMessageService(1);
-
-    vector<string> storeList = m.getSMSStoreNames();
-
-    for (vector<string>::iterator stn = storeList.begin();
-         stn != storeList.end(); ++stn)
-    {
-      cout << "Getting store \"" << *stn << "\"" << endl;
-      SMSStoreRef st = m.getSMSStore(*stn);
-
-      SMSMessageRef sms;
-      cout << "Creating SMS Submit Message and putting it into store" << endl;
-      SMSSubmitMessage *subsms = new SMSSubmitMessage();
-//       Address scAddr("+491710760000");
-//       subsms->setServiceCentreAddress(scAddr);
-      Address destAddr("0177123456");
-      subsms->setDestinationAddress(destAddr);
-      subsms->setUserData("This message was sent from the store.");
-      TimePeriod tp;
-      tp._format = TimePeriod::Relative;
-      tp._relativeTime = 100;
-      /*subsms->setValidityPeriod(tp);
-      subsms->setValidityPeriodFormat(tp._format);
-      subsms->setStatusReportRequest(true);*/
-      sms = subsms;
-      SMSStore::iterator smsIter = st->insert(st->end(), SMSStoreEntry(sms));
-      cout << "Message entered at index #"
-           << smsIter - st->begin() << endl;
-
-      //m.sendSMS(sms);
-      SMSMessageRef ackPdu;
-      int messageRef = smsIter->send(ackPdu);
-      cout << "Message reference: " << messageRef << endl
-           << "ACK PDU:" << endl
-           << (ackPdu.isnull() ? "no ack pdu" : ackPdu->toString())
-           << endl;
-
-      /*      cout << "Erasing all unsent messages" << endl;
-      for (SMSStore::iterator s = st->begin(); s != st->end(); ++s)
-        if (! s->empty() && s->status() == SMSStoreEntry::StoredUnsent)
-        st->erase(s);*/
-
-      cout << "Printing store \"" << *stn << "\"" << endl;
-      for (SMSStore::iterator s = st->begin(); s != st->end(); ++s)
-        if (! s->empty())
-          cout << s->message()->toString();
-
-      break;                    // only do one store
-    }
-  }
-  catch (GsmException &ge)
-  {
-    cerr << "GsmException '" << ge.what() << "'" << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspb-output.txt b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspb-output.txt
deleted file mode 100644
index 83a56fa9f9..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspb-output.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Entries in pbs-copy.pb:
-  Text: Dieter Meier  Telephone: 793045
-  Text: Edgar Hofmann  Telephone: 42345
-  Text: Goethe  Telephone: 847159
-  Text: Hans Hofmann  Telephone: 12345
-  Text: Hans-Dieter Schmidt  Telephone: 82345
-  Text: Hans-Dieter Schmidt  Telephone: 13333345
-  Text: Heiner M�ller  Telephone: 7890
-  Text: line with |  Telephone: 0815
-  Text: line with\  Telephone: 0815
-  Text: One line
back to start  Telephone: 0815
-  Text: two
-line  Telephone: 0815
-Removing entries with telephone == 0815
-Entries in pbs-copy.pb<2>:
-  Text: Hans Hofmann  Telephone: 12345
-  Text: Hans-Dieter Schmidt  Telephone: 13333345
-  Text: Edgar Hofmann  Telephone: 42345
-  Text: Heiner M�ller  Telephone: 7890
-  Text: Dieter Meier  Telephone: 793045
-  Text: Hans-Dieter Schmidt  Telephone: 82345
-  Text: Goethe  Telephone: 847159
-Inserting some entries
-Entries in pbs-copy.pb<3>:
-  Text: Dieter Meier  Telephone: 793045
-  Text: Edgar Hofmann  Telephone: 42345
-  Text: Goethe  Telephone: 847159
-  Text: Hans Hofmann  Telephone: 12345
-  Text: Hans-Dieter Schmidt  Telephone: 13333345
-  Text: Hans-Dieter Schmidt  Telephone: 41598254
-  Text: Hans-Dieter Schmidt  Telephone: 82345
-  Text: Hans-Dieter|Hofmann  Telephone: 34058
-  Text: Heiner M�ller  Telephone: 7890
-  Text: new line with 
 continued  Telephone: 08152
-Erasing all Hans-Dieter Schmidt entries
-About to erase:
-  Text: Hans-Dieter Schmidt  Telephone: 13333345
-  Text: Hans-Dieter Schmidt  Telephone: 41598254
-  Text: Hans-Dieter Schmidt  Telephone: 82345
-Writing back to file
-|Dieter Meier|793045
-|Edgar Hofmann|42345
-|Goethe|847159
-|Hans Hofmann|12345
-|Hans-Dieter\|Hofmann|34058
-|Heiner M�ller|7890
-|new line with \r continued|08152
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspb.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspb.cc
deleted file mode 100644
index 43b9f512db..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspb.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include <gsm_config.h>
-#endif
-#include <gsmlib/gsm_sorted_phonebook.h>
-#include <algorithm>
-#include <strstream>
-#include <iostream>
-
-using namespace std;
-using namespace gsmlib;
-
-void printPb(PhonebookEntry &e)
-{
-  cout << "number: " << e.telephone()
-       << " text: " << e.text() << endl;
-}
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    // open phonebook file
-    SortedPhonebook pb((string)"spb-copy.pb", false);
-    
-    // print all entries
-    cout << "Entries in pbs-copy.pb:" << endl;
-    for (SortedPhonebook::iterator i = pb.begin(); i != pb.end(); ++i)
-      cout << "  Text: " << i->text()
-           << "  Telephone: " << i->telephone() << endl;
-
-    // remove all entries with telephone == "0815"
-    cout << "Removing entries with telephone == 0815" << endl;
-    pb.setSortOrder(ByTelephone);
-
-    string s = "0815";
-    pb.erase(s);
-
-    cout << "Entries in pbs-copy.pb<2>:" << endl;
-    for (SortedPhonebook::iterator i = pb.begin(); i != pb.end(); ++i)
-      cout << "  Text: " << i->text()
-           << "  Telephone: " << i->telephone() << endl;
-
-    // insert some entries
-    cout << "Inserting some entries" << endl;
-    pb.insert(PhonebookEntryBase("08152", "new line with \r continued"));
-    pb.insert(PhonebookEntryBase("41598254", "Hans-Dieter Schmidt"));
-    pb.insert(PhonebookEntryBase("34058", "Hans-Dieter|Hofmann"));
-
-    pb.setSortOrder(ByText);
-    cout << "Entries in pbs-copy.pb<3>:" << endl;
-    for (SortedPhonebook::iterator i = pb.begin(); i != pb.end(); ++i)
-      cout << "  Text: " << i->text()
-           << "  Telephone: " << i->telephone() << endl;
-
-    // test erasing all "Hans-Dieter Schmidt" entries
-    cout << "Erasing all Hans-Dieter Schmidt entries" << endl;
-    s = "Hans-Dieter Schmidt";
-    pair<SortedPhonebook::iterator, SortedPhonebook::iterator> range =
-      pb.equal_range(s);
-    cout << "About to erase:" << endl;
-    for (SortedPhonebook::iterator i = range.first; i != range.second; ++i)
-      cout << "  Text: " << i->text()
-           << "  Telephone: " << i->telephone() << endl;
-    
-    pb.erase(range.first, range.second);
-
-    // write back to file
-    cout << "Writing back to file" << endl;
-    pb.sync();
-
-    // tests the NoCopy class
-    //SortedPhonebook pb2("spb.pb");
-    //pb2 = pb;
-  }
-  catch (GsmException &ge)
-  {
-    cerr << "GsmException '" << ge.what() << "'" << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspb2-output.txt b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspb2-output.txt
deleted file mode 100644
index 60e54ba669..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspb2-output.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Entries in pbs-copy.pb:
-  Text: Dieter Meier  Telephone: 017793045
-  Text: Edgar Hofmann  Telephone: +4942345
-  Text: Goethe  Telephone: 847159
-  Text: Hans Hofmann  Telephone: 0171
-  Text: Hans-Dieter Schmidt  Telephone: 82345
-  Text: Hans-Dieter Schmidt  Telephone: 13333345
-  Text: Heiner M�ller  Telephone: 7890
-  Text: line with |  Telephone: 0815
-  Text: line with\  Telephone: 0815
-  Text: One line
back to start  Telephone: 0815
-  Text: two
-line  Telephone: 0815
-Removing entries with telephone == 0815
-Entries in pbs-copy.pb<2>:
-  Text: Edgar Hofmann  Telephone: +4942345
-  Text: Hans Hofmann  Telephone: 0171
-  Text: Dieter Meier  Telephone: 017793045
-  Text: Hans-Dieter Schmidt  Telephone: 13333345
-  Text: Heiner M�ller  Telephone: 7890
-  Text: Hans-Dieter Schmidt  Telephone: 82345
-  Text: Goethe  Telephone: 847159
-Inserting some entries
-Entries in pbs-copy.pb<3>:
-  Text: Dieter Meier  Telephone: 017793045
-  Text: Edgar Hofmann  Telephone: +4942345
-  Text: Goethe  Telephone: 847159
-  Text: Hans Hofmann  Telephone: 0171
-  Text: Hans-Dieter Schmidt  Telephone: 13333345
-  Text: Hans-Dieter Schmidt  Telephone: 41598254
-  Text: Hans-Dieter Schmidt  Telephone: 82345
-  Text: Hans-Dieter|Hofmann  Telephone: 34058
-  Text: Heiner M�ller  Telephone: 7890
-  Text: new line with 
 continued  Telephone: 08152
-Erasing all Hans-Dieter Schmidt entries
-About to erase:
-  Text: Hans-Dieter Schmidt  Telephone: 13333345
-  Text: Hans-Dieter Schmidt  Telephone: 41598254
-  Text: Hans-Dieter Schmidt  Telephone: 82345
-Writing back to file
-|Dieter Meier|017793045
-|Edgar Hofmann|+4942345
-|Goethe|847159
-|Hans Hofmann|0171
-|Hans-Dieter\|Hofmann|34058
-|Heiner M�ller|7890
-|new line with \r continued|08152
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspbi-output.txt b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspbi-output.txt
deleted file mode 100644
index e4a33e2fa6..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testspbi-output.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-updating 'same name' tel# 23456 to new tel# 12345(index 5)
-deleting 'Nummer 3' tel# 3333333 (index #2)
-deleting 'Nummer 4' tel# 4444444 (index #4)
-inserting 'Nummer 4' tel# 4444444 (index #1)
-inserting 'Nummer 3' tel# 3333333 (index #3)
-1|Nummer 4|4444444
-3|Nummer 3|3333333
-5|same name|12345
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testssms-output.txt b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testssms-output.txt
deleted file mode 100644
index a0e7905939..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testssms-output.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-Entries in sms.sms<0>:
-Inserting some entries
-Entries in sms.sms<1>:
-Entry#2:
----------------------------------------------------------------------------
-Message type: SMS-SUBMIT
-SC address: ''
-Reject duplicates: 1
-Validity period format: relative
-Reply path: 0
-User data header indicator: 0
-Status report request: 0
-Message reference: 0
-Destination address: '0177123456'
-Protocol identifier: 0x0
-Data coding scheme: default alphabet
-Validity period: 2 days
-User data length: 9
-User data header: 0x
-User data: 'submit me'
----------------------------------------------------------------------------
-
-
-Entry#3:
----------------------------------------------------------------------------
-Message type: SMS-SUBMIT
-SC address: ''
-Reject duplicates: 1
-Validity period format: relative
-Reply path: 0
-User data header indicator: 0
-Status report request: 0
-Message reference: 0
-Destination address: ''
-Protocol identifier: 0x0
-Data coding scheme: default alphabet
-Validity period: 2 days
-User data length: 35
-User data header: 0x
-User data: 'This is a submit message, isn't it?'
----------------------------------------------------------------------------
-
-
-Entry#1:
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: '491710762100'
-More messages to send: 1
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: '01805000102'
-Protocol identifier: 0x39
-Data coding scheme: default alphabet
-SC timestamp: 12/17/1998 02:10:55 PM (+0100)
-User data length: 159
-User data header: 0x
-User data: 'Nicht vergessen! Die XtraWeihnachtsverlosung l�uft noch bis zum 24.12. Nutzen Sie jetzt Ihre Gewinnchance und faxen Sie Ihren Teiln.-Gutschein an 0180/5000 056'
----------------------------------------------------------------------------
-
-
-Entry#0:
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: '491710762100'
-More messages to send: 1
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: '171'
-Protocol identifier: 0x39
-Data coding scheme: default alphabet
-SC timestamp: 04/16/1999 08:09:44 AM (+0200)
-User data length: 160
-User data header: 0x
-User data: 'T-D1 News bis 31.05.99 kostenlos testen! �ber 90 Programme aus Politik, Wirtschaft, B�rse, Sport direkt per SMS aufs Handy. Mehr dar�ber unter der Kurzwahl 2323'
----------------------------------------------------------------------------
-
-
-Entries in sms.sms<2>:
-Entry#3:
----------------------------------------------------------------------------
-Message type: SMS-SUBMIT
-SC address: ''
-Reject duplicates: 1
-Validity period format: relative
-Reply path: 0
-User data header indicator: 0
-Status report request: 0
-Message reference: 0
-Destination address: ''
-Protocol identifier: 0x0
-Data coding scheme: default alphabet
-Validity period: 2 days
-User data length: 35
-User data header: 0x
-User data: 'This is a submit message, isn't it?'
----------------------------------------------------------------------------
-
-
-Entry#2:
----------------------------------------------------------------------------
-Message type: SMS-SUBMIT
-SC address: ''
-Reject duplicates: 1
-Validity period format: relative
-Reply path: 0
-User data header indicator: 0
-Status report request: 0
-Message reference: 0
-Destination address: '0177123456'
-Protocol identifier: 0x0
-Data coding scheme: default alphabet
-Validity period: 2 days
-User data length: 9
-User data header: 0x
-User data: 'submit me'
----------------------------------------------------------------------------
-
-
-Entry#1:
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: '491710762100'
-More messages to send: 1
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: '01805000102'
-Protocol identifier: 0x39
-Data coding scheme: default alphabet
-SC timestamp: 12/17/1998 02:10:55 PM (+0100)
-User data length: 159
-User data header: 0x
-User data: 'Nicht vergessen! Die XtraWeihnachtsverlosung l�uft noch bis zum 24.12. Nutzen Sie jetzt Ihre Gewinnchance und faxen Sie Ihren Teiln.-Gutschein an 0180/5000 056'
----------------------------------------------------------------------------
-
-
-Entry#0:
----------------------------------------------------------------------------
-Message type: SMS-DELIVER
-SC address: '491710762100'
-More messages to send: 1
-Reply path: 0
-User data header indicator: 0
-Status report indication: 0
-Originating address: '171'
-Protocol identifier: 0x39
-Data coding scheme: default alphabet
-SC timestamp: 04/16/1999 08:09:44 AM (+0200)
-User data length: 160
-User data header: 0x
-User data: 'T-D1 News bis 31.05.99 kostenlos testen! �ber 90 Programme aus Politik, Wirtschaft, B�rse, Sport direkt per SMS aufs Handy. Mehr dar�ber unter der Kurzwahl 2323'
----------------------------------------------------------------------------
-
-
-Writing back to file
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testssms.cc b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testssms.cc
deleted file mode 100644
index 4c30bd544f..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/tests/testssms.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <gsmlib/gsm_unix_serial.h>
-#include <gsmlib/gsm_sorted_sms_store.h>
-#include <gsmlib/gsm_phonebook.h>
-#include <algorithm>
-#include <iostream>
-#include <strstream>
-
-using namespace std;
-using namespace gsmlib;
-
-int main(int argc, char *argv[])
-{
-  try
-  {
-    // open SMS store file
-    SortedSMSStore sms((string)"sms.sms");
-    
-    // print all entries
-    cout << "Entries in sms.sms<0>:" << endl;
-    for (SortedSMSStore::iterator i = sms.begin(); i != sms.end(); ++i)
-      cout << "Entry#" << i->index() << ":" << endl
-           << i->message()->toString() << endl;
-
-    // insert some entries
-    cout << "Inserting some entries" << endl;
-    SMSMessageRef smsMessage;
-    // test two SMS message I have received
-    smsMessage = SMSMessage::decode("079194710167120004038571F1390099406180904480A0D41631067296EF7390383D07CD622E58CD95CB81D6EF39BDEC66BFE7207A794E2FBB4320AFB82C07E56020A8FC7D9687DBED32285C9F83A06F769A9E5EB340D7B49C3E1FA3C3663A0B24E4CBE76516680A7FCBE920725A5E5ED341F0B21C346D4E41E1BA790E4286DDE4BC0BD42CA3E5207258EE1797E5A0BA9B5E9683C86539685997EBEF61341B249BC966");
-    sms.insert(SMSStoreEntry(smsMessage));
-
-    smsMessage = SMSMessage::decode("0791947101671200040B851008050001F23900892171410155409FCEF4184D07D9CBF273793E2FBB432062BA0CC2D2E5E16B398D7687C768FADC5E96B3DFF3BAFB0C62EFEB663AC8FD1EA341E2F41CA4AFB741329A2B2673819C75BABEEC064DD36590BA4CD7D34149B4BC0C3A96EF69B77B8C0EBBC76550DD4D0699C3F8B21B344D974149B4BCEC0651CB69B6DBD53AD6E9F331BA9C7683C26E102C8683BD6A30180C04ABD900");
-    sms.insert(SMSStoreEntry(smsMessage));
-
-    smsMessage = new SMSSubmitMessage("submit me", "0177123456");
-    sms.insert(SMSStoreEntry(smsMessage));
-
-    SMSSubmitMessage *subsms = new SMSSubmitMessage();
-    subsms->setUserData("This is a submit message, isn't it?");
-    smsMessage = subsms;
-    sms.insert(SMSStoreEntry(smsMessage));
-
-    // print all entries
-    cout << "Entries in sms.sms<1>:" << endl;
-    for (SortedSMSStore::iterator i = sms.begin(); i != sms.end(); ++i)
-      cout << "Entry#" << i->index() << ":" << endl
-           << i->message()->toString() << endl;
-
-    // sort by telephone number
-    sms.setSortOrder(ByAddress);
-
-    // print all entries
-    cout << "Entries in sms.sms<2>:" << endl;
-    for (SortedSMSStore::iterator i = sms.begin(); i != sms.end(); ++i)
-      cout << "Entry#" << i->index() << ":" << endl
-           << i->message()->toString() << endl;
-
-    // write back to file
-    cout << "Writing back to file" << endl;
-    sms.sync();
-
-  }
-  catch (GsmException &ge)
-  {
-    cerr << "GsmException '" << ge.what() << "'" << endl;
-    return 1;
-  }
-  return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/COPYING b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/COPYING
deleted file mode 100644
index 78e994dd75..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/COPYING
+++ /dev/null
@@ -1,5 +0,0 @@
-WARNING
-
-     The files getopt.c and getopt.h in this subdirectory (win32) are
-     not covered by the GNU LIBRARY GENERAL PUBLIC LICENSE as
-     reproduced in ../COPYING. They carry their own license instead.
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/Makefile.am b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/Makefile.am
deleted file mode 100644
index a666fabf31..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: win32 Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 19.1.2001
-# *************************************************************************
-
-EXTRA_DIST =	getopt.c gsmctl.dsp gsmpb.dsp testgsmlib.dsp \
-		getopt.h gsmlib.dsp gsmsendsms.dsp testsms.dsp \
-		README.win gsm_config.h gsmlib.dsw gsmsmsstore.dsp \
-		gsmsmsd.dsp testsms2.dsp
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/Makefile.in b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/Makefile.in
deleted file mode 100644
index 4117eea211..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/Makefile.in
+++ /dev/null
@@ -1,259 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# *************************************************************************
-# * GSM TA/ME library
-# *
-# * File:    Makefile.am
-# *
-# * Purpose: win32 Makefile
-# *
-# * Author:  Peter Hofmann (software@pxh.de)
-# *
-# * Created: 19.1.2001
-# *************************************************************************
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AS = @AS@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-DATADIRNAME = @DATADIRNAME@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GSM_VERSION = @GSM_VERSION@
-HAVE_LIB = @HAVE_LIB@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIB = @LIB@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-
-EXTRA_DIST = getopt.c gsmctl.dsp gsmpb.dsp testgsmlib.dsp \
-		getopt.h gsmlib.dsp gsmsendsms.dsp testsms.dsp \
-		README.win gsm_config.h gsmlib.dsw gsmsmsstore.dsp \
-		gsmsmsd.dsp testsms2.dsp
-
-subdir = win32
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/gsm_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = COPYING Makefile.am Makefile.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  win32/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool uninstall uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/README.win b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/README.win
deleted file mode 100644
index 17aa648dd1..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/README.win
+++ /dev/null
@@ -1,41 +0,0 @@
-INTRODUCTION
-
-     This is a Win32 port of gsmlib contributed by Frediano Ziglio
-     (Frediano.Ziglio@omnitel.it) and adapted by me. You can use the
-     library for inclusion in your own programs or the command line tools
-     which have been ported (with the exception of gsmsmsd).
-
-COMPILATION
-
-     You need Microsoft VC++ 6.0 to compile the library and command
-     line tools. Because I prefer to use the ending .cc for C++ files you
-     need to make some changes to your development environment. These are
-     documented by Microsoft under this URL (one line):
-
-       http://support.microsoft.com/support/kb/articles/Q181/5/
-       06.ASP?LN=EN-US&SD=gn&FR=0&qry=.cc&rnk=1&src=DHCS_MSPSS_gn_SRCH&SPR=VCC
-
-     The title of the document is "HOWTO: Make VC++ Recognize File
-     Extensions as C/C++ Files".
-
-     Then open the workspace gsmlib.dsw with Developer
-     Studio. Compilation should be straightforward after that, just make a
-     batch build of everything.
-
-     If you encounter problems you can use the debug versions and set
-     the environment variable GSMLIB_DEBUG to 1 or 2 to get debugging
-     output.
-
-HINTS
-     - Use COMx: (x is the number of the COM device) instead of the UNIX
-       device name. If this doesn't work use "\\.\COMx:".
-
-     - The files under Release are without debugging code. If you see
-       errors please use the Debug versions and execute
-
-         set GSMLIB_DEBUG=2
-
-       for executing the programs. Please send me the debugging
-       output:
-
-         gsmsmsstore ..... 2> \temp\debug.log
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/getopt.c b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/getopt.c
deleted file mode 100644
index 45fcedc063..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/getopt.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/***************************************************************************** 
- * 
- *  MODULE NAME : GETOPT.C 
- * 
- *  COPYRIGHTS: 
- *             This module contains code made available by IBM 
- *             Corporation on an AS IS basis.  Any one receiving the 
- *             module is considered to be licensed under IBM copyrights 
- *             to use the IBM-provided source code in any way he or she 
- *             deems fit, including copying it, compiling it, modifying 
- *             it, and redistributing it, with or without 
- *             modifications.  No license under any IBM patents or 
- *             patent applications is to be implied from this copyright 
- *             license. 
- * 
- *             A user of the module should understand that IBM cannot 
- *             provide technical support for the module and will not be 
- *             responsible for any consequences of use of the program. 
- * 
- *             Any notices, including this one, are not to be removed 
- *             from the module without the prior written consent of 
- *             IBM. 
- * 
- *  AUTHOR:   Original author: 
- *                 G. R. Blair (BOBBLAIR at AUSVM1) 
- *                 Internet: bobblair@bobblair.austin.ibm.com 
- * 
- *            Extensively revised by: 
- *                 John Q. Walker II, Ph.D. (JOHHQ at RALVM6) 
- *                 Internet: johnq@ralvm6.vnet.ibm.com 
- * 
- *****************************************************************************/ 
- 
-/****************************************************************************** 
- * getopt() 
- * 
- * The getopt() function is a command line parser.  It returns the next 
- * option character in argv that matches an option character in opstring. 
- * 
- * The argv argument points to an array of argc+1 elements containing argc 
- * pointers to character strings followed by a null pointer. 
- * 
- * The opstring argument points to a string of option characters; if an 
- * option character is followed by a colon, the option is expected to have 
- * an argument that may or may not be separated from it by white space. 
- * The external variable optarg is set to point to the start of the option 
- * argument on return from getopt(). 
- * 
- * The getopt() function places in optind the argv index of the next argument 
- * to be processed.  The system initializes the external variable optind to 
- * 1 before the first call to getopt(). 
- * 
- * When all options have been processed (that is, up to the first nonoption 
- * argument), getopt() returns EOF.  The special option "--" may be used to 
- * delimit the end of the options; EOF will be returned, and "--" will be 
- * skipped. 
- * 
- * The getopt() function returns a question mark (?) when it encounters an 
- * option character not included in opstring.  This error message can be 
- * disabled by setting opterr to zero.  Otherwise, it returns the option 
- * character that was detected. 
- * 
- * If the special option "--" is detected, or all options have been 
- * processed, EOF is returned. 
- * 
- * Options are marked by either a minus sign (-) or a slash (/). 
- * 
- * No errors are defined. 
- *****************************************************************************/ 
- 
-#include <stdio.h>                  /* for EOF */ 
-#include <string.h>                 /* for strchr() */ 
- 
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* static (global) variables that are specified as exported by getopt() */ 
-char *optarg = NULL;    /* pointer to the start of the option argument  */ 
-int   optind = 1;       /* number of the next argv[] to be evaluated    */ 
-int   opterr = 1;       /* non-zero if a question mark should be returned 
-                           when a non-valid option character is detected */ 
- 
-/* handle possible future character set concerns by putting this in a macro */ 
-#define _next_char(string)  (char)(*(string+1)) 
- 
-int getopt(int argc, char *argv[], char *opstring) 
-{ 
-  static char *pIndexPosition = NULL; /* place inside current argv string */ 
-  char *pArgString = NULL;        /* where to start from next */ 
-  char *pOptString;               /* the string in our program */ 
- 
- 
-  if (pIndexPosition != NULL) { 
-    /* we last left off inside an argv string */ 
-    if (*(++pIndexPosition)) { 
-      /* there is more to come in the most recent argv */ 
-      pArgString = pIndexPosition; 
-    } 
-  } 
- 
-  if (pArgString == NULL) { 
-    /* we didn't leave off in the middle of an argv string */ 
-    if (optind >= argc) { 
-      /* more command-line arguments than the argument count */ 
-      pIndexPosition = NULL;  /* not in the middle of anything */ 
-      return EOF;             /* used up all command-line arguments */ 
-    } 
- 
-    /*--------------------------------------------------------------------- 
-     * If the next argv[] is not an option, there can be no more options. 
-     *-------------------------------------------------------------------*/ 
-    pArgString = argv[optind++]; /* set this to the next argument ptr */ 
- 
-    if (('/' != *pArgString) && /* doesn't start with a slash or a dash? */ 
-        ('-' != *pArgString)) { 
-      --optind;               /* point to current arg once we're done */ 
-      optarg = NULL;          /* no argument follows the option */ 
-      pIndexPosition = NULL;  /* not in the middle of anything */ 
-      return EOF;             /* used up all the command-line flags */ 
-    } 
- 
-    /* check for special end-of-flags markers */ 
-    if ((strcmp(pArgString, "-") == 0) || 
-        (strcmp(pArgString, "--") == 0)) { 
-      optarg = NULL;          /* no argument follows the option */ 
-      pIndexPosition = NULL;  /* not in the middle of anything */ 
-      return EOF;             /* encountered the special flag */ 
-    } 
- 
-    pArgString++;               /* look past the / or - */ 
-  } 
- 
-  if (':' == *pArgString) {       /* is it a colon? */ 
-    /*--------------------------------------------------------------------- 
-     * Rare case: if opterr is non-zero, return a question mark; 
-     * otherwise, just return the colon we're on. 
-     *-------------------------------------------------------------------*/ 
-    return (opterr ? (int)'?' : (int)':'); 
-  } 
-  else if ((pOptString = strchr(opstring, *pArgString)) == 0) { 
-    /*--------------------------------------------------------------------- 
-     * The letter on the command-line wasn't any good. 
-     *-------------------------------------------------------------------*/ 
-    optarg = NULL;              /* no argument follows the option */ 
-    pIndexPosition = NULL;      /* not in the middle of anything */ 
-    return (opterr ? (int)'?' : (int)*pArgString); 
-  } 
-  else { 
-    /*--------------------------------------------------------------------- 
-     * The letter on the command-line matches one we expect to see 
-     *-------------------------------------------------------------------*/ 
-    if (':' == _next_char(pOptString)) { /* is the next letter a colon? */ 
-      /* It is a colon.  Look for an argument string. */ 
-      if ('\0' != _next_char(pArgString)) {  /* argument in this argv? */ 
-        optarg = &pArgString[1];   /* Yes, it is */ 
-      } 
-      else { 
-        /*------------------------------------------------------------- 
-         * The argument string must be in the next argv. 
-         * But, what if there is none (bad input from the user)? 
-         * In that case, return the letter, and optarg as NULL. 
-         *-----------------------------------------------------------*/ 
-        if (optind < argc) 
-          optarg = argv[optind++]; 
-        else { 
-          optarg = NULL; 
-          return (opterr ? (int)'?' : (int)*pArgString); 
-        } 
-      } 
-      pIndexPosition = NULL;  /* not in the middle of anything */ 
-    } 
-    else { 
-      /* it's not a colon, so just return the letter */ 
-      optarg = NULL;          /* no argument follows the option */ 
-      pIndexPosition = pArgString;    /* point to the letter we're on */ 
-    } 
-    return (int)*pArgString;    /* return the letter that matched */ 
-  } 
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/getopt.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/getopt.h
deleted file mode 100644
index f7446f1c50..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/getopt.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************** 
- * 
- *  MODULE NAME : GETOPT.H 
- * 
- *  COPYRIGHTS: 
- *             This module contains code made available by IBM 
- *             Corporation on an AS IS basis.  Any one receiving the 
- *             module is considered to be licensed under IBM copyrights 
- *             to use the IBM-provided source code in any way he or she 
- *             deems fit, including copying it, compiling it, modifying 
- *             it, and redistributing it, with or without 
- *             modifications.  No license under any IBM patents or 
- *             patent applications is to be implied from this copyright 
- *             license. 
- * 
- *             A user of the module should understand that IBM cannot 
- *             provide technical support for the module and will not be 
- *             responsible for any consequences of use of the program. 
- * 
- *             Any notices, including this one, are not to be removed 
- *             from the module without the prior written consent of 
- *             IBM. 
- * 
- *  AUTHOR:   Original author: 
- *                 G. R. Blair (BOBBLAIR at AUSVM1) 
- *                 Internet: bobblair@bobblair.austin.ibm.com 
- * 
- *            Extensively revised by: 
- *                 John Q. Walker II, Ph.D. (JOHHQ at RALVM6) 
- *                 Internet: johnq@ralvm6.vnet.ibm.com 
- * 
- *****************************************************************************/ 
-#ifndef WIN32_GETOPT_H
-#define WIN32_GETOPT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern char * optarg; 
-extern int    optind; 
- 
-int getopt ( int argc, char **argv, char *optstring); 
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif // WIN32_GETOPT_H
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsm_config.h b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsm_config.h
deleted file mode 100755
index 258d4fed52..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsm_config.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* gsm_config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-#define alloca _alloca // Microsoft
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* used by libtool*/
-#define PACKAGE 0
-
-/* used by libtool*/
-#define VERSION 0
-
-/* Define if getopt_long() available */
-#undef HAVE_GETOPT_LONG
-
-/* Define if alarm() available */
-#undef HAVE_ALARM
-
-/* Define for NLS */
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-
-/* Define LOCALEDIR */
-#define LOCALEDIR "/usr/share/locale"
-
-/* Define if vsnprintf() function available */
-#define HAVE_VSNPRINTF 1
-#ifndef WIN32
-#define vsnprintf _vsnprintf
-#endif// WIN32
-
-/* The number of bytes in a unsigned int.  */
-#define SIZEOF_UNSIGNED_INT 4
-
-/* The number of bytes in a unsigned long int.  */
-#define SIZEOF_UNSIGNED_LONG_INT 4
-
-/* The number of bytes in a unsigned short int.  */
-#define SIZEOF_UNSIGNED_SHORT_INT 2
-
-/* Define if you have the __argz_count function.  */
-#undef HAVE___ARGZ_COUNT
-
-/* Define if you have the __argz_next function.  */
-#undef HAVE___ARGZ_NEXT
-
-/* Define if you have the __argz_stringify function.  */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define if you have the dcgettext function.  */
-#undef HAVE_DCGETTEXT
-
-/* Define if you have the getcwd function.  */
-#undef HAVE_GETCWD
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the munmap function.  */
-#undef HAVE_MUNMAP
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the setenv function.  */
-#undef HAVE_SETENV
-
-/* Define if you have the setlocale function.  */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
-#define strcasecmp _strcmpi
-
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
-
-/* Define if you have the <argz.h> header file.  */
-#undef HAVE_ARGZ_H
-
-/* Define if you have the <libintl.h> header file.  */
-#undef HAVE_LIBINTL_H
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the <malloc.h> header file.  */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the <netinet/in.h> header file.  */
-#undef HAVE_NETINET_IN_H
-
-/* Define if you have the <nl_types.h> header file.  */
-#undef HAVE_NL_TYPES_H
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the i library (-li).  */
-#undef HAVE_LIBI
-
-/* Define if you have the intl library (-lintl).  */
-#undef HAVE_LIBINTL
-
-// WIN32 specific defines
-#pragma warning( disable : 4786 )  // Disable warning messages
-                                   // 4786 (id too long)
-
-// Win32 strftime() does not return length of output when passing
-// NULL pointer
-#define BROKEN_STRFTIME
-// Win32 STL erase() for maps makes iterators invalid
-#define BUGGY_MAP_ERASE
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmctl.dsp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmctl.dsp
deleted file mode 100644
index b48a1c54db..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmctl.dsp
+++ /dev/null
@@ -1,118 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gsmctl" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gsmctl - Win32 Debug
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmctl.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmctl.mak" CFG="gsmctl - Win32 Debug"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "gsmctl - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE "gsmctl - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gsmctl - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /TP /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "gsmctl - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gsmctl - Win32 Release"
-# Name "gsmctl - Win32 Debug"
-# Begin Group "Quellcodedateien"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-
-!IF  "$(CFG)" == "gsmctl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gsmctl - Win32 Debug"
-
-# ADD CPP /Od
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\apps\gsmctl.cc
-# End Source File
-# End Group
-# Begin Group "Header-Dateien"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\getopt.h
-# End Source File
-# End Group
-# Begin Group "Ressourcendateien"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2017.vcxproj b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2017.vcxproj
deleted file mode 100644
index 83fa970270..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2017.vcxproj
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>gsmlib</ProjectName>
-    <ProjectGuid>{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../vcproject;..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\Release/gsmlib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalOptions>/wd4290 /wd4996 %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>4838;4267;4101;4244;4554;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/wd4290 /wd4996 %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>4838;4267;4101;4244;4554;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../vcproject;..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalOptions>/wd4290 /wd4996 %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>4838;4267;4101;4244;4554;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/wd4290 /wd4996 %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>4838;4267;4101;4244;4554;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\gsmlib\gsm_at.cc" />
-    <ClCompile Include="..\gsmlib\gsm_cb.cc" />
-    <ClCompile Include="..\gsmlib\gsm_error.cc" />
-    <ClCompile Include="..\gsmlib\gsm_event.cc" />
-    <ClCompile Include="..\gsmlib\gsm_me_ta.cc" />
-    <ClCompile Include="..\gsmlib\gsm_nls.cc" />
-    <ClCompile Include="..\gsmlib\gsm_parser.cc" />
-    <ClCompile Include="..\gsmlib\gsm_phonebook.cc" />
-    <ClCompile Include="..\gsmlib\gsm_sms.cc" />
-    <ClCompile Include="..\gsmlib\gsm_sms_codec.cc" />
-    <ClCompile Include="..\gsmlib\gsm_sms_store.cc" />
-    <ClCompile Include="..\gsmlib\gsm_sorted_phonebook.cc" />
-    <ClCompile Include="..\gsmlib\gsm_sorted_phonebook_base.cc" />
-    <ClCompile Include="..\gsmlib\gsm_sorted_sms_store.cc" />
-    <ClCompile Include="..\gsmlib\gsm_util.cc" />
-    <ClCompile Include="..\gsmlib\gsm_win32_serial.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\gsmlib\gsm_at.h" />
-    <ClInclude Include="..\gsmlib\gsm_cb.h" />
-    <ClInclude Include="..\gsmlib\gsm_error.h" />
-    <ClInclude Include="..\gsmlib\gsm_event.h" />
-    <ClInclude Include="..\gsmlib\gsm_map_key.h" />
-    <ClInclude Include="..\gsmlib\gsm_me_ta.h" />
-    <ClInclude Include="..\gsmlib\gsm_nls.h" />
-    <ClInclude Include="..\gsmlib\gsm_parser.h" />
-    <ClInclude Include="..\gsmlib\gsm_phonebook.h" />
-    <ClInclude Include="..\gsmlib\gsm_port.h" />
-    <ClInclude Include="..\gsmlib\gsm_sms.h" />
-    <ClInclude Include="..\gsmlib\gsm_sms_codec.h" />
-    <ClInclude Include="..\gsmlib\gsm_sms_store.h" />
-    <ClInclude Include="..\gsmlib\gsm_sorted_phonebook.h" />
-    <ClInclude Include="..\gsmlib\gsm_sorted_phonebook_base.h" />
-    <ClInclude Include="..\gsmlib\gsm_sorted_sms_store.h" />
-    <ClInclude Include="..\gsmlib\gsm_sysdep.h" />
-    <ClInclude Include="..\gsmlib\gsm_util.h" />
-    <ClInclude Include="..\gsmlib\gsm_win32_serial.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.dsp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.dsp
deleted file mode 100644
index ace489a252..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.dsp
+++ /dev/null
@@ -1,232 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gsmlib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=gsmlib - Win32 Debug
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmlib.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmlib.mak" CFG="gsmlib - Win32 Debug"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "gsmlib - Win32 Release" (basierend auf  "Win32 (x86) Static Library")
-!MESSAGE "gsmlib - Win32 Debug" (basierend auf  "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gsmlib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GR /GX /O2 /I "../vcproject" /I ".." /I "." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /FR /YX /FD /TP /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "gsmlib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I ".." /I "." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gsmlib - Win32 Release"
-# Name "gsmlib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;cc;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_at.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_error.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_cb.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_event.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_me_ta.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_nls.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_parser.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_phonebook.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sms.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sms_codec.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sms_store.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sorted_phonebook.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sorted_phonebook_base.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sorted_sms_store.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_util.cc
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_win32_serial.cc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_at.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_cb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_error.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_event.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_map_key.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_me_ta.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_nls.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_parser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_phonebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_port.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sms.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sms_codec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sms_store.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sorted_phonebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sorted_phonebook_base.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sorted_sms_store.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_sysdep.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\gsmlib\gsm_win32_serial.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.dsw b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.dsw
deleted file mode 100644
index 21ab8168ac..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.dsw
+++ /dev/null
@@ -1,149 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GEL�SCHT WERDEN!
-
-###############################################################################
-
-Project: "gsmctl"=".\gsmctl.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gsmlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gsmlib"=".\gsmlib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "gsmpb"=".\gsmpb.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gsmlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gsmsendsms"=".\gsmsendsms.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gsmlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gsmsmsd"=".\gsmsmsd.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gsmlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gsmsmsstore"=".\gsmsmsstore.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gsmlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testgsmlib"=".\testgsmlib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gsmlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testsms"=".\testsms.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gsmlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testsms2"=".\testsms2.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gsmlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.sln b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.sln
deleted file mode 100755
index 928215c23d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.sln
+++ /dev/null
@@ -1,92 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmctl", "gsmctl.vcproj", "{A822BA57-6F96-4C69-9E28-C0FB2667B1B0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmlib", "gsmlib.vcproj", "{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmpb", "gsmpb.vcproj", "{311D5A85-4DC1-4714-9B61-AE3C57B67B5B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmsendsms", "gsmsendsms.vcproj", "{CF99664C-05D1-41A3-9B12-B79D55718377}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmsmsd", "gsmsmsd.vcproj", "{3C5D7948-5E49-4C78-9AAB-3AC53A15BEF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmsmsstore", "gsmsmsstore.vcproj", "{5A834BCC-8B96-4D1C-9811-ADC816797E3A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgsmlib", "testgsmlib.vcproj", "{248E3E22-2203-4352-964E-32946A1A0AEC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsms", "testsms.vcproj", "{BEE3EFDE-4C00-4CE5-9DFC-61DF6F0E5481}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsms2", "testsms2.vcproj", "{3E08AF8F-6DD3-40EC-AA97-C8D4237CA127}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A822BA57-6F96-4C69-9E28-C0FB2667B1B0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A822BA57-6F96-4C69-9E28-C0FB2667B1B0}.Debug|Win32.Build.0 = Debug|Win32
-		{A822BA57-6F96-4C69-9E28-C0FB2667B1B0}.Release|Win32.ActiveCfg = Release|Win32
-		{A822BA57-6F96-4C69-9E28-C0FB2667B1B0}.Release|Win32.Build.0 = Release|Win32
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|Win32.ActiveCfg = Debug|Win32
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|Win32.Build.0 = Debug|Win32
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|Win32.ActiveCfg = Release|Win32
-		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|Win32.Build.0 = Release|Win32
-		{311D5A85-4DC1-4714-9B61-AE3C57B67B5B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{311D5A85-4DC1-4714-9B61-AE3C57B67B5B}.Debug|Win32.Build.0 = Debug|Win32
-		{311D5A85-4DC1-4714-9B61-AE3C57B67B5B}.Release|Win32.ActiveCfg = Release|Win32
-		{311D5A85-4DC1-4714-9B61-AE3C57B67B5B}.Release|Win32.Build.0 = Release|Win32
-		{CF99664C-05D1-41A3-9B12-B79D55718377}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CF99664C-05D1-41A3-9B12-B79D55718377}.Debug|Win32.Build.0 = Debug|Win32
-		{CF99664C-05D1-41A3-9B12-B79D55718377}.Release|Win32.ActiveCfg = Release|Win32
-		{CF99664C-05D1-41A3-9B12-B79D55718377}.Release|Win32.Build.0 = Release|Win32
-		{3C5D7948-5E49-4C78-9AAB-3AC53A15BEF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3C5D7948-5E49-4C78-9AAB-3AC53A15BEF4}.Debug|Win32.Build.0 = Debug|Win32
-		{3C5D7948-5E49-4C78-9AAB-3AC53A15BEF4}.Release|Win32.ActiveCfg = Release|Win32
-		{3C5D7948-5E49-4C78-9AAB-3AC53A15BEF4}.Release|Win32.Build.0 = Release|Win32
-		{5A834BCC-8B96-4D1C-9811-ADC816797E3A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5A834BCC-8B96-4D1C-9811-ADC816797E3A}.Debug|Win32.Build.0 = Debug|Win32
-		{5A834BCC-8B96-4D1C-9811-ADC816797E3A}.Release|Win32.ActiveCfg = Release|Win32
-		{5A834BCC-8B96-4D1C-9811-ADC816797E3A}.Release|Win32.Build.0 = Release|Win32
-		{248E3E22-2203-4352-964E-32946A1A0AEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{248E3E22-2203-4352-964E-32946A1A0AEC}.Debug|Win32.Build.0 = Debug|Win32
-		{248E3E22-2203-4352-964E-32946A1A0AEC}.Release|Win32.ActiveCfg = Release|Win32
-		{248E3E22-2203-4352-964E-32946A1A0AEC}.Release|Win32.Build.0 = Release|Win32
-		{BEE3EFDE-4C00-4CE5-9DFC-61DF6F0E5481}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BEE3EFDE-4C00-4CE5-9DFC-61DF6F0E5481}.Debug|Win32.Build.0 = Debug|Win32
-		{BEE3EFDE-4C00-4CE5-9DFC-61DF6F0E5481}.Release|Win32.ActiveCfg = Release|Win32
-		{BEE3EFDE-4C00-4CE5-9DFC-61DF6F0E5481}.Release|Win32.Build.0 = Release|Win32
-		{3E08AF8F-6DD3-40EC-AA97-C8D4237CA127}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E08AF8F-6DD3-40EC-AA97-C8D4237CA127}.Debug|Win32.Build.0 = Debug|Win32
-		{3E08AF8F-6DD3-40EC-AA97-C8D4237CA127}.Release|Win32.ActiveCfg = Release|Win32
-		{3E08AF8F-6DD3-40EC-AA97-C8D4237CA127}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmpb.dsp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmpb.dsp
deleted file mode 100644
index befc0f6d51..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmpb.dsp
+++ /dev/null
@@ -1,118 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gsmpb" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gsmpb - Win32 Debug
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmpb.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmpb.mak" CFG="gsmpb - Win32 Debug"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "gsmpb - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE "gsmpb - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gsmpb - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /TP /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "gsmpb - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gsmpb - Win32 Release"
-# Name "gsmpb - Win32 Debug"
-# Begin Group "Quellcodedateien"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-
-!IF  "$(CFG)" == "gsmpb - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gsmpb - Win32 Debug"
-
-# ADD CPP /Od
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\apps\gsmpb.cc
-# End Source File
-# End Group
-# Begin Group "Header-Dateien"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\getopt.h
-# End Source File
-# End Group
-# Begin Group "Ressourcendateien"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmsendsms.dsp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmsendsms.dsp
deleted file mode 100644
index 7e660fbdbb..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmsendsms.dsp
+++ /dev/null
@@ -1,118 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gsmsendsms" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gsmsendsms - Win32 Debug
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmsendsms.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmsendsms.mak" CFG="gsmsendsms - Win32 Debug"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "gsmsendsms - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE "gsmsendsms - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gsmsendsms - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /TP /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "gsmsendsms - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gsmsendsms - Win32 Release"
-# Name "gsmsendsms - Win32 Debug"
-# Begin Group "Quellcodedateien"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-
-!IF  "$(CFG)" == "gsmsendsms - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gsmsendsms - Win32 Debug"
-
-# ADD CPP /Od
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\apps\gsmsendsms.cc
-# End Source File
-# End Group
-# Begin Group "Header-Dateien"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\getopt.h
-# End Source File
-# End Group
-# Begin Group "Ressourcendateien"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmsmsd.dsp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmsmsd.dsp
deleted file mode 100644
index 2facfaa47c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmsmsd.dsp
+++ /dev/null
@@ -1,118 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gsmsmsd" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gsmsmsd - Win32 Debug
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmsmsd.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmsmsd.mak" CFG="gsmsmsd - Win32 Debug"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "gsmsmsd - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE "gsmsmsd - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gsmsmsd - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /TP /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "gsmsmsd - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gsmsmsd - Win32 Release"
-# Name "gsmsmsd - Win32 Debug"
-# Begin Group "Quellcodedateien"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-
-!IF  "$(CFG)" == "gsmsmsd - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gsmsmsd - Win32 Debug"
-
-# ADD CPP /Od
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\apps\gsmsmsd.cc
-# End Source File
-# End Group
-# Begin Group "Header-Dateien"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\getopt.h
-# End Source File
-# End Group
-# Begin Group "Ressourcendateien"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmsmsstore.dsp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmsmsstore.dsp
deleted file mode 100644
index 5e7a9c150a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmsmsstore.dsp
+++ /dev/null
@@ -1,119 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gsmsmsstore" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gsmsmsstore - Win32 Debug
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmsmsstore.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "gsmsmsstore.mak" CFG="gsmsmsstore - Win32 Debug"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "gsmsmsstore - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE "gsmsmsstore - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gsmsmsstore - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /TP /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "gsmsmsstore - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gsmsmsstore - Win32 Release"
-# Name "gsmsmsstore - Win32 Debug"
-# Begin Group "Quellcodedateien"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-
-!IF  "$(CFG)" == "gsmsmsstore - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gsmsmsstore - Win32 Debug"
-
-# ADD CPP /Od
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\apps\gsmsmsstore.cc
-# End Source File
-# End Group
-# Begin Group "Header-Dateien"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\getopt.h
-# End Source File
-# End Group
-# Begin Group "Ressourcendateien"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/testgsmlib.dsp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/testgsmlib.dsp
deleted file mode 100644
index 26de21002d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/testgsmlib.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testgsmlib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testgsmlib - Win32 Debug
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "testgsmlib.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "testgsmlib.mak" CFG="testgsmlib - Win32 Debug"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "testgsmlib - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE "testgsmlib - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testgsmlib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /TP /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "testgsmlib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /TP /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testgsmlib - Win32 Release"
-# Name "testgsmlib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\tests\testgsmlib.cc
-# ADD CPP /I "../gsmlib" /I ".." /I "." /D "HAVE_CONFIG_H"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/testsms.dsp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/testsms.dsp
deleted file mode 100644
index 09bf409bd2..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/testsms.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testsms" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testsms - Win32 Debug
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "testsms.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "testsms.mak" CFG="testsms - Win32 Debug"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "testsms - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE "testsms - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testsms - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /TP /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "testsms - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testsms - Win32 Release"
-# Name "testsms - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\tests\testsms.cc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/testsms2.dsp b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/testsms2.dsp
deleted file mode 100644
index 0ab2880c41..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/testsms2.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testsms2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testsms2 - Win32 Debug
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "testsms2.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "testsms2.mak" CFG="testsms2 - Win32 Debug"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "testsms2 - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE "testsms2 - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testsms2 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /TP /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "testsms2 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../gsmlib" /I ".." /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testsms2 - Win32 Release"
-# Name "testsms2 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\tests\testsms2.cc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/mod/endpoints/mod_gsmopen/gsmopen.h b/src/mod/endpoints/mod_gsmopen/gsmopen.h
deleted file mode 100644
index 75f62148e3..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmopen.h
+++ /dev/null
@@ -1,584 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * This module (mod_gsmopen) has been contributed by:
- *
- * Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * Maintainer: Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * mod_gsmopen.cpp -- GSM Modem compatible Endpoint Module
- *
- */
-
-
-#define __STDC_LIMIT_MACROS
-
-#ifdef WIN32
-#define HAVE_VSNPRINTF
-#pragma warning(disable: 4290)
-#endif //WIN32
-
-#define MY_EVENT_INCOMING_SMS "gsmopen::incoming_sms"
-#define MY_EVENT_DUMP "gsmopen::dump_event"
-#define MY_EVENT_ALARM "gsmopen::alarm"
-
-#define ALARM_FAILED_INTERFACE 0
-#define ALARM_NO_NETWORK_REGISTRATION 1
-#define ALARM_ROAMING_NETWORK_REGISTRATION 2
-#define ALARM_NETWORK_NO_SERVICE 3
-#define ALARM_NETWORK_NO_SIGNAL 4
-#define ALARM_NETWORK_LOW_SIGNAL 5
-
-#undef GIOVA48
-
-#ifndef GIOVA48
-#define SAMPLES_PER_FRAME 160
-#else // GIOVA48
-#define SAMPLES_PER_FRAME 960
-#endif // GIOVA48
-
-#ifndef GIOVA48
-#define     GSMOPEN_FRAME_SIZE   160
-#else //GIOVA48
-#define     GSMOPEN_FRAME_SIZE   960
-#endif //GIOVA48
-#define     SAMPLERATE_GSMOPEN   8000
-
-#include <switch.h>
-#ifndef WIN32
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <iconv.h>
-#include <dirent.h>
-#endif //WIN32
-
-#ifndef WIN32
-#include <sys/time.h>
-#endif //WIN32
-
-#define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
-#include <spandsp.h>
-#include <spandsp/version.h>
-
-#ifdef _MSC_VER
-//Windows macro  for FD_SET includes a warning C4127: conditional expression is constant
-#pragma warning(push)
-#pragma warning(disable:4127)
-#endif
-
-#define 	PROTOCOL_ALSA_VOICEMODEM   4
-#define 	PROTOCOL_AT   2
-#define 	PROTOCOL_FBUS2   1
-#define 	PROTOCOL_NO_SERIAL   3
-
-#define AT_MESG_MAX_LENGTH 2048	/* much more than 10 SMSs */
-#define		AT_BUFSIZ AT_MESG_MAX_LENGTH
-#define AT_MESG_MAX_LINES 20	/* 256 lines, so it can contains the results of AT+CLAC, that gives all the AT commands the phone supports */
-
-#ifndef GSMOPEN_SVN_VERSION
-#define GSMOPEN_SVN_VERSION switch_version_full()
-#endif /* GSMOPEN_SVN_VERSION */
-
-#include "ctb-0.16/ctb.h"
-
-typedef enum {
-	TFLAG_IO = (1 << 0),
-	TFLAG_INBOUND = (1 << 1),
-	TFLAG_OUTBOUND = (1 << 2),
-	TFLAG_DTMF = (1 << 3),
-	TFLAG_VOICE = (1 << 4),
-	TFLAG_HANGUP = (1 << 5),
-	TFLAG_LINEAR = (1 << 6),
-	TFLAG_CODEC = (1 << 7),
-	TFLAG_BREAK = (1 << 8)
-} TFLAGS;
-
-typedef enum {
-	GFLAG_MY_CODEC_PREFS = (1 << 0)
-} GFLAGS;
-
-#define DEBUGA_GSMOPEN(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"rev %s [%p|%-7lx][DEBUG_GSMOPEN  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_CALL(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"rev %s [%p|%-7lx][DEBUG_CALL  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_PBX(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"rev %s [%p|%-7lx][DEBUG_PBX  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define ERRORA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 		"rev %s [%p|%-7lx][ERRORA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define WARNINGA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 		"rev %s [%p|%-7lx][WARNINGA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define NOTICA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, 		"rev %s [%p|%-7lx][NOTICA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-
-#define GSMOPEN_P_LOG GSMOPEN_SVN_VERSION, (void *)NULL, (unsigned long)55, __LINE__, tech_pvt ? tech_pvt->name ? tech_pvt->name : "none" : "none", -1, tech_pvt ? tech_pvt->interface_state : -1, tech_pvt ? tech_pvt->phone_callflow : -1
-
-/*********************************/
-#define GSMOPEN_CAUSE_NORMAL		1
-#define GSMOPEN_CAUSE_FAILURE		2
-#define GSMOPEN_CAUSE_NO_ANSWER		3
-/*********************************/
-#define GSMOPEN_FRAME_DTMF		1
-/*********************************/
-#define GSMOPEN_CONTROL_RINGING		1
-#define GSMOPEN_CONTROL_ANSWER		2
-#define GSMOPEN_CONTROL_HANGUP		3
-#define GSMOPEN_CONTROL_BUSY		4
-
-/*********************************/
-#define		GSMOPEN_STATE_IDLE				0
-#define		GSMOPEN_STATE_DOWN				1
-#define		GSMOPEN_STATE_RING				2
-#define		GSMOPEN_STATE_DIALING				3
-#define		GSMOPEN_STATE_BUSY				4
-#define		GSMOPEN_STATE_UP				5
-#define		GSMOPEN_STATE_RINGING				6
-#define		GSMOPEN_STATE_PRERING				7
-#define		GSMOPEN_STATE_ERROR_DOUBLE_CALL			8
-#define		GSMOPEN_STATE_SELECTED				9
-#define 	GSMOPEN_STATE_HANGUP_REQUESTED			10
-#define		GSMOPEN_STATE_PREANSWER				11
-/*********************************/
-/* call flow from the device */
-#define 	CALLFLOW_CALL_IDLE				0
-#define 	CALLFLOW_CALL_DOWN				1
-#define 	CALLFLOW_INCOMING_RING				2
-#define 	CALLFLOW_CALL_DIALING				3
-#define 	CALLFLOW_CALL_LINEBUSY				4
-#define 	CALLFLOW_CALL_ACTIVE				5
-#define 	CALLFLOW_INCOMING_HANGUP			6
-#define 	CALLFLOW_CALL_RELEASED				7
-#define 	CALLFLOW_CALL_NOCARRIER				8
-#define 	CALLFLOW_CALL_INFLUX				9
-#define 	CALLFLOW_CALL_INCOMING				10
-#define 	CALLFLOW_CALL_FAILED				11
-#define 	CALLFLOW_CALL_NOSERVICE				12
-#define 	CALLFLOW_CALL_OUTGOINGRESTRICTED		13
-#define 	CALLFLOW_CALL_SECURITYFAIL			14
-#define 	CALLFLOW_CALL_NOANSWER				15
-#define 	CALLFLOW_STATUS_FINISHED			16
-#define 	CALLFLOW_STATUS_CANCELLED			17
-#define 	CALLFLOW_STATUS_FAILED				18
-#define 	CALLFLOW_STATUS_REFUSED				19
-#define 	CALLFLOW_STATUS_RINGING				20
-#define 	CALLFLOW_STATUS_INPROGRESS			21
-#define 	CALLFLOW_STATUS_UNPLACED			22
-#define 	CALLFLOW_STATUS_ROUTING				23
-#define 	CALLFLOW_STATUS_EARLYMEDIA			24
-#define 	CALLFLOW_INCOMING_CALLID			25
-#define 	CALLFLOW_STATUS_REMOTEHOLD			26
-#define 	CALLFLOW_CALL_REMOTEANSWER			27
-#define 	CALLFLOW_CALL_HANGUP_REQUESTED			28
-
-/*********************************/
-
-#define 	AT_OK   0
-#define 	AT_ERROR   1
-
-#define GSMOPEN_MAX_INTERFACES 64
-
-#define USSD_ENCODING_AUTO 		0
-#define USSD_ENCODING_PLAIN 	1
-#define USSD_ENCODING_HEX_7BIT	2
-#define USSD_ENCODING_HEX_8BIT	3
-#define USSD_ENCODING_UCS2		4
-
-#ifndef WIN32
-struct GSMopenHandles {
-	int currentuserhandle;
-	int api_connected;
-	int fdesc[2];
-};
-#else //WIN32
-
-struct GSMopenHandles {
-	HWND win32_hInit_MainWindowHandle;
-	HWND win32_hGlobal_GSMAPIWindowHandle;
-	HINSTANCE win32_hInit_ProcessHandle;
-	char win32_acInit_WindowClassName[128];
-	UINT win32_uiGlobal_MsgID_GSMControlAPIAttach;
-	UINT win32_uiGlobal_MsgID_GSMControlAPIDiscover;
-	int currentuserhandle;
-	int api_connected;
-	switch_file_t *fdesc[2];
-};
-
-#endif //WIN32
-
-/*!
- * \brief structure for storing the results of AT commands, in an array of AT_MESG_MAX_LINES * AT_MESG_MAX_LENGTH chars
- */
-struct s_result {
-	int elemcount;
-	char result[AT_MESG_MAX_LINES][AT_MESG_MAX_LENGTH];
-};
-
-struct ciapa_struct {
-	int state;
-	int hangupcause;
-};
-typedef struct ciapa_struct ciapa_t;
-
-struct private_object {
-	unsigned int flags;
-	switch_codec_t read_codec;
-	switch_codec_t write_codec;
-	switch_frame_t read_frame;
-	unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	char session_uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	switch_caller_profile_t *caller_profile;
-	switch_mutex_t *mutex;
-	switch_mutex_t *flag_mutex;
-
-	char id[80];
-	char name[80];
-	char dialplan[80];
-	char context[80];
-	char dial_regex[256];
-	char fail_dial_regex[256];
-	char hold_music[256];
-	char type[256];
-	char X11_display[256];
-#ifdef WIN32
-	unsigned short tcp_cli_port;
-	unsigned short tcp_srv_port;
-#else
-	int tcp_cli_port;
-	int tcp_srv_port;
-#endif
-	struct GSMopenHandles GSMopenHandles;
-
-	int interface_state;		/*!< \brief 'state' of the interface (channel) */
-	char language[80];			/*!< \brief default Asterisk dialplan language for this interface */
-	char exten[80];				/*!< \brief default Asterisk dialplan extension for this interface */
-	int gsmopen_sound_rate;		/*!< \brief rate of the sound device, in Hz, eg: 8000 */
-	char callid_name[50];
-	char callid_number[50];
-	double playback_boost;
-	double capture_boost;
-	int stripmsd;
-	char gsmopen_call_id[512];
-	int gsmopen_call_ongoing;
-	char gsmopen_friends[4096];
-	char gsmopen_fullname[512];
-	char gsmopen_displayname[512];
-	int phone_callflow;			/*!< \brief 'callflow' of the gsmopen interface (as opposed to phone interface) */
-	int gsmopen;				/*!< \brief config flag, bool, GSM support on this interface (0 if false, -1 if true) */
-	int control_to_send;
-#ifdef WIN32
-	switch_file_t *audiopipe[2];
-	switch_file_t *audiogsmopenpipe[2];
-	switch_file_t *gsmopen_sound_capt_fd;	/*!< \brief file descriptor for sound capture dev */
-#else							/* WIN32 */
-	int audiopipe[2];
-	int audiogsmopenpipe[2];
-	int gsmopen_sound_capt_fd;	/*!< \brief file descriptor for sound capture dev */
-#endif							/* WIN32 */
-	switch_thread_t *tcp_srv_thread;
-	switch_thread_t *tcp_cli_thread;
-	switch_thread_t *gsmopen_signaling_thread;
-	switch_thread_t *gsmopen_api_thread;
-	int gsmopen_dir_entry_extension_prefix;
-	char gsmopen_user[256];
-	char gsmopen_password[256];
-	char destination[256];
-	struct timeval answer_time;
-
-	struct timeval transfer_time;
-	char transfer_callid_number[50];
-	char gsmopen_transfer_call_id[512];
-	int running;
-	unsigned long ib_calls;
-	unsigned long ob_calls;
-	unsigned long ib_failed_calls;
-	unsigned long ob_failed_calls;
-
-	char controldevice_name[512];	/*!< \brief name of the serial device controlling the interface, possibly none */
-	int controldevprotocol;		/*!< \brief which protocol is used for serial control of this interface */
-	char controldevprotocolname[50];	/*!< \brief name of the serial device controlling protocol, one of "at" "fbus2" "no_serial" "alsa_voicemodem" */
-	int controldevfd;			/*!< \brief serial controlling file descriptor for this interface */
-#ifdef WIN32
-	int controldevice_speed;
-#else
-	speed_t controldevice_speed;
-#endif							// WIN32
-	int controldev_dead;
-
-	char at_dial_pre_number[64];
-	char at_dial_post_number[64];
-	char at_dial_expect[64];
-	unsigned int at_early_audio;
-	char at_hangup[64];
-	char at_hangup_expect[64];
-	char at_answer[64];
-	char at_answer_expect[64];
-	unsigned int at_initial_pause;
-	char at_preinit_1[64];
-	char at_preinit_1_expect[64];
-	char at_preinit_2[64];
-	char at_preinit_2_expect[64];
-	char at_preinit_3[64];
-	char at_preinit_3_expect[64];
-	char at_preinit_4[64];
-	char at_preinit_4_expect[64];
-	char at_preinit_5[64];
-	char at_preinit_5_expect[64];
-	unsigned int at_after_preinit_pause;
-
-	char at_postinit_1[64];
-	char at_postinit_1_expect[64];
-	char at_postinit_2[64];
-	char at_postinit_2_expect[64];
-	char at_postinit_3[64];
-	char at_postinit_3_expect[64];
-	char at_postinit_4[64];
-	char at_postinit_4_expect[64];
-	char at_postinit_5[64];
-	char at_postinit_5_expect[64];
-
-	char at_send_dtmf[64];
-
-	char at_query_battchg[64];
-	char at_query_battchg_expect[64];
-	char at_query_signal[64];
-	char at_query_signal_expect[64];
-	char at_call_idle[64];
-	char at_call_incoming[64];
-	char at_call_active[64];
-	char at_call_failed[64];
-	char at_call_calling[64];
-
-#define CIEV_STRING_SIZE 64
-	char at_indicator_noservice_string[64];
-	char at_indicator_nosignal_string[64];
-	char at_indicator_lowsignal_string[64];
-	char at_indicator_lowbattchg_string[64];
-	char at_indicator_nobattchg_string[64];
-	char at_indicator_callactive_string[64];
-	char at_indicator_nocallactive_string[64];
-	char at_indicator_nocallsetup_string[64];
-	char at_indicator_callsetupincoming_string[64];
-	char at_indicator_callsetupoutgoing_string[64];
-	char at_indicator_callsetupremoteringing_string[64];
-
-	int at_indicator_callp;
-	int at_indicator_callsetupp;
-	int at_indicator_roamp;
-	int at_indicator_battchgp;
-	int at_indicator_servicep;
-	int at_indicator_signalp;
-
-	int at_has_clcc;
-	int at_has_ecam;
-
-	char at_cmgw[16];
-	int no_ucs2;
-	time_t gsmopen_serial_sync_period;
-
-	time_t gsmopen_serial_synced_timestamp;
-	struct s_result line_array;
-
-	int unread_sms_msg_id;
-	int reading_sms_msg;
-	char sms_message[4800];
-	char sms_sender[256];
-	char sms_date[256];
-	char sms_userdataheader[256];
-	char sms_body[4800];
-	char sms_datacodingscheme[256];
-	char sms_servicecentreaddress[256];
-	int sms_messagetype;
-	int sms_cnmi_not_supported;
-	int sms_pdu_not_supported;
-
-	int  ussd_request_encoding;
-	int  ussd_response_encoding;
-	int  ussd_request_hex;
-	int  ussd_received;
-	int  ussd_status;
-	char ussd_message[1024];
-	char ussd_dcs[256];
-
-	struct timeval call_incoming_time;
-	switch_mutex_t *controldev_lock;
-
-	int phonebook_listing;
-	int phonebook_querying;
-	int phonebook_listing_received_calls;
-
-	int phonebook_first_entry;
-	int phonebook_last_entry;
-	int phonebook_number_lenght;
-	int phonebook_text_lenght;
-	FILE *phonebook_writing_fp;
-
-	struct timeval ringtime;
-	ciapa_t *owner;
-
-	time_t audio_play_reset_timestamp;
-	int audio_play_reset_period;
-
-	switch_timer_t timer_read;
-	switch_timer_t timer_write;
-	teletone_dtmf_detect_state_t dtmf_detect;
-	switch_time_t old_dtmf_timestamp;
-
-	int no_sound;
-
-	dtmf_rx_state_t dtmf_state;
-	int active;
-	int home_network_registered;
-	int roaming_registered;
-	int not_registered;
-	int got_signal;
-	int signal_strength;
-	char imei[128];
-	int requesting_imei;
-	char imsi[128];
-	int requesting_imsi;
-	char operator_name[128];
-	int requesting_operator_name;
-	char subscriber_number[128];
-	int requesting_subscriber_number;
-	char device_mfg[128];
-	int requesting_device_mfg;
-	char device_model[128];
-	int requesting_device_model;
-	char device_firmware[128];
-	int requesting_device_firmware;
-	int network_creg_not_supported;
-	char creg[128];
-
-	char controldevice_audio_name[512];
-	int controldev_audio_fd;
-	int controldevice_audio_speed;
-	int controldev_audio_dead;
-	switch_mutex_t *controldev_audio_lock;
-	               ctb::SerialPort * serialPort_serial_audio;
-
-	               ctb::SerialPort * serialPort_serial_control;
-
-	char buffer2[320];
-	int buffer2_full;
-	int serialPort_serial_audio_opened;
-
-};
-
-typedef struct private_object private_t;
-
-void *SWITCH_THREAD_FUNC gsmopen_api_thread_func(switch_thread_t *thread, void *obj);
-int gsmopen_audio_read(private_t *tech_pvt);
-int gsmopen_audio_init(private_t *tech_pvt);
-int gsmopen_signaling_read(private_t *tech_pvt);
-
-int gsmopen_call(private_t *tech_pvt, char *idest, int timeout);
-int gsmopen_senddigit(private_t *tech_pvt, char digit);
-
-void *gsmopen_do_tcp_srv_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC gsmopen_do_tcp_srv_thread(switch_thread_t *thread, void *obj);
-
-void *gsmopen_do_tcp_cli_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC gsmopen_do_tcp_cli_thread(switch_thread_t *thread, void *obj);
-
-void *gsmopen_do_gsmopenapi_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC gsmopen_do_gsmopenapi_thread(switch_thread_t *thread, void *obj);
-int dtmf_received(private_t *tech_pvt, char *value);
-int start_audio_threads(private_t *tech_pvt);
-int new_inbound_channel(private_t *tech_pvt);
-int outbound_channel_answered(private_t *tech_pvt);
-#if defined(WIN32) && !defined(__CYGWIN__)
-int gsmopen_pipe_read(switch_file_t *pipe, short *buf, int howmany);
-int gsmopen_pipe_write(switch_file_t *pipe, short *buf, int howmany);
-/* Visual C do not have strsep ? */
-char *strsep(char **stringp, const char *delim);
-#else
-int gsmopen_pipe_read(int pipe, short *buf, int howmany);
-int gsmopen_pipe_write(int pipe, short *buf, int howmany);
-#endif /* WIN32 */
-int gsmopen_close_socket(unsigned int fd);
-private_t *find_available_gsmopen_interface_rr(private_t *tech_pvt_calling);
-int remote_party_is_ringing(private_t *tech_pvt);
-int remote_party_is_early_media(private_t *tech_pvt);
-int gsmopen_socket_create_and_bind(private_t *tech_pvt, int *which_port);
-
-void *gsmopen_do_controldev_thread(void *data);
-int gsmopen_serial_init(private_t *tech_pvt, int controldevice_speed);
-int gsmopen_serial_monitor(private_t *tech_pvt);
-int gsmopen_serial_sync(private_t *tech_pvt);
-int gsmopen_serial_sync_AT(private_t *tech_pvt);
-int gsmopen_serial_config(private_t *tech_pvt);
-int gsmopen_serial_config_AT(private_t *tech_pvt);
-
-#define gsmopen_serial_write_AT_expect(P, D, S) gsmopen_serial_write_AT_expect1(P, D, S, 1, 0)
-#define gsmopen_serial_write_AT_expect_noexpcr(P, D, S) gsmopen_serial_write_AT_expect1(P, D, S, 0, 0)
-#define gsmopen_serial_write_AT_expect_noexpcr_tout(P, D, S, T) gsmopen_serial_write_AT_expect1(P, D, S, 0, T)
-#define gsmopen_serial_write_AT_expect_longtime(P, D, S) gsmopen_serial_write_AT_expect1(P, D, S, 1, 5)
-#define gsmopen_serial_write_AT_expect_longtime_noexpcr(P, D, S) gsmopen_serial_write_AT_expect1(P, D, S, 0, 5)
-int gsmopen_serial_write_AT(private_t *tech_pvt, const char *data);
-int gsmopen_serial_write_AT_nocr(private_t *tech_pvt, const char *data);
-int gsmopen_serial_write_AT_ack(private_t *tech_pvt, const char *data);
-int gsmopen_serial_write_AT_ack_nocr_longtime(private_t *tech_pvt, const char *data);
-int gsmopen_serial_write_AT_noack(private_t *tech_pvt, const char *data);
-int gsmopen_serial_write_AT_expect1(private_t *tech_pvt, const char *data, const char *expected_string, int expect_crlf, int seconds);
-int gsmopen_serial_AT_expect(private_t *tech_pvt, const char *expected_string, int expect_crlf, int seconds);
-int gsmopen_serial_read_AT(private_t *tech_pvt, int look_for_ack, int timeout_usec, int timeout_sec, const char *expected_string, int expect_crlf);
-int gsmopen_serial_read(private_t *tech_pvt);
-#define RESULT_FAILURE 0
-#define RESULT_SUCCESS 1
-int utf8_to_ucs2(private_t *tech_pvt, char *utf8_in, size_t inbytesleft, char *ucs2_out, size_t outbytesleft);
-int ucs2_to_utf8(private_t *tech_pvt, char *ucs2_in, char *utf8_out, size_t outbytesleft);
-int utf8_to_iso_8859_1(private_t *tech_pvt, char *utf8_in, size_t inbytesleft, char *iso_8859_1_out, size_t outbytesleft);
-#define PUSHA_UNLOCKA(x)    if(option_debug > 100) ERRORA("PUSHA_UNLOCKA: %p\n", GSMOPEN_P_LOG, (void *)x);
-#define POPPA_UNLOCKA(x)    if(option_debug > 100) ERRORA("POPPA_UNLOCKA: %p\n", GSMOPEN_P_LOG, (void *)x);
-#define LOKKA(x)    switch_mutex_lock(x);
-#define UNLOCKA(x)  switch_mutex_unlock(x);
-
-#define gsmopen_queue_control(x, y) ERRORA("gsmopen_queue_control: %p, %d\n", GSMOPEN_P_LOG, (void *)x, y);
-
-#define ast_setstate(x, y) ERRORA("ast_setstate: %p, %d\n", GSMOPEN_P_LOG, (void *)x, y);
-
-int gsmopen_serial_read(private_t *tech_pvt);
-int gsmopen_answer(private_t *tech_pvt);
-int gsmopen_serial_answer(private_t *tech_pvt);
-int gsmopen_serial_answer_AT(private_t *tech_pvt);
-int gsmopen_serial_hangup(private_t *tech_pvt);
-int gsmopen_serial_hangup_AT(private_t *tech_pvt);
-int gsmopen_hangup(private_t *tech_pvt);
-int gsmopen_serial_call(private_t *tech_pvt, char *dstr);
-int gsmopen_serial_call_AT(private_t *tech_pvt, char *dstr);
-int gsmopen_sendsms(private_t *tech_pvt, char *dest, char *text);
-
-void gsmopen_store_boost(char *s, double *boost);
-int gsmopen_sound_boost(void *data, int samples_num, double boost);
-int sms_incoming(private_t *tech_pvt);
-int gsmopen_ring(private_t *tech_pvt);
-
-int iso_8859_1_to_utf8(private_t *tech_pvt, char *iso_8859_1_in, char *utf8_out, size_t outbytesleft);
-int gsmopen_serial_getstatus_AT(private_t *tech_pvt);
-
-int dump_event(private_t *tech_pvt);
-int alarm_event(private_t *tech_pvt, int alarm_code, const char *alarm_message);
-int dump_event_full(private_t *tech_pvt, int is_alarm, int alarm_code, const char *alarm_message);
-
-int gsmopen_serial_init_audio_port(private_t *tech_pvt, int controldevice_audio_speed);
-int serial_audio_init(private_t *tech_pvt);
-int serial_audio_shutdown(private_t *tech_pvt);
-#ifndef WIN32
-void find_ttyusb_devices(private_t *tech_pvt, const char *dirname);
-#endif// WIN32
-int gsmopen_ussd(private_t *tech_pvt, char *ussd, int waittime);
-int ussd_incoming(private_t *tech_pvt);
diff --git a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
deleted file mode 100644
index bfd465501a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
+++ /dev/null
@@ -1,3306 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * This module (mod_gsmopen) has been contributed by:
- *
- * Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * Maintainer: Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * gsmopen_protocol.cpp -- Low Level Interface for mod_gamopen
- *
- */
-
-
-
-
-#include "gsmopen.h"
-#ifdef WIN32
-#include "win_iconv.c"
-#endif // WIN32
-#define WANT_GSMLIB
-
-#ifdef WANT_GSMLIB
-#include <gsmlib/gsm_sms.h>
-
-
-using namespace std;
-using namespace gsmlib;
-#endif // WANT_GSMLIB
-
-
-extern int running;				//FIXME
-int gsmopen_dir_entry_extension = 1;	//FIXME
-int option_debug = 100;			//FIXME
-
-#define gsmopen_sleep switch_sleep
-#define gsmopen_strncpy switch_copy_string
-extern switch_memory_pool_t *gsmopen_module_pool;
-extern switch_endpoint_interface_t *gsmopen_endpoint_interface;
-
-#ifdef WIN32
-/***************/
-// from http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/
-
-#include <time.h>
-
-#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
-#else /*  */
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
-#endif /*  */
-struct sk_timezone {
-	int tz_minuteswest;			/* minutes W of Greenwich */
-	int tz_dsttime;				/* type of dst correction */
-};
-int gettimeofday(struct timeval *tv, struct sk_timezone *tz)
-{
-	FILETIME ft;
-	unsigned __int64 tmpres = 0;
-	static int tzflag;
-	if (NULL != tv) {
-		GetSystemTimeAsFileTime(&ft);
-		tmpres |= ft.dwHighDateTime;
-		tmpres <<= 32;
-		tmpres |= ft.dwLowDateTime;
-
-		/*converting file time to unix epoch */
-		tmpres /= 10;			/*convert into microseconds */
-		tmpres -= DELTA_EPOCH_IN_MICROSECS;
-		tv->tv_sec = (long) (tmpres / 1000000UL);
-		tv->tv_usec = (long) (tmpres % 1000000UL);
-	}
-	if (NULL != tz) {
-		if (!tzflag) {
-			_tzset();
-			tzflag++;
-		}
-		tz->tz_minuteswest = _timezone / 60;
-		tz->tz_dsttime = _daylight;
-	}
-	return 0;
-}
-
-/***************/
-#endif /* WIN32 */
-
-int gsmopen_serial_init(private_t *tech_pvt, int controldevice_speed)
-{
-	if (!tech_pvt)
-		return -1;
-
-	tech_pvt->serialPort_serial_control = new ctb::SerialPort();
-
-	/* windows: com ports above com9 need a special trick, which also works for com ports below com10 ... */
-	char devname[512] = "";
-	strcpy(devname, tech_pvt->controldevice_name);
-#ifdef WIN32
-	strcpy(devname,"\\\\.\\");
-	strcat(devname, tech_pvt->controldevice_name);
-#endif
-
-	if (tech_pvt->serialPort_serial_control->Open(devname, 115200, "8N1", ctb::SerialPort::NoFlowControl) >= 0) {
-		DEBUGA_GSMOPEN("port %s, SUCCESS open\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-	} else {
-#ifdef WIN32
-		LPVOID msg;
-		FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-							NULL,
-							GetLastError(),
-							MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-							(LPTSTR) &msg,
-							0,
-							NULL);
-		ERRORA("port open failed for %s - %s", GSMOPEN_P_LOG, devname, (LPCTSTR) msg);
-		LocalFree(msg);
-#else
-		ERRORA("port %s, NOT open\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-#endif
-		return -1;
-	}
-
-	return 0;
-}
-
-int gsmopen_serial_read(private_t *tech_pvt)
-{
-	if (tech_pvt && tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_read_AT(tech_pvt, 0, 100000, 0, NULL, 1);	// a 10th of a second timeout
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_read_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_read_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-	return -1;
-}
-
-int gsmopen_serial_sync(private_t *tech_pvt)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_sync_AT(tech_pvt);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_sync_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_sync_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-
-	return -1;
-}
-
-int gsmopen_serial_config(private_t *tech_pvt)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_config_AT(tech_pvt);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_config_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_config_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-
-	return -1;
-}
-
-int gsmopen_serial_config_AT(private_t *tech_pvt)
-{
-	int res;
-	char at_command[5];
-	int i;
-
-	if (!tech_pvt)
-		return 0;
-
-/* initial_pause? */
-	if (tech_pvt->at_initial_pause) {
-		DEBUGA_GSMOPEN("sleeping for %u usec\n", GSMOPEN_P_LOG, tech_pvt->at_initial_pause);
-		gsmopen_sleep(tech_pvt->at_initial_pause);
-	}
-
-/* go until first empty preinit string, or last preinit string */
-	while (1) {
-
-		char trash[4096];
-		res = tech_pvt->serialPort_serial_control->Read(trash, 4096);
-		if (res) {
-			DEBUGA_GSMOPEN("READ %d on serialport init\n", GSMOPEN_P_LOG, res);
-		}
-
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CFUN=1");
-		if (res) {
-			DEBUGA_GSMOPEN("no response to AT+CFUN=1. Continuing\n", GSMOPEN_P_LOG);
-		}
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT^CURC=0");
-		if (res) {
-			DEBUGA_GSMOPEN("no response to AT^CURC=0. Continuing\n", GSMOPEN_P_LOG);
-		}
-
-		if (strlen(tech_pvt->at_preinit_1)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_1, tech_pvt->at_preinit_1_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_1, tech_pvt->at_preinit_1_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_preinit_2)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_2, tech_pvt->at_preinit_2_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_2, tech_pvt->at_preinit_2_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_preinit_3)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_3, tech_pvt->at_preinit_3_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_3, tech_pvt->at_preinit_3_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_preinit_4)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_4, tech_pvt->at_preinit_4_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_4, tech_pvt->at_preinit_4_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_preinit_5)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_preinit_5, tech_pvt->at_preinit_5_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_preinit_5, tech_pvt->at_preinit_5_expect);
-			}
-		} else {
-			break;
-		}
-
-		break;
-	}
-
-/* after_preinit_pause? */
-	if (tech_pvt->at_after_preinit_pause) {
-		DEBUGA_GSMOPEN("sleeping for %u usec\n", GSMOPEN_P_LOG, tech_pvt->at_after_preinit_pause);
-		gsmopen_sleep(tech_pvt->at_after_preinit_pause);
-	}
-
-	/* phone, brother, art you alive? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT");
-	if (res) {
-		ERRORA("no response to AT\n", GSMOPEN_P_LOG);
-		return -1;
-	}
-
-	/* for motorola, bring it back to "normal" mode if it happens to be in another mode */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+mode=0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+mode=0 didn't get OK from the phone. If it is NOT Motorola," " no problem.\n", GSMOPEN_P_LOG);
-	}
-	gsmopen_sleep(50000);
-	/* for motorola end */
-
-	/* reset AT configuration to phone default */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "ATZ");
-	if (res) {
-		DEBUGA_GSMOPEN("ATZ failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* disable AT command echo */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "ATE0");
-	if (res) {
-		DEBUGA_GSMOPEN("ATE0 failed\n", GSMOPEN_P_LOG);
-	}
-
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CFUN=1");
-	if (res) {
-		DEBUGA_GSMOPEN("no response to AT+CFUN=1. Continuing\n", GSMOPEN_P_LOG);
-	}
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT^CURC=0");
-	if (res) {
-		DEBUGA_GSMOPEN("no response to AT^CURC=0. Continuing\n", GSMOPEN_P_LOG);
-	}
-
-
-	/* disable extended error reporting */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMEE=0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CMEE failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* various phone manufacturer identifier */
-	for (i = 0; i < 10; i++) {
-		memset(at_command, 0, sizeof(at_command));
-		sprintf(at_command, "ATI%d", i);
-		res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-		if (res) {
-			DEBUGA_GSMOPEN("ATI%d command failed, continue\n", GSMOPEN_P_LOG, i);
-		}
-	}
-
-	/* phone manufacturer */
-	tech_pvt->requesting_device_mfg = 1;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CGMI");
-	tech_pvt->requesting_device_mfg = 0;
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CGMI failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* phone model */
-	tech_pvt->requesting_device_model = 1;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CGMM");
-	tech_pvt->requesting_device_model = 0;
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CGMM failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* phone firmware */
-	tech_pvt->requesting_device_firmware = 1;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CGMR");
-	tech_pvt->requesting_device_firmware = 0;
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CGMR failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* signal network registration with a +CREG unsolicited msg */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CREG=1");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CREG=1 failed\n", GSMOPEN_P_LOG);
-		tech_pvt->network_creg_not_supported = 1;
-	}
-	if (!tech_pvt->network_creg_not_supported) {
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CREG?");
-		if (res) {
-			DEBUGA_GSMOPEN("AT+CREG? failed\n", GSMOPEN_P_LOG);
-		}
-	}
-	/* query signal strength */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSQ");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CSQ failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* operator name */
-	tech_pvt->requesting_operator_name = 1;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+COPS?");
-	tech_pvt->requesting_operator_name = 0;
-	if (res) {
-		DEBUGA_GSMOPEN("AT+COPS? failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* subscriber number */
-	tech_pvt->requesting_subscriber_number = 1;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CNUM");
-	tech_pvt->requesting_subscriber_number = 0;
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CNUM failed, continue\n", GSMOPEN_P_LOG);
-	}
-
-	/* IMEI */
-	tech_pvt->requesting_imei = 1;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+GSN");
-	tech_pvt->requesting_imei = 0;
-	if (res) {
-		DEBUGA_GSMOPEN("AT+GSN failed\n", GSMOPEN_P_LOG);
-		tech_pvt->requesting_imei = 1;
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CGSN");
-		tech_pvt->requesting_imei = 0;
-		if (res) {
-			DEBUGA_GSMOPEN("AT+CGSN failed\n", GSMOPEN_P_LOG);
-		}
-	}
-	/* IMSI */
-	tech_pvt->requesting_imsi = 1;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CIMI");
-	tech_pvt->requesting_imsi = 0;
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CIMI failed\n", GSMOPEN_P_LOG);
-	}
-
-	/* signal incoming SMS with a +CMTI unsolicited msg */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CNMI=2,1,0,0,0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CNMI=2,1,0,0,0 failed, continue\n", GSMOPEN_P_LOG);
-		tech_pvt->sms_cnmi_not_supported = 1;
-		tech_pvt->gsmopen_serial_sync_period = 30;	//FIXME in config
-	}
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CPMS=\"ME\",\"ME\",\"ME\"");
-	if (res) {
-		DEBUGA_GSMOPEN("no response to AT+CPMS=\"ME\",\"ME\",\"ME\". Continuing\n", GSMOPEN_P_LOG);
-	}
-	/* signal incoming SMS with a +CMTI unsolicited msg */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CNMI=2,1,0,0,0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CNMI=2,1,0,0,0 failed, continue\n", GSMOPEN_P_LOG);
-		tech_pvt->sms_cnmi_not_supported = 1;
-		tech_pvt->gsmopen_serial_sync_period = 30;	//FIXME in config
-	}
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CPMS=\"ME\",\"ME\",\"ME\"");
-	if (res) {
-		DEBUGA_GSMOPEN("no response to AT+CPMS=\"ME\",\"ME\",\"ME\". Continuing\n", GSMOPEN_P_LOG);
-	}
-	/* signal incoming SMS with a +CMTI unsolicited msg */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CNMI=2,1,0,0,0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CNMI=2,1,0,0,0 failed, continue\n", GSMOPEN_P_LOG);
-		tech_pvt->sms_cnmi_not_supported = 1;
-		tech_pvt->gsmopen_serial_sync_period = 30;	//FIXME in config
-	}
-
-	/* what is the Message Center address (number) to which the SMS has to be sent? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCA?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CSCA? failed, continue\n", GSMOPEN_P_LOG);
-	}
-	/* what is the Message Format of SMSs? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CMGF? failed, continue\n", GSMOPEN_P_LOG);
-	}
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=1");
-	if (res) {
-		ERRORA("Error setting SMS sending mode to TEXT on the cellphone, let's hope is TEXT by default. Continuing\n", GSMOPEN_P_LOG);
-	}
-	tech_pvt->sms_pdu_not_supported = 1;
-
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSMP=17,167,0,8");	//unicode, 16 bit message
-	if (res) {
-		WARNINGA("AT+CSMP didn't get OK from the phone, continuing\n", GSMOPEN_P_LOG);
-	}
-
-	/* what is the Charset of SMSs? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CSCS? failed, continue\n", GSMOPEN_P_LOG);
-	}
-
-	tech_pvt->no_ucs2 = 0;
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS=\"UCS2\"");
-	if (res) {
-		WARNINGA("AT+CSCS=\"UCS2\" (set TE messages to ucs2) didn't get OK from the phone, let's try with 'GSM'\n", GSMOPEN_P_LOG);
-		tech_pvt->no_ucs2 = 1;
-	}
-	if (tech_pvt->no_ucs2) {
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS=\"GSM\"");
-		if (res) {
-			WARNINGA("AT+CSCS=\"GSM\" (set TE messages to GSM) didn't get OK from the phone\n", GSMOPEN_P_LOG);
-		}
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSMP=17,167,0,0");	//normal, 7 bit message
-		if (res) {
-			WARNINGA("AT+CSMP didn't get OK from the phone, continuing\n", GSMOPEN_P_LOG);
-		}
-	}
-
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=0");
-	if (res) {
-		ERRORA("Error setting SMS sending mode to TEXT on the cellphone, let's hope is TEXT by default. Continuing\n", GSMOPEN_P_LOG);
-	}
-	tech_pvt->sms_pdu_not_supported = 0;
-	tech_pvt->no_ucs2 = 1;
-
-	/* is the unsolicited reporting of mobile equipment event supported? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMER=?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CMER=? failed, continue\n", GSMOPEN_P_LOG);
-	}
-	/* request unsolicited reporting of mobile equipment indicators' events, to be screened by categories reported by +CIND=? */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMER=3,0,0,1");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CMER=? failed, continue\n", GSMOPEN_P_LOG);
-	}
-
-	/* is the solicited reporting of mobile equipment indications supported? */
-
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CIND=?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CIND=? failed, continue\n", GSMOPEN_P_LOG);
-	}
-
-	/* is the unsolicited reporting of call monitoring supported? sony-ericsson specific */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT*ECAM=?");
-	if (res) {
-		DEBUGA_GSMOPEN("AT*ECAM=? failed, continue\n", GSMOPEN_P_LOG);
-	}
-	/* enable the unsolicited reporting of call monitoring. sony-ericsson specific */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT*ECAM=1");
-	if (res) {
-		DEBUGA_GSMOPEN("AT*ECAM=1 failed, continue\n", GSMOPEN_P_LOG);
-		tech_pvt->at_has_ecam = 0;
-	} else {
-		tech_pvt->at_has_ecam = 1;
-	}
-
-	/* disable unsolicited signaling of call list */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CLCC=0");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CLCC=0 failed, continue\n", GSMOPEN_P_LOG);
-		tech_pvt->at_has_clcc = 0;
-	} else {
-		tech_pvt->at_has_clcc = 1;
-	}
-
-	/* give unsolicited caller id when incoming call */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CLIP=1");
-	if (res) {
-		DEBUGA_GSMOPEN("AT+CLIP failed, continue\n", GSMOPEN_P_LOG);
-	}
-	/* for motorola */
-	res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+MCST=1");	/* motorola call control codes
-																   (to know when call is disconnected (they
-																   don't give you "no carrier") */
-	if (res) {
-		DEBUGA_GSMOPEN("AT+MCST=1 didn't get OK from the phone. If it is NOT Motorola," " no problem.\n", GSMOPEN_P_LOG);
-	}
-	/* for motorola end */
-
-/* go until first empty postinit string, or last postinit string */
-	while (1) {
-
-		if (strlen(tech_pvt->at_postinit_1)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_1, tech_pvt->at_postinit_1_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_1, tech_pvt->at_postinit_1_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_postinit_2)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_2, tech_pvt->at_postinit_2_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_2, tech_pvt->at_postinit_2_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_postinit_3)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_3, tech_pvt->at_postinit_3_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_3, tech_pvt->at_postinit_3_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_postinit_4)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_4, tech_pvt->at_postinit_4_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_4, tech_pvt->at_postinit_4_expect);
-			}
-		} else {
-			break;
-		}
-
-		if (strlen(tech_pvt->at_postinit_5)) {
-			res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_postinit_5, tech_pvt->at_postinit_5_expect);
-			if (res) {
-				DEBUGA_GSMOPEN("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, tech_pvt->at_postinit_5, tech_pvt->at_postinit_5_expect);
-			}
-		} else {
-			break;
-		}
-
-		break;
-	}
-
-	return 0;
-}
-
-int gsmopen_serial_sync_AT(private_t *tech_pvt)
-{
-	gsmopen_sleep(10000);		/* 10msec */
-	time(&tech_pvt->gsmopen_serial_synced_timestamp);
-	return 0;
-}
-
-int gsmopen_serial_read_AT(private_t *tech_pvt, int look_for_ack, int timeout_usec, int timeout_sec, const char *expected_string, int expect_crlf)
-{
-	int select_err = 1;
-	struct timeval timeout;
-	char tmp_answer[AT_BUFSIZ];
-	char tmp_answer2[AT_BUFSIZ];
-	char tmp_answer3[AT_BUFSIZ];
-	char *tmp_answer_ptr;
-	char *last_line_ptr;
-	int i = 0;
-	int read_count = 0;
-	int la_counter = 0;
-	int at_ack = -1;
-	int la_read = 0;
-	int timeout_in_msec;
-	int msecs_passed = 0;
-
-	timeout_in_msec = (timeout_sec * 1000) + (timeout_usec ? (timeout_usec / 1000) : 0);
-
-	if (timeout_in_msec != 100)
-		DEBUGA_GSMOPEN("TIMEOUT=%d\n", GSMOPEN_P_LOG, timeout_in_msec);
-
-	if (!running || !tech_pvt || !tech_pvt->running) {
-		return -1;
-	}
-
-	tmp_answer_ptr = tmp_answer;
-	memset(tmp_answer, 0, sizeof(char) * AT_BUFSIZ);
-	memset(tmp_answer2, 0, sizeof(char) * AT_BUFSIZ);
-	memset(tmp_answer3, 0, sizeof(char) * AT_BUFSIZ);
-
-	timeout.tv_sec = timeout_sec;
-	timeout.tv_usec = timeout_usec;
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-
-	while ((!tech_pvt->controldev_dead) && msecs_passed <= timeout_in_msec) {
-		char *token_ptr;
-		timeout.tv_sec = timeout_sec;	//reset the timeout, linux modify it
-		timeout.tv_usec = timeout_usec;	//reset the timeout, linux modify it
-
-	  read:
-		switch_sleep(20000);
-		msecs_passed += 20;
-
-		if (timeout_in_msec != 100) {
-			//ERRORA("TIMEOUT=%d, PASSED=%d\n", GSMOPEN_P_LOG, timeout_in_msec, msecs_passed);
-		}
-		read_count = tech_pvt->serialPort_serial_control->Read(tmp_answer_ptr, AT_BUFSIZ - (tmp_answer_ptr - tmp_answer));
-		memset(tmp_answer3, 0, sizeof(char) * AT_BUFSIZ);
-		strcpy(tmp_answer3, tmp_answer_ptr);
-
-		if (read_count == 0) {
-			if (msecs_passed <= timeout_in_msec) {
-				goto read;
-			}
-		}
-		if (read_count == -1) {
-			ERRORA
-				("read -1 bytes!!! Nenormalno! Marking this gsmopen_serial_device %s as dead, andif it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, power down or battery exhausted\n",
-				 GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-			tech_pvt->controldev_dead = 1;
-			ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-			tech_pvt->running = 0;
-			alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-			tech_pvt->active = 0;
-			tech_pvt->name[0] = '\0';
-
-			UNLOCKA(tech_pvt->controldev_lock);
-			if (tech_pvt->owner) {
-				tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-				gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-			}
-			switch_sleep(1000000);
-			return -1;
-		}
-
-		tmp_answer_ptr = tmp_answer_ptr + read_count;
-
-		la_counter = 0;
-		memset(tmp_answer2, 0, sizeof(char) * AT_BUFSIZ);
-		strcpy(tmp_answer2, tmp_answer);
-		if ((token_ptr = strtok(tmp_answer2, "\n\r"))) {
-			last_line_ptr = token_ptr;
-			strncpy(tech_pvt->line_array.result[la_counter], token_ptr, AT_MESG_MAX_LENGTH);
-			if (strlen(token_ptr) > AT_MESG_MAX_LENGTH) {
-				WARNINGA
-					("AT mesg longer than buffer, original message was: |%s|, in buffer only: |%s|\n",
-					 GSMOPEN_P_LOG, token_ptr, tech_pvt->line_array.result[la_counter]);
-			}
-			la_counter++;
-
-			while ((token_ptr = strtok(NULL, "\n\r"))) {
-				last_line_ptr = token_ptr;
-				strncpy(tech_pvt->line_array.result[la_counter], token_ptr, AT_MESG_MAX_LENGTH);
-				if (strlen(token_ptr) > AT_MESG_MAX_LENGTH) {
-					WARNINGA
-						("AT mesg longer than buffer, original message was: |%s|, in buffer only: |%s|\n",
-						 GSMOPEN_P_LOG, token_ptr, tech_pvt->line_array.result[la_counter]);
-				}
-				la_counter++;
-
-				if (la_counter == AT_MESG_MAX_LINES) {
-					ERRORA("Too many lines in result (>%d). la_counter=%d. tech_pvt->reading_sms_msg=%d. Stop accumulating lines.\n", GSMOPEN_P_LOG,
-						   AT_MESG_MAX_LINES, la_counter, tech_pvt->reading_sms_msg);
-					WARNINGA("read was %d bytes, tmp_answer3= --|%s|--\n", GSMOPEN_P_LOG, read_count, tmp_answer3);
-					at_ack = AT_ERROR;
-					break;
-				}
-
-			}
-		} else {
-			last_line_ptr = tmp_answer;
-		}
-
-		if (expected_string && !expect_crlf) {
-			DEBUGA_GSMOPEN
-				("last_line_ptr=|%s|, expected_string=|%s|, expect_crlf=%d, memcmp(last_line_ptr, expected_string, strlen(expected_string)) = %d\n",
-				 GSMOPEN_P_LOG, last_line_ptr, expected_string, expect_crlf, memcmp(last_line_ptr, expected_string, strlen(expected_string)));
-		}
-
-		if (expected_string && !expect_crlf && !memcmp(last_line_ptr, expected_string, strlen(expected_string))
-			) {
-			strncpy(tech_pvt->line_array.result[la_counter], last_line_ptr, AT_MESG_MAX_LENGTH);
-			// match expected string -> accept it withtout CRLF
-			la_counter++;
-			if (la_counter == AT_MESG_MAX_LINES) {
-				ERRORA("Too many lines in result (>%d). la_counter=%d. tech_pvt->reading_sms_msg=%d. Stop accumulating lines.\n", GSMOPEN_P_LOG,
-					   AT_MESG_MAX_LINES, la_counter, tech_pvt->reading_sms_msg);
-				WARNINGA("read was %d bytes, tmp_answer3= --|%s|--\n", GSMOPEN_P_LOG, read_count, tmp_answer3);
-				at_ack = AT_ERROR;
-				break;
-			}
-		}
-		/* if the last line read was not a complete line, we'll read the rest in the future */
-		else if (tmp_answer[strlen(tmp_answer) - 1] != '\r' && tmp_answer[strlen(tmp_answer) - 1] != '\n')
-			la_counter--;
-
-		/* let's list the complete lines read so far, without re-listing the lines that have already been listed */
-		for (i = la_read; i < la_counter; i++) {
-			DEBUGA_GSMOPEN("Read line %d: |%s| la_counter=%d\n", GSMOPEN_P_LOG, i, tech_pvt->line_array.result[i], la_counter);
-		}
-
-		if (la_counter == AT_MESG_MAX_LINES) {
-			ERRORA("Too many lines in result (>%d). la_counter=%d. tech_pvt->reading_sms_msg=%d. Stop accumulating lines.\n", GSMOPEN_P_LOG,
-				   AT_MESG_MAX_LINES, la_counter, tech_pvt->reading_sms_msg);
-			WARNINGA("read was %d bytes, tmp_answer3= --|%s|--\n", GSMOPEN_P_LOG, read_count, tmp_answer3);
-			at_ack = AT_ERROR;
-			break;
-		}
-
-
-		/* let's interpret the complete lines read so far (WITHOUT looking for OK, ERROR, and EXPECTED_STRING), without re-interpreting the lines that has been yet interpreted, so we're sure we don't miss anything */
-		for (i = la_read; i < la_counter; i++) {
-
-			if ((strcmp(tech_pvt->line_array.result[i], "RING") == 0)) {
-				/* with first RING we wait for callid */
-				gettimeofday(&(tech_pvt->ringtime), NULL);
-				/* give CALLID (+CLIP) a chance, wait for the next RING before answering */
-				if (tech_pvt->phone_callflow == CALLFLOW_INCOMING_RING) {
-					/* we're at the second ring, set the interface state, will be answered by gsmopen_do_monitor */
-					DEBUGA_GSMOPEN("|%s| got second RING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					tech_pvt->interface_state = GSMOPEN_STATE_RING;
-				} else {
-					/* we're at the first ring, so there is no CALLID yet thus clean the previous one
-					   just in case we don't receive the caller identification in this new call */
-					memset(tech_pvt->callid_name, 0, sizeof(tech_pvt->callid_name));
-					memset(tech_pvt->callid_number, 0, sizeof(tech_pvt->callid_number));
-					/* only send AT+CLCC? if the device previously reported its support */
-					if (tech_pvt->at_has_clcc != 0) {
-						/* we're at the first ring, try to get CALLID (with +CLCC) */
-						DEBUGA_GSMOPEN("|%s| got first RING, sending AT+CLCC?\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						int res = gsmopen_serial_write_AT_noack(tech_pvt, "AT+CLCC?");
-						if (res) {
-							ERRORA("AT+CLCC? (call list) was not correctly sent to the phone\n", GSMOPEN_P_LOG);
-						}
-					} else {
-						DEBUGA_GSMOPEN("|%s| got first RING, but not sending AT+CLCC? as this device "
-									   "seems not to support\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					}
-				}
-				tech_pvt->phone_callflow = CALLFLOW_INCOMING_RING;
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CLCC", 5) == 0)) {
-				int commacount = 0;
-				int a = 0;
-				int b = 0;
-				int c = 0;
-				/* with clcc we wait for clip */
-				memset(tech_pvt->callid_name, 0, sizeof(tech_pvt->callid_name));
-				memset(tech_pvt->callid_number, 0, sizeof(tech_pvt->callid_number));
-
-				for (a = 0; a < (int) strlen(tech_pvt->line_array.result[i]); a++) {
-
-					if (tech_pvt->line_array.result[i][a] == ',') {
-						commacount++;
-					}
-					if (commacount == 5) {
-						if (tech_pvt->line_array.result[i][a] != ',' && tech_pvt->line_array.result[i][a] != '"') {
-							tech_pvt->callid_number[b] = tech_pvt->line_array.result[i][a];
-							b++;
-						}
-					}
-					if (commacount == 7) {
-						if (tech_pvt->line_array.result[i][a] != ',' && tech_pvt->line_array.result[i][a] != '"') {
-							tech_pvt->callid_name[c] = tech_pvt->line_array.result[i][a];
-							c++;
-						}
-					}
-				}
-
-				tech_pvt->phone_callflow = CALLFLOW_INCOMING_RING;
-				DEBUGA_GSMOPEN("|%s| CLCC CALLID: name is %s, number is %s\n", GSMOPEN_P_LOG,
-							   tech_pvt->line_array.result[i],
-							   tech_pvt->callid_name[0] ? tech_pvt->callid_name : "not available",
-							   tech_pvt->callid_number[0] ? tech_pvt->callid_number : "not available");
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CLIP", 5) == 0)) {
-				int commacount = 0;
-				int a = 0;
-				int b = 0;
-				int c = 0;
-				/* with CLIP, we want to answer right away */
-				memset(tech_pvt->callid_name, 0, sizeof(tech_pvt->callid_name));
-				memset(tech_pvt->callid_number, 0, sizeof(tech_pvt->callid_number));
-
-				for (a = 7; a < (int) strlen(tech_pvt->line_array.result[i]); a++) {
-					if (tech_pvt->line_array.result[i][a] == ',') {
-						commacount++;
-					}
-					if (commacount == 0) {
-						if (tech_pvt->line_array.result[i][a] != ',' && tech_pvt->line_array.result[i][a] != '"') {
-							tech_pvt->callid_number[b] = tech_pvt->line_array.result[i][a];
-							b++;
-						}
-					}
-					if (commacount == 4) {
-						if (tech_pvt->line_array.result[i][a] != ',' && tech_pvt->line_array.result[i][a] != '"') {
-							tech_pvt->callid_name[c] = tech_pvt->line_array.result[i][a];
-							c++;
-						}
-					}
-				}
-
-				if (tech_pvt->interface_state != GSMOPEN_STATE_RING) {
-					gettimeofday(&(tech_pvt->call_incoming_time), NULL);
-					DEBUGA_GSMOPEN("GSMOPEN_STATE_RING call_incoming_time.tv_sec=%ld\n", GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec);
-
-				}
-
-				tech_pvt->interface_state = GSMOPEN_STATE_RING;
-				tech_pvt->phone_callflow = CALLFLOW_INCOMING_RING;
-				DEBUGA_GSMOPEN("|%s| CLIP INCOMING CALLID: name is %s, number is %s\n", GSMOPEN_P_LOG,
-							   tech_pvt->line_array.result[i],
-							   (strlen(tech_pvt->callid_name) && tech_pvt->callid_name[0] != 1) ? tech_pvt->callid_name : "not available",
-							   strlen(tech_pvt->callid_number) ? tech_pvt->callid_number : "not available");
-
-				if (!strlen(tech_pvt->callid_number)) {
-					strcpy(tech_pvt->callid_number, "not available");
-				}
-
-				if (!strlen(tech_pvt->callid_name) && tech_pvt->callid_name[0] != 1) {
-					strncpy(tech_pvt->callid_name, tech_pvt->callid_number, sizeof(tech_pvt->callid_name));
-					snprintf(tech_pvt->callid_name, sizeof(tech_pvt->callid_name), "GSMopen: %s", tech_pvt->callid_number);
-				}
-
-				DEBUGA_GSMOPEN("|%s| CLIP INCOMING CALLID: NOW name is %s, number is %s\n", GSMOPEN_P_LOG,
-							   tech_pvt->line_array.result[i], tech_pvt->callid_name, tech_pvt->callid_number);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], "+CMS ERROR: 500") == 0)) {
-				ERRORA("Received: \"%s\", generic error, maybe this account ran OUT OF CREDIT?\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			} else if ((strncmp(tech_pvt->line_array.result[i], "+CMS ERROR:", 11) == 0)) {
-				ERRORA("Received: \"%s\", what was this error about?\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "BUSY") == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_LINEBUSY;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_LINEBUSY\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->phone_callflow != CALLFLOW_CALL_DOWN) {
-					switch_core_session_t *session = NULL;
-					switch_channel_t *channel = NULL;
-
-					tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-
-					session = switch_core_session_locate(tech_pvt->session_uuid_str);
-					if (session) {
-						channel = switch_core_session_get_channel(session);
-						switch_core_session_rwunlock(session);
-						switch_channel_hangup(channel, SWITCH_CAUSE_NONE);
-					}
-
-				} else {
-					ERRORA("Why BUSY now?\n", GSMOPEN_P_LOG);
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "NO ANSWER") == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_NOANSWER;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_NOANSWER\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_NO_ANSWER;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				} else {
-					ERRORA("Why NO ANSWER now?\n", GSMOPEN_P_LOG);
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "NO CARRIER") == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_NOCARRIER;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_NOCARRIER\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-					switch_core_session_t *session = NULL;
-					switch_channel_t *channel = NULL;
-
-					tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-
-					session = switch_core_session_locate(tech_pvt->session_uuid_str);
-					if (session) {
-						channel = switch_core_session_get_channel(session);
-						switch_core_session_rwunlock(session);
-						switch_channel_hangup(channel, SWITCH_CAUSE_NONE);
-					}
-				} else {
-					ERRORA("Why NO CARRIER now?\n", GSMOPEN_P_LOG);
-				}
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CBC:", 5) == 0)) {
-				int power_supply, battery_strenght, err;
-
-				power_supply = battery_strenght = 0;
-
-				err = sscanf(&tech_pvt->line_array.result[i][6], "%d,%d", &power_supply, &battery_strenght);
-				if (err < 2) {
-					DEBUGA_GSMOPEN("|%s| is not formatted as: |+CBC: xx,yy| now trying  |+CBC:xx,yy|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-					err = sscanf(&tech_pvt->line_array.result[i][5], "%d,%d", &power_supply, &battery_strenght);
-					DEBUGA_GSMOPEN("|%s| +CBC: Powered by %s, battery strenght=%d\n", GSMOPEN_P_LOG,
-								   tech_pvt->line_array.result[i], power_supply ? "power supply" : "battery", battery_strenght);
-
-				}
-
-				if (err < 2) {
-					DEBUGA_GSMOPEN("|%s| is not formatted as: |+CBC:xx,yy| giving up\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				}
-
-				else {
-					if (option_debug > 1)
-						DEBUGA_GSMOPEN("|%s| +CBC: Powered by %s, battery strenght=%d\n", GSMOPEN_P_LOG,
-									   tech_pvt->line_array.result[i], power_supply ? "power supply" : "battery", battery_strenght);
-					if (!power_supply) {
-						if (battery_strenght < 10) {
-							ERRORA("|%s| BATTERY ALMOST EXHAUSTED\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						} else if (battery_strenght < 20) {
-							WARNINGA("|%s| BATTERY LOW\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-						}
-
-					}
-				}
-
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CSQ:", 5) == 0)) {
-				int signal_quality, ber, err;
-
-				signal_quality = ber = 0;
-
-				err = sscanf(&tech_pvt->line_array.result[i][6], "%d,%d", &signal_quality, &ber);
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| +CSQ: Signal Quality: %d, Error Rate=%d\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], signal_quality, ber);
-				if (err < 2) {
-					ERRORA("|%s| is not formatted as: |+CSQ: xx,yy|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				} else {
-					if (signal_quality < 9 || signal_quality == 99) {
-						ERRORA
-							("|%s| CELLPHONE GETS ALMOST NO SIGNAL, consider to move it or use additional antenna\n",
-							 GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						tech_pvt->got_signal = 0;
-						alarm_event(tech_pvt, ALARM_NETWORK_NO_SIGNAL, "CELLPHONE GETS ALMOST NO SIGNAL, consider to move it or use additional antenna");
-					} else if (signal_quality < 11) {
-						WARNINGA("|%s| CELLPHONE GETS SIGNAL LOW\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						tech_pvt->got_signal = 1;
-						alarm_event(tech_pvt, ALARM_NETWORK_LOW_SIGNAL, "CELLPHONE GETS SIGNAL LOW");
-					} else {
-						tech_pvt->got_signal = 2;
-					}
-
-					if (signal_quality == 99) {
-						tech_pvt->signal_strength = 0;
-					} else {
-						tech_pvt->signal_strength = (signal_quality * 2) - 113; /* RSSI [dBm] = reported_value * 2 - 113dB */
-					}
-
-				}
-
-			}
-			if ((strncmp(tech_pvt->line_array.result[i], "+CREG:", 6) == 0)) {
-				int n, stat, err;
-
-				n = stat = 0;
-
-				err = sscanf(&tech_pvt->line_array.result[i][6], "%d,%d", &n, &stat);
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| +CREG: Display: %d, Registration=%d\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], n, stat);
-				if (err < 2) {
-					DEBUGA_GSMOPEN("|%s| is not formatted as: |+CREG: xx,yy|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				} else {
-					if (stat == 0) {
-						ERRORA
-							("|%s| CELLPHONE is not registered to network, consider to move it or use additional antenna\n",
-							 GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						tech_pvt->not_registered = 1;
-						tech_pvt->home_network_registered = 0;
-						tech_pvt->roaming_registered = 0;
-						alarm_event(tech_pvt, ALARM_NO_NETWORK_REGISTRATION,
-									"CELLPHONE is not registered to network, consider to move it or use additional antenna");
-					} else if (stat == 1) {
-						DEBUGA_GSMOPEN("|%s| CELLPHONE is registered to the HOME network\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						tech_pvt->not_registered = 0;
-						tech_pvt->home_network_registered = 1;
-						tech_pvt->roaming_registered = 0;
-					} else {
-						ERRORA("|%s| CELLPHONE is registered to a ROAMING network\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						tech_pvt->not_registered = 0;
-						tech_pvt->home_network_registered = 0;
-						tech_pvt->roaming_registered = 1;
-						alarm_event(tech_pvt, ALARM_ROAMING_NETWORK_REGISTRATION, "CELLPHONE is registered to a ROAMING network");
-					}
-				}
-
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+COPS:", 6) == 0)) {
-				int mode, format, rat, err;
-				char oper[128] = "";
-				mode = format = rat = err = 0;
-
-				err = sscanf(&tech_pvt->line_array.result[i][6], "%d,%d,%*[\"]%[^\"]%*[\"],%d", &mode, &format, &oper, &rat);
-				if (err < 3) {
-					DEBUGA_GSMOPEN("|%s| is not formatted as: |+COPS: xx,yy,ssss,nn|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				} else if (option_debug > 1) {
-					DEBUGA_GSMOPEN("|%s| +COPS: : Mode %d, Format %d, Operator %s, Rat %d\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], mode, format, oper, rat);
-				}
-
-				/* if we are requesting the operator name, copy it over */
-				if (tech_pvt->requesting_operator_name)
-					strncpy(tech_pvt->operator_name, oper, sizeof(tech_pvt->operator_name));
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CNUM:", 6) == 0) || (strncmp(tech_pvt->line_array.result[i], "ERROR+CNUM:", 11) == 0)) {
-				int  skip_chars, err, type;
-				char number[128] = "";
-				char *in_ptr, *out_ptr;
-
-				skip_chars = err = type = 0;
-				in_ptr = out_ptr = number;
-
-				/* +CNUM or ERROR+CNUM ? */
-				if ((strncmp(tech_pvt->line_array.result[i], "+CNUM:", 6) == 0))
-					skip_chars = 7;
-				else
-					skip_chars = 12;
-
-				err = sscanf(&tech_pvt->line_array.result[i][skip_chars], "%*[^,],%[^,],%d", &number, &type);
-
-				/* Remove any double quotes */
-				while (*in_ptr) {
-					if (*in_ptr != '\"') *out_ptr++ = *in_ptr;
-					in_ptr++;
-				}
-				*out_ptr = '\0';
-
-				if (err < 2) {
-					DEBUGA_GSMOPEN("|%s| is not formatted as: |+CNUM: \"Name\", \"+39025458068\", 145|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				} else if (option_debug) {
-					DEBUGA_GSMOPEN("|%s| +CNUM: Subscriber number = %s, Type = %d\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], number, type);
-				}
-
-				/* Copy only the first number listed if there are more then one */
-				if (tech_pvt->requesting_subscriber_number && !strlen(tech_pvt->subscriber_number))
-					strncpy(tech_pvt->subscriber_number, number, sizeof(tech_pvt->subscriber_number));
-
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMGW:", 6) == 0)) {
-				int err;
-
-				err = sscanf(&tech_pvt->line_array.result[i][7], "%s", tech_pvt->at_cmgw);
-				DEBUGA_GSMOPEN("|%s| +CMGW: %s\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], tech_pvt->at_cmgw);
-				if (err < 1) {
-					ERRORA("|%s| is not formatted as: |+CMGW: xxxx|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				}
-
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "^CEND:1", 7) == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_NOCARRIER;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_NOCARRIER\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-					switch_core_session_t *session = NULL;
-					switch_channel_t *channel = NULL;
-
-					tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-
-					session = switch_core_session_locate(tech_pvt->session_uuid_str);
-					if (session) {
-						channel = switch_core_session_get_channel(session);
-						switch_core_session_rwunlock(session);
-						switch_channel_hangup(channel, SWITCH_CAUSE_NONE);
-					}
-					tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-					if (option_debug > 1)
-						DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_IDLE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-						DEBUGA_GSMOPEN("just received a remote HANGUP\n", GSMOPEN_P_LOG);
-						tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_NORMAL;
-						gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-						DEBUGA_GSMOPEN("just sent GSMOPEN_CONTROL_HANGUP\n", GSMOPEN_P_LOG);
-					}
-				} else {
-					ERRORA("Why NO CARRIER now?\n", GSMOPEN_P_LOG);
-				}
-			}
-
-			/* at_call_* are unsolicited messages sent by the modem to signal us about call processing activity and events */
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_idle) == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_IDLE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					DEBUGA_GSMOPEN("just received a remote HANGUP\n", GSMOPEN_P_LOG);
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_NORMAL;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-					DEBUGA_GSMOPEN("just sent GSMOPEN_CONTROL_HANGUP\n", GSMOPEN_P_LOG);
-				}
-
-				tech_pvt->phone_callflow = CALLFLOW_CALL_NOCARRIER;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_NOCARRIER\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-					switch_core_session_t *session = NULL;
-					switch_channel_t *channel = NULL;
-
-					tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-
-					session = switch_core_session_locate(tech_pvt->session_uuid_str);
-					if (session) {
-						channel = switch_core_session_get_channel(session);
-						switch_core_session_rwunlock(session);
-						switch_channel_hangup(channel, SWITCH_CAUSE_NONE);
-					}
-				} else {
-					ERRORA("Why NO CARRIER now?\n", GSMOPEN_P_LOG);
-				}
-
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_incoming) == 0)) {
-
-
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_INCOMING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-				if (tech_pvt->phone_callflow != CALLFLOW_CALL_INCOMING && tech_pvt->phone_callflow != CALLFLOW_INCOMING_RING) {
-					//mark the time of CALLFLOW_CALL_INCOMING
-					gettimeofday(&(tech_pvt->call_incoming_time), NULL);
-					tech_pvt->phone_callflow = CALLFLOW_CALL_INCOMING;
-					DEBUGA_GSMOPEN("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld\n", GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec);
-
-				}
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_active) == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
-				DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_ACTIVE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-				if (tech_pvt->interface_state == CALLFLOW_CALL_DIALING || tech_pvt->interface_state == CALLFLOW_STATUS_EARLYMEDIA) {
-					DEBUGA_PBX("just received a remote ANSWER\n", GSMOPEN_P_LOG);
-					if (tech_pvt->phone_callflow == GSMOPEN_STATE_UP) {
-						DEBUGA_PBX("just sent GSMOPEN_CONTROL_RINGING\n", GSMOPEN_P_LOG);
-						DEBUGA_PBX("going to send GSMOPEN_CONTROL_ANSWER\n", GSMOPEN_P_LOG);
-						tech_pvt->interface_state = CALLFLOW_CALL_REMOTEANSWER;
-						DEBUGA_PBX("just sent GSMOPEN_CONTROL_ANSWER\n", GSMOPEN_P_LOG);
-					}
-				} else {
-					tech_pvt->interface_state = GSMOPEN_STATE_UP;
-					DEBUGA_PBX("just interface_state UP\n", GSMOPEN_P_LOG);
-				}
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_calling) == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_DIALING;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_DIALING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_call_failed) == 0)) {
-				tech_pvt->phone_callflow = CALLFLOW_CALL_FAILED;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_FAILED\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CSCA:", 6) == 0)) {	//TODO SMS FIXME in config!
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| +CSCA: Message Center Address!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMGF:", 6) == 0)) {	//TODO SMS FIXME in config!
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| +CMGF: Message Format!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMTI:", 6) == 0)) {	//TODO SMS FIXME in config!
-				int err;
-				int pos;
-
-				//FIXME all the following commands in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMTI: Incoming SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-				err = sscanf(&tech_pvt->line_array.result[i][12], "%d", &pos);
-				if (err < 1) {
-					ERRORA("|%s| is not formatted as: |+CMTI: \"MT\",xx|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				} else {
-					DEBUGA_GSMOPEN("|%s| +CMTI: Incoming SMS in position: %d!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i], pos);
-					tech_pvt->unread_sms_msg_id = pos;
-					gsmopen_sleep(1000);
-
-					char at_command[256];
-
-					if (tech_pvt->no_ucs2 == 0) {
-						int res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CSCS=\"UCS2\"");
-						if (res) {
-							ERRORA("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  didn't get OK from the phone, continuing\n", GSMOPEN_P_LOG);
-							//memset(tech_pvt->sms_message, 0, sizeof(tech_pvt->sms_message));
-						}
-					}
-
-					memset(at_command, 0, sizeof(at_command));
-					sprintf(at_command, "AT+CMGR=%d", tech_pvt->unread_sms_msg_id);
-					memset(tech_pvt->sms_message, 0, sizeof(tech_pvt->sms_message));
-
-					tech_pvt->reading_sms_msg = 1;
-					int res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-					tech_pvt->reading_sms_msg = 0;
-					if (res) {
-						ERRORA("AT+CMGR (read SMS) didn't get OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
-					}
-					memset(at_command, 0, sizeof(at_command));
-					sprintf(at_command, "AT+CMGD=%d", tech_pvt->unread_sms_msg_id);	/* delete the message */
-					tech_pvt->unread_sms_msg_id = 0;
-					res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-					if (res) {
-						ERRORA("AT+CMGD (Delete SMS) didn't get OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
-					}
-
-					res = sms_incoming(tech_pvt);
-
-					if (tech_pvt->phone_callflow == CALLFLOW_CALL_IDLE && tech_pvt->interface_state == GSMOPEN_STATE_DOWN && tech_pvt->owner == NULL) {
-						/* we're not in a call, neither calling */
-						res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CKPD=\"EEE\"");
-						if (res) {
-							DEBUGA_GSMOPEN("AT+CKPD=\"EEE\" (cellphone screen back to user) didn't get OK from the phone\n", GSMOPEN_P_LOG);
-						}
-					}
-
-				}				//CMTI well formatted
-
-			}					//CMTI
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+MMGL:", 6) == 0)) {	//TODO MOTOROLA SMS FIXME in config!
-				int err = 0;
-
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +MMGL: Listing Motorola SMSs!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-				err = sscanf(&tech_pvt->line_array.result[i][7], "%d", &tech_pvt->unread_sms_msg_id);
-				if (err < 1) {
-					ERRORA("|%s| is not formatted as: |+MMGL: xx|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				}
-			}
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMGL:", 6) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGL: Listing SMSs!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-			if ((strncmp(tech_pvt->line_array.result[i], "+MMGR:", 6) == 0)) {	//TODO MOTOROLA SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +MMGR: Reading Motorola SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->reading_sms_msg)
-					tech_pvt->reading_sms_msg++;
-			}
-			if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: \"STO U", 13) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading stored UNSENT SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			} else if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: \"STO S", 13) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading stored SENT SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			} else if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: \"REC R", 13) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading received READ SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			} else if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: \"REC U", 13) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading received UNREAD SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->reading_sms_msg)
-					tech_pvt->reading_sms_msg++;
-			} else if ((strncmp(tech_pvt->line_array.result[i], "+CMGR: ", 6) == 0)) {	//TODO  SMS FIXME in config!
-				if (option_debug)
-					DEBUGA_GSMOPEN("|%s| +CMGR: Reading SMS!\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->reading_sms_msg)
-					tech_pvt->reading_sms_msg++;
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], "+MCST: 17") == 0)) {	/* motorola call processing unsolicited messages */
-				tech_pvt->phone_callflow = CALLFLOW_CALL_INFLUX;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_INFLUX\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], "+MCST: 68") == 0)) {	/* motorola call processing unsolicited messages */
-				tech_pvt->phone_callflow = CALLFLOW_CALL_NOSERVICE;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_NOSERVICE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "+MCST: 70") == 0)) {	/* motorola call processing unsolicited messages */
-				tech_pvt->phone_callflow = CALLFLOW_CALL_OUTGOINGRESTRICTED;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_OUTGOINGRESTRICTED\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "+MCST: 72") == 0)) {	/* motorola call processing unsolicited messages */
-				tech_pvt->phone_callflow = CALLFLOW_CALL_SECURITYFAIL;
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| CALLFLOW_CALL_SECURITYFAIL\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN && tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "+CPBR", 5) == 0)) {	/* phonebook stuff begins */
-
-				if (tech_pvt->phonebook_querying) {	/* probably phonebook struct begins */
-					int err, first_entry, last_entry, number_lenght, text_lenght;
-
-					if (option_debug)
-						DEBUGA_GSMOPEN("phonebook struct: |%s|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-					err = sscanf(&tech_pvt->line_array.result[i][8], "%d-%d),%d,%d", &first_entry, &last_entry, &number_lenght, &text_lenght);
-					if (err < 4) {
-
-						err = sscanf(&tech_pvt->line_array.result[i][7], "%d-%d,%d,%d", &first_entry, &last_entry, &number_lenght, &text_lenght);
-					}
-
-					if (err < 4) {
-						ERRORA
-							("phonebook struct: |%s| is nor formatted as: |+CPBR: (1-750),40,14| neither as: |+CPBR: 1-750,40,14|\n",
-							 GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					} else {
-
-						if (option_debug)
-							DEBUGA_GSMOPEN
-								("First entry: %d, last entry: %d, phone number max lenght: %d, text max lenght: %d\n",
-								 GSMOPEN_P_LOG, first_entry, last_entry, number_lenght, text_lenght);
-						tech_pvt->phonebook_first_entry = first_entry;
-						tech_pvt->phonebook_last_entry = last_entry;
-						tech_pvt->phonebook_number_lenght = number_lenght;
-						tech_pvt->phonebook_text_lenght = text_lenght;
-					}
-
-				} else {		/* probably phonebook entry begins */
-
-					if (tech_pvt->phonebook_listing) {
-						int err, entry_id, entry_type;
-
-						char entry_number[256];
-						char entry_text[256];
-
-						if (option_debug)
-							DEBUGA_GSMOPEN("phonebook entry: |%s|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-						err =
-							sscanf(&tech_pvt->line_array.result[i][7], "%d,\"%255[0-9+]\",%d,\"%255[^\"]\"", &entry_id, entry_number, &entry_type,
-								   entry_text);
-						if (err < 4) {
-							ERRORA
-								("err=%d, phonebook entry: |%s| is not formatted as: |+CPBR: 504,\"+39025458068\",145,\"ciao a tutti\"|\n",
-								 GSMOPEN_P_LOG, err, tech_pvt->line_array.result[i]);
-						} else {
-							//TODO: sanitize entry_text
-							if (option_debug)
-								DEBUGA_GSMOPEN("Number: %s, Text: %s, Type: %d\n", GSMOPEN_P_LOG, entry_number, entry_text, entry_type);
-							/* write entry in phonebook file */
-							if (tech_pvt->phonebook_writing_fp) {
-								gsmopen_dir_entry_extension++;
-
-								fprintf(tech_pvt->phonebook_writing_fp,
-										"%s  => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcell=%s|phonebook_entry_owner=%s\n",
-										entry_number, entry_text, "no",
-										tech_pvt->gsmopen_dir_entry_extension_prefix, "2", gsmopen_dir_entry_extension, "yes", "not_specified");
-								fprintf(tech_pvt->phonebook_writing_fp,
-										"%s  => ,%sDO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromcell=%s|phonebook_entry_owner=%s\n",
-										entry_number, entry_text, "no",
-										tech_pvt->gsmopen_dir_entry_extension_prefix, "3", gsmopen_dir_entry_extension, "yes", "not_specified");
-							}
-						}
-
-					}
-
-					if (tech_pvt->phonebook_listing_received_calls) {
-						int err, entry_id, entry_type;
-
-						char entry_number[256] = "";
-						char entry_text[256] = "";
-
-						if (option_debug)
-							DEBUGA_GSMOPEN("phonebook entry: |%s|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-						err =
-							sscanf(&tech_pvt->line_array.result[i][7], "%d,\"%255[0-9+]\",%d,\"%255[^\"]\"", &entry_id, entry_number, &entry_type,
-								   entry_text);
-						if (err < 1) {	//we match only on the progressive id, maybe the remote party has not sent its number, and/or there is no corresponding text entry in the phone directory
-							ERRORA
-								("err=%d, phonebook entry: |%s| is not formatted as: |+CPBR: 504,\"+39025458068\",145,\"ciao a tutti\"|\n",
-								 GSMOPEN_P_LOG, err, tech_pvt->line_array.result[i]);
-						} else {
-							//TODO: sanitize entry_text
-
-							if (option_debug)
-								DEBUGA_GSMOPEN("Number: %s, Text: %s, Type: %d\n", GSMOPEN_P_LOG, entry_number, entry_text, entry_type);
-							memset(tech_pvt->callid_name, 0, sizeof(tech_pvt->callid_name));
-							memset(tech_pvt->callid_number, 0, sizeof(tech_pvt->callid_number));
-							strncpy(tech_pvt->callid_name, entry_text, sizeof(tech_pvt->callid_name));
-							strncpy(tech_pvt->callid_number, entry_number, sizeof(tech_pvt->callid_number));
-							if (option_debug)
-								DEBUGA_GSMOPEN("incoming callid: Text: %s, Number: %s\n", GSMOPEN_P_LOG, tech_pvt->callid_name, tech_pvt->callid_number);
-
-							DEBUGA_GSMOPEN("|%s| CPBR INCOMING CALLID: name is %s, number is %s\n",
-										   GSMOPEN_P_LOG, tech_pvt->line_array.result[i],
-										   tech_pvt->callid_name[0] != 1 ? tech_pvt->callid_name : "not available",
-										   tech_pvt->callid_number[0] ? tech_pvt->callid_number : "not available");
-
-							/* mark the time of RING */
-							gettimeofday(&(tech_pvt->ringtime), NULL);
-							tech_pvt->interface_state = GSMOPEN_STATE_RING;
-							tech_pvt->phone_callflow = CALLFLOW_INCOMING_RING;
-
-						}
-
-					}
-
-					else {
-						DEBUGA_GSMOPEN("phonebook entry: |%s|\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-
-					}
-				}
-
-			}
-			if ((strncmp(tech_pvt->line_array.result[i], "+CUSD:", 6) == 0)) {
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("|%s| USSD received\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				int res = 0, status = 0;
-				unsigned int dcs = 0;
-				char ussd_msg[1024];
-				memset(tech_pvt->ussd_message, '\0', sizeof(tech_pvt->ussd_message));
-				memset(tech_pvt->ussd_dcs, '\0', sizeof(tech_pvt->ussd_dcs));
-				res = sscanf(&tech_pvt->line_array.result[i][6], "%d,\"%1023[0-9A-F]\",%d", &status, ussd_msg, &dcs);
-				if (res == 1) {
-					NOTICA("received +CUSD with status %d\n", GSMOPEN_P_LOG, status);
-					tech_pvt->ussd_received = 1;
-					tech_pvt->ussd_status = status;
-				} else if (res == 3) {
-					tech_pvt->ussd_received = 1;
-					tech_pvt->ussd_status = status;
-
-					//identifying dcs alphabet according to GSM 03.38 Cell Broadcast Data Coding Scheme
-					//CBDataCodingScheme should be used here, but it appears to be buggy (ucs2 messages are not recognized)
-					int alphabet = DCS_RESERVED_ALPHABET;
-					if (dcs == 0x11) {
-						alphabet = DCS_SIXTEEN_BIT_ALPHABET;
-					} else if ((dcs & 0xF0) <= 0x30){
-						alphabet = DCS_DEFAULT_ALPHABET;
-					} else if ((dcs & 0xC0) == 0x40 || (dcs & 0xF0) == 0x90) {
-						alphabet = dcs & (3 << 2);
-					};
-
-					if ( (tech_pvt->ussd_response_encoding == USSD_ENCODING_AUTO && alphabet == DCS_DEFAULT_ALPHABET)
-							|| tech_pvt->ussd_response_encoding == USSD_ENCODING_HEX_7BIT ) {
-						SMSDecoder d(ussd_msg);
-						d.markSeptet();
-						string ussd_dec = gsmToLatin1(d.getString(strlen(ussd_msg) / 2 * 8 / 7));
-						iso_8859_1_to_utf8(tech_pvt, (char *) ussd_dec.c_str(), tech_pvt->ussd_message, sizeof(tech_pvt->ussd_message));
-						strcpy(tech_pvt->ussd_dcs, "default alphabet");
-					} else if ( (tech_pvt->ussd_response_encoding == USSD_ENCODING_AUTO && alphabet == DCS_SIXTEEN_BIT_ALPHABET)
-								|| tech_pvt->ussd_response_encoding == USSD_ENCODING_UCS2 ) {
-						ucs2_to_utf8(tech_pvt, ussd_msg, tech_pvt->ussd_message, sizeof(tech_pvt->ussd_message));
-						strcpy(tech_pvt->ussd_dcs, "16-bit alphabet");
-					} else if ( (tech_pvt->ussd_response_encoding == USSD_ENCODING_AUTO && alphabet == DCS_EIGHT_BIT_ALPHABET)
-								|| tech_pvt->ussd_response_encoding == USSD_ENCODING_HEX_8BIT ) {
-						char ussd_dec[1024];
-						memset(ussd_dec, '\0', sizeof(ussd_dec));
-						hexToBuf(ussd_msg, (unsigned char*)ussd_dec);
-						iso_8859_1_to_utf8(tech_pvt, (char *) ussd_dec, tech_pvt->ussd_message, sizeof(tech_pvt->ussd_message));
-						strcpy(tech_pvt->ussd_dcs, "8-bit alphabet");
-					} else if ( tech_pvt->ussd_response_encoding == USSD_ENCODING_PLAIN ) {
-						string ussd_dec = gsmToLatin1(ussd_msg);
-						iso_8859_1_to_utf8(tech_pvt, (char *) ussd_dec.c_str(), tech_pvt->ussd_message, sizeof(tech_pvt->ussd_message));
-						strcpy(tech_pvt->ussd_dcs, "default alphabet");
-					} else {
-						ERRORA("USSD data coding scheme not supported=%d\n", GSMOPEN_P_LOG, dcs);
-					}
-
-					NOTICA("USSD received: status=%d, message='%s', dcs='%d'\n",
-						GSMOPEN_P_LOG, tech_pvt->ussd_status, tech_pvt->ussd_message, dcs);
-
-					ussd_incoming(tech_pvt);
-				} else {
-					ERRORA ("res=%d, +CUSD command has wrong format: %s\n",
-								 GSMOPEN_P_LOG, res, tech_pvt->line_array.result[i]);
-				}
-			}
-
-			if ((strncmp(tech_pvt->line_array.result[i], "*ECAV", 5) == 0) || (strncmp(tech_pvt->line_array.result[i], "*ECAM", 5) == 0)) {	/* sony-ericsson call processing unsolicited messages */
-				int res, ccid, ccstatus, calltype, processid, exitcause, number, type;
-				res = ccid = ccstatus = calltype = processid = exitcause = number = type = 0;
-				res =
-					sscanf(&tech_pvt->line_array.result[i][6], "%d,%d,%d,%d,%d,%d,%d", &ccid, &ccstatus, &calltype, &processid, &exitcause, &number,
-						   &type);
-				/* only changes the phone_callflow if enought parameters were parsed */
-				if (res >= 3) {
-					switch (ccstatus) {
-					case 0:
-						if (tech_pvt->owner) {
-							ast_setstate(tech_pvt->owner, GSMOPEN_STATE_DOWN);
-							tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_NORMAL;
-							gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-						}
-						tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-						tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: IDLE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 1:
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: CALLING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 2:
-						if (tech_pvt->owner) {
-							ast_setstate(tech_pvt->owner, GSMOPEN_STATE_DIALING);
-						}
-						tech_pvt->interface_state = CALLFLOW_CALL_DIALING;
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: CONNECTING\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 3:
-						if (tech_pvt->owner) {
-							ast_setstate(tech_pvt->owner, GSMOPEN_STATE_UP);
-							gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_ANSWER);
-						}
-						tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
-						tech_pvt->interface_state = GSMOPEN_STATE_UP;
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: ACTIVE\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 4:
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN
-								("|%s| Sony-Ericsson *ECAM/*ECAV: don't know how to handle HOLD event\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					case 5:
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN
-								("|%s| Sony-Ericsson *ECAM/*ECAV: don't know how to handle WAITING event\n", GSMOPEN_P_LOG,
-								 tech_pvt->line_array.result[i]);
-						break;
-					case 6:
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN
-								("|%s| Sony-Ericsson *ECAM/*ECAV: don't know how to handle ALERTING event\n", GSMOPEN_P_LOG,
-								 tech_pvt->line_array.result[i]);
-						break;
-					case 7:
-						if (tech_pvt->owner) {
-							ast_setstate(tech_pvt->owner, GSMOPEN_STATE_BUSY);
-							gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_BUSY);
-						}
-						tech_pvt->phone_callflow = CALLFLOW_CALL_LINEBUSY;
-						tech_pvt->interface_state = GSMOPEN_STATE_BUSY;
-						if (option_debug > 1)
-							DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: BUSY\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-						break;
-					}
-				} else {
-					if (option_debug > 1)
-						DEBUGA_GSMOPEN("|%s| Sony-Ericsson *ECAM/*ECAV: could not parse parameters\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				}
-
-			}
-
-			/* at_indicator_* are unsolicited messages sent by the phone to signal us that some of its visual indicators on its screen has changed, based on CIND CMER ETSI docs */
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_noservice_string) == 0)) {
-				ERRORA("|%s| at_indicator_noservice_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				alarm_event(tech_pvt, ALARM_NETWORK_NO_SERVICE, "at_indicator_noservice_string");
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nosignal_string) == 0)) {
-				ERRORA("|%s| at_indicator_nosignal_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				alarm_event(tech_pvt, ALARM_NETWORK_NO_SIGNAL, "at_indicator_nosignal_string");
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_lowsignal_string) == 0)) {
-				WARNINGA("|%s| at_indicator_lowsignal_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-				alarm_event(tech_pvt, ALARM_NETWORK_LOW_SIGNAL, "at_indicator_lowsignal_string");
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_lowbattchg_string) == 0)) {
-				WARNINGA("|%s| at_indicator_lowbattchg_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nobattchg_string) == 0)) {
-				ERRORA("|%s| at_indicator_nobattchg_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callactive_string) == 0)) {
-				DEBUGA_GSMOPEN("|%s| at_indicator_callactive_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nocallactive_string) == 0)) {
-				DEBUGA_GSMOPEN("|%s| at_indicator_nocallactive_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_nocallsetup_string) == 0)) {
-				DEBUGA_GSMOPEN("|%s| at_indicator_nocallsetup_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callsetupincoming_string) == 0)) {
-				DEBUGA_GSMOPEN("|%s| at_indicator_callsetupincoming_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callsetupoutgoing_string) == 0)) {
-				DEBUGA_GSMOPEN("|%s| at_indicator_callsetupoutgoing_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-			if ((strcmp(tech_pvt->line_array.result[i], tech_pvt->at_indicator_callsetupremoteringing_string)
-				 == 0)) {
-				DEBUGA_GSMOPEN("|%s| at_indicator_callsetupremoteringing_string\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-			}
-
-		}
-
-		/* let's look for OK, ERROR and EXPECTED_STRING in the complete lines read so far, without re-looking at the lines that has been yet looked at */
-		for (i = la_read; i < la_counter; i++) {
-			if (expected_string) {
-				if ((strncmp(tech_pvt->line_array.result[i], expected_string, strlen(expected_string))
-					 == 0)) {
-					if (option_debug > 1)
-						DEBUGA_GSMOPEN("|%s| got what EXPECTED\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					at_ack = AT_OK;
-				}
-			} else {
-				if ((strcmp(tech_pvt->line_array.result[i], "OK") == 0)) {
-					if (option_debug > 1)
-						DEBUGA_GSMOPEN("got OK\n", GSMOPEN_P_LOG);
-					at_ack = AT_OK;
-				}
-			}
-			if ((strcmp(tech_pvt->line_array.result[i], "ERROR") == 0)) {
-				if (option_debug > 1)
-					DEBUGA_GSMOPEN("got ERROR\n", GSMOPEN_P_LOG);
-				at_ack = AT_ERROR;
-			}
-
-			/* if we are requesting IMEI, put the line into the imei buffer if the line is not "OK" or "ERROR" */
-			if (tech_pvt->requesting_imei && at_ack == -1) {
-				if (strlen(tech_pvt->line_array.result[i])) {	/* we are reading the IMEI */
-					strncpy(tech_pvt->imei, tech_pvt->line_array.result[i], sizeof(tech_pvt->imei));
-				}
-			}
-
-			/* if we are requesting IMSI, put the line into the imsi buffer if the line is not "OK" or "ERROR" */
-			if (tech_pvt->requesting_imsi && at_ack == -1) {
-				if (strlen(tech_pvt->line_array.result[i])) {	/* we are reading the IMSI */
-					strncpy(tech_pvt->imsi, tech_pvt->line_array.result[i], sizeof(tech_pvt->imsi));
-				}
-			}
-
-			/* if we are requesting device manufacturer, model or firmware version,
-			 * put the line into the buffer if the line is not "OK" or "ERROR" */
-			if (tech_pvt->requesting_device_mfg && at_ack == -1) {
-				if (strlen(tech_pvt->line_array.result[i])) {
-					strncpy(tech_pvt->device_mfg, tech_pvt->line_array.result[i], sizeof(tech_pvt->device_mfg));
-				}
-			}
-
-			if (tech_pvt->requesting_device_model && at_ack == -1) {
-				if (strlen(tech_pvt->line_array.result[i])) {
-					strncpy(tech_pvt->device_model, tech_pvt->line_array.result[i], sizeof(tech_pvt->device_model));
-				}
-			}
-
-			if (tech_pvt->requesting_device_firmware && at_ack == -1) {
-				if (strlen(tech_pvt->line_array.result[i])) {
-					strncpy(tech_pvt->device_firmware, tech_pvt->line_array.result[i], sizeof(tech_pvt->device_firmware));
-				}
-			}
-
-
-			/* if we are reading an sms message from memory, put the line into the sms buffer if the line is not "OK" or "ERROR" */
-			if (tech_pvt->reading_sms_msg > 1 && at_ack == -1) {
-				int c;
-				char sms_body[16000];
-				int err = 0;
-				memset(sms_body, '\0', sizeof(sms_body));
-
-				if (strncmp(tech_pvt->line_array.result[i], "+CMGR", 5) == 0) {	/* we are reading the "header" of an SMS */
-					char content[512];
-					char content2[512];
-					int inside_comma = 0;
-					int inside_quote = 0;
-					int which_field = 0;
-					int d = 0;
-
-					DEBUGA_GSMOPEN("HERE\n", GSMOPEN_P_LOG);
-
-					memset(content, '\0', sizeof(content));
-
-					for (c = 0; c < (int) strlen(tech_pvt->line_array.result[i]); c++) {
-						if (tech_pvt->line_array.result[i][c] == ',' && tech_pvt->line_array.result[i][c - 1] != '\\' && inside_quote == 0) {
-							if (inside_comma) {
-								inside_comma = 0;
-								DEBUGA_GSMOPEN("inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote,
-											   &tech_pvt->line_array.result[i][c]);
-							} else {
-								inside_comma = 1;
-								DEBUGA_GSMOPEN("inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote,
-											   &tech_pvt->line_array.result[i][c]);
-							}
-						}
-						if (tech_pvt->line_array.result[i][c] == '"' && tech_pvt->line_array.result[i][c - 1] != '\\') {
-							if (inside_quote) {
-								inside_quote = 0;
-								DEBUGA_GSMOPEN("END_CONTENT inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote,
-											   &tech_pvt->line_array.result[i][c]);
-								DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content);
-
-								memset(content2, '\0', sizeof(content2));
-								if (which_field == 1) {
-									err = ucs2_to_utf8(tech_pvt, content, content2, sizeof(content2));
-								} else {
-									err = 0;
-									strncpy(content2, content, sizeof(content2));
-								}
-								DEBUGA_GSMOPEN("%d content2=%s\n", GSMOPEN_P_LOG, which_field, content2);
-								DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content2);
-
-								memset(content, '\0', sizeof(content));
-								d = 0;
-								if (which_field == 1) {
-									strncpy(tech_pvt->sms_sender, content2, sizeof(tech_pvt->sms_sender));
-									DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content2);
-
-								} else if (which_field == 2) {
-									strncpy(tech_pvt->sms_date, content2, sizeof(tech_pvt->sms_date));
-									DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content2);
-								} else if (which_field > 2) {
-									WARNINGA("WHY which_field is > 2 ? (which_field is %d)\n", GSMOPEN_P_LOG, which_field);
-								}
-								which_field++;
-							} else {
-								inside_quote = 1;
-								DEBUGA_GSMOPEN("START_CONTENT inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote,
-											   &tech_pvt->line_array.result[i][c]);
-							}
-						}
-						if (inside_quote && tech_pvt->line_array.result[i][c] != '"') {
-
-							content[d] = tech_pvt->line_array.result[i][c];
-							d++;
-
-						}
-
-					}
-				}				//it was the +CMGR answer from the cellphone
-				else {
-					DEBUGA_GSMOPEN("body=%s\n", GSMOPEN_P_LOG, sms_body);
-					DEBUGA_GSMOPEN("tech_pvt->line_array.result[i]=%s\n", GSMOPEN_P_LOG, tech_pvt->line_array.result[i]);
-					if (tech_pvt->sms_pdu_not_supported) {
-						char content3[1000];
-						strncpy(tech_pvt->sms_message, tech_pvt->line_array.result[i], sizeof(tech_pvt->sms_message));
-
-
-						memset(content3, '\0', sizeof(content3));
-						DEBUGA_GSMOPEN("sms_message=%s\n", GSMOPEN_P_LOG, tech_pvt->sms_message);
-						ucs2_to_utf8(tech_pvt, tech_pvt->sms_message, content3, sizeof(content3));
-						DEBUGA_GSMOPEN("content3=%s\n", GSMOPEN_P_LOG, content3);
-						strncpy(tech_pvt->sms_body, content3, sizeof(tech_pvt->sms_body));
-						if (tech_pvt->sms_cnmi_not_supported) {
-							sms_incoming(tech_pvt);
-							DEBUGA_GSMOPEN("2 content3=%s\n", GSMOPEN_P_LOG, content3);
-						}
-					} else {
-
-
-						try {
-							char content2[1000];
-							SMSMessageRef sms;
-
-							DEBUGA_GSMOPEN("about to decode\n", GSMOPEN_P_LOG);
-							try {
-								sms = SMSMessage::decode(tech_pvt->line_array.result[i]);	// dataCodingScheme = 8 , text=ciao 123 belè новости לק ראת ﺎﻠﺠﻤﻋﺓ 人大
-							}
-							catch(...) {
-								ERRORA("GsmException\n", GSMOPEN_P_LOG);
-								gsmopen_sleep(5000);
-								return -1;
-							}
-
-							DEBUGA_GSMOPEN("after decode\n", GSMOPEN_P_LOG);
-
-#if 0
-							char letsee[1024];
-							memset(letsee, '\0', sizeof(letsee));
-
-							DEBUGA_GSMOPEN("about to letsee\n", GSMOPEN_P_LOG);
-							try {
-								sprintf(letsee, "|%s|\n", sms->toString().c_str());
-							}
-							catch(...) {
-								ERRORA("GsmException\n", GSMOPEN_P_LOG);
-								sleep(5);
-								return -1;
-							}
-							DEBUGA_GSMOPEN("after letsee\n", GSMOPEN_P_LOG);
-
-							DEBUGA_GSMOPEN("SMS=\n%s\n", GSMOPEN_P_LOG, letsee);
-#endif //0
-							memset(content2, '\0', sizeof(content2));
-							if (sms->dataCodingScheme().getAlphabet() == DCS_DEFAULT_ALPHABET) {
-								iso_8859_1_to_utf8(tech_pvt, (char *) sms->userData().c_str(), content2, sizeof(content2));
-							} else if (sms->dataCodingScheme().getAlphabet() == DCS_SIXTEEN_BIT_ALPHABET) {
-								ucs2_to_utf8(tech_pvt, (char *) bufToHex((unsigned char *) sms->userData().data(), sms->userData().length()).c_str(),
-											 content2, sizeof(content2));
-							} else {
-								ERRORA("dataCodingScheme not supported=%u\n", GSMOPEN_P_LOG, sms->dataCodingScheme().getAlphabet());
-
-							}
-							DEBUGA_GSMOPEN("dataCodingScheme=%u\n", GSMOPEN_P_LOG, sms->dataCodingScheme().getAlphabet());
-							DEBUGA_GSMOPEN("dataCodingScheme=%s\n", GSMOPEN_P_LOG, sms->dataCodingScheme().toString().c_str());
-							DEBUGA_GSMOPEN("address=%s\n", GSMOPEN_P_LOG, sms->address().toString().c_str());
-							DEBUGA_GSMOPEN("serviceCentreAddress=%s\n", GSMOPEN_P_LOG, sms->serviceCentreAddress().toString().c_str());
-							DEBUGA_GSMOPEN("serviceCentreTimestamp=%s\n", GSMOPEN_P_LOG, sms->serviceCentreTimestamp().toString().c_str());
-							DEBUGA_GSMOPEN("UserDataHeader=%s\n", GSMOPEN_P_LOG, (char *)bufToHex((unsigned char *)
-											((string) sms->userDataHeader()).data(), sms->userDataHeader().length()).c_str());
-							DEBUGA_GSMOPEN("messageType=%d\n", GSMOPEN_P_LOG, sms->messageType());
-							DEBUGA_GSMOPEN("userData= |||%s|||\n", GSMOPEN_P_LOG, content2);
-
-
-							memset(sms_body, '\0', sizeof(sms_body));
-							strncpy(sms_body, content2, sizeof(sms_body));
-							DEBUGA_GSMOPEN("body=%s\n", GSMOPEN_P_LOG, sms_body);
-							strncpy(tech_pvt->sms_body, sms_body, sizeof(tech_pvt->sms_body));
-							strncpy(tech_pvt->sms_sender, sms->address().toString().c_str(), sizeof(tech_pvt->sms_sender));
-							strncpy(tech_pvt->sms_date, sms->serviceCentreTimestamp().toString().c_str(), sizeof(tech_pvt->sms_date));
-							strncpy(tech_pvt->sms_userdataheader, (char *)
-										bufToHex((unsigned char *)((string) sms->userDataHeader()).data(), sms->userDataHeader().length()).c_str(),
-										sizeof(tech_pvt->sms_userdataheader));
-							strncpy(tech_pvt->sms_datacodingscheme, sms->dataCodingScheme().toString().c_str(), sizeof(tech_pvt->sms_datacodingscheme));
-							strncpy(tech_pvt->sms_servicecentreaddress, sms->serviceCentreAddress().toString().c_str(),
-									sizeof(tech_pvt->sms_servicecentreaddress));
-							tech_pvt->sms_messagetype = sms->messageType();
-
-						}
-							catch(...) {
-								ERRORA("GsmException\n", GSMOPEN_P_LOG);
-								gsmopen_sleep(5000);
-								return -1;
-						}
-
-
-
-
-
-					}
-
-				}				//it was the UCS2 from cellphone
-
-			}					//we were reading the SMS
-
-		}
-
-		la_read = la_counter;
-
-		if (look_for_ack && at_ack > -1)
-			break;
-
-		if (la_counter == AT_MESG_MAX_LINES) {
-			ERRORA("Too many lines in result (>%d). la_counter=%d. tech_pvt->reading_sms_msg=%d. Stop accumulating lines.\n", GSMOPEN_P_LOG,
-				   AT_MESG_MAX_LINES, la_counter, tech_pvt->reading_sms_msg);
-			WARNINGA("read was %d bytes, tmp_answer3= --|%s|--\n", GSMOPEN_P_LOG, read_count, tmp_answer3);
-			at_ack = AT_ERROR;
-			break;
-		}
-
-	}
-
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-	if (select_err == -1) {
-		ERRORA("select returned -1 on %s, setting controldev_dead, error was: %s\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name, strerror(errno));
-		tech_pvt->controldev_dead = 1;
-
-		tech_pvt->running = 0;
-		alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "select returned -1 on interface, setting controldev_dead");
-		tech_pvt->active = 0;
-		tech_pvt->name[0] = '\0';
-		if (tech_pvt->owner)
-			gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-		switch_sleep(1000000);
-		return -1;
-	}
-
-	if (tech_pvt->phone_callflow == CALLFLOW_CALL_INCOMING && tech_pvt->call_incoming_time.tv_sec) {	//after three sec of CALLFLOW_CALL_INCOMING, we assume the phone is incapable of notifying RING (eg: motorola c350), so we try to answer
-		char list_command[64];
-		struct timeval call_incoming_timeout;
-		gettimeofday(&call_incoming_timeout, NULL);
-		call_incoming_timeout.tv_sec -= 3;
-		DEBUGA_GSMOPEN
-			("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-			 GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-		if (call_incoming_timeout.tv_sec > tech_pvt->call_incoming_time.tv_sec) {
-
-			tech_pvt->call_incoming_time.tv_sec = 0;
-			tech_pvt->call_incoming_time.tv_usec = 0;
-			DEBUGA_GSMOPEN
-				("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-				 GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-			int res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CPBS=RC");
-			if (res) {
-				ERRORA("AT+CPBS=RC (select memory of received calls) was not answered by the phone\n", GSMOPEN_P_LOG);
-			}
-			tech_pvt->phonebook_querying = 1;
-			res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CPBR=?");
-			if (res) {
-				ERRORA("AT+CPBS=RC (select memory of received calls) was not answered by the phone\n", GSMOPEN_P_LOG);
-			}
-			tech_pvt->phonebook_querying = 0;
-			sprintf(list_command, "AT+CPBR=%d,%d", tech_pvt->phonebook_first_entry, tech_pvt->phonebook_last_entry);
-			tech_pvt->phonebook_listing_received_calls = 1;
-			res = gsmopen_serial_write_AT_expect_longtime(tech_pvt, list_command, "OK");
-			if (res) {
-				WARNINGA("AT+CPBR=%d,%d failed, continue\n", GSMOPEN_P_LOG, tech_pvt->phonebook_first_entry, tech_pvt->phonebook_last_entry);
-			}
-			tech_pvt->phonebook_listing_received_calls = 0;
-		}
-	}
-
-	if (tech_pvt->phone_callflow == CALLFLOW_INCOMING_RING) {
-		struct timeval call_incoming_timeout;
-		gettimeofday(&call_incoming_timeout, NULL);
-		call_incoming_timeout.tv_sec -= 10;
-		// DEBUGA_GSMOPEN ("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n", GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-		if (call_incoming_timeout.tv_sec > tech_pvt->ringtime.tv_sec) {
-			ERRORA("Ringing stopped and I have not answered. Why?\n", GSMOPEN_P_LOG);
-			DEBUGA_GSMOPEN
-				("CALLFLOW_CALL_INCOMING call_incoming_time.tv_sec=%ld, call_incoming_timeout.tv_sec=%ld\n",
-				 GSMOPEN_P_LOG, tech_pvt->call_incoming_time.tv_sec, call_incoming_timeout.tv_sec);
-			if (tech_pvt->owner) {
-				gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-			}
-		}
-	}
-	tech_pvt->line_array.elemcount = la_counter;
-	//NOTICA (" OUTSIDE this gsmopen_serial_device %s \n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-	if (look_for_ack)
-		return at_ack;
-	else
-		return 0;
-}
-
-int gsmopen_serial_write_AT(private_t *tech_pvt, const char *data)
-{
-	int howmany;
-	int i;
-	int res;
-	int count;
-	char *Data = (char *) data;
-
-	if (!tech_pvt)
-		return -1;
-
-	howmany = strlen(Data);
-
-	for (i = 0; i < howmany; i++) {
-		res = tech_pvt->serialPort_serial_control->Write(&Data[i], 1);
-
-		if (res != 1) {
-			DEBUGA_GSMOPEN("Error sending (%.1s): %d (%s)\n", GSMOPEN_P_LOG, &Data[i], res, strerror(errno));
-			gsmopen_sleep(100000);
-			for (count = 0; count < 10; count++) {
-				res = tech_pvt->serialPort_serial_control->Write(&Data[i], 1);
-				if (res == 1) {
-					DEBUGA_GSMOPEN("Successfully RE-sent (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &Data[i], count, res, strerror(errno));
-					break;
-				} else
-					DEBUGA_GSMOPEN("Error RE-sending (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &Data[i], count, res, strerror(errno));
-				gsmopen_sleep(100000);
-
-			}
-			if (res != 1) {
-				ERRORA("Error RE-sending (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &Data[i], count, res, strerror(errno));
-
-
-
-				ERRORA
-					("wrote -1 bytes!!! Nenormalno! Marking this gsmopen_serial_device %s as dead, andif it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, power down or battery exhausted\n",
-					 GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-				tech_pvt->controldev_dead = 1;
-				ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-				tech_pvt->running = 0;
-				alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-				tech_pvt->active = 0;
-				tech_pvt->name[0] = '\0';
-
-				UNLOCKA(tech_pvt->controldev_lock);
-				if (tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-				switch_sleep(1000000);
-
-
-
-
-				return -1;
-			}
-		}
-		if (option_debug > 1)
-			DEBUGA_GSMOPEN("sent data... (%.1s)\n", GSMOPEN_P_LOG, &Data[i]);
-		gsmopen_sleep(1000);	/* release the cpu */
-	}
-
-	res = tech_pvt->serialPort_serial_control->Write((char *) "\r", 1);
-
-	if (res != 1) {
-		DEBUGA_GSMOPEN("Error sending (carriage return): %d (%s)\n", GSMOPEN_P_LOG, res, strerror(errno));
-		gsmopen_sleep(100000);
-		for (count = 0; count < 10; count++) {
-			res = tech_pvt->serialPort_serial_control->Write((char *) "\r", 1);
-
-			if (res == 1) {
-				DEBUGA_GSMOPEN("Successfully RE-sent carriage return: %d %d (%s)\n", GSMOPEN_P_LOG, count, res, strerror(errno));
-				break;
-			} else
-				DEBUGA_GSMOPEN("Error RE-sending (carriage return): %d %d (%s)\n", GSMOPEN_P_LOG, count, res, strerror(errno));
-			gsmopen_sleep(100000);
-
-		}
-		if (res != 1) {
-			ERRORA("Error RE-sending (carriage return): %d %d (%s)\n", GSMOPEN_P_LOG, count, res, strerror(errno));
-
-			ERRORA
-				("wrote -1 bytes!!! Nenormalno! Marking this gsmopen_serial_device %s as dead, andif it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, power down or battery exhausted\n",
-				 GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-			tech_pvt->controldev_dead = 1;
-			ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-			tech_pvt->running = 0;
-			alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-			tech_pvt->active = 0;
-			tech_pvt->name[0] = '\0';
-
-			UNLOCKA(tech_pvt->controldev_lock);
-			if (tech_pvt->owner) {
-				tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-				gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-			}
-			switch_sleep(1000000);
-
-
-			return -1;
-		}
-	}
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("sent (carriage return)\n", GSMOPEN_P_LOG);
-	gsmopen_sleep(1000);		/* release the cpu */
-
-	return howmany;
-}
-
-int gsmopen_serial_write_AT_nocr(private_t *tech_pvt, const char *data)
-{
-	int howmany;
-	int i;
-	int res;
-	int count;
-	char *Data = (char *) data;
-
-	if (!tech_pvt)
-		return -1;
-
-	howmany = strlen(Data);
-
-	for (i = 0; i < howmany; i++) {
-		res = tech_pvt->serialPort_serial_control->Write(&Data[i], 1);
-
-		if (res != 1) {
-			DEBUGA_GSMOPEN("Error sending (%.1s): %d (%s)\n", GSMOPEN_P_LOG, &Data[i], res, strerror(errno));
-			gsmopen_sleep(100000);
-			for (count = 0; count < 10; count++) {
-				res = tech_pvt->serialPort_serial_control->Write(&Data[i], 1);
-				if (res == 1)
-					break;
-				else
-					DEBUGA_GSMOPEN("Error RE-sending (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &Data[i], count, res, strerror(errno));
-				gsmopen_sleep(100000);
-
-			}
-			if (res != 1) {
-				ERRORA("Error RE-sending (%.1s): %d %d (%s)\n", GSMOPEN_P_LOG, &Data[i], count, res, strerror(errno));
-
-				ERRORA
-					("wrote -1 bytes!!! Nenormalno! Marking this gsmopen_serial_device %s as dead, andif it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, power down or battery exhausted\n",
-					 GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-				tech_pvt->controldev_dead = 1;
-				ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-				tech_pvt->running = 0;
-				alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-				tech_pvt->active = 0;
-				tech_pvt->name[0] = '\0';
-
-				UNLOCKA(tech_pvt->controldev_lock);
-				if (tech_pvt->owner) {
-					tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-					gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-				}
-				switch_sleep(1000000);
-
-
-				return -1;
-			}
-		}
-		if (option_debug > 1)
-			DEBUGA_GSMOPEN("sent data... (%.1s)\n", GSMOPEN_P_LOG, &Data[i]);
-		gsmopen_sleep(1000);	/* release the cpu */
-	}
-
-	gsmopen_sleep(1000);		/* release the cpu */
-
-	return howmany;
-}
-
-int gsmopen_serial_write_AT_noack(private_t *tech_pvt, const char *data)
-{
-
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("gsmopen_serial_write_AT_noack: %s\n", GSMOPEN_P_LOG, data);
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (gsmopen_serial_write_AT(tech_pvt, data) != (int) strlen(data)) {
-
-		ERRORA("Error sending data... (%s)\n", GSMOPEN_P_LOG, strerror(errno));
-		UNLOCKA(tech_pvt->controldev_lock);
-
-		ERRORA
-			("wrote -1 bytes!!! Nenormalno! Marking this gsmopen_serial_device %s as dead, andif it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, power down or battery exhausted\n",
-			 GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-		tech_pvt->controldev_dead = 1;
-		ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-		tech_pvt->running = 0;
-		alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-		tech_pvt->active = 0;
-		tech_pvt->name[0] = '\0';
-
-		UNLOCKA(tech_pvt->controldev_lock);
-		if (tech_pvt->owner) {
-			tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-			gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-		}
-		switch_sleep(1000000);
-
-
-		return -1;
-	}
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return 0;
-}
-
-int gsmopen_serial_write_AT_ack(private_t *tech_pvt, const char *data)
-{
-	int at_result = AT_ERROR;
-
-	if (!tech_pvt)
-		return -1;
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("sending: %s\n", GSMOPEN_P_LOG, data);
-	if (gsmopen_serial_write_AT(tech_pvt, data) != (int) strlen(data)) {
-		ERRORA("Error sending data... (%s) \n", GSMOPEN_P_LOG, strerror(errno));
-		UNLOCKA(tech_pvt->controldev_lock);
-
-		ERRORA
-			("wrote -1 bytes!!! Nenormalno! Marking this gsmopen_serial_device %s as dead, and if it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, powered down or battery exhausted\n",
-			 GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-		tech_pvt->controldev_dead = 1;
-		ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-		tech_pvt->running = 0;
-		alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-		tech_pvt->active = 0;
-		tech_pvt->name[0] = '\0';
-
-		UNLOCKA(tech_pvt->controldev_lock);
-		if (tech_pvt->owner) {
-			tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-			gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-		}
-		switch_sleep(1000000);
-
-
-		return -1;
-	}
-	at_result = gsmopen_serial_read_AT(tech_pvt, 1, 100000, 0, NULL, 1);	// 1/10th sec timeout
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return at_result;
-
-}
-
-int gsmopen_serial_write_AT_ack_nocr_longtime(private_t *tech_pvt, const char *data)
-{
-	int at_result = AT_ERROR;
-
-	if (!tech_pvt)
-		return -1;
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("sending: %s\n", GSMOPEN_P_LOG, data);
-	if (gsmopen_serial_write_AT_nocr(tech_pvt, data) != (int) strlen(data)) {
-		ERRORA("Error sending data... (%s) \n", GSMOPEN_P_LOG, strerror(errno));
-		UNLOCKA(tech_pvt->controldev_lock);
-
-		ERRORA
-			("wrote -1 bytes!!! Nenormalno! Marking this gsmopen_serial_device %s as dead, and if it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, powered down or battery exhausted\n",
-			 GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-		tech_pvt->controldev_dead = 1;
-		ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-		tech_pvt->running = 0;
-		alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-		tech_pvt->active = 0;
-		tech_pvt->name[0] = '\0';
-
-		UNLOCKA(tech_pvt->controldev_lock);
-		if (tech_pvt->owner) {
-			tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-			gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-		}
-		switch_sleep(1000000);
-
-
-		return -1;
-	}
-
-	at_result = gsmopen_serial_read_AT(tech_pvt, 1, 500000, 20, NULL, 1);	// 20.5 sec timeout
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return at_result;
-
-}
-
-int gsmopen_serial_write_AT_expect1(private_t *tech_pvt, const char *data, const char *expected_string, int expect_crlf, int seconds)
-{
-	int at_result = AT_ERROR;
-
-	if (!tech_pvt)
-		return -1;
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("sending: %s, expecting: %s\n", GSMOPEN_P_LOG, data, expected_string);
-	if (gsmopen_serial_write_AT(tech_pvt, data) != (int) strlen(data)) {
-		ERRORA("Error sending data... (%s) \n", GSMOPEN_P_LOG, strerror(errno));
-		UNLOCKA(tech_pvt->controldev_lock);
-
-		ERRORA
-			("wrote -1 bytes!!! Nenormalno! Marking this gsmopen_serial_device %s as dead, and if it is owned by a channel, hanging up. Maybe the phone is stuck, switched off, powered down or battery exhausted\n",
-			 GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-		tech_pvt->controldev_dead = 1;
-		ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-		tech_pvt->running = 0;
-		alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-		tech_pvt->active = 0;
-		tech_pvt->name[0] = '\0';
-
-		UNLOCKA(tech_pvt->controldev_lock);
-		if (tech_pvt->owner) {
-			tech_pvt->owner->hangupcause = GSMOPEN_CAUSE_FAILURE;
-			gsmopen_queue_control(tech_pvt->owner, GSMOPEN_CONTROL_HANGUP);
-		}
-		switch_sleep(1000000);
-
-
-		return -1;
-	}
-
-	at_result = gsmopen_serial_read_AT(tech_pvt, 1, 500000, seconds, expected_string, expect_crlf);	// minimum half a sec timeout
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return at_result;
-
-}
-
-int gsmopen_serial_AT_expect(private_t *tech_pvt, const char *expected_string, int expect_crlf, int seconds)
-{
-	int at_result = AT_ERROR;
-
-	if (!tech_pvt)
-		return -1;
-
-
-	PUSHA_UNLOCKA(tech_pvt->controldev_lock);
-	LOKKA(tech_pvt->controldev_lock);
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("expecting: %s\n", GSMOPEN_P_LOG, expected_string);
-
-	at_result = gsmopen_serial_read_AT(tech_pvt, 1, 100000, seconds, expected_string, expect_crlf);	//  minimum 1/10th sec timeout
-	UNLOCKA(tech_pvt->controldev_lock);
-	POPPA_UNLOCKA(tech_pvt->controldev_lock);
-
-	return at_result;
-
-}
-
-int gsmopen_serial_answer(private_t *tech_pvt)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_answer_AT(tech_pvt);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_answer_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_answer_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-	return -1;
-}
-
-int gsmopen_serial_answer_AT(private_t *tech_pvt)
-{
-	int res;
-
-	if (!tech_pvt)
-		return -1;
-
-	res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_answer, tech_pvt->at_answer_expect);
-	if (res) {
-		DEBUGA_GSMOPEN
-			("at_answer command failed, command used: %s, expecting: %s, trying with AT+CKPD=\"S\"\n",
-			 GSMOPEN_P_LOG, tech_pvt->at_answer, tech_pvt->at_answer_expect);
-
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CKPD=\"S\"");
-		if (res) {
-			ERRORA("at_answer command failed, command used: 'AT+CKPD=\"S\"', giving up\n", GSMOPEN_P_LOG);
-			return -1;
-		}
-	}
-	//res = gsmopen_serial_write_AT_expect(tech_pvt, "AT^DDSETEX=2", tech_pvt->at_dial_expect);
-	DEBUGA_GSMOPEN("AT: call answered\n", GSMOPEN_P_LOG);
-	return 0;
-}
-
-int gsmopen_serial_hangup(private_t *tech_pvt)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_hangup_AT(tech_pvt);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_hangup_FBUS2(tech_pvt);
-#endif /* GSMOPEN_FBUS2 */
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_hangup_CVM_BUSMAIL(tech_pvt);
-#endif /* GSMOPEN_CVM */
-	return -1;
-}
-
-int gsmopen_serial_hangup_AT(private_t *tech_pvt)
-{
-	int res;
-
-	if (!tech_pvt)
-		return -1;
-
-	if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-		res = gsmopen_serial_write_AT_expect(tech_pvt, tech_pvt->at_hangup, tech_pvt->at_hangup_expect);
-		if (res) {
-			DEBUGA_GSMOPEN("at_hangup command failed, command used: %s, trying to use AT+CKPD=\"EEE\"\n", GSMOPEN_P_LOG, tech_pvt->at_hangup);
-			res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CKPD=\"EEE\"");
-			if (res) {
-				ERRORA("at_hangup command failed, command used: 'AT+CKPD=\"EEE\"'\n", GSMOPEN_P_LOG);
-				return -1;
-			}
-
-		}
-
-		res = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CHUP");
-		if (res) {
-			DEBUGA_GSMOPEN("at_hangup command timeout, command used: 'AT+CHUP'\n", GSMOPEN_P_LOG);
-		}
-
-	}
-	tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-	tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-	return 0;
-}
-
-int gsmopen_serial_call(private_t *tech_pvt, char *dstr)
-{
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT)
-		return gsmopen_serial_call_AT(tech_pvt, dstr);
-#ifdef GSMOPEN_FBUS2
-	if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
-		return gsmopen_serial_call_FBUS2(tech_pvt, dstr);
-#endif /* GSMOPEN_FBUS2 */
-	if (tech_pvt->controldevprotocol == PROTOCOL_NO_SERIAL)
-		return 0;
-#ifdef GSMOPEN_CVM
-	if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
-		return gsmopen_serial_call_CVM_BUSMAIL(tech_pvt, dstr);
-#endif /* GSMOPEN_CVM */
-	return -1;
-}
-
-int gsmopen_serial_call_AT(private_t *tech_pvt, char *dstr)
-{
-	int res;
-	char at_command[256];
-
-	if (option_debug)
-		DEBUGA_PBX("Dialing %s\n", GSMOPEN_P_LOG, dstr);
-	memset(at_command, 0, sizeof(at_command));
-	tech_pvt->phone_callflow = CALLFLOW_CALL_DIALING;
-	tech_pvt->interface_state = GSMOPEN_STATE_DIALING;
-	sprintf(at_command, "%s%s%s", tech_pvt->at_dial_pre_number, dstr, tech_pvt->at_dial_post_number);
-	DEBUGA_PBX("Dialstring %s\n", GSMOPEN_P_LOG, at_command);
-	res = gsmopen_serial_write_AT_expect(tech_pvt, at_command, tech_pvt->at_dial_expect);
-	if (res) {
-		ERRORA("dial command failed, dial string was: %s\n", GSMOPEN_P_LOG, at_command);
-		return -1;
-	}
-	//res = gsmopen_serial_write_AT_expect(tech_pvt, "AT^DDSETEX=2", tech_pvt->at_dial_expect);
-
-	return 0;
-}
-
-int ucs2_to_utf8(private_t *tech_pvt, char *ucs2_in, char *utf8_out, size_t outbytesleft)
-{
-	char converted[16000];
-	iconv_t iconv_format;
-	int iconv_res;
-	char *outbuf;
-	char *inbuf;
-	size_t inbytesleft;
-	int c;
-	char stringa[5];
-	double hexnum;
-	int i = 0;
-
-	memset(converted, '\0', sizeof(converted));
-
-	DEBUGA_GSMOPEN("ucs2_in=|%s|, utf8_out=|%s|\n", GSMOPEN_P_LOG, ucs2_in, utf8_out);
-	for (c = 0; c < (int) strlen(ucs2_in); c++) {
-		sprintf(stringa, "0x%c%c", ucs2_in[c], ucs2_in[c + 1]);
-		c++;
-		hexnum = strtod(stringa, NULL);
-		converted[i] = (char) hexnum;
-		i++;
-	}
-
-	outbuf = utf8_out;
-	inbuf = converted;
-
-	iconv_format = iconv_open("UTF8", "UCS-2BE");
-	if (iconv_format == (iconv_t) -1) {
-		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
-		return -1;
-	}
-
-	inbytesleft = i;
-	DEBUGA_GSMOPEN("1 ciao in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
-				   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
-
-#ifdef WIN32
-	iconv_res = iconv(iconv_format, (const char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-#else // WIN32
-	iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-#endif // WIN32
-	if (iconv_res == (size_t) -1) {
-		DEBUGA_GSMOPEN("2 ciao in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
-					   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
-		DEBUGA_GSMOPEN("3 error: %s %d\n", GSMOPEN_P_LOG, strerror(errno), errno);
-		iconv_close(iconv_format);
-		return -1;
-	}
-	DEBUGA_GSMOPEN
-		("iconv_res=%d,  in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
-		 GSMOPEN_P_LOG, iconv_res, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
-	iconv_close(iconv_format);
-
-	return 0;
-}
-
-int utf8_to_iso_8859_1(private_t *tech_pvt, char *utf8_in, size_t inbytesleft, char *iso_8859_1_out, size_t outbytesleft)
-{
-	iconv_t iconv_format;
-	int iconv_res;
-	char *outbuf;
-	char *inbuf;
-
-	outbuf = iso_8859_1_out;
-	inbuf = utf8_in;
-
-	iconv_format = iconv_open("ISO_8859-1", "UTF8");
-	if (iconv_format == (iconv_t) -1) {
-		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
-		return -1;
-	}
-	outbytesleft = strlen(utf8_in) * 2;
-
-	DEBUGA_GSMOPEN("in=%s, inleft=%d, out=%s, outleft=%d, utf8_in=%s, iso_8859_1_out=%s\n",
-				   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_in, iso_8859_1_out);
-#ifdef WIN32
-	iconv_res = iconv(iconv_format, (const char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-#else // WIN32
-	iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-#endif // WIN32
-	if (iconv_res == (size_t) -1) {
-		DEBUGA_GSMOPEN("cannot translate in iso_8859_1 error: %s (errno: %d)\n", GSMOPEN_P_LOG, strerror(errno), errno);
-		return -1;
-	}
-	DEBUGA_GSMOPEN
-		("iconv_res=%d,  in=%s, inleft=%d, out=%s, outleft=%d, utf8_in=%s, iso_8859_1_out=%s\n",
-		 GSMOPEN_P_LOG, iconv_res, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_in, iso_8859_1_out);
-	iconv_close(iconv_format);
-	return 0;
-}
-
-
-int iso_8859_1_to_utf8(private_t *tech_pvt, char *iso_8859_1_in, char *utf8_out, size_t outbytesleft)
-{
-	iconv_t iconv_format;
-	int iconv_res;
-	char *outbuf;
-	char *inbuf;
-	size_t inbytesleft;
-
-	DEBUGA_GSMOPEN("iso_8859_1_in=%s\n", GSMOPEN_P_LOG, iso_8859_1_in);
-
-	outbuf = utf8_out;
-	inbuf = iso_8859_1_in;
-
-	iconv_format = iconv_open("UTF8", "ISO_8859-1");
-	if (iconv_format == (iconv_t) -1) {
-		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
-		return -1;
-	}
-
-	inbytesleft = strlen(iso_8859_1_in) * 2;
-#ifdef WIN32
-	iconv_res = iconv(iconv_format, (const char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-#else // WIN32
-	iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-#endif // WIN32
-	if (iconv_res == (size_t) -1) {
-		DEBUGA_GSMOPEN("ciao in=%s, inleft=%d, out=%s, outleft=%d, utf8_out=%s\n",
-					   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_out);
-		DEBUGA_GSMOPEN("error: %s %d\n", GSMOPEN_P_LOG, strerror(errno), errno);
-		return -1;
-	}
-	DEBUGA_GSMOPEN
-		(" strlen(iso_8859_1_in)=%d, iconv_res=%d,  inbuf=%s, inleft=%d, out=%s, outleft=%d, utf8_out=%s\n",
-		 GSMOPEN_P_LOG, (int) strlen(iso_8859_1_in), iconv_res, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_out);
-
-	iconv_close(iconv_format);
-
-	return 0;
-}
-
-int utf8_to_ucs2(private_t *tech_pvt, char *utf8_in, size_t inbytesleft, char *ucs2_out, size_t outbytesleft)
-{
-	iconv_t iconv_format;
-	int iconv_res;
-	char *outbuf;
-	char *inbuf;
-	char converted[16000];
-	int i;
-	char stringa[16];
-	char stringa2[16];
-
-	memset(converted, '\0', sizeof(converted));
-
-	outbuf = converted;
-	inbuf = utf8_in;
-
-	iconv_format = iconv_open("UCS-2BE", "UTF8");
-	if (iconv_format == (iconv_t) -1) {
-		ERRORA("error: %s\n", GSMOPEN_P_LOG, strerror(errno));
-		return -1;
-	}
-	outbytesleft = 16000;
-
-	DEBUGA_GSMOPEN("in=%s, inleft=%d, out=%s, outleft=%d, utf8_in=%s, converted=%s\n",
-				   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_in, converted);
-#ifdef WIN32
-	iconv_res = iconv(iconv_format, (const char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-#else // WIN32
-	iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-#endif // WIN32
-	if (iconv_res == (size_t) -1) {
-		ERRORA("error: %s %d\n", GSMOPEN_P_LOG, strerror(errno), errno);
-		return -1;
-	}
-	DEBUGA_GSMOPEN
-		("iconv_res=%d,  in=%s, inleft=%d, out=%s, outleft=%d, utf8_in=%s, converted=%s\n",
-		 GSMOPEN_P_LOG, iconv_res, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_in, converted);
-	iconv_close(iconv_format);
-
-	for (i = 0; i < 16000 - (int) outbytesleft; i++) {
-		memset(stringa, '\0', sizeof(stringa));
-		memset(stringa2, '\0', sizeof(stringa2));
-		sprintf(stringa, "%02X", converted[i]);
-		DEBUGA_GSMOPEN("character is |%02X|\n", GSMOPEN_P_LOG, converted[i]);
-		stringa2[0] = stringa[strlen(stringa) - 2];
-		stringa2[1] = stringa[strlen(stringa) - 1];
-		strncat(ucs2_out, stringa2, ((outbytesleft - strlen(ucs2_out)) - 1));	//add the received line to the buffer
-		DEBUGA_GSMOPEN("stringa=%s, stringa2=%s, ucs2_out=%s\n", GSMOPEN_P_LOG, stringa, stringa2, ucs2_out);
-	}
-	return 0;
-}
-
-/*! \brief  Answer incoming call,
- * Part of PBX interface */
-int gsmopen_answer(private_t *tech_pvt)
-{
-	int res;
-
-	if (option_debug) {
-		DEBUGA_PBX("ENTERING FUNC\n", GSMOPEN_P_LOG);
-	}
-	/* do something to actually answer the call, if needed (eg. pick up the phone) */
-	if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
-		if (gsmopen_serial_answer(tech_pvt)) {
-			ERRORA("gsmopen_answer FAILED\n", GSMOPEN_P_LOG);
-			if (option_debug) {
-				DEBUGA_PBX("EXITING FUNC\n", GSMOPEN_P_LOG);
-			}
-			return -1;
-		}
-	}
-	tech_pvt->interface_state = GSMOPEN_STATE_UP;
-	tech_pvt->phone_callflow = CALLFLOW_CALL_ACTIVE;
-
-	while (tech_pvt->interface_state == GSMOPEN_STATE_RING) {
-		gsmopen_sleep(10000);	//10msec
-	}
-	if (tech_pvt->interface_state != GSMOPEN_STATE_UP) {
-		ERRORA("call answering failed\n", GSMOPEN_P_LOG);
-		res = -1;
-	} else {
-		if (option_debug)
-			DEBUGA_PBX("call answered\n", GSMOPEN_P_LOG);
-		res = 0;
-
-		if (tech_pvt->owner) {
-			DEBUGA_PBX("going to send GSMOPEN_STATE_UP\n", GSMOPEN_P_LOG);
-			ast_setstate(tech_pvt->owner, GSMOPEN_STATE_UP);
-			DEBUGA_PBX("just sent GSMOPEN_STATE_UP\n", GSMOPEN_P_LOG);
-		}
-	}
-	if (option_debug) {
-		DEBUGA_PBX("EXITING FUNC\n", GSMOPEN_P_LOG);
-	}
-	return res;
-}
-
-int gsmopen_ring(private_t *tech_pvt)
-{
-	int res = 0;
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	if (session) {
-		switch_core_session_rwunlock(session);
-		return 0;
-	}
-
-	new_inbound_channel(tech_pvt);
-
-	gsmopen_sleep(10000);
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-
-		switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING);
-		if (channel) {
-			switch_channel_mark_ring_ready(channel);
-			DEBUGA_GSMOPEN("switch_channel_mark_ring_ready(channel);\n", GSMOPEN_P_LOG);
-		} else {
-			ERRORA("no channel\n", GSMOPEN_P_LOG);
-		}
-		switch_core_session_rwunlock(session);
-	} else {
-		ERRORA("no session\n", GSMOPEN_P_LOG);
-
-	}
-
-	return res;
-}
-
-/*! \brief  Hangup gsmopen call
- * Part of PBX interface, called from ast_hangup */
-
-int gsmopen_hangup(private_t *tech_pvt)
-{
-
-	/* if there is not gsmopen pvt why we are here ? */
-	if (!tech_pvt) {
-		ERRORA("Asked to hangup channel not connected\n", GSMOPEN_P_LOG);
-		return 0;
-	}
-
-	DEBUGA_GSMOPEN("ENTERING FUNC\n", GSMOPEN_P_LOG);
-
-	if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
-		if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-			/* actually hangup through the serial port */
-			if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
-				int res;
-				res = gsmopen_serial_hangup(tech_pvt);
-				if (res) {
-					ERRORA("gsmopen_serial_hangup error: %d\n", GSMOPEN_P_LOG, res);
-					if (option_debug) {
-						DEBUGA_PBX("EXITING FUNC\n", GSMOPEN_P_LOG);
-					}
-					return -1;
-				}
-			}
-
-			while (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-				gsmopen_sleep(10000);	//10msec
-			}
-			if (tech_pvt->interface_state != GSMOPEN_STATE_DOWN) {
-				ERRORA("call hangup failed\n", GSMOPEN_P_LOG);
-				return -1;
-			} else {
-				DEBUGA_GSMOPEN("call hungup\n", GSMOPEN_P_LOG);
-			}
-		}
-	} else {
-		tech_pvt->interface_state = GSMOPEN_STATE_DOWN;
-		tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-	}
-
-	switch_set_flag(tech_pvt, TFLAG_HANGUP);
-	if (option_debug) {
-		DEBUGA_PBX("EXITING FUNC\n", GSMOPEN_P_LOG);
-	}
-	return 0;
-}
-
-int gsmopen_call(private_t *tech_pvt, char *rdest, int timeout)
-{
-
-	int result;
-
-	DEBUGA_GSMOPEN("Calling GSM, rdest is: %s\n", GSMOPEN_P_LOG, rdest);
-
-	result=gsmopen_serial_call(tech_pvt, rdest);
-	return result;
-}
-
-int gsmopen_senddigit(private_t *tech_pvt, char digit)
-{
-
-	DEBUGA_GSMOPEN("DIGIT received: %c\n", GSMOPEN_P_LOG, digit);
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT && tech_pvt->at_send_dtmf[0]) {
-		int res = 0;
-		char at_command[256];
-
-		memset(at_command, '\0', 256);
-		sprintf(at_command, "%s=1,%c", tech_pvt->at_send_dtmf, digit);
-		res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-		if (res) {
-			DEBUGA_GSMOPEN("XXX answer (OK) takes long to come, goes into timeout. command used: '%s=1,%c'\n", GSMOPEN_P_LOG, tech_pvt->at_send_dtmf,
-						   digit);
-		}
-	}
-
-	return 0;
-}
-
-int gsmopen_sendsms(private_t *tech_pvt, char *dest, char *text)
-{
-	int failed = 0;
-	int err = 0;
-	char mesg_test[1024];
-
-	DEBUGA_GSMOPEN("GSMopenSendsms: dest=%s text=%s\n", GSMOPEN_P_LOG, dest, text);
-	DEBUGA_GSMOPEN("START\n", GSMOPEN_P_LOG);
-	/* we can use gsmopen_request to get the channel, but gsmopen_request would look for onowned channels, and probably we can send SMSs while a call is ongoing
-	 *
-	 */
-
-	if (tech_pvt->controldevprotocol != PROTOCOL_AT) {
-		ERRORA(", GSMOPEN_P_LOGGSMopenSendsms supports only AT command cellphones at the moment :-( !\n", GSMOPEN_P_LOG);
-		return RESULT_FAILURE;
-	}
-
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT) {
-		char smscommand[16000];
-		memset(smscommand, '\0', sizeof(smscommand));
-		char pdu2[16000];
-		memset(pdu2, '\0', sizeof(pdu2));
-		int pdulenght = 0;
-		string pdu;
-
-		PUSHA_UNLOCKA(&tech_pvt->controldev_lock);
-		LOKKA(tech_pvt->controldev_lock);
-
-		if (tech_pvt->no_ucs2 || tech_pvt->sms_pdu_not_supported == 0) {
-			try {
-				int bad_8859 = 0;
-
-				memset(mesg_test, '\0', sizeof(mesg_test));
-				sprintf(mesg_test, ":) ciao belè новости לק ראת ﺎﻠﺠﻤﻋﺓ 人大aèéàòçù");	//let's test the beauty of utf8
-				//sprintf(mesg_test,":) ciao belè èéàòìù");
-				//text=mesg_test;
-
-				bad_8859 = utf8_to_iso_8859_1(tech_pvt, text, strlen(text), smscommand, sizeof(smscommand));
-				if (!bad_8859) {
-					err = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=0");
-					if (err) {
-						ERRORA("AT+CMGF=0 (set message sending to PDU (as opposed to TEXT)  didn't get OK from the phone\n", GSMOPEN_P_LOG);
-					}
-					SMSMessageRef smsMessage;
-					smsMessage = new SMSSubmitMessage(smscommand, dest);
-					pdu = smsMessage->encode();
-					strncpy(pdu2, pdu.c_str(), sizeof(pdu2) - 1);
-					memset(smscommand, '\0', sizeof(smscommand));
-					pdulenght = pdu.length() / 2 - 1;
-					sprintf(smscommand, "AT+CMGS=%d", pdulenght);
-				} else {
-					int ok;
-
-					UNLOCKA(tech_pvt->controldev_lock);
-					POPPA_UNLOCKA(&tech_pvt->controldev_lock);
-
-					tech_pvt->no_ucs2 = 0;
-					tech_pvt->sms_pdu_not_supported = 1;
-
-					ok = gsmopen_sendsms(tech_pvt, dest, text);
-
-					tech_pvt->no_ucs2 = 1;
-					tech_pvt->sms_pdu_not_supported = 0;
-
-					err = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=0");
-					if (err) {
-						ERRORA("AT+CMGF=0 (set message sending to PDU (as opposed to TEXT)  didn't get OK from the phone\n", GSMOPEN_P_LOG);
-					}
-					return ok;
-				}
-
-			}
-			catch(GsmException & ge) {
-				ERRORA("GsmException= |||%s|||\n", GSMOPEN_P_LOG, ge.what());
-			}
-
-
-
-		} else {
-			char dest2[1048];
-
-			err = gsmopen_serial_write_AT_ack(tech_pvt, "AT+CMGF=1");
-			if (err) {
-				ERRORA("AT+CMGF=1 (set message sending to TEXT (as opposed to PDU)  didn't get OK from the phone\n", GSMOPEN_P_LOG);
-			}
-
-			memset(dest2, '\0', sizeof(dest2));
-			utf8_to_ucs2(tech_pvt, dest, strlen(dest), dest2, sizeof(dest2));
-			sprintf(smscommand, "AT+CMGS=\"%s\"", dest2);
-		}
-		err = gsmopen_serial_write_AT_noack(tech_pvt, smscommand);
-		if (err) {
-			ERRORA("Error sending SMS\n", GSMOPEN_P_LOG);
-			failed = 1;
-			goto uscita;
-		}
-		err = gsmopen_serial_AT_expect(tech_pvt, "> ", 0, 1);	// wait 1.1s for the prompt, no  crlf
-		if (err) {
-			DEBUGA_GSMOPEN
-				("Error or timeout getting prompt '> ' for sending sms directly to the remote party. BTW, seems that we cannot do that with Motorola c350, so we'll write to cellphone memory, then send from memory\n",
-				 GSMOPEN_P_LOG);
-
-			err = gsmopen_serial_write_AT_ack(tech_pvt, "ATE1");	//motorola (at least c350) do not echo the '>' prompt when in ATE0... go figure!!!!
-			if (err) {
-				ERRORA("Error activating echo from modem\n", GSMOPEN_P_LOG);
-			}
-			tech_pvt->at_cmgw[0] = '\0';
-			sprintf(smscommand, "AT+CMGW=\"%s\"", dest);	//TODO: support phones that only accept pdu mode
-			err = gsmopen_serial_write_AT_noack(tech_pvt, smscommand);
-			if (err) {
-				ERRORA("Error writing SMS destination to the cellphone memory\n", GSMOPEN_P_LOG);
-				failed = 1;
-				goto uscita;
-			}
-			err = gsmopen_serial_AT_expect(tech_pvt, "> ", 0, 1);	// wait 1.5s for the prompt, no  crlf
-			if (err) {
-				ERRORA("Error or timeout getting prompt '> ' for writing sms text in cellphone memory\n", GSMOPEN_P_LOG);
-				failed = 1;
-				goto uscita;
-			}
-		}
-
-		if (tech_pvt->no_ucs2 || tech_pvt->sms_pdu_not_supported == 0) {
-			memset(smscommand, '\0', sizeof(smscommand));
-			sprintf(smscommand, "%s", pdu2);
-		} else {
-			memset(mesg_test, '\0', sizeof(mesg_test));
-			sprintf(mesg_test, ":) ciao belè новости לק ראת ﺎﻠﺠﻤﻋﺓ 人大aèéàòçù");	//let's test the beauty of utf8
-			//text=mesg_test;
-
-			memset(smscommand, '\0', sizeof(smscommand));
-			if (tech_pvt->no_ucs2) {
-				sprintf(smscommand, "%s", text);
-			} else {
-				utf8_to_ucs2(tech_pvt, text, strlen(text), smscommand, sizeof(smscommand));
-			}
-
-		}
-		smscommand[strlen(smscommand)] = 0x1A;
-		DEBUGA_GSMOPEN("smscommand len is: %d, text is:|||%s|||\n", GSMOPEN_P_LOG, (int) strlen(smscommand), smscommand);
-
-		err = gsmopen_serial_write_AT_ack_nocr_longtime(tech_pvt, smscommand);
-		//TODO would be better to unlock controldev here
-		if (err) {
-			ERRORA("Error writing SMS text to the cellphone memory\n", GSMOPEN_P_LOG);
-			failed = 1;
-			goto uscita;
-		}
-		if (tech_pvt->at_cmgw[0]) {
-			sprintf(smscommand, "AT+CMSS=%s", tech_pvt->at_cmgw);
-			err = gsmopen_serial_write_AT_expect_longtime(tech_pvt, smscommand, "OK");
-			if (err) {
-				ERRORA("Error sending SMS from the cellphone memory\n", GSMOPEN_P_LOG);
-				failed = 1;
-				goto uscita;
-			}
-
-			err = gsmopen_serial_write_AT_ack(tech_pvt, "ATE0");	//motorola (at least c350) do not echo the '>' prompt when in ATE0... go figure!!!!
-			if (err) {
-				ERRORA("Error de-activating echo from modem\n", GSMOPEN_P_LOG);
-			}
-		}
-	  uscita:
-		gsmopen_sleep(1000);
-
-		if (tech_pvt->at_cmgw[0]) {
-
-			/* let's see what we've sent, just for check TODO: Motorola isn't reliable! Motorola c350 tells that all was sent, but is not true! It just sends how much it fits into one SMS FIXME: need an algorithm to calculate how many ucs2 chars fits into an SMS. It make difference based, probably, on the GSM alphabet translation, or so */
-			sprintf(smscommand, "AT+CMGR=%s", tech_pvt->at_cmgw);
-			err = gsmopen_serial_write_AT_ack(tech_pvt, smscommand);
-			if (err) {
-				ERRORA("Error reading SMS back from the cellphone memory\n", GSMOPEN_P_LOG);
-			}
-
-			/* let's delete from cellphone memory what we've sent */
-			sprintf(smscommand, "AT+CMGD=%s", tech_pvt->at_cmgw);
-			err = gsmopen_serial_write_AT_ack(tech_pvt, smscommand);
-			if (err) {
-				ERRORA("Error deleting SMS from the cellphone memory\n", GSMOPEN_P_LOG);
-			}
-
-			tech_pvt->at_cmgw[0] = '\0';
-		}
-		UNLOCKA(tech_pvt->controldev_lock);
-		POPPA_UNLOCKA(&tech_pvt->controldev_lock);
-	}
-
-	DEBUGA_GSMOPEN("FINISH\n", GSMOPEN_P_LOG);
-	if (failed)
-		return -1;
-	else
-		return RESULT_SUCCESS;
-}
-
-int gsmopen_ussd(private_t *tech_pvt, char *ussd, int waittime)
-{
-	int res = 0;
-	DEBUGA_GSMOPEN("gsmopen_ussd: %s\n", GSMOPEN_P_LOG, ussd);
-	if (tech_pvt->controldevprotocol == PROTOCOL_AT) {
-		char at_command[1024];
-
-		string ussd_enc = latin1ToGsm(ussd);
-		SMSEncoder e;
-		e.markSeptet();
-		e.setString(ussd_enc);
-		string ussd_hex = e.getHexString();
-
-		memset(at_command, '\0', sizeof(at_command));
-		tech_pvt->ussd_received = 0;
-		if (tech_pvt->ussd_request_encoding == USSD_ENCODING_PLAIN
-					||tech_pvt->ussd_request_encoding == USSD_ENCODING_AUTO) {
-			snprintf(at_command, sizeof(at_command), "AT+CUSD=1,\"%s\",15", ussd_enc.c_str());
-			res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-			if (res && tech_pvt->ussd_request_encoding == USSD_ENCODING_AUTO) {
-				DEBUGA_GSMOPEN("Plain request failed, trying HEX7 encoding...\n", GSMOPEN_P_LOG);
-				snprintf(at_command, sizeof(at_command), "AT+CUSD=1,\"%s\",15", ussd_hex.c_str());
-				res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-				if (res == 0) {
-					DEBUGA_GSMOPEN("HEX 7-bit request encoding will be used from now on\n", GSMOPEN_P_LOG);
-					tech_pvt->ussd_request_encoding = USSD_ENCODING_HEX_7BIT;
-				}
-			}
-		} else if (tech_pvt->ussd_request_encoding == USSD_ENCODING_HEX_7BIT) {
-			snprintf(at_command, sizeof(at_command), "AT+CUSD=1,\"%s\",15", ussd_hex.c_str());
-			res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-		} else if (tech_pvt->ussd_request_encoding == USSD_ENCODING_HEX_8BIT) {
-			string ussd_h8 = bufToHex((const unsigned char*)ussd_enc.c_str(), ussd_enc.length());
-			snprintf(at_command, sizeof(at_command), "AT+CUSD=1,\"%s\",15", ussd_h8.c_str());
-			res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-		} else if (tech_pvt->ussd_request_encoding == USSD_ENCODING_UCS2) {
-			char ussd_ucs2[1000];
-			memset(ussd_ucs2, '\0', sizeof(ussd_ucs2));
-			utf8_to_ucs2(tech_pvt, ussd, strlen(ussd), ussd_ucs2, sizeof(ussd_ucs2));
-			snprintf(at_command, sizeof(at_command), "AT+CUSD=1,\"%s\",15", ussd_ucs2);
-			res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
-		}
-		if (res) {
-			return res;
-		}
-		if (waittime > 0)
-			res = gsmopen_serial_read_AT(tech_pvt, 1, 0, waittime, "+CUSD", 1);
-	}
-	return res;
-}
-
-/************************************************/
-
-/* LUIGI RIZZO's magic */
-/* boost support. BOOST_SCALE * 10 ^(BOOST_MAX/20) must
- * be representable in 16 bits to avoid overflows.
- */
-#define BOOST_SCALE     (1<<9)
-#define BOOST_MAX       40		/* slightly less than 7 bits */
-
-/*
- * store the boost factor
- */
-void gsmopen_store_boost(char *s, double *boost)
-{
-	private_t *tech_pvt = NULL;
-
-	if (sscanf(s, "%lf", boost) != 1) {
-		ERRORA("invalid boost <%s>\n", GSMOPEN_P_LOG, s);
-		return;
-	}
-	if (*boost < -BOOST_MAX) {
-		WARNINGA("boost %s too small, using %d\n", GSMOPEN_P_LOG, s, -BOOST_MAX);
-		*boost = -BOOST_MAX;
-	} else if (*boost > BOOST_MAX) {
-		WARNINGA("boost %s too large, using %d\n", GSMOPEN_P_LOG, s, BOOST_MAX);
-		*boost = BOOST_MAX;
-	}
-#ifdef WIN32
-	*boost = exp(log((double) 10) * *boost / 20) * BOOST_SCALE;
-#else
-	*boost = exp(log(10) * *boost / 20) * BOOST_SCALE;
-#endif //WIN32
-	if (option_debug > 1)
-		DEBUGA_GSMOPEN("setting boost %s to %f\n", GSMOPEN_P_LOG, s, *boost);
-}
-
-int gsmopen_sound_boost(void *data, int samples_num, double boost)
-{
-/* LUIGI RIZZO's magic */
-	if (boost != 0 && (boost < 511 || boost > 513)) {	/* scale and clip values */
-		int i, x;
-
-		int16_t *ptr = (int16_t *) data;
-
-		for (i = 0; i < samples_num; i++) {
-			x = (int) (ptr[i] * boost) / BOOST_SCALE;
-			if (x > 32767) {
-				x = 32767;
-			} else if (x < -32768) {
-				x = -32768;
-			}
-			ptr[i] = (int16_t) x;
-		}
-	} else {
-		//printf("BOOST=%f\n", boost);
-	}
-
-	return 0;
-}
-
-int gsmopen_serial_getstatus_AT(private_t *tech_pvt)
-{
-	int res;
-	private_t *p = tech_pvt;
-
-	if (!p)
-		return -1;
-
-	PUSHA_UNLOCKA(p->controldev_lock);
-	LOKKA(p->controldev_lock);
-	res = gsmopen_serial_write_AT_ack(p, "AT");
-	if (res) {
-		ERRORA("AT was not acknowledged, continuing but maybe there is a problem\n", GSMOPEN_P_LOG);
-	}
-	gsmopen_sleep(1000);
-
-	if (strlen(p->at_query_battchg)) {
-		res = gsmopen_serial_write_AT_expect(p, p->at_query_battchg, p->at_query_battchg_expect);
-		if (res) {
-			WARNINGA("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, p->at_query_battchg, p->at_query_battchg_expect);
-		}
-		gsmopen_sleep(1000);
-	}
-
-	if (strlen(p->at_query_signal)) {
-		res = gsmopen_serial_write_AT_expect(p, p->at_query_signal, p->at_query_signal_expect);
-		if (res) {
-			WARNINGA("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, p->at_query_signal, p->at_query_signal_expect);
-		}
-		gsmopen_sleep(1000);
-	}
-
-	if (!p->network_creg_not_supported) {
-		res = gsmopen_serial_write_AT_ack(p, "AT+CREG?");
-		if (res) {
-			WARNINGA("%s didn't get %s from the phone. Continuing.\n", GSMOPEN_P_LOG, "AT+CREG?", "OK");
-		}
-		gsmopen_sleep(1000);
-	}
-	//FIXME all the following commands in config!
-
-	if (p->sms_cnmi_not_supported) {
-		res = gsmopen_serial_write_AT_ack(p, "AT+MMGL=\"HEADER ONLY\"");
-		if (res) {
-			WARNINGA
-				("%s didn't get %s from the phone. If your phone is not Motorola, please contact the gsmopen developers. Else, if your phone IS a Motorola, probably a long msg was incoming and ther first part was read and then deleted. The second part is now orphan. If you got this warning  repeatedly, and you cannot correctly receive SMSs from this interface, please manually clean all messages (and the residual parts of them) from the cellphone/SIM. Continuing.\n",
-				 GSMOPEN_P_LOG, "AT+MMGL=\"HEADER ONLY\"", "OK");
-		} else {
-			gsmopen_sleep(1000);
-			if (p->unread_sms_msg_id) {
-				char at_command[256];
-
-				res = gsmopen_serial_write_AT_ack(p, "AT+CSCS=\"UCS2\"");
-				if (res) {
-					ERRORA("AT+CSCS=\"UCS2\" (set TE messages to ucs2)  didn't get OK from the phone\n", GSMOPEN_P_LOG);
-					memset(p->sms_message, 0, sizeof(p->sms_message));
-				}
-
-				memset(at_command, 0, sizeof(at_command));
-				sprintf(at_command, "AT+CMGR=%d", p->unread_sms_msg_id);
-				memset(p->sms_message, 0, sizeof(p->sms_message));
-
-				p->reading_sms_msg = 1;
-				res = gsmopen_serial_write_AT_ack(p, at_command);
-				p->reading_sms_msg = 0;
-				if (res) {
-					ERRORA("AT+CMGR (read SMS) didn't get OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
-				}
-				res = gsmopen_serial_write_AT_ack(p, "AT+CSCS=\"GSM\"");
-				if (res) {
-					ERRORA("AT+CSCS=\"GSM\" (set TE messages to GSM) didn't get OK from the phone\n", GSMOPEN_P_LOG);
-				}
-				memset(at_command, 0, sizeof(at_command));
-				sprintf(at_command, "AT+CMGD=%d", p->unread_sms_msg_id);	/* delete the message */
-				p->unread_sms_msg_id = 0;
-				res = gsmopen_serial_write_AT_ack(p, at_command);
-				if (res) {
-					ERRORA("AT+CMGD (Delete SMS) didn't get OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
-				}
-
-				if (strlen(p->sms_message)) {
-					DEBUGA_GSMOPEN("got SMS incoming message. SMS received was:---%s---\n", GSMOPEN_P_LOG, p->sms_message);
-				}
-			}
-		}
-	}
-
-	UNLOCKA(p->controldev_lock);
-	POPPA_UNLOCKA(p->controldev_lock);
-	return 0;
-}
-
-int gsmopen_serial_init_audio_port(private_t *tech_pvt, int controldevice_audio_speed)
-{
-	/*
-	 * TODO
-	 * hmm, it doesn't look very different from gsmopen_serial_init_port, does it?
-	 */
-
-	if (!tech_pvt)
-		return -1;
-
-	tech_pvt->serialPort_serial_audio = new ctb::SerialPort();
-
-	/* windows: com ports above com9 need a special trick, which also works for com ports below com10 ... */
-	char devname[512] = "";
-	strcpy(devname, tech_pvt->controldevice_audio_name);
-#ifdef WIN32
-	strcpy(devname,"\\\\.\\");
-	strcat(devname, tech_pvt->controldevice_audio_name);
-#endif
-
-	if (tech_pvt->serialPort_serial_audio->Open(devname, 115200, "8N1", ctb::SerialPort::NoFlowControl) >= 0) {
-		DEBUGA_GSMOPEN("port %s, SUCCESS open\n", GSMOPEN_P_LOG, tech_pvt->controldevice_audio_name);
-		tech_pvt->serialPort_serial_audio_opened =1;
-		gsmopen_serial_write_AT_expect(tech_pvt, "AT^DDSETEX=2", tech_pvt->at_dial_expect);
-	} else {
-#ifdef WIN32
-		LPVOID msg;
-		FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-							NULL,
-							GetLastError(),
-							MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-							(LPTSTR) &msg,
-							0,
-							NULL);
-		ERRORA("port open failed for %s - %s", GSMOPEN_P_LOG, devname, (LPCTSTR) msg);
-		LocalFree(msg);
-#else
-		ERRORA("port %s, NOT open\n", GSMOPEN_P_LOG, tech_pvt->controldevice_audio_name);
-#endif
-		return -1;
-	}
-
-	return 0;
-}
-
-int serial_audio_init(private_t *tech_pvt)
-{
-	int res;
-	int err;
-
-	res = gsmopen_serial_init_audio_port(tech_pvt, tech_pvt->controldevice_audio_speed);
-	DEBUGA_GSMOPEN("serial_audio_init res=%d\n", GSMOPEN_P_LOG, res);
-
-	if (res == 0)
-		err = 0;
-	else
-		err = 1;
-
-	return err;
-}
-
-int serial_audio_shutdown(private_t *tech_pvt)
-{
-
-	int res;
-
-	if (!tech_pvt || !tech_pvt->serialPort_serial_audio)
-		return -1;
-
-	res = tech_pvt->serialPort_serial_audio->Close();
-	DEBUGA_GSMOPEN("serial_audio_shutdown res=%d (controldev_audio_fd is %d)\n", GSMOPEN_P_LOG, res, tech_pvt->controldev_audio_fd);
-	tech_pvt->serialPort_serial_audio_opened =0;
-
-	return res;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/COPYRIGHT b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/COPYRIGHT
deleted file mode 100644
index 9d0d9da185..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/COPYRIGHT
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright
-
-Copyright (C) 1999-2010 Joachim Buermann (jbuermann@iftools.com)
- 
-ctb is free software; you can redistribute it and/or modify it under
-the term of the GNU Library General Public Licence as published by the
-Free Software Foundation.
- 
-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
-Library General Public Licence for more details
- 
- 
-EXCEPTION NOTICE
-As a special exception, you may use, copy, link, modify and distribute
-under the user's own terms, binary object code versions of works based
-on the library.
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/GNUmakefile b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/GNUmakefile
deleted file mode 100644
index e39a687d4c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/GNUmakefile
+++ /dev/null
@@ -1,293 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# 'install' program location 
-INSTALL ?= install
-
-# Location where the package is installed by 'make install' 
-prefix ?= /usr/local
-
-# Destination root (/ is used if empty) 
-DESTDIR ?= 
-
-#  
-AR ?= ar
-
-#  
-RANLIB ?= ranlib
-
-# Compiler flags to link shared library 
-LINK_DLL_FLAGS ?= -shared
-
-# C++ compiler 
-CXX = g++
-
-# Standard flags for C++ 
-CXXFLAGS ?= 
-
-# Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS ?= 
-
-# Standard linker flags 
-LDFLAGS ?= 
-
-# Set to 1 to build debug version [0,1]
-DEBUG ?= 0
-
-#  
-GPIB ?= 0
-
-
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
-CTB_LIB_CXXFLAGS = $(____DEBUG) $(____DEBUG_1) -D_THREAD_SAFE -pthread \
-	$(__OPTIMIZE_FLAG) -I../include $(CPPFLAGS) $(CXXFLAGS)
-CTB_LIB_OBJECTS =  \
-	$(OUTPUT)/ctb_lib_fifo.o \
-	$(OUTPUT)/ctb_lib_getopt.o \
-	$(OUTPUT)/ctb_lib_iobase.o \
-	$(OUTPUT)/ctb_lib_portscan.o \
-	$(OUTPUT)/ctb_lib_serportx.o \
-	$(OUTPUT)/ctb_lib_serport.o \
-	$(OUTPUT)/ctb_lib_timer.o \
-	$(__GPIBSRC_OBJECTS)
-CTB_DLL_CXXFLAGS = $(____DEBUG) $(____DEBUG_1) -D_THREAD_SAFE -pthread \
-	$(__OPTIMIZE_FLAG) -I../include -fPIC -DPIC $(CPPFLAGS) $(CXXFLAGS)
-CTB_DLL_OBJECTS =  \
-	$(OUTPUT)/ctb_dll_fifo.o \
-	$(OUTPUT)/ctb_dll_getopt.o \
-	$(OUTPUT)/ctb_dll_iobase.o \
-	$(OUTPUT)/ctb_dll_portscan.o \
-	$(OUTPUT)/ctb_dll_serportx.o \
-	$(OUTPUT)/ctb_dll_serport.o \
-	$(OUTPUT)/ctb_dll_timer.o \
-	$(__GPIBSRC_OBJECTS_1)
-CTBTEST_CXXFLAGS = $(____DEBUG) $(____DEBUG_1) -DGPIB=$(GPIB) -D_THREAD_SAFE \
-	-pthread $(__OPTIMIZE_FLAG) -I../include $(CPPFLAGS) $(CXXFLAGS)
-CTBTEST_OBJECTS =  \
-	$(OUTPUT)/ctbtest_ctbtest.o
-
-### Conditionally set variables: ###
-
-ifeq ($(DEBUG),0)
-OUTPUT = release
-endif
-ifeq ($(DEBUG),1)
-OUTPUT = debug
-endif
-ifeq ($(DEBUG),1)
-LIBFLAG = d
-endif
-ifeq ($(GPIB),1)
-GPIBFLAG = _gpib
-endif
-ifeq ($(GPIB),1)
-GPIBINC = gpib.h
-endif
-ifeq ($(GPIB),1)
-__GPIBSRC_OBJECTS =  \
-	$(OUTPUT)/ctb_lib_gpib.o
-endif
-ifeq ($(GPIB),1)
-__GPIBSRC_OBJECTS_1 =  \
-	$(OUTPUT)/ctb_dll_gpib.o
-endif
-ifeq ($(DEBUG),0)
-____DEBUG = -DNDEBUG
-endif
-ifeq ($(DEBUG),1)
-____DEBUG = 
-endif
-ifeq ($(DEBUG),0)
-__OPTIMIZE_FLAG = -O0
-endif
-ifeq ($(DEBUG),1)
-__OPTIMIZE_FLAG = -O2
-endif
-ifeq ($(GPIB),1)
-__SYSLIB2_p = -lgpib
-endif
-ifeq ($(DEBUG),0)
-____DEBUG_1 = 
-endif
-ifeq ($(DEBUG),1)
-____DEBUG_1 = -g
-endif
-
-
-all: $(OUTPUT)
-$(OUTPUT):
-	@mkdir -p $(OUTPUT)
-
-### Targets: ###
-
-all: ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.so $(OUTPUT)/ctbtest tip-linux
-
-install: install_ctb_lib install_ctb_dll
-	$(INSTALL) -d $(DESTDIR)$(prefix)/include/ctb-0.16
-	for f in ctb.h fifo.h getopt.h $(GPIBINC) iobase.h linux/serport.h linux/timer.h portscan.h serport.h serportx.h timer.h; do \
-	if test ! -d $(DESTDIR)$(prefix)/include/ctb-0.16/`dirname $$f` ; then \
-	$(INSTALL) -d $(DESTDIR)$(prefix)/include/ctb-0.16/`dirname $$f`; \
-	fi; \
-	$(INSTALL) -m 644 ../include/ctb-0.16/$$f $(DESTDIR)$(prefix)/include/ctb-0.16/$$f; \
-	done
-
-uninstall: uninstall_ctb_lib uninstall_ctb_dll
-	for f in ctb.h fifo.h getopt.h $(GPIBINC) iobase.h linux/serport.h linux/timer.h portscan.h serport.h serportx.h timer.h; do \
-	rm -f $(DESTDIR)$(prefix)/include/ctb-0.16/$$f; \
-	done
-
-clean: 
-	rm -f $(OUTPUT)/*.o
-	rm -f $(OUTPUT)/*.d
-	rm -f ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a
-	rm -f ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.so
-	rm -f ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.so
-	rm -f $(OUTPUT)/ctbtest
-
-htmldoc: 
-	(cd ..; tar -cvzf manual/libctb-0.16-htmldoc.tar.gz docs/html/ )
-
-tarball: 
-	(cd ../..; tar -cvzf libctb-0.16.tar.gz \
-	libctb-0.16/build/ \
-	libctb-0.16/manual/refman.pdf \
-	libctb-0.16/include \
-	libctb-0.16/python \
-	libctb-0.16/samples \
-	libctb-0.16/src \
-	libctb-0.16/lib/gpib32.lib \
-	--exclude=release \
-	--exclude=debug \
-	--exclude=install \
-	--exclude=output \
-	--exclude=website \
-	--exclude=*~ \
-	--exclude=buildall.sh \
-	--exclude=buildall.bat \
-	--exclude=version-update.sh \
-	--exclude=libctb-0.16.tar.gz \
-	--exclude=*.ilk \
-	--exclude=*.log \
-	--exclude=*.o* \
-	--exclude=*.pdb \
-	--exclude=*.pyc \
-	--exclude=.svn; mv libctb-0.16.tar.gz libctb-0.16/build )
-
-../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a: $(CTB_LIB_OBJECTS)
-	rm -f $@
-	$(AR) rcu $@ $(CTB_LIB_OBJECTS)
-	$(RANLIB) $@
-
-install_ctb_lib: ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a
-	$(INSTALL) -d $(DESTDIR)$(prefix)/lib
-	$(INSTALL) -m 644 ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a $(DESTDIR)$(prefix)/lib
-
-uninstall_ctb_lib: 
-	rm -f $(DESTDIR)$(prefix)/lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a
-
-../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.so: $(CTB_DLL_OBJECTS)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(CTB_DLL_OBJECTS)  $(____DEBUG_1) -pthread -L../lib $(LDFLAGS)  -lpthread $(__SYSLIB2_p)
-
-install_ctb_dll: ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.so
-	$(INSTALL) -d $(DESTDIR)$(prefix)/lib
-	$(INSTALL) -m 644 ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.so $(DESTDIR)$(prefix)/lib
-	install -c ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.so $(DESTDIR)$(prefix)/lib
-
-uninstall_ctb_dll: 
-	rm -f $(DESTDIR)$(prefix)/lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.so
-	rm -f $(DESTDIR)$(prefix)/lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.so
-
-$(OUTPUT)/ctbtest: $(CTBTEST_OBJECTS) ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a
-	$(CXX) -o $@ $(CTBTEST_OBJECTS)  $(____DEBUG_1) -pthread -L../lib $(LDFLAGS)  ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a -lpthread $(__SYSLIB2_p)
-
-tip-linux: 
-	@echo " "
-	@echo "================================================================"
-	@echo " The building of ctb is finished. On Linux you'll now"
-	@echo " have to run (as root):"
-	@echo " "
-	@echo " make DEBUG=$(DEBUG) GPIB=$(GPIB) install"
-	@echo " "
-	@echo " to install the libraries in $(prefix)/lib"
-	@echo " and the header files in $(prefix)/include/ctb-0.16"
-	@echo " "
-	@echo " Don't forget to run ldconfig (also as root)"
-	@echo " "
-	@echo " ctb comes with no guarantees and doesn't claim"
-	@echo " to be suitable for any purpose."
-	@echo "================================================================"
-	@echo " "
-
-$(OUTPUT)/ctb_lib_fifo.o: ./../src/fifo.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_lib_getopt.o: ./../src/getopt.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_lib_iobase.o: ./../src/iobase.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_lib_portscan.o: ./../src/portscan.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_lib_serportx.o: ./../src/serportx.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_lib_serport.o: ./../src/linux/serport.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_lib_timer.o: ./../src/linux/timer.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_lib_gpib.o: ./../src/gpib.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_dll_fifo.o: ./../src/fifo.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_dll_getopt.o: ./../src/getopt.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_dll_iobase.o: ./../src/iobase.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_dll_portscan.o: ./../src/portscan.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_dll_serportx.o: ./../src/serportx.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_dll_serport.o: ./../src/linux/serport.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_dll_timer.o: ./../src/linux/timer.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctb_dll_gpib.o: ./../src/gpib.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)/ctbtest_ctbtest.o: ./../samples/ctbtest.cpp
-	$(CXX) -c -o $@ $(CTBTEST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all install uninstall clean install_ctb_lib uninstall_ctb_lib \
-	install_ctb_dll uninstall_ctb_dll
-
-
-# Dependencies tracking:
--include $(OUTPUT)/*.d
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/README b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/README
deleted file mode 100644
index fdcdb1d37b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/README
+++ /dev/null
@@ -1,169 +0,0 @@
-
-CTB (Communication toolbox library)          			08.02.2010
-======================================================================
-
-Website: http://www.iftools.com/opensource/ctb.en.php
-Version: 0.16
-
-
-Linux GCC compiliation
-----------------------------------------------------------------
-
-Type 'make DEBUG=x GPIB=x' or 'make -f GNUmakefile DEBUG=x GPIB=x'
-
-Type the same command with an additional install as root to copy the
-headers and libs to there according system places
-(i.e. /usr/local/include/ctb-0.16 and /usr/local/lib/libctb-0.16.a)
-like:
-
-sudo make DEBUG=x GPIB=x install
-
-
-Microsoft MingW32 compilation
-----------------------------------------------------------------
-
-Type mingw32-make -f makefile.gcc DEBUG=x GPIB=x
-
-Please note! Currently only a shared ctb library will be created.
-You have to copy the ctb-VERSION.dll in the application path of
-your application linked with ctb or in a global dll folder (but
-not recommented!)
-
-
-Microsoft Visual C++ compilation
-----------------------------------------------------------------
-
-Type 'nmake -f makefile.vc DEBUG=x GPIB=x'
-
-To create all libs (debug/release with and without gpib support)
-just input: ./buildall.bat in the build folder.
-	
-
-Borland C++ 5.0/5.5 compilation
-----------------------------------------------------------------
-
-Type 'make -f makefile.bcc DEBUG=x GPIB=x'
-
-
-Watcom C++ 10.6/11 and OpenWatcom compilation
-----------------------------------------------------------------
-
-Type 'wmake -f makefile.wat'
-
-
-Python support
---------------
-
-Since version 0.9 ctb also includes a python module ctb.py.
-To build the python module by yourself, your system has to satisfy
-the following requirements:
-
-- the SWIG program, you get it at http://www.swig.org/ (for linux,
-  take a look in your favorite distribution package manager).
-  The current ctb module was build with SWIG version 1.3.29 (linux)
-  and version 1.3.40 (Windows)
-- the develop files for python (means the header and the library
-  files). I tested it with Python 2.4. You will get it at:
-  http://www.python.org/ftp/python/2.4.4/python-2.4.4.msi
-- if you want to communicate via GPIB, a GPIB installation (GPIB 
-  controller and software, for instance a Nation Instruments or 
-  Keithley card). On Linux the libgpib.
-
-Like the building of the wxctb C++ library, you also can choose
-between GPIB and non GPIB (default) support.
-
-Compile the python module
-
-Linux
-cd in the python/src/linux folder and type:
-./makepy.sh USE_GPIB
-or
-./makepy.sh
-if you don't need any GPIB support
-
-Windows
-cd in the python/src/windows folder. Open the makepy.bat with your
-favorite editor and set the commented enviroment variables. See the
-makepy.bat file for more information, how you can do that.
-After that, just type:
-
-./makepy.sh USE_GPIB
-(for GPIB support) or
-./makepy.sh
-if you don't need any GPIB support
-
-At last set the python modul path to the ctb-0.15/python/module
-path.
-On linux:
-
-export PYTHONPATH=somepath/ctb-0.15/python/module/linux
-
-On Windows:
-
-set PYTHONPATH=drive:\somepath\ctb-0.15\python\module\win32
-
-
-ChangeLog
----------
-
-0.16
-    - added port scan function.
-    - bug fixes for MingW build.
-
-0.15
-    - added ctb namespace and removed all wx prefix (also in the header
-	 path).
-    - Linux: A serial port cannot opened twice or more any longer.
-    - 9 bit data transmission support using the parity bit as ninth bit.
-    - improved documentation
-    - Some more documentation
-
-0.14
-    - Support for non-standard baudrates (depends on the used UART
-	 or USB to RS232 converter.
-
-0.13
-    - remove the expect and match mechanism. They didn't work very
-	 well, and a future implementation should be done as a
-      independent library. If someone missed this functions, please
-      let me know.
-
-0.12
-    - more documentation for doxygen
-    - replace the ugly GetSettingsAsString methods by a more intuitive
-	 one.
-    - wxGPIB::Read now checks the MAV bit before reading. This resolves
-	 some stderr stuff on linux.
-
-0.11
-    - the gpib sources are no longer depending on the OS. They are
-	 identical for linux and windows.  
-    - add the current version to the ctb include path, so you can
-	 handle a parallel installation of different versions.
-	 For instance: The header path wx/ctb is replaced by wx/ctb-0.11
-
-0.10
-    - replace the former gpib async io access with the standard
-	 NI-488 functions (ibrd,ibwrt). To avoid blocking, the internal
-	 gpib timeout was set to the lowest value, whereas the wxIOBase
-	 methods handles the timeout in a global and transparent manner.
-    - add a FindListener method in the wxGPIB class to look for all
-	 connected gpib devices (listeners).
-    - The Read and Readv method of the python wxIOBase class returns
-	 additional zero bytes, fixed. 
-
-0.9
-    - added python support for both, serial and gpib 
-
-0.8
-    - added bakefile support
-	 
-0.7 
-    - added GPIB (Nation Instruments GPIB cards) support
-	 
-
-Authors' info
--------------
-
-Joachim Buermann          jbuermann@iftools.com
- 
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/libctb.bkl b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/libctb.bkl
deleted file mode 100644
index eb5670bd4a..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/libctb.bkl
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-  <requires version="0.1.1"/>
-
-  <include file="presets/simple.bkl"/>
-  <using module="datafiles"/>
-
-  <!-- default is NO GPIB support, you can change this by -->
-  <!-- calling make with the Option GPIB=1                -->
-  <option name="GPIB">
-    <default-value>0</default-value>
-  </option>
-
-  <!-- the actual ctb library version -->
-  <set var="VERSION">0.16</set>
-  <set var="NAME">libctb</set>
-
-  <!-- The directory where wxWidgets is installed: -->
-  <set var="ENV_VAR">
-    <if cond="FORMAT=='watcom'">%</if>
-    <if cond="FORMAT!='watcom'"></if>
-  </set>
-
-  <option name="WXDIR">
-    <default-value>$(DOLLAR)($(ENV_VAR)WXWIN)</default-value>
-  </option>
-  <option name="INSTALLDIR">
-    <default-value>$(DOLLAR)($(ENV_VAR)WXWIN)</default-value>
-  </option>
-
-  <!-- the output of the compiler/linker will be put in a release  -->
-  <!-- or debug folder!                                            -->
-  <set var="OUTPUT">
-    <if cond="DEBUG=='1'">debug</if>
-    <if cond="DEBUG=='0'">release</if>
-  </set>
-  <set var="BUILDDIR">$(OUTPUT)</set>
-
-  <set var="INSTALLDIR">
-    <if cond="PLATFORM_WIN32=='1' and WXDIR==''">..$(DIRSEP)lib</if>
-  </set>
-
-  <!-- set the library name dependent on debug/gpib support -->
-  <set var="LIBFLAG">
-    <if cond="DEBUG=='1'">d</if>
-  </set>
-
-  <set var="SYSLIB1">
-    <if cond="PLATFORM_UNIX=='1'">pthread</if>
-    <if cond="PLATFORM_WIN32=='1'">winmm</if>
-  </set>
-
-  <set var="SYSLIB2">
-    <if cond="PLATFORM_UNIX=='1' and GPIB=='1'">gpib</if>
-    <if cond="PLATFORM_WIN32=='1' and GPIB=='1'">gpib32</if>
-  </set>
-
-  <set var="OS">
-    <if cond="PLATFORM_UNIX=='1'">linux</if>
-    <if cond="PLATFORM_WIN32=='1'">win32</if>
-  </set>
-
-  <set var="GPIBFLAG">
-    <if cond="GPIB=='1'">_gpib</if>
-  </set>
-
-  <set var="GPIBSRC">
-    <if cond="GPIB=='1'">
-	 ../src/gpib.cpp
-    </if>
-  </set>
-
-  <set var="GPIBINC">
-    <if cond="GPIB=='1'">
-	 gpib.h
-    </if>
-  </set>
-
-  <set var="OPTIMIZE_FLAG">
-    <if cond="DEBUG=='0'">off</if>
-    <if cond="DEBUG=='1'">speed</if>
-  </set>
-
-  <set var="FILES">
-    ../src/fifo.cpp
-    ../src/getopt.cpp
-    ../src/iobase.cpp
-    ../src/portscan.cpp
-    ../src/serportx.cpp
-    ../src/$(OS)/serport.cpp
-    ../src/$(OS)/timer.cpp
-  </set>
-
-  <define-tag name="run-htmldoc" rules="action">
-    <command>
-	 (cd ..; tar -cvzf manual/$(value) docs/html/ )
-    </command>
-  </define-tag>
-
-  <if cond="PLATFORM_UNIX=='1'">
-    <action id="htmldoc">
-	 <run-htmldoc>$(NAME)-$(VERSION)-htmldoc.tar.gz</run-htmldoc>
-    </action>
-  </if>
-
-  <define-tag name="run-tarball" rules="action">
-    <command>
-	 (cd ../..; tar -cvzf $(value) \
-	 $(NAME)-$(VERSION)/build/ \
-	 $(NAME)-$(VERSION)/manual/refman.pdf \
-	 $(NAME)-$(VERSION)/include \
-	 $(NAME)-$(VERSION)/python \
-	 $(NAME)-$(VERSION)/samples \
-	 $(NAME)-$(VERSION)/src \
-	 $(NAME)-$(VERSION)/lib/gpib32.lib \
-	 --exclude=release \
-	 --exclude=debug \
-	 --exclude=install \
-	 --exclude=output \
-	 --exclude=website \
-	 --exclude=*~ \
-	 --exclude=buildall.sh \
-	 --exclude=buildall.bat \
-	 --exclude=g++.sh \
-	 --exclude=version-update.sh \
-	 --exclude=$(value) \
-	 --exclude=*.ilk \
-	 --exclude=*.log \
-	 --exclude=*.o* \
-	 --exclude=*.pdb \
-	 --exclude=*.pyc \
-	 --exclude=.svn; mv $(value) $(NAME)-$(VERSION)/build )
-    </command>
-  </define-tag>
-
-  <if cond="PLATFORM_UNIX=='1'">
-    <action id="tarball">
-	 <run-tarball>$(NAME)-$(VERSION).tar.gz</run-tarball>
-    </action>
-  </if>
-
-  <!-- This is only for UNIX like OS -->
-  <data-files-tree id="install-headers">
-    <srcdir>..$(DIRSEP)include$(DIRSEP)ctb-$(VERSION)</srcdir>
-    <files>
-	 ctb.h
-	 fifo.h
-	 getopt.h
-	 $(GPIBINC)
-	 iobase.h
-	 linux/serport.h
-	 linux/timer.h
-	 portscan.h
-	 serport.h
-	 serportx.h
-	 timer.h
-    </files>
-    <install-to>$(INCLUDEDIR)$(DIRSEP)ctb-$(VERSION)</install-to>
-  </data-files-tree>
-
-  <lib id="ctb_lib" template="simple">
-    <dirname>../lib</dirname>
-    <libname>ctb$(LIBFLAG)$(GPIBFLAG)-$(VERSION)</libname>
-    <!-- for /MT -->
-    <threading>multi</threading>
-    <runtime-libs>static</runtime-libs>
-    <optimize>$(OPTIMIZE_FLAG)</optimize>
-    <sources>
-	 $(FILES)
-	 $(GPIBSRC)
-    </sources>
-    <lib-path>../lib</lib-path>
-    <sys-lib>$(SYSLIB1)</sys-lib>
-    <sys-lib>$(SYSLIB2)</sys-lib>
-    <include>../include</include>
-    <install-to>$(LIBDIR)</install-to>
-  </lib>	    
-  <dll id="ctb_dll" template="simple">
-    <dirname>../lib</dirname>
-    <threading>multi</threading>
-    <dllname>ctb$(LIBFLAG)$(GPIBFLAG)-$(VERSION)</dllname>
-    <runtime-libs>static</runtime-libs>
-    <optimize>$(OPTIMIZE_FLAG)</optimize>
-    <libname>ctb$(LIBFLAG)$(GPIBFLAG)-$(VERSION)</libname>
-    <sources>
-	 $(FILES)
-	 $(GPIBSRC)
-    </sources>
-    <lib-path>../lib</lib-path>
-    <sys-lib>$(SYSLIB1)</sys-lib>
-    <sys-lib>$(SYSLIB2)</sys-lib>
-    <include>../include</include>
-    <install-to>$(LIBDIR)</install-to>
-  </dll>
-
-  <!-- The sample of ctb -->
-  <!-- ==================== -->
-  <exe id="ctbtest" template="simple">
-    <define>GPIB=$(GPIB)</define>
-    <threading>multi</threading>
-    <runtime-libs>static</runtime-libs>
-    <optimize>$(OPTIMIZE_FLAG)</optimize>
-    <sources>
-	 ../samples/ctbtest.cpp
-    </sources>
-    <include>../include</include>
-    <lib-path>../lib</lib-path>
-    <library>ctb_lib</library>
-    <sys-lib>$(SYSLIB1)</sys-lib>
-    <sys-lib>$(SYSLIB2)</sys-lib>
-  </exe>
-
-  <set var="LIBNAME">
-    <if cond="FORMAT=='msvc'">vc</if>
-    <if cond="FORMAT!='msvc'">$(FORMAT)</if>
-  </set>
-  
-  <action id="wxinstall" cond="PLATFORM_WIN32=='1'">
-    <command>
-	 <!-- create the lib directory if it doesn't exist -->
-	 @if not exist $(INSTALLDIR)\lib\$(LIBNAME)_lib mkdir $(INSTALLDIR)\lib\$(LIBNAME)_lib 
-	 <!-- copy the libraries (lib,dll) -->
-	 @copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-$(VERSION).lib $(INSTALLDIR)\lib\$(LIBNAME)_lib
-	 @copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-$(VERSION).dll $(INSTALLDIR)\lib\$(LIBNAME)_lib
-	 <!-- copy the header files -->
-	 @if not exist $(INSTALLDIR)\include\ctb-$(VERSION)\win32 mkdir $(INSTALLDIR)\include\ctb-$(VERSION)\win32
-	 @copy ..\include\ctb-$(VERSION)\*.h $(INSTALLDIR)\include\ctb-$(VERSION)
-	 @copy ..\include\ctb-$(VERSION)\win32\*.h $(INSTALLDIR)\include\ctb-$(VERSION)\win32
-    </command>
-  </action>
-
-  <action id="tip-linux" cond="PLATFORM_UNIX=='1'">
-    <dependency-of>all</dependency-of>
-    <command>
-	 @echo " "
-	 @echo "================================================================"
-	 @echo " The building of ctb is finished. On Linux you'll now"
-	 @echo " have to run (as root):"
-	 @echo " "
-	 @echo " make DEBUG=$(DEBUG) GPIB=$(GPIB) install"
-	 @echo " "
-	 @echo " to install the libraries in $(LIBDIR)"
-	 @echo " and the header files in $(INCLUDEDIR)/ctb-$(VERSION)"
-	 @echo " "
-	 @echo " Don't forget to run ldconfig (also as root)"
-	 @echo " "
-	 @echo " ctb comes with no guarantees and doesn't claim"
-	 @echo " to be suitable for any purpose."
-	 @echo "================================================================"
-	 @echo " "
-    </command>
-  </action>
-
-  <action id="tip-win32" cond="PLATFORM_WIN32=='1'">
-    <dependency-of>all</dependency-of>
-    <command>
-	 @echo "                                                                "
-	 @echo "================================================================"
-	 @echo " The building of ctb is finished. If you have an installed    "
-	 @echo " wxWidget package (WXWIN must be defined in the enviroment),    "
-	 @echo " you'll now have to run:                                        "
-	 @echo "                                                                "
-	 @echo " make DEBUG=$(DEBUG) GPIB=$(GPIB) wxinstall                     "
-	 @echo "                                                                "
-	 @echo " to install the libraries in:                                   "
-	 @echo " $(INSTALLDIR)$(DIRSEP)lib$(DIRSEP)$(LIBNAME)_lib               "
-	 @echo " and the header files in"
-	 @echo " $(INSTALLDIR)$(DIRSEP)ctb-$(VERSION)"
-	 @echo "                                                                "
-	 @echo " If you are using another compiler (Borland, Watcom, mingw,...) "
-	 @echo " take a look in the README in this directory!                   "
-	 @echo "                                                                "
-	 @echo " ctb comes with no guarantees and doesn't claim               "
-	 @echo " to be suitable for any purpose.                                "
-	 @echo "================================================================"
-	 @echo "                                                                "
-    </command>
-  </action>
-
-</makefile>
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.bcc b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.bcc
deleted file mode 100644
index 6afadafb3f..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.bcc
+++ /dev/null
@@ -1,269 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-
-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# C++ compiler 
-!ifndef CXX
-CXX = bcc32
-!endif
-
-# Standard flags for C++ 
-!ifndef CXXFLAGS
-CXXFLAGS = 
-!endif
-
-# Standard preprocessor flags (common for CC and CXX) 
-!ifndef CPPFLAGS
-CPPFLAGS = -a8 -g0
-!endif
-
-# Standard linker flags 
-!ifndef LDFLAGS
-LDFLAGS = 
-!endif
-
-# Set to 1 to build debug version [0,1]
-!ifndef DEBUG
-DEBUG = 0
-!endif
-
-#  
-!ifndef GPIB
-GPIB = 0
-!endif
-
-#  
-!ifndef WXDIR
-WXDIR = $(WXWIN)
-!endif
-
-#  
-!ifndef INSTALLDIR
-INSTALLDIR = $(WXWIN)
-!endif
-
-
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CTB_LIB_CXXFLAGS = -I$(BCCDIR)\include $(____DEBUG) $(____DEBUG_2) -tWM \
-	$(__OPTIMIZE_FLAG) -I..\include $(CPPFLAGS) $(CXXFLAGS)
-CTB_LIB_OBJECTS =  \
-	$(OUTPUT)\ctb_lib_fifo.obj \
-	$(OUTPUT)\ctb_lib_getopt.obj \
-	$(OUTPUT)\ctb_lib_iobase.obj \
-	$(OUTPUT)\ctb_lib_portscan.obj \
-	$(OUTPUT)\ctb_lib_serportx.obj \
-	$(OUTPUT)\ctb_lib_serport.obj \
-	$(OUTPUT)\ctb_lib_timer.obj \
-	$(____GPIBSRC_FILENAMES_OBJECTS)
-CTB_DLL_CXXFLAGS = -I$(BCCDIR)\include $(____DEBUG) $(____DEBUG_2) -tWM \
-	$(__OPTIMIZE_FLAG) -I..\include $(CPPFLAGS) $(CXXFLAGS)
-CTB_DLL_OBJECTS =  \
-	$(OUTPUT)\ctb_dll_fifo.obj \
-	$(OUTPUT)\ctb_dll_getopt.obj \
-	$(OUTPUT)\ctb_dll_iobase.obj \
-	$(OUTPUT)\ctb_dll_portscan.obj \
-	$(OUTPUT)\ctb_dll_serportx.obj \
-	$(OUTPUT)\ctb_dll_serport.obj \
-	$(OUTPUT)\ctb_dll_timer.obj \
-	$(____GPIBSRC_FILENAMES_1_OBJECTS)
-CTBTEST_CXXFLAGS = -I$(BCCDIR)\include $(____DEBUG) $(____DEBUG_2) \
-	-DGPIB=$(GPIB) -tWM $(__OPTIMIZE_FLAG) -I..\include $(CPPFLAGS) $(CXXFLAGS)
-CTBTEST_OBJECTS =  \
-	$(OUTPUT)\ctbtest_ctbtest.obj
-
-### Conditionally set variables: ###
-
-!if "$(DEBUG)" == "0"
-OUTPUT = release
-!endif
-!if "$(DEBUG)" == "1"
-OUTPUT = debug
-!endif
-!if "$(WXDIR)" == ""
-INSTALLDIR = ..\lib
-!endif
-!if "$(DEBUG)" == "1"
-LIBFLAG = d
-!endif
-!if "$(GPIB)" == "1"
-GPIBFLAG = _gpib
-!endif
-!if "$(GPIB)" == "1"
-____GPIBSRC_FILENAMES_OBJECTS =  \
-	$(OUTPUT)\ctb_lib_gpib.obj
-!endif
-!if "$(GPIB)" == "1"
-____GPIBSRC_FILENAMES_1_OBJECTS =  \
-	$(OUTPUT)\ctb_dll_gpib.obj
-!endif
-!if "$(DEBUG)" == "0"
-____DEBUG = -DNDEBUG
-!endif
-!if "$(DEBUG)" == "1"
-____DEBUG = 
-!endif
-!if "$(DEBUG)" == "0"
-__OPTIMIZE_FLAG = -Od
-!endif
-!if "$(DEBUG)" == "1"
-__OPTIMIZE_FLAG = -O2
-!endif
-!if "$(GPIB)" == "1"
-__SYSLIB2_p = gpib32.lib
-!endif
-!if "$(DEBUG)" == "0"
-____DEBUG_2 = -v-
-!endif
-!if "$(DEBUG)" == "1"
-____DEBUG_2 = -v
-!endif
-
-
-all: $(OUTPUT)
-$(OUTPUT):
-	-if not exist $(OUTPUT) mkdir $(OUTPUT)
-
-### Targets: ###
-
-all: ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll $(OUTPUT)\ctbtest.exe tip-win32
-
-clean: 
-	-if exist $(OUTPUT)\*.obj del $(OUTPUT)\*.obj
-	-if exist $(OUTPUT)\*.res del $(OUTPUT)\*.res
-	-if exist $(OUTPUT)\*.csm del $(OUTPUT)\*.csm
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.tds del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.tds
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ilc del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ilc
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ild del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ild
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ilf del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ilf
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ils del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ils
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-	-if exist $(OUTPUT)\ctbtest.exe del $(OUTPUT)\ctbtest.exe
-	-if exist $(OUTPUT)\ctbtest.tds del $(OUTPUT)\ctbtest.tds
-	-if exist $(OUTPUT)\ctbtest.ilc del $(OUTPUT)\ctbtest.ilc
-	-if exist $(OUTPUT)\ctbtest.ild del $(OUTPUT)\ctbtest.ild
-	-if exist $(OUTPUT)\ctbtest.ilf del $(OUTPUT)\ctbtest.ilf
-	-if exist $(OUTPUT)\ctbtest.ils del $(OUTPUT)\ctbtest.ils
-
-..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib: $(CTB_LIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(CTB_LIB_OBJECTS)
-|
-
-..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll: $(CTB_DLL_OBJECTS)
-	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____DEBUG_2)  -L..\lib $(LDFLAGS) @&&|
-	c0d32.obj $(CTB_DLL_OBJECTS),$@,, winmm.lib $(__SYSLIB2_p) import32.lib cw32mt.lib,,
-|
-	implib -f ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16 $@
-
-$(OUTPUT)\ctbtest.exe: $(CTBTEST_OBJECTS) ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____DEBUG_2)  -L..\lib $(LDFLAGS) @&&|
-	c0x32.obj $(CTBTEST_OBJECTS),$@,, ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib winmm.lib $(__SYSLIB2_p) import32.lib cw32mt.lib,,
-|
-
-wxinstall: 
-	@copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib $(INSTALLDIR)\lib\borland_lib
-	@copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll $(INSTALLDIR)\lib\borland_lib
-	
-	@if not exist $(INSTALLDIR)\include\ctb-0.16\win32 mkdir $(INSTALLDIR)\include\ctb-0.16\win32
-	@copy ..\include\ctb-0.16\*.h $(INSTALLDIR)\include\ctb-0.16
-	@copy ..\include\ctb-0.16\win32\*.h $(INSTALLDIR)\include\ctb-0.16\win32
-
-tip-win32: 
-	@echo "                                                                "
-	@echo "================================================================"
-	@echo " The building of ctb is finished. If you have an installed    "
-	@echo " wxWidget package (WXWIN must be defined in the enviroment),    "
-	@echo " you'll now have to run:                                        "
-	@echo "                                                                "
-	@echo " make DEBUG=$(DEBUG) GPIB=$(GPIB) wxinstall                     "
-	@echo "                                                                "
-	@echo " to install the libraries in:                                   "
-	@echo " $(INSTALLDIR)\lib\borland_lib               "
-	@echo " and the header files in"
-	@echo " $(INSTALLDIR)\ctb-0.16"
-	@echo "                                                                "
-	@echo " If you are using another compiler (Borland, Watcom, mingw,...) "
-	@echo " take a look in the README in this directory!                   "
-	@echo "                                                                "
-	@echo " ctb comes with no guarantees and doesn't claim               "
-	@echo " to be suitable for any purpose.                                "
-	@echo "================================================================"
-	@echo "                                                                "
-
-$(OUTPUT)\ctb_lib_fifo.obj: .\..\src\fifo.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_LIB_CXXFLAGS) .\..\src\fifo.cpp
-
-$(OUTPUT)\ctb_lib_getopt.obj: .\..\src\getopt.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_LIB_CXXFLAGS) .\..\src\getopt.cpp
-
-$(OUTPUT)\ctb_lib_iobase.obj: .\..\src\iobase.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_LIB_CXXFLAGS) .\..\src\iobase.cpp
-
-$(OUTPUT)\ctb_lib_portscan.obj: .\..\src\portscan.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_LIB_CXXFLAGS) .\..\src\portscan.cpp
-
-$(OUTPUT)\ctb_lib_serportx.obj: .\..\src\serportx.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_LIB_CXXFLAGS) .\..\src\serportx.cpp
-
-$(OUTPUT)\ctb_lib_serport.obj: .\..\src\win32\serport.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_LIB_CXXFLAGS) .\..\src\win32\serport.cpp
-
-$(OUTPUT)\ctb_lib_timer.obj: .\..\src\win32\timer.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_LIB_CXXFLAGS) .\..\src\win32\timer.cpp
-
-$(OUTPUT)\ctb_lib_gpib.obj: .\..\src\gpib.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_LIB_CXXFLAGS) .\..\src\gpib.cpp
-
-$(OUTPUT)\ctb_dll_fifo.obj: .\..\src\fifo.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_DLL_CXXFLAGS) .\..\src\fifo.cpp
-
-$(OUTPUT)\ctb_dll_getopt.obj: .\..\src\getopt.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_DLL_CXXFLAGS) .\..\src\getopt.cpp
-
-$(OUTPUT)\ctb_dll_iobase.obj: .\..\src\iobase.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_DLL_CXXFLAGS) .\..\src\iobase.cpp
-
-$(OUTPUT)\ctb_dll_portscan.obj: .\..\src\portscan.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_DLL_CXXFLAGS) .\..\src\portscan.cpp
-
-$(OUTPUT)\ctb_dll_serportx.obj: .\..\src\serportx.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_DLL_CXXFLAGS) .\..\src\serportx.cpp
-
-$(OUTPUT)\ctb_dll_serport.obj: .\..\src\win32\serport.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_DLL_CXXFLAGS) .\..\src\win32\serport.cpp
-
-$(OUTPUT)\ctb_dll_timer.obj: .\..\src\win32\timer.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_DLL_CXXFLAGS) .\..\src\win32\timer.cpp
-
-$(OUTPUT)\ctb_dll_gpib.obj: .\..\src\gpib.cpp
-	$(CXX) -q -c -P -o$@ $(CTB_DLL_CXXFLAGS) .\..\src\gpib.cpp
-
-$(OUTPUT)\ctbtest_ctbtest.obj: .\..\samples\ctbtest.cpp
-	$(CXX) -q -c -P -o$@ $(CTBTEST_CXXFLAGS) .\..\samples\ctbtest.cpp
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.gcc b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.gcc
deleted file mode 100644
index febca07dc8..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.gcc
+++ /dev/null
@@ -1,238 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# Compiler flags to link shared library 
-LINK_DLL_FLAGS ?= -shared
-
-# C++ compiler 
-CXX = g++
-
-# Standard flags for C++ 
-CXXFLAGS ?= 
-
-# Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS ?= 
-
-# Standard linker flags 
-LDFLAGS ?= 
-
-# Set to 1 to build debug version [0,1]
-DEBUG ?= 0
-
-#  
-GPIB ?= 0
-
-#  
-WXDIR ?= $(WXWIN)
-
-#  
-INSTALLDIR ?= $(WXWIN)
-
-
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD -MP
-CTB_LIB_CXXFLAGS = $(____DEBUG) $(____DEBUG_1) -mthreads $(__OPTIMIZE_FLAG) \
-	-I..\include $(CPPFLAGS) $(CXXFLAGS)
-CTB_LIB_OBJECTS =  \
-	$(OUTPUT)\ctb_lib_fifo.o \
-	$(OUTPUT)\ctb_lib_getopt.o \
-	$(OUTPUT)\ctb_lib_iobase.o \
-	$(OUTPUT)\ctb_lib_portscan.o \
-	$(OUTPUT)\ctb_lib_serportx.o \
-	$(OUTPUT)\ctb_lib_serport.o \
-	$(OUTPUT)\ctb_lib_timer.o \
-	$(____GPIBSRC_FILENAMES_OBJECTS)
-CTB_DLL_CXXFLAGS = $(____DEBUG) $(____DEBUG_1) -mthreads $(__OPTIMIZE_FLAG) \
-	-I..\include $(CPPFLAGS) $(CXXFLAGS)
-CTB_DLL_OBJECTS =  \
-	$(OUTPUT)\ctb_dll_fifo.o \
-	$(OUTPUT)\ctb_dll_getopt.o \
-	$(OUTPUT)\ctb_dll_iobase.o \
-	$(OUTPUT)\ctb_dll_portscan.o \
-	$(OUTPUT)\ctb_dll_serportx.o \
-	$(OUTPUT)\ctb_dll_serport.o \
-	$(OUTPUT)\ctb_dll_timer.o \
-	$(____GPIBSRC_FILENAMES_1_OBJECTS)
-CTBTEST_CXXFLAGS = $(____DEBUG) $(____DEBUG_1) -DGPIB=$(GPIB) -mthreads \
-	$(__OPTIMIZE_FLAG) -I..\include $(CPPFLAGS) $(CXXFLAGS)
-CTBTEST_OBJECTS =  \
-	$(OUTPUT)\ctbtest_ctbtest.o
-
-### Conditionally set variables: ###
-
-ifeq ($(DEBUG),0)
-OUTPUT = release
-endif
-ifeq ($(DEBUG),1)
-OUTPUT = debug
-endif
-ifeq ($(WXDIR),)
-INSTALLDIR = ..\lib
-endif
-ifeq ($(DEBUG),1)
-LIBFLAG = d
-endif
-ifeq ($(GPIB),1)
-GPIBFLAG = _gpib
-endif
-ifeq ($(GPIB),1)
-____GPIBSRC_FILENAMES_OBJECTS =  \
-	$(OUTPUT)\ctb_lib_gpib.o
-endif
-ifeq ($(GPIB),1)
-____GPIBSRC_FILENAMES_1_OBJECTS =  \
-	$(OUTPUT)\ctb_dll_gpib.o
-endif
-ifeq ($(DEBUG),0)
-____DEBUG = -DNDEBUG
-endif
-ifeq ($(DEBUG),1)
-____DEBUG = 
-endif
-ifeq ($(DEBUG),0)
-__OPTIMIZE_FLAG = -O0
-endif
-ifeq ($(DEBUG),1)
-__OPTIMIZE_FLAG = -O2
-endif
-ifeq ($(GPIB),1)
-__SYSLIB2_p = -lgpib32
-endif
-ifeq ($(DEBUG),0)
-____DEBUG_1 = 
-endif
-ifeq ($(DEBUG),1)
-____DEBUG_1 = -g
-endif
-
-
-all: $(OUTPUT)
-$(OUTPUT):
-	-if not exist $(OUTPUT) mkdir $(OUTPUT)
-
-### Targets: ###
-
-all: ..\lib\libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll $(OUTPUT)\ctbtest.exe tip-win32
-
-clean: 
-	-if exist $(OUTPUT)\*.o del $(OUTPUT)\*.o
-	-if exist $(OUTPUT)\*.d del $(OUTPUT)\*.d
-	-if exist ..\lib\libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a del ..\lib\libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll
-	-if exist ..\lib\libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a del ..\lib\libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a
-	-if exist $(OUTPUT)\ctbtest.exe del $(OUTPUT)\ctbtest.exe
-
-..\lib\libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a: $(CTB_LIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(CTB_LIB_OBJECTS)
-	ranlib $@
-
-..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll: $(CTB_DLL_OBJECTS)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(CTB_DLL_OBJECTS)  $(____DEBUG_1) -mthreads -Wl,--out-implib=..\lib\libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a -L..\lib $(LDFLAGS)  -lwinmm $(__SYSLIB2_p)
-
-$(OUTPUT)\ctbtest.exe: $(CTBTEST_OBJECTS) ..\lib\libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a
-	$(CXX) -o $@ $(CTBTEST_OBJECTS)  $(____DEBUG_1) -mthreads -L..\lib $(LDFLAGS)  ..\lib\libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a -lwinmm $(__SYSLIB2_p)
-
-wxinstall: 
-	@copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib $(INSTALLDIR)\lib\mingw_lib
-	@copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll $(INSTALLDIR)\lib\mingw_lib
-	
-	@if not exist $(INSTALLDIR)\include\ctb-0.16\win32 mkdir $(INSTALLDIR)\include\ctb-0.16\win32
-	@copy ..\include\ctb-0.16\*.h $(INSTALLDIR)\include\ctb-0.16
-	@copy ..\include\ctb-0.16\win32\*.h $(INSTALLDIR)\include\ctb-0.16\win32
-
-tip-win32: 
-	@echo "                                                                "
-	@echo "================================================================"
-	@echo " The building of ctb is finished. If you have an installed    "
-	@echo " wxWidget package (WXWIN must be defined in the enviroment),    "
-	@echo " you'll now have to run:                                        "
-	@echo "                                                                "
-	@echo " make DEBUG=$(DEBUG) GPIB=$(GPIB) wxinstall                     "
-	@echo "                                                                "
-	@echo " to install the libraries in:                                   "
-	@echo " $(INSTALLDIR)\lib\mingw_lib               "
-	@echo " and the header files in"
-	@echo " $(INSTALLDIR)\ctb-0.16"
-	@echo "                                                                "
-	@echo " If you are using another compiler (Borland, Watcom, mingw,...) "
-	@echo " take a look in the README in this directory!                   "
-	@echo "                                                                "
-	@echo " ctb comes with no guarantees and doesn't claim               "
-	@echo " to be suitable for any purpose.                                "
-	@echo "================================================================"
-	@echo "                                                                "
-
-$(OUTPUT)\ctb_lib_fifo.o: ./../src/fifo.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_lib_getopt.o: ./../src/getopt.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_lib_iobase.o: ./../src/iobase.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_lib_portscan.o: ./../src/portscan.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_lib_serportx.o: ./../src/serportx.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_lib_serport.o: ./../src/win32/serport.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_lib_timer.o: ./../src/win32/timer.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_lib_gpib.o: ./../src/gpib.cpp
-	$(CXX) -c -o $@ $(CTB_LIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_dll_fifo.o: ./../src/fifo.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_dll_getopt.o: ./../src/getopt.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_dll_iobase.o: ./../src/iobase.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_dll_portscan.o: ./../src/portscan.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_dll_serportx.o: ./../src/serportx.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_dll_serport.o: ./../src/win32/serport.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_dll_timer.o: ./../src/win32/timer.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctb_dll_gpib.o: ./../src/gpib.cpp
-	$(CXX) -c -o $@ $(CTB_DLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OUTPUT)\ctbtest_ctbtest.o: ./../samples/ctbtest.cpp
-	$(CXX) -c -o $@ $(CTBTEST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OUTPUT)/*.d
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.vc b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.vc
deleted file mode 100644
index 6b773f429b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.vc
+++ /dev/null
@@ -1,260 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# C++ compiler 
-CXX = cl
-
-# Standard flags for C++ 
-CXXFLAGS = 
-
-# Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS = 
-
-# Standard linker flags 
-LDFLAGS = 
-
-# Set to 1 to build debug version [0,1]
-#   0 - Release
-#   1 - Debug
-DEBUG = 0
-
-#  
-GPIB = 0
-
-#  
-WXDIR = $(WXWIN)
-
-#  
-INSTALLDIR = $(WXWIN)
-
-
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CTB_LIB_CXXFLAGS = /MD$(____DEBUG_4) /DWIN32 $(____DEBUG) $(____DEBUG_2) \
-	$(______DEBUG) /Fd..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.pdb \
-	$(__OPTIMIZE_FLAG) /I..\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
-CTB_LIB_OBJECTS =  \
-	$(OUTPUT)\ctb_lib_fifo.obj \
-	$(OUTPUT)\ctb_lib_getopt.obj \
-	$(OUTPUT)\ctb_lib_iobase.obj \
-	$(OUTPUT)\ctb_lib_portscan.obj \
-	$(OUTPUT)\ctb_lib_serportx.obj \
-	$(OUTPUT)\ctb_lib_serport.obj \
-	$(OUTPUT)\ctb_lib_timer.obj \
-	$(____GPIBSRC_FILENAMES_OBJECTS)
-CTB_DLL_CXXFLAGS = /MD$(____DEBUG_4) /DWIN32 $(____DEBUG) $(____DEBUG_2) \
-	$(______DEBUG) /Fd..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.pdb \
-	$(__OPTIMIZE_FLAG) /I..\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
-CTB_DLL_OBJECTS =  \
-	$(OUTPUT)\ctb_dll_fifo.obj \
-	$(OUTPUT)\ctb_dll_getopt.obj \
-	$(OUTPUT)\ctb_dll_iobase.obj \
-	$(OUTPUT)\ctb_dll_portscan.obj \
-	$(OUTPUT)\ctb_dll_serportx.obj \
-	$(OUTPUT)\ctb_dll_serport.obj \
-	$(OUTPUT)\ctb_dll_timer.obj \
-	$(____GPIBSRC_FILENAMES_1_OBJECTS)
-CTBTEST_CXXFLAGS = /MD$(____DEBUG_4) /DWIN32 $(____DEBUG) $(____DEBUG_2) \
-	$(______DEBUG) /Fd$(OUTPUT)\ctbtest.pdb /DGPIB=$(GPIB) $(__OPTIMIZE_FLAG) \
-	/I..\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
-CTBTEST_OBJECTS =  \
-	$(OUTPUT)\ctbtest_ctbtest.obj
-
-### Conditionally set variables: ###
-
-!if "$(DEBUG)" == "0"
-OUTPUT = release
-!endif
-!if "$(DEBUG)" == "1"
-OUTPUT = debug
-!endif
-!if "$(WXDIR)" == ""
-INSTALLDIR = ..\lib
-!endif
-!if "$(DEBUG)" == "1"
-LIBFLAG = d
-!endif
-!if "$(GPIB)" == "1"
-GPIBFLAG = _gpib
-!endif
-!if "$(GPIB)" == "1"
-____GPIBSRC_FILENAMES_OBJECTS =  \
-	$(OUTPUT)\ctb_lib_gpib.obj
-!endif
-!if "$(GPIB)" == "1"
-____GPIBSRC_FILENAMES_1_OBJECTS =  \
-	$(OUTPUT)\ctb_dll_gpib.obj
-!endif
-!if "$(DEBUG)" == "0"
-____DEBUG = /DNDEBUG
-!endif
-!if "$(DEBUG)" == "1"
-____DEBUG = 
-!endif
-!if "$(DEBUG)" == "0"
-____DEBUG_2 = 
-!endif
-!if "$(DEBUG)" == "1"
-____DEBUG_2 = /Zi
-!endif
-!if "$(DEBUG)" == "0"
-____DEBUG_3 = 
-!endif
-!if "$(DEBUG)" == "1"
-____DEBUG_3 = /DEBUG
-!endif
-!if "$(DEBUG)" == "0"
-______DEBUG = 
-!endif
-!if "$(DEBUG)" == "1"
-______DEBUG = /D_DEBUG
-!endif
-!if "$(DEBUG)" == "0"
-____DEBUG_4 = 
-!endif
-!if "$(DEBUG)" == "1"
-____DEBUG_4 = d
-!endif
-!if "$(DEBUG)" == "0"
-__OPTIMIZE_FLAG = /Od
-!endif
-!if "$(DEBUG)" == "1"
-__OPTIMIZE_FLAG = /O2
-!endif
-!if "$(GPIB)" == "1"
-__SYSLIB2_p = gpib32.lib
-!endif
-
-
-all: $(OUTPUT)
-$(OUTPUT):
-	-if not exist $(OUTPUT) mkdir $(OUTPUT)
-
-### Targets: ###
-
-all: ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll $(OUTPUT)\ctbtest.exe tip-win32
-
-clean: 
-	-if exist $(OUTPUT)\*.obj del $(OUTPUT)\*.obj
-	-if exist $(OUTPUT)\*.res del $(OUTPUT)\*.res
-	-if exist $(OUTPUT)\*.pch del $(OUTPUT)\*.pch
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ilk del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.ilk
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.pdb del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.pdb
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-	-if exist $(OUTPUT)\ctbtest.exe del $(OUTPUT)\ctbtest.exe
-	-if exist $(OUTPUT)\ctbtest.ilk del $(OUTPUT)\ctbtest.ilk
-	-if exist $(OUTPUT)\ctbtest.pdb del $(OUTPUT)\ctbtest.pdb
-
-..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib: $(CTB_LIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(CTB_LIB_OBJECTS)
-<<
-
-..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll: $(CTB_DLL_OBJECTS)
-	link /DLL /NOLOGO /OUT:$@  $(____DEBUG_3) /pdb:"..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.pdb"  /LIBPATH:..\lib $(LDFLAGS) @<<
-	$(CTB_DLL_OBJECTS)  winmm.lib $(__SYSLIB2_p) /IMPLIB:..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-<<
-
-$(OUTPUT)\ctbtest.exe: $(CTBTEST_OBJECTS) ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-	link /NOLOGO /OUT:$@  $(____DEBUG_3) /pdb:"$(OUTPUT)\ctbtest.pdb"  /LIBPATH:..\lib $(LDFLAGS) @<<
-	$(CTBTEST_OBJECTS)  ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib winmm.lib $(__SYSLIB2_p)
-<<
-
-wxinstall: 
-	@copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib $(INSTALLDIR)\lib\vc_lib
-	@copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll $(INSTALLDIR)\lib\vc_lib
-	
-	@if not exist $(INSTALLDIR)\include\ctb-0.16\win32 mkdir $(INSTALLDIR)\include\ctb-0.16\win32
-	@copy ..\include\ctb-0.16\*.h $(INSTALLDIR)\include\ctb-0.16
-	@copy ..\include\ctb-0.16\win32\*.h $(INSTALLDIR)\include\ctb-0.16\win32
-
-tip-win32: 
-	@echo "                                                                "
-	@echo "================================================================"
-	@echo " The building of ctb is finished. If you have an installed    "
-	@echo " wxWidget package (WXWIN must be defined in the enviroment),    "
-	@echo " you'll now have to run:                                        "
-	@echo "                                                                "
-	@echo " make DEBUG=$(DEBUG) GPIB=$(GPIB) wxinstall                     "
-	@echo "                                                                "
-	@echo " to install the libraries in:                                   "
-	@echo " $(INSTALLDIR)\lib\vc_lib               "
-	@echo " and the header files in"
-	@echo " $(INSTALLDIR)\ctb-0.16"
-	@echo "                                                                "
-	@echo " If you are using another compiler (Borland, Watcom, mingw,...) "
-	@echo " take a look in the README in this directory!                   "
-	@echo "                                                                "
-	@echo " ctb comes with no guarantees and doesn't claim               "
-	@echo " to be suitable for any purpose.                                "
-	@echo "================================================================"
-	@echo "                                                                "
-
-$(OUTPUT)\ctb_lib_fifo.obj: .\..\src\fifo.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_LIB_CXXFLAGS) .\..\src\fifo.cpp
-
-$(OUTPUT)\ctb_lib_getopt.obj: .\..\src\getopt.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_LIB_CXXFLAGS) .\..\src\getopt.cpp
-
-$(OUTPUT)\ctb_lib_iobase.obj: .\..\src\iobase.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_LIB_CXXFLAGS) .\..\src\iobase.cpp
-
-$(OUTPUT)\ctb_lib_portscan.obj: .\..\src\portscan.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_LIB_CXXFLAGS) .\..\src\portscan.cpp
-
-$(OUTPUT)\ctb_lib_serportx.obj: .\..\src\serportx.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_LIB_CXXFLAGS) .\..\src\serportx.cpp
-
-$(OUTPUT)\ctb_lib_serport.obj: .\..\src\win32\serport.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_LIB_CXXFLAGS) .\..\src\win32\serport.cpp
-
-$(OUTPUT)\ctb_lib_timer.obj: .\..\src\win32\timer.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_LIB_CXXFLAGS) .\..\src\win32\timer.cpp
-
-$(OUTPUT)\ctb_lib_gpib.obj: .\..\src\gpib.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_LIB_CXXFLAGS) .\..\src\gpib.cpp
-
-$(OUTPUT)\ctb_dll_fifo.obj: .\..\src\fifo.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_DLL_CXXFLAGS) .\..\src\fifo.cpp
-
-$(OUTPUT)\ctb_dll_getopt.obj: .\..\src\getopt.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_DLL_CXXFLAGS) .\..\src\getopt.cpp
-
-$(OUTPUT)\ctb_dll_iobase.obj: .\..\src\iobase.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_DLL_CXXFLAGS) .\..\src\iobase.cpp
-
-$(OUTPUT)\ctb_dll_portscan.obj: .\..\src\portscan.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_DLL_CXXFLAGS) .\..\src\portscan.cpp
-
-$(OUTPUT)\ctb_dll_serportx.obj: .\..\src\serportx.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_DLL_CXXFLAGS) .\..\src\serportx.cpp
-
-$(OUTPUT)\ctb_dll_serport.obj: .\..\src\win32\serport.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_DLL_CXXFLAGS) .\..\src\win32\serport.cpp
-
-$(OUTPUT)\ctb_dll_timer.obj: .\..\src\win32\timer.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_DLL_CXXFLAGS) .\..\src\win32\timer.cpp
-
-$(OUTPUT)\ctb_dll_gpib.obj: .\..\src\gpib.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTB_DLL_CXXFLAGS) .\..\src\gpib.cpp
-
-$(OUTPUT)\ctbtest_ctbtest.obj: .\..\samples\ctbtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CTBTEST_CXXFLAGS) .\..\samples\ctbtest.cpp
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.wat b/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.wat
deleted file mode 100644
index 5041ddac36..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/build/makefile.wat
+++ /dev/null
@@ -1,283 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# C++ compiler 
-CXX = wpp386
-
-# Standard flags for C++ 
-CXXFLAGS = 
-
-# Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS = 
-
-# Standard linker flags 
-LDFLAGS = 
-
-# Set to 1 to build debug version [0,1]
-#   0 - Release
-#   1 - Debug
-DEBUG = 0
-
-#  
-GPIB = 0
-
-#  
-WXDIR = $(%WXWIN)
-
-#  
-INSTALLDIR = $(%WXWIN)
-
-
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-!  loaddll wcc      wccd
-!  loaddll wccaxp   wccdaxp
-!  loaddll wcc386   wccd386
-!  loaddll wpp      wppdi86
-!  loaddll wppaxp   wppdaxp
-!  loaddll wpp386   wppd386
-!  loaddll wlink    wlink
-!  loaddll wlib     wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-OUTPUT =
-!ifeq DEBUG 0
-OUTPUT = release
-!endif
-!ifeq DEBUG 1
-OUTPUT = debug
-!endif
-INSTALLDIR =
-!ifeq WXDIR
-INSTALLDIR = ..\lib
-!endif
-LIBFLAG =
-!ifeq DEBUG 1
-LIBFLAG = d
-!endif
-GPIBFLAG =
-!ifeq GPIB 1
-GPIBFLAG = _gpib
-!endif
-____GPIBSRC_FILENAMES_OBJECTS =
-!ifeq GPIB 1
-____GPIBSRC_FILENAMES_OBJECTS =  &
-	$(OUTPUT)\ctb_lib_gpib.obj
-!endif
-____GPIBSRC_FILENAMES_1_OBJECTS =
-!ifeq GPIB 1
-____GPIBSRC_FILENAMES_1_OBJECTS =  &
-	$(OUTPUT)\ctb_dll_gpib.obj
-!endif
-____DEBUG =
-!ifeq DEBUG 0
-____DEBUG = -dNDEBUG
-!endif
-!ifeq DEBUG 1
-____DEBUG = 
-!endif
-____DEBUG_0 =
-!ifeq DEBUG 0
-____DEBUG_0 = -d0
-!endif
-!ifeq DEBUG 1
-____DEBUG_0 = -d2
-!endif
-____DEBUG_2 =
-!ifeq DEBUG 0
-____DEBUG_2 = 
-!endif
-!ifeq DEBUG 1
-____DEBUG_2 = debug all
-!endif
-__OPTIMIZE_FLAG =
-!ifeq DEBUG 0
-__OPTIMIZE_FLAG = -od
-!endif
-!ifeq DEBUG 1
-__OPTIMIZE_FLAG = -ot -ox
-!endif
-__SYSLIB2_p =
-!ifeq GPIB 1
-__SYSLIB2_p = gpib32.lib
-!endif
-
-### Variables: ###
-
-CTB_LIB_CXXFLAGS = $(____DEBUG) $(____DEBUG_0) -bm $(__OPTIMIZE_FLAG) &
-	-i=..\include $(CPPFLAGS) $(CXXFLAGS)
-CTB_LIB_OBJECTS =  &
-	$(OUTPUT)\ctb_lib_fifo.obj &
-	$(OUTPUT)\ctb_lib_getopt.obj &
-	$(OUTPUT)\ctb_lib_iobase.obj &
-	$(OUTPUT)\ctb_lib_portscan.obj &
-	$(OUTPUT)\ctb_lib_serportx.obj &
-	$(OUTPUT)\ctb_lib_serport.obj &
-	$(OUTPUT)\ctb_lib_timer.obj &
-	$(____GPIBSRC_FILENAMES_OBJECTS)
-CTB_DLL_CXXFLAGS = -bd $(____DEBUG) $(____DEBUG_0) -bm $(__OPTIMIZE_FLAG) &
-	-i=..\include $(CPPFLAGS) $(CXXFLAGS)
-CTB_DLL_OBJECTS =  &
-	$(OUTPUT)\ctb_dll_fifo.obj &
-	$(OUTPUT)\ctb_dll_getopt.obj &
-	$(OUTPUT)\ctb_dll_iobase.obj &
-	$(OUTPUT)\ctb_dll_portscan.obj &
-	$(OUTPUT)\ctb_dll_serportx.obj &
-	$(OUTPUT)\ctb_dll_serport.obj &
-	$(OUTPUT)\ctb_dll_timer.obj &
-	$(____GPIBSRC_FILENAMES_1_OBJECTS)
-CTBTEST_CXXFLAGS = $(____DEBUG) $(____DEBUG_0) -dGPIB=$(GPIB) -bm &
-	$(__OPTIMIZE_FLAG) -i=..\include $(CPPFLAGS) $(CXXFLAGS)
-CTBTEST_OBJECTS =  &
-	$(OUTPUT)\ctbtest_ctbtest.obj
-
-
-all : $(OUTPUT)
-$(OUTPUT) :
-	-if not exist $(OUTPUT) mkdir $(OUTPUT)
-
-### Targets: ###
-
-all : .SYMBOLIC ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll $(OUTPUT)\ctbtest.exe tip-win32
-
-clean : .SYMBOLIC 
-	-if exist $(OUTPUT)\*.obj del $(OUTPUT)\*.obj
-	-if exist $(OUTPUT)\*.res del $(OUTPUT)\*.res
-	-if exist $(OUTPUT)\*.lbc del $(OUTPUT)\*.lbc
-	-if exist $(OUTPUT)\*.ilk del $(OUTPUT)\*.ilk
-	-if exist $(OUTPUT)\*.pch del $(OUTPUT)\*.pch
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll
-	-if exist ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib del ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-	-if exist $(OUTPUT)\ctbtest.exe del $(OUTPUT)\ctbtest.exe
-
-..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib :  $(CTB_LIB_OBJECTS)
-	@%create $(OUTPUT)\ctb_lib.lbc
-	@for %i in ($(CTB_LIB_OBJECTS)) do @%append $(OUTPUT)\ctb_lib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OUTPUT)\ctb_lib.lbc
-
-..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll :  $(CTB_DLL_OBJECTS)
-	@%create $(OUTPUT)\ctb_dll.lbc
-	@%append $(OUTPUT)\ctb_dll.lbc option quiet
-	@%append $(OUTPUT)\ctb_dll.lbc name $^@
-	@%append $(OUTPUT)\ctb_dll.lbc option caseexact
-	@%append $(OUTPUT)\ctb_dll.lbc  $(____DEBUG_2)  libpath ..\lib $(LDFLAGS)
-	@for %i in ($(CTB_DLL_OBJECTS)) do @%append $(OUTPUT)\ctb_dll.lbc file %i
-	@for %i in ( winmm.lib $(__SYSLIB2_p)) do @%append $(OUTPUT)\ctb_dll.lbc library %i
-	@%append $(OUTPUT)\ctb_dll.lbc
-	@%append $(OUTPUT)\ctb_dll.lbc system nt_dll
-	wlink @$(OUTPUT)\ctb_dll.lbc
-	wlib -q -n -b ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib +$^@
-
-$(OUTPUT)\ctbtest.exe :  $(CTBTEST_OBJECTS) ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib
-	@%create $(OUTPUT)\ctbtest.lbc
-	@%append $(OUTPUT)\ctbtest.lbc option quiet
-	@%append $(OUTPUT)\ctbtest.lbc name $^@
-	@%append $(OUTPUT)\ctbtest.lbc option caseexact
-	@%append $(OUTPUT)\ctbtest.lbc  $(____DEBUG_2)  libpath ..\lib $(LDFLAGS)
-	@for %i in ($(CTBTEST_OBJECTS)) do @%append $(OUTPUT)\ctbtest.lbc file %i
-	@for %i in ( ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib winmm.lib $(__SYSLIB2_p)) do @%append $(OUTPUT)\ctbtest.lbc library %i
-	@%append $(OUTPUT)\ctbtest.lbc
-	@for %i in () do @%append $(OUTPUT)\ctbtest.lbc option stack=%i
-	wlink @$(OUTPUT)\ctbtest.lbc
-
-wxinstall :  
-	@copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.lib $(INSTALLDIR)\lib\watcom_lib
-	@copy ..\lib\ctb$(LIBFLAG)$(GPIBFLAG)-0.16.dll $(INSTALLDIR)\lib\watcom_lib
-	
-	@if not exist $(INSTALLDIR)\include\ctb-0.16\win32 mkdir $(INSTALLDIR)\include\ctb-0.16\win32
-	@copy ..\include\ctb-0.16\*.h $(INSTALLDIR)\include\ctb-0.16
-	@copy ..\include\ctb-0.16\win32\*.h $(INSTALLDIR)\include\ctb-0.16\win32
-
-tip-win32 :  
-	@echo "                                                                "
-	@echo "================================================================"
-	@echo " The building of ctb is finished. If you have an installed    "
-	@echo " wxWidget package (WXWIN must be defined in the enviroment),    "
-	@echo " you'll now have to run:                                        "
-	@echo "                                                                "
-	@echo " make DEBUG=$(DEBUG) GPIB=$(GPIB) wxinstall                     "
-	@echo "                                                                "
-	@echo " to install the libraries in:                                   "
-	@echo " $(INSTALLDIR)\lib\watcom_lib               "
-	@echo " and the header files in"
-	@echo " $(INSTALLDIR)\ctb-0.16"
-	@echo "                                                                "
-	@echo " If you are using another compiler (Borland, Watcom, mingw,...) "
-	@echo " take a look in the README in this directory!                   "
-	@echo "                                                                "
-	@echo " ctb comes with no guarantees and doesn't claim               "
-	@echo " to be suitable for any purpose.                                "
-	@echo "================================================================"
-	@echo "                                                                "
-
-$(OUTPUT)\ctb_lib_fifo.obj :  .AUTODEPEND .\..\src\fifo.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_LIB_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_lib_getopt.obj :  .AUTODEPEND .\..\src\getopt.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_LIB_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_lib_iobase.obj :  .AUTODEPEND .\..\src\iobase.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_LIB_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_lib_portscan.obj :  .AUTODEPEND .\..\src\portscan.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_LIB_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_lib_serportx.obj :  .AUTODEPEND .\..\src\serportx.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_LIB_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_lib_serport.obj :  .AUTODEPEND .\..\src\win32\serport.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_LIB_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_lib_timer.obj :  .AUTODEPEND .\..\src\win32\timer.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_LIB_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_lib_gpib.obj :  .AUTODEPEND .\..\src\gpib.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_LIB_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_dll_fifo.obj :  .AUTODEPEND .\..\src\fifo.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_DLL_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_dll_getopt.obj :  .AUTODEPEND .\..\src\getopt.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_DLL_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_dll_iobase.obj :  .AUTODEPEND .\..\src\iobase.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_DLL_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_dll_portscan.obj :  .AUTODEPEND .\..\src\portscan.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_DLL_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_dll_serportx.obj :  .AUTODEPEND .\..\src\serportx.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_DLL_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_dll_serport.obj :  .AUTODEPEND .\..\src\win32\serport.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_DLL_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_dll_timer.obj :  .AUTODEPEND .\..\src\win32\timer.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_DLL_CXXFLAGS) $<
-
-$(OUTPUT)\ctb_dll_gpib.obj :  .AUTODEPEND .\..\src\gpib.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTB_DLL_CXXFLAGS) $<
-
-$(OUTPUT)\ctbtest_ctbtest.obj :  .AUTODEPEND .\..\samples\ctbtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CTBTEST_CXXFLAGS) $<
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/ctb.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/ctb.h
deleted file mode 100644
index c71929f2be..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/ctb.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef LIBCTB_CTB_H_INCLUDED_
-#define LIBCTB_CTB_H_INCLUDED_
-
-#include "ctb-0.16/fifo.h"
-#if ( GPIB )
-# include "ctb-0.16/gpib.h"
-#endif
-#include "ctb-0.16/getopt.h"
-#include "ctb-0.16/iobase.h"
-//#include "ctb-0.16/kbhit.h"
-#include "ctb-0.16/portscan.h"
-#include "ctb-0.16/serport.h"
-#include "ctb-0.16/serportx.h"
-#include "ctb-0.16/timer.h"
-
-/*!
-  \mainpage ctb overview
-
-  The ctb (communication toolbox) library was realized, to simplify the
-  communication with other instruments throughout the serial com ports
-  (at first). To make my life easier, it should works with Linux and
-  all win32 plattforms (excepted windows 3.1, which is a only 16bit OS)
-  because I develope my applications for both plattforms).\n
-  Some times later GPIB support was added to make ctb an integrated part
-  for the extensive test and calibration system of a company I worked
-  these days.\n
-  The main goal of the library was a non-blocked communication to avoid
-  frozen GUIs waiting for data which in some conditions never arrives.
-  
-  On the base ctb defines an abstract class IOBase, which must be
-  derivate for several interfaces (at now this was done for the
-  RS232 comports and GPIB IEEE488 interface).
-
-  This leads to another feature: Because all classes depends on one
-  super class, you have just open your wanted interface and don't
-  worry about it's special typ later. This is like the 'Virtual
-  Instrument' featured by Nation Instruments LabView.
-
-  Last not least: ctb provides one written code for Linux and Windows
-  (compiles well with GNU G++ and VC++). Without any dependences (execept
-  for a standard C++ compilier) ctb runs also in small enviroments like
-  embedded systems and doesn't need any graphic stuff for use.
-
-    ctb is composed of five parts:
-
-  - ctb::IOBase class
-  - ctb::SerialPort class
-  - ctb::GpibDevice class
-  - ctb::Timer class
-  - ctb::Fifo class
-
-  \section IOBase IOBase class
-
-  An abstract class for different interfaces. The idea behind this:
-  Similar to the virtual file system this class defines a lot of
-  preset member functions, which the derivate classes must be
-  overload.\n
-  In the main thing these are: open a interface (such as RS232),
-  reading and writing non blocked through the interface and at
-  last, close it.\n
-  For special interface settings the method ioctl was defined.
-  (control interface). ioctl covers some interface dependent
-  settings like switch on/off the RS232 status lines and must also
-  be defined from each derivated class.
-
-
-  \section SerialPort SerialPort class
-
-  The class for the serial ports is named as
-  ctb::SerialPort. SerialPort is a wrapper for non blocked reading and
-  writing. This is easy under linux, but with windows a lot more
-  tricky. SerialPort is as simple as possible. It doesn't create any
-  gui events or signals, so it works also standalone. It's also not a
-  device driver, means, you must call the read method, if you look for
-  receiving data.
-
-  You can write any desired data with any length (length type is
-  size_t, I think, on win32 and linux this is a 32Bit integer) and
-  SerialPort returns the really writen data length, also you can read
-  a lot of data and SerialPort returns the really received data count.
-
-  Both, read and write returns immediatelly. Using these, the program
-  never blocks.  Also IOBase implements a blocked read and write. You can
-  use these functions, if you want a definitiv count of data and never
-  accept less than this. Because there is a difficulty, when the
-  communication is interrupted or death, both blocked functions get a
-  timeout flag to returns after a given time interval.  The timeouts
-  will be handled with the second timer class.
-
-  As an additional benefit ctb features also 9 Bit transmission (with
-  take advantage of the parity bit), non-standard baudrates (depending
-  on your hardware but not on ctb) and all parity eventualities
-  including static parity settings like Mark and Space.
-
-  \section GpibDevice GpibDevice class
-  
-  Named as ctb::GpibDevice. In the philosophy of the SerialPort class
-  GpibDevice also supports non-blocking communication. You can instant
-  as many GpibDevice objects as you need for instance to communicate 
-  with a lot of different bus participants in a typical GPIB enviroment.
-  GPIB support was tested with PCI cards and USB adapter from Nation
-  Instrument and Keithley.
-
-  \section Timer Timer class
-
-  The idea of the ctb::Timer class is to base on the Unix C alarm
-  function. You create a Timer with a given alarm time and a adress of
-  flag, which the timer must set after the time is over.
-
-  Because the alarm function cannot used more than once in the same
-  process (under windows I don't know a similar function), every timer
-  instance will be a separate thread after starting it. So you can start
-  a timer and continue in your program, make a lot of things and test
-  the flag whenever you want this. (For example, you read/write a
-  given count of data).
-
-  \note
-  I think, it's a better style, to request a given count of data in
-  100ms (for example) and trap the situation, if there are not enough
-  data after this time. And not do this for every byte!
-
-  \section Fifo Fifo cass
-  Provides a simple thread safe fifo to realize a fast and simple
-  communication pipe between two threads (and was used also as a put
-  back mechanism for the wxIOBase and it's derivated classes).\n
-  ctb::Fifo tackles the concurrently access from different threads with an
-  internal temporary pointer asignment which was atomic. From there no
-  mutex or semaphore is involved and lead to a fast access.
-
-  Please note:\n
-  The thread safeness is limited to the put/get write/read methods but
-  which should be sufficent for a fifo.
-
-
-  \latexonly \newpage \endlatexonly
-
- */
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/fifo.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/fifo.h
deleted file mode 100644
index d17079d4a2..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/fifo.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef __LIBCTB_FIFO_H_INCLUDED_
-#define __LIBCTB_FIFO_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fifo.h
-// Purpose:
-// Author:      Joachim Buermann, Michael Hungershausen
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include <sys/types.h>
-
-/**
-   \file fifo.h
-*/
-
-namespace ctb {
-
-/*!
-  \class Fifo
-  A simple thread safe fifo to realize a put back mechanism for the 
-  wxIOBase and it's derivated classes.
-*/
-    class Fifo
-    {
-    protected:
-	   /*! the size of the fifo */
-	   size_t m_size;
-	   /*! the start of the internal fifo buffer */
-	   char* m_begin;
-	   /*! 
-		the end of the internal fifo buffer (m_end marks the first
-		invalid byte AFTER the internal buffer)
-	   */
-	   char* m_end;
-	   /*! the current read position */
-	   char* m_rdptr;
-	   /*! the current write position */
-	   char* m_wrptr;
-    public:
-	   /*!
-		\brief the constructor initialize a fifo with the given size.
-		\param size size of the fifo
-	   */
-	   Fifo(size_t size);
-	   /*!
-		\brief the destructor destroys all internal memory.
-	   */
-	   virtual ~Fifo();
-	   /*!
-		\brief clear all internal memory and set the read and write
-		pointers to the start of the internal memory.
-		\Note This function is not thread safe! Don't use it, if another 
-		thread takes access to the fifo instance. Use a looping get() or
-		read() call instead of this.
-	   */
-	   virtual void clear();
-	   /*!
-		\brief fetch the next available byte from the fifo.
-		\param ch points to a charater to store the result
-		\return 1 if successful, 0 otherwise
-	   */
-	   virtual int get(char* ch);
-	   /*!
-		\brief query the fifo for it's available bytes.
-		\return count of readable bytes, storing in the fifo 
-	   */
-	   size_t items();
-	   /*!
-		\brief put a character into the fifo.
-		\param ch the character to put in
-		\return 1 if successful, 0 otherwise
-	   */
-	   virtual int put(char ch);
-	   /*!
-		\brief read a given count of bytes out of the fifo.
-		\param data memory to store the readed data
-		\param count number of bytes to read
-		\return On success, the number of bytes read are returned, 
-		0 otherwise
-	   */
-	   virtual int read(char* data,int count);
-	   /*!
-		\brief write a given count of bytes into the fifo.
-		\param data start of the data to write
-		\param count number of bytes to write
-		\return On success, the number of bytes written are returned, 
-		0 otherwise
-	   */
-	   virtual int write(char* data,int count);
-    };
-
-} // namespace ctb
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/getopt.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/getopt.h
deleted file mode 100644
index 2efd341889..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/getopt.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef LIBCTB_GETOPT_H_INCLUDED_
-#define LIBCTB_GETOPT_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        getopt.h
-// Purpose:     Simple wrapper file
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined (WIN32)
-# include "win32/getopt.h"
-#else
-# include <getopt.h>
-#endif
-
-#endif
-// __WX_GETOPT_H
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/gpib.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/gpib.h
deleted file mode 100644
index 1d360a8c49..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/gpib.h
+++ /dev/null
@@ -1,378 +0,0 @@
-#ifndef LIBCTB_GPIB_H_INCLUDED_
-#define LIBCTB_GPIB_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        gpibx.h
-// Purpose:     base class for gpib devices
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "ctb-0.16/iobase.h"
-
-namespace ctb {
-
-/*!
-  \file gpib.h
-*/
-
-    /*! defines the os specific name for the first gpib controller */
-    extern const char* GPIB1;
-
-    /*! defines the os specific name for the second gpib controller */
-    extern const char* GPIB2;
-
-    /*!
-	 \enum GpibTimeout
-	 NI488.2 API defines the following valid timeouts.
-    */
-    enum GpibTimeout
-    {
-	   /// no timeout (infinity)
-	   GpibTimeoutNone = 0, 
-	   /// 10 micro seconds
-	   GpibTimeout10us, 
-	   /// 30 micro seconds
-	   GpibTimeout30us,
-	   /// 100 micro seconds
-	   GpibTimeout100us,
-	   /// 300 micro seconds
-	   GpibTimeout300us,
-	   /// 1 milli second
-	   GpibTimeout1ms,
-	   /// 3 milli seconds
-	   GpibTimeout3ms,  
-	   /// 10 milli seconds
-	   GpibTimeout10ms,
-	   /// 30 milli seconds
-	   GpibTimeout30ms, 
-	   /// 0.1 seconds
-	   GpibTimeout100ms,
-	   /// 0.3 seconds
-	   GpibTimeout300ms,
-	   /// 1 second
-	   GpibTimeout1s,
-	   /// 3 seconds
-	   GpibTimeout3s,
-	   /// 10 seconds
-	   GpibTimeout10s,
-	   /// 30 seconds
-	   GpibTimeout30s,
-	   /// 100 seconds
-	   GpibTimeout100s,
-	   /// 300 seconds (5 minutes)
-	   GpibTimeout300s,
-	   /// 1000 seconds
-	   GpibTimeout1000s
-    };
-
-    /*!
-	 \struct Gpib_DCS
-	 
-	 The device control struct for the gpib communication class.
-	 This struct should be used, if you refer advanced parameter.
-    */
-    struct Gpib_DCS
-    {
-	   /*! primary address of GPIB device */
-	   int m_address1;
-	   /*! secondary address of GPIB device */
-	   int m_address2;
-	   /*! I/O timeout */
-	   GpibTimeout m_timeout;
-	   /*! EOT enable */
-	   bool m_eot;
-	   /*!
-		Defines the EOS character.
-		Note! Defining an EOS byte does not cause the driver to
-		automatically send that byte at the end of write I/O
-		operations. The application is responsible for placing the
-		EOS byte at the end of the data strings that it defines.
-		(National Instruments NI-488.2M Function Reference Manual)
-	   */
-	   unsigned char m_eosChar;
-	   /*! 
-		Set the EOS mode (handling).m_eosMode may be a combination 
-		of bits ORed together. The following bits can be used:
-		0x04: Terminate read when EOS is detected.
-		0x08: Set EOI (End or identify line) with EOS on write function
-		0x10: Compare all 8 bits of EOS byte rather than low 7 bits
-		(all read and write functions).
-	   */
-	   unsigned char m_eosMode;
-	   /*! buffer for internal use */
-	   char m_buf[32];
-	   /*! to avoid memory leak warnings generated by swig */
-	   ~Gpib_DCS() {};
-	   /*!
-		\brief the constructor initiate the device control struct with
-		the common useful values and set the internal timeout for the
-		GPIB controller to 1ms to avoid (or better reduce) blocking
-	   */
-	   Gpib_DCS() {
-		  /*! set default device address to 1 */
-		  m_address1 = 1;
-		  m_address2 = 0;
-		  /*! 
-		    set the timeout to a short value to avoid blocking
-		    (default are 1msec)
-		  */
-		  m_timeout = GpibTimeout1ms;
-		  m_eot = true;
-		  /*! EOS character, see above! */
-		  m_eosChar = 0;//'\n';
-		  /*! EOS mode, see above! */
-		  m_eosMode = 0;
-	   };
-	   /*!
-		\brief returns the internal parameters in a more human readable
-		string format like 'Adr: (1,0) to:1ms'.
-		\return the settings as a null terminated string
-	   */
-	   char* GetSettings();
-    }; 
-
-/*!
-  \enum GpibIoctls
-
-  The following Ioctl calls are only valid for the GpibDevice class.
-*/
-    enum GpibIoctls {
-	   /*!
-		Set the adress of the via gpib connected device.
-	   */
-	   CTB_GPIB_SETADR = CTB_GPIB,
-	   /*!
-		Get the serial poll byte
-	   */
-	   CTB_GPIB_GETRSP,
-	   /*!
-		Get the GPIB status
-	   */
-	   CTB_GPIB_GETSTA,
-	   /*!
-		Get the last GPIB error number
-	   */
-	   CTB_GPIB_GETERR,
-	   /*!
-		Get the GPIB line status (hardware control lines) as an
-		integer. The lowest 8 bits correspond to the current state
-		of the lines.
-	   */
-	   CTB_GPIB_GETLINES,
-	   /*!
-		Set the GPIB specific timeout
-	   */
-	   CTB_GPIB_SETTIMEOUT,
-	   /*!
-		Forces the specified device to go to local program mode
-	   */
-	   CTB_GPIB_GTL,
-	   /*!
-		This routine can only be used if the specified GPIB 
-		Interface Board is the System Controller.
-		Remember that even though the REN line is asserted, 
-		the device(s) will not be put into remote state until is
-		addressed to listen by the Active Controller
-	   */
-	   CTB_GPIB_REN,
-	   /*!
-		The command asserts the GPIB interface clear (IFC) line for
-		ast least 100us if the GPIB board is the system controller.
-		This initializes the GPIB and makes the interface CIC and
-		active controller with ATN asserted.
-		Note! The IFC signal resets only the GPIB interface functions
-		of the bus devices and not the internal device functions.
-		For a device reset you should use the CTB_RESET command above.
-	   */
-	   CTB_GPIB_RESET_BUS,
-	   /*!
-		Configure the end-of-string (EOS) termination character.
-		Note! Defining an EOS byte does not cause the driver to
-		automatically send that byte at the end of write I/O
-		operations. The application is responsible for placing the
-		EOS byte at the end of the data strings that it defines.
-		(National Instruments NI-488.2M Function Reference Manual)
-	   */
-	   CTB_GPIB_SET_EOS_CHAR,
-	   /*!
-		Get the internal EOS termination character (see above).
-	   */
-	   CTB_GPIB_GET_EOS_CHAR,
-	   /*! 
-		Set the EOS mode (handling).m_eosMode may be a combination 
-		of bits ORed together. The following bits can be used:
-		0x04: Terminate read when EOS is detected.
-		0x08: Set EOI (End or identify line) with EOS on write function
-		0x10: Compare all 8 bits of EOS byte rather than low 7 bits
-		(all read and write functions).
-	   */
-	   CTB_GPIB_SET_EOS_MODE,
-	   /*!
-		Get the internal EOS mode (see above).
-	   */
-	   CTB_GPIB_GET_EOS_MODE,
-    };
-
-/*!
-  \class GpibDevice
-  GpibDevice is the basic class for communication via the GPIB bus. 
-*/
-    class GpibDevice : public IOBase
-    {
-    protected:
-	   /*!
-		\brief
-		the internal board identifier, 0 for the first gpib controller,
-		1 for the second one
-	   */
-	   int m_board;
-	   /*!
-		\brief
-		the file descriptor of the connected gpib device
-	   */
-	   int m_hd;
-	   /*!
-		\brief
-		contains the internal conditions of the GPIB communication like
-		GPIB error, timeout and so on...
-	   */
-	   int m_state;
-	   /*! the internal GPIB error number */
-	   int m_error;
-	   /*! the count of data read or written */
-	   int m_count;
-	   /*!
-		\brief contains the internal settings of the GPIB connection like
-		address, timeout, end of string character and so one...
-	   */
-	   Gpib_DCS m_dcs;
-	   int CloseDevice();
-	   /*!
-		\brief returns a short notation or more detail description of
-		the given GPIB error number.
-		\param error the occured GPIB error
-		\param detailed true for a more detailed description, false
-		otherwise
-		\return a null terminated string with the short or detailed
-		error message.
-	   */
-	   virtual const char* GetErrorString(int error,bool detailed);
-	   /*!
-		Open the interface (internally to request a file descriptor for the
-		given interface). The second parameter is a undefined pointer of a
-		Gpib_DCS data struct.
-		\param devname the name of the GPIB device, GPIB1 means the first
-		GPIB controller, GPIB2 the second (if available).
-		\param dcs untyped pointer of advanced device parameters,
-		\sa struct Gpib_DCS (data struct for the gpib device)
-		\return zero on success, otherwise -1
-	   */
-	   int OpenDevice(const char* devname, void* dcs);
-    public:
-	   GpibDevice() {
-		  m_board = -1;
-		  m_hd = -1;
-		  m_state = m_count = m_error = 0;
-	   };
-	   virtual ~GpibDevice() {Close();};
-	   /*!
-		\brief returns the name of the class instance. You find this useful,
-		if you handle different devices like a serial port or a gpib device
-		via a IOBase pointer.
-		\return name of the class.
-	   */
-	   const char* ClassName() {return "ctb::GpibDevice";};
-	   /*!
-		\brief returns a more detail description of the given error
-		number.
-		\param error the occured error number
-		\return null terminated string with the error description
-	   */
-	   virtual const char* GetErrorDescription(int error) {
-		  return GetErrorString(error,true);
-	   };
-	   /*!
-		\brief returns a short notation like 'EABO' of the given error
-		number.
-		\param error the occured error number
-		\return null terminated string with the short error notation
-	   */
-	   virtual const char* GetErrorNotation(int error) {
-		  return GetErrorString(error,false);
-	   };
-	   /*!
-		\brief request the current settings of the connected gpib device
-		as a null terminated string.
-		\return the settings as a string like 'Adr: (1,0) to:1ms'
-	   */
-	   virtual char* GetSettingsAsString() {
-		  return m_dcs.GetSettings();
-	   };
-	   /// This is only for internal usage
-	   int Ibrd(char* buf,size_t len);
-	   /// This is only for internal usage
-	   int Ibwrt(char* buf,size_t len);
-	   /*!
-		\brief Many operating characteristics are only possible for
-		special devices. To avoid the need of a lot of different functions
-		and to give the user a uniform interface, all this special
-		operating instructions will covered by one Ioctl methode (like
-		the linux ioctl call).
-		The Ioctl command (cmd) has encoded in it whether the argument 
-		is an in parameter or out parameter, and the size of the
-		argument args in bytes. Macros and defines used in specifying an
-		ioctl request are located in iobase.h and the header file for
-		the derivated device (for example in gpib.h).
-		\param cmd one of GpibIoctls specify the ioctl request.
-		\param args is a typeless pointer to a memory location, where
-		Ioctl reads the request arguments or write the results.
-		Please note, that an invalid memory location or size involving
-		a buffer overflow or segmention fault!
-	   */
-	   virtual int Ioctl(int cmd,void* args);
-	   /*!
-		Returns the current state of the device.
-		\return 1 if device is valid and open, otherwise 0
-	   */
-	   int IsOpen() {
-		  return m_hd >= 0;
-	   };
-
-	   /*!
-	     \brief Opens a GPIB device in a user likely way. Insteed of
-	     using the Device Control Struct just input your parameter in a
-	     more intuitive manner.
-	     \param devname the name of the GPIB controler like GPIB1 or GPIB2
-	     \param address the address of the connected device (1...31)
-	     \return the new file descriptor, or -1 if an error occurred
-	    */
-	   int Open( const char* devname, int address );
-
-	   // Open overrides and hides the IOBase::Open( const char*
-	   // devname, void* dcs ) of the base class! So bring it into scope 
-	   // again!
-	   using IOBase::Open;
-
-	   int Read(char* buf,size_t len);
-
-	   int Write(char* buf,size_t len);
-
-	   /*!
-		\brief FindListener returns all listening devices connected to
-		the GPIB bus of the given board.
-		This function is not member of the GPIB class, becauce it
-		should do it's job before you open any GPIB connection.
-		\param board the board nummber. Default is the first board (=0). 
-		Valid board numbers are 0 and 1.
-		\return -1 if an error occurred, otherwise a setting bit for
-		each listener address. Bit0 is always 0 (address 0 isn't valid,
-		Bit1 means address 1, Bit2 address 2 and so on...
-	   */
-	   static int FindListeners(int board = 0);
-    };
-
-} // namespace ctb
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/iobase.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/iobase.h
deleted file mode 100644
index eda03b314f..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/iobase.h
+++ /dev/null
@@ -1,294 +0,0 @@
-#ifndef LIBCTB_IOBASE_H_INCLUDED_
-#define LIBCTB_IOBASE_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        iobase.h
-// Purpose:     io basic class
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "ctb-0.16/fifo.h"
-#include <sys/types.h>
-
-/**
-   \file iobase.h
-*/
-
-namespace ctb {
-
-    enum {
-
-	   CTB_COMMON = 0x0000,
-	   CTB_SERIAL = 0x0100,
-	   CTB_GPIB = 0x0200,
-	   CTB_TIMEOUT_INFINITY = 0xFFFFFFFF
-    };
-
-//    const unsigned int wxTIMEOUT_INFINITY = 0xFFFFFFFF; 
-
-/*!
-  \enum IOBaseIoctls
-
-  Defines the ioctl calls for derivated classes. The following Ioctl 
-  calls are valid for all from wxIOBase derivated classes.
-*/
-    enum IOBaseIoctls {
-	   /*!
-		Reset the connected device. For a serial (RS232) connection,
-		a break is send. For GPIB the IFC (Interface Clear) line is
-		set.
-	   */
-	   CTB_RESET = CTB_COMMON
-    };
-
-/*!
-  \class IOBase
-  An abstract class for different interfaces. The idea behind this:
-  Similar to the virtual file system this class defines a lot of
-  preset member functions, which the derivate classes must be
-  overload.
-  In the main thing these are: open a interface (such as RS232),
-  reading and writing non blocked through the interface and at
-  last, close it.
-  For special interface settings the method ioctl was defined.
-  (control interface). ioctl covers some interface dependent
-  settings like switch on/off the RS232 status lines and must also
-  be defined from each derivated class.
-*/ 
-
-    class IOBase
-    {
-    protected:
-	   /*!
-		\brief internal fifo (first in, first out queue) to put back
-		already readed bytes into the reading stream. After put back a single
-		byte or sequence of characters, you can read them again with the
-		next Read call.
-	   */
-	   Fifo* m_fifo;
-	   enum {
-		  /// fifosize of the putback fifo 
-		  fifoSize = 256
-	   };
-	   /*!
-		Close the interface (internally the file descriptor, which was
-		connected with the interface).
-		\return zero on success, otherwise -1.
-	   */
-	   virtual int CloseDevice() = 0;
-	   /*!
-		Open the interface (internally to request a file descriptor for the
-		given interface). The second parameter is a undefined pointer of a
-		device dependent data struct. It must be undefined, because different
-		devices have different settings. A serial device like the com ports
-		points here to a data struct, includes information like baudrate,
-		parity, count of stopbits and wordlen and so on. Another devices
-		(for example a IEEE) needs a adress and EOS (end of string character)
-		and don't use baudrate or parity.
-		\param devname the name of the device, presents the given interface.
-		Under windows for example COM1, under Linux /dev/cua0. Use wxCOMn to
-		avoid plattform depended code (n is the serial port number, beginning
-		with 1).
-		\param dcs untyped pointer of advanced device parameters,
-		\sa struct dcs_devCUA (data struct for the serail com ports)
-		\return zero on success, otherwise -1
-	   */
-	   virtual int OpenDevice(const char* devname, void* dcs = 0L) = 0;
-    public:
-	   /*!
-		Default constructor
-	   */
-	   IOBase() {
-		  m_fifo = new Fifo(fifoSize);
-	   };
-
-	   /*!
-		Default destructor
-	   */
-	   virtual ~IOBase() {
-		  delete m_fifo;
-	   };
-	   /*!
-		\brief A little helper function to detect the class name
-		\return the name of the class
-	   */
-	   virtual const char* ClassName() {return "ctb::IOBase";};
-	   /*!
-		Closed the interface. Internally it calls the CloseDevice()
-		method, which must be defined in the derivated class.
-		\return zero on success, or -1 if an error occurred.
-	   */
-	   int Close() {return CloseDevice();};
-
-	   /*!
-		In this method we can do all things, which are different
-		between the discrete interfaces. The method is similar to the
-		C ioctl function. We take a command number and a integer
-		pointer as command parameter.
-		An example for this is the reset of a connection between a PC
-		and one ore more other instruments. On serial (RS232) connections
-		mostly a break will be send, GPIB on the other hand defines a
-		special line on the GPIB bus, to reset all connected devices.
-		If you only want to reset your connection, you should use the
-		Ioctl methode for doing this, independent of the real type of
-		the connection.
-		\param cmd a command identifier, (under Posix such as TIOCMBIS
-		for RS232 interfaces), IOBaseIoctls
-		\param args typeless parameter pointer for the command above.
-		\return zero on success, or -1 if an error occurred.
-	   */    
-	   virtual int Ioctl(int cmd,void* args) {return -1;};
-
-	   /*!
-		Returns the current state of the device.
-		\return 1 if device is valid and open, otherwise 0
-	   */
-	   virtual int IsOpen() = 0;
-
-	   /*!
-		\param devname name of the interface, we want to open
-		\param dcs a untyped pointer to a device control struct. If
-		he is NULL, the default device parameter will be used.
-		\return the new file descriptor, or -1 if an error occurred
-
-		The pointer dcs will be used for special device dependent
-		settings. Because this is very specific, the struct or
-		destination of the pointer will be defined by every device
-		itself. (For example: a serial device class should refer
-		things like parity, word length and count of stop bits,
-		a IEEE class adress and EOS character).
-	   */
-	   int Open(const char* devname,void* dcs=0L) {
-		  return OpenDevice(devname,dcs);
-	   };
-
-	   /*!
-		\brief In some circumstances you want to put back a already
-		readed byte (for instance, you have overreaded it and like to
-		parse the recieving bytes again).
-		The internal fifo stores fifoSize characters until you
-		have to read again.
-		\param ch the character to put back in the input stream
-		\return 1, if successful, otherwise 0
-	   */
-	   int PutBack(char ch) {
-		  return m_fifo->put(ch);
-	   };
-
-	   /*!
-		Read attempt to read len bytes from the interface into the buffer
-		starting with buf. Read never blocks. If there are no bytes for 
-		reading, Read returns zero otherwise the count of bytes been readed.
-		\param buf starting adress of the buffer
-		\param len count of bytes, we want to read
-		\return -1 on fails, otherwise the count of readed bytes
-	   */
-	   virtual int Read(char* buf,size_t len) = 0;
-
-	   /*!
-		\brief
-		ReadUntilEos read bytes from the interface until the EOS string
-		was received or a timeout occurs.
-		ReadUntilEos returns the count of bytes been readed. The received
-		bytes are stored on the heap point by the readbuf pointer and
-		must delete by the caller.
-		\param readbuf points to the start of the readed bytes. You must
-		delete them, also if you received no byte.
-		\param readedBytes A pointer to the variable that receives the number
-		of bytes read.
-		\param eosString is the null terminated end of string sequence.
-		Default is the linefeed character.
-		\param timeout_in_ms the function returns after this time, also
-		if no eos occured (default is 1s).
-		\param quota defines a character between those an EOS doesn't
-		terminate the string
-		\return 1 on sucess (the operation ends successfull without a timeout),
-		0 if a timeout occurred and -1 otherwise 
-	   */
-	   virtual int ReadUntilEOS(char*& readbuf,
-						   size_t* readedBytes,
-						   char* eosString = "\n",
-						   long timeout_in_ms = 1000L,
-						   char quota = 0);
-
-	   /*!
-		\brief
-		readv() attempts to read up to len bytes from the interface
-		into the buffer starting at buf.
-		readv() is blocked till len bytes are readed or the given 
-		timeout in milliseconds was reached.
-		\param buf starting address of the buffer
-		\param len count bytes, we want to read
-		\param timeout_in_ms in milliseconds. If you don't want any timeout,
-		you give the wxTIMEOUT_INFINITY here. 
-		But think of it: In this case, this function never returns
-		if there a not enough bytes to read.
-		\return the number of data bytes successfully  read
-	   */
-	   int Readv(char* buf,size_t len,unsigned int timeout_in_ms);
-
-	   /*!
-		\brief
-		readv() attempts to read up to len bytes from the interface
-		into the buffer starting at buf.
-		readv() is blocked till len bytes are readed or the timeout_flag
-		points on a int greater then zero.
-		\param buf starting adress of the buffer
-		\param len count bytes, we want to read
-		\param timeout_flag a pointer to an integer. If you don't want
-		any timeout, you given a null pointer here.
-		But think of it: In this case, this function comes never
-		back, if there a not enough bytes to read.
-		\param nice if true go to sleep for one ms (reduce CPU last),
-		if there is no byte available (default is false)
-	   */
-	   int Readv(char* buf,size_t len,int* timeout_flag,bool nice=false);
-    
-	   /*!
-		Write writes up to len bytes from the buffer starting with buf
-		into the interface.
-		\param buf start adress of the buffer
-		\param len count of bytes, we want to write
-		\return on success, the number of bytes written are returned 
-		(zero indicates nothing was written).  On error, -1 is returned.
-	   */
-	   virtual int Write(char* buf,size_t len) = 0;
-
-	   /*!
-		Writev() writes up to len bytes to the interface from the buffer,
-		starting at buf.
-		Also Writev() blocks till all bytes are written or the given 
-		timeout in milliseconds was reached.
-		\param buf starting address of the buffer
-		\param len count bytes, we want to write
-		\param timeout_in_ms timeout in milliseconds. If you give 
-		wxTIMEOUT_INFINITY here, the function blocks, till all data was
-		written.
-		\return the number of data bytes successfully written.
-	   */
-	   int Writev(char* buf,size_t len,unsigned int timeout_in_ms);
-
-	   /*!
-		Writev() writes up to len bytes to the interface from the buffer,
-		starting at buf.
-		Also Writev() blocks till all bytes are written or the timeout_flag
-		points to an integer greater then zero.
-		\param buf starting adress of the buffer
-		\param len count bytes, we want to write
-		\param timeout_flag a pointer to an integer. You also can give a null
-		pointer here. This blocks, til all data is writen.
-		\param nice if true go to sleep for one ms (reduce CPU last),
-		if there is no byte available (default is false)
-	   */
-	   int Writev(char* buf,size_t len,int* timeout_flag,bool nice = false);
-
-    };
-
-} // namespace ctb
-
-#endif
-
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/kbhit.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/kbhit.h
deleted file mode 100644
index 2a0545439c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/kbhit.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef LIBCTB_KBHIT_H_INCLUDED_
-#define LIBCTB_KBHIT_H_INCLUDED_
-
-namespace ctb {
-
-    char GetKey();
-
-} // namespace ctb
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/serport.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/serport.h
deleted file mode 100644
index d88528bd25..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/serport.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef LIBCTB_LINUX_SERPORT_H_INCLUDED_
-#define LIBCTB_LINUX_SERPORT_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        linux/serport.h
-// Purpose:
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "ctb-0.16/serportx.h"
-#include <linux/serial.h>
-#include <termios.h>
-
-namespace ctb {
-
-/*!
-  \class SerialPort
-   
-  \brief the linux version
-*/
-    class SerialPort : public SerialPort_x
-    {
-    protected:
-	   /*!
-		\brief under Linux, the serial ports are normal file descriptor
-	   */
-	   int fd;
-	   /*!
-		\brief Linux defines this struct termios for controling asynchronous
-		communication. t covered the active settings, save_t the original 
-		settings.
-	   */
-	   struct termios t, save_t;
-
-	   /*!
-		\brief The Linux serial driver summing all breaks, framings, overruns
-		and parity errors for each port during system runtime. Because we only
-		need the errors during a active connection, we must save the actual
-		error numbers in this separate structurs.
-	   */
-	   struct serial_icounter_struct save_info, last_info;
-
-	   /*!
-		\brief adaptor member function, to convert the plattform independent
-		type wxBaud into a linux conform value.
-		\param baud the baudrate as wxBaud type
-		\return speed_t linux specific data type, defined in termios.h
-	   */
-	   speed_t AdaptBaudrate( int baud );
-    
-	   int CloseDevice();
-	   int OpenDevice(const char* devname, void* dcs);
-
-	   /*!
-		\brief internal member function to set an unusal (non-standard)
-		baudrate. Called by SetBaudrate.
-	    */
-	   int SetBaudrateAny( int baudrate );
-
-	   /*!
-		\brief internal member function to set a standard baudrate.
-		Called by SetBaudrate.
-	    */
-	   int SetBaudrateStandard( int baudrate );
-
-    public:
-	   SerialPort();
-
-	   ~SerialPort();
-
-	   int ChangeLineState( SerialLineState flags );
-
-	   int ClrLineState( SerialLineState flags );
-
-	   int GetLineState();
-	   int Ioctl(int cmd,void* args);
-	   int IsOpen();
-	   int Read(char* buf,size_t len);
-	   int SendBreak(int duration);
-
-	   int SetBaudrate( int baudrate );
-
-	   int SetParityBit( bool parity );
-
-	   int SetLineState( SerialLineState flags );
-
-	   int Write(char* buf,size_t len);
-    };
-
-} // namespace ctb
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/timer.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/timer.h
deleted file mode 100644
index 7cc1a51e01..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/linux/timer.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef LIBCTB_LINUX_TIMER_H_INCLUDED_
-#define LIBCTB_LINUX_TIMER_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        linux/timer.h
-// Purpose:
-// Author:      Joachim Buermann
-// Id:          $Id: timer.h,v 1.1.1.1 2004/11/24 10:30:11 jb Exp $
-// Copyright:   (c) 2001 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-/**
-   \file timer.h
-*/
-
-#include <pthread.h>
-
-namespace ctb {
-
-/*!
-  \brief A data struct, using from class timer.
-*/
-    struct timer_control
-    {
-	   /*!
-		under linux, we used usec internally
-	   */
-	   unsigned int usecs;
-	   /*!
-		covers the adress of the exitflag
-	   */
-	   int *exitflag;
-	   /*! 
-		covers the adress of the exit function. NULL, if
-		there was no exit function.
-	   */
-	   void* (*exitfnc)(void*);
-    };
-
-/*!
-  \class Timer
-  \brief A thread based timer class for handling timeouts in
-  an easier way.
-
-  On starting every timer instance will create it's own thread.
-  The thread makes simply nothing, until it's given time is over.
-  After that, he set a variable, refer by it's adress to one
-  and exit.
-
-  There are a lot of situations, which the timer class must handle.
-  The timer instance leaves his valid range (for example, the 
-  timer instance is local inside a function, and the function fished)
-  BEFORE the thread was ending. In this case, the destructor must 
-  terminate the thread in a correct way. (This is very different
-  between the OS. threads are a system resource like file descriptors
-  and must be deallocated after using it).
-
-  The thread should be asynchronously stopped. Means, under all
-  circumstance, it must be possible, to finish the timer and start
-  it again.
-
-  Several timer instance can be used simultanously.
-*/
-    class Timer
-    {
-    protected:
-	   /*!
-		control covers the time interval, the adress
-		of the exitflag, and if not null, a function, which will
-		be called on the end.
-	   */
-	   timer_control control;
-	   /*!
-		stopped will be set by calling the stop() method.
-		Internaly the timer thread steadily tests the state of 
-		this variable. If stopped not zero, the thread will be
-		finished.
-	   */
-	   int stopped;
-	   /*!
-		under linux we use the pthread library. tid covers the
-		identifier for a separate threads.
-	   */
-	   pthread_t tid;
-	   /*!
-		here we store the time interval, whilst the timer run.
-		This is waste!!!
-	   */
-	   unsigned int timer_secs;
-    
-    public:
-	   /*!
-		The constructor creates an timer object with the given
-		properties. The timer at this moment is not started. This
-		will be done with the start() member function.
-		\param msec time interval after that the the variable
-		pointed by exitflag is setting to one.
-		\param exitflag the adress of an integer, which was set
-		to one after the given time interval.
-		\warning The integer variable shouldn't leave it's valid
-		range, before the timer was finished. So never take a
-		local variable.
-		\param exitfnc A function, which was called after msec.
-		If you don't want this, refer a NULL pointer.
-	   */
-	   Timer(unsigned int msec,int* exitflag,void*(*exitfnc)(void*));
-	   /*!
-		the destructor. If his was called (for example by leaving the
-		valid range of the timer object), the timer thread automaticaly
-		will finished. The exitflag wouldn't be set, also the exitfnc
-		wouldn't be called.
-	   */
-	   ~Timer();
-	   /*!
-		starts the timer. But now a thread will created and started.
-		After this, the timer thread will be running until he was stopped 
-		by calling stop() or reached his given time interval.
-	   */
-	   int start();
-	   /*!
-		stops the timer and canceled the timer thread. After timer::stop() a new
-		start() will started the timer from beginning.
-	   */
-	   int stop();
-    };
-
-/*!
-  \brief sleepms
-  A plattform independent function, to go to sleep for the given
-  time interval.
-  \param ms time interval in milli seconds
-*/
-    void sleepms(unsigned int ms);
-
-} // namespace ctb
-
-#endif
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/portscan.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/portscan.h
deleted file mode 100644
index 92c4ba11d6..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/portscan.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef LIBCTB_PORTSCAN_H_INCLUDED_
-#define LIBCTB_PORTSCAN_H_INCLUDED_
-
-#include <string>
-#include <vector>
-
-/**
-   \file portscan.h
-*/
-
-namespace ctb {
-
-    /*!
-	 \brief returns all available COM ports as an array of strings.
-	 \param result stores the available COM ports
-	 \param checkInUse return only ports which are available AND 
-	 unused (default)
-	 \return true if successful, false otherwise
-    */
-    bool GetAvailablePorts( std::vector<std::string>& result,
-					   bool checkInUse = true );
-
-} // namespace ctb
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/serport.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/serport.h
deleted file mode 100644
index 9488753d4b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/serport.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef LIBCTB_SERPORT_H_INCLUDED_
-#define LIBCTB_SERPORT_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        serport.h
-// Purpose:     simple wrapper file
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined (WIN32)
-# include "ctb-0.16/win32/serport.h"
-#else
-# include "ctb-0.16/linux/serport.h"
-#endif
-
-#endif
-// __SERPORT_BASE_H
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/serportx.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/serportx.h
deleted file mode 100644
index 4d29bb4ccc..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/serportx.h
+++ /dev/null
@@ -1,451 +0,0 @@
-#ifndef LIBCTB_SERPORTX_H_INCLUDED_
-#define LIBCTB_SERPORTX_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        serportx.h
-// Purpose:
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <string.h>
-#include "ctb-0.16/iobase.h"
-
-#if defined(_MSC_VER) && _MSC_VER < 1900
-# define snprintf _snprintf
-#endif
-
-/**
-   \file serportx.h
-*/
-
-/*!
-  \def SERIALPORT_NAME_LEN
-  defines the maximum length of the os depending serial port names
-*/
-#define SERIALPORT_NAME_LEN 32
-
-namespace ctb {
-
-    /*! specifices the first serial port */
-    extern const char* COM1;
-    /*! specifies the second serial port */
-    extern const char* COM2;
-    /*! specifies the third serial port */
-    extern const char* COM3;
-    /*! specifies the fourth serial port */
-    extern const char* COM4;
-    /*! specifies the fifth serial port */
-    extern const char* COM5;
-    /*! specifies the sixth serial port */
-    extern const char* COM6;
-    /*! specifies the seventh serial port */
-    extern const char* COM7;
-    /*! specifies the eighth serial port */
-    extern const char* COM8;
-    /*! specifies the ninth serial port */
-    extern const char* COM9;
-    /*! specifies the tenth serial port */
-    extern const char* COM10;
-    /*! specifies the eleventh serial port */
-    extern const char* COM11;
-    /*! specifies the twelfth serial port */
-    extern const char* COM12;
-    /*! specifies the thriteenth serial port */
-    extern const char* COM13;
-    /*! specifies the fourteenth serial port */
-    extern const char* COM14;
-    /*! specifies the fiveteenth serial port */
-    extern const char* COM15;
-    /*! specifies the sixteenth serial port */
-    extern const char* COM16;
-    /*! specifies the seventeenth serial port */
-    extern const char* COM17;
-    /*! specifies the eighteenth serial port */
-    extern const char* COM18;
-    /*! specifies the nineteenth serial port */
-    extern const char* COM19;
-    /*! specifies the twentieth serial port */
-    extern const char* COM20;
-
-    /*!
-	 \enum Parity
-
-	 \brief Defines the different modes of parity checking. Under
-	 Linux, the struct termios will be set to provide the wanted
-	 behaviour.
-    */
-    enum Parity
-    {
-	   /*! no parity check */
-	   ParityNone,
-	   /*! odd parity check */
-	   ParityOdd,
-	   /*! even parity check */
-	   ParityEven,
-	   /*! mark (not implemented yet) */
-	   ParityMark,
-	   /*! space (not implemented yet) */
-	   ParitySpace
-    };
-
-    /*!
-	 \enum SerialLineState
-
-	 Defines the different modem control lines. The value for
-	 each item are defined in /usr/include/bits/ioctl-types.h.
-	 This is the linux definition. The window version translate
-	 each item in it's own value.
-	 modem lines defined in ioctl-types.h
-	 \code
-	 #define TIOCM_LE	0x001
-	 #define TIOCM_DTR	0x002
-	 #define TIOCM_RTS	0x004
-	 #define TIOCM_ST	0x008
-	 #define TIOCM_SR	0x010
-	 #define TIOCM_CTS	0x020
-	 #define TIOCM_CAR	0x040
-	 #define TIOCM_RNG	0x080
-	 #define TIOCM_DSR	0x100
-	 #define TIOCM_CD	TIOCM_CAR
-	 #define TIOCM_RI	TIOCM_RNG
-	 \endcode
-    */
-    enum SerialLineState
-    {
-	   /*! Data Carrier Detect (read only) */
-	   LinestateDcd = 0x040,
-	   /*! Clear To Send (read only) */
-	   LinestateCts = 0x020,
-	   /*! Data Set Ready (read only) */
-	   LinestateDsr = 0x100,
-	   /*! Data Terminal Ready (write only) */
-	   LinestateDtr = 0x002,
-	   /*! Ring Detect (read only) */
-	   LinestateRing = 0x080,
-	   /*! Request To Send (write only) */
-	   LinestateRts = 0x004,
-	   /*! no active line state, use this for clear */
-	   LinestateNull = 0x000
-    };
-
-    /*!
-	 \struct SerialPort_DCS
-
-	 The device control struct for the serial communication class.
-	 This struct should be used, if you refer advanced parameter.
-    */
-    struct SerialPort_DCS
-    {
-	   /*! the baudrate */
-	   int baud;
-	   /*! the parity */
-	   Parity parity;
-	   /*! the wordlen */
-	   unsigned char wordlen;
-	   /*! count of stopbits */
-	   unsigned char stopbits;
-	   /*! rtscts flow control */
-	   bool rtscts;
-	   /*! XON/XOFF flow control */
-	   bool xonxoff;
-	   /*! buffer for internal use */
-	   char buf[16];
-	   SerialPort_DCS() {
-		  baud = 38400;
-		  parity = ParityNone;
-		  wordlen = 8;
-		  stopbits = 1;
-		  rtscts = false;
-		  xonxoff = false;
-	   };
-	   // to avoid memory leak warnings generated by swig 
-	   ~SerialPort_DCS() {};
-	   /*!
-		\brief returns the internal settings of the DCS as a human
-		readable string like '8N1 115200'.
-		\return the internal settings as null terminated string
-	   */
-	   char* GetSettings() {
-		  const char ac[5] = {'N','O','E','M','S'};
-		  memset(buf,0,sizeof(buf));
-		  snprintf(buf,sizeof(buf)-1,"%i%c%i %i",
-				 wordlen,
-				 ac[parity],
-				 stopbits,
-				 baud);
-		  return buf;
-	   };
-    }; 
-
-/*!
-  \struct SerialPort_EINFO
-
-  The internal communication error struct. It contains the number
-  of each error (break, framing, overrun and parity) since opening
-  the serial port. Each error number will be cleared if the open
-  methode was called.
-*/
-    struct SerialPort_EINFO
-    {
-	   /*! number of breaks */
-	   int brk;
-	   /*! number of framing errors */
-	   int frame;
-	   /*! number of overrun errors */
-	   int overrun;
-	   /*! number of parity errors */
-	   int parity;
-	   SerialPort_EINFO() {
-		  brk = frame = overrun = parity = 0;
-	   };
-	   ~SerialPort_EINFO() {};
-    };
-
-    /*!
-	 \enum SerialPortIoctls
-
-	 The following Ioctl calls are only valid for the SerialPort
-	 class.
-    */
-    enum SerialPortIoctls {
-	   /*!
-		Get all numbers of occured communication errors (breaks
-		framing, overrun and parity), so the args parameter of
-		the Ioctl call must pointed to a SerialPort_EINFO
-		struct.
-	   */
-	   CTB_SER_GETEINFO = CTB_SERIAL,
-	   /*!
-		Get integer 1, if a break occured since the last call
-		so the args parameter of the Ioctl methode must pointed
-		to an integer value. If there was no break, the result
-		is integer 0.
-	   */
-	   CTB_SER_GETBRK,
-	   /*!
-		Get integer 1, if a framing occured since the last call
-		so the args parameter of the Ioctl methode must pointed
-		to an integer value. If there was no break, the result
-		is integer 0.
-	   */
-	   CTB_SER_GETFRM,
-	   /*!
-		Get integer 1, if a overrun occured since the last call
-		so the args parameter of the Ioctl methode must pointed
-		to an integer value. If there was no break, the result
-		is integer 0.
-	   */
-	   CTB_SER_GETOVR,
-	   /*!
-		Get integer 1, if a parity occured since the last call
-		so the args parameter of the Ioctl methode must pointed
-		to an integer value. If there was no break, the result
-		is integer 0.
-	   */
-	   CTB_SER_GETPAR,
-	   /*!
-		Get the number of bytes received by the serial port driver
-		but not yet read by a Read or Readv Operation.
-	   */
-	   CTB_SER_GETINQUE,
-	   /*!
-		Set the parity bit on or off to use it as a ninth bit.
-	   */
-	   CTB_SER_SETPAR
-    };
-
-/*!
-  \class SerialPort_x
-  SerialPort_x is the basic class for serial communication via
-  the serial comports. It is also an abstract class and defines
-  all necessary methods, which the derivated plattform depended
-  classes must be invoke.
-*/
-    class SerialPort_x : public IOBase
-    {
-    protected:
-	   /*!
-		\brief contains the internal settings of the serial port like
-		baudrate, protocol, wordlen and so on.
-	   */
-	   SerialPort_DCS m_dcs;
-	   /*!
-		\brief contains the internal (os specific) name of the serial
-		device.
-	   */
-	   char m_devname[SERIALPORT_NAME_LEN];
-    public:
-
-	   /*!
-		\enum FlowControl
-		\brief Specifies the flow control.
-
-		
-	   */
-	   enum FlowControl
-	   {
-		  NoFlowControl, /*!< No flow control at all */
-
-		  RtsCtsFlowControl, /*!< Enable RTS/CTS hardware flow control */
-
-		  XonXoffFlowControl /*!< Enable XON/XOFF protocol */
-	   };
-
-	   SerialPort_x() {m_devname[0] = '\0';};
-	   virtual ~SerialPort_x() {};
-	   /*!
-		\brief returns the name of the class instance. You find this useful,
-		if you handle different devices like a serial port or a gpib device
-		via a IOBase pointer.
-		\return name of the class.
-	   */
-	   const char* ClassName() {return "ctb::SerialPort";};
-    
-	   /*!
-		\brief change the linestates according to which bits
-		are set/unset in flags.
-		\param flags valid line flags are SERIAL_LINESTATE_DSR and/or
-		SERIAL_LINESTATE_RTS
-		\return zero on success, -1 if an error occurs
-	   */
-	   virtual int ChangeLineState( SerialLineState flags ) = 0;
-
-	   /*! 
-		\brief turn off status lines depending upon which bits (DSR and/or RTS)
-		are set in flags.
-		\param flags valid line flags are SERIAL_LINESTATE_DSR and/or
-		SERIAL_LINESTATE_RTS
-		\return zero on success, -1 if an error occurs
-	   */
-	   virtual int ClrLineState( SerialLineState flags ) = 0;
-
-	   /*!
-		\brief Read the line states of DCD, CTS, DSR and RING
-		\return returns the appropriate bits on sucess, otherwise -1
-	   */
-	   virtual int GetLineState() = 0;
-
-	   /*!
-		\brief request the current settings of the connected serial port
-		as a null terminated string.
-		\return the settings as a string like '8N1 115200'
-	   */
-	   virtual char* GetSettingsAsString() {
-		  return m_dcs.GetSettings();
-	   };
-
-	   /*!
-		\brief Many operating characteristics are only possible for
-		special devices. To avoid the need of a lot of different functions
-		and to give the user a uniform interface, all this special
-		operating instructions will covered by one Ioctl methode (like
-		the linux ioctl call).
-		The Ioctl command (cmd) has encoded in it whether the argument 
-		is an in parameter or out parameter, and the size of the
-		argument args in bytes. Macros and defines used in specifying an
-		ioctl request are located in iobase.h and the header file for
-		the derivated device (for example in serportx.h).
-		\param cmd one of SerialPortIoctls specify the ioctl request.
-		\param args is a typeless pointer to a memory location, where
-		Ioctl reads the request arguments or write the results.
-		Please note, that an invalid memory location or size involving
-		a buffer overflow or segmention fault!
-	   */
-	   virtual int Ioctl(int cmd,void* args) {return -1;};
-
-	   /*!
-		\brief Opens a serial port in a user likely way. Insteed of
-		using the Device Control Struct just input your parameter in a
-		more intuitive manner.
-		\param portname the name of the serial port
-		\param baudrate any baudrate, also an unusual one, if your
-		serial device support them
-		\param protocol a string with the number of databits (5...8),
-		the parity setting (N=None,O=Odd,E=Even,M=Mark,S=Space), also
-		in lower case, and the count of stopbits (1...2)
-		\param flowControl one of NoFlowControl, RtsCtsFlowControl or
-		XonXoffFlowControl.
-		\return the new file descriptor, or -1 if an error occurred
-	    */
-	   int Open( const char* portname, int baudrate,
-			   const char* protocol = "8N1",
-			   FlowControl flowControl = NoFlowControl );
-
-	   /*!
-		\brief Opens the serial port with the given number.
-		\note The port numbering starts with 1 (COM1 for windows and
-		/dev/ttyS0 for Linux. Please note, that USB to RS232 converter
-		in Linux are named as /dev/ttyUSBx and from there have to
-		opened with their device name!
-		\param number of the serial port count from 1
-		\param baudrate any baudrate, also an unusual one, if your
-		serial device support them
-		\param protocol a string with the number of databits (5...8),
-		the parity setting (N=None,O=Odd,E=Even,M=Mark,S=Space), also
-		in lower case, and the count of stopbits (1...2)
-		\param flowControl one of NoFlowControl, RtsCtsFlowControl or
-		XonXoffFlowControl.
-		\return the new file descriptor, or -1 if an error occurred
-	   */
-	   int Open( const int portnumber, int baudrate,
-			   const char* protocol = "8N1",
-			   FlowControl flowControl = NoFlowControl );
-
-	   // Open overrides and hides the IOBase::Open( const char*
-	   // devname, void* dcs ) of the base class! So bring it into scope 
-	   // again!
-	   using IOBase::Open;
-
-	   /*!
-		\brief Sendbreak transmits a continuous stream of zero-valued
-		bits for a specific duration.
-		\param duration If duration is zero, it transmits 
-		zero-valued bits for at least 0.25 seconds, and  not more that 
-		0.5 seconds. If duration is not zero, it sends zero-valued bits
-		for  duration*N  seconds, where N is at least 0.25, and not more
-		than 0.5.
-		\return zero on success, -1 if an error occurs.
-	   */
-	   virtual int SendBreak(int duration) = 0;
-
-	   /*!
-		\brief Set the baudrate (also non-standard)
-		Please note: Non-standard baudrates like 70000 are not supported
-		by each UART and depends on the RS232 chipset you apply.
-		\param baudrate the new baudrate
-		\return zero on success, -1 if an error occurs
-	   */
-	   virtual int SetBaudrate( int baudrate ) = 0;
-
-	   /*! 
-		\brief turn on status lines depending upon which bits (DSR and/or RTS)
-		are set in flags.
-		\param flags valid line flags are SERIAL_LINESTATE_DSR and/or
-		SERIAL_LINESTATE_RTS
-		\return zero on success, -1 if an error occurs
-	   */
-	   virtual int SetLineState( SerialLineState flags ) = 0;
-
-	   /*!
-		\brief Set the parity bit to a firm state, for instance to use
-		the parity bit as the ninth bit in a 9 bit dataword
-		communication.
-		\return zero on succes, a negative value if an error occurs
-	    */
-	   virtual int SetParityBit( bool parity ) = 0;
-
-	   /*!
-		\brief check the given baudrate against a list of standard rates.
-		\ return true, if the baudrate is a standard value, false
-		otherwise
-	    */
-	   static bool IsStandardRate( int rate );
-
-    };
-
-} // namespace ctb
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/timer.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/timer.h
deleted file mode 100644
index b1313ebfef..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/timer.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef LIBCTB_TIMER_H_INCLUDED_
-#define LIBCTB_TIMER_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        timer.h
-// Purpose:     simple wrapper file
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined (WIN32)
-# include "win32/timer.h"
-#else
-# include "linux/timer.h"
-#endif
-
-#endif
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/getopt.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/getopt.h
deleted file mode 100644
index d2a909fd73..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/getopt.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef LIBCTB_WIN32_GETOPT_H_INCLUDED_
-#define LIBCTB_WIN32_GETOPT_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        win32/getopt.h
-// Purpose:
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-extern char* optarg;
-extern int optind;
-
-int getopt(int argc, char* argv[], char* optstring);
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/gpib-32.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/gpib-32.h
deleted file mode 100644
index 307c6ce001..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/gpib-32.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- *
- *
- *                     Win32 include file
- *          for accessing the 32-bit GPIB DLL (gpib-32.dll)
- *
- *
- *         Contains user variables (ibsta, iberr, ibcnt, ibcntl),
- *         function prototypes and useful defined constants for
- *         calling NI-488 and NI-488.2 routines from a Microsoft
- *         C/C++ Win32 application.
- *
- *
- *            Copyright 1998 National Instruments Corporation
- *
- */
-
-#ifndef DECL_32_H       // ensure we are only included once
-#define DECL_32_H
-
-#include "windows.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***************************************************************************/
-/*    HANDY CONSTANTS FOR USE BY APPLICATION PROGRAMS ...                  */
-/***************************************************************************/
-#define UNL  0x3f  /* GPIB unlisten command                */
-#define UNT  0x5f  /* GPIB untalk command                  */
-#define GTL  0x01  /* GPIB go to local                     */
-#define SDC  0x04  /* GPIB selected device clear           */
-#define PPC  0x05  /* GPIB parallel poll configure         */
-#define GET  0x08  /* GPIB group execute trigger           */
-#define TCT  0x09  /* GPIB take control                    */
-#define LLO  0x11  /* GPIB local lock out                  */
-#define DCL  0x14  /* GPIB device clear                    */
-#define PPU  0.16  /* GPIB parallel poll unconfigure       */
-#define SPE  0x18  /* GPIB serial poll enable              */
-#define SPD  0x19  /* GPIB serial poll disable             */
-#define PPE  0x60  /* GPIB parallel poll enable            */
-#define PPD  0x70  /* GPIB parallel poll disable           */
-
-/* GPIB status bit vector :                                */
-/*       global variable ibsta and wait mask               */
-
-#define ERR     (1<<15) /* Error detected                  */
-#define TIMO    (1<<14) /* Timeout                         */
-#define END     (1<<13) /* EOI or EOS detected             */
-#define SRQI    (1<<12) /* SRQ detected by CIC             */
-#define RQS     (1<<11) /* Device needs service            */
-#define CMPL    (1<<8)  /* I/O completed                   */
-#define LOK     (1<<7)  /* Local lockout state             */
-#define REM     (1<<6)  /* Remote state                    */
-#define CIC     (1<<5)  /* Controller-in-Charge            */
-#define ATN     (1<<4)  /* Attention asserted              */
-#define TACS    (1<<3)  /* Talker active                   */
-#define LACS    (1<<2)  /* Listener active                 */
-#define DTAS    (1<<1)  /* Device trigger state            */
-#define DCAS    (1<<0)  /* Device clear state              */
-
-/* Error messages returned in global variable iberr        */
-
-#define EDVR  0  /* System error                           */
-#define ECIC  1  /* Function requires GPIB board to be CIC */
-#define ENOL  2  /* Write function detected no Listeners   */
-#define EADR  3  /* Interface board not addressed correctly*/
-#define EARG  4  /* Invalid argument to function call      */
-#define ESAC  5  /* Function requires GPIB board to be SAC */
-#define EABO  6  /* I/O operation aborted                  */
-#define ENEB  7  /* Non-existent interface board           */
-#define EDMA  8  /* Error performing DMA                   */
-#define EOIP 10  /* I/O operation started before previous  */
-                 /* operation completed                    */
-#define ECAP 11  /* No capability for intended operation   */
-#define EFSO 12  /* File system operation error            */
-#define EBUS 14  /* Command error during device call       */
-#define ESTB 15  /* Serial poll status byte lost           */
-#define ESRQ 16  /* SRQ remains asserted                   */
-#define ETAB 20  /* The return buffer is full.             */
-#define ELCK 21  /* Address or board is locked.            */
-
-/* EOS mode bits                                           */
-
-#define BIN  (1<<12) /* Eight bit compare                  */
-#define XEOS (1<<11) /* Send END with EOS byte             */
-#define REOS (1<<10) /* Terminate read on EOS              */
-
-/* Timeout values and meanings                             */
-
-#define TNONE    0   /* Infinite timeout (disabled)        */
-#define T10us    1   /* Timeout of 10 us (ideal)           */
-#define T30us    2   /* Timeout of 30 us (ideal)           */
-#define T100us   3   /* Timeout of 100 us (ideal)          */
-#define T300us   4   /* Timeout of 300 us (ideal)          */
-#define T1ms     5   /* Timeout of 1 ms (ideal)            */
-#define T3ms     6   /* Timeout of 3 ms (ideal)            */
-#define T10ms    7   /* Timeout of 10 ms (ideal)           */
-#define T30ms    8   /* Timeout of 30 ms (ideal)           */
-#define T100ms   9   /* Timeout of 100 ms (ideal)          */
-#define T300ms  10   /* Timeout of 300 ms (ideal)          */
-#define T1s     11   /* Timeout of 1 s (ideal)             */
-#define T3s     12   /* Timeout of 3 s (ideal)             */
-#define T10s    13   /* Timeout of 10 s (ideal)            */
-#define T30s    14   /* Timeout of 30 s (ideal)            */
-#define T100s   15   /* Timeout of 100 s (ideal)           */
-#define T300s   16   /* Timeout of 300 s (ideal)           */
-#define T1000s  17   /* Timeout of 1000 s (ideal)          */
-
-
-/*  IBLN Constants                                         */
-#define NO_SAD   0
-#define ALL_SAD -1
-
-
-/*  The following constants are used for the second parameter of the
- *  ibconfig function.  They are the "option" selection codes.
- */
-#define  IbcPAD        0x0001      /* Primary Address                      */
-#define  IbcSAD        0x0002      /* Secondary Address                    */
-#define  IbcTMO        0x0003      /* Timeout Value                        */
-#define  IbcEOT        0x0004      /* Send EOI with last data byte?        */
-#define  IbcPPC        0x0005      /* Parallel Poll Configure              */
-#define  IbcREADDR     0x0006      /* Repeat Addressing                    */
-#define  IbcAUTOPOLL   0x0007      /* Disable Auto Serial Polling          */
-#define  IbcCICPROT    0x0008      /* Use the CIC Protocol?                */
-#define  IbcIRQ        0x0009      /* Use PIO for I/O                      */
-#define  IbcSC         0x000A      /* Board is System Controller?          */
-#define  IbcSRE        0x000B      /* Assert SRE on device calls?          */
-#define  IbcEOSrd      0x000C      /* Terminate reads on EOS               */
-#define  IbcEOSwrt     0x000D      /* Send EOI with EOS character          */
-#define  IbcEOScmp     0x000E      /* Use 7 or 8-bit EOS compare           */
-#define  IbcEOSchar    0x000F      /* The EOS character.                   */
-#define  IbcPP2        0x0010      /* Use Parallel Poll Mode 2.            */
-#define  IbcTIMING     0x0011      /* NORMAL, HIGH, or VERY_HIGH timing.   */
-#define  IbcDMA        0x0012      /* Use DMA for I/O                      */
-#define  IbcReadAdjust 0x0013      /* Swap bytes during an ibrd.           */
-#define  IbcWriteAdjust 0x014      /* Swap bytes during an ibwrt.          */
-#define  IbcSendLLO    0x0017      /* Enable/disable the sending of LLO.      */
-#define  IbcSPollTime  0x0018      /* Set the timeout value for serial polls. */
-#define  IbcPPollTime  0x0019      /* Set the parallel poll length period.    */
-#define  IbcEndBitIsNormal 0x001A  /* Remove EOS from END bit of IBSTA.       */
-#define  IbcUnAddr         0x001B  /* Enable/disable device unaddressing.     */
-#define  IbcSignalNumber   0x001C  /* Set UNIX signal number - unsupported */
-#define  IbcBlockIfLocked  0x001D   /* Enable/disable blocking for locked boards/devices         */
-#define  IbcHSCableLength  0x001F  /* Length of cable specified for high speed timing.*/
-#define  IbcIst        0x0020      /* Set the IST bit.                     */
-#define  IbcRsv        0x0021      /* Set the RSV byte.                    */
-
-/*
- *    Constants that can be used (in addition to the ibconfig constants)
- *    when calling the ibask() function.
- */
-
-#define  IbaPAD            IbcPAD
-#define  IbaSAD            IbcSAD
-#define  IbaTMO            IbcTMO
-#define  IbaEOT            IbcEOT
-#define  IbaPPC            IbcPPC
-#define  IbaREADDR         IbcREADDR
-#define  IbaAUTOPOLL       IbcAUTOPOLL
-#define  IbaCICPROT        IbcCICPROT
-#define  IbaIRQ            IbcIRQ
-#define  IbaSC             IbcSC
-#define  IbaSRE            IbcSRE
-#define  IbaEOSrd          IbcEOSrd
-#define  IbaEOSwrt         IbcEOSwrt
-#define  IbaEOScmp         IbcEOScmp
-#define  IbaEOSchar        IbcEOSchar
-#define  IbaPP2            IbcPP2
-#define  IbaTIMING         IbcTIMING
-#define  IbaDMA            IbcDMA
-#define  IbaReadAdjust     IbcReadAdjust
-#define  IbaWriteAdjust    IbcWriteAdjust
-#define  IbaSendLLO        IbcSendLLO
-#define  IbaSPollTime      IbcSPollTime
-#define  IbaPPollTime      IbcPPollTime
-#define  IbaEndBitIsNormal IbcEndBitIsNormal
-#define  IbaUnAddr         IbcUnAddr
-#define  IbaSignalNumber   IbcSignalNumber
-#define  IbaBlockIfLocked  IbcBlockIfLocked
-#define  IbaHSCableLength  IbcHSCableLength
-#define  IbaIst            IbcIst
-#define  IbaRsv            IbcRsv
-
-#define  IbaBNA            0x0200   /* A device's access board.                  */
-
-
-/* Values used by the Send 488.2 command. */
-#define  NULLend 0x00  /* Do nothing at the end of a transfer.*/
-#define  NLend   0x01  /* Send NL with EOI after a transfer.  */
-#define  DABend  0x02  /* Send EOI with the last DAB.         */
-
-/* Value used by the 488.2 Receive command.
- */
-#define  STOPend     0x0100
-
-
-/* Address type (for 488.2 calls) */
-
-typedef short Addr4882_t;       /* System dependent: must be 16 bits */
-
-/*
- *  This macro can be used to easily create an entry in address list
- *  that is required by many of the 488.2 functions. The primary address goes in the
- *  lower 8-bits and the secondary address goes in the upper 8-bits.
- */
-#define  MakeAddr(pad, sad)   ((Addr4882_t)(((pad)&0xFF) | ((sad)<<8)))
-
-/*
- *  This value is used to terminate an address list.  It should be
- *  assigned to the last entry.
- */
-#ifndef NOADDR
-#define  NOADDR    (Addr4882_t)((unsigned short)0xFFFF)
-#endif
-
-/*
- *  The following two macros are used to "break apart" an address list
- *  entry.  They take an unsigned integer and return either the primary
- *  or secondary address stored in the integer.
- */
-#define  GetPAD(val)    ((val) & 0xFF)
-#define  GetSAD(val)    (((val) >> 8) & 0xFF)
-
-/* iblines constants */
-
-#define  ValidEOI   (short)0x0080
-#define  ValidATN   (short)0x0040
-#define  ValidSRQ   (short)0x0020
-#define  ValidREN   (short)0x0010
-#define  ValidIFC   (short)0x0008
-#define  ValidNRFD  (short)0x0004
-#define  ValidNDAC  (short)0x0002
-#define  ValidDAV   (short)0x0001
-#define  BusEOI     (short)0x8000
-#define  BusATN     (short)0x4000
-#define  BusSRQ     (short)0x2000
-#define  BusREN     (short)0x1000
-#define  BusIFC     (short)0x0800
-#define  BusNRFD    (short)0x0400
-#define  BusNDAC    (short)0x0200
-#define  BusDAV     (short)0x0100
-
-/****
- **** typedef for ibnotify callback ****
- ****/
-typedef int (__stdcall * GpibNotifyCallback_t)(int, int, int, long, PVOID);
-
-#define IBNOTIFY_REARM_FAILED    0xE00A003F
-
-
-/*************************************************************************/
-/*                                                                       */
-/*  iblockx and ibunlockx definitions --- for use with GPIB-ENET only !! */
-/*                                                                       */
-/*************************************************************************/
-#define  TIMMEDIATE                 -1
-#define  TINFINITE                  -2
-#define  MAX_LOCKSHARENAME_LENGTH   64
-
-#if defined(UNICODE)
-   #define iblockx iblockxW
-#else
-   #define iblockx iblockxA
-#endif
-
-extern int __stdcall iblockxA (int ud, int LockWaitTime, PCHAR LockShareName);
-extern int __stdcall iblockxW (int ud, int LockWaitTime, PWCHAR LockShareName);
-extern int __stdcall ibunlockx (int ud);
-
-
-/***************************************************************************/
-/*         IBSTA, IBERR, IBCNT, IBCNTL and FUNCTION PROTOTYPES             */
-/*      ( only included if not accessing the 32-bit DLL directly )         */
-/***************************************************************************/
-#if !defined(GPIB_DIRECT_ACCESS)
-
-/*
- *  Set up access to the user variables (ibsta, iberr, ibcnt, ibcntl).
- *  These are declared and exported by the 32-bit DLL.  Separate copies
- *  exist for each process that accesses the DLL.  They are shared by
- *  multiple threads of a single process.
- */
-
-extern int  ibsta;
-extern int  iberr;
-extern int  ibcnt;
-extern long ibcntl;
-
-
-#if defined(UNICODE)
-   #define ibbna  ibbnaW
-   #define ibfind ibfindW
-   #define ibrdf  ibrdfW
-   #define ibwrtf ibwrtfW
-#else
-   #define ibbna  ibbnaA
-   #define ibfind ibfindA
-   #define ibrdf  ibrdfA
-   #define ibwrtf ibwrtfA
-#endif
-
-/*
- *  Extern 32-bit GPIB DLL functions
- */
-
-/*  NI-488 Function Prototypes  */
-extern int __stdcall ibfindA   (LPCSTR udname);
-extern int __stdcall ibbnaA    (int ud, LPCSTR udname);
-extern int __stdcall ibrdfA    (int ud, LPCSTR filename);
-extern int __stdcall ibwrtfA   (int ud, LPCSTR filename);
-
-extern int __stdcall ibfindW   (LPCWSTR udname);
-extern int __stdcall ibbnaW    (int ud, LPCWSTR udname);
-extern int __stdcall ibrdfW    (int ud, LPCWSTR filename);
-extern int __stdcall ibwrtfW   (int ud, LPCWSTR filename);
-
-extern int __stdcall ibask    (int ud, int option, PINT v);
-extern int __stdcall ibcac    (int ud, int v);
-extern int __stdcall ibclr    (int ud);
-extern int __stdcall ibcmd    (int ud, PVOID buf, long cnt);
-extern int __stdcall ibcmda   (int ud, PVOID buf, long cnt);
-extern int __stdcall ibconfig (int ud, int option, int v);
-extern int __stdcall ibdev    (int boardID, int pad, int sad, int tmo, int eot, int eos);
-extern int __stdcall ibdiag   (int ud, PVOID buf, long cnt);
-extern int __stdcall ibdma    (int ud, int v);
-extern int __stdcall ibeos    (int ud, int v);
-extern int __stdcall ibeot    (int ud, int v);
-extern int __stdcall ibgts    (int ud, int v);
-extern int __stdcall ibist    (int ud, int v);
-extern int __stdcall iblines  (int ud, PSHORT result);
-extern int __stdcall ibln     (int ud, int pad, int sad, PSHORT listen);
-extern int __stdcall ibloc    (int ud);
-extern int __stdcall ibnotify (int ud, int mask, GpibNotifyCallback_t Callback, PVOID RefData);
-extern int __stdcall ibonl    (int ud, int v);
-extern int __stdcall ibpad    (int ud, int v);
-extern int __stdcall ibpct    (int ud);
-extern int __stdcall ibpoke   (int ud, long option, long v);
-extern int __stdcall ibppc    (int ud, int v);
-extern int __stdcall ibrd     (int ud, PVOID buf, long cnt);
-extern int __stdcall ibrda    (int ud, PVOID buf, long cnt);
-extern int __stdcall ibrpp    (int ud, PCHAR ppr);
-extern int __stdcall ibrsc    (int ud, int v);
-extern int __stdcall ibrsp    (int ud, PCHAR spr);
-extern int __stdcall ibrsv    (int ud, int v);
-extern int __stdcall ibsad    (int ud, int v);
-extern int __stdcall ibsic    (int ud);
-extern int __stdcall ibsre    (int ud, int v);
-extern int __stdcall ibstop   (int ud);
-extern int __stdcall ibtmo    (int ud, int v);
-extern int __stdcall ibtrg    (int ud);
-extern int __stdcall ibwait   (int ud, int mask);
-extern int __stdcall ibwrt    (int ud, PVOID buf, long cnt);
-extern int __stdcall ibwrta   (int ud, PVOID buf, long cnt);
-
-// GPIB-ENET only functions to support locking across machines
-extern int __stdcall iblock   (int ud);
-extern int __stdcall ibunlock (int ud);
-
-/**************************************************************************/
-/*  Functions to access Thread-Specific copies of the GPIB global vars */
-
-extern int  __stdcall ThreadIbsta (void);
-extern int  __stdcall ThreadIberr (void);
-extern int  __stdcall ThreadIbcnt (void);
-extern long __stdcall ThreadIbcntl (void);
-
-
-/**************************************************************************/
-/*  NI-488.2 Function Prototypes  */
-
-extern void __stdcall AllSpoll      (int boardID, Addr4882_t * addrlist, PSHORT results);
-extern void __stdcall DevClear      (int boardID, Addr4882_t addr);
-extern void __stdcall DevClearList  (int boardID, Addr4882_t * addrlist);
-extern void __stdcall EnableLocal   (int boardID, Addr4882_t * addrlist);
-extern void __stdcall EnableRemote  (int boardID, Addr4882_t * addrlist);
-extern void __stdcall FindLstn      (int boardID, Addr4882_t * addrlist, Addr4882_t * results, int limit);
-extern void __stdcall FindRQS       (int boardID, Addr4882_t * addrlist, PSHORT dev_stat);
-extern void __stdcall PPoll         (int boardID, PSHORT result);
-extern void __stdcall PPollConfig   (int boardID, Addr4882_t addr, int dataLine, int lineSense);
-extern void __stdcall PPollUnconfig (int boardID, Addr4882_t * addrlist);
-extern void __stdcall PassControl   (int boardID, Addr4882_t addr);
-extern void __stdcall RcvRespMsg    (int boardID, PVOID buffer, long cnt, int Termination);
-extern void __stdcall ReadStatusByte(int boardID, Addr4882_t addr, PSHORT result);
-extern void __stdcall Receive       (int boardID, Addr4882_t addr, PVOID buffer, long cnt, int Termination);
-extern void __stdcall ReceiveSetup  (int boardID, Addr4882_t addr);
-extern void __stdcall ResetSys      (int boardID, Addr4882_t * addrlist);
-extern void __stdcall Send          (int boardID, Addr4882_t addr, PVOID databuf, long datacnt, int eotMode);
-extern void __stdcall SendCmds      (int boardID, PVOID buffer, long cnt);
-extern void __stdcall SendDataBytes (int boardID, PVOID buffer, long cnt, int eot_mode);
-extern void __stdcall SendIFC       (int boardID);
-extern void __stdcall SendLLO       (int boardID);
-extern void __stdcall SendList      (int boardID, Addr4882_t * addrlist, PVOID databuf, long datacnt, int eotMode);
-extern void __stdcall SendSetup     (int boardID, Addr4882_t * addrlist);
-extern void __stdcall SetRWLS       (int boardID, Addr4882_t * addrlist);
-extern void __stdcall TestSRQ       (int boardID, PSHORT result);
-extern void __stdcall TestSys       (int boardID, Addr4882_t * addrlist, PSHORT results);
-extern void __stdcall Trigger       (int boardID, Addr4882_t addr);
-extern void __stdcall TriggerList   (int boardID, Addr4882_t * addrlist);
-extern void __stdcall WaitSRQ       (int boardID, PSHORT result);
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif   // DECL_32_H
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/serport.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/serport.h
deleted file mode 100644
index 503f25cffb..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/serport.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef LIBCTB_WIN32_TIMER_H_INCLUDED_
-#define LIBCTB_WIN32_TIMER_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        win32/serport.h
-// Purpose:
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "../serportx.h"
-#include <windows.h>
-
-namespace ctb {
-
-    /*!
-	 \class SerialPort
-   
-	 \brief the win32 version
-    */
-    class SerialPort : public SerialPort_x
-    {
-    protected:
-	   /*!
-		\brief the win32 api equivalent for the Linux
-		file descriptor
-	   */
-	   HANDLE fd;
-	   /*!
-		\brief a very special struct in the win32 api for controling
-		an asynchronous serial communication through the com ports.
-	   */
-	   OVERLAPPED m_ov;
-
-	   /*!
-		\brief The win32 API only allows to test for an existing
-		break, framing, overrun or parity, not for the occured numbers.
-		So every error event decrement this internal error struct and
-		can request by an Ioctl call.
-	   */
-	   SerialPort_EINFO einfo;
-    
-	   /*!
-		\brief The win32 API doesn't have any function to detect the
-		current state of the output lines RST and DTR (if someone knows
-		some function, please contact me).
-		So we save the state always after changing one or both lines
-		(for example, on Open, SetLineState and ChangeLineState)
-	   */
-	   int m_rtsdtr_state;
-
-	   int CloseDevice();
-	   int OpenDevice(const char* devname, void* dcs);
-    public:
-	   SerialPort();
-	   ~SerialPort();
-
-	   int ChangeLineState( SerialLineState flags );
-	   int ClrLineState( SerialLineState flags );
-	   int GetLineState();
-	   int Ioctl(int cmd,void* args);
-	   int IsOpen();
-	   int Read(char* buf,size_t len);
-	   int SendBreak(int duration);
-	   int SetBaudrate( int baudrate );
-	   int SetLineState( SerialLineState flags );
-	   int SetParityBit( bool parity );
-	   int Write(char* buf,size_t len);
-    };
-
-} // namespace ctb
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/timer.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/timer.h
deleted file mode 100644
index e750baead3..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/timer.h
+++ /dev/null
@@ -1,140 +0,0 @@
-#ifndef LIBCTB_WINDOWS_TIMER_H_INCLUDED_
-#define LIBCTB_WINDOWS_TIMER_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        win32/timer.h
-// Purpose:
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include <windows.h>
-
-namespace ctb {
-
-/*!
-  \brief A data struct, using from class timer.
-*/
-    struct timer_control
-    {
-	   /*!
-		under win32, we used msec internally
-	   */
-	   unsigned int msecs;
-	   /*!
-		covers the adress of the exitflag
-	   */
-	   int *exitflag;
-	   /*!
-		the running thread steadily polls this variable (only under win32).
-		If it's not zero, the thread terminate.
-	   */
-	   MMRESULT stop;
-	   /*! 
-		covers the adress of the exit function. NULL, if
-		there was no exit function.
-	   */
-	   void* (*exitfnc)(void*);
-    };
-
-/*!
-  \class Timer
-  \brief A thread based timer class for handling timeouts in
-  an easier way.
-
-  On starting every timer instance will create it's own thread.
-  The thread makes simply nothing, until it's given time is over.
-  After that, he set a variable, refer by it's adress to one
-  and exit.
-
-  There are a lot of situations, which the timer class must handle.
-  The timer instance leaves his valid range (for example, the 
-  timer instance is local inside a function, and the function fished)
-  BEFORE the thread was ending. In this case, the destructor must 
-  terminate the thread in a correct way. (This is very different
-  between the OS. threads are a system resource like file descriptors
-  and must be deallocated after using it).
-
-  The thread should be asynchronously stopped. Means, under all
-  circumstance, it must be possible, to finish the timer and start
-  it again.
-
-  Several timer instance can be used simultanously.
-*/
-    class Timer
-    {
-    protected:
-	   /*!
-		\brief win32 needs this
-	   */
-	   DWORD id;
-	   /*!
-		\brief in win32 internal handle for the timer thread
-	   */
-	   MMRESULT h;
-	   /*!
-		control covers the time interval, the adress
-		of the exitflag, and if not null, a function, which will
-		be called on the end.
-	   */
-	   timer_control control;
-	   /*!
-		here we store the time interval, whilst the timer run.
-		This is waste!!!
-	   */
-	   unsigned int timer_secs;
-    public:
-	   /*!
-		The constructor creates an timer object with the given
-		properties. The timer at this moment is not started. This
-		will be done with the start() member function.
-		\param msec time interval after that the the variable
-		pointed by exitflag is setting to one.
-		\param exitflag the adress of an integer, which was set
-		to one after the given time interval.
-		\warning The integer variable shouldn't leave it's valid
-		range, before the timer was finished. So never take a
-		local variable.
-		\param exitfnc A function, which was called after msec.
-		If you don't want this, refer a NULL pointer.
-	   */
-	   Timer(unsigned int msec,int* exitflag,void*(*exitfnc)(void*));
-	   /*!
-		the destructor. If his was called (for example by leaving the
-		valid range of the timer object), the timer thread automaticaly
-		will finished. The exitflag wouldn't be set, also the exitfnc
-		wouldn't be called.
-	   */
-	   ~Timer();
-	   /*!
-		starts the timer. But now a thread will created and started.
-		After this, the timer thread will be running until he was stopped 
-		by calling stop() or reached his given time interval.
-	   */
-	   int start();
-	   /*!
-		stops the timer and canceled the timer thread. After timer::stop() a new
-		start() will started the timer from beginning.
-	   */
-	   int stop();
-    };
-
-/*!
-  \fn kill_all_timer()
-  \warning This function don't works under win32 and will be removed next
-  time. So don't use that!
-*/
-    void kill_all_timer();
-
-/*!
-  \fn
-  A plattform independent function, to go to sleep for the given
-  time interval.
-  \param ms time interval in milli seconds
-*/
-    void sleepms(unsigned int ms);
-
-} // namespace ctb
-
-#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/lib/EMPTY b/src/mod/endpoints/mod_gsmopen/libctb-0.16/lib/EMPTY
deleted file mode 100644
index 887ae9333d..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/lib/EMPTY
+++ /dev/null
@@ -1 +0,0 @@
-ciao
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/manual/refman.pdf b/src/mod/endpoints/mod_gsmopen/libctb-0.16/manual/refman.pdf
deleted file mode 100644
index 285e523de3..0000000000
Binary files a/src/mod/endpoints/mod_gsmopen/libctb-0.16/manual/refman.pdf and /dev/null differ
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/module/linux/ctb.py b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/module/linux/ctb.py
deleted file mode 100644
index 6b541ffe39..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/module/linux/ctb.py
+++ /dev/null
@@ -1,455 +0,0 @@
-import wxctb, sys, re
-
-DCD = wxctb.LinestateDcd
-CTS = wxctb.LinestateCts
-DSR = wxctb.LinestateDsr
-DTR = wxctb.LinestateDtr
-RING = wxctb.LinestateRing
-RTS = wxctb.LinestateRts
-NULL = wxctb.LinestateNull
-
-def abstract():
-    import inspect
-    caller = inspect.getouterframes(inspect.currentframe())[1][3]
-    raise NotImplementedError(caller + ' must be implemented in subclass')
-
-class IOBase:
-    def __init__(self):
-        self.device = None
-        # set timeout to 1000ms (the default)
-        self.timeout = 1000
-        
-    def __del__(self):
-        pass
-    
-    def Close(self):
-        if self.device:
-            self.device.Close()
-
-    def GetTimeout(self):
-        """
-        Returns the internal timeout value in milliseconds
-        """
-        return self.timeout
-
-    def Ioctl(self,cmd,arg):
-        if self.device:
-            self.device.Ioctl(cmd,arg)
-            
-    def Open(self):
-        abstract()
-
-    def PutBack(self,char):
-        return self.device.PutBack(char)
-    
-    def Read(self,length):
-        """
-        Try to read the given count of data (length) and returns the
-        successfully readed number of data. The function never blocks.
-        For example:
-        readed = dev.Read(100)
-        """
-        buf = "\x00"*(length+1)
-        rd = self.device.Read(buf,length)
-        return buf[0:rd]
-
-    def ReadBinary(self,eos="\n"):
-        """
-        Special SCPI command. Read the next data coded as a SCPI
-        binary format.
-        A binary data transfer will be startet by '#'. The next byte
-        tells the count of bytes for the binary length header,
-        following by the length bytes. After these the data begins.
-        For example:
-        #500004xxxx
-        The header length covers 5 Byte, the length of the binary
-        data is 4 (x means the binary data bytes)
-        """
-        try:
-            eoslen = len(eos)
-            b=self.Readv(2)
-            if len(b) == 2:
-                hl = int(b[1])
-                b = self.Readv(hl)
-                if len(b) == hl:
-                    dl = int(b)
-                    # don't left over the eos string or character in the
-                    # device input buffer
-                    data = self.Readv(dl+eoslen)
-                    # check, if the binary data block is complete
-                    if data[dl] == '#':
-                        # not complete, another block is following
-                        for c in data[dl:dl+eoslen]:
-                            self.PutBack(c)
-
-                        data = data[:dl] + self.ReadBinary()
-                    return data
-        except:
-            pass
-        return ''
-
-    def ReadUntilEOS(self,eos="\n",quota=0):
-        """
-        ReadUntilEOS(eosString=\"\\n\",timeout=1000)
-        Reads data until the given eos string was received (default is
-        the linefeed character (0x0a) or the internal timeout
-        (default 1000ms) was reached.
-        ReadUntilEOS returns the result as the following tuple:
-        ['received string',state,readedBytes]
-        If a timeout occurred, state is 0, otherwise 1
-        """
-        return self.device.ReadUntilEOS("",0,eos,self.timeout,quota)
-
-    def Readv(self,length):
-        """
-        Try to read the given count of data. Readv blocks until all data
-        was readed successfully or the internal timeout, set with the
-        class member function SetTimeout(timeout), was reached.
-        Returns the readed data.
-        """
-        buf = "\x00"*length
-        rd = self.device.Readv(buf,length,self.timeout)
-        return buf[0:rd]
-
-    def ResetBus(self):
-        """
-        If the underlaying interface needs some special reset operations
-        (for instance the GPIB distinguish between a normal device reset
-        and a special bus reset), you can put some code here)
-        """
-        pass
-
-    def SetTimeout(self,timeout):
-        """
-        Set the internal timeout value in milliseconds for all blocked
-        operations like ReadUntilEOS, Readv and Writev.
-        """
-        self.timeout = timeout
-        
-    def Write(self,string):
-        """
-        Writes the given string to the device and returns immediately.
-        Write returns the number of data bytes successfully written or a
-        negativ number if an error occured. For some circumstances, not
-        the complete string was written.
-        So you have to verify the return value to check this out.
-        """
-        return self.device.Write(string,len(string))
-
-    def Writev(self,string):
-        """
-        Writes the given string to the device. The function blocks until
-        the complete string was written or the internal timeout, set with
-        SetTimeout(timeout), was reached.
-        Writev returns the number of data successfully written or a
-        negativ value, if an errors occurred.
-        """
-        return self.device.Writev(string,len(string),self.timeout)
-
-class SerialPort(IOBase):
-    def __init__(self):
-        IOBase.__init__(self)
-
-    def __del__(self):
-        self.Close()
-        
-    def ChangeLineState(self,lineState):
-        """
-        Change (toggle) the state of each the lines given in the
-        linestate parameter. Possible values are DTR and/or RTS.
-        For example to toggle the RTS line only:
-        dev.ChangeLineState(RTS)
-        """
-        self.device.ChangeLineState(lineState)
-
-    def ClrLineState(self,lineState):
-        """
-        Clear the lines given in the linestate parameter. Possible
-        values are DTR and/or RTS. For example to clear only
-        the RTS line:
-        dev.ClrLineState(RTS)
-        """
-        self.device.ClrLineState(lineState)
-
-    def GetAvailableBytes(self):
-        """
-        Returns the available bytes in the input queue of the serial
-        driver.
-        """
-        n = wxctb.new_intp()
-        wxctb.intp_assign(n, 0)
-        self.device.Ioctl(wxctb.CTB_SER_GETINQUE,n)
-        return wxctb.intp_value(n)
-
-    def GetCommErrors(self):
-        """
-        Get the internal communication errors like breaks, framing,
-        parity or overrun errors.
-        Returns the count of each error as a tuple like this:
-        (b,f,o,p) = dev.GetCommErrors()
-        b: breaks, f: framing errors,  o: overruns, p: parity errors
-        """
-        einfo = wxctb.SerialPort_EINFO()
-        self.device.Ioctl(wxctb.CTB_SER_GETEINFO,einfo)
-        return einfo.brk,einfo.frame,einfo.overrun,einfo.parity
-    
-    def GetLineState(self):
-        """
-        Returns the current linestates of the CTS, DCD, DSR and RING
-        signal line as an integer value with the appropriate bits or
-        -1 on error.
-        For example:
-        lines = dev.GetLineState()
-        if lines & CTS:
-            print \"CTS is on\"
-        """
-        return self.device.GetLineState()
-
-    def Open(self,devname,baudrate,protocol='8N1',handshake='no_handshake'):
-        """
-        Open the device devname with the given baudrate, the protocol
-        like '8N1' (default) and the use of the handshake [no_handshake
-        (default), rtscts or xonxoff]
-        For example:
-        At Linux:
-        dev = SerialPort()
-        dev.Open(\"/dev/ttyS0\",115200)
-        or with a datalen of 7 bits, even parity, 2 stopbits and rts/cts
-        handshake:
-        dev.Open(\"/dev/ttyS0\",115200,'7E2',True)
-        At Windows:
-        dev = SerialPort()
-        dev.Open(\"COM1\",115200)
-        dev.Open(\"COM1\",115200,'7E2',True)
-        Returns the handle on success or a negativ value on failure.
-        """
-        # the following parity values are valid:
-        # N:None, O:Odd, E:Even, M:Mark, S:Space
-        parity = {'N':0,'O':1,'E':2,'M':3,'S':4}
-        # the regular expression ensures a valid value for the datalen
-        # (5...8 bit) and the count of stopbits (1,2)
-        reg=re.compile(r"(?P<w>[8765])"r"(?P<p>[NOEMS])"r"(?P<s>[12])")
-        self.device = wxctb.SerialPort()
-        dcs = wxctb.SerialPort_DCS()
-        dcs.baud = baudrate
-        res = reg.search(protocol)
-        # handle the given protocol
-        if res:
-            dcs.wordlen = int(res.group('w'))
-            dcs.stopbits = int(res.group('s'))
-            dcs.parity = parity[res.group('p')]
-        # valid handshake are no one, rts/cts or xon/xoff
-        if handshake == 'rtscts':
-            dcs.rtscts = True
-        elif handshake == 'xonxoff':
-            dcs.xonxoff = True
-        
-        return self.device.Open(devname,dcs)
-    
-    def Reset(self):
-        """
-        Send a break for 0.25s.
-        """
-        self.device.SendBreak(0)
-
-    def SetBaudrate(self,baudrate):
-        """
-        Set the baudrate for the device.
-        """
-        self.device.SetBaudrate(baudrate)
-
-    def SetLineState(self,lineState):
-        """
-        Set the lines given in the linestate parameter. Possible
-        values are DTR and/or RTS. For example to set both:
-        dev.SetLineState( DTR | RTS)
-        """
-        self.device.SetLineState(lineState)
-
-    def SetParityBit(self,parity):
-        """
-        Set the parity bit explicitly to 0 or 1. Use this function, if
-        you would like to simulate a 9 bit wordlen at what the ninth bit
-        was represented by the parity bit value. For example:
-        dev.SetParityBit( 0 )
-        dev.Write('some data sent with parity 0')
-        dev.SetParityBit( 1 )
-        dev.Write('another sequence with parity 1')
-        """
-        return self.device.SetParityBit( parity )
-
-class GpibDevice(IOBase):
-    """
-    GPIB class
-    """
-    def __init__(self):
-        IOBase.__init__(self)
-
-    def __del__(self):
-        self.Close()
-
-    def FindListeners(self,board = 0):
-        """
-        Returns the address of the connected devices as a list.
-        If no device is listening, the list is empty. If an error
-        occurs an IOError exception raised. For example:
-        g = GPIB()
-        listeners = g.FindListeners()
-        """
-        listeners = wxctb.GPIB_x_FindListeners(board)
-        if listeners < 0:
-            raise IOError("GPIB board error")
-        result = []
-        for i in range(1,31):
-            if listeners & (1 << i):
-                result.append(i)
-        return result
-
-    def GetEosChar(self):
-        """
-        Get the internal EOS termination character (see SetEosChar).
-        For example:
-        g = GPIB()
-        g.Open(\"gpib1\",1)
-        eos = g.GetEosChar()
-        """
-        eos = wxctb.new_intp()
-        wxctb.intp_assign(eos, 0)
-        self.device.Ioctl(wxctb.CTB_GPIB_GET_EOS_CHAR,eos)
-        return wxctb.intp_value(eos)
-        
-    def GetEosMode(self):
-        """
-        Get the internal EOS mode (see SetEosMode).
-        For example:
-        g = GPIB()
-        g.Open(\"gpib1\",1)
-        eos = g.GetEosMode()
-        """
-        mode = wxctb.new_intp()
-        wxctb.intp_assign(mode, 0)
-        self.device.Ioctl(wxctb.CTB_GPIB_GET_EOS_MODE,mode)
-        return wxctb.intp_value(mode)
-
-    def GetError(self):
-        errorString = " "*256
-        self.device.GetError(errorString,256)
-        return errorString
-
-    def GetSTB(self):
-        """
-        Returns the value of the internal GPIB status byte register.
-        """
-        stb = wxctb.new_intp()
-        wxctb.intp_assign(stb, 0)
-        self.device.Ioctl(wxctb.CTB_GPIB_GETRSP,stb)
-        return wxctb.intp_value(stb)
-
-    # This is only for internal usage!!!
-    def Ibrd(self,length):
-        buf = "\x00"*length
-        state = self.device.Ibrd(buf,length)
-        return state,buf
-
-    # This is only for internal usage!!!
-    def Ibwrt(self,string):
-        return self.device.Ibwrt(string,len(string))
-
-    def Open(self,devname,adr,eosChar=10,eosMode=0x08|0x04):
-        """
-        Open(gpibdevice,address,eosChar,eosMode)
-        Opens a connected device at the GPIB bus. gpibdevice means the
-        controller, (mostly \"gpib1\"), address the address of the desired
-        device in the range 1...31. The eosChar defines the EOS character
-        (default is linefeed), eosMode may be a combination of bits ORed
-        together. The following bits can be used:
-        0x04: Terminate read when EOS is detected.
-        0x08: Set EOI (End or identify line) with EOS on write function
-        0x10: Compare all 8 bits of EOS byte rather than low 7 bits
-              (all read and write functions). Default is 0x12
-        For example:
-        dev = GPIB()
-        dev.Open(\"gpib1\",17)
-        Opens the device with the address 17, linefeed as EOS (default)
-        and eos mode with 0x04 and 0x08.
-        Open returns >= 0 or a negativ value, if something going wrong.
-        """
-        self.device = wxctb.GpibDevice()
-        dcs = wxctb.Gpib_DCS()
-        dcs.m_address1 = adr
-        dcs.m_eosChar = eosChar
-        dcs.m_eosMode = eosMode
-        result = self.device.Open(devname,dcs)
-        return result
-    
-    def Reset(self):
-        """
-        Resets the connected device. In the GPIB definition, the device
-        should be reset to it's initial state, so you can restart a
-        formely lost communication.
-        """
-        self.device.Ioctl(wxctb.CTB_RESET,None)
-
-    def ResetBus(self):
-        """
-        The command asserts the GPIB interface clear (IFC) line for
-        ast least 100us if the GPIB board is the system controller.
-        This initializes the GPIB and makes the interface CIC and
-        active controller with ATN asserted.
-        Note! The IFC signal resets only the GPIB interface functions
-        of the bus devices and not the internal device functions.
-        For a device reset you should use the Reset() command above.
-        """
-        self.device.Ioctl(wxctb.CTB_GPIB_RESET_BUS,None)
-
-    def SetEosChar(self,eos):
-        """
-        Configure the end-of-string (EOS) termination character.
-        Note! Defining an EOS byte does not cause the driver to
-        automatically send that byte at the end of write I/O
-        operations. The application is responsible for placing the
-        EOS byte at the end of the data strings that it defines.
-        (National Instruments NI-488.2M Function Reference Manual)
-        For example:
-        g = GPIB()
-        g.Open(\"gpib1\",1)
-        eos = g.GetEosChar(0x10)
-        """
-        intp = wxctb.new_intp()
-        wxctb.intp_assign(intp, eos)
-        return self.device.Ioctl(wxctb.CTB_GPIB_SET_EOS_CHAR,intp)
-        
-    def SetEosMode(self,mode):
-        """
-        Set the EOS mode (handling).m_eosMode may be a combination 
-        of bits ORed together. The following bits can be used:
-        0x04: Terminate read when EOS is detected.
-        0x08: Set EOI (End or identify line) with EOS on write function
-        0x10: Compare all 8 bits of EOS byte rather than low 7 bits
-        (all read and write functions). For example:
-        g = GPIB()
-        g.Open(\"gpib1\",1)
-        eos = g.GetEosMode(0x04 | 0x08)
-        """
-        intp = wxctb.new_intp()
-        wxctb.intp_assign(intp, mode)
-        return self.device.Ioctl(wxctb.CTB_GPIB_SET_EOS_MODE,intp)
-        
-def GetKey():
-    """
-    Returns the current pressed key or '\0', if no key is pressed.
-    You can simply create a query loop with:
-    while GetKey() == '\0':
-        ... make some stuff ...
-
-    """
-    return wxctb.GetKey()
-
-def GetVersion():
-    """
-    Returns the version of the ctb python module. The numbering
-    has the following format: x.y.z
-    x.y means the version of the underlaying ctb lib, z the version
-    of the python port.
-    """
-    return "0.16"
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/module/linux/wxctb.py b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/module/linux/wxctb.py
deleted file mode 100644
index f9e0d2ee6e..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/module/linux/wxctb.py
+++ /dev/null
@@ -1,264 +0,0 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.40
-#
-# Do not make changes to this file unless you know what you are doing--modify
-# the SWIG interface file instead.
-
-from sys import version_info
-if version_info >= (2,6,0):
-    def swig_import_helper():
-        from os.path import dirname
-        import imp
-        fp = None
-        try:
-            fp, pathname, description = imp.find_module('_wxctb', [dirname(__file__)])
-        except ImportError:
-            import _wxctb
-            return _wxctb
-        if fp is not None:
-            try:
-                _mod = imp.load_module('_wxctb', fp, pathname, description)
-            finally:
-                fp.close()
-            return _mod
-    _wxctb = swig_import_helper()
-    del swig_import_helper
-else:
-    import _wxctb
-del version_info
-try:
-    _swig_property = property
-except NameError:
-    pass # Python < 2.2 doesn't have 'property'.
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'SwigPyObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError(name)
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-try:
-    _object = object
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-
-
-def _swig_setattr_nondynamic_method(set):
-    def set_attr(self,name,value):
-        if (name == "thisown"): return self.this.own(value)
-        if hasattr(self,name) or (name == "this"):
-            set(self,name,value)
-        else:
-            raise AttributeError("You cannot add attributes to %s" % self)
-    return set_attr
-
-
-
-def new_intp():
-  return _wxctb.new_intp()
-new_intp = _wxctb.new_intp
-
-def copy_intp(*args, **kwargs):
-  return _wxctb.copy_intp(*args, **kwargs)
-copy_intp = _wxctb.copy_intp
-
-def delete_intp(*args, **kwargs):
-  return _wxctb.delete_intp(*args, **kwargs)
-delete_intp = _wxctb.delete_intp
-
-def intp_assign(*args, **kwargs):
-  return _wxctb.intp_assign(*args, **kwargs)
-intp_assign = _wxctb.intp_assign
-
-def intp_value(*args, **kwargs):
-  return _wxctb.intp_value(*args, **kwargs)
-intp_value = _wxctb.intp_value
-class timer_control(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
-    __repr__ = _swig_repr
-    usecs = _swig_property(_wxctb.timer_control_usecs_get, _wxctb.timer_control_usecs_set)
-    exitflag = _swig_property(_wxctb.timer_control_exitflag_get, _wxctb.timer_control_exitflag_set)
-    exitfnc = _swig_property(_wxctb.timer_control_exitfnc_get, _wxctb.timer_control_exitfnc_set)
-timer_control_swigregister = _wxctb.timer_control_swigregister
-timer_control_swigregister(timer_control)
-
-class Timer(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        this = _wxctb.new_Timer(*args, **kwargs)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wxctb.delete_Timer
-    __del__ = lambda self : None;
-    def start(self): return _wxctb.Timer_start(self)
-    def stop(self): return _wxctb.Timer_stop(self)
-Timer_swigregister = _wxctb.Timer_swigregister
-Timer_swigregister(Timer)
-
-
-def sleepms(*args, **kwargs):
-  return _wxctb.sleepms(*args, **kwargs)
-sleepms = _wxctb.sleepms
-CTB_RESET = _wxctb.CTB_RESET
-class IOBase(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined - class is abstract")
-    __repr__ = _swig_repr
-    __swig_destroy__ = _wxctb.delete_IOBase
-    __del__ = lambda self : None;
-    def ClassName(self): return _wxctb.IOBase_ClassName(self)
-    def Close(self): return _wxctb.IOBase_Close(self)
-    def Ioctl(self, *args, **kwargs): return _wxctb.IOBase_Ioctl(self, *args, **kwargs)
-    def IsOpen(self): return _wxctb.IOBase_IsOpen(self)
-    def Open(self, *args, **kwargs): return _wxctb.IOBase_Open(self, *args, **kwargs)
-    def PutBack(self, *args, **kwargs): return _wxctb.IOBase_PutBack(self, *args, **kwargs)
-    def Read(self, *args, **kwargs): return _wxctb.IOBase_Read(self, *args, **kwargs)
-    def ReadUntilEOS(self, *args, **kwargs): return _wxctb.IOBase_ReadUntilEOS(self, *args, **kwargs)
-    def Readv(self, *args, **kwargs): return _wxctb.IOBase_Readv(self, *args, **kwargs)
-    def Write(self, *args, **kwargs): return _wxctb.IOBase_Write(self, *args, **kwargs)
-    def Writev(self, *args, **kwargs): return _wxctb.IOBase_Writev(self, *args, **kwargs)
-IOBase_swigregister = _wxctb.IOBase_swigregister
-IOBase_swigregister(IOBase)
-
-ParityNone = _wxctb.ParityNone
-ParityOdd = _wxctb.ParityOdd
-ParityEven = _wxctb.ParityEven
-ParityMark = _wxctb.ParityMark
-ParitySpace = _wxctb.ParitySpace
-LinestateDcd = _wxctb.LinestateDcd
-LinestateCts = _wxctb.LinestateCts
-LinestateDsr = _wxctb.LinestateDsr
-LinestateDtr = _wxctb.LinestateDtr
-LinestateRing = _wxctb.LinestateRing
-LinestateRts = _wxctb.LinestateRts
-LinestateNull = _wxctb.LinestateNull
-class SerialPort_DCS(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    baud = _swig_property(_wxctb.SerialPort_DCS_baud_get, _wxctb.SerialPort_DCS_baud_set)
-    parity = _swig_property(_wxctb.SerialPort_DCS_parity_get, _wxctb.SerialPort_DCS_parity_set)
-    wordlen = _swig_property(_wxctb.SerialPort_DCS_wordlen_get, _wxctb.SerialPort_DCS_wordlen_set)
-    stopbits = _swig_property(_wxctb.SerialPort_DCS_stopbits_get, _wxctb.SerialPort_DCS_stopbits_set)
-    rtscts = _swig_property(_wxctb.SerialPort_DCS_rtscts_get, _wxctb.SerialPort_DCS_rtscts_set)
-    xonxoff = _swig_property(_wxctb.SerialPort_DCS_xonxoff_get, _wxctb.SerialPort_DCS_xonxoff_set)
-    buf = _swig_property(_wxctb.SerialPort_DCS_buf_get, _wxctb.SerialPort_DCS_buf_set)
-    def __init__(self): 
-        this = _wxctb.new_SerialPort_DCS()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wxctb.delete_SerialPort_DCS
-    __del__ = lambda self : None;
-    def GetSettings(self): return _wxctb.SerialPort_DCS_GetSettings(self)
-SerialPort_DCS_swigregister = _wxctb.SerialPort_DCS_swigregister
-SerialPort_DCS_swigregister(SerialPort_DCS)
-
-class SerialPort_EINFO(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    brk = _swig_property(_wxctb.SerialPort_EINFO_brk_get, _wxctb.SerialPort_EINFO_brk_set)
-    frame = _swig_property(_wxctb.SerialPort_EINFO_frame_get, _wxctb.SerialPort_EINFO_frame_set)
-    overrun = _swig_property(_wxctb.SerialPort_EINFO_overrun_get, _wxctb.SerialPort_EINFO_overrun_set)
-    parity = _swig_property(_wxctb.SerialPort_EINFO_parity_get, _wxctb.SerialPort_EINFO_parity_set)
-    def __init__(self): 
-        this = _wxctb.new_SerialPort_EINFO()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wxctb.delete_SerialPort_EINFO
-    __del__ = lambda self : None;
-SerialPort_EINFO_swigregister = _wxctb.SerialPort_EINFO_swigregister
-SerialPort_EINFO_swigregister(SerialPort_EINFO)
-
-CTB_SER_GETEINFO = _wxctb.CTB_SER_GETEINFO
-CTB_SER_GETBRK = _wxctb.CTB_SER_GETBRK
-CTB_SER_GETFRM = _wxctb.CTB_SER_GETFRM
-CTB_SER_GETOVR = _wxctb.CTB_SER_GETOVR
-CTB_SER_GETPAR = _wxctb.CTB_SER_GETPAR
-CTB_SER_GETINQUE = _wxctb.CTB_SER_GETINQUE
-CTB_SER_SETPAR = _wxctb.CTB_SER_SETPAR
-class SerialPort_x(IOBase):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined - class is abstract")
-    __repr__ = _swig_repr
-    __swig_destroy__ = _wxctb.delete_SerialPort_x
-    __del__ = lambda self : None;
-    def ClassName(self): return _wxctb.SerialPort_x_ClassName(self)
-    def ChangeLineState(self, *args, **kwargs): return _wxctb.SerialPort_x_ChangeLineState(self, *args, **kwargs)
-    def ClrLineState(self, *args, **kwargs): return _wxctb.SerialPort_x_ClrLineState(self, *args, **kwargs)
-    def GetLineState(self): return _wxctb.SerialPort_x_GetLineState(self)
-    def GetSettingsAsString(self): return _wxctb.SerialPort_x_GetSettingsAsString(self)
-    def Ioctl(self, *args, **kwargs): return _wxctb.SerialPort_x_Ioctl(self, *args, **kwargs)
-    def SendBreak(self, *args, **kwargs): return _wxctb.SerialPort_x_SendBreak(self, *args, **kwargs)
-    def SetBaudrate(self, *args, **kwargs): return _wxctb.SerialPort_x_SetBaudrate(self, *args, **kwargs)
-    def SetLineState(self, *args, **kwargs): return _wxctb.SerialPort_x_SetLineState(self, *args, **kwargs)
-    def SetParityBit(self, *args, **kwargs): return _wxctb.SerialPort_x_SetParityBit(self, *args, **kwargs)
-    IsStandardRate = staticmethod(_wxctb.SerialPort_x_IsStandardRate)
-SerialPort_x_swigregister = _wxctb.SerialPort_x_swigregister
-SerialPort_x_swigregister(SerialPort_x)
-
-def SerialPort_x_IsStandardRate(*args, **kwargs):
-  return _wxctb.SerialPort_x_IsStandardRate(*args, **kwargs)
-SerialPort_x_IsStandardRate = _wxctb.SerialPort_x_IsStandardRate
-
-COM1 = "/dev/ttyS0"
-COM2 = "/dev/ttyS1"
-COM3 = "/dev/ttyS2"
-COM4 = "/dev/ttyS3"
-COM5 = "/dev/ttyS4"
-COM6 = "/dev/ttyS5"
-COM7 = "/dev/ttyS6"
-COM8 = "/dev/ttyS7"
-COM9 = "/dev/ttyS8"
-
-class SerialPort(SerialPort_x):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _wxctb.new_SerialPort()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wxctb.delete_SerialPort
-    __del__ = lambda self : None;
-    def ChangeLineState(self, *args, **kwargs): return _wxctb.SerialPort_ChangeLineState(self, *args, **kwargs)
-    def ClrLineState(self, *args, **kwargs): return _wxctb.SerialPort_ClrLineState(self, *args, **kwargs)
-    def GetLineState(self): return _wxctb.SerialPort_GetLineState(self)
-    def Ioctl(self, *args, **kwargs): return _wxctb.SerialPort_Ioctl(self, *args, **kwargs)
-    def IsOpen(self): return _wxctb.SerialPort_IsOpen(self)
-    def Read(self, *args, **kwargs): return _wxctb.SerialPort_Read(self, *args, **kwargs)
-    def SendBreak(self, *args, **kwargs): return _wxctb.SerialPort_SendBreak(self, *args, **kwargs)
-    def SetBaudrate(self, *args, **kwargs): return _wxctb.SerialPort_SetBaudrate(self, *args, **kwargs)
-    def SetLineState(self, *args, **kwargs): return _wxctb.SerialPort_SetLineState(self, *args, **kwargs)
-    def SetParityBit(self, *args, **kwargs): return _wxctb.SerialPort_SetParityBit(self, *args, **kwargs)
-    def Write(self, *args, **kwargs): return _wxctb.SerialPort_Write(self, *args, **kwargs)
-SerialPort_swigregister = _wxctb.SerialPort_swigregister
-SerialPort_swigregister(SerialPort)
-
-
-def GetKey():
-  return _wxctb.GetKey()
-GetKey = _wxctb.GetKey
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/samples/parity.py b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/samples/parity.py
deleted file mode 100755
index 910361b8e0..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/samples/parity.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/python
-
-import getopt, time, sys
-
-sys.path.insert( 0, r'/home/jb/project/libctb-0.16/python/module/linux') 
-
-import ctb
-
-def main():
-
-    baudrate = 19200
-
-    devname = ""
-
-    protocol = '8N1'
-
-    try:
-        opt,arg = getopt.getopt(sys.argv[1:],
-                                'b:d:p:',
-                                ['baudrate=',
-                                 'device=',
-                                 'protocol='
-                                 ])
-
-    except getopt.GetoptError:
-        print "usage: parity.py [options]\n"\
-              "\t-b baudrate\n"\
-              "\t--baudrate=baudrate"\
-              "\t-d device\n"\
-              "\t--device=serial device name like /dev/ttyS0 or COM1\n"\
-              "\t-h\n"\
-              "\t--help print this\n"\
-              "\n"
-        sys.exit(0)
-
-    for o,a in opt:
-
-        if o in ("-b","--baudrate"):
-
-            baudrate = int(a)
-
-        if o in ("-d","--device"):
-
-            devname = a
-
-        if o in ("-p","--protocol"):
-
-            protocol = a
-
-
-    print "Using ctb version " + ctb.GetVersion()
-
-    dev = ctb.SerialPort()
-
-    if dev.Open( devname, baudrate, protocol ) < 0:
-
-        print "Cannot open " + devname +  "\n"
-
-    # send the following string with a always set parity bit
-    dev.SetParityBit( 1 )
-
-    dev.Writev( "Hello World" )
-
-    # send the following string with a always cleared parity bit
-    dev.SetParityBit( 0 )
-
-    dev.Writev( "Hello World" )
-
-main()
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/samples/protocol.py b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/samples/protocol.py
deleted file mode 100755
index ff1731b895..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/samples/protocol.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/python
-
-import getopt, time, sys
-
-sys.path.insert( 0, r'/home/jb/project/libctb-0.16/python/module/linux') 
-
-import ctb
-
-def DataBlock():
-    data = ''
-    for c in range( 0, 256):
-        data += '%c' % c
-
-    return data
-
-def main():
-
-    baudrate = 19200
-
-    devname = ""
-
-    try:
-        opt,arg = getopt.getopt(sys.argv[1:],
-                                'b:d:',
-                                ['baudrate=',
-                                 'device='
-                                 ])
-
-    except getopt.GetoptError:
-        print "usage: protocol.py [options]\n"\
-              "\t-b baudrate\n"\
-              "\t--baudrate=baudrate"\
-              "\t-d device\n"\
-              "\t--device=serial device name like /dev/ttyS0 or COM1\n"\
-              "\t-h\n"\
-              "\t--help print this\n"\
-              "\n"
-        sys.exit(0)
-
-    for o,a in opt:
-
-        if o in ("-b","--baudrate"):
-
-            baudrate = int(a)
-
-        if o in ("-d","--device"):
-
-            devname = a
-
-    print "Using ctb version " + ctb.GetVersion()
-
-    dev = ctb.SerialPort()
-
-    protocols = [
-        '8N1','8O1','8E1','8S1','8M1'
-        ]
-
-    dev.SetTimeout( 1000 )
-
-    for protocol in protocols:
-
-        if dev.Open( devname, baudrate, protocol ) < 0:
-
-            print "Cannot open " + devname +  "\n"
-
-            sys.exit( 1 )
-
-        else:
-
-            print( "%i %s" % ( baudrate, protocol ) )
-
-            for i in range(0, 4 ):
-
-                 dev.Writev( "\x33" )
-
-                 time.sleep( 0.0006 )
-
-                 dev.Writev( "\x31" )
-
-                 time.sleep( 0.0006 )
-
-            time.sleep( 0.5 )
-            
-            dev.Close()
-
-
-main()
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/samples/rtsdtr.py b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/samples/rtsdtr.py
deleted file mode 100755
index e67a9ffd3b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/samples/rtsdtr.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/python
-
-import getopt, time, sys
-
-sys.path.insert( 0, r'/home/jb/project/libctb-0.16/python/module/linux') 
-
-import ctb
-
-def main():
-
-    devname = ""
-
-    try:
-        opt,arg = getopt.getopt(sys.argv[1:],
-                                'd:',
-                                ['device='
-                                 ])
-
-    except getopt.GetoptError:
-        print "usage: parity.py [options]\n"\
-              "\t-d device\n"\
-              "\t--device=serial device name like /dev/ttyS0 or COM1\n"\
-              "\t-h\n"\
-              "\t--help print this\n"\
-              "\n"
-        sys.exit(0)
-
-    for o,a in opt:
-
-        if o in ("-d","--device"):
-
-            devname = a
-
-    print "Using ctb version " + ctb.GetVersion()
-
-    dev = ctb.SerialPort()
-
-    if dev.Open( devname, 38400 ) < 0:
-
-        print "Cannot open " + devname +  "\n"
-
-    dev.SetLineState( ctb.DTR )
-
-    dev.ClrLineState( ctb.RTS )
-
-    for i in range( 0, 100 ) :
-        
-        time.sleep( 0.01 )
-
-        dev.ChangeLineState( ctb.DTR | ctb.RTS )
-
-main()
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/ctb.html b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/ctb.html
deleted file mode 100644
index 7a5732fa9b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/ctb.html
+++ /dev/null
@@ -1,353 +0,0 @@
-
-<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: module ctb</title>
-</head><body bgcolor="#f0f0f8">
-
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
-<tr bgcolor="#7799ee">
-<td valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>ctb</strong></big></big></font></td
-><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/mnt/s/wxaddons/wxctb-0.9/SWIG/ctb.py">/mnt/s/wxaddons/wxctb-0.9/SWIG/ctb.py</a></font></td></tr></table>
-    <p></p>
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#aa55cc">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#fffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr>
-    
-<tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="re.html">re</a><br>
-</td><td width="25%" valign=top><a href="sys.html">sys</a><br>
-</td><td width="25%" valign=top><a href="wxctb.html">wxctb</a><br>
-</td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ee77aa">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial"><big><strong>Classes</strong></big></font></td></tr>
-    
-<tr><td bgcolor="#ee77aa"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><dl>
-<dt><font face="helvetica, arial"><a href="ctb.html#wxIOBase">wxIOBase</a>
-</font></dt><dd>
-<dl>
-<dt><font face="helvetica, arial"><a href="ctb.html#wxGPIB">wxGPIB</a>
-</font></dt><dt><font face="helvetica, arial"><a href="ctb.html#wxSerialPort">wxSerialPort</a>
-</font></dt></dl>
-</dd>
-</dl>
- <p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="wxGPIB">class <strong>wxGPIB</strong></a>(<a href="ctb.html#wxIOBase">wxIOBase</a>)</font></td></tr>
-    
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
-<td colspan=2><tt><a href="#wxGPIB">wxGPIB</a>&nbsp;class<br>&nbsp;</tt></td></tr>
-<tr><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="wxGPIB-GetError"><strong>GetError</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="wxGPIB-GetSTB"><strong>GetSTB</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;value&nbsp;of&nbsp;the&nbsp;internal&nbsp;GPIB&nbsp;status&nbsp;byte&nbsp;register.</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-Ibrd"><strong>Ibrd</strong></a>(self, length)</dt><dd><tt>#&nbsp;This&nbsp;is&nbsp;only&nbsp;for&nbsp;internal&nbsp;usage!!!</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-Ibwrt"><strong>Ibwrt</strong></a>(self, string)</dt><dd><tt>#&nbsp;This&nbsp;is&nbsp;only&nbsp;for&nbsp;internal&nbsp;usage!!!</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-Open"><strong>Open</strong></a>(self, devname, adr)</dt><dd><tt><a href="#wxGPIB-Open">Open</a>(gpibdevice,address)<br>
-Opens&nbsp;a&nbsp;connected&nbsp;device&nbsp;at&nbsp;the&nbsp;GPIB&nbsp;bus.&nbsp;gpibdevice&nbsp;means&nbsp;the<br>
-controller,&nbsp;(mostly&nbsp;"gpib1"),&nbsp;address&nbsp;the&nbsp;address&nbsp;of&nbsp;the&nbsp;desired<br>
-device&nbsp;in&nbsp;the&nbsp;range&nbsp;1...31.&nbsp;For&nbsp;example:<br>
-dev&nbsp;=&nbsp;<a href="#wxGPIB">wxGPIB</a>()<br>
-dev.<a href="#wxGPIB-Open">Open</a>("gpib1",17)<br>
-Opens&nbsp;the&nbsp;device&nbsp;with&nbsp;the&nbsp;address&nbsp;17.<br>
-Open&nbsp;returns&nbsp;&gt;=&nbsp;0&nbsp;or&nbsp;a&nbsp;negativ&nbsp;value,&nbsp;if&nbsp;something&nbsp;going&nbsp;wrong.</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-Reset"><strong>Reset</strong></a>(self)</dt><dd><tt>Resets&nbsp;the&nbsp;connected&nbsp;device.&nbsp;In&nbsp;the&nbsp;GPIB&nbsp;definition,&nbsp;the&nbsp;device<br>
-should&nbsp;be&nbsp;reset&nbsp;to&nbsp;it's&nbsp;initial&nbsp;state,&nbsp;so&nbsp;you&nbsp;can&nbsp;restart&nbsp;a<br>
-formely&nbsp;lost&nbsp;communication.</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-ResetBus"><strong>ResetBus</strong></a>(self)</dt><dd><tt>The&nbsp;command&nbsp;asserts&nbsp;the&nbsp;GPIB&nbsp;interface&nbsp;clear&nbsp;(IFC)&nbsp;line&nbsp;for<br>
-ast&nbsp;least&nbsp;100us&nbsp;if&nbsp;the&nbsp;GPIB&nbsp;board&nbsp;is&nbsp;the&nbsp;system&nbsp;controller.<br>
-This&nbsp;initializes&nbsp;the&nbsp;GPIB&nbsp;and&nbsp;makes&nbsp;the&nbsp;interface&nbsp;CIC&nbsp;and<br>
-active&nbsp;controller&nbsp;with&nbsp;ATN&nbsp;asserted.<br>
-Note!&nbsp;The&nbsp;IFC&nbsp;signal&nbsp;resets&nbsp;only&nbsp;the&nbsp;GPIB&nbsp;interface&nbsp;functions<br>
-of&nbsp;the&nbsp;bus&nbsp;devices&nbsp;and&nbsp;not&nbsp;the&nbsp;internal&nbsp;device&nbsp;functions.<br>
-For&nbsp;a&nbsp;device&nbsp;reset&nbsp;you&nbsp;should&nbsp;use&nbsp;the&nbsp;<a href="#wxGPIB-Reset">Reset</a>()&nbsp;command&nbsp;above.</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-__del__"><strong>__del__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="wxGPIB-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<hr>
-Methods inherited from <a href="ctb.html#wxIOBase">wxIOBase</a>:<br>
-<dl><dt><a name="wxGPIB-Close"><strong>Close</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="wxGPIB-GetTimeout"><strong>GetTimeout</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;internal&nbsp;timeout&nbsp;value&nbsp;in&nbsp;milliseconds</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-Ioctl"><strong>Ioctl</strong></a>(self, cmd, arg)</dt></dl>
-
-<dl><dt><a name="wxGPIB-PutBack"><strong>PutBack</strong></a>(self, char)</dt></dl>
-
-<dl><dt><a name="wxGPIB-Read"><strong>Read</strong></a>(self, length)</dt><dd><tt>Try&nbsp;to&nbsp;read&nbsp;the&nbsp;given&nbsp;count&nbsp;of&nbsp;data&nbsp;(length)&nbsp;and&nbsp;returns&nbsp;the<br>
-successfully&nbsp;readed&nbsp;number&nbsp;of&nbsp;data.&nbsp;The&nbsp;function&nbsp;never&nbsp;blocks.<br>
-For&nbsp;example:<br>
-readed&nbsp;=&nbsp;dev.<a href="#wxGPIB-Read">Read</a>(100)</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-ReadBinary"><strong>ReadBinary</strong></a>(self, eos<font color="#909090">='<font color="#c040c0">\n</font>'</font>)</dt><dd><tt>Special&nbsp;SCPI&nbsp;command.&nbsp;Read&nbsp;the&nbsp;next&nbsp;data&nbsp;coded&nbsp;as&nbsp;a&nbsp;SCPI<br>
-binary&nbsp;format.<br>
-A&nbsp;binary&nbsp;data&nbsp;transfer&nbsp;will&nbsp;be&nbsp;startet&nbsp;by&nbsp;'#'.&nbsp;The&nbsp;next&nbsp;byte<br>
-tells&nbsp;the&nbsp;count&nbsp;of&nbsp;bytes&nbsp;for&nbsp;the&nbsp;binary&nbsp;length&nbsp;header,<br>
-following&nbsp;by&nbsp;the&nbsp;length&nbsp;bytes.&nbsp;After&nbsp;these&nbsp;the&nbsp;data&nbsp;begins.<br>
-For&nbsp;example:<br>
-#500004xxxx<br>
-The&nbsp;header&nbsp;length&nbsp;covers&nbsp;5&nbsp;Byte,&nbsp;the&nbsp;length&nbsp;of&nbsp;the&nbsp;binary<br>
-data&nbsp;is&nbsp;4&nbsp;(x&nbsp;means&nbsp;the&nbsp;binary&nbsp;data&nbsp;bytes)</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-ReadUntilEOS"><strong>ReadUntilEOS</strong></a>(self, eos<font color="#909090">='<font color="#c040c0">\n</font>'</font>, quota<font color="#909090">=0</font>)</dt><dd><tt><a href="#wxGPIB-ReadUntilEOS">ReadUntilEOS</a>(eosString="\n",timeout=1000)<br>
-Reads&nbsp;data&nbsp;until&nbsp;the&nbsp;given&nbsp;eos&nbsp;string&nbsp;was&nbsp;received&nbsp;(default&nbsp;is<br>
-the&nbsp;linefeed&nbsp;character&nbsp;(0x0a)&nbsp;or&nbsp;the&nbsp;internal&nbsp;timeout<br>
-(default&nbsp;1000ms)&nbsp;was&nbsp;reached.<br>
-ReadUntilEOS&nbsp;returns&nbsp;the&nbsp;result&nbsp;as&nbsp;the&nbsp;following&nbsp;tuple:<br>
-['received&nbsp;string',state,readedBytes]<br>
-If&nbsp;a&nbsp;timeout&nbsp;occurred,&nbsp;state&nbsp;is&nbsp;0,&nbsp;otherwise&nbsp;1</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-Readv"><strong>Readv</strong></a>(self, length)</dt><dd><tt>Try&nbsp;to&nbsp;read&nbsp;the&nbsp;given&nbsp;count&nbsp;of&nbsp;data.&nbsp;Readv&nbsp;blocks&nbsp;until&nbsp;all&nbsp;data<br>
-was&nbsp;readed&nbsp;successfully&nbsp;or&nbsp;the&nbsp;internal&nbsp;timeout,&nbsp;set&nbsp;with&nbsp;the<br>
-class&nbsp;member&nbsp;function&nbsp;<a href="#wxGPIB-SetTimeout">SetTimeout</a>(timeout),&nbsp;was&nbsp;reached.<br>
-Returns&nbsp;the&nbsp;readed&nbsp;data.</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-SetTimeout"><strong>SetTimeout</strong></a>(self, timeout)</dt><dd><tt>Set&nbsp;the&nbsp;internal&nbsp;timeout&nbsp;value&nbsp;in&nbsp;milliseconds&nbsp;for&nbsp;all&nbsp;blocked<br>
-operations&nbsp;like&nbsp;ReadUntilEOS,&nbsp;Readv&nbsp;and&nbsp;Writev.</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-Write"><strong>Write</strong></a>(self, string)</dt><dd><tt>Writes&nbsp;the&nbsp;given&nbsp;string&nbsp;to&nbsp;the&nbsp;device&nbsp;and&nbsp;returns&nbsp;immediately.<br>
-Write&nbsp;returns&nbsp;the&nbsp;number&nbsp;of&nbsp;data&nbsp;bytes&nbsp;successfully&nbsp;written&nbsp;or&nbsp;a<br>
-negativ&nbsp;number&nbsp;if&nbsp;an&nbsp;error&nbsp;occured.&nbsp;For&nbsp;some&nbsp;circumstances,&nbsp;not<br>
-the&nbsp;complete&nbsp;string&nbsp;was&nbsp;written.<br>
-So&nbsp;you&nbsp;have&nbsp;to&nbsp;verify&nbsp;the&nbsp;return&nbsp;value&nbsp;to&nbsp;check&nbsp;this&nbsp;out.</tt></dd></dl>
-
-<dl><dt><a name="wxGPIB-Writev"><strong>Writev</strong></a>(self, string)</dt><dd><tt>Writes&nbsp;the&nbsp;given&nbsp;string&nbsp;to&nbsp;the&nbsp;device.&nbsp;The&nbsp;function&nbsp;blocks&nbsp;until<br>
-the&nbsp;complete&nbsp;string&nbsp;was&nbsp;written&nbsp;or&nbsp;the&nbsp;internal&nbsp;timeout,&nbsp;set&nbsp;with<br>
-<a href="#wxGPIB-SetTimeout">SetTimeout</a>(timeout),&nbsp;was&nbsp;reached.<br>
-Writev&nbsp;returns&nbsp;the&nbsp;number&nbsp;of&nbsp;data&nbsp;successfully&nbsp;written&nbsp;or&nbsp;a<br>
-negativ&nbsp;value,&nbsp;if&nbsp;an&nbsp;errors&nbsp;occurred.</tt></dd></dl>
-
-</td></tr></table> <p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="wxIOBase">class <strong>wxIOBase</strong></a></font></td></tr>
-    
-<tr><td bgcolor="#ffc8d8"><tt>&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="wxIOBase-Close"><strong>Close</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="wxIOBase-GetTimeout"><strong>GetTimeout</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;internal&nbsp;timeout&nbsp;value&nbsp;in&nbsp;milliseconds</tt></dd></dl>
-
-<dl><dt><a name="wxIOBase-Ioctl"><strong>Ioctl</strong></a>(self, cmd, arg)</dt></dl>
-
-<dl><dt><a name="wxIOBase-Open"><strong>Open</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="wxIOBase-PutBack"><strong>PutBack</strong></a>(self, char)</dt></dl>
-
-<dl><dt><a name="wxIOBase-Read"><strong>Read</strong></a>(self, length)</dt><dd><tt>Try&nbsp;to&nbsp;read&nbsp;the&nbsp;given&nbsp;count&nbsp;of&nbsp;data&nbsp;(length)&nbsp;and&nbsp;returns&nbsp;the<br>
-successfully&nbsp;readed&nbsp;number&nbsp;of&nbsp;data.&nbsp;The&nbsp;function&nbsp;never&nbsp;blocks.<br>
-For&nbsp;example:<br>
-readed&nbsp;=&nbsp;dev.<a href="#wxIOBase-Read">Read</a>(100)</tt></dd></dl>
-
-<dl><dt><a name="wxIOBase-ReadBinary"><strong>ReadBinary</strong></a>(self, eos<font color="#909090">='<font color="#c040c0">\n</font>'</font>)</dt><dd><tt>Special&nbsp;SCPI&nbsp;command.&nbsp;Read&nbsp;the&nbsp;next&nbsp;data&nbsp;coded&nbsp;as&nbsp;a&nbsp;SCPI<br>
-binary&nbsp;format.<br>
-A&nbsp;binary&nbsp;data&nbsp;transfer&nbsp;will&nbsp;be&nbsp;startet&nbsp;by&nbsp;'#'.&nbsp;The&nbsp;next&nbsp;byte<br>
-tells&nbsp;the&nbsp;count&nbsp;of&nbsp;bytes&nbsp;for&nbsp;the&nbsp;binary&nbsp;length&nbsp;header,<br>
-following&nbsp;by&nbsp;the&nbsp;length&nbsp;bytes.&nbsp;After&nbsp;these&nbsp;the&nbsp;data&nbsp;begins.<br>
-For&nbsp;example:<br>
-#500004xxxx<br>
-The&nbsp;header&nbsp;length&nbsp;covers&nbsp;5&nbsp;Byte,&nbsp;the&nbsp;length&nbsp;of&nbsp;the&nbsp;binary<br>
-data&nbsp;is&nbsp;4&nbsp;(x&nbsp;means&nbsp;the&nbsp;binary&nbsp;data&nbsp;bytes)</tt></dd></dl>
-
-<dl><dt><a name="wxIOBase-ReadUntilEOS"><strong>ReadUntilEOS</strong></a>(self, eos<font color="#909090">='<font color="#c040c0">\n</font>'</font>, quota<font color="#909090">=0</font>)</dt><dd><tt><a href="#wxIOBase-ReadUntilEOS">ReadUntilEOS</a>(eosString="\n",timeout=1000)<br>
-Reads&nbsp;data&nbsp;until&nbsp;the&nbsp;given&nbsp;eos&nbsp;string&nbsp;was&nbsp;received&nbsp;(default&nbsp;is<br>
-the&nbsp;linefeed&nbsp;character&nbsp;(0x0a)&nbsp;or&nbsp;the&nbsp;internal&nbsp;timeout<br>
-(default&nbsp;1000ms)&nbsp;was&nbsp;reached.<br>
-ReadUntilEOS&nbsp;returns&nbsp;the&nbsp;result&nbsp;as&nbsp;the&nbsp;following&nbsp;tuple:<br>
-['received&nbsp;string',state,readedBytes]<br>
-If&nbsp;a&nbsp;timeout&nbsp;occurred,&nbsp;state&nbsp;is&nbsp;0,&nbsp;otherwise&nbsp;1</tt></dd></dl>
-
-<dl><dt><a name="wxIOBase-Readv"><strong>Readv</strong></a>(self, length)</dt><dd><tt>Try&nbsp;to&nbsp;read&nbsp;the&nbsp;given&nbsp;count&nbsp;of&nbsp;data.&nbsp;Readv&nbsp;blocks&nbsp;until&nbsp;all&nbsp;data<br>
-was&nbsp;readed&nbsp;successfully&nbsp;or&nbsp;the&nbsp;internal&nbsp;timeout,&nbsp;set&nbsp;with&nbsp;the<br>
-class&nbsp;member&nbsp;function&nbsp;<a href="#wxIOBase-SetTimeout">SetTimeout</a>(timeout),&nbsp;was&nbsp;reached.<br>
-Returns&nbsp;the&nbsp;readed&nbsp;data.</tt></dd></dl>
-
-<dl><dt><a name="wxIOBase-ResetBus"><strong>ResetBus</strong></a>(self)</dt><dd><tt>If&nbsp;the&nbsp;underlaying&nbsp;interface&nbsp;needs&nbsp;some&nbsp;special&nbsp;reset&nbsp;operations<br>
-(for&nbsp;instance&nbsp;the&nbsp;GPIB&nbsp;distinguish&nbsp;between&nbsp;a&nbsp;normal&nbsp;device&nbsp;reset<br>
-and&nbsp;a&nbsp;special&nbsp;bus&nbsp;reset),&nbsp;you&nbsp;can&nbsp;put&nbsp;some&nbsp;code&nbsp;here)</tt></dd></dl>
-
-<dl><dt><a name="wxIOBase-SetTimeout"><strong>SetTimeout</strong></a>(self, timeout)</dt><dd><tt>Set&nbsp;the&nbsp;internal&nbsp;timeout&nbsp;value&nbsp;in&nbsp;milliseconds&nbsp;for&nbsp;all&nbsp;blocked<br>
-operations&nbsp;like&nbsp;ReadUntilEOS,&nbsp;Readv&nbsp;and&nbsp;Writev.</tt></dd></dl>
-
-<dl><dt><a name="wxIOBase-Write"><strong>Write</strong></a>(self, string)</dt><dd><tt>Writes&nbsp;the&nbsp;given&nbsp;string&nbsp;to&nbsp;the&nbsp;device&nbsp;and&nbsp;returns&nbsp;immediately.<br>
-Write&nbsp;returns&nbsp;the&nbsp;number&nbsp;of&nbsp;data&nbsp;bytes&nbsp;successfully&nbsp;written&nbsp;or&nbsp;a<br>
-negativ&nbsp;number&nbsp;if&nbsp;an&nbsp;error&nbsp;occured.&nbsp;For&nbsp;some&nbsp;circumstances,&nbsp;not<br>
-the&nbsp;complete&nbsp;string&nbsp;was&nbsp;written.<br>
-So&nbsp;you&nbsp;have&nbsp;to&nbsp;verify&nbsp;the&nbsp;return&nbsp;value&nbsp;to&nbsp;check&nbsp;this&nbsp;out.</tt></dd></dl>
-
-<dl><dt><a name="wxIOBase-Writev"><strong>Writev</strong></a>(self, string)</dt><dd><tt>Writes&nbsp;the&nbsp;given&nbsp;string&nbsp;to&nbsp;the&nbsp;device.&nbsp;The&nbsp;function&nbsp;blocks&nbsp;until<br>
-the&nbsp;complete&nbsp;string&nbsp;was&nbsp;written&nbsp;or&nbsp;the&nbsp;internal&nbsp;timeout,&nbsp;set&nbsp;with<br>
-<a href="#wxIOBase-SetTimeout">SetTimeout</a>(timeout),&nbsp;was&nbsp;reached.<br>
-Writev&nbsp;returns&nbsp;the&nbsp;number&nbsp;of&nbsp;data&nbsp;successfully&nbsp;written&nbsp;or&nbsp;a<br>
-negativ&nbsp;value,&nbsp;if&nbsp;an&nbsp;errors&nbsp;occurred.</tt></dd></dl>
-
-<dl><dt><a name="wxIOBase-__del__"><strong>__del__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="wxIOBase-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-</td></tr></table> <p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="wxSerialPort">class <strong>wxSerialPort</strong></a>(<a href="ctb.html#wxIOBase">wxIOBase</a>)</font></td></tr>
-    
-<tr><td bgcolor="#ffc8d8"><tt>&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="wxSerialPort-ChangeLineState"><strong>ChangeLineState</strong></a>(self, lineState)</dt><dd><tt>Change&nbsp;(toggle)&nbsp;the&nbsp;state&nbsp;of&nbsp;each&nbsp;the&nbsp;lines&nbsp;given&nbsp;in&nbsp;the<br>
-linestate&nbsp;parameter.&nbsp;Possible&nbsp;values&nbsp;are&nbsp;wxSERIAL_LINESTATE_DTR<br>
-(means&nbsp;the&nbsp;DTR&nbsp;signal)&nbsp;and/or&nbsp;wxSERIAL_LINESTATE_RTS&nbsp;(RTS&nbsp;signal).<br>
-For&nbsp;example&nbsp;to&nbsp;toggle&nbsp;the&nbsp;RTS&nbsp;line&nbsp;only:<br>
-dev.<a href="#wxSerialPort-ChangeLineState">ChangeLineState</a>(wxSERIAL_LINESTATE_RTS)</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-ClrLineState"><strong>ClrLineState</strong></a>(self, lineState)</dt><dd><tt>Clear&nbsp;the&nbsp;lines&nbsp;given&nbsp;in&nbsp;the&nbsp;linestate&nbsp;parameter.&nbsp;Possible<br>
-values&nbsp;are&nbsp;wxSERIAL_LINESTATE_DTR&nbsp;(means&nbsp;the&nbsp;DTR&nbsp;signal)&nbsp;and/or<br>
-wxSERIAL_LINESTATE_RTS&nbsp;(RTS&nbsp;signal).&nbsp;For&nbsp;example&nbsp;to&nbsp;clear&nbsp;only<br>
-the&nbsp;RTS&nbsp;line:<br>
-dev.<a href="#wxSerialPort-ClrLineState">ClrLineState</a>(wxSERIAL_LINESTATE_RTS)</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-GetAvailableBytes"><strong>GetAvailableBytes</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;available&nbsp;bytes&nbsp;in&nbsp;the&nbsp;input&nbsp;queue&nbsp;of&nbsp;the&nbsp;serial<br>
-driver.</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-GetCommErrors"><strong>GetCommErrors</strong></a>(self)</dt><dd><tt>Get&nbsp;the&nbsp;internal&nbsp;communication&nbsp;errors&nbsp;like&nbsp;breaks,&nbsp;framing,<br>
-parity&nbsp;or&nbsp;overrun&nbsp;errors.<br>
-Returns&nbsp;the&nbsp;count&nbsp;of&nbsp;each&nbsp;error&nbsp;as&nbsp;a&nbsp;tuple&nbsp;like&nbsp;this:<br>
-(b,f,o,p)&nbsp;=&nbsp;dev.<a href="#wxSerialPort-GetCommErrors">GetCommErrors</a>()<br>
-b:&nbsp;breaks,&nbsp;f:&nbsp;framing&nbsp;errors,&nbsp;&nbsp;o:&nbsp;overruns,&nbsp;p:&nbsp;parity&nbsp;errors</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-GetLineState"><strong>GetLineState</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;current&nbsp;linestates&nbsp;of&nbsp;the&nbsp;CTS,&nbsp;DCD,&nbsp;DSR&nbsp;and&nbsp;RING<br>
-signal&nbsp;line&nbsp;as&nbsp;an&nbsp;integer&nbsp;value&nbsp;with&nbsp;the&nbsp;appropriate&nbsp;bits&nbsp;or<br>
--1&nbsp;on&nbsp;error.<br>
-For&nbsp;example:<br>
-lines&nbsp;=&nbsp;dev.<a href="#wxSerialPort-GetLineState">GetLineState</a>()<br>
-if&nbsp;lines&nbsp;&amp;&nbsp;wxSERIAL_LINESTATE_CTS:<br>
-&nbsp;&nbsp;&nbsp;&nbsp;print&nbsp;"CTS&nbsp;is&nbsp;on"</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-Open"><strong>Open</strong></a>(self, devname, baudrate, protocol<font color="#909090">='8N1'</font>, handshake<font color="#909090">='no_handshake'</font>)</dt><dd><tt>Open&nbsp;the&nbsp;device&nbsp;devname&nbsp;with&nbsp;the&nbsp;given&nbsp;baudrate,&nbsp;the&nbsp;protocol<br>
-like&nbsp;'8N1'&nbsp;(default)&nbsp;and&nbsp;the&nbsp;use&nbsp;of&nbsp;the&nbsp;handshake&nbsp;[no_handshake<br>
-(default),&nbsp;rtscts&nbsp;or&nbsp;xonxoff]<br>
-For&nbsp;example:<br>
-At&nbsp;Linux:<br>
-dev&nbsp;=&nbsp;<a href="#wxSerialPort">wxSerialPort</a>()<br>
-dev.<a href="#wxSerialPort-Open">Open</a>("/dev/ttyS0",115200)<br>
-or&nbsp;with&nbsp;a&nbsp;datalen&nbsp;of&nbsp;7&nbsp;bits,&nbsp;even&nbsp;parity,&nbsp;2&nbsp;stopbits&nbsp;and&nbsp;rts/cts<br>
-handshake:<br>
-dev.<a href="#wxSerialPort-Open">Open</a>("/dev/ttyS0",115200,'7E2',True)<br>
-At&nbsp;Windows:<br>
-dev&nbsp;=&nbsp;<a href="#wxSerialPort">wxSerialPort</a>()<br>
-dev.<a href="#wxSerialPort-Open">Open</a>("COM1",115200)<br>
-dev.<a href="#wxSerialPort-Open">Open</a>("COM1",115200,'7E2',True)<br>
-Returns&nbsp;the&nbsp;handle&nbsp;on&nbsp;success&nbsp;or&nbsp;a&nbsp;negativ&nbsp;value&nbsp;on&nbsp;failure.</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-Reset"><strong>Reset</strong></a>(self)</dt><dd><tt>Send&nbsp;a&nbsp;break&nbsp;for&nbsp;0.25s.</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-SetBaudRate"><strong>SetBaudRate</strong></a>(self, baudrate)</dt><dd><tt>Set&nbsp;the&nbsp;baudrate&nbsp;for&nbsp;the&nbsp;device.</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-SetLineState"><strong>SetLineState</strong></a>(self, lineState)</dt><dd><tt>Set&nbsp;the&nbsp;lines&nbsp;given&nbsp;in&nbsp;the&nbsp;linestate&nbsp;parameter.&nbsp;Possible<br>
-values&nbsp;are&nbsp;wxSERIAL_LINESTATE_DTR&nbsp;(means&nbsp;the&nbsp;DTR&nbsp;signal)&nbsp;and/or<br>
-wxSERIAL_LINESTATE_RTS&nbsp;(RTS&nbsp;signal).&nbsp;For&nbsp;example&nbsp;to&nbsp;set&nbsp;both:<br>
-dev.<a href="#wxSerialPort-SetLineState">SetLineState</a>(wxSERIAL_LINESTATE_DTR&nbsp;|&nbsp;wxSERIAL_LINESTATE_RTS)</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-__del__"><strong>__del__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="wxSerialPort-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<hr>
-Methods inherited from <a href="ctb.html#wxIOBase">wxIOBase</a>:<br>
-<dl><dt><a name="wxSerialPort-Close"><strong>Close</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="wxSerialPort-GetTimeout"><strong>GetTimeout</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;internal&nbsp;timeout&nbsp;value&nbsp;in&nbsp;milliseconds</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-Ioctl"><strong>Ioctl</strong></a>(self, cmd, arg)</dt></dl>
-
-<dl><dt><a name="wxSerialPort-PutBack"><strong>PutBack</strong></a>(self, char)</dt></dl>
-
-<dl><dt><a name="wxSerialPort-Read"><strong>Read</strong></a>(self, length)</dt><dd><tt>Try&nbsp;to&nbsp;read&nbsp;the&nbsp;given&nbsp;count&nbsp;of&nbsp;data&nbsp;(length)&nbsp;and&nbsp;returns&nbsp;the<br>
-successfully&nbsp;readed&nbsp;number&nbsp;of&nbsp;data.&nbsp;The&nbsp;function&nbsp;never&nbsp;blocks.<br>
-For&nbsp;example:<br>
-readed&nbsp;=&nbsp;dev.<a href="#wxSerialPort-Read">Read</a>(100)</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-ReadBinary"><strong>ReadBinary</strong></a>(self, eos<font color="#909090">='<font color="#c040c0">\n</font>'</font>)</dt><dd><tt>Special&nbsp;SCPI&nbsp;command.&nbsp;Read&nbsp;the&nbsp;next&nbsp;data&nbsp;coded&nbsp;as&nbsp;a&nbsp;SCPI<br>
-binary&nbsp;format.<br>
-A&nbsp;binary&nbsp;data&nbsp;transfer&nbsp;will&nbsp;be&nbsp;startet&nbsp;by&nbsp;'#'.&nbsp;The&nbsp;next&nbsp;byte<br>
-tells&nbsp;the&nbsp;count&nbsp;of&nbsp;bytes&nbsp;for&nbsp;the&nbsp;binary&nbsp;length&nbsp;header,<br>
-following&nbsp;by&nbsp;the&nbsp;length&nbsp;bytes.&nbsp;After&nbsp;these&nbsp;the&nbsp;data&nbsp;begins.<br>
-For&nbsp;example:<br>
-#500004xxxx<br>
-The&nbsp;header&nbsp;length&nbsp;covers&nbsp;5&nbsp;Byte,&nbsp;the&nbsp;length&nbsp;of&nbsp;the&nbsp;binary<br>
-data&nbsp;is&nbsp;4&nbsp;(x&nbsp;means&nbsp;the&nbsp;binary&nbsp;data&nbsp;bytes)</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-ReadUntilEOS"><strong>ReadUntilEOS</strong></a>(self, eos<font color="#909090">='<font color="#c040c0">\n</font>'</font>, quota<font color="#909090">=0</font>)</dt><dd><tt><a href="#wxSerialPort-ReadUntilEOS">ReadUntilEOS</a>(eosString="\n",timeout=1000)<br>
-Reads&nbsp;data&nbsp;until&nbsp;the&nbsp;given&nbsp;eos&nbsp;string&nbsp;was&nbsp;received&nbsp;(default&nbsp;is<br>
-the&nbsp;linefeed&nbsp;character&nbsp;(0x0a)&nbsp;or&nbsp;the&nbsp;internal&nbsp;timeout<br>
-(default&nbsp;1000ms)&nbsp;was&nbsp;reached.<br>
-ReadUntilEOS&nbsp;returns&nbsp;the&nbsp;result&nbsp;as&nbsp;the&nbsp;following&nbsp;tuple:<br>
-['received&nbsp;string',state,readedBytes]<br>
-If&nbsp;a&nbsp;timeout&nbsp;occurred,&nbsp;state&nbsp;is&nbsp;0,&nbsp;otherwise&nbsp;1</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-Readv"><strong>Readv</strong></a>(self, length)</dt><dd><tt>Try&nbsp;to&nbsp;read&nbsp;the&nbsp;given&nbsp;count&nbsp;of&nbsp;data.&nbsp;Readv&nbsp;blocks&nbsp;until&nbsp;all&nbsp;data<br>
-was&nbsp;readed&nbsp;successfully&nbsp;or&nbsp;the&nbsp;internal&nbsp;timeout,&nbsp;set&nbsp;with&nbsp;the<br>
-class&nbsp;member&nbsp;function&nbsp;<a href="#wxSerialPort-SetTimeout">SetTimeout</a>(timeout),&nbsp;was&nbsp;reached.<br>
-Returns&nbsp;the&nbsp;readed&nbsp;data.</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-ResetBus"><strong>ResetBus</strong></a>(self)</dt><dd><tt>If&nbsp;the&nbsp;underlaying&nbsp;interface&nbsp;needs&nbsp;some&nbsp;special&nbsp;reset&nbsp;operations<br>
-(for&nbsp;instance&nbsp;the&nbsp;GPIB&nbsp;distinguish&nbsp;between&nbsp;a&nbsp;normal&nbsp;device&nbsp;reset<br>
-and&nbsp;a&nbsp;special&nbsp;bus&nbsp;reset),&nbsp;you&nbsp;can&nbsp;put&nbsp;some&nbsp;code&nbsp;here)</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-SetTimeout"><strong>SetTimeout</strong></a>(self, timeout)</dt><dd><tt>Set&nbsp;the&nbsp;internal&nbsp;timeout&nbsp;value&nbsp;in&nbsp;milliseconds&nbsp;for&nbsp;all&nbsp;blocked<br>
-operations&nbsp;like&nbsp;ReadUntilEOS,&nbsp;Readv&nbsp;and&nbsp;Writev.</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-Write"><strong>Write</strong></a>(self, string)</dt><dd><tt>Writes&nbsp;the&nbsp;given&nbsp;string&nbsp;to&nbsp;the&nbsp;device&nbsp;and&nbsp;returns&nbsp;immediately.<br>
-Write&nbsp;returns&nbsp;the&nbsp;number&nbsp;of&nbsp;data&nbsp;bytes&nbsp;successfully&nbsp;written&nbsp;or&nbsp;a<br>
-negativ&nbsp;number&nbsp;if&nbsp;an&nbsp;error&nbsp;occured.&nbsp;For&nbsp;some&nbsp;circumstances,&nbsp;not<br>
-the&nbsp;complete&nbsp;string&nbsp;was&nbsp;written.<br>
-So&nbsp;you&nbsp;have&nbsp;to&nbsp;verify&nbsp;the&nbsp;return&nbsp;value&nbsp;to&nbsp;check&nbsp;this&nbsp;out.</tt></dd></dl>
-
-<dl><dt><a name="wxSerialPort-Writev"><strong>Writev</strong></a>(self, string)</dt><dd><tt>Writes&nbsp;the&nbsp;given&nbsp;string&nbsp;to&nbsp;the&nbsp;device.&nbsp;The&nbsp;function&nbsp;blocks&nbsp;until<br>
-the&nbsp;complete&nbsp;string&nbsp;was&nbsp;written&nbsp;or&nbsp;the&nbsp;internal&nbsp;timeout,&nbsp;set&nbsp;with<br>
-<a href="#wxSerialPort-SetTimeout">SetTimeout</a>(timeout),&nbsp;was&nbsp;reached.<br>
-Writev&nbsp;returns&nbsp;the&nbsp;number&nbsp;of&nbsp;data&nbsp;successfully&nbsp;written&nbsp;or&nbsp;a<br>
-negativ&nbsp;value,&nbsp;if&nbsp;an&nbsp;errors&nbsp;occurred.</tt></dd></dl>
-
-</td></tr></table></td></tr></table><p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#eeaa77">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial"><big><strong>Functions</strong></big></font></td></tr>
-    
-<tr><td bgcolor="#eeaa77"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><dl><dt><a name="-GetKey"><strong>GetKey</strong></a>()</dt><dd><tt>Returns&nbsp;the&nbsp;current&nbsp;pressed&nbsp;key&nbsp;or&nbsp;'',&nbsp;if&nbsp;no&nbsp;key&nbsp;is&nbsp;pressed.<br>
-You&nbsp;can&nbsp;simply&nbsp;create&nbsp;a&nbsp;query&nbsp;loop&nbsp;with:<br>
-while&nbsp;<a href="#-GetKey">GetKey</a>()&nbsp;==&nbsp;'':<br>
-&nbsp;&nbsp;&nbsp;&nbsp;...&nbsp;make&nbsp;some&nbsp;stuff&nbsp;...</tt></dd></dl>
- <dl><dt><a name="-abstract"><strong>abstract</strong></a>()</dt></dl>
-</td></tr></table><p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#55aa55">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr>
-    
-<tr><td bgcolor="#55aa55"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><strong>wxSERIAL_LINESTATE_CTS</strong> = 32<br>
-<strong>wxSERIAL_LINESTATE_DCD</strong> = 64<br>
-<strong>wxSERIAL_LINESTATE_DSR</strong> = 256<br>
-<strong>wxSERIAL_LINESTATE_DTR</strong> = 2<br>
-<strong>wxSERIAL_LINESTATE_NULL</strong> = 0<br>
-<strong>wxSERIAL_LINESTATE_RING</strong> = 128<br>
-<strong>wxSERIAL_LINESTATE_RTS</strong> = 4</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/ctb.py b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/ctb.py
deleted file mode 100644
index 6b541ffe39..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/ctb.py
+++ /dev/null
@@ -1,455 +0,0 @@
-import wxctb, sys, re
-
-DCD = wxctb.LinestateDcd
-CTS = wxctb.LinestateCts
-DSR = wxctb.LinestateDsr
-DTR = wxctb.LinestateDtr
-RING = wxctb.LinestateRing
-RTS = wxctb.LinestateRts
-NULL = wxctb.LinestateNull
-
-def abstract():
-    import inspect
-    caller = inspect.getouterframes(inspect.currentframe())[1][3]
-    raise NotImplementedError(caller + ' must be implemented in subclass')
-
-class IOBase:
-    def __init__(self):
-        self.device = None
-        # set timeout to 1000ms (the default)
-        self.timeout = 1000
-        
-    def __del__(self):
-        pass
-    
-    def Close(self):
-        if self.device:
-            self.device.Close()
-
-    def GetTimeout(self):
-        """
-        Returns the internal timeout value in milliseconds
-        """
-        return self.timeout
-
-    def Ioctl(self,cmd,arg):
-        if self.device:
-            self.device.Ioctl(cmd,arg)
-            
-    def Open(self):
-        abstract()
-
-    def PutBack(self,char):
-        return self.device.PutBack(char)
-    
-    def Read(self,length):
-        """
-        Try to read the given count of data (length) and returns the
-        successfully readed number of data. The function never blocks.
-        For example:
-        readed = dev.Read(100)
-        """
-        buf = "\x00"*(length+1)
-        rd = self.device.Read(buf,length)
-        return buf[0:rd]
-
-    def ReadBinary(self,eos="\n"):
-        """
-        Special SCPI command. Read the next data coded as a SCPI
-        binary format.
-        A binary data transfer will be startet by '#'. The next byte
-        tells the count of bytes for the binary length header,
-        following by the length bytes. After these the data begins.
-        For example:
-        #500004xxxx
-        The header length covers 5 Byte, the length of the binary
-        data is 4 (x means the binary data bytes)
-        """
-        try:
-            eoslen = len(eos)
-            b=self.Readv(2)
-            if len(b) == 2:
-                hl = int(b[1])
-                b = self.Readv(hl)
-                if len(b) == hl:
-                    dl = int(b)
-                    # don't left over the eos string or character in the
-                    # device input buffer
-                    data = self.Readv(dl+eoslen)
-                    # check, if the binary data block is complete
-                    if data[dl] == '#':
-                        # not complete, another block is following
-                        for c in data[dl:dl+eoslen]:
-                            self.PutBack(c)
-
-                        data = data[:dl] + self.ReadBinary()
-                    return data
-        except:
-            pass
-        return ''
-
-    def ReadUntilEOS(self,eos="\n",quota=0):
-        """
-        ReadUntilEOS(eosString=\"\\n\",timeout=1000)
-        Reads data until the given eos string was received (default is
-        the linefeed character (0x0a) or the internal timeout
-        (default 1000ms) was reached.
-        ReadUntilEOS returns the result as the following tuple:
-        ['received string',state,readedBytes]
-        If a timeout occurred, state is 0, otherwise 1
-        """
-        return self.device.ReadUntilEOS("",0,eos,self.timeout,quota)
-
-    def Readv(self,length):
-        """
-        Try to read the given count of data. Readv blocks until all data
-        was readed successfully or the internal timeout, set with the
-        class member function SetTimeout(timeout), was reached.
-        Returns the readed data.
-        """
-        buf = "\x00"*length
-        rd = self.device.Readv(buf,length,self.timeout)
-        return buf[0:rd]
-
-    def ResetBus(self):
-        """
-        If the underlaying interface needs some special reset operations
-        (for instance the GPIB distinguish between a normal device reset
-        and a special bus reset), you can put some code here)
-        """
-        pass
-
-    def SetTimeout(self,timeout):
-        """
-        Set the internal timeout value in milliseconds for all blocked
-        operations like ReadUntilEOS, Readv and Writev.
-        """
-        self.timeout = timeout
-        
-    def Write(self,string):
-        """
-        Writes the given string to the device and returns immediately.
-        Write returns the number of data bytes successfully written or a
-        negativ number if an error occured. For some circumstances, not
-        the complete string was written.
-        So you have to verify the return value to check this out.
-        """
-        return self.device.Write(string,len(string))
-
-    def Writev(self,string):
-        """
-        Writes the given string to the device. The function blocks until
-        the complete string was written or the internal timeout, set with
-        SetTimeout(timeout), was reached.
-        Writev returns the number of data successfully written or a
-        negativ value, if an errors occurred.
-        """
-        return self.device.Writev(string,len(string),self.timeout)
-
-class SerialPort(IOBase):
-    def __init__(self):
-        IOBase.__init__(self)
-
-    def __del__(self):
-        self.Close()
-        
-    def ChangeLineState(self,lineState):
-        """
-        Change (toggle) the state of each the lines given in the
-        linestate parameter. Possible values are DTR and/or RTS.
-        For example to toggle the RTS line only:
-        dev.ChangeLineState(RTS)
-        """
-        self.device.ChangeLineState(lineState)
-
-    def ClrLineState(self,lineState):
-        """
-        Clear the lines given in the linestate parameter. Possible
-        values are DTR and/or RTS. For example to clear only
-        the RTS line:
-        dev.ClrLineState(RTS)
-        """
-        self.device.ClrLineState(lineState)
-
-    def GetAvailableBytes(self):
-        """
-        Returns the available bytes in the input queue of the serial
-        driver.
-        """
-        n = wxctb.new_intp()
-        wxctb.intp_assign(n, 0)
-        self.device.Ioctl(wxctb.CTB_SER_GETINQUE,n)
-        return wxctb.intp_value(n)
-
-    def GetCommErrors(self):
-        """
-        Get the internal communication errors like breaks, framing,
-        parity or overrun errors.
-        Returns the count of each error as a tuple like this:
-        (b,f,o,p) = dev.GetCommErrors()
-        b: breaks, f: framing errors,  o: overruns, p: parity errors
-        """
-        einfo = wxctb.SerialPort_EINFO()
-        self.device.Ioctl(wxctb.CTB_SER_GETEINFO,einfo)
-        return einfo.brk,einfo.frame,einfo.overrun,einfo.parity
-    
-    def GetLineState(self):
-        """
-        Returns the current linestates of the CTS, DCD, DSR and RING
-        signal line as an integer value with the appropriate bits or
-        -1 on error.
-        For example:
-        lines = dev.GetLineState()
-        if lines & CTS:
-            print \"CTS is on\"
-        """
-        return self.device.GetLineState()
-
-    def Open(self,devname,baudrate,protocol='8N1',handshake='no_handshake'):
-        """
-        Open the device devname with the given baudrate, the protocol
-        like '8N1' (default) and the use of the handshake [no_handshake
-        (default), rtscts or xonxoff]
-        For example:
-        At Linux:
-        dev = SerialPort()
-        dev.Open(\"/dev/ttyS0\",115200)
-        or with a datalen of 7 bits, even parity, 2 stopbits and rts/cts
-        handshake:
-        dev.Open(\"/dev/ttyS0\",115200,'7E2',True)
-        At Windows:
-        dev = SerialPort()
-        dev.Open(\"COM1\",115200)
-        dev.Open(\"COM1\",115200,'7E2',True)
-        Returns the handle on success or a negativ value on failure.
-        """
-        # the following parity values are valid:
-        # N:None, O:Odd, E:Even, M:Mark, S:Space
-        parity = {'N':0,'O':1,'E':2,'M':3,'S':4}
-        # the regular expression ensures a valid value for the datalen
-        # (5...8 bit) and the count of stopbits (1,2)
-        reg=re.compile(r"(?P<w>[8765])"r"(?P<p>[NOEMS])"r"(?P<s>[12])")
-        self.device = wxctb.SerialPort()
-        dcs = wxctb.SerialPort_DCS()
-        dcs.baud = baudrate
-        res = reg.search(protocol)
-        # handle the given protocol
-        if res:
-            dcs.wordlen = int(res.group('w'))
-            dcs.stopbits = int(res.group('s'))
-            dcs.parity = parity[res.group('p')]
-        # valid handshake are no one, rts/cts or xon/xoff
-        if handshake == 'rtscts':
-            dcs.rtscts = True
-        elif handshake == 'xonxoff':
-            dcs.xonxoff = True
-        
-        return self.device.Open(devname,dcs)
-    
-    def Reset(self):
-        """
-        Send a break for 0.25s.
-        """
-        self.device.SendBreak(0)
-
-    def SetBaudrate(self,baudrate):
-        """
-        Set the baudrate for the device.
-        """
-        self.device.SetBaudrate(baudrate)
-
-    def SetLineState(self,lineState):
-        """
-        Set the lines given in the linestate parameter. Possible
-        values are DTR and/or RTS. For example to set both:
-        dev.SetLineState( DTR | RTS)
-        """
-        self.device.SetLineState(lineState)
-
-    def SetParityBit(self,parity):
-        """
-        Set the parity bit explicitly to 0 or 1. Use this function, if
-        you would like to simulate a 9 bit wordlen at what the ninth bit
-        was represented by the parity bit value. For example:
-        dev.SetParityBit( 0 )
-        dev.Write('some data sent with parity 0')
-        dev.SetParityBit( 1 )
-        dev.Write('another sequence with parity 1')
-        """
-        return self.device.SetParityBit( parity )
-
-class GpibDevice(IOBase):
-    """
-    GPIB class
-    """
-    def __init__(self):
-        IOBase.__init__(self)
-
-    def __del__(self):
-        self.Close()
-
-    def FindListeners(self,board = 0):
-        """
-        Returns the address of the connected devices as a list.
-        If no device is listening, the list is empty. If an error
-        occurs an IOError exception raised. For example:
-        g = GPIB()
-        listeners = g.FindListeners()
-        """
-        listeners = wxctb.GPIB_x_FindListeners(board)
-        if listeners < 0:
-            raise IOError("GPIB board error")
-        result = []
-        for i in range(1,31):
-            if listeners & (1 << i):
-                result.append(i)
-        return result
-
-    def GetEosChar(self):
-        """
-        Get the internal EOS termination character (see SetEosChar).
-        For example:
-        g = GPIB()
-        g.Open(\"gpib1\",1)
-        eos = g.GetEosChar()
-        """
-        eos = wxctb.new_intp()
-        wxctb.intp_assign(eos, 0)
-        self.device.Ioctl(wxctb.CTB_GPIB_GET_EOS_CHAR,eos)
-        return wxctb.intp_value(eos)
-        
-    def GetEosMode(self):
-        """
-        Get the internal EOS mode (see SetEosMode).
-        For example:
-        g = GPIB()
-        g.Open(\"gpib1\",1)
-        eos = g.GetEosMode()
-        """
-        mode = wxctb.new_intp()
-        wxctb.intp_assign(mode, 0)
-        self.device.Ioctl(wxctb.CTB_GPIB_GET_EOS_MODE,mode)
-        return wxctb.intp_value(mode)
-
-    def GetError(self):
-        errorString = " "*256
-        self.device.GetError(errorString,256)
-        return errorString
-
-    def GetSTB(self):
-        """
-        Returns the value of the internal GPIB status byte register.
-        """
-        stb = wxctb.new_intp()
-        wxctb.intp_assign(stb, 0)
-        self.device.Ioctl(wxctb.CTB_GPIB_GETRSP,stb)
-        return wxctb.intp_value(stb)
-
-    # This is only for internal usage!!!
-    def Ibrd(self,length):
-        buf = "\x00"*length
-        state = self.device.Ibrd(buf,length)
-        return state,buf
-
-    # This is only for internal usage!!!
-    def Ibwrt(self,string):
-        return self.device.Ibwrt(string,len(string))
-
-    def Open(self,devname,adr,eosChar=10,eosMode=0x08|0x04):
-        """
-        Open(gpibdevice,address,eosChar,eosMode)
-        Opens a connected device at the GPIB bus. gpibdevice means the
-        controller, (mostly \"gpib1\"), address the address of the desired
-        device in the range 1...31. The eosChar defines the EOS character
-        (default is linefeed), eosMode may be a combination of bits ORed
-        together. The following bits can be used:
-        0x04: Terminate read when EOS is detected.
-        0x08: Set EOI (End or identify line) with EOS on write function
-        0x10: Compare all 8 bits of EOS byte rather than low 7 bits
-              (all read and write functions). Default is 0x12
-        For example:
-        dev = GPIB()
-        dev.Open(\"gpib1\",17)
-        Opens the device with the address 17, linefeed as EOS (default)
-        and eos mode with 0x04 and 0x08.
-        Open returns >= 0 or a negativ value, if something going wrong.
-        """
-        self.device = wxctb.GpibDevice()
-        dcs = wxctb.Gpib_DCS()
-        dcs.m_address1 = adr
-        dcs.m_eosChar = eosChar
-        dcs.m_eosMode = eosMode
-        result = self.device.Open(devname,dcs)
-        return result
-    
-    def Reset(self):
-        """
-        Resets the connected device. In the GPIB definition, the device
-        should be reset to it's initial state, so you can restart a
-        formely lost communication.
-        """
-        self.device.Ioctl(wxctb.CTB_RESET,None)
-
-    def ResetBus(self):
-        """
-        The command asserts the GPIB interface clear (IFC) line for
-        ast least 100us if the GPIB board is the system controller.
-        This initializes the GPIB and makes the interface CIC and
-        active controller with ATN asserted.
-        Note! The IFC signal resets only the GPIB interface functions
-        of the bus devices and not the internal device functions.
-        For a device reset you should use the Reset() command above.
-        """
-        self.device.Ioctl(wxctb.CTB_GPIB_RESET_BUS,None)
-
-    def SetEosChar(self,eos):
-        """
-        Configure the end-of-string (EOS) termination character.
-        Note! Defining an EOS byte does not cause the driver to
-        automatically send that byte at the end of write I/O
-        operations. The application is responsible for placing the
-        EOS byte at the end of the data strings that it defines.
-        (National Instruments NI-488.2M Function Reference Manual)
-        For example:
-        g = GPIB()
-        g.Open(\"gpib1\",1)
-        eos = g.GetEosChar(0x10)
-        """
-        intp = wxctb.new_intp()
-        wxctb.intp_assign(intp, eos)
-        return self.device.Ioctl(wxctb.CTB_GPIB_SET_EOS_CHAR,intp)
-        
-    def SetEosMode(self,mode):
-        """
-        Set the EOS mode (handling).m_eosMode may be a combination 
-        of bits ORed together. The following bits can be used:
-        0x04: Terminate read when EOS is detected.
-        0x08: Set EOI (End or identify line) with EOS on write function
-        0x10: Compare all 8 bits of EOS byte rather than low 7 bits
-        (all read and write functions). For example:
-        g = GPIB()
-        g.Open(\"gpib1\",1)
-        eos = g.GetEosMode(0x04 | 0x08)
-        """
-        intp = wxctb.new_intp()
-        wxctb.intp_assign(intp, mode)
-        return self.device.Ioctl(wxctb.CTB_GPIB_SET_EOS_MODE,intp)
-        
-def GetKey():
-    """
-    Returns the current pressed key or '\0', if no key is pressed.
-    You can simply create a query loop with:
-    while GetKey() == '\0':
-        ... make some stuff ...
-
-    """
-    return wxctb.GetKey()
-
-def GetVersion():
-    """
-    Returns the version of the ctb python module. The numbering
-    has the following format: x.y.z
-    x.y means the version of the underlaying ctb lib, z the version
-    of the python port.
-    """
-    return "0.16"
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/gpib.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/gpib.i
deleted file mode 100644
index 752ecd3a18..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/gpib.i
+++ /dev/null
@@ -1,96 +0,0 @@
-%{
-#include "ctb-0.16/gpib.h"
-%}
-
-%include iobase.i
-
-namespace ctb {
-
-%typemap(in) void * dcs (Gpib_DCS tmp) {
-	/* dont check for list */
-	$1 = &tmp;
-}
-
-enum GpibTimeout
-{
-    GpibTimeoutNONE = 0, 
-    GpibTimeout10us, 
-    GpibTimeout30us, 
-    GpibTimeout100us,
-    GpibTimeout300us,
-    GpibTimeout1ms,  
-    GpibTimeout3ms,  
-    GpibTimeout10ms, 
-    GpibTimeout30ms, 
-    GpibTimeout100ms,
-    GpibTimeout300ms,
-    GpibTimeout1s,   
-    GpibTimeout3s,   
-    GpibTimeout10s,  
-    GpibTimeout30s,  
-    GpibTimeout100s, 
-    GpibTimeout300s, 
-    GpibTimeout1000s
-};
-
-struct Gpib_DCS
-{
-    int m_address1;
-    int m_address2;
-    GpibTimeout m_timeout;
-    bool m_eot;
-    unsigned char m_eosChar;
-    unsigned char m_eosMode;
-    Gpib_DCS();
-    ~Gpib_DCS();
-    char* GetSettings();
-}; 
-
-enum {
-    CTB_GPIB_SETADR = CTB_GPIB,
-    CTB_GPIB_GETRSP,
-    CTB_GPIB_GETSTA,
-    CTB_GPIB_GETERR,
-    CTB_GPIB_GETLINES,
-    CTB_GPIB_SETTIMEOUT,
-    CTB_GPIB_GTL,
-    CTB_GPIB_REN,
-    CTB_GPIB_RESET_BUS,
-    CTB_GPIB_SET_EOS_CHAR,
-    CTB_GPIB_GET_EOS_CHAR,
-    CTB_GPIB_SET_EOS_MODE,
-    CTB_GPIB_GET_EOS_MODE
-};
-
-class GpibDevice : public IOBase
-{
-protected:
-    int m_board;
-    int m_hd;
-    int m_state;
-    int m_error;
-    int m_count;
-    int m_asyncio;
-    Gpib_DCS m_dcs;
-    int CloseDevice();
-    int OpenDevice(const char* devname, void* dcs);
-    virtual const char* GetErrorString(int error,bool detailed);
-public:
-    GpibDevice();
-    virtual ~GpibDevice();
-    const char* ClassName();
-    virtual const char* GetErrorDescription(int error);
-    virtual const char* GetErrorNotation(int error);
-    virtual char* GetSettingsAsString();
-    int Ibrd(char* buf,size_t len);
-    int Ibwrt(char* buf,size_t len);
-    virtual int Ioctl(int cmd,void* args);
-    int IsOpen();
-    int Read(char* buf,size_t len);
-    int Write(char* buf,size_t len);
-
-    static int FindListeners(int board = 0);
-
-};
-
-};
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/iobase.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/iobase.i
deleted file mode 100644
index c6bc452adb..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/iobase.i
+++ /dev/null
@@ -1,59 +0,0 @@
-%{
-#include "ctb-0.16/iobase.h"
-%}
-
-namespace ctb {
-
-enum {
-    CTB_RESET = CTB_COMMON
-};
-
-%typemap(in) char *& readbuf (char * tmp) {
-	/* dont check for list */
-	$1 = &tmp;
-}
-
-%typemap(argout) char *& readbuf {
-	PyObject * plist = PyList_New(2);
-	PyList_SetItem(plist, 0, PyString_FromString(*$1));
-	PyList_SetItem(plist, 1, $result);
-	$result = plist;
-	delete *$1;
-}
-
-%typemap(in) size_t * readedBytes (size_t tmp) {
-	/* dont check for list */
-	$1 = &tmp;
-}
-
-%typemap(argout) size_t * readedBytes {
-     PyList_Append($result, PyInt_FromLong(*$1));
-}
-
-class IOBase
-{
-protected:
-    virtual int CloseDevice() = 0;
-    virtual int OpenDevice(const char* devname, void* dcs = 0L) = 0;
-public:
-    IOBase();
-    virtual ~IOBase();
-
-    virtual const char* ClassName();
-    int Close();
-    virtual int Ioctl(int cmd,void* args);
-    virtual int IsOpen() = 0;
-    int Open(const char* devname,void* dcs=0L);
-    int PutBack(char ch);
-    virtual int Read(char* buf,size_t len) = 0;
-    virtual int ReadUntilEOS(char*& readbuf,
-					    size_t* readedBytes,
-					    char* eosString = "\n",
-					    long timeout_in_ms = 1000L,
-					    char quota = 0);
-    int Readv(char* buf,size_t len,unsigned int timeout_in_ms);
-    virtual int Write(char* buf,size_t len) = 0;
-    int Writev(char* buf,size_t len,unsigned int timeout_in_ms);
-};
-
-};
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/kbhit.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/kbhit.i
deleted file mode 100644
index 7e5b6cddd3..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/kbhit.i
+++ /dev/null
@@ -1,9 +0,0 @@
-%{
-#include "ctb-0.16/kbhit.h"
-%}
-
-namespace ctb {
-
-char GetKey();
-
-};
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/makepy.sh b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/makepy.sh
deleted file mode 100755
index 40b49dfb2e..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/makepy.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-CFLAG=''
-GPIB_SOURCES=''
-GPIB_LIB=''
-GPIB_SUPPORT=''
-
-# the python develop version. Please check the right version of your
-# python developent enviroment
-PYTHON_VERSION='2.6'
-
-for arg in $*; do
-    if [ "$arg" = "USE_GPIB" ]; then
-	   GPIB_SOURCES='../../../src/gpib.cpp' 
-	   GPIB_LIB='-lgpib'
-	   GPIB_SUPPORT='Yes'
-    else
-	   echo '============================================================'
-	   echo 'You run makepy.sh without GPIB support.'
-	   echo 'If you want to create the python wxctb library with'
-	   echo 'GPIB support, rerun the command with:'
-	   echo 'makepy.sh USE_GPIB=1' 
-	   echo '============================================================'
-	   GPIB_SUPPORT='No'
-    fi
-    if [ "$arg" = "USE_DEBUG" ]; then
-	   CFLAG='-g'
-    fi
-done
-
-echo "// This file is created automatically, don't change it!" > wxctb.i
-echo "%module wxctb" >> wxctb.i
-echo "typedef int size_t;" >> wxctb.i
-echo "%include timer.i" >> wxctb.i
-echo "%include serport.i" >> wxctb.i
-echo "%include ../kbhit.i" >> wxctb.i
-if [ "$arg" = "USE_GPIB" ]; then
-    echo "%include ../gpib.i" >> wxctb.i
-fi
-
-echo "swig generates python wrapper files..."
-swig -c++ -Wall -nodefault -python -keyword -new_repr -modern wxctb.i
-
-echo "create shared library wxctb with GPIB=$GPIB_SUPPORT for python"\
-     "$PYTHON_VERSION ..."
-g++ -Wall $CFLAG -shared -I /usr/include/python$PYTHON_VERSION/ \
-    -I ../../../include \
-    wxctb_wrap.cxx  \
-    ../../../src/linux/timer.cpp \
-    ../../../src/linux/serport.cpp \
-    ../../../src/serportx.cpp \
-    ../../../src/kbhit.cpp \
-    ../../../src/iobase.cpp \
-    ../../../src/fifo.cpp \
-    $GPIB_SOURCES \
-    $GPIB_LIB \
-    -o _wxctb.so
-
-echo "copy ctb.py, wxctb.py and _wxctb.so to the module/linux folder..."
-mkdir -p ../../module/linux
-cp ../ctb.py ../../module/linux/
-cp wxctb.py ../../module/linux/
-cp _wxctb.so ../../module/linux/
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/serport.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/serport.i
deleted file mode 100644
index 3150fe9117..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/serport.i
+++ /dev/null
@@ -1,50 +0,0 @@
-%module serport
-
-%{
-#include "ctb-0.16/linux/serport.h"
-%}
-
-%include ../serportx.i
-
-namespace ctb {
-
-%pythoncode {
-COM1 = "/dev/ttyS0"
-COM2 = "/dev/ttyS1"
-COM3 = "/dev/ttyS2"
-COM4 = "/dev/ttyS3"
-COM5 = "/dev/ttyS4"
-COM6 = "/dev/ttyS5"
-COM7 = "/dev/ttyS6"
-COM8 = "/dev/ttyS7"
-COM9 = "/dev/ttyS8"
-};
-
-class SerialPort : public SerialPort_x
-{
-protected:
-    int fd;
-    struct termios t, save_t;
-    struct serial_icounter_struct save_info, last_info;
-    speed_t AdaptBaudrate(int baud);
-    
-    int CloseDevice();
-    int OpenDevice(const char* devname, void* dcs);
-public:
-    SerialPort();
-    ~SerialPort();
-
-    int ChangeLineState(SerialLineState flags);
-    int ClrLineState(SerialLineState flags);
-    int GetLineState();
-    int Ioctl(int cmd,void* args);
-    int IsOpen();
-    int Read(char* buf,size_t len);
-    int SendBreak(int duration);
-    int SetBaudrate(int baudrate);
-    int SetLineState(SerialLineState flags);
-    int SetParityBit( bool parity );
-    int Write(char* buf,size_t len);
-};
-
-};
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/timer.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/timer.i
deleted file mode 100644
index 5709224113..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/timer.i
+++ /dev/null
@@ -1,37 +0,0 @@
-%{
-#include "ctb-0.16/linux/timer.h"
-%}
-
-%include cpointer.i
-
-// lets create new fuctions for pointer handling in python (for int *exitflag)
-%pointer_functions(int, intp);
-
-namespace ctb {
-
-// perhaps we doesn''t need timer_control to export
-// but we need if we want to inherit from timer in python
-struct timer_control
-{
-    unsigned int usecs;
-    int *exitflag;
-    void* (*exitfnc)(void*);
-};
-
-class Timer
-{
-protected:
-    timer_control control;
-    int stopped;
-    pthread_t tid;
-    unsigned int timer_secs;
-public:
-    Timer(unsigned int msec,int* exitflag,void*(*exitfnc)(void*)=NULL);
-    ~Timer();
-    int start();
-    int stop();
-};
-
-void sleepms(unsigned int ms);
-
-};
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/wxctb.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/wxctb.i
deleted file mode 100644
index 7f84b5fb33..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/wxctb.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is created automatically, don't change it!
-%module wxctb
-typedef int size_t;
-%include timer.i
-%include serport.i
-%include ../kbhit.i
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/wxctb.py b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/wxctb.py
deleted file mode 100644
index f9e0d2ee6e..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/wxctb.py
+++ /dev/null
@@ -1,264 +0,0 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.40
-#
-# Do not make changes to this file unless you know what you are doing--modify
-# the SWIG interface file instead.
-
-from sys import version_info
-if version_info >= (2,6,0):
-    def swig_import_helper():
-        from os.path import dirname
-        import imp
-        fp = None
-        try:
-            fp, pathname, description = imp.find_module('_wxctb', [dirname(__file__)])
-        except ImportError:
-            import _wxctb
-            return _wxctb
-        if fp is not None:
-            try:
-                _mod = imp.load_module('_wxctb', fp, pathname, description)
-            finally:
-                fp.close()
-            return _mod
-    _wxctb = swig_import_helper()
-    del swig_import_helper
-else:
-    import _wxctb
-del version_info
-try:
-    _swig_property = property
-except NameError:
-    pass # Python < 2.2 doesn't have 'property'.
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'SwigPyObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError(name)
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-try:
-    _object = object
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-
-
-def _swig_setattr_nondynamic_method(set):
-    def set_attr(self,name,value):
-        if (name == "thisown"): return self.this.own(value)
-        if hasattr(self,name) or (name == "this"):
-            set(self,name,value)
-        else:
-            raise AttributeError("You cannot add attributes to %s" % self)
-    return set_attr
-
-
-
-def new_intp():
-  return _wxctb.new_intp()
-new_intp = _wxctb.new_intp
-
-def copy_intp(*args, **kwargs):
-  return _wxctb.copy_intp(*args, **kwargs)
-copy_intp = _wxctb.copy_intp
-
-def delete_intp(*args, **kwargs):
-  return _wxctb.delete_intp(*args, **kwargs)
-delete_intp = _wxctb.delete_intp
-
-def intp_assign(*args, **kwargs):
-  return _wxctb.intp_assign(*args, **kwargs)
-intp_assign = _wxctb.intp_assign
-
-def intp_value(*args, **kwargs):
-  return _wxctb.intp_value(*args, **kwargs)
-intp_value = _wxctb.intp_value
-class timer_control(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
-    __repr__ = _swig_repr
-    usecs = _swig_property(_wxctb.timer_control_usecs_get, _wxctb.timer_control_usecs_set)
-    exitflag = _swig_property(_wxctb.timer_control_exitflag_get, _wxctb.timer_control_exitflag_set)
-    exitfnc = _swig_property(_wxctb.timer_control_exitfnc_get, _wxctb.timer_control_exitfnc_set)
-timer_control_swigregister = _wxctb.timer_control_swigregister
-timer_control_swigregister(timer_control)
-
-class Timer(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        this = _wxctb.new_Timer(*args, **kwargs)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wxctb.delete_Timer
-    __del__ = lambda self : None;
-    def start(self): return _wxctb.Timer_start(self)
-    def stop(self): return _wxctb.Timer_stop(self)
-Timer_swigregister = _wxctb.Timer_swigregister
-Timer_swigregister(Timer)
-
-
-def sleepms(*args, **kwargs):
-  return _wxctb.sleepms(*args, **kwargs)
-sleepms = _wxctb.sleepms
-CTB_RESET = _wxctb.CTB_RESET
-class IOBase(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined - class is abstract")
-    __repr__ = _swig_repr
-    __swig_destroy__ = _wxctb.delete_IOBase
-    __del__ = lambda self : None;
-    def ClassName(self): return _wxctb.IOBase_ClassName(self)
-    def Close(self): return _wxctb.IOBase_Close(self)
-    def Ioctl(self, *args, **kwargs): return _wxctb.IOBase_Ioctl(self, *args, **kwargs)
-    def IsOpen(self): return _wxctb.IOBase_IsOpen(self)
-    def Open(self, *args, **kwargs): return _wxctb.IOBase_Open(self, *args, **kwargs)
-    def PutBack(self, *args, **kwargs): return _wxctb.IOBase_PutBack(self, *args, **kwargs)
-    def Read(self, *args, **kwargs): return _wxctb.IOBase_Read(self, *args, **kwargs)
-    def ReadUntilEOS(self, *args, **kwargs): return _wxctb.IOBase_ReadUntilEOS(self, *args, **kwargs)
-    def Readv(self, *args, **kwargs): return _wxctb.IOBase_Readv(self, *args, **kwargs)
-    def Write(self, *args, **kwargs): return _wxctb.IOBase_Write(self, *args, **kwargs)
-    def Writev(self, *args, **kwargs): return _wxctb.IOBase_Writev(self, *args, **kwargs)
-IOBase_swigregister = _wxctb.IOBase_swigregister
-IOBase_swigregister(IOBase)
-
-ParityNone = _wxctb.ParityNone
-ParityOdd = _wxctb.ParityOdd
-ParityEven = _wxctb.ParityEven
-ParityMark = _wxctb.ParityMark
-ParitySpace = _wxctb.ParitySpace
-LinestateDcd = _wxctb.LinestateDcd
-LinestateCts = _wxctb.LinestateCts
-LinestateDsr = _wxctb.LinestateDsr
-LinestateDtr = _wxctb.LinestateDtr
-LinestateRing = _wxctb.LinestateRing
-LinestateRts = _wxctb.LinestateRts
-LinestateNull = _wxctb.LinestateNull
-class SerialPort_DCS(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    baud = _swig_property(_wxctb.SerialPort_DCS_baud_get, _wxctb.SerialPort_DCS_baud_set)
-    parity = _swig_property(_wxctb.SerialPort_DCS_parity_get, _wxctb.SerialPort_DCS_parity_set)
-    wordlen = _swig_property(_wxctb.SerialPort_DCS_wordlen_get, _wxctb.SerialPort_DCS_wordlen_set)
-    stopbits = _swig_property(_wxctb.SerialPort_DCS_stopbits_get, _wxctb.SerialPort_DCS_stopbits_set)
-    rtscts = _swig_property(_wxctb.SerialPort_DCS_rtscts_get, _wxctb.SerialPort_DCS_rtscts_set)
-    xonxoff = _swig_property(_wxctb.SerialPort_DCS_xonxoff_get, _wxctb.SerialPort_DCS_xonxoff_set)
-    buf = _swig_property(_wxctb.SerialPort_DCS_buf_get, _wxctb.SerialPort_DCS_buf_set)
-    def __init__(self): 
-        this = _wxctb.new_SerialPort_DCS()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wxctb.delete_SerialPort_DCS
-    __del__ = lambda self : None;
-    def GetSettings(self): return _wxctb.SerialPort_DCS_GetSettings(self)
-SerialPort_DCS_swigregister = _wxctb.SerialPort_DCS_swigregister
-SerialPort_DCS_swigregister(SerialPort_DCS)
-
-class SerialPort_EINFO(object):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    brk = _swig_property(_wxctb.SerialPort_EINFO_brk_get, _wxctb.SerialPort_EINFO_brk_set)
-    frame = _swig_property(_wxctb.SerialPort_EINFO_frame_get, _wxctb.SerialPort_EINFO_frame_set)
-    overrun = _swig_property(_wxctb.SerialPort_EINFO_overrun_get, _wxctb.SerialPort_EINFO_overrun_set)
-    parity = _swig_property(_wxctb.SerialPort_EINFO_parity_get, _wxctb.SerialPort_EINFO_parity_set)
-    def __init__(self): 
-        this = _wxctb.new_SerialPort_EINFO()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wxctb.delete_SerialPort_EINFO
-    __del__ = lambda self : None;
-SerialPort_EINFO_swigregister = _wxctb.SerialPort_EINFO_swigregister
-SerialPort_EINFO_swigregister(SerialPort_EINFO)
-
-CTB_SER_GETEINFO = _wxctb.CTB_SER_GETEINFO
-CTB_SER_GETBRK = _wxctb.CTB_SER_GETBRK
-CTB_SER_GETFRM = _wxctb.CTB_SER_GETFRM
-CTB_SER_GETOVR = _wxctb.CTB_SER_GETOVR
-CTB_SER_GETPAR = _wxctb.CTB_SER_GETPAR
-CTB_SER_GETINQUE = _wxctb.CTB_SER_GETINQUE
-CTB_SER_SETPAR = _wxctb.CTB_SER_SETPAR
-class SerialPort_x(IOBase):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined - class is abstract")
-    __repr__ = _swig_repr
-    __swig_destroy__ = _wxctb.delete_SerialPort_x
-    __del__ = lambda self : None;
-    def ClassName(self): return _wxctb.SerialPort_x_ClassName(self)
-    def ChangeLineState(self, *args, **kwargs): return _wxctb.SerialPort_x_ChangeLineState(self, *args, **kwargs)
-    def ClrLineState(self, *args, **kwargs): return _wxctb.SerialPort_x_ClrLineState(self, *args, **kwargs)
-    def GetLineState(self): return _wxctb.SerialPort_x_GetLineState(self)
-    def GetSettingsAsString(self): return _wxctb.SerialPort_x_GetSettingsAsString(self)
-    def Ioctl(self, *args, **kwargs): return _wxctb.SerialPort_x_Ioctl(self, *args, **kwargs)
-    def SendBreak(self, *args, **kwargs): return _wxctb.SerialPort_x_SendBreak(self, *args, **kwargs)
-    def SetBaudrate(self, *args, **kwargs): return _wxctb.SerialPort_x_SetBaudrate(self, *args, **kwargs)
-    def SetLineState(self, *args, **kwargs): return _wxctb.SerialPort_x_SetLineState(self, *args, **kwargs)
-    def SetParityBit(self, *args, **kwargs): return _wxctb.SerialPort_x_SetParityBit(self, *args, **kwargs)
-    IsStandardRate = staticmethod(_wxctb.SerialPort_x_IsStandardRate)
-SerialPort_x_swigregister = _wxctb.SerialPort_x_swigregister
-SerialPort_x_swigregister(SerialPort_x)
-
-def SerialPort_x_IsStandardRate(*args, **kwargs):
-  return _wxctb.SerialPort_x_IsStandardRate(*args, **kwargs)
-SerialPort_x_IsStandardRate = _wxctb.SerialPort_x_IsStandardRate
-
-COM1 = "/dev/ttyS0"
-COM2 = "/dev/ttyS1"
-COM3 = "/dev/ttyS2"
-COM4 = "/dev/ttyS3"
-COM5 = "/dev/ttyS4"
-COM6 = "/dev/ttyS5"
-COM7 = "/dev/ttyS6"
-COM8 = "/dev/ttyS7"
-COM9 = "/dev/ttyS8"
-
-class SerialPort(SerialPort_x):
-    thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self): 
-        this = _wxctb.new_SerialPort()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wxctb.delete_SerialPort
-    __del__ = lambda self : None;
-    def ChangeLineState(self, *args, **kwargs): return _wxctb.SerialPort_ChangeLineState(self, *args, **kwargs)
-    def ClrLineState(self, *args, **kwargs): return _wxctb.SerialPort_ClrLineState(self, *args, **kwargs)
-    def GetLineState(self): return _wxctb.SerialPort_GetLineState(self)
-    def Ioctl(self, *args, **kwargs): return _wxctb.SerialPort_Ioctl(self, *args, **kwargs)
-    def IsOpen(self): return _wxctb.SerialPort_IsOpen(self)
-    def Read(self, *args, **kwargs): return _wxctb.SerialPort_Read(self, *args, **kwargs)
-    def SendBreak(self, *args, **kwargs): return _wxctb.SerialPort_SendBreak(self, *args, **kwargs)
-    def SetBaudrate(self, *args, **kwargs): return _wxctb.SerialPort_SetBaudrate(self, *args, **kwargs)
-    def SetLineState(self, *args, **kwargs): return _wxctb.SerialPort_SetLineState(self, *args, **kwargs)
-    def SetParityBit(self, *args, **kwargs): return _wxctb.SerialPort_SetParityBit(self, *args, **kwargs)
-    def Write(self, *args, **kwargs): return _wxctb.SerialPort_Write(self, *args, **kwargs)
-SerialPort_swigregister = _wxctb.SerialPort_swigregister
-SerialPort_swigregister(SerialPort)
-
-
-def GetKey():
-  return _wxctb.GetKey()
-GetKey = _wxctb.GetKey
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/wxctb_wrap.cxx b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/wxctb_wrap.cxx
deleted file mode 100644
index c72f220ded..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/linux/wxctb_wrap.cxx
+++ /dev/null
@@ -1,6469 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-#define SWIGPYTHON
-#define SWIG_PYTHON_DIRECTOR_NO_VTABLE
-
-
-#ifdef __cplusplus
-/* SwigValueWrapper is described in swig.swg */
-template<typename T> class SwigValueWrapper {
-  struct SwigMovePointer {
-    T *ptr;
-    SwigMovePointer(T *p) : ptr(p) { }
-    ~SwigMovePointer() { delete ptr; }
-    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
-  } pointer;
-  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
-  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
-public:
-  SwigValueWrapper() : pointer(0) { }
-  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
-  operator T&() const { return *pointer.ptr; }
-  T *operator&() { return pointer.ptr; }
-};
-
-template <typename T> T SwigValueInit() {
-  return T();
-}
-#endif
-
-/* -----------------------------------------------------------------------------
- *  This section contains generic SWIG labels for method/variable
- *  declarations/attributes, and other compiler dependent labels.
- * ----------------------------------------------------------------------------- */
-
-/* template workaround for compilers that cannot correctly implement the C++ standard */
-#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# else
-#  define SWIGTEMPLATEDISAMBIGUATOR
-# endif
-#endif
-
-/* inline attribute */
-#ifndef SWIGINLINE
-# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
-#   define SWIGINLINE inline
-# else
-#   define SWIGINLINE
-# endif
-#endif
-
-/* attribute recognised by some compilers to avoid 'unused' warnings */
-#ifndef SWIGUNUSED
-# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
-#   else
-#     define SWIGUNUSED
-#   endif
-# elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
-# else
-#   define SWIGUNUSED 
-# endif
-#endif
-
-#ifndef SWIG_MSC_UNSUPPRESS_4505
-# if defined(_MSC_VER)
-#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
-#endif
-
-#ifndef SWIGUNUSEDPARM
-# ifdef __cplusplus
-#   define SWIGUNUSEDPARM(p)
-# else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
-# endif
-#endif
-
-/* internal SWIG method */
-#ifndef SWIGINTERN
-# define SWIGINTERN static SWIGUNUSED
-#endif
-
-/* internal inline SWIG method */
-#ifndef SWIGINTERNINLINE
-# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
-#endif
-
-/* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#  ifndef GCC_HASCLASSVISIBILITY
-#    define GCC_HASCLASSVISIBILITY
-#  endif
-#endif
-
-#ifndef SWIGEXPORT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   if defined(STATIC_LINKED)
-#     define SWIGEXPORT
-#   else
-#     define SWIGEXPORT __declspec(dllexport)
-#   endif
-# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGEXPORT __attribute__ ((visibility("default")))
-#   else
-#     define SWIGEXPORT
-#   endif
-# endif
-#endif
-
-/* calling conventions for Windows */
-#ifndef SWIGSTDCALL
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   define SWIGSTDCALL __stdcall
-# else
-#   define SWIGSTDCALL
-# endif 
-#endif
-
-/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
-# define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
-
-
-/* Python.h has to appear first */
-#include <Python.h>
-
-/* -----------------------------------------------------------------------------
- * swigrun.swg
- *
- * This file contains generic C API SWIG runtime support for pointer
- * type checking.
- * ----------------------------------------------------------------------------- */
-
-/* This should only be incremented when either the layout of swig_type_info changes,
-   or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "4"
-
-/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
-#ifdef SWIG_TYPE_TABLE
-# define SWIG_QUOTE_STRING(x) #x
-# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
-# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
-#else
-# define SWIG_TYPE_TABLE_NAME
-#endif
-
-/*
-  You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the SWIG runtime code.
-  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
-  But only do this if strictly necessary, ie, if you have problems
-  with your compiler or suchlike.
-*/
-
-#ifndef SWIGRUNTIME
-# define SWIGRUNTIME SWIGINTERN
-#endif
-
-#ifndef SWIGRUNTIMEINLINE
-# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
-#endif
-
-/*  Generic buffer size */
-#ifndef SWIG_BUFFER_SIZE
-# define SWIG_BUFFER_SIZE 1024
-#endif
-
-/* Flags for pointer conversions */
-#define SWIG_POINTER_DISOWN        0x1
-#define SWIG_CAST_NEW_MEMORY       0x2
-
-/* Flags for new pointer objects */
-#define SWIG_POINTER_OWN           0x1
-
-
-/* 
-   Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return and integer 
-   that tells if the conversion was successful or not. And if not,
-   an error code can be returned (see swigerrors.swg for the codes).
-   
-   Use the following macros/flags to set or process the returning
-   states.
-   
-   In old versions of SWIG, code such as the following was usually written:
-
-     if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
-       // success code
-     } else {
-       //fail code
-     }
-
-   Now you can be more explicit:
-
-    int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
-    if (SWIG_IsOK(res)) {
-      // success code
-    } else {
-      // fail code
-    }
-
-   which is the same really, but now you can also do
-
-    Type *ptr;
-    int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
-    if (SWIG_IsOK(res)) {
-      // success code
-      if (SWIG_IsNewObj(res) {
-        ...
-	delete *ptr;
-      } else {
-        ...
-      }
-    } else {
-      // fail code
-    }
-    
-   I.e., now SWIG_ConvertPtr can return new objects and you can
-   identify the case and take care of the deallocation. Of course that
-   also requires SWIG_ConvertPtr to return new result values, such as
-
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
-      }
-
-   Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
-   more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   SWIG errors code.
-
-   Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-   allows to return the 'cast rank', for example, if you have this
-
-       int food(double)
-       int fooi(int);
-
-   and you call
- 
-      food(1)   // cast rank '1'  (1 -> 1.0)
-      fooi(1)   // cast rank '0'
-
-   just use the SWIG_AddCast()/SWIG_CheckState()
-*/
-
-#define SWIG_OK                    (0) 
-#define SWIG_ERROR                 (-1)
-#define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
-
-/* The CastRankLimit says how many bits are used for the cast rank */
-#define SWIG_CASTRANKLIMIT         (1 << 8)
-/* The NewMask denotes the object was created (using new/malloc) */
-#define SWIG_NEWOBJMASK            (SWIG_CASTRANKLIMIT  << 1)
-/* The TmpMask is for in/out typemaps that use temporal objects */
-#define SWIG_TMPOBJMASK            (SWIG_NEWOBJMASK << 1)
-/* Simple returning values */
-#define SWIG_BADOBJ                (SWIG_ERROR)
-#define SWIG_OLDOBJ                (SWIG_OK)
-#define SWIG_NEWOBJ                (SWIG_OK | SWIG_NEWOBJMASK)
-#define SWIG_TMPOBJ                (SWIG_OK | SWIG_TMPOBJMASK)
-/* Check, add and del mask methods */
-#define SWIG_AddNewMask(r)         (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r)
-#define SWIG_DelNewMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r)
-#define SWIG_IsNewObj(r)           (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK))
-#define SWIG_AddTmpMask(r)         (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r)
-#define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
-#define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
-
-/* Cast-Rank Mode */
-#if defined(SWIG_CASTRANK_MODE)
-#  ifndef SWIG_TypeRank
-#    define SWIG_TypeRank             unsigned long
-#  endif
-#  ifndef SWIG_MAXCASTRANK            /* Default cast allowed */
-#    define SWIG_MAXCASTRANK          (2)
-#  endif
-#  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
-#  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
-  return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
-}
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
-}
-#else /* no cast-rank mode */
-#  define SWIG_AddCast
-#  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
-#endif
-
-
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void *(*swig_converter_func)(void *, int *);
-typedef struct swig_type_info *(*swig_dycast_func)(void **);
-
-/* Structure to store information on one type */
-typedef struct swig_type_info {
-  const char             *name;			/* mangled name of this type */
-  const char             *str;			/* human readable name of this type */
-  swig_dycast_func        dcast;		/* dynamic cast function down a hierarchy */
-  struct swig_cast_info  *cast;			/* linked list of types that can cast into this type */
-  void                   *clientdata;		/* language specific type data */
-  int                    owndata;		/* flag if the structure owns the clientdata */
-} swig_type_info;
-
-/* Structure to store a type and conversion function used for casting */
-typedef struct swig_cast_info {
-  swig_type_info         *type;			/* pointer to type that is equivalent to this type */
-  swig_converter_func     converter;		/* function to cast the void pointers */
-  struct swig_cast_info  *next;			/* pointer to next cast in linked list */
-  struct swig_cast_info  *prev;			/* pointer to the previous cast */
-} swig_cast_info;
-
-/* Structure used to store module information
- * Each module generates one structure like this, and the runtime collects
- * all of these structures and stores them in a circularly linked list.*/
-typedef struct swig_module_info {
-  swig_type_info         **types;		/* Array of pointers to swig_type_info structures that are in this module */
-  size_t                 size;		        /* Number of types in this module */
-  struct swig_module_info *next;		/* Pointer to next element in circularly linked list */
-  swig_type_info         **type_initial;	/* Array of initially generated type structures */
-  swig_cast_info         **cast_initial;	/* Array of initially generated casting structures */
-  void                    *clientdata;		/* Language specific module data */
-} swig_module_info;
-
-/* 
-  Compare two type names skipping the space characters, therefore
-  "char*" == "char *" and "Class<int>" == "Class<int >", etc.
-
-  Return 0 when the two name types are equivalent, as in
-  strncmp, but skipping ' '.
-*/
-SWIGRUNTIME int
-SWIG_TypeNameComp(const char *f1, const char *l1,
-		  const char *f2, const char *l2) {
-  for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
-    while ((*f1 == ' ') && (f1 != l1)) ++f1;
-    while ((*f2 == ' ') && (f2 != l2)) ++f2;
-    if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
-  }
-  return (int)((l1 - f1) - (l2 - f2));
-}
-
-/*
-  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
-*/
-SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
-}
-
-/*
-  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
-*/
-SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
-}
-
-
-/*
-  Check the typename
-*/
-SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  if (ty) {
-    swig_cast_info *iter = ty->cast;
-    while (iter) {
-      if (strcmp(iter->type->name, c) == 0) {
-        if (iter == ty->cast)
-          return iter;
-        /* Move iter to the top of the linked list */
-        iter->prev->next = iter->next;
-        if (iter->next)
-          iter->next->prev = iter->prev;
-        iter->next = ty->cast;
-        iter->prev = 0;
-        if (ty->cast) ty->cast->prev = iter;
-        ty->cast = iter;
-        return iter;
-      }
-      iter = iter->next;
-    }
-  }
-  return 0;
-}
-
-/* 
-  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
-*/
-SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
-  if (ty) {
-    swig_cast_info *iter = ty->cast;
-    while (iter) {
-      if (iter->type == from) {
-        if (iter == ty->cast)
-          return iter;
-        /* Move iter to the top of the linked list */
-        iter->prev->next = iter->next;
-        if (iter->next)
-          iter->next->prev = iter->prev;
-        iter->next = ty->cast;
-        iter->prev = 0;
-        if (ty->cast) ty->cast->prev = iter;
-        ty->cast = iter;
-        return iter;
-      }
-      iter = iter->next;
-    }
-  }
-  return 0;
-}
-
-/*
-  Cast a pointer up an inheritance hierarchy
-*/
-SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
-}
-
-/* 
-   Dynamic pointer casting. Down an inheritance hierarchy
-*/
-SWIGRUNTIME swig_type_info *
-SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) {
-  swig_type_info *lastty = ty;
-  if (!ty || !ty->dcast) return ty;
-  while (ty && (ty->dcast)) {
-    ty = (*ty->dcast)(ptr);
-    if (ty) lastty = ty;
-  }
-  return lastty;
-}
-
-/*
-  Return the name associated with this type
-*/
-SWIGRUNTIMEINLINE const char *
-SWIG_TypeName(const swig_type_info *ty) {
-  return ty->name;
-}
-
-/*
-  Return the pretty name associated with this type,
-  that is an unmangled type name in a form presentable to the user.
-*/
-SWIGRUNTIME const char *
-SWIG_TypePrettyName(const swig_type_info *type) {
-  /* The "str" field contains the equivalent pretty names of the
-     type, separated by vertical-bar characters.  We choose
-     to print the last name, as it is often (?) the most
-     specific. */
-  if (!type) return NULL;
-  if (type->str != NULL) {
-    const char *last_name = type->str;
-    const char *s;
-    for (s = type->str; *s; s++)
-      if (*s == '|') last_name = s+1;
-    return last_name;
-  }
-  else
-    return type->name;
-}
-
-/* 
-   Set the clientdata field for a type
-*/
-SWIGRUNTIME void
-SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
-  swig_cast_info *cast = ti->cast;
-  /* if (ti->clientdata == clientdata) return; */
-  ti->clientdata = clientdata;
-  
-  while (cast) {
-    if (!cast->converter) {
-      swig_type_info *tc = cast->type;
-      if (!tc->clientdata) {
-	SWIG_TypeClientData(tc, clientdata);
-      }
-    }    
-    cast = cast->next;
-  }
-}
-SWIGRUNTIME void
-SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
-  SWIG_TypeClientData(ti, clientdata);
-  ti->owndata = 1;
-}
-  
-/*
-  Search for a swig_type_info structure only by mangled name
-  Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
-  Note: if start == end at the beginning of the function, we go all the way around
-  the circular list.
-*/
-SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
-		            const char *name) {
-  swig_module_info *iter = start;
-  do {
-    if (iter->size) {
-      register size_t l = 0;
-      register size_t r = iter->size - 1;
-      do {
-	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
-	const char *iname = iter->types[i]->name;
-	if (iname) {
-	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
-	    return iter->types[i];
-	  } else if (compare < 0) {
-	    if (i) {
-	      r = i - 1;
-	    } else {
-	      break;
-	    }
-	  } else if (compare > 0) {
-	    l = i + 1;
-	  }
-	} else {
-	  break; /* should never happen */
-	}
-      } while (l <= r);
-    }
-    iter = iter->next;
-  } while (iter != end);
-  return 0;
-}
-
-/*
-  Search for a swig_type_info structure for either a mangled name or a human readable name.
-  It first searches the mangled names of the types, which is a O(log #types)
-  If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
-  Note: if start == end at the beginning of the function, we go all the way around
-  the circular list.
-*/
-SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
-		     const char *name) {
-  /* STEP 1: Search the name field using binary search */
-  swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
-  if (ret) {
-    return ret;
-  } else {
-    /* STEP 2: If the type hasn't been found, do a complete search
-       of the str field (the human readable name) */
-    swig_module_info *iter = start;
-    do {
-      register size_t i = 0;
-      for (; i < iter->size; ++i) {
-	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
-	  return iter->types[i];
-      }
-      iter = iter->next;
-    } while (iter != end);
-  }
-  
-  /* neither found a match */
-  return 0;
-}
-
-/* 
-   Pack binary data into a string
-*/
-SWIGRUNTIME char *
-SWIG_PackData(char *c, void *ptr, size_t sz) {
-  static const char hex[17] = "0123456789abcdef";
-  register const unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu =  u + sz;
-  for (; u != eu; ++u) {
-    register unsigned char uu = *u;
-    *(c++) = hex[(uu & 0xf0) >> 4];
-    *(c++) = hex[uu & 0xf];
-  }
-  return c;
-}
-
-/* 
-   Unpack binary data from a string
-*/
-SWIGRUNTIME const char *
-SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  register unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu = u + sz;
-  for (; u != eu; ++u) {
-    register char d = *(c++);
-    register unsigned char uu;
-    if ((d >= '0') && (d <= '9'))
-      uu = ((d - '0') << 4);
-    else if ((d >= 'a') && (d <= 'f'))
-      uu = ((d - ('a'-10)) << 4);
-    else 
-      return (char *) 0;
-    d = *(c++);
-    if ((d >= '0') && (d <= '9'))
-      uu |= (d - '0');
-    else if ((d >= 'a') && (d <= 'f'))
-      uu |= (d - ('a'-10));
-    else 
-      return (char *) 0;
-    *u = uu;
-  }
-  return c;
-}
-
-/* 
-   Pack 'void *' into a string buffer.
-*/
-SWIGRUNTIME char *
-SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) {
-  char *r = buff;
-  if ((2*sizeof(void *) + 2) > bsz) return 0;
-  *(r++) = '_';
-  r = SWIG_PackData(r,&ptr,sizeof(void *));
-  if (strlen(name) + 1 > (bsz - (r - buff))) return 0;
-  strcpy(r,name);
-  return buff;
-}
-
-SWIGRUNTIME const char *
-SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) {
-  if (*c != '_') {
-    if (strcmp(c,"NULL") == 0) {
-      *ptr = (void *) 0;
-      return name;
-    } else {
-      return 0;
-    }
-  }
-  return SWIG_UnpackData(++c,ptr,sizeof(void *));
-}
-
-SWIGRUNTIME char *
-SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) {
-  char *r = buff;
-  size_t lname = (name ? strlen(name) : 0);
-  if ((2*sz + 2 + lname) > bsz) return 0;
-  *(r++) = '_';
-  r = SWIG_PackData(r,ptr,sz);
-  if (lname) {
-    strncpy(r,name,lname+1);
-  } else {
-    *r = 0;
-  }
-  return buff;
-}
-
-SWIGRUNTIME const char *
-SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
-  if (*c != '_') {
-    if (strcmp(c,"NULL") == 0) {
-      memset(ptr,0,sz);
-      return name;
-    } else {
-      return 0;
-    }
-  }
-  return SWIG_UnpackData(++c,ptr,sz);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-/*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
-#define  SWIG_SystemError    	   -10
-#define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
-#define  SWIG_NullReferenceError   -13
-
-
-
-/* Compatibility macros for Python 3 */
-#if PY_VERSION_HEX >= 0x03000000
-
-#define PyClass_Check(obj) PyObject_IsInstance(obj, (PyObject *)&PyType_Type)
-#define PyInt_Check(x) PyLong_Check(x)
-#define PyInt_AsLong(x) PyLong_AsLong(x)
-#define PyInt_FromLong(x) PyLong_FromLong(x)
-#define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)
-
-#endif
-
-#ifndef Py_TYPE
-#  define Py_TYPE(op) ((op)->ob_type)
-#endif
-
-/* SWIG APIs for compatibility of both Python 2 & 3 */
-
-#if PY_VERSION_HEX >= 0x03000000
-#  define SWIG_Python_str_FromFormat PyUnicode_FromFormat
-#else
-#  define SWIG_Python_str_FromFormat PyString_FromFormat
-#endif
-
-
-/* Warning: This function will allocate a new string in Python 3,
- * so please call SWIG_Python_str_DelForPy3(x) to free the space.
- */
-SWIGINTERN char*
-SWIG_Python_str_AsChar(PyObject *str)
-{
-#if PY_VERSION_HEX >= 0x03000000
-  char *cstr;
-  char *newstr;
-  Py_ssize_t len;
-  str = PyUnicode_AsUTF8String(str);
-  PyBytes_AsStringAndSize(str, &cstr, &len);
-  newstr = (char *) malloc(len+1);
-  memcpy(newstr, cstr, len+1);
-  Py_XDECREF(str);
-  return newstr;
-#else
-  return PyString_AsString(str);
-#endif
-}
-
-#if PY_VERSION_HEX >= 0x03000000
-#  define SWIG_Python_str_DelForPy3(x) free( (void*) (x) )
-#else
-#  define SWIG_Python_str_DelForPy3(x) 
-#endif
-
-
-SWIGINTERN PyObject*
-SWIG_Python_str_FromChar(const char *c)
-{
-#if PY_VERSION_HEX >= 0x03000000
-  return PyUnicode_FromString(c); 
-#else
-  return PyString_FromString(c);
-#endif
-}
-
-/* Add PyOS_snprintf for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
-#  define PyOS_snprintf _snprintf
-# else
-#  define PyOS_snprintf snprintf
-# endif
-#endif
-
-/* A crude PyString_FromFormat implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-
-#ifndef SWIG_PYBUFFER_SIZE
-# define SWIG_PYBUFFER_SIZE 1024
-#endif
-
-static PyObject *
-PyString_FromFormat(const char *fmt, ...) {
-  va_list ap;
-  char buf[SWIG_PYBUFFER_SIZE * 2];
-  int res;
-  va_start(ap, fmt);
-  res = vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-  return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf);
-}
-#endif
-
-/* Add PyObject_Del for old Pythons */
-#if PY_VERSION_HEX < 0x01060000
-# define PyObject_Del(op) PyMem_DEL((op))
-#endif
-#ifndef PyObject_DEL
-# define PyObject_DEL PyObject_Del
-#endif
-
-/* A crude PyExc_StopIteration exception for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# ifndef PyExc_StopIteration
-#  define PyExc_StopIteration PyExc_RuntimeError
-# endif
-# ifndef PyObject_GenericGetAttr
-#  define PyObject_GenericGetAttr 0
-# endif
-#endif
-
-/* Py_NotImplemented is defined in 2.1 and up. */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef Py_NotImplemented
-#  define Py_NotImplemented PyExc_RuntimeError
-# endif
-#endif
-
-/* A crude PyString_AsStringAndSize implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef PyString_AsStringAndSize
-#  define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
-# endif
-#endif
-
-/* PySequence_Size for old Pythons */
-#if PY_VERSION_HEX < 0x02000000
-# ifndef PySequence_Size
-#  define PySequence_Size PySequence_Length
-# endif
-#endif
-
-/* PyBool_FromLong for old Pythons */
-#if PY_VERSION_HEX < 0x02030000
-static
-PyObject *PyBool_FromLong(long ok)
-{
-  PyObject *result = ok ? Py_True : Py_False;
-  Py_INCREF(result);
-  return result;
-}
-#endif
-
-/* Py_ssize_t for old Pythons */
-/* This code is as recommended by: */
-/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-typedef int Py_ssize_t;
-# define PY_SSIZE_T_MAX INT_MAX
-# define PY_SSIZE_T_MIN INT_MIN
-#endif
-
-/* -----------------------------------------------------------------------------
- * error manipulation
- * ----------------------------------------------------------------------------- */
-
-SWIGRUNTIME PyObject*
-SWIG_Python_ErrorType(int code) {
-  PyObject* type = 0;
-  switch(code) {
-  case SWIG_MemoryError:
-    type = PyExc_MemoryError;
-    break;
-  case SWIG_IOError:
-    type = PyExc_IOError;
-    break;
-  case SWIG_RuntimeError:
-    type = PyExc_RuntimeError;
-    break;
-  case SWIG_IndexError:
-    type = PyExc_IndexError;
-    break;
-  case SWIG_TypeError:
-    type = PyExc_TypeError;
-    break;
-  case SWIG_DivisionByZero:
-    type = PyExc_ZeroDivisionError;
-    break;
-  case SWIG_OverflowError:
-    type = PyExc_OverflowError;
-    break;
-  case SWIG_SyntaxError:
-    type = PyExc_SyntaxError;
-    break;
-  case SWIG_ValueError:
-    type = PyExc_ValueError;
-    break;
-  case SWIG_SystemError:
-    type = PyExc_SystemError;
-    break;
-  case SWIG_AttributeError:
-    type = PyExc_AttributeError;
-    break;
-  default:
-    type = PyExc_RuntimeError;
-  }
-  return type;
-}
-
-
-SWIGRUNTIME void
-SWIG_Python_AddErrorMsg(const char* mesg)
-{
-  PyObject *type = 0;
-  PyObject *value = 0;
-  PyObject *traceback = 0;
-
-  if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
-  if (value) {
-    char *tmp;
-    PyObject *old_str = PyObject_Str(value);
-    PyErr_Clear();
-    Py_XINCREF(type);
-
-    PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
-    SWIG_Python_str_DelForPy3(tmp);
-    Py_DECREF(old_str);
-    Py_DECREF(value);
-  } else {
-    PyErr_SetString(PyExc_RuntimeError, mesg);
-  }
-}
-
-#if defined(SWIG_PYTHON_NO_THREADS)
-#  if defined(SWIG_PYTHON_THREADS)
-#    undef SWIG_PYTHON_THREADS
-#  endif
-#endif
-#if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */
-#  if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL)
-#    if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */
-#      define SWIG_PYTHON_USE_GIL
-#    endif
-#  endif
-#  if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
-#    ifndef SWIG_PYTHON_INITIALIZE_THREADS
-#     define SWIG_PYTHON_INITIALIZE_THREADS  PyEval_InitThreads() 
-#    endif
-#    ifdef __cplusplus /* C++ code */
-       class SWIG_Python_Thread_Block {
-         bool status;
-         PyGILState_STATE state;
-       public:
-         void end() { if (status) { PyGILState_Release(state); status = false;} }
-         SWIG_Python_Thread_Block() : status(true), state(PyGILState_Ensure()) {}
-         ~SWIG_Python_Thread_Block() { end(); }
-       };
-       class SWIG_Python_Thread_Allow {
-         bool status;
-         PyThreadState *save;
-       public:
-         void end() { if (status) { PyEval_RestoreThread(save); status = false; }}
-         SWIG_Python_Thread_Allow() : status(true), save(PyEval_SaveThread()) {}
-         ~SWIG_Python_Thread_Allow() { end(); }
-       };
-#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   SWIG_Python_Thread_Block _swig_thread_block
-#      define SWIG_PYTHON_THREAD_END_BLOCK     _swig_thread_block.end()
-#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   SWIG_Python_Thread_Allow _swig_thread_allow
-#      define SWIG_PYTHON_THREAD_END_ALLOW     _swig_thread_allow.end()
-#    else /* C code */
-#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   PyGILState_STATE _swig_thread_block = PyGILState_Ensure()
-#      define SWIG_PYTHON_THREAD_END_BLOCK     PyGILState_Release(_swig_thread_block)
-#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   PyThreadState *_swig_thread_allow = PyEval_SaveThread()
-#      define SWIG_PYTHON_THREAD_END_ALLOW     PyEval_RestoreThread(_swig_thread_allow)
-#    endif
-#  else /* Old thread way, not implemented, user must provide it */
-#    if !defined(SWIG_PYTHON_INITIALIZE_THREADS)
-#      define SWIG_PYTHON_INITIALIZE_THREADS
-#    endif
-#    if !defined(SWIG_PYTHON_THREAD_BEGIN_BLOCK)
-#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK
-#    endif
-#    if !defined(SWIG_PYTHON_THREAD_END_BLOCK)
-#      define SWIG_PYTHON_THREAD_END_BLOCK
-#    endif
-#    if !defined(SWIG_PYTHON_THREAD_BEGIN_ALLOW)
-#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW
-#    endif
-#    if !defined(SWIG_PYTHON_THREAD_END_ALLOW)
-#      define SWIG_PYTHON_THREAD_END_ALLOW
-#    endif
-#  endif
-#else /* No thread support */
-#  define SWIG_PYTHON_INITIALIZE_THREADS
-#  define SWIG_PYTHON_THREAD_BEGIN_BLOCK
-#  define SWIG_PYTHON_THREAD_END_BLOCK
-#  define SWIG_PYTHON_THREAD_BEGIN_ALLOW
-#  define SWIG_PYTHON_THREAD_END_ALLOW
-#endif
-
-/* -----------------------------------------------------------------------------
- * Python API portion that goes into the runtime
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#if 0
-} /* cc-mode */
-#endif
-#endif
-
-/* -----------------------------------------------------------------------------
- * Constant declarations
- * ----------------------------------------------------------------------------- */
-
-/* Constant Types */
-#define SWIG_PY_POINTER 4
-#define SWIG_PY_BINARY  5
-
-/* Constant information structure */
-typedef struct swig_const_info {
-  int type;
-  char *name;
-  long lvalue;
-  double dvalue;
-  void   *pvalue;
-  swig_type_info **ptype;
-} swig_const_info;
-
-
-/* -----------------------------------------------------------------------------
- * Wrapper of PyInstanceMethod_New() used in Python 3
- * It is exported to the generated module, used for -fastproxy
- * ----------------------------------------------------------------------------- */
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
-{
-#if PY_VERSION_HEX >= 0x03000000
-  return PyInstanceMethod_New(func);
-#else
-  return NULL;
-#endif
-}
-
-#ifdef __cplusplus
-#if 0
-{ /* cc-mode */
-#endif
-}
-#endif
-
-
-/* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
- * pyrun.swg
- *
- * This file contains the runtime support for Python modules
- * and includes code for managing global variables and pointer
- * type checking.
- *
- * ----------------------------------------------------------------------------- */
-
-/* Common SWIG API */
-
-/* for raw pointers */
-#define SWIG_Python_ConvertPtr(obj, pptr, type, flags)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
-#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Python_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(ptr, type, flags)
-#define SWIG_CheckImplicit(ty)                          SWIG_Python_CheckImplicit(ty) 
-#define SWIG_AcquirePtr(ptr, src)                       SWIG_Python_AcquirePtr(ptr, src)
-#define swig_owntype                                    int
-
-/* for raw packed data */
-#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewPackedObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
-
-/* for class or struct pointers */
-#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_ConvertPtr(obj, pptr, type, flags)
-#define SWIG_NewInstanceObj(ptr, type, flags)           SWIG_NewPointerObj(ptr, type, flags)
-
-/* for C or C++ function pointers */
-#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_Python_ConvertFunctionPtr(obj, pptr, type)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Python_NewPointerObj(ptr, type, 0)
-
-/* for C++ member pointers, ie, member methods */
-#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
-#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
-
-
-/* Runtime API */
-
-#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule()
-#define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
-#define SWIG_NewClientData(obj)                         SwigPyClientData_New(obj)
-
-#define SWIG_SetErrorObj                                SWIG_Python_SetErrorObj                            
-#define SWIG_SetErrorMsg                        	SWIG_Python_SetErrorMsg				   
-#define SWIG_ErrorType(code)                    	SWIG_Python_ErrorType(code)                        
-#define SWIG_Error(code, msg)            		SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) 
-#define SWIG_fail                        		goto fail					   
-
-
-/* Runtime API implementation */
-
-/* Error manipulation */
-
-SWIGINTERN void 
-SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) {
-  SWIG_PYTHON_THREAD_BEGIN_BLOCK; 
-  PyErr_SetObject(errtype, obj);
-  Py_DECREF(obj);
-  SWIG_PYTHON_THREAD_END_BLOCK;
-}
-
-SWIGINTERN void 
-SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
-  SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-  PyErr_SetString(errtype, (char *) msg);
-  SWIG_PYTHON_THREAD_END_BLOCK;
-}
-
-#define SWIG_Python_Raise(obj, type, desc)  SWIG_Python_SetErrorObj(SWIG_Python_ExceptionType(desc), obj)
-
-/* Set a constant value */
-
-SWIGINTERN void
-SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
-  PyDict_SetItemString(d, (char*) name, obj);
-  Py_DECREF(obj);                            
-}
-
-/* Append a value to the result obj */
-
-SWIGINTERN PyObject*
-SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
-#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
-  if (!result) {
-    result = obj;
-  } else if (result == Py_None) {
-    Py_DECREF(result);
-    result = obj;
-  } else {
-    if (!PyList_Check(result)) {
-      PyObject *o2 = result;
-      result = PyList_New(1);
-      PyList_SetItem(result, 0, o2);
-    }
-    PyList_Append(result,obj);
-    Py_DECREF(obj);
-  }
-  return result;
-#else
-  PyObject*   o2;
-  PyObject*   o3;
-  if (!result) {
-    result = obj;
-  } else if (result == Py_None) {
-    Py_DECREF(result);
-    result = obj;
-  } else {
-    if (!PyTuple_Check(result)) {
-      o2 = result;
-      result = PyTuple_New(1);
-      PyTuple_SET_ITEM(result, 0, o2);
-    }
-    o3 = PyTuple_New(1);
-    PyTuple_SET_ITEM(o3, 0, obj);
-    o2 = result;
-    result = PySequence_Concat(o2, o3);
-    Py_DECREF(o2);
-    Py_DECREF(o3);
-  }
-  return result;
-#endif
-}
-
-/* Unpack the argument tuple */
-
-SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
-{
-  if (!args) {
-    if (!min && !max) {
-      return 1;
-    } else {
-      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-		   name, (min == max ? "" : "at least "), (int)min);
-      return 0;
-    }
-  }  
-  if (!PyTuple_Check(args)) {
-    PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
-    return 0;
-  } else {
-    register Py_ssize_t l = PyTuple_GET_SIZE(args);
-    if (l < min) {
-      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at least "), (int)min, (int)l);
-      return 0;
-    } else if (l > max) {
-      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at most "), (int)max, (int)l);
-      return 0;
-    } else {
-      register int i;
-      for (i = 0; i < l; ++i) {
-	objs[i] = PyTuple_GET_ITEM(args, i);
-      }
-      for (; l < max; ++l) {
-	objs[l] = 0;
-      }
-      return i + 1;
-    }    
-  }
-}
-
-/* A functor is a function object with one single object argument */
-#if PY_VERSION_HEX >= 0x02020000
-#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunctionObjArgs(functor, obj, NULL);
-#else
-#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunction(functor, "O", obj);
-#endif
-
-/*
-  Helper for static pointer initialization for both C and C++ code, for example
-  static PyObject *SWIG_STATIC_POINTER(MyVar) = NewSomething(...);
-*/
-#ifdef __cplusplus
-#define SWIG_STATIC_POINTER(var)  var
-#else
-#define SWIG_STATIC_POINTER(var)  var = 0; if (!var) var
-#endif
-
-/* -----------------------------------------------------------------------------
- * Pointer declarations
- * ----------------------------------------------------------------------------- */
-
-/* Flags for new pointer objects */
-#define SWIG_POINTER_NOSHADOW       (SWIG_POINTER_OWN      << 1)
-#define SWIG_POINTER_NEW            (SWIG_POINTER_NOSHADOW | SWIG_POINTER_OWN)
-
-#define SWIG_POINTER_IMPLICIT_CONV  (SWIG_POINTER_DISOWN   << 1)
-
-#ifdef __cplusplus
-extern "C" {
-#if 0
-} /* cc-mode */
-#endif
-#endif
-
-/*  How to access Py_None */
-#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  ifndef SWIG_PYTHON_NO_BUILD_NONE
-#    ifndef SWIG_PYTHON_BUILD_NONE
-#      define SWIG_PYTHON_BUILD_NONE
-#    endif
-#  endif
-#endif
-
-#ifdef SWIG_PYTHON_BUILD_NONE
-#  ifdef Py_None
-#   undef Py_None
-#   define Py_None SWIG_Py_None()
-#  endif
-SWIGRUNTIMEINLINE PyObject * 
-_SWIG_Py_None(void)
-{
-  PyObject *none = Py_BuildValue((char*)"");
-  Py_DECREF(none);
-  return none;
-}
-SWIGRUNTIME PyObject * 
-SWIG_Py_None(void)
-{
-  static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
-  return none;
-}
-#endif
-
-/* The python void return value */
-
-SWIGRUNTIMEINLINE PyObject * 
-SWIG_Py_Void(void)
-{
-  PyObject *none = Py_None;
-  Py_INCREF(none);
-  return none;
-}
-
-/* SwigPyClientData */
-
-typedef struct {
-  PyObject *klass;
-  PyObject *newraw;
-  PyObject *newargs;
-  PyObject *destroy;
-  int delargs;
-  int implicitconv;
-} SwigPyClientData;
-
-SWIGRUNTIMEINLINE int 
-SWIG_Python_CheckImplicit(swig_type_info *ty)
-{
-  SwigPyClientData *data = (SwigPyClientData *)ty->clientdata;
-  return data ? data->implicitconv : 0;
-}
-
-SWIGRUNTIMEINLINE PyObject *
-SWIG_Python_ExceptionType(swig_type_info *desc) {
-  SwigPyClientData *data = desc ? (SwigPyClientData *) desc->clientdata : 0;
-  PyObject *klass = data ? data->klass : 0;
-  return (klass ? klass : PyExc_RuntimeError);
-}
-
-
-SWIGRUNTIME SwigPyClientData * 
-SwigPyClientData_New(PyObject* obj)
-{
-  if (!obj) {
-    return 0;
-  } else {
-    SwigPyClientData *data = (SwigPyClientData *)malloc(sizeof(SwigPyClientData));
-    /* the klass element */
-    data->klass = obj;
-    Py_INCREF(data->klass);
-    /* the newraw method and newargs arguments used to create a new raw instance */
-    if (PyClass_Check(obj)) {
-      data->newraw = 0;
-      data->newargs = obj;
-      Py_INCREF(obj);
-    } else {
-#if (PY_VERSION_HEX < 0x02020000)
-      data->newraw = 0;
-#else
-      data->newraw = PyObject_GetAttrString(data->klass, (char *)"__new__");
-#endif
-      if (data->newraw) {
-	Py_INCREF(data->newraw);
-	data->newargs = PyTuple_New(1);
-	PyTuple_SetItem(data->newargs, 0, obj);
-      } else {
-	data->newargs = obj;
-      }
-      Py_INCREF(data->newargs);
-    }
-    /* the destroy method, aka as the C++ delete method */
-    data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__");
-    if (PyErr_Occurred()) {
-      PyErr_Clear();
-      data->destroy = 0;
-    }
-    if (data->destroy) {
-      int flags;
-      Py_INCREF(data->destroy);
-      flags = PyCFunction_GET_FLAGS(data->destroy);
-#ifdef METH_O
-      data->delargs = !(flags & (METH_O));
-#else
-      data->delargs = 0;
-#endif
-    } else {
-      data->delargs = 0;
-    }
-    data->implicitconv = 0;
-    return data;
-  }
-}
-
-SWIGRUNTIME void 
-SwigPyClientData_Del(SwigPyClientData* data)
-{
-  Py_XDECREF(data->newraw);
-  Py_XDECREF(data->newargs);
-  Py_XDECREF(data->destroy);
-}
-
-/* =============== SwigPyObject =====================*/
-
-typedef struct {
-  PyObject_HEAD
-  void *ptr;
-  swig_type_info *ty;
-  int own;
-  PyObject *next;
-} SwigPyObject;
-
-SWIGRUNTIME PyObject *
-SwigPyObject_long(SwigPyObject *v)
-{
-  return PyLong_FromVoidPtr(v->ptr);
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_format(const char* fmt, SwigPyObject *v)
-{
-  PyObject *res = NULL;
-  PyObject *args = PyTuple_New(1);
-  if (args) {
-    if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) {
-      PyObject *ofmt = SWIG_Python_str_FromChar(fmt);
-      if (ofmt) {
-#if PY_VERSION_HEX >= 0x03000000
-	res = PyUnicode_Format(ofmt,args);
-#else
-	res = PyString_Format(ofmt,args);
-#endif
-	Py_DECREF(ofmt);
-      }
-      Py_DECREF(args);
-    }
-  }
-  return res;
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_oct(SwigPyObject *v)
-{
-  return SwigPyObject_format("%o",v);
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_hex(SwigPyObject *v)
-{
-  return SwigPyObject_format("%x",v);
-}
-
-SWIGRUNTIME PyObject *
-#ifdef METH_NOARGS
-SwigPyObject_repr(SwigPyObject *v)
-#else
-SwigPyObject_repr(SwigPyObject *v, PyObject *args)
-#endif
-{
-  const char *name = SWIG_TypePrettyName(v->ty);
-  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, v);
-  if (v->next) {
-#ifdef METH_NOARGS
-    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
-#else
-    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
-#endif
-#if PY_VERSION_HEX >= 0x03000000
-    PyObject *joined = PyUnicode_Concat(repr, nrep);
-    Py_DecRef(repr);
-    Py_DecRef(nrep);
-    repr = joined;
-#else
-    PyString_ConcatAndDel(&repr,nrep);
-#endif
-  }
-  return repr;  
-}
-
-SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
-SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
-{
-  void *i = v->ptr;
-  void *j = w->ptr;
-  return (i < j) ? -1 : ((i > j) ? 1 : 0);
-}
-
-/* Added for Python 3.x, would it also be useful for Python 2.x? */
-SWIGRUNTIME PyObject*
-SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op)
-{
-  PyObject* res;
-  if( op != Py_EQ && op != Py_NE ) {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-  if( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) )
-    res = Py_True;
-  else
-    res = Py_False;
-  Py_INCREF(res);
-  return res;  
-}
-
-
-SWIGRUNTIME PyTypeObject* _PySwigObject_type(void);
-
-SWIGRUNTIME PyTypeObject*
-SwigPyObject_type(void) {
-  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type();
-  return type;
-}
-
-SWIGRUNTIMEINLINE int
-SwigPyObject_Check(PyObject *op) {
-  return (Py_TYPE(op) == SwigPyObject_type())
-    || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0);
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_New(void *ptr, swig_type_info *ty, int own);
-
-SWIGRUNTIME void
-SwigPyObject_dealloc(PyObject *v)
-{
-  SwigPyObject *sobj = (SwigPyObject *) v;
-  PyObject *next = sobj->next;
-  if (sobj->own == SWIG_POINTER_OWN) {
-    swig_type_info *ty = sobj->ty;
-    SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
-    PyObject *destroy = data ? data->destroy : 0;
-    if (destroy) {
-      /* destroy is always a VARARGS method */
-      PyObject *res;
-      if (data->delargs) {
-	/* we need to create a temporary object to carry the destroy operation */
-	PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0);
-	res = SWIG_Python_CallFunctor(destroy, tmp);
-	Py_DECREF(tmp);
-      } else {
-	PyCFunction meth = PyCFunction_GET_FUNCTION(destroy);
-	PyObject *mself = PyCFunction_GET_SELF(destroy);
-	res = ((*meth)(mself, v));
-      }
-      Py_XDECREF(res);
-    } 
-#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-    else {
-      const char *name = SWIG_TypePrettyName(ty);
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
-    }
-#endif
-  } 
-  Py_XDECREF(next);
-  PyObject_DEL(v);
-}
-
-SWIGRUNTIME PyObject* 
-SwigPyObject_append(PyObject* v, PyObject* next)
-{
-  SwigPyObject *sobj = (SwigPyObject *) v;
-#ifndef METH_O
-  PyObject *tmp = 0;
-  if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
-  next = tmp;
-#endif
-  if (!SwigPyObject_Check(next)) {
-    return NULL;
-  }
-  sobj->next = next;
-  Py_INCREF(next);
-  return SWIG_Py_Void();
-}
-
-SWIGRUNTIME PyObject* 
-#ifdef METH_NOARGS
-SwigPyObject_next(PyObject* v)
-#else
-SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
-{
-  SwigPyObject *sobj = (SwigPyObject *) v;
-  if (sobj->next) {    
-    Py_INCREF(sobj->next);
-    return sobj->next;
-  } else {
-    return SWIG_Py_Void();
-  }
-}
-
-SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_disown(PyObject *v)
-#else
-SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
-{
-  SwigPyObject *sobj = (SwigPyObject *)v;
-  sobj->own = 0;
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_acquire(PyObject *v)
-#else
-SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
-{
-  SwigPyObject *sobj = (SwigPyObject *)v;
-  sobj->own = SWIG_POINTER_OWN;
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject*
-SwigPyObject_own(PyObject *v, PyObject *args)
-{
-  PyObject *val = 0;
-#if (PY_VERSION_HEX < 0x02020000)
-  if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
-#else
-  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
-#endif
-    {
-      return NULL;
-    } 
-  else
-    {
-      SwigPyObject *sobj = (SwigPyObject *)v;
-      PyObject *obj = PyBool_FromLong(sobj->own);
-      if (val) {
-#ifdef METH_NOARGS
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v);
-	} else {
-	  SwigPyObject_disown(v);
-	}
-#else
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v,args);
-	} else {
-	  SwigPyObject_disown(v,args);
-	}
-#endif
-      } 
-      return obj;
-    }
-}
-
-#ifdef METH_O
-static PyMethodDef
-swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
-  {0, 0, 0, 0}  
-};
-#else
-static PyMethodDef
-swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
-  {0, 0, 0, 0}  
-};
-#endif
-
-#if PY_VERSION_HEX < 0x02020000
-SWIGINTERN PyObject *
-SwigPyObject_getattr(SwigPyObject *sobj,char *name)
-{
-  return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
-}
-#endif
-
-SWIGRUNTIME PyTypeObject*
-_PySwigObject_type(void) {
-  static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
-  
-  static PyNumberMethods SwigPyObject_as_number = {
-    (binaryfunc)0, /*nb_add*/
-    (binaryfunc)0, /*nb_subtract*/
-    (binaryfunc)0, /*nb_multiply*/
-    /* nb_divide removed in Python 3 */
-#if PY_VERSION_HEX < 0x03000000
-    (binaryfunc)0, /*nb_divide*/
-#endif
-    (binaryfunc)0, /*nb_remainder*/
-    (binaryfunc)0, /*nb_divmod*/
-    (ternaryfunc)0,/*nb_power*/
-    (unaryfunc)0,  /*nb_negative*/
-    (unaryfunc)0,  /*nb_positive*/
-    (unaryfunc)0,  /*nb_absolute*/
-    (inquiry)0,    /*nb_nonzero*/
-    0,		   /*nb_invert*/
-    0,		   /*nb_lshift*/
-    0,		   /*nb_rshift*/
-    0,		   /*nb_and*/
-    0,		   /*nb_xor*/
-    0,		   /*nb_or*/
-#if PY_VERSION_HEX < 0x03000000
-    0,   /*nb_coerce*/
-#endif
-    (unaryfunc)SwigPyObject_long, /*nb_int*/
-#if PY_VERSION_HEX < 0x03000000
-    (unaryfunc)SwigPyObject_long, /*nb_long*/
-#else
-    0, /*nb_reserved*/
-#endif
-    (unaryfunc)0,                 /*nb_float*/
-#if PY_VERSION_HEX < 0x03000000
-    (unaryfunc)SwigPyObject_oct,  /*nb_oct*/
-    (unaryfunc)SwigPyObject_hex,  /*nb_hex*/
-#endif
-#if PY_VERSION_HEX >= 0x03000000 /* 3.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */
-#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
-#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
-#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
-    0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
-#endif
-  };
-
-  static PyTypeObject swigpyobject_type;  
-  static int type_init = 0;
-  if (!type_init) {
-    const PyTypeObject tmp
-      = {
-	/* PyObject header changed in Python 3 */
-#if PY_VERSION_HEX >= 0x03000000
-	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-#else    
-	PyObject_HEAD_INIT(NULL)
-	0,				    /* ob_size */
-#endif
-	(char *)"SwigPyObject",		    /* tp_name */
-	sizeof(SwigPyObject),		    /* tp_basicsize */
-	0,			            /* tp_itemsize */
-	(destructor)SwigPyObject_dealloc,   /* tp_dealloc */
-	(printfunc)SwigPyObject_print,	    /* tp_print */
-#if PY_VERSION_HEX < 0x02020000
-	(getattrfunc)SwigPyObject_getattr,  /* tp_getattr */ 
-#else
-	(getattrfunc)0,			    /* tp_getattr */ 
-#endif
-	(setattrfunc)0,			    /* tp_setattr */ 
-#if PY_VERSION_HEX >= 0x03000000
-    0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
-#else
-	(cmpfunc)SwigPyObject_compare,	    /* tp_compare */
-#endif
-	(reprfunc)SwigPyObject_repr,	    /* tp_repr */    
-	&SwigPyObject_as_number,	    /* tp_as_number */
-	0,				    /* tp_as_sequence */
-	0,				    /* tp_as_mapping */
-	(hashfunc)0,			    /* tp_hash */
-	(ternaryfunc)0,			    /* tp_call */
-	(reprfunc)SwigPyObject_str,	    /* tp_str */
-	PyObject_GenericGetAttr,            /* tp_getattro */
-	0,				    /* tp_setattro */
-	0,		                    /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
-	swigobject_doc, 	            /* tp_doc */        
-	0,                                  /* tp_traverse */
-	0,                                  /* tp_clear */
-	(richcmpfunc)SwigPyObject_richcompare,           /* tp_richcompare */
-	0,                                  /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
-	0,                                  /* tp_iter */
-	0,                                  /* tp_iternext */
-	swigobject_methods,		    /* tp_methods */ 
-	0,			            /* tp_members */
-	0,				    /* tp_getset */	    	
-	0,			            /* tp_base */	        
-	0,				    /* tp_dict */	    	
-	0,				    /* tp_descr_get */  	
-	0,				    /* tp_descr_set */  	
-	0,				    /* tp_dictoffset */ 	
-	0,				    /* tp_init */	    	
-	0,				    /* tp_alloc */	    	
-	0,			            /* tp_new */	    	
-	0,	                            /* tp_free */	   
-	0,                                  /* tp_is_gc */  
-	0,				    /* tp_bases */   
-	0,				    /* tp_mro */
-	0,				    /* tp_cache */   
-	0,				    /* tp_subclasses */
-	0,				    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
-	0,                                  /* tp_del */
-#endif
-#ifdef COUNT_ALLOCS
-	0,0,0,0                             /* tp_alloc -> tp_next */
-#endif
-      };
-    swigpyobject_type = tmp;
-    /* for Python 3 we already assigned ob_type in PyVarObject_HEAD_INIT() */
-#if PY_VERSION_HEX < 0x03000000
-    swigpyobject_type.ob_type = &PyType_Type;
-#endif
-    type_init = 1;
-  }
-  return &swigpyobject_type;
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_New(void *ptr, swig_type_info *ty, int own)
-{
-  SwigPyObject *sobj = PyObject_NEW(SwigPyObject, SwigPyObject_type());
-  if (sobj) {
-    sobj->ptr  = ptr;
-    sobj->ty   = ty;
-    sobj->own  = own;
-    sobj->next = 0;
-  }
-  return (PyObject *)sobj;
-}
-
-/* -----------------------------------------------------------------------------
- * Implements a simple Swig Packed type, and use it instead of string
- * ----------------------------------------------------------------------------- */
-
-typedef struct {
-  PyObject_HEAD
-  void *pack;
-  swig_type_info *ty;
-  size_t size;
-} SwigPyPacked;
-
-SWIGRUNTIME int
-SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char result[SWIG_BUFFER_SIZE];
-  fputs("<Swig Packed ", fp); 
-  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    fputs("at ", fp); 
-    fputs(result, fp); 
-  }
-  fputs(v->ty->name,fp); 
-  fputs(">", fp);
-  return 0; 
-}
-  
-SWIGRUNTIME PyObject *
-SwigPyPacked_repr(SwigPyPacked *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    return SWIG_Python_str_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
-  } else {
-    return SWIG_Python_str_FromFormat("<Swig Packed %s>", v->ty->name);
-  }  
-}
-
-SWIGRUNTIME PyObject *
-SwigPyPacked_str(SwigPyPacked *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
-    return SWIG_Python_str_FromFormat("%s%s", result, v->ty->name);
-  } else {
-    return SWIG_Python_str_FromChar(v->ty->name);
-  }  
-}
-
-SWIGRUNTIME int
-SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
-{
-  size_t i = v->size;
-  size_t j = w->size;
-  int s = (i < j) ? -1 : ((i > j) ? 1 : 0);
-  return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
-}
-
-SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void);
-
-SWIGRUNTIME PyTypeObject*
-SwigPyPacked_type(void) {
-  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type();
-  return type;
-}
-
-SWIGRUNTIMEINLINE int
-SwigPyPacked_Check(PyObject *op) {
-  return ((op)->ob_type == _PySwigPacked_type()) 
-    || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0);
-}
-
-SWIGRUNTIME void
-SwigPyPacked_dealloc(PyObject *v)
-{
-  if (SwigPyPacked_Check(v)) {
-    SwigPyPacked *sobj = (SwigPyPacked *) v;
-    free(sobj->pack);
-  }
-  PyObject_DEL(v);
-}
-
-SWIGRUNTIME PyTypeObject*
-_PySwigPacked_type(void) {
-  static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
-  static PyTypeObject swigpypacked_type;
-  static int type_init = 0;  
-  if (!type_init) {
-    const PyTypeObject tmp
-      = {
-    /* PyObject header changed in Python 3 */
-#if PY_VERSION_HEX>=0x03000000
-    PyVarObject_HEAD_INIT(&PyType_Type, 0)
-#else
-	PyObject_HEAD_INIT(NULL)
-    0,				    /* ob_size */	
-#endif
-	(char *)"SwigPyPacked",		    /* tp_name */	
-	sizeof(SwigPyPacked),		    /* tp_basicsize */	
-	0,				    /* tp_itemsize */	
-	(destructor)SwigPyPacked_dealloc,   /* tp_dealloc */	
-	(printfunc)SwigPyPacked_print,	    /* tp_print */   	
-	(getattrfunc)0,			    /* tp_getattr */ 	
-	(setattrfunc)0,			    /* tp_setattr */ 	
-#if PY_VERSION_HEX>=0x03000000
-    0, /* tp_reserved in 3.0.1 */
-#else
-    (cmpfunc)SwigPyPacked_compare,	    /* tp_compare */
-#endif
-	(reprfunc)SwigPyPacked_repr,	    /* tp_repr */
-	0,	                            /* tp_as_number */
-	0,				    /* tp_as_sequence */
-	0,				    /* tp_as_mapping */
-	(hashfunc)0,			    /* tp_hash */
-	(ternaryfunc)0,			    /* tp_call */
-	(reprfunc)SwigPyPacked_str,	    /* tp_str */
-	PyObject_GenericGetAttr,            /* tp_getattro */
-	0,				    /* tp_setattro */
-	0,		                    /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
-	swigpacked_doc, 	            /* tp_doc */
-	0,                                  /* tp_traverse */
-	0,                                  /* tp_clear */
-	0,                                  /* tp_richcompare */
-	0,                                  /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
-	0,                                  /* tp_iter */
-	0,                                  /* tp_iternext */
-	0,		                    /* tp_methods */ 
-	0,			            /* tp_members */
-	0,				    /* tp_getset */	    	
-	0,			            /* tp_base */	        
-	0,				    /* tp_dict */	    	
-	0,				    /* tp_descr_get */  	
-	0,				    /* tp_descr_set */  	
-	0,				    /* tp_dictoffset */ 	
-	0,				    /* tp_init */	    	
-	0,				    /* tp_alloc */	    	
-	0,			            /* tp_new */	    	
-	0, 	                            /* tp_free */	   
-        0,                                  /* tp_is_gc */  
-	0,				    /* tp_bases */   
-	0,				    /* tp_mro */
-	0,				    /* tp_cache */   
- 	0,				    /* tp_subclasses */
-	0,				    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
-	0,                                  /* tp_del */
-#endif
-#ifdef COUNT_ALLOCS
-	0,0,0,0                             /* tp_alloc -> tp_next */
-#endif
-      };
-    swigpypacked_type = tmp;
-    /* for Python 3 the ob_type already assigned in PyVarObject_HEAD_INIT() */
-#if PY_VERSION_HEX < 0x03000000
-    swigpypacked_type.ob_type = &PyType_Type;
-#endif
-    type_init = 1;
-  }
-  return &swigpypacked_type;
-}
-
-SWIGRUNTIME PyObject *
-SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty)
-{
-  SwigPyPacked *sobj = PyObject_NEW(SwigPyPacked, SwigPyPacked_type());
-  if (sobj) {
-    void *pack = malloc(size);
-    if (pack) {
-      memcpy(pack, ptr, size);
-      sobj->pack = pack;
-      sobj->ty   = ty;
-      sobj->size = size;
-    } else {
-      PyObject_DEL((PyObject *) sobj);
-      sobj = 0;
-    }
-  }
-  return (PyObject *) sobj;
-}
-
-SWIGRUNTIME swig_type_info *
-SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
-{
-  if (SwigPyPacked_Check(obj)) {
-    SwigPyPacked *sobj = (SwigPyPacked *)obj;
-    if (sobj->size != size) return 0;
-    memcpy(ptr, sobj->pack, size);
-    return sobj->ty;
-  } else {
-    return 0;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * pointers/data manipulation
- * ----------------------------------------------------------------------------- */
-
-SWIGRUNTIMEINLINE PyObject *
-_SWIG_This(void)
-{
-    return SWIG_Python_str_FromChar("this");
-}
-
-SWIGRUNTIME PyObject *
-SWIG_This(void)
-{
-  static PyObject *SWIG_STATIC_POINTER(swig_this) = _SWIG_This();
-  return swig_this;
-}
-
-/* #define SWIG_PYTHON_SLOW_GETSET_THIS */
-
-/* TODO: I don't know how to implement the fast getset in Python 3 right now */
-#if PY_VERSION_HEX>=0x03000000
-#define SWIG_PYTHON_SLOW_GETSET_THIS 
-#endif
-
-SWIGRUNTIME SwigPyObject *
-SWIG_Python_GetSwigThis(PyObject *pyobj) 
-{
-  if (SwigPyObject_Check(pyobj)) {
-    return (SwigPyObject *) pyobj;
-  } else {
-    PyObject *obj = 0;
-#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
-    if (PyInstance_Check(pyobj)) {
-      obj = _PyInstance_Lookup(pyobj, SWIG_This());      
-    } else {
-      PyObject **dictptr = _PyObject_GetDictPtr(pyobj);
-      if (dictptr != NULL) {
-	PyObject *dict = *dictptr;
-	obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0;
-      } else {
-#ifdef PyWeakref_CheckProxy
-	if (PyWeakref_CheckProxy(pyobj)) {
-	  PyObject *wobj = PyWeakref_GET_OBJECT(pyobj);
-	  return wobj ? SWIG_Python_GetSwigThis(wobj) : 0;
-	}
-#endif
-	obj = PyObject_GetAttr(pyobj,SWIG_This());
-	if (obj) {
-	  Py_DECREF(obj);
-	} else {
-	  if (PyErr_Occurred()) PyErr_Clear();
-	  return 0;
-	}
-      }
-    }
-#else
-    obj = PyObject_GetAttr(pyobj,SWIG_This());
-    if (obj) {
-      Py_DECREF(obj);
-    } else {
-      if (PyErr_Occurred()) PyErr_Clear();
-      return 0;
-    }
-#endif
-    if (obj && !SwigPyObject_Check(obj)) {
-      /* a PyObject is called 'this', try to get the 'real this'
-	 SwigPyObject from it */ 
-      return SWIG_Python_GetSwigThis(obj);
-    }
-    return (SwigPyObject *)obj;
-  }
-}
-
-/* Acquire a pointer value */
-
-SWIGRUNTIME int
-SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own == SWIG_POINTER_OWN) {
-    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
-    if (sobj) {
-      int oldown = sobj->own;
-      sobj->own = own;
-      return oldown;
-    }
-  }
-  return 0;
-}
-
-/* Convert a pointer value */
-
-SWIGRUNTIME int
-SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
-  if (!obj) return SWIG_ERROR;
-  if (obj == Py_None) {
-    if (ptr) *ptr = 0;
-    return SWIG_OK;
-  } else {
-    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
-    if (own)
-      *own = 0;
-    while (sobj) {
-      void *vptr = sobj->ptr;
-      if (ty) {
-	swig_type_info *to = sobj->ty;
-	if (to == ty) {
-	  /* no type cast needed */
-	  if (ptr) *ptr = vptr;
-	  break;
-	} else {
-	  swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-	  if (!tc) {
-	    sobj = (SwigPyObject *)sobj->next;
-	  } else {
-	    if (ptr) {
-              int newmemory = 0;
-              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-              if (newmemory == SWIG_CAST_NEW_MEMORY) {
-                assert(own);
-                if (own)
-                  *own = *own | SWIG_CAST_NEW_MEMORY;
-              }
-            }
-	    break;
-	  }
-	}
-      } else {
-	if (ptr) *ptr = vptr;
-	break;
-      }
-    }
-    if (sobj) {
-      if (own)
-        *own = *own | sobj->own;
-      if (flags & SWIG_POINTER_DISOWN) {
-	sobj->own = 0;
-      }
-      return SWIG_OK;
-    } else {
-      int res = SWIG_ERROR;
-      if (flags & SWIG_POINTER_IMPLICIT_CONV) {
-	SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
-	if (data && !data->implicitconv) {
-	  PyObject *klass = data->klass;
-	  if (klass) {
-	    PyObject *impconv;
-	    data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/
-	    impconv = SWIG_Python_CallFunctor(klass, obj);
-	    data->implicitconv = 0;
-	    if (PyErr_Occurred()) {
-	      PyErr_Clear();
-	      impconv = 0;
-	    }
-	    if (impconv) {
-	      SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
-	      if (iobj) {
-		void *vptr;
-		res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
-		if (SWIG_IsOK(res)) {
-		  if (ptr) {
-		    *ptr = vptr;
-		    /* transfer the ownership to 'ptr' */
-		    iobj->own = 0;
-		    res = SWIG_AddCast(res);
-		    res = SWIG_AddNewMask(res);
-		  } else {
-		    res = SWIG_AddCast(res);		    
-		  }
-		}
-	      }
-	      Py_DECREF(impconv);
-	    }
-	  }
-	}
-      }
-      return res;
-    }
-  }
-}
-
-/* Convert a function ptr value */
-
-SWIGRUNTIME int
-SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
-  if (!PyCFunction_Check(obj)) {
-    return SWIG_ConvertPtr(obj, ptr, ty, 0);
-  } else {
-    void *vptr = 0;
-    
-    /* here we get the method pointer for callbacks */
-    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-    const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
-    if (desc)
-      desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
-    if (!desc) 
-      return SWIG_ERROR;
-    if (ty) {
-      swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (tc) {
-        int newmemory = 0;
-        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-      } else {
-        return SWIG_ERROR;
-      }
-    } else {
-      *ptr = vptr;
-    }
-    return SWIG_OK;
-  }
-}
-
-/* Convert a packed value value */
-
-SWIGRUNTIME int
-SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
-  swig_type_info *to = SwigPyPacked_UnpackData(obj, ptr, sz);
-  if (!to) return SWIG_ERROR;
-  if (ty) {
-    if (to != ty) {
-      /* check type cast? */
-      swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-      if (!tc) return SWIG_ERROR;
-    }
-  }
-  return SWIG_OK;
-}  
-
-/* -----------------------------------------------------------------------------
- * Create a new pointer object
- * ----------------------------------------------------------------------------- */
-
-/*
-  Create a new instance object, without calling __init__, and set the
-  'this' attribute.
-*/
-
-SWIGRUNTIME PyObject* 
-SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
-{
-#if (PY_VERSION_HEX >= 0x02020000)
-  PyObject *inst = 0;
-  PyObject *newraw = data->newraw;
-  if (newraw) {
-    inst = PyObject_Call(newraw, data->newargs, NULL);
-    if (inst) {
-#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
-      PyObject **dictptr = _PyObject_GetDictPtr(inst);
-      if (dictptr != NULL) {
-	PyObject *dict = *dictptr;
-	if (dict == NULL) {
-	  dict = PyDict_New();
-	  *dictptr = dict;
-	  PyDict_SetItem(dict, SWIG_This(), swig_this);
-	}
-      }
-#else
-      PyObject *key = SWIG_This();
-      PyObject_SetAttr(inst, key, swig_this);
-#endif
-    }
-  } else {
-#if PY_VERSION_HEX >= 0x03000000
-    inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
-    PyObject_SetAttr(inst, SWIG_This(), swig_this);
-    Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
-#else
-    PyObject *dict = PyDict_New();
-    PyDict_SetItem(dict, SWIG_This(), swig_this);
-    inst = PyInstance_NewRaw(data->newargs, dict);
-    Py_DECREF(dict);
-#endif
-  }
-  return inst;
-#else
-#if (PY_VERSION_HEX >= 0x02010000)
-  PyObject *inst;
-  PyObject *dict = PyDict_New();
-  PyDict_SetItem(dict, SWIG_This(), swig_this);
-  inst = PyInstance_NewRaw(data->newargs, dict);
-  Py_DECREF(dict);
-  return (PyObject *) inst;
-#else
-  PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
-  if (inst == NULL) {
-    return NULL;
-  }
-  inst->in_class = (PyClassObject *)data->newargs;
-  Py_INCREF(inst->in_class);
-  inst->in_dict = PyDict_New();
-  if (inst->in_dict == NULL) {
-    Py_DECREF(inst);
-    return NULL;
-  }
-#ifdef Py_TPFLAGS_HAVE_WEAKREFS
-  inst->in_weakreflist = NULL;
-#endif
-#ifdef Py_TPFLAGS_GC
-  PyObject_GC_Init(inst);
-#endif
-  PyDict_SetItem(inst->in_dict, SWIG_This(), swig_this);
-  return (PyObject *) inst;
-#endif
-#endif
-}
-
-SWIGRUNTIME void
-SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
-{
- PyObject *dict;
-#if (PY_VERSION_HEX >= 0x02020000) && !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
- PyObject **dictptr = _PyObject_GetDictPtr(inst);
- if (dictptr != NULL) {
-   dict = *dictptr;
-   if (dict == NULL) {
-     dict = PyDict_New();
-     *dictptr = dict;
-   }
-   PyDict_SetItem(dict, SWIG_This(), swig_this);
-   return;
- }
-#endif
- dict = PyObject_GetAttrString(inst, (char*)"__dict__");
- PyDict_SetItem(dict, SWIG_This(), swig_this);
- Py_DECREF(dict);
-} 
-
-
-SWIGINTERN PyObject *
-SWIG_Python_InitShadowInstance(PyObject *args) {
-  PyObject *obj[2];
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) {
-    return NULL;
-  } else {
-    SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
-    if (sthis) {
-      SwigPyObject_append((PyObject*) sthis, obj[1]);
-    } else {
-      SWIG_Python_SetSwigThis(obj[0], obj[1]);
-    }
-    return SWIG_Py_Void();
-  }
-}
-
-/* Create a new pointer object */
-
-SWIGRUNTIME PyObject *
-SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
-  if (!ptr) {
-    return SWIG_Py_Void();
-  } else {
-    int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
-    PyObject *robj = SwigPyObject_New(ptr, type, own);
-    SwigPyClientData *clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
-    if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
-      PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
-      if (inst) {
-	Py_DECREF(robj);
-	robj = inst;
-      }
-    }
-    return robj;
-  }
-}
-
-/* Create a new packed object */
-
-SWIGRUNTIMEINLINE PyObject *
-SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
-  return ptr ? SwigPyPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
-}
-
-/* -----------------------------------------------------------------------------*
- *  Get type list 
- * -----------------------------------------------------------------------------*/
-
-#ifdef SWIG_LINK_RUNTIME
-void *SWIG_ReturnGlobalTypeList(void *);
-#endif
-
-SWIGRUNTIME swig_module_info *
-SWIG_Python_GetModule(void) {
-  static void *type_pointer = (void *)0;
-  /* first check if module already created */
-  if (!type_pointer) {
-#ifdef SWIG_LINK_RUNTIME
-    type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
-#else
-    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
-				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
-    if (PyErr_Occurred()) {
-      PyErr_Clear();
-      type_pointer = (void *)0;
-    }
-#endif
-  }
-  return (swig_module_info *) type_pointer;
-}
-
-#if PY_MAJOR_VERSION < 2
-/* PyModule_AddObject function was introduced in Python 2.0.  The following function
-   is copied out of Python/modsupport.c in python version 2.3.4 */
-SWIGINTERN int
-PyModule_AddObject(PyObject *m, char *name, PyObject *o)
-{
-  PyObject *dict;
-  if (!PyModule_Check(m)) {
-    PyErr_SetString(PyExc_TypeError,
-		    "PyModule_AddObject() needs module as first arg");
-    return SWIG_ERROR;
-  }
-  if (!o) {
-    PyErr_SetString(PyExc_TypeError,
-		    "PyModule_AddObject() needs non-NULL value");
-    return SWIG_ERROR;
-  }
-  
-  dict = PyModule_GetDict(m);
-  if (dict == NULL) {
-    /* Internal error -- modules must have a dict! */
-    PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
-		 PyModule_GetName(m));
-    return SWIG_ERROR;
-  }
-  if (PyDict_SetItemString(dict, name, o))
-    return SWIG_ERROR;
-  Py_DECREF(o);
-  return SWIG_OK;
-}
-#endif
-
-SWIGRUNTIME void
-SWIG_Python_DestroyModule(void *vptr)
-{
-  swig_module_info *swig_module = (swig_module_info *) vptr;
-  swig_type_info **types = swig_module->types;
-  size_t i;
-  for (i =0; i < swig_module->size; ++i) {
-    swig_type_info *ty = types[i];
-    if (ty->owndata) {
-      SwigPyClientData *data = (SwigPyClientData *) ty->clientdata;
-      if (data) SwigPyClientData_Del(data);
-    }
-  }
-  Py_DECREF(SWIG_This());
-}
-
-SWIGRUNTIME void
-SWIG_Python_SetModule(swig_module_info *swig_module) {
-  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
-
-#if PY_VERSION_HEX >= 0x03000000
- /* Add a dummy module object into sys.modules */
-  PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
-#else
-  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
-				   swig_empty_runtime_method_table);
-#endif
-  PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
-  if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
-  } else {
-    Py_XDECREF(pointer);
-  }
-}
-
-/* The python cached type query */
-SWIGRUNTIME PyObject *
-SWIG_Python_TypeCache(void) {
-  static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New();
-  return cache;
-}
-
-SWIGRUNTIME swig_type_info *
-SWIG_Python_TypeQuery(const char *type)
-{
-  PyObject *cache = SWIG_Python_TypeCache();
-  PyObject *key = SWIG_Python_str_FromChar(type); 
-  PyObject *obj = PyDict_GetItem(cache, key);
-  swig_type_info *descriptor;
-  if (obj) {
-    descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
-  } else {
-    swig_module_info *swig_module = SWIG_Python_GetModule();
-    descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
-    if (descriptor) {
-      obj = PyCObject_FromVoidPtr(descriptor, NULL);
-      PyDict_SetItem(cache, key, obj);
-      Py_DECREF(obj);
-    }
-  }
-  Py_DECREF(key);
-  return descriptor;
-}
-
-/* 
-   For backward compatibility only
-*/
-#define SWIG_POINTER_EXCEPTION  0
-#define SWIG_arg_fail(arg)      SWIG_Python_ArgFail(arg)
-#define SWIG_MustGetPtr(p, type, argnum, flags)  SWIG_Python_MustGetPtr(p, type, argnum, flags)
-
-SWIGRUNTIME int
-SWIG_Python_AddErrMesg(const char* mesg, int infront)
-{  
-  if (PyErr_Occurred()) {
-    PyObject *type = 0;
-    PyObject *value = 0;
-    PyObject *traceback = 0;
-    PyErr_Fetch(&type, &value, &traceback);
-    if (value) {
-      char *tmp;
-      PyObject *old_str = PyObject_Str(value);
-      Py_XINCREF(type);
-      PyErr_Clear();
-      if (infront) {
-	PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str));
-      } else {
-	PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
-      }
-      SWIG_Python_str_DelForPy3(tmp);
-      Py_DECREF(old_str);
-    }
-    return 1;
-  } else {
-    return 0;
-  }
-}
-  
-SWIGRUNTIME int
-SWIG_Python_ArgFail(int argnum)
-{
-  if (PyErr_Occurred()) {
-    /* add information about failing argument */
-    char mesg[256];
-    PyOS_snprintf(mesg, sizeof(mesg), "argument number %d:", argnum);
-    return SWIG_Python_AddErrMesg(mesg, 1);
-  } else {
-    return 0;
-  }
-}
-
-SWIGRUNTIMEINLINE const char *
-SwigPyObject_GetDesc(PyObject *self)
-{
-  SwigPyObject *v = (SwigPyObject *)self;
-  swig_type_info *ty = v ? v->ty : 0;
-  return ty ? ty->str : (char*)"";
-}
-
-SWIGRUNTIME void
-SWIG_Python_TypeError(const char *type, PyObject *obj)
-{
-  if (type) {
-#if defined(SWIG_COBJECT_TYPES)
-    if (obj && SwigPyObject_Check(obj)) {
-      const char *otype = (const char *) SwigPyObject_GetDesc(obj);
-      if (otype) {
-	PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'SwigPyObject(%s)' is received",
-		     type, otype);
-	return;
-      }
-    } else 
-#endif      
-    {
-      const char *otype = (obj ? obj->ob_type->tp_name : 0); 
-      if (otype) {
-	PyObject *str = PyObject_Str(obj);
-	const char *cstr = str ? SWIG_Python_str_AsChar(str) : 0;
-	if (cstr) {
-	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
-		       type, otype, cstr);
-          SWIG_Python_str_DelForPy3(cstr);
-	} else {
-	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
-		       type, otype);
-	}
-	Py_XDECREF(str);
-	return;
-      }
-    }   
-    PyErr_Format(PyExc_TypeError, "a '%s' is expected", type);
-  } else {
-    PyErr_Format(PyExc_TypeError, "unexpected type is received");
-  }
-}
-
-
-/* Convert a pointer value, signal an exception on a type mismatch */
-SWIGRUNTIME void *
-SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
-  void *result;
-  if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
-    PyErr_Clear();
-#if SWIG_POINTER_EXCEPTION
-    if (flags) {
-      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
-      SWIG_Python_ArgFail(argnum);
-    }
-#endif
-  }
-  return result;
-}
-
-
-#ifdef __cplusplus
-#if 0
-{ /* cc-mode */
-#endif
-}
-#endif
-
-
-
-#define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) 
-
-#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else 
-
-
-
-/* -------- TYPES TABLE (BEGIN) -------- */
-
-#define SWIGTYPE_p_char swig_types[0]
-#define SWIGTYPE_p_ctb__IOBase swig_types[1]
-#define SWIGTYPE_p_ctb__SerialPort swig_types[2]
-#define SWIGTYPE_p_ctb__SerialPort_DCS swig_types[3]
-#define SWIGTYPE_p_ctb__SerialPort_EINFO swig_types[4]
-#define SWIGTYPE_p_ctb__SerialPort_x swig_types[5]
-#define SWIGTYPE_p_ctb__Timer swig_types[6]
-#define SWIGTYPE_p_ctb__timer_control swig_types[7]
-#define SWIGTYPE_p_f_p_void__p_void swig_types[8]
-#define SWIGTYPE_p_int swig_types[9]
-#define SWIGTYPE_p_p_char swig_types[10]
-static swig_type_info *swig_types[12];
-static swig_module_info swig_module = {swig_types, 11, 0, 0, 0, 0};
-#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
-#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
-
-/* -------- TYPES TABLE (END) -------- */
-
-#if (PY_VERSION_HEX <= 0x02000000)
-# if !defined(SWIG_PYTHON_CLASSIC)
-#  error "This python version requires swig to be run with the '-classic' option"
-# endif
-#endif
-#if (PY_VERSION_HEX <= 0x02020000)
-# error "This python version requires swig to be run with the '-nomodern' option"
-#endif
-#if (PY_VERSION_HEX <= 0x02020000)
-# error "This python version requires swig to be run with the '-nomodernargs' option"
-#endif
-
-/*-----------------------------------------------
-              @(target):= _wxctb.so
-  ------------------------------------------------*/
-#if PY_VERSION_HEX >= 0x03000000
-#  define SWIG_init    PyInit__wxctb
-
-#else
-#  define SWIG_init    init_wxctb
-
-#endif
-#define SWIG_name    "_wxctb"
-
-#define SWIGVERSION 0x010340 
-#define SWIG_VERSION SWIGVERSION
-
-
-#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) 
-#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) 
-
-
-#include <stdexcept>
-
-
-namespace swig {
-  class SwigPtr_PyObject {
-  protected:
-    PyObject *_obj;
-
-  public:
-    SwigPtr_PyObject() :_obj(0)
-    {
-    }
-
-    SwigPtr_PyObject(const SwigPtr_PyObject& item) : _obj(item._obj)
-    {
-      Py_XINCREF(_obj);      
-    }
-    
-    SwigPtr_PyObject(PyObject *obj, bool initial_ref = true) :_obj(obj)
-    {
-      if (initial_ref) {
-        Py_XINCREF(_obj);
-      }
-    }
-    
-    SwigPtr_PyObject & operator=(const SwigPtr_PyObject& item) 
-    {
-      Py_XINCREF(item._obj);
-      Py_XDECREF(_obj);
-      _obj = item._obj;
-      return *this;      
-    }
-    
-    ~SwigPtr_PyObject() 
-    {
-      Py_XDECREF(_obj);
-    }
-    
-    operator PyObject *() const
-    {
-      return _obj;
-    }
-
-    PyObject *operator->() const
-    {
-      return _obj;
-    }
-  };
-}
-
-
-namespace swig {
-  struct SwigVar_PyObject : SwigPtr_PyObject {
-    SwigVar_PyObject(PyObject* obj = 0) : SwigPtr_PyObject(obj, false) { }
-    
-    SwigVar_PyObject & operator = (PyObject* obj)
-    {
-      Py_XDECREF(_obj);
-      _obj = obj;
-      return *this;      
-    }
-  };
-}
-
-
-#include "ctb-0.16/linux/timer.h"
-
-
-  static int *new_intp() { 
-    return (new int);
-  }
-  
-  static int *copy_intp(int value) { 
-    return (new int(static_cast< const int& >(value)));
-  }
-
-  static void delete_intp(int *self) { 
-    if (self) delete self;
-  }
-
-  static void intp_assign(int *self, int value) {
-    *self = value;
-  }
-
-  static int intp_value(int *self) {
-    return *self;
-  }
-
-
-#include <limits.h>
-#if !defined(SWIG_NO_LLONG_MAX)
-# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
-#   define LLONG_MAX __LONG_LONG_MAX__
-#   define LLONG_MIN (-LLONG_MAX - 1LL)
-#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-# endif
-#endif
-
-
-SWIGINTERN int
-SWIG_AsVal_double (PyObject *obj, double *val)
-{
-  int res = SWIG_TypeError;
-  if (PyFloat_Check(obj)) {
-    if (val) *val = PyFloat_AsDouble(obj);
-    return SWIG_OK;
-  } else if (PyInt_Check(obj)) {
-    if (val) *val = PyInt_AsLong(obj);
-    return SWIG_OK;
-  } else if (PyLong_Check(obj)) {
-    double v = PyLong_AsDouble(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      PyErr_Clear();
-    }
-  }
-#ifdef SWIG_PYTHON_CAST_MODE
-  {
-    int dispatch = 0;
-    double d = PyFloat_AsDouble(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = d;
-      return SWIG_AddCast(SWIG_OK);
-    } else {
-      PyErr_Clear();
-    }
-    if (!dispatch) {
-      long v = PyLong_AsLong(obj);
-      if (!PyErr_Occurred()) {
-	if (val) *val = v;
-	return SWIG_AddCast(SWIG_AddCast(SWIG_OK));
-      } else {
-	PyErr_Clear();
-      }
-    }
-  }
-#endif
-  return res;
-}
-
-
-#include <float.h>
-
-
-#include <math.h>
-
-
-SWIGINTERNINLINE int
-SWIG_CanCastAsInteger(double *d, double min, double max) {
-  double x = *d;
-  if ((min <= x && x <= max)) {
-   double fx = floor(x);
-   double cx = ceil(x);
-   double rd =  ((x - fx) < 0.5) ? fx : cx; /* simple rint */
-   if ((errno == EDOM) || (errno == ERANGE)) {
-     errno = 0;
-   } else {
-     double summ, reps, diff;
-     if (rd < x) {
-       diff = x - rd;
-     } else if (rd > x) {
-       diff = rd - x;
-     } else {
-       return 1;
-     }
-     summ = rd + x;
-     reps = diff/summ;
-     if (reps < 8*DBL_EPSILON) {
-       *d = rd;
-       return 1;
-     }
-   }
-  }
-  return 0;
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_long (PyObject *obj, long* val)
-{
-  if (PyInt_Check(obj)) {
-    if (val) *val = PyInt_AsLong(obj);
-    return SWIG_OK;
-  } else if (PyLong_Check(obj)) {
-    long v = PyLong_AsLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      PyErr_Clear();
-    }
-  }
-#ifdef SWIG_PYTHON_CAST_MODE
-  {
-    int dispatch = 0;
-    long v = PyInt_AsLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_AddCast(SWIG_OK);
-    } else {
-      PyErr_Clear();
-    }
-    if (!dispatch) {
-      double d;
-      int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d));
-      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, LONG_MAX)) {
-	if (val) *val = (long)(d);
-	return res;
-      }
-    }
-  }
-#endif
-  return SWIG_TypeError;
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_int (PyObject * obj, int *val)
-{
-  long v;
-  int res = SWIG_AsVal_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v < INT_MIN || v > INT_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = static_cast< int >(v);
-    }
-  }  
-  return res;
-}
-
-
-  #define SWIG_From_long   PyInt_FromLong 
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_int  (int value)
-{    
-  return SWIG_From_long  (value);
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 
-{
-  if (PyInt_Check(obj)) {
-    long v = PyInt_AsLong(obj);
-    if (v >= 0) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      return SWIG_OverflowError;
-    }
-  } else if (PyLong_Check(obj)) {
-    unsigned long v = PyLong_AsUnsignedLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_OK;
-    } else {
-      PyErr_Clear();
-    }
-  }
-#ifdef SWIG_PYTHON_CAST_MODE
-  {
-    int dispatch = 0;
-    unsigned long v = PyLong_AsUnsignedLong(obj);
-    if (!PyErr_Occurred()) {
-      if (val) *val = v;
-      return SWIG_AddCast(SWIG_OK);
-    } else {
-      PyErr_Clear();
-    }
-    if (!dispatch) {
-      double d;
-      int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d));
-      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) {
-	if (val) *val = (unsigned long)(d);
-	return res;
-      }
-    }
-  }
-#endif
-  return SWIG_TypeError;
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val)
-{
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v > UINT_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = static_cast< unsigned int >(v);
-    }
-  }  
-  return res;
-}
-
-
-SWIGINTERNINLINE PyObject* 
-SWIG_From_unsigned_SS_long  (unsigned long value)
-{
-  return (value > LONG_MAX) ?
-    PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); 
-}
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_unsigned_SS_int  (unsigned int value)
-{    
-  return SWIG_From_unsigned_SS_long  (value);
-}
-
-
-#include "ctb-0.16/linux/serport.h"
-
-
-#include "ctb-0.16/serportx.h"
-
-
-#include "ctb-0.16/iobase.h"
-
-
-SWIGINTERN swig_type_info*
-SWIG_pchar_descriptor(void)
-{
-  static int init = 0;
-  static swig_type_info* info = 0;
-  if (!init) {
-    info = SWIG_TypeQuery("_p_char");
-    init = 1;
-  }
-  return info;
-}
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-{
-  if (carray) {
-    if (size > INT_MAX) {
-      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-      return pchar_descriptor ? 
-	SWIG_NewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
-    } else {
-#if PY_VERSION_HEX >= 0x03000000
-      return PyUnicode_FromStringAndSize(carray, static_cast< int >(size));
-#else
-      return PyString_FromStringAndSize(carray, static_cast< int >(size));
-#endif
-    }
-  } else {
-    return SWIG_Py_Void();
-  }
-}
-
-
-SWIGINTERNINLINE PyObject * 
-SWIG_FromCharPtr(const char *cptr)
-{ 
-  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
-}
-
-
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
-{
-#if PY_VERSION_HEX>=0x03000000
-  if (PyUnicode_Check(obj))
-#else  
-  if (PyString_Check(obj))
-#endif
-  {
-    char *cstr; Py_ssize_t len;
-#if PY_VERSION_HEX>=0x03000000
-    if (!alloc && cptr) {
-        /* We can't allow converting without allocation, since the internal
-           representation of string in Python 3 is UCS-2/UCS-4 but we require
-           a UTF-8 representation.
-           TODO(bhy) More detailed explanation */
-        return SWIG_RuntimeError;
-    }
-    obj = PyUnicode_AsUTF8String(obj);
-    PyBytes_AsStringAndSize(obj, &cstr, &len);
-    if(alloc) *alloc = SWIG_NEWOBJ;
-#else
-    PyString_AsStringAndSize(obj, &cstr, &len);
-#endif
-    if (cptr) {
-      if (alloc) {
-	/* 
-	   In python the user should not be able to modify the inner
-	   string representation. To warranty that, if you define
-	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
-	   buffer is always returned.
-
-	   The default behavior is just to return the pointer value,
-	   so, be careful.
-	*/ 
-#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
-	if (*alloc != SWIG_OLDOBJ) 
-#else
-	if (*alloc == SWIG_NEWOBJ) 
-#endif
-	  {
-	    *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1)));
-	    *alloc = SWIG_NEWOBJ;
-	  }
-	else {
-	  *cptr = cstr;
-	  *alloc = SWIG_OLDOBJ;
-	}
-      } else {
-        #if PY_VERSION_HEX>=0x03000000
-        assert(0); /* Should never reach here in Python 3 */
-        #endif
-	*cptr = SWIG_Python_str_AsChar(obj);
-      }
-    }
-    if (psize) *psize = len + 1;
-#if PY_VERSION_HEX>=0x03000000
-    Py_XDECREF(obj);
-#endif
-    return SWIG_OK;
-  } else {
-    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-    if (pchar_descriptor) {
-      void* vptr = 0;
-      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
-	if (cptr) *cptr = (char *) vptr;
-	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
-	if (alloc) *alloc = SWIG_OLDOBJ;
-	return SWIG_OK;
-      }
-    }
-  }
-  return SWIG_TypeError;
-}
-
-
-
-
-
-SWIGINTERN int
-SWIG_AsCharArray(PyObject * obj, char *val, size_t size)
-{ 
-  char* cptr = 0; size_t csize = 0; int alloc = SWIG_OLDOBJ;
-  int res = SWIG_AsCharPtrAndSize(obj, &cptr, &csize, &alloc);
-  if (SWIG_IsOK(res)) {
-    if ((csize == size + 1) && cptr && !(cptr[csize-1])) --csize;
-    if (csize <= size) {
-      if (val) {
-	if (csize) memcpy(val, cptr, csize*sizeof(char));
-	if (csize < size) memset(val + csize, 0, (size - csize)*sizeof(char));
-      }
-      if (alloc == SWIG_NEWOBJ) {
-	delete[] cptr;
-	res = SWIG_DelNewMask(res);
-      }      
-      return res;
-    }
-    if (alloc == SWIG_NEWOBJ) delete[] cptr;
-  }
-  return SWIG_TypeError;
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_char (PyObject * obj, char *val)
-{    
-  int res = SWIG_AsCharArray(obj, val, 1);
-  if (!SWIG_IsOK(res)) {
-    long v;
-    res = SWIG_AddCast(SWIG_AsVal_long (obj, &v));
-    if (SWIG_IsOK(res)) {
-      if ((CHAR_MIN <= v) && (v <= CHAR_MAX)) {
-	if (val) *val = static_cast< char >(v);
-      } else {
-	res = SWIG_OverflowError;
-      }
-    }
-  }
-  return res;
-}
-
-
-SWIGINTERNINLINE int
-SWIG_AsVal_size_t (PyObject * obj, size_t *val)
-{
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
-  if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
-  return res;
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_char (PyObject * obj, unsigned char *val)
-{
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v > UCHAR_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = static_cast< unsigned char >(v);
-    }
-  }  
-  return res;
-}
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_unsigned_SS_char  (unsigned char value)
-{    
-  return SWIG_From_unsigned_SS_long  (value);
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_bool (PyObject *obj, bool *val)
-{
-  int r = PyObject_IsTrue(obj);
-  if (r == -1)
-    return SWIG_ERROR;
-  if (val) *val = r ? true : false;
-  return SWIG_OK;
-}
-
-
-SWIGINTERNINLINE PyObject*
-  SWIG_From_bool  (bool value)
-{
-  return PyBool_FromLong(value ? 1 : 0);
-}
-
-
-#include "ctb-0.16/kbhit.h"
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_char  (char c) 
-{ 
-  return SWIG_FromCharPtrAndSize(&c,1);
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-SWIGINTERN PyObject *_wrap_new_intp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  int *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"new_intp",0,0)) SWIG_fail;
-  result = (int *)new_intp();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_copy_intp(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  int arg1 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "value", NULL 
-  };
-  int *result = 0 ;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:copy_intp",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "copy_intp" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = static_cast< int >(val1);
-  result = (int *)copy_intp(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_intp(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  int *arg1 = (int *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_intp",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_intp" "', argument " "1"" of type '" "int *""'"); 
-  }
-  arg1 = reinterpret_cast< int * >(argp1);
-  delete_intp(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_intp_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  int *arg1 = (int *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "value", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:intp_assign",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "intp_assign" "', argument " "1"" of type '" "int *""'"); 
-  }
-  arg1 = reinterpret_cast< int * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "intp_assign" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  intp_assign(arg1,arg2);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_intp_value(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  int *arg1 = (int *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:intp_value",kwnames,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "intp_value" "', argument " "1"" of type '" "int *""'"); 
-  }
-  arg1 = reinterpret_cast< int * >(argp1);
-  result = (int)intp_value(arg1);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_timer_control_usecs_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::timer_control *arg1 = (ctb::timer_control *) 0 ;
-  unsigned int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"timer_control_usecs_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__timer_control, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "timer_control_usecs_set" "', argument " "1"" of type '" "ctb::timer_control *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::timer_control * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "timer_control_usecs_set" "', argument " "2"" of type '" "unsigned int""'");
-  } 
-  arg2 = static_cast< unsigned int >(val2);
-  if (arg1) (arg1)->usecs = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_timer_control_usecs_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::timer_control *arg1 = (ctb::timer_control *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  unsigned int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"timer_control_usecs_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__timer_control, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "timer_control_usecs_get" "', argument " "1"" of type '" "ctb::timer_control *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::timer_control * >(argp1);
-  result = (unsigned int) ((arg1)->usecs);
-  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_timer_control_exitflag_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::timer_control *arg1 = (ctb::timer_control *) 0 ;
-  int *arg2 = (int *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"timer_control_exitflag_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__timer_control, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "timer_control_exitflag_set" "', argument " "1"" of type '" "ctb::timer_control *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::timer_control * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_int, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "timer_control_exitflag_set" "', argument " "2"" of type '" "int *""'"); 
-  }
-  arg2 = reinterpret_cast< int * >(argp2);
-  if (arg1) (arg1)->exitflag = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_timer_control_exitflag_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::timer_control *arg1 = (ctb::timer_control *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"timer_control_exitflag_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__timer_control, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "timer_control_exitflag_get" "', argument " "1"" of type '" "ctb::timer_control *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::timer_control * >(argp1);
-  result = (int *) ((arg1)->exitflag);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_timer_control_exitfnc_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::timer_control *arg1 = (ctb::timer_control *) 0 ;
-  void *(*arg2)(void *) = (void *(*)(void *)) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"timer_control_exitfnc_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__timer_control, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "timer_control_exitfnc_set" "', argument " "1"" of type '" "ctb::timer_control *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::timer_control * >(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(obj1, (void**)(&arg2), SWIGTYPE_p_f_p_void__p_void);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "timer_control_exitfnc_set" "', argument " "2"" of type '" "void *(*)(void *)""'"); 
-    }
-  }
-  if (arg1) (arg1)->exitfnc = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_timer_control_exitfnc_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::timer_control *arg1 = (ctb::timer_control *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  void *(*result)(void *) = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"timer_control_exitfnc_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__timer_control, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "timer_control_exitfnc_get" "', argument " "1"" of type '" "ctb::timer_control *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::timer_control * >(argp1);
-  result = (void *(*)(void *)) ((arg1)->exitfnc);
-  resultobj = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_void__p_void);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *timer_control_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_ctb__timer_control, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_new_Timer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  unsigned int arg1 ;
-  int *arg2 = (int *) 0 ;
-  void *(*arg3)(void *) = (void *(*)(void *)) NULL ;
-  unsigned int val1 ;
-  int ecode1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "msec",(char *) "exitflag",(char *) "exitfnc", NULL 
-  };
-  ctb::Timer *result = 0 ;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_Timer",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Timer" "', argument " "1"" of type '" "unsigned int""'");
-  } 
-  arg1 = static_cast< unsigned int >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Timer" "', argument " "2"" of type '" "int *""'"); 
-  }
-  arg2 = reinterpret_cast< int * >(argp2);
-  if (obj2) {
-    {
-      int res = SWIG_ConvertFunctionPtr(obj2, (void**)(&arg3), SWIGTYPE_p_f_p_void__p_void);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "new_Timer" "', argument " "3"" of type '" "void *(*)(void *)""'"); 
-      }
-    }
-  }
-  result = (ctb::Timer *)new ctb::Timer(arg1,arg2,arg3);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ctb__Timer, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_Timer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::Timer *arg1 = (ctb::Timer *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"delete_Timer",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__Timer, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Timer" "', argument " "1"" of type '" "ctb::Timer *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::Timer * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Timer_start(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::Timer *arg1 = (ctb::Timer *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"Timer_start",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__Timer, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Timer_start" "', argument " "1"" of type '" "ctb::Timer *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::Timer * >(argp1);
-  result = (int)(arg1)->start();
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Timer_stop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::Timer *arg1 = (ctb::Timer *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"Timer_stop",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__Timer, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Timer_stop" "', argument " "1"" of type '" "ctb::Timer *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::Timer * >(argp1);
-  result = (int)(arg1)->stop();
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *Timer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_ctb__Timer, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_sleepms(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  unsigned int arg1 ;
-  unsigned int val1 ;
-  int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "ms", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:sleepms",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "sleepms" "', argument " "1"" of type '" "unsigned int""'");
-  } 
-  arg1 = static_cast< unsigned int >(val1);
-  ctb::sleepms(arg1);
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_IOBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"delete_IOBase",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IOBase" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_ClassName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"IOBase_ClassName",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_ClassName" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  result = (char *)(arg1)->ClassName();
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_Close(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"IOBase_Close",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_Close" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  result = (int)(arg1)->Close();
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_Ioctl(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  int arg2 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "cmd",(char *) "args", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IOBase_Ioctl",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_Ioctl" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IOBase_Ioctl" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IOBase_Ioctl" "', argument " "3"" of type '" "void *""'"); 
-  }
-  result = (int)(arg1)->Ioctl(arg2,arg3);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_IsOpen(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"IOBase_IsOpen",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_IsOpen" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  result = (int)(arg1)->IsOpen();
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_Open(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0L ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "devname",(char *) "dcs", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:IOBase_Open",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_Open" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IOBase_Open" "', argument " "2"" of type '" "char const *""'");
-  }
-  arg2 = reinterpret_cast< char * >(buf2);
-  if (obj2) {
-    res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IOBase_Open" "', argument " "3"" of type '" "void *""'"); 
-    }
-  }
-  result = (int)(arg1)->Open((char const *)arg2,arg3);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_PutBack(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  char arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "ch", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IOBase_PutBack",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_PutBack" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  ecode2 = SWIG_AsVal_char(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IOBase_PutBack" "', argument " "2"" of type '" "char""'");
-  } 
-  arg2 = static_cast< char >(val2);
-  result = (int)(arg1)->PutBack(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_Read(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "buf",(char *) "len", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IOBase_Read",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_Read" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IOBase_Read" "', argument " "2"" of type '" "char *""'");
-  }
-  arg2 = reinterpret_cast< char * >(buf2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IOBase_Read" "', argument " "3"" of type '" "size_t""'");
-  } 
-  arg3 = static_cast< size_t >(val3);
-  result = (int)(arg1)->Read(arg2,arg3);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_ReadUntilEOS(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  char **arg2 = 0 ;
-  size_t *arg3 = (size_t *) 0 ;
-  char *arg4 = (char *) "\n" ;
-  long arg5 = (long) 1000L ;
-  char arg6 = (char) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *tmp2 ;
-  size_t tmp3 ;
-  int res4 ;
-  char *buf4 = 0 ;
-  int alloc4 = 0 ;
-  long val5 ;
-  int ecode5 = 0 ;
-  char val6 ;
-  int ecode6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "readbuf",(char *) "readedBytes",(char *) "eosString",(char *) "timeout_in_ms",(char *) "quota", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:IOBase_ReadUntilEOS",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_ReadUntilEOS" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  {
-    /* dont check for list */
-    arg2 = &tmp2;
-  }
-  {
-    /* dont check for list */
-    arg3 = &tmp3;
-  }
-  if (obj3) {
-    res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "IOBase_ReadUntilEOS" "', argument " "4"" of type '" "char *""'");
-    }
-    arg4 = reinterpret_cast< char * >(buf4);
-  }
-  if (obj4) {
-    ecode5 = SWIG_AsVal_long(obj4, &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "IOBase_ReadUntilEOS" "', argument " "5"" of type '" "long""'");
-    } 
-    arg5 = static_cast< long >(val5);
-  }
-  if (obj5) {
-    ecode6 = SWIG_AsVal_char(obj5, &val6);
-    if (!SWIG_IsOK(ecode6)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "IOBase_ReadUntilEOS" "', argument " "6"" of type '" "char""'");
-    } 
-    arg6 = static_cast< char >(val6);
-  }
-  result = (int)(arg1)->ReadUntilEOS(*arg2,arg3,arg4,arg5,arg6);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  {
-    PyObject * plist = PyList_New(2);
-    PyList_SetItem(plist, 0, PyString_FromString(*arg2));
-    PyList_SetItem(plist, 1, resultobj);
-    resultobj = plist;
-    delete *arg2;
-  }
-  {
-    PyList_Append(resultobj, PyInt_FromLong(*arg3));
-  }
-  if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
-  return resultobj;
-fail:
-  if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_Readv(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  unsigned int arg4 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  unsigned int val4 ;
-  int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "buf",(char *) "len",(char *) "timeout_in_ms", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IOBase_Readv",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_Readv" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IOBase_Readv" "', argument " "2"" of type '" "char *""'");
-  }
-  arg2 = reinterpret_cast< char * >(buf2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IOBase_Readv" "', argument " "3"" of type '" "size_t""'");
-  } 
-  arg3 = static_cast< size_t >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IOBase_Readv" "', argument " "4"" of type '" "unsigned int""'");
-  } 
-  arg4 = static_cast< unsigned int >(val4);
-  result = (int)(arg1)->Readv(arg2,arg3,arg4);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_Write(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "buf",(char *) "len", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IOBase_Write",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_Write" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IOBase_Write" "', argument " "2"" of type '" "char *""'");
-  }
-  arg2 = reinterpret_cast< char * >(buf2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IOBase_Write" "', argument " "3"" of type '" "size_t""'");
-  } 
-  arg3 = static_cast< size_t >(val3);
-  result = (int)(arg1)->Write(arg2,arg3);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IOBase_Writev(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::IOBase *arg1 = (ctb::IOBase *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  unsigned int arg4 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  unsigned int val4 ;
-  int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "buf",(char *) "len",(char *) "timeout_in_ms", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IOBase_Writev",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__IOBase, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IOBase_Writev" "', argument " "1"" of type '" "ctb::IOBase *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::IOBase * >(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IOBase_Writev" "', argument " "2"" of type '" "char *""'");
-  }
-  arg2 = reinterpret_cast< char * >(buf2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IOBase_Writev" "', argument " "3"" of type '" "size_t""'");
-  } 
-  arg3 = static_cast< size_t >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IOBase_Writev" "', argument " "4"" of type '" "unsigned int""'");
-  } 
-  arg4 = static_cast< unsigned int >(val4);
-  result = (int)(arg1)->Writev(arg2,arg3,arg4);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *IOBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_ctb__IOBase, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_baud_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_baud_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_baud_set" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_DCS_baud_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  if (arg1) (arg1)->baud = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_baud_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_baud_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_baud_get" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  result = (int) ((arg1)->baud);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_parity_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  ctb::Parity arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_parity_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_parity_set" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_DCS_parity_set" "', argument " "2"" of type '" "ctb::Parity""'");
-  } 
-  arg2 = static_cast< ctb::Parity >(val2);
-  if (arg1) (arg1)->parity = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_parity_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  ctb::Parity result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_parity_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_parity_get" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  result = (ctb::Parity) ((arg1)->parity);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_wordlen_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  unsigned char arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_wordlen_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_wordlen_set" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_DCS_wordlen_set" "', argument " "2"" of type '" "unsigned char""'");
-  } 
-  arg2 = static_cast< unsigned char >(val2);
-  if (arg1) (arg1)->wordlen = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_wordlen_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  unsigned char result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_wordlen_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_wordlen_get" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  result = (unsigned char) ((arg1)->wordlen);
-  resultobj = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_stopbits_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  unsigned char arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_stopbits_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_stopbits_set" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_DCS_stopbits_set" "', argument " "2"" of type '" "unsigned char""'");
-  } 
-  arg2 = static_cast< unsigned char >(val2);
-  if (arg1) (arg1)->stopbits = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_stopbits_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  unsigned char result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_stopbits_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_stopbits_get" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  result = (unsigned char) ((arg1)->stopbits);
-  resultobj = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_rtscts_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  bool arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_rtscts_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_rtscts_set" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_DCS_rtscts_set" "', argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
-  if (arg1) (arg1)->rtscts = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_rtscts_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  bool result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_rtscts_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_rtscts_get" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  result = (bool) ((arg1)->rtscts);
-  resultobj = SWIG_From_bool(static_cast< bool >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_xonxoff_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  bool arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_xonxoff_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_xonxoff_set" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_DCS_xonxoff_set" "', argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
-  if (arg1) (arg1)->xonxoff = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_xonxoff_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  bool result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_xonxoff_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_xonxoff_get" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  result = (bool) ((arg1)->xonxoff);
-  resultobj = SWIG_From_bool(static_cast< bool >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_buf_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  char *arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char temp2[16] ;
-  int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_buf_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_buf_set" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  res2 = SWIG_AsCharArray(obj1, temp2, 16);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SerialPort_DCS_buf_set" "', argument " "2"" of type '" "char [16]""'");
-  }
-  arg2 = reinterpret_cast< char * >(temp2);
-  if (arg2) memcpy(arg1->buf,arg2,16*sizeof(char));
-  else memset(arg1->buf,0,16*sizeof(char));
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_buf_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_buf_get" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  result = (char *)(char *) ((arg1)->buf);
-  {
-    size_t size = 16;
-    
-    while (size && (result[size - 1] == '\0')) --size;
-    
-    resultobj = SWIG_FromCharPtrAndSize(result, size);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_SerialPort_DCS(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"new_SerialPort_DCS",0,0)) SWIG_fail;
-  result = (ctb::SerialPort_DCS *)new ctb::SerialPort_DCS();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ctb__SerialPort_DCS, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_SerialPort_DCS(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"delete_SerialPort_DCS",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SerialPort_DCS" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_DCS_GetSettings(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_DCS *arg1 = (ctb::SerialPort_DCS *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_DCS_GetSettings",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_DCS, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_DCS_GetSettings" "', argument " "1"" of type '" "ctb::SerialPort_DCS *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_DCS * >(argp1);
-  result = (char *)(arg1)->GetSettings();
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *SerialPort_DCS_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_ctb__SerialPort_DCS, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_SerialPort_EINFO_brk_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *arg1 = (ctb::SerialPort_EINFO *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_EINFO_brk_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_EINFO, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_EINFO_brk_set" "', argument " "1"" of type '" "ctb::SerialPort_EINFO *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_EINFO * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_EINFO_brk_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  if (arg1) (arg1)->brk = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_EINFO_brk_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *arg1 = (ctb::SerialPort_EINFO *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_EINFO_brk_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_EINFO, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_EINFO_brk_get" "', argument " "1"" of type '" "ctb::SerialPort_EINFO *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_EINFO * >(argp1);
-  result = (int) ((arg1)->brk);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_EINFO_frame_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *arg1 = (ctb::SerialPort_EINFO *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_EINFO_frame_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_EINFO, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_EINFO_frame_set" "', argument " "1"" of type '" "ctb::SerialPort_EINFO *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_EINFO * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_EINFO_frame_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  if (arg1) (arg1)->frame = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_EINFO_frame_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *arg1 = (ctb::SerialPort_EINFO *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_EINFO_frame_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_EINFO, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_EINFO_frame_get" "', argument " "1"" of type '" "ctb::SerialPort_EINFO *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_EINFO * >(argp1);
-  result = (int) ((arg1)->frame);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_EINFO_overrun_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *arg1 = (ctb::SerialPort_EINFO *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_EINFO_overrun_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_EINFO, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_EINFO_overrun_set" "', argument " "1"" of type '" "ctb::SerialPort_EINFO *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_EINFO * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_EINFO_overrun_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  if (arg1) (arg1)->overrun = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_EINFO_overrun_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *arg1 = (ctb::SerialPort_EINFO *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_EINFO_overrun_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_EINFO, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_EINFO_overrun_get" "', argument " "1"" of type '" "ctb::SerialPort_EINFO *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_EINFO * >(argp1);
-  result = (int) ((arg1)->overrun);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_EINFO_parity_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *arg1 = (ctb::SerialPort_EINFO *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_EINFO_parity_set",2,2,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_EINFO, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_EINFO_parity_set" "', argument " "1"" of type '" "ctb::SerialPort_EINFO *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_EINFO * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_EINFO_parity_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  if (arg1) (arg1)->parity = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_EINFO_parity_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *arg1 = (ctb::SerialPort_EINFO *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_EINFO_parity_get",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_EINFO, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_EINFO_parity_get" "', argument " "1"" of type '" "ctb::SerialPort_EINFO *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_EINFO * >(argp1);
-  result = (int) ((arg1)->parity);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_SerialPort_EINFO(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"new_SerialPort_EINFO",0,0)) SWIG_fail;
-  result = (ctb::SerialPort_EINFO *)new ctb::SerialPort_EINFO();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ctb__SerialPort_EINFO, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_SerialPort_EINFO(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_EINFO *arg1 = (ctb::SerialPort_EINFO *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"delete_SerialPort_EINFO",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_EINFO, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SerialPort_EINFO" "', argument " "1"" of type '" "ctb::SerialPort_EINFO *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_EINFO * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *SerialPort_EINFO_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_ctb__SerialPort_EINFO, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_delete_SerialPort_x(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"delete_SerialPort_x",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SerialPort_x" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_ClassName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_x_ClassName",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_ClassName" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  result = (char *)(arg1)->ClassName();
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_ChangeLineState(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  ctb::SerialLineState arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flags", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_x_ChangeLineState",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_ChangeLineState" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_x_ChangeLineState" "', argument " "2"" of type '" "ctb::SerialLineState""'");
-  } 
-  arg2 = static_cast< ctb::SerialLineState >(val2);
-  result = (int)(arg1)->ChangeLineState(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_ClrLineState(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  ctb::SerialLineState arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flags", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_x_ClrLineState",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_ClrLineState" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_x_ClrLineState" "', argument " "2"" of type '" "ctb::SerialLineState""'");
-  } 
-  arg2 = static_cast< ctb::SerialLineState >(val2);
-  result = (int)(arg1)->ClrLineState(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_GetLineState(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_x_GetLineState",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_GetLineState" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  result = (int)(arg1)->GetLineState();
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_GetSettingsAsString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_x_GetSettingsAsString",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_GetSettingsAsString" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  result = (char *)(arg1)->GetSettingsAsString();
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_Ioctl(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  int arg2 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "cmd",(char *) "args", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SerialPort_x_Ioctl",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_Ioctl" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_x_Ioctl" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SerialPort_x_Ioctl" "', argument " "3"" of type '" "void *""'"); 
-  }
-  result = (int)(arg1)->Ioctl(arg2,arg3);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_SendBreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "duration", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_x_SendBreak",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_SendBreak" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_x_SendBreak" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  result = (int)(arg1)->SendBreak(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_SetBaudrate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "baudrate", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_x_SetBaudrate",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_SetBaudrate" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_x_SetBaudrate" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  result = (int)(arg1)->SetBaudrate(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_SetLineState(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  ctb::SerialLineState arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flags", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_x_SetLineState",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_SetLineState" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_x_SetLineState" "', argument " "2"" of type '" "ctb::SerialLineState""'");
-  } 
-  arg2 = static_cast< ctb::SerialLineState >(val2);
-  result = (int)(arg1)->SetLineState(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_SetParityBit(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort_x *arg1 = (ctb::SerialPort_x *) 0 ;
-  bool arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "parity", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_x_SetParityBit",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort_x, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_x_SetParityBit" "', argument " "1"" of type '" "ctb::SerialPort_x *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort_x * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_x_SetParityBit" "', argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
-  result = (int)(arg1)->SetParityBit(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_x_IsStandardRate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  long arg1 ;
-  long val1 ;
-  int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  char *  kwnames[] = {
-    (char *) "rate", NULL 
-  };
-  bool result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SerialPort_x_IsStandardRate",kwnames,&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_long(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "SerialPort_x_IsStandardRate" "', argument " "1"" of type '" "long""'");
-  } 
-  arg1 = static_cast< long >(val1);
-  result = (bool)ctb::SerialPort_x::IsStandardRate(arg1);
-  resultobj = SWIG_From_bool(static_cast< bool >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *SerialPort_x_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_ctb__SerialPort_x, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_new_SerialPort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *result = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"new_SerialPort",0,0)) SWIG_fail;
-  result = (ctb::SerialPort *)new ctb::SerialPort();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ctb__SerialPort, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_SerialPort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"delete_SerialPort",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SerialPort" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_ChangeLineState(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  ctb::SerialLineState arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flags", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_ChangeLineState",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_ChangeLineState" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_ChangeLineState" "', argument " "2"" of type '" "ctb::SerialLineState""'");
-  } 
-  arg2 = static_cast< ctb::SerialLineState >(val2);
-  result = (int)(arg1)->ChangeLineState(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_ClrLineState(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  ctb::SerialLineState arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flags", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_ClrLineState",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_ClrLineState" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_ClrLineState" "', argument " "2"" of type '" "ctb::SerialLineState""'");
-  } 
-  arg2 = static_cast< ctb::SerialLineState >(val2);
-  result = (int)(arg1)->ClrLineState(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_GetLineState(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_GetLineState",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_GetLineState" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  result = (int)(arg1)->GetLineState();
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_Ioctl(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  int arg2 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "cmd",(char *) "args", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SerialPort_Ioctl",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_Ioctl" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_Ioctl" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SerialPort_Ioctl" "', argument " "3"" of type '" "void *""'"); 
-  }
-  result = (int)(arg1)->Ioctl(arg2,arg3);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_IsOpen(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  int result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"SerialPort_IsOpen",1,1,&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_IsOpen" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  result = (int)(arg1)->IsOpen();
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_Read(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "buf",(char *) "len", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SerialPort_Read",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_Read" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SerialPort_Read" "', argument " "2"" of type '" "char *""'");
-  }
-  arg2 = reinterpret_cast< char * >(buf2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SerialPort_Read" "', argument " "3"" of type '" "size_t""'");
-  } 
-  arg3 = static_cast< size_t >(val3);
-  result = (int)(arg1)->Read(arg2,arg3);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_SendBreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "duration", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_SendBreak",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_SendBreak" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_SendBreak" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  result = (int)(arg1)->SendBreak(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_SetBaudrate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "baudrate", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_SetBaudrate",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_SetBaudrate" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_SetBaudrate" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  result = (int)(arg1)->SetBaudrate(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_SetLineState(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  ctb::SerialLineState arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flags", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_SetLineState",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_SetLineState" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_SetLineState" "', argument " "2"" of type '" "ctb::SerialLineState""'");
-  } 
-  arg2 = static_cast< ctb::SerialLineState >(val2);
-  result = (int)(arg1)->SetLineState(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_SetParityBit(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  bool arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "parity", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SerialPort_SetParityBit",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_SetParityBit" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SerialPort_SetParityBit" "', argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
-  result = (int)(arg1)->SetParityBit(arg2);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SerialPort_Write(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  ctb::SerialPort *arg1 = (ctb::SerialPort *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "buf",(char *) "len", NULL 
-  };
-  int result;
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SerialPort_Write",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ctb__SerialPort, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SerialPort_Write" "', argument " "1"" of type '" "ctb::SerialPort *""'"); 
-  }
-  arg1 = reinterpret_cast< ctb::SerialPort * >(argp1);
-  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SerialPort_Write" "', argument " "2"" of type '" "char *""'");
-  }
-  arg2 = reinterpret_cast< char * >(buf2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SerialPort_Write" "', argument " "3"" of type '" "size_t""'");
-  } 
-  arg3 = static_cast< size_t >(val3);
-  result = (int)(arg1)->Write(arg2,arg3);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return resultobj;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *SerialPort_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_ctb__SerialPort, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_GetKey(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char result;
-  
-  if(!PyArg_UnpackTuple(args,(char *)"GetKey",0,0)) SWIG_fail;
-  result = (char)ctb::GetKey();
-  resultobj = SWIG_From_char(static_cast< char >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-static PyMethodDef SwigMethods[] = {
-	 { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
-	 { (char *)"new_intp", _wrap_new_intp, METH_VARARGS, NULL},
-	 { (char *)"copy_intp", (PyCFunction) _wrap_copy_intp, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"delete_intp", (PyCFunction) _wrap_delete_intp, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"intp_assign", (PyCFunction) _wrap_intp_assign, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"intp_value", (PyCFunction) _wrap_intp_value, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"timer_control_usecs_set", _wrap_timer_control_usecs_set, METH_VARARGS, NULL},
-	 { (char *)"timer_control_usecs_get", _wrap_timer_control_usecs_get, METH_VARARGS, NULL},
-	 { (char *)"timer_control_exitflag_set", _wrap_timer_control_exitflag_set, METH_VARARGS, NULL},
-	 { (char *)"timer_control_exitflag_get", _wrap_timer_control_exitflag_get, METH_VARARGS, NULL},
-	 { (char *)"timer_control_exitfnc_set", _wrap_timer_control_exitfnc_set, METH_VARARGS, NULL},
-	 { (char *)"timer_control_exitfnc_get", _wrap_timer_control_exitfnc_get, METH_VARARGS, NULL},
-	 { (char *)"timer_control_swigregister", timer_control_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Timer", (PyCFunction) _wrap_new_Timer, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"delete_Timer", _wrap_delete_Timer, METH_VARARGS, NULL},
-	 { (char *)"Timer_start", _wrap_Timer_start, METH_VARARGS, NULL},
-	 { (char *)"Timer_stop", _wrap_Timer_stop, METH_VARARGS, NULL},
-	 { (char *)"Timer_swigregister", Timer_swigregister, METH_VARARGS, NULL},
-	 { (char *)"sleepms", (PyCFunction) _wrap_sleepms, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"delete_IOBase", _wrap_delete_IOBase, METH_VARARGS, NULL},
-	 { (char *)"IOBase_ClassName", _wrap_IOBase_ClassName, METH_VARARGS, NULL},
-	 { (char *)"IOBase_Close", _wrap_IOBase_Close, METH_VARARGS, NULL},
-	 { (char *)"IOBase_Ioctl", (PyCFunction) _wrap_IOBase_Ioctl, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"IOBase_IsOpen", _wrap_IOBase_IsOpen, METH_VARARGS, NULL},
-	 { (char *)"IOBase_Open", (PyCFunction) _wrap_IOBase_Open, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"IOBase_PutBack", (PyCFunction) _wrap_IOBase_PutBack, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"IOBase_Read", (PyCFunction) _wrap_IOBase_Read, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"IOBase_ReadUntilEOS", (PyCFunction) _wrap_IOBase_ReadUntilEOS, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"IOBase_Readv", (PyCFunction) _wrap_IOBase_Readv, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"IOBase_Write", (PyCFunction) _wrap_IOBase_Write, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"IOBase_Writev", (PyCFunction) _wrap_IOBase_Writev, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"IOBase_swigregister", IOBase_swigregister, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_baud_set", _wrap_SerialPort_DCS_baud_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_baud_get", _wrap_SerialPort_DCS_baud_get, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_parity_set", _wrap_SerialPort_DCS_parity_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_parity_get", _wrap_SerialPort_DCS_parity_get, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_wordlen_set", _wrap_SerialPort_DCS_wordlen_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_wordlen_get", _wrap_SerialPort_DCS_wordlen_get, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_stopbits_set", _wrap_SerialPort_DCS_stopbits_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_stopbits_get", _wrap_SerialPort_DCS_stopbits_get, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_rtscts_set", _wrap_SerialPort_DCS_rtscts_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_rtscts_get", _wrap_SerialPort_DCS_rtscts_get, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_xonxoff_set", _wrap_SerialPort_DCS_xonxoff_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_xonxoff_get", _wrap_SerialPort_DCS_xonxoff_get, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_buf_set", _wrap_SerialPort_DCS_buf_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_buf_get", _wrap_SerialPort_DCS_buf_get, METH_VARARGS, NULL},
-	 { (char *)"new_SerialPort_DCS", _wrap_new_SerialPort_DCS, METH_VARARGS, NULL},
-	 { (char *)"delete_SerialPort_DCS", _wrap_delete_SerialPort_DCS, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_GetSettings", _wrap_SerialPort_DCS_GetSettings, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_DCS_swigregister", SerialPort_DCS_swigregister, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_EINFO_brk_set", _wrap_SerialPort_EINFO_brk_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_EINFO_brk_get", _wrap_SerialPort_EINFO_brk_get, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_EINFO_frame_set", _wrap_SerialPort_EINFO_frame_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_EINFO_frame_get", _wrap_SerialPort_EINFO_frame_get, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_EINFO_overrun_set", _wrap_SerialPort_EINFO_overrun_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_EINFO_overrun_get", _wrap_SerialPort_EINFO_overrun_get, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_EINFO_parity_set", _wrap_SerialPort_EINFO_parity_set, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_EINFO_parity_get", _wrap_SerialPort_EINFO_parity_get, METH_VARARGS, NULL},
-	 { (char *)"new_SerialPort_EINFO", _wrap_new_SerialPort_EINFO, METH_VARARGS, NULL},
-	 { (char *)"delete_SerialPort_EINFO", _wrap_delete_SerialPort_EINFO, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_EINFO_swigregister", SerialPort_EINFO_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_SerialPort_x", _wrap_delete_SerialPort_x, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_x_ClassName", _wrap_SerialPort_x_ClassName, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_x_ChangeLineState", (PyCFunction) _wrap_SerialPort_x_ChangeLineState, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_x_ClrLineState", (PyCFunction) _wrap_SerialPort_x_ClrLineState, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_x_GetLineState", _wrap_SerialPort_x_GetLineState, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_x_GetSettingsAsString", _wrap_SerialPort_x_GetSettingsAsString, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_x_Ioctl", (PyCFunction) _wrap_SerialPort_x_Ioctl, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_x_SendBreak", (PyCFunction) _wrap_SerialPort_x_SendBreak, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_x_SetBaudrate", (PyCFunction) _wrap_SerialPort_x_SetBaudrate, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_x_SetLineState", (PyCFunction) _wrap_SerialPort_x_SetLineState, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_x_SetParityBit", (PyCFunction) _wrap_SerialPort_x_SetParityBit, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_x_IsStandardRate", (PyCFunction) _wrap_SerialPort_x_IsStandardRate, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_x_swigregister", SerialPort_x_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SerialPort", _wrap_new_SerialPort, METH_VARARGS, NULL},
-	 { (char *)"delete_SerialPort", _wrap_delete_SerialPort, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_ChangeLineState", (PyCFunction) _wrap_SerialPort_ChangeLineState, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_ClrLineState", (PyCFunction) _wrap_SerialPort_ClrLineState, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_GetLineState", _wrap_SerialPort_GetLineState, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_Ioctl", (PyCFunction) _wrap_SerialPort_Ioctl, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_IsOpen", _wrap_SerialPort_IsOpen, METH_VARARGS, NULL},
-	 { (char *)"SerialPort_Read", (PyCFunction) _wrap_SerialPort_Read, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_SendBreak", (PyCFunction) _wrap_SerialPort_SendBreak, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_SetBaudrate", (PyCFunction) _wrap_SerialPort_SetBaudrate, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_SetLineState", (PyCFunction) _wrap_SerialPort_SetLineState, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_SetParityBit", (PyCFunction) _wrap_SerialPort_SetParityBit, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_Write", (PyCFunction) _wrap_SerialPort_Write, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"SerialPort_swigregister", SerialPort_swigregister, METH_VARARGS, NULL},
-	 { (char *)"GetKey", _wrap_GetKey, METH_VARARGS, NULL},
-	 { NULL, NULL, 0, NULL }
-};
-
-
-/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
-
-static void *_p_ctb__SerialPort_xTo_p_ctb__IOBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((ctb::IOBase *)  ((ctb::SerialPort_x *) x));
-}
-static void *_p_ctb__SerialPortTo_p_ctb__IOBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((ctb::IOBase *) (ctb::SerialPort_x *) ((ctb::SerialPort *) x));
-}
-static void *_p_ctb__SerialPortTo_p_ctb__SerialPort_x(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((ctb::SerialPort_x *)  ((ctb::SerialPort *) x));
-}
-static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ctb__IOBase = {"_p_ctb__IOBase", "ctb::IOBase *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ctb__SerialPort = {"_p_ctb__SerialPort", "ctb::SerialPort *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ctb__SerialPort_DCS = {"_p_ctb__SerialPort_DCS", "ctb::SerialPort_DCS *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ctb__SerialPort_EINFO = {"_p_ctb__SerialPort_EINFO", "ctb::SerialPort_EINFO *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ctb__SerialPort_x = {"_p_ctb__SerialPort_x", "ctb::SerialPort_x *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ctb__Timer = {"_p_ctb__Timer", "ctb::Timer *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ctb__timer_control = {"_p_ctb__timer_control", "ctb::timer_control *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_void__p_void = {"_p_f_p_void__p_void", "void *(*)(void *)", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "int *|size_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
-
-static swig_type_info *swig_type_initial[] = {
-  &_swigt__p_char,
-  &_swigt__p_ctb__IOBase,
-  &_swigt__p_ctb__SerialPort,
-  &_swigt__p_ctb__SerialPort_DCS,
-  &_swigt__p_ctb__SerialPort_EINFO,
-  &_swigt__p_ctb__SerialPort_x,
-  &_swigt__p_ctb__Timer,
-  &_swigt__p_ctb__timer_control,
-  &_swigt__p_f_p_void__p_void,
-  &_swigt__p_int,
-  &_swigt__p_p_char,
-};
-
-static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ctb__IOBase[] = {  {&_swigt__p_ctb__IOBase, 0, 0, 0},  {&_swigt__p_ctb__SerialPort_x, _p_ctb__SerialPort_xTo_p_ctb__IOBase, 0, 0},  {&_swigt__p_ctb__SerialPort, _p_ctb__SerialPortTo_p_ctb__IOBase, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ctb__SerialPort[] = {  {&_swigt__p_ctb__SerialPort, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ctb__SerialPort_DCS[] = {  {&_swigt__p_ctb__SerialPort_DCS, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ctb__SerialPort_EINFO[] = {  {&_swigt__p_ctb__SerialPort_EINFO, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ctb__SerialPort_x[] = {  {&_swigt__p_ctb__SerialPort_x, 0, 0, 0},  {&_swigt__p_ctb__SerialPort, _p_ctb__SerialPortTo_p_ctb__SerialPort_x, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ctb__Timer[] = {  {&_swigt__p_ctb__Timer, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ctb__timer_control[] = {  {&_swigt__p_ctb__timer_control, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_void__p_void[] = {  {&_swigt__p_f_p_void__p_void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
-
-static swig_cast_info *swig_cast_initial[] = {
-  _swigc__p_char,
-  _swigc__p_ctb__IOBase,
-  _swigc__p_ctb__SerialPort,
-  _swigc__p_ctb__SerialPort_DCS,
-  _swigc__p_ctb__SerialPort_EINFO,
-  _swigc__p_ctb__SerialPort_x,
-  _swigc__p_ctb__Timer,
-  _swigc__p_ctb__timer_control,
-  _swigc__p_f_p_void__p_void,
-  _swigc__p_int,
-  _swigc__p_p_char,
-};
-
-
-/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
-
-static swig_const_info swig_const_table[] = {
-{0, 0, 0, 0.0, 0, 0}};
-
-#ifdef __cplusplus
-}
-#endif
-/* -----------------------------------------------------------------------------
- * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
- * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
- * swig_module, and does all the lookup, filling in the swig_module.types
- * array with the correct data and linking the correct swig_cast_info
- * structures together.
- *
- * The generated swig_type_info structures are assigned staticly to an initial 
- * array. We just loop through that array, and handle each type individually.
- * First we lookup if this type has been already loaded, and if so, use the
- * loaded structure instead of the generated one. Then we have to fill in the
- * cast linked list. The cast data is initially stored in something like a
- * two-dimensional array. Each row corresponds to a type (there are the same
- * number of rows as there are in the swig_type_initial array). Each entry in
- * a column is one of the swig_cast_info structures for that type.
- * The cast_initial array is actually an array of arrays, because each row has
- * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
- * adding the casts to the list. The one last trick we need to do is making
- * sure the type pointer in the swig_cast_info struct is correct.
- *
- * First off, we lookup the cast->type name to see if it is already loaded. 
- * There are three cases to handle:
- *  1) If the cast->type has already been loaded AND the type we are adding
- *     casting info to has not been loaded (it is in this module), THEN we
- *     replace the cast->type pointer with the type pointer that has already
- *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
- *     cast->type) are loaded, THEN the cast info has already been loaded by
- *     the previous module so we just ignore it.
- *  3) Finally, if cast->type has not already been loaded, then we add that
- *     swig_cast_info to the linked list (because the cast->type) pointer will
- *     be correct.
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-extern "C" {
-#if 0
-} /* c-mode */
-#endif
-#endif
-
-#if 0
-#define SWIGRUNTIME_DEBUG
-#endif
-
-
-SWIGRUNTIME void
-SWIG_InitializeModule(void *clientdata) {
-  size_t i;
-  swig_module_info *module_head, *iter;
-  int found, init;
-  
-  clientdata = clientdata;
-  
-  /* check to see if the circular list has been setup, if not, set it up */
-  if (swig_module.next==0) {
-    /* Initialize the swig_module */
-    swig_module.type_initial = swig_type_initial;
-    swig_module.cast_initial = swig_cast_initial;
-    swig_module.next = &swig_module;
-    init = 1;
-  } else {
-    init = 0;
-  }
-  
-  /* Try and load any already created modules */
-  module_head = SWIG_GetModule(clientdata);
-  if (!module_head) {
-    /* This is the first module loaded for this interpreter */
-    /* so set the swig module into the interpreter */
-    SWIG_SetModule(clientdata, &swig_module);
-    module_head = &swig_module;
-  } else {
-    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
-    found=0;
-    iter=module_head;
-    do {
-      if (iter==&swig_module) {
-        found=1;
-        break;
-      }
-      iter=iter->next;
-    } while (iter!= module_head);
-    
-    /* if the is found in the list, then all is done and we may leave */
-    if (found) return;
-    /* otherwise we must add out module into the list */
-    swig_module.next = module_head->next;
-    module_head->next = &swig_module;
-  }
-  
-  /* When multiple interpeters are used, a module could have already been initialized in
-       a different interpreter, but not yet have a pointer in this interpreter.
-       In this case, we do not want to continue adding types... everything should be
-       set up already */
-  if (init == 0) return;
-  
-  /* Now work on filling in swig_module.types */
-#ifdef SWIGRUNTIME_DEBUG
-  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
-#endif
-  for (i = 0; i < swig_module.size; ++i) {
-    swig_type_info *type = 0;
-    swig_type_info *ret;
-    swig_cast_info *cast;
-    
-#ifdef SWIGRUNTIME_DEBUG
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
-#endif
-    
-    /* if there is another module already loaded */
-    if (swig_module.next != &swig_module) {
-      type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name);
-    }
-    if (type) {
-      /* Overwrite clientdata field */
-#ifdef SWIGRUNTIME_DEBUG
-      printf("SWIG_InitializeModule: found type %s\n", type->name);
-#endif
-      if (swig_module.type_initial[i]->clientdata) {
-        type->clientdata = swig_module.type_initial[i]->clientdata;
-#ifdef SWIGRUNTIME_DEBUG
-        printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name);
-#endif
-      }
-    } else {
-      type = swig_module.type_initial[i];
-    }
-    
-    /* Insert casting types */
-    cast = swig_module.cast_initial[i];
-    while (cast->type) {
-      /* Don't need to add information already in the list */
-      ret = 0;
-#ifdef SWIGRUNTIME_DEBUG
-      printf("SWIG_InitializeModule: look cast %s\n", cast->type->name);
-#endif
-      if (swig_module.next != &swig_module) {
-        ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name);
-#ifdef SWIGRUNTIME_DEBUG
-        if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name);
-#endif
-      }
-      if (ret) {
-        if (type == swig_module.type_initial[i]) {
-#ifdef SWIGRUNTIME_DEBUG
-          printf("SWIG_InitializeModule: skip old type %s\n", ret->name);
-#endif
-          cast->type = ret;
-          ret = 0;
-        } else {
-          /* Check for casting already in the list */
-          swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type);
-#ifdef SWIGRUNTIME_DEBUG
-          if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name);
-#endif
-          if (!ocast) ret = 0;
-        }
-      }
-      
-      if (!ret) {
-#ifdef SWIGRUNTIME_DEBUG
-        printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
-#endif
-        if (type->cast) {
-          type->cast->prev = cast;
-          cast->next = type->cast;
-        }
-        type->cast = cast;
-      }
-      cast++;
-    }
-    /* Set entry in modules->types array equal to the type */
-    swig_module.types[i] = type;
-  }
-  swig_module.types[i] = 0;
-  
-#ifdef SWIGRUNTIME_DEBUG
-  printf("**** SWIG_InitializeModule: Cast List ******\n");
-  for (i = 0; i < swig_module.size; ++i) {
-    int j = 0;
-    swig_cast_info *cast = swig_module.cast_initial[i];
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
-    while (cast->type) {
-      printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
-      cast++;
-      ++j;
-    }
-    printf("---- Total casts: %d\n",j);
-  }
-  printf("**** SWIG_InitializeModule: Cast List ******\n");
-#endif
-}
-
-/* This function will propagate the clientdata field of type to
-* any new swig_type_info structures that have been added into the list
-* of equivalent types.  It is like calling
-* SWIG_TypeClientData(type, clientdata) a second time.
-*/
-SWIGRUNTIME void
-SWIG_PropagateClientData(void) {
-  size_t i;
-  swig_cast_info *equiv;
-  static int init_run = 0;
-  
-  if (init_run) return;
-  init_run = 1;
-  
-  for (i = 0; i < swig_module.size; i++) {
-    if (swig_module.types[i]->clientdata) {
-      equiv = swig_module.types[i]->cast;
-      while (equiv) {
-        if (!equiv->converter) {
-          if (equiv->type && !equiv->type->clientdata)
-          SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata);
-        }
-        equiv = equiv->next;
-      }
-    }
-  }
-}
-
-#ifdef __cplusplus
-#if 0
-{
-  /* c-mode */
-#endif
-}
-#endif
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-  
-  /* Python-specific SWIG API */
-#define SWIG_newvarlink()                             SWIG_Python_newvarlink()
-#define SWIG_addvarlink(p, name, get_attr, set_attr)  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
-#define SWIG_InstallConstants(d, constants)           SWIG_Python_InstallConstants(d, constants)
-  
-  /* -----------------------------------------------------------------------------
-   * global variable support code.
-   * ----------------------------------------------------------------------------- */
-  
-  typedef struct swig_globalvar {
-    char       *name;                  /* Name of global variable */
-    PyObject *(*get_attr)(void);       /* Return the current value */
-    int       (*set_attr)(PyObject *); /* Set the value */
-    struct swig_globalvar *next;
-  } swig_globalvar;
-  
-  typedef struct swig_varlinkobject {
-    PyObject_HEAD
-    swig_globalvar *vars;
-  } swig_varlinkobject;
-  
-  SWIGINTERN PyObject *
-  swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
-#if PY_VERSION_HEX >= 0x03000000
-    return PyUnicode_InternFromString("<Swig global variables>");
-#else
-    return PyString_FromString("<Swig global variables>");
-#endif
-  }
-  
-  SWIGINTERN PyObject *
-  swig_varlink_str(swig_varlinkobject *v) {
-#if PY_VERSION_HEX >= 0x03000000
-    PyObject *str = PyUnicode_InternFromString("(");
-    PyObject *tail;
-    PyObject *joined;
-    swig_globalvar *var;
-    for (var = v->vars; var; var=var->next) {
-      tail = PyUnicode_FromString(var->name);
-      joined = PyUnicode_Concat(str, tail);
-      Py_DecRef(str);
-      Py_DecRef(tail);
-      str = joined;
-      if (var->next) {
-        tail = PyUnicode_InternFromString(", ");
-        joined = PyUnicode_Concat(str, tail);
-        Py_DecRef(str);
-        Py_DecRef(tail);
-        str = joined;
-      }
-    }
-    tail = PyUnicode_InternFromString(")");
-    joined = PyUnicode_Concat(str, tail);
-    Py_DecRef(str);
-    Py_DecRef(tail);
-    str = joined;
-#else
-    PyObject *str = PyString_FromString("(");
-    swig_globalvar *var;
-    for (var = v->vars; var; var=var->next) {
-      PyString_ConcatAndDel(&str,PyString_FromString(var->name));
-      if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
-    }
-    PyString_ConcatAndDel(&str,PyString_FromString(")"));
-#endif
-    return str;
-  }
-  
-  SWIGINTERN int
-  swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
-    char *tmp;
-    PyObject *str = swig_varlink_str(v);
-    fprintf(fp,"Swig global variables ");
-    fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
-    SWIG_Python_str_DelForPy3(tmp);
-    Py_DECREF(str);
-    return 0;
-  }
-  
-  SWIGINTERN void
-  swig_varlink_dealloc(swig_varlinkobject *v) {
-    swig_globalvar *var = v->vars;
-    while (var) {
-      swig_globalvar *n = var->next;
-      free(var->name);
-      free(var);
-      var = n;
-    }
-  }
-  
-  SWIGINTERN PyObject *
-  swig_varlink_getattr(swig_varlinkobject *v, char *n) {
-    PyObject *res = NULL;
-    swig_globalvar *var = v->vars;
-    while (var) {
-      if (strcmp(var->name,n) == 0) {
-        res = (*var->get_attr)();
-        break;
-      }
-      var = var->next;
-    }
-    if (res == NULL && !PyErr_Occurred()) {
-      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
-    }
-    return res;
-  }
-  
-  SWIGINTERN int
-  swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
-    int res = 1;
-    swig_globalvar *var = v->vars;
-    while (var) {
-      if (strcmp(var->name,n) == 0) {
-        res = (*var->set_attr)(p);
-        break;
-      }
-      var = var->next;
-    }
-    if (res == 1 && !PyErr_Occurred()) {
-      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
-    }
-    return res;
-  }
-  
-  SWIGINTERN PyTypeObject*
-  swig_varlink_type(void) {
-    static char varlink__doc__[] = "Swig var link object";
-    static PyTypeObject varlink_type;
-    static int type_init = 0;  
-    if (!type_init) {
-      const PyTypeObject tmp
-      = {
-        /* PyObject header changed in Python 3 */
-#if PY_VERSION_HEX >= 0x03000000
-        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-#else
-        PyObject_HEAD_INIT(NULL)
-        0,                                  /* Number of items in variable part (ob_size) */
-#endif
-        (char *)"swigvarlink",              /* Type name (tp_name) */
-        sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
-        0,                                  /* Itemsize (tp_itemsize) */
-        (destructor) swig_varlink_dealloc,  /* Deallocator (tp_dealloc) */ 
-        (printfunc) swig_varlink_print,     /* Print (tp_print) */
-        (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
-        (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
-        0,                                  /* tp_compare */
-        (reprfunc) swig_varlink_repr,       /* tp_repr */
-        0,                                  /* tp_as_number */
-        0,                                  /* tp_as_sequence */
-        0,                                  /* tp_as_mapping */
-        0,                                  /* tp_hash */
-        0,                                  /* tp_call */
-        (reprfunc) swig_varlink_str,        /* tp_str */
-        0,                                  /* tp_getattro */
-        0,                                  /* tp_setattro */
-        0,                                  /* tp_as_buffer */
-        0,                                  /* tp_flags */
-        varlink__doc__,                     /* tp_doc */
-        0,                                  /* tp_traverse */
-        0,                                  /* tp_clear */
-        0,                                  /* tp_richcompare */
-        0,                                  /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
-        0,                                  /* tp_del */
-#endif
-#ifdef COUNT_ALLOCS
-        0,0,0,0                             /* tp_alloc -> tp_next */
-#endif
-      };
-      varlink_type = tmp;
-      /* for Python 3 we already assigned ob_type in PyVarObject_HEAD_INIT() */
-#if PY_VERSION_HEX < 0x03000000
-      varlink_type.ob_type = &PyType_Type;
-#endif
-      type_init = 1;
-    }
-    return &varlink_type;
-  }
-  
-  /* Create a variable linking object for use later */
-  SWIGINTERN PyObject *
-  SWIG_Python_newvarlink(void) {
-    swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
-    if (result) {
-      result->vars = 0;
-    }
-    return ((PyObject*) result);
-  }
-  
-  SWIGINTERN void 
-  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
-    swig_varlinkobject *v = (swig_varlinkobject *) p;
-    swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
-    if (gv) {
-      size_t size = strlen(name)+1;
-      gv->name = (char *)malloc(size);
-      if (gv->name) {
-        strncpy(gv->name,name,size);
-        gv->get_attr = get_attr;
-        gv->set_attr = set_attr;
-        gv->next = v->vars;
-      }
-    }
-    v->vars = gv;
-  }
-  
-  SWIGINTERN PyObject *
-  SWIG_globals(void) {
-    static PyObject *_SWIG_globals = 0; 
-    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
-    return _SWIG_globals;
-  }
-  
-  /* -----------------------------------------------------------------------------
-   * constants/methods manipulation
-   * ----------------------------------------------------------------------------- */
-  
-  /* Install Constants */
-  SWIGINTERN void
-  SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
-    PyObject *obj = 0;
-    size_t i;
-    for (i = 0; constants[i].type; ++i) {
-      switch(constants[i].type) {
-      case SWIG_PY_POINTER:
-        obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
-        break;
-      case SWIG_PY_BINARY:
-        obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
-        break;
-      default:
-        obj = 0;
-        break;
-      }
-      if (obj) {
-        PyDict_SetItemString(d, constants[i].name, obj);
-        Py_DECREF(obj);
-      }
-    }
-  }
-  
-  /* -----------------------------------------------------------------------------*/
-  /* Fix SwigMethods to carry the callback ptrs when needed */
-  /* -----------------------------------------------------------------------------*/
-  
-  SWIGINTERN void
-  SWIG_Python_FixMethods(PyMethodDef *methods,
-    swig_const_info *const_table,
-    swig_type_info **types,
-    swig_type_info **types_initial) {
-    size_t i;
-    for (i = 0; methods[i].ml_name; ++i) {
-      const char *c = methods[i].ml_doc;
-      if (c && (c = strstr(c, "swig_ptr: "))) {
-        int j;
-        swig_const_info *ci = 0;
-        const char *name = c + 10;
-        for (j = 0; const_table[j].type; ++j) {
-          if (strncmp(const_table[j].name, name, 
-              strlen(const_table[j].name)) == 0) {
-            ci = &(const_table[j]);
-            break;
-          }
-        }
-        if (ci) {
-          size_t shift = (ci->ptype) - types;
-          swig_type_info *ty = types_initial[shift];
-          size_t ldoc = (c - methods[i].ml_doc);
-          size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
-          char *ndoc = (char*)malloc(ldoc + lptr + 10);
-          if (ndoc) {
-            char *buff = ndoc;
-            void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
-            if (ptr) {
-              strncpy(buff, methods[i].ml_doc, ldoc);
-              buff += ldoc;
-              strncpy(buff, "swig_ptr: ", 10);
-              buff += 10;
-              SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
-              methods[i].ml_doc = ndoc;
-            }
-          }
-        }
-      }
-    }
-  } 
-  
-#ifdef __cplusplus
-}
-#endif
-
-/* -----------------------------------------------------------------------------*
- *  Partial Init method
- * -----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-extern "C"
-#endif
-
-SWIGEXPORT 
-#if PY_VERSION_HEX >= 0x03000000
-PyObject*
-#else
-void
-#endif
-SWIG_init(void) {
-  PyObject *m, *d;  
-#if PY_VERSION_HEX >= 0x03000000
-  static struct PyModuleDef SWIG_module = {
-    PyModuleDef_HEAD_INIT,
-    (char *) SWIG_name,
-    NULL,
-    -1,
-    SwigMethods,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-  };
-#endif
-  
-  /* Fix SwigMethods to carry the callback ptrs when needed */
-  SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
-  
-#if PY_VERSION_HEX >= 0x03000000
-  m = PyModule_Create(&SWIG_module);
-#else
-  m = Py_InitModule((char *) SWIG_name, SwigMethods);
-#endif
-  d = PyModule_GetDict(m);
-  
-  SWIG_InitializeModule(0);
-  SWIG_InstallConstants(d,swig_const_table);
-  
-  
-  SWIG_Python_SetConstant(d, "CTB_RESET",SWIG_From_int(static_cast< int >(ctb::CTB_RESET)));
-  SWIG_Python_SetConstant(d, "ParityNone",SWIG_From_int(static_cast< int >(ctb::ParityNone)));
-  SWIG_Python_SetConstant(d, "ParityOdd",SWIG_From_int(static_cast< int >(ctb::ParityOdd)));
-  SWIG_Python_SetConstant(d, "ParityEven",SWIG_From_int(static_cast< int >(ctb::ParityEven)));
-  SWIG_Python_SetConstant(d, "ParityMark",SWIG_From_int(static_cast< int >(ctb::ParityMark)));
-  SWIG_Python_SetConstant(d, "ParitySpace",SWIG_From_int(static_cast< int >(ctb::ParitySpace)));
-  SWIG_Python_SetConstant(d, "LinestateDcd",SWIG_From_int(static_cast< int >(ctb::LinestateDcd)));
-  SWIG_Python_SetConstant(d, "LinestateCts",SWIG_From_int(static_cast< int >(ctb::LinestateCts)));
-  SWIG_Python_SetConstant(d, "LinestateDsr",SWIG_From_int(static_cast< int >(ctb::LinestateDsr)));
-  SWIG_Python_SetConstant(d, "LinestateDtr",SWIG_From_int(static_cast< int >(ctb::LinestateDtr)));
-  SWIG_Python_SetConstant(d, "LinestateRing",SWIG_From_int(static_cast< int >(ctb::LinestateRing)));
-  SWIG_Python_SetConstant(d, "LinestateRts",SWIG_From_int(static_cast< int >(ctb::LinestateRts)));
-  SWIG_Python_SetConstant(d, "LinestateNull",SWIG_From_int(static_cast< int >(ctb::LinestateNull)));
-  SWIG_Python_SetConstant(d, "CTB_SER_GETEINFO",SWIG_From_int(static_cast< int >(ctb::CTB_SER_GETEINFO)));
-  SWIG_Python_SetConstant(d, "CTB_SER_GETBRK",SWIG_From_int(static_cast< int >(ctb::CTB_SER_GETBRK)));
-  SWIG_Python_SetConstant(d, "CTB_SER_GETFRM",SWIG_From_int(static_cast< int >(ctb::CTB_SER_GETFRM)));
-  SWIG_Python_SetConstant(d, "CTB_SER_GETOVR",SWIG_From_int(static_cast< int >(ctb::CTB_SER_GETOVR)));
-  SWIG_Python_SetConstant(d, "CTB_SER_GETPAR",SWIG_From_int(static_cast< int >(ctb::CTB_SER_GETPAR)));
-  SWIG_Python_SetConstant(d, "CTB_SER_GETINQUE",SWIG_From_int(static_cast< int >(ctb::CTB_SER_GETINQUE)));
-  SWIG_Python_SetConstant(d, "CTB_SER_SETPAR",SWIG_From_int(static_cast< int >(ctb::CTB_SER_SETPAR)));
-#if PY_VERSION_HEX >= 0x03000000
-  return m;
-#else
-  return;
-#endif
-}
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/serportx.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/serportx.i
deleted file mode 100644
index 083daddab4..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/serportx.i
+++ /dev/null
@@ -1,84 +0,0 @@
-%{
-#include "ctb-0.16/serportx.h"
-%}
-
-%include iobase.i
-
-namespace ctb {
-
-enum Parity
-{
-    ParityNone,
-    ParityOdd,
-    ParityEven,
-    ParityMark,
-    ParitySpace
-};
-
-enum SerialLineState
-{
-    LinestateDcd = 0x040,
-    LinestateCts = 0x020,
-    LinestateDsr = 0x100,
-    LinestateDtr = 0x002,
-    LinestateRing = 0x080,
-    LinestateRts = 0x004,
-    LinestateNull = 0x000
-};
-
-struct SerialPort_DCS
-{
-    int baud;
-    Parity parity;
-    unsigned char wordlen;
-    unsigned char stopbits;
-    bool rtscts;
-    bool xonxoff;
-    char buf[16];
-    SerialPort_DCS();
-    ~SerialPort_DCS();
-    char* GetSettings();
-}; 
-
-struct SerialPort_EINFO
-{
-    int brk;
-    int frame;
-    int overrun;
-    int parity;
-    SerialPort_EINFO();
-    ~SerialPort_EINFO();
-};
-
-enum {
-    CTB_SER_GETEINFO = CTB_SERIAL,
-    CTB_SER_GETBRK,
-    CTB_SER_GETFRM,
-    CTB_SER_GETOVR,
-    CTB_SER_GETPAR,
-    CTB_SER_GETINQUE,
-    CTB_SER_SETPAR,
-};
-
-class SerialPort_x : public IOBase
-{
-protected:
-    SerialPort_DCS m_dcs;
-    char m_devname[SERIALPORT_NAME_LEN];
-public:
-    SerialPort_x();
-    virtual ~SerialPort_x();
-    const char* ClassName();
-    virtual int ChangeLineState(SerialLineState flags) = 0;
-    virtual int ClrLineState(SerialLineState flags) = 0;
-    virtual int GetLineState() = 0;
-    virtual char* GetSettingsAsString();
-    virtual int Ioctl(int cmd,void* args);
-    virtual int SendBreak(int duration) = 0;
-    virtual int SetBaudrate(int baudrate) = 0;
-    virtual int SetLineState(SerialLineState flags) = 0;
-    virtual int SetParityBit( bool parity ) = 0;
-    static bool IsStandardRate( long rate );
-};
-
-};
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/makepy.bat b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/makepy.bat
deleted file mode 100644
index 8320cb9e57..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/makepy.bat
+++ /dev/null
@@ -1,65 +0,0 @@
-@ECHO OFF
-
-REM ##################################################################
-REM # set the path/settings of your compiler enviroment and remove the
-REM # comment command (REM)
-REM # (you don't need this, if you set it always in your system
-REM # enviroment)
-REM ##################################################################
-REM CALL "c:\Programme\Microsoft Visual C++ Toolkit 2003\vcvars32.bat"
-
-REM ##################################################################
-REM # set the path to your python24 (or python23) library, for example
-REM # works for me with C:\Program Files\Python2.4\libs\python24.lib
-REM ##################################################################
-SET PYTHON_LIB="C:\Program Files\Python2.4\libs\python24.lib"
-
-REM ##################################################################
-REM # set the include path of your python24 (python23) deleveloper
-REM # header files. For me, it's on C:\Program Files
-REM ################################################################## 
-SET PYTHON_INCLUDE="C:\Program Files\Python2.4\include"
-
-REM ##################################################################
-REM # after installing swig, set the path, so the script can find it
-REM ################################################################## 
-SET SWIG="C:\Program Files\swigwin-1.3.40\swig"
-
-REM ##################################################################
-REM # DON'T CHANGE ANYMORE AT THE FOLLOWING LINES!!!
-REM ##################################################################
-
-SET GPIB_LIB=
-SET GPIB_SRC=
-
-ECHO // This file is created automatically, don't change it! > wxctb.i
-ECHO %%module wxctb >> wxctb.i
-ECHO typedef int size_t; >> wxctb.i
-ECHO %%include timer.i >> wxctb.i
-ECHO %%include serport.i >> wxctb.i
-ECHO %%include ../kbhit.i >> wxctb.i
-
-IF NOT [%1]==[USE_GPIB] GOTO nogpib
-SET GPIB_LIB=../../../lib/gpib32.lib
-SET GPIB_SRC=../../../src/gpib.cpp
-ECHO %%include ../gpib.i >> wxctb.i
-
-:nogpib
-
-
-DEL *.obj wxctb_wrap.cxx *.lib *.dll *.exp
-
-ECHO "swig generates python wrapper files..."
-%SWIG% -c++ -Wall -nodefault -python -keyword -new_repr -modern wxctb.i
-
-ECHO "create shared library wxctb for python 2.4..."
-cl /LD /D WIN32 /I %PYTHON_INCLUDE% /I ../../../include wxctb_wrap.cxx ../../../src/win32/serport.cpp ../../../src/serportx.cpp ../../../src/win32/timer.cpp ../../../src/kbhit.cpp ../../../src/iobase.cpp %GPIB_SRC% ../../../src/fifo.cpp /link %PYTHON_LIB% winmm.lib %GPIB_LIB%
-
-MOVE wxctb_wrap.dll _wxctb.dll
-
-ECHO "copy ctb.py, wxctb.py and _wxctb.so to the module/win32 folder..."
-MKDIR ..\..\module\win32
-COPY ..\ctb.py ..\..\module\win32
-COPY wxctb.py ..\..\module\win32
-COPY _wxctb.dll ..\..\module\win32
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/serport.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/serport.i
deleted file mode 100644
index 84cb69887c..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/serport.i
+++ /dev/null
@@ -1,57 +0,0 @@
-%{
-#include "ctb-0.16/win32/serport.h"	
-%}
-
-%include ../serportx.i
-
-namespace ctb {
-
-%pythoncode {
-COM1 = "com1"
-COM2 = "com2"
-COM3 = "com3"
-COM4 = "com4"
-COM5 = "com5"
-COM6 = "com6"
-COM7 = "com7"
-COM8 = "com8"
-COM9 = "com9"
-COM10 = "\\\\.\\com10"
-COM11 = "\\\\.\\com11"
-COM12 = "\\\\.\\com12"
-COM13 = "\\\\.\\com13"
-COM14 = "\\\\.\\com14"
-COM15 = "\\\\.\\com15"
-COM16 = "\\\\.\\com16"
-COM17 = "\\\\.\\com17"
-COM18 = "\\\\.\\com18"
-COM19 = "\\\\.\\com19"
-};
-
-class SerialPort : public SerialPort_x
-{
-protected:
-    HANDLE fd;
-    OVERLAPPED ov;
-    SerialPort_EINFO einfo;
-      
-    int CloseDevice();
-    int OpenDevice(const char* devname, void* dcs);
-public:
-    SerialPort();
-    ~SerialPort();
-
-    int ChangeLineState(SerialLineState flags);
-    int ClrLineState(SerialLineState flags);
-    int GetLineState();
-    int Ioctl(int cmd,void* args);
-    int IsOpen();
-    int Read(char* buf,size_t len);
-    int SendBreak(int duration);
-    int SetBaudrate(int baudrate);
-    int SetLineState(SerialLineState flags);
-    int SetParityBit( bool parity );
-    int Write(char* buf,size_t len);
-};
-
-};
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/timer.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/timer.i
deleted file mode 100644
index b95f26a0d4..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/timer.i
+++ /dev/null
@@ -1,39 +0,0 @@
-%{
-#include "ctb-0.16/win32/timer.h"
-%}
-
-%include cpointer.i
-
-// lets create new fuctions for pointer handling in python (for int *exitflag)
-%pointer_functions(int, intp);
-
-namespace ctb {
-
-// perhaps we doesn''t need timer_control to export
-// but we need if we want to inherit from timer in python
-struct timer_control
-{
-    unsigned int msecs;
-    int *exitflag;
-    MMRESULT stop;
-    void* (*exitfnc)(void*);
-};
-
-class Timer
-{
-protected:
-
-    DWORD id;
-    MMRESULT h;
-    timer_control control;
-    unsigned int timer_secs;
-public:
-    Timer(unsigned int msec,int* exitflag,void*(*exitfnc)(void*)=NULL);
-    ~Timer();
-    int start();
-    int stop();
-};
-
-void sleepms(unsigned int ms);
-
-};
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/wxctb.i b/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/wxctb.i
deleted file mode 100644
index d00350fb03..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/python/src/win32/wxctb.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is created automatically, don't change it! 
-%module wxctb 
-typedef int size_t; 
-%include timer.i 
-%include serport.i 
-%include ../kbhit.i 
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/samples/ctbtest.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/samples/ctbtest.cpp
deleted file mode 100644
index bf84e20ed7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/samples/ctbtest.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-#include "ctb-0.16/ctb.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <iostream>
-#include <string>
-
-using namespace std;
-
-// ----------------- options -------------------------------
-const char* options="a:b:d:e:hlp:t:";
-
-const char* helpMessage =
-{
-    "A simple serial port class test\n"
-    "ctbtest [options]\n"
-    "available options are:\n"
-    "-a     : address (only GPIB)\n"
-    "-b     : baudrate [any value], default is 38400\n"
-    "-d     : connected device, default is COM1\n"
-    "-e     : eos\n"
-    "-h     : print this\n"
-    "-l     : list all available serial ports\n"
-    "-p     : protocol like 8N1\n"
-    "-t     : communication timeout in ms (default is 100ms)\n"
-};
-
-int main(int argc,char* argv[])
-{
-    int address = 15;
-
-    int baudrate = 19200;
-
-    string devname = ctb::COM1;
-
-    string eos = "\r\n";
-
-    string protocol = "8N1";
-
-    int timeout = 100;
-
-    bool showAvailablePorts = false;
-
-    int quit = 0;
-
-    int val;
-
-    while ( ( val=getopt( argc, argv, (char*)options ) ) != EOF ) {
-	   switch ( val ) {
-	   case 'a' : address = strtol( optarg, NULL, 10 ); break;
-	   case 'b' : baudrate = strtol( optarg, NULL, 10 ); break;
-	   case 'd' : devname = optarg; break;
-	   case 'h' : cerr << helpMessage << endl; exit( 0 );
-	   case 'l' : showAvailablePorts = true; break;
-	   case 'p' : protocol = optarg; break;
-	   case 't' : timeout = strtol( optarg, NULL, 10 ); break;
-	   }
-    }
-
-    ctb::IOBase* device = NULL;
-
-    std::vector<std::string> ports;
-
-    if( ctb::GetAvailablePorts( ports ) && showAvailablePorts ) {
-
-	   for( int i = 0; i < ports.size(); 
-		   std::cout << ports[ i++ ] << endl ) {};
-
-	   return 0;
-
-    }
-
-
-#if ( GPIB )
-    if( ( devname == ctb::GPIB1 ) || ( devname == ctb::GPIB2 ) ) {
-
-	   ctb::GpibDevice* gpibDevice = new ctb::GpibDevice();
-
-	   if( gpibDevice->Open( devname.c_str(), address ) >= 0 ) {
-
-		  device = gpibDevice;
-
-	   }
-
-    }
-    else {
-#endif
-      
-	   ctb::SerialPort* serialPort = new ctb::SerialPort();
-
- 	   if( serialPort->Open( devname.c_str(), baudrate, 
-					    protocol.c_str(), 
-					    ctb::SerialPort::NoFlowControl ) >= 0 ) {
-
-		  device = serialPort;
-
-	   }
-
-#if ( GPIB )
-    }
-#endif
-
-    if( ! device ) {
-
-	   cout << "Cannot open " << devname.c_str() << endl;
-
-	   return -1;
-    
-    }
-
-    // up to know you don't have to worry any longer about the kind of
-    // the connected device.  As long as you do nothing something device
-    // specific (like toggle some modem control lines), the access is
-    // the same for each device.
-
-    string line;
-
-    char receiveBuf[ 128 ];
-
-    cout << "Enter your command or just press Enter without any\n"
-	   "input for exit!";
-
-    while( true ) {
-
-	   cout << endl << "Your input >";
-
-	   // read the string to send
-	   getline( cin, line );
-
-	   // add some defined EOS (end of string sequence or character)
-	   if( line.empty() ) {
-
-		  break;
-
-	   }
-
-	   line += eos;
-      
-	   // send data throughout the connected device independent of the typ
-	   if( device->Writev( (char*)line.c_str(),
-					   line.size(), 
-					   timeout ) != line.size() ) {
-			 
-		  cerr << "Incomplete data transmission" << endl;
-
-	   }
-
-	   int readed = 0;
-
-	   do {
-
-		  // in case of an event driven GUI you better use a non blocking
-		  // Read(...) in your idle function. Here we have to wait for the 
-		  // response before we send another user command...
-		  readed = device->Readv( receiveBuf, 
-							 sizeof( receiveBuf ) - 1, 
-							 timeout);
-
-		  // something received?
-		  if( readed > 0 ) {
-
-			 receiveBuf[ readed ] = 0;
-
-			 cout << receiveBuf;
-
-		  }
-
-	   } while( readed > 0 );
-		  
-	   cout << endl;
-	   
-    } // while( true )
-
-    device->Close();
-
-    delete device;
-
-    return 0;
-}
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/fifo.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/fifo.cpp
deleted file mode 100644
index c03e320846..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/fifo.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fifo.cpp
-// Purpose:
-// Author:      Joachim Buermann, Michael Hungershausen
-// Id:          $Id$
-// Copyright:   (c) 2006,2007 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "ctb-0.16/fifo.h"
-
-namespace ctb {
-
-    Fifo::Fifo(size_t size) :
-	   m_size(size)
-    {
-	   m_begin = new char[size];
-	   m_end = m_begin + m_size;
-	   m_rdptr = m_wrptr = m_begin;
-    };
-
-    Fifo::~Fifo()
-    {
-	   delete m_begin;
-    };
-
-    void Fifo::clear()
-    {
-	   m_rdptr = m_wrptr = m_begin;
-    };
-
-    int Fifo::get(char* ch)
-    {
-	   if(m_rdptr != m_wrptr) {
-		  *ch = *m_rdptr++;
-		  if(m_rdptr >= m_end) {
-			 m_rdptr = m_begin;
-		  }
-		  return 1;
-	   }
-	   return 0;
-    };
-
-    size_t Fifo::items()
-    {
-	   char* tmp_wrptr = m_wrptr;
-	   // the rdptr will only changed by the reader. If we suppose, that
-	   // the caller of the items() method is identical with the reader,
-	   // this should be thread save.
-	   char* tmp_rdptr = m_rdptr;
-
-	   // if the write pointer is identical with the read, there are no
-	   // more data in the Fifo
-	   if(tmp_wrptr == tmp_rdptr) {
-		  return 0;
-	   }
-	   // the write pointer is greater as the read pointer, so we just
-	   // can calculate the difference for the remaining data
-	   if(tmp_wrptr > tmp_rdptr) {
-		  return (tmp_wrptr - tmp_rdptr);
-	   }
-	   // the write pointer has circulate and stands against the read
-	   // pointer
-	   else {
-		  return (m_size - (tmp_rdptr - tmp_wrptr));
-	   }
-    };
-
-    int Fifo::put(char ch)
-    {
-	   // for a thread safe operation, the write of a data byte must be
-	   // atomic. So we first assign the current position of the write
-	   // pointer to a temporary pointer.
-	   // Increment it for the comparison with the end of the internal 
-	   // buffer and the read pointer
-	   char* tmp_wrptr = m_wrptr + 1;
-	   if(tmp_wrptr >= m_end) {
-		  tmp_wrptr = m_begin;
-	   }
-	   if(tmp_wrptr == m_rdptr) {
-		  return 0;
-	   }
-	   // this don't changes the write pointer!
-	   *m_wrptr = ch;
-	   // that's the trick! The following assignment is atomic and cannot
-	   // interrupted within a read access by the read thread
-	   m_wrptr = tmp_wrptr;
-	   return 1;
-    };
-    
-    int Fifo::read(char* data,int n)
-    {
-	   int nresult = 0;
-	   while(n--) {
-		  // the same as get()
-		  if(m_rdptr != m_wrptr) {
-			 *data = *m_rdptr++;
-			 if(m_rdptr >= m_end) {
-				m_rdptr = m_begin;
-			 }
-		  }
-		  else {
-			 break;
-		  }
-		  nresult++;
-		  data++;
-	   }
-	   return nresult;
-    };
-
-    int Fifo::write(char* data,int n)
-    {
-	   int nresult = 0;
-	   while(n--) {
-		  // the same as put()
-		  char* tmp_wrptr = m_wrptr + 1;
-		  if(tmp_wrptr >= m_end) {
-			 tmp_wrptr = m_begin;
-		  }
-		  if(tmp_wrptr == m_rdptr) {
-			 break;
-		  }
-		  *m_wrptr = *data++;
-		  m_wrptr = tmp_wrptr;
-		  nresult++;
-	   }
-	   return nresult;
-    };
-
-} // namespace ctb    
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/getopt.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/getopt.cpp
deleted file mode 100644
index 69afb2e7b7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/getopt.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        getopt.cpp
-// Purpose:     simple wrapper file
-// Author:      Joachim Buermann
-// Id:          $Id: timer.h,v 1.1.1.1 2004/11/24 10:30:11 jb Exp $
-// Copyright:   (c) 2001 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined (WIN32)
-# include "win32/getopt.cpp"
-#endif
-
-
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/gpib.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/gpib.cpp
deleted file mode 100644
index e2f577de64..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/gpib.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        gpibx.cpp
-// Purpose:
-// Author:      Joachim Buermann
-// Id:          $Id: gpibx.cpp,v 1.1.1.1 2004/11/24 10:30:11 jb Exp $
-// Copyright:   (c) 2001,2004 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "ctb-0.16/gpib.h"
-#include "ctb-0.16/timer.h"
-#include <stdio.h>
-#include <string.h>
-#ifdef WIN32
-# include "ctb-0.16/win32/gpib-32.h"
-#if _MSC_VER < 1900
-# define snprintf _snprintf
-#endif
-#elif __GNUG__
-# include <gpib/ib.h>
-#endif
-
-namespace ctb {
-
-    const char* GPIB1 = "gpib1";
-    const char* GPIB2 = "gpib2";
-
-    struct gpibErr_t {
-	   int m_errno;
-	   const char* m_notation;
-	   const char* m_description;
-    };
-
-    static gpibErr_t gpibErrors[] = {
-	   {0,"EDVR","DOS Error"},
-	   {1,"ECIC","Specified GPIB Interface Board is Not Active Controller"},
-	   {2,"ENOL","No present listing device"},
-	   {3,"EADR","GPIB Board has not been addressed properly"},
-	   {4,"EARG","Invalid argument"},
-	   {5,"ESAC","Specified GPIB Interface Board is not System Controller"},
-	   {6,"EABO","I/O operation aborted (time-out)"},
-	   {7,"ENEB","Non-existent GPIB board"},
-	   {10,"EOIP","Routine not allowed during asynchronous I/O operation"},
-	   {11,"ECAP","No capability for operation"},
-	   {12,"EFSO","File System Error"},
-	   {14,"EBUS","Command byte transfer error"},
-	   {15,"ESTB","Serial poll status byte lost"},
-	   {16,"ESQR","SRQ stuck in ON position"},
-	   {20,"ETAB","Table problem"},
-	   {247,"EINT","No interrupt configured on board"},
-	   {248,"EWMD","Windows is not in Enhanced mode"},
-	   {249,"EVDD","GPIB driver is not installed"},
-	   {250,"EOVR","Buffer Overflow"},
-	   {251,"ESML","Two library calls running simultaneously"},
-	   {252,"ECFG","Board type does not match GPIB.CFG"},
-	   {253,"ETMR","No Windows timers available"},
-	   {254,"ESLC","No Windows selectors available"},
-	   {255,"EBRK","Control-Break pressed"}
-    };
-
-    char* Gpib_DCS::GetSettings()
-    {
-	   const char* to[] = {
-		  "None","10us","30us","100us","300us","1ms","3ms","10ms","30ms", 
-		  "100ms","300ms","1s","3s","10s","30s","100s","300s","1000s"
-	   };
-	   memset(m_buf,0,sizeof(m_buf));
-	   snprintf(m_buf,sizeof(m_buf)-1,"Adr: (%i,%i) to:%s",
-			  m_address1,
-			  m_address2,
-			  to[m_timeout]);
-	   return m_buf;
-    };
-
-    int GpibDevice::CloseDevice()
-    {
-	   if(m_hd != -1) {
-		  // goto local...
-		  ibloc(m_hd);
-		  // ...and switch device offline
-		  ibonl(m_hd,0);
-		  m_hd = -1;
-		  m_board = -1;
-	   }
-	   return 0;
-    };
-
-    const char* GpibDevice::GetErrorString(int error,bool detailed)
-    {
-	   for(size_t i=0;i<(sizeof(gpibErrors)/sizeof(gpibErr_t));i++) {
-		  if(gpibErrors[i].m_errno == error) {
-			 if(detailed) {
-				return gpibErrors[i].m_description;
-			 }
-			 else {
-				return gpibErrors[i].m_notation;
-			 }
-		  }
-	   }
-	   return 0;
-    };
-
-// This is only for internal usage
-    int GpibDevice::Ibrd(char* buf,size_t len)
-    {
-	   return ibrd(m_hd,buf,len);
-    };
-
-// This is only for internal usage
-    int GpibDevice::Ibwrt(char* buf,size_t len)
-    {
-	   return ibwrt(m_hd,buf,len);
-    };
-
-    int GpibDevice::Ioctl(int cmd,void* args)
-    {
-	   switch(cmd) {
-	   case CTB_RESET:
-		  if(m_hd >= 0) {
-			 ibclr(m_hd);
-			 return 0;
-		  }
-		  return -1;
-	   case CTB_GPIB_GETRSP: {
-		  char spr = 0;
-		  if(m_hd >= 0) {
-			 ibrsp(m_hd,&spr);
-			 *(int*)args = (int)spr;
-			 return 0;
-		  }
-		  return 1; }
-	   case CTB_GPIB_GETSTA:
-		  *(int*)args = m_state;
-		  return 0;
-	   case CTB_GPIB_GETERR:
-		  *(int*)args = m_error;
-		  return 0;
-	   case CTB_GPIB_GETLINES: {
-		  short state = 0;
-		  if(m_hd >= 0) {
-			 iblines(m_board,&state);
-			 *(int*)args = (int)state;
-			 return 0;
-		  }
-		  return -1; }
-	   case CTB_GPIB_SETTIMEOUT: {
-		  if(m_hd >= 0) {
-			 GpibTimeout timeout;
-			 unsigned long to = *(unsigned long*)args;
-			 // convert the timeout in ms (given by args) into the
-			 // traditional NI-488.2 timeout period 
-			 if(to > 1000000) timeout = GpibTimeout1000s;
-			 else if(to >= 300000) timeout = GpibTimeout300s;
-			 else if(to >= 100000) timeout = GpibTimeout100s;
-			 else if(to >= 30000) timeout = GpibTimeout30s;
-			 else if(to >= 10000) timeout = GpibTimeout10s;
-			 else if(to >= 3000) timeout = GpibTimeout3s;
-			 else if(to >= 1000) timeout = GpibTimeout1s;
-			 else if(to >= 300) timeout = GpibTimeout300ms;
-			 else if(to >= 100) timeout = GpibTimeout100ms;
-			 else if(to >= 30) timeout = GpibTimeout30ms;
-			 else if(to >= 10) timeout = GpibTimeout10ms;
-			 else if(to >= 3) timeout = GpibTimeout3ms;
-			 else if(to >= 1) timeout = GpibTimeout1ms;
-			 else timeout = GpibTimeoutNone;
-			 ibtmo(m_hd,timeout);
-			 return 0; 
-		  }
-		  return -1; }
-	   case CTB_GPIB_GTL:
-		  // Forces the specified device to go to local program mode
-		  if(m_hd >= 0) {
-			 ibloc(m_hd);
-			 return 0;
-		  }
-		  return -1;
-	   case CTB_GPIB_REN:
-		  // This routine can only be used if the specified GPIB 
-		  // Interface Board is the System Controller.
-		  // Remember that even though the REN line is asserted, 
-		  // the device(s) will not be put into remote state until is
-		  // addressed to listen by the Active Controller
-		  if(m_hd) {
-			 char adr = (char)m_dcs.m_address1;
-			 ibsre(m_board,1);
-			 ibcmd(m_board,&adr,1);
-			 return 0;
-		  }
-		  return -1;
-	   case CTB_GPIB_RESET_BUS:
-		  ibsic(m_board);
-		  return 0;
-	   case CTB_GPIB_GET_EOS_CHAR:
-		  if( m_hd ) {
-			 *(int*)args = (int)m_dcs.m_eosChar;
-			 return 0;
-		  }
-		  return -1;
-	   case CTB_GPIB_SET_EOS_CHAR:
-#ifdef __GNUG__
-		  // FIXME!
-		  // Doesn't work with linux-gpib-3.2.08. All EOS beside 0x00
-		  // are blocking during sending data to the device. (Look at 
-		  // function my_ibwrt in linux-gpib-3.2.08/lib/ibWrt.c
-		  if( m_hd ) {
-			 m_dcs.m_eosChar = (char)*(int*)args;
-			 ibeos(m_hd,(m_dcs.m_eosMode << 8) | m_dcs.m_eosChar);
-			 return 0;
-		  }
-#endif
-		  return -1;
-	   case CTB_GPIB_GET_EOS_MODE:
-		  if( m_hd ) {
-			 *(int*)args = (int)m_dcs.m_eosMode;
-			 return 0;
-		  }
-		  return -1;
-	   case CTB_GPIB_SET_EOS_MODE:
-		  if( m_hd ) {
-			 m_dcs.m_eosMode = (char)*(int*)args;
-			 ibeos(m_hd,(m_dcs.m_eosMode << 8) | m_dcs.m_eosChar);
-			 return 0;
-		  }
-		  return -1;
-	   }
-	   // error or unknown command
-	   return -1;
-    };
-
-    int GpibDevice::FindListeners(int board)
-    {
-	   int listeners = 0;
-	   if((unsigned int)board > 1) {
-		  return -1;
-	   }
-	   // reset the GPIB, otherwise no connected device is found (linux)
-	   SendIFC(board);
-	   // list of primary addresses to searching for. Must be terminated
-	   // with NOADDR.
-	   Addr4882_t addrlist[31];
-	   // The range of valid addresses is 1...30, 0 is reservated by the 
-	   // controller, 31 is not valid
-	   for(int i = 0;i < 30; i++) addrlist[i] = (Addr4882_t) i + 1;
-	   addrlist[30] = NOADDR;
-	   // place to store the results
-	   Addr4882_t results[31];
-	   memset(results,0,sizeof(results));
-	   FindLstn(board, addrlist, results, 31);
-	   if(ibsta & ERR) {
-		  return -1;
-	   }
-	   for(int i=0;i<=30;i++) {
-		  if(results[i]) {
-			 listeners |= 1 << results[i];
-		  } 
-	   }
-	   return listeners;
-    };
-
-    int GpibDevice::Open( const char* devname, int address )
-    {
-	   m_dcs.m_address1 = address;
-
-	   return OpenDevice( devname, &m_dcs );
-    }
-
-
-    int GpibDevice::OpenDevice(const char* devname, void* dcs)
-    {
-	   // if dcs isn't NULL, type cast
-	   if(dcs) m_dcs = *(Gpib_DCS*)dcs;
-    
-	   if(strncmp(devname,"gpib1",5) == 0) m_board = 0;
-	   else if(strncmp(devname,"gpib2",5) == 0) m_board = 1;
-	   if(m_board < 0) {
-		  return -1;
-	   }
-	   // check for a valid timeout
-	   if((unsigned int)m_dcs.m_timeout > GpibTimeout1000s) {
-		  m_dcs.m_timeout = GpibTimeout10us;
-	   }
-
-	   m_hd = ibdev(m_board,
-				 m_dcs.m_address1,
-				 m_dcs.m_address2,
-				 m_dcs.m_timeout,
-				 m_dcs.m_eot,
-#ifdef __GNUG__
-				 // FIXME!
-				 // linux-gpib-3.2.08 doesn't work with any EOS (blocks). 
-				 // Because we always has to add an EOS on the message 
-				 // (independent of the m_eosChar setting), we can ignore it! 
-				 0
-#else
-				 (m_dcs.m_eosMode << 8) | m_dcs.m_eosChar
-#endif
-		  );
-	   if(m_hd < 0) {
-		  // no gpib controller installed (not found)
-		  return -2;
-	   }
-	   // test for a connected listener (device with given address)
-	   short int listen = 0;
-	   ibln(m_board,m_dcs.m_address1,NO_SAD,&listen);
-	   if(!listen) {
-		  // no listener at the given address
-		  CloseDevice();
-		  return -3;
-	   }
-	   // reset device
-	   ibclr(m_hd);
-	   // save state, error and count
-	   m_state = ThreadIbsta();
-	   m_count = ThreadIbcnt();
-	   m_error = ThreadIberr();
-	   // no error
-	   return 0;
-    };
-
-    int GpibDevice::Read(char* buf,size_t len)
-    {
-	   // if something is in the fifo, first read that
-	   if(m_fifo->items() > 0) {
-		  return m_fifo->read(buf,len);
-	   }
-	   m_state = ibrd(m_hd,buf,len);
-	   m_error = ThreadIberr();
-	   m_count = ThreadIbcnt();
-	   return m_count;
-    };
-
-    int GpibDevice::Write(char* buf,size_t len)
-    {
-	   m_state = ibwrt(m_hd,buf,len);
-	   m_error = ThreadIberr();
-	   m_count = ThreadIbcnt();
-	   return m_count;
-    };
-
-} // namespace ctb    
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/iobase.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/iobase.cpp
deleted file mode 100644
index b92ba4f2d6..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/iobase.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        iobase.cpp
-// Purpose:
-// Author:      Joachim Buermann
-// Id:          $Id: iobase.cpp,v 1.1.1.1 2004/11/24 10:30:11 jb Exp $
-// Copyright:   (c) 2001 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <string.h>
-#include "ctb-0.16/iobase.h"
-#include "ctb-0.16/timer.h"
-
-namespace ctb {
-
-#define DELTA_BUFSIZE 512 
-
-    int IOBase::Readv(char* buf,size_t len,unsigned int timeout_in_ms)
-    {
-	   char *cp = buf;
-	   int n = 0;
-	   int timeout = 0;
-	   size_t toread = len;
-
-	   Timer t(timeout_in_ms,&timeout,NULL);
-	   if(timeout_in_ms != 0xFFFFFFFF) {
-		  t.start();
-	   }
-
-	   while(!timeout && (toread > 0)) {
-		  if((n = Read(cp,toread)) < 0) {
-			 break;
-		  }
-		  if(!n) {
-			 sleepms(1);
-		  }
-		  toread -= n;
-		  cp += n;
-	   }
-	   // ok, all bytes received
-	   return(len - toread);
-    };
-
-/*
-  Readv() calls the member function Read() repeatedly, til all
-  demand bytes were received. To avoid an endless loop, you
-  can refer an integer, which was set unequal zero after a
-  specific time. (See the timer class)
-*/
-    int IOBase::Readv(char* buf,size_t len,int* timeout_flag,bool nice)
-    {
-	   size_t toread = len;
-	   int n = 0;
-	   char *cp = buf;
-
-	   while(toread > 0) {
-		  if(timeout_flag && (*timeout_flag > 0)) {
-			 return (len - toread);
-		  }
-		  if((n = Read(cp,toread)) < 0) {
-			 return (len - toread);
-		  }
-		  if(!n && nice) {
-			 sleepms(1);
-		  }
-		  if (n > 0)
-		  {
-			 toread -= n;
-			 cp += n;
-		  }
-	   }
-	   // ok, all bytes received
-	   return(len - toread);
-    };
-
-    int IOBase::ReadUntilEOS(char*& readbuf,
-						 size_t* readedBytes,
-						 char* eosString,
-						 long timeout_in_ms,
-						 char quota)
-    {
-	   int n = 0;
-	   int timeout = 0;
-	   int bufsize = DELTA_BUFSIZE;
-	   int result = 0;
-	   int quoted = 0;
-	   char* buf = new char[bufsize];
-	   char* des = buf;
-	   char* eos = eosString;
-	   char ch;
-
-	   Timer t(timeout_in_ms,&timeout,NULL);
-	   t.start();
-
-	   while(!timeout) {
-		  if(des >= &buf[bufsize]) {
-			 // buffer full, realloc more memory
-			 char* tmp = new char[bufsize + DELTA_BUFSIZE + 1];
-			 memcpy(tmp,buf,bufsize);
-			 delete[] buf;
-			 buf = tmp;
-			 des = &buf[bufsize];
-			 bufsize += DELTA_BUFSIZE;
-		  }
-		  // read next byte
-		  n = Read(&ch,1);
-		  if(n < 0) {
-			 // an error occured
-			 result = -1;
-			 break;
-		  }
-		  else if(n == 0) {
-			 // no data available, give up the processor for some time
-			 // to reduce the cpu last
-			 sleepms(10);
-			 continue;
-		  }
-		  // if eos is composed of more than one char, and the current
-		  // byte doesn't match the next eos character, we handle the
-		  // readed byte as a normal char (and not an eos)
-		  if((eos != eosString) && (ch != *eos)) {
-			 // FIXME!
-			 // write all characters, which was matched the eos string
-			 // until now (with the first wrong character all received
-			 // eos characters are invalid and must handled as normal
-			 // characters).
-
-			 // This doesn't work right and is only a little workaround
-			 // because the received eos chars are lost
-			 PutBack(ch);
-			 // because we doesn't match the eos string, we must 'reset' 
-			 // the eos match
-			 eos = eosString;
-			 continue;
-		  }
-		  else {
-			 if((ch == *eos) && !quoted) {
-				if(*++eos == 0) {
-				    // the eos string is complete
-				    result = 1;
-				    break;
-				}
-				continue;
-			 }
-		  }
-		  if(ch == quota) {
-			 quoted ^= 1;
-		  }
-		  *des++ = ch;
-	   }
-	   *des = 0;
-	   readbuf = buf;
-	   *readedBytes = des - buf;
-	   return result;
-    };
-
-    int IOBase::Writev(char* buf,size_t len,unsigned int timeout_in_ms)
-    {
-	   char *cp = buf;
-	   int n = 0;
-	   int timeout = 0;
-	   size_t towrite = len;
-
-	   Timer t(timeout_in_ms,&timeout,NULL);
-	   if(timeout_in_ms != 0xFFFFFFFF) {
-		  t.start();
-	   }
-
-	   while(!timeout && (towrite > 0)) {
-		  if((n = Write(cp,towrite)) < 0) {
-			 // an error occurs
-			 break;
-		  }
-		  if(!n) {
-			 sleepms(1);
-		  }
-		  towrite -= n;
-		  cp += n;
-	   }
-	   return (len - towrite);
-    };
-
-/*
-  Similar to Readv(). Writev() calls Write() repeatedly till
-  all bytes are written.
-*/
-    int IOBase::Writev(char* buf,size_t len,int* timeout_flag,bool nice)
-    {
-	   size_t towrite = len;
-	   int n = 0;
-	   char *cp = buf;
-
-	   while(towrite > 0) {
-		  if(timeout_flag && (*timeout_flag > 0)) {
-			 return (len - towrite);
-		  }
-		  if((n = Write(cp,towrite)) < 0) {
-			 // an error occurs
-			 return (len - towrite);
-		  }
-		  if(!n && nice) {
-			 sleepms(1);
-		  }
-		  towrite -= n;
-		  cp += n;
-	   }
-	   return(len);
-    };
-
-} // namespace ctb
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/kbhit.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/kbhit.cpp
deleted file mode 100644
index 4a244ea251..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/kbhit.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#if defined ( WIN32 )
-# include <conio.h>
-#else
-# include <stdio.h>
-# include <termios.h>
-#endif
-
-namespace ctb {
-
-    char GetKey()
-    {
-#if defined ( WIN32 )
-	   if(_kbhit()) {
-		  return _getch();
-	   }
-	   return '\0';
-#else
-	   int ch;
-	   static struct termios t, save_t;
-	   tcgetattr(0,&t);
-	   save_t = t;
-	   t.c_lflag &= ~(ICANON);
-	   t.c_cc[VMIN] = 0;
-	   t.c_cc[VTIME] = 0;
-	   tcsetattr(0,TCSANOW,&t);
-
-	   ch = fgetc(stdin);
-
-	   tcsetattr(0,TCSANOW,&save_t);
-	   if(ch != EOF) {
-		  return ch;
-	   }
-	   return '\0';
-#endif
-    }
-
-} // namespace ctb
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/serport.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/serport.cpp
deleted file mode 100644
index a369abc5e7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/serport.cpp
+++ /dev/null
@@ -1,443 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        linux/serport.cpp
-// Purpose:
-// Author:      Joachim Buermann
-// Id:          $Id: serport.cpp,v 1.1.1.1 2004/11/24 10:30:11 jb Exp $
-// Copyright:   (c) 2001 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "ctb-0.16/linux/serport.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <termios.h>
-#include <unistd.h>
-
-#define CMSPAR	  010000000000		/* mark or space (stick) parity */
-
-namespace ctb {
-
-    const char* COM1 = "/dev/ttyS0";
-    const char* COM2 = "/dev/ttyS1";
-    const char* COM3 = "/dev/ttyS2";
-    const char* COM4 = "/dev/ttyS3";
-    const char* COM5 = "/dev/ttyS4";
-    const char* COM6 = "/dev/ttyS5";
-    const char* COM7 = "/dev/ttyS6";
-    const char* COM8 = "/dev/ttyS7";
-    const char* COM9 = "/dev/ttyS8";
-    const char* COM10 = "/dev/ttyS9";
-    const char* COM11= "/dev/ttyS10";
-    const char* COM12= "/dev/ttyS11";
-    const char* COM13 = "/dev/ttyS12";
-    const char* COM14 = "/dev/ttyS13";
-    const char* COM15 = "/dev/ttyS14";
-    const char* COM16 = "/dev/ttyS15";
-    const char* COM17 = "/dev/ttyS16";
-    const char* COM18 = "/dev/ttyS17";
-    const char* COM19 = "/dev/ttyS18";
-    const char* COM20 = "/dev/ttyS19";
-
-    SerialPort::SerialPort() :
-	   SerialPort_x()
-    {
-	   fd = -1;
-    };
-
-    SerialPort::~SerialPort()
-    {
-	   Close();
-    };
-
-    speed_t SerialPort::AdaptBaudrate( int baud )
-    {
-	   switch(baud) {
-	   case 150: return B150;
-	   case 300: return B300;
-	   case 600: return B600;
-	   case 1200: return B1200;
-	   case 2400: return B2400;
-	   case 4800: return B4800;
-	   case 9600: return B9600;
-	   case 19200: return B19200;
-	   case 57600: return B57600;
-	   case 115200: return B115200;
-	   case 230400: return B230400;
-	   case 460800: return B460800;
-	   case 921600: return B921600;
-
-		  // NOTE! The speed of 38400 is required, if you want to set
-		  //       an non-standard baudrate. See below!
-	   default: return B38400;
-	   }
-    };
-
-    int SerialPort::CloseDevice()
-    {
-	   int err = 0;
-	   // only close an open file handle
-	   if(fd < 0) return EBADF;
-	   // With some systems, it is recommended to flush the serial port's 
-	   // Output before closing it, in order to avoid a possible hang of
-	   // the process...
-	   // Thanks to Germain (I couldn't answer you, because your email
-	   // address was invalid)
-	   tcflush(fd, TCOFLUSH);
-
-	   // Don't recover the orgin settings while the device is open. This
-	   // implicate a mismatched data output!
-	   // Just close device
-	   err = close( fd );
-
-	   fd = -1;
-
-	   return err;
-    };
-
-    int SerialPort::ChangeLineState( SerialLineState flags )
-    {
-	   int state;
-	   ioctl(fd,TIOCMGET,&state);
-	   state ^= flags;
-	   return ioctl(fd,TIOCMSET,&state);
-    };
-
-    int SerialPort::ClrLineState( SerialLineState flags )
-    {
-	   return ioctl(fd,TIOCMBIC,&flags);
-    };
-
-    int SerialPort::GetLineState()
-    {
-	   SerialLineState flags = LinestateNull;
-
-	   if( ioctl( fd, TIOCMGET, &flags ) < 0 ) {
-
-		  return -1;
-
-	   }
-	   return (int)( flags & 0x1FF );
-    };
-
-//
-// included from /usr/include/linux/serial.h
-//
-//  struct serial_icounter_struct {
-//  	int cts, dsr, rng, dcd;
-//  	int rx, tx;
-//  	int frame, overrun, parity, brk;
-//  	int buf_overrun;
-//  	int reserved[9];
-//  };
-//
-    int SerialPort::Ioctl(int cmd, void* args)
-    {
-	   int count = 0;
-	   int err = 0;
-	   struct serial_icounter_struct info;
-	   SerialPort_EINFO einfo;
-
-	   switch(cmd) {
-	   case CTB_RESET:
-		  return SendBreak(0);
-	   case CTB_SER_GETEINFO:
-		  err = ioctl(fd,TIOCGICOUNT,&info);
-		  if(err) return err;
-		  einfo.brk = info.brk - save_info.brk;
-		  einfo.frame = info.frame - save_info.frame;
-		  einfo.overrun = info.overrun - save_info.overrun;
-		  einfo.parity = info.parity - save_info.parity;
-		  *(SerialPort_EINFO*)args = einfo;
-		  break;
-	   case CTB_SER_GETBRK:
-		  err = ioctl(fd,TIOCGICOUNT,&info);
-		  if(err) return err;
-		  if(last_info.brk != info.brk) count = 1;
-		  break;
-	   case CTB_SER_GETFRM:
-		  err = ioctl(fd,TIOCGICOUNT,&info);
-		  if(err) return err;
-		  if(last_info.frame != info.frame) count = 1;
-		  break;
-	   case CTB_SER_GETOVR:
-		  err = ioctl(fd,TIOCGICOUNT,&info);
-		  if(err) return err;
-		  if(last_info.overrun != info.overrun) count = 1;
-		  break;
-	   case CTB_SER_GETPAR:
-		  err = ioctl(fd,TIOCGICOUNT,&info);
-		  if(err) return err;
-		  if(last_info.parity != info.parity) count = 1;
-		  break;
-	   case CTB_SER_GETINQUE:
-		  err = ioctl(fd,TIOCINQ,&count);
-		  if(err) return err;
-		  *(int*)args = count;
-		  return 0;
-	   case CTB_SER_SETPAR:
-		  return SetParityBit( *(int*)args == 1 ); 
-	   default:
-		  return -1;
-	   }
-	   last_info = info;
-	   return 0;
-    };
-
-    int SerialPort::IsOpen()
-    {
-	   return (fd != -1);
-    };
-
-    int SerialPort::OpenDevice(const char* devname, void* dcs)
-    {
-	   // if dcs isn't NULL, type cast
-	   if(dcs) m_dcs = *(SerialPort_DCS*)dcs;
-	   // open serial comport device for reading and writing,
-	   // don't wait (O_NONBLOCK)
-	   fd = open(devname, O_RDWR | O_NOCTTY | O_NONBLOCK);
-	   if(fd >= 0) {
-
-		  // exclusive use
-		  int dummy;
-
-		  ioctl( fd, TIOCEXCL, &dummy );
-
-		  tcgetattr(fd,&t);
-		  save_t = t;
-
-		  // save the device name
-		  strncpy(m_devname,(char*)devname,sizeof(m_devname));
-		  // we write an eos to avoid a buffer overflow
-		  m_devname[sizeof(m_devname)-1] = '\0';
-
-		  // Fill the internal terios struct.
-		  // If the given baudrate is an non-standard one, the AdaptBaudrate
-		  // call returns the linux specific value B38400 which is a
-		  // condition for the later switch to an unusual baudrate!
-		  cfsetspeed(&t, AdaptBaudrate( m_dcs.baud ) );
-
-		  //cfsetospeed(&t, AdaptBaudrate( m_dcs.baud ) );
-
-		  // parity settings
-		  switch( m_dcs.parity ) {
-
-		  case ParityNone:
-			 t.c_cflag &= ~PARENB; break;
-
-		  case ParityOdd:
-			 t.c_cflag |= PARENB;
-			 t.c_cflag |= PARODD;
-			 break;
-
-		  case ParityEven:
-			 t.c_cflag |= PARENB;
-			 t.c_cflag &= ~PARODD;
-			 break;
-
-		  case ParityMark:
-			 t.c_cflag |= PARENB | CMSPAR | PARODD;
-			 break;
-
-		  case ParitySpace:
-			 t.c_cflag |= PARENB | CMSPAR;
-			 t.c_cflag &= ~PARODD;
-			 break;
-		  }
-		  
-		  // stopbits
-		  if(m_dcs.stopbits == 2)
-			 t.c_cflag |= CSTOPB;
-		  else
-			 t.c_cflag &= ~CSTOPB;
-		  // wordlen
-		  t.c_cflag &= ~CSIZE;
-		  if(m_dcs.wordlen == 7) t.c_cflag |= CS7;
-		  else if(m_dcs.wordlen == 6) t.c_cflag |= CS6;
-		  else if(m_dcs.wordlen == 5) t.c_cflag |= CS5;
-		  // this is the default
-		  else t.c_cflag |= CS8;
-		  // rts/cts
-		  if(m_dcs.rtscts == false)
-			 t.c_cflag &= ~CRTSCTS;
-		  else
-			 t.c_cflag |= CRTSCTS;
-
-		  t.c_lflag &= ~(ICANON | ECHO | ISIG | IEXTEN);
-		  t.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON | IXOFF | IXANY);
-		  t.c_iflag |= IGNPAR;
-		  t.c_oflag &= ~OPOST;
-
-		  if(m_dcs.xonxoff == true) {
-			 t.c_iflag |= (IXON | IXOFF);
-		  }
-
-		  // look out!
-		  // MIN = 1 means, in TIME (1/10 secs) defined timeout
-		  // will be started AFTER receiving the first byte
-		  // so we must set MIN = 0. (timeout starts immediately, abort
-		  // also without readed byte)
-		  t.c_cc[VMIN] = 0;
-		  // timeout in 1/10 secs
-		  // no timeout for non blocked transfer
-		  t.c_cc[VTIME] = 0;
-		  // write the settings
-		  tcsetattr(fd,TCSANOW,&t);
-		  // it's careless, but in the moment we don't test
-		  // the return of tcsetattr (normally there is no error)
-	
-		  // request the actual numbers of breaks, framing, overrun
-		  // and parity errors (because Linux summing all of them during
-		  // system lifetime, not only while serial port is open.
-		  ioctl(fd,TIOCGICOUNT,&save_info);
-		  // it's also careless, but we assume, that there was no error
-		  last_info = save_info;
-
-		  // in case of a non-standard rate, the termios struct have to set
-		  // with the B38400 rate, see above!
-		  if( ! IsStandardRate( m_dcs.baud ) ) {
-
-			 SetBaudrateAny( m_dcs.baud );
-
-		  }
-	   }
-	   return fd;
-    };
-
-    int SerialPort::Read(char* buf,size_t len)
-    {
-	   if(m_fifo->items() > 0) {
-		  return m_fifo->read(buf,len);
-	   }
-	   // Read() (using read() ) will return an 'error' EAGAIN as it is 
-	   // set to non-blocking. This is not a true error within the 
-	   // functionality of Read, and thus should be handled by the caller.
-	   int n = read(fd,buf,len);
-	   if((n < 0) && (errno == EAGAIN)) return 0;
-	   return n;
-    };
-
-    int SerialPort::SendBreak(int duration)
-    {
-	   // the parameter is equal with linux
-	   return tcsendbreak(fd,duration);
-    };
-
-    /*
-	 Note: The following hints are copied from the ftdi_sio.c sources of
-	 the kernel modul for the USB to RS232 converter using an FTDI
-	 chipset (FT232BM or similar). Thanks to all those people
-	 contribute code and above all helpful comments to this modul.
-    */
-
-    /*
-	* The logic involved in setting the baudrate can be cleanly split in 3 steps.
-	* Obtaining the actual baud rate is a little tricky since unix traditionally
-	* somehow ignored the possibility to set non-standard baud rates.
-	* 1. Standard baud rates are set in tty->termios->c_cflag
-	* 2. If these are not enough, you can set any speed using alt_speed as 
-	* follows:
-	*    - set tty->termios->c_cflag speed to B38400
-	*    - set your real speed in tty->alt_speed; it gets ignored when
-	*      alt_speed==0, (or)
-	*    - call TIOCSSERIAL ioctl with (struct serial_struct) set as follows:
-	*      flags & ASYNC_SPD_MASK == ASYNC_SPD_[HI, VHI, SHI, WARP], this just
-	*      sets alt_speed to (HI: 57600, VHI: 115200, SHI: 230400, WARP: 460800)
-	* ** Steps 1, 2 are done courtesy of tty_get_baud_rate
-	* 3. You can also set baud rate by setting custom divisor as follows
-	*    - set tty->termios->c_cflag speed to B38400
-	*    - call TIOCSSERIAL ioctl with (struct serial_struct) set as follows:
-	*      o flags & ASYNC_SPD_MASK == ASYNC_SPD_CUST
-	*      o custom_divisor set to baud_base / your_new_baudrate
-	* ** Step 3 is done courtesy of code borrowed from serial.c - I should really
-	*    spend some time and separate+move this common code to serial.c, it is
-	*    replicated in nearly every serial driver you see.
-    */
-
-    int SerialPort::SetBaudrateAny( int baudrate )
-    {
-	   struct serial_struct ser_info; 
-
-	   int result = ioctl( fd, TIOCGSERIAL, &ser_info ); 
-
-	   ser_info.flags = ASYNC_SPD_CUST | ASYNC_LOW_LATENCY;
-
-	   ser_info.custom_divisor = ser_info.baud_base / baudrate; 
-
-	   result = ioctl( fd, TIOCSSERIAL, &ser_info );
-
-	   return result;
-    }
-
-    int SerialPort::SetBaudrateStandard( int baudrate )
-    {
-	   speed_t baud = AdaptBaudrate( baudrate );
-	   // setting the input baudrate
-	   if(cfsetspeed(&t,baud) < 0) {
-		  return -1;
-	   }
-	   // take over
-	   m_dcs.baud = baudrate;
-
-	   tcsetattr(fd,TCSANOW,&t);
-
-	   return tcgetattr( fd, &t );
-	   
-    };
-
-    int SerialPort::SetBaudrate( int baudrate )
-    {
-	   return IsStandardRate( baudrate ) ?
-		  SetBaudrateStandard( baudrate ) :
-		  SetBaudrateAny( baudrate );
-
-    }
-
-    int SerialPort::SetLineState( SerialLineState flags )
-    {
-	   return ioctl(fd,TIOCMBIS,&flags);
-    };
-
-    int SerialPort::SetParityBit( bool parity )
-    {
-	   // waits until all output has been transmitted
-	   tcdrain( fd );
-
-	   // now read the current termios settings and manipulate
-	   // the parity
-	   tcgetattr( fd, &t );
-
-	   if( parity ) { 
-		  
-		  t.c_cflag |= PARENB | CMSPAR | PARODD;
-
-	   }
-	   else {
-
-		  t.c_cflag |= PARENB | CMSPAR;
-
-		  t.c_cflag &= ~PARODD;
-
-	   }		  
-
-	   tcsetattr( fd,TCSANOW, &t );
-
-	   tcgetattr( fd, &t );
-
-	   return 0;
-    }
-
-    int SerialPort::Write(char* buf,size_t len)
-    {
-	   // Write() (using write() ) will return an 'error' EAGAIN as it is 
-	   // set to non-blocking. This is not a true error within the 
-	   // functionality of Write, and thus should be handled by the caller.
-	   int n = write(fd,buf,len);
-	   if((n < 0) && (errno == EAGAIN)) return 0;
-	   return n;
-    };
-
-} // namespace ctb
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/timer.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/timer.cpp
deleted file mode 100644
index f1c50f613b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/linux/timer.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        linux/timer.cpp
-// Purpose:
-// Author:      Joachim Buermann
-// Id:          $Id: timer.cpp,v 1.1.1.1 2004/11/24 10:30:11 jb Exp $
-// Copyright:   (c) 2001 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#include "ctb-0.16/timer.h"
-#include <unistd.h>
-
-namespace ctb {
-
-// a dummy function, see below
-    static void timer_exit(void* arg)
-    {
-    };
-
-    static void* timer_fnc(void* arg)
-    {
-	   // the timer thread should be canceled every time
-	   // (asyncronously)
-	   pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS,NULL);
-	   // this is tricky, but absolutly necessarily to avoid segfaults
-	   // if the destructor finished a running thread
-	   pthread_cleanup_push(timer_exit,NULL);
-	   timer_control *tc = (timer_control*)arg;
-	   // linux allows a real sleep, means the timer thread will
-	   // be sleeping (no reduce of the system performance) 
-	   usleep(tc->usecs);
-	   // time is over, system reawake the thread.
-	   // if there is an exit function, calling it
-	   if(tc->exitfnc) tc->exitfnc(NULL);
-	   // set the exit flag
-	   if(tc->exitflag) *tc->exitflag = 1;
-	   // deallocate the system resources (thread)
-	   pthread_cleanup_pop(1);
-	   return NULL;
-    };
-
-    // the constructor initiate the internal control struct
-    Timer::Timer( unsigned int msecs, int* exitflag, void*( *exitfnc )(void*) )
-    {
-	   control.usecs = msecs * 1000;
-	   control.exitflag = exitflag;
-	   control.exitfnc = exitfnc;
-	   stopped = 1;
-    };
-
-    // if a timer instance leave it's valid range, it automaticaly will
-    // be finished
-    Timer::~Timer()
-    {
-	   if(!stopped) {
-		  // only a running thread may be canceled
-		  stop();
-	   }
-    };
-
-    // starts the timer thread
-    int Timer::start()
-    {
-	   stopped = 0;
-	   if(pthread_create(&tid,	// result parameter, covers the id
-					 // of the new threads
-					 NULL,	// thread attribute object, NULL means
-					 // the defaults
-					 timer_fnc,	// start function of the thread
-					 &control	// start function parameter, must refer
-					 // as void*
-			) == -1) {
-		  return -1;		// there was something going wrong
-	   }
-	   pthread_detach(tid);	// thread status must be "detach". In the other
-	   // case, the destructor call of a running
-	   // thread throws a segfault
-	   return 0;
-    };
-
-    // stop the timer thread
-    int Timer::stop()
-    {
-	   if(control.exitflag && (*control.exitflag == 0)) {
-		  pthread_cancel(tid);
-	   }
-	   stopped = 1;
-	   return 0;
-    };
-
-    void sleepms(unsigned int ms)
-    {
-	   usleep(ms * 1000);
-    };
-
-} // namespace ctb
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/portscan.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/portscan.cpp
deleted file mode 100644
index f13766e9fa..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/portscan.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "ctb-0.16/ctb.h"
-#include "ctb-0.16/portscan.h"
-
-#include <sstream>
-
-#ifndef _WIN32
-# include <glob.h>
-#endif
-
-namespace ctb {
-
-    bool GetAvailablePorts( std::vector<std::string>& result,
-					   bool checkInUse )
-    {
-#ifdef _WIN32
-
-	   std::stringstream devname;
-
-	   for( int i = 1; i < 100; i++ ) {
-
-		  devname.clear(); devname.str( "" );
-
-		  // some systems like WinCE doesn't like the extended port numbering...
-		  i < 10 ? devname << "com" << i : devname << "\\\\.\\com" << i;
-
-		  COMMCONFIG cc;
-
-		  DWORD dwSize = sizeof( cc );
-
-		  if ( ::GetDefaultCommConfig( devname.str().c_str(), &cc, &dwSize ) ) {
-
-			 if( cc.dwProviderSubType == PST_RS232 ) {
-
-				ctb::SerialPort com;
-
-				if( com.Open( devname.str().c_str() ) < 0 ) {
-
-				    continue;
-
-				}
-
-				result.push_back( devname.str().c_str() );
-
-			 }
-		  }
-	   }
-
-#else
-	   glob_t globbuf;
-
-	   // search for standard serial ports
-	   int res = glob( "/dev/ttyS*", GLOB_ERR, NULL, &globbuf );
-
-	   if( res == 0 ) {
-
-		  // no error, glob was successful
-		  for( int i = 0; i < globbuf.gl_pathc; i++ ) {
-
-			 if( checkInUse ) {
-			 
-				ctb::SerialPort com;
-
-				if( com.Open( globbuf.gl_pathv[ i ] ) < 0 ) {
-
-				    continue;
-
-				}
-
-				result.push_back( std::string( globbuf.gl_pathv[ i ] ) );
-
-			 }
-		  }
-	   
-	   }
-	   globfree( &globbuf );
-
-	   // search for USB to RS232 converters
-	   res = glob( "/dev/ttyUSB*", GLOB_ERR, NULL, &globbuf );
-
-	   if( res == 0 ) {
-
-		  // no error, glob was successful
-		  for( int i = 0; i < globbuf.gl_pathc; i++ ) {
-
-			 if( checkInUse ) {
-			 
-				ctb::SerialPort com;
-
-				if( com.Open( globbuf.gl_pathv[ i ] ) < 0 ) {
-
-				    continue;
-
-				}
-
-				result.push_back( std::string( globbuf.gl_pathv[ i ] ) );
-
-			 }
-		  }
-	   
-	   }
-
-	   globfree( &globbuf );
-#endif    
-
-    return result.size();
-
-    }
-
-} // namespace ctb
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/serportx.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/serportx.cpp
deleted file mode 100644
index c59bcc002f..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/serportx.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-#include "ctb-0.16/serportx.h"
-
-#include <sstream>
-
-namespace ctb {
-
-    int SerialPort_x::Open( const char* portname, int baudrate,
-					   const char* protocol,
-					   FlowControl flowControl )
-    {
-	   SerialPort_DCS dcs;
-
-	   dcs.baud = baudrate;
-
-	   // default wordlen is 8
-	   if( ( protocol[ 0 ] >= '5' ) && ( protocol[ 0 ] <= '8' )) {
-		  
-		  dcs.wordlen = protocol[ 0 ] - '0';
-
-	   }
-	   else {
-
-		  return -1;
-
-	   }
-
-	   // protocol is given as a string like "8N1", the first
-	   // character specifies the data bits (5...8), the second
-	   // the parity (None,Odd,Even,Mark,Space).
-	   // The third character defines the stopbit (1...2).
-	   switch( protocol[ 1 ] ) {
-	   case 'N': case 'n': dcs.parity = ParityNone; break;
-	   case 'O': case 'o': dcs.parity = ParityOdd; break;
-	   case 'E': case 'e': dcs.parity = ParityEven; break;
-	   case 'M': case 'm': dcs.parity = ParityMark; break;
-	   case 'S': case 's': dcs.parity = ParitySpace; break;
-		  // all other parameters cause an error!
-	   default: return -1;
-	   }
-	   // default stopbits is 1
-	   if( ( protocol[ 2 ] >= '1' ) && ( protocol[ 2 ] <= '2' )) {
-		  
-		  dcs.stopbits = protocol[ 2 ] - '0';
-
-	   }
-	   else {
-
-		  return -1;
-
-	   }
-	   // default flow control is disabled
-	   dcs.rtscts = ( flowControl == RtsCtsFlowControl );
-
-	   dcs.xonxoff = ( flowControl == XonXoffFlowControl );
-
-	   // save the settings in the internal dcs for later use
-	   m_dcs = dcs;
-
-	   return OpenDevice( portname, &m_dcs );
-
-    }
-
-    int SerialPort_x::Open( const int portnumber, int baudrate,
-					   const char* protocol,
-					   FlowControl flowControl )
-    {
-	   // portnumbers start with 1
-	   if( portnumber < 1 ) {
-
-		  return -1;
-
-	   }
- 	   std::stringstream devname;
-
-#if defined ( WIN32 )
-	   // some systems like WinCE doesn't like the extended port numbering...
-	   portnumber < 10 ? devname << "com" << portnumber : 
-		  devname << "\\\\.\\com" << portnumber;
-#else
-	   devname << "/dev/ttyS" << ( portnumber - 1 );
-#endif
-    
-	   return Open( devname.str().c_str(), baudrate, protocol, flowControl );
-    }
-
-    bool SerialPort_x::IsStandardRate( int rate )
-    {
-	   const int rates[] = {
-		  150, 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600,
-		  115200, 230400, 460800, 921600
-	   };
-
-	   for( unsigned int i = 0; i < ( sizeof( rates ) / sizeof( int ) ); i++ ) {
-
-		  if( rate == rates[ i ] ) {
-
-			 return true;
-
-		  }
-	   }
-	   return false;
-    }
-
-} // namespace ctb
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/getopt.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/getopt.cpp
deleted file mode 100644
index c8454b9bde..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/getopt.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        win32/getopt.cpp
-// Purpose:
-// Author:      unknown, I found it in the internet
-// Id:          $Id: getopt.cpp,v 1.1.1.1 2004/11/24 10:30:11 jb Exp $
-// Copyright:   (c) 2001 ?
-// Licence:     (I think Open Source)
-/////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <string.h>
-
-char    *optarg;        /* Global argument pointer. */
-int     optind = 0;     /* Global argv index. */
-
-static char     *scan = NULL;   /* Private scan pointer. */
-
-/* found char, or NULL if none */
-static char *index(const char* s,char charwanted)
-{
-    return(strchr((char*)s, charwanted));
-}
-
-int getopt(int argc, char* argv[], char* optstring)
-{
-    register char c;
-    register char *place;
-
-    optarg = NULL;
-
-    if (scan == NULL || *scan == '\0') {
-	   if (optind == 0)
-		  optind++;
-        
-	   if (optind >= argc || argv[optind][0] != '-' || argv[optind][1] == '\0')
-		  return(EOF);
-	   if (strcmp(argv[optind], "--")==0) {
-		  optind++;
-		  return(EOF);
-	   }
-        
-	   scan = argv[optind]+1;
-	   optind++;
-    }
-
-    c = *scan++;
-    place = index(optstring, c);
-
-    if (place == NULL || c == ':') {
-	   fprintf(stderr, "%s: unknown option -%c\n", argv[0], c);
-	   return('?');
-    }
-
-    place++;
-    if (*place == ':') {
-	   if (*scan != '\0') {
-		  optarg = scan;
-		  scan = NULL;
-	   } else {
-		  optarg = argv[optind];
-		  optind++;
-	   }
-    }
-
-    return(c);
-}
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/serport.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/serport.cpp
deleted file mode 100644
index 23b50ab32b..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/serport.cpp
+++ /dev/null
@@ -1,452 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        serport.cpp
-// Purpose:
-// Author:      Joachim Buermann
-// Id:          $Id: serport.cpp,v 1.1.1.1 2004/11/24 10:30:11 jb Exp $
-// Copyright:   (c) 2001 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include <string.h>
-#include "ctb-0.16/serport.h"
-
-#define SERIALPORT_BUFSIZE 4096
-
-namespace ctb {
-
-    const char* COM1 = "com1";
-    const char* COM2 = "com2";
-    const char* COM3 = "com3";
-    const char* COM4 = "com4";
-    const char* COM5 = "com5";
-    const char* COM6 = "com6";
-    const char* COM7 = "com7";
-    const char* COM8 = "com8";
-    const char* COM9 = "com9";
-    const char* COM10 = "\\\\.\\com10";
-    const char* COM11 = "\\\\.\\com11";
-    const char* COM12 = "\\\\.\\com12";
-    const char* COM13 = "\\\\.\\com13";
-    const char* COM14 = "\\\\.\\com14";
-    const char* COM15 = "\\\\.\\com15";
-    const char* COM16 = "\\\\.\\com16";
-    const char* COM17 = "\\\\.\\com17";
-    const char* COM18 = "\\\\.\\com18";
-    const char* COM19 = "\\\\.\\com19";
-    const char* COM20 = "\\\\.\\com20";
-
-    SerialPort::SerialPort()
-    {
-	   memset( &m_ov, 0, sizeof( OVERLAPPED ) );
-	   fd = INVALID_HANDLE_VALUE;
-	   m_rtsdtr_state = LinestateNull;
-    };
-
-    SerialPort::~SerialPort()
-    {
-	   Close();
-    };
-
-    int SerialPort::CloseDevice()
-    {
-	   if(fd != INVALID_HANDLE_VALUE) {
-		  CloseHandle(m_ov.hEvent);
-		  CloseHandle(fd);
-		  fd = INVALID_HANDLE_VALUE;
-	   }
-	   return 0;
-    };
-
-    int SerialPort::ChangeLineState( SerialLineState flags )
-    {
-	   bool ok = false;
-	   if(flags & LinestateDtr) {
-		  if(m_rtsdtr_state & LinestateDtr) {
-			 ok = EscapeCommFunction(fd,CLRDTR);
-		  }
-		  else {
-			 ok = EscapeCommFunction(fd,SETDTR);
-		  }
-		  m_rtsdtr_state ^= LinestateDtr;
-	   }
-	   if(flags & LinestateRts) {
-		  if(m_rtsdtr_state & LinestateRts) {
-			 ok = EscapeCommFunction(fd,CLRRTS);
-		  }
-		  else {
-			 ok = EscapeCommFunction(fd,SETRTS);
-		  }
-		  m_rtsdtr_state ^= LinestateRts;
-	   }
-	   if(!ok) return -1;
-	   return 0;
-    };
-
-    int SerialPort::ClrLineState( SerialLineState flags )
-    {
-	   BOOL ok = false;
-	   if(flags & LinestateDtr) {
-		  ok = EscapeCommFunction(fd,CLRDTR);
-		  m_rtsdtr_state &= ~LinestateDtr;
-	   }
-	   if(flags & LinestateRts) {
-		  ok = EscapeCommFunction(fd,CLRRTS);
-		  m_rtsdtr_state &= ~LinestateRts;
-	   }
-	   if(!ok) return -1;
-	   return 0;
-    };
-
-    int SerialPort::GetLineState()
-    {
-	   BOOL ok = false;
-	   DWORD stat;
-	   int flags = 0;
-	   if(GetCommModemStatus(fd,&stat)) {
-		  if(stat & MS_CTS_ON) 
-			 flags |= LinestateCts;
-		  if(stat & MS_DSR_ON) 
-			 flags |= LinestateDsr;
-		  if(stat & MS_RING_ON) 
-			 flags |= LinestateRing;
-		  if(stat & MS_RLSD_ON) 
-			 flags |= LinestateDcd;
-		  ok = true;
-	   }
-	   if(!ok) return -1;
-	   return flags;
-    };
-
-    int SerialPort::Ioctl(int cmd,void* args)
-    {
-	   COMSTAT comstat;
-	   DWORD errors;
-	   int result = 0;
-	   bool brk;
-	   switch(cmd) {
-	   case CTB_RESET:
-		  return SendBreak(0);
-	   case CTB_SER_GETEINFO:
-		  if(ClearCommError(fd,&errors,&comstat)) {
-			 // actualize the last events
-			 if(errors & CE_BREAK) einfo.brk++;
-			 if(errors & CE_FRAME) einfo.frame++;
-			 if(errors & CE_OVERRUN) einfo.overrun++;
-			 if(errors & CE_RXPARITY) einfo.parity++;
-			 *(SerialPort_EINFO*)args = einfo;
-			 return 0;
-		  }
-	   case CTB_SER_GETBRK:
-		  if(ClearCommError(fd,&errors,&comstat)) {
-			 if(errors & CE_BREAK) result = 1;
-			 einfo.brk += result;
-			 *(int*)args = result;
-			 return 0;
-		  }
-		  break;
-	   case CTB_SER_GETFRM:
-		  if(ClearCommError(fd,&errors,&comstat)) {
-			 if(errors & CE_FRAME) result = 1;
-			 einfo.frame += result;
-			 *(int*)args = result;
-			 return 0;
-		  }
-	   case CTB_SER_GETOVR:
-		  if(ClearCommError(fd,&errors,&comstat)) {
-			 if(errors & CE_OVERRUN) result = 1;
-			 einfo.overrun += result;
-			 *(int*)args = result;
-			 return 0;
-		  }
-		  break;
-	   case CTB_SER_GETPAR:
-		  if(ClearCommError(fd,&errors,&comstat)) {
-			 if(errors & CE_RXPARITY) result = 1;
-			 einfo.parity += result;
-			 *(int*)args = result;
-			 return 0;
-		  }
-		  break;
-	   case CTB_SER_GETINQUE:
-		  if(ClearCommError(fd,&errors,&comstat)) {
-			 *(int*)args = (int)comstat.cbInQue;
-			 return 0;
-		  }
-		  break;
-	   case CTB_SER_SETPAR:
-		  return SetParityBit( *(int*)args == 1 );
-	   }
-	   // error or unknown command
-	   return -1;
-    };
-
-    int SerialPort::IsOpen()
-    {
-	   return (fd != INVALID_HANDLE_VALUE);
-    };
-
-    int SerialPort::OpenDevice(const char* devname, void* dcs)
-    {
-	   // if dcs isn't NULL, type cast
-	   if(dcs) m_dcs = *(SerialPort_DCS*)dcs;
-
-	   fd = CreateFile(devname,	// device name
-				    GENERIC_READ | GENERIC_WRITE,	// O_RDWR
-				    0,		// not shared
-				    NULL,	// default value for object security ?!?
-				    OPEN_EXISTING, // file (device) exists
-				    FILE_FLAG_OVERLAPPED,	// asynchron handling
-				    NULL); // no more handle flags
-	
-	   if(fd == INVALID_HANDLE_VALUE) {
-		  return -1;
-	   }
-	   // save the device name
-	   strncpy(m_devname,(char*)devname,sizeof(m_devname));
-	   // we write an eos to avoid a buffer overflow
-	   m_devname[sizeof(m_devname)-1] = '\0';
-
-	   // device control block
-	   DCB dcb;
-	   memset(&dcb,0,sizeof(dcb));
-	   dcb.DCBlength = sizeof(dcb);
-	   dcb.BaudRate = m_dcs.baud;
-	   dcb.fBinary = 1;
-
-	   m_rtsdtr_state = LinestateNull;
-
-	   // Specifies whether the CTS (clear-to-send) signal is monitored 
-	   // for output flow control. If this member is TRUE and CTS is turned
-	   // off, output is suspended until CTS is sent again.
-	   dcb.fOutxCtsFlow = m_dcs.rtscts;
-
-	   // Specifies the DTR (data-terminal-ready) flow control. 
-	   // This member can be one of the following values:
-	   // DTR_CONTROL_DISABLE   Disables the DTR line when the device is 
-	   //                       opened and leaves it disabled. 
-	   // DTR_CONTROL_ENABLE    Enables the DTR line when the device is 
-	   //                       opened and leaves it on. 
-	   // DTR_CONTROL_HANDSHAKE Enables DTR handshaking. If handshaking is 
-	   //                       enabled, it is an error for the application
-	   //                       to adjust the line by using the 
-	   //                       EscapeCommFunction function.  
-	   dcb.fDtrControl = DTR_CONTROL_DISABLE;
-	   m_rtsdtr_state |= LinestateDtr;
-	   // Specifies the RTS flow control. If this value is zero, the
-	   // default is RTS_CONTROL_HANDSHAKE. This member can be one of
-	   // the following values:
-	   // RTS_CONTROL_DISABLE   Disables the RTS line when device is
-	   //                       opened and leaves it disabled.
-	   // RTS_CONTROL_ENABLED   Enables the RTS line when device is
-	   //                       opened and leaves it on.
-	   // RTS_CONTROL_HANDSHAKE Enables RTS handshaking. The driver
-	   //                       raises the RTS line when the
-	   //                       "type-ahead" (input)buffer is less than
-	   //                       one-half full and lowers the RTS line
-	   //                       when the buffer is more than three-quarters
-	   //                       full. If handshaking is enabled, it is an
-	   //                       error for the application to adjust the
-	   //                       line by using the EscapeCommFunction function.
-	   // RTS_CONTROL_TOGGLE    Specifies that the RTS line will be high if 
-	   //                       bytes are available for transmission. After
-	   //                       all buffered bytes have been send, the RTS
-	   //                       line will be low.
-	   if(m_dcs.rtscts) dcb.fRtsControl = RTS_CONTROL_HANDSHAKE;
-	   else {
-		  dcb.fRtsControl = RTS_CONTROL_DISABLE;
-		  m_rtsdtr_state |= LinestateRts;
-	   }
-	   // Specifies the XON/XOFF flow control.
-	   // If fOutX is true (the default is false), transmission stops when the
-	   // XOFF character is received and starts again, when the XON character
-	   // is received.
-	   dcb.fOutX = m_dcs.xonxoff;
-	   // If fInX is true (default is false), the XOFF character is sent when
-	   // the input buffer comes within XoffLim bytes of being full, and the
-	   // XON character is sent, when the input buffer comes within XonLim
-	   // bytes of being empty.
-	   dcb.fInX = m_dcs.xonxoff;
-	   // default character for XOFF is 0x13 (hex 13)
-	   dcb.XoffChar = 0x13;
-	   // default character for XON is 0x11 (hex 11)
-	   dcb.XonChar = 0x11;
-	   // set the minimum number of bytes allowed in the input buffer before
-	   // the XON character is sent (3/4 of full size)
-	   dcb.XonLim = (SERIALPORT_BUFSIZE >> 2) * 3;
-	   // set the maximum number of free bytes in the input buffer, before the
-	   // XOFF character is sent (3/4 of full size)
-	   dcb.XoffLim = (SERIALPORT_BUFSIZE >> 2) * 3;
-
-	   // parity
-	   switch( m_dcs.parity ) {
-
-	   case ParityOdd: dcb.Parity = ODDPARITY; break;
-	   case ParityEven: dcb.Parity = EVENPARITY; break;
-	   case ParityMark: dcb.Parity = MARKPARITY; break;
-	   case ParitySpace: dcb.Parity = SPACEPARITY; break;
-	   default: dcb.Parity = NOPARITY;
-
-	   }
-	   // stopbits
-	   if(m_dcs.stopbits == 2) dcb.StopBits = TWOSTOPBITS;
-	   else dcb.StopBits = ONESTOPBIT;
-	   // wordlen, valid values are 5,6,7,8
-	   dcb.ByteSize = m_dcs.wordlen;
-
-	   if(!SetCommState(fd,&dcb))
-		  return -2;
-
-	   // create event for overlapped I/O
-	   // we need a event object, which inform us about the
-	   // end of an operation (here reading device)
-	   m_ov.hEvent = CreateEvent(NULL,// LPSECURITY_ATTRIBUTES lpsa
-						    TRUE, // BOOL fManualReset 
-						    TRUE, // BOOL fInitialState
-						    NULL); // LPTSTR lpszEventName
-	   if(m_ov.hEvent == INVALID_HANDLE_VALUE) {
-		  return -3;
-	   }
-
-	   /* THIS IS OBSOLETE!!!
-	   // event should be triggered, if there are some received data
-	   if(!SetCommMask(fd,EV_RXCHAR))
-	   return -4;
-	   */
-
-	   COMMTIMEOUTS cto = {MAXDWORD,0,0,0,0};
-	   if(!SetCommTimeouts(fd,&cto))
-		  return -5;
-
-	   // for a better performance with win95/98 I increased the internal
-	   // buffer to SERIALPORT_BUFSIZE (normal size is 1024, but this can 
-	   // be a little bit to small, if you use a higher baudrate like 115200)
-	   if(!SetupComm(fd,SERIALPORT_BUFSIZE,SERIALPORT_BUFSIZE))
-		  return -6;
-
-	   // clear the internal error struct
-	   memset(&einfo,0,sizeof(einfo));
-	   return 0;
-    };
-
-    int SerialPort::Read(char* buf,size_t len)
-    {
-	   DWORD read;
-	   int m = m_fifo->items();
-	   while(len) {
-		  if(m_fifo->get(buf) == 1) {
-			 len--;
-			 buf++;
-		  }
-		  else {
-			 break;
-		  }
-	   }
-	   if(!ReadFile(fd,buf,len,&read,&m_ov)) {
-		  // if we use a asynchrone reading, ReadFile gives always
-		  // FALSE
-		  // ERROR_IO_PENDING means ok, other values show an error
-		  if(GetLastError() != ERROR_IO_PENDING) {
-			 // oops..., error in communication
-			 return -1;
-		  }
-	   }
-	   else {
-		  // ok, we have read all wanted bytes
-		  return (int)read + m;
-	   }
-	   return 0;
-    };
-
-    int SerialPort::SendBreak(int duration)
-    {
-	   if(duration <= 0) duration = 1;
-	   if(!SetCommBreak(fd)) return -1;
-	   // win32 Sleep parameter is ms
-	   Sleep(duration * 250);
-	   if(!ClearCommBreak(fd)) return -1;
-	   // no error
-	   return 0;
-    };
-
-/*
-  FIXME! : We need some additional code to check the success of the
-  baudrate modulation (non-standard rates depend on the used
-  UART chipset).		 
-*/
-    int SerialPort::SetBaudrate( int baudrate )
-    {
-	   DCB dcb;
-
-	   // get the current dcb...
-	   if(!GetCommState(fd,&dcb)) {
-		  return -1;
-	   }
-	   dcb.BaudRate = baudrate;
-	   // and write it back
-	   if(!SetCommState(fd,&dcb)) {
-		  return -1;
-	   }
-	   m_dcs.baud = baudrate;
-	   return 0;
-    }
-
-    int SerialPort::SetLineState( SerialLineState flags )
-    {
-	   BOOL ok = false;
-	   if(flags & LinestateDtr) {
-		  ok = EscapeCommFunction(fd,SETDTR);
-		  // save the new state
-		  m_rtsdtr_state |= LinestateDtr;
-	   }
-	   if(flags & LinestateRts) {
-		  ok = EscapeCommFunction(fd,SETRTS);
-		  // save the new state
-		  m_rtsdtr_state |= LinestateRts;
-	   }
-	   if(!ok) return -1;
-	   return 0;
-    };
-
-    int SerialPort::SetParityBit( bool parity )
-    {
-	   DCB dcb;
-
-	   if( ! GetCommState( fd, &dcb ) ) {
-
-		  return -1;
-
-	   }	   
-
-	   parity ? dcb.Parity = MARKPARITY : dcb.Parity = SPACEPARITY;
-
-	   if( ! SetCommState( fd, &dcb ) ) {
-
-		  return -2;
-
-	   }
-	   return 0;
-    }
-
-    int SerialPort::Write(char* buf,size_t len)
-    {
-	   DWORD write;
-	   if(!WriteFile(fd,buf,len,&write,&m_ov)) {
-		  if(GetLastError() != ERROR_IO_PENDING) {
-			 return -1;
-		  }
-		  else {
-			 // VERY IMPORTANT to flush the data out of the internal
-			 // buffer
-			 FlushFileBuffers(fd);
-			 // first you must call GetOverlappedResult, then you
-			 // get the REALLY transmitted count of bytes
-			 if(!GetOverlappedResult(fd,&m_ov,&write,TRUE)) {
-				// ooops... something is going wrong
-				return (int)write;
-			 }
-		  }
-	   }
-	   return write;
-    };
-
-} // namespace ctb
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/timer.cpp b/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/timer.cpp
deleted file mode 100644
index 617aa5b5ad..0000000000
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/timer.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        win32/timer.cpp
-// Purpose:
-// Author:      Joachim Buermann
-// Id:          $Id: timer.cpp,v 1.2 2004/11/30 12:39:17 jb Exp $
-// Copyright:   (c) 2001 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef WIN32
-#include <windows.h>
-# ifndef DWORD_PTR 
-#  define DWORD_PTR DWORD*
-# endif
-#endif
-
-#include "ctb-0.16/timer.h"
-
-namespace ctb {
-
-    static void WINAPI timer_fnc(UINT uTimerID, 
-						   UINT uMsg, 
-						   DWORD_PTR dwUser, 
-						   DWORD_PTR dw1, 
-						   DWORD_PTR dw2)
-    {
-	   timer_control *tc = (timer_control*)dwUser;
-
-	   if(tc->exitfnc) tc->exitfnc(NULL);
-	   if(tc->exitflag) *tc->exitflag = 1;
-	   tc->stop = 0;
-    };
-
-    Timer::Timer(unsigned int msecs,int* exitflag,void*(*exitfnc)(void*))
-    {
-	   control.msecs = msecs;
-	   if(!control.msecs) control.msecs = 1;
-	   control.exitflag = exitflag;
-	   control.exitfnc = exitfnc;
-	   control.stop = 0;
-    };
-
-    Timer::~Timer()
-    {
-	   stop();				  // stop the thread
-    };
-
-    int Timer::start()
-    {
-	   stop();
-	   control.stop = timeSetEvent(control.msecs, 
-							 (control.msecs > 10) ? 5 : 1, 
-							 (LPTIMECALLBACK) timer_fnc, 
-							 (DWORD) &control, 
-							 TIME_ONESHOT | TIME_CALLBACK_FUNCTION);
-	   return 0;
-    };
-
-    int Timer::stop()
-    {
-	   if (control.stop)
-		  timeKillEvent(control.stop);
-	   control.stop = 0;
-	   return 0;
-    };
-
-    void kill_all_timer()
-    {
-    };
-
-    void sleepms(unsigned int ms)
-    {
-	   // set the granularity of Sleep() for the application, that
-	   // calls it so Sleep(1) will truly sleep for just a millisecond,
-	   // rather than the default 10!
-	   // See: http://www.geisswerks.com/ryan/FAQS/timing.html
-	   timeBeginPeriod(1);
-	   SleepEx(ms,false);
-	   timeEndPeriod(1);
-    };
-
-} // namespace ctb
diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2017.vcxproj b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2017.vcxproj
deleted file mode 100644
index 2904f57a85..0000000000
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2017.vcxproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_gsmopen</ProjectName>
-    <ProjectGuid>{74B120FF-6935-4DFE-A142-CDB6BEA99C90}</ProjectGuid>
-    <RootNamespace>mod_skypiax</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)\w32\tiff.props" />
-    <Import Project="$(SolutionDir)\w32\spandsp.props"/>
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>gsmlib\gsmlib-1.10-patched-13ubuntu;libctb-0.16\include;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src\msvc;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src;%(RootDir)%(Directory)..\..\..\..\libs\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NO_ALSA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <DisableSpecificWarnings>4554;4324;4389;4244;4267;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>gsmlib\gsmlib-1.10-patched-13ubuntu;libctb-0.16\include;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src\msvc;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src;%(RootDir)%(Directory)..\..\..\..\libs\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4554;4324;4389;4244;4267;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>gsmlib\gsmlib-1.10-patched-13ubuntu;libctb-0.16\include;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src\msvc;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src;%(RootDir)%(Directory)..\..\..\..\libs\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NO_ALSA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <DisableSpecificWarnings>4554;4324;4389;4244;4267;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>gsmlib\gsmlib-1.10-patched-13ubuntu;libctb-0.16\include;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src\msvc;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src;%(RootDir)%(Directory)..\..\..\..\libs\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4554;4324;4389;4244;4267;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="gsmopen.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="gsmopen_protocol.cpp" />
-    <ClCompile Include="mod_gsmopen.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\libs\spandsp\src\libspandsp.2017.vcxproj">
-      <Project>{1cbb0077-18c5-455f-801c-0a0ce7b0bbf5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libs\win32\libcbt\libcbt.2017.vcxproj">
-      <Project>{77bc1dd2-c9a1-44d7-bffa-1320370cacb9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gsmlib\gsmlib-1.10-patched-13ubuntu\win32\gsmlib.2017.vcxproj">
-      <Project>{26c82fce-e0cf-4d10-a00c-d8e582ffeb53}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
deleted file mode 100644
index 20697adda4..0000000000
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
+++ /dev/null
@@ -1,3299 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * This module (mod_gsmopen) has been contributed by:
- *
- * Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * Maintainer: Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * mod_gsmopen.cpp -- GSM Modem compatible Endpoint Module
- *
- */
-
-#include "gsmopen.h"
-
-SWITCH_BEGIN_EXTERN_C SWITCH_MODULE_LOAD_FUNCTION(mod_gsmopen_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_gsmopen_shutdown);
-SWITCH_MODULE_DEFINITION(mod_gsmopen, mod_gsmopen_load, mod_gsmopen_shutdown, NULL);
-SWITCH_END_EXTERN_C
-#define GSMOPEN_CHAT_PROTO "sms"
-SWITCH_STANDARD_API(gsm_function);
-#define GSM_SYNTAX "list [full] || console || AT_command || remove < interface_name | interface_id > || reload"
-SWITCH_STANDARD_API(gsmopen_function);
-#define GSMOPEN_SYNTAX "interface_name AT_command"
-
-SWITCH_STANDARD_API(gsmopen_boost_audio_function);
-#define GSMOPEN_BOOST_AUDIO_SYNTAX "interface_name [<play|capt> <in decibels: -40 ... 0 ... +40>]"
-SWITCH_STANDARD_API(sendsms_function);
-#define SENDSMS_SYNTAX "gsmopen_sendsms interface_name destination_number SMS_text"
-SWITCH_STANDARD_API(gsmopen_dump_function);
-#define GSMOPEN_DUMP_SYNTAX "gsmopen_dump <interface_name|list>"
-SWITCH_STANDARD_API(gsmopen_ussd_function);
-#define USSD_SYNTAX "gsmopen_ussd <interface_name> <ussd_code> [nowait]"
-#define FULL_RELOAD 0
-#define SOFT_RELOAD 1
-
-const char *interface_status[] = {	/* should match GSMOPEN_STATE_xxx in gsmopen.h */
-	"IDLE",
-	"DOWN",
-	"RING",
-	"DIALING",
-	"BUSY",
-	"UP",
-	"RINGING",
-	"PRERING",
-	"DOUBLE",
-	"SELECTD",
-	"HANG_RQ",
-	"PREANSW"
-};
-
-const char *phone_callflow[] = {	/* should match CALLFLOW_XXX in gsmopen.h */
-	"CALL_IDLE",
-	"CALL_DOWN",
-	"INCOMING_RNG",
-	"CALL_DIALING",
-	"CALL_LINEBUSY",
-	"CALL_ACTIVE",
-	"INCOMING_HNG",
-	"CALL_RLEASD",
-	"CALL_NOCARR",
-	"CALL_INFLUX",
-	"CALL_INCOMING",
-	"CALL_FAILED",
-	"CALL_NOSRVC",
-	"CALL_OUTRESTR",
-	"CALL_SECFAIL",
-	"CALL_NOANSWER",
-	"STATUS_FNSHED",
-	"STATUS_CANCLED",
-	"STATUS_FAILED",
-	"STATUS_REFUSED",
-	"STATUS_RINGING",
-	"STATUS_INPROGRS",
-	"STATUS_UNPLACD",
-	"STATUS_ROUTING",
-	"STATUS_EARLYMD",
-	"INCOMING_CLID",
-	"STATUS_RMTEHOLD"
-};
-
-static struct {
-	int debug;
-	char *ip;
-	int port;
-	char *dialplan;
-	char *destination;
-	char *context;
-	char *codec_string;
-	char *codec_order[SWITCH_MAX_CODECS];
-	int codec_order_last;
-	char *codec_rates_string;
-	char *codec_rates[SWITCH_MAX_CODECS];
-	int codec_rates_last;
-	unsigned int flags;
-	int fd;
-	int calls;
-	int real_interfaces;
-	int next_interface;
-	char hold_music[256];
-	private_t GSMOPEN_INTERFACES[GSMOPEN_MAX_INTERFACES];
-	switch_mutex_t *mutex;
-	private_t *gsm_console;
-} globals;
-
-switch_endpoint_interface_t *gsmopen_endpoint_interface;
-switch_memory_pool_t *gsmopen_module_pool = NULL;
-int running = 0;
-
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_context, globals.context);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_destination, globals.destination);
-
-static switch_status_t interface_exists(char *the_interface);
-static switch_status_t remove_interface(char *the_interface);
-
-static switch_status_t channel_on_init(switch_core_session_t *session);
-static switch_status_t channel_on_hangup(switch_core_session_t *session);
-static switch_status_t channel_on_destroy(switch_core_session_t *session);
-static switch_status_t channel_on_routing(switch_core_session_t *session);
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
-static switch_status_t channel_on_consume_media(switch_core_session_t *session);
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
-													switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-													switch_call_cause_t *cancel_cause);
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
-static switch_status_t gsmopen_tech_init(private_t *tech_pvt, switch_core_session_t *session);
-
-static switch_status_t gsmopen_codec(private_t *tech_pvt, int sample_rate, int codec_ms)
-{
-	switch_core_session_t *session = NULL;
-
-	if (switch_core_codec_init
-		(&tech_pvt->read_codec, "L16", NULL, NULL, sample_rate, codec_ms, 1,
-		 SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("Can't load codec?\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_core_codec_init
-		(&tech_pvt->write_codec, "L16", NULL, NULL, sample_rate, codec_ms, 1,
-		 SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("Can't load codec?\n", GSMOPEN_P_LOG);
-		switch_core_codec_destroy(&tech_pvt->read_codec);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	tech_pvt->read_frame.rate = sample_rate;
-	tech_pvt->read_frame.codec = &tech_pvt->read_codec;
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-
-	if (session) {
-		switch_core_session_set_read_codec(session, &tech_pvt->read_codec);
-		switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
-		switch_core_session_rwunlock(session);
-	} else {
-		ERRORA("no session\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-switch_status_t gsmopen_tech_init(private_t *tech_pvt, switch_core_session_t *session)
-{
-
-	switch_assert(tech_pvt != NULL);
-	switch_assert(session != NULL);
-	tech_pvt->read_frame.data = tech_pvt->databuf;
-	tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
-	switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-	switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-	switch_core_session_set_private(session, tech_pvt);
-	switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), sizeof(tech_pvt->session_uuid_str));
-	if (!strlen(tech_pvt->session_uuid_str)) {
-		ERRORA("no tech_pvt->session_uuid_str\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-	if (gsmopen_codec(tech_pvt, SAMPLERATE_GSMOPEN, 20) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("gsmopen_codec FAILED\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-	dtmf_rx_init(&tech_pvt->dtmf_state, NULL, NULL);
-	dtmf_rx_parms(&tech_pvt->dtmf_state, 0, 10, 10, -99);
-
-/*
-	if (tech_pvt->no_sound == 0) {
-		if (serial_audio_init(tech_pvt)) {
-			ERRORA("serial_audio_init failed\n", GSMOPEN_P_LOG);
-			return SWITCH_STATUS_FALSE;
-
-		}
-	}
-*/
-
-	if (switch_core_timer_init(&tech_pvt->timer_read, "soft", 20, tech_pvt->read_codec.implementation->samples_per_packet, gsmopen_module_pool) !=
-		SWITCH_STATUS_SUCCESS) {
-		ERRORA("setup timer failed\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_core_timer_sync(&tech_pvt->timer_read);
-
-	if (switch_core_timer_init(&tech_pvt->timer_write, "soft", 20, tech_pvt->write_codec.implementation->samples_per_packet, gsmopen_module_pool) !=
-		SWITCH_STATUS_SUCCESS) {
-		ERRORA("setup timer failed\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_core_timer_sync(&tech_pvt->timer_write);
-
-	switch_mutex_lock(tech_pvt->flag_mutex);
-	switch_clear_flag(tech_pvt, TFLAG_HANGUP);
-	switch_mutex_unlock(tech_pvt->flag_mutex);
-	DEBUGA_GSMOPEN("gsmopen_codec SUCCESS\n", GSMOPEN_P_LOG);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t list_interfaces(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	int interface_id;
-	switch_console_callback_match_t *my_matches = NULL;
-	switch_status_t status = SWITCH_STATUS_FALSE;
-
-	for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
-		if (globals.GSMOPEN_INTERFACES[interface_id].running) {
-			switch_console_push_match(&my_matches, (const char *) globals.GSMOPEN_INTERFACES[interface_id].name);
-		}
-	}
-
-	if (my_matches) {
-		*matches = my_matches;
-		status = SWITCH_STATUS_SUCCESS;
-	}
-
-	return status;
-}
-
-static switch_status_t interface_exists(char *the_interface)
-{
-	int i;
-	int interface_id;
-
-	if (*the_interface == '#') {	/* look by interface id or interface name */
-		the_interface++;
-		switch_assert(the_interface);
-		interface_id = atoi(the_interface);
-
-		/* take a number as interface id */
-		if (interface_id > 0 || (interface_id == 0 && strcmp(the_interface, "0") == 0)) {
-			if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
-				return SWITCH_STATUS_SUCCESS;
-			}
-		} else {
-			/* interface name */
-			for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
-				if (strcmp(globals.GSMOPEN_INTERFACES[interface_id].name, the_interface) == 0) {
-					return SWITCH_STATUS_SUCCESS;
-					break;
-				}
-			}
-		}
-	} else {					/* look by gsmopen_user */
-
-		for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-			if (strlen(globals.GSMOPEN_INTERFACES[i].gsmopen_user)) {
-				if (strcmp(globals.GSMOPEN_INTERFACES[i].gsmopen_user, the_interface) == 0) {
-					return SWITCH_STATUS_SUCCESS;
-				}
-			}
-		}
-	}
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t remove_interface(char *the_interface)
-{
-	int x = 10;
-	int fd;
-#ifdef WIN32
-	switch_size_t howmany = 8;
-#else
-	unsigned int howmany = 8;
-#endif
-
-	int interface_id = -1;
-	private_t *tech_pvt = NULL;
-	switch_status_t status;
-
-
-	switch_assert(the_interface);
-	interface_id = atoi(the_interface);
-
-	if ((interface_id > 0 && interface_id < GSMOPEN_MAX_INTERFACES) || (interface_id == 0 && strcmp(the_interface, "0") == 0)) {
-		if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
-			/* take a number as interface id */
-			tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-		}
-	} else {
-
-		for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
-			if (strcmp(globals.GSMOPEN_INTERFACES[interface_id].name, the_interface) == 0) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-				break;
-			}
-		}
-	}
-
-	if (!tech_pvt) {
-		DEBUGA_GSMOPEN("interface '%s' does not exist\n", GSMOPEN_P_LOG, the_interface);
-		goto end;
-	}
-
-	if (strlen(globals.GSMOPEN_INTERFACES[interface_id].session_uuid_str)) {
-		DEBUGA_GSMOPEN("interface '%s' is busy\n", GSMOPEN_P_LOG, the_interface);
-		goto end;
-	}
-
-	LOKKA(tech_pvt->controldev_lock);
-
-	globals.GSMOPEN_INTERFACES[interface_id].running = 0;
-
-	if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
-#ifdef WIN32
-		switch_file_write(tech_pvt->GSMopenHandles.fdesc[1], "sciutati", &howmany);	// let's the controldev_thread die
-#else /* WIN32 */
-		howmany = write(tech_pvt->GSMopenHandles.fdesc[1], "sciutati", howmany);
-#endif /* WIN32 */
-		DEBUGA_GSMOPEN("HERE will shutdown gsmopen_signaling_thread of '%s'\n", GSMOPEN_P_LOG, the_interface);
-	}
-
-	if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread) {
-		DEBUGA_GSMOPEN("HERE will shutdown gsmopen_api_thread of '%s'\n", GSMOPEN_P_LOG, the_interface);
-	}
-
-	while (x) {
-		x--;
-		switch_yield(50000);
-	}
-
-	if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
-		switch_thread_join(&status, globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread);
-	}
-
-	if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread) {
-		switch_thread_join(&status, globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread);
-	}
-
-	fd = tech_pvt->controldevfd;
-	if (fd) {
-		tech_pvt->controldevfd = -1;
-		DEBUGA_GSMOPEN("SHUTDOWN tech_pvt->controldevfd=%d\n", GSMOPEN_P_LOG, tech_pvt->controldevfd);
-	}
-
-	serial_audio_shutdown(tech_pvt);
-
-	int res;
-	res = tech_pvt->serialPort_serial_control->Close();
-	DEBUGA_GSMOPEN("serial_shutdown res=%d (controldevfd is %d)\n", GSMOPEN_P_LOG, res, tech_pvt->controldevfd);
-
-#ifndef WIN32
-	shutdown(tech_pvt->audiogsmopenpipe[0], 2);
-	close(tech_pvt->audiogsmopenpipe[0]);
-	shutdown(tech_pvt->audiogsmopenpipe[1], 2);
-	close(tech_pvt->audiogsmopenpipe[1]);
-	shutdown(tech_pvt->audiopipe[0], 2);
-	close(tech_pvt->audiopipe[0]);
-	shutdown(tech_pvt->audiopipe[1], 2);
-	close(tech_pvt->audiopipe[1]);
-	shutdown(tech_pvt->GSMopenHandles.fdesc[0], 2);
-	close(tech_pvt->GSMopenHandles.fdesc[0]);
-	shutdown(tech_pvt->GSMopenHandles.fdesc[1], 2);
-	close(tech_pvt->GSMopenHandles.fdesc[1]);
-#endif /* WIN32 */
-
-	UNLOCKA(tech_pvt->controldev_lock);
-	switch_mutex_lock(globals.mutex);
-	if (globals.gsm_console == &globals.GSMOPEN_INTERFACES[interface_id]) {
-		DEBUGA_GSMOPEN("interface '%s' no more console\n", GSMOPEN_P_LOG, the_interface);
-		globals.gsm_console = NULL;
-	} else {
-		DEBUGA_GSMOPEN("interface '%s' STILL console\n", GSMOPEN_P_LOG, the_interface);
-	}
-	memset(&globals.GSMOPEN_INTERFACES[interface_id], '\0', sizeof(private_t));
-	globals.real_interfaces--;
-	switch_mutex_unlock(globals.mutex);
-
-	DEBUGA_GSMOPEN("interface '%s' deleted successfully\n", GSMOPEN_P_LOG, the_interface);
-
-  end:
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/*
-   State methods that get called when the state changes to the specific state
-   returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
-   so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
-*/
-static switch_status_t channel_on_init(switch_core_session_t *session)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt = NULL;
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	memset(tech_pvt->buffer2, 0, sizeof(tech_pvt->buffer2));
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-	switch_mutex_lock(tech_pvt->flag_mutex);
-	switch_set_flag(tech_pvt, TFLAG_IO);
-	switch_mutex_unlock(tech_pvt->flag_mutex);
-
-	switch_mutex_lock(globals.mutex);
-	globals.calls++;
-
-	switch_mutex_unlock(globals.mutex);
-	DEBUGA_GSMOPEN("%s CHANNEL INIT %s\n", GSMOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_destroy(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-
-	if (tech_pvt) {
-		DEBUGA_GSMOPEN("%s CHANNEL DESTROY %s\n", GSMOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
-
-		if (switch_core_codec_ready(&tech_pvt->read_codec)) {
-			switch_core_codec_destroy(&tech_pvt->read_codec);
-		}
-
-		if (switch_core_codec_ready(&tech_pvt->write_codec)) {
-			switch_core_codec_destroy(&tech_pvt->write_codec);
-		}
-
-		switch_core_timer_destroy(&tech_pvt->timer_read);
-		switch_core_timer_destroy(&tech_pvt->timer_write);
-
-		if (tech_pvt->no_sound == 0) {
-			serial_audio_shutdown(tech_pvt);
-		}
-
-		*tech_pvt->session_uuid_str = '\0';
-		tech_pvt->interface_state = GSMOPEN_STATE_IDLE;
-		if (tech_pvt->phone_callflow == CALLFLOW_STATUS_FINISHED) {
-			tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-		}
-		memset(tech_pvt->buffer2, 0, sizeof(tech_pvt->buffer2));
-		switch_core_session_set_private(session, NULL);
-	} else {
-		DEBUGA_GSMOPEN("!!!!!!NO tech_pvt!!!! CHANNEL DESTROY %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(session));
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_hangup(switch_core_session_t *session)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	tech_pvt->phone_callflow = CALLFLOW_CALL_HANGUP_REQUESTED;
-
-	if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
-		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-			tech_pvt->ob_failed_calls++;
-		} else {
-			tech_pvt->ib_failed_calls++;
-		}
-	}
-
-	DEBUGA_GSMOPEN("%s CHANNEL HANGUP\n", GSMOPEN_P_LOG, tech_pvt->name);
-	switch_mutex_lock(tech_pvt->flag_mutex);
-	switch_clear_flag(tech_pvt, TFLAG_IO);
-	switch_clear_flag(tech_pvt, TFLAG_VOICE);
-	switch_set_flag(tech_pvt, TFLAG_HANGUP);
-	switch_mutex_unlock(tech_pvt->flag_mutex);
-
-	gsmopen_hangup(tech_pvt);
-
-	//memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str));
-	//*tech_pvt->session_uuid_str = '\0';
-	DEBUGA_GSMOPEN("%s CHANNEL HANGUP\n", GSMOPEN_P_LOG, tech_pvt->name);
-	switch_mutex_lock(globals.mutex);
-	globals.calls--;
-	if (globals.calls < 0) {
-		globals.calls = 0;
-	}
-
-	tech_pvt->interface_state = GSMOPEN_STATE_IDLE;
-	tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
-	switch_mutex_unlock(globals.mutex);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_routing(switch_core_session_t *session)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_GSMOPEN("%s CHANNEL ROUTING\n", GSMOPEN_P_LOG, tech_pvt->name);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_execute(switch_core_session_t *session)
-{
-
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_GSMOPEN("%s CHANNEL EXECUTE\n", GSMOPEN_P_LOG, tech_pvt->name);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_GSMOPEN("%s CHANNEL KILL_CHANNEL\n", GSMOPEN_P_LOG, tech_pvt->name);
-	switch (sig) {
-	case SWITCH_SIG_KILL:
-		DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_SIG_KILL\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		switch_mutex_lock(tech_pvt->flag_mutex);
-		switch_clear_flag(tech_pvt, TFLAG_IO);
-		switch_clear_flag(tech_pvt, TFLAG_VOICE);
-		switch_set_flag(tech_pvt, TFLAG_HANGUP);
-		switch_mutex_unlock(tech_pvt->flag_mutex);
-		break;
-	case SWITCH_SIG_BREAK:
-		DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_SIG_BREAK\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		switch_mutex_lock(tech_pvt->flag_mutex);
-		switch_set_flag(tech_pvt, TFLAG_BREAK);
-		switch_mutex_unlock(tech_pvt->flag_mutex);
-		break;
-	default:
-		break;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_consume_media(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-
-	if (tech_pvt) {
-		DEBUGA_GSMOPEN("%s CHANNEL CONSUME_MEDIA\n", GSMOPEN_P_LOG, tech_pvt->name);
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	if (tech_pvt) {
-		DEBUGA_GSMOPEN("%s CHANNEL EXCHANGE_MEDIA\n", GSMOPEN_P_LOG, tech_pvt->name);
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	if (tech_pvt) {
-		DEBUGA_GSMOPEN("%s CHANNEL SOFT_EXECUTE\n", GSMOPEN_P_LOG, tech_pvt->name);
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
-{
-	private_t *tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_GSMOPEN("%s CHANNEL SEND_DTMF\n", GSMOPEN_P_LOG, tech_pvt->name);
-	DEBUGA_GSMOPEN("DTMF: %c\n", GSMOPEN_P_LOG, dtmf->digit);
-
-	gsmopen_senddigit(tech_pvt, dtmf->digit);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-	switch_byte_t *data;
-
-	int samples;
-	char digit_str[256];
-	char buffer2[640];
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	if (!switch_channel_ready(channel) || !switch_test_flag(tech_pvt, TFLAG_IO)) {
-		ERRORA("channel not ready \n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-		return SWITCH_STATUS_FALSE;
-	}
-
-	tech_pvt->read_frame.flags = SFF_NONE;
-	*frame = NULL;
-
-	if (switch_test_flag(tech_pvt, TFLAG_HANGUP)) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_core_timer_next(&tech_pvt->timer_read);
-
-	if (tech_pvt->no_sound) {
-		goto cng;
-	}
-	memset(buffer2, 0, sizeof(buffer2));
-	samples = tech_pvt->serialPort_serial_audio->Read(buffer2, 640);
-
-	if (samples >= 320) {
-		tech_pvt->buffer2_full = 0;
-
-		if (samples >= 640) {
-			DEBUGA_GSMOPEN("read more than 320, samples=%d\n", GSMOPEN_P_LOG, samples);
-			memcpy(tech_pvt->buffer2, buffer2 + 320, 320);
-			tech_pvt->buffer2_full = 1;
-		}
-		samples = 320;
-		memcpy(tech_pvt->read_frame.data, buffer2, 320);
-	} else {
-		if (samples != 0) {
-			DEBUGA_GSMOPEN("read less than 320, samples=%d\n", GSMOPEN_P_LOG, samples);
-		}
-		if (tech_pvt->buffer2_full) {
-			memcpy(tech_pvt->read_frame.data, tech_pvt->buffer2, 320);
-			tech_pvt->buffer2_full = 0;
-			samples = 320;
-			DEBUGA_GSMOPEN("samples=%d FROM BUFFER\n", GSMOPEN_P_LOG, samples);
-			memset(tech_pvt->buffer2, 0, sizeof(tech_pvt->buffer2));
-		}
-
-	}
-
-	tech_pvt->read_frame.datalen = samples;
-	tech_pvt->read_frame.samples = samples / 2;
-	tech_pvt->read_frame.timestamp = tech_pvt->timer_read.samplecount;
-
-	*frame = &tech_pvt->read_frame;
-
-	switch_mutex_lock(tech_pvt->flag_mutex);
-	switch_set_flag(tech_pvt, TFLAG_VOICE);
-	switch_mutex_unlock(tech_pvt->flag_mutex);
-
-	if (samples != 320) {
-		memset(tech_pvt->buffer2, 0, sizeof(tech_pvt->buffer2));
-		if (samples != 0) {
-			DEBUGA_GSMOPEN("samples=%d, goto cng\n", GSMOPEN_P_LOG, samples);
-		}
-		goto cng;
-	}
-
-	memset(digit_str, 0, sizeof(digit_str));
-	dtmf_rx(&tech_pvt->dtmf_state, (int16_t *) tech_pvt->read_frame.data, tech_pvt->read_frame.samples);
-	dtmf_rx_get(&tech_pvt->dtmf_state, digit_str, sizeof(digit_str));
-
-	gsmopen_sound_boost(tech_pvt->read_frame.data, tech_pvt->read_frame.samples, tech_pvt->capture_boost);
-
-	if (digit_str[0]) {
-		switch_time_t new_dtmf_timestamp = switch_time_now();
-		if ((new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp) > 350000) {	//FIXME: make it configurable
-			char *p = digit_str;
-
-			while (p && *p) {
-				switch_dtmf_t dtmf = { 0 };
-				dtmf.digit = *p;
-				dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION;
-				switch_channel_queue_dtmf(channel, &dtmf);
-				p++;
-			}
-			DEBUGA_GSMOPEN("DTMF DETECTED: [%s] new_dtmf_timestamp: %u, delta_t: %u\n", GSMOPEN_P_LOG, digit_str, (unsigned int) new_dtmf_timestamp,
-						   (unsigned int) (new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp));
-			tech_pvt->old_dtmf_timestamp = new_dtmf_timestamp;
-		}
-	}
-	while (switch_test_flag(tech_pvt, TFLAG_IO)) {
-		if (switch_test_flag(tech_pvt, TFLAG_BREAK)) {
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			switch_clear_flag(tech_pvt, TFLAG_BREAK);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-			DEBUGA_GSMOPEN("BREAK: CHANNEL READ FRAME goto CNG\n", GSMOPEN_P_LOG);
-			goto cng;
-		}
-
-		if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
-			DEBUGA_GSMOPEN("CHANNEL READ FRAME not IO\n", GSMOPEN_P_LOG);
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) {
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			switch_clear_flag(tech_pvt, TFLAG_VOICE);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-			if (!tech_pvt->read_frame.datalen) {
-				DEBUGA_GSMOPEN("CHANNEL READ CONTINUE\n", GSMOPEN_P_LOG);
-				continue;
-			}
-			*frame = &tech_pvt->read_frame;
-#ifdef BIGENDIAN
-			if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
-				switch_swap_linear((int16_t *) (*frame)->data, (int) (*frame)->datalen / 2);
-			}
-#endif
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		DEBUGA_GSMOPEN("CHANNEL READ no TFLAG_VOICE\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-
-	}
-
-	DEBUGA_GSMOPEN("CHANNEL READ FALSE\n", GSMOPEN_P_LOG);
-	return SWITCH_STATUS_FALSE;
-  cng:
-	data = (switch_byte_t *) tech_pvt->read_frame.data;
-	data[0] = 65;
-	data[1] = 0;
-	tech_pvt->read_frame.datalen = 2;
-	tech_pvt->read_frame.flags = SFF_CNG;
-	*frame = &tech_pvt->read_frame;
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	unsigned int sent;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	if (!switch_channel_ready(channel) || !switch_test_flag(tech_pvt, TFLAG_IO)) {
-		ERRORA("channel not ready \n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-		return SWITCH_STATUS_FALSE;
-	}
-#ifdef BIGENDIAN
-	if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
-#ifdef WIN32
-		switch_swap_linear((int16_t *) frame->data, (int) frame->datalen / 2);
-#else
-		switch_swap_linear(frame->data, (int) frame->datalen / 2);
-#endif //WIN32
-	}
-#endif
-
-	gsmopen_sound_boost(frame->data, frame->samples, tech_pvt->playback_boost);
-	if (!tech_pvt->no_sound) {
-		if (!tech_pvt->serialPort_serial_audio_opened) {
-			serial_audio_init(tech_pvt);
-		}
-		sent = tech_pvt->serialPort_serial_audio->Write((char *) frame->data, (int) (frame->datalen));
-
-		if (sent && sent != frame->datalen && sent != -1) {
-			DEBUGA_GSMOPEN("sent %u\n", GSMOPEN_P_LOG, sent);
-		}
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_answer_channel(switch_core_session_t *session)
-{
-	private_t *tech_pvt;
-	switch_channel_t *channel = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	switch_mutex_lock(tech_pvt->flag_mutex);
-	switch_set_flag(tech_pvt, TFLAG_IO);
-	switch_mutex_unlock(tech_pvt->flag_mutex);
-
-	gsmopen_serial_answer(tech_pvt);
-
-	switch_mutex_lock(globals.mutex);
-	globals.calls++;
-
-	switch_mutex_unlock(globals.mutex);
-	DEBUGA_GSMOPEN("%s CHANNEL ANSWER %s\n", GSMOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
-
-
-	if (channel) {
-		switch_channel_mark_answered(channel);
-	}
-
-	DEBUGA_GSMOPEN("ANSWERED! \n", GSMOPEN_P_LOG);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	switch (msg->message_id) {
-	case SWITCH_MESSAGE_INDICATE_ANSWER:
-		{
-			DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_MESSAGE_INDICATE_ANSWER\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-			if (tech_pvt->interface_state != GSMOPEN_STATE_UP && tech_pvt->phone_callflow != CALLFLOW_CALL_ACTIVE) {
-				DEBUGA_GSMOPEN("MSG_ID=%d, TO BE ANSWERED!\n", GSMOPEN_P_LOG, msg->message_id);
-				channel_answer_channel(session);
-			}
-		}
-		break;
-
-	case SWITCH_MESSAGE_INDICATE_PROGRESS:
-		{
-			DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_MESSAGE_INDICATE_PROGRESS\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-			if (tech_pvt->interface_state != GSMOPEN_STATE_UP && tech_pvt->phone_callflow != CALLFLOW_CALL_ACTIVE) {
-				DEBUGA_GSMOPEN("MSG_ID=%d, TO BE ANSWERED!\n", GSMOPEN_P_LOG, msg->message_id);
-				channel_answer_channel(session);
-			}
-		}
-		break;
-	case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC:
-
-		DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_MESSAGE_INDICATE_AUDIO_SYNC\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		switch_core_timer_sync(&tech_pvt->timer_read);
-		switch_core_timer_sync(&tech_pvt->timer_write);
-
-		break;
-
-	case SWITCH_MESSAGE_INDICATE_TRANSFER:
-		DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_MESSAGE_INDICATE_TRANSFER\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		break;
-	case SWITCH_MESSAGE_INDICATE_BRIDGE:
-		DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_MESSAGE_INDICATE_BRIDGE\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		break;
-	case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY:
-		DEBUGA_GSMOPEN("%s CHANNEL got SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		break;
-	default:
-		{
-			if (msg->message_id != SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC && msg->message_id != SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC_COMPLETE) {
-				DEBUGA_GSMOPEN("MSG_ID=%d\n", GSMOPEN_P_LOG, msg->message_id);
-			}
-		}
-		break;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_receive_event(switch_core_session_t *session, switch_event_t *event)
-{
-	struct private_object *tech_pvt = (struct private_object *) switch_core_session_get_private(session);
-	char *body = switch_event_get_body(event);
-	switch_assert(tech_pvt != NULL);
-
-	if (!body) {
-		body = (char *) "";
-	}
-
-	WARNINGA("event: |||%s|||\n", GSMOPEN_P_LOG, body);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_state_handler_table_t gsmopen_state_handlers = {
-	/*.on_init */ channel_on_init,
-	/*.on_routing */ channel_on_routing,
-	/*.on_execute */ channel_on_execute,
-	/*.on_hangup */ channel_on_hangup,
-	/*.on_exchange_media */ channel_on_exchange_media,
-	/*.on_soft_execute */ channel_on_soft_execute,
-	/*.on_consume_media */ channel_on_consume_media,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ NULL,
-	/*.on_destroy */ channel_on_destroy
-};
-
-switch_io_routines_t gsmopen_io_routines = {
-	/*.outgoing_channel */ channel_outgoing_channel,
-	/*.read_frame */ channel_read_frame,
-	/*.write_frame */ channel_write_frame,
-	/*.kill_channel */ channel_kill_channel,
-	/*.send_dtmf */ channel_send_dtmf,
-	/*.receive_message */ channel_receive_message,
-	/*.receive_event */ channel_receive_event
-};
-
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
-													switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-													switch_call_cause_t *cancel_cause)
-{
-	private_t *tech_pvt = NULL;
-	int result;
-
-	if ((*new_session = switch_core_session_request_uuid(gsmopen_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool, switch_event_get_header(var_event, "origination_uuid"))) != 0) {
-
-		switch_channel_t *channel = NULL;
-		switch_caller_profile_t *caller_profile;
-		char *rdest;
-		int found = 0;
-		char interface_name[256];
-
-		DEBUGA_GSMOPEN("1 SESSION_REQUEST %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(*new_session));
-		switch_core_session_add_stream(*new_session, NULL);
-
-		if (!zstr(outbound_profile->destination_number)) {
-			int i;
-			char *slash;
-
-			switch_copy_string(interface_name, outbound_profile->destination_number, 255);
-			slash = strrchr(interface_name, '/');
-			*slash = '\0';
-
-			switch_mutex_lock(globals.mutex);
-			if (strncmp("ANY", interface_name, strlen(interface_name)) == 0 || strncmp("RR", interface_name, strlen(interface_name)) == 0) {
-				/* we've been asked for the "ANY" interface, let's find the first idle interface */
-				/* Find the first idle interface using Round Robin */
-				DEBUGA_GSMOPEN("Finding one available gsmopen interface RR\n", GSMOPEN_P_LOG);
-				tech_pvt = find_available_gsmopen_interface_rr(NULL);
-				if (tech_pvt) {
-					found = 1;
-					DEBUGA_GSMOPEN("FOUND one available gsmopen interface RR\n", GSMOPEN_P_LOG);
-				}
-			}
-
-			for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-				/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-				if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, interface_name, strlen(interface_name)) == 0)) {
-					if (strlen(globals.GSMOPEN_INTERFACES[i].session_uuid_str)) {
-						DEBUGA_GSMOPEN
-							("globals.GSMOPEN_INTERFACES[%d].name=|||%s||| session_uuid_str=|||%s||| is BUSY\n",
-							 GSMOPEN_P_LOG, i, globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].session_uuid_str);
-						DEBUGA_GSMOPEN("1 SESSION_DESTROY %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(*new_session));
-						switch_core_session_destroy(new_session);
-						switch_mutex_unlock(globals.mutex);
-						return SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-					}
-
-					DEBUGA_GSMOPEN("globals.GSMOPEN_INTERFACES[%d].name=|||%s|||?\n", GSMOPEN_P_LOG, i, globals.GSMOPEN_INTERFACES[i].name);
-					tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-					found = 1;
-					break;
-				}
-
-			}
-
-		} else {
-			ERRORA("Doh! no destination number?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-
-		if (!found) {
-			DEBUGA_GSMOPEN("Doh! no available interface for |||%s|||?\n", GSMOPEN_P_LOG, interface_name);
-			DEBUGA_GSMOPEN("2 SESSION_DESTROY %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(*new_session));
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-		}
-
-		channel = switch_core_session_get_channel(*new_session);
-		if (!channel) {
-			ERRORA("Doh! no channel?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-		if (gsmopen_tech_init(tech_pvt, *new_session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Doh! no tech_init?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-
-		if (outbound_profile) {
-			char name[128];
-
-			snprintf(name, sizeof(name), "gsmopen/%s", outbound_profile->destination_number);
-			switch_channel_set_name(channel, name);
-			caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
-			switch_channel_set_caller_profile(channel, caller_profile);
-			tech_pvt->caller_profile = caller_profile;
-		} else {
-			ERRORA("Doh! no caller profile\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-
-		tech_pvt->ob_calls++;
-
-		rdest = strchr(caller_profile->destination_number, '/');
-		*rdest++ = '\0';
-
-
-		switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(*new_session), sizeof(tech_pvt->session_uuid_str));
-		caller_profile = tech_pvt->caller_profile;
-		caller_profile->destination_number = rdest;
-
-		switch_mutex_lock(tech_pvt->flag_mutex);
-		switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
-		switch_mutex_unlock(tech_pvt->flag_mutex);
-		switch_channel_set_state(channel, CS_INIT);
-		result=gsmopen_call(tech_pvt, rdest, 30);
-		switch_mutex_unlock(globals.mutex);
-		if(result != 0){
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-		return SWITCH_CAUSE_SUCCESS;
-	}
-
-	ERRORA("Doh! no new_session\n", GSMOPEN_P_LOG);
-	return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-}
-
-/*!
- * \brief This thread runs during a call, and monitor the interface for signaling, like hangup, caller id, etc most of signaling is handled inside the gsmopen_signaling_read function
- *
- */
-
-static switch_status_t load_config(int reload_type)
-{
-	const char *cf = "gsmopen.conf";
-	switch_xml_t cfg, xml, global_settings, param, interfaces, myinterface;
-	private_t *tech_pvt = NULL;
-
-#ifdef WIN32
-	DEBUGA_GSMOPEN("Windows CODEPAGE Input =%u\n", GSMOPEN_P_LOG, GetConsoleCP());
-	SetConsoleCP(65001);
-	DEBUGA_GSMOPEN("Windows CODEPAGE Input =%u\n", GSMOPEN_P_LOG, GetConsoleCP());
-	DEBUGA_GSMOPEN("Windows CODEPAGE Output =%u\n", GSMOPEN_P_LOG, GetConsoleOutputCP());
-	SetConsoleOutputCP(65001);
-	DEBUGA_GSMOPEN("Windows CODEPAGE Output =%u\n", GSMOPEN_P_LOG, GetConsoleOutputCP());
-	//let's hope to have unicode in console now. You need to use Lucida Console or, much better, Courier New font for the command prompt to show unicode
-#endif // WIN32
-	NOTICA("GSMOPEN Charset Output Test 0 %s\n", GSMOPEN_P_LOG, "èéòàù");
-	NOTICA("GSMOPEN Charset Output Test 1 %s\n", GSMOPEN_P_LOG, "ç°§^£");
-	NOTICA("GSMOPEN Charset Output Test 2 %s\n", GSMOPEN_P_LOG, "новости");
-	NOTICA("GSMOPEN Charset Output Test 3 %s\n", GSMOPEN_P_LOG, "ﺎﻠﺠﻤﻋﺓ");
-	NOTICA("GSMOPEN Charset Output Test 4 %s\n", GSMOPEN_P_LOG, "ראת");
-	NOTICA("GSMOPEN Charset Output Test 5 %s\n", GSMOPEN_P_LOG, "לק");
-	NOTICA("GSMOPEN Charset Output Test 6 %s\n", GSMOPEN_P_LOG, "人大");
-
-	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, gsmopen_module_pool);
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		ERRORA("open of %s failed\n", GSMOPEN_P_LOG, cf);
-		running = 0;
-		switch_xml_free(xml);
-		return SWITCH_STATUS_TERM;
-	}
-
-	switch_mutex_lock(globals.mutex);
-
-	set_global_dialplan("XML");
-	DEBUGA_GSMOPEN("Default globals.dialplan=%s\n", GSMOPEN_P_LOG, globals.dialplan);
-	set_global_destination("5000");
-	DEBUGA_GSMOPEN("Default globals.destination=%s\n", GSMOPEN_P_LOG, globals.destination);
-	set_global_context("default");
-	DEBUGA_GSMOPEN("Default globals.context=%s\n", GSMOPEN_P_LOG, globals.context);
-
-	if ((global_settings = switch_xml_child(cfg, "global_settings"))) {
-		for (param = switch_xml_child(global_settings, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!strcasecmp(var, "debug")) {
-				DEBUGA_GSMOPEN("globals.debug=%d\n", GSMOPEN_P_LOG, globals.debug);
-				globals.debug = atoi(val);
-				DEBUGA_GSMOPEN("globals.debug=%d\n", GSMOPEN_P_LOG, globals.debug);
-			} else if (!strcasecmp(var, "hold-music")) {
-				switch_set_string(globals.hold_music, val);
-				DEBUGA_GSMOPEN("globals.hold_music=%s\n", GSMOPEN_P_LOG, globals.hold_music);
-			} else if (!strcmp(var, "dialplan")) {
-				set_global_dialplan(val);
-				DEBUGA_GSMOPEN("globals.dialplan=%s\n", GSMOPEN_P_LOG, globals.dialplan);
-			} else if (!strcmp(var, "destination")) {
-				set_global_destination(val);
-				DEBUGA_GSMOPEN("globals.destination=%s\n", GSMOPEN_P_LOG, globals.destination);
-			} else if (!strcmp(var, "context")) {
-				set_global_context(val);
-				DEBUGA_GSMOPEN("globals.context=%s\n", GSMOPEN_P_LOG, globals.context);
-
-			}
-
-		}
-	}
-
-	if ((interfaces = switch_xml_child(cfg, "per_interface_settings"))) {
-		int i = 0;
-
-		for (myinterface = switch_xml_child(interfaces, "interface"); myinterface; myinterface = myinterface->next) {
-			char *id = (char *) switch_xml_attr(myinterface, "id");
-			char *name = (char *) switch_xml_attr(myinterface, "name");
-			const char *context = globals.context;
-			const char *dialplan = globals.dialplan;
-			const char *destination = globals.destination;
-			const char *controldevice_name = "/dev/ttyUSB3";
-			const char *controldevice_audio_name = "/dev/ttyUSB2";
-			char *digit_timeout = NULL;
-			char *max_digits = NULL;
-			char *hotline = NULL;
-			char *dial_regex = NULL;
-			char *hold_music = globals.hold_music;
-			char *fail_dial_regex = NULL;
-			const char *enable_callerid = "true";
-
-			const char *at_dial_pre_number = "ATD";
-			const char *at_dial_post_number = ";";
-			const char *at_dial_expect = "OK";
-			const char *at_hangup = "ATH";
-			const char *at_hangup_expect = "OK";
-			const char *at_answer = "ATA";
-			const char *at_answer_expect = "OK";
-			const char *at_send_dtmf = "AT^DTMF";
-			const char *at_preinit_1 = "";
-			const char *at_preinit_1_expect = "";
-			const char *at_preinit_2 = "";
-			const char *at_preinit_2_expect = "";
-			const char *at_preinit_3 = "";
-			const char *at_preinit_3_expect = "";
-			const char *at_preinit_4 = "";
-			const char *at_preinit_4_expect = "";
-			const char *at_preinit_5 = "";
-			const char *at_preinit_5_expect = "";
-			const char *at_postinit_1 = "at+cmic=0,9";
-			const char *at_postinit_1_expect = "OK";
-			const char *at_postinit_2 = "AT+CKPD=\"EEE\"";
-			const char *at_postinit_2_expect = "OK";
-			const char *at_postinit_3 = "AT+CSSN=1,0";
-			const char *at_postinit_3_expect = "OK";
-			const char *at_postinit_4 = "at+sidet=0";
-			const char *at_postinit_4_expect = "OK";
-			const char *at_postinit_5 = "at+clvl=3";
-			const char *at_postinit_5_expect = "OK";
-			const char *at_query_battchg = "AT+CBC";
-			const char *at_query_battchg_expect = "OK";
-			const char *at_query_signal = "AT+CSQ";
-			const char *at_query_signal_expect = "OK";
-			const char *at_call_idle = "+MCST: 1";
-			const char *at_call_incoming = "RING";
-			const char *at_call_active = "^CONN:1,0";
-			const char *at_call_failed = "+MCST: 65";
-			const char *at_call_calling = "^ORIG:1,0";
-			const char *at_indicator_noservice_string = "CIEV: 2;0";
-			const char *at_indicator_nosignal_string = "CIEV: 5;0";
-			const char *at_indicator_lowsignal_string = "CIEV: 5;1";
-			const char *at_indicator_lowbattchg_string = "CIEV: 0;1";
-			const char *at_indicator_nobattchg_string = "CIEV: 0;0";
-			const char *at_indicator_callactive_string = "CIEV: 3;1";
-			const char *at_indicator_nocallactive_string = "CIEV: 3;0";
-			const char *at_indicator_nocallsetup_string = "CIEV: 6;0";
-			const char *at_indicator_callsetupincoming_string = "CIEV: 6;1";
-			const char *at_indicator_callsetupoutgoing_string = "CIEV: 6;2";
-			const char *at_indicator_callsetupremoteringing_string = "CIEV: 6;3";
-			const char *at_early_audio = "0";
-			const char *at_after_preinit_pause = "500000";
-			const char *at_initial_pause = "500000";
-			const char *at_has_clcc = "0";
-			const char *at_has_ecam = "0";
-			const char *gsmopen_sound_rate = "8000";
-			const char *capture_boost = "0";
-			const char *playback_boost = "0";
-			const char *no_sound = "0";
-			const char *portaudiocindex = "1";
-			const char *portaudiopindex = "1";
-			const char *speexecho = "1";
-			const char *speexpreprocess = "1";
-			const char *ussd_request_encoding = "auto";
-			const char *ussd_response_encoding = "auto";
-
-			uint32_t interface_id = 0;
-			int controldevice_speed = 115200;	//FIXME TODO
-			//int controldevice_audio_speed = 115200;	//FIXME TODO
-			uint32_t controldevprotocol = PROTOCOL_AT;	//FIXME TODO
-			const char *gsmopen_serial_sync_period = "300";	//FIXME TODO
-			const char *imei = "";
-			const char *imsi = "";
-
-			tech_pvt = NULL;
-
-			for (param = switch_xml_child(myinterface, "param"); param; param = param->next) {
-				char *var = (char *) switch_xml_attr_soft(param, "name");
-				char *val = (char *) switch_xml_attr_soft(param, "value");
-
-				if (!strcasecmp(var, "id")) {
-					id = val;
-				} else if (!strcasecmp(var, "name")) {
-					name = val;
-				} else if (!strcasecmp(var, "context")) {
-					context = val;
-				} else if (!strcasecmp(var, "dialplan")) {
-					dialplan = val;
-				} else if (!strcasecmp(var, "destination")) {
-					destination = val;
-				} else if (!strcasecmp(var, "controldevice_name")) {
-					controldevice_name = val;
-				} else if (!strcasecmp(var, "controldevice_audio_name")) {
-					controldevice_audio_name = val;
-				} else if (!strcasecmp(var, "digit_timeout")) {
-					digit_timeout = val;
-				} else if (!strcasecmp(var, "max_digits")) {
-					max_digits = val;
-				} else if (!strcasecmp(var, "hotline")) {
-					hotline = val;
-				} else if (!strcasecmp(var, "dial_regex")) {
-					dial_regex = val;
-				} else if (!strcasecmp(var, SWITCH_HOLD_MUSIC_VARIABLE)) {
-					hold_music = val;
-				} else if (!strcasecmp(var, "fail_dial_regex")) {
-					fail_dial_regex = val;
-				} else if (!strcasecmp(var, "enable_callerid")) {
-					enable_callerid = val;
-				} else if (!strcasecmp(var, "at_dial_pre_number")) {
-					at_dial_pre_number = val;
-				} else if (!strcasecmp(var, "at_dial_post_number")) {
-					at_dial_post_number = val;
-				} else if (!strcasecmp(var, "at_dial_expect")) {
-					at_dial_expect = val;
-				} else if (!strcasecmp(var, "at_hangup")) {
-					at_hangup = val;
-				} else if (!strcasecmp(var, "at_hangup_expect")) {
-					at_hangup_expect = val;
-				} else if (!strcasecmp(var, "at_answer")) {
-					at_answer = val;
-				} else if (!strcasecmp(var, "at_answer_expect")) {
-					at_answer_expect = val;
-				} else if (!strcasecmp(var, "at_send_dtmf")) {
-					at_send_dtmf = val;
-				} else if (!strcasecmp(var, "at_preinit_1")) {
-					at_preinit_1 = val;
-				} else if (!strcasecmp(var, "at_preinit_1_expect")) {
-					at_preinit_1_expect = val;
-				} else if (!strcasecmp(var, "at_preinit_2")) {
-					at_preinit_2 = val;
-				} else if (!strcasecmp(var, "at_preinit_2_expect")) {
-					at_preinit_2_expect = val;
-				} else if (!strcasecmp(var, "at_preinit_3")) {
-					at_preinit_3 = val;
-				} else if (!strcasecmp(var, "at_preinit_3_expect")) {
-					at_preinit_3_expect = val;
-				} else if (!strcasecmp(var, "at_preinit_4")) {
-					at_preinit_4 = val;
-				} else if (!strcasecmp(var, "at_preinit_4_expect")) {
-					at_preinit_4_expect = val;
-				} else if (!strcasecmp(var, "at_preinit_5")) {
-					at_preinit_5 = val;
-				} else if (!strcasecmp(var, "at_preinit_5_expect")) {
-					at_preinit_5_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_1")) {
-					at_postinit_1 = val;
-				} else if (!strcasecmp(var, "at_postinit_1_expect")) {
-					at_postinit_1_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_2")) {
-					at_postinit_2 = val;
-				} else if (!strcasecmp(var, "at_postinit_2_expect")) {
-					at_postinit_2_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_3")) {
-					at_postinit_3 = val;
-				} else if (!strcasecmp(var, "at_postinit_3_expect")) {
-					at_postinit_3_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_4")) {
-					at_postinit_4 = val;
-				} else if (!strcasecmp(var, "at_postinit_4_expect")) {
-					at_postinit_4_expect = val;
-				} else if (!strcasecmp(var, "at_postinit_5")) {
-					at_postinit_5 = val;
-				} else if (!strcasecmp(var, "at_postinit_5_expect")) {
-					at_postinit_5_expect = val;
-				} else if (!strcasecmp(var, "at_query_battchg")) {
-					at_query_battchg = val;
-				} else if (!strcasecmp(var, "at_query_battchg_expect")) {
-					at_query_battchg_expect = val;
-				} else if (!strcasecmp(var, "at_query_signal")) {
-					at_query_signal = val;
-				} else if (!strcasecmp(var, "at_query_signal_expect")) {
-					at_query_signal_expect = val;
-				} else if (!strcasecmp(var, "at_call_idle")) {
-					at_call_idle = val;
-				} else if (!strcasecmp(var, "at_call_incoming")) {
-					at_call_incoming = val;
-				} else if (!strcasecmp(var, "at_call_active")) {
-					at_call_active = val;
-				} else if (!strcasecmp(var, "at_call_failed")) {
-					at_call_failed = val;
-				} else if (!strcasecmp(var, "at_call_calling")) {
-					at_call_calling = val;
-				} else if (!strcasecmp(var, "at_indicator_noservice_string")) {
-					at_indicator_noservice_string = val;
-				} else if (!strcasecmp(var, "at_indicator_nosignal_string")) {
-					at_indicator_nosignal_string = val;
-				} else if (!strcasecmp(var, "at_indicator_lowsignal_string")) {
-					at_indicator_lowsignal_string = val;
-				} else if (!strcasecmp(var, "at_indicator_lowbattchg_string")) {
-					at_indicator_lowbattchg_string = val;
-				} else if (!strcasecmp(var, "at_indicator_nobattchg_string")) {
-					at_indicator_nobattchg_string = val;
-				} else if (!strcasecmp(var, "at_indicator_callactive_string")) {
-					at_indicator_callactive_string = val;
-				} else if (!strcasecmp(var, "at_indicator_nocallactive_string")) {
-					at_indicator_nocallactive_string = val;
-				} else if (!strcasecmp(var, "at_indicator_nocallsetup_string")) {
-					at_indicator_nocallsetup_string = val;
-				} else if (!strcasecmp(var, "at_indicator_callsetupincoming_string")) {
-					at_indicator_callsetupincoming_string = val;
-				} else if (!strcasecmp(var, "at_indicator_callsetupoutgoing_string")) {
-					at_indicator_callsetupoutgoing_string = val;
-				} else if (!strcasecmp(var, "at_indicator_callsetupremoteringing_string")) {
-					at_indicator_callsetupremoteringing_string = val;
-				} else if (!strcasecmp(var, "portaudiocindex")) {
-					portaudiocindex = val;
-				} else if (!strcasecmp(var, "portaudiopindex")) {
-					portaudiopindex = val;
-				} else if (!strcasecmp(var, "speexecho")) {
-					speexecho = val;
-				} else if (!strcasecmp(var, "speexpreprocess")) {
-					speexpreprocess = val;
-				} else if (!strcasecmp(var, "at_early_audio")) {
-					at_early_audio = val;
-				} else if (!strcasecmp(var, "at_after_preinit_pause")) {
-					at_after_preinit_pause = val;
-				} else if (!strcasecmp(var, "at_initial_pause")) {
-					at_initial_pause = val;
-				} else if (!strcasecmp(var, "at_has_clcc")) {
-					at_has_clcc = val;
-				} else if (!strcasecmp(var, "at_has_ecam")) {
-					at_has_ecam = val;
-				} else if (!strcasecmp(var, "gsmopen_sound_rate")) {
-					gsmopen_sound_rate = val;
-				} else if (!strcasecmp(var, "capture_boost")) {
-					capture_boost = val;
-				} else if (!strcasecmp(var, "playback_boost")) {
-					playback_boost = val;
-				} else if (!strcasecmp(var, "no_sound")) {
-					no_sound = val;
-				} else if (!strcasecmp(var, "imsi")) {
-					imsi = val;
-				} else if (!strcasecmp(var, "imei")) {
-					imei = val;
-				} else if (!strcasecmp(var, "gsmopen_serial_sync_period")) {
-					gsmopen_serial_sync_period = val;
-				} else if (!strcasecmp(var, "ussd_request_encoding")) {
-					ussd_request_encoding = val;
-				} else if (!strcasecmp(var, "ussd_response_encoding")) {
-					ussd_response_encoding = val;
-				}
-
-			}
-
-			if (reload_type == SOFT_RELOAD) {
-				char the_interface[256];
-				sprintf(the_interface, "#%s", name);
-
-				if (interface_exists(the_interface) == SWITCH_STATUS_SUCCESS) {
-					continue;
-				}
-			}
-
-			if (!id) {
-				ERRORA("interface missing REQUIRED param 'id'\n", GSMOPEN_P_LOG);
-				continue;
-			}
-
-			if (switch_is_number(id)) {
-				interface_id = atoi(id);
-			} else {
-				ERRORA("interface param 'id' MUST be a number, now id='%s'\n", GSMOPEN_P_LOG, id);
-				continue;
-			}
-
-			if (!switch_is_number(at_early_audio)) {
-				ERRORA("interface param 'at_early_audio' MUST be a number, now at_early_audio='%s'\n", GSMOPEN_P_LOG, at_early_audio);
-				continue;
-			}
-			if (!switch_is_number(at_after_preinit_pause)) {
-				ERRORA("interface param 'at_after_preinit_pause' MUST be a number, now at_after_preinit_pause='%s'\n", GSMOPEN_P_LOG,
-					   at_after_preinit_pause);
-				continue;
-			}
-			if (!switch_is_number(at_initial_pause)) {
-				ERRORA("interface param 'at_initial_pause' MUST be a number, now at_initial_pause='%s'\n", GSMOPEN_P_LOG, at_initial_pause);
-				continue;
-			}
-			if (!switch_is_number(at_has_clcc)) {
-				ERRORA("interface param 'at_has_clcc' MUST be a number, now at_has_clcc='%s'\n", GSMOPEN_P_LOG, at_has_clcc);
-				continue;
-			}
-			if (!switch_is_number(at_has_ecam)) {
-				ERRORA("interface param 'at_has_ecam' MUST be a number, now at_has_ecam='%s'\n", GSMOPEN_P_LOG, at_has_ecam);
-				continue;
-			}
-			if (!switch_is_number(gsmopen_sound_rate)) {
-				ERRORA("interface param 'gsmopen_sound_rate' MUST be a number, now gsmopen_sound_rate='%s'\n", GSMOPEN_P_LOG, gsmopen_sound_rate);
-				continue;
-			}
-			if (!switch_is_number(capture_boost)) {
-				ERRORA("interface param 'capture_boost' MUST be a number, now capture_boost='%s'\n", GSMOPEN_P_LOG, capture_boost);
-				continue;
-			}
-			if (!switch_is_number(playback_boost)) {
-				ERRORA("interface param 'playback_boost' MUST be a number, now playback_boost='%s'\n", GSMOPEN_P_LOG, playback_boost);
-				continue;
-			}
-			if (!switch_is_number(no_sound)) {
-				ERRORA("interface param 'no_sound' MUST be a number, now no_sound='%s'\n", GSMOPEN_P_LOG, no_sound);
-				continue;
-			}
-			if (!switch_is_number(gsmopen_serial_sync_period)) {
-				ERRORA("interface param 'gsmopen_serial_sync_period' MUST be a number, now gsmopen_serial_sync_period='%s'\n", GSMOPEN_P_LOG,
-					   gsmopen_serial_sync_period);
-				continue;
-			}
-
-			if (interface_id && interface_id < GSMOPEN_MAX_INTERFACES) {
-				private_t newconf;
-				//int res = 0;
-
-				memset(&newconf, '\0', sizeof(newconf));
-				globals.GSMOPEN_INTERFACES[interface_id] = newconf;
-
-				switch_mutex_init(&globals.GSMOPEN_INTERFACES[interface_id].controldev_lock, SWITCH_MUTEX_NESTED, gsmopen_module_pool);
-				switch_mutex_init(&globals.GSMOPEN_INTERFACES[interface_id].controldev_audio_lock, SWITCH_MUTEX_NESTED, gsmopen_module_pool);
-
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].id, id);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].name, name);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].context, context);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].dialplan, dialplan);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].destination, destination);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].controldevice_name, controldevice_name);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].controldevice_audio_name, controldevice_audio_name);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].dial_regex, dial_regex);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].hold_music, hold_music);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].fail_dial_regex, fail_dial_regex);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_dial_pre_number, at_dial_pre_number);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_dial_post_number, at_dial_post_number);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_dial_expect, at_dial_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_hangup, at_hangup);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_hangup_expect, at_hangup_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_answer, at_answer);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_answer_expect, at_answer_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_send_dtmf, at_send_dtmf);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_1, at_preinit_1);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_1_expect, at_preinit_1_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_2, at_preinit_2);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_2_expect, at_preinit_2_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_3, at_preinit_3);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_3_expect, at_preinit_3_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_4, at_preinit_4);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_4_expect, at_preinit_4_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_5, at_preinit_5);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_preinit_5_expect, at_preinit_5_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_1, at_postinit_1);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_1_expect, at_postinit_1_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_2, at_postinit_2);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_2_expect, at_postinit_2_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_3, at_postinit_3);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_3_expect, at_postinit_3_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_4, at_postinit_4);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_4_expect, at_postinit_4_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_5, at_postinit_5);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_postinit_5_expect, at_postinit_5_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_query_battchg, at_query_battchg);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_query_battchg_expect, at_query_battchg_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_query_signal, at_query_signal);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_query_signal_expect, at_query_signal_expect);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_idle, at_call_idle);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_incoming, at_call_incoming);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_active, at_call_active);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_failed, at_call_failed);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_call_calling, at_call_calling);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_noservice_string, at_indicator_noservice_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_nosignal_string, at_indicator_nosignal_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_lowsignal_string, at_indicator_lowsignal_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_lowbattchg_string, at_indicator_lowbattchg_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_nobattchg_string, at_indicator_nobattchg_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callactive_string, at_indicator_callactive_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_nocallactive_string, at_indicator_nocallactive_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_nocallsetup_string, at_indicator_nocallsetup_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupincoming_string, at_indicator_callsetupincoming_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupoutgoing_string, at_indicator_callsetupoutgoing_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupremoteringing_string,
-								  at_indicator_callsetupremoteringing_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].imsi, imsi);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].imei, imei);
-				globals.GSMOPEN_INTERFACES[interface_id].at_early_audio = atoi(at_early_audio);
-				globals.GSMOPEN_INTERFACES[interface_id].at_after_preinit_pause = atoi(at_after_preinit_pause);
-				globals.GSMOPEN_INTERFACES[interface_id].at_initial_pause = atoi(at_initial_pause);
-				globals.GSMOPEN_INTERFACES[interface_id].at_has_clcc = atoi(at_has_clcc);
-				globals.GSMOPEN_INTERFACES[interface_id].at_has_ecam = atoi(at_has_ecam);
-				globals.GSMOPEN_INTERFACES[interface_id].capture_boost = atoi(capture_boost);
-				globals.GSMOPEN_INTERFACES[interface_id].playback_boost = atoi(playback_boost);
-				globals.GSMOPEN_INTERFACES[interface_id].no_sound = atoi(no_sound);
-				globals.GSMOPEN_INTERFACES[interface_id].gsmopen_serial_sync_period = atoi(gsmopen_serial_sync_period);
-
-				globals.GSMOPEN_INTERFACES[interface_id].ussd_request_encoding =
-					strcasecmp(ussd_request_encoding, "plain") == 0 ? USSD_ENCODING_PLAIN :
-					strcasecmp(ussd_request_encoding, "hex7") == 0 ? USSD_ENCODING_HEX_7BIT :
-					strcasecmp(ussd_request_encoding, "hex8") == 0 ? USSD_ENCODING_HEX_8BIT :
-					strcasecmp(ussd_request_encoding, "ucs2") == 0 ? USSD_ENCODING_UCS2 : USSD_ENCODING_AUTO;
-
-				globals.GSMOPEN_INTERFACES[interface_id].ussd_response_encoding =
-					strcasecmp(ussd_response_encoding, "plain") == 0 ? USSD_ENCODING_PLAIN :
-					strcasecmp(ussd_response_encoding, "hex7") == 0 ? USSD_ENCODING_HEX_7BIT :
-					strcasecmp(ussd_response_encoding, "hex8") == 0 ? USSD_ENCODING_HEX_8BIT :
-					strcasecmp(ussd_response_encoding, "ucs2") == 0 ? USSD_ENCODING_UCS2 : USSD_ENCODING_AUTO;
-
-				globals.GSMOPEN_INTERFACES[interface_id].controldevice_speed = controldevice_speed;	//FIXME
-				globals.GSMOPEN_INTERFACES[interface_id].controldevprotocol = controldevprotocol;	//FIXME
-				globals.GSMOPEN_INTERFACES[interface_id].running = 1;	//FIXME
-
-
-				gsmopen_store_boost((char *) capture_boost, &globals.GSMOPEN_INTERFACES[interface_id].capture_boost);	//FIXME
-				gsmopen_store_boost((char *) playback_boost, &globals.GSMOPEN_INTERFACES[interface_id].playback_boost);	//FIXME
-
-			} else {
-				ERRORA("interface id %u is higher than GSMOPEN_MAX_INTERFACES (%d)\n", GSMOPEN_P_LOG, interface_id, GSMOPEN_MAX_INTERFACES);
-				alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "interface id is higher than GSMOPEN_MAX_INTERFACES");
-				continue;
-			}
-
-		}
-
-#ifndef WIN32
-		find_ttyusb_devices(NULL, "/sys/devices");
-#endif// WIN32
-
-		for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-
-			switch_threadattr_t *gsmopen_api_thread_attr = NULL;
-			int res = 0;
-			int interface_id = i;
-
-			tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name) && !globals.GSMOPEN_INTERFACES[i].active) {
-
-				WARNINGA("STARTING interface_id=%u\n", GSMOPEN_P_LOG, interface_id);
-				DEBUGA_GSMOPEN("id=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].id);
-				DEBUGA_GSMOPEN("name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].name);
-				DEBUGA_GSMOPEN("hold-music=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].hold_music);
-				DEBUGA_GSMOPEN("context=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].context);
-				DEBUGA_GSMOPEN("dialplan=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].dialplan);
-				DEBUGA_GSMOPEN("destination=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].destination);
-				DEBUGA_GSMOPEN("imei=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].imei);
-				DEBUGA_GSMOPEN("imsi=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].imsi);
-				DEBUGA_GSMOPEN("controldevice_name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].controldevice_name);
-				DEBUGA_GSMOPEN("controldevice_audio_name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].controldevice_audio_name);
-				DEBUGA_GSMOPEN("gsmopen_serial_sync_period=%d\n", GSMOPEN_P_LOG,
-							   (int) globals.GSMOPEN_INTERFACES[interface_id].gsmopen_serial_sync_period);
-
-				/* init the serial port */
-				if (globals.GSMOPEN_INTERFACES[interface_id].controldevprotocol != PROTOCOL_NO_SERIAL) {
-					globals.GSMOPEN_INTERFACES[interface_id].controldevfd =
-						gsmopen_serial_init(&globals.GSMOPEN_INTERFACES[interface_id], globals.GSMOPEN_INTERFACES[interface_id].controldevice_speed);
-					if (globals.GSMOPEN_INTERFACES[interface_id].controldevfd == -1) {
-						ERRORA("STARTING interface_id=%u FAILED: gsmopen_serial_init failed\n", GSMOPEN_P_LOG, interface_id);
-						globals.GSMOPEN_INTERFACES[interface_id].running = 0;
-						alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_serial_init failed");
-						globals.GSMOPEN_INTERFACES[interface_id].active = 0;
-						globals.GSMOPEN_INTERFACES[interface_id].name[0] = '\0';
-						continue;
-					}
-				}
-
-				/* config the phone/modem on the serial port */
-				if (globals.GSMOPEN_INTERFACES[interface_id].controldevprotocol != PROTOCOL_NO_SERIAL) {
-					res = gsmopen_serial_config(&globals.GSMOPEN_INTERFACES[interface_id]);
-					if (res) {
-						int count = 0;
-						ERRORA("gsmopen_serial_config failed, let's try again\n", GSMOPEN_P_LOG);
-						while (res && count < 5) {
-							switch_sleep(100000);	//0.1 seconds
-							res = gsmopen_serial_config(&globals.GSMOPEN_INTERFACES[interface_id]);
-							count++;
-							if (res) {
-								ERRORA("%d: gsmopen_serial_config failed, let's try again\n", GSMOPEN_P_LOG, count);
-							}
-						}
-						if (res) {
-							ERRORA("STARTING interface_id=%u FAILED\n", GSMOPEN_P_LOG, interface_id);
-							globals.GSMOPEN_INTERFACES[interface_id].running = 0;
-							alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_serial_config failed");
-							globals.GSMOPEN_INTERFACES[interface_id].active = 0;
-							globals.GSMOPEN_INTERFACES[interface_id].name[0] = '\0';
-							continue;
-						}
-					}
-				}
-
-				if (globals.GSMOPEN_INTERFACES[interface_id].no_sound == 0) {
-					if (serial_audio_init(&globals.GSMOPEN_INTERFACES[interface_id])) {
-						ERRORA("serial_audio_init failed\n", GSMOPEN_P_LOG);
-						ERRORA("STARTING interface_id=%u FAILED\n", GSMOPEN_P_LOG, interface_id);
-						globals.GSMOPEN_INTERFACES[interface_id].running = 0;
-						alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "serial_audio_init failed");
-						globals.GSMOPEN_INTERFACES[interface_id].active = 0;
-						globals.GSMOPEN_INTERFACES[interface_id].name[0] = '\0';
-						continue;
-
-					}
-
-					if (serial_audio_shutdown(&globals.GSMOPEN_INTERFACES[interface_id])) {
-						ERRORA("serial_audio_shutdown failed\n", GSMOPEN_P_LOG);
-						ERRORA("STARTING interface_id=%u FAILED\n", GSMOPEN_P_LOG, interface_id);
-						globals.GSMOPEN_INTERFACES[interface_id].running = 0;
-						alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "serial_audio_shutdown failed");
-						globals.GSMOPEN_INTERFACES[interface_id].active = 0;
-						globals.GSMOPEN_INTERFACES[interface_id].name[0] = '\0';
-						continue;
-
-					}
-
-				}
-
-				globals.GSMOPEN_INTERFACES[interface_id].active = 1;
-
-				//gsmopen_store_boost((char *) capture_boost, &globals.GSMOPEN_INTERFACES[interface_id].capture_boost);	//FIXME
-				//gsmopen_store_boost((char *) playback_boost, &globals.GSMOPEN_INTERFACES[interface_id].playback_boost);	//FIXME
-
-				switch_sleep(100000);
-				switch_threadattr_create(&gsmopen_api_thread_attr, gsmopen_module_pool);
-				switch_threadattr_stacksize_set(gsmopen_api_thread_attr, SWITCH_THREAD_STACKSIZE);
-				switch_thread_create(&globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread, gsmopen_api_thread_attr, gsmopen_do_gsmopenapi_thread,
-									 &globals.GSMOPEN_INTERFACES[interface_id], gsmopen_module_pool);
-
-				switch_sleep(100000);
-				WARNINGA("STARTED interface_id=%u\n", GSMOPEN_P_LOG, interface_id);
-
-				/* How many real intterfaces */
-				globals.real_interfaces++;
-
-			}
-		}
-
-
-		for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)) {
-
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-
-				DEBUGA_GSMOPEN("id=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].id);
-				DEBUGA_GSMOPEN("name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].name);
-				DEBUGA_GSMOPEN("context=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].context);
-				DEBUGA_GSMOPEN("hold-music=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].hold_music);
-				DEBUGA_GSMOPEN("dialplan=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].dialplan);
-				DEBUGA_GSMOPEN("destination=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].destination);
-				DEBUGA_GSMOPEN("imei=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].imei);
-				DEBUGA_GSMOPEN("imsi=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].imsi);
-				DEBUGA_GSMOPEN("controldevice_name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].controldevice_name);
-				DEBUGA_GSMOPEN("gsmopen_serial_sync_period=%d\n", GSMOPEN_P_LOG, (int) globals.GSMOPEN_INTERFACES[i].gsmopen_serial_sync_period);
-				DEBUGA_GSMOPEN("controldevice_audio_name=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].controldevice_audio_name);
-			}
-		}
-	}
-
-	switch_mutex_unlock(globals.mutex);
-	switch_xml_free(xml);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t chat_send(switch_event_t *message_event)
-{
-	char *user = NULL, *host, *f_user = NULL, *f_host = NULL, *f_resource = NULL;
-	private_t *tech_pvt = NULL;
-	int i = 0, found = 0;
-
-	const char *proto;
-	const char *from;
-	const char *to;
-	const char *subject;
-	const char *body;
-	const char *hint;
-
-	proto = switch_event_get_header(message_event, "proto");
-	from = switch_event_get_header(message_event, "from");
-	to = switch_event_get_header(message_event, "to");
-	subject = switch_event_get_header(message_event, "subject");
-	body = switch_event_get_body(message_event);
-	hint = switch_event_get_header(message_event, "hint");
-
-	switch_assert(proto != NULL);
-
-	DEBUGA_GSMOPEN("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, hint=%s)\n", GSMOPEN_P_LOG, proto, from, to, subject, body,
-				   hint ? hint : "NULL");
-
-	if (!to || !strlen(to)) {
-		ERRORA("Missing To: header.\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if ((!from && !hint) || (!strlen(from) && !strlen(hint))) {
-		ERRORA("Missing From: AND Hint: headers.\n", GSMOPEN_P_LOG);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (from && (f_user = strdup(from))) {
-		if ((f_host = strchr(f_user, '@'))) {
-			*f_host++ = '\0';
-			if ((f_resource = strchr(f_host, '/'))) {
-				*f_resource++ = '\0';
-			}
-		}
-	}
-
-	if (hint == NULL || !strlen(hint)) {	//FIXME FIXME FIXME
-		hint = from;
-	}
-	if (subject == NULL || !strlen(subject)) {	//FIXME FIXME FIXME
-		subject = "SIMPLE MESSAGE";
-	}
-	if (to && (user = strdup(to))) {
-		if ((host = strchr(user, '@'))) {
-			*host++ = '\0';
-		}
-
-		DEBUGA_GSMOPEN("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, hint=%s)\n", GSMOPEN_P_LOG, proto, from, to, subject, body,
-					   hint ? hint : "NULL");
-		if (hint && strlen(hint)) {
-			//in hint we receive the interface name to use
-			for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-				if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, hint, strlen(hint)) == 0)) {
-					tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-					DEBUGA_GSMOPEN("Using interface: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", GSMOPEN_P_LOG, i,
-								   globals.GSMOPEN_INTERFACES[i].name);
-					found = 1;
-					break;
-				}
-			}
-		}
-		if (!found) {
-			ERRORA("ERROR: A GSMopen interface with name='%s' or one with SIM_number='%s' was not found\n", GSMOPEN_P_LOG, hint ? hint : "NULL",
-				   from ? from : "NULL");
-			goto end;
-		} else {
-			if (strcasecmp(to, "ussd") == 0) {
-				gsmopen_ussd(tech_pvt, (char *) body, 0);
-			} else {
-				gsmopen_sendsms(tech_pvt, (char *) to, (char *) body);
-			}
-
-		}
-	}
-  end:
-	switch_safe_free(user);
-	switch_safe_free(f_user);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t compat_chat_send(const char *proto, const char *from, const char *to,
-										const char *subject, const char *body, const char *type, const char *hint)
-{
-	switch_event_t *message_event;
-	switch_status_t status;
-
-	if (switch_event_create(&message_event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "proto", proto);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "from", from);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "to", to);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "subject", subject);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "type", type);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "hint", hint);
-
-		if (body) {
-			switch_event_add_body(message_event, "%s", body);
-		}
-	} else {
-		abort();
-	}
-
-	status = chat_send(message_event);
-	switch_event_destroy(&message_event);
-
-	return status;
-
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_gsmopen_load)
-{
-	switch_api_interface_t *commands_api_interface;
-	switch_chat_interface_t *chat_interface;
-
-	gsmopen_module_pool = pool;
-	memset(&globals, '\0', sizeof(globals));
-
-	running = 1;
-
-	if (load_config(FULL_RELOAD) != SWITCH_STATUS_SUCCESS) {
-		running = 0;
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_event_reserve_subclass(MY_EVENT_INCOMING_SMS) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	gsmopen_endpoint_interface = (switch_endpoint_interface_t *) switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-	gsmopen_endpoint_interface->interface_name = "gsmopen";
-	gsmopen_endpoint_interface->io_routines = &gsmopen_io_routines;
-	gsmopen_endpoint_interface->state_handler = &gsmopen_state_handlers;
-
-	if (running) {
-
-		SWITCH_ADD_API(commands_api_interface, "gsm", "gsm console AT_command", gsm_function, GSM_SYNTAX);
-		SWITCH_ADD_API(commands_api_interface, "gsmopen", "gsmopen interface AT_command", gsmopen_function, GSMOPEN_SYNTAX);
-		SWITCH_ADD_API(commands_api_interface, "gsmopen_boost_audio", "gsmopen_boost_audio interface AT_command", gsmopen_boost_audio_function,
-					   GSMOPEN_BOOST_AUDIO_SYNTAX);
-		SWITCH_ADD_API(commands_api_interface, "gsmopen_dump", "gsmopen_dump interface", gsmopen_dump_function, GSMOPEN_DUMP_SYNTAX);
-		SWITCH_ADD_API(commands_api_interface, "gsmopen_sendsms", "gsmopen_sendsms interface destination_number SMS_text", sendsms_function,
-					   SENDSMS_SYNTAX);
-		SWITCH_ADD_API(commands_api_interface, "gsmopen_ussd", "gsmopen_ussd interface ussd_code wait_seconds", gsmopen_ussd_function,
-					   SENDSMS_SYNTAX);
-		SWITCH_ADD_CHAT(chat_interface, GSMOPEN_CHAT_PROTO, chat_send);
-
-		switch_console_set_complete("add gsm list");
-		switch_console_set_complete("add gsm list full");
-		switch_console_set_complete("add gsm console ::gsm::list_interfaces");
-		switch_console_set_complete("add gsm remove ::gsm::list_interfaces");
-		switch_console_set_complete("add gsm reload");
-		switch_console_set_complete("add gsmopen ::gsm::list_interfaces");
-		switch_console_set_complete("add gsmopen_dump list");
-		switch_console_set_complete("add gsmopen_dump ::gsm::list_interfaces");
-		switch_console_set_complete("add gsmopen_ussd ::gsm::list_interfaces");
-		switch_console_set_complete("add gsmopen_sendsms ::gsm::list_interfaces");
-		switch_console_set_complete("add gsmopen_boost_audio ::gsm::list_interfaces");
-
-		switch_console_add_complete_func("::gsm::list_interfaces", list_interfaces);
-
-		/* indicate that the module should continue to be loaded */
-		return SWITCH_STATUS_SUCCESS;
-	} else
-		return SWITCH_STATUS_FALSE;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_gsmopen_shutdown)
-{
-	int x;
-	private_t *tech_pvt = NULL;
-	switch_status_t status;
-#ifdef WIN32
-	switch_size_t howmany = 8;
-#else
-	unsigned int howmany = 8;
-#endif
-	int interface_id;
-	int fd;
-
-	running = 0;
-
-	for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
-		tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-
-		if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
-			WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
-			globals.GSMOPEN_INTERFACES[interface_id].running = 0;
-			if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
-#ifdef WIN32
-				switch_file_write(tech_pvt->GSMopenHandles.fdesc[1], "sciutati", &howmany);	// let's the controldev_thread die
-#else /* WIN32 */
-				howmany = write(tech_pvt->GSMopenHandles.fdesc[1], "sciutati", howmany);
-#endif /* WIN32 */
-			}
-			x = 10;
-			while (x) {			//FIXME 0.5 seconds?
-				x--;
-				switch_yield(50000);
-			}
-			if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
-				switch_thread_join(&status, globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread);
-			}
-			if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread) {
-				switch_thread_join(&status, globals.GSMOPEN_INTERFACES[interface_id].gsmopen_api_thread);
-			}
-
-			x = 10;
-			while (x) {			//FIXME 0.5 seconds?
-				x--;
-				switch_yield(50000);
-			}
-			fd = tech_pvt->controldevfd;
-			if (fd) {
-				tech_pvt->controldevfd = -1;
-				DEBUGA_GSMOPEN("SHUTDOWN tech_pvt->controldevfd=%d\n", GSMOPEN_P_LOG, tech_pvt->controldevfd);
-			}
-
-			if (!globals.GSMOPEN_INTERFACES[interface_id].no_sound) {
-				serial_audio_shutdown(tech_pvt);
-			}
-
-			if (tech_pvt->serialPort_serial_control) {
-				int res;
-				res = tech_pvt->serialPort_serial_control->Close();
-				DEBUGA_GSMOPEN("serial_shutdown res=%d (controldevfd is %d)\n", GSMOPEN_P_LOG, res, tech_pvt->controldevfd);
-			}
-
-#ifndef WIN32
-			shutdown(tech_pvt->audiogsmopenpipe[0], 2);
-			close(tech_pvt->audiogsmopenpipe[0]);
-			shutdown(tech_pvt->audiogsmopenpipe[1], 2);
-			close(tech_pvt->audiogsmopenpipe[1]);
-			shutdown(tech_pvt->audiopipe[0], 2);
-			close(tech_pvt->audiopipe[0]);
-			shutdown(tech_pvt->audiopipe[1], 2);
-			close(tech_pvt->audiopipe[1]);
-			shutdown(tech_pvt->GSMopenHandles.fdesc[0], 2);
-			close(tech_pvt->GSMopenHandles.fdesc[0]);
-			shutdown(tech_pvt->GSMopenHandles.fdesc[1], 2);
-			close(tech_pvt->GSMopenHandles.fdesc[1]);
-#endif /* WIN32 */
-		}
-
-	}
-
-	switch_event_free_subclass(MY_EVENT_INCOMING_SMS);
-
-	switch_safe_free(globals.dialplan);
-	switch_safe_free(globals.context);
-	switch_safe_free(globals.destination);
-	switch_safe_free(globals.codec_string);
-	switch_safe_free(globals.codec_rates_string);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-void *SWITCH_THREAD_FUNC gsmopen_do_gsmopenapi_thread(switch_thread_t *thread, void *obj)
-{
-	return gsmopen_do_gsmopenapi_thread_func(obj);
-}
-
-int dtmf_received(private_t *tech_pvt, char *value)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	channel = switch_core_session_get_channel(session);
-
-	if (channel) {
-
-		if (!switch_channel_test_flag(channel, CF_BRIDGED)) {
-
-			switch_dtmf_t dtmf = { (char) value[0], switch_core_default_dtmf_duration(0) };
-			DEBUGA_GSMOPEN("received DTMF %c on channel %s\n", GSMOPEN_P_LOG, dtmf.digit, switch_channel_get_name(channel));
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			//FIXME: why sometimes DTMFs from here do not seems to be get by FS?
-			switch_channel_queue_dtmf(channel, &dtmf);
-			switch_set_flag(tech_pvt, TFLAG_DTMF);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-		} else {
-			DEBUGA_GSMOPEN
-				("received a DTMF on channel %s, but we're BRIDGED, so let's NOT relay it out of band\n", GSMOPEN_P_LOG, switch_channel_get_name(channel));
-		}
-	} else {
-		WARNINGA("received %c DTMF, but no channel?\n", GSMOPEN_P_LOG, value[0]);
-	}
-	switch_core_session_rwunlock(session);
-
-	return 0;
-}
-
-int new_inbound_channel(private_t *tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	switch_assert(tech_pvt != NULL);
-	tech_pvt->ib_calls++;
-	if ((session = switch_core_session_request(gsmopen_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) != 0) {
-		DEBUGA_GSMOPEN("2 SESSION_REQUEST %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(session));
-		switch_core_session_add_stream(session, NULL);
-		channel = switch_core_session_get_channel(session);
-		if (!channel) {
-			ERRORA("Doh! no channel?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(&session);
-			return 0;
-		}
-		if (gsmopen_tech_init(tech_pvt, session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Doh! no tech_init?\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(&session);
-			return 0;
-		}
-
-		if ((tech_pvt->caller_profile =
-			 switch_caller_profile_new(switch_core_session_get_pool(session), "gsmopen",
-									   tech_pvt->dialplan, tech_pvt->callid_name,
-									   tech_pvt->callid_number, NULL, NULL, NULL, NULL, "mod_gsmopen", tech_pvt->context, tech_pvt->destination)) != 0) {
-			char name[128];
-			switch_snprintf(name, sizeof(name), "gsmopen/%s", tech_pvt->name);
-			switch_channel_set_name(channel, name);
-			switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
-		}
-		switch_channel_set_state(channel, CS_INIT);
-		if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Error spawning thread\n", GSMOPEN_P_LOG);
-			switch_core_session_destroy(&session);
-			return 0;
-		}
-	}
-
-	DEBUGA_GSMOPEN("EXITING new_inbound_channel\n", GSMOPEN_P_LOG);
-
-	return 0;
-}
-
-int remote_party_is_ringing(private_t *tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	} else {
-		ERRORA("No session???\n", GSMOPEN_P_LOG);
-		goto done;
-	}
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-	} else {
-		ERRORA("No session???\n", GSMOPEN_P_LOG);
-		goto done;
-	}
-	if (channel) {
-		switch_channel_mark_ring_ready(channel);
-		DEBUGA_GSMOPEN("gsmopen_call: REMOTE PARTY RINGING\n", GSMOPEN_P_LOG);
-	} else {
-		ERRORA("No channel???\n", GSMOPEN_P_LOG);
-	}
-
-	switch_core_session_rwunlock(session);
-
-  done:
-	return 0;
-}
-
-int remote_party_is_early_media(private_t *tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	} else {
-		ERRORA("No session???\n\n\n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-		goto done;
-	}
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-		switch_core_session_add_stream(session, NULL);
-	} else {
-		ERRORA("No session???\n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-		goto done;
-	}
-	if (channel) {
-		switch_channel_mark_pre_answered(channel);
-		DEBUGA_GSMOPEN("gsmopen_call: REMOTE PARTY EARLY MEDIA\n", GSMOPEN_P_LOG);
-	} else {
-		ERRORA("No channel???\n", GSMOPEN_P_LOG);
-		//TODO: kill the bastard
-	}
-
-	switch_core_session_rwunlock(session);
-
-  done:
-	return 0;
-}
-
-int outbound_channel_answered(private_t *tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	} else {
-		ERRORA("No session???\n", GSMOPEN_P_LOG);
-		goto done;
-	}
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-	} else {
-		ERRORA("No channel???\n", GSMOPEN_P_LOG);
-		goto done;
-	}
-	if (channel) {
-		switch_channel_mark_answered(channel);
-		tech_pvt->phone_callflow = GSMOPEN_STATE_UP;
-		tech_pvt->interface_state = GSMOPEN_STATE_UP;
-	} else {
-		ERRORA("No channel???\n", GSMOPEN_P_LOG);
-	}
-
-	switch_core_session_rwunlock(session);
-
-  done:
-	DEBUGA_GSMOPEN("outbound_channel_answered!\n", GSMOPEN_P_LOG);
-
-	return 0;
-}
-
-private_t *find_available_gsmopen_interface_rr(private_t *tech_pvt_calling)
-{
-	private_t *tech_pvt = NULL;
-	int i;
-
-	switch_mutex_lock(globals.mutex);
-
-	/* Fact is the real interface start from 1 */
-	//XXX no, is just a convention, but you can have it start from 0. I do not, for aestetic reasons :-)
-
-	for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-		int interface_id;
-
-		interface_id = globals.next_interface;
-		globals.next_interface = interface_id + 1 < GSMOPEN_MAX_INTERFACES ? interface_id + 1 : 0;
-
-		if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
-			int gsmopen_state = 0;
-
-			tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
-			gsmopen_state = tech_pvt->interface_state;
-			DEBUGA_GSMOPEN("gsmopen interface: %d, name: %s, state: %d\n", GSMOPEN_P_LOG, interface_id, globals.GSMOPEN_INTERFACES[interface_id].name,
-						   gsmopen_state);
-			if ((tech_pvt_calling ? strcmp(tech_pvt->gsmopen_user, tech_pvt_calling->gsmopen_user) : 1)
-				&& (GSMOPEN_STATE_DOWN == gsmopen_state || 0 == gsmopen_state) && (tech_pvt->phone_callflow == CALLFLOW_STATUS_FINISHED
-																				   || 0 == tech_pvt->phone_callflow)) {
-				DEBUGA_GSMOPEN("returning as available gsmopen interface name: %s, state: %d callflow: %d\n", GSMOPEN_P_LOG, tech_pvt->name, gsmopen_state,
-							   tech_pvt->phone_callflow);
-				if (tech_pvt_calling == NULL) {
-					tech_pvt->interface_state = GSMOPEN_STATE_SELECTED;
-				}
-
-				switch_mutex_unlock(globals.mutex);
-				return tech_pvt;
-			}
-		}
-	}
-
-	switch_mutex_unlock(globals.mutex);
-	return NULL;
-}
-
-SWITCH_STANDARD_API(gsm_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-
-	if (globals.gsm_console)
-		stream->write_function(stream, "gsm console is: |||%s|||\n", globals.gsm_console->name);
-	else
-		stream->write_function(stream, "gsm console is NOT yet assigned\n");
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc || !argv[0]) {
-		stream->write_function(stream, "%s", GSM_SYNTAX);
-		goto end;
-	}
-
-	if (!strcasecmp(argv[0], "list")) {
-		int i;
-		unsigned int ib = 0;
-		unsigned int ib_failed = 0;
-		unsigned int ob = 0;
-		unsigned int ob_failed = 0;
-		char next_flag_char = ' ';
-
-		stream->write_function(stream, "F ID Name       Operator         IMEI            IB (F/T)  OB (F/T)  State   CallFlw         UUID\n");
-		stream->write_function(stream, "= == ========== ================ =============== ========= ========= ======= =============== ====\n");
-
-		for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)) {
-				next_flag_char = i == globals.next_interface ? '*' : ' ';
-				ib += globals.GSMOPEN_INTERFACES[i].ib_calls;
-				ib_failed += globals.GSMOPEN_INTERFACES[i].ib_failed_calls;
-				ob += globals.GSMOPEN_INTERFACES[i].ob_calls;
-				ob_failed += globals.GSMOPEN_INTERFACES[i].ob_failed_calls;
-
-
-				stream->write_function(stream,
-						"%c %-2d %-10s %-16.16s %-15s %4u/%-4u %4u/%-4u %-7s %-15s %s\n",
-						next_flag_char,
-						i, globals.GSMOPEN_INTERFACES[i].name,
-						globals.GSMOPEN_INTERFACES[i].operator_name,
-						globals.GSMOPEN_INTERFACES[i].imei,
-						globals.GSMOPEN_INTERFACES[i].ib_failed_calls,
-						globals.GSMOPEN_INTERFACES[i].ib_calls,
-						globals.GSMOPEN_INTERFACES[i].ob_failed_calls,
-						globals.GSMOPEN_INTERFACES[i].ob_calls,
-						interface_status[globals.GSMOPEN_INTERFACES[i].interface_state],
-						phone_callflow[globals.GSMOPEN_INTERFACES[i].phone_callflow], globals.GSMOPEN_INTERFACES[i].session_uuid_str);
-			} else if (argc > 1 && !strcasecmp(argv[1], "full")) {
-				stream->write_function(stream, "%c %d\n", next_flag_char, i);
-			}
-
-		}
-		stream->write_function(stream, "\nTotal Interfaces: %d  IB Calls(Failed/Total): %u/%u  OB Calls(Failed/Total): %u/%u\n",
-							   globals.real_interfaces > 0 ? globals.real_interfaces : 0, ib_failed, ib, ob_failed, ob);
-
-	} else if (!strcasecmp(argv[0], "console")) {
-		int i;
-		int found = 0;
-
-		if (argc == 2) {
-			for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-				/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-				if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[1], strlen(argv[1])) == 0)) {
-					globals.gsm_console = &globals.GSMOPEN_INTERFACES[i];
-					stream->write_function(stream, "gsm console is now: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", i,
-										   globals.GSMOPEN_INTERFACES[i].name);
-					stream->write_function(stream, "gsm console is: |||%s|||\n", globals.gsm_console->name);
-					found = 1;
-					break;
-				}
-
-			}
-			if (!found)
-				stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[1]);
-		} else {
-
-			stream->write_function(stream, "-ERR Usage: gsm console interface_name\n");
-			goto end;
-		}
-
-	} else if (!strcasecmp(argv[0], "ciapalino")) {
-
-	} else if (!strcasecmp(argv[0], "reload")) {
-		if (load_config(SOFT_RELOAD) != SWITCH_STATUS_SUCCESS) {
-			stream->write_function(stream, "gsm reload failed\n");
-		} else {
-			stream->write_function(stream, "gsm reload success\n");
-		}
-	} else if (!strcasecmp(argv[0], "remove")) {
-		if (argc == 2) {
-			if (remove_interface(argv[1]) == SWITCH_STATUS_SUCCESS) {
-				if (interface_exists(argv[1]) == SWITCH_STATUS_SUCCESS) {
-					stream->write_function(stream, "gsm remove '%s' failed\n", argv[1]);
-				} else {
-					stream->write_function(stream, "gsm remove '%s' success\n", argv[1]);
-				}
-			}
-		} else {
-			stream->write_function(stream, "-ERR Usage: gsm remove interface_name\n");
-			goto end;
-		}
-
-	} else {
-		if (globals.gsm_console)
-			gsmopen_serial_write_AT_noack(globals.gsm_console, (char *) cmd);
-		else
-			stream->write_function(stream, "gsm console is NOT yet assigned\n");
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(gsmopen_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_SYNTAX);
-		goto end;
-	}
-
-	if (argc < 2) {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_SYNTAX);
-		goto end;
-	}
-
-	if (argv[0]) {
-		int i;
-		int found = 0;
-
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				stream->write_function(stream, "Using interface: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", i, globals.GSMOPEN_INTERFACES[i].name);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
-			switch_safe_free(mycmd);
-
-			return SWITCH_STATUS_SUCCESS;
-		} else {
-			gsmopen_serial_write_AT_noack(tech_pvt, (char *) &cmd[strlen(argv[0]) + 1]);
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_SYNTAX);
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-SWITCH_STANDARD_API(gsmopen_dump_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-	char value[512];
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_DUMP_SYNTAX);
-		goto end;
-	}
-	if (argc == 1 && argv[0]) {
-		int found = 0;
-		int i = 0;
-
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found && (strcmp("list", argv[0]) == 0)) {
-			stream->write_function(stream, "gsmopen_dump LIST\n\n");
-			for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-				if (strlen(globals.GSMOPEN_INTERFACES[i].name)) {
-					stream->write_function(stream, "dumping interface '%s'\n\n", globals.GSMOPEN_INTERFACES[i].name);
-					tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-
-					stream->write_function(stream, "interface_name = %s\n", tech_pvt->name);
-					stream->write_function(stream, "interface_id = %s\n", tech_pvt->id);
-					snprintf(value, sizeof(value) - 1, "%d", tech_pvt->active);
-					stream->write_function(stream, "active = %s\n", value);
-					if (!tech_pvt->network_creg_not_supported) {
-						snprintf(value, sizeof(value) - 1, "%d", tech_pvt->not_registered);
-						stream->write_function(stream, "not_registered = %s\n", value);
-						snprintf(value, sizeof(value) - 1, "%d", tech_pvt->home_network_registered);
-						stream->write_function(stream, "home_network_registered = %s\n", value);
-						snprintf(value, sizeof(value) - 1, "%d", tech_pvt->roaming_registered);
-						stream->write_function(stream, "roaming_registered = %s\n", value);
-					} else {
-						stream->write_function(stream, "not_registered = %s\n", "N/A");
-						stream->write_function(stream, "home_network_registered = %s\n", "N/A");
-						stream->write_function(stream, "roaming_registered = %s\n", "N/A");
-					}
-					snprintf(value, sizeof(value) - 1, "%d", tech_pvt->got_signal);
-					stream->write_function(stream, "got_signal = %s\n", value);
-					snprintf(value, sizeof(value) - 1, "%d", tech_pvt->signal_strength);
-					stream->write_function(stream, "signal_strength = %s\n", value);
-					snprintf(value, sizeof(value) - 1, "%d", tech_pvt->running);
-					stream->write_function(stream, "running = %s\n", value);
-					stream->write_function(stream, "subscriber_number = %s\n", tech_pvt->subscriber_number);
-					stream->write_function(stream, "device_manufacturer = %s\n", tech_pvt->device_mfg);
-					stream->write_function(stream, "device_model = %s\n", tech_pvt->device_model);
-					stream->write_function(stream, "device_firmware = %s\n", tech_pvt->device_firmware);
-					stream->write_function(stream, "operator = %s\n", tech_pvt->operator_name);
-					stream->write_function(stream, "imei = %s\n", tech_pvt->imei);
-					stream->write_function(stream, "imsi = %s\n", tech_pvt->imsi);
-					snprintf(value, sizeof(value) - 1, "%d", tech_pvt->controldev_dead);
-					stream->write_function(stream, "controldev_dead = %s\n", value);
-					stream->write_function(stream, "controldevice_name = %s\n", tech_pvt->controldevice_name);
-					snprintf(value, sizeof(value) - 1, "%d", tech_pvt->no_sound);
-					stream->write_function(stream, "no_sound = %s\n", value);
-					snprintf(value, sizeof(value) - 1, "%f", tech_pvt->playback_boost);
-					stream->write_function(stream, "playback_boost = %s\n", value);
-					snprintf(value, sizeof(value) - 1, "%f", tech_pvt->capture_boost);
-					stream->write_function(stream, "capture_boost = %s\n", value);
-					stream->write_function(stream, "dialplan = %s\n", tech_pvt->dialplan);
-					stream->write_function(stream, "context = %s\n", tech_pvt->context);
-					stream->write_function(stream, "destination = %s\n", tech_pvt->destination);
-					snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ib_calls);
-					stream->write_function(stream, "ib_calls = %s\n", value);
-					snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ob_calls);
-					stream->write_function(stream, "ob_calls = %s\n", value);
-					snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ib_failed_calls);
-					stream->write_function(stream, "ib_failed_calls = %s\n", value);
-					snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ob_failed_calls);
-					stream->write_function(stream, "ob_failed_calls = %s\n", value);
-					snprintf(value, sizeof(value) - 1, "%d", tech_pvt->interface_state);
-					stream->write_function(stream, "interface_state = %s\n", value);
-					snprintf(value, sizeof(value) - 1, "%d", tech_pvt->phone_callflow);
-					stream->write_function(stream, "phone_callflow = %s\n", value);
-					stream->write_function(stream, "session_uuid_str = %s\n", tech_pvt->session_uuid_str);
-					stream->write_function(stream, "\n");
-
-					dump_event(tech_pvt);
-				}
-
-			}
-
-		} else if (found) {
-			stream->write_function(stream, "dumping interface '%s'\n\n", argv[0]);
-			tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-
-			stream->write_function(stream, "interface_name = %s\n", tech_pvt->name);
-			stream->write_function(stream, "interface_id = %s\n", tech_pvt->id);
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->active);
-			stream->write_function(stream, "active = %s\n", value);
-			if (!tech_pvt->network_creg_not_supported) {
-				snprintf(value, sizeof(value) - 1, "%d", tech_pvt->not_registered);
-				stream->write_function(stream, "not_registered = %s\n", value);
-				snprintf(value, sizeof(value) - 1, "%d", tech_pvt->home_network_registered);
-				stream->write_function(stream, "home_network_registered = %s\n", value);
-				snprintf(value, sizeof(value) - 1, "%d", tech_pvt->roaming_registered);
-				stream->write_function(stream, "roaming_registered = %s\n", value);
-			} else {
-				stream->write_function(stream, "not_registered = %s\n", "N/A");
-				stream->write_function(stream, "home_network_registered = %s\n", "N/A");
-				stream->write_function(stream, "roaming_registered = %s\n", "N/A");
-			}
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->got_signal);
-			stream->write_function(stream, "got_signal = %s\n", value);
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->signal_strength);
-			stream->write_function(stream, "signal_strength = %s\n", value);
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->running);
-			stream->write_function(stream, "running = %s\n", value);
-			stream->write_function(stream, "subscriber_number = %s\n", tech_pvt->subscriber_number);
-			stream->write_function(stream, "device_manufacturer = %s\n", tech_pvt->device_mfg);
-			stream->write_function(stream, "device_model = %s\n", tech_pvt->device_model);
-			stream->write_function(stream, "device_firmware = %s\n", tech_pvt->device_firmware);
-			stream->write_function(stream, "operator = %s\n", tech_pvt->operator_name);
-			stream->write_function(stream, "imei = %s\n", tech_pvt->imei);
-			stream->write_function(stream, "imsi = %s\n", tech_pvt->imsi);
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->controldev_dead);
-			stream->write_function(stream, "controldev_dead = %s\n", value);
-			stream->write_function(stream, "controldevice_name = %s\n", tech_pvt->controldevice_name);
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->no_sound);
-			stream->write_function(stream, "no_sound = %s\n", value);
-			snprintf(value, sizeof(value) - 1, "%f", tech_pvt->playback_boost);
-			stream->write_function(stream, "playback_boost = %s\n", value);
-			snprintf(value, sizeof(value) - 1, "%f", tech_pvt->capture_boost);
-			stream->write_function(stream, "capture_boost = %s\n", value);
-			stream->write_function(stream, "dialplan = %s\n", tech_pvt->dialplan);
-			stream->write_function(stream, "context = %s\n", tech_pvt->context);
-			stream->write_function(stream, "destination = %s\n", tech_pvt->destination);
-			snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ib_calls);
-			stream->write_function(stream, "ib_calls = %s\n", value);
-			snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ob_calls);
-			stream->write_function(stream, "ob_calls = %s\n", value);
-			snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ib_failed_calls);
-			stream->write_function(stream, "ib_failed_calls = %s\n", value);
-			snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ob_failed_calls);
-			stream->write_function(stream, "ob_failed_calls = %s\n", value);
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->interface_state);
-			stream->write_function(stream, "interface_state = %s\n", value);
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->phone_callflow);
-			stream->write_function(stream, "phone_callflow = %s\n", value);
-			stream->write_function(stream, "session_uuid_str = %s\n", tech_pvt->session_uuid_str);
-			stream->write_function(stream, "\n");
-
-			dump_event(tech_pvt);
-		} else {
-			stream->write_function(stream, "interface '%s' was not found\n", argv[0]);
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_DUMP_SYNTAX);
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(gsmopen_boost_audio_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if ((argc == 1 || argc == 3) && argv[0]) {
-		int i;
-		int found = 0;
-
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				stream->write_function(stream, "Using interface: globals.GSMOPEN_INTERFACES[%d].name=|||%s|||\n", i, globals.GSMOPEN_INTERFACES[i].name);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
-
-		} else {
-			if (argc == 1) {
-				stream->write_function(stream, "[%s] capture boost is %f\n", globals.GSMOPEN_INTERFACES[i].name,
-									   globals.GSMOPEN_INTERFACES[i].capture_boost);
-				stream->write_function(stream, "[%s] playback boost is %f\n", globals.GSMOPEN_INTERFACES[i].name,
-									   globals.GSMOPEN_INTERFACES[i].playback_boost);
-				stream->write_function(stream, "%s usage: %s", argv[0], GSMOPEN_BOOST_AUDIO_SYNTAX);
-				goto end;
-			} else if ((strncmp("play", argv[1], strlen(argv[1])) == 0)) {
-				if (switch_is_number(argv[2])) {
-					stream->write_function(stream, "[%s] playback boost was %f\n", globals.GSMOPEN_INTERFACES[i].name,
-										   globals.GSMOPEN_INTERFACES[i].playback_boost);
-					gsmopen_store_boost(argv[2], &globals.GSMOPEN_INTERFACES[i].playback_boost);	//FIXME
-					stream->write_function(stream, "[%s] playback boost is now %f\n", globals.GSMOPEN_INTERFACES[i].name,
-										   globals.GSMOPEN_INTERFACES[i].playback_boost);
-				}
-			} else if ((strncmp("capt", argv[1], strlen(argv[1])) == 0)) {
-				if (switch_is_number(argv[2])) {
-					stream->write_function(stream, "[%s] capture boost was %f\n", globals.GSMOPEN_INTERFACES[i].name,
-										   globals.GSMOPEN_INTERFACES[i].capture_boost);
-					gsmopen_store_boost(argv[2], &globals.GSMOPEN_INTERFACES[i].capture_boost);	//FIXME
-					stream->write_function(stream, "[%s] capture boost is now %f\n", globals.GSMOPEN_INTERFACES[i].name,
-										   globals.GSMOPEN_INTERFACES[i].capture_boost);
-				}
-			} else {
-				stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_BOOST_AUDIO_SYNTAX);
-			}
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_BOOST_AUDIO_SYNTAX);
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-void *gsmopen_do_gsmopenapi_thread_func(void *obj)
-{
-
-	private_t *tech_pvt = (private_t *) obj;
-	time_t now_timestamp;
-
-	while (running && tech_pvt && tech_pvt->running) {
-		int res;
-		res = gsmopen_serial_read(tech_pvt);
-		if (res == -1) {		//manage the graceful interface shutdown
-			tech_pvt->controldev_dead = 1;
-			close(tech_pvt->controldevfd);
-			ERRORA("gsmopen_serial_monitor failed, declaring %s dead\n", GSMOPEN_P_LOG, tech_pvt->controldevice_name);
-			tech_pvt->running = 0;
-			alarm_event(tech_pvt, ALARM_FAILED_INTERFACE, "gsmopen_serial_monitor failed, declaring interface dead");
-			tech_pvt->active = 0;
-			tech_pvt->name[0] = '\0';
-			switch_sleep(1000000);
-		} else if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL && tech_pvt->interface_state == GSMOPEN_STATE_RING
-				   && tech_pvt->phone_callflow != CALLFLOW_CALL_HANGUP_REQUESTED) {
-
-			gsmopen_ring(tech_pvt);
-
-		} else if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL && tech_pvt->interface_state == GSMOPEN_STATE_DIALING) {
-			DEBUGA_GSMOPEN("WE'RE DIALING, let's take the earlymedia\n", GSMOPEN_P_LOG);
-			tech_pvt->interface_state = CALLFLOW_STATUS_EARLYMEDIA;
-			remote_party_is_early_media(tech_pvt);
-
-		} else if (tech_pvt->interface_state == CALLFLOW_CALL_REMOTEANSWER) {
-			DEBUGA_GSMOPEN("REMOTE PARTY ANSWERED\n", GSMOPEN_P_LOG);
-			outbound_channel_answered(tech_pvt);
-		}
-		switch_sleep(100);		//give other threads a chance
-		time(&now_timestamp);
-
-		if ((now_timestamp - tech_pvt->gsmopen_serial_synced_timestamp) > tech_pvt->gsmopen_serial_sync_period) {	//TODO find a sensible period. 5min? in config?
-			gsmopen_serial_sync(tech_pvt);
-			gsmopen_serial_getstatus_AT(tech_pvt);
-		}
-	}
-	DEBUGA_GSMOPEN("EXIT\n", GSMOPEN_P_LOG);
-	return NULL;
-
-}
-
-SWITCH_STANDARD_API(sendsms_function)
-{
-	char *mycmd = NULL, *argv[3] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
-		goto end;
-	}
-
-	if (argc < 3) {
-		stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
-		goto end;
-	}
-
-	if (argv[0]) {
-		int i;
-		int found = 0;
-
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				stream->write_function(stream, "Trying to send your SMS: interface=%s, dest=%s, text=%s\n", argv[0], argv[1], argv[2]);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
-			switch_safe_free(mycmd);
-
-			return SWITCH_STATUS_SUCCESS;
-		} else {
-			NOTICA("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, type=NULL, hint=%s)\n", GSMOPEN_P_LOG, GSMOPEN_CHAT_PROTO, tech_pvt->name,
-				   argv[1], "SIMPLE MESSAGE", switch_str_nil(argv[2]), tech_pvt->name);
-
-			compat_chat_send(GSMOPEN_CHAT_PROTO, tech_pvt->name, argv[1], "SIMPLE MESSAGE", switch_str_nil(argv[2]), NULL, tech_pvt->name);
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", SENDSMS_SYNTAX);
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(gsmopen_ussd_function)
-{
-	char *mycmd = NULL, *argv[3] = { 0 };
-	int argc = 0;
-	int waittime = 20;
-	private_t *tech_pvt = NULL;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", USSD_SYNTAX);
-		goto end;
-	}
-
-	if (argc < 2) {
-		stream->write_function(stream, "ERROR, usage: %s", USSD_SYNTAX);
-		goto end;
-	}
-
-	if (argc >= 3 && strcasecmp(argv[2], "nowait")==0) {
-		waittime = 0;
-	}
-
-	if (argv[0]) {
-		int i;
-		int found = 0;
-
-		for (i = 0; !found && i < GSMOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.GSMOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.GSMOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.GSMOPEN_INTERFACES[i];
-				NOTICA("Trying to send USSD request: interface=%s, ussd=%s\n", GSMOPEN_P_LOG, argv[0], argv[1]);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
-			switch_safe_free(mycmd);
-
-			return SWITCH_STATUS_SUCCESS;
-		} else {
-			int err = gsmopen_ussd(tech_pvt, (char *) argv[1], waittime);
-			if (err == AT_ERROR) {
-				stream->write_function(stream, "ERROR: command failed\n");
-			} else if (!waittime) {
-				stream->write_function(stream, "USSD request has been sent\n");
-			} else if (err) {
-				stream->write_function(stream, "ERROR: USSD request timeout (%d)\n", err);
-			} else if (!tech_pvt->ussd_received) {
-				stream->write_function(stream, "ERROR: no response received\n");
-			} else {
-				stream->write_function(stream, "Status: %d%s\n", tech_pvt->ussd_status,
-				tech_pvt->ussd_status == 0 ? " - completed" :
-				tech_pvt->ussd_status == 1 ? " - action required" :
-				tech_pvt->ussd_status == 2 ? " - error" : "");
-				if (strlen(tech_pvt->ussd_message) != 0)
-					stream->write_function(stream, "Text: %s\n", tech_pvt->ussd_message);
-			}
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", USSD_SYNTAX);
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-int dump_event_full(private_t *tech_pvt, int is_alarm, int alarm_code, const char *alarm_message)
-{
-	switch_event_t *event;
-	char value[512];
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-	switch_status_t status;
-
-	if (!tech_pvt) {
-		return -1;
-	}
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-	}
-
-	if (is_alarm) {
-		ERRORA("ALARM on interface %s: \n", GSMOPEN_P_LOG, tech_pvt->name);
-		status = switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_ALARM);
-	} else {
-		DEBUGA_GSMOPEN("DUMP on interface %s: \n", GSMOPEN_P_LOG, tech_pvt->name);
-		status = switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_DUMP);
-	}
-	if (status == SWITCH_STATUS_SUCCESS) {
-		if (is_alarm) {
-			snprintf(value, sizeof(value) - 1, "%d", alarm_code);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm_code", value);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alarm_message", alarm_message);
-		}
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_name", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_id", tech_pvt->id);
-		snprintf(value, sizeof(value) - 1, "%d", tech_pvt->active);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "active", value);
-		if (!tech_pvt->network_creg_not_supported) {
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->not_registered);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "not_registered", value);
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->home_network_registered);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "home_network_registered", value);
-			snprintf(value, sizeof(value) - 1, "%d", tech_pvt->roaming_registered);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "roaming_registered", value);
-		} else {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "not_registered", "N/A");
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "home_network_registered", "N/A");
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "roaming_registered", "N/A");
-		}
-		snprintf(value, sizeof(value) - 1, "%d", tech_pvt->got_signal);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "got_signal", value);
-		snprintf(value, sizeof(value) - 1, "%d", tech_pvt->signal_strength);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "signal_strength", value);
-		snprintf(value, sizeof(value) - 1, "%d", tech_pvt->running);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "running", value);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subscriber_number", tech_pvt->subscriber_number);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "device_manufacturer", tech_pvt->device_mfg);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "device_model", tech_pvt->device_model);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "device_firmware", tech_pvt->device_firmware);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "operator", tech_pvt->operator_name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "imei", tech_pvt->imei);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "imsi", tech_pvt->imsi);
-		snprintf(value, sizeof(value) - 1, "%d", tech_pvt->controldev_dead);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldev_dead", value);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldevice_name", tech_pvt->controldevice_name);
-		snprintf(value, sizeof(value) - 1, "%d", tech_pvt->no_sound);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "no_sound", value);
-		snprintf(value, sizeof(value) - 1, "%f", tech_pvt->playback_boost);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "playback_boost", value);
-		snprintf(value, sizeof(value) - 1, "%f", tech_pvt->capture_boost);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "capture_boost", value);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialplan", tech_pvt->dialplan);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "context", tech_pvt->context);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "destination", tech_pvt->destination);
-		snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ib_calls);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "ib_calls", value);
-		snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ob_calls);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "ob_calls", value);
-		snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ib_failed_calls);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "ib_failed_calls", value);
-		snprintf(value, sizeof(value) - 1, "%lu", tech_pvt->ob_failed_calls);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "ob_failed_calls", value);
-		snprintf(value, sizeof(value) - 1, "%d", tech_pvt->interface_state);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_state", value);
-		snprintf(value, sizeof(value) - 1, "%d", tech_pvt->phone_callflow);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "phone_callflow", value);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "session_uuid_str", tech_pvt->session_uuid_str);
-		if (strlen(tech_pvt->session_uuid_str)) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "true");
-		} else {				//no session
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "false");
-		}
-		if (channel) {
-			switch_channel_event_set_data(channel, event);
-		}
-		switch_event_fire(&event);
-	} else {
-		ERRORA("cannot create event on interface %s. WHY?????\n", GSMOPEN_P_LOG, tech_pvt->name);
-	}
-
-	if (session) {
-		switch_core_session_rwunlock(session);
-	}
-	return 0;
-}
-
-int dump_event(private_t *tech_pvt)
-{
-	return dump_event_full(tech_pvt, 0, 0, NULL);
-}
-
-int alarm_event(private_t *tech_pvt, int alarm_code, const char *alarm_message)
-{
-	return dump_event_full(tech_pvt, 1, alarm_code, alarm_message);
-}
-
-int sms_incoming(private_t *tech_pvt)
-{
-	switch_event_t *event;
-
-	if (!tech_pvt) {
-		return -1;
-	}
-	NOTICA("received SMS on interface %s: DATE=%s, SENDER=%s, BODY=|%s|\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_date, tech_pvt->sms_sender,
-					tech_pvt->sms_body);
-	if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", GSMOPEN_CHAT_PROTO);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->sms_sender);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "date", tech_pvt->sms_date);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "userdataheader", tech_pvt->sms_userdataheader);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "datacodingscheme", tech_pvt->sms_datacodingscheme);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "servicecentreaddress", tech_pvt->sms_servicecentreaddress);
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "messagetype", "%d", tech_pvt->sms_messagetype);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_proto", GSMOPEN_CHAT_PROTO);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_user", tech_pvt->sms_sender);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_user", tech_pvt->name);
-		switch_event_add_body(event, "%s\n", tech_pvt->sms_body);
-		switch_core_chat_send("GLOBAL", event);	/* mod_sms */
-	} else {
-
-		ERRORA("cannot create event on interface %s. WHY?????\n", GSMOPEN_P_LOG, tech_pvt->name);
-	}
-
-	memset(tech_pvt->sms_message, '\0', sizeof(tech_pvt->sms_message));
-	memset(tech_pvt->sms_sender, '\0', sizeof(tech_pvt->sms_sender));
-	memset(tech_pvt->sms_date, '\0', sizeof(tech_pvt->sms_date));
-	memset(tech_pvt->sms_userdataheader, '\0', sizeof(tech_pvt->sms_userdataheader));
-	memset(tech_pvt->sms_body, '\0', sizeof(tech_pvt->sms_body));
-	memset(tech_pvt->sms_datacodingscheme, '\0', sizeof(tech_pvt->sms_datacodingscheme));
-	memset(tech_pvt->sms_servicecentreaddress, '\0', sizeof(tech_pvt->sms_servicecentreaddress));
-
-	return 0;
-}
-
-int ussd_incoming(private_t *tech_pvt)
-{
-	switch_event_t *event;
-
-	DEBUGA_GSMOPEN("received USSD on interface %s: TEXT=%s|\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->ussd_message);
-
-/* mod_sms begin */
-	if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", GSMOPEN_CHAT_PROTO);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", "ussd");
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "date", tech_pvt->sms_date);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "datacodingscheme", tech_pvt->ussd_dcs);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "servicecentreaddress", tech_pvt->sms_servicecentreaddress);
-		//switch_event_add_header(event, SWITCH_STACK_BOTTOM, "messagetype", "%d", tech_pvt->sms_messagetype);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "USSD MESSAGE");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_proto", GSMOPEN_CHAT_PROTO);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_user", "ussd");
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_host", "from_host");
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_full", "from_full");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_user", tech_pvt->name);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_host", "to_host");
-		switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ussd_status", "%d", tech_pvt->ussd_status);
-		switch_event_add_body(event, "%s\n", tech_pvt->ussd_message);
-		//switch_core_chat_send("GLOBAL", event); /* mod_sms */
-		switch_core_chat_send("GLOBAL", event);	/* mod_sms */
-	} else {
-
-		ERRORA("cannot create event on interface %s. WHY?????\n", GSMOPEN_P_LOG, tech_pvt->name);
-	}
-	/* mod_sms end */
-
-	return 0;
-}
-
-#ifndef WIN32
-#define PATH_MAX_GIOVA PATH_MAX
-static struct {
-char path_idvendor[PATH_MAX_GIOVA];
-char path_idproduct[PATH_MAX_GIOVA];
-char tty_base[PATH_MAX_GIOVA];
-char idvendor[PATH_MAX_GIOVA];
-char idproduct[PATH_MAX_GIOVA];
-char tty_data_dir[PATH_MAX_GIOVA];
-char tty_audio_dir[PATH_MAX_GIOVA];
-char data_dev_id[256];
-char audio_dev_id[256];
-char delimiter[256];
-char txt_saved[PATH_MAX_GIOVA];
-char tty_base_copied[PATH_MAX_GIOVA];
-char tty_data_device_file[PATH_MAX_GIOVA];
-char tty_data_device[256];
-char tty_audio_device_file[PATH_MAX_GIOVA];
-char tty_audio_device[256];
-char answer[AT_BUFSIZ];
-char imei[256];
-char imsi[256];
-} f;
-/*
-int times=0;
-int conta=0;
-*/
-void find_ttyusb_devices(private_t *tech_pvt, const char *dirname)
-{
-	DIR *dir;
-	struct dirent *entry;
-
-	memset( f.path_idvendor, 0, sizeof(f.path_idvendor) );
-	memset( f.path_idproduct, 0, sizeof(f.path_idproduct) );
-	memset( f.tty_base, 0, sizeof(f.tty_base) );
-	memset( f.idvendor, 0, sizeof(f.idvendor) );
-	memset( f.idproduct, 0, sizeof(f.idproduct) );
-	memset( f.tty_data_dir, 0, sizeof(f.tty_data_dir) );
-	memset( f.tty_audio_dir, 0, sizeof(f.tty_audio_dir) );
-	memset( f.data_dev_id, 0, sizeof(f.data_dev_id) );
-	memset( f.audio_dev_id, 0, sizeof(f.audio_dev_id) );
-	memset( f.delimiter, 0, sizeof(f.delimiter) );
-	memset( f.txt_saved, 0, sizeof(f.txt_saved) );
-	memset( f.tty_base_copied, 0, sizeof(f.tty_base_copied) );
-	memset( f.tty_data_device_file, 0, sizeof(f.tty_data_device_file) );
-	memset( f.tty_data_device, 0, sizeof(f.tty_data_device) );
-	memset( f.tty_audio_device_file, 0, sizeof(f.tty_audio_device_file) );
-	memset( f.tty_audio_device, 0, sizeof(f.tty_audio_device) );
-
-	if (!(dir = opendir(dirname))){
-		ERRORA("ERRORA! dirname=%s\n", GSMOPEN_P_LOG, dirname);
-		closedir(dir);
-		//conta--;
-		return;
-	}
-	if (!(entry = readdir(dir))){
-		ERRORA("ERRORA!\n", GSMOPEN_P_LOG);
-		closedir(dir);
-		//conta--;
-		return;
-	}
-
-	//conta++;
-	do {
-		if (entry->d_type == DT_DIR) {
-			char path[PATH_MAX_GIOVA];
-			int len;
-
-			//times++;
-			len = snprintf(path, sizeof(path)-1, "%s/%s", dirname, entry->d_name);
-			path[len] = 0;
-			if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
-				continue;
-			find_ttyusb_devices(tech_pvt, path);
-		} else{
-			int fd=-1;
-			int len2=-1;
-			DIR *dir2=NULL;
-			struct dirent *entry2=NULL;
-			int counter;
-			char *scratch=NULL;
-			char *txt=NULL;
-
-			if (strcmp(entry->d_name, "idVendor") == 0){
-				sprintf(f.tty_base, "%s", dirname);
-				sprintf(f.path_idvendor, "%s/%s", dirname, entry->d_name);
-				sprintf(f.path_idproduct, "%s/idProduct", dirname);
-
-				fd = open(f.path_idvendor, O_RDONLY);
-				len2=read(fd, f.idvendor, sizeof(f.idvendor));
-				close(fd);
-
-				if(f.idvendor[len2-1]=='\n'){
-					f.idvendor[len2-1]='\0';
-				}
-				if (strcmp(f.idvendor, "12d1") == 0){
-
-					fd = open(f.path_idproduct, O_RDONLY);
-					len2=read(fd, f.idproduct, sizeof(f.idproduct));
-					close(fd);
-
-					if(f.idproduct[len2-1]=='\n'){
-						f.idproduct[len2-1]='\0';
-					}
-					if (strcmp(f.idproduct, "1001") == 0  ||  strcmp(f.idproduct, "140c") == 0 ||  strcmp(f.idproduct, "1436") == 0 ||  strcmp(f.idproduct, "1506") == 0 ||  strcmp(f.idproduct, "14ac") == 0 ){
-						if (strcmp(f.idproduct, "1001") == 0){
-							strcpy(f.data_dev_id, "2");
-							strcpy(f.audio_dev_id, "1");
-						}else if (strcmp(f.idproduct, "140c") == 0){
-							strcpy(f.data_dev_id, "3");
-							strcpy(f.audio_dev_id, "2");
-						}else if (strcmp(f.idproduct, "1436") == 0){
-							strcpy(f.data_dev_id, "4");
-							strcpy(f.audio_dev_id, "3");
-						}else if (strcmp(f.idproduct, "1506") == 0){
-							strcpy(f.data_dev_id, "1");
-							strcpy(f.audio_dev_id, "2");
-						}else if (strcmp(f.idproduct, "14ac") == 0){
-							strcpy(f.data_dev_id, "4");
-							strcpy(f.audio_dev_id, "3");
-						}else{
-							//not possible
-						}
-						strcpy(f.delimiter, "/");
-						strcpy(f.tty_base_copied, f.tty_base);
-						counter=0;
-						while((txt = strtok_r(!counter ? f.tty_base_copied : NULL, f.delimiter, &scratch)))
-						{
-							strcpy(f.txt_saved, txt);
-							counter++;
-						}
-						sprintf(f.tty_data_dir, "%s/%s:1.%s", f.tty_base, f.txt_saved, f.data_dev_id);
-						sprintf(f.tty_audio_dir, "%s/%s:1.%s", f.tty_base, f.txt_saved, f.audio_dev_id);
-
-						if (!(dir2 = opendir(f.tty_data_dir))) {
-							ERRORA("ERRORA!\n", GSMOPEN_P_LOG);
-						}
-						if (!(entry2 = readdir(dir2))){
-							ERRORA("ERRORA!\n", GSMOPEN_P_LOG);
-						}
-						do {
-							if (strncmp(entry2->d_name, "ttyUSB", 6) == 0){
-								//char f.answer[AT_BUFSIZ];
-								ctb::SerialPort *serialPort_serial_control;
-								int res;
-								int read_count;
-								char at_command[256];
-
-								sprintf(f.tty_data_device_file, "%s/%s", f.tty_data_dir, entry2->d_name);
-								sprintf(f.tty_data_device, "/dev/%s", entry2->d_name);
-
-								memset(f.answer,0,sizeof(f.answer));
-								memset(f.imei,0,sizeof(f.imei));
-								memset(f.imsi,0,sizeof(f.imsi));
-
-								serialPort_serial_control = new ctb::SerialPort();
-								if (serialPort_serial_control->Open(f.tty_data_device, 115200, "8N1", ctb::SerialPort::NoFlowControl) >= 0) {
-									sprintf(at_command, "AT\r\n");
-									res = serialPort_serial_control->Write(at_command, 4);
-									usleep(20000); //0.02 seconds
-									res = serialPort_serial_control->Write(at_command, 4);
-									usleep(20000); //0.02 seconds
-									sprintf(at_command, "ATE1\r\n");
-									res = serialPort_serial_control->Write(at_command, 6);
-									usleep(20000); //0.02 seconds
-									read_count = serialPort_serial_control->Read(f.answer, AT_BUFSIZ);
-									sprintf(at_command, "AT\r\n");
-									res = serialPort_serial_control->Write(at_command, 4);
-									usleep(20000); //0.02 seconds
-									read_count = serialPort_serial_control->Read(f.answer, AT_BUFSIZ);
-									memset(f.answer,0,sizeof(f.answer));
-									read_count = serialPort_serial_control->Read(f.answer, AT_BUFSIZ);
-									memset(f.answer,0,sizeof(f.answer));
-
-									/* IMEI */
-									sprintf(at_command, "AT+GSN\r\n");
-									res = serialPort_serial_control->Write(at_command, 8);
-									if (res != 8) {
-										ERRORA("writing AT+GSN failed: %d\n", GSMOPEN_P_LOG, res);
-									}else {
-										usleep(200000); //0.2 seconds
-										read_count = serialPort_serial_control->Read(f.answer, AT_BUFSIZ);
-										if (read_count < 32) {
-											ERRORA("reading AT+GSN failed: |%s|, read_count=%d, probably harmless in 'gsm reload'\n", GSMOPEN_P_LOG, f.answer, read_count);
-										} else {
-											strncpy(f.imei, f.answer+9, 15);
-											sprintf(at_command, "AT\r\n");
-											res = serialPort_serial_control->Write(at_command, 4);
-											usleep(20000); //0.02 seconds
-											res = serialPort_serial_control->Write(at_command, 4);
-											usleep(20000); //0.02 seconds
-											sprintf(at_command, "ATE1\r\n");
-											res = serialPort_serial_control->Write(at_command, 6);
-											usleep(20000); //0.02 seconds
-											read_count = serialPort_serial_control->Read(f.answer, AT_BUFSIZ);
-											sprintf(at_command, "AT\r\n");
-											res = serialPort_serial_control->Write(at_command, 4);
-											usleep(20000); //0.02 seconds
-											read_count = serialPort_serial_control->Read(f.answer, AT_BUFSIZ);
-											memset(f.answer,0,sizeof(f.answer));
-											read_count = serialPort_serial_control->Read(f.answer, AT_BUFSIZ);
-											memset(f.answer,0,sizeof(f.answer));
-
-											/* IMSI */
-											sprintf(at_command, "AT+CIMI\r\n");
-											res = serialPort_serial_control->Write(at_command, 9);
-											if (res != 9) {
-												ERRORA("writing AT+CIMI failed: %d\n", GSMOPEN_P_LOG, res);
-											}else {
-												usleep(200000); //0.2 seconds
-												read_count = serialPort_serial_control->Read(f.answer, AT_BUFSIZ);
-												if (read_count < 33) {
-													ERRORA("reading AT+CIMI failed: |%s|, read_count=%d\n", GSMOPEN_P_LOG, f.answer, read_count);
-												} else {
-													strncpy(f.imsi, f.answer+10, 15);
-												}
-											}
-										}
-									}
-									res = serialPort_serial_control->Close();
-								} else {
-									ERRORA("port %s, NOT open\n", GSMOPEN_P_LOG, f.tty_data_device);
-								}
-							}
-						} while ((entry2 = readdir(dir2)));
-						closedir(dir2);
-
-						if (!(dir2 = opendir(f.tty_audio_dir))) {
-							ERRORA("ERRORA!\n", GSMOPEN_P_LOG);
-						}
-						if (!(entry2 = readdir(dir2))){
-							ERRORA("ERRORA!\n", GSMOPEN_P_LOG);
-						}
-						do {
-							if (strncmp(entry2->d_name, "ttyUSB", 6) == 0){
-								int i;
-								sprintf(f.tty_audio_device_file, "%s/%s", f.tty_audio_dir, entry2->d_name);
-								sprintf(f.tty_audio_device, "/dev/%s", entry2->d_name);
-
-								NOTICA("************************************************\n", GSMOPEN_P_LOG, f.imei);
-								NOTICA("f.imei=|%s|\n", GSMOPEN_P_LOG, f.imei);
-								NOTICA("f.imsi=|%s|\n", GSMOPEN_P_LOG, f.imsi);
-								NOTICA("f.tty_data_device = |%s|\n", GSMOPEN_P_LOG, f.tty_data_device);
-								NOTICA("f.tty_audio_device = |%s|\n", GSMOPEN_P_LOG, f.tty_audio_device);
-								NOTICA("************************************************\n", GSMOPEN_P_LOG, f.imei);
-
-								for (i = 0; i < GSMOPEN_MAX_INTERFACES; i++) {
-									switch_threadattr_t *gsmopen_api_thread_attr = NULL;
-									int res = 0;
-									int interface_id = i;
-
-									if (strlen(globals.GSMOPEN_INTERFACES[i].name) && (strlen(globals.GSMOPEN_INTERFACES[i].imsi) || strlen(globals.GSMOPEN_INTERFACES[i].imei)) ) {
-										//NOTICA("globals.GSMOPEN_INTERFACES[i].imei)=%s strlen(globals.GSMOPEN_INTERFACES[i].imei)=%d (strcmp(globals.GSMOPEN_INTERFACES[i].imei, f.imei) == 0)=%d \n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].imei, strlen(globals.GSMOPEN_INTERFACES[i].imei), (strcmp(globals.GSMOPEN_INTERFACES[i].imei, f.imei) == 0) );
-										if( ( strlen(globals.GSMOPEN_INTERFACES[i].imei) ? (strcmp(globals.GSMOPEN_INTERFACES[i].imei, f.imei) == 0) : 1)  ) {
-											if ( (strlen(globals.GSMOPEN_INTERFACES[i].imsi) ? (strcmp(globals.GSMOPEN_INTERFACES[i].imsi, f.imsi) == 0) : 1) ){
-												strcpy(globals.GSMOPEN_INTERFACES[i].controldevice_audio_name, f.tty_audio_device);
-												strcpy(globals.GSMOPEN_INTERFACES[i].controldevice_name, f.tty_data_device);
-												NOTICA("name = |%s|, controldevice_audio_name = |%s|, controldevice_name = |%s|\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].controldevice_audio_name, globals.GSMOPEN_INTERFACES[i].controldevice_name);
-												break;
-											}
-										}
-									}
-								}
-							}
-						} while ((entry2 = readdir(dir2)));
-						closedir(dir2);
-					}
-				}
-			}
-		}
-	} while ((entry = readdir(dir)));
-	closedir(dir);
-/*
-	if(f.conta < 0){
-		ERRORA("f.conta=%d, dirs=%d, mem=%d\n", GSMOPEN_P_LOG, conta, times, conta*PATH_MAX_GIOVA);
-	}else{
-		NOTICA("f.conta=%d, dirs=%d, mem=%d\n", GSMOPEN_P_LOG, conta, times, conta*PATH_MAX_GIOVA);
-	}
-	conta--;
-*/
-}
-#endif// WIN32
-
-
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet expandtab:
- */
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv.c b/src/mod/endpoints/mod_gsmopen/win_iconv.c
deleted file mode 100644
index e60f714889..0000000000
--- a/src/mod/endpoints/mod_gsmopen/win_iconv.c
+++ /dev/null
@@ -1,1986 +0,0 @@
-/*
- * iconv library using Win32 API to conversion.
- *
- * This file is placed in the public domain.
- *
- * Last Change: 2009-07-06
- *
- * ENVIRONMENT VARIABLE:
- *     WINICONV_LIBICONV_DLL
- *         If $WINICONV_LIBICONV_DLL is set, win_iconv uses the DLL.  If
- *         loading the DLL or iconv_open() failed, falls back to internal
- *         conversion.  If a few DLL are specified as comma separated list,
- *         the first loadable DLL is used.  The DLL should have iconv_open(),
- *         iconv_close() and iconv().  Or libiconv_open(), libiconv_close()
- *         and libiconv().
- *         (only available when USE_LIBICONV_DLL is defined at compile time)
- *
- * Win32 API does not support strict encoding conversion for some
- * codepage.  And MLang function drop or replace invalid bytes and does
- * not return useful error status as iconv.  This implementation cannot
- * be used for encoding validation purpose.
- */
-
-/* for WC_NO_BEST_FIT_CHARS */
-#ifndef WINVER
-# define WINVER 0x0500
-#endif
-
-#include <windows.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#if 0
-# define MAKE_EXE
-# define MAKE_DLL
-# define USE_LIBICONV_DLL
-#endif
-
-#if !defined(DEFAULT_LIBICONV_DLL)
-# define DEFAULT_LIBICONV_DLL ""
-#endif
-
-#define MB_CHAR_MAX 16
-
-#define UNICODE_MODE_BOM_DONE   1
-#define UNICODE_MODE_SWAPPED    2
-
-#define FLAG_USE_BOM            1
-#define FLAG_TRANSLIT           2 /* //TRANSLIT */
-#define FLAG_IGNORE             4 /* //IGNORE (not implemented) */
-
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned int uint;
-
-typedef void* iconv_t;
-
-iconv_t iconv_open(const char *tocode, const char *fromcode);
-int iconv_close(iconv_t cd);
-size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-
-/* libiconv interface for vim */
-#if defined(MAKE_DLL)
-int
-iconvctl (iconv_t cd, int request, void* argument)
-{
-    /* not supported */
-    return 0;
-}
-#endif
-
-typedef struct compat_t compat_t;
-typedef struct csconv_t csconv_t;
-typedef struct rec_iconv_t rec_iconv_t;
-
-typedef iconv_t (*f_iconv_open)(const char *tocode, const char *fromcode);
-typedef int (*f_iconv_close)(iconv_t cd);
-typedef size_t (*f_iconv)(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-typedef int* (*f_errno)(void);
-typedef int (*f_mbtowc)(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-typedef int (*f_wctomb)(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-typedef int (*f_mblen)(csconv_t *cv, const uchar *buf, int bufsize);
-typedef int (*f_flush)(csconv_t *cv, uchar *buf, int bufsize);
-
-#define COMPAT_IN   1
-#define COMPAT_OUT  2
-
-/* unicode mapping for compatibility with other conversion table. */
-struct compat_t {
-    uint in;
-    uint out;
-    uint flag;
-};
-
-struct csconv_t {
-    int codepage;
-    int flags;
-    f_mbtowc mbtowc;
-    f_wctomb wctomb;
-    f_mblen mblen;
-    f_flush flush;
-    DWORD mode;
-    compat_t *compat;
-};
-
-struct rec_iconv_t {
-    iconv_t cd;
-    f_iconv_close iconv_close;
-    f_iconv iconv;
-    f_errno _errno;
-    csconv_t from;
-    csconv_t to;
-#if defined(USE_LIBICONV_DLL)
-    HMODULE hlibiconv;
-#endif
-};
-
-static int win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
-static int win_iconv_close(iconv_t cd);
-static size_t win_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-
-static int load_mlang();
-static int make_csconv(const char *name, csconv_t *cv);
-static int name_to_codepage(const char *name);
-static uint utf16_to_ucs4(const ushort *wbuf);
-static void ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize);
-static int mbtowc_flags(int codepage);
-static int must_use_null_useddefaultchar(int codepage);
-static char *strrstr(const char *str, const char *token);
-static char *xstrndup(const char *s, size_t n);
-static int seterror(int err);
-
-#if defined(USE_LIBICONV_DLL)
-static int libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
-static PVOID MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size);
-static HMODULE find_imported_module_by_funcname(HMODULE hModule, const char *funcname);
-
-static HMODULE hwiniconv;
-#endif
-
-static int sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-
-static int kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize);
-
-static struct {
-    int codepage;
-    const char *name;
-} codepage_alias[] = {
-    {65001, "CP65001"},
-    {65001, "UTF8"},
-    {65001, "UTF-8"},
-
-    {1200, "CP1200"},
-    {1200, "UTF16LE"},
-    {1200, "UTF-16LE"},
-    {1200, "UCS-2LE"},
-
-    {1201, "CP1201"},
-    {1201, "UTF16BE"},
-    {1201, "UTF-16BE"},
-    {1201, "UCS-2BE"},
-    {1201, "unicodeFFFE"},
-
-    {12000, "CP12000"},
-    {12000, "UTF32LE"},
-    {12000, "UTF-32LE"},
-
-    {12001, "CP12001"},
-    {12001, "UTF32BE"},
-    {12001, "UTF-32BE"},
-
-#ifndef GLIB_COMPILATION
-    /*
-     * Default is big endian.
-     * See rfc2781 4.3 Interpreting text labelled as UTF-16.
-     */
-    {1201, "UTF16"},
-    {1201, "UTF-16"},
-    {12001, "UTF32"},
-    {12001, "UTF-32"},
-#else
-    /* Default is little endian, because the platform is */
-    {1200, "UTF16"},
-    {1200, "UTF-16"},
-    {1200, "UCS-2"},
-    {12000, "UTF32"},
-    {12000, "UTF-32"},
-#endif
-
-    /* copy from libiconv `iconv -l` */
-    /* !IsValidCodePage(367) */
-    {20127, "ANSI_X3.4-1968"},
-    {20127, "ANSI_X3.4-1986"},
-    {20127, "ASCII"},
-    {20127, "CP367"},
-    {20127, "IBM367"},
-    {20127, "ISO-IR-6"},
-    {20127, "ISO646-US"},
-    {20127, "ISO_646.IRV:1991"},
-    {20127, "US"},
-    {20127, "US-ASCII"},
-    {20127, "CSASCII"},
-
-    /* !IsValidCodePage(819) */
-    {1252, "CP819"},
-    {1252, "IBM819"},
-    {28591, "ISO-8859-1"},
-    {28591, "ISO-IR-100"},
-    {28591, "ISO8859-1"},
-    {28591, "ISO_8859-1"},
-    {28591, "ISO_8859-1:1987"},
-    {28591, "L1"},
-    {28591, "LATIN1"},
-    {28591, "CSISOLATIN1"},
-
-    {1250, "CP1250"},
-    {1250, "MS-EE"},
-    {1250, "WINDOWS-1250"},
-
-    {1251, "CP1251"},
-    {1251, "MS-CYRL"},
-    {1251, "WINDOWS-1251"},
-
-    {1252, "CP1252"},
-    {1252, "MS-ANSI"},
-    {1252, "WINDOWS-1252"},
-
-    {1253, "CP1253"},
-    {1253, "MS-GREEK"},
-    {1253, "WINDOWS-1253"},
-
-    {1254, "CP1254"},
-    {1254, "MS-TURK"},
-    {1254, "WINDOWS-1254"},
-
-    {1255, "CP1255"},
-    {1255, "MS-HEBR"},
-    {1255, "WINDOWS-1255"},
-
-    {1256, "CP1256"},
-    {1256, "MS-ARAB"},
-    {1256, "WINDOWS-1256"},
-
-    {1257, "CP1257"},
-    {1257, "WINBALTRIM"},
-    {1257, "WINDOWS-1257"},
-
-    {1258, "CP1258"},
-    {1258, "WINDOWS-1258"},
-
-    {850, "850"},
-    {850, "CP850"},
-    {850, "IBM850"},
-    {850, "CSPC850MULTILINGUAL"},
-
-    /* !IsValidCodePage(862) */
-    {862, "862"},
-    {862, "CP862"},
-    {862, "IBM862"},
-    {862, "CSPC862LATINHEBREW"},
-
-    {866, "866"},
-    {866, "CP866"},
-    {866, "IBM866"},
-    {866, "CSIBM866"},
-
-    /* !IsValidCodePage(154) */
-    {154, "CP154"},
-    {154, "CYRILLIC-ASIAN"},
-    {154, "PT154"},
-    {154, "PTCP154"},
-    {154, "CSPTCP154"},
-
-    /* !IsValidCodePage(1133) */
-    {1133, "CP1133"},
-    {1133, "IBM-CP1133"},
-
-    {874, "CP874"},
-    {874, "WINDOWS-874"},
-
-    /* !IsValidCodePage(51932) */
-    {51932, "CP51932"},
-    {51932, "MS51932"},
-    {51932, "WINDOWS-51932"},
-    {51932, "EUC-JP"},
-
-    {932, "CP932"},
-    {932, "MS932"},
-    {932, "SHIFFT_JIS"},
-    {932, "SHIFFT_JIS-MS"},
-    {932, "SJIS"},
-    {932, "SJIS-MS"},
-    {932, "SJIS-OPEN"},
-    {932, "SJIS-WIN"},
-    {932, "WINDOWS-31J"},
-    {932, "WINDOWS-932"},
-    {932, "CSWINDOWS31J"},
-
-    {50221, "CP50221"},
-    {50221, "ISO-2022-JP"},
-    {50221, "ISO-2022-JP-MS"},
-    {50221, "ISO2022-JP"},
-    {50221, "ISO2022-JP-MS"},
-    {50221, "MS50221"},
-    {50221, "WINDOWS-50221"},
-
-    {936, "CP936"},
-    {936, "GBK"},
-    {936, "MS936"},
-    {936, "WINDOWS-936"},
-
-    {950, "CP950"},
-    {950, "BIG5"},
-
-    {949, "CP949"},
-    {949, "UHC"},
-    {949, "EUC-KR"},
-
-    {1361, "CP1361"},
-    {1361, "JOHAB"},
-
-    {437, "437"},
-    {437, "CP437"},
-    {437, "IBM437"},
-    {437, "CSPC8CODEPAGE437"},
-
-    {737, "CP737"},
-
-    {775, "CP775"},
-    {775, "IBM775"},
-    {775, "CSPC775BALTIC"},
-
-    {852, "852"},
-    {852, "CP852"},
-    {852, "IBM852"},
-    {852, "CSPCP852"},
-
-    /* !IsValidCodePage(853) */
-    {853, "CP853"},
-
-    {855, "855"},
-    {855, "CP855"},
-    {855, "IBM855"},
-    {855, "CSIBM855"},
-
-    {857, "857"},
-    {857, "CP857"},
-    {857, "IBM857"},
-    {857, "CSIBM857"},
-
-    /* !IsValidCodePage(858) */
-    {858, "CP858"},
-
-    {860, "860"},
-    {860, "CP860"},
-    {860, "IBM860"},
-    {860, "CSIBM860"},
-
-    {861, "861"},
-    {861, "CP-IS"},
-    {861, "CP861"},
-    {861, "IBM861"},
-    {861, "CSIBM861"},
-
-    {863, "863"},
-    {863, "CP863"},
-    {863, "IBM863"},
-    {863, "CSIBM863"},
-
-    {864, "CP864"},
-    {864, "IBM864"},
-    {864, "CSIBM864"},
-
-    {865, "865"},
-    {865, "CP865"},
-    {865, "IBM865"},
-    {865, "CSIBM865"},
-
-    {869, "869"},
-    {869, "CP-GR"},
-    {869, "CP869"},
-    {869, "IBM869"},
-    {869, "CSIBM869"},
-
-    /* !IsValidCodePage(1152) */
-    {1125, "CP1125"},
-
-    /*
-     * Code Page Identifiers
-     * http://msdn2.microsoft.com/en-us/library/ms776446.aspx
-     */
-    {37, "IBM037"}, /* IBM EBCDIC US-Canada */
-    {437, "IBM437"}, /* OEM United States */
-    {500, "IBM500"}, /* IBM EBCDIC International */
-    {708, "ASMO-708"}, /* Arabic (ASMO 708) */
-    /* 709 		Arabic (ASMO-449+, BCON V4) */
-    /* 710 		Arabic - Transparent Arabic */
-    {720, "DOS-720"}, /* Arabic (Transparent ASMO); Arabic (DOS) */
-    {737, "ibm737"}, /* OEM Greek (formerly 437G); Greek (DOS) */
-    {775, "ibm775"}, /* OEM Baltic; Baltic (DOS) */
-    {850, "ibm850"}, /* OEM Multilingual Latin 1; Western European (DOS) */
-    {852, "ibm852"}, /* OEM Latin 2; Central European (DOS) */
-    {855, "IBM855"}, /* OEM Cyrillic (primarily Russian) */
-    {857, "ibm857"}, /* OEM Turkish; Turkish (DOS) */
-    {858, "IBM00858"}, /* OEM Multilingual Latin 1 + Euro symbol */
-    {860, "IBM860"}, /* OEM Portuguese; Portuguese (DOS) */
-    {861, "ibm861"}, /* OEM Icelandic; Icelandic (DOS) */
-    {862, "DOS-862"}, /* OEM Hebrew; Hebrew (DOS) */
-    {863, "IBM863"}, /* OEM French Canadian; French Canadian (DOS) */
-    {864, "IBM864"}, /* OEM Arabic; Arabic (864) */
-    {865, "IBM865"}, /* OEM Nordic; Nordic (DOS) */
-    {866, "cp866"}, /* OEM Russian; Cyrillic (DOS) */
-    {869, "ibm869"}, /* OEM Modern Greek; Greek, Modern (DOS) */
-    {870, "IBM870"}, /* IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2 */
-    {874, "windows-874"}, /* ANSI/OEM Thai (same as 28605, ISO 8859-15); Thai (Windows) */
-    {875, "cp875"}, /* IBM EBCDIC Greek Modern */
-    {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */
-    {932, "shift-jis"}, /* alternative name for it */
-    {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */
-    {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */
-    {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */
-    {1026, "IBM1026"}, /* IBM EBCDIC Turkish (Latin 5) */
-    {1047, "IBM01047"}, /* IBM EBCDIC Latin 1/Open System */
-    {1140, "IBM01140"}, /* IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro) */
-    {1141, "IBM01141"}, /* IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro) */
-    {1142, "IBM01142"}, /* IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro) */
-    {1143, "IBM01143"}, /* IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro) */
-    {1144, "IBM01144"}, /* IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro) */
-    {1145, "IBM01145"}, /* IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro) */
-    {1146, "IBM01146"}, /* IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro) */
-    {1147, "IBM01147"}, /* IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro) */
-    {1148, "IBM01148"}, /* IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro) */
-    {1149, "IBM01149"}, /* IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro) */
-    {1250, "windows-1250"}, /* ANSI Central European; Central European (Windows) */
-    {1251, "windows-1251"}, /* ANSI Cyrillic; Cyrillic (Windows) */
-    {1252, "windows-1252"}, /* ANSI Latin 1; Western European (Windows) */
-    {1253, "windows-1253"}, /* ANSI Greek; Greek (Windows) */
-    {1254, "windows-1254"}, /* ANSI Turkish; Turkish (Windows) */
-    {1255, "windows-1255"}, /* ANSI Hebrew; Hebrew (Windows) */
-    {1256, "windows-1256"}, /* ANSI Arabic; Arabic (Windows) */
-    {1257, "windows-1257"}, /* ANSI Baltic; Baltic (Windows) */
-    {1258, "windows-1258"}, /* ANSI/OEM Vietnamese; Vietnamese (Windows) */
-    {1361, "Johab"}, /* Korean (Johab) */
-    {10000, "macintosh"}, /* MAC Roman; Western European (Mac) */
-    {10001, "x-mac-japanese"}, /* Japanese (Mac) */
-    {10002, "x-mac-chinesetrad"}, /* MAC Traditional Chinese (Big5); Chinese Traditional (Mac) */
-    {10003, "x-mac-korean"}, /* Korean (Mac) */
-    {10004, "x-mac-arabic"}, /* Arabic (Mac) */
-    {10005, "x-mac-hebrew"}, /* Hebrew (Mac) */
-    {10006, "x-mac-greek"}, /* Greek (Mac) */
-    {10007, "x-mac-cyrillic"}, /* Cyrillic (Mac) */
-    {10008, "x-mac-chinesesimp"}, /* MAC Simplified Chinese (GB 2312); Chinese Simplified (Mac) */
-    {10010, "x-mac-romanian"}, /* Romanian (Mac) */
-    {10017, "x-mac-ukrainian"}, /* Ukrainian (Mac) */
-    {10021, "x-mac-thai"}, /* Thai (Mac) */
-    {10029, "x-mac-ce"}, /* MAC Latin 2; Central European (Mac) */
-    {10079, "x-mac-icelandic"}, /* Icelandic (Mac) */
-    {10081, "x-mac-turkish"}, /* Turkish (Mac) */
-    {10082, "x-mac-croatian"}, /* Croatian (Mac) */
-    {20000, "x-Chinese_CNS"}, /* CNS Taiwan; Chinese Traditional (CNS) */
-    {20001, "x-cp20001"}, /* TCA Taiwan */
-    {20002, "x_Chinese-Eten"}, /* Eten Taiwan; Chinese Traditional (Eten) */
-    {20003, "x-cp20003"}, /* IBM5550 Taiwan */
-    {20004, "x-cp20004"}, /* TeleText Taiwan */
-    {20005, "x-cp20005"}, /* Wang Taiwan */
-    {20105, "x-IA5"}, /* IA5 (IRV International Alphabet No. 5, 7-bit); Western European (IA5) */
-    {20106, "x-IA5-German"}, /* IA5 German (7-bit) */
-    {20107, "x-IA5-Swedish"}, /* IA5 Swedish (7-bit) */
-    {20108, "x-IA5-Norwegian"}, /* IA5 Norwegian (7-bit) */
-    {20127, "us-ascii"}, /* US-ASCII (7-bit) */
-    {20261, "x-cp20261"}, /* T.61 */
-    {20269, "x-cp20269"}, /* ISO 6937 Non-Spacing Accent */
-    {20273, "IBM273"}, /* IBM EBCDIC Germany */
-    {20277, "IBM277"}, /* IBM EBCDIC Denmark-Norway */
-    {20278, "IBM278"}, /* IBM EBCDIC Finland-Sweden */
-    {20280, "IBM280"}, /* IBM EBCDIC Italy */
-    {20284, "IBM284"}, /* IBM EBCDIC Latin America-Spain */
-    {20285, "IBM285"}, /* IBM EBCDIC United Kingdom */
-    {20290, "IBM290"}, /* IBM EBCDIC Japanese Katakana Extended */
-    {20297, "IBM297"}, /* IBM EBCDIC France */
-    {20420, "IBM420"}, /* IBM EBCDIC Arabic */
-    {20423, "IBM423"}, /* IBM EBCDIC Greek */
-    {20424, "IBM424"}, /* IBM EBCDIC Hebrew */
-    {20833, "x-EBCDIC-KoreanExtended"}, /* IBM EBCDIC Korean Extended */
-    {20838, "IBM-Thai"}, /* IBM EBCDIC Thai */
-    {20866, "koi8-r"}, /* Russian (KOI8-R); Cyrillic (KOI8-R) */
-    {20871, "IBM871"}, /* IBM EBCDIC Icelandic */
-    {20880, "IBM880"}, /* IBM EBCDIC Cyrillic Russian */
-    {20905, "IBM905"}, /* IBM EBCDIC Turkish */
-    {20924, "IBM00924"}, /* IBM EBCDIC Latin 1/Open System (1047 + Euro symbol) */
-    {20932, "EUC-JP"}, /* Japanese (JIS 0208-1990 and 0121-1990) */
-    {20936, "x-cp20936"}, /* Simplified Chinese (GB2312); Chinese Simplified (GB2312-80) */
-    {20949, "x-cp20949"}, /* Korean Wansung */
-    {21025, "cp1025"}, /* IBM EBCDIC Cyrillic Serbian-Bulgarian */
-    /* 21027 		(deprecated) */
-    {21866, "koi8-u"}, /* Ukrainian (KOI8-U); Cyrillic (KOI8-U) */
-    {28591, "iso-8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
-    {28591, "iso8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
-    {28592, "iso-8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
-    {28592, "iso8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
-    {28593, "iso-8859-3"}, /* ISO 8859-3 Latin 3 */
-    {28593, "iso8859-3"}, /* ISO 8859-3 Latin 3 */
-    {28594, "iso-8859-4"}, /* ISO 8859-4 Baltic */
-    {28594, "iso8859-4"}, /* ISO 8859-4 Baltic */
-    {28595, "iso-8859-5"}, /* ISO 8859-5 Cyrillic */
-    {28595, "iso8859-5"}, /* ISO 8859-5 Cyrillic */
-    {28596, "iso-8859-6"}, /* ISO 8859-6 Arabic */
-    {28596, "iso8859-6"}, /* ISO 8859-6 Arabic */
-    {28597, "iso-8859-7"}, /* ISO 8859-7 Greek */
-    {28597, "iso8859-7"}, /* ISO 8859-7 Greek */
-    {28598, "iso-8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
-    {28598, "iso8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
-    {28599, "iso-8859-9"}, /* ISO 8859-9 Turkish */
-    {28599, "iso8859-9"}, /* ISO 8859-9 Turkish */
-    {28603, "iso-8859-13"}, /* ISO 8859-13 Estonian */
-    {28603, "iso8859-13"}, /* ISO 8859-13 Estonian */
-    {28605, "iso-8859-15"}, /* ISO 8859-15 Latin 9 */
-    {28605, "iso8859-15"}, /* ISO 8859-15 Latin 9 */
-    {29001, "x-Europa"}, /* Europa 3 */
-    {38598, "iso-8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
-    {38598, "iso8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
-    {50220, "iso-2022-jp"}, /* ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS) */
-    {50221, "csISO2022JP"}, /* ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana) */
-    {50222, "iso-2022-jp"}, /* ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI) */
-    {50225, "iso-2022-kr"}, /* ISO 2022 Korean */
-    {50225, "iso2022-kr"}, /* ISO 2022 Korean */
-    {50227, "x-cp50227"}, /* ISO 2022 Simplified Chinese; Chinese Simplified (ISO 2022) */
-    /* 50229 		ISO 2022 Traditional Chinese */
-    /* 50930 		EBCDIC Japanese (Katakana) Extended */
-    /* 50931 		EBCDIC US-Canada and Japanese */
-    /* 50933 		EBCDIC Korean Extended and Korean */
-    /* 50935 		EBCDIC Simplified Chinese Extended and Simplified Chinese */
-    /* 50936 		EBCDIC Simplified Chinese */
-    /* 50937 		EBCDIC US-Canada and Traditional Chinese */
-    /* 50939 		EBCDIC Japanese (Latin) Extended and Japanese */
-    {51932, "euc-jp"}, /* EUC Japanese */
-    {51936, "EUC-CN"}, /* EUC Simplified Chinese; Chinese Simplified (EUC) */
-    {51949, "euc-kr"}, /* EUC Korean */
-    /* 51950 		EUC Traditional Chinese */
-    {52936, "hz-gb-2312"}, /* HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ) */
-    {54936, "GB18030"}, /* Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030) */
-    {57002, "x-iscii-de"}, /* ISCII Devanagari */
-    {57003, "x-iscii-be"}, /* ISCII Bengali */
-    {57004, "x-iscii-ta"}, /* ISCII Tamil */
-    {57005, "x-iscii-te"}, /* ISCII Telugu */
-    {57006, "x-iscii-as"}, /* ISCII Assamese */
-    {57007, "x-iscii-or"}, /* ISCII Oriya */
-    {57008, "x-iscii-ka"}, /* ISCII Kannada */
-    {57009, "x-iscii-ma"}, /* ISCII Malayalam */
-    {57010, "x-iscii-gu"}, /* ISCII Gujarati */
-    {57011, "x-iscii-pa"}, /* ISCII Punjabi */
-
-    {0, NULL}
-};
-
-/*
- * SJIS SHIFTJIS table              CP932 table
- * ---- --------------------------- --------------------------------
- *   5C U+00A5 YEN SIGN             U+005C REVERSE SOLIDUS
- *   7E U+203E OVERLINE             U+007E TILDE
- * 815C U+2014 EM DASH              U+2015 HORIZONTAL BAR
- * 815F U+005C REVERSE SOLIDUS      U+FF3C FULLWIDTH REVERSE SOLIDUS
- * 8160 U+301C WAVE DASH            U+FF5E FULLWIDTH TILDE
- * 8161 U+2016 DOUBLE VERTICAL LINE U+2225 PARALLEL TO
- * 817C U+2212 MINUS SIGN           U+FF0D FULLWIDTH HYPHEN-MINUS
- * 8191 U+00A2 CENT SIGN            U+FFE0 FULLWIDTH CENT SIGN
- * 8192 U+00A3 POUND SIGN           U+FFE1 FULLWIDTH POUND SIGN
- * 81CA U+00AC NOT SIGN             U+FFE2 FULLWIDTH NOT SIGN
- *
- * EUC-JP and ISO-2022-JP should be compatible with CP932.
- *
- * Kernel and MLang have different Unicode mapping table.  Make sure
- * which API is used.
- */
-static compat_t cp932_compat[] = {
-    {0x00A5, 0x005C, COMPAT_OUT},
-    {0x203E, 0x007E, COMPAT_OUT},
-    {0x2014, 0x2015, COMPAT_OUT},
-    {0x301C, 0xFF5E, COMPAT_OUT},
-    {0x2016, 0x2225, COMPAT_OUT},
-    {0x2212, 0xFF0D, COMPAT_OUT},
-    {0x00A2, 0xFFE0, COMPAT_OUT},
-    {0x00A3, 0xFFE1, COMPAT_OUT},
-    {0x00AC, 0xFFE2, COMPAT_OUT},
-    {0, 0, 0}
-};
-
-static compat_t cp20932_compat[] = {
-    {0x00A5, 0x005C, COMPAT_OUT},
-    {0x203E, 0x007E, COMPAT_OUT},
-    {0x2014, 0x2015, COMPAT_OUT},
-    {0xFF5E, 0x301C, COMPAT_OUT|COMPAT_IN},
-    {0x2225, 0x2016, COMPAT_OUT|COMPAT_IN},
-    {0xFF0D, 0x2212, COMPAT_OUT|COMPAT_IN},
-    {0xFFE0, 0x00A2, COMPAT_OUT|COMPAT_IN},
-    {0xFFE1, 0x00A3, COMPAT_OUT|COMPAT_IN},
-    {0xFFE2, 0x00AC, COMPAT_OUT|COMPAT_IN},
-    {0, 0, 0}
-};
-
-static compat_t *cp51932_compat = cp932_compat;
-
-/* cp20932_compat for kernel.  cp932_compat for mlang. */
-static compat_t *cp5022x_compat = cp932_compat;
-
-typedef HRESULT (WINAPI *CONVERTINETSTRING)(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnSrcSize,
-    LPBYTE lpDstStr,
-    LPINT lpnDstSize
-);
-typedef HRESULT (WINAPI *CONVERTINETMULTIBYTETOUNICODE)(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnMultiCharCount,
-    LPWSTR lpDstStr,
-    LPINT lpnWideCharCount
-);
-typedef HRESULT (WINAPI *CONVERTINETUNICODETOMULTIBYTE)(
-    LPDWORD lpdwMode,
-    DWORD dwEncoding,
-    LPCWSTR lpSrcStr,
-    LPINT lpnWideCharCount,
-    LPSTR lpDstStr,
-    LPINT lpnMultiCharCount
-);
-typedef HRESULT (WINAPI *ISCONVERTINETSTRINGAVAILABLE)(
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding
-);
-typedef HRESULT (WINAPI *LCIDTORFC1766A)(
-    LCID Locale,
-    LPSTR pszRfc1766,
-    int nChar
-);
-typedef HRESULT (WINAPI *LCIDTORFC1766W)(
-    LCID Locale,
-    LPWSTR pszRfc1766,
-    int nChar
-);
-typedef HRESULT (WINAPI *RFC1766TOLCIDA)(
-    LCID *pLocale,
-    LPSTR pszRfc1766
-);
-typedef HRESULT (WINAPI *RFC1766TOLCIDW)(
-    LCID *pLocale,
-    LPWSTR pszRfc1766
-);
-static CONVERTINETSTRING ConvertINetString;
-static CONVERTINETMULTIBYTETOUNICODE ConvertINetMultiByteToUnicode;
-static CONVERTINETUNICODETOMULTIBYTE ConvertINetUnicodeToMultiByte;
-static ISCONVERTINETSTRINGAVAILABLE IsConvertINetStringAvailable;
-static LCIDTORFC1766A LcidToRfc1766A;
-static RFC1766TOLCIDA Rfc1766ToLcidA;
-
-static int
-load_mlang()
-{
-    HMODULE h;
-    if (ConvertINetString != NULL)
-        return TRUE;
-    h = LoadLibrary("mlang.dll");
-    if (!h)
-        return FALSE;
-    ConvertINetString = (CONVERTINETSTRING)GetProcAddress(h, "ConvertINetString");
-    ConvertINetMultiByteToUnicode = (CONVERTINETMULTIBYTETOUNICODE)GetProcAddress(h, "ConvertINetMultiByteToUnicode");
-    ConvertINetUnicodeToMultiByte = (CONVERTINETUNICODETOMULTIBYTE)GetProcAddress(h, "ConvertINetUnicodeToMultiByte");
-    IsConvertINetStringAvailable = (ISCONVERTINETSTRINGAVAILABLE)GetProcAddress(h, "IsConvertINetStringAvailable");
-    LcidToRfc1766A = (LCIDTORFC1766A)GetProcAddress(h, "LcidToRfc1766A");
-    Rfc1766ToLcidA = (RFC1766TOLCIDA)GetProcAddress(h, "Rfc1766ToLcidA");
-    return TRUE;
-}
-
-iconv_t
-iconv_open(const char *tocode, const char *fromcode)
-{
-    rec_iconv_t *cd;
-
-    cd = (rec_iconv_t *)calloc(1, sizeof(rec_iconv_t));
-    if (cd == NULL)
-        return (iconv_t)(-1);
-
-#if defined(USE_LIBICONV_DLL)
-    errno = 0;
-    if (libiconv_iconv_open(cd, tocode, fromcode))
-        return (iconv_t)cd;
-#endif
-
-    /* reset the errno to prevent reporting wrong error code.
-     * 0 for unsorted error. */
-    errno = 0;
-    if (win_iconv_open(cd, tocode, fromcode))
-        return (iconv_t)cd;
-
-    free(cd);
-
-    return (iconv_t)(-1);
-}
-
-int
-iconv_close(iconv_t _cd)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    int r = cd->iconv_close(cd->cd);
-    int e = *(cd->_errno());
-#if defined(USE_LIBICONV_DLL)
-    if (cd->hlibiconv != NULL)
-        FreeLibrary(cd->hlibiconv);
-#endif
-    free(cd);
-    errno = e;
-    return r;
-}
-
-size_t
-iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    size_t r = cd->iconv(cd->cd, inbuf, inbytesleft, outbuf, outbytesleft);
-    errno = *(cd->_errno());
-    return r;
-}
-
-static int
-win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
-{
-    if (!make_csconv(fromcode, &cd->from) || !make_csconv(tocode, &cd->to))
-        return FALSE;
-    cd->iconv_close = win_iconv_close;
-    cd->iconv = win_iconv;
-    cd->_errno = _errno;
-    cd->cd = (iconv_t)cd;
-    return TRUE;
-}
-
-static int
-win_iconv_close(iconv_t cd)
-{
-    return 0;
-}
-
-static size_t
-win_iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    ushort wbuf[MB_CHAR_MAX]; /* enough room for one character */
-    int insize;
-    int outsize;
-    int wsize;
-    DWORD frommode;
-    DWORD tomode;
-    uint wc;
-    compat_t *cp;
-    int i;
-
-    if (inbuf == NULL || *inbuf == NULL)
-    {
-        if (outbuf != NULL && *outbuf != NULL && cd->to.flush != NULL)
-        {
-            tomode = cd->to.mode;
-            outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, *outbytesleft);
-            if (outsize == -1)
-            {
-                cd->to.mode = tomode;
-                return (size_t)(-1);
-            }
-            *outbuf += outsize;
-            *outbytesleft -= outsize;
-        }
-        cd->from.mode = 0;
-        cd->to.mode = 0;
-        return 0;
-    }
-
-    while (*inbytesleft != 0)
-    {
-        frommode = cd->from.mode;
-        tomode = cd->to.mode;
-        wsize = MB_CHAR_MAX;
-
-        insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, *inbytesleft, wbuf, &wsize);
-        if (insize == -1)
-        {
-            cd->from.mode = frommode;
-            return (size_t)(-1);
-        }
-
-        if (wsize == 0)
-        {
-            *inbuf += insize;
-            *inbytesleft -= insize;
-            continue;
-        }
-
-        if (cd->from.compat != NULL)
-        {
-            wc = utf16_to_ucs4(wbuf);
-            cp = cd->from.compat;
-            for (i = 0; cp[i].in != 0; ++i)
-            {
-                if ((cp[i].flag & COMPAT_IN) && cp[i].out == wc)
-                {
-                    ucs4_to_utf16(cp[i].in, wbuf, &wsize);
-                    break;
-                }
-            }
-        }
-
-        if (cd->to.compat != NULL)
-        {
-            wc = utf16_to_ucs4(wbuf);
-            cp = cd->to.compat;
-            for (i = 0; cp[i].in != 0; ++i)
-            {
-                if ((cp[i].flag & COMPAT_OUT) && cp[i].in == wc)
-                {
-                    ucs4_to_utf16(cp[i].out, wbuf, &wsize);
-                    break;
-                }
-            }
-        }
-
-        outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, *outbytesleft);
-        if (outsize == -1)
-        {
-            cd->from.mode = frommode;
-            cd->to.mode = tomode;
-            return (size_t)(-1);
-        }
-
-        *inbuf += insize;
-        *outbuf += outsize;
-        *inbytesleft -= insize;
-        *outbytesleft -= outsize;
-    }
-
-    return 0;
-}
-
-static int
-make_csconv(const char *_name, csconv_t *cv)
-{
-    CPINFOEX cpinfoex;
-    int use_compat = TRUE;
-    int flag = 0;
-    char *name;
-    char *p;
-
-    name = xstrndup(_name, strlen(_name));
-    if (name == NULL)
-        return FALSE;
-
-    /* check for option "enc_name//opt1//opt2" */
-    while ((p = strrstr(name, "//")) != NULL)
-    {
-        if (_stricmp(p + 2, "nocompat") == 0)
-            use_compat = FALSE;
-        else if (_stricmp(p + 2, "translit") == 0)
-            flag |= FLAG_TRANSLIT;
-        else if (_stricmp(p + 2, "ignore") == 0)
-            flag |= FLAG_IGNORE;
-        *p = 0;
-    }
-
-    cv->mode = 0;
-    cv->flags = flag;
-    cv->mblen = NULL;
-    cv->flush = NULL;
-    cv->compat = NULL;
-    cv->codepage = name_to_codepage(name);
-    if (cv->codepage == 1200 || cv->codepage == 1201)
-    {
-        cv->mbtowc = utf16_mbtowc;
-        cv->wctomb = utf16_wctomb;
-        if (_stricmp(name, "UTF-16") == 0 || _stricmp(name, "UTF16") == 0)
-            cv->flags |= FLAG_USE_BOM;
-    }
-    else if (cv->codepage == 12000 || cv->codepage == 12001)
-    {
-        cv->mbtowc = utf32_mbtowc;
-        cv->wctomb = utf32_wctomb;
-        if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0)
-            cv->flags |= FLAG_USE_BOM;
-    }
-    else if (cv->codepage == 65001)
-    {
-        cv->mbtowc = kernel_mbtowc;
-        cv->wctomb = kernel_wctomb;
-        cv->mblen = utf8_mblen;
-    }
-    else if ((cv->codepage == 50220 || cv->codepage == 50221 || cv->codepage == 50222) && load_mlang())
-    {
-        cv->mbtowc = iso2022jp_mbtowc;
-        cv->wctomb = iso2022jp_wctomb;
-        cv->flush = iso2022jp_flush;
-    }
-    else if (cv->codepage == 51932 && load_mlang())
-    {
-        cv->mbtowc = mlang_mbtowc;
-        cv->wctomb = mlang_wctomb;
-        cv->mblen = eucjp_mblen;
-    }
-    else if (IsValidCodePage(cv->codepage)
-	     && GetCPInfoEx(cv->codepage, 0, &cpinfoex) != 0)
-    {
-        cv->mbtowc = kernel_mbtowc;
-        cv->wctomb = kernel_wctomb;
-        if (cpinfoex.MaxCharSize == 1)
-            cv->mblen = sbcs_mblen;
-        else if (cpinfoex.MaxCharSize == 2)
-            cv->mblen = dbcs_mblen;
-	else
-	    cv->mblen = mbcs_mblen;
-    }
-    else
-    {
-        /* not supported */
-        free(name);
-        errno = EINVAL;
-        return FALSE;
-    }
-
-    if (use_compat)
-    {
-        switch (cv->codepage)
-        {
-        case 932: cv->compat = cp932_compat; break;
-        case 20932: cv->compat = cp20932_compat; break;
-        case 51932: cv->compat = cp51932_compat; break;
-        case 50220: case 50221: case 50222: cv->compat = cp5022x_compat; break;
-        }
-    }
-
-    free(name);
-
-    return TRUE;
-}
-
-static int
-name_to_codepage(const char *name)
-{
-    int i;
-
-    if (*name == '\0' ||
-	strcmp(name, "char") == 0)
-        return GetACP();
-    else if (strcmp(name, "wchar_t") == 0)
-        return 1200;
-    else if (_strnicmp(name, "cp", 2) == 0)
-        return atoi(name + 2); /* CP123 */
-    else if ('0' <= name[0] && name[0] <= '9')
-        return atoi(name);     /* 123 */
-    else if (_strnicmp(name, "xx", 2) == 0)
-        return atoi(name + 2); /* XX123 for debug */
-
-    for (i = 0; codepage_alias[i].name != NULL; ++i)
-        if (_stricmp(name, codepage_alias[i].name) == 0)
-            return codepage_alias[i].codepage;
-    return -1;
-}
-
-/*
- * http://www.faqs.org/rfcs/rfc2781.html
- */
-static uint
-utf16_to_ucs4(const ushort *wbuf)
-{
-    uint wc = wbuf[0];
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-        wc = ((wbuf[0] & 0x3FF) << 10) + (wbuf[1] & 0x3FF) + 0x10000;
-    return wc;
-}
-
-static void
-ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize)
-{
-    if (wc < 0x10000)
-    {
-        wbuf[0] = wc;
-        *wbufsize = 1;
-    }
-    else
-    {
-        wc -= 0x10000;
-        wbuf[0] = 0xD800 | ((wc >> 10) & 0x3FF);
-        wbuf[1] = 0xDC00 | (wc & 0x3FF);
-        *wbufsize = 2;
-    }
-}
-
-/*
- * Check if codepage is one of those for which the dwFlags parameter
- * to MultiByteToWideChar() must be zero. Return zero or
- * MB_ERR_INVALID_CHARS.  The docs in Platform SDK for for Windows
- * Server 2003 R2 claims that also codepage 65001 is one of these, but
- * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave
- * out 65001 (UTF-8), and that indeed seems to be the case on XP, it
- * works fine to pass MB_ERR_INVALID_CHARS in dwFlags when converting
- * from UTF-8.
- */
-static int
-mbtowc_flags(int codepage)
-{
-    return (codepage == 50220 || codepage == 50221 ||
-	    codepage == 50222 || codepage == 50225 ||
-	    codepage == 50227 || codepage == 50229 ||
-	    codepage == 52936 || codepage == 54936 ||
-	    (codepage >= 57002 && codepage <= 57011) ||
-	    codepage == 65000 || codepage == 42) ? 0 : MB_ERR_INVALID_CHARS;
-}
-
-/*
- * Check if codepage is one those for which the lpUsedDefaultChar
- * parameter to WideCharToMultiByte() must be NULL.  The docs in
- * Platform SDK for for Windows Server 2003 R2 claims that this is the
- * list below, while the MSDN docs for MSVS2008 claim that it is only
- * for 65000 (UTF-7) and 65001 (UTF-8). This time the earlier Platform
- * SDK seems to be correct, at least for XP.
- */
-static int
-must_use_null_useddefaultchar(int codepage)
-{
-    return (codepage == 65000 || codepage == 65001 ||
-            codepage == 50220 || codepage == 50221 ||
-            codepage == 50222 || codepage == 50225 ||
-            codepage == 50227 || codepage == 50229 ||
-            codepage == 52936 || codepage == 54936 ||
-            (codepage >= 57002 && codepage <= 57011) ||
-            codepage == 42);
-}
-
-static char *
-strrstr(const char *str, const char *token)
-{
-    int len = strlen(token);
-    const char *p = str + strlen(str);
-
-    while (str <= --p)
-        if (p[0] == token[0] && strncmp(p, token, len) == 0)
-            return (char *)p;
-    return NULL;
-}
-
-static char *
-xstrndup(const char *s, size_t n)
-{
-    char *p;
-
-    p = (char *)malloc(n + 1);
-    if (p == NULL)
-        return NULL;
-    memcpy(p, s, n);
-    p[n] = '\0';
-    return p;
-}
-
-static int
-seterror(int err)
-{
-    errno = err;
-    return -1;
-}
-
-#if defined(USE_LIBICONV_DLL)
-static int
-libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
-{
-    HMODULE hlibiconv = NULL;
-    HMODULE hmsvcrt = NULL;
-    char *dllname;
-    const char *p;
-    const char *e;
-    f_iconv_open _iconv_open;
-
-    /*
-     * always try to load dll, so that we can switch dll in runtime.
-     */
-
-    /* XXX: getenv() can't get variable set by SetEnvironmentVariable() */
-    p = getenv("WINICONV_LIBICONV_DLL");
-    if (p == NULL)
-        p = DEFAULT_LIBICONV_DLL;
-    /* parse comma separated value */
-    for ( ; *p != 0; p = (*e == ',') ? e + 1 : e)
-    {
-        e = strchr(p, ',');
-        if (p == e)
-            continue;
-        else if (e == NULL)
-            e = p + strlen(p);
-        dllname = xstrndup(p, e - p);
-        if (dllname == NULL)
-            return FALSE;
-        hlibiconv = LoadLibrary(dllname);
-        free(dllname);
-        if (hlibiconv != NULL)
-        {
-            if (hlibiconv == hwiniconv)
-            {
-                FreeLibrary(hlibiconv);
-                hlibiconv = NULL;
-                continue;
-            }
-            break;
-        }
-    }
-
-    if (hlibiconv == NULL)
-        goto failed;
-
-    hmsvcrt = find_imported_module_by_funcname(hlibiconv, "_errno");
-    if (hmsvcrt == NULL)
-        goto failed;
-
-    _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "libiconv_open");
-    if (_iconv_open == NULL)
-        _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "iconv_open");
-    cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "libiconv_close");
-    if (cd->iconv_close == NULL)
-        cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "iconv_close");
-    cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "libiconv");
-    if (cd->iconv == NULL)
-        cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "iconv");
-    cd->_errno = (f_errno)GetProcAddress(hmsvcrt, "_errno");
-    if (_iconv_open == NULL || cd->iconv_close == NULL
-            || cd->iconv == NULL || cd->_errno == NULL)
-        goto failed;
-
-    cd->cd = _iconv_open(tocode, fromcode);
-    if (cd->cd == (iconv_t)(-1))
-        goto failed;
-
-    cd->hlibiconv = hlibiconv;
-    return TRUE;
-
-failed:
-    if (hlibiconv != NULL)
-        FreeLibrary(hlibiconv);
-    /* do not free hmsvcrt which is obtained by GetModuleHandle() */
-    return FALSE;
-}
-
-/*
- * Reference:
- * http://forums.belution.com/ja/vc/000/234/78s.shtml
- * http://nienie.com/~masapico/api_ImageDirectoryEntryToData.html
- *
- * The formal way is
- *   imagehlp.h or dbghelp.h
- *   imagehlp.lib or dbghelp.lib
- *   ImageDirectoryEntryToData()
- */
-#define TO_DOS_HEADER(base) ((PIMAGE_DOS_HEADER)(base))
-#define TO_NT_HEADERS(base) ((PIMAGE_NT_HEADERS)((LPBYTE)(base) + TO_DOS_HEADER(base)->e_lfanew))
-static PVOID
-MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
-{
-    /* TODO: MappedAsImage? */
-    PIMAGE_DATA_DIRECTORY p;
-    p = TO_NT_HEADERS(Base)->OptionalHeader.DataDirectory + DirectoryEntry;
-    if (p->VirtualAddress == 0) {
-      *Size = 0;
-      return NULL;
-    }
-    *Size = p->Size;
-    return (PVOID)((LPBYTE)Base + p->VirtualAddress);
-}
-
-static HMODULE
-find_imported_module_by_funcname(HMODULE hModule, const char *funcname)
-{
-    DWORD Base;
-    ULONG Size;
-    PIMAGE_IMPORT_DESCRIPTOR Imp;
-    PIMAGE_THUNK_DATA Name;         /* Import Name Table */
-    PIMAGE_IMPORT_BY_NAME ImpName;
-
-    Base = (DWORD)hModule;
-    Imp = MyImageDirectoryEntryToData(
-            (LPVOID)Base,
-            TRUE,
-            IMAGE_DIRECTORY_ENTRY_IMPORT,
-            &Size);
-    if (Imp == NULL)
-        return NULL;
-    for ( ; Imp->OriginalFirstThunk != 0; ++Imp)
-    {
-        Name = (PIMAGE_THUNK_DATA)(Base + Imp->OriginalFirstThunk);
-        for ( ; Name->u1.Ordinal != 0; ++Name)
-        {
-            if (!IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal))
-            {
-                ImpName = (PIMAGE_IMPORT_BY_NAME)
-                    (Base + (DWORD)Name->u1.AddressOfData);
-                if (strcmp((char *)ImpName->Name, funcname) == 0)
-                    return GetModuleHandle((char *)(Base + Imp->Name));
-            }
-        }
-    }
-    return NULL;
-}
-#endif
-
-static int
-sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    return 1;
-}
-
-static int
-dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = IsDBCSLeadByteEx(cv->codepage, buf[0]) ? 2 : 1;
-    if (bufsize < len)
-        return seterror(EINVAL);
-    return len;
-}
-
-static int
-mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = 0;
-
-    if (cv->codepage == 54936) {
-	if (buf[0] <= 0x7F) len = 1;
-	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
-		 bufsize >= 2 &&
-		 ((buf[1] >= 0x40 && buf[1] <= 0x7E) ||
-		  (buf[1] >= 0x80 && buf[1] <= 0xFE))) len = 2;
-	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
-		 bufsize >= 4 &&
-		 buf[1] >= 0x30 && buf[1] <= 0x39) len = 4;
-	else
-	    return seterror(EINVAL);
-	return len;
-    }
-    else
-	return seterror(EINVAL);
-}
-
-static int
-utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = 0;
-
-    if (buf[0] < 0x80) len = 1;
-    else if ((buf[0] & 0xE0) == 0xC0) len = 2;
-    else if ((buf[0] & 0xF0) == 0xE0) len = 3;
-    else if ((buf[0] & 0xF8) == 0xF0) len = 4;
-    else if ((buf[0] & 0xFC) == 0xF8) len = 5;
-    else if ((buf[0] & 0xFE) == 0xFC) len = 6;
-
-    if (len == 0)
-        return seterror(EILSEQ);
-    else if (bufsize < len)
-        return seterror(EINVAL);
-    return len;
-}
-
-static int
-eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    if (buf[0] < 0x80) /* ASCII */
-        return 1;
-    else if (buf[0] == 0x8E) /* JIS X 0201 */
-    {
-        if (bufsize < 2)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[1] && buf[1] <= 0xDF))
-            return seterror(EILSEQ);
-        return 2;
-    }
-    else if (buf[0] == 0x8F) /* JIS X 0212 */
-    {
-        if (bufsize < 3)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[1] && buf[1] <= 0xFE)
-                || !(0xA1 <= buf[2] && buf[2] <= 0xFE))
-            return seterror(EILSEQ);
-        return 3;
-    }
-    else /* JIS X 0208 */
-    {
-        if (bufsize < 2)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[0] && buf[0] <= 0xFE)
-                || !(0xA1 <= buf[1] && buf[1] <= 0xFE))
-            return seterror(EILSEQ);
-        return 2;
-    }
-}
-
-static int
-kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int len;
-
-    len = cv->mblen(cv, buf, bufsize);
-    if (len == -1)
-        return -1;
-    *wbufsize = MultiByteToWideChar(cv->codepage, mbtowc_flags (cv->codepage),
-            (const char *)buf, len, (wchar_t *)wbuf, *wbufsize);
-    if (*wbufsize == 0)
-        return seterror(EILSEQ);
-    return len;
-}
-
-static int
-kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    BOOL usedDefaultChar = 0;
-    BOOL *p = NULL;
-    int flags = 0;
-    int len;
-
-    if (bufsize == 0)
-        return seterror(E2BIG);
-    if (!must_use_null_useddefaultchar(cv->codepage))
-    {
-        p = &usedDefaultChar;
-#ifdef WC_NO_BEST_FIT_CHARS
-        if (!(cv->flags & FLAG_TRANSLIT))
-            flags |= WC_NO_BEST_FIT_CHARS;
-#endif
-    }
-    len = WideCharToMultiByte(cv->codepage, flags,
-            (const wchar_t *)wbuf, wbufsize, (char *)buf, bufsize, NULL, p);
-    if (len == 0)
-    {
-        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-            return seterror(E2BIG);
-        return seterror(EILSEQ);
-    }
-    else if (usedDefaultChar)
-        return seterror(EILSEQ);
-    else if (cv->mblen(cv, buf, len) != len) /* validate result */
-        return seterror(EILSEQ);
-    return len;
-}
-
-/*
- * It seems that the mode (cv->mode) is fixnum.
- * For example, when converting iso-2022-jp(cp50221) to unicode:
- *      in ascii sequence: mode=0xC42C0000
- *   in jisx0208 sequence: mode=0xC42C0001
- * "C42C" is same for each convert session.
- * It should be: ((codepage-1)<<16)|state
- */
-static int
-mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int len;
-    int insize;
-    HRESULT hr;
-
-    len = cv->mblen(cv, buf, bufsize);
-    if (len == -1)
-        return -1;
-    insize = len;
-    hr = ConvertINetMultiByteToUnicode(&cv->mode, cv->codepage,
-            (const char *)buf, &insize, (wchar_t *)wbuf, wbufsize);
-    if (hr != S_OK || insize != len)
-        return seterror(EILSEQ);
-    return len;
-}
-
-static int
-mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    char tmpbuf[MB_CHAR_MAX]; /* enough room for one character */
-    int tmpsize = MB_CHAR_MAX;
-    int insize = wbufsize;
-    HRESULT hr;
-
-    hr = ConvertINetUnicodeToMultiByte(&cv->mode, cv->codepage,
-            (const wchar_t *)wbuf, &wbufsize, tmpbuf, &tmpsize);
-    if (hr != S_OK || insize != wbufsize)
-        return seterror(EILSEQ);
-    else if (bufsize < tmpsize)
-        return seterror(E2BIG);
-    else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize)
-        return seterror(EILSEQ);
-    memcpy(buf, tmpbuf, tmpsize);
-    return tmpsize;
-}
-
-static int
-utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int codepage = cv->codepage;
-
-    /* swap endian: 1200 <-> 1201 */
-    if (cv->mode & UNICODE_MODE_SWAPPED)
-        codepage ^= 1;
-
-    if (bufsize < 2)
-        return seterror(EINVAL);
-    if (codepage == 1200) /* little endian */
-        wbuf[0] = (buf[1] << 8) | buf[0];
-    else if (codepage == 1201) /* big endian */
-        wbuf[0] = (buf[0] << 8) | buf[1];
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (wbuf[0] == 0xFFFE)
-        {
-            cv->mode |= UNICODE_MODE_SWAPPED;
-            *wbufsize = 0;
-            return 2;
-        }
-        else if (wbuf[0] == 0xFEFF)
-        {
-            *wbufsize = 0;
-            return 2;
-        }
-    }
-
-    if (0xDC00 <= wbuf[0] && wbuf[0] <= 0xDFFF)
-        return seterror(EILSEQ);
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-    {
-        if (bufsize < 4)
-            return seterror(EINVAL);
-        if (codepage == 1200) /* little endian */
-            wbuf[1] = (buf[3] << 8) | buf[2];
-        else if (codepage == 1201) /* big endian */
-            wbuf[1] = (buf[2] << 8) | buf[3];
-        if (!(0xDC00 <= wbuf[1] && wbuf[1] <= 0xDFFF))
-            return seterror(EILSEQ);
-        *wbufsize = 2;
-        return 4;
-    }
-    *wbufsize = 1;
-    return 2;
-}
-
-static int
-utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        int r;
-
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (bufsize < 2)
-            return seterror(E2BIG);
-        if (cv->codepage == 1200) /* little endian */
-            memcpy(buf, "\xFF\xFE", 2);
-        else if (cv->codepage == 1201) /* big endian */
-            memcpy(buf, "\xFE\xFF", 2);
-
-        r = utf16_wctomb(cv, wbuf, wbufsize, buf + 2, bufsize - 2);
-        if (r == -1)
-            return -1;
-        return r + 2;
-    }
-
-    if (bufsize < 2)
-        return seterror(E2BIG);
-    if (cv->codepage == 1200) /* little endian */
-    {
-        buf[0] = (wbuf[0] & 0x00FF);
-        buf[1] = (wbuf[0] & 0xFF00) >> 8;
-    }
-    else if (cv->codepage == 1201) /* big endian */
-    {
-        buf[0] = (wbuf[0] & 0xFF00) >> 8;
-        buf[1] = (wbuf[0] & 0x00FF);
-    }
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-    {
-        if (bufsize < 4)
-            return seterror(E2BIG);
-        if (cv->codepage == 1200) /* little endian */
-        {
-            buf[2] = (wbuf[1] & 0x00FF);
-            buf[3] = (wbuf[1] & 0xFF00) >> 8;
-        }
-        else if (cv->codepage == 1201) /* big endian */
-        {
-            buf[2] = (wbuf[1] & 0xFF00) >> 8;
-            buf[3] = (wbuf[1] & 0x00FF);
-        }
-        return 4;
-    }
-    return 2;
-}
-
-static int
-utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int codepage = cv->codepage;
-    uint wc = 0;
-
-    /* swap endian: 12000 <-> 12001 */
-    if (cv->mode & UNICODE_MODE_SWAPPED)
-        codepage ^= 1;
-
-    if (bufsize < 4)
-        return seterror(EINVAL);
-    if (codepage == 12000) /* little endian */
-        wc = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
-    else if (codepage == 12001) /* big endian */
-        wc = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (wc == 0xFFFE0000)
-        {
-            cv->mode |= UNICODE_MODE_SWAPPED;
-            *wbufsize = 0;
-            return 4;
-        }
-        else if (wc == 0x0000FEFF)
-        {
-            *wbufsize = 0;
-            return 4;
-        }
-    }
-
-    if ((0xD800 <= wc && wc <= 0xDFFF) || 0x10FFFF < wc)
-        return seterror(EILSEQ);
-    ucs4_to_utf16(wc, wbuf, wbufsize);
-    return 4;
-}
-
-static int
-utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    uint wc;
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        int r;
-
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (bufsize < 4)
-            return seterror(E2BIG);
-        if (cv->codepage == 12000) /* little endian */
-            memcpy(buf, "\xFF\xFE\x00\x00", 4);
-        else if (cv->codepage == 12001) /* big endian */
-            memcpy(buf, "\x00\x00\xFE\xFF", 4);
-
-        r = utf32_wctomb(cv, wbuf, wbufsize, buf + 4, bufsize - 4);
-        if (r == -1)
-            return -1;
-        return r + 4;
-    }
-
-    if (bufsize < 4)
-        return seterror(E2BIG);
-    wc = utf16_to_ucs4(wbuf);
-    if (cv->codepage == 12000) /* little endian */
-    {
-        buf[0] = wc & 0x000000FF;
-        buf[1] = (wc & 0x0000FF00) >> 8;
-        buf[2] = (wc & 0x00FF0000) >> 16;
-        buf[3] = (wc & 0xFF000000) >> 24;
-    }
-    else if (cv->codepage == 12001) /* big endian */
-    {
-        buf[0] = (wc & 0xFF000000) >> 24;
-        buf[1] = (wc & 0x00FF0000) >> 16;
-        buf[2] = (wc & 0x0000FF00) >> 8;
-        buf[3] = wc & 0x000000FF;
-    }
-    return 4;
-}
-
-/*
- * 50220: ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS)
- * 50221: ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow
- *        1 byte Kana)
- * 50222: ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte
- *        Kana - SO/SI)
- *
- * MultiByteToWideChar() and WideCharToMultiByte() behave differently
- * depending on Windows version.  On XP, WideCharToMultiByte() doesn't
- * terminate result sequence with ascii escape.  But Vista does.
- * Use MLang instead.
- */
-
-#define ISO2022_MODE(cs, shift) (((cs) << 8) | (shift))
-#define ISO2022_MODE_CS(mode) (((mode) >> 8) & 0xFF)
-#define ISO2022_MODE_SHIFT(mode) ((mode) & 0xFF)
-
-#define ISO2022_SI  0
-#define ISO2022_SO  1
-
-/* shift in */
-static const char iso2022_SI_seq[] = "\x0F";
-/* shift out */
-static const char iso2022_SO_seq[] = "\x0E";
-
-typedef struct iso2022_esc_t iso2022_esc_t;
-struct iso2022_esc_t {
-    const char *esc;
-    int esc_len;
-    int len;
-    int cs;
-};
-
-#define ISO2022JP_CS_ASCII            0
-#define ISO2022JP_CS_JISX0201_ROMAN   1
-#define ISO2022JP_CS_JISX0201_KANA    2
-#define ISO2022JP_CS_JISX0208_1978    3
-#define ISO2022JP_CS_JISX0208_1983    4
-#define ISO2022JP_CS_JISX0212         5
-
-static iso2022_esc_t iso2022jp_esc[] = {
-    {"\x1B\x28\x42", 3, 1, ISO2022JP_CS_ASCII},
-    {"\x1B\x28\x4A", 3, 1, ISO2022JP_CS_JISX0201_ROMAN},
-    {"\x1B\x28\x49", 3, 1, ISO2022JP_CS_JISX0201_KANA},
-    {"\x1B\x24\x40", 3, 2, ISO2022JP_CS_JISX0208_1983}, /* unify 1978 with 1983 */
-    {"\x1B\x24\x42", 3, 2, ISO2022JP_CS_JISX0208_1983},
-    {"\x1B\x24\x28\x44", 4, 2, ISO2022JP_CS_JISX0212},
-    {NULL, 0, 0, 0}
-};
-
-static int
-iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    char tmp[MB_CHAR_MAX];
-    int insize;
-    HRESULT hr;
-    DWORD dummy = 0;
-    int len;
-    int esc_len;
-    int cs;
-    int shift;
-    int i;
-
-    if (buf[0] == 0x1B)
-    {
-        for (i = 0; iesc[i].esc != NULL; ++i)
-        {
-            esc_len = iesc[i].esc_len;
-            if (bufsize < esc_len)
-            {
-                if (strncmp((char *)buf, iesc[i].esc, bufsize) == 0)
-                    return seterror(EINVAL);
-            }
-            else
-            {
-                if (strncmp((char *)buf, iesc[i].esc, esc_len) == 0)
-                {
-                    cv->mode = ISO2022_MODE(iesc[i].cs, ISO2022_SI);
-                    *wbufsize = 0;
-                    return esc_len;
-                }
-            }
-        }
-        /* not supported escape sequence */
-        return seterror(EILSEQ);
-    }
-    else if (buf[0] == iso2022_SO_seq[0])
-    {
-        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SO);
-        *wbufsize = 0;
-        return 1;
-    }
-    else if (buf[0] == iso2022_SI_seq[0])
-    {
-        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SI);
-        *wbufsize = 0;
-        return 1;
-    }
-
-    cs = ISO2022_MODE_CS(cv->mode);
-    shift = ISO2022_MODE_SHIFT(cv->mode);
-
-    /* reset the mode for informal sequence */
-    if (buf[0] < 0x20)
-    {
-        cs = ISO2022JP_CS_ASCII;
-        shift = ISO2022_SI;
-    }
-
-    len = iesc[cs].len;
-    if (bufsize < len)
-        return seterror(EINVAL);
-    for (i = 0; i < len; ++i)
-        if (!(buf[i] < 0x80))
-            return seterror(EILSEQ);
-    esc_len = iesc[cs].esc_len;
-    memcpy(tmp, iesc[cs].esc, esc_len);
-    if (shift == ISO2022_SO)
-    {
-        memcpy(tmp + esc_len, iso2022_SO_seq, 1);
-        esc_len += 1;
-    }
-    memcpy(tmp + esc_len, buf, len);
-
-    if ((cv->codepage == 50220 || cv->codepage == 50221
-                || cv->codepage == 50222) && shift == ISO2022_SO)
-    {
-        /* XXX: shift-out cannot be used for mbtowc (both kernel and
-         * mlang) */
-        esc_len = iesc[ISO2022JP_CS_JISX0201_KANA].esc_len;
-        memcpy(tmp, iesc[ISO2022JP_CS_JISX0201_KANA].esc, esc_len);
-        memcpy(tmp + esc_len, buf, len);
-    }
-
-    insize = len + esc_len;
-    hr = ConvertINetMultiByteToUnicode(&dummy, cv->codepage,
-            (const char *)tmp, &insize, (wchar_t *)wbuf, wbufsize);
-    if (hr != S_OK || insize != len + esc_len)
-        return seterror(EILSEQ);
-
-    /* Check for conversion error.  Assuming defaultChar is 0x3F. */
-    /* ascii should be converted from ascii */
-    if (wbuf[0] == buf[0]
-            && cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
-        return seterror(EILSEQ);
-
-    /* reset the mode for informal sequence */
-    if (cv->mode != ISO2022_MODE(cs, shift))
-        cv->mode = ISO2022_MODE(cs, shift);
-
-    return len;
-}
-
-static int
-iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    char tmp[MB_CHAR_MAX];
-    int tmpsize = MB_CHAR_MAX;
-    int insize = wbufsize;
-    HRESULT hr;
-    DWORD dummy = 0;
-    int len;
-    int esc_len = 0;
-    int cs = 0;
-    int shift;
-    int i;
-
-    /*
-     * MultiByte = [escape sequence] + character + [escape sequence]
-     *
-     * Whether trailing escape sequence is added depends on which API is
-     * used (kernel or MLang, and its version).
-     */
-    hr = ConvertINetUnicodeToMultiByte(&dummy, cv->codepage,
-            (const wchar_t *)wbuf, &wbufsize, tmp, &tmpsize);
-    if (hr != S_OK || insize != wbufsize)
-        return seterror(EILSEQ);
-    else if (bufsize < tmpsize)
-        return seterror(E2BIG);
-
-    if (tmpsize == 1)
-    {
-        cs = ISO2022JP_CS_ASCII;
-        esc_len = 0;
-    }
-    else
-    {
-        for (i = 1; iesc[i].esc != NULL; ++i)
-        {
-            esc_len = iesc[i].esc_len;
-            if (strncmp(tmp, iesc[i].esc, esc_len) == 0)
-            {
-                cs = iesc[i].cs;
-                break;
-            }
-        }
-        if (iesc[i].esc == NULL)
-            /* not supported escape sequence */
-            return seterror(EILSEQ);
-    }
-
-    shift = ISO2022_SI;
-    if (tmp[esc_len] == iso2022_SO_seq[0])
-    {
-        shift = ISO2022_SO;
-        esc_len += 1;
-    }
-
-    len = iesc[cs].len;
-
-    /* Check for converting error.  Assuming defaultChar is 0x3F. */
-    /* ascii should be converted from ascii */
-    if (cs == ISO2022JP_CS_ASCII && !(wbuf[0] < 0x80))
-        return seterror(EILSEQ);
-    else if (tmpsize < esc_len + len)
-        return seterror(EILSEQ);
-
-    if (cv->mode == ISO2022_MODE(cs, shift))
-    {
-        /* remove escape sequence */
-        if (esc_len != 0)
-            memmove(tmp, tmp + esc_len, len);
-        esc_len = 0;
-    }
-    else
-    {
-        if (cs == ISO2022JP_CS_ASCII)
-        {
-            esc_len = iesc[ISO2022JP_CS_ASCII].esc_len;
-            memmove(tmp + esc_len, tmp, len);
-            memcpy(tmp, iesc[ISO2022JP_CS_ASCII].esc, esc_len);
-        }
-        if (ISO2022_MODE_SHIFT(cv->mode) == ISO2022_SO)
-        {
-            /* shift-in before changing to other mode */
-            memmove(tmp + 1, tmp, len + esc_len);
-            memcpy(tmp, iso2022_SI_seq, 1);
-            esc_len += 1;
-        }
-    }
-
-    if (bufsize < len + esc_len)
-        return seterror(E2BIG);
-    memcpy(buf, tmp, len + esc_len);
-    cv->mode = ISO2022_MODE(cs, shift);
-    return len + esc_len;
-}
-
-static int
-iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    int esc_len;
-
-    if (cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
-    {
-        esc_len = 0;
-        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
-            esc_len += 1;
-        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
-            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
-        if (bufsize < esc_len)
-            return seterror(E2BIG);
-
-        esc_len = 0;
-        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
-        {
-            memcpy(buf, iso2022_SI_seq, 1);
-            esc_len += 1;
-        }
-        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
-        {
-            memcpy(buf + esc_len, iesc[ISO2022JP_CS_ASCII].esc,
-                    iesc[ISO2022JP_CS_ASCII].esc_len);
-            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
-        }
-        return esc_len;
-    }
-    return 0;
-}
-
-#if defined(MAKE_DLL) && defined(USE_LIBICONV_DLL)
-BOOL WINAPI
-DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
-{
-    switch( fdwReason )
-    {
-    case DLL_PROCESS_ATTACH:
-        hwiniconv = (HMODULE)hinstDLL;
-        break;
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
-#endif
-
-#if defined(MAKE_EXE)
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-int
-main(int argc, char **argv)
-{
-    char *fromcode = NULL;
-    char *tocode = NULL;
-    int i;
-    char inbuf[BUFSIZ];
-    char outbuf[BUFSIZ];
-    const char *pin;
-    char *pout;
-    size_t inbytesleft;
-    size_t outbytesleft;
-    size_t rest = 0;
-    iconv_t cd;
-    size_t r;
-    FILE *in = stdin;
-
-    _setmode(_fileno(stdin), _O_BINARY);
-    _setmode(_fileno(stdout), _O_BINARY);
-
-    for (i = 1; i < argc; ++i)
-    {
-        if (strcmp(argv[i], "-l") == 0)
-        {
-            for (i = 0; codepage_alias[i].name != NULL; ++i)
-                printf("%s\n", codepage_alias[i].name);
-            return 0;
-        }
-
-        if (strcmp(argv[i], "-f") == 0)
-            fromcode = argv[++i];
-        else if (strcmp(argv[i], "-t") == 0)
-            tocode = argv[++i];
-        else
-        {
-            in = fopen(argv[i], "rb");
-            if (in == NULL)
-            {
-                fprintf(stderr, "cannot open %s\n", argv[i]);
-                return 1;
-            }
-            break;
-        }
-    }
-
-    if (fromcode == NULL || tocode == NULL)
-    {
-        printf("usage: %s -f from-enc -t to-enc [file]\n", argv[0]);
-        return 0;
-    }
-
-    cd = iconv_open(tocode, fromcode);
-    if (cd == (iconv_t)(-1))
-    {
-        perror("iconv_open error");
-        return 1;
-    }
-
-    while ((inbytesleft = fread(inbuf + rest, 1, sizeof(inbuf) - rest, in)) != 0
-            || rest != 0)
-    {
-        inbytesleft += rest;
-        pin = inbuf;
-        pout = outbuf;
-        outbytesleft = sizeof(outbuf);
-        r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
-        fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
-        if (r == (size_t)(-1) && errno != E2BIG && (errno != EINVAL || feof(in)))
-        {
-            perror("conversion error");
-            return 1;
-        }
-        memmove(inbuf, pin, inbytesleft);
-        rest = inbytesleft;
-    }
-    pout = outbuf;
-    outbytesleft = sizeof(outbuf);
-    r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
-    fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
-    if (r == (size_t)(-1))
-    {
-        perror("conversion error");
-        return 1;
-    }
-
-    iconv_close(cd);
-
-    return 0;
-}
-#endif
-
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/Makefile b/src/mod/endpoints/mod_gsmopen/win_iconv/Makefile
deleted file mode 100644
index c0969f607f..0000000000
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-
-# comma separated list (e.g. "iconv.dll,libiconv.dll")
-DEFAULT_LIBICONV_DLL ?= \"\"
-
-CFLAGS += -pedantic -Wall
-CFLAGS += -DUSE_LIBICONV_DLL
-CFLAGS += -DDEFAULT_LIBICONV_DLL=$(DEFAULT_LIBICONV_DLL)
-
-all: iconv.dll libiconv.a win_iconv.exe
-
-dist: test win_iconv.zip
-
-iconv.dll: win_iconv.c
-	gcc $(CFLAGS) -c win_iconv.c -DMAKE_DLL
-	dllwrap --dllname iconv.dll --def iconv.def win_iconv.o $(SPECS_FLAGS)
-	strip iconv.dll
-
-libiconv.a: win_iconv.c
-	gcc $(CFLAGS) -c win_iconv.c
-	ar rcs libiconv.a win_iconv.o
-	ranlib libiconv.a
-
-win_iconv.exe: win_iconv.c
-	gcc $(CFLAGS) -s -o win_iconv.exe win_iconv.c -DMAKE_EXE
-
-libmlang.a: mlang.def
-	dlltool --kill-at --input-def mlang.def --output-lib libmlang.a
-
-test:
-	gcc $(CFLAGS) -s -o win_iconv_test.exe win_iconv_test.c
-	./win_iconv_test.exe
-
-win_iconv.zip: msvcrt msvcr70 msvcr71
-	rm -rf win_iconv
-	svn export . win_iconv
-	cp msvcrt/iconv.dll msvcrt/win_iconv.exe win_iconv/
-	mkdir win_iconv/msvcr70
-	cp msvcr70/iconv.dll win_iconv/msvcr70/
-	mkdir win_iconv/msvcr71
-	cp msvcr71/iconv.dll win_iconv/msvcr71/
-	zip -r win_iconv.zip win_iconv
-
-msvcrt:
-	svn export . msvcrt; \
-	cd msvcrt; \
-	$(MAKE);
-
-msvcr70:
-	svn export . msvcr70; \
-	cd msvcr70; \
-	gcc -dumpspecs | sed s/-lmsvcrt/-lmsvcr70/ > specs; \
-	$(MAKE) "SPECS_FLAGS=-specs=$$PWD/specs";
-
-msvcr71:
-	svn export . msvcr71; \
-	cd msvcr71; \
-	gcc -dumpspecs | sed s/-lmsvcrt/-lmsvcr71/ > specs; \
-	$(MAKE) "SPECS_FLAGS=-specs=$$PWD/specs";
-
-clean:
-	rm -f win_iconv.exe
-	rm -f win_iconv.o
-	rm -f iconv.dll
-	rm -f libiconv.a
-	rm -f win_iconv_test.exe
-	rm -f libmlang.a
-	rm -rf win_iconv
-	rm -rf win_iconv.zip
-	rm -rf msvcrt
-	rm -rf msvcr70
-	rm -rf msvcr71
-
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.def b/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.def
deleted file mode 100644
index f609c86a59..0000000000
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.def
+++ /dev/null
@@ -1,24 +0,0 @@
-LIBRARY ICONV.DLL
-EXPORTS
-  iconv
-  iconv_open
-  iconv_close
-  iconvctl
-  libiconv=iconv
-  libiconv_open=iconv_open
-  libiconv_close=iconv_close
-  libiconvctl=iconvctl
-;; libiconv-1.11.dll
-;; TODO for binary compatibility
-;  _libiconv_version @1
-;  aliases2_lookup @2
-;  aliases_lookup @3
-;  iconv_canonicalize @4
-;  libiconv @5
-;  libiconv_close @6
-;  libiconv_open @7
-;  libiconv_relocate @8
-;  libiconv_set_relocation_prefix @9
-;  libiconvctl @10
-;  libiconvlist @11
-;  locale_charset @12
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.h b/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.h
deleted file mode 100644
index 455be3b6b7..0000000000
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stddef.h>
-typedef void* iconv_t;
-iconv_t iconv_open(const char *tocode, const char *fromcode);
-int iconv_close(iconv_t cd);
-size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.def b/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.def
deleted file mode 100644
index cb475aeea8..0000000000
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.def
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBRARY MLANG.DLL
-EXPORTS
-  ConvertINetMultiByteToUnicode@24
-  ;; ConvertINetReset (not documented)
-  ConvertINetString@28
-  ConvertINetUnicodeToMultiByte@24
-  IsConvertINetStringAvailable@8
-  LcidToRfc1766A@12
-  LcidToRfc1766W@12
-  Rfc1766ToLcidA@8
-  Rfc1766ToLcidW@8
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.h b/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.h
deleted file mode 100644
index 5cbf779c92..0000000000
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.h
+++ /dev/null
@@ -1,54 +0,0 @@
-HRESULT WINAPI ConvertINetString(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnSrcSize,
-    LPBYTE lpDstStr,
-    LPINT lpnDstSize
-);
-
-HRESULT WINAPI ConvertINetMultiByteToUnicode(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnMultiCharCount,
-    LPWSTR lpDstStr,
-    LPINT lpnWideCharCount
-);
-
-HRESULT WINAPI ConvertINetUnicodeToMultiByte(
-    LPDWORD lpdwMode,
-    DWORD dwEncoding,
-    LPCWSTR lpSrcStr,
-    LPINT lpnWideCharCount,
-    LPSTR lpDstStr,
-    LPINT lpnMultiCharCount
-);
-
-HRESULT WINAPI IsConvertINetStringAvailable(
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding
-);
-
-HRESULT WINAPI LcidToRfc1766A(
-    LCID Locale,
-    LPSTR pszRfc1766,
-    int nChar
-);
-
-HRESULT WINAPI LcidToRfc1766W(
-    LCID Locale,
-    LPWSTR pszRfc1766,
-    int nChar
-);
-
-HRESULT WINAPI Rfc1766ToLcidA(
-    LCID *pLocale,
-    LPSTR pszRfc1766
-);
-
-HRESULT WINAPI Rfc1766ToLcidW(
-    LCID *pLocale,
-    LPWSTR pszRfc1766
-);
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/readme.txt b/src/mod/endpoints/mod_gsmopen/win_iconv/readme.txt
deleted file mode 100644
index 31f423dc75..0000000000
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-win_iconv is a iconv library using Win32 API to conversion.
-win_iconv is placed in the public domain.
-Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv.c b/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv.c
deleted file mode 100644
index 7a3eda3e10..0000000000
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv.c
+++ /dev/null
@@ -1,1986 +0,0 @@
-/*
- * iconv library using Win32 API to conversion.
- *
- * This file is placed in the public domain.
- *
- * Last Change: 2009-07-06
- *
- * ENVIRONMENT VARIABLE:
- *     WINICONV_LIBICONV_DLL
- *         If $WINICONV_LIBICONV_DLL is set, win_iconv uses the DLL.  If
- *         loading the DLL or iconv_open() failed, falls back to internal
- *         conversion.  If a few DLL are specified as comma separated list,
- *         the first loadable DLL is used.  The DLL should have iconv_open(),
- *         iconv_close() and iconv().  Or libiconv_open(), libiconv_close()
- *         and libiconv().
- *         (only available when USE_LIBICONV_DLL is defined at compile time)
- *
- * Win32 API does not support strict encoding conversion for some
- * codepage.  And MLang function drop or replace invalid bytes and does
- * not return useful error status as iconv.  This implementation cannot
- * be used for encoding validation purpose.
- */
-
-/* for WC_NO_BEST_FIT_CHARS */
-#ifndef WINVER
-# define WINVER 0x0500
-#endif
-
-#include <windows.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#if 0
-# define MAKE_EXE
-# define MAKE_DLL
-# define USE_LIBICONV_DLL
-#endif
-
-#if !defined(DEFAULT_LIBICONV_DLL)
-# define DEFAULT_LIBICONV_DLL ""
-#endif
-
-#define MB_CHAR_MAX 16
-
-#define UNICODE_MODE_BOM_DONE   1
-#define UNICODE_MODE_SWAPPED    2
-
-#define FLAG_USE_BOM            1
-#define FLAG_TRANSLIT           2 /* //TRANSLIT */
-#define FLAG_IGNORE             4 /* //IGNORE (not implemented) */
-
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned int uint;
-
-typedef void* iconv_t;
-
-iconv_t iconv_open(const char *tocode, const char *fromcode);
-int iconv_close(iconv_t cd);
-size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-
-/* libiconv interface for vim */
-#if defined(MAKE_DLL)
-int
-iconvctl (iconv_t cd, int request, void* argument)
-{
-    /* not supported */
-    return 0;
-}
-#endif
-
-typedef struct compat_t compat_t;
-typedef struct csconv_t csconv_t;
-typedef struct rec_iconv_t rec_iconv_t;
-
-typedef iconv_t (*f_iconv_open)(const char *tocode, const char *fromcode);
-typedef int (*f_iconv_close)(iconv_t cd);
-typedef size_t (*f_iconv)(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-typedef int* (*f_errno)(void);
-typedef int (*f_mbtowc)(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-typedef int (*f_wctomb)(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-typedef int (*f_mblen)(csconv_t *cv, const uchar *buf, int bufsize);
-typedef int (*f_flush)(csconv_t *cv, uchar *buf, int bufsize);
-
-#define COMPAT_IN   1
-#define COMPAT_OUT  2
-
-/* unicode mapping for compatibility with other conversion table. */
-struct compat_t {
-    uint in;
-    uint out;
-    uint flag;
-};
-
-struct csconv_t {
-    int codepage;
-    int flags;
-    f_mbtowc mbtowc;
-    f_wctomb wctomb;
-    f_mblen mblen;
-    f_flush flush;
-    DWORD mode;
-    compat_t *compat;
-};
-
-struct rec_iconv_t {
-    iconv_t cd;
-    f_iconv_close iconv_close;
-    f_iconv iconv;
-    f_errno _errno;
-    csconv_t from;
-    csconv_t to;
-#if defined(USE_LIBICONV_DLL)
-    HMODULE hlibiconv;
-#endif
-};
-
-static int win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
-static int win_iconv_close(iconv_t cd);
-static size_t win_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-
-static int load_mlang();
-static int make_csconv(const char *name, csconv_t *cv);
-static int name_to_codepage(const char *name);
-static uint utf16_to_ucs4(const ushort *wbuf);
-static void ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize);
-static int mbtowc_flags(int codepage);
-static int must_use_null_useddefaultchar(int codepage);
-static char *strrstr(const char *str, const char *token);
-static char *xstrndup(const char *s, size_t n);
-static int seterror(int err);
-
-#if defined(USE_LIBICONV_DLL)
-static int libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
-static PVOID MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size);
-static HMODULE find_imported_module_by_funcname(HMODULE hModule, const char *funcname);
-
-static HMODULE hwiniconv;
-#endif
-
-static int sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-
-static int kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize);
-
-static struct {
-    int codepage;
-    const char *name;
-} codepage_alias[] = {
-    {65001, "CP65001"},
-    {65001, "UTF8"},
-    {65001, "UTF-8"},
-
-    {1200, "CP1200"},
-    {1200, "UTF16LE"},
-    {1200, "UTF-16LE"},
-    {1200, "UCS-2LE"},
-
-    {1201, "CP1201"},
-    {1201, "UTF16BE"},
-    {1201, "UTF-16BE"},
-    {1201, "UCS-2BE"},
-    {1201, "unicodeFFFE"},
-
-    {12000, "CP12000"},
-    {12000, "UTF32LE"},
-    {12000, "UTF-32LE"},
-
-    {12001, "CP12001"},
-    {12001, "UTF32BE"},
-    {12001, "UTF-32BE"},
-
-#ifndef GLIB_COMPILATION
-    /*
-     * Default is big endian.
-     * See rfc2781 4.3 Interpreting text labelled as UTF-16.
-     */
-    {1201, "UTF16"},
-    {1201, "UTF-16"},
-    {12001, "UTF32"},
-    {12001, "UTF-32"},
-#else
-    /* Default is little endian, because the platform is */
-    {1200, "UTF16"},
-    {1200, "UTF-16"},
-    {1200, "UCS-2"},
-    {12000, "UTF32"},
-    {12000, "UTF-32"},
-#endif
-
-    /* copy from libiconv `iconv -l` */
-    /* !IsValidCodePage(367) */
-    {20127, "ANSI_X3.4-1968"},
-    {20127, "ANSI_X3.4-1986"},
-    {20127, "ASCII"},
-    {20127, "CP367"},
-    {20127, "IBM367"},
-    {20127, "ISO-IR-6"},
-    {20127, "ISO646-US"},
-    {20127, "ISO_646.IRV:1991"},
-    {20127, "US"},
-    {20127, "US-ASCII"},
-    {20127, "CSASCII"},
-
-    /* !IsValidCodePage(819) */
-    {1252, "CP819"},
-    {1252, "IBM819"},
-    {28591, "ISO-8859-1"},
-    {28591, "ISO-IR-100"},
-    {28591, "ISO8859-1"},
-    {28591, "ISO_8859-1"},
-    {28591, "ISO_8859-1:1987"},
-    {28591, "L1"},
-    {28591, "LATIN1"},
-    {28591, "CSISOLATIN1"},
-
-    {1250, "CP1250"},
-    {1250, "MS-EE"},
-    {1250, "WINDOWS-1250"},
-
-    {1251, "CP1251"},
-    {1251, "MS-CYRL"},
-    {1251, "WINDOWS-1251"},
-
-    {1252, "CP1252"},
-    {1252, "MS-ANSI"},
-    {1252, "WINDOWS-1252"},
-
-    {1253, "CP1253"},
-    {1253, "MS-GREEK"},
-    {1253, "WINDOWS-1253"},
-
-    {1254, "CP1254"},
-    {1254, "MS-TURK"},
-    {1254, "WINDOWS-1254"},
-
-    {1255, "CP1255"},
-    {1255, "MS-HEBR"},
-    {1255, "WINDOWS-1255"},
-
-    {1256, "CP1256"},
-    {1256, "MS-ARAB"},
-    {1256, "WINDOWS-1256"},
-
-    {1257, "CP1257"},
-    {1257, "WINBALTRIM"},
-    {1257, "WINDOWS-1257"},
-
-    {1258, "CP1258"},
-    {1258, "WINDOWS-1258"},
-
-    {850, "850"},
-    {850, "CP850"},
-    {850, "IBM850"},
-    {850, "CSPC850MULTILINGUAL"},
-
-    /* !IsValidCodePage(862) */
-    {862, "862"},
-    {862, "CP862"},
-    {862, "IBM862"},
-    {862, "CSPC862LATINHEBREW"},
-
-    {866, "866"},
-    {866, "CP866"},
-    {866, "IBM866"},
-    {866, "CSIBM866"},
-
-    /* !IsValidCodePage(154) */
-    {154, "CP154"},
-    {154, "CYRILLIC-ASIAN"},
-    {154, "PT154"},
-    {154, "PTCP154"},
-    {154, "CSPTCP154"},
-
-    /* !IsValidCodePage(1133) */
-    {1133, "CP1133"},
-    {1133, "IBM-CP1133"},
-
-    {874, "CP874"},
-    {874, "WINDOWS-874"},
-
-    /* !IsValidCodePage(51932) */
-    {51932, "CP51932"},
-    {51932, "MS51932"},
-    {51932, "WINDOWS-51932"},
-    {51932, "EUC-JP"},
-
-    {932, "CP932"},
-    {932, "MS932"},
-    {932, "SHIFFT_JIS"},
-    {932, "SHIFFT_JIS-MS"},
-    {932, "SJIS"},
-    {932, "SJIS-MS"},
-    {932, "SJIS-OPEN"},
-    {932, "SJIS-WIN"},
-    {932, "WINDOWS-31J"},
-    {932, "WINDOWS-932"},
-    {932, "CSWINDOWS31J"},
-
-    {50221, "CP50221"},
-    {50221, "ISO-2022-JP"},
-    {50221, "ISO-2022-JP-MS"},
-    {50221, "ISO2022-JP"},
-    {50221, "ISO2022-JP-MS"},
-    {50221, "MS50221"},
-    {50221, "WINDOWS-50221"},
-
-    {936, "CP936"},
-    {936, "GBK"},
-    {936, "MS936"},
-    {936, "WINDOWS-936"},
-
-    {950, "CP950"},
-    {950, "BIG5"},
-
-    {949, "CP949"},
-    {949, "UHC"},
-    {949, "EUC-KR"},
-
-    {1361, "CP1361"},
-    {1361, "JOHAB"},
-
-    {437, "437"},
-    {437, "CP437"},
-    {437, "IBM437"},
-    {437, "CSPC8CODEPAGE437"},
-
-    {737, "CP737"},
-
-    {775, "CP775"},
-    {775, "IBM775"},
-    {775, "CSPC775BALTIC"},
-
-    {852, "852"},
-    {852, "CP852"},
-    {852, "IBM852"},
-    {852, "CSPCP852"},
-
-    /* !IsValidCodePage(853) */
-    {853, "CP853"},
-
-    {855, "855"},
-    {855, "CP855"},
-    {855, "IBM855"},
-    {855, "CSIBM855"},
-
-    {857, "857"},
-    {857, "CP857"},
-    {857, "IBM857"},
-    {857, "CSIBM857"},
-
-    /* !IsValidCodePage(858) */
-    {858, "CP858"},
-
-    {860, "860"},
-    {860, "CP860"},
-    {860, "IBM860"},
-    {860, "CSIBM860"},
-
-    {861, "861"},
-    {861, "CP-IS"},
-    {861, "CP861"},
-    {861, "IBM861"},
-    {861, "CSIBM861"},
-
-    {863, "863"},
-    {863, "CP863"},
-    {863, "IBM863"},
-    {863, "CSIBM863"},
-
-    {864, "CP864"},
-    {864, "IBM864"},
-    {864, "CSIBM864"},
-
-    {865, "865"},
-    {865, "CP865"},
-    {865, "IBM865"},
-    {865, "CSIBM865"},
-
-    {869, "869"},
-    {869, "CP-GR"},
-    {869, "CP869"},
-    {869, "IBM869"},
-    {869, "CSIBM869"},
-
-    /* !IsValidCodePage(1152) */
-    {1125, "CP1125"},
-
-    /*
-     * Code Page Identifiers
-     * http://msdn2.microsoft.com/en-us/library/ms776446.aspx
-     */
-    {37, "IBM037"}, /* IBM EBCDIC US-Canada */
-    {437, "IBM437"}, /* OEM United States */
-    {500, "IBM500"}, /* IBM EBCDIC International */
-    {708, "ASMO-708"}, /* Arabic (ASMO 708) */
-    /* 709 		Arabic (ASMO-449+, BCON V4) */
-    /* 710 		Arabic - Transparent Arabic */
-    {720, "DOS-720"}, /* Arabic (Transparent ASMO); Arabic (DOS) */
-    {737, "ibm737"}, /* OEM Greek (formerly 437G); Greek (DOS) */
-    {775, "ibm775"}, /* OEM Baltic; Baltic (DOS) */
-    {850, "ibm850"}, /* OEM Multilingual Latin 1; Western European (DOS) */
-    {852, "ibm852"}, /* OEM Latin 2; Central European (DOS) */
-    {855, "IBM855"}, /* OEM Cyrillic (primarily Russian) */
-    {857, "ibm857"}, /* OEM Turkish; Turkish (DOS) */
-    {858, "IBM00858"}, /* OEM Multilingual Latin 1 + Euro symbol */
-    {860, "IBM860"}, /* OEM Portuguese; Portuguese (DOS) */
-    {861, "ibm861"}, /* OEM Icelandic; Icelandic (DOS) */
-    {862, "DOS-862"}, /* OEM Hebrew; Hebrew (DOS) */
-    {863, "IBM863"}, /* OEM French Canadian; French Canadian (DOS) */
-    {864, "IBM864"}, /* OEM Arabic; Arabic (864) */
-    {865, "IBM865"}, /* OEM Nordic; Nordic (DOS) */
-    {866, "cp866"}, /* OEM Russian; Cyrillic (DOS) */
-    {869, "ibm869"}, /* OEM Modern Greek; Greek, Modern (DOS) */
-    {870, "IBM870"}, /* IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2 */
-    {874, "windows-874"}, /* ANSI/OEM Thai (same as 28605, ISO 8859-15); Thai (Windows) */
-    {875, "cp875"}, /* IBM EBCDIC Greek Modern */
-    {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */
-    {932, "shift-jis"}, /* alternative name for it */
-    {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */
-    {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */
-    {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */
-    {1026, "IBM1026"}, /* IBM EBCDIC Turkish (Latin 5) */
-    {1047, "IBM01047"}, /* IBM EBCDIC Latin 1/Open System */
-    {1140, "IBM01140"}, /* IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro) */
-    {1141, "IBM01141"}, /* IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro) */
-    {1142, "IBM01142"}, /* IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro) */
-    {1143, "IBM01143"}, /* IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro) */
-    {1144, "IBM01144"}, /* IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro) */
-    {1145, "IBM01145"}, /* IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro) */
-    {1146, "IBM01146"}, /* IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro) */
-    {1147, "IBM01147"}, /* IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro) */
-    {1148, "IBM01148"}, /* IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro) */
-    {1149, "IBM01149"}, /* IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro) */
-    {1250, "windows-1250"}, /* ANSI Central European; Central European (Windows) */
-    {1251, "windows-1251"}, /* ANSI Cyrillic; Cyrillic (Windows) */
-    {1252, "windows-1252"}, /* ANSI Latin 1; Western European (Windows) */
-    {1253, "windows-1253"}, /* ANSI Greek; Greek (Windows) */
-    {1254, "windows-1254"}, /* ANSI Turkish; Turkish (Windows) */
-    {1255, "windows-1255"}, /* ANSI Hebrew; Hebrew (Windows) */
-    {1256, "windows-1256"}, /* ANSI Arabic; Arabic (Windows) */
-    {1257, "windows-1257"}, /* ANSI Baltic; Baltic (Windows) */
-    {1258, "windows-1258"}, /* ANSI/OEM Vietnamese; Vietnamese (Windows) */
-    {1361, "Johab"}, /* Korean (Johab) */
-    {10000, "macintosh"}, /* MAC Roman; Western European (Mac) */
-    {10001, "x-mac-japanese"}, /* Japanese (Mac) */
-    {10002, "x-mac-chinesetrad"}, /* MAC Traditional Chinese (Big5); Chinese Traditional (Mac) */
-    {10003, "x-mac-korean"}, /* Korean (Mac) */
-    {10004, "x-mac-arabic"}, /* Arabic (Mac) */
-    {10005, "x-mac-hebrew"}, /* Hebrew (Mac) */
-    {10006, "x-mac-greek"}, /* Greek (Mac) */
-    {10007, "x-mac-cyrillic"}, /* Cyrillic (Mac) */
-    {10008, "x-mac-chinesesimp"}, /* MAC Simplified Chinese (GB 2312); Chinese Simplified (Mac) */
-    {10010, "x-mac-romanian"}, /* Romanian (Mac) */
-    {10017, "x-mac-ukrainian"}, /* Ukrainian (Mac) */
-    {10021, "x-mac-thai"}, /* Thai (Mac) */
-    {10029, "x-mac-ce"}, /* MAC Latin 2; Central European (Mac) */
-    {10079, "x-mac-icelandic"}, /* Icelandic (Mac) */
-    {10081, "x-mac-turkish"}, /* Turkish (Mac) */
-    {10082, "x-mac-croatian"}, /* Croatian (Mac) */
-    {20000, "x-Chinese_CNS"}, /* CNS Taiwan; Chinese Traditional (CNS) */
-    {20001, "x-cp20001"}, /* TCA Taiwan */
-    {20002, "x_Chinese-Eten"}, /* Eten Taiwan; Chinese Traditional (Eten) */
-    {20003, "x-cp20003"}, /* IBM5550 Taiwan */
-    {20004, "x-cp20004"}, /* TeleText Taiwan */
-    {20005, "x-cp20005"}, /* Wang Taiwan */
-    {20105, "x-IA5"}, /* IA5 (IRV International Alphabet No. 5, 7-bit); Western European (IA5) */
-    {20106, "x-IA5-German"}, /* IA5 German (7-bit) */
-    {20107, "x-IA5-Swedish"}, /* IA5 Swedish (7-bit) */
-    {20108, "x-IA5-Norwegian"}, /* IA5 Norwegian (7-bit) */
-    {20127, "us-ascii"}, /* US-ASCII (7-bit) */
-    {20261, "x-cp20261"}, /* T.61 */
-    {20269, "x-cp20269"}, /* ISO 6937 Non-Spacing Accent */
-    {20273, "IBM273"}, /* IBM EBCDIC Germany */
-    {20277, "IBM277"}, /* IBM EBCDIC Denmark-Norway */
-    {20278, "IBM278"}, /* IBM EBCDIC Finland-Sweden */
-    {20280, "IBM280"}, /* IBM EBCDIC Italy */
-    {20284, "IBM284"}, /* IBM EBCDIC Latin America-Spain */
-    {20285, "IBM285"}, /* IBM EBCDIC United Kingdom */
-    {20290, "IBM290"}, /* IBM EBCDIC Japanese Katakana Extended */
-    {20297, "IBM297"}, /* IBM EBCDIC France */
-    {20420, "IBM420"}, /* IBM EBCDIC Arabic */
-    {20423, "IBM423"}, /* IBM EBCDIC Greek */
-    {20424, "IBM424"}, /* IBM EBCDIC Hebrew */
-    {20833, "x-EBCDIC-KoreanExtended"}, /* IBM EBCDIC Korean Extended */
-    {20838, "IBM-Thai"}, /* IBM EBCDIC Thai */
-    {20866, "koi8-r"}, /* Russian (KOI8-R); Cyrillic (KOI8-R) */
-    {20871, "IBM871"}, /* IBM EBCDIC Icelandic */
-    {20880, "IBM880"}, /* IBM EBCDIC Cyrillic Russian */
-    {20905, "IBM905"}, /* IBM EBCDIC Turkish */
-    {20924, "IBM00924"}, /* IBM EBCDIC Latin 1/Open System (1047 + Euro symbol) */
-    {20932, "EUC-JP"}, /* Japanese (JIS 0208-1990 and 0121-1990) */
-    {20936, "x-cp20936"}, /* Simplified Chinese (GB2312); Chinese Simplified (GB2312-80) */
-    {20949, "x-cp20949"}, /* Korean Wansung */
-    {21025, "cp1025"}, /* IBM EBCDIC Cyrillic Serbian-Bulgarian */
-    /* 21027 		(deprecated) */
-    {21866, "koi8-u"}, /* Ukrainian (KOI8-U); Cyrillic (KOI8-U) */
-    {28591, "iso-8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
-    {28591, "iso8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
-    {28592, "iso-8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
-    {28592, "iso8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
-    {28593, "iso-8859-3"}, /* ISO 8859-3 Latin 3 */
-    {28593, "iso8859-3"}, /* ISO 8859-3 Latin 3 */
-    {28594, "iso-8859-4"}, /* ISO 8859-4 Baltic */
-    {28594, "iso8859-4"}, /* ISO 8859-4 Baltic */
-    {28595, "iso-8859-5"}, /* ISO 8859-5 Cyrillic */
-    {28595, "iso8859-5"}, /* ISO 8859-5 Cyrillic */
-    {28596, "iso-8859-6"}, /* ISO 8859-6 Arabic */
-    {28596, "iso8859-6"}, /* ISO 8859-6 Arabic */
-    {28597, "iso-8859-7"}, /* ISO 8859-7 Greek */
-    {28597, "iso8859-7"}, /* ISO 8859-7 Greek */
-    {28598, "iso-8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
-    {28598, "iso8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
-    {28599, "iso-8859-9"}, /* ISO 8859-9 Turkish */
-    {28599, "iso8859-9"}, /* ISO 8859-9 Turkish */
-    {28603, "iso-8859-13"}, /* ISO 8859-13 Estonian */
-    {28603, "iso8859-13"}, /* ISO 8859-13 Estonian */
-    {28605, "iso-8859-15"}, /* ISO 8859-15 Latin 9 */
-    {28605, "iso8859-15"}, /* ISO 8859-15 Latin 9 */
-    {29001, "x-Europa"}, /* Europa 3 */
-    {38598, "iso-8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
-    {38598, "iso8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
-    {50220, "iso-2022-jp"}, /* ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS) */
-    {50221, "csISO2022JP"}, /* ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana) */
-    {50222, "iso-2022-jp"}, /* ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI) */
-    {50225, "iso-2022-kr"}, /* ISO 2022 Korean */
-    {50225, "iso2022-kr"}, /* ISO 2022 Korean */
-    {50227, "x-cp50227"}, /* ISO 2022 Simplified Chinese; Chinese Simplified (ISO 2022) */
-    /* 50229 		ISO 2022 Traditional Chinese */
-    /* 50930 		EBCDIC Japanese (Katakana) Extended */
-    /* 50931 		EBCDIC US-Canada and Japanese */
-    /* 50933 		EBCDIC Korean Extended and Korean */
-    /* 50935 		EBCDIC Simplified Chinese Extended and Simplified Chinese */
-    /* 50936 		EBCDIC Simplified Chinese */
-    /* 50937 		EBCDIC US-Canada and Traditional Chinese */
-    /* 50939 		EBCDIC Japanese (Latin) Extended and Japanese */
-    {51932, "euc-jp"}, /* EUC Japanese */
-    {51936, "EUC-CN"}, /* EUC Simplified Chinese; Chinese Simplified (EUC) */
-    {51949, "euc-kr"}, /* EUC Korean */
-    /* 51950 		EUC Traditional Chinese */
-    {52936, "hz-gb-2312"}, /* HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ) */
-    {54936, "GB18030"}, /* Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030) */
-    {57002, "x-iscii-de"}, /* ISCII Devanagari */
-    {57003, "x-iscii-be"}, /* ISCII Bengali */
-    {57004, "x-iscii-ta"}, /* ISCII Tamil */
-    {57005, "x-iscii-te"}, /* ISCII Telugu */
-    {57006, "x-iscii-as"}, /* ISCII Assamese */
-    {57007, "x-iscii-or"}, /* ISCII Oriya */
-    {57008, "x-iscii-ka"}, /* ISCII Kannada */
-    {57009, "x-iscii-ma"}, /* ISCII Malayalam */
-    {57010, "x-iscii-gu"}, /* ISCII Gujarati */
-    {57011, "x-iscii-pa"}, /* ISCII Punjabi */
-
-    {0, NULL}
-};
-
-/*
- * SJIS SHIFTJIS table              CP932 table
- * ---- --------------------------- --------------------------------
- *   5C U+00A5 YEN SIGN             U+005C REVERSE SOLIDUS
- *   7E U+203E OVERLINE             U+007E TILDE
- * 815C U+2014 EM DASH              U+2015 HORIZONTAL BAR
- * 815F U+005C REVERSE SOLIDUS      U+FF3C FULLWIDTH REVERSE SOLIDUS
- * 8160 U+301C WAVE DASH            U+FF5E FULLWIDTH TILDE
- * 8161 U+2016 DOUBLE VERTICAL LINE U+2225 PARALLEL TO
- * 817C U+2212 MINUS SIGN           U+FF0D FULLWIDTH HYPHEN-MINUS
- * 8191 U+00A2 CENT SIGN            U+FFE0 FULLWIDTH CENT SIGN
- * 8192 U+00A3 POUND SIGN           U+FFE1 FULLWIDTH POUND SIGN
- * 81CA U+00AC NOT SIGN             U+FFE2 FULLWIDTH NOT SIGN
- *
- * EUC-JP and ISO-2022-JP should be compatible with CP932.
- *
- * Kernel and MLang have different Unicode mapping table.  Make sure
- * which API is used.
- */
-static compat_t cp932_compat[] = {
-    {0x00A5, 0x005C, COMPAT_OUT},
-    {0x203E, 0x007E, COMPAT_OUT},
-    {0x2014, 0x2015, COMPAT_OUT},
-    {0x301C, 0xFF5E, COMPAT_OUT},
-    {0x2016, 0x2225, COMPAT_OUT},
-    {0x2212, 0xFF0D, COMPAT_OUT},
-    {0x00A2, 0xFFE0, COMPAT_OUT},
-    {0x00A3, 0xFFE1, COMPAT_OUT},
-    {0x00AC, 0xFFE2, COMPAT_OUT},
-    {0, 0, 0}
-};
-
-static compat_t cp20932_compat[] = {
-    {0x00A5, 0x005C, COMPAT_OUT},
-    {0x203E, 0x007E, COMPAT_OUT},
-    {0x2014, 0x2015, COMPAT_OUT},
-    {0xFF5E, 0x301C, COMPAT_OUT|COMPAT_IN},
-    {0x2225, 0x2016, COMPAT_OUT|COMPAT_IN},
-    {0xFF0D, 0x2212, COMPAT_OUT|COMPAT_IN},
-    {0xFFE0, 0x00A2, COMPAT_OUT|COMPAT_IN},
-    {0xFFE1, 0x00A3, COMPAT_OUT|COMPAT_IN},
-    {0xFFE2, 0x00AC, COMPAT_OUT|COMPAT_IN},
-    {0, 0, 0}
-};
-
-static compat_t *cp51932_compat = cp932_compat;
-
-/* cp20932_compat for kernel.  cp932_compat for mlang. */
-static compat_t *cp5022x_compat = cp932_compat;
-
-typedef HRESULT (WINAPI *CONVERTINETSTRING)(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnSrcSize,
-    LPBYTE lpDstStr,
-    LPINT lpnDstSize
-);
-typedef HRESULT (WINAPI *CONVERTINETMULTIBYTETOUNICODE)(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnMultiCharCount,
-    LPWSTR lpDstStr,
-    LPINT lpnWideCharCount
-);
-typedef HRESULT (WINAPI *CONVERTINETUNICODETOMULTIBYTE)(
-    LPDWORD lpdwMode,
-    DWORD dwEncoding,
-    LPCWSTR lpSrcStr,
-    LPINT lpnWideCharCount,
-    LPSTR lpDstStr,
-    LPINT lpnMultiCharCount
-);
-typedef HRESULT (WINAPI *ISCONVERTINETSTRINGAVAILABLE)(
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding
-);
-typedef HRESULT (WINAPI *LCIDTORFC1766A)(
-    LCID Locale,
-    LPSTR pszRfc1766,
-    int nChar
-);
-typedef HRESULT (WINAPI *LCIDTORFC1766W)(
-    LCID Locale,
-    LPWSTR pszRfc1766,
-    int nChar
-);
-typedef HRESULT (WINAPI *RFC1766TOLCIDA)(
-    LCID *pLocale,
-    LPSTR pszRfc1766
-);
-typedef HRESULT (WINAPI *RFC1766TOLCIDW)(
-    LCID *pLocale,
-    LPWSTR pszRfc1766
-);
-static CONVERTINETSTRING ConvertINetString;
-static CONVERTINETMULTIBYTETOUNICODE ConvertINetMultiByteToUnicode;
-static CONVERTINETUNICODETOMULTIBYTE ConvertINetUnicodeToMultiByte;
-static ISCONVERTINETSTRINGAVAILABLE IsConvertINetStringAvailable;
-static LCIDTORFC1766A LcidToRfc1766A;
-static RFC1766TOLCIDA Rfc1766ToLcidA;
-
-static int
-load_mlang()
-{
-    HMODULE h;
-    if (ConvertINetString != NULL)
-        return TRUE;
-    h = LoadLibrary("mlang.dll");
-    if (!h)
-        return FALSE;
-    ConvertINetString = (CONVERTINETSTRING)GetProcAddress(h, "ConvertINetString");
-    ConvertINetMultiByteToUnicode = (CONVERTINETMULTIBYTETOUNICODE)GetProcAddress(h, "ConvertINetMultiByteToUnicode");
-    ConvertINetUnicodeToMultiByte = (CONVERTINETUNICODETOMULTIBYTE)GetProcAddress(h, "ConvertINetUnicodeToMultiByte");
-    IsConvertINetStringAvailable = (ISCONVERTINETSTRINGAVAILABLE)GetProcAddress(h, "IsConvertINetStringAvailable");
-    LcidToRfc1766A = (LCIDTORFC1766A)GetProcAddress(h, "LcidToRfc1766A");
-    Rfc1766ToLcidA = (RFC1766TOLCIDA)GetProcAddress(h, "Rfc1766ToLcidA");
-    return TRUE;
-}
-
-iconv_t
-iconv_open(const char *tocode, const char *fromcode)
-{
-    rec_iconv_t *cd;
-
-    cd = (rec_iconv_t *)calloc(1, sizeof(rec_iconv_t));
-    if (cd == NULL)
-        return (iconv_t)(-1);
-
-#if defined(USE_LIBICONV_DLL)
-    errno = 0;
-    if (libiconv_iconv_open(cd, tocode, fromcode))
-        return (iconv_t)cd;
-#endif
-
-    /* reset the errno to prevent reporting wrong error code.
-     * 0 for unsorted error. */
-    errno = 0;
-    if (win_iconv_open(cd, tocode, fromcode))
-        return (iconv_t)cd;
-
-    free(cd);
-
-    return (iconv_t)(-1);
-}
-
-int
-iconv_close(iconv_t _cd)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    int r = cd->iconv_close(cd->cd);
-    int e = *(cd->_errno());
-#if defined(USE_LIBICONV_DLL)
-    if (cd->hlibiconv != NULL)
-        FreeLibrary(cd->hlibiconv);
-#endif
-    free(cd);
-    errno = e;
-    return r;
-}
-
-size_t
-iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    size_t r = cd->iconv(cd->cd, inbuf, inbytesleft, outbuf, outbytesleft);
-    errno = *(cd->_errno());
-    return r;
-}
-
-static int
-win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
-{
-    if (!make_csconv(fromcode, &cd->from) || !make_csconv(tocode, &cd->to))
-        return FALSE;
-    cd->iconv_close = win_iconv_close;
-    cd->iconv = win_iconv;
-    cd->_errno = _errno;
-    cd->cd = (iconv_t)cd;
-    return TRUE;
-}
-
-static int
-win_iconv_close(iconv_t cd)
-{
-    return 0;
-}
-
-static size_t
-win_iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    ushort wbuf[MB_CHAR_MAX]; /* enough room for one character */
-    int insize;
-    int outsize;
-    int wsize;
-    DWORD frommode;
-    DWORD tomode;
-    uint wc;
-    compat_t *cp;
-    int i;
-
-    if (inbuf == NULL || *inbuf == NULL)
-    {
-        if (outbuf != NULL && *outbuf != NULL && cd->to.flush != NULL)
-        {
-            tomode = cd->to.mode;
-            outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, *outbytesleft);
-            if (outsize == -1)
-            {
-                cd->to.mode = tomode;
-                return (size_t)(-1);
-            }
-            *outbuf += outsize;
-            *outbytesleft -= outsize;
-        }
-        cd->from.mode = 0;
-        cd->to.mode = 0;
-        return 0;
-    }
-
-    while (*inbytesleft != 0)
-    {
-        frommode = cd->from.mode;
-        tomode = cd->to.mode;
-        wsize = MB_CHAR_MAX;
-
-        insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, *inbytesleft, wbuf, &wsize);
-        if (insize == -1)
-        {
-            cd->from.mode = frommode;
-            return (size_t)(-1);
-        }
-
-        if (wsize == 0)
-        {
-            *inbuf += insize;
-            *inbytesleft -= insize;
-            continue;
-        }
-
-        if (cd->from.compat != NULL)
-        {
-            wc = utf16_to_ucs4(wbuf);
-            cp = cd->from.compat;
-            for (i = 0; cp[i].in != 0; ++i)
-            {
-                if ((cp[i].flag & COMPAT_IN) && cp[i].out == wc)
-                {
-                    ucs4_to_utf16(cp[i].in, wbuf, &wsize);
-                    break;
-                }
-            }
-        }
-
-        if (cd->to.compat != NULL)
-        {
-            wc = utf16_to_ucs4(wbuf);
-            cp = cd->to.compat;
-            for (i = 0; cp[i].in != 0; ++i)
-            {
-                if ((cp[i].flag & COMPAT_OUT) && cp[i].in == wc)
-                {
-                    ucs4_to_utf16(cp[i].out, wbuf, &wsize);
-                    break;
-                }
-            }
-        }
-
-        outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, *outbytesleft);
-        if (outsize == -1)
-        {
-            cd->from.mode = frommode;
-            cd->to.mode = tomode;
-            return (size_t)(-1);
-        }
-
-        *inbuf += insize;
-        *outbuf += outsize;
-        *inbytesleft -= insize;
-        *outbytesleft -= outsize;
-    }
-
-    return 0;
-}
-
-static int
-make_csconv(const char *_name, csconv_t *cv)
-{
-    CPINFOEX cpinfoex;
-    int use_compat = TRUE;
-    int flag = 0;
-    char *name;
-    char *p;
-
-    name = xstrndup(_name, strlen(_name));
-    if (name == NULL)
-        return FALSE;
-
-    /* check for option "enc_name//opt1//opt2" */
-    while ((p = strrstr(name, "//")) != NULL)
-    {
-        if (_stricmp(p + 2, "nocompat") == 0)
-            use_compat = FALSE;
-        else if (_stricmp(p + 2, "translit") == 0)
-            flag |= FLAG_TRANSLIT;
-        else if (_stricmp(p + 2, "ignore") == 0)
-            flag |= FLAG_IGNORE;
-        *p = 0;
-    }
-
-    cv->mode = 0;
-    cv->flags = flag;
-    cv->mblen = NULL;
-    cv->flush = NULL;
-    cv->compat = NULL;
-    cv->codepage = name_to_codepage(name);
-    if (cv->codepage == 1200 || cv->codepage == 1201)
-    {
-        cv->mbtowc = utf16_mbtowc;
-        cv->wctomb = utf16_wctomb;
-        if (_stricmp(name, "UTF-16") == 0 || _stricmp(name, "UTF16") == 0)
-            cv->flags |= FLAG_USE_BOM;
-    }
-    else if (cv->codepage == 12000 || cv->codepage == 12001)
-    {
-        cv->mbtowc = utf32_mbtowc;
-        cv->wctomb = utf32_wctomb;
-        if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0)
-            cv->flags |= FLAG_USE_BOM;
-    }
-    else if (cv->codepage == 65001)
-    {
-        cv->mbtowc = kernel_mbtowc;
-        cv->wctomb = kernel_wctomb;
-        cv->mblen = utf8_mblen;
-    }
-    else if ((cv->codepage == 50220 || cv->codepage == 50221 || cv->codepage == 50222) && load_mlang())
-    {
-        cv->mbtowc = iso2022jp_mbtowc;
-        cv->wctomb = iso2022jp_wctomb;
-        cv->flush = iso2022jp_flush;
-    }
-    else if (cv->codepage == 51932 && load_mlang())
-    {
-        cv->mbtowc = mlang_mbtowc;
-        cv->wctomb = mlang_wctomb;
-        cv->mblen = eucjp_mblen;
-    }
-    else if (IsValidCodePage(cv->codepage)
-	     && GetCPInfoEx(cv->codepage, 0, &cpinfoex) != 0)
-    {
-        cv->mbtowc = kernel_mbtowc;
-        cv->wctomb = kernel_wctomb;
-        if (cpinfoex.MaxCharSize == 1)
-            cv->mblen = sbcs_mblen;
-        else if (cpinfoex.MaxCharSize == 2)
-            cv->mblen = dbcs_mblen;
-	else
-	    cv->mblen = mbcs_mblen;
-    }
-    else
-    {
-        /* not supported */
-        free(name);
-        errno = EINVAL;
-        return FALSE;
-    }
-
-    if (use_compat)
-    {
-        switch (cv->codepage)
-        {
-        case 932: cv->compat = cp932_compat; break;
-        case 20932: cv->compat = cp20932_compat; break;
-        case 51932: cv->compat = cp51932_compat; break;
-        case 50220: case 50221: case 50222: cv->compat = cp5022x_compat; break;
-        }
-    }
-
-    free(name);
-
-    return TRUE;
-}
-
-static int
-name_to_codepage(const char *name)
-{
-    int i;
-
-    if (*name == '\0' ||
-	strcmp(name, "char") == 0)
-        return GetACP();
-    else if (strcmp(name, "wchar_t") == 0)
-        return 1200;
-    else if (_strnicmp(name, "cp", 2) == 0)
-        return atoi(name + 2); /* CP123 */
-    else if ('0' <= name[0] && name[0] <= '9')
-        return atoi(name);     /* 123 */
-    else if (_strnicmp(name, "xx", 2) == 0)
-        return atoi(name + 2); /* XX123 for debug */
-
-    for (i = 0; codepage_alias[i].name != NULL; ++i)
-        if (_stricmp(name, codepage_alias[i].name) == 0)
-            return codepage_alias[i].codepage;
-    return -1;
-}
-
-/*
- * http://www.faqs.org/rfcs/rfc2781.html
- */
-static uint
-utf16_to_ucs4(const ushort *wbuf)
-{
-    uint wc = wbuf[0];
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-        wc = ((wbuf[0] & 0x3FF) << 10) + (wbuf[1] & 0x3FF) + 0x10000;
-    return wc;
-}
-
-static void
-ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize)
-{
-    if (wc < 0x10000)
-    {
-        wbuf[0] = wc;
-        *wbufsize = 1;
-    }
-    else
-    {
-        wc -= 0x10000;
-        wbuf[0] = 0xD800 | ((wc >> 10) & 0x3FF);
-        wbuf[1] = 0xDC00 | (wc & 0x3FF);
-        *wbufsize = 2;
-    }
-}
-
-/*
- * Check if codepage is one of those for which the dwFlags parameter
- * to MultiByteToWideChar() must be zero. Return zero or
- * MB_ERR_INVALID_CHARS.  The docs in Platform SDK for for Windows
- * Server 2003 R2 claims that also codepage 65001 is one of these, but
- * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave
- * out 65001 (UTF-8), and that indeed seems to be the case on XP, it
- * works fine to pass MB_ERR_INVALID_CHARS in dwFlags when converting
- * from UTF-8.
- */
-static int
-mbtowc_flags(int codepage)
-{
-    return (codepage == 50220 || codepage == 50221 ||
-	    codepage == 50222 || codepage == 50225 ||
-	    codepage == 50227 || codepage == 50229 ||
-	    codepage == 52936 || codepage == 54936 ||
-	    (codepage >= 57002 && codepage <= 57011) ||
-	    codepage == 65000 || codepage == 42) ? 0 : MB_ERR_INVALID_CHARS;
-}
-
-/*
- * Check if codepage is one those for which the lpUsedDefaultChar
- * parameter to WideCharToMultiByte() must be NULL.  The docs in
- * Platform SDK for for Windows Server 2003 R2 claims that this is the
- * list below, while the MSDN docs for MSVS2008 claim that it is only
- * for 65000 (UTF-7) and 65001 (UTF-8). This time the earlier Platform
- * SDK seems to be correct, at least for XP.
- */
-static int
-must_use_null_useddefaultchar(int codepage)
-{
-    return (codepage == 65000 || codepage == 65001 ||
-            codepage == 50220 || codepage == 50221 ||
-            codepage == 50222 || codepage == 50225 ||
-            codepage == 50227 || codepage == 50229 ||
-            codepage == 52936 || codepage == 54936 ||
-            (codepage >= 57002 && codepage <= 57011) ||
-            codepage == 42);
-}
-
-static char *
-strrstr(const char *str, const char *token)
-{
-    int len = strlen(token);
-    const char *p = str + strlen(str);
-
-    while (str <= --p)
-        if (p[0] == token[0] && strncmp(p, token, len) == 0)
-            return (char *)p;
-    return NULL;
-}
-
-static char *
-xstrndup(const char *s, size_t n)
-{
-    char *p;
-
-    p = (char *)malloc(n + 1);
-    if (p == NULL)
-        return NULL;
-    memcpy(p, s, n);
-    p[n] = '\0';
-    return p;
-}
-
-static int
-seterror(int err)
-{
-    errno = err;
-    return -1;
-}
-
-#if defined(USE_LIBICONV_DLL)
-static int
-libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
-{
-    HMODULE hlibiconv = NULL;
-    HMODULE hmsvcrt = NULL;
-    char *dllname;
-    const char *p;
-    const char *e;
-    f_iconv_open _iconv_open;
-
-    /*
-     * always try to load dll, so that we can switch dll in runtime.
-     */
-
-    /* XXX: getenv() can't get variable set by SetEnvironmentVariable() */
-    p = getenv("WINICONV_LIBICONV_DLL");
-    if (p == NULL)
-        p = DEFAULT_LIBICONV_DLL;
-    /* parse comma separated value */
-    for ( ; *p != 0; p = (*e == ',') ? e + 1 : e)
-    {
-        e = strchr(p, ',');
-        if (p == e)
-            continue;
-        else if (e == NULL)
-            e = p + strlen(p);
-        dllname = xstrndup(p, e - p);
-        if (dllname == NULL)
-            return FALSE;
-        hlibiconv = LoadLibrary(dllname);
-        free(dllname);
-        if (hlibiconv != NULL)
-        {
-            if (hlibiconv == hwiniconv)
-            {
-                FreeLibrary(hlibiconv);
-                hlibiconv = NULL;
-                continue;
-            }
-            break;
-        }
-    }
-
-    if (hlibiconv == NULL)
-        goto failed;
-
-    hmsvcrt = find_imported_module_by_funcname(hlibiconv, "_errno");
-    if (hmsvcrt == NULL)
-        goto failed;
-
-    _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "libiconv_open");
-    if (_iconv_open == NULL)
-        _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "iconv_open");
-    cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "libiconv_close");
-    if (cd->iconv_close == NULL)
-        cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "iconv_close");
-    cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "libiconv");
-    if (cd->iconv == NULL)
-        cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "iconv");
-    cd->_errno = (f_errno)GetProcAddress(hmsvcrt, "_errno");
-    if (_iconv_open == NULL || cd->iconv_close == NULL
-            || cd->iconv == NULL || cd->_errno == NULL)
-        goto failed;
-
-    cd->cd = _iconv_open(tocode, fromcode);
-    if (cd->cd == (iconv_t)(-1))
-        goto failed;
-
-    cd->hlibiconv = hlibiconv;
-    return TRUE;
-
-failed:
-    if (hlibiconv != NULL)
-        FreeLibrary(hlibiconv);
-    /* do not free hmsvcrt which is obtained by GetModuleHandle() */
-    return FALSE;
-}
-
-/*
- * Reference:
- * http://forums.belution.com/ja/vc/000/234/78s.shtml
- * http://nienie.com/~masapico/api_ImageDirectoryEntryToData.html
- *
- * The formal way is
- *   imagehlp.h or dbghelp.h
- *   imagehlp.lib or dbghelp.lib
- *   ImageDirectoryEntryToData()
- */
-#define TO_DOS_HEADER(base) ((PIMAGE_DOS_HEADER)(base))
-#define TO_NT_HEADERS(base) ((PIMAGE_NT_HEADERS)((LPBYTE)(base) + TO_DOS_HEADER(base)->e_lfanew))
-static PVOID
-MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
-{
-    /* TODO: MappedAsImage? */
-    PIMAGE_DATA_DIRECTORY p;
-    p = TO_NT_HEADERS(Base)->OptionalHeader.DataDirectory + DirectoryEntry;
-    if (p->VirtualAddress == 0) {
-      *Size = 0;
-      return NULL;
-    }
-    *Size = p->Size;
-    return (PVOID)((LPBYTE)Base + p->VirtualAddress);
-}
-
-static HMODULE
-find_imported_module_by_funcname(HMODULE hModule, const char *funcname)
-{
-    DWORD Base;
-    ULONG Size;
-    PIMAGE_IMPORT_DESCRIPTOR Imp;
-    PIMAGE_THUNK_DATA Name;         /* Import Name Table */
-    PIMAGE_IMPORT_BY_NAME ImpName;
-
-    Base = (DWORD)hModule;
-    Imp = MyImageDirectoryEntryToData(
-            (LPVOID)Base,
-            TRUE,
-            IMAGE_DIRECTORY_ENTRY_IMPORT,
-            &Size);
-    if (Imp == NULL)
-        return NULL;
-    for ( ; Imp->OriginalFirstThunk != 0; ++Imp)
-    {
-        Name = (PIMAGE_THUNK_DATA)(Base + Imp->OriginalFirstThunk);
-        for ( ; Name->u1.Ordinal != 0; ++Name)
-        {
-            if (!IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal))
-            {
-                ImpName = (PIMAGE_IMPORT_BY_NAME)
-                    (Base + (DWORD)Name->u1.AddressOfData);
-                if (strcmp((char *)ImpName->Name, funcname) == 0)
-                    return GetModuleHandle((char *)(Base + Imp->Name));
-            }
-        }
-    }
-    return NULL;
-}
-#endif
-
-static int
-sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    return 1;
-}
-
-static int
-dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = IsDBCSLeadByteEx(cv->codepage, buf[0]) ? 2 : 1;
-    if (bufsize < len)
-        return seterror(EINVAL);
-    return len;
-}
-
-static int
-mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = 0;
-
-    if (cv->codepage == 54936) {
-	if (buf[0] <= 0x7F) len = 1;
-	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
-		 bufsize >= 2 &&
-		 ((buf[1] >= 0x40 && buf[1] <= 0x7E) ||
-		  (buf[1] >= 0x80 && buf[1] <= 0xFE))) len = 2;
-	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
-		 bufsize >= 4 &&
-		 buf[1] >= 0x30 && buf[1] <= 0x39) len = 4;
-	else
-	    return seterror(EINVAL);
-	return len;
-    }
-    else
-	return seterror(EINVAL);
-}
-
-static int
-utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = 0;
-
-    if (buf[0] < 0x80) len = 1;
-    else if ((buf[0] & 0xE0) == 0xC0) len = 2;
-    else if ((buf[0] & 0xF0) == 0xE0) len = 3;
-    else if ((buf[0] & 0xF8) == 0xF0) len = 4;
-    else if ((buf[0] & 0xFC) == 0xF8) len = 5;
-    else if ((buf[0] & 0xFE) == 0xFC) len = 6;
-
-    if (len == 0)
-        return seterror(EILSEQ);
-    else if (bufsize < len)
-        return seterror(EINVAL);
-    return len;
-}
-
-static int
-eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    if (buf[0] < 0x80) /* ASCII */
-        return 1;
-    else if (buf[0] == 0x8E) /* JIS X 0201 */
-    {
-        if (bufsize < 2)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[1] && buf[1] <= 0xDF))
-            return seterror(EILSEQ);
-        return 2;
-    }
-    else if (buf[0] == 0x8F) /* JIS X 0212 */
-    {
-        if (bufsize < 3)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[1] && buf[1] <= 0xFE)
-                || !(0xA1 <= buf[2] && buf[2] <= 0xFE))
-            return seterror(EILSEQ);
-        return 3;
-    }
-    else /* JIS X 0208 */
-    {
-        if (bufsize < 2)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[0] && buf[0] <= 0xFE)
-                || !(0xA1 <= buf[1] && buf[1] <= 0xFE))
-            return seterror(EILSEQ);
-        return 2;
-    }
-}
-
-static int
-kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int len;
-
-    len = cv->mblen(cv, buf, bufsize);
-    if (len == -1)
-        return -1;
-    *wbufsize = MultiByteToWideChar(cv->codepage, mbtowc_flags (cv->codepage),
-            (const char *)buf, len, (wchar_t *)wbuf, *wbufsize);
-    if (*wbufsize == 0)
-        return seterror(EILSEQ);
-    return len;
-}
-
-static int
-kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    BOOL usedDefaultChar = 0;
-    BOOL *p = NULL;
-    int flags = 0;
-    int len;
-
-    if (bufsize == 0)
-        return seterror(E2BIG);
-    if (!must_use_null_useddefaultchar(cv->codepage))
-    {
-        p = &usedDefaultChar;
-#ifdef WC_NO_BEST_FIT_CHARS
-        if (!(cv->flags & FLAG_TRANSLIT))
-            flags |= WC_NO_BEST_FIT_CHARS;
-#endif
-    }
-    len = WideCharToMultiByte(cv->codepage, flags,
-            (const wchar_t *)wbuf, wbufsize, (char *)buf, bufsize, NULL, p);
-    if (len == 0)
-    {
-        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-            return seterror(E2BIG);
-        return seterror(EILSEQ);
-    }
-    else if (usedDefaultChar)
-        return seterror(EILSEQ);
-    else if (cv->mblen(cv, buf, len) != len) /* validate result */
-        return seterror(EILSEQ);
-    return len;
-}
-
-/*
- * It seems that the mode (cv->mode) is fixnum.
- * For example, when converting iso-2022-jp(cp50221) to unicode:
- *      in ascii sequence: mode=0xC42C0000
- *   in jisx0208 sequence: mode=0xC42C0001
- * "C42C" is same for each convert session.
- * It should be: ((codepage-1)<<16)|state
- */
-static int
-mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int len;
-    int insize;
-    HRESULT hr;
-
-    len = cv->mblen(cv, buf, bufsize);
-    if (len == -1)
-        return -1;
-    insize = len;
-    hr = ConvertINetMultiByteToUnicode(&cv->mode, cv->codepage,
-            (const char *)buf, &insize, (wchar_t *)wbuf, wbufsize);
-    if (hr != S_OK || insize != len)
-        return seterror(EILSEQ);
-    return len;
-}
-
-static int
-mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    char tmpbuf[MB_CHAR_MAX]; /* enough room for one character */
-    int tmpsize = MB_CHAR_MAX;
-    int insize = wbufsize;
-    HRESULT hr;
-
-    hr = ConvertINetUnicodeToMultiByte(&cv->mode, cv->codepage,
-            (const wchar_t *)wbuf, &wbufsize, tmpbuf, &tmpsize);
-    if (hr != S_OK || insize != wbufsize)
-        return seterror(EILSEQ);
-    else if (bufsize < tmpsize)
-        return seterror(E2BIG);
-    else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize)
-        return seterror(EILSEQ);
-    memcpy(buf, tmpbuf, tmpsize);
-    return tmpsize;
-}
-
-static int
-utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int codepage = cv->codepage;
-
-    /* swap endian: 1200 <-> 1201 */
-    if (cv->mode & UNICODE_MODE_SWAPPED)
-        codepage ^= 1;
-
-    if (bufsize < 2)
-        return seterror(EINVAL);
-    if (codepage == 1200) /* little endian */
-        wbuf[0] = (buf[1] << 8) | buf[0];
-    else if (codepage == 1201) /* big endian */
-        wbuf[0] = (buf[0] << 8) | buf[1];
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (wbuf[0] == 0xFFFE)
-        {
-            cv->mode |= UNICODE_MODE_SWAPPED;
-            *wbufsize = 0;
-            return 2;
-        }
-        else if (wbuf[0] == 0xFEFF)
-        {
-            *wbufsize = 0;
-            return 2;
-        }
-    }
-
-    if (0xDC00 <= wbuf[0] && wbuf[0] <= 0xDFFF)
-        return seterror(EILSEQ);
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-    {
-        if (bufsize < 4)
-            return seterror(EINVAL);
-        if (codepage == 1200) /* little endian */
-            wbuf[1] = (buf[3] << 8) | buf[2];
-        else if (codepage == 1201) /* big endian */
-            wbuf[1] = (buf[2] << 8) | buf[3];
-        if (!(0xDC00 <= wbuf[1] && wbuf[1] <= 0xDFFF))
-            return seterror(EILSEQ);
-        *wbufsize = 2;
-        return 4;
-    }
-    *wbufsize = 1;
-    return 2;
-}
-
-static int
-utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        int r;
-
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (bufsize < 2)
-            return seterror(E2BIG);
-        if (cv->codepage == 1200) /* little endian */
-            memcpy(buf, "\xFF\xFE", 2);
-        else if (cv->codepage == 1201) /* big endian */
-            memcpy(buf, "\xFE\xFF", 2);
-
-        r = utf16_wctomb(cv, wbuf, wbufsize, buf + 2, bufsize - 2);
-        if (r == -1)
-            return -1;
-        return r + 2;
-    }
-
-    if (bufsize < 2)
-        return seterror(E2BIG);
-    if (cv->codepage == 1200) /* little endian */
-    {
-        buf[0] = (wbuf[0] & 0x00FF);
-        buf[1] = (wbuf[0] & 0xFF00) >> 8;
-    }
-    else if (cv->codepage == 1201) /* big endian */
-    {
-        buf[0] = (wbuf[0] & 0xFF00) >> 8;
-        buf[1] = (wbuf[0] & 0x00FF);
-    }
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-    {
-        if (bufsize < 4)
-            return seterror(E2BIG);
-        if (cv->codepage == 1200) /* little endian */
-        {
-            buf[2] = (wbuf[1] & 0x00FF);
-            buf[3] = (wbuf[1] & 0xFF00) >> 8;
-        }
-        else if (cv->codepage == 1201) /* big endian */
-        {
-            buf[2] = (wbuf[1] & 0xFF00) >> 8;
-            buf[3] = (wbuf[1] & 0x00FF);
-        }
-        return 4;
-    }
-    return 2;
-}
-
-static int
-utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int codepage = cv->codepage;
-    uint wc;
-
-    /* swap endian: 12000 <-> 12001 */
-    if (cv->mode & UNICODE_MODE_SWAPPED)
-        codepage ^= 1;
-
-    if (bufsize < 4)
-        return seterror(EINVAL);
-    if (codepage == 12000) /* little endian */
-        wc = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
-    else if (codepage == 12001) /* big endian */
-        wc = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (wc == 0xFFFE0000)
-        {
-            cv->mode |= UNICODE_MODE_SWAPPED;
-            *wbufsize = 0;
-            return 4;
-        }
-        else if (wc == 0x0000FEFF)
-        {
-            *wbufsize = 0;
-            return 4;
-        }
-    }
-
-    if ((0xD800 <= wc && wc <= 0xDFFF) || 0x10FFFF < wc)
-        return seterror(EILSEQ);
-    ucs4_to_utf16(wc, wbuf, wbufsize);
-    return 4;
-}
-
-static int
-utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    uint wc;
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        int r;
-
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (bufsize < 4)
-            return seterror(E2BIG);
-        if (cv->codepage == 12000) /* little endian */
-            memcpy(buf, "\xFF\xFE\x00\x00", 4);
-        else if (cv->codepage == 12001) /* big endian */
-            memcpy(buf, "\x00\x00\xFE\xFF", 4);
-
-        r = utf32_wctomb(cv, wbuf, wbufsize, buf + 4, bufsize - 4);
-        if (r == -1)
-            return -1;
-        return r + 4;
-    }
-
-    if (bufsize < 4)
-        return seterror(E2BIG);
-    wc = utf16_to_ucs4(wbuf);
-    if (cv->codepage == 12000) /* little endian */
-    {
-        buf[0] = wc & 0x000000FF;
-        buf[1] = (wc & 0x0000FF00) >> 8;
-        buf[2] = (wc & 0x00FF0000) >> 16;
-        buf[3] = (wc & 0xFF000000) >> 24;
-    }
-    else if (cv->codepage == 12001) /* big endian */
-    {
-        buf[0] = (wc & 0xFF000000) >> 24;
-        buf[1] = (wc & 0x00FF0000) >> 16;
-        buf[2] = (wc & 0x0000FF00) >> 8;
-        buf[3] = wc & 0x000000FF;
-    }
-    return 4;
-}
-
-/*
- * 50220: ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS)
- * 50221: ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow
- *        1 byte Kana)
- * 50222: ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte
- *        Kana - SO/SI)
- *
- * MultiByteToWideChar() and WideCharToMultiByte() behave differently
- * depending on Windows version.  On XP, WideCharToMultiByte() doesn't
- * terminate result sequence with ascii escape.  But Vista does.
- * Use MLang instead.
- */
-
-#define ISO2022_MODE(cs, shift) (((cs) << 8) | (shift))
-#define ISO2022_MODE_CS(mode) (((mode) >> 8) & 0xFF)
-#define ISO2022_MODE_SHIFT(mode) ((mode) & 0xFF)
-
-#define ISO2022_SI  0
-#define ISO2022_SO  1
-
-/* shift in */
-static const char iso2022_SI_seq[] = "\x0F";
-/* shift out */
-static const char iso2022_SO_seq[] = "\x0E";
-
-typedef struct iso2022_esc_t iso2022_esc_t;
-struct iso2022_esc_t {
-    const char *esc;
-    int esc_len;
-    int len;
-    int cs;
-};
-
-#define ISO2022JP_CS_ASCII            0
-#define ISO2022JP_CS_JISX0201_ROMAN   1
-#define ISO2022JP_CS_JISX0201_KANA    2
-#define ISO2022JP_CS_JISX0208_1978    3
-#define ISO2022JP_CS_JISX0208_1983    4
-#define ISO2022JP_CS_JISX0212         5
-
-static iso2022_esc_t iso2022jp_esc[] = {
-    {"\x1B\x28\x42", 3, 1, ISO2022JP_CS_ASCII},
-    {"\x1B\x28\x4A", 3, 1, ISO2022JP_CS_JISX0201_ROMAN},
-    {"\x1B\x28\x49", 3, 1, ISO2022JP_CS_JISX0201_KANA},
-    {"\x1B\x24\x40", 3, 2, ISO2022JP_CS_JISX0208_1983}, /* unify 1978 with 1983 */
-    {"\x1B\x24\x42", 3, 2, ISO2022JP_CS_JISX0208_1983},
-    {"\x1B\x24\x28\x44", 4, 2, ISO2022JP_CS_JISX0212},
-    {NULL, 0, 0, 0}
-};
-
-static int
-iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    char tmp[MB_CHAR_MAX];
-    int insize;
-    HRESULT hr;
-    DWORD dummy = 0;
-    int len;
-    int esc_len;
-    int cs;
-    int shift;
-    int i;
-
-    if (buf[0] == 0x1B)
-    {
-        for (i = 0; iesc[i].esc != NULL; ++i)
-        {
-            esc_len = iesc[i].esc_len;
-            if (bufsize < esc_len)
-            {
-                if (strncmp((char *)buf, iesc[i].esc, bufsize) == 0)
-                    return seterror(EINVAL);
-            }
-            else
-            {
-                if (strncmp((char *)buf, iesc[i].esc, esc_len) == 0)
-                {
-                    cv->mode = ISO2022_MODE(iesc[i].cs, ISO2022_SI);
-                    *wbufsize = 0;
-                    return esc_len;
-                }
-            }
-        }
-        /* not supported escape sequence */
-        return seterror(EILSEQ);
-    }
-    else if (buf[0] == iso2022_SO_seq[0])
-    {
-        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SO);
-        *wbufsize = 0;
-        return 1;
-    }
-    else if (buf[0] == iso2022_SI_seq[0])
-    {
-        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SI);
-        *wbufsize = 0;
-        return 1;
-    }
-
-    cs = ISO2022_MODE_CS(cv->mode);
-    shift = ISO2022_MODE_SHIFT(cv->mode);
-
-    /* reset the mode for informal sequence */
-    if (buf[0] < 0x20)
-    {
-        cs = ISO2022JP_CS_ASCII;
-        shift = ISO2022_SI;
-    }
-
-    len = iesc[cs].len;
-    if (bufsize < len)
-        return seterror(EINVAL);
-    for (i = 0; i < len; ++i)
-        if (!(buf[i] < 0x80))
-            return seterror(EILSEQ);
-    esc_len = iesc[cs].esc_len;
-    memcpy(tmp, iesc[cs].esc, esc_len);
-    if (shift == ISO2022_SO)
-    {
-        memcpy(tmp + esc_len, iso2022_SO_seq, 1);
-        esc_len += 1;
-    }
-    memcpy(tmp + esc_len, buf, len);
-
-    if ((cv->codepage == 50220 || cv->codepage == 50221
-                || cv->codepage == 50222) && shift == ISO2022_SO)
-    {
-        /* XXX: shift-out cannot be used for mbtowc (both kernel and
-         * mlang) */
-        esc_len = iesc[ISO2022JP_CS_JISX0201_KANA].esc_len;
-        memcpy(tmp, iesc[ISO2022JP_CS_JISX0201_KANA].esc, esc_len);
-        memcpy(tmp + esc_len, buf, len);
-    }
-
-    insize = len + esc_len;
-    hr = ConvertINetMultiByteToUnicode(&dummy, cv->codepage,
-            (const char *)tmp, &insize, (wchar_t *)wbuf, wbufsize);
-    if (hr != S_OK || insize != len + esc_len)
-        return seterror(EILSEQ);
-
-    /* Check for conversion error.  Assuming defaultChar is 0x3F. */
-    /* ascii should be converted from ascii */
-    if (wbuf[0] == buf[0]
-            && cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
-        return seterror(EILSEQ);
-
-    /* reset the mode for informal sequence */
-    if (cv->mode != ISO2022_MODE(cs, shift))
-        cv->mode = ISO2022_MODE(cs, shift);
-
-    return len;
-}
-
-static int
-iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    char tmp[MB_CHAR_MAX];
-    int tmpsize = MB_CHAR_MAX;
-    int insize = wbufsize;
-    HRESULT hr;
-    DWORD dummy = 0;
-    int len;
-    int esc_len;
-    int cs;
-    int shift;
-    int i;
-
-    /*
-     * MultiByte = [escape sequence] + character + [escape sequence]
-     *
-     * Whether trailing escape sequence is added depends on which API is
-     * used (kernel or MLang, and its version).
-     */
-    hr = ConvertINetUnicodeToMultiByte(&dummy, cv->codepage,
-            (const wchar_t *)wbuf, &wbufsize, tmp, &tmpsize);
-    if (hr != S_OK || insize != wbufsize)
-        return seterror(EILSEQ);
-    else if (bufsize < tmpsize)
-        return seterror(E2BIG);
-
-    if (tmpsize == 1)
-    {
-        cs = ISO2022JP_CS_ASCII;
-        esc_len = 0;
-    }
-    else
-    {
-        for (i = 1; iesc[i].esc != NULL; ++i)
-        {
-            esc_len = iesc[i].esc_len;
-            if (strncmp(tmp, iesc[i].esc, esc_len) == 0)
-            {
-                cs = iesc[i].cs;
-                break;
-            }
-        }
-        if (iesc[i].esc == NULL)
-            /* not supported escape sequence */
-            return seterror(EILSEQ);
-    }
-
-    shift = ISO2022_SI;
-    if (tmp[esc_len] == iso2022_SO_seq[0])
-    {
-        shift = ISO2022_SO;
-        esc_len += 1;
-    }
-
-    len = iesc[cs].len;
-
-    /* Check for converting error.  Assuming defaultChar is 0x3F. */
-    /* ascii should be converted from ascii */
-    if (cs == ISO2022JP_CS_ASCII && !(wbuf[0] < 0x80))
-        return seterror(EILSEQ);
-    else if (tmpsize < esc_len + len)
-        return seterror(EILSEQ);
-
-    if (cv->mode == ISO2022_MODE(cs, shift))
-    {
-        /* remove escape sequence */
-        if (esc_len != 0)
-            memmove(tmp, tmp + esc_len, len);
-        esc_len = 0;
-    }
-    else
-    {
-        if (cs == ISO2022JP_CS_ASCII)
-        {
-            esc_len = iesc[ISO2022JP_CS_ASCII].esc_len;
-            memmove(tmp + esc_len, tmp, len);
-            memcpy(tmp, iesc[ISO2022JP_CS_ASCII].esc, esc_len);
-        }
-        if (ISO2022_MODE_SHIFT(cv->mode) == ISO2022_SO)
-        {
-            /* shift-in before changing to other mode */
-            memmove(tmp + 1, tmp, len + esc_len);
-            memcpy(tmp, iso2022_SI_seq, 1);
-            esc_len += 1;
-        }
-    }
-
-    if (bufsize < len + esc_len)
-        return seterror(E2BIG);
-    memcpy(buf, tmp, len + esc_len);
-    cv->mode = ISO2022_MODE(cs, shift);
-    return len + esc_len;
-}
-
-static int
-iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    int esc_len;
-
-    if (cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
-    {
-        esc_len = 0;
-        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
-            esc_len += 1;
-        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
-            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
-        if (bufsize < esc_len)
-            return seterror(E2BIG);
-
-        esc_len = 0;
-        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
-        {
-            memcpy(buf, iso2022_SI_seq, 1);
-            esc_len += 1;
-        }
-        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
-        {
-            memcpy(buf + esc_len, iesc[ISO2022JP_CS_ASCII].esc,
-                    iesc[ISO2022JP_CS_ASCII].esc_len);
-            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
-        }
-        return esc_len;
-    }
-    return 0;
-}
-
-#if defined(MAKE_DLL) && defined(USE_LIBICONV_DLL)
-BOOL WINAPI
-DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
-{
-    switch( fdwReason )
-    {
-    case DLL_PROCESS_ATTACH:
-        hwiniconv = (HMODULE)hinstDLL;
-        break;
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
-#endif
-
-#if defined(MAKE_EXE)
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-int
-main(int argc, char **argv)
-{
-    char *fromcode = NULL;
-    char *tocode = NULL;
-    int i;
-    char inbuf[BUFSIZ];
-    char outbuf[BUFSIZ];
-    const char *pin;
-    char *pout;
-    size_t inbytesleft;
-    size_t outbytesleft;
-    size_t rest = 0;
-    iconv_t cd;
-    size_t r;
-    FILE *in = stdin;
-
-    _setmode(_fileno(stdin), _O_BINARY);
-    _setmode(_fileno(stdout), _O_BINARY);
-
-    for (i = 1; i < argc; ++i)
-    {
-        if (strcmp(argv[i], "-l") == 0)
-        {
-            for (i = 0; codepage_alias[i].name != NULL; ++i)
-                printf("%s\n", codepage_alias[i].name);
-            return 0;
-        }
-
-        if (strcmp(argv[i], "-f") == 0)
-            fromcode = argv[++i];
-        else if (strcmp(argv[i], "-t") == 0)
-            tocode = argv[++i];
-        else
-        {
-            in = fopen(argv[i], "rb");
-            if (in == NULL)
-            {
-                fprintf(stderr, "cannot open %s\n", argv[i]);
-                return 1;
-            }
-            break;
-        }
-    }
-
-    if (fromcode == NULL || tocode == NULL)
-    {
-        printf("usage: %s -f from-enc -t to-enc [file]\n", argv[0]);
-        return 0;
-    }
-
-    cd = iconv_open(tocode, fromcode);
-    if (cd == (iconv_t)(-1))
-    {
-        perror("iconv_open error");
-        return 1;
-    }
-
-    while ((inbytesleft = fread(inbuf + rest, 1, sizeof(inbuf) - rest, in)) != 0
-            || rest != 0)
-    {
-        inbytesleft += rest;
-        pin = inbuf;
-        pout = outbuf;
-        outbytesleft = sizeof(outbuf);
-        r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
-        fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
-        if (r == (size_t)(-1) && errno != E2BIG && (errno != EINVAL || feof(in)))
-        {
-            perror("conversion error");
-            return 1;
-        }
-        memmove(inbuf, pin, inbytesleft);
-        rest = inbytesleft;
-    }
-    pout = outbuf;
-    outbytesleft = sizeof(outbuf);
-    r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
-    fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
-    if (r == (size_t)(-1))
-    {
-        perror("conversion error");
-        return 1;
-    }
-
-    iconv_close(cd);
-
-    return 0;
-}
-#endif
-
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv_test.c b/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv_test.c
deleted file mode 100644
index b2aafa4a57..0000000000
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv_test.c
+++ /dev/null
@@ -1,261 +0,0 @@
-
-#include "win_iconv.c"
-#include <stdio.h>
-
-const char *
-tohex(const char *str, int size)
-{
-    static char buf[BUFSIZ];
-    char *pbuf = buf;
-    int i;
-    buf[0] = 0;
-    for (i = 0; i < size; ++i)
-        pbuf += sprintf(pbuf, "%02X", str[i] & 0xFF);
-    return buf;
-}
-
-const char *
-errstr(int errcode)
-{
-    static char buf[BUFSIZ];
-    switch (errcode)
-    {
-    case 0: return "NOERROR";
-    case EINVAL: return "EINVAL";
-    case EILSEQ: return "EILSEQ";
-    case E2BIG: return "E2BIG";
-    }
-    sprintf(buf, "%d\n", errcode);
-    return buf;
-}
-
-#ifdef USE_LIBICONV_DLL
-int use_dll;
-
-int
-setdll(const char *dllpath)
-{
-    char buf[BUFSIZ];
-    rec_iconv_t cd;
-
-    sprintf(buf, "WINICONV_LIBICONV_DLL=%s", dllpath);
-    putenv(buf);
-    if (libiconv_iconv_open(&cd, "ascii", "ascii"))
-    {
-        FreeLibrary(cd.hlibiconv);
-        use_dll = TRUE;
-        return TRUE;
-    }
-    use_dll = FALSE;
-    return FALSE;
-}
-#endif
-
-/*
- * We can test the codepage that is installed in the system.
- */
-int
-check_enc(const char *encname, int codepage)
-{
-    iconv_t cd;
-    int cp;
-    cd = iconv_open("utf-8", encname);
-    if (cd == (iconv_t)(-1))
-    {
-        printf("%s(%d) IS NOT SUPPORTED: SKIP THE TEST\n", encname, codepage);
-        return FALSE;
-    }
-    cp = ((rec_iconv_t *)cd)->from.codepage;
-    if (cp != codepage)
-    {
-        printf("%s(%d) ALIAS IS MAPPED TO DIFFERENT CODEPAGE (%d)\n", encname, codepage, cp);
-        exit(1);
-    }
-    iconv_close(cd);
-    return TRUE;
-}
-
-int use_dll;
-
-void
-test(const char *from, const char *fromstr, int fromsize, const char *to, const char *tostr, int tosize, int errcode, int bufsize, int line)
-{
-    char outbuf[BUFSIZ];
-    const char *pin;
-    char *pout;
-    size_t inbytesleft;
-    size_t outbytesleft;
-    iconv_t cd;
-    size_t r;
-    char dllpath[_MAX_PATH];
-
-    cd = iconv_open(to, from);
-    if (cd == (iconv_t)(-1))
-    {
-        printf("%s -> %s: NG: INVALID ENCODING NAME: line=%d\n", from, to, line);
-        exit(1);
-    }
-
-#ifdef USE_LIBICONV_DLL
-    if (((rec_iconv_t *)cd)->hlibiconv != NULL)
-        GetModuleFileName(((rec_iconv_t *)cd)->hlibiconv, dllpath, sizeof(dllpath));
-
-    if (use_dll && ((rec_iconv_t *)cd)->hlibiconv == NULL)
-    {
-        printf("%s: %s -> %s: NG: FAILED TO USE DLL: line=%d\n", dllpath, from, to, line);
-        exit(1);
-    }
-    else if (!use_dll && ((rec_iconv_t *)cd)->hlibiconv != NULL)
-    {
-        printf("%s: %s -> %s: NG: DLL IS LOADED UNEXPECTEDLY: line=%d\n", dllpath, from, to, line);
-        exit(1);
-    }
-#endif
-
-    errno = 0;
-
-    pin = fromstr;
-    pout = outbuf;
-    inbytesleft = fromsize;
-    outbytesleft = bufsize;
-    r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
-    if (r != (size_t)(-1))
-        r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
-    *pout = 0;
-
-#ifdef USE_LIBICONV_DLL
-    if (use_dll)
-        printf("%s: ", dllpath);
-#endif
-    printf("%s(%s) -> ", from, tohex(fromstr, fromsize));
-    printf("%s(%s%s%s): ", to, tohex(tostr, tosize),
-            errcode == 0 ? "" : ":",
-            errcode == 0 ? "" : errstr(errcode));
-    if (strcmp(outbuf, tostr) == 0 && errno == errcode)
-        printf("OK\n");
-    else
-    {
-        printf("RESULT(%s:%s): ", tohex(outbuf, sizeof(outbuf) - outbytesleft),
-                errstr(errno));
-        printf("NG: line=%d\n", line);
-        exit(1);
-    }
-}
-
-#define STATIC_STRLEN(arr) (sizeof(arr) - 1)
-
-#define success(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), 0, BUFSIZ, __LINE__)
-#define einval(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), EINVAL, BUFSIZ, __LINE__)
-#define eilseq(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), EILSEQ, BUFSIZ, __LINE__)
-#define e2big(from, fromstr, to, tostr, bufsize) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), E2BIG, bufsize, __LINE__)
-
-int
-main(int argc, char **argv)
-{
-#ifdef USE_LIBICONV_DLL
-    /* test use of dll if $DEFAULT_LIBICONV_DLL was defined. */
-    if (setdll(""))
-    {
-        success("ascii", "ABC", "ascii", "ABC");
-        success("ascii", "ABC", "utf-16be", "\x00\x41\x00\x42\x00\x43");
-    }
-    else
-    {
-        printf("\nDLL TEST IS SKIPPED\n\n");
-    }
-
-    setdll("none");
-#endif
-
-    if (check_enc("ascii", 20127))
-    {
-        success("ascii", "ABC", "ascii", "ABC");
-        /* MSB is dropped.  Hmm... */
-        success("ascii", "\x80\xFF", "ascii", "\x00\x7F");
-    }
-
-    /* unicode (CP1200 CP1201 CP12000 CP12001 CP65001) */
-    if (check_enc("utf-8", 65001)
-            && check_enc("utf-16be", 1201) && check_enc("utf-16le", 1200)
-            && check_enc("utf-32be", 12001) && check_enc("utf-32le", 12000)
-            )
-    {
-        /* Test the BOM behavior
-         * 1. Remove the BOM when "fromcode" is utf-16 or utf-32.
-         * 2. Add the BOM when "tocode" is utf-16 or utf-32.  */
-        success("utf-16", "\xFE\xFF\x01\x02", "utf-16be", "\x01\x02");
-        success("utf-16", "\xFF\xFE\x02\x01", "utf-16be", "\x01\x02");
-        success("utf-32", "\x00\x00\xFE\xFF\x00\x00\x01\x02", "utf-32be", "\x00\x00\x01\x02");
-        success("utf-32", "\xFF\xFE\x00\x00\x02\x01\x00\x00", "utf-32be", "\x00\x00\x01\x02");
-        success("utf-16", "\xFE\xFF\x00\x01", "utf-8", "\x01");
-#ifndef GLIB_COMPILATION
-        success("utf-8", "\x01", "utf-16", "\xFE\xFF\x00\x01");
-        success("utf-8", "\x01", "utf-32", "\x00\x00\xFE\xFF\x00\x00\x00\x01");
-#else
-        success("utf-8", "\x01", "utf-16", "\xFF\xFE\x01\x00");
-        success("utf-8", "\x01", "utf-32", "\xFF\xFE\x00\x00\x01\x00\x00\x00");
-#endif
-
-        success("utf-16be", "\xFE\xFF\x01\x02", "utf-16be", "\xFE\xFF\x01\x02");
-        success("utf-16le", "\xFF\xFE\x02\x01", "utf-16be", "\xFE\xFF\x01\x02");
-        success("utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02", "utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02");
-        success("utf-32le", "\xFF\xFE\x00\x00\x02\x01\x00\x00", "utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02");
-        success("utf-16be", "\xFE\xFF\x00\x01", "utf-8", "\xEF\xBB\xBF\x01");
-        success("utf-8", "\xEF\xBB\xBF\x01", "utf-8", "\xEF\xBB\xBF\x01");
-
-        success("utf-16be", "\x01\x02", "utf-16le", "\x02\x01");
-        success("utf-16le", "\x02\x01", "utf-16be", "\x01\x02");
-        success("utf-16be", "\xFE\xFF", "utf-16le", "\xFF\xFE");
-        success("utf-16le", "\xFF\xFE", "utf-16be", "\xFE\xFF");
-        success("utf-32be", "\x00\x00\x03\x04", "utf-32le", "\x04\x03\x00\x00");
-        success("utf-32le", "\x04\x03\x00\x00", "utf-32be", "\x00\x00\x03\x04");
-        success("utf-32be", "\x00\x00\xFF\xFF", "utf-16be", "\xFF\xFF");
-        success("utf-16be", "\xFF\xFF", "utf-32be", "\x00\x00\xFF\xFF");
-        success("utf-32be", "\x00\x01\x00\x00", "utf-16be", "\xD8\x00\xDC\x00");
-        success("utf-16be", "\xD8\x00\xDC\x00", "utf-32be", "\x00\x01\x00\x00");
-        success("utf-32be", "\x00\x10\xFF\xFF", "utf-16be", "\xDB\xFF\xDF\xFF");
-        success("utf-16be", "\xDB\xFF\xDF\xFF", "utf-32be", "\x00\x10\xFF\xFF");
-        eilseq("utf-32be", "\x00\x11\x00\x00", "utf-16be", "");
-        eilseq("utf-16be", "\xDB\xFF\xE0\x00", "utf-32be", "");
-        success("utf-8", "\xE3\x81\x82", "utf-16be", "\x30\x42");
-        einval("utf-8", "\xE3", "utf-16be", "");
-    }
-
-    /* Japanese (CP932 CP20932 CP50220 CP50221 CP50222 CP51932) */
-    if (check_enc("cp932", 932)
-            && check_enc("cp20932", 20932) && check_enc("euc-jp", 51932)
-            && check_enc("cp50220", 50220) && check_enc("cp50221", 50221)
-            && check_enc("cp50222", 50222) && check_enc("iso-2022-jp", 50221))
-    {
-        /* Test the compatibility for each other Japanese codepage.
-         * And validate the escape sequence handling for iso-2022-jp. */
-        success("utf-16be", "\xFF\x5E", "cp932", "\x81\x60");
-        success("utf-16be", "\x30\x1C", "cp932", "\x81\x60");
-        success("utf-16be", "\xFF\x5E", "cp932//nocompat", "\x81\x60");
-        eilseq("utf-16be", "\x30\x1C", "cp932//nocompat", "");
-        success("euc-jp", "\xA4\xA2", "utf-16be", "\x30\x42");
-        einval("euc-jp", "\xA4\xA2\xA4", "utf-16be", "\x30\x42");
-        eilseq("euc-jp", "\xA4\xA2\xFF\xFF", "utf-16be", "\x30\x42");
-        success("cp932", "\x81\x60", "iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42");
-        success("UTF-16BE", "\xFF\x5E", "iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42");
-        eilseq("UTF-16BE", "\x30\x1C", "iso-2022-jp//nocompat", "");
-        success("UTF-16BE", "\x30\x42\x30\x44", "iso-2022-jp", "\x1B\x24\x42\x24\x22\x24\x24\x1B\x28\x42");
-        success("iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42", "UTF-16BE", "\xFF\x5E");
-    }
-
-    /*
-     * test for //translit
-     * U+FF41 (FULLWIDTH LATIN SMALL LETTER A) <-> U+0062 (LATIN SMALL LETTER A)
-     */
-    eilseq("UTF-16BE", "\xFF\x41", "iso-8859-1", "");
-    success("UTF-16BE", "\xFF\x41", "iso-8859-1//translit", "a");
-
-    /*
-     * TODO:
-     * Test for state after iconv() failed.
-     * Ensure iconv() error is safe and continuable.
-     */
-
-    return 0;
-}
-
diff --git a/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml b/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml
deleted file mode 100644
index 6778ef7cb2..0000000000
--- a/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml
+++ /dev/null
@@ -1,511 +0,0 @@
-<configuration name="khomp.conf" description="Khomp Configuration">
-<!-- Config for all boards -->
-<settings>
-
-<!--
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;; This is the configuration file for the Khomp ;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Endpoint 1.0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--->
-
-<channels>
-<!-- Section for main configurations about channels. -->
-
-<!--
-Name of the dialplan module in use.
-(default = XML)
-
-<param name="dialplan" value="XML"/>
--->
-
-<!--
-Enable/disable generalized echo cancellation in the channel, for calls
-passing inside FreeSWITCH (disabled for bridged calls).
-(default = yes)
-
-<param name="echo-canceller" value="yes"/>
--->
-
-<!--
-Enable/disable AGC (auto gain control). Should be used carefully, as it
-can make line noise really loud.
-(default = yes)
-
-<param name="auto-gain-control" value="yes"/>
--->
-
-<!--
-Enable/disable sending DTMFs out-band as a way to pass detected DTMFs to
-FreeSWITCH. Needed if FreeSWITCH generates digits for us in bridge application
-or is being used for IVR ("URA", in pt_BR).
-(default = yes)
-
-<param name="out-of-band-dtmfs" value="yes"/>
--->
-
-<!--
-Enable/disable DTMF suppression delay. WARNING: if you disable this, DTMFs
-will not be suppressed anymore! You should only use this option if
-"out-of-band-dtmfs" is "no".
-(default = yes)
-
-<param name="suppression-delay" value="yes"/>
--->
-
-<!--
-Adjust connection automagically if a FAX tone is detected.
-(default = yes)
-
-<param name="auto-fax-adjustment" value="yes"/>
--->
-
-<!--
-Time (is seconds) since connection, when we may detect FAX tone and perform
-automagical adjustment. After this, FAX tone detection is ignored.
-Possible values: 0 - 9999
-(default = 30).
-
-<param name="fax-adjustment-timeout" value="30"/>
--->
-
-<!--
-Enable/disable pulse detection (reported as DTMF digits).
-(default = yes)
-
-<param name="pulse-forwarding" value="yes"/>
--->
-
-<!--
-Enable correct standard following for R2/MFC protocol. Disabled by default,
-as using FreeSWITCH behind a PBX may timeout all outgoing calls without this.
-However, you can set this to "yes" if FreeSWITCH is directly connected to a
-CO (central office) or to a fast signaling PBX, and have a correct
-behaviour for condition obtaining/reporting.
-(default = no)
-
-<param name="r2-strict-behaviour" value="no"/>
--->
-
-<!--
-Set the delay (in ms) after sending ringback condition where audio stream
-should be opened for the channel. Limited to 25ms min, 500ms max.
-(default = 250)
-
-<param name="r2-preconnect-wait" value="250"/>
--->
-
-<!--
-Defines the incoming context for calls on E1 channels. Some wildcards are
-accepted, and described in the bottom of this file.
-(default = khomp-DD-LL)
-
-<param name="context-digital" value="khomp-DD-LL"/>
--->
-
-<!--
-Defines the incoming context for calls on FXS channels. Some wildcards are
-accepted, and described in the bottom of this file.
-(default = khomp-DD-CC)
-
-<param name="context-fxs" value="khomp-DD-CC"/>
--->
-
-<!--
-Defines the incoming context for calls on FXO channels. Some wildcards are
-accepted, and described in the bottom of this file.
-(default = khomp-DD-CC)
-
-<param name="context-fxo" value="khomp-DD-CC"/>
--->
-
-<!--
-Defines the incoming context for calls on GSM channels. Some wildcards are
-accepted, and described in the bottom of this file.
-(default = khomp-DD-CC)
-
-<param name="context-gsm-call" value="khomp-DD-CC"/>
--->
-
-<!--
-Defines the incoming context for messages on GSM channels. Some wildcards are
-accepted, and described in the bottom of this file.
-(default = khomp-sms-DD-CC)
-
-<param name="context-gsm-sms" value="khomp-sms-DD-CC"/>
--->
-
-<!--
-Defines the incoming context for calls on Passive Record boards (KPR). Some
-wildcards are accepted, and described in the bottom of this file.
-(default = khomp-DD-CC)
-
-<param name="context-pr" value="khomp-DD-CC"/>
--->
-
-<!--
-Set the logging of messages to console. Possible values (to set more than one,
-separate the values with comma):
-
- errors    - Error messages, when something goes really wrong.
- warnings  - Warnings, used when something might not be going as expected.
- messages  - Generic messages, used to indicate some information.
- events    - Show received K3L events as console messages.
- commands  - Show sent K3L commands as console messages.
- audio     - Enable messages for K3L audio events (very verbose!).
- modem     - Enable messages for data received from KGSM modems.
- link      - Enable logging of link status changes.
- standard  - Special, enable default messages (RECOMMENDED).
- all       - Special, enable ALL messages (should not be used naively).
-
-(default = standard)
-
-<param name="log-to-console" value="standard"/>
--->
-
-<!--
-Set the logging of messages to disk. Possible values (to set more than one,
-separate the values with comma):
-
- errors    - Error messages, when something goes really wrong.
- warnings  - Warnings, used when something might not be going as expected.
- messages  - Generic messages, used to indicate some information.
- events    - Record received K3L events as log messages.
- commands  - Record sent K3L commands as log messages.
- audio     - Enable messages for K3L audio events (very verbose!).
- modem     - Enable messages for data received from KGSM modems.
- link      - Enable logging of link status changes.
- functions - Enable debugging for functions. Should not be used naively!).
- threads   - Enable debugging for threads. Should not be used naively!).
- locks     - Enable debugging for locks. Should not be used naively!).
- streams   - Enable debugging for streams. Should not be used naively!).
- standard  - Special, enable default messages (RECOMMENDED).
- debugging - Special, enable debug messages (should not be used naively).
- all       - Special, enable ALL messages (DO NOT USE THIS!).
-
-(default = standard)
-
-<param name="log-to-disk" value="standard"/>
--->
-
-<!--
-Set the low level tracing. DO NOT USE THIS UNLESS YOU WERE ADVISED TO DO SO.
-Possible values (to set more than one, separate the values with comma):
-
-k3l  - Enable the low level tracing of board's API.
-        If you are using 'kserver', this option will take no effect. For
-        the k3l tracing to proceed, you will need to (re)start kserver
-        with 'debug' option. E.g. '#> kserver start -debug'.
-rdsi - Enable ISDN low level debugging.
-r2   - Enable r2 protocol low level debugging.
-
-(default = <empty>)
-
-<param name="trace" value=""/>
--->
-
-<!--
-Set output volume level. Possible values:
-
-  * '+ N' = increase N times;
-  * '- N' = decrease N times.
-  *   '0' = leave default.
-
-(default = 0)
-
-<param name="output-volume" value="0"/>
--->
-
-<!--
-Set input volume level. Can only be used if AGC (and not pulse detection)
-is enabled on the board configuration. Possible values:
-
-  * '+ N' = increase N times;
-  * '- N' = decrease N times.
-  *   '0' = leave default.
-
-(default = 0)
-
-<param name="input-volume" value="0"/>
--->
-
-<!--
-Sets the account code for calls placed on the channel. The account code may
-be any alphanumeric string
-default = <empty>)
-
-<param name="accountcode" value=""/>
--->
-
-<!--
-Set the language of the channel (useful for selecting audio messages of a
-specific language on answer).
-
-(default = <empty>)
-
-<param name="language" value="pt_BR"/>
--->
-
-<!--
-Sets the global orig (CALLERID) base for FXS boards. This number is added
-to a sequencial number, which is incremented for each FXS board and FXS
-channel in the system.
-(default = 0)
-
-<param name="fxs-global-orig" value="0"/>
--->
-
-<!--
-Sets the numbers (separated by comma) in which the 'pbx-dialtone' from
-FXS boards will be changed to 'co-dialtone' (public tone), when they are
-pressed.
-(default = <empty>)
-
-<param name="fxs-co-dialtone" value="0,90"/>
--->
-
-<!--
-Enable or disable sending number of A throught BINA DTMF signalization to
-a FXS branch.
-(default = yes)
-
-<param name="fxs-bina" value="yes"/>
--->
-
-<!--
-Enables/disables the use of sharp (#) as an end-of-number digit on FXS
-channels for instant dialing. This does not affect special numbers which
-start on sharp, like #8 or #1.
-(default = yes)
-
-<param name="fxs-sharp-dial" value="yes" />
--->
-
-<!--
-This is the delay time to really disconnect a channel after the disconnect
-event arrive. If a connect event comes up in this interval, then the
-disconnection is ignored and the call keeps going on. Values in ms.
-(default = 0)
-
-<param name="disconnect-delay" value="0"/>
--->
-
-<!--
-This timer controls the delay associated with ringback generation in the
-Khomp channel, when the other side *does not send audio* - in other words,
-this is used when calling peers located at VoIP channels.
-Values are in milliseconds.
-(default = 1500)
-
-<param name="delay-ringback-co" value="1500"/>
--->
-
-<!--
-This timer controls the delay associated with ringback generation in the
-Khomp channel when the other side report a continuous stream of audio in
-silence - in other words, this is used when the audio is present but does
-not have any tone. Values are in milliseconds.
-(default = 2500)
-
-<param name="delay-ringback-pbx" value="2500"/>
--->
-
-<!--
-Defines if the channel should ignore some uncommon DTMF digits detected by
-the board (A, B, C and D). This reduces the number of false positives which
-may happen sometimes, without affecting correctness on traditional
-scenarios. However, if you need to pass those digits througth the board,
-you may need to set this option to 'no'.
-(default = yes)
-
-<param name="ignore-letter-dtmfs" value="yes"/>
--->
-
-<!--
-When there is a request to indicate busy for an incoming KFXO call, the
-ringing channel is taken off hook and then placed on hook, so it now goes
-to answered state and we can send audio throught the line.
-
-If the off/on hook time interval is too short, the PSTN may ignore it, and
-keep the line in a ringing state. If it is too long, the call may be charged.
-The option below defines the delay between the line being answered and being
-disconnected, in miliseconds (from 50ms to 90000ms).
-
-(default = 1250)
-
-<param name="fxo-busy-disconnection" value="1250"/>
--->
-
-<!--
-For KFXO series boards, defines if audio will be allowed being sent into
-outgoing calls before it has been connected.
-(default = yes)
-
-<param name="fxo-send-pre-audio" value="yes"/>
--->
-
-<!--
-Defines the timeout, in seconds, between digits of a FXS board's extension.
-(default = 7)
-
-<param name="fxs-digit-timeout" value="7"/>
--->
-
-<!--
-Enables/Disables the action of dropping collect calls. If enabled, all
-collect calls will be dropped no matter what KDropCollectCall is set to.
-(default = no)
-
-<param name="drop-collect-call" value="no"/>
--->
-
-<!--
-Defines if the activation and deactivation of Kommuter is done automatically by the channel,
-or manually by the user. Possible values:
-
-auto     - Khomp channel driver starts all kommuter devices at initialization and stops them if the module is unloaded.
-manual   - The user must explicity call the CLI command < khomp kommuter on/off >, that starts or stops the kommuter devices connected to this machine.
-(default = auto)
-
-<param name="kommuter-activation" value="auto"/>
--->
-
-<!--
-Defines the default value for the Kommuter watchdog in seconds.
-All kommuters conected to this machine will be initialized with this value,
-and will commute the links after reaching this time with no response of the channel.
-The minimum is 0 (will never commute the links), and maximum value is 255 seconds.
-(default = 10)
-
-<param name="kommuter-timeout" value="10"/>
--->
-
-<!--
-When adjusted to some DTMF digit sequence, it will define those as the digits
-to be used to initialize a call transfer using PBX-to-PBX signaling.
-(default = empty)
-
-<param name="user-transfer-digits" value="#2"/>
--->
-
-<!--
-Defines the digits to be sent when the flash is detected.
-
-<param name="flash-to-digits" value="*1"/>
--->
-
-<!--
-;;;;;;;;;;;;;;;;;;;; CONTEXTS WILDCARDS ;;;;;;;;;;;;;;;;;;;;;;
-
-For incoming contexts, you can use the following wildcards:
-
-'DD' (device number): the sequence number of the board on the
-system (can be checked using "khomp summary", valid for all
-board models);
-
-'LL' (link number): the sequence number of link where the call
-has arrived on the board. valid only for E1 boards.
-
-'SSSS' (serial number): the serial number of the board (can
-be checked using "khomp summary", and it's valid for all
-board models);
-
-'CC' (channel number): the channel number on which the call
-or message has arrived (valid for FXO, FXS and GSM boards);
-
-'CCC' (channel number): same as above, but valid only for E1
-channels;
--->
-
-</channels>
-
-<!--  Section for configuring allocation groups. -->
-<groups>
-<!--
-In this section, you should define options using the following syntax:
-
-<groupname> = <allocation-string>[:<context>]
-
-<param name="pstn" value="b0l0 + b1c38"/>
-<param name="pstn" value="b0l0 + b1c38:from-pstn"/>
-
-You may define your own groups. In the example above, the group
-called pstn can be used in the bridge string as <action application="brigde" data="Khomp/Gpstn/..." />
-or <action application="brigde" data="Khomp/Gpstn/..." />. As a result, the allocation string will be
-replaced with the one associated with the group "pstn". This is the same
-of doing <action application="brigde" data="Khomp/b0l0 + b1c38/... />.
-In the second example, a context is also defined which can be used in
-extensions.conf for inbound calls on that allocation string's range.
--->
-</groups>
-
-<!--
-Section for configuring cadences used on FXS boards and the whole
-channel (fast busy, ringback tones, etc).
--->
-<cadences>
-<!--
-Default value for cadences. You may define your own cadences, and
-also use them in the bridge arguments as "cadence=your_cadence_name".
-
- "0,0" means a continuous dialtone.
-
- (default as defined below)
- <param name="fast-busy" value="100,100" />
- <param name="ringback" value="1000,4000" />
- <param name="pbx-dialtone" value="1000,100" />
- <param name="vm-dialtone " value="1000,100,100,100" />
- <param name="co-dialtone " value="0,0" />
--->
-</cadences>
-
-
-<!-- Section for configuring CALLERID's associated with FXS boards. -->
-<fxs-branches>
-<!--
-In this section, you should define options using the following syntax:
-
-'orig_prefix = serial number 0, serial number 1, ...'
-
-ex: <param name="880" value="111,222"/>
-
-In the example above (assuming KFXS-SPX boards 1234 and 4535), the
-branches will be numbered from 800 to 829 in board 1234, and from
-830 to 859 in board 4535.
--->
-</fxs-branches>
-
-<!-- Section for configuring FXS hotlines. -->
-<fxs-hotlines>
-<!--
-In this section, you should define options using the following syntax:
-
-'orig_prefix = destination_number'
-
-ex: <param name="804" value="32332933" />
-
-In the example above, the branch numbered 804 will call the number
-3233-2933 (Khomp support number) every time the FXS branch goes off hook.
--->
-</fxs-hotlines>
-
-<!-- Section for configuring specific options for FXS branches. -->
-<fxs-options>
-<!--
-In this section, you should define options using the following syntax:
-
-orig_prefix = option1:value | option2:value | option3:value ...
-
-ex: <param name="804" value="output-volume:+2" />
-
-In the example above, the branch numbered 804 will have specific
-configuration for default output volume set to +2.
-
-Possible values to options is:
-context, input-volume, output-volume, language,
-accountcode, calleridnum, calleridname, flash-to-digits.
--->
-</fxs-options>
-
-</settings>
-</configuration>
diff --git a/src/mod/endpoints/mod_khomp/Makefile.am b/src/mod/endpoints/mod_khomp/Makefile.am
deleted file mode 100644
index 43e803d073..0000000000
--- a/src/mod/endpoints/mod_khomp/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_khomp
-mod_LTLIBRARIES = mod_khomp.la
-mod_khomp_la_SOURCES  = mod_khomp.cpp
-mod_khomp_la_CFLAGS   = $(AM_CFLAGS)
-mod_khomp_la_CFLAGS  += -I./ -I./include -I./commons -I./commons/base -I./support 
-mod_khomp_la_CFLAGS  += -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DCOMMONS_LIBRARY_USING_FREESWITCH
-mod_khomp_la_CFLAGS  += -DFS_VERSION_MAJOR=`./tools/getversion.sh "SWITCH_VERSION_MAJOR" $(switch_srcdir)`
-mod_khomp_la_CFLAGS  += -DFS_VERSION_MINOR=`./tools/getversion.sh "SWITCH_VERSION_MINOR" $(switch_srcdir)`
-mod_khomp_la_CFLAGS  += -DFS_VERSION_MICRO=`./tools/getversion.sh "SWITCH_VERSION_MICRO" $(switch_srcdir)` 
-mod_khomp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_khomp_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lk3l
-KHOMP_MODDIR=$(switch_srcdir)/src/mod/endpoints/mod_khomp
-TOOLS_DIR=$(KHOMP_MODDIR)/commons/tools
-
-mod_khomp_la_SOURCES += ./commons/base/k3lapi.cpp ./commons/base/k3lutil.cpp ./commons/base/config_options.cpp ./commons/base/format.cpp ./commons/base/strings.cpp ./commons/base/ringbuffer.cpp ./commons/base/verbose.cpp ./commons/base/saved_condition.cpp ./commons/base/regex.cpp ./commons/base/timer.cpp ./commons/base/configurator/configfile.cpp ./commons/base/configurator/option.cpp ./commons/base/configurator/section.cpp ./commons/base/configurator/restriction.cpp ./commons/base/verbose_traits.cpp 
-mod_khomp_la_SOURCES += ./support/klog-config.cpp ./support/klog-options.cpp ./support/config_defaults.cpp
-mod_khomp_la_SOURCES += ./src/globals.cpp ./src/opt.cpp ./src/frame.cpp ./src/utils.cpp ./src/lock.cpp ./src/spec.cpp ./src/applications.cpp ./src/khomp_pvt_fxo.cpp ./src/khomp_pvt_gsm.cpp ./src/khomp_pvt_kxe1.cpp ./src/khomp_pvt_passive.cpp ./src/khomp_pvt.cpp ./src/logger.cpp ./src/cli.cpp
-
-conf_file_name = khomp.conf.xml
-conf_file_dir = ./Install/files
-conf_file_dir_alt = ./conf
-conf_file_install = $(sysconfdir)/autoload_configs
-
-BUILT_SOURCES=verbose_traits.hpp verbose_traits.cpp
-
-verbose_traits.hpp verbose_traits.cpp:
-	@if test ! -f $(KHOMP_MODDIR)/commons/base/verbose_traits.hpp || test ! -f $(KHOMP_MODDIR)/commons/base/verbose_traits.cpp ; then \
-		echo "Generating verbose_traits" ;\
-		bash $(TOOLS_DIR)/generate-verbose-headers.sh $(KHOMP_MODDIR)/commons/base/ include/k3l.h ;\
-	fi;
-
-install-data-local:
-	@if test "w`kserver --version 2>/dev/null | grep 2.1`" == "w" ; then \
-		echo "###############################################################################" ;\
-		echo "Install k3l from KHOMP." ;\
-		echo "Run: ./tools/getk3l.sh" ;\
-		echo "###############################################################################" ;\
-		exit 1;\
-	fi;
-	@echo "Copy $(conf_file_name)"
-	@if test -d  $(conf_file_install) ; then \
-		if test -f $(conf_file_dir)/$(conf_file_name) ; then \
-			cp $(conf_file_dir)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\
-		else \
-			cp $(conf_file_dir_alt)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\
-		fi; \
-		if test ! -f "$(conf_file_install)/$(conf_file_name)" ; then \
-			mv $(conf_file_install)/$(conf_file_name).new $(conf_file_install)/$(conf_file_name) ;\
-		fi; \
-	fi;
diff --git a/src/mod/endpoints/mod_khomp/commons/base/atomic.hpp b/src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
deleted file mode 100644
index 02278b390c..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-
-    This code was based on FreeBSD 7.X SVN (sys/i386/include/atomic.h),
-    with changes regarding optimizations and generalizations, and a
-    remake of the interface to fit use C++ features.
-
-    Code is distributed under original license.
-    Original copyright follows:
-
- * Copyright (c) 1998 Doug Rabson
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-
-*/
-
-#ifndef _ATOMIC_HPP_
-#define _ATOMIC_HPP_
-
-namespace Atomic
-{
-    // Macros used to insert compare and exchange instructions easily into functions.
-
-    #define MAKE_CMPXCHG_FUNCTION(INS, PTR, EXP, VAL, TYPE)  \
-        PunnedType pexp; pexp.valtype = EXP;                 \
-        PunnedType pval; pval.valtype = VAL;                 \
-        TYPE vexp = *(pexp.podtype);                         \
-        TYPE vval = *(pval.podtype);                         \
-        TYPE res;                                            \
-        unsigned char chg = 0;                               \
-        asm volatile("lock;" INS "sete %1;"                  \
-        : "=a" (res),                           /* 0 */      \
-        "=q" (chg),                             /* 1 */      \
-        "=m" (*(unsigned char **)(PTR))         /* 2 */      \
-        : "r" (vval),                           /* 3 */      \
-        "a" (vexp),                             /* 4 */      \
-        "m" (*(unsigned char **)(PTR))          /* 5 */      \
-        : "memory");                                         \
-        *(pexp.podtype) = res;                               \
-        return (chg != 0 ? true : false);
-
-    #define MAKE_CMPXCHG8B_FUNCTION(PTR,EXP,VAL)           \
-        PunnedType pexp; pexp.valtype = EXP;               \
-        PunnedType pval; pval.valtype = VAL;               \
-        unsigned long long vexp = *(pexp.podtype);         \
-        unsigned long long vval = *(pval.podtype);         \
-        unsigned long vval32 = (unsigned long)vval;        \
-        unsigned char chg = 0;                             \
-        asm volatile(                                      \
-            "xchgl %%ebx, %4;"                             \
-            "lock; cmpxchg8b %2; sete %1;"                 \
-            "movl %4, %%ebx;   "                           \
-        : "+A" (vexp),                    /* 0 (result) */ \
-          "=c" (chg)                      /* 1 */          \
-        : "m" (*(unsigned char**)(PTR)),  /* 2 */          \
-          "c" ((unsigned long)(vval >> 32)),               \
-          "m" (vval32));                                   \
-        *(pexp.podtype) = vexp;                            \
-        return (chg != 0 ? true : false);
-
-//            "movl %%ecx, %4;"
-//
-//          "m" (*((unsigned long*)(*(pval.podtype)))),
-//          "m" ((unsigned long)(vval >> 32))
-//
-//          "m" (*((unsigned long*)(&vval))),
-//          "m" ((unsigned long)(vval >> 32))
-//
-//        unsigned long long vval = *(pval.podtype);
-//        unsigned long long res = (unsigned long long)exp;
-//
-    // Types used for making CMPXCHG instructions independent from base type.
-
-    template < typename ValType, typename PodType >
-    union PunnedTypeTemplate
-    {
-        ValType * valtype;
-        PodType * podtype;
-    };
-
-    template < int SizeOfType, typename ReturnType >
-    struct HelperCreateCAS;
-
-    template < typename ValType >
-    struct HelperCreateCAS<4, ValType>
-    {
-        #if !defined(__LP64__) && !defined(__LP64)
-            typedef unsigned long BaseType;
-        #else
-            typedef unsigned int  BaseType;
-        #endif
-
-        typedef PunnedTypeTemplate< ValType, BaseType > PunnedType;
-
-        inline static bool apply(volatile void *p, ValType * exp, ValType now)
-        {
-            #if !defined(__LP64__) && !defined(__LP64)
-                MAKE_CMPXCHG_FUNCTION("cmpxchgl %3,%5;", p, exp, &now, BaseType);
-            #else
-                MAKE_CMPXCHG_FUNCTION("cmpxchgl %k3,%5;", p, exp, &now, BaseType);
-            #endif
-        }
-    };
-
-    template < typename ValType >
-    struct HelperCreateCAS<8, ValType>
-    {
-        #if !defined(__LP64__) && !defined(__LP64)
-            typedef unsigned long long BaseType;
-        #else
-            typedef unsigned long BaseType;
-        #endif
-
-        typedef PunnedTypeTemplate< ValType, BaseType > PunnedType;
-
-        inline static volatile ValType apply(volatile void *p, ValType * exp, ValType now)
-        {
-            #if !defined(__LP64__) && !defined(__LP64)
-                MAKE_CMPXCHG8B_FUNCTION(p, exp, &now);
-            #else
-                MAKE_CMPXCHG_FUNCTION("cmpxchgq %3,%5;", p, exp, &now, BaseType);
-            #endif
-        }
-
-    };
-
-    // The CAS function itself.
-
-    template < typename ValType >
-    inline bool doCAS(volatile ValType * p, ValType * o, ValType n)
-    {
-        return HelperCreateCAS<sizeof(ValType), ValType>::apply(static_cast<volatile void *>(p), o, n);
-    };
-
-    template < typename ValType >
-    inline bool doCAS(volatile ValType * p, ValType o, ValType n)
-    {
-        return HelperCreateCAS<sizeof(ValType), ValType>::apply(static_cast<volatile void *>(p), &o, n);
-    };
-
-    #undef MAKE_CMPXCHG_32_FUNCTION
-    #undef MAKE_CMPXCHG_64_FUNCTION
-
-    #define MAKE_LOCKED_TEMPLATE(NAME)                                                     \
-    template < typename ValType > inline void do##NAME(volatile ValType * p, ValType v);   \
-    template < typename ValType > inline void do##NAME(volatile ValType * p);
-
-    #define MAKE_LOCKED_FUNCTION(NAME, TYPE, INS, CONS, VAL)                                                                                    \
-    template < > inline void do##NAME < TYPE > (volatile TYPE * p, TYPE v){   asm volatile("lock;" INS : "=m" (*p) : CONS (VAL), "m" (*p)); }   \
-    template < > inline void do##NAME < TYPE > (volatile TYPE * p)        {   asm volatile("lock;" INS : "=m" (*p) : CONS (1),   "m" (*p)); }
-
-    #define MAKE_LOCKED_FUNCTIONS(NAME, TYPE, INS, CONS, VAL)       \
-        MAKE_LOCKED_FUNCTION(NAME, TYPE, INS, CONS, VAL)            \
-        MAKE_LOCKED_FUNCTION(NAME, unsigned TYPE, INS, CONS, VAL)
-
-    MAKE_LOCKED_TEMPLATE(Add);
-    MAKE_LOCKED_TEMPLATE(Sub);
-    MAKE_LOCKED_TEMPLATE(SetBits);
-    MAKE_LOCKED_TEMPLATE(ClearBits);
-
-    MAKE_LOCKED_FUNCTIONS(Add,   int,   "addl %1,%0",  "ir",  v);
-    MAKE_LOCKED_FUNCTIONS(Sub,   int,   "subl %1,%0",  "ir",  v);
-    MAKE_LOCKED_FUNCTIONS(SetBits,   int,   "orl %1,%0",   "ir",  v);
-    MAKE_LOCKED_FUNCTIONS(ClearBits, int,   "andl %1,%0",  "ir", ~v);
-
-    #if !defined(__LP64__) && !defined(__LP64)
-
-    MAKE_LOCKED_FUNCTIONS(Add,   long,  "addl %1,%0",  "ir",  v);
-    MAKE_LOCKED_FUNCTIONS(Sub,   long,  "subl %1,%0",  "ir",  v);
-    MAKE_LOCKED_FUNCTIONS(SetBits,   long,  "orl %1,%0",   "ir",  v);
-    MAKE_LOCKED_FUNCTIONS(ClearBits, long,  "andl %1,%0",  "ir", ~v);
-
-    #else
-
-    MAKE_LOCKED_FUNCTIONS(Add,   long,  "addq %1,%0",  "ir",  v);
-    MAKE_LOCKED_FUNCTIONS(Sub,   long,  "subq %1,%0",  "ir",  v);
-    MAKE_LOCKED_FUNCTIONS(SetBits,   long,  "orq %1,%0",   "ir",  v);
-    MAKE_LOCKED_FUNCTIONS(ClearBits, long,  "andq %1,%0",  "ir", ~v);
-
-    #endif
-};
-
-#endif /* _ATOMIC_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/config_commons.hpp b/src/mod/endpoints/mod_khomp/commons/base/config_commons.hpp
deleted file mode 100644
index 14f8a19d2c..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/config_commons.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _CONFIG_COMMONS_HPP_
-#define _CONFIG_COMMONS_HPP_
-
-/****************************************************************************/
-/* ASTERISK */
-#if   defined(COMMONS_LIBRARY_USING_ASTERISK)
- #define COMMONS_IMPLEMENTATION asterisk
-/****************************************************************************/
-/* CALLWEAVER */
-#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
- #define COMMONS_IMPLEMENTATION callweaver
-/****************************************************************************/
-/* FREESWITCH */
-#elif defined(COMMONS_LIBRARY_USING_FREESWITCH)
- #define COMMONS_IMPLEMENTATION freeswitch
-/****************************************************************************/
-/* GNU/LINUX (generic) */
-#elif defined(COMMONS_LIBRARY_USING_GNU_LINUX)
- #define COMMONS_IMPLEMENTATION gnulinux
-/****************************************************************************/
-#else
- #error Unknown implementation selected. Please define COMMONS_LIBRARY_USING_* correctly.
-#endif
-
-#define COMMONS_INCLUDE(file) <system/COMMONS_IMPLEMENTATION/file>
-
-#define COMMONS_VERSION_MAJOR 1
-#define COMMONS_VERSION_MINOR 1
-
-#define COMMONS_AT_LEAST(x,y) \
-    ((COMMONS_VERSION_MAJOR > x) || (COMMONS_VERSION_MAJOR == x && COMMONS_VERSION_MINOR >= y))
-
-#endif  /* _CONFIG_COMMONS_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/config_options.cpp b/src/mod/endpoints/mod_khomp/commons/base/config_options.cpp
deleted file mode 100644
index 7412b4b1a0..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/config_options.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <config_options.hpp>
-
-void Config::Restriction::checkRange(const std::string & name, const SIntType value, const Range < SIntType > & range)
-{
-    if (value < range.minimum)
-        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (too low)") % value % name));
-
-    if (value > range.maximum)
-        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (too high)") % value % name));
-
-    if (((value - range.minimum) % range.step) != 0)
-        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (outside allowed step)") % value % name));
-}
-
-void Config::Restriction::checkRange(const std::string & name, const UIntType value, const Range < UIntType > & range)
-{
-    if (value < range.minimum)
-        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (too low)") % value % name));
-
-    if (value > range.maximum)
-        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (too high)") % value % name));
-
-    if (((value - range.minimum) % range.step) != 0)
-        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (outside allowed step)") % value % name));
-}
-
-void Config::Restriction::checkStringSet(const std::string & name, const StringType & value, const StringSet & allowed)
-{
-    if (allowed.empty())
-        return;
-
-    if (allowed.find(value) != allowed.end())
-        return;
-
-    std::string strlist;
-
-    for (StringSet::const_iterator i = allowed.begin(); i != allowed.end(); i++)
-    {
-        strlist += " '";
-        strlist += (*i);
-        strlist += "'";
-    }
-
-    throw Failure(STG(FMT("value '%s' not allowed for option '%s' (allowed values:%s)")
-        % value % name % strlist));
-}
-
-Config::Option::Option(std::string name, Config::Option::StringMemberType value, const StringType defvalue, StringSet & allowed, bool listme)
-: _myname(name), _option(InnerStringType(name, value, defvalue, allowed)), _listme(listme), _values(NULL)
-{};
-
-Config::Option::Option(std::string name, Config::Option::StringMemberType value, const StringType defvalue, bool listme)
-: _myname(name), _option(InnerStringType(name, value, defvalue)), _listme(listme), _values(NULL)
-{};
-
-Config::Option::Option(std::string name, Config::Option::BooleanMemberType value, const BooleanType defvalue, bool listme)
-: _myname(name), _option(InnerBooleanType(name, value, defvalue)), _listme(listme), _values(NULL)
-{};
-
-Config::Option::Option(std::string name, Config::Option::SIntMemberType value, const SIntType defvalue,
-                       SIntType min, SIntType max, SIntType step, bool listme)
-: _myname(name), _option(InnerSIntType(name, value, defvalue, min, max, step)), _listme(listme), _values(NULL)
-{};
-
-Config::Option::Option(std::string name, Config::Option::UIntMemberType value, const UIntType defvalue,
-                       UIntType min, UIntType max, UIntType step, bool listme)
-: _myname(name), _option(InnerUIntType(name, value, defvalue, min, max, step)), _listme(listme), _values(NULL)
-{};
-
-Config::Option::Option(const Config::Option & o)
-: _myname(o._myname), _option(o._option), _listme(o._listme), _values(o._values)
-{};
-
-Config::Option::Option(std::string name, Config::Option::FunctionMemberType value, const StringType defvalue, StringSet & allowed, bool listme)
-: _myname(name), _option(InnerFunctionType(name, value, defvalue, allowed)), _listme(listme), _values(NULL)
-{};
-
-Config::Option::Option(std::string name, Config::Option::FunctionMemberType value, const StringType defvalue, bool listme)
-: _myname(name), _option(InnerFunctionType(name, value, defvalue)), _listme(listme), _values(NULL)
-{};
-
-Config::Option::~Option(void)
-{
-    if (_values)
-    {
-        for (unsigned int i = 0; _values[i] != NULL; i++)
-            delete _values[i];
-
-        delete[] _values;
-        _values = NULL;
-    }
-};
-
-const char ** Config::Option::values(void)
-{
-    if (_values != NULL)
-        return _values;
-
-    /**/ if (_option.check<InnerBooleanType>())
-    {
-        _values = new const char*[3];
-
-        _values[0] = strdup("yes");
-        _values[1] = strdup("no");
-        _values[2] = NULL;
-
-    }
-    else if (_option.check<InnerSIntType>())
-    {
-        const InnerSIntType & tmp = _option.get<InnerSIntType>();
-
-        unsigned int count = ((tmp._range.maximum - tmp._range.minimum) / tmp._range.step) + 1;
-        unsigned int index = 0;
-
-        _values = new const char*[count + 1];
-
-        for (SIntType i = tmp._range.minimum; i <= tmp._range.maximum; i += tmp._range.step, ++index)
-            _values[index] = strdup(STG(FMT("%d") % i).c_str());
-
-        _values[index] = NULL;
-    }
-    else if (_option.check<InnerUIntType>())
-    {
-        const InnerUIntType & tmp = _option.get<InnerUIntType>();
-
-        unsigned int count = ((tmp._range.maximum - tmp._range.minimum) / tmp._range.step) + 1;
-        unsigned int index = 0;
-
-        _values = new const char*[count + 1];
-
-        for (UIntType i = tmp._range.minimum; i <= tmp._range.maximum; i += tmp._range.step, ++index)
-            _values[index] = strdup(STG(FMT("%d") % i).c_str());
-
-        _values[index] = NULL;
-    }
-    else if (_option.check<InnerStringType>())
-    {
-        const InnerStringType & tmp = _option.get<InnerStringType>();
-
-        _values = new const char*[ tmp._allowed.size() + 1 ];
-
-        unsigned int index = 0;
-
-        for (StringSet::iterator i = tmp._allowed.begin(); i != tmp._allowed.end(); ++i, ++index)
-            _values[index] = strdup((*i).c_str());
-
-        _values[index] = NULL;
-    }
-    else if (_option.check<InnerFunctionType>())
-    {
-        const InnerFunctionType & tmp = _option.get<InnerFunctionType>();
-
-        _values = new const char*[ tmp._allowed.size() + 1 ];
-
-        unsigned int index = 0;
-
-        for (StringSet::iterator i = tmp._allowed.begin(); i != tmp._allowed.end(); ++i, ++index)
-            _values[index] = strdup((*i).c_str());
-
-        _values[index] = NULL;
-    }
-    else
-    {
-        throw Failure(STG(FMT("values() not implemented for type used in option '%s'") % _myname));
-    }
-
-    return _values;
-};
-
-/*********************************/
-
-Config::Options::Options(void)
-: _values(NULL)
-{};
-
-Config::Options::~Options()
-{
-    if (_values)
-    {
-        for (unsigned int i = 0; _values[i] != NULL; i++)
-            free((void*)(_values[i]));
-
-        delete[] _values;
-        _values = NULL;
-    }
-};
-
-bool Config::Options::add(Config::Option option)
-{
-    std::pair<OptionMap::iterator, bool> ret = _map.insert(OptionPair(option.name(), option));
-
-    return ret.second;
-}
-
-bool Config::Options::synonym(std::string equiv_opt, std::string main_opt)
-{
-    std::pair<SynOptionMap::iterator, bool> ret = _syn_map.insert(SynOptionPair(equiv_opt, main_opt));
-
-    return ret.second;
-}
-
-Config::StringSet Config::Options::options(void)
-{
-    StringSet res;
-
-    for (OptionMap::iterator i = _map.begin(); i != _map.end(); i++)
-        res.insert(i->first);
-
-    return res;
-}
-
-const char ** Config::Options::values(const char * name)
-{
-    OptionMap::iterator iter = find_option(name);
-
-    if (iter == _map.end())
-        throw Failure(STG(FMT("unknown option '%s'") % name));
-
-    return iter->second.values();
-}
-
-const char ** Config::Options::values(void)
-{
-    if (_values != NULL)
-        return _values;
-
-    unsigned int count = 0;
-
-    for (OptionMap::iterator i = _map.begin(); i != _map.end(); ++i)
-        if (i->second.listme())
-            ++count;
-
-    _values = new const char*[ count + 1 ];
-
-    unsigned int index = 0;
-
-    for (OptionMap::iterator i = _map.begin(); i != _map.end(); ++i)
-    {
-        if (i->second.listme())
-        {
-            _values[index] = strdup(i->first.c_str());
-            ++index;
-        }
-    }
-
-    _values[index] = NULL;
-
-    return _values;
-}
-
-Config::Options::OptionMap::iterator Config::Options::find_option(std::string name)
-{
-    SynOptionMap::iterator syn_iter = _syn_map.find(name);
-
-    if (syn_iter != _syn_map.end())
-        name = syn_iter->second;
-
-    OptionMap::iterator iter = _map.find(name);
-
-    return iter;
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/config_options.hpp b/src/mod/endpoints/mod_khomp/commons/base/config_options.hpp
deleted file mode 100644
index 9196f3b5a8..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/config_options.hpp
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _CONFIG_OPTIONS_HPP_
-#define _CONFIG_OPTIONS_HPP_
-
-#include <set>
-#include <map>
-#include <vector>
-#include <stdexcept>
-
-#include <strings.hpp>
-#include <format.hpp>
-#include <tagged_union.hpp>
-#include <function.hpp>
-#include <variable.hpp>
-
-namespace Config
-{
-    /* exceptions */
-
-    struct Failure: public std::runtime_error
-    {
-        Failure(const std::string & msg) : std::runtime_error(msg) {};
-    };
-
-    struct EmptyValue: public std::runtime_error
-    {
-        EmptyValue(): std::runtime_error("accessed option still not loaded from configuration") {};
-    };
-
-    /* types */
-
-    typedef int          SIntType;
-    typedef unsigned int UIntType;
-    typedef bool         BooleanType;
-    typedef std::string  StringType;
-
-    template < typename Type >
-    struct Value;
-
-    template < typename Type >
-    struct InnerOptionBase;
-
-    template < typename Type >
-    struct InnerOption;
-
-    struct Option;
-
-    /* here we go! */
-
-    template < typename Type >
-    struct Range
-    {
-        Range(const Type _minimum, const Type _maximum, const Type _step)
-        : minimum(_minimum), maximum(_maximum), step(_step) {};
-
-        const Type minimum, maximum, step;
-    };
-
-    typedef std::set < std::string > StringSet;
-
-    template < typename Type >
-    struct Value: COUNTER_SUPER(Value < Type >)
-    {
-        friend class COUNTER_CLASS(Value < Type >);
-        friend class InnerOptionBase< Type >;
-        friend class InnerOption < Type >;
-        friend class Option;
-
-        Value()
-        : _tmpval(0), _stored(0), _loaded(false), _inited(false)
-        {};
-
-        Value(const Value & o)
-        : COUNTER_REFER(o, Value < Type >),
-          _tmpval(o._tmpval), _stored(o._stored),
-          _loaded(o._loaded), _inited(o._inited)
-        {};
-
-        const Type & operator()(void) const
-        {
-            if (!_inited)
-                throw EmptyValue();
-
-            if (!_stored)
-                return *_tmpval;
-
-            return *_stored;
-        };
-
-        const Type &     get(void) const { return operator()(); };
-        bool          loaded(void) const { return _loaded;      };
-
-        void store(const Type val)
-        {
-            if (_tmpval)
-            {
-                delete _tmpval;
-                _tmpval = 0;
-            }
-
-            _tmpval = new Type(val);
-
-            _loaded = true;
-            _inited = true;
-        }
-
-    protected:
-        void unreference(void)
-        {
-            _inited = false;
-            _loaded = false;
-
-            if (_tmpval)
-            {
-                delete _tmpval;
-                _tmpval = 0;
-            }
-
-            if (_stored)
-            {
-                delete _stored;
-                _stored = 0;
-            }
-        };
-
-    protected:
-        void commit(Type def)
-        {
-            if (_tmpval)
-            {
-                {
-                    delete _stored;
-                    _stored = 0;
-                }
-
-                _stored = _tmpval;
-                _tmpval = 0;
-            }
-            else
-            {
-                if (!_stored)
-                    _stored = new Type(def);
-            }
-
-            _loaded = true;
-            _inited = true;
-        };
-
-        void reset(void)
-        {
-            _loaded = false;
-        }
-
-    protected:
-        const Type * _tmpval;
-        const Type * _stored;
-        bool _loaded;
-        bool _inited;
-    };
-
-    struct FunctionValue
-    {
-        friend class InnerFunctionType;
-        friend class Option;
-
-        FunctionValue()
-        : _loaded(false), _inited(false) {};
-
-        virtual ~FunctionValue() {};
-
-    public:
-        virtual void operator()(const StringType & val)
-        {
-            throw Failure("undefined operator() for value");
-        }
-
-        const StringType &     get(void) const
-        {
-            if (!_inited)
-                throw EmptyValue();
-
-            return _stored;
-        };
-
-        bool loaded(void) const { return _loaded; };
-
-    protected:
-        void commit(const StringType def)
-        {
-            if (_tmpval.empty())
-            {
-                _stored = def;
-            }
-            else
-            {
-                _stored = _tmpval;
-                _tmpval.clear();
-            }
-
-            operator()(_stored);
-
-            _loaded = true;
-            _inited = true;
-        };
-
-        void store(const StringType val)
-        {
-            _tmpval = val;
-            _loaded = true;
-            _inited = true;
-        }
-
-        void reset(void)
-        {
-            _loaded = false;
-        }
-
-    private:
-        StringType _tmpval;
-        StringType _stored;
-        bool _loaded;
-        bool _inited;
-    };
-
-    /* NOTE: we use a non-templated classe to place this functions inside the .cpp */
-    struct Restriction
-    {
-        static void checkRange(const std::string & name,     const SIntType value, const Range < SIntType > & range);
-        static void checkRange(const std::string & name,     const UIntType value, const Range < UIntType > & range);
-        static void checkStringSet(const std::string & name, const StringType & value, const StringSet & allowed);
-    };
-
-    template < typename Type >
-    struct InnerOptionBase
-    {
-        typedef Variable < Value < Type > > MemberValue;
-
-        InnerOptionBase(const std::string name, MemberValue option, const Type defvalue)
-        : _name(name), _option(option), _default(defvalue) {};
-
-        template < typename Object >
-        void reset(Object * const obj) const
-        {
-            _option(obj).reset();
-        }
-
-        template < typename Object >
-        const Type & get(const Object * const obj) const
-        {
-            return _option(obj).get();
-        }
-
-        template < typename Object >
-        bool loaded(const Object * const obj) const
-        {
-            return _option(obj).loaded();
-        }
-
-    protected:
-        const std::string   _name;
-        MemberValue         _option;
-        const Type          _default;
-    };
-
-    template < >
-    struct InnerOption < SIntType >: public InnerOptionBase < SIntType >
-    {
-        typedef InnerOptionBase < SIntType >  Super;
-        typedef Super::MemberValue           MemberValue;
-
-        InnerOption(const std::string name, MemberValue option, const SIntType defval,
-                    const SIntType min, const SIntType max, const SIntType step)
-        : Super(name, option, defval), _range(min, max, step) {};
-
-        template < typename Object >
-        void commit(Object * const obj) const
-        {
-            Restriction::checkRange(_name, _default, _range);
-            _option(obj).commit(_default);
-        };
-
-        template < typename Object >
-        void store(Object * const obj, const SIntType stored) const
-        {
-            Restriction::checkRange(_name, _default, _range);
-            _option(obj).store(stored);
-        }
-
-        using Super::reset;
-        using Super::get;
-
-        const Range< SIntType >  _range;
-    };
-
-    template < >
-    struct InnerOption < UIntType >: public InnerOptionBase < UIntType >
-    {
-        typedef InnerOptionBase < UIntType >  Super;
-        typedef Super::MemberValue                 MemberValue;
-
-        InnerOption(const std::string name, MemberValue option, const UIntType defval,
-                    const UIntType min, const UIntType max, const UIntType step)
-        : Super(name, option, defval), _range(min, max, step) {};
-
-        template < typename Object >
-        void commit(Object * const obj) const
-        {
-            Restriction::checkRange(_name, _default, _range);
-            _option(obj).commit(_default);
-        };
-
-        template < typename Object >
-        void store(Object * const obj, const UIntType stored) const
-        {
-            Restriction::checkRange(_name, _default, _range);
-            _option(obj).store(stored);
-        }
-
-        using Super::reset;
-        using Super::get;
-
-        const Range< UIntType >  _range;
-    };
-
-    template < >
-    struct InnerOption < BooleanType >: public InnerOptionBase < BooleanType >
-    {
-        typedef InnerOptionBase < BooleanType >  Super;
-        typedef Super::MemberValue                    MemberValue;
-
-        InnerOption(std::string name, MemberValue option, BooleanType defval)
-        : Super(name, option, defval) {};
-
-        template < typename Object >
-        void commit(Object * obj) const
-        {
-            _option(obj).commit(_default);
-        };
-
-        template < typename Object >
-        void store(Object * obj, BooleanType stored) const
-        {
-            _option(obj).store(stored);
-        }
-
-        using Super::reset;
-        using Super::get;
-    };
-
-    template < >
-    struct InnerOption < StringType >: public InnerOptionBase < StringType >
-    {
-        typedef InnerOptionBase < StringType >  Super;
-        typedef Super::MemberValue              MemberValue;
-
-        InnerOption(const std::string name, MemberValue option, const StringType defval, const StringSet & allowed)
-        : Super(name, option, defval), _allowed(allowed) {};
-
-        InnerOption(const std::string name, MemberValue option, const StringType defval)
-        : Super(name, option, defval) {};
-
-        template < typename Object >
-        void commit(Object * const obj) const
-        {
-            Restriction::checkStringSet(_name, _default, _allowed);
-            _option(obj).commit(_default);
-        };
-
-        template < typename Object >
-        void store(Object * const obj, const StringType stored) const
-        {
-            Restriction::checkStringSet(_name, _default, _allowed);
-            _option(obj).store(stored);
-        }
-
-        using Super::reset;
-        using Super::get;
-
-        const StringSet _allowed;
-    };
-
-    struct InnerFunctionType
-    {
-        typedef Variable < FunctionValue > MemberValue;
-
-        InnerFunctionType(const std::string name, MemberValue option, const StringType defval, const StringSet & allowed)
-        : _name(name), _option(option), _default(defval), _allowed(allowed) {};
-
-        InnerFunctionType(const std::string name, MemberValue option, const StringType defval)
-        : _name(name), _option(option), _default(defval) {};
-
-        template < typename Object >
-        const StringType & get(const Object * const obj) const
-        {
-            return _option(obj).get();
-        }
-
-        template < typename Object >
-        bool loaded(const Object * const obj) const
-        {
-            return _option(obj).loaded();
-        }
-
-        template < typename Object >
-        void reset(Object * const obj) const
-        {
-            _option(obj).reset();
-        }
-
-        template < typename Object >
-        void commit(Object * const obj) const
-        {
-            Restriction::checkStringSet(_name, _default, _allowed);
-            _option(obj).commit(_default);
-        };
-
-        template < typename Object >
-        void store(Object * const obj, const StringType stored) const
-        {
-            Restriction::checkStringSet(_name, _default, _allowed);
-            _option(obj).store(stored);
-        }
-
-    protected:
-        const std::string   _name;
-        MemberValue         _option;
-        const StringType    _default;
-
-    public:
-        const StringSet     _allowed;
-    };
-
-    struct Option
-    {
-        typedef InnerOption < SIntType >        InnerSIntType;
-        typedef InnerOption < UIntType >        InnerUIntType;
-        typedef InnerOption < BooleanType >  InnerBooleanType;
-        typedef InnerOption < StringType >    InnerStringType;
-
-        typedef Variable < Value < SIntType > >         SIntMemberType;
-        typedef Variable < Value < UIntType > >         UIntMemberType;
-        typedef Variable < Value < BooleanType > >   BooleanMemberType;
-        typedef Variable < Value < StringType > >     StringMemberType;
-
-        typedef Variable < FunctionValue >          FunctionMemberType;
-
-        typedef Tagged::Union < InnerStringType,
-                Tagged::Union < InnerBooleanType,
-                Tagged::Union < InnerSIntType ,
-                Tagged::Union < InnerUIntType,
-                Tagged::Union < InnerFunctionType > > > > >
-            InnerType;
-
-        explicit Option(std::string, StringMemberType,   const StringType, StringSet & allowed, bool listme = true);
-        explicit Option(std::string, StringMemberType,   const StringType = "", bool listme = true);
-        explicit Option(std::string, SIntMemberType,     const SIntType = 0, SIntType min =  INT_MIN, SIntType max =  INT_MAX, SIntType step = 1, bool listme = true);
-        explicit Option(std::string, UIntMemberType,     const UIntType = 0, UIntType min = 0, UIntType max = UINT_MAX, UIntType step = 1, bool listme = true);
-        explicit Option(std::string, BooleanMemberType,  const BooleanType = false, bool listme = true);
-
-        explicit Option(std::string, FunctionMemberType, const StringType, StringSet & allowed, bool listme = true);
-        explicit Option(std::string, FunctionMemberType, const StringType = "", bool listme = true);
-
-        Option(const Option & o);
-
-        ~Option(void);
-
-        template < typename Object >
-        void set(Object * object, std::string value)
-        {
-            try
-            {
-                /**/ if (_option.check<InnerFunctionType>()) _option.get<InnerFunctionType>().store(object, value);
-                else if (_option.check<InnerStringType>())   _option.get<InnerStringType>().store(object, value);
-                else if (_option.check<InnerBooleanType>())  _option.get<InnerBooleanType>().store(object, Strings::toboolean(value));
-                else if (_option.check<InnerSIntType>())     _option.get<InnerSIntType>().store(object, Strings::tolong(value));
-                else if (_option.check<InnerUIntType>())     _option.get<InnerUIntType>().store(object, Strings::toulong(value));
-                else
-                {
-                    throw Failure(STG(FMT("set() not implemented for type used in option '%s'") % _myname));
-                }
-            }
-            catch (Strings::invalid_value & e)
-            {
-                throw Failure(STG(FMT("got invalid value '%s' for option '%s'") % value % _myname));
-            }
-            catch (EmptyVariable & e)
-            {
-                throw Failure(STG(FMT("uninitialized variable while setting value '%s' for option '%s'") % value % _myname));
-            }
-        }
-
-        template < typename Object >
-        std::string get(const Object * const object) const
-        {
-            try
-            {
-                /**/ if (_option.check<InnerFunctionType>()) return _option.get<InnerFunctionType>().get(object);
-                else if (_option.check<InnerStringType>())   return _option.get<InnerStringType>().get(object);
-                else if (_option.check<InnerBooleanType>())  return (_option.get<InnerBooleanType>().get(object) ? "yes" : "no");
-                else if (_option.check<InnerSIntType>())     return STG(FMT("%d") % _option.get<InnerSIntType>().get(object));
-                else if (_option.check<InnerUIntType>())     return STG(FMT("%u") % _option.get<InnerUIntType>().get(object));
-                else
-                {
-                    throw Failure(STG(FMT("get() not implemented for type used in option '%s'") % _myname));
-                }
-            }
-            catch (EmptyVariable & e)
-            {
-                throw Failure(STG(FMT("uninitialized variable while getting value for option '%s'") % _myname));
-            }
-        }
-
-        template < typename Object >
-        bool loaded(const Object * const object) const
-        {
-            try
-            {
-                /**/ if (_option.check<InnerFunctionType>()) return _option.get<InnerFunctionType>().loaded(object);
-                else if (_option.check<InnerBooleanType>())  return _option.get<InnerBooleanType>().loaded(object);
-                else if (_option.check<InnerStringType>())   return _option.get<InnerStringType>().loaded(object);
-                else if (_option.check<InnerSIntType>())     return _option.get<InnerSIntType>().loaded(object);
-                else if (_option.check<InnerUIntType>())     return _option.get<InnerUIntType>().loaded(object);
-                else
-                {
-                    throw Failure(STG(FMT("loaded() not implemented for type used in option '%s'") % _myname));
-                }
-            }
-            catch (EmptyVariable & e)
-            {
-                throw Failure(STG(FMT("uninitialized variable while checking load status for option '%s'") % _myname));
-            }
-        }
-
-        template < typename Object >
-        void reset(Object * const object)
-        {
-            try
-            {
-                /**/ if (_option.check<InnerFunctionType>()) _option.get<InnerFunctionType>().reset(object);
-                else if (_option.check<InnerBooleanType>())  _option.get<InnerBooleanType>().reset(object);
-                else if (_option.check<InnerStringType>())   _option.get<InnerStringType>().reset(object);
-                else if (_option.check<InnerSIntType>())     _option.get<InnerSIntType>().reset(object);
-                else if (_option.check<InnerUIntType>())     _option.get<InnerUIntType>().reset(object);
-                else
-                {
-                    throw Failure(STG(FMT("reset() not implemented for type used in option '%s'") % _myname));
-                }
-            }
-            catch (EmptyVariable & e)
-            {
-                throw Failure(STG(FMT("uninitialized variable while reseting status for option '%s'") % _myname));
-            }
-        }
-
-        template < typename Object >
-        void commit(Object * const object)
-        {
-            try
-            {
-                /**/ if (_option.check<InnerFunctionType>()) _option.get<InnerFunctionType>().commit(object);
-                else if (_option.check<InnerBooleanType>())  _option.get<InnerBooleanType>().commit(object);
-                else if (_option.check<InnerStringType>())   _option.get<InnerStringType>().commit(object);
-                else if (_option.check<InnerSIntType>())     _option.get<InnerSIntType>().commit(object);
-                else if (_option.check<InnerUIntType>())     _option.get<InnerUIntType>().commit(object);
-                else
-                {
-                    throw Failure(STG(FMT("commit() not implemented for type used in option '%s'") % _myname));
-                }
-            }
-            catch (EmptyVariable & e)
-            {
-                throw Failure(STG(FMT("uninitialized variable while commiting option '%s'") % _myname));
-            }
-        }
-
-        const std::string &   name(void) const { return _myname; }
-        bool                listme(void) const { return _listme; };
-
-        const char **       values(void);
-
-        template < typename Object >
-        void                copyFrom(const Object * const srcobj, Object * const dstobj, bool force = false)
-        {
-            if (loaded(dstobj) && !force)
-                return;
-
-            if (loaded(srcobj))
-                set(dstobj, get(srcobj));
-            else
-                reset(dstobj);
-        }
-
-    protected:
-        const std::string  _myname;
-        InnerType          _option;
-        const bool         _listme;
-        const char **      _values;
-    };
-
-    struct Options
-    {
-        typedef std::vector < std::string >    Messages;
-
-        Options();
-        ~Options();
-
-        typedef std::set < std::string >  StringSet;
-
-        typedef std::map  < std::string, Option >   OptionMap;
-        typedef std::pair < std::string, Option >  OptionPair;
-
-        typedef std::map  < std::string, std::string >   SynOptionMap;
-        typedef std::pair < std::string, std::string >  SynOptionPair;
-
-        bool add(Option option);
-
-        /* only valid in "process" (for backwards compatibility config files) */
-        bool synonym(std::string, std::string);
-
-        template < typename Type >
-        void set(const std::string & name, Type value)
-        {
-            OptionMap::iterator iter = find_option(name);
-
-            if (iter == _map.end())
-                throw Failure(STG(FMT("unknown option: %s") % name));
-
-            iter->second.set(value);
-        }
-
-        template < typename Object >
-        std::string get(const Object * const object, const std::string & name)
-        {
-            OptionMap::iterator iter = find_option(name);
-
-            if (iter == _map.end())
-                throw Failure(STG(FMT("unknown option: %s") % name));
-
-            return iter->second.get(object);
-        }
-
-        template < typename Object >
-        void process(Object * const object, const char * name, const char * value)
-        {
-            OptionMap::iterator iter = find_option(name);
-
-            if (iter == _map.end())
-                throw Failure(STG(FMT("unknown option '%s'") % name));
-
-            iter->second.set(object, value);
-        }
-
-        template < typename Object >
-        Messages commit(Object * const object, const std::string & name)
-        {
-            Messages msgs;
-
-            OptionMap::iterator i = _map.find(name);
-
-            if (i != _map.end())
-            {
-                try
-                {
-                    i->second.commit(object);
-                }
-                catch (Failure & e)
-                {
-                    msgs.push_back(e.what());
-                }
-            }
-            else
-            {
-                msgs.push_back(STG(FMT("unable to find option: %s") % name));
-            };
-
-            return msgs;
-        }
-
-        template < typename Object >
-        Messages commit(Object * const object)
-        {
-            Messages msgs;
-
-            for (OptionMap::iterator i = _map.begin(); i != _map.end(); ++i)
-            {
-                try
-                {
-                    i->second.commit(object);
-                }
-                catch (Failure & e)
-                {
-                    msgs.push_back(e.what());
-                }
-            }
-
-            return msgs;
-        }
-
-        template < typename Object >
-        void reset(Object * object)
-        {
-            for (OptionMap::iterator i = _map.begin(); i != _map.end(); ++i)
-                i->second.reset(object);
-        }
-
-        template < typename Object >
-        bool loaded(Object * object, const std::string & name)
-        {
-            OptionMap::iterator iter = find_option(name);
-
-            if (iter == _map.end())
-                return false;
-
-            return iter->second.loaded(object);
-        }
-
-        bool exists(const std::string & name)
-        {
-            OptionMap::iterator iter = find_option(name);
-
-            return (iter != _map.end());
-        }
-
-        StringSet options(void);
-
-        const char ** values(const char *); /* option value */
-        const char ** values(void);         /* values from options */
-
-        template < typename Object >
-        void copyFrom(const std::string & name, const Object * const src_obj, Object * const dst_obj, bool force = false)
-        {
-            OptionMap::iterator iter = find_option(name);
-
-            if (iter == _map.end())
-                throw Failure(STG(FMT("unknown option '%s'") % name));
-
-            iter->second.copyFrom(src_obj, dst_obj, force);
-        }
-
-        template < typename Object >
-        void copyFrom(Object * src_obj, Object * dst_obj, bool force = false)
-        {
-            for (OptionMap::iterator iter = _map.begin(); iter != _map.end(); ++iter)
-                iter->second.copyFrom(src_obj, dst_obj, force);
-        }
-
-    protected:
-        OptionMap::iterator find_option(std::string);
-
-    protected:
-        OptionMap      _map;
-        SynOptionMap   _syn_map;
-
-        const char **  _values;
-    };
-};
-
-#endif /* _CONFIG_OPTIONS_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.cpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.cpp
deleted file mode 100644
index 02e43df120..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-#include <errno.h>
-
-#include <configurator/configfile.hpp>
-
-#if _MSC_VER >= 1400
-#undef close
-#endif
-
-void Configfile::ignore(const std::string & str)
-{
-    _ignores.insert(str);
-};
-
-bool Configfile::select(Section **ptr, const std::string & str)
-{
-    /* default section == this! */
-    *ptr = this;
-
-    /* always success by default */
-    return true;
-};
-
-bool Configfile::adjust(Section * section, const std::string & opt, const std::string & val)
-{
-    return section->load(opt, val);
-};
-
-bool Configfile::deserialize(std::ifstream & fd)
-{
-    Section * section = NULL;
-
-    /* default selection! */
-    if (!select(&section))
-    {
-        _errors.push_back("default selection has failed!");
-        return false;
-    }
-
-    size_t count = 0;
-
-    while (fd.good())
-    {
-        std::string str;
-
-        /* read one line! */
-        std::getline(fd, str);
-
-        size_t lst = str.size() - 1;
-
-        if (str.size() >= 1 && str[lst] == '\r') //cuida das quebras de linha do tipo \r\n
-        {
-            str.erase(lst,1);
-            --lst;
-        }
-
-        /* empty line! */
-        if (str.size() == 0)
-            continue;
-
-        /* comment! */
-        if (str[0] == '#')
-            continue;
-
-        ++count;
-
-        if (str[0] == '[' && str[lst] == ']')
-        {
-            str.erase(0,1);   --lst;
-            str.erase(lst,1); --lst;
-
-            if (!select(&section, str))
-            {
-                _errors.push_back(STG(FMT("erroneous section '%s'") % str));
-
-                /* ignore this section */
-                section = NULL;
-                continue;
-            }
-        }
-        else
-        {
-            std::string::size_type pos = str.find('=');
-
-            if (pos == std::string::npos)
-            {
-                _errors.push_back(STG(FMT("erroneous separator '%s'") % str));
-                continue;
-            };
-
-            if (section == NULL)
-            {
-                _errors.push_back(STG(FMT("no section for option '%s'") % str));
-                continue;
-            }
-
-            std::string  opt(str.substr(0,pos));
-            std::string  val(str.substr(pos+1));
-
-            if (_ignores.find(opt) != _ignores.end())
-                continue;
-
-            if (val == "@") val = "";
-
-            if (adjust(section, opt, val))
-                continue;
-
-            _errors.push_back(STG(FMT("option '%s' does not exist or '%s' is not "
-                "a valid value (at section '%s')") % opt % val % section->name()));
-        }
-    }
-
-    // retorna 'true' se arquivo tinha alguma coisa valida.
-    return (count != 0);
-}
-
-bool Configfile::obtain()
-{
-    std::ifstream fd(_filename.c_str());
-
-    if (!fd.is_open())
-    {
-        _errors.push_back(STG(FMT("unable to open file '%s': %s")
-            % _filename % strerror(errno)));
-        return false;
-    };
-
-    if (!deserialize(fd))
-    {
-        fd.close();
-        return false;
-    }
-
-    fd.close();
-    return true;
-};
-
-void Configfile::recurse(std::ofstream & fd, Section * section)
-{
-    typedef Section::SectionMap::const_iterator SectionIter;
-    typedef Section::OptionMap::const_iterator  OptionIter;
-
-    for (OptionIter i = section->option_begin(); i != section->option_end(); i++)
-    {
-        std::string res;
-
-        if ((*i).second.store(res))
-        {
-            if (res == "") res = "@";
-            fd << (*i).first << "=" << res << std::endl;
-        }
-    }
-
-    if (!section->recursive())
-        return;
-
-    for (SectionIter j = section->section_begin(); j != section->section_end(); j++)
-        recurse(fd, (*j).second);
-}
-
-bool Configfile::serialize(std::ofstream & fd)
-{
-    recurse(fd, this);
-    return true;
-}
-
-bool Configfile::provide()
-{
-    std::string tmp(_filename);
-    tmp += ".new";
-
-    std::ofstream fd(tmp.c_str());
-
-    if (!fd.good())
-    {
-        _errors.push_back(STG(FMT("unable to open file '%s': %s")
-            % tmp % strerror(errno)));
-        return false;
-    }
-
-    if (!serialize(fd))
-    {
-        fd.close();
-        return false;
-    }
-
-    fd.close();
-
-    if (rename(tmp.c_str(), _filename.c_str()) != 0)
-    {
-        _errors.push_back(STG(FMT("unable to replace config file '%s': %s")
-            % _filename % strerror(errno)));
-        return false;
-    }
-
-    return true;
-}
-
-#if _MSC_VER >= 1400
-#define close _close
-#endif
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.hpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.hpp
deleted file mode 100644
index e725c09964..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <vector>
-#include <fstream>
-#include <sstream>
-#include <set>
-
-#include <format.hpp>
-
-#include <configurator/section.hpp>
-
-#ifndef _CONFIG_CONFIGFILE_HPP_
-#define _CONFIG_CONFIGFILE_HPP_
-
-struct Configfile: public Section
-{
-    typedef std::list < std::string >  ErrorVector;
-    typedef std::set  < std::string >  NameSet;
-
-    Configfile(const std::string & name, const std::string & desc)
-    : Section(name, desc), _good(false) {};
-
-    virtual ~Configfile() {};
-
-    bool                      good() const { return _good;     };
-    const std::string &   filename() const { return _filename; };
-
-    const ErrorVector &     errors() const { return _errors;   };
-
-    void ignore(const std::string &);
-
-    virtual bool obtain();
-    virtual bool provide();
-
- protected:
-    virtual bool select(Section **, const std::string & str = "");
-    virtual bool adjust(Section *, const std::string & opt, const std::string & val);
-
-    virtual bool deserialize(std::ifstream &);
-    virtual bool serialize(std::ofstream &);
-
-    void recurse(std::ofstream &, Section *);
-
- protected:
-    bool         _good;
-    ErrorVector  _errors;
-    NameSet      _ignores;
-    std::string  _filename;
-};
-
-#endif /* _CONFIG_CONFIGFILE_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/option.cpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/option.cpp
deleted file mode 100644
index 6de9212bf3..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/configurator/option.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <configurator/option.hpp>
-
-bool Option::equals(const std::string & value) const
-{
-    switch (_restriction.numeral())
-    {
-        case Restriction::N_UNIQUE:
-        {
-            Restriction::Value my_value;
-
-            if (!_restriction.get(Restriction::F_USER, my_value))
-                return false;
-
-            return (my_value == value);
-        }
-        case Restriction::N_MULTIPLE:
-        {
-            Restriction::Vector my_values;
-
-            if (!_restriction.get(Restriction::F_USER, my_values))
-                return false;
-
-            for (Restriction::Vector::iterator i = my_values.begin(); i != my_values.end(); i++)
-            {
-                if ((*i) == value)
-                    return true;
-            }
-
-            return false;
-        }
-    }
-
-    return false;
-}
-
-bool Option::load(const std::string & value)
-{
-    bool ret = _restriction.set( (const Restriction::Format)Restriction::F_FILE, value);
-
-    if (ret) _modified = false;
-
-    return ret;
-}
-
-bool Option::change(const std::string & value)
-{
-    bool ret = _restriction.set(Restriction::F_FILE, value);
-
-    if (ret) _modified = true;
-
-    return ret;
-}
-
-bool Option::store(std::string & value) const
-{
-    switch  (_restriction.numeral())
-    {
-        case Restriction::N_UNIQUE:
-            return _restriction.get(Restriction::F_FILE, value);
-
-        case Restriction::N_MULTIPLE:
-        {
-            Restriction::Vector values;
-
-            if (!_restriction.get(Restriction::F_FILE, values))
-                return false;
-
-            Strings::Merger strs;
-
-            for (Restriction::Vector::iterator i = values.begin(); i != values.end(); i++)
-                strs.add(*i);
-
-            value = strs.merge(",");
-
-            return true;
-        }
-
-        default:
-            return false;
-    }
-}
-
-/*
-Option::Flags Option::set(const char * value)
-{
-    std::string str_value(value);
-    return set(str_value);
-}
-*/
-
-Option::Flags Option::set(const Restriction::Value & value)
-{
-    Restriction::Value  last_value, curr_value;
-    Flags               flags;
-
-    bool ret1 = _restriction.get(Restriction::F_USER, last_value);
-
-    if (!_restriction.set(Restriction::F_USER, value))
-        return flags;
-
-    flags[F_ADJUSTED] = true;
-
-    bool ret2 = _restriction.get(Restriction::F_USER, curr_value);
-
-    if (!ret1 || (ret2 && (last_value != curr_value)))
-    {
-        flags[F_MODIFIED] = true;
-        _modified = true;
-    }
-
-    return flags;
-}
-
-Option::Flags Option::set(const Restriction::Vector & values)
-{
-    Restriction::Vector  last_values, curr_values;
-    Flags                flags;
-
-    bool ret1 = _restriction.get(Restriction::F_USER, last_values);
-
-    if (!_restriction.set(Restriction::F_USER, values))
-        return flags;
-
-    flags[F_ADJUSTED] = true;
-
-    bool ret2 = _restriction.get(Restriction::F_USER, curr_values);
-
-    if (!ret1 || (ret2 && (last_values != curr_values)))
-    {
-        flags[F_MODIFIED] = true;
-        _modified = true;
-    }
-
-    return flags;
-}
-
-bool Option::get(Restriction::Value & value) const
-{
-    return _restriction.get(Restriction::F_USER, value);
-}
-
-bool Option::get(Restriction::Vector & values) const
-{
-    return _restriction.get(Restriction::F_USER, values);
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/option.hpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/option.hpp
deleted file mode 100644
index e46ab75902..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/configurator/option.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <iostream>
-
-#include <string>
-#include <list>
-#include <vector>
-
-#include <format.hpp>
-#include <strings.hpp>
-
-#include <configurator/restriction.hpp>
-
-#ifndef _CONFIG_OPTION_HPP_
-#define _CONFIG_OPTION_HPP_
-
-struct Option
-{
-    enum FlagTypes
-    {
-        F_MODIFIED = 0x0, /* if option was modified */
-        F_ADJUSTED = 0x1, /* if option was correctly formated */
-    };
-
-    struct Flags: public std::vector<bool>
-    {
-        Flags(): std::vector<bool>(2) {};
-    };
-
-    typedef Restriction::Value   Value;
-    typedef Restriction::Vector Vector;
-
-    /* exception */
-    struct InvalidDefaultValue: public std::runtime_error
-    {
-        InvalidDefaultValue(const std::string & name, const std::string & value)
-        : std::runtime_error(STG(FMT("invalid default value '%s' for option '%s'") % value % name)),
-           _name(name), _value(value)
-        {};
-
-        ~InvalidDefaultValue() throw ()
-        {};
-
-        const std::string &  name() const { return _name;  };
-        const std::string & value() const { return _value; };
-
-      protected:
-        const std::string _name;
-        const std::string _value;
-    };
-
-    Option(const std::string & name, const std::string & desc, const std::string & defvalue, const Restriction & restriction)
-    : _name(name), _description(desc), _restriction(restriction), _modified(true)
-    {
-//        std::string value(defvalue);
-
-        if (!(set(defvalue)[F_ADJUSTED]))
-            throw InvalidDefaultValue(name, defvalue);
-    }
-
-    const std::string &        name() const { return _name;        };
-    const std::string & description() const { return _description; };
-
-    const Restriction & restriction() const { return _restriction; };
-    bool                   modified() const { return _modified;    };
-
- public:
-    bool    load(const std::string &);
-    bool  change(const std::string &);
-    bool   store(std::string &) const;
-
-//    Flags   set(const char  *);
-    Flags   set(const Value  &);
-    Flags   set(const Vector &);
-
-    bool    get(Value  &) const;
-    bool    get(Vector &) const;
-
-    bool    equals(const std::string &) const;
-
- protected:
-    const std::string   _name;
-    const std::string   _description;
-
-    Restriction         _restriction;
-    bool                _modified;
-};
-
-#endif /* _CONFIG_OPTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.cpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.cpp
deleted file mode 100644
index 52be1ea881..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <math.h>
-#include <string.h>
-
-#include <iostream>
-#include <strings.hpp>
-
-#include <configurator/restriction.hpp>
-
-/* internal helper! */
-bool Restriction::equalNumber(const double a, const double b)
-{
-    char tmp1[64];
-    char tmp2[64];
-
-    snprintf(tmp1, sizeof(tmp1), "%.3f", a);
-    snprintf(tmp2, sizeof(tmp2), "%.3f", b);
-
-    if (strncmp(tmp1, tmp2, sizeof(tmp1)))
-        return false;
-
-    return true;
-}
-
-/* process value to our internal representation */
-
-bool Restriction::process(Restriction::Format fmt,
-        const Restriction::Value & value, Restriction::Value & final) const
-{
-    switch (_bounds)
-    {
-        case B_RANGE:
-        {
-            if (_kind != K_NUMBER)
-                return false;
-
-            std::string tmpvalue;
-
-            Restriction::Value::const_iterator itr = value.begin();
-            Restriction::Value::const_iterator end = value.end();
-
-            tmpvalue.reserve(value.size());
-
-            // f*cking dot/comma notation!
-            for (; itr != end; ++itr)
-                tmpvalue += ((*itr) != ',' ? (*itr) : '.');
-
-            try
-            {
-                double newvalue = Strings::todouble(tmpvalue);
-
-                if (newvalue < _init && newvalue > _fini)
-                    return false;
-
-                double res = (newvalue - _init) / _step;
-
-                if (!Restriction::equalNumber(res, rint(res)))
-                    return false;
-
-                final = value;
-                return true;
-            }
-            catch (...)
-            {
-                return false;
-            }
-        }
-
-        case B_LIST:
-            for (List::const_iterator i = _list.begin(); i != _list.end(); i++)
-            {
-                const Value & tmp = (*i);
-
-                if (tmp == value)
-                {
-                    final = value;
-                    return true;
-                }
-            }
-            return false;
-
-        case B_MAPS:
-            switch (fmt)
-            {
-                case F_USER:
-                {
-                    Map::const_iterator i = _map_from_usr.find(value);
-
-                    if (i == _map_from_usr.end())
-                        return false;
-
-                    const Value & tmp = (*i).second;
-
-                    final = tmp;
-                    return true;
-                }
-
-                case F_FILE:
-                {
-                    Map::const_iterator i = _map_from_cfg.find(value);
-
-                    if (i == _map_from_cfg.end())
-                        return false;
-
-                    final = value;
-                    return true;
-                }
-
-                default:
-                    break;
-            }
-            return false;
-
-        case B_FREE:
-            final = value;
-            return true;
-
-        default:
-            break;
-    }
-
-    return false;
-}
-
-/* unprocess the value (outputs the external representation) */
-
-bool Restriction::unprocess(Restriction::Format fmt,
-        const Restriction::Value & value, Restriction::Value & final) const
-{
-    switch (_bounds)
-    {
-        case B_MAPS:
-
-            switch (fmt)
-            {
-                case F_USER:
-                {
-                    Map::const_iterator i = _map_from_cfg.find(value);
-
-                    if (i == _map_from_cfg.end())
-                        return false;
-
-                    final = (*i).second;
-                    return true;
-                }
-                default:
-                    break;
-            }
-
-        default:
-            final = value;
-            return true;
-    }
-}
-
-/***************************** *****************************/
-
-bool Restriction::get(Restriction::Format fmt, Restriction::Value & value) const
-{
-    if (_numeral != N_UNIQUE)
-        return false;
-
-    if (!unprocess(fmt, _value._unique, value))
-        return false;
-
-    return true;
-}
-
-bool Restriction::get(Restriction::Format fmt, Restriction::Vector & values) const
-{
-    if (_numeral != N_MULTIPLE)
-        return false;
-
-    const List & my_values = _value._multiple;
-
-    for (List::const_iterator i = my_values.begin(); i != my_values.end(); i++)
-    {
-        const Value & value = (*i);
-
-        Value   final;
-
-        if (!unprocess(fmt, value, final))
-            return false;
-
-        values.push_back(final);
-    };
-
-    return true;
-}
-
-/***************************** *****************************/
-
-bool Restriction::set(Restriction::Format fmt, const Restriction::Value & value)
-{
-    switch (_numeral)
-    {
-        case N_UNIQUE:
-        {
-            Value final;
-
-            if (!constThis().process(fmt, value, final))
-                return false;
-
-            _value._unique = final;
-            return true;
-        }
-
-        case N_MULTIPLE:
-        {
-            if (value == "@" || value == "#" || value == "")
-            {
-                _value._multiple.clear();
-                return true;
-            }
-
-            Strings::vector_type values;
-            Strings::tokenize(value, values, ",");
-
-            return set(fmt, values);
-        }
-
-        default:
-            return false;
-    }
-}
-
-bool Restriction::set(Restriction::Format fmt, const Restriction::Vector & values)
-{
-    if (_numeral != N_MULTIPLE)
-        return false;
-
-    if (values.empty())
-    {
-        _value._multiple.clear();
-    }
-    else
-    {
-        /* list needed to store temporary values */
-        List finals;
-
-        for (Vector::const_iterator i = values.begin(); i != values.end(); i++)
-        {
-            const Value & value = (*i);
-
-            Value   final;
-
-            if (!constThis().process(fmt, value, final))
-                return false;
-
-            finals.push_back(final);
-        }
-
-        List & lst = _value._multiple;
-
-        /* need to clear values set before */
-        lst.clear();
-
-        for (List::iterator i = finals.begin(); i != finals.end(); i++)
-        {
-            Value value = (*i);
-            lst.push_back(value);
-        }
-    };
-
-    return true;
-}
-
-/***************************** *****************************/
-
-void Restriction::allowed(Restriction::Vector & vals) const
-{
-    switch (_bounds)
-    {
-        case B_FREE:
-            return;
-
-        case B_LIST:
-            for (List::const_iterator i = _list.begin(); i != _list.end(); i++)
-                vals.push_back(*i);
-            break;
-
-        case B_MAPS:
-            for (Map::const_iterator i = _map_from_usr.begin(); i != _map_from_usr.end(); i++)
-                vals.push_back(i->first);
-            break;
-
-        case B_RANGE:
-        {
-            if (_kind != K_NUMBER)
-                return;
-
-            // is there any fraction?
-            bool has_fraction =
-                (!Restriction::equalNumber(_init, rint(_init))) ||
-                (!Restriction::equalNumber(_fini, rint(_fini))) ||
-                (!Restriction::equalNumber(_step, rint(_step)));
-
-            const char * format = (has_fraction ? "%.2f" : "%02.0f");
-
-            for (double i = _init; i <= _fini; i += _step)
-            {
-                char tmp[32];
-                snprintf(tmp, sizeof(tmp), format, i);
-                vals.push_back(std::string(tmp));
-            }
-            break;
-        }
-
-        default:
-            break;
-    }
-}
-
-void Restriction::init_class()
-{
-    _value._unique.clear();
-    _value._multiple.clear();
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.hpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.hpp
deleted file mode 100644
index 576560dbd4..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.hpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <stdarg.h>
-
-#include <string>
-#include <list>
-#include <vector>
-#include <map>
-
-#include <const_this.hpp>
-
-#ifndef _CONFIG_RESTRICTION_HPP_
-#define _CONFIG_RESTRICTION_HPP_
-
-struct Restriction: public ConstThis < Restriction >
-{
-    /* generic types */
-
-    // TODO: change this type name for something different
-    //       to avoid conflicting with "format.hpp".
-    enum Format
-    {
-        F_USER,
-        F_FILE
-    };
-
-    enum Kind
-    {
-        K_STRING,
-        K_NUMBER // = K_INTEGER // compatibility
-    };
-
-    enum Bounds
-    {
-        B_FREE,
-        B_RANGE,
-        B_LIST,
-        B_MAPS
-    };
-
-    enum Numeral
-    {
-        N_UNIQUE,
-        N_MULTIPLE
-    };
-
-    typedef std::string   Value;
-
-    /* types used for data input */
-    struct Pair
-    {
-        const char *pretty;
-        const char *value;
-    };
-
-    typedef std::pair < Value, Value >   PairMap;
-    typedef std::list < PairMap >        ListMap;
-
-    /* types used internally */
-    typedef std::map < Value, Value >           Map;
-    typedef std::vector < Value >            Vector;
-
-    typedef std::list < Value >                List;
-    typedef std::pair < Value, Value >       MapPair;
-
-    struct Generic
-    {
-        Value _unique;
-        List  _multiple;
-    };
-
-    Restriction(Kind kind, Numeral num)
-    : _kind(kind), _bounds(B_FREE), _numeral(num), _unit(""),
-      _init(-1), _fini(-1), _step(-1)
-    {
-        init_class();
-    }
-
-    Restriction(Kind kind, Numeral num,
-                double init, double fini, double step = 1)
-    : _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(""),
-      _init(init), _fini(fini), _step(step)
-    {
-        init_class();
-    }
-
-    Restriction(Kind kind, Numeral num,
-                const char *unit, double init, double fini, double step = 1.0)
-    : _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-      _init(init), _fini(fini), _step(step)
-    {
-        init_class();
-    }
-
-    Restriction(Kind kind, Numeral num,
-                std::string unit, double init, double fini, double step = 1.0)
-    : _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-      _init(init), _fini(fini), _step(step)
-    {
-        init_class();
-    }
-
-    Restriction(Kind kind, Numeral num,
-                const char *first, ...)
-    : _kind(kind), _bounds(B_LIST), _numeral(num), _unit(""),
-      _init(-1), _fini(-1), _step(-1)
-    {
-        _list.push_back(std::string(first));
-
-        va_list ap;
-        va_start(ap, first);
-
-        while (true)
-        {
-            const char *arg = va_arg(ap, const char *);
-
-            if (arg == NULL) break;
-
-            _list.push_back(std::string(arg));
-        }
-
-        init_class();
-    }
-
-    Restriction(Kind kind, const char *unit, Numeral num,
-                const char *first, ...)
-    : _kind(kind), _bounds(B_LIST), _numeral(num), _unit(unit),
-      _init(-1), _fini(-1), _step(-1)
-    {
-        _list.push_back(std::string(first));
-
-        va_list ap;
-        va_start(ap, first);
-
-        while (true)
-        {
-            const char *arg = va_arg(ap, const char *);
-
-            if (arg == NULL) break;
-
-            _list.push_back(std::string(arg));
-        }
-
-        init_class();
-    }
-
-    Restriction(Kind kind, Numeral num,
-                const struct Pair first, ...)
-    : _kind(kind), _bounds(B_MAPS), _numeral(num), _unit(""),
-      _init(-1), _fini(-1), _step(-1)
-    {
-        _map_from_usr.insert(MapPair(Value(first.pretty), Value(first.value)));
-        _map_from_cfg.insert(MapPair(Value(first.value), Value(first.pretty)));
-
-        va_list ap;
-        va_start(ap, first);
-
-        while (true)
-        {
-            Pair arg = va_arg(ap, Pair);
-
-            if (arg.pretty == NULL) break;
-
-            _map_from_usr.insert(MapPair(Value(arg.pretty), Value(arg.value)));
-            _map_from_cfg.insert(MapPair(Value(arg.value), Value(arg.pretty)));
-        }
-
-        init_class();
-    }
-
-    Restriction(Kind kind, Numeral num, List list)
-    : _kind(kind), _bounds(B_LIST), _numeral(num), _unit(""),
-      _init(-1), _fini(-1), _step(-1), _list(list)
-    {
-        init_class();
-    }
-
-    Restriction(Kind kind, Numeral num, ListMap map)
-    : _kind(kind), _bounds(B_MAPS), _numeral(num), _unit(""),
-      _init(-1), _fini(-1), _step(-1)
-    {
-        for (ListMap::iterator i = map.begin(); i != map.end(); i++)
-        {
-            _map_from_usr.insert(MapPair(Value((*i).first), Value((*i).second)));
-            _map_from_cfg.insert(MapPair(Value((*i).second), Value((*i).first)));
-        }
-
-        init_class();
-    }
-
-    const Kind          kind() const { return _kind;    };
-    const Bounds      bounds() const { return _bounds;  };
-    const Numeral    numeral() const { return _numeral; };
-
-    const std::string & unit() const { return _unit;    };
-
-    bool  set(Format, const Vector &);
-    bool  set(Format, const  Value &);
-
-    bool  get(Format, Vector &) const;
-    bool  get(Format,  Value &) const;
-
-    void  allowed(Vector &) const;
-
- private:
-    bool    process(const Format, const Value &, Value &) const;
-    bool  unprocess(const Format, const Value &, Value &) const;
-
-    void  init_class();
-
-    static bool equalNumber(const double, const double);
-
- protected:
-    const Kind      _kind;
-    const Bounds    _bounds;
-    const Numeral   _numeral;
-
-    Value     _unit;
-
-    const double    _init, _fini, _step;
-
-    Map       _map_from_usr,
-              _map_from_cfg;
-
-    List      _list;
-
-    Generic   _value;
-};
-
-#endif /* _CONFIG_RESTRICTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/section.cpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/section.cpp
deleted file mode 100644
index 9ed775b044..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/configurator/section.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <configurator/section.hpp>
-
-void Section::options(Section::OptionVector & vec) const
-{
-    for (OptionMap::const_iterator it = _options.begin(); it != _options.end();)
-    {
-        vec.push_back(const_cast< Option * >(&(it->second)));
-        ++it;
-    }
-}
-
-void Section::sections(Section::SectionVector & vec) const
-{
-    for (SectionMap::const_iterator it = _sections.begin(); it != _sections.end();)
-    {
-        vec.push_back(const_cast< Section * >(it->second));
-        ++it;
-    }
-}
-
-/*********/
-
-Option * Section::option_find(const std::string & str, bool recurse) const
-{
-    OptionMap::const_iterator i = _options.find(str);
-
-    if (i == _options.end())
-    {
-        if (!recurse)
-            throw OptionNotFound(str, _name);
-//            throw not_found();
-
-        for (SectionMap::const_iterator i = _sections.begin(); i != _sections.end(); i++)
-        {
-            try
-            {
-                return i->second->option_find(str, recurse);
-            }
-            catch (NotFound & e)
-            {
-                /* keep looping! */
-            };
-        }
-
-//        throw not_found();
-        throw OptionNotFound(str, _name);
-    }
-
-    return const_cast< Option * >(&(i->second));
-}
-
-/*
-Option * Section::option_find(const char * str, bool recurse)
-{
-    std::string sstr(str);
-    return option_find(sstr, recurse);
-}
-*/
-
-/*********/
-
-Section * Section::section_find(const std::string & str, bool recurse) const
-{
-    SectionMap::const_iterator i = _sections.find(str);
-
-    if (i == _sections.end())
-    {
-        if (!recurse)
-            throw SectionNotFound(str, _name);
-
-        for (SectionMap::const_iterator i = _sections.begin(); i != _sections.end(); i++)
-        {
-            try
-            {
-                return i->second->section_find(str, recurse);
-            }
-            catch (NotFound & e)
-            {
-                /* keep looping! */
-            };
-        }
-
-        throw SectionNotFound(str, _name);
-    }
-
-    return const_cast< Section * >(i->second);
-}
-
-/*
-Section * Section::section_find(const char * str, bool recurse)
-{
-    std::string sstr(str);
-    return section_find(sstr, recurse);
-}
-*/
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/section.hpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/section.hpp
deleted file mode 100644
index d5a8c95688..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/configurator/section.hpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _CONFIG_SECTION_HPP_
-#define _CONFIG_SECTION_HPP_
-
-#include <string>
-#include <vector>
-#include <map>
-#include <algorithm>
-#include <iostream>
-
-#include <format.hpp>
-
-#include <configurator/option.hpp>
-
-struct Section
-{
-    typedef std::map < std::string, Option >   OptionMap;
-    typedef std::vector< Option * >            OptionVector;
-
-    typedef std::map < std::string, Section * > SectionMap;
-    typedef std::vector < Section * >           SectionVector;
-
-    struct NotFound: public std::runtime_error
-    {
-        NotFound(const std::string & type, const std::string & name, const std::string & me)
-        : std::runtime_error(STG(FMT("%s '%s' not found on section '%s'") % type % name % me)) {};
-    };
-
-    struct OptionNotFound: public NotFound
-    {
-        OptionNotFound(const std::string & name, const std::string & me)
-        : NotFound("option", name, me) {};
-    };
-
-    struct SectionNotFound: public NotFound
-    {
-        SectionNotFound(const std::string & name, const std::string & me)
-        : NotFound("section", name, me) {};
-    };
-
-    typedef NotFound not_found; /* backward compatibility */
-
-// protected:
-    Section(const std::string & name, const std::string & desc, bool recursive = true)
-    : _name(name), _description(desc), _recursive(recursive) {};
-
-    void add(const Option & o)
-    {
-        _options.insert(std::pair<std::string,Option>(o.name(), o));
-    };
-
-    void del(const std::string & name)
-    {
-        _options.erase(name);
-    };
-
-    void add(Section * s)
-    {
-        _sections.insert(std::pair< std::string, Section * >(s->name(), s));
-    };
-
- public:
-    const std::string & name()        const { return _name;        };
-    const std::string & description() const { return _description; };
-
-    const bool          recursive()   const { return _recursive;   };
-
-    OptionMap::const_iterator option_begin()   const { return _options.begin(); };
-    OptionMap::const_iterator option_end()     const { return _options.end();   };
-
-    SectionMap::const_iterator section_begin() const { return _sections.begin(); };
-    SectionMap::const_iterator section_end()   const { return _sections.end();   };
-
-    /**/
-
-//    Option  *  option_find(const char *, bool recurse = false) const;
-//    Section * section_find(const char *, bool recurse = false) const;
-
-    Option  *  option_find(const std::string &, bool recurse = false) const;
-    Section * section_find(const std::string &, bool recurse = false) const;
-
-    /**/
-
-    void  options(OptionVector &)  const;
-    void sections(SectionVector &) const;
-
-    /**/
-
-    template < typename T, typename F >
-    bool search_and_apply(const std::string & key, T & value, F f)
-    {
-        OptionMap::iterator i = _options.find(key);
-
-        if (i != _options.end())
-            return f(i->second);
-
-        if (!_recursive)
-            return false;
-
-        return (find_if(_sections.begin(), _sections.end(), f) != _sections.end());
-    }
-
- private:
-    struct ConstKeyValue
-    {
-        ConstKeyValue(const std::string & k, const std::string &v)
-        : _k(k), _v(v) {};
-
-        const std::string & _k;
-        const std::string & _v;
-    };
-
-    struct KeyValue
-    {
-        KeyValue(const std::string & k, std::string &v)
-        : _k(k), _v(v) {};
-
-        const std::string & _k;
-              std::string & _v;
-    };
-
-    struct load_section: protected ConstKeyValue
-    {
-        load_section(const std::string & k, const std::string & v): ConstKeyValue(k,v) {};
-
-        bool operator()(Option & o)                 { return o.load(_v);            };
-        bool operator()(SectionMap::value_type & v) { return v.second->load(_k,_v); };
-    };
-
-    struct change_section: protected ConstKeyValue
-    {
-        change_section(const std::string & k, const std::string & v): ConstKeyValue(k,v) {};
-
-        bool operator()(Option & o)                 { return o.change(_v);            };
-        bool operator()(SectionMap::value_type & v) { return v.second->change(_k,_v); };
-    };
-
-    struct store_section: protected KeyValue
-    {
-        store_section(const std::string & k, std::string & v): KeyValue(k,v) {};
-
-        bool operator()(Option & o)                 { return o.store(_v);            };
-        bool operator()(SectionMap::value_type & v) { return v.second->store(_k,_v); };
-    };
-
-    struct set_section: protected ConstKeyValue
-    {
-        set_section(const std::string & k, const std::string & v): ConstKeyValue(k,v) {};
-
-        bool operator()(Option & o)                 { return (o.set(_v))[Option::F_ADJUSTED]; };
-        bool operator()(SectionMap::value_type & v) { return  v.second->set(_k,_v);           };
-    };
-
-    struct get_section: protected KeyValue
-    {
-        get_section(const std::string & k, std::string & v): KeyValue(k,v) {};
-
-        bool operator()(Option & o)                 { return o.get(_v);            };
-        bool operator()(SectionMap::value_type & v) { return v.second->get(_k,_v); };
-    };
-
-    struct modified_section
-    {
-        bool operator()(const OptionMap::value_type  & v) { return v.second.modified();  };
-        bool operator()(const SectionMap::value_type & v) { return v.second->modified(); };
-    };
-
- public:
-/*
-    bool load(const char * key, const std::string value)
-    {
-        std::string skey(key);
-        return search_and_apply(skey, value, load_section(skey, value));
-    }
-*/
-    bool load(const std::string & key, const std::string & value)
-    {
-        return search_and_apply(key, value, load_section(key, value));
-    }
-
-    bool change(const std::string & key, const std::string & value)
-    {
-        return search_and_apply(key, value, change_section(key, value));
-    }
-
-    bool store(const std::string & key, std::string & value)
-    {
-        return search_and_apply(key, value, store_section(key, value));
-    }
-
-    bool set(const std::string & key, const std::string & value)
-    {
-        return search_and_apply(key, value, set_section(key, value));
-    }
-
-    bool get(const std::string & key, std::string & value)
-    {
-        return search_and_apply(key, value, get_section(key, value));
-    }
-
-    bool modified() const
-    {
-        return ((find_if(_options.begin(),  _options.end(),  modified_section()) != _options.end()) ||
-                (find_if(_sections.begin(), _sections.end(), modified_section()) != _sections.end()));
-    }
-
- private:
-    Section(): _name(""), _description(""), _recursive(false) {};
-
- protected:
-    const std::string   _name;
-    const std::string   _description;
-
-    OptionMap           _options;
-    SectionMap          _sections;
-
-    const bool          _recursive;
-};
-
-#endif /* _CONFIG_SECTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/const_this.hpp b/src/mod/endpoints/mod_khomp/commons/base/const_this.hpp
deleted file mode 100644
index 48e3c1e32f..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/const_this.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#ifndef _CONST_THIS_H_
-#define _CONST_THIS_H_
-
-template < typename T >
-struct ConstThis
-{
-    T const & constThis() const
-    {
-        // TODO: will this return the right reference?
-        return static_cast<const T&>(*this);
-    }
-};
-
-#endif /* _CONST_THIS_H_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/flagger.hpp b/src/mod/endpoints/mod_khomp/commons/base/flagger.hpp
deleted file mode 100644
index 49a4adda0f..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/flagger.hpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <map>
-
-#include <initializer.hpp>
-
-#ifndef _FLAGGER_HPP_
-#define _FLAGGER_HPP_
-
-template < typename Flag >
-struct Flagger
-{
- protected:
-    struct Bool
-    {
-        Bool():        value(false) {};
-        Bool(bool &v): value(v)     {};
-
-        bool value;
-    };
-
-    typedef std::map< Flag, Bool >  Map;
-
- public:
-    typedef  Initializer< Flag >  InitFlags;
-
-    Flagger() {};
-
-    Flagger(InitFlags flags)
-    {
-        for (typename InitFlags::iterator i = flags.begin(); i != flags.end(); i++)
-        {
-            Flag & flag = (*i);
-            _map[flag].value = true;
-        };
-    };
-
-    void set(Flag elt, bool value = true)
-    {
-        _map[elt].value = value;
-    }
-
-    bool is_set(Flag elt)
-    {
-        return _map[elt].value;
-    }
-
-    Flagger & operator&(Flag elt)
-    {
-        set(elt);
-        return *this;
-    };
-
-    bool operator[](Flag elt)
-    {
-        return is_set(elt);
-    };
-
- protected:
-     Map _map;
-};
-
-#endif /* _FLAGGER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/format.cpp b/src/mod/endpoints/mod_khomp/commons/base/format.cpp
deleted file mode 100644
index 74223cc406..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/format.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include "format.hpp"
-//#include <iostream>
-
-void FormatTraits::initialize(const char * format_string)
-{
-    std::string txt;
-
-    const char * ptr = format_string;
-
-    while (*ptr != '\0')
-    {
-        if (*ptr != '%')
-        {
-            txt += *ptr;
-            ++ptr;
-            continue;
-        }
-
-        const char * ptr2 = ptr+1;
-
-        if (*ptr2 == '%')
-        {
-            txt += *ptr;
-            ptr += 2;
-            continue;
-        }
-
-        if (!txt.empty())
-            push_argument(txt, T_LITERAL);
-
-        std::string arg(1, *ptr);
-
-        ++ptr;
-
-        bool finished = false;
-
-        short long_count = 0;
-        short short_count = 0;
-
-        while(*ptr != '\0' && !finished)
-        {
-            switch (*ptr)
-            {
-                case ' ':
-                    // uncomplete format with ' ', make it a literal.
-                    arg += *ptr;
-                    push_argument(arg, T_LITERAL);
-                    finished = true;
-                    break;
-
-                case '%':
-                    // uncomplete format with '%', make it a literal and start a new format.
-                    push_argument(arg, T_LITERAL);
-                    arg += *ptr;
-                    break;
-
-                case 'h':
-                    short_count = std::min<short>(short_count+1, 2);
-                    long_count = 0;
-                    arg += *ptr;
-                    break;
-
-                case 'l':
-                    long_count = std::min<short>(long_count+1, 2);
-                    short_count = 0;
-                    arg += *ptr;
-                    break;
-
-                case 'd':
-                case 'i':
-                    arg += *ptr;
-                    switch (long_count - short_count)
-                    {
-                        case  2:
-                            push_argument(arg, T_SIGNED_LONG_LONG);
-                            break;
-                        case  1:
-                            push_argument(arg, T_SIGNED_LONG);
-                            break;
-                        case  0:
-                            push_argument(arg, T_SIGNED_INT);
-                            break;
-                        case -1:
-                            push_argument(arg, T_SIGNED_SHORT);
-                            break;
-                        case -2:
-                            push_argument(arg, T_SIGNED_SHORT_SHORT);
-                            break;
-                        default:
-                            break;
-                    }
-                    finished = true;
-                    break;
-
-                case 'o':
-                case 'u':
-                case 'x':
-                case 'X':
-                    arg += *ptr;
-                    switch (long_count - short_count)
-                    {
-                        case  2:
-                            push_argument(arg, T_UNSIGNED_LONG_LONG);
-                            break;
-                        case  1:
-                            push_argument(arg, T_UNSIGNED_LONG);
-                            break;
-                        case  0:
-                            push_argument(arg, T_UNSIGNED_INT);
-                            break;
-                        case -1:
-                            push_argument(arg, T_UNSIGNED_SHORT);
-                            break;
-                        case -2:
-                            push_argument(arg, T_UNSIGNED_SHORT_SHORT);
-                            break;
-                        default:
-                            break;
-                    }
-                    finished = true;
-                    break;
-
-                case 'e':
-                case 'E':
-                case 'f':
-                case 'F':
-                case 'g':
-                case 'G':
-                case 'a':
-                case 'A':
-                    arg += *ptr;
-                    push_argument(arg, T_FLOAT);
-                    finished = true;
-                    break;
-
-                case 'c':
-                    arg += *ptr;
-                    push_argument(arg, T_CHAR);
-                    finished = true;
-                    break;
-
-                case 's':
-                    arg += *ptr;
-                    push_argument(arg, T_STRING);
-                    finished = true;
-                    break;
-
-                case 'p':
-                    arg += *ptr;
-                    push_argument(arg, T_POINTER);
-                    finished = true;
-                    break;
-
-                case 'C':
-                case 'S':
-                case 'm':
-                case 'n': // unsupported for now.
-                    arg += *ptr;
-                    push_argument(arg, T_ANYTHING);
-                    finished = true;
-                    break;
-
-                default:
-                    arg += *ptr;
-                    break;
-            }
-
-            ++ptr;
-        }
-
-        if (!arg.empty())
-            push_argument(arg, T_LITERAL);
-    }
-
-    if (!txt.empty())
-        push_argument(txt, T_LITERAL);
-}
-
-void FormatTraits::push_argument(std::string & data, FormatTraits::Type type)
-{
-//    std::cerr << "pushing type (" << type << ") with format (" << data << ")" << std::endl;
-
-    _args.push(Argument(data, type));
-    data.clear();
-}
-
-void FormatTraits::pop_argument(void)
-{
-    _args.pop();
-}
-
-const FormatTraits::Argument * FormatTraits::next_argument(void)
-{
-//    std::cerr << "size: " << _args.size() << std::endl;
-
-    while (true)
-    {
-//        std::cerr << "loop size: " << _args.size() << std::endl;
-
-        if (_args.empty())
-            return NULL; // throw NoArgumentLeft();
-
-        const Argument & top = _args.front();
-
-        if (top.type() == T_LITERAL)
-        {
-//            std::cerr << "top type == LITERAL, looping..." << std::endl;
-            _result += top.fmts();
-            pop_argument();
-        }
-        else
-        {
-//            std::cerr << "top type: " << top.type() << std::endl;
-            return &top;
-        }
-    }
-}
-
-/******************************************************************/
-
-#if 0
-Format::Format(const char  * format_string, bool raise_exception)
-: _format(format_string), _valid(true), _raise(raise_exception)
-{
-    FormatTraits::initialize(format_string);
-}
-
-Format::Format(std::string   format_string, bool raise_exception)
-: _format(format_string), _valid(true), _raise(raise_exception)
-{
-    FormatTraits::initialize(format_string.c_str());
-}
-
-/*
-Format::Format(std::string & format_string, bool raise_exception)
-: _format(NULL), _valid(true), _raise(raise_exception)
-{
-    initialize(format_string.c_str());
-}
-*/
-
-void Format::mark_invalid(std::string & msg)
-{
-    if (_valid)
-    {
-        _valid = false;
-
-        _result  = "** INVALID FORMAT: ";
-        _result += msg;
-        _result += " **";
-    }
-}
-
-void Format::raise(void) const
-{
-    if (!_valid)
-    {
-        // call specialized class
-        FormatException::raise(_result);
-    }
-}
-
-bool Format::valid(void) const
-{
-//    raise();
-    return _valid;
-}
-
-std::string Format::str()
-{
-    if (!valid())
-        return _result;
-
-//    try
-//    {
-    if (next_argument() != NULL)
-    {
-        std::string msg;
-
-        msg += "too few arguments passed for format '";
-        msg += _format;
-        msg += "' (";
-        msg += _format;
-        msg += ")";
-
-        mark_invalid(msg);
-
-        return _result;
-    }
-//    catch (NoArgumentLeft e)
-//    {
-//        return _result;
-//    }
-}
-
-#endif
diff --git a/src/mod/endpoints/mod_khomp/commons/base/format.hpp b/src/mod/endpoints/mod_khomp/commons/base/format.hpp
deleted file mode 100644
index 0469e4fdf9..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/format.hpp
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _FORMAT_H_
-#define _FORMAT_H_
-
-#include <cstring>
-#include <cstdlib>
-#include <typeinfo>
-#include <stdexcept>
-#include <string>
-#include <queue>
-#include <iostream>
-#include <stdio.h>
-
-#ifdef WIN32 // WINDOWS
-# include <KHostSystem.h>
-#endif
-
-struct InvalidFormat
-{
-    InvalidFormat(std::string _msg) : msg(_msg) {}
-    const std::string msg;
-};
-
-template < bool E >
-struct FormatException
-{
-    void raise(const std::string & msg) const
-    {
-        /* DO NOTHING */
-    };
-};
-
-template < >
-struct FormatException < true >
-{
-    void raise(const std::string & msg) const
-    {
-        throw InvalidFormat(msg);
-    };
-};
-
-struct FormatTraits
-{
-    enum Type
-    {
-        T_ANYTHING = 1,
-
-        T_SIGNED_SHORT,
-        T_SIGNED_SHORT_SHORT,
-        T_SIGNED_INT,
-        T_SIGNED_LONG,
-        T_SIGNED_LONG_LONG,
-
-        T_UNSIGNED_SHORT,
-        T_UNSIGNED_SHORT_SHORT,
-        T_UNSIGNED_INT,
-        T_UNSIGNED_LONG,
-        T_UNSIGNED_LONG_LONG,
-
-        T_FLOAT,
-        T_CHAR,
-
-        T_POINTER,
-        T_STRING,
-
-        T_LITERAL
-    };
-
-    struct Argument
-    {
-        Argument(std::string fmts, Type type)
-        : _fmts(fmts), _type(type) {};
-
-        const Type          type(void) const { return _type; }
-        const std::string & fmts(void) const { return _fmts; }
-
-     protected:
-        const std::string _fmts;
-        const Type        _type;
-    };
-
-    typedef std::queue < Argument > ArgumentQueue;
-
-    //////////////////////////////////
-
-    template < typename V >
-    bool number_verify_signed_short( V value ) const
-    {
-        return
-           ((typeid(V) == typeid(short int) ||
-             typeid(V) == typeid(short) ||
-             typeid(V) == typeid(const short int) ||
-             typeid(V) == typeid(const short) ||
-             typeid(V) == typeid(volatile short int) ||
-             typeid(V) == typeid(volatile short)) &&
-             sizeof(V) == sizeof(short));
-    }
-
-    template < typename V >
-    bool number_verify_unsigned_short( V value ) const
-    {
-        return
-           ((typeid(V) == typeid(unsigned short int) ||
-             typeid(V) == typeid(unsigned short) ||
-             typeid(V) == typeid(const unsigned short int) ||
-             typeid(V) == typeid(const unsigned short) ||
-             typeid(V) == typeid(volatile unsigned short int) ||
-             typeid(V) == typeid(volatile unsigned short)) &&
-             sizeof(V) == sizeof(unsigned short));
-    }
-
-    template < typename V >
-    bool number_verify_signed_long( V value ) const
-    {
-        return
-           ((typeid(V) == typeid(long int) ||
-             typeid(V) == typeid(long) ||
-             typeid(V) == typeid(const long int) ||
-             typeid(V) == typeid(const long) ||
-             typeid(V) == typeid(volatile long int) ||
-             typeid(V) == typeid(volatile long)) &&
-             sizeof(V) == sizeof(long));
-    }
-
-    template < typename V >
-    bool number_verify_unsigned_long( V value ) const
-    {
-        return
-           ((typeid(V) == typeid(unsigned long int) ||
-             typeid(V) == typeid(unsigned long) ||
-             typeid(V) == typeid(const unsigned long int) ||
-             typeid(V) == typeid(const unsigned long) ||
-             typeid(V) == typeid(volatile unsigned long int) ||
-             typeid(V) == typeid(volatile unsigned long)) &&
-             sizeof(V) == sizeof(long long));
-    }
-
-    template < typename V >
-    bool number_verify_signed_long_long( V value ) const
-    {
-        return
-           ((typeid(V) == typeid(long long int) ||
-             typeid(V) == typeid(long long) ||
-             typeid(V) == typeid(const long long int) ||
-             typeid(V) == typeid(const long long) ||
-             typeid(V) == typeid(volatile long long) ||
-             typeid(V) == typeid(volatile long long int)) &&
-             sizeof(V) == sizeof(long long));
-    }
-
-    template < typename V >
-    bool number_verify_unsigned_long_long( V value ) const
-    {
-        return
-           ((typeid(V) == typeid(unsigned long long int) ||
-             typeid(V) == typeid(unsigned long long) ||
-             typeid(V) == typeid(const unsigned long long int) ||
-             typeid(V) == typeid(const unsigned long long) ||
-             typeid(V) == typeid(volatile unsigned long long) ||
-             typeid(V) == typeid(volatile unsigned long long int)) &&
-             sizeof(V) == sizeof(unsigned long long));
-    }
-
-    template < typename V >
-    bool number_verify_signed_int( V value ) const
-    {
-        return
-            (sizeof(V) <= sizeof(int) ||
-             typeid(V) == typeid(int) ||
-             typeid(V) == typeid(const int) ||
-             typeid(V) == typeid(volatile int));
-    }
-
-    template < typename V >
-    bool number_verify_unsigned_int( V value ) const
-    {
-        return
-            (sizeof(V) <= sizeof(unsigned int) ||
-             typeid(V) == typeid(unsigned int) ||
-             typeid(V) == typeid(const unsigned int) ||
-             typeid(V) == typeid(volatile unsigned int));
-    }
-
-    template < typename V >
-    bool generic_verify( V value, const Type type ) const
-    {
-        switch (type)
-        {
-            /* EXCEPTION: consider any number an valid input. */
-            case T_SIGNED_INT:
-            case T_UNSIGNED_INT:
-                return
-                    (number_verify_signed_int(value)     ||
-                     number_verify_unsigned_int(value)   ||
-                     number_verify_signed_long(value)    ||
-                     number_verify_unsigned_long(value)  ||
-                     number_verify_signed_short(value)   ||
-                     number_verify_unsigned_short(value));
-
-            case T_SIGNED_SHORT_SHORT:
-                return (typeid(V) == typeid(char) || typeid(V) == typeid(const char));
-
-            case T_SIGNED_SHORT:
-                return number_verify_signed_short(value);
-
-            case T_SIGNED_LONG:
-                return number_verify_signed_long(value);
-
-            case T_SIGNED_LONG_LONG:
-                return number_verify_signed_long_long(value);
-
-            case T_UNSIGNED_SHORT_SHORT:
-                return (typeid(V) == typeid(unsigned char) || typeid(V) == typeid(unsigned char));
-
-            case T_UNSIGNED_SHORT:
-                return number_verify_unsigned_short(value);
-
-            case T_UNSIGNED_LONG:
-                return number_verify_unsigned_long(value);
-
-            case T_UNSIGNED_LONG_LONG:
-                return number_verify_unsigned_long_long(value);
-
-            case T_FLOAT:
-                return (typeid(V) == typeid(float)) || (typeid(V) == typeid(double) ||
-                    typeid(V) == typeid(const float)) || (typeid(V) == typeid(const double));
-
-            case T_CHAR:
-                return (typeid(V) == typeid(char)) || (typeid(V) == typeid(unsigned char) ||
-                    typeid(V) == typeid(const char)) || (typeid(V) == typeid(const unsigned char));
-
-            case T_POINTER:
-            case T_STRING:
-                return false;
-
-            case T_ANYTHING:
-                return true;
-
-            case T_LITERAL:
-                return false;
-        }
-
-        return false;
-    };
-
-    const Argument * next_argument(void);
-
-    void push_argument(std::string & data, const Type type);
-    void pop_argument(void);
-
-    void initialize(const char *);
-
-  protected:
-    ArgumentQueue _args;
-    std::string   _result;
-
-};
-
-template < bool E = false >
-struct FormatBase: protected FormatTraits, protected FormatException < E >
-{
-    static const unsigned int strings_base_length = 64;
-    static const unsigned int generic_base_length = 64;
-
-    explicit FormatBase(const char  * format_string)
-    : _format(format_string), _valid(true)
-    {
-        FormatTraits::initialize(format_string);
-    };
-
-    explicit FormatBase(std::string   format_string)
-    : _format(format_string), _valid(true)
-    {
-        FormatTraits::initialize(format_string.c_str());
-    };
-
-    bool valid(void) const
-    {
-        return _valid;
-    }
-
-    const std::string str()
-    {
-        if (valid() && (next_argument() != NULL))
-        {
-            std::string msg;
-
-            // TODO: why format appears two times?
-            msg += "too few arguments passed for format '";
-            msg += _format;
-            msg += "' (";
-            msg += _format;
-            msg += ")";
-
-            mark_invalid(msg);
-        }
-
-        raise();
-        return _result;
-    };
-
-    ////////////////////////////////////////////////////////////
-
-    template < typename V >
-    FormatBase & operator%( V value )
-    {
-        if (!valid())
-            return *this;
-
-        const Argument * top = next_argument();
-
-        if (top == NULL)
-        {
-            std::string msg;
-
-            msg += "too many arguments passed for format '";
-            msg += _format;
-            msg += "'";
-
-            mark_invalid(msg);
-        }
-        else
-        {
-            char temp[generic_base_length];
-
-            if (!FormatTraits::generic_verify(value, top->type()))
-            {
-                std::string msg;
-
-                msg += "type mismatch: got type '";
-                msg += typeid(value).name();
-                msg += "' in format '";
-                msg += top->fmts();
-                msg += "' (";
-                msg += _format;
-                msg += ")";
-
-                mark_invalid(msg);
-                return *this;
-            }
-
-            snprintf(temp, sizeof(temp), top->fmts().c_str(), value);
-            _result += temp;
-
-            pop_argument();
-        }
-
-        raise();
-        return *this;
-    }
-
-    template < typename V >
-    FormatBase & operator%( V * value )
-    {
-        if (!valid())
-            return *this;
-
-        const Argument * top = next_argument();
-
-        if (top == NULL)
-        {
-            std::string msg;
-
-            msg += "too many arguments passed for format '";
-            msg += _format;
-            msg += "'";
-
-            mark_invalid(msg);
-        }
-        else
-        {
-            switch (top->type())
-            {
-                case T_POINTER:
-                {
-                    char temp[generic_base_length];
-                    snprintf(temp, sizeof(temp), top->fmts().c_str(), value);
-                    _result += temp;
-                    break;
-                }
-
-                case T_STRING:
-                {
-                    if ((typeid(const char)          == typeid(V)) ||
-                        (typeid(char)                == typeid(V)) ||
-                        (typeid(const unsigned char) == typeid(V)) ||
-                        (typeid(unsigned char)       == typeid(V)) ||
-                        (typeid(const void)          == typeid(V)) ||
-                        (typeid(void)                == typeid(V)))
-                    {
-                        int len = strlen((const char*)value)+strings_base_length+1;
-
-                        char * temp = new char[len];
-
-                        snprintf(temp, len, top->fmts().c_str(), value);
-                        _result += temp;
-
-                        delete[] temp;
-                    }
-                    else
-                    {
-                        std::string msg;
-
-                        msg += "type mismatch: got type '";
-                        msg += typeid(value).name();
-                        msg += "' in string format (";
-                        msg += _format;
-                        msg += ")";
-
-                        mark_invalid(msg);
-                    }
-                    break;
-                }
-
-                default:
-                {
-                    std::string msg;
-
-                    msg += "type mismatch: got pointer/string type in format '";
-                    msg += top->fmts();
-                    msg += "' (";
-                    msg += _format;
-                    msg += ")";
-
-                    mark_invalid(msg);
-                    break;
-                }
-            }
-
-            pop_argument();
-        }
-
-        raise();
-        return *this;
-    }
-
-    FormatBase & operator%( const std::string value )
-    {
-        if (!valid())
-            return *this;
-
-        const Argument * top = next_argument();
-
-        if (top == NULL)
-        {
-            std::string msg;
-
-            msg += "too many arguments passed for format '";
-            msg += _format;
-            msg += "'";
-
-            mark_invalid(msg);
-        }
-        else
-        {
-            if (top->type() == T_STRING)
-            {
-                int len = value.length()+strings_base_length+1;
-
-                char * temp = new char[len];
-
-                snprintf(temp, len, top->fmts().c_str(), value.c_str());
-                _result += temp;
-
-                delete[] temp;
-            }
-            else
-            {
-                std::string msg;
-
-                msg += "type mismatch: got string type in format '";
-                msg += top->fmts();
-                msg += "' (";
-                msg += _format;
-                msg += ")";
-
-                mark_invalid(msg);
-            }
-
-            pop_argument();
-        }
-
-        raise();
-        return *this;
-    }
-
-  protected:
-    void mark_invalid(std::string & msg)
-    {
-        if (_valid)
-        {
-            _valid = false;
-
-            _result  = "** INVALID FORMAT: ";
-            _result += msg;
-            _result += " **";
-        }
-    }
-
-    void raise(void) const
-    {
-        if (!_valid)
-        {
-            // call specialized class
-            FormatException< E >::raise(_result);
-        }
-    }
-
- private:
-    const std::string _format;
-    bool              _valid;
-};
-
-/* useful typedef for general usage (not generating exceptions) */
-typedef FormatBase<> Format;
-
-/* macros used for shortening lines and making the code clearer */
-#define STG(x) (x).str()
-#define FMT(x) Format(x)
-
-#endif /* _FORMAT_H_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/function.hpp b/src/mod/endpoints/mod_khomp/commons/base/function.hpp
deleted file mode 100644
index 7470bf245d..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/function.hpp
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the "LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <refcounter.hpp>
-
-#ifndef _FUNCTION_HPP_
-#define _FUNCTION_HPP_
-
-namespace Function
-{
-    struct EmptyFunction     {};
-    struct NonMemberFunction {};
-
-    /**/
-
-    template < typename FunctionTraits >
-    struct StorageBase: COUNTER_SUPER(StorageBase < FunctionTraits >)
-    {
-        typedef typename FunctionTraits::BaseType BaseType;
-
-        typedef typename FunctionTraits::FunType  FunType;
-        typedef typename FunctionTraits::ObjType  ObjType;
-
-        template < typename Functor >
-        StorageBase(const Functor f)
-        : _object(reinterpret_cast< ObjType >(new Functor(f))),
-          _function(reinterpret_cast< FunType >(&Functor::operator())),
-          _malloced(true)
-        {};
-
-        template < typename Functor >
-        StorageBase(Functor & f, bool malloced)
-        : _object(reinterpret_cast< ObjType >((malloced ? new Functor(f) : &f))),
-          _function(reinterpret_cast< FunType >(&Functor::operator())),
-          _malloced(malloced)
-        {};
-
-        StorageBase(FunType const * member)
-        : _object(reinterpret_cast< ObjType >(0)),
-          _function(reinterpret_cast< FunType >(member)),
-          _malloced(false)
-        {};
-
-        StorageBase()
-        : _object(reinterpret_cast< ObjType >(0)),
-          _function(reinterpret_cast< FunType >(0)),
-          _malloced(false)
-        {};
-
-        StorageBase(const StorageBase & o)
-        : COUNTER_REFER(o, StorageBase < FunctionTraits >),
-           _object(o._object), _function(o._function), _malloced(o._malloced)
-        {};
-
-        virtual ~StorageBase() {};
-
-        void unreference()
-        {
-            // TODO: will this work if we delete a different type? //
-            if (_malloced)
-                delete _object;
-        };
-
-        template < typename Functor >
-        void operator=(Functor f)
-        {
-            _object   = reinterpret_cast< ObjType >(new Functor(f)),
-            _function = reinterpret_cast< FunType >(&Functor::operator());
-            _malloced = true;
-        }
-
-     protected:
-        ObjType _object;
-        FunType _function;
-        bool    _malloced;
-    };
-
-    /**/
-
-    template < typename R >
-    struct VTable0
-    {
-        R operator()(void) { return R(); };
-    };
-
-    template < >
-    struct VTable0< void >
-    {
-        void operator()(void) { return; };
-    };
-
-    template < typename R >
-    struct Function0Traits
-    {
-        typedef VTable0<R> BaseType;
-
-        typedef R (BaseType::* FunType)(void);
-        typedef BaseType *     ObjType;
-    };
-
-    /**/
-
-    template < typename R, typename A0 >
-    struct VTable1
-    {
-        R operator()(A0 a0) { return R(); };
-    };
-
-    template < typename A0 >
-    struct VTable1< void, A0 >
-    {
-        void operator()(A0 a0) { return; };
-    };
-
-    template < typename R, typename A0 >
-    struct Function1Traits
-    {
-        typedef VTable1<R, A0> BaseType;
-
-        typedef R (BaseType::* FunType)(A0);
-        typedef BaseType *     ObjType;
-    };
-
-    /**/
-
-    template < typename R, typename A0, typename A1 >
-    struct VTable2
-    {
-        R operator()(A0 a0, A1) { return R(); };
-    };
-
-    template < typename A0, typename A1 >
-    struct VTable2< void, A0, A1 >
-    {
-        void operator()(A0 a0, A1 a1) { return; };
-    };
-
-    template < typename R, typename A0, typename A1 >
-    struct Function2Traits
-    {
-        typedef VTable2<R, A0, A1> BaseType;
-
-        typedef R (BaseType::* FunType)(A0, A1);
-        typedef BaseType *     ObjType;
-    };
-
-    /**/
-
-    template < typename R, typename A0, typename A1, typename A2 >
-    struct VTable3
-    {
-        R operator()(A0 a0, A1 a1, A2 a2) { return R(); };
-    };
-
-    template < typename A0, typename A1, typename A2 >
-    struct VTable3< void, A0, A1, A2 >
-    {
-        void operator()(A0 a0, A1 a1, A2 a2) { return; };
-    };
-
-    template < typename R, typename A0, typename A1, typename A2 >
-    struct Function3Traits
-    {
-        typedef VTable3<R, A0, A1, A2> BaseType;
-
-        typedef R (BaseType::* FunType)(A0, A1, A2);
-        typedef BaseType *     ObjType;
-    };
-
-    /**/
-
-    template < typename R, typename A0, typename A1, typename A2, typename A3 >
-    struct VTable4
-    {
-        R operator()(A0 a0, A1 a1, A2 a2, A3 a3) { return R(); };
-    };
-
-    template < typename A0, typename A1, typename A2, typename A3 >
-    struct VTable4< void, A0, A1, A2, A3 >
-    {
-        void operator()(A0 a0, A1 a1, A2 a2, A3 a3) { return; };
-    };
-
-    template < typename R, typename A0, typename A1, typename A2, typename A3 >
-    struct Function4Traits
-    {
-        typedef VTable4<R, A0, A1, A2, A3> BaseType;
-
-        typedef R (BaseType::* FunType)(A0, A1, A2, A3);
-        typedef BaseType *     ObjType;
-    };
-
-    /**/
-
-    template < typename R, typename A0 >
-    struct Function0 : public StorageBase < Function0Traits < R > >
-    {
-        typedef StorageBase < Function0Traits < R > >  Storage;
-
-        template < typename Functor >
-        Function0(const Functor f)
-        : Storage(f) {};
-
-        template < typename Functor >
-        Function0(Functor & f, bool m)
-        : Storage(f, m) {};
-
-        Function0(const typename Function0Traits < R >::FunType * m)
-        : Storage(m) {};
-
-        Function0() {};
-
-        R operator()(void)
-        {
-            if (reinterpret_cast<void *>(Storage::_object) == 0)
-                throw EmptyFunction();
-
-            return ((Storage::_object)->*(Storage::_function))();
-        }
-
-        template < typename Object >
-        R operator()(Object * object)
-        {
-            if (reinterpret_cast<void *>(Storage::_function) == 0)
-                throw EmptyFunction();
-
-            if (reinterpret_cast<void *>(Storage::_object) != 0)
-                throw NonMemberFunction();
-
-            return (reinterpret_cast< typename Function0Traits < R >::ObjType *>(object)->*(Storage::_function))();
-        }
-    };
-
-    template < typename R, typename A0 >
-    struct Function1 : public StorageBase < Function1Traits < R, A0 > >
-    {
-        typedef StorageBase < Function1Traits < R, A0 > >  Storage;
-
-        template < typename Functor >
-        Function1(const Functor f)
-        : Storage(f) {};
-
-        template < typename Functor >
-        Function1(Functor & f, bool m)
-        : Storage(f, m) {};
-
-        Function1(const typename Function1Traits < R, A0 >::FunType * m)
-        : Storage(m) {};
-
-        Function1() {};
-
-        R operator()(A0 a0)
-        {
-            if (reinterpret_cast<void *>(Storage::_object) == 0)
-                throw EmptyFunction();
-
-            return ((Storage::_object)->*(Storage::_function))(a0);
-        }
-
-        template < typename Object >
-        R operator()(Object * object, A0 a0)
-        {
-            if (reinterpret_cast<void *>(Storage::_function) == 0)
-                throw EmptyFunction();
-
-            if (reinterpret_cast<void *>(Storage::_object) != 0)
-                throw NonMemberFunction();
-
-            return (reinterpret_cast< typename Function1Traits < R, A0 >::ObjType *>(object)->*(Storage::_function))(a0);
-        }
-    };
-
-    template < typename R, typename A0, typename A1 >
-    struct Function2 : public StorageBase < Function2Traits < R, A0, A1 > >
-    {
-        typedef StorageBase < Function2Traits < R, A0, A1 > >  Storage;
-
-        template < typename Functor >
-        Function2(const Functor f)
-        : Storage(f) {};
-
-        template < typename Functor >
-        Function2(Functor & f, bool m)
-        : Storage(f, m) {};
-
-        Function2(const typename Function2Traits < R, A0, A1 >::FunType * m)
-        : Storage(m) {};
-
-        Function2() {};
-
-        R operator()(A0 a0, A1 a1)
-        {
-            if (reinterpret_cast<void *>(Storage::_object) == 0)
-                throw EmptyFunction();
-
-            return ((Storage::_object)->*(Storage::_function))(a0, a1);
-        }
-
-        template < typename Object >
-        R operator()(Object * object, A0 a0, A1 a1)
-        {
-            if (reinterpret_cast<void *>(Storage::_function) == 0)
-                throw EmptyFunction();
-
-            if (reinterpret_cast<void *>(Storage::_object) != 0)
-                throw NonMemberFunction();
-
-            return (reinterpret_cast< typename Function2Traits < R, A0, A1 >::ObjType *>(object)->*(Storage::_function))(a0, a1);
-        }
-    };
-
-    template < typename R, typename A0, typename A1, typename A2 >
-    struct Function3 : public StorageBase < Function3Traits < R, A0, A1, A2 > >
-    {
-        typedef StorageBase < Function3Traits < R, A0, A1, A2 > >  Storage;
-
-        template < typename Functor >
-        Function3(const Functor f)
-        : Storage(f) {};
-
-        template < typename Functor >
-        Function3(Functor & f, bool m)
-        : Storage(f, m) {};
-
-        Function3(const typename Function3Traits < R, A0, A1, A2 >::FunType * m)
-        : Storage(m) {};
-
-        Function3() {};
-
-        R operator()(A0 a0, A1 a1, A2 a2)
-        {
-            if (reinterpret_cast<const void *>(Storage::_object) == 0)
-                throw EmptyFunction();
-
-            return ((Storage::_object)->*(Storage::_function))(a0, a1, a2);
-        }
-
-        template < typename Object >
-        R operator()(Object * object, A0 a0, A1 a1, A2 a2)
-        {
-            if (reinterpret_cast<void *>(Storage::_function) == 0)
-                throw EmptyFunction();
-
-            if (reinterpret_cast<void *>(Storage::_object) != 0)
-                throw NonMemberFunction();
-
-            return (reinterpret_cast< typename Function3Traits < R, A0, A1, A2 >::ObjType *>(object)->*(Storage::_function))(a0, a1, a2);
-        }
-    };
-
-    template < typename R, typename A0, typename A1, typename A2, typename A3 >
-    struct Function4 : public StorageBase < Function4Traits < R, A0, A1, A2, A3 > >
-    {
-        typedef StorageBase < Function4Traits < R, A0, A1, A2, A3 > >  Storage;
-
-        template < typename Functor >
-        Function4(const Functor f)
-        : Storage(f) {};
-
-        template < typename Functor >
-        Function4(Functor & f, bool m)
-        : Storage(f, m) {};
-
-        Function4(const typename Function4Traits < R, A0, A1, A2, A3 >::FunType * m)
-        : Storage(m) {};
-
-        Function4() {};
-
-        R operator()(A0 a0, A1 a1, A2 a2, A3 a3)
-        {
-            if (reinterpret_cast<void *>(Storage::_object) == 0)
-                throw EmptyFunction();
-
-            return ((Storage::_object)->*(Storage::_function))(a0, a1, a2, a3);
-        }
-
-        template < typename Object >
-        R operator()(Object * object, A0 a0, A1 a1, A2 a2, A3 a3)
-        {
-            if (reinterpret_cast<void *>(Storage::_function) == 0)
-                throw EmptyFunction();
-
-            if (reinterpret_cast<void *>(Storage::_object) != 0)
-                throw NonMemberFunction();
-
-            return (reinterpret_cast< typename Function4Traits < R, A0, A1, A2, A3 >::ObjType *>(object)->*(Storage::_function))(a0, a1, a2, a3);
-        }
-    };
-};
-
-#endif /* _FUNCTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/initializer.hpp b/src/mod/endpoints/mod_khomp/commons/base/initializer.hpp
deleted file mode 100644
index 16359e8c97..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/initializer.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <vector>
-
-#ifndef _INITIALIZER_HPP_
-#define _INITIALIZER_HPP_
-
-template < typename Type >
-struct Initializer: public std::vector< Type >
-{
-    typedef std::vector< Type > Super;
-
-    Initializer(Type   e) { Super::push_back(e); };
-    Initializer(Type & e) { Super::push_back(e); };
-
-    Initializer & operator&(const Initializer v)
-    {
-        Super::insert(Super::end(), v.begin(), v.end());
-        return *this;
-    };
-
-    Initializer & operator&(Initializer & v)
-    {
-        Super::insert(Super::end(), v.begin(), v.end());
-        return *this;
-    };
-
-    Initializer & operator&(Type v)
-    {
-        Super::insert(Super::end(), v);
-        return *this;
-    };
-
-    Initializer & operator&(Type  & v)
-    {
-        Super::insert(Super::end(), v);
-        return *this;
-    };
-};
-
-#endif /* _INITIALIZER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/k3lapi.cpp b/src/mod/endpoints/mod_khomp/commons/base/k3lapi.cpp
deleted file mode 100644
index ffc9d93435..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/k3lapi.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <k3lapi.hpp>
-
-#include <string.h>
-
-K3LAPIBase::K3LAPIBase()
-: _device_count(0),  _channel_count(0),  _link_count(0),
-  _device_config(0), _channel_config(0), _link_config(0)
-{};
-
-/* initialize the whole thing! */
-
-void K3LAPIBase::start(void)
-{
-    /* tie the used k3l to the compiled k3l version */
-    char *ret = k3lStart(k3lApiMajorVersion, k3lApiMinorVersion, 0); //k3lApiBuildVersion);
-
-    if (ret && *ret)
-        throw start_failed(ret);
-
-    /* call init automagically */
-    init();
-}
-
-void K3LAPIBase::stop(void)
-{
-    k3lStop();
-    fini();
-}
-
-/* envio de comandos para placa */
-
-void K3LAPIBase::mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const
-{
-    KMixerCommand mix;
-
-    mix.Track = track;
-    mix.Source = src;
-    mix.SourceIndex = index;
-
-    command(dev, obj, CM_MIXER, (const char *) &mix);
-}
-
-void K3LAPIBase::mixerRecord(int32 dev, KDeviceType type, int32 obj, byte track, KMixerSource src, int32 index) const
-{
-    /* estes buffers *NAO PODEM SER ESTATICOS*! */
-    char cmd[] = { 0x3f, 0x03, (char)obj, (char)track, 0xff, 0xff };
-
-    switch (src)
-    {
-        case kmsChannel:
-            cmd[4] = 0x05;
-            cmd[5] = (char)index;
-            break;
-
-        case kmsNoDelayChannel:
-            cmd[4] = 0x0a;
-            cmd[5] = (char)index;
-            break;
-
-        case kmsGenerator:
-            cmd[4] = 0x09;
-
-            switch ((KMixerTone)index)
-            {
-                case kmtSilence:
-                    cmd[5] = 0x0F;
-                    break;
-                case kmtDial:
-                    cmd[5] = 0x08;
-                    break;
-                case kmtBusy:
-                    cmd[5] = 0x0D;
-                    break;
-
-                case kmtFax:
-                case kmtVoice:
-                case kmtEndOf425:
-                case kmtCollect:
-                case kmtEndOfDtmf:
-                    /* TODO: exception, unable to generate */
-                    break;
-            }
-            break;
-
-        case kmsCTbus:
-        case kmsPlay:
-            /* TODO: exception, not implemented! */
-            break;
-    }
-
-    int32 dsp = get_dsp(type, DSP_AUDIO);
-
-    raw_command(dev, dsp, cmd, sizeof(cmd));
-}
-
-void K3LAPIBase::mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const
-{
-    KMixerCommand mix;
-
-    mix.Track = track;
-    mix.Source = src;
-    mix.SourceIndex = index;
-
-    command(dev, obj, CM_MIXER_CTBUS, (const char *) &mix);
-}
-
-void K3LAPIBase::command(int32 dev, int32 obj, int32 code, std::string & str) const
-{
-    command(dev, obj, code, str.c_str());
-}
-
-void K3LAPIBase::command (int32 dev, int32 obj, int32 code, const char * parms) const
-{
-    K3L_COMMAND cmd;
-
-    cmd.Cmd = code;
-    cmd.Object = obj;
-    cmd.Params = (byte *)parms;
-
-    int32 rc = k3lSendCommand(dev, &cmd);
-
-    if (rc != ksSuccess)
-        throw failed_command(code, dev, obj, rc);
-}
-
-void K3LAPIBase::raw_command(int32 dev, int32 dsp, std::string & str) const
-{
-    raw_command(dev, dsp, str.data(), str.size());
-}
-
-void K3LAPIBase::raw_command(int32 dev, int32 dsp, const char * cmds, int32 size) const
-{
-    std::string str(cmds, size);
-
-    int32 rc = k3lSendRawCommand(dev, dsp, (void *)cmds, size);
-
-    if (rc != ksSuccess)
-        throw failed_raw_command(dev, dsp, rc);
-}
-
-KLibraryStatus K3LAPIBase::get_param(K3L_EVENT *ev, const char *name, std::string &res) const
-{
-    char tmp_param[256];
-    memset((void*)tmp_param, 0, sizeof(tmp_param));
-
-    int32 rc = k3lGetEventParam (ev, (sbyte *)name, (sbyte *)tmp_param, sizeof(tmp_param)-1);
-
-    if (rc != ksSuccess)
-        return (KLibraryStatus)rc;
-
-    res.append(tmp_param, strlen(tmp_param));
-    return ksSuccess;
-}
-
-std::string K3LAPIBase::get_param(K3L_EVENT *ev, const char *name) const
-{
-    std::string res;
-
-    KLibraryStatus rc = get_param(ev, name, res);
-
-    if (rc != ksSuccess)
-        throw get_param_failed(name, rc);
-
-    return res;
-}
-
-std::string K3LAPIBase::get_param_optional(K3L_EVENT *ev, const char *name) const
-{
-    std::string res;
-
-    (void)get_param(ev, name, res);
-
-    return res;
-}
-
-void K3LAPIBase::init(void)
-{
-    if (_device_count != 0) return;
-
-    _device_count = k3lGetDeviceCount();
-
-    _device_type    = new KDeviceType[_device_count];
-    _device_config  = new device_conf_type[_device_count];
-    _channel_config = new channel_ptr_conf_type[_device_count];
-    _link_config    = new link_ptr_conf_type[_device_count];
-    _channel_count    = new unsigned int[_device_count];
-    _link_count        = new unsigned int[_device_count];
-
-    for (unsigned int dev = 0; dev < _device_count; dev++)
-    {
-        _device_type[dev] = (KDeviceType) k3lGetDeviceType(dev);
-
-        /* caches each device config */
-        if (k3lGetDeviceConfig(dev, ksoDevice + dev, &(_device_config[dev]), sizeof(_device_config[dev])) != ksSuccess)
-            throw start_failed("k3lGetDeviceConfig(device)");
-
-        /* adjust channel/link count for device */
-        _channel_count[dev] = _device_config[dev].ChannelCount;
-        _link_count[dev] = _device_config[dev].LinkCount;
-
-        /* caches each channel config */
-        _channel_config[dev] = new channel_conf_type[_channel_count[dev]];
-
-        for (unsigned int obj = 0; obj < _channel_count[dev]; obj++)
-        {
-            if (k3lGetDeviceConfig(dev, ksoChannel + obj, &(_channel_config[dev][obj]),
-                                    sizeof(_channel_config[dev][obj])) != ksSuccess)
-                throw start_failed("k3lGetDeviceConfig(channel)");
-        }
-
-        /* adjust link count for device */
-        _link_count[dev] = _device_config[dev].LinkCount;
-
-        /* caches each link config */
-        _link_config[dev] = new link_conf_type[_link_count[dev]];
-
-        for (unsigned int obj = 0; obj < _link_count[dev]; obj++)
-        {
-            if (k3lGetDeviceConfig(dev, ksoLink + obj, &(_link_config[dev][obj]),
-                                    sizeof(_link_config[dev][obj])) != ksSuccess)
-                throw start_failed("k3lGetDeviceConfig(link)");
-        }
-    }
-}
-
-void K3LAPIBase::fini(void)
-{
-    for (unsigned int dev = 0; dev < _device_count; dev++)
-    {
-        if (_channel_config[dev])
-        {
-            delete[] _channel_config[dev];
-            _channel_config[dev] = NULL;
-        }
-
-        if (_link_config[dev])
-        {
-            delete[] _link_config[dev];
-            _link_config[dev] = NULL;
-        }
-    }
-
-    _device_count = 0;
-
-    if (_device_type)    { delete[] _device_type;       _device_type = NULL; }
-    if (_device_config)  { delete[] _device_config;   _device_config = NULL; }
-    if (_channel_config) { delete[] _channel_config; _channel_config = NULL; }
-    if (_link_config)    { delete[] _link_config;       _link_config = NULL; }
-    if (_channel_count)  { delete[] _channel_count;   _channel_count = NULL; }
-    if (_link_count)     { delete[] _link_count;         _link_count = NULL; }
-}
-
-int32 K3LAPIBase::get_dsp(KDeviceType devtype, K3LAPI::DspType type) const
-{
-    switch (devtype)
-    {
-        case kdtFXO:
-        case kdtFXOVoIP:
-#if K3L_AT_LEAST(1,6,0)
-        case kdtGSM:
-        case kdtGSMSpx:
-#endif
-#if K3L_AT_LEAST(2,1,0)
-        case kdtGSMUSB:
-        case kdtGSMUSBSpx:
-#endif
-            return 0;
-
-        default:
-            return (type == DSP_AUDIO ? 1 : 0);
-    }
-}
-
-int32 K3LAPIBase::get_dsp(const K3LAPIBase::GenericTarget & tgt, K3LAPI::DspType type) const
-{
-    return get_dsp(_device_type[tgt.device], type);
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/k3lapi.hpp b/src/mod/endpoints/mod_khomp/commons/base/k3lapi.hpp
deleted file mode 100644
index f65d52405a..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/k3lapi.hpp
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <string>
-#include <stdexcept>
-
-#include <format.hpp>
-
-#include <k3l.h>
-
-/* if using full k3l.h (for softpbx), version already defined. */
-#ifndef k3lApiMajorVersion
-# include <k3lVersion.h>
-#endif
-
-#ifdef __GNUC_PREREQ
-#if __GNUC_PREREQ(4,3)
-#include <cstring>
-#endif
-#endif
-
-#include <types.hpp>
-
-#ifndef _K3LAPI_HPP_
-#define _K3LAPI_HPP_
-
-struct K3LAPITraits
-{
-    struct invalid_device;
-    struct invalid_channel;
-    struct invalid_link;
-
-    struct invalid_target: public std::runtime_error
-    {
-        friend class invalid_device;
-        friend class invalid_channel;
-        friend class invalid_link;
-
-        const int32 device, object;
-
-      protected:
-        invalid_target(int32 _device, int32 _object, const std::string & msg)
-        : std::runtime_error(msg), device(_device), object(_object) {};
-    };
-
-    struct invalid_device: public invalid_target
-    {
-        invalid_device(int32 _device)
-        : invalid_target(_device, -1, STG(FMT("invalid device number '%d'") % _device)) {};
-    };
-
-    struct invalid_channel: public invalid_target
-    {
-        invalid_channel(int32 _device, int32 _channel)
-        : invalid_target(_device, _channel, STG(FMT("invalid channel number '%d' on device '%d'") % _channel % _device)) {};
-    };
-
-    struct invalid_link: public invalid_target
-    {
-        invalid_link(int32 _device, int32 _link)
-        : invalid_target(_device, _link, STG(FMT("invalid link number '%d' on device '%d'") % _link % _device)) {};
-    };
-};
-
-struct K3LAPIBase
-{
-    /* High level checked object identifier. */
-
-    struct GenericTarget
-    {
-        typedef enum { DEVICE, CHANNEL, MIXER, LINK } Type;
-
-        GenericTarget(const K3LAPIBase & k3lapi, Type _type, int32 _device, int32 _object)
-        : type(_type), device((unsigned int)_device), object((unsigned int)_object)
-        {
-            switch (_type)
-            {
-                case DEVICE:
-                    if (!k3lapi.valid_device(_device))
-                        throw K3LAPITraits::invalid_device(_device);
-                    break;
-
-                case CHANNEL:
-                case MIXER:
-                    if (!k3lapi.valid_channel(_device, _object))
-                        throw K3LAPITraits::invalid_channel(_device, _object);
-                    break;
-
-                case LINK:
-                    if (!k3lapi.valid_link(_device, _object))
-                        throw K3LAPITraits::invalid_link(_device, _object);
-                    break;
-            }
-        };
-
-        const Type type;
-
-        const unsigned int device;
-        const unsigned int object;
-    };
-
-/*
-    struct LinkTarget    : public GenericTarget
-    {
-        LinkTarget(const K3LAPIBase & k3lapi, int32 _device, int32 _object)
-        : GenericTarget(k3lapi, GenericTarget::LINK, _device, _object) {};
-    };
-
-    struct ChannelTarget : public GenericTarget
-    {
-        ChannelTarget(const K3LAPIBase & k3lapi, int32 _device, int32 _object)
-        : GenericTarget(k3lapi, GenericTarget::CHANNEL, _device, _object) {};
-    };
-
-*/
-    template < GenericTarget::Type T >
-    struct Target: public GenericTarget
-    {
-        Target(const K3LAPIBase & k3lapi, int32 _device, int32 _object)
-        : GenericTarget(k3lapi, T, _device, _object) {};
-
-//        operator const GenericTarget&() const { return static_cast<const GenericTarget &>(*this); };
-    };
-
-    /* exceptions */
-
-    struct start_failed: public std::runtime_error
-    {
-        start_failed(const char * msg)
-        : std::runtime_error(msg) {};
-    };
-
-    struct failed_command
-    {
-        failed_command(int32 _code, unsigned short _dev, unsigned short _obj, int32 _rc)
-        : code(_code), dev(_dev), obj(_obj), rc(_rc) {};
-
-        int32           code;
-        unsigned short  dev;
-        unsigned short  obj;
-        int32           rc;
-    };
-
-    struct failed_raw_command
-    {
-        failed_raw_command(unsigned short _dev, unsigned short _dsp, int32 _rc)
-        : dev(_dev), dsp(_dsp), rc(_rc) {};
-
-        unsigned short  dev;
-        unsigned short  dsp;
-        int32           rc;
-    };
-
-    struct get_param_failed
-    {
-        get_param_failed(std::string _name, int32 _rc)
-        : name(_name), rc((KLibraryStatus)_rc) {};
-
-        std::string name;
-        KLibraryStatus rc;
-    };
-
-    /* typedefs essenciais */
-
-    typedef K3L_DEVICE_CONFIG          device_conf_type;
-    typedef K3L_CHANNEL_CONFIG        channel_conf_type;
-    typedef K3L_CHANNEL_CONFIG *  channel_ptr_conf_type;
-    typedef K3L_LINK_CONFIG              link_conf_type;
-    typedef K3L_LINK_CONFIG *        link_ptr_conf_type;
-
-    /* constructors/destructors */
-
-             K3LAPIBase();
-    virtual ~K3LAPIBase() {};
-
-    /* (init|final)ialize the whole thing! */
-
-    void start(void);
-    void stop(void);
-
-    /* verificacao de intervalos */
-
-    inline bool valid_device(int32 dev) const
-    {
-        return (dev >= 0 && dev < ((int32)_device_count));
-    }
-
-    inline bool valid_channel(int32 dev, int32 obj) const
-    {
-        return (valid_device(dev) && obj >= 0 && obj < ((int32)_channel_count[dev]));
-    }
-
-    inline bool valid_link(int32 dev, int32 obj) const
-    {
-        return (valid_device(dev) && obj >= 0 && obj < ((int32)_link_count[dev]));
-    }
-
-    /* envio de comandos para placa (geral) */
-
-    void raw_command(int32 dev, int32 dsp, std::string & str) const;
-    void raw_command(int32 dev, int32 dsp, const char * cmds, int32 size) const;
-
-    /* obter dados 'cacheados' (geral) */
-
-    inline unsigned int device_count(void) const
-    {
-        return _device_count;
-    }
-
-    /* envio de comandos para placa (sem identificadores) */
-
-    void mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const;
-    void mixerRecord(int32 dev, KDeviceType type, int32 obj, byte track, KMixerSource src, int32 index) const;
-    void mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const;
-
-    void command (int32 dev, int32 obj, int32 code, std::string & str) const;
-    void command (int32 dev, int32 obj, int32 code, const char * parms = NULL) const;
-
-
-    /* envio de comandos para placa (com identificadores) */
-
-    void mixer(const GenericTarget & tgt, byte track, KMixerSource src, int32 index) const
-    {
-        mixer(tgt.device, tgt.object, track, src, index);
-    }
-
-    void mixerRecord(const GenericTarget & tgt, byte track, KMixerSource src, int32 index) const
-    {
-        mixerRecord((int32)tgt.device, _device_type[tgt.device], (int32)tgt.object, track, src, index);
-    }
-
-    void mixerCTbus(const GenericTarget & tgt, byte track, KMixerSource src, int32 index) const
-    {
-        mixerCTbus((int32)tgt.device, (int32)tgt.object, track, src, index);
-    }
-
-    void command(const GenericTarget & tgt, int32 code, std::string & str) const
-    {
-        command((int32)tgt.device, (int32)tgt.object, code, str);
-    };
-
-    void command(const GenericTarget & tgt, int32 code, const char * parms = NULL) const
-    {
-        command((int32)tgt.device, (int32)tgt.object, code, parms);
-    };
-
-    /* obter dados 'cacheados' (com indentificadores) */
-
-    inline unsigned int channel_count(const GenericTarget & tgt) const
-    {
-        return _channel_count[tgt.device];
-    }
-
-    inline unsigned int link_count(const GenericTarget & tgt) const
-    {
-        return _link_count[tgt.device];
-    }
-
-    KDeviceType device_type(const GenericTarget & tgt) const
-    {
-        return _device_type[tgt.device];
-    }
-
-    const K3L_DEVICE_CONFIG & device_config(const GenericTarget & tgt) const
-    {
-        return _device_config[tgt.device];
-    }
-
-    const K3L_CHANNEL_CONFIG & channel_config(const Target<GenericTarget::CHANNEL> & tgt) const
-    {
-        return _channel_config[tgt.device][tgt.object];
-    }
-
-    const K3L_LINK_CONFIG & link_config(const Target<GenericTarget::LINK> & tgt) const
-    {
-        return _link_config[tgt.device][tgt.object];
-    }
-
-    /* pega valores em strings de eventos */
-
-    KLibraryStatus get_param(K3L_EVENT *ev, const char *name, std::string &res) const;
-
-    std::string get_param(K3L_EVENT *ev, const char *name) const;
-    std::string get_param_optional(K3L_EVENT *ev, const char *name) const;
-
-    /* inicializa valores em cache */
-
-    void init(void);
-    void fini(void);
-
-    /* utilidades diversas e informacoes */
-
-    enum DspType
-    {
-        DSP_AUDIO,
-        DSP_SIGNALING,
-    };
-
-    int32 get_dsp(KDeviceType, DspType) const;
-
-    int32 get_dsp(const GenericTarget &, DspType) const;
-
- protected:
-
-    unsigned int           _device_count;
-    unsigned int *        _channel_count;
-    unsigned int *           _link_count;
-
-         device_conf_type *   _device_config;
-    channel_ptr_conf_type *  _channel_config;
-       link_ptr_conf_type *     _link_config;
-              KDeviceType *     _device_type;
-};
-
-/* exceptions */
-template < bool E = false >
-struct K3LAPIException
-{
-    void invalid_device(const int32 device) const
-    {
-        /* NOTHING */
-    }
-
-    void invalid_channel(const int32 device, const int32 channel) const
-    {
-        /* NOTHING */
-    }
-
-    void invalid_link(const int32 device, const int32 link) const
-    {
-        /* NOTHING */
-    }
-};
-
-template < >
-struct K3LAPIException < true >
-{
-    void invalid_device(const int32 device) const
-    {
-        throw K3LAPITraits::invalid_device(device);
-    }
-
-    void invalid_channel(const int32 device, const int32 channel) const
-    {
-        throw K3LAPITraits::invalid_channel(device, channel);
-    }
-
-    void invalid_link(const int32 device, const int32 link) const
-    {
-        throw K3LAPITraits::invalid_link(device, link);
-    }
-};
-
-template < bool E = false >
-struct K3LAPITemplate: public K3LAPIBase, protected K3LAPIException < E >
-{
-    using K3LAPIBase::device_config;
-    using K3LAPIBase::channel_config;
-    using K3LAPIBase::link_config;
-
-    using K3LAPIBase::device_type;
-    using K3LAPIBase::get_dsp;
-    
-    using K3LAPIBase::mixerRecord;
-
-    /* obter dados 'cacheados' (sem identificadores) */
-
-    inline unsigned int channel_count(int32 dev) const
-    {
-        if (!valid_device(dev))
-        {
-            K3LAPIException< E >::invalid_device(dev);
-            return 0;
-        }
-
-        return _channel_count[dev];
-    }
-
-    inline unsigned int link_count(int32 dev) const
-    {
-        if (!valid_device(dev))
-        {
-            K3LAPIException< E >::invalid_device(dev);
-            return 0;
-        }
-
-        return _link_count[dev];
-    }
-
-    inline uint32 channel_stats(int32 dev, int32 obj, uint32 index) const
-    {
-        if (!valid_channel(dev, obj))
-        {
-            K3LAPIException< E >::invalid_channel(dev, obj);
-            return 0u;
-        }
-
-        uint32 res_value = 0u;
-
-#if K3L_AT_LEAST(2,1,0)
-        if (k3lGetChannelStats(dev, obj, index, &res_value) != ksSuccess)
-            return 0u;
-
-        return res_value;
-#endif
-    }
-
-    KDeviceType device_type(int32 dev) const
-    {
-        if (!valid_device(dev))
-        {
-            K3LAPIException< E >::invalid_device(dev);
-            return kdtDevTypeCount;
-        }
-
-        return _device_type[dev];
-    }
-
-    const K3L_DEVICE_CONFIG & device_config(int32 dev) const
-    {
-        if (!valid_device(dev))
-            throw K3LAPITraits::invalid_device(dev);
-
-        return _device_config[dev];
-    }
-
-    const K3L_CHANNEL_CONFIG & channel_config(int32 dev, int32 obj) const
-    {
-        if (!valid_channel(dev, obj))
-            throw K3LAPITraits::invalid_channel(dev, obj);
-
-        return _channel_config[dev][obj];
-    }
-
-    const K3L_LINK_CONFIG & link_config(int32 dev, int32 obj) const
-    {
-        if (!valid_link(dev, obj))
-            throw K3LAPITraits::invalid_link(dev, obj);
-
-        return _link_config[dev][obj];
-    }
-
-    int32 get_dsp(int32 dev, DspType type) const
-    {
-        return get_dsp(device_type(dev), type);
-    }
-
-    void mixerRecord(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const
-    {
-        mixerRecord(dev, device_type(dev), obj, track, src, index);
-    }
-};
-
-typedef K3LAPITemplate<> K3LAPI;
-
-#endif /* _K3LAPI_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/k3lutil.cpp b/src/mod/endpoints/mod_khomp/commons/base/k3lutil.cpp
deleted file mode 100644
index 3fda813a03..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/k3lutil.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <k3lutil.hpp>
-
-std::string K3LUtil::channelStatus(int32 dev, int32 channel,
-        Verbose::Presentation fmt)
-{
-    try
-    {
-        const K3L_CHANNEL_CONFIG & config = _k3lapi.channel_config(dev, channel);
-
-        K3L_CHANNEL_STATUS   status;
-
-        KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (dev,
-                channel + ksoChannel, &status, sizeof(status));
-
-        switch (ret)
-        {
-            case ksSuccess:  return Verbose::channelStatus(config.Signaling,
-                    status.AddInfo, fmt);
-            default:         return (fmt == Verbose::EXACT ? "<unknown[fail]>"
-                                                            : "Unknown (fail)");
-        }
-    }
-    catch(K3LAPITraits::invalid_channel & e)
-    {
-        return (fmt == Verbose::EXACT ? "<unknown[fail]>" : "Unknown (fail)");
-    }
-}
-
-std::string K3LUtil::callStatus(int32 dev, int32 channel,
-        Verbose::Presentation fmt)
-{
-    K3L_CHANNEL_STATUS status;
-
-    KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus(dev,
-            channel + ksoChannel, &status, sizeof(status));
-
-    switch (ret)
-    {
-        case ksSuccess:  return Verbose::callStatus(status.CallStatus, fmt);
-        default:         return (fmt == Verbose::EXACT ? "<unknown[fail]>"
-                                                        : "Unknown (fail)");
-    }
-}
-
-std::string K3LUtil::linkStatus(int32 dev, int32 link,
-        Verbose::Presentation fmt, KSignaling signaling, bool simpleStatus)
-{
-    try
-    {
-        if (signaling == ksigInactive)
-        {
-            const K3L_LINK_CONFIG & config = _k3lapi.link_config(dev, link);
-            signaling = config.Signaling;
-        }
-
-        K3L_LINK_STATUS   status;
-
-        KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (dev,
-                link + ksoLink, &status, sizeof(status));
-
-        switch (ret)
-        {
-            case ksSuccess:  return Verbose::linkStatus(signaling, status.E1, fmt, simpleStatus);
-            default:         return (fmt == Verbose::EXACT ?
-                                "<unknown[failure]>" : "Unknown (failure)");
-        }
-    }
-    catch(K3LAPITraits::invalid_channel & e)
-    {
-        return (fmt == Verbose::EXACT ? "<unknown[failure]>"
-                                        : "Unknown (failure)");
-    }
-}
-
-
-unsigned int K3LUtil::physicalLinkCount(int32 dev, bool count_virtual)
-{
-    unsigned int number = 0;
-
-    try
-    {
-        switch (_k3lapi.device_type(dev))
-        {
-#if K3L_AT_LEAST(1,6,0)
-            case kdtFXS:
-                number = (count_virtual ? (_k3lapi.channel_count(dev) < 50 ? 1 : 2) : 0);
-                break;
-
-            case kdtFXSSpx:
-                number = (count_virtual ? (_k3lapi.channel_count(dev) < 30 ? 1 : 2) : 0);
-                break;
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-            case kdtE1FXSSpx:
-                number = (count_virtual ? 2 : 1);
-                break;
-#endif
-
-            /* E1 boards */
-            case kdtE1:
-            case kdtE1Spx:
-            case kdtE1IP:
-                number = _k3lapi.link_count(dev);
-                break;
-
-            case kdtPR:
-            case kdtE1GW:
-                number = 1;
-                break;
-
-#if K3L_AT_LEAST(1,6,0)
-            case kdtFXO:
-            case kdtFXOVoIP:
-            case kdtGSM:
-            case kdtGSMSpx:
-#else
-            case kdtFX:
-            case kdtFXVoIP:
-#endif
-            case kdtConf:
-            case kdtGWIP:
-#if K3L_AT_LEAST(2,1,0)
-            case kdtGSMUSB:
-            case kdtGSMUSBSpx:
-            case kdtReserved1:    // just to avoid warnings.
-            case kdtDevTypeCount: // just to avoid warnings.
-#endif
-                number = 0;
-                break;
-        }
-    }
-    catch(K3LAPITraits::invalid_device & e)
-    {
-        return 0;
-    }
-
-    return number;
-}
-
-
-K3LUtil::ErrorCountType K3LUtil::linkErrorCount(int32 dev, int32 link,
-        Verbose::Presentation fmt)
-{
-    ErrorCountType          result;
-    K3L_LINK_ERROR_COUNTER  status;
-
-    KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (dev,
-            link + ksoLinkMon, &status, sizeof(status));
-
-    switch (ret)
-    {
-        case ksSuccess:
-            for (unsigned int i = klecChangesToLock; i < klecCount; i++)
-            {
-                result.push_back(ErrorCountPairType(Verbose::linkErrorCounter
-                        ((KLinkErrorCounter)i, fmt), status.ErrorCounters[i]));
-            }
-            /* fall */
-
-        default:
-            return result;
-    }
-}
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/k3lutil.hpp b/src/mod/endpoints/mod_khomp/commons/base/k3lutil.hpp
deleted file mode 100644
index 9d87d8b0f6..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/k3lutil.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <string>
-#include <utility>
-#include <list>
-
-#include <k3lapi.hpp>
-#include <verbose.hpp>
-
-#ifndef _K3LUTIL_HPP_
-#define _K3LUTIL_HPP_
-
-struct K3LUtil
-{
-    typedef std::pair < std::string, unsigned int > ErrorCountPairType;
-    typedef std::list < ErrorCountPairType >        ErrorCountType;
-
-    K3LUtil(K3LAPI & k3lapi): _k3lapi(k3lapi) {};
-
-    std::string callStatus(int32 dev, int32 channel,
-            Verbose::Presentation fmt = Verbose::HUMAN);
-
-    std::string channelStatus(int32, int32,
-            Verbose::Presentation fmt = Verbose::HUMAN);
-
-    std::string linkStatus(int32, int32,
-            Verbose::Presentation fmt = Verbose::HUMAN,
-            KSignaling sig = ksigInactive,
-            bool simpleStatus = false);
-
-    unsigned int physicalLinkCount(int32 dev, bool count_virtual = false);
-
-    ErrorCountType linkErrorCount(int32, int32,
-            Verbose::Presentation fmt = Verbose::HUMAN);
-
- protected:
-    K3LAPI & _k3lapi;
-};
-
-#endif /* _K3LUTIL_HPP_ */
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/logger.hpp b/src/mod/endpoints/mod_khomp/commons/base/logger.hpp
deleted file mode 100644
index 2a119afb9c..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/logger.hpp
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <stdio.h>
-#include <sys/time.h>
-#include <time.h>
-
-#include <map>
-#include <string>
-#include <iostream>
-
-#include <tagged_union.hpp>
-#include <format.hpp>
-#include <refcounter.hpp>
-#include <flagger.hpp>
-
-#if defined(COMMONS_LIBRARY_USING_ASTERISK) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
-extern "C"
-{
-    #include <time.h>
-}
-#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
-extern "C"
-{
-    #include <callweaver/localtime.h>
-}
-#endif
-/*
-
-********************************************************************************
-***************************** 'Logger' user manual *****************************
-********************************************************************************
-
-* Description:
-
-This class does the management of log messages for applications. It works with
-the following axioms:
-
-<*> There are several class of messages.
-<*> There are some outputs, which may be files, sockets, or a console device.
-<*> There are options for classes, for outputs and for the association of both.
-
-The last rule also shows the order in which options are processed: first the
-'classes' options are processed, then 'output' options are processed, and then
-the options for the tuple '(class, output)' are processed.
-
-The options are mapped like this:
-
-  <class-of-message>                  -> options [prefix, flags]
-  <output-sink>                       -> options [prefix]
-( <class-of-message>, <output-sink> ) -> options [prefix, flags]
-
- - "prefix" means a fixed string prefix before the real message.
- - "flags" means auxiliary flags (DATETIME, THREADID) which are
-   used to add information based on OS or process context info.
-
-* Example of use:
-
-typedef enum
-{
-    C_DBG_FUNC,
-    C_DBG_LOCK,
-    C_WARNING,
-    C_ERROR,
-    C_CLI,
-}
-AstClassId;
-
-typedef enum
-{
-    F_CONSOLE,
-    F_GENERIC,
-    F_TRACE,
-}
-AstOutputId;
-
-// used to indicate the console log //
-struct AstConsoleLog {};
-
-struct AstPrinter: public Logger::DefaultPrinter
-{
-    typedef Logger::DefaultPrinter Super;
-
-    using namespace Tagged;
-
-    using Super::operator()(int);
-
-    // just 2 type of descriptors //
-    typedef Union < int, Union < AstConsoleLog > > Container;
-
-    ast_printer(std::string & msg): Super(msg) {};
-
-    bool operator()(const AstConsoleLog & log)
-    {
-        ast_console_puts(_msg.c_str());
-        return true;
-    };
-
-#if 0
-    bool operator()(int log)
-    {
-        return Super::operator()(log);
-    };
-#endif
-};
-
-bool start_log()
-{
-    typedef Logger::Manager<AstClassId, AstOutputId, AstPrinter, SimpleLock> LogManager;
-
-    LogManager logger;
-
-    // shortcut definition //
-    typedef LogManager::Option LogOption;
-
-    FILE * log_file = fopen( "output.log", "a");
-
-    if (!log_file)
-        return false;
-
-    logger.add( F_CONSOLE, AstConsoleLog(), "chan_khomp: ");
-    logger.add( F_GENERIC, log_file);
-
-    logger.classe( C_WARNING )
-        & LogOption(F_CONSOLE, "WARNING: ", LogOption::Flags(LogOption::Flag(LogOption::DATETIME)))
-        & LogOption(F_GENERIC, "W: ", LogOption::Flags(LogOption::Flag(LogOption::DATETIME)))
-
-    logger.classe( C_DBG_LOCK ).enabled(false);
-
-    logger.classe( C_DBG_LOCK )
-        & LogOption(F_GENERIC, "L: ", LogOption::Flags
-            (LogOption::flag_type(LogOption::ENABLED) &
-             LogOption::flag_type(LogOption::DATETIME))
-
-    logger(C_WARNING, "eu sou uma mensagem de warning");
-
-    logger.classe(C_WARNING).set(F_GENERIC, LogOption::ENABLED, true);
-    logger.classe(C_WARNING).set(F_CONSOLE, LogOption::ENABLED, false);
-
-    logger.classe(C_CLI).prefix("<K>");
-
-    return true;
-}
-
-void message_the_user(int fd)
-{
-    logger(C_CLI, fd, "eu sou uma mensagem de cli!");
-    logger(C_WARNING, "eu sou um warning");
-}
-
-********************************************************************************
-********************************************************************************
-
-Now, the code..!
-
-*/
-
-#ifndef _LOGGER_HPP_
-#define _LOGGER_HPP_
-
-#include <tagged_union.hpp>
-
-struct Logger
-{
-    /*** a base struct for printing messages in many ways ***/
-
-    struct DefaultPrinter
-    {
-        typedef Tagged::Union < int, Tagged::Union < FILE *, Tagged::Union < std::ostream * > > >  BaseType;
-
-        typedef bool ReturnType;
-
-        DefaultPrinter(std::string & msg): _msg(msg) {};
-
-        bool operator()(std::ostream * out)
-        {
-            (*out) << _msg;
-            out->flush();
-
-            return out->good();
-        }
-
-        bool operator()(FILE * out)
-        {
-            if (fputs(_msg.c_str(), out) < 0)
-                return false;
-
-            if (fflush(out) < 0)
-                return false;
-
-            return true;
-        }
-
-        bool operator()(int out)
-        {
-#ifndef KWIN32
-            return (write(out, _msg.c_str(), _msg.size()) == (int)_msg.size());
-#else
-            // no need for file descriptors on windows
-            return false;
-#endif
-        }
-
-        std::string & msg() { return _msg; }
-
-     protected:
-        std::string & _msg;
-    };
-
-    /*** manage the printing of messages ***/
-
-    template <class ClassId, class OutputId, class Printer, class LockType>
-    struct Manager
-    {
-        typedef  typename Printer::BaseType       BaseType;
-
-     protected:
-         /* holds a stream, and an optimal message prefix */
-        struct OutputOptions
-        {
-            OutputOptions(BaseType & stream, std::string & prefix)
-            : _stream(stream), _prefix(prefix) {};
-
-            BaseType     _stream;
-            std::string  _prefix;
-            LockType     _lock;
-        };
-
-        typedef  std::map < OutputId, OutputOptions > OutputMap;
-
-     public:
-
-        /* print in a specific 'message class' */
-        struct ClassType
-        {
-            ClassType(void)
-            : _enabled(true)
-            {};
-
-//            ClassType(ClassType & o)
-//            : _stream_map(o._stream_map), _prefix(o.prefix),
-//              _lock(o._lock),_enabled(o._enabled)
-//            {};
-
-            /* initializes the options of the (class, stream) pair */
-            struct Option
-            {
-                typedef enum { ENABLED, DATETIME, THREADID, DATETIMEMS } EnumType;
-
-                typedef Flagger< EnumType >             Flags;
-                typedef typename Flags::InitFlags   InitFlags;
-
-                Option(OutputId output, const char * prefix,
-                       Flags flags = InitFlags(ENABLED))
-                : _output(output), _prefix(prefix), _flags(flags) {};
-
-                Option(OutputId output, std::string prefix,
-                       Flags flags = InitFlags(ENABLED))
-                : _output(output), _prefix(prefix), _flags(flags) {};
-
-                Option(OutputId output,
-                    Flags flags = InitFlags(ENABLED))
-                : _output(output), _flags(flags) {};
-
-                OutputId     _output;
-                std::string  _prefix;
-                Flags        _flags;
-            };
-
-         protected:
-
-             /* holds a prefix and a activation status */
-            struct OptionContainer
-            {
-                OptionContainer(std::string prefix, typename Option::Flags flags)
-                : _prefix(prefix), _flags(flags) {};
-
-                std::string            _prefix;
-                typename Option::Flags _flags;
-            };
-
-            typedef std::multimap < OutputId, OptionContainer > OptionMap;
-
-            /* utility function for printing */
-            bool print(std::string & msg, BaseType & stream, LockType & lock)
-            {
-                lock.lock();
-
-                Printer p(msg);
-                bool ret = stream.visit(p);
-
-                lock.unlock();
-
-                return ret;
-            };
-
-/*
-            bool print(std::string & msg, BaseType & stream, LockType & lock)
-            {
-                lock.lock();
-
-                Printer p(msg);
-                bool ret = stream.visit(p);
-
-                lock.unlock();
-
-                return ret;
-            };
-*/
-
-         public:
-            ClassType & operator&(const Option & value)
-            {
-                add(value._output, value._prefix, value._flags);
-                return *this;
-            }
-
-            void add(OutputId output_id, std::string prefix,
-                typename Option::Flags      flags)
-            {
-                typedef std::pair < OutputId, OptionContainer > pair_type;
-                _stream_map.insert(pair_type(output_id, OptionContainer(prefix, flags)));
-            }
-
-            /* get and set methods for active mode */
-            void set(OutputId id, typename Option::EnumType flag, bool value = true)
-            {
-                typename OptionMap::iterator iter = _stream_map.find(id);
-
-                if (iter == _stream_map.end())
-                    return;
-
-                (*iter).second._flags.set(flag, value);
-            }
-
-            bool get(OutputId idx, typename Option::EnumType flag)
-            {
-                typename OptionMap::iterator iter = _stream_map.find(idx);
-
-                if (iter == _stream_map.end())
-                    return false;
-
-                return (*iter).second._flags.is_set(flag);
-            }
-
-            /* get/adjust the enable/disable value for the class */
-            void  enabled(bool enabled) { _enabled = enabled; };
-            bool  enabled()             { return _enabled;    };
-
-            /* get/adjust the classe prefix */
-            void          prefix(const char  * prefix) { _prefix = prefix; }
-            void          prefix(std::string & prefix) { _prefix = prefix; }
-            std::string & prefix()                     { return _prefix;   }
-
-            /* printing function (operator, actually) */
-            bool operator()(OutputMap & out_map, std::string & msg)
-            {
-                if (!_enabled)
-                    return true;
-
-                typedef typename OptionMap::iterator Iter;
-
-                bool ret = true;
-
-                for (Iter iter = _stream_map.begin(); iter != _stream_map.end(); iter++)
-                {
-                    OptionContainer & opt = (*iter).second;
-
-                    if (!opt._flags[Option::ENABLED])
-                        continue;
-
-                    typename OutputMap::iterator out_iter = out_map.find((*iter).first);
-
-                    /* this stream have been added already? if not, skip! */
-                    if (out_iter == out_map.end())
-                        continue;
-
-                    /* final message */
-                    std::string out_msg;
-
-                    if (opt._flags[Option::DATETIME])
-                    {
-#if defined(COMMONS_LIBRARY_USING_ASTERISK) || defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
-                        time_t      tv;
-                        struct tm   lt;
-
-                        time (&tv);
-                        localtime_r (&tv, &lt);
-
-                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d] ")
-                            % (lt.tm_year % 100) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour
-                            % lt.tm_min % lt.tm_sec);
-#endif
-                    }
-
-                    if (opt._flags[Option::DATETIMEMS])
-                    {
-#if defined(COMMONS_LIBRARY_USING_ASTERISK) || defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
-                        time_t      tv;
-                        struct tm   lt;
-
-                        time (&tv);
-                        localtime_r (&tv, &lt);
-
-                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d:%04d] ")
-                            % (lt.tm_year % 100) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
-                            % lt.tm_sec % (tv * 1000));
-#endif
-                    }
-
-                    OutputOptions & out_opt = (*out_iter).second;
-
-                    if (opt._flags[Option::THREADID])
-                    {
-#if defined (COMMONS_LIBRARY_USING_ASTERISK) || defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
-                        out_msg += STG(FMT("%08x ") % ((unsigned long)pthread_self()));
-#endif
-                    }
-
-                    out_msg += _prefix;
-                    out_msg += out_opt._prefix;
-                    out_msg += opt._prefix;
-                    out_msg += msg;
-                    out_msg += "\n";
-
-                    ret |= print(out_msg, out_opt._stream, out_opt._lock);
-                }
-
-                return ret;
-            }
-
-            bool operator()(BaseType & stream, std::string & msg)
-            {
-                std::string final_msg;
-
-                final_msg += _prefix;
-                final_msg += msg;
-                final_msg += "\n";
-
-                return print(final_msg, stream, _lock);
-            }
-
-         protected:
-            OptionMap    _stream_map;
-            std::string  _prefix;
-            LockType     _lock;
-            bool         _enabled;
-        };
-
-        /* util declaration */
-        typedef typename ClassType::Option  Option;
-
-        /* class_id_type -> ClassType mapper */
-        typedef std::map < ClassId, ClassType >  ClassMap;
-
-        /* local option pair */
-        typedef std::pair < OutputId, OutputOptions >  OutputOptionPair;
-
-        void add(OutputId output, BaseType stream, const char * prefix = "")
-        {
-            std::string str_prefix(prefix);
-
-            _output_map.insert(OutputOptionPair(output, OutputOptions(stream, str_prefix)));
-        }
-
-        void add(OutputId output, BaseType stream, std::string prefix)
-        {
-            _output_map.insert(OutputOptionPair(output, OutputOptions(stream, prefix)));
-        }
-
-        ClassType & classe(ClassId classeid)
-        {
-            return _classe_map[classeid];
-        }
-
-        bool operator()(ClassId classeid, const char * msg)
-        {
-            std::string str_msg(msg);
-            return _classe_map[classeid](_output_map, str_msg);
-        }
-
-        bool operator()(ClassId classeid, std::string & msg)
-        {
-            return _classe_map[classeid](_output_map, msg);
-        }
-
-        bool operator()(ClassId classeid, Format fmt)
-        {
-            std::string str_fmt = STG(fmt);
-            return _classe_map[classeid](_output_map, str_fmt);
-        }
-
-        bool operator()(ClassId classeid, BaseType stream, const char * msg)
-        {
-            std::string str_msg(msg);
-            return _classe_map[classeid](stream, str_msg);
-        }
-
-        bool operator()(ClassId classeid, BaseType stream, std::string & msg)
-        {
-            return _classe_map[classeid](stream, msg);
-        }
-
-        bool operator()(ClassId classeid, BaseType stream, Format fmt)
-        {
-            std::string str_fmt = STG(fmt);
-            return _classe_map[classeid](stream, str_fmt);
-        }
-
-     protected:
-        ClassMap   _classe_map;
-        OutputMap  _output_map;
-    };
-
- private:
-    Logger();
-};
-
-#endif /* _LOGGER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/noncopyable.hpp b/src/mod/endpoints/mod_khomp/commons/base/noncopyable.hpp
deleted file mode 100644
index d32faa8913..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/noncopyable.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _NONCOPYABLE_HPP_
-#define _NONCOPYABLE_HPP_
-
-struct NonCopyable
-{
-    NonCopyable() {};
- private:
-    NonCopyable(NonCopyable const &)             { };
-    NonCopyable & operator=(NonCopyable const &) { return *this; };
-};
-
-#endif /* _NONCOPYABLE_HPP_ */
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/refcounter.hpp b/src/mod/endpoints/mod_khomp/commons/base/refcounter.hpp
deleted file mode 100644
index d1738185bb..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/refcounter.hpp
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the "LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-/* This struct uses static polymorphism, and derived classes should implement *
- * the "unreference()" method, which should release all resources when called */
-
-#ifndef _REFCOUNTER_HPP_
-#define _REFCOUNTER_HPP_
-
-#define COUNTER_CLASS(...)    ReferenceCounter< __VA_ARGS__ >
-#define COUNTER_SUPER(...)    public COUNTER_CLASS( __VA_ARGS__ )
-#define COUNTER_REFER(o, ...) COUNTER_CLASS( __VA_ARGS__ )(static_cast< const COUNTER_CLASS( __VA_ARGS__ ) & >(o))
-
-// DEPRECATED DECLARATIONS ///
-#define NEW_REFCOUNTER(...)    public ReferenceCounter< __VA_ARGS__ >
-#define INC_REFCOUNTER(o, ...) ReferenceCounter< __VA_ARGS__ >(static_cast< const ReferenceCounter < __VA_ARGS__ > & >(o))
-
-#include <stdlib.h>
-
-#include <noncopyable.hpp>
-#include <atomic.hpp>
-
-#ifdef DEBUG
-# include <iostream>
-#endif
-
-struct ReferenceData: public NonCopyable
-{
-    ReferenceData()
-    : _data_count(1)
-    {};
-
-    inline unsigned int increment(void)
-    {
-        if (!_data_count)
-            abort();
-
-        Atomic::doAdd(&_data_count);
-
-        return _data_count;
-    }
-
-    inline unsigned int decrement(void)
-    {
-        if (!_data_count)
-            abort();
-
-        Atomic::doSub(&_data_count);
-        return _data_count;
-    }
-
-    volatile unsigned int _data_count;
-};
-
-template < typename T >
-struct ReferenceCounter
-{
-    typedef T Type;
-
-    ReferenceCounter(bool create_counter = true)
-    : _reference_count(0)
-    {
-        reference_restart(create_counter);
-
-#ifdef DEBUG
-        std::cerr <<  ((void*)this) << ": ReferenceCounter() [ref_count="
-            << (_reference_count ? (*_reference_count) : -1) << "]" << std::endl;
-#endif
-    };
-
-    ReferenceCounter(const ReferenceCounter & o)
-    : _reference_count(0)
-    {
-        reference_reflect(o);
-
-#ifdef DEBUG
-        std::cerr << ((void*)this) << ": ReferenceCounter(" << ((void*)(&o)) << ") [ref_count="
-            << (_reference_count ? (*_reference_count) : -1) << "]" << std::endl;
-#endif
-    };
-
-    virtual ~ReferenceCounter()
-    {
-#ifdef DEBUG
-        std::cerr << ((void*)this) << ": ~ReferenceCounter() [ref_count="
-            << (_reference_count ? (*_reference_count) : -1) << "]" << std::endl;
-#endif
-        reference_disconnect(_reference_count);
-    }
-
-    ReferenceCounter & operator=(const ReferenceCounter & o)
-    {
-        reference_reflect(o);
-
-#ifdef DEBUG
-        std::cerr << ((void*)this) << ": ReferenceCounter::operator=(" << ((void*)(&o)) << ") [ref_count="
-            << (_reference_count ? (*_reference_count) : -1) << "]" << std::endl;
-#endif
-
-        return *this;
-    };
-
- protected:
-    inline void reference_restart(bool create_counter = false)
-    {
-        ReferenceData * oldref = _reference_count;
-
-        _reference_count = (create_counter ? new ReferenceData() : 0);
-
-        if (oldref) reference_disconnect(oldref);
-    }
-
-    inline void reference_reflect(const ReferenceCounter & other)
-    {
-        ReferenceData * newref = other._reference_count;
-        ReferenceData * oldref = _reference_count;
-
-        /* NOTE: increment before, avoid our reference being zero, even *
-         *       for a short period of time.                            */
-
-        if (newref) newref->increment();
-
-        _reference_count = newref;
-
-        if (oldref) reference_disconnect(oldref);
-    };
-
-    inline void reference_disconnect(ReferenceData *& counter)
-    {
-        if (counter)
-        {
-            unsigned int result = counter->decrement();
-
-            if (!result)
-            {
-                static_cast< Type * >(this)->unreference();
-                delete counter;
-            }
-
-            counter = 0;
-        }
-    };
-
-  private:
-    ReferenceData * _reference_count;
-};
-
-template < typename T >
-struct ReferenceContainer: COUNTER_SUPER(ReferenceContainer< T >)
-{
-    /* type */
-    typedef T Type;
-
-    /* shorthand */
-    typedef COUNTER_CLASS(ReferenceContainer< Type >) Counter;
-
-    // TODO: make this a generic exception someday
-    struct NotFound {};
-
-    ReferenceContainer()
-    : Counter(false),
-      _reference_value(0)
-    {};
-
-    ReferenceContainer(Type * value)
-    : _reference_value(value)
-    {};
-
-    ReferenceContainer(const ReferenceContainer & value)
-    : Counter(false),
-      _reference_value(0)
-    {
-        operator()(value);
-    };
-
-    virtual ~ReferenceContainer()
-    {};
-
-    ReferenceContainer operator=(const ReferenceContainer & value)
-    {
-        operator()(value);
-        return *this;
-    };
-
-    /**/
-
-    void unreference()
-    {
-        if (_reference_value)
-        {
-            delete _reference_value;
-            _reference_value = 0;
-        }
-    }
-
-    // simulates a copy constructor
-    void operator()(const ReferenceContainer & value)
-    {
-        Counter::reference_reflect(value);
-
-        _reference_value = const_cast<Type *>(value._reference_value);
-    };
-
-    // shortcut for operator below
-    void operator=(const Type * value)
-    {
-        operator()(value);
-    };
-
-    // accept value (pointer)!
-    void operator()(const Type * value)
-    {
-         Counter::reference_restart((value != 0));
-
-        _reference_value = const_cast<Type *>(value);
-    };
-
-    // return value (pointer)!
-    Type * operator()(void) const
-    {
-        return _reference_value;
-    };
-
-  protected:
-    Type * _reference_value;
-
-  protected:
-};
-
-#endif /* _REFCOUNTER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/regex.cpp b/src/mod/endpoints/mod_khomp/commons/base/regex.cpp
deleted file mode 100644
index d2b8cd0469..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/regex.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <regex.hpp>
-
-#include <string.h>
-
-void Regex::Expression::initialize(void)
-{
-    unsigned int tmplen = strlen(_expression);
-
-    bool extflag = (_flags & E_EXTENDED);
-
-    for (unsigned int i = 0; i < tmplen; ++i)
-    {
-        switch (_expression[i])
-        {
-            case '\\':
-                ++i;
-
-                if (!extflag && i < tmplen)
-                    if (_expression[i] == '(')
-                        ++_subcounter;
-
-                break;
-
-            case '(':
-                if (extflag)
-                    ++_subcounter;
-
-            default:
-                break;
-        }
-    }
-
-    _errorstate = regcomp(&_comp_regex, _expression, _flags);
-}
-
-std::string Regex::Expression::regerror_as_string(void) const
-{
-    unsigned int count = regerror(_errorstate, &_comp_regex, 0, 0) + 1;
-
-    char * msg = new char[count];
-
-    regerror(_errorstate, &_comp_regex, msg, count);
-
-    std::string tmp(msg, count);
-
-    delete[] msg;
-
-    return tmp;
-}
-
-void Regex::Match::initialize(void)
-{
-    if (_expression.valid())
-    {
-        _subcounter = (_expression.subcount() + 2); // 0 + N.. + invalid
-        _submatches = new regmatch_t[_subcounter];
-        _subcaching = new std::string[_subcounter];
-        _have_match = (regexec(_expression.repr(), _basestring.c_str(),
-            _subcounter, _submatches, _flags) == 0);
-    }
-}
-
-std::string Regex::Match::replace(std::string rep, unsigned int index)
-{
-    ReplaceMap tmp;
-    tmp.insert(ReplacePair(index,rep));
-    return replace(tmp);
-}
-
-std::string Regex::Match::replace(Regex::ReplaceMap & map)
-{
-    if (!_have_match)
-        return _basestring;
-
-    std::string buffer = _basestring;
-
-    try
-    {
-        if (_submatches[0].rm_so != 0 && (map.find(0) != map.end()))
-            return buffer.replace(_submatches[0].rm_so, _submatches[0].rm_eo - _submatches[0].rm_so, map.find(0)->second);
-
-        for (unsigned int n = 1; (_submatches[n].rm_so != -1) && (n < _subcounter); n++)
-        {
-            //// s    f RRR s f RRR s    f RRRR s  f
-            //// XXXYYY(ZZZ)AAA(BBB)CCCEEE(FFFF)GGGG
-
-            bool globalsubs = false;
-
-            if (map.find(n) == map.end())
-            {
-                if (map.find(UINT_MAX) == map.end())
-                    continue;
-
-                globalsubs = true;
-            }
-
-            buffer = buffer.replace(_submatches[n].rm_so,
-                _submatches[n].rm_eo - _submatches[n].rm_so,
-                map.find((globalsubs ? UINT_MAX : n))->second);
-        }
-    }
-    catch (std::out_of_range e)
-    {
-        return "";
-    }
-
-    return buffer;
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/regex.hpp b/src/mod/endpoints/mod_khomp/commons/base/regex.hpp
deleted file mode 100644
index 61325238b8..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/regex.hpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <sys/types.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <string.h>
-#include <regex.h>
-
-#include <iostream>
-#include <string>
-#include <stdexcept>
-#include <map>
-
-#include <refcounter.hpp>
-#include <noncopyable.hpp>
-
-#ifndef _REGEX_HPP_
-#define _REGEX_HPP_
-
-struct Regex
-{
-    enum
-    {
-        E_EXTENDED         = REG_EXTENDED,
-        E_IGNORE_CASE      = REG_ICASE,
-        E_NO_SUB_MATCH     = REG_NOSUB,
-        E_EXPLICIT_NEWLINE = REG_NEWLINE,
-    };
-
-    enum
-    {
-        M_NO_BEGIN_OF_LINE    = REG_NOTBOL,
-        M_NO_END_OF_LINE      = REG_NOTEOL,
-    };
-
-    enum
-    {
-        /* mark replace for full match (submatch "0"). */
-        REP_BASE             = 0u,
-        /* mark global string for replace. */
-        REP_ALL              = UINT_MAX,
-    };
-
-    typedef std::pair < unsigned int, std::string >    ReplacePair;
-    typedef std::map  < unsigned int, std::string >     ReplaceMap;
-
-    struct Expression : public NonCopyable
-    {
-        Expression(const char * expression, unsigned int flags = 0)
-        :  _expression(expression), _alloced(false),
-           _subcounter(0), _errorstate(INT_MAX), _flags(flags)
-        {
-            initialize();
-        }
-
-        Expression(std::string & expression, unsigned int flags = 0)
-        :  _expression(strdup(expression.c_str())), _alloced(true),
-           _subcounter(0), _errorstate(INT_MAX), _flags(flags)
-        {
-            initialize();
-        }
-
-        ~Expression()
-        {
-            if (_errorstate != INT_MAX)
-                regfree(&_comp_regex);
-
-            if (_alloced)
-            {
-                delete _expression;
-                _expression = 0;
-            }
-        }
-
-        bool               valid(void) const { return (_errorstate == 0); }
-
-        unsigned int    subcount(void) const { return  _subcounter; }
-        const regex_t *     repr(void) const { return &_comp_regex; }
-
-        std::string error(void) const
-        {
-            switch (_errorstate)
-            {
-                case 0:       return "";
-                case INT_MAX: return "uninitialized";
-                default:      return regerror_as_string();
-            }
-        }
-
-     private:
-        std::string regerror_as_string(void) const;
-
-     private:
-        void initialize(void);
-
-     protected:
-        const char   * _expression;
-        const bool     _alloced;
-
-        unsigned int   _subcounter;
-
-        int            _errorstate;
-        regex_t        _comp_regex;
-
-        const unsigned int _flags;
-    };
-
-    struct Match: COUNTER_SUPER(Match)
-    {
-        Match(const char * basestring, const Expression & expression, unsigned int flags = 0)
-        : _basestring(basestring), _expression(expression), _subcounter(0), _submatches(0),
-           _have_match(false), _flags(flags)
-        {
-            initialize();
-        }
-
-        Match(const std::string & basestring, const Expression & expression, unsigned int flags = 0)
-        : _basestring(basestring), _expression(expression), _subcounter(0), _submatches(0),
-          _have_match(false), _flags(flags)
-        {
-            initialize();
-        }
-
-        Match(const Match & o)
-        : COUNTER_REFER(o, Match),
-          _basestring(o._basestring), _expression(o._expression),
-          _subcounter(o._subcounter), _submatches(o._submatches),
-          _have_match(o._have_match), _flags(o._flags)
-        {
-        }
-
-        void unreference()
-        {
-            delete[] _submatches;
-            delete[] _subcaching;
-
-            _submatches = 0;
-            _subcaching = 0;
-        }
-
-        bool matched(void)
-        {
-            return _have_match;
-        }
-
-        bool matched(unsigned int number)
-        {
-            if (_have_match && number < _subcounter)
-                return (_submatches[number].rm_so != -1);
-
-            return false;
-        }
-
-        const std::string & submatch(int number)
-        {
-            if (!matched(number))
-                return _subcaching[_subcounter - 1 /* invalid, always empty! */ ];
-
-            if (_subcaching[number].empty())
-            {
-                _subcaching[number].assign(_basestring, _submatches[number].rm_so,
-                    _submatches[number].rm_eo - _submatches[number].rm_so);
-            }
-
-            return _subcaching[number];
-        }
-
-        const std::string & operator[](int number)
-        {
-            return submatch(number);
-        }
-
-        /**
-        * \brief replaces strings matched by parentesis
-        * \param each item of the vector is a parentesis replaced
-        * \return string replaced
-        * \note The overload method match only one string in parentesis.
-        * \author Eduardo Nunes Pereira
-        *
-        * If fails the empty string is returned.
-        */
-        std::string replace(ReplaceMap &);
-        std::string replace(std::string, unsigned int index = REP_BASE);
-
-        // NOTE: there is already a way to get subcount defined on EXPRESSION class!
-
-     private:
-        void initialize(void);
-
-     protected:
-        const std::string    _basestring;
-        const Expression   & _expression;
-
-        unsigned int   _subcounter;
-        regmatch_t   * _submatches;
-        std::string  * _subcaching;
-        bool           _have_match;
-
-        const unsigned int  _flags;
-    };
-};
-
-#endif /* _REGEX_HPP_ */
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.cpp b/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.cpp
deleted file mode 100644
index 42056307e0..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.cpp
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <ringbuffer.hpp>
-
-// #include <stdio.h>
-
-
-  /* Documentation of the formula used in the buffer arithmetic.
-   *
-   * [0|1|2|3|4|5|6|7] => size=8
-   *      |   |
-   *  reader  |
-   *         writer
-   *
-   * => writer has places [5,6,7,0,1] to write (5 places).
-   *
-   * =>  8 - (4-2+1) = 8 - (2+1) = 8 - 3 = 5
-   *
-   * > writer goes 1 up, amount goes 1 down.
-   * > reader goes 1 up, amount goes 1 up.
-   * > size goes 1 down, amount goes 1 down.
-   *
-   */
-
-/********** BUFFER FUNCTIONS **********/
-
-/* writes everything or nothing */
-bool Ringbuffer_traits::traits_provide(char * buffer, const char * value, unsigned int amount, bool do_not_overwrite)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    bool need_overwrite = false;
-
-    if (amount > free_blocks(cache))
-    {
-        if (do_not_overwrite)
-            return false;
-
-        /* if we are allowed to overwrite, just the buffer size matters for us */
-        if (amount >= _size)
-            return false;
-
-        /* we need to change reader pointer below... */
-        need_overwrite = true;
-    }
-
-    const unsigned int wr = cache.writer.complete;
-    const unsigned int wp = cache.writer.complete - 1;
-
-    /* should we go around the buffer for writing? */
-    if ((wr + amount) > _size)
-    {
-//        fprintf(stderr, "%p> first if matched\n", this);
-
-        if (need_overwrite)
-        {
-            do
-            {
-                Buffer_pointer extra(cache.reader);
-                extra.complete = ((wr + amount) % _size); // (extra.complete + amount) % _size;
-//                extra.complete = (extra.complete + amount) % _size;
-
-                if (update(cache.reader, extra))
-                    break;
-            }
-            while (true);
-        }
-
-        unsigned int wr1 = _size - wr + 1; /* writer is already 1 position after */
-        unsigned int wr2 = amount - wr1;
-
-//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
-
-        /* two partial writes (one at the end, another at the beginning) */
-        memcpy((void *) &(buffer[wp]), (const void *)  (value),      _block * wr1);
-        memcpy((void *)  (buffer),     (const void *) &(value[wr1]), _block * wr2);
-    }
-    else
-    {
-//        fprintf(stderr, "%p> second if matched\n", this);
-
-        if (need_overwrite)
-        {
-            do
-            {
-                Buffer_pointer extra(cache.reader);
-                extra.complete = ((wr + amount) % _size); // (extra.complete + amount) % _size;
-
-                if (update(cache.reader, extra))
-                    break;
-            }
-            while (true);
-        }
-
-//        fprintf(stderr, "%p> full write: a=%d/s=%d [r=%d/w=%d]\n", this, amount, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) &(buffer[wp]), (const void *) value, _block * amount);
-    }
-
-    _pointers.writer.complete = ((wp + amount) % _size) + 1;
-    _pointers.writer.partial  = 1;
-
-//    if (need_overwrite)
-//        fprintf(stdout, "%p> write end: w=%d/r=%d\n", this, _pointers.writer.complete, _pointers.reader.complete);
-
-    return true;
-}
-
-/* returns the number of itens that have been read */
-unsigned int Ringbuffer_traits::traits_consume(const char * buffer, char * value, unsigned int amount, bool atomic_mode)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int available = used_blocks(cache);
-
-    if (atomic_mode && amount > available)
-        return false;
-
-    const unsigned int rd = _pointers.reader.complete;
-
-    unsigned int total = std::min(amount, available);
-
-    /* should we go around the buffer for reading? */
-    if ((rd + total) >= _size)
-    {
-        unsigned int rd1 = _size - rd;
-        unsigned int rd2 = total - rd1;
-
-//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
-
-        /* two partial consumes (one at the end, another at the beginning) */
-        memcpy((void *)  (value),      (const void *) &(buffer[rd]), _block * rd1);
-        memcpy((void *) &(value[rd1]), (const void *)  (buffer),     _block * rd2);
-    }
-    else
-    {
-//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) value, (const void *) &(buffer[rd]), _block * total);
-    }
-
-    do
-    {
-        /* jump the reader forward */
-        Buffer_pointer index((cache.reader.complete + total) % _size, 0);
-
-        if (update(cache.reader, index))
-            break;
-    }
-    while (true);
-
-//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
-
-    return total;
-}
-
-/********** TWO-PHASE BUFFER FUNCTIONS ***********/
-
-/* returns the number of itens that have been read */
-unsigned int Ringbuffer_traits::traits_consume_begins(const char * buffer, char * value, unsigned int amount, bool atomic_mode)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int available = used_blocks(cache);
-
-    if (amount > available)
-    {
-        if (atomic_mode)
-            return false;
-    }
-
-    const unsigned int rd = _pointers.reader.complete;
-
-    unsigned int total = std::min(amount, available);
-
-    /* should we go around the buffer for reading? */
-    if ((rd + total) >= _size)
-    {
-        unsigned int rd1 = _size - rd;
-        unsigned int rd2 = total - rd1;
-
-//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
-
-        /* two partial consumes (one at the end, another at the beginning) */
-        memcpy((void *)  (value),      (const void *) &(buffer[rd]), _block * rd1);
-        memcpy((void *) &(value[rd1]), (const void *)  (buffer),     _block * rd2);
-    }
-    else
-    {
-//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) value, (const void *) &(buffer[rd]), _block * total);
-    }
-
-    return total;
-}
-
-bool Ringbuffer_traits::traits_consume_commit(unsigned int amount)
-{
-    if (amount == 0)
-        return true;
-
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int available = used_blocks(cache);
-
-    /* cannot commit more than available! */
-    if (amount > available)
-        return false;
-
-    unsigned int total = std::min(amount, available);
-
-    do
-    {
-        /* jump the reader forward */
-        Buffer_pointer index((cache.reader.complete + total) % _size, 0);
-
-        if (update(cache.reader, index))
-            break;
-    }
-    while (true);
-
-//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
-
-    return true;
-}
-
-/********** PARTIAL BUFFER FUNCTIONS (bytes) ***********/
-
-/* writes everything or nothing */
-bool Ringbuffer_traits::traits_provide_partial(char * buffer, const char * value, unsigned int amount)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int memsize = (_size * _block);
-
-    if (amount > (free_blocks(cache) * _block))
-        return false;
-
-    const unsigned int wr = ((cache.writer.complete - 1) * _block) + cache.writer.partial;
-    const unsigned int wp = wr - 1;
-
-    /* should we go around the buffer for writing? */
-    if ((wr + amount) > memsize)
-    {
-//        fprintf(stderr, "%p> first if matched\n", this);
-
-        unsigned int wr1 = memsize - wr + 1; /* writer is already 1 position after */
-        unsigned int wr2 = amount - wr1;
-
-//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
-
-        /* two partial writes (one at the end, another at the beginning) */
-        memcpy((void *) &(buffer[wp]), (const void *)  (value),      wr1);
-        memcpy((void *)  (buffer),     (const void *) &(value[wr1]), wr2);
-    }
-    else
-    {
-//        fprintf(stderr, "%p> second if matched\n", this);
-
-//        fprintf(stderr, "%p> full write: a=%d/s=%d [r=%d/w=%d]\n", this, amount, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) &(buffer[wp]), (const void *) value, amount);
-    }
-
-    const unsigned int new_wp = (wp + amount) % memsize;
-
-    _pointers.writer.complete = (unsigned int)(floor((double)new_wp / (double)_block) + 1);
-    _pointers.writer.partial  = (new_wp % _block) + 1;
-
-//    if (need_overwrite)
-//        fprintf(stdout, "%p> write end: w=%d/r=%d\n", this, _pointers.writer.complete, _pointers.reader.complete);
-
-    return true;
-}
-
-/* returns the number of bytes that have been read */
-unsigned int Ringbuffer_traits::traits_consume_partial(const char * buffer, char * value, unsigned int amount)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int available = used_blocks(cache) * _block;
-
-    const unsigned int rd = (_pointers.reader.complete * _block) + _pointers.reader.partial;
-
-    const unsigned int memsize = _size * _block;
-
-    unsigned int total = std::min(amount, available);
-
-    /* should we go around the buffer for reading? */
-    if ((rd + total) >= _size)
-    {
-        unsigned int rd1 = memsize - rd;
-        unsigned int rd2 = total - rd1;
-
-//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
-
-        /* two partial consumes (one at the end, another at the beginning) */
-        memcpy((void *)  (value),      (const void *) &(buffer[rd]), rd1);
-        memcpy((void *) &(value[rd1]), (const void *)  (buffer),     rd2);
-    }
-    else
-    {
-//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) value, (const void *) &(buffer[rd]), total);
-    }
-
-    do
-    {
-        const unsigned int new_rd = (((cache.reader.complete * _block) + cache.reader.partial) + total) % memsize;
-
-        /* jump the reader forward */
-        Buffer_pointer index((unsigned int)floor((double)new_rd / (double)_block), (unsigned short)(new_rd % _block));
-
-        if (update(cache.reader, index))
-            break;
-    }
-    while (true);
-
-//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
-
-    return total;
-}
-
-/********** IO FUNCTIONS **********/
-
-/* returns the number of items written to from buffer to stream */
-unsigned int Ringbuffer_traits::traits_put(const char * buffer, std::ostream &fd, unsigned int amount)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int available = used_blocks(cache);
-
-    if (amount > available)
-        return false;
-
-    const unsigned int wr = _pointers.writer.complete;
-    const unsigned int rd = _pointers.reader.complete;
-
-    unsigned int total = std::min(amount, available);
-
-    /* should we go around the buffer for reading? */
-    if ((rd + total) >= _size)
-    {
-        unsigned int rd1 = _size - rd;
-        unsigned int rd2 = total - rd1;
-
-//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
-
-        /* two partial consumes (one at the end, another at the beginning) */
-        fd.write((const char *) &(buffer[rd]), _block * rd1);
-        fd.write((const char *)  (buffer),     _block * rd2);
-    }
-    else
-    {
-//      fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
-        fd.write((const char *) &(buffer[rd]), _block * total);
-    }
-
-    do
-    {
-        /* jump the reader forward */
-        Buffer_pointer index((cache.reader.complete + total) % _size, 0);
-
-        if (update(cache.reader, index))
-            break;
-    }
-    while (true);
-
-//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
-
-    return total;
-}
-
-/* returns number of items read from stream to buffer */
-unsigned int Ringbuffer_traits::traits_get(char * buffer, std::istream &fd, unsigned int amount)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    if (amount > free_blocks(cache))
-        return false;
-
-    const unsigned int wr = cache.writer.complete;
-    const unsigned int wp = cache.writer.complete - 1;
-
-    unsigned int real_amount = 0;
-
-    /* should we go around the buffer for writing? */
-    if ((wr + amount) > _size)
-    {
-//        fprintf(stderr, "%p> first if matched\n", this);
-
-        unsigned int wr1 = _size - wr + 1; /* writer is already 1 position after */
-        unsigned int wr2 = amount - wr1;
-
-//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
-
-        /* two partial writes (one at the end, another at the beginning) */
-        unsigned int char_amount = 0;
-
-        /* one partial write on the buffer (at the end) */
-        fd.read((char *) &(buffer[wp]), _block * wr1);
-        char_amount += fd.gcount();
-
-        if (fd.gcount() == (int)(_block * wr1))
-        {
-            /* another partial write on the buffer (at the beginning) */
-            fd.read((char *) (buffer), _block * wr2);
-            char_amount += fd.gcount();
-        }
-
-        real_amount = char_amount / _block;
-    }
-    else
-    {
-//        fprintf(stderr, "%p> second if matched\n", this);
-
-//        fprintf(stderr, "%p> full write: a=%d/s=%d [r=%d/w=%d]\n", this, amount, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        fd.read((char *) &(buffer[wp]), _block * amount);
-
-        real_amount = fd.gcount() / _block;
-    }
-
-    _pointers.writer.complete = ((wp + amount) % _size) + 1;
-    _pointers.writer.partial  = 1;
-
-//    fprintf(stdout, "%p> write end: %d\n", this, _pointers.writer.complete);
-
-    return real_amount;
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.hpp b/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.hpp
deleted file mode 100644
index b9ecd7e6bd..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.hpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-/* WARNING: This is a generic ringbuffer abstraction, which works for single-sized elements,
-            partial elements, single/multi-elements read/writes. It is not wise to mix some
-            functions (partial element write / full element write), since it was not designed
-            with this use in mind.
-
-            Also, it works only for single-reader + single-writer, since it does not depends
-            on external mutex functions.
-
-    NOTE: for single element provide/consume, this abstraction has standard C++ semantics.
-
-          for multiple and partial element provide/consume, memcpy is used - thus complex C++
-          objects which need correct copy constructor semantics should not copied this way.
-
- */
-
-#include <string.h>
-
-#include <cmath>
-#include <iostream>
-
-#include <noncopyable.hpp>
-#include <atomic.hpp>
-
-#ifndef _RINGBUFFER_HPP_
-#define _RINGBUFFER_HPP_
-
-struct Buffer_pointer
-{
-    Buffer_pointer(unsigned int _complete, unsigned short _partial)
-    : complete(_complete), partial(_partial)
-    {};
-
-    Buffer_pointer(const Buffer_pointer & o)
-    : complete(o.complete), partial(o.partial)
-    {};
-
-    Buffer_pointer(const volatile Buffer_pointer & o)
-    : complete(o.complete), partial(o.partial)
-    {};
-
-    void operator=(const volatile Buffer_pointer o)
-    {
-        complete = o.complete;
-        partial = o.partial;
-    }
-
-    void operator=(const Buffer_pointer o) volatile
-    {
-        complete = o.complete;
-        partial = o.partial;
-    }
-
-    bool operator==(const Buffer_pointer & o)
-    {
-        return (complete == o.complete && partial == o.partial);
-    }
-
-    unsigned int  complete:20;
-    unsigned short partial:12;
-}
-__attribute__((packed));
-
-struct Buffer_table
-{
-    Buffer_table()
-    : reader(0,0),
-      writer(1,1)
-    {};
-
-    Buffer_table(const Buffer_table & o)
-    : reader(o.reader), writer(o.writer)
-    {};
-
-    Buffer_table(const volatile Buffer_table & o)
-    : reader(o.reader), writer(o.writer)
-    {};
-
-    void operator=(const volatile Buffer_table o)
-    {
-        reader = o.reader;
-        writer = o.writer;
-    }
-
-    void operator=(const Buffer_table o) volatile
-    {
-        reader = o.reader;
-        writer = o.writer;
-    }
-
-    bool operator==(const Buffer_table & o)
-    {
-        return (reader == o.reader && writer == o.writer);
-    }
-
-    Buffer_pointer reader;
-    Buffer_pointer writer;
-}
-__attribute__((packed));
-
-struct Ringbuffer_traits
-{
-    struct BufferFull  {};
-    struct BufferEmpty {};
-
-  protected:
-    Ringbuffer_traits(unsigned int block, unsigned int size)
-    : _block(block), _size(size)
-    {};
-
-    bool         traits_provide(      char *, const char *, unsigned int, bool);
-    unsigned int traits_consume(const char *,       char *, unsigned int, bool);
-
-    unsigned int traits_consume_begins(const char *, char *, unsigned int, bool);
-    bool         traits_consume_commit(unsigned int);
-
-    bool         traits_provide_partial(      char *, const char *, unsigned int);
-    unsigned int traits_consume_partial(const char *,       char *, unsigned int);
-
-    unsigned int traits_get(      char *, std::istream &, unsigned int);
-    unsigned int traits_put(const char *, std::ostream &, unsigned int);
-
-    bool update(Buffer_pointer & cache, Buffer_pointer & update)
-    {
-        return Atomic::doCAS(&(_pointers.reader), &cache, update);
-    }
-
-    inline unsigned int free_blocks(const Buffer_table & cache) const
-    {
-        const unsigned int r = cache.reader.complete;
-        const unsigned int w = cache.writer.complete;
-
-        if (r >= w)
-            return (r - w);
-
-        return _size - (w - r);
-    }
-
-    inline unsigned int used_blocks(const Buffer_table & cache) const
-    {
-        const unsigned int r = cache.reader.complete;
-        const unsigned int w = cache.writer.complete;
-
-        if (r >= w)
-            return (_size - (r - w)) - 1;
-
-        return (w - r) - 1;
-    }
-
- protected:
-    const unsigned int      _block;
-    const unsigned int      _size;
-
-    volatile Buffer_table _pointers;
-};
-
-template <typename T>
-struct Ringbuffer: public Ringbuffer_traits, public NonCopyable
-{
-    Ringbuffer(unsigned int size)
-    : Ringbuffer_traits(sizeof(T), size)
-    {
-        _buffer = new T[_size];
-        _malloc = true;
-    };
-
-    Ringbuffer(unsigned int size, T * buffer)
-    : Ringbuffer_traits(sizeof(T), size)
-    {
-        _buffer = buffer;
-        _malloc = false;
-    };
-
-    ~Ringbuffer()
-    {
-        if (_malloc)
-          delete[] _buffer;
-    }
-
-    /***** GENERIC RANGE/INDEX CALCULATION FUNCTIONS *****/
-
-  protected:
-    inline bool may_write(const Buffer_table & cache) const
-    {
-        const unsigned int r = cache.reader.complete;
-        const unsigned int w = cache.writer.complete;
-
-        return (((r - w) != 0) && (!(r == 0 && w == _size)));
-    }
-
-    inline bool may_read(const Buffer_table & cache) const
-    {
-        if ((cache.writer.complete - cache.reader.complete) == 1)
-            return false;
-
-        return true;
-    }
-
-    inline unsigned int writer_next(const Buffer_pointer & cache, Buffer_pointer & index) const
-    {
-        unsigned int dest = cache.complete - 1,
-                     temp = cache.complete + 1;
-
-        if (temp > _size) index.complete = 1;
-        else              index.complete = temp;
-
-        index.partial = 1;
-
-        return dest;
-    };
-
-    inline void reader_next(const Buffer_pointer & cache, Buffer_pointer & index) const
-    {
-        unsigned int temp = cache.complete + 1;
-
-        if (temp == _size) index.complete = 0;
-        else               index.complete = temp;
-
-        index.partial = 0;
-    }
-
-    /***** BUFFER FUNCTIONS *****/
-
-  public:
-    bool provide(const T & value)
-    {
-        Buffer_table   cache = _pointers;
-        Buffer_pointer index = _pointers.writer;
-
-        if (!may_write(cache))
-            return false;
-
-//        fprintf(stderr, "%p> provide %d/%d!\n", this, reader, writer);
-
-        unsigned int dest = writer_next(cache.writer, index);
-
-        _buffer[dest] = value;
-
-        _pointers.writer = index;
-
-//        fprintf(stderr, "%p> write: %d/%d [%d/%d]\n", this, _pointers.reader, _pointers.writer, _pointers.reader_partial, _pointers.writer_partial);
-
-        return true;
-    }
-
-    bool consume(T & value)
-    {
-        Buffer_table   cache = _pointers;
-        Buffer_pointer index = _pointers.reader;
-
-        if (!may_read(cache))
-            return false;
-
-//        fprintf(stderr, "%p> consume %d/%d!\n", this, reader, writer);
-
-        value = _buffer[index.complete];
-
-        do
-        {
-            reader_next(cache.reader, index);
-
-            if (update(cache.reader, index))
-                break;
-
-            cache.reader = index;
-        }
-        while (true);
-
-//      fprintf(stderr, "%p> read: %d/%d [%d/%d]\n", this, _pointers.reader, _pointers.writer, _pointers.reader_partial, _pointers.writer_partial);
-
-        return true;
-    }
-
-    /* writes everything or nothing */
-    inline bool provide(const T * value, unsigned int amount, bool do_not_overwrite = true)
-    {
-        return traits_provide((char *)_buffer, (const char *) value, amount, do_not_overwrite);
-    }
-
-    /* returns the number of items that have been read (atomic_mode == true means 'all or nothing') */
-    inline unsigned int consume(T * value, unsigned int amount, bool atomic_mode = false)
-    {
-        return traits_consume((const char *)_buffer, (char *) value, amount, atomic_mode);
-    }
-
-    /***** TWO-PHASE BUFFER FUNCTIONS *****/
-
-    /* returns the number of items that have been read (atomic_mode == true means 'all or nothing') */
-    inline unsigned int consume_begins(T * value, unsigned int amount, bool atomic_mode = false)
-    {
-        return traits_consume_begins((const char *)_buffer, (char *) value, amount, atomic_mode);
-    }
-
-    /* returns true if we could commit that much of buffer (use only after consume_begins).    *
-     * note: you may commit less bytes that have been read to keep some data inside the buffer */
-    inline bool consume_commit(unsigned int amount)
-    {
-        return traits_consume_commit(amount);
-    }
-
-    /***** TWO-PHASE SINGLE-ELEMENT BUFFER FUNCTIONS *****/
-
-    T & provider_start(void)
-    {
-        Buffer_table  cache = _pointers;
-
-        if (!may_write(cache))
-            throw BufferFull();
-
-        unsigned writer = _pointers.writer.complete - 1;
-
-//        fprintf(stderr, "%p> provider start %d/%d!\n", this, reader, writer);
-
-        return _buffer[writer];
-    }
-
-    void provider_commit(void)
-    {
-        unsigned int temp = _pointers.writer.complete + 1;
-
-//        fprintf(stderr, "%p> provider commit %d!\n", this, temp);
-
-        if (temp > _size)
-            temp = 1;
-
-        _pointers.writer.complete = temp;
-        _pointers.writer.partial  = 1;
-
-//        fprintf(stderr, "%p> write: %d/%d [%d/%d]\n", this, _pointers.reader, _pointers.writer, _pointers.reader_partial, _pointers.writer_partial);
-    }
-
-    const T & consumer_start(void)
-    {
-        Buffer_table  cache = _pointers;
-
-        if (!may_read(cache))
-            throw BufferEmpty();
-
-        unsigned int reader = _pointers.reader.complete;
-
-//        fprintf(stderr, "%p> consumer start %d/%d!\n", this, reader, writer);
-
-        return _buffer[reader];
-    }
-
-    void consumer_commit(void)
-    {
-        Buffer_pointer cache = _pointers.reader;
-        Buffer_pointer index(cache);
-
-        do
-        {
-            reader_next(cache, index);
-
-            if (update(cache, index))
-                break;
-
-            cache = index;
-        }
-        while (true);
-
-//        fprintf(stderr, "%p> consumer commit %d!\n", this, temp);
-
-//        fprintf(stderr, "%p> read: %d/%d [%d/%d]\n", this, _pointers.reader, _pointers.writer, _pointers.reader_partial, _pointers.writer_partial);
-    }
-
-    /* writes everything or nothing, but works on bytes (may write incomplete elements) */
-    /* WARNING: do not mix this with full element provider */
-    inline bool provider_partial(const char *buffer, unsigned int amount)
-    {
-        return traits_provide_partial((char *)_buffer, buffer, amount);
-    }
-
-    /* returns the number of bytes that have been read (may read incomplete elements) */
-    /* WARNING: do not mix this with full element consumer */
-    inline unsigned int consumer_partial(char *buffer, unsigned int amount)
-    {
-        return traits_consume_partial((const char *)_buffer, buffer, amount);
-    }
-
-    /***** IO FUNCTIONS *****/
-
-    /* returns the number of items written to from buffer to stream */
-    inline unsigned int put(std::ostream &fd, unsigned int amount)
-    {
-        return traits_put((const char *)_buffer, fd, amount);
-    }
-
-    /* returns number of items read from stream to buffer */
-    inline unsigned int get(std::istream &fd, unsigned int amount)
-    {
-        return traits_get((char *)_buffer, fd, amount);
-    }
-
-    void clear()
-    {
-        _pointers.reader.complete = 0;
-        _pointers.reader.partial  = 0;
-        _pointers.writer.complete = 1;
-        _pointers.writer.partial  = 1;
-    }
-
- protected:
-    T *  _buffer;
-    bool _malloc;
-};
-
-#endif /* _RINGBUFFER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/saved_condition.cpp b/src/mod/endpoints/mod_khomp/commons/base/saved_condition.cpp
deleted file mode 100644
index 4c9f80f47f..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/saved_condition.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-
-#include <config_commons.hpp>
-
-#include COMMONS_INCLUDE(saved_condition.cpp)
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/saved_condition.hpp b/src/mod/endpoints/mod_khomp/commons/base/saved_condition.hpp
deleted file mode 100644
index dcfd22423d..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/saved_condition.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _SAVED_CONDITION_COMMON_HPP_
-#define _SAVED_CONDITION_COMMON_HPP_
-
-#include <config_commons.hpp>
-
-//#include <refcounter.hpp>
-
-struct SavedConditionCommon
-{
-    SavedConditionCommon() : _signaled(false) {}
-
- protected:
-    bool _signaled;
-};
-
-
-#include COMMONS_INCLUDE(saved_condition.hpp)
-
-#endif /* _SAVED_CONDITION_COMMON_HPP_ */
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/scoped_lock.hpp b/src/mod/endpoints/mod_khomp/commons/base/scoped_lock.hpp
deleted file mode 100644
index a85627f3cd..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/scoped_lock.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <simple_lock.hpp>
-
-struct ScopedLockBasic
-{
-    ScopedLockBasic(void)
-    : _locked(true) {};
-
-    ScopedLockBasic(bool locked)
-    : _locked(locked) {};
-
-    virtual ~ScopedLockBasic() {};
-
- protected:
-    bool _locked;
-};
-
-
-struct ScopedLock : public ScopedLockBasic
-{
-    struct LockFailed {};
-
-    ScopedLock(SimpleLock & mutex)
-    : ScopedLockBasic(false), _mutex(mutex)
-    {
-        switch (_mutex.lock())
-        {
-            case SimpleLock::ISINUSE:
-            case SimpleLock::FAILURE:
-                throw LockFailed();
-            default:
-                break;
-        }
-
-        _locked = true;
-    }
-
-    ~ScopedLock()
-    {
-        unlock();
-    }
-
-    void unlock()
-    {
-        if (_locked)
-        {
-            _locked = false;
-            _mutex.unlock();
-        }
-    }
-
- protected:
-    SimpleLock & _mutex;
-};
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/simple_lock.hpp b/src/mod/endpoints/mod_khomp/commons/base/simple_lock.hpp
deleted file mode 100644
index 16d85fb053..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/simple_lock.hpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _SIMPLE_LOCK_COMMON_HPP_
-#define _SIMPLE_LOCK_COMMON_HPP_
-
-#include <config_commons.hpp>
-
-#include <unistd.h>
-#include <noncopyable.hpp>
-
-#include <refcounter.hpp>
-
-/* This struct uses static polymorphism, and derived classes should implement  *
- * the "lock/trylock/unlock()" methods for correct code compilation.           *
- * The base class also features reference counting, so derived classes should  *
- * implement the "unreference_data()" method for releasing resources.               */
-
-template < typename Implementor >
-struct SimpleLockCommon: COUNTER_SUPER( SimpleLockCommon < Implementor > )
-{
-    friend class ReferenceCounter < SimpleLockCommon < Implementor > >;
-
-    typedef enum
-    {
-        ISINUSE = 0, // operation not succeded (no error)
-        SUCCESS = 1, // operation succeded (no error)
-        FAILURE = 2, // mutex or state is somehow invalid (error! run for your life!)
-    }
-    Result;
-
-    SimpleLockCommon()
-    {};
-
-    SimpleLockCommon(const SimpleLockCommon & o)
-    : COUNTER_REFER(o, SimpleLockCommon)
-    {};
-
-    virtual ~SimpleLockCommon()
-    {};
-
-    inline Result lock()
-    {
-        return static_cast<Implementor*>(this)->lock();
-    }
-
-    inline Result trylock()
-    {
-        return static_cast<Implementor*>(this)->trylock();
-    }
-
-    inline void unlock()
-    {
-        static_cast<Implementor*>(this)->unlock();
-    }
-
-  protected:
-    void unreference(void)
-    {
-        static_cast<Implementor*>(this)->unreference_data();
-    }
-};
-
-#include COMMONS_INCLUDE(simple_lock.hpp)
-
-#endif /* _SIMPLE_LOCK_COMMON_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/strings.cpp b/src/mod/endpoints/mod_khomp/commons/base/strings.cpp
deleted file mode 100644
index b7b84025a8..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/strings.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <strings.hpp>
-
-void Strings::Merger::add(std::string s)
-{
-    _list.push_back(s);
-};
-
-std::string Strings::Merger::merge(const std::string & sep)
-{
-    list_type::iterator i = _list.begin();
-
-    std::string res;
-
-    if (i != _list.end())
-    {
-        res += (*i);
-        ++i;
-    };
-
-    while (i != _list.end())
-    {
-        res += sep;
-        res += (*i);
-        ++i;
-    }
-
-    return res;
-};
-
-std::string Strings::Merger::merge(const char *sep)
-{
-    std::string ssep(sep);
-    return merge(ssep);
-}
-
-unsigned int Strings::tokenize(const std::string & str, Strings::vector_type & tokens,
-    const std::string & delims, long int max_tokens, bool keep_empty)
-{
-    std::string::size_type base = 0;
-
-    std::string::size_type init = str.find_first_not_of(delims, 0);
-    std::string::size_type fini = str.find_first_of(delims, init);
-
-    long int cur_token = 1;
-
-    while (std::string::npos != init)
-    {
-        if (keep_empty && base < init)
-        {
-            std::string::size_type cur_empty = init - base;
-
-            while (cur_empty && cur_token < max_tokens)
-            {
-                tokens.push_back("");
-
-                ++cur_token;
-                --cur_empty;
-            }
-        }
-
-        if (std::string::npos != fini && cur_token < max_tokens)
-        {
-            base = fini + 1;
-
-            tokens.push_back(str.substr(init, fini - init));
-            ++cur_token;
-        }
-        else
-        {
-            base = str.size(); // find_first_of(delims, init);
-
-            tokens.push_back(str.substr(init, str.size() - init));
-           	break;
-        }
-
-   	    init = str.find_first_not_of(delims, fini);
-       	fini = str.find_first_of(delims, init);
-    }
-
-    if (keep_empty && base != str.size())
-    {
-        std::string::size_type cur_empty = str.size() - base + 1;
-
-   	    while (cur_empty && cur_token < max_tokens)
-       	{
-            tokens.push_back("");
-
-   	        ++cur_token;
-       		--cur_empty;
-        }
-
-        if (cur_empty)
-        {
-            std::string::size_type pos = base + cur_empty - 1;
-            tokens.push_back(str.substr(pos, str.size() - pos));
-            ++cur_token;
-        }
-    }
-
-    return (cur_token - 1);
-}
-
-long Strings::tolong(const std::string & str, int base)
-{
-    return tolong(str.c_str(), base);
-}
-
-unsigned long Strings::toulong(const std::string & str, int base)
-{
-    return toulong(str.c_str(), base);
-}
-
-unsigned long long Strings::toulonglong(const std::string & str, int base)
-{
-    return toulonglong(str.c_str(), base);
-}
-
-double Strings::todouble(const std::string & str)
-{
-    return todouble(str.c_str());
-}
-
-long Strings::tolong(const char * str, int base)
-{
-    char *str_end = 0;
-
-    unsigned long value = strtol(str, &str_end, base);
-
-    if (str_end && *str_end == 0)
-        return value;
-
-    throw invalid_value(str);
-}
-
-bool Strings::toboolean(std::string str)
-{
-    std::string tmp(str);
-
-    Strings::lower(tmp);
-
-    if ((tmp == "true")  || (tmp == "yes")) return true;
-    if ((tmp == "false") || (tmp == "no"))  return false;
-
-    throw invalid_value(str);
-}
-
-unsigned long Strings::toulong(const char * str, int base)
-{
-    char *str_end = 0;
-
-    unsigned long value = strtoul(str, &str_end, base);
-
-    if (str_end && *str_end == 0)
-        return value;
-
-    throw invalid_value(str);
-}
-
-unsigned long long Strings::toulonglong(const char * str, int base)
-{
-#if defined(_WINDOWS) || defined(_Windows) || defined(_WIN32) || defined(WIN32)
-    throw not_implemented();
-#else
-    char *str_end = 0;
-
-    unsigned long long value = strtoull(str, &str_end, base);
-
-    if (str_end && *str_end == 0)
-        return value;
-
-    throw invalid_value(str);
-#endif
-}
-
-double Strings::todouble(const char * str)
-{
-    char *str_end = 0;
-
-    double value = strtod(str, &str_end);
-
-    if (str_end && *str_end == 0)
-        return value;
-
-    throw invalid_value(str);
-}
-
-std::string Strings::fromboolean(bool value)
-{
-    if (value) return "true";
-    else       return "false";
-}
-
-std::string Strings::lower(std::string str)
-{
-    std::string res;
-
-    for (std::string::iterator i = str.begin(); i != str.end(); i++)
-        res += tolower((*i));
-
-    return res;
-}
-
-std::string Strings::hexadecimal(std::string value)
-{
-    std::string result;
-
-    for (std::string::iterator i = value.begin(); i != value.end(); i++)
-    {
-        if (i != value.begin())
-            result += " ";
-
-        result += STG(FMT("%2x") % (unsigned int)(*i));
-    }
-
-    return result;
-}
-
-std::string Strings::trim(const std::string& str, const std::string& trim_chars)
-{
-    std::string result(str);
-
-    result.erase( result.find_last_not_of( trim_chars ) + 1 );
-    result.erase( 0, result.find_first_not_of( trim_chars ) );
-
-    return result;
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/strings.hpp b/src/mod/endpoints/mod_khomp/commons/base/strings.hpp
deleted file mode 100644
index 947da384d9..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/strings.hpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <limits.h>
-
-#include <list>
-#include <vector>
-#include <string>
-
-#include <types.hpp>
-
-#include <format.hpp>
-
-/* Generic string funcions */
-
-#ifndef _STRINGS_HPP_
-#define _STRINGS_HPP_
-
-struct Strings
-{
-    typedef std::list<std::string>      list_type;
-    typedef std::vector<std::string>  vector_type;
-
-    struct Merger
-    {
-        void          add(std::string);
-
-        std::string merge(const std::string &);
-        std::string merge(const char *);
-
-        bool empty() { return _list.empty(); };
-
-        const list_type & list() { return _list; };
-
-     protected:
-        list_type   _list;
-    };
-
- public:
-    struct invalid_value
-    {
-        invalid_value(const char        * value): _value(value) {};
-        invalid_value(const std::string & value): _value(value) {};
-
-        std::string & value() { return _value; }
-
-     protected:
-         std::string _value;
-    };
-
-    struct not_implemented {};
-
-    static unsigned int tokenize(const std::string &, vector_type &, const std::string & delims = ",;:",
-                                 long int max_toxens = LONG_MAX, bool keep_empty = true);
-
-    static bool        toboolean(std::string);
-    static std::string fromboolean(bool);
-
-    static long               tolong(const std::string &, int base = 10);
-    static unsigned long      toulong(const std::string &, int base = 10);
-    static unsigned long long toulonglong(const std::string &, int base = 10);
-    static double             todouble(const std::string &);
-
-    static long               tolong(const char *, int base = 10);
-    static unsigned long      toulong(const char *, int base = 10);
-    static unsigned long long toulonglong(const char *, int base = 10);
-    static double             todouble(const char *);
-
-    static std::string lower(std::string);
-    static std::string hexadecimal(std::string);
-
-    static std::string trim(const std::string&, const std::string& trim_chars = " \f\n\r\t\v");
-};
-
-#endif // _STRINGS_HPP_ //
diff --git a/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.cpp b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.cpp
deleted file mode 100644
index d4d9861f5c..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include "saved_condition.hpp"
-
-bool SavedCondition::wait(unsigned int msec)
-{
-    bool ret = true;
-
-    switch_mutex_lock(_mutex);
-
-    if (!_signaled)
-    {
-        /* msec * 1000 = The amount of time in microseconds to wait. */
-        if (switch_thread_cond_timedwait(_condition, _mutex, (switch_interval_time_t)msec * 1000) != 0)
-            ret = false;
-    }
-
-    _signaled = false;
-
-    switch_mutex_unlock(_mutex);
-
-    return ret;
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.hpp b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.hpp
deleted file mode 100644
index b34e40b0c0..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _SAVED_CONDITION_
-#define _SAVED_CONDITION_
-
-#include <saved_condition.hpp>
-
-extern "C"
-{
-    #include <switch.h>
-}
-
-struct SavedCondition : public SavedConditionCommon// : public RefCounter < SavedCondition >
-{
-    typedef switch_thread_cond_t  BaseConditionType;
-    typedef switch_mutex_t        BaseMutexType;
-
-     SavedCondition(switch_memory_pool_t *pool=NULL):
-        _pool(pool),
-        _can_delete_pool(false)
-     {
-        if(!_pool)
-        {
-            switch_core_new_memory_pool(&_pool);
-            _can_delete_pool = true;
-        }
-
-        switch_thread_cond_create(&_condition, _pool);
-        switch_mutex_init(&_mutex, SWITCH_MUTEX_DEFAULT, _pool);
-     }
-
-     //SavedCondition(const SavedCondition &);
-    ~SavedCondition()
-    {
-        switch_thread_cond_destroy(_condition);
-        switch_mutex_destroy(_mutex);
-
-        if(_can_delete_pool)
-            switch_core_destroy_memory_pool(&_pool);
-    }
-
-    void signal(void)
-    {
-        switch_mutex_lock(_mutex);
-
-        _signaled = true;
-        switch_thread_cond_signal(_condition);
-
-        switch_mutex_unlock(_mutex);
-    }
-
-    void broadcast(void)
-    {
-        switch_mutex_lock(_mutex);
-
-        _signaled = true;
-        switch_thread_cond_broadcast(_condition);
-
-        switch_mutex_unlock(_mutex);
-    }
-
-    void wait(void)
-    {
-        switch_mutex_lock(_mutex);
-
-        if (!_signaled)
-            switch_thread_cond_wait(_condition, _mutex);
-
-        _signaled = false;
-
-        switch_mutex_unlock(_mutex);
-    }
-
-    bool wait(unsigned int);
-
-    void reset(void)
-    {
-        switch_mutex_lock(_mutex);
-
-        _signaled = false;
-
-        switch_mutex_unlock(_mutex);
-    }
-
-    BaseMutexType     * mutex()     { return _mutex;     };
-    BaseConditionType * condition() { return _condition; };
-
- protected:
-
-    BaseConditionType    *_condition;
-    BaseMutexType        *_mutex;
-    switch_memory_pool_t *_pool;
-    bool                 _can_delete_pool;
-};
-
-#endif /* _SAVED_CONDITION_ */
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/simple_lock.hpp b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/simple_lock.hpp
deleted file mode 100644
index 6b3a17f46d..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/simple_lock.hpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _SIMPLE_LOCK_HPP_
-#define _SIMPLE_LOCK_HPP_
-
-#include <simple_lock.hpp>
-
-extern "C"
-{
-    #include <switch.h>
-}
-
-template < typename Implementor >
-struct SimpleLockBasic: public SimpleLockCommon < Implementor >
-{
-    typedef SimpleLockCommon < Implementor >   Super;
-    typedef typename Super::Result            Result;
-
-    typedef switch_mutex_t BaseMutexType;
-
-    SimpleLockBasic(switch_memory_pool_t *pool = NULL)
-    : _pool(pool), _can_delete_pool( (_pool == NULL) )
-
-    {
-        if(!_pool)
-            switch_core_new_memory_pool(&_pool);
-
-        //switch_mutex_init(&_mutex, SWITCH_MUTEX_DEFAULT, _pool);
-        switch_mutex_init(&_mutex, SWITCH_MUTEX_NESTED, _pool);
-    }
-
-    virtual ~SimpleLockBasic()
-    {
-        /* do nothing */
-    };
-
-    void unreference_data()
-    {
-        switch_mutex_destroy(_mutex);
-
-        if (_can_delete_pool)
-            switch_core_destroy_memory_pool(&_pool);
-    }
-
-    Result trylock()
-    {
-        switch (switch_mutex_trylock(_mutex))
-        {
-            case SWITCH_STATUS_SUCCESS:
-                return Super::SUCCESS;
-            case SWITCH_STATUS_FALSE:
-            case SWITCH_STATUS_TERM:
-            case SWITCH_STATUS_NOTIMPL:
-            case SWITCH_STATUS_MEMERR:
-            case SWITCH_STATUS_GENERR:
-            case SWITCH_STATUS_SOCKERR:
-            case SWITCH_STATUS_NOTFOUND:
-            case SWITCH_STATUS_UNLOAD:
-            case SWITCH_STATUS_NOUNLOAD:
-            case SWITCH_STATUS_NOT_INITALIZED:
-                return Super::FAILURE;
-            //case SWITCH_STATUS_INUSE:
-            default:
-                return Super::ISINUSE;
-        }
-    }
-
-    void  unlock()
-    {
-        switch_mutex_unlock(_mutex);
-    }
-
-    BaseMutexType * mutex() { return _mutex; };
-
- protected:
-    BaseMutexType *_mutex;
-    switch_memory_pool_t *_pool;
-    bool _can_delete_pool;
-};
-
-struct SimpleLock: public SimpleLockBasic < SimpleLock >
-{
-    typedef SimpleLockBasic < SimpleLock >   Super;
-    typedef Super::Result                   Result;
-
-    SimpleLock(switch_memory_pool_t *pool = NULL)
-    : Super(pool) {};
-
-    Result lock()
-    {
-        switch (switch_mutex_lock(_mutex))
-        {
-            case SWITCH_STATUS_SUCCESS:
-                return Super::SUCCESS;
-            case SWITCH_STATUS_FALSE:
-            case SWITCH_STATUS_TERM:
-            case SWITCH_STATUS_NOTIMPL:
-            case SWITCH_STATUS_MEMERR:
-            case SWITCH_STATUS_GENERR:
-            case SWITCH_STATUS_SOCKERR:
-            case SWITCH_STATUS_NOTFOUND:
-            case SWITCH_STATUS_UNLOAD:
-            case SWITCH_STATUS_NOUNLOAD:
-            case SWITCH_STATUS_NOT_INITALIZED:
-                return Super::FAILURE;
-            //case SWITCH_STATUS_INUSE:
-            default:
-                return Super::ISINUSE;
-        }
-    }
-};
-
-template < unsigned int Retries = 10, unsigned int Interval = 50 >
-struct SimpleNonBlockLock: public SimpleLockBasic < SimpleNonBlockLock < Retries, Interval > >
-{
-    typedef SimpleLockBasic < SimpleNonBlockLock < Retries, Interval > >   Super;
-    typedef typename Super::Result                                        Result;
-
-    SimpleNonBlockLock(switch_memory_pool_t *pool = NULL)
-    : Super(pool) {};
-
-    inline Result lock()
-    {
-        for (unsigned int i = 0; i < Retries; i++)
-        {
-            Result ret = Super::trylock();
-
-            if (ret != Super::ISINUSE)
-                return ret;
-
-            usleep(Interval * 1000);
-        }
-
-        return Super::ISINUSE;
-    }
-};
-
-#endif /* _SIMPLE_LOCK_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/thread.hpp b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/thread.hpp
deleted file mode 100644
index 3c61b6a6ec..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/thread.hpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _THREAD_HPP_
-#define _THREAD_HPP_
-
-#include <thread.hpp>
-
-extern "C"
-{
-    #include <switch.h>
-}
-
-struct Thread : ThreadCommon
-{
-    typedef switch_thread_t BaseThreadType;
-
-    template<typename T, typename R, typename A>
-    struct ThreadData : ThreadDataCommon
-    {
-        ThreadData(T data, A arg) : _data(data), _arg(arg) {}
-
-        int run()
-        {
-            return _data(_arg);
-        }
-
-        T _data;
-        A _arg;
-    };
-
-    template<typename T, typename R>
-    struct ThreadData < T, R, void > : ThreadDataCommon
-    {
-        ThreadData(T data) : _data(data) {}
-
-        int run()
-        {
-            return _data();
-        }
-
-        T _data;
-    };
-
-    template<typename T, typename A>
-    struct ThreadData < T, void, A > : ThreadDataCommon
-    {
-        ThreadData(T data, A arg) : _data(data), _arg(arg) {}
-
-        int run()
-        {
-            _data(_arg);
-            return 0;
-        }
-
-        T _data;
-        A _arg;
-    };
-
-
-    template<typename T>
-    struct ThreadData < T, void, void > : ThreadDataCommon
-    {
-        ThreadData(T data) : _data(data) {}
-
-        int run()
-        {
-            _data();
-            return 0;
-        }
-
-        T _data;
-    };
-
-    template<typename T>
-    Thread(T obj, switch_memory_pool_t *pool=NULL) :
-            _thread_info(new ThreadData<T, typename DecomposeFunction<T>::Return, void>(obj)),
-            _pool(pool),
-            _can_delete_pool(false)
-    {
-        if(!_pool)
-        {
-            switch_core_new_memory_pool(&_pool);
-            _can_delete_pool = true;
-        }
-
-        _thread_info->_thread = this;
-        _thread_info->_self = NULL;
-        _thread_info->_attribute = NULL;
-
-        if(switch_threadattr_create(
-                (switch_threadattr_t **)&_thread_info->_attribute, _pool) != 0)
-        {
-            _thread_info->_attribute = NULL;
-            return;
-        }
-
-        switch_threadattr_stacksize_set(
-                (switch_threadattr_t *)_thread_info->_attribute,
-                SWITCH_THREAD_STACKSIZE);
-
-        if(!priority())
-        {
-            _thread_info->_attribute = NULL;
-        }
-
-    }
-
-    template<typename T, typename A>
-    Thread(T obj, A arg, switch_memory_pool_t *pool=NULL) :
-            _thread_info(new ThreadData<T, typename DecomposeFunction<T>::Return, A>(obj, arg)),
-            _pool(pool),
-            _can_delete_pool(false)
-    {
-        if(!_pool)
-        {
-            switch_core_new_memory_pool(&_pool);
-            _can_delete_pool = true;
-        }
-
-        _thread_info->_thread = this;
-        _thread_info->_self = NULL;
-        _thread_info->_attribute = NULL;
-
-        if(switch_threadattr_create(
-                (switch_threadattr_t **)&_thread_info->_attribute, _pool) != 0)
-        {
-            _thread_info->_attribute = NULL;
-            return;
-        }
-
-        switch_threadattr_stacksize_set(
-                (switch_threadattr_t *)_thread_info->_attribute,
-                SWITCH_THREAD_STACKSIZE);
-
-        if(!priority())
-        {
-            _thread_info->_attribute = NULL;
-        }
-
-    }
-
-    ~Thread()
-    {
-        if(_thread_info)
-            delete _thread_info;
-
-        if (_can_delete_pool)
-            switch_core_destroy_memory_pool(&_pool);
-    }
-
-    void detach(bool d = true)
-    {
-        if(!_thread_info->_attribute)
-            return;
-
-        /* Non-zero if detached threads should be created. */
-        switch_threadattr_detach_set(
-                (switch_threadattr_t *)_thread_info->_attribute, d ? 1 : 0);
-    }
-
-    bool start()
-    {
-        if(!_pool || !_thread_info->_attribute)
-            return false;
-
-        switch_thread_create((switch_thread_t**)&_thread_info->_self,
-                (switch_threadattr_t *)_thread_info->_attribute,
-                run,
-                _thread_info,
-                _pool);
-
-        if(!_thread_info->_self)
-            return false;
-
-        return true;
-    }
-
-    int join()
-    {
-        /*
-         * block until the desired thread stops executing.
-         * @param retval The return value from the dead thread.
-         * @param thd The thread to join
-         *
-         * SWITCH_DECLARE(switch_status_t) switch_thread_join(switch_status_t *retval, switch_thread_t *thd);
-        */
-
-        if(!_thread_info->_self)
-            return -2;
-
-        int retval = 0;
-
-        if(switch_thread_join((switch_status_t*)&retval,
-                (switch_thread_t *)_thread_info->_self) != 0)
-            return -1;
-
-        return retval;
-    }
-
-    BaseThreadType * self()
-    {
-        //switch_thread_self();
-        //apr_os_thread_current();
-        return (BaseThreadType *)_thread_info->_self;
-    }
-
-private:
-    void exit(int status)
-    {
-        /**
-         * stop the current thread
-         * @param thd The thread to stop
-         * @param retval The return value to pass back to any thread that cares
-         */
-        //SWITCH_DECLARE(switch_status_t) switch_thread_exit(switch_thread_t *thd, switch_status_t retval);
-        switch_thread_exit((switch_thread_t *)_thread_info->_self, (switch_status_t)status);
-
-    }
-
-#ifndef WIN32
-    struct apr_threadattr_t {
-        apr_pool_t *pool;
-        pthread_attr_t attr;
-    };
-#endif
-
-    bool priority()
-    {
-#ifndef WIN32
-        struct sched_param param;
-
-        struct apr_threadattr_t *myattr = (struct apr_threadattr_t *)_thread_info->_attribute;
-
-        if (pthread_attr_setschedpolicy(
-                (pthread_attr_t *)&myattr->attr, SCHED_RR) < 0)
-            return false;
-
-        if (pthread_attr_getschedparam(
-                (pthread_attr_t *)&myattr->attr, &param) < 0)
-            return false;
-
-        param.sched_priority = sched_get_priority_max(SCHED_RR);
-
-        if (pthread_attr_setschedparam(
-                (pthread_attr_t *)&myattr->attr, &param) < 0)
-            return false;
-
-#endif
-        return true;
-
-/*
-        //BUG in Freeswitch  
-
-THANKS FOR NOT REPORTING IT SO WE MUST LIVE WITH A PROBLEM YOU KNOW ABOUT .....
-
-        if(switch_threadattr_priority_increase(
-                (switch_threadattr_t *)_thread_info->_attribute) != 0)
-            return false;
-
-        return true;
-*/
-    }
-
-
-protected:
-    ThreadDataCommon * _thread_info;
-    switch_memory_pool_t *_pool;
-    bool _can_delete_pool;
-
-protected:
-
-    static void *SWITCH_THREAD_FUNC run(BaseThreadType *thread, void * obj)
-    {
-        //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-        //        "Starting new Thread\n");
-
-        ThreadDataCommon * data = (ThreadDataCommon *)obj;
-        int retval = data->run();
-
-        //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-        //        "Stopping new Thread = %d\n", retval);
-
-        ((Thread *)(data->_thread))->exit(retval);
-
-        return NULL;
-    }
-
-};
-
-
-#endif /* _THREAD_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/tagged_union.hpp b/src/mod/endpoints/mod_khomp/commons/base/tagged_union.hpp
deleted file mode 100644
index f46aab0b75..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/tagged_union.hpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _TAGGED_UNION_HPP_
-#define _TAGGED_UNION_HPP_
-
-#include <unistd.h>
-
-#include <typeinfo>
-#include <stdexcept>
-#include <iostream>
-
-#include <format.hpp>
-
-namespace Tagged
-{
-    struct EmptyUnion
-    {
-        friend class Value;
-
-        EmptyUnion()
-        : _adjusted(false) {};
-
-        // copy constructor
-        EmptyUnion(const EmptyUnion & o)
-        : _adjusted(o._adjusted) {};
-
-        // copy assignment operator
-        EmptyUnion & operator=(const EmptyUnion & o)
-        {
-            _adjusted = o._adjusted;
-            return *this;
-        };
-
-        ~EmptyUnion() { _adjusted = false; };
-
-        bool operator==(const EmptyUnion & o) const
-        {
-            return true;
-        };
-
-      public:
-        void clear(void) { _adjusted = false; };
-      protected:
-        void setup(void) { _adjusted = true;  };
-
-      protected:
-        bool value_set(void) const   { return false; };
-        bool value_get(void) const   { return false; };
-
-        bool value_check(void) const { return false; };
-
-        template < typename S >
-        bool value_visit(S & visitor, typename S::ReturnType & ret) const
-        {
-            return false;
-        };
-
-        template < typename S >
-        bool value_visit_void(S & visitor) const
-        {
-            return false;
-        };
-
-        bool adjusted() const { return _adjusted;  };
-
-      private:
-        bool _adjusted;
-    };
-
-    template < typename V, typename E = EmptyUnion >
-    struct Union: public E
-    {
-        friend class Value;
-
-        // default constructor
-        Union()
-        : _value(0) {};
-
-        // constructor with initializer
-        template < typename U >
-        Union(U value)
-        : _value(0)
-        {
-            set(value);
-        };
-
-        // copy constructor
-        Union(const Union & o)
-        : E(static_cast<const E&>(o)),
-          _value( (o._value ? new V(*(o._value)) : 0) )
-        {};
-
-        // copy assignment operator
-        Union & operator=(const Union & o)
-        {
-            if (_value)
-            {
-                delete _value;
-                _value = 0;
-            }
-
-            if (o._value)
-            {
-                _value = new V(*(o._value));
-            }
-
-            E::operator=(static_cast<const E&>(o));
-
-            return *this;
-        };
-
-        // destructor
-        ~Union()
-        {
-            if (_value)
-            {
-                delete _value;
-                _value = 0;
-            }
-        };
-
-        // equal sign operator
-        template < typename U >
-        void operator=(U value)
-        {
-            set(value);
-        }
-
-        template < typename U >
-        bool check(void) const
-        {
-            return value_check(static_cast< const U * const>(0));
-        };
-
-        template < typename U >
-        U & get(void) const
-        {
-            U * res = 0;
-
-            if (!E::adjusted())
-                throw std::runtime_error("tagged union empty!");
-
-            if (!value_get(&res) || !res)
-                throw std::runtime_error(STG(FMT("type mismatch when asked for '%s'") % typeid(U).name()));
-
-            return *res;
-        };
-
-        template < typename U >
-        void set(U val)
-        {
-            if (E::adjusted())
-                clear();
-
-            if (!value_set(val))
-                throw std::runtime_error("unable to set value of invalid type");
-        };
-
-        template < typename S >
-        typename S::ReturnType visit(S visitor) const
-        {
-            typename S::ReturnType ret;
-
-            if (!value_visit(visitor, ret))
-                throw std::runtime_error("unable to visit empty value");
-
-            return ret;
-        };
-
-        template < typename S >
-        void visit_void(S visitor) const
-        {
-            if (!value_visit_void(visitor))
-                throw std::runtime_error("unable to visit empty value");
-        };
-
-        void clear()
-        {
-            if (_value)
-            {
-                delete _value;
-                _value = 0;
-            }
-
-            E::clear();
-        };
-
-        // compare (equal) operator
-        bool operator==(const Union & o) const
-        {
-            bool are_equal = false;
-
-            if (!_value && !(o._value))
-                are_equal = true;
-
-            if (_value && o._value)
-                are_equal = (*_value == *(o._value));
-
-            if (are_equal)
-                return E::operator==(static_cast<const E&>(o));
-
-            return false;
-        };
-
-        // compare types
-        bool sameType(const Union & o) const
-        {
-            if ((!(_value) && !(o._value)) || (_value && o._value))
-                return E::operator==(static_cast<const E&>(o));
-
-            return false;
-        };
-
-      protected:
-        using E::value_set;
-        using E::value_get;
-
-        using E::value_check;
-        using E::value_visit;
-        using E::value_visit_void;
-
-        bool value_set(V val)
-        {
-            _value = new V(val);
-            E::setup();
-
-            return true;
-        };
-
-        bool value_get(V ** val) const
-        {
-            if (!_value)
-                return false;
-
-            *val = _value;
-            return true;
-        }
-
-        bool value_check(const V * const junk) const
-        {
-            (void)junk;
-            return (_value != 0);
-        };
-
-        template < typename S >
-        bool value_visit(S & visitor, typename S::ReturnType & ret) const
-        {
-            if (_value)
-            {
-                ret = visitor(*const_cast<V*>(_value));
-                return true;
-            };
-
-            return E::value_visit(visitor, ret);
-        };
-
-        template < typename S >
-        bool value_visit_void(S & visitor) const
-        {
-            if (_value)
-            {
-                visitor(*const_cast<V*>(_value));
-                return true;
-            };
-
-            return E::value_visit_void(visitor);
-        };
-
-      private:
-        V * _value;
-    };
-};
-
-#endif /* _TAGGED_UNION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/thread.hpp b/src/mod/endpoints/mod_khomp/commons/base/thread.hpp
deleted file mode 100644
index e00d7c875a..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/thread.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _THREAD_COMMON_HPP_
-#define _THREAD_COMMON_HPP_
-
-#include <config_commons.hpp>
-
-#include <types.hpp>
-//#include <function.hpp>
-
-struct ThreadCommon
-{
-  protected:
-    template<typename FuncPtrType>
-    struct DecomposeFuncPtr;
-
-    template<typename ReturnType, typename ArgType>
-    struct DecomposeFuncPtr<ReturnType(*)(ArgType)>
-    {
-        typedef ReturnType Return;
-    };
-
-    template<typename SomeClass>
-    struct DecomposeFuncPtr
-    {
-        typedef void Return;
-    };
-
-    template<typename ReturnType>
-    struct DecomposeFuncPtr<ReturnType(*)()>
-    {
-        typedef ReturnType Return;
-    };
-
-    template< typename FunctionType >
-    struct DecomposeFunction
-    {
-        typedef typename Select < IsClass< FunctionType >::Result, int,
-            typename DecomposeFuncPtr< FunctionType >::Return >::Result
-        Return;
-    };
-
-  public:
-    struct ThreadDataCommon
-    {
-        ThreadDataCommon() {}
-
-        virtual ~ThreadDataCommon() {}
-
-        virtual int run() = 0;
-
-        ThreadCommon * _thread;
-
-        void * _self;
-        void * _attribute;
-    };
-
-    ThreadCommon() {}
-};
-
-
-#include COMMONS_INCLUDE(thread.hpp)
-
-#endif /* _THREAD_COMMON_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/timer.cpp b/src/mod/endpoints/mod_khomp/commons/base/timer.cpp
deleted file mode 100644
index 0cb0ac4340..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/timer.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <timer.hpp>
-
-TimerTraits::TimerTraits()
-: _thread((Thread*)0), _purify(false), _last_tick(0), _age_count(0), _shutdown(false)
-{};
-
-bool TimerTraits::start (void)
-{
-    _shutdown = false;
-
-    _condition.reset();
-    _finalized.reset();
-
-    if (!_thread)
-    {
-        _thread = new Thread(TimerTraits::loop_thread(this));
-        _purify = true;
-    }
-
-#if defined(_WINDOWS) || defined(_Windows) || defined(_WIN32) || defined(WIN32)
-    // set priority ...
-#else
-    pthread_attr_t attrs;
-    sched_param    param;
-
-    if (pthread_attr_init(&attrs) < 0)
-        return false;
-
-    if (pthread_attr_setschedpolicy(&attrs, SCHED_RR) < 0)
-        return false;
-
-    if (pthread_attr_getschedparam(&attrs, &param) < 0)
-        return false;
-
-    param.sched_priority = sched_get_priority_max(SCHED_RR);
-
-    if (pthread_attr_setschedparam(&attrs, &param) < 0)
-        return false;
-
-    // set priority...
-
-//    if (pthread_create(&_thread, &attrs, TimerTraits::loop_thread, NULL) < 0)
-//        return false;
-
-    _thread->start();
-#endif
-
-    return true;
-}
-
-bool TimerTraits::stop (void)
-{
-    _shutdown = true;
-
-    _condition.signal();
-
-    _finalized.wait(10000); /* 10 seconds max wait */
-
-    if (_thread && _purify)
-    {
-        delete _thread;
-
-        _thread = (Thread *)0;
-        _purify = false;
-    }
-
-    return true;
-}
-
-//-----------------------------------------
-
-int TimerTraits::loop_thread::operator()(void)
-{
-    try
-    {
-        _timer->loop();
-    }
-    catch( ... )
-    {
-        /* something wrong happened! */
-    }
-
-    _timer->_finalized.signal();
-
-    return 0;
-}
-
-void TimerTraits::execute(ControlSet::iterator init, const TimerTraits::Control & ctrl)
-{
-    volatile CallbackFuncType func = (volatile CallbackFuncType) ctrl._func;
-    volatile CallbackDataType data = (volatile CallbackDataType) ctrl._data;
-
-    _timer_set.erase(init);
-
-    _mutex.unlock();
-
-    func(data);
-}
-
-void TimerTraits::loop (void)
-{
-    while (true)
-    {
-        if (_shutdown) break;
-
-        _mutex.lock();
-
-        ControlSet::iterator init = _timer_set.begin();
-
-        if (init == _timer_set.end())
-        {
-            _mutex.unlock();
-            _condition.wait();
-        }
-        else
-        {
-            const Control & ctrl = *init;
-
-            unsigned int ts_now    = TimerTraits::tick();
-
-            if (_age_count == ctrl._age)
-            {
-                if (ts_now < ctrl._msecs)
-                {
-                    /* age is right, but it is not time to expire yet... */
-                    volatile unsigned int wait_time = ctrl._msecs - ts_now;
-                    _mutex.unlock();
-                    _condition.wait(wait_time); /* expire - now */
-                }
-                else
-                {
-                    /* age is right, and we should expire! */
-                    execute(init, ctrl); /* called locked, return unlocked */
-                }
-            }
-            else if (_age_count < ctrl._age)
-            {
-                /* age is not there yet (need some time to overlap)... */
-                volatile unsigned int wait_time = (UINT_MAX - ts_now) + ctrl._msecs;
-                _mutex.unlock();
-                _condition.wait(wait_time); /* MAX - now + expire */
-            }
-            else
-            {
-                /* age has passed, we should have expired before! */
-                execute(init, ctrl); /* called locked, return unlocked */
-            }
-        }
-    }
-
-    _finalized.signal();
-}
-
-unsigned int TimerTraits::tick()
-{
-#if defined(_WINDOWS) || defined(_Windows) || defined(_WIN32) || defined(WIN32)
-    unsigned int tick =  GetTickCount();
-#else
-    struct timespec ticks;
-
-    // error condition, make the user notice this..
-    if (clock_gettime(CLOCK_MONOTONIC, &ticks) < 0)
-        return 0;
-
-    unsigned int tick = ( ticks.tv_sec * 1000 ) + ( ticks.tv_nsec / 1000000 );
-#endif
-
-    if (_last_tick > tick)
-        ++_age_count;
-
-    _last_tick = tick;
-
-    return tick;
-}
-
-//-----------------------------------------
-
-TimerTraits::Index TimerTraits::traits_add_unlocked (unsigned int msecs, const void * func, const void * data, unsigned int value)
-{
-    unsigned int ms_tick = TimerTraits::tick();
-
-    unsigned int ms_left =  UINT_MAX - ms_tick;
-    unsigned int ms_real =  msecs;
-
-    unsigned int age_num = _age_count;
-
-    if (ms_left < msecs)
-    {
-        ms_real -= ms_left;
-        ++age_num;
-    }
-    else
-    {
-        ms_real += ms_tick;
-    }
-
-    ControlSet::iterator it = _timer_set.insert(Control(age_num,ms_real,func,data,value));
-
-    if (_timer_set.size() == 1 || _timer_set.begin() == it)
-    {
-        _condition.signal();
-    };
-
-    return Index(age_num, ms_real, msecs, func, data, value);
-}
-
-TimerTraits::Index TimerTraits::traits_add (unsigned int msecs, const void * func, const void * data, unsigned int value)
-{
-    _mutex.lock();
-
-    Index idx = traits_add_unlocked(msecs, func, data, value);
-
-    _mutex.unlock();
-
-    return idx;
-}
-
-bool TimerTraits::traits_restart (TimerTraits::Index & idx, bool force)
-{
-    bool ret = false;
-
-    _mutex.lock();
-
-    if (idx.valid)
-    {
-        if (traits_del_unlocked(idx) || force)
-        {
-            idx = traits_add_unlocked(idx.delta, idx.func, idx.data, idx.value);
-            ret = true;
-        }
-    }
-
-    _mutex.unlock();
-
-    return ret;
-}
-
-void TimerTraits::traits_setup(TimerTraits::Index * idx, unsigned int msecs, const void * func, void * data, unsigned int value)
-{
-    _mutex.lock();
-
-    if (idx->valid)
-    {
-        (void)traits_del_unlocked(*idx);
-    }
-
-    *idx = traits_add_unlocked(msecs, func, data, value);
-
-    _mutex.unlock();
-}
-
-bool TimerTraits::traits_del_unlocked (TimerTraits::Index & idx)
-{
-    bool ret = false;
-
-    if (idx.valid)
-    {
-        ControlSet::iterator i = _timer_set.lower_bound(Control(idx.era, idx.msec));
-        ControlSet::iterator j = _timer_set.upper_bound(Control(idx.era, idx.msec));
-
-        for (; i != j; i++)
-        {
-            const Control & ctrl = (*i);
-
-            if ((idx.value && !(ctrl._value & idx.value)))
-                continue;
-
-            if (((idx.func && ctrl._func == idx.func) || !idx.func) && ((idx.data && ctrl._data == idx.data) || !idx.data))
-            {
-                if (_timer_set.begin() == i)
-                    _condition.signal();
-
-                _timer_set.erase(i);
-
-                ret = true;
-                break;
-            }
-        }
-
-        idx.valid = false;
-    }
-
-    return ret;
-}
-
-bool TimerTraits::traits_del (TimerTraits::Index & idx)
-{
-    _mutex.lock();
-
-    bool ret = traits_del_unlocked(idx);
-
-    _mutex.unlock();
-
-    return ret;
-}
-
-bool TimerTraits::traits_del (const void * func, const void * data, unsigned int value)
-{
-    bool ret = false;
-
-    _mutex.lock();
-
-    for (ControlSet::iterator i = _timer_set.begin(); i != _timer_set.end(); i++)
-    {
-        const Control & ctrl = (*i);
-
-        if ((value && !(ctrl._value & value)))
-            continue;
-
-        if (((func && ctrl._func == func) || !func) && ((data && ctrl._data == data) || !data))
-        {
-            if (_timer_set.begin() == i)
-                _condition.signal();
-
-            _timer_set.erase(i);
-
-            ret = true;
-            break;
-        }
-    }
-
-    _mutex.unlock();
-
-    return ret;
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/timer.hpp b/src/mod/endpoints/mod_khomp/commons/base/timer.hpp
deleted file mode 100644
index 24d115d991..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/timer.hpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#if defined(_WINDOWS) || defined(_Windows) || defined(_WIN32) || defined(WIN32)
-#include <windows.h>
-#else
-#include <sched.h>
-#endif
-
-#include <set>
-
-#include <simple_lock.hpp>
-#include <saved_condition.hpp>
-#include <thread.hpp>
-#include <refcounter.hpp>
-
-#ifndef _TIMER_HPP_
-#define _TIMER_HPP_
-
-struct TimerTraits
-{
-    typedef bool          (* CallbackFuncType)(const void * volatile);
-    typedef const void *     CallbackDataType;
-
-    TimerTraits();
-
-    virtual ~TimerTraits() {};
-
- protected:
-
-    /* pre-declaration, used below */
-    struct ControlCompare;
-
-    struct Control
-    {
-        Control(unsigned int age, unsigned int msecs, const void * func = 0, const void * data = 0, unsigned int value = 0)
-        : _age(age), _msecs(msecs), _func(func), _data(data), _value(value) {}
-
-        unsigned int  _age;
-
-        unsigned int  _msecs;
-
-        const void * _func;
-        const void * _data;
-
-        unsigned int  _value;
-    };
-
-    struct ControlCompare
-    {
-        bool operator()(const Control & c1, const Control & c2) const
-        {
-            return (c1._age < c2._age ? true : c1._msecs < c2._msecs);
-        }
-    };
-
-    typedef std::multiset < Control, ControlCompare > ControlSet;
-
- public:
-    struct Index
-    {
-        Index(): era(0), msec(0), valid(false) {};
-
-        Index(unsigned int _era, unsigned int _msec, unsigned int _delta, const void * _func, const void * _data, unsigned int _value)
-        : era(_era), msec(_msec), delta(_delta), func(_func), data(_data), value(_value), valid(true) {};
-
-        unsigned int   era;
-        unsigned int  msec;
-
-        unsigned int  delta;
-
-        const void *  func;
-        const void *  data;
-
-        unsigned int value;
-
-        bool         valid;
-
-        void reset(void) { era = 0; msec = 0; valid = false; };
-    };
-
-    /* timer add/remove functions */
-    Index traits_add (unsigned int msecs, const void * func, const void * data = 0, unsigned int value = 0);
-
-    bool traits_restart (Index & idx, bool force);
-
-    bool traits_del (Index & idx);
-    bool traits_del (const void * func, const void * data = 0, unsigned int value = 0);
-
-    void traits_setup(Index * idx, unsigned int msecs, const void * func, void * data = 0, unsigned int value = 0);
-
-    /* timer start/stop functions */
-    bool start(void);
-    bool stop(void);
-
-  protected:
-    Index traits_add_unlocked (unsigned int msecs, const void * func, const void * data, unsigned int value);
-
-    bool traits_del_unlocked (Index & idx);
-
-  protected:
-    void execute(ControlSet::iterator, const Control &);
-
-    void loop(void);
-
-    struct loop_thread
-    {
-        loop_thread(TimerTraits *timer) : _timer(timer) {};
-
-        int operator()(void);
-
-      protected:
-        TimerTraits * _timer;
-    };
-
-    unsigned int tick();
-
-    /* variables */
-
-    SavedCondition   _condition;
-
-    SimpleLock       _mutex;
-    Thread         * _thread;
-    bool             _purify;
-
-    ControlSet       _timer_set;
-
-    unsigned int     _last_tick;
-    unsigned int     _age_count;
-
-    SavedCondition   _finalized;
-    bool             _shutdown;
-};
-
-template < typename F, typename D >
-struct TimerTemplate: COUNTER_SUPER(TimerTemplate< F, D >)
-{
-    typedef TimerTraits::Index   Index;
-    typedef TimerTraits::Control Control;
-
-    TimerTemplate()
-    : _timer(new TimerTraits())
-    {};
-
-    TimerTemplate(const TimerTemplate< F, D > & o)
-    : COUNTER_REFER(o, TimerTemplate< F, D >),
-      _timer(o._timer)
-    {};
-
-    void unreference(void)
-    {
-        if (_timer)
-            delete _timer;
-    };
-
-    bool start() { return _timer->start(); }
-    bool stop()  { return _timer->stop();  }
-
-    inline void setup(Index * idx, unsigned int msecs, F * func, D data = 0, unsigned int value = 0)
-    {
-        _timer->traits_setup(idx, msecs, (const void *)func, (void *)(data), value);
-    }
-
-    inline Index add(unsigned int msecs, F * func, D data = 0, unsigned int value = 0)
-    {
-        return _timer->traits_add(msecs, (const void *)func, (void *)(data), value);
-    }
-
-    inline bool restart(Index & idx, bool force = false)
-    {
-        return _timer->traits_restart(idx, force);
-    }
-
-    inline bool del(Index & idx)
-    {
-        return _timer->traits_del(idx);
-    }
-
-    inline bool del(F * func, D data, unsigned int value = 0)
-    {
-        return _timer->traits_del((const void *)func, (void *)(data), value);
-    }
-
-    inline bool del(unsigned int value)
-    {
-        return _timer->traits_del((const void *)0, (void *)0, value);
-    }
-
-  protected:
-    TimerTraits * _timer;
-};
-
-#endif /* _TIMER_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/types.hpp b/src/mod/endpoints/mod_khomp/commons/base/types.hpp
deleted file mode 100644
index 5ab6d292c6..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/types.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _TYPES_HPP_
-#define _TYPES_HPP_
-
-/*** Used for conditional compilation based on K3L version ***/
-
-#define K3L_AT_LEAST(major,minor,build) \
-    (((k3lApiMajorVersion == major) && ((k3lApiMinorVersion == minor) && (k3lApiBuildVersion >= build)) || \
-     ((k3lApiMajorVersion == major) && (k3lApiMinorVersion > minor))) || \
-      (k3lApiMajorVersion  > major))
-
-#define K3L_EXACT(major,minor,build) \
-    ((k3lApiMajorVersion == major) && (k3lApiMinorVersion == minor) && (k3lApiBuildVersion >= build))
-
-/*** Used for checking information on classes and stuff.. ***/
-
-template< typename T >
-struct IsClass
-{
-  protected:
-    template < typename X > static char ( &A( void(X::*)() ) )[1];
-    template < typename X > static char ( &A( X ) )[2];
-  public:
-    static bool const Result = sizeof( A< T >(0) ) == 1;
-};
-
-template < typename T >
-struct IsConst
-{
-    static bool const Result = false;
-};
-
-template < typename T >
-struct IsConst< const T >
-{
-    static bool const Result = true;
-};
-
-template < typename T >
-struct IsConst< T const * >
-{
-    static bool const Result = true;
-};
-
-/*** Used for template metaprogramming ***/
-
-template < bool Value, typename Then, typename Else >
-struct Select
-{
-    typedef Then Result;
-};
-
-template < typename Then, typename Else >
-struct Select < false, Then, Else >
-{
-    typedef Else Result;
-};
-
-#endif /* _TYPES_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/variable.hpp b/src/mod/endpoints/mod_khomp/commons/base/variable.hpp
deleted file mode 100644
index efeb0f53b7..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/variable.hpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the "LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <refcounter.hpp>
-
-#ifndef _VARIABLE_HPP_
-#define _VARIABLE_HPP_
-
-template < typename R >
-struct VariableBaseTable
-{
-    R value;
-};
-
-struct EmptyVariable {};
-
-template < typename R >
-struct Variable
-{
-  protected:
-    typedef VariableBaseTable< R >  BaseType;
-
-    typedef const BaseType *    ConstObjType;
-    typedef BaseType *               ObjType;
-    typedef R BaseType::*            VarType;
-
-  public:
-    template < typename ConstructorObjType >
-    Variable(R ConstructorObjType::* v)
-    : _adjusted(true),
-      _variable(reinterpret_cast<const VarType>(v))
-    {};
-
-    Variable()
-    : _adjusted(false)
-    {};
-
-    template < typename MemberType >
-    void operator=(const MemberType v)
-    {
-        _adjusted = true;
-        _variable = reinterpret_cast<const VarType>(v);
-    }
-
-    template < typename Type >
-    R & operator()(Type * obj) const
-    {
-        if (!_adjusted)
-            throw EmptyVariable();
-
-        return (reinterpret_cast< ObjType >(obj))->*(_variable);
-    }
-
-    template < typename Type >
-    R & operator()(Type & obj) const
-    {
-        if (!_adjusted)
-            throw EmptyVariable();
-
-        return (reinterpret_cast< ObjType >(&obj))->*(_variable);
-    }
-
-    template < typename Type >
-    const R & operator()(const Type * obj) const
-    {
-        if (!_adjusted)
-            throw EmptyVariable();
-
-        return (reinterpret_cast< ConstObjType >(obj))->*(_variable);
-    }
-
-    template < typename Type >
-    const R & operator()(const Type & obj) const
-    {
-        if (!_adjusted)
-            throw EmptyVariable();
-
-        return (reinterpret_cast< ConstObjType >(&obj))->*(_variable);
-    }
-
-  protected:
-    bool    _adjusted;
-    VarType _variable;
-};
-
-#endif /* _VARIABLE_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/verbose.cpp b/src/mod/endpoints/mod_khomp/commons/base/verbose.cpp
deleted file mode 100644
index bacd269736..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/verbose.cpp
+++ /dev/null
@@ -1,2992 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <strings.hpp>
-#include <verbose.hpp>
-
-#define PRESENTATION_CHECK_RETURN(fmt, txtexact, txthuman) \
-    { \
-        switch(fmt) \
-        { \
-            case EXACT: return txtexact; \
-            case HUMAN: return txthuman; \
-        } \
-        return txtexact; \
-    }
-
-/********************************************/
-
-std::string Verbose::channelStatus(const int32 dev, const int32 obj, const int32 cs, const Verbose::Presentation fmt) const
-{
-    try
-    {
-        const K3L_CHANNEL_CONFIG & config = _api.channel_config(dev, obj);
-        return Verbose::channelStatus(config.Signaling, cs, fmt);
-    }
-    catch (...)
-    {
-        return presentation(fmt, "<unknown>", "Unknown");
-    }
-}
-
-#if K3L_AT_LEAST(2,0,0)
-std::string Verbose::event(const int32 obj, const K3L_EVENT * const ev, const R2CountryType r2_country, const Verbose::Presentation fmt) const
-#else
-std::string Verbose::event(const int32 obj, const K3L_EVENT * const ev, const Verbose::Presentation fmt) const
-#endif
-{
-    try
-    {
-        const K3L_CHANNEL_CONFIG & config = _api.channel_config(ev->DeviceId, obj);
-#if K3L_AT_LEAST(2,0,0)
-        return Verbose::event(config.Signaling, obj, ev, r2_country, fmt);
-#else
-        return Verbose::event(config.Signaling, obj, ev, fmt);
-#endif
-    }
-    catch (...)
-    {
-#if K3L_AT_LEAST(2,0,0)
-        return Verbose::event(ksigInactive, obj, ev, r2_country, fmt);
-#else
-        return Verbose::event(ksigInactive, obj, ev, fmt);
-#endif
-    }
-}
-
-/********************************************/
-
-std::string Verbose::echoLocation(const KEchoLocation ec, const Verbose::Presentation fmt)
-{
-    switch (ec)
-    {
-#if K3L_AT_LEAST(1,5,4)
-        case kelNetwork: return presentation(fmt, "kelNetwork", "Network");
-#else
-        case kelE1:      return presentation(fmt, "kelE1",      "Network");
-#endif
-        case kelCtBus:   return presentation(fmt, "kelCtBus",   "CT-Bus");
-    };
-
-    return presentation(fmt, "<unknown>", "Unknown");
-};
-
-std::string Verbose::echoCancellerConfig(KEchoCancellerConfig ec, const Verbose::Presentation fmt)
-{
-    switch (ec)
-    {
-        case keccNotPresent:    return presentation(fmt, "keccNotPresent",    "Not Present");
-        case keccOneSingleBank: return presentation(fmt, "keccOneSingleBank", "One, Single Bank");
-        case keccOneDoubleBank: return presentation(fmt, "keccOneDoubleBank", "One, Double Bank");
-        case keccTwoSingleBank: return presentation(fmt, "keccTwoSingleBank", "Two, Single Bank");
-        case keccTwoDoubleBank: return presentation(fmt, "keccTwoDoubleBank", "Two, Double Bank");
-        case keccFail:          return presentation(fmt, "keccFail",          "Failure");
-    };
-
-    return presentation(fmt, "<unknown>", "Unknown");
-};
-
-std::string Verbose::deviceName(const KDeviceType dt, const int32 model, const Verbose::Presentation fmt)
-{
-    return deviceName(dt, model, 0, fmt);
-}
-
-std::string Verbose::deviceName(const KDeviceType dt, const int32 model, const int32 count, const Verbose::Presentation fmt)
-{
-    try
-    {
-        std::string value;
-
-        value += internal_deviceType(dt, count);
-        value += "-";
-        value += internal_deviceModel(dt, model, count);
-
-        return value;
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[type/model='%d/%d']") % (int)dt % (int)model),
-            STG(FMT("Unknown device type/model (%d/%d)") % (int)dt % (int)model));
-    }
-}
-
-std::string Verbose::deviceType(const KDeviceType dt, const Verbose::Presentation fmt)
-{
-    return deviceType(dt, 0, fmt);
-}
-
-std::string Verbose::deviceType(const KDeviceType dt, const int32 count, const Verbose::Presentation fmt)
-{
-    try
-    {
-        return internal_deviceType(dt, count);
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[type='%d']") % (int)dt),
-            STG(FMT("Unknown device type (%d)") % (int)dt));
-    }
-}
-
-std::string Verbose::internal_deviceType(const KDeviceType dt, const int32 count)
-{
-    switch (dt)
-    {
-        case kdtE1:            return (count > 34 || count == 0 ? "K2E1" : "K1E1");
-
-#if K3L_AT_LEAST(1,6,0)
-        case kdtFXO:           return "KFXO";
-#else
-        case kdtFX:            return "KFXO";
-#endif
-
-        case kdtConf:          return "KCONF";
-        case kdtPR:            return "KPR";
-        case kdtE1GW:          return "KE1GW";
-
-#if K3L_AT_LEAST(1,6,0)
-        case kdtFXOVoIP:       return "KFXVoIP";
-#else
-        case kdtFXVoIP:        return "KFXVoIP";
-#endif
-
-#if K3L_AT_LEAST(1,5,0)
-        case kdtE1IP:          return (count > 90 || count == 0 ? "K2E1" : "K1E1");
-#endif
-#if K3L_AT_LEAST(1,5,1)
-        case kdtE1Spx:         return (count > 30 || count == 0 ? "K2E1" : "K1E1");
-        case kdtGWIP:          return "KGWIP";
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case kdtFXS:           return "KFXS";
-        case kdtFXSSpx:        return "KFXS";
-        case kdtGSM:           return "KGSM";
-        case kdtGSMSpx:        return "KGSM";
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-        case kdtGSMUSB:        return "KGSMUSB";
-        case kdtGSMUSBSpx:     return "KGSMUSB";
-
-        case kdtE1FXSSpx:      return "KE1FXS";
-#endif
-
-#if K3L_EXACT(2,1,0)
-        case kdtReserved1:     return "Reserved1";
-#endif
-
-#if K3L_AT_LEAST(2,2,0)
-        case kdtE1AdHoc:       return "KE1AdHoc";
-#endif
-        case kdtDevTypeCount:  break;
-    }
-
-    throw internal_not_found();
-}
-
-std::string Verbose::deviceModel(const KDeviceType dt, const int32 model, const Verbose::Presentation fmt)
-{
-    return deviceModel(dt, model, 0, fmt);
-};
-
-std::string Verbose::deviceModel(const KDeviceType dt, const int32 model, const int32 count, const Verbose::Presentation fmt)
-{
-    try
-    {
-        return internal_deviceModel(dt, model, count);
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[model='%d']") % (int)model),
-            STG(FMT("Unknown device model (%d)") % (int)model));
-    }
-}
-
-std::string Verbose::internal_deviceModel(const KDeviceType dt, const int32 model, const int32 count)
-{
-    switch (dt)
-    {
-        case kdtE1:
-            switch ((KE1DeviceModel)model)
-            {
-                case kdmE1600:   return (count > 34 || count == 0 ? "600" : "300");
-                case kdmE1600E:  return (count > 34 || count == 0 ? "600" : "300");
-#if K3L_AT_LEAST(2,0,0)
-                case kdmE1600EX: return (count > 34 || count == 0 ? "600" : "300");
-#endif
-            }
-            throw internal_not_found();
-
-#if K3L_AT_LEAST(1,6,0)
-        case kdtFXO:
-            switch ((KFXODeviceModel)model)
-#else
-        case kdtFX:
-            switch ((KFXDeviceModel)model)
-#endif
-            {
-#if K3L_AT_LEAST(1,6,0)
-                case kdmFXO80:
-                    switch (count)
-                    {
-                        case 0: /* default */
-                        case 8: return "80";
-                        case 4: return "40";
-                    }
-                    break;
-
-                case kdmFXOHI:
-                    switch (count)
-                    {
-                        case 0: /* default */
-                        case 8: return "80-HI";
-                        case 4: return "40-HI";
-                    }
-                    break;
-
-                case kdmFXO160HI: return "160HI";
-#if K3L_AT_LEAST(2,1,0)
-                case kdmFXO240HI: return "240HI";
-#endif
-#else
-                case kdmFXO80:
-                    switch (count)
-                    {
-                        case 0: /* default */
-                        case 8: return "80";
-                        case 4: return "40";
-                    }
-                    break;
-
-#endif
-            }
-
-            throw internal_not_found();
-
-        case kdtConf:
-            switch ((KConfDeviceModel)model)
-            {
-                case kdmConf240:   return "240";
-                case kdmConf120:   return "120";
-#if K3L_AT_LEAST(2,0,0)
-                case kdmConf240EX: return "240EX";
-                case kdmConf120EX: return "120EX";
-#endif
-            }
-
-            throw internal_not_found();
-
-        case kdtPR:
-            switch ((KPRDeviceModel)model)
-            {
-#if K3L_AT_LEAST(1,6,0)
-                case kdmPR300v1:       return "300v1";
-                case kdmPR300SpxBased: return "300S";
-#if K3L_AT_LEAST(2,0,0)
-                case kdmPR300EX:       return "300EX";
-#endif
-                case kdmPR300:         return "300";
-            }
-#endif
-            throw internal_not_found();
-
-#if K3L_AT_LEAST(1,4,0)
-        case kdtE1GW:
-            switch ((KE1GWDeviceModel)model)
-            {
-#if K3L_AT_LEAST(1,6,0)
-                case kdmE1GW640:    return "640";
-#if K3L_AT_LEAST(2,0,0)
-                case kdmE1GW640EX:  return "640EX";
-#endif
-#else
-                case kdmE1600V:  return (count > 34 || count == 0 ? "600V"  : "300V" );
-                case kdmE1600EV: return (count > 34 || count == 0 ? "600EV" : "600EV");
-#endif
-            }
-
-            throw internal_not_found();
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case kdtFXOVoIP:
-            switch ((KFXOVoIPDeviceModel)model)
-            {
-                case kdmFXGW180:  return "180";
-            }
-
-            throw internal_not_found();
-
-#elif K3L_AT_LEAST(1,4,0)
-        case kdtFXVoIP:
-            switch ((KFXVoIPDeviceModel)model)
-            {
-                case kdmFXO80V: return "80V";
-            }
-
-            throw internal_not_found();
-#endif
-
-#if K3L_AT_LEAST(1,5,0)
-        case kdtE1IP:
-            switch ((KE1IPDeviceModel)model)
-            {
-#if K3L_AT_LEAST(1,6,0)
-                case kdmE1IP:    return "E1IP";
-#if K3L_AT_LEAST(2,0,0)
-                case kdmE1IPEX:  return "E1IPEX";
-#endif
-#else
-                case kdmE1600EG: return (count > 90 || count == 0 ? "600EG" : "300EG");
-#endif
-            }
-
-            throw internal_not_found();
-#endif
-
-#if K3L_AT_LEAST(1,5,1)
-        case kdtE1Spx:
-            switch ((KE1SpxDeviceModel)model)
-            {
-                case kdmE1Spx:      return "SPX";
-                case kdm2E1Based:   return "SPX-2E1";
-#if K3L_AT_LEAST(2,0,0)
-                case kdmE1SpxEX:    return "SPXEX";
-#endif
-            }
-            throw internal_not_found();
-
-        case kdtGWIP:
-            switch ((KGWIPDeviceModel)model)
-            {
-#if K3L_AT_LEAST(1,6,0)
-                case kdmGWIP:     return "GWIP";
-#if K3L_AT_LEAST(2,0,0)
-                case kdmGWIPEX:   return "GWIPEX";
-#endif
-#else
-                case kdmGW600G:   return "600G";
-                case kdmGW600EG:  return "600EG";
-#endif
-            }
-
-            throw internal_not_found();
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case kdtFXS:
-            switch ((KFXSDeviceModel)model)
-            {
-                case kdmFXS300:   return (count > 30 || count == 0 ? "300"   : "150");
-#if K3L_AT_LEAST(2,0,0)
-                case kdmFXS300EX: return (count > 30 || count == 0 ? "300EX" : "150EX");
-#endif
-            }
-
-            throw internal_not_found();
-
-        case kdtFXSSpx:
-            switch ((KFXSSpxDeviceModel)model)
-            {
-                case kdmFXSSpx300:      return (count > 30 || count == 0 ? "300-SPX"     : "150-SPX");
-                case kdmFXSSpx2E1Based: return "SPX-2E1";
-#if K3L_AT_LEAST(2,0,0)
-                case kdmFXSSpx300EX:    return (count > 30 || count == 0 ? "300-SPXEX"   : "150-SPXEX");
-#endif
-            }
-
-            throw internal_not_found();
-
-        case kdtGSM:
-            switch ((KGSMDeviceModel)model)
-            {
-                case kdmGSM:
-                    switch (count)
-                    {
-                        case 0: /* default */
-                        case 4: return "40";
-                        case 3: return "30";
-                        case 2: return "20";
-                        case 1: return "10";
-                    }
-                    break;
-#if K3L_AT_LEAST(2,0,0)
-                case kdmGSMEX:
-                    switch (count)
-                    {
-                        case 0: /* default */
-                        case 4: return "40EX";
-                        case 3: return "80EX";
-                        case 2: return "20EX";
-                        case 1: return "10EX";
-                    }
-                    break;
-#endif
-            }
-
-            throw internal_not_found();
-
-        case kdtGSMSpx:
-            switch ((KGSMSpxDeviceModel)model)
-            {
-                case kdmGSMSpx:
-                    switch (count)
-                    {
-                        case 0: /* default */
-                        case 4: return "40";
-                        case 3: return "30";
-                        case 2: return "20";
-                        case 1: return "10";
-                    }
-                    break;
-#if K3L_AT_LEAST(2,0,0)
-                case kdmGSMSpxEX:
-                    switch (count)
-                    {
-                        case 0: /* default */
-                        case 4: return "40-SPXEX";
-                        case 3: return "80-SPXEX";
-                        case 2: return "20-SPXEX";
-                        case 1: return "10-SPXEX";
-                    }
-                    break;
-#endif
-            }
-
-            throw internal_not_found();
-
-#if K3L_AT_LEAST(2,1,0)
-        case kdtGSMUSB:
-            switch ((KGSMUSBDeviceModel)model)
-            {
-                case kdmGSMUSB:    return "20";
-            }
-
-            throw internal_not_found();
-
-        case kdtGSMUSBSpx:
-            switch ((KGSMUSBSpxDeviceModel)model)
-            {
-                case kdmGSMUSBSpx: return "SPX";
-            }
-
-            throw internal_not_found();
-
-        case kdtE1FXSSpx:
-            switch ((KGSMSpxDeviceModel)model)
-            {
-                case kdmE1FXSSpx:   return "450-SPX";
-                case kdmE1FXSSpxEX: return "450-SPXEX";
-            }
-
-            throw internal_not_found();
-#if K3L_AT_LEAST(2,2,0)
-        case kdtE1AdHoc:
-            switch((KE1AdHocModel)model)
-            {
-                case kdmE1AdHoc100:  return "E1AdHoc100";
-                case kdmE1AdHoc100E: return "E1AdHoc100E";
-                case kdmE1AdHoc240:  return "E1AdHoc240";
-                case kdmE1AdHoc240E: return "E1AdHoc240E";
-                case kdmE1AdHoc400:  return "E1AdHoc240";
-                case kdmE1AdHoc400E: return "E1AdHoc240E";
-            }
-            throw internal_not_found();
-#endif
-
-#if K3L_EXACT(2,1,0)
-        case kdtReserved1:
-#endif
-        case kdtDevTypeCount:
-            throw internal_not_found();
-
-#endif
-#endif
-    }
-
-    throw internal_not_found();
-}
-
-std::string Verbose::signaling(const KSignaling sig, const Verbose::Presentation fmt)
-{
-    switch (sig)
-    {
-        case ksigInactive:      return presentation(fmt, "ksigInactive",        "Inactive");
-        case ksigAnalog:        return presentation(fmt, "ksigAnalog",          "FXO (analog)");
-        case ksigContinuousEM:  return presentation(fmt, "ksigContinuousEM",    "E+M Continuous");
-        case ksigPulsedEM:      return presentation(fmt, "ksigPulsedEM",        "E+M PUlsed");
-        case ksigOpenCAS:       return presentation(fmt, "ksigOpenCAS",         "Open CAS");
-        case ksigOpenR2:        return presentation(fmt, "ksigOpenR2",          "Open R2");
-        case ksigR2Digital:     return presentation(fmt, "ksigR2Digital",       "R2/MFC");
-        case ksigUserR2Digital: return presentation(fmt, "ksigUserR2Digital",   "R2/Other");
-#if K3L_AT_LEAST(1,4,0)
-        case ksigSIP:           return presentation(fmt, "ksigSIP",             "SIP");
-#endif
-
-#if K3L_AT_LEAST(1,5,1)
-        case ksigOpenCCS:       return presentation(fmt, "ksigOpenCCS",         "Open CCS");
-        case ksigPRI_EndPoint:  return presentation(fmt, "ksigPRI_EndPoint",    "ISDN Endpoint");
-        case ksigPRI_Network:   return presentation(fmt, "ksigPRI_Network",     "ISDN Network");
-        case ksigPRI_Passive:   return presentation(fmt, "ksigPRI_Passive",     "ISDN Passive");
-#endif
-#if K3L_AT_LEAST(1,5,3)
-        case ksigLineSide:        return presentation(fmt, "ksigLineSide",      "Line Side");
-#endif
-#if K3L_AT_LEAST(1,6,0)
-        case ksigAnalogTerminal: return presentation(fmt, "ksigAnalogTerminal", "FXS (analog)");
-        case ksigGSM:            return presentation(fmt, "ksigGSM",            "GSM");
-        case ksigCAS_EL7:        return presentation(fmt, "ksigCAS_EL7",        "CAS EL7");
-        case ksigE1LC:           return presentation(fmt, "ksigE1LC",           "E1 LC");
-#endif
-#if K3L_AT_LEAST(2,1,0)
-        case ksigISUP:           return presentation(fmt, "ksigISUP",           "ISUP");
-#endif
-#if K3L_EXACT(2,1,0)
-        case ksigFax:            return presentation(fmt, "ksigFax",            "Fax");
-#endif
-#if K3L_AT_LEAST(2,2,0)
-        case ksigISUPPassive:    return presentation(fmt, "ksigISUPPassive",    "ISUP Passive");
-#endif
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KSignaling='%d']") % (int)sig),
-        STG(FMT("Unknown signaling (%d)") % (int)sig));
-}
-
-std::string Verbose::systemObject(const KSystemObject so, const Verbose::Presentation fmt)
-{
-    switch (so)
-    {
-        case ksoLink:      return presentation(fmt, "ksoLink",      "Link");
-        case ksoLinkMon:   return presentation(fmt, "ksoLinkMon",   "Link Monitor");
-        case ksoChannel:   return presentation(fmt, "ksoChannel",   "Channel");
-#if K3L_AT_LEAST(2,1,0)
-        case ksoGsmChannel:return presentation(fmt, "ksoGsmChannel","GsmChannel");
-#endif
-        case ksoH100:      return presentation(fmt, "ksoH100",      "H.100");
-        case ksoFirmware:  return presentation(fmt, "ksoFirmware",  "Firmware");
-        case ksoDevice:    return presentation(fmt, "ksoDevice",    "Device");
-        case ksoAPI:       return presentation(fmt, "ksoAPI",       "Software Layer");
-    }
-
-    return presentation(fmt,
-        STG(FMT("[KSystemObject='%d']") % (int)so),
-        STG(FMT("Unknown object (%d)") % (int)so));
-}
-
-std::string Verbose::mixerTone(const KMixerTone mt, const Verbose::Presentation fmt)
-{
-    switch (mt)
-    {
-        case kmtSilence:   return presentation(fmt, "kmtSilence",   "Silence");
-        case kmtDial:      return presentation(fmt, "kmtDial",      "Dialtone begin");
-        case kmtEndOf425:  return presentation(fmt, "kmtEndOf425",  "Dialtone end");
-        case kmtBusy:      return presentation(fmt, "kmtBusy",      "Busy");
-        case kmtFax:       return presentation(fmt, "kmtFax",       "Fax");
-        case kmtVoice:     return presentation(fmt, "kmtVoice",     "Voice");
-#if K3L_AT_LEAST(1,5,0)
-        case kmtCollect:   return presentation(fmt, "kmtCollect",   "Collect Call");
-#endif
-#if K3L_AT_LEAST(1,5,1)
-        case kmtEndOfDtmf: return presentation(fmt, "kmtEndOfDtmf", "DTMF end");
-#endif
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KMixerTone='%d']") % (int)mt),
-        STG(FMT("Unknonwn tone (%d)") % (int)mt));
-}
-
-std::string Verbose::mixerSource(const KMixerSource ms, const Verbose::Presentation fmt)
-{
-    switch (ms)
-    {
-        case kmsChannel:        return presentation(fmt, "kmsChannel",        "Channel");
-        case kmsPlay:           return presentation(fmt, "kmsPlay",           "Player");
-        case kmsGenerator:      return presentation(fmt, "kmsGenerator",      "Generator");
-        case kmsCTbus:          return presentation(fmt, "kmsCTbus",          "CT-bus");
-#if (K3L_AT_LEAST(1,4,0) && !K3L_AT_LEAST(1,6,0))
-        case kmsVoIP:           return presentation(fmt, "kmsVoIP",           "VoIP");
-#endif
-#if K3L_AT_LEAST(1,6,0)
-        case kmsNoDelayChannel: return presentation(fmt, "kmsNoDelayChannel", "No delay channel");
-#endif
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KMixerSource='%d']") % (int)ms),
-        STG(FMT("Unknonwn source (%d)") % (int)ms));
-}
-
-std::string Verbose::channelFeatures(const int32 flags, const Verbose::Presentation fmt)
-{
-    if (0x00 != flags)
-    {
-        Strings::Merger strs;
-
-        if (kcfDtmfSuppression & flags)   strs.add(presentation(fmt, "DtmfSuppression",   "DTMF Suppression"));
-        if (kcfCallProgress & flags)      strs.add(presentation(fmt, "CallProgress",      "Call Progress"));
-        if (kcfPulseDetection & flags)    strs.add(presentation(fmt, "PulseDetection",    "Pulse Detection"));
-        if (kcfAudioNotification & flags) strs.add(presentation(fmt, "AudioNotification", "Audio Notification"));
-        if (kcfEchoCanceller & flags)     strs.add(presentation(fmt, "EchoCanceller",     "Echo Canceller"));
-        if (kcfAutoGainControl & flags)   strs.add(presentation(fmt, "AutoGainControl",   "Input AGC"));
-        if (kcfHighImpEvents & flags)     strs.add(presentation(fmt, "HighImpEvents",     "High Impedance Events"));
-#if K3L_AT_LEAST(1,6,0)
-        if (kcfCallAnswerInfo & flags)    strs.add(presentation(fmt, "CallAnswerInfo",    "Call Answer Info"));
-        if (kcfOutputVolume & flags)      strs.add(presentation(fmt, "OutputVolume",      "Output Volume"));
-        if (kcfPlayerAGC & flags)         strs.add(presentation(fmt, "PlayerAGC",         "Player AGC"));
-#endif
-
-        return presentation(fmt,
-            STG(FMT("kcf{%s}") % strs.merge(",")),
-            STG(FMT("%s") % strs.merge(", ")));
-    };
-
-    PRESENTATION_CHECK_RETURN(fmt, "", "No features");
-}
-
-std::string Verbose::seizeFail(const KSeizeFail sf, const Verbose::Presentation fmt)
-{
-    switch (sf)
-    {
-        case ksfChannelLocked:   return presentation(fmt, "ksfChannelLocked",   "Channel Locked");
-        case ksfChannelBusy:     return presentation(fmt, "ksfChannelBusy",     "Channel Busy");
-        case ksfIncomingChannel: return presentation(fmt, "ksfIncomingChannel", "Incoming Channel");
-        case ksfDoubleSeizure:   return presentation(fmt, "ksfDoubleSeizure",   "Double Seizure");
-        case ksfCongestion:      return presentation(fmt, "ksfCongestion",      "Congestion");
-        case ksfNoDialTone:      return presentation(fmt, "ksfNoDialTone",      "No Dial Tone");
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KSeizeFail='%d']") % (int)sf),
-        STG(FMT("Unknown seize fail (%d)") % (int)sf));
-}
-
-#if K3L_AT_LEAST(1,5,0)
-std::string Verbose::internal_sipFailures(const KSIP_Failures code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-#if K3L_AT_LEAST(1,6,0)
-        case kveResponse_200_OK_Success:                 return presentation(fmt, "kveResponse_200_OK_Success",                 "200 OK");
-#endif
-        case kveRedirection_300_MultipleChoices:         return presentation(fmt, "kveRedirection_300_MultipleChoices",         "300 Multiple Choices");
-        case kveRedirection_301_MovedPermanently:        return presentation(fmt, "kveRedirection_301_MovedPermanently",        "301 Moved Permanently");
-        case kveRedirection_302_MovedTemporarily:        return presentation(fmt, "kveRedirection_302_MovedTemporarily",        "302 Moved Temporarily");
-        case kveRedirection_305_UseProxy:                return presentation(fmt, "kveRedirection_305_UseProxy",                "305 Use Proxy");
-        case kveRedirection_380_AlternativeService:      return presentation(fmt, "kveRedirection_380_AlternativeService",      "380 Alternate Service");
-        case kveFailure_400_BadRequest:                  return presentation(fmt, "kveFailure_400_BadRequest",                  "400 Bad Request");
-        case kveFailure_401_Unauthorized:                return presentation(fmt, "kveFailure_401_Unauthorized",                "401 Unauthorized");
-        case kveFailure_402_PaymentRequired:             return presentation(fmt, "kveFailure_402_PaymentRequired",             "402 Payment Required");
-        case kveFailure_403_Forbidden:                   return presentation(fmt, "kveFailure_403_Forbidden",                   "403 Forbidden");
-        case kveFailure_404_NotFound:                    return presentation(fmt, "kveFailure_404_NotFound",                    "404 Not Found");
-        case kveFailure_405_MethodNotAllowed:            return presentation(fmt, "kveFailure_405_MethodNotAllowed",            "405 Method Not Allowed");
-        case kveFailure_406_NotAcceptable:               return presentation(fmt, "kveFailure_406_NotAcceptable",               "406 Not Acceptable");
-        case kveFailure_407_ProxyAuthenticationRequired: return presentation(fmt, "kveFailure_407_ProxyAuthenticationRequired", "407 Proxy Authentication Required");
-        case kveFailure_408_RequestTimeout:              return presentation(fmt, "kveFailure_408_RequestTimeout",              "408 Request Timeout");
-        case kveFailure_410_Gone:                        return presentation(fmt, "kveFailure_410_Gone",                        "410 Gone");
-        case kveFailure_413_RequestEntityTooLarge:       return presentation(fmt, "kveFailure_413_RequestEntityTooLarge",       "413 Request Entity Too Large");
-        case kveFailure_414_RequestURI_TooLong:          return presentation(fmt, "kveFailure_414_RequestURI_TooLong",          "414 Request URI Too Long");
-        case kveFailure_415_UnsupportedMediaType:        return presentation(fmt, "kveFailure_415_UnsupportedMediaType",        "415 Unsupported Media Type");
-        case kveFailure_416_UnsupportedURI_Scheme:       return presentation(fmt, "kveFailure_416_UnsupportedURI_Scheme",       "416 Unsupported URI Scheme");
-        case kveFailure_420_BadExtension:                return presentation(fmt, "kveFailure_420_BadExtension",                "420 Bad Extension");
-        case kveFailure_421_ExtensionRequired:           return presentation(fmt, "kveFailure_421_ExtensionRequired",           "421 Extension Required");
-        case kveFailure_423_IntervalTooBrief:            return presentation(fmt, "kveFailure_423_IntervalTooBrief",            "423 Internal Too Brief");
-        case kveFailure_480_TemporarilyUnavailable:      return presentation(fmt, "kveFailure_480_TemporarilyUnavailable",      "480 Temporarily Unavailable");
-        case kveFailure_481_CallDoesNotExist:            return presentation(fmt, "kveFailure_481_CallDoesNotExist",            "481 Call Does Not Exist");
-        case kveFailure_482_LoopDetected:                return presentation(fmt, "kveFailure_482_LoopDetected",                "482 Loop Detected");
-        case kveFailure_483_TooManyHops:                 return presentation(fmt, "kveFailure_483_TooManyHops",                 "483 Too Many Hops");
-        case kveFailure_484_AddressIncomplete:           return presentation(fmt, "kveFailure_484_AddressIncomplete",           "484 Address Incomplete");
-        case kveFailure_485_Ambiguous:                   return presentation(fmt, "kveFailure_485_Ambiguous",                   "485 Ambiguous");
-        case kveFailure_486_BusyHere:                    return presentation(fmt, "kveFailure_486_BusyHere",                    "486 Busy Here");
-        case kveFailure_487_RequestTerminated:           return presentation(fmt, "kveFailure_487_RequestTerminated",           "487 Request Terminated");
-        case kveFailure_488_NotAcceptableHere:           return presentation(fmt, "kveFailure_488_NotAcceptableHere",           "488 Not Acceptable Here");
-        case kveFailure_491_RequestPending:              return presentation(fmt, "kveFailure_491_RequestPending",              "491 Request Pending");
-        case kveFailure_493_Undecipherable:              return presentation(fmt, "kveFailure_493_Undecipherable",              "493 Undecipherable");
-        case kveServer_500_InternalError:                return presentation(fmt, "kveServer_500_InternalError",                "500 Internal Error");
-        case kveServer_501_NotImplemented:               return presentation(fmt, "kveServer_501_NotImplemented",               "501 Not Implemented");
-        case kveServer_502_BadGateway:                   return presentation(fmt, "kveServer_502_BadGateway",                   "502 Bad Gateway");
-        case kveServer_503_ServiceUnavailable:           return presentation(fmt, "kveServer_503_ServiceUnavailable",           "503 Service Unavailable");
-        case kveServer_504_TimeOut:                      return presentation(fmt, "kveServer_504_TimeOut",                      "504 Timed Out");
-        case kveServer_505_VersionNotSupported:          return presentation(fmt, "kveServer_505_VersionNotSupported",          "505 Version Not Supported");
-        case kveServer_513_MessageTooLarge:              return presentation(fmt, "kveServer_513_MessageTooLarge",              "513 Message Too Large");
-        case kveGlobalFailure_600_BusyEverywhere:        return presentation(fmt, "kveGlobalFailure_600_BusyEverywhere",        "600 Busy Everywhere");
-        case kveGlobalFailure_603_Decline:               return presentation(fmt, "kveGlobalFailure_603_Decline",               "603 Decline");
-        case kveGlobalFailure_604_DoesNotExistAnywhere:  return presentation(fmt, "kveGlobalFailure_604_DoesNotExistAnywhere",  "604 Does Not Exist Anywhere");
-        case kveGlobalFailure_606_NotAcceptable:         return presentation(fmt, "kveGlobalFailure_606_NotAcceptable",         "606 Not Acceptable");
-    }
-
-    throw internal_not_found();
-}
-
-std::string Verbose::sipFailures(const KSIP_Failures code, const Verbose::Presentation fmt)
-{
-    try
-    {
-        return internal_sipFailures(code, fmt);
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[KSIP_Failures='%d']") % (int)code),
-            STG(FMT("Unknown SIP failure (%d)") % (int)code));
-    }
-}
-
-#endif
-
-#if K3L_AT_LEAST(1,5,1)
-std::string Verbose::internal_isdnCause(const KQ931Cause code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case kq931cNone:                           return presentation(fmt, "kq931cNone",                           "None");
-        case kq931cUnallocatedNumber:              return presentation(fmt, "kq931cUnallocatedNumber",              "Unallocated number");
-        case kq931cNoRouteToTransitNet:            return presentation(fmt, "kq931cNoRouteToTransitNet",            "No route to transmit to network");
-        case kq931cNoRouteToDest:                  return presentation(fmt, "kq931cNoRouteToDest",                  "No route to destination");
-#if 1 /* this changed during K3L 1.6.0 development cycle... */
-        case kq931cSendSpecialInfoTone:            return presentation(fmt, "kq931cSendSpecialInfoTone",            "Send special information tone");
-        case kq931cMisdialedTrunkPrefix:           return presentation(fmt, "kq931cMisdialedTrunkPrefix",           "Misdialed trunk prefix");
-#endif
-        case kq931cChannelUnacceptable:            return presentation(fmt, "kq931cChannelUnacceptable",            "Channel unacceptable");
-        case kq931cCallAwarded:                    return presentation(fmt, "kq931cCallAwarded",                    "Call awarded");
-#if 1 /* this changed during K3L 1.6.0 development cycle... */
-        case kq931cPreemption:                     return presentation(fmt, "kq931cPreemption",                     "Preemption");
-        case kq931cPreemptionCircuitReuse:         return presentation(fmt, "kq931cPreemptionCircuitReuse",         "Preemption circuit reuse");
-        case kq931cQoR_PortedNumber:               return presentation(fmt, "kq931cQoR_PortedNumber",               "QoR ported number");
-#endif
-        case kq931cNormalCallClear:                return presentation(fmt, "kq931cNormalCallClear",                "Normal call clear");
-        case kq931cUserBusy:                       return presentation(fmt, "kq931cUserBusy",                       "User busy");
-        case kq931cNoUserResponding:               return presentation(fmt, "kq931cNoUserResponding",               "No user responding");
-        case kq931cNoAnswerFromUser:               return presentation(fmt, "kq931cNoAnswerFromUser",               "No answer from user");
-#if 1 /* this changed during K3L 1.6.0 development cycle... */
-        case kq931cSubscriberAbsent:               return presentation(fmt, "kq931cSubscriberAbsent",               "Subscriber absent");
-#endif
-        case kq931cCallRejected:                   return presentation(fmt, "kq931cCallRejected",                   "Call rejected");
-        case kq931cNumberChanged:                  return presentation(fmt, "kq931cNumberChanged",                  "Number changed");
-#if 1 /* this changed during K3L 1.6.0 development cycle... */
-        case kq931cRedirectionToNewDest:           return presentation(fmt, "kq931cRedirectionToNewDest",           "Redirection to new destination");
-        case kq931cCallRejectedFeatureDest:        return presentation(fmt, "kq931cCallRejectedFeatureDest",        "Call rejected feature destination");
-        case kq931cExchangeRoutingError:           return presentation(fmt, "kq931cExchangeRoutingError",           "Exchange routing error");
-#endif
-        case kq931cNonSelectedUserClear:           return presentation(fmt, "kq931cNonSelectedUserClear",           "Non selected user clear");
-        case kq931cDestinationOutOfOrder:          return presentation(fmt, "kq931cDestinationOutOfOrder",          "Destination out of order");
-        case kq931cInvalidNumberFormat:            return presentation(fmt, "kq931cInvalidNumberFormat",            "Invalid number format");
-        case kq931cFacilityRejected:               return presentation(fmt, "kq931cFacilityRejected",               "Facility rejected");
-        case kq931cRespStatusEnquiry:              return presentation(fmt, "kq931cRespStatusEnquiry",              "Response status enquiry");
-        case kq931cNormalUnspecified:              return presentation(fmt, "kq931cNormalUnspecified",              "Normal unespecified");
-        case kq931cNoCircuitChannelAvail:          return presentation(fmt, "kq931cNoCircuitChannelAvail",          "No circuit channel available");
-        case kq931cNetworkOutOfOrder:              return presentation(fmt, "kq931cNetworkOutOfOrder",              "Network out of order");
-#if 1 /* this changed during K3L 1.6.0 development cycle... */
-        case kq931cPermanentFrameConnOutOfService: return presentation(fmt, "kq931cPermanentFrameConnOutOfService", "Permanent frame connection out of service");
-        case kq931cPermanentFrameConnOperational:  return presentation(fmt, "kq931cPermanentFrameConnOperational",  "Permanent frame connection operational");
-#endif
-        case kq931cTemporaryFailure:               return presentation(fmt, "kq931cTemporaryFailure",               "Temporary failure");
-        case kq931cSwitchCongestion:               return presentation(fmt, "kq931cSwitchCongestion",               "Switch congestion");
-        case kq931cAccessInfoDiscarded:            return presentation(fmt, "kq931cAccessInfoDiscarded",            "Access information discarded");
-        case kq931cRequestedChannelUnav:           return presentation(fmt, "kq931cRequestedChannelUnav",           "Requested channel unavailable");
-        case kq931cPrecedenceCallBlocked:          return presentation(fmt, "kq931cPrecedenceCallBlocked",          "Precedence call blocked");
-        case kq931cResourceUnavailable:            return presentation(fmt, "kq931cResourceUnavailable",            "Request resource unavailable");
-        case kq931cQosUnavailable:                 return presentation(fmt, "kq931cQosUnavailable",                 "QoS unavailable");
-        case kq931cReqFacilityNotSubsc:            return presentation(fmt, "kq931cReqFacilityNotSubsc",            "Request facility not subscribed");
-        case kq931cOutCallsBarredWithinCUG:        return presentation(fmt, "kq931cOutCallsBarredWithinCUG",        "Out calls barred within UG");
-        case kq931cInCallsBarredWithinCUG:         return presentation(fmt, "kq931cInCallsBarredWithinCUG",         "In calls barred within UG");
-        case kq931cBearerCapabNotAuthor:           return presentation(fmt, "kq931cBearerCapabNotAuthor",           "Bearer capability not authorized");
-        case kq931cBearerCapabNotAvail:            return presentation(fmt, "kq931cBearerCapabNotAvail",            "Bearer capability not available");
-#if 1 /* this changed during K3L 1.6.0 development cycle... */
-        case kq931cInconsistency:                  return presentation(fmt, "kq931cInconsistency",                  "Inconsistency");
-#endif
-        case kq931cServiceNotAvailable:            return presentation(fmt, "kq931cServiceNotAvailable",            "Service not available");
-        case kq931cBcNotImplemented:               return presentation(fmt, "kq931cBcNotImplemented",               "Bearer capability not implemented");
-        case kq931cChannelTypeNotImplem:           return presentation(fmt, "kq931cChannelTypeNotImplem",           "Channel type not implemented");
-        case kq931cReqFacilityNotImplem:           return presentation(fmt, "kq931cReqFacilityNotImplem",           "Request facility not implemented");
-        case kq931cOnlyRestrictedBcAvail:          return presentation(fmt, "kq931cOnlyRestrictedBcAvail",          "Only restricted bearer capability available");
-        case kq931cServiceNotImplemented:          return presentation(fmt, "kq931cServiceNotImplemented",          "Service not implemented");
-        case kq931cInvalidCrv:                     return presentation(fmt, "kq931cInvalidCrv",                     "Invalid call reference value");
-        case kq931cChannelDoesNotExist:            return presentation(fmt, "kq931cChannelDoesNotExist",            "Channel does not exist");
-        case kq931cCallIdDoesNotExist:             return presentation(fmt, "kq931cCallIdDoesNotExist",             "Call identification does not exist");
-        case kq931cCallIdInUse:                    return presentation(fmt, "kq931cCallIdInUse",                    "Call identification in use");
-        case kq931cNoCallSuspended:                return presentation(fmt, "kq931cNoCallSuspended",                "No call suspended");
-        case kq931cCallIdCleared:                  return presentation(fmt, "kq931cCallIdCleared",                  "Call identification cleared");
-#if 1 /* this changed during K3L 1.6.0 development cycle... */
-        case kq931cUserNotMemberofCUG:             return presentation(fmt, "kq931cUserNotMemberofCUG",             "User not member of UG");
-#endif
-        case kq931cIncompatibleDestination:        return presentation(fmt, "kq931cIncompatibleDestination",        "Incompatible destination");
-        case kq931cInvalidTransitNetSel:           return presentation(fmt, "kq931cInvalidTransitNetSel",           "Invalid transit network selected");
-        case kq931cInvalidMessage:                 return presentation(fmt, "kq931cInvalidMessage",                 "Invalid message");
-        case kq931cMissingMandatoryIe:             return presentation(fmt, "kq931cMissingMandatoryIe",             "Missing mandatory information element");
-        case kq931cMsgTypeNotImplemented:          return presentation(fmt, "kq931cMsgTypeNotImplemented",          "Message type not implemented");
-        case kq931cMsgIncompatWithState:           return presentation(fmt, "kq931cMsgIncompatWithState",           "Message incompatible with state");
-        case kq931cIeNotImplemented:               return presentation(fmt, "kq931cIeNotImplemented",               "Information element not implemented");
-        case kq931cInvalidIe:                      return presentation(fmt, "kq931cInvalidIe",                      "Invalid information element");
-        case kq931cMsgIncompatWithState2:          return presentation(fmt, "kq931cMsgIncompatWithState2",          "Message incompatible with state (2)");
-        case kq931cRecoveryOnTimerExpiry:          return presentation(fmt, "kq931cRecoveryOnTimerExpiry",          "Recovery on timer expiry");
-        case kq931cProtocolError:                  return presentation(fmt, "kq931cProtocolError",                  "Protocol error");
-#if 1 /* this changed during K3L 1.6.0 development cycle... */
-        case kq931cMessageWithUnrecognizedParam:   return presentation(fmt, "kq931cMessageWithUnrecognizedParam",   "Message with unrecognized parameters");
-        case kq931cProtocolErrorUnspecified:       return presentation(fmt, "kq931cProtocolErrorUnspecified",       "Protocol error unspecified");
-#endif
-        case kq931cInterworking:                   return presentation(fmt, "kq931cInterworking",                   "Interworking");
-        case kq931cCallConnected:                  return presentation(fmt, "kq931cCallConnected",                  "Call connected");
-        case kq931cCallTimedOut:                   return presentation(fmt, "kq931cCallTimedOut",                   "Call timeout");
-        case kq931cCallNotFound:                   return presentation(fmt, "kq931cCallNotFound",                   "Call not found");
-        case kq931cCantReleaseCall:                return presentation(fmt, "kq931cCantReleaseCall",                "Cannot realese call");
-        case kq931cNetworkFailure:                 return presentation(fmt, "kq931cNetworkFailure",                 "Network failure");
-        case kq931cNetworkRestart:                 return presentation(fmt, "kq931cNetworkRestart",                 "Network restart");
-    }
-
-    throw internal_not_found();
-}
-
-std::string Verbose::isdnCause(const KQ931Cause code, const Verbose::Presentation fmt)
-{
-    try
-    {
-        return internal_isdnCause(code);
-    }
-    catch (internal_not_found e)
-    {
-        return STG(FMT("[KQ931Cause='%d']") % (int)code);
-    }
-}
-#endif
-
-#if K3L_AT_LEAST(1,5,2)
-std::string Verbose::isdnDebug(const int32 flags, const Verbose::Presentation fmt)
-{
-    if (0x00 != flags)
-    {
-        Strings::Merger strs;
-
-        if (flags & kidfQ931)   strs.add("Q931");
-        if (flags & kidfLAPD)   strs.add("LAPD");
-        if (flags & kidfSystem) strs.add("System");
-
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("kidf{%s}") % strs.merge(",")),
-            strs.merge(", "));
-    }
-
-    return presentation(fmt, "", "No debug active");
-}
-#endif
-
-#if K3L_AT_LEAST(2,0,0)
-std::string Verbose::internal_signGroupB(const KSignGroupB group, const R2CountryType country, const Verbose::Presentation fmt)
-#else
-std::string Verbose::internal_signGroupB(const KSignGroupB group, const Verbose::Presentation fmt)
-#endif
-{
-#if K3L_AT_LEAST(2,0,0)
-    switch (country)
-    {
-        case R2_COUNTRY_ARG:
-            switch ((KSignGroupB_Argentina)group)
-            {
-                case kgbArNumberChanged:       return presentation(fmt, "kgbArNumberChanged",      "Number Changed");
-                case kgbArBusy:                return presentation(fmt, "kgbArBusy",               "Busy");
-                case kgbArCongestion:          return presentation(fmt, "kgbArCongestion",         "Congestion");
-                case kgbArInvalidNumber:       return presentation(fmt, "kgbArInvalidNumber",      "Invalid Number");
-                case kgbArLineFreeCharged:     return presentation(fmt, "kgbArLineFreeCharged",    "Line Free Charged");
-                case kgbArLineFreeNotCharged:  return presentation(fmt, "kgbArLineFreeNotCharged", "Line Free Not Charged");
-                case kgbArLineOutOfOrder:      return presentation(fmt, "kgbArLineOutOfOrder",     "Line Out Of Order");
-                case kgbArNone:                return presentation(fmt, "kgbArNone",               "None");
-            }
-            break;
-
-        case R2_COUNTRY_BRA:
-            switch ((KSignGroupB_Brazil)group)
-            {
-                case kgbBrLineFreeCharged:     return presentation(fmt, "kgbBrLineFreeCharged",    "Line Free Charged");
-                case kgbBrLineFreeNotCharged:  return presentation(fmt, "kgbBrLineFreeNotCharged", "Line Free Not Charged");
-                case kgbBrLineFreeChargedLPR:  return presentation(fmt, "kgbBrLineFreeChargedLPR", "Line Free Charged PLR");
-                case kgbBrBusy:                return presentation(fmt, "kgbBrBusy",               "Busy");
-                case kgbBrNumberChanged:       return presentation(fmt, "kgbBrNumberChanged",      "Number Changed");
-                case kgbBrCongestion:          return presentation(fmt, "kgbBrCongestion",         "Congestion");
-                case kgbBrInvalidNumber:       return presentation(fmt, "kgbBrInvalidNumber",      "Invalid Number");
-                case kgbBrLineOutOfOrder:      return presentation(fmt, "kgbBrLineOutOfOrder",     "Line Out Of Order");
-                case kgbBrNone:                return presentation(fmt, "kgbBrNone",               "None");
-            }
-            break;
-
-        case R2_COUNTRY_CHI:
-            switch ((KSignGroupB_Chile)group)
-            {
-                case kgbClNumberChanged:       return presentation(fmt, "kgbClNumberChanged",      "Number Changed");
-                case kgbClBusy:                return presentation(fmt, "kgbClBusy",               "Busy");
-                case kgbClCongestion:          return presentation(fmt, "kgbClCongestion",         "Congestion");
-                case kgbClInvalidNumber:       return presentation(fmt, "kgbClInvalidNumber",      "Invalid Number");
-                case kgbClLineFreeCharged:     return presentation(fmt, "kgbClLineFreeCharged",    "Line Free Charged");
-                case kgbClLineFreeNotCharged:  return presentation(fmt, "kgbClLineFreeNotCharged", "Line Free Not Charged");
-                case kgbClLineOutOfOrder:      return presentation(fmt, "kgbClLineOutOfOrder",     "Line Out Of Order");
-                case kgbClNone:                return presentation(fmt, "kgbClNone",               "None");
-            }
-            break;
-
-        case R2_COUNTRY_MEX:
-            switch ((KSignGroupB_Mexico)group)
-            {
-                case kgbMxLineFreeCharged:     return presentation(fmt, "kgbMxLineFreeCharged",    "Line Free Charged");
-                case kgbMxBusy:                return presentation(fmt, "kgbMxBusy",               "Busy");
-                case kgbMxLineFreeNotCharged:  return presentation(fmt, "kgbMxLineFreeNotCharged", "Line Free Not Charged");
-                case kgbMxNone:                return presentation(fmt, "kgbMxNone",               "None");
-            }
-            break;
-
-        case R2_COUNTRY_URY:
-            switch ((KSignGroupB_Uruguay)group)
-            {
-                case kgbUyNumberChanged:       return presentation(fmt, "kgbUyNumberChanged",      "Number Changed");
-                case kgbUyBusy:                return presentation(fmt, "kgbUyBusy",               "Busy");
-                case kgbUyCongestion:          return presentation(fmt, "kgbUyCongestion",         "Congestion");
-                case kgbUyInvalidNumber:       return presentation(fmt, "kgbUyInvalidNumber",      "Invalid Number");
-                case kgbUyLineFreeCharged:     return presentation(fmt, "kgbUyLineFreeCharged",    "Line Free Charged");
-                case kgbUyLineFreeNotCharged:  return presentation(fmt, "kgbUyLineFreeNotCharged", "Line Free Not Charged");
-                case kgbUyLineOutOfOrder:      return presentation(fmt, "kgbUyLineOutOfOrder",     "Line Out Of Order");
-                case kgbUyNone:                return presentation(fmt, "kgbUyNone",               "None");
-            }
-            break;
-
-        case R2_COUNTRY_VEN:
-            switch ((KSignGroupB_Venezuela)group)
-            {
-                case kgbVeLineFreeChargedLPR:  return presentation(fmt, "kgbVeLineFreeChargedLPR", "Line Free Charged PLR");
-                case kgbVeNumberChanged:       return presentation(fmt, "kgbVeNumberChanged",      "Number Changed");
-                case kgbVeBusy:                return presentation(fmt, "kgbVeBusy",               "Busy");
-                case kgbVeCongestion:          return presentation(fmt, "kgbVeCongestion",         "Congestion");
-                case kgbVeInformationTone:     return presentation(fmt, "kgbVeInformationTone",    "Information Tone");
-                case kgbVeLineFreeCharged:     return presentation(fmt, "kgbVeLineFreeCharged",    "Line Free Charged");
-                case kgbVeLineFreeNotCharged:  return presentation(fmt, "kgbVeLineFreeNotCharged", "Line Free Not Charged");
-                case kgbVeLineBlocked:         return presentation(fmt, "kgbVeLineBlocked",        "Line Blocked");
-                case kgbVeIntercepted:         return presentation(fmt, "kgbVeIntercepted",        "Intercepted");
-                case kgbVeDataTrans:           return presentation(fmt, "kgbVeDataTrans",          "Data Transfer");
-                case kgbVeNone:                return presentation(fmt, "kgbVeNone",               "None");
-            }
-            break;
-    }
-#else
-    switch ((KSignGroupB)group)
-    {
-        case kgbLineFreeCharged:     return presentation(fmt, "kgbLineFreeCharged",    "Line Free Charged");
-        case kgbLineFreeNotCharged:  return presentation(fmt, "kgbLineFreeNotCharged", "Line Free Not Charged");
-        case kgbLineFreeChargedLPR:  return presentation(fmt, "kgbLineFreeChargedLPR", "Line Free Charged PLR");
-        case kgbBusy:                return presentation(fmt, "kgbBusy",               "Busy");
-        case kgbNumberChanged:       return presentation(fmt, "kgbNumberChanged",      "Number Changed");
-        case kgbCongestion:          return presentation(fmt, "kgbCongestion",         "Congestion");
-        case kgbInvalidNumber:       return presentation(fmt, "kgbInvalidNumber",      "Invalid Number");
-        case kgbLineOutOfOrder:      return presentation(fmt, "kgbLineOutOfOrder",     "Line Out Of Order");
-        case kgbNone:                return presentation(fmt, "kgbNone",               "None");
-    }
-#endif
-
-    throw internal_not_found();
-}
-
-#if K3L_AT_LEAST(2,0,0)
-std::string Verbose::signGroupB(const KSignGroupB group, const R2CountryType r2_country, const Verbose::Presentation fmt)
-#else
-std::string Verbose::signGroupB(const KSignGroupB group, const Verbose::Presentation fmt)
-#endif
-{
-    try
-    {
-#if K3L_AT_LEAST(2,0,0)
-        return internal_signGroupB(group, r2_country, fmt);
-#else
-        return internal_signGroupB(group, fmt);
-#endif
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[KSignGroupB='%d']") % (int)group),
-            STG(FMT("Unknown group B (%d)") % (int)group));
-    }
-}
-
-#if K3L_AT_LEAST(2,0,0)
-std::string Verbose::internal_signGroupII(const KSignGroupII group, const R2CountryType country, const Verbose::Presentation fmt)
-#else
-std::string Verbose::internal_signGroupII(const KSignGroupII group, const Verbose::Presentation fmt)
-#endif
-{
-#if K3L_AT_LEAST(2,0,0)
-    switch (country)
-    {
-        case R2_COUNTRY_ARG:
-            switch ((KSignGroupII_Argentina)group)
-            {
-                case kg2ArOrdinary:             return presentation(fmt, "kg2ArOrdinary",            "Ordinary");
-                case kg2ArPriority:             return presentation(fmt, "kg2ArPriority",            "Priority");
-                case kg2ArMaintenance:          return presentation(fmt, "kg2ArMaintenance",         "Maintenance");
-                case kg2ArLocalPayPhone:        return presentation(fmt, "kg2ArLocalPayPhone",       "Local pay phone");
-                case kg2ArTrunkOperator:        return presentation(fmt, "kg2ArTrunkOperator",       "Trunk operator");
-                case kg2ArDataTrans:            return presentation(fmt, "kg2ArDataTrans",           "Data transfer");
-                case kg2ArCPTP:                 return presentation(fmt, "kg2ArCPTP",                "CPTP");
-                case kg2ArSpecialLine:          return presentation(fmt, "kg2ArSpecialLine",         "Special line");
-                case kg2ArMobileUser:           return presentation(fmt, "kg2ArMobileUser",          "Mobile user");
-                case kg2ArPrivateRedLine:       return presentation(fmt, "kg2ArPrivateRedLine",      "Private red line");
-                case kg2ArSpecialPayPhoneLine:  return presentation(fmt, "kg2ArSpecialPayPhoneLine", "Special pay phone line");
-            }
-            break;
-
-        case R2_COUNTRY_BRA:
-            switch ((KSignGroupII_Brazil)group)
-            {
-                case kg2BrOrdinary:         return presentation(fmt, "kg2BrOrdinary",            "Ordinary");
-                case kg2BrPriority:         return presentation(fmt, "kg2BrPriority",            "Priority");
-                case kg2BrMaintenance:      return presentation(fmt, "kg2BrMaintenance",         "Maintenance");
-                case kg2BrLocalPayPhone:    return presentation(fmt, "kg2BrLocalPayPhone",       "Local pay phone");
-                case kg2BrTrunkOperator:    return presentation(fmt, "kg2BrTrunkOperator",       "Trunk operator");
-                case kg2BrDataTrans:        return presentation(fmt, "kg2BrDataTrans",           "Data transfer");
-                case kg2BrNonLocalPayPhone: return presentation(fmt, "kg2BrNonLocalPayPhone",    "Non local pay phone");
-                case kg2BrCollectCall:      return presentation(fmt, "kg2BrCollectCall",         "Collect call");
-                case kg2BrOrdinaryInter:    return presentation(fmt, "kg2BrOrdinaryInter",       "Ordinary international");
-                case kg2BrTransfered:       return presentation(fmt, "kg2BrTransfered",          "Transfered");
-            }
-            break;
-
-        case R2_COUNTRY_CHI:
-            switch ((KSignGroupII_Chile)group)
-            {
-                case kg2ClOrdinary:               return presentation(fmt, "kg2ClOrdinary",               "Ordinary");
-                case kg2ClPriority:               return presentation(fmt, "kg2ClPriority",               "Priority");
-                case kg2ClMaintenance:            return presentation(fmt, "kg2ClMaintenance",            "Maintenance");
-                case kg2ClTrunkOperator:          return presentation(fmt, "kg2ClTrunkOperator",          "Trunk operator");
-                case kg2ClDataTrans:              return presentation(fmt, "kg2ClDataTrans",              "Data transfer");
-                case kg2ClUnidentifiedSubscriber: return presentation(fmt, "kg2ClUnidentifiedSubscriber", "Unidentified subscriber");
-            }
-            break;
-
-        case R2_COUNTRY_MEX:
-            switch ((KSignGroupII_Mexico)group)
-            {
-                case kg2MxTrunkOperator:    return presentation(fmt, "kg2MxTrunkOperator",       "Trunk operator");
-                case kg2MxOrdinary:         return presentation(fmt, "kg2MxOrdinary",            "Ordinary");
-                case kg2MxMaintenance:      return presentation(fmt, "kg2MxMaintenance",         "Maintenance");
-            }
-            break;
-
-        case R2_COUNTRY_URY:
-            switch ((KSignGroupII_Uruguay)group)
-            {
-                case kg2UyOrdinary:         return presentation(fmt, "kg2UyOrdinary",            "Ordinary");
-                case kg2UyPriority:         return presentation(fmt, "kg2UyPriority",            "Priority");
-                case kg2UyMaintenance:      return presentation(fmt, "kg2UyMaintenance",         "Maintenance");
-                case kg2UyLocalPayPhone:    return presentation(fmt, "kg2UyLocalPayPhone",       "Local pay phone");
-                case kg2UyTrunkOperator:    return presentation(fmt, "kg2UyTrunkOperator",       "Trunk operator");
-                case kg2UyDataTrans:        return presentation(fmt, "kg2UyDataTrans",           "Data transfer");
-                case kg2UyInternSubscriber: return presentation(fmt, "kg2UyInternSubscriber",    "International subscriber");
-            }
-            break;
-
-        case R2_COUNTRY_VEN:
-            switch ((KSignGroupII_Venezuela)group)
-            {
-                case kg2VeOrdinary:           return presentation(fmt, "kg2VeOrdinary",            "Ordinary");
-                case kg2VePriority:           return presentation(fmt, "kg2VePriority",            "Priority");
-                case kg2VeMaintenance:        return presentation(fmt, "kg2VeMaintenance",         "Maintenance");
-                case kg2VeLocalPayPhone:      return presentation(fmt, "kg2VeLocalPayPhone",       "Local pay phone");
-                case kg2VeTrunkOperator:      return presentation(fmt, "kg2VeTrunkOperator",       "Trunk operator");
-                case kg2VeDataTrans:          return presentation(fmt, "kg2VeDataTrans",           "Data transfer");
-                case kg2VeNoTransferFacility: return presentation(fmt, "kg2VeNoTransferFacility",  "No transfer facility");
-            }
-            break;
-    }
-#else
-    switch ((KSignGroupII)group)
-    {
-        case kg2Ordinary:         return presentation(fmt, "kg2Ordinary",            "Ordinary");
-        case kg2Priority:         return presentation(fmt, "kg2Priority",            "Priority");
-        case kg2Maintenance:      return presentation(fmt, "kg2Maintenance",         "Maintenance");
-        case kg2LocalPayPhone:    return presentation(fmt, "kg2LocalPayPhone",       "Local pay phone");
-        case kg2TrunkOperator:    return presentation(fmt, "kg2TrunkOperator",       "Trunk operator");
-        case kg2DataTrans:        return presentation(fmt, "kg2DataTrans",           "Data transfer");
-        case kg2NonLocalPayPhone: return presentation(fmt, "kg2NonLocalPayPhone",    "Non local pay phone");
-        case kg2CollectCall:      return presentation(fmt, "kg2CollectCall",         "Collect call");
-        case kg2OrdinaryInter:    return presentation(fmt, "kg2OrdinaryInter",       "Ordinary international");
-        case kg2Transfered:       return presentation(fmt, "kg2Transfered",          "Transfered");
-    }
-#endif
-
-    throw internal_not_found();
-}
-
-#if K3L_AT_LEAST(2,0,0)
-std::string Verbose::signGroupII(const KSignGroupII group, const R2CountryType r2_country, const Verbose::Presentation fmt)
-#else
-std::string Verbose::signGroupII(const KSignGroupII group, const Verbose::Presentation fmt)
-#endif
-{
-    try
-    {
-#if K3L_AT_LEAST(2,0,0)
-        return internal_signGroupII(group, r2_country);
-#else
-        return internal_signGroupII(group);
-#endif
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[KSignGroupII='%d']") % (int)group),
-            STG(FMT("Unknown group II (%d)") % (int)group));
-    }
-}
-
-#if K3L_AT_LEAST(2,0,0)
-std::string Verbose::callFail(const KSignaling sig, const R2CountryType country, const int32 info, const Verbose::Presentation fmt)
-#else
-std::string Verbose::callFail(const KSignaling sig, const int32 info, const Verbose::Presentation fmt)
-#endif
-{
-    try
-    {
-        switch (sig)
-        {
-            case ksigInactive:
-                throw internal_not_found();
-
-            case ksigAnalog:
-                if (('a' <= ((char)info) && 'z' >= ((char)info)) || ('A' <= ((char)info) && 'Z' >= ((char)info)))
-                    return STG(FMT("%c") % (char)info);
-                else
-                    throw internal_not_found();
-
-#if K3L_AT_LEAST(1,5,4)
-            case ksigLineSide:
-#endif
-#if K3L_EXACT(2,1,0)
-            case ksigISUP:
-#if !K3L_AT_LEAST(2,2,0)
-            case ksigFax:
-#endif
-#endif
-#if K3L_AT_LEAST(1,6,0)
-            case ksigCAS_EL7:
-            case ksigE1LC:
-                return "NOT IMPLEMENTED";
-
-            case ksigAnalogTerminal:
-#endif
-            case ksigContinuousEM:
-            case ksigPulsedEM:
-
-            case ksigR2Digital:
-            case ksigOpenR2:
-#if K3L_AT_LEAST(2,0,0)
-                return internal_signGroupB((KSignGroupB)info, country);
-#else
-                return internal_signGroupB((KSignGroupB)info);
-#endif
-
-            case ksigOpenCAS:
-            case ksigUserR2Digital:
-#if K3L_AT_LEAST(2,0,0)
-                return internal_signGroupB((KSignGroupB)info, R2_COUNTRY_BRA);
-#else
-                return internal_signGroupB((KSignGroupB)info);
-#endif
-
-#if K3L_AT_LEAST(1,5,0)
-            case ksigSIP:
-                return internal_sipFailures((KSIP_Failures)info);
-#endif
-
-#if K3L_AT_LEAST(1,5,1)
-            case ksigOpenCCS:
-            case ksigPRI_EndPoint:
-            case ksigPRI_Network:
-            case ksigPRI_Passive:
-#if K3L_AT_LEAST(2,2,0)
-            case ksigISUP:
-            case ksigISUPPassive:
-#endif
-                return internal_isdnCause((KQ931Cause)info);
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-            case ksigGSM:
-                return internal_gsmCallCause((KGsmCallCause)info);
-#endif
-        }
-    }
-    catch (internal_not_found e)
-    {
-        /* this exception is used for breaking the control flow */
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[%s, callFail='%d']") % signaling(sig, fmt) % (int)info),
-        STG(FMT("Unknown call fail code for '%s' (%d)") % signaling(sig, fmt) % (int)info));
-}
-
-std::string Verbose::channelFail(const KSignaling sig, const int32 code, const Verbose::Presentation fmt)
-{
-    try
-    {
-        switch (sig)
-        {
-            case ksigInactive:
-            case ksigAnalog:
-            case ksigSIP:
-#if K3L_EXACT(2,1,0)
-            case ksigISUP:
-#if !K3L_AT_LEAST(2,2,0)
-            case ksigFax:
-#endif
-#endif
-                throw internal_not_found();
-
-#if K3L_AT_LEAST(1,6,0)
-            case ksigGSM:
-                return internal_gsmMobileCause((KGsmMobileCause)code);
-
-            case ksigAnalogTerminal:
-            case ksigCAS_EL7:
-            case ksigE1LC:
-#endif
-
-            case ksigContinuousEM:
-            case ksigPulsedEM:
-
-            case ksigLineSide:
-
-            case ksigOpenCAS:
-            case ksigOpenR2:
-            case ksigR2Digital:
-            case ksigUserR2Digital:
-                switch ((KChannelFail)code)
-                {
-                    case kfcRemoteFail:         return presentation(fmt, "kfcRemoteFail",         "Remote failure");
-                    case kfcLocalFail:          return presentation(fmt, "kfcLocalFail",          "Local failure");
-                    case kfcRemoteLock:         return presentation(fmt, "kfcRemoteLock",         "Remote lock");
-                    case kfcLineSignalFail:     return presentation(fmt, "kfcLineSignalFail",     "Line signal failure");
-                    case kfcAcousticSignalFail: return presentation(fmt, "kfcAcousticSignalFail", "Acoustic signal failure");
-                }
-
-                throw internal_not_found();
-
-#if K3L_AT_LEAST(1,5,1)
-            case ksigOpenCCS:
-            case ksigPRI_EndPoint:
-            case ksigPRI_Network:
-            case ksigPRI_Passive:
-#if K3L_AT_LEAST(2,2,0)
-            case ksigISUP:
-            case ksigISUPPassive:
-#endif
-                return internal_isdnCause((KQ931Cause)code);
-#endif
-        }
-    }
-    catch (internal_not_found e)
-    {
-        /* this exception is used for breaking the control flow */
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[%s, channelFail='%d']") % signaling(sig, fmt) % (int)code),
-        STG(FMT("Unknown channel fail code for '%s' (%d)") % signaling(sig, fmt) % (int)code));
-}
-
-std::string Verbose::internalFail(const KInternalFail inf, const Verbose::Presentation fmt)
-{
-    switch (inf)
-    {
-        case kifInterruptCtrl:     return presentation(fmt, "kifInterruptCtrl",     "Interrupt control");
-        case kifCommunicationFail: return presentation(fmt, "kifCommunicationFail", "Communication failure");
-        case kifProtocolFail:      return presentation(fmt, "kifProtocolFail",      "Protocol failure");
-        case kifInternalBuffer:    return presentation(fmt, "kifInternalBuffer",    "Internal buffer");
-        case kifMonitorBuffer:     return presentation(fmt, "kifMonitorBuffer",     "Monitor buffer");
-        case kifInitialization:    return presentation(fmt, "kifInitialization",    "Initialization");
-        case kifInterfaceFail:     return presentation(fmt, "kifInterfaceFail",     "Interface failure");
-        case kifClientCommFail:    return presentation(fmt, "kifClientCommFail",    "Client communication failure");
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KInternalFail='%d']") % (int)inf),
-        STG(FMT("Unknown internal failure (%d)") % (int)inf));
-}
-
-std::string Verbose::linkErrorCounter(const KLinkErrorCounter ec, const Verbose::Presentation fmt)
-{
-    switch (ec)
-    {
-        case klecChangesToLock:     return presentation(fmt, "klecChangesToLock",     "Changes to lock");
-        case klecLostOfSignal:      return presentation(fmt, "klecLostOfSignal",      "Lost of signal");
-        case klecAlarmNotification: return presentation(fmt, "klecAlarmNotification", "Alarm notification");
-        case klecLostOfFrame:       return presentation(fmt, "klecLostOfFrame",       "Lost of frame");
-        case klecLostOfMultiframe:  return presentation(fmt, "klecLostOfMultiframe",  "Lost of multiframe");
-        case klecRemoteAlarm:       return presentation(fmt, "klecRemoteAlarm",       "Remote alarm");
-        case klecUnknowAlarm:       return presentation(fmt, "klecUnknowAlarm",       "Slip alarm");
-        case klecPRBS:              return presentation(fmt, "klecPRBS",              "PRBS");
-        case klecWrogrBits:         return presentation(fmt, "klecWrongBits",         "Wrong bits");
-        case klecJitterVariation:   return presentation(fmt, "klecJitterVariation",   "Jitter variation");
-        case klecFramesWithoutSync: return presentation(fmt, "klecFramesWithoutSync", "Frames without sync");
-        case klecMultiframeSignal:  return presentation(fmt, "klecMultiframeSignal",  "Multiframe Signal");
-        case klecFrameError:        return presentation(fmt, "klecFrameError",        "Frame error");
-        case klecBipolarViolation:  return presentation(fmt, "klecBipolarViolation",  "Bipolar violation");
-        case klecCRC4:              return presentation(fmt, "klecCRC4",              "CRC4 error");
-        case klecCount:             return ""; /* this should never be verbosed */
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KLinkErrorCounter='%d']") % (int)ec),
-        STG(FMT("Unknown link error counter (%d)") % (int)ec));
-}
-
-std::string Verbose::callStatus(const KCallStatus code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case kcsFree:       return presentation(fmt, "kcsFree",     "Free");
-        case kcsIncoming:   return presentation(fmt, "kcsIncoming", "Incoming");
-        case kcsOutgoing:   return presentation(fmt, "kcsOutgoing", "Outgoing");
-        case kcsFail:       return presentation(fmt, "kcsFail",     "Failure");
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KCallStatus='%d']") % (int)code),
-        STG(FMT("Unknown call status (%d)") % (int)code));
-}
-
-std::string Verbose::linkStatus(const KSignaling sig, const int32 code, const Verbose::Presentation fmt, const bool simpleStatus)
-{
-    switch (sig)
-    {
-        case ksigInactive:
-            return presentation(fmt, "[ksigInactive]", "Inactive trunk");
-
-        case ksigAnalog:
-            return presentation(fmt, "[ksigAnalog]", "Analog trunk");
-
-#if K3L_AT_LEAST(1,4,1)
-        case ksigSIP:
-            return presentation(fmt, "[ksigSIP]", "SIP trunk");
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case ksigGSM:
-            return presentation(fmt, "[ksigGSM]", "GSM trunk");
-#endif
-
-#if K3L_EXACT(2,1,0)
-#if !K3L_AT_LEAST(2,2,0)
-            case ksigFax:
-#endif
-            return presentation(fmt, "[ksigFax]", "FAX");
-#endif
-        case ksigContinuousEM:
-        case ksigPulsedEM:
-
-        case ksigOpenCAS:
-        case ksigOpenR2:
-        case ksigR2Digital:
-        case ksigUserR2Digital:
-
-#if K3L_AT_LEAST(1,5,1)
-        case ksigOpenCCS:
-        case ksigPRI_EndPoint:
-        case ksigPRI_Network:
-        case ksigPRI_Passive:
-#endif
-#if K3L_AT_LEAST(1,5,3)
-        case ksigLineSide:
-#endif
-#if K3L_AT_LEAST(1,6,0)
-        case ksigAnalogTerminal:
-        case ksigCAS_EL7:
-        case ksigE1LC:
-#endif
-#if K3L_AT_LEAST(2,2,0)
-        case ksigISUP:
-        case ksigISUPPassive:
-#endif
-            if (kesOk == code)
-            {
-                return presentation(fmt, "kesOk", "Up");
-            }
-            else
-            {
-                Strings::Merger strs;
-
-                if (kesSignalLost & code)         strs.add(presentation(fmt, "SignalLost",         "Signal lost"));
-                if (kesNetworkAlarm & code)       strs.add(presentation(fmt, "NetworkAlarm",       "Network alarm"));
-                if (kesFrameSyncLost & code)      strs.add(presentation(fmt, "FrameSyncLost",      "Frame sync lost"));
-                if (kesMultiframeSyncLost & code) strs.add(presentation(fmt, "MultiframeSyncLost", "Multiframe sync lost"));
-                if (kesRemoteAlarm & code)        strs.add(presentation(fmt, "RemoteAlarm",        "Remote alarm"));
-                if (kesHighErrorRate & code)      strs.add(presentation(fmt, "HighErrorRate",      "High error rate"));
-                if (kesUnknownAlarm & code)       strs.add(presentation(fmt, "UnknownAlarm",       "Slip alarm"));
-                if (kesE1Error & code)            strs.add(presentation(fmt, "E1Error",            "E1 error"));
-
-                if (simpleStatus)
-                {
-                    PRESENTATION_CHECK_RETURN(fmt,
-                        STG(FMT("kes{%s}") % *(strs.list().begin())),
-                            *(strs.list().begin()));
-                }
-                else
-                {
-                    PRESENTATION_CHECK_RETURN(fmt,
-                        STG(FMT("kes{%s}") % strs.merge(",")),
-                            strs.merge(", "));
-                }
-            }
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[%s, linkStatus='%d']") % signaling(sig) % (int)code),
-        STG(FMT("Unknown link status for '%s' (%d)") % signaling(sig) % (int)code));
-}
-
-std::string Verbose::channelStatus(const KSignaling sig, const int32 flags, const Verbose::Presentation fmt)
-{
-    try
-    {
-        switch (sig)
-        {
-            case ksigInactive:
-                return presentation(fmt, "[ksigInactive]", "Inactive channel");
-
-#if K3L_AT_LEAST(1,4,1)
-            case ksigSIP:
-                return presentation(fmt, "[ksigSIP]", "SIP channel");
-#endif
-#if K3L_EXACT(2,1,0)
-            case ksigISUP:
-                return presentation(fmt, "[ksigISUP]", "ISUP trunk");
-#if !K3L_AT_LEAST(2,2,0)
-            case ksigFax:
-                return presentation(fmt, "[ksigFax]", "FAX");
-#endif
-#endif
-
-            case ksigAnalog:
-#if K3L_AT_LEAST(1,6,0)
-                switch ((KFXOChannelStatus)flags)
-#else
-                switch ((KFXChannelStatus)flags)
-#endif
-                {
-                    case kfcsDisabled:   return presentation(fmt, "kfcsDisabled", "Disabled");
-                    case kfcsEnabled:    return presentation(fmt, "kfcsEnabled",  "Enabled");
-                }
-
-                throw internal_not_found();
-
-#if K3L_AT_LEAST(1,6,0)
-            case ksigAnalogTerminal:
-                switch ((KFXSChannelStatus)flags)
-                {
-                    case kfxsOnHook:   return presentation(fmt, "kfxsOnHook",  "On Hook");
-                    case kfxsOffHook:  return presentation(fmt, "kfxsOffHook", "Off Hook");
-                    case kfxsRinging:  return presentation(fmt, "kfxsRinging", "Ringing");
-                    case kfxsFail:     return presentation(fmt, "kfxsFail",    "Failure");
-                }
-
-                throw internal_not_found();
-
-            case ksigGSM:
-                switch ((KGsmChannelStatus)flags)
-                {
-                    case kgsmIdle:            return presentation(fmt, "kgsmIdle",           "Idle");
-                    case kgsmCallInProgress:  return presentation(fmt, "kgsmCallInProgress", "Call in progress");
-                    case kgsmSMSInProgress:   return presentation(fmt, "kgsmSMSInProgress",  "SMS in progress");
-                    case kgsmModemError:      return presentation(fmt, "kgsmModemError",     "Modem error");
-                    case kgsmSIMCardError:    return presentation(fmt, "kgsmSIMCardError",   "SIM card error");
-                    case kgsmNetworkError:    return presentation(fmt, "kgsmNetworkError",   "Network error");
-                    case kgsmNotReady:        return presentation(fmt, "kgsmNotReady",       "Initializing");
-                }
-
-                throw internal_not_found();
-#endif
-
-            /* deprecated, but still.. */
-            case ksigPulsedEM:
-            case ksigContinuousEM:
-
-            case ksigOpenCAS:
-            case ksigOpenR2:
-            case ksigR2Digital:
-            case ksigUserR2Digital:
-
-#if K3L_AT_LEAST(1,5,1)
-            case ksigOpenCCS:
-            case ksigPRI_EndPoint:
-            case ksigPRI_Network:
-            case ksigPRI_Passive:
-#endif
-#if K3L_AT_LEAST(1,5,3)
-            case ksigLineSide:
-#endif
-#if K3L_AT_LEAST(1,6,0)
-            case ksigCAS_EL7:
-            case ksigE1LC:
-#endif
-#if K3L_AT_LEAST(2,2,0)
-            case ksigISUP:
-            case ksigISUPPassive:
-#endif
-            {
-                if (flags == kecsFree)
-                {
-                    return presentation(fmt, "kecsFree", "Free");
-                }
-                else
-                {
-                    Strings::Merger strs;
-
-                    if (flags & kecsBusy)
-                        strs.add("Busy");
-
-                    switch (flags & 0x06)
-                    {
-                        case kecsOutgoing:
-                            strs.add("Outgoing");
-                             break;
-                        case kecsIncoming:
-                            strs.add("Incoming");
-                            break;
-                        case kecsLocked:
-                            strs.add("Locked");
-                        default:
-                            break;
-                    }
-
-                    int32 value = (flags & 0xf0);
-
-                    if (kecsOutgoingLock & value)
-                        strs.add(presentation(fmt, "OutgoingLock", "Outgoing Lock"));
-
-                    if (kecsLocalFail & value)
-                        strs.add(presentation(fmt, "LocalFail", "Local Failure"));
-
-                    if (kecsIncomingLock & value)
-                        strs.add(presentation(fmt, "IncomingLock", "Incoming Lock"));
-
-                    if (kecsRemoteLock & value)
-                        strs.add(presentation(fmt, "RemoteLock", "Remote Lock"));
-
-                    PRESENTATION_CHECK_RETURN(fmt,
-                        STG(FMT("kecs{%s}") % strs.merge(",")),
-                        strs.merge(", "));
-                }
-
-                throw internal_not_found();
-            }
-        }
-    }
-    catch (internal_not_found e)
-    {
-        /* we use this exception to break the control flow */
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[%s, channelStatus='%d']") % signaling(sig) % flags),
-        STG(FMT("Unknown channel status for '%s' (%d)") % signaling(sig) % flags));
-}
-
-std::string Verbose::status(const KLibraryStatus code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case ksSuccess:        return presentation(fmt, "ksSuccess",        "Success");
-        case ksFail:           return presentation(fmt, "ksFail",           "Failure");
-        case ksTimeOut:        return presentation(fmt, "ksTimeOut",        "Time Out");
-        case ksBusy:           return presentation(fmt, "ksBusy",           "Busy");
-        case ksLocked:         return presentation(fmt, "ksLocked",         "Locked");
-        case ksInvalidParams:  return presentation(fmt, "ksInvalidParams",  "Invalid Parameters");
-        case ksEndOfFile:      return presentation(fmt, "ksEndOfFile",      "End of File");
-        case ksInvalidState:   return presentation(fmt, "ksInvalidState",   "Invalid State");
-        case ksServerCommFail: return presentation(fmt, "ksServerCommFail", "Communication Failure");
-        case ksOverflow:       return presentation(fmt, "ksOverflow",       "Overflow");
-        case ksUnderrun:       return presentation(fmt, "ksUnderrun",       "Underrun");
-
-#if K3L_AT_LEAST(1,4,0)
-        case ksNotFound:       return presentation(fmt, "ksNotFound",       "Not Found");
-        case ksNotAvailable:   return presentation(fmt, "ksNotAvaiable",    "Not Available");
-#endif
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KLibraryStatus='%d']") % (int)code),
-        STG(FMT("Unknown library status (%d)") % (int)code));
-}
-
-std::string Verbose::h100configIndex(const KH100ConfigIndex code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case khciDeviceMode:         return presentation(fmt, "khciDeviceMode",      "Device Mode");
-        case khciMasterGenClock:     return presentation(fmt, "khciMasterGenClock",  "Master Generated Clock");
-        case khciCTNetRefEnable:     return presentation(fmt, "khciCTNetRefEnable",  "CTBus Network Reference Enable");
-        case khciSCbusEnable:        return presentation(fmt, "khciSCbusEnable",     "SCBus Enable");
-        case khciHMVipEnable:        return presentation(fmt, "khciHMVipEnable",     "HMVip Enable");
-        case khciMVip90Enable:       return presentation(fmt, "khciMVip90Enable",    "MVip90 Enable");
-        case khciCTbusDataEnable:    return presentation(fmt, "khciCTbusDataEnable", "CTBus Data Enable");
-        case khciCTbusFreq03_00:     return presentation(fmt, "khciCTbusFreq03_00",  "CTBus Frequency 03 00"); // TODO: find better name
-        case khciCTbusFreq07_04:     return presentation(fmt, "khciCTbusFreq07_04",  "CTBus Frequency 07 04"); // TODO: find better name
-        case khciCTbusFreq11_08:     return presentation(fmt, "khciCTbusFreq11_08",  "CTBus Frequency 11 08"); // TODO: find better name
-        case khciCTbusFreq15_12:     return presentation(fmt, "khciCTbusFreq15_12",  "CTBus Frequency 15 12"); // TODO: find better name
-        case khciMax:                return presentation(fmt, "khciMax",             "Max");                   // TODO: find better name
-        case khciMasterDevId:        return presentation(fmt, "khciMasterDevId",     "Master Device Number");
-        case khciSecMasterDevId:     return presentation(fmt, "khciSecMasterDevId",  "Secondary Master Device Number");
-        case khciCtNetrefDevId:      return presentation(fmt, "khciCtNetrefDevId",   "CTBus Network Reference Device Number");
-#if K3L_AT_LEAST(1,6,0)
-        case khciMaxH100ConfigIndex: return ""; /* do not verbose this value */
-#endif
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KH100ConfigIndex='%d']") % (int)code),
-        STG(FMT("Unknown H.100 config index (%d)") % (int)code));
-}
-
-#if K3L_AT_LEAST(1,6,0)
-std::string Verbose::callStartInfo(const KCallStartInfo code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case kcsiHumanAnswer:         return presentation(fmt, "kcsiHumanAnswer",         "Human Answer");
-        case kcsiAnsweringMachine:    return presentation(fmt, "kcsiAnsweringMachine",    "Answering Machine");
-        case kcsiCellPhoneMessageBox: return presentation(fmt, "kcsiCellPhoneMessageBox", "Cell Phone Message Box");
-        case kcsiCarrierMessage:      return presentation(fmt, "kcsiCarrierMessage",      "Carrier Message");
-        case kcsiUnknown:             return presentation(fmt, "kcsiUnknown",             "Unknown");
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KCallStartInfo='%d']") % (int)code),
-        STG(FMT("Unknown call answer info (%d)") % (int)code));
-}
-
-std::string Verbose::gsmCallCause(const KGsmCallCause code, const Verbose::Presentation fmt)
-{
-    try
-    {
-        return internal_gsmCallCause(code, fmt);
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[KGsmCallCause='%d']") % (int)code),
-            STG(FMT("Unknown GSM call cause (%d)") % (int)code));
-    }
-}
-
-std::string Verbose::internal_gsmCallCause(const KGsmCallCause code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case kgccNone:                               return presentation(fmt, "kgccNone",                      "None");
-        case kgccUnallocatedNumber:                  return presentation(fmt, "kgccUnallocatedNumber",         "Unallocated number");
-        case kgccNoRouteToDest:                      return presentation(fmt, "kgccNoRouteToDest",             "No route to destination");
-        case kgccChannelUnacceptable:                return presentation(fmt, "kgccChannelUnacceptable",       "Channel unacceptable");
-        case kgccOperatorDeterminedBarring:          return presentation(fmt, "kgccOperatorDeterminedBarring", "Operator determined barring");
-        case kgccNormalCallClear:                    return presentation(fmt, "kgccNormalCallClear",           "Normal call clear");
-        case kgccUserBusy:                           return presentation(fmt, "kgccUserBusy",                  "User busy");
-        case kgccNoUserResponding:                   return presentation(fmt, "kgccNoUserResponding",          "No user responding");
-        case kgccNoAnswerFromUser:                   return presentation(fmt, "kgccNoAnswerFromUser",          "No answer from user");
-        case kgccCallRejected:                       return presentation(fmt, "kgccCallRejected",              "Call rejected");
-        case kgccNumberChanged:                      return presentation(fmt, "kgccNumberChanged",             "Number changed");
-        case kgccNonSelectedUserClear:               return presentation(fmt, "kgccNonSelectedUserClear",      "Non Selected user clear");
-        case kgccDestinationOutOfOrder:              return presentation(fmt, "kgccDestinationOutOfOrder",     "Destination out of order");
-        case kgccInvalidNumberFormat:                return presentation(fmt, "kgccInvalidNumberFormat",       "Invalid number format");
-        case kgccFacilityRejected:                   return presentation(fmt, "kgccFacilityRejected",          "Facility rejected");
-        case kgccRespStatusEnquiry:                  return presentation(fmt, "kgccRespStatusEnquiry",         "Response status enquiry");
-        case kgccNormalUnspecified:                  return presentation(fmt, "kgccNormalUnspecified",         "Normal, unspecified");
-        case kgccNoCircuitChannelAvail:              return presentation(fmt, "kgccNoCircuitChannelAvail",     "No circuit channel available");
-        case kgccNetworkOutOfOrder:                  return presentation(fmt, "kgccNetworkOutOfOrder",         "Network out of order");
-        case kgccTemporaryFailure:                   return presentation(fmt, "kgccTemporaryFailure",          "Temporary failure");
-        case kgccSwitchCongestion:                   return presentation(fmt, "kgccSwitchCongestion",          "Switch congestion");
-        case kgccAccessInfoDiscarded:                return presentation(fmt, "kgccAccessInfoDiscarded",       "Access information discarded");
-        case kgccRequestedChannelUnav:               return presentation(fmt, "kgccRequestedChannelUnav",      "Requested channel unavailable");
-        case kgccResourceUnavailable:                return presentation(fmt, "kgccResourceUnavailable",       "Resource unavailable");
-        case kgccQosUnavailable:                     return presentation(fmt, "kgccQosUnavailable",            "QoS unavailable");
-        case kgccReqFacilityNotSubsc:                return presentation(fmt, "kgccReqFacilityNotSubsc",       "Request facility not subscribed");
-        case kgccCallBarredWitchCUG:                 return presentation(fmt, "kgccCallBarredWitchCUG",        "Call barred with UG");
-        case kgccBearerCapabNotAuthor:               return presentation(fmt, "kgccBearerCapabNotAuthor",      "Bearer capability not authorized");
-        case kgccBearerCapabNotAvail:                return presentation(fmt, "kgccBearerCapabNotAvail",       "Bearer capability not available");
-        case kgccServiceNotAvailable:                return presentation(fmt, "kgccServiceNotAvailable",       "Service not available");
-        case kgccBcNotImplemented:                   return presentation(fmt, "kgccBcNotImplemented",          "Bearer capability not implemented");
-        case kgccReqFacilityNotImplem:               return presentation(fmt, "kgccReqFacilityNotImplem",      "Request facility not implemented");
-        case kgccOnlyRestrictedBcAvail:              return presentation(fmt, "kgccOnlyRestrictedBcAvail",     "Only restricted bearer capability available");
-        case kgccServiceNotImplemented:              return presentation(fmt, "kgccServiceNotImplemented",     "Service not implemented");
-        case kgccInvalidCrv:                         return presentation(fmt, "kgccInvalidCrv",                "Invalid call reference value");
-        case kgccUserNotMemberOfCUG:                 return presentation(fmt, "kgccUserNotMemberOfCUG",        "User not member of UG");
-        case kgccIncompatibleDestination:            return presentation(fmt, "kgccIncompatibleDestination",   "Incompatible destination");
-        case kgccInvalidTransitNetSel:               return presentation(fmt, "kgccInvalidTransitNetSel",      "Invalid transit network selected");
-        case kgccInvalidMessage:                     return presentation(fmt, "kgccInvalidMessage",            "Invalid message");
-        case kgccMissingMandatoryIe:                 return presentation(fmt, "kgccMissingMandatoryIe",        "Missing mandatory information element");
-        case kgccMsgTypeNotImplemented:              return presentation(fmt, "kgccMsgTypeNotImplemented",     "Message type not implemented");
-        case kgccMsgIncompatWithState:               return presentation(fmt, "kgccMsgIncompatWithState",      "Message incompatible with state");
-        case kgccIeNotImplemented:                   return presentation(fmt, "kgccIeNotImplemented",          "Information element not implemented");
-        case kgccInvalidIe:                          return presentation(fmt, "kgccInvalidIe",                 "Invalid information element");
-        case kgccMsgIncompatWithState2:              return presentation(fmt, "kgccMsgIncompatWithState2",     "Message incompatible with state (2)");
-        case kgccRecoveryOnTimerExpiry:              return presentation(fmt, "kgccRecoveryOnTimerExpiry",     "Recovery on timer expiry");
-        case kgccProtocolError:                      return presentation(fmt, "kgccProtocolError",             "Protocol error");
-        case kgccInterworking:                       return presentation(fmt, "kgccInterworking",              "Interworking");
-    }
-
-    throw internal_not_found();
-}
-
-std::string Verbose::gsmMobileCause(const KGsmMobileCause code, const Verbose::Presentation fmt)
-{
-    try
-    {
-        return internal_gsmMobileCause(code, fmt);
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[KGsmMobileCause='%d']") % (int)code),
-            STG(FMT("Unknown GSM mobile cause (%d)") % (int)code));
-    }
-}
-
-std::string Verbose::internal_gsmMobileCause(const KGsmMobileCause code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case kgmcPhoneFailure:                    return presentation(fmt, "kgmcPhoneFailure",               "Phone failure");
-        case kgmcNoConnectionToPhone:             return presentation(fmt, "kgmcNoConnectionToPhone",        "No connection to phone");
-        case kgmcPhoneAdaptorLinkReserved:        return presentation(fmt, "kgmcPhoneAdaptorLinkReserved",   "Phone adaptor link reserved");
-#if 0 /* this changed during K3L 1.6.0 development cycle... */
-        case kgmcCoperationNotAllowed:            return presentation(fmt, "kgmcCoperationNotAllowed",       "");
-        case kgmcCoperationNotSupported:          return presentation(fmt, "kgmcCoperationNotSupported",     "");
-#else
-        case kgmcOperationNotAllowed:             return presentation(fmt, "kgmcOperationNotAllowed",        "Operation not allowed");
-        case kgmcOperationNotSupported:           return presentation(fmt, "kgmcOperationNotSupported",      "Operation not supported");
-#endif
-        case kgmcPH_SIMPINRequired:               return presentation(fmt, "kgmcPH_SIMPINRequired",          "Phone SIM PIN required");
-        case kgmcPH_FSIMPINRequired:              return presentation(fmt, "kgmcPH_FSIMPINRequired",         "Phone FSIM PIN required");
-        case kgmcPH_FSIMPUKRequired:              return presentation(fmt, "kgmcPH_FSIMPUKRequired",         "Phone FSIM PUK required");
-        case kgmcSIMNotInserted:                  return presentation(fmt, "kgmcSIMNotInserted",             "SIM not inserted");
-        case kgmcSIMPINRequired:                  return presentation(fmt, "kgmcSIMPINRequired",             "SIM PIN required");
-        case kgmcSIMPUKRequired:                  return presentation(fmt, "kgmcSIMPUKRequired",             "SIM PUK required");
-        case kgmcSIMFailure:                      return presentation(fmt, "kgmcSIMFailure",                 "SIM failure");
-        case kgmcSIMBusy:                         return presentation(fmt, "kgmcSIMBusy",                    "SIM busy");
-        case kgmcSIMWrong:                        return presentation(fmt, "kgmcSIMWrong",                   "SIM wrong");
-        case kgmcIncorrectPassword:               return presentation(fmt, "kgmcIncorrectPassword",          "Incorrect password");
-        case kgmcSIMPIN2Required:                 return presentation(fmt, "kgmcSIMPIN2Required",            "SIM PIN2 required");
-        case kgmcSIMPUK2Required:                 return presentation(fmt, "kgmcSIMPUK2Required",            "SIM PUK2 required");
-        case kgmcMemoryFull:                      return presentation(fmt, "kgmcMemoryFull",                 "Memory full");
-        case kgmcInvalidIndex:                    return presentation(fmt, "kgmcInvalidIndex",               "Invalid index");
-        case kgmcNotFound:                        return presentation(fmt, "kgmcNotFound",                   "Not found");
-        case kgmcMemoryFailure:                   return presentation(fmt, "kgmcMemoryFailure",              "Memory failure");
-        case kgmcTextStringTooLong:               return presentation(fmt, "kgmcTextStringTooLong",          "Text string too long");
-        case kgmcInvalidCharInTextString:         return presentation(fmt, "kgmcInvalidCharInTextString",    "Invalid character in text string");
-        case kgmcDialStringTooLong:               return presentation(fmt, "kgmcDialStringTooLong",          "Dial string too long");
-        case kgmcInvalidCharInDialString:         return presentation(fmt, "kgmcInvalidCharInDialString",    "Invalid character in dial string");
-        case kgmcNoNetworkService:                return presentation(fmt, "kgmcNoNetworkService",           "No network service");
-        case kgmcNetworkTimeout:                  return presentation(fmt, "kgmcNetworkTimeout",             "Network timeout");
-        case kgmcNetworkNotAllowed:               return presentation(fmt, "kgmcNetworkNotAllowed",          "Network not allowed");
-        case kgmcCommandAborted:                  return presentation(fmt, "kgmcCommandAborted",             "Command aborted");
-        case kgmcNumParamInsteadTextParam:        return presentation(fmt, "kgmcNumParamInsteadTextParam",   "Number parameter instead of text parameter");
-        case kgmcTextParamInsteadNumParam:        return presentation(fmt, "kgmcTextParamInsteadNumParam",   "Text parameter instead of number parameter");
-        case kgmcNumericParamOutOfBounds:         return presentation(fmt, "kgmcNumericParamOutOfBounds",    "Numeric parameter out of bounds");
-        case kgmcTextStringTooShort:              return presentation(fmt, "kgmcTextStringTooShort",         "Text string too short");
-        case kgmcNetworkPINRequired:              return presentation(fmt, "kgmcNetworkPINRequired",         "Network PIN required");
-        case kgmcNetworkPUKRequired:              return presentation(fmt, "kgmcNetworkPUKRequired",         "Network PUK required");
-        case kgmcNetworkSubsetPINRequired:        return presentation(fmt, "kgmcNetworkSubsetPINRequired",   "Network subset PIN required");
-        case kgmcNetworkSubnetPUKRequired:        return presentation(fmt, "kgmcNetworkSubnetPUKRequired",   "Network subset PUK required");
-        case kgmcServiceProviderPINRequired:      return presentation(fmt, "kgmcServiceProviderPINRequired", "Network service provider PIN required");
-        case kgmcServiceProviderPUKRequired:      return presentation(fmt, "kgmcServiceProviderPUKRequired", "Network service provider PUK required");
-        case kgmcCorporatePINRequired:            return presentation(fmt, "kgmcCorporatePINRequired",       "Corporate PIN required");
-        case kgmcCorporatePUKRequired:            return presentation(fmt, "kgmcCorporatePUKRequired",       "Corporate PUK required");
-        case kgmcSIMServiceOptNotSupported:       return presentation(fmt, "kgmcSIMServiceOptNotSupported",  "SIM Service option not supported");
-        case kgmcUnknown:                         return presentation(fmt, "kgmcUnknown",                    "Unknown");
-        case kgmcIllegalMS_N3:                    return presentation(fmt, "kgmcIllegalMS_N3",               "Illegal MS #3");
-        case kgmcIllegalME_N6:                    return presentation(fmt, "kgmcIllegalME_N6",               "Illegal MS #6");
-        case kgmcGPRSServicesNotAllowed_N7:       return presentation(fmt, "kgmcGPRSServicesNotAllowed_N7",  "GPRS service not allowed #7");
-        case kgmcPLMNNotAllowed_No11:             return presentation(fmt, "kgmcPLMNNotAllowed_No11",        "PLMN not allowed #11");
-        case kgmcLocationAreaNotAllowed_N12:      return presentation(fmt, "kgmcLocationAreaNotAllowed_N12", "Location area not allowed #12");
-        case kgmcRoamingNotAllowed_N13:           return presentation(fmt, "kgmcRoamingNotAllowed_N13",      "Roaming not allowed #13");
-        case kgmcServiceOptNotSupported_N32:      return presentation(fmt, "kgmcServiceOptNotSupported_N32", "Service option not supported #32");
-        case kgmcReqServOptNotSubscribed_N33:     return presentation(fmt, "kgmcReqServOptNotSubscribed_N33", "Registration service option not subscribed #33");
-        case kgmcServOptTempOutOfOrder_N34:       return presentation(fmt, "kgmcServOptTempOutOfOrder_N34",   "Service option temporary out of order #34");
-        case kgmcLongContextActivation:           return presentation(fmt, "kgmcLongContextActivation",       "Long context activation");
-        case kgmcUnspecifiedGPRSError:            return presentation(fmt, "kgmcUnspecifiedGPRSError",        "Unspecified GPRS error");
-        case kgmcPDPAuthenticationFailure:        return presentation(fmt, "kgmcPDPAuthenticationFailure",    "PDP authentication failure");
-        case kgmcInvalidMobileClass:              return presentation(fmt, "kgmcInvalidMobileClass",          "Invalid mobile class");
-        case kgmcGPRSDisconnectionTmrActive:      return presentation(fmt, "kgmcGPRSDisconnectionTmrActive",  "GPRS disconnection TMR active");
-        case kgmcTooManyActiveCalls:              return presentation(fmt, "kgmcTooManyActiveCalls",          "Too many active calls");
-        case kgmcCallRejected:                    return presentation(fmt, "kgmcCallRejected",                "Call rejected");
-        case kgmcUnansweredCallPending:           return presentation(fmt, "kgmcUnansweredCallPending",       "Unanswered call pending");
-        case kgmcUnknownCallingError:             return presentation(fmt, "kgmcUnknownCallingError",         "Unknown calling error");
-        case kgmcNoPhoneNumRecognized:            return presentation(fmt, "kgmcNoPhoneNumRecognized",        "No phone number recognized");
-        case kgmcCallStateNotIdle:                return presentation(fmt, "kgmcCallStateNotIdle",            "Call state not idle");
-        case kgmcCallInProgress:                  return presentation(fmt, "kgmcCallInProgress",              "Call in progress");
-        case kgmcDialStateError:                  return presentation(fmt, "kgmcDialStateError",              "Dial state error");
-        case kgmcUnlockCodeRequired:              return presentation(fmt, "kgmcUnlockCodeRequired",          "Unlock code required");
-        case kgmcNetworkBusy:                     return presentation(fmt, "kgmcNetworkBusy",                 "Network busy");
-        case kgmcInvalidPhoneNumber:              return presentation(fmt, "kgmcInvalidPhoneNumber",          "Invalid phone number");
-        case kgmcNumberEntryAlreadyStarted:       return presentation(fmt, "kgmcNumberEntryAlreadyStarted",   "Number entry already started");
-        case kgmcCancelledByUser:                 return presentation(fmt, "kgmcCancelledByUser",             "Cancelled by user");
-        case kgmcNumEntryCouldNotBeStarted:       return presentation(fmt, "kgmcNumEntryCouldNotBeStarted",   "Number entry could not be started");
-        case kgmcDataLost:                        return presentation(fmt, "kgmcDataLost",                    "Data lost");
-        case kgmcInvalidBessageBodyLength:        return presentation(fmt, "kgmcInvalidBessageBodyLength",    "Invalid message body length");
-        case kgmcInactiveSocket:                  return presentation(fmt, "kgmcInactiveSocket",              "Inactive socket");
-        case kgmcSocketAlreadyOpen:               return presentation(fmt, "kgmcSocketAlreadyOpen",           "Socket already open");
-#if K3L_AT_LEAST(2,1,0)
-        case kgmcSuccess:                         return presentation(fmt, "kgmcSuccess",                     "Success");
-#endif
-    }
-
-    throw internal_not_found();
-}
-
-std::string Verbose::gsmSmsCause(const KGsmSmsCause code, const Verbose::Presentation fmt)
-{
-    try
-    {
-        return internal_gsmSmsCause(code, fmt);
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[KGsmSmsCause='%d']") % (int)code),
-            STG(FMT("Unknown GSM SMS cause (%d)") % (int)code));
-    }
-}
-
-std::string Verbose::internal_gsmSmsCause(const KGsmSmsCause code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-#if K3L_AT_LEAST(2,1,0)
-        case kgscNone:                           return presentation(fmt, "kgscNone",                         "None");
-#endif
-        case kgscUnassigned:                     return presentation(fmt, "kgscUnassigned",                   "Unassigned number");
-        case kgscOperatorDeterminedBarring:      return presentation(fmt, "kgscOperatorDeterminedBarring",    "Operator determined barring");
-        case kgscCallBarred:                     return presentation(fmt, "kgscCallBarred",                   "Call barred");
-        case kgscSMSTransferRejected:            return presentation(fmt, "kgscSMSTransferRejected",          "SMS transfer rejected");
-        case kgscDestinationOutOfService:        return presentation(fmt, "kgscDestinationOutOfService",      "Destination out of service");
-        case kgscUnidentifiedSubscriber:         return presentation(fmt, "kgscUnidentifiedSubscriber",       "Unidentified subscriber");
-        case kgscFacilityRejected:               return presentation(fmt, "kgscFacilityRejected",             "Facility rejected");
-        case kgscUnknownSubscriber:              return presentation(fmt, "kgscUnknownSubscriber",            "Unknown subscriber");
-        case kgscNetworkOutOfOrder:              return presentation(fmt, "kgscNetworkOutOfOrder",            "Network out of order");
-        case kgscTemporaryFailure:               return presentation(fmt, "kgscTemporaryFailure",             "Temporary failure");
-        case kgscCongestion:                     return presentation(fmt, "kgscCongestion",                   "Congestion");
-        case kgscResourcesUnavailable:           return presentation(fmt, "kgscResourcesUnavailable",         "Resources unavailable");
-        case kgscFacilityNotSubscribed:          return presentation(fmt, "kgscFacilityNotSubscribed",        "Facility not subscribed");
-        case kgscFacilityNotImplemented:         return presentation(fmt, "kgscFacilityNotImplemented",       "Facility not implemented");
-        case kgscInvalidSMSTransferRefValue:     return presentation(fmt, "kgscInvalidSMSTransferRefValue",   "Invalid SMS transfer reference value");
-        case kgscInvalidMessage:                 return presentation(fmt, "kgscInvalidMessage",               "Invalid message");
-        case kgscInvalidMandatoryInformation:    return presentation(fmt, "kgscInvalidMandatoryInformation",  "Invalid mandatory information");
-        case kgscMessageTypeNonExistent:         return presentation(fmt, "kgscMessageTypeNonExistent",       "Message type non existent");
-        case kgscMsgNotCompatWithSMProtState:    return presentation(fmt, "kgscMsgNotCompatWithSMProtState",  "Message not compatible with SMS protection state");
-        case kgscInformationElementNonExiste:    return presentation(fmt, "kgscInformationElementNonExiste",  "Information element non existent");
-        case kgscProtocolError:                  return presentation(fmt, "kgscProtocolError",                "Protocol error");
-        case kgscInterworking:                   return presentation(fmt, "kgscInterworking",                 "Interworking");
-        case kgscTelematicInterworkingNotSup:    return presentation(fmt, "kgscTelematicInterworkingNotSup",  "Telematic interworking not supported");
-        case kgscSMSTypeZeroNotSupported:        return presentation(fmt, "kgscSMSTypeZeroNotSupported",      "SMS type zero not supported");
-        case kgscCannotReplaceSMS:               return presentation(fmt, "kgscCannotReplaceSMS",             "Cannot replace SMS");
-        case kgscUnspecifiedTPPIDError:          return presentation(fmt, "kgscUnspecifiedTPPIDError",        "Unspecified TPPID error");
-        case kgscAlphabetNotSupported:           return presentation(fmt, "kgscAlphabetNotSupported",         "Alphabet not supported");
-        case kgscMessageClassNotSupported:       return presentation(fmt, "kgscMessageClassNotSupported",     "Message class not supported");
-        case kgscUnspecifiedTPDCSError:          return presentation(fmt, "kgscUnspecifiedTPDCSError",        "Unspecified TPDCS error");
-        case kgscCommandCannotBeActioned:        return presentation(fmt, "kgscCommandCannotBeActioned",      "Command cannot be actioned");
-        case kgscCommandUnsupported:             return presentation(fmt, "kgscCommandUnsupported",           "Command unsupported");
-        case kgscUnspecifiedTPCommandError:      return presentation(fmt, "kgscUnspecifiedTPCommandError",    "Unspecified TP command error");
-        case kgscTPDUNotSupported:               return presentation(fmt, "kgscTPDUNotSupported",             "TPDU not supported");
-        case kgscSCBusy:                         return presentation(fmt, "kgscSCBusy",                       "SC busy");
-        case kgscNoSCSubscription:               return presentation(fmt, "kgscNoSCSubscription",             "No SC subscription");
-        case kgscSCSystemFailure:                return presentation(fmt, "kgscSCSystemFailure",              "SC system failure");
-        case kgscInvalidSMEAddress:              return presentation(fmt, "kgscInvalidSMEAddress",            "Invalid SME address");
-        case kgscDestinationSMEBarred:           return presentation(fmt, "kgscDestinationSMEBarred",         "Destination SME barred");
-        case kgscSMRejectedDuplicateSM:          return presentation(fmt, "kgscSMRejectedDuplicateSM",        "SM rejected duplicate SM");
-        case kgscTPVPFNotSupported:              return presentation(fmt, "kgscTPVPFNotSupported",            "TPVPF not supported");
-        case kgscTPVPNotSupported:               return presentation(fmt, "kgscTPVPNotSupported",             "TPVP not supported");
-        case kgscSIMSMSStorageFull:              return presentation(fmt, "kgscSIMSMSStorageFull",            "SIM SMS storage full");
-        case kgscNoSMSStorageCapabilityInSIM:    return presentation(fmt, "kgscNoSMSStorageCapabilityInSIM",  "No SMS storage capability in SIM");
-        case kgscErrorInMS:                      return presentation(fmt, "kgscErrorInMS",                    "Error in SMS");
-        case kgscMemoryCapacityExceeded:         return presentation(fmt, "kgscMemoryCapacityExceeded",       "Memory capatity exceeded");
-        case kgscSIMDataDownloadError:           return presentation(fmt, "kgscSIMDataDownloadError",         "SIM data download error");
-        case kgscUnspecifiedError:               return presentation(fmt, "kgscUnspecifiedError",             "Unspecified error");
-        case kgscPhoneFailure:                   return presentation(fmt, "kgscPhoneFailure",                 "Phone failure");
-        case kgscSmsServiceReserved:             return presentation(fmt, "kgscSmsServiceReserved",           "SMS service reserved");
-        case kgscOperationNotAllowed:            return presentation(fmt, "kgscOperationNotAllowed",          "Operation not allowed");
-        case kgscOperationNotSupported:          return presentation(fmt, "kgscOperationNotSupported",        "Operation not supported");
-        case kgscInvalidPDUModeParameter:        return presentation(fmt, "kgscInvalidPDUModeParameter",      "Invalid PDU mode parameter");
-        case kgscInvalidTextModeParameter:       return presentation(fmt, "kgscInvalidTextModeParameter",     "Invalid text mode parameter");
-        case kgscSIMNotInserted:                 return presentation(fmt, "kgscSIMNotInserted",               "SIM not inserted");
-        case kgscSIMPINNecessary:                return presentation(fmt, "kgscSIMPINNecessary",              "SIM PIN necessary");
-        case kgscPH_SIMPINNecessary:             return presentation(fmt, "kgscPH_SIMPINNecessary",           "Phone SIM PIN necessary");
-        case kgscSIMFailure:                     return presentation(fmt, "kgscSIMFailure",                   "SIM failure");
-        case kgscSIMBusy:                        return presentation(fmt, "kgscSIMBusy",                      "SIM busy");
-        case kgscSIMWrong:                       return presentation(fmt, "kgscSIMWrong",                     "SIM wrong");
-        case kgscMemoryFailure:                  return presentation(fmt, "kgscMemoryFailure",                "Memory failure");
-        case kgscInvalidMemoryIndex:             return presentation(fmt, "kgscInvalidMemoryIndex",           "Invalid memory index");
-        case kgscMemoryFull:                     return presentation(fmt, "kgscMemoryFull",                   "Memory full");
-        case kgscSMSCAddressUnknown:             return presentation(fmt, "kgscSMSCAddressUnknown",           "SMSC address unknown");
-        case kgscNoNetworkService:               return presentation(fmt, "kgscNoNetworkService",             "No network service");
-        case kgscNetworkTimeout:                 return presentation(fmt, "kgscNetworkTimeout",               "Network timeout");
-        case kgscUnknownError:                   return presentation(fmt, "kgscUnknownError",                 "Unknown error");
-        case kgscNetworkBusy:                    return presentation(fmt, "kgscNetworkBusy",                  "Network busy");
-        case kgscInvalidDestinationAddress:      return presentation(fmt, "kgscInvalidDestinationAddress",    "Invalid destination address");
-        case kgscInvalidMessageBodyLength:       return presentation(fmt, "kgscInvalidMessageBodyLength",     "Invalid message body length");
-        case kgscPhoneIsNotInService:            return presentation(fmt, "kgscPhoneIsNotInService",          "Phone is not in service");
-        case kgscInvalidPreferredMemStorage:     return presentation(fmt, "kgscInvalidPreferredMemStorage",   "Invalid preferred memory storage");
-        case kgscUserTerminated:                 return presentation(fmt, "kgscUserTerminated",               "User terminated");
-    }
-
-    throw internal_not_found();
-}
-
-std::string Verbose::q931ProgressIndication(const KQ931ProgressIndication code, const Verbose::Presentation fmt)
-{
-    try
-    {
-        return internal_q931ProgressIndication(code);
-    }
-    catch (internal_not_found e)
-    {
-        PRESENTATION_CHECK_RETURN(fmt,
-            STG(FMT("[KQ931ProgressIndication='%d']") % (int)code),
-            STG(FMT("Unknown Q931 progress indication (%d)") % (int)code));
-    }
-}
-
-std::string Verbose::internal_q931ProgressIndication(const KQ931ProgressIndication code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case kq931pTonesMaybeAvailable:     return presentation(fmt, "kq931pTonesMaybeAvailable",  "Tones may be available");
-        case kq931pDestinationIsNonIsdn:    return presentation(fmt, "kq931pDestinationIsNonIsdn", "Destination is not ISDN");
-        case kq931pOriginationIsNonIsdn:    return presentation(fmt, "kq931pOriginationIsNonIsdn", "Origination is not ISDN");
-        case kq931pCallReturnedToIsdn:      return presentation(fmt, "kq931pCallReturnedToIsdn",   "Call returned to ISDN");
-        case kq931pTonesAvailable:          return presentation(fmt, "kq931pTonesAvailable",       "Tones available");
-    }
-
-    throw internal_not_found();
-}
-
-#endif /* K3L_AT_LEAST(1,6,0) */
-
-
-
-
-#if K3L_AT_LEAST(2,1,0)
-std::string Verbose::faxResult(const KFaxResult code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case kfaxrEndOfTransmission:    return presentation(fmt, "kfaxrEndOfTransmission", "EndOfTransmission");
-        case kfaxrStoppedByCommand:     return presentation(fmt, "kfaxrStoppedByCommand", "StoppedByCommand");
-        case kfaxrProtocolTimeout:      return presentation(fmt, "kfaxrProtocolTimeout", "ProtocolTimeout");
-        case kfaxrProtocolError:        return presentation(fmt, "kfaxrProtocolError", "ProtocolError");
-        case kfaxrRemoteDisconnection:  return presentation(fmt, "kfaxrRemoteDisconnection", "RemoteDisconnection");
-        case kfaxrFileError:            return presentation(fmt, "kfaxrFileError", "FileError");
-        case kfaxrUnknown:              return presentation(fmt, "kfaxrUnknown", "Unknown");
-        case kfaxrEndOfReception:       return presentation(fmt, "kfaxrEndOfReception", "EndOfReception");
-        case kfaxrCompatibilityError:   return presentation(fmt, "kfaxrCompatibilityError", "CompatibilityError");
-        case kfaxrQualityError:         return presentation(fmt, "kfaxrQualityError", "QualityError");
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KFaxResult='%d']") % (int)code),
-        STG(FMT("Unknown fax result (%d)") % (int)code));
-}
-
-std::string Verbose::faxFileErrorCause(const KFaxFileErrorCause code, const Verbose::Presentation fmt)
-{
-    switch (code)
-    {
-        case kfaxfecTransmissionStopped:       return presentation(fmt, "kfaxfecTransmissionStopped", "TransmissionStopped");
-        case kfaxfecTransmissionError:          return presentation(fmt, "kfaxfecTransmissionError", "TransmissionError");
-        case kfaxfecListCleared:                return presentation(fmt, "kfaxfecListCleared", "ListCleared");
-        case kfaxfecCouldNotOpen:               return presentation(fmt, "kfaxfecCouldNotOpen", "CouldNotOpen");
-        case kfaxfecInvalidHeader:              return presentation(fmt, "kfaxfecInvalidHeader", "InvalidHeader");
-        case kfaxfecDataNotFound:               return presentation(fmt, "kfaxfecDataNotFound", "DataNotFound");
-        case kfaxfecInvalidHeight:              return presentation(fmt, "kfaxfecInvalidHeight", "InvalidHeight");
-        case kfaxfecUnsupportedWidth:           return presentation(fmt, "kfaxfecUnsupportedWidth", "UnsupportedWidth");
-        case kfaxfecUnsupportedCompression:     return presentation(fmt, "kfaxfecUnsupportedCompression", "UnsupportedCompression");
-        case kfaxfecUnsupportedRowsPerStrip:    return presentation(fmt, "kfaxfecUnsupportedRowsPerStrip", "UnsupportedRowsPerStrip");
-        case kfaxfecUnknown:                    return presentation(fmt, "kfaxfecUnknown", "Unknown");
-    }
-
-    PRESENTATION_CHECK_RETURN(fmt,
-        STG(FMT("[KFaxFileErrorCause='%d']") % (int)code),
-        STG(FMT("Unknown fax file error cause (%d)") % (int)code));
-}
-
-#endif
-
-/********/
-
-#if K3L_AT_LEAST(2,0,0)
-std::string Verbose::command(const int32 dev, const K3L_COMMAND * const k3lcmd, const R2CountryType r2_country, const Verbose::Presentation fmt)
-#else
-std::string Verbose::command(const int32 dev, const K3L_COMMAND * const k3lcmd, const Verbose::Presentation fmt)
-#endif
-{
-#if K3L_AT_LEAST(2,0,0)
-    return command(k3lcmd->Cmd, dev, k3lcmd->Object, (const char *) k3lcmd->Params, r2_country, fmt);
-#else
-    return command(k3lcmd->Cmd, dev, k3lcmd->Object, (const char *) k3lcmd->Params, fmt);
-#endif
-}
-
-#if K3L_AT_LEAST(2,0,0)
-std::string Verbose::command(const int32 cmd_code, const int32 dev_idx, const int32 obj_idx, const char * const params, const R2CountryType r2_country, const Verbose::Presentation fmt)
-#else
-std::string Verbose::command(const int32 cmd_code, const int32 dev_idx, const int32 obj_idx, const char * const params, const Verbose::Presentation fmt)
-#endif
-{
-    unsigned short int dev = (unsigned short int) dev_idx;
-    unsigned short int obj = (unsigned short int) obj_idx;
-
-    VerboseTraits::Command code = (VerboseTraits::Command) cmd_code;
-
-    std::string buf, extra;
-
-    switch (code)
-    {
-        case VerboseTraits::K_CM_SEIZE:
-        case VerboseTraits::K_CM_SYNC_SEIZE:
-        case VerboseTraits::K_CM_VOIP_SEIZE:
-        case VerboseTraits::K_CM_DIAL_MFC:
-        case VerboseTraits::K_CM_DIAL_DTMF:
-
-        case VerboseTraits::K_CM_CONNECT:
-        case VerboseTraits::K_CM_PRE_CONNECT:
-        case VerboseTraits::K_CM_DISCONNECT:
-        case VerboseTraits::K_CM_DROP_COLLECT_CALL:
-
-        case VerboseTraits::K_CM_START_SEND_FAIL:
-        case VerboseTraits::K_CM_STOP_SEND_FAIL:
-
-        case VerboseTraits::K_CM_ENABLE_DTMF_SUPPRESSION:
-        case VerboseTraits::K_CM_DISABLE_DTMF_SUPPRESSION:
-        case VerboseTraits::K_CM_ENABLE_AUDIO_EVENTS:
-        case VerboseTraits::K_CM_DISABLE_AUDIO_EVENTS:
-        case VerboseTraits::K_CM_ENABLE_CALL_PROGRESS:
-        case VerboseTraits::K_CM_DISABLE_CALL_PROGRESS:
-        case VerboseTraits::K_CM_ENABLE_PULSE_DETECTION:
-        case VerboseTraits::K_CM_DISABLE_PULSE_DETECTION:
-        case VerboseTraits::K_CM_ENABLE_ECHO_CANCELLER:
-        case VerboseTraits::K_CM_DISABLE_ECHO_CANCELLER:
-        case VerboseTraits::K_CM_ENABLE_AGC:
-        case VerboseTraits::K_CM_DISABLE_AGC:
-        case VerboseTraits::K_CM_ENABLE_HIGH_IMP_EVENTS:
-        case VerboseTraits::K_CM_DISABLE_HIGH_IMP_EVENTS:
-
-        case VerboseTraits::K_CM_FLASH:
-        case VerboseTraits::K_CM_RESET_LINK:
-        case VerboseTraits::K_CM_CLEAR_MIXER:
-
-        case VerboseTraits::K_CM_LOCK_INCOMING:
-        case VerboseTraits::K_CM_UNLOCK_INCOMING:
-        case VerboseTraits::K_CM_LOCK_OUTGOING:
-        case VerboseTraits::K_CM_UNLOCK_OUTGOING:
-
-        case VerboseTraits::K_CM_INCREASE_VOLUME:
-        case VerboseTraits::K_CM_DECREASE_VOLUME:
-
-        case VerboseTraits::K_CM_STOP_RECORD:
-        case VerboseTraits::K_CM_PAUSE_RECORD:
-        case VerboseTraits::K_CM_RESUME_RECORD:
-
-        case VerboseTraits::K_CM_STOP_LISTEN:
-
-        case VerboseTraits::K_CM_PLAY_SOUND_CARD:
-        case VerboseTraits::K_CM_STOP_SOUND_CARD:
-        case VerboseTraits::K_CM_RINGBACK:
-#if K3L_AT_LEAST(1,4,0) && !K3L_AT_LEAST(2,0,0)
-        case VerboseTraits::K_CM_VOIP_START_DEBUG:
-        case VerboseTraits::K_CM_VOIP_STOP_DEBUG:
-        case VerboseTraits::K_CM_VOIP_DUMP_STAT:
-#endif
-
-#if K3L_AT_LEAST(1,5,3)
-        case VerboseTraits::K_CM_END_OF_NUMBER:
-#endif
-
-#if K3L_AT_LEAST(1,5,4)
-        case VerboseTraits::K_CM_SET_VOLUME:
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case VerboseTraits::K_CM_ENABLE_CALL_ANSWER_INFO:
-        case VerboseTraits::K_CM_DISABLE_CALL_ANSWER_INFO:
-
-        case VerboseTraits::K_CM_SS_TRANSFER:
-
-        case VerboseTraits::K_CM_CHECK_NEW_SMS:
-        case VerboseTraits::K_CM_GET_SMS:
-        case VerboseTraits::K_CM_PREPARE_SMS:
-        case VerboseTraits::K_CM_SEND_SMS:
-
-        case VerboseTraits::K_CM_START_CADENCE:
-        case VerboseTraits::K_CM_STOP_CADENCE:
-        case VerboseTraits::K_CM_SEND_TO_MODEM:
-#endif
-#if K3L_HAS_MPTY_SUPPORT
-        case VerboseTraits::K_CM_HOLD_SWITCH:
-        case VerboseTraits::K_CM_MPTY_CONF:
-        case VerboseTraits::K_CM_MPTY_SPLIT:
-#endif
-#if K3L_AT_LEAST(2,1,0)
-        case VerboseTraits::K_CM_SIM_CARD_SELECT:
-        case VerboseTraits::K_CM_CT_TRANSFER:
-#endif
-            if (params != NULL)
-            {
-                extra += "param='";
-                extra += (params ? params : "<empty>");
-                extra += "'";
-
-                return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-            }
-            else
-            {
-                return show(buf, commandName(code), Target(CHANNEL, dev, obj));
-            }
-
-        case VerboseTraits::K_CM_SEND_DTMF: /* ?? */
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj));
-
-        /****/
-
-        case VerboseTraits::K_CM_STOP_AUDIO:
-            extra  = "stop='";
-            switch ((params ? (int)(*params) : -1))
-            {
-                case 1:   extra += "tx";
-                case 2:   extra += "rx";
-                case 3:   extra += "tx+rx";
-                default:  extra += "<unknown>";
-            }
-            extra  = "'";
-
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-
-        /****/
-
-#if K3L_AT_LEAST(1,5,2) && !K3L_AT_LEAST(2,0,0)
-        case VerboseTraits::K_CM_ISDN_DEBUG:
-            extra  = "flags='";
-            extra += isdnDebug((unsigned long)params);
-            extra += "'";
-
-            return show(buf, commandName(code), Target(NONE), extra);
-#endif
-
-        /****/
-
-#if K3L_AT_LEAST(1,5,1)
-        case VerboseTraits::K_CM_USER_INFORMATION:
-#endif
-            if (params != NULL)
-            {
-                KUserInformation * userinfo = (KUserInformation *)params;
-
-                std::string tmp((const char*) userinfo->UserInfo, userinfo->UserInfoLength);
-
-                extra = STG(FMT("proto='%d',length='%d',data='%s'")
-                        % userinfo->ProtocolDescriptor % userinfo->UserInfoLength % tmp);
-
-                return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-            }
-            else
-            {
-                return show(buf, commandName(code), Target(CHANNEL, dev, obj));
-            }
-
-        /****/
-
-
-
-        case VerboseTraits::K_CM_CAS_CHANGE_LINE_STT:
-        {
-            const char status = (params ? *params : 0x00);
-
-            extra += "status='";
-            extra += (status & 0x01 ? "1" : "0");
-            extra += (status & 0x02 ? "1" : "0");
-            extra += (status & 0x04 ? "1" : "0");
-            extra += (status & 0x08 ? "1" : "0");
-            extra += "'";
-
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-        }
-
-        case VerboseTraits::K_CM_CAS_SEND_MFC:
-        {
-            char mfc = (params ? *params : 0xff);
-
-            extra = STG(FMT("mfc='%d'") % (int) mfc);
-
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-        }
-
-        case VerboseTraits::K_CM_CAS_SET_MFC_DETECT_MODE:
-        {
-            int mode = (params ? *((int *)params) : -1);
-
-            extra = STG(FMT("mode='%d'") % mode);
-
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-        }
-
-        case VerboseTraits::K_CM_SET_FORWARD_CHANNEL:
-        {
-            int channel = (params ? *((int*) params) : -1);
-
-            extra = STG(FMT("forward='%03d'") % channel);
-
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-        }
-
-#if K3L_AT_LEAST(1,5,0)
-        case VerboseTraits::K_CM_MAKE_CALL:
-            extra  = "options='";
-            extra += (params ? params : "<empty>");
-            extra += "'";
-
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-#endif
-
-        case VerboseTraits::K_CM_MIXER:
-        case VerboseTraits::K_CM_MIXER_CTBUS:
-        {
-            if (params)
-            {
-                KMixerCommand *m = (KMixerCommand*)params;
-
-                std::string src = mixerSource((KMixerSource)m->Source);
-                std::string idx("<unknown>");
-
-                switch (m->Source)
-                {
-                    case kmsChannel:
-                    case kmsPlay:
-                    case kmsCTbus:
-#if (K3L_AT_LEAST(1,4,0) && !K3L_AT_LEAST(1,6,0))
-                    case kmsVoIP:
-#endif
-#if K3L_AT_LEAST(1,6,0)
-                    case kmsNoDelayChannel:
-#endif
-                        idx = STG(FMT("%02d") % (int)m->SourceIndex);
-                        break;
-
-                    case kmsGenerator:
-                        idx = mixerTone((KMixerTone)m->SourceIndex);
-                        break;
-                };
-
-                extra = STG(FMT("track='%d',src='%s',index='%s'") % (int)m->Track % src % idx);
-            }
-            else
-            {
-                extra = "<unknown>";
-            }
-
-            return show(buf, commandName(code), Target(MIXER, dev, obj), extra);
-        };
-
-        case VerboseTraits::K_CM_PLAY_FROM_FILE:
-            extra  = "file='";
-            extra += (params ? params : "<empty>");
-            extra += "'";
-
-            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
-
-        case VerboseTraits::K_CM_RECORD_TO_FILE:
-            extra  = "file='";
-            extra += (params ? params : "<empty>");
-            extra += "'";
-
-            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
-
-        case VerboseTraits::K_CM_RECORD_TO_FILE_EX:
-            extra  = "params='";
-            extra += (params ? params : "<empty>");
-            extra += "'";
-
-            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
-
-        case VerboseTraits::K_CM_PLAY_FROM_STREAM:
-        case VerboseTraits::K_CM_ADD_STREAM_BUFFER:
-        {
-            struct buffer_param
-            {
-                const void * ptr;
-                const int   size;
-            }
-            *p = (buffer_param *) params;
-
-            std::stringstream stream;
-
-            extra = STG(FMT("buffer='%p',size='%d'")
-                % (const void *) p->ptr % (const int) p->size);
-
-            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
-        }
-
-        case VerboseTraits::K_CM_PLAY_FROM_STREAM_EX:
-        {
-            struct buffer_param
-            {
-                const void  *  ptr;
-                const int     size;
-                const char   codec;
-            }
-            *p = (buffer_param *) params;
-
-            std::string codec;
-
-            switch (p->codec)
-            {
-                case 0:  codec = "A-Law";
-                case 1:  codec = "PCM-08khz";
-                case 2:  codec = "PCM-11khz";
-                default: codec = "<unknown>";
-            }
-
-            std::stringstream stream;
-
-            extra = STG(FMT("buffer='%p',size='%d',codec='%s'")
-                % (const void *) p->ptr % (const int) p->size % codec);
-
-            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
-        }
-
-        case VerboseTraits::K_CM_STOP_PLAY:
-        case VerboseTraits::K_CM_PAUSE_PLAY:
-        case VerboseTraits::K_CM_RESUME_PLAY:
-
-        case VerboseTraits::K_CM_START_STREAM_BUFFER:
-        case VerboseTraits::K_CM_STOP_STREAM_BUFFER:
-
-        case VerboseTraits::K_CM_ENABLE_PLAYER_AGC:
-        case VerboseTraits::K_CM_DISABLE_PLAYER_AGC:
-
-        case VerboseTraits::K_CM_SEND_BEEP:
-        case VerboseTraits::K_CM_SEND_BEEP_CONF:
-
-        case VerboseTraits::K_CM_INTERNAL_PLAY:
-        case VerboseTraits::K_CM_INTERNAL_PLAY_EX:
-            return show(buf, commandName(code), Target(PLAYER, dev, obj));
-
-        case VerboseTraits::K_CM_ADD_TO_CONF:
-            extra += "conference='";
-            extra += (params ? (int) (*params) : -1);
-            extra += "'";
-
-            return show(buf, commandName(code), Target(MIXER, dev, obj), extra);
-
-        case CM_REMOVE_FROM_CONF:
-            return show(buf, commandName(code), Target(MIXER, dev, obj));
-
-        case VerboseTraits::K_CM_LISTEN:
-        case VerboseTraits::K_CM_PREPARE_FOR_LISTEN:
-        {
-            int msecs = (params ? *((int*)params) : -1);
-
-            extra = STG(FMT("msecs='%d'") % msecs);
-
-            return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
-        }
-
-        case VerboseTraits::K_CM_SEND_TO_CTBUS:
-        case VerboseTraits::K_CM_RECV_FROM_CTBUS:
-        {
-            KCtbusCommand *p = (KCtbusCommand*)(params);
-
-            extra = STG(FMT("stream='%02d',timeslot='%02d',enable='%d'")
-                % (int)p->Stream % (int)p->TimeSlot % (int)p->Enable);
-
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-        }
-
-        case VerboseTraits::K_CM_SET_LINE_CONDITION:
-        case VerboseTraits::K_CM_SEND_LINE_CONDITION:
-            extra  = "condition='";
-#if K3L_AT_LEAST(2,0,0)
-            extra += signGroupB((KSignGroupB) *((int *) params), r2_country);
-#else
-            extra += signGroupB((KSignGroupB) *((int *) params));
-#endif
-            extra += "'";
-
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::K_CM_SET_CALLER_CATEGORY:
-            extra  = "category='";
-#if K3L_AT_LEAST(2,0,0)
-            extra += signGroupII((KSignGroupII) *((int *) params), r2_country);
-#else
-            extra += signGroupII((KSignGroupII) *((int *) params));
-#endif
-            extra += "'";
-
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-
-#if K3L_AT_LEAST(1,6,0)
-        case VerboseTraits::K_CM_CLEAR_LINK_ERROR_COUNTER:
-            return show(buf, commandName(code), Target(LINK, dev, obj));
-
-        case VerboseTraits::K_CM_SIP_REGISTER:
-            if (params != NULL)
-            {
-                extra += "param='";
-                extra += (params ? params : "<empty>");
-                extra += "'";
-
-                return show(buf, commandName(code), Target(DEVICE, dev), extra);
-            }
-            else
-            {
-                return show(buf, commandName(code), Target(DEVICE, dev));
-            }
-#endif
-
-        case VerboseTraits::K_CM_SETUP_H100:
-            extra += "option='";
-            extra += h100configIndex((KH100ConfigIndex)obj_idx);
-            extra += "'value='";
-            extra += (params ? STG(FMT("%02d") % (int)(*params)) : "<empty>");
-            extra += "'";
-
-            return show(buf, commandName(code), Target(DEVICE, dev), extra);
-
-        case VerboseTraits::K_CM_HARD_RESET:
-            return show(buf, commandName(code), Target(LINK, dev, obj));
-
-#if !K3L_AT_LEAST(2,0,0)
-        /* como funciona? */
-        case VerboseTraits::K_CM_LOG_REQUEST:
-        case VerboseTraits::K_CM_LOG_CREATE_DISPATCHER:
-        case VerboseTraits::K_CM_LOG_DESTROY_DISPATCHER:
-        case VerboseTraits::K_CM_PING:
-#endif
-//#if K3L_AT_LEAST(2,1,0)
-//        case VerboseTraits::K_CM_LOG_UPDATE:
-//#endif
-            return show(buf, commandName(code), Target(NONE));
-#if K3L_AT_LEAST(2,1,0)
-        case VerboseTraits::K_CM_START_FAX_TX:
-        case VerboseTraits::K_CM_START_FAX_RX:
-        case VerboseTraits::K_CM_ADD_FAX_FILE:
-            extra  = "params='";
-            extra += (params ? params : "<empty>");
-            extra += "'";
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-        case VerboseTraits::K_CM_STOP_FAX_TX:
-        case VerboseTraits::K_CM_STOP_FAX_RX:
-        case VerboseTraits::K_CM_ADD_FAX_PAGE_BREAK:
-            return show(buf, commandName(code), Target(CHANNEL, dev, obj));
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-        case VerboseTraits::K_CM_NOTIFY_WATCHDOG:
-        case VerboseTraits::K_CM_STOP_WATCHDOG:
-        case VerboseTraits::K_CM_START_WATCHDOG:
-            return show(buf, commandName(code) , Target(DEVICE, obj));
-        case VerboseTraits::K_CM_WATCHDOG_COUNT:
-            return show(buf, commandName(code) , Target(NONE));
-#endif
-
-    }
-
-    /* default command handler */
-    return show(buf, commandName(code), Target(CHANNEL, dev, obj));
-}
-
-#if K3L_AT_LEAST(2,0,0)
-std::string Verbose::event(const KSignaling sig, const int32 obj_idx, const K3L_EVENT * const ev, const R2CountryType r2_country, const Verbose::Presentation fmt)
-#else
-std::string Verbose::event(const KSignaling sig, const int32 obj_idx, const K3L_EVENT * const ev, const Verbose::Presentation fmt)
-#endif
-{
-    unsigned short int dev = (unsigned short int) ev->DeviceId;
-    unsigned short int obj = (unsigned short int) obj_idx;
-
-    VerboseTraits::Event code = (VerboseTraits::Event) ev->Code;
-
-    std::string buf;
-    std::string extra;
-
-    switch (code)
-    {
-        case VerboseTraits::VerboseTraits::K_EV_CHANNEL_FREE:
-        case VerboseTraits::VerboseTraits::K_EV_SEIZE_SUCCESS:
-        case VerboseTraits::VerboseTraits::K_EV_CALL_SUCCESS:
-        case VerboseTraits::VerboseTraits::K_EV_NO_ANSWER:
-        case VerboseTraits::VerboseTraits::K_EV_CONNECT:
-        case VerboseTraits::VerboseTraits::K_EV_DTMF_SEND_FINISH:
-        case VerboseTraits::VerboseTraits::K_EV_SEIZURE_START:
-        case VerboseTraits::VerboseTraits::K_EV_BILLING_PULSE:
-        case VerboseTraits::VerboseTraits::K_EV_REFERENCE_FAIL:
-
-#if K3L_AT_LEAST(1,4,0)
-        case VerboseTraits::VerboseTraits::K_EV_CALL_HOLD_START:
-        case VerboseTraits::VerboseTraits::K_EV_CALL_HOLD_STOP:
-#endif
-
-#if K3L_AT_LEAST(1,5,0)
-        case VerboseTraits::VerboseTraits::K_EV_NEW_CALL:
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case VerboseTraits::VerboseTraits::K_EV_FLASH:
-        case VerboseTraits::VerboseTraits::K_EV_POLARITY_REVERSAL:
-        case VerboseTraits::VerboseTraits::K_EV_COLLECT_CALL:
-        case VerboseTraits::VerboseTraits::K_EV_RING_DETECTED:
-        case VerboseTraits::VerboseTraits::K_EV_SS_TRANSFER_FAIL:
-#endif
-#if K3L_HAS_MPTY_SUPPORT
-        case VerboseTraits::VerboseTraits::K_EV_CALL_MPTY_START:
-        case VerboseTraits::VerboseTraits::K_EV_CALL_MPTY_STOP:
-#endif
-            break;
-
-#if K3L_AT_LEAST(1,6,0)
-        case VerboseTraits::VerboseTraits::K_EV_RECV_FROM_MODEM:
-        case VerboseTraits::VerboseTraits::K_EV_SMS_INFO:
-        case VerboseTraits::VerboseTraits::K_EV_SMS_DATA:
-#endif
-            extra  = "data='";
-            extra += (ev->Params ? (const char *)(ev->Params) : "<empty>");
-            extra += "'";
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-#if K3L_AT_LEAST(1,6,0)
-        case VerboseTraits::VerboseTraits::K_EV_SMS_SEND_RESULT:
-            extra  = "result='";
-#if K3L_AT_LEAST(2,0,0)
-            extra += gsmSmsCause((KGsmSmsCause)ev->AddInfo);
-#else
-            extra += gsmCallCause((KGsmCallCause)ev->AddInfo);
-#endif
-            extra += "'";
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-#if K3L_HAS_MPTY_SUPPORT
-        case VerboseTraits::VerboseTraits::K_EV_GSM_COMMAND_STATUS:
-            extra  = "result='";
-            extra += gsmMobileCause((KGsmMobileCause)ev->AddInfo);
-            extra += "'";
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-#endif
-
-        case VerboseTraits::VerboseTraits::K_EV_CALL_ANSWER_INFO:
-            extra  = "info='";
-            extra += callStartInfo((KCallStartInfo)ev->AddInfo);
-            extra += "'";
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_NEW_SMS:
-            if (ev->AddInfo != 0)
-            {
-                extra  = "messages='";
-                extra += STG(FMT("%d") % ev->AddInfo);
-                extra += "'";
-                return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-            }
-            else
-            {
-                return show(buf, eventName(code), Target(CHANNEL, dev, obj));
-            }
-
-        case VerboseTraits::VerboseTraits::K_EV_ISDN_PROGRESS_INDICATOR:
-            if (ev->AddInfo != 0)
-            {
-                extra  = "indication='";
-                extra += q931ProgressIndication((KQ931ProgressIndication)ev->AddInfo);
-                extra += "'";
-                return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-            }
-            else
-            {
-                return show(buf, eventName(code), Target(CHANNEL, dev, obj));
-            }
-#endif
-
-        case VerboseTraits::VerboseTraits::K_EV_CAS_LINE_STT_CHANGED:
-            extra = STG(FMT("[a=%d,b=%d,c=%d,d=%d]")
-                % ((ev->AddInfo & 0x8) >> 3) % ((ev->AddInfo & 0x4) >> 2)
-                % ((ev->AddInfo & 0x2) >> 1) %  (ev->AddInfo & 0x1));
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_CAS_MFC_RECV:
-            extra = STG(FMT("digit='%d'") % ev->AddInfo);
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_CALL_FAIL:
-            extra  = "cause='";
-#if K3L_AT_LEAST(2,0,0)
-            extra += callFail(sig, r2_country, ev->AddInfo);
-#else
-            extra += callFail(sig, ev->AddInfo);
-#endif
-            extra += "'";
-
-            if (ev->Params != NULL && ev->ParamSize != 0)
-            {
-                if (!extra.empty())
-                    extra += ",";
-
-                extra += "params='";
-                extra += (const char *) ev->Params;
-                extra += "'";
-            }
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_DISCONNECT:
-            switch (sig)
-            {
-#if K3L_AT_LEAST(1,5,1)
-                case ksigOpenCCS:
-                case ksigPRI_EndPoint:
-                case ksigPRI_Network:
-                case ksigPRI_Passive:
-                    extra  = "cause='";
-                    extra += isdnCause((KQ931Cause) ev->AddInfo);
-                    extra += "'";
-#endif
-                default:
-                    break;
-            }
-
-            if (ev->Params != NULL && ev->ParamSize != 0)
-            {
-                if (!extra.empty())
-                    extra += ",";
-
-                extra += "params='";
-                extra += (const char *) ev->Params;
-                extra += "'";
-            }
-
-            if (!extra.empty())
-                return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-            else
-                return show(buf, eventName(code), Target(CHANNEL, dev, obj));
-
-            break;
-
-#if K3L_AT_LEAST(1,6,0)
-        case VerboseTraits::VerboseTraits::K_EV_SIP_DTMF_DETECTED:
-#endif
-        case VerboseTraits::VerboseTraits::K_EV_DTMF_DETECTED:
-        case VerboseTraits::VerboseTraits::K_EV_PULSE_DETECTED:
-        case VerboseTraits::VerboseTraits::K_EV_DIALED_DIGIT:
-            extra = STG(FMT("digit='%c'") % (char)ev->AddInfo);
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_SEIZURE:
-        {
-            KIncomingSeizeParams *n = (KIncomingSeizeParams *)
-                ( ((char*)ev) + sizeof(K3L_EVENT) );
-
-            extra += "orig_addr='";
-            extra += n->NumberA;
-            extra += "',dest_addr='";
-            extra += n->NumberB;
-            extra += "'";
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-        }
-
-#if K3L_AT_LEAST(1,4,0)
-        case VerboseTraits::VerboseTraits::K_EV_VOIP_SEIZURE:
-        {
-            char *numB = ((char*)ev) + sizeof(K3L_EVENT);
-            char *numA = numB + 61;
-
-            extra  = "numberA='";
-            extra += numA;
-            extra += "',numberB='";
-            extra += numB;
-            extra += "'";
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-        }
-#endif
-
-
-        case VerboseTraits::VerboseTraits::K_EV_END_OF_STREAM:
-            return show(buf, eventName(code), Target(PLAYER, dev, obj));
-
-        case VerboseTraits::VerboseTraits::K_EV_AUDIO_STATUS:
-            extra  = "tone='";
-            extra += mixerTone((KMixerTone)ev->AddInfo);
-            extra += "'";
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_CADENCE_RECOGNIZED:
-            extra = STG(FMT("cadence='%c'") % (char)(ev->AddInfo));
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_CHANNEL_FAIL:
-            extra  = "reason='";
-            extra += channelFail(sig, ev->AddInfo);
-            extra += "'";
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_SEIZE_FAIL:
-            extra  = "reason='";
-            extra += seizeFail((KSeizeFail) ev->AddInfo);
-            extra += "'";
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_INTERNAL_FAIL:
-            extra  = "reason='";
-            extra += internalFail((KInternalFail) ev->AddInfo);
-            extra += "'";
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_HARDWARE_FAIL:
-            extra  = "component='";
-            extra += systemObject((KSystemObject) ev->AddInfo);
-            extra += "'";
-
-            switch (ev->AddInfo)
-            {
-                case ksoChannel:
-                    return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-                case ksoLink:
-                    return show(buf, eventName(code), Target(LINK, dev, obj), extra);
-                case ksoLinkMon:
-                case ksoH100:
-                case ksoFirmware:
-                case ksoDevice:
-                    return show(buf, eventName(code), Target(DEVICE, dev), extra);
-                case ksoAPI:
-                    return show(buf, eventName(code), Target(NONE), extra);
-            }
-
-
-        case VerboseTraits::VerboseTraits::K_EV_LINK_STATUS:
-            // EV_LINK_STATUS has always zero in ObjectInfo (and AddInfo!)
-            /* fall throught... */
-
-#if K3L_AT_LEAST(1,6,0)
-        case VerboseTraits::VerboseTraits::K_EV_PHYSICAL_LINK_UP:
-        case VerboseTraits::VerboseTraits::K_EV_PHYSICAL_LINK_DOWN:
-            return show(buf, eventName(code), Target(LINK, dev, obj));
-#endif
-
-#if K3L_AT_LEAST(1,5,1)
-        case VerboseTraits::VerboseTraits::K_EV_USER_INFORMATION:
-        {
-            KUserInformation *info = (KUserInformation *)(ev->Params);
-
-            std::string data((const char *)info->UserInfo,
-                std::min<size_t>(info->UserInfoLength, KMAX_USER_USER_LEN));
-
-            extra = STG(FMT("proto='%d',length='%d',data='%s'")
-                % info->ProtocolDescriptor % info->UserInfoLength % data);
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-        }
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case VerboseTraits::VerboseTraits::K_EV_SIP_REGISTER_INFO:
-            extra  = "params='";
-            extra += (ev->Params ? (const char *) (ev->Params) : "<unknown>");
-            extra += "',status='";
-            extra += sipFailures((KSIP_Failures)(ev->AddInfo));
-            extra += "'";
-
-            return show(buf, eventName(code), Target(DEVICE, dev), extra);
-#endif
-
-#if !K3L_AT_LEAST(2,0,0)
-        case VerboseTraits::VerboseTraits::K_EV_PONG:
-#endif
-
-#if K3L_AT_LEAST(1,4,0)
-        case VerboseTraits::VerboseTraits::K_EV_CLIENT_RECONNECT:
-#endif
-            return show(buf, eventName(code), Target(NONE));
-
-#if K3L_AT_LEAST(2,1,0)
-        case VerboseTraits::VerboseTraits::K_EV_FAX_CHANNEL_FREE:
-            extra  = "status='";
-            extra += faxResult((KFaxResult)ev->AddInfo);
-            extra += "'";
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_FAX_FILE_SENT:
-            extra  = "filename='";
-            extra += (ev->Params ? (const char *) (ev->Params) : "<unknown>");
-            extra += "'";
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_FAX_FILE_FAIL:
-            extra  = "cause='";
-            extra += faxFileErrorCause((KFaxFileErrorCause)ev->AddInfo);
-            extra += "',filename='";
-            extra += (ev->Params ? (const char *) (ev->Params) : "<unknown>");
-            extra += "'";
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_FAX_REMOTE_INFO:
-            extra = ((ev->Params && ev->ParamSize != 0) ? (const char *) ev->Params : "");
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-
-        case VerboseTraits::VerboseTraits::K_EV_FAX_PAGE_CONFIRMATION:
-        case VerboseTraits::VerboseTraits::K_EV_FAX_TX_TIMEOUT:
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj));
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-        case VerboseTraits::VerboseTraits::K_EV_WATCHDOG_COUNT:
-            extra = STG(FMT("count='%d'") % (char)ev->AddInfo);
-            return show(buf , eventName(code), Target(NONE), extra);
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-        case VerboseTraits::VerboseTraits::K_EV_CT_TRANSFER_FAIL:
-            extra  = "cause='";
-            extra += isdnCause((KQ931Cause)ev->AddInfo);
-            extra += "'";
-
-            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-#endif
-    }
-
-    // default handler...
-    if (ev->Params != NULL && ev->ParamSize != 0)
-    {
-        extra += "params='";
-        extra.append((const char *) ev->Params, (unsigned int) std::max<int>(ev->ParamSize - 1, 0));
-        extra += "'";
-
-        return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-    }
-    else
-        return show(buf, eventName(code), Target(CHANNEL, dev, obj));
-}
-
-/********************************************/
-
-std::string Verbose::show(std::string & buf, const std::string & name, const Target tgt, const std::string & extra)
-{
-    if (tgt.type == NONE)
-    {
-        generate(buf, name, tgt, extra);
-    }
-    else
-    {
-        std::string tmp(",");
-        tmp += extra;
-
-        generate(buf, name, tgt, tmp);
-    }
-
-    return buf;
-}
-
-std::string Verbose::show(std::string & buf, const std::string & name, const Target tgt)
-{
-    std::string tmp("");
-
-    generate(buf, name, tgt, tmp);
-    return buf;
-}
-
-void Verbose::generate(std::string & buf, const std::string & name, const Target tgt, const std::string & extra)
-{
-    switch (tgt.type)
-    {
-        case NONE:
-            if (extra.empty())
-                buf += STG(FMT("<%s>") % name);
-            else
-                buf += STG(FMT("<%s> (%s)") % name % extra);
-            break;
-
-        case DEVICE:
-            buf += STG(FMT("<%s> (d=%02d%s)")
-                % name % tgt.device % extra);
-            break;
-
-        default:
-        {
-            const char *kind = "o";
-
-            switch (tgt.type)
-            {
-                case CHANNEL:
-                    kind = "c";
-                    break;
-                case PLAYER:
-                    kind = "p";
-                    break;
-                case MIXER:
-                    kind = "m";
-                    break;
-                case LINK:
-                    kind = "l";
-                default:
-                    break;
-            }
-
-            buf += STG(FMT("<%s> (d=%02d,%s=%03d%s)")
-                % name % tgt.device % kind % tgt.object % extra);
-            break;
-        }
-    }
-}
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/verbose.hpp b/src/mod/endpoints/mod_khomp/commons/base/verbose.hpp
deleted file mode 100644
index a0ea290b7e..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/base/verbose.hpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifndef _VERBOSE_HPP_
-#define _VERBOSE_HPP_
-
-#include <string>
-#include <sstream>
-#include <map>
-
-#include <k3l.h>
-
-// k3lApiMajorVersion
-#ifndef CM_PING
-# include <k3lVersion.h>
-# include <KTools.h>
-#endif
-
-#include <types.hpp>
-#include <k3lapi.hpp>
-#include <format.hpp>
-
-#include <verbose_traits.hpp>
-
-struct Verbose
-{
-    typedef enum
-    {
-        R2_COUNTRY_BRA = 1,
-        R2_COUNTRY_ARG = 2,
-        R2_COUNTRY_CHI = 3,
-        R2_COUNTRY_MEX = 4,
-        R2_COUNTRY_URY = 5,
-        R2_COUNTRY_VEN = 6
-    }
-    R2CountryType;
-
-    typedef enum
-    {
-        HUMAN,
-        EXACT
-    }
-    Presentation;
-
-    /* dynamic (object) stuff */
-
-    Verbose(const K3LAPI & api)
-    : _api(api) {};
-
-#if K3L_AT_LEAST(2,0,0)
-    std::string event(const int32, const K3L_EVENT * const,
-                      const R2CountryType r2_country = R2_COUNTRY_BRA,
-                      const Presentation fmt = HUMAN) const;
-#else
-    std::string event(const int32, const K3L_EVENT * const,
-                      const Presentation fmt = HUMAN) const;
-#endif
-
-    std::string channelStatus(const int32, const int32, const int32,
-                              const Presentation fmt = HUMAN) const;
-
-    /* end of dynamic (object) stuff */
-
- protected:
-    const K3LAPI & _api;
-
-    /* used internally */
-    struct internal_not_found {};
-
- public:
-
-    /* static (class) stuff */
-
-    static std::string echoLocation(const KEchoLocation, const Presentation fmt = HUMAN);
-    static std::string echoCancellerConfig(const KEchoCancellerConfig, const Presentation fmt = HUMAN);
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string event(const KSignaling, const int32, const K3L_EVENT * const,
-                             const R2CountryType = R2_COUNTRY_BRA, Presentation fmt = HUMAN);
-#else
-    static std::string event(const KSignaling, const int32, const K3L_EVENT * const,
-                             const Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string command(const int32, const K3L_COMMAND * const,
-                               const R2CountryType = R2_COUNTRY_BRA,
-                               const Presentation fmt = HUMAN);
-
-    static std::string command(const int32, const int32, const int32, const char * const,
-                               const R2CountryType = R2_COUNTRY_BRA,
-                               const Presentation fmt = HUMAN);
-#else
-    static std::string command(const int32, const K3L_COMMAND * const,
-                               const Presentation fmt = HUMAN);
-
-    static std::string command(const int32, const int32, const int32, const char * const,
-                               const Presentation fmt = HUMAN);
-#endif
-
-    static std::string deviceName(const KDeviceType, const int32, const int32 count = 0, const Presentation fmt = HUMAN);
-    static std::string deviceName(const KDeviceType, const int32, const Presentation fmt);
-
-    static std::string deviceType(const KDeviceType, const int32 count = 0, const Presentation fmt = HUMAN);
-    static std::string deviceType(const KDeviceType, const Presentation fmt);
-
-    static std::string deviceModel(const KDeviceType, const int32, const int32 count = 0, const Presentation fmt = HUMAN);
-    static std::string deviceModel(const KDeviceType, const int32, const Presentation fmt);
-
-    static std::string channelFeatures(const int32, const Presentation fmt = HUMAN);
-    static std::string signaling(const KSignaling, const Presentation fmt = HUMAN);
-    static std::string systemObject(const KSystemObject, const Presentation fmt = HUMAN);
-    static std::string mixerTone(const KMixerTone, const Presentation fmt = HUMAN);
-    static std::string mixerSource(const KMixerSource, const Presentation fmt = HUMAN);
-
-    static std::string seizeFail(const KSeizeFail, const Presentation fmt = HUMAN);
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string callFail(const KSignaling, const R2CountryType, const int32, const Presentation fmt = HUMAN);
-#else
-    static std::string callFail(const KSignaling, const int32, const Presentation fmt = HUMAN);
-#endif
-
-    static std::string channelFail(const KSignaling, const int32, const Presentation fmt = HUMAN);
-    static std::string internalFail(const KInternalFail, const Presentation fmt = HUMAN);
-
-    static std::string linkErrorCounter(const KLinkErrorCounter, const Presentation fmt = HUMAN);
-
-    static std::string linkStatus(const KSignaling, const int32, const Presentation fmt = HUMAN, const bool simpleStatus = false);
-    static std::string channelStatus(const KSignaling, const int32, const Presentation fmt = HUMAN);
-    static std::string callStatus(const KCallStatus, const Presentation fmt = HUMAN);
-    static std::string status(const KLibraryStatus, const Presentation fmt = HUMAN);
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string signGroupB(const KSignGroupB, const R2CountryType contry = R2_COUNTRY_BRA,
-        Presentation fmt = HUMAN);
-#else
-    static std::string signGroupB(const KSignGroupB, const Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string signGroupII(const KSignGroupII, const R2CountryType contry = R2_COUNTRY_BRA,
-        Presentation fmt = HUMAN);
-#else
-    static std::string signGroupII(const KSignGroupII, const Presentation fmt = HUMAN);
-#endif
-
-    static std::string h100configIndex(const KH100ConfigIndex, const Presentation fmt = HUMAN);
-
-    static std::string eventName(const int32 value)
-    {
-        return VerboseTraits::eventName((VerboseTraits::Event)value);
-    };
-
-    static std::string commandName(const int32 value)
-    {
-        return VerboseTraits::commandName((VerboseTraits::Command)value);
-    };
-
-#if K3L_AT_LEAST(1,5,0)
-    static std::string sipFailures(const KSIP_Failures, const Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(1,5,1)
-    static std::string isdnCause(const KQ931Cause, const Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(1,5,2)
-    static std::string isdnDebug(const int32, const Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-    static std::string callStartInfo(const KCallStartInfo, const Presentation fmt = HUMAN);
-
-    static std::string gsmCallCause(const KGsmCallCause, const Presentation fmt = HUMAN);
-    static std::string gsmMobileCause(const KGsmMobileCause, const Presentation fmt = HUMAN);
-    static std::string gsmSmsCause(const KGsmSmsCause, const Presentation fmt = HUMAN);
-
-    static std::string q931ProgressIndication(const KQ931ProgressIndication,
-        Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-    static std::string faxResult(const KFaxResult code, const Presentation fmt = HUMAN);
-    static std::string faxFileErrorCause(const KFaxFileErrorCause code, const Presentation fmt = HUMAN);
-#endif
-
-    /* end of static (class) stuff */
-
- private:
-    static std::string internal_deviceType(const KDeviceType, const int32);
-    static std::string internal_deviceModel(const KDeviceType, const int32, const int32);
-
-#if K3L_AT_LEAST(1,5,0)
-    static std::string internal_sipFailures(const KSIP_Failures, const Presentation fmt = HUMAN);
-#endif
-#if K3L_AT_LEAST(1,5,1)
-    static std::string internal_isdnCause(const KQ931Cause, const Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string internal_signGroupB(const KSignGroupB, const R2CountryType contry, const Presentation fmt = HUMAN);
-    static std::string internal_signGroupII(const KSignGroupII, const R2CountryType contry, const Presentation fmt = HUMAN);
-#else
-    static std::string internal_signGroupB(const KSignGroupB, const Presentation fmt = HUMAN);
-    static std::string internal_signGroupII(const KSignGroupII, const Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-    static std::string internal_gsmCallCause(const KGsmCallCause, const Presentation fmt = HUMAN);
-    static std::string internal_gsmMobileCause(const KGsmMobileCause, const Presentation fmt = HUMAN);
-    static std::string internal_gsmSmsCause(const KGsmSmsCause, const Presentation fmt = HUMAN);
-
-    static std::string internal_q931ProgressIndication(const KQ931ProgressIndication, const Presentation fmt = HUMAN);
-#endif
-
- private:
-    enum Type
-    {
-        DEVICE,
-        CHANNEL,
-        PLAYER,
-        MIXER,
-        LINK,
-        NONE
-    };
-
-    struct Target
-    {
-        Target(Type _type)
-        : type(_type), device(-1), object(-1)
-        {};
-
-        Target(Type _type, int32 _device)
-        : type(_type), device(_device), object(-1)
-        {};
-
-        Target(Type _type, int32 _device, int32 _object)
-        : type(_type), device(_device), object(_object)
-        {};
-
-        const Type    type;
-        const int32 device;
-        const int32 object;
-    };
-
-    static void generate(std::string &, const std::string &, const Target, const std::string &);
-
-    static std::string show(std::string &, const std::string &, const Target, const std::string &);
-    static std::string show(std::string &, const std::string &, const Target);
-
-    template < typename ReturnType >
-    static ReturnType presentation(const Presentation fmt, ReturnType str_exact, ReturnType str_human)
-    {
-        switch (fmt)
-        {
-            case HUMAN: return str_human;
-            case EXACT: return str_exact;
-        };
-
-        return str_exact;
-    }
-};
-
-#endif /* _VERBOSE_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/tools/generate-verbose-headers.sh b/src/mod/endpoints/mod_khomp/commons/tools/generate-verbose-headers.sh
deleted file mode 100755
index 7b9012baea..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/tools/generate-verbose-headers.sh
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/bin/sh
-
-cut_defines ()
-{
-    cut -b9- | cut -f1 | cut -d' ' -f1
-}
-
-list_commands ()
-{
-    egrep -h 'define.+CM_' "$@" | cut_defines
-}
-
-list_events ()
-{
-    # list and remove deprecations
-    egrep -h 'define.+EV_' "$@" | cut_defines | \
-        grep -v 'EV_CALL_PROGRESS\|EV_FAX_MESSAGE_CONFIRMATION'
-}
-
-make_enumeration_one_by_one ()
-{
-    while read line
-    do
-        local size=$[50 - $(expr length "${line}")]
-
-        echo -n "        K_${line}"
-
-        for ((i=0;i<size;i++))
-        do
-            echo -n " "
-        done
-
-        echo "= ${line},"
-    done
-}
-
-make_enumeration ()
-{
-    local name="$1"; shift
-    local func="$1"; shift
-
-    echo "    typedef enum"
-    echo "    {"
-    "${func}" "$@" | make_enumeration_one_by_one
-    echo "    }"
-    echo "    ${name};"
-}
-
-make_switch_case_one_by_one ()
-{
-    while read line
-    do
-        local size=$[50 - $(expr length "${line}")]
-
-        echo -n "        case K_${line}:"
-
-        for ((i=0;i<size;i++))
-        do
-            echo -n " "
-        done
-
-        echo "return \"${line}\";"
-    done
-}
-
-make_switch_case ()
-{
-    local type="$1"; shift
-    local name="$1"; shift
-    local func="$1"; shift
-
-    echo "std::string VerboseTraits::${name}Name(const ${type} value)"
-    echo "{"
-    echo "    switch(value)"
-    echo "    {"
-    "${func}" "$@" | make_switch_case_one_by_one
-    echo "    }"
-    echo "    return STG(FMT(\"${name}=%d\") % ((int)value));"
-    echo "}"
-}
-
-make_license ()
-{
-    echo '/*'
-    echo '    KHOMP generic endpoint/channel library.'
-    echo '    Copyright (C) 2007-2010 Khomp Ind. & Com.'
-    echo ''
-    echo '  The contents of this file are subject to the Mozilla Public License Version 1.1'
-    echo '  (the "License"); you may not use this file except in compliance with the'
-    echo '  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/'
-    echo ''
-    echo '  Software distributed under the License is distributed on an "AS IS" basis,'
-    echo '  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for'
-    echo '  the specific language governing rights and limitations under the License.'
-    echo ''
-    echo '  Alternatively, the contents of this file may be used under the terms of the'
-    echo '  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which'
-    echo '  case the provisions of "LGPL License" are applicable instead of those above.'
-    echo ''
-    echo '  If you wish to allow use of your version of this file only under the terms of'
-    echo '  the LGPL License and not to allow others to use your version of this file under'
-    echo '  the MPL, indicate your decision by deleting the provisions above and replace them'
-    echo '  with the notice and other provisions required by the LGPL License. If you do not'
-    echo '  delete the provisions above, a recipient may use your version of this file under'
-    echo '  either the MPL or the LGPL License.'
-    echo ''
-    echo '  The LGPL header follows below:'
-    echo ''
-    echo '    This library is free software; you can redistribute it and/or'
-    echo '    modify it under the terms of the GNU Lesser General Public'
-    echo '    License as published by the Free Software Foundation; either'
-    echo '    version 2.1 of the License, or (at your option) any later version.'
-    echo ''
-    echo '    This library is distributed in the hope that it will be useful,'
-    echo '    but WITHOUT ANY WARRANTY; without even the implied warranty of'
-    echo '    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU'
-    echo '    Lesser General Public License for more details.'
-    echo ''
-    echo '    You should have received a copy of the GNU Lesser General Public License'
-    echo '    along with this library; if not, write to the Free Software Foundation, Inc.,'
-    echo '    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA'
-    echo ''
-    echo '*/'
-
-    echo "/* ****************************************************************************** */"
-    echo "/* ******************* AUTO GENERATED FILE - DO NOT EDIT! *********************** */"
-    echo "/* ****************************************************************************** */"
-    echo
-}
-
-make_header ()
-{
-    make_license
-
-    echo "#ifndef _VERBOSE_TRAITS_H_"
-    echo "#define _VERBOSE_TRAITS_H_"
-    echo
-    echo "#include <string>"
-    echo
-    echo "#include <format.hpp>"
-    echo
-    echo "#include <k3l.h>"
-    echo
-    echo "struct VerboseTraits"
-    echo "{"
-    make_enumeration "Command" list_commands "$@" || return 1
-    echo
-    make_enumeration "Event"   list_events   "$@" || return 1
-    echo
-    echo "    static std::string   eventName(const Event);"
-    echo "    static std::string commandName(const Command);"
-    echo "};"
-    echo
-    echo "#endif /* _VERBOSE_TRAITS_H_ */"
-}
-
-make_source ()
-{
-    make_license
-
-    echo "#include <verbose_traits.hpp>"
-    echo
-
-    make_switch_case "Event"   "event"   list_events   "$@" || return 1
-    echo
-    make_switch_case "Command" "command" list_commands "$@" || return 1
-}
-
-make_run ()
-{
-    local destdir="$1"; shift
-
-    if [ ! -d "${destdir}" ]
-    then
-        echo "ERROR: First argument is not a directory!"
-        return 1
-    fi
-
-    make_header "$@" > "${destdir}/verbose_traits.hpp"
-    make_source "$@" > "${destdir}/verbose_traits.cpp"
-}
-
-make_run "$@"
diff --git a/src/mod/endpoints/mod_khomp/docs/Manual.html b/src/mod/endpoints/mod_khomp/docs/Manual.html
deleted file mode 100644
index b1fcfc0107..0000000000
--- a/src/mod/endpoints/mod_khomp/docs/Manual.html
+++ /dev/null
@@ -1,1091 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Mod Khomp: Manual</title></head><body>
-<a name="Considera.C3.A7.C3.B5es_iniciais" id="Considera.C3.A7.C3.B5es_iniciais"></a><h1> <span class="mw-headline"> Considera��es iniciais </span></h1>
-<p>Este documento aborda informa��es sobre o <i>Endpoint</i> da Khomp como um todo, desde op��es dispon�veis de configura��o, os <i>applications</i> disponibilizados, os poss�veis comandos de <b>CLI</b>, entre outros.
-</p><p>Para procedimentos sobre a instala��o, favor consultar o <a href=".htmlMod_Khomp/README" title="Mod Khomp/README">README do Endpoint</a>.
-<br />
-</p>
-<a name="Configura.C3.A7.C3.A3o" id="Configura.C3.A7.C3.A3o"></a><h1> <span class="mw-headline"> Configura��o </span></h1>
-<p>Configurar o Endpoint da Khomp � uma tarefa que consiste de tr�s etapas:
-</p>
-<ul><li> Configura��o das placas, atrav�s da K3L;
-</li><li> Configura��o do Endpoint;
-</li><li> Configura��o do FreeSWITCH.
-</li></ul>
-<p>Estas etapas s�o descritas mais detalhadamente abaixo.
-<br />
-</p>
-<a name="Configura.C3.A7.C3.A3o_da_API_K3L" id="Configura.C3.A7.C3.A3o_da_API_K3L"></a><h2> <span class="mw-headline"> Configura��o da API K3L </span></h2>
-<p>Esta etapa � realizada de maneira semi-automatizada atrav�s do programa <b>khompwizard</b>, um assistente que configura os par�metros b�sicos das placas do sistema. Esse assistente inicializa os arquivos de configura��o atrav�s de informa��es obtidas do usu�rio, quando estas forem necess�rias, inicializando as configura��es menos utilizadas com os valores padr�es.
-</p><p>Normalmente, este programa � executado automaticamente ap�s a instala��o do sistema. Entretanto, pode ser necess�rio execut�-lo manualmente caso uma atualiza��o esteja sendo realizada, ou se novas placas foram adicionadas no sistema ap�s a instala��o dos <i>drivers</i> da placa.
-</p><p>Caso seja necess�ria a configura��o de par�metros avan�ados da placa e/ou da sinaliza��o, o programa <b>k3lconfig</b> permite acessar todas as configura��es dispon�veis de cada placa instalada. Para maiores informa��es sobre este programa, consulte a documenta��o do mesmo. Para solu��es de problemas de sincronismo, consulte a se��o <a href="#Solu.C3.A7.C3.A3o_de_problemas" title="">Solu��o de problemas</a> sobre o procedimento de configura��o manual das placas.
-<br />
-</p>
-<a name="Configura.C3.A7.C3.A3o_do_Endpoint" id="Configura.C3.A7.C3.A3o_do_Endpoint"></a><h2> <span class="mw-headline"> Configura��o do Endpoint </span></h2>
-<p>A configura��o padr�o do sistema costuma atender � maior parte das necessidades. Entretanto, as configura��es do Endpoint da Khomp podem ser modificadas atrav�s do arquivo de configura��o '<b>/usr/local/freeswitch/conf/autoload_configs/khomp.conf.xml'</b>.
-</p><p>A lista de op��es � a seguinte:
-</p>
-<a name=".3Cchannels.3E" id=".3Cchannels.3E"></a><h4> <span class="mw-headline"> &lt;channels&gt; </span></h4>
-<p>Define as configura��es gerais de todos os canais da Khomp.
-</p>
-<pre><b>Sintaxe:</b> &lt;param name="..." value="..."/&gt;
-</pre>
-<p><br />
-</p>
-<ul><li><b>accountcode</b>: Define o account code padr�o para chamadas no Endpoint. Esta op��o pode ser qualquer string alfanum�rica; 
-</li><li><b>dialplan</b>: Nome do m�dulo de <i>dialplan</i> em uso.
-</li><li><b>auto-fax-adjustment</b>: Ativa ("yes") ou desativa ("no") o ajuste autom�tico do canal (desabilitar o cancelador de eco e a supress�o DTMF) ao detectar tom de FAX; 
-</li><li><b>auto-gain-control</b>: Ativa ("yes") ou desativa ("no") a ativa��o do controle autom�tico de ganho (AGC) pelo Endpoint; 
-</li><li><b>context-digital</b>: Contexto de entrada para liga��es em placas digitais (o padr�o � "khomp-DD-LL", onde "DD" ser� substitu�do, no momento da liga��o, pelo n�mero do dispositivo, "LL" pelo n�mero do link, "CCC" pelo n�mero do canal e "SSSS" pelo n�mero serial do dispositivo); 
-</li><li><b>context-fxo</b>: Contexto de entrada para placas FXO (o padr�o � "khomp-DD-CC", onde "DD" ser� substitu�do, no momento da liga��o, pelo n�mero do dispositivo, "CC" pelo n�mero do canal, e "SSSS" pelo n�mero serial do dispositivo); 
-</li><li><b>context-fxs</b>: Contexto de entrada para placas FXS (o padr�o � "khomp-DD-CC", onde "DD" ser� substitu�do, no momento da liga��o, pelo n�mero do dispositivo, "CC" pelo n�mero do canal, e "SSSS" pelo n�mero serial do dispositivo); 
-</li><li><b>context-gsm-call</b> (ou "context-gsm"): Contexto de entrada para liga��es GSM (o padr�o � "khomp-DD-CC", onde "DD" ser� substitu�do no momento da liga��o pelo n�mero do dispositivo, "CC" pelo n�mero do canal, e "SSSS" pelo n�mero serial do dispositivo); 
-</li><li><b>context-gsm-sms</b>: Contexto de entrada para SMSs (o padr�o � "khomp-sms-DD-CC", onde "DD" ser� substitu�do pelo n�mero de dispositivo, "CC" pelo n�mero do canal, e "SSSS" pelo n�mero serial do dispositivo);
-</li><li><b>context-pr</b>: Contexto de entrada para liga��es em placas KPR (o padr�o � "khomp-DD-CC", onde "DD" ser� substitu�do, no momento da liga��o, pelo n�mero do dispositivo, "CC" pelo n�mero do canal);
-</li><li><b>delay-ringback-co</b>: Define o tempo de <i>delay</i> para ativar a gera��o de tom de controle de chamada (<i>ringback</i>) pelo Endpoint da Khomp quando h� uma indica��o de <i>ringback</i>, e n�o h� �udio sendo enviado por quem indicou a situa��o de controle da chamada;
-</li><li><b>delay-ringback-pbx</b>: Define o tempo de <i>delay</i> para ativar a gera��o de controle de chamada (<i>ringback</i>) pelo Endpoint da Khomp quando h� uma indica��o de <i>ringback</i>, e o �udio de controle enviado n�o possui nenhum tom (ou seja, est� em sil�ncio);
-</li><li><b>disconnect-delay</b>: Define o tempo em milissegundos para realizar o processamento de um evento de desconex�o, para ignorar situa��es onde outros equipamentos realizam o duplo atendimento para derrubar chamadas a cobrar;
-</li><li><b>drop-collect-call</b>: Ativa ("yes") ou desativa ("no") o derrubamento de chamadas � cobrar. Caso ativo, todas as chamadas � cobrar ser�o derrubadas n�o importando o que foi ajustado na vari�vel KDropCollectCall (o valor padr�o � "no");
-</li><li><b>echo-canceller</b>: Ativa ("yes") ou desativa ("no") o cancelamento de eco autom�tico pelo Endpoint; 
-</li><li><b>flash-to-digits</b>: Define os d�gitos para serem enviados quando o FLASH � detectado na FXS;
-</li><li><b>fxo-send-pre-audio</b>: Quando ativada ("yes") libera canal de �udio sainte antes da conex�o da chamada em placas KFXO (o valor padr�o � "yes");
-</li><li><b>fxs-digit-timeout</b>: Define o <i>timeout</i>, em segundos, entre d�gitos na FXS;
-</li><li><b>fxs-global-orig</b>: N�mero inicial para numera��o seq�encial de ramais das placas <b>KFXS</b> que n�o estiverem listadas na se��o <b>&lt;fxs-branches&gt;</b> (a numera��o segue ordem crescente por n�mero da placa e n�mero do canal f�sico) (o padr�o � "0"); 
-</li><li><b>fxs-co-dialtone</b>: Seq��ncias de n�meros, separados por v�rgula, que disparam um tom cont�nuo (de central p�blica) em ramais FXS (ex: "0,99" faz com que, ao discar "0" ou "99", o usu�rio receba o tom de linha cont�nuo) (o padr�o � vazio);
-</li><li><b>fxs-bina</b>: Quando ativada ("yes"), liga��es para ramais FXS enviar�o os d�gitos correspondentes ao telefone de origem em sinaliza��o BINA DTMF (o valor padr�o � "no");
-</li><li><b>language</b>: Define idioma para liga��es nas placas Khomp; 
-</li><li><b>ignore-letter-dtmfs</b>: Define se o canal deve ignorar DTMFs incomuns detectados pela placa (A, B, C e D). Entretanto, se voc� necessita passar esses d�gitos pela placa, voc� deve ajustar esta op��o para "no" (o valor padr�o � "yes");
-</li><li><b>input-volume</b>: Define o volume de entrada das liga��es, varia de -10 a +10&nbsp;; 
-</li><li><b>kommuter-activation</b>: Define se a ativa��o de dispositivos kommuter encontrados no sistema ser� feita de forma autom�tica ("auto"), ou de forma manual ("manual") pelo usu�rio, atrav�s do comando "khomp kommuter on/off"; 
-</li><li><b>kommuter-timeout</b>: Define o <i>timeout</i> (em segundos) com que os kommuters ser�o inicializados. Se chegarem a este <i>timeout</i> sem receberem notifica��o do channel, os dispositivos ir�o comutar para o estado "desligado". O valor m�nimo � "0" , onde os links permanecer�o sempre comutados no estado "ligado", e o valor m�ximo � "255"; 
-</li><li><b>log-to-console</b>: Define mensagens de log que devem ser impressas na console; 
-</li><li><b>log-to-disk</b>: Define mensagens de log que devem ser salvar em disco; 
-</li><li><b>out-of-band-dtmfs</b>: Ativa ("yes") ou desativa ("no") a supress�o DTMF e o envio destes out-of-band; 
-</li><li><b>output-volume</b>: Define o volume de sa�da das liga��es, varia de -10 a +10&nbsp;; 
-</li><li><b>pulse-forwarding</b>: Ativa ("yes") ou desativa ("no") a detec��o de pulsos e a convers�o dos mesmos em DTMFs; 
-</li><li><b>r2-preconnect-wait</b>: Define o tempo de espera do envio da sinaliza��o de ringback, no protocolo R2/MFC, para iniciar o envio de �udio de sil�ncio. Apenas utilizado quando "r2-strict-behaviour" estiver ajustado para "no"; 
-</li><li><b>r2-strict-behaviour</b>: Ativa ("yes") ou desativa ("no") o comportamento da sinaliza��o R2/MFC conforme a norma define. O padr�o � "no", e pode ser alterado para "yes" caso seja necess�rio receber/enviar dados precisos da sinaliza��o do protocolo (condi��o de B, por exemplo); 
-</li><li><b>suppression-delay</b>: Ativa ("yes") ou desativa ("no") o delay necess�rio para supress�o DTMF. Se desativado ("no"), tamb�m desativa supress�o de DTMFs; 
-</li><li><b>trace</b>: Define op��es de depura��o. N�o deve ser utilizado em produ��o a n�o ser que estritamente necess�rio;
-</li><li><b>user-transfer-digits</b>: Define uma seq��ncia de d�gitos DTMF para iniciar a transferencia entre o FreeSWITCH&reg; e um outro PABX (utilizando sinaliza��o de usu�rio, como QSig ou FXO FLASH);
-</li></ul>
-<p><br />
-</p>
-<a name=".3Cgroups.3E" id=".3Cgroups.3E"></a><h4> <span class="mw-headline"> &lt;groups&gt; </span></h4>
-<p>Define os grupos para serem usados na aloca��o de canal.
-</p><p>Neste caso, as op��es s�o usadas para definir nomes para <i>strings de aloca��o de canais</i>. O formato segue o padr�o &lt;param name="nome grupo" value="string aloca��o"/&gt;, onde as <i>strings de aloca��o de canais</i> s�o as mesmas utilizadas no application bridge, e <i>nome do grupo</i> � um nome arbitr�rio escolhido pelo usu�rio. 
-</p>
-<dl><dd>Por exemplo, para definir o grupo <b>pstn</b> como os canais 0 e 5 da placa 0, deveria-se utilizar a linha:
-</dd></dl>
-<pre>&lt;param name="pstn" value="b0c0 + b0c5"/&gt; 
-</pre>
-<p>Este grupo, por sua vez, poderia ser usado no <i>application bridge</i> como <b>&lt;action application="bridge" data="Khomp/Gpstn/..."/&gt;</b>.
-</p>
-<dl><dd>Pode-se tamb�m associar um determinado contexto de entrada a um grupo de canais, bastando especificar um nome de contexto ap�s a <i>string</i> de aloca��o, separado por ':' da mesma.
-</dd></dl>
-<p>Por exemplo, para definir o mesmo grupo <b>pstn</b> acima como os canais 0 at� 20 da placa 0, com contexto de entrada <b>from-pstn</b>, poderia-se utilizar a linha:
-</p>
-<pre>&lt;param name="pstn" value="b0c0-20:from-pstn"/&gt;
-</pre>
-<p>Este grupo, por sua vez, poderia ser usado no <i>application bridge</i> como <b>&lt;action application="bridge" data="Khomp/Gpstn/..."/&gt;</b>, e todas as liga��es vindas destes canais seriam tratadas no contexto <b>from-pstn</b>.
-<br />
-</p>
-<a name=".3Ccadences.3E" id=".3Ccadences.3E"></a><h4> <span class="mw-headline"> &lt;cadences&gt; </span></h4>
-<p>Define configura��es de cad�ncias para o Endpoint. 
-</p><p>Neste caso, as op��es s�o nomes de cad�ncias e um ou dois pares de n�meros, que definem os intervalos de tom e sil�ncio a ser utilizado nas cad�ncias. Para maiores detalhes, favor consultar o arquivo de configura��o.
-<br />
-</p>
-<a name=".3Cfxs-branches.3E" id=".3Cfxs-branches.3E"></a><h4> <span class="mw-headline"> &lt;fxs-branches&gt; </span></h4>
-<p>Define n�meros de origem para a placa KFXS. 
-</p><p>Neste caso, as op��es s�o seq��ncias de prefixos de ramais e n�meros seriais das placas, que definem os n�meros base dos endere�os de origem, e a ordem num�rica das placas. O formato das op��es �:
-</p>
-<pre>&lt;param name="prefixo" value="serial1, serial2, ...."/&gt;
-</pre>
-<p>Por exemplo, para definir que as placas K0374 e K2352 devem ser numeradas seq�encialmente, partido do ramal 200, basta escrever:
-</p>
-<pre>&lt;param name="200" value="374, 2352"/&gt;
-</pre>
-<p>Para maiores detalhes, favor consultar o arquivo de configura��o.
-<br />
-</p>
-<a name=".3Cfxs-hotlines.3E" id=".3Cfxs-hotlines.3E"></a><h4> <span class="mw-headline"> &lt;fxs-hotlines&gt; </span></h4>
-<p>Define hotlines para a placa KFXS.
-</p><p>Neste caso, as op��es s�o seq��ncias de ramais e n�meros de destino, definindo os ramais listados nesta se��o para serem tratados como "hotlines". Para cada ramal listado, o n�mero de destino especificado ser� discado quando o ramal for retirado do gancho. Exemplo:
-</p>
-<pre>&lt;param name="100" value="1234"/&gt;
-&lt;param name="200" value="4321"/&gt; 
-</pre>
-<p>No primeiro exemplo, o ramal de n�mero 100 ir� telefonar para n�mero 1234 ao ser retirado do gancho; no segundo, o ramal de n�mero 200 ir� telefonar para o n�mero 4321 ao ser retirado do gancho.
-</p>
-<a name=".3Cfxs-options.3E" id=".3Cfxs-options.3E"></a><h4> <span class="mw-headline"> &lt;fxs-options&gt; </span></h4>
-<p>Permite definir configura��es espec�ficas por ramal FXS.
-</p><p>Neste caso, as configura��es s�o n�meros de ramais (baseado nos definidos na se��o &lt;fxs-branches&gt;), e as op��es e seus valores. As op��es dispon�veis s�o: 
-</p>
-<ul><li>context; 
-</li><li>input-volume; 
-</li><li>output-volume; 
-</li><li>language; 
-</li><li>accountcode;
-</li><li>calleridnum; 
-</li><li>calleridname;
-</li><li>flash-to-digits.
-</li></ul>
-<p>Cada op��o � separada uma da outra por um pipe "|" ou uma barra "/" e definidas ap�s dois pontos ":", exemplo:
-</p>
-<pre> &lt;param name="200" value="input-volume:1|context:master-branch" /&gt;
-</pre>
-<p>Para maiores informa��es sobre a sintaxe e exemplos, favor consultar o arquivo de configura��o.
-</p><p><br />
-</p><p>Para maiores informa��es, consultar o arquivo de configura��o '<b>khomp.conf.xml'</b>.
-<br />
-</p>
-<a name="Configura.C3.A7.C3.A3o_do_FreeSWITCH" id="Configura.C3.A7.C3.A3o_do_FreeSWITCH"></a><h2> <span class="mw-headline"> Configura��o do FreeSWITCH </span></h2>
-<p>Quando as liga��es s�o recebidas nas placas e dispositivos Khomp, estas s�o encaminhadas pelo <i>Endpoint</i> da Khomp para contextos espec�ficos dentro do plano de discagem do FreeSWITCH&reg;. Estes contextos podem ser alterados atrav�s do arquivo de configura��es <b>khomp.conf.xml</b>, dispon�vel no diret�rio de configura��o do FreeSWITCH (por padr�o, "<b>/usr/local/freeswitch/conf/autoload_configs</b>").
-</p><p>Para maiores detalhes sobre os contextos espec�ficos, consultar a se��o de <a href="#Configura.C3.A7.C3.A3o_do_Endpoint" title="">Configura��o do Endpoint</a>.
-</p><p>Abaixo, encontram-se informa��es de como configurar os contextos de entrada de chamadas:
-<br />
-</p><p><br />
-</p>
-<a name="Contextos_de_entrada_em_canais_E1" id="Contextos_de_entrada_em_canais_E1"></a><h3> <span class="mw-headline"> Contextos de entrada em canais E1 </span></h3>
-<p>Para placas E1, as liga��es de entrada por padr�o chegam em um contexto pr�-definido conforme a op��o <b>context-digital</b>:
-</p>
-<pre>&lt;param name="context-digital" value="khomp-DD-LL"/&gt;
-</pre>
-<p>Este contexto padr�o define que as liga��es ser�o redirecionadas de acordo com o n�mero da placa e n�mero do <i>link</i>: <b>DD</b> � o n�mero dispositivo (com dois d�gitos), e <b>LL</b> � o n�mero do <i>link</i> (tamb�m com dois d�gitos).
-</p><p>Entretanto, � poss�vel configurar outros contextos de entrada, com formatos diferenciados. Pode-se utilizar a op��o <b>CCC</b>, que significa o n�mero do canal na placa (com tr�s d�gitos), e <b>SSSS</b>, que representa o n�mero serial da placa (com quatro d�gitos).
-</p><p>Exemplos de configura��o no arquivo <b>khomp.conf.xml</b>:
-</p>
-<pre>&lt;!-- n�mero seq�encial da placa e do link (ex: khomp-01-00) --&gt;
-&lt;param name="context-digital" value="khomp-DD-LL"/&gt;
-</pre>
-<pre>&lt;!-- n�mero serial da placa e seq�encial do link (ex: khomp-3049-00) --&gt;
-&lt;param name="context-digital" value="khomp-SSSS-LL"/&gt;
-</pre>
-<pre>&lt;!-- n�mero seq�encial da placa e do canal (ex: khomp-00-001) --&gt;
-&lt;param name="context-digital" value="khomp-DD-CCC"/&gt;
-</pre>
-<pre>&lt;!-- recebe todas as chamadas em um s� contexto (khomp-digital) --&gt;
-&lt;param name="context-digital" value="khomp-digital"/&gt;
-</pre>
-<p>Abaixo um exemplo de contexto no plano de discagem:
-<!-- NEED 6 -->
-</p>
-<pre>&lt;!-- 
-Este contexto presente em seu arquivo de dialplan, ir� manipular chamadas
-de entrada no link 0 (primeiro link) da placa 0.
---&gt;
-&lt;context name="khomp-00-00"&gt;
-             .
-             .
-             .
-&lt;/context&gt;
-</pre>
-<p>Outro exemplo, utilizando o mesmo formato:
-<!-- NEED 6 -->
-</p>
-<pre>&lt;!-- 
-Este contexto presente em seu arquivo de dialplan, ir� manipular chamadas
-de entrada no link 1 (segundo link) da placa 0.
---&gt;
-&lt;context name="khomp-00-01&gt;
-             .
-             .
-             .
-&lt;/context&gt;
-</pre>
-<p>Um exemplo completo, com algumas a��es simples:
-<!-- NEED 10 -->
-</p>
-<pre>&lt;context name="khomp-00-00"&gt;
-    &lt;extension name="exemplo_1"&gt;
-        &lt;condition field="destination_number" expression="^1234$"&gt;
-            &lt;action application="bridge" data="Khomp/b0L1/2345"/&gt;
-        &lt;/condition&gt;
-    &lt;/extension&gt;
-    &lt;extension name="exemplo_2"&gt;
-        &lt;condition field="destination_number" expression="^23(\d{2})$"&gt;
-            &lt;action application="bridge" data="sofia/${use_profile}/11$1@${sip_from_host}"/&gt;
-        &lt;/condition&gt;
-    &lt;/extension&gt;
-&lt;/context&gt;
-</pre>
-<pre>&lt;context name="khomp-00-01"&gt;
-    &lt;extension name="exemplo_3"&gt;
-        &lt;condition field="destination_number" expression="^1111$"&gt;
-            &lt;action application="bridge" data="Khomp/b0L0/2345"/&gt;
-        &lt;/condition&gt;
-    &lt;/extension&gt;
-&lt;/context&gt;
-</pre>
-<p>Este plano de discagem define o recebimento de chamadas na placa <b>0</b> e no link <b>0</b>, redirecionando chamadas para o n�mero 1234 feitas para o link <b>1</b> da placa <b>0</b>, pro ramal/telefone <b>2345</b>, e redirecionando qualquer n�mero de quatro d�gitos come�ado com <b>23</b> para telefones SIP de quatro d�gitos come�ados com <b>11</b> mais os dois �ltimos d�gitos recebidos.
-</p><p>Tamb�m h� mais uma extens�o definida, onde as liga��es recebidas no link <b>1</b> da placa <b>0</b> para o n�mero <b>1111</b>, s�o redirecionadas para o link <b>0</b> da placa <b>0</b>, para o telefone/ramal <b>2345</b>.
-<br />
-</p>
-<a name="Contextos_de_entrada_em_canais_FXS.2FFXO.2FGSM" id="Contextos_de_entrada_em_canais_FXS.2FFXO.2FGSM"></a><h3> <span class="mw-headline"> Contextos de entrada em canais FXS/FXO/GSM </span></h3>
-<p>Da mesma forma que no contexto de placas E1, as liga��es de entrada s�o encaminhadas pelo <i>Endpoint</i> para o FreeSWITCH. 
-</p><p>O contexto � pr�-definido da seguinte forma, conforme o arquivo <b>khomp.conf.xml</b>:
-</p>
-<pre>&lt;param name="context-gsm" value="khomp-DD-CC"/&gt;&nbsp;;placas GSM
-</pre>
-<pre>&lt;param name="context-fxs" value="khomp-DD-CC"/&gt;&nbsp;; placas FXS
-</pre>
-<pre>&lt;param name="context-fxo" value="khomp-DD-CC"/&gt;&nbsp;; placas FXO
-</pre>
-<p><br />
-Nestes casos, <b>DD</b> � o n�mero dispositivo (com dois d�gitos), e <b>CC</b> � o n�mero do canal da placa. Pode-se utilizar tamb�m <b>SSSS</b>, que representa o n�mero serial da placa. 
-</p>
-<ul><li> <b>IMPORTANTE</b>: No caso da placa <b>KGSM</b>, as liga��es entrantes s�o <b>sempre</b> encaminhadas para o <i>extension</i> <b>"s"</b> por padr�o, visto que o protocolo GSM n�o identifica o n�mero de destino nas liga��es entrantes, apenas o n�mero de origem - quando n�o omitido.
-</li></ul>
-<a name="Prioridade_de_contextos_na_placa_FXS" id="Prioridade_de_contextos_na_placa_FXS"></a><h4> <span class="mw-headline"> Prioridade de contextos na placa FXS </span></h4>
-<p>Em liga��es originadas a partir de um ramal FXS, o Endpoint driver procura uma extens�o v�lida (dos d�gitos discados) ap�s o d�gito <b>#</b> ou ap�s o timeout (configur�vel pela op��o <b>fxs-digit-timeout</b>, no arquivo <b>khomp.conf.xml</b>). Essa busca � realizada no contexto espec�fico do ramal (definido na se��o <b>&lt;fxs-options&gt;</b> do arquivo de configura��o <b>khomp.conf.xml</b>), caso n�o seja configurado, a busca � realizada no contexto definido na op��o <b>context-fxs</b>;
-</p><p><br />
-</p>
-<a name="Contextos_de_mensagens_SMS_.28apenas_GSM.29" id="Contextos_de_mensagens_SMS_.28apenas_GSM.29"></a><h3> <span class="mw-headline"> Contextos de mensagens SMS (apenas GSM) </span></h3>
-<p>Mensagens SMS s�o recebidas pelo <i>Endpoint</i> da Khomp e encaminhadas para o FreeSWITCH como uma liga��o normal, mas sem �udio, que possui algumas vari�veis ajustadas com informa��es recebidas na mensagem - para maiores informa��es sobre estas vari�veis, consulte a documenta��o das vari�veis do <i>Endpoint</i>. Este contexto tamb�m pode ser alterado, de mesma forma que o contextos acima.
-</p><p>Esta liga��o entra no seguinte contexto, conforme o arquivo <b>khomp.conf.xml</b>:
-</p>
-<pre>&lt;param name="context-gsm-sms" value="khomp-sms-DD-CC"/&gt; 
-</pre>
-<p>Onde <b>DD</b> � o n�mero dispositivo (com dois d�gitos), e <b>CC</b> � o n�mero do canal (tamb�m com dois d�gitos). Por exemplo:
-</p>
-<pre>&lt;context name="khomp-sms-00-01"&gt;
-    &lt;extension name="sms"&gt;
-        &lt;condition field="destination_number" expression="^s$"&gt;
-            &lt;action application="log" data="DEBUG KSmsType=${KSmsType}"/&gt;
-            &lt;action application="log" data="DEBUG KSmsBody=${KSmsBody}"/&gt;
-        &lt;/condition&gt;
-    &lt;/extension&gt;
-&lt;/context&gt;
-</pre>
-<a name="Contexto_de_entrada_em_canais_Khomp_PR_.28KPR.29" id="Contexto_de_entrada_em_canais_Khomp_PR_.28KPR.29"></a><h3> <span class="mw-headline"> Contexto de entrada em canais Khomp_PR (KPR) </span></h3>
-<p>Para estas placas, as liga��es de entrada possuem um contexto pr�-definido, conforme exemplo abaixo:
-</p>
-<pre>&lt;param name="context-pr" value="khomp-DD-CC"/&gt; 
-</pre>
-<p>Neste caso, <b>DD</b> � o n�mero do dispositivo (com dois d�gitos), e <b>CC</b> � o n�mero do canal da placa.
-<br />
-</p>
-<a name="Contextos_por_grupo_de_chamada" id="Contextos_por_grupo_de_chamada"></a><h3> <span class="mw-headline">Contextos por grupo de chamada </span></h3>
-<p>A se��o <b>groups</b>, no arquivo de configura��o <b>khomp.conf.xml</b>, pode ser utilizado para definir contextos espec�ficos para determinados grupos de canais.
-</p><p>Esta se��o � detalhada na se��o <b>Configura��o do Endpoint</b>.
-<br />
-</p>
-<a name="Utiliza.C3.A7.C3.A3o_do_application_bridge" id="Utiliza.C3.A7.C3.A3o_do_application_bridge"></a><h3> <span class="mw-headline">Utiliza��o do <i>application</i> bridge </span></h3>
-<p>O aplicativo (ou <i>application</i>) <b>bridge</b> � respons�vel por gerar chamadas no FreeSWITCH a partir de um <i>dialplan</i>. Este aplicativo pode ser utilizado para gerar chamadas a partir de diversos tipos de <i>Endpoints</i>, sendo que cada <i>Endpoint</i> segue um formato espec�fico para definir tanto as op��es quanto os canais de comunica��es a serem utilizados.
-</p>
-<a name="Campos_relativos_ao_Endpoint" id="Campos_relativos_ao_Endpoint"></a><h4> <span class="mw-headline"> Campos relativos ao <i>Endpoint</i> </span></h4>
-<p>Quando utilizado para canais da <b>Khomp</b>, a <i>string</i> de <b>bridge</b> pode ter dois, tr�s ou quatro campos separados por uma barra (/). Algumas <i>strings</i> de exemplo:
-<!-- NEED 11 -->
-</p>
-<pre>&lt;action application="bridge" data="Khomp/B2L0/32625644"/&gt;
-&lt;action application="bridge" data="Khomp/*B2L0/32625644"/&gt;
-&lt;action application="bridge" data="Khomp/S0411/99991234"/&gt;
-&lt;action application="bridge" data="Khomp/Gpstn/99991234"/&gt;
-&lt;action application="bridge" data="Khomp/*Gpstn/99991234"/&gt;
-&lt;action application="bridge" data="Khomp/B2C58/32625644/category=4:orig=4855553232"/&gt;
-&lt;action application="bridge" data="Khomp/b0c9"/&gt;
-&lt;action application="bridge" data="Khomp/b0c1+b0c14"/&gt;
-&lt;action application="bridge" data="Khomp/r304"/&gt;
-</pre>
-<p>Nos cinco primeiros exemplos, temos tr�s campos sendo especificados; no sexto, quatros campos s�o utilizados; e por fim, nos tr�s �ltimos exemplos, apenas dois s�o utilizados.
-</p><p>Sobre os campos utilizados, segue a descri��o:
-</p>
-<ul><li> <b>1� campo</b>, 'Khomp': identifica o tipo do <i>Endpoint</i> em quest�o;
-</li><li> <b>2� campo</b>, 'B2L0', 'S0411', 'Gpstn', etc: representa a <b>Pol�tica de Aloca��o de Canais</b>;
-</li><li> <b>3� campo</b>, '32625644' e '99991234': s�o os n�meros de destino, para onde ser� efetuada a liga��o (ausente em placas <b>KFXS</b>);
-</li><li> <b>4� campo</b>, 'category=4:orig=4855553232': op��es adicionais n�o-obrigat�rias, detalhadas mais � frente.
-</li></ul>
-<p>OBS: A <i>string</i> de <b>bridge</b> com somente dois campos � espec�fica � liga��es para uma placa KFXS, onde o destino est� atrelado automaticamente ao canal alocado, ou ao ramal especificado.
-</p>
-<a name="Pol.C3.ADtica_de_aloca.C3.A7.C3.A3o_de_canais" id="Pol.C3.ADtica_de_aloca.C3.A7.C3.A3o_de_canais"></a><h4> <span class="mw-headline"> Pol�tica de aloca��o de canais </span></h4>
-<p>A pol�tica de aloca��o de canais, no m�dulo da <b>Khomp</b>, pode ser especificado na pr�pria <i>string</i> de <i>bridge</i> ou atrav�s de grupos, no arquivo de configura��o <b>khomp.conf.xml</b>. Para especificar placas, canais e links a serem alocados existe a seguinte sintaxe dispon�vel (considerando X, Y e Z como n�meros quaisquer):
-</p>
-<ul><li> b<b>X</b>      -- busca os canais na placa 'X', de maneira crescente.
-</li><li> b<b>X</b>L<b>Y</b>    -- busca canais no link 'Y' da placa 'X', fazendo uma procura crescente (com rela��o ao n�mero dos canais).
-</li><li> b<b>X</b>c<b>Y</b>    -- utiliza apenas o canal 'Y' da placa 'X'.
-</li><li> b<b>X</b>c<b>Y</b>-<b>Z</b>  -- busca por canais, iniciando do canal 'Y' e indo at� o canal 'Z' (inclusive), da placa 'X', de maneira crescente.
-</li><li> B<b>X</b>c<b>Y</b>-<b>Z</b>  -- idem ao anterior, de maneira decrescente.
-</li><li> s<b>X</b>      -- busca os canais na placa de serial 'X', de maneira crescente.
-</li><li> s<b>X</b>L<b>Y</b>    -- busca canais no link 'Y' da placa de serial 'X', fazendo uma procura crescente (com rela��o ao n�mero dos canais).
-</li><li> s<b>X</b>c<b>Y</b>    -- utiliza apenas o canal 'Y' da placa de serial 'X'.
-</li><li> s<b>X</b>c<b>Y</b>-<b>Z</b>  -- busca por canais, iniciando do canal 'Y' e indo at� o canal 'Z' (inclusive), da placa de serial 'X', de maneira crescente.
-</li><li> S<b>X</b>c<b>Y</b>-<b>Z</b>  -- idem ao anterior, de maneira decrescente.
-</li></ul>
-<p>Para buscar por ramais de placas <b>KFXS</b> de acordo com o n�mero do ramal, pode ser utilizada a seguinte sintaxe (considerando X e Y n�meros de ramais v�lidos):
-</p>
-<ul><li> r<b>X</b>      -- busca ramal 'X'.
-</li><li> R<b>X</b>      -- equivalente ao anterior.
-</li><li> r<b>X</b>-<b>Y</b>    -- busca de ramal 'X' a 'Y', ordem crescente.
-</li><li> R<b>X</b>-<b>Y</b>    -- busca de ramal 'X' a 'Y', ordem decrescente.
-</li></ul>
-<p>� interessante notar que apenas a capitaliza��o da letra 'B', 'S' ou 'R' define a ordem de busca dos canais; se min�scula, crescente, e se mai�scula, decrescente.
-</p><p>J� para a aloca��o de canais atrav�s de grupos, existe a seguinte sintaxe dispon�vel:
-</p>
-<ul><li> Ggroupname  -- utiliza a string de <i>bridge</i> definida ao grupo "groupname" no arquivo de configura��o; j� detalhado na se��o de configura��o do Endpoint.
-</li><li> ggroupname  -- equivalente ao anterior.
-</li></ul>
-<a name="Agrupando_aloca.C3.A7.C3.B5es_de_canais" id="Agrupando_aloca.C3.A7.C3.B5es_de_canais"></a><h4> <span class="mw-headline"> Agrupando aloca��es de canais  </span></h4>
-<p>Existem casos onde � necess�rio buscar canais mais de um determinado dispositivo, ou determinado grupo de ramais. Para isto, existe uma extens�o dispon�vel na string de aloca��o, que diz respeito ao uso do s�mbolo de soma (<b>+</b>) para concatenar v�rias <i>strings</i> de liga��o, da seguinte forma: <!-- NEED 6 --> 
-</p>
-<pre>&lt;action application="bridge" data="Khomp/B1L0+B2L0/32332933"/&gt;
-&lt;action application="bridge" data="Khomp/*B2+B3+B4/99887766"/&gt;
-&lt;action application="bridge" data="Khomp/S0411+B1L0/99887766"/&gt;
-&lt;action application="bridge" data="Khomp/Gpstn1+Gpstn2/99991234"/&gt;
-&lt;action application="bridge" data="Khomp/*gOperadora1+gOperadora2/98891234"/&gt;
-</pre>
-<p>Esta extens�o est� dispon�vel tanto no <i>application</i> <b>bridge</b> quanto na especifica��o de grupos, e pode ser utilizada para agrupar qualquer <i>string</i> de aloca��o v�lida � outra. O processamento das <i>strings</i> de aloca��o se d� da esquerda para a direita - exceto quanto utilizando a aloca��o c�clica, onde <b>todos</b> os canais especificados s�o verificados simultaneamente.
-</p>
-<a name="Escolha_c.C3.ADclica_e.2Fou_justa" id="Escolha_c.C3.ADclica_e.2Fou_justa"></a><h4> <span class="mw-headline"> Escolha c�clica e/ou <i>justa</i>  </span></h4>
-<p>Uma varia��o da aloca��o de canais � atrav�s de uma escolha c�clica e/ou <i>justa</i>, que consiste em escolher o canal que <b>completou</b> - at� o momento - o menor n�mero de liga��es <b>saintes</b>. Essa forma � caracterizada por um asterisco (<b>*</b>) antes da string de aloca��o de canais (conforme pode ser verificado acima, no segundo e quinto exemplos). 
-</p><p>Quando iniciada com um asterisco (<b>*</b>), as outras formas de aloca��o subseq�entes (crescente, decrescente, etc) s�o utilizadas para decidir, entre os canais com menor n�mero de liga��es saintes, qual ser� verificado primeiro para realizar a chamada. 
-</p>
-<ul><li><b>AVISO: O uso da aloca��o justa e/ou c�clica � recomend�vel <u>somente</u> em placas anal�gicas (KFXO), de ramais (KFXS) e de interface celular (KGSM)</b>. Conex�es E1 tendem a alocar os canais de maneira crescente ou decrescente de um lado (na operadora, por exemplo), e o inverso do outro (no PABX, por exemplo), para evitar problemas de dupla ocupa��o (o que pode ocorrer na sinaliza��o R2/MFC). A aloca��o c�clica/justa tamb�m consome mais recursos de mem�ria e processamento que a aloca��o tradicional, o que � agravado ainda mais pelo fato de placas E1 terem um n�mero muito maior de canais (30 por link).<br /><br />Por estes motivos, aloca��es justas e/ou c�clicas devem ser utilizadas apenas em sinaliza��es onde isso pode representar alguma diferen�a real, como equalizar a tarifa��o das linhas, o uso das mesmas, ou o n�mero de liga��es recebidas por cada ponto de atendimento (PA).
-</li></ul>
-<a name="Op.C3.A7.C3.B5es_dispon.C3.ADves" id="Op.C3.A7.C3.B5es_dispon.C3.ADves"></a><h4> <span class="mw-headline"> Op��es dispon�ves </span></h4>
-<ul><li><b>orig</b>: Define o n�mero de origem a ser utilizado na chamada, <b>sem alterar a vari�vel ${origination_caller_id_number}</b>. Ou seja, a op��o <b>orig</b> serve <b>apenas</b> para repassar um n�mero de origem diferente do ${origination_caller_id_number}. Caso o FreeSWITCH j� tenha ajustado a vari�vel ${origination_caller_id_number}, o que � o comportamento padr�o, o Endpoint utiliza este valor automaticamente como refer�ncia do n�mero de origem, sem ser necess�rio repassar nenhuma op��o adicional.<br /><br />Nas placas <b>KGSM</b>, se ajustado para <b>restricted</b>, omite o n�mero de origem. Exemplo:<br />
-</li></ul>
-<pre>
- &lt;action application=&quot;bridge&quot; data=&quot;Khomp/b0/99887766/orig=restricted&quot;/&gt;
-</pre>
-<ul><li><b>category</b>: Quando ajustado para um valor num�rico, define a categoria do n�mero de A. Dispon�vel apenas em sinaliza��o R2/MFC; 
-</li><li><b>uui</b>: Quando ajustado para um n�mero e uma string de texto, separados por cerquilha ("#"), envia uma mensagem "User-to-User" para a outra ponta, antes de realizar a chamada, utilizando o descritor como o n�mero e a mensagem como o texto. Dispon�vel apenas em sinaliza��o RDSI (ISDN); 
-</li><li><b>ring_cadence</b>: Quando ajustado para um identificador, utiliza cad�ncia definida com este nome na se��o "cadences" do arquivo de configura��o do Endpoint da Khomp para chamar o canal desejado. Dispon�vel apenas em sinaliza��o FXS; 
-</li><li><b>ring</b>: Quando ajustado para dois n�meros, separados por ponto ("."), define as cad�ncias de chamada de um ramal FXS para estes valores, sendo o primeiro relativo ao tempo de chamando, e o segundo, ao tempo de sil�ncio; 
-</li><li><b>ring_ext</b>: Quando ajustado para dois n�meros, separados por ponto ("."), define as cad�ncias de chamada extendidas (a serem executadas depois da cad�ncia principal) de um ramal FXS para estes valores, sendo o primeiro relativo ao tempo de chamando, e o segundo, ao tempo de sil�ncio; 
-</li><li><b>usr_xfer</b>: Quando ajustado para uma seq��ncia de d�gitos DTMF, define estes como d�gitos a serem utilizados para iniciar uma transfer�ncia entre PABXes (utilizando sinaliza��es de usu�rio); 
-</li><li><b>drop_on</b>: Quando ajustado para "message_box", "human_answer", "answering_machine", "carrier_message", "unknown" ou uma lista destes (separados por mais ("+") ou ponto (".")), faz com que a chamada seja derrubada ao detectar tons de caixa postal, atendimento humano, secret�ria eletr�nica, mensagens da operadora, ou algum atendimento desconhecido - respectivamente. Dispon�vel em sinaliza��es digitais (links E1 e placas KGSM). Adicionalmente, a informa��o de atendimento � reportada para o usu�rio na vari�vel KCallAnswerInfo; 
-</li><li><b>answer_info</b>: Op��o booleana (n�o necessita de valor). Quando especificada, reporta informa��es de atendimento para o usu�rio atrav�s da vari�vel KCallAnswerInfo; 
-</li><li><b>pre</b>: Quando ajustado para uma seq��ncia de d�gitos DTMF, utiliza estes para pre-alocar um canal de sa�da em um PABX anal�gico, discando o n�mero de B desejado a seguir. Somente dispon�vel para sinaliza��o anal�gica (FXO);
-</li><li><b>pre_answer</b>: Op��o booleana (n�o necessita de valor). Quando especificada, "antende" o canal antes de a liga��o ser completada permitindo, por exemplo, que DTMFs possam ser enviados - �til para utilizar em um <b>DISA</b>;
-</li><li><b>output_volume</b>: Define o volume de sa�da da liga��o. Varia de -10 a +10;
-</li><li><b>input_volume</b>: Define o volume de entrada da liga��o. Varia de -10 a +10;
-</li></ul>
-<p><br />
-</p>
-<a name="Lista_das_vari.C3.A1veis" id="Lista_das_vari.C3.A1veis"></a><h3> <span class="mw-headline"> Lista das vari�veis </span></h3>
-<p>Segue lista de vari�veis dispon�veis no Endpoint:
-</p>
-<ul><li><b>KDropCollectCall</b>: Quando definida antes do atendimento (ao receber uma chamada), ativa ("yes") ou desativa ("no", padr�o) o derrubamento de chamadas � cobrar baseado na sinaliza��o recebida da central p�blica; atrav�s do duplo atendimento; ou atrav�s do reconhecimento por �udio de uma chamada � cobrar (pode ser definido de maneira global);
-</li><li><b>KR2SendCondition</b>: Quando definida antes do envio de ringback pelo FreeSWITCH (ao receber uma chamada), ajusta a condi��o de B para o valor num�rico que foi ajustada. Apenas dispon�vel para sinaliza��o R2; 
-</li><li><b>KR2GotCategory</b>: Ajustada pelo Endpoint ao receber uma chamada entrante, e possui a categoria do n�mero de A. Apenas dispon�vel para sinaliza��o R2; 
-</li><li><b>KR2GotCondition</b>: Ajustada pelo Endpoint, e dispon�vel ap�s o retorno de uma chamada realizada pelo FreeSWITCH. Cont�m a condi��o de B recebida ao realizar a chamada. Apenas dispon�vel para sinaliza��o R2;
-</li><li><b>KISDNGotCause</b>: Ajustada pelo Endpoint, e dispon�vel ap�s o retorno de uma chamada realizada pelo FreeSWITCH. Cont�m o c�digo de <i>cause</i> do ISDN recebido ao realizar a chamada. Apenas dispon�vel para sinaliza��o ISDN;
-</li><li><b>KCallAnswerInfo</b>: Ajustada pelo Endpoint, e dispon�vel ap�s o retorno de uma chamada realizada pelo FreeSWITCH. Cont�m as informa��es de atendimento detectadas ao realizar a chamada e est� dispon�vel apenas para sinaliza��es digitais (E1, GSM);
-</li><li><b>KSmsDelivered</b>: Ajustada pelo Endpoint ao enviar uma mensagem SMS com o <i>application</i> <b>KSendSMS</b>, e define se a mensagem foi entregue com sucesso ("yes") ou n�o ("no"); 
-</li><li><b>KSmsErrorCode</b>: Ajustada pelo Endpoint ao enviar uma mensagem SMS com o <i>application</i> <b>KSendSMS</b>, e define o c�digo de erro ao enviar a mensagem; 
-</li><li><b>KSmsErrorName</b>: Ajustada pelo Endpoint ao enviar uma mensagem SMS com o <i>application</i> <b>KSendSMS</b>, cont�m o nome do erro em forma textual, ou "None" caso n�o tenha ocorrido nenhum erro.
-</li><li><b>KSmsType</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, define o tipo da mensagem recebida (pode conter os valores "message", "confirm" ou "broadcast"; 
-</li><li><b>KSmsFrom</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, define o n�mero de origem da mensagem recebida (dispon�vel em tipos "message" e "confirm"); 
-</li><li><b>KSmsDate</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, define a data de envio da mensagem (dispon�vel em tipos "message" e "confirm"); 
-</li><li><b>KSmsSize</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, cont�m o tamanho (em bytes) da mensagem recebida (dispon�vel em tipos "message" e "broadcast"); 
-</li><li><b>KSmsMode</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, cont�m o tipo codifica��o da mensagem recebida (dispon�vel em tipos "message" e "broadcast"); 
-</li><li><b>KSmsBody</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, cont�m o texto da mensagem recebida (dispon�vel em tipos "message" e "broadcast");
-</li><li><b>KSmsDelivery</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, cont�m a data de entrega de mensagem enviada anteriormente cuja confirma��o foi requisitada (dispon�vel no tipo "confirm");
-</li><li><b>KSmsStatus</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, cont�m o <i>status</i> de envio de mensagem anteriormente cuja confirma��o foi requisitada (dispon�vel no tipo "confirm");
-</li><li><b>KSmsSerial</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, cont�m o n�mero de s�rie da mensagem recebida (dispon�vel no tipo "broadcast");
-</li><li><b>KSmsPage</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, cont�m o n�mero da p�gina relativo � mensagem recebida (dispon�vel no tipo "broadcast");
-</li><li><b>KSmsPages</b>: Ajustada pelo Endpoint no contexto de entrada das mensagens SMS, cont�m o n�mero total de p�ginas a serem recebidas (dispon�vel no tipo "broadcast");
-</li><li><b>KUserInfoDescriptor</b>: Define/informa descritor do protoloco utilizado na mensagem User-to-User Information (RDSI). 
-</li><li><b>KUserInfoData</b>: Define/informa os dados na mensagem User-to-User Information (RDSI).
-</li><li><b>KFaxSent</b>: Ajustada pelo Endpoint ao enviar FAX com o application KSendFax, e define se o FAX foi enviado com sucesso ("yes") ou n�o ("no"); 
-</li><li><b>KFaxReceived</b>: Ajustada pelo Endpoint ao receber FAX com o application KReceiveFax, e define se o FAX foi recebido com sucesso ("yes") ou n�o ("no"); 
-</li><li><b>KFaxResult</b>: Ajustada pelo Endpoint ao enviar ou receber FAX com o application KSendFax ou KReceiveFax, respectivamente, e define o seu resultado.
-</li></ul>
-<p><br />
-</p>
-<a name="Descri.C3.A7.C3.A3o_das_vari.C3.A1veis" id="Descri.C3.A7.C3.A3o_das_vari.C3.A1veis"></a><h3> <span class="mw-headline"> Descri��o das vari�veis </span></h3>
-<p>Abaixo, segue uma explana��o sobre como utilizar as vari�veis do Endpoint da Khomp dispon�veis no dialplan, tanto para comunicar quanto para receber informa��es: 
-</p><p><br />
-</p>
-<a name="KDropCollectCall" id="KDropCollectCall"></a><h4> <span class="mw-headline"> KDropCollectCall </span></h4>
-<p>Quando ativada, faz com que o Endpoint da Khomp derrube chamadas a cobrar atrav�s de duplo atendimento (dispon�vel para sinaliza��es 'R2 Digital' e FXO), atrav�s da informa��o dispon�vel no protocolo RDSI e R2/MFC, ou atrav�s da detec��o do �udio de chamada a cobrar (dispon�vel para qualquer sinaliza��o digital por link E1, e para sinaliza��o GSM).
-</p><p>Esta vari�vel � �til para derrubar chamadas a cobrar para determinados ramais, e deve ser ajustado <b>obrigatoriamente</b> antes de realizar qualquer tipo de atendimento - aplica��es como <b>playback</b> e <b>bridge</b> devem ser executadas sempre ap�s ajustar esta vari�vel, por exemplo.
-</p><p>Para melhor funcionalidade, � recomendado tamb�m que nenhum estado de chamada (<i>ringback</i>) seja enviado antes desta vari�vel ser ajustada, ent�o aplica��es devem ser executadas apenas ap�s o ajuste correto desta vari�vel.
-</p><p>Esta vari�vel pode ser ajustada localmente e globalmente, tanto para <b>yes</b> quanto para <b>no</b>. O ajuste da vari�vel global para <b>yes</b> far� com que todas as chamadas a cobrar sejam derrubadas, a n�o ser que a chamada espec�fica seja ajustada para <b>no</b> - isto permite a cria��o de um filtro global de chamadas a cobrar, com algumas poucas exce��es.
-</p><p>Ativando a vari�vel dentro do contexto <b>default</b>:
-<!-- NEED 5 --> 
-</p><p>&lt;context name="default"&gt;
-</p>
-<pre>&lt;extension name="exemplo"&gt;
- .
- .
- .
- &lt;action aplication="set" data="KDropCollectCall=yes"/&gt;
- .
- .
- .
-&lt;/extension&gt;
-</pre>
-<p>&lt;/context&gt;
-</p><p>Ativando a vari�vel no contexto global, lembrando que a mesma deve ser configurada no arquivo <b>vars.xml</b>:
-<!-- NEED 5 --> 
-</p>
-<pre>&lt;X-PRE-PROCESS cmd="set" data="KDropCollectCall=yes"/&gt;
-</pre>
-<a name="KR2SendCondition" id="KR2SendCondition"></a><h4> <span class="mw-headline"> KR2SendCondition </span></h4>
-<p>Ao receber uma chamada, pode ser definida antes do envio de ringback pelo FreeSWITCH (ou seja, antes do FreeSWITCH executar as aplica��es answer, ou bridge). Quando utilizada em sinaliza��o R2/MFC, esta vari�vel ajusta a condi��o de B para o valor num�rico desejado. 
-</p><p>Exemplo:
-<!-- NEED 6 --> 
-</p>
-<pre>&lt;!-- Condi��o "NUMBER CHANGED", avisa ao chamador que o n�mero de B mudou. --&gt;
-&lt;action application="KR2SendCondition" data="3"/&gt;
-</pre>
-<a name="KR2GotCategory" id="KR2GotCategory"></a><h4> <span class="mw-headline"> KR2GotCategory </span></h4>
-<p>Ao receber uma chamada, � ajustada pelo Endpoint com a categoria recebida do n�mero que originou a chamada. � ajustada na sinaliza��o R2/MFC, e pode ser consultada em qualquer local do dialplan. 
-</p><p>Exemplo:
-<!-- NEED 3 --> 
-</p>
-<pre>&lt;action application="log" data="DEBUG KR2GotCategory [${KR2GotCategory}]"/&gt; 
-</pre>
-<a name="KR2GotCondition" id="KR2GotCondition"></a><h4> <span class="mw-headline"> KR2GotCondition </span></h4>
-<p>Vari�vel ajustada pelo Endpoint, e dispon�vel ap�s o retorno de uma chamada realizada pelo FreeSWITCH. Cont�m a condi��o de B recebida ao realizar a chamada. Dispon�vel apenas para sinaliza��o R2/MFC. 
-</p><p>Exemplo:
-<!-- NEED 3 --> 
-</p>
-<pre>&lt;action application="log" data="DEBUG KR2GotCondition [${KR2GotCondition}]"/&gt;
-</pre>
-<a name="KUserInfoDescriptor" id="KUserInfoDescriptor"></a><h4> <span class="mw-headline"> KUserInfoDescriptor </span></h4>
-<p>Vari�vel ajustada pelo Endpoint no contexto de entrada, a partir de informa��es recebidas pela rede RDSI atrav�s da funcionalidade User-to-User Information. Cont�m o n�mero do descritor do protocolo utilizado pela outra ponta, e normalmente cont�m valor '0', mas este valor � dependente da aplica��o utilizada. 
-</p><p>Maiores informa��es, consultar a especifica��o ITU-T Q931 (mais precisamente, a tabela 4-26 da especifica��o). 
-</p><p>Exemplo (trabalhando com o n�mero do descritor do protocolo): <!-- NEED 3 --> 
-</p>
-<pre>&lt;action application="log" data="DEBUG KUserInfoDescriptor [${KUserInfoDescriptor}]"/&gt;
-</pre>
-<a name="KUserInfoData" id="KUserInfoData"></a><h4> <span class="mw-headline"> KUserInfoData </span></h4>
-<p>Vari�vel ajustada pelo Endpoint no contexto de entrada, a partir de informa��es recebidas pela rede RDSI atrav�s da funcionalidade User-to-User Information. Cont�m os dados propriamente ditos, que foram recebidos, em forma de uma 'string' de texto. 
-</p><p>Maiores informa��es sobre este recurso, consultar a especifica��o ITU-T Q931. 
-</p><p>Exemplo (trabalhando com os dados recebidos): <!-- NEED 3 --> 
-</p>
-<pre>&lt;action application="log" data="DEBUG KUserInfoData [${KUserInfoData}]"/&gt;
-</pre>
-<p>� importante salientar que as vari�veis s�o sens�veis � capitaliza��o das letras (case sensitive).
-</p>
-<a name="KCallAnswerInfo" id="KCallAnswerInfo"></a><h4> <span class="mw-headline"> KCallAnswerInfo </span></h4>
-<p>Vari�vel ajustada pelo Endpoint em liga��es de sa�da, representando o tipo de atendimento realizado pela outra ponta. Pode conter os seguintes valores:
-</p>
-<dl><dd><ul><li> "MessageBox" (*): detectada caixa postal de um telefone celular;
-</li><li> "CarrierMessage": mensagem de operadora enviada antes do atendimento;
-</li><li> "AnsweringMachine" (**): atendimento por secret�ria eletr�nica;
-</li><li> "HumanAnswer" (**): atendimento humano;
-</li><li> "Unknown": tipo de atendimento desconhecido;
-</li><li> "Fax": reportado quando um tom de fax for detectado.
-</li></ul>
-</dd></dl>
-<p><br />
-(*) Este tipo de atendimento � detectado por sinais em determinadas freq��ncias que s�o enviados antes da chamada entrar em uma caixa postal, e variam conforme a operadora. O algoritmo captura a maior parte das caixas postais, mas pode falhar se n�o existir um sinal claro, ou se o mesmo n�o estiver dentro dos padr�es mais utilizados;
-</p><p>(**) A diferencia��o entre estes dois tipos de atendimento depende de configura��o espec�fica utilizando o programa <b>k3lanswerinfoconfig</b>, sendo a detec��o apenas baseada em heur�sticas e <b>nunca</b> com precis�o de 100%.
-<br />
-</p>
-<a name="Comandos_de_console" id="Comandos_de_console"></a><h1> <span class="mw-headline">Comandos de console </span></h1>
-<p>Lista de comandos dispon�veis no console do FreeSWITCH para o Endpoint da Khomp:
-</p><p><br />
-</p>
-<ul><li> <b>khomp channels disconnect </b>: Desconecta um ou v�rios canais. Este comando envia uma mensagem diretamente para o canal f�sico da placa em quest�o, requisitando a desconex�o. Use com cautela; 
-</li><li> <b>khomp channels unblock </b>: Desbloqueia canais bloqueados para entrada ou para sa�da. Somente dispon�vel em sinaliza��o digital via link E1; 
-</li><li> <b>khomp clear links</b>: Limpa os contadores de erros nos links;
-</li><li> <b>khomp clear statistics</b>: Limpa as estat�sticas de liga��es dos canais, ou as estat�sticas de um canal espec�fico; 
-</li><li> <b>khomp get </b>: Obt�m as op��es diversas do Endpoint da Khomp;
-</li><li> <b>khomp kommuter </b>: Ativa ou desativa os kommuters ligados via USB nesta m�quina. Somente acess�vel quando a configura��o "kommuter-activation" estiver setada como "manual";
-</li><li> <b>khomp kommuter count</b>: Obt�m a quantidade de kommuters ligados via USB nesta m�quina;
-</li><li> <b>khomp log console</b>: Ajusta op��es de logs no console. 
-</li><li> <b>khomp log disk</b>:&nbsp;: Ajusta op��es de log em disco. 
-<ul><li> <b>khomp log console</b> e <b>khomp log disk</b> disp�em de op��es auxiliares <b>no</b>, que inverte a escolha de mensagens, e <b>just</b>, que generaliza a escolha. Exemplos:
-<ul><li> <b>khomp log disk just commands events</b> (Habilita <i>somente</i> o registro de comandos e eventos da API em disco).
-</li><li> <b>khomp log disk no commands</b> (Desabilita o registro em disco de comandos enviados � API).
-</li><li> <b>khomp log disk warnings</b> (Habilita <i>tamb�m</i> o registro em disco dos avisos do Endpoint).
-</li></ul>
-</li><li> Mais informa��es sobre as op��es de <i>log</i> nos comando "<b>help khomp log disk</b>" ou "<b>help khomp log console</b>".
-</li></ul>
-</li><li> <b>khomp log rotate</b>: Rotaciona arquivos de log do Endpoint;
-</li><li> <b>khomp log status</b>: Mostra mensagens de log atualmente sendo escritas em disco e mostradas no console;
-</li><li> <b>khomp log trace isdn</b>: Ativa a depura��o da sinaliza��o RDSI (ISDN);
-</li><li> <b>khomp log trace k3l </b>: Ativa a depura��o de baixo n�vel da API K3L;
-</li><li> <b>khomp log trace r2 </b>: Ativa a depura��o de baixo n�vel da sinaliza��o R2/MFC;
-</li><li> <b>khomp reset links</b>: Envia um comando de reset para um determinado link E1 de uma determinada placa; 
-</li><li> <b>khomp revision</b>: Mostra n�mero da vers�o e revis�o do Endpoint;
-</li><li> <b>khomp select sim</b>: Seleciona o SIM card, dispon�vel nas placas KGSM;
-</li><li> <b>khomp send command </b>: Envia comando da API K3L diretamente para a placa. Apenas para depura��o de problemas, pode compromenter a estabilidade do sistema se utilizado de maneira incorreta;
-</li><li> <b>khomp send raw command </b>: Envia um comando diretamente para o DSP da placa. Apenas para depura��o de problemas, pode compromenter a estabilidade do sistema se utilizado de maneira incorreta;
-</li><li> <b>khomp set </b>: Ajusta op��es diversas do Endpoint da Khomp;
-</li><li> <b>khomp show calls </b>: Mostra estados das chamadas Khomp, podendo listar tamb�m por placa ou canal espec�fico;
-</li><li> <b>khomp show channels </b>: Mostra o estado dos canais Khomp, podendo listar tamb�m por placa espec�fica; 
-</li><li> <b>khomp show links</b>: Mostra estados dos links E1 dispon�veis. 
-</li><li> <b>khomp show statistics </b>: Mostra as estat�sticas de liga��es dos canais, ou as estat�sticas de um canal espec�fico; 
-</li><li> <b>khomp sms </b>: Envia uma mensagem SMS utilizando canais da placa KGSM para um determinado n�mero;
-</li><li> <b>khomp summary </b>:Imprime um sum�rio das placas do sistema e de suas caracter�sticas;
-</li></ul>
-<p><br />
-</p>
-<a name="Recursos_adicionais" id="Recursos_adicionais"></a><h1> <span class="mw-headline">Recursos adicionais </span></h1>
-<p>Este cap�tulo trata de recursos adicionais do Endpoint, relacionados �s funcionalidades especiais presentes em algumas sinaliza��es.
-<br />
-</p>
-<a name="Aplica.C3.A7.C3.B5es_.28applications.29_e_canais" id="Aplica.C3.A7.C3.B5es_.28applications.29_e_canais"></a><h2> <span class="mw-headline">Aplica��es (applications) e canais  </span></h2>
-<p>O Endpoint da Khomp, al�m de registrar um tipo de canal de comunica��o "Khomp", registra tamb�m os seguintes itens: 
-<br />
-</p>
-<a name="Aplica.C3.A7.C3.A3o_.22KUserTransfer.22" id="Aplica.C3.A7.C3.A3o_.22KUserTransfer.22"></a><h3> <span class="mw-headline">Aplica��o "KUserTransfer"  </span></h3>
-<p>Realiza o processo de transfer�ncia do canal atual para o ramal <i>n�mero'</i> utilizando o protocolo de sinaliza��o QSig (Single Step Call Transfer) para placas E1 configuradas com sinaliza��o RDSI (ISDN), ou utiliza comando de FLASH para linhas FXO, LineSide, CAS_EL7 e E1LC.
-</p><p>A sintaxe segue: 
-</p>
-<pre>&lt;action application="KUserTransfer" data="<b>n�mero</b>[,op��es])"/&gt;
-</pre>
-<p>Exemplo: 
-</p>
-<pre>&lt;action application="answer"/&gt;
-&lt;action application="KUserTransfer" data="2345"/&gt;
-</pre>
-<p>Os campos t�m o seguinte significado:
-</p>
-<ul><li><b>n�mero</b>: N�mero para onde a liga��o deve ser transferida.
-</li><li><b>op��es</b>: Define as op��es de transfer�ncia a utilizar, que s�o: 
-<ul><li><b>n</b>: Aguarda at� o canal ser desconectado.
-</li></ul>
-</li></ul>
-<p><br />
-</p><p><br />
-</p>
-<a name="Aplica.C3.A7.C3.A3o_.22KSendSMS.22" id="Aplica.C3.A7.C3.A3o_.22KSendSMS.22"></a><h3> <span class="mw-headline">Aplica��o "KSendSMS"  </span></h3>
-<p>Esta aplica��o tem a fun��o de enviar mensagens SMS atrav�s das placas KGSM da Khomp, utilizando os m�dulos e SIM cards presentes na placa para tal. A sintaxe da aplica��o � a seguinte: 
-</p>
-<pre>&lt;action application="KSendSMS" data="recurso|destino|mensagem" /&gt;
-</pre>
-<p>Podendo cada campo ser resumido em: 
-</p>
-<ul><li><b>recurso</b>: Segue uma sintaxe id�ntica � aloca��o de canais do application Bridge, e define qual modem utilizar; 
-</li><li><b>destino</b>: N�mero para onde enviar a mensagem, podendo ser precedido ou sucedido por <b>!</b> para requisitar uma mensagem de confirma��o de envio; 
-</li><li><b>mensagem</b>: Texto (sem aspas) que deve ser enviado para <b>destino</b>.
-</li></ul>
-<p>Ap�s o envio da mensagem, as vari�veis <b>KSmsDelivered</b> e <b>KSmsErrorCode</b> conter�o o resultado do envio da mensagem. Para maiores informa��es sobre estas, favor consultar a se��o sobre as vari�veis utilizadas no Endpoint.
-</p><p>Exemplos de uso desta aplica��o seguem abaixo: 
-</p>
-<ul><li>Envia "Mensagem de teste." para telefone "99887766" utilizando o modem "1" (segundo modem) da placa "0":
-</li></ul>
-<pre>&lt;action application="log" data="DEBUG Enviando SMS..." /&gt;
-&lt;action application="KSendSMS" data="b0c1|99887766|Mensagem de teste" /&gt;
-</pre>
-<ul><li>Envia "Mensagem de teste." para telefone "99887766" utilizando o primeiro modem livre da placa "0", e verifica retorno do envio:
-</li></ul>
-<pre>&lt;action application="log" data="DEBUG Enviando SMS..." /&gt;
-&lt;action application="KSendSMS" data="b0|99887766|Mensagem de teste" /&gt;
-&lt;action application="log" data="DEBUG Enviou? ${KSmsDelivered}" /&gt;
-&lt;action application="log" data="DEBUG Codigo: ${KSmsErrorCode}" /&gt;
-&lt;action application="log" data="DEBUG Descr.: ${KSmsErrorName}" /&gt;
-</pre>
-<ul><li>Envia "Mensagem de teste." para telefone "99887766" utilizando o primeiro modem livre da placa "0", ou para o primeiro canal livre da placa "1" (se n�o houver canal livre na primeira placa):
-</li></ul>
-<pre>&lt;action application="log" data="DEBUG Enviando SMS..." /&gt;
-&lt;action application="KSendSMS" data="b0+b1|99887766|Mensagem de teste" /&gt;
-</pre>
-<ul><li>Envia "Mensagem de teste." para telefone "99887766" utilizando o primeiro modem livre da placa "0", requisitando confirma��o:
-</li></ul>
-<pre>&lt;action application="log" data="DEBUG Enviando SMS..." /&gt;
-&lt;action application="KSendSMS" data="b0|99887766!|Mensagem de teste" /&gt;
-</pre>
-<p><br />
-</p>
-<a name="Aplica.C3.A7.C3.A3o_.22KEchoCanceller.22" id="Aplica.C3.A7.C3.A3o_.22KEchoCanceller.22"></a><h3> <span class="mw-headline"> Aplica��o "KEchoCanceller"  </span></h3>
-<p>Esta aplica��o tem a fun��o de habilitar ou desabilitar o cancelador de eco do canal.
-</p>
-<pre>&lt;action application="KEchoCanceller" data="<b>a��o</b>[,op��es])"/&gt;
-</pre>
-<p>Onde:
-</p>
-<ul><li><b>a��o</b>: Pode ser <b>on</b> para habilitar o cancelador de eco, e <b>off</b> para desabilitar;
-</li></ul>
-<p>Exemplo de uso desta aplica��o:
-</p>
-<pre>&lt;action application="KEchoCanceller" data="off"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Aplica.C3.A7.C3.A3o_.22KAutoGainControl.22" id="Aplica.C3.A7.C3.A3o_.22KAutoGainControl.22"></a><h3> <span class="mw-headline"> Aplica��o "KAutoGainControl"  </span></h3>
-<p>Esta aplica��o tem a fun��o de habilitar ou desabilitar o controle autom�tico de ganho no canal.
-</p>
-<pre>&lt;action application="KAutoGainControl" data="<b>a��o</b>[,op��es])"/&gt;
-</pre>
-<p>Onde: 
-</p>
-<ul><li><b>a��o</b>: Pode ser <b>on</b> para habilitar o controle autom�tico de ganho, e <b>off</b> para desabilitar;
-</li></ul>
-<p>Exemplo de uso desta aplica��o: 
-</p>
-<pre>&lt;action application="KAutoGainControl" data="on"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Aplica.C3.A7.C3.A3o_.22KDTMFSuppression.22" id="Aplica.C3.A7.C3.A3o_.22KDTMFSuppression.22"></a><h3> <span class="mw-headline"> Aplica��o "KDTMFSuppression"  </span></h3>
-<p>Esta aplica��o tem a fun��o de habilitar ou desabilitar a supress�o de DTMF do canal. A sintaxe da aplica��o � a seguinte: 
-</p>
-<pre>&lt;action applicatin="KDTMFSuppression" value="<b>a��o</b>[,op��es])"/&gt;
-</pre>
-<p>Onde: 
-</p>
-<ul><li><b>a��o</b>: Pode ser <b>on</b> para habilitar a supress�o DTMF, e <b>off</b> para desabilitar;
-</li></ul>
-<p>� importante notar que quando desabilitada a supress�o de DTMF, os DTMFs ser�o passados <i>inband</i> e n�o ser�o mais reportados ao FreeSWITCH. Dessa forma o FreeSWITCH n�o reconhecer� os DTMFs, o que pode ocasionar em mau funcionamento de aplica��es como por exemplo, URAs. 
-</p><p>Exemplo de uso desta aplica��o: 
-</p>
-<pre>&lt;action applicatin="KDTMFSuppression" value="off"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Aplica.C3.A7.C3.A3o_.22KSetVolume.22" id="Aplica.C3.A7.C3.A3o_.22KSetVolume.22"></a><h3> <span class="mw-headline"> Aplica��o "KSetVolume"  </span></h3>
-<p>Esta aplica��o tem a fun��o de ajustar o volume de entrade e sa�da de canais da Khomp, sendo a sua sintaxe a seguinte:
-</p>
-<pre>&lt;action application="KSetVolume" data="&lt;volume&gt;"/&gt;
-&lt;action application="KSetVolume" data="&lt;output-volume&gt;|&lt;input-volume&gt;"/&gt;
-</pre>
-<p>Onde os campos possuem o seguinte significado: 
-</p>
-<ul><li><b>volume</b>: Ajusta o volume de entrada e sa�da (-10 a +10);
-</li><li><b>output-volume</b>: Ajusta o volume de sa�da (-10 a +10, "none" para n�o alterar);
-</li><li><b>input-volume</b>: Ajusta o volume de entrada (-10 a +10, "none" para n�o alterar).
-</li></ul>
-<p><br />
-</p>
-<a name="Aplica.C3.A7.C3.A3o_.22KAdjustForFax.22" id="Aplica.C3.A7.C3.A3o_.22KAdjustForFax.22"></a><h3> <span class="mw-headline"> Aplica��o "KAdjustForFax"  </span></h3>
-<p>Esta aplica��o tem a fun��o de ajustar um canal da Khomp para o recebimento de sinal de FAX/modem, otimizando o canal de comunica��o para o tr�fego de dados. Sintaxe:
-</p>
-<pre>&lt;action application="KAdjustForFax" data=""/&gt;
-</pre>
-<p>Esta aplica��o n�o recebe par�metros. Exemplo de utiliza��o:
-</p>
-<pre>&lt;action application="KAdjustForFax" data=""/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Aplica.C3.A7.C3.A3o_.22KSendFax.22" id="Aplica.C3.A7.C3.A3o_.22KSendFax.22"></a><h3> <span class="mw-headline"> Aplica��o "KSendFax"  </span></h3>
-<p>Esta aplica��o tem a fun��o de enviar fax utilizando canais digitais ou FXO da Khomp em liga��es pr�-estabelecidas, sendo a sua sintaxe a seguinte:
-</p>
-<pre>&lt;action application="KSendFax" data="&lt;arquivo&gt;[:&lt;arquivo2&gt;[:...]][|&lt;faxid&gt;]"/&gt;
-</pre>
-<p><strong>Esta aplica��o necessita de uma licen�a adquirida � parte para ser utilizada em canais digitais</strong>. Os campos possuem os seguintes significados: 
-</p>
-<ul><li><b>arquivos</b>: Arquivos a serem enviados para o fax devem estar encapsulados no formato TIFF e possu�rem resolu��o de 98, 196 ou 392 dpi;
-</li><li><b>faxid</b>: N�mero do fax. Caso n�o seja especificado, o valor ser� obtido pela id da liga��o, e caso esta, tamb�m n�o seja v�lida, o n�mero do fax ser� o configurado como padr�o na K3L.
-</li></ul>
-<p>Exemplo de uso desta aplica��o: 
-</p>
-<pre>&lt;action application="KSendFax" data="/tmp/fax.tif:/home/root/fax2.tif,1234"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Aplica.C3.A7.C3.A3o_.22KReceiveFax.22" id="Aplica.C3.A7.C3.A3o_.22KReceiveFax.22"></a><h3> <span class="mw-headline"> Aplica��o "KReceiveFax"  </span></h3>
-<p>Esta aplica��o tem a fun��o de receber fax utilizando canais digitais ou FXO da Khomp, sendo a sua sintaxe a seguinte:
-</p>
-<pre>&lt;action application="KReceiveFax" data="&lt;arquivo&gt;[|&lt;faxid&gt;]/&gt;
-</pre>
-<p><strong>Esta aplica��o necessita de uma licen�a adquirida � parte para ser utilizada em canais digitais</strong>. Os campos possuem os seguintes significados:
-</p>
-<ul><li><b>arquivo</b>: Nome que ser� atribu�do ao arquivo de fax recebido.
-</li><li><b>faxid</b>: N�mero do fax. Caso n�o seja especificado, o valor ser� obtido pela id da liga��o, e caso esta, tamb�m n�o seja v�lida, o n�mero do fax ser� o configurado como padr�o na K3L.
-</li></ul>
-<p>Exemplo de uso desta aplica��o: 
-</p>
-<pre>&lt;action application="answer" /&gt;
-&lt;action application="KReceiveFax" data="/tmp/fax.tif"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Canal_.22Khomp_SMS.22" id="Canal_.22Khomp_SMS.22"></a><h3> <span class="mw-headline"> Canal "Khomp_SMS"  </span></h3>
-<p>Este canal de comunica��o � utilizado para receber mensagens SMS e criar liga��es entrantes no FreeSWITCH para cada mensagem recebida. Este canal n�o possui qualquer tipo de tratamento ou processamento de �udio, e � chamado com cinco vari�veis ajustadas: 
-</p>
-<ul><li><b>KSmsFrom</b>, contendo o n�mero de origem de quem enviou a mensagem; 
-</li><li><b>KSmsDate</b>, que define a data/hora do recebimento da mensagem; 
-</li><li><b>KSmsSize</b>, representando o tamanho da mensagem (em bytes); 
-</li><li><b>KSmsMode</b>, contendo a codifica��o utilizada para transmitir a mensagem; 
-</li><li><b>KSmsBody</b>, que � a mensagem em si.
-</li></ul>
-<p>O processamento do dialplan do FreeSWITCH pode ser utilizado para guardar esta mensagem em um banco de dados, executar alguma aplica��o, entre outros. Entretanto, a �nica a��o aceita por este channel � desligamento (hangup) - ou seja, esta liga��o entrante n�o pode ser considerada uma liga��o comum.
-<br />
-</p>
-<a name="Canal_.22Khomp_PR.22" id="Canal_.22Khomp_PR.22"></a><h3> <span class="mw-headline"> Canal "Khomp_PR"  </span></h3>
-<p>Este canal de comunica��o � utilizado para receber liga��es em placas de grava��o passiva (fam�lia <b>KPR</b> e <b>KFXO-HI</b>), criando liga��es entrantes no FreeSWITCH para cada chamada recebida. Este canal permite apenas o recebimento de �udio capturado do <i>link</i>, n�o permitindo tanto o envio de mensagens de �udio quanto o de sinaliza��es de controle.
-</p><p>O processamento do dialplan do FreeSWITCH pode ser utilizado para gravar dados sobre esta liga��o em um banco de dados, executar alguma aplica��o especial e/ou algum <i>application</i> de grava��o (como o <b>record</b>), entre outros. Entretanto, a �nica a��o aceita por este channel � desligamento (hangup) - ou seja, esta liga��o entrante n�o pode ser considerada uma liga��o comum.
-<br />
-</p><p><br />
-</p>
-<a name="C.C3.B3digos_e_significados" id="C.C3.B3digos_e_significados"></a><h1> <span class="mw-headline">C�digos e significados </span></h1>
-<p>Este cap�tulo apresenta os c�digos presentes no Endpoint da Khomp e seus significados, utilizados nos comandos de console:
-<br />
-</p>
-<a name="Estados_de_canais" id="Estados_de_canais"></a><h2> <span class="mw-headline">Estados de canais </span></h2>
-<p>Refletem o estado do canal relativo � placa. No caso de links E1, o estado pode ter uma ou mais das seguintes op��es:
-</p>
-<ul><li> <b>Free</b>: o canal est� livre;
-</li><li> <b>Busy</b>: o canal n�o est� livre (ou ocupado, ou em falha);
-</li><li> <b>Outgoing</b>: o canal possui uma liga��o de sa�da;
-</li><li> <b>Incoming</b>: o canal possui uma liga��o de entrada;
-</li><li> <b>Locked</b>: o canal est� bloqueado;
-</li><li> <b>Outgoing Lock</b>: o canal est� bloqueado para chamadas saintes;
-</li><li> <b>Local Fail</b>: o canal possui uma falha local (nesta ponta);
-</li><li> <b>Incoming Lock</b>: o canal est� bloqueado para chamadas entrantes;
-</li><li> <b>Remote Lock</b>: h� um bloqueio remoto (na outra ponta) neste canal.
-</li></ul>
-<p>No caso de um canal FXS, o estado � definido por um destes valores:
-</p>
-<ul><li> <b>On Hook</b>: o telefone conectado neste canal est� no gancho ou desconectado;
-</li><li> <b>Off Hook</b>: o telefone conectado neste canal est� fora do gancho;
-</li><li> <b>Ringing</b>: o canal est� sendo chamado;
-</li><li> <b>Failure</b>: o canal est� em falha devido a problemas de comunica��o entre a central e a placa.
-</li></ul>
-<p>No caso de um canal GSM, o estado tamb�m � definido por um dos valores a seguir:
-</p>
-<ul><li> <b>Idle</b>: o canal est� livre e dispon�vel para realizar chamadas;
-</li><li> <b>Call In Progress</b>: o canal est� ocupado em uma liga��o;
-</li><li> <b>Modem Error</b>: ocorreu um erro na comunica��o com o modem do canal;
-</li><li> <b>SIM Card Error</b>: o SIM card n�o est� presente ou n�o foi inserido/detectado corretamente;
-</li><li> <b>Network Error</b>: ocorreu um erro ao comunicar-se com a rede;
-</li><li> <b>Not Ready</b>: o modem est� sendo inicializado no canal.
-</li></ul>
-<p>E no caso de um canal FXO, os estados ser�o os seguintes:
-</p>
-<ul><li> <b>Disabled</b>: o canal est� desabilitado;
-</li><li> <b>Enabled</b>: o canal est� habilitado.
-</li></ul>
-<p><br />
-</p>
-<a name="Estados_de_chamada" id="Estados_de_chamada"></a><h2> <span class="mw-headline"> Estados de chamada </span></h2>
-<p>Define o estado de cada canal relativo ao software, que pode ser::
-</p>
-<ul><li><b>Free</b>: o canal est� livre;
-</li><li><b>Incoming</b>: o canal est� recebendo uma chamada;
-</li><li><b>Outgoing</b>: o canal est� realizando uma chamada;
-</li><li><b>Failure</b>: o canal est� em falha.
-</li></ul>
-<p><br />
-</p>
-<a name="Estados_da_chamada_FreeSWITCH" id="Estados_da_chamada_FreeSWITCH"></a><h2> <span class="mw-headline"> Estados da chamada FreeSWITCH </span></h2>
-<p>Reflete diretamente o estado de chamada controlado pelo FreeSWITCH, que pode se
-</p>
-<ul><li> <b>new</b>: Canal � rec�m criado;
-</li><li> <b>init</b>: Canal foi inicializado;
-</li><li> <b>routing</b>: Canal est� procurando uma extens�o para executar;
-</li><li> <b>execute</b>: Canal est� executando seu dialplan;
-</li><li> <b>ex_media</b>: Canal est� trocando media com outro canal;
-</li><li> <b>cs_media</b>: Canal est� consumindo toda media;
-</li><li> <b>hangup</b>: O canal est� marcada para hangup e pronto para terminar.
-</li></ul>
-<p><br />
-</p>
-<a name="C.C3.B3digos_GSM" id="C.C3.B3digos_GSM"></a><h2> <span class="mw-headline"> C�digos GSM </span></h2>
-<p>Os seguintes c�digos num�ricos s�o reportados:
-</p>
-<a name="C.C3.B3digos_de_SMS_.28SMS_cause.29" id="C.C3.B3digos_de_SMS_.28SMS_cause.29"></a><h3> <span class="mw-headline"> C�digos de SMS (<i>SMS cause</i>) </span></h3>
-<pre>1	Unassigned number
-8	Operator determined barring
-10	Call barred
-21	SMS transfer rejected
-27	Destination out of service
-28	Unidentified subscriber
-29	Facility rejected
-30	Unknown subscriber
-38	Network out of order
-41	Temporary failure
-42	Congestion
-47	Resources unavailable
-50	Facility not subscribed
-69	Facility not implemented
-81	Invalid SMS transfer reference value
-95	Invalid message
-96	Invalid mandatory information
-97	Message type non existent
-98	Message not compatible with SMS protection state
-99	Information element non existent
-111	Protocol error
-127	Interworking
-128	Telematic interworking not supported
-129	SMS type zero not supported
-130	Cannot replace SMS
-143	Unspecified TPPID error
-144	Alphabet not supported
-145	Message class not supported
-159	Unspecified TPDCS error
-160	Command cannot be actioned
-161	Command unsupported
-175	Unspecified TP command error
-176	TPDU not supported
-192	SC busy
-193	No SC subscription
-194	SC system failure
-195	Invalid SME address
-196	Destination SME barred
-197	SM rejected duplicate SM
-198	TPVPF not supported
-199	TPVP not supported
-208	SIM SMS storage full
-209	No SMS storage capability in SIM
-210	Error in SMS
-211	Memory capatity exceeded
-213	SIM data download error
-255	Unspecified error
-300	Phone failure
-301	SMS service reserved
-302	Operation not allowed
-303	Operation not supported
-304	Invalid PDU mode parameter
-305	Invalid text mode parameter
-310	SIM not inserted
-311	SIM PIN necessary
-312	Phone SIM PIN necessary
-313	SIM failure
-314	SIM busy
-315	SIM wrong
-320	Memory failure
-321	Invalid memory index
-322	Memory full
-330	SMSC address unknown
-331	No network service
-332	Network timeout
-500	Unknown error
-512	Network busy
-513	Invalid destination address
-514	Invalid message body length
-515	Phone is not in service
-516	Invalid preferred memory storage
-517	User terminated
-</pre>
-<a name="C.C3.B3digos_de_chamada_.28call_cause.29" id="C.C3.B3digos_de_chamada_.28call_cause.29"></a><h3> <span class="mw-headline"> C�digos de chamada (<i>call cause</i>) </span></h3>
-<pre>1	Unallocated number
-3	No route to destination
-6	Channel unacceptable
-8	Operator determined barring
-16	Normal call clear
-17	User busy
-18	No user responding
-19	No answer from user
-21	Call rejected
-22	Number changed
-26	Non Selected user clear
-27	Destination out of order
-28	Invalid number format
-29	Facility rejected
-30	Response status enquiry
-31	Normal, unspecified
-34	No circuit channel available
-38	Network out of order
-41	Temporary failure
-42	Switch congestion
-43	Access information discarded
-44	Requested channel unavailable
-47	Resource unavailable
-49	QoS unavailable
-50	Request facility not subscribed
-55	Call barred with UG
-57	Bearer capability not authorized
-58	Bearer capability not available
-63	Service not available
-65	Bearer capability not implemented
-69	Request facility not implemented
-70	Only restricted bearer capability available
-79	Service not implemented
-81	Invalid call reference value
-82	User not member of UG
-88	Incompatible destination
-91	Invalid transit network selected
-95	Invalid message
-96	Missing mandatory information element
-97	Message type not implemented
-98	Message incompatible with state
-99	Information element not implemented
-100	Invalid information element
-101	Message incompatible with state (2)
-102	Recovery on timer expiry
-111	Protocol error
-127	Interworking
-</pre>
-<a name="C.C3.B3digos_gerais_.28mobile_cause.29" id="C.C3.B3digos_gerais_.28mobile_cause.29"></a><h3> <span class="mw-headline"> C�digos gerais (<i>mobile cause</i>) </span></h3>
-<pre>0	Phone failure
-1	No connection to phone
-2	Phone adaptor link reserved
-3	Operation not allowed
-4	Operation not supported
-5	Phone SIM PIN required
-6	Phone FSIM PIN required
-7	Phone FSIM PUK required
-10	SIM not inserted
-11	SIM PIN required
-12	SIM PUK required
-13	SIM failure
-14	SIM busy
-15	SIM wrong
-16	Incorrect password
-17	SIM PIN2 required
-18	SIM PUK2 required
-20	Memory full
-21	Invalid index
-22	Not found
-23	Memory failure
-24	Text string too long
-25	Invalid character in text string
-26	Dial string too long
-27	Invalid character in dial string
-30	No network service
-31	Network timeout
-32	Network not allowed
-33	Command aborted
-34	Number parameter instead of text parameter
-35	Text parameter instead of number parameter
-36	Numeric parameter out of bounds
-37	Text string too short
-40	Network PIN required
-41	Network PUK required
-42	Network subset PIN required
-43	Network subset PUK required
-44	Network service provider PIN required
-45	Network service provider PUK required
-46	Corporate PIN required
-47	Corporate PUK required
-60	SIM Service option not supported
-100	Unknown
-103	Illegal MS #3
-106	Illegal MS #6
-107	GPRS service not allowed #7
-111	PLMN not allowed #11
-112	Location area not allowed #12
-113	Roaming not allowed #13
-132	Service option not supported #32
-133	Registration service option not subscribed #33
-134	Service option temporary out of order #34
-147	Long context activation
-148	Unspecified GPRS error
-149	PDP authentication failure
-150	Invalid mobile class
-151	GPRS disconnection TMR active
-256	Too many active calls
-257	Call rejected
-258	Unanswered call pending
-259	Unknown calling error
-260	No phone number recognized
-261	Call state not idle
-262	Call in progress
-263	Dial state error
-264	Unlock code required
-265	Network busy
-266	Invalid phone number
-267	Number entry already started
-268	Cancelled by user
-269	Number entry could not be started
-280	Data lost
-281	Invalid message body length
-282	Inactive socket
-283	Socket already open
-</pre>
-<p><br />
-</p>
-<a name="Solu.C3.A7.C3.A3o_de_problemas" id="Solu.C3.A7.C3.A3o_de_problemas"></a><h1> <span class="mw-headline"> Solu��o de problemas </span></h1>
-<p>Nesta se��o, erros e suas solu��es mais comuns s�o apresentados.
-</p>
-<a name="Erro_durante_a_instala.C3.A7.C3.A3o_do_m.C3.B3dulo_de_kernel" id="Erro_durante_a_instala.C3.A7.C3.A3o_do_m.C3.B3dulo_de_kernel"></a><h2> <span class="mw-headline"> Erro durante a instala��o do m�dulo de kernel </span></h2>
-<p>Durante a instala��o do <i>Endpoint</i> da Khomp, podem ocorrer as seguintes mensagens:
-<!-- NEED 3 --> 
-</p>
-<pre>K3L: WARNING: Unable to find a module for [...]
-</pre>
-<p>ou
-<!-- NEED 8 --> 
-</p>
-<pre>install: ******  THE KERNEL MODULE HAS NOT BEEN INSTALLED: *******
-install: 
-install: ** Please, untar the file kpdriver*.tar.gz located in: **
-install: **                 '/usr/src/khomp/'                   **
-install: **             then check the README.txt               **
-install: **  for knowing how to proceed with the installation.  **
-</pre>
-<p>Neste caso, ser� necess�rio compilar os <i>drivers</i> manualmente para o seu sistema. Prossiga para o item abaixo para maiores informa��es.
-<br />
-</p>
-<a name="Compilandos_os_drivers_e_iniciando_os_servi.C3.A7os" id="Compilandos_os_drivers_e_iniciando_os_servi.C3.A7os"></a><h3> <span class="mw-headline">Compilandos os <i>drivers</i> e iniciando os servi�os </span></h3>
-<p>Basta seguir ao diret�rio <b>/usr/src/khomp</b>, descompactar o arquivo "kpdriver_2.0.0<b>XX</b>.tar.gz", e acompanhar procedimentos descritos no arquivo <b>README.txt</b>.
-</p><p>Ap�s realizar a compila��o e a instala��o do m�dulo, basta carreg�-lo no sistema, configurar as placas, e iniciar o servidor de processos da Khomp. 
-</p><p>Para carregar o driver de kernel, � necess�rio executar o seguinte comando:
-<!-- NEED 3 --> 
-</p>
-<pre># /etc/init.d/khompdrv start
-</pre>
-<p>Para configurar as placas, por sua vez,  necess�rio executar o comando:
-<!-- NEED 3 --> 
-</p>
-<pre># khompwizard
-</pre>
-<p>Isto executar� um assistente de configura��o, que ir� perguntar a sinaliza��o utilizada no sistema, bem como outros par�metros de utiliza��o das placas.
-</p><p>Caso seja necess�rio configurar outros par�metros adicionais, pode-se utilizar o seguinte comando:
-<!-- NEED 3 --> 
-</p>
-<pre># k3lconfig
-</pre>
-<p>Este configurador, por sua vez, mostra todas as op��es poss�veis de configura��o da placa. Os par�metros que n�o forem configurados assumem os valores padr�o automaticamente, e s�o compat�veis com a maior parte dos sistemas. Maiores detalhes sobre este programa podem ser obtidos na se��o de n�mero '2'. 
-</p><p><br />
-</p>
-<ul><li> <b>IMPORTANTE</b>: Para o FreeSWITCH iniciar, � preciso que a placa da khomp esteja configurada e todos m�dulos estejam rodando (conforme mostrado acima). <br /><br />Se voc� deseja rodar o sistema sem a placa da Khomp, � preciso configurar o FreeSWITCH para ele n�o carregar o m�dulo da Khomp. Para isso, abra o arquivo <b>/usr/local/freeswitch/conf/autoload_configs/modules.conf.xml</b>, e comente a linha que carrega o m�dulo:<br />
-</li></ul>
-<pre>
-  &lt;!-- &lt;load module=&quot;mod_khomp&quot; /&gt; --&gt;
-</pre><br />
-<p>Quando a placa da Khomp estiver devidamente configurada e os m�dulos da khomp carregados (explicado acima), lembre-se de descomentar esta linha no arquivo.
-</p><p><br />
-Por fim, para carregar o servidor de processos, basta executar o seguinte comando:
-<!-- NEED 3 --> 
-</p>
-<pre># kserver start
-</pre>
-<p>Ap�s realizar estes procedimentos, o Endpoint j� estar� operacional, e o FreeSWITCH j� pode ser carregado.
-<br />
-</p>
-<a name="Configurando_par.C3.A2metros_especiais_de_sinaliza.C3.A7.C3.A3o_ou_.C3.A1udio" id="Configurando_par.C3.A2metros_especiais_de_sinaliza.C3.A7.C3.A3o_ou_.C3.A1udio"></a><h2> <span class="mw-headline">Configurando par�metros especiais de sinaliza��o ou �udio </span></h2>
-<p>Para configurar par�metros especiais de sincronismo e/ou sinaliza��o, � poss�vel utilizar o programa "k3lconfig": basta selecionar a placa desejada, e as op��es das placas ser�o apresentadas, divididas em se��es e subse��es para facilitar o acesso. N�o � necess�rio efetuar a configura��o de todos os par�metros: os valores padr�o s�o assumidos, caso n�o sejam configurados.
-</p><p>Para ajustar a sinaliza��o do link, basta - depois de selecionar a placa - entrar na se��o "Op��es de sinaliza��o", e em seguida, em "Sinaliza��o da linha". Para escolher uma sinaliza��o espec�fica, basta utilizar as teclas de direcionamento (setas) at� selecion�-la, pressionar 'espa�o', e confirmar a op��o pressionando 'Enter' sobre o bot�o "Confirmar".
-</p><p>Por fim, para salvar as configura��es modificadas, basta sair do programa: ele ir� mostrar uma janela, com op��es para salvar ou n�o as altera��es realizadas.
-</p><p>� importante notar que <b>n�o � necess�rio alterar/ativar as seguintes op��es</b>:
-</p>
-<ul><li> Cancelamento de eco autom�tico;
-</li><li> Supress�o de DTMFs autom�tica;
-</li><li> Controle de ganho (AGC) autom�tico.
-</li></ul>
-<p>Estas op��es <b>s�o controladas pelo Endpoint</b>, e devem estar <b>desabilitadas</b> no 'k3lconfig'.
-<br />
-</p>
-<a name="Inicializa.C3.A7.C3.A3o_autom.C3.A1tica_dos_servi.C3.A7os_e_m.C3.B3dulos_de_kernel" id="Inicializa.C3.A7.C3.A3o_autom.C3.A1tica_dos_servi.C3.A7os_e_m.C3.B3dulos_de_kernel"></a><h2> <span class="mw-headline">Inicializa��o autom�tica dos servi�os e m�dulos de <i>kernel</i> </span></h2>
-<p>Se a carga dos m�dulos de <i>kernel</i> ou a inicializa��o dos servi�os da Khomp n�o for realizada automaticamente na inicializa��o do sistema, � poss�vel realizar esta instala��o manualmente, criando um <i>link</i> para os <i>scripts</i> <b>/etc/init.d/khompdrv</b> e <b>/etc/init.d/kserver</b> no diret�rio de inicializa��o do sistema.
-</p><p>Na caso da distribui��o <b>Debian</b>, o <i>script</i> de carga dos m�dulos de <i>kernel</i> seria <i>linkado</i> dentro do diret�rio <i>/etc/rcS.d/</i>, enquanto o <i>script</i> de inicializa��o dos servi�os seria <i>linkado</i> dentro dos diret�rios <i>/etc/rc2.d</i>, <i>/etc/rc3.d</i>, <i>/etc/rc4.d</i>, <i>/etc/rc5.d</i>, da seguinte forma:
-</p><p><!-- NEED 6 -->
-</p>
-<pre># ln -s /etc/init.d/khompdrv  /etc/rcS.d/S19khompdrv
-# ln -s /etc/init.d/kserver   /etc/rc2.d/S20kserver
-# ln -s /etc/init.d/kserver   /etc/rc3.d/S20kserver
-# ln -s /etc/init.d/kserver   /etc/rc4.d/S20kserver
-# ln -s /etc/init.d/kserver   /etc/rc5.d/S20kserver
-</pre>
-<p>� interessante verificar as normas da sua distribui��o para inicializar os servi�os de acordo com o que � esperado pela inicializa��o da mesma.
-<br />
-</p>
-<a name="Ap.C3.AAndice" id="Ap.C3.AAndice"></a><h1> <span class="mw-headline"> Ap�ndice </span></h1>
-<p>Nesta se��o, encontram-se informa��es �teis sobre o Endpoint e componentes relacionados.
-</p>
-<a name="Disposi.C3.A7.C3.A3o_dos_arquivos" id="Disposi.C3.A7.C3.A3o_dos_arquivos"></a><h2> <span class="mw-headline"> Disposi��o dos arquivos </span></h2>
-<p>Os diret�rios criados/modificados nesta instala��o s�o:
-<!-- NEED 20 -->
-</p>
-<pre>/etc/init.d/                -- Scripts de inicializa��o;
-
-/etc/khomp/                 -- Arquivos de firmware e configura��es;
-
-/usr/local/freeswitch/conf/ -- Configura��es do FreeSWITCH e Endpoint;
-
-/usr/doc/khomp/             -- Documenta��o das placas, do mod_khomp e dos utilit�rios;
-
-/usr/sbin/                  -- Utilit�rios e servidor de processos;
-
-/usr/lib/                   -- Bibliotecas compartilhadas da K3L;
-
-/usr/local/freeswitch/mod/  -- M�dulo 'mod_khomp.so';
- 
-/var/log/khomp2.1/          -- Diret�rio de logs da K3L e Endpoint
-</pre>
-<p><br />
-O <i>script</i> <b>/etc/init.d/khompdrv</b> � respons�vel por carregar os m�dulos <i>kpci9030.ko</i> e <i>kpex8311.ko</i> no <i>kernel</i>, que deve ser realizada automaticamente na inicializa��o do sistema. Em caso de problemas, verifique a se��o <a href="#Solu.C3.A7.C3.A3o_de_problemas" title="">Solu��o de problemas</a>.
-<br />
-</p><p><br />
-Para mais detalhes: <a href="http://www.khomp.com.br" class="external free" title="http://www.khomp.com.br" rel="nofollow">http://www.khomp.com.br</a>
-</p><p><br />
-</p></body></html>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/docs/Manual.pdf b/src/mod/endpoints/mod_khomp/docs/Manual.pdf
deleted file mode 100644
index ff57814824..0000000000
Binary files a/src/mod/endpoints/mod_khomp/docs/Manual.pdf and /dev/null differ
diff --git a/src/mod/endpoints/mod_khomp/docs/README.html b/src/mod/endpoints/mod_khomp/docs/README.html
deleted file mode 100644
index c9756b36a2..0000000000
--- a/src/mod/endpoints/mod_khomp/docs/README.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Mod Khomp: README</title></head><body><a name="Guia_R.C3.A1pido" id="Guia_R.C3.A1pido"></a><h1> <span class="mw-headline"> Guia R�pido  </span></h1>
-<p>Depois de instalar a placa no sistema, e executar o programa de instala��o pela primeira vez, os <i>drivers</i> e servi�os da Khomp ser�o adicionados na inicializa��o do sistema, e automaticamente carregados.
-</p><p>Se o sistema possuir pelo menos uma placa de tronco E1 e/ou uma placa FXO, uma tela de configura��o b�sica dever� ser apresentada ao final do processo, questionando par�metros de sinaliza��o - no caso de existirem placas E1 - e/ou realizando o ajuste de cad�ncias - no caso de existirem placas FXO.
-</p><p>Se todas estas etapas foram executadas com sucesso, prossiga para o item <b>Utilizando o <i>Endpoint</i> da Khomp</b>. Caso algum problema ocorra, consulte o <a href=".htmlMod_Khomp/Manual" title="Mod Khomp/Manual">Manual do Endpoint</a>, seguindo para a se��o de <a href=".htmlMod_Khomp/Manual#Solu.C3.A7.C3.A3o_de_problemas" title="Mod Khomp/Manual">Solu��o de problemas</a>.
-</p>
-<a name="Utilizando_o_Endpoint_da_Khomp" id="Utilizando_o_Endpoint_da_Khomp"></a><h1> <span class="mw-headline"> Utilizando o <i>Endpoint</i> da Khomp </span></h1>
-<p>Ap�s a instala��o e inicializa��o dos servi�os necess�rios pela Khomp, o FreeSWITCH j� pode ser carregado ou inicializado.
-</p>
-<ul><li> <b>AVISO</b>: Evite usar a op��o <b>-nort</b>, pois ela desabilita escalonamento em tempo real, � imprescind�vel que o <b>FreeSWITCH</b> esteja utilizando o escalonamento em tempo real, especialmente se este estiver sendo executado lado-a-lado com servidores <i>web</i> ou servidores de banco de dados. Utilizar a op��o <b>-nort</b> pode resultar em perda de qualidade do �udio, gerando um s�rio comprometimento nas liga��es do sistema.
-</li></ul>
-<p>Ap�s a inicializa��o do FreeSWITCH, pode-se verificar se o m�dulo da Khomp foi carregado atrav�s do seguinte comando:<br /> 
-</p>
-<pre> freeswitch@hostname&gt; module_exists mod_khomp
-</pre>
-<p>A pr�xima linha dever� responder algo tipo:
-</p>
-<pre> true
-</pre>
-<p>Para verificar se o FreeSWITCH reconheceu todas as placas, digite: 
-</p>
-<pre> freeswitch@hostname&gt; khomp summary
-</pre>
-<p>A sa�da desse comando mostrar� detalhes de todas placas reconhecidas.
-</p><p>No caso de uma placa de tronco E1, pode-se verificar o estado dos links com o seguinte comando:
-</p>
-<pre> freeswitch@hostname&gt; khomp show links
-</pre>
-<p>O estado dos canais individuais, por sua vez, pode ser aferido com o comando:
-</p>
-<pre> freeswitch@hostname&gt; khomp show channels
-</pre>
-<p>Para mais detalhes sobre os comandos do Endpoint da khomp digite no console do FreeSWITCH: 
-</p>
-<pre> freeswitch@hostname&gt; help khomp
-</pre>
-<ul><li> <b>IMPORTANTE</b>: Para fazer completo uso da sua placa Khomp, ser� preciso configurar suas regras de discagem, seja atrav�s do arquivo <i>default.xml</i> ou de um aplicativo externo, definindo regras espec�ficas para realizar ao receber liga��es.<br /><br />No <a href=".htmlMod_Khomp/Manual" title="Mod Khomp/Manual">Manual do Endpoint</a>, podem ser encontradas informa��es sobre o formato dos contextos de entrada (respons�veis por receber as liga��es) e sobre as op��es dispon�veis no application Bridge (respons�vel por realizar liga��es) que podem ser utilizadas com o Endpoint da Khomp, al�m de outras funcionalidades especiais providas pelo mesmo.
-</li></ul>
-<p><br />
-</p></body></html>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/docs/README.pdf b/src/mod/endpoints/mod_khomp/docs/README.pdf
deleted file mode 100644
index 304f6e0dd3..0000000000
Binary files a/src/mod/endpoints/mod_khomp/docs/README.pdf and /dev/null differ
diff --git a/src/mod/endpoints/mod_khomp/docs/README_en.html b/src/mod/endpoints/mod_khomp/docs/README_en.html
deleted file mode 100644
index c72b84270c..0000000000
--- a/src/mod/endpoints/mod_khomp/docs/README_en.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Mod Khomp: README: en</title></head><body><a name="Quick_guide" id="Quick_guide"></a><h1> <span class="mw-headline"> Quick guide </span></h1>
-<p>After installing the card in the system and run the installation program for the first time, the <i>drivers</i> and Khomp services will be added at system startup, and automatically loaded.
-</p><p>If your system has at least one E1 trunk card and / or an FXO card, a basic setup screen will be presented at the end of the process, questioning signaling parameters - if there are signs E1 - and/or performing the adjustment cadences - where that FXO cards.
-</p><p>If all these steps were performed successfully, proceed to the item <b>Using Khomp Endpoint</b>. If a problem occurs, see the <a href=".htmlMod_Khomp/User_Guide" title="Mod Khomp/User Guide">User Guide</a>, in the section <a href=".htmlMod_Khomp/User_Guide#Troubleshooting" title="Mod Khomp/User Guide">Troubleshooting</a>.
-</p>
-<a name="Using_the_Khomp_Endpoint" id="Using_the_Khomp_Endpoint"></a><h1> <span class="mw-headline"> Using the Khomp Endpoint </span></h1>
-<p>After installation and startup services required by Khomp, FreeSWITCH can now be loaded or initialized.
-</p>
-<ul><li><b>WARNING</b>: Avoid using the <b>-nort</b>, as it disables real-time scheduling, it is essential that the <b>FreeSwitch</b> are using real-time scheduling, especially if it is running side-by-side with <i>web</i> servers or database . Use the <b>-nort</b> may result in loss of audio quality, causing a serious commitment on the progress of system connections.
-</li></ul>
-<p>After initialization of FreeSWITCH, you can verify that the module was loaded Khomp through the following command: <br />
-</p>
-<pre> freeswitch@hostname&gt; module_exists mod_khomp
-</pre>
-<p>The next line should answer something like:
-</p>
-<pre> true
-</pre>
-<p>To verify that the FreeSwitch recognize all the cards, type:
-</p>
-<pre> freeswitch@hostname&gt; khomp summary
-</pre>
-<p>The output of this command will show details of all cards accepted.
-</p><p>In the case of an E1 card, you can check the status of links with the following command:
-</p>
-<pre> freeswitch@hostname&gt; khomp show links
-</pre>
-<p>The state of individual channels, in turn, can be measured with the command:
-</p>
-<pre> freeswitch@hostname&gt; khomp show channels
-</pre>
-<p>For more details on the commands of the Endpoint khomp type in the console of FreeSWITCH:
-</p>
-<pre> freeswitch@hostname&gt; help khomp
-</pre>
-<ul><li><b>IMPORTANT</b>: To make full use of your card Khomp, you must configure your dialing rules, either through the extension.conf or from an external application by setting specific rules for conduct by receiving connections. <br /> In the <a href=".htmlMod_Khomp/User_Guide" title="Mod Khomp/User Guide">User Guide</a>, information can be found on the format of input contexts (responsible for receiving calls) and on the options available on application Dial (responsible for make calls) that can be used with the Endpoint Khomp, and other special features provided by it.
-</li></ul>
-<p><br />
-</p></body></html>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/docs/README_en.pdf b/src/mod/endpoints/mod_khomp/docs/README_en.pdf
deleted file mode 100644
index 8931da9147..0000000000
Binary files a/src/mod/endpoints/mod_khomp/docs/README_en.pdf and /dev/null differ
diff --git a/src/mod/endpoints/mod_khomp/docs/User_Guide.html b/src/mod/endpoints/mod_khomp/docs/User_Guide.html
deleted file mode 100644
index 4a1932a1ab..0000000000
--- a/src/mod/endpoints/mod_khomp/docs/User_Guide.html
+++ /dev/null
@@ -1,1093 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Mod Khomp: User Guide</title></head><body>
-<a name="First_considerations" id="First_considerations"></a><h1> <span class="mw-headline"> First considerations </span></h1>
-<p>This document covers information about the <i>Endpoint</i> of Khomp as a whole, include the options, <i>applications</i>, <b>CLI</b> commands, among others.
-</p><p>For first installation procedures, please see the <a href=".htmlMod_Khomp/README/en" title="Mod Khomp/README/en">README</a>.
-<br />
-</p>
-<a name="Configuration" id="Configuration"></a><h1> <span class="mw-headline"> Configuration </span></h1>
-<p>Configuring the Khomp Endpoint is a task that consists of three steps:
-</p>
-<ul><li> Configuration of the boards through the K3L;
-</li><li> Setting up the Endpoint;
-</li><li> Setting up the FreeSWITCH.
-</li></ul>
-<p>These steps are described more fully below.
-<br />
-</p>
-<a name="K3L_API_Configuration" id="K3L_API_Configuration"></a><h2> <span class="mw-headline"> K3L API Configuration </span></h2>
-<p>This step is carried out in a semi-automated way using the <b>khompwizard</b> program, a wizard that configures the basic parameters of the system boards. This wizard initializes the configuration files using information from the user when they are needed, initializing the standard settings to default values.
-</p><p>Typically, this program runs automatically after installation of the system. However, you may need to run it manually if an update is being performed, or if new cards were added to the system after installing new drivers.
-</p><p><br />
-If you need to set advanced parameters of the board and/or signaling, the program <b>k3lconfig</b> allows you to access all the available settings for each installed card. For more information about this program, check the <b><a href="http://169.254.1.3/kdevwiki/wikidocs/index.php?title=K3lconfig_-_User%27s_Guide&amp;action=edit&amp;redlink=1" class="new" title="K3lconfig - User&#39;s Guide (p�gina n�o existe)">k3lconfig User's Guide</a></b>. For solving synchronization issues, check the <a href="#Troubleshooting" title="">Troubleshooting</a> section for manual configuration of the boards.
-<br />
-</p>
-<a name="Endpoint_Configuration" id="Endpoint_Configuration"></a><h2> <span class="mw-headline"> Endpoint Configuration </span></h2>
-<p>The system's default configuration normally meet most user's needs. However, the configuration of the Endpoint Khomp can be modified through the configuration file '<b>/usr/local/freeswitch/conf/autoload_configs/khomp.conf.xml'</b>.
-</p><p>The list of options is as follows:
-</p>
-<a name=".3Cchannels.3E" id=".3Cchannels.3E"></a><h4> <span class="mw-headline"> &lt;channels&gt; </span></h4>
-<p>Define general settings of all channels of Khomp:
-</p>
-<pre><b>Sintaxe:</b> &lt;param name="..." value="..."/&gt;
-</pre>
-<ul><li><b>accountcode</b>: Sets the default account code to calls in the Endpoint. This option can be any alphanumeric string;
-</li><li><b>dialplan</b>: Name of the dialplan module in use.
-</li><li><b>auto-fax-adjustment</b>: Enable ("yes") or disables ("no") the automatic adjustment of the channel (disable the echo canceller and the suppression DTMF) tone to detect FAX (local option)&nbsp;;
-</li><li><b>auto-gain-control</b>:Enable ("yes") or disables ("no") the activation of the automatic gain control (AGC) by the Endpoint (local option);
-</li><li><b>context-digital</b>: Context for incoming connections on digital boards (the default is "khomp-DD-LL", where "DD" will be replaced at the time of connection by the device number, "LL" by the number of the link, "CCC" by channel number and "SSSS" for the device serial number);
-</li><li><b>context-fxo</b>: Context for incoming connections on FXO cards (the default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC" by channel number, and "SSSS" by the device serial number);
-</li><li><b>context-fxs</b>: Context for incoming connections on FXS cards (the default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC" by channel number, and "SSSS" by the device serial number); 
-</li><li><b>context-gsm-call</b> (or <b>context-gsm</b>): Context of entry for GSM boards (the default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC" by channel number, and "SSSS" by the device serial number);
-</li><li><b>context-gsm-sms</b>: Context for incoming SMSs (the default is "khomp-sms-CC-DD", where "DD" will be replaced by the number of device, "CC" by channel number and "SSSS" by the device's serial number);
-</li><li><b>context-pr</b>: Context for incoming connections on boards KPR (default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC "by channel number);
-</li><li><b>delay-ringback-co</b>: Sets the delay to enable the generation of call control tone (ringback) by the Endpoint Khomp when there is an ringback indication from signaling and there is no audio being sent by the channel which indicated the situation (local option);
-</li><li><b>delay-ringback-pbx</b>: Sets the delay to enable the generation of call control tone (ringback) by the Endpoint Khomp when there is an ringback indication, and the audio has no tone (silence) (local option);
-</li><li><b>disconnect-delay</b>: Sets the time in milliseconds to perform processing a disconnect event, to ignore situations where other equipment performing the double service to overthrow collect calls (local option);
-</li><li><b>drop-collect-call</b>: Enables/Disables the action of dropping collect calls. If enabled, all collect calls will be dropped no matter what KDropCollectCall is set to (the default value is "no");
-</li><li><b>echo-canceller</b> (former 'echocanceller): Active ("yes") or disables ("no") echo cancellation automatic Endpoint (local option);
-</li><li><b>flash-to-digits</b>: Defines the digits to be sent when the FLASH is detected on FXS channels;
-</li><li><b>fxo-send-pre-audio</b>: When enabled ("yes") releases audio channel before the outgoing call connection boards KFXO (the default value is "yes");
-</li><li><b>fxs-digit-timeout</b>: Defines the timeout, in seconds, between digits of a FXS board's extension;
-</li><li><b>fxs-global-orig</b>: Start number for sequencial branch numbering in FXS cards that are not listed in the <b>[fxs-branches]</b> section (the numbering follows ascending order from board number and physical channel number) (default is "0");
-</li><li><b>fxs-co-dialtone</b>: Sequences of numbers, separated by commas, which fires a continuous tone (of central office) in FXS branches (eg: "0,99" means that, when you dial "0" or "99", the user will hear a continuous dial tone) (default is empty);
-</li><li><b>fxs-bina</b>: When enabled ("yes"), calls to FXS lines will send digits corresponding to the source phone identification using BINA DTMF signaling (the default value is "no") (local option);
-</li><li><b>ignore-letter-dtmfs</b>: Defines if the channel should ignore some uncommon DTMF digits detected by the board (A, B, C and D). However, if you need to pass those digits througth the board, you may need to set this option to 'no' (the default value is "yes");
-</li><li><b>input-volume</b>: Sets the volume gain for incoming audio (entering the board), from -10 to +10 (local option);
-</li><li><b>kommuter-activation</b>: Sets whether to activate devices kommuter found in the system will be done automatically ("auto") by the channel, or manually ("manual") by the user through the command "khomp kommuter on/off" 
-</li><li><b>kommuter-timeout</b>: Sets the timeout (in seconds) for initializing the kommuter devices. If this timeout is reached without receiving notification of the channel, the devices will switch back to "off" condition. The minimum value is "0", where the links will always remain switched "on", and the maximum is "255";
-</li><li><b>language</b>: Set language to Khomp board calls;
-</li><li><b>log-to-console</b>: Set log messages to be printed on the console;
-</li><li><b>log-to-disk</b> (old "log"): Set log messages to be saved to disk;
-</li><li><b>out-of-band-DTMF</b> (former <b>dtmfsuppression</b>): Activate ("yes") or disables ("no") the removal and DTMF sending these out-of-band (local option);
-</li><li><b>output-volume</b>: Define o volume de sa�da das liga��es, varia de -10 a +10&nbsp;; 
-</li><li><b>pulse-forwarding</b> (former 'pulsedetection): Active ("yes") or disables ("no") for the detection of pulses and converting them into DTMF (local option);
-</li><li><b>r2-preconnect-wait</b> (former 'r2preconnectwait): Sets the timeout sending the ringback signaling, protocol R2/MFC to start sending audio silence. Only used when "r2-strict-Behavior" is set to "no" (local option);
-</li><li><b>r2-strict-Behaviour</b>: Enable ("yes") or disables ("no") the behavior of signaling R2/MFC as the standard sets. The default is "no", and can be changed to "yes" if needed to receive / send data precise signaling protocol (condition B, for example) (local option);
-</li><li><b>suppression-delay</b> (former <b>suppressiondelay</b>): Activate ("yes") or disables ("no") the delay necessary to suppress DTMF. If disabled ("no"), also disables suppression of DTMF (local option);
-</li><li><b>trace</b>: Set debugging options. Should not be used in production unless absolutely necessary;
-</li><li><b>user-transfer-digits</b>: Defines a sequence of DTMF digits to initiate the transfer between FreeSWITCH&reg; and another PBX (using user signaling, like QSig or FXO FLASH);
-</li></ul>
-<p><br />
-</p>
-<a name=".3Cgroups.3E" id=".3Cgroups.3E"></a><h4> <span class="mw-headline"> &lt;groups&gt; </span></h4>
-<p>Defines the groups to be used in channel allocation.
-</p><p>In this case, the options are used to define names for <i>strings allocation of channels</i>. The format follows the standard <b>&lt;group name&gt; = &lt;allocation string&gt;</b>, where the <b>allocation string</b> is the same string used in the bridge application, and <b>group name</b> is an arbitrary name chosen by the user.
-</p>
-<dl><dd>For example, to define the group <b>pstn</b> as the channels 0 and 5 of the board 0, the following line could be used:
-</dd></dl>
-<pre>&lt;param name="pstn" value="b0c0 + b0c5"/&gt; 
-</pre>
-<p>This group, in turn, could be used in the <i>bridge application</i> as <b>&lt;action application="bridge" data="Khomp/Gpstn/..."/&gt;</b>.
-</p>
-<dl><dd>You can associate a given input context to a channel group, simply specify a name of context string after the allocation, separated by ':'.
-</dd></dl>
-<p>For example, to define the same group <b>pstn</b> as channels 0 to 20 of card 0, and defining the incoming context to for channels in this groups to <b>from-pstn</b>, one could use the line:
-</p>
-<pre>&lt;param name="pstn" value="b0c0-20:from-pstn"/&gt;
-</pre>
-<p>This group would be used the same way as before in the <i>bridge application</i>, and all the calls coming from these channels would be treated in context <b>from-pstn</b>.
-<br />
-</p>
-<a name=".3Ccadences.3E" id=".3Ccadences.3E"></a><h4> <span class="mw-headline"> &lt;cadences&gt; </span></h4>
-<p>Defines settings for the Endpoint cadences.
-</p><p>In this case, the options are names cadences, followed by one or two pairs of numbers - that define the ranges of tone and silence to be used in cadences.
-For details, please refer to the configuration file for examples.
-<br />
-</p>
-<a name=".3Cfxs-branches.3E" id=".3Cfxs-branches.3E"></a><h4> <span class="mw-headline"> &lt;fxs-branches&gt; </span></h4>
-<p>Defines source numbers for the board KFXS.
-</p><p>In this case, the options are sequences of prefixes of branches and serial numbers of the boards, which define the basic numbers of source addresses, and the numerical order of the boards. The format of the options is:
-</p>
-<pre>&lt;param name="prefixo" value="serial1, serial2, ...."/&gt;
-</pre>
-<p>For example, if two <b>KFXS-300 SPX</b> boards with serial numbers <b>K0374</b> and <b>K2352</b> must be numbered sequentially, starting from branch 200, you may write:
-</p>
-<pre>&lt;param name="200" value="374, 2352"/&gt;
-</pre>
-<p>This will define the first branch of board '<i>K0374</i> as number 200, the second as 201, and so one. The first branch from board K2352 will have number 230 (as K0374 has 30 channels), the second will be numbered 231, and so on - until the last channel, numbered 259.
-</p><p>For more details, please refer to the configuration file for other exemples.
-<br />
-</p>
-<a name=".3Cfxs-hotlines.3E" id=".3Cfxs-hotlines.3E"></a><h4> <span class="mw-headline"> &lt;fxs-hotlines&gt; </span></h4>
-<p>Sets hotlines for the KFXS based boards
-</p><p>In this case, the options are sequences of branches and sequences of destination numbers, which define branches to be treated as "hotlines" and numbers to be dialed when they are take off hook. For instance:
-</p>
-<pre>&lt;param name="100" value="1234"/&gt;
-&lt;param name="200" value="4321"/&gt; 
-</pre>
-<p>In the first line, the branch numbered 100 will call extension 1234 when taken off hook, while in the second one, branch 200 will call number 4321 when taken off hook.
-<br />
-</p>
-<a name=".3Cfxs-options.3E" id=".3Cfxs-options.3E"></a><h4> <span class="mw-headline"> &lt;fxs-options&gt; </span></h4>
-<p>Allows you to set specific settings for FXS extension.
-</p><p>In this case, the settings are extension numbers (based on those defined in the <b>&lt;fxs-branches&gt;</b>), and the options and their values.
-</p>
-<ul><li>context; 
-</li><li>input-volume; 
-</li><li>output-volume; 
-</li><li>calleridnum; 
-</li><li>calleridname;
-</li><li>language;
-</li><li>accountcode;
-</li><li>flash-to-digits.
-</li></ul>
-<p>Each option is separated from each other by a pipe "|" or a slash "/" and defined after the colon ":". Example:
-</p>
-<pre>&lt;param name="200" value="input-volume:1|context:master-branch" /&gt;
-</pre>
-<p>For more information on the syntax and examples, please refer to the configuration file.
-</p><p>For more information visit the configuration file '<b>khomp.conf.xml'</b>.
-<br />
-</p>
-<a name="FreeSWITCH_Configuration" id="FreeSWITCH_Configuration"></a><h2> <span class="mw-headline"> FreeSWITCH Configuration </span></h2>
-<p>When connections are received on the boards and devices Khomp, they are forwarded by the <i>Endpoint</i> to specific contexts within the dialplan of FreeSWITCH&reg;. These settings can be changed via the configuration file <b>khomp.conf.xml</b>, available on the FreeSWITCH configuration directory (by default, "<b>/usr/local/freeswitch/conf/autoload_configs</b>").
-</p><p>For details about the specific contexts, see section <a href="#Endpoint_Configuration" title="">Endpoint configuration</a>.
-</p><p>Below are details of how to configure the settings for incoming calls
-<br />
-</p><p><br />
-</p>
-<a name="Contexts_for_E1_channels" id="Contexts_for_E1_channels"></a><h3> <span class="mw-headline"> Contexts for E1 channels </span></h3>
-<p>For E1 boards, inbound contexts are predefined as option <b>context-digital</b> with default value as following:
-</p>
-<pre>&lt;param name="context-digital" value="khomp-DD-LL"/&gt;
-</pre>
-<p>This standard defines the context that links will be redirected in accordance with the number of the board and number of the link: <b>DD</b> is the device number (two digits), and <b>LL</b> is the number of the link (also with two digits).
-</p><p>However, it is possible to configure other inbound contexts, with different formats. There is format <b>CCC</b>, which means the channel number on the card (three digits), and <b>SSSS</b>, which represents the serial board number (with four digits).
-</p><p>Examples for configuration entries (<b>khomp.conf.xml</b>):
-</p>
-<pre>&lt;!-- Serial board number and sequential link (ex: khomp-01-00) --&gt;
-&lt;param name="context-digital" value="khomp-DD-LL"/&gt;
-</pre>
-<pre>&lt;!-- Serial board number and sequential link (ex: khomp-3049-00) --&gt;
-&lt;param name="context-digital" value="khomp-SSSS-LL"/&gt;
-</pre>
-<pre>&lt;!-- Sequential board number and the channel (ex: khomp-00-001) --&gt;
-&lt;param name="context-digital" value="khomp-DD-CCC"/&gt;
-</pre>
-<pre>&lt;!-- Receive all calls in one context (khomp-digital) --&gt;
-&lt;param name="context-digital" value="khomp-digital"/&gt;
-</pre>
-<p>Follows an example the context usage inside the dialplan:
-<!-- NEED 6 -->
-</p>
-<pre>&lt;!--
-The present context in 'extensions.conf' will handle calls
-that come from the link 0 (first link) of the board 0.
---&gt;
-&lt;context name="khomp-00-00"&gt;
-             .
-             .
-             .
-&lt;/context&gt;
-</pre>
-<p>Another example, using the same format:
-<!-- NEED 6 -->
-</p>
-<pre>&lt;!-- 
-The present context in 'extensions.conf' will handle calls
-that come from the link 1 (second link) of the board 0.
---&gt;
-&lt;context name="khomp-00-01&gt;
-             .
-             .
-             .
-&lt;/context&gt;
-</pre>
-<p>A complete example, with a few simple actions:
-<!-- NEED 10 -->
-</p>
-<pre>&lt;context name="khomp-00-00"&gt;
-    &lt;extension name="exemplo_1"&gt;
-        &lt;condition field="destination_number" expression="^1234$"&gt;
-            &lt;action application="bridge" data="Khomp/b0L1/2345"/&gt;
-        &lt;/condition&gt;
-    &lt;/extension&gt;
-    &lt;extension name="exemplo_2"&gt;
-        &lt;condition field="destination_number" expression="^23(\d{2})$"&gt;
-            &lt;action application="bridge" data="sofia/${use_profile}/11$1@${sip_from_host}"/&gt;
-        &lt;/condition&gt;
-    &lt;/extension&gt;
-&lt;/context&gt;
-</pre>
-<pre>&lt;context name="khomp-00-01"&gt;
-    &lt;extension name="exemplo_3"&gt;
-        &lt;condition field="destination_number" expression="^1111$"&gt;
-            &lt;action application="bridge" data="Khomp/b0L0/2345"/&gt;
-        &lt;/condition&gt;
-    &lt;/extension&gt;
-&lt;/context&gt;
-</pre>
-<p>This dialplan defines that:
-</p>
-<ol><li> The incoming calls on the link <b>0</b> of the board <b>0</b> will have the following handling:
-<ul><li> Calls to the extension 1234 for will be redirected to the second link on the first board (b0L1), calling number <b>2345</b>;
-</li><li> Calls to any four digit number starting with<b>23</b> will be redirected to SIP phones numbered <b>11</b> plus the last two digits of the number dialed.
-</li></ul>
-</li><li> The incoming calls on the link <b>1</b> of the board <b>0</b> for the number <b>1111</b> will be redirected to the first link of the first board (b0L0) calling number <b>2345</b>.
-</li></ol>
-<a name="Contexts_of_FXS.2FFXO.2FGSM_channels" id="Contexts_of_FXS.2FFXO.2FGSM_channels"></a><h3> <span class="mw-headline"> Contexts of FXS/FXO/GSM channels </span></h3>
-<p>Just as in the context of E1 cards, inbound links are forwarded to the Endpoint FreeSwitch. 
-</p><p>The context is pre-defined as follows, according to the file <b>khomp.conf.xml</b>:
-</p>
-<pre>&lt;param name="context-gsm" value="khomp-DD-CC"/&gt;&nbsp;;placas GSM
-</pre>
-<pre>&lt;param name="context-fxs" value="khomp-DD-CC"/&gt;&nbsp;; placas FXS
-</pre>
-<pre>&lt;param name="context-fxo" value="khomp-DD-CC"/&gt;&nbsp;; placas FXO
-</pre>
-<p>For these options, <b>DD</b> is the device number (two digits), and <b>CC</b> is the channel number (also two digits). There is also the <b>SSSS</b> format, which represents the serial number board.
-</p>
-<ul><li><b>NOTE</b>: In the <b>KGSM</b> board, incoming calls are <b>always</b> redirected to the <b>"s"</b> extension, since the GSM protocol does not identify the target number, only the originator - if not omitted.
-</li></ul>
-<a name="Priority_settings_on_the_FXS_branches" id="Priority_settings_on_the_FXS_branches"></a><h4> <span class="mw-headline"> Priority settings on the FXS branches </span></h4>
-<p>On calls originated from an FXS branch, the Endpoint searches for a valid extension (digits sent) after the DTMF <b>#</b> or after the <i>timeout</i> (option <b>fxs-digit-timeout</b>). That search is done in the context defined in section <b>&lt;fxs-options&gt;</b>, or if no context configured, the search is done in context defined in <b>context-fxs</b>.
-<br />
-</p>
-<a name="Contexts_for_SMS_messages_.28GSM_only.29" id="Contexts_for_SMS_messages_.28GSM_only.29"></a><h3> <span class="mw-headline"> Contexts for SMS messages (GSM only) </span></h3>
-<p>SMS messages are received by the Khomp <i>Endpoint</i> and forwarded to FreeSWITCH as a normal connection but no audio, which has some variables set with information received in the message - for more information on these variables, see the documentation of the variables of the <i>Endpoint</i>. This context can also be modified in the same way as the above contexts.
-</p><p>The default value for this option follows (<b>khomp.conf.xml</b>):
-</p>
-<pre>&lt;param name="context-gsm-sms" value="khomp-sms-DD-CC"/&gt; 
-</pre>
-<p>Where <b>DD</b> is the device number (two digits), and <b>CC</b> is the channel number (also with two digits). For example:
-</p>
-<pre>&lt;context name="khomp-sms-00-01"&gt;
-    &lt;extension name="sms"&gt;
-        &lt;condition field="destination_number" expression="^s$"&gt;
-            &lt;action application="log" data="DEBUG KSmsType=${KSmsType}"/&gt;
-            &lt;action application="log" data="DEBUG KSmsBody=${KSmsBody}"/&gt;
-        &lt;/condition&gt;
-    &lt;/extension&gt;
-&lt;/context&gt;
-</pre>
-<a name="Contexts_for_Khomp_PR_channels_.28KPR.29" id="Contexts_for_Khomp_PR_channels_.28KPR.29"></a><h3> <span class="mw-headline"> Contexts for Khomp_PR channels (KPR) </span></h3>
-<p>For these cards, inbound links have a pre-defined context, as shown below:
-</p>
-<pre>&lt;param name="context-pr" value="khomp-DD-CC"/&gt; 
-</pre>
-<p>In this case, <b>DD</b> is the device number (two digits), and<b>CC</b> is the channel number (also two digits). The name and format of this context can also be changed through the "context-pr" in the configuration file.
-<br />
-</p>
-<a name="Groups_contexts" id="Groups_contexts"></a><h3> <span class="mw-headline"> Groups contexts </span></h3>
-<p>The section <b>groups</b>, in the configuration file <b>khomp.conf.xml</b>, can be used to define specific settings for certain groups of channels.
-</p><p>This section is detailed in the section <b>Endpoint Configuration</b>.
-<br />
-</p>
-<a name="Using_the_bridge_application" id="Using_the_bridge_application"></a><h3> <span class="mw-headline"> Using the <i>bridge</i> application </span></h3>
-<p>The <b>bridge</b> application is responsible for generating calls from the FreeSWITCH from a dialplan. This application can be used to generate calls from different Endpoints technologies, following a specific format to define destination, dialing options and define the communication <i>Endpoint</i> to be used.
-</p>
-<a name="Fields_relating_to_the_Khomp_Endpoint" id="Fields_relating_to_the_Khomp_Endpoint"></a><h4> <span class="mw-headline"> Fields relating to the Khomp <i>Endpoint</i> </span></h4>
-<p>When used for <b>Khomp</b> channels, the <i>bridge</i> <i>string</i> can have two, three or four fields separated by slash (/). Some example strings:
-<!-- NEED 11 -->
-</p>
-<pre>&lt;action application="bridge" data="Khomp/B2L0/32625644"/&gt;
-&lt;action application="bridge" data="Khomp/*B2L0/32625644"/&gt;
-&lt;action application="bridge" data="Khomp/S0411/99991234"/&gt;
-&lt;action application="bridge" data="Khomp/Gpstn/99991234"/&gt;
-&lt;action application="bridge" data="Khomp/*Gpstn/99991234"/&gt;
-&lt;action application="bridge" data="Khomp/B2C58/32625644/category=4:orig=4855553232"/&gt;
-&lt;action application="bridge" data="Khomp/b0c9"/&gt;
-&lt;action application="bridge" data="Khomp/b0c1+b0c14"/&gt;
-&lt;action application="bridge" data="Khomp/r304"/&gt;
-</pre>
-<p>In the first five examples, three fields have been specified; in the sixth, four fields are used; in the last three examples, just two are used.
-</p><p>The fields description for the Khomp Endpoint:
-</p>
-<ul><li><b>1st</b> field: <b>Khomp</b>: identifying the type of <i>Endpoint</i> in question;
-</li><li><b>2nd</b> field: <b>B2L0</b>, <b>S0411</b>, <b>Gpstn</b>, etc: represents the <b>Policy for channel allocation</b> (detailed below);
-</li><li><b>3rd</b> field: <b>32625644</b> and <b>99991234</b>: the destination numbers (missing for calls to <b> KFXS</b> channels);
-</li><li><b>4th</b> field: <b>category=4:orig=4855553232</b>: additional options, detailed below.
-</li></ul>
-<p>NOTE: The <i>bridge</i> allocation string with only two fields is specific to the KFXS boards, where the destination is the channel itself.
-</p>
-<a name="Policy_for_channel_allocation" id="Policy_for_channel_allocation"></a><h4> <span class="mw-headline"> Policy for channel allocation </span></h4>
-<p>The policy for allocation of channels on the <b>Khomp</b> Endpoint can be specified in the <b>bridge</b> string itself or in the <b>groups</b> section (inside the configuration file <b>khomp.conx.conf</b>). To specify boards, links and channels, the following syntax is available (considering X, Y and Z as any numbers):
-</p>
-<ul><li> b<b>X</b> -- search the channels on the board <b>X</b>, ascending order;
-</li><li> b<b>X</b>L<b>Y</b> -- search channel on the link <b>Y</b> from <b>X</b> board, ascending order;
-</li><li> b<b>X</b>c<b>Y</b> -- try to allocate channel <b>Y</b> from board <b>X</b>;
-</li><li> b<b>X</b>c<b>Y</b>-<b>Z</b> -- search for channels starting from channel <b>Y</b> to channel <b>Z</b> (inclusive) of board <b>X</b>, ascending order;
-</li><li> B<b>X</b>c<b>Y</b>-<b>Z</b> -- same as above, but descending order;
-</li><li> s<b>X</b> -- search the channels on the board of serial number <b>X</b>, ascending order;
-</li><li> s<b>X</b>L<b>Y</b> -- search channel on the link <b>Y</b> from board of serial number <b>X</b>, ascending order;
-</li><li> s<b>X</b>c<b>Y</b> -- try to allocate channel <b>Y</b> from board of serial number <b>X</b>;
-</li><li> s<b>X</b>c<b>Y</b>-<b>Z</b> -- search for channels starting from channel <b>Y</b> to channel <b>Z</b> (inclusive) from board of serial number <b>X</b>, ascending order;
-</li><li> S<b>X</b>c<b>Y</b>-<b>Z</b>-- same as above, but descending order.
-</li></ul>
-<p>To search for extensions of cards<b>KFXS</b> according to the extension number, can be used the following syntax (whereas X and Y valid extension numbers):
-</p>
-<ul><li> r<b>X</b>- search branch numbered <b>X</b>;
-</li><li> R<b>X</b>- equivalent to the above;
-</li><li> r<b>X</b>-<b>Y</b>- search from branch <b>X</b> to <b>Y</b>, ascending order;
-</li><li> R<b>X</b>-<b>Y</b>- search from branch <b>X</b> to <b>Y</b>, descending order.
-</li></ul>
-<p>The capitalization of the letter 'B', 'S' or 'R' defines the search order of the channels: if capitalized, order is descending; otherwise, ascending.
-</p><p>As for the allocation of channels across groups, the following syntax is available:
-</p>
-<ul><li> ggroupname - uses the string defined the group "groupname" in the configuration file (detailed in the configuration section of the Endpoint).
-</li><li> Ggroupname - equivalent to the above.
-</li></ul>
-<a name="Grouping_channel_allocations" id="Grouping_channel_allocations"></a><h3> <span class="mw-headline"> Grouping channel allocations </span></h3>
-<p>There are cases where you need to get more channels for a particular device or particular group of extensions. For this, there is an extension available in string allocation, with respect to the use of token sum (<b>+</b>) to concatenate multiple strings<i>binding</i>, as follows:
-<!-- NEED 6 --> 
-</p>
-<pre>&lt;action application="bridge" data="Khomp/B1L0+B2L0/32332933"/&gt;
-&lt;action application="bridge" data="Khomp/*B2+B3+B4/99887766"/&gt;
-&lt;action application="bridge" data="Khomp/S0411+B1L0/99887766"/&gt;
-&lt;action application="bridge" data="Khomp/Gpstn1+Gpstn2/99991234"/&gt;
-&lt;action application="bridge" data="Khomp/*gOperadora1+gOperadora2/98891234"/&gt;
-</pre>
-<p>This grouping is available for the <i>application</i> <b>bridge</b> and on the specification of groups. The processing of allocation takes place from left to right - except when using cyclic channel allocation, where<b>all</b> the specified channels are scanned simultaneously.
-</p>
-<a name="Cyclical_and.2For_fair_allocation" id="Cyclical_and.2For_fair_allocation"></a><h4> <span class="mw-headline"> Cyclical and/or <i>fair</i> allocation </span></h4>
-<p>Another way for allocation of channels is the cyclic and/or <i>fair</i> allocation, which chooses the channel that has <b>completed</b> the the lowest number of <b>outgoing</b> calls. This mode of allocation may be used by passing an asterisk (<b>*</b>) before the allocation string of channels (as can be seen in the section above, in the second and fifth examples).
-</p><p>When started with an asterisk (<b>*</b>), other forms of allocation (increasing, decreasing, etc) are used to decide what channel will be allocated when there are two or more channels with less number of outgoing calls.
-</p>
-<ul><li><b>WARNING: The use of fair and/or cyclic is recommended <u>only</u> for analog (KFXO), branches (KFXS) and cellular interface (KGSM) boards</b>. E1 connections should allocate channels in one way (ascending/descending) from one side and the opposite on the other to avoid problems of double seizure (which may occur in R2/MFC signaling). Fair/cyclic allocation also costs more in memory and processor footprint, which tends to be a higher cost in E1 due to the higher number of channels (30 in each link).<br /><br /> For these reasons, fair/cyclic allocations should only be used on signalizations where it can represent any real difference, like equalizing the charge costs of the lines, the total usage, or the number of connections received by each branch.
-</li></ul>
-<a name="Available_options" id="Available_options"></a><h4> <span class="mw-headline"> Available options </span></h4>
-<ul><li><b>orig</b>: Sets the originator number, <b>without changing the variable ${CALLERID(num)}</b>. That is, the option <b>orig</b> serves <b>only</b> to pass a number of different source of${origination_caller_id_number}. If FreeSWITCH has already set the variable ${origination_caller_id_number}, which is the default behavior, Endpoint automatically uses this value as a reference to the number of origin, without having to pass any additional options.<br /><br />On the boards <b>KGSM</b>, is set to <b>restricted</b>, omits the number of origin. Example:<br />
-</li></ul>
-<pre>
- &lt;action application=&quot;bridge&quot; data=&quot;Khomp/b0/99887766/orig=restricted&quot;/&gt;
-</pre>
-<ul><li><b>category</b>: When set to a numeric value, sets the category of outgoing call to this value (available only in R2/MFC signaling);
-</li><li><b>uui</b>: When adjusted for a number and a string of text, separated by hash ("#"), sends a "UserToUser" to the other end before making the call - the first value will be the descriptor and the second one will be the message as the text (available only in ISDN signaling);
-</li><li><b>ring_cadence</b>: When set to a cadence name (listed in the <b>[cadences]</b> section), uses this for ringing FXS channels;
-</li><li><b>ring</b>: When set to two numbers separated by a dot ("."), defines the cadences to be used while ringing a FXS channel - the first time is the ringing time, and the second one, the silence time;
-</li><li><b>ring_ext</b>: When set to two numbers separated by a dot ("."), defines the extended cadences to be used while ringing a FXS channel, executed after the <b>ring</b> specification - the first time 
-</li><li><b>usr_xfer</b>: Defines a group of DTMF digits to initiate a transfer between PBXes (using QSig or FXO FLASH, for instance);
-</li><li><b>drop_on</b>: When set to "message_box", "human_answer", "answering_machine", "carrier_message", "unknown" or a list them - separated by plus sign ("+") or dot ("." ) - drops the call when detect voice mail box, human answer, answering machine messages, operator messages, or unknown answer pattern - respectively. Available in digital signals (E1 links and boards KGSM). Additionally, the information service is reported to the user in the variable<b>KCallAnswerInfo</b>;
-</li><li><b>answer_info</b>: When specified (take no parameters), report answer information to the user through the variable<b>KCallAnswerInfo</b>
-</li><li><b>pre</b>: When set to a string of DTMF digits, uses these to pre-allocate an output channel in an analog PABX, dial the desired number of B below. Only available for signaling analog (FXO);
-</li><li><b>pre_answer</b>: When set (need no value), answers the channel before the connection is completed - allowing, for instance, DTMF tones to sent (useful for use in a <b>DISA</b>);
-</li><li><b>output_volume</b>: Sets the output volume of the link (ranges from -10 to +10);
-</li><li><b>input_volume</b>: Sets the volume of inbound link (ranges from -10 to +10);
-</li></ul>
-<p><br />
-</p>
-<a name="List_of_variables" id="List_of_variables"></a><h3> <span class="mw-headline"> List of variables </span></h3>
-<p>Here's a list of variables available in the Endpoint:
-</p>
-<ul><li><b>KDropCollectCall</b>: When set before ringing or answer an incoming call, enables ("yes") or disables ("no", default) the drop of collect calls based on signaling received from the central public, double answer, audio tone recognition (can be defined globally);
-</li><li><b>KR2SendCondition</b>: When set to a numeric value, before the ringing an incoming call, adjusts the condition for this Endpoint to this value (available only on R2 signaling);
-</li><li><b>KR2GotCategory</b>: Adjusted by the Endpoint when an incoming call is received, with the category number of the caller (only available on R2 signaling);
-</li><li><b>KR2GotCondition *</b>: Adjusted by the Endpoint, available after returning from a call made by FreeSWITCH (<b>bridge</b> application). Has the condition of the remote end received when making the call (available only for R2 signaling);
-</li><li><b>KISDNGotCause *</b>: Adjusted by the Endpoint, available after returning from a call made by FreeSWITCH (<b>bridge</b> application). Has the ISDN "cause" code received when making the call (available only for ISDN signaling);
-</li><li><b>KCallAnswerInfo *</b>: Adjusted by the Endpoint, available after returning from a call made by FreeSWITCH (<b>bridge</b> application). Contains the service information identified to make the call (available only for digital signaling - E1 and GSM);
-</li><li><b>KSmsDelivered</b>: Adjusted by the Endpoint when sending a SMS message with the application <b>KSendSMS</b>, saying whether the message was delivered successfully ("yes") or not ("no");
-</li><li><b>KSmsErrorCode</b>: Adjusted by the Endpoint when sending a SMS message with the application <b>KSendSMS</b>, containing the error code that happened when sending the message;
-</li><li><b>KSmsErrorName</b>: Adjusted by the Endpoint when sending a SMS message with the application <b>KSendSMS</b>, contains the name of the error or "None" if there has been no error;
-</li><li><b>KSmsType</b>: Adjusted for the input Endpoint in the context of SMS messages, defines the type of message received (can contain the values "message", "confirm" or "broadcast";
-</li><li><b>KSmsFrom</b>: Adjusted for the input Endpoint in the context of SMS messages, sets the number of origin of the received message (available on types" message "and" confirm ");
-</li><li><b>KSmsDate</b>: Adjusted for the input Endpoint in the context of SMS messages, sets the date of sending the message (available on types "message" and "confirm");
-</li><li><b>KSmsSize</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the size (in bytes) of the received message (available on types "message" and "broadcast");
-</li><li><b>KSmsMode</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the encoding type of the received message (available on types "message" and "broadcast");
-</li><li><b>KSmsBody</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the text of the received message (available in types "message" and "broadcast");
-</li><li><b>KSmsDelivery</b>: Adjusted for the input Endpoint in the context of SMS messages, containing the date of delivery of the message sent earlier (available in type "confirm");
-</li><li><b>KSmsStatus</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the status of the message sent earlier (available on the type "confirm");
-</li><li><b>KSmsSerial</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the serial number of the received message (available on the type "broadcast");
-</li><li><b>KSmsPage</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the page number of the received message (available on the type broadcast");
-</li><li><b>KSmsPages</b>: Adjusted for the input Endpoint in the context of SMS messages, contains the total number of pages to be received (available in type "broadcast");
-</li><li><b>KUserInfoDescriptor</b>: Sets/reports protocol descriptor of the User-to-User Information message (ISDN).
-</li><li><b>KUserInfoData</b>: Sets/reports data in the User-to-User Information message (ISDN).
-</li><li><b>KFaxSent</b>: Adjusted by the Endpoint when sending FAX with <b>KSendFax</b> application, and determines whether the fax was successfully sent ("yes") or not ("No");
-</li><li><b>KFaxReceived</b>: Adjusted by channel when receiving FAX with <b>KReceiveFax</b> application, and determines whether the fax was successfully received ("yes") or not ("no");
-</li><li><b>KFaxResult</b>: Adjusted by the channel when sending or receiving FAX with the application <b>KSendFax</b> or <b>KReceiveFax</b> (respectively), and defines the result of execution.
-</li></ul>
-<p><br />
-</p>
-<a name="Description_of_variables" id="Description_of_variables"></a><h3> <span class="mw-headline"> Description of variables </span></h3>
-<p>Below, follows an explanation on how to use variables of Khomp Endpoint in the dialplan, to communicate and/or to receive information:
-</p><p><br />
-</p>
-<a name="KDropCollectCall" id="KDropCollectCall"></a><h4> <span class="mw-headline"> KDropCollectCall </span></h4>
-<p>When activated, causes the Endpoint to drop Khomp collect calls through dual service (available for signaling 'R2 Digital' and FXO), through information available on the ISDN protocol and R2/MFC, or by detecting the audio call collect (available for any digital signage for E1, and GSM signaling).
-</p><p>This variable is useful to filter collect calls to certain extensions, and <b>must</b> be set before making any type of answer - applications such as <b>playback</b> and <b>bridge</b> should always be executed after setting this variable, for example.
-</p><p>For better functionality, is also recommended that no call status (<i>ringback</i>) is sent before this variable is set, so applications should be performed only after the correct setting of this variable.
-</p><p>This variable can be set locally and globally, both to <b>yes</b> or <b>no</b>. The adjustment of global variable to <b>yes</b> will drop all the collect calls, unless the particular call is set to <b>no</b> - this allows the creation of a global filter of collect calls, with few exceptions.
-</p><p>Enabling the variable in context <b>default</b>:
-</p><p><!-- NEED 5 -->
-&lt;context name="default"&gt;
-</p>
-<pre>&lt;extension name="example"&gt;
- .
- .
- .
- &lt;action aplication="set" data="KDropCollectCall=yes"/&gt;
- .
- .
- .
-&lt;/extension&gt;
-</pre>
-<p>&lt;/context&gt;
-</p><p>Enabling the variable in the global context, remembering that it must be configured in the file <b>vars.xml</b>:
-<!-- NEED 5 --> 
-</p>
-<pre>&lt;X-PRE-PROCESS cmd="set" data="KDropCollectCall=yes"/&gt;
-</pre>
-<a name="KR2SendCondition" id="KR2SendCondition"></a><h4> <span class="mw-headline"> KR2SendCondition </span></h4>
-<p>When you receive a call, can be set before sending ringback by FreeSWITCH (ie, before the run FreeSWITCH applications <b>answer</b>, <b>bridge</b>). When used in signaling R2/MFC, this variable sets the condition for B to the numeric value desired.
-</p><p>Exemplo:
-<!-- NEED 6 --> 
-</p>
-<pre>&lt;!-- Condition "NUMBER CHANGED" warns the caller that the number of B has changed. --&gt;
-&lt;action application="KR2SendCondition" data="3"/&gt;
-</pre>
-<a name="KR2GotCategory" id="KR2GotCategory"></a><h4> <span class="mw-headline"> KR2GotCategory </span></h4>
-<p>When you receive a call, is set by the Endpoint with the category received from the number that originated the call. It is set in signaling R2/MFC, and can be found anywhere in the dialplan.
-</p><p>Example:
-<!-- NEED 3 --> 
-</p>
-<pre>&lt;action application="log" data="DEBUG KR2GotCategory [${KR2GotCategory}]"/&gt;
-</pre>
-<a name="KR2GotCondition" id="KR2GotCondition"></a><h4> <span class="mw-headline"> KR2GotCondition </span></h4>
-<p>Variable adjusted by the Endpoint, and available after returning from a call made by FreeSWITCH. Has the condition of B received when making the call. Available only for signaling R2/MFC.
-</p><p>Example:
-<!-- NEED 3 --> 
-</p>
-<pre>&lt;action application="log" data="DEBUG KR2GotCondition [${KR2GotCondition}]"/&gt;
-</pre>
-<a name="KUserInfoDescriptor" id="KUserInfoDescriptor"></a><h4> <span class="mw-headline"> KUserInfoDescriptor </span></h4>
-<p>Variable adjusted by the Endpoint in the context of entry, from information received by the ISDN network functionality through user-to-User Information. Contains the descriptor number of the protocol used by the other end, and usually contains the value '0 ', but this is dependent on application.
-</p><p>For further information, consult the specification ITU-T Q931 (more precisely, the specification table 4-26).
-</p><p>Example (working with the descriptor number of the protocol):
-<!-- NEED 3 --> 
-</p>
-<pre>&lt;action application="log" data="DEBUG KUserInfoDescriptor [${KUserInfoDescriptor}]"/&gt;
-</pre>
-<a name="KUserInfoData" id="KUserInfoData"></a><h4> <span class="mw-headline"> KUserInfoData </span></h4>
-<p>Variable adjusted by the channel in the context of entry, from information received by the ISDN network functionality through user-to-User Information. Contains the actual data, which were received in the form of a string of text.
-</p><p>More information about this feature, see the specification ITU-T Q931.
-</p><p>Example (working with the data received):
-<!-- NEED 3 -->
-</p>
-<pre>&lt;action application="log" data="DEBUG KUserInfoData [${KUserInfoData}]"/&gt;
-</pre>
-<p>It is important to note that the variables are sensitive to the capitalization of letters (case sensitive).
-</p>
-<a name="KCallAnswerInfo" id="KCallAnswerInfo"></a><h4> <span class="mw-headline"> KCallAnswerInfo </span></h4>
-<p>Variable adjusted by the Endpoint. It is set in outbound connections, representing the type of answer performed by the other end. May contain the following values:
-</p>
-<dl><dd><ul><li> "MessageBox" (*): detected mailbox of a cell phone;
-</li><li> "CarrierMessage": message sent before the service provider;
-</li><li> "AnsweringMachine" (**): answering answering machine;
-</li><li> "HumanAnswer" (**): human service;
-</li><li> "Fax": reported when a fax tone is detected.
-</li><li> "Unknown": unknown type of care;
-</li></ul>
-</dd></dl>
-<p>(*) This type of service is detected by signals at certain frequencies that are sent before the call comes into a mailbox, and vary by operator. The algorithm captures most of the mailboxes, but can fail if there is not a clear signal, or if it is not within the standards most commonly used;
-</p><p>(**) The difference between these two types of care depends on the specific configuration using the program <b>k3lanswerinfoconfig</b>, with the detection only based on heuristics and <b>never</b> with an accuracy of 100%.
-<br />
-</p>
-<a name="Console_commands" id="Console_commands"></a><h1> <span class="mw-headline"> Console commands </span></h1>
-<p>List of available commands in the console for the FreeSWITCH Endpoint of Khomp:
-</p><p><br />
-</p>
-<ul><li> <b>khomp channels disconnect </b>: Disconnect one or more channels. This command sends a message directly to the physical channel of the card in question, requesting a disconnection. Use with caution;
-</li><li> <b>khomp channels unblock </b>: Unlock blocked channels for input or output. Only available in digital signage via E1;
-</li><li> <b>khomp clear links</b>: Clears error counters on the links;
-</li><li> <b>khomp clear statistics</b>: Clears the statistics of channel connections, or statistics for a particular channel;
-</li><li> <b>khomp get </b>: Gets the number of options Endpoint Khomp;
-</li><li> <b>khomp kommuter </b>: Enables or disables kommuters connected via USB on this machine. Only accessible when the configuration "kommuter-activation" is set to "manual".
-</li><li> <b>khomp kommuter count</b>: Gets the amount of kommuters connected via USB on this machine;
-</li><li> <b>khomp log console</b>: Sets options in the console logs;
-</li><li> <b>khomp log disk</b>: Sets logging options to disk;
-<ul><li> <b>khomp log console</b> and <b>khomp log disk</b> have auxiliary options <b>No</b>, which reverses the selection of messages, and <b>just</b>, which generalizes the choice. Examples:
-<ul><li> <b>khomp log disk just commands events</b> (Enables <b>only</b> logging to the disk of commands and events);
-</li><li> <b>khomp log disk no commands </b> (Disable logging to the disk of commands sent to board);
-</li><li> <b>khomp log disk warnings</b> (Enables also logging to the disk of warnings from Endpoint).
-</li></ul>
-</li><li> More information on options for the <b>log</b> command, type: "<b>help khomp log disk</b>" or "<b>help console log khomp</b>".
-</li></ul>
-</li><li> <b>khomp log rotate</b>: Rotate log files from the Endpoint;
-</li><li> <b>khomp log status</b>: Shows log messages currently being written to disk and displayed on the console;
-</li><li> <b>khomp log trace isdn</b>: Enable Debugging ISDN signaling;
-</li><li> <b>khomp log trace k3l </b>: Enables debugging low-level API K3L;
-</li><li> <b>khomp log trace r2 </b>: Enables debugging low-level signaling R2/MFC;
-</li><li> <b>khomp reset links</b>: Sends a reset command for a specific <b>E1</b> of a particular <i>card</i>; 
-</li><li> <b>khomp revision</b>: Shows version number and revision of the Endpoint;
-</li><li> <b>khomp select sim</b>: Select the SIM card, available on the boards KGSM;
-</li><li> <b>khomp send command </b>: Sends command API K3L directly to the board (only for debugging, may compromise the stability of the system if used improperly);
-</li><li> <b>khomp send raw command </b>: Sends a command directly to the DSP board (only for debugging, may compromise the stability of the system if used improperly);
-</li><li> <b>khomp set </b>: Sets various options of the Endpoint Khomp;
-</li><li> <b>khomp show calls </b>: Shows states for calls, may also listing specific channels or boards;
-</li><li> <b>khomp show channels </b>: Shows the status of the channels Khomp and may also list specific adapter; 
-</li><li> <b>khomp show links</b>: Display states of E1 links available. 
-</li><li> <b>khomp show statistics </b>: Shows the statistics of channel connections, or statistics for a particular channel;
-</li><li> <b>khomp sms </b>: Send an SMS message for a given number, using KGSM channels;
-</li><li> <b>khomp summary </b>: Prints a summary of system boards and their features;
-</li></ul>
-<p><br />
-</p>
-<a name="Additional_features" id="Additional_features"></a><h1> <span class="mw-headline"> Additional features </span></h1>
-<p>This chapter discusses additional features of the Endpoint, related to the special features present in certain signs.
-<br />
-</p>
-<a name="Aplica.C3.A7.C3.B5es_.28applications.29_e_canais" id="Aplica.C3.A7.C3.B5es_.28applications.29_e_canais"></a><h2> <span class="mw-headline">Aplica��es (applications) e canais  </span></h2>
-<p>The Endpoint Khomp, and to record a type of communication channel "Khomp" also records the following items:
-<br />
-</p>
-<a name=".22KUserTransfer.22_application" id=".22KUserTransfer.22_application"></a><h3> <span class="mw-headline"> "KUserTransfer" application </span></h3>
-<p>Performs the transfer process from the current channel <i>number</i> for the extension using the signaling protocol QSig (Single Step Call Transfer) for boards configured with E1 ISDN signaling (ISDN), or use the FLASH command for FXO.
-</p><p>The syntax follows:
-</p>
-<pre> &lt;action application="KUserTransfer" data="<b>number</b>[,options])"/&gt;
-</pre>
-<p>Example:
-</p>
-<pre>&lt;action application="answer"/&gt;
-&lt;action application="KUserTransfer" data="2345"/&gt;
-</pre>
-<p>The fields have the following meanings:
-</p>
-<ul><li><b>number</b>: Number where the link should be transferred.
-</li><li><b>options</b>: Sets the transfer options to be used, which are:
-<ul><li><b> N</b>: Wait until the channel is disconnected.
-</li></ul>
-</li></ul>
-<p><br />
-</p>
-<a name="Application_.22KSendSMS.22" id="Application_.22KSendSMS.22"></a><h3> <span class="mw-headline"> Application "KSendSMS" </span></h3>
-<p>This application has the function of sending SMS messages through the boards of KGSM Khomp using modules and SIM cards in the board to do so. The syntax of the application is as follows:
-</p>
-<pre>&lt;action application="KSendSMS" data="resource | destination | message" /&gt;
-</pre>
-<p>Each field can be summarized in:
-</p>
-<ul><li><b>resource</b>: The following is a syntax identical to the allocation of channels Dial application, and defines what modem use;
-</li><li><b>destination</b>: Number where to send the message, may be preceded or succeeded by<b>!</b> to request a confirmation of transmission;
-</li><li><b>message</b>: Text (without quotes) to be sent to<b>destination</b>.
-</li></ul>
-<p>After sending the message, the variables <b>KSmsDelivered</b> and <b>KSmsErrorCode</b> will contain the result of the post. For more information about these, please consult the section on variables used in the Endpoint.
-</p><p>Examples of use of this application are as follows:
-</p>
-<ul><li> Sends "Test message." phone for "99887766" using the modem "1" (second modem) card "0":
-</li></ul>
-<pre>&lt;action application="log" data="DEBUG Sending SMS ..." /&gt;
-&lt;action application="KSendSMS" data="b0c1|99887766|Test message" /&gt;
-</pre>
-<ul><li> Sends "Test message." phone for "99887766" using the first free modem card "0", and checks the return shipment:
-</li></ul>
-<pre>&lt;action application="log" data="DEBUG  Sending SMS ..." /&gt;
-&lt;action application="KSendSMS" data="b0|99887766|Test message" /&gt;
-&lt;action application="log" data="DEBUG Sent? ${KSmsDelivered}" /&gt;
-&lt;action application="log" data="DEBUG Code: ${KSmsErrorCode}" /&gt;
-&lt;action application="log" data="DEBUG Desc: ${KSmsErrorName}" /&gt;
-</pre>
-<ul><li> Sends "Test message." phone for "99887766" using the first free modem card "0", or the first free channel board "1" (if no free channel at the first sign):
-</li></ul>
-<pre>&lt;action application="log" data="DEBUG Sending SMS ..." /&gt;
-&lt;action application="KSendSMS" data="b0+b1|99887766|Test message" /&gt;
-</pre>
-<ul><li> Sends "Test message." phone for "99887766" using the first free modem card "0", requesting confirmation:
-</li></ul>
-<pre>&lt;action application="log" data="DEBUG Sending SMS ..." /&gt;
-&lt;action application="KSendSMS" data="b0|99887766!|Test message" /&gt;
-</pre>
-<p><br />
-</p>
-<a name="Application_.22KEchoCanceller.22" id="Application_.22KEchoCanceller.22"></a><h3> <span class="mw-headline"> Application "KEchoCanceller" </span></h3>
-<p>This application has the function to enable or disable the echo canceller channel.
-</p>
-<pre>&lt;action application="KEchoCanceller" data="<b>action</b>[,options])"/&gt;
-</pre>
-<p>Where:
-</p>
-<ul><li><b>actions</b>: It is <b>on</b> to enable the echo canceller, and <b>off</b> to disable;
-</li></ul>
-<p>Example usage of this application:
-</p>
-<pre>&lt;action application="KEchoCanceller" data="off"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Application_.22KAutoGainControl.22" id="Application_.22KAutoGainControl.22"></a><h3> <span class="mw-headline"> Application "KAutoGainControl" </span></h3>
-<p>This application has the function to enable or disable the automatic gain control in the channel.
-</p>
-<pre>&lt;action application="KAutoGainControl" data="<b>action</b>[,options])"/&gt;
-</pre>
-<p>Where:
-</p>
-<ul><li><b>actions</b>: It is <b>on</b> to enable the automatic gain control, and <b>off</b> to disable;
-</li></ul>
-<p>Example usage of this application:
-</p>
-<pre>  &lt;action application="KAutoGainControl" data="on"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Application_.22KDTMFSuppression.22" id="Application_.22KDTMFSuppression.22"></a><h3> <span class="mw-headline"> Application "KDTMFSuppression" </span></h3>
-<p>This application has the function to enable or disable the suppression of DTMF channel. The syntax of the application is as follows:
-</p>
-<pre>&lt;action applicatin="KDTMFSuppression" value="<b>action</b>[,options])"/&gt;
-</pre>
-<p>Where:
-</p>
-<ul><li><b>actions</b>: It is<b>on</b> to enable DTMF suppression, and <b>off</b> to disable;
-</li></ul>
-<p>It is important to note that when disabled suppression of DTMF, DTMF tones are passed inband <i>and</i> will not be reported to FreeSWITCH. Thus FreeSWITCH does not recognize the DTMF tones, which may result in malfunction of applications such as IVR.
-</p><p>Example usage of this application:
-</p>
-<pre>&lt;action applicatin="KDTMFSuppression" value="off"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Application_.22KSetVolume.22" id="Application_.22KSetVolume.22"></a><h3> <span class="mw-headline"> Application "KSetVolume" </span></h3>
-<p>This application has the function to adjust the volume of incoming and outgoing channels Khomp, and its syntax as follows:
-</p>
-<pre>&lt;action application="KSetVolume" data="&lt;volume&gt;"/&gt;
-&lt;action application="KSetVolume" data="&lt;output-volume&gt;|&lt;input-volume&gt;"/&gt;
-</pre>
-<p>Where the fields have the following meanings:
-</p>
-<ul><li><b>volume</b>: Sets the volume of input and output (-10 to +10);
-</li><li><b>output-volume</b>: Sets the output volume (-10 to +10, "none" for no change);
-</li><li><b>input-volume</b>: Sets the input level (-10 to +10, "none" for no change).
-</li></ul>
-<p><br />
-</p>
-<a name="Application_.22KAdjustForFax.22" id="Application_.22KAdjustForFax.22"></a><h3> <span class="mw-headline"> Application "KAdjustForFax" </span></h3>
-<p>This application has the function of setting a channel for receiving Khomp signal FAX/modem, optimizing the communication channel for data traffic. Syntax:
-</p>
-<pre>&lt;action application="KAdjustForFax" data=""/&gt;
-</pre>
-<p>This application does not receive parameters. Example of use:
-</p>
-<pre>&lt;action application="KAdjustForFax" data=""/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Application_.22KSendFax.22" id="Application_.22KSendFax.22"></a><h3> <span class="mw-headline"> Application "KSendFax" </span></h3>
-<p>This application has the function to send faxes using digital channels or FXO connections Khomp in pre-established, and its syntax as follows:
-</p>
-<pre>&lt;action application="KSendFax" data="&lt;file&gt;[:&lt;file2&gt;[:...]][|&lt;faxid&gt;]"/&gt;
-</pre>
-<p><strong>This application requires a license purchased separately to be used in digital (non-FXO) channels</strong>. Fields have the following meanings:
-</p>
-<ul><li><b>file</b>: Files to be sent to the fax should be encapsulated in TIFF format and have a resolution of 98, 196 or 392 dpi;
-</li><li><b>faxid</b>: the fax number. If not specified, the value is obtained by the id of the link, and if this also is not valid, the fax number will be set as default in K3L.
-</li></ul>
-<p>Example usage of this application:
-</p>
-<pre>&lt;action application="KSendFax" data="/tmp/fax.tif:/home/root/fax2.tif,1234"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Application_.22KReceiveFax.22" id="Application_.22KReceiveFax.22"></a><h3> <span class="mw-headline"> Application "KReceiveFax" </span></h3>
-<p>This application has the function of receiving digital channels or fax using the FXO Khomp, and its syntax as follows:
-</p>
-<pre>&lt;action application="KReceiveFax" data="&lt;file&gt;[|&lt;faxid&gt;]/&gt;
-</pre>
-<p><strong>This application requires a license purchased separately to be used in digital (non-FXO) channels</strong>. Fields have the following meanings:
-</p>
-<ul><li><b>file</b>: Name that file will be assigned to incoming fax.
-</li><li><b>faxid</b>: the fax number. If not specified, the value is obtained by the id of the link, and if this also is not valid, the fax number will be set as default in K3L.
-</li></ul>
-<p>Example usage of this application:
-</p>
-<pre>&lt;action application="answer" /&gt;
-&lt;action application="KReceiveFax" data="/tmp/fax.tif"/&gt;
-</pre>
-<p><br />
-</p>
-<a name="Channel_.22Khomp_SMS.22" id="Channel_.22Khomp_SMS.22"></a><h3> <span class="mw-headline"> Channel "Khomp_SMS" </span></h3>
-<p>This communication channel is used to receive SMS and create incoming links in FreeSWITCH for each message received. This channel does not have any treatment or audio processing, and is called with five variables set:
-</p>
-<ul><li><b>KSmsFrom</b>, containing the number of source who sent the message;
-</li><li><b>KSmsDate</b>, which sets the date/time of receipt of the message;
-</li><li><b>KSmsSize</b>, representing the message size (in bytes);
-</li><li><b>KSmsMode</b>, containing the encoding used to transmit the message;
-</li><li><b>KSmsBody</b>, that is the message itself.
-</li></ul>
-<p>The FreeSWITCH dialplan processing can be used to store this message in a database, run any application, among others. However, the only action accepted by this channel is shutdown (Hangup), so this incoming call should be considered a special dialplan execution without audio streams or channel allocation.
-<br />
-</p>
-<a name="Channel_.22Khomp_PR.22" id="Channel_.22Khomp_PR.22"></a><h3> <span class="mw-headline"> Channel "Khomp_PR" </span></h3>
-<p>This communication channel is used to receive calls on boards passive recording (<b>KPR family</b> and <b>KFXO-HI</b>), creating incoming links on FreeSWITCH for each incoming call. This channel allows only receiving audio captured the <i>link</i>by not allowing both the transmission of audio signalings as the control.
-</p><p>The FreeSWITCH dialplan processing can be used to record data on this link in a database, perform some special application and/or some recording application (such as <b>record</b>), among others. However, the only action accepted by this channel is shutdown (Hangup), so this should not be considered a common call.
-<br />
-</p>
-<a name="Codes_and_meanings" id="Codes_and_meanings"></a><h1> <span class="mw-headline"> Codes and meanings </span></h1>
-<p>This chapter presents the codes present in the channel Khomp and their meanings, used in both events as in the AMI console commands:
-<br />
-</p>
-<a name="Channel_state" id="Channel_state"></a><h2> <span class="mw-headline"> Channel state </span></h2>
-<p>Reflect the state of the channel on the board. In the case of E1 links, the state may have one or more of the following:
-</p>
-<ul><li><b>Free</b>: the channel is free;
-</li><li><b>Busy</b>: the channel is not free (or occupied, or failure);
-</li><li><b>Outgoing</b>: the channel has an output connection;
-</li><li><b>Incoming</b>: the channel has an input connection;
-</li><li><b>Locked</b>: the channel is blocked;
-</li><li><b>Outgoing Lock</b>: The channel is blocked for outgoing calls;
-</li><li><b>Local Fail</b>: The channel has a fault (at this point);
-</li><li><b>Incoming Lock</b>: the channel is blocked for incoming calls;
-</li><li><b>Remote Lock</b>: there is a remote lock (at the other end) in this channel.
-</li></ul>
-<p>In the case of a FXS channel, the state is defined by one of these values:
-</p>
-<ul><li><b>On Hook</b>: the phone connected to this channel is on-hook or disconnected;
-</li><li><b>Off Hook</b>: the phone connected to this channel is off the hook;
-</li><li><b>Ringing</b>: the channel is being called;
-</li><li><b>Failure</b>: the channel is in failure due to communication problems between the central and the plate.
-</li></ul>
-<p>In the case of a GSM channel, the state is defined by one of the following values:
-</p>
-<ul><li><b>Idle</b>: the channel is free and available for calls;
-</li><li><b>Call In Progress</b>: the channel is busy on a call;
-</li><li><b>SMS In Progress</b>: the channel is busy sending / receiving SMS messages;
-</li><li><b>Modem Error</b>: an error occurred communicating with the modem channel;
-</li><li><b>SIM Card Error</b>: The SIM card is not present or is not inserted / detected correctly;
-</li><li><b>Network Error</b>: an error occurred while communicating with the network;
-</li><li><b>Not Ready</b>: The modem is initializing the channel.
-</li></ul>
-<p>And in the case of an FXO channel, the states are as follows:
-</p>
-<ul><li><b>Disabled</b>: the channel is disabled;
-</li><li><b>Enabled</b>: the channel is enabled.
-</li></ul>
-<p><br />
-</p>
-<a name="Call_state" id="Call_state"></a><h2> <span class="mw-headline"> Call state </span></h2>
-<p>Defines the logical state for each channel, which can be:
-</p>
-<ul><li><b>Free</b>: the channel is free;
-</li><li><b>Incoming</b>: the channel is receiving a call;
-</li><li><b>Outgoing</b>: the channel is making a call;
-</li><li><b>Failure</b>: the channel is in fault.
-</li></ul>
-<p><br />
-</p>
-<a name="FreeSWITCH_call_states" id="FreeSWITCH_call_states"></a><h2> <span class="mw-headline"> FreeSWITCH call states </span></h2>
-<p>Directly reflects the call state controlled by FreeSWITCH, which can be:
-</p><p><br />
-</p>
-<ul><li> <b>new</b>: Channel is newly created;
-</li><li> <b>init</b>: Channel has been initialized;
-</li><li> <b>routing</b>: Channel is looking for an extension to execute;
-</li><li> <b>execute</b>: Channel is executing its dialplan;
-</li><li> <b>ex_media</b>: Channel is exchanging media with another channel;
-</li><li> <b>cs_media</b>: Channel is consuming all media;
-</li><li> <b>hangup</b>: Channel is flagged for hangup and ready to end.
-</li></ul>
-<p><br />
-</p>
-<a name="GSM_Codes" id="GSM_Codes"></a><h2> <span class="mw-headline"> GSM Codes </span></h2>
-<p>The following numeric codes are reported:
-</p>
-<a name="SMS_codes_.28SMS_causes.29" id="SMS_codes_.28SMS_causes.29"></a><h3> <span class="mw-headline"> SMS codes (SMS causes) </span></h3>
-<pre>1	Unassigned number
-8	Operator determined barring
-10	Call barred
-21	SMS transfer rejected
-27	Destination out of service
-28	Unidentified subscriber
-29	Facility rejected
-30	Unknown subscriber
-38	Network out of order
-41	Temporary failure
-42	Congestion
-47	Resources unavailable
-50	Facility not subscribed
-69	Facility not implemented
-81	Invalid SMS transfer reference value
-95	Invalid message
-96	Invalid mandatory information
-97	Message type non existent
-98	Message not compatible with SMS protection state
-99	Information element non existent
-111	Protocol error
-127	Interworking
-128	Telematic interworking not supported
-129	SMS type zero not supported
-130	Cannot replace SMS
-143	Unspecified TPPID error
-144	Alphabet not supported
-145	Message class not supported
-159	Unspecified TPDCS error
-160	Command cannot be actioned
-161	Command unsupported
-175	Unspecified TP command error
-176	TPDU not supported
-192	SC busy
-193	No SC subscription
-194	SC system failure
-195	Invalid SME address
-196	Destination SME barred
-197	SM rejected duplicate SM
-198	TPVPF not supported
-199	TPVP not supported
-208	SIM SMS storage full
-209	No SMS storage capability in SIM
-210	Error in SMS
-211	Memory capatity exceeded
-213	SIM data download error
-255	Unspecified error
-300	Phone failure
-301	SMS service reserved
-302	Operation not allowed
-303	Operation not supported
-304	Invalid PDU mode parameter
-305	Invalid text mode parameter
-310	SIM not inserted
-311	SIM PIN necessary
-312	Phone SIM PIN necessary
-313	SIM failure
-314	SIM busy
-315	SIM wrong
-320	Memory failure
-321	Invalid memory index
-322	Memory full
-330	SMSC address unknown
-331	No network service
-332	Network timeout
-500	Unknown error
-512	Network busy
-513	Invalid destination address
-514	Invalid message body length
-515	Phone is not in service
-516	Invalid preferred memory storage
-517	User terminated
-</pre>
-<a name="Call_codes_.28call_causes.29" id="Call_codes_.28call_causes.29"></a><h3> <span class="mw-headline"> Call codes (call causes) </span></h3>
-<pre>1	Unallocated number
-3	No route to destination
-6	Channel unacceptable
-8	Operator determined barring
-16	Normal call clear
-17	User busy
-18	No user responding
-19	No answer from user
-21	Call rejected
-22	Number changed
-26	Non Selected user clear
-27	Destination out of order
-28	Invalid number format
-29	Facility rejected
-30	Response status enquiry
-31	Normal, unspecified
-34	No circuit channel available
-38	Network out of order
-41	Temporary failure
-42	Switch congestion
-43	Access information discarded
-44	Requested channel unavailable
-47	Resource unavailable
-49	QoS unavailable
-50	Request facility not subscribed
-55	Call barred with UG
-57	Bearer capability not authorized
-58	Bearer capability not available
-63	Service not available
-65	Bearer capability not implemented
-69	Request facility not implemented
-70	Only restricted bearer capability available
-79	Service not implemented
-81	Invalid call reference value
-82	User not member of UG
-88	Incompatible destination
-91	Invalid transit network selected
-95	Invalid message
-96	Missing mandatory information element
-97	Message type not implemented
-98	Message incompatible with state
-99	Information element not implemented
-100	Invalid information element
-101	Message incompatible with state (2)
-102	Recovery on timer expiry
-111	Protocol error
-127	Interworking
-</pre>
-<a name="General_codes_.28mobile_causes.29" id="General_codes_.28mobile_causes.29"></a><h3> <span class="mw-headline"> General codes (mobile causes) </span></h3>
-<pre>0	Phone failure
-1	No connection to phone
-2	Phone adaptor link reserved
-3	Operation not allowed
-4	Operation not supported
-5	Phone SIM PIN required
-6	Phone FSIM PIN required
-7	Phone FSIM PUK required
-10	SIM not inserted
-11	SIM PIN required
-12	SIM PUK required
-13	SIM failure
-14	SIM busy
-15	SIM wrong
-16	Incorrect password
-17	SIM PIN2 required
-18	SIM PUK2 required
-20	Memory full
-21	Invalid index
-22	Not found
-23	Memory failure
-24	Text string too long
-25	Invalid character in text string
-26	Dial string too long
-27	Invalid character in dial string
-30	No network service
-31	Network timeout
-32	Network not allowed
-33	Command aborted
-34	Number parameter instead of text parameter
-35	Text parameter instead of number parameter
-36	Numeric parameter out of bounds
-37	Text string too short
-40	Network PIN required
-41	Network PUK required
-42	Network subset PIN required
-43	Network subset PUK required
-44	Network service provider PIN required
-45	Network service provider PUK required
-46	Corporate PIN required
-47	Corporate PUK required
-60	SIM Service option not supported
-100	Unknown
-103	Illegal MS #3
-106	Illegal MS #6
-107	GPRS service not allowed #7
-111	PLMN not allowed #11
-112	Location area not allowed #12
-113	Roaming not allowed #13
-132	Service option not supported #32
-133	Registration service option not subscribed #33
-134	Service option temporary out of order #34
-147	Long context activation
-148	Unspecified GPRS error
-149	PDP authentication failure
-150	Invalid mobile class
-151	GPRS disconnection TMR active
-256	Too many active calls
-257	Call rejected
-258	Unanswered call pending
-259	Unknown calling error
-260	No phone number recognized
-261	Call state not idle
-262	Call in progress
-263	Dial state error
-264	Unlock code required
-265	Network busy
-266	Invalid phone number
-267	Number entry already started
-268	Cancelled by user
-269	Number entry could not be started
-280	Data lost
-281	Invalid message body length
-282	Inactive socket
-283	Socket already open
-</pre>
-<p><br />
-</p>
-<a name="Troubleshooting" id="Troubleshooting"></a><h1> <span class="mw-headline"> Troubleshooting </span></h1>
-<p>In this section, errors and their most common solutions are presented.
-</p>
-<a name="Error_during_installation_of_kernel_module" id="Error_during_installation_of_kernel_module"></a><h2> <span class="mw-headline"> Error during installation of kernel module </span></h2>
-<p>During installation of the <i>Endpoint</i>of Khomp may occur the following messages:
-<!-- NEED 3 -->
-</p>
-<pre>K3L: WARNING: Unable to find a module for [...]
-</pre>
-<p>or
-<!-- NEED 8 --> 
-</p>
-<pre>install: ******  THE KERNEL MODULE HAS NOT BEEN INSTALLED: *******
-install: 
-install: ** Please, untar the file kpdriver*.tar.gz located in: **
-install: **                 '/usr/src/khomp/'                   **
-install: **             then check the README.txt               **
-install: **  for knowing how to proceed with the installation.  **
-</pre>
-<p>In this case, you must compile the drivers manually to your system. Proceed to the item below for more information.
-<br />
-</p>
-<a name="Compiling_the_drivers_and_starting_the_services" id="Compiling_the_drivers_and_starting_the_services"></a><h3> <span class="mw-headline"> Compiling the drivers and starting the services </span></h3>
-<p>Just follow to the directory <b>/usr/src/khomp</b>, unpack the file "kpdriver_2.0.0<b>XX</b>.tar.gz", and follow procedures described in the file <b>README_en.txt</b>.
-</p><p>After performing compilation and installation of the module, just load it into the system, configuring the boards and start the server processes Khomp.
-</p><p>To load the kernel driver, you must run the following command:
-<!-- NEED 3 --> 
-</p>
-<pre># /etc/init.d/khompdrv start
-</pre>
-<p>To set up the boards, in turn, must run the command:
-<!-- NEED 3 --> 
-</p>
-<pre># khompwizard
-</pre>
-<p>This will run a setup wizard that will ask the signaling used in the system, as well as other parameters of use of the boards.
-</p><p>If necessary configure other additional parameters you can use the following command:
-<!-- NEED 3 --> 
-</p>
-<pre># k3lconfig
-</pre>
-<p>This configurator, in turn, shows all possible options for card configuration. The parameters that are not configured automatically assume the default values, and are compatible with most systems. More details about this program can be obtained from the section number '2 '.
-</p>
-<ul><li> <b>ATTENTION</b>: To start FreeSWITCH&reg;, it is necessary that the Khomp board is configured and all modules are running (as shown above). <br /> <br /> If you want to run the system without the Khomp board, you need to configure FreeSWITCH for it does not load the module Khomp. To do this, open the <b>/usr/local/freeswitch/conf/autoload_configs/modules.conf.xml</b> and comment the line:<br />
-</li></ul>
-<pre> 
-&lt;!-- &lt;load module=&quot;mod_khomp&quot; /&gt; --&gt;
-</pre><br /> 
-<p>When the board Khomp is properly configured and loaded modules khomp (explained above), remember to uncomment this line in the file.
-</p><p>Finally, to load the server process, simply run the following command:
-<!-- NEED 3 -->
-</p>
-<pre># kserver start
-</pre>
-<p>After performing these procedures, the Endpoint is already operational, and FreeSWITCH can now be loaded.
-<br />
-</p>
-<a name="Setting_up_special_parameters_for_audio_or_signaling" id="Setting_up_special_parameters_for_audio_or_signaling"></a><h2> <span class="mw-headline"> Setting up special parameters for audio or signaling </span></h2>
-<p>To set specific parameters of timing and/or signaling, you can use the program "k3lconfig": simply select the card you want, and options of the boards will be presented, divided into sections and subsections for easy access. It is not necessary to effect the configuration of all parameters: default values are assumed, if not configured.
-</p><p>To adjust the signaling link, simply - after selecting the card - enter the "Options signaling, and then in" Signs of the line. " To choose a particular signaling, just use the direction keys (arrows) to select it, press 'space', and confirm the option by pressing 'Enter' on the "Confirm" button.
-</p><p>Finally, to save the modified settings, just exit the program: it will display a window with options to save the changes made or not.
-</p><p>Please not that <b>the following options are required to be unchanged from the defaults</b>:
-</p>
-<ul><li> Automatic echo cancellation;
-</li><li> DTMF suppression;
-</li><li> Automatic Gain Control (AGC).
-</li></ul>
-<p>These options are <b>controlled by Endpoint</b> and should be <b>disabled</b> in 'k3lconfig' (the default configuration).
-<br />
-</p>
-<a name="Automatic_load_of_services_and_kernel_modules" id="Automatic_load_of_services_and_kernel_modules"></a><h2> <span class="mw-headline"> Automatic load of services and kernel modules </span></h2>
-<p>If the loading of <i>kernel</i> module or Khomp services startup is not performed automatically at startup, you can perform this installation manually, creating a <i>link</i> for the <i>scripts</i> <b>/etc/init.d/khompdrv</b> and <b>/etc/init.d/kserver</b> in the system startup directory.
-</p><p>In the case of <b>Debian</b>-based distributions the <i>script</i> for loading <i>kernel</i> modules would be <i>linked</i> within the directory <i>/etc/rcS.d</i>, while the services loader would be <i>linked</i> within the directories <i>/etc/rc2.d</i>, <i>/etc/rc3.d</i>, <i>/etc/rc4.d</i>, <i>/etc/rc5.d</i> as follows:
-</p><p><!-- NEED 6 -->
-</p>
-<pre># ln -s /etc/init.d/khompdrv  /etc/rcS.d/S19khompdrv
-# ln -s /etc/init.d/kserver   /etc/rc2.d/S20kserver
-# ln -s /etc/init.d/kserver   /etc/rc3.d/S20kserver
-# ln -s /etc/init.d/kserver   /etc/rc4.d/S20kserver
-# ln -s /etc/init.d/kserver   /etc/rc5.d/S20kserver
-</pre>
-<p>Please check the rules of your distribution to initialize the services in accordance with what is expected by the start of it.
-<br />
-</p>
-<a name="Ap.C3.AAndice" id="Ap.C3.AAndice"></a><h1> <span class="mw-headline"> Ap�ndice </span></h1>
-<p>This section presents useful informations about Endpoint and related components.
-</p>
-<a name="Arrangement_of_installed_files" id="Arrangement_of_installed_files"></a><h2> <span class="mw-headline"> Arrangement of installed files </span></h2>
-<p>The directories created/modified in this facility are:
-<!-- NEED 20 -->
-</p>
-<pre>/etc/init.d/                -- Startup scripts;
-
-/etc/khomp/                 -- Firmware files and settings;
-
-/usr/local/freeswitch/conf/ -- Settings for FreeSWITCH and Endpoint;
-
-/usr/doc/khomp/             -- Docs for the boards, Channel, and utilities;
-
-/usr/sbin/                  -- Utilities and server processes;
-
-/usr/lib/                   -- Shared libraries;
-
-/usr/local/freeswitch/mod/  -- Endpoint module;
- 
-/var/log/khomp2.1/          -- Log directory for K3L and Endpoint;
-</pre>
-<p>The script <b>/etc/init.d/khompdrv</b> is responsible for loading modules <b>kpci9030.ko</b> and <b>kpex8311.ko</b> in the kernel, which should be carried out automatically at system startup. In case of problems, check the <a href="#Troubleshooting" title="">Troubleshooting</a> section. 
-</p><p><br />
-</p><p>For more details: <a href="http://www.khomp.com.br" class="external free" title="http://www.khomp.com.br" rel="nofollow">http://www.khomp.com.br</a>
-</p><p><br />
-</p></body></html>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf b/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf
deleted file mode 100644
index a0645460e5..0000000000
Binary files a/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf and /dev/null differ
diff --git a/src/mod/endpoints/mod_khomp/examples/intercept.xml b/src/mod/endpoints/mod_khomp/examples/intercept.xml
deleted file mode 100644
index 5c91d7c79e..0000000000
--- a/src/mod/endpoints/mod_khomp/examples/intercept.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<include>
-
-<!-- ########################### FXS Context ############################### -->
-<context name="khomp-fxs-00">
-
-  <extension name="main">
-    <condition field="destination_number" expression="^(\d{4})$">
-    <action application="set"    data="called_party_callgroup=1"/>
-    <action application="db"     data="insert/last_dial/${called_party_callgroup}/${uuid}"/>
-    <action application="bridge" data="khomp/r$1"/>
-    </condition>
-  </extension>
-
-  <extension name="intercept">
-    <condition field="destination_number" expression="^55$">
-      <action application="answer"/>
-      <action application="set"       data="intercept_unbridged_only=true"/>
-      <action application="intercept" data="${db(select/last_dial/1)}"/>
-    </condition>
-  </extension>
-
-</context>
-<!-- ####################################################################### -->
-
-</include>
-
diff --git a/src/mod/endpoints/mod_khomp/examples/transfer.xml b/src/mod/endpoints/mod_khomp/examples/transfer.xml
deleted file mode 100644
index 5c66633574..0000000000
--- a/src/mod/endpoints/mod_khomp/examples/transfer.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<include>
-
-<!-- ########################### FXS Context ############################### -->
-<context name="khomp-fxs-00">
-
-  <extension name="main">
-    <condition field="destination_number" expression="^(\d{4})$">
-    <action application="set"    data="continue_on_fail=true"/>
-    <action application="set"    data="dialed_extension=$1"/>
-    <action application="export" data="dialed_extension=$1"/>
-    <action application="bind_meta_app" data="1 b s execute_extension::attented_xfer XML khomp-features"/>
-    <action application="set"    data="transfer_ringback=$${hold_music}"/>
-    <action application="set"    data="call_timeout=10"/>
-    <action application="set"    data="hangup_after_bridge=true"/>
-    <action application="bridge" data="khomp/r$1"/>
-    <action application="bridge" data="sofia/external/$1@169.1.1.1"/>
-    <action application="hangup"/>
-    </condition>
-  </extension>
-
-</context>
-<!-- ####################################################################### -->
-<!-- ########################## Features ################################### -->
-<context name="khomp-features">
-
-  <extension name="attented_xfer">
-    <condition field="destination_number" expression="^attented_xfer$">
-      <action application="set"      data="continue_on_fail=true"/>
-      <action application="set"      data="ringback=${us-ring}"/>
-
-      <action application="read"     data="3 4 misc/8000/transfer1.wav attxfer_callthis 30000 #"/>
-      <action application="set"      data="origination_cancel_key=#" />
-
-      <action application="att_xfer" data="khomp/r${attxfer_callthis}"/>
-      <action application="att_xfer" data="sofia/external/${attxfer_callthis}@169.1.1.1" />
-    </condition>
-  </extension>
-
-</context>
-<!-- ####################################################################### -->
-
-</include>
-
diff --git a/src/mod/endpoints/mod_khomp/include/applications.h b/src/mod/endpoints/mod_khomp/include/applications.h
deleted file mode 100644
index 14ba1d3323..0000000000
--- a/src/mod/endpoints/mod_khomp/include/applications.h
+++ /dev/null
@@ -1,1037 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _APPLICATIONS_H_
-#define _APPLICATIONS_H_
-
-#include "lock.h"
-#include "khomp_pvt.h"
-
-struct Application 
-{
-    Application(Board::KhompPvt * pvt) : _pvt(pvt) {}
-    ~Application() {}
-
-    Statistics * statistics() { return _app_statistics; }
-
-    template <typename T>
-    T* statistics() { return static_cast<T*>(_app_statistics); }
-
-    Board::KhompPvt *_pvt;
-    Statistics      *_app_statistics;
-};
-
-/*************************** FAX **********************************************/
-struct Fax
-{
-    Fax(Board::KhompPvt * pvt) : _pvt(pvt) {}
-
-    /*
-    bool clear(Board::KhompPvt * pvt)
-    {
-        _pvt = pvt;
-        return true;
-    }
-    */
-
-    bool adjustForFax();    
-
-    bool sendFax(switch_core_session_t * session, const char *data);
-    bool receiveFax(switch_core_session_t * session, const char *data);
-
-    bool onFaxChannelRelease(K3L_EVENT *e);
-
-    bool startFaxTX(const char * orig_addr = NULL);
-    bool stopFaxTX();
-    bool startFaxRX(const char * filename, const char * orig_addr = NULL);
-    bool stopFaxRX();
-    bool addFaxFile(const char * filename, bool last = true);
-
-
-    Board::KhompPvt *_pvt;
-
-    /* used by app FAX */
-    SavedCondition _fax_cond;
-    KFaxResult     _fax_result;
-
-};
-
-/*************************** TRANSFER *****************************************/
-template <typename T, bool flash = true>
-struct Transfer
-{
-    Transfer(Board::KhompPvt * pvt) : _pvt(pvt), _is_ok(false) {}
-    
-    bool clear()
-    {
-        if(!_is_ok)
-        {
-            _call = dynamic_cast<T *>(_pvt->call());
-
-            _is_ok = true;
-
-            if(!_call)
-            {
-                DBG(FUNC, D("Error in cast"));
-                _is_ok = false;
-            }
-        }
-
-        _call->_flags.clear(Kflags::XFER_DIALING);
-
-        return true;
-    }
-
-    bool userTransfer(switch_core_session_t * session, const char *data)
-    {
-        DBG(FUNC, PVT_FMT(_pvt->target(), "c"));
-
-        std::string dest("");
-        std::string opts("");
-
-        try
-        {
-            Strings::vector_type params;
-
-            Strings::tokenize((const char *)data, params, "|,", 2);
-
-            dest = params[0];
-
-            if (params.size() > 1)
-            {
-                // other options go here...
-            }
-            
-            ScopedPvtLock lock(_pvt);
-
-            int timeout = 5;
-
-            if(!_pvt->call()->_flags.check(Kflags::REALLY_CONNECTED) && !_pvt->loopWhileFlagTimed(Kflags::REALLY_CONNECTED, timeout, false))
-                return false;
-
-            DBG(FUNC, PVT_FMT(_pvt->target(), "flashing channel!"));
-
-            _pvt->command(KHOMP_LOG, CM_FLASH);
-
-            lock.unlock();
-
-            timeout = 15; // 15 * 200000 = 3s
-
-            do
-            {
-                usleep(200000);
-                timeout--;
-
-                ScopedPvtLock lock2(_pvt);
-
-                if(!_pvt->call()->_flags.check(Kflags::IS_INCOMING) && !_pvt->call()->_flags.check(Kflags::IS_OUTGOING))
-                {
-                    DBG(FUNC, PVT_FMT(_pvt->target(), "unable to do a user transfer, channel disconnected"));
-                    return false;
-                }
-
-            }
-            while(timeout);
-
-            ScopedPvtLock lock3(_pvt);
-
-            _pvt->command(KHOMP_LOG, CM_DIAL_DTMF, dest.c_str());
-
-            _pvt->call()->_flags.set(Kflags::WAIT_SEND_DTMF);
-
-            lock3.unlock();
-
-            timeout = 300; // 300 * 200000 = 60s
-
-            do
-            {
-                usleep(200000);
-                timeout--;
-
-                ScopedPvtLock lock4(_pvt);
-
-                if(!_pvt->call()->_flags.check(Kflags::WAIT_SEND_DTMF))
-                    break;
-            }
-            while(timeout);
-
-        }
-        catch (ScopedLockFailed & err)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
-            return false;
-        }
-
-
-        DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
-        return true;
-    }
-
-    /* User transfer functions */
-    bool doUserXferUnlocked()
-    {
-        DBG(FUNC, PVT_FMT(_pvt->target(), "c (flashing channel!)"));
-
-        bool ret = false;
-
-        ret = _pvt->command(KHOMP_LOG, CM_FLASH);
-
-        DBG(FUNC, PVT_FMT(_pvt->target(), "r (%s)") % (ret ? "true" : "false"));
-        return ret;
-    }
-
-    bool checkUserXferUnlocked(std::string digit)
-    { 
-        DBG(FUNC, PVT_FMT(_pvt->target(), "c (CM_FLASH)"));
-
-
-        if (_call->_user_xfer_digits.empty())
-        {
-            _call->_digits_buffer += digit;
-            DBG(FUNC, PVT_FMT(_pvt->target(), "r (disabled)"));
-            return false;
-        }
-
-        _call->_user_xfer_buffer += digit;
-
-        /* temporary buffer */
-        std::string tmp = _call->_user_xfer_buffer;
-
-        unsigned int amount = tmp.size();
-        
-        try
-        {
-
-        if (amount == _call->_user_xfer_digits.size())
-        {
-            if (tmp == _call->_user_xfer_digits)
-            {
-                bool ret = doUserXferUnlocked();
-
-                _call->_user_xfer_buffer.clear();
-                _call->_digits_buffer.clear();
-
-                Board::board(_pvt->target().device)->_timers.del(_idx_xfer_dial);
-
-                DBG(FUNC, PVT_FMT(_pvt->target(), "r (ret=%s, done xfer)") % (ret ? "true" : "false"));
-                return ret;
-            }
-
-            _call->_digits_buffer += tmp[0];
-            _call->_user_xfer_buffer.erase(0, 1);
-            DBG(FUNC, PVT_FMT(_pvt->target(), "r (false, no xfer)"));
-            return false;
-        }
-
-        if (tmp == _call->_user_xfer_digits.substr(0,amount))
-        {
-            if (!(_call->_flags.check(Kflags::XFER_DIALING)))
-            {
-                _call->_flags.set(Kflags::XFER_DIALING);
-                _idx_xfer_dial = Board::board(_pvt->target().device)->_timers.add(Opt::_options._transferdigittimeout(), &userXferTimer, _pvt, TM_VAL_CALL);
-            }
-            else
-            {
-                Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
-            }
-
-            DBG(FUNC, PVT_FMT(_pvt->target(), "r (true, buffering)"));
-            return true;
-        }
-
-        }
-        catch (K3LAPITraits::invalid_device & err)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "Unable to get device: %d!") % err.device);
-        }
-
-        _call->_digits_buffer += tmp[0];
-        _call->_user_xfer_buffer.erase(0, 1);
-        DBG(FUNC, PVT_FMT(_pvt->target(), "r (false, buffering)"));
-
-        return false;
-
-    }
-
-    static void userXferTimer(Board::KhompPvt * pvt)
-    {
-        DBG(FUNC, PVT_FMT(pvt->target(), "c"));
-        
-        T * call = static_cast<T *>(pvt->call());
-
-        try
-        {
-            ScopedPvtLock lock(pvt);
-
-            if (!call->_user_xfer_buffer.empty())
-            {
-                pvt->command(KHOMP_LOG, CM_DIAL_DTMF, call->_user_xfer_buffer.c_str());
-
-                /* clear the buffer that has been send */
-                call->_user_xfer_buffer.clear();
-            }
-
-            call->_flags.clear(Kflags::XFER_DIALING);
-        }
-        catch (ScopedLockFailed & err)
-        {
-            LOG(ERROR, PVT_FMT(pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
-            return;
-        }
-
-        DBG(FUNC, PVT_FMT(pvt->target(), "r"));
-    }
-
-    bool                    _is_ok;
-    T *                     _call;
-    Board::KhompPvt *       _pvt;
-    Board::ChanTimer::Index _idx_xfer_dial;
-};
-
-template<typename T> 
-struct Transfer<T, false>
-{
-    Transfer(Board::KhompPvt * pvt) : _pvt(pvt), _is_ok(false) {}
-
-    bool clear()
-    {
-        if(!_is_ok)
-        {
-            _call = dynamic_cast<T *>(_pvt->call());
-
-            _is_ok = true;
-
-            if(!_call)
-            {
-                DBG(FUNC, D("Error in cast"));
-                _is_ok = false;
-            }
-        }
-
-        _call->_flags.clear(Kflags::XFER_DIALING);
-        _call->_flags.clear(Kflags::XFER_QSIG_DIALING);
-
-        return true;
-    }
-    
-    bool userTransfer(switch_core_session_t * session, const char *data)
-    {
-        DBG(FUNC, PVT_FMT(_pvt->target(), "c"));
-
-        std::string dest("");
-
-        bool opt_nowait = false;
-
-        try
-        {
-            Strings::vector_type params;
-
-            Strings::tokenize((const char *)data, params, "|,", 2);
-
-            dest = params[0];
-
-            if (params.size() > 1)
-            {
-                opt_nowait = (params[1].find('n') != std::string::npos);
-
-                // other options go here...
-            }
-            
-            ScopedPvtLock lock(_pvt);
-
-            int timeout = 5;
-            
-            if(!_pvt->call()->_flags.check(Kflags::REALLY_CONNECTED) && !_pvt->loopWhileFlagTimed(Kflags::REALLY_CONNECTED, timeout, false))
-                return false;
-
-            DBG(FUNC, PVT_FMT(_pvt->target(), "ss_transfer on channel!"));
-
-            _pvt->command(KHOMP_LOG, CM_SS_TRANSFER,
-                    STG(FMT("transferred_to=\"%s\" await_connect=\"%d\"")
-                    % dest % (opt_nowait ? 0 : 1)).c_str());
-
-        }
-        catch (ScopedLockFailed & err)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
-            return false;
-        }
-
-
-        DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
-        return true;
-    }
-
-    /* User transfer functions */
-    bool doUserXferUnlocked(void)
-    {
-        DBG(FUNC, PVT_FMT(_pvt->target(), "c"));
-
-        bool ret = false;
-
-        if (_call->_flags.check(Kflags::XFER_QSIG_DIALING))
-        {
-            DBG(FUNC, PVT_FMT(_pvt->target(), "ss_transfer on channel!"));
-
-            _call->_flags.clear(Kflags::XFER_DIALING);
-            _call->_flags.clear(Kflags::XFER_QSIG_DIALING);
-
-            ret = _pvt->command(KHOMP_LOG, CM_SS_TRANSFER,
-                    STG(FMT("transferred_to=\"%s\" await_connect=\"1\"") % _call->_qsig_number).c_str());
-        }
-        else
-        {
-            DBG(FUNC, PVT_FMT(_pvt->target(), "starting to store digits for ss_transfer..."));
-            _call->_flags.set(Kflags::XFER_QSIG_DIALING);
-
-            _xfer_thread = threadCreate(Transfer<T, false>::userXferPlayback,(void*) _pvt);
-            _xfer_thread->start();
-
-            ret = true;
-        }
-
-        DBG(FUNC, PVT_FMT(_pvt->target(), "r (%s)") % (ret ? "true" : "false"));
-        return ret;
-
-    }
-
-    bool checkUserXferUnlocked(std::string digit) 
-    { 
-        DBG(FUNC, PVT_FMT(_pvt->target(), "c (CM_SS_TRANSFER)"));
-
-
-        if (_call->_user_xfer_digits.empty())
-        {
-            _call->_digits_buffer += digit;
-            DBG(FUNC, PVT_FMT(_pvt->target(), "r (disabled)"));
-            return false;
-        }
-
-        _call->_user_xfer_buffer += digit;
-
-        DBG(FUNC, PVT_FMT(_pvt->target(), "c digits=[%s] buffer=[%s]") % _call->_user_xfer_digits % _call->_user_xfer_buffer );
-
-        /* temporary buffer */
-        std::string tmp = _call->_user_xfer_buffer;
-
-        unsigned int amount = tmp.size();
-        
-        try
-        {
-
-        if (amount == _call->_user_xfer_digits.size())
-        {
-            if (tmp == _call->_user_xfer_digits)
-            {
-                bool ret = doUserXferUnlocked();
-
-                _call->_user_xfer_buffer.clear();
-                _call->_qsig_number.clear();
-                _call->_digits_buffer.clear();
-
-                if(!_call->_flags.check(Kflags::XFER_QSIG_DIALING))
-                {
-                    Board::board(_pvt->target().device)->_timers.del(_idx_xfer_dial);
-
-                    DBG(FUNC, PVT_FMT(_pvt->target(), "r (ret=%s, done xfer)") % (ret ? "true" : "false"));
-                }
-                else
-                {
-                    Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
-                    DBG(FUNC, PVT_FMT(_pvt->target(), "r (waiting digits for transfer)"));
-                }
-                return ret;
-            }
-
-            if (_call->_flags.check(Kflags::XFER_QSIG_DIALING))
-            {
-                DBG(FUNC, PVT_FMT(_pvt->target(), "putting digits ('%s') on transfer-to number!") % tmp);
-
-                _call->_qsig_number += tmp[0];
-                _call->_user_xfer_buffer.erase(0, 1);
-                Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
-
-                DBG(FUNC, PVT_FMT(_pvt->target(), "r (true, qsig transfer)"));
-                return true;
-            }
-
-            _call->_digits_buffer += tmp[0];
-            _call->_user_xfer_buffer.erase(0, 1);
-            DBG(FUNC, PVT_FMT(_pvt->target(), "r (false, no qsig)"));
-            return false;
-        }
-
-        if (tmp == _call->_user_xfer_digits.substr(0,amount))
-        {
-            if (!(_call->_flags.check(Kflags::XFER_DIALING) || _call->_flags.check(Kflags::XFER_QSIG_DIALING)))
-            {
-                _call->_flags.set(Kflags::XFER_DIALING);
-                _idx_xfer_dial = Board::board(_pvt->target().device)->_timers.add(Opt::_options._transferdigittimeout(), &userXferTimer, _pvt, TM_VAL_CALL);
-            }
-            else
-            {
-                Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
-            }
-
-            DBG(FUNC, PVT_FMT(_pvt->target(), "r (true, buffering)"));
-            return true;
-        }
-
-        if (_call->_flags.check(Kflags::XFER_QSIG_DIALING))
-        {
-            DBG(FUNC, PVT_FMT(_pvt->target(), "putting digits ('%s') on transfer-to number!") % tmp);
-
-            _call->_qsig_number += tmp[0];
-            _call->_user_xfer_buffer.erase(0, 1);
-
-            Board::board(_pvt->target().device)->_timers.restart(_idx_xfer_dial);
-            DBG(FUNC, PVT_FMT(_pvt->target(), "r (true, qsig buffering)"));
-            return true;
-        }
-        
-        }
-        catch (K3LAPITraits::invalid_device & err)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "Unable to get device: %d!") % err.device);
-        }
-
-        _call->_digits_buffer += tmp[0];
-        _call->_user_xfer_buffer.erase(0, 1);
-        DBG(FUNC, PVT_FMT(_pvt->target(), "r (false, buffering)"));
-
-        return false;
-    }
-
-    static void userXferTimer(Board::KhompPvt * pvt)
-    {
-        DBG(FUNC, PVT_FMT(pvt->target(), "c"));
-
-        T * call = static_cast<T *>(pvt->call());
-
-        try
-        {
-            ScopedPvtLock lock(pvt);
-
-            if (!call->_user_xfer_buffer.empty())
-            {
-                pvt->command(KHOMP_LOG, CM_DIAL_DTMF, call->_user_xfer_buffer.c_str());
-
-                /* clear the buffer that has been send */
-                call->_user_xfer_buffer.clear();
-            }
-
-            if (!call->_qsig_number.empty())
-            {
-                pvt->command(KHOMP_LOG, CM_SS_TRANSFER,
-                        STG(FMT("transferred_to=\"%s\" await_connect=\"1\"") % call->_qsig_number).c_str());
-
-                /* clear the buffer that has been send */
-                call->_qsig_number.clear();
-            }
-
-            call->_flags.clear(Kflags::XFER_DIALING);
-            call->_flags.clear(Kflags::XFER_QSIG_DIALING);
-        }
-        catch (ScopedLockFailed & err)
-        {
-            LOG(ERROR, PVT_FMT(pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
-            return;
-        }
-
-        DBG(FUNC, PVT_FMT(pvt->target(), "r"));
-    }
-
-    static switch_status_t dtmfCallback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
-    {
-        char sbuf[3];
-
-        if(!session)
-        {
-            DBG(FUNC,D("session is NULL"))
-                return SWITCH_STATUS_FALSE;
-        }
-
-        switch_channel_t * chan = switch_core_session_get_channel(session);
-
-        if(!chan)
-        {
-            DBG(FUNC,D("channel is NULL"))
-                return SWITCH_STATUS_FALSE;
-        }
-
-        switch_core_session_t *peer_session = switch_core_session_locate(switch_channel_get_partner_uuid(chan));
-
-        if(!peer_session)
-        {
-            DBG(FUNC,D("session is NULL"))
-                return SWITCH_STATUS_FALSE;
-        }
-
-        switch (itype) 
-        {
-            case SWITCH_INPUT_TYPE_DTMF:
-            {
-                switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
-
-                Board::KhompPvt * tech_pvt = static_cast< Board::KhompPvt* >(switch_core_session_get_private(peer_session));
-                if(!tech_pvt)
-                {
-                    DBG(FUNC,D("Init: pvt is NULL"))
-                    switch_core_session_rwunlock(peer_session);
-                    return SWITCH_STATUS_FALSE;
-                }
-
-                char s[] = { dtmf->digit, '\0' };
-                tech_pvt->sendDtmf(s); 
-
-                break;
-            }        
-            default: 
-                break;
-        }        
-
-        switch_core_session_rwunlock(peer_session);
-        return SWITCH_STATUS_SUCCESS;
-    }
-
-
-    static int userXferPlayback(void * pvt_ptr)
-    {
-        /* get pointer... */
-        Board::KhompPvt * pvt = static_cast < Board::KhompPvt * > (pvt_ptr);
-
-        DBG(FUNC, PVT_FMT(pvt->target(), "c"));
-
-        try
-        {
-            ScopedPvtLock lock(pvt);
-
-            /* get the owner */
-            switch_channel_t * chan = pvt->getFSChannel();
-
-            /* get other side of the bridge */
-            switch_core_session_t * peer_session = NULL;
-            switch_core_session_get_partner(pvt->session(),&peer_session);
-
-            if(!peer_session)
-            {
-                DBG(FUNC, PVT_FMT(pvt->target(), "r (session is null)"));
-                return NULL;
-            }
-
-            switch_channel_t * peer = switch_core_session_get_channel(peer_session);
-
-            /* put the channel in hold */
-            //switch_core_session_t *session = switch_core_session_locate(switch_channel_get_partner_uuid(chan));
-            //switch_channel_t *chan_core = switch_core_session_get_channel(session);
-
-            const char *stream;
-
-            if (!(stream = switch_channel_get_variable(chan, SWITCH_HOLD_MUSIC_VARIABLE)))
-            {
-                stream = "silence";
-            }
-
-            DBG(FUNC, PVT_FMT(pvt->target(), "stream=%s") % stream);
-
-            if (stream && strcasecmp(stream, "silence"))
-            {
-                /* Freeswitch not get/put frames */
-                //switch_channel_set_flag(channel, CF_HOLD);
-                switch_ivr_broadcast(switch_core_session_get_uuid(pvt->session()),stream, SMF_ECHO_ALEG | SMF_LOOP | SMF_PRIORITY);
-            }
-
-            switch_core_session_rwunlock(peer_session);
-            lock.unlock();
-
-            /* kickstart my heart */
-            switch_input_args_t args = {0};
-            args.input_callback = dtmfCallback;
-
-            /* wait while xfering... */
-            while (true)
-            {
-                switch_ivr_collect_digits_callback(peer_session,&args,1000,0);
-                ScopedPvtLock lock2(pvt);
-
-                if (!pvt->call()->_flags.check(Kflags::XFER_QSIG_DIALING))
-                {
-                    break;
-                }
-
-                lock2.unlock();
-            }
-
-            //switch_channel_clear_flag(channel, CF_HOLD);
-
-            switch_channel_stop_broadcast(chan);
-            switch_channel_wait_for_flag(chan, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
-            switch_core_session_rwunlock(pvt->session());
-            switch_core_session_rwunlock(peer_session);
-
-            //switch_ivr_unhold_uuid(switch_channel_get_partner_uuid(chan));
-        }
-        catch (ScopedLockFailed & err)
-        {
-            LOG(ERROR, PVT_FMT(pvt->target(),"r (unable to lock %s!)") % err._msg.c_str() );
-            return NULL;
-        }
-        catch (Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(pvt->target(), "r (%s)") % err._msg.c_str() );
-            return NULL;
-        }
-
-        DBG(FUNC, PVT_FMT(pvt->target(), "r"));
-
-        return NULL;
-    }
-
-    bool                    _is_ok;
-    T *                     _call;
-    Board::KhompPvt *       _pvt;
-    Thread *                _xfer_thread;
-    Board::ChanTimer::Index _idx_xfer_dial;
-};
-
-/*************************** SMS **********************************************/
-#define ESL_SMS_RECEIVED "khomp::sms_received"
-#define ESL_SMS_SENT     "khomp::sms_sent"
-
-struct SMS : public Application
-{
-    typedef std::list< switch_core_session_t *> OwnersList;
-
-    struct SMSStatistics : public Statistics
-    {
-        SMSStatistics():
-            _sms_number_incoming(0),
-            _sms_number_outgoing(0),
-            _sms_number_confirm(0),
-            _sms_number_broadcast(0) {};
-
-        void incrementIncoming()
-        {
-            _sms_number_incoming++;
-        }
-
-        void incrementOutgoing()
-        {
-            _sms_number_outgoing++;
-        }
-
-        void incrementConfirm()
-        {
-            _sms_number_confirm++;
-        }
-
-        void incrementBroadcast()
-        {
-            _sms_number_broadcast++;
-        }
-        
-        std::string getDetailed()
-        {
-            std::string tmpBuffer;
-
-            tmpBuffer.append(STG(FMT("Number of incoming SMS: \t%d\n")  % _sms_number_incoming));
-            tmpBuffer.append(STG(FMT("Number of outgoing SMS: \t%d\n")  % _sms_number_outgoing));
-            tmpBuffer.append(STG(FMT("Number of broadcast SMS: \t%d\n") % _sms_number_broadcast));
-            tmpBuffer.append(STG(FMT("Number of confirm SMS:  \t%d\n")  % _sms_number_confirm));
-
-            return tmpBuffer;
-        }
-
-        void clear()
-        {
-            _sms_number_incoming  = 0;
-            _sms_number_outgoing  = 0;
-            _sms_number_confirm   = 0;
-            _sms_number_broadcast = 0;
-        }
-
-        unsigned int _sms_number_incoming;
-        unsigned int _sms_number_outgoing;
-        unsigned int _sms_number_confirm;
-        unsigned int _sms_number_broadcast;
-    };
-
-    SMS(Board::KhompPvt * pvt) : 
-    Application(pvt),
-    _thread(NULL),
-    _shutdown(false),
-    _can_receive(false),
-    _can_send(false),
-    _result(0),
-    _mutex(Globals::module_pool),
-    _cond(Globals::module_pool),
-    _buffer(8)
-    {
-        _cond.reset();
-        _app_statistics = new SMSStatistics();
-    }
-
-    ~SMS()
-    {
-        stop();
-        delete _app_statistics;
-    }
-
-    struct ReceiveData
-    {
-        ReceiveData() {};
-
-        ReceiveData(const ReceiveData & o)
-        {
-            _type    = o._type;
-            _from    = o._from;
-            _date    = o._date;
-            _size    = o._size;
-            _coding  = o._coding;
-            _serial  = o._serial;
-            _id      = o._id;
-            _page    = o._page;
-            _pages   = o._pages;
-            _sc_date = o._sc_date;
-            _status  = o._status;
-            _body    = o._body;
-        };
-
-        void clear(void)
-        {
-            /* reset data stuff */
-            _type.clear();
-            _from.clear();
-            _date.clear();
-            _size.clear();
-            _coding.clear();
-            _serial.clear();
-            _id.clear();
-            _page.clear();
-            _pages.clear();
-            _sc_date.clear();
-            _status.clear();
-            _body.clear();
-        };
-
-        std::string _type;
-        std::string _from;
-        std::string _date;
-        std::string _size;
-        std::string _coding;
-        std::string _serial;
-        std::string _id;
-        std::string _page;
-        std::string _pages;
-        std::string _sc_date;
-        std::string _status;
-        std::string _body;
-    };
-
-    struct SendData
-    {
-        SendData(): _conf(false) {};
-
-        SendData(const SendData & o)
-        {
-            _dest    = o._dest;
-            _body    = o._body;
-            _conf    = o._conf;
-        };
-
-        void clear(void)
-        {
-            /* reset data stuff */
-            _dest.clear();
-            _body.clear();
-            _conf = false;
-        };
-
-        std::string _dest;
-        std::string _body;
-        bool        _conf;
-    };
-
-    static struct _SMSEvent : public ESL
-    {
-
-        _SMSEvent() : ESL("khomp::sms") 
-        {
-            if(_events)
-            {
-                _events->push_back(ESL_SMS_RECEIVED);
-                _events->push_back(ESL_SMS_SENT);
-            }
-        }
-
-        ~_SMSEvent()
-        {
-            if(_events)
-            {
-                //Remove two from vector
-                _events->pop_back();
-                _events->pop_back();
-            }
-        }
-        
-        bool operator()(Board::KhompPvt * pvt, ReceiveData & data)
-        {
-            switch_event_t *event = create(ESL_SMS_RECEIVED);
-
-            if(!event)
-            {
-                LOG(ERROR, "Cannot create SMS ESL");
-                return false;
-            }
-
-            add(event, pvt->target());
-            add(event, "Type", data._type);
-            add(event, "From", data._from);
-            add(event, "Date", data._date);
-            add(event, "Size", data._size);
-            add(event, "Coding", data._coding);
-            add(event, "Serial", data._serial);
-            add(event, "Id", data._id);
-            add(event, "Page", data._page);
-            add(event, "Pages", data._pages);
-            add(event, "Sc_date", data._sc_date);
-            add(event, "Status", data._status);
-            add(event, "Body", data._body);
-
-            return fire(&event);
-        }
-        
-        bool operator()(Board::KhompPvt * pvt, SendData & data)
-        {
-            switch_event_t *event = create(ESL_SMS_SENT);
-
-            if(!event)
-            {
-                LOG(ERROR, "Cannot create SMS ESL");
-                return false;
-            }
-
-            add(event, pvt->target());
-            add(event, "Dest", data._dest);
-            add(event, "Body", data._body);
-            add(event, "Confirmation?", (data._conf ? "Yes" : "No"));
-
-
-            return fire(&event);
-        }
-
-
-
-    } SMSEvent;
-
-    struct Request
-    {
-        /* "empty" constructor */
-        Request(): _finished(NULL), _cause(NULL) {};
-
-        /* "real" constructor */
-        Request(SendData & send_sms, volatile bool * finished, volatile KGsmCallCause * cause)
-            : _send_sms(send_sms), _finished(finished), _cause(cause)
-        {};
-
-        SendData _send_sms;
-
-        volatile bool          * _finished;
-        volatile KGsmCallCause * _cause;
-    };
-
-    bool start()
-    {
-        _pvt->call()->_flags.clear(Kflags::SMS_DOING_UPLOAD);
-
-        _thread = threadCreate(&smsThread, (void*) this);
-        _thread->start();
-    }
-
-    bool stop()
-    {
-        if(!_thread)
-        {
-            return false;
-        }
-
-        _shutdown = true;
-        _cond.signal();
-        _thread->join();
-        delete _thread;
-        _thread = NULL;
-
-        return true;
-    }
-
-    bool justAlloc(unsigned int count = 0);
-    bool justStart();
-
-    bool sendSMS(switch_core_session_t * session, const char *data);
-    
-
-    bool onNewSMS(K3L_EVENT *e);
-    bool onSMSInfo(K3L_EVENT *e);
-    bool onSMSData(K3L_EVENT *e);
-    bool onSMSSendResult(K3L_EVENT *e);
-   
-    Thread                                             *_thread;
-    bool                                                _shutdown;
-    bool                                                _can_receive;
-    bool                                                _can_send;
-    ReceiveData                                         _got_sms;
-    SendData                                            _send_sms;
-    int                                                 _result;
-    SavedCondition                                      _cond;
-    Globals::Mutex                                      _mutex;
-    Ringbuffer < SMS::Request >                         _buffer;
-    OwnersList                                          _owners;
-
-    static int smsThread(void * sms_ptr);
-};
-
-/******************************************************************************/
-
-
-#endif /* _APPLICATIONS_H_ */
-
diff --git a/src/mod/endpoints/mod_khomp/include/cli.h b/src/mod/endpoints/mod_khomp/include/cli.h
deleted file mode 100644
index 5df472bb66..0000000000
--- a/src/mod/endpoints/mod_khomp/include/cli.h
+++ /dev/null
@@ -1,1273 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _CLI_H_
-#define _CLI_H_
-
-#include "globals.h"
-#include "logger.h"
-
-struct Command 
-{
-    /* print in client the usage */
-    void printUsage(switch_stream_handle_t *stream)
-    { 
-        if(stream)
-        {
-            printBrief(stream);
-            K::Logger::Logg2(C_CLI,stream, 
-"------------------------------ Description --------------------------------"); 
-            K::Logger::Logg2(C_CLI,stream, 
-"---------------------------------------------------------------------------"); 
-            K::Logger::Logg2(C_CLI,stream,(char*) usage.c_str()); 
-            K::Logger::Logg2(C_CLI,stream, 
-"---------------------------------------------------------------------------"); 
-        }
-        else
-        {
-            LOG(ERROR,FMT("Invalid stream for commmand: %s") % complete_name);
-        }
-    }
-
-    /* print in client the brief */
-    void printBrief(switch_stream_handle_t *stream)
-    {
-        if(stream)
-        {
-            K::Logger::Logg2(C_CLI,stream, 
-"---------------------------------------------------------------------------"); 
-            K::Logger::Logg2(C_CLI,stream, 
-"-------------------------------- Brief ------------------------------------"); 
-            K::Logger::Logg2(C_CLI,stream, 
-"---------------------------------------------------------------------------"); 
-            K::Logger::Logg2(C_CLI,stream,(char*) brief.c_str()); 
-            K::Logger::Logg2(C_CLI,stream, 
-"---------------------------------------------------------------------------"); 
-        }
-        else
-        {
-            LOG(ERROR,FMT("Invalid stream for commmand: %s") % complete_name);
-        }
-    }
-
-    /* pure virtual */
-    virtual bool execute(int argc, char *argv[]) = 0;
-
-    std::string complete_name;         /* specify the command in console */
-    std::vector<std::string> options;  /* extra options for command */
-    std::string brief;                 /* brief of the command, a path */
-    std::string usage;                 /* usage of the command, a help */
-};
-
-struct CommandXMLOutput : public Command
-{
-    void createRoot(const char *name)
-    {
-        root = switch_xml_new(name);
-    }
-
-    void insertXML(switch_xml_t xml)
-    {
-        switch_xml_insert(xml,root,0);
-    }
-
-    void clearRoot()
-    {
-        if(root) 
-        {
-            switch_xml_free(root);
-            root = NULL;
-        }
-    }
-
-    void printXMLOutput(switch_stream_handle_t *stream)
-    {
-        K::Logger::Logg2(C_CLI,stream,switch_xml_toxml(root,SWITCH_FALSE)); 
-    }
-
-    CommandXMLOutput() : root(NULL) {};
-
-    switch_xml_t root;                 /* for commands that ouput as xml */
-};
-
-struct Cli 
-{
-    /* Useful definitions --------------------------------------------------- */
-    typedef switch_status_t (APIFunc)(const char*, switch_core_session_t*, switch_stream_handle_t*);
-    typedef std::vector<Command*> Commands;
-
-    /* Define the output types form commands */
-    typedef enum 
-    {
-        VERBOSE = 1,
-        CONCISE,
-        DETAILED,
-        XML
-    } OutputType;
-
-    /* register our commands, but you must create the command function */
-    static void registerCommands(APIFunc func,switch_loadable_module_interface_t **mod_int);
-    
-    /* delete the commands */
-    static void unregisterCommands()
-    {
-        switch_console_set_complete("del khomp");
-    }
-
-    /* stream is very useful */
-    static void setStream(switch_stream_handle_t *s)
-    {
-        if(!s)
-        {
-            LOG(ERROR,"Invalid stream passed");
-            return;
-        }
-
-        stream = s;
-    }
-
-    /* gets the khomp usage */
-    static void printKhompUsage()
-    {
-        if(stream)
-        {
-            K::Logger::Logg2(C_CLI,stream,(char*) _khomp_usage.c_str());
-        }
-        else
-        {
-            LOG(ERROR,"Invalid stream for command: printKhompUsage");
-        }
-    }
-
-    /* is responsible for parse and execute all commands */
-    static bool parseCommands(int argc, char *argv[]);
-
-    /* The Commands --------------------------------------------------------- */
-
-    /* khomp summary */
-    static struct _KhompSummary : public CommandXMLOutput
-    {
-        _KhompSummary(bool on_cli_term = true):
-        CommandXMLOutput(),
-        _on_cli_term(on_cli_term),
-        xdevs(NULL)
-        {
-            complete_name = "summary";
-
-            options.push_back("verbose");
-            options.push_back("concise");
-            options.push_back("xml");
-
-            brief = "Print system info.";                                            
-            usage =                                                            \
-"Prints detailed info about the system like API version and \n"                \
-"boards characteristics like DSPs version.\n\n"                                \
-"Usage: khomp summary [concise|verbose|xml]";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-        bool _on_cli_term;     /* indicates if message is sent to fs_cli */
-        switch_xml_t xdevs;  /* support xml needed to help the interation */
-    } KhompSummary;
-
-    /* khomp show calls */
-    static struct _KhompShowCalls : public Command
-    {
-        _KhompShowCalls()
-        {
-            complete_name = "show calls";
-            brief  =                                                           \
-"Show each Khomp channel which have more than one call state associated.";
-
-            usage =                                                            \
-"Show each Khomp channel which have more than one call state associated.\n\n"  \
-"Usage: khomp show calls [<board> [<channel>]]";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-
-        /* support function for _KhompShowCalls */
-        void showCalls(unsigned int device, unsigned int object, std::string &buffer);
-    } KhompShowCalls;
-
-    /* khomp channels disconnect */
-    static struct _KhompChannelsDisconnect : public Command
-    {
-        _KhompChannelsDisconnect()
-        {
-            complete_name = "channels disconnect";
-            brief = "Disconnect a(ll) channel(s).";                                                              
-            usage =                                                            \
-"Disconnects channels in boards, or specific board/channel if parameter \n"    \
-"is supplied.\n\n"                                                             \
-"Usage: khomp channels disconnect {all | <board> all | <board> <channel>}\n"   \
-"\tboard   -- Number of the board (start from 0).\n"                           \
-"\tchannel -- Number of the channel (start from 0).\n"                         \
-"e.g. khomp channels disconnect all - Disconnect all channels of all boards.\n"\
-"e.g. khomp channels disconnect 0 5 - Disconnect channel 5 of board 0.";              
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-
-        /* support function for _KhompChannelsDisconnect */
-        bool forceDisconnect(unsigned int device, unsigned int channel);
-    } KhompChannelsDisconnect;
-
-    /* khomp channels unblock */
-    static struct _KhompChannelsUnblock : public Command
-    {   
-        _KhompChannelsUnblock()
-        {
-            complete_name = "channels unblock";
-            brief = "Unblock a(ll) channel(s).";
-
-            usage =                                                            \
-"The board will request to the PBX or network where it is connected to \n"     \
-"unblock the channel if its blocked.\n\n"                                      \
-"Usage: khomp channels unblock {all | <board> all | <board> <channel>}\n"      \
-"\tboard   -- Number of the board (start from 0).\n"                           \
-"\tchannel -- Number of the channel (start from 0).\n"                         \
-"e.g. khomp channels unblock all   - Unblock all channels of all boards.\n"    \
-"e.g. khomp channels unblock 0 all - Unblock all channels of board 0.\n"       \
-"e.g. khomp channels unblock 1 20  - Unblock channel 20 of board 1.";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompChannelsUnblock;
-
-    /* khomp show statistics */
-    static struct _KhompShowStatistics : public CommandXMLOutput
-    {
-        _KhompShowStatistics() : CommandXMLOutput(), xdevs(NULL)
-        {
-            complete_name = "show statistics";
-
-            options.push_back("verbose");
-            options.push_back("detailed");
-            options.push_back("xml");
-
-            brief = "Shows statistics of the channels.";
-
-            usage =                                                            \
-"Shows statistics of the channels, like number of calls incoming \n"           \
-"and outgoing, status, status time.\n\n"                                       \
-"Usage: khomp show statistics [{{verbose|xml} [<board> [<channel>]]} | \n"     \
-"                              {detailed <board> <channel>}]\n"                \
-"\tboard   -- Number of the board (start from 0).\n"                           \
-"\tchannel -- Number of the channel (start from 0).\n"                         \
-"e.g. khomp channels statistics              - Shows general statistics \n"    \
-"                                              of all boards.\n"               \
-"e.g. khomp channels statistics 0            - Shows general statistics \n"    \
-"                                              of board 0.\n"                  \
-"e.g. khomp channels statistics verbose      - Shows general statistics \n"    \
-"                                              of all boards.\n"               \
-"e.g. khomp channels statistics verbose  0   - Shows general statistics \n"    \
-"                                              of board 0.\n"                  \
-"e.g. khomp channels statistics detailed 0 2 - Shows detailed statistics \n"   \
-"                                              of channel 2 on board 0.";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-
-        /* support functions */
-        void cliStatistics(unsigned int device, OutputType output_type);
-        void cliDetailedStatistics(unsigned int device, unsigned int channel, OutputType output_type);
-        switch_xml_t xdevs;  /* support xml needed to help the interation */
-
-    } KhompShowStatistics;
-
-    /* khomp show channels */
-    static struct _KhompShowChannels: public CommandXMLOutput
-    {
-        _KhompShowChannels() : CommandXMLOutput(), xdev(NULL)
-        {
-            complete_name = "show channels";
-
-            options.push_back("verbose");
-            options.push_back("concise");
-            options.push_back("xml");
-
-            brief = "Show all channels status.";                                                                               
-            usage =                                                            \
-"List the status of each channel, both on asterisk point of view and on \n"    \
-"khomp API point of view.\n\n"                                                 \
-"Usage: \n"                                                                    \
-"khomp show channels [{<board> [<channel>]} | \n"                              \
-                          "{{concise|verbose|xml} [<board> [<channel>]]}]\n"   \
-"\tboard -- Number of the board (start from 0).\n"                             \
-"e.g. khomp show channels - List status of all channels of all boards.\n"      \
-"e.g. khomp show channels concise 0 - List status of all channels of \n"       \
-"                                     board 0 in a concise way.\n"             \
-"e.g. khomp show channels xml 0     - List status of all channels of \n"       \
-"                                     board 0 in a xml structure.";
-
-            _commands.push_back(this);
-        };
-
-        /* support function for _KhompShowChannels */
-        void showChannel(unsigned int device, unsigned int channel, OutputType output_type = Cli::VERBOSE);
-        void showChannels(unsigned int device, OutputType output_type = Cli::VERBOSE);
-
-        bool execute(int argc, char *argv[]);
-        switch_xml_t xdev; /* support xml needed to help the interation */
-
-    } KhompShowChannels;
-    
-    /* khomp show links */
-    static struct _KhompShowLinks: public CommandXMLOutput
-    {
-        _KhompShowLinks() : CommandXMLOutput(), xdev(NULL)
-        {
-            complete_name = "show links";
-
-            options.push_back("verbose");
-            options.push_back("concise");
-            options.push_back("xml");
-            options.push_back("errors");
-            options.push_back("errors verbose");
-            options.push_back("errors concise");
-            options.push_back("errors xml");
-
-            brief = "Show E1 link(s) status/errors counters in a concise \n"   \
-            "way or not.";
-
-            usage =                                                            \
-"Prints information about the signaling, syncronization and general \n"        \
-"status/the error counters of each link on the board. It prints in \n"         \
-"a concise way for parsing facilities.\n\n"                                    \
-"Usage: \n"                                                                    \
-"khomp show links [[errors] [{<board>} | {{concise|verbose|xml} [<board>]}]]\n"\
-"e.g. khomp show links          - Show all links of all boards.\n"             \
-"e.g. khomp show links xml      - Show all links of all boards in xml.\n"      \
-"e.g. khomp show links errors   - Show error counters of all links of \n"      \
-"                                 all boards.\n"                               \
-"e.g. khomp show links errors 0 - Show error counters of all links of \n"      \
-"                                 board 0.";
-
-            _commands.push_back(this);
-        };
-
-        /* support function for _KhompShowLinks */
-        void showLinks(unsigned int device, OutputType output_type = Cli::VERBOSE);
-        void showErrors(unsigned int device, OutputType output_type = Cli::VERBOSE);
-        std::string getLinkStatus(int dev, int obj, Verbose::Presentation fmt);
-
-        bool execute(int argc, char *argv[]);
-        switch_xml_t xdev; /* support xml needed to help the interation */
-    } KhompShowLinks;
-
-    /* khomp clear links */
-    static struct _KhompClearLinks: public Command
-    {
-        _KhompClearLinks()
-        {
-            complete_name = "clear links";
-    
-            brief = "Clear the error counters of the links.";
-
-            usage =                                                            \
-"Clear the error counters of the links.\n\n"                                   \
-"Usage: khomp clear links [<board> [<link>]]\n"                                \
-"\tboard -- Number of the board (start from 0).\n"                             \
-"\tlink  -- Number of the link (start from 0).\n"                              \
-"e.g. khomp clear links 0 -- Clear error counters of all links of board 0.";
-
-            _commands.push_back(this);
-        };
-
-        /* support function for _KhompClearLinks */
-        void clearLink(unsigned int device, unsigned int link);
-
-        bool execute(int argc, char *argv[]);
-    } KhompClearLinks;
-
-    /* khomp clear statistics */
-    static struct _KhompClearStatistics: public Command
-    {
-        _KhompClearStatistics()
-        {
-            complete_name = "clear statistics";
-    
-            brief = "Clear statistics of the channels.";
-
-            usage =                                                            \
-"Clear statistics of the channels, like number of calls incoming \n"           \
-"and outgoing, status, status time.\n\n"                                       \
-"Usage: khomp clear statistics [<board> [<channel>]]\n"                        \
-"\tboard   -- Number of the board (start from 0).\n"                           \
-"\tchannel -- Number of the channel (start from 0).\n"                         \
-"e.g. khomp clear statistics 0 -- Clear statistics of board 0."; 
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompClearStatistics;
-
-
-    /* khomp reset links */
-    static struct _KhompResetLinks: public Command
-    {
-        _KhompResetLinks()
-        {
-            complete_name = "reset links";
-    
-            brief = "Reset the specified link.";
-
-            usage =                                                            \
-"Reset the specified link.\n\n"                                                \
-"Usage: khomp reset links [<board> [<link>]]\n"                                \
-"\tboard -- Number of the board (start from 0).\n"                             \
-"\tlink  -- Number of the link (start from 0).\n"                              \
-"e.g. khomp reset links 0 1 -- Reset link 1 of board 0.";
-
-            _commands.push_back(this);
-        };
-
-        /* support function for _KhompResetLinks */
-        void resetLink(unsigned int device, unsigned int link);
-
-        bool execute(int argc, char *argv[]);
-    } KhompResetLinks;
-   
-    /* khomp sms */
-    static struct _KhompSMS : public Command
-    {
-        _KhompSMS()
-        {
-            complete_name = "sms";
-            brief = "Send an SMS message using a Khomp KGSM board.";
-
-            usage =                                                            \
-"Send an SMS message using a Khomp KGSM board.\n\n"                            \
-"Usage: khomp sms <device> <destination> <message..>\n"                        \
-"\tdevice      -- Device to use (same string used in Dial for \n"              \
-"\t               channel allocation).\n"                                      \
-"\tdestination -- Phone number of the destination.\n"                          \
-"\tmessage     -- Message to send.\n"                                          \
-"e.g. khomp sms b0 99887766 Oi, tudo bem?";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompSMS;
-
-    /* khomp log console */
-    static struct _KhompLogConsole : public Command
-    {
-        _KhompLogConsole()
-        {
-            complete_name = "log console";
-
-            options.push_back("errors");
-            options.push_back("warnings");
-            options.push_back("messages");
-            options.push_back("events");
-            options.push_back("commands");
-            options.push_back("audio");
-            options.push_back("modem");
-            options.push_back("link");
-            options.push_back("cas");
-            options.push_back("standard");
-            options.push_back("all");
-            options.push_back("no");
-            options.push_back("just");
-
-            brief = "Enables/disables showing console messages for the channel.";
-            usage =                                                            \
-"Enables/disables showing channel messages, where <options> can be:\n"         \
-"\terrors    -- Error messages, when something goes really \n"                 \
-"\t             wrong. Enabled by default.\n"                                  \
-"\twarnings  -- Warnings, used when something might not be \n"                 \
-"\t             going as expected. Enabled by default.\n"                      \
-"\tmessages  -- Generic messages, used to indicate some \n"                    \
-"\t             information. Enabled by default.\n"                            \
-"\tevents    -- Show received K3L events as console \n"                        \
-"\t             messages. Disabled by default.\n"                              \
-"\tcommands  -- Show sent K3L commands as console \n"                          \
-"\t             messages. Disabled by default.\n"                              \
-"\taudio     -- Enable messages for K3L audio events. \n"                      \
-"\t             Disabled by default (very verbose!).\n"                        \
-"\tmodem     -- Enable messages for data received from \n"                     \
-"\t             KGSM modems. Disabled by default.\n"                           \
-"\tlink      -- Enable logging of link status changes. \n"                     \
-"\t             Enabled by default.\n"                                         \
-"\tcas       -- Enable logging of MFCs and line state \n"                      \
-"\t             changes in KPR board. Disabled by default.\n"                  \
-"\tstandard  -- Special identifier, enable default \n"                         \
-"\t             console messages.\n"                                           \
-"\tall       -- Special identifier, enable ALL console \n"                     \
-"\t             messages (should not be used naively).\n\n"                    \
-"Usage: khomp log console <options>\n"                                         \
-"e.g. khomp log console standard";
-
-            _commands.push_back(this);
-        }
-
-        bool execute(int argc, char *argv[]);
-    } KhompLogConsole;
-
-    /* khomp log disk */
-    static struct _KhompLogDisk : public Command
-    {
-        _KhompLogDisk()
-        {
-            complete_name = "log disk";
-
-            options.push_back("errors");
-            options.push_back("warnings");
-            options.push_back("messages");
-            options.push_back("events");
-            options.push_back("commands");
-            options.push_back("audio");
-            options.push_back("modem");
-            options.push_back("link");
-            options.push_back("cas");
-            options.push_back("functions");
-            options.push_back("threads");
-            options.push_back("locks");
-            options.push_back("streams");
-            options.push_back("standard");
-            options.push_back("debugging");
-            options.push_back("all");
-            options.push_back("no");
-            options.push_back("just");
-
-            brief = "Enables/disables logging to file messages for the channel.";
-            usage =                                                            \
-"Enables/disables the logging of channel messages to disk, where <options> \n" \
-"can be:\n"                                                                    \
-"\terrors    -- Error messages, when something goes really \n"                 \
-"\t             wrong. Enabled by default.\n"                                  \
-"\twarnings  -- Warnings, used when something might not be \n"                 \
-"\t             going as expected. Enabled by default.\n"                      \
-"\tmessages  -- Generic messages, used to indicate some \n"                    \
-"\t             information. Enabled by default.\n"                            \
-"\tevents    -- Record received K3L events as log messages. \n"                \
-"\t             Disabled by default.\n"                                        \
-"\tcommands  -- Record sent K3L commands as log messages. \n"                  \
-"\t             Disabled by default.\n"                                        \
-"\taudio     -- Enable messages for K3L audio events. \n"                      \
-"\t             Disabled by default (very verbose!).\n"                        \
-"\tmodem     -- Enable messages for data received from \n"                     \
-"\t             KGSM modems. Disabled by default.\n"                           \
-"\tlink      -- Enable logging of link status changes. \n"                     \
-"\t             Enabled by default.\n"                                         \
-"\tcas       -- Enable logging of MFCs and line state \n"                      \
-"\t             changes in KPR board. Disabled by default.\n"                  \
-"\tfunctions -- Enable debugging for functions. Disabled \n"                   \
-"\t             by default (should not be used naively!).\n"                   \
-"\tthreads   -- Enable debugging for threads. Disabled by \n"                  \
-"\t             default (should not be used naively!).\n"                      \
-"\tlocks     -- Enable debugging for locks. Disabled by \n"                    \
-"\t             default (should not be used naively!).\n"                      \
-"\tstreams   -- Enable debugging for streams. Disabled by \n"                  \
-"\t             default (should not be used naively!).\n"                      \
-"\tstandard  -- Special identifier, enable default messages.\n"                \
-"\tdebugging -- Special identifier, enable debugging messages \n"              \
-"\t             (should not be used naively).\n"                               \
-"\tall       -- Special identifier, enable ALL disk \n"                        \
-"\t             messages (DO NOT USE THIS!).\n\n"                              \
-"Usage: khomp log disk <options>\n"                                            \
-"e.g. khomp log disk <options>";
-
-            _commands.push_back(this);
-        }
-
-        bool execute(int argc, char *argv[]);
-    } KhompLogDisk;
-
-    /* khomp log trace k3l */
-    static struct _KhompLogTraceK3L : public Command
-    {
-        _KhompLogTraceK3L()
-        {
-            complete_name = "log trace k3l";
-
-            options.push_back("on");
-            options.push_back("off");
-
-            brief = "Set K3L tracing (debug) option.";
-
-            usage =                                                            \
-"Sets the low-level log for K3L API. Should not be set for long time \n"       \
-"periods.\n\n"                                                                 \
-"Usage: khomp log trace k3l {on|off}\n"                                        \
-"e.g. khomp log trace k3l on";
-
-            _commands.push_back(this);
-        }
-
-        bool execute(int argc, char *argv[]);
-    } KhompLogTraceK3L;
-
-    /* khomp log trace ISDN */
-    static struct _KhompLogTraceISDN : public Command
-    {
-        _KhompLogTraceISDN()
-        {
-            complete_name = "log trace isdn";
-
-            options.push_back("q931");
-            options.push_back("lapd");
-            options.push_back("system");
-            options.push_back("off");
-
-            brief = "Set ISDN signaling trace.";
-
-            usage =                                                            \
-"Sets the low-level log for ISDN signalling. Should not be set for \n"         \
-"long time periods.\n\n"                                                       \
-"Usage: khomp log trace isdn <what>[,<what2>[,..]]\n"                          \
-"\twhat -- \"q931\", \"lapd\", \"system\" or \"off\" \n"                       \
-"\t        (comma-separated values).\n"                                        \
-"e.g. khomp log trace isdn q931,system";
-
-            _commands.push_back(this);
-        }
-
-        bool execute(int argc, char *argv[]);
-    } KhompLogTraceISDN;
-
-    /* khomp log trace R2 */
-    static struct _KhompLogTraceR2 : public Command
-    {
-        _KhompLogTraceR2()
-        {
-            complete_name = "log trace r2";
-
-            options.push_back("on");
-            options.push_back("off");
-
-            brief = "Set R2 signaling trace.";
-
-            usage =                                                            \
-"Sets the low-level log monitor for R2 digital signalling. Should not \n"      \
-"be set for long time periods.\n\n"                                            \
-"Usage: khomp log trace r2 {on|off}\n"                                         \
-"e.g. khomp log trace r2 on";
-
-            _commands.push_back(this);
-        }
-
-        bool execute(int argc, char *argv[]);
-    } KhompLogTraceR2;
-
-    /* khomp get */
-    static struct _KhompGet : public Command
-    {
-        _KhompGet()
-        {
-            complete_name = "get";
-
-            options.push_back("dialplan");
-            options.push_back("echo-canceller");
-            options.push_back("auto-gain-control");
-            options.push_back("out-of-band-dtmfs");
-            options.push_back("suppression-delay");
-            options.push_back("auto-fax-adjustment");
-            options.push_back("fax-adjustment-timeout");
-            options.push_back("pulse-forwarding");
-            options.push_back("r2-strict-behaviour");
-            options.push_back("r2-preconnect-wait");
-            options.push_back("context-digital");
-            options.push_back("context-fxs");
-            options.push_back("context-fxo");
-            options.push_back("context-gsm-call");
-            options.push_back("context-gsm-sms");
-            options.push_back("context-pr");
-            options.push_back("log-to-console");
-            options.push_back("log-to-disk");
-            options.push_back("trace");
-            options.push_back("output-volume");
-            options.push_back("input-volume");
-            options.push_back("fxs-global-orig");
-            options.push_back("fxs-co-dialtone");
-            options.push_back("fxs-bina");
-            options.push_back("fxs-sharp-dial");
-            options.push_back("disconnect-delay");
-            options.push_back("delay-ringback-co");
-            options.push_back("delay-ringback-pbx");
-            options.push_back("ignore-letter-dtmfs");
-            options.push_back("fxo-send-pre-audio");
-            options.push_back("fxo-busy-disconnection");
-            options.push_back("fxs-digit-timeout");
-            options.push_back("drop-collect-call");
-            options.push_back("kommuter-activation");
-            options.push_back("kommuter-timeout");
-            options.push_back("user-transfer-digits");
-            options.push_back("flash-to-digits");
-            options.push_back("accountcode");
-            options.push_back("audio-packet-length");
-
-            brief = "Get configuration options in the Khomp channel.";
-
-            usage =                                                            \
-"Usage: khomp get <option>\n"                                                  \
-"<option>  -- Shown below, with a short description each.\n\n"                 \
-"Option               Description\n"                                           \
-"dialplan             Gets the Name of the dialplan module in use.\n"          \
-"echo-canceller       Gets the echo cancellation procedures if they are \n"    \
-"                      avaliable.\n"                                           \
-"auto-gain-control    Gets the AGC procedures if they are avaliable.\n"        \
-"out-of-band-dtmfs    Gets DTMFs to be sent out-of-band (using ast_frames) \n" \
-"                      instead of in-band (audio).\n"                          \
-"suppression-delay    Enable/disable the internal buffer for DTMF \n"          \
-"                      suppression.\n"                                         \
-"auto-fax-adjustment  Gets the automatic adjustment for FAX (mainly, \n"       \
-"                      disables the echo canceller).\n"                        \
-//"fax-adjustment-timeout"
-"pulse-forwarding     Gets the forwarding of detected pulses as DTMF tones.\n" \
-"r2-strict-behaviour  Gets the R2 protocol behavior while answering lines.\n"  \
-"r2-preconnect-wait   Gets the R2 protocol delay to pre-connect after \n"      \
-"                      sending ringback signal.\n"                             \
-"context-digital      Context (may be a template) for receiving digital \n"    \
-"                      (E1) calls.\n"                                          \
-"context-fxs          Context (may be a template) for receiving FXS calls.\n"  \
-"context-fxo          Context (may be a template) for receiving FXO calls.\n"  \
-"context-gsm-call     Context (may be a template) for receiving GSM calls.\n"  \
-"context-gsm-sms      Context (may be a template) for receiving GSM \n"        \
-"                      messages.\n"                                            \
-"context-pr           Context (may be a template) for receiving calls on \n"   \
-"                      Passive Record boards.\n"                               \
-"log-to-console       Gets the logging of messages to console.\n"              \
-"log-to-disk          Gets the logging of messages to disk.\n"                 \
-"trace                Gets the low level tracing.\n"                           \
-"output-volume        Gets the volume multiplier to be applied by the \n"      \
-"                      board over the output audio.\n"                         \
-"input-volume         Gets the volume multiplier to be applied by the \n"      \
-"                      board over the input audio.\n\n"                        \
-"FOR ALL COMMANDS, CHECK THE DOCUMENTATION.";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompGet;
-
-    /* khomp set */
-    static struct _KhompSet : public Command
-    {
-        _KhompSet()
-        {
-            complete_name = "set";
-
-            options.push_back("dialplan");
-            options.push_back("echo-canceller");
-            options.push_back("auto-gain-control");
-            options.push_back("out-of-band-dtmfs");
-            options.push_back("suppression-delay");
-            options.push_back("auto-fax-adjustment");
-            options.push_back("fax-adjustment-timeout");
-            options.push_back("pulse-forwarding");
-            options.push_back("r2-strict-behaviour");
-            options.push_back("r2-preconnect-wait");
-            options.push_back("context-digital");
-            options.push_back("context-fxs");
-            options.push_back("context-fxo");
-            options.push_back("context-gsm-call");
-            options.push_back("context-gsm-sms");
-            options.push_back("context-pr");
-            options.push_back("log-to-console");
-            options.push_back("log-to-disk");
-            options.push_back("trace");
-            options.push_back("output-volume");
-            options.push_back("input-volume");
-            options.push_back("fxs-global-orig");
-            options.push_back("fxs-co-dialtone");
-            options.push_back("fxs-bina");
-            options.push_back("fxs-sharp-dial");
-            options.push_back("disconnect-delay");
-            options.push_back("delay-ringback-co");
-            options.push_back("delay-ringback-pbx");
-            options.push_back("ignore-letter-dtmfs");
-            options.push_back("fxo-send-pre-audio");
-            options.push_back("fxo-busy-disconnection");
-            options.push_back("fxs-digit-timeout");
-            options.push_back("drop-collect-call");
-            options.push_back("kommuter-activation");
-            options.push_back("kommuter-timeout");
-            options.push_back("user-transfer-digits");
-            options.push_back("flash-to-digits");
-            options.push_back("accountcode");
-            options.push_back("audio-packet-length");
-
-            brief = "Ajust configuration options in the Khomp channel.";
-
-            usage =                                                            \
-"Usage: khomp set <option> <value>\n"                                          \
-"\t<option>  -- Shown below, with a short description each.\n"                 \
-"\t<value>   -- Depends on the option. Check the documentation for \n"         \
-"\t             more info.\n\n"                                                \
-"Option               Description\n"                                           \
-"dialplan             Sets the Name of the dialplan module in use.\n"          \
-"echo-canceller       Sets the echo cancellation procedures if they are \n"    \
-"                      avaliable.\n"                                           \
-"auto-gain-control    Sets the AGC procedures if they are avaliable.\n"        \
-"out-of-band-dtmfs    Sets DTMFs to be sent out-of-band (using ast_frames) \n" \
-"                      instead of in-band (audio).\n"                          \
-"suppression-delay    Enable/disable the internal buffer for DTMF \n"          \
-"                      suppression.\n"                                         \
-"auto-fax-adjustment  Sets the automatic adjustment for FAX (mainly, \n"       \
-"                      disables the echo canceller).\n"                        \
-"pulse-forwarding     Sets the forwarding of detected pulses as DTMF tones.\n" \
-"r2-strict-behaviour  Sets the R2 protocol behavior while answering lines.\n"  \
-"r2-preconnect-wait   Sets the R2 protocol delay to pre-connect after \n"      \
-"                      sending ringback signal.\n"                             \
-"context-digital      Context (may be a template) for receiving digital \n"    \
-"                      (E1) calls.\n"                                          \
-"context-fxs          Context (may be a template) for receiving FXS calls.\n"  \
-"context-fxo          Context (may be a template) for receiving FXO calls.\n"  \
-"context-gsm-call     Context (may be a template) for receiving GSM calls.\n"  \
-"context-gsm-sms      Context (may be a template) for receiving GSM \n"        \
-"                      messages.\n"                                            \
-"context-pr           Context (may be a template) for receiving calls on \n"   \
-"                      Passive Record boards.\n"                               \
-"log-to-console       Sets the logging of messages to console.\n"              \
-"log-to-disk          Sets the logging of messages to disk.\n"                 \
-"trace                Sets the low level tracing.\n"                           \
-"output-volume        Sets the volume multiplier to be applied by the \n"      \
-"                      board over the output audio.\n"                         \
-"input-volume         Sets the volume multiplier to be applied by the \n"      \
-"                      board over the input audio.\n\n"                        \
-"FOR ALL COMMANDS, CHECK THE DOCUMENTATION.";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompSet;
-
-    /* khomp log rotate */
-    static struct _KhompLogRotate : public Command 
-    {
-        _KhompLogRotate()
-        {
-            complete_name = "log rotate";
-            brief = "Rotate the files where the messages are being logged.";
-
-            usage =                                                            \
-"Rotate the files where the messages are being logged.\n\n"                    \
-"Usage: khomp log rotate";
-
-            _commands.push_back(this);
-        }
-
-        bool execute(int argc, char *argv[]);
-    } KhompLogRotate;
-
-    /* khomp log status */
-    static struct _KhompLogStatus : public Command
-    {
-        _KhompLogStatus()
-        {
-            complete_name = "log status";
-            brief = "Show the status of the messages.";
-
-            usage =                                                            \
-"Show the status of the message system (enabled/disabled messages).\n\n"       \
-"Usage: khomp log status";
-
-            _commands.push_back(this);
-        }
-
-        bool execute(int argc, char *argv[]);
-    } KhompLogStatus;
-
-    /* khomp revision */
-    static struct _KhompRevision : public Command
-    {
-        _KhompRevision()
-        {
-            complete_name = "revision";
-            brief = "Show revision number.";
-
-            usage =                                                            \
-"Show the internal revision number for this channel.\n\n"                      \
-"Usage: khomp revision";
-
-            _commands.push_back(this);
-        }
-
-        bool execute(int argc, char *argv[]);
-    } KhompRevision;
-
-    /* khomp dump config */
-    static struct _KhompDumpConfig : public Command
-    {
-        _KhompDumpConfig()
-        {
-            complete_name = "dump config";
-            brief = "Dump configuration values on screen.";
-
-            usage =                                                            \
-"\nUsage: khomp dump config\n\n"                                               \
-"Dump configuration values loaded on memory.\n ";                              
-            
-            _commands.push_back(this);
-        }
-
-        /* just to hide unavaible options */
-        bool removeUnavaible(const std::string &s)
-        {
-            if(s == "atxfer" || s == "blindxfer" || s == "callgroup" ||
-               s == "mohclass" || s == "native-bridge" || s == "recording" ||
-               s == "record-prefix" || s == "transferdigittimeout" ||
-               s == "pickupgroup" || s == "has-ctbus" || 
-               s == "user-transfer-digits")
-                return true;
-            return false;
-        }
-        
-        bool execute(int argc, char *argv[]);
-    } KhompDumpConfig;
-
-    /* khomp send command */
-    static struct _KhompSendCommand : public Command
-    {
-        _KhompSendCommand()
-        {
-            complete_name = "send command";
-            brief = "Send an K3L API command directly to the board.";
-
-            usage =                                                            \
-"Send an K3L API command directly to the board.\n"                             \
-"WARNING: This command is for debugging only - just use if you know \n"        \
-"what you are doing!\n\n"                                                      \
-"Usage: khomp send command <board> <channel> <command> [argument]\n"           \
-"\tboard    -- Number of the board (start from 0).\n"                          \
-"\tchannel  -- Number of the channel (start from 0).\n"                        \
-"\tcommand  -- Number of API command (should be consulted in separate docs).\n"\
-"\targument -- Optimal string to use as parameter for the command.\n"          \
-"e.g. khomp send command 0 1 4 123456 - Send DTMFs 123456 throught \n"         \
-"                                       channel 1 on board 0.";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompSendCommand;
-
-    /* khomp send raw */
-    static struct _KhompSendRawCommand : public Command 
-    {
-        _KhompSendRawCommand()
-        {
-            complete_name = "send raw command";
-            brief = "Send an command directly to a DSP at the board.";
-
-            usage =                                                            \
-"Send an command directly to some DSP at the board.\n"                         \
-"WARNING: This command is for debugging only - just use if you know \n"        \
-"what you are doing!\n\n"                                                      \
-"Usage: khomp send raw command <board> <dsp> <c0> <c1> [...]\n"                \
-"\tboard       -- Number of the board (start from 0).\n"                       \
-"\tchannel     -- Number of the channel (start from 0).\n"                     \
-"\tdsp         -- Number of the DSP.\n"                                        \
-"\tc0, c1, ... -- Hexadecimal numbers for the command.\n"                      \
-"e.g. khomp send raw command 0 1 0x4a 0x00 0x00 - Disables the internal \n"    \
-"                                                 audio delay on board 0.";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompSendRawCommand;
-    
-    /* khomp select sim */
-    static struct _KhompSelectSim : public Command
-    {
-        _KhompSelectSim()
-        {
-            complete_name = "select sim";
-
-            brief = "Select SIM card, available to Khomp KGSM boards.";
-
-            usage =                                                            \
-"Select SIM card, available to Khomp KGSM boards.\n\n"                         \
-"Usage: khomp select sim <board> <channel> <sim_card>\n"                       \
-"\tboard    -- Number of the board (start from 0).\n"                          \
-"\tchannel  -- Number of the channel (start from 0), identifies \n"            \
-"\t            the modem inside the board.\n"                                  \
-"\tsim_card -- Number for the SIM card to select.\n"                           \
-"e.g. khomp select sim 0 0 2";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompSelectSim;
-
-    /* khomp kommuter */
-    static struct _KhompKommuterOnOff : public Command
-    {
-        _KhompKommuterOnOff()
-        {
-            complete_name = "kommuter";
-
-            options.push_back("on");
-            options.push_back("off");
-
-            brief = "Activate and deactives the Kommuter devices.";
-
-            usage =                                                            \
-"Manually activates or deactivates all kommuters connected to this machine.\n" \
-"This command will only be sent if kommuter-activation variable in \n"         \
-"khomp.conf is set to manual. All kommuter devices will be configure with \n"  \
-"the timeout defined in kommuter-timeout.\n\n"                                 \
-"Usage: khomp kommuter {on|off}\n"                                             \
-"\ton     -- Turn ON kommuter devices on this machine.\n"                      \
-"\toff    -- Turn OFF kommuter devices on this machine.";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompKommuterOnOff;
-    
-    /* khomp kommuter count */
-    static struct _KhompKommuterCount : public Command
-    {
-        _KhompKommuterCount()
-        {
-            complete_name = "kommuter count";
-
-            brief = "Prints the number of Kommuter devices.";
-
-            usage =                                                            \
-"Prints the number of Kommuter devices connected to this machine.\n\n"         \
-"Usage: khomp kommuter count";
-
-            _commands.push_back(this);
-        };
-
-        bool execute(int argc, char *argv[]);
-    } KhompKommuterCount;
-
-protected:
-    static switch_stream_handle_t* stream;
-    static switch_loadable_module_interface_t **module_interface;
-    static Commands _commands;
-    static std::string _khomp_usage;
-};
-
-/******************************************************************************/
-/******************************* Command Tree *********************************
-
-This tree is a overview for all commands in our module,
-when a command is added, deleted or modified, please, update our tree.
-
-+ khomp 
-|
-+ ---- channels 
-|    |
--    + ---- disconnect
-|    |
--    + ---- unblock
-|
-+ ---- show
-|    | 
--    + ---- calls
-|    |
--    + ---- channels
-|    |    | 
--    -    + ---- verbose
-|    |    |
--    -    + ---- concise
-|    |
--    + ---- statistics
-|    |    |  
--    -    + ---- detailed
-|    |    |  
--    -    + ---- verbose 
-|    |   
--    + ---- links
-|         |
--         + ---- errors
-|         |
--         + ---- verbose
-|         |
--         + ---- concise
-|    
-+ ---- reset
-|    | 
--    + ---- links
-|
-+ ---- clear
-|    | 
--    + ---- links
-|         |
--         + ---- errors
-|         |
--         + ---- statistics
-|
-+ ---- log
-|    |
--    + ---- console
-|    |    |
--    -    + ---- errors
-|    |    |
--    -    + ---- warnings
-|    |    |
--    -    + ---- messages
-|    |    |
--    -    + ---- events
-|    |    |
--    -    + ---- commands
-|    |    |
--    -    + ---- audio
-|    |    |
--    -    + ---- link
-|    |    |
--    -    + ---- cas
-|    |    |
--    -    + ---- standard
-|    |    |
--    -    + ---- all
-|    |
--    + ---- disk
-|    |    |
--    -    + ---- errors
-|    |    |
--    -    + ---- warnings
-|    |    |
--    -    + ---- messages
-|    |    |
--    -    + ---- events
-|    |    |
--    -    + ---- commands
-|    |    |
--    -    + ---- audio
-|    |    |
--    -    + ---- modem
-|    |    |
--    -    + ---- link
-|    |    |
--    -    + ---- cas
-|    |    |
--    -    + ---- functions
-|    |    |
--    -    + ---- threads
-|    |    |
--    -    + ---- locks
-|    |    |
--    -    + ---- streams
-|    |    |
--    -    + ---- standard
-|    |    |
--    -    + ---- debugging
-|    |    |
--    -    + ---- all
-|    |     
--    + ---- rotate
-|    |
--    + ---- status
-|    |
--    + ---- trace
-|         |
--         + ---- isdn 
-|         |    |
--         -    + ---- q931
-|         |    |
--         -    + ---- lapd
-|         |    |
--         -    + ---- system
-|         |    |
--         -    + ---- off
-|         |
--         + ---- k3l 
-|         |    |
--         -    + ---- on
-|         |    |
--         -    + ---- off
-|         |
--         + ---- r2 
-|              |
--              + ---- on
-|              |
--              + ---- off
-|
-+ ---- send
-|    |
--    + ---- command
-|    |
--    + ---- raw
-|
-+ ---- get
-|
-+ ---- set
-|
-+ ---- select
-|    |
--    + ---- sim
-|
-+ ---- sms
-|
-+ ---- summary
-|    |
--    + ---- concise
-|    |
--    + ---- verbose
-|
-+ ---- revision
-|
-+ ---- kommuter
-     |
-     + ---- on
-     |
-     + ---- off
-
- ******************************************************************************/
-/******************************************************************************/
-
-#endif 
-
diff --git a/src/mod/endpoints/mod_khomp/include/defs.h b/src/mod/endpoints/mod_khomp/include/defs.h
deleted file mode 100644
index 5d72c95b72..0000000000
--- a/src/mod/endpoints/mod_khomp/include/defs.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _DEFS_H_
-#define _DEFS_H_
-
-/* formatation macros */
-#include "revision.h"
-
-#define KHOMP_LOG __FILE__, __SWITCH_FUNC__, __LINE__
-#define KHOMP_EVENT_MAINT "khomp::maintenance"
-
-#define OBJ_FMT(dev,obj,msg) \
-    FMT("%s (d=%02d,c=%03d) " msg) % __SWITCH_FUNC__ % dev % obj
-
-#define OBJ_MSG(dev,obj,msg) \
-    "%s (d=%02d,c=%03d) " msg, __SWITCH_FUNC__, dev, obj
-
-#define PVT_FMT(tgt,msg) \
-    FMT("%s (d=%02d,c=%03d) " msg) % __SWITCH_FUNC__ % tgt.device % tgt.object
-
-#define PVT_MSG(tgt,msg) \
-    "%s (d=%02d,c=%03d) " msg, __SWITCH_FUNC__, tgt.device, tgt.object
-
-#define D(x) ( FMT( "%s: " x ) % __func__ )
-
-#define STR(fmt) \
-    STG(fmt).c_str()
-
-/* version controller macro */
-#define SWITCH_LESS_THAN(x,y,z)                                                           \
-   (FS_VERSION_MICRO != -1) &&                                                            \
-   (((FS_VERSION_MAJOR == x)  && (FS_VERSION_MINOR == y)  &&  (FS_VERSION_MICRO <= z)) || \
-   ((FS_VERSION_MAJOR == x)  && (FS_VERSION_MINOR < y)) || (FS_VERSION_MAJOR < x))
-
-/* signalling groups macro */
-#define CASE_R2_SIG         \
-    case ksigR2Digital:     \
-    case ksigContinuousEM:  \
-    case ksigPulsedEM:      \
-    case ksigUserR2Digital: \
-    case ksigOpenCAS:       \
-    case ksigOpenR2
-/*
-    case ksigLineSide:      \
-    case ksigCAS_EL7:       \
-    case ksigE1LC
-*/
-
-#define CASE_RDSI_SIG       \
-    case ksigPRI_EndPoint:  \
-    case ksigPRI_Network:   \
-    case ksigPRI_Passive:   \
-    case ksigOpenCCS
-
-#define CASE_FLASH_GRP          \
-    case ksigLineSide:          \
-    case ksigCAS_EL7:           \
-    case ksigE1LC
-
-/******************************************************************************/
-
-/* Buffering size constants */
-
-#define SILENCE_PACKS               2
-
-#define KHOMP_READ_PACKET_TIME     16                            // board sample (ms)
-
-#define KHOMP_READ_PACKET_SIZE    (KHOMP_READ_PACKET_TIME *   8) // asterisk sample size (bytes)
-
-#define KHOMP_MIN_READ_PACKET_SIZE (10 * 8)                      // min size to return on khomp_read
-#define KHOMP_MAX_READ_PACKET_SIZE (30 * 8)                      // max size to return on khomp_read
-
-#define KHOMP_AUDIO_BUFFER_SIZE   (KHOMP_READ_PACKET_SIZE  *  8) // buffer size (bytes)
-
-/* debug and log macros */
-#define DBG(x,y) \
-    { \
-        if (K::Logger::Logg.classe( C_DBG_##x ).enabled()) \
-                K::Logger::Logg( C_DBG_##x , y ); \
-    }
-
-#define LOG(x,y) \
-    { \
-        K::Logger::Logg( C_##x , y ); \
-    }
-
-#define LOGC(x,y) \
-    { \
-        if (K::Logger::Logg.classe( C_##x ).enabled()) \
-            LOG( x , y ); \
-    }
-
-/* useful to debug arguments */
-#define DEBUG_CLI_CMD() \
-{ \
-    K::Logger::Logg2(C_CLI,stream,FMT("argc: %d ") % argc); \
-    for(int i = 0;i< argc;i++)                              \
-        K::Logger::Logg2(C_CLI,stream,FMT("argv[%d]:%s ") % i % argv[i]); \
-}
-
-/* macros to cli commands */
-#define ARG_CMP(a,b) (argv[a] && !strncasecmp(argv[a],b,sizeof(b))) 
-#define EXEC_CLI_CMD(command) Cli::command.execute(argc,argv)
-
-/* macro to string treats */
-#define SAFE_sprintf(a, ...)    snprintf(a,sizeof(a), __VA_ARGS__)
-#define SAFE_strcasecmp(a,b)    strncasecmp(a, b, sizeof(b))
-
-/* tags for timers */
-#define TM_VAL_CALL    (unsigned int)0x01
-#define TM_VAL_CHANNEL (unsigned int)0x02
-
-/* macro to creating contexts */
-#define BEGIN_CONTEXT do
-#define END_CONTEXT while(false);
-
-/* Define log type */
-typedef enum
-{
-    C_CLI,      /* cli msgs    */
-
-    C_ERROR,    /* errors      */
-    C_WARNING,  /* warnings    */
-    C_MESSAGE,  /* normal msgs */
-
-    C_EVENT,    /* k3l events   */
-    C_COMMAND,  /* k3l commands */
-
-    C_AUDIO_EV, /* k3l audio events */
-    C_MODEM_EV, /* gsm modem events */
-    C_LINK_STT, /* link status msgs */
-    C_CAS_MSGS, /* cas events msgs  */
-
-    C_DBG_FUNC,
-    C_DBG_LOCK,
-    C_DBG_THRD,
-    C_DBG_STRM,
-    
-    C_DBG_CONF,
-}
-class_type;
-
-typedef enum
-{
-    O_CONSOLE,
-    O_GENERIC,
-    O_R2TRACE,
-}
-output_type;
-
-typedef enum
-{
-    SCE_SHOW_WARNING,
-    SCE_SHOW_DEBUG,
-    SCE_SHOW_SAME,
-    SCE_HIDE
-}
-send_cmd_error_type;
-
-typedef enum 
-{
-    T_UNKNOWN = 2,
-    T_TRUE = 1,
-    T_FALSE = 0,
-}
-TriState;
-    
-
-#endif
diff --git a/src/mod/endpoints/mod_khomp/include/frame.h b/src/mod/endpoints/mod_khomp/include/frame.h
deleted file mode 100644
index 8337f37b3e..0000000000
--- a/src/mod/endpoints/mod_khomp/include/frame.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _FRAME_HPP_
-#define _FRAME_HPP_
-
-#include <stdlib.h>
-#include <sys/mman.h>
-
-#include <ringbuffer.hpp>
-
-#include "globals.h"
-
-struct FrameStorage
-{
-    static const unsigned int frame_count = 24;//6;
-    static const unsigned int audio_count = 24;//4;
-
-    FrameStorage(switch_codec_t * codec, int packet_size);
-    virtual ~FrameStorage();
-
-    inline switch_frame_t * next_frame(void)
-    {
-        return &(_frames[next_index()]);
-    }
-
-    inline unsigned int next_index()
-    {
-        unsigned int tmp = _index;
-
-        if (++_index >= frame_count)
-            _index = 0;
-
-        return tmp;
-    }
-
-    inline switch_frame_t * cng_frame(void)
-    {
-        return &_cng_frame;
-    }
-
-    char * audio_buffer()
-    {
-        return _buffer;
-    };
-
- private:
-    switch_frame_t   _cng_frame;
-
-    switch_frame_t * _frames;
-    char           * _buffer;
-
-    unsigned int     _index;
-};
-
-/* Internal frame array structure. */
-template < int S >
-struct FrameManager: protected FrameStorage
-{
-    typedef const char Packet[ S ];
-
-    typedef Ringbuffer < Packet >  AudioBuffer;
-
-    FrameManager(switch_codec_t * codec)
-    : FrameStorage(codec, S),
-      _audio(audio_count, (Packet*)audio_buffer())
-    {};
-
-//    ~FrameManager();
-
-    // may throw Ringbuffer::BufferEmpty
-    switch_frame_t * pick(void)
-    {
-        try
-        {
-            /* try to consume from buffer.. */
-            Packet & a = _audio.consumer_start();
-
-            switch_frame * f = next_frame();
-
-            /* adjust pointer */
-            f->data = (char *)(&a);
-
-            /* advance now */
-            _audio.consumer_commit();
- 
-            return f;
-        }
-        catch (...) // AudioBuffer::BufferEmpty & e)
-        {
-            return NULL;
-        }
-    }
-
-    // may throw Ringbuffer::BufferFull
-    bool give(const char * buf, unsigned int size)
-    {
-        return _audio.provider_partial(buf, size);
-    }
-
-    switch_frame_t * cng(void)
-    {
-        return cng_frame();
-    }
-
-    void clear()
-    {
-        _audio.clear();
-    }
-
- protected:
-    AudioBuffer      _audio;
-
-    unsigned int     _index;
-};
-
-typedef FrameManager < Globals::switch_packet_size > FrameSwitchManager;
-typedef FrameManager < Globals::boards_packet_size > FrameBoardsManager;
-
-#endif /* _FRAME_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/include/globals.h b/src/mod/endpoints/mod_khomp/include/globals.h
deleted file mode 100644
index a807273027..0000000000
--- a/src/mod/endpoints/mod_khomp/include/globals.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _GLOBALS_H_
-#define _GLOBALS_H_
-#include "k3lapi.hpp"
-
-#include <config_options.hpp>
-#include <k3lutil.hpp>
-#include <verbose.hpp>
-#include <regex.hpp>
-#include <timer.hpp>
-
-#include <vector>
-#include <string>
-#include <fstream>
-
-#include <simple_lock.hpp>
-
-extern "C"
-{
-    #include <switch.h>
-}
-
-/* As this is a static-variable-only struct, member variable *
- * names need not to get "_" in front of the name            */
-
-struct Globals
-{
-    typedef void * global_timer_data;
-    typedef void (global_timer_func)(global_timer_data);
-    typedef TimerTemplate < global_timer_func, global_timer_data > GlobalTimer;
-    
-    typedef SimpleNonBlockLock<25,100> Mutex;
-    
-    /* FreeSWITCH variables for packets and buffer */
-    // in ms
-    static const unsigned int switch_packet_duration  = 30;
-    static const unsigned int boards_packet_duration  = 24;
-    // in bytes
-    static const unsigned int switch_packet_size = switch_packet_duration *  8;
-    static const unsigned int boards_packet_size = boards_packet_duration *  8;
-    static const unsigned int    cng_buffer_size = (switch_packet_size > boards_packet_size ? switch_packet_size : boards_packet_size);    
-
-    /* Father */
-    static K3LAPI                            k3lapi;
-
-    /* Son */
-    static K3LUtil                           k3lutil;
-
-    /* Holy Spirit */
-    static Verbose                           verbose;
-
-    /* Global timer */ 
-    static  GlobalTimer                    * global_timer;
-
-    /* Mutex to KhompPvt allocation */
-    static Mutex                             khomp_alloc_mutex;
-
-    /* Config options class */
-    static Config::Options                   options;
-
-    static const Regex::Expression           regex_allocation;
-
-    /* FreeSWITCH Articular Ligaments */ 
-    static switch_endpoint_interface_t     * khomp_endpoint_interface;
-    static switch_endpoint_interface_t     * khomp_sms_endpoint_interface;
-    static switch_endpoint_interface_t     * khomp_pr_endpoint_interface;
-    static switch_application_interface_t  * khomp_app_inteface;
-    static switch_api_interface_t          * api_interface;
-    static switch_memory_pool_t            * module_pool;
-    
-    /* Still a nice workaround */ 
-    volatile static bool                     logs_being_rotated;
-
-    /* Trace flags */
-    static bool                              flag_trace_rdsi;
-};
-
-#endif /* _GLOBALS_H_ */
-
diff --git a/src/mod/endpoints/mod_khomp/include/k3l.h b/src/mod/endpoints/mod_khomp/include/k3l.h
deleted file mode 100644
index 51686d0296..0000000000
--- a/src/mod/endpoints/mod_khomp/include/k3l.h
+++ /dev/null
@@ -1,2009 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _GENERATED_K3L_H_
-#define _GENERATED_K3L_H_
-#if !defined KLTYPEDEFS_H
-#define KLTYPEDEFS_H
-#if defined( _WINDOWS ) || defined( _Windows ) || defined( _WIN32 )
-	#ifndef KWIN32
-	#define KWIN32 1
-	#endif
-#endif
-
-#ifdef KWIN32
-	typedef __int64				int64;
-	typedef unsigned __int64	uint64;
-	#define Kstdcall __stdcall
-#else
-	typedef long long				int64;
-	typedef unsigned long long		uint64;
-	#define Kstdcall 
-#endif
-typedef int					int32;
-typedef unsigned int		uint32;
-typedef uint64			    intptr;
-typedef intptr              stackint;
-typedef short int			int16;
-typedef unsigned short int	uint16;
-typedef char				int8;
-typedef unsigned char		uint8;
-typedef unsigned char		byte;
-typedef char				sbyte;
-typedef double				float64;
-typedef float				float32;
-typedef int32				stt_code;
-
-enum KLibraryStatus 
-{
-	ksSuccess =			0,
-	ksFail =			1,
-	ksTimeOut =			2,
-	ksBusy =			3,
-	ksLocked =			4,
-	ksInvalidParams =	5,
-	ksEndOfFile =		6,
-	ksInvalidState =	7,
-	ksServerCommFail =	8,
-	ksOverflow =		9,
-    ksUnderrun =        10,
-	ksNotFound =		11,
-    ksNotAvailable =    12
-};	
-enum KTxRx
-{
-	kNoTxRx	= 0x0,
-	kTx		= 0x1,
-	kRx		= 0x2,
-	kBoth	= 0x3
-}; 
-
-#define KMAX_SERIAL_NUMBER			12 
-#define KMAX_E1_CHANNELS			30
-#define KMAX_DIAL_NUMBER	        20
-#define KMAX_ADDRESS				60
-#define KMAX_DSP_NAME		        8
-#define KMAX_STR_VERSION	        80
-#define KMAX_BUFFER_ADDRESSES		16
-#define KMAX_LOG                    1024
-#define KMAX_SIP_DATA               248
-#define KMAX_GSM_CALLS              6
-#define KMAX_GSM_OPER_NAME          32
-#define KMAX_GSM_IMEI_SIZE          16
-#endif
-#if !defined KVOIPDEFS_H
-#define KVOIPDEFS_H
-enum KRejectReason
-{
-	UserBusy = 0,
-	UserNotFound,
-	NoAnswer,
-	Decline,
-	ServiceUnavailable,
-	ServerInternalError,
-	UnknownRejectReason
-};
-enum KSIP_Failures
-{
-	kveResponse_200_OK_Success             		= 200,
-    kveRedirection_300_MultipleChoices			= 300,
-	kveRedirection_301_MovedPermanently			= 301,
-	kveRedirection_302_MovedTemporarily			= 302,
-	kveRedirection_305_UseProxy					= 305,
-	kveRedirection_380_AlternativeService		= 380,
-	kveFailure_400_BadRequest					= 400,
-	kveFailure_401_Unauthorized					= 401,
-	kveFailure_402_PaymentRequired				= 402,
-	kveFailure_403_Forbidden					= 403,
-	kveFailure_404_NotFound						= 404,
-	kveFailure_405_MethodNotAllowed				= 405,
-	kveFailure_406_NotAcceptable				= 406,
-	kveFailure_407_ProxyAuthenticationRequired	= 407,
-	kveFailure_408_RequestTimeout				= 408,
-	kveFailure_410_Gone							= 410,
-	kveFailure_413_RequestEntityTooLarge		= 413,
-	kveFailure_414_RequestURI_TooLong			= 414,
-	kveFailure_415_UnsupportedMediaType			= 415,
-	kveFailure_416_UnsupportedURI_Scheme		= 416,
-	kveFailure_420_BadExtension					= 420,
-	kveFailure_421_ExtensionRequired			= 421,
-	kveFailure_423_IntervalTooBrief				= 423,
-	kveFailure_480_TemporarilyUnavailable		= 480,
-	kveFailure_481_CallDoesNotExist				= 481,
-	kveFailure_482_LoopDetected					= 482,
-	kveFailure_483_TooManyHops					= 483,
-	kveFailure_484_AddressIncomplete			= 484,
-	kveFailure_485_Ambiguous					= 485,
-	kveFailure_486_BusyHere						= 486,
-	kveFailure_487_RequestTerminated			= 487,
-	kveFailure_488_NotAcceptableHere			= 488,
-	kveFailure_491_RequestPending				= 491,
-	kveFailure_493_Undecipherable				= 493,
-	kveServer_500_InternalError					= 500,
-	kveServer_501_NotImplemented				= 501,
-	kveServer_502_BadGateway					= 502,
-	kveServer_503_ServiceUnavailable			= 503,
-	kveServer_504_TimeOut						= 504,
-	kveServer_505_VersionNotSupported			= 505,
-	kveServer_513_MessageTooLarge				= 513,
-	kveGlobalFailure_600_BusyEverywhere			= 600,
-	kveGlobalFailure_603_Decline				= 603,
-	kveGlobalFailure_604_DoesNotExistAnywhere	= 604,
-	kveGlobalFailure_606_NotAcceptable			= 606
-};
-enum KVoIPRegTypes
-{
-   kvrtRegister    =   0,
-   kvrtUnregister  =   1
-};
-
-struct KVoIPCallParams
-{
-	sbyte ToUser[ KMAX_ADDRESS + 1 ];
-	sbyte FromUser[ KMAX_ADDRESS + 1 ];
-    sbyte FromUserIP[ KMAX_ADDRESS + 1 ];
-};
-struct KVoIPEvRegisterParams
-{
-    KVoIPRegTypes Register;
-	sbyte User[ KMAX_ADDRESS + 1 ];
-	sbyte ProxyIP[ KMAX_ADDRESS + 1 ];
-};
-struct KVoIPSeize 
-{
-	sbyte FromUser[ KMAX_ADDRESS + 1 ];
-	sbyte ToUser[ KMAX_ADDRESS + 1 ];
-    sbyte ProxyIP[ KMAX_ADDRESS + 1 ];
-};
-#endif
-#if !defined KLDEFS_H
-#define KLDEFS_H
-
-
-
-#define CM_SEIZE					0x01
-     
-#define CM_SYNC_SEIZE				0x02
-
-#define CM_SIP_REGISTER             0x03
-
-#define CM_DIAL_DTMF				0x04
-
-#define CM_DISCONNECT				0x05
-
-#define CM_CONNECT					0x06
-
-#define CM_PRE_CONNECT				0x07
-
-#define CM_CAS_CHANGE_LINE_STT		0x08
-
-#define CM_CAS_SEND_MFC				0x09
-
-#define CM_SET_FORWARD_CHANNEL		0x0A
-
-#define CM_CAS_SET_MFC_DETECT_MODE	0x0B
-
-#define CM_DROP_COLLECT_CALL		0x0C
-
-#define CM_MAKE_CALL				0x0D
-
-#define CM_RINGBACK 				0x0E
-
-#define CM_USER_INFORMATION         0x0F
-
-#define CM_USER_INFORMATION_EX      0x2B
-
-#define CM_VOIP_SEIZE				0x23
-
-
-#define	CM_LOCK_INCOMING			0x10
-
-#define CM_UNLOCK_INCOMING			0x11
-
-#define CM_LOCK_OUTGOING			0x12
-
-#define CM_UNLOCK_OUTGOING			0x13
-
-#define CM_START_SEND_FAIL			0x14
-
-#define CM_STOP_SEND_FAIL			0x15
-
-#define CM_END_OF_NUMBER            0x16
-
-#define CM_SEND_SIP_DATA			0x17
-
-#define CM_SS_TRANSFER              0x18
-
-#define CM_GET_SMS                  0x19
-
-#define CM_PREPARE_SMS              0x1A
-
-#define CM_SEND_SMS                 0x1B
-
-#define CM_SEND_TO_MODEM            0x1C
-
-#define CM_CHECK_NEW_SMS            0x1D
-
-#define CM_ISDN_SEND_SUBADDRESSES   0x1E
-
-#define CM_CT_TRANSFER              0x1F
-
-#define CM_ENABLE_DTMF_SUPPRESSION	0x30
-
-#define CM_DISABLE_DTMF_SUPPRESSION	0x31
-
-#define CM_ENABLE_AUDIO_EVENTS		0x32
-
-#define CM_DISABLE_AUDIO_EVENTS		0x33
-
-#define CM_ENABLE_CALL_PROGRESS		0x34
-
-#define CM_DISABLE_CALL_PROGRESS	0x35
-
-#define CM_FLASH					0x36
-
-#define CM_ENABLE_PULSE_DETECTION	0x37
-
-#define CM_DISABLE_PULSE_DETECTION	0x38
-
-#define CM_ENABLE_ECHO_CANCELLER	0x39
-
-#define CM_DISABLE_ECHO_CANCELLER	0x3A
-
-#define CM_ENABLE_AGC				0x3B
-
-#define CM_DISABLE_AGC				0x3C
-
-#define CM_ENABLE_HIGH_IMP_EVENTS	0x3D
-
-#define CM_DISABLE_HIGH_IMP_EVENTS	0x3E
-
-#define CM_ENABLE_CALL_ANSWER_INFO  0x40
-
-#define CM_DISABLE_CALL_ANSWER_INFO 0x41
-
-#define CM_START_WATCHDOG           0x45
-
-#define CM_STOP_WATCHDOG            0x46
-
-#define CM_NOTIFY_WATCHDOG          0x47
-
-#define CM_WATCHDOG_COUNT           0x48
-
-#define CM_HOLD_SWITCH             0x4A
-
-#define CM_MPTY_CONF               0x4B
-
-#define CM_MPTY_SPLIT              0x4C
-
-#define CM_SIM_CARD_SELECT         0x4D
-
-#define CM_START_FAX_TX				0x50
-
-#define CM_STOP_FAX_TX			0x51
-
-#define CM_ADD_FAX_FILE				0x52
-
-#define CM_ADD_FAX_PAGE_BREAK		0x53
-
-#define CM_START_FAX_RX				0x54
-
-#define CM_STOP_FAX_RX			    0x55
-
-#define CM_RESET_LINK				0xF1
-
-#define CM_CLEAR_LINK_ERROR_COUNTER 0xF2
-
-#define CM_SEND_DEVICE_SECURITY_KEY 0xF3
-
-#define CM_RESET_MODEM              0xF4
-
-#define CM_ISDN_DISABLE_LINK        0xF5
-
-#define CM_ISDN_ENABLE_LINK         0xF6
-
-
-#define EV_CHANNEL_FREE				0x01
-
-#define EV_CONNECT					0x03
-
-#define EV_DISCONNECT				0x04
-
-#define EV_CALL_SUCCESS				0x05
-
-#define EV_CALL_FAIL				0x06
-
-#define EV_NO_ANSWER				0x07
-
-#define EV_BILLING_PULSE			0x08
-
-#define EV_SEIZE_SUCCESS			0x09
-
-#define EV_SEIZE_FAIL				0x0A
-
-#define EV_SEIZURE_START			0x0B
-
-#define EV_CAS_LINE_STT_CHANGED		0x0C
-
-#define EV_CAS_MFC_RECV				0x0D
-
-#define EV_NEW_CALL                 0x0E
-
-#define EV_USER_INFORMATION         0x0F
-
-#define EV_USER_INFORMATION_EX      0x1D 
-
-#define EV_DIALED_DIGIT             0x10
-
-#define EV_SIP_REGISTER_INFO        0x11
-
-#define EV_RING_DETECTED            0x12
-
-#define EV_ISDN_SUBADDRESSES        0x13
-
-#define EV_CALL_HOLD_START			0x16
-
-#define EV_CALL_HOLD_STOP			0x17
-
-#define EV_SS_TRANSFER_FAIL         0x18
-
-#define EV_FLASH                    0x19
-
-#define EV_ISDN_PROGRESS_INDICATOR	0x1A
-
-#define EV_CT_TRANSFER_SUCCESS      0x1B
-
-#define EV_CT_TRANSFER_FAIL         0x1C
-
-#define EV_DTMF_DETECTED			0x20
-
-#define EV_DTMF_SEND_FINISH			0x21
-
-#define EV_AUDIO_STATUS				0x22
-
-#define EV_CADENCE_RECOGNIZED		0x23
-#define EV_CALL_PROGRESS			EV_CADENCE_RECOGNIZED
-
-#define EV_END_OF_STREAM			0x24
-
-#define EV_PULSE_DETECTED			0x25
-
-#define EV_POLARITY_REVERSAL		0x26
-
-#define EV_CALL_ANSWER_INFO     	0x27
-
-#define EV_COLLECT_CALL          	0x28
-
-#define EV_SIP_DTMF_DETECTED        0x29
-
-#define EV_SIP_DATA			        0x2A
-
-#define EV_RECV_FROM_MODEM			0x42
-
-#define EV_NEW_SMS                  0x43
-
-#define EV_SMS_INFO                 0x44
-
-#define EV_SMS_DATA                 0x45
-
-#define EV_SMS_SEND_RESULT          0x46
-
-#define EV_CALL_MPTY_START			0x47
-
-#define EV_CALL_MPTY_STOP			0x48
-
-#define EV_GSM_COMMAND_STATUS		0x49
-
-#define EV_WATCHDOG_COUNT           0x60
-
-#define EV_CHANNEL_FAIL				0x30
-
-#define EV_REFERENCE_FAIL			0x31
-
-#define EV_INTERNAL_FAIL			0x32
-
-#define EV_HARDWARE_FAIL			0x33
-
-#define EV_LINK_STATUS				0x34
-
-#define EV_PHYSICAL_LINK_UP			0x35
-
-#define EV_PHYSICAL_LINK_DOWN		0x36
-
-#define EV_CLIENT_RECONNECT		0xF0
-
-#define EV_CLIENT_AUDIOLISTENER_TIMEOUT     0xF1
-
-#define EV_CLIENT_BUFFERED_AUDIOLISTENER_OVERFLOW   0xF2
-
-#define EV_REQUEST_DEVICE_SECURITY_KEY 0xF3
-
-#define EV_DISK_IS_FULL		0xF4
-
-
-#define CM_SEND_DTMF				0xD1
-
-#define CM_STOP_AUDIO 				0xD2
-
-#define CM_HARD_RESET				0xF0
-
-#define EV_VOIP_SEIZURE					0x40
-
-#define EV_SEIZURE					0x41
-
-#define EV_FAX_CHANNEL_FREE			0x50
-
-#define EV_FAX_FILE_SENT			0x51
-#define EV_FAX_FILE_FAIL			0x52
-#define EV_FAX_MESSAGE_CONFIRMATION 0x53
-#define EV_FAX_TX_TIMEOUT			0x54
-#define EV_FAX_PAGE_CONFIRMATION EV_FAX_MESSAGE_CONFIRMATION
-#define EV_FAX_REMOTE_INFO			0x55
-
-#endif
-
-   #define FC_REMOTE_FAIL			0x01
-   #define FC_LOCAL_FAIL			0x02
- 
-   #define FC_REMOTE_LOCK			0x03
-  
-   #define FC_LINE_SIGNAL_FAIL		0x04
-   #define FC_ACOUSTIC_SIGNAL_FAIL	0x05
-
-enum KChannelFail
-{
-	kfcRemoteFail = FC_REMOTE_FAIL,
-	kfcLocalFail = FC_LOCAL_FAIL,
-	kfcRemoteLock = FC_REMOTE_LOCK,
-	kfcLineSignalFail = FC_LINE_SIGNAL_FAIL,
-	kfcAcousticSignalFail = FC_ACOUSTIC_SIGNAL_FAIL
-};
-
-   #define ER_INTERRUPT_CTRL		0x01
-   #define ER_COMMUNICATION_FAIL	0x02
-   #define ER_PROTOCOL_FAIL			0x03
-   #define ER_INTERNAL_BUFFER		0x04
-	#define ER_MONITOR_BUFFER		0x05
-	#define ER_INITIALIZATION		0x06
-	#define ER_INTERFACE_FAIL		0x07
-	#define ER_CLIENT_COMM_FAIL		0x08
-	#define ER_POLL_CTRL			0x09
-	#define ER_EVT_BUFFER_CTRL		0x0A
-
-	#define ER_INVALID_CONFIG_VALUE 0x0B
-
-	#define ER_INTERNAL_GENERIC_FAIL 0x0C
-
-enum KInternalFail
-{
-	kifInterruptCtrl = ER_INTERRUPT_CTRL,
-	kifCommunicationFail = ER_COMMUNICATION_FAIL,
-	kifProtocolFail = ER_PROTOCOL_FAIL,
-	kifInternalBuffer = ER_INTERNAL_BUFFER,
-	kifMonitorBuffer = ER_MONITOR_BUFFER,
-	kifInitialization = ER_INITIALIZATION,
-	kifInterfaceFail = ER_INTERFACE_FAIL,
-	kifClientCommFail = ER_CLIENT_COMM_FAIL
-};	
-
-   #define FS_CHANNEL_LOCKED		0x01
-   #define FS_INCOMING_CHANNEL		0x02
-   #define FS_CHANNEL_NOT_FREE		0x03
-   #define FS_DOUBLE_SEIZE			0x04
-   #define FS_LOCAL_CONGESTION		0x06
-   #define FS_NO_DIAL_TONE			0x07
-enum KSeizeFail
-{
-	ksfChannelLocked = FS_CHANNEL_LOCKED,
-	ksfIncomingChannel = FS_INCOMING_CHANNEL,
-	ksfChannelBusy = FS_CHANNEL_NOT_FREE,
-	ksfDoubleSeizure = FS_DOUBLE_SEIZE,
-	ksfCongestion = FS_LOCAL_CONGESTION,
-	ksfNoDialTone = FS_NO_DIAL_TONE
-};
-#if !defined KH100DEFS_H
-#define KH100DEFS_H
-
-#define CM_SEND_TO_CTBUS			0x90
-
-#define CM_RECV_FROM_CTBUS			0x91
-
-#define CM_SEND_RANGE_TO_CTBUS		0x92
-
-#define CM_SETUP_H100				0x93
-
-enum KH100ConfigIndex
-{
-	khciDeviceMode = 0,
-	khciMasterGenClock = 1,
-	khciCTNetRefEnable = 4,
-	khciSCbusEnable = 6,
-	khciHMVipEnable = 7,
-	khciMVip90Enable = 8,
-	khciCTbusDataEnable = 9,
-	khciCTbusFreq03_00 = 10,
-	khciCTbusFreq07_04 = 11,
-	khciCTbusFreq11_08 = 12,
-	khciCTbusFreq15_12 = 13,
-	khciMax = 14,
-	khciMasterDevId = 20,
-	khciSecMasterDevId = 21,
-	khciCtNetrefDevId = 22,
-    khciMaxH100ConfigIndex
-};	
-
-enum KMasterPLLClockReference
-{
-    h100_Ref_FreeRun = 0,
-    h100_Ref_holdover = 1,
-	h100_Automatic = 2,
-    h100_Ref_ctnetref = 7,
-    h100_Ref_link0 = 8,
-    h100_Ref_link1 = 9
-};
-enum KSlavePLLClockReference
-{
-    h100_PllLoc_ClkA = 0,
-    h100_PllLoc_ClkB = 1,
-    h100_PllLoc_SCBus = 2,
-    h100_PllLoc_MVIP90 = 3,
-    h100_PllLoc_Link0 = 4,
-    h100_PllLoc_Link1 = 5,
-    h100_PllLoc_Error = 6
-};
-
-#define H100_DEVICE_MODE				khciDeviceMode
-	enum KH100Mode
-	{
-		h100_Slave,
-		h100_Master,
-		h100_StandbyMaster,
-		h100_Diagnostic,
-		h100_NotConnected
-	};
-#define H100_MASTER_GEN_CLOCK			khciMasterGenClock
-	enum KH100SelectCtbusClock
-	{
-		h100_scClockA,
-		h100_scClockB
-	};
-
-#define H100_CT_NETREF_ENABLE			khciCTNetRefEnable
-	enum KH100CtNetref
-	{
-		h100_nrOff,
-		h100_nrEnable
-	};
-#define	H100_SCBUS_ENABLE				khciSCbusEnable
-	enum KH100ScbusEnable
-	{
-		h100_seOff,
-		h100_seOn2Mhz,
-		h100_seOn4Mhz,
-		h100_seOn8Mhz
-	};
-#define H100_HMVIP_ENABLE				khciHMVipEnable
-
-#define H100_MVIP90_ENABLE				khciMVip90Enable
-
-#define H100_CTBUS_DATA_ENABLE			khciCTbusDataEnable
-
-enum KH100Enable
-{
-	h100_On = 0x01,
-	h100_Off = 0x00
-};
-	
-#define H100_CTBUS_FREQ_03_00			khciCTbusFreq03_00
-#define H100_CTBUS_FREQ_07_04			khciCTbusFreq07_04
-#define H100_CTBUS_FREQ_11_08			khciCTbusFreq11_08
-#define H100_CTBUS_FREQ_15_12			khciCTbusFreq15_12
-
-enum KH100CtbusFreq
-{
-	h100_cf_2Mhz	=	0,
-	h100_cf_4Mhz	=	1,
-	h100_cf_8Mhz	=	2 
-};
-
-#endif
-
-#define CM_MIXER					0x60
-
-#define CM_CLEAR_MIXER				0x61
-
-#define CM_PLAY_FROM_FILE			0x62
-
-#define CM_RECORD_TO_FILE			0x63
-	
-#define CM_PLAY_FROM_STREAM			0x64 
-
-#define CM_INTERNAL_PLAY			0x65 
-
-#define CM_STOP_PLAY				0x66
-
-#define CM_STOP_RECORD				0x67
-
-#define CM_PAUSE_PLAY				0x68
-
-#define CM_PAUSE_RECORD				0x69
-
-#define CM_RESUME_PLAY				0x6A
-
-#define CM_RESUME_RECORD			0x6B
-
-#define CM_INCREASE_VOLUME			0x6C
-
-#define CM_DECREASE_VOLUME			0x6D
-
-#define CM_LISTEN					0x6E
-
-#define CM_STOP_LISTEN				0x6F
-
-#define CM_PREPARE_FOR_LISTEN		0x70
-
-#define CM_PLAY_SOUND_CARD			0x71
-
-#define CM_STOP_SOUND_CARD			0x72
-
-#define CM_MIXER_CTBUS				0x73
-
-#define CM_PLAY_FROM_STREAM_EX			0x74 
-
-#define CM_INTERNAL_PLAY_EX			0x75 
-
-#define CM_ENABLE_PLAYER_AGC		0x76
-
-#define CM_DISABLE_PLAYER_AGC		0x77
-
-#define CM_START_STREAM_BUFFER		0x78
-
-#define CM_ADD_STREAM_BUFFER		0x79
-
-#define CM_STOP_STREAM_BUFFER		0x7A
-
-#define CM_SEND_BEEP				0x7B
-
-#define CM_SEND_BEEP_CONF			0x7C
-
-#define CM_ADD_TO_CONF				0x7D
-
-#define CM_REMOVE_FROM_CONF			0x7E
-
-#define CM_RECORD_TO_FILE_EX		0x7F
-
-#define CM_SET_VOLUME				0xA0
-
-#define CM_START_CADENCE			0xA1
-
-#define CM_STOP_CADENCE				0xA2
-
-#define CM_SET_INPUT_MODE				0xA3
-#if !defined KR2D_H
-#define KR2D_H
-
-#define CM_SET_LINE_CONDITION		0x80
-
-#define CM_SEND_LINE_CONDITION		0x81
-
-#define CM_SET_CALLER_CATEGORY		0x82
-      
-	
-#define CM_DIAL_MFC					0x83
-
-
-
-enum KSignGroupII_Brazil
-{
-	kg2BrOrdinary		        = 0x01,     
-	kg2BrPriority		        = 0x02,     
-	kg2BrMaintenance	        = 0x03,     
-	kg2BrLocalPayPhone	        = 0x04,     
-	kg2BrTrunkOperator	        = 0x05,     
-	kg2BrDataTrans	            = 0x06,     
-	kg2BrNonLocalPayPhone       = 0x07,     
-	kg2BrCollectCall	        = 0x08,     
-	kg2BrOrdinaryInter	        = 0x09,     
-	kg2BrTransfered		        = 0x0B,     
-};
-
-enum KSignGroupB_Brazil
-{
-	kgbBrLineFreeCharged		= 0x01,     
-	kgbBrBusy					= 0x02,     
-	kgbBrNumberChanged			= 0x03,     
-	kgbBrCongestion				= 0x04,     
-	kgbBrLineFreeNotCharged		= 0x05,     
-	kgbBrLineFreeChargedLPR		= 0x06,     
-	kgbBrInvalidNumber			= 0x07,     
-	kgbBrLineOutOfOrder			= 0x08,     
-	kgbBrNone					= 0xFF      
-};
-
-
-enum KSignGroupII_Argentina
-{
-	kg2ArOrdinary		        = 0x01,     
-	kg2ArPriority		        = 0x02,     
-	kg2ArMaintenance	        = 0x03,     
-	kg2ArLocalPayPhone	        = 0x04,     
-	kg2ArTrunkOperator	        = 0x05,     
-	kg2ArDataTrans	            = 0x06,     
-    kg2ArCPTP                   = 0x0B,     
-    kg2ArSpecialLine            = 0x0C,     
-    kg2ArMobileUser             = 0x0D,     
-    kg2ArPrivateRedLine         = 0x0E,     
-    kg2ArSpecialPayPhoneLine    = 0x0F,     
-};
-
-enum KSignGroupB_Argentina
-{
-	kgbArNumberChanged			= 0x02,     
-	kgbArBusy					= 0x03,     
-	kgbArCongestion				= 0x04,     
-	kgbArInvalidNumber			= 0x05,     
-	kgbArLineFreeCharged		= 0x06,     
-	kgbArLineFreeNotCharged		= 0x07,     
-	kgbArLineOutOfOrder			= 0x08,     
-	kgbArNone					= 0xFF      
-};
-
-
-enum KSignGroupII_Chile
-{
-    kg2ClOrdinary		        = 0x01,     
-	kg2ClPriority		        = 0x02,     
-	kg2ClMaintenance	        = 0x03,     
-	kg2ClTrunkOperator	        = 0x05,     
-	kg2ClDataTrans	            = 0x06,     
-    kg2ClUnidentifiedSubscriber = 0x0B,     
-};
-
-enum KSignGroupB_Chile
-{
-	kgbClNumberChanged			= 0x02,     
-	kgbClBusy					= 0x03,     
-	kgbClCongestion				= 0x04,     
-	kgbClInvalidNumber			= 0x05,     
-	kgbClLineFreeCharged		= 0x06,     
-	kgbClLineFreeNotCharged		= 0x07,     
-	kgbClLineOutOfOrder			= 0x08,     
-	kgbClNone					= 0xFF      
-};
-
-
-enum KSignGroupII_Mexico
-{
-	kg2MxTrunkOperator	        = 0x01,     
-	kg2MxOrdinary		        = 0x02,     
-	kg2MxMaintenance	        = 0x06,     
-};
-
-enum KSignGroupB_Mexico
-{
-	kgbMxLineFreeCharged		= 0x01,     
-	kgbMxBusy					= 0x02,     
-	kgbMxLineFreeNotCharged		= 0x05,     
-	kgbMxNone				    = 0xFF      
-};
-
-
-enum KSignGroupII_Uruguay
-{
-	kg2UyOrdinary		        = 0x01,     
-	kg2UyPriority		        = 0x02,     
-	kg2UyMaintenance	        = 0x03,     
-	kg2UyLocalPayPhone	        = 0x04,     
-	kg2UyTrunkOperator	        = 0x05,     
-	kg2UyDataTrans	            = 0x06,     
-    kg2UyInternSubscriber       = 0x07,     
-};
-
-enum KSignGroupB_Uruguay
-{
-	kgbUyNumberChanged			= 0x02,     
-	kgbUyBusy					= 0x03,     
-	kgbUyCongestion				= 0x04,     
-	kgbUyInvalidNumber			= 0x05,     
-	kgbUyLineFreeCharged		= 0x06,     
-	kgbUyLineFreeNotCharged		= 0x07,     
-	kgbUyLineOutOfOrder			= 0x08,     
-	kgbUyNone					= 0xFF      
-};
-
-
-enum KSignGroupII_Venezuela
-{
-	kg2VeOrdinary		        = 0x01,     
-	kg2VePriority		        = 0x02,     
-	kg2VeMaintenance	        = 0x03,     
-	kg2VeLocalPayPhone	        = 0x04,     
-	kg2VeTrunkOperator	        = 0x05,     
-	kg2VeDataTrans	            = 0x06,     
-    kg2VeNoTransferFacility     = 0x07,     
-};
-
-enum KSignGroupB_Venezuela
-{
-	kgbVeLineFreeChargedLPR		= 0x01,     
-	kgbVeNumberChanged			= 0x02,     
-	kgbVeBusy					= 0x03,     
-	kgbVeCongestion				= 0x04,     
-	kgbVeInformationTone		= 0x05,     
-	kgbVeLineFreeCharged		= 0x06,     
-	kgbVeLineFreeNotCharged		= 0x07,     
-    kgbVeLineBlocked            = 0x08,     
-    kgbVeIntercepted            = 0x09,     
-    kgbVeDataTrans              = 0x0A,     
-	kgbVeNone					= 0xFF      
-};
-
-
-
-
-
-enum KSignGroupB
-{
-	kgbLineFreeCharged			= 0x01,
-	kgbLineFreeNotCharged		= 0x05,
-	kgbLineFreeChargedLPR		= 0x06,
-	kgbBusy						= 0x02,
-	kgbNumberChanged			= 0x03,
-	kgbCongestion				= 0x04,
-	kgbInvalidNumber			= 0x07,
-	kgbLineOutOfOrder			= 0x08,
-	kgbNone						= 0xFF
-};
-#define STT_GB_LINEFREE_CHARGED				0x01
-#define STT_GB_LINEFREE_NOTCHARGED			0x05
-#define STT_GB_LINEFREE_CHARGED_LPR			0x06
-#define	STT_GB_BUSY							0x02
-#define STT_GB_NUMBER_CHANGED				0x03
-#define STT_GB_CONGESTION					0x04
-#define STT_GB_UNALLOCATED_NUMBER			0x07
-#define STT_GB_LINE_OUT_OF_ORDER			0x08
-#define STT_GB_NONE							0xFF
-
-enum KSignGroupII
-{
-	kg2Ordinary			= 0x01,
-	kg2Priority			= 0x02,
-	kg2Maintenance		= 0x03,
-	kg2LocalPayPhone	= 0x04,
-	kg2TrunkOperator	= 0x05,
-	kg2DataTrans		= 0x06,
-	kg2NonLocalPayPhone = 0x07,
-	kg2CollectCall		= 0x08,
-	kg2OrdinaryInter	= 0x09,
-	kg2Transfered		= 0x0B,
-};
-#define STT_GII_ORDINARY					0x01
-#define STT_GII_PRIORITY					0x02
-#define STT_GII_MAINTENANCE					0x03
-#define STT_GII_LOCAL_PAY_PHONE				0x04
-#define STT_GII_TRUNK_OPERATOR				0x05
-#define STT_GII_DATA_TRANS					0x06
-#define STT_GII_NON_LOCAL_PAY_PHONE			0x07		
-#define STT_GII_COLLECT_CALL				0x08
-#define STT_GII_ORDINARY_INTERNATIONAL		0x09
-#define STT_GII_TRANSFERED					0x0B
-#endif
-#ifndef _KISDN_H_
-#define _KISDN_H_
-#define KMAX_USER_USER_LEN              32
-#define KMAX_USER_USER_EX_LEN           254
-#define KMAX_SUBADRESS_INFORMATION_LEN  20 
-
-enum KQ931Cause
-{
-    kq931cNone                    			= 0,
-    kq931cUnallocatedNumber       			= 1,
-    kq931cNoRouteToTransitNet     			= 2,
-    kq931cNoRouteToDest           			= 3,
-	kq931cSendSpecialInfoTone				= 4,
-	kq931cMisdialedTrunkPrefix				= 5,
-    kq931cChannelUnacceptable     			= 6,
-    kq931cCallAwarded             			= 7,
-	kq931cPreemption						= 8,
-	kq931cPreemptionCircuitReuse			= 9,
-	kq931cQoR_PortedNumber					= 14,
-    kq931cNormalCallClear         			= 16,
-    kq931cUserBusy                			= 17,
-    kq931cNoUserResponding        			= 18,
-    kq931cNoAnswerFromUser        			= 19,
-	kq931cSubscriberAbsent					= 20,
-    kq931cCallRejected            			= 21,
-    kq931cNumberChanged           			= 22,
-	kq931cRedirectionToNewDest				= 23,
-	kq931cCallRejectedFeatureDest			= 24,
-	kq931cExchangeRoutingError				= 25,
-    kq931cNonSelectedUserClear    			= 26,
-    kq931cDestinationOutOfOrder   			= 27,
-    kq931cInvalidNumberFormat     			= 28,
-    kq931cFacilityRejected        			= 29,
-    kq931cRespStatusEnquiry       			= 30,
-    kq931cNormalUnspecified       			= 31,
-    kq931cNoCircuitChannelAvail   			= 34,
-    kq931cNetworkOutOfOrder       			= 38,
-	kq931cPermanentFrameConnOutOfService	= 39,
-	kq931cPermanentFrameConnOperational		= 40,
-    kq931cTemporaryFailure          		= 41,
-    kq931cSwitchCongestion          		= 42,
-    kq931cAccessInfoDiscarded       		= 43,
-    kq931cRequestedChannelUnav      		= 44,
-	kq931cPrecedenceCallBlocked				= 46,
-    kq931cResourceUnavailable       		= 47,
-    kq931cQosUnavailable            		= 49,
-    kq931cReqFacilityNotSubsc       		= 50,
-	kq931cOutCallsBarredWithinCUG			= 53,
-	kq931cInCallsBarredWithinCUG			= 55,
-    kq931cBearerCapabNotAuthor      		= 57,
-    kq931cBearerCapabNotAvail       		= 58,
-	kq931cInconsistency						= 62,
-    kq931cServiceNotAvailable       		= 63,
-    kq931cBcNotImplemented          		= 65,
-    kq931cChannelTypeNotImplem      		= 66,
-    kq931cReqFacilityNotImplem      		= 69,
-    kq931cOnlyRestrictedBcAvail     		= 70,
-    kq931cServiceNotImplemented     		= 79,
-    kq931cInvalidCrv                		= 81,
-    kq931cChannelDoesNotExist       		= 82,
-    kq931cCallIdDoesNotExist        		= 83,
-    kq931cCallIdInUse               		= 84,
-    kq931cNoCallSuspended           		= 85,
-    kq931cCallIdCleared             		= 86,
-	kq931cUserNotMemberofCUG				= 87,
-    kq931cIncompatibleDestination   		= 88,
-    kq931cInvalidTransitNetSel      		= 91,
-    kq931cInvalidMessage            		= 95,
-    kq931cMissingMandatoryIe        		= 96,
-    kq931cMsgTypeNotImplemented     		= 97,
-    kq931cMsgIncompatWithState      		= 98,
-    kq931cIeNotImplemented          		= 99,
-    kq931cInvalidIe                 		= 100,
-    kq931cMsgIncompatWithState2     		= 101,
-    kq931cRecoveryOnTimerExpiry     		= 102,
-    kq931cProtocolError             		= 103,
-	kq931cMessageWithUnrecognizedParam		= 110,
-	kq931cProtocolErrorUnspecified			= 111,
-    kq931cInterworking              		= 127,
-    kq931cCallConnected             		= 128,
-    kq931cCallTimedOut              		= 129,
-    kq931cCallNotFound              		= 130,
-    kq931cCantReleaseCall           		= 131,
-    kq931cNetworkFailure            		= 132,
-    kq931cNetworkRestart            		= 133,
-    kq931cLastValidCause            		= kq931cNetworkRestart,
-};
-
-enum KQ931ProgressIndication
-{
-    kq931pTonesMaybeAvailable       = 1,
-    kq931pDestinationIsNonIsdn      = 2,
-    kq931pOriginationIsNonIsdn      = 3,
-    kq931pCallReturnedToIsdn        = 4,
-    kq931pTonesAvailable            = 8,
-};
-
-enum KQ931Hlc
-{
-    kq931hTelefony                  = 0x81,
-    k1931hFaxGroup23                = 0x84,
-    k1931hFaxGroup4                 = 0xa1,
-    kq931hTeletexF184               = 0xa4,
-    kq931hTeletexF220               = 0xa8,
-    kq931hTeletexf200               = 0xb1,
-    kq931hVideotex                  = 0xb2,
-    kq931hTelexF60                  = 0xb5,
-    kq931hMhs                       = 0xb8,
-    kq931hOsiApp                    = 0xc1,
-    kq931hMaintenance               = 0xde,
-    kq931hManagement                = 0xdf,
-};
-
-enum KQ931BearerCapability
-{
-    kq931bSpeech                    = 0x00,
-    kq931bUnrestrictedDigital       = 0x08,
-    kq931bAudio31kHz                = 0x10,
-    kq931bAudio7kHz                 = 0x11,
-    kq931bVideo                     = 0x18,
-};
-
-enum KQ931TypeOfNumber
-{
-    kq931tUnknownNumber             = 0x00,
-    kq931tInternationalNumber       = 0x10,
-    kq931tNationalNumber            = 0x20,
-    kq931tNetworkSpecificNumber     = 0x30,
-    kq931tSubscriberNumber          = 0x40,
-    kq931tAbbreviatedNumber         = 0x60,
-    kq931tReservedNumber            = 0x70,
-    kq931tDefaultNumber             = kq931tUnknownNumber,
-};
-
-enum KQ931NumberingPlan
-{
-    kq931pUnknownPlan               = 0x00,
-    kq931pIsdnPlan                  = 0x01,
-    kq931pDataPlan                  = 0x03,
-    kq931pTelexPlan                 = 0x04,
-    kq931pNationalPlan              = 0x08,
-    kq931pPrivatePlan               = 0x09,
-    kq931pReservedPlan              = 0x0F,
-    kq931pDefaultPlan               = kq931pUnknownPlan,
-};
-
-enum KQ931UserInfoProtocolDescriptor
-{
-    kq931uuUserSpecific             = 0x00,
-    kq931uuOSI_HighLayer            = 0x01,
-    kq931uuX244                     = 0x02,
-    kq931uuIA5_Chars                = 0x04,
-    kq931uuX208_X209                = 0x05,
-    kq931uuV120                     = 0x07,
-    kq931uuQ931_CallControl         = 0x08,
-    kq931uuNational                 = 0x40 
-};
-enum KQ931PresentationIndicator
-{
-	kq931piPresentationAllowed					= 0x00,
-	kq931piPresentationRestricted				= 0x01,
-	kq931piNumberNotAvailableDueToInterworking	= 0x02,
-};
-enum KQ931ScreeningIndicator
-{
-	kq931siUserProvidedNotScreened				= 0x00,
-	kq931siUserProvidedVerifiedAndPassed		= 0x01,
-	kq931siUserProvidedVerifiedAndFailed		= 0x02,
-	kq931siNetworkProvided						= 0x03,
-};
-enum KQ931TypeOfSubaddress
-{
-    kq931tsNSAP                                 = 0x00,
-    kq931tsUserSpecified                        = 0x01,
-};
-#endif 
-#ifndef KGSM_H
-#define KGSM_H
-
-enum KGsmCallCause
-{
-    kgccNone                      = 0,
-    kgccUnallocatedNumber         = 1,
-    kgccNoRouteToDest             = 3,
-    kgccChannelUnacceptable       = 6,
-    kgccOperatorDeterminedBarring = 8,
-    kgccNormalCallClear           = 16,
-    kgccUserBusy                  = 17,
-    kgccNoUserResponding          = 18,
-    kgccNoAnswerFromUser          = 19,
-    kgccCallRejected              = 21,
-    kgccNumberChanged             = 22,
-    kgccNonSelectedUserClear      = 26,
-    kgccDestinationOutOfOrder     = 27,
-    kgccInvalidNumberFormat       = 28,
-    kgccFacilityRejected          = 29,
-    kgccRespStatusEnquiry         = 30,
-    kgccNormalUnspecified         = 31,
-    kgccNoCircuitChannelAvail     = 34,
-    kgccNetworkOutOfOrder         = 38,
-    kgccTemporaryFailure          = 41,
-    kgccSwitchCongestion          = 42,
-    kgccAccessInfoDiscarded       = 43,
-    kgccRequestedChannelUnav      = 44,
-    kgccResourceUnavailable       = 47,
-    kgccQosUnavailable            = 49,
-    kgccReqFacilityNotSubsc       = 50,
-    kgccCallBarredWitchCUG        = 55,
-    kgccBearerCapabNotAuthor      = 57,
-    kgccBearerCapabNotAvail       = 58,
-    kgccServiceNotAvailable       = 63,
-    kgccBcNotImplemented          = 65,
-    kgccReqFacilityNotImplem      = 69,
-    kgccOnlyRestrictedBcAvail     = 70,
-    kgccServiceNotImplemented     = 79,
-    kgccInvalidCrv                = 81,
-    kgccUserNotMemberOfCUG        = 82,
-    kgccIncompatibleDestination   = 88,
-    kgccInvalidTransitNetSel      = 91,
-    kgccInvalidMessage            = 95,
-    kgccMissingMandatoryIe        = 96,
-    kgccMsgTypeNotImplemented     = 97,
-    kgccMsgIncompatWithState      = 98,
-    kgccIeNotImplemented          = 99,
-    kgccInvalidIe                 = 100,
-    kgccMsgIncompatWithState2     = 101,
-    kgccRecoveryOnTimerExpiry     = 102,
-    kgccProtocolError             = 111,
-    kgccInterworking              = 127,
-};
-
-enum KGsmMobileCause
-{
-    kgmcPhoneFailure                = 0,
-    kgmcNoConnectionToPhone         = 1,
-    kgmcPhoneAdaptorLinkReserved    = 2,
-    kgmcOperationNotAllowed         = 3,
-    kgmcOperationNotSupported       = 4,
-    kgmcPH_SIMPINRequired           = 5,
-    kgmcPH_FSIMPINRequired          = 6,
-    kgmcPH_FSIMPUKRequired          = 7,
-    kgmcSIMNotInserted              = 10,
-    kgmcSIMPINRequired              = 11,
-    kgmcSIMPUKRequired              = 12,
-    kgmcSIMFailure                  = 13,
-    kgmcSIMBusy                     = 14,
-    kgmcSIMWrong                    = 15,
-    kgmcIncorrectPassword           = 16,
-    kgmcSIMPIN2Required             = 17,
-    kgmcSIMPUK2Required             = 18,
-    kgmcMemoryFull                  = 20,
-    kgmcInvalidIndex                = 21,
-    kgmcNotFound                    = 22,
-    kgmcMemoryFailure               = 23,
-    kgmcTextStringTooLong           = 24,
-    kgmcInvalidCharInTextString     = 25,
-    kgmcDialStringTooLong           = 26,
-    kgmcInvalidCharInDialString     = 27,
-    kgmcNoNetworkService            = 30,  
-    kgmcNetworkTimeout              = 31,  
-    kgmcNetworkNotAllowed           = 32,
-    kgmcCommandAborted              = 33,
-    kgmcNumParamInsteadTextParam    = 34,
-    kgmcTextParamInsteadNumParam    = 35,
-    kgmcNumericParamOutOfBounds     = 36,
-    kgmcTextStringTooShort          = 37,
-    kgmcNetworkPINRequired          = 40,
-    kgmcNetworkPUKRequired          = 41,
-    kgmcNetworkSubsetPINRequired    = 42,
-    kgmcNetworkSubnetPUKRequired    = 43,
-    kgmcServiceProviderPINRequired  = 44,
-    kgmcServiceProviderPUKRequired  = 45,
-    kgmcCorporatePINRequired        = 46,
-    kgmcCorporatePUKRequired        = 47,
-    kgmcSIMServiceOptNotSupported   = 60,
-    kgmcUnknown                     = 100,
-    kgmcIllegalMS_N3                = 103,
-    kgmcIllegalME_N6                = 106,
-    kgmcGPRSServicesNotAllowed_N7   = 107,
-    kgmcPLMNNotAllowed_No11         = 111,
-    kgmcLocationAreaNotAllowed_N12  = 112,
-    kgmcRoamingNotAllowed_N13       = 113,
-    kgmcServiceOptNotSupported_N32  = 132,
-    kgmcReqServOptNotSubscribed_N33 = 133,
-    kgmcServOptTempOutOfOrder_N34   = 134,
-    kgmcLongContextActivation       = 147,
-    kgmcUnspecifiedGPRSError        = 148,
-    kgmcPDPAuthenticationFailure    = 149,
-    kgmcInvalidMobileClass          = 150,
-    kgmcGPRSDisconnectionTmrActive  = 151,
-    kgmcTooManyActiveCalls          = 256,
-    kgmcCallRejected                = 257,
-    kgmcUnansweredCallPending       = 258,
-    kgmcUnknownCallingError         = 259,
-    kgmcNoPhoneNumRecognized        = 260,
-    kgmcCallStateNotIdle            = 261,
-    kgmcCallInProgress              = 262,
-    kgmcDialStateError              = 263,
-    kgmcUnlockCodeRequired          = 264,
-    kgmcNetworkBusy                 = 265,
-    kgmcInvalidPhoneNumber          = 266,
-    kgmcNumberEntryAlreadyStarted   = 267,
-    kgmcCancelledByUser             = 268,
-    kgmcNumEntryCouldNotBeStarted   = 269,
-    kgmcDataLost                    = 280,
-    kgmcInvalidBessageBodyLength    = 281,
-    kgmcInactiveSocket              = 282,
-    kgmcSocketAlreadyOpen           = 283,
-    
-    kgmcSuccess                     = 0x7fff
-};
-
-enum KGsmSmsCause
-{
-    kgscNone                        = 0,
-    kgscUnassigned                  = 1,
-    kgscOperatorDeterminedBarring   = 8,
-    kgscCallBarred                  = 10,
-    kgscSMSTransferRejected         = 21,
-    kgscDestinationOutOfService     = 27,
-    kgscUnidentifiedSubscriber      = 28,
-    kgscFacilityRejected            = 29,
-    kgscUnknownSubscriber           = 30,
-    kgscNetworkOutOfOrder           = 38,
-    kgscTemporaryFailure            = 41,
-    kgscCongestion                  = 42,
-    kgscResourcesUnavailable        = 47,
-    kgscFacilityNotSubscribed       = 50,
-    kgscFacilityNotImplemented      = 69,
-    kgscInvalidSMSTransferRefValue  = 81,
-    kgscInvalidMessage              = 95,
-    kgscInvalidMandatoryInformation = 96,
-    kgscMessageTypeNonExistent      = 97,
-    kgscMsgNotCompatWithSMProtState = 98,
-    kgscInformationElementNonExiste = 99,
-    kgscProtocolError               = 111,
-    kgscInterworking                = 127,
-    kgscTelematicInterworkingNotSup = 128,
-    kgscSMSTypeZeroNotSupported     = 129,
-    kgscCannotReplaceSMS            = 130,
-    kgscUnspecifiedTPPIDError       = 143,
-    kgscAlphabetNotSupported        = 144,
-    kgscMessageClassNotSupported    = 145,
-    kgscUnspecifiedTPDCSError       = 159,
-    kgscCommandCannotBeActioned     = 160,
-    kgscCommandUnsupported          = 161,
-    kgscUnspecifiedTPCommandError   = 175,
-    kgscTPDUNotSupported            = 176,
-    kgscSCBusy                      = 192,
-    kgscNoSCSubscription            = 193,
-    kgscSCSystemFailure             = 194,
-    kgscInvalidSMEAddress           = 195,
-    kgscDestinationSMEBarred        = 196,
-    kgscSMRejectedDuplicateSM       = 197,
-    kgscTPVPFNotSupported           = 198,
-    kgscTPVPNotSupported            = 199,
-    kgscSIMSMSStorageFull           = 208,
-    kgscNoSMSStorageCapabilityInSIM = 209,
-    kgscErrorInMS                   = 210,
-    kgscMemoryCapacityExceeded      = 211,
-    kgscSIMDataDownloadError        = 213,
-    kgscUnspecifiedError            = 255,
-    kgscPhoneFailure                = 300,
-    kgscSmsServiceReserved          = 301,
-    kgscOperationNotAllowed         = 302,
-    kgscOperationNotSupported       = 303,
-    kgscInvalidPDUModeParameter     = 304,
-    kgscInvalidTextModeParameter    = 305,
-    kgscSIMNotInserted              = 310,
-    kgscSIMPINNecessary             = 311,
-    kgscPH_SIMPINNecessary          = 312,
-    kgscSIMFailure                  = 313,
-    kgscSIMBusy                     = 314,
-    kgscSIMWrong                    = 315,
-    kgscMemoryFailure               = 320,
-    kgscInvalidMemoryIndex          = 321,
-    kgscMemoryFull                  = 322,
-    kgscSMSCAddressUnknown          = 330,
-    kgscNoNetworkService            = 331,
-    kgscNetworkTimeout              = 332,
-    kgscUnknownError                = 500,
-    kgscNetworkBusy                 = 512,
-    kgscInvalidDestinationAddress   = 513,
-    kgscInvalidMessageBodyLength    = 514,
-    kgscPhoneIsNotInService         = 515,
-    kgscInvalidPreferredMemStorage  = 516,
-    kgscUserTerminated              = 517
-};
-
-enum KGsmRegistryStatus
-{
-	kgrsNotRegistered = 0x00,
-	kgrsRegistered    = 0x01,
-	kgrsSearching     = 0x02,
-	kgrsDenied        = 0x03,
-	kgrsUnknown       = 0x04,
-	kgrsRoaming       = 0x05,
-	kgrsInitializing  = 0xff,
-};
-enum KGsmCallStatus
-{
-	kgcstActive   = 0x0,
-	kgcstHeld     = 0x1,
-	kgcstDialing  = 0x2,
-	kgcstAlerting = 0x3,
-	kgcstIncoming = 0x4,
-	kgcstWaiting  = 0x5,
-	kgcstReleased = 0x6,
-};
-enum KGsmCallMode
-{
-	kgcmVoice   = 0x0,
-	kgcmData    = 0x1,
-	kgcmFax     = 0x2,
-	kgcmUnknown = 0x3
-};
-enum KGsmCallFlags
-{
-	kgcflMultiparty           = 0x01,
-	kgcflInternationalNumber  = 0x02,
-	kgcflMobileTerminatedCall = 0x04,
-};
-enum KGsmChannelFeatures
-{
-	kgcfMultiparty  = 0x01,
-	kgcfCallForward = 0x02, 
-};
-#endif
-#ifndef K3L_STATS_H
-#define K3L_STATS_H
-
-enum KGeneralCallStatIndex
-{
-    kcsiInbound,            
-    kcsiOutbound,           
-    kcsiOutCompleted,       
-    kcsiOutFailed,          
-    kcsiRemoteDisc,         
-    kcsiLocalDisc,          
-    kcsiLastGeneralCallStat
-};
-
-enum KFailedCallStatIndex
-{
-    kcsiFailedBusy = kcsiLastGeneralCallStat,
-    kcsiFailedNoAnswer,
-    kcsiFailedRejected,
-    kcsiFailedAddrChanged,
-    kcsiFailedInvalidAddr,
-    kcsiFailedOutOfService,
-    kcsiFailedCongestion,
-    kcsiFailedNetworkFailure,
-    kcsiFailedOther,
-    kcsiLastFailedCallStat
-};
-const uint32 kcsiMaxCallStats = kcsiLastFailedCallStat;
-typedef uint32 KStatIndex;
-
-#endif
-#ifndef k3lVersion_h
-#define k3lVersion_h
-#define k3lApiMajorVersion	2
-#define k3lApiMinorVersion	1
-#define k3lApiBuildVersion	0
-#endif
-#if !defined K3L_H
-#define K3L_H
-
-enum KDeviceType
-{
-	kdtE1           = 0,
-	kdtFXO          = 1,
-	kdtConf         = 2,
-	kdtPR           = 3,
-	kdtE1GW         = 4,
-	kdtFXOVoIP      = 5,
-	kdtE1IP	        = 6,
-	kdtE1Spx        = 7,
-    kdtGWIP         = 8,
-    kdtFXS          = 9,
-    kdtFXSSpx       = 10,
-    kdtGSM          = 11,
-    kdtGSMSpx       = 12,
-	kdtReserved1  	= 13,
-    kdtGSMUSB       = 14,
-    kdtGSMUSBSpx    = 15,
-    kdtE1FXSSpx 	= 16,
-	kdtDevTypeCount
-};
-enum KSignaling
-{
-	ksigInactive		= 0,
-	ksigR2Digital		= 1,
-	ksigContinuousEM	= 2,
-	ksigPulsedEM		= 3,
-	ksigUserR2Digital	= 4,
-	ksigAnalog			= 5,
-	ksigOpenCAS			= 6,
-	ksigOpenR2			= 7,
-	ksigSIP 			= 8,
-    ksigOpenCCS         = 9,
-    ksigPRI_EndPoint    = 10,
-    ksigAnalogTerminal  = 11,
-    ksigPRI_Network     = 12,
-    ksigPRI_Passive     = 13,
-	ksigLineSide  		= 14,
-	ksigCAS_EL7			= 15,
-    ksigGSM             = 16,
-	ksigE1LC			= 17,
-	ksigISUP			= 18,
-	ksigFax				= 19,
-};
-enum KE1DeviceModel
-{
-	kdmE1600	= 0,
-	kdmE1600E	= 1,
-	kdmE1600EX  = 2
-};
-enum KE1GWDeviceModel 
-{
-	kdmE1GW640   = 1,
-    kdmE1GW640EX = 2
-};
-enum KE1IPDeviceModel 
-{
-	kdmE1IP   = 1,
-    kdmE1IPEX = 2
-};
-enum KGWIPDeviceModel 
-{
-	kdmGWIP   = 1,
-	kdmGWIPEX = 2
-};
-enum KFXODeviceModel
-{
-	kdmFXO80    = 0,
-	kdmFXOHI    = 1,
-	kdmFXO160HI = 2,
-    kdmFXO240HI = 3
-};
-enum KFXOVoIPDeviceModel 
-{
-	kdmFXGW180 = kdmFXO80
-};
-enum KConfDeviceModel
-{
-	kdmConf240   = 0,
-	kdmConf120   = 1,
-	kdmConf240EX = 2,
-	kdmConf120EX = 3
-};
-enum KPRDeviceModel
-{
-	kdmPR300v1         = 0,
-    kdmPR300           = 1,
-	kdmPR300SpxBased   = 2,
-    kdmPR300EX         = 3
-};
-enum KFXSDeviceModel
-{
-    kdmFXS300   = 1,
-    kdmFXS300EX = 2
-};
-enum KFXSSpxDeviceModel
-{
-    kdmFXSSpx300      = 0,
-    kdmFXSSpx2E1Based = 1,
-    kdmFXSSpx300EX    = 2
-};
-enum KE1SpxDeviceModel
-{
-	kdmE1Spx    = 0,
-	kdm2E1Based = 1,
-    kdmE1SpxEX  = 2
-};
-enum KGSMDeviceModel
-{
-    kdmGSM      = 0,
-    kdmGSMEX    = 1
-};
-enum KGSMSpxDeviceModel
-{
-    kdmGSMSpx   = 0,
-    kdmGSMSpxEX = 1
-};
-enum KGSMUSBDeviceModel
-{
-    kdmGSMUSB      = 0
-};
-enum KGSMUSBSpxDeviceModel
-{
-    kdmGSMUSBSpx   = 0
-};
-enum KE1FXSDeviceModel
-{
-    kdmE1FXSSpx     = 0,
-    kdmE1FXSSpxEX   = 1
-};
-enum KSystemObject
-{
-	ksoLink       = 0x00,   
-	ksoLinkMon    = 0x20,   
-	ksoFirmware   = 0x80,   
-	ksoDevice     = 0x100,  
-	ksoAPI        = 0x150,  
-	ksoH100       = 0x200,  
-	ksoChannel	  = 0x1000,	
-	ksoGsmChannel = 0x2000, 
-};
-enum KFirmwareId
-{
-	kfiE1600A,				
-	kfiE1600B,				
-	kfiFXO80,				
-    kfiGSM40,               
-    kfiGSMUSB
-};
-enum KE1Status
-{
-	kesOk					= 0x00,		
-	kesSignalLost			= 0x01,		
-	kesNetworkAlarm			= 0x02,		
-	kesFrameSyncLost		= 0x04,		
-	kesMultiframeSyncLost	= 0x08,		
-	kesRemoteAlarm			= 0x10,		
-	kesHighErrorRate		= 0x20,		
-	kesUnknownAlarm			= 0x40,		
-	kesE1Error				= 0x80,		
-    kesNotInitialized       = 0xFF      
-};
-enum KE1ChannelStatus
-{
-	kecsFree			= 0x00,			
-	kecsBusy			= 0x01,			
-	kecsOutgoing		= 0x02,			
-	kecsIncoming		= 0x04,			
-	kecsLocked			= 0x06,			
-	kecsOutgoingLock	= 0x10,			
-	kecsLocalFail		= 0x20,			
-	kecsIncomingLock	= 0x40,			
-	kecsRemoteLock		= 0x80			
-};
-enum KVoIPChannelStatus
-{
-	kipcsFree			= kecsFree,		
-	kipcsOutgoingLock	= kecsOutgoingLock,
-	kipcsIncomingLock	= kecsIncomingLock
-};
-enum KFXOChannelStatus
-{
-	kfcsDisabled	= 0x00,		
-	kfcsEnabled		= 0x01		
-};
-enum KFXSChannelStatus
-{
-    kfxsOnHook,
-    kfxsOffHook,
-    kfxsRinging,
-    kfxsFail
-};
-enum KGsmChannelStatus
-{
-    kgsmIdle,
-    kgsmCallInProgress,
-    kgsmSMSInProgress,
-    kgsmModemError,
-    kgsmSIMCardError,
-    kgsmNetworkError,
-    kgsmNotReady
-};
-enum KCallStatus
-{
-	kcsFree		= 0x00,				
-	kcsIncoming = 0x01,				
-	kcsOutgoing = 0x02,				
-	kcsFail		= 0x04				
-};
-enum KCallStartInfo
-{
-    kcsiHumanAnswer,
-    kcsiAnsweringMachine,
-    kcsiCellPhoneMessageBox,
-    kcsiUnknown,
-    kcsiCarrierMessage
-};
-enum KChannelFeatures
-{
-	kcfDtmfSuppression	= 0x0001,
-	kcfCallProgress		= 0x0002,
-	kcfPulseDetection	= 0x0004,
-	kcfAudioNotification= 0x0008,
-	kcfEchoCanceller	= 0x0010,
-	kcfAutoGainControl	= 0x0020,
-	kcfHighImpEvents	= 0x0080,
-    kcfCallAnswerInfo   = 0x0100,
-    kcfOutputVolume     = 0x0200,
-    kcfPlayerAGC        = 0x0400
-};
-enum KMixerSource
-{
-	kmsChannel,
-	kmsPlay,
-	kmsGenerator,
-	kmsCTbus,
-    kmsNoDelayChannel
-};
-struct KMixerCommand
-{
-    int32 Track;
-    int32 Source;        
-    int32 SourceIndex;
-};
-struct KPlayFromStreamCommand
-{
-	void *Buffer;
-	uint32 BufferSize;
-	int32 CodecIndex;
-};
-struct KBufferParam
-{
-	void *Buffer;
-	uint32 BufferSize;
-};
-enum KMixerTone
-{
-	kmtSilence	= 0x00,	
-	kmtDial		= 0x01, 
-	kmtBusy		= 0x02, 
-	kmtFax		= 0x03, 
-	kmtVoice	= 0x04, 
-	kmtEndOf425 = 0x05,	
-    kmtCollect  = 0x06, 
-    kmtEndOfDtmf= 0x07, 
-};
-struct K3L_CHANNEL_STATUS
-{
- 	KCallStatus CallStatus;
-	KMixerTone AudioStatus;
-	int32 AddInfo;			
-	int32 EnabledFeatures;	
-};
-struct K3L_GSM_CALL_STATUS
-{
-	KGsmCallStatus Status;
-	KGsmCallMode Mode;
-	char Number[ KMAX_DIAL_NUMBER ];
-	int32 Flags; 
-};
-struct K3L_GSM_CHANNEL_STATUS
-{
-	uint8 SignalStrength; 
-	uint8 ErrorRate;      
-	KGsmRegistryStatus RegistryStatus;
-	char OperName[ KMAX_GSM_OPER_NAME ];
-	K3L_GSM_CALL_STATUS CallStatus[ KMAX_GSM_CALLS ];
-	int32 UnreadSmsCount;  
-	int32 EnabledFeatures; 
-    char IMEI[ KMAX_GSM_IMEI_SIZE ];
-    unsigned char SIM; 
-    unsigned char Reserved[15]; 
-};
-struct K3L_LINK_STATUS
-{
-	int16 E1; 
-	byte Channels[ KMAX_E1_CHANNELS ];	
-};
-enum KPllErrors
-{
-	kpeClockAError    = 0x01,
-	kpeClockBError    = 0x02,
-	kpeSCbusError     = 0x04,
-	kpeMVIPError	  = 0x08,
-	kpeMasterPllError = 0x10,
-	kpeModeError      = 0x20,
-	kpeLocalRefError  = 0x40,
-	kpeInternalError  = 0x80
-};
-struct K3L_H100_STATUS
-{
-	int32 Mode;
-	int32 MasterClock;
-	int32 Enable;
-	int32 Reference;
-	int32 SCbus;
-	int32 HMVIP;
-	int32 MVIP90;
-	int32 CT_NETREF;
-	int32 PllLocalRef;
-	int32 PllErrors;		
-};
-enum KEchoLocation
-{
-	kelNetwork	= 0x0,
-	kelCtBus	= 0x1
-};
-enum KCodecIndex
-{
-	kci8kHzALAW	= 0x00,
-	kci8kHzPCM	= 0x01,  
-	kci11kHzPCM	= 0x02,  
-	kci8kHzGSM	= 0x03, 
-	kci8kHzADPCM= 0x04, 
-	kci8kHzULAW	= 0x05,
-	kciLastCodecEntryMark
-};
-enum KEchoCancellerConfig
-{
-    keccNotPresent,
-    keccOneSingleBank,
-    keccOneDoubleBank,
-    keccTwoSingleBank,
-    keccTwoDoubleBank,
-    keccFail
-};
-struct K3L_DEVICE_CONFIG
-{
-	int32 LinkCount;
-	int32 ChannelCount;
-	int32 EnabledChannelCount;
-	int32 MixerCount;
-	int32 MixerCapacity;
-	int32 WorkStatus;
-	int32 DeviceModel;		
-	int32 H100_Mode;		
-	int32 PciBus;
-	int32 PciSlot;
-	int32 PlayerCount;
-	int32 VoIPChannelCount;
-    int32 CTbusCount;
-    KEchoCancellerConfig EchoConfig;
-    KEchoLocation EchoLocation;
-	sbyte SerialNumber[ KMAX_SERIAL_NUMBER ];
-};
-
-typedef K3L_DEVICE_CONFIG K3L_E1_DEVICE_CONFIG;
-typedef K3L_DEVICE_CONFIG K3L_FX_DEVICE_CONFIG;
-struct K3L_API_CONFIG
-{
-	int32 MajorVersion;
-	int32 MinorVersion;
-	int32 BuildVersion;
-    int32 SvnRevision;
-	int32 RawCmdLogging;
-	int32 VpdVersionNeeded;
-	sbyte StrVersion[ KMAX_STR_VERSION ];
-};
-struct K3L_LINK_CONFIG
-{
-	KSignaling Signaling;
-	int32 IncomingDigitsRequest;
-	int32 IdentificationRequestPos;
-	int32 ChannelCount;
-	int32 ReceivingClock;
-	sbyte NumberA[ KMAX_DIAL_NUMBER + 1 + 3 ]; 
-};
-struct K3L_CHANNEL_CONFIG
-{
-	KSignaling Signaling;
-    int32 AutoEnableFeatures;   
-    int32 CapableFeatures;      
-};
-struct K3L_E1600A_FW_CONFIG
-{
-	int32 MfcExchangersCount;
-	int32 MonitorBufferSize;
-	sbyte FwVersion[ KMAX_STR_VERSION ];
-	sbyte DspVersion[ KMAX_DSP_NAME ];
-};
-struct K3L_E1600B_FW_CONFIG
-{
-	int32 AudioBufferSize;
-	int32 FilterCount;
-	int32 MixerCount;
-	int32 MixerCapacity;
-	sbyte FwVersion[ KMAX_STR_VERSION ];
-	sbyte DspVersion[ KMAX_DSP_NAME ];
-};
-typedef K3L_E1600B_FW_CONFIG K3L_GSM40_FW_CONFIG;
-typedef K3L_E1600B_FW_CONFIG K3L_FXO80_FW_CONFIG;
-typedef K3L_E1600B_FW_CONFIG K3L_GSMUSB_FW_CONFIG;
-struct K3L_COMMAND
-{
-	int32 Object;			
-	int32 Cmd;				
-	byte *Params;			
-};
-
-enum KEventObjectId
-{
-	koiDevice		= 0x00,
-	koiChannel		= 0x01,
-	koiPlayer		= 0x02,
-	koiLink			= 0x03,
-    koiSystem       = 0x04
-};
-
-struct K3L_EVENT
-{
-	int32 Code;				
-	int32 AddInfo;			
-	int32 DeviceId;			
-	int32 ObjectInfo;		
-	void *Params;			
-	int32 ParamSize;		
-	int32 ObjectId;			
-};
-struct KIncomingSeizeParams
-{
-	sbyte NumberB[ KMAX_DIAL_NUMBER + 1 ];
-	sbyte NumberA[ KMAX_DIAL_NUMBER + 1 ];
-	sbyte Padding[2];  
-};
-struct KCtbusCommand
-{
-	int32 Stream;
-	int32 TimeSlot;
-	int32 Enable;
-};
-struct KUserInformation
-{
-    int32 ProtocolDescriptor;
-    int32 UserInfoLength;
-    byte  UserInfo[ KMAX_USER_USER_LEN ];
-};
-struct KUserInformationEx
-{
-    int32 ProtocolDescriptor;
-    int32 UserInfoLength;
-    byte  UserInfo[ KMAX_USER_USER_EX_LEN ];
-};
-struct KISDNSubaddressInformation
-{
-    KQ931TypeOfSubaddress TypeOfSubaddress;
-    bool  OddNumberOfSignals;
-    int32 InformationLength;
-    byte  Information[ KMAX_SUBADRESS_INFORMATION_LEN ];
-};
-struct KISDNSubaddresses
-{
-    KISDNSubaddressInformation Called;
-    KISDNSubaddressInformation Calling;
-};
-enum KCTTransferResult
-{
-    TransferByJoin          = 0,
-    TransferByRerouteing    = 1
-};
-enum KLinkErrorCounter
-{
-	klecChangesToLock		=  0,
-	klecLostOfSignal		=  1,
-	klecAlarmNotification   =  2,
-	klecLostOfFrame         =  3,
-	klecLostOfMultiframe    =  4,
-	klecRemoteAlarm			=  5,
-    klecSlipAlarm           =  6,
-	klecUnknowAlarm			=  klecSlipAlarm,
-	klecPRBS				=  7,
-	klecWrogrBits			=  8,
-	klecJitterVariation		=  9,
-	klecFramesWithoutSync	= 10,
-	klecMultiframeSignal	= 11,
-	klecFrameError			= 12,
-	klecBipolarViolation	= 13,
-	klecCRC4				= 14,
-	klecCount				= 15
-};
-struct K3L_LINK_ERROR_COUNTER
-{
-	int32 ErrorCounters[ klecCount ];
-};
-struct KSipData
-{
-    int32 DataLength;
-    byte  Data[ KMAX_SIP_DATA ];
-};
-
-enum KLibParams
-{
-	klpDebugFirmware,           
-    klpResetFwOnStartup,		
-    klpResetFwOnShutdown,       
-    klpSeizureEventCompat,      
-    klpDisableTDMBufferWarnings,
-    klpDisableInternalVoIP,     
-    klpLogCallControl,          
-    klpDoNotLogApiInterface,    
-	klpMaxParams
-};
-
-enum KFaxChannelStatus
-{
-	kfaxcsFree,
-	kfaxcsWaitingForFaxSignal,
-	kfaxcsSendingFax,
-	kfaxcsReceivingFax,
-	kfaxcsFail
-};
-enum KFaxResult
-{
-	kfaxrEndOfTransmission,
-	kfaxrStoppedByCommand,
-	kfaxrProtocolTimeout,
-	kfaxrProtocolError,
-	kfaxrRemoteDisconnection,
-	kfaxrFileError,
-	kfaxrUnknown,
-    kfaxrEndOfReception,
-	kfaxrCompatibilityError,
-	kfaxrQualityError,
-	kfaxrChannelReleased
-};
-enum KFaxFileErrorCause
-{
-	kfaxfecTransmissionStopped,
-	kfaxfecTransmissionError,
-	kfaxfecListCleared,
-	kfaxfecCouldNotOpen,	
-	kfaxfecInvalidHeader,
-	kfaxfecDataNotFound,
-	kfaxfecInvalidHeight,
-	kfaxfecUnsupportedWidth,
-	kfaxfecUnsupportedCompression,
-	kfaxfecUnsupportedRowsPerStrip,
-	kfaxfecUnknown
-};
-
-typedef stt_code ( Kstdcall K3L_CALLBACK )();
-typedef stt_code ( Kstdcall K3L_MONITOR_CALLBACK )( byte *, byte );
-typedef stt_code ( Kstdcall K3L_EVENT_CALLBACK )( int32 Object, K3L_EVENT * );
-typedef stt_code ( Kstdcall *K3L_THREAD_CALLBACK )( void * );
-typedef void	 ( Kstdcall K3L_AUDIO_CALLBACK )( int32 DevId, int32 Channel, byte *Buffer, int32 Size );
-#if __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-extern "C"
-{
-sbyte *Kstdcall k3lStart( int32 Major, int32 Minor, int32 Build );
-void Kstdcall k3lStop();
-void Kstdcall k3lRegisterEventHandler( K3L_EVENT_CALLBACK *Function );
-void Kstdcall k3lRegisterAudioListener( K3L_AUDIO_CALLBACK *Player, K3L_AUDIO_CALLBACK *Recorder );
-int32 Kstdcall k3lSendCommand( int32 DeviceId, K3L_COMMAND *Cmd );
-int32 Kstdcall k3lSendRawCommand( int32 DeviceId, int32 IntfId, void *Command, int32 CmdSize );
-int32 Kstdcall k3lRegisterMonitor( K3L_MONITOR_CALLBACK *EventMonitor, K3L_MONITOR_CALLBACK *CommandMonitor, K3L_MONITOR_CALLBACK *BufferMonitor );
-int32 Kstdcall k3lGetDeviceConfig( int32 DeviceId, int32 Object, void *Data, int32 DataSize );
-int32 Kstdcall k3lGetDeviceStatus( int32 DeviceId, int32 Object, void *Data, int32 DataSize );
-int32 Kstdcall k3lGetDeviceCount();
-int32 Kstdcall k3lGetDeviceType( int32 DeviceId );
-int32 Kstdcall k3lGetEventParam( K3L_EVENT *Evt, const sbyte *Name, sbyte *Buffer, int32 BufferSize );
-int32 Kstdcall k3lSetGlobalParam( int32 ParamIndex, int32 ParamValue );
-int32 Kstdcall k3lGetChannelStats( int32 DevId, int32 Channel, KStatIndex si, uint32 *StatData );
-}
-#if __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-#endif
-
-
-enum KISDNDebugFlag
-{
-    kidfQ931                        = 0x01,
-    kidfLAPD                        = 0x02,
-    kidfSystem                      = 0x04,
-    kidfInvalid                     = 0x08,
-};
-
-#define CM_VOIP_START_DEBUG      0x20
-#define CM_VOIP_STOP_DEBUG       0x21
-#define CM_VOIP_DUMP_STAT        0x22
-
-#define CM_ISDN_DEBUG            0x24
-
-#define CM_PING     0x123456
-#define EV_PONG     0x654321
-
-#define CM_LOG_UPDATE            0x100 
-#define EV_LOG_UPDATE            0x100 
-
-#endif /* _GENERATED_K3L_H_ */
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt.h
deleted file mode 100644
index b17d163cc6..0000000000
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt.h
+++ /dev/null
@@ -1,1349 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _KHOMP_PVT_H_
-#define _KHOMP_PVT_H_
-
-#include <timer.hpp>
-#include "globals.h"
-#include "frame.h"
-#include "opt.h"
-#include "logger.h"
-#include "defs.h"
-
-/*!
- \brief Callback generated from K3L API for every new event on the board.
- \param[in] obj Object ID (could be a channel or a board, depends on device type) which generated the event.
- \param[in] e The event itself.
- \return ksSuccess if the event was treated
- \see K3L_EVENT Event specification
- */
-extern "C" int32 Kstdcall khompEventCallback (int32, K3L_EVENT *);
-
-/*!
- \brief Callback generated from K3L API everytime audio is available on the board.
- @param[in] deviceid Board on which we get the event
- @param[in] objectid The channel we are getting the audio from
- @param[out] read_buffer The audio buffer itself (RAW)
- @param[in] read_size The buffer size, meaning the amount of data to be read
- \return ksSuccess if the event was treated
- */
-extern "C" void Kstdcall khompAudioListener (int32, int32, byte *, int32);
-
-/******************************************************************************/
-/********************************* Board **************************************/
-/******************************************************************************/
-struct Board
-{
-    /* Timers */
-    struct KhompPvt;
-    typedef KhompPvt *     ChanTimerData;
-    typedef                void (ChanTimerFunc)(ChanTimerData);
-    typedef TimerTemplate < ChanTimerFunc, ChanTimerData > ChanTimer;
-
-/******************************************************************************/
-/******************************** Channel *************************************/
-struct KhompPvt
-{
-    typedef SimpleNonBlockLock<25,100>      ChanLockType;
-
-    typedef enum
-    {
-        CI_MESSAGE_BOX        = 0x01,
-        CI_HUMAN_ANSWER       = 0x02,
-        CI_ANSWERING_MACHINE  = 0x04,
-        CI_CARRIER_MESSAGE    = 0x08,
-        CI_UNKNOWN            = 0x10,
-        CI_FAX                = 0x20,
-    }
-    CallInfoType;
-    
-    struct InitFailure {};
-
-    struct InvalidSwitchChannel
-    {
-        typedef enum { NULL_SWITCH_CHANNEL, NULL_SWITCH_SESSION_PASSED, NULL_SWITCH_VALUE, FAILED } FailType;
-
-        InvalidSwitchChannel(FailType fail, std::string msg)
-            : _fail(fail),_msg(msg) {};
-
-        std::string _msg;
-        FailType _fail;
-    };
-
-    typedef enum
-    {
-        PLAY_NONE = 0,
-        PLAY_VM_TONE,
-        PLAY_PBX_TONE,
-        PLAY_PUB_TONE,
-        PLAY_RINGBACK,
-        PLAY_FASTBUSY,
-    }
-    CadencesType;
-
-    typedef enum
-    {
-        INDICA_NONE = 0,
-        INDICA_RING,
-        INDICA_BUSY,
-        INDICA_FAST_BUSY,
-    }
-    IndicationType;
-    
-    typedef enum
-    {
-        CLN_HARD,
-        CLN_SOFT,
-        CLN_FAIL,
-    }
-    CleanupType;
-
-/********************************** Call **************************************/
-    struct Call
-    {
-        struct CallStatistics : public Statistics
-        {
-            CallStatistics(Call *call):
-                _call(call),
-                _total_time_incoming(0),
-                _total_time_outgoing(0),
-                _total_idle_time(0),
-                _channel_fails(0)
-            {
-                time(&_base_idle_time);            
-                time(&_base_time);            
-            }
-
-            void idle()
-            {
-                if (_call->_flags.check(Kflags::IS_INCOMING) || 
-                    _call->_flags.check(Kflags::IS_OUTGOING) ||
-                    _call->_indication == INDICA_RING ||
-                    _call->_indication == INDICA_BUSY)
-                {   
-                    return;
-                }   
-
-                time_t tmp;
-                time (&tmp);
-
-                _total_idle_time += (tmp - _base_idle_time);
-                time (&_base_idle_time);
-            }
-
-            void incrementNewCall()
-            {
-                time (&_base_time);
-            }
-
-            void incrementHangup()
-            {
-                time_t tmp;
-                time (&tmp);
-
-                if (_call->_flags.check(Kflags::IS_OUTGOING))
-                {   
-                    _total_time_outgoing += (tmp - _base_time);
-                    time (&_base_time);
-                }   
-                else if (_call->_flags.check(Kflags::IS_INCOMING))
-                {   
-                    _total_time_incoming += (tmp - _base_time);
-                    time (&_base_time);
-                }   
-
-                time(&_base_idle_time);
-            }
-
-            void incrementChannelFail()
-            {
-                _channel_fails++;
-            }
-
-            std::string getDetailed() 
-            {
-                /* buffer our data to return at the end */
-                std::string strBuffer;
-
-                /* very very important yet! */
-                idle();
-
-                std::string str_incoming_time = timeToString(_total_time_incoming);
-                std::string str_outgoing_time = timeToString(_total_time_outgoing);
-                std::string str_idle_time     = timeToString(_total_idle_time);
-
-                strBuffer.append(STG(FMT("Total Incoming Time: \t%s\n") % str_incoming_time));
-                strBuffer.append(STG(FMT("Total Outgoing Time: \t%s\n") % str_outgoing_time));
-                strBuffer.append(STG(FMT("Total Idle Time: \t%s\n") % str_idle_time));
-                strBuffer.append(STG(FMT("Number of channel fails: \t%d\n") % _channel_fails));                
-
-                return strBuffer;
-            }
-
-            switch_xml_t getDetailedXML()
-            {
-                /* very very important yet! */
-                idle();
-
-                std::string str_incoming_time = timeToString(_total_time_incoming);
-                std::string str_outgoing_time = timeToString(_total_time_outgoing);
-                std::string str_idle_time     = timeToString(_total_idle_time);
-
-                /* total */
-                switch_xml_t xtotal = switch_xml_new("total");
-
-                /* total/incoming_time */
-                switch_xml_t xin_time = switch_xml_add_child_d(xtotal,"incoming_time",0);
-                switch_xml_set_txt_d(xin_time, str_incoming_time.c_str());
-
-                /* total/outgoing_time */
-                switch_xml_t xout_time = switch_xml_add_child_d(xtotal,"outgoing_time",0);
-                switch_xml_set_txt_d(xout_time, str_outgoing_time.c_str());
-
-                /* total/idle_time */
-                switch_xml_t xidle_time = switch_xml_add_child_d(xtotal,"idle_time",0);
-                switch_xml_set_txt_d(xidle_time, str_idle_time.c_str());
-
-                /* total/channel_fails */
-                switch_xml_t xchannel_fails = switch_xml_add_child_d(xtotal,"channel_fails",0);
-                switch_xml_set_txt_d(xchannel_fails, STR(FMT("%d") % _channel_fails));
-
-                return xtotal;
-            }
-
-            void clear()
-            {   
-                time(&_base_time);
-                time(&_base_idle_time);
-
-                _total_idle_time = 0;
-                _channel_fails = 0;
-
-                _total_time_incoming = 0;
-                _total_time_outgoing = 0;
-            }
-
-            time_t _base_time;
-            time_t _total_time_incoming;
-            time_t _total_time_outgoing;
-            time_t _total_idle_time;
-            time_t _base_idle_time;     /* base time for idle time refreshing */
-            unsigned int _channel_fails;/* number of channel fails*/
-
-        protected:        
-            Call *_call;  /* associate to call, useful */
-        };
-
-        Call() 
-        {
-            clear(); 
-            _call_statistics = new CallStatistics(this);
-        }
-
-        virtual ~Call() { delete _call_statistics; }
-
-        CallStatistics * statistics() { return _call_statistics; };
-
-        virtual bool process(std::string name, std::string value = "")
-        {
-            if (name == "pre_answer")
-            {
-                _pre_answer = true;
-            }
-            else if (name == "orig")
-            {
-                DBG(FUNC, FMT("orig addr adjusted (%s).") % value.c_str());
-                _orig_addr = value;
-            }
-            else if (name == "dest")
-            {
-                _dest_addr = value;
-            }
-
-            else if (name == "input_volume" || name == "output_volume")
-            {
-                try
-                {
-                    int i = Strings::tolong(value);
-    
-                    if (i < -10 || i > 10)
-                    {
-                        LOG(ERROR, FMT("Could not set '%s': '%s' is not a valid number between -10 and 10.") % name % value);
-                    }
-                    else
-                    {
-                        DBG(FUNC, FMT("Changing '%s' volume to '%s'.") % name % value);
-                        if(name == "input_volume")
-                            _input_volume = i;
-                        else
-                            _output_volume = i;
-                    }
-                }
-                catch (Strings::invalid_value & e)
-                {
-                    LOG(ERROR, D("invalid numeric value: %s") % e.value());
-                }
-            }
-
-            else
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        virtual bool clear()
-        {
-
-            _orig_addr.clear();
-            _dest_addr.clear();
-            _incoming_context.clear();
-            _queued_digits_buffer.clear();
-            _pre_answer = false;
-            _is_progress_sent = false;
-            _collect_call = false;
-            _hangup_cause = 0;
-            _cleanup_upon_hangup = false;
-            _input_volume = 999;
-            _output_volume = 999;
-
-            _var_dtmf_state = T_UNKNOWN;
-            _var_echo_state = T_UNKNOWN;
-            _var_gain_state = T_UNKNOWN;            
-            
-            _flags.clearAll();
-
-            _cadence = PLAY_NONE;
-            _indication = INDICA_NONE;
-
-            return true;
-        }
-
-        /* used while answering calls */
-        std::string _orig_addr;
-        std::string _dest_addr;
-
-        std::string _incoming_context;
-
-        std::string _queued_digits_buffer;
-
-        /* should freeswitch answer before connect event?  */
-        bool _pre_answer;
-
-        bool _is_progress_sent;
-
-        /* is a collect call? */
-        bool _collect_call;
-
-        int _hangup_cause;
-
-        bool _cleanup_upon_hangup;
-
-        int _input_volume;
-        int _output_volume;
-
-        TriState _var_dtmf_state;
-        TriState _var_echo_state;
-        TriState _var_gain_state;        
-
-        Kflags _flags;
-
-        CadencesType _cadence;
-        IndicationType _indication;
-        
-        ChanTimer::Index _idx_co_ring;
-        ChanTimer::Index _idx_pbx_ring;
-
-        CallStatistics *_call_statistics;
-    };
-/******************************************************************************/
-public:
-
-    /* KhompPvt constructor */
-    KhompPvt(K3LAPIBase::GenericTarget & target);
-
-    /* KhompPvt destructor */
-    virtual ~KhompPvt()
-    {
-        delete _pvt_statistics;
-        _session = NULL;
-    }
-   
-    struct PvtStatistics : public Statistics
-    {
-        PvtStatistics(KhompPvt * pvt):
-            _pvt(pvt) {}
-
-        std::string getDetailedRates();
-        switch_xml_t getDetailedRatesXML();
-
-        std::string getDetailed();
-        switch_xml_t getDetailedXML();
-
-        std::string getRow();
-        switch_xml_t getNode();
-
-
-        void clear()
-        {
-            _pvt->call()->statistics()->clear();
-        }
-        
-        KhompPvt * _pvt;
-    };
-
-    /* Virtual Methods */
-
-    /*!
-     \defgroup KhompEvents
-                Callbacks that boards can implement to produce the expected
-                particular behaviour. Refer to Khomp documentation for a
-                detailed description of each method.
-     */
-    /*@{*/
-    virtual bool onChannelRelease(K3L_EVENT *);
-    virtual bool onNewCall(K3L_EVENT *);
-    virtual bool onCallSuccess(K3L_EVENT *);
-    virtual bool onCallFail(K3L_EVENT *);
-    virtual bool onConnect(K3L_EVENT *);
-    virtual bool onDisconnect(K3L_EVENT *);
-    virtual bool onAudioStatus(K3L_EVENT *);
-    virtual bool onCollectCall(K3L_EVENT *);
-    virtual bool onSeizureStart(K3L_EVENT *);
-    virtual bool onDtmfDetected(K3L_EVENT *);
-    virtual bool onNoAnswer(K3L_EVENT *);
-    virtual bool onDtmfSendFinish(K3L_EVENT *);
-    virtual bool onEvUntreated(K3L_EVENT *);
-    virtual bool eventHandler(K3L_EVENT *);
-    /*@}*/
-    
-    virtual bool doChannelAnswer(CommandRequest &);
-    virtual bool doChannelHangup(CommandRequest &);
-    bool commandHandler(CommandRequest &);
-    
-    virtual int makeCall(std::string params = "");
-    virtual bool setupConnection();
-
-    virtual int causeFromCallFail(int fail)  { return SWITCH_CAUSE_USER_BUSY; };
-    virtual int callFailFromCause(int cause) { return -1; };
-    virtual void reportFailToReceive(int fail_code) 
-    { 
-        call()->_indication = INDICA_FAST_BUSY; 
-    }
-    virtual bool setCollectCall();
-
-    virtual bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
-
-    virtual bool cleanup(CleanupType type = CLN_HARD);
-
-    virtual RingbackDefs::RingbackStType sendRingBackStatus(int rb_value = RingbackDefs::RB_SEND_DEFAULT) 
-    { 
-        return RingbackDefs::RBST_UNSUPPORTED; 
-    }
-
-    virtual bool sendPreAudio(int rb_value = RingbackDefs::RB_SEND_NOTHING) 
-    { 
-        if (rb_value != RingbackDefs::RB_SEND_NOTHING)
-        {
-            if(sendRingBackStatus(rb_value) == RingbackDefs::RBST_FAILURE)
-                return false;
-        }
-
-        return true;
-    }
-    
-    virtual bool isOK(void) { return false; }
-    virtual bool isPhysicalFree() { return false; }
-    virtual bool isFree(bool just_phy = false);
-
-    virtual bool hasNumberDial() { return true; }
-
-    virtual void getSpecialVariables()
-    {
-        try
-        {
-            const char * str_sup = getFSChannelVar("KDTMFSuppression");
-            const char * str_agc = getFSChannelVar("KAutoGainControl");
-            const char * str_eco = getFSChannelVar("KEchoCanceller");
-
-            call()->_var_dtmf_state = (str_sup ? ((!SAFE_strcasecmp(str_sup, "true") || !SAFE_strcasecmp(str_sup, "on"))? T_TRUE : T_FALSE) : T_UNKNOWN);
-            call()->_var_echo_state = (str_eco ? (!SAFE_strcasecmp(str_eco, "true") ? T_TRUE : T_FALSE) : T_UNKNOWN);
-            call()->_var_gain_state = (str_agc ? (!SAFE_strcasecmp(str_agc, "true") ? T_TRUE : T_FALSE) : T_UNKNOWN);
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(_target, "%s") % err._msg.c_str());
-        }
-
-        try
-        {
-            char * volume = (char*) getFSChannelVar("KSetVolume");
-            
-            if(!volume)
-            {
-                return;
-            }
-
-            std::string datastr(volume);
-
-            Strings::trim(datastr);
-
-            Strings::vector_type params;
-            Strings::tokenize(datastr, params, "|,", 2);
-
-            int inpvol = INT_MAX;
-            int outvol = INT_MAX;
-
-            /**/ if (params.size() == 1)
-            {    
-                int vol = (params[0] != "none" ? Strings::tolong(params[0]) : INT_MAX);
-
-                inpvol = vol; 
-                outvol = vol; 
-            }    
-            else if (params.size() == 2)
-            {    
-                inpvol = (params[0] != "none" ? Strings::tolong(params[0]) : INT_MAX);
-                outvol = (params[1] != "none" ? Strings::tolong(params[1]) : INT_MAX);
-            }    
-            else 
-            {    
-                LOG(ERROR, "invalid number of arguments for KSetVolume!");
-                return;
-            }    
-
-            if (inpvol != INT_MAX)
-            {
-                if(_call->_input_volume < -10 || _call->_input_volume > 10)
-                {
-                    _call->_input_volume = inpvol;
-                }
-            }
-
-            if (outvol != INT_MAX)
-            {
-                if(_call->_output_volume < -10 || _call->_output_volume > 10)
-                {
-                    _call->_output_volume = outvol;
-                }
-            }
-
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(_target, "%s") % err._msg.c_str());            
-        }
-        catch (Strings::invalid_value e)
-        {    
-            LOG(ERROR, FMT("invalid numeric value: %s") % e.value());
-        }    
-    }
-    
-    virtual void setSpecialVariables() {}
-
-    virtual bool application(ApplicationType type, switch_core_session_t * session, const char *data) 
-    {
-        switch(type)
-        {
-        case FAX_ADJUST:
-        case FAX_SEND:
-        case FAX_RECEIVE:
-            LOG(ERROR, PVT_FMT(_target, "not a digital and not "
-                    "a fxo Khomp channel, fax not supported"));
-            break;
-        default:
-            LOG(ERROR, PVT_FMT(_target, 
-                    "application not supported"));
-            break;
-        }
-
-        return false;
-    }
-
-    /* statistics functions */
-    virtual std::string getStatistics(Statistics::Type type);
-    virtual switch_xml_t getStatisticsXML(Statistics::Type type);
-    virtual void clearStatistics()
-    {
-        _pvt_statistics->clear();   
-    }
-
-    virtual bool indicateRinging();
-    virtual bool sendDtmf(std::string digit);
-    virtual void cleanupIndications(bool force);
-
-    /* Methods */
-
-    bool indicateProgress();
-
-    bool signalDTMF(char d);
-
-    bool loopWhileFlagTimed(Kflags::FlagType flag, int &timeout, bool clear = true)
-    {
-        bool pvt_locked = true;
-        bool quit       = false;
-
-        unsigned int sleeps = 0;
-
-        while ((timeout != 0) && !quit)
-        {
-            for (; (sleeps < 10) && !quit; sleeps++)
-            {
-                /* unlock our pvt struct */
-                if (pvt_locked)
-                {
-                    _mutex.unlock();
-                    pvt_locked = false;
-                }
-
-                /* wait a little while (100ms is good?) */
-                usleep (100000);
-                ++sleeps;
-
-                /* re-lock pvt struct */
-                switch (_mutex.lock())
-                {
-                    case SimpleLock::ISINUSE:
-                    case SimpleLock::FAILURE:
-                        LOG(ERROR, PVT_FMT(_target, "unable to lock pvt_mutex, trying again."));
-
-                        sched_yield();
-                        continue;
-
-                    default:
-                        break;
-                }
-
-                pvt_locked = true;
-
-                if(clear)
-                {
-                    if(!call()->_flags.check(flag))
-                    {
-                        quit = true;
-                        break;
-                    }
-                }
-                else
-                {
-                    if(call()->_flags.check(flag))
-                    {
-                        quit = true;
-                        break;
-                    }
-
-                }
-            }
-
-            /* decrement timeout, zero "sleeps". */
-            timeout = (timeout > 0) ? timeout - 1 : timeout;
-            sleeps = 0;
-        }
-
-        /* pvt should always be locked when retuning here. */
-        return pvt_locked;
-    }
-
-    K3LAPIBase::GenericTarget & target()
-    {
-        return _target;
-    }
-
-    void session(switch_core_session_t * newSession)
-    {
-        _session = newSession;
-    }
-
-    switch_core_session_t * session()
-    {
-        return _session;
-    }
-
-    void owner(switch_core_session_t * owner) { _owner = owner; }
-
-    switch_core_session_t * owner() const { return _owner; }
-
-    /* 
-       Returns the FreeSWITCH channel (switch_channel_t) 
-       Can throw InvalidSwitchChannel, so must be carefull
-    */
-    switch_channel_t * getFSChannel()
-    {
-        if(!session()) 
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t");
-        switch_channel_t *c = switch_core_session_get_channel(session());
-        if(!c) 
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
-        return c;       
-    }
-
-    /* 
-       Returns the FreeSWITCH channel (switch_channel_t) from given session 
-       Can throw InvalidSwitchChannel, so must be carefull
-    */
-    static switch_channel_t * getFSChannel(switch_core_session_t * s)
-    {
-        if(!s) 
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t passed");
-        switch_channel_t *c = switch_core_session_get_channel(s);
-        if(!c) 
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
-        return c;       
-    }
-
-    /* 
-       Returns the FreeSWITCH partner session (switch_core_session_t) 
-       Can throw InvalidSwitchChannel, so must be carefull
-       Don't forget to unlock [unlockPartner(switch_core_session_t*)]
-    */
-    switch_core_session_t * getFSLockedPartnerSession()
-    {
-        if(!session()) 
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t");
-
-        switch_core_session_t * p_s = NULL;
-        switch_core_session_get_partner(session(), &p_s);
-
-        if(!p_s)
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t (partner)");
-        return p_s;
-    }
-
-    /* Unlock a partner session */
-    void unlockPartner(switch_core_session_t * s)
-    {
-        if(!s) 
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t passed");
-        switch_core_session_rwunlock(s);
-    }
-
-    /* Get the uuid of session */
-    char * getUUID()
-    {
-        if(!session()) 
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t");
-        return switch_core_session_get_uuid(session());        
-    }
-
-    /* Get the uuid of given session */
-    char * getUUID(switch_core_session_t * s)
-    {
-        if(!s)
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_SESSION_PASSED,"null switch_core_session_t passed");
-        return switch_core_session_get_uuid(s);        
-    }
-
-    /* 
-       Set a variable into a FS channel 
-       Can throw InvalidSwitchChannel, so must be carefull
-    */
-    void setFSChannelVar(const char * name, const char * value)
-    {
-        if(!name || !value)
-            return;
-
-        switch_channel_t *c = getFSChannel(_owner);
-        if(!c) 
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
-        switch_channel_set_variable(c,name,value);
-    }    
-
-   /* 
-      Set a variable into a FS channel 
-      Can throw InvalidSwitchChannel, so must be carefull
-   */
-   void setFSChannelVar(switch_channel_t *c, const char * name, const char * value)
-   {
-       if(!c)
-           throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
-      
-       if(!name || !value)
-           return;
-
-       switch_channel_set_variable(c,name,value);
-   }
-
-    /* 
-       Get a varibale from a FS channel
-       Can throw InvalidSwitchChannel, so must be carefull
-    */
-    const char * getFSChannelVar(const char * value)
-    {
-        if(!value)
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_VALUE, "value is null");
-
-        switch_channel_t *c = getFSChannel(_owner);
-        if(!c) 
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
-        return switch_channel_get_variable(c,value);
-    }
-
-    /* 
-       Get a varibale from a FS from a given channel
-       Can throw InvalidSwitchChannel, so must be carefull
-    */
-    const char * getFSChannelVar(switch_channel_t *c, const char * value)
-    {
-        if(!c)
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_CHANNEL,"null switch_channel_t obtained");
-        if(!value)
-            throw InvalidSwitchChannel(InvalidSwitchChannel::NULL_SWITCH_VALUE, "value is null");
-        return switch_channel_get_variable(c,value);
-    }
-
-    /* Set a global variable  (without any throw) */
-    void setFSGlobalVar(const char * name, const char * value)
-    {
-        if(!name || !value)
-            return;
-
-        switch_core_set_variable(name,value);
-    }
-
-    /* Get a global variable (without any throw) */
-    const char * getFSGlobalVar(const char * name)
-    {
-        if(!name)
-            return NULL;
-
-#if SWITCH_LESS_THAN(1,0,6)
-        const char * tmp = switch_core_get_variable(name);
-
-        if(!tmp) return NULL;
-
-        const char * val = strdup(tmp);
-
-        return val;
-#else
-        return switch_core_get_variable_dup(name);
-#endif
-    }
-
-    void freeFSGlobalVar(const char ** val)
-    {
-        if(!val || !*val) return;
-
-#if SWITCH_LESS_THAN(1,0,6)
-        free((void *)*val);
-        *val = NULL;
-#else
-        char * v = (char *)*val;
-        switch_safe_free(v);
-        *val=NULL;
-#endif
-    }
-
-    bool mixer(const char *file, const char *func, int line, 
-            byte track, KMixerSource src, int32 index)
-    {
-        KMixerCommand mix;
-
-        mix.Track = track;
-        mix.Source = src;
-        mix.SourceIndex = index;
-
-        return command(file, func, line, CM_MIXER, (const char *)&mix);
-    }
-
-    /* Error handling for send command */
-    bool command(const char *file, const char *func, int line, int code,
-            const char *params = NULL, bool log = true)
-    {
-        try
-        {
-            Globals::k3lapi.command(_target, code, params);
-        }
-        catch(K3LAPI::failed_command & e)
-        {
-            if(log)
-            {
-                DBG(FUNC, OBJ_FMT(e.dev,e.obj,"Command '%s' has failed with error '%s'")
-                   % Verbose::commandName(e.code).c_str()
-                   % Verbose::status((KLibraryStatus)e.rc).c_str());
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-    
-    //TODO: Unir os dois metodos
-    int commandState(const char *file, const char *func, int line, int code,
-            const char *params = NULL)
-    {
-        try
-        {
-            Globals::k3lapi.command(_target, code, params);
-        }
-        catch(K3LAPI::failed_command & e)
-        {
-            LOG(ERROR,OBJ_FMT(e.dev,e.obj,"Command '%s' has failed with error '%s'")
-               % Verbose::commandName(e.code).c_str()
-               % Verbose::status((KLibraryStatus)e.rc).c_str());
-
-            return e.rc;
-        }
-
-        return ksSuccess;
-    }
-
-    /*!
-     \brief Will init part of our private structure and setup all the read/write
-     buffers along with the proper codecs. Right now, only PCMA.
-    */
-    switch_status_t justAlloc(bool is_answering = true, switch_memory_pool_t **pool = NULL);
-    switch_status_t justStart(switch_caller_profile_t *profile = NULL);
-
-    void destroy(switch_core_session_t * s = NULL);
-    void destroyAll();
-
-    void doHangup();
-
-    void setHangupCause(int cause, bool set_now = false)
-    {
-        if(_call->_hangup_cause) 
-        { 
-
-            DBG(FUNC,PVT_FMT(_target,"cause already set to %s") % switch_channel_cause2str((switch_call_cause_t) _call->_hangup_cause));
-            return;
-        }
-
-        if(!session())
-        {
-            DBG(FUNC,PVT_FMT(_target,"session is null"));
-            return;
-        }
-
-        switch_channel_t * channel = NULL;
-        
-        try
-        {
-            channel = getFSChannel();
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            DBG(FUNC, PVT_FMT(_target,"%s") % err._msg.c_str());
-            return;
-        }
-
-        int cause_from_freeswitch = switch_channel_get_cause(channel);
-        if(cause_from_freeswitch != SWITCH_CAUSE_NONE)
-        {
-            DBG(FUNC,PVT_FMT(_target,"cause already set to %s from freeswitch") % switch_channel_cause2str((switch_call_cause_t)cause_from_freeswitch));
-            _call->_hangup_cause = cause_from_freeswitch;
-            return;
-        }
-        
-        if(!cause)
-        {
-            DBG(FUNC,PVT_FMT(_target,"cause not defined"));
-        }
-        else
-        {
-            DBG(FUNC,PVT_FMT(_target,"setting cause to '%s'") % switch_channel_cause2str((switch_call_cause_t) cause));
-            _call->_hangup_cause = cause;
-
-            // not set variable in channel owner
-            if(set_now)
-            {
-                switch_channel_hangup(channel, (switch_call_cause_t)_call->_hangup_cause);
-            }
-        }
-    }
-
-    bool startCadence(CadencesType type);
-    bool stopCadence()
-    {
-        if(call()->_cadence != PLAY_NONE)
-        {
-            call()->_cadence = PLAY_NONE;
-
-            command(KHOMP_LOG, CM_STOP_CADENCE);
-        }
-    }
-
-    bool startStream(bool enable_mixer = true);
-    bool stopStream(bool enable_mixer = true);
-
-    bool startListen(bool conn_rx = true);
-    bool stopListen(void);
-
-    bool obtainRX(bool with_delay = false);
-    bool obtainTX();
-
-    bool setVolume(const char * type, int volume);
-    bool setVolume()
-    {
-        bool ret = false;
-
-        if(_call->_input_volume >= -10 && _call->_input_volume <= 10)
-        {
-            setVolume("input", _call->_input_volume);
-            ret = true;
-        }
-
-        if(_call->_output_volume >= -10 && _call->_output_volume <= 10)
-        {
-            setVolume("output", _call->_output_volume);
-            ret = true;
-        }
-     
-        return ret;
-    }
-
-    KSignaling getSignaling(void)
-    {
-        return Globals::k3lapi.channel_config(_target.device,_target.object).Signaling;
-    }
-
-    std::string getStateString(void);
-
-    bool dtmfSuppression(bool enable);
-    bool echoCancellation(bool enable);
-    virtual bool autoGainControl(bool enable);    
-
-    /* Timer callbacks */
-    static void pbxRingGen(Board::KhompPvt * pvt);
-    static void coRingGen(Board::KhompPvt * pvt);
-
-    virtual int getActiveChannel(bool invalid_as_not_found);
-
-    /* Let's validate the contexts */
-    virtual bool validContexts(MatchExtension::ContextListType & contexts, 
-                               std::string extra_string = "")
-    {
-        DBG(FUNC,PVT_FMT(_target,"c"));
-
-        /*
-        if(!_group_context.empty())
-        {
-            contexts.insert(contexts.begin(), _group_context);
-            //contexts.push_back(_group_context);
-        }
-        */
-    
-        for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
-            replaceTemplate((*i),  "DD", _target.device);
-
-        BEGIN_CONTEXT  
-        {    
-            const K3L_DEVICE_CONFIG & dev_cfg = Globals::k3lapi.device_config(_target);
-
-            for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
-                replaceTemplate((*i), "SSSS", atoi(dev_cfg.SerialNumber));
-        }    
-        END_CONTEXT
-      
-        DBG(FUNC,PVT_FMT(_target,"r"));
-        return true;
-    }
-
-    void cleanupBuffers()
-    {
-        DBG(FUNC,PVT_FMT(_target, "Cleanup buffers"));
-
-        _reader_frames.clear();
-        _writer_frames.clear();
-
-        for(unsigned int i = 0; i < SILENCE_PACKS; i++)
-        {
-            /* add silence to the read buffer */
-            if (!_reader_frames.give((const char *)Board::_cng_buffer, Globals::switch_packet_size))
-            {
-                LOG(ERROR, PVT_FMT(target(), "Problem in Reader Buffer"));
-            }
-        
-            /* add silence to the writer buffer */
-            if (!_writer_frames.give((const char *)Board::_cng_buffer, Globals::boards_packet_size))
-            {
-                LOG(ERROR, PVT_FMT(target(), "Problem in Writer Buffer"));
-            }
-        }
-    }
-
-    bool freeState()
-    {
-        return !(_call->_flags.check(Kflags::IS_INCOMING) || _call->_flags.check(Kflags::IS_OUTGOING));
-    }
-
-    Call * call() { return _call; }
-
-    K3LAPIBase::GenericTarget           _target;    /*!< The device/channel pair to bind this pvt to */
-    ChanLockType             _mutex;     /*!< Used for *our* internal locking */
-    Call                    *_call;
-    switch_core_session_t   *_session;   /*!< The session to which this pvt is associated with */
-    switch_core_session_t   *_owner;
-    bool                     _has_fail;
-
-    switch_caller_profile_t *_caller_profile;
-
-    switch_codec_t           _read_codec;
-    switch_codec_t           _write_codec;
-
-    FrameSwitchManager       _reader_frames;
-    FrameBoardsManager       _writer_frames;
-
-    std::string              _group_context;
-
-    PvtStatistics           *_pvt_statistics;
-
-    std::string              _mohclass;
-    std::string              _language;
-    std::string              _accountcode;
-};
-
-/******************************************************************************/
-/******************************************************************************/
-    typedef std::vector < Board * >    VectorBoard;
-    typedef std::vector < KhompPvt * > VectorChannel;  /*!< Collection of pointers of KhompPvts */
-
-     /*
-        these (below) are going to rule the elements ordering in our multiset
-        (used as a "ordering-save priority queue").
-     */
-    struct PvtCallCompare
-    {
-        bool operator() (KhompPvt * pvt1, KhompPvt * pvt2) const
-        {
-            /* true if pvt1 precedes pvt2 */
-            return (Board::getStats(pvt1->target().device,pvt1->target().object,kcsiOutbound) <
-                    Board::getStats(pvt2->target().device,pvt2->target().object,kcsiOutbound));
-            return true;
-        }
-    };
-
-    typedef std::multiset< KhompPvt *, PvtCallCompare > PriorityCallQueue;
-   
-public:
-    
-    /* Board constructor */
-    Board(int id) : _device_id(id) {}
-
-    /* Board destructor */    
-    virtual ~Board() {}
-
-    int id() { return _device_id; }
-
-    KhompPvt * channel(int obj)
-    {
-        try
-        {
-            KhompPvt * pvt = _channels.at(obj);
-
-            if(!pvt)
-            {
-                throw;
-            }
-
-            return pvt;
-        }
-        catch (...)
-        {
-            throw K3LAPITraits::invalid_channel(_device_id, obj);
-        }
-    }
-
-    ChanEventHandler * chanEventHandler() { return _event_handler; }
-    
-    ChanCommandHandler * chanCommandHandler() { return _command_handler; }
-
-    virtual void initializeChannels(void);
-    void finalizeChannels(void);
-
-    virtual bool eventHandler(const int obj, K3L_EVENT *e)
-    {
-        DBG(STRM, D("(Generic Board) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-        case EV_REQUEST_DEVICE_SECURITY_KEY:
-            break;
-        default:
-            try
-            {
-                ret = channel(obj)->eventHandler(e);
-            }
-            catch (K3LAPITraits::invalid_channel & invalid)
-            {
-                LOG(ERROR, OBJ_FMT(_device_id,obj,"(Generic Board) r (invalid channel on event '%s')") 
-                % Verbose::eventName(e->Code).c_str());
-
-                return false;
-            }
-
-            break;
-        }
-        
-        DBG(STRM, D("(Generic Board) r"));
-
-        return ret;
-    }
-
-public:
-    ChanTimer            _timers;
-protected:
-    const int            _device_id;
-    ChanEventHandler   * _event_handler; /* The device event handler */
-    ChanCommandHandler * _command_handler; /* The device command handler */
-    VectorChannel        _channels;
-
-public:
-    /* static stuff */
-    static bool initializeK3L(void);
-    static bool finalizeK3L(void);
-    static bool initializeHandlers(void);
-    static bool finalizeHandlers(void);
-    static void initializeBoards(void);
-    static void finalizeBoards(void);
-    static void initializeCngBuffer(void);
-    static bool initialize(void);
-    static bool finalize(void);
-
-    /* Thread Device Event Handler */
-    static int eventThread(void *);
-    
-    /* Thread Device Command Handler */
-    static int commandThread(void *);
-
-    /*!
-      \brief Lookup channels and boards when dialed.
-      \param allocation_string The dialstring as put on Dialplan. [Khomp/[a|A|0-board_high]/[a|A|0-channel_high]/dest].
-      \param new_session Session allocated for this call.
-      \param[out] cause Cause returned. Returns NULL if suceeded if not, the proper cause.
-      \return KhompPvt to be used on the call.
-      */
-    static KhompPvt * find_channel(char* allocation_string, switch_core_session_t * new_session, switch_call_cause_t * cause);
-    static void khomp_add_event_board_data(const K3LAPIBase::GenericTarget target, switch_event_t *event);
-
-    static Board * board(int dev)
-    {
-        try
-        {
-            Board * b = _boards.at(dev);
-
-            if(!b)
-            {
-                throw;
-            }
-
-            return b;
-        }
-        catch(...)
-        {
-            throw K3LAPITraits::invalid_device(dev);
-        }
-    }
-
-    static KhompPvt * get(int32 device, int32 object)
-    {
-        //if (!Globals::k3lapi.valid_channel(device, object))
-        //    throw K3LAPI::invalid_channel(device, object);
-
-        try
-        {
-            return board(device)->channel(object);
-        }
-        catch(...)
-        {
-            throw K3LAPITraits::invalid_channel(device, object);
-        }
-    }
-
-    static KhompPvt * get(K3LAPIBase::GenericTarget & target)
-    {
-        //if (!Globals::k3lapi.valid_channel(target.device, target.object))
-        //    throw K3LAPI::invalid_channel(target.device, target.object);
-
-        try
-        {
-            return board(target.device)->channel(target.object);
-            //return KhompPvt::_pvts[target.device][target.object];
-        }
-        catch(...)
-        {
-            return NULL;
-            //throw K3LAPI::invalid_channel(target.device, target.object);
-        }
-    }
-
-    static unsigned int getStats(int32 device, int32 object, uint32 index)
-    {
-        unsigned int stats = (unsigned int)-1;
-
-        try
-        {
-            stats = Globals::k3lapi.channel_stats(device, object, index);
-        }
-        catch(K3LAPITraits::invalid_channel & err)
-        {
-        //K::logger::logg(C_WARNING, B(dev,channel, "Command get_stats has failed with error '%s'.") %
-        //                          Verbose::status((KLibraryStatus) stt_res));
-        }
-
-        return stats;
-    }
-
-    static KhompPvt * queueFindFree(PriorityCallQueue &pqueue);
-    static void queueAddChannel(PriorityCallQueue &pqueue, unsigned int board, unsigned int object);
-    static KhompPvt * findFree(unsigned int board, unsigned int object, bool fully_available = true);
-    static void applyGlobalVolume(void);
-
-public:
-
-    static VectorBoard     _boards;
-    static char            _cng_buffer[Globals::cng_buffer_size];
-
-    static Kommuter        kommuter;
-
-};
-
-/******************************************************************************/
-/******************************************************************************/
-/******************************************************************************/
-
-#endif /* _KHOMP_PVT_H_*/
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h
deleted file mode 100644
index 6e51af35bd..0000000000
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h
+++ /dev/null
@@ -1,395 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _KHOMP_PVT_FXO_H_
-#define _KHOMP_PVT_FXO_H_
-
-#include "khomp_pvt.h"
-#include "applications.h"
-
-/******************************************************************************/
-/********************************* FXO Board **********************************/
-/******************************************************************************/
-struct BoardFXO: public Board
-{
-/******************************************************************************/
-/******************************** FXO Channel *********************************/
-struct KhompPvtFXO: public KhompPvt 
-{
-/********************************** FXO Call **********************************/
-    struct CallFXO : public Call
-    {
-        CallFXO() {}
-
-        bool process(std::string name, std::string value = "")
-        {
-            if (name == "pre")
-            {
-                DBG(FUNC, D("pre digits adjusted (%s).") % value);
-                _pre_digits = value;
-            }
-            else if (name == "answer_info")
-            {
-                _call_info_report = true;
-            }
-            else if (name == "drop_on")
-            {
-                _call_info_report = true;
-
-                Strings::vector_type drop_item;
-                Strings::tokenize (value, drop_item, ".+");
-
-                for (Strings::vector_type::iterator i = drop_item.begin(); i != drop_item.end(); i++)
-                {
-
-                         if ((*i) == "message_box")        _call_info_drop |= CI_MESSAGE_BOX;
-                    else if ((*i) == "human_answer")       _call_info_drop |= CI_HUMAN_ANSWER;
-                    else if ((*i) == "answering_machine")  _call_info_drop |= CI_ANSWERING_MACHINE;
-                    else if ((*i) == "carrier_message")    _call_info_drop |= CI_CARRIER_MESSAGE;
-                    else if ((*i) == "unknown")            _call_info_drop |= CI_UNKNOWN;
-                    else
-                    {
-                        LOG(ERROR, FMT("unknown paramenter to 'calldrop' Dial option: '%s'.") % (*i));
-                        continue;
-                    }
-
-                    DBG(FUNC, FMT("droping call on '%s'.") % (*i));
-                }
-            }
-            else if (name == "usr_xfer")
-            {
-                _user_xfer_digits = value;
-            }
-            else
-            {            
-                return Call::process(name, value);
-            }
-
-            return true;
-        }
-        
-        bool clear()
-        {
-            _pre_digits.clear();
-            _call_info_report = false;
-            _call_info_drop = 0;
-
-            _user_xfer_digits = Opt::_options._user_xfer_digits();
-            _user_xfer_buffer.clear();
-            _digits_buffer.clear();
-
-            _var_fax_adjust = T_UNKNOWN;
- 
-            return Call::clear();
-        }
-
-        std::string  _pre_digits;
-
-        /* report what we got? */
-        bool _call_info_report;
-
-        /* what call info flags should make us drop the call? */
-        long int _call_info_drop;
-
-        /* used for xfer on user signaling */
-        std::string _user_xfer_digits;
-        std::string _user_xfer_buffer;
-        std::string _digits_buffer;
-
-        TriState _var_fax_adjust;
-
-        ChanTimer::Index _busy_disconnect;        
-    };
-/******************************************************************************/
-    KhompPvtFXO(K3LAPIBase::GenericTarget & target) : KhompPvt(target) 
-    {
-        _fax = new Fax(this);
-        _transfer = new Transfer<CallFXO>(this);
-        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
-    }
-
-    ~KhompPvtFXO() 
-    {
-        delete _fax;
-        delete _transfer;
-    }
-
-    CallFXO * callFXO()
-    {
-        return (CallFXO *)call();
-    }
-
-    int makeCall(std::string params = "");
-    bool doChannelAnswer(CommandRequest &);
-
-    bool onNewCall(K3L_EVENT *e);
-    bool onDisconnect(K3L_EVENT *e);
-    bool onChannelRelease(K3L_EVENT *e);
-    bool onCallSuccess(K3L_EVENT *e);
-    bool onCallFail(K3L_EVENT *e);
-    bool onAudioStatus(K3L_EVENT *e);
-    bool onSeizeSuccess(K3L_EVENT *e);
-    bool onDtmfDetected(K3L_EVENT *e);
-    bool onDtmfSendFinish(K3L_EVENT *);
-    bool onCallAnswerInfo(K3L_EVENT *e);
-
-    virtual bool eventHandler(K3L_EVENT *e)
-    {
-        DBG(STRM, D("(FXO) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-            case EV_NEW_CALL:
-                ret = onNewCall(e);
-                break;
-            case EV_DISCONNECT:
-                ret = onDisconnect(e);
-                break;
-            case EV_CHANNEL_FREE:
-            case EV_CHANNEL_FAIL:
-                ret = onChannelRelease(e);
-                break;
-            case EV_CALL_SUCCESS:
-                ret = onCallSuccess(e);
-                break;
-            case EV_CALL_FAIL:
-                ret = onCallFail(e);
-                break;
-            case EV_AUDIO_STATUS:
-                ret = onAudioStatus(e);
-                break;
-            case EV_SEIZE_SUCCESS:
-                ret = onSeizeSuccess(e);
-                break;
-            case EV_DTMF_DETECTED:
-            case EV_PULSE_DETECTED:
-                ret = onDtmfDetected(e);
-                break;
-            case EV_DTMF_SEND_FINISH:
-                ret = onDtmfSendFinish(e);
-                break;
-            case EV_CALL_ANSWER_INFO:
-                ret = onCallAnswerInfo(e);
-                break;
-            case EV_FAX_CHANNEL_FREE:
-                ret = _fax->onFaxChannelRelease(e);
-                break;
-            case EV_FAX_FILE_SENT:
-            case EV_FAX_FILE_FAIL:
-            case EV_FAX_TX_TIMEOUT:
-            case EV_FAX_PAGE_CONFIRMATION:
-            case EV_FAX_REMOTE_INFO:
-                break;
-            case EV_POLARITY_REVERSAL:
-                break;
-            default:
-                ret = KhompPvt::eventHandler(e);
-                break;
-        }
-
-        DBG(STRM, D("(FXO) r"));
-
-        return ret;
-    }
-
-    bool application(ApplicationType type, switch_core_session_t * session, const char *data);
-
-    bool setupConnection();
-    bool autoGainControl(bool enable);
-    void setAnswerInfo(int answer_info);
-    bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
-    static void busyDisconnect(Board::KhompPvt * pvt);
-    void reportFailToReceive(int fail_code);
-    bool validContexts(MatchExtension::ContextListType & contexts, 
-                       std::string extra_context = "");
-  
-    bool isOK(void); 
-
-    bool isPhysicalFree() 
-    {
-        K3L_CHANNEL_STATUS status;
-
-        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
-            return false; 
-
-        bool physically_free = (status.AddInfo == kfcsEnabled);
-
-        if(status.CallStatus != kcsFree || !physically_free)
-        {
-            DBG(FUNC, PVT_FMT(_target, "call status not free, or not physically free!"));
-            return false;
-        }
-
-        return true;
-    }
-
-    virtual bool cleanup(CleanupType type = CLN_HARD)
-    {
-        try
-        {
-            Board::board(_target.device)->_timers.del(callFXO()->_busy_disconnect);
-        }
-        catch (K3LAPITraits::invalid_device & err)
-        {
-            LOG(ERROR, PVT_FMT(target(), "Unable to get device: %d!") % err.device);
-        }
-
-        call()->_flags.clear(Kflags::CALL_WAIT_SEIZE);
-        call()->_flags.clear(Kflags::EARLY_RINGBACK);
-
-        _transfer->clear();
-        callFXO()->_busy_disconnect.reset();
-
-        switch (type)
-        {
-        case CLN_HARD:
-        case CLN_FAIL:
-            call()->_flags.clear(Kflags::FAX_DETECTED);
-            break;
-        case CLN_SOFT:
-            break;
-        }
-
-        return KhompPvt::cleanup(type);
-    }
-
-    virtual void getSpecialVariables()
-    {
-        try
-        {
-            const char * str_fax = getFSChannelVar("KAdjustForFax");
-
-            callFXO()->_var_fax_adjust = (str_fax ? (!SAFE_strcasecmp(str_fax, "true") ? T_TRUE : T_FALSE) : T_UNKNOWN);
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(_target, "(FXO) %s") % err._msg.c_str());
-        }
-
-        KhompPvt::getSpecialVariables();
-    }
-
-    bool sendDtmf(std::string digit);
-
-    /* used by app FAX */
-    Fax * _fax;
-
-    Transfer<CallFXO> * _transfer;
-
-//    static void delayedDisconnect(Board::KhompPvt * pvt);
-
-    void cleanupIndications(bool force)
-    {
-        if (call()->_indication == INDICA_BUSY && !force)
-        {
-            DBG(FUNC, PVT_FMT(_target, "skipping busy indication cleanup on FXO channel."));
-            return;
-        }
-
-        KhompPvt::cleanupIndications(force);
-    }
-};
-/******************************************************************************/
-/******************************************************************************/
-    BoardFXO(int id) : Board(id) {}
-
-    void initializeChannels(void)
-    {
-        LOG(MESSAGE, "(FXO) loading channels ...");
-
-        for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
-        {
-            K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
-            KhompPvt * pvt;
-
-            switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
-            {
-            case ksigAnalog:
-                pvt = new BoardFXO::KhompPvtFXO(tgt);
-                pvt->_call = new BoardFXO::KhompPvtFXO::CallFXO();
-                DBG(FUNC, "(FXO) FXO channel");
-                break;
-            default:
-                pvt = new Board::KhompPvt(tgt);
-                pvt->_call = new Board::KhompPvt::Call();
-                DBG(FUNC, FMT("(FXO) signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
-                break;
-            }
-
-            _channels.push_back(pvt);
-
-            pvt->cleanup();
-
-        }
-    }
-
-    /*
-    virtual bool eventHandler(const int obj, K3L_EVENT *e)
-    {
-        DBG(STRM, D("(FXO Board) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-        case :
-            break;
-        default:
-            ret = Board::eventHandler(obj, e);
-            break;
-        }
-
-        DBG(STRM, D("(FXO Board) r"));
-
-        return ret;
-    }
-    */
-   
-};
-/******************************************************************************/
-/******************************************************************************/
-/******************************************************************************/
-#endif /* _KHOMP_PVT_FXO_H_*/
-
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h
deleted file mode 100644
index 7467a5ed9a..0000000000
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _KHOMP_PVT_GSM_H_
-#define _KHOMP_PVT_GSM_H_
-
-#include "khomp_pvt.h"
-#include "applications.h"
-
-/******************************************************************************/
-/********************************* GSM Board **********************************/
-/******************************************************************************/
-struct BoardGSM: public Board
-{
-/******************************************************************************/
-/******************************** GSM Channel *********************************/
-struct KhompPvtGSM: public KhompPvt 
-{
-/********************************** GSM Call **********************************/
-    struct CallGSM : public Call
-    {
-        CallGSM() {}
-
-        bool process(std::string name, std::string value = "")
-        {
-            if (name == "answer_info")
-            {
-                _call_info_report = true;
-            }
-            else if (name == "drop_on")
-            {
-                _call_info_report = true;
-
-                Strings::vector_type drop_item;
-                Strings::tokenize (value, drop_item, ".+");
-
-                for (Strings::vector_type::iterator i = drop_item.begin(); i != drop_item.end(); i++)
-                {
-
-                         if ((*i) == "message_box")        _call_info_drop |= CI_MESSAGE_BOX;
-                    else if ((*i) == "human_answer")       _call_info_drop |= CI_HUMAN_ANSWER;
-                    else if ((*i) == "answering_machine")  _call_info_drop |= CI_ANSWERING_MACHINE;
-                    else if ((*i) == "carrier_message")    _call_info_drop |= CI_CARRIER_MESSAGE;
-                    else if ((*i) == "unknown")            _call_info_drop |= CI_UNKNOWN;
-                    else
-                    {
-                        LOG(ERROR, FMT("unknown paramenter to 'calldrop' Dial option: '%s'.") % (*i));
-                        continue;
-                    }
-
-                    DBG(FUNC, FMT("droping call on '%s'.") % (*i));
-                }
-            }
-            else
-            {            
-                return Call::process(name, value);
-            }
-
-            return true;
-        }
-        
-        bool clear()
-        {
-            _call_info_report = false;
-            _call_info_drop = 0;
- 
-            return Call::clear();
-        }
-
-        /* report what we got? */
-        bool _call_info_report;
-
-        /* what call info flags should make us drop the call? */
-        long int _call_info_drop;
-    };
-
-/******************************************************************************/
-    KhompPvtGSM(K3LAPIBase::GenericTarget & target) : KhompPvt(target) 
-    {
-        _sms = new SMS(this);
-        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
-    }
-
-    ~KhompPvtGSM() 
-    {
-        delete _sms;
-    }
-
-    CallGSM * callGSM()
-    {
-        return (CallGSM *)call();
-    }
-
-    int makeCall(std::string params = "");
-    bool doChannelAnswer(CommandRequest &);
-    bool doChannelHangup(CommandRequest &);
-
-    //bool onNewCall(K3L_EVENT *e);
-    bool onChannelRelease(K3L_EVENT *e);
-    bool onCallFail(K3L_EVENT *e);
-    bool onCallSuccess(K3L_EVENT *e);
-    bool onCallAnswerInfo(K3L_EVENT *e);
-    bool onDisconnect(K3L_EVENT *e);
-    //bool onDtmfDetected(K3L_EVENT *e);
-
-    virtual bool eventHandler(K3L_EVENT *e)
-    {
-        DBG(STRM, D("(GSM) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-            /*
-            case EV_NEW_CALL:
-                onNewCall(e);
-                break;
-            */
-            case EV_CHANNEL_FREE:
-            case EV_CHANNEL_FAIL:
-                ret = onChannelRelease(e);
-                break;
-            case EV_CALL_SUCCESS:
-                ret = onCallSuccess(e);
-                break;
-            case EV_DISCONNECT:
-                ret = onDisconnect(e);
-                break;
-            case EV_CALL_FAIL:
-                ret = onCallFail(e);
-                break;
-            case EV_CALL_ANSWER_INFO:
-                ret = onCallAnswerInfo(e);
-                break;
-            case EV_RECV_FROM_MODEM:
-                break;
-            case EV_NEW_SMS:
-                ret = _sms->onNewSMS(e);
-                break;
-            case EV_SMS_INFO:
-                ret = _sms->onSMSInfo(e);
-                break;
-            case EV_SMS_DATA:
-                ret = _sms->onSMSData(e);
-                break;
-            case EV_SMS_SEND_RESULT:
-                ret = _sms->onSMSSendResult(e);
-                break;
-            default:
-                ret = KhompPvt::eventHandler(e);
-                break;
-        }        
-
-        DBG(STRM, D("(GSM) r"));
-
-        return ret;
-    }
-
-    bool application(ApplicationType type, switch_core_session_t * session, const char *data);    
-  
-    bool setupConnection();
-    void setAnswerInfo(int answer_info);
-    bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
-    void reportFailToReceive(int fail_code);
-    int causeFromCallFail(int fail);
-    int callFailFromCause(int cause);
-    bool isOK(void); 
-
-    bool isPhysicalFree() 
-    {
-        K3L_CHANNEL_STATUS status;
-
-        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
-            return false; 
-
-        bool physically_free = (status.AddInfo == kgsmIdle);
-
-        if(status.CallStatus != kcsFree || !physically_free)
-        {
-            DBG(FUNC, PVT_FMT(_target, "call status not free, or not physically free!"));
-            return false;
-        }
-
-        return true;
-    }
-
-    bool sendPreAudio(int rb_value = RingbackDefs::RB_SEND_NOTHING)
-    {
-        return false;
-    }
-
-    bool selectSimCard(const char * sim_card)
-    {
-        return command(KHOMP_LOG, CM_SIM_CARD_SELECT, sim_card);
-    }
-
-    std::string getStatistics(Statistics::Type type)
-    {
-        switch(type)
-        {
-            case Statistics::DETAILED:
-            {
-                /* buffer our data to return at the end */
-                std::string strBuffer;
-
-                strBuffer.append(_pvt_statistics->getDetailed());
-                strBuffer.append(_sms->statistics()->getDetailed());
-                return strBuffer;
-            }
-            case Statistics::ROW:
-            {
-                return _pvt_statistics->getRow();
-            }
-            default:
-                return "";
-        }
-    }
-
-    void clearStatistics()
-    {
-        KhompPvt::clearStatistics();
-        _sms->statistics()->clear();
-    }
-
-    bool validContexts(MatchExtension::ContextListType & contexts, 
-                       std::string extra_context = "");
-        
-    SMS * _sms;
-
-};
-/******************************************************************************/
-/******************************************************************************/
-    BoardGSM(int id) : Board(id) {}
-
-    void initializeChannels(void)
-    {
-        LOG(MESSAGE, "(GSM) loading channels ...");
-
-        for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
-        {
-            K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
-            KhompPvt * pvt;
-
-            switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
-            {
-            case ksigGSM:
-                pvt = new BoardGSM::KhompPvtGSM(tgt);
-                pvt->_call = new BoardGSM::KhompPvtGSM::CallGSM();
-                ((BoardGSM::KhompPvtGSM *)pvt)->_sms->start();
-                DBG(FUNC, "(GSM) GSM channel");
-                break;
-            default:
-                pvt = new Board::KhompPvt(tgt);
-                pvt->_call = new Board::KhompPvt::Call();
-                DBG(FUNC, FMT("(GSM) signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
-                break;
-            }
-
-            _channels.push_back(pvt);
-
-            pvt->cleanup();
-
-        }
-    }
-
-/*
-    virtual bool eventHandler(const int obj, K3L_EVENT *e)
-    {
-        DBG(STRM, D("(GSM Board) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-        case :
-            break;
-        default:
-            ret = Board::eventHandler(obj, e);
-            break;
-        }
-
-        DBG(STRM, D("(GSM Board) r"));
-
-        return ret;
-    }
-*/
-   
-};
-/******************************************************************************/
-/******************************************************************************/
-/******************************************************************************/
-#endif /* _KHOMP_PVT_GSM_H_*/
-
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h
deleted file mode 100644
index c32071b981..0000000000
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h
+++ /dev/null
@@ -1,1198 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _KHOMP_PVT_E1_H_
-#define _KHOMP_PVT_E1_H_
-
-#include "khomp_pvt.h"
-
-#include "applications.h"
-
-/******************************************************************************/
-/********************************** E1 Board **********************************/
-/******************************************************************************/
-struct BoardE1: public Board
-{
-/******************************************************************************/
-/********************************* E1 Channel *********************************/
-struct KhompPvtE1: public KhompPvt 
-{
-/*********************************** E1 Call **********************************/
-    struct CallE1 : public Call
-    {
-        CallE1() {}
-
-        bool process(std::string name, std::string value = "")
-        {
-            if (name == "answer_info")
-            {
-                _call_info_report = true;
-            }
-            else if (name == "drop_on")
-            {
-                _call_info_report = true;
-
-                Strings::vector_type drop_item;
-                Strings::tokenize (value, drop_item, ".+");
-
-                for (Strings::vector_type::iterator i = drop_item.begin(); i != drop_item.end(); i++)
-                {
-
-                         if ((*i) == "message_box")        _call_info_drop |= CI_MESSAGE_BOX;
-                    else if ((*i) == "human_answer")       _call_info_drop |= CI_HUMAN_ANSWER;
-                    else if ((*i) == "answering_machine")  _call_info_drop |= CI_ANSWERING_MACHINE;
-                    else if ((*i) == "carrier_message")    _call_info_drop |= CI_CARRIER_MESSAGE;
-                    else if ((*i) == "unknown")            _call_info_drop |= CI_UNKNOWN;
-                    else
-                    {
-                        LOG(ERROR, FMT("unknown paramenter to 'calldrop' Dial option: '%s'.") % (*i));
-                        continue;
-                    }
-
-                    DBG(FUNC, FMT("droping call on '%s'.") % (*i));
-                }
-            }
-            else
-            {            
-                return Call::process(name, value);
-            }
-
-            return true;
-        }
-        
-        bool clear()
-        {
-            _call_info_report = false;
-            _call_info_drop = 0;
-
-            _var_fax_adjust = T_UNKNOWN;
- 
-            return Call::clear();
-        }
-
-        /* report what we got? */
-        bool _call_info_report;
-
-        /* what call info flags should make us drop the call? */
-        long int _call_info_drop;
-
-        TriState _var_fax_adjust;
-
-        ChanTimer::Index _idx_disconnect;
-    
-    };
-/******************************************************************************/
-    KhompPvtE1(K3LAPIBase::GenericTarget & target) : KhompPvt(target)
-    {
-        _fax = new Fax(this);
-        command(KHOMP_LOG,CM_ENABLE_CALL_ANSWER_INFO); 
-    }
-
-    ~KhompPvtE1() 
-    {
-        delete _fax;
-    }
-
-    CallE1 * callE1()
-    {
-        return (CallE1 *)call();
-    }
-
-    int makeCall(std::string params = "");
-
-    bool onChannelRelease(K3L_EVENT *e);
-    bool onCallSuccess(K3L_EVENT *e);
-    bool onAudioStatus(K3L_EVENT *e);
-    bool onCallAnswerInfo(K3L_EVENT *e);
-    bool onDisconnect(K3L_EVENT *e);
-    
-    virtual bool eventHandler(K3L_EVENT *e)
-    {
-        DBG(STRM, D("(E1) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-            case EV_CHANNEL_FREE:
-            case EV_CHANNEL_FAIL:
-                ret = onChannelRelease(e);
-                break;
-            case EV_CALL_ANSWER_INFO:
-                ret = onCallAnswerInfo(e);
-                break;
-            case EV_DISCONNECT:
-                ret = onDisconnect(e);
-                break;                            
-            case EV_AUDIO_STATUS:
-                ret = onAudioStatus(e);
-                break;
-            case EV_FAX_CHANNEL_FREE:
-                ret = _fax->onFaxChannelRelease(e);
-                break;
-            case EV_FAX_FILE_SENT:
-            case EV_FAX_FILE_FAIL:
-            case EV_FAX_TX_TIMEOUT:
-            case EV_FAX_PAGE_CONFIRMATION:
-            case EV_FAX_REMOTE_INFO:
-                break;
-            default:
-                ret = KhompPvt::eventHandler(e);
-                break;
-        }        
-
-        DBG(STRM, D("(E1) r"));
-
-        return ret;
-    }
-    
-    bool application(ApplicationType type, switch_core_session_t * session, const char *data);
-    
-    bool setupConnection();
-    bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
-    void setAnswerInfo(int answer_info);
-    bool validContexts(MatchExtension::ContextListType & contexts, 
-                       std::string extra_context = "");
-    bool isOK(void); 
-
-    bool isPhysicalFree() 
-    {
-        K3L_CHANNEL_STATUS status;
-
-        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
-            return false; 
-
-        bool physically_free = (status.AddInfo == kecsFree);
-
-        if(status.CallStatus != kcsFree || !physically_free)
-        {
-            DBG(FUNC, PVT_FMT(_target, "call status not free, or not physically free!"));
-            return false;
-        }
-
-        return true;
-    }
-
-    virtual bool cleanup(CleanupType type = CLN_HARD)
-    {
-        try
-        {
-            Board::board(_target.device)->_timers.del(callE1()->_idx_disconnect);
-        }
-        catch (K3LAPITraits::invalid_device & err)
-        {
-            LOG(ERROR, PVT_FMT(target(), "Unable to get device: %d!") % err.device);
-        }
-
-        callE1()->_idx_disconnect.reset();
-
-        switch (type)
-        {
-        case CLN_HARD:
-        case CLN_FAIL:
-            call()->_flags.clear(Kflags::FAX_DETECTED);
-            break;
-        case CLN_SOFT:
-            break;
-        }
-
-        return KhompPvt::cleanup(type);
-    }
-
-    virtual void getSpecialVariables()
-    {
-        try
-        {
-            const char * str_fax = getFSChannelVar("KAdjustForFax");
-
-            callE1()->_var_fax_adjust = (str_fax ? (!SAFE_strcasecmp(str_fax, "true") ? T_TRUE : T_FALSE) : T_UNKNOWN);
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(_target, "(E1) %s") % err._msg.c_str());
-        }
-
-        KhompPvt::getSpecialVariables();
-    }
-        
-    /* used by app FAX */
-    Fax * _fax;
-
-    static void delayedDisconnect(Board::KhompPvt * pvt);
-};
-/******************************************************************************/
-/********************************** ISDN Channel ******************************/
-struct KhompPvtISDN: public KhompPvtE1 
-{
-/********************************** ISDN Call *********************************/
-    struct CallISDN : public CallE1
-    {
-    
-        CallISDN() {}
-
-        bool process(std::string name, std::string value = "")
-        {
-            if ((name == "uui" ) || (name == "uui_ex"))
-            {
-                if(value.find("#") != std::string::npos)
-                {
-                    Strings::vector_type values;
-                    Strings::tokenize(value, values, "#", 2);
-
-                    try
-                    {
-                        std::string uui_proto_s = values[0];
-                        _uui_extended = (name == "uui_ex");
-                        _uui_descriptor = Strings::toulong(uui_proto_s);
-                        _uui_information.clear();
-
-                        for (unsigned int i = 0; i < values[1].size(); ++i) 
-                            _uui_information += STG(FMT("%02hhx") % ((unsigned char)values[1][i]));
-
-                        DBG(FUNC, FMT("uui adjusted (ex=%s, proto=%s, data='%s')!") 
-                                % (_uui_extended ? "true" : "false")
-                                % uui_proto_s.c_str()
-                                % _uui_information.c_str());
-                    }
-                    catch (...)
-                    {
-                        LOG(ERROR, FMT("invalid %s protocol descriptor: '%s' is not a number.") 
-                                % (_uui_extended ? "uui_ex" : "uui")
-                                % value.c_str());
-                    }
-                } 
-                else
-                {
-                    LOG(ERROR, FMT("invalid %s protocol descriptor, need a '#'.") 
-                            % (_uui_extended ? "uui_ex" : "uui"))
-                }
-            }
-            else if (name == "usr_xfer")
-            {
-                _user_xfer_digits = value;
-            }
-            else
-            {            
-                return CallE1::process(name, value);
-            }
-
-            return true;
-        }
-    
-        bool clear()
-        {
-            _uui_extended = false;
-            _uui_descriptor = -1;
-            _uui_information.clear();
-            _isdn_cause = -1;
-
-            _user_xfer_digits = Opt::_options._user_xfer_digits();
-            _user_xfer_buffer.clear();
-            _digits_buffer.clear();
-            _qsig_number.clear();
-    
-            return CallE1::clear();
-        }
-        
-        /* used for isdn EV_USER_INFORMATION */
-        long int     _uui_descriptor;
-        std::string  _uui_information;
-        long int     _isdn_cause;
-        bool         _uui_extended;
-
-        /* what should we dial to trigger an user-signaled transfer? */
-        /* used for xfer on user signaling */
-        std::string _user_xfer_digits;
-        std::string _user_xfer_buffer;
-        std::string _digits_buffer;
-        std::string _qsig_number;
-        
-        /* isdn information  */
-        std::string _isdn_orig_type_of_number;
-        std::string _isdn_orig_numbering_plan;
-        std::string _isdn_dest_type_of_number;
-        std::string _isdn_dest_numbering_plan;
-        std::string _isdn_orig_presentation;
-
-    };
-/******************************************************************************/
-    KhompPvtISDN(K3LAPIBase::GenericTarget & target) : KhompPvtE1(target) 
-    {
-        _transfer = new Transfer<CallISDN, false>(this);
-    }
-
-    ~KhompPvtISDN() 
-    {
-        delete _transfer;
-    }
-
-    CallISDN * callISDN()
-    {
-        return (CallISDN *)call();
-    }
-    
-    int makeCall(std::string params = "");
-    bool doChannelAnswer(CommandRequest &); 
-
-    bool onSyncUserInformation(K3L_EVENT *e);
-    bool onIsdnProgressIndicator(K3L_EVENT *e);
-    bool onNewCall(K3L_EVENT *e);
-    bool onCallSuccess(K3L_EVENT *e);
-    bool onCallFail(K3L_EVENT *e);
-
-    virtual bool eventHandler(K3L_EVENT *e)
-    {
-        DBG(STRM, D("(ISDN) c"));
-
-        bool ret = true;
-        
-        switch(e->Code)
-        {
-            case EV_USER_INFORMATION:
-                ret = onSyncUserInformation(e);
-                break;
-            case EV_ISDN_PROGRESS_INDICATOR:
-                ret = onIsdnProgressIndicator(e);
-                break;
-            case EV_NEW_CALL:
-                ret = onNewCall(e);
-                break;
-            case EV_CALL_SUCCESS:
-                ret = onCallSuccess(e);
-                break;
-            case EV_CALL_FAIL:
-                ret = onCallFail(e);
-                break;
-            case EV_SS_TRANSFER_FAIL:
-                break;
-            default:
-                ret = KhompPvtE1::eventHandler(e);
-                break;
-        }        
-
-        DBG(STRM, D("(ISDN) r"));
-
-        return ret;
-    }
-    
-    bool application(ApplicationType type, switch_core_session_t * session, const char *data);
-
-    int causeFromCallFail(int fail);
-    int callFailFromCause(int cause);
-    void reportFailToReceive(int fail_code);
-    RingbackDefs::RingbackStType sendRingBackStatus(int rb_value = RingbackDefs::RB_SEND_DEFAULT); 
-    bool sendPreAudio(int rb_value = RingbackDefs::RB_SEND_NOTHING);
-    bool sendDtmf(std::string digit);
-
-    virtual bool cleanup(CleanupType type = CLN_HARD)
-    {
-        _transfer->clear();
-        
-        /*
-        switch (type)
-        {
-        case CLN_HARD:
-        case CLN_FAIL:
-            break;
-        case CLN_SOFT:
-            break;
-        }
-        */
-
-        return KhompPvtE1::cleanup(type);
-    }
-
-    virtual void setSpecialVariables()
-    {
-        try
-        {
-            /* rdsi user info */
-            if (callISDN()->_uui_descriptor != -1)
-            {
-                DBG(FUNC,"Setting ISDN descriptor");
-
-                std::string descriptor = STG(FMT("%d") % callISDN()->_uui_descriptor);
-
-                setFSChannelVar("KUserInfoExtended", (callISDN()->_uui_extended ? "true" : "false"));
-                setFSChannelVar("KUserInfoDescriptor", descriptor.c_str());
-                setFSChannelVar("KUserInfoData", callISDN()->_uui_information.c_str());
-
-                callISDN()->_uui_extended = false; 
-                callISDN()->_uui_descriptor = -1;
-                callISDN()->_uui_information.clear();
-            }
-
-            if (!callISDN()->_isdn_orig_type_of_number.empty())
-                setFSChannelVar("KISDNOrigTypeOfNumber", callISDN()->_isdn_orig_type_of_number.c_str());
-
-            if (!callISDN()->_isdn_dest_type_of_number.empty())
-                setFSChannelVar("KISDNDestTypeOfNumber", callISDN()->_isdn_dest_type_of_number.c_str());
-
-            if (!callISDN()->_isdn_orig_numbering_plan.empty())
-                setFSChannelVar("KISDNOrigNumberingPlan", callISDN()->_isdn_orig_numbering_plan.c_str());
-
-            if (!callISDN()->_isdn_dest_numbering_plan.empty())
-                setFSChannelVar("KISDNDestNumberingPlan", callISDN()->_isdn_dest_numbering_plan.c_str());
-
-            if (!callISDN()->_isdn_orig_presentation.empty())
-                setFSChannelVar("KISDNOrigPresentation", callISDN()->_isdn_orig_presentation.c_str());
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(_target, "(ISDN) %s") % err._msg.c_str());
-        }
-
-        KhompPvtE1::setSpecialVariables();
-    }
-
-    virtual void getSpecialVariables()
-    {
-        try
-        {
-            const char * isdn_orig_type = getFSChannelVar("KISDNOrigTypeOfNumber");
-            const char * isdn_dest_type = getFSChannelVar("KISDNDestTypeOfNumber");
-            const char * isdn_orig_numbering = getFSChannelVar("KISDNOrigNumberingPlan");
-            const char * isdn_dest_numbering = getFSChannelVar("KISDNDestNumberingPlan");
-            const char * isdn_orig_presentation = getFSChannelVar("KISDNOrigPresentation");
-
-            LOG(ERROR, PVT_FMT(_target,"ISDNORIG: %s") % (isdn_orig_type ? isdn_orig_type : ""));
-
-            callISDN()->_isdn_orig_type_of_number = (isdn_orig_type ? isdn_orig_type : "");
-            callISDN()->_isdn_dest_type_of_number = (isdn_dest_type ? isdn_dest_type : "");
-            callISDN()->_isdn_orig_numbering_plan = (isdn_orig_numbering ? isdn_orig_numbering : "");
-            callISDN()->_isdn_dest_numbering_plan = (isdn_dest_numbering ? isdn_dest_numbering : "");
-            callISDN()->_isdn_orig_presentation   = (isdn_orig_presentation ? isdn_orig_presentation : "");
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(_target, "(ISDN) %s") % err._msg.c_str());
-        }
-
-        KhompPvt::getSpecialVariables();
-    }
-       
-    Transfer<CallISDN, false> * _transfer;
-};
-/******************************************************************************/
-/********************************* R2 Channel *********************************/
-struct KhompPvtR2: public KhompPvtE1
-{
-/********************************* R2 Call ************************************/
-    struct CallR2 : public CallE1
-    {
-    
-        CallR2() {}
-
-
-        bool process(std::string name, std::string value = "")
-        {
-            if (name == "category")
-            {
-                try
-                {
-                    unsigned long int category = Strings::toulong (value);
-                    DBG(FUNC, FMT("r2 category adjusted (%s)!") % value.c_str());
-                    _r2_category = category;
-                }
-                catch (...)
-                {
-                   LOG(ERROR, FMT("invalid r2 category: '%s' is not a number.") % value.c_str());
-                }
-            }
-            else
-            {
-                return CallE1::process(name, value);
-            }
-            return true;
-        }
-        
-        bool clear()
-        {
-            _r2_category  = -1; 
-            _r2_condition = -1;
-
-            return CallE1::clear();
-        }
-
-        long int _r2_category;
-        long int _r2_condition;
-
-        ChanTimer::Index _idx_number_dial;
-        std::string _incoming_exten;
-    };
-/******************************************************************************/
-    KhompPvtR2(K3LAPIBase::GenericTarget & target) : KhompPvtE1(target) 
-    {
-        K3L_E1600A_FW_CONFIG dspAcfg;
-
-        if (k3lGetDeviceConfig(_target.device, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) != ksSuccess)
-        {
-            DBG(FUNC, PVT_FMT(target, "unable to get signaling locality for board: assuming brazilian signaling"));
- 
-            _r2_country = Verbose::R2_COUNTRY_BRA;
-           
-            return;
-        }
-        Regex::Expression e(".+\\((Arg|Bra|Chi|Mex|Ury|Ven)\\).+", Regex::E_EXTENDED);
-        std::string fwname(dspAcfg.FwVersion);
-
-        Regex::Match what(fwname, e);
-
-        if (!what.matched() || !what.matched(1))
-        {
-            DBG(FUNC, PVT_FMT(target, "invalid firmware string, unable to find country code: assuming brazilian signaling.\n"));
-            
-            _r2_country = Verbose::R2_COUNTRY_BRA;
-            return;
-        }
-
-        std::string country = what.submatch(1);
-    
-        /**/ if (country == "Arg")
-            _r2_country = Verbose::R2_COUNTRY_ARG;
-        else if (country == "Bra")
-            _r2_country = Verbose::R2_COUNTRY_BRA;
-        else if (country == "Chi")
-            _r2_country = Verbose::R2_COUNTRY_CHI;
-        else if (country == "Mex")
-            _r2_country = Verbose::R2_COUNTRY_MEX;
-        else if (country == "Ury")
-            _r2_country = Verbose::R2_COUNTRY_URY;
-        else if (country == "Ven")
-            _r2_country = Verbose::R2_COUNTRY_VEN;
-        else
-        {
-            DBG(FUNC, PVT_FMT(target, "invalid firmware string (%s), assuming brazilian signaling.") % country.c_str());
-
-            _r2_country = Verbose::R2_COUNTRY_BRA;
-            return;
-        }
-    
-        DBG(FUNC, PVT_FMT(target, "adjusting country signaling to code '%s'...")
-            % country.c_str());
-
-    }
-
-    ~KhompPvtR2() {}
-    
-    CallR2 * callR2()
-    {
-        return (CallR2 *)call();
-    }
-
-    bool forceDisconnect(void)
-    {
-        char cmd[] = { 0x07, (char)(_target.object + 1) };
-        
-        try
-        {
-            Globals::k3lapi.raw_command(_target.device, 0, cmd, sizeof(cmd));
-        }
-        catch(K3LAPI::failed_raw_command &e)
-        {
-            return false;
-        }
-
-        return true;
-    };
-
-    int makeCall(std::string params = "");
-    bool doChannelAnswer(CommandRequest &); 
-    bool doChannelHangup(CommandRequest &);
-
-    bool onNewCall(K3L_EVENT *e);
-    bool onCallSuccess(K3L_EVENT *e);
-    bool onCallFail(K3L_EVENT *e);
-    bool onNumberDetected(K3L_EVENT *e);
-    
-    virtual bool eventHandler(K3L_EVENT *e)
-    {
-        DBG(STRM, D("(R2) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-            case EV_NEW_CALL:
-                ret = onNewCall(e);
-                break;
-            case EV_CALL_SUCCESS:
-                ret = onCallSuccess(e);
-                break;
-            case EV_CALL_FAIL:
-                ret = onCallFail(e);
-                break;
-            case EV_DIALED_DIGIT:
-                ret = onNumberDetected(e);
-                break;
-            default:
-                ret = KhompPvtE1::eventHandler(e);
-                break;
-        }        
-
-        DBG(STRM, D("(R2) r"));
-
-        return ret;
-
-    }
-    
-    int causeFromCallFail(int fail);
-    int callFailFromCause(int cause);
-    void reportFailToReceive(int fail_code);
-    RingbackDefs::RingbackStType sendRingBackStatus(int rb_value = RingbackDefs::RB_SEND_DEFAULT); 
-    bool sendPreAudio(int rb_value = RingbackDefs::RB_SEND_NOTHING);
-    bool indicateRinging();
-
-    virtual void setSpecialVariables()
-    {
-        try
-        {
-            /* r2 caller category */
-            if (callR2()->_r2_category != -1)
-            {
-                setFSChannelVar("KR2GotCategory",STG(FMT("%d") % callR2()->_r2_category).c_str());
-                setFSChannelVar("KR2StrCategory",Verbose::signGroupII((KSignGroupII)callR2()->_r2_category).c_str());
-            }
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(_target, "(R2) %s") % err._msg.c_str());
-        }
-
-        KhompPvtE1::setSpecialVariables();
-    }
-
-    virtual bool cleanup(CleanupType type = CLN_HARD)
-    {
-        call()->_flags.clear(Kflags::NEEDS_RINGBACK_CMD);
-        call()->_flags.clear(Kflags::NUMBER_DIAL_ONGOING);
-        call()->_flags.clear(Kflags::NUMBER_DIAL_FINISHD);
-
-        switch (type)
-        {
-        case CLN_HARD:
-        case CLN_FAIL:
-            break;
-        case CLN_SOFT:
-            break;
-        }
-
-        return KhompPvtE1::cleanup(type);
-    }
-
-    static void numberDialTimer(Board::KhompPvt * pvt);
-
-public:
-    Verbose::R2CountryType _r2_country;
-
-};
-/******************************************************************************/
-/********************************* FLASH Channel ******************************/
-/* ksigLineSide ksigCAS_EL7 ksigE1LC */
-struct KhompPvtFlash: public KhompPvtR2 
-{
-/********************************* R2 Call ************************************/
-    struct CallFlash : public CallR2
-    {
-    
-        CallFlash() {}
-
-        bool process(std::string name, std::string value = "")
-        {
-            if (name == "usr_xfer")
-            {
-                _user_xfer_digits = value;
-            }
-            else
-            {
-                return CallR2::process(name, value);
-            }
-
-            return true;
-        }
-        
-        bool clear()
-        {
-            _user_xfer_digits = Opt::_options._user_xfer_digits();
-            _user_xfer_buffer.clear();
-            _digits_buffer.clear();
-
-            return CallR2::clear();
-        }
-
-        /* used for xfer on user signaling */
-        std::string _user_xfer_digits;
-        std::string _user_xfer_buffer;
-        std::string _digits_buffer;
-
-    };
-/******************************************************************************/
-    KhompPvtFlash(K3LAPIBase::GenericTarget & target) : KhompPvtR2(target) 
-    {
-        _transfer = new Transfer<CallFlash>(this);
-    }
-    
-    ~KhompPvtFlash() 
-    {
-        delete _transfer;
-    }
-    
-    CallFlash * callFlash()
-    {
-        return (CallFlash *)call();
-    }
-
-    bool application(ApplicationType type, switch_core_session_t * session, const char *data);
-
-    bool sendDtmf(std::string digit);
-
-    virtual bool cleanup(CleanupType type = CLN_HARD)
-    {
-        _transfer->clear();
-
-        /*
-        switch (type)
-        {
-        case CLN_HARD:
-        case CLN_FAIL:
-            break;
-        case CLN_SOFT:
-            break;
-        }
-        */
-
-        return KhompPvtR2::cleanup(type);
-    }
-
-    Transfer<CallFlash> * _transfer;
-};
-/******************************************************************************/
-/********************************* FSX Channel ********************************/
-struct KhompPvtFXS: public KhompPvt 
-{
-/********************************** FXS Call **********************************/
-    struct CallFXS : public Call
-    {
-        CallFXS() {}
-
-        bool process(std::string name, std::string value = "")
-        {
-            if (name == "ring")
-            {
-                Strings::vector_type ring_item;
-                Strings::tokenize (value, ring_item, ".");
-
-                if (ring_item.size() != 2)
-                {
-                    LOG(ERROR, FMT("invalid values on ring string: two numbers, dot separated, are needed."));
-                    return false;
-                }
-
-                try
-                {
-                    unsigned long int time_on = Strings::toulong (ring_item[0]);
-                    unsigned long int time_off = Strings::toulong (ring_item[1]);
-
-                    _ring_on = time_on;
-                    _ring_off = time_off;
-
-                    DBG(FUNC, D("ring values adjusted (%i,%i).") % time_on % time_off);
-                }
-                catch (...)
-                {
-                    LOG(ERROR, FMT("invalid number on ring string."));
-                }
-            }
-            else if (name == "ring_ext")
-            {
-                if (_ring_on == -1) // so ring was not set.
-                {
-                    LOG(ERROR, FMT("ring_ext only make sense if ring values are set."));
-                    return false;
-                }
-
-                Strings::vector_type ring_item;
-                Strings::tokenize (value, ring_item, ".");
-
-                if (ring_item.size() != 2)
-                {
-                    LOG(ERROR, FMT("invalid values on ring_ext string: two numbers, dot separated, are needed."));
-                    return false;
-                }
-
-                try
-                {
-                    unsigned long int time_on = Strings::toulong (ring_item[0]);
-                    unsigned long int time_off = Strings::toulong (ring_item[1]);
-
-                    _ring_on_ext = time_on;
-                    _ring_off_ext = time_off;
-
-                    DBG(FUNC, D("ring_ext values adjusted (%i,%i).") % time_on % time_off);
-                }
-                catch (...)
-                {
-                    LOG(ERROR, FMT("invalid number on ring_ext string."));
-                }
-            }
-            else if (name == "ring_cadence")
-            {
-                CadencesMapType::iterator i = Opt::_cadences.find(value);
-
-                if (i != Opt::_cadences.end())
-                {
-                    CadenceType cadence = (*i).second;
-
-                    _ring_on      = cadence.ring;
-                    _ring_off     = cadence.ring_s;
-                    _ring_on_ext  = cadence.ring_ext;
-                    _ring_off_ext = cadence.ring_ext_s;
-
-                    DBG(FUNC, D("cadence adjusted (%i,%i,%i,%i).") 
-                            % cadence.ring
-                            % cadence.ring_s 
-                            % cadence.ring_ext 
-                            % cadence.ring_ext_s);
-                }
-                else
-                {
-                    LOG(ERROR, FMT("unable to find cadence '%s'!") % value);
-                }
-            }
-            else
-            {            
-                return Call::process(name, value);
-            }
-
-            return true;
-        }
-        
-        bool clear()
-        {
-            _ring_on      = -1;
-            _ring_off     = -1;
-            _ring_on_ext  = -1;
-            _ring_off_ext = -1;
-
-            _incoming_exten.clear();
-            //_flash_transfer.clear();
-
-            //_uuid_other_session.clear();
- 
-            return Call::clear();
-        }
-
-        long int _ring_on;
-        long int _ring_off;
-        long int _ring_on_ext;
-        long int _ring_off_ext;
-
-        ChanTimer::Index _idx_dial;
-
-        std::string _incoming_exten;
-        
-        //ChanTimer::Index _idx_transfer;
-
-        //std::string _flash_transfer;
-        //std::string _uuid_other_session;
-        
-
-    };
-/******************************************************************************/
-    KhompPvtFXS(K3LAPIBase::GenericTarget & target) : KhompPvt(target)
-    {
-       //command(KHOMP_LOG,CM_ENABLE_CALL_ANSWER_INFO);
-       /* sequence numbers on FXS */
-       static OrigToNseqMapType fxs_nseq = generateNseqMap();
-
-       load(fxs_nseq);
-    }
-
-    ~KhompPvtFXS() {}
-
-    CallFXS * callFXS()
-    {
-        return (CallFXS *)call();
-    }
-
-    int makeCall(std::string params = "");
-    bool doChannelAnswer(CommandRequest &);
-    bool doChannelHangup(CommandRequest &);
-   
-    bool onChannelRelease(K3L_EVENT *e);
-    bool onSeizureStart(K3L_EVENT *);
-    bool onCallSuccess(K3L_EVENT *);
-    bool onDtmfDetected(K3L_EVENT *);
-    //bool onDtmfSendFinish(K3L_EVENT *);
-    bool onFlashDetected(K3L_EVENT *);
-    
-    virtual bool eventHandler(K3L_EVENT *e)
-    {
-        DBG(STRM, D("(FXS) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-            case EV_CHANNEL_FREE:
-            case EV_CHANNEL_FAIL:
-                ret = onChannelRelease(e);
-                break;
-            case EV_SEIZURE_START:
-                ret = onSeizureStart(e);                
-                break;
-            case EV_CALL_SUCCESS:
-                ret = onCallSuccess(e);
-                break;
-            case EV_DTMF_DETECTED:
-            case EV_PULSE_DETECTED:
-                ret = onDtmfDetected(e);
-                break;
-            /*
-            case EV_DTMF_SEND_FINISH:
-                ret = onDtmfSendFinish(e);
-                break;
-            */
-            case EV_FLASH:
-                ret = onFlashDetected(e);
-                break;
-            default:
-                ret = KhompPvt::eventHandler(e);
-                break;
-        }        
-
-        DBG(STRM, D("(FXS) r"));
-
-        return ret;
-    }
-
-    bool setupConnection();
-    void load(OrigToNseqMapType & fxs_nseq);
-    void loadOptions();
-    bool parseBranchOptions(std::string options_str);
-    bool alloc();
-    bool indicateBusyUnlocked(int cause, bool sent_signaling = false);
-    void reportFailToReceive(int fail_code);
-    bool validContexts(MatchExtension::ContextListType & contexts, 
-                       std::string extra_context = "");
-    bool isOK(void);
-
-    //bool startTransfer();
-    //bool stopTransfer();
-    //bool transfer(std::string & context, bool blind = false);
-
-    bool hasNumberDial() { return false; }
-    
-    bool isPhysicalFree() 
-    {
-        K3L_CHANNEL_STATUS status;
-
-        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
-            return false; 
-
-        bool physically_free = (status.AddInfo == kfxsOnHook);
-
-        if(status.CallStatus != kcsFree || !physically_free)
-        {
-            DBG(FUNC, PVT_FMT(_target, "call status not free, or not physically free!"));
-            return false;
-        }
-
-        return true;
-    }
-    
-    virtual bool cleanup(CleanupType type = CLN_HARD)
-    {
-        callFXS()->_flags.clear(Kflags::FXS_DIAL_ONGOING);
-        callFXS()->_flags.clear(Kflags::FXS_DIAL_FINISHD);
-        callFXS()->_flags.clear(Kflags::FXS_FLASH_TRANSFER);
-
-        switch (type)
-        {
-        case CLN_HARD:
-        case CLN_FAIL:
-            callFXS()->_flags.clear(Kflags::FXS_OFFHOOK);        
-            break;
-        case CLN_SOFT:
-            break;
-        }
-
-        return KhompPvt::cleanup(type);
-    }
-
-    
-    /* number based on fxs-global-orig */
-    std::string _fxs_fisical_addr; 
-    /* the branch number, possibly the new calleridnum */
-    std::string _fxs_orig_addr; 
-    std::string _calleridname;
-    int         _amaflags;
-    std::string _callgroup;
-    std::string _pickupgroup;
-    std::string _context;
-    int         _input_volume;
-    int         _output_volume;
-    std::string _mailbox;
-    std::string _flash;
-
-    static OrigToNseqMapType generateNseqMap();
-    static void dialTimer(KhompPvt * pvt);
-    //static void transferTimer(KhompPvt * pvt);
-
-    static std::string padOrig(std::string orig_base, unsigned int padding)
-    {
-        unsigned int orig_size = orig_base.size();
-        unsigned int orig_numb = 0;
-
-        try
-        {
-            orig_numb = Strings::toulong(orig_base);
-        }
-        catch(Strings::invalid_value & e)
-        {
-            LOG(ERROR, D("invalid numeric value: %s") % e.value());
-        }
-
-        return STG(FMT(STG(FMT("%%0%dd") % orig_size)) % (orig_numb + padding));
-    }
-
-    void cleanupIndications(bool force)
-    {
-        if (call()->_indication == INDICA_BUSY && !force)
-        {
-            DBG(FUNC, PVT_FMT(_target, "skipping busy indication cleanup on FXS channel."));
-            return;
-        }
-
-        KhompPvt::cleanupIndications(force);
-    }
-};
-/******************************************************************************/
-/******************************************************************************/
-    BoardE1(int id) : Board(id) {}
-
-    void initializeChannels(void)
-    {
-        LOG(MESSAGE, "(E1) loading channels ...");
-
-        for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
-        {
-            K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
-            KhompPvt * pvt;
-
-            switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
-            {
-            CASE_RDSI_SIG:
-                pvt = new BoardE1::KhompPvtISDN(tgt);
-                pvt->_call = new BoardE1::KhompPvtISDN::CallISDN();
-                DBG(FUNC, "(E1) ISDN channel");
-                break;
-            CASE_R2_SIG:
-                pvt = new BoardE1::KhompPvtR2(tgt);
-                pvt->_call = new BoardE1::KhompPvtR2::CallR2();
-                pvt->command(KHOMP_LOG, CM_DISCONNECT);
-                DBG(FUNC, "(E1) R2 channel");
-                break;
-            CASE_FLASH_GRP:
-                pvt = new BoardE1::KhompPvtFlash(tgt);
-                pvt->_call = new BoardE1::KhompPvtFlash::CallFlash();
-                pvt->command(KHOMP_LOG, CM_DISCONNECT);
-                DBG(FUNC, "(E1) \"Flash\" channel");
-                break;
-            case ksigAnalogTerminal:
-                pvt = new BoardE1::KhompPvtFXS(tgt);
-                pvt->_call = new BoardE1::KhompPvtFXS::CallFXS();
-                DBG(FUNC, "(E1) FXS channel");
-                break;
-            default:
-                pvt = new Board::KhompPvt(tgt);
-                pvt->_call = new Board::KhompPvt::Call();
-                DBG(FUNC, FMT("(E1) signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
-                break;
-            }
-
-            _channels.push_back(pvt);
-
-            pvt->cleanup();
-
-        }
-    }
-
-    bool onLinkStatus(K3L_EVENT *e);
-
-    virtual bool eventHandler(const int obj, K3L_EVENT *e)
-    {
-        DBG(STRM, D("(E1 Board) c"));
-
-        int ret = true;
-
-        switch(e->Code)
-        {
-        case EV_LINK_STATUS:
-        case EV_PHYSICAL_LINK_DOWN:
-        case EV_PHYSICAL_LINK_UP:
-
-            if (K::Logger::Logg.classe(C_LINK_STT).enabled() || K::Logger::Logg.classe(C_EVENT).enabled())
-            {    
-                std::string msg = Globals::verbose.event (obj, e) + "."; 
-                LOG(LINK_STT, msg);
-            }            
-
-            ret = onLinkStatus(e);
-            break;
-        default:
-            ret = Board::eventHandler(obj, e);
-            break;
-        }
-
-        DBG(STRM, D("(E1 Board) r"));
-
-        return ret;
-    }
-   
-};
-/******************************************************************************/
-/******************************************************************************/
-/******************************************************************************/
-#endif /* _KHOMP_PVT_H_*/
-
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h
deleted file mode 100644
index 1fa23cd3ec..0000000000
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _KHOMP_PVT_PASSIVE_H_
-#define _KHOMP_PVT_PASSIVE_H_
-
-#include "khomp_pvt.h"
-#include "applications.h"
-
-/******************************************************************************/
-/******************************** Passive Board *******************************/
-/******************************************************************************/
-struct BoardPassive: public Board
-{
-/******************************************************************************/
-/******************************** Passive Channel *****************************/
-struct KhompPvtPassive: public KhompPvt 
-{
-/******************************** Passive Call ********************************/
-/*
-    struct CallPassive : public Call
-    {
-        CallPassive() {}
-
-        bool process(std::string name, std::string value = "")
-        {
-            }
-            else
-            {            
-                return Call::process(name, value);
-            }
-
-            return true;
-        }
-        
-        bool clear()
-        {
-            return Call::clear();
-        }
-
-    };
-*/
-/******************************************************************************/
-    KhompPvtPassive(K3LAPIBase::GenericTarget & target) : KhompPvt(target) 
-    {
-    }
-
-    ~KhompPvtPassive() 
-    {
-    }
-/*    
-    CallPassive * callPassive()
-    {
-        return (CallPassive *)call();
-    }
-*/
-    
-    virtual bool eventHandler(K3L_EVENT *e)
-    {
-        DBG(STRM, D("(Passive) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-            case EV_CHANNEL_FREE:
-            case EV_CHANNEL_FAIL:
-                ret = onChannelRelease(e);
-                break;
-/*
-            case EV_CALL_SUCCESS:
-            case EV_CALL_FAIL:
-            case EV_PULSE_DETECTED:
-*/
-            case EV_DISCONNECT:
-            case EV_DTMF_DETECTED:
-            case EV_AUDIO_STATUS:
-                break;
-            default:
-                ret = true;
-                break;
-        }
-
-        DBG(STRM, D("(Passive) r"));
-
-        return ret;
-    }
-    
-    bool validContexts(MatchExtension::ContextListType & contexts, 
-                       std::string extra_context = "");
-
-/*
-    virtual bool cleanup(CleanupType type = CLN_HARD)
-    {
-        switch (type)
-        {
-        case CLN_HARD:
-        case CLN_FAIL:
-            break;
-        case CLN_SOFT:
-            break;
-        }
-
-        return KhompPvt::cleanup(type);
-    }
-*/
-
-};
-/******************************************************************************/
-/********************************** HI Channel ********************************/
-struct KhompPvtHI: public KhompPvtPassive
-{
-    KhompPvtHI(K3LAPIBase::GenericTarget & target) : KhompPvtPassive(target) 
-    {
-    }
-
-    ~KhompPvtHI() 
-    {
-    }
-    
-    bool onSeizureStart(K3L_EVENT *e);
-
-    virtual bool eventHandler(K3L_EVENT *e)
-    {
-        DBG(STRM, D("(HI) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-            case EV_SEIZURE_START:
-                ret = onSeizureStart(e);
-                break;
-            case EV_RING_DETECTED:
-            case EV_POLARITY_REVERSAL:
-                break;
-            default:
-                ret = KhompPvtPassive::eventHandler(e);
-                break;
-        }
-
-        DBG(STRM, D("(HI) r"));
-
-        return ret;
-    }
-
-};
-/******************************************************************************/
-/********************************* KPR Channel ********************************/
-struct KhompPvtKPR: public KhompPvtPassive
-{
-    KhompPvtKPR(K3LAPIBase::GenericTarget & target) : KhompPvtPassive(target) 
-    {
-    }
-
-    ~KhompPvtKPR() 
-    {
-    }
-    
-    bool onNewCall(K3L_EVENT *e);
-/*
-    bool onConnect(K3L_EVENT *e);
-*/
-
-    virtual bool eventHandler(K3L_EVENT *e)
-    {
-        DBG(STRM, D("(KPR) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-            case EV_NEW_CALL:
-                ret = onNewCall(e);
-                break;
-            case EV_CONNECT:
-                break;
-            case EV_SEIZURE_START:
-            case EV_CAS_MFC_RECV:
-            case EV_CAS_LINE_STT_CHANGED:
-            case EV_LINK_STATUS:
-                break;
-            default:
-                ret = KhompPvtPassive::eventHandler(e);
-                break;
-        }
-
-        DBG(STRM, D("(KPR) r"));
-
-        return ret;
-    }
-
-    bool obtainBoth();
-
-};
-/******************************************************************************/
-/******************************************************************************/
-    BoardPassive(int id) : Board(id) {}
-
-    void initializeChannels(void)
-    {
-        LOG(MESSAGE, "(Passive) loading channels ...");
-
-        for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
-        {
-            K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
-            KhompPvt * pvt;
-
-            switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
-            {
-            case ksigAnalog:
-                pvt = new BoardPassive::KhompPvtHI(tgt);
-                pvt->_call = new BoardPassive::KhompPvtHI::Call();
-                DBG(FUNC, "(Passive) HI channel");
-                break;
-            CASE_RDSI_SIG:
-            CASE_R2_SIG:
-            CASE_FLASH_GRP:
-            case ksigAnalogTerminal:
-                pvt = new BoardPassive::KhompPvtKPR(tgt);
-                pvt->_call = new BoardPassive::KhompPvtKPR::Call();
-                DBG(FUNC, "(Passive) KPR channel");
-                break;
-            default:
-                pvt = new Board::KhompPvt(tgt);
-                pvt->_call = new Board::KhompPvt::Call();
-                DBG(FUNC, FMT("(Passive) signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
-                break;
-            }
-
-            _channels.push_back(pvt);
-
-            pvt->cleanup();
-
-        }
-    }
-
-    /*
-    virtual bool eventHandler(const int obj, K3L_EVENT *e)
-    {
-        DBG(STRM, D("(Passive Board) c"));
-
-        bool ret = true;
-
-        switch(e->Code)
-        {
-        case :
-            break;
-        default:
-            ret = Board::eventHandler(obj, e);
-            break;
-        }
-
-        DBG(STRM, D("(Passive Board) r"));
-
-        return ret;
-    }
-    */
-   
-};
-/******************************************************************************/
-/******************************************************************************/
-/******************************************************************************/
-#endif /* _KHOMP_PVT_PASSIVE_H_*/
-
diff --git a/src/mod/endpoints/mod_khomp/include/lock.h b/src/mod/endpoints/mod_khomp/include/lock.h
deleted file mode 100644
index 621b724d72..0000000000
--- a/src/mod/endpoints/mod_khomp/include/lock.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef CHAN_LOCK_H
-#define CHAN_LOCK_H
-
-#include <scoped_lock.hpp>
-#include "khomp_pvt.h"
-
-
-struct ScopedLockFailed
-{
-    typedef enum { NULL_PVT, NULL_SOFT_CHAN, FAILED, ALLOC_FAILED } FailType;
-
-    ScopedLockFailed(FailType fail, std::string msg)
-    : _fail(fail), _msg(msg) {};
-
-    FailType    _fail;
-    std::string _msg;
-};
-
-
-struct ScopedPvtLock: public ScopedLockBasic
-{
-    typedef Board::KhompPvt KhompPvt;
-
-    ScopedPvtLock(KhompPvt * pvt);
-    ~ScopedPvtLock();
-
-    void unlock();
-
- protected:
-    KhompPvt * _pvt;
-};
-
-
-struct ScopedAllocLock : public ScopedLockBasic
-{
-    ScopedAllocLock();
-    ~ScopedAllocLock();
-
-    void unlock();
-
-};
-
-#endif /* CHAN_LOCK_H */
diff --git a/src/mod/endpoints/mod_khomp/include/logger.h b/src/mod/endpoints/mod_khomp/include/logger.h
deleted file mode 100644
index 554a48de6d..0000000000
--- a/src/mod/endpoints/mod_khomp/include/logger.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _Logger_H_
-#define _Logger_H_
-
-#include <switch.h>
-#include <string>
-#include <simple_lock.hpp>
-#include <logger.hpp>
-#include <configurator/configfile.hpp>
-#include <klog-config.hpp>
-#include "defs.h"
-#include "format.hpp"
-
-namespace K
-{
-    struct LogConfig
-    {
-        static bool set(Logfile &, const char *, const char *, bool);
-        static bool commit(Logfile &);
-    };
-
-    struct SwitchConsoleLog {}; 
-
-    struct SwitchPrinter: public Logger::DefaultPrinter
-    {
-        typedef Logger::DefaultPrinter Super;
-        typedef Tagged::Union < std::ostream *, Tagged::Union < int, Tagged::Union < SwitchConsoleLog > > > BaseType;
-
-        SwitchPrinter(std::string & msg): Super(msg) {}; 
-
-        using Super::operator();
-
-        bool operator()(const SwitchConsoleLog & ignored)
-        {   
-            switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN,SWITCH_LOG_CONSOLE,"%s",_msg.c_str());
-            return true;
-        };  
-    };
-
-    /* Log manager declaration. */
-    typedef Logger::Manager <class_type, output_type, SwitchPrinter, SimpleLock>  LogManager;
-
-    /* Forward declaration */
-    struct LogInternalManager; 
-
-    struct Logger
-    {
-        /* Logger instance. */
-        static LogManager Logg;
-
-        /* Util Logger instance. */
-        static LogInternalManager Logg2;
-
-        static bool start();
-        static void stop();
-        static bool rotate();
-        static void processLogConsole(switch_stream_handle_t *s, const std::string options, bool invert, bool unique);
-        static void processLogDisk(switch_stream_handle_t *s, const std::string options, bool invert, bool unique);
-
-    private:
-        static std::string     base_path;
-        static std::ofstream   generic_file;
-    };
-
-    /* Internal logging facility declaration */
-    struct LogInternalManager
-    {
-        bool operator()(class_type classe, switch_stream_handle_t *stream, const char *args)
-        {
-            switch (classe)
-            {
-                case C_CLI:
-                    stream->write_function(stream,"%s\n",args);
-                    return true;
-                default:
-                    return K::Logger::Logg(classe, args);
-            }
-        }
-        
-        bool operator()(class_type classe, switch_stream_handle_t *stream, Format &fmt)
-        {
-            return K::Logger::Logg2(classe,stream,(char*) STR(fmt));
-        }
-
-        bool operator()(class_type classe, switch_stream_handle_t *stream, const char *fmt, const char *args)
-        {
-            switch (classe)
-            {
-                case C_CLI:
-                    stream->write_function(stream,fmt,args); 
-                    return true;
-                default:
-                    return K::Logger::Logg(classe, FMT(fmt) % args);
-            }
-        }
-    };
-};
-
-#endif /* _Logger_H_ */
diff --git a/src/mod/endpoints/mod_khomp/include/opt.h b/src/mod/endpoints/mod_khomp/include/opt.h
deleted file mode 100644
index 4bc65361a6..0000000000
--- a/src/mod/endpoints/mod_khomp/include/opt.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _OPT_H_
-#define _OPT_H_
-
-#include <string>
-#include <map>
-#include <vector>
-
-#include <config_options.hpp>
-
-#include "switch.h"
-#include "utils.h"
-
-typedef std::map    < std::string, std::string >       OrigToDestMapType;
-typedef std::pair   < std::string, std::string >      OrigToDestPairType;
-typedef std::vector < std::string >                       DestVectorType;
-
-typedef std::map    < unsigned int, std::string >     BoardToOrigMapType;
-typedef std::pair   < unsigned int, std::string >    BoardToOrigPairType;
-
-typedef std::map    < std::string, unsigned int >      OrigToNseqMapType;
-typedef std::pair   < std::string, unsigned int >     OrigToNseqPairType;
-
-typedef std::pair   < unsigned int,unsigned int >           ObjectIdType;
-typedef std::pair   < std::string, ObjectIdType > BranchToObjectPairType;
-typedef std::map    < std::string, ObjectIdType >  BranchToObjectMapType;
-
-typedef std::map    < std::string, std::string >      BranchToOptMapType;
-typedef std::pair   < std::string, std::string >     BranchToOptPairType;
-
-typedef std::map    < std::string, std::string >      GroupToDestMapType;
-typedef std::pair   < std::string, std::string >     GroupToDestPairType;
-
-struct CadenceType
-{
-    CadenceType(void)
-    : ring(0), ring_s(0), ring_ext(0), ring_ext_s(0) {};
-
-    CadenceType(unsigned int _ring, unsigned int _ring_s)
-    : ring(_ring), ring_s(_ring_s), ring_ext(0), ring_ext_s(0) {};
-
-    CadenceType(unsigned int _ring, unsigned int _ring_s, unsigned int _ring_ext, unsigned int _ring_ext_s)
-    : ring(_ring), ring_s(_ring_s), ring_ext(_ring_ext), ring_ext_s(_ring_ext_s) {};
-
-    unsigned int ring;
-    unsigned int ring_s;
-    unsigned int ring_ext;
-    unsigned int ring_ext_s;
-};
-
-typedef std::pair < std::string, CadenceType > CadencesPairType;
-typedef std::map  < std::string, CadenceType >  CadencesMapType;
-
-struct Options
-{
-    Config::Value< bool >        _debug;
-    Config::Value< std::string > _dialplan;
-    Config::Value< std::string > _context;
-    
-    Config::Value< bool > _echo_canceller;
-    Config::Value< bool > _auto_gain_control;
-    Config::Value< bool > _out_of_band_dtmfs;
-    Config::Value< bool > _suppression_delay;
-    Config::Value< bool > _pulse_forwarding;
-    Config::Value< bool > _native_bridge;
-    Config::Value< bool > _recording;
-    Config::Value< bool > _has_ctbus;
-    Config::Value< bool > _fxs_bina;
-    Config::Value< bool > _fxs_sharp_dial;
-    Config::Value< bool > _drop_collect_call;
-    Config::Value< bool > _ignore_letter_dtmfs;
-    Config::Value< bool > _optimize_audio_path;
-    
-    Config::Value< bool > _fxo_send_pre_audio;
-    Config::Value< unsigned int > _fxo_busy_disconnection;
-
-    Config::Value< bool         > _auto_fax_adjustment;
-    Config::Value< unsigned int > _fax_adjustment_timeout;
-
-    Config::Value< bool         > _r2_strict_behaviour;
-    Config::Value< unsigned int > _r2_preconnect_wait;
-
-    Config::Value< unsigned int > _fxs_digit_timeout;
-    Config::Value< unsigned int > _transferdigittimeout;
-
-    Config::Value< std::string > _flash;
-    Config::Value< std::string > _blindxfer;
-    Config::Value< std::string > _atxfer;
-
-    Config::Value< unsigned int > _ringback_co_delay;
-    Config::Value< unsigned int > _ringback_pbx_delay;
-
-    Config::Value< unsigned int > _disconnect_delay;
-
-    Config::Value< int > _input_volume;
-    Config::Value< int > _output_volume;
-
-    struct CentralOfficeDialtone : public Config::FunctionValue
-    {   
-        void operator ()(const Config::StringType &); 
-        const DestVectorType & operator()(void) const { return _value; };
-        void clear(void)
-        {   
-            _value.clear();
-        }   
-
-    protected:
-        DestVectorType _value;
-    } _fxs_co_dialtone;
-
-    struct LogDiskOption : public Config::FunctionValue
-    {
-        void operator ()(const Config::StringType &);
-    } _log_disk_option;
-
-    /*
-    struct CallGroupOption: public Config::FunctionValue
-    {   
-        void operator ()(const Config::StringType &); 
-        const std::string operator()(void) const { return _groups; };
-    protected:
-        std::string _groups;
-    } _callgroup;
-
-    struct PickupGroupOption: public Config::FunctionValue
-    { 
-        void operator ()(const Config::StringType &); 
-        const std::string operator()(void) const { return _groups; };
-    protected:
-        std::string _groups;
-    } _pickupgroup; // or intercept 
-    */
-
-    struct LogConsoleOption : public Config::FunctionValue
-    {
-        void operator ()(const Config::StringType &);
-    } _log_console_option;
-
-    struct LogTraceOption : public Config::FunctionValue
-    {
-        void operator ()(const Config::StringType &);
-    } _log_trace_option;
-
-    struct RecordPrefixOption: public Config::FunctionValue
-    {   
-        void operator ()(const Config::StringType &); 
-        const std::string & operator()(void) const { return _value; };
-
-    protected:
-        std::string _value;
-    } _record_prefix;
-
-    Config::Value< std::string > _user_xfer_digits;
-    Config::Value< std::string > _fxs_global_orig_base;
-
-    Config::Value< std::string > _global_mohclass;
-    Config::Value< std::string > _global_language;
-
-    Config::Value< std::string > _context_gsm_call;
-    Config::Value< std::string > _context2_gsm_call;
-    Config::Value< std::string > _context_gsm_sms;
-    Config::Value< std::string > _context_fxo;
-    Config::Value< std::string > _context2_fxo;
-    Config::Value< std::string > _context_fxs;
-    Config::Value< std::string > _context2_fxs;
-    Config::Value< std::string > _context_digital;
-    Config::Value< std::string > _context_pr;
-
-    Config::Value< std::string > _callgroup;
-    Config::Value< std::string > _pickupgroup; /* or intercept */
-    Config::Value< std::string > _accountcode;
-    
-    Config::Value< unsigned int > _kommuter_timeout;
-    Config::Value< std::string  > _kommuter_activation;
-
-    Config::Value< unsigned int > _audio_packet_size;
-};
-
-struct Opt
-{
-    /* here we load [cadences] */
-    static CadencesMapType        _cadences;
-
-    /* here we load [groups] */
-    static GroupToDestMapType     _groups;
-
-    /* here we load [fxs-hotlines] */
-    static OrigToDestMapType      _fxs_hotline;
-
-    /* here we load [fxs-branches] */
-    static BoardToOrigMapType     _fxs_orig_base;
-
-    /* here we load [fxs-options] */
-    static BranchToOptMapType     _branch_options;
-
-    /* here we load ... hannnn */
-    static BranchToObjectMapType  _fxs_branch_map;
-
-    static Options _options;
-
-    /* Member functions */
-    static void initialize(void);
-    static void obtain(void);
-    static void commit(void);
-
-    //TODO: reload options at reloadxml ?
-    static void reload(void); 
-
-    protected:
-    static void loadConfiguration(const char *, const char **, bool show_errors = true);
-    static void cleanConfiguration(void);
-
-    static switch_xml_t processSimpleXML(switch_xml_t &xml, const std::string& child_name);
-    static void processGroupXML(switch_xml_t &xml);
-    static void processCadenceXML(switch_xml_t &xml);
-    static void processFXSBranchesXML(switch_xml_t &xml);
-    static void processFXSHotlines(switch_xml_t &xml);
-    static void processFXSOptions(switch_xml_t &xml);
-};
-
-
-
-#endif /* _OPT_H_ */
-
diff --git a/src/mod/endpoints/mod_khomp/include/revision.h b/src/mod/endpoints/mod_khomp/include/revision.h
deleted file mode 100644
index 717124dda9..0000000000
--- a/src/mod/endpoints/mod_khomp/include/revision.h
+++ /dev/null
@@ -1 +0,0 @@
-#define MOD_KHOMP_VERSION "1.0 - (rev: 6034)"
diff --git a/src/mod/endpoints/mod_khomp/include/spec.h b/src/mod/endpoints/mod_khomp/include/spec.h
deleted file mode 100644
index cf788f646f..0000000000
--- a/src/mod/endpoints/mod_khomp/include/spec.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _SPEC_HPP_
-#define _SPEC_HPP_
-
-#include <function.hpp>
-#include "khomp_pvt.h"
-
-typedef enum
-{
-    SPR_CONTINUE,
-    SPR_SUCCESS,
-    SPR_FAIL,
-}
-SpecRetType;
-
-typedef enum
-{
-    SPF_FIRST  = 0x01,
-    SPF_CYCLIC = 0x02,
-}
-SpecFlagType;
-
-typedef unsigned int SpecFlagsType;
-typedef Function::Function3 < bool, unsigned int, unsigned int, SpecFlagsType & > SpecFunType;
-
-/* Request a Board::KhompPvt based on dialplan string.
-
--- Format of dialplan string. --
-
-Dial(Khomp/B2C58/4832625644)
- |      |    |       |
- |      |    |       |
- |      |    |       |
- |      |    |       +- Destination number.
- |      |    |
- |      |    +- Identifier for board 2, channel 58.
- |      |
- |      +- Khomp channel identifier.
- |
- +- Dial Application.
-*/
-
-Board::KhompPvt * processDialString(const char *, int *);
-void processGroupString();
-
-Board::KhompPvt * processSMSString(const char *, int *);
-
-#endif /* _SPEC_HPP_ */
-
diff --git a/src/mod/endpoints/mod_khomp/include/utils.h b/src/mod/endpoints/mod_khomp/include/utils.h
deleted file mode 100644
index 0c59241168..0000000000
--- a/src/mod/endpoints/mod_khomp/include/utils.h
+++ /dev/null
@@ -1,783 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License 
-  Version 1.1 (the "License"); you may not use this file except in compliance 
-  with the License. You may obtain a copy of the License at 
-  http://www.mozilla.org/MPL/ 
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file 
-  under the MPL, indicate your decision by deleting the provisions above and 
-  replace them with the notice and other provisions required by the LGPL 
-  License. If you do not delete the provisions above, a recipient may use your 
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#ifndef _UTILS_H_
-#define _UTILS_H_
-
-#include <bitset>
-#include <refcounter.hpp>
-#include <ringbuffer.hpp>
-#include <simple_lock.hpp>
-#include <saved_condition.hpp>
-#include <thread.hpp>
-#include "globals.h"
-#include "logger.h"
-#include "defs.h"
-
-/******************************************************************************/
-/************************** Defining applications *****************************/
-
-typedef enum
-{
-    FAX_ADJUST,
-    FAX_SEND,
-    FAX_RECEIVE,
-    USER_TRANSFER,
-    SMS_CHECK,
-    SMS_SEND,
-    SELECT_SIM_CARD,
-}
-ApplicationType;
-
-/******************************************************************************/
-/***************** Abstraction for defining channel flags *********************/
-
-struct Kflags
-{
-    typedef enum
-    {
-        CONNECTED = 0,
-        REALLY_CONNECTED,
-
-        IS_OUTGOING,
-        IS_INCOMING,
-
-        STREAM_UP,
-        LISTEN_UP,
-
-        GEN_CO_RING,
-        GEN_PBX_RING,
-
-        HAS_PRE_AUDIO,
-        HAS_CALL_FAIL,
-
-        DROP_COLLECT,
-
-        NEEDS_RINGBACK_CMD, //R2
-        EARLY_RINGBACK, //FXO
-
-        FAX_DETECTED, //Digital, FXO
-        FAX_SENDING, //Digital, FXO
-        FAX_RECEIVING, //Digital, FXO
-
-        OUT_OF_BAND_DTMFS,
-
-        KEEP_DTMF_SUPPRESSION,
-        KEEP_ECHO_CANCELLATION,
-        KEEP_AUTO_GAIN_CONTROL,
-
-        WAIT_SEND_DTMF,
-
-        CALL_WAIT_SEIZE, //FXO
-
-        NUMBER_DIAL_FINISHD, //R2
-        NUMBER_DIAL_ONGOING, //R2
-
-        FXS_OFFHOOK, //FXS
-        FXS_DIAL_FINISHD, //FXS
-        FXS_DIAL_ONGOING, //FXS
-        FXS_FLASH_TRANSFER, //FXS
-
-        XFER_QSIG_DIALING, //ISDN
-        XFER_DIALING, //ISDN, FXO
-
-        SMS_DOING_UPLOAD, //GSM
-
-        /*
-        NOW LOADING ...
-
-        BRIDGED,
-        */
-
-        /* Do not remove this last FLAG */
-        INVALID_FLAG
-    }
-    FlagType;
-
-    struct Flag
-    {        
-        const char *_name;
-        bool _value;
-    };
-
-    Kflags() { init(); };
-
-    void init();
-
-    inline const char * name(FlagType bit) { return _flags[bit]._name; }
-
-    inline bool check(FlagType bit) 
-    {
-#ifdef DEBUG_FLAGS
-        DBG(FUNC, D("Flag %s=%s") % name(bit) % 
-                (_flags[bit]._value ? "TRUE" : "FALSE"));
-#endif
-        return _flags[bit]._value;
-    }
-
-    inline void set(FlagType bit)
-    {
-#ifdef DEBUG_FLAGS
-        DBG(FUNC, D("Flag %s") % name(bit));
-#endif
-        _flags[bit]._value = true;
-    }
-
-    inline void clear(FlagType bit)
-    { 
-#ifdef DEBUG_FLAGS
-        DBG(FUNC, D("Flag %s") % name(bit));
-#endif
-        _flags[bit]._value = false;
-    }
-
-    inline void clearAll()
-    {
-        unsigned int index = 0;
-        for(; (FlagType)index < INVALID_FLAG; index++)
-        {
-            if(_flags[index]._value)
-            {
-                DBG(FUNC, D("Flag %s was not clean!") % name((FlagType)index));
-                clear((FlagType)index);
-            }
-        }
-    }
-
- protected:
-    Flag _flags[INVALID_FLAG+1];
-};
-
-/******************************************************************************/
-/************************* Commands and Events Handler ************************/
-struct CommandRequest
-{
-    typedef enum
-    {
-        NONE = 0,
-        COMMAND,
-        ACTION
-    }
-    ReqType;
-
-    typedef enum
-    {
-        CNONE = 0,
-
-        /* Commands */
-        CMD_CALL,
-        CMD_ANSWER,
-        CMD_HANGUP,
-        
-        /* Actions */
-        FLUSH_REC_STREAM,
-        FLUSH_REC_BRIDGE,
-        START_RECORD,
-        STOP_RECORD
-
-    }
-    CodeType;
-
-    typedef enum
-    {
-        RFA_CLOSE,
-        RFA_KEEP_OPEN,
-        RFA_REMOVE
-    }
-    RecFlagType;
-
-    /* "empty" constructor */
-    CommandRequest() : 
-        _type(NONE),
-        _code(CNONE),
-        _obj(-1)
-    {}
-
-    CommandRequest(ReqType type, CodeType code, int obj) : 
-            _type(type),
-            _code(code),
-            _obj(obj)
-    {}
-
-    CommandRequest(const CommandRequest & cmd) : 
-            _type(cmd._type), 
-            _code(cmd._code), 
-            _obj(cmd._obj) 
-    {}
-
-    ~CommandRequest() {}
-
-    void operator=(const CommandRequest & cmd)
-    {
-        _type = cmd._type;
-        _code = cmd._code;
-        _obj = cmd._obj;
-    }
-
-    void mirror(const CommandRequest & cmd_request)
-    {
-        _type = cmd_request._type;
-        _code = cmd_request._code;
-        _obj = cmd_request._obj;
-    }
-
-    short type() { return _type; }
-    
-    short code() { return _code; }
-
-    int obj() { return _obj; }
-
-private:
-    short _type;
-    short _code;
-    int   _obj;
-};
-
-struct EventRequest
-{
-    /* "empty" constructor */
-    EventRequest(bool can_delete = true) : 
-        _delete(can_delete), 
-        _obj(-1)
-    {
-        if(can_delete)
-            _event = new K3L_EVENT();
-    }
-
-    /* Temporary constructor */
-    EventRequest(int obj, K3L_EVENT * ev) :
-            _delete(false),
-            _obj(obj),
-            _event(ev)
-    {}
-    
-    //EventRequest(const EventRequest & ev) : _obj(ev._obj) {}
-
-    ~EventRequest()
-    {
-
-        if(!_delete || !_event)
-            return;
-
-        if(_event->ParamSize)
-            free(_event->Params);
-
-        delete _event;
-    }
-
-    void operator=(const EventRequest & ev)
-    {
-        _delete = false;
-        _obj = ev._obj;
-        _event = ev._event;
-
-    }
-
-    void mirror(const EventRequest & ev_request)
-    {
-        //Checar o _event
-
-        if(_event->ParamSize)
-        {
-            free(_event->Params);
-        }
-
-        _event->Params = NULL;
-
-        _obj = ev_request._obj;
-
-        K3L_EVENT * ev     = ev_request._event;
-
-        if(!ev)
-        {
-            clearEvent();
-            return;
-        }
-
-        _event->Code       = ev->Code;       // API code
-        _event->AddInfo    = ev->AddInfo;    // Parameter 1
-        _event->DeviceId   = ev->DeviceId;   // Hardware information
-        _event->ObjectInfo = ev->ObjectInfo; // Additional object information
-        _event->ParamSize  = ev->ParamSize;  // Size of parameter buffer
-        _event->ObjectId   = ev->ObjectId;   // KEventObjectId: Event thrower object id
-
-        if(ev->ParamSize)
-        {
-            // Pointer to the parameter buffer
-            _event->Params = malloc(ev->ParamSize+1);
-            memcpy(_event->Params, ev->Params, ev->ParamSize);
-            ((char *)(_event->Params))[ev->ParamSize] = 0;
-        }
-    }
-
-    bool clearEvent()
-    {
-        _event->Code       = -1;
-        _event->AddInfo    = -1;
-        _event->DeviceId   = -1;
-        _event->ObjectInfo = -1;
-        _event->ParamSize  = 0;
-        _event->ObjectId   = -1;
-    }
-
-    int obj() { return _obj; }
-
-    K3L_EVENT * event() { return _event; }
-
-
-private:
-    bool        _delete;
-    int         _obj;
-    K3L_EVENT * _event;
-};
-
-template < typename R, int S >
-struct GenericFifo
-{
-    typedef R RequestType;
-    typedef SimpleNonBlockLock<25,100>  LockType;
-
-    GenericFifo(int device) : 
-            _device(device), 
-            _shutdown(false), 
-            _buffer(S), 
-            _mutex(Globals::module_pool), 
-            _cond(Globals::module_pool)
-    {};
-
-    int                         _device;
-    bool                        _shutdown;
-    Ringbuffer < RequestType >  _buffer;
-    LockType                    _mutex; /* to sync write acess to event list */
-    SavedCondition              _cond;
-    Thread                     *_thread;
-
-};
-
-typedef GenericFifo < CommandRequest, 250 > CommandFifo;
-typedef GenericFifo < EventRequest, 500 >   EventFifo;
-
-/* Used inside KhompPvt to represent an command handler */
-struct ChanCommandHandler: NEW_REFCOUNTER(ChanCommandHandler)
-{
-    typedef int (HandlerType)(void *);
-
-    ChanCommandHandler(int device, HandlerType * handler)
-    {
-        _fifo = new CommandFifo(device);
-        /* device event handler */
-        _fifo->_thread = new Thread(handler, (void *)this, Globals::module_pool);
-        if(_fifo->_thread->start())
-        {
-            DBG(FUNC,"Device command handler started");
-        }
-        else
-        {
-            LOG(ERROR, "Device command handler error");
-        }
-    }
-
-    ChanCommandHandler(const ChanCommandHandler & cmd)
-    : INC_REFCOUNTER(cmd, ChanCommandHandler),
-      _fifo(cmd._fifo)
-    {};
-
-    void unreference();
-
-    CommandFifo * fifo()
-    {
-        return _fifo;
-    }
-
-    void signal()
-    {
-        _fifo->_cond.signal();
-    };
-
-    bool writeNoSignal(const CommandRequest &);
-    bool write(const CommandRequest &);
-
-protected:
-    CommandFifo * _fifo;
-};
-
-/* Used inside KhompPvt to represent an event handler */
-struct ChanEventHandler: NEW_REFCOUNTER(ChanEventHandler)
-{
-    typedef int (HandlerType)(void *);
-
-    ChanEventHandler(int device, HandlerType * handler)
-    {
-        _fifo = new EventFifo(device);
-        /* device event handler */
-        _fifo->_thread = new Thread(handler, (void *)this, Globals::module_pool);
-        if(_fifo->_thread->start())
-        {
-            DBG(FUNC,"Device event handler started");
-        }
-        else
-        {
-            LOG(ERROR, "Device event handler error");
-        }
-    }
-
-    ChanEventHandler(const ChanEventHandler & evt)
-    : INC_REFCOUNTER(evt, ChanEventHandler),
-      _fifo(evt._fifo)
-    {};
-
-    void unreference();
-
-    EventFifo * fifo()
-    {
-        return _fifo;
-    }
-
-    void signal()
-    {
-        _fifo->_cond.signal();
-    };
-
-    bool provide(const EventRequest &);
-    bool writeNoSignal(const EventRequest &);
-    bool write(const EventRequest &);
-
-protected:
-    EventFifo * _fifo;
-};
-
-
-/******************************************************************************/
-/****************************** Internal **************************************/
-struct RingbackDefs
-{
-    enum
-    {
-        RB_SEND_DEFAULT = -1,
-        RB_SEND_NOTHING = -2,
-    };
-
-    typedef enum
-    {
-        RBST_SUCCESS,
-        RBST_UNSUPPORTED,
-        RBST_FAILURE,
-    }
-    RingbackStType;
-};
-
-/******************************************************************************/
-/******************************* Others ***************************************/
-static bool checkTrueString(const char * str)
-{   
-    if (str && *str)
-    {   
-        if (!SAFE_strcasecmp(str, "yes") || !SAFE_strcasecmp(str, "true") ||
-                !SAFE_strcasecmp(str, "enabled") || !SAFE_strcasecmp(str, "sim"))
-        {   
-            return true;
-        }   
-    }   
-
-    return false;
-}   
-
-static bool checkFalseString(const char * str)
-{   
-    if (str && *str)
-    {   
-        if (!SAFE_strcasecmp(str, "no") || !SAFE_strcasecmp(str, "false") ||
-                !SAFE_strcasecmp(str, "disabled") || !SAFE_strcasecmp(str, "não"))
-        {   
-            return true;
-        }   
-    }   
-
-    return false;
-}   
-
-static TriState getTriStateValue(const char * str)
-{
-    if (str)
-    {   
-        /**/ if (checkTrueString(str))  return T_TRUE;
-        else if (checkFalseString(str)) return T_FALSE;
-        else /***********************************/ return T_UNKNOWN;
-    }   
-
-    return T_UNKNOWN;
-}
-
-const char * answerInfoToString(int answer_info);
-
-static bool replaceTemplate(std::string & haystack, const std::string & needed, int value)
-{
-    Regex::Expression e(std::string(needed).c_str());
-    Regex::Match r(haystack,e);
-
-    if(!r.matched()) return false;
-
-    int len;
-    std::string fmt;
-    std::string tmp;
-
-    // if needed isn't "SSSS" the length of needed will give string format
-    // if needed is "SSSS" the length of value will give string format
-    std::string ssss("SSSS");
-
-    if (ssss != needed)
-    {   
-        len = needed.size();
-        fmt = STG(FMT("%%0%dd") % len);
-        tmp = STG(FMT(fmt) % value);
-    }   
-    else
-    {   
-        len = (STG(FMT("%d") % value)).size();
-        fmt = STG(FMT("%%%dd") % len);
-        tmp = STG(FMT(fmt) % value);
-    }   
-
-    haystack = r.replace(STG(FMT(fmt) % value));
-
-    DBG(FUNC,FMT("haystack: %s") % haystack);
-    return true;
-}
-
-
-static std::string timeToString (time_t time_value)
-{
-    int horas = (int)time_value / 3600;
-
-    if (horas > 0) 
-        time_value -= horas * 3600;
-
-    int minutos = (int)time_value / 60;
-
-    if (minutos > 0) 
-        time_value -= minutos * 60;
-
-    return STG(FMT("%02d:%02d:%02d") % horas % minutos % (int)time_value);
-}
-/******************************************************************************/
-/******************************* Match functions ******************************/
-struct MatchExtension
-{
-    typedef std::vector<std::string> ContextListType;
-    typedef std::vector<std::string> ExtenListType;
-
-    typedef enum
-    {
-        MATCH_NONE,
-        MATCH_EXACT,
-        MATCH_MORE
-    }
-    MatchType;
-
-    static bool canMatch(std::string & context, std::string & exten, 
-                std::string & caller_id, bool match_more = false);
-
-    static MatchType matchExtension(std::string &, std::string &, 
-                std::string &, bool match_only = false);
-
-    static MatchType findExtension(std::string &, std::string &, 
-                ContextListType &, std::string &, std::string &,
-                bool default_ctx = true, bool default_ext = true);
-
-};
-/******************************************************************************/
-/************************** Thread helper functions ***************************/
-typedef int (HandlerType)(void *);
-static Thread * threadCreate(HandlerType * handler,void * arg)
-{
-    Thread *t = new Thread(handler, (void *) arg, Globals::module_pool);
-    return t;
-}
-
-/******************************************************************************/
-/******************************** Kommuter ************************************/
-struct Kommuter
-{
-    Kommuter() : 
-        _kommuter_count(-1), 
-        _kwtd_timer_on(false)
-    {}
-    
-    bool start()
-    {
-        /* Checks for kommuter */
-        try
-        {
-            Globals::k3lapi.command(-1,-1,CM_WATCHDOG_COUNT);
-        }
-        catch(K3LAPI::failed_command & e)
-        {
-            LOG(WARNING , "libkwd.so used by Kommuter devices is not available.");
-            return false;
-        }
-
-        return true;
-    }
-
-    bool stop();
-    
-    bool initialize(K3L_EVENT *e);
-  
-    /* Index of the WatchDog timer */ 
-    TimerTraits::Index  _kwtd_timer_index;
-    int                 _kommuter_count;
-    bool                _kwtd_timer_on;
-
-    /* Timer to control our dog (totó) */
-    static void wtdKickTimer(void *);
-    
-};
-
-/******************************************************************************/
-/******************************* Statistics ***********************************/
-struct Statistics
-{
-    typedef enum
-    {
-        DETAILED = 0,
-        ROW
-    }
-    Type;
-
-    virtual std::string getDetailed() { return ""; }
-    virtual void clear() {}
-};
-/******************************************************************************/
-/****************************** ESL - Events **********************************/
-    
-struct ESL 
-{
-
-    typedef std::vector <std::string> VectorEvents;
-    
-    ESL(std::string type);
-
-    ~ESL();
-    
-    switch_event_t * create(const std::string type)
-    {
-        switch_event_t *event;
-
-        if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, type.c_str()) != SWITCH_STATUS_SUCCESS)
-        {
-            return NULL;
-        }
-
-        return event;
-    }
-    
-    switch_event_t * create()
-    {
-        return create(_type);
-    }
-
-    bool add(switch_event_t *event, const std::string key, 
-                                    const std::string value) const
-    {
-        if(!event) return false;
-
-        switch_status_t res = switch_event_add_header_string(event, 
-                SWITCH_STACK_BOTTOM,
-                key.c_str(), 
-                value.c_str());
-
-        return (res == SWITCH_STATUS_SUCCESS ? true : false);
-    }
-
-    bool add(switch_event_t *event, K3LAPIBase::GenericTarget & target)
-    {
-        bool ok = add(event, "Device", STR(FMT("%d") % target.device));
-
-        if(!ok)
-            return ok;
-
-        std::string type;
-
-        switch(target.type)
-        {
-            case K3LAPIBase::GenericTarget::CHANNEL:
-                type = "Channel";
-                break;
-            case K3LAPIBase::GenericTarget::MIXER:
-                type = "Mixer";
-                break;
-            case K3LAPIBase::GenericTarget::LINK:
-                type = "Link";
-                break;
-            default:
-                type = "Other";
-                break;
-        }        
-
-        return add(event, type, STR(FMT("%d") % target.object));
-    }
-
-    bool fire(switch_event_t **event) const
-    {
-        if(!event || !*event) return false;
-
-        switch_status_t res = switch_event_fire(event);
-
-        *event = NULL;
-
-        return (res == SWITCH_STATUS_SUCCESS ? true : false);
-    }
-
-    static bool registerEvents();
-
-    static bool unregisterEvents();
-
-protected:
-    const std::string _type;
-    static VectorEvents * _events;
-};
-
-/******************************************************************************/
-/******************************************************************************/
-
-#endif  /* _UTILS_H_ */
diff --git a/src/mod/endpoints/mod_khomp/mod_khomp.cpp b/src/mod/endpoints/mod_khomp/mod_khomp.cpp
deleted file mode 100644
index 3653fd03da..0000000000
--- a/src/mod/endpoints/mod_khomp/mod_khomp.cpp
+++ /dev/null
@@ -1,1524 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Khomp development team
- * Geovani Ricardo Wiedenhoft <grw.freeswitch  (at) gmail.com>
- * Leonardo Lang              <lang.freeswitch (at) gmail.com>
- * Eduardo Nunes              <eduardonunesp   (at) gmail.com>
- * Joao Mesquita              <mesquita        (at) khomp.com.br>
- * Raul Fragoso               <raulfragoso     (at) gmail.com>
- *
- *
- * mod_khomp.c -- Khomp board Endpoint Module
- *
- */
-
-/**
-  \mainpage Khomp board Endpoint Module
-
-  \section Introduction
-  This module has been developed to make a nice, affordable brazilian board
-  called Khomp (http://www.khomp.com.br) compatible with FreeSWITCH.
-  This module is supported by the manufacturer.
-
-  \section Contributors
-  \li Khomp development team
-  \li Geovani Ricardo Wiedenhoft <grw.freeswitch  (at) gmail.com>
-  \li Leonardo Lang              <lang.freeswitch (at) gmail.com>
-  \li Eduardo Nunes              <eduardonunesp   (at) gmail.com>
-  \li Joao Mesquita              <jmesquita       (at) gmail.com>
-  \li Raul Fragoso               <raulfragoso     (at) gmail.com>
-**/
-
-/**
- * @file mod_khomp.cpp
- * @brief Khomp Endpoint Module
- * @see mod_khomp
- */
-
-#include <string>
-#include "khomp_pvt.h"
-#include "spec.h"
-#include "lock.h"
-#include "logger.h"
-#include "opt.h"
-#include "globals.h"
-#include "cli.h"
-
-extern "C" void Kstdcall khompAudioListener(int32 deviceid, int32 objectid,
-                                          byte * read_buffer, int32 read_size);
-
-/*!
-  \brief Load the module. Expadend by a FreeSWITCH macro.
-  Things we do here:
-  \li Initialize a static structure on KhompPvt
-  \li Load the configuration
-  \li Start the K3L API, responsible for connecting to KServer
-  \li Register mod APIs and APPs
-  \li Register audio callback for KServer
-  \li Register event callback for KServer
-  \see Opt Where all the configs are handled
-  \see khompEventCallback To where we bind the event handler
-  \see khompAudioListener To where we bind the audio handlers
-  */
-SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_khomp_shutdown);
-SWITCH_MODULE_DEFINITION(mod_khomp, mod_khomp_load, mod_khomp_shutdown, NULL);
-
-/*!
- \defgroup fs_states FreeSWITCH State Handlers
-            We get called back from FreeSWITCH core everytime we make a
-            transition to any of these states. Refer to FreeSWITCH docs for a
-            detailed explanation of each state.
- */
-/*@{*/
-switch_status_t khompInit(switch_core_session_t *session);
-switch_status_t khompRouting(switch_core_session_t *session);
-switch_status_t khompExecute(switch_core_session_t *session);
-switch_status_t khompHangup(switch_core_session_t *session);
-switch_status_t khompExchangeMedia(switch_core_session_t *session);
-switch_status_t khompSoftExecute(switch_core_session_t *session);
-switch_status_t khompDestroy(switch_core_session_t *session);
-/*@}*/
-
-switch_state_handler_table_t khomp_state_handlers = {
-    khompInit,          /*.on_init */
-    khompRouting,       /*.on_routing */
-    khompExecute,       /*.on_execute */
-    khompHangup,        /*.on_hangup */
-    khompExchangeMedia, /*.on_exchange_media */
-    khompSoftExecute,   /*.on_soft_execute */
-    NULL,               /*.on_consume_media */
-    NULL,               /*.on_hibernate */
-    NULL,               /*.on_reset */
-    NULL,               /*.on_park*/
-    NULL,               /*.on_reporting*/
-    khompDestroy        /*.on_destroy*/
-};
-
-switch_status_t khompSMSDestroy(switch_core_session_t *session);
-
-switch_state_handler_table_t khomp_sms_state_handlers = {
-    khompInit,          /*.on_init */
-    khompRouting,       /*.on_routing */
-    khompExecute,       /*.on_execute */
-    NULL,               /*.on_hangup */
-    khompExchangeMedia, /*.on_exchange_media */
-    khompSoftExecute,   /*.on_soft_execute */
-    NULL,               /*.on_consume_media */
-    NULL,               /*.on_hibernate */
-    NULL,               /*.on_reset */
-    NULL,               /*.on_park*/
-    NULL,               /*.on_reporting*/
-    khompSMSDestroy     /*.on_destroy*/
-};
-
-switch_status_t khompPRHangup(switch_core_session_t *session);
-
-switch_state_handler_table_t khomp_pr_state_handlers = {
-    khompInit,          /*.on_init */
-    khompRouting,       /*.on_routing */
-    khompExecute,       /*.on_execute */
-    khompPRHangup,      /*.on_hangup */
-    khompExchangeMedia, /*.on_exchange_media */
-    khompSoftExecute,   /*.on_soft_execute */
-    NULL,               /*.on_consume_media */
-    NULL,               /*.on_hibernate */
-    NULL,               /*.on_reset */
-    NULL,               /*.on_park*/
-    NULL,               /*.on_reporting*/
-    khompDestroy        /*.on_destroy*/
-};
-
-/* Callbacks for FreeSWITCH */
-switch_call_cause_t khompCall(
-        switch_core_session_t *session,
-        switch_event_t *var_event,
-        switch_caller_profile_t *outbound_profile,
-        switch_core_session_t **new_session,
-        switch_memory_pool_t **pool,
-        switch_originate_flag_t flags,
-        switch_call_cause_t *cancel_cause);
-switch_status_t khompRead(switch_core_session_t *session,
-        switch_frame_t **frame,
-        switch_io_flag_t flags,
-        int stream_id);
-switch_status_t khompWrite(switch_core_session_t *session,
-        switch_frame_t *frame,
-        switch_io_flag_t flags,
-        int stream_id);
-switch_status_t khompKill(switch_core_session_t *session,
-        int sig);
-switch_status_t khompDigit(switch_core_session_t *session,
-        const switch_dtmf_t *dtmf);
-switch_status_t khompReceiveMessage(switch_core_session_t *session,
-        switch_core_session_message_t *msg);
-switch_status_t khompReceiveEvent(switch_core_session_t *session,
-        switch_event_t *event);
-
-/*!
- \ingroup fs_states
- */
-switch_io_routines_t khomp_io_routines = {
-    khompCall,           /*.outgoing_channel */
-    khompRead,           /*.read_frame */
-    khompWrite,          /*.write_frame */
-    khompKill,           /*.kill_channel */
-    khompDigit,          /*.send_dtmf */
-    khompReceiveMessage, /*.receive_message */
-    khompReceiveEvent    /*.receive_event */
-};
-
-switch_io_routines_t khomp_sms_io_routines = {
-    NULL,           /*.outgoing_channel */
-    NULL,           /*.read_frame */
-    NULL,           /*.write_frame */
-    khompKill,      /*.kill_channel */
-    NULL,           /*.send_dtmf */
-    NULL,           /*.receive_message */
-    NULL            /*.receive_event */
-};
-
-switch_status_t khompPRWrite(switch_core_session_t *session,
-        switch_frame_t *frame,
-        switch_io_flag_t flags,
-        int stream_id);
-
-switch_io_routines_t khomp_pr_io_routines = {
-    NULL,                /*.outgoing_channel */
-    khompRead,           /*.read_frame */
-    khompPRWrite,        /*.write_frame */
-    khompKill,           /*.kill_channel */
-    NULL,                /*.send_dtmf */
-    NULL,                /*.receive_message */
-    NULL                 /*.receive_event */
-};
-
-/* Macros to define specific API functions */
-SWITCH_STANDARD_API(apiKhomp);
-
-/*!
- \brief Print link status. [khomp show links]
- */
-void apiPrintLinks(switch_stream_handle_t* stream, unsigned int device,
-        unsigned int link);
-/*!
- \brief Print board channel status. [khomp show channels]
- */
-void apiPrintChannels(switch_stream_handle_t* stream);
-
-/*!
-   \brief State methods they get called when the state changes to the specific state
-   returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
-   so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
-*/
-switch_status_t khompInit(switch_core_session_t *session)
-{
-    DBG(FUNC, "CHANNEL INIT")
-    switch_channel_t *channel = switch_core_session_get_channel(session);
-
-    if(!channel)
-    {
-        DBG(FUNC, D("Channel is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    /* Move channel's state machine to ROUTING. This means the call is trying
-       to get from the initial start where the call because, to the point
-       where a destination has been identified. If the channel is simply
-       left in the initial state, nothing will happen. */
-    switch_channel_set_state(channel, CS_ROUTING);
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompRouting(switch_core_session_t *session)
-{
-    DBG(FUNC, "CHANNEL ROUTING");
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompExecute(switch_core_session_t *session)
-{
-
-    DBG(FUNC, "CHANNEL EXECUTE");
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompHangup(switch_core_session_t *session)
-{
-    Board::KhompPvt *tech_pvt = NULL;
-
-    if(!session)
-    {
-        LOG(ERROR, D("cr (Session is NULL)"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("cr (pvt is NULL)"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "c"));
-
-    try
-    {
-        ScopedPvtLock lock(tech_pvt);
-
-        if(tech_pvt->freeState())
-        {
-            DBG(FUNC, PVT_FMT(tech_pvt->target(), "r (Already disconnected)"));
-            return SWITCH_STATUS_SUCCESS;
-        }
-
-        tech_pvt->setHangupCause(SWITCH_CAUSE_NORMAL_CLEARING, true);
-
-        //tech_pvt->doHangup();
-
-        lock.unlock();
-
-        CommandRequest c_req(CommandRequest::COMMAND, CommandRequest::CMD_HANGUP, tech_pvt->target().object);
-
-        Board::board(tech_pvt->target().device)->chanCommandHandler()->write(c_req);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(tech_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
-        return SWITCH_STATUS_FALSE;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(tech_pvt->target(), "r (unable to get device: %d!)") % err.device);
-        return SWITCH_STATUS_FALSE;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "r"))
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompPRHangup(switch_core_session_t *session)
-{
-    DBG(FUNC, D("CHANNEL HANGUP"))
-}
-
-
-switch_status_t khompDestroy(switch_core_session_t *session)
-{
-    if(!session)
-    {
-        LOG(ERROR, D("cr (session is null)"))
-        return SWITCH_STATUS_FALSE;
-    }
-
-    Board::KhompPvt *tech_pvt = NULL;
-
-    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("cr (pvt is null)"))
-        return SWITCH_STATUS_FALSE;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "c"))
-
-    do
-    {
-        try
-        {
-            ScopedPvtLock lock(tech_pvt);
-
-            switch_core_session_set_private(session, NULL);
-            tech_pvt->destroyAll();
-
-            DBG(FUNC, PVT_FMT(tech_pvt->target(), "r"));
-
-            return SWITCH_STATUS_SUCCESS;
-        }
-        catch (ScopedLockFailed & err)
-        {
-            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to lock: %s!: try again...") %  err._msg.c_str());
-        }
-
-    }
-    while(true);
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "r (unable to lock!)"));
-
-    return SWITCH_STATUS_FALSE;
-}
-
-switch_status_t khompSMSDestroy(switch_core_session_t *session)
-{
-    DBG(FUNC, D("c"))
-
-    if(!session)
-    {
-        DBG(FUNC, D("r (session is null)"))
-        return SWITCH_STATUS_FALSE;
-    }
-/*
-    Board::KhompPvt *tech_pvt = NULL;
-
-    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-
-    if(!tech_pvt)
-    {
-        DBG(FUNC, D("r (pvt is null)"))
-        return SWITCH_STATUS_FALSE;
-    }
-
-    try
-    {
-        ScopedPvtLock lock(tech_pvt);
-*/
-        switch_core_session_set_private(session, NULL);
-/*
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        DBG(FUNC, PVT_FMT(tech_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
-    }
-*/
-
-    DBG(FUNC, D("r"))
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompKill(switch_core_session_t *session, int sig)
-{
-    //DBG(FUNC,FMT("CHANNEL KILL, kill = %d") % sig)
-    Board::KhompPvt *tech_pvt = NULL;
-
-    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-
-    if(!tech_pvt)
-    {
-        return SWITCH_STATUS_FALSE;
-    }
-
-    switch (sig)
-    {
-    case SWITCH_SIG_NONE:
-        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL,  NONE!"));
-        break;
-    case SWITCH_SIG_KILL:
-        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL, SIGKILL!"));
-        //switch_thread_cond_signal(tech_pvt->_cond);
-        break;
-    case SWITCH_SIG_XFER:
-        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL, SIGXFER!"));
-        break;
-    case SWITCH_SIG_BREAK:
-        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL, BREAK!"));
-        break;
-    default:
-        DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL KILL, WHAT?!"));
-        break;
-    }
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompExchangeMedia(switch_core_session_t *session)
-{
-    DBG(FUNC, "CHANNEL LOOPBACK")
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompSoftExecute(switch_core_session_t *session)
-{
-    DBG(FUNC, "CHANNEL TRANSMIT")
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompDigit(switch_core_session_t *session, const switch_dtmf_t *dtmf)
-{
-    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("pvt is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "c (%c)") % dtmf->digit);
-
-    try
-    {
-        ScopedPvtLock lock(tech_pvt);
-
-        char s[] = { dtmf->digit, '\0' };
-
-        tech_pvt->sendDtmf(s);
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(tech_pvt->target(), "r (unable to lock: %s!)") % err._msg.c_str());
-        return SWITCH_STATUS_FALSE;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "r"));
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompRead(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
-{
-    Board::KhompPvt *tech_pvt = NULL;
-    //switch_time_t started = switch_time_now();
-    //unsigned int elapsed;
-    //switch_byte_t *data;
-
-    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-    if(!tech_pvt)
-    {
-        DBG(FUNC, D("pvt is NULL"))
-        return SWITCH_STATUS_FALSE;
-    }
-
-    *frame = NULL;
-
-    while (true)
-    {
-        /*
-        if (switch_test_flag(tech_pvt, TFLAG_BREAK))
-        {
-            switch_clear_flag_locked(tech_pvt, TFLAG_BREAK);
-
-            *frame = tech_pvt->_reader_frames.cng();
-            return SWITCH_STATUS_SUCCESS;
-        }
-        */
-
-        if (tech_pvt->call()->_flags.check(Kflags::LISTEN_UP))
-        {
-            *frame = tech_pvt->_reader_frames.pick();
-
-            if (!*frame)
-            {
-                //Reader buffer empty, waiting...
-                switch_cond_next();
-                continue;
-            }
-        }
-        else
-        {
-            switch_yield(20000);
-            *frame = tech_pvt->_reader_frames.cng();
-        }
-/*
-#ifdef BIGENDIAN
-        if (switch_test_flag(tech_pvt, TFLAG_LINEAR))
-        {
-            switch_swap_linear((*frame)->data, (int) (*frame)->datalen / 2);
-        }
-#endif
-*/
-        return SWITCH_STATUS_SUCCESS;
-    }
-
-    return SWITCH_STATUS_FALSE;
-}
-
-switch_status_t khompWrite(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
-{
-    Board::KhompPvt *tech_pvt = NULL;
-
-    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("pvt is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-/*
-#ifdef BIGENDIAN
-    if (switch_test_flag(tech_pvt, TFLAG_LINEAR))
-    {
-        switch_swap_linear(frame->data, (int) frame->datalen / 2);
-    }
-#endif
-*/
-
-    if (frame) // && frame->flags != SFF_CNG)
-    {
-        if(frame->datalen != 0 && tech_pvt->call()->_flags.check(Kflags::GEN_CO_RING))
-        {
-            tech_pvt->call()->_flags.clear(Kflags::GEN_CO_RING);
-
-            try
-            {
-                Board::board(tech_pvt->target().device)->_timers.del(tech_pvt->call()->_idx_co_ring);
-            }
-            catch (K3LAPITraits::invalid_device & err)
-            {
-                LOG(ERROR, PVT_FMT(tech_pvt->target(), "Unable to get device: %d!") % err.device);
-            }
-
-            if(tech_pvt->call()->_cadence != Board::KhompPvt::PLAY_VM_TONE)
-            {
-                tech_pvt->stopCadence();
-            }
-        }
-
-        if (!tech_pvt->_writer_frames.give((const char *)frame->data, (size_t)frame->datalen))
-        {
-            DBG(STRM, PVT_FMT(tech_pvt->target(), "Writer buffer full!"));
-            //Writer buffer full!
-        }
-    }
-
-    return SWITCH_STATUS_SUCCESS;
-
-}
-
-switch_status_t khompPRWrite(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
-{
-    /*
-    Board::KhompPvt *tech_pvt = NULL;
-
-    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-    if(!tech_pvt)
-    {
-        DBG(FUNC, D("pvt is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-    */
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t khompAnswer(switch_core_session_t *session)
-{
-    Board::KhompPvt *tech_pvt;
-    switch_channel_t *channel = NULL;
-
-    channel = switch_core_session_get_channel(session);
-
-    if(!channel)
-    {
-        LOG(ERROR, D("channel is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("pvt is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "CHANNEL ANSWER"));
-
-    try
-    {
-        ScopedPvtLock lock(tech_pvt);
-
-        if(!tech_pvt->session() || !tech_pvt->call()->_flags.check(Kflags::IS_INCOMING))
-        {
-            LOG(ERROR, PVT_FMT(tech_pvt->target(), "Channel is not connected"));
-            return SWITCH_STATUS_FALSE;
-        }
-
-        tech_pvt->getSpecialVariables();
-
-        tech_pvt->setVolume();
-
-        tech_pvt->setCollectCall();
-
-        if (!tech_pvt->call()->_flags.check(Kflags::CONNECTED))
-        {
-            /* we can unlock it now */
-            lock.unlock();
-
-            CommandRequest c_req(CommandRequest::COMMAND, CommandRequest::CMD_ANSWER, tech_pvt->target().object);
-
-            Board::board(tech_pvt->target().device)->chanCommandHandler()->write(c_req);
-
-        }
-        else
-        {
-            DBG(FUNC, PVT_FMT(tech_pvt->target(), "channel is already connected"));
-        }
-
-        //Esperar o atendimento EV_CONNECT
-        //if (!khomp_pvt::loop_while_flag_timed(pvt, c, kflags::REALLY_CONNECTED, timeout, &lock, false)) { return SWITCH_STATUS_FALSE; }
-
-
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, D("unable to get device: %d!") % err.device);
-        return SWITCH_STATUS_FALSE;
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to lock: %s!") % err._msg.c_str());
-        return SWITCH_STATUS_FALSE;
-
-    }
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t khompReceiveMessage(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-    Board::KhompPvt *tech_pvt;
-
-    if(!session)
-    {
-        LOG(ERROR, D("session is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    if(!msg)
-    {
-        LOG(ERROR, D("msg is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    tech_pvt = (Board::KhompPvt *) switch_core_session_get_private(session);
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("pvt is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    switch (msg->message_id) {
-        case SWITCH_MESSAGE_REDIRECT_AUDIO:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_REDIRECT_AUDIO"));
-            break;
-        case SWITCH_MESSAGE_TRANSMIT_TEXT:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_TRANSMIT_TEXT"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_ANSWER:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_ANSWER"));
-            return khompAnswer(session);
-            break;
-        case SWITCH_MESSAGE_INDICATE_PROGRESS:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_PROGRESS"));
-            tech_pvt->indicateProgress();
-            break;
-        case SWITCH_MESSAGE_INDICATE_BRIDGE:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_BRIDGE"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_UNBRIDGE:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_UNBRIDGE"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_TRANSFER:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_TRANSFER"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_RINGING:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_RINGING"));
-            tech_pvt->indicateRinging();
-            break;
-        case SWITCH_MESSAGE_INDICATE_MEDIA:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_MEDIA"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_NOMEDIA:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_NOMEDIA"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_HOLD:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_HOLD"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_UNHOLD:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_UNHOLD"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_REDIRECT:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_REDIRECT"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_RESPOND:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_RESPOND"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_BROADCAST:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_BROADCAST"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_DEFLECT:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_DEFLECT"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_DISPLAY:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_DISPLAY"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_AUDIO_SYNC"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_REQUEST_IMAGE_MEDIA:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_REQUEST_IMAGE_MEDIA"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_UUID_CHANGE:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_UUID_CHANGE"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_SIMPLIFY:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_SIMPLIFY"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_DEBUG_MEDIA:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_DEBUG_MEDIA"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_PROXY_MEDIA:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_PROXY_MEDIA"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC"));
-            break;
-        case SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC_COMPLETE:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC_COMPLETE"));
-            break;
-        case SWITCH_MESSAGE_INVALID:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "SWITCH_MESSAGE_INVALID"));
-            break;
-        default:
-            DBG(FUNC, PVT_FMT(tech_pvt->_target, "unknown message received [%d].") % msg->message_id % (msg->from ? msg->from : 0));
-            break;
-    }
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-/*!
-  \brief Make sure when you have 2 sessions in the same scope that you pass
-  the appropriate one to the routines that allocate memory or you will have
-  1 channel with memory allocated from another channel's pool!
-*/
-switch_call_cause_t khompCall
-        (switch_core_session_t *session,
-         switch_event_t *var_event,
-         switch_caller_profile_t *outbound_profile,
-         switch_core_session_t **new_session,
-         switch_memory_pool_t **pool,
-         switch_originate_flag_t flags,
-         switch_call_cause_t *cancel_cause)
-{
-    if (!outbound_profile)
-    {
-        LOG(ERROR, D("No caller profile"));
-        //switch_core_session_destroy(new_session);
-        return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-    }
-
-    Board::KhompPvt *tech_pvt;
-    int cause = (int)SWITCH_CAUSE_NONE;
-
-    try
-    {
-        ScopedAllocLock alloc_lock;
-
-        // got the pvt
-        tech_pvt = processDialString(outbound_profile->destination_number,&cause);
-
-        if(tech_pvt == NULL || cause != SWITCH_CAUSE_SUCCESS)
-        {
-            LOG(ERROR, D("unable to find free channel"));
-            return (cause == SWITCH_CAUSE_SUCCESS) ? SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER : (switch_call_cause_t) cause;
-        }
-
-        ScopedPvtLock lock(tech_pvt);
-
-        if(tech_pvt->justAlloc(false, pool) != SWITCH_STATUS_SUCCESS)
-        {
-            tech_pvt->cleanup(Board::KhompPvt::CLN_HARD);
-            LOG(ERROR, PVT_FMT(tech_pvt->target(), "Initilization Error!"));
-            return SWITCH_CAUSE_UNALLOCATED_NUMBER;
-        }
-
-        tech_pvt->owner((session ? session : tech_pvt->session()));
-        // get the session to FS
-        *new_session = tech_pvt->session();
-
-        if(tech_pvt->justStart(outbound_profile) != SWITCH_STATUS_SUCCESS)
-        {
-            *new_session = NULL;
-            tech_pvt->cleanup(Board::KhompPvt::CLN_HARD);
-            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to justStart"));
-            return SWITCH_CAUSE_UNALLOCATED_NUMBER;
-        }
-
-        alloc_lock.unlock();
-
-        tech_pvt->getSpecialVariables();
-
-        tech_pvt->setVolume();
-
-        if(tech_pvt->makeCall() != ksSuccess)
-        {
-            *new_session = NULL;
-            tech_pvt->cleanup(Board::KhompPvt::CLN_HARD);
-            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to makeCall"));
-            return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-        }
-
-        tech_pvt->setFSChannelVar("KCallAnswerInfo", "Unknown");
-    }
-    catch(ScopedLockFailed & err)
-    {
-        if(err._fail == ScopedLockFailed::ALLOC_FAILED)
-        {
-            LOG(ERROR, D("unable to global alloc lock: %s!") % err._msg.c_str());
-        }
-        else
-        {
-            tech_pvt->cleanup(Board::KhompPvt::CLN_HARD);
-            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to lock: %s!") % err._msg.c_str());
-        }
-        return SWITCH_CAUSE_INTERWORKING;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(tech_pvt->target(), "%s") % err._msg.c_str());
-    }
-
-    return SWITCH_CAUSE_SUCCESS;
-}
-
-switch_status_t khompReceiveEvent(switch_core_session_t *session, switch_event_t *event)
-{
-    struct Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-    char *body = switch_event_get_body(event);
-    //switch_assert(tech_pvt != NULL);
-
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("pvt is NULL"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Receive Event id[%d] name[%s] body=[%s]") % event->event_id % event->headers->name % body);
-
-    if (!body) {
-        body = (char *)"";
-    }
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-/* A simple idea of app */
-SWITCH_STANDARD_APP(klogFunction)
-{
-    if (zstr(data))
-    {
-        LOG(ERROR, D("No data specified"));
-    }
-    else
-    {
-        LOG(MESSAGE, FMT("KLOG: %s") %  std::string(data));
-    }
-}
-
-void setVariable(switch_core_session_t * session, const char * variable, const char * data)
-{
-    if(!session)
-    {
-        LOG(ERROR, FMT("Session is NULL in %s") % variable);
-        return;
-    }
-
-    if (zstr(data))
-    {
-        LOG(ERROR, FMT("No %s specified") % variable);
-        return;
-    }
-
-    if(strcasecmp(data, "on") && strcasecmp(data, "off"))
-    {
-        LOG(ERROR, FMT("On %s specify on or off") % variable);
-        return;
-    }
-
-    switch_channel_t *c = switch_core_session_get_channel(session);
-
-    if(!c)
-    {
-        LOG(ERROR, FMT("Channel is NULL in %s") % variable);
-        return;
-    }
-
-    switch_channel_set_variable(c, variable, (!strcasecmp(data, "on") ? "true" : "false" ));
-
-    DBG(FUNC,FMT("%s set %s") % variable % data);
-}
-
-SWITCH_STANDARD_APP(kdtmfSuppressionFunction)
-{
-    setVariable(session, "KDTMFSuppression", data);
-}
-
-SWITCH_STANDARD_APP(kechoCancellerFunction)
-{
-    setVariable(session, "KEchoCanceller", data);
-}
-
-SWITCH_STANDARD_APP(kautoGainControlFunction)
-{
-    setVariable(session, "KAutoGainControl", data);
-}
-
-SWITCH_STANDARD_APP(kr2SendConditionFunction)
-{
-    setVariable(session, "KR2SendCondition", data);
-}
-
-SWITCH_STANDARD_APP(kadjustForFaxFunction)
-{
-    if(!session)
-    {
-        LOG(ERROR, D("Session is NULL"));
-        return;
-    }
-
-    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("pvt is NULL"));
-        return;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KAdjustForFax"));
-
-    try
-    {
-        ScopedPvtLock lock(tech_pvt);
-
-        if(tech_pvt->application(FAX_ADJUST, session, data))
-        {
-            /* adjust the flag */
-            tech_pvt->call()->_flags.set(Kflags::FAX_DETECTED);
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to lock: %s!") %  err._msg.c_str());
-        return;
-    }
-}
-
-SWITCH_STANDARD_APP(ksendFaxFunction)
-{
-    if(!session)
-    {
-        LOG(ERROR, D("Session is NULL"));
-        return;
-    }
-
-
-    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("pvt is NULL"));
-        return;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KSendFax"));
-
-    tech_pvt->application(FAX_SEND, session, data);
-}
-
-SWITCH_STANDARD_APP(kreceiveFaxFunction)
-{
-    if(!session)
-    {
-        LOG(ERROR, D("Session is NULL"));
-        return;
-    }
-
-
-    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-
-    if(!tech_pvt)
-    {
-        LOG(ERROR, D("pvt is NULL"));
-        return;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KReceiveFax"));
-
-    tech_pvt->application(FAX_RECEIVE, session, data);
-}
-
-SWITCH_STANDARD_APP(kUserTransferFunction)
-{
-    if(!session)
-    {
-        LOG(ERROR, D("Session is NULL"));
-        return;
-    }
-
-    if (zstr(data))
-    {
-        LOG(ERROR, D("No number specified"));
-        return;
-    }
-
-    Board::KhompPvt *tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
-
-    if(!tech_pvt)
-    {
-        DBG(FUNC, D("pvt is NULL"));
-        return;
-    }
-
-    DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KUserTransfer"));
-
-    tech_pvt->application(USER_TRANSFER, session, data);
-}
-
-SWITCH_STANDARD_APP(ksetVolumeFunction)
-{
-    if(!session)
-    {
-        LOG(ERROR, D("Session is NULL"));
-        return;
-    }
-
-    if (zstr(data))
-    {
-        LOG(ERROR, D("No KSetVolume specified"));
-        return;
-    }
-
-    switch_channel_t *c = switch_core_session_get_channel(session);
-
-    if(!c)
-    {
-        LOG(ERROR, D("Channel is NULL"));
-        return;
-    }
-
-    switch_channel_set_variable(c, "KSetVolume", data);
-
-    DBG(FUNC, FMT("KSetVolume set %s") % data);
-}
-
-SWITCH_STANDARD_APP(kSendSMSFunction)
-{
-    if(!session)
-    {
-        LOG(ERROR, D("Session is NULL"));
-        return;
-    }
-
-    switch_channel_t *channel = switch_core_session_get_channel(session);
-
-    if(!channel)
-    {
-        LOG(ERROR, D("Channel is NULL"));
-        return;
-    }
-
-    switch_channel_set_variable(channel, "KSmsDelivered", "no");
-    switch_channel_set_variable(channel, "KSmsErrorCode", "42");
-    switch_channel_set_variable(channel, "KSmsErrorName", Verbose::gsmSmsCause((KGsmSmsCause)42).c_str());
-
-    if (zstr(data))
-    {
-        LOG(ERROR, D("No data specified"));
-        return;
-    }
-
-    int cause = (int)SWITCH_CAUSE_SUCCESS;
-
-    try
-    {
-        ScopedAllocLock alloc_lock;
-
-        Board::KhompPvt *tech_pvt = processSMSString(data, &cause);
-
-        if(!tech_pvt)
-        {
-            DBG(FUNC, D("pvt is NULL, cause '%d'") % cause);
-            return;
-        }
-
-        DBG(FUNC, PVT_FMT(tech_pvt->target(), "Application KSendSMS"));
-
-        ScopedPvtLock lock(tech_pvt);
-
-        alloc_lock.unlock();
-
-        tech_pvt->application(SMS_SEND, session, data);
-
-    }
-    catch(ScopedLockFailed & err)
-    {
-        if(err._fail == ScopedLockFailed::ALLOC_FAILED)
-        {
-            LOG(ERROR, D("unable to global alloc lock"));
-        }
-        else
-        {
-            LOG(ERROR, D("unable to lock: %s!") % err._msg.c_str());
-        }
-    }
-
-}
-
-SWITCH_STANDARD_APP(kSelectSimCardFunction)
-{
-    if(!session)
-    {
-        LOG(ERROR, D("Session is NULL"));
-        return;
-    }
-
-    if (zstr(data))
-    {
-        LOG(ERROR, D("invalid number of arguments"));
-        return;
-    }
-
-    int dev = -1;
-    int obj = -1;
-
-    try
-    {
-        std::string datastr((const char*) data);
-        Strings::trim(datastr);
-
-        Strings::vector_type params;
-        Strings::tokenize(datastr, params, "|,",3);
-
-        std::string num("0");
-
-        if (params.size() == 3)
-        {
-            dev = Strings::tolong(params[0]);
-            obj = Strings::tolong(params[1]);
-            num = params[2];
-
-            /* just check for validity */
-            (void)Strings::tolong(params[2]);
-        }
-        else
-        {
-            LOG(ERROR, D("Invalid number of arguments!"));
-            return;
-        }
-
-        if (!Globals::k3lapi.valid_device(dev))
-        {
-            LOG(ERROR, D("ERROR: Invalid device number '%d'!") % dev);
-            return;
-        }
-
-        if (!Globals::k3lapi.valid_channel(dev, obj))
-        {
-            LOG(ERROR, D("ERROR: Invalid channel number '%d' on device '%d'!") % obj % dev);
-            return;
-        }
-
-        if(!Board::get(dev, obj)->application(SELECT_SIM_CARD, NULL, num.c_str()))
-        {
-            LOG(ERROR, D("ERROR: Unable to select sim card"));
-        }
-    }
-    catch (Strings::invalid_value & e)
-    {
-        LOG(ERROR, D("invalid numeric value: %s") % e.value());
-    }
-    catch(...)
-    {
-        LOG(ERROR, D("ERROR: Unable to select sim card"));
-    }
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load)
-{
-    /* start log early */
-    if(!K::Logger::start())
-    {
-        return SWITCH_STATUS_FALSE;
-    }
-
-    /* Two bodies can not occupy the same space at the same time */
-    if(switch_loadable_module_exists("mod_kommuter") == SWITCH_STATUS_SUCCESS)
-    {
-        LOG(ERROR, D("Kommuter module for FreeSWITCH is already loaded."));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    //TODO: must put the autorevision variable here
-    LOG(MESSAGE, "loading Khomp module");
-
-    /* get a reference for the module pool */
-    Globals::module_pool = pool;
-
-    /* start config system! */
-    Opt::initialize();
-
-    if(!Board::initializeK3L())
-    {
-        return SWITCH_STATUS_TERM;
-    }
-
-    /* read configuration first */
-    Opt::obtain();
-
-    /*
-       Spawn our k3l global var that will be used along the module
-       for sending info to the boards
-    */
-
-    if(!Board::initialize())
-    {
-        LOG(ERROR, "Error while initialize Board struct");
-        return SWITCH_STATUS_TERM;
-    }
-
-    /* apply global volume now */
-    if(Opt::_options._input_volume() != 0 || Opt::_options._output_volume() != 0)
-        Board::applyGlobalVolume();
-
-    Opt::commit();
-
-    /* create module interface, set state handlers and give a name */
-    *module_interface = switch_loadable_module_create_module_interface(pool, "mod_khomp");
-    Globals::khomp_endpoint_interface = static_cast<switch_endpoint_interface_t*>(switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE));
-    Globals::khomp_endpoint_interface->interface_name = "khomp";
-    Globals::khomp_endpoint_interface->io_routines = &khomp_io_routines;
-    Globals::khomp_endpoint_interface->state_handler = &khomp_state_handlers;
-
-
-    Globals::khomp_sms_endpoint_interface = static_cast<switch_endpoint_interface_t*>(switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE));
-    Globals::khomp_sms_endpoint_interface->interface_name = "khomp_SMS";
-    Globals::khomp_sms_endpoint_interface->io_routines = &khomp_sms_io_routines;
-    Globals::khomp_sms_endpoint_interface->state_handler = &khomp_sms_state_handlers;
-
-    Globals::khomp_pr_endpoint_interface = static_cast<switch_endpoint_interface_t*>(switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE));
-    Globals::khomp_pr_endpoint_interface->interface_name = "khomp_PR";
-    Globals::khomp_pr_endpoint_interface->io_routines = &khomp_pr_io_routines;
-    Globals::khomp_pr_endpoint_interface->state_handler = &khomp_pr_state_handlers;
-
-    /* Register cli commands */
-    Cli::registerCommands(apiKhomp,module_interface);
-
-    ESL::registerEvents();
-
-    /* Add applications */
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KLog", "KLog", "KLog log every string to khomp log system", klogFunction, "<value>", SAF_SUPPORT_NOMEDIA);
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KDTMFSuppression", "KDTMFSuppression", "KDTMFSuppresion", kdtmfSuppressionFunction, "on|off", SAF_SUPPORT_NOMEDIA);
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KEchoCanceller", "KEchoCanceller", "KEchoCanceller", kechoCancellerFunction, "on|off", SAF_SUPPORT_NOMEDIA);
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KAutoGainControl", "KAutoGainControl", "KAutoGainControl", kautoGainControlFunction, "on|off", SAF_SUPPORT_NOMEDIA);
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KSetVolume", "KSetVolume", "KSetVolume", ksetVolumeFunction, "value|value", SAF_SUPPORT_NOMEDIA);
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KR2SendCondition", "KR2SendCondition", "KR2SendCondition", kr2SendConditionFunction, "value|value", SAF_SUPPORT_NOMEDIA);
-
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KAdjustForFax", "KAdjustForFax", "KAdjustForFax", kadjustForFaxFunction, "", SAF_SUPPORT_NOMEDIA);
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KSendFax", "KSendFax", "KSendFax", ksendFaxFunction, "<infilename>[:<infilename2>[:...]][|<faxid>]", SAF_SUPPORT_NOMEDIA);
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KReceiveFax", "KReceiveFax", "KReceiveFax", kreceiveFaxFunction, "<outfilename>[|<faxid>]", SAF_SUPPORT_NOMEDIA);
-
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KUserTransfer", "KUserTransfer", "KUserTransfer", kUserTransferFunction, "number", SAF_SUPPORT_NOMEDIA);
-
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KSendSMS", "KSendSMS", "KSendSMS", kSendSMSFunction, "resource|destination|message", SAF_SUPPORT_NOMEDIA);
-
-    SWITCH_ADD_APP(Globals::khomp_app_inteface, "KSelectSimCard", "KSelectSimCard", "KSelectSimCard", kSelectSimCardFunction, "<board>|<channel>|<sim_card>", SAF_SUPPORT_NOMEDIA);
-
-    Board::initializeHandlers();
-
-    Board::kommuter.start();
-
-    /* indicate that the module should continue to be loaded */
-    return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_khomp_shutdown)
-{
-    Board::kommuter.stop();
-
-    Cli::unregisterCommands();
-
-    ESL::unregisterEvents();
-
-
-    /* Finnish him! */
-    DBG(FUNC, "Unloading mod_khomp...")
-
-    Board::finalizeHandlers();
-
-    Board::finalize();
-
-    DBG(FUNC, "Successfully Unloaded mod_khomp")
-
-    K::Logger::stop();
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-/*!
-   \brief khomp API definition
-   TODO: Add as xml modifier
-*/
-SWITCH_STANDARD_API(apiKhomp)
-{
-    char *argv[10] = { 0 };
-    int argc = 0;
-    void *val;
-    char *myarg = NULL;
-    switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-    /* We should not ever get a session here */
-    if (session) return SWITCH_STATUS_FALSE;
-
-    /* Set the stream for Cli class */
-    Cli::setStream(stream);
-
-    if (zstr(cmd))
-    {
-        Cli::printKhompUsage();
-        return status;
-    }
-
-    if (!(myarg = strdup(cmd))) return SWITCH_STATUS_MEMERR;
-
-
-    if ((argc = switch_separate_string(myarg, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) {
-        Cli::printKhompUsage();
-        goto done;
-    }
-
-    /* Parse all commands */
-    Cli::parseCommands(argc,argv);
-
-done:
-    switch_safe_free(myarg);
-    return status;
-}
-
-extern "C" void Kstdcall khompAudioListener (int32 deviceid, int32 objectid, byte * read_buffer, int32 read_size)
-{
-    try
-    {
-
-    //If NULL get throws K3LAPITraits::invalid_channel exception.
-    Board::KhompPvt * pvt = Board::get(deviceid, objectid);
-
-    /* add listener audio to the read buffer */
-    if (!pvt->_reader_frames.give((const char *)read_buffer, read_size))
-    {
-        DBG(STRM, PVT_FMT(pvt->target(), "Reader buffer full (read_size: %d)") % read_size);
-    }
-
-    if (!pvt->call()->_flags.check(Kflags::STREAM_UP))
-    {
-        DBG(STRM, PVT_FMT(pvt->target(), "Stream not enabled, skipping write..."));
-        return;
-    }
-
-    /* will be used below for CM_ADD_STREAM_BUFFER */
-    struct
-    {
-        const byte * buff;
-        size_t       size;
-    }
-    write_packet = { (const byte *)0, 0 };
-
-    /* push audio from the write buffer */
-    switch_frame_t * fr = pvt->_writer_frames.pick();
-
-    if (!fr)
-    {
-        //Writer buffer empty!
-        DBG(STRM, PVT_FMT(pvt->target(), "Writer buffer empty (silence to board)"));
-
-        write_packet.buff = (const byte *) Board::_cng_buffer;
-        write_packet.size = (size_t)       Globals::boards_packet_size;
-
-        pvt->command(KHOMP_LOG, CM_ADD_STREAM_BUFFER,
-                (const char *)&write_packet);
-        return;
-    }
-
-
-    /* what is the frame type? */
-    switch (fr->flags)
-    {
-        case SFF_NONE:
-        {
-            write_packet.buff = (const byte *) fr->data;
-            write_packet.size = (size_t)       fr->datalen;
-
-
-            pvt->command(KHOMP_LOG, CM_ADD_STREAM_BUFFER,
-                    (const char *)&write_packet);
-
-            break;
-        }
-
-        case SFF_CNG:
-        {
-            write_packet.buff = (const byte *) Board::_cng_buffer;
-            write_packet.size = (size_t)       Globals::boards_packet_size;
-
-            pvt->command(KHOMP_LOG, CM_ADD_STREAM_BUFFER,
-                    (const char *)&write_packet);
-
-            break;
-        }
-
-        default:
-            DBG(FUNC, PVT_FMT(pvt->target(), "DROPPING AUDIO..."));
-            /* TODO: log something here... */
-            break;
-    }
-
-    }
-    catch (K3LAPITraits::invalid_channel & err)
-    {
-        LOG(ERROR, OBJ_FMT(deviceid, objectid, "Invalid channel..."));
-        return;
-    }
-    catch (...)
-    {
-        LOG(ERROR, OBJ_FMT(deviceid, objectid, "Unexpected error..."));
-        return;
-    }
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet expandtab:
- */
diff --git a/src/mod/endpoints/mod_khomp/src/applications.cpp b/src/mod/endpoints/mod_khomp/src/applications.cpp
deleted file mode 100644
index 405161d3f2..0000000000
--- a/src/mod/endpoints/mod_khomp/src/applications.cpp
+++ /dev/null
@@ -1,976 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "applications.h"
-#include "lock.h"
-
-
-bool Fax::adjustForFax()
-{
-    /* Don't worry, let the man work */
-    DBG(FUNC, PVT_FMT(_pvt->target(),"Channel is now being adjusted for fax!"));
-
-    try
-    {
-        ScopedPvtLock lock(_pvt);
-
-        _pvt->echoCancellation(false);
-        _pvt->dtmfSuppression(false);
-        _pvt->autoGainControl(false);
-
-        _pvt->call()->_input_volume = 0;
-        _pvt->setVolume("input" , 0);
-        _pvt->call()->_output_volume = 0;
-        _pvt->setVolume("output", 0);
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
-        return false;
-    }
-
-    return true;
-}
-
-bool Fax::sendFax(switch_core_session_t * session, const char *data)
-{
-    DBG(FUNC, PVT_FMT(_pvt->target(), "c (%s)") % data);
-
-    try
-    {
-        switch_channel_t *channel = _pvt->getFSChannel(session);
-
-        switch_channel_set_variable(channel, "KFaxSent", "no");
-        switch_channel_set_variable(channel, "KFaxResult", "none");
-
-        std::string           fax_string((const char *)data);
-        Strings::vector_type  fax_args;
-        Strings::vector_type  fax_files;
-
-        Strings::tokenize(fax_string, fax_args, "|,");
-
-        if(fax_args.size() != 1 && fax_args.size() != 2)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "r (invalid string '%s': wrong number of separators.)") % fax_string);
-            return false;
-        }
-
-        Strings::tokenize(fax_args[0], fax_files, ":");
-
-        if(fax_files.size() <= 0)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "r (invalid string '%s': wrong number of separators.)") % fax_string);
-            return false;
-        }
-
-        ScopedPvtLock lock(_pvt);
-
-        std::string id;
-
-        if(fax_args.size() == 2)
-        {
-            id = fax_args[1];
-        }
-        else if(!_pvt->call()->_orig_addr.empty())
-        {
-            id = _pvt->call()->_orig_addr;
-        }
-
-        const char * orig_addr = id.empty() ? NULL : id.c_str();
-
-        int timeout = 5;
-
-        if(!_pvt->call()->_flags.check(Kflags::REALLY_CONNECTED) && !_pvt->loopWhileFlagTimed(Kflags::REALLY_CONNECTED, timeout, false))
-            return false;
-
-        if(!startFaxTX(orig_addr))
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to start send fax)"));
-            return false;
-        }
-
-        for(unsigned int i = 0; i < fax_files.size() ; ++i)
-        {
-            if (!addFaxFile(fax_files[i].c_str(), (i == fax_files.size()-1)? true : false))
-            {
-                DBG(FUNC, D("unable to add fax file='%s'")
-                        % fax_files[i].c_str());
-            }
-        }
-
-        _fax_cond.reset();
-
-        lock.unlock();
-
-        _fax_cond.wait();
-
-        switch_channel_set_variable(channel, "KFaxSent", ((_fax_result == kfaxrEndOfTransmission) ? "yes" : "no"));
-        switch_channel_set_variable(channel, "KFaxResult", (Verbose::faxResult((KFaxResult)_fax_result).c_str()));
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "r (%s)") % err._msg.c_str());
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
-    return true;
-}
-
-
-bool Fax::receiveFax(switch_core_session_t * session, const char *data)
-{
-    DBG(FUNC, PVT_FMT(_pvt->target(), "c (%s)") % data);
-
-    try
-    {
-        switch_channel_t *channel = _pvt->getFSChannel(session);
-
-        switch_channel_set_variable(channel, "KFaxReceived", "no");
-        switch_channel_set_variable(channel, "KFaxResult", "none");
-
-        std::string          fax_string((const char *)data);
-        Strings::vector_type fax_args;
-
-        Strings::tokenize(fax_string, fax_args, "|,");
-
-        if(fax_args.size() != 1 && fax_args.size() != 2)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "r (invalid string '%s': wrong number of separators.)") % fax_string);
-            return false;
-        }
-
-        ScopedPvtLock lock(_pvt);
-
-        std::string id;
-
-        if(fax_args.size() == 2)
-        {
-            id = fax_args[1];
-        }
-        else if(!_pvt->call()->_dest_addr.empty())
-        {
-            id = _pvt->call()->_dest_addr;
-        }
-
-        const char * orig_addr = id.empty() ? NULL : id.c_str();
-
-        int timeout = 5;
-
-        if(!_pvt->call()->_flags.check(Kflags::REALLY_CONNECTED) && !_pvt->loopWhileFlagTimed(Kflags::REALLY_CONNECTED, timeout, false))
-            return false;
-
-        if(!startFaxRX(fax_args[0].c_str(), orig_addr))
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to start receive fax)"));
-            return false;
-        }
-
-        _fax_cond.reset();
-
-        lock.unlock();
-
-        _fax_cond.wait();
-
-        switch_channel_set_variable(channel, "KFaxReceived", ((_fax_result == kfaxrEndOfReception) ? "yes" : "no"));
-        switch_channel_set_variable(channel, "KFaxResult", (Verbose::faxResult((KFaxResult)_fax_result).c_str()));
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "r (%s)") % err._msg.c_str());
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
-
-    return true;
-}
-
-bool Fax::onFaxChannelRelease(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_pvt->target(), "c"));
-
-    try
-    {
-        ScopedPvtLock lock(_pvt);
-
-        if (_pvt->call()->_flags.check(Kflags::FAX_SENDING))
-        {
-            _pvt->call()->_flags.clear(Kflags::FAX_SENDING);
-
-            /* make audio come back.. */
-            _pvt->startStream(false);
-            _pvt->startListen();
-        }
-        else if (_pvt->call()->_flags.check(Kflags::FAX_RECEIVING))
-        {
-            _pvt->call()->_flags.clear(Kflags::FAX_RECEIVING);
-
-            /* make audio come back.. */
-            _pvt->startStream(false);
-            _pvt->startListen();
-        }
-
-        _fax_result = (KFaxResult)e->AddInfo;
-
-        _fax_cond.signal();
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "r (unable to lock %s!)") % err._msg.c_str());
-        return false;
-    };
-
-    DBG(FUNC, PVT_FMT(_pvt->target(), "r"));
-
-    return true;
-}
-
-bool Fax::startFaxTX(const char * orig_addr)
-{
-    /* no audio after this point, so stop streams! */
-    _pvt->stopStream(false);
-    _pvt->stopListen();
-
-    std::string id;
-
-    if(orig_addr)
-        id = STG(FMT("orig_addr=\"%s\"") % orig_addr);
-
-    const char * param = id.empty() ? NULL : id.c_str();
-
-
-    if (!_pvt->command(KHOMP_LOG, CM_START_FAX_TX, param))
-    {
-        _pvt->startStream(false);
-        _pvt->startListen();
-        return false;
-    }
-
-    _pvt->call()->_flags.set(Kflags::FAX_SENDING);
-
-    return true;
-
-}
-
-bool Fax::stopFaxTX(void)
-{
-    /* EV_FAX_CHANNEL_FREE , EV_FAX_FILE_FAIL */
-    if (!_pvt->command(KHOMP_LOG, CM_STOP_FAX_TX))
-        return false;
-
-    _pvt->call()->_flags.clear(Kflags::FAX_SENDING);
-
-    /* make audio come back.. */
-    _pvt->startStream(false);
-    _pvt->startListen();
-
-    return true;
-}
-
-
-
-bool Fax::startFaxRX(const char * filename, const char * orig_addr)
-{
-    if(!filename)
-        return false;
-
-    std::string param = STG(FMT("filename=\"%s\"") % filename);
-
-    if(orig_addr)
-        param += STG(FMT(" orig_addr=\"%s\"") % orig_addr);
-
-    /* no audio after this point, so stop streams! */
-    _pvt->stopStream(false);
-    _pvt->stopListen();
-
-    if (!_pvt->command(KHOMP_LOG, CM_START_FAX_RX, param.c_str()))
-    {
-        _pvt->startStream(false);
-        _pvt->startListen();
-        return false;
-    }
-
-    _pvt->call()->_flags.set(Kflags::FAX_RECEIVING);
-
-    return true;
-}
-
-bool Fax::stopFaxRX()
-{
-    /* Events: EV_FAX_CHANNEL_FREE */
-    if (!_pvt->command(KHOMP_LOG, CM_STOP_FAX_RX))
-        return false;
-
-    _pvt->call()->_flags.clear(Kflags::FAX_RECEIVING);
-
-    /* make audio come back.. */
-    _pvt->startStream(false);
-    _pvt->startListen();
-
-    return true;
-}
-
-bool Fax::addFaxFile(const char * filename, bool last)
-{
-    /* Events: EV_FAX_FILE_SENT , EV_FAX_FILE_FAIL , EV_FAX_TX_TIMEOUT */
-    if(!filename)
-        return false;
-
-    std::string params = STG(FMT("filename=\"%s\" last=\"%s\"") % filename
-            % (last ? "true": "false"));
-
-    if (!_pvt->command(KHOMP_LOG, CM_ADD_FAX_FILE, params.c_str()))
-        return false;
-
-    return true;
-}
-
-/******************************************************************************/
-SMS::_SMSEvent SMS::SMSEvent;
-
-bool SMS::justAlloc(unsigned int count)
-{
-    /* incoming contexts */
-    MatchExtension::ContextListType contexts;
-
-    contexts.push_back(Opt::_options._context_gsm_sms());
-
-    /* temporary variables */
-    std::string context;
-    std::string exten("s");
-
-    const K3L_DEVICE_CONFIG & dev_cfg = Globals::k3lapi.device_config(_pvt->_target);
-
-    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
-    {
-        replaceTemplate((*i), "DD", _pvt->_target.device);
-        replaceTemplate((*i), "CC", _pvt->_target.object);
-        replaceTemplate((*i), "SSSS", atoi(dev_cfg.SerialNumber));
-    }
-
-    //switch(_pvt->findExtension(exten, context, contexts, _got_sms._type, _got_sms._from, false, true))
-    switch(MatchExtension::findExtension(exten, context, contexts, exten, _got_sms._from, false, true))
-    {
-    case MatchExtension::MATCH_NONE:
-        if( _got_sms._type != "broadcast")
-        {
-            LOG(WARNING, PVT_FMT(_pvt->target(), "unable to find context/exten for incoming SMS (s/%s), processing disabled for this channel.")
-                    % (contexts.size() >= 1 ? contexts[0] : "default"));
-
-        }
-
-        return false;
-
-    default:
-        DBG(FUNC, PVT_FMT(_pvt->target(), "our: context '%s', exten '%s'") % context % exten);
-        break;
-    }
-
-    for(unsigned int c = 0; c < count; c++)
-    {
-
-#if SWITCH_LESS_THAN(1,0,6)
-        switch_core_session_t *session = switch_core_session_request(Globals::khomp_sms_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL);
-#else
-        switch_core_session_t *session = switch_core_session_request(Globals::khomp_sms_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL);
-#endif
-
-        if(!session)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "Initilization Error, session not created!"));
-            return false;
-        }
-
-        switch_core_session_add_stream(session, NULL);
-
-        switch_core_session_set_private(session, _pvt);
-
-        switch_caller_profile_t *caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
-                "Khomp_SMS",                       //username
-                Opt::_options._dialplan().c_str(), //dialplan
-                NULL,                              //caller_id_name
-                _got_sms._from.c_str(),            //caller_id_number
-                NULL,                              //network_addr
-                _got_sms._from.c_str(),            //ani
-                NULL,                              //aniii
-                NULL,                              //rdnis
-                (char *) "mod_khomp",              //source
-                context.c_str(),                   //context
-                exten.c_str());                    //destination_number
-
-        if(!caller_profile)
-        {
-            _pvt->destroy(session);
-            LOG(ERROR, PVT_FMT(_pvt->target(), "r (Cannot create caller profile)"));
-            return false;
-        }
-
-        switch_channel_t *channel = switch_core_session_get_channel(session);
-
-        if(!channel)
-        {
-            _pvt->destroy(session);
-            LOG(ERROR, PVT_FMT(_pvt->target(), "r (Cannot get channel)"));
-            return false;
-        }
-
-        std::string name = STG(FMT("Khomp_SMS/%d/%d")
-                % _pvt->target().device
-                % _pvt->target().object);
-
-        switch_channel_set_name(channel, name.c_str());
-        switch_channel_set_caller_profile(channel, caller_profile);
-
-        //DBG(FUNC, PVT_FMT(_pvt->target(), "Connect inbound SMS channel %s") % name.c_str());
-
-        switch_channel_set_state(channel, CS_INIT);
-
-
-        _owners.push_front(session);
-    }
-
-    return true;
-}
-
-bool SMS::justStart()
-{
-    OwnersList::iterator i = _owners.begin();
-
-    if(i == _owners.end())
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "Cannot get session"));
-        return false;
-    }
-
-    switch_core_session_t *session = (*i);
-
-    _owners.pop_front();
-
-    if(!session)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "Cannot get session"));
-        return false;
-    }
-
-    switch_channel_t *channel = switch_core_session_get_channel(session);
-
-    if(!channel)
-    {
-        _pvt->destroy(session);
-        LOG(ERROR, PVT_FMT(_pvt->target(), "r (Cannot get channel)"));
-        return false;
-    }
-
-    switch_channel_set_variable(channel, "KSmsType", _got_sms._type.c_str());
-
-    if (_got_sms._type == "message" || _got_sms._type == "confirm")
-    {
-        switch_channel_set_variable(channel, "KSmsFrom", _got_sms._from.c_str());
-        switch_channel_set_variable(channel, "KSmsDate", _got_sms._date.c_str());
-    }
-
-    if(_got_sms._type == "confirm")
-    {
-        switch_channel_set_variable(channel, "KSmsDelivery", _got_sms._sc_date.c_str());
-        switch_channel_set_variable(channel, "KSmsStatus", _got_sms._status.c_str());
-    }
-    else
-    {
-        if(_got_sms._type == "broadcast")
-        {
-            switch_channel_set_variable(channel, "KSmsSerial", _got_sms._serial.c_str());
-            switch_channel_set_variable(channel, "KSmsPage", _got_sms._page.c_str());
-            switch_channel_set_variable(channel, "KSmsPages", _got_sms._pages.c_str());
-        }
-        switch_channel_set_variable(channel, "KSmsSize", _got_sms._size.c_str());
-        switch_channel_set_variable(channel, "KSmsMode", _got_sms._coding.c_str());
-        switch_channel_set_variable(channel, "KSmsBody", _got_sms._body.c_str());
-    }
-
-
-    if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS)
-    {
-        _pvt->destroy(session);
-        LOG(ERROR, PVT_FMT(_pvt->target(), "Error spawning thread"));
-        return false;
-    }
-
-    return true;
-}
-
-bool SMS::sendSMS(switch_core_session_t * session, const char *data)
-{
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
-
-    volatile bool finished = false;
-    volatile KGsmCallCause result = kgccNone;
-
-    try
-    {
-        //ScopedAllocLock alloc_lock;
-
-        if(!_can_send)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (cannot send SMS messages, modem NOT initialized!)"));
-            return false;
-        }
-
-        std::string           sms_string((const char *)data);
-        Strings::vector_type  sms_args;
-
-        Strings::tokenize(sms_string, sms_args, "/|,", 3);
-
-        if (sms_args.size() != 3)
-        {
-            LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (invalid dial string '%s': wrong number of separators.)") % sms_string);
-            return false;
-        }
-
-        std::string dest(sms_args[1]);
-
-        bool conf = false;
-
-        if (dest[0] == '!')
-        {
-            dest.erase(0,1);
-            conf = true;
-        }
-
-        if (dest[dest.size()-1] == '!')
-        {
-            dest.erase(dest.size()-1,1);
-            conf = true;
-        }
-
-        // get options/values
-
-        _send_sms._dest = dest;
-        _send_sms._conf = conf;
-        _send_sms._body = sms_args[2];
-
-        Request request_sms(_send_sms, &finished, &result);
-
-        _mutex.lock();
-        bool status = _buffer.provide(request_sms);
-        _mutex.unlock();
-
-        _pvt->_mutex.unlock();
-
-        if(status)
-            _cond.signal();
-
-        while (!finished)
-        {
-            usleep(200000);
-        }
-
-        _pvt->_mutex.lock();
-
-        switch_channel_t *channel = _pvt->getFSChannel(session);
-
-        switch_channel_set_variable(channel, "KSmsDelivered", ((KGsmSmsCause)result == ((KGsmSmsCause)0) ? "yes" : "no"));
-        switch_channel_set_variable(channel, "KSmsErrorCode", STG(FMT("%d") % result).c_str());
-        switch_channel_set_variable(channel, "KSmsErrorName", ((KGsmSmsCause)result == ((KGsmSmsCause)0) ? "None" : Verbose::gsmSmsCause((KGsmSmsCause)result).c_str()));
-
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to global alloc lock)"));
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) %s") % err._msg.c_str());
-        //return false;
-    }
-
-    bool ret = ((KGsmSmsCause)result == ((KGsmSmsCause)0));
-
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r (%s)") % (ret ? "true" : "false"));
-
-    //return (KGsmSmsCause)result;
-    return ret;
-}
-
-bool SMS::onNewSMS(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(_pvt);
-
-        if(!_can_receive)
-        {
-            DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) received new SMS message(s), but receiving is disabled. keeping the message(s) at the SIM card."));
-            ret = false;
-        }
-        else if(!justAlloc(e->AddInfo))
-        {
-            LOG(WARNING, PVT_FMT(_pvt->target(), "(SMS) unable to allocate channel for new SMS message(s). disabling processing to prevent messages from being lost."));
-            _can_receive = false;
-            ret = false;
-        }
-        else
-        {
-
-            DBG(FUNC, PVT_FMT(_pvt->target(), "downloading %d SMS message(s) on the SIM card.") % e->AddInfo);
-
-            _pvt->command(KHOMP_LOG, CM_GET_SMS);
-        }
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r"));
-
-    return ret;
-}
-
-bool SMS::onSMSInfo(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
-
-    try
-    {
-        ScopedPvtLock lock(_pvt);
-
-        Globals::k3lapi.get_param(e, "sms_type",    _got_sms._type);
-        Globals::k3lapi.get_param(e, "sms_from",    _got_sms._from);
-        Globals::k3lapi.get_param(e, "sms_date",    _got_sms._date);
-        Globals::k3lapi.get_param(e, "sms_size",    _got_sms._size);
-        Globals::k3lapi.get_param(e, "sms_coding",  _got_sms._coding);
-        Globals::k3lapi.get_param(e, "sms_serial",  _got_sms._serial);
-        Globals::k3lapi.get_param(e, "sms_id",      _got_sms._id);
-        Globals::k3lapi.get_param(e, "sms_page",    _got_sms._page);
-        Globals::k3lapi.get_param(e, "sms_pages",   _got_sms._pages);
-        Globals::k3lapi.get_param(e, "sms_sc_date", _got_sms._sc_date);
-        Globals::k3lapi.get_param(e, "sms_status",  _got_sms._status);
-
-        //DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) type=%s from=%s date=%s size=%s coding=%s serial=%s id=%s page=%s pages=%s sc_date=%s status=%s") % _got_sms._type % _got_sms._from % _got_sms._date % _got_sms._size % _got_sms._coding % _got_sms._serial % _got_sms._id % _got_sms._page % _got_sms._pages % _got_sms._sc_date % _got_sms._status);
-
-        if (_owners.empty() && !justAlloc(1) && (_got_sms._type.compare("broadcast") != 0))
-        {
-            // this error is fatal
-            LOG(ERROR, PVT_FMT(_pvt->target(), "unable to allocate channel, new SMS message from %s will not be sent to dialplan!") % _got_sms._from);
-            return false;
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r"));
-
-    return true;
-}
-
-bool SMS::onSMSData(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
-
-    try
-    {
-        ScopedPvtLock lock(_pvt);
-
-        if (_owners.empty())
-        {
-            if(_got_sms._type != "broadcast")
-            {
-                LOG(WARNING, PVT_FMT(_pvt->target(), "unable to allocate channel for new SMS message(s). disabling processing to prevent messages from being lost."));
-                _can_receive = false;
-            }
-        }
-        else
-        {
-            _got_sms._body = (const char *)(e->Params ? e->Params : "");
-
-            SMSEvent(_pvt, _got_sms);
-
-            if(!justStart())
-            {
-                if(_got_sms._type != "broadcast")
-                {
-                    LOG(ERROR, PVT_FMT(_pvt->target(), "unable to receive SMS from '%s', something wrong!") % _got_sms._from);
-                    LOG(ERROR, PVT_FMT(_pvt->target(), "disabling SMS processing to prevent messages from being lost."));
-
-                    _can_receive = false;
-                }
-            }
-        }
-
-        if(_can_receive)
-        {
-            /* stats update! */
-            if(_got_sms._type == "message")
-            {
-                statistics<SMSStatistics>()->incrementIncoming();
-            }
-            else if(_got_sms._type == "confirm")
-            {
-                statistics<SMSStatistics>()->incrementConfirm();
-            }
-            else
-            {
-                statistics<SMSStatistics>()->incrementBroadcast();
-            }
-        }
-
-        /* reset data stuff */
-        _got_sms.clear();
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r"));
-    return true;
-}
-
-bool SMS::onSMSSendResult(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) c"));
-
-    try
-    {
-        ScopedPvtLock lock(_pvt);
-
-        _result = (KGsmCallCause)e->AddInfo;
-        _pvt->call()->_flags.clear(Kflags::SMS_DOING_UPLOAD);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_pvt->target(), "(SMS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_pvt->target(), "(SMS) r"));
-
-    return true;
-}
-
-int SMS::smsThread(void * sms_ptr)
-{
-    SMS * sms = static_cast < SMS * > (sms_ptr);
-
-    Board::KhompPvt * pvt = static_cast < Board::KhompPvt * > (sms->_pvt);
-
-    DBG(THRD, PVT_FMT(pvt->target(), "c"));
-
-    bool loop = true;
-
-    while(loop)
-    {
-        if(sms->_cond.wait(1000))
-        {
-            if(sms->_shutdown)
-                return 0;
-        }
-
-        try
-        {
-            ScopedPvtLock lock(pvt);
-
-            K3L_CHANNEL_STATUS status;
-
-            KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus(
-                    pvt->_target.device,
-                    pvt->_target.object + ksoChannel,
-                    &status,
-                    sizeof(status));
-
-            if (ret == ksSuccess)
-            {
-                switch (status.AddInfo)
-                {
-                    case kgsmModemError:
-                    case kgsmSIMCardError:
-                        return 0;
-
-                    case kgsmIdle:
-                    {
-                        /* pede registro do canal.. */
-                        pvt->command(KHOMP_LOG, CM_SEND_TO_MODEM, "AT+COPS?");
-
-                        /* pede estado da antena.. */
-                        pvt->command(KHOMP_LOG, CM_SEND_TO_MODEM, "AT+CSQ?");
-
-                        /* forca tipo padrao a ser message... */
-                        sms->_got_sms._type = "message";
-
-                        /* pre-aloca canal para receber mensagens SMS. */
-                        if (sms->justAlloc())
-                        {
-                            /* habilita processamento de SMSs entrantes */
-                            sms->_can_receive = true;
-
-                            /* envia comando para "limpar" SMSs do SIM card */
-                            pvt->command(KHOMP_LOG, CM_CHECK_NEW_SMS);
-                        }
-
-                        sms->_got_sms.clear();
-
-                        /* sai fora do loop! */
-                        loop = false;
-                    }
-                    default:
-                        break;
-                }
-            }
-        }
-        catch (ScopedLockFailed & err)
-        {
-            DBG(FUNC, PVT_FMT(pvt->_target, "unable to obtain lock: %s") % err._msg.c_str());
-        }
-
-    }
-
-    sms->_can_send = true;
-
-    while(true)
-    {
-        Request request_sms;
-
-        DBG(THRD, PVT_FMT(pvt->_target, "begin"));
-
-        while(!sms->_buffer.consume(request_sms))
-        {
-            DBG(THRD, PVT_FMT(pvt->_target, "buffer empty"));
-
-            sms->_cond.wait();
-
-            DBG(THRD, PVT_FMT(pvt->_target, "waked up!"));
-
-            if(sms->_shutdown)
-                return 0;
-        }
-
-        DBG(THRD, PVT_FMT(pvt->_target, "processing buffer..."));
-
-        try
-        {
-            int timeout = 30;
-
-            ScopedPvtLock lock(pvt);
-
-            pvt->call()->_flags.set(Kflags::SMS_DOING_UPLOAD);
-
-            if (pvt->command(KHOMP_LOG, CM_PREPARE_SMS, request_sms._send_sms._body.c_str()))
-            {
-                std::string extra = (request_sms._send_sms._conf ? " sms_confirm=\"TRUE\"" : "");
-
-                if (pvt->command(KHOMP_LOG, CM_SEND_SMS,
-                            STG(FMT("sms_to=\"%s\"%s") % request_sms._send_sms._dest % extra).c_str()))
-                {
-                    if (!pvt->loopWhileFlagTimed(Kflags::SMS_DOING_UPLOAD, timeout))
-                        break;
-                }
-                else
-                {
-                    sms->_result = kgccResourceUnavailable;
-                }
-            }
-            else
-            {
-                sms->_result = kgccInvalidMessage;
-            }
-
-            pvt->call()->_flags.clear(Kflags::SMS_DOING_UPLOAD);
-
-            if (request_sms._cause)
-                *(request_sms._cause) = (KGsmCallCause)sms->_result;
-
-            if (request_sms._finished)
-                *(request_sms._finished) = true;
-
-            if (sms->_result == kgccNone)
-            {
-                sms->SMSEvent(pvt, sms->_send_sms);
-
-                /* stats update if sent! */
-                sms->statistics<SMSStatistics>()->incrementOutgoing();
-            }
-
-            sms->_send_sms.clear();
-
-        }
-        catch (ScopedLockFailed & err)
-        {
-            DBG(FUNC, PVT_FMT(pvt->_target, "unable to obtain lock: %s") % err._msg.c_str());
-        }
-
-        DBG(FUNC, PVT_FMT(pvt->target(), "ok, going to loop..."));
-
-    }
-
-
-    DBG(FUNC, PVT_FMT(pvt->target(), "r"));
-
-    return 0;
-}
-
diff --git a/src/mod/endpoints/mod_khomp/src/cli.cpp b/src/mod/endpoints/mod_khomp/src/cli.cpp
deleted file mode 100644
index b7d62e180b..0000000000
--- a/src/mod/endpoints/mod_khomp/src/cli.cpp
+++ /dev/null
@@ -1,3141 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "cli.h"
-#include "k3l.h"
-#include "lock.h"
-#include "khomp_pvt.h"
-#include "spec.h"
-
-/* our stream and interface handlers */
-switch_stream_handle_t *Cli::stream;
-switch_loadable_module_interface_t **Cli::module_interface;
-
-/* contains all commands */
-Cli::Commands Cli::_commands;
-
-/* khomp all commands usage */
-std::string Cli::_khomp_usage;
-
-/* register our commands, but you must create the command function */
-void Cli::registerCommands(APIFunc func,switch_loadable_module_interface_t **mod_int)
-{
-    if(!mod_int || !*mod_int)
-    {
-        LOG(ERROR,"Invalid module passed");
-        return;
-    }
-
-    /* the manual */
-    _khomp_usage =                                                             \
-"---------------------------------------------------------------------------\n"\
-"---------------------------------- HELP -----------------------------------\n"\
-"---------------------------------------------------------------------------\n"\
-" khomp channels disconnect {all | <board> all | <board> <channel>}\n"         \
-" khomp channels unblock {all | <board> all | <board> <channel>}\n"            \
-" khomp clear links [<board> [<link>]]\n"                                      \
-" khomp clear statistics [<board> [<channel>]]\n"                              \
-" khomp dump config\n"                                                         \
-" khomp get <option>\n"                                                        \
-" khomp kommuter {on|off}\n"                                                   \
-" khomp kommuter count\n"                                                      \
-" khomp log console <options>\n"                                               \
-" khomp log disk <options>\n"                                                  \
-" khomp log rotate\n"                                                          \
-" khomp log status\n"                                                          \
-" khomp log trace isdn <what>[,<what2>[,..]]\n"                                \
-" khomp log trace k3l {on|off}\n"                                              \
-" khomp log trace r2 {on|off}\n"                                               \
-" khomp reset links [<board> [<link>]]\n"                                      \
-" khomp revision\n"                                                            \
-" khomp select sim <board> <channel> <sim_card>\n"                             \
-" khomp send command <board> <channel> <command> [argument]\n"                 \
-" khomp send raw command <board> <dsp> <c0> <c1> [...]\n"                      \
-" khomp set <option> <value>\n"                                                \
-" khomp show calls [<board> [<channel>]]\n"                                    \
-" khomp show channels [{<board> [<channel>]} | \n"                             \
-"                      {{concise|verbose|xml} [<board> [<channel>]]}]\n"       \
-" khomp show links [[errors] [{<board>} | {{concise|verbose|xml}[<board>]}]]\n"\
-" khomp show statistics [{{verbose|xml} [<board> [<channel>]]} | \n"           \
-"                        {detailed <board> <channel>}]\n"                      \
-" khomp sms <device> <destination> <message..>\n"                              \
-" khomp summary [concise|verbose|xml]\n"                                       \
-"---------------------------------------------------------------------------\n\n";
-
-    /* we need this module_inteface, is used by SWITCH_ADD_API, there's no escape */
-    module_interface = mod_int;
-
-    /* khomp cli commands */
-    SWITCH_ADD_API(Globals::api_interface, "khomp", "Khomp Menu", func, _khomp_usage.c_str());
-
-    /* insert commands in list */
-    for(Commands::iterator itr = _commands.begin();itr != _commands.end();itr++)
-    {
-        switch_console_set_complete(STR(FMT("add khomp %s") % (*itr)->complete_name));
-
-        /* if we have options, let's insert them */
-        if((*itr)->options.size() > 0)
-        {
-            std::vector<std::string>::iterator itr_option = (*itr)->options.begin();
-            while(itr_option != (*itr)->options.end())
-            {
-                switch_console_set_complete(STR(FMT("add khomp %s %s") % (*itr)->complete_name % *itr_option));
-                itr_option++;
-            }
-        }
-    }
-}
-
-/* is responsible for parse and execute all commands */
-bool Cli::parseCommands(int argc, char *argv[])
-{
-    /*
-     * DEBUG_CLI_CMD();
-     */
-
-    /* khomp summary */
-    if (ARG_CMP(0, "summary"))
-        return EXEC_CLI_CMD(Cli::KhompSummary);
-
-    /* khomp show */
-    else if(ARG_CMP(0, "show"))
-    {
-        /* khomp show calls */
-        if(ARG_CMP(1, "calls"))
-            return EXEC_CLI_CMD(Cli::KhompShowCalls);
-
-        /* khomp show channels */
-        if(ARG_CMP(1, "channels"))
-            return EXEC_CLI_CMD(Cli::KhompShowChannels);
-
-        /* khomp show links */
-        if(ARG_CMP(1, "links"))
-            return EXEC_CLI_CMD(Cli::KhompShowLinks);
-
-        /* khomp show statistics */
-        if(ARG_CMP(1, "statistics"))
-            return EXEC_CLI_CMD(Cli::KhompShowStatistics);
-    }
-
-    /* khomp clear */
-    else if(ARG_CMP(0, "clear"))
-    {
-        /* khomp clear links */
-        if(ARG_CMP(1, "links"))
-            return EXEC_CLI_CMD(Cli::KhompClearLinks);
-
-        /* khomp clear statistics */
-        if(ARG_CMP(1, "statistics"))
-            return EXEC_CLI_CMD(Cli::KhompClearStatistics);
-    }
-
-    /* khomp dump */
-    else if(ARG_CMP(0, "dump"))
-    {
-        /* khomp dump config */
-        if(ARG_CMP(1, "config"))
-            return EXEC_CLI_CMD(Cli::KhompDumpConfig);
-    }
-
-    /* khomp reset */
-    else if(ARG_CMP(0, "reset"))
-    {
-        /* khomp reset links */
-        if(ARG_CMP(1, "links"))
-            return EXEC_CLI_CMD(Cli::KhompResetLinks);
-
-    }
-
-    /* khomp sms */
-    else if(ARG_CMP(0, "sms"))
-    {
-        return EXEC_CLI_CMD(Cli::KhompSMS);
-    }
-
-    /* khomp log */
-    else if(ARG_CMP(0, "log"))
-    {
-        /* khomp log console */
-        if(ARG_CMP(1, "console"))
-            return EXEC_CLI_CMD(Cli::KhompLogConsole);
-
-        /* khomp log  disk */
-        if(ARG_CMP(1, "disk"))
-            return EXEC_CLI_CMD(Cli::KhompLogDisk);
-
-        /* khomp log status */
-        if(ARG_CMP(1, "status"))
-            return EXEC_CLI_CMD(Cli::KhompLogStatus);
-
-        /* khomp log rotate */
-        if(ARG_CMP(1, "rotate"))
-            return EXEC_CLI_CMD(Cli::KhompLogRotate);
-
-        /* khomp log trace */
-        if(ARG_CMP(1, "trace"))
-        {
-            /* khomp log trace k3l */
-            if(ARG_CMP(2, "k3l"))
-                return EXEC_CLI_CMD(Cli::KhompLogTraceK3L);
-
-            /* khomp log trace isdn */
-            if(ARG_CMP(2, "isdn"))
-                return EXEC_CLI_CMD(Cli::KhompLogTraceISDN);
-
-            /* khomp log trace r2 */
-            if(ARG_CMP(2, "r2"))
-                return EXEC_CLI_CMD(Cli::KhompLogTraceR2);
-        }
-    }
-
-    /* khomp channels */
-    else if(ARG_CMP(0, "channels"))
-    {
-        /* khomp channels disconnect */
-        if(ARG_CMP(1, "disconnect"))
-            return EXEC_CLI_CMD(Cli::KhompChannelsDisconnect);
-
-        /* khomp channels unblock */
-        if(ARG_CMP(1, "unblock"))
-            return EXEC_CLI_CMD(Cli::KhompChannelsUnblock);
-    }
-
-    /* khomp get */
-    else if(ARG_CMP(0, "get"))
-        return EXEC_CLI_CMD(Cli::KhompGet);
-
-    /* khomp set */
-    else if(ARG_CMP(0, "set"))
-        return EXEC_CLI_CMD(Cli::KhompSet);
-
-    /* khomp reivision */
-    else if(ARG_CMP(0, "revision"))
-        return EXEC_CLI_CMD(Cli::KhompRevision);
-
-    /* khomp send */
-    else if(ARG_CMP(0, "send"))
-    {
-        /* khomp send command */
-        if(ARG_CMP(1, "command"))
-            return EXEC_CLI_CMD(Cli::KhompSendCommand);
-
-        /* khomp send raw */
-        if(ARG_CMP(1, "raw"))
-            return EXEC_CLI_CMD(Cli::KhompSendRawCommand);
-    }
-
-    /* khomp select */
-    else if(ARG_CMP(0, "select"))
-    {
-        /* khomp select sim */
-        if(ARG_CMP(1, "sim"))
-            return EXEC_CLI_CMD(Cli::KhompSelectSim);
-
-    }
-
-    /* khomp kommuter */
-    else if(ARG_CMP(0, "kommuter"))
-    {
-        if(ARG_CMP(1, "on") || ARG_CMP(1, "off"))
-            return EXEC_CLI_CMD(Cli::KhompKommuterOnOff);
-
-        if(ARG_CMP(1, "count"))
-            return EXEC_CLI_CMD(Cli::KhompKommuterCount);
-    }
-
-    /* if everything fails, i'm here to support */
-    printKhompUsage();
-
-    return false;
-}
-
-/******************************************************************************/
-/******************** Defining the static initialization **********************/
-
-Cli::_KhompSummary            Cli::KhompSummary;
-Cli::_KhompShowCalls          Cli::KhompShowCalls;
-Cli::_KhompShowChannels       Cli::KhompShowChannels;
-Cli::_KhompShowLinks          Cli::KhompShowLinks;
-Cli::_KhompShowStatistics     Cli::KhompShowStatistics;
-Cli::_KhompClearLinks         Cli::KhompClearLinks;
-Cli::_KhompDumpConfig         Cli::KhompDumpConfig;
-Cli::_KhompClearStatistics    Cli::KhompClearStatistics;
-Cli::_KhompResetLinks         Cli::KhompResetLinks;
-Cli::_KhompChannelsDisconnect Cli::KhompChannelsDisconnect;
-Cli::_KhompChannelsUnblock    Cli::KhompChannelsUnblock;
-Cli::_KhompSMS                Cli::KhompSMS;
-Cli::_KhompLogConsole         Cli::KhompLogConsole;
-Cli::_KhompLogDisk            Cli::KhompLogDisk;
-Cli::_KhompLogStatus          Cli::KhompLogStatus;
-Cli::_KhompLogRotate          Cli::KhompLogRotate;
-Cli::_KhompLogTraceK3L        Cli::KhompLogTraceK3L;
-Cli::_KhompLogTraceISDN       Cli::KhompLogTraceISDN;
-Cli::_KhompLogTraceR2         Cli::KhompLogTraceR2;
-Cli::_KhompGet                Cli::KhompGet;
-Cli::_KhompSet                Cli::KhompSet;
-Cli::_KhompRevision           Cli::KhompRevision;
-Cli::_KhompSendCommand        Cli::KhompSendCommand;
-Cli::_KhompSendRawCommand     Cli::KhompSendRawCommand;
-Cli::_KhompSelectSim          Cli::KhompSelectSim;
-Cli::_KhompKommuterOnOff      Cli::KhompKommuterOnOff;
-Cli::_KhompKommuterCount      Cli::KhompKommuterCount;
-
-/******************************************************************************/
-/*************************** Defining the commands ****************************/
-/*!
- \brief Print a system summary for all the boards. [khomp summary]
- */
-bool Cli::_KhompSummary::execute(int argc, char *argv[])
-{
-    if(argc < 1 || argc > 2)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    Cli::OutputType output_type = Cli::VERBOSE;
-    if(ARG_CMP(1, "concise")) output_type = Cli::CONCISE;
-    if(ARG_CMP(1, "xml"))
-    {
-        output_type = Cli::XML;
-        createRoot("summary");
-    }
-
-    class_type classe = ( !_on_cli_term ? C_MESSAGE : C_CLI );
-    K3L_API_CONFIG apiCfg;
-
-    if (output_type == Cli::VERBOSE)
-    {
-        K::Logger::Logg2(classe, stream, " ------------------------------------------------------------------");
-        K::Logger::Logg2(classe, stream, "|---------------------- Khomp System Summary ----------------------|");
-        K::Logger::Logg2(classe, stream, "|------------------------------------------------------------------|");
-    }
-
-    const bool running = (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess);
-
-    if(running)
-    {
-        switch(output_type)
-        {
-            case Cli::VERBOSE:
-            {
-                K::Logger::Logg2(classe, stream, FMT("| K3L API %d.%d.%d [m.VPD %d] - %-38s |")
-                        % apiCfg.MajorVersion % apiCfg.MinorVersion % apiCfg.BuildVersion
-                        % apiCfg.VpdVersionNeeded % apiCfg.StrVersion);
-            } break;
-
-            case Cli::CONCISE:
-            {
-                K::Logger::Logg2(classe, stream, FMT("%d.%d.%d;%d;%s")
-                        % apiCfg.MajorVersion % apiCfg.MinorVersion % apiCfg.BuildVersion
-                        % apiCfg.VpdVersionNeeded % apiCfg.StrVersion);
-            } break;
-
-            case Cli::XML:
-            {
-                /* summary/k3lapi */
-                switch_xml_t xk3lapi = switch_xml_add_child_d(root, "k3lapi",0);
-
-                /* summary/k3lapi/version */
-                switch_xml_t xk3l_version = switch_xml_add_child_d(xk3lapi,"version", 0);
-                switch_xml_set_attr_d(xk3l_version,"major",STR(FMT("%d") % apiCfg.MajorVersion));
-                switch_xml_set_attr_d(xk3l_version,"minor",STR(FMT("%d") % apiCfg.MinorVersion));
-                switch_xml_set_attr_d(xk3l_version,"build",STR(FMT("%d") % apiCfg.BuildVersion));
-                switch_xml_set_attr_d(xk3l_version,"vpd",STR(FMT("%d")   % apiCfg.VpdVersionNeeded));
-
-                /* summary/k3lapi/version/revision */
-                switch_xml_t xk3l_rev = switch_xml_add_child_d(xk3l_version,"revision",0);
-                switch_xml_set_txt_d(xk3l_rev,STR(FMT("%s") % apiCfg.StrVersion));
-            } break;
-
-            default:
-                break;
-        }
-    }
-    else
-    {
-        switch(output_type)
-        {
-            case Cli::VERBOSE:
-            {
-                K::Logger::Logg2(classe, stream, "| Connection to KServer broken, please check system logs!          |");
-            } break;
-
-            case Cli::CONCISE:
-            {
-                K::Logger::Logg2(classe, stream, "CONNECTION BROKEN");
-            } break;
-
-            case Cli::XML:
-            {
-                 /* summary/k3lapi */
-                switch_xml_t xk3lapi = switch_xml_add_child_d(root, "k3lapi",0);
-                switch_xml_set_txt_d(xk3lapi, "CONNECTION BROKEN");
-            } break;
-        }
-    }
-
-#ifndef MOD_KHOMP_VERSION
-#define MOD_KHOMP_VERSION "unknown"
-#endif
-
-#ifndef SWITCH_VERSION_FULL
-#define SWITCH_VERSION_FULL "unknown"
-#endif
-
-    std::string khomp_endpoint_rev(MOD_KHOMP_VERSION);
-    std::string freeswitch_rev(SWITCH_VERSION_FULL);
-
-    switch(output_type)
-    {
-        case Cli::VERBOSE:
-        {
-            K::Logger::Logg2(classe, stream, FMT("| Khomp Endpoint - %-47s |") % khomp_endpoint_rev);
-            K::Logger::Logg2(classe, stream, FMT("| FreeSWITCH - %-51s |") % freeswitch_rev);
-        } break;
-
-        case Cli::CONCISE:
-        {
-            K::Logger::Logg2(classe, stream, FMT("%s") % khomp_endpoint_rev);
-            K::Logger::Logg2(classe, stream, FMT("%s") % freeswitch_rev);
-        } break;
-
-        case Cli::XML:
-        {
-            /* summary/mod_khomp */
-            switch_xml_t xmod_khomp = switch_xml_add_child_d(root,"mod_khomp",0);
-
-            /* summary/mod_khomp/revision */
-            switch_xml_t xrevision  = switch_xml_add_child_d(xmod_khomp,"revision",0);
-            switch_xml_set_txt_d(xrevision, khomp_endpoint_rev.c_str());
-
-            /* summary/freeswitch */
-            switch_xml_t xfs = switch_xml_add_child_d(root,"freeswitch",0);
-
-            /* summary/freeswitch/revision */
-            switch_xml_t xfs_rev = switch_xml_add_child_d(xfs,"revision",0);
-            switch_xml_set_txt_d(xfs_rev, freeswitch_rev.c_str());
-        } break;
-
-        default:
-            break;
-    }
-
-    if(!running)
-    {
-        if (output_type == Cli::VERBOSE)
-            K::Logger::Logg2(classe,stream, " ------------------------------------------------------------------");
-
-        if (output_type == Cli::XML)
-        {
-            printXMLOutput(stream);
-            clearRoot();
-        }
-
-        return false;
-    }
-
-    if (output_type == Cli::XML)
-    {
-        /* summary/board */
-        xdevs = switch_xml_add_child_d(root,"devices",0);
-    }
-
-    for (unsigned int i = 0; i < Globals::k3lapi.device_count(); i++)
-    {
-        const K3L_DEVICE_CONFIG & devCfg = Globals::k3lapi.device_config(i);
-
-        std::string tipo = Verbose::deviceName((KDeviceType)Globals::k3lapi.device_type(i), devCfg.DeviceModel);
-
-        if (output_type == Cli::VERBOSE)
-            K::Logger::Logg2(classe, stream, " ------------------------------------------------------------------");
-
-        switch (Globals::k3lapi.device_type(i))
-        {
-            /* E1 boards */
-            case kdtE1:
-            case kdtConf:
-            case kdtPR:
-            case kdtE1GW:
-            case kdtE1IP:
-            case kdtE1Spx:
-            case kdtGWIP:
-            case kdtFXS:
-            case kdtFXSSpx:
-            case kdtE1FXSSpx:
-            {
-                K3L_E1600A_FW_CONFIG dspAcfg;
-                K3L_E1600B_FW_CONFIG dspBcfg;
-
-                if ((k3lGetDeviceConfig(i, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) == ksSuccess) &&
-                    (k3lGetDeviceConfig(i, ksoFirmware + kfiE1600B, &dspBcfg, sizeof(dspBcfg)) == ksSuccess))
-                {
-                    switch(output_type)
-                    {
-                        case Cli::VERBOSE:
-                        {
-                            K::Logger::Logg2(classe, stream, FMT("| [[ %02u ]] %s, serial '%s', %02d channels, %d links.%s|")
-                                    % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount % devCfg.LinkCount
-                                    % std::string(std::max<int>(0, 22 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
-                            K::Logger::Logg2(classe, stream, FMT("| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|")
-                                    % dspAcfg.DspVersion % dspBcfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                    % std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' '));
-                            K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspAcfg.FwVersion);
-                            K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspBcfg.FwVersion);
-
-                            K::Logger::Logg2(classe, stream, FMT("| * Echo Canceller: %-20s - Location: %-12s  |")
-                                    % Verbose::echoCancellerConfig(devCfg.EchoConfig)
-                                    % Verbose::echoLocation(devCfg.EchoLocation));
-                        } break;
-
-                        case Cli::CONCISE:
-                        {
-                            K::Logger::Logg2(classe, stream, FMT("%02u;%s;%d;%d;%d;%s;%s;%02d;%02d;%s;%s;%s;%s")
-                                    % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount % devCfg.LinkCount
-                                    % dspAcfg.DspVersion % dspBcfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                    % dspAcfg.FwVersion % dspBcfg.FwVersion
-                                    % Verbose::echoCancellerConfig(devCfg.EchoConfig)
-                                    % Verbose::echoLocation(devCfg.EchoLocation));
-                        } break;
-
-                        case Cli::XML:
-                        {
-                            /* boards/board */
-                            switch_xml_t xdev = switch_xml_add_child_d(xdevs,"device",0);
-                            switch_xml_set_attr_d(xdev,"id",STR(FMT("%02u") % i));
-
-                            /* boards/board/general */
-                            switch_xml_t xgeneral = switch_xml_add_child_d(xdev,"general",0);
-
-                            /* boards/board/general/type */
-                            switch_xml_t xtype = switch_xml_add_child_d(xgeneral,"type",0);
-                            switch_xml_set_txt_d(xtype,tipo.c_str());
-
-                            /* boards/board/general/serial */
-                            switch_xml_t xserial = switch_xml_add_child_d(xgeneral,"serial",0);
-                            switch_xml_set_txt_d(xserial, devCfg.SerialNumber);
-
-                            /* boards/board/general/channels */
-                            switch_xml_t xchannels = switch_xml_add_child_d(xgeneral,"channels",0);
-                            switch_xml_set_txt_d(xchannels, STR(FMT("%02d") % devCfg.ChannelCount));
-
-                            /* boards/board/general/links */
-                            switch_xml_t xlinks = switch_xml_add_child_d(xgeneral,"links",0);
-                            switch_xml_set_txt_d(xlinks, STR(FMT("%d") % devCfg.LinkCount));
-
-                            /* boards/board/hardware */
-                            switch_xml_t xhardware = switch_xml_add_child_d(xdev,"hardware",0);
-
-                            /* boards/board/hardware/dsps */
-                            switch_xml_t xdsps = switch_xml_add_child_d(xhardware,"dsps",0);
-
-                            /* boards/board/hardware/dsps/dsp (0) */
-                            switch_xml_t xdsp0 = switch_xml_add_child_d(xdsps,"dsp",0);
-                            switch_xml_set_attr_d(xdsp0,"id","0");
-
-                            /* boards/board/hardware/dsps/dsp/version */
-                            switch_xml_t xversion0 = switch_xml_add_child_d(xdsp0,"version",0);
-                            switch_xml_set_txt_d(xversion0, dspAcfg.DspVersion);
-
-                            /* boards/board/hardware/dsps/dsp/firmware */
-                            switch_xml_t xfirmware0 = switch_xml_add_child_d(xdsp0,"firmware",0);
-                            switch_xml_set_txt_d(xfirmware0,dspAcfg.FwVersion);
-
-                            /* boards/board/hardware/dsps/dsp (1) */
-                            switch_xml_t xdsp1 = switch_xml_add_child_d(xdsps,"dsp",0);
-                            switch_xml_set_attr_d(xdsp1,"id","1");
-
-                            /* boards/board/hardware/dsps/dsp/version */
-                            switch_xml_t xversion1 = switch_xml_add_child_d(xdsp1,"version",0);
-                            switch_xml_set_txt_d(xversion1, dspBcfg.DspVersion);
-
-                            /* boards/board/hardware/dsps/dsp/firmware */
-                            switch_xml_t xfirmware1 = switch_xml_add_child_d(xdsp1,"firmware",0);
-                            switch_xml_set_txt_d(xfirmware1,dspBcfg.FwVersion);
-                        } break;
-
-                        default:
-                            break;
-                    }
-                }
-
-                break;
-            }
-
-            /* analog boards */
-            case kdtFXO:
-            case kdtFXOVoIP:
-            /*
-            TODO: This not found
-            case kdtFX:
-            case kdtFXVoIP:
-            */
-            {
-                K3L_FXO80_FW_CONFIG dspCfg;
-
-                if (k3lGetDeviceConfig(i, ksoFirmware + kfiFXO80, &dspCfg, sizeof(dspCfg)) == ksSuccess)
-                {
-                    switch(output_type)
-                    {
-                        case Cli::VERBOSE:
-                        {
-                            K::Logger::Logg2(classe, stream, FMT("| [[ %02u ]] %s, serial '%s', %02d channels. %s|")
-                                        % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
-                                        % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
-                            K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|")
-                                        % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                        % std::string(30 - strlen(dspCfg.DspVersion), ' '));
-                            K::Logger::Logg2(classe, stream, FMT("| * %-63s|") % dspCfg.FwVersion);
-                        } break;
-
-                        case Cli::CONCISE:
-                        {
-                            K::Logger::Logg2(classe, stream, FMT("%02u;%s;%d;%d;%s;%02d;%02d;%s")
-                                        % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
-                                        % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                        % dspCfg.FwVersion);
-                        } break;
-
-                        case Cli::XML:
-                        {
-                            /* boards/board  */
-                            switch_xml_t xdev = switch_xml_add_child_d(xdevs,"device",0);
-                            switch_xml_set_attr_d(xdev,"id",STR(FMT("%02u") % i));
-
-                            /* boards/board/general  */
-                            switch_xml_t xgeneral = switch_xml_add_child_d(xdev,"general",0);
-
-                            /* boards/board/general/type  */
-                            switch_xml_t xtype = switch_xml_add_child_d(xgeneral,"type",0);
-                            switch_xml_set_txt_d(xtype,tipo.c_str());
-
-                            /* boards/board/general/serial */
-                            switch_xml_t xserial = switch_xml_add_child_d(xgeneral,"serial",0);
-                            switch_xml_set_txt_d(xserial, devCfg.SerialNumber);
-
-                            /* boards/board/general/channels */
-                            switch_xml_t xchannels = switch_xml_add_child_d(xgeneral,"channels",0);
-                            switch_xml_set_txt_d(xchannels, STR(FMT("%02d") % devCfg.ChannelCount));
-
-                            /* boards/board/general/links */
-                            switch_xml_t xlinks = switch_xml_add_child_d(xgeneral,"links",0);
-                            switch_xml_set_txt_d(xlinks, STR(FMT("%d") % devCfg.LinkCount));
-
-                            /* boards/hardware */
-                            switch_xml_t xhardware = switch_xml_add_child_d(xdev,"hardware",0);
-
-                            /* boards/board/hardware/dsps */
-                            switch_xml_t xdsps = switch_xml_add_child_d(xhardware,"dsps",0);
-
-                            /* boards/board/hardware/dsps/dsp */
-                            switch_xml_t xdsp = switch_xml_add_child_d(xdsps,"dsp",0);
-                            switch_xml_set_attr_d(xdsp,"id","0");
-
-                            /* boards/board/hardware/dsps/dsps/version */
-                            switch_xml_t xversion_a = switch_xml_add_child_d(xdsp,"version",0);
-                            switch_xml_set_txt_d(xversion_a, dspCfg.DspVersion);
-
-                            /* boards/board/hardware/dsps/dsps/firmare */
-                            switch_xml_t xfirmware = switch_xml_add_child_d(xdsp,"firmware",0);
-                            switch_xml_set_txt_d(xfirmware,dspCfg.FwVersion);
-
-                            /* boards/board/hardware/pci */
-                            switch_xml_t xpci = switch_xml_add_child_d(xhardware,"pci",0);
-                            switch_xml_set_attr_d(xpci,"bus" ,STR(FMT("%02d") % devCfg.PciBus ));
-                            switch_xml_set_attr_d(xpci,"slot",STR(FMT("%02d") % devCfg.PciSlot));
-                        } break;
-
-                        default:
-                            break;
-                    }
-                }
-
-                if (Globals::k3lapi.device_type(i) == kdtFXOVoIP)
-                {
-                    if (output_type == Cli::VERBOSE)
-                    {
-                        K::Logger::Logg2(classe, stream, FMT("| * Echo Canceller: %-20s - Location: %-12s  |")
-                            % Verbose::echoCancellerConfig(devCfg.EchoConfig)
-                            % Verbose::echoLocation(devCfg.EchoLocation));
-                    }
-                }
-
-                break;
-            }
-            case kdtGSM:
-            case kdtGSMSpx:
-            {
-                K3L_GSM40_FW_CONFIG dspCfg;
-
-                if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSM40, &dspCfg, sizeof(dspCfg)) == ksSuccess)
-                {
-                    switch(output_type)
-                    {
-                        case Cli::VERBOSE:
-                        {
-                            K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] %s, serial '%s', %02d channels. %s|")
-                                % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
-                                % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
-
-                            K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|")
-                                        % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                        % std::string(std::max<int>(30 - strlen(dspCfg.DspVersion), 0), ' '));
-
-                            K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspCfg.FwVersion);
-                        } break;
-
-                        case Cli::CONCISE:
-                        {
-                            K::Logger::Logg2(classe, stream, FMT("%02d;%s;%d;%d;%s;%02d;%02d;%s")
-                                        % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
-                                        % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                        % dspCfg.FwVersion);
-                        } break;
-
-                        case Cli::XML:
-                        {
-                            /* boards/board */
-                            switch_xml_t xdev = switch_xml_add_child_d(xdev,"device",0);
-                            switch_xml_set_attr_d(xdev,"id",STR(FMT("%02u") % i));
-
-                            /* boards/board/general */
-                            switch_xml_t xgeneral = switch_xml_add_child_d(xdev,"general",0);
-
-                            /* boards/board/general/type */
-                            switch_xml_t xtype = switch_xml_add_child_d(xgeneral,"type",0);
-                            switch_xml_set_txt_d(xtype,tipo.c_str());
-
-                            /* boards/board/general/serial */
-                            switch_xml_t xserial = switch_xml_add_child_d(xgeneral,"serial",0);
-                            switch_xml_set_txt_d(xserial, devCfg.SerialNumber);
-
-                            /* boards/board/general/channels */
-                            switch_xml_t xchannels = switch_xml_add_child_d(xgeneral,"channels",0);
-                            switch_xml_set_txt_d(xchannels, STR(FMT("%02d") % devCfg.ChannelCount));
-
-                            /* boards/board/general/links */
-                            switch_xml_t xlinks = switch_xml_add_child_d(xgeneral,"links",0);
-                            switch_xml_set_txt_d(xlinks, STR(FMT("%d") % devCfg.LinkCount));
-
-                            /* boards/board/hardware */
-                            switch_xml_t xhardware = switch_xml_add_child_d(xdev,"hardware",0);
-
-                            /* boards/board/hardware/dsps */
-                            switch_xml_t xdsps = switch_xml_add_child_d(xhardware,"dsps",0);
-
-                            /* boards/board/hardware/dsps/dsp */
-                            switch_xml_t xdsp = switch_xml_add_child_d(xdsps,"dsp",0);
-                            switch_xml_set_attr_d(xdsp,"id","0");
-
-                            /* boards/board/hardware/dsps/dsp/version */
-                            switch_xml_t xversion_a = switch_xml_add_child_d(xdsp,"version",0);
-                            switch_xml_set_txt_d(xversion_a, dspCfg.DspVersion);
-
-                            /* boards/board/hardware/dsps/dsp/firmware*/
-                            switch_xml_t xfirmware = switch_xml_add_child_d(xdsp,"firmware",0);
-                            switch_xml_set_txt_d(xfirmware,dspCfg.FwVersion);
-
-                            /* boards/board/hardware/dsps/dsp/pci */
-                            switch_xml_t xpci = switch_xml_add_child_d(xhardware,"pci",0);
-                            switch_xml_set_attr_d(xpci,"bus" ,STR(FMT("%02d") % devCfg.PciBus ));
-                            switch_xml_set_attr_d(xpci,"slot",STR(FMT("%02d") % devCfg.PciSlot));
-                        } break;
-
-                        default:
-                            break;
-                    }
-                }
-
-                break;
-            }
-            case kdtGSMUSB:
-            case kdtGSMUSBSpx:
-            {
-                K3L_GSMUSB_FW_CONFIG dspCfg;
-
-                if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSMUSB, &dspCfg, sizeof(dspCfg)) == ksSuccess)
-                {
-                    switch(output_type)
-                    {
-                        case Cli::VERBOSE:
-                        {
-                            K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] %s, serial '%s', %02d channels. %s|")
-                                % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
-                                % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
-
-                            int size = strlen(dspCfg.DspVersion) + strlen(dspCfg.FwVersion);
-
-                            K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - %s%s|")
-                                % dspCfg.DspVersion % dspCfg.FwVersion
-                                % std::string(std::max<int>(55 - size, 0), ' '));
-
-                        } break;
-
-                        case Cli::CONCISE:
-                        {
-                            K::Logger::Logg2(classe, stream, FMT("%02d;%s;%d;%d;%s;%s")
-                                        % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
-                                        % dspCfg.DspVersion % dspCfg.FwVersion);
-                        } break;
-
-                        case Cli::XML:
-                        {
-                            /* boards/board */
-                            switch_xml_t xdev = switch_xml_add_child_d(xdev,"device",0);
-                            switch_xml_set_attr_d(xdev,"id",STR(FMT("%02u") % i));
-
-                            /* boards/board/general */
-                            switch_xml_t xgeneral = switch_xml_add_child_d(xdev,"general",0);
-
-                            /* boards/board/general/type */
-                            switch_xml_t xtype = switch_xml_add_child_d(xgeneral,"type",0);
-                            switch_xml_set_txt_d(xtype,tipo.c_str());
-
-                            /* boards/board/general/serial */
-                            switch_xml_t xserial = switch_xml_add_child_d(xgeneral,"serial",0);
-                            switch_xml_set_txt_d(xserial, devCfg.SerialNumber);
-
-                            /* boards/board/general/channels */
-                            switch_xml_t xchannels = switch_xml_add_child_d(xgeneral,"channels",0);
-                            switch_xml_set_txt_d(xchannels, STR(FMT("%02d") % devCfg.ChannelCount));
-
-                            /* boards/board/hardware */
-                            switch_xml_t xhardware = switch_xml_add_child_d(xdev,"hardware",0);
-
-                            /* boards/board/hardware/dsps */
-                            switch_xml_t xdsps = switch_xml_add_child_d(xhardware,"dsps",0);
-
-                            /* boards/board/hardware/dsp */
-                            switch_xml_t xdsp = switch_xml_add_child_d(xdsps,"dsp",0);
-                            switch_xml_set_attr_d(xdsp,"id","0");
-
-                            /* boards/board/hardware/dsps/dsp/version */
-                            switch_xml_t xversion_a = switch_xml_add_child_d(xdsp,"version",0);
-                            switch_xml_set_txt_d(xversion_a, dspCfg.DspVersion);
-
-                            /* boards/board/hardware/dsps/dsp/firmware */
-                            switch_xml_t xfirmware = switch_xml_add_child_d(xdsp,"firmware",0);
-                            switch_xml_set_txt_d(xfirmware,dspCfg.FwVersion);
-                        } break;
-
-                        default:
-                            break;
-                    }
-                }
-
-                break;
-            }
-
-            default:
-                K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] Unknown type '%02d'! Please contact Khomp support for help! |")
-                    % i % Globals::k3lapi.device_type(i));
-                break;
-        }
-    }
-
-    if (output_type == Cli::VERBOSE)
-        K::Logger::Logg2(classe,stream, " ------------------------------------------------------------------");
-
-    if (output_type == Cli::XML)
-    {
-        printXMLOutput(stream);
-        clearRoot();
-    }
-
-    return true;
-}
-
-/* support function for _KhompShowCalls */
-void Cli::_KhompShowCalls::showCalls(unsigned int d, unsigned int o, std::string &buffer)
-{
-    buffer += STR(FMT("| %d,%02d |   unused   | %11s | %-36s |\n")
-             % d
-             % o
-             % Globals::k3lutil.callStatus(d,o)
-             % Globals::k3lutil.channelStatus(d,o));
-}
-
-bool Cli::_KhompShowCalls::execute(int argc, char *argv[])
-{
-    if(argc > 4)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    int device = argv[2] ? atoi(argv[2]) : -1;
-    int object = argv[3] ? atoi(argv[3]) : -1;
-
-    int d = -1;
-    int o = -1;
-
-    if (device != -1)
-    {
-        d = device;
-
-        if (!Globals::k3lapi.valid_device(d))
-        {
-            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such device %d!") % d);
-            return false;
-        }
-    }
-
-    if (object != -1)
-    {
-        o = object;
-
-        if (!Globals::k3lapi.valid_channel(d,o))
-        {
-            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such chanel %d for device %d!") % o % d);
-            return false;
-        }
-    }
-
-    /* keep the channels reponse */
-    std::string buffer("");
-
-    try
-    {
-        /**/ if (d != -1 && o != -1)
-        {
-            showCalls(d,o,buffer);
-        }
-        else if (d != -1 && o == -1)
-        {
-            for (unsigned int i = 0; i < Globals::k3lapi.channel_count(d); i++)
-            {
-                buffer += " ------------------------------------------------------------------------\n";
-                showCalls(d,i,buffer);
-            }
-        }
-        else if (d == -1 && o == -1)
-        {
-            for (unsigned int i = 0; i < Globals::k3lapi.device_count(); i++)
-            {
-                buffer += " ------------------------------------------------------------------------\n";
-                for (unsigned int j = 0; j < Globals::k3lapi.channel_count(i); j++)
-                {
-                    showCalls(i,j,buffer);
-                }
-            }
-        }
-    }
-    catch(K3LAPITraits::invalid_channel & err)
-    {
-        K::Logger::Logg2(C_CLI, stream, "ERROR: No such chanel");
-        return false;
-    }
-
-    //TODO: The information shown here, must be reviewed cuz is the same of show channels
-    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
-    K::Logger::Logg2(C_CLI, stream, "|------------------------------- Khomp Calls ----------------------------|");
-    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------ ");
-    K::Logger::Logg2(C_CLI, stream, "|  hw  | freeSWITCH |  khomp call |             khomp channel            |");
-    K::Logger::Logg2(C_CLI, stream, "|  id  |   status   |    status   |                status                |");
-    K::Logger::Logg2(C_CLI, stream, "%s", (char*) buffer.c_str());
-    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
-
-    return true;
-}
-
-bool Cli::_KhompChannelsDisconnect::forceDisconnect(unsigned int device, unsigned int channel)
-{
-    bool ret = false;
-    Board::KhompPvt *pvt = NULL;
-
-    try
-    {
-        pvt = Board::get(device,channel);
-        ScopedPvtLock lock(pvt);
-
-        ret = pvt->command(KHOMP_LOG,CM_DISCONNECT);
-        DBG(FUNC,PVT_FMT(pvt->target(),"Command CM_DISCONNECT sent!"));
-    }
-    catch (K3LAPITraits::invalid_channel & err)
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
-    }
-    catch (ScopedLockFailed & err)
-    {
-        K::Logger::Logg2(C_CLI,stream,FMT("error: channel %d at device %d could not be locked: %s!")
-        % channel
-        % device
-        % err._msg.c_str());
-    }
-
-    return ret;
-}
-
-bool Cli::_KhompChannelsDisconnect::execute(int argc, char *argv[])
-{
-    if (argc < 3 || argc > 4)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    switch (argc)
-    {
-        case 3:
-        {
-            if (!ARG_CMP(2, "all"))
-            {
-                K::Logger::Logg2(C_CLI, stream, "usage: khomp channels disconnect < all | <boardid> < all | <channelid> > >");
-                return false;
-            }
-
-            K::Logger::Logg2(C_CLI, stream, "NOTICE: Disconnecting all channels on all boards!");
-
-            for (unsigned int dev = 0; dev < Globals::k3lapi.device_count(); dev++)
-            {
-                for (unsigned int chan = 0; chan < Globals::k3lapi.channel_count(dev); chan++)
-                    forceDisconnect(dev,chan);
-            }
-            break;
-        }
-        case 4:
-        {
-            unsigned int dev = atoi(argv[2]);
-
-            if (ARG_CMP(3, "all"))
-            {
-                K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Disconnecting all channels on board %d!") % dev);
-
-                for (unsigned int chan = 0; chan < Globals::k3lapi.channel_count(dev); chan++)
-                    forceDisconnect(dev,chan);
-            }
-
-            unsigned int channel = atoi(argv[3]);
-
-            if (dev >= Globals::k3lapi.device_count())
-            {
-                K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such device: %d!") % dev);
-                return false;
-            }
-
-
-            K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Disconnecting channel %d on board %d!") % channel % dev);
-
-            forceDisconnect(dev,channel);
-            break;
-        }
-
-        default:
-            break;
-    }
-
-    return true;
-}
-
-bool Cli::_KhompChannelsUnblock::execute(int argc, char *argv[])
-{
-    if (argc != 4 && argc != 3)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    switch (argc)
-    {
-        case 3:
-        {
-            K::Logger::Logg2(C_CLI, stream, "NOTICE: Unblocking all channels on all devices!");
-            for (unsigned int dev = 0; dev < Globals::k3lapi.device_count(); dev++)
-            {
-                for (unsigned int chan = 0; chan < Globals::k3lapi.channel_count(dev); chan++)
-                {
-                    try
-                    {
-                        Globals::k3lapi.command(dev,chan,CM_UNLOCK_INCOMING);
-                        Globals::k3lapi.command(dev,chan,CM_UNLOCK_OUTGOING);
-                    }
-                    catch(K3LAPI::failed_command &e)
-                    {
-                        if (K::Logger::Logg.classe(C_WARNING).enabled())
-                        {
-                            LOG(WARNING, FMT("Command '%s' has failed with error '%s'.")
-                                    % Verbose::commandName(e.code) % Verbose::status((KLibraryStatus)e.rc));
-                        }
-
-                        return false;
-                    }
-                }
-            }
-            break;
-        }
-        case 4:
-        {
-            int dev = atoi (argv[2]);
-
-            if ( !SAFE_strcasecmp(argv[3], "all") )
-            {
-                if (!Globals::k3lapi.valid_device( dev ))
-                {
-                    K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find device: %d!") % dev );
-                    return false;
-                }
-
-                K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Unblocking all channels on device %d!") % dev);
-
-                for (unsigned int i = 0; i < Globals::k3lapi.channel_count(dev); i++)
-                {
-                    try
-                    {
-                        Globals::k3lapi.command(dev,i,CM_UNLOCK_INCOMING);
-                        Globals::k3lapi.command(dev,i,CM_UNLOCK_OUTGOING);
-                    }
-                    catch(K3LAPI::failed_command &e)
-                    {
-                        if (K::Logger::Logg.classe(C_WARNING).enabled())
-                        {
-                            LOG(WARNING, FMT("Command '%s' has failed with error '%s'.")
-                                    % Verbose::commandName(e.code) % Verbose::status((KLibraryStatus)e.rc));
-                        }
-
-                        return false;
-                    }
-                }
-            }
-            else
-            {
-                int obj = atoi (argv[3]);
-
-                if (!Globals::k3lapi.valid_channel(dev, obj))
-                {
-                    K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such channel %d at device %d!") % obj % dev);
-                    return false;
-                }
-
-                K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Unblocking channel %d on device %d!") % obj % dev);
-
-                try
-                {
-                    Globals::k3lapi.command(dev,obj,CM_UNLOCK_INCOMING);
-                    Globals::k3lapi.command(dev,obj,CM_UNLOCK_OUTGOING);
-                }
-                catch(K3LAPI::failed_command &e)
-                {
-                    if (K::Logger::Logg.classe(C_WARNING).enabled())
-                    {
-                        LOG(WARNING, FMT("Command '%s' has failed with error '%s'.")
-                                % Verbose::commandName(e.code) % Verbose::status((KLibraryStatus)e.rc));
-                    }
-
-                    return false;
-                }
-            }
-            break;
-        }
-        default:
-            break;
-    }
-
-    return true;
-}
-
-void Cli::_KhompShowStatistics::cliStatistics(unsigned int device, OutputType output_type)
-{
-    if(output_type == Cli::XML)
-    {
-        /* device */
-        xdevs = switch_xml_add_child_d(root,"device",0);
-        switch_xml_set_attr_d(xdevs,"id",STR(FMT("%d") % device));
-    }
-
-    for (unsigned int channel = 0; channel < Globals::k3lapi.channel_count(device); channel++)
-    {
-        try
-        {
-            Board::KhompPvt *pvt = Board::get(device, channel);
-            switch(output_type)
-            {
-                case Cli::VERBOSE:
-                    K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::ROW).c_str());
-                    break;
-                case Cli::CONCISE:
-                    /* do we need concise ? */
-                    break;
-                case Cli::XML:
-                    switch_xml_insert(pvt->getStatisticsXML(Statistics::ROW),xdevs,0);
-                    break;
-            }
-        }
-        catch (K3LAPITraits::invalid_channel & err)
-        {
-            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
-        }
-    }
-}
-
-void Cli::_KhompShowStatistics::cliDetailedStatistics(unsigned int device, unsigned int channel, OutputType output_type)
-{
-    try
-    {
-        Board::KhompPvt *pvt = Board::get(device, channel);
-        switch(output_type)
-        {
-            case Cli::DETAILED:
-            {
-                K::Logger::Logg2(C_CLI,stream,"----------------------------------------------");
-                K::Logger::Logg2(C_CLI,stream,FMT("Detailed statistics of: Device %02d - Channel %02d") % pvt->target().device % pvt->target().object);
-                K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::DETAILED).c_str());
-                K::Logger::Logg2(C_CLI,stream,"----------------------------------------------");
-            } break;
-
-            case Cli::CONCISE:
-            {
-                /* We don't have xml, need concise yet ? */
-            } break;
-
-            case Cli::XML:
-            {
-                /* We don't have concise, need XML yet ? */
-            } break;
-        }
-    }
-    catch (K3LAPITraits::invalid_channel & err)
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
-    }
-}
-
-bool Cli::_KhompShowStatistics::execute(int argc, char *argv[])
-{
-    if (argc < 2 || argc > 5)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    unsigned int dev = UINT_MAX;
-    unsigned int obj = UINT_MAX;
-    int detailed = 0, verbose  = 0, as_xml = 0;
-    OutputType output_type = Cli::VERBOSE;
-
-    detailed = ((argc > 2)  && (!strcasecmp(argv[2], "detailed")) ? 1 : 0 );
-    verbose  = ((argc > 2)  && (!strcasecmp(argv[2], "verbose"))  ? 1 : 0 );
-    as_xml   = ((argc > 2)  && (!strcasecmp(argv[2], "xml"))      ? 1 : 0 );
-
-    try
-    {
-        if(argc > (2+detailed+verbose+as_xml))
-        {
-            dev = Strings::tolong(argv[2+detailed+verbose+as_xml]);
-            if (!Globals::k3lapi.valid_device(dev))
-            {
-                K::Logger::Logg2(C_CLI, stream, "ERROR: No such device!");
-                return false;
-            }
-        }
-
-        if (argc > (3+detailed+verbose+as_xml))
-        {
-            std::string object(argv[3+detailed+verbose+as_xml]);
-            obj = Strings::tolong(object);
-
-            if (!Globals::k3lapi.valid_channel(dev, obj))
-            {
-                K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % obj % dev );
-                return false;
-            }
-        }
-    }
-    catch (Strings::invalid_value e)
-    {
-        K::Logger::Logg2(C_CLI, stream, "ERROR: Invalid numeric value!");
-        return false;
-    }
-
-    if(detailed) output_type = Cli::DETAILED;
-    if(as_xml)
-    {
-        createRoot("statistics");
-        output_type = Cli::XML;
-    }
-
-    std::string header;
-    header.append( " ------------------------------------------------------------------------------------\n");
-    header.append( "|----------------------------- Khomp Endpoint Statistics ----------------------------|\n");
-    header.append( "|------------------------------------------------------------------------------------|\n");
-    header.append( "|  hw  |          total calls           | channel | FreeSWITCH | channel  |  status  |\n");
-    header.append( "|  id  | incoming | outgoing |  failed  |  fails  |   status   |  state   |   time   |\n");
-    header.append( " ------------------------------------------------------------------------------------");
-    std::string footer;
-    footer.append( " ------------------------------------------------------------------------------------");
-
-    try
-    {
-        if (obj != UINT_MAX)
-        {
-            switch(output_type)
-            {
-                case Cli::VERBOSE:
-                {
-                    K::Logger::Logg2(C_CLI,stream,header.c_str());
-                    Board::KhompPvt *pvt = Board::get(dev, obj);
-                    K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::ROW).c_str());
-                    K::Logger::Logg2(C_CLI,stream,footer.c_str());
-                } break;
-
-                case Cli::DETAILED:
-                {
-                    cliDetailedStatistics (dev, obj, output_type);
-                } break;
-
-                case Cli::XML:
-                {
-                    /* no problem, nothing created */
-                    switch_xml_t xboard = NULL;
-
-                    /* device */
-                    xdevs = switch_xml_add_child_d(root,"device",0);
-                    switch_xml_set_attr_d(xdevs,"id",STR(FMT("%d") % dev));
-
-                    try
-                    {
-                        Board::KhompPvt *pvt = Board::get(dev, obj);
-                        switch_xml_insert(pvt->getStatisticsXML(Statistics::ROW),xdevs,0);
-                    }
-                    catch (K3LAPITraits::invalid_channel & err)
-                    {
-                        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
-                    }
-
-                    printXMLOutput(stream);
-                    clearRoot();
-                } break;
-            }
-        }
-        else
-        {
-            switch(output_type)
-            {
-                case Cli::VERBOSE:
-                {
-                    K::Logger::Logg2(C_CLI,stream,header.c_str());
-
-                    if (dev == UINT_MAX)
-                    {
-                        for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
-                            cliStatistics (dev, output_type);
-                    }
-                    else
-                    {
-                        cliStatistics (dev, output_type);
-                    }
-
-                    K::Logger::Logg2(C_CLI,stream,footer.c_str());
-                } break;
-
-                case Cli::XML:
-                {
-                    if (dev == UINT_MAX)
-                    {
-                        for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
-                            cliStatistics (dev, output_type);
-                    }
-                    else
-                    {
-                        cliStatistics (dev, output_type);
-                    }
-
-                    printXMLOutput(stream);
-                    clearRoot();
-
-                } break;
-
-                case Cli::DETAILED:
-                {
-                    printUsage(stream);
-                    return false;
-                } break;
-            }
-        }
-    }
-    catch(K3LAPITraits::invalid_channel &e)
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % obj % dev );
-    }
-
-    return true;
-}
-
-void Cli::_KhompShowChannels::showChannel(unsigned int device, unsigned int channel, OutputType output_type)
-{
-    try
-    {
-        Board::KhompPvt *pvt = Board::get(device, channel);
-
-        DBG(FUNC, PVT_FMT(pvt->target(), "found channel.."));
-
-        /* skip inactive channels */
-        if (pvt->getSignaling() == ksigInactive)
-            return;
-
-        DBG(FUNC, PVT_FMT(pvt->target(), "is valid.."));
-
-        /* make sure the states wont start 'dancing' at random.. */
-        ScopedPvtLock lock(pvt);
-
-        std::string tmp_call = Globals::k3lutil.callStatus(
-                pvt->target().device,
-                pvt->target().object,
-                (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
-
-        std::string tmp_chan = Globals::k3lutil.channelStatus(
-                pvt->target().device,
-                pvt->target().object,
-                (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
-
-
-        switch(output_type)
-        {
-            case Cli::VERBOSE:
-            {
-                if (pvt->getSignaling() == ksigGSM)
-                {
-                    K3L_GSM_CHANNEL_STATUS gsmStatus;
-
-                    if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
-                        return;
-
-                    const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
-
-                    const unsigned int full_size = 10;
-                    const unsigned int sign_size = std::min((sign_numb * full_size) / 100, full_size);
-
-                    std::string tmp_antenna_level;
-
-                    for (unsigned int i = 0; i < sign_size; i++)
-                        tmp_antenna_level += '*';
-
-                    for (unsigned int i = sign_size; i < full_size; i++)
-                        tmp_antenna_level += ' ';
-
-                    tmp_chan += " (";
-                    tmp_chan += (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "...");
-                    tmp_chan += ")";
-
-                    K::Logger::Logg2(C_CLI, stream, FMT("| %d,%02d | %8s | %8s | %-23s | %02d%% |%s|")
-                            % device % channel %  pvt->getStateString() % tmp_call % tmp_chan
-                            % sign_numb % tmp_antenna_level);
-                }
-                else
-                {
-                    K::Logger::Logg2(C_CLI, stream, FMT("| %d,%02d | %8s | %8s | %-40s |")
-                            % device % channel % pvt->getStateString() % tmp_call % tmp_chan);
-                }
-
-            } break;
-
-            case Cli::CONCISE:
-            {
-                std::string state = pvt->getStateString();
-
-                if (pvt->getSignaling() == ksigGSM)
-                {
-                    K3L_GSM_CHANNEL_STATUS gsmStatus;
-
-                    if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
-                        return;
-
-                    const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
-
-                    std::string gsm_registry = (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "<none>");
-
-                    K::Logger::Logg2(C_CLI, stream, FMT("B%02dC%02d:%s:%s:%s:%d%%:%s")
-                            % device % channel % state % tmp_call % tmp_chan
-                            % sign_numb % gsm_registry);
-                }
-                else
-                {
-                    K::Logger::Logg2(C_CLI, stream, FMT("B%02dC%02d:%s:%s:%s")
-                            % device % channel %  state % tmp_call % tmp_chan);
-                }
-
-            } break;
-
-            case Cli::XML:
-            {
-                /* device/channel */
-                switch_xml_t xchannel = switch_xml_add_child_d(xdev,"channel",0);
-                switch_xml_set_attr_d(xchannel,"id",STR(FMT("%d") % channel));
-
-                /* device/channel/fs_state */
-                switch_xml_t xstate = switch_xml_add_child_d(xchannel,"fs_state",0);
-                switch_xml_set_txt_d(xstate, pvt->getStateString().c_str());
-
-                /* device/channel/call */
-                switch_xml_t xcall = switch_xml_add_child_d(xchannel,"call",0);
-                switch_xml_set_txt_d(xcall, tmp_call.c_str());
-
-                /* device/channel/status */
-                switch_xml_t xstatus = switch_xml_add_child_d(xchannel,"status",0);
-                switch_xml_set_txt_d(xstatus, tmp_chan.c_str());
-
-                if (pvt->getSignaling() == ksigGSM)
-                {
-                    K3L_GSM_CHANNEL_STATUS gsmStatus;
-
-                    if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
-                        return;
-
-                    const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
-                    std::string gsm_registry = (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "<none>");
-
-                    /* device/channel/signal */
-                    switch_xml_t xsign_numb = switch_xml_add_child_d(xchannel, "signal", 0);
-                    switch_xml_set_txt_d(xsign_numb, STR(FMT("%d") % sign_numb));
-
-                    /* device/channel/registry */
-                    switch_xml_t xgsm_registry = switch_xml_add_child_d(xchannel, "registry", 9);
-                    switch_xml_set_txt_d(xgsm_registry, gsm_registry.c_str());
-                }
-
-            } break;
-
-            default:
-                /* do nothing */
-                break;
-        }
-
-    }
-    catch (K3LAPITraits::invalid_channel & err)
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
-    }
-    catch (...)
-    {
-        K::Logger::Logg2(C_CLI, stream, "ERROR: Unexpected error..., skipping");
-    }
-}
-
-void Cli::_KhompShowChannels::showChannels(unsigned int device, OutputType output_type)
-{
-    if(output_type == Cli::XML)
-    {
-        /* channels/device */
-        xdev = switch_xml_add_child_d(root,"device",0);
-        switch_xml_set_attr_d(xdev, "id", STR(FMT("%d") % device));
-    }
-
-    for (unsigned int channel = 0; channel < Globals::k3lapi.channel_count(device); channel++)
-    {
-        showChannel(device, channel, output_type);
-    }
-}
-
-bool Cli::_KhompShowChannels::execute(int argc, char *argv[])
-{
-    unsigned int dev = UINT_MAX;
-    int concise = 0, verbose = 0, as_xml = 0;
-    OutputType output_type = Cli::VERBOSE;
-
-    bool onlyShowOneChannel = false;
-    unsigned int channelToShow = 0;
-
-    if (argc > 5)
-    {
-        Cli::KhompShowChannels.printUsage(stream);
-        return false;
-    }
-
-    concise = ( ((argc == 3) || (argc == 4) || (argc == 5) ) && (ARG_CMP(2, "concise")) ? 1 : 0 );
-    verbose = ( ((argc == 3) || (argc == 4) || (argc == 5) ) && (ARG_CMP(2, "verbose")) ? 1 : 0 );
-    as_xml  = ( ((argc == 3) || (argc == 4) || (argc == 5) ) && (ARG_CMP(2, "xml"))     ? 1 : 0 );
-
-    if (argc >= (3 + concise + verbose + as_xml))
-    {
-        dev = atoi (argv[2 + concise + verbose + as_xml]);
-
-        if (!Globals::k3lapi.valid_device(dev))
-        {
-            K::Logger::Logg2(C_CLI, stream, "ERROR: no such device!");
-            return false;
-        }
-
-        if (argc == ( 4 + concise + verbose + as_xml))
-        {
-            onlyShowOneChannel = true;
-            channelToShow = atoi (argv[3 + concise + verbose + as_xml]);
-        }
-    }
-
-    if (concise == 0 && as_xml == 0)
-    {
-        K::Logger::Logg2(C_CLI, stream, " -----------------------------------------------------------------------");
-        K::Logger::Logg2(C_CLI, stream, "|-------------------- Khomp Channels and Connections -------------------|");
-        K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
-        K::Logger::Logg2(C_CLI, stream, "|  hw  |freeSWITCH|   call   |                   channel                |");
-        K::Logger::Logg2(C_CLI, stream, "|  id  |  status  |  status  |                   status                 |");
-        K::Logger::Logg2(C_CLI, stream, " -----------------------------------------------------------------------");
-    }
-
-    if (concise != 0) output_type = Cli::CONCISE;
-    if (as_xml  != 0)
-    {
-        output_type = Cli::XML;
-
-        /* channels */
-        createRoot("channels");
-    }
-
-    if ( onlyShowOneChannel )
-    {
-        if ( channelToShow <  Globals::k3lapi.channel_count(dev) )
-        {
-            if(output_type == Cli::XML)
-            {
-                /* channels/device */
-                xdev = switch_xml_add_child_d(root,"device",0);
-                switch_xml_set_attr_d(xdev, "id", STR(FMT("%d") % dev));
-            }
-
-            showChannel (dev, channelToShow, output_type);
-        }
-        else
-        {
-            K::Logger::Logg2(C_CLI, stream, "ERROR: no such channel!");
-        }
-    }
-    else if (dev == UINT_MAX)
-    {
-        for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
-        {
-            showChannels(dev, output_type);
-        }
-    }
-    else
-    {
-        showChannels ( dev, output_type);
-    }
-
-    if (concise == 0 && as_xml == 0)
-        K::Logger::Logg2(C_CLI, stream, " -----------------------------------------------------------------------");
-
-    if(output_type == Cli::XML)
-    {
-        printXMLOutput(stream);
-        clearRoot();
-    }
-
-    return true;
-}
-
-std::string Cli::_KhompShowLinks::getLinkStatus(int dev, int obj, Verbose::Presentation fmt)
-{
-    switch(Globals::k3lapi.device_type(dev))
-    {
-        case kdtE1FXSSpx:
-            if (obj == 1)
-                return Globals::k3lutil.linkStatus(dev, obj, fmt, ksigAnalogTerminal, true);
-        default:
-            break;
-    }
-
-    std::string res;
-
-    try
-    {
-        const K3L_LINK_CONFIG & conf = Globals::k3lapi.link_config(dev, obj);
-
-        res = Globals::k3lutil.linkStatus(dev, obj, fmt);
-
-        if (conf.ReceivingClock & 0x01)
-           res += (fmt == Verbose::EXACT ? ",sync" : " (sync)");
-    }
-    catch (K3LAPITraits::invalid_target & e)
-    {
-        res = "<error>";
-    }
-
-    return res;
-}
-
-void Cli::_KhompShowLinks::showLinks(unsigned int device, OutputType output_type)
-{
-    if (output_type != Cli::CONCISE && output_type != Cli::XML)
-        K::Logger::Logg2(C_CLI, stream, "|------------------------------------------------------------------------|");
-
-    switch (Globals::k3lutil.physicalLinkCount(device, true))
-    {
-        case 1:
-        {
-            std::string str_link0 = getLinkStatus(device, 0, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
-
-            switch(output_type)
-            {
-                case Cli::VERBOSE:
-                {
-                    K::Logger::Logg2(C_CLI, stream, FMT("| Link '0' on board '%d': %-47s |") % device % str_link0);
-                } break;
-
-                case Cli::CONCISE:
-                {
-                    K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL00:%s") % device % str_link0);
-                } break;
-
-                case Cli::XML:
-                {
-                    /* device */
-                    xdev = switch_xml_add_child_d(root,"device",0);
-                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
-
-                    /* device/links */
-                    switch_xml_t xlinks = switch_xml_add_child_d(xdev,"links",0);
-
-                    /* device/links/link */
-                    switch_xml_t xlink = switch_xml_add_child_d(xlinks,"link",0);
-                    switch_xml_set_attr_d(xlink, "id", "0");
-                    switch_xml_set_txt_d(xlink, str_link0.c_str());
-                } break;
-            }
-
-            break;
-        }
-
-        case 2:
-        {
-            std::string str_link0 = getLinkStatus(device, 0, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
-            std::string str_link1 = getLinkStatus(device, 1, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
-
-            switch(output_type)
-            {
-                case Cli::VERBOSE:
-                {
-                    K::Logger::Logg2(C_CLI, stream, FMT("|------ Link '0' on board '%d' ------||------ Link '1' on board '%d' ------|")
-                        % device % device);
-
-                    K::Logger::Logg2(C_CLI, stream, FMT("| %-33s || %-33s |") % str_link0 % str_link1);
-                } break;
-
-                case Cli::CONCISE:
-                {
-                    K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL00:%s") % device % str_link0);
-                    K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL01:%s") % device % str_link1);
-                } break;
-
-                case Cli::XML:
-                {
-                    /* device */
-                    xdev = switch_xml_add_child_d(root,"device",0);
-                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
-
-                    /* device/links */
-                    switch_xml_t xlinks = switch_xml_add_child_d(xdev,"links",0);
-
-                    /* device/links/link (0) */
-                    switch_xml_t xlink = switch_xml_add_child_d(xlinks,"link",0);
-                    switch_xml_set_attr_d(xlink, "id", "0");
-                    switch_xml_set_txt_d(xlink, str_link0.c_str());
-
-                    /* device/links/link (1) */
-                    switch_xml_t xlink1 = switch_xml_add_child_d(xlinks,"link",0);
-                    switch_xml_set_attr_d(xlink1, "id", "1");
-                    switch_xml_set_txt_d(xlink1, str_link0.c_str());
-                } break;
-            }
-
-            break;
-        }
-        default:
-        {
-            switch(output_type)
-            {
-                case Cli::VERBOSE:
-                {
-                    K::Logger::Logg2(C_CLI, stream, FMT("| Board '%d': %-59s |") % device % "No links available.");
-                } break;
-
-                case Cli::CONCISE:
-                {
-                    K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dLXX:NoLinksAvailable") % device);
-                } break;
-
-                case Cli::XML:
-                {
-                    /* device */
-                    xdev = switch_xml_add_child_d(root,"device",0);
-                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
-                    switch_xml_set_txt_d(xdev,"NoLinksAvailable");
-                } break;
-            }
-
-            break;
-        }
-    }
-}
-
-void Cli::_KhompShowLinks::showErrors(unsigned int device, OutputType output_type)
-{
-    if (output_type != Cli::CONCISE && output_type != Cli::XML)
-        K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
-
-    switch (Globals::k3lutil.physicalLinkCount(device, true))
-    {
-        case 2:
-        {
-            K3LUtil::ErrorCountType link0 = Globals::k3lutil.linkErrorCount(
-                    device, 0, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
-            K3LUtil::ErrorCountType link1 = Globals::k3lutil.linkErrorCount(
-                    device, 1, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
-
-            switch(output_type)
-            {
-                case Cli::VERBOSE:
-                {
-                    K::Logger::Logg2(C_CLI, stream, FMT("|----- Link '0' on board '%d' ------| |----- Link '1' on board '%d' ------|") % device % device);
-                    K::Logger::Logg2(C_CLI, stream, "|----------------------------------| |----------------------------------|");
-                    K::Logger::Logg2(C_CLI, stream, "|       Error type       | Number  | |       Error type       | Number  |");
-                    K::Logger::Logg2(C_CLI, stream, "|----------------------------------| |----------------------------------|");
-
-                    K3LUtil::ErrorCountType::iterator i = link0.begin();
-                    K3LUtil::ErrorCountType::iterator j = link1.begin();
-
-                    for (; i != link0.end() && j != link1.end(); i++, j++)
-                    {
-                        K::Logger::Logg2(C_CLI, stream, FMT("| %22s | %-7d | | %22s | %-7d |")
-                           % i->first % i->second % j->first % j->second);
-                    }
-                } break;
-
-                case Cli::CONCISE:
-                {
-                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
-                        K::Logger::Logg2(C_CLI, stream, FMT("%d:0:%s:%d") % device % i->first % i->second);
-
-                    for (K3LUtil::ErrorCountType::iterator i = link1.begin(); i != link1.end(); i++)
-                        K::Logger::Logg2(C_CLI, stream, FMT("%d:1:%s:%d") % device % i->first % i->second);
-                } break;
-
-                case Cli::XML:
-                {
-                    /* device */
-                    xdev = switch_xml_add_child_d(root,"device",0);
-                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
-
-                    /* device/errors */
-                    switch_xml_t xerrors = switch_xml_add_child_d(xdev,"errors",0);
-
-                    /* device/errors/link (0) */
-                    switch_xml_t xlinks0 = switch_xml_add_child_d(xerrors,"link",0);
-                    switch_xml_set_attr_d(xlinks0,"id","0");
-
-                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
-                    {
-                        /* device/errors/link/type */
-                        switch_xml_t xtype0 = switch_xml_add_child_d(xlinks0,"type",0);
-                        switch_xml_set_txt_d(xtype0,i->first.c_str());
-
-                        /* device/errors/link/number */
-                        switch_xml_t xnumber0  = switch_xml_add_child_d(xlinks0,"number",0);
-                        switch_xml_set_txt_d(xnumber0,STR(FMT("%d") % i->second));
-                    }
-
-                    /* device/errors/link (1) */
-                    switch_xml_t xlinks1 = switch_xml_add_child_d(xerrors,"link",0);
-                    switch_xml_set_attr_d(xlinks1,"id","1");
-
-                    for (K3LUtil::ErrorCountType::iterator i = link1.begin(); i != link1.end(); i++)
-                    {
-                        /* device/errors/link/type */
-                        switch_xml_t xtype1 = switch_xml_add_child_d(xlinks1,"type",0);
-                        switch_xml_set_txt_d(xtype1,i->first.c_str());
-
-                        /* device/errors/link/number */
-                        switch_xml_t xnumber1  = switch_xml_add_child_d(xlinks1,"number",0);
-                        switch_xml_set_txt_d(xnumber1,STR(FMT("%d") % i->second));
-                    }
-                } break;
-            }
-
-            break;
-        }
-
-        case 1:
-        {
-            K3LUtil::ErrorCountType link0 = Globals::k3lutil.linkErrorCount(device, 0, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
-
-            switch(output_type)
-            {
-                case Cli::VERBOSE:
-                {
-                    K::Logger::Logg2(C_CLI, stream, FMT("|------------------------ Link '0' on board '%d' ------------------------|") % device);
-                    K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
-                    K::Logger::Logg2(C_CLI, stream, "|                      Error type                      |     Number     |");
-                    K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
-
-                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
-                        K::Logger::Logg2(C_CLI, stream, FMT("| %52s | %-14d |") % i->first % i->second);
-                } break;
-
-                case Cli::CONCISE:
-                {
-                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
-                        K::Logger::Logg2(C_CLI, stream, FMT("%d:0:%s:%d") % device % i->first % i->second);
-                } break;
-
-                case Cli::XML:
-                {
-                    /* device */
-                    xdev = switch_xml_add_child_d(root,"device",0);
-                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
-
-                    /* device/errors */
-                    switch_xml_t xerrors = switch_xml_add_child_d(xdev,"errors",0);
-
-                    /* device/errors/link (0) */
-                    switch_xml_t xlinks0 = switch_xml_add_child_d(xerrors,"link",0);
-                    switch_xml_set_attr_d(xlinks0,"id","0");
-
-                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
-                    {
-                        /* device/errors/link/type */
-                        switch_xml_t xtype0 = switch_xml_add_child_d(xlinks0,"type",0);
-                        switch_xml_set_txt_d(xtype0,i->first.c_str());
-
-                        /* device/errors/link/number */
-                        switch_xml_t xnumber0  = switch_xml_add_child_d(xlinks0,"number",0);
-                        switch_xml_set_txt_d(xnumber0,STR(FMT("%d") % i->second));
-                    }
-                } break;
-            }
-
-            break;
-        }
-
-        case 0:
-        {
-            if (output_type != Cli::XML && output_type != Cli::CONCISE)
-                K::Logger::Logg2(C_CLI, stream, FMT("|                     No links detected on board %d!                     |") % device);
-
-            break;
-        }
-    }
-}
-
-bool Cli::_KhompShowLinks::execute(int argc, char *argv[])
-{
-    if(argc < 2 || argc > 5)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    unsigned int dev = UINT_MAX;
-    int concise = 0, verbose = 0, as_xml = 0, errors = 0;
-    OutputType output_type = Cli::VERBOSE;
-
-    errors = ( (argc > 2) && (!strcasecmp(argv[2],"errors")) ? 1 : 0 );
-
-    concise = ( (argc > (2+errors)) && (!strcasecmp(argv[(2+errors)],"concise")) ? 1 : 0 );
-    verbose = ( (argc > (2+errors)) && (!strcasecmp(argv[(2+errors)],"verbose")) ? 1 : 0 );
-    as_xml  = ( (argc > (2+errors)) && (!strcasecmp(argv[(2+errors)],"xml"))     ? 1 : 0 );
-
-    if(argc > (2+errors+concise+verbose+as_xml))
-    {
-        dev = atoi(argv[(2+errors+concise+verbose+as_xml)]);
-
-        if (!Globals::k3lapi.valid_device(dev))
-        {
-            K::Logger::Logg2(C_CLI, stream, "ERROR: no such device!");
-            return false;
-        }
-    }
-
-
-    if (!concise && !as_xml)
-    {
-        K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
-        if(!errors)
-        {
-            K::Logger::Logg2(C_CLI, stream, "|--------------------------- Khomp Links List ---------------------------|");
-        }
-        else
-        {
-            K::Logger::Logg2(C_CLI, stream, "|-------------------- Khomp Errors Counters on Links -------------------|");
-        }
-    }
-
-    if(concise) output_type = Cli::CONCISE;
-    if(as_xml)
-    {
-        output_type = Cli::XML;
-        createRoot("links");
-    }
-
-    if (dev == UINT_MAX)
-    {
-        for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
-        {
-            if(!errors)
-            {
-                showLinks (dev, output_type);
-            }
-            else
-            {
-                showErrors(dev, output_type);
-            }
-        }
-    }
-    else
-    {
-        if(!errors)
-        {
-            showLinks (dev, output_type);
-        }
-        else
-        {
-            showErrors(dev, output_type);
-        }
-    }
-
-    if (!concise && !as_xml)
-    {
-        K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
-    }
-
-    if (as_xml)
-    {
-        printXMLOutput(stream);
-        clearRoot();
-    }
-
-    return true;
-}
-
-void Cli::_KhompClearLinks::clearLink(unsigned int device, unsigned int link)
-{
-    try
-    {
-        Globals::k3lapi.command(device, link, CM_CLEAR_LINK_ERROR_COUNTER);
-    }
-    catch(K3LAPI::failed_command & e)
-    {
-        K::Logger::Logg2(C_CLI, stream,
-                FMT("ERROR: Command has failed with error '%s'")
-                % Verbose::status((KLibraryStatus)e.rc).c_str());
-    }
-}
-
-bool Cli::_KhompClearLinks::execute(int argc, char *argv[])
-{
-    if(argc < 2 || argc > 4)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    unsigned int dev = UINT_MAX;
-    unsigned int obj = UINT_MAX;
-
-    if(argc > 2)
-    {
-        dev = atoi(argv[2]);
-
-        if (!Globals::k3lapi.valid_device(dev))
-        {
-            K::Logger::Logg2(C_CLI, stream,
-                    FMT("ERROR: no such device %d!") % dev);
-            return false;
-        }
-
-        if(argc > 3)
-        {
-            obj = atoi(argv[3]);
-
-            if(!Globals::k3lapi.valid_link(dev, obj))
-            {
-                K::Logger::Logg2(C_CLI, stream,
-                      FMT("ERROR: No such link %d on device %d!") % obj % dev);
-                return false;
-            }
-        }
-    }
-
-    if(dev == UINT_MAX)
-    {
-        K::Logger::Logg2(C_CLI, stream,
-                "NOTICE: Reseting error count of all links...");
-
-        for (unsigned int d = 0; d < Globals::k3lapi.device_count(); d++)
-        {
-            unsigned int link_count = Globals::k3lutil.physicalLinkCount(d, true);
-
-            for (unsigned int o = 0; o < link_count; o++)
-                clearLink(d, o);
-        }
-    }
-    else
-    {
-        if (obj == UINT_MAX)
-        {
-            K::Logger::Logg2(C_CLI, stream,
-                FMT("NOTICE: Reseting error count of all links on device %d...")
-                % dev);
-            unsigned int link_count = Globals::k3lutil.physicalLinkCount(dev, true);
-
-            for (unsigned int o = 0; o < link_count; o++)
-                clearLink(dev, o);
-        }
-        else
-        {
-            K::Logger::Logg2(C_CLI, stream,
-                FMT("NOTICE: Reseting error count of link %d on device %d...")
-                % obj % dev);
-
-            clearLink(dev, obj);
-        }
-    }
-
-    return true;
-}
-
-bool Cli::_KhompClearStatistics::execute(int argc, char *argv[])
-{
-    if(argc < 2 || argc > 4)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    try
-    {
-
-    unsigned int dev = UINT_MAX;
-    unsigned int obj = UINT_MAX;
-
-    if(argc > 2)
-    {
-        dev = atoi(argv[2]);
-
-        if (!Globals::k3lapi.valid_device(dev))
-        {
-            K::Logger::Logg2(C_CLI, stream,
-                    FMT("ERROR: no such device %d!") % dev);
-            return false;
-        }
-
-        if(argc > 3)
-        {
-            obj = atoi(argv[3]);
-
-
-            if(!Globals::k3lapi.valid_channel(dev, obj))
-            {
-                K::Logger::Logg2(C_CLI, stream,
-                      FMT("ERROR: No such channel %d on device %d!") % obj % dev);
-                return false;
-            }
-        }
-    }
-
-    if(dev == UINT_MAX)
-    {
-        K::Logger::Logg2(C_CLI, stream, "NOTICE: Reseting statistics of all channels...");
-
-        for (unsigned int d = 0; d < Globals::k3lapi.device_count(); d++)
-        {
-            for (unsigned int o = 0; o < Globals::k3lapi.channel_count(d); o++)
-                Board::get(d, o)->clearStatistics();
-        }
-    }
-    else
-    {
-        if (obj == UINT_MAX)
-        {
-            K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Reseting statistics of all channels from board %d...") % dev);
-
-            for (unsigned int o = 0; o < Globals::k3lapi.channel_count(dev); o++)
-                Board::get(dev, o)->clearStatistics();
-        }
-        else
-        {
-            K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Reseting statistics of channel %d from board %d") % obj % dev);
-            Board::get(dev, obj)->clearStatistics();
-        }
-    }
-
-    }
-    catch (K3LAPITraits::invalid_channel & err)
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
-        return false;
-    }
-
-    return true;
-}
-
-bool Cli::_KhompDumpConfig::execute(int argc, char *argv[])
-{
-    if (argc != 2)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    const Config::StringSet opts = Globals::options.options();
-
-    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
-    K::Logger::Logg2(C_CLI, stream, "|--------------------------- Khomp Options Dump -------------------------|");
-    K::Logger::Logg2(C_CLI, stream, "|------------------------------------------------------------------------|");
-
-    for (Config::StringSet::const_iterator itr = opts.begin(); itr != opts.end(); ++itr)
-    {   try
-        {
-            if(removeUnavaible((*itr))) continue;
-            K::Logger::Logg2(C_CLI, stream, FMT("| %-24s => %42s |")
-                    % (*itr) % Globals::options.get(&(Opt::_options), (*itr)));
-        }
-        catch(Config::EmptyValue &e)
-        {
-            K::Logger::Logg(C_ERROR, FMT("%s (%s)") % e.what() % (*itr));
-        }
-    }
-
-    K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
-
-    return true;
-}
-
-void Cli::_KhompResetLinks::resetLink(unsigned int device, unsigned int link)
-{
-    try
-    {
-        Globals::k3lapi.command(device, link, CM_RESET_LINK);
-    }
-    catch(K3LAPI::failed_command & e)
-    {
-        K::Logger::Logg2(C_CLI, stream,
-                FMT("ERROR: Command has failed with error '%s'")
-                % Verbose::status((KLibraryStatus)e.rc).c_str());
-    }
-}
-
-bool Cli::_KhompResetLinks::execute(int argc, char *argv[])
-{
-    if(argc < 2 || argc > 4)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    unsigned int dev = UINT_MAX;
-    unsigned int obj = UINT_MAX;
-
-    if(argc > 2)
-    {
-        dev = atoi(argv[2]);
-
-        if (!Globals::k3lapi.valid_device(dev))
-        {
-            K::Logger::Logg2(C_CLI, stream,
-                    FMT("ERROR: no such device %d!") % dev);
-            return false;
-        }
-
-        if(argc > 3)
-        {
-            obj = atoi(argv[3]);
-
-            if(!Globals::k3lapi.valid_link(dev, obj))
-            {
-                K::Logger::Logg2(C_CLI, stream,
-                      FMT("ERROR: No such link %d on device %d!") % obj % dev);
-                return false;
-            }
-        }
-    }
-
-    if(dev == UINT_MAX)
-    {
-        K::Logger::Logg2(C_CLI, stream,
-                "NOTICE: Reseting all links...");
-
-        for (unsigned int d = 0; d < Globals::k3lapi.device_count(); d++)
-        {
-            unsigned int link_count = Globals::k3lutil.physicalLinkCount(d, true);
-
-            for (unsigned int o = 0; o < link_count; o++)
-                resetLink(d, o);
-        }
-    }
-    else
-    {
-        if (obj == UINT_MAX)
-        {
-            K::Logger::Logg2(C_CLI, stream,
-                FMT("NOTICE: Reseting all links on device %d...")
-                % dev);
-            unsigned int link_count = Globals::k3lutil.physicalLinkCount(dev, true);
-
-            for (unsigned int o = 0; o < link_count; o++)
-                resetLink(dev, o);
-        }
-        else
-        {
-            K::Logger::Logg2(C_CLI, stream,
-                FMT("NOTICE: Reseting link %d on device %d...")
-                % obj % dev);
-
-            resetLink(dev, obj);
-        }
-    }
-
-    return true;
-}
-
-bool Cli::_KhompSMS::execute(int argc, char *argv[])
-{
-    if(argc < 4)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    std::string devs(argv[1]);
-    std::string numb(argv[2]);
-    std::string mesg(argv[3]);
-
-    for (unsigned int i = 4; i < (unsigned int)argc; i++)
-    {
-        mesg += " ";
-        mesg += argv[i];
-    }
-
-    Board::KhompPvt * pvt = NULL;
-
-    bool enable_retry = false;
-
-    size_t pos = numb.find('r');
-    if (pos != std::string::npos)
-    {
-        numb.erase(pos,1);
-        enable_retry = true;
-    }
-
-    std::string begin;
-
-    if(devs[0] != 'b' && devs[0] != 'B')
-    {
-        begin = "b";
-    }
-
-    std::string complete = begin + devs + "/" + numb + "/" + mesg;
-    int cause = (int)SWITCH_CAUSE_NONE;
-
-    try
-    {
-        for (unsigned int ntry = 0; ntry < 15; ++ntry)
-        {
-            ScopedAllocLock alloc_lock;
-
-            pvt = processSMSString(complete.c_str(), &cause);
-
-            /* NOTE: go directly to the pvt check below! */
-            if (!enable_retry || pvt)
-                break;
-
-            alloc_lock.unlock();
-
-            K::Logger::Logg2(C_CLI, stream, FMT("WARNING: '%s': No available channel, trying again...") % devs);
-            usleep(2500000);
-        }
-
-        if (!pvt)
-        {
-            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: '%s': No available channel %s") % devs % (enable_retry ? "after 15 retries, giving up!" : ""));
-            return false;
-        }
-
-        ScopedPvtLock lock(pvt);
-
-        if(!pvt->application(SMS_SEND, NULL, complete.c_str()))
-        {
-            K::Logger::Logg2(C_CLI, stream, "ERROR: Message could not be sent");
-            return false;
-        }
-
-    }
-    catch(ScopedLockFailed & err)
-    {
-        if(err._fail == ScopedLockFailed::ALLOC_FAILED)
-        {
-            K::Logger::Logg2(C_CLI, stream, "ERROR: unable to global alloc lock");
-        }
-        else
-        {
-            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: unable to lock: %s!") % err._msg.c_str());
-        }
-        return false;
-    }
-
-    K::Logger::Logg2(C_CLI, stream, "Message sent successfully!");
-
-    return true;
-}
-
-bool Cli::_KhompLogConsole::execute(int argc, char *argv[])
-{
-    if (argc < 3)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    bool invert = false;
-    bool unique = false;
-
-    std::string extra(argv[2]);
-
-    unsigned int total_args = argc - 2; /* remove "khomp log console" */
-
-    if (extra == "no")
-    {
-        invert = true;
-        --total_args;
-    }
-    else if (extra == "just")
-    {
-        unique = true;
-        --total_args;
-    }
-
-    unsigned int first_args = argc - total_args;
-
-    std::string options;
-
-    for (unsigned int i = first_args; i < (unsigned int)argc; i++)
-    {
-        options += argv[i];
-        options += ",";
-    }
-
-    K::Logger::processLogConsole(stream, options, invert, unique);
-    return true;
-}
-
-bool Cli::_KhompLogDisk::execute(int argc, char *argv[])
-{
-    if (argc < 3)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    bool invert = false;
-    bool unique = false;
-
-    std::string extra(argv[2]);
-
-    unsigned int total_args = argc - 2; /* remove "khomp log disk" */
-
-    if (extra == "no")
-    {
-        invert = true;
-        --total_args;
-    }
-    else if (extra == "just")
-    {
-        unique = true;
-        --total_args;
-    }
-
-    unsigned int first_args = argc - total_args;
-
-    std::string options;
-
-    for (unsigned int i = first_args; i < (unsigned int)argc; i++)
-    {
-        options += argv[i];
-        options += ",";
-    }
-
-    K::Logger::processLogDisk(stream, options, invert, unique);
-    return true;
-}
-
-bool Cli::_KhompLogStatus::execute(int argc, char *argv[])
-{
-    if(argc != 2)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    Strings::Merger m1;
-
-    bool flag1_errors   = K::Logger::Logg.classe(C_ERROR).get(O_CONSOLE, K::LogManager::Option::ENABLED);
-    bool flag1_warnings = K::Logger::Logg.classe(C_WARNING).get(O_CONSOLE, K::LogManager::Option::ENABLED);
-    bool flag1_messages = K::Logger::Logg.classe(C_MESSAGE).get(O_CONSOLE, K::LogManager::Option::ENABLED);
-    bool flag1_events   = K::Logger::Logg.classe(C_EVENT).get(O_CONSOLE, K::LogManager::Option::ENABLED);
-    bool flag1_commands = K::Logger::Logg.classe(C_COMMAND).get(O_CONSOLE, K::LogManager::Option::ENABLED);
-    bool flag1_audio    = K::Logger::Logg.classe(C_AUDIO_EV).get(O_CONSOLE, K::LogManager::Option::ENABLED);
-    bool flag1_modem    = K::Logger::Logg.classe(C_MODEM_EV).get(O_CONSOLE, K::LogManager::Option::ENABLED);
-    bool flag1_links    = K::Logger::Logg.classe(C_LINK_STT).get(O_CONSOLE, K::LogManager::Option::ENABLED);
-    bool flag1_cas      = K::Logger::Logg.classe(C_CAS_MSGS).get(O_CONSOLE, K::LogManager::Option::ENABLED);
-
-    if (flag1_errors)   m1.add("errors");
-    if (flag1_warnings) m1.add("warnings");
-    if (flag1_messages) m1.add("messages");
-    if (flag1_events)   m1.add("events");
-    if (flag1_commands) m1.add("commands");
-    if (flag1_audio)    m1.add("audio");
-    if (flag1_modem)    m1.add("modem");
-    if (flag1_links)    m1.add("link");
-    if (flag1_cas)      m1.add("cas");
-
-    K::Logger::Logg2(C_CLI, stream, "             ");
-
-    if (!m1.empty()) K::Logger::Logg2(C_CLI, stream, FMT("Enabled console messages: %s.") % m1.merge(", "));
-    else /* ----- */ K::Logger::Logg2(C_CLI, stream, "There are no console messages enabled.");
-
-    bool flag2_errors    = K::Logger::Logg.classe(C_ERROR).get(O_GENERIC, K::LogManager::Option::ENABLED);
-    bool flag2_warnings  = K::Logger::Logg.classe(C_WARNING).get(O_GENERIC, K::LogManager::Option::ENABLED);
-    bool flag2_messages  = K::Logger::Logg.classe(C_MESSAGE).get(O_GENERIC, K::LogManager::Option::ENABLED);
-    bool flag2_events    = K::Logger::Logg.classe(C_EVENT).get(O_GENERIC, K::LogManager::Option::ENABLED);
-    bool flag2_commands  = K::Logger::Logg.classe(C_COMMAND).get(O_GENERIC, K::LogManager::Option::ENABLED);
-    bool flag2_audio     = K::Logger::Logg.classe(C_AUDIO_EV).get(O_GENERIC, K::LogManager::Option::ENABLED);
-    bool flag2_modem     = K::Logger::Logg.classe(C_MODEM_EV).get(O_GENERIC, K::LogManager::Option::ENABLED);
-    bool flag2_links     = K::Logger::Logg.classe(C_LINK_STT).get(O_GENERIC, K::LogManager::Option::ENABLED);
-    bool flag2_cas       = K::Logger::Logg.classe(C_CAS_MSGS).get(O_GENERIC, K::LogManager::Option::ENABLED);
-    bool flag2_functions = K::Logger::Logg.classe(C_DBG_FUNC).enabled();
-    bool flag2_threads   = K::Logger::Logg.classe(C_DBG_THRD).enabled();
-    bool flag2_locks     = K::Logger::Logg.classe(C_DBG_LOCK).enabled();
-    bool flag2_streams   = K::Logger::Logg.classe(C_DBG_STRM).enabled();
-
-    Strings::Merger m2;
-
-    if (flag2_errors)    m2.add("errors");
-    if (flag2_warnings)  m2.add("warnings");
-    if (flag2_messages)  m2.add("messages");
-    if (flag2_events)    m2.add("events");
-    if (flag2_commands)  m2.add("commands");
-    if (flag2_audio)     m2.add("audio");
-    if (flag2_modem)     m2.add("modem");
-    if (flag2_links)     m2.add("link");
-    if (flag2_cas)       m2.add("cas");
-    if (flag2_functions) m2.add("functions");
-    if (flag2_threads)   m2.add("threads");
-    if (flag2_locks)     m2.add("locks");
-    if (flag2_streams)   m2.add("streams");
-
-    if (!m2.empty()) K::Logger::Logg2(C_CLI, stream, FMT("Enabled log-on-disk messages: %s.") % m2.merge(", "));
-    else /* ----- */ K::Logger::Logg2(C_CLI, stream, "There are no log-on-disk messages enabled.");
-
-    if (Globals::flag_trace_rdsi) K::Logger::Logg2(C_CLI, stream, "The ISDN (RDSI) low-level tracing is enabled.");
-
-    K::Logger::Logg2(C_CLI, stream, "             ");
-
-    return true;
-}
-
-bool Cli::_KhompLogRotate::execute(int argc, char *argv[])
-{
-    if (argc != 2)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    if (!K::Logger::rotate())
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool Cli::_KhompLogTraceK3L::execute(int argc, char *argv[])
-{
-    if (argc != 4)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    std::string str_on("on");
-    std::string str_off("off");
-
-    bool value = false;
-
-         if (str_on  == argv[3]) value = true;
-    else if (str_off == argv[3]) value = false;
-    else
-    {
-        K::Logger::Logg2(C_CLI, stream, "ERROR: Please use 'on' or 'off' to enable or disable.");
-        return false;
-    }
-
-    K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: %sbling k3l debug messages.") % (value ? "Ena" : "Disa"));
-
-    Logfile logfile;
-
-    K::LogConfig::set(logfile, "K3L", "Value",        value);
-    K::LogConfig::set(logfile, "K3L", "CallProgress", value);
-    K::LogConfig::set(logfile, "K3L", "CallAnalyzer", value);
-    K::LogConfig::set(logfile, "K3L", "CadenceRecog", value);
-    K::LogConfig::set(logfile, "K3L", "CallControl",  value);
-    K::LogConfig::set(logfile, "K3L", "Fax",          value);
-
-    if (K::LogConfig::commit(logfile))
-    {
-        try
-        {
-            Globals::k3lapi.command(-1, -1, CM_LOG_UPDATE);
-        }
-        catch(...)
-        {
-            LOG(ERROR,"Error while send command CM_LOG_UPDATE");
-        }
-    }
-
-    return true;
-}
-
-bool Cli::_KhompLogTraceISDN::execute(int argc, char *argv[])
-{
-    if (argc < 4)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    bool active = true;
-
-    bool change_lapd = false;
-    bool change_q931 = false;
-
-    std::string what;
-
-    for (unsigned int i = 3; i < (unsigned int)argc; i++)
-    {
-        what += argv[i];
-        what += ",";
-    }
-
-    Strings::vector_type values;
-    Strings::tokenize(what, values, ",");
-
-    for (Strings::vector_type::iterator i = values.begin(); i != values.end(); i++)
-    {
-        if ((*i) == "q931") change_q931 = true;
-        if ((*i) == "lapd") change_lapd = true;
-        if ((*i) == "off")  active = false;
-    }
-
-    Logfile logfile;
-
-    K::LogConfig::set(logfile, "ISDN", "Value", active);
-
-    if (change_lapd || !active)
-        K::LogConfig::set(logfile, "ISDN", "Lapd", active);
-
-    if (change_q931 || !active)
-        K::LogConfig::set(logfile, "ISDN", "Q931", active);
-
-    if (K::LogConfig::commit(logfile))
-    {
-        try
-        {
-            Globals::k3lapi.command(-1, -1, CM_LOG_UPDATE);
-
-            if (active)
-            {
-                K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Activating the following ISDN debug option(s): %s") % what);
-                Globals::flag_trace_rdsi = true;
-            }
-            else
-            {
-                K::Logger::Logg2(C_CLI, stream, "NOTICE: Deactivating ISDN debug options");
-                Globals::flag_trace_rdsi = false;
-            }
-        }
-        catch(...)
-        {
-            if (active)
-                K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to activate the following ISDN debug option(s): %s") % what);
-            else
-                K::Logger::Logg2(C_CLI, stream, "ERROR: Unable to deactivate ISDN debug options");
-        }
-
-        return false;
-    }
-
-    return true;
-}
-
-bool Cli::_KhompLogTraceR2::execute(int argc, char *argv[])
-{
-    if (argc != 4)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    try
-    {
-        std::string str_off("off");
-        std::string str_on("on" );
-
-        bool enable = false;
-
-        if (str_on   == argv[3]) enable = true;
-        else if (str_off  == argv[3]) enable = false;
-
-        if (enable)
-        {
-            K::Logger::Logg2(C_CLI, stream, "NOTICE: All channels of all devices will be monitored!" );
-        }
-        else
-        {
-            K::Logger::Logg2(C_CLI, stream, "NOTICE: Deactivating R2 debug options" );
-        }
-
-        Logfile logfile;
-
-        K::LogConfig::set(logfile, "R2", "Value",     enable);
-        K::LogConfig::set(logfile, "R2", "Signaling", enable);
-        K::LogConfig::set(logfile, "R2", "States",    enable);
-
-        if (K::LogConfig::commit(logfile))
-        {
-            try
-            {
-                Globals::k3lapi.command(-1, -1, CM_LOG_UPDATE);
-            }
-            catch(...)
-            {
-                LOG(ERROR,"Error while send command CM_LOG_UPDATE");
-            }
-        }
-    }
-    catch (Strings::invalid_value e)
-    {
-        K::Logger::Logg2(C_CLI, stream, "ERROR: Invalid numeric value in arguments.");
-        return false;
-    }
-
-    return true;
-}
-
-bool Cli::_KhompGet::execute(int argc, char *argv[])
-{
-    if (argc < 2)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    std::string arg(argv[1]);
-
-    try
-    {
-       std::string res = Globals::options.get(&Opt::_options, (const char*) argv[1]);
-       K::Logger::Logg2(C_CLI, stream, FMT("Result for command %s is %s.") % std::string(argv[1]) % res);
-    }catch(Config::Failure &e){
-       K::Logger::Logg2(C_CLI, stream, e.what());
-    }
-
-    return true;
-}
-
-bool Cli::_KhompSet::execute(int argc, char *argv[])
-{
-    if (argc < 3)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    std::string args;
-
-    const unsigned int first = 2;
-
-    for (unsigned int i = first; i < (unsigned int)argc; i++)
-    {
-        if (i != first) { args += " "; }
-
-        args += argv[i];
-    }
-
-    try
-    {
-        Globals::options.process(&Opt::_options, (const char *) argv[1], (const char *) args.c_str());
-        const Config::Options::Messages msgs = Globals::options.commit(&Opt::_options, (const char *)argv[1]);
-
-        for (Config::Options::Messages::const_iterator i = msgs.begin(); i != msgs.end(); ++i)
-        {
-            K::Logger::Logg2(C_ERROR, stream, FMT("%s.") % (*i));
-        }
-
-        K::Logger::Logg2(C_CLI, stream, FMT("Setting %s for value %s") % argv[1] % argv[2]);
-    }
-    catch (Config::Failure &e)
-    {
-        K::Logger::Logg2(C_ERROR,stream, FMT("config processing error: %s.") % e.what());
-    }
-
-    return true;
-}
-
-bool Cli::_KhompRevision::execute(int argc, char *argv[])
-{
-#ifndef MOD_KHOMP_VERSION
-#define MOD_KHOMP_VERSION "unknown"
-#endif
-
-#ifndef SWITCH_VERSION_FULL
-#define SWITCH_VERSION_FULL "unknown"
-#endif
-
-    std::string khomp_endpoint_rev(MOD_KHOMP_VERSION);
-    std::string freeswitch_rev(SWITCH_VERSION_FULL);
-
-    K::Logger::Logg2(C_CLI, stream, FMT("Khomp Endpoint - %s") % khomp_endpoint_rev);
-    K::Logger::Logg2(C_CLI, stream, FMT("FreeSWITCH - %s") % freeswitch_rev);
-    return true;
-}
-
-bool Cli::_KhompSendCommand::execute(int argc, char *argv[])
-{
-    if (argc < 5 || argc > 6)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    unsigned int dev = atoi (argv[2]);
-
-    if (dev >= Globals::k3lapi.device_count())
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such device: %d!") % dev);
-        return false;
-    }
-
-    unsigned int num = atoi (argv[4]);
-
-    if (num >= 256)
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Invalid command number: %d!") % num);
-        return false;
-    }
-
-    unsigned int obj = atoi (argv[3]);
-
-    try
-    {
-        switch (argc)
-        {
-            case 5:    Globals::k3lapi.command(dev,obj, num);         break;
-            case 6:    Globals::k3lapi.command(dev,obj, num,argv[5]); break;
-            default:   /*               what-a-hell ?!             */ break;
-        }
-    }
-    catch(K3LAPI::failed_command &e)
-    {
-        if (K::Logger::Logg.classe(C_WARNING).enabled())
-        {
-            LOG(WARNING, FMT("Command '%s' has failed with error '%s'.")
-                % Verbose::commandName(e.code) % Verbose::status((KLibraryStatus)e.rc));
-        }
-
-        return false;
-    }
-
-    return true;
-}
-
-bool Cli::_KhompSendRawCommand::execute(int argc, char *argv[])
-{
-    if (argc < 6)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    unsigned int dev = atoi (argv[3]);
-
-    if (dev >= Globals::k3lapi.device_count())
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: No such device: %d!") % dev);
-        return false;
-    }
-
-    unsigned int dsp = atoi (argv[4]);
-
-    if (dsp >= 2)
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Invalid DSP number: %d!") % dsp);
-        return false;
-    }
-
-    const unsigned int base = 5;
-    char commands[(argc - base)];
-
-    for (int i = base, j = 0; i < argc; i++, j++)
-    {
-        if (sscanf(argv[i], "%hhx", &(commands[j])) != 1)
-        {
-            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Invalid hexadecimal sequence: '%s'!") % argv[i]);
-            return false;
-        }
-    }
-
-    try
-    {
-        Globals::k3lapi.raw_command(dev, dsp, commands, (argc - base));
-    }
-    catch(K3LAPI::failed_raw_command &e)
-    {
-        if (K::Logger::Logg.classe(C_WARNING).enabled())
-        {
-            LOG(WARNING, FMT("(dev=%d,dsp=%d): Raw command '%s' has failed with error '%s'.")
-            % e.dev
-            % e.dsp
-            % Strings::hexadecimal(std::string((char*) commands,(argc - base)))
-            % Verbose::status((KLibraryStatus)e.rc));
-        }
-
-        return false;
-    }
-
-   return true;
-}
-
-bool Cli::_KhompSelectSim::execute(int argc, char *argv[])
-{
-    if(argc != 5)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    std::string dev_str(argv[2]);
-    std::string obj_str(argv[3]);
-    std::string num_str(argv[4]);
-
-    try
-    {
-        unsigned int dev = Strings::tolong(dev_str);
-        unsigned int obj = Strings::tolong(obj_str);
-
-        if (!Globals::k3lapi.valid_device(dev))
-        {
-            K::Logger::Logg2(C_CLI, stream,
-                    FMT("ERROR: no such device %d!") % dev);
-            return false;
-        }
-
-        if (!Globals::k3lapi.valid_channel(dev, obj))
-        {
-            K::Logger::Logg2(C_CLI, stream,
-                    FMT("ERROR: No such channel %d on device %d!") % obj % dev);
-            return false;
-        }
-
-        /* just check for validity */
-        (void)Strings::tolong(num_str);
-
-
-        if(!Board::get(dev, obj)->application(SELECT_SIM_CARD, NULL, num_str.c_str()))
-        {
-            K::Logger::Logg2(C_CLI, stream, "ERROR: Unable to select sim card");
-            return false;
-        }
-    }
-    catch (Strings::invalid_value & e)
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Invalid number '%s'!") % e.value());
-        return false;
-    }
-    catch (K3LAPITraits::invalid_channel & err)
-    {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
-        return false;
-    }
-    catch(...)
-    {
-        K::Logger::Logg2(C_CLI, stream, "ERROR: Unable to select sim card");
-        return false;
-    }
-
-    return true;
-}
-
-bool Cli::_KhompKommuterOnOff::execute(int argc, char *argv[])
-{
-    if(argc != 2)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    switch (Board::kommuter._kommuter_count)
-    {
-        case -1: K::Logger::Logg2(C_CLI, stream, "ERROR: libkwd.so required for kommuter could not be found." ); return false;
-        case 0:  K::Logger::Logg2(C_CLI, stream, "ERROR: none Kommuter was found on the system." );              return false;
-    }
-
-    if (Opt::_options._kommuter_activation() == "auto")
-    {
-        K::Logger::Logg2(C_CLI, stream, "ERROR: Kommuter is set to be started automatically by kommuter-activation configuration.");
-        return false;
-    }
-
-    bool on_off = ARG_CMP(1, "on") ? true : false;
-
-    int ret = 0;
-    if (on_off)
-    {
-        int timeout = Opt::_options._kommuter_timeout();
-        K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Activating Kommuters with timeout of %d seconds .") % timeout);
-        bool start_timer = false;
-
-        std::string param= STG(FMT("timeout=%d") % timeout);
-
-        for (int kommuter = 0; kommuter < Board::kommuter._kommuter_count; kommuter++)
-        {
-            try
-            {
-                Globals::k3lapi.command(-1, kommuter, CM_START_WATCHDOG, (char*) param.c_str());
-                start_timer = true;
-            }
-            catch(K3LAPI::failed_command & e)
-            {
-                switch(e.rc)
-                {
-                case ksInvalidParams:
-                    K::Logger::Logg2(C_CLI,stream,FMT("ERROR: invalid timeout '%d' for Kommuter device '%d' timeout. Mininum is 0, maximum is 255.")
-                % timeout % kommuter);
-                    break;
-                default:
-                    K::Logger::Logg2(C_CLI,stream,FMT("ERROR: could not start the kommuter device number '%d'.") % kommuter);
-                    break;
-                }
-            }
-            catch(...)
-            {
-                K::Logger::Logg2(C_CLI, stream, FMT("ERROR: could not start the Kommuter device number '%d'.") % kommuter);
-            }
-        }
-
-        if (timeout == 0)
-        {
-            DBG(FUNC, D("kommuter watchdog timer not created because timeout is 0."));
-            return false;
-        }
-
-        if (start_timer)
-        {
-            if (!Globals::global_timer)
-            {
-                K::Logger::Logg2(C_CLI, stream , "Error creating the timer for kommuter.");
-                return true;
-            }
-            else if (Board::kommuter._kwtd_timer_on)
-            {
-                Globals::global_timer->restart( Board::kommuter._kwtd_timer_index, true );
-                DBG(FUNC, D("kommuter watchdog timer restarted."));
-            }
-            else
-            {
-                Board::kommuter._kwtd_timer_index = Globals::global_timer->add(((timeout < 5) ? (timeout*500) : 2000), &Kommuter::wtdKickTimer);
-                Board::kommuter._kwtd_timer_on = true;
-                DBG(FUNC, D("kommuter watchdog timer created and started."));
-            }
-        }
-    }
-    else
-    {
-        K::Logger::Logg2(C_CLI, stream, "NOTICE: Deactivating Kommuters.");
-
-        if (Board::kommuter._kwtd_timer_on)
-        {
-            Globals::global_timer->del( Board::kommuter._kwtd_timer_index);
-            Board::kommuter._kwtd_timer_on = false;
-        }
-
-        for(int kommuter = 0; kommuter < Board::kommuter._kommuter_count; kommuter++)
-        {
-            try
-            {
-                Globals::k3lapi.command(-1, kommuter, CM_STOP_WATCHDOG);
-                return true;
-            }
-            catch(K3LAPI::failed_command & e)
-            {
-                K::Logger::Logg2(C_CLI,stream,FMT("ERROR: Kommuter device '%d' was not initialized.") % kommuter);
-            }
-            catch(...)
-            {
-                K::Logger::Logg2(C_CLI, stream,FMT("ERROR: could not disable kommuter device '%d' for some unknow reason.") % kommuter);
-            }
-        }
-    }
-
-    return false;
-}
-
-bool Cli::_KhompKommuterCount::execute(int argc, char *argv[])
-{
-    if(argc != 2)
-    {
-        printUsage(stream);
-        return false;
-    }
-
-    if(Board::kommuter._kommuter_count == -1)
-    {
-        K::Logger::Logg2(C_CLI, stream,
-                "ERROR: libkwd.so required for kommuter could not be found." );
-        return false;
-    }
-
-    K::Logger::Logg2(C_CLI, stream,
-            FMT("Kommuter devices detected = [%d]")
-            % Board::kommuter._kommuter_count);
-
-    return true;
-}
-
diff --git a/src/mod/endpoints/mod_khomp/src/frame.cpp b/src/mod/endpoints/mod_khomp/src/frame.cpp
deleted file mode 100644
index ad2b105772..0000000000
--- a/src/mod/endpoints/mod_khomp/src/frame.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "frame.h"
-
-#define ALLOC(T,s) ((T*)calloc(1,s))
-
-/* Internal frame manager structure. */
-FrameStorage::FrameStorage(switch_codec_t * codec, int packet_size)
-:  _frames(ALLOC(switch_frame_t, frame_count * sizeof(switch_frame_t))),
-   _buffer(ALLOC(          char, audio_count * packet_size)),
-   _index(0)
-{
-    for (unsigned int i = 0; i < frame_count; i++)
-    {
-        _frames[i].codec      = codec;
-        _frames[i].source     = "mod_khomp";
-
-        _frames[i].packet     = 0;
-        _frames[i].packetlen  = 0;
-        _frames[i].extra_data = 0;
-
-        _frames[i].data       = (char *)0;
-        _frames[i].datalen    = packet_size;
-        _frames[i].buflen     = packet_size;
-
-        _frames[i].samples    = packet_size; // packet_duration * 8
-        _frames[i].rate       = 8000;
-        _frames[i].payload    = 0;
-
-        _frames[i].timestamp  = 0u;
-
-        _frames[i].seq        = 0u;
-        _frames[i].ssrc       = 0u;
-        _frames[i].m          = SWITCH_FALSE;
-        _frames[i].flags      = SFF_NONE;
-    }
-
-    _cng_frame.codec      = codec;
-    _cng_frame.source     = "mod_khomp";
-    _cng_frame.packet     = 0;
-    _cng_frame.packetlen  = 0;
-    _cng_frame.extra_data = 0;
-
-    _cng_frame.data       = (void*)"A";
-    _cng_frame.datalen    = 2;
-    _cng_frame.buflen     = 2;
-
-    _cng_frame.samples    = packet_size;
-    _cng_frame.rate       = 8000;
-    _cng_frame.payload    = 0;
-
-    _cng_frame.timestamp  = 0u;
-
-    _cng_frame.seq        = 0u;
-    _cng_frame.ssrc       = 0u;
-    _cng_frame.m          = SWITCH_FALSE;
-    _cng_frame.flags      = SFF_CNG;
-
-//    if (mlock(&_frames, frames_size) < 0)
-//    {
-//        DBG(CONF, F("Unable to lock ast_frame buffer memory in RAM: %s") % strerror(errno));
-//        std::cerr << "chan_khomp: Unable to lock ast_frame buffer memory in RAM: "
-//            << strerror(errno) << ". "
-//                << "This is not a catastrophic failure, but may cause unpredictable "
-//                << "audio delay under extreme load conditions." << std::endl;
-//    }
-//
-//    if (mlock(&_buffer, buffer_size) < 0)
-//    {
-//        DBG(CONF, F("Unable to lock audio buffer memory in RAM: %s") % strerror(errno));
-//        std::cerr << "chan_khomp: Unable to lock temporary audio buffer memory in RAM: "
-//                << strerror(errno) << ". "
-//                    << "This is not a catastrophic failure, but may cause unpredictable "
-//                    << "audio delay under extreme load conditions." << std::endl;
-//    }
-};
-
-FrameStorage::~FrameStorage()
-{
-    free(_frames);
-    free(_buffer);
-}
-
diff --git a/src/mod/endpoints/mod_khomp/src/globals.cpp b/src/mod/endpoints/mod_khomp/src/globals.cpp
deleted file mode 100644
index b5d22a261e..0000000000
--- a/src/mod/endpoints/mod_khomp/src/globals.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "globals.h"
-
-K3LAPI                           Globals::k3lapi;
-K3LUtil                          Globals::k3lutil(Globals::k3lapi);
-Verbose                          Globals::verbose(Globals::k3lapi);
-
-/* Global Timer */
-Globals::GlobalTimer           * Globals::global_timer = NULL;
-
-Globals::Mutex                   Globals::khomp_alloc_mutex;
-
-Config::Options                  Globals::options;
-
-const Regex::Expression          Globals::regex_allocation("(((([bB])[ ]*([0-9]+))|(([sS])[ ]*([0-9]+)))[ ]*(([cClL])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)?)|(([rR])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)", Regex::E_EXTENDED);
-
-switch_endpoint_interface_t    * Globals::khomp_endpoint_interface     = NULL;
-switch_endpoint_interface_t    * Globals::khomp_sms_endpoint_interface = NULL;
-switch_endpoint_interface_t    * Globals::khomp_pr_endpoint_interface  = NULL;
-switch_application_interface_t * Globals::khomp_app_inteface           = NULL;
-switch_api_interface_t         * Globals::api_interface                = NULL;
-switch_memory_pool_t           * Globals::module_pool                  = NULL;
-
-volatile bool                    Globals::logs_being_rotated = false;
-
-bool                             Globals::flag_trace_rdsi = false;
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp
deleted file mode 100644
index c8058e8e2d..0000000000
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp
+++ /dev/null
@@ -1,2607 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "khomp_pvt.h"
-#include "lock.h"
-#include "khomp_pvt_kxe1.h"
-#include "khomp_pvt_gsm.h"
-#include "khomp_pvt_fxo.h"
-#include "khomp_pvt_passive.h"
-#include "utils.h"
-
-Board::VectorBoard  Board::_boards;
-char                Board::_cng_buffer[Globals::cng_buffer_size];
-Kommuter            Board::kommuter;
-
-
-Board::KhompPvt::KhompPvt(K3LAPIBase::GenericTarget & target) :
-  _target(target),
-  _mutex(Globals::module_pool),
-  _session(NULL),
-  _caller_profile(NULL),
-  _reader_frames(&_read_codec),
-  _writer_frames(&_write_codec)
-{
-    _read_codec.implementation = NULL;
-    _write_codec.implementation = NULL;
-
-    _pvt_statistics = new PvtStatistics(this);
-
-    _mohclass    = Opt::_options._global_mohclass();
-    _language    = Opt::_options._global_language();
-    _accountcode = Opt::_options._accountcode();
-}
-
-bool Board::initializeK3L(void)
-{
-    LOG(MESSAGE, "starting K3L API ...");
-
-    /* Start the API and connect to KServer */
-    k3lSetGlobalParam (klpResetFwOnStartup, 1);
-    k3lSetGlobalParam (klpDisableInternalVoIP, 1);
-
-    try
-    {
-        Globals::k3lapi.start();
-    }
-    catch (K3LAPI::start_failed & e)
-    {
-        LOG(ERROR,FMT("loading K3L API failed: %s") % e.what());
-        return false;
-    }
-
-    LOG(MESSAGE, "the K3L API have been started!");
-
-    return true;
-}
-
-bool Board::finalizeK3L(void)
-{
-    /* Stop the API and disconnect to KServer */
-    try
-    {
-        Globals::k3lapi.stop();
-    }
-    catch(...)
-    {
-        LOG(ERROR, "K3L not stopped");
-        return false;
-    }
-    LOG(MESSAGE, "K3L stopped..");
-    return true;
-}
-
-bool Board::initializeHandlers(void)
-{
-    Globals::global_timer = new Globals::GlobalTimer;
-    Globals::global_timer->start();
-
-    if (Globals::k3lapi.device_count() == 0)
-        return false;
-
-    for (VectorBoard::iterator it_dev = _boards.begin();
-                               it_dev != _boards.end();
-                               it_dev++)
-    {
-        Board * device = *it_dev;
-        device->_event_handler = new ChanEventHandler(device->id(), &eventThread);
-        device->_command_handler = new ChanCommandHandler(device->id(), &commandThread);
-
-        device->_timers.start();
-    }
-
-    k3lRegisterEventHandler( khompEventCallback );
-    k3lRegisterAudioListener( NULL, khompAudioListener );
-
-    LOG(MESSAGE, "K3l event and audio handlers registered.");
-
-    return true;
-}
-
-bool Board::finalizeHandlers(void)
-{
-    /* if timer still ticks, stop him */
-    if(Globals::global_timer != NULL)
-    {
-        Globals::global_timer->stop();
-        delete Globals::global_timer;
-        Globals::global_timer = NULL;
-    }
-
-    if (Globals::k3lapi.device_count() == 0)
-        return false;
-
-    k3lRegisterEventHandler( NULL );
-    k3lRegisterAudioListener( NULL, NULL );
-
-
-    for (VectorBoard::iterator it_dev = _boards.begin();
-                               it_dev != _boards.end();
-                               it_dev++)
-    {
-        Board * device = *it_dev;
-        // stop event handler for device
-        ChanEventHandler * evt_handler = device->_event_handler;
-        evt_handler->fifo()->_shutdown = true;
-        evt_handler->signal();
-        delete evt_handler;
-        device->_event_handler = NULL;
-        // stop command handler for device
-        ChanCommandHandler * cmd_handler = device->_command_handler;
-        cmd_handler->fifo()->_shutdown = true;
-        cmd_handler->signal();
-        delete cmd_handler;
-        device->_command_handler = NULL;
-        // stop timer
-        device->_timers.stop();
-    }
-
-    /* wait every thread to finalize */
-    sleep(1);
-
-    LOG(MESSAGE, "K3l event and audio handlers unregistered.");
-
-    return true;
-
-}
-
-void Board::initializeBoards(void)
-{
-
-    for (unsigned dev = 0; dev < Globals::k3lapi.device_count(); dev++)
-    {
-        LOG(MESSAGE,FMT("loading device %d..." ) % dev);
-
-        switch(Globals::k3lapi.device_type(dev))
-        {
-            case kdtE1:
-            case kdtE1Spx:
-            case kdtE1GW:
-            case kdtE1IP:
-            case kdtE1FXSSpx:
-            case kdtFXS:
-            case kdtFXSSpx:
-                _boards.push_back(new BoardE1(dev));
-                break;
-            case kdtGSM:
-            case kdtGSMSpx:
-            case kdtGSMUSB:
-            case kdtGSMUSBSpx:
-                _boards.push_back(new BoardGSM(dev));
-                break;
-            case kdtFXO:
-            case kdtFXOVoIP:
-                switch(Globals::k3lapi.device_config(dev).DeviceModel)
-                {
-                case kdmFXO80:
-                    _boards.push_back(new BoardFXO(dev));
-                    break;
-                default:
-                    _boards.push_back(new BoardPassive(dev));
-                    break;
-                }
-                break;
-            case kdtPR:
-                    _boards.push_back(new BoardPassive(dev));
-                    break;
-            default:
-                _boards.push_back(new Board(dev));
-                LOG(ERROR,FMT("device type %d unknown" ) %  Globals::k3lapi.device_type(dev));
-                break;
-        }
-
-        _boards.back()->initializeChannels();
-    }
-}
-
-void Board::initializeChannels(void)
-{
-    LOG(MESSAGE, "loading channels ...");
-
-    for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
-    {
-        K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
-
-        KhompPvt * pvt;
-
-		switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
-		{
-            case ksigInactive:
-            default:
-                pvt = new Board::KhompPvt(tgt);
-                pvt->_call = new Board::KhompPvt::Call();
-                DBG(FUNC, FMT("signaling %d unknown") % Globals::k3lapi.channel_config(_device_id, obj).Signaling);
-                break;
-        }
-
-        _channels.push_back(pvt);
-
-        pvt->cleanup();
-    }
-}
-
-void Board::finalizeBoards(void)
-{
-    LOG(MESSAGE, "finalizing boards ...");
-
-    for (VectorBoard::iterator it_dev = _boards.begin();
-                               it_dev != _boards.end();
-                               it_dev++)
-    {
-        Board * & device_ref = *it_dev;
-        Board *   device_ptr = device_ref;
-
-        device_ptr->finalizeChannels();
-
-        device_ref = (Board *) NULL;
-
-        delete device_ptr;
-    }
-
-}
-
-void Board::finalizeChannels()
-{
-    LOG(MESSAGE, "finalizing channels ...");
-    for (VectorChannel::iterator it_obj = _channels.begin();
-         it_obj != _channels.end();
-         it_obj++)
-    {
-        KhompPvt * & pvt_ref = *it_obj;
-        KhompPvt *   pvt_ptr = pvt_ref;
-
-        if(!pvt_ptr)
-            continue;
-
-        try
-        {
-            ScopedPvtLock lock(pvt_ptr);
-
-            if(pvt_ptr->session())
-            {
-                //TODO: Tratamento para desconectar do canal do FreeSwitch.
-                pvt_ptr->cleanup();
-            }
-
-            delete pvt_ptr->_call;
-            pvt_ptr->_call = NULL;
-
-            pvt_ref = (KhompPvt *) NULL;
-        }
-        catch(...)
-        {
-            /* keep walking! */
-        }
-
-        delete pvt_ptr;
-    }
-}
-
-void Board::initializeCngBuffer(void)
-{
-    bool turn = true;
-
-    for (unsigned int i = 0; i < Globals::cng_buffer_size; i++)
-    {
-        _cng_buffer[i] = (turn ? 0xD5 : 0xD4);
-        turn = !turn;
-    }
-}
-
-bool Board::initialize(void)
-{
-    initializeCngBuffer();
-
-    try
-    {
-       initializeBoards();
-    }
-    catch(K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, FMT("Invalid device at initialize boards: %s") %  err.what());
-        return false;
-    }
-    catch(K3LAPITraits::invalid_channel & err)
-    {
-        LOG(ERROR, FMT("Invalid channel at initialize boards: %s") %  err.what());
-        return false;
-    }
-    catch(K3LAPITraits::invalid_link & err)
-    {
-        LOG(ERROR, FMT("Invalid link at initialize boards: %s") %  err.what());
-        return false;
-    }
-
-    return true;
-}
-
-bool Board::finalize(void)
-{
-    finalizeBoards();
-
-    return finalizeK3L();
-}
-
-void Board::khomp_add_event_board_data(const K3LAPIBase::GenericTarget target, switch_event_t *event)
-{
-
-    //if (!event) {
-        //TODO: RAISE!
-    //}
-
-    try
-    {
-        if (target.type == K3LAPIBase::GenericTarget::CHANNEL)
-        {
-            switch_core_session_t * s = get(target.device, target.object)->session();
-            switch_channel_event_set_data(Board::KhompPvt::getFSChannel(s), event);
-        }
-
-        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Khomp-DeviceId", "%u", target.device);
-        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Khomp-Object", "%u", target.object);
-    }
-    catch(K3LAPITraits::invalid_channel & err)
-    {
-        LOG(ERROR, PVT_FMT(target, "Invalid channel"));
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target, "No valid channel: %s") % err._msg.c_str());
-    }
-}
-
-std::string Board::KhompPvt::getStatistics(Statistics::Type type)
-{
-    switch(type)
-    {
-        case Statistics::DETAILED:
-        {
-            return _pvt_statistics->getDetailed();
-        }
-        case Statistics::ROW:
-        {
-            return _pvt_statistics->getRow();
-        }
-        default:
-            return "";
-    }
-}
-
-switch_xml_t Board::KhompPvt::getStatisticsXML(Statistics::Type type)
-{
-    switch(type)
-    {
-        case Statistics::DETAILED:
-        {
-            return _pvt_statistics->getDetailedXML();
-        }
-        case Statistics::ROW:
-        {
-            return _pvt_statistics->getNode();
-        }
-        default:
-            return NULL;
-    }
-}
-
-std::string Board::KhompPvt::PvtStatistics::getDetailedRates()
-{
-    /* skip inactive channels */
-    //if (_pvt->getSignaling() == ksigInactive) return "";
-
-    /* buffer our data to return at the end */
-    std::string strBuffer;
-
-    /* this values come from kserver */
-    unsigned int call_incoming = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiInbound);
-    unsigned int call_outgoing = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutbound);
-
-    float occupation_rate = 100.0;
-
-    if (_pvt->call()->statistics()->_total_idle_time > 0)
-    {
-        occupation_rate = 100 * (
-            _pvt->call()->statistics()->_total_time_incoming +
-            _pvt->call()->statistics()->_total_time_outgoing
-            ) / (
-            _pvt->call()->statistics()->_total_idle_time +
-            _pvt->call()->statistics()->_total_time_incoming +
-            _pvt->call()->statistics()->_total_time_outgoing);
-    }
-
-    strBuffer.append(STG(FMT("Occupation rate: \t\t%0.2f%%\n") % occupation_rate));
-
-    if (call_incoming > 0)
-    {
-        std::string str_calls_incoming_mean = timeToString ( (time_t) (_pvt->call()->statistics()->_total_time_incoming / call_incoming) );
-        strBuffer.append(STG(FMT("Mean duration time of incoming calls: %s\n") % str_calls_incoming_mean));
-    }
-
-    if (call_outgoing > 0)
-    {
-        std::string str_calls_outgoing_mean = timeToString ( (time_t) (_pvt->call()->statistics()->_total_time_outgoing / call_outgoing) );
-        strBuffer.append(STG(FMT("Mean duration time of outgoing calls: %s\n") % str_calls_outgoing_mean));
-    }
-
-    return strBuffer;
-}
-
-switch_xml_t Board::KhompPvt::PvtStatistics::getDetailedRatesXML()
-{
-    switch_xml_t xrates = switch_xml_new("rates");
-
-    /* this values come from kserver */
-    unsigned int call_incoming = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiInbound);
-    unsigned int call_outgoing = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutbound);
-
-    float occupation_rate = 100.0;
-
-    if (_pvt->call()->statistics()->_total_idle_time > 0)
-    {
-        occupation_rate = 100 * (
-            _pvt->call()->statistics()->_total_time_incoming +
-            _pvt->call()->statistics()->_total_time_outgoing
-            ) / (
-            _pvt->call()->statistics()->_total_idle_time +
-            _pvt->call()->statistics()->_total_time_incoming +
-            _pvt->call()->statistics()->_total_time_outgoing);
-    }
-
-    switch_xml_t xoccupation = switch_xml_add_child_d(xrates,"oucpation",0);
-    switch_xml_set_txt_d(xoccupation,STR(FMT("%d") % occupation_rate));
-
-    if (call_incoming > 0)
-    {
-        std::string str_calls_incoming_mean = timeToString ( (time_t) (_pvt->call()->statistics()->_total_time_incoming / call_incoming) );
-        switch_xml_t xmean_in = switch_xml_add_child_d(xrates,"incoming",0);
-        switch_xml_set_txt_d(xmean_in,str_calls_incoming_mean.c_str());
-    }
-
-    if (call_outgoing > 0)
-    {
-        std::string str_calls_outgoing_mean = timeToString ( (time_t) (_pvt->call()->statistics()->_total_time_outgoing / call_outgoing) );
-        switch_xml_t xmean_out = switch_xml_add_child_d(xrates,"outgoing",0);
-        switch_xml_set_txt_d(xmean_out,str_calls_outgoing_mean.c_str());
-    }
-
-    return xrates;
-}
-
-std::string Board::KhompPvt::PvtStatistics::getDetailed()
-{
-    /* skip inactive channels */
-    //if (_pvt->getSignaling() == ksigInactive) return "";
-
-    /* buffer our data to return at the end */
-    std::string strBuffer;
-
-    strBuffer.append(_pvt->call()->statistics()->getDetailed());
-
-    /* this values come from kserver */
-    unsigned int call_incoming = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiInbound);
-    unsigned int call_outgoing = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutbound);
-    unsigned int call_fails    = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutFailed);
-
-    strBuffer.append(STG(FMT("Number of incoming calls: \t%d\n") % call_incoming));
-    strBuffer.append(STG(FMT("Number of outgoing calls: \t%d\n") % call_outgoing));
-    strBuffer.append(STG(FMT("Number of calls failed: \t%d\n") % call_fails));
-
-    strBuffer.append(getDetailedRates());
-
-    return strBuffer;
-}
-
-
-switch_xml_t Board::KhompPvt::PvtStatistics::getDetailedXML()
-{
-    switch_xml_t xch = _pvt->call()->statistics()->getDetailedXML();
-
-    /* this values come from kserver */
-    unsigned int call_incoming = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiInbound);
-    unsigned int call_outgoing = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutbound);
-    unsigned int call_fails    = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutFailed);
-
-    /* total/call_incoming */
-    switch_xml_t xin_calls = switch_xml_add_child_d(xch,"calls_incoming",0);
-    switch_xml_set_txt_d(xin_calls,STR(FMT("%d") % call_incoming));
-
-    /* total/call_outgoing */
-    switch_xml_t xout_calls = switch_xml_add_child_d(xch,"calls_outgoing",0);
-    switch_xml_set_txt_d(xout_calls,STR(FMT("%d") % call_outgoing));
-
-    /* total/calls_failed */
-    switch_xml_t xfailed_calls = switch_xml_add_child_d(xch,"calls_failed",0);
-    switch_xml_set_txt_d(xfailed_calls,STR(FMT("%d") % call_fails));
-
-    return xch;
-}
-
-std::string Board::KhompPvt::PvtStatistics::getRow()
-{
-    /* skip inactive channels */
-    //if (_pvt->getSignaling() == ksigInactive) return "";
-
-    time_t action_time;
-    time (&action_time);
-
-    action_time -= _pvt->call()->statistics()->_base_time;
-
-    uint32 calls_incoming = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiInbound);
-    uint32 calls_outgoing = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutbound);
-    uint32 call_fails     = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutFailed);
-
-    std::string string_time = "  n/a  ";
-    std::string call_type   = "  none  ";
-
-    if (_pvt->call()->_flags.check(Kflags::IS_INCOMING))
-        call_type = "incoming";
-    else if (_pvt->call()->_flags.check(Kflags::IS_OUTGOING))
-        call_type = "outgoing";
-
-    if (_pvt->owner())
-    {
-        string_time = timeToString(action_time);
-    }
-
-    return  STG(FMT("| %d,%02d | %8d | %8d | %8d | %7d | %10s | %8s | %8s |")
-            % _pvt->target().device
-            % _pvt->target().object
-            % calls_incoming
-            % calls_outgoing
-            % _pvt->call()->statistics()->_channel_fails
-            % call_fails
-            % _pvt->getStateString()
-            % call_type
-            % string_time);
-}
-
-switch_xml_t Board::KhompPvt::PvtStatistics::getNode()
-{
-    time_t action_time;
-    time (&action_time);
-
-    action_time -= _pvt->call()->statistics()->_base_time;
-
-    uint32 calls_incoming = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiInbound);
-    uint32 calls_outgoing = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutbound);
-    uint32 call_fails     = Globals::k3lapi.channel_stats(
-            _pvt->target().device, _pvt->target().object, kcsiOutFailed);
-
-    std::string string_time = "  n/a  ";
-    std::string call_type   = "  none  ";
-
-    if (_pvt->call()->_flags.check(Kflags::IS_INCOMING))
-        call_type = "incoming";
-    else if (_pvt->call()->_flags.check(Kflags::IS_OUTGOING))
-        call_type = "outgoing";
-
-    if (_pvt->owner())
-    {
-        string_time = timeToString(action_time);
-    }
-
-    /* device/channel */
-    switch_xml_t xchn = switch_xml_new("channel");
-    switch_xml_set_attr_d(xchn,"id",STR(FMT("%d") % _pvt->target().object));
-
-    /* device/channel/details */
-    switch_xml_t xdetails = switch_xml_add_child_d(xchn,"details",0);
-
-    /* device/channel/details/calls_incomming */
-    switch_xml_t xin_calls = switch_xml_add_child_d(xdetails,"calls_incoming",0);
-    switch_xml_set_txt_d(xin_calls,STR(FMT("%d") % calls_incoming));
-
-    /* device/channel/details/calls_outgoing */
-    switch_xml_t xout_calls = switch_xml_add_child_d(xdetails,"calls_incoming",0);
-    switch_xml_set_txt_d(xout_calls,STR(FMT("%d") % calls_outgoing));
-
-    /* device/channel/details/channel_fails */
-    switch_xml_t xchn_fails = switch_xml_add_child_d(xdetails,"channel_fails",0);
-    switch_xml_set_txt_d(xchn_fails,STR(FMT("%d") % _pvt->call()->statistics()->_channel_fails));
-
-    /* device/channel/details/calls_fails */
-    switch_xml_t xcall_fails = switch_xml_add_child_d(xdetails,"calls_fails",0);
-    switch_xml_set_txt_d(xcall_fails,STR(FMT("%d") % call_fails));
-
-    /* device/channel/details/state */
-    switch_xml_t xstate = switch_xml_add_child_d(xdetails,"state",0);
-    switch_xml_set_txt_d(xstate,_pvt->getStateString().c_str());
-
-    /* device/channel/details/call_type */
-    switch_xml_t xcall_type = switch_xml_add_child_d(xdetails,"call_type",0);
-    switch_xml_set_txt_d(xcall_type,call_type.c_str());
-
-    /* device/channel/details/time */
-    switch_xml_t xtime = switch_xml_add_child_d(xdetails,"time",0);
-    switch_xml_set_txt_d(xtime,string_time.c_str());
-
-    return xchn;
-}
-
-switch_status_t Board::KhompPvt::justAlloc(bool is_answering, switch_memory_pool_t **pool)
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-
-    if(is_answering)
-    {
-        /* Create a new session on incoming call */
-        call()->_flags.set(Kflags::IS_INCOMING);
-        if(!session())
-        {
-#if SWITCH_LESS_THAN(1,0,6)
-            session(switch_core_session_request(Globals::khomp_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL));
-#else
-            session(switch_core_session_request(Globals::khomp_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL));
-#endif
-        }
-        else
-        {
-            DBG(FUNC, PVT_FMT(target(), "Session already created"));
-        }
-    }
-    else
-    {
-        /* Create a new session on outgoing call */
-        call()->_flags.set(Kflags::IS_OUTGOING);
-#if SWITCH_LESS_THAN(1,0,6)
-        session(switch_core_session_request(Globals::khomp_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool));
-#else
-        session(switch_core_session_request(Globals::khomp_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, SOF_NONE, pool));
-#endif
-    }
-
-    if(!session())
-    {
-        LOG(ERROR, PVT_FMT(target(), "r (Initilization Error, session not created!)"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    switch_core_session_add_stream(session(), NULL);
-
-    if (switch_core_codec_init(&_read_codec, "PCMA", NULL, NULL, 8000, Globals::switch_packet_duration, 1,
-            SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
-                (pool ? *pool : NULL)) != SWITCH_STATUS_SUCCESS)
-    {
-        destroy();
-        LOG(ERROR, PVT_FMT(target(), "r (Error while init read codecs)"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    if (switch_core_codec_init(&_write_codec, "PCMA", NULL, NULL, 8000, Globals::switch_packet_duration, 1,
-            SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
-                (pool ? *pool : NULL)) != SWITCH_STATUS_SUCCESS)
-    {
-        destroy();
-        LOG(ERROR, PVT_FMT(target(), "r (Error while init write codecs)"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    //TODO: Retirar daqui
-//    switch_mutex_init(&flag_mutex, SWITCH_MUTEX_NESTED,
-//                switch_core_session_get_pool(_session));
-
-    switch_core_session_set_private(_session, this);
-
-    if((switch_core_session_set_read_codec(_session, &_read_codec) !=
-                SWITCH_STATUS_SUCCESS) ||
-       (switch_core_session_set_write_codec(_session, &_write_codec) !=
-                SWITCH_STATUS_SUCCESS))
-    {
-        destroy();
-        LOG(ERROR, PVT_FMT(target(), "r (Error while set read codecs)"));
-        return SWITCH_STATUS_FALSE;
-    }
-
-    try
-    {
-        /* accounttcode for CDR identification */
-        setFSChannelVar(getFSChannel(),"accountcode",_accountcode.c_str());
-
-        /* language for IVR machine */
-        setFSChannelVar(getFSChannel(),"language",_language.c_str());
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(%s)") % err._msg.c_str() );
-        return SWITCH_STATUS_FALSE;
-    }
-
-    DBG(FUNC, PVT_FMT(target(), "r"));
-    return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t Board::KhompPvt::justStart(switch_caller_profile_t *profile)
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-
-    try
-    {
-        switch_channel_t *channel = getFSChannel();
-
-        if(call()->_flags.check(Kflags::IS_INCOMING))
-        {
-            std::string exten("s");
-
-            owner(_session);
-
-            if(call()->_incoming_context.empty())
-            {
-                MatchExtension::ContextListType contexts;
-                std::string context("default");
-
-                if(!validContexts(contexts))
-                {
-                    destroy();
-                    owner(NULL);
-                    LOG(ERROR, PVT_FMT(_target, "r (Invalid context)"));
-                    return SWITCH_STATUS_FALSE;
-                }
-
-                switch(MatchExtension::findExtension(exten, context, contexts, _call->_dest_addr, _call->_orig_addr))
-                {
-                    case MatchExtension::MATCH_NONE:
-                        destroy();
-                        owner(NULL);
-                        LOG(ERROR, PVT_FMT(_target, "r (unable to find exten/context on incoming call %s/%s)")
-                                % _call->_dest_addr % (contexts.size() >= 1 ? contexts[0] : "default"));
-                        return SWITCH_STATUS_FALSE;
-                    default:
-                        DBG(FUNC, PVT_FMT(_target, "our: dialplan '%s', context '%s', exten '%s'") % Opt::_options._dialplan() % context % exten);
-                        break;
-                }
-
-                call()->_incoming_context = context;
-            }
-            else
-            {
-                exten = call()->_dest_addr;
-                DBG(FUNC, PVT_FMT(target(), "already found our: dialplan '%s', context '%s', exten '%s'") % Opt::_options._dialplan() % call()->_incoming_context % exten);
-            }
-
-            _caller_profile = switch_caller_profile_new(switch_core_session_get_pool(_session),
-                    "Khomp",                           //username
-                    Opt::_options._dialplan().c_str(), //dialplan
-                    NULL,                              //caller_id_name
-                    _call->_orig_addr.c_str(),         //caller_id_number
-                    NULL,                              //network_addr
-                    _call->_orig_addr.c_str(),         //ani
-                    NULL,                              //aniii
-                    NULL,                              //rdnis
-                    (char *) "mod_khomp",              //source
-                    call()->_incoming_context.c_str(), //context
-                    exten.c_str());                    //destination_number
-
-            if(!_caller_profile)
-            {
-                destroy();
-                owner(NULL);
-                LOG(ERROR, PVT_FMT(_target, "r (Cannot create caller profile)"));
-                return SWITCH_STATUS_FALSE;
-            }
-
-            std::string name = STG(FMT("Khomp/%d/%d/%s")
-                    % target().device
-                    % target().object
-                    % _call->_dest_addr);
-
-            DBG(FUNC, PVT_FMT(target(), "Connect inbound channel %s") % name.c_str());
-
-            switch_channel_set_name(channel, name.c_str());
-            switch_channel_set_caller_profile(channel, _caller_profile);
-
-            switch_channel_set_state(channel, CS_INIT);
-
-            setSpecialVariables();
-
-            if (switch_core_session_thread_launch(_session) != SWITCH_STATUS_SUCCESS)
-            {
-                destroy();
-                owner(NULL);
-                LOG(ERROR, PVT_FMT(target(), "r (Error spawning thread)"));
-                return SWITCH_STATUS_FALSE;
-            }
-        }
-        else if(call()->_flags.check(Kflags::IS_OUTGOING))
-        {
-            if(_call->_orig_addr.empty())
-                _call->_orig_addr = profile->caller_id_number;
-
-            switch_channel_set_name(channel, STG(FMT("Khomp/%d/%d/%s")
-                        % target().device
-                        % target().object
-                        % (!_call->_dest_addr.empty() ? _call->_dest_addr.c_str() : "")).c_str());
-            _caller_profile = switch_caller_profile_clone(_session, profile);
-            switch_channel_set_caller_profile(channel, _caller_profile);
-
-            switch_channel_set_state(channel, CS_INIT);
-        }
-        else
-        {
-            DBG(FUNC, PVT_FMT(target(), "r (Not INCOMING or OUTGOING)"));
-            return SWITCH_STATUS_FALSE;
-        }
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        destroy();
-        owner(NULL);
-        DBG(FUNC, PVT_FMT(target(), "r (%s)") % err._msg.c_str());
-        return SWITCH_STATUS_FALSE;
-    }
-
-    DBG(FUNC, PVT_FMT(target(), "r"));
-    return SWITCH_STATUS_SUCCESS;
-}
-
-int Board::KhompPvt::makeCall(std::string params)
-{
-    DBG(FUNC, PVT_FMT(target(), "Dialing to %s from %s")
-        % _call->_dest_addr.c_str()
-        % _call->_orig_addr.c_str());
-
-    /* Lets make the call! */
-    std::string full_params;
-
-    if(!_call->_dest_addr.empty())
-        full_params += STG(FMT(" dest_addr=\"%s\"")
-                % _call->_dest_addr);
-
-    if(!params.empty())
-        full_params += STG(FMT(" %s")
-                % params);
-
-    DBG(FUNC, PVT_FMT(target(), "We are calling with params: %s.") % full_params.c_str());
-
-    int ret = commandState(KHOMP_LOG, CM_MAKE_CALL, (full_params != "" ? full_params.c_str() : NULL));
-
-    if(ret != ksSuccess)
-    {
-        destroy();
-        cleanup(CLN_FAIL);
-    }
-
-    return ret;
-}
-
-bool Board::KhompPvt::signalDTMF(char d)
-{
-    DBG(FUNC, PVT_FMT(target(), "c (dtmf=%c)") % d);
-
-    try
-    {
-        switch_dtmf_t dtmf = { (char) d, switch_core_default_dtmf_duration(0) };
-        switch_channel_queue_dtmf(getFSChannel(), &dtmf);
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "r (Received a DTMF, but %s)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(target(), "r"));
-
-    return true;
-}
-
-bool Board::KhompPvt::indicateBusyUnlocked(int cause, bool sent_signaling)
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-
-    /* already playing! */
-    if (call()->_indication != INDICA_NONE)
-    {
-        if (call()->_indication == INDICA_RING)
-        {
-            DBG(FUNC, PVT_FMT(target(), "ringback being disabled"));
-
-            if(call()->_cadence == PLAY_RINGBACK)
-                stopCadence();
-
-            try
-            {
-                call()->_flags.clear(Kflags::GEN_PBX_RING);
-                call()->_flags.clear(Kflags::GEN_CO_RING);
-
-                Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
-                Board::board(_target.device)->_timers.del(call()->_idx_co_ring);
-            }
-            catch (K3LAPITraits::invalid_device & err)
-            {
-                LOG(ERROR, PVT_FMT(_target, "Unable to get device: %d!") % err.device);
-            }
-
-            mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
-            call()->_indication = INDICA_NONE;
-        }
-        else
-        {
-            DBG(FUNC, PVT_FMT(target(), "r (already playing something: %d)")
-                    % call()->_indication);
-            return false;
-        }
-    }
-
-    setHangupCause(cause, false);
-
-    call()->_indication = INDICA_BUSY;
-
-    DBG(FUNC, PVT_FMT(target(), "r"));
-
-    return true;
-}
-
-void Board::KhompPvt::destroy(switch_core_session_t * s)
-{
-    switch_core_session_t * tmp_session;
-
-    if(!s)
-    {
-        if(!_session)
-            return;
-
-        tmp_session = _session;
-    }
-    else
-    {
-        tmp_session = s;
-
-    }
-
-    switch_core_session_destroy(&tmp_session);
-}
-
-void Board::KhompPvt::destroyAll()
-{
-    if(_session)
-    {
-        switch_core_session_set_private(_session, NULL);
-        _session = NULL;
-    }
-
-    owner(NULL);
-
-    if(_caller_profile)
-    {
-        //DBG(FUNC, PVT_FMT(target(), "Profile != NULL"));
-        //TODO: Destruir
-        _caller_profile = NULL;
-    }
-
-    if (switch_core_codec_ready(&_read_codec)) {
-        //if(session())
-        //    switch_core_session_lock_codec_read(_session);
-        switch_core_codec_destroy(&_read_codec);
-        _read_codec.implementation = NULL;
-        //if(session())
-        //    switch_core_session_unlock_codec_read(_session);
-    }
-
-    if (switch_core_codec_ready(&_write_codec)) {
-        //if(session())
-        //    switch_core_session_lock_codec_write(_session);
-        switch_core_codec_destroy(&_write_codec);
-        _write_codec.implementation = NULL;
-        //if(session())
-        //    switch_core_session_unlock_codec_write(_session);
-    }
-
-}
-
-void Board::KhompPvt::doHangup()
-{
-    try
-    {
-        switch_channel_t *channel = getFSChannel();
-
-        int cause_from_freeswitch = switch_channel_get_cause(channel);
-        if(cause_from_freeswitch != SWITCH_CAUSE_NONE)
-        {
-            DBG(FUNC, PVT_FMT(_target, "cause already set to %s from freeswitch") % switch_channel_cause2str((switch_call_cause_t)cause_from_freeswitch));
-        }
-        else
-        {
-            DBG(FUNC, PVT_FMT(target(), "Hangup channel \"%s\"") % switch_channel_get_name(channel));
-
-            switch_channel_hangup(channel, (switch_call_cause_t)call()->_hangup_cause);
-        }
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        //DBG(FUNC, PVT_FMT(target(), "Hangup channel already done"));
-    }
-}
-
-bool Board::KhompPvt::cleanup(CleanupType type)
-{
-//    flags = 0;
-
-    _reader_frames.clear();
-    _writer_frames.clear();
-
-    call()->_flags.clear(Kflags::CONNECTED);
-
-    //call()->_flags.clear(Kflags::BRIDGED);
-
-    call()->_flags.clear(Kflags::DROP_COLLECT);
-
-    call()->_flags.clear(Kflags::OUT_OF_BAND_DTMFS);
-
-    call()->_flags.clear(Kflags::WAIT_SEND_DTMF);
-
-    call()->_flags.clear(Kflags::GEN_PBX_RING);
-    call()->_flags.clear(Kflags::GEN_CO_RING);
-
-    try
-    {
-        Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
-        Board::board(_target.device)->_timers.del(call()->_idx_co_ring);
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "Unable to get device: %d!") % err.device);
-    }
-
-    call()->_idx_pbx_ring.reset();
-    call()->_idx_co_ring.reset();
-
-    switch (type)
-    {
-    case CLN_HARD:
-    case CLN_FAIL:
-        call()->_flags.clear(Kflags::KEEP_DTMF_SUPPRESSION);
-        call()->_flags.clear(Kflags::KEEP_ECHO_CANCELLATION);
-        call()->_flags.clear(Kflags::KEEP_AUTO_GAIN_CONTROL);
-
-        stopStream();
-        stopListen();
-        doHangup();
-        call()->_flags.clear(Kflags::IS_INCOMING);
-        call()->_flags.clear(Kflags::IS_OUTGOING);
-        call()->_flags.clear(Kflags::REALLY_CONNECTED);
-        call()->_flags.clear(Kflags::HAS_PRE_AUDIO);
-        call()->_flags.clear(Kflags::HAS_CALL_FAIL);
-
-        /* pára cadências e limpa estado das flags */
-        stopCadence();
-
-        cleanupIndications(true);
-
-        if(call()->_input_volume >= -10 && call()->_input_volume <= 10)
-            setVolume("input" , Opt::_options._input_volume());
-
-        if(call()->_output_volume >= -10 && call()->_output_volume <= 10)
-            setVolume("output", Opt::_options._output_volume());
-
-        return _call->clear();
-    case CLN_SOFT:
-        if(call()->_cadence != PLAY_FASTBUSY)
-        {
-            /* pára cadências e limpa estado das flags */
-            stopCadence();
-        }
-
-        if (call()->_indication == INDICA_RING)
-        {
-            call()->_indication = INDICA_NONE;
-
-            mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
-        }
-        break;
-    }
-
-    return true;
-}
-
-void Board::KhompPvt::cleanupIndications(bool force)
-{
-    if (call()->_indication != INDICA_NONE)
-    {
-        call()->_indication = INDICA_NONE;
-        mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
-    }
-}
-
-bool Board::KhompPvt::isFree(bool just_phy)
-{
-    //DBG(FUNC, DP(this, "c"));
-	try
-	{
-        bool is_physical_free = isPhysicalFree();
-
-		/* if we got here, is physically free */
-		if (!is_physical_free || just_phy)
-			return is_physical_free;
-
-        ScopedPvtLock lock(this);
-
-        if(session())
-            return false;
-
-		bool free_state = !(_call->_flags.check(Kflags::IS_INCOMING) || _call->_flags.check(Kflags::IS_OUTGOING));
-
-		DBG(FUNC, PVT_FMT(target(), "[free = %s]") % (free_state ? "yes" : "no"));
-		return free_state;
-	}
-    catch (ScopedLockFailed & err)
-	{
-		DBG(FUNC, PVT_FMT(target(), "unable to obtain lock: %s") % err._msg.c_str());
-	}
-
-	return false;
-}
-
-Board::KhompPvt * Board::queueFindFree(PriorityCallQueue &pqueue)
-{
-    for (PriorityCallQueue::iterator i = pqueue.begin(); i != pqueue.end(); i++)
-    {
-        KhompPvt *pvt = (*i);
-        if (pvt && pvt->isFree())
-        {
-            return pvt;
-        }
-    }
-
-    DBG(FUNC, D("found no free channel for fair allocation!"));
-    return NULL;
-}
-
-void Board::queueAddChannel(PriorityCallQueue &pqueue, unsigned int board, unsigned int object)
-{
-    try
-    {
-        KhompPvt * pvt = get(board, object);
-        pqueue.insert(pvt);
-    }
-    catch(K3LAPITraits::invalid_channel & err)
-    {
-        //...
-    }
-}
-
-Board::KhompPvt * Board::findFree(unsigned int board, unsigned int object, bool fully_available)
-{
-    try
-    {
-        KhompPvt * pvt = get(board, object);
-        return ((fully_available ? pvt->isFree() : pvt->isOK()) ? pvt : NULL);
-    }
-    catch(K3LAPITraits::invalid_channel & err)
-    {
-    }
-    return NULL;
-}
-
-void Board::applyGlobalVolume(void)
-{
-    DBG(FUNC, "c");
-
-    for (unsigned int dev = 0; dev < Globals::k3lapi.device_count(); dev++)
-    {
-        for (unsigned int obj = 0; obj < Globals::k3lapi.channel_count(dev); obj++)
-        {
-            try
-            {
-                Board::get(dev,obj)->setVolume("input", Opt::_options._input_volume());
-                Board::get(dev,obj)->setVolume("output",Opt::_options._output_volume());
-            }
-            catch(K3LAPITraits::invalid_channel & err)
-            {
-                DBG(FUNC, OBJ_FMT(dev, obj, "Channel not found"));
-            }
-        }
-    }
-
-    DBG(FUNC, "r");
-}
-
-bool Board::KhompPvt::startCadence(CadencesType type)
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-
-    std::string tone("");
-
-    /**/ if (type == PLAY_VM_TONE)  tone = "vm-dialtone";
-    else if (type == PLAY_PBX_TONE) tone = "pbx-dialtone";
-    else if (type == PLAY_PUB_TONE) tone = "co-dialtone";
-    else if (type == PLAY_RINGBACK) tone = "ringback";
-    else if (type == PLAY_FASTBUSY) tone = "fast-busy";
-
-
-    if (tone != "")
-    {
-        call()->_cadence = type;
-
-        CadencesMapType::iterator i = Opt::_cadences.find(tone);
-        std::string cmd_params;
-
-        if (i != Opt::_cadences.end())
-        {
-            CadenceType cadence = (*i).second;
-
-            if (cadence.ring == 0 && cadence.ring_s == 0)
-            {
-                cmd_params = "cadence_times=\"continuous\" mixer_track=1";
-            }
-            else if (cadence.ring_ext == 0 && cadence.ring_ext_s == 0)
-            {
-                cmd_params = STG(FMT("cadence_times=\"%d,%d\" mixer_track=1")
-                    % cadence.ring % cadence.ring_s);
-            }
-            else
-            {
-                cmd_params = STG(FMT("cadence_times=\"%d,%d,%d,%d\" mixer_track=1")
-                    % cadence.ring % cadence.ring_s % cadence.ring_ext % cadence.ring_ext_s);
-            }
-
-            command(KHOMP_LOG,CM_START_CADENCE,cmd_params.c_str());
-        }
-        else
-        {
-            LOG(ERROR, PVT_FMT(_target, "r (cadence '%s' not found)") % tone);
-            return false;
-        }
-    }
-    else
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unknown cadence requested )"));
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(target(), "r"));
-    return true;
-}
-
-/* Helper functions - based on code from chan_khomp */
-bool Board::KhompPvt::startStream(bool enable_mixer)
-{
-    if (call()->_flags.check(Kflags::STREAM_UP))
-        return true;
-
-    if(enable_mixer)
-    {
-        if(!mixer(KHOMP_LOG, 0, kmsPlay, _target.object))
-            return false;
-    }
-
-    if(!command(KHOMP_LOG, CM_START_STREAM_BUFFER))
-        return false;
-
-    call()->_flags.set(Kflags::STREAM_UP);
-
-    return true;
-}
-
-bool Board::KhompPvt::stopStream(bool enable_mixer)
-{
-    if (!call()->_flags.check(Kflags::STREAM_UP))
-        return true;
-
-    call()->_flags.clear(Kflags::STREAM_UP);
-
-    if(enable_mixer)
-    {
-        if(!mixer(KHOMP_LOG, 0, kmsGenerator, kmtSilence))
-            return false;
-    }
-
-    if(!command(KHOMP_LOG, CM_STOP_STREAM_BUFFER))
-        return false;
-
-    return true;
-}
-
-bool Board::KhompPvt::startListen(bool conn_rx)
-{
-    if(call()->_flags.check(Kflags::LISTEN_UP))
-        return true;
-
-    const size_t buffer_size = Globals::boards_packet_duration;
-
-    if(conn_rx)
-    {
-        if(!obtainRX(false)) //no delay, by default..
-            return false;
-    }
-
-    if(!command(KHOMP_LOG, CM_LISTEN, (const char *) &buffer_size))
-        return false;
-
-    call()->_flags.set(Kflags::LISTEN_UP);
-
-    return true;
-}
-
-bool Board::KhompPvt::stopListen(void)
-{
-    if(!call()->_flags.check(Kflags::LISTEN_UP))
-        return true;
-
-    call()->_flags.clear(Kflags::LISTEN_UP);
-
-    if(!command(KHOMP_LOG, CM_STOP_LISTEN))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool Board::KhompPvt::obtainRX(bool with_delay)
-{
-    try
-    {
-        Globals::k3lapi.mixerRecord(_target, 0, (with_delay ? kmsChannel : kmsNoDelayChannel), target().object);
-        Globals::k3lapi.mixerRecord(_target, 1, kmsGenerator, kmtSilence);
-    }
-    catch(K3LAPI::failed_raw_command & e)
-    {
-        LOG(ERROR, PVT_FMT(target(), "ERROR sending mixer command!"));
-        return false;
-    }
-
-    return true;
-}
-
-bool Board::KhompPvt::obtainTX()
-{
-    /* estes buffers *NAO PODEM SER ESTATICOS*! */
-    char cmd1[] = { 0x3f, 0x03, 0xff, 0x00, 0x00, 0xff };
-    char cmd2[] = { 0x3f, 0x03, 0xff, 0x01, 0x09, 0x0f };
-
-    cmd1[2] = cmd1[5] = cmd2[2] = _target.object;
-
-    try
-    {
-        int dsp = Globals::k3lapi.get_dsp(_target, K3LAPI::DSP_AUDIO);
-
-        Globals::k3lapi.raw_command(_target.device, dsp, cmd1, sizeof(cmd1));
-
-        Globals::k3lapi.raw_command(_target.device, dsp, cmd2, sizeof(cmd2));
-
-    }
-    catch(K3LAPI::failed_raw_command & e)
-    {
-        LOG(ERROR, PVT_FMT(target(), "ERROR sending mixer command!"));
-        return false;
-    }
-
-    return true;
-}
-
-bool Board::KhompPvt::sendDtmf(std::string digit)
-{
-    if(!call()->_flags.check(Kflags::STREAM_UP))
-    {
-        DBG(FUNC, PVT_FMT(target(), "stream down, not sending dtmf"));
-        return false;
-    }
-
-    if(!call()->_flags.check(Kflags::OUT_OF_BAND_DTMFS))
-    {
-        DBG(FUNC, PVT_FMT(target(), "dtmf suppression disabled, not generating dtmf"));
-        return false;
-    }
-
-    if(digit.empty())
-    {
-        DBG(FUNC, PVT_FMT(target(), "not sending dtmf (there is nothing to send)"));
-        return false;
-    }
-
-    if(call()->_flags.check(Kflags::WAIT_SEND_DTMF))
-    {
-        DBG(FUNC, PVT_FMT(target(), "queueing dtmf (%s)") % digit);
-        call()->_queued_digits_buffer += digit;
-        return true;
-    }
-
-    DBG(FUNC, PVT_FMT(target(), "sending dtmf (%s)") % digit);
-
-    call()->_flags.set(Kflags::WAIT_SEND_DTMF);
-
-    return command(KHOMP_LOG, CM_DIAL_DTMF, digit.c_str());
-}
-
-bool Board::KhompPvt::setVolume(const char * type, int volume)
-{
-    std::string arg = STG(FMT("volume=\"%d\" type=\"%s\"") % volume % type);
-    DBG(FUNC, PVT_FMT(_target, "%s") % arg);
-    return command(KHOMP_LOG,CM_SET_VOLUME,arg.c_str());
-}
-
-std::string Board::KhompPvt::getStateString(void)
-{
-    try
-    {
-        switch_channel_t *c = getFSChannel();
-        if(!c) return "unused";
-
-        switch_channel_state_t state = switch_channel_get_state(c);
-
-        /* shortcut */
-        typedef std::string S;
-
-        switch (state)
-        {
-            case CS_NEW:               return S("new");
-            case CS_INIT:              return S("init");
-            case CS_ROUTING:           return S("routing");
-            case CS_SOFT_EXECUTE:      return S("sf_exec");
-            case CS_EXECUTE:           return S("execute");
-            case CS_EXCHANGE_MEDIA:    return S("ex_media");
-            case CS_PARK:              return S("park");
-            case CS_CONSUME_MEDIA:     return S("cs_media");
-            case CS_HIBERNATE:         return S("hibernat");
-            case CS_RESET:             return S("reset");
-            case CS_HANGUP:            return S("hangup");
-            case CS_REPORTING:         return S("reportg");
-            case CS_DESTROY:           return S("destroy");
-            case CS_NONE:              return S("none");
-            default:
-                return STG(FMT("none (%d)") % state);
-        }
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        return "unused";
-    }
-}
-
-bool Board::KhompPvt::dtmfSuppression(bool enable)
-{
-    if (!command(KHOMP_LOG, (enable ? CM_ENABLE_DTMF_SUPPRESSION : CM_DISABLE_DTMF_SUPPRESSION)))
-        return false;
-
-    if (enable) call()->_flags.set(Kflags::OUT_OF_BAND_DTMFS);
-    else        call()->_flags.clear(Kflags::OUT_OF_BAND_DTMFS);
-
-    DBG(FUNC, PVT_FMT(_target, "flag OUT_OF_BAND_DTMFS is : %s") %
-        (call()->_flags.check(Kflags::OUT_OF_BAND_DTMFS) ? "true" : "false"));
-
-    return true;
-}
-
-bool Board::KhompPvt::echoCancellation(bool enable)
-{
-    const K3L_DEVICE_CONFIG & devCfg = Globals::k3lapi.device_config(_target);
-
-    /* echo canceller should not be used for non-echo cancellable channels */
-    switch (devCfg.EchoConfig)
-    {
-        case keccFail:
-            if (!enable)
-                return true;
-
-            LOG(ERROR, PVT_FMT(_target, "unable to activate echo cancellation"));
-            return false;
-
-        case keccNotPresent:
-            DBG(FUNC, PVT_FMT(_target, "echo cancellation not present, not %s.") % (enable ? "enabling" : "disabling"));
-            return true;
-
-        default:
-            return command(KHOMP_LOG,(enable ? CM_ENABLE_ECHO_CANCELLER : CM_DISABLE_ECHO_CANCELLER));
-    }
-}
-
-bool Board::KhompPvt::autoGainControl(bool enable)
-{
-    bool ret = command(KHOMP_LOG,(enable ? CM_ENABLE_AGC : CM_DISABLE_AGC));
-    return ret;
-}
-
-void Board::KhompPvt::pbxRingGen(Board::KhompPvt * pvt)
-{
-    DBG(FUNC, PVT_FMT(pvt->target(), "Generating pbx ring"));
-
-    try
-    {
-        ScopedPvtLock lock(pvt);
-
-        if (!pvt->call()->_flags.check(Kflags::GEN_PBX_RING))
-            return;
-
-        if (!pvt->obtainTX())
-            return;
-
-        pvt->startCadence(PLAY_RINGBACK);
-    }
-    catch (...)
-    {
-        LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock!"));
-    }
-}
-
-void Board::KhompPvt::coRingGen(Board::KhompPvt * pvt)
-{
-    DBG(FUNC, PVT_FMT(pvt->target(), "Generating co ring"));
-
-    try
-    {
-        ScopedPvtLock lock(pvt);
-
-        if (!pvt->call()->_flags.check(Kflags::GEN_CO_RING))
-            return;
-
-        pvt->startCadence(PLAY_RINGBACK);
-    }
-    catch (...)
-    {
-        LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock the pvt !"));
-    }
-}
-
-int Board::KhompPvt::getActiveChannel(bool invalid_as_not_found)
-{
-    // AT CONSTRUCTION
-    return 0;
-}
-
-bool Board::KhompPvt::setCollectCall()
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-    // NEEDS LOCK !?
-
-    std::vector< TriState > confvalues;
-
-    // temporary!
-    const char * tmp_var = NULL;
-
-    // get option configuration value
-    confvalues.push_back(Opt::_options._drop_collect_call() ? T_TRUE : T_FALSE);
-    DBG(FUNC, PVT_FMT(_target, "option drop collect call is '%s'") % (Opt::_options._drop_collect_call() ? "yes" : "no"));
-
-    // get global filter configuration value
-    tmp_var = getFSGlobalVar("KDropCollectCall");
-    confvalues.push_back(getTriStateValue(tmp_var));
-    DBG(FUNC, PVT_FMT(_target, "global KDropCollectCall was '%s'") % (tmp_var ? tmp_var : "(empty)"));
-
-    freeFSGlobalVar(&tmp_var);
-
-    try
-    {
-        // get local filter configuration value
-        tmp_var = switch_channel_get_variable(getFSChannel(), "KDropCollectCall");
-        confvalues.push_back(getTriStateValue(tmp_var));
-        DBG(FUNC, PVT_FMT(_target, "local KDropCollectCall was '%s'") % (tmp_var ? tmp_var : "(empty)"));
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "Cannot obtain the channel variable: %s") % err._msg.c_str());
-    }
-
-    // store last state assigned
-    bool last_state = false;
-
-    // validate the states
-    std::vector< TriState >::const_iterator end = confvalues.end();
-    for (std::vector< TriState >::const_iterator i = confvalues.begin(); i != end; ++i)
-    {
-        switch(*i)
-        {
-            case T_TRUE:
-                last_state = true;
-                break;
-            case T_FALSE:
-                last_state = false;
-                break;
-            case T_UNKNOWN:
-            default:
-                break;
-        }
-    }
-
-    if (last_state)
-        call()->_flags.set(Kflags::DROP_COLLECT);
-    else
-        call()->_flags.clear(Kflags::DROP_COLLECT);
-
-    DBG(FUNC, PVT_FMT(_target, "drop collect call flag: %s.") % (last_state ? "set" : "unset"));
-
-    return last_state;
-}
-
-bool Board::KhompPvt::onChannelRelease(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (e->Code == EV_CHANNEL_FAIL)
-        {
-            call()->statistics()->incrementChannelFail();
-            _has_fail = true;
-            setHangupCause(SWITCH_CAUSE_NETWORK_OUT_OF_ORDER);
-            cleanup(CLN_HARD);
-        }
-        else
-        {
-            if(call()->_flags.check(Kflags::REALLY_CONNECTED))
-            {
-                call()->statistics()->incrementHangup();
-            }
-
-            setHangupCause(SWITCH_CAUSE_NORMAL_CLEARING);
-            cleanup(CLN_HARD);
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(target(), "r"));
-    return true;
-}
-
-//TODO: This method must return more information about the channel allocation
-bool Board::KhompPvt::onNewCall(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-
-    std::string orig_addr, dest_addr;
-
-    Globals::k3lapi.get_param(e, "orig_addr", orig_addr);
-    Globals::k3lapi.get_param(e, "dest_addr", dest_addr);
-
-    if(dest_addr.empty())
-    {
-        dest_addr="s";
-    }
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        _call->_orig_addr = orig_addr;
-        _call->_dest_addr = dest_addr;
-
-        if (justAlloc(true) != SWITCH_STATUS_SUCCESS)
-        {
-            int fail_code = callFailFromCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
-            setHangupCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
-            cleanup(CLN_FAIL);
-            reportFailToReceive(fail_code);
-
-            LOG(ERROR, PVT_FMT(target(), "r (Initilization Error on alloc!)"));
-            return false;
-        }
-
-        if (justStart() != SWITCH_STATUS_SUCCESS)
-        {
-            int fail_code = callFailFromCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
-            setHangupCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
-            cleanup(CLN_FAIL);
-            reportFailToReceive(fail_code);
-
-            LOG(ERROR, PVT_FMT(target(), "r (Initilization Error on start!)"));
-            return false;
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        cleanup(CLN_FAIL);
-        LOG(ERROR, PVT_FMT(target(), "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        cleanup(CLN_FAIL);
-        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(target(), "r"));
-    return true;
-}
-
-bool Board::KhompPvt::onDisconnect(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "c"));
-
-/*
-    try
-    {
-        ScopedPvtLock lock(this);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-*/
-
-    DBG(FUNC, PVT_FMT(_target, "r"));
-    return true;
-}
-
-bool Board::KhompPvt::onAudioStatus(K3L_EVENT *e)
-{
-    try
-    {
-        if(e->AddInfo != kmtSilence)
-        {
-            if(call()->_flags.check(Kflags::GEN_PBX_RING))
-            {
-                DBG(FUNC, PVT_FMT(_target, "PBX ringback being disabled..."));
-                ScopedPvtLock lock(this);
-
-                call()->_flags.clear(Kflags::GEN_PBX_RING);
-                Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
-
-                if(call()->_cadence != PLAY_VM_TONE)
-                {
-                    stopCadence();
-                }
-
-                if (!call()->_flags.check(Kflags::CONNECTED))
-                {
-                    obtainRX(Opt::_options._suppression_delay());
-
-                    //Marcar para o Freeswitch que jah tem audio passando
-                    if (call()->_flags.check(Kflags::IS_OUTGOING))
-                        switch_channel_mark_pre_answered(getFSChannel());
-
-                }
-            }
-
-            if (!call()->_is_progress_sent && call()->_flags.check(Kflags::HAS_CALL_FAIL))
-            {
-
-                ScopedPvtLock lock(this);
-
-                DBG(FUNC, PVT_FMT(_target, "Audio status progress"));
-
-                call()->_is_progress_sent = true;
-                //Sinaliza para o Freeswitch PROGRESS
-
-                DBG(FUNC, PVT_FMT(_target, "Pre answer"));
-
-                //pvt->signal_state(AST_CONTROL_PROGRESS);
-                switch_channel_pre_answer(getFSChannel());
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
-        return false;
-
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        cleanup(CLN_FAIL);
-        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to get device: %d!)") % err.device);
-        return false;
-    }
-
-    return true;
-}
-
-bool Board::KhompPvt::onCollectCall(K3L_EVENT *e)
-{
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        //TODO: AMI ?
-        //K::internal::ami_event(pvt, EVENT_FLAG_CALL, "CollectCall",
-          //      STG(FMT("Channel: Khomp/B%dC%d\r\n") % pvt->boardid % pvt->objectid));
-
-        if (Opt::_options._drop_collect_call() || _call->_flags.check(Kflags::DROP_COLLECT))
-        {
-            /* disconnect! */
-            //TODO: SCE_HIDE !?
-            command(KHOMP_LOG,CM_DISCONNECT);
-//           command(KHOMP_LOG,CM_DISCONNECT,SCE_HIDE);
-
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-
-    return true;
-}
-
-bool Board::KhompPvt::onSeizureStart(K3L_EVENT *e)
-{
-/*
-    try
-    {
-        ScopedPvtLock lock(this);
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-*/
-    return true;
-}
-
-bool Board::KhompPvt::setupConnection()
-{
-    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        DBG(FUNC, PVT_FMT(_target, "Channel already disconnected"));
-        return false;
-    }
-
-    if(call()->_cadence != PLAY_VM_TONE)
-    {
-        stopCadence();
-    }
-
-    if (call()->_indication != INDICA_NONE)
-    {
-        call()->_indication = INDICA_NONE;
-
-        mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
-    }
-
-    if(call()->_flags.check(Kflags::GEN_PBX_RING))
-    {
-        call()->_flags.clear(Kflags::GEN_PBX_RING);
-        Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
-    }
-
-    if(call()->_flags.check(Kflags::GEN_CO_RING))
-    {
-        call()->_flags.clear(Kflags::GEN_CO_RING);
-        Board::board(_target.device)->_timers.del(call()->_idx_co_ring);
-    }
-
-    if (!call()->_flags.check(Kflags::CONNECTED))
-        call()->_flags.set(Kflags::CONNECTED);
-
-    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
-        call()->_flags.set(Kflags::REALLY_CONNECTED);
-
-    /* Sinalizar para o Freeswitch o atendimento */
-
-    DBG(FUNC, PVT_FMT(_target, "Call will be answered."));
-
-    if(call()->_flags.check(Kflags::IS_INCOMING))
-    {
-        switch_channel_answer(getFSChannel());
-    }
-    else if(call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        switch_channel_mark_answered(getFSChannel());
-    }
-
-    call()->statistics()->incrementNewCall();
-
-    return true;
-}
-
-
-bool Board::KhompPvt::onConnect(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "c"));
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        return setupConnection();
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to get device: %d!)") % err.device);
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "r"));
-
-    return true;
-}
-
-bool Board::KhompPvt::onCallSuccess(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "c"));
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        switch_channel_mark_ring_ready(getFSChannel());
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "r"));
-
-    return true;
-}
-
-bool Board::KhompPvt::onCallFail(K3L_EVENT *e)
-{
-   DBG(FUNC, PVT_FMT(_target, "c"));
-   try
-   {
-       ScopedPvtLock lock(this);
-
-        call()->_flags.set(Kflags::HAS_CALL_FAIL);
-
-       //TODO: Notificar o Freeswitch: call fail
-
-        cleanup(CLN_SOFT);
-   }
-   catch (ScopedLockFailed & err)
-   {
-       LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-       return false;
-   }
-
-   DBG(FUNC, PVT_FMT(_target, "r"));
-
-   return true;
-}
-
-bool Board::KhompPvt::onNoAnswer(K3L_EVENT *e)
-{
-    /* TODO: Destroy sessions and channels */
-    DBG(FUNC, PVT_FMT(_target, "No one answered the call."));
-
-    // TODO: Set channel variable if we get this event
-    // TODO: Fire an event so ESL can get it?
-    // Call Analyser has to be enabled on k3lconfig
-    DBG(FUNC, PVT_FMT(_target, "Detected: \"%s\"") %  Verbose::callStartInfo((KCallStartInfo)e->AddInfo).c_str());
-
-    // Fire a custom event about this
-    /* MUST USE THE NEW EVENT SYSTEM
-    switch_event_t * event;
-    if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, KHOMP_EVENT_MAINT) == SWITCH_STATUS_SUCCESS)
-    {
-        Board::khomp_add_event_board_data(_target, event);
-        switch_event_add_header_string(event, SWITCH_STACK_BOTTOM,
-                "EV_CALL_ANSWER_INFO",
-                Verbose::callStartInfo((KCallStartInfo)e->AddInfo).c_str());
-
-        switch_event_fire(&event);
-    }
-    */
-
-    return true;
-}
-
-bool Board::KhompPvt::onDtmfDetected(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "c (dtmf=%c)") % (char) e->AddInfo);
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (call()->_flags.check(Kflags::IS_INCOMING) || call()->_flags.check(Kflags::IS_OUTGOING)) /* is a valid call? */
-        {
-            char digit = (char) e->AddInfo;
-
-            //TODO: WTHeck ?
-            //if (!call()->_flags.check(Kflags::OUT_OF_BAND_DTMFS) && !call()->_flags.check(Kflags::BRIDGED))
-            if (!call()->_flags.check(Kflags::OUT_OF_BAND_DTMFS))
-            {
-                /* we do not queue dtmfs as we do not need to resend them */
-                DBG(FUNC, PVT_FMT(_target, "r (not queueing dtmf, not needed.)"));
-                return true;
-            }
-
-            if (Opt::_options._ignore_letter_dtmfs())
-            {
-                switch (e->AddInfo)
-                {
-                    case 'A': case 'a':
-                    case 'B': case 'b':
-                    case 'C': case 'c':
-                    case 'D': case 'd':
-                        DBG(FUNC, PVT_FMT(_target, "r (not queueing dtmf, letter digit ignored!)"));
-                        return true;
-                    default:
-                        break;
-                }
-            }
-
-            signalDTMF(e->AddInfo);
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "r"));
-    return true;
-}
-
-bool Board::KhompPvt::onDtmfSendFinish(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "c"));
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (call()->_flags.check(Kflags::WAIT_SEND_DTMF))
-        {
-            if(!call()->_queued_digits_buffer.empty())
-            {
-                DBG(FUNC, PVT_FMT(target(), "sending dtmf (%s)")
-                        % call()->_queued_digits_buffer);
-
-                command(KHOMP_LOG, CM_DIAL_DTMF,
-                        call()->_queued_digits_buffer.c_str());
-
-                /* clear the buffer that has been send */
-                call()->_queued_digits_buffer.clear();
-            }
-            else
-            {
-                DBG(FUNC, PVT_FMT(target(),
-                        "finished sending some digits, cleaning up!"));
-                call()->_flags.clear(Kflags::WAIT_SEND_DTMF);
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "r"));
-
-    return true;
-}
-
-bool Board::KhompPvt::onEvUntreated(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "New Event has just arrived with untreated code \"%d\" \"%s\"") % e->Code % Globals::verbose.event(_target.object, e));
-
-    return false;
-}
-
-bool Board::KhompPvt::eventHandler(K3L_EVENT *e)
-{
-    DBG(STRM, D("c"));
-
-    bool ret = true;
-
-    switch(e->Code)
-    {
-    case EV_CHANNEL_FREE:
-    case EV_CHANNEL_FAIL:
-        ret = onChannelRelease(e);
-        break;
-
-    case EV_NEW_CALL:
-        ret = onNewCall(e);
-        break;
-
-    case EV_CALL_SUCCESS:
-        ret = onCallSuccess(e);
-        break;
-
-    case EV_CALL_FAIL:
-        ret = onCallFail(e);
-        break;
-
-    case EV_CONNECT:
-        ret = onConnect(e);
-        break;
-
-    case EV_DISCONNECT:
-        ret = onDisconnect(e);
-        break;
-
-    case EV_AUDIO_STATUS:
-        ret = onAudioStatus(e);
-        break;
-
-    case EV_NO_ANSWER:
-        ret = onNoAnswer(e);
-        break;
-
-    case EV_DTMF_DETECTED:
-        ret = onDtmfDetected(e);
-        break;
-
-    case EV_DTMF_SEND_FINISH:
-        ret = onDtmfSendFinish(e);
-        break;
-
-    case EV_COLLECT_CALL:
-        ret = onCollectCall(e);
-        break;
-
-    case EV_SEIZURE_START:
-        ret = onSeizureStart(e);
-        break;
-
-    case EV_CADENCE_RECOGNIZED:
-        break;
-
-    default:
-        ret = onEvUntreated(e);
-        break;
-    }
-
-    DBG(STRM, D("r"));
-
-    return ret;
-}
-
-bool Board::KhompPvt::indicateProgress()
-{
-    DBG(FUNC, PVT_FMT(_target, "c"));
-
-    int ret = false;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (!call()->_flags.check(Kflags::CONNECTED))
-        {
-            bool has_audio = sendPreAudio(RingbackDefs::RB_SEND_NOTHING);
-
-            if (has_audio)
-            {
-                /* start grabbing audio */
-                startListen();
-                /* start stream if it is not already */
-                startStream();
-
-                ret = true;
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "r"));
-
-    return ret;
-}
-
-bool Board::KhompPvt::indicateRinging()
-{
-    DBG(FUNC, PVT_FMT(_target, "c"));
-
-    bool ret = false;
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        /* already playing! */
-        if (call()->_indication != INDICA_NONE)
-        {
-            DBG(FUNC, PVT_FMT(_target, "r (already playing something: %d)")
-                    % call()->_indication);
-            return false;
-        }
-
-        // any collect calls ?
-        setCollectCall();
-
-        call()->_indication = INDICA_RING;
-
-        bool send_ringback = true;
-
-        if (!call()->_flags.check(Kflags::CONNECTED))
-        {
-            int ringback_value = RingbackDefs::RB_SEND_DEFAULT;
-
-            bool do_drop_call = Opt::_options._drop_collect_call()
-                                        || call()->_flags.check(Kflags::DROP_COLLECT);
-
-            if (do_drop_call && call()->_collect_call)
-            {
-                ringback_value = kq931cCallRejected;
-                DBG(FUNC, PVT_FMT(_target, "ringback value adjusted to refuse collect call: %d") % ringback_value);
-            }
-
-            // send ringback too?
-            send_ringback = sendPreAudio(ringback_value);
-
-            if (!send_ringback)
-            {
-                // warn the developer which may be debugging some "i do not have ringback!" issue.
-                DBG(FUNC, PVT_FMT(_target, " not sending pre connection audio"));
-            }
-
-        }
-
-        if (send_ringback)
-        {
-            call()->_flags.set(Kflags::GEN_CO_RING);
-            call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_co_delay(), &Board::KhompPvt::coRingGen,this);
-
-            /* start grabbing audio */
-            startListen();
-
-            /* start stream if it is not already */
-            startStream();
-
-            ret = true;
-        }
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to get device: %d!)") % err.device);
-        return false;
-    }
-
-
-    DBG(FUNC, PVT_FMT(_target, "r"));
-    return ret;
-}
-
-bool Board::KhompPvt::doChannelAnswer(CommandRequest &cmd)
-{
-    DBG(FUNC, PVT_FMT(_target, "c"));
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        call()->_flags.set(Kflags::CONNECTED);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "r"));
-    return true;
-}
-
-bool Board::KhompPvt::doChannelHangup(CommandRequest &cmd)
-{
-    DBG(FUNC, PVT_FMT(_target, "c"));
-
-    bool answered     = true;
-    bool disconnected = false;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (call()->_flags.check(Kflags::IS_INCOMING))
-        {
-            DBG(FUNC, PVT_FMT(_target, "disconnecting incoming channel"));
-
-            //disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-        }
-        else if (call()->_flags.check(Kflags::IS_OUTGOING))
-        {
-            if(call()->_cleanup_upon_hangup)
-            {
-                DBG(FUNC, PVT_FMT(_target, "disconnecting not allocated outgoing channel..."));
-
-                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-                cleanup(KhompPvt::CLN_HARD);
-                answered = false;
-
-            }
-            else
-            {
-                DBG(FUNC, PVT_FMT(_target, "disconnecting outgoing channel..."));
-
-                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-            }
-        }
-        else
-        {
-            DBG(FUNC, PVT_FMT(_target, "already disconnected"));
-            return true;
-        }
-
-        if(answered)
-        {
-            indicateBusyUnlocked(SWITCH_CAUSE_USER_BUSY, disconnected);
-        }
-
-        if (call()->_flags.check(Kflags::IS_INCOMING))
-        {
-            DBG(FUNC, PVT_FMT(_target, "disconnecting incoming channel..."));
-            disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-        }
-
-        stopStream();
-
-        stopListen();
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-
-    DBG(FUNC, PVT_FMT(_target, "r"));
-    return true;
-}
-
-bool Board::KhompPvt::commandHandler(CommandRequest &cmd)
-{
-    DBG(STRM, PVT_FMT(target(), "c"));
-
-    bool ret = true;
-
-    switch(cmd.type())
-    {
-    case CommandRequest::COMMAND:
-        switch(cmd.code())
-        {
-        case CommandRequest::CMD_CALL:
-            break;
-        case CommandRequest::CMD_ANSWER:
-            ret = doChannelAnswer(cmd);
-            break;
-        case CommandRequest::CMD_HANGUP:
-            ret = doChannelHangup(cmd);
-            break;
-        default:
-            ret = false;
-        }
-        break;
-
-    case CommandRequest::ACTION:
-        break;
-
-    default:
-        ret = false;
-    }
-
-    DBG(STRM, PVT_FMT(target(), "r"));
-    return ret;
-}
-
-int Board::eventThread(void *void_evt)
-{
-    EventRequest evt(false);
-    EventFifo * fifo = static_cast < ChanEventHandler * >(void_evt)->fifo();
-    int devid = fifo->_device;
-
-    for(;;)
-    {
-        DBG(THRD, D("(d=%d) c") % devid);
-        while(1)
-        {
-            try
-            {
-                evt = fifo->_buffer.consumer_start();
-                break;
-            }
-            catch(...) //BufferEmpty & e
-            {
-                DBG(THRD, D("(d=%d) buffer empty") % devid);
-
-                fifo->_cond.wait();
-
-                if (fifo->_shutdown)
-                    return 0;
-
-                DBG(THRD, D("(d=%d) waked up!") % devid);
-            }
-        }
-
-        /*while (!fifo->_buffer.consume(evt))
-        {
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(d=%d) buffer empty\n", fifo->_device);
-
-            fifo->_cond.wait();
-
-            if (fifo->_shutdown)
-                return 0;
-
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(d=%d) waked up!\n", fifo->_device);
-        }*/
-
-        DBG(THRD, D("(d=%d) processing buffer...") % devid);
-
-        try
-        {
-            if(!board(devid)->eventHandler(evt.obj(), evt.event()))
-            {
-                LOG(ERROR, D("(d=%d) Error on event (%d) \"%s\"")
-                        % devid
-                        % evt.event()->Code
-                        % Globals::verbose.event(evt.obj(), evt.event()));
-            }
-        }
-        catch (K3LAPITraits::invalid_device & invalid)
-        {
-            LOG(ERROR, D("invalid device on event '%s'")
-                % Verbose::eventName(evt.event()->Code).c_str());
-        }
-
-        fifo->_buffer.consumer_commit();
-
-    }
-
-    return 0;
-}
-
-int Board::commandThread(void *void_evt)
-{
-    CommandFifo * fifo = static_cast < ChanCommandHandler * >(void_evt)->fifo();
-    int devid = fifo->_device;
-
-    for(;;)
-    {
-        CommandRequest cmd;
-
-        DBG(THRD, D("(d=%d) Command c") % devid);
-
-        while (!fifo->_buffer.consume(cmd))
-        {
-            DBG(THRD, D("(d=%d) Command buffer empty") % devid);
-            fifo->_cond.wait();
-
-            if (fifo->_shutdown)
-                return 0;
-
-            DBG(THRD, D("(d=%d) Command waked up!") % devid);
-        }
-
-        DBG(THRD, D("(d=%d) Command processing buffer...") % devid);
-
-
-        try
-        {
-            if(!get(devid, cmd.obj())->commandHandler(cmd))
-            {
-                LOG(ERROR, D("(d=%d) Error on command(%d)") % devid % cmd.code());
-            }
-        }
-        catch (K3LAPITraits::invalid_channel & invalid)
-        {
-            LOG(ERROR, OBJ_FMT(devid,cmd.obj(), "invalid device on command '%d'") %  cmd.code());
-        }
-
-    }
-
-
-    return 0;
-}
-
-/* This is the callback function for API events. It selects the event *
- * on a switch and forwards to the real implementation.               */
-extern "C" int32 Kstdcall khompEventCallback(int32 obj, K3L_EVENT * e)
-{
-    //if (K::Logger::Logg.classe(C_EVENT).enabled())
-    //    std::string msg = Globals::verbose.event (obj, e) + ".";
-    LOGC(EVENT, FMT("%s.") % Globals::verbose.event(obj, e));
-
-    switch(e->Code)
-    {
-    case EV_WATCHDOG_COUNT:
-        Board::kommuter.initialize(e);
-        break;
-    case EV_HARDWARE_FAIL:
-    case EV_DISK_IS_FULL:
-    case EV_CLIENT_RECONNECT:
-    case EV_CLIENT_BUFFERED_AUDIOLISTENER_OVERFLOW:
-        LOG(ERROR, D("Audio client buffered overflow"));
-        break;
-    case EV_CLIENT_AUDIOLISTENER_TIMEOUT:
-        LOG(ERROR, "Timeout on audio listener, registering audio listener again");
-        k3lRegisterAudioListener( NULL, khompAudioListener );
-        break;
-    default:
-        try
-        {
-            EventRequest e_req(obj, e);
-            Board::board(e->DeviceId)->chanEventHandler()->write(e_req);
-        }
-        catch (K3LAPITraits::invalid_device & err)
-        {
-            LOG(ERROR, D("Unable to get device: %d!") % err.device);
-            return ksFail;
-        }
-        break;
-    }
-
-    return ksSuccess;
-}
-
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp
deleted file mode 100644
index 74d813b4c3..0000000000
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp
+++ /dev/null
@@ -1,821 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "khomp_pvt_fxo.h"
-#include "lock.h"
-#include "logger.h"
-
-int BoardFXO::KhompPvtFXO::makeCall(std::string params)
-{
-    DBG(FUNC,PVT_FMT(_target, "(FXO) c"));
-
-    int ret = ksSuccess;
-
-    /* we always have audio */
-    call()->_flags.set(Kflags::HAS_PRE_AUDIO);
-
-    if(callFXO()->_call_info_drop == 0 && !callFXO()->_call_info_report)
-    {
-        command(KHOMP_LOG, CM_DISABLE_CALL_ANSWER_INFO);
-    }
-
-    if (!callFXO()->_pre_digits.empty())
-    {
-        /* Seize the line at local PABX. */
-
-        callFXO()->_flags.set(Kflags::CALL_WAIT_SEIZE);
-
-        if (!command(KHOMP_LOG, CM_SEIZE, call()->_orig_addr.c_str()))
-            return ksFail;
-
-        int timeout = 150;
-
-        if(!loopWhileFlagTimed(Kflags::CALL_WAIT_SEIZE, timeout))
-            return ksFail;
-
-        if (callFXO()->_flags.check(Kflags::CALL_WAIT_SEIZE) || (timeout <= 0))
-            return ksFail;
-
-        /* Grab line from local PABX. */
-
-        callFXO()->_flags.set(Kflags::WAIT_SEND_DTMF);
-
-        if (!command(KHOMP_LOG, CM_DIAL_DTMF, callFXO()->_pre_digits.c_str()))
-            return ksFail;
-
-        if(!loopWhileFlagTimed(Kflags::WAIT_SEND_DTMF, timeout))
-            return ksFail;
-
-        if (callFXO()->_flags.check(Kflags::WAIT_SEND_DTMF) || (timeout <= 0))
-            return ksFail;
-
-        /* Seize line from public central (works because the     *
-        * continuous cadence is always detected by the k3l api. */
-
-        callFXO()->_flags.set(Kflags::CALL_WAIT_SEIZE);
-
-        if (!command(KHOMP_LOG, CM_SEIZE, call()->_orig_addr.c_str()))
-            return ksFail;
-
-        if(!loopWhileFlagTimed(Kflags::CALL_WAIT_SEIZE, timeout))
-            return ksFail;
-
-        if (callFXO()->_flags.check(Kflags::CALL_WAIT_SEIZE) || (timeout <= 0))
-            return ksFail;
-
-        /* we want the audio as soon as dialing ends */
-        callFXO()->_flags.set(Kflags::EARLY_RINGBACK);
-
-        if (!command(KHOMP_LOG, CM_DIAL_DTMF, call()->_dest_addr.c_str()))
-            return ksFail;
-    }
-    else
-    {
-        /* we want the audio as soon as dialing ends */
-        callFXO()->_flags.set(Kflags::EARLY_RINGBACK);
-
-
-        if(!call()->_orig_addr.empty())
-            params += STG(FMT(" orig_addr=\"%s\"") % _call->_orig_addr);
-
-
-        ret = KhompPvt::makeCall(params);
-
-        if(ret != ksSuccess)
-        {
-            LOG(ERROR, PVT_FMT(target(), "Fail on make call"));
-        }
-
-        call()->_cleanup_upon_hangup = (ret == ksInvalidParams);
-    }
-
-    DBG(FUNC,PVT_FMT(_target, "(FXO) r"));
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::doChannelAnswer(CommandRequest &cmd)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        // is this a collect call?
-        bool has_recv_collect_call = _call->_collect_call;
-
-        if(has_recv_collect_call)
-            DBG(FUNC, PVT_FMT(target(), "receive a collect call"));
-
-        if(call()->_flags.check(Kflags::DROP_COLLECT))
-            DBG(FUNC, PVT_FMT(target(), "flag DROP_COLLECT == true"));
-
-        // do we have to drop collect calls?
-        bool has_drop_collect_call = call()->_flags.check(Kflags::DROP_COLLECT);
-
-        // do we have to drop THIS call?
-        bool do_drop_call = has_drop_collect_call && has_recv_collect_call;
-
-        if(!do_drop_call)
-        {
-            command(KHOMP_LOG, CM_CONNECT);
-        }
-
-        if(has_drop_collect_call)
-        {
-            if(has_recv_collect_call)
-            {
-                usleep(75000);
-
-                DBG(FUNC, PVT_FMT(target(), "disconnecting collect call doChannelAnswer FXO"));
-                command(KHOMP_LOG,CM_DISCONNECT);
-
-                // thou shalt not talk anymore!
-                stopListen();
-                stopStream();
-            }
-            else
-            {
-                DBG(FUNC, PVT_FMT(target(), "dropping collect call at doChannelAnswer FXO"));
-                command(KHOMP_LOG, CM_DROP_COLLECT_CALL);
-            }
-        }
-
-        ret = KhompPvt::doChannelAnswer(cmd);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target,"(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
-
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::onNewCall(K3L_EVENT *e)
-{
-    DBG(FUNC,PVT_FMT(_target,"(FXO) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        /* we always have audio */
-        call()->_flags.set(Kflags::HAS_PRE_AUDIO);
-
-        ret = KhompPvt::onNewCall(e);
-
-        if(!ret)
-            return false;
-
-        startListen();
-        startStream();
-
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
-
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::onDisconnect(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        command(KHOMP_LOG, CM_DISCONNECT);
-
-        ret = KhompPvt::onDisconnect(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
-
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::onChannelRelease(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (call()->_flags.check(Kflags::FAX_SENDING))
-        {
-            DBG(FUNC, PVT_FMT(_target, "stopping fax tx"));
-            _fax->stopFaxTX();
-        }
-        else if (call()->_flags.check(Kflags::FAX_RECEIVING))
-        {
-            DBG(FUNC, PVT_FMT(_target, "stopping fax rx"));
-            _fax->stopFaxRX();
-        }
-
-        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
-
-        ret = KhompPvt::onChannelRelease(e);
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::onCallSuccess(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        ret = KhompPvt::onCallSuccess(e);
-
-        if (call()->_pre_answer)
-        {
-            dtmfSuppression(Opt::_options._out_of_band_dtmfs() && !call()->_flags.check(Kflags::FAX_DETECTED));
-
-            startListen();
-            startStream();
-            switch_channel_mark_pre_answered(getFSChannel());
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(FXO) r (%s)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
-
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::onCallFail(K3L_EVENT *e)
-{
-    bool ret = true;
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        command(KHOMP_LOG, CM_DISCONNECT);
-
-        setHangupCause(causeFromCallFail(e->AddInfo), true);
-
-        ret = KhompPvt::onCallFail(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::onAudioStatus(K3L_EVENT *e)
-{
-    DBG(STRM, PVT_FMT(_target, "(FXO) c"));
-
-    try
-    {
-        //ScopedPvtLock lock(this);
-
-        if(e->AddInfo == kmtFax)
-        {
-            DBG(STRM, PVT_FMT(_target, "Fax detected"));
-
-            /* hadn't we did this already? */
-            bool already_detected = call()->_flags.check(Kflags::FAX_DETECTED);
-
-            time_t time_was = call()->_call_statistics->_base_time;
-            time_t time_now = time(NULL);
-
-            bool detection_timeout = (time_now > (time_was + (time_t) (Opt::_options._fax_adjustment_timeout())));
-
-            BEGIN_CONTEXT
-            {
-                ScopedPvtLock lock(this);
-
-                /* already adjusted? do not adjust again. */
-                if (already_detected || detection_timeout)
-                    break;
-
-                if (callFXO()->_call_info_drop != 0 || callFXO()->_call_info_report)
-                {
-                    /* we did not detected fax yet, send answer info! */
-                    setAnswerInfo(Board::KhompPvt::CI_FAX);
-
-                    if (callFXO()->_call_info_drop & Board::KhompPvt::CI_FAX)
-                    {
-                        /* fastest way to force a disconnection */
-                        command(KHOMP_LOG,CM_DISCONNECT);//,SCE_HIDE);
-                    }
-                }
-
-                if (Opt::_options._auto_fax_adjustment())
-                {
-                    DBG(FUNC, PVT_FMT(_target, "communication will be adjusted for fax!"));
-                    _fax->adjustForFax();
-                }
-            }
-            END_CONTEXT
-
-            if (!already_detected)
-            {
-                ScopedPvtLock lock(this);
-
-                /* adjust the flag */
-                call()->_flags.set(Kflags::FAX_DETECTED);
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    bool ret = KhompPvt::onAudioStatus(e);
-
-    DBG(STRM, PVT_FMT(_target, "(FXO) r"));
-
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::onSeizeSuccess(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        callFXO()->_flags.clear(Kflags::CALL_WAIT_SEIZE);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
-
-    return true;
-}
-
-bool BoardFXO::KhompPvtFXO::onDtmfDetected(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (callFXO()->_flags.check(Kflags::WAIT_SEND_DTMF) ||
-                callFXO()->_flags.check(Kflags::CALL_WAIT_SEIZE))
-        {
-            /* waiting digit or seize means DEADLOCK if we try to
-             *  queue something below. */
-            DBG(FUNC, PVT_FMT(_target, "not queueing dtmf, waiting stuff!"));
-            return true;
-        }
-
-        ret = KhompPvt::onDtmfDetected(e);
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
-
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::onDtmfSendFinish(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        ret = KhompPvt::onDtmfSendFinish(e);
-
-        if (callFXO()->_flags.check(Kflags::EARLY_RINGBACK))
-        {
-            callFXO()->_flags.clear(Kflags::EARLY_RINGBACK);
-
-            /* start grabbing */
-            startListen();
-
-            /* activate resources early... */
-            bool fax_detected = callFXO()->_flags.check(Kflags::FAX_DETECTED);
-
-            bool res_out_of_band_dtmf = Opt::_options._suppression_delay() && Opt::_options._out_of_band_dtmfs() && !fax_detected;
-            bool res_echo_cancellator = Opt::_options._echo_canceller() && !fax_detected;
-            bool res_auto_gain_cntrol = Opt::_options._auto_gain_control() && !fax_detected;
-
-            if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
-                dtmfSuppression(res_out_of_band_dtmf);
-
-            if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
-                echoCancellation(res_echo_cancellator);
-
-            if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
-                autoGainControl(res_auto_gain_cntrol);
-
-            /* start sending audio if wanted so */
-            if (Opt::_options._fxo_send_pre_audio())
-                startStream();
-
-            //TODO: Verificar isso aqui
-            if (call()->_pre_answer)
-            {
-                /* tell the user we are answered! */
-                switch_channel_mark_answered(getFSChannel());
-                //pvt->signal_state(AST_CONTROL_ANSWER);
-            }
-            else
-            {
-                /* are we ringing, now? lets try this way! */
-                switch_channel_mark_ring_ready(getFSChannel());
-                //pvt->signal_state(AST_CONTROL_RINGING);
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXO) r (no valid channel: %s)") % err._msg.c_str());
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
-
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::onCallAnswerInfo(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        int info_code = -1;
-
-        switch (e->AddInfo)
-        {
-            case kcsiCellPhoneMessageBox:
-                info_code = CI_MESSAGE_BOX;
-                break;
-            case kcsiHumanAnswer:
-                info_code = CI_HUMAN_ANSWER;
-                break;
-            case kcsiAnsweringMachine:
-                info_code = CI_ANSWERING_MACHINE;
-                break;
-            case kcsiCarrierMessage:
-                info_code = CI_CARRIER_MESSAGE;
-                break;
-            case kcsiUnknown:
-                info_code = CI_UNKNOWN;
-                break;
-            default:
-                DBG(FUNC, PVT_FMT(_target, "got an unknown call answer info '%d', ignoring...") % e->AddInfo);
-                break;
-        }
-
-        if (info_code != -1)
-        {
-            if (callFXO()->_call_info_report)
-            {
-                //TODO: HOW WE TREAT THAT
-                // make the channel export this
-                setAnswerInfo(info_code);
-            }
-
-            if (callFXO()->_call_info_drop & info_code)
-            {
-                command(KHOMP_LOG,CM_DISCONNECT);
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target,"(FXO) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
-    return true;
-}
-
-bool BoardFXO::KhompPvtFXO::application(ApplicationType type, switch_core_session_t * session, const char *data)
-{
-    switch(type)
-    {
-        case FAX_ADJUST:
-            return _fax->adjustForFax();
-        case FAX_SEND:
-            return _fax->sendFax(session, data);
-        case FAX_RECEIVE:
-            return _fax->receiveFax(session, data);
-        case USER_TRANSFER:
-            return _transfer->userTransfer(session, data);
-        default:
-            return KhompPvt::application(type, session, data);
-    }
-
-    return true;
-}
-
-bool BoardFXO::KhompPvtFXO::setupConnection()
-{
-    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        DBG(FUNC,PVT_FMT(_target, "Channel already disconnected"));
-        return false;
-    }
-
-    callFXO()->_flags.clear(Kflags::CALL_WAIT_SEIZE);
-    callFXO()->_flags.clear(Kflags::WAIT_SEND_DTMF);
-
-    /* if received some disconnect from 'drop collect call'
-       feature of some pbx, then leave the call rock and rolling */
-    //Board::board(_target.device)->_timers.del(callFXO()->_idx_disconnect);
-
-    bool fax_detected = callFXO()->_flags.check(Kflags::FAX_DETECTED) || (callFXO()->_var_fax_adjust == T_TRUE);
-
-    bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN || fax_detected ?
-        Opt::_options._suppression_delay() && Opt::_options._out_of_band_dtmfs() && !fax_detected : (call()->_var_dtmf_state == T_TRUE));
-
-    bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN || fax_detected ?
-        Opt::_options._echo_canceller() && !fax_detected : (call()->_var_echo_state == T_TRUE));
-
-    bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN || fax_detected ?
-        Opt::_options._auto_gain_control() && !fax_detected : (call()->_var_gain_state == T_TRUE));
-
-    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
-    {
-        obtainRX(res_out_of_band_dtmf);
-
-        /* esvazia buffers de leitura/escrita */
-        cleanupBuffers();
-
-        if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
-            dtmfSuppression(res_out_of_band_dtmf);
-
-        if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
-            echoCancellation(res_echo_cancellator);
-
-        if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
-            autoGainControl(res_auto_gain_cntrol);
-
-        startListen(false);
-
-        startStream();
-
-        DBG(FUNC, PVT_FMT(_target, "(FXO) Audio callbacks initialized successfully"));
-    }
-
-    return KhompPvt::setupConnection();
-}
-
-bool BoardFXO::KhompPvtFXO::autoGainControl(bool enable)
-{
-    bool ret = KhompPvt::autoGainControl(enable);
-
-    /* enable this AGC also, can be very useful */
-    ret &= command(KHOMP_LOG, (enable ? CM_ENABLE_PLAYER_AGC : CM_DISABLE_PLAYER_AGC));
-    return ret;
-}
-
-void BoardFXO::KhompPvtFXO::setAnswerInfo(int answer_info)
-{
-    const char * value = answerInfoToString(answer_info);
-
-    if (value == NULL)
-    {
-        DBG(FUNC, PVT_FMT(_target,"signaled unknown call answer info '%d', using 'Unknown'...") % answer_info);
-        value = "Unknown";
-    }
-
-    DBG(FUNC,PVT_FMT(_target,"KCallAnswerInfo: %s") % value);
-
-    try
-    {
-        setFSChannelVar("KCallAnswerInfo", value);
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR,PVT_FMT(_target,"Cannot obtain the channel variable: %s") % err._msg.c_str());
-    }
-}
-
-bool BoardFXO::KhompPvtFXO::indicateBusyUnlocked(int cause, bool sent_signaling)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXO) c"));
-
-    if(!KhompPvt::indicateBusyUnlocked(cause, sent_signaling))
-    {
-        DBG(FUNC, PVT_FMT(_target, "(FXO) r (false)"));
-        return false;
-    }
-
-    if(call()->_flags.check(Kflags::IS_INCOMING))
-    {
-        /* already connected or sent signaling... */
-        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-
-        if(!call()->_flags.check(Kflags::CONNECTED) && !sent_signaling)
-        {
-            /* we are talking about branches, not trunks */
-            command(KHOMP_LOG, CM_CONNECT);
-            callFXO()->_busy_disconnect = Board::board(_target.device)->_timers.add(Opt::_options._fxo_busy_disconnection(), &BoardFXO::KhompPvtFXO::busyDisconnect, this);
-        }
-    }
-    else if(call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        /* already connected or sent signaling... */
-        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-    }
-
-    DBG(FUNC,PVT_FMT(_target, "(FXO) r"));
-    return true;
-}
-
-void BoardFXO::KhompPvtFXO::busyDisconnect(Board::KhompPvt * pvt)
-{
-    DBG(FUNC, PVT_FMT(pvt->target(), "Disconnecting FXO"));
-
-    try
-    {
-        ScopedPvtLock lock(pvt);
-        pvt->command(KHOMP_LOG, CM_DISCONNECT);
-    }
-    catch (...)
-    {
-        LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock the pvt !"));
-    }
-}
-
-void BoardFXO::KhompPvtFXO::reportFailToReceive(int fail_code)
-{
-    KhompPvt::reportFailToReceive(fail_code);
-
-    command(KHOMP_LOG, CM_CONNECT);
-    command(KHOMP_LOG, CM_DISCONNECT);
-}
-
-bool BoardFXO::KhompPvtFXO::validContexts(
-        MatchExtension::ContextListType & contexts, std::string extra_context)
-{
-    DBG(FUNC,PVT_FMT(_target,"(FXO) c"));
-
-    if(!_group_context.empty())
-    {
-        contexts.push_back(_group_context);
-    }
-
-    contexts.push_back(Opt::_options._context_fxo());
-    contexts.push_back(Opt::_options._context2_fxo());
-
-    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
-    {
-        replaceTemplate((*i), "CC", _target.object);
-    }
-
-    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
-
-    DBG(FUNC,PVT_FMT(_target,"(FXO) r"));
-
-    return ret;
-}
-
-bool BoardFXO::KhompPvtFXO::isOK()
-{
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        K3L_CHANNEL_STATUS status;
-
-        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
-            return false;
-
-        return (status.AddInfo == kfcsEnabled);
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-    }
-
-    return false;
-}
-
-bool BoardFXO::KhompPvtFXO::sendDtmf(std::string digit)
-{
-    if(_transfer->checkUserXferUnlocked(digit))
-    {
-        DBG(FUNC, PVT_FMT(target(), "started (or waiting for) an user xfer"));
-        return true;
-    }
-
-    bool ret = KhompPvt::sendDtmf(callFXO()->_digits_buffer);
-
-    callFXO()->_digits_buffer.clear();
-
-    return ret;
-}
-
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp
deleted file mode 100644
index a57dc813c6..0000000000
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp
+++ /dev/null
@@ -1,572 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "khomp_pvt_gsm.h"
-#include "lock.h"
-#include "logger.h"
-
-bool BoardGSM::KhompPvtGSM::isOK()
-{
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        K3L_CHANNEL_STATUS status;
-
-        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
-            return false;
-
-        switch (status.AddInfo)
-        {
-            case kgsmModemError:
-            case kgsmSIMCardError:
-            case kgsmNetworkError:
-            case kgsmNotReady:
-                return false;
-            default:
-                return true;
-        }
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-    }
-
-    return false;
-}
-
-bool BoardGSM::KhompPvtGSM::onChannelRelease(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        call()->_flags.clear(Kflags::HAS_PRE_AUDIO);
-        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
-
-        ret = KhompPvt::onChannelRelease(e);
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(GSM) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
-    return ret;
-}
-
-bool BoardGSM::KhompPvtGSM::onCallSuccess(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        ret = KhompPvt::onCallSuccess(e);
-
-        if (call()->_pre_answer)
-        {
-            dtmfSuppression(Opt::_options._out_of_band_dtmfs());
-
-            startListen();
-            startStream();
-            switch_channel_mark_pre_answered(getFSChannel());
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(GSM) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(GSM) r (%s)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
-
-    return ret;
-}
-
-void BoardGSM::KhompPvtGSM::setAnswerInfo(int answer_info)
-{
-    const char * value = answerInfoToString(answer_info);
-
-    if (value == NULL)
-    {
-        DBG(FUNC, PVT_FMT(_target,"signaled unknown call answer info '%d', using 'Unknown'...") % answer_info);
-        value = "Unknown";
-    }
-
-    DBG(FUNC,PVT_FMT(_target,"KCallAnswerInfo: %s") % value);
-
-    try
-    {
-        setFSChannelVar("KCallAnswerInfo",value);
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR,PVT_FMT(_target,"Cannot obtain the channel variable: %s") % err._msg.c_str());
-    }
-}
-
-bool BoardGSM::KhompPvtGSM::onCallAnswerInfo(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        int info_code = -1;
-
-        switch (e->AddInfo)
-        {
-            case kcsiCellPhoneMessageBox:
-                info_code = CI_MESSAGE_BOX;
-                break;
-            case kcsiHumanAnswer:
-                info_code = CI_HUMAN_ANSWER;
-                break;
-            case kcsiAnsweringMachine:
-                info_code = CI_ANSWERING_MACHINE;
-                break;
-            case kcsiCarrierMessage:
-                info_code = CI_CARRIER_MESSAGE;
-                break;
-            case kcsiUnknown:
-                info_code = CI_UNKNOWN;
-                break;
-            default:
-                DBG(FUNC, PVT_FMT(_target, "got an unknown call answer info '%d', ignoring...") % e->AddInfo);
-                break;
-        }
-
-        if (info_code != -1)
-        {
-            if (callGSM()->_call_info_report)
-            {
-                //TODO: HOW WE TREAT THAT
-                // make the channel export this
-                setAnswerInfo(info_code);
-            }
-
-            if (callGSM()->_call_info_drop & info_code)
-            {
-                command(KHOMP_LOG, CM_SEND_TO_MODEM, "ATH");
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target,"(GSM) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
-    return true;
-}
-
-/*
-bool BoardGSM::KhompPvtGSM::onDtmfDetected(K3L_EVENT *e)
-{
-    bool ret = KhompPvt::onDtmfDetected(e);
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(GSM) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    return ret;
-}
-
-bool BoardGSM::KhompPvtGSM::onNewCall(K3L_EVENT *e)
-{
-    DBG(FUNC,PVT_FMT(_target,"(GSM) c"));
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        bool ret = KhompPvtGSM::onNewCall(e);
-
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(GSM) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
-
-    return ret;
-}
-*/
-
-
-
-bool BoardGSM::KhompPvtGSM::onCallFail(K3L_EVENT *e)
-{
-    bool ret = true;
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        //K::internal::gsm_cleanup_and_restart(pvt, owner_nr, true);
-        setHangupCause(causeFromCallFail(e->AddInfo), true);
-
-        ret = KhompPvt::onCallFail(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-
-    return ret;
-}
-
-bool BoardGSM::KhompPvtGSM::onDisconnect(K3L_EVENT *e)
-{
-    bool ret = true;
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        //gsm_cleanup_and_restart(pvt, (int)evt.gsm_call_ref);
-
-        ret = KhompPvt::onDisconnect(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(GSM) unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-
-    return ret;
-}
-
-int BoardGSM::KhompPvtGSM::makeCall(std::string params)
-{
-    DBG(FUNC,PVT_FMT(_target, "(GSM) c"));
-
-    if(callGSM()->_call_info_drop == 0 && !callGSM()->_call_info_report)
-    {
-        command(KHOMP_LOG, CM_DISABLE_CALL_ANSWER_INFO);
-    }
-
-    if(!_call->_orig_addr.compare("restricted"))
-        params += " orig_addr=\"restricted\"";
-
-    int ret = KhompPvt::makeCall(params);
-
-    if(ret != ksSuccess)
-    {
-        LOG(ERROR, PVT_FMT(target(), "Fail on make call"));
-    }
-
-    call()->_cleanup_upon_hangup = (ret == ksInvalidParams || ret == ksInvalidState);
-
-    DBG(FUNC,PVT_FMT(_target, "(GSM) r"));
-    return ret;
-}
-
-bool BoardGSM::KhompPvtGSM::doChannelAnswer(CommandRequest &cmd)
-{
-    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        command(KHOMP_LOG, CM_CONNECT);
-
-        ret = KhompPvt::doChannelAnswer(cmd);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target,"(GSM) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
-
-    return ret;
-}
-
-bool BoardGSM::KhompPvtGSM::doChannelHangup(CommandRequest &cmd)
-{
-    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        int owner_nr = 0;
-
-        command(KHOMP_LOG, CM_DISCONNECT,
-                STG(FMT("gsm_call_ref=%d") % (int)owner_nr).c_str());
-
-
-        //ret = KhompPvt::doChannelHangup(cmd);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target,"(GSM) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
-
-    return ret;
-}
-
-bool BoardGSM::KhompPvtGSM::application(ApplicationType type, switch_core_session_t * session, const char *data)
-{
-    switch(type)
-    {
-        case SMS_CHECK:
-            return true;
-        case SMS_SEND:
-            return _sms->sendSMS(session, data);
-        case SELECT_SIM_CARD:
-            return selectSimCard(data);
-        default:
-            return KhompPvt::application(type, session, data);
-    }
-
-    return true;
-}
-
-bool BoardGSM::KhompPvtGSM::setupConnection()
-{
-    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        DBG(FUNC,PVT_FMT(_target, "Channel already disconnected"));
-        return false;
-    }
-
-    bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN ?
-        Opt::_options._suppression_delay() && Opt::_options._out_of_band_dtmfs() : (call()->_var_dtmf_state == T_TRUE));
-
-    bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN ?
-        Opt::_options._echo_canceller() : (call()->_var_echo_state == T_TRUE));
-
-
-    bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN ?
-        Opt::_options._auto_gain_control() : (call()->_var_gain_state == T_TRUE));
-
-
-    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
-    {
-        obtainRX(res_out_of_band_dtmf);
-
-        /* esvazia buffers de leitura/escrita */
-        cleanupBuffers();
-
-        if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
-            dtmfSuppression(res_out_of_band_dtmf);
-
-        if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
-            echoCancellation(res_echo_cancellator);
-
-        if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
-            autoGainControl(res_auto_gain_cntrol);
-
-        startListen(false);
-
-        startStream();
-
-        DBG(FUNC, PVT_FMT(_target, "(GSM) Audio callbacks initialized successfully"));
-    }
-
-    return Board::KhompPvt::setupConnection();
-}
-
-bool BoardGSM::KhompPvtGSM::indicateBusyUnlocked(int cause, bool sent_signaling)
-{
-    DBG(FUNC, PVT_FMT(_target, "(GSM) c"));
-
-    if(!KhompPvt::indicateBusyUnlocked(cause, sent_signaling))
-    {
-        DBG(FUNC, PVT_FMT(_target, "(GSM) r (false)"));
-        return false;
-    }
-
-    if(call()->_flags.check(Kflags::IS_INCOMING))
-    {
-        if(!call()->_flags.check(Kflags::CONNECTED) && !sent_signaling)
-        {
-            /* we are talking about branches, not trunks */
-            command(KHOMP_LOG, CM_DISCONNECT);
-        }
-        else
-        {
-            /* already connected or sent signaling... */
-            mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-        }
-    }
-    else if(call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        /* already connected or sent signaling... */
-        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-    }
-
-    DBG(FUNC,PVT_FMT(_target, "(GSM) r"));
-
-    return true;
-}
-
-void BoardGSM::KhompPvtGSM::reportFailToReceive(int fail_code)
-{
-    KhompPvt::reportFailToReceive(fail_code);
-
-    command(KHOMP_LOG, CM_CONNECT);
-
-    /* K3L may fail depending on its configuration (GsmModem) */
-    if (!command(KHOMP_LOG, CM_DISCONNECT))
-    {
-        int owner_nr = 0;
-        command(KHOMP_LOG, CM_DISCONNECT,
-                STG(FMT("gsm_call_ref=\"%d\"") % owner_nr).c_str());
-    }
-
-}
-
-int BoardGSM::KhompPvtGSM::causeFromCallFail(int fail)
-{
-    int switch_cause = SWITCH_CAUSE_USER_BUSY;
-
-    if (fail <= 127)
-        switch_cause = fail;
-    else
-        switch_cause = SWITCH_CAUSE_INTERWORKING;
-
-    return switch_cause;
-}
-
-int BoardGSM::KhompPvtGSM::callFailFromCause(int cause)
-{
-    int k3l_fail = -1; // default
-
-    if (cause <= 127)
-        k3l_fail = cause;
-    else
-        k3l_fail = kgccInterworking;
-
-    return k3l_fail;
-}
-
-bool BoardGSM::KhompPvtGSM::validContexts(
-        MatchExtension::ContextListType & contexts, std::string extra_context)
-{
-    DBG(FUNC,PVT_FMT(_target,"(GSM) c"));
-
-    if(!_group_context.empty())
-    {
-        contexts.push_back(_group_context);
-    }
-
-    if (!extra_context.empty())
-    {
-        if (!_group_context.empty())
-        {
-            std::string pvt_context(_group_context);
-            pvt_context += "-";
-            pvt_context += extra_context;
-            contexts.push_back(pvt_context);
-        }
-
-        if (!Opt::_options._context_gsm_call().empty())
-        {
-            std::string context(Opt::_options._context_gsm_call());
-            context += "-";
-            context += extra_context;
-            contexts.push_back(_group_context);
-        }
-
-        if (!Opt::_options._context2_gsm_call().empty())
-        {
-            std::string context(Opt::_options._context2_gsm_call());
-            context += "-";
-            context += extra_context;
-            contexts.push_back(_group_context);
-        }
-    }
-
-    contexts.push_back(Opt::_options._context_gsm_call());
-    contexts.push_back(Opt::_options._context2_gsm_call());
-
-    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
-        replaceTemplate((*i), "CC", _target.object);
-
-    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
-
-    DBG(FUNC,PVT_FMT(_target,"(GSM) r"));
-
-    return ret;
-}
-
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp
deleted file mode 100644
index 0aa2979cf8..0000000000
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp
+++ /dev/null
@@ -1,3590 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "khomp_pvt_kxe1.h"
-#include "lock.h"
-#include "logger.h"
-
-
-bool BoardE1::KhompPvtE1::isOK()
-{
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        K3L_CHANNEL_STATUS status;
-
-        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
-            return false;
-
-        return   ((status.AddInfo == kecsFree) ||
-                (!(status.AddInfo & kecsLocalFail) &&
-                 !(status.AddInfo & kecsRemoteLock)));
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-    }
-
-    return false;
-}
-
-bool BoardE1::KhompPvtE1::onChannelRelease(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (call()->_flags.check(Kflags::FAX_SENDING))
-        {
-            DBG(FUNC, PVT_FMT(_target, "stopping fax tx"));
-            _fax->stopFaxTX();
-        }
-        else if (call()->_flags.check(Kflags::FAX_RECEIVING))
-        {
-            DBG(FUNC, PVT_FMT(_target, "stopping fax rx"));
-            _fax->stopFaxRX();
-        }
-
-        call()->_flags.clear(Kflags::HAS_PRE_AUDIO);
-
-        command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
-
-        ret = KhompPvt::onChannelRelease(e);
-
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(E1) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(E1) r"));
-    return ret;
-}
-
-bool BoardE1::KhompPvtE1::onCallSuccess(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
-
-    bool ret;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        ret = KhompPvt::onCallSuccess(e);
-
-        if (call()->_pre_answer)
-        {
-            dtmfSuppression(Opt::_options._out_of_band_dtmfs()&& !call()->_flags.check(Kflags::FAX_DETECTED));
-
-            startListen();
-            startStream();
-            switch_channel_mark_pre_answered(getFSChannel());
-        }
-        else
-        {
-            call()->_flags.set(Kflags::GEN_PBX_RING);
-            call()->_idx_pbx_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_pbx_delay(),
-                                             &Board::KhompPvt::pbxRingGen,this, TM_VAL_CALL);
-        }
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to get device: %d!)") % err.device);
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(E1) r"));
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtE1::onAudioStatus(K3L_EVENT *e)
-{
-    DBG(STRM, PVT_FMT(_target, "(E1) c"));
-
-    try
-    {
-        //ScopedPvtLock lock(this);
-
-        if(e->AddInfo == kmtFax)
-        {
-            DBG(STRM, PVT_FMT(_target, "Fax detected"));
-
-            /* hadn't we did this already? */
-            bool already_detected = call()->_flags.check(Kflags::FAX_DETECTED);
-
-            time_t time_was = call()->_call_statistics->_base_time;
-            time_t time_now = time(NULL);
-
-            bool detection_timeout = (time_now > (time_was + (time_t) (Opt::_options._fax_adjustment_timeout())));
-
-            DBG(STRM, PVT_FMT(_target, "is set? (%s) timeout? (%s)")
-                            % (already_detected ? "true" : "false") % (detection_timeout ? "true" : "false"));
-
-            BEGIN_CONTEXT
-            {
-                ScopedPvtLock lock(this);
-
-                /* already adjusted? do not adjust again. */
-                if (already_detected || detection_timeout)
-                    break;
-
-                if (callE1()->_call_info_drop != 0 || callE1()->_call_info_report)
-                {
-                    /* we did not detected fax yet, send answer info! */
-                    setAnswerInfo(Board::KhompPvt::CI_FAX);
-
-                    if (callE1()->_call_info_drop & Board::KhompPvt::CI_FAX)
-                    {
-                        /* fastest way to force a disconnection */
-                        command(KHOMP_LOG,CM_DISCONNECT);//,SCE_HIDE);
-                    }
-                }
-
-                if (Opt::_options._auto_fax_adjustment())
-                {
-                    DBG(FUNC, PVT_FMT(_target, "communication will be adjusted for fax!"));
-                    _fax->adjustForFax();
-                }
-            }
-            END_CONTEXT
-
-            if (!already_detected)
-            {
-                ScopedPvtLock lock(this);
-
-                /* adjust the flag */
-                call()->_flags.set(Kflags::FAX_DETECTED);
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-
-    bool ret = KhompPvt::onAudioStatus(e);
-
-    DBG(STRM, PVT_FMT(_target, "(E1) r"));
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtE1::onCallAnswerInfo(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        int info_code = -1;
-
-        switch (e->AddInfo)
-        {
-            case kcsiCellPhoneMessageBox:
-                info_code = CI_MESSAGE_BOX;
-                break;
-            case kcsiHumanAnswer:
-                info_code = CI_HUMAN_ANSWER;
-                break;
-            case kcsiAnsweringMachine:
-                info_code = CI_ANSWERING_MACHINE;
-                break;
-            case kcsiCarrierMessage:
-                info_code = CI_CARRIER_MESSAGE;
-                break;
-            case kcsiUnknown:
-                info_code = CI_UNKNOWN;
-                break;
-            default:
-                DBG(FUNC, PVT_FMT(_target, "got an unknown call answer info '%d', ignoring...") % e->AddInfo);
-                break;
-        }
-
-        if (info_code != -1)
-        {
-            if (callE1()->_call_info_report)
-            {
-                //TODO: HOW WE TREAT THAT
-                // make the channel export this
-                setAnswerInfo(info_code);
-            }
-
-            if (callE1()->_call_info_drop & info_code)
-            {
-                // fastest way to force a disconnection
-                //K::util::sendCmd(pvt->boardid, pvt->objectid, CM_DISCONNECT, true, false);
-                command(KHOMP_LOG,CM_DISCONNECT/*,SCE_HIDE ?*/);
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(E1) r"));
-    return true;
-}
-
-bool BoardE1::KhompPvtE1::onDisconnect(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (call()->_flags.check(Kflags::IS_OUTGOING) ||
-            call()->_flags.check(Kflags::IS_INCOMING))
-        {
-            if(Opt::_options._disconnect_delay()== 0)
-            {
-                DBG(FUNC, PVT_FMT(_target, "queueing disconnecting outgoing channel!"));
-                command(KHOMP_LOG, CM_DISCONNECT);
-            }
-            else
-            {
-                callE1()->_idx_disconnect = Board::board(_target.device)->_timers.add(
-                    1000 * Opt::_options._disconnect_delay(),&BoardE1::KhompPvtE1::delayedDisconnect,this);
-            }
-        }
-        else
-        {
-            /* in the case of a disconnect confirm is needed and a call
-            was not started e.g. just after a ev_seizure_start */
-            command(KHOMP_LOG, CM_DISCONNECT);
-        }
-
-        ret = KhompPvt::onDisconnect(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to get device: %d!)") % err.device);
-        return false;
-    }
-
-    DBG(FUNC,PVT_FMT(_target, "(E1) r"));
-    return ret;
-}
-
-void BoardE1::KhompPvtE1::delayedDisconnect(Board::KhompPvt * pvt)
-{
-    DBG(FUNC,PVT_FMT(pvt->target(), "Delayed disconnect"));
-
-    try
-    {
-        ScopedPvtLock lock(pvt);
-
-        DBG(FUNC, PVT_FMT(pvt->target(), "queueing disconnecting outgoing channel after delaying!"));
-
-        pvt->command(KHOMP_LOG,CM_DISCONNECT);
-        pvt->cleanup(CLN_HARD);
-    }
-    catch (...)
-    {
-        LOG(ERROR, PVT_FMT(pvt->target(), "r (unable to lock the pvt !)"));
-    }
-}
-
-bool BoardE1::onLinkStatus(K3L_EVENT *e)
-{
-    DBG(FUNC, D("Link %02d on board %02d changed") % e->AddInfo % e->DeviceId);
-
-    /* Fire a custom event about this */
-    /*
-    switch_event_t * event;
-    if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, KHOMP_EVENT_MAINT) == SWITCH_STATUS_SUCCESS)
-    {
-        //khomp_add_event_board_data(e->AddInfo, event);
-        Board::khomp_add_event_board_data(K3LAPI::target(Globals::k3lapi, K3LAPI::target::LINK, e->DeviceId, e->AddInfo), event);
-
-        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "EV_LINK_STATUS", "%d", e->AddInfo);
-        switch_event_fire(&event);
-    }
-    */
-
-    return true;
-}
-
-bool BoardE1::KhompPvtISDN::onSyncUserInformation(K3L_EVENT *e)
-{
-    DBG(FUNC,PVT_FMT(_target, "Synchronizing"));
-
-    if(callISDN()->_uui_extended)
-    {
-        KUserInformationEx * info = (KUserInformationEx *) (((char*)e) + sizeof(K3L_EVENT));
-        callISDN()->_uui_descriptor = (long int) info->ProtocolDescriptor;
-
-        /* clean string */
-        callISDN()->_uui_information.clear();
-
-        if (info->UserInfoLength)
-        {
-            /* append to a clean string */
-            for (unsigned int i = 0; i < info->UserInfoLength; ++i)
-                callISDN()->_uui_information += STG(FMT("%02hhx") % ((unsigned char) info->UserInfo[i]));
-        }
-    }
-    else
-    {
-        KUserInformation * info = (KUserInformation *) (((char*)e) + sizeof(K3L_EVENT));
-        callISDN()->_uui_descriptor = info->ProtocolDescriptor;
-
-        /* clean string */
-        callISDN()->_uui_information.clear();
-
-        if (info->UserInfoLength)
-        {
-            for (unsigned int i = 0; i < info->UserInfoLength; ++i)
-                callISDN()->_uui_information += STG(FMT("%02hhx") % ((unsigned char) info->UserInfo[i]));
-        }
-    }
-
-    return true;
-}
-
-bool BoardE1::KhompPvtISDN::onIsdnProgressIndicator(K3L_EVENT *e)
-{
-    //TODO: Do we need return something ?
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        switch (e->AddInfo)
-        {
-            case kq931pTonesMaybeAvailable:
-            case kq931pTonesAvailable:
-                if (!call()->_is_progress_sent)
-                {
-                    call()->_is_progress_sent = true;
-
-                    //Sinaliza para o Freeswitch PROGRESS
-                    DBG(FUNC, PVT_FMT(_target, "Pre answer"));
-
-                    //pvt->signal_state(SWITCH_CONTROL_PROGRESS);
-                    //switch_channel_pre_answer(channel);
-                    switch_channel_mark_pre_answered(getFSChannel());
-
-                }
-                break;
-            case kq931pDestinationIsNonIsdn:
-            case kq931pOriginationIsNonIsdn:
-            case kq931pCallReturnedToIsdn:
-            default:
-                break;
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "No valid channel: %s") % err._msg.c_str());
-        return false;
-    }
-
-    return true;
-}
-
-bool BoardE1::KhompPvtISDN::onNewCall(K3L_EVENT *e)
-{
-    DBG(FUNC,PVT_FMT(_target, "(ISDN) c"));
-
-    bool isdn_reverse_charge = false;
-    std::string isdn_reverse_charge_str;
-    bool ret;
-
-    try
-    {
-        callISDN()->_isdn_orig_type_of_number = Globals::k3lapi.get_param(e, "isdn_orig_type_of_number");
-        callISDN()->_isdn_orig_numbering_plan = Globals::k3lapi.get_param(e, "isdn_orig_numbering_plan");
-        callISDN()->_isdn_dest_type_of_number = Globals::k3lapi.get_param(e, "isdn_dest_type_of_number");
-        callISDN()->_isdn_dest_numbering_plan = Globals::k3lapi.get_param(e, "isdn_dest_numbering_plan");
-        callISDN()->_isdn_orig_presentation   = Globals::k3lapi.get_param(e, "isdn_orig_presentation");
-        isdn_reverse_charge_str = Globals::k3lapi.get_param(e, "isdn_reverse_charge");
-        isdn_reverse_charge = Strings::toboolean(isdn_reverse_charge_str);
-    }
-    catch(K3LAPI::get_param_failed & err)
-    {
-        LOG(WARNING, PVT_FMT(_target, "maybe the parameter is not sent (%s)'") % err.name.c_str());
-    }
-    catch (Strings::invalid_value & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to get param '%s'") % err.value().c_str());
-    }
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if(session())
-        {
-            bool pvt_locked = true;
-            bool is_ok = false;
-
-            DBG(FUNC, PVT_FMT(_target, "Session has not been destroyed yet, waiting for khompDestroy"));
-
-            for(unsigned int sleeps = 0; sleeps < 20; sleeps++)
-            {
-                /* unlock our pvt struct */
-                if(pvt_locked)
-                {
-                    _mutex.unlock();
-                    pvt_locked = false;
-                }
-
-                /* wait a little while (100ms is good?) */
-                usleep (100000);
-
-                /* re-lock pvt struct */
-                switch (_mutex.lock())
-                {
-                case SimpleLock::ISINUSE:
-                case SimpleLock::FAILURE:
-                    LOG(ERROR, PVT_FMT(_target, "unable to lock pvt_mutex, trying again."));
-                    sched_yield();
-                    continue;
-
-                default:
-                    break;
-                }
-
-                pvt_locked = true;
-
-                if(!session())
-                {
-                    is_ok = true;
-                    break;
-                }
-            }
-
-            if(is_ok)
-            {
-                DBG(FUNC, PVT_FMT(_target, "Session destroyed properly"));
-            }
-            else
-            {
-                LOG(ERROR, PVT_FMT(target(), "(ISDN) r (Session was not destroyed, stopping to wait)"));
-                return false;
-            }
-        }
-
-        if(isdn_reverse_charge)
-        {
-            call()->_collect_call = true;
-        }
-
-        ret = KhompPvtE1::onNewCall(e);
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(ISDN) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(ISDN) r"));
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtISDN::onCallSuccess(K3L_EVENT *e)
-{
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if(e->AddInfo > 0)
-        {
-            callISDN()->_isdn_cause = e->AddInfo;
-            setFSChannelVar("KISDNGotCause", Verbose::isdnCause((KQ931Cause)callISDN()->_isdn_cause).c_str());
-        }
-
-        ret = KhompPvtE1::onCallSuccess(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str());
-        return false;
-    }
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtISDN::onCallFail(K3L_EVENT *e)
-{
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if(e->AddInfo > 0)
-        {
-            callISDN()->_isdn_cause = e->AddInfo;
-            setFSChannelVar("KISDNGotCause", Verbose::isdnCause((KQ931Cause)callISDN()->_isdn_cause).c_str());
-        }
-
-        setHangupCause(causeFromCallFail(e->AddInfo),true);
-
-        ret = KhompPvtE1::onCallFail(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str());
-        return false;
-    }
-
-    return ret;
-}
-
-RingbackDefs::RingbackStType BoardE1::KhompPvtISDN::sendRingBackStatus(int rb_value)
-{
-    DBG(FUNC, PVT_FMT(target(), "this is the rdsi ringback procedure"));
-
-
-    std::string cause = (rb_value == -1 ? "" : STG(FMT("isdn_cause=\"%d\"") % rb_value));
-    return (command(KHOMP_LOG, CM_RINGBACK, cause.c_str()) ?
-            RingbackDefs::RBST_SUCCESS : RingbackDefs::RBST_FAILURE);
-}
-
-bool BoardE1::KhompPvtISDN::sendPreAudio(int rb_value)
-{
-    if(!KhompPvtE1::sendPreAudio(rb_value))
-        return false;
-
-
-    DBG(FUNC,PVT_FMT(_target, "doing the ISDN pre_connect"));
-
-    if (call()->_flags.check(Kflags::HAS_PRE_AUDIO))
-    {
-        DBG(FUNC, PVT_FMT(target(), "already pre_connect"));
-        return true;
-    }
-    else
-    {
-        bool result = command(KHOMP_LOG, CM_PRE_CONNECT);
-
-        if (result)
-            call()->_flags.set(Kflags::HAS_PRE_AUDIO);
-
-        return result;
-    }
-}
-
-bool BoardE1::KhompPvtISDN::application(ApplicationType type, switch_core_session_t * session, const char *data)
-{
-    switch(type)
-    {
-        case USER_TRANSFER:
-            return _transfer->userTransfer(session, data);
-        default:
-            return KhompPvtE1::application(type, session, data);
-    }
-
-    return true;
-}
-
-bool BoardE1::KhompPvtISDN::sendDtmf(std::string digit)
-{
-    if(_transfer->checkUserXferUnlocked(digit))
-    {
-        DBG(FUNC, PVT_FMT(target(), "started (or waiting for) an user xfer"));
-        return true;
-    }
-
-    bool ret = KhompPvtE1::sendDtmf(callISDN()->_digits_buffer);
-
-    callISDN()->_digits_buffer.clear();
-
-    return ret;
-}
-
-int BoardE1::KhompPvtE1::makeCall(std::string params)
-{
-    if(callE1()->_call_info_drop == 0 && !callE1()->_call_info_report)
-    {
-        command(KHOMP_LOG, CM_DISABLE_CALL_ANSWER_INFO);
-    }
-
-    if(!_call->_orig_addr.empty())
-        params += STG(FMT(" orig_addr=\"%s\"") % _call->_orig_addr);
-
-    int ret = KhompPvt::makeCall(params);
-
-    if(ret == ksSuccess)
-    {
-        startListen();
-    }
-    else
-    {
-        LOG(ERROR, PVT_FMT(target(), "Fail on make call"));
-    }
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtE1::indicateBusyUnlocked(int cause, bool sent_signaling)
-{
-    DBG(FUNC, PVT_FMT(_target, "(E1) c"));
-
-    if(!KhompPvt::indicateBusyUnlocked(cause, sent_signaling))
-    {
-        DBG(FUNC, PVT_FMT(_target, "(E1) r (false)"));
-        return false;
-    }
-
-    if(call()->_flags.check(Kflags::IS_INCOMING))
-    {
-        if(!call()->_flags.check(Kflags::CONNECTED) && !sent_signaling)
-        {
-            if(!call()->_flags.check(Kflags::HAS_PRE_AUDIO))
-            {
-                int rb_value = callFailFromCause(call()->_hangup_cause);
-                DBG(FUNC, PVT_FMT(target(), "sending the busy status"));
-
-                if (sendRingBackStatus(rb_value) == RingbackDefs::RBST_UNSUPPORTED)
-                {
-                    DBG(FUNC, PVT_FMT(target(), "falling back to audio indication!"));
-                    /* stop the line audio */
-                    stopStream();
-
-                    /* just pre connect, no ringback */
-                    if (!sendPreAudio())
-                        DBG(FUNC, PVT_FMT(target(), "everything else failed, just sending audio indication..."));
-
-                    /* be very specific about the situation. */
-                    mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-                }
-            }
-            else
-            {
-                DBG(FUNC, PVT_FMT(target(), "going to play busy"));
-
-                /* stop the line audio */
-                stopStream();
-
-                /* be very specific about the situation. */
-                mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-
-            }
-        }
-        else
-        {
-            /* already connected or sent signaling... */
-            mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-        }
-
-    }
-    else if(call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        /* already connected or sent signaling... */
-        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-    }
-
-    DBG(FUNC,PVT_FMT(_target, "(E1) r"));
-
-    return true;
-}
-
-void BoardE1::KhompPvtE1::setAnswerInfo(int answer_info)
-{
-    const char * value = answerInfoToString(answer_info);
-
-    if (value == NULL)
-    {
-        DBG(FUNC, PVT_FMT(_target, "signaled unknown call answer info '%d', using 'Unknown'...") % answer_info);
-        value = "Unknown";
-    }
-
-    DBG(FUNC,PVT_FMT(_target, "KCallAnswerInfo: %s") % value);
-
-    try
-    {
-        setFSChannelVar("KCallAnswerInfo",value);
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str());
-    }
-}
-
-bool BoardE1::KhompPvtE1::setupConnection()
-{
-    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        DBG(FUNC,PVT_FMT(_target, "Channel already disconnected"));
-        return false;
-    }
-
-    /* if received some disconnect from 'drop collect call'
-       feature of some pbx, then leave the call rock and rolling */
-    Board::board(_target.device)->_timers.del(callE1()->_idx_disconnect);
-
-    bool fax_detected = callE1()->_flags.check(Kflags::FAX_DETECTED) || (callE1()->_var_fax_adjust == T_TRUE);
-
-    bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN || fax_detected ?
-        Opt::_options._suppression_delay()&& Opt::_options._out_of_band_dtmfs()&& !fax_detected : (call()->_var_dtmf_state == T_TRUE));
-
-    bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN || fax_detected ?
-        Opt::_options._echo_canceller()&& !fax_detected : (call()->_var_echo_state == T_TRUE));
-
-    bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN || fax_detected ?
-        Opt::_options._auto_gain_control()&& !fax_detected : (call()->_var_gain_state == T_TRUE));
-
-    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
-    {
-        obtainRX(res_out_of_band_dtmf);
-
-        /* esvazia buffers de leitura/escrita */
-        cleanupBuffers();
-
-        if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
-            dtmfSuppression(res_out_of_band_dtmf);
-
-        if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
-            echoCancellation(res_echo_cancellator);
-
-        if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
-            autoGainControl(res_auto_gain_cntrol);
-
-        startListen(false);
-
-        startStream();
-
-        DBG(FUNC, PVT_FMT(_target, "(E1) Audio callbacks initialized successfully"));
-    }
-
-    return Board::KhompPvt::setupConnection();
-}
-
-bool BoardE1::KhompPvtE1::application(ApplicationType type, switch_core_session_t * session, const char *data)
-{
-    switch(type)
-    {
-        case FAX_ADJUST:
-            return _fax->adjustForFax();
-        case FAX_SEND:
-            return _fax->sendFax(session, data);
-        case FAX_RECEIVE:
-            return _fax->receiveFax(session, data);
-        default:
-            return KhompPvt::application(type, session, data);
-    }
-
-    return true;
-}
-
-bool BoardE1::KhompPvtE1::validContexts(
-        MatchExtension::ContextListType & contexts, std::string extra_context)
-{
-    DBG(FUNC,PVT_FMT(_target, "(E1) c"));
-
-    if(!_group_context.empty())
-    {
-        contexts.push_back(_group_context);
-    }
-
-    contexts.push_back(Opt::_options._context_digital());
-
-    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
-    {
-        replaceTemplate((*i), "LL", ((_target.object)/30));
-        replaceTemplate((*i), "CCC", _target.object);
-    }
-
-    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
-
-    DBG(FUNC,PVT_FMT(_target, "(E1) r"));
-
-    return ret;
-}
-
-int BoardE1::KhompPvtISDN::makeCall(std::string params)
-{
-    DBG(FUNC,PVT_FMT(_target, "(ISDN) c"));
-
-    CallISDN * call = callISDN();
-
-    if(call->_uui_descriptor != -1)
-    {
-        DBG(FUNC,PVT_FMT(_target, "got userinfo"));
-
-        /* grab this information first, avoiding latter side-effects */
-        const bool        info_extd = call->_uui_extended;
-        const long int    info_desc = call->_uui_descriptor;
-        const std::string info_data = call->_uui_information.c_str();
-        const size_t      info_size = std::min<size_t>(call->_uui_information.size(), (info_extd ? KMAX_USER_USER_EX_LEN : KMAX_USER_USER_LEN) << 1) >> 1;
-
-        bool res = true;
-
-        if(info_extd)
-        {
-            KUserInformationEx info;
-
-            info.ProtocolDescriptor = info_desc;
-            info.UserInfoLength = info_size;
-
-            for (unsigned int pos = 0u, index = 0u; pos < info_size; index+=2, ++pos)
-                info.UserInfo[pos] = (unsigned char)Strings::toulong(info_data.substr(index,2), 16);
-
-            if (!command(KHOMP_LOG, CM_USER_INFORMATION_EX, (const char *) &info))
-            {
-                LOG(ERROR,PVT_FMT(_target, "UUI could not be sent before dialing!"));
-            }
-        }
-        else
-        {
-            KUserInformation info;
-
-            info.ProtocolDescriptor = info_desc;
-            info.UserInfoLength = info_size;
-
-            for (unsigned int pos = 0u, index = 0u; pos < info_size; index+=2, ++pos)
-                info.UserInfo[pos] = (unsigned char)Strings::toulong(info_data.substr(index,2), 16);
-
-            if (!command(KHOMP_LOG, CM_USER_INFORMATION, (const char *) &info))
-            {
-                LOG(ERROR,PVT_FMT(_target, "UUI could not be sent before dialing!"));
-            }
-        }
-
-        call->_uui_extended = false;
-        call->_uui_descriptor = -1;
-        call->_uui_information.clear();
-    }
-
-    if (!callISDN()->_isdn_orig_type_of_number.empty())
-    {
-        params += "isdn_orig_type_of_number=\"";
-        params += callISDN()->_isdn_orig_type_of_number;
-        params += "\" ";
-    }
-
-    if (!callISDN()->_isdn_dest_type_of_number.empty())
-    {
-        params += "isdn_dest_type_of_number=\"";
-        params += callISDN()->_isdn_dest_type_of_number;
-        params += "\" ";
-    }
-
-    if (!callISDN()->_isdn_orig_numbering_plan.empty())
-    {
-        params += "isdn_orig_numbering_plan=\"";
-        params += callISDN()->_isdn_orig_numbering_plan;
-        params += "\" ";
-    }
-
-    if (!callISDN()->_isdn_dest_numbering_plan.empty())
-    {
-        params += "isdn_dest_numbering_plan=\"";
-        params += callISDN()->_isdn_dest_numbering_plan;
-        params += "\" ";
-    }
-
-    if (!callISDN()->_isdn_orig_presentation.empty())
-    {
-        params += "isdn_orig_presentation=\"";
-        params += callISDN()->_isdn_orig_presentation;
-        params += "\" ";
-    }
-
-    int ret = KhompPvtE1::makeCall(params);
-
-    call->_cleanup_upon_hangup = (ret == ksInvalidParams || ret == ksBusy);
-
-    DBG(FUNC,PVT_FMT(_target, "(ISDN) r"));
-
-    return ret;
-}
-
-void BoardE1::KhompPvtISDN::reportFailToReceive(int fail_code)
-{
-    KhompPvt::reportFailToReceive(fail_code);
-
-    if(fail_code != -1)
-    {
-        DBG(FUNC,PVT_FMT(_target, "sending a 'unknown number' message/audio"));
-
-        if(sendRingBackStatus(fail_code) == RingbackDefs::RBST_UNSUPPORTED)
-        {
-            sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
-            startCadence(PLAY_FASTBUSY);
-        }
-    }
-    else
-    {
-        DBG(FUNC, PVT_FMT(_target, "sending fast busy audio directly"));
-
-        sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
-        startCadence(PLAY_FASTBUSY);
-    }
-}
-
-bool BoardE1::KhompPvtISDN::doChannelAnswer(CommandRequest &cmd)
-{
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        // is this a collect call?
-        bool has_recv_collect_call = _call->_collect_call;
-
-        if(has_recv_collect_call)
-            DBG(FUNC, PVT_FMT(target(), "receive a collect call"));
-
-        if(call()->_flags.check(Kflags::DROP_COLLECT))
-            DBG(FUNC, PVT_FMT(target(), "flag DROP_COLLECT == true"));
-
-        // do we have to drop collect calls?
-        bool has_drop_collect_call = call()->_flags.check(Kflags::DROP_COLLECT);
-
-        // do we have to drop THIS call?
-        bool do_drop_call = has_drop_collect_call && has_recv_collect_call;
-
-        if(!do_drop_call)
-        {
-            command(KHOMP_LOG, CM_CONNECT);
-        }
-        else
-        {
-            usleep(75000);
-
-            DBG(FUNC, PVT_FMT(target(), "disconnecting collect call doChannelAnswer ISDN"));
-            command(KHOMP_LOG,CM_DISCONNECT);
-
-            // thou shalt not talk anymore!
-            stopListen();
-            stopStream();
-        }
-
-        ret = KhompPvtE1::doChannelAnswer(cmd);
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-
-    return ret;
-}
-
-int BoardE1::KhompPvtR2::makeCall(std::string params)
-{
-    DBG(FUNC,PVT_FMT(_target, "(R2) c"));
-
-    if (callR2()->_r2_category != -1)
-        params += STG(FMT(" r2_categ_a=\"%ld\"")
-                % callR2()->_r2_category);
-
-    int ret = KhompPvtE1::makeCall(params);
-
-    call()->_cleanup_upon_hangup = (ret == ksInvalidParams);
-
-    DBG(FUNC,PVT_FMT(_target, "(R2) r"));
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtR2::doChannelAnswer(CommandRequest &cmd)
-{
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        // is this a collect call?
-        bool has_recv_collect_call = _call->_collect_call;
-
-        // do we have to drop collect calls?
-        bool has_drop_collect_call = call()->_flags.check(Kflags::DROP_COLLECT);
-
-        // do we have to drop THIS call?
-        bool do_drop_call = has_drop_collect_call && has_recv_collect_call;
-
-        bool do_send_ring = call()->_flags.check(Kflags::NEEDS_RINGBACK_CMD);
-
-        // do we have to send ringback? yes we need !!!
-        if(do_send_ring)
-        {
-            call()->_flags.clear(Kflags::NEEDS_RINGBACK_CMD);
-
-            //TODO: callFailFromCause ??
-            std::string cause = ( do_drop_call ? STG(FMT("r2_cond_b=\"%d\"") % kgbBusy) : "" );
-            command(KHOMP_LOG,CM_RINGBACK,cause.c_str());
-
-            usleep(75000);
-        }
-
-        if(!do_drop_call)
-        {
-            command(KHOMP_LOG, CM_CONNECT);
-        }
-
-        if(!do_send_ring && has_drop_collect_call)
-        {
-            usleep(75000);
-
-            if(has_recv_collect_call)
-            {
-                // thou shalt not talk anymore!
-                stopListen();
-                stopStream();
-
-                if (call()->_indication == INDICA_NONE)
-                {
-                    call()->_indication = INDICA_BUSY;
-                    mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-                }
-
-                DBG(FUNC, PVT_FMT(_target,"forcing disconnect for collect call"));
-                forceDisconnect();
-            }
-            else
-            {
-                DBG(FUNC, PVT_FMT(target(), "dropping collect call at doChannelAnswer"));
-                command(KHOMP_LOG, CM_DROP_COLLECT_CALL);
-            }
-        }
-
-        ret = KhompPvtE1::doChannelAnswer(cmd);
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtR2::doChannelHangup(CommandRequest &cmd)
-{
-    DBG(FUNC, PVT_FMT(_target, "(R2) c"));
-
-    bool answered     = true;
-    bool disconnected = false;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (call()->_flags.check(Kflags::IS_INCOMING))
-        {
-            DBG(FUNC,PVT_FMT(_target, "disconnecting incoming channel"));
-
-            //disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-        }
-        else if (call()->_flags.check(Kflags::IS_OUTGOING))
-        {
-            if(call()->_cleanup_upon_hangup)
-            {
-                DBG(FUNC,PVT_FMT(_target, "disconnecting not allocated outgoing channel..."));
-
-                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-                cleanup(KhompPvt::CLN_HARD);
-                answered = false;
-
-            }
-            else
-            {
-                DBG(FUNC,PVT_FMT(_target, "disconnecting outgoing channel..."));
-
-                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-            }
-        }
-        else
-        {
-            DBG(FUNC,PVT_FMT(_target, "already disconnected"));
-            return true;
-        }
-
-        if(answered)
-        {
-            indicateBusyUnlocked(SWITCH_CAUSE_USER_BUSY, disconnected);
-        }
-
-        if (call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::NEEDS_RINGBACK_CMD))
-        {
-            DBG(FUNC,PVT_FMT(_target, "disconnecting incoming channel..."));
-            disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-        }
-
-        stopStream();
-
-        stopListen();
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(R2) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-
-    DBG(FUNC, PVT_FMT(_target, "(R2) r"));
-    return true;
-}
-
-int BoardE1::KhompPvtISDN::causeFromCallFail(int fail)
-{
-    int switch_cause = SWITCH_CAUSE_USER_BUSY;
-
-    if (fail <= 127)
-        switch_cause = fail;
-    else
-        switch_cause = SWITCH_CAUSE_INTERWORKING;
-
-    return switch_cause;
-}
-
-void BoardE1::KhompPvtR2::reportFailToReceive(int fail_code)
-{
-    KhompPvt::reportFailToReceive(fail_code);
-
-    if (Opt::_options._r2_strict_behaviour()&& fail_code != -1)
-    {
-        DBG(FUNC,PVT_FMT(_target, "sending a 'unknown number' message/audio"));
-
-        if(sendRingBackStatus(fail_code) == RingbackDefs::RBST_UNSUPPORTED)
-        {
-            sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
-            startCadence(PLAY_FASTBUSY);
-        }
-    }
-    else
-    {
-        DBG(FUNC, PVT_FMT(_target, "sending fast busy audio directly"));
-
-        sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
-        startCadence(PLAY_FASTBUSY);
-    }
-}
-
-int BoardE1::KhompPvtR2::causeFromCallFail(int fail)
-{
-    int switch_cause = SWITCH_CAUSE_USER_BUSY;
-
-    try
-    {
-        bool handled = false;
-
-        switch (_r2_country)
-        {
-            case Verbose::R2_COUNTRY_ARG:
-                switch (fail)
-                {
-                    case kgbArBusy:
-                        switch_cause = SWITCH_CAUSE_USER_BUSY;
-                        break;
-                    case kgbArNumberChanged:
-                        switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
-                        break;
-                    case kgbArCongestion:
-                        switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-                        break;
-                    case kgbArInvalidNumber:
-                        switch_cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
-                        break;
-                    case kgbArLineOutOfOrder:
-                        switch_cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL;
-                        break;
-                }
-                handled = true;
-                break;
-
-            case Verbose::R2_COUNTRY_BRA:
-                switch (fail)
-                {
-                    case kgbBrBusy:
-                        switch_cause = SWITCH_CAUSE_USER_BUSY;
-                        break;
-                    case kgbBrNumberChanged:
-                        switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
-                        break;
-                    case kgbBrCongestion:
-                        switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-                        break;
-                    case kgbBrInvalidNumber:
-                        switch_cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
-                        break;
-                    case kgbBrLineOutOfOrder:
-                        switch_cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL;
-                        break;
-                }
-                handled = true;
-                break;
-            case Verbose::R2_COUNTRY_CHI:
-                    switch (fail)
-                    {
-                        case kgbClBusy:
-                            switch_cause = SWITCH_CAUSE_USER_BUSY;
-                            break;
-                        case kgbClNumberChanged:
-                            switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
-                            break;
-                        case kgbClCongestion:
-                            switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-                            break;
-                        case kgbClInvalidNumber:
-                            switch_cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
-                            break;
-                        case kgbClLineOutOfOrder:
-                            switch_cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL;
-                            break;
-                    }
-                handled = true;
-                break;
-
-            case Verbose::R2_COUNTRY_MEX:
-                switch (fail)
-                {
-                    case kgbMxBusy:
-                        switch_cause = SWITCH_CAUSE_USER_BUSY;
-                        break;
-                }
-                handled = true;
-                break;
-
-            case Verbose::R2_COUNTRY_URY:
-                switch (fail)
-                {
-                    case kgbUyBusy:
-                        switch_cause = SWITCH_CAUSE_USER_BUSY;
-                        break;
-                    case kgbUyNumberChanged:
-                        switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
-                        break;
-                    case kgbUyCongestion:
-                        switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-                        break;
-                    case kgbUyInvalidNumber:
-                        switch_cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
-                        break;
-                    case kgbUyLineOutOfOrder:
-                        switch_cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL;
-                        break;
-                }
-                handled = true;
-                break;
-            case Verbose::R2_COUNTRY_VEN:
-                switch (fail)
-                {
-                    case kgbVeBusy:
-                        switch_cause = SWITCH_CAUSE_USER_BUSY;
-                        break;
-                    case kgbVeNumberChanged:
-                        switch_cause = SWITCH_CAUSE_NUMBER_CHANGED;
-                        break;
-                    case kgbVeCongestion:
-                        switch_cause = SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-                        break;
-                    case kgbVeLineBlocked:
-                        switch_cause = SWITCH_CAUSE_OUTGOING_CALL_BARRED;
-                        break;
-                }
-                handled = true;
-                break;
-        }
-
-        if (!handled)
-            throw std::runtime_error("");
-    }
-    catch (...)
-    {
-        LOG(ERROR,
-                PVT_FMT(_target, "country signaling not found, unable to report R2 hangup code.."));
-    }
-
-    return switch_cause;
-
-}
-
-int BoardE1::KhompPvtR2::callFailFromCause(int cause)
-{
-    int k3l_fail = -1; // default
-
-    try
-    {
-        bool handled = false;
-
-        switch (_r2_country)
-        {
-            case Verbose::R2_COUNTRY_ARG:
-                switch (cause)
-                {
-                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
-                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
-                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
-                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
-                    case SWITCH_CAUSE_INVALID_GATEWAY:
-                    case SWITCH_CAUSE_INVALID_URL:
-                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
-                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
-
-                    case SWITCH_CAUSE_INCOMING_CALL_BARRED: /* ?? */
-                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED: /* ?? */
-                        k3l_fail = kgbArInvalidNumber;
-                        break;
-
-                    case SWITCH_CAUSE_USER_BUSY:
-                    case SWITCH_CAUSE_NO_USER_RESPONSE:
-                    case SWITCH_CAUSE_CALL_REJECTED:
-                        k3l_fail = kgbArBusy;
-                        break;
-
-                    case SWITCH_CAUSE_NUMBER_CHANGED:
-                        k3l_fail = kgbArNumberChanged;
-                        break;
-
-                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
-                    case SWITCH_CAUSE_SWITCH_CONGESTION:
-
-                    case SWITCH_CAUSE_NORMAL_CLEARING:
-                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
-                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
-                        // this preserves semantics..
-                        k3l_fail = kgbArCongestion;
-                        break;
-
-                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
-                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
-                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_INVALID_PROFILE:
-                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_GATEWAY_DOWN:
-                    case SWITCH_CAUSE_FACILITY_REJECTED:
-                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
-                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
-                    default:
-                        k3l_fail = kgbArLineOutOfOrder;
-                        break;
-                }
-                handled = true;
-                break;
-
-            case Verbose::R2_COUNTRY_BRA:
-                switch (cause)
-                {
-                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
-                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
-                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
-                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
-                    case SWITCH_CAUSE_INVALID_GATEWAY:
-                    case SWITCH_CAUSE_INVALID_URL:
-                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
-                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
-
-                    case SWITCH_CAUSE_INCOMING_CALL_BARRED: /* ?? */
-                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED: /* ?? */
-                        k3l_fail = kgbBrInvalidNumber;
-                        break;
-
-                    case SWITCH_CAUSE_USER_BUSY:
-                    case SWITCH_CAUSE_NO_USER_RESPONSE:
-                    case SWITCH_CAUSE_CALL_REJECTED:
-                        k3l_fail = kgbBrBusy;
-                        break;
-
-                    case SWITCH_CAUSE_NUMBER_CHANGED:
-                        k3l_fail = kgbBrNumberChanged;
-                        break;
-
-                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
-                    case SWITCH_CAUSE_SWITCH_CONGESTION:
-
-                    case SWITCH_CAUSE_NORMAL_CLEARING:
-                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
-                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
-                        // this preserves semantics..
-                        k3l_fail = kgbBrCongestion;
-                        break;
-
-                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
-                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
-                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_GATEWAY_DOWN:
-                    case SWITCH_CAUSE_FACILITY_REJECTED:
-                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
-                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
-                    default:
-                        k3l_fail = kgbBrLineOutOfOrder;
-                        break;
-                }
-                handled = true;
-                break;
-
-            case Verbose::R2_COUNTRY_CHI:
-                switch (cause)
-                {
-                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
-                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
-                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
-                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
-                    case SWITCH_CAUSE_INVALID_GATEWAY:
-                    case SWITCH_CAUSE_INVALID_URL:
-                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
-                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
-
-                    case SWITCH_CAUSE_INCOMING_CALL_BARRED: /* ?? */
-                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED: /* ?? */
-                        k3l_fail = kgbClInvalidNumber;
-                        break;
-
-                    case SWITCH_CAUSE_USER_BUSY:
-                    case SWITCH_CAUSE_NO_USER_RESPONSE:
-                    case SWITCH_CAUSE_CALL_REJECTED:
-                        k3l_fail = kgbClBusy;
-                        break;
-
-                    case SWITCH_CAUSE_NUMBER_CHANGED:
-                        k3l_fail = kgbClNumberChanged;
-                        break;
-
-                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
-                    case SWITCH_CAUSE_SWITCH_CONGESTION:
-
-                    case SWITCH_CAUSE_NORMAL_CLEARING:
-                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
-                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
-                        // this preserves semantics..
-                        k3l_fail = kgbClCongestion;
-                        break;
-
-                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
-                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
-                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_GATEWAY_DOWN:
-                    case SWITCH_CAUSE_FACILITY_REJECTED:
-                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
-                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
-                    default:
-                        k3l_fail = kgbClLineOutOfOrder;
-                        break;
-                }
-                handled = true;
-                break;
-
-
-            case Verbose::R2_COUNTRY_MEX:
-                k3l_fail = kgbMxBusy;
-                handled = true;
-                break;
-
-
-            case Verbose::R2_COUNTRY_URY:
-                switch (cause)
-                {
-                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
-                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
-                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
-                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
-                    case SWITCH_CAUSE_INVALID_GATEWAY:
-                    case SWITCH_CAUSE_INVALID_URL:
-                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
-                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
-
-                    case SWITCH_CAUSE_INCOMING_CALL_BARRED: /* ?? */
-                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED: /* ?? */
-                        k3l_fail = kgbUyInvalidNumber;
-                        break;
-
-                    case SWITCH_CAUSE_USER_BUSY:
-                    case SWITCH_CAUSE_NO_USER_RESPONSE:
-                    case SWITCH_CAUSE_CALL_REJECTED:
-                        k3l_fail = kgbUyBusy;
-                        break;
-
-                    case SWITCH_CAUSE_NUMBER_CHANGED:
-                        k3l_fail = kgbUyNumberChanged;
-                        break;
-
-                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
-                    case SWITCH_CAUSE_SWITCH_CONGESTION:
-
-                    case SWITCH_CAUSE_NORMAL_CLEARING:
-                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
-                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
-                        // this preserves semantics..
-                        k3l_fail = kgbUyCongestion;
-                        break;
-
-                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
-                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
-                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_GATEWAY_DOWN:
-                    case SWITCH_CAUSE_FACILITY_REJECTED:
-                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
-                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
-                    default:
-                        k3l_fail = kgbUyLineOutOfOrder;
-                        break;
-                }
-                handled = true;
-                break;
-
-
-            case Verbose::R2_COUNTRY_VEN:
-                switch (cause)
-                {
-                    case SWITCH_CAUSE_INCOMING_CALL_BARRED:
-                    case SWITCH_CAUSE_OUTGOING_CALL_BARRED:
-                        k3l_fail = kgbVeLineBlocked;
-                        break;
-
-                    case SWITCH_CAUSE_NUMBER_CHANGED:
-                        k3l_fail = kgbVeNumberChanged;
-                        break;
-
-                    case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
-                    case SWITCH_CAUSE_SWITCH_CONGESTION:
-
-                    case SWITCH_CAUSE_NORMAL_CLEARING:
-                    case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
-                    case SWITCH_CAUSE_CALL_AWARDED_DELIVERED: /* ?? */
-                        // this preserves semantics..
-                        k3l_fail = kgbVeCongestion;
-                        break;
-
-                    case SWITCH_CAUSE_UNALLOCATED_NUMBER:
-                    case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
-                    case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
-                    case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
-                    case SWITCH_CAUSE_INVALID_GATEWAY:
-                    case SWITCH_CAUSE_INVALID_URL:
-                    case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
-                    case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
-
-                    case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
-                    case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
-                    case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
-                    case SWITCH_CAUSE_GATEWAY_DOWN:
-                    case SWITCH_CAUSE_FACILITY_REJECTED:
-                    case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
-                    case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
-
-                    case SWITCH_CAUSE_USER_BUSY:
-                    case SWITCH_CAUSE_NO_USER_RESPONSE:
-                    case SWITCH_CAUSE_CALL_REJECTED:
-                    default:
-                        k3l_fail = kgbVeBusy;
-                        break;
-                }
-
-                handled = true;
-                break;
-
-        }
-
-        if (!handled)
-            throw std::runtime_error("");
-    }
-    catch(...)
-    {
-        LOG(ERROR,PVT_FMT(_target, "country signaling not found, unable to report R2 hangup code."));
-    }
-
-    return k3l_fail;
-}
-
-int BoardE1::KhompPvtISDN::callFailFromCause(int cause)
-{
-    int k3l_fail = -1; // default
-
-    if (cause <= 127)
-        k3l_fail = cause;
-    else
-        k3l_fail = kq931cInterworking;
-
-    return k3l_fail;
-}
-
-RingbackDefs::RingbackStType BoardE1::KhompPvtR2::sendRingBackStatus(int rb_value)
-{
-    DBG(FUNC,PVT_FMT(_target, "(p=%p) this is the r2 ringback procedure") % this);
-
-    std::string cause = (rb_value == -1 ? "" : STG(FMT("r2_cond_b=\"%d\"") % rb_value));
-    return (command(KHOMP_LOG, CM_RINGBACK, cause.c_str()) ?
-            RingbackDefs::RBST_SUCCESS : RingbackDefs::RBST_FAILURE);
-}
-
-bool BoardE1::KhompPvtR2::sendPreAudio(int rb_value)
-{
-    DBG(FUNC,PVT_FMT(_target, "must send R2 preaudio ?"));
-    if(!KhompPvtE1::sendPreAudio(rb_value))
-        return false;
-
-
-    DBG(FUNC,PVT_FMT(_target, "doing the R2 pre_connect wait..."));
-
-    /* wait some ms, just to be sure the command has been sent. */
-    usleep(Opt::_options._r2_preconnect_wait()* 1000);
-
-    if (call()->_flags.check(Kflags::HAS_PRE_AUDIO))
-    {
-        DBG(FUNC, PVT_FMT(target(), "(p=%p) already pre_connect") % this);
-        return true;
-    }
-    else
-    {
-        bool result = command(KHOMP_LOG, CM_PRE_CONNECT);
-
-        if (result)
-            call()->_flags.set(Kflags::HAS_PRE_AUDIO);
-
-        return result;
-    }
-}
-
-void BoardE1::KhompPvtR2::numberDialTimer(Board::KhompPvt * pvt)
-{
-    try
-    {
-        ScopedPvtLock lock(pvt);
-
-        if (!pvt->call()->_flags.check(Kflags::NUMBER_DIAL_ONGOING) ||
-             pvt->call()->_flags.check(Kflags::NUMBER_DIAL_FINISHD))
-        {
-            return;
-        }
-
-        pvt->call()->_flags.set(Kflags::NUMBER_DIAL_FINISHD);
-
-        static_cast<BoardE1::KhompPvtR2*>(pvt)->callR2()->_incoming_exten.clear();
-        pvt->command(KHOMP_LOG, CM_END_OF_NUMBER);
-    }
-    catch (...)
-    {
-        // TODO: log something.
-    }
-}
-
-bool BoardE1::KhompPvtR2::indicateRinging()
-{
-    DBG(FUNC, PVT_FMT(_target, "(R2) c"));
-
-    bool ret = false;
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        /* already playing! */
-        if (call()->_indication != INDICA_NONE)
-        {
-            DBG(FUNC, PVT_FMT(_target, "(R2) r (already playing something: %d)") % call()->_indication);
-            return false;
-        }
-
-        // any collect calls ?
-        setCollectCall();
-
-        call()->_indication = INDICA_RING;
-
-        bool send_ringback = true;
-
-        if (!call()->_flags.check(Kflags::CONNECTED))
-        {
-            int ringback_value = RingbackDefs::RB_SEND_DEFAULT;
-
-            bool do_drop_call = Opt::_options._drop_collect_call()
-                                        || call()->_flags.check(Kflags::DROP_COLLECT);
-
-            if (do_drop_call && call()->_collect_call)
-            {
-                ringback_value = kgbBusy;
-                DBG(FUNC, PVT_FMT(_target, "ringback value adjusted to refuse collect call: %d") % ringback_value);
-            }
-
-            const char *condition_string = getFSChannelVar("KR2SendCondition");
-
-            try
-            {
-                if (condition_string)
-                {
-                    ringback_value = Strings::toulong(condition_string);
-                    DBG(FUNC, PVT_FMT(_target, "KR2SendCondition adjusted ringback value to %d") % ringback_value);
-                }
-            }
-            catch (Strings::invalid_value e)
-            {
-                LOG(ERROR, PVT_FMT(_target, "invalid value '%s', adjusted in KR2SendCondition: not a valid number.")
-                        % condition_string);
-            }
-
-            if (Opt::_options._r2_strict_behaviour())
-            {
-                /* send ringback too? */
-                send_ringback = sendPreAudio(ringback_value);
-
-                if (!send_ringback)
-                {
-                    /* warn the developer which may be debugging some "i do not have ringback!" issue. */
-                    DBG(FUNC, PVT_FMT(_target, "not sending pre connection audio"));
-                }
-
-                call()->_flags.clear(Kflags::NEEDS_RINGBACK_CMD);
-            }
-
-        }
-
-        if (send_ringback)
-        {
-            DBG(FUNC, PVT_FMT(_target, "Send ringback!"));
-
-            call()->_flags.set(Kflags::GEN_CO_RING);
-            call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_co_delay(), &Board::KhompPvt::coRingGen,this);
-
-            /* start grabbing audio */
-            startListen();
-
-            /* start stream if it is not already */
-            startStream();
-
-            ret = true;
-        }
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(R2) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "(R2) r (%s)") % err._msg.c_str());
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(R2) r (unable to get device: %d!)") % err.device);
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(R2) r"));
-    return ret;
-}
-
-bool BoardE1::KhompPvtR2::onNewCall(K3L_EVENT *e)
-{
-    DBG(FUNC,PVT_FMT(_target, "(R2) c"));
-
-    std::string r2_categ_a;
-
-    int status = Globals::k3lapi.get_param(e, "r2_categ_a", r2_categ_a);
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (status == ksSuccess && !r2_categ_a.empty())
-        {
-
-            try
-            {
-                callR2()->_r2_category = Strings::toulong(r2_categ_a);
-            }
-            catch (Strings::invalid_value e)
-            {
-                /* do nothing */
-            };
-
-            /* channel will know if is a collect call or not */
-            if (callR2()->_r2_category == kg2CollectCall)
-            {
-                call()->_collect_call = true;
-            }
-        }
-
-        bool ret = KhompPvtE1::onNewCall(e);
-
-        if(!ret)
-            return false;
-
-        if (!Opt::_options._r2_strict_behaviour())
-        {
-            bool do_drop_collect = Opt::_options._drop_collect_call();
-            const char* drop_str = getFSGlobalVar("KDropCollectCall");
-
-            if(checkTrueString(drop_str))
-            {
-                do_drop_collect = true;
-                call()->_flags.set(Kflags::DROP_COLLECT);
-                DBG(FUNC,PVT_FMT(_target, "Setting DROP_COLLECT flag"));
-            }
-
-            freeFSGlobalVar(&drop_str);
-
-            // keeping the hardcore mode
-            if (do_drop_collect && call()->_collect_call)
-            {
-                // kill, kill, kill!!!
-                DBG(FUNC,PVT_FMT(_target, "dropping collect call at onNewCall"));
-                sendRingBackStatus(callFailFromCause(SWITCH_CAUSE_CALL_REJECTED));
-                usleep(75000);
-            }
-            else
-            {
-                // send ringback too!
-                sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
-                startStream();
-            }
-        }
-        else
-        {
-            _call->_flags.set(Kflags::NEEDS_RINGBACK_CMD);
-        }
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(R2) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC,PVT_FMT(_target, "(R2) r"));
-
-    return true;
-}
-
-bool BoardE1::KhompPvtR2::onCallSuccess(K3L_EVENT *e)
-{
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if(e->AddInfo > 0)
-        {
-            callR2()->_r2_condition = e->AddInfo;
-            setFSChannelVar("KR2GotCondition", Verbose::signGroupB((KSignGroupB)callR2()->_r2_condition).c_str());
-        }
-
-        KhompPvtE1::onCallSuccess(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str());
-        return false;
-    }
-
-    return true;
-}
-
-bool BoardE1::KhompPvtR2::onCallFail(K3L_EVENT *e)
-{
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if(e->AddInfo > 0)
-        {
-            callR2()->_r2_condition = e->AddInfo;
-            setFSChannelVar("KR2GotCondition", Verbose::signGroupB((KSignGroupB)callR2()->_r2_condition).c_str());
-        }
-
-        setHangupCause(causeFromCallFail(e->AddInfo),true);
-
-        ret = KhompPvtE1::onCallFail(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "%s") % err._msg.c_str());
-        return false;
-    }
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtR2::onNumberDetected(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(digit=%d) c") % e->AddInfo);
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (call()->_flags.check(Kflags::NUMBER_DIAL_FINISHD))
-            return false;
-
-        if (!call()->_flags.check(Kflags::NUMBER_DIAL_ONGOING))
-        {
-            DBG(FUNC, PVT_FMT(_target, "incoming number start..."));
-
-            call()->_flags.set(Kflags::NUMBER_DIAL_ONGOING);
-            callR2()->_incoming_exten.clear();
-
-            callR2()->_idx_number_dial = Board::board(_target.device)->_timers.add(4000,
-                &BoardE1::KhompPvtR2::numberDialTimer, this, TM_VAL_CALL);
-        }
-        else
-        {
-            Board::board(_target.device)->_timers.restart(callR2()->_idx_number_dial);
-        }
-
-        callR2()->_incoming_exten += e->AddInfo;
-
-        DBG(FUNC, PVT_FMT(_target, "incoming exten %s") % callR2()->_incoming_exten);
-
-        /* begin context adjusting + processing */
-        MatchExtension::ContextListType contexts;
-
-        validContexts(contexts);
-
-        /* temporary */
-        std::string tmp_exten;
-        std::string tmp_context;
-        std::string tmp_orig("");
-
-        switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, callR2()->_incoming_exten,tmp_orig, false, false))
-        {
-            case MatchExtension::MATCH_EXACT:
-            case MatchExtension::MATCH_NONE:
-                call()->_flags.set(Kflags::NUMBER_DIAL_FINISHD);
-
-                DBG(FUNC,FMT("incoming exten matched: %s") % callR2()->_incoming_exten);
-
-                callR2()->_incoming_exten.clear();
-                command(KHOMP_LOG,CM_END_OF_NUMBER);
-                break;
-
-            case MatchExtension::MATCH_MORE:
-                DBG(FUNC, "didn't match exact extension, waiting...");
-                // cannot say anything exact about the number, do nothing...
-                break;
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
-        return false;
-    }
-
-    return true;
-}
-
-bool BoardE1::KhompPvtFlash::application(ApplicationType type, switch_core_session_t * session, const char *data)
-{
-    switch(type)
-    {
-        case USER_TRANSFER:
-            return _transfer->userTransfer(session, data);
-        default:
-            return KhompPvtR2::application(type, session, data);
-    }
-
-    return true;
-}
-
-bool BoardE1::KhompPvtFlash::sendDtmf(std::string digit)
-{
-    if(_transfer->checkUserXferUnlocked(digit))
-    {
-        DBG(FUNC, PVT_FMT(target(), "started (or waiting for) an user xfer"));
-        return true;
-    }
-
-    bool ret = KhompPvtR2::sendDtmf(callFlash()->_digits_buffer);
-
-    callFlash()->_digits_buffer.clear();
-
-    return ret;
-}
-
-OrigToNseqMapType BoardE1::KhompPvtFXS::generateNseqMap()
-{
-    OrigToNseqMapType fxs_nseq; /* sequence numbers on FXS */
-
-    fxs_nseq.insert(OrigToNseqPairType("", 0)); /* global sequence */
-
-    for (BoardToOrigMapType::iterator i = Opt::_fxs_orig_base.begin(); i != Opt::_fxs_orig_base.end(); i++)
-    {
-        fxs_nseq.insert(OrigToNseqPairType((*i).second, 0));
-    }
-
-    return fxs_nseq;
-}
-
-
-void BoardE1::KhompPvtFXS::load(OrigToNseqMapType & fxs_nseq)
-{
-    BoardToOrigMapType::iterator it1 = Opt::_fxs_orig_base.find(_target.device);
-    OrigToNseqMapType::iterator  it2;
-
-    std::string orig_base("invalid"); /* will have orig base */
-
-    if (it1 == Opt::_fxs_orig_base.end())
-    {
-        it2 = fxs_nseq.find("");
-        orig_base = Opt::_options._fxs_global_orig_base();
-    }
-    else
-    {
-        it2 = fxs_nseq.find((*it1).second);
-        orig_base = (*it1).second;
-    }
-
-    if (it2 == fxs_nseq.end())
-    {
-        LOG(ERROR, PVT_FMT(_target, "could not find sequence number for FXS channel"));
-
-        /* Ok, load the default options */
-        loadOptions();
-    }
-    else
-    {
-        try
-        {
-            /* generate orig_addr, padding to the original size (adding zeros at left) */
-            _fxs_fisical_addr = padOrig(orig_base, (*it2).second);
-
-            /* Set this branch options to get right callerid before mapping */
-            loadOptions();
-
-            /* makes a "reverse mapping" for Dial using 'r' identifiers */
-            Opt::_fxs_branch_map.insert(BranchToObjectPairType(_fxs_orig_addr,
-                ObjectIdType(_target.device, _target.object)));
-
-            /* increment sequence number */
-            ++((*it2).second);
-        }
-        catch (Strings::invalid_value e)
-        {
-            LOG(ERROR, PVT_FMT(_target, "expected an integer, got string '%s'")
-                % e.value() );
-        }
-    }
-}
-
-void BoardE1::KhompPvtFXS::loadOptions()
-{
-    /* the fxs_orig_addr can be reset on parse_branch_options */
-    _fxs_orig_addr = _fxs_fisical_addr;
-
-    /* Initialize fxs default options */
-    _calleridname.clear();
-    //_amaflags = Opt::_amaflags;
-    _callgroup = Opt::_options._callgroup();
-    _pickupgroup = Opt::_options._pickupgroup();
-    _context.clear();
-    _input_volume = Opt::_options._input_volume();
-    _output_volume = Opt::_options._output_volume();
-    _mailbox.clear();
-    _flash = Opt::_options._flash();
-
-    BranchToOptMapType::iterator it3 = Opt::_branch_options.find(_fxs_orig_addr);
-
-    if (it3 != Opt::_branch_options.end())
-    {
-        parseBranchOptions(it3->second);
-    }
-
-    //TODO: Implementar o setVolume para levar em consideracao que o
-    //       padrao pode ser o da FXS
-    if (_input_volume != Opt::_options._input_volume())
-        setVolume("input", _input_volume);
-    if (_output_volume != Opt::_options._output_volume())
-        setVolume("output", _output_volume);
-}
-
-bool BoardE1::KhompPvtFXS::parseBranchOptions(std::string options_str)
-{
-    Strings::vector_type options;
-    Strings::tokenize(options_str, options, "|/");
-
-    if (options.size() < 1)
-    {
-        DBG(FUNC, PVT_FMT(_target, "[fxs-options] no options are set for branch %s.") %
-                _fxs_orig_addr.c_str());
-        return false;
-    }
-
-    try
-    {
-        for (Strings::vector_type::iterator it = options.begin(); it != options.end(); it++)
-        {
-            Strings::vector_type par;
-            Strings::tokenize(Strings::trim(*it), par, ":");
-
-            if ( par.size() != 2 )
-            {
-                LOG(WARNING, PVT_FMT(_target, "[fxs-options] error on parsing options for branch %s.") % _fxs_orig_addr.c_str());
-                return false;
-            }
-
-            std::string opt_name = Strings::trim(par.at(0));
-            std::string opt_value = Strings::trim(par.at(1));
-
-            if (opt_name == "pickupgroup")
-            {
-               _pickupgroup = opt_value;//ast_get_group(opt_value.c_str());
-            }
-            else if (opt_name == "callgroup")
-            {
-               _callgroup = opt_value;//ast_get_group(opt_value.c_str());
-            }
-            /*
-               else if (opt_name == "amaflags")
-               {
-               int amaflags = ast_cdr_amaflags2int(opt_value.c_str());
-
-               if (amaflags < 0)
-               DBG(FUNC, PVT_FMT(_target, "[fxs-options] invalid AMA flags on branch %s.") % _fxs_orig_addr.c_str());
-               else
-               _amaflags = amaflags;
-               }
-            */
-            else if (opt_name == "context")
-            {
-                _context = opt_value;
-            }
-            else if (opt_name == "input-volume")
-            {
-                long long volume = Strings::tolong(opt_value);
-
-                if ( (volume < -10) || (volume > 10) )
-                {
-                    DBG(FUNC, PVT_FMT(_target, "[fxs-options] input-volume on branch %s.") % _fxs_orig_addr.c_str());
-                }
-                else
-                {
-                    _input_volume = volume;
-                }
-            }
-            else if (opt_name == "output-volume")
-            {
-                long long volume = Strings::tolong(opt_value);
-
-                if ( (volume < -10) || (volume > 10) )
-                {
-                    DBG(FUNC, PVT_FMT(_target, "[fxs-options] ouput-volume on branch %s.") % _fxs_orig_addr.c_str());
-                }
-                else
-                {
-                    _output_volume = volume;
-                }
-            }
-            else if (opt_name == "language")
-            {
-                _language = opt_value;
-            }
-            else if (opt_name == "mohclass")
-            {
-                _mohclass = opt_value;
-            }
-            else if (opt_name == "accountcode")
-            {
-                _accountcode = opt_value;
-            }
-            else if (opt_name == "calleridnum") // conscious ultra chuncho!
-            {
-                BranchToOptMapType::iterator it3 = Opt::_branch_options.find(_fxs_orig_addr);
-
-                if (it3 != Opt::_branch_options.end())
-                {
-                    Opt::_branch_options.insert(BranchToOptPairType(opt_value, it3->second));
-
-                    Opt::_branch_options.erase(it3);
-                }
-
-                _fxs_orig_addr = opt_value;
-            }
-            else if (opt_name == "calleridname")
-            {
-                _calleridname = opt_value;
-            }
-            else if (opt_name == "mailbox")
-            {
-                _mailbox = opt_value;
-            }
-            else if (opt_name == "flash-to-digits")
-            {
-                _flash = opt_value;
-            }
-            else
-            {
-                DBG(FUNC, PVT_FMT(_target, "[fxs-options] invalid option on branch %s: \"%s\".") % _fxs_orig_addr.c_str() % opt_name.c_str());
-            }
-        }
-    }
-    catch (Strings::invalid_value e)
-    {
-        LOG(WARNING, PVT_FMT(_target, "[fxs-options] number expected on Khomp configuration file, got '%s'.") % e.value().c_str());
-        return false;
-    }
-
-    return true;
-}
-
-bool BoardE1::KhompPvtFXS::alloc()
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
-
-    callFXS()->_flags.set(Kflags::FXS_DIAL_FINISHD);
-
-    if(justStart(/*need_context*/) != SWITCH_STATUS_SUCCESS)
-    {
-        int fail_code = callFailFromCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
-        setHangupCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
-        cleanup(CLN_FAIL);
-        reportFailToReceive(fail_code);
-        LOG(ERROR, PVT_FMT(target(), "(FXS) r (Initilization Error on start!)"));
-        return false;
-    }
-
-    startListen();
-    startStream();
-
-    /* do this procedures early (as audio is already being heard) */
-    dtmfSuppression(Opt::_options._out_of_band_dtmfs() && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
-    echoCancellation(Opt::_options._echo_canceller() && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
-    autoGainControl(Opt::_options._auto_gain_control() && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
-
-    //TODO: NEED RECORD HERE !?
-    /* if it does not need context, probably it's a pickupcall and will
-       not pass throw setup_connection, so we start recording here*/
-    //if (!need_context && K::opt::recording && !pvt->is_recording)
-    //startRecord();
-
-    DBG(FUNC, "(FXS) r");
-    return true;
-}
-
-bool BoardE1::KhompPvtFXS::onSeizureStart(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        /* we always have audio */
-        call()->_flags.set(Kflags::HAS_PRE_AUDIO);
-
-        ret = KhompPvt::onSeizureStart(e);
-
-        if (justAlloc(true) != SWITCH_STATUS_SUCCESS)
-        {
-            int fail_code = callFailFromCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
-            setHangupCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
-            cleanup(CLN_FAIL);
-            reportFailToReceive(fail_code);
-            LOG(ERROR,PVT_FMT(_target, "(FXS) r (Initilization Error on alloc!)"));
-            return false;
-        }
-
-        /* disable to avoid problems with DTMF detection */
-        echoCancellation(false);
-        autoGainControl(false);
-
-        call()->_orig_addr = _fxs_orig_addr;
-
-        OrigToDestMapType::iterator i = Opt::_fxs_hotline.find(_fxs_orig_addr);
-
-        if (i != Opt::_fxs_hotline.end())
-        {
-            /* make it burn! */
-            call()->_dest_addr = (*i).second;
-            alloc();
-        }
-        else
-        {
-            /* normal line */
-            if (!_mailbox.empty() /*&& (ast_app_has_voicemail(pvt->fxs_opt.mailbox.c_str(), NULL) == 1)*/)
-                startCadence(PLAY_VM_TONE);
-            else
-                startCadence(PLAY_PBX_TONE);
-
-            call()->_flags.clear(Kflags::FXS_DIAL_ONGOING);
-            call()->_flags.set(Kflags::FXS_OFFHOOK);
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtFXS::onCallSuccess(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
-
-    bool ret;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        ret = KhompPvt::onCallSuccess(e);
-
-        if (call()->_pre_answer)
-        {
-            dtmfSuppression(Opt::_options._out_of_band_dtmfs());
-
-            startListen();
-            startStream();
-            switch_channel_mark_pre_answered(getFSChannel());
-        }
-        else
-        {
-            call()->_flags.set(Kflags::GEN_PBX_RING);
-            call()->_idx_pbx_ring = Board::board(_target.device)->_timers.add(
-                    Opt::_options._ringback_pbx_delay(),
-                    &Board::KhompPvt::pbxRingGen,
-                    this,
-                    TM_VAL_CALL);
-        }
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to get device: %d!)") % err.device);
-        return false;
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(FXS) r (%s)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
-
-    return ret;
-}
-
-void BoardE1::KhompPvtFXS::dialTimer(KhompPvt * pvt)
-{
-    DBG(FUNC, PVT_FMT(pvt->target(), "FXS Dial timer"));
-
-    try
-    {
-        ScopedPvtLock lock(pvt);
-
-        KhompPvtFXS * pvt_fxs = static_cast<BoardE1::KhompPvtFXS*>(pvt);
-
-        if(!pvt_fxs->callFXS()->_flags.check(Kflags::FXS_DIAL_ONGOING)
-            || pvt_fxs->callFXS()->_flags.check(Kflags::FXS_DIAL_FINISHD))
-            return;
-
-        pvt_fxs->call()->_dest_addr = pvt_fxs->callFXS()->_incoming_exten;
-        pvt_fxs->alloc();
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock %s!") % err._msg.c_str());
-    }
-
-}
-
-/*
-void BoardE1::KhompPvtFXS::transferTimer(KhompPvt * pvt)
-{
-    DBG(FUNC, PVT_FMT(pvt->target(), "c"));
-
-    try
-    {
-        ScopedPvtLock lock(pvt);
-
-        KhompPvtFXS * pvt_fxs = static_cast<BoardE1::KhompPvtFXS*>(pvt);
-
-        if(!pvt_fxs->callFXS()->_flags.check(Kflags::FXS_FLASH_TRANSFER))
-        {
-            DBG(FUNC, PVT_FMT(pvt->target(), "r (Flag not set)"));
-            return;
-        }
-
-        pvt_fxs->callFXS()->_flags.clear(Kflags::FXS_FLASH_TRANSFER);
-
-        if(pvt_fxs->callFXS()->_flash_transfer.empty())
-        {
-            DBG(FUNC, PVT_FMT(pvt->target(), "r (Number is empty)"));
-
-            if(!pvt_fxs->stopTransfer())
-            {
-                pvt_fxs->cleanup(KhompPvt::CLN_HARD);
-                DBG(FUNC, PVT_FMT(pvt_fxs->target(), "r (unable to stop transfer)"));
-                return;
-            }
-
-            return;
-        }
-
-        // begin context adjusting + processing
-        MatchExtension::ContextListType contexts;
-
-        pvt_fxs->validContexts(contexts);
-
-        std::string tmp_exten;
-        std::string tmp_context;
-
-        switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, pvt_fxs->callFXS()->_flash_transfer, pvt_fxs->call()->_orig_addr, false, false))
-        {
-            case MatchExtension::MATCH_EXACT:
-            case MatchExtension::MATCH_MORE:
-            {
-                pvt_fxs->callFXS()->_flash_transfer = tmp_exten;
-                DBG(FUNC,FMT("incoming exten matched: %s") % pvt_fxs->callFXS()->_flash_transfer);
-
-                if(!pvt_fxs->transfer(tmp_context))
-                {
-                    pvt_fxs->cleanup(KhompPvt::CLN_HARD);
-                    DBG(FUNC, PVT_FMT(pvt_fxs->target(), "r (unable to transfer)"));
-                    return;
-                }
-
-                break;
-            }
-            case MatchExtension::MATCH_NONE:
-            {
-                DBG(FUNC, PVT_FMT(pvt_fxs->target(), "match none!"));
-
-                if(!pvt_fxs->stopTransfer())
-                {
-                    pvt_fxs->cleanup(KhompPvt::CLN_HARD);
-                    DBG(FUNC, PVT_FMT(pvt_fxs->target(), "r (unable to stop transfer)"));
-                    return;
-                }
-
-                break;
-            }
-        }
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(pvt->target(), "r (unable to lock %s!)") % err._msg.c_str());
-        return;
-    }
-
-    DBG(FUNC, PVT_FMT(pvt->target(), "r"));
-
-}
-*/
-
-bool BoardE1::KhompPvtFXS::onChannelRelease(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        /*
-        if(!callFXS()->_uuid_other_session.empty() && session())
-        {
-
-            //switch_core_session_t *hold_session;
-
-            //if ((hold_session = switch_core_session_locate(callFXS()->_uuid_other_session.c_str())))
-            //{
-            //    switch_channel_t * hold = switch_core_session_get_channel(hold_session);
-            //    switch_channel_stop_broadcast(hold);
-            //    switch_channel_wait_for_flag(hold, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
-            //    switch_core_session_rwunlock(hold_session);
-            //}
-
-            try
-            {
-                // get other side of the bridge
-                switch_core_session_t * peer_session = getFSLockedPartnerSession();
-                unlockPartner(peer_session);
-                DBG(FUNC, PVT_FMT(target(), "bridge with the new session"));
-                switch_ivr_uuid_bridge(getUUID(peer_session), callFXS()->_uuid_other_session.c_str());
-
-            }
-            catch(Board::KhompPvt::InvalidSwitchChannel & err)
-            {
-                DBG(FUNC, PVT_FMT(target(), "no partner: %s!") % err._msg.c_str());
-            }
-
-            callFXS()->_uuid_other_session.clear();
-        }
-        */
-
-        ret = KhompPvt::onChannelRelease(e);
-
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
-    return ret;
-
-}
-/*
-bool BoardE1::KhompPvtFXS::startTransfer()
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-
-    try
-    {
-        switch_core_session_t *peer_session = getFSLockedPartnerSession();
-        switch_channel_t *peer_channel = getFSChannel(peer_session);
-
-        const char *stream = NULL;
-
-        if (!(stream = getFSChannelVar(peer_channel, SWITCH_HOLD_MUSIC_VARIABLE)))
-        {
-            stream = "silence";
-        }
-
-        unlockPartner(peer_session);
-
-        DBG(FUNC, PVT_FMT(target(), "stream=%s") % stream);
-
-        if (stream && strcasecmp(stream, "silence"))
-        {
-            // Freeswitch not get/put frames
-            //switch_channel_set_flag(channel, CF_HOLD);
-            switch_ivr_broadcast(getUUID(peer_session), stream, SMF_ECHO_ALEG | SMF_LOOP);
-        }
-
-        callFXS()->_flags.set(Kflags::FXS_FLASH_TRANSFER);
-
-        startCadence(PLAY_PBX_TONE);
-
-        callFXS()->_idx_transfer = Board::board(_target.device)->_timers.add(Opt::_options._fxs_digit_timeout()* 1000, &BoardE1::KhompPvtFXS::transferTimer, this, TM_VAL_CALL);
-
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        //cleanup(KhompPvt::CLN_HARD);
-        LOG(ERROR, PVT_FMT(target(), "r (no valid partner %s!)") % err._msg.c_str());
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
-    }
-
-    //switch_ivr_hold_uuid(switch_core_session_get_uuid(session()), NULL, SWITCH_TRUE);
-    DBG(FUNC, PVT_FMT(target(), "r"));
-
-    return true;
-}
-
-bool BoardE1::KhompPvtFXS::stopTransfer()
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-
-    callFXS()->_flags.clear(Kflags::FXS_FLASH_TRANSFER);
-
-    callFXS()->_flash_transfer.clear();
-
-    stopCadence();
-
-    try
-    {
-        Board::board(_target.device)->_timers.del(callFXS()->_idx_transfer);
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
-    }
-
-    try
-    {
-        // get other side of the bridge
-        switch_core_session_t * peer_session = getFSLockedPartnerSession();
-        switch_channel_t * peer_channel = getFSChannel(peer_session);
-
-        switch_channel_stop_broadcast(peer_channel);
-        switch_channel_wait_for_flag(peer_channel, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
-
-        unlockPartner(peer_session);
-
-        //switch_ivr_unhold_uuid(switch_core_session_get_uuid(session()));
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "r (no valid partner %s!)") % err._msg.c_str());
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(target(), "r"));
-    return true;
-}
-
-static switch_status_t xferHook(switch_core_session_t *session)
-{
-    switch_channel_t *channel = switch_core_session_get_channel(session);
-    switch_channel_state_t state = switch_channel_get_state(channel);
-
-    DBG(FUNC, D("state change=%d") % state);
-
-    if (state == CS_PARK)
-    {
-        switch_core_event_hook_remove_state_change(session, xferHook);
-
-        BoardE1::KhompPvtFXS * pvt = static_cast<BoardE1::KhompPvtFXS*>(switch_core_session_get_private(session));
-
-        if(!pvt)
-        {
-            DBG(FUNC, D("pvt is NULL"));
-            return SWITCH_STATUS_FALSE;
-        }
-
-        try
-        {
-            ScopedPvtLock lock(pvt);
-
-            if(!pvt->callFXS()->_uuid_other_session.empty())
-            {
-                DBG(FUNC, D("bridge after park"));
-                std::string number = pvt->callFXS()->_uuid_other_session;
-                pvt->callFXS()->_uuid_other_session.clear();
-
-                switch_ivr_uuid_bridge(pvt->getUUID(), number.c_str());
-            }
-        }
-        catch(ScopedLockFailed & err)
-        {
-            LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock: %s!") %  err._msg.c_str());
-            return SWITCH_STATUS_FALSE;
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(pvt->target(), "%s!") %  err._msg.c_str());
-            return SWITCH_STATUS_FALSE;
-        }
-
-    }
-    else if (state == CS_HANGUP)
-    {
-        switch_core_event_hook_remove_state_change(session, xferHook);
-
-        //BoardE1::KhompPvtFXS * pvt = static_cast<BoardE1::KhompPvtFXS*>(switch_core_session_get_private(session));
-        //
-        //if(!pvt)
-        //{
-        //    DBG(FUNC, D("pvt is NULL"));
-        //    return SWITCH_STATUS_FALSE;
-        //}
-
-        //try
-        //{
-        //    ScopedPvtLock lock(pvt);
-
-        //    if(!pvt->callFXS()->_uuid_other_session.empty())
-        //    {
-        //        DBG(FUNC, D("bridge after hangup"));
-        //        std::string number = pvt->callFXS()->_uuid_other_session;
-        //        pvt->callFXS()->_uuid_other_session.clear();
-
-        //        switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), number.c_str());
-        //    }
-        //}
-        //catch(ScopedLockFailed & err)
-        //{
-        //   LOG(ERROR, PVT_FMT(pvt->target(), "unable to lock: %s!") %  err._msg.c_str());
-        //}
-
-    }
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-bool BoardE1::KhompPvtFXS::transfer(std::string & context, bool blind)
-{
-    DBG(FUNC, PVT_FMT(target(), "c"));
-
-    callFXS()->_flags.clear(Kflags::FXS_FLASH_TRANSFER);
-
-    std::string number = callFXS()->_flash_transfer;
-    callFXS()->_flash_transfer.clear();
-
-    try
-    {
-        Board::board(_target.device)->_timers.del(callFXS()->_idx_transfer);
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
-    }
-
-    try
-    {
-        // get other side of the bridge
-        switch_core_session_t * peer_session = getFSLockedPartnerSession();
-        switch_channel_t * peer_channel = getFSChannel(peer_session);
-
-        switch_channel_stop_broadcast(peer_channel);
-        switch_channel_wait_for_flag(peer_channel, CF_BROADCAST, SWITCH_FALSE, 5000, NULL);
-
-        unlockPartner(peer_session);
-
-        if(blind)
-        {
-            DBG(FUNC, PVT_FMT(_target, "Blind Transfer"));
-            switch_ivr_session_transfer(peer_session, number.c_str(), Opt::_options._dialplan().c_str(), context.c_str());
-        }
-        else
-        {
-            DBG(FUNC, PVT_FMT(_target, "Attended Transfer"));
-
-            if(!callFXS()->_uuid_other_session.empty())
-            {
-                DBG(FUNC, PVT_FMT(target(), "second transfer, hang up session"));
-            }
-            else
-            {
-                DBG(FUNC, PVT_FMT(target(), "first transfer"));
-                callFXS()->_uuid_other_session = getUUID(peer_session);
-                const char *stream = NULL;
-
-                if (!(stream = switch_channel_get_hold_music(peer_channel)))
-                {
-                    stream = "silence";
-                }
-
-                DBG(FUNC, PVT_FMT(target(), "transfer stream=%s") % stream);
-
-                if (stream && strcasecmp(stream, "silence"))
-                {
-                    std::string moh = STR(FMT("endless_playback:%s,park") % stream);
-                    switch_ivr_session_transfer(peer_session, moh.c_str(), "inline", NULL);
-                }
-                else
-                {
-                    switch_ivr_session_transfer(peer_session, "endless_playback:local_stream://moh,park", "inline", NULL);
-                    //switch_ivr_session_transfer(peer_session, "park", "inline", NULL);
-                }
-            }
-
-            switch_channel_t * channel = getFSChannel();
-            switch_channel_set_variable(channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE, "true");
-            switch_core_event_hook_add_state_change(session(), xferHook);
-
-            switch_ivr_session_transfer(session(), number.c_str(), Opt::_options._dialplan().c_str(), context.c_str());
-
-            DBG(FUNC, PVT_FMT(target(), "Generating ring"));
-            call()->_indication = INDICA_RING;
-            call()->_flags.set(Kflags::GEN_CO_RING);
-            startCadence(PLAY_RINGBACK);
-
-
-            //try
-            //{
-            //    call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_co_delay(), &Board::KhompPvt::coRingGen,this);
-            //}
-            //catch (K3LAPITraits::invalid_device & err)
-            //{
-             //   LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
-            //}
-
-        }
-    }
-    catch(Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "r (no valid partner %s!)") % err._msg.c_str());
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(target(), "r"));
-
-    return true;
-}
-*/
-
-bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c (dtmf=%c)") % (char) e->AddInfo);
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        if (call()->_flags.check(Kflags::IS_INCOMING) &&
-                callFXS()->_flags.check(Kflags::FXS_OFFHOOK) &&
-                !callFXS()->_flags.check(Kflags::FXS_DIAL_FINISHD))
-        {
-            DBG(FUNC, PVT_FMT(_target, "dialing"));
-
-            if (call()->_cadence == PLAY_PBX_TONE)
-            {
-                stopCadence();
-            }
-
-            if (call()->_cadence == PLAY_PUB_TONE)
-            {
-                stopCadence();
-                //call()->_cadence = PLAY_NONE;
-                //mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
-            }
-
-            if (!callFXS()->_flags.check(Kflags::FXS_DIAL_ONGOING))
-            {
-                DBG(FUNC, PVT_FMT(_target, "dialing started now, clearing stuff.."));
-
-                callFXS()->_flags.set(Kflags::FXS_DIAL_ONGOING);
-
-                callFXS()->_incoming_exten.clear();
-
-                mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
-
-                callFXS()->_idx_dial = Board::board(_target.device)->_timers.add(Opt::_options._fxs_digit_timeout()* 1000, &BoardE1::KhompPvtFXS::dialTimer, this, TM_VAL_CALL);
-            }
-            else
-            {
-                Board::board(_target.device)->_timers.restart(callFXS()->_idx_dial);
-            }
-
-            callFXS()->_incoming_exten += e->AddInfo;
-
-            /* begin context adjusting + processing */
-            MatchExtension::ContextListType contexts;
-
-            validContexts(contexts);
-
-            std::string tmp_exten;
-            std::string tmp_context;
-
-            switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, callFXS()->_incoming_exten, call()->_orig_addr, false, false))
-            {
-                case MatchExtension::MATCH_EXACT:
-                    callFXS()->_incoming_exten = tmp_exten;
-                    DBG(FUNC,FMT("incoming exten matched: %s") % callFXS()->_incoming_exten);
-                    Board::board(_target.device)->_timers.del(callFXS()->_idx_dial);
-                    call()->_dest_addr = callFXS()->_incoming_exten;
-                    call()->_incoming_context = tmp_context;
-
-                    alloc();
-                    break;
-
-                case MatchExtension::MATCH_MORE:
-                    DBG(FUNC, PVT_FMT(target(), "match more..."));
-
-                    /* can match, will match more, and it's an external call? */
-                    for (DestVectorType::const_iterator i = Opt::_options._fxs_co_dialtone().begin(); i != Opt::_options._fxs_co_dialtone().end(); i++)
-                    {
-                        if (callFXS()->_incoming_exten == (*i))
-                        {
-                            startCadence(PLAY_PUB_TONE);
-                            break;
-                        }
-                    }
-
-                    break;
-                case MatchExtension::MATCH_NONE:
-                    DBG(FUNC, PVT_FMT(target(), "match none!"));
-
-                    std::string invalid = "i";
-
-                    Board::board(_target.device)->_timers.del(callFXS()->_idx_dial);
-
-                    switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, invalid, call()->_orig_addr, true, false))
-                    {
-                        case MatchExtension::MATCH_EXACT:
-                            // this dialing is invalid, and we can handle it...
-                            call()->_dest_addr = invalid;
-                            call()->_incoming_context = tmp_context;
-                            alloc();
-                            break;
-                        case MatchExtension::MATCH_MORE:
-                        case MatchExtension::MATCH_NONE:
-                            callFXS()->_flags.set(Kflags::FXS_DIAL_FINISHD);
-                            startCadence(PLAY_FASTBUSY);
-                            break;
-                    }
-                    break;
-            }
-        }
-        /*
-        else if(callFXS()->_flags.check(Kflags::FXS_OFFHOOK) &&
-                callFXS()->_flags.check(Kflags::FXS_FLASH_TRANSFER))
-        {
-            Board::board(_target.device)->_timers.restart(callFXS()->_idx_transfer);
-            DBG(FUNC, PVT_FMT(target(), "Flash Transfer"));
-
-            if (call()->_cadence == PLAY_PBX_TONE)
-            {
-                stopCadence();
-            }
-
-            if (call()->_cadence == PLAY_PUB_TONE)
-            {
-                stopCadence();
-                //call()->_cadence = PLAY_NONE;
-                //mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
-            }
-
-            callFXS()->_flash_transfer += e->AddInfo;
-
-            // begin context adjusting + processing
-            MatchExtension::ContextListType contexts;
-
-            validContexts(contexts);
-
-            std::string tmp_exten;
-            std::string tmp_context;
-
-            switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, callFXS()->_flash_transfer, call()->_orig_addr, false, false))
-            {
-                case MatchExtension::MATCH_EXACT:
-                {
-                    callFXS()->_flash_transfer = tmp_exten;
-                    DBG(FUNC,FMT("incoming exten matched: %s") % callFXS()->_flash_transfer);
-
-                    if(!transfer(tmp_context))
-                    {
-                        cleanup(KhompPvt::CLN_HARD);
-                        DBG(FUNC, PVT_FMT(target(), "(FXS) r (unable to transfer)"));
-                        return false;
-                    }
-
-                    break;
-                }
-                case MatchExtension::MATCH_MORE:
-                    DBG(FUNC, PVT_FMT(target(), "match more..."));
-
-                    // can match, will match more, and it's an external call?
-                    for (DestVectorType::const_iterator i = Opt::_options._fxs_co_dialtone().begin(); i != Opt::_options._fxs_co_dialtone().end(); i++)
-                    {
-                        if (callFXS()->_flash_transfer == (*i))
-                        {
-                            startCadence(PLAY_PUB_TONE);
-                            break;
-                        }
-                    }
-
-                    break;
-                case MatchExtension::MATCH_NONE:
-                {
-                    DBG(FUNC, PVT_FMT(target(), "match none!"));
-
-                    if(!stopTransfer())
-                    {
-                        cleanup(KhompPvt::CLN_HARD);
-                        DBG(FUNC, PVT_FMT(target(), "(FXS) r (unable to stop transfer)"));
-                        return false;
-                    }
-
-                    break;
-                }
-            }
-        }
-        */
-        else
-        {
-            ret = KhompPvt::onDtmfDetected(e);
-        }
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (K3LAPITraits::invalid_device & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to get device: %d!)") % err.device);
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
-
-    return ret;
-}
-
-/*
-bool BoardE1::KhompPvtFXS::onDtmfSendFinish(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        ret = KhompPvt::onDtmfSendFinish(e);
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
-
-    return ret;
-}
-*/
-
-bool BoardE1::KhompPvtFXS::onFlashDetected(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c (%s)") % _flash);
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        for(std::string::const_iterator it = _flash.begin(); it != _flash.end(); it++)
-        {
-            signalDTMF(*it);
-        }
-
-        DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
-
-        return true;
-
-/******************************************************************************/
-        //Old implementation, not used
-        /*
-        if(callFXS()->_flags.check(Kflags::FXS_FLASH_TRANSFER))
-        {
-            DBG(FUNC, PVT_FMT(_target, "(FXS) transfer canceled"));
-
-            if(!stopTransfer())
-            {
-                cleanup(KhompPvt::CLN_HARD);
-                DBG(FUNC, PVT_FMT(target(), "(FXS) r (unable to stop transfer)"));
-                return false;
-            }
-
-            DBG(FUNC, PVT_FMT(target(), "(FXS) r"));
-            return true;
-        }
-
-        if(call()->_flags.check(Kflags::IS_INCOMING))
-        {
-            DBG(FUNC, PVT_FMT(_target, "incoming call"));
-        }
-        else if(call()->_flags.check(Kflags::IS_OUTGOING))
-        {
-            DBG(FUNC, PVT_FMT(_target, "outgoing call"));
-        }
-        else
-        {
-            DBG(FUNC, PVT_FMT(_target, "(FXS) r (!incoming and !outgoing call)"));
-            return true;
-        }
-
-        echoCancellation(false);
-
-        if(!startTransfer())
-        {
-            DBG(FUNC, PVT_FMT(target(), "(FXS) r (unable to start transfer)"));
-            return false;
-        }
-        */
-/******************************************************************************/
-
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
-
-    return true;
-}
-
-int BoardE1::KhompPvtFXS::makeCall(std::string params)
-{
-    DBG(FUNC,PVT_FMT(_target, "(FXS) c"));
-
-    /* we always have audio */
-    call()->_flags.set(Kflags::HAS_PRE_AUDIO);
-
-    if (Opt::_options._fxs_bina()&& !call()->_orig_addr.empty())
-    {
-        /* Sending Bina DTMF*/
-        callFXS()->_flags.set(Kflags::WAIT_SEND_DTMF);
-
-        std::stringstream dial_bina;
-
-        dial_bina << "A1" << call()->_orig_addr << "C";
-
-        if (!command(KHOMP_LOG, CM_DIAL_DTMF, dial_bina.str().c_str()))
-        {
-            return ksFail;
-            //throw call_error("something went while sending BINA digits to FXS branch");
-        }
-
-        int timeout = 150;
-
-        if(!loopWhileFlagTimed(Kflags::WAIT_SEND_DTMF, timeout))
-            return ksFail;
-        //throw call_error("call has been dropped while sending digits");
-
-        if(timeout <= 0)
-            return ksFail;
-        //throw call_error("sending number of A caused timeout of this call");
-    }
-
-    if(!call()->_orig_addr.empty())
-        params += STG(FMT(" orig_addr=\"%s\"") % _call->_orig_addr);
-
-    if (callFXS()->_ring_on != -1)
-        params += STG(FMT(" ring_on=\"%ld\"") % callFXS()->_ring_on);
-
-    if (callFXS()->_ring_off != -1)
-        params += STG(FMT(" ring_off=\"%ld\"") % callFXS()->_ring_off);
-
-    if (callFXS()->_ring_on_ext != -1)
-        params += STG(FMT(" ring_on_ext=\"%ld\"") % callFXS()->_ring_on_ext);
-
-    if (callFXS()->_ring_off_ext != -1)
-        params += STG(FMT(" ring_off_ext=\"%ld\"") % callFXS()->_ring_off_ext);
-
-    int ret = KhompPvt::makeCall(params);
-
-    if(ret == ksSuccess)
-    {
-        try
-        {
-            switch_channel_mark_ring_ready(getFSChannel());
-        //signal_state(AST_CONTROL_RINGING);
-        }
-        catch(Board::KhompPvt::InvalidSwitchChannel & err)
-        {
-            LOG(ERROR, PVT_FMT(_target, "No valid channel: %s") % err._msg.c_str());
-        }
-    }
-    else
-    {
-        LOG(ERROR, PVT_FMT(target(), "Fail on make call"));
-    }
-
-    call()->_cleanup_upon_hangup = (ret == ksInvalidParams || ret == ksInvalidState);
-
-    DBG(FUNC,PVT_FMT(_target, "(FXS) r"));
-    return ret;
-}
-
-bool BoardE1::KhompPvtFXS::doChannelAnswer(CommandRequest &cmd)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
-
-    bool ret = true;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        setupConnection();
-
-        ret = KhompPvt::doChannelAnswer(cmd);
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-    catch (Board::KhompPvt::InvalidSwitchChannel & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtFXS::doChannelHangup(CommandRequest &cmd)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
-
-    bool ret = true;
-
-    bool answered     = true;
-    bool disconnected = false;
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        /*
-        if(!callFXS()->_uuid_other_session.empty())
-        {
-            DBG(FUNC,PVT_FMT(_target, "unable to transfer"));
-
-            switch_core_session_t *hold_session;
-
-            if ((hold_session = switch_core_session_locate(callFXS()->_uuid_other_session.c_str())))
-            {
-                switch_channel_t *hold_channel = switch_core_session_get_channel(hold_session);
-                switch_core_session_rwunlock(hold_session);
-
-                if(hold_channel)
-                    switch_channel_hangup(hold_channel, (switch_call_cause_t)call()->_hangup_cause);
-                //switch_channel_hangup(hold_channel, SWITCH_CAUSE_ATTENDED_TRANSFER);
-            }
-            callFXS()->_uuid_other_session.clear();
-        }
-        */
-
-        if (call()->_flags.check(Kflags::IS_INCOMING))
-        {
-            DBG(FUNC,PVT_FMT(_target, "disconnecting incoming channel"));
-
-        }
-        else if (call()->_flags.check(Kflags::IS_OUTGOING))
-        {
-            if (!call()->_flags.check(Kflags::FXS_OFFHOOK))
-            {
-                DBG(FUNC, PVT_FMT(_target, "disconnecting not answered outgoing FXS channel..."));
-                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-                cleanup(KhompPvt::CLN_HARD);
-                answered = false;
-
-            }
-            else if(call()->_cleanup_upon_hangup)
-            {
-                DBG(FUNC,PVT_FMT(_target, "disconnecting not allocated outgoing channel..."));
-
-                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-                cleanup(KhompPvt::CLN_HARD);
-                answered = false;
-
-            }
-            else
-            {
-                DBG(FUNC,PVT_FMT(_target, "disconnecting outgoing channel..."));
-
-                disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-            }
-        }
-        else
-        {
-            DBG(FUNC,PVT_FMT(_target, "already disconnected"));
-            return true;
-        }
-
-        if(answered)
-        {
-            indicateBusyUnlocked(SWITCH_CAUSE_USER_BUSY, disconnected);
-        }
-
-        if (call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::NEEDS_RINGBACK_CMD))
-        {
-            DBG(FUNC,PVT_FMT(_target, "disconnecting incoming channel..."));
-            disconnected = command(KHOMP_LOG, CM_DISCONNECT);
-        }
-
-        stopStream();
-
-        stopListen();
-
-        //ret = KhompPvt::doChannelHangup(cmd);
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR,PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtFXS::setupConnection()
-{
-    if(!call()->_flags.check(Kflags::IS_INCOMING) && !call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        DBG(FUNC,PVT_FMT(_target, "Channel already disconnected"));
-        return false;
-    }
-
-    bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN ?
-        Opt::_options._suppression_delay() && Opt::_options._out_of_band_dtmfs(): (call()->_var_dtmf_state == T_TRUE));
-
-    bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN ?
-        Opt::_options._echo_canceller() : (call()->_var_echo_state == T_TRUE));
-
-
-    bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN ?
-        Opt::_options._auto_gain_control() : (call()->_var_gain_state == T_TRUE));
-
-
-    if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
-    {
-        obtainRX(res_out_of_band_dtmf);
-
-        /* esvazia buffers de leitura/escrita */
-        cleanupBuffers();
-
-        if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
-            dtmfSuppression(res_out_of_band_dtmf);
-
-        if (!call()->_flags.check(Kflags::KEEP_ECHO_CANCELLATION))
-            echoCancellation(res_echo_cancellator);
-
-        if (!call()->_flags.check(Kflags::KEEP_AUTO_GAIN_CONTROL))
-            autoGainControl(res_auto_gain_cntrol);
-
-        startListen(false);
-
-        startStream();
-
-        DBG(FUNC, PVT_FMT(_target, "(FXS) Audio callbacks initialized successfully"));
-    }
-
-    call()->_flags.set(Kflags::FXS_OFFHOOK);
-
-    return KhompPvt::setupConnection();
-}
-
-bool BoardE1::KhompPvtFXS::indicateBusyUnlocked(int cause, bool sent_signaling)
-{
-    DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
-
-    if(!KhompPvt::indicateBusyUnlocked(cause, sent_signaling))
-    {
-        DBG(FUNC, PVT_FMT(_target, "(FXS) r (false)"));
-        return false;
-    }
-
-    if(call()->_flags.check(Kflags::IS_INCOMING))
-    {
-        if(!call()->_flags.check(Kflags::CONNECTED) && !sent_signaling)
-        {
-            if(!call()->_flags.check(Kflags::HAS_PRE_AUDIO))
-            {
-                int rb_value = callFailFromCause(call()->_hangup_cause);
-                DBG(FUNC, PVT_FMT(target(), "sending the busy status"));
-
-                if (sendRingBackStatus(rb_value) == RingbackDefs::RBST_UNSUPPORTED)
-                {
-                    DBG(FUNC, PVT_FMT(target(), "falling back to audio indication!"));
-                    /* stop the line audio */
-                    stopStream();
-
-                    /* just pre connect, no ringback */
-                    if (!sendPreAudio())
-                        DBG(FUNC, PVT_FMT(target(), "everything else failed, just sending audio indication..."));
-
-                    /* be very specific about the situation. */
-                    mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-                }
-            }
-            else
-            {
-                DBG(FUNC, PVT_FMT(target(), "going to play busy"));
-
-                /* stop the line audio */
-                stopStream();
-
-                /* be very specific about the situation. */
-                mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-
-            }
-        }
-        else
-        {
-            /* already connected or sent signaling... */
-            mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-        }
-
-    }
-    else if(call()->_flags.check(Kflags::IS_OUTGOING))
-    {
-        /* already connected or sent signaling... */
-        mixer(KHOMP_LOG, 1, kmsGenerator, kmtBusy);
-    }
-
-    DBG(FUNC,PVT_FMT(_target, "(FXS) r"));
-
-    return true;
-}
-
-void BoardE1::KhompPvtFXS::reportFailToReceive(int fail_code)
-{
-    KhompPvt::reportFailToReceive(fail_code);
-
-    if(fail_code != -1)
-    {
-        DBG(FUNC,PVT_FMT(_target, "sending a 'unknown number' message/audio"));
-
-        if(sendRingBackStatus(fail_code) == RingbackDefs::RBST_UNSUPPORTED)
-        {
-            sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
-            startCadence(PLAY_FASTBUSY);
-        }
-    }
-    else
-    {
-        DBG(FUNC, PVT_FMT(_target, "sending fast busy audio directly"));
-
-        sendPreAudio(RingbackDefs::RB_SEND_DEFAULT);
-        startCadence(PLAY_FASTBUSY);
-    }
-}
-
-bool BoardE1::KhompPvtFXS::validContexts(
-        MatchExtension::ContextListType & contexts, std::string extra_context)
-{
-    DBG(FUNC,PVT_FMT(_target, "(FXS) c"));
-
-    if(!_context.empty())
-        contexts.push_back(_context);
-
-    if(!_group_context.empty())
-    {
-        contexts.push_back(_group_context);
-    }
-
-    contexts.push_back(Opt::_options._context_fxs());
-    contexts.push_back(Opt::_options._context2_fxs());
-
-    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
-    {
-        replaceTemplate((*i), "CC", _target.object);
-    }
-
-    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
-
-    DBG(FUNC,PVT_FMT(_target, "(FXS) r"));
-
-    return ret;
-}
-
-bool BoardE1::KhompPvtFXS::isOK()
-{
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        K3L_CHANNEL_STATUS status;
-
-        if (k3lGetDeviceStatus (_target.device, _target.object + ksoChannel, &status, sizeof (status)) != ksSuccess)
-            return false;
-
-        return (status.AddInfo != kfxsFail);
-    }
-    catch (ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
-    }
-
-    return false;
-}
-
-
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp
deleted file mode 100644
index a5c66afaee..0000000000
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "khomp_pvt_passive.h"
-#include "lock.h"
-#include "logger.h"
-
-bool BoardPassive::KhompPvtPassive::validContexts(
-        MatchExtension::ContextListType & contexts, std::string extra_context)
-{
-    DBG(FUNC,PVT_FMT(_target,"(Passive) c"));
-
-    if(!_group_context.empty())
-    {
-        contexts.push_back(_group_context);
-    }
-
-    contexts.push_back(Opt::_options._context_pr());
-
-    for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
-    {
-        replaceTemplate((*i), "CC", _target.object);
-    }
-
-    bool ret = Board::KhompPvt::validContexts(contexts,extra_context);
-
-    DBG(FUNC,PVT_FMT(_target,"(Passive) r"));
-
-    return ret;
-}
-
-bool BoardPassive::KhompPvtHI::onSeizureStart(K3L_EVENT *e)
-{
-    DBG(FUNC,PVT_FMT(_target,"(HI) c"));
-
-    try
-    {
-        ScopedPvtLock lock(this);
-
-        _call->_orig_addr.clear();
-        _call->_dest_addr = "s";
-
-#if SWITCH_LESS_THAN(1,0,6)
-        session(switch_core_session_request(Globals::khomp_pr_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL));
-#else
-        session(switch_core_session_request(Globals::khomp_pr_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL));
-#endif
-
-        if (justAlloc(true) != SWITCH_STATUS_SUCCESS)
-        {
-            setHangupCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
-            cleanup(CLN_FAIL);
-            LOG(ERROR, PVT_FMT(target(), "(HI) r (Initilization Error on alloc!)"));
-            return false;
-        }
-
-        /* begin context adjusting + processing */
-        MatchExtension::ContextListType contexts;
-
-        validContexts(contexts);
-
-        std::string tmp_exten;
-        std::string tmp_context;
-
-        switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, call()->_dest_addr, call()->_orig_addr, false))
-        {
-        case MatchExtension::MATCH_NONE:
-            destroy();
-            owner(NULL);
-            LOG(WARNING, PVT_FMT(_target, "(HI) r (unable to find exten/context on incoming call %s/%s)")
-                    % _call->_dest_addr % (contexts.size() >= 1 ? contexts[0] : "default"));
-            return false;
-        default:
-            DBG(FUNC, PVT_FMT(_target, "(HI) our: context '%s', exten '%s'") % tmp_context % tmp_exten);
-            break;
-
-        }
-
-        call()->_incoming_context = tmp_context;
-        _call->_dest_addr = tmp_exten;
-
-        startListen();
-
-        if (justStart() != SWITCH_STATUS_SUCCESS)
-        {
-            setHangupCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
-            cleanup(CLN_FAIL);
-            LOG(ERROR, PVT_FMT(target(), "(HI) r (Initilization Error on start!)"));
-            return false;
-        }
-
-        call()->_flags.set(Kflags::REALLY_CONNECTED);
-        call()->statistics()->incrementNewCall();
-
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(HI) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(HI) r"));
-
-    return true;
-}
-
-bool BoardPassive::KhompPvtKPR::onNewCall(K3L_EVENT *e)
-{
-    DBG(FUNC, PVT_FMT(_target, "(KPR) c"));
-
-    try
-    {
-        std::string orig_addr, dest_addr;
-
-        Globals::k3lapi.get_param(e, "orig_addr", orig_addr);
-        Globals::k3lapi.get_param(e, "dest_addr", dest_addr);
-
-        if(dest_addr.empty())
-        {
-            dest_addr="s";
-        }
-
-        bool isdn_reverse_charge = false;
-        std::string isdn_reverse_charge_str;
-        int isdn_status = Globals::k3lapi.get_param(e, "isdn_reverse_charge", isdn_reverse_charge_str);
-
-        if (isdn_status == ksSuccess && !isdn_reverse_charge_str.empty())
-        {
-            try
-            {
-                isdn_reverse_charge = Strings::toboolean(isdn_reverse_charge_str);
-            }
-            catch (Strings::invalid_value & err)
-            {
-            }
-        }
-
-        long int r2_category = -1;
-        std::string r2_categ_a;
-        int r2_status = Globals::k3lapi.get_param(e, "r2_categ_a", r2_categ_a);
-
-        if (r2_status == ksSuccess && !r2_categ_a.empty())
-        {
-            try
-            {
-                r2_category = Strings::toulong(r2_categ_a);
-            }
-            catch (Strings::invalid_value e)
-            {
-            }
-
-        }
-
-        ScopedPvtLock lock(this);
-
-        _call->_orig_addr = orig_addr;
-        _call->_dest_addr = dest_addr;
-
-        if(isdn_reverse_charge || r2_category == kg2CollectCall)
-        {
-            call()->_collect_call = true;
-        }
-
-#if SWITCH_LESS_THAN(1,0,6)
-        session(switch_core_session_request(Globals::khomp_pr_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL));
-#else
-        session(switch_core_session_request(Globals::khomp_pr_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL));
-#endif
-
-        if (justAlloc(true) != SWITCH_STATUS_SUCCESS)
-        {
-            setHangupCause(SWITCH_CAUSE_UNALLOCATED_NUMBER);
-            cleanup(CLN_FAIL);
-            LOG(ERROR, PVT_FMT(target(), "(KPR) r (Initilization Error on alloc!)"));
-            return false;
-        }
-
-        /* begin context adjusting + processing */
-        MatchExtension::ContextListType contexts;
-
-        validContexts(contexts);
-
-        std::string tmp_exten;
-        std::string tmp_context;
-
-        switch (MatchExtension::findExtension(tmp_exten, tmp_context, contexts, call()->_dest_addr, call()->_orig_addr, false))
-        {
-            case MatchExtension::MATCH_NONE:
-                destroy();
-                owner(NULL);
-                LOG(WARNING, PVT_FMT(_target, "(KPR) r (unable to find exten/context on incoming call %s/%s)")
-                        % _call->_dest_addr % (contexts.size() >= 1 ? contexts[0] : "default"));
-                return false;
-            default:
-                DBG(FUNC, PVT_FMT(_target, "(KPR) our: context '%s', exten '%s'") % tmp_context % tmp_exten);
-                break;
-
-        }
-
-        call()->_incoming_context = tmp_context;
-        _call->_dest_addr = tmp_exten;
-
-        obtainBoth();
-
-        startListen(false);
-
-        if (justStart() != SWITCH_STATUS_SUCCESS)
-        {
-            setHangupCause(SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
-            cleanup(CLN_FAIL);
-            LOG(ERROR, PVT_FMT(target(), "(KPR) r (Initilization Error on start!)"));
-            return false;
-        }
-
-        call()->_flags.set(Kflags::REALLY_CONNECTED);
-        call()->statistics()->incrementNewCall();
-
-    }
-    catch(ScopedLockFailed & err)
-    {
-        LOG(ERROR, PVT_FMT(target(), "(KPR) r (unable to lock %s!)") % err._msg.c_str() );
-        return false;
-    }
-
-    DBG(FUNC, PVT_FMT(_target, "(KPR) r"));
-    return true;
-}
-
-bool BoardPassive::KhompPvtKPR::obtainBoth()
-{
-    /* estes buffers *NAO PODEM SER ESTATICOS*! */
-    char cmd1[] = { 0x3f, 0x03, 0xff, 0x00, 0x05, 0xff };
-    char cmd2[] = { 0x3f, 0x03, 0xff, 0x01, 0x05, 0xff };
-
-    cmd1[2] = cmd1[5] = cmd2[2] = _target.object;
-    cmd2[5] = _target.object + 30;
-
-    try
-    {
-        int dsp = Globals::k3lapi.get_dsp(_target.device, K3LAPI::DSP_AUDIO);
-
-        Globals::k3lapi.raw_command(_target.device, dsp, cmd1, sizeof(cmd1));
-
-        Globals::k3lapi.raw_command(_target.device, dsp, cmd2, sizeof(cmd2));
-
-    }
-    catch(K3LAPI::failed_raw_command & e)
-    {
-        LOG(ERROR, PVT_FMT(target(), "ERROR sending mixer command!"));
-        return false;
-    }
-
-    return true;
-}
-
diff --git a/src/mod/endpoints/mod_khomp/src/lock.cpp b/src/mod/endpoints/mod_khomp/src/lock.cpp
deleted file mode 100644
index f7be368e05..0000000000
--- a/src/mod/endpoints/mod_khomp/src/lock.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "lock.h"
-
-/* ScopedPvtLock */
-
-ScopedPvtLock::ScopedPvtLock(KhompPvt * pvt)
-: ScopedLockBasic(false), _pvt(pvt)
-{
-    //DBG(LOCK, DP(_pvt, "c"));
-
-    if (! _pvt)
-        throw ScopedLockFailed(ScopedLockFailed::NULL_PVT, "null KhompPvt");
-
-    switch(_pvt->_mutex.lock())
-    {
-        case SimpleLock::FAILURE:
-            throw ScopedLockFailed(ScopedLockFailed::FAILED, "Failure");
-            break;
-        case SimpleLock::ISINUSE:
-            throw ScopedLockFailed(ScopedLockFailed::FAILED, "In use");
-            break;
-        default:
-            break;
-    }
-
-    _locked = true;
-
-    //DBG(LOCK, DP(_pvt, "r"));
-}
-
-ScopedPvtLock::~ScopedPvtLock()
-{
-    //DBG(LOCK, DP(_pvt, "c"));
-    unlock();
-    //DBG(LOCK, DP(_pvt, "r"));
-}
-
-void ScopedPvtLock::unlock()
-{
-    //DBG(LOCK, DP(_pvt, "c"));
-
-    if (_locked)
-    {
-        //DBG(LOCK, DP(_pvt, "unlocking!"));
-
-        _locked = false;
-        _pvt->_mutex.unlock();
-    }
-
-    //DBG(LOCK, DP(_pvt, "r"));
-}
-
-ScopedAllocLock::ScopedAllocLock()
-: ScopedLockBasic(false)
-{
-    //DBG(LOCK, DP(_pvt, "c"));
-
-    switch(Globals::khomp_alloc_mutex.lock())
-    {
-        case SimpleLock::FAILURE:
-            throw ScopedLockFailed(ScopedLockFailed::ALLOC_FAILED, "Failure");
-            break;
-        case SimpleLock::ISINUSE:
-            throw ScopedLockFailed(ScopedLockFailed::ALLOC_FAILED, "In use");
-            break;
-        default:
-            break;
-    }
-
-    _locked = true;
-
-    //DBG(LOCK, DP(_pvt, "r"));
-}
-
-ScopedAllocLock::~ScopedAllocLock()
-{
-    //DBG(LOCK, DP(_pvt, "c"));
-    unlock();
-    //DBG(LOCK, DP(_pvt, "r"));
-}
-
-void ScopedAllocLock::unlock()
-{
-    //DBG(LOCK, DP(_pvt, "c"));
-
-    if (_locked)
-    {
-        //DBG(LOCK, DP(_pvt, "unlocking!"));
-
-        _locked = false;
-        Globals::khomp_alloc_mutex.unlock();
-    }
-
-    //DBG(LOCK, DP(_pvt, "r"));
-}
-
diff --git a/src/mod/endpoints/mod_khomp/src/logger.cpp b/src/mod/endpoints/mod_khomp/src/logger.cpp
deleted file mode 100644
index cb66668e5b..0000000000
--- a/src/mod/endpoints/mod_khomp/src/logger.cpp
+++ /dev/null
@@ -1,437 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "logger.h"
-#include "globals.h"
-
-namespace K
-{
-    LogManager Logger::Logg;
-    LogInternalManager Logger::Logg2;
-
-    std::string     Logger::base_path;
-    std::ofstream   Logger::generic_file;
-
-    bool LogConfig::set(Logfile & file, const char * section, const char * option, bool value)
-    {
-        Section * sec = file.root().section_find(section);
-
-        if (!sec)
-            return false;
-
-        Option * opt = sec->option_find(option);
-
-        if (!opt)
-            return false;
-
-        opt->set( value ? "Ativado" : "Desativado" );
-
-        return true;
-    }
-
-    bool LogConfig::commit(Logfile & file)
-    {
-        return file.provide();
-    }
-
-    bool Logger::start()
-    {
-        /* we love shortcuts! */
-        typedef LogManager::Option LogOpt;
-
-        typedef LogOpt::Flags     Flags;
-        typedef LogOpt::InitFlags FL;
-
-        /* configures default log levels */
-        Logger::Logg.classe(C_ERROR)
-            & LogOpt(O_CONSOLE, "ERROR: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::ENABLED)))
-            & LogOpt(O_GENERIC, "E: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        Logger::Logg.classe(C_WARNING)
-            & LogOpt(O_CONSOLE, "WARNING: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::ENABLED)))
-            & LogOpt(O_GENERIC, "W: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        Logger::Logg.classe(C_MESSAGE)
-            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::ENABLED)))
-            & LogOpt(O_GENERIC, "M: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        /* k3l messages */
-        Logger::Logg.classe(C_COMMAND)
-            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME)))
-            & LogOpt(O_GENERIC, "c: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID)));
-
-        Logger::Logg.classe(C_EVENT)
-            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME)))
-            & LogOpt(O_GENERIC, "e: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID)));
-
-        Logger::Logg.classe(C_AUDIO_EV)
-            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME)))
-            & LogOpt(O_GENERIC, "a: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID)));
-
-        Logger::Logg.classe(C_MODEM_EV)
-            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME)))
-            & LogOpt(O_GENERIC, "m: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        Logger::Logg.classe(C_LINK_STT)
-            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME) & FL(LogOpt::ENABLED)))
-            & LogOpt(O_GENERIC, "s: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        Logger::Logg.classe(C_CAS_MSGS)
-            & LogOpt(O_CONSOLE, Flags(FL(LogOpt::DATETIME) & FL(LogOpt::ENABLED)))
-            & LogOpt(O_GENERIC, "p: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        /* channel debug */
-        Logger::Logg.classe(C_DBG_FUNC)
-            & LogOpt(O_GENERIC, "F: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        Logger::Logg.classe(C_DBG_LOCK)
-            & LogOpt(O_GENERIC, "L: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        Logger::Logg.classe(C_DBG_THRD)
-            & LogOpt(O_GENERIC, "T: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        Logger::Logg.classe(C_DBG_STRM)
-            & LogOpt(O_GENERIC, "S: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        Logger::Logg.classe(C_DBG_CONF)
-            & LogOpt(O_GENERIC, "C: ", Flags(FL(LogOpt::DATETIME) & FL(LogOpt::THREADID) & FL(LogOpt::ENABLED)));
-
-        Logger::Logg.classe(C_DBG_FUNC).enabled(false);
-        Logger::Logg.classe(C_DBG_LOCK).enabled(false);
-        Logger::Logg.classe(C_DBG_THRD).enabled(false);
-        Logger::Logg.classe(C_DBG_STRM).enabled(false);
-
-        /* we debug config file loading, by default */
-        Logger::Logg.classe(C_DBG_CONF).enabled(true);
-
-        /* adds a prefix to the cli messages */
-        Logger::Logg.classe(C_CLI).prefix("<K> ");
-
-        /* inserts default console log before opening files */
-        Logger::Logg.add(O_CONSOLE,SwitchConsoleLog(), "mod_khomp: ");
-
-        time_t      tv;
-        struct tm   lt;
-
-        /* get local time! */
-        time (&tv);
-        localtime_r (&tv, &lt);
-
-        base_path = STG(FMT("/var/log/khomp%d.%d/mod_khomp-%04d%02d%02d_%02d%02d%02d/")
-                % k3lApiMajorVersion % k3lApiMinorVersion % (lt.tm_year + 1900) % (lt.tm_mon + 1)
-                % lt.tm_mday % lt.tm_hour % lt.tm_min % lt.tm_sec );
-
-        // NOTE: ALWAYS unlink, as we may have a dangling symlink lying around...
-        std::string link_path = STG(FMT("/var/log/khomp%d.%d/current") % k3lApiMajorVersion % k3lApiMinorVersion );
-        unlink(link_path.c_str());
-
-        if (mkdir(base_path.c_str(), 493 /*755*/) < 0 && errno != EEXIST)
-        {
-            Logger::Logg(C_ERROR, D("unable to create log directory '%s': %s!") % base_path % strerror(errno));
-            return false;
-        }
-
-        if (symlink(base_path.c_str(), link_path.c_str()))
-        {
-            Logger::Logg(C_ERROR, D("unable to create symlink to latest log directory '%s': %s!") % base_path % strerror(errno));
-        }
-
-        std::string gen_tmp = base_path + std::string("generic.log");
-        generic_file.open(gen_tmp.c_str());
-
-        if (!generic_file.good())
-        {
-            Logger::Logg(C_ERROR, D("could not open file '%s': %s") % gen_tmp % strerror(errno));
-            return false;
-        }
-
-        /* inserts other file descriptors (TODO: delete this when stopping logs) */
-        Logger::Logg.add(O_GENERIC, &generic_file);
-        return true;
-    }
-
-    void Logger::stop()
-    {
-        if(generic_file.is_open())
-        {
-            generic_file.close();
-        }
-    }
-
-    bool Logger::rotate()
-    {
-        std::string new_gen;
-
-        for (unsigned int i = 0;; i++)
-        {
-            std::string tmp = base_path + STG(FMT("generic.%d.log") % i);
-
-            if (access(tmp.c_str(), R_OK|W_OK) != 0 && errno == ENOENT)
-            {
-                new_gen = tmp;
-                break;
-            }
-        }
-
-        std::string old_gen = base_path + "generic.log";
-
-        if (rename(old_gen.c_str(), new_gen.c_str()) != 0)
-        {
-            Logger::Logg(C_ERROR, FMT("unable to move generic log file: %s.") % strerror(errno));
-            return false;
-        }
-
-        Globals::logs_being_rotated = true;
-
-        generic_file.close();
-        generic_file.open(old_gen.c_str());
-
-        Globals::logs_being_rotated = false;
-
-        return true;
-    }
-
-    void Logger::processLogConsole(switch_stream_handle_t *s, const std::string options, bool invert, bool unique)
-    {
-        class_type classe = ( !s ? C_MESSAGE : C_CLI );
-
-        Strings::vector_type tokens;
-        Strings::tokenize(options, tokens, ",");
-
-        bool flag_errors   = false;
-        bool flag_warnings = false;
-        bool flag_messages = false;
-        bool flag_events   = false;
-        bool flag_commands = false;
-        bool flag_audio    = false;
-        bool flag_modem    = false;
-        bool flag_link     = false;
-        bool flag_cas      = false;
-
-        Strings::Merger strs;
-
-        for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++)
-        {
-            std::string tok = Strings::trim(*i);
-
-            /**/ if ((tok) == "errors")     flag_errors   = true;
-            else if ((tok) == "warnings")   flag_warnings = true;
-            else if ((tok) == "messages")   flag_messages = true;
-            else if ((tok) == "events")     flag_events   = true;
-            else if ((tok) == "commands")   flag_commands = true;
-            else if ((tok) == "audio")      flag_audio    = true;
-            else if ((tok) == "modem")      flag_modem    = true;
-            else if ((tok) == "link")       flag_link     = true;
-            else if ((tok) == "cas")        flag_cas      = true;
-            else if ((tok) == "standard")
-            {
-                flag_errors   = true;
-                flag_warnings = true;
-                flag_messages = true;
-                flag_link     = true;
-            }
-            else if ((tok) == "all")
-            {
-                flag_errors   = true;
-                flag_warnings = true;
-                flag_messages = true;
-                flag_events   = true;
-                flag_commands = true;
-                flag_audio    = true;
-                flag_modem    = true;
-                flag_link     = true;
-                flag_cas      = true;
-            }
-            else
-            {
-                K::Logger::Logg2(classe, s, FMT("WARNING: The following console message option is not valid and will be ignored: %s.") % (tok) );
-                continue;
-            }
-
-            strs.add(tok);
-        }
-
-        if ((unique && !flag_errors)    || flag_errors)    K::Logger::Logg.classe(C_ERROR)   .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_errors));
-        if ((unique && !flag_warnings)  || flag_warnings)  K::Logger::Logg.classe(C_WARNING) .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_warnings));
-        if ((unique && !flag_messages)  || flag_messages)  K::Logger::Logg.classe(C_MESSAGE) .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_messages));
-        if ((unique && !flag_events)    || flag_events)    K::Logger::Logg.classe(C_EVENT)   .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_events));
-        if ((unique && !flag_commands)  || flag_commands)  K::Logger::Logg.classe(C_COMMAND) .set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_commands));
-        if ((unique && !flag_audio)     || flag_audio)     K::Logger::Logg.classe(C_AUDIO_EV).set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_audio));
-        if ((unique && !flag_modem)     || flag_modem)     K::Logger::Logg.classe(C_MODEM_EV).set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_modem));
-        if ((unique && !flag_link)      || flag_link)      K::Logger::Logg.classe(C_LINK_STT).set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_link));
-        if ((unique && !flag_cas)       || flag_cas)       K::Logger::Logg.classe(C_CAS_MSGS).set(O_CONSOLE, LogManager::Option::ENABLED, (!invert && flag_cas));
-
-        if (!strs.empty())
-        {
-            K::Logger::Logg2(classe, s, FMT("NOTICE: %s %sthe following console messages: %s.")
-                    % (invert ? "Disabling" : "Enabling")
-                    % (unique ? "just " : "") % strs.merge(", "));
-        }
-        else
-        {
-            K::Logger::Logg2(classe, s, "WARNING: No valid console messages have been specified, doing nothing.");
-        }
-    }
-
-    void Logger::processLogDisk(switch_stream_handle_t *s, const std::string options, bool invert, bool unique)
-    {
-        class_type classe = ( !s ? C_MESSAGE : C_CLI );
-
-        Strings::vector_type tokens;
-        Strings::tokenize(options, tokens, ",");
-
-        bool flag_errors    = false;
-        bool flag_warnings  = false;
-        bool flag_messages  = false;
-        bool flag_events    = false;
-        bool flag_commands  = false;
-        bool flag_audio     = false;
-        bool flag_modem     = false;
-        bool flag_link      = false;
-        bool flag_cas       = false;
-        bool flag_functions = false;
-        bool flag_threads   = false;
-        bool flag_locks     = false;
-        bool flag_streams   = false;
-
-        Strings::Merger strs;
-
-        for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++)
-        {
-            std::string tok = Strings::trim(*i);
-
-            /**/ if ((tok) == "errors")     flag_errors    = true;
-            else if ((tok) == "warnings")   flag_warnings  = true;
-            else if ((tok) == "messages")   flag_messages  = true;
-            else if ((tok) == "events")     flag_events    = true;
-            else if ((tok) == "commands")   flag_commands  = true;
-            else if ((tok) == "audio")      flag_audio     = true;
-            else if ((tok) == "modem")      flag_modem     = true;
-            else if ((tok) == "link")       flag_link      = true;
-            else if ((tok) == "cas")        flag_cas       = true;
-            else if ((tok) == "functions")  flag_functions = true;
-            else if ((tok) == "threads")    flag_threads   = true;
-            else if ((tok) == "locks")      flag_locks     = true;
-            else if ((tok) == "streams")    flag_streams   = true;
-            else if ((tok) == "standard")
-            {
-                flag_errors   = true;
-                flag_warnings = true;
-                flag_messages = true;
-                flag_link     = true;
-            }
-            else if ((tok) == "debugging")
-            {
-                flag_errors    = true;
-                flag_warnings  = true;
-                flag_messages  = true;
-                flag_commands  = true;
-                flag_events    = true;
-                flag_audio     = true;
-                flag_modem     = true;
-                flag_link      = true;
-                flag_cas       = true;
-                flag_functions = true;
-            }
-            else if ((tok) == "all")
-            {
-                flag_errors    = true;
-                flag_warnings  = true;
-                flag_messages  = true;
-                flag_events    = true;
-                flag_commands  = true;
-                flag_audio     = true;
-                flag_modem     = true;
-                flag_link      = true;
-                flag_cas       = true;
-                flag_functions = true;
-                flag_threads   = true;
-                flag_locks     = true;
-                flag_streams   = true;
-            }
-            else
-            {
-                /* do not show! */
-                continue;
-            }
-
-            strs.add(tok);
-        }
-
-        if ((unique && !flag_errors)    || flag_errors)    K::Logger::Logg.classe(C_ERROR)   .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_errors));
-        if ((unique && !flag_warnings)  || flag_warnings)  K::Logger::Logg.classe(C_WARNING) .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_warnings));
-        if ((unique && !flag_messages)  || flag_messages)  K::Logger::Logg.classe(C_MESSAGE) .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_messages));
-        if ((unique && !flag_events)    || flag_events)    K::Logger::Logg.classe(C_EVENT)   .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_events));
-        if ((unique && !flag_commands)  || flag_commands)  K::Logger::Logg.classe(C_COMMAND) .set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_commands));
-        if ((unique && !flag_audio)     || flag_audio)     K::Logger::Logg.classe(C_AUDIO_EV).set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_audio));
-        if ((unique && !flag_modem)     || flag_modem)     K::Logger::Logg.classe(C_MODEM_EV).set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_modem));
-        if ((unique && !flag_link)      || flag_link)      K::Logger::Logg.classe(C_LINK_STT).set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_link));
-        if ((unique && !flag_cas)       || flag_cas)       K::Logger::Logg.classe(C_CAS_MSGS).set(O_GENERIC, LogManager::Option::ENABLED, (!invert && flag_cas));
-        if ((unique && !flag_functions) || flag_functions) K::Logger::Logg.classe(C_DBG_FUNC).enabled(!invert && flag_functions);
-        if ((unique && !flag_threads)   || flag_threads)   K::Logger::Logg.classe(C_DBG_THRD).enabled(!invert && flag_threads);
-        if ((unique && !flag_locks)     || flag_locks)     K::Logger::Logg.classe(C_DBG_LOCK).enabled(!invert && flag_locks);
-        if ((unique && !flag_streams)   || flag_streams)   K::Logger::Logg.classe(C_DBG_STRM).enabled(!invert && flag_streams);
-
-        if (!strs.empty())
-        {
-            K::Logger::Logg2(classe, s, FMT("NOTICE: %s %sthe logging of the following messages: %s.")
-                    % (invert ? "Disabling" : "Enabling")
-                    % (unique ? "just " : "") % strs.merge(", "));
-
-            if ((flag_streams || flag_locks) && !invert)
-            {
-                K::Logger::Logg2(classe, s, "WARNING: You have enabled *INTENSIVE* debug messages for the Khomp channel!");
-                K::Logger::Logg2(classe, s, "WARNING: Don't *EVER* use these options on production systems, unless you *REALLY* know what you are doing!");
-            }
-            else if ((flag_functions || flag_threads) && !invert)
-            {
-                K::Logger::Logg2(classe, s, "WARNING: You have enabled some debug messages for the Khomp channel.");
-                K::Logger::Logg2(classe, s, "WARNING: Do not use these options on production systems unless you really know what you are doing!");
-            }
-        }
-        else
-        {
-            K::Logger::Logg2(classe, s, "WARNING: No valid log messages have been specified, doing nothing.");
-        }
-    }
-}
diff --git a/src/mod/endpoints/mod_khomp/src/opt.cpp b/src/mod/endpoints/mod_khomp/src/opt.cpp
deleted file mode 100644
index 5166643f70..0000000000
--- a/src/mod/endpoints/mod_khomp/src/opt.cpp
+++ /dev/null
@@ -1,694 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include "opt.h"
-#include "globals.h"
-#include "defs.h"
-#include "logger.h"
-#include "spec.h"
-
-#include <function.hpp>
-
-Options               Opt::_options;
-CadencesMapType       Opt::_cadences;
-GroupToDestMapType    Opt::_groups;
-OrigToDestMapType     Opt::_fxs_hotline;
-BoardToOrigMapType    Opt::_fxs_orig_base;
-BranchToOptMapType    Opt::_branch_options;
-BranchToObjectMapType Opt::_fxs_branch_map;
-
-/* not beautiful, should think of something! */
-#define FUNCTION_VALUE(x) reinterpret_cast< Config::FunctionValue Options::* >( x )
-
-void Opt::initialize(void)
-{
-    Globals::options.add(Config::Option("debug",    &Options::_debug,    false));
-    Globals::options.add(Config::Option("dialplan", &Options::_dialplan, "XML"));
-    Globals::options.add(Config::Option("context",  &Options::_context,  "default"));
-
-	Globals::options.add(Config::Option("echo-canceller",      &Options::_echo_canceller,      true));
-	Globals::options.add(Config::Option("auto-gain-control",   &Options::_auto_gain_control,   true));
-	Globals::options.add(Config::Option("out-of-band-dtmfs",   &Options::_out_of_band_dtmfs,   true));
-	Globals::options.add(Config::Option("suppression-delay",   &Options::_suppression_delay,   true));
-	Globals::options.add(Config::Option("pulse-forwarding",    &Options::_pulse_forwarding,    false));
-	Globals::options.add(Config::Option("native-bridge",       &Options::_native_bridge,       true));
-	Globals::options.add(Config::Option("recording",           &Options::_recording,           true));
-	Globals::options.add(Config::Option("has-ctbus",           &Options::_has_ctbus,           false));
-	Globals::options.add(Config::Option("fxs-bina",            &Options::_fxs_bina,            true));
-	Globals::options.add(Config::Option("fxs-sharp-dial",      &Options::_fxs_sharp_dial,      true));
-	Globals::options.add(Config::Option("drop-collect-call",   &Options::_drop_collect_call,   false));
-	Globals::options.add(Config::Option("ignore-letter-dtmfs", &Options::_ignore_letter_dtmfs, true));
-	Globals::options.add(Config::Option("optimize-audio-path", &Options::_optimize_audio_path, false));
-
-    Globals::options.add(Config::Option("fxo-send-pre-audio",     &Options::_fxo_send_pre_audio,  true));
-    Globals::options.add(Config::Option("fxo-busy-disconnection", &Options::_fxo_busy_disconnection, 1250u, 50u, 90000u));
-
-    Globals::options.add(Config::Option("auto-fax-adjustment",    &Options::_auto_fax_adjustment,    true));
-    Globals::options.add(Config::Option("fax-adjustment-timeout", &Options::_fax_adjustment_timeout, 30u, 3u, 9999u));
-
-    Globals::options.add(Config::Option("r2-strict-behaviour", &Options::_r2_strict_behaviour, false));
-    Globals::options.add(Config::Option("r2-preconnect-wait",  &Options::_r2_preconnect_wait,  250u, 25u, 500u));
-
-    Globals::options.add(Config::Option("fxs-digit-timeout",    &Options::_fxs_digit_timeout,   7u,  1u, 30u));
-    Globals::options.add(Config::Option("transferdigittimeout", &Options::_transferdigittimeout, 3000u, 0u, 90000u));
-
-    Globals::options.add(Config::Option("atxfer",    &Options::_atxfer, ""));
-    Globals::options.add(Config::Option("blindxfer", &Options::_blindxfer, ""));
-
-    Globals::options.add(Config::Option("flash-to-digits", &Options::_flash, "*1"));
-
-    Globals::options.add(Config::Option("delay-ringback-co",  &Options::_ringback_co_delay,  1500u, 0u, 999000u));
-    Globals::options.add(Config::Option("delay-ringback-pbx", &Options::_ringback_pbx_delay, 2500u, 0u, 999000u));
-
-    Globals::options.add(Config::Option("disconnect-delay", &Options::_disconnect_delay, 0u, 0u, 100000u));
-
-    Globals::options.add(Config::Option("input-volume",  &Options::_input_volume, 0, -10, 10));
-    Globals::options.add(Config::Option("output-volume", &Options::_output_volume, 0, -10, 10));
-
-    Globals::options.add(Config::Option("fxs-co-dialtone",
-        FUNCTION_VALUE(&Options::_fxs_co_dialtone), ""));
-
-    Globals::options.add(Config::Option("log-to-disk",
-        FUNCTION_VALUE(&Options::_log_disk_option),    "standard", false));
-
-    Globals::options.add(Config::Option("callgroup", &Options::_callgroup,   "0"));
-
-    Globals::options.add(Config::Option("pickupgroup", &Options::_pickupgroup, "0"));
-
-    Globals::options.add(Config::Option("log-to-console",
-        FUNCTION_VALUE(&Options::_log_console_option), "standard", false));
-
-    Globals::options.add(Config::Option("trace",
-        FUNCTION_VALUE(&Options::_log_trace_option), "", false));
-
-    Globals::options.add(Config::Option("record-prefix",
-        FUNCTION_VALUE(&Options::_record_prefix), "/var/spool/freeswitch/monitor/"));
-
-    Globals::options.add(Config::Option("fxs-global-orig", &Options::_fxs_global_orig_base,  "0"));
-
-    Globals::options.add(Config::Option("language", &Options::_global_language, ""));
-    Globals::options.add(Config::Option("mohclass", &Options::_global_mohclass, ""));
-
-    Globals::options.add(Config::Option("context-fxo",          &Options::_context_fxo,       "khomp-DD-CC"));
-    Globals::options.add(Config::Option("context-fxo-alt",      &Options::_context2_fxo,      "khomp-DD"));
-    Globals::options.add(Config::Option("context-fxs",          &Options::_context_fxs,       "khomp-DD-CC"));
-    Globals::options.add(Config::Option("context-fxs-alt",      &Options::_context2_fxs,      "khomp-DD"));
-    Globals::options.add(Config::Option("context-gsm-call",     &Options::_context_gsm_call,  "khomp-DD-CC"));
-    Globals::options.add(Config::Option("context-gsm-call-alt", &Options::_context2_gsm_call, "khomp-DD"));
-    Globals::options.add(Config::Option("context-gsm-sms",      &Options::_context_gsm_sms,   "khomp-sms-DD-CC"));
-    Globals::options.add(Config::Option("context-digital",      &Options::_context_digital,   "khomp-DD-LL"));
-    Globals::options.add(Config::Option("context-pr",           &Options::_context_pr,        "khomp-DD-CC"));
-
-    Globals::options.add(Config::Option("accountcode", &Options::_accountcode, ""));
-
-    Config::StringSet activation_strings;
-    activation_strings.insert("auto");
-    activation_strings.insert("manual");
-
-    Globals::options.add(Config::Option("kommuter-activation", &Options::_kommuter_activation , "auto", activation_strings));
-    Globals::options.add(Config::Option("kommuter-timeout",    &Options::_kommuter_timeout ,(unsigned int) 10 , (unsigned int) 0 , (unsigned int) 255));
-
-    Globals::options.add(Config::Option("audio-packet-length", &Options::_audio_packet_size,
-         (unsigned int)KHOMP_READ_PACKET_SIZE, (unsigned int)KHOMP_MIN_READ_PACKET_SIZE, (unsigned int)KHOMP_MAX_READ_PACKET_SIZE, 8u));
-
-    Globals::options.add(Config::Option("user-transfer-digits", &Options::_user_xfer_digits, ""));
-
-    /* aliases */
-    Globals::options.synonym("context-gsm", "context-gsm-call");
-    Globals::options.synonym("context-gsm-alt", "context-gsm-call-alt");
-    Globals::options.synonym("echocanceller", "echo-canceller");
-    Globals::options.synonym("dtmfsuppression", "out-of-band-dtmfs");
-    Globals::options.synonym("dtmfsupression", "out-of-band-dtmfs");
-    Globals::options.synonym("pulsedetection", "pulse-forwarding");
-    Globals::options.synonym("r2preconnectwait", "r2-preconnect-wait");
-    Globals::options.synonym("bridge", "native-bridge");
-    Globals::options.synonym("suppressiondelay", "suppression-delay");
-    Globals::options.synonym("log", "log-to-disk");
-    Globals::options.synonym("volume", "output-volume");
-    Globals::options.synonym("disconnectdelay", "disconnect-delay");
-}
-
-void Opt::obtain(void)
-{
-    try
-    {
-        /* everything should start clean! */
-        cleanConfiguration();
-
-        /* reset loaded options */
-        Globals::options.reset(&Opt::_options);
-
-        /* should be loaded *BEFORE* start_k3l */
-        loadConfiguration("khomp.conf", NULL);
-
-        /* commit, loading defaults where needed */
-            Config::Options::Messages msgs = Globals::options.commit(&Opt::_options);
-
-        /* config already full loaded at this point, so we can use our own log system... */
-        for (Config::Options::Messages::iterator i = msgs.begin(); i != msgs.end(); i++)
-        {
-            DBG(FUNC,FMT("%s") % (*i).c_str());
-        }
-    }
-    catch (std::runtime_error & e)
-    {
-        LOG(ERROR, FMT("unable to obtain general options: %s: procedure aborted!") % e.what());
-    }
-}
-
-void Opt::commit(void)
-{
-    processGroupString();
-
-    /* Check FXS hotlines correcteness */
-    OrigToDestMapType::const_iterator endOfHotlines = _fxs_hotline.end();
-
-    for (OrigToDestMapType::const_iterator i = _fxs_hotline.begin(); i != endOfHotlines; i++)
-    {
-        BranchToObjectMapType::const_iterator j = _fxs_branch_map.find(i->first);
-
-        if (j == _fxs_branch_map.end())
-        {
-            LOG(ERROR, FMT("unable to find branch '%s': hotline '%s' to '%s' is invalid!")
-                % i->first % i->first % i->second);
-        }
-    }
-
-    /* Check FXS options correcteness */
-    BranchToOptMapType::const_iterator endOfOptions = _branch_options.end();
-
-    for (BranchToOptMapType::const_iterator i = _branch_options.begin(); i != endOfOptions; i++)
-    {
-        BranchToObjectMapType::const_iterator j = _fxs_branch_map.find(i->first);
-        if (j == _fxs_branch_map.end())
-        {
-            LOG(ERROR, FMT("unable to find branch '%s' for options '%s'")
-                % i->first % i->second);
-        }
-    }
-}
-
-void Opt::loadConfiguration(const char *file_name, const char **section, bool show_errors)
-{
-    switch_xml_t cfg, xml, settings;
-
-    if (!(xml = switch_xml_open_cfg(file_name, &cfg, NULL)))
-    {
-        if (show_errors)
-        {
-            LOG(ERROR,FMT("Open of %s failed") % file_name);
-        }
-
-        return;
-    }
-
-    /* Load all the global settings pertinent to all boards */
-    settings = processSimpleXML(cfg,"settings");
-
-    /* Process channel settings */
-    processSimpleXML(settings,"channels");
-
-    /* Process groups settings */
-    processGroupXML(settings);
-
-    /* Process cadence settings */
-    processCadenceXML(settings);
-
-    /* Process fxs branches settings */
-    processFXSBranchesXML(settings);
-
-    /* Process hotlines settings */
-    processFXSHotlines(settings);
-
-    /* Process fxs options settings */
-    processFXSOptions(settings);
-
-    switch_xml_free(xml);
-}
-
-void Opt::cleanConfiguration(void)
-{
-    _fxs_orig_base.clear();
-    _fxs_hotline.clear();
-    _fxs_branch_map.clear();
-    _branch_options.clear();
-
-    _groups.clear();
-    _cadences.clear();
-
-    _cadences.insert(CadencesPairType("fast-busy", CadenceType(100,100)));
-    _cadences.insert(CadencesPairType("ringback", CadenceType(1000,4000)));
-    _cadences.insert(CadencesPairType("pbx-dialtone", CadenceType(1000,100)));
-    _cadences.insert(CadencesPairType("co-dialtone", CadenceType(0,0)));
-    _cadences.insert(CadencesPairType("vm-dialtone", CadenceType(1000,100,100,100)));
-}
-
-/*
-void Options::AmaflagOption::operator()(const Config::StringType & str)
-{
-    //_value = Strings::tolong(str);
-    //if(_value < 0)
-    //    throw Config::Failure(STG(FMT("invalid AMA flags: %s") % str));
-}
-
-void Options::CallGroupOption::operator()(const Config::StringType & str)
-{
-    _groups = str;
-}
-
-void Options::PickupGroupOption::operator()(const Config::StringType & str)
-{
-    _groups = str;
-}
-*/
-
-void Options::RecordPrefixOption::operator()(const Config::StringType & str)
-{
-    if (mkdir(str.c_str(), 493 /* 0755 */) < 0 && errno != EEXIST)
-        throw Config::Failure("the default recording directory could not be created.");
-
-    _value = str;
-}
-
-void Options::CentralOfficeDialtone::operator()(const Config::StringType & str)
-{
-    Strings::vector_type tokens;
-    Strings::tokenize(str, tokens, ",");
-
-    for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++)
-        _value.push_back(*i);
-}
-
-void Options::LogDiskOption::operator()(const Config::StringType & str)
-{
-    K::Logger::processLogDisk(NULL, str, false, true);
-}
-
-void Options::LogConsoleOption::operator()(const Config::StringType & str)
-{
-    K::Logger::processLogConsole(NULL, str, false, true);
-}
-
-void Options::LogTraceOption::operator()(const Config::StringType & str)
-{
-    Strings::vector_type tokens;
-    Strings::tokenize(str, tokens, ",");
-
-    bool         enable_k3l_tracing  = false;
-    bool         enable_r2_tracing   = false;
-    bool         enable_rdsi_tracing = false;
-
-    for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++)
-    {
-        std::string tok = Strings::trim(*i);
-
-        /**/ if (tok == "k3l")  enable_k3l_tracing = true;
-        else if (tok == "r2")   enable_r2_tracing = true;
-        else if (tok == "rdsi") enable_rdsi_tracing = true;
-        else
-        {
-            LOG(ERROR, FMT("invalid string '%s' for option 'trace', ignoring...") % tok)
-        }
-    }
-
-    Logfile logfile;
-
-    /* k3l tracing */
-    if (enable_k3l_tracing)
-    {
-        K::LogConfig::set(logfile, "K3L", "Value",        enable_k3l_tracing);
-        K::LogConfig::set(logfile, "K3L", "CallProgress", enable_k3l_tracing);
-        K::LogConfig::set(logfile, "K3L", "CallAnalyzer", enable_k3l_tracing);
-        K::LogConfig::set(logfile, "K3L", "CadenceRecog", enable_k3l_tracing);
-        K::LogConfig::set(logfile, "K3L", "CallControl",  enable_k3l_tracing);
-        K::LogConfig::set(logfile, "K3L", "Fax",          enable_k3l_tracing);
-    }
-
-    /* r2 tracing */
-    K::LogConfig::set(logfile, "R2", "Value",     enable_r2_tracing);
-    K::LogConfig::set(logfile, "R2", "Signaling", enable_r2_tracing);
-    K::LogConfig::set(logfile, "R2", "States",    enable_r2_tracing);
-
-    /* ISDN tracing */
-    if (enable_rdsi_tracing ^ Globals::flag_trace_rdsi)
-    {
-        K::LogConfig::set(logfile, "ISDN", "Value", enable_rdsi_tracing);
-        K::LogConfig::set(logfile, "ISDN", "Lapd",  enable_rdsi_tracing);
-        K::LogConfig::set(logfile, "ISDN", "Q931",  enable_rdsi_tracing);
-    }
-
-    try
-    {
-        Globals::k3lapi.command(-1, -1, CM_LOG_UPDATE);
-    }
-    catch(...)
-    {
-        LOG(ERROR,"Error while send command CM_LOG_UPDATE");
-    }
-}
-
-switch_xml_t Opt::processSimpleXML(switch_xml_t &xml, const std::string& child_name)
-{
-    switch_xml_t param, child;
-
-    if ((child = switch_xml_child(xml, child_name.c_str())))
-    {
-        for (param = switch_xml_child(child, "param"); param; param = param->next)
-        {
-            char *var = (char *) switch_xml_attr_soft(param, "name");
-            char *val = (char *) switch_xml_attr_soft(param, "value");
-
-            try
-            {
-                DBG(FUNC,FMT("loading '%s' options: '%s'...")
-                    % var
-                    % val);
-
-                Globals::options.process(&Opt::_options, var, val);
-            }
-            catch (Config::Failure e)
-            {
-                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")
-                    % e.what()
-                    % var
-                    % val);
-
-            }
-        }
-    }
-
-    return child;
-}
-
-void Opt::processGroupXML(switch_xml_t &xml)
-{
-    switch_xml_t param, child;
-
-    if ((child = switch_xml_child(xml,"groups")))
-    {
-        for (param = switch_xml_child(child, "param"); param; param = param->next)
-        {
-            char *var = (char *) switch_xml_attr_soft(param, "name");
-            char *val = (char *) switch_xml_attr_soft(param, "value");
-
-            try
-            {
-                DBG(FUNC,FMT("loading group '%s' options: '%s'...")
-                    % var
-                    % val);
-
-                _groups.insert(GroupToDestPairType(var,val));
-
-            }
-            catch (Config::Failure e)
-            {
-                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")
-                    % e.what()
-                    % var
-                    % val);
-            }
-        }
-    }
-}
-
-void Opt::processCadenceXML(switch_xml_t &xml)
-{
-    switch_xml_t param, child;
-
-    if ((child = switch_xml_child(xml,"cadences")))
-    {
-        for (param = switch_xml_child(child, "param"); param; param = param->next)
-        {
-            char *var = (char *) switch_xml_attr_soft(param, "name");
-            char *val = (char *) switch_xml_attr_soft(param, "value");
-
-            try
-            {
-                DBG(FUNC,FMT("loading cadences '%s' options: '%s'...")
-                    % var
-                    % val);
-
-                Strings::vector_type values;
-                Strings::tokenize(val, values, " :,.");
-
-                if (values.size() != 2 && values.size() != 4)
-                {
-                    LOG(WARNING, FMT("file '%s': wrong number of arguments at cadence '%s'!")
-                        % "khomp.conf.xml"
-                        % var);
-                }
-                else
-                {
-                    CadenceType cadence;
-
-                    cadence.ring       = Strings::toulong(Strings::trim(values[0]));
-                    cadence.ring_s     = Strings::toulong(Strings::trim(values[1]));
-
-                    if (values.size() == 4)
-                    {
-                        cadence.ring_ext   = Strings::toulong(Strings::trim(values[2]));
-                        cadence.ring_ext_s = Strings::toulong(Strings::trim(values[3]));
-                    }
-
-                    _cadences.erase(var); /* erases previous (possibly predefined) cadence */
-                    _cadences.insert(CadencesPairType(var, cadence));
-                }
-            }
-            catch (Config::Failure e)
-            {
-                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")
-                    % e.what()
-                    % var
-                    % val);
-
-            }
-            catch (Strings::invalid_value e)
-            {
-               LOG(ERROR,FMT("file '%s': number expected at cadence '%s', got '%s'.")
-                    % "khomp.conf.xml"
-                    % var
-                    % e.value().c_str());
-            }
-        }
-    }
-}
-
-void Opt::processFXSBranchesXML(switch_xml_t &xml)
-{
-    switch_xml_t param, child;
-
-    if ((child = switch_xml_child(xml,"fxs-branches")))
-    {
-        for (param = switch_xml_child(child, "param"); param; param = param->next)
-        {
-            char *var = (char *) switch_xml_attr_soft(param, "name");
-            char *val = (char *) switch_xml_attr_soft(param, "value");
-
-
-            DBG(FUNC,FMT("loading fxs-branches '%s' options: '%s'...")
-                    % var
-                    % val);
-
-            try
-            {
-                unsigned long orig_number = Strings::toulong(var);
-
-                /* gcc! stop complaining! */
-                (void)orig_number;
-
-                Strings::vector_type boards;
-                Strings::tokenize(val, boards, " :,");
-
-                if (boards.size() < 1)
-                {
-                    DBG(FUNC,FMT("file '%s': orig number '%s' without any board!")
-                        % "khomp.conf.xml"
-                        % var);
-                    continue;
-                }
-
-                for (Strings::vector_type::iterator iter = boards.begin(); iter != boards.end(); iter++)
-                {
-                    /* quebrar em strings por vírgula/espaço */
-                    unsigned long serial_number = Strings::toulong(Strings::trim(*iter));
-
-                    bool found = false;
-
-                    for (unsigned int device = 0; device < Globals::k3lapi.device_count(); device++)
-                    {
-                        const K3L_DEVICE_CONFIG & conf = Globals::k3lapi.device_config(device);
-
-                        std::string str_serial(conf.SerialNumber);
-
-                        if (Strings::toulong(str_serial) == serial_number)
-                        {
-                            found = true;
-
-                            _fxs_orig_base.insert(BoardToOrigPairType(device, var));
-                            break;
-                        }
-                    }
-
-                    if (!found)
-                    {
-                        LOG(WARNING, FMT("file 'khomp.conf.xml': board with serial number '%u' not found!")
-                        % serial_number);
-
-                        break;
-                    }
-                }
-            }
-            catch (Config::Failure e)
-            {
-                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")
-                    % e.what()
-                    % var
-                    % val);
-            }
-            catch (Strings::invalid_value & e)
-            {
-                LOG(ERROR, D("invalid numeric value: %s") % e.value());
-            }
-            catch (...)
-            {
-                LOG(ERROR, D("config processing error..."));
-            }
-        }
-    }
-}
-
-void Opt::processFXSHotlines(switch_xml_t &xml)
-{
-    switch_xml_t param, child;
-
-    if ((child = switch_xml_child(xml,"fxs-hotlines")))
-    {
-        for (param = switch_xml_child(child, "param"); param; param = param->next)
-        {
-            char *var = (char *) switch_xml_attr_soft(param, "name");
-            char *val = (char *) switch_xml_attr_soft(param, "value");
-
-            try
-            {
-                DBG(FUNC,FMT("loading fxs-hotlines '%s' options: '%s'...")
-                    % var
-                    % val);
-
-                unsigned long orig_number = Strings::toulong(var);
-
-                (void)orig_number; /* stop complaining! */
-
-                _fxs_hotline.insert(OrigToDestPairType(var, val));
-
-            }
-            catch (Config::Failure e)
-            {
-                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")
-                    % e.what()
-                    % var
-                    % val);
-            }
-            catch (Strings::invalid_value e)
-            {
-                LOG(WARNING, FMT("file '%s': number expected, got '%s'!")
-                    % "khomp.conf.xml" % e.value().c_str());
-            }
-        }
-    }
-}
-
-void Opt::processFXSOptions(switch_xml_t &xml)
-{
-    switch_xml_t param, child;
-
-    if ((child = switch_xml_child(xml,"fxs-options")))
-    {
-        for (param = switch_xml_child(child, "param"); param; param = param->next)
-        {
-            char *var = (char *) switch_xml_attr_soft(param, "name");
-            char *val = (char *) switch_xml_attr_soft(param, "value");
-
-            try
-            {
-                DBG(FUNC,FMT("loading fxs-options '%s' options: '%s'...")
-                    % var
-                    % val);
-
-                Strings::vector_type branches;
-                Strings::tokenize(var, branches, " ,");
-
-                if (branches.size() < 1)
-                {
-                    //TODO: Get linenumber
-                    LOG(WARNING, FMT("file '%s': no branches specified in line %d!")
-                    % "khomp.conf.xml" % 0);
-                }
-                else
-                {
-                    for (Strings::vector_type::iterator iter = branches.begin();
-                            iter != branches.end(); iter++)
-                    {
-                        std::string tmp_branch = Strings::trim(*iter);
-
-                        unsigned long branch_number = Strings::toulong(tmp_branch);
-                        (void) branch_number;
-
-                        _branch_options.insert(BranchToOptPairType(tmp_branch, val));
-                    }
-                }
-            }
-            catch (Config::Failure e)
-            {
-                LOG(ERROR,FMT("config processing error: %s. [%s=%s]")
-                    % e.what()
-                    % var
-                    % val);
-            }
-            catch (Strings::invalid_value e)
-            {
-                LOG(WARNING, FMT("file '%s': number expected, got '%s'!")
-                    % "khomp.conf.xml" % e.value().c_str());
-            }
-        }
-    }
-}
diff --git a/src/mod/endpoints/mod_khomp/src/spec.cpp b/src/mod/endpoints/mod_khomp/src/spec.cpp
deleted file mode 100644
index 38b0cfb6d9..0000000000
--- a/src/mod/endpoints/mod_khomp/src/spec.cpp
+++ /dev/null
@@ -1,893 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include <regex.hpp>
-#include "spec.h"
-#include "logger.h"
-#include "khomp_pvt.h"
-#include "khomp_pvt_kxe1.h"
-
-/************************** Forward declaration *******************************/
-static SpecRetType processSpecAtom(std::string &, SpecFlagsType &, SpecFunType &);
-static SpecRetType processSpecAtoms(std::string &, SpecFlagsType &, SpecFunType &);
-
-static bool processCallChannelString(std::string &, Board::KhompPvt *&, int *, bool need_free = true);
-
-/******************************************************************************/
-
-static SpecRetType processSpecAtom(std::string & atom, SpecFlagsType & flags, SpecFunType & fun)
-{
-	std::string allocstr = Strings::trim(atom);
-
-	DBG(FUNC, D("allocation string 'atom': %s") % allocstr.c_str());
-
-    /* check if is a group */
-   	if (allocstr.size() >= 1 && (allocstr[0] == 'g' || allocstr[0] == 'G'))
-    {
-   		std::string group_name = allocstr.substr(1);
-
-		GroupToDestMapType::iterator it = Opt::_groups.find(group_name);
-
-		if (it == Opt::_groups.end())
-		{
-			LOG(ERROR, FMT("invalid dial string '%s': no valid group found!") % allocstr.c_str());
-        	return SPR_FAIL;
-		}
-
-		allocstr = it->second;
-		return processSpecAtoms(allocstr, flags, fun);
-    }
-
-	Regex::Match what(allocstr, Globals::regex_allocation);
-
-	if (!what.matched())
-	{
-		LOG(ERROR, FMT("invalid dial string '%s': this is not a valid expression.") % allocstr.c_str());
-		return SPR_FAIL;
-	}
-
-	bool reverse = true;
-
-	try
-	{
-
-		unsigned long int board_id = UINT_MAX;
-
-		if (what.matched(3)) //matched [bB]
-		{
-			board_id = Strings::toulong(what.submatch(5));
-
-			DBG(FUNC, D("board matched: %d") % board_id);
-
-
-			if (board_id >= Globals::k3lapi.device_count())
-			{
-            	LOG(ERROR, FMT("invalid dial string '%s': no such board '%d'.") % allocstr.c_str() % board_id);
-				return SPR_FAIL;
-			}
-
-			switch ((what.submatch(4))[0])
-			{
-				case 'b': reverse = false; break;
-				case 'B': reverse = true;  break;
-			}
-		}
-
-		else if (what.matched(6)) //matched [sS]
-		{
-			unsigned int serial_id = Strings::toulong(what.submatch(8));
-
-			DBG(FUNC, D("serial matched: %d") % serial_id);
-
-			for (unsigned int i = 0; i < Globals::k3lapi.device_count(); i++)
-			{
-
-				K3L_DEVICE_CONFIG conf = Globals::k3lapi.device_config(i);
-
-				unsigned int tmp = Strings::toulong((const char *)conf.SerialNumber);
-
-				if (tmp == serial_id)
-				{
-					board_id = i;
-					break;
-				}
-			}
-
-			if (board_id == UINT_MAX)
-			{
-   	        	LOG(ERROR, FMT("invalid dial string '%s': there is no board with serial '%04d'.") % allocstr.c_str() % serial_id);
-				return SPR_FAIL;
-			}
-
-			switch ((what.submatch(7))[0])
-			{
-				case 's': reverse = false; break;
-				case 'S': reverse = true;  break;
-			}
-		}
-		else if (what.matched(14)) //matched [rR]
-		{
-			std::string base_addr = what.submatch(16);
-
-			unsigned int branch_id = Strings::toulong(base_addr);
-
-			if (what.matched(17))
-			{
-				unsigned int branch2_id = Strings::toulong(what.submatch(18));
-
-				DBG(FUNC, D("branch range matched (%d to %d)") % branch_id % branch2_id);
-
-				switch ((what.submatch(15))[0])
-				{
-					case 'r': reverse = false; break;
-					case 'R': reverse = true;  break;
-				}
-
-				if (!reverse)
-				{
-					for (unsigned int i = branch_id; i <= branch2_id; i++)
-					{
-						std::string call_addr = BoardE1::KhompPvtFXS::padOrig(base_addr, i - branch_id);
-						BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(call_addr);
-
-						if (i == Opt::_fxs_branch_map.end())
-						{
-   	    			    	LOG(WARNING, FMT("invalid value '%s': there is no such branch number.") % call_addr);
-							return SPR_FAIL;
-						}
-
-						if (!fun(i->second.first, i->second.second, flags))
-							return SPR_SUCCESS;
-					}
-				}
-				else
-				{
-					for (unsigned int i = branch2_id; i >= branch_id; i--)
-					{
-						std::string call_addr = BoardE1::KhompPvtFXS::padOrig(base_addr, i - branch_id);
-
-						BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(call_addr);
-
-						if (i == Opt::_fxs_branch_map.end())
-						{
-   	    			    	LOG(WARNING, FMT("invalid value '%s': there is no such branch number.") % call_addr);
-							return SPR_FAIL;
-						}
-
-						if (!fun(i->second.first, i->second.second, flags))
-							return SPR_SUCCESS;
-					}
-				}
-			}
-			else
-			{
-				DBG(FUNC, D("branch matched: %s") % base_addr);
-
-				BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(base_addr);
-
-				if (i == Opt::_fxs_branch_map.end())
-				{
-   	    	    	LOG(WARNING, FMT("invalid value '%s': there is no such branch number.") % base_addr);
-					return SPR_FAIL;
-				}
-
-				if (!fun(i->second.first, i->second.second, flags))
-					return SPR_SUCCESS;
-			}
-		}
-
-		else
-		{
-           	LOG(ERROR, FMT("invalid dial string '%s': unknown allocation method.") % allocstr.c_str());
-			return SPR_FAIL;
-		}
-
-		if (what.matched(9)) // matched something about links/channels [cClL]n|[cC]n-m
-		{
-			DBG(FUNC, D("channel/link matched"));
-			unsigned long int object_id = Strings::toulong(what.submatch(11));
-
-			if (what.matched(12))
-			{
-
-				DBG(FUNC, D("channel range matched")); // matched [cC]n-m
-
-				if ((what.submatch(10))[0] != 'c' && (what.submatch(10))[0] != 'C')
-				{
-					LOG(ERROR, FMT("invalid dial string '%s': range just allowed for channels.") % allocstr.c_str());
-					return SPR_FAIL;
-				}
-
-				unsigned long int object2_id = Strings::toulong(what.submatch(13));
-
-				DBG(FUNC, D("(d=%d,lo=%d,up=%d,r=%s) c") % board_id % object_id % object2_id % (reverse ? "true" : "false"));
-
-				if (reverse)
-				{
-					for (unsigned int obj = std::min<unsigned int>(object2_id + 1, Globals::k3lapi.channel_count(board_id)); obj > 0 && obj > object_id; obj--)
-					{
-						if (!fun(board_id, obj-1, flags))
-							return SPR_SUCCESS;
-					}
-				}
-				else
-				{
-					for (unsigned int obj = object_id; obj < std::min<unsigned int>(Globals::k3lapi.channel_count(board_id), object2_id + 1); obj++)
-					{
-						if (!fun(board_id, obj, flags))
-							return SPR_SUCCESS;
-					}
-				}
-
-			}
-
-			else // matched [cClL]n
-			{
-				DBG(FUNC, D("individual channel/link matched"));
-
-				switch ((what.submatch(10))[0])
-				{
-					case 'C':
-					case 'c':
-						DBG(FUNC, D("individual channel matched"));
-
-						if (!fun(board_id, object_id, flags))
-							return SPR_SUCCESS;
-
-                        return SPR_CONTINUE;
-
-					case 'l':
-					case 'L':
-						DBG(FUNC, D("individual link matched"));
-
-						switch (Globals::k3lapi.device_type(board_id))
-						{
-							case kdtE1:
-							case kdtPR:
-							case kdtE1GW:
-							case kdtE1IP:
-							case kdtE1Spx:
-#if K3L_AT_LEAST(2,1,0)
-							case kdtE1FXSSpx:
-#endif
-							{
-								unsigned int link_first = object_id * 30;
-								unsigned int link_final = ((object_id + 1) * 30);
-
-								if (reverse)
-								{
-									for (unsigned int obj = std::min(link_final, Globals::k3lapi.channel_count(board_id)); obj > 0 && obj > link_first; obj--)
-									{
-										if (!fun(board_id, obj-1, flags))
-											return SPR_SUCCESS;
-									}
-								}
-								else
-								{
-									for (unsigned int obj = link_first; obj < std::min(Globals::k3lapi.channel_count(board_id), link_final); obj++)
-									{
-										if (!fun(board_id, obj, flags))
-											return SPR_SUCCESS;
-									}
-								}
-                                return SPR_CONTINUE;
-
-							}
-
-							default:
-								LOG(ERROR, FMT("invalid dial string '%s': board '%d' does not have links.")
-									% allocstr.c_str() % board_id);
-								return SPR_FAIL;
-						}
-
-					default:
-						LOG(ERROR, FMT("invalid dial string '%s': invalid object specification.") % allocstr.c_str());
-						return SPR_FAIL;
-				}
-			}
-		}
-		else if (what.matched(3) || what.matched(6)) // matched something about boards [bBsS]
-		{
-			if (reverse)
-			{
-				for (unsigned int obj = Globals::k3lapi.channel_count(board_id); obj > 0; obj--)
-				{
-					if (!fun(board_id, obj-1, flags))
-						return SPR_SUCCESS;
-		        }
-	        }
-			else
-			{
-				for (unsigned int obj = 0; obj < Globals::k3lapi.channel_count(board_id); obj++)
-				{
-					if (!fun(board_id, obj, flags))
-						return SPR_SUCCESS;
-				}
-			}
-		}
-
-	}
-	catch (Strings::invalid_value e)
-	{
-		LOG(ERROR, FMT("invalid dial string '%s': invalid numeric value specified.") % allocstr.c_str());
-		return SPR_FAIL;
-	}
-    catch (Function::EmptyFunction & e)
-    {
-		LOG(ERROR, FMT("invalid function."));
-		return SPR_FAIL;
-    }
-
-	return SPR_CONTINUE;
-}
-
-static SpecRetType processSpecAtoms(std::string & gotatoms, SpecFlagsType & flags, SpecFunType & fun)
-{
-	std::string atoms(gotatoms);
-
-	DBG(FUNC, D("allocation string 'atoms': %s") % atoms);
-
-
-	if (!atoms.empty() && (atoms.at(0) == '*'))  //so it is a "cyclical" allocation
-	{
-		atoms.erase(0, 1);
-
-		if (flags & SPF_FIRST)
-		{
-			if (!(flags & SPF_CYCLIC))
-			{
-				DBG(FUNC, D("got a cyclic/fair allocation (%s), priorizing less used channels...") % atoms);
-				flags |= SPF_CYCLIC;
-			}
-		}
-		else
-		{
-			DBG(FUNC, D("cyclic/fair allocation NOT at first string, ignoring..."));
-		}
-	}
-
-
-	Strings::vector_type boundaries;
-	Strings::tokenize(atoms, boundaries, "+");
-
-    if (boundaries.size() < 1)
-    {
-        LOG(ERROR, FMT("invalid dial string '%s': no allocation string found!") % atoms);
-        return SPR_FAIL;
-    }
-
-	for (Strings::vector_type::iterator iter = boundaries.begin(); iter != boundaries.end(); iter++)
-	{
-		switch (processSpecAtom(*iter, flags, fun))
-		{
-			// if had some error processing dialstring, bail out..
-			case SPR_FAIL:
-				return SPR_FAIL;
-
-			// found someone? return ASAP!
-			case SPR_SUCCESS:
-				return SPR_SUCCESS;
-
-			// else, keep going..
-			case SPR_CONTINUE:
-				break;
-		}
-
-		flags &= ~SPF_FIRST;
-	}
-
-	/* found nothing, but this is NOT an error */
-	return SPR_CONTINUE;
-}
-
-struct funProcessCallChannelString
-{
-	funProcessCallChannelString(int *cause, bool need_free)
-	: _cause(cause), _need_free(need_free),
-	  _all_fail(true), //_fxs_only(true),
-	  _pvt(NULL)
-	{};
-
-	bool operator()(unsigned int dev, unsigned int obj, SpecFlagsType & flags)
-	{
-        try
-        {
-    	    Board::KhompPvt *tmp = Board::get(dev, obj);
-
-	    	// used for cause definition
-		    if (_all_fail)
-			    _all_fail = (tmp ? !tmp->isOK() : true);
-        }
-        catch (K3LAPITraits::invalid_channel & err)
-        {
-            _all_fail = true;
-        }
-
-		//used for precise cause definition
-        //if (_fxs_only)
-		//	_fxs_only = (tmp ? tmp->is_fxs() : false);
-
-		if (flags & SPF_CYCLIC)
-		{
-			Board::queueAddChannel(_channels, dev, obj);
-			return true;
-		}
-		else
-		{
-			_pvt = Board::findFree(dev, obj, _need_free);
-			return (_pvt == NULL);
-		}
-		return true;
-	}
-
-	Board::KhompPvt * pvt(SpecFlagsType & flags)
-	{
-
-		if ((flags & SPF_CYCLIC) && !_pvt)
-		{
-			 //we have no pvt 'till now, lets find a suitable one..
-			_pvt = Board::queueFindFree(_channels);
-		}
-
-		if (!_pvt && _cause && !(*_cause))
-		{
-
-			if (_all_fail)
-			{
-				// all channels are in fail
-				*_cause = SWITCH_CAUSE_NETWORK_OUT_OF_ORDER;
-			}
-			else
-			{
-				//if (_fxs_only)
-				//	*_cause = SWITCH_CAUSE_USER_BUSY;
-				//else
-					*_cause = SWITCH_CAUSE_SWITCH_CONGESTION;
-			}
-		}
-
-		return _pvt;
-	}
-
-	int   * _cause;
-
-	bool    _need_free;
-
-	bool    _all_fail;
-	//bool    _fxs_only; //TODO: futuro implementar a parte de FXS
-
-	Board::KhompPvt          * _pvt;
-	Board::PriorityCallQueue   _channels;
-};
-
-struct funProcessSMSChannelString
-{
-
-    funProcessSMSChannelString(int *cause)
-    : _cause(cause), _all_fail(true), _pvt(NULL)
-    {};
-
-    bool operator()(unsigned int dev, unsigned int obj, SpecFlagsType & flags)
-    {
-        Board::KhompPvt *pvt = Board::findFree(dev, obj);
-
-        if (pvt)
-        {
-            // found something? check if its GSM
-            if (pvt->application(SMS_CHECK, NULL, NULL))
-            {
-                // used for cause definition
-                if (_all_fail)
-                    _all_fail = (pvt ? !pvt->isOK() : true);
-
-                if (flags & SPF_CYCLIC)
-                {
-                    Board::queueAddChannel(_channels, dev, obj);
-                    return true;
-                }
-                else
-                {
-                    _pvt = pvt;
-                    return false;
-                }
-            }
-            else
-            {
-                // not gsm, return ASAP and stop search
-                LOG(ERROR, PVT_FMT(pvt->target(), "channel is NOT a GSM channel! unable to send message!"));
-                return false;
-            }
-        }
-
-        // keep searching
-        return true;
-    }
-
-    Board::KhompPvt * pvt(SpecFlagsType & flags)
-    {
-        if ((flags & SPF_CYCLIC) && !_pvt)
-        {
-            // we have no pvt 'till now, lets find a suitable one..
-            _pvt = Board::queueFindFree(_channels);
-        }
-
-        if (!_pvt && _cause && !(*_cause))
-        {
-            if (_all_fail)
-            {
-                // all channels are in fail
-                *_cause = SWITCH_CAUSE_NETWORK_OUT_OF_ORDER;
-            }
-            else
-            {
-                // otherwise, congestion..
-                *_cause = SWITCH_CAUSE_SWITCH_CONGESTION;
-            }
-        }
-
-        return _pvt;
-    }
-
-    int                            * _cause;
-
-    bool                             _need_free;
-
-    bool                             _all_fail;
-
-	Board::KhompPvt          * _pvt;
-	Board::PriorityCallQueue   _channels;
-};
-
-struct FunProcessGroupString
-{
-    /* used for group processing */
-    FunProcessGroupString(std::string ctx)
-        : _ctx(ctx) {};
-
-    FunProcessGroupString(const FunProcessGroupString &o)
-        : _ctx(o._ctx) {};
-
-    bool operator()(unsigned int dev, unsigned int obj, SpecFlagsType & flags) const
-    {
-        try
-        {
-            Board::KhompPvt * pvt = Board::get(dev,obj);
-
-            DBG(CONF, FMT("loading context %s for channel %d,%d") % _ctx % dev % obj);
-
-            if (pvt) pvt->_group_context = _ctx;
-        }
-        catch (K3LAPITraits::invalid_channel & err)
-        {
-        }
-
-        return true;
-    }
-
-
-    std::string _ctx;
-};
-
-static bool processCallChannelString(std::string & str, Board::KhompPvt *& pvt, int * cause, bool need_free)
-{
-	funProcessCallChannelString  proc(cause, need_free);
-
-	SpecFlagsType   flags = SPF_FIRST;
-	SpecFunType     fun(proc, false); //   = ReferenceWrapper < SpecFunType > (proc);
-
-    bool ret = true;
-
-	switch (processSpecAtoms(str, flags, fun))
-	{
-		case SPR_FAIL:
-			DBG(FUNC, D("SPR_FAIL: %p") % cause);
-
-			if (cause)
-				*cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
-
-			ret = false;
-            break;
-		case SPR_SUCCESS:
-		case SPR_CONTINUE:
-            pvt = proc.pvt(flags);
-			DBG(FUNC, D("pvt = %p") % pvt);
-
-			if (cause && !(*cause))
-            {
-    			if (!pvt)
-			    	*cause = SWITCH_CAUSE_INTERWORKING;
-                else
-			    	*cause = SWITCH_CAUSE_SUCCESS;
-            }
-
-			ret = true;
-            break;
-	}
-
-	return ret;
-}
-
-bool processSMSChannelString(std::string & str, Board::KhompPvt *& pvt, int *cause)
-{
-    funProcessSMSChannelString proc(cause);
-
-    SpecFlagsType flags = SPF_FIRST;
-    SpecFunType   fun(proc, false);
-
-    switch (processSpecAtoms(str, flags, fun))
-    {
-        case SPR_FAIL:
-            DBG(FUNC, FMT("SPR_FAIL: %p") % cause);
-            if (cause)
-                *cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
-            return false;
-
-        case SPR_SUCCESS:
-        case SPR_CONTINUE:
-            pvt = proc.pvt(flags);
-            DBG(FUNC, FMT("pvt = %p") % pvt);
-
-            if (cause && !(*cause))
-            {
-    			if (!pvt)
-			    	*cause = SWITCH_CAUSE_INTERWORKING;
-                else
-			    	*cause = SWITCH_CAUSE_SUCCESS;
-            }
-
-            return true;
-    }
-
-    return true;
-}
-
-Board::KhompPvt * processDialString (const char *dial_charv, int *cause)
-{
-	DBG(FUNC, D("c (%p, %p)") % dial_charv % cause);
-	std::string           dial_string(dial_charv);
-	Strings::vector_type  dial_args;
-
-	Strings::tokenize(dial_string, dial_args, "/");
-
-	Board::KhompPvt *pvt = NULL;
-
-    DBG(FUNC, FMT("processing dial string [%d] : '%s'") % dial_args.size() % dial_string);
-
-	if ((dial_args.size() < 1 || dial_args.size() > 3))
-	{
-		LOG(ERROR, FMT("invalid dial string '%s': wrong number of separators ('/').") % dial_string);
-		return NULL;
-	}
-
-	bool dial_string_ok = processCallChannelString(dial_args[0], pvt, cause, true);
-
-	if (pvt == NULL)
-	{
-		if (dial_string_ok)
-            LOG(WARNING, "unable to allocate channel -- no free channel found!");
-		return NULL;
-    }
-
-    DBG(FUNC, PVT_FMT(pvt->target(), "pvt %p") % pvt);
-
-	unsigned int opt_size = (pvt->hasNumberDial() ? 3 : 2);
-	unsigned int opt_arg  = opt_size - 1;
-
-	if (dial_args.size() == opt_size)
-	{
-        Strings::vector_type options_args;
-        Strings::tokenize (dial_args[opt_arg], options_args, ":");
-
-		for (Strings::vector_type::iterator opt_arg = options_args.begin();
-		     opt_arg != options_args.end(); opt_arg++)
-		{
-			std::string str = (*opt_arg);
-
-			Strings::vector_type option_item;
-			Strings::tokenize (str, option_item, "=");
-
-			switch (option_item.size())
-			{
-				case 2:
-				{
-					std::string index (option_item[0]);
-					std::string value (option_item[1]);
-
-                    if(pvt->call()->process(index, value))
-						continue;
-
-					break;
-				}
-
-				case 1:
-				{
-		            std::string index (option_item[0]);
-
-                    if(pvt->call()->process(index))
-						continue;
-
-					break;
-				}
-
-				default:
-	            {
-					LOG(ERROR, FMT("invalid option specification '%s'.") % str);
-	                continue;
-	            }
-			}
-            LOG(ERROR, FMT("unknown option name '%s', ignoring...") % str);
-        }
-	}
-
-    if(pvt->hasNumberDial())
-    {
-		if (dial_args.size() <= 1)
-		{
-            LOG(ERROR, FMT("invalid dial string '%s': missing destination number!") % dial_string);
-			return NULL;
-		}
-
-        std::string name ("dest");
-        std::string value (dial_args[1]);
-
-        pvt->call()->process(name, value);
-
-		//pvt->call()->dest_addr = dial_args[1];
-	}
-
-    return pvt;
-};
-
-Board::KhompPvt * processSMSString (const char *sms_charv, int *cause)
-{
-    std::string           sms_string(sms_charv);
-    Strings::vector_type  sms_args;
-
-    Strings::tokenize(sms_string, sms_args, "/|,", 3); // '/' is a backward compatibility feature!
-
-    DBG(FUNC, FMT("processing SMS string [%d] : '%s'") % sms_args.size() % sms_string);
-
-    if (sms_args.size () != 3)
-    {
-        LOG(ERROR, FMT("invalid dial string '%s': wrong number of separators.") % sms_string);
-        return NULL;
-    }
-
-    Board::KhompPvt *pvt = NULL;
-
-    bool dial_string_ok = processSMSChannelString(sms_args[0], pvt, cause);
-
-    if (pvt == NULL)
-    {
-        if (dial_string_ok)
-        {
-            LOG(WARNING, "unable to allocate channel -- no free channel found!");
-        }
-
-        return NULL;
-    }
-    else
-    {
-        if (!pvt->application(SMS_CHECK, NULL, NULL))
-        {
-            LOG(ERROR, PVT_FMT(pvt->target(), "allocated channel is NOT a GSM channel! unable to send message!"));
-
-            return NULL;
-        }
-    }
-
-
-/*
-    std::string dest(sms_args[1]);
-
-    bool conf = false;
-
-    if (dest[0] == '!')
-    {
-        dest.erase(0,1);
-        conf = true;
-    }
-
-    if (dest[dest.size()-1] == '!')
-    {
-        dest.erase(dest.size()-1,1);
-        conf = true;
-    }
-
-    // get options/values
-    pvt->send_sms.sms_dest = dest;
-    pvt->send_sms.sms_conf = conf;
-    pvt->send_sms.sms_body = sms_args[2];
-*/
-
-    return pvt;
-};
-
-void processGroupString()
-{
-    for (GroupToDestMapType::iterator i = Opt::_groups.begin(); i != Opt::_groups.end(); i++)
-    {
-        const std::string & name = (*i).first;
-        std::string & opts = (*i).second;
-
-        Strings::vector_type tokens;
-        Strings::tokenize(opts, tokens, ",:", 2);
-
-        if (tokens.size() != 2 && tokens.size() != 1)
-        {
-            LOG(WARNING, FMT("wrong number of arguments at group '%s', ignoring group!\n") % name.c_str());
-            opts.clear();
-            continue;
-        }
-
-        if (tokens.size() < 2)
-            continue;
-        FunProcessGroupString    proc(tokens[1]);
-
-        SpecFlagsType   flags = SPF_FIRST;
-        SpecFunType     fun(proc, false);
-
-        switch (processSpecAtoms(tokens[0], flags, fun))
-        {
-            case SPR_CONTINUE:
-                // remove context from spec
-                opts = tokens[0];
-
-                // log this!
-                DBG(CONF, FMT("group '%s' is now '%s', with context '%s'...")
-                        % name % tokens[0] % tokens[1]);
-                break;
-
-            default:
-                LOG(WARNING, FMT("skipping group '%s', bad configuration!\n") % name.c_str());
-
-                // "zero" group
-                opts.clear();
-
-                // log this!
-                DBG(CONF, FMT("group '%s' have misconfigured options, ignoring...") % name);
-                break;
-        }
-    }
-}
-
diff --git a/src/mod/endpoints/mod_khomp/src/utils.cpp b/src/mod/endpoints/mod_khomp/src/utils.cpp
deleted file mode 100644
index 8f7b33f43e..0000000000
--- a/src/mod/endpoints/mod_khomp/src/utils.cpp
+++ /dev/null
@@ -1,682 +0,0 @@
-/*******************************************************************************
-
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.1 (the "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file
-  under the MPL, indicate your decision by deleting the provisions above and
-  replace them with the notice and other provisions required by the LGPL
-  License. If you do not delete the provisions above, a recipient may use your
-  version of this file under either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*******************************************************************************/
-
-#include <utils.h>
-#include "khomp_pvt.h"
-
-void Kflags::init()
-{
-    _flags[CONNECTED]._name = "CONNECTED";
-    _flags[CONNECTED]._value = false;
-    _flags[REALLY_CONNECTED]._name = "REALLY_CONNECTED";
-    _flags[REALLY_CONNECTED]._value = false;
-    _flags[IS_OUTGOING]._name = "IS_OUTGOING";
-    _flags[IS_OUTGOING]._value = false;
-    _flags[IS_INCOMING]._name = "IS_INCOMING";
-    _flags[IS_INCOMING]._value = false;
-    _flags[STREAM_UP]._name = "STREAM_UP";
-    _flags[STREAM_UP]._value = false;
-    _flags[LISTEN_UP]._name = "LISTEN_UP";
-    _flags[LISTEN_UP]._value = false;
-    _flags[GEN_CO_RING]._name = "GEN_CO_RING";
-    _flags[GEN_CO_RING]._value = false;
-    _flags[GEN_PBX_RING]._name = "GEN_PBX_RING";
-    _flags[GEN_PBX_RING]._value = false;
-    _flags[HAS_PRE_AUDIO]._name = "HAS_PRE_AUDIO";
-    _flags[HAS_PRE_AUDIO]._value = false;
-    _flags[HAS_CALL_FAIL]._name = "HAS_CALL_FAIL";
-    _flags[HAS_CALL_FAIL]._value = false;
-    _flags[DROP_COLLECT]._name = "DROP_COLLECT";
-    _flags[DROP_COLLECT]._value = false;
-    _flags[NEEDS_RINGBACK_CMD]._name = "NEEDS_RINGBACK_CMD";
-    _flags[NEEDS_RINGBACK_CMD]._value = false;
-    _flags[EARLY_RINGBACK]._name = "EARLY_RINGBACK";
-    _flags[EARLY_RINGBACK]._value = false;
-    _flags[FAX_DETECTED]._name = "FAX_DETECTED";
-    _flags[FAX_DETECTED]._value = false;
-    _flags[FAX_SENDING]._name = "FAX_SENDING";
-    _flags[FAX_SENDING]._value = false;
-    _flags[FAX_RECEIVING]._name = "FAX_RECEIVING";
-    _flags[FAX_RECEIVING]._value = false;
-    _flags[OUT_OF_BAND_DTMFS]._name = "OUT_OF_BAND_DTMFS";
-    _flags[OUT_OF_BAND_DTMFS]._value = false;
-    _flags[KEEP_DTMF_SUPPRESSION]._name = "KEEP_DTMF_SUPPRESSION";
-    _flags[KEEP_DTMF_SUPPRESSION]._value = false;
-    _flags[KEEP_ECHO_CANCELLATION]._name = "KEEP_ECHO_CANCELLATION";
-    _flags[KEEP_ECHO_CANCELLATION]._value = false;
-    _flags[KEEP_AUTO_GAIN_CONTROL]._name = "KEEP_AUTO_GAIN_CONTROL";
-    _flags[KEEP_AUTO_GAIN_CONTROL]._value = false;
-    _flags[WAIT_SEND_DTMF]._name = "WAIT_SEND_DTMF";
-    _flags[WAIT_SEND_DTMF]._value = false;
-    _flags[CALL_WAIT_SEIZE]._name = "CALL_WAIT_SEIZE";
-    _flags[CALL_WAIT_SEIZE]._value = false;
-    _flags[NUMBER_DIAL_FINISHD]._name = "NUMBER_DIAL_FINISHD";
-    _flags[NUMBER_DIAL_FINISHD]._value = false;
-    _flags[NUMBER_DIAL_ONGOING]._name = "NUMBER_DIAL_ONGOING";
-    _flags[NUMBER_DIAL_ONGOING]._value = false;
-
-    _flags[FXS_OFFHOOK]._name = "FXS_OFFHOOK";
-    _flags[FXS_OFFHOOK]._value = false;
-    _flags[FXS_DIAL_FINISHD]._name = "FXS_DIAL_FINISHD";
-    _flags[FXS_DIAL_FINISHD]._value = false;
-    _flags[FXS_DIAL_ONGOING]._name = "FXS_DIAL_ONGOING";
-    _flags[FXS_DIAL_ONGOING]._value = false;
-    _flags[FXS_FLASH_TRANSFER]._name = "FXS_FLASH_TRANSFER";
-    _flags[FXS_FLASH_TRANSFER]._value = false;
-    _flags[XFER_QSIG_DIALING]._name = "XFER_QSIG_DIALING";
-    _flags[XFER_QSIG_DIALING]._value = false;
-    _flags[XFER_DIALING]._name = "XFER_DIALING";
-    _flags[XFER_DIALING]._value = false;
-
-    _flags[SMS_DOING_UPLOAD]._name = "SMS_DOING_UPLOAD";
-    _flags[SMS_DOING_UPLOAD]._value = false;
-
-    /*
-    NOW LOADING ...
-
-    _flags[BRIDGED]._name = "BRIDGED";
-    _flags[BRIDGED]._value = false;
-    */
-
-    _flags[INVALID_FLAG]._name = "INVALID_FLAG";
-    _flags[INVALID_FLAG]._value = false;
-}
-
-
-/* Command */
-
-bool ChanCommandHandler::writeNoSignal(const CommandRequest & cmd)
-{
-    _fifo->_mutex.lock();
-    bool status = _fifo->_buffer.provide(cmd);
-    _fifo->_mutex.unlock();
-    return status;
-};
-
-bool ChanCommandHandler::write(const CommandRequest & cmd)
-{
-    bool status = writeNoSignal(cmd);
-
-    if (status) signal();
-
-    return status;
-};
-
-void ChanCommandHandler::unreference()
-{
-
-    if (!_fifo)
-        return;
-
-    if(_fifo->_thread)
-    {
-        _fifo->_thread->join();
-        delete _fifo->_thread;
-        _fifo->_thread = NULL;
-    }
-
-    delete _fifo;
-    _fifo = NULL;
-};
-
-
-/* Event */
-
-bool ChanEventHandler::provide(const EventRequest & evt)
-{
-    _fifo->_mutex.lock();
-    bool status = _fifo->_buffer.provide(evt);
-    _fifo->_mutex.unlock();
-    return status;
-};
-
-bool ChanEventHandler::writeNoSignal(const EventRequest & evt)
-{
-    bool status = true;
-    _fifo->_mutex.lock();
-
-    try
-    {
-        _fifo->_buffer.provider_start().mirror(evt);
-        _fifo->_buffer.provider_commit();
-    }
-    catch(...) //BufferFull & e
-    {
-        status = false;
-    }
-
-    _fifo->_mutex.unlock();
-    return status;
-};
-
-bool ChanEventHandler::write(const EventRequest & evt)
-{
-    bool status = writeNoSignal(evt);
-
-    if (status) signal();
-
-    return status;
-};
-
-void ChanEventHandler::unreference()
-{
-
-    if (!_fifo)
-        return;
-
-    if(_fifo->_thread)
-    {
-        _fifo->_thread->join();
-        delete _fifo->_thread;
-        _fifo->_thread = NULL;
-    }
-
-    delete _fifo;
-    _fifo = NULL;
-};
-
-const char * answerInfoToString(int answer_info)
-{
-    switch (answer_info)
-    {
-        case Board::KhompPvt::CI_MESSAGE_BOX:
-            return "MessageBox";
-        case Board::KhompPvt::CI_HUMAN_ANSWER:
-            return "HumanAnswer";
-        case Board::KhompPvt::CI_ANSWERING_MACHINE:
-            return "AnsweringMachine";
-        case Board::KhompPvt::CI_CARRIER_MESSAGE:
-            return "CarrierMessage";
-        case Board::KhompPvt::CI_UNKNOWN:
-            return "Unknown";
-        case Board::KhompPvt::CI_FAX:
-            return "Fax";
-    }
-
-    return NULL;
-}
-/******************************* Match functions ******************************/
-bool MatchExtension::canMatch(std::string & context, std::string & exten,
-                              std::string & caller_id, bool match_more)
-{
-    if(!match_more)
-    {
-        return true;
-    }
-
-    if (Opt::_options._fxs_sharp_dial())
-    {
-        char key_digit  = '#';
-        size_t finished = exten.find_last_of(key_digit);
-        char last_char  = exten.at(exten.size() - 1);
-
-        if(finished != std::string::npos && last_char == key_digit)
-        {
-            if(exten.size() <= 1)
-            {
-                DBG(FUNC, FMT("exten=%s size=%d") % exten % exten.size());
-                return true;
-            }
-
-            exten.erase(finished);
-            DBG(FUNC, FMT("match exact!!! exten=%s") % exten);
-            return false;
-        }
-    }
-
-    return true;
-
-/*
-    switch_xml_t xml = NULL;
-    switch_xml_t xcontext = NULL;
-    switch_regex_t *re;
-    int ovector[30];
-
-    if (switch_xml_locate("dialplan","context","name",context.c_str(),&xml,&xcontext, NULL,SWITCH_FALSE) == SWITCH_STATUS_SUCCESS)
-    {
-        switch_xml_t xexten = NULL;
-
-        if(!(xexten = switch_xml_child(xcontext,"extension")))
-        {
-            DBG(FUNC,"extension cannot match, returning");
-
-            if(xml)
-                switch_xml_free(xml);
-
-            return false;
-        }
-
-        while(xexten)
-        {
-            switch_xml_t xcond = NULL;
-
-            for (xcond = switch_xml_child(xexten, "condition"); xcond; xcond = xcond->next)
-            {
-                std::string expression;
-
-                if (switch_xml_child(xcond, "condition"))
-                {
-                    LOG(ERROR,"Nested conditions are not allowed");
-                }
-
-                switch_xml_t xexpression = switch_xml_child(xcond, "expression");
-
-                if ((xexpression = switch_xml_child(xcond, "expression")))
-                {
-                    expression = switch_str_nil(xexpression->txt);
-                }
-                else
-                {
-                    expression =  switch_xml_attr_soft(xcond, "expression");
-                }
-
-                if(expression.empty() || expression == "^(.*)$")
-                {
-                    //We're not gonna take it
-                    //No, we ain't gonna take it
-                    // We're not gonna take it anymore
-                    //
-                    continue;
-                }
-
-                int pm = -1;
-                switch_status_t is_match = SWITCH_STATUS_FALSE;
-                is_match =  switch_regex_match_partial(exten.c_str(),expression.c_str(),&pm);
-
-                if(is_match == SWITCH_STATUS_SUCCESS)
-                {
-                    if(match_more)
-                    {
-                        if(pm == 1)
-                        {
-                            switch_xml_free(xml);
-                            return true;
-                        }
-                    }
-                    else
-                    {
-                        switch_xml_free(xml);
-                        return true;
-                    }
-                }
-                else
-                {
-                    // not match
-                }
-            }
-
-            xexten = xexten->next;
-        }
-    }
-    else
-    {
-        DBG(FUNC,"context cannot match, returning");
-    }
-
-    if(xml)
-        switch_xml_free(xml);
-
-    return false;
-*/
-}
-
-
-MatchExtension::MatchType MatchExtension::matchExtension(
-                                        std::string & context,
-                                        std::string & exten,
-                                        std::string & callerid,
-                                        bool match_only)
-{
-    if(!canMatch(context,exten,callerid))
-    {
-        DBG(FUNC, "context/extension cannot match");
-        return MATCH_NONE;
-    }
-
-    if(match_only)
-    {
-        DBG(FUNC, "for now we want know if it matches...");
-        return MATCH_MORE;
-    }
-
-    if(!canMatch(context,exten,callerid,true))
-    {
-        DBG(FUNC, "it match exact!");
-        return MATCH_EXACT;
-    }
-
-    return MATCH_MORE;
-}
-
-MatchExtension::MatchType MatchExtension::findExtension(
-                                        std::string & ref_extension,
-                                        std::string & ref_context,
-                                        ContextListType & contexts,
-                                        std::string & extension,
-                                        std::string & caller_id,
-                                        bool default_ctx,
-                                        bool default_ext)
-{
-    ExtenListType extens;
-
-    if(!extension.empty())
-    {
-        extens.push_back(extension);
-    }
-
-    if(default_ext)
-    {
-        if (extension != "s")
-        {
-            extens.push_back("s");
-        }
-
-        extens.push_back("i");
-    }
-
-    if(default_ctx)
-    {
-        contexts.push_back("default");
-    }
-
-    for(ContextListType::iterator itc = contexts.begin(); itc != contexts.end(); itc++)
-    {
-        for(ExtenListType::iterator ite = extens.begin(); ite != extens.end(); ite++)
-        {
-            DBG(FUNC, FMT("trying context '%s' with exten '%s'...") % *itc % *ite);
-            ref_context   = *itc;
-            ref_extension = *ite;
-
-            MatchType m = matchExtension(ref_context, ref_extension, caller_id, false);
-
-            switch (m)
-            {
-                case MATCH_NONE:
-                    continue;
-
-                case MATCH_MORE:
-                case MATCH_EXACT:
-                {
-                    //ref_context = *itc;
-                    //ref_extension = *ite;
-
-                    DBG(FUNC, ".... can match context/extension (some way)!");
-
-                    return m;
-                }
-            }
-        }
-    }
-
-    ref_context.clear();
-    ref_extension.clear();
-
-    DBG(FUNC, D("... no context/extension found!"));
-    return MATCH_NONE;
-}
-
-/******************************** Kommuter ************************************/
-bool Kommuter::stop()
-{
-    if(_kwtd_timer_on)
-    {
-        Globals::global_timer->del(_kwtd_timer_index);
-        _kwtd_timer_on = false;
-    }
-
-    /* stop all watches */
-    if (Opt::_options._kommuter_activation() == "auto")
-    {
-        for (int kommuter = 0 ; kommuter < _kommuter_count ; kommuter++)
-        {
-            try
-            {
-                Globals::k3lapi.command(-1, kommuter, CM_STOP_WATCHDOG);
-                LOG(MESSAGE, FMT("kommuter device (%d) was stoped at finalize_module().") % kommuter);
-            }
-            catch(K3LAPI::failed_command & e)
-            {
-                LOG(ERROR, FMT("could not stop the Kommuter device (%d) at finalize_module().") % kommuter);
-            }
-
-        }
-    }
-
-    return true;
-}
-
-bool Kommuter::initialize(K3L_EVENT *e)
-{
-    /* get total of kommuter devices */
-    _kommuter_count = e->AddInfo;
-
-    if(Opt::_options._kommuter_activation() == "manual")
-    {
-        if (_kommuter_count > 0)
-        {
-            LOG(WARNING, "Kommuter devices were found on your system, but activation is set to manual. To activate this devices use the command 'khomp kommuter on'.");
-        }
-
-        return true;
-    }
-
-    if (_kommuter_count > 0)
-    {
-        bool start_timer = false;
-        int timeout = Opt::_options._kommuter_timeout();
-
-        std::string param = STG(FMT("timeout=%d") % timeout);
-
-        for (int kommuter = 0; kommuter < _kommuter_count; kommuter++)
-        {
-            try
-            {
-                Globals::k3lapi.command(-1, kommuter, CM_START_WATCHDOG, param.c_str());
-                start_timer = true;
-            }
-            catch(K3LAPI::failed_command & e)
-            {
-                switch(e.rc)
-                {
-                case ksInvalidParams:
-                    LOG(ERROR, FMT("invalid timeout '%d' for Kommuter device '%d' timeout. Mininum is 0, maximum is 255.")
-                                % timeout % kommuter);
-                    break;
-                default:
-                    LOG(ERROR, FMT("could not start the kommuter device number '%d'.") % kommuter);
-                    break;
-
-                }
-            }
-            catch(...)
-            {
-                LOG(ERROR, FMT("could not start the kommuter device number '%d'.") % kommuter);
-            }
-        }
-
-        if(timeout == 0)
-        {
-            DBG(FUNC, D("kommuter watchdog timer not created because timeout is 0."));
-            return true;
-        }
-
-        if (start_timer)
-        {
-            if (!Globals::global_timer)
-            {
-                LOG(ERROR, D("error creating the timer for kommuter."));
-            }
-            else
-            {
-                _kwtd_timer_index = Globals::global_timer->add((timeout < 5 ? (timeout*500) : 2000), &wtdKickTimer);
-                _kwtd_timer_on = true;
-
-                DBG(FUNC, D("kommuter watchdog timer created and started."));
-            }
-        }
-    }
-    else
-    {
-        DBG(FUNC, D("no kommuter devices were found on system."));
-    }
-
-    return true;
-}
-
-void Kommuter::wtdKickTimer(void *)
-{
-    try
-    {
-        bool restart_timer = false;
-
-        for (int kommuter = 0; kommuter < Board::kommuter._kommuter_count; kommuter++)
-        {
-            try
-            {
-                Globals::k3lapi.command(-1, kommuter, CM_NOTIFY_WATCHDOG);
-                restart_timer = true;
-                DBG(FUNC, D("Kommuter device (%d) notified.") % kommuter);
-            }
-            catch(K3LAPI::failed_command & e)
-            {
-                switch(e.rc)
-                {
-                    case ksInvalidState:
-                        LOG(ERROR, FMT("Kommuter device '%d' was not initialized.") % kommuter);
-                        break;
-                    case ksNotAvailable:
-                        LOG(ERROR, FMT("Kommuter device '%d' not found.") % kommuter);
-                        break;
-                    case ksFail:
-                        LOG(ERROR, FMT("Kommuter notify command has failed for device '%d'.") % kommuter);
-                        break;
-                    default:
-                        LOG(ERROR, FMT("Kommuter device '%d' could not be notified for some unknow reason.") % kommuter);
-                        break;
-                }
-            }
-        }
-
-        if(restart_timer)
-        {
-            Globals::global_timer->restart( Board::kommuter._kwtd_timer_index, true );
-            DBG(FUNC, D("Kommuter timer restarted."));
-        }
-    }
-    catch (...)
-    {
-        return;
-    }
-}
-
-/************************************ ESLs **********************************/
-ESL::VectorEvents * ESL::_events = NULL;
-
-ESL::ESL(std::string type) : _type(type)
-{
-    if(!_events)
-        _events = new VectorEvents();
-
-//    _events->push_back(_type);
-}
-
-ESL::~ESL()
-{
-    if(!_events)
-        return;
-
-    //Remove one from vector
-    //_events->pop_back();
-
-    if(_events->size() == 0)
-    {
-        delete _events;
-        _events = NULL;
-    }
-}
-
-bool ESL::registerEvents()
-{
-    bool ok = true;
-
-    DBG(FUNC, "Register ESLs");
-
-    if(!_events)
-        return true;
-
-    for(VectorEvents::const_iterator event = _events->begin(); event != _events->end(); event++)
-    {
-        if (switch_event_reserve_subclass((*(event)).c_str()) != SWITCH_STATUS_SUCCESS)
-        {
-            LOG(ERROR, FMT("Couldn't register subclass=\"%s\"") % *(event));
-            ok = false;
-        }
-        else
-        {
-            DBG(FUNC, FMT("Register subclass=\"%s\"") % *(event));
-        }
-    }
-
-    return ok;
-}
-
-bool ESL::unregisterEvents()
-{
-    DBG(FUNC, "Unregister ESLs");
-
-    if(!_events)
-        return true;
-
-    for(VectorEvents::const_iterator event = _events->begin(); event != _events->end(); event++)
-    {
-        DBG(FUNC, FMT("Unregister subclass=\"%s\"") % *(event));
-        switch_event_free_subclass((*(event)).c_str());
-    }
-
-    return true;
-}
-
-
-
-/******************************************************************************/
-
diff --git a/src/mod/endpoints/mod_khomp/support/config_defaults.cpp b/src/mod/endpoints/mod_khomp/support/config_defaults.cpp
deleted file mode 100644
index 9cf809eee2..0000000000
--- a/src/mod/endpoints/mod_khomp/support/config_defaults.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <config_defaults.hpp>
-
-/* boolean value */
-Restriction::Pair booleanValue[3] =
-{
-    {    "Ativado",  "true" },
-    { "Desativado", "false" },
-    {        NULL ,   NULL  },
-};
diff --git a/src/mod/endpoints/mod_khomp/support/config_defaults.hpp b/src/mod/endpoints/mod_khomp/support/config_defaults.hpp
deleted file mode 100644
index b3b77cfe8d..0000000000
--- a/src/mod/endpoints/mod_khomp/support/config_defaults.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <configurator/restriction.hpp>
-
-#ifndef _CONFIG_DEFAULTS_HPP_
-#define _CONFIG_DEFAULTS_HPP_
-
-/* default khomp config directory */
-#define KHOMP_CONFIG_DIR "/etc/khomp/config"
-
-/* define util macro for text conversion */
-#define CONV(s) \
-    encoder::recode_env(encoder::C_ISO88591, s)
-
-/* define another util macro for text conversion */
-#define CONVU(s) \
-    encoder::recode_env(encoder::C_UTF8, s)
-
-/* shortcut */
-#define K(x) Restriction::K_##x
-#define N(x) Restriction::N_##x
-#define B(x) Restriction::B_##x
-
-/* boolean value */
-extern Restriction::Pair booleanValue[3];
-
-/* nasty shortcuts */
-#define BOOLEAN_VALUE        booleanValue[0], booleanValue[1], booleanValue[2]
-
-#define BOOLEAN_ALWAYS_TRUE  booleanValue[0], booleanValue[2]
-#define BOOLEAN_ALWAYS_FALSE booleanValue[1], booleanValue[2]
-
-#define BOOLEAN_TRUE         booleanValue[0].pretty
-#define BOOLEAN_FALSE        booleanValue[1].pretty
-
-#endif /* _CONFIG_DEFAULTS_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/support/klog-config.cpp b/src/mod/endpoints/mod_khomp/support/klog-config.cpp
deleted file mode 100644
index 112b616cb1..0000000000
--- a/src/mod/endpoints/mod_khomp/support/klog-config.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <config_defaults.hpp>
-
-#include <support/klog-config.hpp>
-
-Logfile::Logfile()
-: Configfile("Options", "Log Options")
-{
-    _filename = STG(FMT("%s/klog.cfg") % KHOMP_CONFIG_DIR);
-
-    // necessario?
-    add(&_logoptions);
-
-    /* Obtain configuration, if file exists. */
-    _good = obtain();
-}
-
-Logfile::~Logfile()
-{
-    /* nothing for now */
-};
-
-#if COMMONS_AT_LEAST(1,1)
-bool Logfile::select(Section ** ptr, const std::string & str)
-#else
-bool Logfile::select(Section ** ptr, std::string str)
-#endif
-{
-    // default section, needed for API compliance.
-    if (str == "")
-        *ptr = &_logoptions;
-    else
-    {
-        try
-        {
-            *ptr = _logoptions.section_find(str);
-        }
-        catch (Section::not_found e)
-        {
-            _errors.push_back(STG(FMT("unsupported section '%s', ignoring!") % str));
-        }
-    }
-
-    return (*ptr != 0);
-};
-
-bool Logfile::serialize(std::ofstream &fd)
-{
-    typedef std::vector < std::string > StrList;
-
-    StrList vec;
-
-    vec.push_back("KLogger");
-    vec.push_back("K3L");
-    vec.push_back("IntfK3L");
-    vec.push_back("IntfK3L_C");
-    vec.push_back("ISDN");
-    vec.push_back("R2");
-    vec.push_back("Firmware");
-    vec.push_back("Audio");
-    vec.push_back("SS7");
-    vec.push_back("SIP");
-    vec.push_back("GSM");
-    vec.push_back("Timer");
-
-    for (StrList::iterator i = vec.begin(); i != vec.end(); i++)
-    {
-        fd << "[" << (*i) << "]" << std::endl;
-
-        try
-        {
-            Section * sec = _logoptions.section_find(*i);
-            recurse(fd, sec);
-        }
-        catch (Section::not_found e)
-        {
-            _errors.push_back(STG(FMT("unable to find section '%s' in memory, ignoring!") % (*i)));
-        }
-
-        fd << std::endl;
-    }
-
-    fd << "# precisa ter um caracter sobrando no final!" << std::endl;
-
-    return true;
-}
diff --git a/src/mod/endpoints/mod_khomp/support/klog-config.hpp b/src/mod/endpoints/mod_khomp/support/klog-config.hpp
deleted file mode 100644
index fbab7058e8..0000000000
--- a/src/mod/endpoints/mod_khomp/support/klog-config.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#pragma GCC visibility push(default)
-#include <stdexcept>
-#pragma GCC visibility pop
-
-#include <config_commons.hpp>
-#include <format.hpp>
-
-#include <configurator/configfile.hpp>
-
-#include <support/klog-options.hpp>
-
-#ifndef _KLOG_CONFIG_HPP_
-#define _KLOG_CONFIG_HPP_
-
-struct Logfile: public Configfile
-{
-    Logfile();
-    ~Logfile();
-
-#if COMMONS_AT_LEAST(1,1)
-    bool select(Section **, const std::string & str = "");
-#else
-    bool select(Section **, std::string str = "");
-#endif
-
-    bool serialize(std::ofstream &);
-
-    Section & root() { return _logoptions; };
-
-  protected:
-    LogOptions _logoptions;
-};
-
-#endif /* _KLOG_CONFIG_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/support/klog-options.cpp b/src/mod/endpoints/mod_khomp/support/klog-options.cpp
deleted file mode 100644
index 3cb7e3e6fd..0000000000
--- a/src/mod/endpoints/mod_khomp/support/klog-options.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <config_defaults.hpp>
-
-#include <support/klog-options.hpp>
-
-LogOptions::KLogger::KLogger()
-: Section("KLogger", "KLogger", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("FullLog", "Log everything", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::K3L::K3L()
-: Section("K3L", "K3L", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("CallProgress", "Call Progress events", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("CallAnalyzer", "Call Analyzer events", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("CadenceRecog", "Cadences recognized", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("CallControl",  "Call control", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("Fax",          "Fax stack", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::IntfK3L::IntfK3L()
-: Section("IntfK3L", "IntfK3L", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("AudioEvent", "Audio events", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::IntfK3L_C::IntfK3L_C()
-: Section("IntfK3L_C", "IntfK3L_C", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("AudioEvent", "Audio events", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::ISDN::ISDN()
-: Section("ISDN", "ISDN", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("Lapd", "LAPD layer log", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("Q931", "Q.931 layer log", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::R2::R2()
-: Section("R2", "R2", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("Signaling", "R2 Signaling log", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("States", "R2 States Log", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::Firmware::Firmware()
-: Section("Firmware", "Firmware", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("FwHdlcMsg", "HDLC messages", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("FwLinkErrors", "Link errors", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("FwModemChar", "MODEM char TX/RX", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::Audio::Audio()
-: Section("Audio", "Audio", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("DSP", "DSP audio messages", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("K3L", "K3L audio messages", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::SS7::SS7()
-: Section("SS7", "SS7", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("MTP2States", "MTP2 States", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("MTP2Debug", "MTP2 Debug", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("MTP3Management", "MTP3 Management", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("MTP3Test", "MTP3 Test", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("MTP3Debug", "MTP3 Debug", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("ISUPStates", "ISUP States", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("ISUPDebug", "ISUP Debug", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-    add(Option("ISUPMessages", "ISUP Messages", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::SIP::SIP()
-: Section("SIP", "SIP", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::GSM::GSM()
-: Section("GSM", "GSM", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::Timer::Timer()
-: Section("Timer", "Timer", false)
-{
-    add(Option("Value", "Enable log class?", BOOLEAN_FALSE, Restriction(K(STRING), N(UNIQUE), BOOLEAN_VALUE)));
-};
-
-LogOptions::LogOptions()
-: Section("Options", "KLog Options", false)
-{
-    add(&_klogger);
-    add(&_k3l);
-    add(&_intfk3l);
-    add(&_intfk3lc);
-    add(&_isdn);
-    add(&_r2);
-    add(&_firmware);
-    add(&_audio);
-    add(&_ss7);
-    add(&_sip);
-    add(&_gsm);
-    add(&_timer);
-};
diff --git a/src/mod/endpoints/mod_khomp/support/klog-options.hpp b/src/mod/endpoints/mod_khomp/support/klog-options.hpp
deleted file mode 100644
index b700947ea4..0000000000
--- a/src/mod/endpoints/mod_khomp/support/klog-options.hpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (the "License"); you may not use this file except in compliance with the
-  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <types.hpp>
-
-#include <configurator/option.hpp>
-#include <configurator/section.hpp>
-
-#ifndef _KLOG_OPTIONS_HPP_
-#define _KLOG_OPTIONS_HPP_
-
-struct LogOptions: public Section
-{
-    struct KLogger:   public Section { KLogger();   };
-    struct K3L:       public Section { K3L();       };
-    struct IntfK3L:   public Section { IntfK3L();   };
-    struct IntfK3L_C: public Section { IntfK3L_C(); };
-    struct ISDN:      public Section { ISDN();      };
-    struct R2:        public Section { R2();        };
-    struct Firmware:  public Section { Firmware();  };
-    struct Audio:     public Section { Audio();     };
-    struct SS7:       public Section { SS7();       };
-    struct SIP:       public Section { SIP();       };
-    struct GSM:       public Section { GSM();     };
-    struct Timer:     public Section { Timer();     };
-
-    LogOptions();
-
-    KLogger     _klogger;
-    K3L         _k3l;
-    IntfK3L     _intfk3l;
-    IntfK3L_C   _intfk3lc;
-    ISDN        _isdn;
-    R2          _r2;
-    Firmware    _firmware;
-    Audio       _audio;
-    SS7         _ss7;
-    SIP         _sip;
-    GSM         _gsm;
-    Timer       _timer;
-};
-
-#endif /* _KLOG_OPTIONS_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/tools/getk3l.sh b/src/mod/endpoints/mod_khomp/tools/getk3l.sh
deleted file mode 100755
index 59e3f4b5e3..0000000000
--- a/src/mod/endpoints/mod_khomp/tools/getk3l.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-###############################################################################
-#   KHOMP generic endpoint/channel library.
-#   Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-# the specific language governing rights and limitations under the License.
-
-# Alternatively, the contents of this file may be used under the terms of the
-# "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-# case the provisions of "LGPL License" are applicable instead of those above.
-
-# If you wish to allow use of your version of this file only under the terms of
-# the LGPL License and not to allow others to use your version of this file
-# under the MPL, indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by the LGPL
-# License. If you do not delete the provisions above, a recipient may use your
-# version of this file under either the MPL or the LGPL License.
-
-# The LGPL header follows below:
-
-#   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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-###############################################################################
-
-K3L_FILE="k3l_2.1_client.sh"
-PARAM="0"
-
-if [  "$1" ]
-then
-    PARAM=$1
-fi
-
-help()
-{
-    echo "Usage: getk3l.sh [OPTION]"
-    echo
-    echo "  -h,  --help       print this help"
-    echo "  -d,  --download   only download the k3l package withou doing the installation" 
-    echo 
-}
-
-download()
-{
-    if [ "w`uname -m | grep x86_64`" == "w" ]
-    then
-        echo "Downloading i686 package"
-        wget -t15 -c --progress=bar:force -O $K3L_FILE.gz http://www.khomp.com.br/binaries/softpbx/freeswitch/k3l_2.1_client_i686.sh.gz
-    else
-        echo "Downloading x86_64 package"
-        wget -t15 -c --progress=bar:force -O $K3L_FILE.gz http://www.khomp.com.br/binaries/softpbx/freeswitch/k3l_2.1_client_x86-64.sh.gz
-    fi
-}
-
-clean()
-{
-    printf "$1"
-    exit 1
-}
-
-install()
-{
-    if [ `whoami` != 'root' ] 
-    then
-         clean "Need to be root to install !\n"
-         exit 1
-    fi  
-
-    if ! which 'kserver' &> /dev/null
-    then
-        download
-        gunzip $K3L_FILE.gz
-        chmod 0755 $K3L_FILE
-        (./$K3L_FILE) || clean "Error on k3l install\n"
-        rm $K3L_FILE
-    fi
-}
-
-if [ $PARAM == '--help' -o $PARAM == '-h' ]
-then
-    help
-    exit 0
-elif [ $PARAM == '--download' -o $PARAM == '-d' ]
-then 
-    download
-    exit 0
-else
-    echo "k3l will be installed"
-    install
-
-    if [ "w`kserver --version | grep 2.1`" == "w" ]
-    then
-        clean "k3l version 2.1 must be installed: \n\tUninstall the old version of k3l and try again\n"
-        exit 1
-    fi
-
-    echo "Successfully installed!"
-fi
diff --git a/src/mod/endpoints/mod_khomp/tools/getversion.sh b/src/mod/endpoints/mod_khomp/tools/getversion.sh
deleted file mode 100755
index d22bf2b231..0000000000
--- a/src/mod/endpoints/mod_khomp/tools/getversion.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#/bin/bash
-
-###############################################################################
-#   KHOMP generic endpoint/channel library.
-#   Copyright (C) 2007-2010 Khomp Ind. & Com.
-
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-# the specific language governing rights and limitations under the License.
-
-# Alternatively, the contents of this file may be used under the terms of the
-# "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-# case the provisions of "LGPL License" are applicable instead of those above.
-
-# If you wish to allow use of your version of this file only under the terms of
-# the LGPL License and not to allow others to use your version of this file
-# under the MPL, indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by the LGPL
-# License. If you do not delete the provisions above, a recipient may use your
-# version of this file under either the MPL or the LGPL License.
-
-# The LGPL header follows below:
-
-#   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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-###############################################################################
-
-version=`grep "#define $1" $2/src/include/switch_version.h | sed -r "s/#define\s+$1.*\"(.*)\"/\1/g"`
-
-if [ "$version" == "head" ]
-then
-    echo -1
-else
-    echo $version
-fi
diff --git a/src/mod/endpoints/mod_loopback/mod_loopback.c b/src/mod/endpoints/mod_loopback/mod_loopback.c
index 456936562a..f5941eae36 100644
--- a/src/mod/endpoints/mod_loopback/mod_loopback.c
+++ b/src/mod/endpoints/mod_loopback/mod_loopback.c
@@ -1429,7 +1429,7 @@ static switch_status_t null_tech_init(null_private_t *tech_pvt, switch_core_sess
 		// switch_core_media_check_video_codecs(session);
 		// switch_core_media_choose_port(session, SWITCH_MEDIA_TYPE_AUDIO, 0);
 		// switch_core_media_choose_port(session, SWITCH_MEDIA_TYPE_VIDEO, 0);
-		// switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, "127.0.0.1", 2000, NULL, 0);
+		// switch_core_media_gen_local_sdp(session, SDP_OFFER, "127.0.0.1", 2000, NULL, 0);
 		// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s\n", mparams.local_sdp_str);
 	}
 
diff --git a/src/mod/endpoints/mod_portaudio/Makefile.am b/src/mod/endpoints/mod_portaudio/Makefile.am
deleted file mode 100644
index 06ba6f6c92..0000000000
--- a/src/mod/endpoints/mod_portaudio/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_portaudio
-
-if HAVE_PORTAUDIO
-mod_LTLIBRARIES = mod_portaudio.la
-mod_portaudio_la_SOURCES = mod_portaudio.c pablio.c pa_ringbuffer.c
-mod_portaudio_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_la_CPPFLAGS = -I. $(PORTAUDIO_CFLAGS) $(AM_CPPFLAGS)
-mod_portaudio_la_LIBADD = $(PORTAUDIO_LIBS) $(switch_builddir)/libfreeswitch.la
-mod_portaudio_la_LDFLAGS = -avoid-version -module -no-undefined -shared
-if ISMAC
-mod_portaudio_la_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
-endif
-else
-install: error
-all: error
-error:
-	$(error You must install portaudio19-dev to build $(MODNAME))
-endif
diff --git a/src/mod/endpoints/mod_portaudio/conf/autoload_configs/portaudio.conf.xml b/src/mod/endpoints/mod_portaudio/conf/autoload_configs/portaudio.conf.xml
deleted file mode 100644
index b11725a2dc..0000000000
--- a/src/mod/endpoints/mod_portaudio/conf/autoload_configs/portaudio.conf.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<configuration name="portaudio.conf" description="Soundcard Endpoint">
-  <settings>
-    <!-- indev, outdev, ringdev:
-	 partial case sensitive string match on something in the name
-	 or the device number prefixed with # eg "#1" (or blank for default) -->
-
-    <!-- device to use for input -->
-    <param name="indev" value=""/>
-    <!-- device to use for output -->
-    <param name="outdev" value=""/>
-
-    <!--device to use for inbound ring -->
-    <!--<param name="ringdev" value=""/>-->
-    <!--File to play as the ring sound -->
-    <!--<param name="ring-file" value="/sounds/ring.wav"/>-->
-    <!--Number of seconds to pause between rings -->
-    <!--<param name="ring-interval" value="5"/>-->
-    <!--Enable or Disable dual_streams-->
-    <!--<param name="dual-streams" value="true"/>-->
-
-    <!--file to play when calls are on hold-->
-    <param name="hold-file" value="$${hold_music}"/>
-    <!--Timer to use for hold music (i'd leave this one commented)-->
-    <!--<param name="timer-name" value="soft"/>-->
-
-    <!--Default dialplan and caller-id info -->
-    <param name="dialplan" value="XML"/>
-    <param name="cid-name" value="$${outbound_caller_name}"/>
-    <param name="cid-num" value="$${outbound_caller_id}"/>
-
-    <!--audio sample rate and interval -->
-    <param name="sample-rate" value="48000"/>
-    <param name="codec-ms" value="20"/>
-
-    <!--uncomment the following line to make mod_portaudio fail to load if it fails to find a device-->
-    <!-- <param name="unload-on-device-fail" value="true"/> -->
-  </settings>
-
-  <!--
-	mod_portaudio "streams"
-
-	The portaudio streams were introduced to support multiple devices and multiple channels in mod_portaudio.
-	For example, if you have a sound card that supports multiple channels or have multiple sound cards and you
-	want to use them at the same time, you can do it configuring streams and endpoints here.
-
-	A "stream" is just a logical container for some settings required by portaudio in order to stream audio and
-	define a friendly name for that configuration. Streams in itself do not do anything else than contain configs.
-	Once you have your streams defined you can proceed to define "endpoints". Go to the "<endpoints>" section
-	for more information on endpoints.
-
-	You can use the command "pa shstreams" (portaudio shared streams) to show the configured streams.
-  -->
-  <streams>
-  	<!--
-	In this example we define 2 streams, one for a usb audio device and another for the usual Mac defaults
-	The name="" attribute in the <stream> tag must uniquely identify the stream configuration and can be
-	later used when creating endpoints in the "instream" and "outstream" parameters of the endpoint.
-	-->
-
-	<!-- This sample "usb1" configuration was tested with a USB Griffin iMic device -->
-  	<stream name="usb1">
-		<!--
-			Which device to use for input in this stream
-			The value for this parameter must be either in the form '#devno',
-			for example '#2' for device number 2, or 'device-name', like 'iMic USB audio system'
-			The output of command "pa devlist" will show you device names and numbers as enumerated
-			by portaudio.
-		-->
-		<param name="indev" value="#2" />
-
-		<!--
-			Same as the indev but for output. In this case the device is capable of input and output
-			Some devices are capable of input only or output only (see the default example)
-	       	-->
-		<param name="outdev" value="#2" />
-
-		<!-- The sample rate to use for this stream -->
-		<param name="sample-rate" value="48000" />
-
-		<!--
-			Size of the packets in milliseconds. The smaller the number the less latency you'll have
-			The minimum value is 10ms
-		-->
-		<param name="codec-ms" value="10" />
-
-		<!--
-			How many channels to open for this stream.
-			If you're device is stereo, you can choose 2 here. However, bear in mind that then
-			your left and right channels will be separated and when creating endpoints you will have
-			to either choose the left or right channel. This may or may not be what you want. This separation
-			means that you can have 2 separate FreeSWITCH calls, listening to one of them in your left channel
-			and the other in the right chanel.
-		-->
-		<param name="channels" value="2" />
-  	</stream>
-
-	<!-- This default stream was tested using the default Macbook Pro input/output devices -->
-  	<stream name="default">
-		<!-- The default system input device -->
-		<param name="indev" value="#0" />
-		<!-- The default system output device -->
-		<param name="outdev" value="#1" />
-		<!-- CD quality sampling rate ftw -->
-		<param name="sample-rate" value="48000" />
-		<!-- Low latency -->
-		<param name="codec-ms" value="10" />
-		<!-- Choosing 1 channel allows to hear in both left-right channel when using a headset -->
-		<param name="channels" value="1" />
-  	</stream>
-  </streams>
-
-  <!--
-	mod_portaudio "endpoints"
-
-	Endpoints is a way to define the input and output that a given portaudio channel will use.
-	There is a lot of flexibility. You can create endpoints which are "send-only", which means
-	audio will be read from FreeSWITCH and sent down to the provided stream, but no audio will
-	be read from that stream and only silence provided back to FreeSWITCH.
-
-		send-only endpoint:
-			(FS CORE) ->-> audio ->-> sound-card-x
-
-	You can also create a read-only endpoint.
-
-		read-only-endpoint:
-			(FS CORE) <-<- audio <-<- sound-card-x
-
-	And of course you can create a bidirectional endpoint:
-		bidirectional-endpoint:
-			(FS CORE) <-> audio <-> sound-card-x
-
-	You can also define a stream which uses only the left or only the right channel of a given device stream.
-	This means you can have 2 SIP calls connected to the same device haring one call in your left ear and
-	the other call to your right ear :-)
-
-	The name="parameter" of the endpoint allows you to use it in the FreeSWITCH dial plan to dial, ie:
-
-	<action application="bridge" data="portaudio/endpoint/usb1out-left" />
-
-	You can use the command "pa endpoints" to show the configured endpoints.
-  -->
-  <endpoints>
-
-	<!--
-		An endpoint is a handle name to refer to a configuration that determines where to read media from
-		and write media to. The endpoint can use any input/output stream combination for that purpose as
-		long as the streams match the sampling rate and codec-ms (see <streams> XML tag).
-		You can also omit the instream or the outstream parameter (but obviously not both).
-	-->
-
-	<!--
-		Configuration for a "default" bidirectional endpoint that uses the default stream defined previously in
-		the <streams> section.
-	 -->
-  	<endpoint name="default">
-		<!--
-			The instream, outstream is the name of the stream and channel to use. The stream
-			name is the same you configured in the <streams> section. This parameters follow
-			the syntax <stream-name>:<channel index>. You can omit either the outstream
-			or the instream, but not both! The channel index is zero-based and must be consistent
-			with the number of channels available for that stream (as configured in the <stream> section).
-			You cannot use index 1 if you chose channels=1 in the stream configuration.
-		-->
-		<param name="instream" value="default:0" />
-		<param name="outstream" value="default:0" />
-	</endpoint>
-
-	<!--
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'send-only' or 'output-only' and uses the channel index 0 (left channel in a stereo device)
-	-->
-  	<endpoint name="usb1out-left">
-		<param name="outstream" value="usb1:0" />
-	</endpoint>
-
-	<!--
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'send-only' or 'output-only' and uses the channel index 1 (right channel in a stereo device)
-	-->
-  	<endpoint name="usb1out-right">
-		<param name="outstream" value="usb1:1" />
-	</endpoint>
-
-	<!--
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'receive-only' or 'input-only' and uses the channel index 0 (left channel in a stereo device)
-	-->
-  	<endpoint name="usb1in-left">
-		<param name="instream" value="usb1:0" />
-	</endpoint>
-
-	<!--
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'receive-only' or 'input-only' and uses the channel index 1 (right channel in a stereo device)
-	-->
-  	<endpoint name="usb1in-right">
-		<param name="instream" value="usb1:1" />
-	</endpoint>
-
-	<!--
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'bidirectional' or 'send-receive' and uses the channel index 0 (left channel in a stereo device)
-	-->
-  	<endpoint name="usb1-left">
-		<param name="instream" value="usb1:0" />
-		<param name="outstream" value="usb1:0" />
-	</endpoint>
-
-	<!--
-		This endpoint uses the USB stream defined previously in the <streams> section and
-		is 'bidirectional' or 'send-receive' and uses the channel index 1 (right channel in a stereo device)
-	-->
-  	<endpoint name="usb1-right">
-		<param name="instream" value="usb1:1" />
-		<param name="outstream" value="usb1:1" />
-	</endpoint>
-
-  </endpoints>
-
-</configuration>
-
diff --git a/src/mod/endpoints/mod_portaudio/mod_PortAudio.2017.vcxproj b/src/mod/endpoints/mod_portaudio/mod_PortAudio.2017.vcxproj
deleted file mode 100644
index 42d6ceeb55..0000000000
--- a/src/mod/endpoints/mod_portaudio/mod_PortAudio.2017.vcxproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_PortAudio</ProjectName>
-    <ProjectGuid>{5FD31A25-5D83-4794-8BEE-904DAD84CE71}</ProjectGuid>
-    <RootNamespace>mod_PortAudio</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ALLOW_SMP_DANGERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/NODEFAULTLIB:LIMBCTD %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\portaudio\winvc\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ALLOW_SMP_DANGERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/NODEFAULTLIB:LIMBCTD %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\portaudio\winvc\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ALLOW_SMP_DANGERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\portaudio\winvc\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ALLOW_SMP_DANGERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\portaudio\winvc\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_PortAudio.c">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ClCompile Include="pa_ringbuffer.c" />
-    <ClCompile Include="pablio.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pa_ringbuffer.h" />
-    <ClInclude Include="pablio.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\libs\win32\apr\libapr.2017.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libs\win32\portaudio\portaudio.2017.vcxproj">
-      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
deleted file mode 100644
index 62eba524d3..0000000000
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ /dev/null
@@ -1,3312 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License `
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- * Moises Silva <moises.silva@gmail.com> (Multiple endpoints work sponsored by Comrex Corporation)
- * Raymond Chandler <intralanman@freeswitch.org>
- *
- *
- * mod_portaudio.c -- PortAudio Endpoint Module
- *
- */
-
-#include "switch.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include "pablio.h"
-
-#define MY_EVENT_RINGING "portaudio::ringing"
-#define MY_EVENT_MAKE_CALL "portaudio::makecall"
-#define MY_EVENT_CALL_HELD "portaudio::callheld"
-#define MY_EVENT_CALL_RESUMED "portaudio::callresumed"
-#define MY_EVENT_ERROR_AUDIO_DEV "portaudio::audio_dev_error"
-#define SWITCH_PA_CALL_ID_VARIABLE "pa_call_id"
-
-#define MIN_STREAM_SAMPLE_RATE 8000
-#define STREAM_SAMPLES_PER_PACKET(stream) ((stream->codec_ms * stream->sample_rate) / 1000)
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_portaudio_shutdown);
-//SWITCH_MODULE_RUNTIME_FUNCTION(mod_portaudio_runtime);
-SWITCH_MODULE_DEFINITION(mod_portaudio, mod_portaudio_load, mod_portaudio_shutdown, NULL);
-
-static switch_memory_pool_t *module_pool = NULL;
-switch_endpoint_interface_t *portaudio_endpoint_interface;
-
-#define SAMPLE_TYPE  paInt16
-typedef int16_t SAMPLE;
-
-typedef switch_status_t (*pa_command_t) (char **argv, int argc, switch_stream_handle_t *stream);
-
-typedef enum {
-	GFLAG_NONE = 0,
-	GFLAG_EAR = (1 << 0),
-	GFLAG_MOUTH = (1 << 1),
-	GFLAG_RING = (1 << 2)
-} GFLAGS;
-
-typedef enum {
-	TFLAG_IO = (1 << 0),
-	TFLAG_INBOUND = (1 << 1),
-	TFLAG_OUTBOUND = (1 << 2),
-	TFLAG_DTMF = (1 << 3),
-	TFLAG_VOICE = (1 << 4),
-	TFLAG_HANGUP = (1 << 5),
-	TFLAG_LINEAR = (1 << 6),
-	TFLAG_ANSWER = (1 << 7),
-	TFLAG_HUP = (1 << 8),
-	TFLAG_MASTER = (1 << 9),
-	TFLAG_AUTO_ANSWER = (1 << 10)
-} TFLAGS;
-
-struct audio_stream {
-	int indev;
-	int outdev;
-	PABLIO_Stream *stream;
-	switch_timer_t write_timer;
-	struct audio_stream *next;
-};
-typedef struct audio_stream audio_stream_t;
-
-/* Audio stream that can be shared across endpoints */
-typedef struct _shared_audio_stream_t {
-	/*! Friendly name for this stream */
-	char name[255];
-	/*! Sampling rate */
-	int sample_rate;
-	/*! Buffer packetization (and therefore timing) */
-	int codec_ms;
-	/*! The PA input device */
-	int indev;
-	/*! Input channels being used */
-	uint8_t inchan_used[MAX_IO_CHANNELS];
-	/*! The PA output device */
-	int outdev;
-	/*! Output channels being used */
-	uint8_t outchan_used[MAX_IO_CHANNELS];
-	/*! How many channels to create (for both indev and outdev) */
-	int channels;
-	/*! The io stream helper to buffer audio */
-	PABLIO_Stream *stream;
-	/* It can be shared after all :-)  */
-	switch_mutex_t *mutex;
-} shared_audio_stream_t;
-
-typedef struct private_object private_t;
-/* Endpoint that can be called via portaudio/endpoint/<endpoint-name> */
-typedef struct _audio_endpoint {
-	/*! Friendly name for this endpoint */
-	char name[255];
-
-	/*! Input stream for this endpoint */
-	shared_audio_stream_t *in_stream;
-
-	/*! Output stream for this endpoint */
-	shared_audio_stream_t *out_stream;
-
-	/*! Channel index within the input stream where we get the audio for this endpoint */
-	int inchan;
-
-	/*! Channel index within the output stream where we get the audio for this endpoint */
-	int outchan;
-
-	/*! Associated private information if involved in a call */
-	private_t *master;
-
-	/*! For timed read and writes */
-	switch_timer_t read_timer;
-	switch_timer_t write_timer;
-
-	/* We need our own read frame */
-	switch_frame_t read_frame;
-	unsigned char read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-
-	/* Needed codecs for the core to read/write in the proper format */
-	switch_codec_t read_codec;
-	switch_codec_t write_codec;
-
-	/*! Let's be safe */
-	switch_mutex_t *mutex;
-} audio_endpoint_t;
-
-struct private_object {
-	unsigned int flags;
-	switch_core_session_t *session;
-	switch_caller_profile_t *caller_profile;
-	char call_id[50];
-	int sample_rate;
-	int codec_ms;
-	switch_mutex_t *flag_mutex;
-	char *hold_file;
-	switch_file_handle_t fh;
-	switch_file_handle_t *hfh;
-	switch_frame_t hold_frame;
-	unsigned char holdbuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	audio_endpoint_t *audio_endpoint;
-	struct private_object *next;
-};
-
-
-static struct {
-	int debug;
-	int port;
-	char *cid_name;
-	char *cid_num;
-	char *dialplan;
-	char *context;
-	char *ring_file;
-	char *hold_file;
-	char *timer_name;
-	int ringdev;
-	int indev;
-	int outdev;
-	int call_id;
-	int unload_device_fail;
-	switch_hash_t *call_hash;
-	switch_mutex_t *device_lock;
-	switch_mutex_t *pvt_lock;
-	switch_mutex_t *streams_lock;
-	switch_mutex_t *flag_mutex;
-	switch_mutex_t *pa_mutex;
-	int sample_rate;
-	int codec_ms;
-	audio_stream_t *main_stream;
-	audio_stream_t *ring_stream;
-	switch_codec_t read_codec;
-	switch_codec_t write_codec;
-	switch_frame_t read_frame;
-	switch_frame_t cng_frame;
-	unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	unsigned char cngbuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	private_t *call_list;
-	audio_stream_t *stream_list;
-	/*! Streams that can be used by multiple endpoints at the same time */
-	switch_hash_t *sh_streams;
-	/*! Endpoints configured */
-	switch_hash_t *endpoints;
-	int ring_interval;
-	GFLAGS flags;
-	switch_timer_t read_timer;
-	switch_timer_t readfile_timer;
-	switch_timer_t hold_timer;
-	int dual_streams;
-	time_t deactivate_timer;
-	int live_stream_switch;
-	int no_auto_resume_call;
-	int no_ring_during_call;
-	int codecs_inited;
-	int stream_in_use; //only really used by playdev
-	int destroying_streams;
-} globals;
-
-
-#define PA_MASTER 1
-#define PA_SLAVE 0
-
-
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_context, globals.context);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_name, globals.cid_name);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_num, globals.cid_num);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ring_file, globals.ring_file);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_hold_file, globals.hold_file);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_timer_name, globals.timer_name);
-#define is_master(t) switch_test_flag(t, TFLAG_MASTER)
-
-static void add_pvt(private_t *tech_pvt, int master);
-static void remove_pvt(private_t *tech_pvt);
-static switch_status_t channel_on_init(switch_core_session_t *session);
-static switch_status_t channel_on_hangup(switch_core_session_t *session);
-static switch_status_t channel_on_destroy(switch_core_session_t *session);
-static switch_status_t channel_on_routing(switch_core_session_t *session);
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-													switch_call_cause_t *cancel_cause);
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
-
-static switch_status_t create_codecs(int restart);
-static void create_hold_event(private_t *tech_pvt, int unhold);
-static audio_stream_t * find_audio_stream(int indev, int outdev, int already_locked);
-static audio_stream_t * get_audio_stream(int indev, int outdev);
-static audio_stream_t * create_audio_stream(int indev, int outdev);
-PaError open_audio_stream(PABLIO_Stream **stream, const PaStreamParameters * inputParameters, const PaStreamParameters * outputParameters);
-static switch_status_t switch_audio_stream();
-static void add_stream(audio_stream_t *stream, int already_locked);
-static void remove_stream(audio_stream_t *stream, int already_locked);
-static switch_status_t destroy_audio_stream(int indev, int outdev);
-static switch_status_t destroy_actual_stream(audio_stream_t *stream);
-static void destroy_audio_streams();
-static switch_status_t validate_main_audio_stream();
-static switch_status_t validate_ring_audio_stream();
-
-static int dump_info(int verbose);
-static switch_status_t load_config(void);
-static int get_dev_by_name(char *name, int in);
-static int get_dev_by_number(char *numstr, int in);
-SWITCH_STANDARD_API(pa_cmd);
-
-/*
-   State methods they get called when the state changes to the specific state
-   returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
-   so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
-*/
-static switch_status_t channel_on_init(switch_core_session_t *session)
-{
-	switch_channel_t *channel;
-
-	if (session) {
-		if ((channel = switch_core_session_get_channel(session))) {
-			switch_channel_set_flag(channel, CF_AUDIO);
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_routing(switch_core_session_t *session)
-{
-
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	private_t *tech_pvt = switch_core_session_get_private(session);
-	switch_time_t last;
-	int waitsec = globals.ring_interval * 1000000;
-	switch_file_handle_t fh = { 0 };
-	const char *val, *ring_file = NULL, *hold_file = NULL;
-	int16_t abuf[2048];
-
-	switch_assert(tech_pvt != NULL);
-
-	last = switch_micro_time_now() - waitsec;
-
-	if ((val = switch_channel_get_variable(channel, "pa_hold_file"))) {
-		hold_file = val;
-	} else {
-		hold_file = globals.hold_file;
-	}
-
-	if (hold_file) {
-		tech_pvt->hold_file = switch_core_session_strdup(session, hold_file);
-	}
-	if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
-		if (!tech_pvt->audio_endpoint && validate_main_audio_stream() != SWITCH_STATUS_SUCCESS) {
-			switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (!tech_pvt->audio_endpoint &&
-		    switch_test_flag(tech_pvt, TFLAG_OUTBOUND) &&
-		    !switch_test_flag(tech_pvt, TFLAG_AUTO_ANSWER)) {
-
-			add_pvt(tech_pvt, PA_SLAVE);
-
-			ring_file = globals.ring_file;
-			if ((val = switch_channel_get_variable(channel, "pa_ring_file"))) {
-				ring_file = val;
-			}
-
-			if (switch_test_flag((&globals), GFLAG_RING)) {
-				ring_file = NULL;
-			}
-			switch_set_flag_locked((&globals), GFLAG_RING);
-			if (ring_file) {
-				if (switch_core_file_open(&fh,
-										  ring_file,
-										  globals.read_codec.implementation->number_of_channels,
-										  globals.read_codec.implementation->actual_samples_per_second,
-										  SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) == SWITCH_STATUS_SUCCESS) {
-
-					if (validate_ring_audio_stream() != SWITCH_STATUS_SUCCESS) {
-						switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Ring Error!\n");
-						switch_core_file_close(&fh);
-						return SWITCH_STATUS_GENERR;
-					}
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot open %s, disabling ring file!\n", ring_file);
-					ring_file = NULL;
-				}
-			}
-		}
-
-		if (tech_pvt->audio_endpoint || switch_test_flag(tech_pvt, TFLAG_AUTO_ANSWER)) {
-			switch_mutex_lock(globals.pvt_lock);
-			add_pvt(tech_pvt, PA_MASTER);
-			if (switch_test_flag(tech_pvt, TFLAG_AUTO_ANSWER)) {
-				switch_channel_mark_answered(channel);
-				switch_set_flag(tech_pvt, TFLAG_ANSWER);
-			}
-			switch_mutex_unlock(globals.pvt_lock);
-			switch_yield(1000000);
-		} else {
-			switch_channel_mark_ring_ready(channel);
-		}
-
-		while (switch_channel_get_state(channel) == CS_ROUTING &&
-		       !switch_channel_test_flag(channel, CF_ANSWERED) &&
-		       !switch_test_flag(tech_pvt, TFLAG_ANSWER)) {
-			switch_size_t olen = globals.readfile_timer.samples;
-
-			if (switch_micro_time_now() - last >= waitsec) {
-				char buf[512];
-				switch_event_t *event;
-
-				switch_snprintf(buf, sizeof(buf), "BRRRRING! BRRRRING! call %s\n", tech_pvt->call_id);
-
-				if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_RINGING) == SWITCH_STATUS_SUCCESS) {
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_info", buf);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call_id", tech_pvt->call_id); /* left behind for backwards compatability */
-					switch_channel_set_variable(channel, SWITCH_PA_CALL_ID_VARIABLE, tech_pvt->call_id);
-					switch_channel_event_set_data(channel, event);
-					switch_event_fire(&event);
-				}
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s\n", buf);
-				last = switch_micro_time_now();
-			}
-
-			if (ring_file) {
-				if (switch_core_timer_next(&globals.readfile_timer) != SWITCH_STATUS_SUCCESS) {
-					switch_core_file_close(&fh);
-					break;
-				}
-				switch_core_file_read(&fh, abuf, &olen);
-				if (olen == 0) {
-					unsigned int pos = 0;
-					switch_core_file_seek(&fh, &pos, 0, SEEK_SET);
-				}
-
-				if (globals.ring_stream && (! switch_test_flag(globals.call_list, TFLAG_MASTER) ||
-							( !globals.no_ring_during_call && globals.main_stream != globals.ring_stream)) ) { //if there is a ring stream and not an active call or if there is an active call and we are allowed to ring during it AND the ring stream is not the main stream
-						WriteAudioStream(globals.ring_stream->stream, abuf, (long) olen, 0, &globals.ring_stream->write_timer);
-				}
-			} else {
-				switch_yield(10000);
-			}
-		}
-		switch_clear_flag_locked((&globals), GFLAG_RING);
-	}
-
-	if (ring_file) {
-		switch_core_file_close(&fh);
-	}
-
-	if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
-		if (!switch_test_flag(tech_pvt, TFLAG_ANSWER) &&
-		    !switch_channel_test_flag(channel, CF_ANSWERED)) {
-			switch_channel_hangup(channel, SWITCH_CAUSE_NO_ANSWER);
-			return SWITCH_STATUS_SUCCESS;
-		}
-		switch_set_flag(tech_pvt, TFLAG_ANSWER);
-	}
-
-	switch_set_flag_locked(tech_pvt, TFLAG_IO);
-
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n",
-					  switch_channel_get_name(switch_core_session_get_channel(session)));
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_execute(switch_core_session_t *session)
-{
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n",
-					  switch_channel_get_name(switch_core_session_get_channel(session)));
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static audio_stream_t* find_audio_stream(int indev, int outdev, int already_locked)
-{
-	audio_stream_t *cur_stream;
-
-	if (! globals.stream_list) {
-		return NULL;
-	}
-
-	if (! already_locked) {
-		switch_mutex_lock(globals.streams_lock);
-	}
-	cur_stream = globals.stream_list;
-
-	while (cur_stream != NULL) {
-		if (cur_stream->outdev == outdev) {
-			if (indev == -1 || cur_stream->indev == indev) {
-				if (! already_locked) {
-					switch_mutex_unlock(globals.streams_lock);
-				}
-				return cur_stream;
-			}
-		}
-		cur_stream = cur_stream->next;
-	}
-	if (! already_locked) {
-		switch_mutex_unlock(globals.streams_lock);
-	}
-	return NULL;
-}
-
-static void destroy_audio_streams()
-{
-	int close_wait = 4;
-	globals.destroying_streams = 1;
-
-	while (globals.stream_in_use && close_wait--) {
-		switch_yield(250000);
-	}
-	while (globals.stream_list != NULL) {
-		destroy_audio_stream(globals.stream_list->indev, globals.stream_list->outdev);
-	}
-	globals.destroying_streams = 0;
-}
-
-static switch_status_t validate_main_audio_stream()
-{
-	if (globals.read_timer.timer_interface) {
-		switch_core_timer_sync(&globals.read_timer);
-	}
-
-	if (globals.main_stream) {
-		if (globals.main_stream->write_timer.timer_interface) {
-			switch_core_timer_sync(&(globals.main_stream->write_timer));
-		}
-
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	globals.main_stream = get_audio_stream(globals.indev, globals.outdev);
-
-	if (globals.main_stream) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t validate_ring_audio_stream()
-{
-	if (globals.ringdev == -1) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-	if (globals.ring_stream) {
-		if (globals.ring_stream->write_timer.timer_interface) {
-			switch_core_timer_sync(&(globals.ring_stream->write_timer));
-		}
-		return SWITCH_STATUS_SUCCESS;
-	}
-	globals.ring_stream = get_audio_stream(-1, globals.ringdev);
-	if (globals.ring_stream) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t destroy_actual_stream(audio_stream_t *stream)
-{
-	if (stream == NULL) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (globals.main_stream == stream) {
-		globals.main_stream = NULL;
-	}
-
-	if (globals.ring_stream == stream) {
-		globals.ring_stream = NULL;
-	}
-
-	CloseAudioStream(stream->stream);
-	stream->stream = NULL;
-
-	if (stream->write_timer.timer_interface) {
-		switch_core_timer_destroy(&stream->write_timer);
-	}
-
-	switch_safe_free(stream);
-	return SWITCH_STATUS_SUCCESS;
-}
-static switch_status_t destroy_audio_stream(int indev, int outdev)
-{
-	audio_stream_t *stream;
-
-	switch_mutex_lock(globals.streams_lock);
-	stream = find_audio_stream(indev, outdev,1);
-	if (stream == NULL) {
-		switch_mutex_unlock(globals.streams_lock);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	remove_stream(stream, 1);
-	switch_mutex_unlock(globals.streams_lock);
-
-	destroy_actual_stream(stream);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static void destroy_codecs(void)
-{
-
-	if (switch_core_codec_ready(&globals.read_codec)) {
-		switch_core_codec_destroy(&globals.read_codec);
-	}
-
-	if (switch_core_codec_ready(&globals.write_codec)) {
-		switch_core_codec_destroy(&globals.write_codec);
-	}
-
-	if (globals.read_timer.timer_interface) {
-		switch_core_timer_destroy(&globals.read_timer);
-	}
-
-	if (globals.readfile_timer.timer_interface) {
-		switch_core_timer_destroy(&globals.readfile_timer);
-	}
-
-	if (globals.hold_timer.timer_interface) {
-		switch_core_timer_destroy(&globals.hold_timer);
-	}
-
-	globals.codecs_inited = 0;
-}
-
-static void create_hold_event(private_t *tech_pvt, int unhold)
-{
-	switch_event_t *event;
-	char * event_id;
-
-	if (unhold) {
-		event_id = MY_EVENT_CALL_RESUMED;
-	} else {
-		event_id = MY_EVENT_CALL_HELD;
-	}
-
-	if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, event_id) == SWITCH_STATUS_SUCCESS) {
-		switch_channel_event_set_data(switch_core_session_get_channel(tech_pvt->session), event);
-		switch_event_fire(&event);
-	}
-}
-
-static void add_stream(audio_stream_t * stream, int already_locked)
-{
-	audio_stream_t *last;
-
-	if (! already_locked) {
-		switch_mutex_lock(globals.streams_lock);
-	}
-	for (last = globals.stream_list; last && last->next; last = last->next);
-	if (last == NULL) {
-		globals.stream_list = stream;
-	} else {
-		last->next = stream;
-	}
-	if (! already_locked) {
-		switch_mutex_unlock(globals.streams_lock);
-	}
-}
-static void remove_stream(audio_stream_t * stream, int already_locked)
-{
-	audio_stream_t *previous;
-	if (! already_locked) {
-		switch_mutex_lock(globals.streams_lock);
-	}
-	if (globals.stream_list == stream) {
-		globals.stream_list = stream->next;
-	} else {
-		for (previous = globals.stream_list; previous && previous->next && previous->next != stream; previous = previous->next) {
-			;
-		}
-		if (previous) {
-			previous->next = stream->next;
-		}
-	}
-	if (! already_locked) {
-		switch_mutex_unlock(globals.streams_lock);
-	}
-}
-
-static void add_pvt(private_t *tech_pvt, int master)
-{
-	private_t *tp;
-	uint8_t in_list = 0;
-
-	switch_mutex_lock(globals.pvt_lock);
-
-	if (*tech_pvt->call_id == '\0') {
-		switch_mutex_lock(globals.pa_mutex);
-		switch_snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", ++globals.call_id);
-		switch_channel_set_variable(switch_core_session_get_channel(tech_pvt->session), SWITCH_PA_CALL_ID_VARIABLE, tech_pvt->call_id);
-		switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
-		if (!tech_pvt->audio_endpoint) {
-			switch_core_session_set_read_codec(tech_pvt->session, &globals.read_codec);
-			switch_core_session_set_write_codec(tech_pvt->session, &globals.write_codec);
-		}
-		switch_mutex_unlock(globals.pa_mutex);
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Added call %s\n", tech_pvt->call_id);
-	}
-
-	for (tp = globals.call_list; tp; tp = tp->next) {
-		if (tp == tech_pvt) {
-			in_list = 1;
-		}
-		if (master && switch_test_flag(tp, TFLAG_MASTER) ) {
-			switch_clear_flag_locked(tp, TFLAG_MASTER);
-			create_hold_event(tp, 0);
-		}
-	}
-
-
-	if (master) {
-		if (!in_list) {
-			tech_pvt->next = globals.call_list;
-			globals.call_list = tech_pvt;
-		}
-		switch_set_flag_locked(tech_pvt, TFLAG_MASTER);
-
-	} else if (!in_list) {
-		for (tp = globals.call_list; tp && tp->next; tp = tp->next);
-		if (tp) {
-			tp->next = tech_pvt;
-		} else {
-			globals.call_list = tech_pvt;
-		}
-	}
-
-	switch_mutex_unlock(globals.pvt_lock);
-}
-
-static void remove_pvt(private_t *tech_pvt)
-{
-	private_t *tp, *last = NULL;
-	int was_master = 0;
-
-	switch_mutex_lock(globals.pvt_lock);
-	for (tp = globals.call_list; tp; tp = tp->next) {
-
-		if (tp == tech_pvt) {
-			if (switch_test_flag(tp, TFLAG_MASTER)) {
-				switch_clear_flag_locked(tp, TFLAG_MASTER);
-				was_master = 1;
-			}
-			if (last) {
-				last->next = tp->next;
-			} else {
-				globals.call_list = tp->next;
-			}
-		}
-		last = tp;
-	}
-
-	if (globals.call_list) {
-		if (was_master && ! globals.no_auto_resume_call) {
-			switch_set_flag_locked(globals.call_list, TFLAG_MASTER);
-			create_hold_event(globals.call_list, 1);
-		}
-	} else {
-		globals.deactivate_timer = switch_epoch_time_now(NULL) + 2;
-		destroy_audio_streams();
-	}
-
-	switch_mutex_unlock(globals.pvt_lock);
-}
-
-static void tech_close_file(private_t *tech_pvt)
-{
-	if (tech_pvt->hfh) {
-		tech_pvt->hfh = NULL;
-		switch_core_file_close(&tech_pvt->fh);
-	}
-}
-
-static switch_status_t channel_on_destroy(switch_core_session_t *session)
-{
-	//private_t *tech_pvt = switch_core_session_get_private(session);
-	//switch_assert(tech_pvt != NULL);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static int release_stream_channel(shared_audio_stream_t *stream, int index, int input);
-static switch_status_t channel_on_hangup(switch_core_session_t *session)
-{
-	private_t *tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	if (tech_pvt->audio_endpoint) {
-		audio_endpoint_t *endpoint = tech_pvt->audio_endpoint;
-
-		tech_pvt->audio_endpoint = NULL;
-
-		switch_mutex_lock(endpoint->mutex);
-
-		release_stream_channel(endpoint->in_stream, endpoint->inchan, 1);
-		release_stream_channel(endpoint->out_stream, endpoint->outchan, 0);
-		switch_core_timer_destroy(&endpoint->read_timer);
-		switch_core_timer_destroy(&endpoint->write_timer);
-		switch_core_codec_destroy(&endpoint->read_codec);
-		switch_core_codec_destroy(&endpoint->write_codec);
-		endpoint->master = NULL;
-
-		switch_mutex_unlock(endpoint->mutex);
-	}
-
-	switch_mutex_lock(globals.pa_mutex);
-	switch_core_hash_delete(globals.call_hash, tech_pvt->call_id);
-	switch_mutex_unlock(globals.pa_mutex);
-
-	switch_clear_flag_locked(tech_pvt, TFLAG_IO);
-	switch_set_flag_locked(tech_pvt, TFLAG_HUP);
-
-	remove_pvt(tech_pvt);
-
-	tech_close_file(tech_pvt);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n",
-					  switch_channel_get_name(switch_core_session_get_channel(session)));
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	private_t *tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	switch (sig) {
-	case SWITCH_SIG_KILL:
-		switch_set_flag_locked(tech_pvt, TFLAG_HUP);
-		switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-		break;
-	default:
-		break;
-	}
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
-{
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
-{
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t channel_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
-{
-	private_t *tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "DTMF ON CALL %s [%c]\n", tech_pvt->call_id, dtmf->digit);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_endpoint_read(audio_endpoint_t *endpoint, switch_frame_t **frame)
-{
-	int samples = 0;
-
-	if (!endpoint->in_stream) {
-		switch_core_timer_next(&endpoint->read_timer);
-		*frame = &globals.cng_frame;
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	endpoint->read_frame.data = endpoint->read_buf;
-	endpoint->read_frame.buflen = sizeof(endpoint->read_buf);
-	endpoint->read_frame.source = __FILE__;
-	samples = ReadAudioStream(endpoint->in_stream->stream,
-			endpoint->read_frame.data, STREAM_SAMPLES_PER_PACKET(endpoint->in_stream),
-			endpoint->inchan, &endpoint->read_timer);
-
-	if (!samples) {
-		switch_core_timer_next(&endpoint->read_timer);
-		*frame = &globals.cng_frame;
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	endpoint->read_frame.datalen = (samples * sizeof(int16_t));
-	endpoint->read_frame.samples = samples;
-	endpoint->read_frame.codec = &endpoint->read_codec;
-	*frame = &endpoint->read_frame;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
-{
-	private_t *tech_pvt = switch_core_session_get_private(session);
-	int samples = 0;
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	switch_assert(tech_pvt != NULL);
-
-	if (tech_pvt->audio_endpoint) {
-		return channel_endpoint_read(tech_pvt->audio_endpoint, frame);
-	}
-
-	if (!globals.main_stream) {
-		goto normal_return;
-	}
-
-	if (switch_test_flag(tech_pvt, TFLAG_HUP)) {
-		goto normal_return;
-	}
-
-	if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
-		goto cng_wait;
-	}
-
-	if (!is_master(tech_pvt)) {
-		if (tech_pvt->hold_file) {
-			switch_size_t olen = globals.read_codec.implementation->samples_per_packet;
-
-			if (!tech_pvt->hfh) {
-				int sample_rate = globals.sample_rate;
-				if (switch_core_file_open(&tech_pvt->fh,
-										  tech_pvt->hold_file,
-										  globals.read_codec.implementation->number_of_channels,
-										  globals.read_codec.implementation->actual_samples_per_second,
-										  SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
-					tech_pvt->hold_file = NULL;
-					goto cng_wait;
-				}
-
-				tech_pvt->hfh = &tech_pvt->fh;
-				tech_pvt->hold_frame.data = tech_pvt->holdbuf;
-				tech_pvt->hold_frame.buflen = sizeof(tech_pvt->holdbuf);
-				tech_pvt->hold_frame.rate = sample_rate;
-				tech_pvt->hold_frame.codec = &globals.write_codec;
-			}
-
-			if (switch_core_timer_next(&globals.hold_timer) != SWITCH_STATUS_SUCCESS) {
-				switch_core_file_close(&tech_pvt->fh);
-				goto cng_nowait;
-			}
-			switch_core_file_read(tech_pvt->hfh, tech_pvt->hold_frame.data, &olen);
-
-			if (olen == 0) {
-				unsigned int pos = 0;
-				switch_core_file_seek(tech_pvt->hfh, &pos, 0, SEEK_SET);
-				goto cng_nowait;
-			}
-
-			tech_pvt->hold_frame.datalen = (uint32_t) (olen * sizeof(int16_t));
-			tech_pvt->hold_frame.samples = (uint32_t) olen;
-			*frame = &tech_pvt->hold_frame;
-
-			status = SWITCH_STATUS_SUCCESS;
-			goto normal_return;
-		}
-
-		goto cng_wait;
-	}
-
-	if (tech_pvt->hfh) {
-		tech_close_file(tech_pvt);
-	}
-
-	switch_mutex_lock(globals.device_lock);
-	samples = ReadAudioStream(globals.main_stream->stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_packet, 0, &globals.read_timer);
-	switch_mutex_unlock(globals.device_lock);
-
-	if (samples) {
-		globals.read_frame.datalen = samples * 2;
-		globals.read_frame.samples = samples;
-
-		*frame = &globals.read_frame;
-
-		if (!switch_test_flag((&globals), GFLAG_MOUTH)) {
-			memset(globals.read_frame.data, 255, globals.read_frame.datalen);
-		}
-		status = SWITCH_STATUS_SUCCESS;
-	} else {
-		goto cng_nowait;
-	}
-
-normal_return:
-	return status;
-
-  cng_nowait:
-	*frame = &globals.cng_frame;
-	return SWITCH_STATUS_SUCCESS;
-
-  cng_wait:
-	switch_core_timer_next(&globals.hold_timer);
-	*frame = &globals.cng_frame;
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t channel_endpoint_write(audio_endpoint_t *endpoint, switch_frame_t *frame)
-{
-	if (!endpoint->out_stream) {
-		switch_core_timer_next(&endpoint->write_timer);
-		return SWITCH_STATUS_SUCCESS;
-	}
-	if (!endpoint->master) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-	if (switch_test_flag(endpoint->master, TFLAG_HUP)) {
-		return SWITCH_STATUS_FALSE;
-	}
-	if (!switch_test_flag(endpoint->master, TFLAG_IO)) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-	WriteAudioStream(endpoint->out_stream->stream, (short *)frame->data,
-			(int)(frame->datalen / sizeof(SAMPLE)),
-			endpoint->outchan, &(endpoint->write_timer));
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
-{
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	private_t *tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	if (tech_pvt->audio_endpoint) {
-		return channel_endpoint_write(tech_pvt->audio_endpoint, frame);
-	}
-
-	if (!globals.main_stream) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_test_flag(tech_pvt, TFLAG_HUP)) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (!is_master(tech_pvt) || !switch_test_flag(tech_pvt, TFLAG_IO)) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (globals.main_stream) {
-		if (switch_test_flag((&globals), GFLAG_EAR)) {
-			WriteAudioStream(globals.main_stream->stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)), 0, &(globals.main_stream->write_timer));
-		}
-		status = SWITCH_STATUS_SUCCESS;
-	}
-
-	return status;
-}
-
-static switch_status_t channel_answer_channel(switch_core_session_t *session)
-{
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	private_t *tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	switch (msg->message_id) {
-	case SWITCH_MESSAGE_INDICATE_ANSWER:
-		channel_answer_channel(session);
-		break;
-	case SWITCH_MESSAGE_INDICATE_PROGRESS:
-		{
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Engage Early Media\n");
-			switch_set_flag_locked(tech_pvt, TFLAG_IO);
-		}
-	default:
-		break;
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_state_handler_table_t portaudio_event_handlers = {
-	/*.on_init */ channel_on_init,
-	/*.on_routing */ channel_on_routing,
-	/*.on_execute */ channel_on_execute,
-	/*.on_hangup */ channel_on_hangup,
-	/*.on_exchange_media */ channel_on_exchange_media,
-	/*.on_soft_execute */ channel_on_soft_execute,
-	/*.on_consume_media */ NULL,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ NULL,
-	/*.on_destroy */ channel_on_destroy
-};
-
-switch_io_routines_t portaudio_io_routines = {
-	/*.outgoing_channel */ channel_outgoing_channel,
-	/*.read_frame */ channel_read_frame,
-	/*.write_frame */ channel_write_frame,
-	/*.kill_channel */ channel_kill_channel,
-	/*.send_dtmf */ channel_send_dtmf,
-	/*.receive_message */ channel_receive_message
-};
-
-static int create_shared_audio_stream(shared_audio_stream_t *stream);
-static int destroy_shared_audio_stream(shared_audio_stream_t *stream);
-static int take_stream_channel(shared_audio_stream_t *stream, int index, int input)
-{
-	int rc = 0;
-	if (!stream) {
-		return rc;
-	}
-
-	switch_mutex_lock(stream->mutex);
-
-	if (!stream->stream && create_shared_audio_stream(stream)) {
-		rc = -1;
-		goto done;
-	}
-
-	if (input) {
-	       	if (stream->inchan_used[index]) {
-			rc = -1;
-			goto done;
-		}
-		stream->inchan_used[index] = 1;
-	} else {
-		if (!input && stream->outchan_used[index]) {
-			rc = -1;
-			goto done;
-		}
-		stream->outchan_used[index] = 1;
-	}
-
-done:
-	switch_mutex_unlock(stream->mutex);
-	return rc;
-}
-
-static int release_stream_channel(shared_audio_stream_t *stream, int index, int input)
-{
-	int i = 0;
-	int destroy_stream = 1;
-	int rc = 0;
-
-	if (!stream) {
-		return rc;
-	}
-
-	switch_mutex_lock(stream->mutex);
-
-	if (input) {
-		stream->inchan_used[index] = 0;
-	} else {
-		stream->outchan_used[index] = 0;
-	}
-
-	for (i = 0; i < stream->channels; i++) {
-		if (stream->inchan_used[i] || stream->outchan_used[i]) {
-			destroy_stream = 0;
-		}
-	}
-	if (destroy_stream) {
-		destroy_shared_audio_stream(stream);
-	}
-
-	switch_mutex_unlock(stream->mutex);
-	return rc;
-}
-
-/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
-   that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
-*/
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-													switch_call_cause_t *cancel_cause)
-{
-	char name[128];
-	const char *id = NULL;
-	private_t *tech_pvt = NULL;
-	switch_channel_t *channel = NULL;
-	switch_caller_profile_t *caller_profile = NULL;
-	switch_call_cause_t retcause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-	int codec_ms = -1;
-	int samples_per_packet = -1;
-	int sample_rate = 0;
-	audio_endpoint_t *endpoint = NULL;
-	char *endpoint_name = NULL;
-	const char *endpoint_answer = NULL;
-
-	if (!outbound_profile) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing caller profile\n");
-		return retcause;
-	}
-
-	if (!(*new_session = switch_core_session_request_uuid(portaudio_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool, switch_event_get_header(var_event, "origination_uuid")))) {
-		return retcause;
-	}
-
-	switch_core_session_add_stream(*new_session, NULL);
-	if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) {
-		memset(tech_pvt, 0, sizeof(*tech_pvt));
-		switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session));
-		channel = switch_core_session_get_channel(*new_session);
-		switch_core_session_set_private(*new_session, tech_pvt);
-		tech_pvt->session = *new_session;
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
-		switch_core_session_destroy(new_session);
-		return retcause;
-	}
-
-	if (outbound_profile->destination_number && !strncasecmp(outbound_profile->destination_number, "endpoint", sizeof("endpoint")-1)) {
-		endpoint = NULL;
-		endpoint_name = switch_core_strdup(outbound_profile->pool, outbound_profile->destination_number);
-		endpoint_name = strchr(endpoint_name, '/');
-		if (!endpoint_name) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_CRIT, "No portaudio endpoint specified\n");
-			goto error;
-		}
-		endpoint_name++;
-		endpoint = switch_core_hash_find(globals.endpoints, endpoint_name);
-		if (!endpoint) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_CRIT, "Invalid portaudio endpoint %s\n", endpoint_name);
-			goto error;
-		}
-
-		switch_mutex_lock(endpoint->mutex);
-
-		if (endpoint->master) {
-			/* someone already has this endpoint */
-			retcause = SWITCH_CAUSE_USER_BUSY;
-			goto error;
-		}
-
-		codec_ms = endpoint->in_stream ? endpoint->in_stream->codec_ms : endpoint->out_stream->codec_ms;
-		samples_per_packet = endpoint->in_stream ?
-			STREAM_SAMPLES_PER_PACKET(endpoint->in_stream) : STREAM_SAMPLES_PER_PACKET(endpoint->out_stream);
-		sample_rate = endpoint->in_stream ? endpoint->in_stream->sample_rate : endpoint->out_stream->sample_rate;
-
-		if (switch_core_timer_init(&endpoint->read_timer,
-				   globals.timer_name, codec_ms,
-				   samples_per_packet, module_pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to setup read timer for endpoint '%s'!\n", endpoint->name);
-			goto error;
-		}
-
-		/* The write timer must be setup regardless */
-		if (switch_core_timer_init(&endpoint->write_timer,
-				   globals.timer_name, codec_ms,
-				   samples_per_packet, module_pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to setup read timer for endpoint '%s'!\n", endpoint->name);
-			goto error;
-		}
-
-		if (switch_core_codec_init(&endpoint->read_codec,
-								   "L16", NULL, NULL, sample_rate, codec_ms, 1,
-								   SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-			goto error;
-		}
-
-		if (switch_core_codec_init(&endpoint->write_codec,
-								   "L16", NULL, NULL, sample_rate, codec_ms, 1,
-								   SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-			goto error;
-		}
-		switch_core_session_set_read_codec(tech_pvt->session, &endpoint->read_codec);
-		switch_core_session_set_write_codec(tech_pvt->session, &endpoint->write_codec);
-
-		/* try to acquire the stream */
-		if (take_stream_channel(endpoint->in_stream, endpoint->inchan, 1)) {
-			retcause = SWITCH_CAUSE_USER_BUSY;
-			goto error;
-		}
-		if (take_stream_channel(endpoint->out_stream, endpoint->outchan, 0)) {
-			release_stream_channel(endpoint->in_stream, endpoint->inchan, 1);
-			retcause = SWITCH_CAUSE_USER_BUSY;
-			goto error;
-		}
-		switch_snprintf(name, sizeof(name), "portaudio/endpoint-%s", endpoint_name);
-		if (var_event && (endpoint_answer = (switch_event_get_header(var_event, "endpoint_answer")))) {
-			if (switch_true(endpoint_answer)) {
-				switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER);
-			}
-		} else {
-			switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER);
-		}
-		endpoint->master = tech_pvt;
-		tech_pvt->audio_endpoint = endpoint;
-		switch_mutex_unlock(endpoint->mutex);
-	} else {
-		id = !zstr(outbound_profile->caller_id_number) ? outbound_profile->caller_id_number : "na";
-		switch_snprintf(name, sizeof(name), "portaudio/%s", id);
-		if (outbound_profile->destination_number && !strcasecmp(outbound_profile->destination_number, "auto_answer")) {
-			switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER);
-		}
-	}
-	switch_channel_set_name(channel, name);
-	caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
-	switch_channel_set_caller_profile(channel, caller_profile);
-	tech_pvt->caller_profile = caller_profile;
-
-	switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
-	switch_channel_set_state(channel, CS_INIT);
-	switch_channel_set_flag(channel, CF_AUDIO);
-	return SWITCH_CAUSE_SUCCESS;
-
-error:
-	if (endpoint) {
-		if (!endpoint->master) {
-			if (endpoint->read_timer.interval) {
-				switch_core_timer_destroy(&endpoint->read_timer);
-			}
-			if (endpoint->write_timer.interval) {
-				switch_core_timer_destroy(&endpoint->write_timer);
-			}
-			if (endpoint->read_codec.codec_interface) {
-				switch_core_codec_destroy(&endpoint->read_codec);
-			}
-			if (endpoint->write_codec.codec_interface) {
-				switch_core_codec_destroy(&endpoint->write_codec);
-			}
-		}
-		switch_mutex_unlock(endpoint->mutex);
-	}
-	if (new_session && *new_session) {
-		switch_core_session_destroy(new_session);
-	}
-	return retcause;
-}
-
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_load)
-{
-	switch_status_t status;
-	switch_api_interface_t *api_interface;
-
-	module_pool = pool;
-
-	if (paNoError != Pa_Initialize()) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot initialize port audio!\n");
-		return SWITCH_STATUS_TERM;
-	}
-
-	memset(&globals, 0, sizeof(globals));
-
-	switch_core_hash_init(&globals.call_hash);
-	switch_core_hash_init(&globals.sh_streams);
-	switch_core_hash_init(&globals.endpoints);
-	switch_mutex_init(&globals.device_lock, SWITCH_MUTEX_NESTED, module_pool);
-	switch_mutex_init(&globals.pvt_lock, SWITCH_MUTEX_NESTED, module_pool);
-	switch_mutex_init(&globals.streams_lock, SWITCH_MUTEX_NESTED, module_pool);
-	switch_mutex_init(&globals.flag_mutex, SWITCH_MUTEX_NESTED, module_pool);
-	switch_mutex_init(&globals.pa_mutex, SWITCH_MUTEX_NESTED, module_pool);
-	globals.codecs_inited = 0;
-	globals.read_frame.data = globals.databuf;
-	globals.read_frame.buflen = sizeof(globals.databuf);
-	globals.cng_frame.data = globals.cngbuf;
-	globals.cng_frame.buflen = sizeof(globals.cngbuf);
-	switch_set_flag((&globals.cng_frame), SFF_CNG);
-	globals.flags = GFLAG_EAR | GFLAG_MOUTH;
-	/* dual streams makes portaudio on solaris choke */
-#if defined(sun) || defined(__sun)
-	globals.dual_streams = 0;
-#endif
-
-	if ((status = load_config()) != SWITCH_STATUS_SUCCESS) {
-		return status;
-	}
-
-	if (dump_info(0)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't find any audio devices!\n");
-		return SWITCH_STATUS_TERM;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-					  "Input Device: %d, Output Device: %d, Ring Device: %d Sample Rate: %d MS: %d\n", globals.indev,
-					  globals.outdev, globals.ringdev, globals.sample_rate, globals.codec_ms);
-
-
-	if (switch_event_reserve_subclass(MY_EVENT_RINGING) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	if (switch_event_reserve_subclass(MY_EVENT_MAKE_CALL) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-		return SWITCH_STATUS_GENERR;
-	}
-	if (switch_event_reserve_subclass(MY_EVENT_CALL_HELD) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-		return SWITCH_STATUS_GENERR;
-	}
-	if (switch_event_reserve_subclass(MY_EVENT_CALL_RESUMED) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	if (switch_event_reserve_subclass(MY_EVENT_ERROR_AUDIO_DEV) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	portaudio_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-	portaudio_endpoint_interface->interface_name = "portaudio";
-	portaudio_endpoint_interface->io_routines = &portaudio_io_routines;
-	portaudio_endpoint_interface->state_handler = &portaudio_event_handlers;
-
-	SWITCH_ADD_API(api_interface, "pa", "PortAudio", pa_cmd, "<command> [<args>]");
-	switch_console_set_complete("add pa help");
-	switch_console_set_complete("add pa dump");
-	switch_console_set_complete("add pa call");
-	switch_console_set_complete("add pa answer");
-	switch_console_set_complete("add pa hangup");
-	switch_console_set_complete("add pa list");
-	switch_console_set_complete("add pa switch");
-	switch_console_set_complete("add pa dtmf");
-	switch_console_set_complete("add pa flags");
-	switch_console_set_complete("add pa devlist");
-	switch_console_set_complete("add pa indev");
-	switch_console_set_complete("add pa outdev");
-	switch_console_set_complete("add pa preparestream");
-	switch_console_set_complete("add pa switchstream");
-	switch_console_set_complete("add pa closestreams");
-	switch_console_set_complete("add pa ringdev");
-	switch_console_set_complete("add pa ringfile");
-	switch_console_set_complete("add pa play");
-	switch_console_set_complete("add pa playdev");
-	switch_console_set_complete("add pa looptest");
-	switch_console_set_complete("add pa shstreams");
-	switch_console_set_complete("add pa endpoints");
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static int check_device(char *devstr, int check_input)
-{
-	int devval;
-	if (devstr[0] == '#') {
-		devval = get_dev_by_number(devstr + 1, check_input);
-	} else {
-		devval = get_dev_by_name(devstr, check_input);
-	}
-	return devval;
-}
-
-static switch_status_t load_streams(switch_xml_t streams)
-{
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_xml_t param, mystream;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading streams ...\n");
-	for (mystream = switch_xml_child(streams, "stream"); mystream; mystream = mystream->next) {
-		shared_audio_stream_t *stream = NULL;
-		int devval = -1;
-		char *stream_name = (char *) switch_xml_attr_soft(mystream, "name");
-
-		if (!stream_name) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing stream name attribute, skipping ...\n");
-			continue;
-		}
-
-		/* check if that stream name is not already used */
-		stream = switch_core_hash_find(globals.sh_streams, stream_name);
-		if (stream) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "A stream with name '%s' already exists\n", stream_name);
-			continue;
-		}
-
-		stream = switch_core_alloc(module_pool, sizeof(*stream));
-		if (!stream) {
-			continue;
-		}
-		switch_mutex_init(&stream->mutex, SWITCH_MUTEX_NESTED, module_pool);
-		stream->indev = -1;
-		stream->outdev = -1;
-		stream->sample_rate = globals.sample_rate;
-		stream->codec_ms = globals.codec_ms;
-		stream->channels = 1;
-		switch_snprintf(stream->name, sizeof(stream->name), "%s", stream_name);
-		for (param = switch_xml_child(mystream, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Parsing stream '%s' parameter %s = %s\n", stream_name, var, val);
-			if (!strcmp(var, "indev")) {
-				devval = check_device(val, 1);
-				if (devval < 0) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-							"Invalid indev specified for stream '%s'\n", stream_name);
-					stream->indev = -1;
-					continue;
-				}
-				stream->indev = devval;
-			} else if (!strcmp(var, "outdev")) {
-				devval = check_device(val, 0);
-				if (devval < 0) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-							"Invalid outdev specified for stream '%s'\n", stream_name);
-					stream->outdev = -1;
-					continue;
-				}
-				stream->outdev = devval;
-			} else if (!strcmp(var, "sample-rate")) {
-				stream->sample_rate = atoi(val);
-				if (stream->sample_rate < MIN_STREAM_SAMPLE_RATE) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-							"Invalid sample rate specified for stream '%s', forcing to 8000\n", stream_name);
-					stream->sample_rate = MIN_STREAM_SAMPLE_RATE;
-				}
-			} else if (!strcmp(var, "codec-ms")) {
-				int tmp = atoi(val);
-				if (switch_check_interval(stream->sample_rate, tmp)) {
-					stream->codec_ms = tmp;
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
-									  "codec-ms must be multiple of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
-				}
-			} else if (!strcmp(var, "channels")) {
-				stream->channels = atoi(val);
-				if (stream->channels < 1 || stream->channels > MAX_IO_CHANNELS) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-							"Invalid number of channels specified for stream '%s', forcing to 1\n", stream_name);
-					stream->channels = 1;
-				}
-			}
-		}
-		if (stream->indev < 0 && stream->outdev < 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-					"You need at least one device for stream '%s'\n", stream_name);
-			continue;
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
-				"Created stream '%s', sample-rate = %d, codec-ms = %d\n", stream->name, stream->sample_rate, stream->codec_ms);
-		switch_core_hash_insert(globals.sh_streams, stream->name, stream);
-	}
-	return status;
-}
-
-static int check_stream_compat(shared_audio_stream_t *in_stream, shared_audio_stream_t *out_stream)
-{
-	if (!in_stream || !out_stream) {
-		/* nothing to be compatible with */
-		return 0;
-	}
-	if (in_stream->sample_rate != out_stream->sample_rate) {
-		return -1;
-	}
-	if (in_stream->codec_ms != out_stream->codec_ms) {
-		return -1;
-	}
-	return 0;
-}
-
-static shared_audio_stream_t *check_stream(char *streamstr, int check_input, int *chanindex)
-{
-	shared_audio_stream_t *stream = NULL;
-	int cnum = 0;
-	char stream_name[255];
-	char *chan = NULL;
-
-	*chanindex = -1;
-
-	switch_snprintf(stream_name, sizeof(stream_name), "%s", streamstr);
-
-	chan = strchr(stream_name, ':');
-	if (!chan) {
-		return NULL;
-	}
-	*chan = 0;
-	chan++;
-	cnum = atoi(chan);
-
-	stream = switch_core_hash_find(globals.sh_streams, stream_name);
-	if (!stream) {
-		return NULL;
-	}
-
-	if (cnum < 0 || cnum > stream->channels) {
-		return NULL;
-	}
-
-	if (check_input && stream->indev < 0) {
-		return NULL;
-	}
-
-	if (!check_input && stream->outdev < 0) {
-		return NULL;
-	}
-
-	*chanindex = cnum;
-
-	return stream;
-}
-
-static switch_status_t load_endpoints(switch_xml_t endpoints)
-{
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_xml_t param, myendpoint;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading endpoints ...\n");
-	for (myendpoint = switch_xml_child(endpoints, "endpoint"); myendpoint; myendpoint = myendpoint->next) {
-		audio_endpoint_t *endpoint = NULL;
-		shared_audio_stream_t *stream = NULL;
-		char *endpoint_name = (char *) switch_xml_attr_soft(myendpoint, "name");
-
-		if (!endpoint_name) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing endpoint name attribute, skipping ...\n");
-			continue;
-		}
-
-		/* check if that endpoint name is not already used */
-		endpoint = switch_core_hash_find(globals.endpoints, endpoint_name);
-		if (endpoint) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "An endpoint with name '%s' already exists\n", endpoint_name);
-			continue;
-		}
-
-		endpoint = switch_core_alloc(module_pool, sizeof(*endpoint));
-		if (!endpoint) {
-			continue;
-		}
-		switch_mutex_init(&endpoint->mutex, SWITCH_MUTEX_NESTED, module_pool);
-		endpoint->inchan = -1;
-		endpoint->outchan = -1;
-		switch_snprintf(endpoint->name, sizeof(endpoint->name), "%s", endpoint_name);
-		for (param = switch_xml_child(myendpoint, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Parsing endpoint '%s' parameter %s = %s\n", endpoint_name, var, val);
-			if (!strcmp(var, "instream")) {
-				stream = check_stream(val, 1, &endpoint->inchan) ;
-				if (!stream) {
-					endpoint->in_stream = NULL;
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-							"Invalid instream specified for endpoint '%s'\n", endpoint_name);
-					continue;
-				}
-				endpoint->in_stream = stream;
-			} else if (!strcmp(var, "outstream")) {
-				stream = check_stream(val, 0, &endpoint->outchan);
-				if (!stream) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-							"Invalid outstream specified for endpoint '%s'\n", endpoint_name);
-					endpoint->out_stream = NULL;
-					continue;
-				}
-				endpoint->out_stream = stream;
-			}
-		}
-		if (!endpoint->in_stream && !endpoint->out_stream) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-					"You need at least one stream for endpoint '%s'\n", endpoint_name);
-			continue;
-		}
-		if (check_stream_compat(endpoint->in_stream, endpoint->out_stream)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-					"Incompatible input and output streams for endpoint '%s'\n", endpoint_name);
-			continue;
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
-				"Created endpoint '%s', instream = %s, outstream = %s\n", endpoint->name,
-				endpoint->in_stream ? endpoint->in_stream->name : "(none)",
-				endpoint->out_stream ? endpoint->out_stream->name : "(none)");
-		switch_core_hash_insert(globals.endpoints, endpoint->name, endpoint);
-	}
-	return status;
-}
-
-static switch_status_t load_config(void)
-{
-	char *cf = "portaudio.conf";
-	switch_xml_t cfg, xml, settings, streams, endpoints, param;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
-		return SWITCH_STATUS_TERM;
-	}
-	destroy_audio_streams();
-	destroy_codecs();
-	globals.dual_streams = 0;
-	globals.live_stream_switch = 0;
-	globals.no_auto_resume_call = 0;
-	globals.no_ring_during_call = 0;
-	globals.indev = globals.outdev = globals.ringdev = -1;
-	globals.sample_rate = 8000;
-	globals.unload_device_fail = 0;
-
-	if ((settings = switch_xml_child(cfg, "settings"))) {
-		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!strcmp(var, "debug")) {
-				globals.debug = atoi(val);
-			} else if (!strcmp(var, "ring-interval")) {
-				globals.ring_interval = atoi(val);
-			} else if (!strcmp(var, "no-auto-resume-call")) {
-				if (switch_true(val)) {
-					globals.no_auto_resume_call = 1;
-				} else {
-					globals.no_auto_resume_call = 0;
-				}
-			} else if (!strcmp(var, "no-ring-during-call")) {
-				if (switch_true(val)) {
-					globals.no_ring_during_call = 1;
-				} else {
-					globals.no_ring_during_call = 0;
-				}
-			} else if (!strcmp(var, "live-stream-switch")) {
-				if (switch_true(val)) {
-					globals.live_stream_switch = 1;
-				} else {
-					globals.live_stream_switch = 0;
-				}
-			} else if (!strcmp(var, "ring-file")) {
-				set_global_ring_file(val);
-			} else if (!strcmp(var, "hold-file")) {
-				set_global_hold_file(val);
-			} else if (!strcmp(var, "dual-streams")) {
-				if (switch_true(val)) {
-					globals.dual_streams = 1;
-				} else {
-					globals.dual_streams = 0;
-				}
-			} else if (!strcmp(var, "timer-name")) {
-				set_global_timer_name(val);
-			} else if (!strcmp(var, "sample-rate")) {
-				globals.sample_rate = atoi(val);
-			} else if (!strcmp(var, "codec-ms")) {
-				int tmp = atoi(val);
-				if (switch_check_interval(globals.sample_rate, tmp)) {
-					globals.codec_ms = tmp;
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
-									  "codec-ms must be multiple of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
-				}
-			} else if (!strcmp(var, "dialplan")) {
-				set_global_dialplan(val);
-			} else if (!strcmp(var, "context")) {
-				set_global_context(val);
-			} else if (!strcmp(var, "cid-name")) {
-				set_global_cid_name(val);
-			} else if (!strcmp(var, "cid-num")) {
-				set_global_cid_num(val);
-			} else if (!strcmp(var, "indev")) {
-				if (*val == '#') {
-					globals.indev = get_dev_by_number(val + 1, 1);
-				} else {
-					globals.indev = get_dev_by_name(val, 1);
-				}
-			} else if (!strcmp(var, "outdev")) {
-				if (*val == '#') {
-					globals.outdev = get_dev_by_number(val + 1, 0);
-				} else {
-					globals.outdev = get_dev_by_name(val, 0);
-				}
-			} else if (!strcmp(var, "ringdev")) {
-				if (*val == '#') {
-					globals.ringdev = get_dev_by_number(val + 1, 0);
-				} else {
-					globals.ringdev = get_dev_by_name(val, 0);
-				}
-			} else if (!strcasecmp(var, "unload-on-device-fail")) {
-				globals.unload_device_fail = switch_true(val);
-			}
-		}
-	}
-
-	if (!globals.dialplan) {
-		set_global_dialplan("XML");
-	}
-
-	if (!globals.context) {
-		set_global_context("default");
-	}
-
-	if (!globals.sample_rate) {
-		globals.sample_rate = 8000;
-	}
-
-	if (!globals.codec_ms) {
-		globals.codec_ms = 20;
-	}
-
-	globals.cng_frame.datalen = switch_samples_per_packet(globals.sample_rate, globals.codec_ms) * 2;
-
-	if (!globals.ring_interval) {
-		globals.ring_interval = 5;
-	}
-
-	if (!globals.timer_name) {
-		set_global_timer_name("soft");
-	}
-
-	if (globals.indev < 0) {
-		globals.indev = get_dev_by_name(NULL, 1);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "global indev [%d]\n", globals.indev);
-		if (globals.indev > -1) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Switching to default input device\n");
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find an input device\n");
-			if (globals.unload_device_fail) {
-				status = SWITCH_STATUS_GENERR;
-			}
-		}
-	}
-
-	if (globals.outdev < 0) {
-		globals.outdev = get_dev_by_name(NULL, 0);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "global outdev [%d]\n", globals.outdev);
-		if (globals.outdev > -1) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Switching to default output device\n");
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find an output device\n");
-			if (globals.unload_device_fail) {
-				status = SWITCH_STATUS_GENERR;
-			}
-		}
-	}
-
-	if (globals.ringdev < 0) {
-		if (globals.outdev > -1) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid or no ring device configured, using output device as ring device\n");
-			globals.ringdev = globals.outdev;
-		}
-	}
-
-	/* streams and endpoints must be last, some initialization depend on globals defaults */
-	if ((streams = switch_xml_child(cfg, "streams"))) {
-		load_streams(streams);
-	}
-
-	if ((endpoints = switch_xml_child(cfg, "endpoints"))) {
-		load_endpoints(endpoints);
-	}
-
-
-	switch_xml_free(xml);
-
-	return status;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_portaudio_shutdown)
-{
-
-	destroy_audio_streams();
-	destroy_codecs();
-
-	Pa_Terminate();
-	switch_core_hash_destroy(&globals.call_hash);
-	switch_core_hash_destroy(&globals.sh_streams);
-	switch_core_hash_destroy(&globals.endpoints);
-
-	switch_event_free_subclass(MY_EVENT_RINGING);
-	switch_event_free_subclass(MY_EVENT_MAKE_CALL);
-	switch_event_free_subclass(MY_EVENT_ERROR_AUDIO_DEV);
-	switch_event_free_subclass(MY_EVENT_CALL_HELD);
-	switch_event_free_subclass(MY_EVENT_CALL_RESUMED);
-
-
-	switch_safe_free(globals.dialplan);
-	switch_safe_free(globals.context);
-	switch_safe_free(globals.cid_name);
-	switch_safe_free(globals.cid_num);
-	switch_safe_free(globals.ring_file);
-	switch_safe_free(globals.hold_file);
-	switch_safe_free(globals.timer_name);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static int get_dev_by_number(char *numstr, int in)
-{
-	int numDevices = Pa_GetDeviceCount();
-	const PaDeviceInfo *pdi;
-	char *end_ptr;
-	int number;
-
-	number = (int) strtol(numstr, &end_ptr, 10);
-
-	if (end_ptr == numstr || number < 0) {
-		return -1;
-	}
-
-	if (number > -1 && number < numDevices && (pdi = Pa_GetDeviceInfo(number))) {
-		if (in && pdi->maxInputChannels) {
-			return number;
-		} else if (!in && pdi->maxOutputChannels) {
-			return number;
-		}
-	}
-
-	return -1;
-}
-
-static int get_dev_by_name(char *name, int in)
-{
-	int i;
-	int numDevices;
-	const PaDeviceInfo *pdi;
-	numDevices = Pa_GetDeviceCount();
-
-	if (numDevices < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices);
-		return -2;
-	}
-
-	for (i = 0; i < numDevices; i++) {
-		int match = 0;
-		pdi = Pa_GetDeviceInfo(i);
-
-		if (zstr(name)) {
-			match = 1;
-		} else if (pdi && pdi->name && strstr(pdi->name, name)) {
-			match = 1;
-		}
-
-		if (match) {
-			if (in && pdi->maxInputChannels) {
-				return i;
-			} else if (!in && pdi->maxOutputChannels) {
-				return i;
-			}
-		}
-	}
-
-	return -1;
-}
-
-
-/*******************************************************************/
-static void PrintSupportedStandardSampleRates(const PaStreamParameters * inputParameters, const PaStreamParameters * outputParameters)
-{
-	int i, printCount, cr = 7;
-	PaError err;
-	static double standardSampleRates[] = { 8000.0, 9600.0, 11025.0, 12000.0, 16000.0, 22050.0, 24000.0, 32000.0,
-		44100.0, 48000.0, 88200.0, 96000.0, 192000.0, -1
-	};
-
-	printCount = cr;
-	for (i = 0; standardSampleRates[i] > 0; i++) {
-		err = Pa_IsFormatSupported(inputParameters, outputParameters, standardSampleRates[i]);
-		if (err == paFormatIsSupported) {
-			if (printCount == cr) {
-				printCount = 0;
-				switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "\n\t%0.2f", standardSampleRates[i]);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, ", %0.2f", standardSampleRates[i]);
-			}
-			printCount++;
-		}
-	}
-	if (!printCount) {
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, " None\n");
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "\n");
-	}
-}
-
-/*******************************************************************/
-static switch_status_t play_dev(switch_stream_handle_t *stream, int outdev, char * file, const char * max_seconds, const char * no_close)
-{
-	switch_file_handle_t fh = { 0 };
-	int samples = 0;
-	int seconds = 5;
-	audio_stream_t * audio_stream;
-	int created_stream = 0;
-	int wrote = 0;
-	switch_size_t olen;
-	int16_t abuf[2048];
-
-
-	if (!strcasecmp(file, "ringtest")) {
-		file = globals.ring_file;
-	}
-	if (outdev == -1) {
-		stream->write_function(stream, "Invalid output audio device\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	audio_stream = get_audio_stream(-1, outdev);
-
-	fh.pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN;
-
-	if (switch_core_file_open(&fh,	file,
-		globals.read_codec.implementation->number_of_channels,
-		globals.read_codec.implementation->actual_samples_per_second,
-		SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
-			stream->write_function(stream, "Cannot play requested file %s\n", file);
-			return SWITCH_STATUS_FALSE;
-	}
-
-	olen = globals.read_codec.implementation->samples_per_packet;
-
-	if (max_seconds) {
-		int i = atoi(max_seconds);
-		if (i >= 0) {
-			seconds = i;
-		}
-	}
-
-	if (globals.call_list) {
-		switch_mutex_lock(globals.pvt_lock);
-		if (!globals.main_stream) {
-			switch_mutex_unlock(globals.pvt_lock);
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if ( switch_test_flag(globals.call_list, TFLAG_MASTER) && globals.main_stream->outdev == outdev) { /*so we are the active stream so we need to dupe it basically */
-			audio_stream = create_audio_stream(-1,outdev);
-			created_stream=1;
-		}
-		switch_mutex_unlock(globals.pvt_lock);
-	}
-
-	if (! audio_stream) {
-		stream->write_function(stream, "Failed to engage audio device\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-
-
-	samples = globals.read_codec.implementation->actual_samples_per_second * seconds;
-	globals.stream_in_use=1;
-	while (switch_core_file_read(&fh, abuf, &olen) == SWITCH_STATUS_SUCCESS) {
-		if (globals.destroying_streams ||  ! audio_stream->stream) {
-			break;
-		}
-
-		WriteAudioStream(audio_stream->stream, abuf, (long) olen, 0, &(audio_stream->write_timer));
-		wrote += (int) olen;
-		if (samples) {
-			samples -= (int) olen;
-			if (samples <= 0) {
-				break;
-			}
-		}
-		olen = globals.read_codec.implementation->samples_per_packet;
-	}
-	globals.stream_in_use = 0;
-
-	switch_core_file_close(&fh);
-	if (! globals.call_list && ( ! no_close || strcasecmp(no_close,  "no_close"))) {
-		destroy_audio_streams();
-	}
-
-	seconds = wrote / globals.read_codec.implementation->actual_samples_per_second;
-	stream->write_function(stream, "playback test [%s] %d second(s) %d samples @%dkhz",
-		file, seconds, wrote, globals.read_codec.implementation->actual_samples_per_second);
-	if (created_stream) { /*still need this as not added to the global pool */
-		destroy_actual_stream(audio_stream);
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-static switch_status_t devlist(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	int i, numDevices, prev;
-	const PaDeviceInfo *deviceInfo;
-	const PaHostApiInfo *hostApiInfo;
-
-	numDevices = Pa_GetDeviceCount();
-
-	if (numDevices < 0) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (argv[0] && !strcasecmp(argv[0], "xml")) {
-		stream->write_function(stream, "<xml>\n\t<devices>\n");
-
-		for (i = 0; i < numDevices; i++) {
-			deviceInfo = Pa_GetDeviceInfo(i);
-			hostApiInfo = Pa_GetHostApiInfo(deviceInfo->hostApi);
-			stream->write_function(stream, "\t\t<device id=\"%d\" name=\"%s\" hostapi=\"%s\" inputs=\"%d\" outputs=\"%d\" />\n", i, deviceInfo->name,
-								   hostApiInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
-		}
-
-		stream->write_function(stream, "\t</devices>\n\t<bindings>\n"
-							   "\t\t<ring device=\"%d\" />\n"
-							   "\t\t<input device=\"%d\" />\n"
-							   "\t\t<output device=\"%d\" />\n" "\t</bindings>\n</xml>\n", globals.ringdev, globals.indev, globals.outdev);
-	} else {
-
-		for (i = 0; i < numDevices; i++) {
-			deviceInfo = Pa_GetDeviceInfo(i);
-			hostApiInfo = Pa_GetHostApiInfo(deviceInfo->hostApi);
-
-			stream->write_function(stream, "%d;%s(%s);%d;%d;", i, deviceInfo->name, hostApiInfo->name, deviceInfo->maxInputChannels,
-								   deviceInfo->maxOutputChannels);
-
-			prev = 0;
-			if (globals.ringdev == i) {
-				stream->write_function(stream, "r");
-				prev = 1;
-			}
-
-			if (globals.indev == i) {
-				if (prev) {
-					stream->write_function(stream, ",");
-				}
-				stream->write_function(stream, "i");
-				prev = 1;
-			}
-
-			if (globals.outdev == i) {
-				if (prev) {
-					stream->write_function(stream, ",");
-				}
-				stream->write_function(stream, "o");
-			}
-
-			stream->write_function(stream, "\n");
-
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static int dump_info(int verbose)
-{
-	int i, numDevices, defaultDisplayed;
-	const PaDeviceInfo *deviceInfo;
-	PaStreamParameters inputParameters, outputParameters;
-	PaError err;
-	const char *line = "--------------------------------------------------------------------------------\n";
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
-					  "PortAudio version number = %d\nPortAudio version text = '%s'\n", Pa_GetVersion(), Pa_GetVersionText());
-	if (globals.call_list) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-		return 0;
-	}
-
-	if (verbose < 0) {
-		destroy_audio_streams();
-		destroy_codecs();
-		Pa_Terminate();
-		Pa_Initialize();
-		load_config();
-		verbose = 0;
-	}
-
-	numDevices = Pa_GetDeviceCount();
-	if (numDevices < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices);
-		err = numDevices;
-		goto error;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Number of devices = %d\n", numDevices);
-
-	if (!verbose) {
-		return 0;
-	}
-
-	for (i = 0; i < numDevices; i++) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s", line);
-		deviceInfo = Pa_GetDeviceInfo(i);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Device #%d ", i);
-
-		/* Mark global and API specific default devices */
-		defaultDisplayed = 0;
-		if (i == Pa_GetDefaultInputDevice()) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "**Default Input");
-			defaultDisplayed = 1;
-
-		} else if (i == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultInputDevice) {
-
-			const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo(deviceInfo->hostApi);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "**Default %s Input", hostInfo->name);
-			defaultDisplayed = 1;
-		}
-
-		if (i == Pa_GetDefaultOutputDevice()) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "**Default Output");
-			defaultDisplayed = 1;
-
-		} else if (i == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultOutputDevice) {
-
-			const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo(deviceInfo->hostApi);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "**Default %s Output", hostInfo->name);
-			defaultDisplayed = 1;
-		}
-
-		if (defaultDisplayed) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "** | ");
-		}
-		/* print device info fields */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Name: %s\n", deviceInfo->name);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Host: %s | ", Pa_GetHostApiInfo(deviceInfo->hostApi)->name);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "inputs: %d | ", deviceInfo->maxInputChannels);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "outputs: %d | ", deviceInfo->maxOutputChannels);
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Default rate: %8.2f\n", deviceInfo->defaultSampleRate);
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Default input latency: %.3f | ", deviceInfo->defaultLowInputLatency);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Default output latency: %.3f\n", deviceInfo->defaultLowOutputLatency);
-
-		/* poll for standard sample rates */
-		inputParameters.device = i;
-		inputParameters.channelCount = deviceInfo->maxInputChannels;
-		inputParameters.sampleFormat = paInt16;
-		inputParameters.suggestedLatency = deviceInfo->defaultLowInputLatency;	/* ignored by Pa_IsFormatSupported() */
-		inputParameters.hostApiSpecificStreamInfo = NULL;
-
-		outputParameters.device = i;
-		outputParameters.channelCount = deviceInfo->maxOutputChannels;
-		outputParameters.sampleFormat = paInt16;
-		outputParameters.suggestedLatency = deviceInfo->defaultLowOutputLatency;	/* ignored by Pa_IsFormatSupported() */
-		outputParameters.hostApiSpecificStreamInfo = NULL;
-
-		if (inputParameters.channelCount > 0) {
-
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "half-duplex 16 bit %d channel input rates:", inputParameters.channelCount);
-			PrintSupportedStandardSampleRates(&inputParameters, NULL);
-		}
-
-		if (outputParameters.channelCount > 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "half-duplex 16 bit %d channel output rates:", outputParameters.channelCount);
-			PrintSupportedStandardSampleRates(NULL, &outputParameters);
-		}
-
-		if (inputParameters.channelCount > 0 && outputParameters.channelCount > 0) {
-
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
-							  "full-duplex 16 bit %d channel input, %d channel output rates:", inputParameters.channelCount,
-							  outputParameters.channelCount);
-			PrintSupportedStandardSampleRates(&inputParameters, &outputParameters);
-		}
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s", line);
-
-	return 0;
-
-  error:
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "An error occurred while using the portaudio stream\n");
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Error number: %d\n", err);
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Error message: %s\n", Pa_GetErrorText(err));
-	return err;
-}
-
-static switch_status_t create_codecs(int restart)
-{
-	int sample_rate = globals.sample_rate;
-	int codec_ms = globals.codec_ms;
-
-	if (restart) {
-		destroy_codecs();
-	}
-	if (globals.codecs_inited) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (!switch_core_codec_ready(&globals.read_codec)) {
-		if (switch_core_codec_init(&globals.read_codec,
-								   "L16",
-								   NULL,
-								   NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
-								   NULL) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-	switch_assert(globals.read_codec.implementation);
-
-	if (!switch_core_codec_ready(&globals.write_codec)) {
-		if (switch_core_codec_init(&globals.write_codec,
-								   "L16",
-								   NULL,
-								   NULL,
-								   sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-			switch_core_codec_destroy(&globals.read_codec);
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-	if (!globals.read_timer.timer_interface) {
-		if (switch_core_timer_init(&globals.read_timer,
-								   globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet,
-								   module_pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
-			switch_core_codec_destroy(&globals.read_codec);
-			switch_core_codec_destroy(&globals.write_codec);
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-	if (!globals.readfile_timer.timer_interface) {
-		if (switch_core_timer_init(&globals.readfile_timer,
-								   globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet,
-								   module_pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
-			switch_core_codec_destroy(&globals.read_codec);
-			switch_core_codec_destroy(&globals.write_codec);
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-
-	if (!globals.hold_timer.timer_interface) {
-		if (switch_core_timer_init(&globals.hold_timer,
-								   globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet,
-								   module_pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup hold timer failed!\n");
-			switch_core_codec_destroy(&globals.read_codec);
-			switch_core_codec_destroy(&globals.write_codec);
-			switch_core_timer_destroy(&globals.read_timer);
-			switch_core_timer_destroy(&globals.readfile_timer);
-
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-	globals.cng_frame.rate = globals.read_frame.rate = sample_rate;
-	globals.cng_frame.codec = globals.read_frame.codec = &globals.read_codec;
-
-	globals.codecs_inited=1;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_audio_stream()
-{
-	audio_stream_t *stream;
-	if (! globals.call_list) { /* If no active calls then it will automatically switch over on next call */
-		return SWITCH_STATUS_SUCCESS;
-	}
-	stream = get_audio_stream(globals.indev, globals.outdev);
-	if (stream == NULL) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	globals.main_stream = stream;//TODO: need locks around here??
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-PaError open_audio_stream(PABLIO_Stream **stream, const PaStreamParameters * inputParameters, const PaStreamParameters * outputParameters)
-{
-	if (inputParameters->device != -1) {
-		return OpenAudioStream(stream, inputParameters, outputParameters, globals.sample_rate, paClipOff, globals.read_codec.implementation->samples_per_packet, globals.dual_streams);
-	}
-	return OpenAudioStream(stream, NULL, outputParameters, globals.sample_rate, paClipOff, globals.read_codec.implementation->samples_per_packet, 0);
-}
-
-PaError open_shared_audio_stream(shared_audio_stream_t *shstream, const PaStreamParameters * inputParameters, const PaStreamParameters * outputParameters)
-{
-	PaError err;
-	if (inputParameters->device != -1) {
-		err = OpenAudioStream(&shstream->stream, inputParameters->device != -1 ? inputParameters : NULL,
-							outputParameters->device != -1 ? outputParameters : NULL, shstream->sample_rate,
-				paClipOff, STREAM_SAMPLES_PER_PACKET(shstream), globals.dual_streams);
-	} else {
-		err = OpenAudioStream(&shstream->stream, NULL, outputParameters, shstream->sample_rate,
-				paClipOff, STREAM_SAMPLES_PER_PACKET(shstream), 0);
-	}
-	if (err != paNoError) {
-		shstream->stream = NULL;
-	}
-	return err;
-}
-
-static int create_shared_audio_stream(shared_audio_stream_t *shstream)
-{
-	PaStreamParameters inputParameters, outputParameters;
-	PaError err;
-	switch_event_t *event;
-
-	inputParameters.device = shstream->indev;
-	if (shstream->indev != -1) {
-		inputParameters.channelCount = shstream->channels;
-		inputParameters.sampleFormat = SAMPLE_TYPE;
-		inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency;
-		inputParameters.hostApiSpecificStreamInfo = NULL;
-	}
-	outputParameters.device = shstream->outdev;
-	if (shstream->outdev != -1) {
-		outputParameters.channelCount = shstream->channels;
-		outputParameters.sampleFormat = SAMPLE_TYPE;
-		outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
-		outputParameters.hostApiSpecificStreamInfo = NULL;
-	}
-
-	err = open_shared_audio_stream(shstream, &inputParameters, &outputParameters);
-	if (err != paNoError) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-						"Error opening audio device retrying (indev = %d, outdev = %d, error = %s)\n",
-						inputParameters.device, outputParameters.device, Pa_GetErrorText(err));
-		switch_yield(1000000);
-		err = open_shared_audio_stream(shstream, &inputParameters, &outputParameters);
-	}
-
-	if (err != paNoError) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device (indev = %d, outdev = %d, error = %s)\n",
-				inputParameters.device, outputParameters.device, Pa_GetErrorText(err));
-		if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_ERROR_AUDIO_DEV) == SWITCH_STATUS_SUCCESS) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Reason", Pa_GetErrorText(err));
-			switch_event_fire(&event);
-		}
-		return -1;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created shared audio stream %s: %d channels %d\n",
-			shstream->name, shstream->sample_rate, shstream->channels);
-	return 0;
-}
-
-static int destroy_shared_audio_stream(shared_audio_stream_t *shstream)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroying shared audio stream %s\n", shstream->name);
-	CloseAudioStream(shstream->stream);
-	shstream->stream = NULL;
-	return 0;
-}
-
-static audio_stream_t *create_audio_stream(int indev, int outdev)
-{
-	PaStreamParameters inputParameters, outputParameters;
-	PaError err;
-	switch_event_t *event;
-	audio_stream_t *stream;
-
-	stream = malloc(sizeof(*stream));
-	if (stream == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to alloc memory\n");
-		return NULL;
-	}
-	memset(stream, 0, sizeof(*stream));
-	stream->next = NULL;
-	stream->stream = NULL;
-	stream->indev = indev;
-	stream->outdev = outdev;
-	if (!stream->write_timer.timer_interface) {
-		if (switch_core_timer_init(&(stream->write_timer),
-								   globals.timer_name, globals.codec_ms, globals.read_codec.implementation->samples_per_packet,
-								   module_pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
-			switch_safe_free(stream);
-			return NULL;
-		}
-	}
-
-	inputParameters.device = indev;
-	if (indev != -1) {
-		inputParameters.channelCount = 1;
-		inputParameters.sampleFormat = SAMPLE_TYPE;
-		inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency;
-		inputParameters.hostApiSpecificStreamInfo = NULL;
-	}
-	outputParameters.device = outdev;
-
-	if (outdev != -1) {
-		outputParameters.channelCount = 1;
-		outputParameters.sampleFormat = SAMPLE_TYPE;
-		outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
-		outputParameters.hostApiSpecificStreamInfo = NULL;
-	}
-
-	err = open_audio_stream(&(stream->stream), &inputParameters, &outputParameters);
-	if (err != paNoError) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening audio device retrying\n");
-		switch_yield(1000000);
-		err = open_audio_stream(&(stream->stream), &inputParameters, &outputParameters);
-	}
-
-	if (err != paNoError) {
-		switch_safe_free(stream);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device\n");
-		if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_ERROR_AUDIO_DEV) == SWITCH_STATUS_SUCCESS) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Reason", Pa_GetErrorText(err));
-			switch_event_fire(&event);
-		}
-		return NULL;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created audio stream: %d channels %d\n", globals.sample_rate, outputParameters.channelCount);
-	return stream;
-}
-
-audio_stream_t *get_audio_stream(int indev, int outdev)
-{
-	audio_stream_t *stream = NULL;
-	if (outdev == -1) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid output audio device\n");
-		return NULL;
-	}
-	if (create_codecs(0) != SWITCH_STATUS_SUCCESS) {
-		return NULL;
-	}
-
-	stream = find_audio_stream(indev, outdev, 0);
-	if (stream != NULL) {
-		return stream;
-	}
-	stream = create_audio_stream(indev, outdev);
-	if (stream) {
-		add_stream(stream, 0);
-	}
-	return stream;
-}
-
-static switch_status_t dtmf_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	char *dtmf_str = argv[0];
-	switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0) };
-
-	if (zstr(dtmf_str)) {
-		stream->write_function(stream, "No DTMF Supplied!\n");
-	} else {
-		switch_mutex_lock(globals.pvt_lock);
-		if (globals.call_list) {
-			switch_channel_t *channel = switch_core_session_get_channel(globals.call_list->session);
-			char *p = dtmf_str;
-			while (p && *p) {
-				dtmf.digit = *p;
-				switch_channel_queue_dtmf(channel, &dtmf);
-				p++;
-			}
-		}
-		switch_mutex_unlock(globals.pvt_lock);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t list_shared_streams(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	switch_hash_index_t *hi;
-	int cnt = 0;
-	for (hi = switch_core_hash_first(globals.sh_streams); hi; hi = switch_core_hash_next(&hi)) {
-		const void *var;
-		void *val;
-		shared_audio_stream_t *s = NULL;
-		switch_core_hash_this(hi, &var, NULL, &val);
-		s = val;
-		stream->write_function(stream, "%s> indev: %d, outdev: %d, sample-rate: %d, codec-ms: %d, channels: %d\n",
-				s->name, s->indev, s->outdev, s->sample_rate, s->codec_ms, s->channels);
-		cnt++;
-	}
-	stream->write_function(stream, "Total streams: %d\n", cnt);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t list_endpoints(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	switch_hash_index_t *hi;
-	int cnt = 0;
-	for (hi = switch_core_hash_first(globals.endpoints); hi; hi = switch_core_hash_next(&hi)) {
-		const void *var;
-		void *val;
-		audio_endpoint_t *e = NULL;
-		switch_core_hash_this(hi, &var, NULL, &val);
-		e = val;
-		stream->write_function(stream, "%s> instream: %s, outstream: %s\n",
-				e->name, e->in_stream ? e->in_stream->name : "(none)",
-				e->out_stream ? e->out_stream->name : "(none)");
-		cnt++;
-	}
-	stream->write_function(stream, "Total endpoints: %d\n", cnt);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t close_streams(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	if (globals.call_list) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	destroy_audio_streams();
-	stream->write_function(stream, "closestreams all open streams closed\n");
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t set_indev(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	int devval;
-
-	if (globals.call_list && ! globals.live_stream_switch) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	if (*argv[0] == '#') {
-		devval = get_dev_by_number(argv[0] + 1, 1);
-	} else {
-		devval = get_dev_by_name(argv[0], 1);
-	}
-	if (devval < 0) {
-		stream->write_function(stream, "indev not set (invalid value)\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	globals.indev = devval;
-	switch_audio_stream();
-	stream->write_function(stream, "indev set to %d\n", devval);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t set_outdev(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	int devval;
-	if (globals.call_list && ! globals.live_stream_switch) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	if (*argv[0] == '#') {
-		devval = get_dev_by_number(argv[0] + 1, 0);
-	} else {
-		devval = get_dev_by_name(argv[0], 0);
-	}
-	if (devval < 0) {
-		stream->write_function(stream, "outdev not set (invalid value)\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	globals.outdev = devval;
-	switch_audio_stream();
-	stream->write_function(stream, "outdev set to %d\n", devval);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t prepare_stream(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	int devval=-2,devval2=-1;
-	if (! strcmp(argv[0], "#-1")) {
-		devval = -1;
-	} else if (*argv[0] == '#') {
-		devval = get_dev_by_number(argv[0]+1, 1);
-	}
-	if (devval == -2) {
-		stream->write_function(stream, "preparestream not prepared as indev has (invalid value)\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	if (*argv[1] == '#') {
-		devval2 = get_dev_by_number(argv[1]+1, 0);
-	}
-	if (devval2 == -1) {
-		stream->write_function(stream, "preparestream not prepared as outdev has (invalid value)\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (! get_audio_stream(devval,devval2)) {
-		stream->write_function(stream, "preparestream not prepared received an invalid stream back\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	stream->write_function(stream, "preparestream prepared indev: %d outdev: %d\n", devval, devval2);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_stream(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	int devval =-1, devval2 = -1;
-	if (globals.call_list && ! globals.live_stream_switch) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	if (*argv[0] == '#') {
-		devval = get_dev_by_number(argv[0]+1, 1);
-	}
-	if (devval == -1) {
-		stream->write_function(stream, "switchstream not prepared as indev has (invalid value)\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	if (*argv[1] == '#') {
-		devval2 = get_dev_by_number(argv[1]+1, 0);
-	}
-	if (devval2 == -1) {
-		stream->write_function(stream, "switchstream not prepared as outdev has (invalid value)\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	globals.indev = devval;
-	globals.outdev = devval2;
-	if (switch_audio_stream() != SWITCH_STATUS_SUCCESS) {
-		stream->write_function(stream, "switchstream was unable to switch\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	stream->write_function(stream, "switchstream switched to indev: %d outdev: %d\n", devval, devval2);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t set_ringdev(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	int devval;
-	if (globals.call_list && ! globals.live_stream_switch) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	if (! strcmp(argv[0], "#-1")) {
-		globals.ring_stream = NULL;
-		globals.ringdev = -1;
-		stream->write_function(stream, "ringdev set to %d\n", globals.ringdev);
-		return SWITCH_STATUS_SUCCESS;
-	} else if (*argv[0] == '#') {
-		devval = get_dev_by_number(argv[0] + 1, 0);
-	} else {
-		devval = get_dev_by_name(argv[0], 0);
-	}
-	if (devval == -1) {
-		stream->write_function(stream, "ringdev not set as dev has (invalid value)\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	globals.ringdev = devval;
-	stream->write_function(stream, "ringdev set to %d\n", globals.ringdev);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t looptest(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	int samples = 0;
-	int success = 0;
-	int i;
-
-	if (globals.call_list) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	if (validate_main_audio_stream() != SWITCH_STATUS_SUCCESS) {
-		stream->write_function(stream, "looptest Failed to engage audio device\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	globals.stream_in_use = 1;
-	for (i = 0; i < 400; i++) {
-		if (globals.destroying_streams ||  ! globals.main_stream->stream) {
-			break;
-		}
-		if ((samples = ReadAudioStream(globals.main_stream->stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_packet, 0, &globals.read_timer))) {
-			WriteAudioStream(globals.main_stream->stream, globals.read_frame.data, (long) samples, 0, &(globals.main_stream->write_timer));
-			success = 1;
-		}
-		switch_yield(10000);
-	}
-	globals.stream_in_use = 0;
-
-	if (!success) {
-		stream->write_function(stream, "Failed to read any bytes from indev\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	destroy_audio_streams();
-	stream->write_function(stream, "looptest complete\n");
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t set_ringfile(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	if (! argv[0]) {
-		stream->write_function(stream, "%s", globals.ring_file);
-		return SWITCH_STATUS_SUCCESS;
-	}
-	if (create_codecs(0) == SWITCH_STATUS_SUCCESS) {
-		switch_file_handle_t fh = { 0 };
-		if (switch_core_file_open(&fh,
-								  argv[0],
-								  globals.read_codec.implementation->number_of_channels,
-								  globals.read_codec.implementation->actual_samples_per_second,
-								  SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) == SWITCH_STATUS_SUCCESS) {
-			switch_core_file_close(&fh);
-			set_global_ring_file(argv[0]);
-		} else {
-			stream->write_function(stream, "ringfile Unable to open ring file %s\n", argv[0]);
-			return SWITCH_STATUS_FALSE;
-		}
-	} else {
-		stream->write_function(stream, "ringfile Failed to init codecs device\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	stream->write_function(stream, "ringfile set to %s", globals.ring_file);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	private_t *tp, *tech_pvt = NULL;
-	char *callid = argv[0];
-	uint8_t one_call = 0;
-
-
-	switch_mutex_lock(globals.pvt_lock);
-	if (zstr(callid)) {
-		if (globals.call_list) {
-			if (globals.call_list->next) {
-				tech_pvt = globals.call_list->next;
-			} else {
-				tech_pvt = globals.call_list;
-				one_call = 1;
-			}
-		}
-	} else if (!strcasecmp(callid, "none")) {
-		for (tp = globals.call_list; tp; tp = tp->next) {
-			if (switch_test_flag(tp, TFLAG_MASTER))	{
-			switch_clear_flag_locked(tp, TFLAG_MASTER);
-				create_hold_event(tp,0);
-			}
-		}
-		stream->write_function(stream, "OK\n");
-		goto done;
-	} else {
-		tech_pvt = switch_core_hash_find(globals.call_hash, callid);
-	}
-
-	if (tech_pvt) {
-		if (tech_pvt == globals.call_list && !tech_pvt->next) {
-			one_call = 1;
-		}
-
-		if (!one_call) {
-			remove_pvt(tech_pvt);
-		}
-		add_pvt(tech_pvt, PA_MASTER);
-		create_hold_event(tech_pvt, 1);
-		stream->write_function(stream, "OK\n");
-	} else {
-		stream->write_function(stream, "NO SUCH CALL\n");
-	}
-
-  done:
-	switch_mutex_unlock(globals.pvt_lock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t hangup_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	private_t *tech_pvt;
-	char *callid = argv[0];
-
-	switch_mutex_lock(globals.pvt_lock);
-	if (zstr(callid)) {
-		tech_pvt = globals.call_list;
-	} else {
-		tech_pvt = switch_core_hash_find(globals.call_hash, callid);
-	}
-
-	if (tech_pvt) {
-		switch_channel_hangup(switch_core_session_get_channel(tech_pvt->session), SWITCH_CAUSE_NORMAL_CLEARING);
-		stream->write_function(stream, "OK\n");
-	} else {
-		stream->write_function(stream, "NO SUCH CALL\n");
-	}
-	switch_mutex_unlock(globals.pvt_lock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t answer_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	private_t *tp;
-	int x = 0;
-	char *callid = argv[0];
-
-	switch_mutex_lock(globals.pvt_lock);
-
-	if (!zstr(callid)) {
-		if ((tp = switch_core_hash_find(globals.call_hash, callid))) {
-			if (switch_test_flag(tp, TFLAG_ANSWER)) {
-				stream->write_function(stream, "CALL ALREADY ANSWERED\n");
-			} else {
-				switch_channel_t *channel = switch_core_session_get_channel(tp->session);
-				switch_set_flag_locked(tp, TFLAG_ANSWER);
-				if (tp != globals.call_list) {
-					remove_pvt(tp);
-				}
-				add_pvt(tp, PA_MASTER);
-				switch_channel_mark_answered(channel);
-			}
-		} else {
-			stream->write_function(stream, "NO SUCH CALL\n");
-		}
-
-		goto done;
-	}
-
-	for (tp = globals.call_list; tp; tp = tp->next) {
-		if (!switch_test_flag(tp, TFLAG_ANSWER)) {
-			switch_channel_t *channel = switch_core_session_get_channel(tp->session);
-			switch_set_flag_locked(tp, TFLAG_ANSWER);
-			add_pvt(tp, PA_MASTER);
-			switch_channel_mark_answered(channel);
-			x++;
-			break;
-		}
-	}
-  done:
-	switch_mutex_unlock(globals.pvt_lock);
-	stream->write_function(stream, "Answered %d channels.\n", x);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t do_flags(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	char *action = argv[0];
-	char *flag_str;
-	GFLAGS flags = GFLAG_NONE;
-	char *p;
-	int x = 0;
-
-	if (argc < 2) {
-		goto desc;
-	}
-
-	for (x = 1; x < argc; x++) {
-		flag_str = argv[x];
-		for (p = flag_str; *p; p++) {
-			*p = (char) tolower(*p);
-		}
-
-		if (strstr(flag_str, "ear")) {
-			flags |= GFLAG_EAR;
-		}
-		if (strstr(flag_str, "mouth")) {
-			flags |= GFLAG_MOUTH;
-		}
-	}
-
-	if (!strcasecmp(action, "on")) {
-		if (flags & GFLAG_EAR) {
-			switch_set_flag((&globals), GFLAG_EAR);
-		}
-		if (flags & GFLAG_MOUTH) {
-			switch_set_flag((&globals), GFLAG_MOUTH);
-		}
-	} else if (!strcasecmp(action, "off")) {
-		if (flags & GFLAG_EAR) {
-			switch_clear_flag((&globals), GFLAG_EAR);
-		}
-		if (flags & GFLAG_MOUTH) {
-			switch_clear_flag((&globals), GFLAG_MOUTH);
-		}
-	} else {
-		goto bad;
-	}
-
-  desc:
-	x = 0;
-	stream->write_function(stream, "FLAGS: ");
-	if (switch_test_flag((&globals), GFLAG_EAR)) {
-		stream->write_function(stream, "ear");
-		x++;
-	}
-	if (switch_test_flag((&globals), GFLAG_MOUTH)) {
-		stream->write_function(stream, "%smouth", x ? "|" : "");
-		x++;
-	}
-	if (!x) {
-		stream->write_function(stream, "none");
-	}
-
-	goto done;
-
-  bad:
-	stream->write_function(stream, "Usage: flags [on|off] <flags>\n");
-  done:
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t list_calls(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	private_t *tp;
-	int x = 0;
-	const char *cid_name = "n/a";
-	const char *cid_num = "n/a";
-
-	switch_mutex_lock(globals.pvt_lock);
-	for (tp = globals.call_list; tp; tp = tp->next) {
-		switch_channel_t *channel;
-		switch_caller_profile_t *profile;
-		x++;
-		channel = switch_core_session_get_channel(tp->session);
-
-		if ((profile = switch_channel_get_caller_profile(channel))) {
-			if (profile->originatee_caller_profile) {
-				cid_name = "Outbound Call";
-				cid_num = profile->originatee_caller_profile->destination_number;
-			} else {
-				cid_name = profile->caller_id_name;
-				cid_num = profile->caller_id_number;
-			}
-		}
-
-		stream->write_function(stream, "%s %s [%s (%s)] %s\n", tp->call_id, switch_channel_get_name(channel),
-							   cid_name, cid_num, switch_test_flag(tp, TFLAG_MASTER) ? "active" : "hold");
-	}
-	switch_mutex_unlock(globals.pvt_lock);
-
-	stream->write_function(stream, "\n%d call%s\n", x, x == 1 ? "" : "s");
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t place_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-	switch_core_session_t *session;
-	char *dest = NULL;
-
-	if (zstr(argv[0])) {
-		stream->write_function(stream, "FAIL:Usage: call <dest>\n");
-		return SWITCH_STATUS_SUCCESS;
-	}
-	dest = argv[0];
-
-	if ((session = switch_core_session_request(portaudio_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) != 0) {
-		private_t *tech_pvt;
-		switch_channel_t *channel;
-		char *dialplan = globals.dialplan;
-		char *context = globals.context;
-		char *cid_name = globals.cid_name;
-		char *cid_num = globals.cid_num;
-		char ip[25] = "0.0.0.0";
-
-		switch_core_session_add_stream(session, NULL);
-		if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) {
-			memset(tech_pvt, 0, sizeof(*tech_pvt));
-			switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-			channel = switch_core_session_get_channel(session);
-			switch_core_session_set_private(session, tech_pvt);
-			tech_pvt->session = session;
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
-			switch_core_session_destroy(&session);
-			return SWITCH_STATUS_MEMERR;
-		}
-
-		if (!zstr(argv[1])) {
-			dialplan = argv[1];
-		}
-
-		if (!zstr(argv[2])) {
-			cid_num = argv[2];
-		}
-
-		if (!zstr(argv[3])) {
-			cid_name = argv[3];
-		}
-
-		if (!zstr(argv[4])) {
-			tech_pvt->sample_rate = atoi(argv[4]);
-		}
-
-		if (!zstr(argv[5])) {
-			tech_pvt->codec_ms = atoi(argv[5]);
-		}
-
-		switch_find_local_ip(ip, sizeof(ip), NULL, AF_INET);
-
-		if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
-																  NULL, dialplan, cid_name, cid_num, ip, NULL, NULL, NULL, modname, context, dest)) != 0) {
-			char name[128];
-			switch_snprintf(name, sizeof(name), "portaudio/%s",
-							tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : modname);
-			switch_channel_set_name(channel, name);
-
-			switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
-		}
-		tech_pvt->session = session;
-		if (validate_main_audio_stream() == SWITCH_STATUS_SUCCESS) {
-			switch_set_flag_locked(tech_pvt, TFLAG_ANSWER);
-			switch_channel_mark_answered(channel);
-			switch_channel_set_state(channel, CS_INIT);
-			if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) {
-				switch_event_t *event;
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error spawning thread\n");
-				switch_core_session_destroy(&session);
-				stream->write_function(stream, "FAIL:Thread Error!\n");
-				if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_MAKE_CALL) == SWITCH_STATUS_SUCCESS) {
-					char buf[512];
-					switch_channel_event_set_data(channel, event);
-					switch_snprintf(buf, sizeof(buf), "Thread error!.\n");
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "error", buf);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fail", "true");
-					switch_event_fire(&event);
-				}
-			} else {
-				switch_event_t *event;
-				add_pvt(tech_pvt, PA_MASTER);
-				stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session));
-				if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_MAKE_CALL) == SWITCH_STATUS_SUCCESS) {
-					switch_channel_event_set_data(channel, event);
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fail", "false");
-					switch_event_fire(&event);
-				}
-			}
-		} else {
-			switch_event_t *event;
-			switch_core_session_destroy(&session);
-			stream->write_function(stream, "FAIL:Device Error!\n");
-			if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_MAKE_CALL) == SWITCH_STATUS_SUCCESS) {
-				char buf[512];
-				switch_channel_event_set_data(channel, event);
-				switch_snprintf(buf, sizeof(buf), "Device fail.\n");
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "error", buf);
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fail", "true");
-				switch_event_fire(&event);
-			}
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(pa_cmd)
-{
-	char *argv[1024] = { 0 };
-	int argc = 0;
-	char *mycmd = NULL;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	pa_command_t func = NULL;
-	int devval;
-	int lead = 1;
-	char *wcmd = NULL, *action = NULL;
-	char cmd_buf[1024] = "";
-	char *http = NULL;
-
-	const char *usage_string = "USAGE:\n"
-		"--------------------------------------------------------------------------------\n"
-		"pa help\n"
-		"pa dump\n"
-		"pa rescan\n"
-		"pa call <dest> [<dialplan> <cid_name> <cid_num>]\n"
-		"pa answer [<call_id>]\n"
-		"pa hangup [<call_id>]\n"
-		"pa list\n"
-		"pa switch [<call_id>|none]\n"
-		"pa dtmf <digit string>\n"
-		"pa flags [on|off] [ear] [mouth]\n"
-		"pa devlist [xml]\n"
-		"pa indev #<num>|<partial name>\n"
-		"pa outdev #<num>|<partial name>\n"
-		"pa preparestream #<indev_num> #<outdev_num>\n"
-		"pa switchstream #<indev_num> #<outdev_num>\n"
-		"pa closestreams\n"
-		"pa ringdev #<num>|<partial name>\n"
-		"pa play [ringtest|<filename>] [seconds] [no_close]\n"
-		"pa playdev #<num> [ringtest|<filename>] [seconds] [no_close]\n"
-		"pa ringfile [filename]\n"
-		"pa looptest\n"
-		"pa shstreams\n"
-		"pa endpoints\n"
-		"--------------------------------------------------------------------------------\n";
-
-
-	if (stream->param_event) {
-		http = switch_event_get_header(stream->param_event, "http-host");
-	}
-
-	if (http) {
-		stream->write_function(stream, "Content-type: text/html\n\n");
-
-		wcmd = switch_str_nil(switch_event_get_header(stream->param_event, "wcmd"));
-		action = switch_event_get_header(stream->param_event, "action");
-
-		if (action) {
-			if (strlen(action) == 1) {
-				switch_snprintf(cmd_buf, sizeof(cmd_buf), "dtmf %s", action);
-				cmd = cmd_buf;
-			} else if (!strcmp(action, "mute")) {
-				switch_snprintf(cmd_buf, sizeof(cmd_buf), "flags off mouth");
-				cmd = cmd_buf;
-			} else if (!strcmp(action, "unmute")) {
-				switch_snprintf(cmd_buf, sizeof(cmd_buf), "flags on mouth");
-				cmd = cmd_buf;
-			} else if (!strcmp(action, "switch")) {
-				switch_snprintf(cmd_buf, sizeof(cmd_buf), "switch %s", wcmd);
-				cmd = cmd_buf;
-			} else if (!strcmp(action, "call")) {
-				switch_snprintf(cmd_buf, sizeof(cmd_buf), "call %s", wcmd);
-				cmd = cmd_buf;
-			} else if (!strcmp(action, "hangup") || !strcmp(action, "list") || !strcmp(action, "devlist") || !strcmp(action, "answer")) {
-				cmd = action;
-			}
-		}
-
-		if (zstr(cmd)) {
-			goto done;
-		}
-
-	} else {
-
-		if (zstr(cmd)) {
-			stream->write_function(stream, "%s", usage_string);
-			goto done;
-		}
-	}
-
-	if (!(mycmd = strdup(cmd))) {
-		status = SWITCH_STATUS_MEMERR;
-		goto done;
-	}
-
-	if (!(argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
-		stream->write_function(stream, "%s", usage_string);
-		goto done;
-	}
-
-	if (!argv[0]) {
-		stream->write_function(stream, "Unknown Command\n");
-		goto done;
-	}
-
-	if (!strcasecmp(argv[0], "call")) {
-		func = place_call;
-	} else if (!strcasecmp(argv[0], "help")) {
-		stream->write_function(stream, "%s", usage_string);
-		goto done;
-	} else if (!strcasecmp(argv[0], "devlist")) {
-		func = devlist;
-	} else if (!strcasecmp(argv[0], "rescan")) {
-
-		if (globals.call_list) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-			goto done;
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Looking for new devices.\n");
-		dump_info(-1);
-		goto done;
-	} else if (!strcasecmp(argv[0], "dump")) {
-		dump_info(1);
-		goto done;
-	} else if (!strcasecmp(argv[0], "list")) {
-		func = list_calls;
-	} else if (!strcasecmp(argv[0], "flags")) {
-		func = do_flags;
-	} else if (!strcasecmp(argv[0], "hangup")) {
-		func = hangup_call;
-	} else if (!strcasecmp(argv[0], "answer")) {
-		func = answer_call;
-	} else if (!strcasecmp(argv[0], "switch")) {
-		func = switch_call;
-	} else if (!strcasecmp(argv[0], "dtmf")) {
-		func = dtmf_call;
-	} else if (!strcasecmp(argv[0], "closestreams")) {
-		func = close_streams;
-	} else if (argv[1] && !strcmp(argv[0], "indev")) {
-		func = set_indev;
-	} else if (argv[1] && !strcmp(argv[0], "outdev")) {
-		func = set_outdev;
-	} else if (argv[1] && argv[2] && !strcmp(argv[0], "preparestream")) {
-		func = prepare_stream;
-	} else if (argv[1] && argv[2] && !strcmp(argv[0], "switchstream")) {
-		func = switch_stream;
-	} else if (argv[1] && !strcmp(argv[0], "ringdev")) {
-		func = set_ringdev;
-	} else if ((argv[1] && !strcmp(argv[0], "play"))) {
-		if (validate_main_audio_stream() == SWITCH_STATUS_SUCCESS) {
-			play_dev(stream, globals.main_stream ? globals.main_stream->outdev : -1,argv[1],argv[2], argv[3]);
-		}else{
-			stream->write_function(stream, "Failed to engage audio device\n");
-		}
-		goto done;
-	} else if ((argv[1] && argv[2] && !strcmp(argv[0], "playdev"))) {
-		if (*argv[1] == '#') {
-			devval = get_dev_by_number(argv[1] + 1, 0);
-		} else {
-			devval = -1;
-		}
-		play_dev(stream, devval,argv[2],argv[3],argv[4]);
-		goto done;
-	} else if (!strcasecmp(argv[0], "looptest")) {
-		func = looptest;
-	} else if (!strcasecmp(argv[0], "ringfile")) {
-		func = set_ringfile;
-	} else if (!strcasecmp(argv[0], "shstreams")) {
-		func = list_shared_streams;
-	} else if (!strcasecmp(argv[0], "endpoints")) {
-		func = list_endpoints;
-	} else {
-		stream->write_function(stream, "Unknown Command or not enough args [%s]\n", argv[0]);
-	}
-
-
-	if (func) {
-		if (http) {
-			stream->write_function(stream, "<pre>");
-		}
-
-		switch_mutex_lock(globals.pa_mutex);
-		func(&argv[lead], argc - lead, stream);
-		status = SWITCH_STATUS_SUCCESS; /*if func was defined we want to always return success as the command was found */
-		switch_mutex_unlock(globals.pa_mutex);
-
-		if (http) {
-			stream->write_function(stream, "\n\n</pre>");
-		}
-	}
-
-  done:
-	if (http) {
-		stream->write_function(stream,
-							   "<br><br><table align=center><tr><td><center><form method=post>\n"
-							   "<input type=text name=wcmd size=40><br><br>\n"
-							   "<input name=action type=submit value=\"call\"> "
-							   "<input name=action type=submit value=\"hangup\"> "
-							   "<input name=action type=submit value=\"list\"> "
-							   "<input name=action type=submit value=\"switch\"> "
-							   "<input name=action type=submit value=\"mute\"> "
-							   "<input name=action type=submit value=\"unmute\"> "
-							   "<input name=action type=submit value=\"indev\"> "
-							   "<input name=action type=submit value=\"outdev\"> "
-							   "<input name=action type=submit value=\"devlist\"> <br> "
-							   "<input name=action type=submit value=\"preparestream\"> "
-							   "<input name=action type=submit value=\"switchstream\"> "
-							   "<input name=action type=submit value=\"closestreams\"> "
-							   "<input name=action type=submit value=\"ringdev\"> "
-							   "<input name=action type=submit value=\"play\"> "
-							   "<input name=action type=submit value=\"playdev\"> "
-							   "<input name=action type=submit value=\"answer\"> <br><br>"
-							   "<table border=1>\n"
-							   "<tr><td><input name=action type=submit value=\"1\"></td>"
-							   "<td><input name=action type=submit value=\"2\"></td>"
-							   "<td><input name=action type=submit value=\"3\"></td>\n"
-							   "<td><input name=action type=submit value=\"A\"></td></tr>\n"
-							   "<tr><td><input name=action type=submit value=\"4\"></td>"
-							   "<td><input name=action type=submit value=\"5\"></td>"
-							   "<td><input name=action type=submit value=\"6\"></td>\n"
-							   "<td><input name=action type=submit value=\"B\"></td></tr>\n"
-							   "<tr><td><input name=action type=submit value=\"7\"></td>"
-							   "<td><input name=action type=submit value=\"8\"></td>"
-							   "<td><input name=action type=submit value=\"9\"></td>\n"
-							   "<td><input name=action type=submit value=\"C\"></td></tr>\n"
-							   "<tr><td><input name=action type=submit value=\"*\"></td>"
-							   "<td><input name=action type=submit value=\"0\"></td>"
-							   "<td><input name=action type=submit value=\"#\"></td>\n"
-							   "<td><input name=action type=submit value=\"D\"></td></tr>\n" "</table>" "</form><br></center></td></tr></table>\n");
-	}
-
-	switch_safe_free(mycmd);
-	return status;
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c b/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
deleted file mode 100644
index 00e5f3a982..0000000000
--- a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * $Id: pa_ringbuffer.c 1164 2006-12-21 15:34:50Z bjornroche $
- * Portable Audio I/O Library
- * Ring Buffer utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- * modified for SMP safety on Mac OS X by Bjorn Roche
- * modified for SMP safety on Linux by Leland Lucius
- * also, allowed for const where possible
- * Note that this is safe only for a single-thread reader and a
- * single-thread writer.
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/**
- @file
- @ingroup common_src
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include "pa_ringbuffer.h"
-
-/****************
- * First, we'll define some memory barrier primitives based on the system.
- * right now only OS X, FreeBSD, and Linux are supported. In addition to providing
- * memory barriers, these functions should ensure that data cached in registers
- * is written out to cache where it can be snooped by other CPUs. (ie, the volatile
- * keyword should not be required)
- *
- * the primitives that must be defined are:
- *
- * PaUtil_FullMemoryBarrier()
- * PaUtil_ReadMemoryBarrier()
- * PaUtil_WriteMemoryBarrier()
- *
- ****************/
-#define __VIA_HACK__
-#if defined(__VIA_HACK__)
-#define NO_BARRIER
-#endif
-
-#if defined(NO_BARRIER)
-#   define PaUtil_FullMemoryBarrier()
-#   define PaUtil_ReadMemoryBarrier()
-#   define PaUtil_WriteMemoryBarrier()
-#else
-
-#if defined(__APPLE__)			//|| defined(__FreeBSD__)
-#   include <libkern/OSAtomic.h>
-	/* Here are the memory barrier functions. Mac OS X and FreeBSD only provide
-	   full memory barriers, so the three types of barriers are the same. */
-#   define PaUtil_FullMemoryBarrier()  OSMemoryBarrier()
-#   define PaUtil_ReadMemoryBarrier()  OSMemoryBarrier()
-#   define PaUtil_WriteMemoryBarrier() OSMemoryBarrier()
-#elif defined(__GNUC__)
-
-	/* GCC understands volatile asm and "memory" to mean it
-	 * should not reorder memory read/writes */
-#   if defined( __PPC__ )
-#      define PaUtil_FullMemoryBarrier()  __asm__ volatile("sync":::"memory")
-#      define PaUtil_ReadMemoryBarrier()  __asm__ volatile("sync":::"memory")
-#      define PaUtil_WriteMemoryBarrier() __asm__ volatile("sync":::"memory")
-#   elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) || defined(__x86_64__)
-#      define PaUtil_FullMemoryBarrier()  __asm__ volatile("mfence":::"memory")
-#      define PaUtil_ReadMemoryBarrier()  __asm__ volatile("lfence":::"memory")
-#      define PaUtil_WriteMemoryBarrier() __asm__ volatile("sfence":::"memory")
-#   else
-#      define PaUtil_FullMemoryBarrier()
-#      define PaUtil_ReadMemoryBarrier()
-#      define PaUtil_WriteMemoryBarrier()
-#   endif
-#elif defined(_MSC_VER)
-#   include <intrin.h>
-#   pragma intrinsic(_ReadWriteBarrier)
-#   pragma intrinsic(_ReadBarrier)
-#   pragma intrinsic(_WriteBarrier)
-#   define PaUtil_FullMemoryBarrier()  _ReadWriteBarrier()
-#   define PaUtil_ReadMemoryBarrier()  _ReadBarrier()
-#   define PaUtil_WriteMemoryBarrier() _WriteBarrier()
-#else
-#   define PaUtil_FullMemoryBarrier()
-#   define PaUtil_ReadMemoryBarrier()
-#   define PaUtil_WriteMemoryBarrier()
-#endif
-#endif
-/***************************************************************************
- * Initialize FIFO.
- * numBytes must be power of 2, returns -1 if not.
- */
-long PaUtil_InitializeRingBuffer(PaUtilRingBuffer * rbuf, long numBytes, void *dataPtr)
-{
-	if (((numBytes - 1) & numBytes) != 0)
-		return -1;				/* Not Power of two. */
-	rbuf->bufferSize = numBytes;
-	rbuf->buffer = (char *) dataPtr;
-	PaUtil_FlushRingBuffer(rbuf);
-	rbuf->bigMask = (numBytes * 2) - 1;
-	rbuf->smallMask = (numBytes) - 1;
-	return 0;
-}
-
-/***************************************************************************
-** Return number of bytes available for reading. */
-long PaUtil_GetRingBufferReadAvailable(PaUtilRingBuffer * rbuf)
-{
-	PaUtil_ReadMemoryBarrier();
-	return ((rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask);
-}
-
-/***************************************************************************
-** Return number of bytes available for writing. */
-long PaUtil_GetRingBufferWriteAvailable(PaUtilRingBuffer * rbuf)
-{
-	/* Since we are calling PaUtil_GetRingBufferReadAvailable, we don't need an aditional MB */
-	return (rbuf->bufferSize - PaUtil_GetRingBufferReadAvailable(rbuf));
-}
-
-/***************************************************************************
-** Clear buffer. Should only be called when buffer is NOT being read. */
-void PaUtil_FlushRingBuffer(PaUtilRingBuffer * rbuf)
-{
-	rbuf->writeIndex = rbuf->readIndex = 0;
-}
-
-/***************************************************************************
-** Get address of region(s) to which we can write data.
-** If the region is contiguous, size2 will be zero.
-** If non-contiguous, size2 will be the size of second region.
-** Returns room available to be written or numBytes, whichever is smaller.
-*/
-long PaUtil_GetRingBufferWriteRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2)
-{
-	long index;
-	long available = PaUtil_GetRingBufferWriteAvailable(rbuf);
-	if (numBytes > available)
-		numBytes = available;
-	/* Check to see if write is not contiguous. */
-	index = rbuf->writeIndex & rbuf->smallMask;
-	if ((index + numBytes) > rbuf->bufferSize) {
-		/* Write data in two blocks that wrap the buffer. */
-		long firstHalf = rbuf->bufferSize - index;
-		*dataPtr1 = &rbuf->buffer[index];
-		*sizePtr1 = firstHalf;
-		*dataPtr2 = &rbuf->buffer[0];
-		*sizePtr2 = numBytes - firstHalf;
-	} else {
-		*dataPtr1 = &rbuf->buffer[index];
-		*sizePtr1 = numBytes;
-		*dataPtr2 = NULL;
-		*sizePtr2 = 0;
-	}
-	return numBytes;
-}
-
-
-/***************************************************************************
-*/
-long PaUtil_AdvanceRingBufferWriteIndex(PaUtilRingBuffer * rbuf, long numBytes)
-{
-	/* we need to ensure that previous writes are seen before we update the write index */
-	PaUtil_WriteMemoryBarrier();
-	return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask;
-}
-
-/***************************************************************************
-** Get address of region(s) from which we can read data.
-** If the region is contiguous, size2 will be zero.
-** If non-contiguous, size2 will be the size of second region.
-** Returns room available to be written or numBytes, whichever is smaller.
-*/
-long PaUtil_GetRingBufferReadRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2)
-{
-	long index;
-	long available = PaUtil_GetRingBufferReadAvailable(rbuf);
-	if (numBytes > available)
-		numBytes = available;
-	/* Check to see if read is not contiguous. */
-	index = rbuf->readIndex & rbuf->smallMask;
-	if ((index + numBytes) > rbuf->bufferSize) {
-		/* Write data in two blocks that wrap the buffer. */
-		long firstHalf = rbuf->bufferSize - index;
-		*dataPtr1 = &rbuf->buffer[index];
-		*sizePtr1 = firstHalf;
-		*dataPtr2 = &rbuf->buffer[0];
-		*sizePtr2 = numBytes - firstHalf;
-	} else {
-		*dataPtr1 = &rbuf->buffer[index];
-		*sizePtr1 = numBytes;
-		*dataPtr2 = NULL;
-		*sizePtr2 = 0;
-	}
-	return numBytes;
-}
-
-/***************************************************************************
-*/
-long PaUtil_AdvanceRingBufferReadIndex(PaUtilRingBuffer * rbuf, long numBytes)
-{
-	/* we need to ensure that previous writes are always seen before updating the index. */
-	PaUtil_WriteMemoryBarrier();
-	return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask;
-}
-
-/***************************************************************************
-** Return bytes written. */
-long PaUtil_WriteRingBuffer(PaUtilRingBuffer * rbuf, const void *data, long numBytes)
-{
-	long size1, size2, numWritten;
-	void *data1, *data2;
-	numWritten = PaUtil_GetRingBufferWriteRegions(rbuf, numBytes, &data1, &size1, &data2, &size2);
-	if (size2 > 0) {
-
-		memcpy(data1, data, size1);
-		data = ((char *) data) + size1;
-		memcpy(data2, data, size2);
-	} else {
-		memcpy(data1, data, size1);
-	}
-	PaUtil_AdvanceRingBufferWriteIndex(rbuf, numWritten);
-	return numWritten;
-}
-
-/***************************************************************************
-** Return bytes read. */
-long PaUtil_ReadRingBuffer(PaUtilRingBuffer * rbuf, void *data, long numBytes)
-{
-	long size1, size2, numRead;
-	void *data1, *data2;
-	numRead = PaUtil_GetRingBufferReadRegions(rbuf, numBytes, &data1, &size1, &data2, &size2);
-	if (size2 > 0) {
-		memcpy(data, data1, size1);
-		data = ((char *) data) + size1;
-		memcpy(data, data2, size2);
-	} else {
-		memcpy(data, data1, size1);
-	}
-	PaUtil_AdvanceRingBufferReadIndex(rbuf, numRead);
-	return numRead;
-}
diff --git a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h b/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h
deleted file mode 100644
index 05e0602529..0000000000
--- a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h
+++ /dev/null
@@ -1,192 +0,0 @@
-#ifndef PA_RINGBUFFER_H
-#define PA_RINGBUFFER_H
-/*
- * $Id: pa_ringbuffer.h 1151 2006-11-29 02:11:16Z leland_lucius $
- * Portable Audio I/O Library
- * Ring Buffer utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- * modified for SMP safety on OS X by Bjorn Roche.
- * also allowed for const where possible.
- * Note that this is safe only for a single-thread reader
- * and a single-thread writer.
- *
- * This program is distributed with the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/** @file
- @ingroup common_src
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif							/* __cplusplus */
-
-	typedef struct PaUtilRingBuffer {
-		long bufferSize;		/* Number of bytes in FIFO. Power of 2. Set by PaUtil_InitRingBuffer. */
-		long writeIndex;		/* Index of next writable byte. Set by PaUtil_AdvanceRingBufferWriteIndex. */
-		long readIndex;			/* Index of next readable byte. Set by PaUtil_AdvanceRingBufferReadIndex. */
-		long bigMask;			/* Used for wrapping indices with extra bit to distinguish full/empty. */
-		long smallMask;			/* Used for fitting indices to buffer. */
-		char *buffer;
-	} PaUtilRingBuffer;
-
-/** Initialize Ring Buffer.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes in the buffer and must be power of 2.
-
- @param dataPtr A pointer to a previously allocated area where the data
- will be maintained.  It must be numBytes long.
-
- @return -1 if numBytes is not a power of 2, otherwise 0.
-*/
-	long PaUtil_InitializeRingBuffer(PaUtilRingBuffer * rbuf, long numBytes, void *dataPtr);
-
-/** Clear buffer. Should only be called when buffer is NOT being read.
-
- @param rbuf The ring buffer.
-*/
-	void PaUtil_FlushRingBuffer(PaUtilRingBuffer * rbuf);
-
-/** Retrieve the number of bytes available in the ring buffer for writing.
-
- @param rbuf The ring buffer.
-
- @return The number of bytes available for writing.
-*/
-	long PaUtil_GetRingBufferWriteAvailable(PaUtilRingBuffer * rbuf);
-
-/** Retrieve the number of bytes available in the ring buffer for reading.
-
- @param rbuf The ring buffer.
-
- @return The number of bytes available for reading.
-*/
-	long PaUtil_GetRingBufferReadAvailable(PaUtilRingBuffer * rbuf);
-
-/** Write data to the ring buffer.
-
- @param rbuf The ring buffer.
-
- @param data The address of new data to write to the buffer.
-
- @param numBytes The number of bytes to be written.
-
- @return The number of bytes written.
-*/
-	long PaUtil_WriteRingBuffer(PaUtilRingBuffer * rbuf, const void *data, long numBytes);
-
-/** Read data from the ring buffer.
-
- @param rbuf The ring buffer.
-
- @param data The address where the data should be stored.
-
- @param numBytes The number of bytes to be read.
-
- @return The number of bytes read.
-*/
-	long PaUtil_ReadRingBuffer(PaUtilRingBuffer * rbuf, void *data, long numBytes);
-
-/** Get address of region(s) to which we can write data.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes desired.
-
- @param dataPtr1 The address where the first (or only) region pointer will be
- stored.
-
- @param sizePtr1 The address where the first (or only) region length will be
- stored.
-
- @param dataPtr2 The address where the second region pointer will be stored if
- the first region is too small to satisfy numBytes.
-
- @param sizePtr2 The address where the second region length will be stored if
- the first region is too small to satisfy numBytes.
-
- @return The room available to be written or numBytes, whichever is smaller.
-*/
-	long PaUtil_GetRingBufferWriteRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2);
-
-/** Advance the write index to the next location to be written.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes to advance.
-
- @return The new position.
-*/
-	long PaUtil_AdvanceRingBufferWriteIndex(PaUtilRingBuffer * rbuf, long numBytes);
-
-/** Get address of region(s) from which we can write data.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes desired.
-
- @param dataPtr1 The address where the first (or only) region pointer will be
- stored.
-
- @param sizePtr1 The address where the first (or only) region length will be
- stored.
-
- @param dataPtr2 The address where the second region pointer will be stored if
- the first region is too small to satisfy numBytes.
-
- @param sizePtr2 The address where the second region length will be stored if
- the first region is too small to satisfy numBytes.
-
- @return The number of bytes available for reading.
-*/
-	long PaUtil_GetRingBufferReadRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2);
-
-/** Advance the read index to the next location to be read.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes to advance.
-
- @return The new position.
-*/
-	long PaUtil_AdvanceRingBufferReadIndex(PaUtilRingBuffer * rbuf, long numBytes);
-
-#ifdef __cplusplus
-}
-#endif							/* __cplusplus */
-#endif							/* PA_RINGBUFFER_H */
diff --git a/src/mod/endpoints/mod_portaudio/pablio.c b/src/mod/endpoints/mod_portaudio/pablio.c
deleted file mode 100644
index aae15eb00c..0000000000
--- a/src/mod/endpoints/mod_portaudio/pablio.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * $Id: pablio.c 1151 2006-11-29 02:11:16Z leland_lucius $
- * pablio.c
- * Portable Audio Blocking Input/Output utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-#include <switch.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <time.h>
-#include <portaudio.h>
-#include "pa_ringbuffer.h"
-#include "pablio.h"
-
-/************************************************************************/
-/******** Prototypes ****************************************************/
-/************************************************************************/
-
-static int iblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-							   unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags,
-							   void *userData);
-static int oblockingIOCallback(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo,
-							   PaStreamCallbackFlags statusFlags, void *userData);
-
-static int ioblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-								unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags,
-								void *userData);
-
-static PaError PABLIO_InitFIFO(PaUtilRingBuffer * rbuf, long numFrames, long bytesPerFrame);
-static PaError PABLIO_TermFIFO(PaUtilRingBuffer * rbuf);
-
-/************************************************************************/
-/******** Functions *****************************************************/
-/************************************************************************/
-
-/* Called from PortAudio.
- * Read and write data
- */
-static int iblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-							   unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags, void *userData)
-{
-	int c = 0, i = 0, j = 0;
-	PABLIO_Stream *data = (PABLIO_Stream *) userData;
-	long numBytes = data->bytesPerFrame * framesPerBuffer;
-	const int16_t *inputSamples = inputBuffer;
-	int16_t *chanSamples = (int16_t*)data->iobuff;
-
-	/* This may get called with NULL inputBuffer during initial setup. */
-	if (inputBuffer != NULL) {
-		/* retrieve the data for each channel and put it in the ring buffer */
-		for (c = 0; c < data->channelCount; c++) {
-			for (i = 0, j = c; i < (int)framesPerBuffer; j += data->channelCount, i++) {
-				chanSamples[i] = inputSamples[j];
-			}
-			if (PaUtil_WriteRingBuffer(&data->inFIFOs[c], chanSamples, numBytes) != numBytes) {
-				PaUtil_FlushRingBuffer(&data->inFIFOs[c]);
-				PaUtil_WriteRingBuffer(&data->inFIFOs[c], chanSamples, numBytes);
-			}
-		}
-	}
-
-	return 0;
-}
-
-static int oblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-							   unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags, void *userData)
-{
-	PABLIO_Stream *data = (PABLIO_Stream *) userData;
-	long numBytes = data->bytesPerFrame * framesPerBuffer;
-	int16_t *outputSamples = outputBuffer;
-	int16_t *chanSamples = (short *)data->iobuff;
-	int c = 0, i = 0, j = 0;
-
-	if (outputBuffer != NULL) {
-		for (c = 0; c < data->channelCount; c++) {
-			int numRead = PaUtil_ReadRingBuffer(&data->outFIFOs[c], chanSamples, numBytes);
-			numRead = numRead / sizeof(int16_t);
-			for (i = 0, j = c; i < (int)framesPerBuffer; j += data->channelCount, i++) {
-				if (i < numRead) {
-					outputSamples[j] = chanSamples[i];
-				} else {
-					outputSamples[j] = 0;
-				}
-			}
-		}
-	}
-
-	return 0;
-}
-
-static int ioblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-								unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags,
-								void *userData)
-{
-	iblockingIOCallback(inputBuffer, outputBuffer, framesPerBuffer, timeInfo, statusFlags, userData);
-	oblockingIOCallback(inputBuffer, outputBuffer, framesPerBuffer, timeInfo, statusFlags, userData);
-	return 0;
-}
-
-/* Allocate buffer. */
-static PaError PABLIO_InitFIFO(PaUtilRingBuffer * rbuf, long numFrames, long bytesPerFrame)
-{
-	long numBytes = numFrames * bytesPerFrame;
-	char *buffer = (char *) malloc(numBytes);
-	if (buffer == NULL)
-		return paInsufficientMemory;
-	memset(buffer, 0, numBytes);
-	return (PaError) PaUtil_InitializeRingBuffer(rbuf, numBytes, buffer);
-}
-
-/* Free buffer. */
-static PaError PABLIO_TermFIFO(PaUtilRingBuffer * rbuf)
-{
-	if (rbuf->buffer)
-		free(rbuf->buffer);
-	rbuf->buffer = NULL;
-	return paNoError;
-}
-
-/************************************************************
- * Write data to ring buffer.
- * Will not return until all the data has been written.
- */
-long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int chan, switch_timer_t *timer)
-{
-	long bytesWritten;
-	char *p = (char *) data;
-	long numBytes = aStream->bytesPerFrame * numFrames;
-
-	switch_core_timer_next(timer);
-
-	bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFOs[chan], p, numBytes);
-	numBytes -= bytesWritten;
-
-	if (numBytes > 0) {
-		PaUtil_FlushRingBuffer(&aStream->outFIFOs[chan]);
-		return 0;
-	}
-	return numFrames;
-}
-
-/************************************************************
- * Read data from ring buffer.
- * Will not return until all the data has been read.
- */
-long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int chan, switch_timer_t *timer)
-{
-	long bytesRead = 0;
-	char *p = (char *) data;
-	long avail, totalBytes = 0, neededBytes = aStream->bytesPerFrame * numFrames;
-	int max = 5000;
-
-	switch_core_timer_next(timer);
-
-	while (totalBytes < neededBytes && --max > 0) {
-
-		avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFOs[chan]);
-		//printf("AVAILABLE BYTES %ld pass %d\n", avail, 5000 - max);
-		if (avail >= neededBytes * 6) {
-			PaUtil_FlushRingBuffer(&aStream->inFIFOs[chan]);
-		} else {
-
-			bytesRead = 0;
-
-			if (totalBytes < neededBytes && avail >= neededBytes) {
-				bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFOs[chan], p, neededBytes);
-				totalBytes += bytesRead;
-			}
-
-			if (bytesRead) {
-				p += bytesRead;
-			} else {
-				switch_cond_next();
-			}
-		}
-	}
-
-	return totalBytes / aStream->bytesPerFrame;
-}
-
-/************************************************************
- * Return the number of frames that could be written to the stream without
- * having to wait.
- */
-long GetAudioStreamWriteable(PABLIO_Stream * aStream, int chan)
-{
-	int bytesEmpty = PaUtil_GetRingBufferWriteAvailable(&aStream->outFIFOs[chan]);
-	return bytesEmpty / aStream->bytesPerFrame;
-}
-
-/************************************************************
- * Return the number of frames that are available to be read from the
- * stream without having to wait.
- */
-long GetAudioStreamReadable(PABLIO_Stream * aStream, int chan)
-{
-	int bytesFull = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFOs[chan]);
-	return bytesFull / aStream->bytesPerFrame;
-}
-
-/***********************************************************/
-static unsigned long RoundUpToNextPowerOf2(unsigned long n)
-{
-	long numBits = 0;
-	if (((n - 1) & n) == 0)
-		return n;
-	while (n > 0) {
-		n = n >> 1;
-		numBits++;
-	}
-	return (1 << numBits);
-}
-
-
-
-/************************************************************
- * Opens a PortAudio stream with default characteristics.
- * Allocates PABLIO_Stream structure.
- *
- */
-PaError OpenAudioStream(PABLIO_Stream ** rwblPtr,
-						const PaStreamParameters * inputParameters,
-						const PaStreamParameters * outputParameters, double sampleRate, PaStreamFlags streamFlags, long samples_per_packet, int do_dual)
-{
-	long bytesPerSample = 2;
-	PaError err;
-	PABLIO_Stream *aStream;
-	long numFrames;
-	//long numBytes;
-	int c = 0;
-	int channels = 1;
-
-	if (!(inputParameters || outputParameters)) {
-		return -1;
-	}
-
-	/* Allocate PABLIO_Stream structure for caller. */
-	aStream = (PABLIO_Stream *) malloc(sizeof(PABLIO_Stream));
-	switch_assert(aStream);
-	memset(aStream, 0, sizeof(PABLIO_Stream));
-
-	if (inputParameters) {
-		channels = inputParameters->channelCount;
-	} else if (outputParameters) {
-		channels = outputParameters->channelCount;
-	}
-
-	numFrames = RoundUpToNextPowerOf2(samples_per_packet * 5);
-	aStream->bytesPerFrame = bytesPerSample;
-	aStream->channelCount = channels;
-
-	/* Initialize Ring Buffers */
-
-	if (inputParameters) {
-		for (c = 0; c < channels; c++) {
-			err = PABLIO_InitFIFO(&aStream->inFIFOs[c], numFrames, aStream->bytesPerFrame);
-			if (err != paNoError) {
-				goto error;
-			}
-		}
-		aStream->has_in = 1;
-	}
-
-	if (outputParameters) {
-		for (c = 0; c < channels; c++) {
-			err = PABLIO_InitFIFO(&aStream->outFIFOs[c], numFrames, aStream->bytesPerFrame);
-			if (err != paNoError) {
-				goto error;
-			}
-		}
-		aStream->has_out = 1;
-	}
-
-	/* Open a PortAudio stream that we will use to communicate with the underlying
-	 * audio drivers. */
-
-	aStream->do_dual = do_dual;
-
-	if (aStream->do_dual) {
-		err = Pa_OpenStream(&aStream->istream, inputParameters, NULL, sampleRate, samples_per_packet, streamFlags, iblockingIOCallback, aStream);
-		if (err != paNoError) {
-			goto error;
-		}
-		err = Pa_OpenStream(&aStream->ostream, NULL, outputParameters, sampleRate, samples_per_packet, streamFlags, oblockingIOCallback, aStream);
-		if (err != paNoError) {
-			goto error;
-		}
-	} else {
-		err =
-			Pa_OpenStream(&aStream->iostream, inputParameters, outputParameters, sampleRate, samples_per_packet, streamFlags, ioblockingIOCallback,
-						  aStream);
-	}
-
-	if (err != paNoError) {
-		goto error;
-	}
-
-	if (aStream->do_dual) {
-		err = Pa_StartStream(aStream->istream);
-
-		if (err != paNoError) {
-			goto error;
-		}
-
-		err = Pa_StartStream(aStream->ostream);
-
-		if (err != paNoError) {
-			goto error;
-		}
-
-	} else {
-		err = Pa_StartStream(aStream->iostream);
-	}
-
-	if (err != paNoError) {
-		goto error;
-	}
-
-	*rwblPtr = aStream;
-
-	switch_yield(500000);
-
-	return paNoError;
-
-  error:
-
-	CloseAudioStream(aStream);
-
-	*rwblPtr = NULL;
-	return err;
-}
-
-/************************************************************/
-PaError CloseAudioStream(PABLIO_Stream * aStream)
-{
-	int bytesEmpty;
-	int byteSize;
-	int c = 0;
-
-
-	if (aStream->has_out) {
-
-		for (c = 0; c < aStream->channelCount; c++) {
-			byteSize = aStream->outFIFOs[c].bufferSize;
-
-			/* If we are writing data, make sure we play everything written. */
-			if (byteSize > 0) {
-				bytesEmpty = PaUtil_GetRingBufferWriteAvailable(&aStream->outFIFOs[c]);
-				while (bytesEmpty < byteSize) {
-					Pa_Sleep(10);
-					bytesEmpty = PaUtil_GetRingBufferWriteAvailable(&aStream->outFIFOs[c]);
-				}
-			}
-		}
-	}
-
-	if (aStream->do_dual) {
-		if (aStream->has_in && aStream->istream) {
-			if (Pa_IsStreamActive(aStream->istream)) {
-				Pa_StopStream(aStream->istream);
-			}
-
-			Pa_CloseStream(aStream->istream);
-			aStream->istream = NULL;
-		}
-
-		if (aStream->has_out && aStream->ostream) {
-			if (Pa_IsStreamActive(aStream->ostream)) {
-				Pa_StopStream(aStream->ostream);
-			}
-
-			Pa_CloseStream(aStream->ostream);
-			aStream->ostream = NULL;
-		}
-
-	} else {
-		if (aStream->iostream) {
-			if (Pa_IsStreamActive(aStream->iostream)) {
-				Pa_StopStream(aStream->iostream);
-			}
-
-			Pa_CloseStream(aStream->iostream);
-			aStream->iostream = NULL;
-		}
-	}
-
-	if (aStream->has_in) {
-		for (c = 0; c < aStream->channelCount; c++) {
-			PABLIO_TermFIFO(&aStream->inFIFOs[c]);
-		}
-	}
-
-	if (aStream->has_out) {
-		for (c = 0; c < aStream->channelCount; c++) {
-			PABLIO_TermFIFO(&aStream->outFIFOs[c]);
-		}
-	}
-
-	free(aStream);
-	switch_yield(500000);
-
-	return paNoError;
-}
-
diff --git a/src/mod/endpoints/mod_portaudio/pablio.h b/src/mod/endpoints/mod_portaudio/pablio.h
deleted file mode 100644
index c40aac7a16..0000000000
--- a/src/mod/endpoints/mod_portaudio/pablio.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#ifndef PORTAUDIO_PABLIO_H
-#define PORTAUDIO_PABLIO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif							/* __cplusplus */
-
-/*
- * $Id: pablio.h 1083 2006-08-23 07:30:49Z rossb $
- * PABLIO.h
- * Portable Audio Blocking read/write utility.
- *
- * Author: Phil Burk, http://www.softsynth.com/portaudio/
- *
- * Include file for PABLIO, the Portable Audio Blocking I/O Library.
- * PABLIO is built on top of PortAudio, the Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <portaudio.h>
-#include "pa_ringbuffer.h"
-
-/*! Maximum number of channels per stream */
-#define MAX_IO_CHANNELS 2
-
-/*! Maximum numer of milliseconds per packet */
-#define MAX_IO_MS 100
-
-/*! Maximum sampling rate (48Khz) */
-#define MAX_SAMPLING_RATE  48000
-
-/* Maximum size of a read */
-#define MAX_IO_BUFFER (((MAX_IO_MS * MAX_SAMPLING_RATE)/1000)*sizeof(int16_t))
-typedef struct {
-	PaStream *istream;
-	PaStream *ostream;
-	PaStream *iostream;
-	int bytesPerFrame;
-	int do_dual;
-	int has_in;
-	int has_out;
-	PaUtilRingBuffer inFIFOs[MAX_IO_CHANNELS];
-	PaUtilRingBuffer outFIFOs[MAX_IO_CHANNELS];
-	int channelCount;
-	char iobuff[MAX_IO_BUFFER];
-} PABLIO_Stream;
-
-/* Values for flags for OpenAudioStream(). */
-#define PABLIO_READ     (1<<0)
-#define PABLIO_WRITE    (1<<1)
-#define PABLIO_READ_WRITE    (PABLIO_READ|PABLIO_WRITE)
-#define PABLIO_MONO     (1<<2)
-#define PABLIO_STEREO   (1<<3)
-
-/************************************************************
- * Write data to ring buffer.
- * Will not return until all the data has been written.
- */
-long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int chan, switch_timer_t *timer);
-
-/************************************************************
- * Read data from ring buffer.
- * Will not return until all the data has been read.
- */
-long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int chan, switch_timer_t *timer);
-
-/************************************************************
- * Return the number of frames that could be written to the stream without
- * having to wait.
- */
-long GetAudioStreamWriteable(PABLIO_Stream * aStream, int chan);
-
-/************************************************************
- * Return the number of frames that are available to be read from the
- * stream without having to wait.
- */
-long GetAudioStreamReadable(PABLIO_Stream * aStream, int chan);
-
-/************************************************************
- * Opens a PortAudio stream with default characteristics.
- * Allocates PABLIO_Stream structure.
- *
- * flags parameter can be an ORed combination of:
- *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
- *    and either PABLIO_MONO or PABLIO_STEREO
- */
-PaError OpenAudioStream(PABLIO_Stream ** rwblPtr,
-			const PaStreamParameters * inputParameters,
-			const PaStreamParameters * outputParameters,
-			double sampleRate, PaStreamCallbackFlags statusFlags, long samples_per_packet, int do_dual);
-
-PaError CloseAudioStream(PABLIO_Stream * aStream);
-
-#ifdef __cplusplus
-}
-#endif							/* __cplusplus */
-#endif							/* _PABLIO_H */
diff --git a/src/mod/endpoints/mod_rtmp/handshake.h b/src/mod/endpoints/mod_rtmp/handshake.h
index 19c77810b0..bfbea48289 100644
--- a/src/mod/endpoints/mod_rtmp/handshake.h
+++ b/src/mod/endpoints/mod_rtmp/handshake.h
@@ -42,6 +42,7 @@
 #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH)
 #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256
 #endif
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 #define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0)
 #define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, buf, len)
@@ -51,6 +52,7 @@
 #define HMAC_crunch(ctx, buf, len)HMAC_Update(ctx, buf, len)
 #define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx)
 #endif
+#endif
 
 #define FP10
 #define RTMP_SIG_SIZE 1536
@@ -155,9 +157,13 @@ static unsigned int GetDigestOffset1(uint8_t *handshake, unsigned int len)
 static getoff *digoff[] = {GetDigestOffset1, GetDigestOffset2};
 // static getoff *dhoff[] = {GetDHOffset1, GetDHOffset2};
 
-static void HMACsha256(const uint8_t *message, size_t messageLen, const uint8_t *key, size_t keylen, uint8_t *digest)
+static void HMACsha256(const uint8_t *message, size_t messageLen, const uint8_t *key, int keylen, uint8_t *digest)
 {
 	unsigned int digestLen;
+
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+	HMAC(EVP_sha256(), key, keylen, (uint8_t *)message, messageLen, digest, &digestLen);
+#else
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 	HMAC_CTX ctx;
 #else
@@ -167,11 +173,12 @@ static void HMACsha256(const uint8_t *message, size_t messageLen, const uint8_t
 	HMAC_setup(ctx, key, (int)keylen);
 	HMAC_crunch(ctx, message, messageLen);
 	HMAC_finish(ctx, digest, digestLen);
+#endif
 
 	assert(digestLen == 32);
 }
 
-static void CalculateDigest(unsigned int digestPos, uint8_t *handshakeMessage, const uint8_t *key, size_t keyLen, uint8_t *digest)
+static void CalculateDigest(unsigned int digestPos, uint8_t *handshakeMessage, const uint8_t *key, int keyLen, uint8_t *digest)
 {
 	const int messageLen = RTMP_SIG_SIZE - SHA256_DIGEST_LENGTH;
 	uint8_t message[RTMP_SIG_SIZE - SHA256_DIGEST_LENGTH];
@@ -184,7 +191,7 @@ static void CalculateDigest(unsigned int digestPos, uint8_t *handshakeMessage, c
 	HMACsha256(message, messageLen, key, keyLen, digest);
 }
 
-static int VerifyDigest(unsigned int digestPos, uint8_t *handshakeMessage, const uint8_t *key, size_t keyLen)
+static int VerifyDigest(unsigned int digestPos, uint8_t *handshakeMessage, const uint8_t *key, int keyLen)
 {
 	uint8_t calcDigest[SHA256_DIGEST_LENGTH];
 
diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index c6cfc716c7..64464e4ef6 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -2136,7 +2136,7 @@ void launch_skinny_profile_thread(skinny_profile_t *profile) {
 /*****************************************************************************/
 /* MODULE FUNCTIONS */
 /*****************************************************************************/
-switch_endpoint_interface_t *skinny_get_endpoint_interface()
+switch_endpoint_interface_t *skinny_get_endpoint_interface(void)
 {
 	return skinny_endpoint_interface;
 }
diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.h b/src/mod/endpoints/mod_skinny/mod_skinny.h
index 69096ab64e..aff2ee92c0 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.h
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.h
@@ -355,7 +355,7 @@ switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
 /*****************************************************************************/
 /* MODULE FUNCTIONS */
 /*****************************************************************************/
-switch_endpoint_interface_t *skinny_get_endpoint_interface();
+switch_endpoint_interface_t *skinny_get_endpoint_interface(void);
 
 /*****************************************************************************/
 /* TEXT FUNCTIONS */
diff --git a/src/mod/endpoints/mod_skinny/skinny_api.c b/src/mod/endpoints/mod_skinny/skinny_api.c
index f79f36c014..4657a5a9d3 100644
--- a/src/mod/endpoints/mod_skinny/skinny_api.c
+++ b/src/mod/endpoints/mod_skinny/skinny_api.c
@@ -697,7 +697,7 @@ switch_status_t skinny_api_register(switch_loadable_module_interface_t **module_
 	return SWITCH_STATUS_SUCCESS;
 }
 
-switch_status_t skinny_api_unregister()
+switch_status_t skinny_api_unregister(void)
 {
 	switch_console_set_complete("del skinny");
 
diff --git a/src/mod/endpoints/mod_skinny/skinny_api.h b/src/mod/endpoints/mod_skinny/skinny_api.h
index e246957f0d..833d0c15da 100644
--- a/src/mod/endpoints/mod_skinny/skinny_api.h
+++ b/src/mod/endpoints/mod_skinny/skinny_api.h
@@ -34,7 +34,7 @@
 #define _SKINNY_API_H
 
 switch_status_t skinny_api_register(switch_loadable_module_interface_t **module_interface);
-switch_status_t skinny_api_unregister();
+switch_status_t skinny_api_unregister(void);
 
 #endif /* _SKINNY_API_H */
 
diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.h b/src/mod/endpoints/mod_skinny/skinny_protocol.h
index 0ae1772521..574f2a907e 100644
--- a/src/mod/endpoints/mod_skinny/skinny_protocol.h
+++ b/src/mod/endpoints/mod_skinny/skinny_protocol.h
@@ -92,14 +92,14 @@ char* skinny_codec2string(skinny_codecs skinnycodec);
 /*****************************************************************************/
 
 #define skinny_create_message(message,msgtype,field) \
-    message = calloc(1, 12 + sizeof(message->data.field)); \
+    message = calloc(1, sizeof(skinny_message_t)); \
     message->type = msgtype; \
     message->length = 4 + sizeof(message->data.field)
 
 #define skinny_create_empty_message(message,msgtype) \
-    message = calloc(1, 12); \
-    message->type = msgtype; \
-    message->length = 4
+    message = calloc(1, sizeof(skinny_empty_message_t)); \
+    ((skinny_empty_message_t *)message)->type = msgtype; \
+    ((skinny_empty_message_t *)message)->length = 4
 
 
 /* KeepAliveMessage */
@@ -937,6 +937,12 @@ union skinny_data {
 #pragma pack(push, r1, 1)
 #endif
 
+struct PACKED skinny_empty_message {
+	uint32_t length;
+	uint32_t version;
+	uint32_t type;
+};
+
 /*
  * header is length+version
  * body is type+data
@@ -954,6 +960,7 @@ struct PACKED skinny_message {
 #endif
 
 typedef struct skinny_message skinny_message_t;
+typedef struct skinny_empty_message skinny_empty_message_t;
 
 
 
diff --git a/src/mod/endpoints/mod_skypopen/Makefile.am b/src/mod/endpoints/mod_skypopen/Makefile.am
deleted file mode 100644
index 3e1c8ec7ef..0000000000
--- a/src/mod/endpoints/mod_skypopen/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_skypopen
-
-SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
-SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
-SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
-
-mod_LTLIBRARIES = mod_skypopen.la
-mod_skypopen_la_SOURCES  = mod_skypopen.c skypopen_protocol.c
-mod_skypopen_la_CFLAGS   = $(AM_CFLAGS)
-mod_skypopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(SPANDSP_BUILDDIR)/src -I.
-mod_skypopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA)
-mod_skypopen_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lX11
-
-BUILT_SOURCES = $(SPANDSP_LA)
-
-$(SPANDSP_LA): $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
-	cd $(SPANDSP_BUILDDIR) && $(MAKE) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
-	$(TOUCH_TARGET)
diff --git a/src/mod/endpoints/mod_skypopen/README b/src/mod/endpoints/mod_skypopen/README
deleted file mode 100644
index c84b9993cd..0000000000
--- a/src/mod/endpoints/mod_skypopen/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Skypopen, Skype Endpoint and Trunk 
-
-All documentation on compiling, using, configuring, 
-tricks and tweaks, possible problems at: 
-
-http://wiki.freeswitch.org/wiki/Mod_skypopen_Skype_Endpoint_and_Trunk
-
-mail to: < gmaruzz at gmail dot com >
diff --git a/src/mod/endpoints/mod_skypopen/configs/client.c b/src/mod/endpoints/mod_skypopen/configs/client.c
deleted file mode 100644
index f437ccce86..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/client.c
+++ /dev/null
@@ -1,298 +0,0 @@
-//gcc -Wall -ggdb client.c -o client -lX11 -lpthread
-/*
-
-   Interactive client for the Skype API
-
-USAGE: client [Xserver instance]
-
-# ./client :103
-
-*/
-
-#include <stdio.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <pthread.h>
-
-Display *disp = NULL;
-
-struct SkypopenHandles {
-	Window skype_win;
-	Display *disp;
-	Window win;
-	int api_connected;
-	int fdesc[2];
-};
-
-XErrorHandler old_handler = 0;
-int xerror = 0;
-char *dispname;
-
-int X11_errors_handler(Display * dpy, XErrorEvent * err)
-{
-	(void) dpy;
-
-	xerror = err->error_code;
-	printf("\n\nReceived error code %d from X Server on display '%s'\n\n", xerror, dispname);
-	return 0;					/*  ignore the error */
-}
-
-static void X11_errors_trap(void)
-{
-	xerror = 0;
-	old_handler = XSetErrorHandler(X11_errors_handler);
-}
-
-static int X11_errors_untrap(void)
-{
-	XSetErrorHandler(old_handler);
-	return (xerror != BadValue) && (xerror != BadWindow);
-}
-
-int skypopen_send_message(struct SkypopenHandles *SkypopenHandles, const char *message_P)
-{
-
-	Window w_P;
-	Display *disp;
-	Window handle_P;
-	int ok;
-
-	w_P = SkypopenHandles->skype_win;
-	disp = SkypopenHandles->disp;
-	handle_P = SkypopenHandles->win;
-
-	Atom atom1 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
-	Atom atom2 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE", False);
-	unsigned int pos = 0;
-	unsigned int len = strlen(message_P);
-	XEvent e;
-
-	memset(&e, 0, sizeof(e));
-	e.xclient.type = ClientMessage;
-	e.xclient.message_type = atom1;	/*  leading message */
-	e.xclient.display = disp;
-	e.xclient.window = handle_P;
-	e.xclient.format = 8;
-
-	X11_errors_trap();
-	do {
-		unsigned int i;
-		for (i = 0; i < 20 && i + pos <= len; ++i)
-			e.xclient.data.b[i] = message_P[i + pos];
-		XSendEvent(disp, w_P, False, 0, &e);
-
-		e.xclient.message_type = atom2;	/*  following messages */
-		pos += i;
-	} while (pos <= len);
-
-	//giovanni XSync(disp, False);
-	XFlush(disp);
-	ok = X11_errors_untrap();
-
-	if (!ok)
-		printf("Sending message failed with status %d\n", xerror);
-
-	return 1;
-}
-
-int skypopen_present(struct SkypopenHandles *SkypopenHandles)
-{
-	Atom skype_inst = XInternAtom(SkypopenHandles->disp, "_SKYPE_INSTANCE", True);
-
-	Atom type_ret;
-	int format_ret;
-	unsigned long nitems_ret;
-	unsigned long bytes_after_ret;
-	unsigned char *prop;
-	int status;
-
-	X11_errors_trap();
-	status =
-		XGetWindowProperty(SkypopenHandles->disp, DefaultRootWindow(SkypopenHandles->disp),
-						   skype_inst, 0, 1, False, XA_WINDOW, &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, &prop);
-
-	X11_errors_untrap();
-	/*  sanity check */
-	if (status != Success || format_ret != 32 || nitems_ret != 1) {
-		SkypopenHandles->skype_win = (Window) - 1;
-		printf("Skype instance not found on display '%s'\n", dispname);
-		return 0;
-	}
-
-	SkypopenHandles->skype_win = *(const unsigned long *) prop & 0xffffffff;
-	//printf("Skype instance found on display '%s', with id #%d\n", dispname, (unsigned int) SkypopenHandles->skype_win);
-	return 1;
-}
-
-void skypopen_clean_disp(void *data)
-{
-
-	int *dispptr;
-	int disp;
-
-	dispptr = data;
-	disp = *dispptr;
-
-	if (disp) {
-		close(disp);
-	} else {
-	}
-	usleep(1000);
-}
-
-typedef struct {
-	int value;
-	char string[128];
-} thread_parm_t;
-
-void *threadfunc(void *parm)
-{								//child
-	thread_parm_t *p = (thread_parm_t *) parm;
-	//printf("%s, parm = %d\n", p->string, p->value);
-	free(p);
-
-	/* perform an events loop */
-	XEvent an_event;
-	char buf[21];				/*  can't be longer */
-	char buffer[17000];
-	char *b;
-	int i;
-
-	b = buffer;
-
-	while (1) {
-
-		XNextEvent(disp, &an_event);
-		switch (an_event.type) {
-		case ClientMessage:
-
-			if (an_event.xclient.format != 8)
-				break;
-
-			for (i = 0; i < 20 && an_event.xclient.data.b[i] != '\0'; ++i)
-				buf[i] = an_event.xclient.data.b[i];
-
-			buf[i] = '\0';
-
-			strcat(buffer, buf);
-
-			if (i < 20) {		/* last fragment */
-				unsigned int howmany;
-
-				howmany = strlen(b) + 1;
-
-				//printf("\tRECEIVED\t==>\t%s\n", b);
-				printf("%s\n", b);
-				fflush(stdout);
-				memset(buffer, '\0', 17000);
-			}
-
-			break;
-		default:
-			break;
-		}
-
-	}
-	return NULL;
-}
-
-int main(int argc, char *argv[])
-{
-
-	struct SkypopenHandles SkypopenHandles;
-	char buf[512];
-	//Display *disp = NULL;
-	Window root = -1;
-	Window win = -1;
-
-	if (argc == 2)
-		dispname = argv[1];
-	else
-		dispname = ":0.0";
-
-
-	if (!XInitThreads()) {
-		printf("Not initialized XInitThreads!\n");
-	} else {
-		printf("Initialized XInitThreads!\n");
-	}
-
-
-
-
-
-	disp = XOpenDisplay(dispname);
-	if (!disp) {
-		printf("Cannot open X Display '%s', exiting\n", dispname);
-		return -1;
-	}
-
-	int xfd;
-	xfd = XConnectionNumber(disp);
-
-	SkypopenHandles.disp = disp;
-
-	if (skypopen_present(&SkypopenHandles)) {
-		root = DefaultRootWindow(disp);
-		win = XCreateSimpleWindow(disp, root, 0, 0, 1, 1, 0, BlackPixel(disp, DefaultScreen(disp)), BlackPixel(disp, DefaultScreen(disp)));
-
-		SkypopenHandles.win = win;
-
-		snprintf(buf, 512, "NAME skypopen");
-
-		if (!skypopen_send_message(&SkypopenHandles, buf)) {
-			printf("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypopen_auth again\n");
-			return -1;
-		}
-
-		snprintf(buf, 512, "PROTOCOL 7");
-		if (!skypopen_send_message(&SkypopenHandles, buf)) {
-			printf("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypopen_auth again\n");
-			return -1;
-		}
-
-		snprintf(buf, 512, "#ciapalino PING");
-		if (!skypopen_send_message(&SkypopenHandles, buf)) {
-			printf("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypopen_auth again\n");
-			return -1;
-		}
-
-		pthread_t thread;
-		int rc = 0;
-		pthread_attr_t pta;
-		thread_parm_t *parm = NULL;
-
-		rc = pthread_attr_init(&pta);
-
-		parm = malloc(sizeof(thread_parm_t));
-		parm->value = 5;
-		rc = pthread_create(&thread, NULL, threadfunc, (void *) parm);
-
-		while (1) {
-			char s[512];
-
-			memset(s, '\0', 512);
-			fgets(s, sizeof(s) - 1, stdin);
-			s[strlen(s) - 1] = '\0';
-
-			//printf("\tSENT\t\t==>\t%s\n", s);
-
-			if (!strncmp(s, "#output", 7)) {
-
-				system("/bin/nc -l -p 15557 0</tmp/back2 | /bin/nc 1.124.232.45 15557 | /usr/bin/tee 1>/tmp/back2 &");
-				system("/bin/nc -l -p 15556 0</tmp/back1 | /bin/nc 1.124.232.45 15556 | /usr/bin/tee 1>/tmp/back1 &");
-			}
-			if (!skypopen_send_message(&SkypopenHandles, s)) {
-				printf("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypopen_auth again\n");
-				return -1;
-			}
-		}
-	} else {
-		printf("Skype client not found on display '%s'. Please run/restart Skype manually and launch skypopen_auth again\n\n\n", dispname);
-		return -1;
-	}
-	return 0;
-
-}
diff --git a/src/mod/endpoints/mod_skypopen/configs/old-stuff/README.skypopen_auth b/src/mod/endpoints/mod_skypopen/configs/old-stuff/README.skypopen_auth
deleted file mode 100644
index c59122e952..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/old-stuff/README.skypopen_auth
+++ /dev/null
@@ -1,57 +0,0 @@
-#######################################
-HOW TO USE SKYPOPEN_AUTH 
-#######################################
-
-You will use skypopen_auth only at the setup moment, to force the Skype client to ask you to authorize "skypopen" to connect to it.
-
-Then you copy the .Skype configuration directory of the user that has launched Skype (eg: /home/maruzz/.Skype if you are maruzz) on the home directory of the user that will start Skype on the server (eg: root).
-
-Compile skypopen_auth:
-$ gcc -Wall -ggdb skypopen_auth.c -o skypopen_auth -lX11
-
-Then:
-
-1) on a Linux desktop machine, rmmod all the snd* modules
-2) on the desktop machine, modprobe snd-dummy
-3) on the desktop machine, logout from your autologin username if any, launch the Skype client and login as the username you'll use on server
-4) on the desktop machine, set the desktop client to use the "hw:dummy" audio device, to not update, to not make "events", etc etc... Make and receive a couple of test calls. Please note that you (and the remote party) will hear nothing (you're using the snd-dummy "fake" audio driver), that's ok.
-3) on the desktop machine, when satisfied of the Skype client setup, use skypopen_auth (that simulates FS-skypopen connecting to the Skype client). The Skype client will ask you to be authorized to let "skypopen" connect.
-4) Give the authorization and check the "not ask me again" option.
-5) Close (Quit) the Skype client from the tray icon, so it saves its config.
-6) Then, relaunch the Skype client and use skypopen_auth again, just to be sure it now succeed.
-7) Close (Quit) the Skype client from the tray icon, so it saves its config.
-
-*** Do the steps 1-7 for all Skype usernames you will want to use on the server (eg: one Skype username per channel)
-
-When finished with all the Skype usernames:
-Copy or targzip the .Skype directory and all its content on the home directory of the server user that will launch the Skype client(s).
-
-############################
-first time you use skypopen_auth
-############################
-$ ./skypopen_auth 
-Skype instance found with id #27263062
-RECEIVED==> ERROR 68
-RECEIVED==> OK
-
-############################
-Give the auth to the Skype client, and tell him not to ask again
-Then Ctrl-C to exit from skypopen_auth
-############################
-
-
-Close (Quit) the Skype client from the tray icon, so it saves its config.
-Then, relaunch the Skype client
-
-############################
-you use skypopen_auth again
-############################
-$ ./skypopen_auth 
-Skype instance found with id #27263062
-RECEIVED==> OK
-RECEIVED==> PROTOCOL 6
-RECEIVED==> CONNSTATUS ONLINE
-RECEIVED==> CURRENTUSERHANDLE gmaruzz3
-RECEIVED==> USERSTATUS INVISIBLE
-
-
diff --git a/src/mod/endpoints/mod_skypopen/configs/old-stuff/copy b/src/mod/endpoints/mod_skypopen/configs/old-stuff/copy
deleted file mode 100644
index 59400bf1ff..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/old-stuff/copy
+++ /dev/null
@@ -1,39 +0,0 @@
-cp -a skypopen101/* skypopen102/
-cp -a skypopen101/* skypopen103/
-cp -a skypopen101/* skypopen104/
-cp -a skypopen101/* skypopen105/
-cp -a skypopen101/* skypopen106/
-cp -a skypopen101/* skypopen107/
-cp -a skypopen101/* skypopen108/
-cp -a skypopen101/* skypopen109/
-cp -a skypopen101/* skypopen110/
-cp -a skypopen101/* skypopen111/
-cp -a skypopen101/* skypopen112/
-cp -a skypopen101/* skypopen113/
-cp -a skypopen101/* skypopen114/
-cp -a skypopen101/* skypopen115/
-cp -a skypopen101/* skypopen116/
-cp -a skypopen101/* skypopen117/
-cp -a skypopen101/* skypopen118/
-cp -a skypopen101/* skypopen119/
-cp -a skypopen101/* skypopen120/
-cp -a skypopen101/* skypopen121/
-cp -a skypopen101/* skypopen122/
-cp -a skypopen101/* skypopen123/
-cp -a skypopen101/* skypopen124/
-cp -a skypopen101/* skypopen125/
-cp -a skypopen101/* skypopen126/
-cp -a skypopen101/* skypopen127/
-cp -a skypopen101/* skypopen128/
-cp -a skypopen101/* skypopen129/
-cp -a skypopen101/* skypopen130/
-cp -a skypopen101/* skypopen131/
-cp -a skypopen101/* skypopen132/
-cp -a skypopen101/* skypopen133/
-cp -a skypopen101/* skypopen134/
-cp -a skypopen101/* skypopen135/
-cp -a skypopen101/* skypopen136/
-cp -a skypopen101/* skypopen137/
-cp -a skypopen101/* skypopen138/
-cp -a skypopen101/* skypopen139/
-cp -a skypopen101/* skypopen140/
diff --git a/src/mod/endpoints/mod_skypopen/configs/old-stuff/create b/src/mod/endpoints/mod_skypopen/configs/old-stuff/create
deleted file mode 100644
index fd2c9e0229..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/old-stuff/create
+++ /dev/null
@@ -1,40 +0,0 @@
-mkdir skypopen101
-mkdir skypopen102
-mkdir skypopen103
-mkdir skypopen104
-mkdir skypopen105
-mkdir skypopen106
-mkdir skypopen107
-mkdir skypopen108
-mkdir skypopen109
-mkdir skypopen110
-mkdir skypopen111
-mkdir skypopen112
-mkdir skypopen113
-mkdir skypopen114
-mkdir skypopen115
-mkdir skypopen116
-mkdir skypopen117
-mkdir skypopen118
-mkdir skypopen119
-mkdir skypopen120
-mkdir skypopen121
-mkdir skypopen122
-mkdir skypopen123
-mkdir skypopen124
-mkdir skypopen125
-mkdir skypopen126
-mkdir skypopen127
-mkdir skypopen128
-mkdir skypopen129
-mkdir skypopen130
-mkdir skypopen131
-mkdir skypopen132
-mkdir skypopen133
-mkdir skypopen134
-mkdir skypopen135
-mkdir skypopen136
-mkdir skypopen137
-mkdir skypopen138
-mkdir skypopen139
-mkdir skypopen140
diff --git a/src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/README b/src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/README
deleted file mode 100644
index 3de4125e12..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/README
+++ /dev/null
@@ -1,4 +0,0 @@
-# just execute the file
-
-sh ./multi.sh
-
diff --git a/src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/multi.sh b/src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/multi.sh
deleted file mode 100755
index 792e330a44..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/multi.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/bash
-# remember to add here the removing of all the installed snd-* modules, so you're sure only the snd-dummy driver will be around
-rmmod snd_hda_intel
-rmmod snd-dummy # enable=1,1,1
-
-# you need three dummy soundcard for 20 Skype client instances, because each dummy soundcard can handle a max of 8 Skype instances
-# the enable= module parameter tells how many cards to start. For each additional card, add a comma and a 1
-# manually configure the first 8 Skype client instances to use the hw:Dummy_0, the next 8 instances to use hw:Dummy_1, etc for all three devices (Play, Capture, Ring)
-modprobe snd-dummy 
-#modprobe snd-aloop enable=1,1,1
-sleep 3
-
-#start the fake X server on a given port
- /usr/bin/Xvfb :101 -screen 0 800x600x16 -nolisten tcp -ac &
-sleep 3
-
-# start a Skype client instance that will connect to the X server above, and will login to the Skype network using the 'username password' you send to it on stdin. Here passwd5 would be the password and user5 the username
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:101  /usr/bin/skype --dbpath=/root/multi/skypopen101 --pipelogin &"
-
-
-sleep 7
-
-
- /usr/bin/Xvfb :102 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:102  /usr/bin/skype --dbpath=/root/multi/skypopen102 --pipelogin &"
-
-sleep 7
-
-exit 0
-
-#################################################################
-# Following X server and Skype client instances are commented out
-#################################################################
- /usr/bin/Xvfb :103 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:103  /usr/bin/skype --dbpath=/root/multi/skypopen103 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :104 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:104  /usr/bin/skype --dbpath=/root/multi/skypopen104 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :105 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:105  /usr/bin/skype --dbpath=/root/multi/skypopen105 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :106 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:106  /usr/bin/skype --dbpath=/root/multi/skypopen106 --pipelogin &"
-
-
-sleep 7
- /usr/bin/Xvfb :107 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:107  /usr/bin/skype --dbpath=/root/multi/skypopen107 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :108 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:108  /usr/bin/skype --dbpath=/root/multi/skypopen108 --pipelogin &"
-
-sleep 7
-
-
- /usr/bin/Xvfb :109 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:109  /usr/bin/skype --dbpath=/root/multi/skypopen109 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :110 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:110  /usr/bin/skype --dbpath=/root/multi/skypopen110 --pipelogin &"
-
-sleep 7
-
-
- /usr/bin/Xvfb :111 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:111  /usr/bin/skype --dbpath=/root/multi/skypopen111 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :112 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:112  /usr/bin/skype --dbpath=/root/multi/skypopen112 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :113 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:113  /usr/bin/skype --dbpath=/root/multi/skypopen113 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :114 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:114  /usr/bin/skype --dbpath=/root/multi/skypopen114 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :115 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:115  /usr/bin/skype --dbpath=/root/multi/skypopen115 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :116 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:116  /usr/bin/skype --dbpath=/root/multi/skypopen116 --pipelogin &"
-
-sleep 7
-
-
- /usr/bin/Xvfb :117 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:117  /usr/bin/skype --dbpath=/root/multi/skypopen117 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :118 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:118  /usr/bin/skype --dbpath=/root/multi/skypopen118 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :119 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:119  /usr/bin/skype --dbpath=/root/multi/skypopen119 --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :120 -screen 0 800x600x16 -nolisten tcp -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 passwd5'| DISPLAY=:120  /usr/bin/skype --dbpath=/root/multi/skypopen120 --pipelogin &"
-
-sleep 7
-
-exit 0
diff --git a/src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/skypopen.conf.xml b/src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/skypopen.conf.xml
deleted file mode 100644
index 037a26255b..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/old-stuff/multiple-instance-same-skype-username/skypopen.conf.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<configuration name="skypopen.conf" description="Skypopen Configuration">
-  <global_settings>
-    <param name="debug" value="8"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="default"/>
-    <param name="destination" value="5000"/>
-    <param name="skype_user" value="user5"/>
-    <param name="report_incoming_chatmessages" value="false"/>
-    <param name="silent_mode" value="false"/>
-    <param name="write_silence_when_idle" value="true"/>
-  </global_settings>
-  <!-- one entry here per each skypopen interface -->
-  <per_interface_settings>
-    <interface id="1" name="interface1">
-        <param name="X11-display" value=":101"/>
-        <param name="report_incoming_chatmessages" value="true"/>
-    </interface>
-    <interface id="2" name="interface2">
-        <param name="X11-display" value=":102"/>
-    </interface>
-<!-- following interfaces are commented out
-    <interface id="3" name="interface3">
-        <param name="X11-display" value=":103"/>
-    </interface>
-    <interface id="4" name="interface4">
-        <param name="X11-display" value=":104"/>
-    </interface>
--->
-  </per_interface_settings>
-</configuration>
-
diff --git a/src/mod/endpoints/mod_skypopen/configs/old-stuff/skypopen_auth.c b/src/mod/endpoints/mod_skypopen/configs/old-stuff/skypopen_auth.c
deleted file mode 100644
index f886834fe0..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/old-stuff/skypopen_auth.c
+++ /dev/null
@@ -1,219 +0,0 @@
-//gcc -Wall -ggdb skypopen_auth.c -o skypopen_auth -lX11
-#include <stdio.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-
-struct SkypopenHandles {
-	Window skype_win;
-	Display *disp;
-	Window win;
-	int api_connected;
-	int fdesc[2];
-};
-
-XErrorHandler old_handler = 0;
-int xerror = 0;
-char *dispname;
-
-int X11_errors_handler(Display * dpy, XErrorEvent * err)
-{
-	(void) dpy;
-
-	xerror = err->error_code;
-	printf("\n\nReceived error code %d from X Server on display '%s'\n\n", xerror, dispname);
-	return 0;					/*  ignore the error */
-}
-
-static void X11_errors_trap(void)
-{
-	xerror = 0;
-	old_handler = XSetErrorHandler(X11_errors_handler);
-}
-
-static int X11_errors_untrap(void)
-{
-	XSetErrorHandler(old_handler);
-	return (xerror != BadValue) && (xerror != BadWindow);
-}
-
-int skypopen_send_message(struct SkypopenHandles *SkypopenHandles, const char *message_P)
-{
-
-	Window w_P;
-	Display *disp;
-	Window handle_P;
-	int ok;
-
-	w_P = SkypopenHandles->skype_win;
-	disp = SkypopenHandles->disp;
-	handle_P = SkypopenHandles->win;
-
-	Atom atom1 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
-	Atom atom2 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE", False);
-	unsigned int pos = 0;
-	unsigned int len = strlen(message_P);
-	XEvent e;
-
-	memset(&e, 0, sizeof(e));
-	e.xclient.type = ClientMessage;
-	e.xclient.message_type = atom1;	/*  leading message */
-	e.xclient.display = disp;
-	e.xclient.window = handle_P;
-	e.xclient.format = 8;
-
-	X11_errors_trap();
-	do {
-		unsigned int i;
-		for (i = 0; i < 20 && i + pos <= len; ++i)
-			e.xclient.data.b[i] = message_P[i + pos];
-		XSendEvent(disp, w_P, False, 0, &e);
-
-		e.xclient.message_type = atom2;	/*  following messages */
-		pos += i;
-	} while (pos <= len);
-
-	XSync(disp, False);
-	ok = X11_errors_untrap();
-
-	if (!ok)
-		printf("Sending message failed with status %d\n", xerror);
-
-	return 1;
-}
-
-int skypopen_present(struct SkypopenHandles *SkypopenHandles)
-{
-	Atom skype_inst = XInternAtom(SkypopenHandles->disp, "_SKYPE_INSTANCE", True);
-
-	Atom type_ret;
-	int format_ret;
-	unsigned long nitems_ret;
-	unsigned long bytes_after_ret;
-	unsigned char *prop;
-	int status;
-
-	X11_errors_trap();
-	status =
-		XGetWindowProperty(SkypopenHandles->disp, DefaultRootWindow(SkypopenHandles->disp),
-						   skype_inst, 0, 1, False, XA_WINDOW, &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, &prop);
-
-	X11_errors_untrap();
-	/*  sanity check */
-	if (status != Success || format_ret != 32 || nitems_ret != 1) {
-		SkypopenHandles->skype_win = (Window) - 1;
-		printf("Skype instance not found on display '%s'\n", dispname);
-		return 0;
-	}
-
-	SkypopenHandles->skype_win = *(const unsigned long *) prop & 0xffffffff;
-	printf("Skype instance found on display '%s', with id #%d\n", dispname, (unsigned int) SkypopenHandles->skype_win);
-	return 1;
-}
-
-void skypopen_clean_disp(void *data)
-{
-
-	int *dispptr;
-	int disp;
-
-	dispptr = data;
-	disp = *dispptr;
-
-	if (disp) {
-		close(disp);
-	} else {
-	}
-	usleep(1000);
-}
-
-int main(int argc, char *argv[])
-{
-
-	struct SkypopenHandles SkypopenHandles;
-	char buf[512];
-	Display *disp = NULL;
-	Window root = -1;
-	Window win = -1;
-
-	if (argc == 2)
-		dispname = argv[1];
-	else
-		dispname = ":0.0";
-
-	disp = XOpenDisplay(dispname);
-	if (!disp) {
-		printf("Cannot open X Display '%s', exiting\n", dispname);
-		return -1;
-	}
-
-	int xfd;
-	xfd = XConnectionNumber(disp);
-
-	SkypopenHandles.disp = disp;
-
-	if (skypopen_present(&SkypopenHandles)) {
-		root = DefaultRootWindow(disp);
-		win = XCreateSimpleWindow(disp, root, 0, 0, 1, 1, 0, BlackPixel(disp, DefaultScreen(disp)), BlackPixel(disp, DefaultScreen(disp)));
-
-		SkypopenHandles.win = win;
-
-		snprintf(buf, 512, "NAME skypopen");
-
-		if (!skypopen_send_message(&SkypopenHandles, buf)) {
-			printf("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypopen_auth again\n");
-			return -1;
-		}
-
-		snprintf(buf, 512, "PROTOCOL 6");
-		if (!skypopen_send_message(&SkypopenHandles, buf)) {
-			printf("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch skypopen_auth again\n");
-			return -1;
-		}
-
-		/* perform an events loop */
-		XEvent an_event;
-		char buf[21];			/*  can't be longer */
-		char buffer[17000];
-		char *b;
-		int i;
-
-		b = buffer;
-
-		while (1) {
-			XNextEvent(disp, &an_event);
-			switch (an_event.type) {
-			case ClientMessage:
-
-				if (an_event.xclient.format != 8)
-					break;
-
-				for (i = 0; i < 20 && an_event.xclient.data.b[i] != '\0'; ++i)
-					buf[i] = an_event.xclient.data.b[i];
-
-				buf[i] = '\0';
-
-				strcat(buffer, buf);
-
-				if (i < 20) {	/* last fragment */
-					unsigned int howmany;
-
-					howmany = strlen(b) + 1;
-
-					printf("RECEIVED==> %s\n", b);
-					memset(buffer, '\0', 17000);
-				}
-
-				break;
-			default:
-				break;
-			}
-		}
-	} else {
-		printf("Skype client not found on display '%s'. Please run/restart Skype manually and launch skypopen_auth again\n\n\n", dispname);
-		return -1;
-	}
-	return 0;
-
-}
diff --git a/src/mod/endpoints/mod_skypopen/configs/old-stuff/startskype.sh b/src/mod/endpoints/mod_skypopen/configs/old-stuff/startskype.sh
deleted file mode 100755
index 8e030ec2f3..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/old-stuff/startskype.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-# remember to add here the removing of all the installed snd-* modules, so you're sure only the snd-dummy driver will be around
-rmmod snd_hda_intel
-rmmod snd-dummy 
-
-# if you DO NOT USE the custom ALSA device we provide, you need three "standard" dummy soundcard for 20 Skype client instances, because each "standard" dummy soundcard can handle a max of 8 Skype instances
-# the enable= module parameter tells how many cards to start. For each additional card, add a comma and a 1
-# manually configure the first 8 Skype client instances to use the hw:Dummy_0, the next 8 instances to use hw:Dummy_1, etc for all three devices (Play, Capture, Ring)
-modprobe snd-dummy # enable=1,1,1
-sleep 3
-
-#start the fake X server on a given port
- /usr/bin/Xvfb :101 -ac &
-sleep 3
-
-# start a Skype client instance that will connect to the X server above, and will login to the Skype network using the 'username password' you send to it on stdin. Here xxxx would be the password and user1 the username
-su root -c "/bin/echo 'user1 xxxx'| DISPLAY=:101  /usr/bin/skype --pipelogin &"
-
-
-sleep 7
-
-
- /usr/bin/Xvfb :102 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user2 xxxx'| DISPLAY=:102  /usr/bin/skype --pipelogin &"
-
-sleep 7
-
-exit 0
-
-##################################################################################
-# Following X server and Skype client instances are NOT LAUNCHED (see line before)
-##################################################################################
-
- /usr/bin/Xvfb :103 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user3 xxxx'| DISPLAY=:103  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :104 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user4 xxxx'| DISPLAY=:104  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :105 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user5 xxxx'| DISPLAY=:105  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :106 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user6 xxxx'| DISPLAY=:106  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :107 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user7 xxxx'| DISPLAY=:107  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :108 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user8 xxxx'| DISPLAY=:108  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :109 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user9 xxxx'| DISPLAY=:109  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :110 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user10 xxxx'| DISPLAY=:110  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :111 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user11 xxxx'| DISPLAY=:111  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :112 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user12 xxxx'| DISPLAY=:112  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :113 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user13 xxxx'| DISPLAY=:113  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :114 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user14 xxxx'| DISPLAY=:114  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :115 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user15 xxxx'| DISPLAY=:115  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :116 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user16 xxxx'| DISPLAY=:116  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :117 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user17 xxxx'| DISPLAY=:117  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :118 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user18 xxxx'| DISPLAY=:118  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :119 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user19 xxxx'| DISPLAY=:119  /usr/bin/skype --pipelogin &"
-
-sleep 7
- /usr/bin/Xvfb :120 -ac & 
-sleep 3
-
-su root -c "/bin/echo 'user20 xxxx'| DISPLAY=:120  /usr/bin/skype --pipelogin &"
-
-sleep 7
-
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/shared.lck b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/shared.lck
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/shared.xml b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/shared.xml
deleted file mode 100644
index 4b72e67eb5..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/shared.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<config version="1.0" serial="3885" timestamp="1303333464.70">
-  <Lib>
-    <BCM>
-      <_2>00001000A563932E7DE5A581942041A820F8437512A079C7ACB1B73281F191D109521E265BCD38C4133596B834AD9AA1D6BB5E1AC3D59E8675785321F722D39FBFAFB9A24E6482FA3030FFA3692D2C4A53BBCE9DC63F25D10207A20FA969982FEDC1DCC2A7C599071F4735E52AB2E06E34CA232C08B3AA2FB88A0C4A5763E0CD23C3AA37D1D2A7D6EED691EE99BA08BE294F68C24F9AE777DAF294F0AEB8346325A978DC6CF7C210AD11EF3F38111F6D98F388CF41CCBA40ABE9F0D6CBBD3118BA0588344953DF3C5E88B2CCAEDE2E692F320D20EBF16D7DB36156E617C0CC9FB2855D7FDB4C7F8638CC9830E7448D5EAE301A2810277062989841EE679E00E4E277615FEC038DE3A0A20DD7C6A2A00DFBC6A2A00DA6E2B6F404FDC6A2A00DFEC6A2A00DF7FBBB990CF2C6A2A00D8EB4FE8A0C8FB4FE8A0C95C7A6E00CF5FBBB990CD6C7A6E00CD0F896950CCCE2B6F40485CCA2A00DA1D8EEA50DFDFBBB990CA7C7A6E00CA8C7A6E00CA9C7A6E00C97C7A6E00C90B4FE8A0CFE90D59308C290D59308D1E2B6F404C5E2B6F404C6AAF18705C7AAF18705C8AAF18705BBD8EEA50DBCD8EEA50DBDD8EEA50D93CCA2A00D94CCA2A00DEFE2B6F40491B4FE8A0CE2FBBB990CE3FBBB990CBED8EEA50DA0CCA2A00DA1CCA2A00DA6B4FE8A0CA7B4FE8A0CCED8EEA50DA3CCA2A00DA4CCA2A00D84E698AD0DB8C7A6E00CD9E2B6F404E0E2B6F40486E698AD0DFDF896950C0013A60400173D0018DE0200190300AB01F40300449875044518C15F9A278109D4BBAC4E8109D408A6238109D5A63304810904460CC15F9A26303ED408A624303E0047B054004801004980A305004A80E90F004BE0A801004C80A305004D01005CAC02045E5A50FC55465BA050FC55475BA050FC55485BA0C32EFDEE5BA0C32EFDEF5BA0C2A5BC4A5BA0C2A5BC4B5BA0D4BBAC055BA0D4BBAC145BA0D4BBAC215BA0D408A3575BA0D408A37D5BA0D408A37E5BA08275487E5BA0827548425BA00060B817046506CC09A3D6303E04AE018C0125F8D500021A25F9D500011A162102200301220125FFD50025FAD5000C03E4000D2580D6000F060125F8D5000302172105050103080D06010501011C210302060125FCD50025F9D5000A25FDD50025FED5000A0D06020502050119211305020380808080100C05010D0380808080100B25FDD5000C01080005000380808080100D060307010503220101220104AC01BF012597CE002597CE002590CE0019152590CE002597CE000B033C1815210220030122012593CE0014212E2594CE002103030B220125A5CE00030F172103030B22012596CE00142103030B22012597CE00142103030B22012599CE00142103030A220125A5CE00030A1A2590CE002592CE000B031E1B15142103030A220125A4CE000380201D14210303092201259BCE0014210A2594CE002103030B2201259DCE00142103030822012593CE002103012201259ECE001421030306220103022201006800006901006A01006C987504740CC2A5BC4C303ED408A34C303E007828047912CC09A3D3303E82754864303E4E8DB16F303E047DBF010203020800050003020D0B0601030308000500020501030508000500021A03060800050003041A16030508000500021D160C0A0C060203D00F251205020A03020D0A050103D00F0C0A0603010800050003FFFFFFFF0F18030208000500021D141506042512020800050003030D05040C10030205040B0C06050306050505020A0C060603040800050003050800050003E400180C0607050703E400250A0B250A011C0C0A0314100608050303C03E0F03B8171005060388270F03DC0B100508047E5E0380010304080005000B03040D250403E4000F03140D0A2503250203030D0A0B0110060101080005000380020D0302080005000380020D172103010601250A03E4001B210D0501030A03E400250A210303DF002002250A0B0D0F0601050100800180EA49008101E003036F3139352E34362E3235332E3235333A313233353000038201706F6F6C313D2A2E6C6976657461622E736B7970653B706F6F6C323D7765622E6578747261732E736B7970653B706F6F6C333D6578747261732E646F776E6C6F6164732E736B7970653B706F6F6C343D2A2E736B79706566696E642E736B7970653B706F6F6C353D2A2E7072656D69756D2E736B7970653B706F6F6C363D2A2E6D756C74696D656469612E736B7970653B706F6F6C373D2A2E6D756C74696D656469612E6D657461636166653B706F6F6C383D2A2E6D756C74696D656469612E6461696C796D6F74696F6E3B706F6F6C393D2A2E6D756C74696D656469612E6D6574616F6D6E69747572653B706F6F6C31303D77686174736E65772E736B7970653B706F6F6C31313D7061792E736B7970653B706F6F6C31323D7365637572652E7061792E736B7970653B706F6F6C31333D2A2E70696373746F72653B706F6F6C31343D2A2E6D796163636F756E742E736B7970653B706F6F6C31353D2A2E62696269743B706F6F6C31363D2A2E70726F6363796265723B706F6F6C31373D747261636B696E672E6F6D6E69747572653B706F6F6C31383D676F2E736B7970653B706F6F6C31393D747261636B2E736B7970657C706F6F6C313D3139342E3139322E3139392E3235313A31323335303B706F6F6C323D3139342E3139322E3139392E3235323A31323335303B706F6F6C333D3139342E3139322E3139392E3235323A31323335303B706F6F6C343D3139342E3136352E3138382E3130313A31323335303B706F6F6C353D3139332E39352E3135342E31353A31323335313B706F6F6C363D3139342E3136352E3138382E3130303A31323335303B706F6F6C373D3139342E3136352E3138382E3130303A31323335303B706F6F6C383D3139342E3136352E3138382E3130303A31323335303B706F6F6C393D3139342E3136352E3138382E3130303A31323335303B706F6F6C31303D3230342E392E3136332E3134313A31323335303B706F6F6C31313D3139352E34362E3235332E3234353A31323335303B706F6F6C31323D3139352E34362E3235332E3234353A31323335303B706F6F6C31333D3139332E39352E3135342E31343A31323335313B706F6F6C31343D3139332E39352E3135342E31343A31323335313B706F6F6C31353D3139332E39352E3135342E31343A31323335313B706F6F6C31363D3139332E39352E3135342E31343A31323335313B706F6F6C31373D3139342E3136352E3138382E3130303A31323335303B706F6F6C31383D3139342E3136352E3138382E3130303A31323335303B706F6F6C31393D3139332E39352E3135342E31343A31323335310003B101706F6F6C313D2A2E6C6976657461622E736B7970653B706F6F6C323D7765622E6578747261732E736B797065206578747261732E646F776E6C6F6164732E736B7970653B706F6F6C333D2A2E687773746F72652E736B7970653B706F6F6C343D2A2E736B79706566696E642E736B797065202A2E6469726563746F72792E736B7970653B706F6F6C353D2A2E70696373746F7265202A2E6D796163636F756E742E736B797065202A2E6269626974202A2E70726F63637962657220747261636B2E736B79706520617070732E736B7970656173736574733B706F6F6C363D2A2E6D756C74696D656469612E736B797065202A2E6D756C74696D656469612E6D65746163616665202A2E6D756C74696D656469612E6461696C796D6F74696F6E202A2E6D756C74696D656469612E6D6574616F6D6E6974757265207777772E736B7970652077686174736E65772E736B7970653B706F6F6C373D7061792E736B797065207365637572652E7061792E736B7970653B706F6F6C383D6170692E736B7970653B706F6F6C393D63616C6C70686F6E65732E736B7970652063616C6C72617465732E736B7970653B706F6F6C31303D2A2E7072656D69756D2E736B7970653B706F6F6C31323D6C6F67732E736B7970653B706F6F6C31333D617661746172736572766963652E736B79706520636F6E74616374696D706F72742E736B7970653B706F6F6C31343D676F2E736B7970653B706F6F6C31353D747261636B696E672E6F6D6E69747572657C706F6F6C313D3139342E3139322E3139392E3235312C31323335302C312C4E4C2C77652C35302C313B706F6F6C323D3139342E3139322E3139392E3235322C31323335302C312C444B2C77652C35302C313B706F6F6C333D3139332E39352E3135342E31372C31323335312C312C49452C77652C35302C31203231322E3138372E3137322E36322C31323335312C312C49452C77652C35302C31203139352E34362E3235332E3232372C31323335312C312C4C552C77652C35302C31203231322E382E3136362E33332C31323335312C312C4C552C77652C35302C313B706F6F6C343D3139342E3136352E3138382E3130312C31323335302C312C49452C77652C35302C313B706F6F6C353D3139332E39352E3135342E31342C31323335312C312C49452C77652C35302C31203139352E34362E3235332E3230352C31323335312C312C4C552C77652C35302C31203231322E3138372E3137322E35392C31323335312C312C49452C77652C35302C31203231322E382E3136362E31392C31323335312C312C4C552C77652C35302C313B706F6F6C363D3139342E3136352E3138382E3130302C31323335302C312C49452C77652C35302C31203230342E392E3136332E3134302C31323335302C312C43412C6E612C35302C313B706F6F6C373D3139352E34362E3235332E3234352C31323335302C312C4C552C77652C35302C31203139332E39352E3135342E31362C31323335312C312C49452C77652C35302C31203231322E3138372E3137322E36312C31323335312C312C49452C77652C35302C31203231322E382E3136362E32302C31323335302C312C4C552C77652C35302C313B706F6F6C383D3230342E392E3136332E3138342C31323335302C312C43412C6E612C35302C312037382E3134312E3137372E38392C31323335302C312C4C552C77652C35302C313B706F6F6C393D3139342E3136352E3138382E3131352C31323335302C312C49452C77652C35302C31203230342E392E3136332E3134312C31323335302C312C43412C6E612C35302C313B706F6F6C31303D3139332E39352E3135342E31352C31323335312C312C49452C77652C35302C31203231322E3138372E3137322E36302C31323335312C312C49452C77652C35302C31203139352E34362E3235332E3232362C31323335312C312C4C552C77652C35302C31203231322E382E3136362E33322C31323335312C312C4C552C77652C35302C313B706F6F6C31323D37382E3134312E3137372E37362C31323335302C312C4C552C77652C35302C313B706F6F6C31333D3230342E392E3136332E3136372C31323335302C312C43412C6E612C35302C312037382E3134312E3137372E38312C31323335302C312C4C552C77652C35302C313B706F6F6C31343D3230342E392E3136332E3136382C31323335302C312C43412C6E612C35302C31203139342E3136352E3138382E3130302C31323335302C312C49452C77652C35302C313B706F6F6C31353D3230342E392E3136332E3136392C31323335302C312C43412C6E612C35302C31203139342E3136352E3138382E3130302C31323335302C312C49452C77652C35302C3100039701736B79706566696E642E736B7970653D31372C362C382C2D33392C3139206469726563746F72792E736B7970653D31372C362C382C2D33392C31390003A60138302E3235322E38352E37302C32333435362C312C6E6C2C77652C35302C312038302E3235322E38352E37312C32333435362C312C6E6C2C77652C35302C312038302E3235322E38352E37322C32333435362C312C6E6C2C77652C35302C31203139352E34362E3235332E3233382C32333435362C322C6C752C77652C35302C31203139352E34362E3235332E3233392C32333435362C322C6C752C77652C35302C31203139342E3136352E3138382E37342C32333435362C332C69652C77652C35302C31203139342E3136352E3138382E37352C32333435362C332C69652C77652C35302C31203231322E3138372E3137322E352C32333435362C342C69652C77652C35302C31203231322E3138372E3137322E32302C32333435362C342C69652C77652C35302C31203231322E3138372E3137322E33332C32333435362C342C69652C77652C35302C31203231322E382E3136332E38372C32333435362C362C6C752C77652C35302C31203231322E382E3136332E3132352C32333435362C362C6C752C77652C35302C31203231322E382E3136332E3132362C32333435362C362C6C752C77652C35302C31203133302E3131372E37322E3132362C32333435362C372C6E6C2C77652C35302C31203133302E3131372E37322E36362C32333435362C372C6E6C2C77652C35302C310004B2010B03A09C0125B3EA010B220104A5012A24A39C012102220025A19C010401F3C2011A142103030A220125B0EA0103051A2103030B2201030522010384012B39393030303131313A37382E3134312E3137372E39363A3233343536000086010C008701880E039101000493010CC2A5BC5C2774C32EFDD927740496010CD592BC1034504E8DB5F2345006C20105F801F901FA01FB01FC010395016272617465303D31206272617465313D31206272617465323D31206272617465333D31206272617465343D31206272617465353D31206272617465363D31206272617465373D31206272617465383D31207372617465303D31207372617465313D31207372617465323D31207372617465333D31207372617465343D31207372617465353D31207372617465363D31207372617465373D31207372617465383D310003B4013139342E3136352E3138382E37373A3132333530203231322E382E3136332E3130333A31323335300000C0010100C1010103CB012E6163636573732E736B7970652E6E65740000E1010F00F0010100F101A982CA950303D50137382E3134312E3137372E33383A3132333530203230342E392E3136332E3135313A31323335300003CF0137382E3134312E3137372E36393A3132333530203230342E392E3136332E3134393A31323335300000D6010103E4013139342E3136352E3138382E38303A3132333530203231322E382E3136362E353A31323335300003E5010000F8016403F7015B574845453A204F4646203130302C20563120302C20563220305D205B496E70757445513A204F46462035302C2056312035305D205B4945513A204F46462031362C2056312031322C2056322031322C2056332031322C2056342031322C2056352031322C2056362031322C2056372031325D205B53453A204453203130302C2057494F20305D205B5345323A2044532039302C2057494F2031305D205B414D504D3A204F4C442035302C20444147432035305D205B4B54523A204F46462035302C204F4E2035305D205B49414D323A204F46462039392C204D3120312C204D3220305D0003FA0152434F4E3D350003F901302F342E322E2A2E2A2C33322C3320302F352E302E2A2E2A2C31342C3320302F352E312E2A2E3130342C342C330003A80168747470733A2F2F7777775C2E70617970616C5C2E2E3F2E3F2E3F247C68747470733A2F2F696D616765735C2E70617970616C5C2E636F6D247C68747470733A2F2F7777775C2E70617970616C6F626A656374735C2E636F6D247C68747470733F3A2F2F2E2B5C2E666263646E5C2E6E6574247C68747470733F3A2F2F2E2B5C2E66616365626F6F6B5C2E636F6D247C68747470733F3A2F2F6368616E6E656C5C2E736B7970655C2E636F6D247C68747470733A2F2F617070735C2E736B7970655C2E636F6D247C68747470733F3A2F2F7161617070735C2E736B7970655C2E6E6574247C68747470733F3A2F2F636F6E6E6563745C2E66616365626F6F6B5C2E6E6574247C68747470733A2F2F2E2A5C2E736B7970656173736574735C2E636F6D247C68747470733A2F2F61645C2E646F75626C65636C69636B5C2E6E6574247C68747470733A2F2F61642D656D65615C2E646F75626C65636C69636B5C2E6E6574247C68747470733A2F2F61642D617061635C2E646F75626C65636C69636B5C2E6E6574247C68747470733A2F2F737461746963323F5C2E736B7970655C2E636F6D247C68747470733A2F2F7161737461746963323F5C2E736B7970655C2E6E6574247C68747470733A2F2F7072657374617469635C2E736B7970655C2E6E6574240003FF013078313030303230343030393136333231372D642D723230342E392E3136332E3231373A38313932203078313030303230343030393136333231392D642D723230342E392E3136332E3231393A38313932203078313030303230343030393136333232312D642D723230342E392E3136332E3232313A38313932203078313030303230343030393136333232332D642D723230342E392E3136332E3232333A38313932203078313030303230343030393136333232352D642D723230342E392E3136332E3232353A38313932203078313030303230343030393136333232372D642D723230342E392E3136332E3232373A38313932203078313030303230383038383138363030352D642D723230382E38382E3138362E353A38313932203078313030303230383038383138363030372D642D723230382E38382E3138362E373A38313932203078313030303230383038383138363030392D642D723230382E38382E3138362E393A38313932203078313030303230383038383138363031312D642D723230382E38382E3138362E31313A38313932203078313030303230383038383138363031332D642D723230382E38382E3138362E31333A38313932203078313030303230383038383138363031352D642D723230382E38382E3138362E31353A38313932203078313030303230383038383138363031372D642D723230382E38382E3138362E31373A38313932203078313030303230383038383138363031392D642D723230382E38382E3138362E31393A38313932203078313030303230383038383138363032312D642D723230382E38382E3138362E32313A38313932203078313030303230383038383138363032332D642D723230382E38382E3138362E32333A38313932203078313030303230383038383138363032352D642D723230382E38382E3138362E32353A38313932203078313030303230383038383138363032372D642D723230382E38382E3138362E32373A38313932203078313030303230383038383138363032392D642D723230382E38382E3138362E32393A38313932203078313030303230383038383138363033312D642D723230382E38382E3138362E33313A38313932203078313030303230383038383138363033332D642D723230382E38382E3138362E33333A38313932203078313030303230383038383138363033352D642D723230382E38382E3138362E33353A38313932203078313030303230383038383138363033372D642D723230382E38382E3138362E33373A38313932203078313030303230383038383138363033392D642D723230382E38382E3138362E33393A38313932203078313030303230383038383138363034372D642D723230382E38382E3138362E34373A38313932203078313030303230383038383138363034392D642D723230382E38382E3138362E34393A38313932203078313030303230383038383138363035312D642D723230382E38382E3138362E35313A38313932203078313030303230383038383138363035332D642D723230382E38382E3138362E35333A38313932203078313030303230383038383138363035352D642D723230382E38382E3138362E35353A38313932203078313030303230383038383138363035372D642D723230382E38382E3138362E35373A38313932203078313030303230383038383138363035392D642D723230382E38382E3138362E35393A38313932203078313030303230383038383138363036312D642D723230382E38382E3138362E36313A38313932203078313030303230383038383138363036332D642D723230382E38382E3138362E36333A38313932203078313030303230383038383138363035392D642D723230382E38382E3138362E36353A38313932203078313030303230383038383138363036312D642D723230382E38382E3138362E36373A38313932203078313030303230383038383138363036332D642D723230382E38382E3138362E36393A38313932203078313030303230383038383138363037312D642D723230382E38382E3138362E37313A38313932203078313030303230383038383138363037332D642D723230382E38382E3138362E37333A38313932203078313030303230383038383138363037352D642D723230382E38382E3138362E37353A38313932203078313030303230383038383138363037372D642D723230382E38382E3138362E37373A38313932203078313030303230383038383138363037392D642D723230382E38382E3138362E37393A38313932203078313030303230383038383138363038312D642D723230382E38382E3138362E38313A38313932203078313030303230383038383138363038332D642D723230382E38382E3138362E38333A38313932203078313030303230383038383138363038352D642D723230382E38382E3138362E38353A38313932203078313030303230383038383138363038372D642D723230382E38382E3138362E38373A38313932203078313030303230383038383138363038392D642D723230382E38382E3138362E38393A38313932203078313030303230383038383138363039312D642D723230382E38382E3138362E39313A38313932203078313030303230383038383138363039332D642D723230382E38382E3138362E39333A38313932203078313030303230383038383138363039352D642D723230382E38382E3138362E39353A38313932203078313030303230383038383138363039372D642D723230382E38382E3138362E39373A38313932203078313030303230383038383138363039392D642D723230382E38382E3138362E39393A38313932203078313030303230383038383138363130312D642D723230382E38382E3138362E3130313A38313932203078313030303230383038383138363130332D642D723230382E38382E3138362E3130333A38313932203078313030303230383038383138363130352D642D723230382E38382E3138362E3130353A38313932203078313030303230383038383138363130372D642D723230382E38382E3138362E3130373A38313932203078313030303230383038383138363130392D642D723230382E38382E3138362E3130393A38313932203078313030303230383038383138363131312D642D723230382E38382E3138362E3131313A38313932203078313030303230383038383138363131332D642D723230382E38382E3138362E3131333A38313932203078313030303230383038383138363131352D642D723230382E38382E3138362E3131353A38313932203078313030303230383038383138363131372D642D723230382E38382E3138362E3131373A38313932203078323030303134393030353034353031312D642D723134392E352E34352E31313A38313932203078323030303134393030353034353031332D642D723134392E352E34352E31333A38313932203078323030303134393030353034353031352D642D723134392E352E34352E31353A38313932203078323030303134393030353034353031372D642D723134392E352E34352E31373A38313932203078323030303134393030353034353031392D642D723134392E352E34352E31393A38313932203078323030303134393030353034353032312D642D723134392E352E34352E32313A38313932203078323030303134393030353034353032332D642D723134392E352E34352E32333A38313932203078323030303134393030353034353032352D642D723134392E352E34352E32353A38313932203078323030303134393030353034353032372D642D723134392E352E34352E32373A38313932203078323030303134393030353034353032392D642D723134392E352E34352E32393A38313932203078323030303134393030353034353033312D642D723134392E352E34352E33313A38313932203078323030303134393030353034353033332D642D723134392E352E34352E33333A38313932203078323030303134393030353034353033352D642D723134392E352E34352E33353A38313932203078323030303134393030353034353033372D642D723134392E352E34352E33373A38313932203078323030303134393030353034353033392D642D723134392E352E34352E33393A38313932203078323030303134393030353034353034312D642D723134392E352E34352E34313A38313932203078323030303134393030353034353034332D642D723134392E352E34352E34333A38313932203078323030303134393030353034353034352D642D723134392E352E34352E34353A38313932203078323030303134393030353034353034372D642D723134392E352E34352E34373A38313932203078323030303134393030353034353034392D642D723134392E352E34352E34393A38313932203078323030303134393030353034353035312D642D723134392E352E34352E35313A38313932203078323030303134393030353034353035332D642D723134392E352E34352E35333A38313932203078323030303134393030353034353035352D642D723134392E352E34352E35353A38313932203078323030303134393030353034353035372D642D723134392E352E34352E35373A38313932203078323030303134393030353034353035392D642D723134392E352E34352E35393A38313932203078323030303134393030353034353036312D642D723134392E352E34352E36313A38313932203078323030303134393030353034353036332D642D723134392E352E34352E36333A38313932203078323030303134393030353034353036352D642D723134392E352E34352E36353A38313932203078323030303134393030353034353036372D642D723134392E352E34352E36373A38313932203078323030303134393030353034353036392D642D723134392E352E34352E36393A38313932203078323030303134393030353034353037312D642D723134392E352E34352E37313A38313932203078323030303134393030353034353037332D642D723134392E352E34352E37333A38313932203078323030303134393030353034353037352D642D723134392E352E34352E37353A38313932203078323030303134393030353034353037372D642D723134392E352E34352E37373A38313932203078323030303134393030353034353037392D642D723134392E352E34352E37393A38313932203078323030303134393030353034353038312D642D723134392E352E34352E38313A38313932203078323030303134393030353034353038332D642D723134392E352E34352E38333A38313932203078323030303134393030353034353038352D642D723134392E352E34352E38353A38313932203078323030303134393030353034353038372D642D723134392E352E34352E38373A38313932203078323030303134393030353034353038392D642D723134392E352E34352E38393A38313932203078323030303134393030353034353039312D642D723134392E352E34352E39313A38313932203078323030303134393030353034353039332D642D723134392E352E34352E39333A38313932203078323030303134393030353034353039352D642D723134392E352E34352E39353A38313932203078323030303134393030353034353039372D642D723134392E352E34352E39373A38313932203078323030303134393030353034353039392D642D723134392E352E34352E39393A38313932203078323030303134393030353034353130312D642D723134392E352E34352E3130313A38313932203078323030303134393030353034353130332D642D723134392E352E34352E3130333A38313932203078323030303134393030353034353130352D642D723134392E352E34352E3130353A38313932203078323030303134393030353034353130372D642D723134392E352E34352E3130373A38313932203078323030303134393030353034353130392D642D723134392E352E34352E3130393A38313932203078323030303134393030353034353131312D642D723134392E352E34352E3131313A38313932203078323030303134393030353034353131332D642D723134392E352E34352E3131333A38313932203078323030303134393030353034353131352D642D723134392E352E34352E3131353A38313932203078323030303134393030353034353131372D642D723134392E352E34352E3131373A38313932203078323030303134393030353034353131392D642D723134392E352E34352E3131393A38313932203078323030303134393030353034353132312D642D723134392E352E34352E3132313A38313932203078323030303134393030353034353132332D642D723134392E352E34352E3132333A38313932203078323030303134393030353034353132352D642D723134392E352E34352E3132353A38313932203078323030303134393030353034353132372D642D723134392E352E34352E3132373A38313932203078323030303134393030353034353132392D642D723134392E352E34352E3132393A38313932000089020A062E19AEBFD5A40B80D4B6B30280D2AFF205808CFD910B80DEB9F1048FA486F4049CA486F404D5A486F404ACC686F404C2C686F404878F87F404CEB887F404ADC487F404BCC687F404D4D087F404F9EA87F4049CF587F404C8F487F404C9F487F404CAF487F404EACCBB9C05F7CCBB9C05E694D7BB058E96D7BB05A896D7BB050094023C0095021400930201039902536B79706520546563686E6F6C6F6769657320534100008E0200008F0280BAB70300910280A30503F2013231332E3134362E3138392E3230313A3132333530203231332E3134362E3138392E3230323A3132333530203231332E3134362E3138392E3230333A3132333530203231332E3134362E3138392E3230343A3132333530203231332E3134362E3138392E3230353A3132333530203231332E3134362E3138392E3230363A3132333530203231322E3136312E382E31303A3132333530203231322E3136312E382E323A3132333530203231322E3136312E382E333A3132333530203231322E3136312E382E343A3132333530203231322E3136312E382E353A3132333530203231322E3136312E382E363A31323335300000FC010106FD0106011E64AC02A403E807009002C20103C301687474703A2F2F37392E3132352E36332E3732247C68747470733F3A2F2F2E2B5C2E66616365626F6F6B5C2E636F6D240000DE0148</_2>
-      <_256>000010011AC0AA3BA66DF7FB48228AE35F9BB4A032FE4A6A898DA7A1A5AE37DC59FB3D09607F1CACD46A5DBC008DABF8F09C797DF5A8903307D04C318825CEA7C481303C655A9EEE099E9A0AF1158373B458BB8FDACB336A6EC63C043E6782688E2350B417DDDDFF96B474DAEA7D1DF3742303B79111FC752BFB5D6887A5B822F945CC761FAF6E80DE5EC60868768CB8A9F9C876137806DCEA0DD1300181558ABFDBA26592078F5F84195C526D8C7F339EF82700FD93F8FB71ADA5ED3E977D27FA52D1F489EF5DA0A9E00B146BADCBDEBFB0DFEBCD61E5B8352A49893357E0DC3A736743929DA975782EA4D8184605FD064641986C47706D264281C876F926BF58003E9E</_256>
-      <_3>0000100498ECF8A7A4585F76C930739A1EAE590DE96D9EF3AA9B231E67965F3F08ECFC493E1DA23ECDE17A85C94CBE034E88F9414E9BBC82F32AAFCFFB2C09F6F57A478238BAEC9EEF2BB9C67F71257722E6786D88D6400F6B7D81450FB3B6CCCC3986E3782D2387E354EBA9099331AEF510D479C6601D2383D866E2B5B525DF0BA975D58C120EFAE88C89EE365FC696CC891B77F67CFA18FDE8E95DDAC25A7C7D70FA7A1414BAE593856A658888C622836006C1C131B4B2E805554DCFA52F3EFD34C1B759BF8A302E491835DCE701E84D37ED150C8ADD699AD3DCA9F515123C5B5AD94E253E173BA3465E64A0079D5EF4E6075E66D0F5FBC3D9BC25C4E80C4CB2FE9B87040003000004D00F0005D00F050041040400B80125C20003141B14230025D50003031B14230024E100142300250003191714230025EA0003141714230025EA00011724EA00140A14230025E400030F1C14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025E10025E10003A006100A0309031725000325180C0A25C20003140B0C03040D0A03882725C3000C0A03E43225C4000C0A0602050228038407DC08FA1E0601050102050203FA1E1C0603250028061D1E1F202122060105010205010503050141060300636F756E74206279207175616C697479000001CC080002040003000004010005010501410603006261647175616C69747920636F756E742062792076657273696F6E000001D6080002070003000004010005010501410603006261647175616C6974792073756D2062792076657273696F6E000001E0080002070003000004010005010500410304005424E400142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025E40025E40028043CB401D804901C060105010205014106030073756D206F66206C61737463616C6C206475726174696F6E73000001B009000201000300000480A3050005B054050141060300636F756E74206279206C61737463616C6C206475726174696F6E000001BA090002050003000004010005010500410204005025EB00011C142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025EB0028031E32D0000601050102050141060300636F756E742062792073797374656D20637075207573616765000001940A0002040003000004010005010500410204004F25EC00011C142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025EC0028030F1E320601050102050141060300636F756E742062792070726F63657373206370752075736167650000019E0A0002040003000004010005010500410304006824C20014230024E60014230025E600011A14230025EC00011C142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025EC0028030F1E320601050102050125C2000501410603006A6974746572636F756E742062792070726F6365737320637075207573616765000001F80A0002040003000004010005010501410603006A69747465722062792070726F6365737320637075207573616765000001820B0002040003000004D00F0005D00F0500410304004424E700142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A1423000225E700050141060300706F74656E7469616C207463702066616C6C6261636B73000001DC0B00020100030000040100050105014106030061637475616C207463702066616C6C6261636B73000001E60B00020100030000040100050105004103040056240C142300250C030A1814230025EA0003141714230025EA00011724EA00140A14230024E70014230025E700011A14230024E50014230025E500011C0602250C29050306070809280401020405060105010205010502050141060300636F756E74206279206E617474797065000001C00C0002050003000004010005010501410603007564706661696C75726573206279206E617474797065000001CA0C0002050003000004010005010500410204001B25D90014230025D90025DA000B0602050228030102040601050102050141060300636F756E74206279206E726F666D756C74696368617473000001A40D0002040003000004010005010500410304001425F700011C14230025000319171423000225F90005014106030075736572732077686F206861766520636F6D706C65746564204943000001880E0002010003000004010005010501410603006C617374204943207969656C6420676C6F62616C73756D000001920E0002010003000004E8070005500500410304001224F60014230025000319171423000225F60005014106030075736572732077686F206861766520494320737570706F7274000001EC0E0002010003000004010005010501410603004943207374617274757020636F756E7420676C6F62616C73756D000001F60E00020100030000046400051405004102040025240C142300250C030A18142300250C011C142300250C280802030405060708090601050102050141060300636F756E74206279206E617474797065000001D00F0002090003000004010005010500410404001A250003191714230025E20025E30025FC00280201020601050102050141060300766964656F2073656E642063617061626C650000019811000201000300000401000501050141060300766964656F20706172616C6C656C2063616C6C730000019911000201000300000414000502050141060300636F756E7420627920766964656F2063616C6C73206D616465000001A2110002030003000004010005010500410204003A250003191714230025EA0003141714230025EA00011724EA00140A14230024E50014230025E50003031914230025E50028030102030601050102050141060300636F756E742062792073747265616D7472616E73706F7274000001FC11000204000300000401000501050041090400E00125C20003141B25E400030F1C1514230024E100142300250003191714230025EA0003141725EA0001171514230025FF002580010A011A14230025E60003031A25E50003031A1514230024F5001423002412142300249F0114230025C30025E10025E10003A006100A03A0060B0309031725000325180C0A25C20003140B0C03040D0A2512030A0C251025F5001703CC080C0A1C160602020502250003231B241D150603050305020503150503251D03808080808080808080011D14150603050305020503150503251D038080808080808080C0011D1415060305030502050315050141060300706F74656E7469616C2052555F756E65787065637465645F62616471000001E01200020100030000040100050105014106030061637475616C2052555F756E65787065637465645F62616471000001EA1200020100030000040100050105014106030042435020706F74656E7469616C2052555F756E65787065637465645F62616471000001F4120002010003000004010005010501410603004243502061637475616C2052555F756E65787065637465645F62616471000001FE12000201000300000401000501050141060300424350203220706F74656E7469616C2052555F756E65787065637465645F62616471000001881300020100030000040100050105014106030042435020322061637475616C2052555F756E65787065637465645F626164710000019213000201000300000401000501050141060300424350203420706F74656E7469616C2052555F756E65787065637465645F626164710000019C130002010003000004010005010501410603004243502031362061637475616C2052555F756E65787065637465645F62616471000001A6130002010003000004010005010500410304000825B801011C25B701050141060300757365727320696E207075626C6963206368617473000001C4130002010003000004010005010501410603007075626C69632063686174206D6573736167657320696E206C617374206D696E757465000001CE1300020100030000046400050A0500410404005F248E0114230024D5001423002500032B1B1423002500032B1C250D03021C16250E03FFFFFFFF0F1D03B4E2C8F10217250E0380808080100D03B4E2C8F10217151614230025D500280219C80106010501020501258E010501258E0103880E1C050141060300636F756E742062792062756464696573000001A814000203000300000401000501050141060300617661696C6162696C697479206167652062792062756464696573000001B2140002030003000004C0FC150005A099020501410603006C6F6E6720617661696C6162696C697479206167652062792062756464696573000001BC140002030003000004010005010500410204003324C000142300250003191714230025F301290300E5C68583B7AEDE36F2CAB9A3A7AE983806020502280202030601050125C00005014106030073696D756C74616E656F75732063616C6C7320706572206E616D6573706163650000018C15000203000300000419000519050041020400C50125C00006020502142300250006030503031917142300050303231B06040504210302200225A1010605050421030502200225A2010606030606070505021A050503021A160506021A15210305072002010607050203021B050603021B152103050720020206070502021A050603021B15210305072002030206070502021A050503041A15210305072002030306070502021A050503031A15210305072002030406070502021A050503051A152103050720020305060705072806010203040506060105010205014106030063616C6C6572733A207332735F313120636F6E665F686F737420636F6E665F636C69656E7420736B7970656F757420736B797065696E20766F6963656D61696C20756E6B6E6F776E000001F015000207000300000401000501</_3>
-      <_4>000010052A0B6759B71FBC1EF05BE97DFEA4EE6C1E15AF19ED70DEC1130B14C13CE41246D302B9662592907E3CA508A57702B5C00C2A05170857FA22012E0F235B425B4D919B23A541D3AD6E948FC634DE71A29493634884DFD5E9D89C5D951CBCD71B9B3ABFD3C4E2779BB1817D76E7C223CA36BD75A6A05B730AF138057E4048B2FFDD522BB588EC0B9D3E014BF9E354EB608150BC613C739D9E8C7465F05F047FAF7AFA3EE89B9B58BF0FC35F07B55CF3E4B59A7C4ED48B1C0C7F0305E6AC2E80AAEAD6064EB6ACDC1806FCE0B5CB66F0840DA7F0FE7B228E3898E3E42A9AFEFE13DDF019EF8D8F02A631AF2615BBC6E1EDB65C89A775F642C88109E6247EC4B463DC302E2A2E323000050541020006020307322E302E2A2E3100050541030006020307322E302E2A2E3200000AE4ED8009050541030006020307322E302E2A2E33000009B3E6CC990B050541040006020307322E302E2A2E3400000AE4ED8009000BA00B050541030006020308322E302E2A2E35000307322E302E2A2E3900050541040006020308322E302E2A2E39000307322E302E2A2E313100000AE4ED8009050541040006020308322E302E2A2E3131000307322E302E2A2E3135000009E6CC99B306050541050006020308322E302E2A2E3135000307322E302E2A2E323000000AE4ED8009000BA00B050041050303557067726164655465737433000301332E302E302E3130300003044E6963654272616E6400050541040006020307332E302E302E2A0003074E6963654272616E6400000AE4ED8009050541040006020307322E302E302E2A0003074E6963654272616E6400000AE4ED80090500410E0303557067726164655465737433000301332E302E302E31303000050541040006020307332E302E302E39390003074F746865724272616E6400000AE4ED8009050541040006020307322E302E302E39390003074F746865724272616E6400000AE4ED8009050541040006020307332E302E302E39380003074F746865724272616E64000009B3E6CC990B050541040006020307322E302E302E39380003074F746865724272616E64000009B3E6CC990B050541050006020307332E302E302E39370003074F746865724272616E6400000AE4ED8009000BA00B050541050006020307322E302E302E39370003074F746865724272616E6400000AE4ED8009000BA00B050541030006020307332E302E302E393900000AE4ED8009050541030006020307322E302E302E393900000AE4ED8009050541030006020307332E302E302E3938000009B3E6CC990B050541030006020307322E302E302E3938000009B3E6CC990B050541040006020307332E302E302E393700000AE4ED8009000BA00B050541040006020307322E302E302E393700000AE4ED8009000BA00B0500410303033130303031000301302E302E302E313000050541020006020307302E302E302E3900</_4>
-      <_5>00001006739CA527EF827847E16F23CD52458C3EBA3460A42935EC6948BEFA626B49E3BDF279FC62486E2DDBCA19609ED23D31F4E5175920F282AD74A74A997C3909E67B622480C68A058E886C7D5F3C40954880D7798CD61CEA0FBAFB389BE5B2B8A887348F7AADB4DF642B194B814047CDA0E698EDDE61DFA731DCA5883A76F913D8C94066718054E85ADA7AE009F2B2A9AF762FDCB9B6CAF64C156911E3AB172CFD795F66FB6E8E15048A54E4AB17979D6C447DEBADE75CC6F606050D980061112AFF9AE7C7BF8065D711949E41FA4C8B6CBF0916BB395B3E186A7D617D353C6BFFC687FE79475DFA095D113D70B828FB597BC3665B7C9C3669CA9CBE5D308D3FC23803044E45544745415200050541020006040307302E392E302E2A000500410503033130303033000301312E302E302E3137000304534D4300050541020006040307302E392E302E313200050541020006020307302E392E302E3230000500410503033130303033000301312E312E302E313000030442454C4B494E00050541020006040307302E392E302E313200050541020006020307302E392E302E3230000500410503033130303033000301312E302E302E3137000304454447452D434F524500050541020006040307302E392E302E313200050541020006020307302E392E302E3230000500410503033130303033000301312E302E302E31330003044C4F474954454300050541020006040307302E392E302E313200050541020006020307302E392E302E3230000500410503033130303035000301312E342E38382E31333636000304544F50434F4D00050541020006040307312E342E38382E3133353600050541020006020307312E342E38382E31333635000500410503033130303035000301312E342E38382E313336360003045043484F4D4500050541020006040307312E342E38382E3133353600050541020006020307312E342E38382E31333635000500410403033130303036000301302E302E302E313000050541020006040307302E302E302E3500050541020006020307302E302E302E39000500410503033130303037000301312E302E312E330003045445434F00050541020006040307312E302E302E3800050541020006020307312E302E312E31000500410503033130303038000301302E392E332E3339370003044C494E4B53595300050541020006040307302E382E332E2A00050541020006020307302E392E332E333932000500410503033130303038000301302E392E332E3339370003044E45544745415200050541020006040307302E382E332E2A00050541020006020307302E392E332E333932000500410503033130303038000301302E392E332E3339370003045048494C49505300050541020006040307302E382E332E2A00050541020006020307302E392E332E333932000500410403033130303130000301302E392E302E31310003044C494E4B53595300050541020006040307302E392E302E3130000500410403033130303130000301302E392E302E313100030442554646414C4F00050541020006040307302E392E302E3130000500410503033130303132000301312E302E302E310003044353544E00050541020006040307302E302E302E3500050541020006020307302E302E302E39000500410503033130303133000301302E302E332E3234000304414B00050541020006040307302E302E312E323400050541020006020307302E302E322E3234000500410303033130303134000301312E372E34332E33382E3200050541020006040307312E372E32332E32372E34000500410503033130303135000301312E322E31372E30000304415A5445434800050541020006040307312E322E31312E3000050541020006020307312E322E31352E30000500410303033130303230000301312E302E302E343700050541030006020308312E302E302E3233000307312E302E302E3233000500410403033130303234000301332E322E302E323800050541030006040308332E302E302E35000307332E302E302E3500050541030006020308332E312E302E31000307332E322E302E38000500410503033130303232000301302E302E302E3900030450414E41534F4E494300050541020006040307302E302E302E3100050541020006020307302E302E302E38000500410503033130303232000301302E302E302E3900030450414E41534F4E4943434F4E53554D455200050541020006040307302E302E302E3100050541020006020307302E302E302E3800</_5>
-    </BCM>
-    <BackboneInited>1</BackboneInited>
-    <Chat>
-      <FriendlyNameMaxSize>400</FriendlyNameMaxSize>
-    </Chat>
-    <Connection>
-      <Bandwidth>
-        <CurSlotLength>8118</CurSlotLength>
-        <InHistory>39,64,8184</InHistory>
-        <OutHistory>37,50,13164</OutHistory>
-      </Bandwidth>
-      <DisablePort80>1</DisablePort80>
-      <EventServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </EventServers>
-      <Firewall>
-        <TcpInHistory>-1431699456</TcpInHistory>
-        <UdpInHistory>-1431699456</UdpInHistory>
-        <UdpOutHistory>1610612735</UdpOutHistory>
-      </Firewall>
-      <HostCache>41C801050041050200D9AF0D45D9E900010400028788BCED0400038788BCED04000400050041050200BB0AB3FDD1A40001040002B7DCBCED040003B7DCBCED040004000500410502005C3766C2DA6B00010400029FB2BCED0400039FB2BCED04000400050041050200D9F8DC20CA33000104000296DAAAED04000396DAAAED0400040005004105020063847B3765900001040002D794BDED040003D794BDED040004000500410502004E80142FD3C70001040002CF86BDED040003CF86BDED04000400050041050200C3B213EA24A50001040002BF89BBED040003BF89BBED040004000500410502006FFEF1BA804C0001040002CF86BDED040003CF86BDED0400040005004105020052ED923CB3A700010400028788BCED0400038788BCED040004000500410502005243330D305B000104000283FFB2ED04000383FFB2ED040004000500410502006FF9438E9E5D0001040002CF86BDED040003CF86BDED04000400050041050200585515F19D77000104000283FFB2ED04000383FFB2ED04000400050041050200729EE3A8DD460001040002CF86BDED040003CF86BDED040004000500410502004572795D3BB300010400029FB2BCED0400039FB2BCED040004000500410502009F94D72CABA40001040002CF86BDED040003CF86BDED0400040005004105020095052D9C81090001040002B7DCBCED040003B7DCBCED040004000500410502005859A15FD7FC0001040002DC8FB5ED040003DC8FB5ED0400040005004105020059D7AB3EBBFB0001020002F8FABCED040003CF86BDED04000400050041050200BB2481B9390E0001040002CF86BDED040003CF86BDED0400040005004105020059D7F395A7BA0001040002B7DCBCED040003B7DCBCED040004000500410502006DC4BEF5D52E0001040002B0DFBAED040003B0DFBAED040004000500410502004B6E709CF4290001040002B7DCBCED040003B7DCBCED040004000500410502007A7D5CEC2B8D0001040002CF86BDED040003CF86BDED040004000500410502006FFFA8AFB19D0001040002B7DCBCED040003B7DCBCED040004000500410502003E4475A07A6F0001040002B7DCBCED040003B7DCBCED040004000500410502003EDD8384A4F90001040002BF89BBED040003BF89BBED04000400050041050200560FBFA4E4900001040002B7DCBCED040003B7DCBCED04000400050041050200C24FAEEE43F10001040002B3CEB5ED040003B3CEB5ED040004000500410502004F378778C6F30001040002CF86BDED040003CF86BDED04000400050041050200C94418BB0EDF0001040002B7DCBCED040003B7DCBCED040004000500410502003B75A58BECB30001040002CF86BDED040003CF86BDED04000400050041050200772A7A0908890001040002CF86BDED040003CF86BDED0400040005004105020048BB63586DE100010400029088BCED0400039088BCED040004000500410502005544F881BEDA000104000283FFB2ED04000383FFB2ED040004000500410502005B4C1468EDF80001040002B7DCBCED040003B7DCBCED04000400050041050200538BAF3F934F0001040002B3CEB5ED040003B3CEB5ED0400040005004105020055D6F93A4FD70001040002D7B3BBED040003D7B3BBED04000400050041050200D5D64561E55F00010400028788BCED0400038788BCED0400040005004105020046ADF229B8570001040002CF86BDED040003CF86BDED04000400050041050200D5151C19FFD600010200029FB2BCED040003B7DCBCED04000400050041050200973CA35DB82400010400029FB2BCED0400039FB2BCED04000400050041050200C249E5B953700001040002CF86BDED040003CF86BDED04000400050041050200722C69D8C4F500010400029FB2BCED0400039FB2BCED0400040005004105020058CBB311F2400001040002DC8FB5ED040003DC8FB5ED040004000500410502004BB7A090766E0001040002CF86BDED040003CF86BDED040004000500410502007DEF80FBEBD90001040002EFDDBBED040003EFDDBBED0400040005004105020076A03698F87A0001040002CF86BDED040003CF86BDED0400040005004105020050E5DFDD0C700001040002CF86BDED040003CF86BDED040004000500410502004D4C85E0CEC80001040002CF86BDED040003CF86BDED040004000500410502006FEA6BCD92A10001020002F8FABCED040003CF86BDED0400040005004105020043BAA930F28600010400029FB2BCED0400039FB2BCED04000400050041050200722DB82DDB780001040002CF86BDED040003CF86BDED0400040005004105020052E995118B9F0001040002CF86BDED040003CF86BDED040004000500410502005403013B36D20001040002EFDDBBED040003EFDDBBED04000400050041050200B27C0C920B260001040002B7DCBCED040003B7DCBCED04000400050041050200D9AF0997A7450001040002BCD9AAED040003BCD9AAED04000400050041050200BC00130BB5F60001040002CF86BDED040003CF86BDED04000400050041050200591FF23B53830001040002CF86BDED040003CF86BDED04000400050041050200557EB01367590001040002CF86BDED040003CF86BDED04000400050041050200505F157093A2000102000297A4BCED04000397A4BCED040004000500410502003A036C495C670001040002CF86BDED040003CF86BDED0400040005004105020050D8CF0B7D480001040002B7DCBCED040003B7DCBCED040004000500410502004E34E4D0FF250001040002B7DCBCED040003B7DCBCED040004000500410502007A1E50A46E770001040002CF86BDED040003CF86BDED040004000500410502005F18C666CBB80001040002EFDDBBED040003EFDDBBED04000400050041050200C19335603A9E0001040002DC8FB5ED040003DC8FB5ED0400040005004105020097142BD7DF890001040002AFDFBAED040003AFDFBAED0400040005004105020052F3355FFED400010400029FB2BCED0400039FB2BCED04000400050041050200BCBA857EECDF0001040002D7B3BBED040003D7B3BBED04000400050041050200729259D605EF0001040002CF86BDED040003CF86BDED04000400050041050200BEC2F57655B300010400029FB2BCED0400039FB2BCED040004000500410502005BD905C8304B0001020002A8EEBBED0400038788BCED0400040005004105020055F2C0360F360001040002EFDDBBED040003EFDDBBED0400040005004105020082C01DB9605D00010400028788BCED0400038788BCED04000400050041050200BC73B8FB30360001040002CF86BDED040003CF86BDED0400040005004105020050390E32DF8B0001040002B0DFBAED040003B0DFBAED040004000500410502005BCE8A2D7B8000010400028788BCED0400038788BCED0400040005004105020042292BB45D2D0001040002CF86BDED040003CF86BDED040004000500410502004F1A354DCA9A00010400029FB2BCED0400039FB2BCED04000400050041050200591C1D7F0EC900010400028788BCED0400038788BCED04000400050041050200722E9D2CCB030001040002CF86BDED040003CF86BDED04000400050041050200443AB71D3F8A0001040002CF86BDED040003CF86BDED0400040005004105020018DEF34EB70600010400028788BCED0400038788BCED0400040005004105020097215860080F00010400029FB2BCED0400039FB2BCED040004000500410502007229C156A49E0001040002B7DCBCED040003B7DCBCED040004000500410502003A72EDECB0250001040002B3F7B4ED040003B3F7B4ED04000400050041050200D52F8CD18F640001040002E285B0ED040003E285B0ED040004000500410502006B0325208B4C0001040002EFDDBBED040003EFDDBBED040004000500410502005164424285660001040002938AB5ED040003938AB5ED04000400050041050200D4E9D6AB12F80001040002AFDFBAED040003AFDFBAED0400040005004105020059B3090F459C0001040002FCDDAAED040003FCDDAAED04000400050041050200BC10C41E7AAB0001040002CF86BDED040003CF86BDED040004000500410502009F9532B560C100010400028788BCED0400038788BCED0400040005004105020050EA7B4A63750001040002CF86BDED040003CF86BDED0400040005004105020045A658245E790001040002CF86BDED040003CF86BDED0400040005004105020047E3059299620001040002CF86BDED040003CF86BDED0400040005004105020081164AFC3B450001040002CF86BDED040003CF86BDED040004000500410502005703C3FC60FF00010400028788BCED0400038788BCED0400040005004105020063FAEB02F39300010400028788BCED0400038788BCED040004000500410502005714F2D9F6650001020002AFDFBAED040003ECE7BAED04000400050041050200505F1B22B00D0001040002CF86BDED040003CF86BDED0400040005004105020062C2F2A80C7900010400029FB2BCED0400039FB2BCED04000400050041050200425CA6CCD1FF0001040002CF86BDED040003CF86BDED0400040005004105020084C778D4AB110001040002CF86BDED040003CF86BDED040004000500410502005106437CD3B60001040002CF86BDED040003CF86BDED0400040005004105020058506B2B47D40001040002D7B3BBED040003D7B3BBED04000400050041050200DD70204563390001040002B7DCBCED040003B7DCBCED040004000500410502005CFFA5BE4A0000010200028888BCED040003F8FABCED0400040005004105020089BD8692E0400001040002B7DCBCED040003B7DCBCED040004000500410502004AC12BB2AB8D0001040002B7DCBCED040003B7DCBCED04000400050041050200DB555CBAEE6B0001040002CF86BDED040003CF86BDED0400040005004105020095052D8F81090001020002A7FDBCED040003CF86BDED04000400050041050200473AA0E1C9110001020002A7FDBCED040003CF86BDED040004000500410502004EFA971D2E4C0001040002B7DCBCED040003B7DCBCED04000400050041050200BCE6C5A829D900010400029E90B5ED0400039E90B5ED0400040005004105020051699F18DC540001040002D7B3BBED040003D7B3BBED040004000500410502005CFB85D7E6460001040002B3CEB5ED040003B3CEB5ED0400040005004105020052D17CE5A9840001040002BF89BBED040003BF89BBED0400040005004105020054DD54C818F20001040002CF86BDED040003CF86BDED040004000500410502005C3555EBDC670001040002B7DCBCED040003B7DCBCED0400040005004105020051D92EE554370001040002BF89BBED040003BF89BBED0400040005004105020095549556182D0001040002CF86BDED040003CF86BDED040004000500410502005419C1F7F52A0001040002B3CEB5ED040003B3CEB5ED040004000500410502008C7259638E1D0001040002B7DCBCED040003B7DCBCED04000400050041050200516745231C2200010400029FB2BCED0400039FB2BCED0400040005004105020055FB3DEAE2380001040002B7DCBCED040003B7DCBCED040004000500410502005D5470BCB83A00010400028788BCED0400038788BCED0400040005004105020054C6D511E6810001040002CF86BDED040003CF86BDED0400040005004105020062A7FAC0119000010200028788BCED0400038888BCED040004000500410502007225A1DCFB1A00010200028788BCED0400038888BCED04000400050041050200708B358CF15C00010400028788BCED0400038788BCED04000400050041050200D9A293C3FE550001040002AFDFBAED040003AFDFBAED04000400050041050200722119BAFCB600010400029FB2BCED0400039FB2BCED0400040005004105020054369C95EAC60001040002CF86BDED040003CF86BDED04000400050041050200AE74419813810001040002B7DCBCED040003B7DCBCED0400040005004105020048C613BC68510001040002EFDDBBED040003EFDDBBED04000400050041050200516E168D638B0001040002EFDDBBED040003EFDDBBED040004000500410502001819CFB484D20001040002CF86BDED040003CF86BDED04000400050041050200ADE013B3E9F10001040002CF86BDED040003CF86BDED040004000500410502005C708ABFAC890001040002B3CEB5ED040003B3CEB5ED04000400050041050200BC81882E891C0001040002B7DCBCED040003B7DCBCED0400040005004105020057785543EB480001040002CF86BDED040003CF86BDED040004000500410502006FF0CE6CB4500001040002CF86BDED040003CF86BDED040004000500410502005CE13B7199D4000102000283ADE7E304000383ADE7E30400040005004105020063F610137D170001040002B7DCBCED040003B7DCBCED04000400050041050200DC887BC89E210001040002CF86BDED040003CF86BDED040004000500410502005D9324151E7F0001020002A7FDBCED040003CF86BDED04000400050041050200BC02D363924D00010400029FB2BCED0400039FB2BCED040004000500410502004F28848E1AC50001040002CF86BDED040003CF86BDED0400040005004105020054C606DD0D260001040002D984B5ED040003D984B5ED04000400050041050200D5F586558C850001040002BF89BBED040003BF89BBED0400040005004105020082582B0468CF00010400028788BCED0400038788BCED040004000500410502005CE21BB9BD7C00010400029FB2BCED0400039FB2BCED0400040005004105020059A9ACE3BC02000104000296DAAAED04000396DAAAED040004000500410502005557DB28EDA300010400028788BCED0400038788BCED0400040005004105020076ABA00FF52C0001040002CF86BDED040003CF86BDED0400040005004105020052185C5CB8440001040002B7DCBCED040003B7DCBCED04000400050041050200441402A770A800010200028788BCED0400038888BCED04000400050041050200516623CC99760001040002CF86BDED040003CF86BDED040004000500410502005A3D6D867C2A0001040002BF89BBED040003BF89BBED04000400050041050200BC70864FCE530001040002B3F7B4ED040003B3F7B4ED040004000500410502005E9C9B4E7A740001040002CF86BDED040003CF86BDED0400040005004105020058ABF63F0EA70001040002FCDDAAED040003FCDDAAED040004000500410502005556BDBE86AC000104000286FFB2ED04000386FFB2ED0400040005004105020059D0D49C9B8000010400028788BCED0400038788BCED0400040005004105020059A934952E920001040002B3F7B4ED040003B3F7B4ED040004000500410502007220ABEC82C80001040002B7DCBCED040003B7DCBCED04000400050041050200807AB45544310001040002BF89BBED040003BF89BBED04000400050041050200187A8DFCCDCF0001040002BF89BBED040003BF89BBED04000400050041050200616B5C35801000010400028788BCED0400038788BCED040004000500410502005ABCE5EAE3790001040002938AB5ED040003938AB5ED0400040005004105020048DF5F3311D10001020002F8FABCED040003CF86BDED04000400050041050200D3146B24D6340001040002CF86BDED040003CF86BDED0400040005004105020059037023AC7D00010400029FB2BCED0400039FB2BCED040004000500410502003EDD92C929340001040002BF89BBED040003BF89BBED040004000500410502004C4EB0C1270D0001040002CF86BDED040003CF86BDED04000400050041050200BCA300CD17370001040002CF86BDED040003CF86BDED040004000500410502005BC42D9E789A0001040002D7B3BBED040003D7B3BBED04000400050041050200589755D3E75F0001020002D884B5ED040003B3CEB5ED040004000500410502007A7CC86B21530001040002CF86BDED040003CF86BDED040004000500410502005352A2DA24D300010400028788BCED0400038788BCED0400040005004105020058C9F9B6A86F0001040002B7DCBCED040003B7DCBCED040004000500410502005706A79DEAE60001020002AFDFBAED040003ECE7BAED0400040005004105020082D1B28F7A3A0001040002CF86BDED040003CF86BDED0400040005004105020052217343E79C0001040002CF86BDED040003CF86BDED0400040005004105020082CEA3A289FE000104000296DAAAED04000396DAAAED04000400050041050200D9E0FF79D1180001040002B7DCBCED040003B7DCBCED0400040005004105020052FD31513EE90001040002938AB5ED040003938AB5ED0400040005004105020052128CCDBA7C00010400029FB2BCED0400039FB2BCED040004000500410502006FB83DA167580001040002CF86BDED040003CF86BDED040004000500410502002E14B9387F540001020002B7DCBCED040003CF86BDED040004000500410502004F7E6F098A990001040002CF86BDED040003CF86BDED040004000500410502005D98B7099E1F0001040002B7DCBCED040003B7DCBCED04000400050041050200722A7476317600010400029FB2BCED0400039FB2BCED04000400050041050200BC18CE5EBDA10001020002AFDFBAED040003ECE7BAED040004000500410502005CF890CF3E270001040002B7DCBCED040003B7DCBCED040004000500410502008D72AE6DBEE30001040002CF86BDED040003CF86BDED0400040005004105020076A6D8E9EAAB0001040002CF86BDED040003CF86BDED04000400050041050200721B63925A140001040002CF86BDED040003CF86BDED040004000500410502007608B348A53A0001040002CF86BDED040003CF86BDED04000400</HostCache>
-      <HttpsProxy>
-        <Enable>0</Enable>
-      </HttpsProxy>
-      <LastIP>-645574544</LastIP>
-      <LastProbingFailed>0</LastProbingFailed>
-      <ListeningPort>47500</ListeningPort>
-      <LoginServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </LoginServers>
-      <NatTracker>
-        <ContraProbeResults>217.133.80.112:1076 217.133.80.112:47500 217.133.80.112:1083 217.133.80.112:1083 217.133.80.112:49734</ContraProbeResults>
-        <PreviousNatType>7</PreviousNatType>
-        <ProbeResults>
-          <_1303289856>6C81442204F3D9855070B98CAE5879A505F3D9855070B98C4D4320134B66D9855070B98C5F4E60ED0D34D98550700434</_1303289856>
-          <_1303293952>4287274ED659D9855070B98C4287274ED74BD9855070B98C4287274EC15CD9855070B98C4287274ECE92D9855070B98C4287274EA75BD9855070B98C4287274E4B98D9855070B98C4287274EAA2DD9855070B98C4287274EA175D9855070B98C4287274ED735D9855070B98C4287274EAE25D9855070B98C4287274E1A2BD9855070B98C3D7D44372576D9855070B98CCF86DF304366D9855070B98C3D2E02A2259CD9855070B98C4287274EB98CD9855070B98C</_1303293952>
-          <_1303298048>2E3363049108D9855070B98C2E3795FA3202D9855070B98C2E2F6F42E86DD9855070B98CB4B0620AA528D9855070B98C</_1303298048>
-          <_1303306240>5F1894D8122BD9855070B98C2E40484969A3D9855070B98CD592A70A5566D9855070B98C2E26119F8DBED9855070B98C2E3754264E48D9855070B98C</_1303306240>
-          <_1303314432>4D2BFFCAEC6CD9855070043B54BAD08D05E0D9855070B98C9D9D4DA11995D9855070B98C59584CCBB5CED9855070B98C972AC71733DDD9855070B98C</_1303314432>
-          <_1303322624>5F3B0DCEB535D9855070043BD5150C1746D3D9855070B98C4D4B8646EF29D9855070B98CD5152F4D12BBD9855070B98C</_1303322624>
-          <_1303326720>59D0D11D89DCD9855070C2462E755D8E1E97D9855070B98C2E492F875789D9855070B98C2E378784E9C6D9855070B98C2E2F6F6B48FCD9855070B98C</_1303326720>
-        </ProbeResults>
-        <UsedIPList>
-          <_1303289856>9A4A56D31C619325C6601C71B23E13FDFAF5CA49F15C34A4E33F239B524D6BBC226021F010D2270A3B48DFA2E8CDB6FD37531B1118DB2D471CB980D0</_1303289856>
-          <_1303293952>D5A2186D0B45088ADDFA7B626C0904CED47E3DF13172672AED483E1EAD69DB781ABEC0D8812B1B5EFF91BC28C67FB5A3404D875A</_1303293952>
-          <_1303298048>DB0EC5161D10171C7C6A4C7109DD</_1303298048>
-          <_1303302144>5379BD98</_1303302144>
-          <_1303306240>88B19442A48D863ED54D712EEC36D53127BCE36653FE</_1303306240>
-          <_1303310336>1908404B0F7BA3BE952CB1C533456D3CDA410BCB774AF93880FB8BD8C110</_1303310336>
-          <_1303314432>4B015AD444DD027FD3F61B2A51A53BA0</_1303314432>
-          <_1303322624>878BAF81A9F053B39E35081485E24B4EDA5F79D37E176C409B6E237A336451F42CFA7CEC013C98A18B51</_1303322624>
-          <_1303326720>CFB137906F6CCE77246BD5B6B434875570B1F9B9140C85D5114EE6953110B04F3557C0D1686D46A9F69106521979AE49E19F8622F93A</_1303326720>
-          <_1303330816>BA4B81F735FDCDA4E4EF57ACF8A37051C66401E41CA4E562A5A49ACC2E246CCE</_1303330816>
-        </UsedIPList>
-      </NatTracker>
-      <PresenceServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </PresenceServers>
-      <SipServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </SipServers>
-      <SocksProxy>
-        <Enable>0</Enable>
-      </SocksProxy>
-      <StatsServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </StatsServers>
-    </Connection>
-    <Localnode>
-      <NodeID>9BF92EA4B417A7F6</NodeID>
-    </Localnode>
-    <PropsManager>
-      <PermaProps>4102030E322F322E302E302E37322F31373400000FF6EB9ADC04</PermaProps>
-    </PropsManager>
-    <VoiceEng>
-      <AGC>0</AGC>
-    </VoiceEng>
-  </Lib>
-  <UI>
-    <Installed>2</Installed>
-    <Language>en</Language>
-    <Pos>
-      <Height>357</Height>
-      <Width>258</Width>
-      <X>0</X>
-      <Y>0</Y>
-    </Pos>
-    <SavePassword>0</SavePassword>
-  </UI>
-</config>
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/config.lck b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/config.lck
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/config.xml b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/config.xml
deleted file mode 100644
index f7af8873ad..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/config.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<config version="1.0" serial="3315" timestamp="1303209780.1">
-  <Lib>
-    <Account>
-      <IdleTimeForAway>300</IdleTimeForAway>
-      <IdleTimeForNA>1800</IdleTimeForNA>
-      <Migration>63</Migration>
-    </Account>
-    <Call>
-      <DPC>41010300676D6172757A7A3400</DPC>
-      <FirstSkypeoutTime>1268962216</FirstSkypeoutTime>
-    </Call>
-    <CentralStorage>
-      <LastBackoff>0</LastBackoff>
-      <LastFailure>0</LastFailure>
-      <LastSync>1303202372</LastSync>
-      <NeedSync>0</NeedSync>
-      <SyncSet>
-        <p>
-          <email>35716ecf:2</email>
-          <profile>98e6c103:0</profile>
-        </p>
-        <u>&#10;        </u>
-      </SyncSet>
-    </CentralStorage>
-    <Chat>
-      <ActivityTS>1</ActivityTS>
-      <DialogPartner>3</DialogPartner>
-      <HistoryDays>65535</HistoryDays>
-      <MigrationDone>1266110339</MigrationDone>
-    </Chat>
-    <Contacts>
-      <Migration>1</Migration>
-    </Contacts>
-    <Message>
-      <DisableHistory>1</DisableHistory>
-    </Message>
-    <Notification>
-      <LastID>1000000166</LastID>
-      <LastPoll>1303166852</LastPoll>
-      <LastSearch>1303209779</LastSearch>
-    </Notification>
-    <PM>
-      <pslut>1267114269</pslut>
-    </PM>
-    <ProfilePopulated>2</ProfilePopulated>
-    <PropsManager>
-      <PermaProps>4109008620EBA4DDDB0400FA0100009E2001009420FB09008520B1A58BDD04008120CCD9E6E3040093209B0A00F501820200F801A3B608</PermaProps>
-    </PropsManager>
-    <StatsSender>
-      <CollectorLastSent>1267114267</CollectorLastSent>
-      <CollectorSeq>11</CollectorSeq>
-      <Saved>4263C0064DD5ACF9A03594DAB928D2B81510</Saved>
-    </StatsSender>
-    <Video>
-      <AdvertPolicy>noone</AdvertPolicy>
-      <Disable>1</Disable>
-      <RecvPolicy>noone</RecvPolicy>
-    </Video>
-    <table_insert_history>
-      <_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>1303296179 23160:21600:1303209779 9589:7200:1303209779 8707:21600:1303209779</_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>
-    </table_insert_history>
-  </Lib>
-  <UI>
-    <API>
-      <Authorizations>skypopen</Authorizations>
-      <BlockedPrograms></BlockedPrograms>
-    </API>
-    <AutoUpdate>0</AutoUpdate>
-    <CaptureDevice>2</CaptureDevice>
-    <RingDevice>2</RingDevice>
-    <SoundDevice>2</SoundDevice>
-  </UI>
-</config>
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/httpfe/cookies.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/httpfe/cookies.dat
deleted file mode 100644
index fc7f2b1150..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/httpfe/cookies.dat
+++ /dev/null
@@ -1 +0,0 @@
-B
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/index2.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/index2.dat
deleted file mode 100644
index b8b96d8431..0000000000
Binary files a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/index2.dat and /dev/null differ
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/main.lock b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameA/main.lock
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/config.lck b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/config.lck
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/config.xml b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/config.xml
deleted file mode 100644
index f7af8873ad..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/config.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<config version="1.0" serial="3315" timestamp="1303209780.1">
-  <Lib>
-    <Account>
-      <IdleTimeForAway>300</IdleTimeForAway>
-      <IdleTimeForNA>1800</IdleTimeForNA>
-      <Migration>63</Migration>
-    </Account>
-    <Call>
-      <DPC>41010300676D6172757A7A3400</DPC>
-      <FirstSkypeoutTime>1268962216</FirstSkypeoutTime>
-    </Call>
-    <CentralStorage>
-      <LastBackoff>0</LastBackoff>
-      <LastFailure>0</LastFailure>
-      <LastSync>1303202372</LastSync>
-      <NeedSync>0</NeedSync>
-      <SyncSet>
-        <p>
-          <email>35716ecf:2</email>
-          <profile>98e6c103:0</profile>
-        </p>
-        <u>&#10;        </u>
-      </SyncSet>
-    </CentralStorage>
-    <Chat>
-      <ActivityTS>1</ActivityTS>
-      <DialogPartner>3</DialogPartner>
-      <HistoryDays>65535</HistoryDays>
-      <MigrationDone>1266110339</MigrationDone>
-    </Chat>
-    <Contacts>
-      <Migration>1</Migration>
-    </Contacts>
-    <Message>
-      <DisableHistory>1</DisableHistory>
-    </Message>
-    <Notification>
-      <LastID>1000000166</LastID>
-      <LastPoll>1303166852</LastPoll>
-      <LastSearch>1303209779</LastSearch>
-    </Notification>
-    <PM>
-      <pslut>1267114269</pslut>
-    </PM>
-    <ProfilePopulated>2</ProfilePopulated>
-    <PropsManager>
-      <PermaProps>4109008620EBA4DDDB0400FA0100009E2001009420FB09008520B1A58BDD04008120CCD9E6E3040093209B0A00F501820200F801A3B608</PermaProps>
-    </PropsManager>
-    <StatsSender>
-      <CollectorLastSent>1267114267</CollectorLastSent>
-      <CollectorSeq>11</CollectorSeq>
-      <Saved>4263C0064DD5ACF9A03594DAB928D2B81510</Saved>
-    </StatsSender>
-    <Video>
-      <AdvertPolicy>noone</AdvertPolicy>
-      <Disable>1</Disable>
-      <RecvPolicy>noone</RecvPolicy>
-    </Video>
-    <table_insert_history>
-      <_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>1303296179 23160:21600:1303209779 9589:7200:1303209779 8707:21600:1303209779</_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>
-    </table_insert_history>
-  </Lib>
-  <UI>
-    <API>
-      <Authorizations>skypopen</Authorizations>
-      <BlockedPrograms></BlockedPrograms>
-    </API>
-    <AutoUpdate>0</AutoUpdate>
-    <CaptureDevice>2</CaptureDevice>
-    <RingDevice>2</RingDevice>
-    <SoundDevice>2</SoundDevice>
-  </UI>
-</config>
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/httpfe/cookies.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/httpfe/cookies.dat
deleted file mode 100644
index fc7f2b1150..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/httpfe/cookies.dat
+++ /dev/null
@@ -1 +0,0 @@
-B
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/index2.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/index2.dat
deleted file mode 100644
index b8b96d8431..0000000000
Binary files a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/index2.dat and /dev/null differ
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/main.lock b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient00/skypenameB/main.lock
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/shared.lck b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/shared.lck
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/shared.xml b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/shared.xml
deleted file mode 100644
index 4b72e67eb5..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/shared.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<config version="1.0" serial="3885" timestamp="1303333464.70">
-  <Lib>
-    <BCM>
-      <_2>00001000A563932E7DE5A581942041A820F8437512A079C7ACB1B73281F191D109521E265BCD38C4133596B834AD9AA1D6BB5E1AC3D59E8675785321F722D39FBFAFB9A24E6482FA3030FFA3692D2C4A53BBCE9DC63F25D10207A20FA969982FEDC1DCC2A7C599071F4735E52AB2E06E34CA232C08B3AA2FB88A0C4A5763E0CD23C3AA37D1D2A7D6EED691EE99BA08BE294F68C24F9AE777DAF294F0AEB8346325A978DC6CF7C210AD11EF3F38111F6D98F388CF41CCBA40ABE9F0D6CBBD3118BA0588344953DF3C5E88B2CCAEDE2E692F320D20EBF16D7DB36156E617C0CC9FB2855D7FDB4C7F8638CC9830E7448D5EAE301A2810277062989841EE679E00E4E277615FEC038DE3A0A20DD7C6A2A00DFBC6A2A00DA6E2B6F404FDC6A2A00DFEC6A2A00DF7FBBB990CF2C6A2A00D8EB4FE8A0C8FB4FE8A0C95C7A6E00CF5FBBB990CD6C7A6E00CD0F896950CCCE2B6F40485CCA2A00DA1D8EEA50DFDFBBB990CA7C7A6E00CA8C7A6E00CA9C7A6E00C97C7A6E00C90B4FE8A0CFE90D59308C290D59308D1E2B6F404C5E2B6F404C6AAF18705C7AAF18705C8AAF18705BBD8EEA50DBCD8EEA50DBDD8EEA50D93CCA2A00D94CCA2A00DEFE2B6F40491B4FE8A0CE2FBBB990CE3FBBB990CBED8EEA50DA0CCA2A00DA1CCA2A00DA6B4FE8A0CA7B4FE8A0CCED8EEA50DA3CCA2A00DA4CCA2A00D84E698AD0DB8C7A6E00CD9E2B6F404E0E2B6F40486E698AD0DFDF896950C0013A60400173D0018DE0200190300AB01F40300449875044518C15F9A278109D4BBAC4E8109D408A6238109D5A63304810904460CC15F9A26303ED408A624303E0047B054004801004980A305004A80E90F004BE0A801004C80A305004D01005CAC02045E5A50FC55465BA050FC55475BA050FC55485BA0C32EFDEE5BA0C32EFDEF5BA0C2A5BC4A5BA0C2A5BC4B5BA0D4BBAC055BA0D4BBAC145BA0D4BBAC215BA0D408A3575BA0D408A37D5BA0D408A37E5BA08275487E5BA0827548425BA00060B817046506CC09A3D6303E04AE018C0125F8D500021A25F9D500011A162102200301220125FFD50025FAD5000C03E4000D2580D6000F060125F8D5000302172105050103080D06010501011C210302060125FCD50025F9D5000A25FDD50025FED5000A0D06020502050119211305020380808080100C05010D0380808080100B25FDD5000C01080005000380808080100D060307010503220101220104AC01BF012597CE002597CE002590CE0019152590CE002597CE000B033C1815210220030122012593CE0014212E2594CE002103030B220125A5CE00030F172103030B22012596CE00142103030B22012597CE00142103030B22012599CE00142103030A220125A5CE00030A1A2590CE002592CE000B031E1B15142103030A220125A4CE000380201D14210303092201259BCE0014210A2594CE002103030B2201259DCE00142103030822012593CE002103012201259ECE001421030306220103022201006800006901006A01006C987504740CC2A5BC4C303ED408A34C303E007828047912CC09A3D3303E82754864303E4E8DB16F303E047DBF010203020800050003020D0B0601030308000500020501030508000500021A03060800050003041A16030508000500021D160C0A0C060203D00F251205020A03020D0A050103D00F0C0A0603010800050003FFFFFFFF0F18030208000500021D141506042512020800050003030D05040C10030205040B0C06050306050505020A0C060603040800050003050800050003E400180C0607050703E400250A0B250A011C0C0A0314100608050303C03E0F03B8171005060388270F03DC0B100508047E5E0380010304080005000B03040D250403E4000F03140D0A2503250203030D0A0B0110060101080005000380020D0302080005000380020D172103010601250A03E4001B210D0501030A03E400250A210303DF002002250A0B0D0F0601050100800180EA49008101E003036F3139352E34362E3235332E3235333A313233353000038201706F6F6C313D2A2E6C6976657461622E736B7970653B706F6F6C323D7765622E6578747261732E736B7970653B706F6F6C333D6578747261732E646F776E6C6F6164732E736B7970653B706F6F6C343D2A2E736B79706566696E642E736B7970653B706F6F6C353D2A2E7072656D69756D2E736B7970653B706F6F6C363D2A2E6D756C74696D656469612E736B7970653B706F6F6C373D2A2E6D756C74696D656469612E6D657461636166653B706F6F6C383D2A2E6D756C74696D656469612E6461696C796D6F74696F6E3B706F6F6C393D2A2E6D756C74696D656469612E6D6574616F6D6E69747572653B706F6F6C31303D77686174736E65772E736B7970653B706F6F6C31313D7061792E736B7970653B706F6F6C31323D7365637572652E7061792E736B7970653B706F6F6C31333D2A2E70696373746F72653B706F6F6C31343D2A2E6D796163636F756E742E736B7970653B706F6F6C31353D2A2E62696269743B706F6F6C31363D2A2E70726F6363796265723B706F6F6C31373D747261636B696E672E6F6D6E69747572653B706F6F6C31383D676F2E736B7970653B706F6F6C31393D747261636B2E736B7970657C706F6F6C313D3139342E3139322E3139392E3235313A31323335303B706F6F6C323D3139342E3139322E3139392E3235323A31323335303B706F6F6C333D3139342E3139322E3139392E3235323A31323335303B706F6F6C343D3139342E3136352E3138382E3130313A31323335303B706F6F6C353D3139332E39352E3135342E31353A31323335313B706F6F6C363D3139342E3136352E3138382E3130303A31323335303B706F6F6C373D3139342E3136352E3138382E3130303A31323335303B706F6F6C383D3139342E3136352E3138382E3130303A31323335303B706F6F6C393D3139342E3136352E3138382E3130303A31323335303B706F6F6C31303D3230342E392E3136332E3134313A31323335303B706F6F6C31313D3139352E34362E3235332E3234353A31323335303B706F6F6C31323D3139352E34362E3235332E3234353A31323335303B706F6F6C31333D3139332E39352E3135342E31343A31323335313B706F6F6C31343D3139332E39352E3135342E31343A31323335313B706F6F6C31353D3139332E39352E3135342E31343A31323335313B706F6F6C31363D3139332E39352E3135342E31343A31323335313B706F6F6C31373D3139342E3136352E3138382E3130303A31323335303B706F6F6C31383D3139342E3136352E3138382E3130303A31323335303B706F6F6C31393D3139332E39352E3135342E31343A31323335310003B101706F6F6C313D2A2E6C6976657461622E736B7970653B706F6F6C323D7765622E6578747261732E736B797065206578747261732E646F776E6C6F6164732E736B7970653B706F6F6C333D2A2E687773746F72652E736B7970653B706F6F6C343D2A2E736B79706566696E642E736B797065202A2E6469726563746F72792E736B7970653B706F6F6C353D2A2E70696373746F7265202A2E6D796163636F756E742E736B797065202A2E6269626974202A2E70726F63637962657220747261636B2E736B79706520617070732E736B7970656173736574733B706F6F6C363D2A2E6D756C74696D656469612E736B797065202A2E6D756C74696D656469612E6D65746163616665202A2E6D756C74696D656469612E6461696C796D6F74696F6E202A2E6D756C74696D656469612E6D6574616F6D6E6974757265207777772E736B7970652077686174736E65772E736B7970653B706F6F6C373D7061792E736B797065207365637572652E7061792E736B7970653B706F6F6C383D6170692E736B7970653B706F6F6C393D63616C6C70686F6E65732E736B7970652063616C6C72617465732E736B7970653B706F6F6C31303D2A2E7072656D69756D2E736B7970653B706F6F6C31323D6C6F67732E736B7970653B706F6F6C31333D617661746172736572766963652E736B79706520636F6E74616374696D706F72742E736B7970653B706F6F6C31343D676F2E736B7970653B706F6F6C31353D747261636B696E672E6F6D6E69747572657C706F6F6C313D3139342E3139322E3139392E3235312C31323335302C312C4E4C2C77652C35302C313B706F6F6C323D3139342E3139322E3139392E3235322C31323335302C312C444B2C77652C35302C313B706F6F6C333D3139332E39352E3135342E31372C31323335312C312C49452C77652C35302C31203231322E3138372E3137322E36322C31323335312C312C49452C77652C35302C31203139352E34362E3235332E3232372C31323335312C312C4C552C77652C35302C31203231322E382E3136362E33332C31323335312C312C4C552C77652C35302C313B706F6F6C343D3139342E3136352E3138382E3130312C31323335302C312C49452C77652C35302C313B706F6F6C353D3139332E39352E3135342E31342C31323335312C312C49452C77652C35302C31203139352E34362E3235332E3230352C31323335312C312C4C552C77652C35302C31203231322E3138372E3137322E35392C31323335312C312C49452C77652C35302C31203231322E382E3136362E31392C31323335312C312C4C552C77652C35302C313B706F6F6C363D3139342E3136352E3138382E3130302C31323335302C312C49452C77652C35302C31203230342E392E3136332E3134302C31323335302C312C43412C6E612C35302C313B706F6F6C373D3139352E34362E3235332E3234352C31323335302C312C4C552C77652C35302C31203139332E39352E3135342E31362C31323335312C312C49452C77652C35302C31203231322E3138372E3137322E36312C31323335312C312C49452C77652C35302C31203231322E382E3136362E32302C31323335302C312C4C552C77652C35302C313B706F6F6C383D3230342E392E3136332E3138342C31323335302C312C43412C6E612C35302C312037382E3134312E3137372E38392C31323335302C312C4C552C77652C35302C313B706F6F6C393D3139342E3136352E3138382E3131352C31323335302C312C49452C77652C35302C31203230342E392E3136332E3134312C31323335302C312C43412C6E612C35302C313B706F6F6C31303D3139332E39352E3135342E31352C31323335312C312C49452C77652C35302C31203231322E3138372E3137322E36302C31323335312C312C49452C77652C35302C31203139352E34362E3235332E3232362C31323335312C312C4C552C77652C35302C31203231322E382E3136362E33322C31323335312C312C4C552C77652C35302C313B706F6F6C31323D37382E3134312E3137372E37362C31323335302C312C4C552C77652C35302C313B706F6F6C31333D3230342E392E3136332E3136372C31323335302C312C43412C6E612C35302C312037382E3134312E3137372E38312C31323335302C312C4C552C77652C35302C313B706F6F6C31343D3230342E392E3136332E3136382C31323335302C312C43412C6E612C35302C31203139342E3136352E3138382E3130302C31323335302C312C49452C77652C35302C313B706F6F6C31353D3230342E392E3136332E3136392C31323335302C312C43412C6E612C35302C31203139342E3136352E3138382E3130302C31323335302C312C49452C77652C35302C3100039701736B79706566696E642E736B7970653D31372C362C382C2D33392C3139206469726563746F72792E736B7970653D31372C362C382C2D33392C31390003A60138302E3235322E38352E37302C32333435362C312C6E6C2C77652C35302C312038302E3235322E38352E37312C32333435362C312C6E6C2C77652C35302C312038302E3235322E38352E37322C32333435362C312C6E6C2C77652C35302C31203139352E34362E3235332E3233382C32333435362C322C6C752C77652C35302C31203139352E34362E3235332E3233392C32333435362C322C6C752C77652C35302C31203139342E3136352E3138382E37342C32333435362C332C69652C77652C35302C31203139342E3136352E3138382E37352C32333435362C332C69652C77652C35302C31203231322E3138372E3137322E352C32333435362C342C69652C77652C35302C31203231322E3138372E3137322E32302C32333435362C342C69652C77652C35302C31203231322E3138372E3137322E33332C32333435362C342C69652C77652C35302C31203231322E382E3136332E38372C32333435362C362C6C752C77652C35302C31203231322E382E3136332E3132352C32333435362C362C6C752C77652C35302C31203231322E382E3136332E3132362C32333435362C362C6C752C77652C35302C31203133302E3131372E37322E3132362C32333435362C372C6E6C2C77652C35302C31203133302E3131372E37322E36362C32333435362C372C6E6C2C77652C35302C310004B2010B03A09C0125B3EA010B220104A5012A24A39C012102220025A19C010401F3C2011A142103030A220125B0EA0103051A2103030B2201030522010384012B39393030303131313A37382E3134312E3137372E39363A3233343536000086010C008701880E039101000493010CC2A5BC5C2774C32EFDD927740496010CD592BC1034504E8DB5F2345006C20105F801F901FA01FB01FC010395016272617465303D31206272617465313D31206272617465323D31206272617465333D31206272617465343D31206272617465353D31206272617465363D31206272617465373D31206272617465383D31207372617465303D31207372617465313D31207372617465323D31207372617465333D31207372617465343D31207372617465353D31207372617465363D31207372617465373D31207372617465383D310003B4013139342E3136352E3138382E37373A3132333530203231322E382E3136332E3130333A31323335300000C0010100C1010103CB012E6163636573732E736B7970652E6E65740000E1010F00F0010100F101A982CA950303D50137382E3134312E3137372E33383A3132333530203230342E392E3136332E3135313A31323335300003CF0137382E3134312E3137372E36393A3132333530203230342E392E3136332E3134393A31323335300000D6010103E4013139342E3136352E3138382E38303A3132333530203231322E382E3136362E353A31323335300003E5010000F8016403F7015B574845453A204F4646203130302C20563120302C20563220305D205B496E70757445513A204F46462035302C2056312035305D205B4945513A204F46462031362C2056312031322C2056322031322C2056332031322C2056342031322C2056352031322C2056362031322C2056372031325D205B53453A204453203130302C2057494F20305D205B5345323A2044532039302C2057494F2031305D205B414D504D3A204F4C442035302C20444147432035305D205B4B54523A204F46462035302C204F4E2035305D205B49414D323A204F46462039392C204D3120312C204D3220305D0003FA0152434F4E3D350003F901302F342E322E2A2E2A2C33322C3320302F352E302E2A2E2A2C31342C3320302F352E312E2A2E3130342C342C330003A80168747470733A2F2F7777775C2E70617970616C5C2E2E3F2E3F2E3F247C68747470733A2F2F696D616765735C2E70617970616C5C2E636F6D247C68747470733A2F2F7777775C2E70617970616C6F626A656374735C2E636F6D247C68747470733F3A2F2F2E2B5C2E666263646E5C2E6E6574247C68747470733F3A2F2F2E2B5C2E66616365626F6F6B5C2E636F6D247C68747470733F3A2F2F6368616E6E656C5C2E736B7970655C2E636F6D247C68747470733A2F2F617070735C2E736B7970655C2E636F6D247C68747470733F3A2F2F7161617070735C2E736B7970655C2E6E6574247C68747470733F3A2F2F636F6E6E6563745C2E66616365626F6F6B5C2E6E6574247C68747470733A2F2F2E2A5C2E736B7970656173736574735C2E636F6D247C68747470733A2F2F61645C2E646F75626C65636C69636B5C2E6E6574247C68747470733A2F2F61642D656D65615C2E646F75626C65636C69636B5C2E6E6574247C68747470733A2F2F61642D617061635C2E646F75626C65636C69636B5C2E6E6574247C68747470733A2F2F737461746963323F5C2E736B7970655C2E636F6D247C68747470733A2F2F7161737461746963323F5C2E736B7970655C2E6E6574247C68747470733A2F2F7072657374617469635C2E736B7970655C2E6E6574240003FF013078313030303230343030393136333231372D642D723230342E392E3136332E3231373A38313932203078313030303230343030393136333231392D642D723230342E392E3136332E3231393A38313932203078313030303230343030393136333232312D642D723230342E392E3136332E3232313A38313932203078313030303230343030393136333232332D642D723230342E392E3136332E3232333A38313932203078313030303230343030393136333232352D642D723230342E392E3136332E3232353A38313932203078313030303230343030393136333232372D642D723230342E392E3136332E3232373A38313932203078313030303230383038383138363030352D642D723230382E38382E3138362E353A38313932203078313030303230383038383138363030372D642D723230382E38382E3138362E373A38313932203078313030303230383038383138363030392D642D723230382E38382E3138362E393A38313932203078313030303230383038383138363031312D642D723230382E38382E3138362E31313A38313932203078313030303230383038383138363031332D642D723230382E38382E3138362E31333A38313932203078313030303230383038383138363031352D642D723230382E38382E3138362E31353A38313932203078313030303230383038383138363031372D642D723230382E38382E3138362E31373A38313932203078313030303230383038383138363031392D642D723230382E38382E3138362E31393A38313932203078313030303230383038383138363032312D642D723230382E38382E3138362E32313A38313932203078313030303230383038383138363032332D642D723230382E38382E3138362E32333A38313932203078313030303230383038383138363032352D642D723230382E38382E3138362E32353A38313932203078313030303230383038383138363032372D642D723230382E38382E3138362E32373A38313932203078313030303230383038383138363032392D642D723230382E38382E3138362E32393A38313932203078313030303230383038383138363033312D642D723230382E38382E3138362E33313A38313932203078313030303230383038383138363033332D642D723230382E38382E3138362E33333A38313932203078313030303230383038383138363033352D642D723230382E38382E3138362E33353A38313932203078313030303230383038383138363033372D642D723230382E38382E3138362E33373A38313932203078313030303230383038383138363033392D642D723230382E38382E3138362E33393A38313932203078313030303230383038383138363034372D642D723230382E38382E3138362E34373A38313932203078313030303230383038383138363034392D642D723230382E38382E3138362E34393A38313932203078313030303230383038383138363035312D642D723230382E38382E3138362E35313A38313932203078313030303230383038383138363035332D642D723230382E38382E3138362E35333A38313932203078313030303230383038383138363035352D642D723230382E38382E3138362E35353A38313932203078313030303230383038383138363035372D642D723230382E38382E3138362E35373A38313932203078313030303230383038383138363035392D642D723230382E38382E3138362E35393A38313932203078313030303230383038383138363036312D642D723230382E38382E3138362E36313A38313932203078313030303230383038383138363036332D642D723230382E38382E3138362E36333A38313932203078313030303230383038383138363035392D642D723230382E38382E3138362E36353A38313932203078313030303230383038383138363036312D642D723230382E38382E3138362E36373A38313932203078313030303230383038383138363036332D642D723230382E38382E3138362E36393A38313932203078313030303230383038383138363037312D642D723230382E38382E3138362E37313A38313932203078313030303230383038383138363037332D642D723230382E38382E3138362E37333A38313932203078313030303230383038383138363037352D642D723230382E38382E3138362E37353A38313932203078313030303230383038383138363037372D642D723230382E38382E3138362E37373A38313932203078313030303230383038383138363037392D642D723230382E38382E3138362E37393A38313932203078313030303230383038383138363038312D642D723230382E38382E3138362E38313A38313932203078313030303230383038383138363038332D642D723230382E38382E3138362E38333A38313932203078313030303230383038383138363038352D642D723230382E38382E3138362E38353A38313932203078313030303230383038383138363038372D642D723230382E38382E3138362E38373A38313932203078313030303230383038383138363038392D642D723230382E38382E3138362E38393A38313932203078313030303230383038383138363039312D642D723230382E38382E3138362E39313A38313932203078313030303230383038383138363039332D642D723230382E38382E3138362E39333A38313932203078313030303230383038383138363039352D642D723230382E38382E3138362E39353A38313932203078313030303230383038383138363039372D642D723230382E38382E3138362E39373A38313932203078313030303230383038383138363039392D642D723230382E38382E3138362E39393A38313932203078313030303230383038383138363130312D642D723230382E38382E3138362E3130313A38313932203078313030303230383038383138363130332D642D723230382E38382E3138362E3130333A38313932203078313030303230383038383138363130352D642D723230382E38382E3138362E3130353A38313932203078313030303230383038383138363130372D642D723230382E38382E3138362E3130373A38313932203078313030303230383038383138363130392D642D723230382E38382E3138362E3130393A38313932203078313030303230383038383138363131312D642D723230382E38382E3138362E3131313A38313932203078313030303230383038383138363131332D642D723230382E38382E3138362E3131333A38313932203078313030303230383038383138363131352D642D723230382E38382E3138362E3131353A38313932203078313030303230383038383138363131372D642D723230382E38382E3138362E3131373A38313932203078323030303134393030353034353031312D642D723134392E352E34352E31313A38313932203078323030303134393030353034353031332D642D723134392E352E34352E31333A38313932203078323030303134393030353034353031352D642D723134392E352E34352E31353A38313932203078323030303134393030353034353031372D642D723134392E352E34352E31373A38313932203078323030303134393030353034353031392D642D723134392E352E34352E31393A38313932203078323030303134393030353034353032312D642D723134392E352E34352E32313A38313932203078323030303134393030353034353032332D642D723134392E352E34352E32333A38313932203078323030303134393030353034353032352D642D723134392E352E34352E32353A38313932203078323030303134393030353034353032372D642D723134392E352E34352E32373A38313932203078323030303134393030353034353032392D642D723134392E352E34352E32393A38313932203078323030303134393030353034353033312D642D723134392E352E34352E33313A38313932203078323030303134393030353034353033332D642D723134392E352E34352E33333A38313932203078323030303134393030353034353033352D642D723134392E352E34352E33353A38313932203078323030303134393030353034353033372D642D723134392E352E34352E33373A38313932203078323030303134393030353034353033392D642D723134392E352E34352E33393A38313932203078323030303134393030353034353034312D642D723134392E352E34352E34313A38313932203078323030303134393030353034353034332D642D723134392E352E34352E34333A38313932203078323030303134393030353034353034352D642D723134392E352E34352E34353A38313932203078323030303134393030353034353034372D642D723134392E352E34352E34373A38313932203078323030303134393030353034353034392D642D723134392E352E34352E34393A38313932203078323030303134393030353034353035312D642D723134392E352E34352E35313A38313932203078323030303134393030353034353035332D642D723134392E352E34352E35333A38313932203078323030303134393030353034353035352D642D723134392E352E34352E35353A38313932203078323030303134393030353034353035372D642D723134392E352E34352E35373A38313932203078323030303134393030353034353035392D642D723134392E352E34352E35393A38313932203078323030303134393030353034353036312D642D723134392E352E34352E36313A38313932203078323030303134393030353034353036332D642D723134392E352E34352E36333A38313932203078323030303134393030353034353036352D642D723134392E352E34352E36353A38313932203078323030303134393030353034353036372D642D723134392E352E34352E36373A38313932203078323030303134393030353034353036392D642D723134392E352E34352E36393A38313932203078323030303134393030353034353037312D642D723134392E352E34352E37313A38313932203078323030303134393030353034353037332D642D723134392E352E34352E37333A38313932203078323030303134393030353034353037352D642D723134392E352E34352E37353A38313932203078323030303134393030353034353037372D642D723134392E352E34352E37373A38313932203078323030303134393030353034353037392D642D723134392E352E34352E37393A38313932203078323030303134393030353034353038312D642D723134392E352E34352E38313A38313932203078323030303134393030353034353038332D642D723134392E352E34352E38333A38313932203078323030303134393030353034353038352D642D723134392E352E34352E38353A38313932203078323030303134393030353034353038372D642D723134392E352E34352E38373A38313932203078323030303134393030353034353038392D642D723134392E352E34352E38393A38313932203078323030303134393030353034353039312D642D723134392E352E34352E39313A38313932203078323030303134393030353034353039332D642D723134392E352E34352E39333A38313932203078323030303134393030353034353039352D642D723134392E352E34352E39353A38313932203078323030303134393030353034353039372D642D723134392E352E34352E39373A38313932203078323030303134393030353034353039392D642D723134392E352E34352E39393A38313932203078323030303134393030353034353130312D642D723134392E352E34352E3130313A38313932203078323030303134393030353034353130332D642D723134392E352E34352E3130333A38313932203078323030303134393030353034353130352D642D723134392E352E34352E3130353A38313932203078323030303134393030353034353130372D642D723134392E352E34352E3130373A38313932203078323030303134393030353034353130392D642D723134392E352E34352E3130393A38313932203078323030303134393030353034353131312D642D723134392E352E34352E3131313A38313932203078323030303134393030353034353131332D642D723134392E352E34352E3131333A38313932203078323030303134393030353034353131352D642D723134392E352E34352E3131353A38313932203078323030303134393030353034353131372D642D723134392E352E34352E3131373A38313932203078323030303134393030353034353131392D642D723134392E352E34352E3131393A38313932203078323030303134393030353034353132312D642D723134392E352E34352E3132313A38313932203078323030303134393030353034353132332D642D723134392E352E34352E3132333A38313932203078323030303134393030353034353132352D642D723134392E352E34352E3132353A38313932203078323030303134393030353034353132372D642D723134392E352E34352E3132373A38313932203078323030303134393030353034353132392D642D723134392E352E34352E3132393A38313932000089020A062E19AEBFD5A40B80D4B6B30280D2AFF205808CFD910B80DEB9F1048FA486F4049CA486F404D5A486F404ACC686F404C2C686F404878F87F404CEB887F404ADC487F404BCC687F404D4D087F404F9EA87F4049CF587F404C8F487F404C9F487F404CAF487F404EACCBB9C05F7CCBB9C05E694D7BB058E96D7BB05A896D7BB050094023C0095021400930201039902536B79706520546563686E6F6C6F6769657320534100008E0200008F0280BAB70300910280A30503F2013231332E3134362E3138392E3230313A3132333530203231332E3134362E3138392E3230323A3132333530203231332E3134362E3138392E3230333A3132333530203231332E3134362E3138392E3230343A3132333530203231332E3134362E3138392E3230353A3132333530203231332E3134362E3138392E3230363A3132333530203231322E3136312E382E31303A3132333530203231322E3136312E382E323A3132333530203231322E3136312E382E333A3132333530203231322E3136312E382E343A3132333530203231322E3136312E382E353A3132333530203231322E3136312E382E363A31323335300000FC010106FD0106011E64AC02A403E807009002C20103C301687474703A2F2F37392E3132352E36332E3732247C68747470733F3A2F2F2E2B5C2E66616365626F6F6B5C2E636F6D240000DE0148</_2>
-      <_256>000010011AC0AA3BA66DF7FB48228AE35F9BB4A032FE4A6A898DA7A1A5AE37DC59FB3D09607F1CACD46A5DBC008DABF8F09C797DF5A8903307D04C318825CEA7C481303C655A9EEE099E9A0AF1158373B458BB8FDACB336A6EC63C043E6782688E2350B417DDDDFF96B474DAEA7D1DF3742303B79111FC752BFB5D6887A5B822F945CC761FAF6E80DE5EC60868768CB8A9F9C876137806DCEA0DD1300181558ABFDBA26592078F5F84195C526D8C7F339EF82700FD93F8FB71ADA5ED3E977D27FA52D1F489EF5DA0A9E00B146BADCBDEBFB0DFEBCD61E5B8352A49893357E0DC3A736743929DA975782EA4D8184605FD064641986C47706D264281C876F926BF58003E9E</_256>
-      <_3>0000100498ECF8A7A4585F76C930739A1EAE590DE96D9EF3AA9B231E67965F3F08ECFC493E1DA23ECDE17A85C94CBE034E88F9414E9BBC82F32AAFCFFB2C09F6F57A478238BAEC9EEF2BB9C67F71257722E6786D88D6400F6B7D81450FB3B6CCCC3986E3782D2387E354EBA9099331AEF510D479C6601D2383D866E2B5B525DF0BA975D58C120EFAE88C89EE365FC696CC891B77F67CFA18FDE8E95DDAC25A7C7D70FA7A1414BAE593856A658888C622836006C1C131B4B2E805554DCFA52F3EFD34C1B759BF8A302E491835DCE701E84D37ED150C8ADD699AD3DCA9F515123C5B5AD94E253E173BA3465E64A0079D5EF4E6075E66D0F5FBC3D9BC25C4E80C4CB2FE9B87040003000004D00F0005D00F050041040400B80125C20003141B14230025D50003031B14230024E100142300250003191714230025EA0003141714230025EA00011724EA00140A14230025E400030F1C14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025E10025E10003A006100A0309031725000325180C0A25C20003140B0C03040D0A03882725C3000C0A03E43225C4000C0A0602050228038407DC08FA1E0601050102050203FA1E1C0603250028061D1E1F202122060105010205010503050141060300636F756E74206279207175616C697479000001CC080002040003000004010005010501410603006261647175616C69747920636F756E742062792076657273696F6E000001D6080002070003000004010005010501410603006261647175616C6974792073756D2062792076657273696F6E000001E0080002070003000004010005010500410304005424E400142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025E40025E40028043CB401D804901C060105010205014106030073756D206F66206C61737463616C6C206475726174696F6E73000001B009000201000300000480A3050005B054050141060300636F756E74206279206C61737463616C6C206475726174696F6E000001BA090002050003000004010005010500410204005025EB00011C142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025EB0028031E32D0000601050102050141060300636F756E742062792073797374656D20637075207573616765000001940A0002040003000004010005010500410204004F25EC00011C142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025EC0028030F1E320601050102050141060300636F756E742062792070726F63657373206370752075736167650000019E0A0002040003000004010005010500410304006824C20014230024E60014230025E600011A14230025EC00011C142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A14230025EC0028030F1E320601050102050125C2000501410603006A6974746572636F756E742062792070726F6365737320637075207573616765000001F80A0002040003000004010005010501410603006A69747465722062792070726F6365737320637075207573616765000001820B0002040003000004D00F0005D00F0500410304004424E700142300250003191714230025EA0003141714230025EA00011724EA00140A14230025FC00011A24FF000A14230025FF00011A142300258001011A1423000225E700050141060300706F74656E7469616C207463702066616C6C6261636B73000001DC0B00020100030000040100050105014106030061637475616C207463702066616C6C6261636B73000001E60B00020100030000040100050105004103040056240C142300250C030A1814230025EA0003141714230025EA00011724EA00140A14230024E70014230025E700011A14230024E50014230025E500011C0602250C29050306070809280401020405060105010205010502050141060300636F756E74206279206E617474797065000001C00C0002050003000004010005010501410603007564706661696C75726573206279206E617474797065000001CA0C0002050003000004010005010500410204001B25D90014230025D90025DA000B0602050228030102040601050102050141060300636F756E74206279206E726F666D756C74696368617473000001A40D0002040003000004010005010500410304001425F700011C14230025000319171423000225F90005014106030075736572732077686F206861766520636F6D706C65746564204943000001880E0002010003000004010005010501410603006C617374204943207969656C6420676C6F62616C73756D000001920E0002010003000004E8070005500500410304001224F60014230025000319171423000225F60005014106030075736572732077686F206861766520494320737570706F7274000001EC0E0002010003000004010005010501410603004943207374617274757020636F756E7420676C6F62616C73756D000001F60E00020100030000046400051405004102040025240C142300250C030A18142300250C011C142300250C280802030405060708090601050102050141060300636F756E74206279206E617474797065000001D00F0002090003000004010005010500410404001A250003191714230025E20025E30025FC00280201020601050102050141060300766964656F2073656E642063617061626C650000019811000201000300000401000501050141060300766964656F20706172616C6C656C2063616C6C730000019911000201000300000414000502050141060300636F756E7420627920766964656F2063616C6C73206D616465000001A2110002030003000004010005010500410204003A250003191714230025EA0003141714230025EA00011724EA00140A14230024E50014230025E50003031914230025E50028030102030601050102050141060300636F756E742062792073747265616D7472616E73706F7274000001FC11000204000300000401000501050041090400E00125C20003141B25E400030F1C1514230024E100142300250003191714230025EA0003141725EA0001171514230025FF002580010A011A14230025E60003031A25E50003031A1514230024F5001423002412142300249F0114230025C30025E10025E10003A006100A03A0060B0309031725000325180C0A25C20003140B0C03040D0A2512030A0C251025F5001703CC080C0A1C160602020502250003231B241D150603050305020503150503251D03808080808080808080011D14150603050305020503150503251D038080808080808080C0011D1415060305030502050315050141060300706F74656E7469616C2052555F756E65787065637465645F62616471000001E01200020100030000040100050105014106030061637475616C2052555F756E65787065637465645F62616471000001EA1200020100030000040100050105014106030042435020706F74656E7469616C2052555F756E65787065637465645F62616471000001F4120002010003000004010005010501410603004243502061637475616C2052555F756E65787065637465645F62616471000001FE12000201000300000401000501050141060300424350203220706F74656E7469616C2052555F756E65787065637465645F62616471000001881300020100030000040100050105014106030042435020322061637475616C2052555F756E65787065637465645F626164710000019213000201000300000401000501050141060300424350203420706F74656E7469616C2052555F756E65787065637465645F626164710000019C130002010003000004010005010501410603004243502031362061637475616C2052555F756E65787065637465645F62616471000001A6130002010003000004010005010500410304000825B801011C25B701050141060300757365727320696E207075626C6963206368617473000001C4130002010003000004010005010501410603007075626C69632063686174206D6573736167657320696E206C617374206D696E757465000001CE1300020100030000046400050A0500410404005F248E0114230024D5001423002500032B1B1423002500032B1C250D03021C16250E03FFFFFFFF0F1D03B4E2C8F10217250E0380808080100D03B4E2C8F10217151614230025D500280219C80106010501020501258E010501258E0103880E1C050141060300636F756E742062792062756464696573000001A814000203000300000401000501050141060300617661696C6162696C697479206167652062792062756464696573000001B2140002030003000004C0FC150005A099020501410603006C6F6E6720617661696C6162696C697479206167652062792062756464696573000001BC140002030003000004010005010500410204003324C000142300250003191714230025F301290300E5C68583B7AEDE36F2CAB9A3A7AE983806020502280202030601050125C00005014106030073696D756C74616E656F75732063616C6C7320706572206E616D6573706163650000018C15000203000300000419000519050041020400C50125C00006020502142300250006030503031917142300050303231B06040504210302200225A1010605050421030502200225A2010606030606070505021A050503021A160506021A15210305072002010607050203021B050603021B152103050720020206070502021A050603021B15210305072002030206070502021A050503041A15210305072002030306070502021A050503031A15210305072002030406070502021A050503051A152103050720020305060705072806010203040506060105010205014106030063616C6C6572733A207332735F313120636F6E665F686F737420636F6E665F636C69656E7420736B7970656F757420736B797065696E20766F6963656D61696C20756E6B6E6F776E000001F015000207000300000401000501</_3>
-      <_4>000010052A0B6759B71FBC1EF05BE97DFEA4EE6C1E15AF19ED70DEC1130B14C13CE41246D302B9662592907E3CA508A57702B5C00C2A05170857FA22012E0F235B425B4D919B23A541D3AD6E948FC634DE71A29493634884DFD5E9D89C5D951CBCD71B9B3ABFD3C4E2779BB1817D76E7C223CA36BD75A6A05B730AF138057E4048B2FFDD522BB588EC0B9D3E014BF9E354EB608150BC613C739D9E8C7465F05F047FAF7AFA3EE89B9B58BF0FC35F07B55CF3E4B59A7C4ED48B1C0C7F0305E6AC2E80AAEAD6064EB6ACDC1806FCE0B5CB66F0840DA7F0FE7B228E3898E3E42A9AFEFE13DDF019EF8D8F02A631AF2615BBC6E1EDB65C89A775F642C88109E6247EC4B463DC302E2A2E323000050541020006020307322E302E2A2E3100050541030006020307322E302E2A2E3200000AE4ED8009050541030006020307322E302E2A2E33000009B3E6CC990B050541040006020307322E302E2A2E3400000AE4ED8009000BA00B050541030006020308322E302E2A2E35000307322E302E2A2E3900050541040006020308322E302E2A2E39000307322E302E2A2E313100000AE4ED8009050541040006020308322E302E2A2E3131000307322E302E2A2E3135000009E6CC99B306050541050006020308322E302E2A2E3135000307322E302E2A2E323000000AE4ED8009000BA00B050041050303557067726164655465737433000301332E302E302E3130300003044E6963654272616E6400050541040006020307332E302E302E2A0003074E6963654272616E6400000AE4ED8009050541040006020307322E302E302E2A0003074E6963654272616E6400000AE4ED80090500410E0303557067726164655465737433000301332E302E302E31303000050541040006020307332E302E302E39390003074F746865724272616E6400000AE4ED8009050541040006020307322E302E302E39390003074F746865724272616E6400000AE4ED8009050541040006020307332E302E302E39380003074F746865724272616E64000009B3E6CC990B050541040006020307322E302E302E39380003074F746865724272616E64000009B3E6CC990B050541050006020307332E302E302E39370003074F746865724272616E6400000AE4ED8009000BA00B050541050006020307322E302E302E39370003074F746865724272616E6400000AE4ED8009000BA00B050541030006020307332E302E302E393900000AE4ED8009050541030006020307322E302E302E393900000AE4ED8009050541030006020307332E302E302E3938000009B3E6CC990B050541030006020307322E302E302E3938000009B3E6CC990B050541040006020307332E302E302E393700000AE4ED8009000BA00B050541040006020307322E302E302E393700000AE4ED8009000BA00B0500410303033130303031000301302E302E302E313000050541020006020307302E302E302E3900</_4>
-      <_5>00001006739CA527EF827847E16F23CD52458C3EBA3460A42935EC6948BEFA626B49E3BDF279FC62486E2DDBCA19609ED23D31F4E5175920F282AD74A74A997C3909E67B622480C68A058E886C7D5F3C40954880D7798CD61CEA0FBAFB389BE5B2B8A887348F7AADB4DF642B194B814047CDA0E698EDDE61DFA731DCA5883A76F913D8C94066718054E85ADA7AE009F2B2A9AF762FDCB9B6CAF64C156911E3AB172CFD795F66FB6E8E15048A54E4AB17979D6C447DEBADE75CC6F606050D980061112AFF9AE7C7BF8065D711949E41FA4C8B6CBF0916BB395B3E186A7D617D353C6BFFC687FE79475DFA095D113D70B828FB597BC3665B7C9C3669CA9CBE5D308D3FC23803044E45544745415200050541020006040307302E392E302E2A000500410503033130303033000301312E302E302E3137000304534D4300050541020006040307302E392E302E313200050541020006020307302E392E302E3230000500410503033130303033000301312E312E302E313000030442454C4B494E00050541020006040307302E392E302E313200050541020006020307302E392E302E3230000500410503033130303033000301312E302E302E3137000304454447452D434F524500050541020006040307302E392E302E313200050541020006020307302E392E302E3230000500410503033130303033000301312E302E302E31330003044C4F474954454300050541020006040307302E392E302E313200050541020006020307302E392E302E3230000500410503033130303035000301312E342E38382E31333636000304544F50434F4D00050541020006040307312E342E38382E3133353600050541020006020307312E342E38382E31333635000500410503033130303035000301312E342E38382E313336360003045043484F4D4500050541020006040307312E342E38382E3133353600050541020006020307312E342E38382E31333635000500410403033130303036000301302E302E302E313000050541020006040307302E302E302E3500050541020006020307302E302E302E39000500410503033130303037000301312E302E312E330003045445434F00050541020006040307312E302E302E3800050541020006020307312E302E312E31000500410503033130303038000301302E392E332E3339370003044C494E4B53595300050541020006040307302E382E332E2A00050541020006020307302E392E332E333932000500410503033130303038000301302E392E332E3339370003044E45544745415200050541020006040307302E382E332E2A00050541020006020307302E392E332E333932000500410503033130303038000301302E392E332E3339370003045048494C49505300050541020006040307302E382E332E2A00050541020006020307302E392E332E333932000500410403033130303130000301302E392E302E31310003044C494E4B53595300050541020006040307302E392E302E3130000500410403033130303130000301302E392E302E313100030442554646414C4F00050541020006040307302E392E302E3130000500410503033130303132000301312E302E302E310003044353544E00050541020006040307302E302E302E3500050541020006020307302E302E302E39000500410503033130303133000301302E302E332E3234000304414B00050541020006040307302E302E312E323400050541020006020307302E302E322E3234000500410303033130303134000301312E372E34332E33382E3200050541020006040307312E372E32332E32372E34000500410503033130303135000301312E322E31372E30000304415A5445434800050541020006040307312E322E31312E3000050541020006020307312E322E31352E30000500410303033130303230000301312E302E302E343700050541030006020308312E302E302E3233000307312E302E302E3233000500410403033130303234000301332E322E302E323800050541030006040308332E302E302E35000307332E302E302E3500050541030006020308332E312E302E31000307332E322E302E38000500410503033130303232000301302E302E302E3900030450414E41534F4E494300050541020006040307302E302E302E3100050541020006020307302E302E302E38000500410503033130303232000301302E302E302E3900030450414E41534F4E4943434F4E53554D455200050541020006040307302E302E302E3100050541020006020307302E302E302E3800</_5>
-    </BCM>
-    <BackboneInited>1</BackboneInited>
-    <Chat>
-      <FriendlyNameMaxSize>400</FriendlyNameMaxSize>
-    </Chat>
-    <Connection>
-      <Bandwidth>
-        <CurSlotLength>8118</CurSlotLength>
-        <InHistory>39,64,8184</InHistory>
-        <OutHistory>37,50,13164</OutHistory>
-      </Bandwidth>
-      <DisablePort80>1</DisablePort80>
-      <EventServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </EventServers>
-      <Firewall>
-        <TcpInHistory>-1431699456</TcpInHistory>
-        <UdpInHistory>-1431699456</UdpInHistory>
-        <UdpOutHistory>1610612735</UdpOutHistory>
-      </Firewall>
-      <HostCache>41C801050041050200D9AF0D45D9E900010400028788BCED0400038788BCED04000400050041050200BB0AB3FDD1A40001040002B7DCBCED040003B7DCBCED040004000500410502005C3766C2DA6B00010400029FB2BCED0400039FB2BCED04000400050041050200D9F8DC20CA33000104000296DAAAED04000396DAAAED0400040005004105020063847B3765900001040002D794BDED040003D794BDED040004000500410502004E80142FD3C70001040002CF86BDED040003CF86BDED04000400050041050200C3B213EA24A50001040002BF89BBED040003BF89BBED040004000500410502006FFEF1BA804C0001040002CF86BDED040003CF86BDED0400040005004105020052ED923CB3A700010400028788BCED0400038788BCED040004000500410502005243330D305B000104000283FFB2ED04000383FFB2ED040004000500410502006FF9438E9E5D0001040002CF86BDED040003CF86BDED04000400050041050200585515F19D77000104000283FFB2ED04000383FFB2ED04000400050041050200729EE3A8DD460001040002CF86BDED040003CF86BDED040004000500410502004572795D3BB300010400029FB2BCED0400039FB2BCED040004000500410502009F94D72CABA40001040002CF86BDED040003CF86BDED0400040005004105020095052D9C81090001040002B7DCBCED040003B7DCBCED040004000500410502005859A15FD7FC0001040002DC8FB5ED040003DC8FB5ED0400040005004105020059D7AB3EBBFB0001020002F8FABCED040003CF86BDED04000400050041050200BB2481B9390E0001040002CF86BDED040003CF86BDED0400040005004105020059D7F395A7BA0001040002B7DCBCED040003B7DCBCED040004000500410502006DC4BEF5D52E0001040002B0DFBAED040003B0DFBAED040004000500410502004B6E709CF4290001040002B7DCBCED040003B7DCBCED040004000500410502007A7D5CEC2B8D0001040002CF86BDED040003CF86BDED040004000500410502006FFFA8AFB19D0001040002B7DCBCED040003B7DCBCED040004000500410502003E4475A07A6F0001040002B7DCBCED040003B7DCBCED040004000500410502003EDD8384A4F90001040002BF89BBED040003BF89BBED04000400050041050200560FBFA4E4900001040002B7DCBCED040003B7DCBCED04000400050041050200C24FAEEE43F10001040002B3CEB5ED040003B3CEB5ED040004000500410502004F378778C6F30001040002CF86BDED040003CF86BDED04000400050041050200C94418BB0EDF0001040002B7DCBCED040003B7DCBCED040004000500410502003B75A58BECB30001040002CF86BDED040003CF86BDED04000400050041050200772A7A0908890001040002CF86BDED040003CF86BDED0400040005004105020048BB63586DE100010400029088BCED0400039088BCED040004000500410502005544F881BEDA000104000283FFB2ED04000383FFB2ED040004000500410502005B4C1468EDF80001040002B7DCBCED040003B7DCBCED04000400050041050200538BAF3F934F0001040002B3CEB5ED040003B3CEB5ED0400040005004105020055D6F93A4FD70001040002D7B3BBED040003D7B3BBED04000400050041050200D5D64561E55F00010400028788BCED0400038788BCED0400040005004105020046ADF229B8570001040002CF86BDED040003CF86BDED04000400050041050200D5151C19FFD600010200029FB2BCED040003B7DCBCED04000400050041050200973CA35DB82400010400029FB2BCED0400039FB2BCED04000400050041050200C249E5B953700001040002CF86BDED040003CF86BDED04000400050041050200722C69D8C4F500010400029FB2BCED0400039FB2BCED0400040005004105020058CBB311F2400001040002DC8FB5ED040003DC8FB5ED040004000500410502004BB7A090766E0001040002CF86BDED040003CF86BDED040004000500410502007DEF80FBEBD90001040002EFDDBBED040003EFDDBBED0400040005004105020076A03698F87A0001040002CF86BDED040003CF86BDED0400040005004105020050E5DFDD0C700001040002CF86BDED040003CF86BDED040004000500410502004D4C85E0CEC80001040002CF86BDED040003CF86BDED040004000500410502006FEA6BCD92A10001020002F8FABCED040003CF86BDED0400040005004105020043BAA930F28600010400029FB2BCED0400039FB2BCED04000400050041050200722DB82DDB780001040002CF86BDED040003CF86BDED0400040005004105020052E995118B9F0001040002CF86BDED040003CF86BDED040004000500410502005403013B36D20001040002EFDDBBED040003EFDDBBED04000400050041050200B27C0C920B260001040002B7DCBCED040003B7DCBCED04000400050041050200D9AF0997A7450001040002BCD9AAED040003BCD9AAED04000400050041050200BC00130BB5F60001040002CF86BDED040003CF86BDED04000400050041050200591FF23B53830001040002CF86BDED040003CF86BDED04000400050041050200557EB01367590001040002CF86BDED040003CF86BDED04000400050041050200505F157093A2000102000297A4BCED04000397A4BCED040004000500410502003A036C495C670001040002CF86BDED040003CF86BDED0400040005004105020050D8CF0B7D480001040002B7DCBCED040003B7DCBCED040004000500410502004E34E4D0FF250001040002B7DCBCED040003B7DCBCED040004000500410502007A1E50A46E770001040002CF86BDED040003CF86BDED040004000500410502005F18C666CBB80001040002EFDDBBED040003EFDDBBED04000400050041050200C19335603A9E0001040002DC8FB5ED040003DC8FB5ED0400040005004105020097142BD7DF890001040002AFDFBAED040003AFDFBAED0400040005004105020052F3355FFED400010400029FB2BCED0400039FB2BCED04000400050041050200BCBA857EECDF0001040002D7B3BBED040003D7B3BBED04000400050041050200729259D605EF0001040002CF86BDED040003CF86BDED04000400050041050200BEC2F57655B300010400029FB2BCED0400039FB2BCED040004000500410502005BD905C8304B0001020002A8EEBBED0400038788BCED0400040005004105020055F2C0360F360001040002EFDDBBED040003EFDDBBED0400040005004105020082C01DB9605D00010400028788BCED0400038788BCED04000400050041050200BC73B8FB30360001040002CF86BDED040003CF86BDED0400040005004105020050390E32DF8B0001040002B0DFBAED040003B0DFBAED040004000500410502005BCE8A2D7B8000010400028788BCED0400038788BCED0400040005004105020042292BB45D2D0001040002CF86BDED040003CF86BDED040004000500410502004F1A354DCA9A00010400029FB2BCED0400039FB2BCED04000400050041050200591C1D7F0EC900010400028788BCED0400038788BCED04000400050041050200722E9D2CCB030001040002CF86BDED040003CF86BDED04000400050041050200443AB71D3F8A0001040002CF86BDED040003CF86BDED0400040005004105020018DEF34EB70600010400028788BCED0400038788BCED0400040005004105020097215860080F00010400029FB2BCED0400039FB2BCED040004000500410502007229C156A49E0001040002B7DCBCED040003B7DCBCED040004000500410502003A72EDECB0250001040002B3F7B4ED040003B3F7B4ED04000400050041050200D52F8CD18F640001040002E285B0ED040003E285B0ED040004000500410502006B0325208B4C0001040002EFDDBBED040003EFDDBBED040004000500410502005164424285660001040002938AB5ED040003938AB5ED04000400050041050200D4E9D6AB12F80001040002AFDFBAED040003AFDFBAED0400040005004105020059B3090F459C0001040002FCDDAAED040003FCDDAAED04000400050041050200BC10C41E7AAB0001040002CF86BDED040003CF86BDED040004000500410502009F9532B560C100010400028788BCED0400038788BCED0400040005004105020050EA7B4A63750001040002CF86BDED040003CF86BDED0400040005004105020045A658245E790001040002CF86BDED040003CF86BDED0400040005004105020047E3059299620001040002CF86BDED040003CF86BDED0400040005004105020081164AFC3B450001040002CF86BDED040003CF86BDED040004000500410502005703C3FC60FF00010400028788BCED0400038788BCED0400040005004105020063FAEB02F39300010400028788BCED0400038788BCED040004000500410502005714F2D9F6650001020002AFDFBAED040003ECE7BAED04000400050041050200505F1B22B00D0001040002CF86BDED040003CF86BDED0400040005004105020062C2F2A80C7900010400029FB2BCED0400039FB2BCED04000400050041050200425CA6CCD1FF0001040002CF86BDED040003CF86BDED0400040005004105020084C778D4AB110001040002CF86BDED040003CF86BDED040004000500410502005106437CD3B60001040002CF86BDED040003CF86BDED0400040005004105020058506B2B47D40001040002D7B3BBED040003D7B3BBED04000400050041050200DD70204563390001040002B7DCBCED040003B7DCBCED040004000500410502005CFFA5BE4A0000010200028888BCED040003F8FABCED0400040005004105020089BD8692E0400001040002B7DCBCED040003B7DCBCED040004000500410502004AC12BB2AB8D0001040002B7DCBCED040003B7DCBCED04000400050041050200DB555CBAEE6B0001040002CF86BDED040003CF86BDED0400040005004105020095052D8F81090001020002A7FDBCED040003CF86BDED04000400050041050200473AA0E1C9110001020002A7FDBCED040003CF86BDED040004000500410502004EFA971D2E4C0001040002B7DCBCED040003B7DCBCED04000400050041050200BCE6C5A829D900010400029E90B5ED0400039E90B5ED0400040005004105020051699F18DC540001040002D7B3BBED040003D7B3BBED040004000500410502005CFB85D7E6460001040002B3CEB5ED040003B3CEB5ED0400040005004105020052D17CE5A9840001040002BF89BBED040003BF89BBED0400040005004105020054DD54C818F20001040002CF86BDED040003CF86BDED040004000500410502005C3555EBDC670001040002B7DCBCED040003B7DCBCED0400040005004105020051D92EE554370001040002BF89BBED040003BF89BBED0400040005004105020095549556182D0001040002CF86BDED040003CF86BDED040004000500410502005419C1F7F52A0001040002B3CEB5ED040003B3CEB5ED040004000500410502008C7259638E1D0001040002B7DCBCED040003B7DCBCED04000400050041050200516745231C2200010400029FB2BCED0400039FB2BCED0400040005004105020055FB3DEAE2380001040002B7DCBCED040003B7DCBCED040004000500410502005D5470BCB83A00010400028788BCED0400038788BCED0400040005004105020054C6D511E6810001040002CF86BDED040003CF86BDED0400040005004105020062A7FAC0119000010200028788BCED0400038888BCED040004000500410502007225A1DCFB1A00010200028788BCED0400038888BCED04000400050041050200708B358CF15C00010400028788BCED0400038788BCED04000400050041050200D9A293C3FE550001040002AFDFBAED040003AFDFBAED04000400050041050200722119BAFCB600010400029FB2BCED0400039FB2BCED0400040005004105020054369C95EAC60001040002CF86BDED040003CF86BDED04000400050041050200AE74419813810001040002B7DCBCED040003B7DCBCED0400040005004105020048C613BC68510001040002EFDDBBED040003EFDDBBED04000400050041050200516E168D638B0001040002EFDDBBED040003EFDDBBED040004000500410502001819CFB484D20001040002CF86BDED040003CF86BDED04000400050041050200ADE013B3E9F10001040002CF86BDED040003CF86BDED040004000500410502005C708ABFAC890001040002B3CEB5ED040003B3CEB5ED04000400050041050200BC81882E891C0001040002B7DCBCED040003B7DCBCED0400040005004105020057785543EB480001040002CF86BDED040003CF86BDED040004000500410502006FF0CE6CB4500001040002CF86BDED040003CF86BDED040004000500410502005CE13B7199D4000102000283ADE7E304000383ADE7E30400040005004105020063F610137D170001040002B7DCBCED040003B7DCBCED04000400050041050200DC887BC89E210001040002CF86BDED040003CF86BDED040004000500410502005D9324151E7F0001020002A7FDBCED040003CF86BDED04000400050041050200BC02D363924D00010400029FB2BCED0400039FB2BCED040004000500410502004F28848E1AC50001040002CF86BDED040003CF86BDED0400040005004105020054C606DD0D260001040002D984B5ED040003D984B5ED04000400050041050200D5F586558C850001040002BF89BBED040003BF89BBED0400040005004105020082582B0468CF00010400028788BCED0400038788BCED040004000500410502005CE21BB9BD7C00010400029FB2BCED0400039FB2BCED0400040005004105020059A9ACE3BC02000104000296DAAAED04000396DAAAED040004000500410502005557DB28EDA300010400028788BCED0400038788BCED0400040005004105020076ABA00FF52C0001040002CF86BDED040003CF86BDED0400040005004105020052185C5CB8440001040002B7DCBCED040003B7DCBCED04000400050041050200441402A770A800010200028788BCED0400038888BCED04000400050041050200516623CC99760001040002CF86BDED040003CF86BDED040004000500410502005A3D6D867C2A0001040002BF89BBED040003BF89BBED04000400050041050200BC70864FCE530001040002B3F7B4ED040003B3F7B4ED040004000500410502005E9C9B4E7A740001040002CF86BDED040003CF86BDED0400040005004105020058ABF63F0EA70001040002FCDDAAED040003FCDDAAED040004000500410502005556BDBE86AC000104000286FFB2ED04000386FFB2ED0400040005004105020059D0D49C9B8000010400028788BCED0400038788BCED0400040005004105020059A934952E920001040002B3F7B4ED040003B3F7B4ED040004000500410502007220ABEC82C80001040002B7DCBCED040003B7DCBCED04000400050041050200807AB45544310001040002BF89BBED040003BF89BBED04000400050041050200187A8DFCCDCF0001040002BF89BBED040003BF89BBED04000400050041050200616B5C35801000010400028788BCED0400038788BCED040004000500410502005ABCE5EAE3790001040002938AB5ED040003938AB5ED0400040005004105020048DF5F3311D10001020002F8FABCED040003CF86BDED04000400050041050200D3146B24D6340001040002CF86BDED040003CF86BDED0400040005004105020059037023AC7D00010400029FB2BCED0400039FB2BCED040004000500410502003EDD92C929340001040002BF89BBED040003BF89BBED040004000500410502004C4EB0C1270D0001040002CF86BDED040003CF86BDED04000400050041050200BCA300CD17370001040002CF86BDED040003CF86BDED040004000500410502005BC42D9E789A0001040002D7B3BBED040003D7B3BBED04000400050041050200589755D3E75F0001020002D884B5ED040003B3CEB5ED040004000500410502007A7CC86B21530001040002CF86BDED040003CF86BDED040004000500410502005352A2DA24D300010400028788BCED0400038788BCED0400040005004105020058C9F9B6A86F0001040002B7DCBCED040003B7DCBCED040004000500410502005706A79DEAE60001020002AFDFBAED040003ECE7BAED0400040005004105020082D1B28F7A3A0001040002CF86BDED040003CF86BDED0400040005004105020052217343E79C0001040002CF86BDED040003CF86BDED0400040005004105020082CEA3A289FE000104000296DAAAED04000396DAAAED04000400050041050200D9E0FF79D1180001040002B7DCBCED040003B7DCBCED0400040005004105020052FD31513EE90001040002938AB5ED040003938AB5ED0400040005004105020052128CCDBA7C00010400029FB2BCED0400039FB2BCED040004000500410502006FB83DA167580001040002CF86BDED040003CF86BDED040004000500410502002E14B9387F540001020002B7DCBCED040003CF86BDED040004000500410502004F7E6F098A990001040002CF86BDED040003CF86BDED040004000500410502005D98B7099E1F0001040002B7DCBCED040003B7DCBCED04000400050041050200722A7476317600010400029FB2BCED0400039FB2BCED04000400050041050200BC18CE5EBDA10001020002AFDFBAED040003ECE7BAED040004000500410502005CF890CF3E270001040002B7DCBCED040003B7DCBCED040004000500410502008D72AE6DBEE30001040002CF86BDED040003CF86BDED0400040005004105020076A6D8E9EAAB0001040002CF86BDED040003CF86BDED04000400050041050200721B63925A140001040002CF86BDED040003CF86BDED040004000500410502007608B348A53A0001040002CF86BDED040003CF86BDED04000400</HostCache>
-      <HttpsProxy>
-        <Enable>0</Enable>
-      </HttpsProxy>
-      <LastIP>-645574544</LastIP>
-      <LastProbingFailed>0</LastProbingFailed>
-      <ListeningPort>47500</ListeningPort>
-      <LoginServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </LoginServers>
-      <NatTracker>
-        <ContraProbeResults>217.133.80.112:1076 217.133.80.112:47500 217.133.80.112:1083 217.133.80.112:1083 217.133.80.112:49734</ContraProbeResults>
-        <PreviousNatType>7</PreviousNatType>
-        <ProbeResults>
-          <_1303289856>6C81442204F3D9855070B98CAE5879A505F3D9855070B98C4D4320134B66D9855070B98C5F4E60ED0D34D98550700434</_1303289856>
-          <_1303293952>4287274ED659D9855070B98C4287274ED74BD9855070B98C4287274EC15CD9855070B98C4287274ECE92D9855070B98C4287274EA75BD9855070B98C4287274E4B98D9855070B98C4287274EAA2DD9855070B98C4287274EA175D9855070B98C4287274ED735D9855070B98C4287274EAE25D9855070B98C4287274E1A2BD9855070B98C3D7D44372576D9855070B98CCF86DF304366D9855070B98C3D2E02A2259CD9855070B98C4287274EB98CD9855070B98C</_1303293952>
-          <_1303298048>2E3363049108D9855070B98C2E3795FA3202D9855070B98C2E2F6F42E86DD9855070B98CB4B0620AA528D9855070B98C</_1303298048>
-          <_1303306240>5F1894D8122BD9855070B98C2E40484969A3D9855070B98CD592A70A5566D9855070B98C2E26119F8DBED9855070B98C2E3754264E48D9855070B98C</_1303306240>
-          <_1303314432>4D2BFFCAEC6CD9855070043B54BAD08D05E0D9855070B98C9D9D4DA11995D9855070B98C59584CCBB5CED9855070B98C972AC71733DDD9855070B98C</_1303314432>
-          <_1303322624>5F3B0DCEB535D9855070043BD5150C1746D3D9855070B98C4D4B8646EF29D9855070B98CD5152F4D12BBD9855070B98C</_1303322624>
-          <_1303326720>59D0D11D89DCD9855070C2462E755D8E1E97D9855070B98C2E492F875789D9855070B98C2E378784E9C6D9855070B98C2E2F6F6B48FCD9855070B98C</_1303326720>
-        </ProbeResults>
-        <UsedIPList>
-          <_1303289856>9A4A56D31C619325C6601C71B23E13FDFAF5CA49F15C34A4E33F239B524D6BBC226021F010D2270A3B48DFA2E8CDB6FD37531B1118DB2D471CB980D0</_1303289856>
-          <_1303293952>D5A2186D0B45088ADDFA7B626C0904CED47E3DF13172672AED483E1EAD69DB781ABEC0D8812B1B5EFF91BC28C67FB5A3404D875A</_1303293952>
-          <_1303298048>DB0EC5161D10171C7C6A4C7109DD</_1303298048>
-          <_1303302144>5379BD98</_1303302144>
-          <_1303306240>88B19442A48D863ED54D712EEC36D53127BCE36653FE</_1303306240>
-          <_1303310336>1908404B0F7BA3BE952CB1C533456D3CDA410BCB774AF93880FB8BD8C110</_1303310336>
-          <_1303314432>4B015AD444DD027FD3F61B2A51A53BA0</_1303314432>
-          <_1303322624>878BAF81A9F053B39E35081485E24B4EDA5F79D37E176C409B6E237A336451F42CFA7CEC013C98A18B51</_1303322624>
-          <_1303326720>CFB137906F6CCE77246BD5B6B434875570B1F9B9140C85D5114EE6953110B04F3557C0D1686D46A9F69106521979AE49E19F8622F93A</_1303326720>
-          <_1303330816>BA4B81F735FDCDA4E4EF57ACF8A37051C66401E41CA4E562A5A49ACC2E246CCE</_1303330816>
-        </UsedIPList>
-      </NatTracker>
-      <PresenceServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </PresenceServers>
-      <SipServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </SipServers>
-      <SocksProxy>
-        <Enable>0</Enable>
-      </SocksProxy>
-      <StatsServers>
-        <DirectlyConnected>1</DirectlyConnected>
-      </StatsServers>
-    </Connection>
-    <Localnode>
-      <NodeID>9BF92EA4B417A7F6</NodeID>
-    </Localnode>
-    <PropsManager>
-      <PermaProps>4102030E322F322E302E302E37322F31373400000FF6EB9ADC04</PermaProps>
-    </PropsManager>
-    <VoiceEng>
-      <AGC>0</AGC>
-    </VoiceEng>
-  </Lib>
-  <UI>
-    <Installed>2</Installed>
-    <Language>en</Language>
-    <Pos>
-      <Height>357</Height>
-      <Width>258</Width>
-      <X>0</X>
-      <Y>0</Y>
-    </Pos>
-    <SavePassword>0</SavePassword>
-  </UI>
-</config>
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/config.lck b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/config.lck
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/config.xml b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/config.xml
deleted file mode 100644
index f7af8873ad..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/config.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<config version="1.0" serial="3315" timestamp="1303209780.1">
-  <Lib>
-    <Account>
-      <IdleTimeForAway>300</IdleTimeForAway>
-      <IdleTimeForNA>1800</IdleTimeForNA>
-      <Migration>63</Migration>
-    </Account>
-    <Call>
-      <DPC>41010300676D6172757A7A3400</DPC>
-      <FirstSkypeoutTime>1268962216</FirstSkypeoutTime>
-    </Call>
-    <CentralStorage>
-      <LastBackoff>0</LastBackoff>
-      <LastFailure>0</LastFailure>
-      <LastSync>1303202372</LastSync>
-      <NeedSync>0</NeedSync>
-      <SyncSet>
-        <p>
-          <email>35716ecf:2</email>
-          <profile>98e6c103:0</profile>
-        </p>
-        <u>&#10;        </u>
-      </SyncSet>
-    </CentralStorage>
-    <Chat>
-      <ActivityTS>1</ActivityTS>
-      <DialogPartner>3</DialogPartner>
-      <HistoryDays>65535</HistoryDays>
-      <MigrationDone>1266110339</MigrationDone>
-    </Chat>
-    <Contacts>
-      <Migration>1</Migration>
-    </Contacts>
-    <Message>
-      <DisableHistory>1</DisableHistory>
-    </Message>
-    <Notification>
-      <LastID>1000000166</LastID>
-      <LastPoll>1303166852</LastPoll>
-      <LastSearch>1303209779</LastSearch>
-    </Notification>
-    <PM>
-      <pslut>1267114269</pslut>
-    </PM>
-    <ProfilePopulated>2</ProfilePopulated>
-    <PropsManager>
-      <PermaProps>4109008620EBA4DDDB0400FA0100009E2001009420FB09008520B1A58BDD04008120CCD9E6E3040093209B0A00F501820200F801A3B608</PermaProps>
-    </PropsManager>
-    <StatsSender>
-      <CollectorLastSent>1267114267</CollectorLastSent>
-      <CollectorSeq>11</CollectorSeq>
-      <Saved>4263C0064DD5ACF9A03594DAB928D2B81510</Saved>
-    </StatsSender>
-    <Video>
-      <AdvertPolicy>noone</AdvertPolicy>
-      <Disable>1</Disable>
-      <RecvPolicy>noone</RecvPolicy>
-    </Video>
-    <table_insert_history>
-      <_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>1303296179 23160:21600:1303209779 9589:7200:1303209779 8707:21600:1303209779</_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>
-    </table_insert_history>
-  </Lib>
-  <UI>
-    <API>
-      <Authorizations>skypopen</Authorizations>
-      <BlockedPrograms></BlockedPrograms>
-    </API>
-    <AutoUpdate>0</AutoUpdate>
-    <CaptureDevice>2</CaptureDevice>
-    <RingDevice>2</RingDevice>
-    <SoundDevice>2</SoundDevice>
-  </UI>
-</config>
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/httpfe/cookies.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/httpfe/cookies.dat
deleted file mode 100644
index fc7f2b1150..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/httpfe/cookies.dat
+++ /dev/null
@@ -1 +0,0 @@
-B
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/index2.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/index2.dat
deleted file mode 100644
index b8b96d8431..0000000000
Binary files a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/index2.dat and /dev/null differ
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/main.lock b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameA/main.lock
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/config.lck b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/config.lck
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/config.xml b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/config.xml
deleted file mode 100644
index f7af8873ad..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/config.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<config version="1.0" serial="3315" timestamp="1303209780.1">
-  <Lib>
-    <Account>
-      <IdleTimeForAway>300</IdleTimeForAway>
-      <IdleTimeForNA>1800</IdleTimeForNA>
-      <Migration>63</Migration>
-    </Account>
-    <Call>
-      <DPC>41010300676D6172757A7A3400</DPC>
-      <FirstSkypeoutTime>1268962216</FirstSkypeoutTime>
-    </Call>
-    <CentralStorage>
-      <LastBackoff>0</LastBackoff>
-      <LastFailure>0</LastFailure>
-      <LastSync>1303202372</LastSync>
-      <NeedSync>0</NeedSync>
-      <SyncSet>
-        <p>
-          <email>35716ecf:2</email>
-          <profile>98e6c103:0</profile>
-        </p>
-        <u>&#10;        </u>
-      </SyncSet>
-    </CentralStorage>
-    <Chat>
-      <ActivityTS>1</ActivityTS>
-      <DialogPartner>3</DialogPartner>
-      <HistoryDays>65535</HistoryDays>
-      <MigrationDone>1266110339</MigrationDone>
-    </Chat>
-    <Contacts>
-      <Migration>1</Migration>
-    </Contacts>
-    <Message>
-      <DisableHistory>1</DisableHistory>
-    </Message>
-    <Notification>
-      <LastID>1000000166</LastID>
-      <LastPoll>1303166852</LastPoll>
-      <LastSearch>1303209779</LastSearch>
-    </Notification>
-    <PM>
-      <pslut>1267114269</pslut>
-    </PM>
-    <ProfilePopulated>2</ProfilePopulated>
-    <PropsManager>
-      <PermaProps>4109008620EBA4DDDB0400FA0100009E2001009420FB09008520B1A58BDD04008120CCD9E6E3040093209B0A00F501820200F801A3B608</PermaProps>
-    </PropsManager>
-    <StatsSender>
-      <CollectorLastSent>1267114267</CollectorLastSent>
-      <CollectorSeq>11</CollectorSeq>
-      <Saved>4263C0064DD5ACF9A03594DAB928D2B81510</Saved>
-    </StatsSender>
-    <Video>
-      <AdvertPolicy>noone</AdvertPolicy>
-      <Disable>1</Disable>
-      <RecvPolicy>noone</RecvPolicy>
-    </Video>
-    <table_insert_history>
-      <_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>1303296179 23160:21600:1303209779 9589:7200:1303209779 8707:21600:1303209779</_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>
-    </table_insert_history>
-  </Lib>
-  <UI>
-    <API>
-      <Authorizations>skypopen</Authorizations>
-      <BlockedPrograms></BlockedPrograms>
-    </API>
-    <AutoUpdate>0</AutoUpdate>
-    <CaptureDevice>2</CaptureDevice>
-    <RingDevice>2</RingDevice>
-    <SoundDevice>2</SoundDevice>
-  </UI>
-</config>
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/httpfe/cookies.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/httpfe/cookies.dat
deleted file mode 100644
index fc7f2b1150..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/httpfe/cookies.dat
+++ /dev/null
@@ -1 +0,0 @@
-B
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/index2.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/index2.dat
deleted file mode 100644
index b8b96d8431..0000000000
Binary files a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/index2.dat and /dev/null differ
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/main.lock b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameB/main.lock
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/config.lck b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/config.lck
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/config.xml b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/config.xml
deleted file mode 100644
index f7af8873ad..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/config.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<config version="1.0" serial="3315" timestamp="1303209780.1">
-  <Lib>
-    <Account>
-      <IdleTimeForAway>300</IdleTimeForAway>
-      <IdleTimeForNA>1800</IdleTimeForNA>
-      <Migration>63</Migration>
-    </Account>
-    <Call>
-      <DPC>41010300676D6172757A7A3400</DPC>
-      <FirstSkypeoutTime>1268962216</FirstSkypeoutTime>
-    </Call>
-    <CentralStorage>
-      <LastBackoff>0</LastBackoff>
-      <LastFailure>0</LastFailure>
-      <LastSync>1303202372</LastSync>
-      <NeedSync>0</NeedSync>
-      <SyncSet>
-        <p>
-          <email>35716ecf:2</email>
-          <profile>98e6c103:0</profile>
-        </p>
-        <u>&#10;        </u>
-      </SyncSet>
-    </CentralStorage>
-    <Chat>
-      <ActivityTS>1</ActivityTS>
-      <DialogPartner>3</DialogPartner>
-      <HistoryDays>65535</HistoryDays>
-      <MigrationDone>1266110339</MigrationDone>
-    </Chat>
-    <Contacts>
-      <Migration>1</Migration>
-    </Contacts>
-    <Message>
-      <DisableHistory>1</DisableHistory>
-    </Message>
-    <Notification>
-      <LastID>1000000166</LastID>
-      <LastPoll>1303166852</LastPoll>
-      <LastSearch>1303209779</LastSearch>
-    </Notification>
-    <PM>
-      <pslut>1267114269</pslut>
-    </PM>
-    <ProfilePopulated>2</ProfilePopulated>
-    <PropsManager>
-      <PermaProps>4109008620EBA4DDDB0400FA0100009E2001009420FB09008520B1A58BDD04008120CCD9E6E3040093209B0A00F501820200F801A3B608</PermaProps>
-    </PropsManager>
-    <StatsSender>
-      <CollectorLastSent>1267114267</CollectorLastSent>
-      <CollectorSeq>11</CollectorSeq>
-      <Saved>4263C0064DD5ACF9A03594DAB928D2B81510</Saved>
-    </StatsSender>
-    <Video>
-      <AdvertPolicy>noone</AdvertPolicy>
-      <Disable>1</Disable>
-      <RecvPolicy>noone</RecvPolicy>
-    </Video>
-    <table_insert_history>
-      <_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>1303296179 23160:21600:1303209779 9589:7200:1303209779 8707:21600:1303209779</_59908281a5de1c9c602d40fe1f815199a1601558ebea75accdfae8b723bb342e>
-    </table_insert_history>
-  </Lib>
-  <UI>
-    <API>
-      <Authorizations>skypopen</Authorizations>
-      <BlockedPrograms></BlockedPrograms>
-    </API>
-    <AutoUpdate>0</AutoUpdate>
-    <CaptureDevice>2</CaptureDevice>
-    <RingDevice>2</RingDevice>
-    <SoundDevice>2</SoundDevice>
-  </UI>
-</config>
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/httpfe/cookies.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/httpfe/cookies.dat
deleted file mode 100644
index fc7f2b1150..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/httpfe/cookies.dat
+++ /dev/null
@@ -1 +0,0 @@
-B
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/index2.dat b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/index2.dat
deleted file mode 100644
index b8b96d8431..0000000000
Binary files a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/index2.dat and /dev/null differ
diff --git a/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/main.lock b/src/mod/endpoints/mod_skypopen/configs/skype-client-configuration-dir-template/skypeclient01/skypenameC/main.lock
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/mod/endpoints/mod_skypopen/configs/skypopen.conf.xml b/src/mod/endpoints/mod_skypopen/configs/skypopen.conf.xml
deleted file mode 100644
index c03fd718e0..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/skypopen.conf.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<configuration name="skypopen.conf" description="Skypopen Configuration">
-  <global_settings>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="default"/>
-    <param name="destination" value="5000"/>
-    <param name="skype_user" value="user1"/>
-    <param name="report_incoming_chatmessages" value="true"/>
-    <param name="silent_mode" value="false"/>
-    <param name="write_silence_when_idle" value="true"/>
-    <param name="setsockopt" value="true"/>
-  </global_settings>
-  <!-- one entry here per each skypopen interface -->
-  <per_interface_settings>
-    <interface id="1" name="interface1">
-        <param name="X11-display" value=":101"/>
-        <param name="skype_user" value="user1"/>
-    </interface>
-    <interface id="2" name="interface2">
-        <param name="X11-display" value=":102"/>
-        <param name="skype_user" value="user2"/>
-    </interface>
-<!-- following interfaces are commented out
-    <interface id="3" name="interface3">
-        <param name="X11-display" value=":103"/>
-        <param name="skype_user" value="user3"/>
-    </interface>
-    <interface id="4" name="interface4">
-        <param name="X11-display" value=":104"/>
-        <param name="skype_user" value="user4"/>
-    </interface>
--->
-  </per_interface_settings>
-</configuration>
-
diff --git a/src/mod/endpoints/mod_skypopen/configs/startskype.bat b/src/mod/endpoints/mod_skypopen/configs/startskype.bat
deleted file mode 100644
index 5624b02af4..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/startskype.bat
+++ /dev/null
@@ -1,52 +0,0 @@
-echo off
-REM
-REM you MUST use the new Skype (4.x) for Windows, older versions (3.x) cannot be started this way
-REM
-REM you have to adjust PATH to where the Skype executable is
-set PATH=%PATH%;C:\Program Files\Skype\Phone\
-
-echo %PATH%
-
-REM start a Skype client instance that will login to the Skype network using the "username password" you give to it. Here xxx would be the password and user1 the username
-start Skype.exe /secondary /username:user1 /password:xxx
-call wait 7
-start Skype.exe /secondary /username:user2 /password:xxx
-call wait 7
-REM 
-REM Following Skype client instances are commented out
-REM
-REM start Skype.exe /secondary /username:user3 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user4 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user5 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user6 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user7 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user8 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user9 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user10 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user11 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user12 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user13 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user14 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user15 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user16 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user17 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user18 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user19 /password:xxx
-REM call wait 7
-REM start Skype.exe /secondary /username:user20 /password:xxx
diff --git a/src/mod/endpoints/mod_skypopen/configs/wait.bat b/src/mod/endpoints/mod_skypopen/configs/wait.bat
deleted file mode 100644
index 8381230f47..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/wait.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-REM would you believe there is no sleep() in standard windows batchfiles?
-@ping 127.0.0.1 -n 2 -w 1000 > nul
-@ping 127.0.0.1 -n %1% -w 1000> nul
-
diff --git a/src/mod/endpoints/mod_skypopen/configs/windows-service/startskype.cmd b/src/mod/endpoints/mod_skypopen/configs/windows-service/startskype.cmd
deleted file mode 100644
index 505a36c4b5..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/windows-service/startskype.cmd
+++ /dev/null
@@ -1,61 +0,0 @@
-echo off
-
-REM
-REM you MUST use the new Skype (4.x) for Windows, older versions (3.x) cannot be started this way
-REM
-REM you have to adjust PATH to where the Skype executable is
-set PATH=%PATH%;C:\Program Files\Skype\Phone\
-
-REM echo %PATH%
-
-REM start a Skype client instance that will login to the Skype network using the "username password" you give to it. 
-REM Here xxxx would be the password and user20 the username
-
-start Skype.exe /secondary /username:user20 /password:xxxx
-call C:\wait.cmd 20
-
-start Skype.exe /secondary /username:user19 /password:xxxx
-call C:\wait.cmd 5
-
-REM 
-REM Following Skype client instances are commented out
-REM
-
-REM start Skype.exe /secondary /username:user18 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user17 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user16 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user15 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user14 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user13 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user12 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user11 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user10 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user9 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user8 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user7 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user6 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user5 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user4 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user3 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user2 /password:xxxx
-REM call C:\wait.cmd 5
-REM start Skype.exe /secondary /username:user1 /password:xxxx
-call C:\wait.cmd 120
-NET start AICCU2
-pause 
diff --git a/src/mod/endpoints/mod_skypopen/configs/windows-service/wait.cmd b/src/mod/endpoints/mod_skypopen/configs/windows-service/wait.cmd
deleted file mode 100644
index 8381230f47..0000000000
--- a/src/mod/endpoints/mod_skypopen/configs/windows-service/wait.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-REM would you believe there is no sleep() in standard windows batchfiles?
-@ping 127.0.0.1 -n 2 -w 1000 > nul
-@ping 127.0.0.1 -n %1% -w 1000> nul
-
diff --git a/src/mod/endpoints/mod_skypopen/install/install.pl b/src/mod/endpoints/mod_skypopen/install/install.pl
deleted file mode 100755
index e449f0ad2e..0000000000
--- a/src/mod/endpoints/mod_skypopen/install/install.pl
+++ /dev/null
@@ -1,365 +0,0 @@
-#!/usr/bin/perl
-
-my $myname ;
-my $skype_download_url = "http://download.skype.com/linux/skype-4.3.0.37.tar.bz2";
-my $skype_download_pkg = "skype-4.3.0.37.tar.bz2";
-my $skype_binary_dir = "/usr/local/freeswitch/skypopen/skype-clients-symlinks-dir";
-my $skype_download_dir = "/tmp/skype_download";
-my $skype_unpacked_dir = "skype-4.3.0.37";
-my $skype_share_dir = "/usr/share/skype";
-my $freeswitch_modules_config_dir = "/usr/local/freeswitch/conf/autoload_configs";
-my $skypopen_sound_driver_dir = "/usr/local/freeswitch/skypopen/skypopen-sound-driver-dir";
-my $skype_config_dir = "/usr/local/freeswitch/skypopen/skype-clients-configuration-dir";
-my $skype_startup_dir = "/usr/local/freeswitch/skypopen/skype-clients-startup-dir";
-my $skype_symlinks_dir = "/usr/local/freeswitch/skypopen/skype-clients-symlinks-dir";
-my $skype_clients_to_be_launched = "5";
-my $skype_clients_starting_number = "100";
-my $multi_skypeusername = "one";
-my $skype_username = "your_own_skype_username";
-my $skype_password = "your_own_skype_password";
-my @skype_username_array;
-my @skype_password_array;
-my $sure = "nope";
-
-### PRESENTATION ###
-system("clear");
-printf("\n");
-printf("This is the interactive installation helper for Skypopen\n");
-printf("(http://wiki.freeswitch.org/wiki/Mod_skypopen_Skype_Endpoint_and_Trunk)\n");
-printf("\n");
-printf("Especially designed for FreeSWITCH\n");
-printf("by Giovanni Maruzzelli\n");
-printf("\n");
-printf("Please direct all questions or issues to the FreeSWITCH mailing list or Jira\n");
-printf("(http://lists.freeswitch.org/mailman/listinfo or https://freeswitch.org/jira)\n");
-printf("\n");
-printf("\n");
-printf("I'll ask you questions, giving default answers in square brackets [] if any\n");
-printf("To accept the default, just press Enter\n");
-printf("You'll be prompted to confirm your answer at each step\n");
-printf("At the end of questions, before I do anything, I'll let you review it all\n");
-printf("To abort, press Ctrl-C\n");
-printf("\n");
-printf("\n");
-printf("Let's start asking your name, so you see how the question/answer works\n");
-printf("To accept the default, just press Enter\n");
-$myname = &promptUser("Enter your name ", "Giovanni");
-system("clear");
-printf("\n");
-printf("OK %s, GREAT! Let's start real questions! (At any time, Ctrl-C to abort)\n", $myname);
-printf("\n");
-printf("At the end of questions, before I do anything, I'll let you review all your answers, don't worry! :)\n");
-printf("\n");
-printf("\n");
-
-### ASKING QUESTIONS ###
-
-printf("I'm about to download the Skype client for Linux version 2.0.0.72 for OSS\n");
-printf("nicely repackaged by Arch Linux with official Skype permission.\n");
-printf("I need to create a directory to download and unpack the Skype client\n");
-printf("To accept the default, just press Enter\n");
-$skype_download_dir = &promptUser("Enter the full path of the Skype download directory ", "$skype_download_dir");
-system("clear");
-printf("\n");
-printf("I'm about to install the Skype client\n");
-printf("I would put the binary in $skype_binary_dir and the associated files in $skype_share_dir\n");
-printf("Location of associated files is mandatory ($skype_share_dir)\n");
-printf("Location of binary is recommended ($skype_binary_dir)\n");
-printf("To accept the default, just press Enter\n");
-$skype_binary_dir = &promptUser("Enter the directory full path for Skype client binary ", "$skype_binary_dir");
-system("clear");
-printf("\n");
-printf("I'm about to create the FreeSWITCH configuration file for mod_skypopen (skypopen.conf.xml)\n");
-printf("I need to know where to put it, eg: where is the FreeSWITCH modules' config dir\n");
-printf("To accept the default, just press Enter\n");
-$freeswitch_modules_config_dir = &promptUser("Enter the directory full path for FreeSWITCH modules' config files ", "$freeswitch_modules_config_dir");
-system("clear");
-printf("\n");
-printf("I'm about to create the directory where to put our fake sound driver\n");
-printf("Location of fake sound driver directory is where you like it more :)\n");
-printf("To accept the default, just press Enter\n");
-$skypopen_sound_driver_dir = &promptUser("Enter the directory full path for fake sound driver ", "$skypopen_sound_driver_dir");
-system("clear");
-printf("\n");
-printf("I'm about to create the configuration directory needed by the Skype clients\n");
-printf("Location of Skype clients configuration directory is where you like it more :)\n");
-printf("To accept the default, just press Enter\n");
-$skype_config_dir = &promptUser("Enter the directory full path for Skype clients config ", "$skype_config_dir");
-system("clear");
-printf("\n");
-printf("I'm about to create a directory where I'll put the Skype clients startup script\n");
-printf("Location of Skype clients startup script directory is where you like it more :)\n");
-printf("To accept the default, just press Enter\n");
-$skype_startup_dir = &promptUser("Enter the directory full path for Skype clients startup script ", "$skype_startup_dir");
-system("clear");
-printf("\n");
-printf("I'm about to create the directory for symlinks needed by the Skype clients startup script\n");
-printf("Location of symlinks directory is where you like it more :)\n");
-printf("To accept the default, just press Enter\n");
-$skype_symlinks_dir = &promptUser("Enter the directory full path for Skype clients symlinks ", "$skype_symlinks_dir");
-system("clear");
-printf("\n");
-printf("How many Skype clients (channels) do you want to launch?\n");
-printf("Each Skype client will be one channel to FreeSWITCH and use approx 70MB of ram\n");
-printf("A quad core CPU can very easily support 20 or more Skype clients\n");
-printf("Each Skype client allows one concurrent call\n");
-printf("Eg: if you plan to have a max of 10 concurrent (outbound and/or inbound) Skype calls then enter 10\n");
-printf("To accept the default, just press Enter\n");
-$skype_clients_to_be_launched = &promptUser("Enter how many Skype clients will be launched ", "$skype_clients_to_be_launched");
-system("clear");
-printf("\n");
-
-
-while(1){
-	printf("You want all of the Skype clients to use the same Skype login (skypeusername)?\n");
-	printf("eg: you want all of your skypopen channels to be Bob on the Skype network, or you want channel skype01 to be Bob, channel skype02 to be Alice, etc?\n");
-	printf("Please answer 'one' for all channels using the same Skype login (you'll be asked just one time for Skype login and password) or 'multi' for being asked for each channel\n");
-	printf("\n");
-	$multi_skypeusername = &promptUser("Enter 'one' or 'multi' ", "$multi_skypeusername");
-	system("clear");
-	printf("\n");
-	if($multi_skypeusername eq "one" or $multi_skypeusername eq "multi"){
-		last;
-	}
-}
-
-
-if($multi_skypeusername eq "one"){
-	printf("I need the Skype username which will be used by ALL the Skype clients to be launched\n");
-	printf("(That's the one-word you registered as login to the Skype network)\n");
-	printf("This installer will create the needed files to launch concurrently many (or one) instances of it\n");
-	printf("\n");
-	printf("NB: DON'T ACCEPT the DEFAULT, write YOUR OWN\n");
-	$skype_username = &promptUser("Enter the Skype clients username ", "$skype_username");
-	for($count=1; $count <= $skype_clients_to_be_launched ; $count++){
-		$skype_username_array[$count] = $skype_username;
-	}
-	system("clear");
-	printf("\n");
-	printf("I need the Skype password which will be used by ALL the Skype clients to be launched\n");
-	printf("(That's the one-word you registered as password to the Skype network)\n");
-	printf("\n");
-	printf("NB: DON'T ACCEPT the DEFAULT, write YOUR OWN\n");
-	$skype_password = &promptUser("Enter the Skype clients password ", "$skype_password");
-	for($count=1; $count <= $skype_clients_to_be_launched ; $count++){
-		$skype_password_array[$count] = $skype_password;
-	}
-	system("clear");
-} else {
-	for($count=1; $count <= $skype_clients_to_be_launched ; $count++){
-		$skype_client_extension = $skype_clients_starting_number + $count ;
-		printf("I need the Skype username which will be used by the Skype client for channel 'skype$skype_client_extension'\n");
-		printf("(That's the one-word you registered as login to the Skype network)\n");
-		printf("\n");
-		printf("NB: DON'T ACCEPT the DEFAULT, write YOUR OWN\n");
-		$skype_username = &promptUser("Enter the Skype username for channel 'skype$skype_client_extension'", "$skype_username");
-		$skype_username_array[$count] = $skype_username;
-		system("clear");
-		printf("\n");
-		printf("I need the Skype password which will be used by the Skype client 'skype$skype_client_extension'\n");
-		printf("(That's the one-word you registered as password to the Skype network)\n");
-		printf("\n");
-		printf("NB: DON'T ACCEPT the DEFAULT, write YOUR OWN\n");
-		$skype_password = &promptUser("Enter the Skype password for '$skype_username'", "$skype_password");
-		$skype_password_array[$count] = $skype_password;
-		system("clear");
-	}
-
-}
-
-### GETTING FINAL APPROVAL ###
-printf("\n");
-printf("Please check the following values:\n");
-printf("\n");
-printf("directory for downloading and unpacking Skype client:\n'$skype_download_dir'\n");
-printf("directory for Skype client binary:\n'$skype_binary_dir'\n");
-printf("directory for FreeSWITCH modules' configs:\n'$freeswitch_modules_config_dir'\n");
-printf("directory for fake sound driver:\n'$skypopen_sound_driver_dir'\n");
-printf("directory for Skype clients configs:\n'$skype_config_dir'\n");
-printf("directory for Skype clients startup script:\n'$skype_startup_dir'\n");
-printf("directory for Skype clients symlinks:\n'$skype_symlinks_dir'\n");
-printf("how many Skype clients to launch: '$skype_clients_to_be_launched'\n");
-if($multi_skypeusername eq "one"){
-	printf("Skype login: '$skype_username'\n");
-	printf("Skype password: '$skype_password'\n");
-}else {
-	for($count=1; $count <= $skype_clients_to_be_launched ; $count++){
-		$skype_client_extension = $skype_clients_starting_number + $count ;
-		printf("channel='skype$skype_client_extension' Skype login='$skype_username_array[$count]' Skype password='$skype_password_array[$count]'\n");
-	}
-}
-
-$sure = &promptUser("Are you sure you like the values? Write 'sure' for yes ", "$sure");
-if($sure ne "sure"){
-	printf("No problem, please relaunch the installer and begin again\n");
-	exit 0;
-}
-system("clear");
-
-printf("\n");
-printf("GREAT! Please stand back, I'm working...\n");
-printf("\n");
-
-#### EXECUTION ###
-
-system("mkdir -p $skype_download_dir");
-system("cd $skype_download_dir ; wget -c $skype_download_url");
-system("cd $skype_download_dir ; tar -xjf $skype_download_pkg");
-
-system("mkdir -p $skype_binary_dir");
-system("cd $skype_download_dir/$skype_unpacked_dir ; cp skype $skype_binary_dir/");
-
-system("mkdir -p $skype_share_dir");
-system("cd $skype_download_dir/$skype_unpacked_dir ; cp -a avatars $skype_share_dir/");
-system("cd $skype_download_dir/$skype_unpacked_dir ; cp -a sounds $skype_share_dir/");
-system("cd $skype_download_dir/$skype_unpacked_dir ; cp -a lang $skype_share_dir/");
-system("cd $skype_download_dir/$skype_unpacked_dir ; cp -a icons $skype_share_dir/");
-
-
-system("mkdir -p $skype_config_dir");
-system("mkdir -p $skype_startup_dir");
-system("mkdir -p $skype_symlinks_dir");
-
-system("echo \"<configuration name=\\\"skypopen.conf\\\" description=\\\"Skypopen Configuration\\\">\" > $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"<global_settings>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"  <param name=\\\"dialplan\\\" value=\\\"XML\\\"/>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"  <param name=\\\"context\\\" value=\\\"default\\\"/>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"  <param name=\\\"destination\\\" value=\\\"5000\\\"/>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"  <param name=\\\"skype_user\\\" value=\\\"$skype_username\\\"/>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"  <param name=\\\"report_incoming_chatmessages\\\" value=\\\"false\\\"/>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"  <param name=\\\"write_silence_when_idle\\\" value=\\\"false\\\"/>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"  <param name=\\\"setsockopt\\\" value=\\\"true\\\"/>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"</global_settings>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"<!-- one entry follows per each skypopen interface -->\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"<per_interface_settings>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-
-
-system("echo \"#!/bin/sh\" > $skype_startup_dir/start_skype_clients.sh");
-system("echo >> $skype_startup_dir/start_skype_clients.sh");
-system("echo >> $skype_startup_dir/start_skype_clients.sh");
-
-
-for ($count = 1; $count <= $skype_clients_to_be_launched; $count++) {
-	$skype_client_extension = $skype_clients_starting_number + $count ;
-	$skype_login=$skype_username_array[$count];
-	$skype_passwd=$skype_password_array[$count];
-	system("ln -s $skype_binary_dir/skype $skype_symlinks_dir/skype$skype_client_extension");
-	system("mkdir -p $skype_config_dir/skype$skype_client_extension");
-	system("cp -a ../configs/skype-client-configuration-dir-template/skypeclient01/shared.* $skype_config_dir/skype$skype_client_extension");
-	system("cp -a ../configs/skype-client-configuration-dir-template/skypeclient01/skypenameA $skype_config_dir/skype$skype_client_extension/$skype_login");
-
-	system("echo \" <interface id=\\\"$count\\\" name=\\\"skype$skype_client_extension\\\">\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-	if($multi_skypeusername ne "one"){
-		system("echo \" <param name=\\\"skype_user\\\" value=\\\"$skype_login\\\"/>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-	}
-	system("echo \" <param name=\\\"X11-display\\\" value=\\\":$skype_client_extension\\\"/>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-	system("echo \" </interface>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-
-	system("echo \"#start the fake X server on the given port\" >> $skype_startup_dir/start_skype_clients.sh");
-	system("echo \"/usr/bin/Xvfb :$skype_client_extension -ac -nolisten tcp -screen 0 640x480x8 &\" >> $skype_startup_dir/start_skype_clients.sh");
-	system("echo \"sleep 3\" >> $skype_startup_dir/start_skype_clients.sh");
-	system("echo \"# start a Skype client instance that will connect to the X server above, and will login to the Skype network using the 'username password' you send to it on stdin.\" >> $skype_startup_dir/start_skype_clients.sh");
-	system("echo \"su root -c \\\"/bin/echo '$skype_login $skype_passwd'| DISPLAY=:$skype_client_extension  $skype_symlinks_dir/skype$skype_client_extension --dbpath=$skype_config_dir/skype$skype_client_extension --pipelogin &\\\"\" >> $skype_startup_dir/start_skype_clients.sh");
-	system("echo \"sleep 7\" >> $skype_startup_dir/start_skype_clients.sh");
-	system("echo >> $skype_startup_dir/start_skype_clients.sh");
-}
-
-system("echo \"</per_interface_settings>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-system("echo \"</configuration>\" >> $freeswitch_modules_config_dir/skypopen.conf.xml");
-
-system("echo \"exit 0\" >> $skype_startup_dir/start_skype_clients.sh");
-
-
-printf("\n");
-printf("SUCCESS!!!\n");
-printf("\n");
-
-
-#=========================================================================#
-
-
-#-------------------------------------------------------------------------#
-# promptUser, a Perl subroutine to prompt a user for input.
-# Copyright 2010 Alvin Alexander, devdaily.com.
-# This code is shared here under the 
-# Creative Commons Attribution-ShareAlike Unported 3.0 license.
-# See http://creativecommons.org/licenses/by-sa/3.0/ for more information.
-#-------------------------------------------------------------------------#
-
-# Original at: http://www.devdaily.com/perl/edu/articles/pl010005
-# Modified to get confirmations by Giovanni Maruzzelli
-
-#----------------------------(  promptUser  )-----------------------------#
-#                                                                         #
-#  FUNCTION:	promptUser                                                #
-#                                                                         #
-#  PURPOSE:	Prompt the user for some type of input, and return the    #
-#		input back to the calling program.                        #
-#                                                                         #
-#  ARGS:	$promptString - what you want to prompt the user with     #
-#		$defaultValue - (optional) a default value for the prompt #
-#                                                                         #
-#-------------------------------------------------------------------------#
-
-sub promptUser {
-
-#-------------------------------------------------------------------#
-#  two possible input arguments - $promptString, and $defaultValue  #
-#  make the input arguments local variables.                        #
-#-------------------------------------------------------------------#
-
-	local($promptString,$defaultValue) = @_;
-	local $input;
-	local $confirm;
-	local $gave;
-
-#-------------------------------------------------------------------#
-#  if there is a default value, use the first print statement; if   #
-#  no default is provided, print the second string.                 #
-#-------------------------------------------------------------------#
-
-	while(1){
-		printf("\n");
-		if ($defaultValue) {
-			print $promptString, "\n[", $defaultValue, "]: ";
-		} else {
-			print $promptString, ": ";
-		}
-
-		$| = 1;               # force a flush after our print
-			$input = <STDIN>;         # get the input from STDIN (presumably the keyboard)
-
-
-#------------------------------------------------------------------#
-# remove the newline character from the end of the input the user  #
-# gave us.                                                         #
-#------------------------------------------------------------------#
-
-			chomp($input);
-
-		$gave = $input ? $input : $defaultValue;
-		print("You gave: '$gave'\nIt's OK? Please answer 'Y' for yes or 'N' for not [N]: ");
-		$| = 1;               # force a flush after our print
-			$confirm = <STDIN>;
-		chomp($confirm);
-		if($confirm eq "Y" or $confirm eq "y"){
-			last;
-		}
-	}
-#-----------------------------------------------------------------#
-#  if we had a $default value, and the user gave us input, then   #
-#  return the input; if we had a default, and they gave us no     #
-#  no input, return the $defaultValue.                            #
-#                                                                 # 
-#  if we did not have a default value, then just return whatever  #
-#  the user gave us.  if they just hit the <enter> key,           #
-#  the calling routine will have to deal with that.               #
-#-----------------------------------------------------------------#
-
-	if ("$defaultValue") {
-		return $input ? $input : $defaultValue;    # return $_ if it has a value
-	} else {
-		return $input;
-	}
-}
-
diff --git a/src/mod/endpoints/mod_skypopen/mod_skypopen.2015.vcxproj b/src/mod/endpoints/mod_skypopen/mod_skypopen.2015.vcxproj
deleted file mode 100644
index bb8fd5eda9..0000000000
--- a/src/mod/endpoints/mod_skypopen/mod_skypopen.2015.vcxproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_skypopen</ProjectName>
-    <ProjectGuid>{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}</ProjectGuid>
-    <RootNamespace>mod_skypopen</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)\w32\tiff.props" />
-    <Import Project="$(SolutionDir)\w32\spandsp.props"/>
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src\msvc;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src;%(RootDir)%(Directory)..\..\..\..\libs\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <DisableSpecificWarnings>28252;28253;4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>rpcrt4.lib  "..\..\..\..\libs\spandsp\src\Win32\Debug\libtiff.lib" "..\..\..\..\Win32\Debug\libspandsp.lib" %(AdditionalOptions)</AdditionalOptions>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src\msvc;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src;%(RootDir)%(Directory)..\..\..\..\libs\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <DisableSpecificWarnings>28183;28252;28253;4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>rpcrt4.lib  "..\..\..\..\libs\spandsp\src\x64\Debug\libtiff.lib" "..\..\..\..\x64\Debug\libspandsp.lib" %(AdditionalOptions)</AdditionalOptions>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src\msvc;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src;%(RootDir)%(Directory)..\..\..\..\libs\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>28252;28253;4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>rpcrt4.lib "..\..\..\..\libs\spandsp\src\Win32\Release\libtiff.lib" "..\..\..\..\Win32\Release\libspandsp.lib" %(AdditionalOptions)</AdditionalOptions>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src\msvc;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src;%(RootDir)%(Directory)..\..\..\..\libs\jpeg-8d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>28252;28253;4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>rpcrt4.lib "..\..\..\..\libs\spandsp\src\x64\Release\libtiff.lib" "..\..\..\..\x64\Release\libspandsp.lib" %(AdditionalOptions)</AdditionalOptions>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_skypopen.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="skypopen_protocol.c">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </AdditionalOptions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="skypopen.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2015.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_skypopen/mod_skypopen.c b/src/mod/endpoints/mod_skypopen/mod_skypopen.c
deleted file mode 100644
index ccfcc0d567..0000000000
--- a/src/mod/endpoints/mod_skypopen/mod_skypopen.c
+++ /dev/null
@@ -1,3403 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * This module (mod_gsmopen) has been contributed by:
- *
- * Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * Maintainer: Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * mod_skypopen.c -- Skype compatible Endpoint Module
- *
- */
-
-
-#include "skypopen.h"
-#define SKYPE_CHAT_PROTO "skype"
-
-#ifdef WIN32
-/***************/
-// from http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/
-
-#include <time.h>
-
-#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
-#else /*  */
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
-#endif /*  */
-struct sk_timezone {
-	int tz_minuteswest;			/* minutes W of Greenwich */
-	int tz_dsttime;				/* type of dst correction */
-};
-int gettimeofday(struct timeval *tv, struct sk_timezone *tz)
-{
-	FILETIME ft;
-	unsigned __int64 tmpres = 0;
-	static int tzflag;
-	if (NULL != tv) {
-		GetSystemTimeAsFileTime(&ft);
-		tmpres |= ft.dwHighDateTime;
-		tmpres <<= 32;
-		tmpres |= ft.dwLowDateTime;
-
-		/*converting file time to unix epoch */
-		tmpres /= 10;			/*convert into microseconds */
-		tmpres -= DELTA_EPOCH_IN_MICROSECS;
-		tv->tv_sec = (long) (tmpres / 1000000UL);
-		tv->tv_usec = (long) (tmpres % 1000000UL);
-	}
-	if (NULL != tz) {
-		if (!tzflag) {
-			_tzset();
-			tzflag++;
-		}
-		tz->tz_minuteswest = _timezone / 60;
-		tz->tz_dsttime = _daylight;
-	}
-	return 0;
-}
-
-/***************/
-#endif /* WIN32 */
-SWITCH_MODULE_LOAD_FUNCTION(mod_skypopen_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown);
-SWITCH_MODULE_DEFINITION(mod_skypopen, mod_skypopen_load, mod_skypopen_shutdown, NULL);
-SWITCH_STANDARD_API(sk_function);
-/* BEGIN: Changes here */
-#define SK_SYNTAX "list [full] || console || skype_API_msg || remove < skypeusername | #interface_name | #interface_id > || reload"
-/* END: Changes heres */
-SWITCH_STANDARD_API(skypopen_function);
-#define SKYPOPEN_SYNTAX "interface_name skype_API_msg"
-
-SWITCH_STANDARD_API(skypopen_chat_function);
-#define SKYPOPEN_CHAT_SYNTAX "interface_name remote_skypename TEXT"
-#define FULL_RELOAD 0
-#define SOFT_RELOAD 1
-
-char *interface_status[] = {	/* should match SKYPOPEN_STATE_xxx in skypopen.h */
-	"IDLE",
-	"DOWN",
-	"RING",
-	"DIALING",
-	"BUSY",
-	"UP",
-	"RINGING",
-	"PRERING",
-	"DOUBLE",
-	"SELECTD",
-	"HANG_RQ",
-	"PREANSW",
-	"DEAD"
-};
-
-char *skype_callflow[] = {		/* should match CALLFLOW_XXX in skypopen.h */
-	"IDLE",
-	"DOWN",
-	"INC_RNG",
-	"CALL_DIALING",
-	"CALL_LINEBUSY",
-	"CALL_ACTIVE",
-	"INC_HNG",
-	"CALL_RLEASD",
-	"CALL_NOCARR",
-	"CALL_INFLUX",
-	"CALL_INCOMING",
-	"CALL_FAILED",
-	"CALL_NOSRVC",
-	"CALL_OUTRESTR",
-	"CALL_SECFAIL",
-	"CALL_NOANSWER",
-	"FNSHED",
-	"CANCLED",
-	"FAILED",
-	"REFUSED",
-	"RINGING",
-	"INPROGRS",
-	"UNPLACD",
-	"ROUTING",
-	"EARLYMD",
-	"INC_CLID",
-	"RMTEHOLD"
-};
-
-
-static struct {
-	int debug;
-	char *context;
-	char *dialplan;
-	char *destination;
-	char *skype_user;
-	char *report_incoming_chatmessages;
-	char *silent_mode;
-	char *write_silence_when_idle;
-	char *setsockopt;
-	int calls;
-	int real_interfaces;
-	int next_interface;
-	private_t SKYPOPEN_INTERFACES[SKYPOPEN_MAX_INTERFACES];
-	switch_mutex_t *mutex;
-	private_t *sk_console;
-	int start_port;
-
-	// CLOUDTREE (THomas Hazel)
-	switch_mutex_t *list_mutex;
-
-} globals;
-
-switch_endpoint_interface_t *skypopen_endpoint_interface;
-switch_memory_pool_t *skypopen_module_pool = NULL;
-int running = 0;
-
-// CLOUDTREE (THomas Hazel)
-#ifndef WIN32
-struct SkypopenList global_handles_list;
-extern int xio_error_handler(Display * dpy);
-extern int X11_errors_handler(Display * dpy, XErrorEvent * err);
-extern int xio_error_handler2(Display * dpy, XErrorEvent * err);
-#endif
-
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_context, globals.context);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_destination, globals.destination);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_skype_user, globals.skype_user);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_report_incoming_chatmessages, globals.report_incoming_chatmessages);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_silent_mode, globals.silent_mode);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_write_silence_when_idle, globals.write_silence_when_idle);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_setsockopt, globals.setsockopt);
-
-static switch_status_t interface_exists(char *the_interface);
-/* CLOUDTREE (Thomas Hazel) static*/ switch_status_t remove_interface(char *the_interface, /* CLOUDTREE (Thomas Hazel */ switch_bool_t force);
-
-static switch_status_t channel_on_init(switch_core_session_t *session);
-static switch_status_t channel_on_hangup(switch_core_session_t *session);
-//static switch_status_t channel_on_reset(switch_core_session_t *session);
-static switch_status_t channel_on_destroy(switch_core_session_t *session);
-static switch_status_t channel_on_routing(switch_core_session_t *session);
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
-static switch_status_t channel_on_consume_media(switch_core_session_t *session);
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
-													switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-													switch_call_cause_t *cancel_cause);
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
-static switch_status_t skypopen_tech_init(private_t *tech_pvt, switch_core_session_t *session);
-
-static switch_status_t skypopen_codec(private_t *tech_pvt, int sample_rate, int codec_ms)
-{
-	switch_core_session_t *session = NULL;
-
-	if (switch_core_codec_init
-		(&tech_pvt->read_codec, "L16", NULL, NULL, sample_rate, codec_ms, 1,
-		 SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("skypopen_codec: Can't load codec?\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_core_codec_init
-		(&tech_pvt->write_codec, "L16", NULL, NULL, sample_rate, codec_ms, 1,
-		 SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("skypopen_codec: Can't load codec?\n", SKYPOPEN_P_LOG);
-		switch_core_codec_destroy(&tech_pvt->read_codec);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	tech_pvt->read_frame.rate = sample_rate;
-	tech_pvt->read_frame.codec = &tech_pvt->read_codec;
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-
-	if (session) {
-		switch_core_session_set_read_codec(session, &tech_pvt->read_codec);
-		switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
-		switch_core_session_rwunlock(session);
-	} else {
-		ERRORA("skypopen_codec: no session\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	DEBUGA_SKYPE("codecs UP\n", SKYPOPEN_P_LOG);
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-switch_status_t skypopen_tech_init(private_t *tech_pvt, switch_core_session_t *session)
-{
-
-	switch_assert(tech_pvt != NULL);
-	switch_assert(session != NULL);
-	tech_pvt->read_frame.data = tech_pvt->databuf;
-	tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
-	switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-	switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-	switch_core_session_set_private(session, tech_pvt);
-	switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), sizeof(tech_pvt->session_uuid_str));
-	if (!strlen(tech_pvt->session_uuid_str)) {
-		ERRORA("skypopen_tech_init: no tech_pvt->session_uuid_str\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-	if (skypopen_codec(tech_pvt, SAMPLERATE_SKYPOPEN, MS_SKYPOPEN) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("skypopen_tech_init: skypopen_codec FAILED\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	dtmf_rx_init(&tech_pvt->dtmf_state, NULL, NULL);
-	dtmf_rx_parms(&tech_pvt->dtmf_state, 0, 10, 10, -99);
-
-
-	DEBUGA_SKYPE("skypopen_tech_init SUCCESS\n", SKYPOPEN_P_LOG);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t interface_exists(char *the_interface)
-{
-	int i;
-	int interface_id;
-
-	if (*the_interface == '#') {	/* look by interface id or interface name */
-		the_interface++;
-		switch_assert(the_interface);
-		interface_id = atoi(the_interface);
-
-		/* take a number as interface id */
-		if (interface_id > 0 || (interface_id == 0 && strcmp(the_interface, "0") == 0)) {
-			if (strlen(globals.SKYPOPEN_INTERFACES[interface_id].name)) {
-				return SWITCH_STATUS_SUCCESS;
-			}
-		} else {
-			/* interface name */
-			for (interface_id = 0; interface_id < SKYPOPEN_MAX_INTERFACES; interface_id++) {
-				if (strcmp(globals.SKYPOPEN_INTERFACES[interface_id].name, the_interface) == 0) {
-					return SWITCH_STATUS_SUCCESS;
-					break;
-				}
-			}
-		}
-	} else {					/* look by skype_user */
-
-
-		for (i = 0; i < SKYPOPEN_MAX_INTERFACES; i++) {
-			if (strlen(globals.SKYPOPEN_INTERFACES[i].skype_user)) {
-				if (strcmp(globals.SKYPOPEN_INTERFACES[i].skype_user, the_interface) == 0) {
-					return SWITCH_STATUS_SUCCESS;
-				}
-			}
-		}
-	}
-	return SWITCH_STATUS_FALSE;
-}
-
-/* CLOUDTREE (Thomas Hazel) static */ switch_status_t remove_interface(char *the_interface, /* CLOUDTREE (Thomas Hazel) */ switch_bool_t force)
-{
-	int x = 10;
-	switch_size_t howmany = 8;
-	int interface_id = -1;
-	private_t *tech_pvt = NULL;
-	switch_status_t status;
-
-
-	if (*the_interface == '#') {	/* remove by interface id or interface name */
-		the_interface++;
-		switch_assert(the_interface);
-		interface_id = atoi(the_interface);
-
-		if (interface_id > 0 || (interface_id == 0 && strcmp(the_interface, "0") == 0)) {
-			/* take a number as interface id */
-			tech_pvt = &globals.SKYPOPEN_INTERFACES[interface_id];
-		} else {
-
-			for (interface_id = 0; interface_id < SKYPOPEN_MAX_INTERFACES; interface_id++) {
-				if (strcmp(globals.SKYPOPEN_INTERFACES[interface_id].name, the_interface) == 0) {
-					tech_pvt = &globals.SKYPOPEN_INTERFACES[interface_id];
-					break;
-				}
-			}
-		}
-	} else {					/* remove by skype_user */
-		for (interface_id = 0; interface_id < SKYPOPEN_MAX_INTERFACES; interface_id++) {
-			if (strcmp(globals.SKYPOPEN_INTERFACES[interface_id].skype_user, the_interface) == 0) {
-				tech_pvt = &globals.SKYPOPEN_INTERFACES[interface_id];
-				break;
-			}
-		}
-	}
-
-	if (!tech_pvt) {
-		DEBUGA_SKYPE("interface '%s' does not exist\n", SKYPOPEN_P_LOG, the_interface);
-		goto end;
-	}
-
-	if ( /* CLOUDTREE (Thomas Hazel) */ (force == FALSE) && strlen(globals.SKYPOPEN_INTERFACES[interface_id].session_uuid_str)) {
-		DEBUGA_SKYPE("interface '%s' is busy\n", SKYPOPEN_P_LOG, the_interface);
-		goto end;
-	}
-
-	globals.SKYPOPEN_INTERFACES[interface_id].running = 0;
-
-	tech_pvt->interface_state = SKYPOPEN_STATE_DEAD;
-
-	if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
-#ifdef WIN32
-		skypopen_signaling_write(tech_pvt, "DIE");
-		switch_sleep(20000);
-		switch_file_write(tech_pvt->SkypopenHandles.fdesc[1], "sciutati", &howmany);	// let's the controldev_thread die
-#else /* WIN32 */
-		howmany = write(tech_pvt->SkypopenHandles.fdesc[1], "sciutati", howmany);
-#endif /* WIN32 */
-	}
-
-	if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_api_thread) {
-#ifdef WIN32
-		if (SendMessage(tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) {	// let's the skypopen_api_thread_func die
-			DEBUGA_SKYPE("got FALSE here, thread probably was already dead. GetLastError returned: %d\n", SKYPOPEN_P_LOG, GetLastError());
-			globals.SKYPOPEN_INTERFACES[interface_id].skypopen_api_thread = NULL;
-		}
-#else
-		if (tech_pvt->running && tech_pvt->SkypopenHandles.disp) {
-			XEvent e;
-			Atom atom1 = XInternAtom(tech_pvt->SkypopenHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
-			switch_sleep(20000);
-			XFlush(tech_pvt->SkypopenHandles.disp);
-			memset(&e, 0, sizeof(e));
-			e.xclient.type = ClientMessage;
-			e.xclient.message_type = atom1;	/*  leading message */
-			e.xclient.display = tech_pvt->SkypopenHandles.disp;
-			e.xclient.window = tech_pvt->SkypopenHandles.skype_win;
-			e.xclient.format = 8;
-
-			XSendEvent(tech_pvt->SkypopenHandles.disp, tech_pvt->SkypopenHandles.win, False, 0, &e);
-			XFlush(tech_pvt->SkypopenHandles.disp);
-		}
-#endif
-	}
-
-	while (x) {
-		x--;
-		switch_yield(50000);
-	}
-
-#ifndef WIN32
-	if (tech_pvt->SkypopenHandles.disp) {
-	}
-#endif
-
-	if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
-		switch_thread_join(&status, globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread);
-	}
-
-	if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_api_thread) {
-		switch_thread_join(&status, globals.SKYPOPEN_INTERFACES[interface_id].skypopen_api_thread);
-	}
-
-	switch_mutex_lock(globals.mutex);
-	if (globals.sk_console == &globals.SKYPOPEN_INTERFACES[interface_id]) {
-		DEBUGA_SKYPE("interface '%s' no more console\n", SKYPOPEN_P_LOG, the_interface);
-		globals.sk_console = NULL;
-	} else {
-		DEBUGA_SKYPE("interface '%s' STILL console\n", SKYPOPEN_P_LOG, the_interface);
-	}
-	if (strlen(tech_pvt->session_uuid_str)) {
-
-	} else {
-		memset(&globals.SKYPOPEN_INTERFACES[interface_id], '\0', sizeof(private_t));
-	}
-	globals.real_interfaces--;
-	switch_mutex_unlock(globals.mutex);
-
-	DEBUGA_SKYPE("interface '%s' deleted successfully\n", SKYPOPEN_P_LOG, the_interface);
-	globals.SKYPOPEN_INTERFACES[interface_id].running = 1;
-  end:
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-/*
-   State methods they get called when the state changes to the specific state
-   returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
-   so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
-*/
-static switch_status_t channel_on_init(switch_core_session_t *session)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt = NULL;
-
-	tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-	memset(tech_pvt->skype_voicemail_id, '\0', sizeof(tech_pvt->skype_voicemail_id));
-	memset(tech_pvt->skype_voicemail_id_greeting, '\0', sizeof(tech_pvt->skype_voicemail_id_greeting));
-	switch_channel_set_variable(channel, "skype_user", tech_pvt->skype_user);
-	switch_mutex_lock(tech_pvt->flag_mutex);
-	switch_set_flag(tech_pvt, TFLAG_IO);
-	switch_mutex_unlock(tech_pvt->flag_mutex);
-
-	DEBUGA_SKYPE("%s CHANNEL INIT %s\n", SKYPOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
-	switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), sizeof(tech_pvt->session_uuid_str));
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_destroy(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-	switch_status_t status;
-	int conta;
-
-	tech_pvt = switch_core_session_get_private(session);
-
-
-	if (tech_pvt) {
-		DEBUGA_SKYPE("%s CHANNEL DESTROY %s\n", SKYPOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
-
-		if (tech_pvt->interface_state != SKYPOPEN_STATE_DEAD) {
-			tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-		}
-
-		switch_mutex_lock(tech_pvt->flag_mutex);
-		switch_clear_flag(tech_pvt, TFLAG_IO);
-		switch_clear_flag(tech_pvt, TFLAG_VOICE);
-		if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
-			switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
-		}
-		switch_mutex_unlock(tech_pvt->flag_mutex);
-
-		DEBUGA_SKYPE("audio tcp threads to DIE\n", SKYPOPEN_P_LOG);
-		conta = 0;
-		while (tech_pvt->tcp_srv_thread) {
-			switch_sleep(50000);
-			conta++;
-			if (conta == 20) {
-				ERRORA("tcp_srv_thread is NOT dead, this can LEAK MEMORY\n", SKYPOPEN_P_LOG);
-				break;
-			}
-		}
-		DEBUGA_SKYPE("audio tcp srv thread DEAD %d\n", SKYPOPEN_P_LOG, conta);
-		conta = 0;
-		while (tech_pvt->tcp_cli_thread) {
-			switch_sleep(50000);
-			conta++;
-			if (conta == 20) {
-				ERRORA("tcp_cli_thread is NOT dead, this can LEAK MEMORY\n", SKYPOPEN_P_LOG);
-				break;
-			}
-		}
-		DEBUGA_SKYPE("audio tcp cli thread DEAD %d\n", SKYPOPEN_P_LOG, conta);
-
-
-		if (switch_core_codec_ready(&tech_pvt->read_codec)) {
-			switch_core_codec_destroy(&tech_pvt->read_codec);
-		}
-
-		if (switch_core_codec_ready(&tech_pvt->write_codec)) {
-			switch_core_codec_destroy(&tech_pvt->write_codec);
-		}
-
-		DEBUGA_SKYPE("codecs DOWN\n", SKYPOPEN_P_LOG);
-		if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
-			switch_core_timer_destroy(&tech_pvt->timer_read);
-		}
-
-		if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
-			switch_core_timer_destroy(&tech_pvt->timer_read_srv);
-		}
-
-		if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
-			switch_core_timer_destroy(&tech_pvt->timer_write);
-		}
-
-		if (tech_pvt->read_buffer) {
-			switch_buffer_destroy(&tech_pvt->read_buffer);
-		}
-		if (tech_pvt->write_buffer) {
-			switch_buffer_destroy(&tech_pvt->write_buffer);
-		}
-		//DEBUGA_SKYPE("debugging_hangup 13\n", SKYPOPEN_P_LOG);
-		switch_mutex_lock(tech_pvt->mutex_thread_audio_cli);
-		//DEBUGA_SKYPE("debugging_hangup cli lock\n", SKYPOPEN_P_LOG);
-		if (tech_pvt->tcp_cli_thread) {
-			//DEBUGA_SKYPE("debugging_hangup 14\n", SKYPOPEN_P_LOG);
-			switch_thread_join(&status, tech_pvt->tcp_cli_thread);
-			tech_pvt->tcp_cli_thread = NULL;
-			//DEBUGA_SKYPE("debugging_hangup 15\n", SKYPOPEN_P_LOG);
-		}
-		switch_mutex_unlock(tech_pvt->mutex_thread_audio_cli);
-		//DEBUGA_SKYPE("debugging_hangup cli unlock\n", SKYPOPEN_P_LOG);
-		switch_mutex_lock(tech_pvt->mutex_thread_audio_srv);
-		//DEBUGA_SKYPE("debugging_hangup srv lock\n", SKYPOPEN_P_LOG);
-		if (tech_pvt->tcp_srv_thread) {
-			//DEBUGA_SKYPE("debugging_hangup 16\n", SKYPOPEN_P_LOG);
-			switch_thread_join(&status, tech_pvt->tcp_srv_thread);
-			tech_pvt->tcp_srv_thread = NULL;
-			//DEBUGA_SKYPE("debugging_hangup 17\n", SKYPOPEN_P_LOG);
-		}
-		switch_mutex_unlock(tech_pvt->mutex_thread_audio_srv);
-		//DEBUGA_SKYPE("debugging_hangup srv unlock\n", SKYPOPEN_P_LOG);
-		//DEBUGA_SKYPE("debugging_hangup 18\n", SKYPOPEN_P_LOG);
-
-		*tech_pvt->session_uuid_str = '\0';
-
-		if (tech_pvt->interface_state != SKYPOPEN_STATE_DEAD) {
-			tech_pvt->interface_state = SKYPOPEN_STATE_IDLE;
-			tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
-		} else {
-			memset(tech_pvt, '\0', sizeof(private_t));
-		}
-		switch_core_session_set_private(session, NULL);
-	} else {
-		DEBUGA_SKYPE("!!!!!!NO tech_pvt!!!! CHANNEL DESTROY %s\n", SKYPOPEN_P_LOG, switch_core_session_get_uuid(session));
-	}
-
-	DEBUGA_SKYPE("CHANNEL DESTROYED %s\n", SKYPOPEN_P_LOG, switch_core_session_get_uuid(session));
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_hangup(switch_core_session_t *session)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-	char msg_to_skype[256];
-	//switch_status_t status;
-
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = switch_core_session_get_private(session);
-
-	//DEBUGA_SKYPE("debugging_hangup 1\n", SKYPOPEN_P_LOG);
-
-	if (tech_pvt) {
-		if (tech_pvt->interface_state == SKYPOPEN_STATE_DEAD) {
-			return SWITCH_STATUS_SUCCESS;
-		}
-		if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
-			if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-				tech_pvt->ob_failed_calls++;
-			} else {
-				tech_pvt->ib_failed_calls++;
-			}
-		}
-
-		tech_pvt->interface_state = SKYPOPEN_STATE_HANGUP_REQUESTED;
-		switch_mutex_lock(tech_pvt->flag_mutex);
-		switch_clear_flag(tech_pvt, TFLAG_IO);
-		switch_clear_flag(tech_pvt, TFLAG_VOICE);
-		if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
-			switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
-		}
-		switch_mutex_unlock(tech_pvt->flag_mutex);
-
-
-		//DEBUGA_SKYPE("debugging_hangup 2\n", SKYPOPEN_P_LOG);
-
-		if (strlen(tech_pvt->skype_call_id)) {
-			DEBUGA_SKYPE("hanging up skype call: %s\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id);
-			if(strlen(tech_pvt->skype_voicemail_id_greeting)){
-				sprintf(msg_to_skype, "ALTER VOICEMAIL %s STOPPLAYBACK", tech_pvt->skype_voicemail_id_greeting);
-				skypopen_signaling_write(tech_pvt, msg_to_skype);
-				switch_sleep(MS_SKYPOPEN * 1000 * 100);//XXX FIXME 2000 millisecs, 2 seconds, so it will record at least 1 second
-			}
-
-			if(strlen(tech_pvt->skype_voicemail_id_greeting)){
-				sprintf(msg_to_skype, "ALTER VOICEMAIL %s DELETE", tech_pvt->skype_voicemail_id_greeting);
-				skypopen_signaling_write(tech_pvt, msg_to_skype);
-				switch_sleep(MS_SKYPOPEN * 1000 * 10);//XXX FIXME 200 millisecs
-			}
-			if(strlen(tech_pvt->skype_voicemail_id)){
-				sprintf(msg_to_skype, "ALTER VOICEMAIL %s STOPRECORDING", tech_pvt->skype_voicemail_id);
-				skypopen_signaling_write(tech_pvt, msg_to_skype);
-				switch_sleep(MS_SKYPOPEN * 1000 * 10);//XXX FIXME 200 millisecs
-			}
-			sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
-			skypopen_signaling_write(tech_pvt, msg_to_skype);
-			sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->skype_call_id);
-			skypopen_signaling_write(tech_pvt, msg_to_skype);
-		}
-		DEBUGA_SKYPE("%s CHANNEL HANGUP\n", SKYPOPEN_P_LOG, tech_pvt->name);
-		switch_mutex_lock(globals.mutex);
-		globals.calls--;
-		if (globals.calls < 0) {
-			globals.calls = 0;
-		}
-		//DEBUGA_SKYPE("debugging_hangup 9\n", SKYPOPEN_P_LOG);
-		tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-		if (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED) {
-			tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
-		}
-		//DEBUGA_SKYPE("debugging_hangup 10\n", SKYPOPEN_P_LOG);
-		switch_mutex_unlock(globals.mutex);
-	} else {
-		WARNINGA("FYI %s CHANNEL has no tech_pvt in his private\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-		//DEBUGA_SKYPE("debugging_hangup 11\n", SKYPOPEN_P_LOG);
-	}
-	//DEBUGA_SKYPE("debugging_hangup 12\n", SKYPOPEN_P_LOG);
-
-	//switch_channel_set_state(channel, CS_DESTROY);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_routing(switch_core_session_t *session)
-{
-	//switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	//channel = switch_core_session_get_channel(session);
-	//switch_assert(channel != NULL);
-
-	tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_SKYPE("%s CHANNEL ROUTING\n", SKYPOPEN_P_LOG, tech_pvt->name);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_execute(switch_core_session_t *session)
-{
-
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_SKYPE("%s CHANNEL EXECUTE\n", SKYPOPEN_P_LOG, tech_pvt->name);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = switch_core_session_get_private(session);
-
-	//DEBUGA_SKYPE("%s CHANNEL KILL_CHANNEL\n", SKYPOPEN_P_LOG, tech_pvt->name);
-	if (tech_pvt) {
-		switch (sig) {
-		case SWITCH_SIG_KILL:
-			DEBUGA_SKYPE("%s CHANNEL got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-			if (tech_pvt->interface_state == SKYPOPEN_STATE_DEAD) {
-				switch_channel_set_state(channel, CS_HANGUP);
-				return SWITCH_STATUS_SUCCESS;
-			}
-			tech_pvt->interface_state = SKYPOPEN_STATE_HANGUP_REQUESTED;
-			if (tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD) {
-				DEBUGA_SKYPE("FYI %s CHANNEL in CALLFLOW_STATUS_REMOTEHOLD got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-			}
-			if (switch_channel_get_state(channel) == CS_NEW) {
-				WARNINGA("FYI %s CHANNEL in CS_NEW state got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-			}
-			if (switch_channel_get_state(channel) != CS_NEW && switch_channel_get_state(channel) < CS_EXECUTE) {
-				WARNINGA("FYI %s CHANNEL in %d state got SWITCH_SIG_KILL\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel),
-						 switch_channel_get_state(channel));
-			}
-
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			switch_clear_flag(tech_pvt, TFLAG_IO);
-			switch_clear_flag(tech_pvt, TFLAG_VOICE);
-			switch_set_flag(tech_pvt, TFLAG_HANGUP);
-			if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
-				switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
-			}
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-			break;
-		case SWITCH_SIG_BREAK:
-			DEBUGA_SKYPE("%s CHANNEL got SWITCH_SIG_BREAK\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			switch_set_flag(tech_pvt, TFLAG_BREAK);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-			break;
-		default:
-			break;
-		}
-	} else {
-		WARNINGA("FYI %s CHANNEL has no tech_pvt in his private\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_consume_media(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-
-	tech_pvt = switch_core_session_get_private(session);
-
-	DEBUGA_SKYPE("%s CHANNEL CONSUME_MEDIA\n", SKYPOPEN_P_LOG, tech_pvt->name);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-	tech_pvt = switch_core_session_get_private(session);
-	DEBUGA_SKYPE("%s CHANNEL EXCHANGE_MEDIA\n", SKYPOPEN_P_LOG, tech_pvt->name);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-	tech_pvt = switch_core_session_get_private(session);
-	DEBUGA_SKYPE("%s CHANNEL SOFT_EXECUTE\n", SKYPOPEN_P_LOG, tech_pvt->name);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-#if 0
-static switch_status_t channel_on_reset(switch_core_session_t *session)
-{
-	private_t *tech_pvt = NULL;
-	switch_channel_t *channel = NULL;
-	tech_pvt = switch_core_session_get_private(session);
-	DEBUGA_SKYPE("%s CHANNEL RESET\n", SKYPOPEN_P_LOG, tech_pvt->name);
-
-
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-	} else {
-		ERRORA("No session???\n", SKYPOPEN_P_LOG);
-	}
-	if (channel) {
-		switch_channel_set_state(channel, CS_HANGUP);
-	} else {
-		ERRORA("No channel???\n", SKYPOPEN_P_LOG);
-	}
-
-
-	return SWITCH_STATUS_SUCCESS;
-}
-#endif //0
-
-
-static switch_status_t channel_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
-{
-	private_t *tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	DEBUGA_SKYPE("%s CHANNEL SEND_DTMF\n", SKYPOPEN_P_LOG, tech_pvt->name);
-	DEBUGA_SKYPE("DTMF: %c\n", SKYPOPEN_P_LOG, dtmf->digit);
-
-	skypopen_senddigit(tech_pvt, dtmf->digit);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-	switch_byte_t *data;
-	char digit_str[256];
-	short *frame_16_khz;
-	short frame_8_khz[160];
-	unsigned int i;
-	unsigned int a;
-	size_t bytes_read = 0;
-	int try = 0;
-
-
-	*frame = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	tech_pvt->read_frame.flags = SFF_NONE;
-
-	if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
-		switch_sleep(MS_SKYPOPEN * 1000);
-		return SWITCH_STATUS_FALSE;
-	}
-	if (!switch_channel_ready(channel)) {
-		ERRORA("channel not ready \n", SKYPOPEN_P_LOG);
-		switch_sleep(MS_SKYPOPEN * 1000);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
-		//DEBUGA_SKYPE("CHANNEL READ FRAME in TFLAG_PROGRESS goto CNG\n", SKYPOPEN_P_LOG);
-		//switch_sleep(MS_SKYPOPEN * 1000);
-		goto cng;
-	}
-
-	if (!tech_pvt->read_buffer) {
-		int32_t max_len = BYTES_PER_FRAME * 10;
-
-		switch_buffer_create(skypopen_module_pool, &tech_pvt->read_buffer, max_len);
-		switch_assert(tech_pvt->read_buffer);
-		switch_buffer_zero(tech_pvt->read_buffer);
-		tech_pvt->begin_to_read = 1;
-	}
-
-
-
-	if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
-		switch_core_timer_next(&tech_pvt->timer_read);
-	}
-
-	try = 0;
-  read:
-
-
-	if (tech_pvt && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN
-		&& (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
-			|| tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
-			|| tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
-		switch_mutex_lock(tech_pvt->mutex_audio_srv);
-		if (tech_pvt->read_buffer && switch_buffer_inuse(tech_pvt->read_buffer)) {
-			bytes_read = switch_buffer_read(tech_pvt->read_buffer, tech_pvt->read_frame.data, BYTES_PER_FRAME);
-			tech_pvt->read_frame.datalen = (uint32_t)bytes_read;
-		}
-		switch_mutex_unlock(tech_pvt->mutex_audio_srv);
-
-		if (!bytes_read) {
-			switch_sleep(1000);	//XXX don't like this
-			try++;
-			if (try < 5) {
-				//DEBUGA_SKYPE("skypopen_audio_read going back to read\n", SKYPOPEN_P_LOG);
-				goto read;
-			}
-
-			if (!strlen(tech_pvt->skype_voicemail_id)) {
-				DEBUGA_SKYPE("READ BUFFER EMPTY, skypopen_audio_read Silence\n", SKYPOPEN_P_LOG);
-			}
-			memset(tech_pvt->read_frame.data, 255, BYTES_PER_FRAME);
-			tech_pvt->read_frame.datalen = BYTES_PER_FRAME;
-
-		}
-	} else {
-		memset(tech_pvt->read_frame.data, 255, BYTES_PER_FRAME);
-		tech_pvt->read_frame.datalen = BYTES_PER_FRAME;
-	}
-
-	switch_mutex_lock(tech_pvt->flag_mutex);
-	switch_set_flag(tech_pvt, TFLAG_VOICE);
-	switch_mutex_unlock(tech_pvt->flag_mutex);
-
-	while (switch_test_flag(tech_pvt, TFLAG_IO)) {
-		if (switch_test_flag(tech_pvt, TFLAG_BREAK)) {
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			switch_clear_flag(tech_pvt, TFLAG_BREAK);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-			DEBUGA_SKYPE("CHANNEL READ FRAME goto CNG\n", SKYPOPEN_P_LOG);
-			goto cng;
-		}
-
-		if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
-			DEBUGA_SKYPE("CHANNEL READ FRAME not IO\n", SKYPOPEN_P_LOG);
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) {
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			switch_clear_flag(tech_pvt, TFLAG_VOICE);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-			if (!tech_pvt->read_frame.datalen) {
-				DEBUGA_SKYPE("CHANNEL READ CONTINUE\n", SKYPOPEN_P_LOG);
-				continue;
-			}
-			*frame = &tech_pvt->read_frame;
-
-
-			if (switch_true(switch_channel_get_variable(channel, "skype_get_inband_dtmf"))) {
-
-				frame_16_khz = tech_pvt->read_frame.data;
-
-				a = 0;
-				for (i = 0; i < tech_pvt->read_frame.datalen / sizeof(short); i++) {
-					frame_8_khz[a] = frame_16_khz[i];
-					i++;
-					a++;
-				}
-
-				memset(digit_str, 0, sizeof(digit_str));
-				dtmf_rx(&tech_pvt->dtmf_state, (int16_t *) frame_8_khz, 160);
-				dtmf_rx_get(&tech_pvt->dtmf_state, digit_str, sizeof(digit_str));
-
-
-				if (digit_str[0]) {
-					switch_time_t new_dtmf_timestamp = switch_time_now();
-					if ((new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp) > 350000) {
-						char *p = digit_str;
-						switch_channel_t *channel = switch_core_session_get_channel(session);
-
-						if (channel) {
-
-							while (p && *p) {
-								switch_dtmf_t dtmf = { 0 };
-								dtmf.digit = *p;
-								dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION;
-								switch_channel_queue_dtmf(channel, &dtmf);
-								p++;
-							}
-							NOTICA("DTMF DETECTED: [%s] new_dtmf_timestamp: %u, delta_t: %u\n", SKYPOPEN_P_LOG, digit_str,
-								   (unsigned int) new_dtmf_timestamp, (unsigned int) (new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp));
-							tech_pvt->old_dtmf_timestamp = new_dtmf_timestamp;
-						} else {
-							WARNINGA("NO CHANNEL ?\n", SKYPOPEN_P_LOG);
-						}
-					}
-				}
-			}
-#if SWITCH_BYTE_ORDER == __BIG_ENDIAN
-			if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
-				switch_swap_linear((*frame)->data, (int) (*frame)->datalen / 2);
-			}
-#endif
-			return SWITCH_STATUS_SUCCESS;
-		}
-		DEBUGA_SKYPE("CHANNEL READ no TFLAG_IO\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	DEBUGA_SKYPE("CHANNEL READ FALSE\n", SKYPOPEN_P_LOG);
-	return SWITCH_STATUS_FALSE;
-
-  cng:
-	data = (switch_byte_t *) tech_pvt->read_frame.data;
-	data[0] = 65;
-	data[1] = 0;
-	tech_pvt->read_frame.datalen = 2;
-	tech_pvt->read_frame.flags = SFF_CNG;
-	*frame = &tech_pvt->read_frame;
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-	int no_space = 0;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
-		//DEBUGA_SKYPE("CHANNEL in TFLAG_PROGRESS\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (!switch_channel_ready(channel)) {
-		ERRORA("channel not ready \n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-	if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
-		DEBUGA_SKYPE("channel not in TFLAG_IO \n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-#if SWITCH_BYTE_ORDER == __BIG_ENDIAN
-	if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
-		switch_swap_linear(frame->data, (int) frame->datalen / 2);
-	}
-#endif
-	if (!tech_pvt->write_buffer) {
-		int32_t max_len = BYTES_PER_FRAME * 4;
-
-		switch_buffer_create(skypopen_module_pool, &tech_pvt->write_buffer, max_len);
-		switch_assert(tech_pvt->write_buffer);
-	}
-
-	switch_mutex_lock(tech_pvt->mutex_audio_cli);
-	if (switch_buffer_freespace(tech_pvt->write_buffer) < frame->datalen) {
-		switch_buffer_zero(tech_pvt->write_buffer);
-		no_space = 1;
-	}
-	switch_buffer_write(tech_pvt->write_buffer, frame->data, frame->datalen);
-	switch_mutex_unlock(tech_pvt->mutex_audio_cli);
-	if (no_space && !strlen(tech_pvt->skype_voicemail_id)) {
-		//switch_sleep(MS_SKYPOPEN * 1000);
-		DEBUGA_SKYPE("NO SPACE in WRITE BUFFER: there was no space for %d\n", SKYPOPEN_P_LOG, frame->datalen);
-	}
-	tech_pvt->begin_to_write = 1;
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_answer_channel(switch_core_session_t *session)
-{
-	private_t *tech_pvt;
-	switch_channel_t *channel = NULL;
-	int conta = 0;
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	switch_mutex_lock(tech_pvt->flag_mutex);
-	switch_clear_flag(tech_pvt, TFLAG_IO);
-	switch_mutex_unlock(tech_pvt->flag_mutex);
-	skypopen_answer(tech_pvt);
-
-	while (!switch_test_flag(tech_pvt, TFLAG_IO)) {
-		if (switch_channel_get_state(channel) == CS_RESET) {
-			return SWITCH_STATUS_FALSE;
-		}
-		switch_sleep(50000);
-		conta++;
-		if (conta == 10) {		//0.5 seconds
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-	switch_mutex_lock(globals.mutex);
-	globals.calls++;
-
-	switch_mutex_unlock(globals.mutex);
-	DEBUGA_SKYPE("%s CHANNEL ANSWER %s\n", SKYPOPEN_P_LOG, tech_pvt->name, switch_core_session_get_uuid(session));
-
-
-
-
-	DEBUGA_SKYPE("ANSWERED! \n", SKYPOPEN_P_LOG);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	char msg_to_skype[256];
-
-	channel = switch_core_session_get_channel(session);
-	switch_assert(channel != NULL);
-
-	tech_pvt = (private_t *) switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	switch (msg->message_id) {
-	case SWITCH_MESSAGE_INDICATE_PROGRESS:
-		{
-			DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_PROGRESS\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			switch_set_flag(tech_pvt, TFLAG_PROGRESS);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-		}
-		break;
-	case SWITCH_MESSAGE_INDICATE_CLEAR_PROGRESS:
-		{
-			DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_CLEAR_PROGRESS\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-			if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
-				sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->ring_id);
-				skypopen_signaling_write(tech_pvt, msg_to_skype);
-				sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->ring_id);
-				skypopen_signaling_write(tech_pvt, msg_to_skype);
-				sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->skype_call_id);
-				skypopen_signaling_write(tech_pvt, msg_to_skype);
-				sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
-				skypopen_signaling_write(tech_pvt, msg_to_skype);
-				switch_mutex_lock(tech_pvt->flag_mutex);
-				switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
-				switch_mutex_unlock(tech_pvt->flag_mutex);
-			}
-		}
-		break;
-
-	case SWITCH_MESSAGE_INDICATE_ANSWER:
-		{
-			DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_ANSWER\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-
-			channel_answer_channel(session);
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-
-			if (tech_pvt->read_buffer) {
-				switch_mutex_lock(tech_pvt->mutex_audio_srv);
-				switch_buffer_zero(tech_pvt->read_buffer);
-				if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
-					switch_core_timer_sync(&tech_pvt->timer_read);
-				}
-				if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
-					switch_core_timer_sync(&tech_pvt->timer_read_srv);
-				}
-				switch_mutex_unlock(tech_pvt->mutex_audio_srv);
-			}
-
-			if (tech_pvt->write_buffer) {
-				switch_mutex_lock(tech_pvt->mutex_audio_cli);
-				switch_buffer_zero(tech_pvt->write_buffer);
-				if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
-					switch_core_timer_sync(&tech_pvt->timer_write);
-				}
-				switch_mutex_unlock(tech_pvt->mutex_audio_cli);
-			}
-			DEBUGA_SKYPE("Synching audio\n", SKYPOPEN_P_LOG);
-
-		}
-		break;
-	case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC:
-
-		DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_AUDIO_SYNC\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-
-		if (tech_pvt->read_buffer) {
-			switch_mutex_lock(tech_pvt->mutex_audio_srv);
-			switch_buffer_zero(tech_pvt->read_buffer);
-			if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
-				switch_core_timer_sync(&tech_pvt->timer_read);
-			}
-			if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
-				switch_core_timer_sync(&tech_pvt->timer_read_srv);
-			}
-			switch_mutex_unlock(tech_pvt->mutex_audio_srv);
-		}
-
-		if (tech_pvt->write_buffer) {
-			switch_mutex_lock(tech_pvt->mutex_audio_cli);
-			switch_buffer_zero(tech_pvt->write_buffer);
-			if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
-				switch_core_timer_sync(&tech_pvt->timer_write);
-			}
-			switch_mutex_unlock(tech_pvt->mutex_audio_cli);
-		}
-		DEBUGA_SKYPE("Synching audio\n", SKYPOPEN_P_LOG);
-		break;
-	case SWITCH_MESSAGE_INDICATE_BRIDGE:
-		DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_BRIDGE\n", SKYPOPEN_P_LOG, switch_channel_get_name(channel));
-
-		if (tech_pvt->read_buffer) {
-			switch_mutex_lock(tech_pvt->mutex_audio_srv);
-			switch_buffer_zero(tech_pvt->read_buffer);
-			if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
-				switch_core_timer_sync(&tech_pvt->timer_read);
-			}
-			if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
-				switch_core_timer_sync(&tech_pvt->timer_read_srv);
-			}
-			switch_mutex_unlock(tech_pvt->mutex_audio_srv);
-		}
-
-		if (tech_pvt->write_buffer) {
-			switch_mutex_lock(tech_pvt->mutex_audio_cli);
-			switch_buffer_zero(tech_pvt->write_buffer);
-			if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
-				switch_core_timer_sync(&tech_pvt->timer_write);
-			}
-			switch_mutex_unlock(tech_pvt->mutex_audio_cli);
-		}
-		DEBUGA_SKYPE("Synching audio\n", SKYPOPEN_P_LOG);
-		break;
-
-	default:
-		{
-
-			DEBUGA_SKYPE("MSG_ID=%d\n", SKYPOPEN_P_LOG, msg->message_id);
-		}
-		break;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_receive_event(switch_core_session_t *session, switch_event_t *event)
-{
-	struct private_object *tech_pvt = switch_core_session_get_private(session);
-	char *body = switch_event_get_body(event);
-	switch_assert(tech_pvt != NULL);
-
-	if (!body) {
-		body = "";
-	}
-
-	WARNINGA("event: |||%s|||\n", SKYPOPEN_P_LOG, body);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_state_handler_table_t skypopen_state_handlers = {
-	/*.on_init */ channel_on_init,
-	/*.on_routing */ channel_on_routing,
-	/*.on_execute */ channel_on_execute,
-	/*.on_hangup */ channel_on_hangup,
-	/*.on_exchange_media */ channel_on_exchange_media,
-	/*.on_soft_execute */ channel_on_soft_execute,
-	/*.on_consume_media */ channel_on_consume_media,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ NULL,
-	/*.on_destroy */ channel_on_destroy
-};
-
-switch_io_routines_t skypopen_io_routines = {
-	/*.outgoing_channel */ channel_outgoing_channel,
-	/*.read_frame */ channel_read_frame,
-	/*.write_frame */ channel_write_frame,
-	/*.kill_channel */ channel_kill_channel,
-	/*.send_dtmf */ channel_send_dtmf,
-	/*.receive_message */ channel_receive_message,
-	/*.receive_event */ channel_receive_event
-};
-
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
-													switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-													switch_call_cause_t *cancel_cause)
-{
-	private_t *tech_pvt = NULL;
-	if ((*new_session = switch_core_session_request_uuid(skypopen_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool, switch_event_get_header(var_event, "origination_uuid"))) != 0) {
-		switch_channel_t *channel = NULL;
-		switch_caller_profile_t *caller_profile;
-		char *rdest;
-		int found = 0;
-		char interface_name[256];
-
-		DEBUGA_SKYPE("1 SESSION_REQUEST %s\n", SKYPOPEN_P_LOG, switch_core_session_get_uuid(*new_session));
-		switch_core_session_add_stream(*new_session, NULL);
-
-
-		if (!zstr(outbound_profile->destination_number)) {
-			int i;
-			char *slash;
-
-			switch_copy_string(interface_name, outbound_profile->destination_number, 255);
-			slash = strrchr(interface_name, '/');
-			if(slash != NULL){
-				*slash = '\0';
-			}
-
-			switch_mutex_lock(globals.mutex);
-			if (strncmp("ANY", interface_name, strlen(interface_name)) == 0 || strncmp("RR", interface_name, strlen(interface_name)) == 0) {
-				/* Find the first idle interface using Round Robin */
-				DEBUGA_SKYPE("Finding one available skype interface RR\n", SKYPOPEN_P_LOG);
-				tech_pvt = find_available_skypopen_interface_rr(NULL);
-				if (tech_pvt)
-					found = 1;
-			}
-
-			for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-				/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-				if (strlen(globals.SKYPOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.SKYPOPEN_INTERFACES[i].name, interface_name, strlen(interface_name)) == 0)) {
-					if (strlen(globals.SKYPOPEN_INTERFACES[i].session_uuid_str)) {
-						DEBUGA_SKYPE
-							("globals.SKYPOPEN_INTERFACES[%d].name=|||%s||| session_uuid_str=|||%s||| is BUSY\n",
-							 SKYPOPEN_P_LOG, i, globals.SKYPOPEN_INTERFACES[i].name, globals.SKYPOPEN_INTERFACES[i].session_uuid_str);
-						DEBUGA_SKYPE("1 SESSION_DESTROY %s\n", SKYPOPEN_P_LOG, switch_core_session_get_uuid(*new_session));
-						switch_core_session_destroy(new_session);
-						switch_mutex_unlock(globals.mutex);
-						return SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-					}
-
-					DEBUGA_SKYPE("globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||?\n", SKYPOPEN_P_LOG, i, globals.SKYPOPEN_INTERFACES[i].name);
-					tech_pvt = &globals.SKYPOPEN_INTERFACES[i];
-					found = 1;
-					break;
-				}
-
-			}
-
-		} else {
-			ERRORA("Doh! no destination number?\n", SKYPOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-
-		if (!found) {
-			DEBUGA_SKYPE("Doh! no available interface for |||%s|||?\n", SKYPOPEN_P_LOG, interface_name);
-			DEBUGA_SKYPE("2 SESSION_DESTROY %s\n", SKYPOPEN_P_LOG, switch_core_session_get_uuid(*new_session));
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION;
-		}
-
-		channel = switch_core_session_get_channel(*new_session);
-		if (!channel) {
-			ERRORA("Doh! no channel?\n", SKYPOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-		switch_channel_set_variable(channel, "waste", "false");
-		if (skypopen_tech_init(tech_pvt, *new_session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Doh! no tech_init?\n", SKYPOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-
-
-		if (outbound_profile) {
-			char name[128];
-
-			if (strncmp("ANY", outbound_profile->destination_number, 3) == 0) {
-				snprintf(name, sizeof(name), "skypopen/%s%s", tech_pvt->name, outbound_profile->destination_number + 3);
-			} else if (strncmp("RR", outbound_profile->destination_number, 2) == 0) {
-				snprintf(name, sizeof(name), "skypopen/%s%s", tech_pvt->name, outbound_profile->destination_number + 2);
-			} else {
-				snprintf(name, sizeof(name), "skypopen/%s", outbound_profile->destination_number);
-			}
-
-			switch_channel_set_name(channel, name);
-			caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
-			switch_channel_set_caller_profile(channel, caller_profile);
-			tech_pvt->caller_profile = caller_profile;
-		} else {
-			ERRORA("Doh! no caller profile\n", SKYPOPEN_P_LOG);
-			switch_core_session_destroy(new_session);
-			switch_mutex_unlock(globals.mutex);
-			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-		}
-
-
-		rdest = strchr(caller_profile->destination_number, '/');
-		*rdest++ = '\0';
-
-		switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(*new_session), sizeof(tech_pvt->session_uuid_str));
-		caller_profile = tech_pvt->caller_profile;
-		caller_profile->destination_number = rdest;
-
-		switch_mutex_lock(tech_pvt->flag_mutex);
-		tech_pvt->ob_calls++;
-		switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
-		switch_mutex_unlock(tech_pvt->flag_mutex);
-		switch_channel_set_state(channel, CS_INIT);
-		skypopen_call(tech_pvt, rdest, 30);
-		switch_mutex_unlock(globals.mutex);
-		return SWITCH_CAUSE_SUCCESS;
-	}
-
-	ERRORA("Doh! no new_session\n", SKYPOPEN_P_LOG);
-	return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-}
-
-/*!
- * \brief This thread runs during a call, and monitor the interface for signaling, like hangup, caller id, etc most of signaling is handled inside the skypopen_signaling_read function
- *
- */
-static void *SWITCH_THREAD_FUNC skypopen_signaling_thread_func(switch_thread_t *thread, void *obj)
-{
-	private_t *tech_pvt = obj;
-	int res;
-	int forever = 1;
-	switch_event_t *event;
-
-	if (!tech_pvt)
-		return NULL;
-
-	DEBUGA_SKYPE("In skypopen_signaling_thread_func: started, p=%p\n", SKYPOPEN_P_LOG, (void *) tech_pvt);
-
-	while (forever) {
-		if (!(running && tech_pvt->running))
-			break;
-		res = skypopen_signaling_read(tech_pvt);
-
-		if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_INCOMING_RAW) == SWITCH_STATUS_SUCCESS) {
-			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "X-Skype-Response-Code", "%d", res);
-			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "X-Skype-Interface", "%s", tech_pvt->interface_id);
-			switch_event_add_body(event, "%s", tech_pvt->message);
-			switch_event_fire(&event);
-		}
-
-		if (res == CALLFLOW_INCOMING_HANGUP || tech_pvt->skype_callflow == CALLFLOW_INCOMING_HANGUP) {
-			switch_core_session_t *session = NULL;
-			switch_channel_t *channel = NULL;
-			int conta;
-
-			DEBUGA_SKYPE("skype call ended\n", SKYPOPEN_P_LOG);
-
-			if (tech_pvt) {
-				if (tech_pvt->interface_state == SKYPOPEN_STATE_DEAD) {
-					break;
-				}
-				session = switch_core_session_locate(tech_pvt->session_uuid_str);
-				if (session) {
-					channel = switch_core_session_get_channel(session);
-					if (channel) {
-						switch_channel_state_t state = switch_channel_get_state(channel);
-						if (state < CS_EXECUTE) {
-							switch_sleep(20000);	//20 msec, let the state evolve from CS_NEW
-						}
-						switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-					} else {
-						ERRORA("no channel?\n", SKYPOPEN_P_LOG);
-					}
-					switch_core_session_rwunlock(session);
-				} else {
-					DEBUGA_SKYPE("no session\n", SKYPOPEN_P_LOG);
-
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-					DEBUGA_SKYPE("audio tcp threads to DIE\n", SKYPOPEN_P_LOG);
-					conta = 0;
-					while (tech_pvt->tcp_srv_thread) {
-						switch_sleep(50000);
-						conta++;
-						if (conta == 20) {
-							ERRORA("tcp_srv_thread is NOT dead, this can LEAK MEMORY\n", SKYPOPEN_P_LOG);
-							break;
-						}
-					}
-					DEBUGA_SKYPE("audio tcp srv thread DEAD %d\n", SKYPOPEN_P_LOG, conta);
-					conta = 0;
-					while (tech_pvt->tcp_cli_thread) {
-						switch_sleep(50000);
-						conta++;
-						if (conta == 20) {
-							ERRORA("tcp_cli_thread is NOT dead, this can LEAK MEMORY\n", SKYPOPEN_P_LOG);
-							break;
-						}
-					}
-					DEBUGA_SKYPE("audio tcp cli thread DEAD %d\n", SKYPOPEN_P_LOG, conta);
-				}
-				switch_mutex_lock(globals.mutex);
-				tech_pvt->ringing_state = SKYPOPEN_RINGING_INIT;
-				*tech_pvt->session_uuid_str = '\0';
-				*tech_pvt->initial_skype_user = '\0';
-				*tech_pvt->answer_id = '\0';
-				*tech_pvt->answer_value = '\0';
-				*tech_pvt->ring_id = '\0';
-				*tech_pvt->ring_value = '\0';
-				*tech_pvt->callid_number = '\0';
-				*tech_pvt->callid_name = '\0';
-
-				tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
-				tech_pvt->interface_state = SKYPOPEN_STATE_IDLE;
-				switch_mutex_unlock(globals.mutex);
-			} else {
-				ERRORA("no tech_pvt?\n", SKYPOPEN_P_LOG);
-			}
-		}
-	}
-	tech_pvt->skypopen_signaling_thread = NULL;
-	DEBUGA_SKYPE("EXITING\n", SKYPOPEN_P_LOG);
-	return NULL;
-}
-
-static switch_status_t load_config(int reload_type)
-{
-	char *cf = "skypopen.conf";
-	switch_xml_t cfg, xml, global_settings, param, interfaces, myinterface;
-	private_t *tech_pvt = NULL;
-
-	// CLOUDTREE (Thomas Hazel) - always try to load configuration
-	running = 1;
-
-	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, skypopen_module_pool);
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		ERRORA("open of %s failed\n", SKYPOPEN_P_LOG, cf);
-		running = 0;
-		switch_xml_free(xml);
-		return SWITCH_STATUS_TERM;
-	}
-
-	switch_mutex_lock(globals.mutex);
-	if ((global_settings = switch_xml_child(cfg, "global_settings"))) {
-		for (param = switch_xml_child(global_settings, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!strcasecmp(var, "debug")) {
-				globals.debug = atoi(val);
-				DEBUGA_SKYPE("globals.debug=%d\n", SKYPOPEN_P_LOG, globals.debug);
-
-			} else if (!strcmp(var, "context")) {
-				set_global_context(val);
-				DEBUGA_SKYPE("globals.context=%s\n", SKYPOPEN_P_LOG, globals.context);
-			} else if (!strcmp(var, "dialplan")) {
-				set_global_dialplan(val);
-				DEBUGA_SKYPE("globals.dialplan=%s\n", SKYPOPEN_P_LOG, globals.dialplan);
-			} else if (!strcmp(var, "destination")) {
-				set_global_destination(val);
-				DEBUGA_SKYPE("globals.destination=%s\n", SKYPOPEN_P_LOG, globals.destination);
-			} else if (!strcmp(var, "skype_user")) {
-				set_global_skype_user(val);
-				DEBUGA_SKYPE("globals.skype_user=%s\n", SKYPOPEN_P_LOG, globals.skype_user);
-			} else if (!strcmp(var, "report_incoming_chatmessages")) {
-				set_global_report_incoming_chatmessages(val);
-				DEBUGA_SKYPE("globals.report_incoming_chatmessages=%s\n", SKYPOPEN_P_LOG, globals.report_incoming_chatmessages);
-			} else if (!strcmp(var, "silent_mode")) {
-				set_global_silent_mode(val);
-				DEBUGA_SKYPE("globals.silent_mode=%s\n", SKYPOPEN_P_LOG, globals.silent_mode);
-			} else if (!strcmp(var, "write_silence_when_idle")) {
-				set_global_write_silence_when_idle(val);
-				DEBUGA_SKYPE("globals.write_silence_when_idle=%s\n", SKYPOPEN_P_LOG, globals.write_silence_when_idle);
-			} else if (!strcmp(var, "setsockopt")) {
-				set_global_setsockopt(val);
-				DEBUGA_SKYPE("globals.setsockopt=%s\n", SKYPOPEN_P_LOG, globals.setsockopt);
-			}
-
-		}
-	}
-
-	globals.start_port = 32769;
-	if ((interfaces = switch_xml_child(cfg, "per_interface_settings"))) {
-		int i = 0;
-
-		for (myinterface = switch_xml_child(interfaces, "interface"); myinterface; myinterface = myinterface->next) {
-			char *id = (char *) switch_xml_attr(myinterface, "id");
-			char *name = (char *) switch_xml_attr(myinterface, "name");
-			char *context = "default";
-			char *dialplan = "XML";
-			char *destination = "5000";
-			char *X11_display = NULL;
-			char *skype_user = NULL;
-			char *report_incoming_chatmessages = "true";
-			char *silent_mode = "false";
-			char *write_silence_when_idle = "true";
-			char *setsockopt = "false";
-			uint32_t interface_id = 0;
-
-			if (globals.context)
-				context = globals.context;
-			if (globals.dialplan)
-				dialplan = globals.dialplan;
-			if (globals.destination)
-				destination = globals.destination;
-			if (globals.skype_user)
-				skype_user = globals.skype_user;
-			if (globals.report_incoming_chatmessages)
-				report_incoming_chatmessages = globals.report_incoming_chatmessages;
-			if (globals.silent_mode)
-				silent_mode = globals.silent_mode;
-			if (globals.write_silence_when_idle)
-				write_silence_when_idle = globals.write_silence_when_idle;
-			if (globals.setsockopt)
-				setsockopt = globals.setsockopt;
-
-			tech_pvt = NULL;
-
-			for (param = switch_xml_child(myinterface, "param"); param; param = param->next) {
-				char *var = (char *) switch_xml_attr_soft(param, "name");
-				char *val = (char *) switch_xml_attr_soft(param, "value");
-
-				if (!strcasecmp(var, "context")) {
-					context = val;
-				} else if (!strcasecmp(var, "dialplan")) {
-					dialplan = val;
-				} else if (!strcasecmp(var, "destination")) {
-					destination = val;
-				} else if (!strcasecmp(var, "skype_user")) {
-					skype_user = val;
-				} else if (!strcasecmp(var, "report_incoming_chatmessages")) {
-					report_incoming_chatmessages = val;
-				} else if (!strcasecmp(var, "silent_mode")) {
-					silent_mode = val;
-				} else if (!strcasecmp(var, "write_silence_when_idle")) {
-					write_silence_when_idle = val;
-				} else if (!strcasecmp(var, "setsockopt")) {
-					setsockopt = val;
-				} else if (!strcasecmp(var, "X11-display") || !strcasecmp(var, "X11_display")) {
-					X11_display = val;
-				}
-
-			}
-			if (!skype_user) {
-				ERRORA("interface missing REQUIRED param 'skype_user'\n", SKYPOPEN_P_LOG);
-				continue;
-			}
-
-			if (reload_type == SOFT_RELOAD) {
-				char the_interface[256];
-				sprintf(the_interface, "#%s", name);
-
-				if (interface_exists(the_interface) == SWITCH_STATUS_SUCCESS) {
-					continue;
-				}
-			}
-#ifndef WIN32
-			if (!X11_display) {
-				ERRORA("interface missing REQUIRED param 'X11_display'\n", SKYPOPEN_P_LOG);
-				continue;
-			}
-#endif
-			if (!id) {
-				ERRORA("interface missing REQUIRED param 'id'\n", SKYPOPEN_P_LOG);
-				continue;
-			}
-			if (switch_is_number(id)) {
-				interface_id = atoi(id);
-				DEBUGA_SKYPE("interface_id=%d\n", SKYPOPEN_P_LOG, interface_id);
-			} else {
-				ERRORA("interface param 'id' MUST be a number, now id='%s'\n", SKYPOPEN_P_LOG, id);
-				continue;
-			}
-
-			if (!name) {
-				WARNINGA("interface missing param 'name', not nice, but works\n", SKYPOPEN_P_LOG);
-			}
-
-			if (name) {
-				DEBUGA_SKYPE("name=%s\n", SKYPOPEN_P_LOG, name);
-			}
-#ifndef WIN32
-			if (!XInitThreads()) {
-				ERRORA("Not initialized XInitThreads!\n", SKYPOPEN_P_LOG);
-			} else {
-				DEBUGA_SKYPE("Initialized XInitThreads!\n", SKYPOPEN_P_LOG);
-			}
-			switch_sleep(20000);
-#endif /* WIN32 */
-
-			if (interface_id && interface_id < SKYPOPEN_MAX_INTERFACES) {
-				private_t newconf;
-				switch_threadattr_t *skypopen_api_thread_attr = NULL;
-				switch_threadattr_t *skypopen_signaling_thread_attr = NULL;
-
-				memset(&newconf, '\0', sizeof(newconf));
-				globals.SKYPOPEN_INTERFACES[interface_id] = newconf;
-				globals.SKYPOPEN_INTERFACES[interface_id].running = 1;
-
-
-				tech_pvt = &globals.SKYPOPEN_INTERFACES[interface_id];
-
-				switch_set_string(globals.SKYPOPEN_INTERFACES[interface_id].interface_id, id);
-				if (name) {
-					switch_set_string(globals.SKYPOPEN_INTERFACES[interface_id].name, name);
-				} else {
-					switch_set_string(globals.SKYPOPEN_INTERFACES[interface_id].name, "N/A");
-				}
-				DEBUGA_SKYPE("CONFIGURING interface_id=%d\n", SKYPOPEN_P_LOG, interface_id);
-
-				switch_set_string(globals.SKYPOPEN_INTERFACES[interface_id].context, context);
-				switch_set_string(globals.SKYPOPEN_INTERFACES[interface_id].dialplan, dialplan);
-				switch_set_string(globals.SKYPOPEN_INTERFACES[interface_id].destination, destination);
-				switch_set_string(globals.SKYPOPEN_INTERFACES[interface_id].X11_display, X11_display);
-				switch_set_string(globals.SKYPOPEN_INTERFACES[interface_id].skype_user, skype_user);
-
-				if (!strcmp(report_incoming_chatmessages, "true") || !strcmp(report_incoming_chatmessages, "1")) {
-					globals.SKYPOPEN_INTERFACES[interface_id].report_incoming_chatmessages = 1;
-				} else {
-					globals.SKYPOPEN_INTERFACES[interface_id].report_incoming_chatmessages = 0;	//redundant, just in case
-
-				}
-
-				if (!strcmp(silent_mode, "true") || !strcmp(silent_mode, "1")) {
-					globals.SKYPOPEN_INTERFACES[interface_id].silent_mode = 1;
-				} else {
-					globals.SKYPOPEN_INTERFACES[interface_id].silent_mode = 0;	//redundant, just in case
-
-				}
-
-				if (!strcmp(write_silence_when_idle, "true") || !strcmp(write_silence_when_idle, "1")) {
-					globals.SKYPOPEN_INTERFACES[interface_id].write_silence_when_idle = 1;
-				} else {
-					globals.SKYPOPEN_INTERFACES[interface_id].write_silence_when_idle = 0;	//redundant, just in case
-
-				}
-
-				if (!strcmp(setsockopt, "true") || !strcmp(setsockopt, "1")) {
-					globals.SKYPOPEN_INTERFACES[interface_id].setsockopt = 1;
-				} else {
-					globals.SKYPOPEN_INTERFACES[interface_id].setsockopt = 0;	//redundant, just in case
-
-				}
-
-				DEBUGA_SKYPE("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].name=%s\n",
-							 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].name);
-				DEBUGA_SKYPE
-					("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].context=%s\n",
-					 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].context);
-				DEBUGA_SKYPE
-					("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].dialplan=%s\n",
-					 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].dialplan);
-				DEBUGA_SKYPE
-					("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].destination=%s\n",
-					 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].destination);
-				DEBUGA_SKYPE
-					("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].X11_display=%s\n",
-					 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].X11_display);
-				DEBUGA_SKYPE
-					("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].skype_user=%s\n",
-					 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].skype_user);
-				DEBUGA_SKYPE
-					("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].report_incoming_chatmessages=%d\n",
-					 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].report_incoming_chatmessages);
-				DEBUGA_SKYPE
-					("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].silent_mode=%d\n",
-					 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].silent_mode);
-				DEBUGA_SKYPE
-					("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].write_silence_when_idle=%d\n",
-					 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].write_silence_when_idle);
-				DEBUGA_SKYPE
-					("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].setsockopt=%d\n",
-					 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].setsockopt);
-
-				WARNINGA("STARTING interface_id=%d\n", SKYPOPEN_P_LOG, interface_id);
-
-				switch_threadattr_create(&skypopen_api_thread_attr, skypopen_module_pool);
-				switch_threadattr_detach_set(skypopen_api_thread_attr, 0);
-				switch_threadattr_stacksize_set(skypopen_api_thread_attr, SWITCH_THREAD_STACKSIZE);
-
-				switch_thread_create(&globals.SKYPOPEN_INTERFACES[interface_id].skypopen_api_thread,
-									 skypopen_api_thread_attr, skypopen_do_skypeapi_thread, &globals.SKYPOPEN_INTERFACES[interface_id],
-									 skypopen_module_pool);
-
-				switch_sleep(100000);
-
-				switch_threadattr_create(&skypopen_signaling_thread_attr, skypopen_module_pool);
-				switch_threadattr_detach_set(skypopen_signaling_thread_attr, 0);
-				switch_threadattr_stacksize_set(skypopen_signaling_thread_attr, SWITCH_THREAD_STACKSIZE);
-
-				switch_thread_create(&globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread, skypopen_signaling_thread_attr,
-									 skypopen_signaling_thread_func, &globals.SKYPOPEN_INTERFACES[interface_id], skypopen_module_pool);
-
-				switch_sleep(100000);
-
-				skypopen_audio_init(&globals.SKYPOPEN_INTERFACES[interface_id]);
-				switch_mutex_init(&globals.SKYPOPEN_INTERFACES[interface_id].mutex_audio_srv, SWITCH_MUTEX_NESTED, skypopen_module_pool);
-				switch_mutex_init(&globals.SKYPOPEN_INTERFACES[interface_id].mutex_audio_cli, SWITCH_MUTEX_NESTED, skypopen_module_pool);
-				switch_mutex_init(&globals.SKYPOPEN_INTERFACES[interface_id].mutex_thread_audio_srv, SWITCH_MUTEX_NESTED, skypopen_module_pool);
-				switch_mutex_init(&globals.SKYPOPEN_INTERFACES[interface_id].mutex_thread_audio_cli, SWITCH_MUTEX_NESTED, skypopen_module_pool);
-
-				NOTICA
-					("WAITING roughly 10 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d\n",
-					 SKYPOPEN_P_LOG, interface_id);
-				i = 0;
-				while (globals.SKYPOPEN_INTERFACES[interface_id].SkypopenHandles.api_connected == 0 && running && i < 200) {	// 10 seconds! thanks Jeff Lenk
-					switch_sleep(50000);
-					i++;
-				}
-				if (globals.SKYPOPEN_INTERFACES[interface_id].SkypopenHandles.api_connected) {
-					NOTICA
-						("Found a running Skype client, connected to its SKYPE API for interface_id=%d, waiting 60 seconds for CURRENTUSERHANDLE==%s\n",
-						 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].skype_user);
-				} else {
-					ERRORA
-						("Failed to connect to a SKYPE API for interface_id=%d, no SKYPE client running, please (re)start Skype client. Skypopen exiting\n",
-						 SKYPOPEN_P_LOG, interface_id);
-					running = 0;
-					switch_mutex_unlock(globals.mutex);
-					switch_xml_free(xml);
-					return SWITCH_STATUS_FALSE;
-				}
-
-				i = 0;
-				while (globals.SKYPOPEN_INTERFACES[interface_id].SkypopenHandles.currentuserhandle == 0 && running && i < 1200) {	// 60 seconds! thanks Jeff Lenk
-					switch_sleep(50000);
-					i++;
-				}
-				if (globals.SKYPOPEN_INTERFACES[interface_id].SkypopenHandles.currentuserhandle) {
-					WARNINGA
-						("Interface_id=%d is now STARTED, the Skype client to which we are connected gave us the correct CURRENTUSERHANDLE (%s)\n",
-						 SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].skype_user);
-
-					skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "PROTOCOL 999");
-					switch_sleep(20000);
-					skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "SET AUTOAWAY OFF");
-					switch_sleep(20000);
-					skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "SET WINDOWSTATE HIDDEN");
-					switch_sleep(20000);
-					skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "SET USERSTATUS ONLINE");
-					switch_sleep(20000);
-					if (globals.SKYPOPEN_INTERFACES[interface_id].silent_mode) {
-						skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "SET SILENT_MODE ON");
-						switch_sleep(20000);
-						skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "SET SILENT_MODE OFF");
-						switch_sleep(20000);
-						skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[interface_id], "SET SILENT_MODE ON");
-						switch_sleep(20000);
-					}
-				} else {
-					ERRORA
-						("The Skype client to which we are connected FAILED to gave us CURRENTUSERHANDLE=%s, interface_id=%d FAILED to start. No Skype client logged in as '%s' has been found. Please (re)launch a Skype client logged in as '%s'. Skypopen exiting now\n",
-						 SKYPOPEN_P_LOG, globals.SKYPOPEN_INTERFACES[interface_id].skype_user,
-						 interface_id, globals.SKYPOPEN_INTERFACES[interface_id].skype_user, globals.SKYPOPEN_INTERFACES[interface_id].skype_user);
-					running = 0;
-					switch_mutex_unlock(globals.mutex);
-					switch_xml_free(xml);
-					return SWITCH_STATUS_FALSE;
-				}
-
-			} else {
-				ERRORA("interface id %d is higher than SKYPOPEN_MAX_INTERFACES (%d)\n", SKYPOPEN_P_LOG, interface_id, SKYPOPEN_MAX_INTERFACES);
-				continue;
-			}
-
-		}
-
-		for (i = 0; i < SKYPOPEN_MAX_INTERFACES; i++) {
-			if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
-				/* How many real intterfaces */
-				globals.real_interfaces = i + 1;
-
-				tech_pvt = &globals.SKYPOPEN_INTERFACES[i];
-
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].interface_id=%s\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].interface_id);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].name=%s\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].name);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].context=%s\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].context);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].dialplan=%s\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].dialplan);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].destination=%s\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].destination);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].X11_display=%s\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].X11_display);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].skype_user=%s\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].skype_user);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].report_incoming_chatmessages=%d\n", SKYPOPEN_P_LOG, i, i,
-							 globals.SKYPOPEN_INTERFACES[i].report_incoming_chatmessages);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].silent_mode=%d\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].silent_mode);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].write_silence_when_idle=%d\n", SKYPOPEN_P_LOG, i, i,
-							 globals.SKYPOPEN_INTERFACES[i].write_silence_when_idle);
-				DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].setsockopt=%d\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].setsockopt);
-			}
-		}
-	}
-
-	switch_mutex_unlock(globals.mutex);
-	switch_xml_free(xml);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t chat_send(switch_event_t *message_event)
-{
-	char *user = NULL, *host, *f_user = NULL, *f_host = NULL, *f_resource = NULL;
-	private_t *tech_pvt = NULL;
-	int i = 0, found = 0, tried = 0;
-	char skype_msg[1024];
-
-	const char *proto;
-	const char *from;
-	const char *to;
-	const char *subject;
-	const char *body;
-	//const char *type;
-	const char *hint;
-
-	proto = switch_event_get_header(message_event, "proto");
-	from = switch_event_get_header(message_event, "from");
-	to = switch_event_get_header(message_event, "to");
-	subject = switch_event_get_header(message_event, "subject");
-	body = switch_event_get_body(message_event);
-	//type = switch_event_get_header(message_event, "type");
-	hint = switch_event_get_header(message_event, "hint");
-
-	switch_assert(proto != NULL);
-
-	//DEBUGA_SKYPE("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, type=%s, hint=%s)\n", SKYPOPEN_P_LOG, proto, from, to, subject, body, type,
-	//           hint ? hint : "NULL");
-	DEBUGA_SKYPE("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, hint=%s)\n", SKYPOPEN_P_LOG, proto, from, to, subject, body,
-				 hint ? hint : "NULL");
-
-	if (!to || !strlen(to)) {
-		ERRORA("Missing To: header.\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if ((!from && !hint) || (!strlen(from) && !strlen(hint))) {
-		ERRORA("Missing From: AND Hint: headers.\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (from && (f_user = strdup(from))) {
-		if ((f_host = strchr(f_user, '@'))) {
-			*f_host++ = '\0';
-			if ((f_resource = strchr(f_host, '/'))) {
-				*f_resource++ = '\0';
-			}
-		}
-	}
-
-	if (to && (user = strdup(to))) {
-		if ((host = strchr(user, '@'))) {
-			*host++ = '\0';
-		}
-		//DEBUGA_SKYPE("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, type=%s, hint=%s)\n", SKYPOPEN_P_LOG, proto, from, to, subject, body, type,
-		//           hint ? hint : "NULL");
-		DEBUGA_SKYPE("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, hint=%s)\n", SKYPOPEN_P_LOG, proto, from, to, subject, body,
-					 hint ? hint : "NULL");
-		if (hint && strlen(hint)) {
-			//in hint we receive the interface name to use
-			for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-				if (strlen(globals.SKYPOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.SKYPOPEN_INTERFACES[i].name, hint, strlen(hint)) == 0)) {
-					tech_pvt = &globals.SKYPOPEN_INTERFACES[i];
-					DEBUGA_SKYPE("Using interface: globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||\n", SKYPOPEN_P_LOG, i,
-								 globals.SKYPOPEN_INTERFACES[i].name);
-					found = 1;
-					break;
-				}
-			}
-		} else {
-			//we have no a predefined interface name to use (hint is NULL), so let's choose an interface from the username (from)
-			for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-				if (strlen(globals.SKYPOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.SKYPOPEN_INTERFACES[i].skype_user, from, strlen(from)) == 0)) {
-					tech_pvt = &globals.SKYPOPEN_INTERFACES[i];
-					DEBUGA_SKYPE("Using interface: globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||\n", SKYPOPEN_P_LOG, i,
-								 globals.SKYPOPEN_INTERFACES[i].name);
-					found = 1;
-					break;
-				}
-			}
-		}
-		if (!found) {
-			ERRORA("ERROR: A Skypopen interface with name='%s' or one with skypeuser='%s' was not found\n", SKYPOPEN_P_LOG, hint ? hint : "NULL",
-				   from ? from : "NULL");
-			goto end;
-		} else {
-
-			snprintf(skype_msg, sizeof(skype_msg), "CHAT CREATE %s", to);
-			skypopen_signaling_write(tech_pvt, skype_msg);
-			switch_sleep(20000);
-		}
-
-		found = 0;
-
-		while (!found) {
-			for (i = 0; i < MAX_CHATS; i++) {
-				//DEBUGA_SKYPE("tech_pvt->chats[i].dialog_partner='%s' to='%s'\n", SKYPOPEN_P_LOG, tech_pvt->chats[i].dialog_partner, to);
-				if (!strcmp(tech_pvt->chats[i].dialog_partner, to)) {
-					snprintf(skype_msg, sizeof(skype_msg), "CHATMESSAGE %s %s", tech_pvt->chats[i].chatname, body);
-					skypopen_signaling_write(tech_pvt, skype_msg);
-					found = 1;
-					break;
-				}
-			}
-			if (found) {
-				break;
-			}
-			tried++;
-			if (tried > 20) {
-				ERRORA
-					("No chat with dialog_partner='%s' was found. (If you're using mod_sms this is a bug of mod_skypopen when using mod_sms, from next incoming message it will probably work...)\n",
-					 SKYPOPEN_P_LOG, to);
-				break;
-			}
-			switch_sleep(50000);
-		}
-
-	}
-  end:
-	switch_safe_free(user);
-	switch_safe_free(f_user);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_skypopen_load)
-{
-	switch_api_interface_t *commands_api_interface;
-	switch_chat_interface_t *chat_interface;
-
-	skypopen_module_pool = pool;
-	memset(&globals, '\0', sizeof(globals));
-
-	// CLOUDTREE (Thomas Hazel)
-#ifndef WIN32
-	// XXX: these assumes no one will override
-	//XSetErrorHandler(X11_errors_handler);
-	//XXX giovanni: seems that if Xserver is up, but skype client is crashed, the error is non fatal. Let's use Thomas handler in this case too
-	XSetErrorHandler(xio_error_handler2);
-	XSetIOErrorHandler(xio_error_handler);
-
-	memset(&global_handles_list, 0, sizeof(global_handles_list));
-	switch_mutex_init(&globals.list_mutex, SWITCH_MUTEX_NESTED, skypopen_module_pool);
-#endif
-
-	running = 1;
-
-	if (load_config(FULL_RELOAD) == SWITCH_STATUS_SUCCESS) {
-
-		*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-		skypopen_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-		skypopen_endpoint_interface->interface_name = "skypopen";
-		skypopen_endpoint_interface->io_routines = &skypopen_io_routines;
-		skypopen_endpoint_interface->state_handler = &skypopen_state_handlers;
-
-		if (running) {
-
-			SWITCH_ADD_API(commands_api_interface, "sk", "Skypopen console commands", sk_function, SK_SYNTAX);
-			SWITCH_ADD_API(commands_api_interface, "skypopen", "Skypopen interface commands", skypopen_function, SKYPOPEN_SYNTAX);
-			SWITCH_ADD_API(commands_api_interface, "skypopen_chat", "Skypopen_chat interface remote_skypename TEXT", skypopen_chat_function,
-					SKYPOPEN_CHAT_SYNTAX);
-			SWITCH_ADD_CHAT(chat_interface, SKYPE_CHAT_PROTO, chat_send);
-
-			if (switch_event_reserve_subclass(MY_EVENT_INCOMING_CHATMESSAGE) != SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-				return SWITCH_STATUS_FALSE;
-			}
-
-			if (switch_event_reserve_subclass(MY_EVENT_INCOMING_RAW) != SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-				return SWITCH_STATUS_FALSE;
-			}
-
-			/* indicate that the module should continue to be loaded */
-			return SWITCH_STATUS_SUCCESS;
-		}
-	} else {
-		running = 0;
-		switch_sleep(1000000); //1 full second
-		return SWITCH_STATUS_FALSE;
-	}
-	return SWITCH_STATUS_FALSE;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown)
-{
-	int x;
-	private_t *tech_pvt = NULL;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_size_t howmany = 8;
-	int interface_id;
-
-	running = 0;
-
-	for (interface_id = 0; interface_id < SKYPOPEN_MAX_INTERFACES; interface_id++) {
-		tech_pvt = &globals.SKYPOPEN_INTERFACES[interface_id];
-
-
-		if (strlen(globals.SKYPOPEN_INTERFACES[interface_id].name)) {
-			if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
-#ifdef WIN32
-				skypopen_signaling_write(tech_pvt, "DIE");
-				switch_sleep(20000);
-				switch_file_write(tech_pvt->SkypopenHandles.fdesc[1], "sciutati", &howmany);	// let's the controldev_thread die
-
-#else /* WIN32 */
-				skypopen_signaling_write(tech_pvt, "DIE");
-				switch_sleep(20000);
-				howmany = write(tech_pvt->SkypopenHandles.fdesc[1], "sciutati", howmany);
-#endif /* WIN32 */
-			}
-
-			if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_api_thread) {
-#ifdef WIN32
-				if (SendMessage(tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) {	// let's the skypopen_api_thread_func die
-					DEBUGA_SKYPE("got FALSE here, thread probably was already dead. GetLastError returned: %d\n", SKYPOPEN_P_LOG, GetLastError());
-					tech_pvt->skypopen_api_thread = NULL;
-				}
-#else
-				if (tech_pvt->SkypopenHandles.disp) {
-					XEvent e;
-					Atom atom1 = XInternAtom(tech_pvt->SkypopenHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN",
-											 False);
-					switch_sleep(20000);
-					XFlush(tech_pvt->SkypopenHandles.disp);
-					memset(&e, 0, sizeof(e));
-					e.xclient.type = ClientMessage;
-					e.xclient.message_type = atom1;	/*  leading message */
-					e.xclient.display = tech_pvt->SkypopenHandles.disp;
-					e.xclient.window = tech_pvt->SkypopenHandles.skype_win;
-					e.xclient.format = 8;
-
-					XSendEvent(tech_pvt->SkypopenHandles.disp, tech_pvt->SkypopenHandles.win, False, 0, &e);
-					XFlush(tech_pvt->SkypopenHandles.disp);
-				}
-#endif
-			}
-			x = 10;
-			while (x) {
-				x--;
-				switch_yield(50000);
-			}
-#ifndef WIN32
-			if (tech_pvt->SkypopenHandles.disp) {
-				DEBUGA_SKYPE("CLOSIN X\n", SKYPOPEN_P_LOG);
-				XCloseDisplay(tech_pvt->SkypopenHandles.disp);
-				DEBUGA_SKYPE("CLOSIN X END\n", SKYPOPEN_P_LOG);
-			}
-#endif
-			if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
-				switch_thread_join(&status, globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread);
-			}
-			if (status != SWITCH_STATUS_SUCCESS)
-				DEBUGA_SKYPE("got FALSE here, thread was not joined\n", SKYPOPEN_P_LOG);
-			if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_api_thread) {
-				switch_thread_join(&status, globals.SKYPOPEN_INTERFACES[interface_id].skypopen_api_thread);
-			}
-			if (status != SWITCH_STATUS_SUCCESS)
-				DEBUGA_SKYPE("got FALSE here, thread was not joined\n", SKYPOPEN_P_LOG);
-#ifndef WIN32
-			WARNINGA("SHUTDOWN interface_id=%d\n", SKYPOPEN_P_LOG, interface_id);
-			shutdown(tech_pvt->audiopipe_cli[0], 2);
-			close(tech_pvt->audiopipe_cli[0]);
-			shutdown(tech_pvt->audiopipe_cli[1], 2);
-			close(tech_pvt->audiopipe_cli[1]);
-			shutdown(tech_pvt->audiopipe_srv[0], 2);
-			close(tech_pvt->audiopipe_srv[0]);
-			shutdown(tech_pvt->audiopipe_srv[1], 2);
-			close(tech_pvt->audiopipe_srv[1]);
-			shutdown(tech_pvt->SkypopenHandles.fdesc[0], 2);
-			close(tech_pvt->SkypopenHandles.fdesc[0]);
-			shutdown(tech_pvt->SkypopenHandles.fdesc[1], 2);
-			close(tech_pvt->SkypopenHandles.fdesc[1]);
-#endif /* WIN32 */
-		}
-
-	}
-	switch_event_free_subclass(MY_EVENT_INCOMING_CHATMESSAGE);
-	switch_event_free_subclass(MY_EVENT_INCOMING_RAW);
-
-	switch_safe_free(globals.context);
-	switch_safe_free(globals.dialplan);
-	switch_safe_free(globals.destination);
-	switch_safe_free(globals.skype_user);
-	switch_safe_free(globals.report_incoming_chatmessages);
-	switch_safe_free(globals.silent_mode);
-	switch_safe_free(globals.write_silence_when_idle);
-	switch_safe_free(globals.setsockopt);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-void *SWITCH_THREAD_FUNC skypopen_do_tcp_srv_thread(switch_thread_t *thread, void *obj)
-{
-	return skypopen_do_tcp_srv_thread_func(obj);
-}
-
-void *SWITCH_THREAD_FUNC skypopen_do_tcp_cli_thread(switch_thread_t *thread, void *obj)
-{
-	return skypopen_do_tcp_cli_thread_func(obj);
-}
-
-void *SWITCH_THREAD_FUNC skypopen_do_skypeapi_thread(switch_thread_t *thread, void *obj)
-{
-	return skypopen_do_skypeapi_thread_func(obj);
-}
-
-int dtmf_received(private_t *tech_pvt, char *value)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-
-		if (channel) {
-
-			if (switch_channel_test_flag(channel, CF_BRIDGED)
-				&& !switch_true(switch_channel_get_variable(channel, "skype_add_outband_dtmf_also_when_bridged"))) {
-
-
-				NOTICA
-					("received DTMF '%c' on channel %s, but we're BRIDGED, so we DO NOT relay it out of band. If you DO want to relay it out of band when bridged too, on top of audio DTMF, set the channel variable 'skype_add_outband_dtmf_also_when_bridged=true' \n",
-					 SKYPOPEN_P_LOG, value[0], switch_channel_get_name(channel));
-
-			} else {
-
-
-
-				switch_dtmf_t dtmf = { (char) value[0], switch_core_default_dtmf_duration(0) };
-				DEBUGA_SKYPE("received DTMF %c on channel %s\n", SKYPOPEN_P_LOG, dtmf.digit, switch_channel_get_name(channel));
-				switch_mutex_lock(tech_pvt->flag_mutex);
-				switch_channel_queue_dtmf(channel, &dtmf);
-				switch_set_flag(tech_pvt, TFLAG_DTMF);
-				switch_mutex_unlock(tech_pvt->flag_mutex);
-			}
-		} else {
-			WARNINGA("received %c DTMF, but no channel?\n", SKYPOPEN_P_LOG, value[0]);
-		}
-		switch_core_session_rwunlock(session);
-	} else {
-		WARNINGA("received %c DTMF, but no session?\n", SKYPOPEN_P_LOG, value[0]);
-	}
-
-	return 0;
-}
-
-void *SWITCH_THREAD_FUNC skypopen_do_mod_sms_thread(switch_thread_t *thread, void *obj)
-{
-	switch_event_t *event;
-
-
-	event = obj;
-	switch_core_chat_send("GLOBAL", event);	/* mod_sms */
-
-	return event;
-
-}
-
-
-
-int start_mod_sms_thread(private_t *tech_pvt, switch_event_t *event)
-{
-	switch_threadattr_t *mod_sms_thread_thd_attr = NULL;
-	switch_thread_t *mod_sms_thread;
-
-
-	switch_threadattr_create(&mod_sms_thread_thd_attr, skypopen_module_pool);
-	switch_threadattr_detach_set(mod_sms_thread_thd_attr, 0);
-	switch_threadattr_stacksize_set(mod_sms_thread_thd_attr, SWITCH_THREAD_STACKSIZE);
-	if (switch_thread_create(&mod_sms_thread, mod_sms_thread_thd_attr, skypopen_do_mod_sms_thread, event, skypopen_module_pool) == SWITCH_STATUS_SUCCESS) {
-		DEBUGA_SKYPE("started mod_sms_thread thread.\n", SKYPOPEN_P_LOG);
-	} else {
-		ERRORA("failed to start mod_sms_thread thread.\n", SKYPOPEN_P_LOG);
-		return -1;
-	}
-	if (mod_sms_thread == NULL) {
-		WARNINGA("mod_sms_thread exited\n", SKYPOPEN_P_LOG);
-		return -1;
-	}
-
-	return 0;
-}
-
-
-int start_audio_threads(private_t *tech_pvt)
-{
-	switch_threadattr_t *tcp_srv_thread_thd_attr = NULL;
-	switch_threadattr_t *tcp_cli_thread_thd_attr = NULL;
-
-	tech_pvt->begin_to_write = 0;
-	tech_pvt->begin_to_read = 0;
-
-	if (switch_core_timer_init(&tech_pvt->timer_read, "soft", MS_SKYPOPEN, SAMPLES_PER_FRAME, skypopen_module_pool) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("setup timer failed\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_core_timer_sync(&tech_pvt->timer_read);
-
-	if (switch_core_timer_init(&tech_pvt->timer_read_srv, "soft", MS_SKYPOPEN, SAMPLES_PER_FRAME, skypopen_module_pool) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("setup timer failed\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_core_timer_sync(&tech_pvt->timer_read_srv);
-
-	if (switch_core_timer_init(&tech_pvt->timer_write, "soft", MS_SKYPOPEN, SAMPLES_PER_FRAME, skypopen_module_pool) != SWITCH_STATUS_SUCCESS) {
-		ERRORA("setup timer failed\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_core_timer_sync(&tech_pvt->timer_write);
-
-	switch_threadattr_create(&tcp_srv_thread_thd_attr, skypopen_module_pool);
-	switch_threadattr_detach_set(tcp_srv_thread_thd_attr, 0);
-	switch_threadattr_stacksize_set(tcp_srv_thread_thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_threadattr_priority_set(tcp_srv_thread_thd_attr, SWITCH_PRI_REALTIME);
-	switch_mutex_lock(tech_pvt->mutex_thread_audio_srv);
-	//DEBUGA_SKYPE("debugging_hangup srv lock\n", SKYPOPEN_P_LOG);
-	if (switch_thread_create(&tech_pvt->tcp_srv_thread, tcp_srv_thread_thd_attr, skypopen_do_tcp_srv_thread, tech_pvt, skypopen_module_pool) ==
-		SWITCH_STATUS_SUCCESS) {
-		DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPOPEN_P_LOG);
-	} else {
-		ERRORA("failed to start tcp_srv_thread thread.\n", SKYPOPEN_P_LOG);
-		switch_mutex_unlock(tech_pvt->mutex_thread_audio_srv);
-		//DEBUGA_SKYPE("debugging_hangup srv unlock\n", SKYPOPEN_P_LOG);
-		return -1;
-	}
-	switch_mutex_unlock(tech_pvt->mutex_thread_audio_srv);
-	//DEBUGA_SKYPE("debugging_hangup srv unlock\n", SKYPOPEN_P_LOG);
-
-	switch_threadattr_create(&tcp_cli_thread_thd_attr, skypopen_module_pool);
-	switch_threadattr_detach_set(tcp_cli_thread_thd_attr, 0);
-	switch_threadattr_stacksize_set(tcp_cli_thread_thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_threadattr_priority_set(tcp_cli_thread_thd_attr, SWITCH_PRI_REALTIME);
-	switch_mutex_lock(tech_pvt->mutex_thread_audio_cli);
-	//DEBUGA_SKYPE("debugging_hangup cli lock\n", SKYPOPEN_P_LOG);
-	if (switch_thread_create(&tech_pvt->tcp_cli_thread, tcp_cli_thread_thd_attr, skypopen_do_tcp_cli_thread, tech_pvt, skypopen_module_pool) ==
-		SWITCH_STATUS_SUCCESS) {
-		DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPOPEN_P_LOG);
-	} else {
-		ERRORA("failed to start tcp_cli_thread thread.\n", SKYPOPEN_P_LOG);
-		switch_mutex_unlock(tech_pvt->mutex_thread_audio_cli);
-		//DEBUGA_SKYPE("debugging_hangup cli unlock\n", SKYPOPEN_P_LOG);
-		return -1;
-	}
-	switch_mutex_unlock(tech_pvt->mutex_thread_audio_cli);
-	//DEBUGA_SKYPE("debugging_hangup cli unlock\n", SKYPOPEN_P_LOG);
-	switch_sleep(100000);
-
-	if (tech_pvt->tcp_cli_thread == NULL || tech_pvt->tcp_srv_thread == NULL) {
-		WARNINGA("tcp_cli_thread or tcp_srv_thread exited\n", SKYPOPEN_P_LOG);
-		return -1;
-	}
-
-	return 0;
-}
-
-int new_inbound_channel(private_t *tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if ((session = switch_core_session_request(skypopen_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) != 0) {
-		DEBUGA_SKYPE("2 SESSION_REQUEST %s\n", SKYPOPEN_P_LOG, switch_core_session_get_uuid(session));
-		switch_core_session_add_stream(session, NULL);
-		channel = switch_core_session_get_channel(session);
-		if (!channel) {
-			ERRORA("Doh! no channel?\n", SKYPOPEN_P_LOG);
-			switch_core_session_destroy(&session);
-			return 0;
-		}
-		switch_channel_set_variable(channel, "waste", "false");
-		if (skypopen_tech_init(tech_pvt, session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Doh! no tech_init?\n", SKYPOPEN_P_LOG);
-			switch_core_session_destroy(&session);
-			return 0;
-		}
-
-		if ((tech_pvt->caller_profile =
-			 switch_caller_profile_new(switch_core_session_get_pool(session), "skypopen",
-									   tech_pvt->dialplan, tech_pvt->callid_name,
-									   tech_pvt->callid_number, NULL, NULL, NULL, NULL, "mod_skypopen", tech_pvt->context, tech_pvt->destination)) != 0) {
-			char name[128];
-			switch_snprintf(name, sizeof(name), "skypopen/%s", tech_pvt->name);
-			switch_channel_set_name(channel, name);
-			switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
-		}
-		switch_channel_set_state(channel, CS_INIT);
-		if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Error spawning thread\n", SKYPOPEN_P_LOG);
-			switch_core_session_destroy(&session);
-			return 0;
-		}
-	}
-	if (channel) {
-		switch_channel_set_variable(channel, "skype_user", tech_pvt->skype_user);
-		switch_channel_set_variable(channel, "initial_skype_user", tech_pvt->initial_skype_user);
-	}
-
-	DEBUGA_SKYPE("new_inbound_channel\n", SKYPOPEN_P_LOG);
-
-	return 0;
-}
-
-int remote_party_is_ringing(private_t *tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	} else {
-		ERRORA("No session_uuid_str???\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-	} else {
-		ERRORA("No session???\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-	if (channel) {
-		switch_channel_mark_ring_ready(channel);
-		DEBUGA_SKYPE("skype_call: REMOTE PARTY RINGING\n", SKYPOPEN_P_LOG);
-	} else {
-		ERRORA("No channel???\n", SKYPOPEN_P_LOG);
-	}
-
-	switch_core_session_rwunlock(session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-int remote_party_is_early_media(private_t *tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	} else {
-		ERRORA("No session_uuid_str???\n\n\n", SKYPOPEN_P_LOG);
-		goto done;
-	}
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-		switch_core_session_add_stream(session, NULL);
-	} else {
-		ERRORA("No session???\n", SKYPOPEN_P_LOG);
-		goto done;
-	}
-	if (channel) {
-		switch_channel_mark_pre_answered(channel);
-		DEBUGA_SKYPE("skype_call: REMOTE PARTY EARLY MEDIA\n", SKYPOPEN_P_LOG);
-	} else {
-		ERRORA("No channel???\n", SKYPOPEN_P_LOG);
-	}
-
-	switch_core_session_rwunlock(session);
-
-  done:
-	return 0;
-}
-
-int outbound_channel_answered(private_t *tech_pvt)
-{
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	} else {
-		ERRORA("No session???\n", SKYPOPEN_P_LOG);
-		goto done;
-	}
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-	} else {
-		ERRORA("No channel???\n", SKYPOPEN_P_LOG);
-		goto done;
-	}
-	if (channel) {
-		switch_channel_mark_answered(channel);
-	} else {
-		ERRORA("No channel???\n", SKYPOPEN_P_LOG);
-	}
-
-	switch_core_session_rwunlock(session);
-
-  done:
-	DEBUGA_SKYPE("outbound_channel_answered!\n", SKYPOPEN_P_LOG);
-
-	return 0;
-}
-
-private_t *find_available_skypopen_interface_rr(private_t *tech_pvt_calling)
-{
-	private_t *tech_pvt = NULL;
-	int i;
-
-	switch_mutex_lock(globals.mutex);
-
-	/* Fact is the real interface start from 1 */
-	//XXX no, is just a convention, but you can have it start from 0. I do not, for aestetic reasons :-)
-
-	for (i = 0; i < SKYPOPEN_MAX_INTERFACES; i++) {
-		int interface_id;
-
-		interface_id = globals.next_interface;
-		globals.next_interface = interface_id + 1 < SKYPOPEN_MAX_INTERFACES ? interface_id + 1 : 0;
-
-		if (strlen(globals.SKYPOPEN_INTERFACES[interface_id].name)) {
-			int skype_state = 0;
-
-			tech_pvt = &globals.SKYPOPEN_INTERFACES[interface_id];
-			skype_state = tech_pvt->interface_state;
-			if ((tech_pvt_calling ? strcmp(tech_pvt->skype_user, tech_pvt_calling->skype_user) : 1)
-				&& (SKYPOPEN_STATE_IDLE == skype_state)) {
-				DEBUGA_SKYPE("returning as available skype interface name: %s, state: %d callflow: %d\n", SKYPOPEN_P_LOG, tech_pvt->name, skype_state,
-							 tech_pvt->skype_callflow);
-				if (tech_pvt_calling == NULL) {
-					tech_pvt->interface_state = SKYPOPEN_STATE_SELECTED;
-				}
-
-				switch_mutex_unlock(globals.mutex);
-				return tech_pvt;
-			}
-		}
-	}
-
-	switch_mutex_unlock(globals.mutex);
-	return NULL;
-}
-
-SWITCH_STANDARD_API(sk_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	int tmp_i = 0;
-	char tmp_message[4096];
-
-	if (globals.sk_console)
-		stream->write_function(stream, "sk console is: |||%s|||\n", globals.sk_console->name);
-	else
-		stream->write_function(stream, "sk console is NOT yet assigned\n");
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc || !argv[0]) {
-		stream->write_function(stream, "%s", SK_SYNTAX);
-		goto end;
-	}
-
-
-	if (!strcasecmp(argv[0], "balances")) {
-		stream->write_function(stream, "  Name  \tBalance\tCurrency\n");
-		stream->write_function(stream, "  ====  \t=======\t========\n");
-
-		for (tmp_i = 0; tmp_i < SKYPOPEN_MAX_INTERFACES; tmp_i++) {
-			if (strlen(globals.SKYPOPEN_INTERFACES[tmp_i].name)) {
-				skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[tmp_i], "GET PROFILE PSTN_BALANCE");
-				switch_sleep(20000);
-
-				strncpy(tmp_message, globals.SKYPOPEN_INTERFACES[tmp_i].message, sizeof(globals.SKYPOPEN_INTERFACES[tmp_i].message));
-
-				skypopen_signaling_write(&globals.SKYPOPEN_INTERFACES[tmp_i], "GET PROFILE PSTN_BALANCE_CURRENCY");
-				switch_sleep(20000);
-				if (strlen(tmp_message) > 21 && strlen(globals.SKYPOPEN_INTERFACES[tmp_i].message) > 30)
-					stream->write_function(stream, "  %s \t%s\t%s\n", globals.SKYPOPEN_INTERFACES[tmp_i].name, tmp_message + 21,
-										   globals.SKYPOPEN_INTERFACES[tmp_i].message + 30);
-			}
-		}
-	} else if (!strcasecmp(argv[0], "list")) {
-		int i;
-		unsigned int ib = 0;
-		unsigned int ib_failed = 0;
-		unsigned int ob = 0;
-		unsigned int ob_failed = 0;
-		char next_flag_char = ' ';
-
-		stream->write_function(stream, "F ID\t    Name    \tIB (F/T)    OB (F/T)\tState\tCallFlw\t\tUUID\n");
-		stream->write_function(stream, "= ====\t  ========  \t=======     =======\t======\t============\t======\n");
-
-		for (i = 0; i < SKYPOPEN_MAX_INTERFACES; i++) {
-			if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
-				next_flag_char = i == globals.next_interface ? '*' : ' ';
-				ib += globals.SKYPOPEN_INTERFACES[i].ib_calls;
-				ib_failed += globals.SKYPOPEN_INTERFACES[i].ib_failed_calls;
-				ob += globals.SKYPOPEN_INTERFACES[i].ob_calls;
-				ob_failed += globals.SKYPOPEN_INTERFACES[i].ob_failed_calls;
-
-				stream->write_function(stream,
-									   "%c %d\t[%6s]\t%3u/%u\t%6u/%u\t%s\t%s\t%s\n",
-									   next_flag_char,
-									   i, globals.SKYPOPEN_INTERFACES[i].name,
-									   globals.SKYPOPEN_INTERFACES[i].ib_failed_calls,
-									   globals.SKYPOPEN_INTERFACES[i].ib_calls,
-									   globals.SKYPOPEN_INTERFACES[i].ob_failed_calls,
-									   globals.SKYPOPEN_INTERFACES[i].ob_calls,
-									   interface_status[globals.SKYPOPEN_INTERFACES[i].interface_state],
-									   skype_callflow[globals.SKYPOPEN_INTERFACES[i].skype_callflow], globals.SKYPOPEN_INTERFACES[i].session_uuid_str);
-			} else if (argc > 1 && !strcasecmp(argv[1], "full")) {
-				stream->write_function(stream, "%c %d\n", next_flag_char, i);
-			}
-
-		}
-		stream->write_function(stream, "\nTotal Interfaces: %d  IB Calls(Failed/Total): %u/%u  OB Calls(Failed/Total): %u/%u\n",
-							   globals.real_interfaces > 0 ? globals.real_interfaces - 1 : 0, ib_failed, ib, ob_failed, ob);
-
-	} else if (!strcasecmp(argv[0], "console")) {
-		int i;
-		int found = 0;
-
-		if (argc == 2) {
-			for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-				/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-				if (strlen(globals.SKYPOPEN_INTERFACES[i].name)
-					&& (strncmp(globals.SKYPOPEN_INTERFACES[i].name, argv[1], strlen(argv[1])) == 0)) {
-					globals.sk_console = &globals.SKYPOPEN_INTERFACES[i];
-					stream->write_function(stream,
-										   "sk console is now: globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPOPEN_INTERFACES[i].name);
-					stream->write_function(stream, "sk console is: |||%s|||\n", globals.sk_console->name);
-					found = 1;
-					break;
-				}
-
-			}
-			if (!found)
-				stream->write_function(stream, "ERROR: A Skypopen interface with name='%s' was not found\n", argv[1]);
-		} else {
-
-			stream->write_function(stream, "-ERR Usage: sk console interface_name\n");
-			goto end;
-		}
-
-	} else if (!strcasecmp(argv[0], "reload")) {
-		if (load_config(SOFT_RELOAD) != SWITCH_STATUS_SUCCESS) {
-			stream->write_function(stream, "sk reload failed\n");
-		} else {
-			stream->write_function(stream, "sk reload success\n");
-		}
-	} else if (!strcasecmp(argv[0], "remove")) {
-		if (argc == 2) {
-			if (remove_interface(argv[1], FALSE) == SWITCH_STATUS_SUCCESS) {
-				if (interface_exists(argv[1]) == SWITCH_STATUS_SUCCESS) {
-					stream->write_function(stream, "sk remove '%s' failed\n", argv[1]);
-				} else {
-					stream->write_function(stream, "sk remove '%s' success\n", argv[1]);
-				}
-			}
-		} else {
-			stream->write_function(stream, "-ERR Usage: sk remove interface_name\n");
-			goto end;
-		}
-
-	} else {
-		if (globals.sk_console)
-			skypopen_signaling_write(globals.sk_console, (char *) cmd);
-		else
-			stream->write_function(stream, "sk console is NOT yet assigned\n");
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(skypopen_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", SKYPOPEN_SYNTAX);
-		goto end;
-	}
-
-	if (argc < 2) {
-		stream->write_function(stream, "ERROR, usage: %s", SKYPOPEN_SYNTAX);
-		goto end;
-	}
-
-	if (argv[0]) {
-		int i;
-		int found = 0;
-
-		for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.SKYPOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.SKYPOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.SKYPOPEN_INTERFACES[i];
-				stream->write_function(stream, "Using interface: globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPOPEN_INTERFACES[i].name);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A Skypopen interface with name='%s' was not found\n", argv[0]);
-			switch_safe_free(mycmd);
-
-			return SWITCH_STATUS_SUCCESS;
-		} else {
-			skypopen_signaling_write(tech_pvt, (char *) &cmd[strlen(argv[0]) + 1]);
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", SKYPOPEN_SYNTAX);
-	}
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-int skypopen_partner_handle_ring(private_t *tech_pvt)
-{
-	char msg_to_skype[1024];
-	int i;
-	int found = 0;
-	private_t *giovatech;
-	struct timeval timenow;
-	char *id = tech_pvt->ring_id;
-	char *value = tech_pvt->ring_value;
-	switch_core_session_t *session = NULL;
-
-	switch_mutex_lock(globals.mutex);
-
-	gettimeofday(&timenow, NULL);
-	for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-		if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
-
-			giovatech = &globals.SKYPOPEN_INTERFACES[i];
-			if ((giovatech->interface_state != SKYPOPEN_STATE_DEAD) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (giovatech->interface_state != SKYPOPEN_STATE_IDLE) && (strcmp(giovatech->name, tech_pvt->name)) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->ring_value, value)) && ((((timenow.tv_sec - giovatech->ring_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->ring_time.tv_usec)) < 1000000)) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
-				found = 1;
-				DEBUGA_SKYPE
-					("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
-					 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number,
-					 value);
-				if (tech_pvt->interface_state == SKYPOPEN_STATE_PRERING) {
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-				} else if (tech_pvt->interface_state != 0 && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN) {
-					WARNINGA("Why an interface_state %d HERE?\n", SKYPOPEN_P_LOG, tech_pvt->interface_state);
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-				}
-
-				*tech_pvt->answer_id = '\0';
-				*tech_pvt->answer_value = '\0';
-				*tech_pvt->ring_id = '\0';
-				*tech_pvt->ring_value = '\0';
-				break;
-			}
-		}
-	}
-
-	if (found) {
-		switch_mutex_unlock(globals.mutex);
-		return 0;
-	}
-	DEBUGA_SKYPE("NOT FOUND\n", SKYPOPEN_P_LOG);
-
-	// CLOUDTREE (Thomas Hazel)
-	if (tech_pvt && tech_pvt->ringing_state == SKYPOPEN_RINGING_INIT) {
-		/* we are not inside an active call */
-
-		switch_channel_t *channel = NULL;
-
-		tech_pvt->interface_state = SKYPOPEN_STATE_PRERING;
-		gettimeofday(&tech_pvt->ring_time, NULL);
-		switch_copy_string(tech_pvt->callid_number, value, sizeof(tech_pvt->callid_number) - 1);
-
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-		if (session) {
-			switch_core_session_rwunlock(session);
-			return 0;
-		}
-
-		new_inbound_channel(tech_pvt);
-
-		switch_sleep(10000);
-
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-		if (session) {
-			channel = switch_core_session_get_channel(session);
-			switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING);
-			if (channel) {
-				switch_channel_mark_ring_ready(channel);
-				DEBUGA_SKYPE("switch_channel_mark_ring_ready(channel);\n", SKYPOPEN_P_LOG);
-			} else {
-				ERRORA("no channel\n", SKYPOPEN_P_LOG);
-			}
-			switch_core_session_rwunlock(session);
-		} else {
-			ERRORA("no session\n", SKYPOPEN_P_LOG);
-		}
-	} else if (!tech_pvt || !tech_pvt->skype_call_id[0]) {
-		ERRORA("No Call ID?\n", SKYPOPEN_P_LOG);
-	} else {
-		DEBUGA_SKYPE("We're in a call now (%s), let's refuse this one (%s)\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, id);
-		sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
-		skypopen_signaling_write(tech_pvt, msg_to_skype);
-		sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
-		skypopen_signaling_write(tech_pvt, msg_to_skype);
-	}
-
-	switch_mutex_unlock(globals.mutex);
-	return 0;
-}
-
-int skypopen_answer(private_t *tech_pvt)
-{
-	char msg_to_skype[1024];
-	int i;
-	int found = 0;
-	private_t *giovatech;
-	struct timeval timenow;
-	char *id = tech_pvt->answer_id;
-	char *value = tech_pvt->answer_value;
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	switch_mutex_lock(globals.mutex);
-
-	gettimeofday(&timenow, NULL);
-	for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-		if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
-
-			giovatech = &globals.SKYPOPEN_INTERFACES[i];
-			if (strlen(giovatech->skype_call_id) && (giovatech->interface_state != SKYPOPEN_STATE_DEAD) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (giovatech->interface_state != SKYPOPEN_STATE_IDLE) && (strcmp(giovatech->name, tech_pvt->name)) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->callid_number, value)) && ((((timenow.tv_sec - giovatech->answer_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->answer_time.tv_usec)) < 1000000)) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
-				found = 1;
-				DEBUGA_SKYPE
-					("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
-					 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number,
-					 value);
-				if (tech_pvt->interface_state == SKYPOPEN_STATE_PRERING) {
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-				} else if (tech_pvt->interface_state != 0 && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN) {
-					WARNINGA("Why an interface_state %d HERE?\n", SKYPOPEN_P_LOG, tech_pvt->interface_state);
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-				}
-
-
-				if (!zstr(tech_pvt->session_uuid_str)) {
-					session = switch_core_session_locate(tech_pvt->session_uuid_str);
-				} else {
-					ERRORA("No session_uuid_str???\n", SKYPOPEN_P_LOG);
-					break;
-				}
-				if (session) {
-					channel = switch_core_session_get_channel(session);
-				} else {
-					ERRORA("No session???\n", SKYPOPEN_P_LOG);
-					switch_core_session_rwunlock(session);
-					break;
-				}
-				if (channel) {
-					switch_channel_set_state(channel, CS_RESET);
-				} else {
-					ERRORA("No channel???\n", SKYPOPEN_P_LOG);
-					switch_core_session_rwunlock(session);
-					break;
-				}
-
-				switch_core_session_rwunlock(session);
-
-				break;
-			}
-		}
-	}
-
-	if (found) {
-		switch_mutex_unlock(globals.mutex);
-		return 0;
-	}
-	DEBUGA_SKYPE("NOT FOUND\n", SKYPOPEN_P_LOG);
-
-	// CLOUDTREE (Thomas Hazel)
-	if (tech_pvt && tech_pvt->ringing_state == SKYPOPEN_RINGING_INIT) {
-		/* we are not inside an active call */
-
-		tech_pvt->ib_calls++;
-
-		tech_pvt->interface_state = SKYPOPEN_STATE_PREANSWER;
-		sprintf(msg_to_skype, "ALTER CALL %s ANSWER", id);
-		skypopen_signaling_write(tech_pvt, msg_to_skype);
-		DEBUGA_SKYPE("We answered a Skype RING on skype_call %s\n", SKYPOPEN_P_LOG, id);
-		gettimeofday(&tech_pvt->answer_time, NULL);
-		switch_copy_string(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-
-		switch_copy_string(tech_pvt->callid_number, value, sizeof(tech_pvt->callid_number) - 1);
-
-		DEBUGA_SKYPE
-			("NEW!  name: %s, state: %d, value=%s, tech_pvt->callid_number=%s, tech_pvt->skype_user=%s\n",
-			 SKYPOPEN_P_LOG, tech_pvt->name, tech_pvt->interface_state, value, tech_pvt->callid_number, tech_pvt->skype_user);
-	} else if (!tech_pvt || !tech_pvt->skype_call_id[0]) {
-		ERRORA("No Call ID?\n", SKYPOPEN_P_LOG);
-	} else {
-		DEBUGA_SKYPE("We're in a call now (%s), let's refuse this one (%s)\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, id);
-		sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
-		skypopen_signaling_write(tech_pvt, msg_to_skype);
-		sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
-		skypopen_signaling_write(tech_pvt, msg_to_skype);
-	}
-
-	switch_mutex_unlock(globals.mutex);
-	return 0;
-}
-
-int skypopen_transfer(private_t *tech_pvt)
-{
-	char msg_to_skype[1024];
-	int i;
-	int found = 0;
-	private_t *giovatech;
-	struct timeval timenow;
-	char *id = tech_pvt->ring_id;
-	char *value = tech_pvt->ring_value;
-
-	switch_mutex_lock(globals.mutex);
-
-	gettimeofday(&timenow, NULL);
-	for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-		if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
-
-			giovatech = &globals.SKYPOPEN_INTERFACES[i];
-			/* let's look for a RINGING one */
-			if ((giovatech->interface_state != SKYPOPEN_STATE_DEAD) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (giovatech->interface_state != SKYPOPEN_STATE_IDLE) && (strcmp(giovatech->name, tech_pvt->name)) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->ring_value, value)) && ((((timenow.tv_sec - giovatech->ring_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->ring_time.tv_usec)) < 1000000)) {	//XXX 1.0sec - can have a max of 1 call coming from the same skypename to the same skypename each 1.0 seconds
-				found = 1;
-				DEBUGA_SKYPE
-					("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
-					 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number,
-					 value);
-				if (tech_pvt->interface_state == SKYPOPEN_STATE_PRERING) {
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-				}
-				break;
-			}
-		}
-	}
-
-	for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-		if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
-
-			giovatech = &globals.SKYPOPEN_INTERFACES[i];
-			/* let's look for a IDLE one */
-			if ((giovatech->interface_state == SKYPOPEN_STATE_IDLE) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user))) {
-				found = 1;
-				DEBUGA_SKYPE
-					("FOUND  (name=%s, giovatech->interface_state=%d == SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
-					 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number,
-					 value);
-				if (tech_pvt->interface_state == SKYPOPEN_STATE_PRERING) {
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-				}
-				break;
-			}
-		}
-	}
-
-
-	if (found) {
-		switch_mutex_unlock(globals.mutex);
-		return 0;
-	}
-	DEBUGA_SKYPE("NOT FOUND\n", SKYPOPEN_P_LOG);
-
-	if (!tech_pvt || !tech_pvt->skype_call_id[0]) {
-		/* we are not inside an active call */
-		DEBUGA_SKYPE("We're NO MORE in a call now %s\n", SKYPOPEN_P_LOG, tech_pvt ? tech_pvt->skype_call_id : "");
-		switch_mutex_unlock(globals.mutex);
-
-	} else {
-
-		/*  we're in a call, let's try to transfer */
-		/************************** TODO
-		  Checking here if it is possible to transfer this call to Test2
-		  -> GET CALL 288 CAN_TRANSFER Test2
-		  <- CALL 288 CAN_TRANSFER test2 TRUE
-		 **********************************/
-
-		private_t *available_skypopen_interface = NULL;
-
-		gettimeofday(&timenow, NULL);
-		for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-			if (strlen(globals.SKYPOPEN_INTERFACES[i].name)) {
-
-				giovatech = &globals.SKYPOPEN_INTERFACES[i];
-				if (strlen(giovatech->skype_transfer_call_id) && (giovatech->interface_state != SKYPOPEN_STATE_DOWN) && (giovatech->interface_state != SKYPOPEN_STATE_DEAD) && (!strcmp(giovatech->skype_user, tech_pvt->skype_user)) && (!strcmp(giovatech->transfer_callid_number, value)) && ((((timenow.tv_sec - giovatech->transfer_time.tv_sec) * 1000000) + (timenow.tv_usec - giovatech->transfer_time.tv_usec)) < 1000000)) {	//1.0 sec
-					found = 1;
-					DEBUGA_SKYPE
-						("FOUND  (name=%s, giovatech->interface_state=%d != SKYPOPEN_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->transfer_callid_number=%s == value=%s)\n",
-						 SKYPOPEN_P_LOG, giovatech->name, giovatech->interface_state,
-						 giovatech->skype_user, tech_pvt->skype_user, giovatech->transfer_callid_number, value)
-						break;
-				}
-			}
-		}
-
-		if (found) {
-			switch_mutex_unlock(globals.mutex);
-			return 0;
-		}
-		DEBUGA_SKYPE("NOT FOUND\n", SKYPOPEN_P_LOG);
-
-		available_skypopen_interface = find_available_skypopen_interface_rr(tech_pvt);
-		if (available_skypopen_interface) {
-			/* there is a skypopen interface idle, let's transfer the call to it */
-
-			switch_copy_string(available_skypopen_interface->initial_skype_user, tech_pvt->skype_user, sizeof(tech_pvt->skype_user) - 1);
-
-			gettimeofday(&tech_pvt->transfer_time, NULL);
-			switch_copy_string(tech_pvt->skype_transfer_call_id, id, sizeof(tech_pvt->skype_transfer_call_id) - 1);
-
-			switch_copy_string(tech_pvt->transfer_callid_number, value, sizeof(tech_pvt->transfer_callid_number) - 1);
-
-			DEBUGA_SKYPE
-				("Let's transfer the skype_call %s to %s interface (with skype_user: %s), because we are already in a skypopen call(%s)\n",
-				 SKYPOPEN_P_LOG, tech_pvt->skype_call_id, available_skypopen_interface->name, available_skypopen_interface->skype_user, id);
-
-
-			sprintf(msg_to_skype, "ALTER CALL %s TRANSFER %s", id, available_skypopen_interface->skype_user);
-			skypopen_signaling_write(tech_pvt, msg_to_skype);
-		} else {
-			/* no skypopen interfaces idle, do hangup */
-			DEBUGA_SKYPE
-				("Not answering the skype_call %s, because we are already in a skypopen call(%s) and not transferring, because no other skypopen interfaces are available\n",
-				 SKYPOPEN_P_LOG, id, tech_pvt->skype_call_id);
-			sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
-			skypopen_signaling_write(tech_pvt, msg_to_skype);
-			sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
-			skypopen_signaling_write(tech_pvt, msg_to_skype);
-		}
-		switch_sleep(20000);
-		DEBUGA_SKYPE
-			("We have NOT answered a Skype RING from skype_call %s, because we are already in a skypopen call (%s)\n",
-			 SKYPOPEN_P_LOG, id, tech_pvt->skype_call_id);
-
-		switch_mutex_unlock(globals.mutex);
-	}
-	return 0;
-}
-
-int incoming_chatmessage(private_t *tech_pvt, int which)
-{
-	switch_event_t *event;
-	switch_core_session_t *session = NULL;
-	int event_sent_to_esl = 0;
-
-	DEBUGA_SKYPE("received CHATMESSAGE on interface %s\n", SKYPOPEN_P_LOG, tech_pvt->name);
-
-	if (!tech_pvt->report_incoming_chatmessages) {
-		DEBUGA_SKYPE("I will not generate an Event, report_incoming_chatmessages is %d\n", SKYPOPEN_P_LOG, tech_pvt->report_incoming_chatmessages);
-		return 0;
-	}
-
-	if (!zstr(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	}
-	if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", SKYPE_CHAT_PROTO);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", tech_pvt->name);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->chatmessages[which].from_dispname);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->chatmessages[which].from_handle);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "chatname", tech_pvt->chatmessages[which].chatname);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "id", tech_pvt->chatmessages[which].id);
-/* mod_sms begin */
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to", tech_pvt->skype_user);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_proto", SKYPE_CHAT_PROTO);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_user", tech_pvt->chatmessages[which].from_handle);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_host", "from_host");
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_full", "from_full");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_user", tech_pvt->name);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_host", "to_host");
-/* mod_sms end */
-
-		switch_event_add_body(event, "%s", tech_pvt->chatmessages[which].body);
-
-		if (session) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "true");
-			if (switch_core_session_queue_event(session, &event) != SWITCH_STATUS_SUCCESS) {
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true");
-				switch_event_fire(&event);
-			}
-		} else {				//no session
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "false");
-			switch_event_fire(&event);
-			event_sent_to_esl = 1;
-		}
-
-	} else {
-		ERRORA("cannot create event on interface %s. WHY?????\n", SKYPOPEN_P_LOG, tech_pvt->name);
-	}
-
-	if (!event_sent_to_esl) {
-
-		if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", SKYPE_CHAT_PROTO);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", tech_pvt->name);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->chatmessages[which].from_dispname);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->chatmessages[which].from_handle);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE");
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "chatname", tech_pvt->chatmessages[which].chatname);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "id", tech_pvt->chatmessages[which].id);
-			switch_event_add_body(event, "%s", tech_pvt->chatmessages[which].body);
-			if (session) {
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "true");
-			} else {			//no session
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "false");
-			}
-			switch_event_fire(&event);
-		} else {
-			ERRORA("cannot create event on interface %s. WHY?????\n", SKYPOPEN_P_LOG, tech_pvt->name);
-		}
-	}
-
-	if (session) {
-		switch_core_session_rwunlock(session);
-	}
-
-
-	if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", SKYPE_CHAT_PROTO);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", tech_pvt->name);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->chatmessages[which].from_dispname);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", tech_pvt->chatmessages[which].from_handle);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "chatname", tech_pvt->chatmessages[which].chatname);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "id", tech_pvt->chatmessages[which].id);
-/* mod_sms begin */
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to", tech_pvt->skype_user);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hint", tech_pvt->name);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_proto", SKYPE_CHAT_PROTO);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_user", tech_pvt->chatmessages[which].from_handle);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_host", "from_host");
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_full", "from_full");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_user", tech_pvt->name);
-		//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to_host", "to_host");
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "context", tech_pvt->context);
-/* mod_sms end */
-
-		switch_event_add_body(event, "%s", tech_pvt->chatmessages[which].body);
-		//switch_core_chat_send("GLOBAL", event); /* mod_sms */
-		start_mod_sms_thread(tech_pvt, event);
-		//usleep(20000);
-
-	} else {
-		ERRORA("cannot create event on interface %s. WHY?????\n", SKYPOPEN_P_LOG, tech_pvt->name);
-	}
-
-	return 0;
-}
-
-static switch_status_t compat_chat_send(const char *proto, const char *from, const char *to,
-										const char *subject, const char *body, const char *type, const char *hint)
-{
-	switch_event_t *message_event;
-	switch_status_t status;
-
-	if (switch_event_create(&message_event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "proto", proto);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "from", from);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "to", to);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "subject", subject);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "type", type);
-		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "hint", hint);
-
-		if (body) {
-			switch_event_add_body(message_event, "%s", body);
-		}
-	} else {
-		abort();
-	}
-
-	status = chat_send(message_event);
-	switch_event_destroy(&message_event);
-
-	return status;
-
-}
-
-SWITCH_STANDARD_API(skypopen_chat_function)
-{
-	char *mycmd = NULL, *argv[10] = { 0 };
-	int argc = 0;
-	private_t *tech_pvt = NULL;
-	int i;
-	int found = 0;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	}
-
-	if (!argc) {
-		stream->write_function(stream, "ERROR, usage: %s", SKYPOPEN_CHAT_SYNTAX);
-		goto end;
-	}
-
-	if (argc < 3) {
-		stream->write_function(stream, "ERROR, usage: %s", SKYPOPEN_CHAT_SYNTAX);
-		goto end;
-	}
-
-	if (argv[0]) {
-		for (i = 0; !found && i < SKYPOPEN_MAX_INTERFACES; i++) {
-			/* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
-			if (strlen(globals.SKYPOPEN_INTERFACES[i].name)
-				&& (strncmp(globals.SKYPOPEN_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
-				tech_pvt = &globals.SKYPOPEN_INTERFACES[i];
-				stream->write_function(stream, "Using interface: globals.SKYPOPEN_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPOPEN_INTERFACES[i].name);
-				found = 1;
-				break;
-			}
-
-		}
-		if (!found) {
-			stream->write_function(stream, "ERROR: A Skypopen interface with name='%s' was not found\n", argv[0]);
-			goto end;
-		} else {
-
-			NOTICA("chat_send(proto=%s, from=%s, to=%s, subject=%s, body=%s, type=NULL, hint=%s)\n", SKYPOPEN_P_LOG, SKYPE_CHAT_PROTO,
-				   tech_pvt->skype_user, argv[1], "SIMPLE MESSAGE", switch_str_nil((char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1]),
-				   tech_pvt->name);
-
-			compat_chat_send(SKYPE_CHAT_PROTO, tech_pvt->skype_user, argv[1], "SIMPLE MESSAGE",
-							 switch_str_nil((char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1]), NULL, tech_pvt->name);
-
-		}
-	} else {
-		stream->write_function(stream, "ERROR, usage: %s", SKYPOPEN_CHAT_SYNTAX);
-		goto end;
-	}
-
-  end:
-	switch_safe_free(mycmd);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-int next_port(void)
-{
-	switch_mutex_lock(globals.mutex);
-	globals.start_port++;
-	if (globals.start_port == 65000)
-		globals.start_port = 32769;
-	switch_mutex_unlock(globals.mutex);
-	return (globals.start_port - 1);
-}
-
-#ifndef WIN32
-// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list?
-struct SkypopenHandles *skypopen_list_add(struct SkypopenList *list, struct SkypopenHandles *handle)
-{
-	switch_mutex_lock(globals.list_mutex);
-
-	if (handle->managed == SWITCH_TRUE) {
-		// already added
-		switch_mutex_unlock(globals.list_mutex);
-		return 0;
-	}
-
-	if (list->head == 0) {
-		list->head = handle;
-		handle->prev = 0;
-
-	} else {
-		((struct SkypopenHandles *) list->tail)->next = handle;
-		((struct SkypopenHandles *) handle)->prev = list->tail;
-	}
-
-	list->tail = handle;
-	handle->next = 0;
-
-	handle->managed = SWITCH_TRUE;
-
-	list->entries++;
-
-	switch_mutex_unlock(globals.list_mutex);
-
-	return handle;
-}
-
-// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list?
-struct SkypopenHandles *skypopen_list_remove_by_value(struct SkypopenList *list, Display * display)
-{
-	struct SkypopenHandles *iter;
-	struct SkypopenHandles *handle = 0;
-
-	switch_mutex_lock(globals.list_mutex);
-
-	iter = (struct SkypopenHandles *) list->head;
-	while (iter != 0) {
-		if (iter->disp == display) {
-			handle = iter;
-			break;
-		}
-
-		iter = (struct SkypopenHandles *) iter->next;
-	}
-
-	if ((handle != 0) && (handle->managed == SWITCH_TRUE)) {
-		if (handle->prev == 0) {
-			list->head = ((struct SkypopenHandles *) handle)->next;
-
-		} else {
-			((struct SkypopenHandles *) handle->prev)->next = ((struct SkypopenHandles *) handle)->next;
-		}
-
-		if (handle->next == 0) {
-			list->tail = ((struct SkypopenHandles *) handle)->prev;
-
-		} else {
-			((struct SkypopenHandles *) handle->next)->prev = ((struct SkypopenHandles *) handle)->prev;
-		}
-
-		handle->managed = SWITCH_FALSE;
-		handle->next = 0;
-		handle->prev = 0;
-
-		list->entries--;
-	}
-
-	switch_mutex_unlock(globals.list_mutex);
-
-	return handle;
-}
-
-// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list?
-struct SkypopenHandles *skypopen_list_remove_by_reference(struct SkypopenList *list, struct SkypopenHandles *handle)
-{
-	private_t *tech_pvt = NULL;
-
-	switch_mutex_lock(globals.list_mutex);
-
-	DEBUGA_SKYPE("BEGIN REMOVE\n", SKYPOPEN_P_LOG);
-	if (handle->managed == SWITCH_FALSE) {
-		// already removed
-		switch_mutex_unlock(globals.list_mutex);
-		DEBUGA_SKYPE("EXIT REMOVE\n", SKYPOPEN_P_LOG);
-		return 0;
-	}
-
-	if (handle->prev == 0) {
-		list->head = ((struct SkypopenHandles *) handle)->next;
-
-	} else {
-		((struct SkypopenHandles *) handle->prev)->next = ((struct SkypopenHandles *) handle)->next;
-	}
-
-	if (handle->next == 0) {
-		list->tail = ((struct SkypopenHandles *) handle)->prev;
-
-	} else {
-		((struct SkypopenHandles *) handle->next)->prev = ((struct SkypopenHandles *) handle)->prev;
-	}
-
-	handle->managed = SWITCH_FALSE;
-	handle->next = 0;
-	handle->prev = 0;
-
-	list->entries--;
-
-	switch_mutex_unlock(globals.list_mutex);
-	DEBUGA_SKYPE("EXIT REMOVE\n", SKYPOPEN_P_LOG);
-
-	return handle;
-}
-
-// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list?
-#ifdef XIO_ERROR_BY_UCONTEXT
-struct SkypopenHandles *skypopen_list_find(struct SkypopenList *list, struct SkypopenHandles *find)
-{
-	struct SkypopenHandles *iter;
-	struct SkypopenHandles *handle = NULL;
-
-	switch_mutex_lock(globals.list_mutex);
-
-	iter = (struct SkypopenHandles *) list->head;
-	while (iter != NULL) {
-		if (iter == find) {
-			handle = iter;
-			break;
-		}
-
-		iter = (struct SkypopenHandles *) iter->next;
-	}
-
-	switch_mutex_unlock(globals.list_mutex);
-
-	return handle;
-}
-#endif
-
-// CLOUDTREE (THomas Hazel) - is there a capable freeswitch list?
-int skypopen_list_size(struct SkypopenList *list)
-{
-	return list->entries;
-}
-#endif /* NOT WIN32 */
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/Makefile b/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/Makefile
deleted file mode 100644
index 86aab9175e..0000000000
--- a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Asterisk -- A telephony toolkit for Linux.
-# 
-# Makefile for channel drivers
-#
-# Copyright (C) 1999-2005, Mark Spencer
-#
-# Mark Spencer <markster@digium.com>
-#
-# Edited By Belgarath <> Aug 28 2004
-# Added bare bones ultrasparc-linux support.
-#
-# This program is free software, distributed under the terms of
-# the GNU General Public License
-#
-
-#ASTERISK INCLUDE FILES
-#The directory that contains the Asterisk include files (eg: /usr/include or /usr/include/asterisk or /usr/src/asterisk/include or ...)
-#AST_INCLUDE_DIR=/usr/src/asterisk/include
-#AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_trunk/include
-#AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_160/include
-#AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_12/include
-#AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_14/include
-#AST_INCLUDE_DIR=/home/maruzz/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include
-AST_INCLUDE_DIR=/home/user/devel/asterisk-1.4.23.1/include
-
-#ASTERISK
-CFLAGS+=-DASTERISK
-
-#ASTERISK VERSION
-#Uncomment one of the following lines to match your Asterisk series
-CFLAGS+=-DASTERISK_VERSION_1_4
-#CFLAGS+=-DASTERISK_VERSION_1_6
-#CFLAGS+=-DASTERISK_VERSION_1_2
-
-#LINUX SKYPE SUPPORT (Celliax for Cygwin always supports Skype)
-SKYPE_LIB=-L/usr/X11R6/lib -lX11
-
-CFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-CFLAGS+=-g3
-
-
-
-CFLAGS+=-I$(AST_INCLUDE_DIR) -I.
-CFLAGS+=-D_REENTRANT -D_GNU_SOURCE
-#CFLAGS+=-O6
-CFLAGS+=-march=i686
-CFLAGS+=-fomit-frame-pointer
-ifeq ($(shell uname -m),x86_64)
-CFLAGS+=-fPIC
-endif
-
-SVNDEF := -D'SKYPIAX_SVN_VERSION="$(shell svnversion -n ..)"'
-CFLAGS += $(SVNDEF)
-
-
-SOLINK=-shared -Xlinker -x 
-CHANNEL_LIBS=chan_skypiax.so
-CC=gcc
-
-OSARCH=$(shell uname -s)
-
-ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-# definition of pthread_kill as a printf (or as a noop) is required for Asterisk (and skypiax) to run on Cygwin
-# without it, each time (often) pthread_kill is called (by any thread, with any signal, URG included), bad things happen 
-CC=gcc -D pthread_kill=cyg_no_pthreadkill
-AST_DLL_DIR=/home/maruzz/devel/svn_asterisk_branches_12
-CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols cyg_no_pthread_kill.o
-CYGSOLIB=-L/usr/lib/w32api -lrpcrt4 -L/lib/mingw -lwinmm -L$(AST_DLL_DIR) -lasterisk.dll -L$(AST_DLL_DIR)/res -lres_features.so 
-SKYPE_LIB=
-CHANNEL_LIBS=cyg_no_pthread_kill.o chan_skypiax.so
-endif
-
-all: $(CHANNEL_LIBS) 
-
-clean:
-	rm -f *.so *.o *.so.a
-
-
-#chan_skypiax section begins
-
-#to debug threads and lock on 1.4 uncomment the following
-#CFLAGS+=-include /usr/src/asterisk/include/asterisk/autoconfig.h  
-
-
-cyg_no_pthread_kill.o: cyg_no_pthread_kill.c
-	$(CC) $(CFLAGS) -c -o cyg_no_pthread_kill.o cyg_no_pthread_kill.c
-chan_skypiax.o: chan_skypiax.c
-	$(CC) $(CFLAGS) -c -o chan_skypiax.o chan_skypiax.c
-chan_skypiax.so: chan_skypiax.o skypiax_protocol.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_skypiax.o skypiax_protocol.o -lm -ldl $(SKYPE_LIB) ${CYGSOLIB}
-#chan_skypiax section ends
-
diff --git a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/README b/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/README
deleted file mode 100644
index a3d352e0c6..0000000000
--- a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/README
+++ /dev/null
@@ -1 +0,0 @@
-Skypopen for asterisk does not work yet.
diff --git a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/chan_skypiax.c b/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/chan_skypiax.c
deleted file mode 100644
index 52101f171b..0000000000
--- a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/chan_skypiax.c
+++ /dev/null
@@ -1,2315 +0,0 @@
-//indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90
-#include "skypiax.h"
-
-/* LOCKS */
-/*! \brief Protect the skypiax_usecnt */
-AST_MUTEX_DEFINE_STATIC(skypiax_usecnt_lock);
-/*! \brief Protect the monitoring thread, so only one process can kill or start it, and not
- *    when it's doing something critical. */
-AST_MUTEX_DEFINE_STATIC(skypiax_monlock);
-/*! \brief Protect the interfaces list */
-AST_MUTEX_DEFINE_STATIC(skypiax_iflock);
-
-/* GLOBAL VARIABLES */
-int running = 1;
-int skypiax_dir_entry_extension = 1;	//FIXME one var for each interface!
-char skypiax_console_active_array[50] = "";
-char *skypiax_console_active = skypiax_console_active_array;
-/*! \brief Count of active channels for this module */
-int skypiax_usecnt = 0;
-int skypiax_debug = 0;
-/*! \brief This is the thread for the monitor which checks for input on the channels
- *    which are not currently in use.  */
-pthread_t skypiax_monitor_thread = AST_PTHREADT_NULL;
-pthread_t skypiax_monitor_audio_thread = AST_PTHREADT_NULL;
-
-/* CONSTANTS */
-/*! \brief Textual description for this module */
-const char skypiax_desc[] = "Skypiax, Skype Driver";
-/*! \brief Textual type for this module */
-const char skypiax_type[] = "Skypiax";
-/*! \brief Name of configuration file for this module */
-const char skypiax_config[] = "skypiax.conf";
-
-char skypiax_console_skypiax_usage[] =
-	"       \n" "chan_skypiax commands info\n" "       \n"
-	"       chan_skypiax adds to Asterisk the following CLI commands:\n" "       \n"
-	"       CLI COMMANDS:\n" "          skypiax_hangup\n" "          skypiax_dial\n"
-	"          skypiax_console\n" "          skypiax_playback_boost\n"
-	"          skypiax_capture_boost\n" "          skypiax_skype\n"
-	"          skypiax_dir_import\n" "\n" "       You can type 'help [command]' to obtain more specific info on usage.\n" "       \n";
-char skypiax_console_hangup_usage[] =
-	"Usage: skypiax_hangup\n"
-	"       Hangs up any call currently placed on the \"current\" skypiax_console (Skypiax) channel.\n"
-	"       Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n";
-char skypiax_console_playback_boost_usage[] =
-	"Usage: skypiax_playback_boost [value]\n"
-	"       Shows or set the value of boost applied to the outgoing sound (voice). Possible values are: 0 (no boost applied), -40 to 40 (negative to positive range, in db). Without specifying a value, it just shows the current value. The value is for the  \"current\" skypiax_console (Skypiax) channel.\n"
-	"       Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n";
-char skypiax_console_capture_boost_usage[] =
-	"Usage: skypiax_capture_boost [value]\n"
-	"       Shows or set the value of boost applied to the incoming sound (voice). Possible values are: 0 (no boost applied), -40 to 40 (negative to positive range, in db). Without specifying a value, it just shows the current value. The value is for the  \"current\" skypiax_console (Skypiax) channel.\n"
-	"       Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n";
-
-char skypiax_console_dial_usage[] =
-	"Usage: skypiax_dial [DTMFs]\n"
-	"       Dials a given DTMF string in the call currently placed on the\n"
-	"       \"current\" skypiax_console (Skypiax) channel.\n" "       Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n";
-
-char skypiax_console_skypiax_console_usage[] =
-	"Usage: skypiax_console [interface] | [show]\n"
-	"       If used without a parameter, displays which interface is the \"current\"\n"
-	"       skypiax_console.  If a device is specified, the \"current\" skypiax_console is changed to\n"
-	"       the interface specified.\n" "       If the parameter is \"show\", the available interfaces are listed\n";
-
-char skypiax_console_skype_usage[] =
-	"Usage: skypiax_skype [command string]\n"
-	"       Send the 'command string' skype_msg to the Skype client connected to the  \"current\" skypiax_console (Skypiax) channel.\n"
-	"       Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n";
-
-char skypiax_console_skypiax_dir_import_usage[] =
-	"Usage: skypiax_dir_import [add | replace]\n"
-	"       Write in the directoriax.conf config file all the entries found in 'Contacts' list of the Skype client connected to the \"current\" skypiax_console.\n"
-	"       You can choose between 'add' to the end of the directoriax.conf file, or 'replace' the whole file with this new content.\n"
-	"       Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n";
-
-/*! \brief Definition of this channel for PBX channel registration */
-const struct ast_channel_tech skypiax_tech = {
-	.type = skypiax_type,
-	.description = skypiax_desc,
-	.capabilities = AST_FORMAT_SLINEAR,
-	.requester = skypiax_request,
-	.hangup = skypiax_hangup,
-	.answer = skypiax_answer,
-	.read = skypiax_read,
-	.call = skypiax_originate_call,
-	.write = skypiax_write,
-	.indicate = skypiax_indicate,
-	.fixup = skypiax_fixup,
-	.devicestate = skypiax_devicestate,
-#ifdef ASTERISK_VERSION_1_4
-	.send_digit_begin = skypiax_digitsend_begin,
-	.send_digit_end = skypiax_digitsend_end,
-#else /* ASTERISK_VERSION_1_4 */
-	.send_digit = skypiax_digitsend,
-#endif /* ASTERISK_VERSION_1_4 */
-};
-
-/*! \brief fake skypiax_pvt structure values,
- * just for logging purposes */
-struct skypiax_pvt skypiax_log_struct = {
-	.name = "none",
-};
-
-/*! \brief Default skypiax_pvt structure values,
- * used by skypiax_mkif to initialize the interfaces */
-struct skypiax_pvt skypiax_default = {
-	.interface_state = SKYPIAX_STATE_DOWN,
-	.skype_callflow = 0,
-	.context = "default",
-	.language = "en",
-	.exten = "s",
-	.next = NULL,
-	.owner = NULL,
-	.controldev_thread = AST_PTHREADT_NULL,
-	.skypiax_sound_rate = 8000,
-	.skypiax_sound_capt_fd = -1,
-	.capture_boost = 0,
-	.playback_boost = 0,
-	.stripmsd = 0,
-	.skype = 0,
-	.skypiax_dir_entry_extension_prefix = 6,
-};
-
-/*!
- * \brief PVT structure for a skypiax interface (channel), created by skypiax_mkif
- */
-struct skypiax_pvt *skypiax_iflist = NULL;
-
-#ifdef ASTERISK_VERSION_1_6
-struct ast_cli_entry myclis[] = {
-/*
- * CLI do not works since some time on 1.6, they changed the CLI mechanism
- */
-#if 0
-	AST_CLI_DEFINE(skypiax_console_hangup, "Hangup a call on the console"),
-	AST_CLI_DEFINE(skypiax_console_dial, "Dial an extension on the console"),
-	AST_CLI_DEFINE(skypiax_console_playback_boost, "Sets/displays spk boost in dB"),
-	AST_CLI_DEFINE(skypiax_console_capture_boost, "Sets/displays mic boost in dB"),
-	AST_CLI_DEFINE(skypiax_console_set_active, "Sets/displays active console"),
-	AST_CLI_DEFINE(skypiax_console_skype, "Sends a Skype command"),
-	AST_CLI_DEFINE(skypiax_console_skypiax_dir_import, "imports entries from cellphone"),
-	AST_CLI_DEFINE(skypiax_console_skypiax, "all things skypiax"),
-#endif
-};
-#else
-struct ast_cli_entry myclis[] = {
-	{{"skypiax_hangup", NULL}, skypiax_console_hangup,
-	 "Hangup a call on the skypiax_console",
-	 skypiax_console_hangup_usage},
-	{{"skypiax_playback_boost", NULL}, skypiax_console_playback_boost, "playback boost",
-	 skypiax_console_playback_boost_usage},
-	{{"skypiax_capture_boost", NULL}, skypiax_console_capture_boost, "capture boost",
-	 skypiax_console_capture_boost_usage},
-	{{"skypiax_usage", NULL}, skypiax_console_skypiax, "chan_skypiax commands info",
-	 skypiax_console_skypiax_usage},
-	{{"skypiax_skype", NULL}, skypiax_console_skype, "Skype msg",
-	 skypiax_console_skype_usage},
-	{{"skypiax_dial", NULL}, skypiax_console_dial,
-	 "Dial an extension on the skypiax_console",
-	 skypiax_console_dial_usage},
-	{{"skypiax_console", NULL}, skypiax_console_set_active,
-	 "Sets/displays active skypiax_console",
-	 skypiax_console_skypiax_console_usage},
-	{{"skypiax_dir_import", NULL}, skypiax_console_skypiax_dir_import,
-	 "Write the directoriax.conf file, used by directoriax app",
-	 skypiax_console_skypiax_dir_import_usage},
-};
-#endif
-
-/* IMPLEMENTATION */
-
-void skypiax_unlocka_log(void *x)
-{
-	ast_mutex_t *y;
-	y = x;
-	int i;
-
-	for (i = 0; i < 5; i++) {	//let's be generous
-
-		ast_log(LOG_DEBUG,
-				SKYPIAX_SVN_VERSION
-				"[%-7lx] I'm a dying thread, and I'm to go unlocking mutex %p for the %dth time\n", (unsigned long int) pthread_self(), y, i);
-
-		ast_mutex_unlock(y);
-	}
-	ast_log(LOG_DEBUG, SKYPIAX_SVN_VERSION "[%-7lx] I'm a dying thread, I've finished unlocking mutex %p\n", (unsigned long int) pthread_self(), y);
-}
-
-int skypiax_queue_control(struct ast_channel *c, int control)
-{
-	struct skypiax_pvt *p = c->tech_pvt;
-
-/* queue the frame */
-	if (p)
-		p->control_to_send = control;
-	else {
-		return 0;
-	}
-	DEBUGA_PBX("Queued CONTROL FRAME %d\n", SKYPIAX_P_LOG, control);
-
-/* wait for the frame to be sent */
-	while (p->control_to_send)
-		usleep(1);
-
-	return 0;
-}
-
-int skypiax_devicestate(void *data)
-{
-	struct skypiax_pvt *p = NULL;
-	char *name = data;
-	int res = AST_DEVICE_INVALID;
-
-	if (!data) {
-		ERRORA("Devicestate requested with no data\n", SKYPIAX_P_LOG);
-		return res;
-	}
-
-	/* lock the interfaces' list */
-	LOKKA(&skypiax_iflock);
-	/* make a pointer to the first interface in the interfaces list */
-	p = skypiax_iflist;
-	/* Search for the requested interface and verify if is unowned */
-	while (p) {
-		size_t length = strlen(p->name);
-		/* is this the requested interface? */
-		if (strncmp(name, p->name, length) == 0) {
-			/* is this interface unowned? */
-			if (!p->owner) {
-				res = AST_DEVICE_NOT_INUSE;
-				DEBUGA_PBX("Interface is NOT OWNED by a channel\n", SKYPIAX_P_LOG);
-			} else {
-				/* interface owned by a channel */
-				res = AST_DEVICE_INUSE;
-				DEBUGA_PBX("Interface is OWNED by a channel\n", SKYPIAX_P_LOG);
-			}
-
-			/* we found the requested interface, bail out from the while loop */
-			break;
-		}
-		/* not yet found, next please */
-		p = p->next;
-	}
-	/* unlock the interfaces' list */
-	UNLOCKA(&skypiax_iflock);
-
-	if (res == AST_DEVICE_INVALID) {
-		ERRORA("Checking device state for interface [%s] returning AST_DEVICE_INVALID\n", SKYPIAX_P_LOG, name);
-	}
-	return res;
-}
-
-#ifndef ASTERISK_VERSION_1_4
-int skypiax_indicate(struct ast_channel *c, int cond)
-#else
-int skypiax_indicate(struct ast_channel *c, int cond, const void *data, size_t datalen)
-#endif
-{
-	struct skypiax_pvt *p = c->tech_pvt;
-	int res = 0;
-
-	NOTICA("Let's INDICATE %d\n", SKYPIAX_P_LOG, cond);
-
-	switch (cond) {
-	case AST_CONTROL_BUSY:
-	case AST_CONTROL_CONGESTION:
-	case AST_CONTROL_RINGING:
-	case -1:
-		res = -1;				/* Ask for inband indications */
-		break;
-	case AST_CONTROL_PROGRESS:
-	case AST_CONTROL_PROCEEDING:
-	case AST_CONTROL_VIDUPDATE:
-	case AST_CONTROL_HOLD:
-	case AST_CONTROL_UNHOLD:
-#ifdef ASTERISK_VERSION_1_4
-	case AST_CONTROL_SRCUPDATE:
-#endif /* ASTERISK_VERSION_1_4 */
-		break;
-	default:
-		WARNINGA("Don't know how to display condition %d on %s\n", SKYPIAX_P_LOG, cond, c->name);
-		/* The core will play inband indications for us if appropriate */
-		res = -1;
-	}
-
-	return res;
-}
-
-/*! \brief PBX interface function -build skypiax pvt structure
- *         skypiax calls initiated by the PBX arrive here */
-struct ast_channel *skypiax_request(const char *type, int format, void *data, int *cause)
-{
-	struct skypiax_pvt *p = NULL;
-	struct ast_channel *tmp = NULL;
-	char *name = data;
-	int found = 0;
-
-	DEBUGA_PBX("Try to request type: %s, name: %s, cause: %d," " format: %d\n", SKYPIAX_P_LOG, type, name, *cause, format);
-
-	if (!data) {
-		ERRORA("Channel requested with no data\n", SKYPIAX_P_LOG);
-		return NULL;
-	}
-
-	char interface[256];
-	int i;
-	memset(interface, '\0', sizeof(interface));
-
-	for (i = 0; i < sizeof(interface); i++) {
-		if (name[i] == '/')
-			break;
-		interface[i] = name[i];
-	}
-	/* lock the interfaces' list */
-	LOKKA(&skypiax_iflock);
-	/* make a pointer to the first interface in the interfaces list */
-	p = skypiax_iflist;
-
-	if (strcmp("ANY", interface) == 0) {
-		/* we've been asked for the "ANY" interface, let's find the first idle interface */
-		DEBUGA_SKYPE("Finding one available skype interface\n", SKYPIAX_P_LOG);
-		p = find_available_skypiax_interface();
-		if (p) {
-			found = 1;
-
-			/* create a new channel owning this interface */
-			tmp = skypiax_new(p, SKYPIAX_STATE_DOWN, p->context);
-			if (!tmp) {
-				/* the channel was not created, probable memory allocation error */
-				*cause = AST_CAUSE_SWITCH_CONGESTION;
-			}
-
-		}
-
-	}
-
-	/* Search for the requested interface and verify if is unowned and format compatible */
-	while (p && !found) {
-		//size_t length = strlen(p->name);
-		/* is this the requested interface? */
-		if (strcmp(interface, p->name) == 0) {
-			/* is the requested format supported by this interface? */
-			if ((format & AST_FORMAT_SLINEAR) != 0) {
-				/* is this interface unowned? */
-				if (!p->owner) {
-					DEBUGA_PBX("Requesting: %s, name: %s, format: %d\n", SKYPIAX_P_LOG, type, name, format);
-					/* create a new channel owning this interface */
-					tmp = skypiax_new(p, SKYPIAX_STATE_DOWN, p->context);
-					if (!tmp) {
-						/* the channel was not created, probable memory allocation error */
-						*cause = AST_CAUSE_SWITCH_CONGESTION;
-					}
-				} else {
-					/* interface owned by another channel */
-					WARNINGA("owned by another channel\n", SKYPIAX_P_LOG);
-					*cause = AST_CAUSE_REQUESTED_CHAN_UNAVAIL;
-				}
-			} else {
-				/* requested format not supported */
-				WARNINGA("format %d not supported\n", SKYPIAX_P_LOG, format);
-				*cause = AST_CAUSE_BEARERCAPABILITY_NOTAVAIL;
-			}
-			/* we found the requested interface, bail out from the while loop */
-			break;
-		}
-		/* not yet found, next please */
-		p = p->next;
-	}
-	/* unlock the interfaces' list */
-	UNLOCKA(&skypiax_iflock);
-	/* restart the monitor so it will watch only the remaining unowned interfaces  */
-	skypiax_restart_monitor();
-	if (tmp == NULL) {
-		/* new channel was not created */
-		WARNINGA("Unable to create new Skypiax channel %s\n", SKYPIAX_P_LOG, name);
-	}
-	/* return the newly created channel */
-	return tmp;
-}
-
-/*! \brief  Hangup skypiax call
- * Part of PBX interface, called from ast_hangup */
-
-int skypiax_hangup(struct ast_channel *c)
-{
-	struct skypiax_pvt *p;
-
-	/* get our skypiax pvt interface from channel */
-	p = c->tech_pvt;
-	/* if there is not skypiax pvt why we are here ? */
-	if (!p) {
-		ERRORA("Asked to hangup channel not connected\n", SKYPIAX_P_LOG);
-		return 0;
-	}
-
-	if (p->skype && p->interface_state != SKYPIAX_STATE_DOWN) {
-		char msg_to_skype[1024];
-		p->interface_state = SKYPIAX_STATE_HANGUP_REQUESTED;
-		DEBUGA_SKYPE("hanging up skype call: %s\n", SKYPIAX_P_LOG, p->skype_call_id);
-		//sprintf(msg_to_skype, "SET CALL %s STATUS FINISHED", p->skype_call_id);
-		sprintf(msg_to_skype, "ALTER CALL %s HANGUP", p->skype_call_id);
-		skypiax_signaling_write(p, msg_to_skype);
-	}
-
-	while (p->interface_state != SKYPIAX_STATE_DOWN) {
-		usleep(10000);
-	}
-	DEBUGA_SKYPE("Now is really DOWN\n", SKYPIAX_P_LOG);
-	/* shutdown the serial monitoring thread */
-	if (p->controldev_thread && (p->controldev_thread != AST_PTHREADT_NULL)
-		&& (p->controldev_thread != AST_PTHREADT_STOP)) {
-		if (pthread_cancel(p->controldev_thread)) {
-			ERRORA("controldev_thread pthread_cancel failed, maybe he killed himself?\n", SKYPIAX_P_LOG);
-		}
-		/* push it, maybe is stuck in a select or so */
-		if (pthread_kill(p->controldev_thread, SIGURG)) {
-			DEBUGA_SERIAL("controldev_thread pthread_kill failed, no problem\n", SKYPIAX_P_LOG);
-		}
-#ifndef __CYGWIN__				/* under cygwin, this seems to be not reliable, get stuck at times */
-		/* wait for it to die */
-		if (pthread_join(p->controldev_thread, NULL)) {
-			ERRORA("controldev_thread pthread_join failed, BAD\n", SKYPIAX_P_LOG);
-		}
-#else /* __CYGWIN__ */
-/* allow the serial thread to die */
-		usleep(300000);			//300msecs
-#endif /* __CYGWIN__ */
-	}
-	p->controldev_thread = AST_PTHREADT_NULL;
-
-	p->interface_state = SKYPIAX_STATE_DOWN;
-	p->skype_callflow = CALLFLOW_CALL_IDLE;
-
-	DEBUGA_PBX("I'll send AST_CONTROL_HANGUP\n", SKYPIAX_P_LOG);
-	ast_queue_control(p->owner, AST_CONTROL_HANGUP);
-	DEBUGA_PBX("I've sent AST_CONTROL_HANGUP\n", SKYPIAX_P_LOG);
-
-	/* subtract one to the usage count of Skypiax-type channels */
-	LOKKA(&skypiax_usecnt_lock);
-	skypiax_usecnt--;
-	if (skypiax_usecnt < 0)
-		ERRORA("Usecnt < 0???\n", SKYPIAX_P_LOG);
-	UNLOCKA(&skypiax_usecnt_lock);
-	ast_update_use_count();
-
-	/* our skypiax pvt interface is no more part of a channel */
-	p->owner = NULL;
-	/* our channel has no more this skypiax pvt interface to manage */
-	c->tech_pvt = NULL;
-	/* set the channel state to DOWN, eg. available, not in active use */
-	if (ast_setstate(c, SKYPIAX_STATE_DOWN)) {
-		ERRORA("ast_setstate failed, BAD\n", SKYPIAX_P_LOG);
-		return -1;
-	}
-
-	/* restart the monitor thread, so it can recheck which interfaces it have to watch during its loop (the interfaces that are not owned by channels) */
-	if (skypiax_restart_monitor()) {
-		ERRORA("skypiax_restart_monitor failed, BAD\n", SKYPIAX_P_LOG);
-		return -1;
-	}
-
-	return 0;
-}
-
-/*! \brief  Answer incoming call,
- * Part of PBX interface */
-int skypiax_answer(struct ast_channel *c)
-{
-	struct skypiax_pvt *p = c->tech_pvt;
-	int res;
-
-	/* whle ringing, we just wait, the skype thread will answer */
-	while (p->interface_state == SKYPIAX_STATE_RING) {
-		usleep(10000);			//10msec
-	}
-	if (p->interface_state != SKYPIAX_STATE_UP) {
-		ERRORA("call answering failed, we want it to be into interface_state=%d, got %d\n", SKYPIAX_P_LOG, SKYPIAX_STATE_UP, p->interface_state);
-		res = -1;
-	} else {
-		DEBUGA_PBX("call answered\n", SKYPIAX_P_LOG);
-		res = 0;
-	}
-	return res;
-}
-
-#ifdef ASTERISK_VERSION_1_4
-int skypiax_digitsend_begin(struct ast_channel *c, char digit)
-{
-	struct skypiax_pvt *p = c->tech_pvt;
-
-	DEBUGA_PBX("DIGIT BEGIN received: %c\n", SKYPIAX_P_LOG, digit);
-
-	return 0;
-}
-
-int skypiax_digitsend_end(struct ast_channel *c, char digit, unsigned int duration)
-{
-	struct skypiax_pvt *p = c->tech_pvt;
-	char msg_to_skype[1024];
-
-	NOTICA("DIGIT END received: %c %d\n", SKYPIAX_P_LOG, digit, duration);
-
-	sprintf(msg_to_skype, "SET CALL %s DTMF %c", p->skype_call_id, digit);
-
-	skypiax_signaling_write(p, msg_to_skype);
-
-	return 0;
-}
-#else /* ASTERISK_VERSION_1_4 */
-int skypiax_digitsend(struct ast_channel *c, char digit)
-{
-	struct skypiax_pvt *p = c->tech_pvt;
-	char msg_to_skype[1024];
-
-	NOTICA("DIGIT received: %c\n", SKYPIAX_P_LOG, digit);
-
-	sprintf(msg_to_skype, "SET CALL %s DTMF %c", p->skype_call_id, digit);
-
-	skypiax_signaling_write(p, msg_to_skype);
-
-	return 0;
-}
-
-#endif /* ASTERISK_VERSION_1_4 */
-//struct ast_frame *skypiax_audio_read(struct skypiax_pvt *p)
-//#define SAMPLES_PER_FRAME 160
-/*! \brief Read audio frames from channel */
-struct ast_frame *skypiax_read(struct ast_channel *c)
-{
-	struct skypiax_pvt *p = c->tech_pvt;
-	static struct ast_frame f;
-	static short __buf[SKYPIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
-	short *buf;
-	int samples;
-
-/* if there are control frames queued to be sent by skypiax_queue_control, send it the first */
-//TODO maybe better a real queue?
-	if (p && p->owner && p->control_to_send) {
-		ast_queue_control(p->owner, p->control_to_send);
-		DEBUGA_PBX("Sent CONTROL FRAME %d\n", SKYPIAX_P_LOG, p->control_to_send);
-		p->control_to_send = 0;
-	}
-
-	memset(__buf, '\0', (SKYPIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2));
-
-	buf = __buf + AST_FRIENDLY_OFFSET / 2;
-
-	f.frametype = AST_FRAME_NULL;
-	f.subclass = 0;
-	f.samples = 0;
-	f.datalen = 0;
-	f.data = NULL;
-	f.offset = 0;
-	f.src = skypiax_type;
-	f.mallocd = 0;
-	f.delivery.tv_sec = 0;
-	f.delivery.tv_usec = 0;
-
-/* if the call is not active (ie: answered), do not send audio frames, they would pile up in a lag queue */
-	if (p->owner && p->owner->_state != SKYPIAX_STATE_UP) {
-		return &f;
-	}
-
-	if ((samples = read(p->audiopipe[0], buf, SAMPLES_PER_FRAME * sizeof(short))) != 320) {
-		DEBUGA_SOUND("read=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME * sizeof(short));
-		usleep(100);
-		//do nothing
-	} else {
-		//DEBUGA_SOUND("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples);
-		/* A real frame */
-		f.frametype = AST_FRAME_VOICE;
-		f.subclass = AST_FORMAT_SLINEAR;
-		f.samples = SKYPIAX_FRAME_SIZE;
-		f.datalen = SKYPIAX_FRAME_SIZE * 2;
-		f.data = buf;
-		f.offset = AST_FRIENDLY_OFFSET;
-		f.src = skypiax_type;
-		f.mallocd = 0;
-
-		if (p->capture_boost)
-			skypiax_sound_boost(&f, p->capture_boost);
-	}
-
-	return &f;
-}
-
-/*! \brief Initiate skypiax call from PBX
- * used from the dial() application
- */
-int skypiax_originate_call(struct ast_channel *c, char *idest, int timeout)
-{
-	struct skypiax_pvt *p = NULL;
-	p = c->tech_pvt;
-	char rdest[80], *where, dstr[100] = "";
-	char *stringp = NULL;
-	int status;
-
-	if ((c->_state != SKYPIAX_STATE_DOWN)
-		&& (c->_state != SKYPIAX_STATE_RESERVED)) {
-		ERRORA("skypiax_originate_call called on %s, neither down nor reserved\n", SKYPIAX_P_LOG, c->name);
-		return -1;
-	}
-
-	DEBUGA_PBX("skypiax_originate_call to call idest: %s, timeout: %d!\n", SKYPIAX_P_LOG, idest, timeout);
-
-	strncpy(rdest, idest, sizeof(rdest) - 1);
-	stringp = rdest;
-	strsep(&stringp, "/");
-	where = strsep(&stringp, "/");
-	if (!where) {
-		ERRORA("Destination %s requires an actual destination (Skypiax/device/destination)\n", SKYPIAX_P_LOG, idest);
-		return -1;
-	}
-
-	strncpy(dstr, where + p->stripmsd, sizeof(dstr) - 1);
-	DEBUGA_PBX("skypiax_originate_call dialing idest: %s, timeout: %d, dstr: %s!\n", SKYPIAX_P_LOG, idest, timeout, dstr);
-
-	strcpy(p->session_uuid_str, "dialing");
-	status = skypiax_call(p, dstr, timeout);
-	if (status) {
-		WARNINGA("skypiax_originate_call dialing failed: %d!\n", SKYPIAX_P_LOG, status);
-		return -1;
-	}
-
-	DEBUGA_PBX("skypiax_originate_call dialed idest: %s, timeout: %d, dstr: %s!\n", SKYPIAX_P_LOG, idest, timeout, dstr);
-
-	ast_setstate(p->owner, SKYPIAX_STATE_DIALING);
-	return 0;
-}
-
-int skypiax_sound_boost(struct ast_frame *f, double boost)
-{
-/* LUIGI RIZZO's magic */
-	if (boost != 0) {			/* scale and clip values */
-		int i, x;
-		int16_t *ptr = (int16_t *) f->data;
-		for (i = 0; i < f->samples; i++) {
-			x = (ptr[i] * boost) / BOOST_SCALE;
-			if (x > 32767) {
-				x = 32767;
-			} else if (x < -32768) {
-				x = -32768;
-			}
-			ptr[i] = x;
-		}
-	}
-	return 0;
-}
-
-/*! \brief Send audio frame to channel */
-int skypiax_write(struct ast_channel *c, struct ast_frame *f)
-{
-	struct skypiax_pvt *p = c->tech_pvt;
-	int sent;
-
-	if (p->owner && p->owner->_state != SKYPIAX_STATE_UP) {
-		return 0;
-	}
-	if (p->playback_boost)
-		skypiax_sound_boost(f, p->playback_boost);
-
-	sent = write(p->audioskypepipe[1], (short *) f->data, f->datalen);
-	//skypiax_sound_write(p, f);
-
-	return 0;
-}
-
-/*! \brief  Fix up a channel:  If a channel is consumed, this is called.
- * Basically update any ->owner links */
-int skypiax_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
-{
-	struct skypiax_pvt *p = newchan->tech_pvt;
-
-	if (!p) {
-		ERRORA("No pvt after masquerade. Strange things may happen\n", SKYPIAX_P_LOG);
-		return -1;
-	}
-
-	if (p->owner != oldchan) {
-		ERRORA("old channel wasn't %p but was %p\n", SKYPIAX_P_LOG, oldchan, p->owner);
-		return -1;
-	}
-
-	p->owner = newchan;
-	return 0;
-}
-
-struct ast_channel *skypiax_new(struct skypiax_pvt *p, int state, char *context)
-{
-	struct ast_channel *tmp;
-
-	/* alloc a generic channel struct */
-#ifndef ASTERISK_VERSION_1_4
-	tmp = ast_channel_alloc(1);
-#else
-	//tmp = ast_channel_alloc(1, state, 0, 0, "", p->exten, p->context, 0, "");
-	//tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, i->amaflags, "Skypiax/%s", p->name);
-	tmp = ast_channel_alloc(1, state, 0, 0, "", p->exten, p->context, 0, "Skypiax/%s", p->name);
-
-#endif /* ASTERISK_VERSION_1_4 */
-	if (tmp) {
-
-		/* give a name to the newly created channel */
-#ifndef ASTERISK_VERSION_1_4
-		snprintf(tmp->name, sizeof(tmp->name), "Skypiax/%s", p->name);
-		tmp->type = skypiax_type;
-#else /* ASTERISK_VERSION_1_4 */
-		ast_string_field_build(tmp, name, "Skypiax/%s", p->name);
-#endif /* ASTERISK_VERSION_1_4 */
-
-		DEBUGA_PBX("new channel: name=%s requested_state=%d\n", SKYPIAX_P_LOG, tmp->name, state);
-
-		/* fd for the channel to poll for incoming audio */
-		tmp->fds[0] = p->skypiax_sound_capt_fd;
-
-		/* audio formats managed */
-		tmp->nativeformats = AST_FORMAT_SLINEAR;
-		tmp->readformat = AST_FORMAT_SLINEAR;
-		tmp->writeformat = AST_FORMAT_SLINEAR;
-		/* the technology description (eg. the interface type) of the newly created channel is the Skypiax's one */
-		tmp->tech = &skypiax_tech;
-		/* the technology pvt (eg. the interface) of the newly created channel is this interface pvt */
-		tmp->tech_pvt = p;
-
-		/* copy this interface default context, extension, language to the newly created channel */
-		if (strlen(p->context))
-			strncpy(tmp->context, p->context, sizeof(tmp->context) - 1);
-		if (strlen(p->exten))
-			strncpy(tmp->exten, p->exten, sizeof(tmp->exten) - 1);
-#ifndef ASTERISK_VERSION_1_4
-		if (strlen(p->language))
-			strncpy(tmp->language, p->language, sizeof(tmp->language) - 1);
-#else
-		if (strlen(p->language))
-			ast_string_field_set(tmp, language, p->language);
-#endif /* ASTERISK_VERSION_1_4 */
-		/* copy the requested context (not necessarily the interface default) to the newly created channel */
-		if (strlen(context))
-			strncpy(tmp->context, context, sizeof(tmp->context) - 1);
-
-		/* copy this interface default callerid in the newly created channel */
-		ast_set_callerid(tmp, !ast_strlen_zero(p->callid_number) ? p->callid_number : NULL,
-						 !ast_strlen_zero(p->callid_name) ? p->callid_name : NULL, !ast_strlen_zero(p->callid_number) ? p->callid_number : NULL);
-
-		DEBUGA_PBX("callid_number=%s, callid_name=%s\n", SKYPIAX_P_LOG, p->callid_number, p->callid_name);
-
-		/* the owner of this interface pvt is the newly created channel */
-		p->owner = tmp;
-		/* set the newly created channel state to the requested state */
-		if (ast_setstate(tmp, state)) {
-			ERRORA("ast_setstate failed, BAD\n", SKYPIAX_P_LOG);
-			//ast_dsp_free(p->dsp);
-			ast_channel_free(tmp);
-			return NULL;
-		}
-		/* if the requested state is different from DOWN, let the pbx manage this interface (now part of the newly created channel) */
-		if (state != SKYPIAX_STATE_DOWN) {
-			DEBUGA_PBX("Try to start PBX on %s, state=%d\n", SKYPIAX_P_LOG, tmp->name, state);
-			if (ast_pbx_start(tmp)) {
-				ERRORA("Unable to start PBX on %s\n", SKYPIAX_P_LOG, tmp->name);
-				ast_channel_free(tmp);
-				return NULL;
-			}
-		}
-		/* let's start the serial monitoring thread too, so we can have serial signaling */
-		if (ast_pthread_create(&p->controldev_thread, NULL, skypiax_do_controldev_thread, p) < 0) {
-			ERRORA("Unable to start controldev thread.\n", SKYPIAX_P_LOG);
-			ast_channel_free(tmp);
-			tmp = NULL;
-		}
-		DEBUGA_SERIAL("STARTED controldev_thread=%lu STOP=%lu NULL=%lu\n", SKYPIAX_P_LOG,
-					  (unsigned long) p->controldev_thread, (unsigned long) AST_PTHREADT_STOP, (unsigned long) AST_PTHREADT_NULL);
-
-		/* add one to the usage count of Skypiax-type channels */
-		LOKKA(&skypiax_usecnt_lock);
-		skypiax_usecnt++;
-		UNLOCKA(&skypiax_usecnt_lock);
-		ast_update_use_count();
-
-		/* return the newly created channel */
-		return tmp;
-	}
-	ERRORA("failed memory allocation for Skypiax channel\n", SKYPIAX_P_LOG);
-	return NULL;
-}
-
-/*!
- * \brief Load the module into Asterisk and start its threads
- *
- * This function register the module into Asterisk,
- * create the interfaces for the channels,
- * start the auxiliary threads for the interfaces,
- * then start a monitor thread. The monitor thread
- * will signal Asterisk when an interface receive a call.
- *
- *
- * \return zero on success, -1 on error.
- */
-int load_module(void)
-{
-	int i;
-	struct ast_config *cfg;
-	struct skypiax_pvt *tmp;
-	struct skypiax_pvt *p = NULL;
-	struct skypiax_pvt *p2 = NULL;
-#ifdef ASTERISK_VERSION_1_6
-	struct ast_flags config_flags = { 0 };
-#endif /* ASTERISK_VERSION_1_6 */
-
-#if defined(WANT_SKYPE_X11) || defined(__CYGWIN__)
-#ifndef __CYGWIN__
-	if (!XInitThreads())
-		ast_log(LOG_ERROR, "Not initialized XInitThreads!\n");
-#endif /* __CYGWIN__ */
-#if 0
-	ast_register_atexit(skypiax_disconnect);
-	ast_register_application(skype2skypiaxapp, skype2skypiax, skype2skypiaxsynopsis, skype2skypiaxdescrip);
-	ast_register_application(skypiax2skypeapp, skypiax2skype, skypiax2skypesynopsis, skypiax2skypedescrip);
-#endif
-#endif /* defined(WANT_SKYPE_X11) || defined(__CYGWIN__) */
-
-	/* make sure we can register our channel type with Asterisk */
-	i = ast_channel_register(&skypiax_tech);
-	if (i < 0) {
-		ERRORA("Unable to register channel type '%s'\n", SKYPIAX_P_LOG, skypiax_type);
-		return -1;
-	}
-	/* load skypiax.conf config file */
-#ifdef ASTERISK_VERSION_1_6
-	cfg = ast_config_load(skypiax_config, config_flags);
-#else
-	cfg = ast_config_load(skypiax_config);
-#endif /* ASTERISK_VERSION_1_6 */
-	if (cfg != NULL) {
-		char *ctg = NULL;
-		int is_first_category = 1;
-		while ((ctg = ast_category_browse(cfg, ctg)) != NULL) {
-			/* create one interface for each category in skypiax.conf config file, first one set the defaults */
-			tmp = skypiax_mkif(cfg, ctg, is_first_category);
-			if (tmp) {
-				DEBUGA_PBX("Created channel Skypiax: skypiax.conf category '[%s]', channel name '%s'" "\n", SKYPIAX_P_LOG, ctg, tmp->name);
-				/* add interface to skypiax_iflist */
-				tmp->next = skypiax_iflist;
-				skypiax_iflist = tmp;
-				/* next one will not be the first ;) */
-				if (is_first_category == 1) {
-					is_first_category = 0;
-					skypiax_console_active = tmp->name;
-				}
-			} else {
-				ERRORA("Unable to create channel Skypiax from skypiax.conf category '[%s]'\n", SKYPIAX_P_LOG, ctg);
-				/* if error, unload config from memory and return */
-				ast_config_destroy(cfg);
-				ast_channel_unregister(&skypiax_tech);
-				return -1;
-			}
-			/* do it for each category described in config */
-		}
-
-		/* we finished, unload config from memory */
-		ast_config_destroy(cfg);
-	} else {
-		ERRORA("Unable to load skypiax_config skypiax.conf\n", SKYPIAX_P_LOG);
-		ast_channel_unregister(&skypiax_tech);
-		return -1;
-	}
-#ifndef ASTERISK_VERSION_1_6
-	ast_cli_register_multiple(myclis, sizeof(myclis) / sizeof(struct ast_cli_entry));
-#endif /* ASTERISK_VERSION_1_6 */
-	/* start to monitor the interfaces (skypiax_iflist) for the first time */
-	if (skypiax_restart_monitor()) {
-		ERRORA("skypiax_restart_monitor failed, BAD\n", SKYPIAX_P_LOG);
-		return -1;
-	}
-	/* go through the interfaces list (skypiax_iflist) WITHOUT locking */
-	p = skypiax_iflist;
-	while (p) {
-		int i;
-		/* for each interface in list */
-		p2 = p->next;
-		NOTICA("STARTING interface %s, please be patient\n", SKYPIAX_P_LOG, p->name);
-		i = 0;
-		while (p->SkypiaxHandles.api_connected == 0 && running && i < 60000) {	// 60sec FIXME
-			usleep(1000);
-			i++;
-		}
-		if (p->SkypiaxHandles.api_connected) {
-			NOTICA("STARTED interface %s\n", SKYPIAX_P_LOG, p->name);
-		} else {
-			ERRORA("Interface %s FAILED to start\n", SKYPIAX_P_LOG, p->name);
-			running = 0;
-			return -1;
-		}
-		/* next one, please */
-		p = p2;
-	}
-	return 0;
-}
-
-/*!
- * \brief Unload the module from Asterisk and shutdown its threads
- *
- * This function unregister the module from Asterisk,
- * destroy the interfaces for the channels,
- * shutdown the auxiliary threads for the interfaces,
- * then shutdown its monitor thread.
- *
- * \return zero on success, -1 on error.
- */
-int unload_module(void)
-{
-	struct skypiax_pvt *p = NULL, *p2 = NULL;
-	int res;
-
-	/* unregister our channel type with Asterisk */
-	ast_channel_unregister(&skypiax_tech);
-	ast_cli_unregister_multiple(myclis, sizeof(myclis) / sizeof(struct ast_cli_entry));
-
-#if defined(WANT_SKYPE_X11) || defined(__CYGWIN__)
-#ifndef __CYGWIN__
-	//FIXME what to do? if (!XInitThreads())
-	//FIXME what to do? ast_log(LOG_ERROR, "Not initialized XInitThreads!\n");
-#endif /* __CYGWIN__ */
-#if 0
-	ast_unregister_atexit(skypiax_disconnect);
-	ast_unregister_application(skype2skypiaxapp);
-	ast_unregister_application(skypiax2skypeapp);
-#endif
-#endif /* defined(WANT_SKYPE_X11) || defined(__CYGWIN__) */
-
-	/* lock the skypiax_monlock, kill the monitor thread, unlock the skypiax_monlock */
-	LOKKA(&skypiax_monlock);
-	if (skypiax_monitor_thread && (skypiax_monitor_thread != AST_PTHREADT_NULL)
-		&& (skypiax_monitor_thread != AST_PTHREADT_STOP)) {
-		if (pthread_cancel(skypiax_monitor_thread)) {
-			ERRORA("pthread_cancel failed, BAD\n", SKYPIAX_P_LOG);
-			return -1;
-		}
-		if (pthread_kill(skypiax_monitor_thread, SIGURG)) {
-			DEBUGA_PBX("pthread_kill failed\n", SKYPIAX_P_LOG);	//maybe it just died
-		}
-#ifndef __CYGWIN__				/* under cygwin, this seems to be not reliable, get stuck at times */
-		if (pthread_join(skypiax_monitor_thread, NULL)) {
-			ERRORA("pthread_join failed, BAD\n", SKYPIAX_P_LOG);
-			return -1;
-		}
-#endif /* __CYGWIN__ */
-	}
-	skypiax_monitor_thread = AST_PTHREADT_STOP;
-	UNLOCKA(&skypiax_monlock);
-
-	if (skypiax_monitor_audio_thread && (skypiax_monitor_audio_thread != AST_PTHREADT_NULL)
-		&& (skypiax_monitor_audio_thread != AST_PTHREADT_STOP)) {
-
-		if (pthread_cancel(skypiax_monitor_audio_thread)) {
-			ERRORA("pthread_cancel skypiax_monitor_audio_thread failed, BAD\n", SKYPIAX_P_LOG);
-		}
-		if (pthread_kill(skypiax_monitor_audio_thread, SIGURG)) {
-			DEBUGA_PBX("pthread_kill skypiax_monitor_audio_thread failed, no problem\n", SKYPIAX_P_LOG);	//maybe it just died
-		}
-
-		if (pthread_join(skypiax_monitor_audio_thread, NULL)) {
-			ERRORA("pthread_join failed, BAD\n", SKYPIAX_P_LOG);
-		}
-	}
-	/* lock the skypiax_iflock, and go through the interfaces list (skypiax_iflist) */
-	LOKKA(&skypiax_iflock);
-	p = skypiax_iflist;
-	while (p) {
-		/* for each interface in list */
-		p2 = p->next;
-		/* shutdown the sound system, close sound fds, and if exist shutdown the sound managing threads */
-		DEBUGA_SOUND("shutting down sound\n", SKYPIAX_P_LOG);
-		res = skypiax_sound_shutdown(p);
-		if (res == -1) {
-			ERRORA("Failed to shutdown sound\n", SKYPIAX_P_LOG);
-		}
-#if 0
-		/* if a dsp struct has been allocated, free it */
-		if (p->dsp) {
-			ast_dsp_free(p->dsp);
-			p->dsp = NULL;
-		}
-#endif
-		DEBUGA_PBX("freeing PVT\n", SKYPIAX_P_LOG);
-		/* free the pvt allocated memory */
-		free(p);
-		/* next one, please */
-		p = p2;
-	}
-	/* finished with the interfaces list, unlock the skypiax_iflock */
-	UNLOCKA(&skypiax_iflock);
-
-#ifdef __CYGWIN__
-	NOTICA("Sleping 5 secs, please wait...\n", SKYPIAX_P_LOG);
-	sleep(5);					/* without this pause, for some unknown (to me) reason it crashes on cygwin */
-#endif /* __CYGWIN__ */
-	NOTICA("Unloaded Skypiax Module\n", SKYPIAX_P_LOG);
-	return 0;
-}
-
-/*!
- * \brief Return the count of active channels for this module
- *
- * \return the count of active channels for this module
- */
-int usecount()
-{
-	int res;
-	static struct skypiax_pvt *p = &skypiax_log_struct;
-/* lock the skypiax_usecnt lock */
-	LOKKA(&skypiax_usecnt_lock);
-	/* retrieve the skypiax_usecnt */
-	res = skypiax_usecnt;
-/* unlock the skypiax_usecnt lock */
-	UNLOCKA(&skypiax_usecnt_lock);
-	/* return the skypiax_usecnt */
-	return res;
-}
-
-/*!
- * \brief Return the textual description of the module
- *
- * \return the textual description of the module
- */
-char *description()
-{
-	return (char *) skypiax_desc;
-}
-
-/*!
- * \brief Return the ASTERISK_GPL_KEY
- *
- * \return the ASTERISK_GPL_KEY
- */
-char *key()
-{
-	struct skypiax_pvt *p = NULL;
-
-	NOTICA("Returning Key\n", SKYPIAX_P_LOG);
-
-	return ASTERISK_GPL_KEY;
-}
-
-/*!
- * \brief Create and initialize one interface for the module
- * \param cfg pointer to configuration data from skypiax.conf
- * \param ctg pointer to a category name to be found in cfg
- * \param is_first_category is this the first category in cfg
- *
- * This function create and initialize one interface for the module
- *
- * \return a pointer to the PVT structure of interface on success, NULL on error.
- */
-struct skypiax_pvt *skypiax_mkif(struct ast_config *cfg, char *ctg, int is_first_category)
-{
-	struct skypiax_pvt *tmp;
-	struct ast_variable *v;
-	int res;
-
-	int debug_all = 0;
-	int debug_at = 0;
-	int debug_fbus2 = 0;
-	int debug_serial = 0;
-	int debug_sound = 0;
-	int debug_pbx = 0;
-	int debug_skype = 0;
-	int debug_call = 0;
-	int debug_locks = 0;
-	int debug_monitorlocks = 0;
-
-	ast_log(LOG_DEBUG, "ENTERING FUNC\n");
-	/* alloc memory for PVT */
-	tmp = malloc(sizeof(struct skypiax_pvt));
-	if (tmp == NULL) {			/* fail */
-		return NULL;
-	}
-	/* clear memory for PVT */
-	memset(tmp, 0, sizeof(struct skypiax_pvt));
-
-	/* if we are reading the "first" category of the config file, take SELECTED values as defaults, overriding the values in skypiax_default */
-	if (is_first_category == 1) {
-		/* for each variable in category, copy it in the skypiax_default struct */
-		for (v = ast_variable_browse(cfg, ctg); v; v = v->next) {
-			M_START(v->name, v->value);
-
-			M_STR("context", skypiax_default.context)
-				M_STR("language", skypiax_default.language)
-				M_STR("extension", skypiax_default.exten)
-				M_F("playback_boost", skypiax_store_boost(v->value, &skypiax_default.playback_boost))
-				M_F("capture_boost", skypiax_store_boost(v->value, &skypiax_default.capture_boost))
-				M_UINT("skypiax_dir_entry_extension_prefix", skypiax_default.skypiax_dir_entry_extension_prefix)
-				M_END(;
-				);
-		}
-	}
-
-	/* initialize the newly created PVT from the skypiax_default values */
-	*tmp = skypiax_default;
-
-	/* the category name becomes the interface name */
-	tmp->name = strdup(ctg);
-
-	/* for each category in config file, "first" included, read in ALL the values */
-	for (v = ast_variable_browse(cfg, ctg); v; v = v->next) {
-		M_START(v->name, v->value);
-
-		M_BOOL("debug_all", debug_all)
-			M_BOOL("debug_at", debug_at)
-			M_BOOL("debug_fbus2", debug_fbus2)
-			M_BOOL("debug_serial", debug_serial)
-			M_BOOL("debug_sound", debug_sound)
-			M_BOOL("debug_pbx", debug_pbx)
-			M_BOOL("debug_skype", debug_skype)
-			M_BOOL("debug_call", debug_call)
-			M_BOOL("debug_locks", debug_locks)
-			M_BOOL("debug_monitorlocks", debug_monitorlocks)
-			M_BOOL("skype", tmp->skype)
-			M_STR("context", tmp->context)
-			M_STR("language", tmp->language)
-			M_STR("extension", tmp->exten)
-			M_STR("X11_display", tmp->X11_display)
-			M_UINT("tcp_cli_port", tmp->tcp_cli_port)
-			M_UINT("tcp_srv_port", tmp->tcp_srv_port)
-			M_F("playback_boost", skypiax_store_boost(v->value, &tmp->playback_boost))
-			M_F("capture_boost", skypiax_store_boost(v->value, &tmp->capture_boost))
-			M_STR("skype_user", tmp->skype_user)
-			M_UINT("skypiax_dir_entry_extension_prefix", tmp->skypiax_dir_entry_extension_prefix)
-			M_END(;
-			);
-	}
-
-	if (debug_all) {
-		skypiax_debug = skypiax_debug | DEBUG_ALL;
-		if (!option_debug) {
-			WARNINGA
-				("DEBUG_ALL activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_ALL debugging output.\n",
-				 SKYPIAX_TMP_LOG);
-		} else {
-			NOTICA("DEBUG_ALL activated. \n", SKYPIAX_TMP_LOG);
-		}
-	}
-
-	if (debug_fbus2) {
-		skypiax_debug = skypiax_debug | DEBUG_FBUS2;
-		if (!option_debug) {
-			WARNINGA
-				("DEBUG_FBUS2 activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_FBUS2 debugging output.\n",
-				 SKYPIAX_TMP_LOG);
-		} else {
-			NOTICA("DEBUG_FBUS2 activated. \n", SKYPIAX_TMP_LOG);
-		}
-	}
-
-	if (debug_serial) {
-		skypiax_debug = skypiax_debug | DEBUG_SERIAL;
-		if (!option_debug) {
-			WARNINGA
-				("DEBUG_SERIAL activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_SERIAL debugging output.\n",
-				 SKYPIAX_TMP_LOG);
-		} else {
-			NOTICA("DEBUG_SERIAL activated. \n", SKYPIAX_TMP_LOG);
-		}
-	}
-
-	if (debug_sound) {
-		skypiax_debug = skypiax_debug | DEBUG_SOUND;
-		if (!option_debug) {
-			WARNINGA
-				("DEBUG_SOUND activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_SOUND debugging output.\n",
-				 SKYPIAX_TMP_LOG);
-		} else {
-			NOTICA("DEBUG_SOUND activated. \n", SKYPIAX_TMP_LOG);
-		}
-	}
-
-	if (debug_pbx) {
-		skypiax_debug = skypiax_debug | DEBUG_PBX;
-		if (!option_debug) {
-			WARNINGA
-				("DEBUG_PBX activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_PBX debugging output.\n",
-				 SKYPIAX_TMP_LOG);
-		} else {
-			NOTICA("DEBUG_PBX activated. \n", SKYPIAX_TMP_LOG);
-		}
-	}
-
-	if (debug_skype) {
-		skypiax_debug = skypiax_debug | DEBUG_SKYPE;
-		if (!option_debug) {
-			WARNINGA
-				("DEBUG_SKYPE activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_SKYPE debugging output.\n",
-				 SKYPIAX_TMP_LOG);
-		} else {
-			NOTICA("DEBUG_SKYPE activated. \n", SKYPIAX_TMP_LOG);
-		}
-	}
-
-	if (debug_call) {
-		skypiax_debug = skypiax_debug | DEBUG_CALL;
-		if (!option_debug) {
-			WARNINGA
-				("DEBUG_CALL activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_CALL debugging output.\n",
-				 SKYPIAX_TMP_LOG);
-		} else {
-			NOTICA("DEBUG_CALL activated. \n", SKYPIAX_TMP_LOG);
-		}
-	}
-
-	if (debug_locks) {
-		skypiax_debug = skypiax_debug | DEBUG_LOCKS;
-		if (!option_debug) {
-			WARNINGA
-				("DEBUG_LOCKS activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_LOCKS debugging output.\n",
-				 SKYPIAX_TMP_LOG);
-		} else {
-			NOTICA("DEBUG_LOCKS activated. \n", SKYPIAX_TMP_LOG);
-		}
-	}
-
-	if (debug_monitorlocks) {
-		skypiax_debug = skypiax_debug | DEBUG_MONITORLOCKS;
-		if (!option_debug) {
-			WARNINGA
-				("DEBUG_MONITORLOCKS activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_MONITORLOCKS debugging output.\n",
-				 SKYPIAX_TMP_LOG);
-		} else {
-			NOTICA("DEBUG_MONITORLOCKS activated. \n", SKYPIAX_TMP_LOG);
-		}
-	}
-
-	if (option_debug > 1) {
-		DEBUGA_SOUND("playback_boost is %f\n", SKYPIAX_TMP_LOG, tmp->playback_boost);
-		DEBUGA_SOUND("capture_boost is %f\n", SKYPIAX_TMP_LOG, tmp->capture_boost);
-	}
-/* initialize the soundcard channels (input and output) used by this interface (a multichannel soundcard can be used by multiple interfaces), optionally starting the sound managing threads */
-	res = skypiax_sound_init(tmp);
-	if (res == -1) {
-		ERRORA("Failed initializing sound device\n", SKYPIAX_TMP_LOG);
-		/* we failed, free the PVT */
-		free(tmp);
-		return NULL;
-	}
-	/*
-	   res = pipe(tmp->SkypiaxHandles.fdesc);
-	   if (res) {
-	   ast_log(LOG_ERROR, "Unable to create skype pipe\n");
-	   if (option_debug > 10) {
-	   DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG);
-	   }
-	   free(tmp);
-	   return NULL;
-	   }
-	   fcntl(tmp->SkypiaxHandles.fdesc[0], F_SETFL, O_NONBLOCK);
-	   fcntl(tmp->SkypiaxHandles.fdesc[1], F_SETFL, O_NONBLOCK);
-	 */
-	tmp->skype_thread = AST_PTHREADT_NULL;
-
-	if (tmp->skype) {
-		ast_log(LOG_DEBUG, "TO BE started skype_thread=%lu STOP=%lu NULL=%lu\n",
-				(unsigned long) tmp->skype_thread, (unsigned long) AST_PTHREADT_STOP, (unsigned long) AST_PTHREADT_NULL);
-#ifdef __CYGWIN__
-		if (ast_pthread_create(&tmp->skype_thread, NULL, do_skypeapi_thread, tmp) < 0) {
-			ast_log(LOG_ERROR, "Unable to start skype_main thread.\n");
-			free(tmp);
-			return NULL;
-		}
-#else /* __CYGWIN__ */
-#ifdef WANT_SKYPE_X11
-		ast_log(LOG_DEBUG, "AsteriskHandlesfd: %d\n", tmp->SkypiaxHandles.fdesc[1]);
-		if (ast_pthread_create(&tmp->skype_thread, NULL, do_skypeapi_thread, tmp) < 0) {
-			ast_log(LOG_ERROR, "Unable to start skype_main thread.\n");
-			free(tmp);
-			return NULL;
-		}
-#endif /* WANT_SKYPE_X11 */
-#endif /* __CYGWIN__ */
-		usleep(100000);			//0.1 sec
-		if (tmp->skype_thread == AST_PTHREADT_NULL) {
-			ast_log(LOG_ERROR, "Unable to start skype_main thread.\n");
-			free(tmp);
-			return NULL;
-		}
-		ast_log(LOG_DEBUG, "STARTED skype_thread=%lu STOP=%lu NULL=%lu\n",
-				(unsigned long) tmp->skype_thread, (unsigned long) AST_PTHREADT_STOP, (unsigned long) AST_PTHREADT_NULL);
-	}
-#if 0
-	if (tmp->skype) {
-#if 0
-		if (option_debug > 1)
-			ast_log(LOG_DEBUG, "TO BE started skype_thread=%lu STOP=%lu NULL=%lu\n",
-					(unsigned long) tmp->skype_thread, (unsigned long) AST_PTHREADT_STOP, (unsigned long) AST_PTHREADT_NULL);
-#endif
-#ifdef __CYGWIN__
-		if (ast_pthread_create(&tmp->skype_thread, NULL, do_skypeapi_thread, &tmp->SkypiaxHandles) < 0) {
-			ast_log(LOG_ERROR, "Unable to start skype_main thread.\n");
-			if (option_debug > 10) {
-				DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG);
-			}
-			free(tmp);
-			return NULL;
-		}
-#else /* __CYGWIN__ */
-#ifdef WANT_SKYPE_X11
-		if (ast_pthread_create(&tmp->signaling_thread, NULL, do_signaling_thread_fnc, tmp) < 0) {
-			ast_log(LOG_ERROR, "Unable to start skype_main thread.\n");
-			if (option_debug > 10) {
-				DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG);
-			}
-			free(tmp);
-			return NULL;
-		}
-#endif /* WANT_SKYPE_X11 */
-#endif /* __CYGWIN__ */
-		usleep(100000);			//0.1 sec
-		if (tmp->skype_thread == AST_PTHREADT_NULL) {
-			ast_log(LOG_ERROR, "Unable to start skype_main thread.\n");
-			if (option_debug > 10) {
-				DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG);
-			}
-			free(tmp);
-			return NULL;
-		}
-		if (option_debug > 1)
-			ast_log(LOG_DEBUG, "STARTED signaling_thread=%lu STOP=%lu NULL=%lu\n",
-					(unsigned long) tmp->signaling_thread, (unsigned long) AST_PTHREADT_STOP, (unsigned long) AST_PTHREADT_NULL);
-	}
-#endif
-
-	/* return the newly created skypiax_pvt */
-	return tmp;
-}
-
-/*! \brief (Re)Start the module main monitor thread, watching for incoming calls on the interfaces */
-int skypiax_restart_monitor(void)
-{
-	static struct skypiax_pvt *p = &skypiax_log_struct;
-
-	/* If we're supposed to be stopped -- stay stopped */
-	if (skypiax_monitor_thread == AST_PTHREADT_STOP) {
-		return 0;
-	}
-	LOKKA(&skypiax_monlock);
-	/* Do not seems possible to me that this function can be called by the very same monitor thread, but let's be paranoid */
-	if (skypiax_monitor_thread == pthread_self()) {
-		UNLOCKA(&skypiax_monlock);
-		ERRORA("Cannot kill myself\n", SKYPIAX_P_LOG);
-		return -1;
-	}
-	/* if the monitor thread exists */
-	if (skypiax_monitor_thread != AST_PTHREADT_NULL) {
-		/* Wake up the thread, it can be stuck waiting in a select or so */
-		pthread_kill(skypiax_monitor_thread, SIGURG);
-	} else {
-		/* the monitor thread does not exists, start a new monitor */
-		if (ast_pthread_create(&skypiax_monitor_thread, NULL, skypiax_do_monitor, NULL) < 0) {
-			UNLOCKA(&skypiax_monlock);
-			ERRORA("Unable to start monitor thread.\n", SKYPIAX_P_LOG);
-			return -1;
-		}
-	}
-	UNLOCKA(&skypiax_monlock);
-	return 0;
-}
-
-/*! \brief The skypiax monitoring thread
- * \note   This thread monitors all the skypiax interfaces that are not in a call
- *         (and thus do not have a separate thread) indefinitely
- *         */
-void *skypiax_do_monitor(void *data)
-{
-	fd_set rfds;
-	int res;
-	struct skypiax_pvt *p = NULL;
-	int max = -1;
-	struct timeval to;
-	time_t now_timestamp;
-
-	if (pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL)) {
-		ERRORA("Unable to set cancel type to deferred\n", SKYPIAX_P_LOG);
-		return NULL;
-	}
-
-	for (;;) {
-		pthread_testcancel();
-		/* Don't let anybody kill us right away.  Nobody should lock the interface list
-		   and wait for the monitor list, but the other way around is okay. */
-		PUSHA_UNLOCKA(&skypiax_monlock);
-		MONITORLOKKA(&skypiax_monlock);
-		/* Lock the interface list */
-		PUSHA_UNLOCKA(&skypiax_iflock);
-		MONITORLOKKA(&skypiax_iflock);
-		/* Build the stuff we're going to select on, that is the skypiax_serial_fd of every
-		   skypiax_pvt that does not have an associated owner channel. In the case of FBUS2 3310
-		   and in the case of PROTOCOL_NO_SERIAL we add the audio_fd as well, because there is not serial signaling of incoming calls */
-		FD_ZERO(&rfds);
-
-		time(&now_timestamp);
-		p = skypiax_iflist;
-		while (p) {
-			if (!p->owner) {
-				/* This interface needs to be watched, as it lacks an owner */
-
-				if (p->skype) {
-					if (FD_ISSET(p->SkypiaxHandles.fdesc[0], &rfds))
-						ERRORA("Descriptor %d (SkypiaxHandles.fdesc[0]) appears twice ?\n", SKYPIAX_P_LOG, p->SkypiaxHandles.fdesc[0]);
-
-					if (p->SkypiaxHandles.fdesc[0] > 0) {
-						FD_SET(p->SkypiaxHandles.fdesc[0], &rfds);
-						if (p->SkypiaxHandles.fdesc[0] > max)
-							max = p->SkypiaxHandles.fdesc[0];
-
-					}
-				}
-
-			}
-			/* next interface, please */
-			p = p->next;
-		}
-		/* Okay, now that we know what to do, release the interface lock */
-		MONITORUNLOCKA(&skypiax_iflock);
-		POPPA_UNLOCKA(&skypiax_iflock);
-		/* And from now on, we're okay to be killed, so release the monitor lock as well */
-		MONITORUNLOCKA(&skypiax_monlock);
-		POPPA_UNLOCKA(&skypiax_monlock);
-
-		/* you want me to die? */
-		pthread_testcancel();
-
-		/* Wait for something to happen */
-		to.tv_sec = 0;
-		to.tv_usec = 500000;	/* we select with this timeout because under cygwin we avoid the signal usage, so there is no way to end the thread if it is stuck waiting for select */
-		res = ast_select(max + 1, &rfds, NULL, NULL, &to);
-
-		/* you want me to die? */
-		pthread_testcancel();
-
-		/* Okay, select has finished.  Let's see what happened.  */
-
-		/* If there are errors...  */
-		if (res < 0) {
-			if (errno == EINTR)	/* EINTR is just the select
-								   being interrupted by a SIGURG, or so */
-				continue;
-			else {
-				ERRORA("select returned %d: %s\n", SKYPIAX_P_LOG, res, strerror(errno));
-				return NULL;
-			}
-		}
-
-		/* must not be killed while skypiax_iflist is locked */
-		PUSHA_UNLOCKA(&skypiax_monlock);
-		MONITORLOKKA(&skypiax_monlock);
-		/* Alright, lock the interface list again, and let's look and see what has
-		   happened */
-		PUSHA_UNLOCKA(&skypiax_iflock);
-		MONITORLOKKA(&skypiax_iflock);
-
-		p = skypiax_iflist;
-		for (; p; p = p->next) {
-
-			if (p->skype) {
-				if (FD_ISSET(p->SkypiaxHandles.fdesc[0], &rfds)) {
-					res = skypiax_signaling_read(p);
-					if (res == CALLFLOW_INCOMING_CALLID || res == CALLFLOW_INCOMING_RING) {
-						//ast_log(LOG_NOTICE, "CALLFLOW_INCOMING_RING SKYPE\n");
-						DEBUGA_SKYPE("CALLFLOW_INCOMING_RING\n", SKYPIAX_P_LOG);
-						skypiax_new(p, SKYPIAX_STATE_RING, p->context /* p->context */ );
-					}
-				}
-			}
-
-		}
-		MONITORUNLOCKA(&skypiax_iflock);
-		POPPA_UNLOCKA(&skypiax_iflock);
-		MONITORUNLOCKA(&skypiax_monlock);
-		POPPA_UNLOCKA(&skypiax_monlock);
-		pthread_testcancel();
-	}
-/* Never reached */
-	return NULL;
-
-}
-
-/*!
- * \brief Initialize the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces)
- * \param p the skypiax_pvt of the interface
- *
- * This function initialize the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces). It simply pass its parameters to the right function for the sound system for which has been compiled, eg. alsa_init for ALSA, oss_init for OSS, winmm_init for Windows Multimedia, etc and return the result
- *
- * \return zero on success, -1 on error.
- */
-
-int skypiax_sound_init(struct skypiax_pvt *p)
-{
-	return skypiax_audio_init(p);
-}
-
-/*!
- * \brief Shutdown the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces)
- * \param p the skypiax_pvt of the interface
- *
- * This function shutdown the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces). It simply pass its parameters to the right function for the sound system for which has been compiled, eg. alsa_shutdown for ALSA, oss_shutdown for OSS, winmm_shutdown for Windows Multimedia, etc and return the result
- *
- * \return zero on success, -1 on error.
- */
-
-int skypiax_sound_shutdown(struct skypiax_pvt *p)
-{
-
-	//return skypiax_portaudio_shutdown(p);
-
-	return -1;
-}
-
-/*! \brief Read audio frames from interface */
-struct ast_frame *skypiax_sound_read(struct skypiax_pvt *p)
-{
-	struct ast_frame *f = NULL;
-	int res;
-
-	res = skypiax_audio_read(p);
-	f = &p->read_frame;
-	return f;
-}
-
-/*! \brief Send audio frame to interface */
-int skypiax_sound_write(struct skypiax_pvt *p, struct ast_frame *f)
-{
-	int ret = -1;
-
-	ret = skypiax_audio_write(p, f);
-	return ret;
-}
-
-/*!
- * \brief This thread runs during a call, and monitor the interface serial port for signaling, like hangup, caller id, etc
- *
- */
-void *skypiax_do_controldev_thread(void *data)
-{
-	struct skypiax_pvt *p = data;
-	int res;
-
-	DEBUGA_SERIAL("In skypiax_do_controldev_thread: started, p=%p\n", SKYPIAX_P_LOG, p);
-
-	if (pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL)) {
-		ERRORA("Unable to set cancel type to deferred\n", SKYPIAX_P_LOG);
-		return NULL;
-	}
-
-	while (1) {
-		usleep(1000);
-		pthread_testcancel();
-		if (p->skype) {
-			res = skypiax_signaling_read(p);
-			if (res == CALLFLOW_INCOMING_HANGUP) {
-				DEBUGA_SKYPE("skype call ended\n", SKYPIAX_P_LOG);
-				if (p->owner) {
-					pthread_testcancel();
-					ast_queue_control(p->owner, AST_CONTROL_HANGUP);
-				}
-			}
-		}
-	}
-
-	return NULL;
-
-}
-
-/************************************************/
-
-/* LUIGI RIZZO's magic */
-/*
- * store the boost factor
- */
-#ifdef ASTERISK_VERSION_1_6
-void skypiax_store_boost(const char *s, double *boost)
-#else
-void skypiax_store_boost(char *s, double *boost)
-#endif							/* ASTERISK_VERSION_1_6 */
-{
-	struct skypiax_pvt *p = NULL;
-
-	if (sscanf(s, "%lf", boost) != 1) {
-		ERRORA("invalid boost <%s>\n", SKYPIAX_P_LOG, s);
-		return;
-	}
-	if (*boost < -BOOST_MAX) {
-		WARNINGA("boost %s too small, using %d\n", SKYPIAX_P_LOG, s, -BOOST_MAX);
-		*boost = -BOOST_MAX;
-	} else if (*boost > BOOST_MAX) {
-		WARNINGA("boost %s too large, using %d\n", SKYPIAX_P_LOG, s, BOOST_MAX);
-		*boost = BOOST_MAX;
-	}
-	*boost = exp(log(10) * *boost / 20) * BOOST_SCALE;
-	DEBUGA_SOUND("setting boost %s to %f\n", SKYPIAX_P_LOG, s, *boost);
-}
-
-/*
- * returns a pointer to the descriptor with the given name
- */
-struct skypiax_pvt *skypiax_console_find_desc(char *dev)
-{
-	struct skypiax_pvt *p = NULL;
-
-	for (p = skypiax_iflist; p && strcmp(p->name, dev) != 0; p = p->next);
-	if (p == NULL)
-		WARNINGA("could not find <%s>\n", SKYPIAX_P_LOG, dev);
-
-	return p;
-}
-int skypiax_console_playback_boost(int fd, int argc, char *argv[])
-{
-	struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active);
-
-	if (argc > 2) {
-		return RESULT_SHOWUSAGE;
-	}
-	if (!p) {
-		ast_cli(fd, "No \"current\" skypiax_console for playback_boost, please enter 'help skypiax_console'\n");
-		return RESULT_SUCCESS;
-	}
-
-	if (argc == 1) {
-		ast_cli(fd, "playback_boost on the active skypiax_console, that is [%s], is: %5.1f\n",
-				skypiax_console_active, 20 * log10(((double) p->playback_boost / (double) BOOST_SCALE)));
-	} else if (argc == 2) {
-		skypiax_store_boost(argv[1], &p->playback_boost);
-
-		ast_cli(fd,
-				"playback_boost on the active skypiax_console, that is [%s], is now: %5.1f\n",
-				skypiax_console_active, 20 * log10(((double) p->playback_boost / (double) BOOST_SCALE)));
-	}
-
-	return RESULT_SUCCESS;
-}
-int skypiax_console_capture_boost(int fd, int argc, char *argv[])
-{
-	struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active);
-
-	if (argc > 2) {
-		return RESULT_SHOWUSAGE;
-	}
-	if (!p) {
-		ast_cli(fd, "No \"current\" skypiax_console for capture_boost, please enter 'help skypiax_console'\n");
-		return RESULT_SUCCESS;
-	}
-
-	if (argc == 1) {
-		ast_cli(fd, "capture_boost on the active skypiax_console, that is [%s], is: %5.1f\n",
-				skypiax_console_active, 20 * log10(((double) p->capture_boost / (double) BOOST_SCALE)));
-	} else if (argc == 2) {
-		skypiax_store_boost(argv[1], &p->capture_boost);
-
-		ast_cli(fd,
-				"capture_boost on the active skypiax_console, that is [%s], is now: %5.1f\n",
-				skypiax_console_active, 20 * log10(((double) p->capture_boost / (double) BOOST_SCALE)));
-	}
-
-	return RESULT_SUCCESS;
-}
-
-int skypiax_console_hangup(int fd, int argc, char *argv[])
-{
-	struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active);
-
-	if (argc != 1) {
-		return RESULT_SHOWUSAGE;
-	}
-	if (!p) {
-		ast_cli(fd, "No \"current\" skypiax_console for hanging up, please enter 'help skypiax_console'\n");
-		return RESULT_SUCCESS;
-	}
-	if (!p->owner) {
-		ast_cli(fd, "No call to hangup on the active skypiax_console, that is [%s]\n", skypiax_console_active);
-		return RESULT_FAILURE;
-	}
-	if (p->owner)
-		ast_queue_hangup(p->owner);
-	return RESULT_SUCCESS;
-}
-
-int skypiax_console_dial(int fd, int argc, char *argv[])
-{
-	char *s = NULL;
-	struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active);
-
-	if (argc != 2) {
-		return RESULT_SHOWUSAGE;
-	}
-	if (!p) {
-		ast_cli(fd, "No \"current\" skypiax_console for dialing, please enter 'help skypiax_console'\n");
-		return RESULT_SUCCESS;
-	}
-
-	if (p->owner) {				/* already in a call */
-		int i;
-		struct ast_frame f = { AST_FRAME_DTMF, 0 };
-
-		s = argv[1];
-		/* send the string one char at a time */
-		for (i = 0; i < strlen(s); i++) {
-			f.subclass = s[i];
-			ast_queue_frame(p->owner, &f);
-		}
-		return RESULT_SUCCESS;
-	} else
-		ast_cli(fd, "No call in which to dial on the \"current\" skypiax_console, that is [%s]\n", skypiax_console_active);
-	if (s)
-		free(s);
-	return RESULT_SUCCESS;
-}
-int skypiax_console_set_active(int fd, int argc, char *argv[])
-{
-	if (argc == 1)
-		ast_cli(fd,
-				"\"current\" skypiax_console is [%s]\n    Enter 'skypiax_console show' to see the available interfaces.\n    Enter 'skypiax_console interfacename' to change the \"current\" skypiax_console.\n",
-				skypiax_console_active);
-	else if (argc != 2) {
-		return RESULT_SHOWUSAGE;
-	} else {
-		struct skypiax_pvt *p;
-		if (strcmp(argv[1], "show") == 0) {
-			ast_cli(fd, "Available interfaces:\n");
-			for (p = skypiax_iflist; p; p = p->next)
-				ast_cli(fd, "     [%s]\n", p->name);
-			return RESULT_SUCCESS;
-		}
-		p = skypiax_console_find_desc(argv[1]);
-		if (p == NULL)
-			ast_cli(fd, "Interface [%s] do not exists!\n", argv[1]);
-		else {
-			skypiax_console_active = p->name;
-			ast_cli(fd, "\"current\" skypiax_console is now: [%s]\n", argv[1]);
-		}
-	}
-	return RESULT_SUCCESS;
-}
-
-int skypiax_console_skypiax(int fd, int argc, char *argv[])
-{
-	return RESULT_SHOWUSAGE;
-}
-
-void *do_skypeapi_thread(void *obj)
-{
-	return skypiax_do_skypeapi_thread_func(obj);
-}
-
-int dtmf_received(private_t * p, char *value)
-{
-
-	struct ast_frame f2 = { AST_FRAME_DTMF, value[0], };
-	DEBUGA_SKYPE("Received DTMF: %s\n", SKYPIAX_P_LOG, value);
-	ast_queue_frame(p->owner, &f2);
-
-	return 0;
-
-}
-
-int start_audio_threads(private_t * p)
-{
-	//if (!p->tcp_srv_thread) {
-	if (ast_pthread_create(&p->tcp_srv_thread, NULL, skypiax_do_tcp_srv_thread, p) < 0) {
-		ERRORA("Unable to start tcp_srv_thread thread.\n", SKYPIAX_P_LOG);
-		return -1;
-	} else {
-		DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG);
-	}
-	//}
-	//if (!p->tcp_cli_thread) {
-	if (ast_pthread_create(&p->tcp_cli_thread, NULL, skypiax_do_tcp_cli_thread, p) < 0) {
-		ERRORA("Unable to start tcp_cli_thread thread.\n", SKYPIAX_P_LOG);
-		return -1;
-	} else {
-		DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG);
-	}
-	//}
-
-#ifdef NOTDEF
-	switch_threadattr_t *thd_attr = NULL;
-
-	switch_threadattr_create(&thd_attr, skypiax_module_pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&tech_pvt->tcp_srv_thread, thd_attr, skypiax_do_tcp_srv_thread, tech_pvt, skypiax_module_pool);
-	DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG);
-
-	switch_threadattr_create(&thd_attr, skypiax_module_pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&tech_pvt->tcp_cli_thread, thd_attr, skypiax_do_tcp_cli_thread, tech_pvt, skypiax_module_pool);
-	DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG);
-	switch_sleep(100000);
-
-#endif
-
-	return 0;
-}
-
-int new_inbound_channel(private_t * p)
-{
-
-#ifdef NOTDEF
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if ((session = switch_core_session_request(skypiax_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) != 0) {
-		switch_core_session_add_stream(session, NULL);
-		channel = switch_core_session_get_channel(session);
-		skypiax_tech_init(tech_pvt, session);
-
-		if ((tech_pvt->caller_profile =
-			 switch_caller_profile_new(switch_core_session_get_pool(session), "skypiax",
-									   tech_pvt->dialplan, tech_pvt->callid_name,
-									   tech_pvt->callid_number, NULL, NULL, NULL, NULL, "mod_skypiax", tech_pvt->context, tech_pvt->destination)) != 0) {
-			char name[128];
-			//switch_snprintf(name, sizeof(name), "skypiax/%s/%s", tech_pvt->name, tech_pvt->caller_profile->destination_number);
-			switch_snprintf(name, sizeof(name), "skypiax/%s", tech_pvt->name);
-			switch_channel_set_name(channel, name);
-			switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
-		}
-		switch_channel_set_state(channel, CS_INIT);
-		if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
-			ERRORA("Error spawning thread\n", SKYPIAX_P_LOG);
-			switch_core_session_destroy(&session);
-		}
-	}
-	switch_channel_mark_answered(channel);
-
-#endif
-	return 0;
-}
-
-int remote_party_is_ringing(private_t * p)
-{
-	if (p->owner) {
-		ast_queue_control(p->owner, AST_CONTROL_RINGING);
-	}
-
-	return 0;
-}
-
-int remote_party_is_early_media(private_t * p)
-{
-	if (p->owner) {
-		ast_queue_control(p->owner, AST_CONTROL_RINGING);
-	}
-
-	return 0;
-}
-
-int outbound_channel_answered(private_t * p)
-{
-
-	if (p->owner) {
-		ast_queue_control(p->owner, AST_CONTROL_ANSWER);
-	}
-
-	return 0;
-}
-void *skypiax_do_tcp_srv_thread(void *obj)
-{
-	return skypiax_do_tcp_srv_thread_func(obj);
-}
-void *skypiax_do_tcp_cli_thread(void *obj)
-{
-	return skypiax_do_tcp_cli_thread_func(obj);
-}
-
-int skypiax_audio_write(struct skypiax_pvt *p, struct ast_frame *f)
-{
-	int sent;
-
-	sent = write(p->audioskypepipe[1], (short *) f->data, f->datalen);
-
-	return 0;
-}
-int skypiax_console_skype(int fd, int argc, char *argv[])
-{
-	struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active);
-	char skype_msg[1024];
-	int i, a, c;
-
-	if (argc == 1) {
-		return RESULT_SHOWUSAGE;
-	}
-	if (!p) {
-		ast_cli(fd, "No \"current\" console for skypiax_, please enter 'help console'\n");
-		return RESULT_SUCCESS;
-	}
-	if (!p->skype) {
-		ast_cli(fd, "The \"current\" console is not connected to a Skype client'\n");
-		return RESULT_SUCCESS;
-	}
-
-	memset(skype_msg, 0, sizeof(skype_msg));
-	c = 0;
-	for (i = 1; i < argc; i++) {
-		for (a = 0; a < strlen(argv[i]); a++) {
-			skype_msg[c] = argv[i][a];
-			c++;
-			if (c == 1022)
-				break;
-		}
-		if (i != argc - 1) {
-			skype_msg[c] = ' ';
-			c++;
-		}
-		if (c == 1023)
-			break;
-	}
-	skypiax_signaling_write(p, skype_msg);
-	return RESULT_SUCCESS;
-}
-
-int skypiax_console_skypiax_dir_import(int fd, int argc, char *argv[])
-{
-	//int res;
-	struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active);
-	//char list_command[64];
-	char fn[256];
-	char date[256] = "";
-	time_t t;
-	char *configfile = SKYPIAX_DIR_CONFIG;
-	int add_to_skypiax_dir_conf = 1;
-	//int fromskype = 0;
-	//int fromcell = 0;
-
-#if 0
-	if (directoriax_entry_extension) {
-		skypiax_dir_entry_extension = directoriax_entry_extension;
-	} else {
-		ast_cli(fd, "No 'directoriax_entry_extension', you MUST have loaded directoriax.so\n");
-		return RESULT_SUCCESS;
-	}
-#endif
-
-	if (argc != 2)
-		return RESULT_SHOWUSAGE;
-	if (!p) {
-		ast_cli(fd, "No \"current\" console ???, please enter 'help skypiax_console'\n");
-		return RESULT_SUCCESS;
-	}
-
-	if (!strcasecmp(argv[1], "add"))
-		add_to_skypiax_dir_conf = 1;
-	else if (!strcasecmp(argv[1], "replace"))
-		add_to_skypiax_dir_conf = 0;
-	else {
-		ast_cli(fd, "\n\nYou have neither specified 'add' nor 'replace'\n\n");
-		return RESULT_SHOWUSAGE;
-	}
-
-#if 0
-	if (!strcasecmp(argv[2], "fromskype"))
-		fromskype = 1;
-	else if (!strcasecmp(argv[2], "fromcell"))
-		fromcell = 1;
-	else {
-		ast_cli(fd, "\n\nYou have neither specified 'fromskype' nor 'fromcell'\n\n");
-		return RESULT_SHOWUSAGE;
-	}
-
-	if (fromcell) {
-		ast_cli(fd, "Importing from cellphone is currently supported only on \"AT\" cellphones :( !\n");
-		//fclose(p->phonebook_writing_fp);
-		//skypiax_dir_create_extensions();
-		return RESULT_SUCCESS;
-	}
-
-	if (fromskype)
-		if (!p->skype) {
-			ast_cli(fd, "Importing from skype is supported by skypiax_dir on chan_skypiax!\n");
-			//fclose(p->phonebook_writing_fp);
-			//skypiax_dir_create_extensions();
-			return RESULT_SUCCESS;
-		}
-
-	if (fromcell || fromskype)
-		if (argc != 3) {
-			ast_cli(fd, "\n\nYou don't have to specify a filename with 'fromcell' or with 'fromskype'\n\n");
-			return RESULT_SHOWUSAGE;
-		}
-#endif
-
-  /*******************************************************************************************/
-
-	if (configfile[0] == '/') {
-		ast_copy_string(fn, configfile, sizeof(fn));
-	} else {
-		snprintf(fn, sizeof(fn), "%s/%s", ast_config_AST_CONFIG_DIR, configfile);
-	}
-	NOTICA("Opening '%s'\n", SKYPIAX_P_LOG, fn);
-	time(&t);
-	ast_copy_string(date, ctime(&t), sizeof(date));
-
-	if (add_to_skypiax_dir_conf)
-		p->phonebook_writing_fp = fopen(fn, "a+");
-	else
-		p->phonebook_writing_fp = fopen(fn, "w+");
-
-	if (p->phonebook_writing_fp) {
-		if (add_to_skypiax_dir_conf) {
-			NOTICA("Opened '%s' for appending \n", SKYPIAX_P_LOG, fn);
-			fprintf(p->phonebook_writing_fp, ";!\n");
-			fprintf(p->phonebook_writing_fp, ";! Update Date: %s", date);
-			fprintf(p->phonebook_writing_fp, ";! Updated by: %s, %d\n", __FILE__, __LINE__);
-			fprintf(p->phonebook_writing_fp, ";!\n");
-		} else {
-			NOTICA("Opened '%s' for writing \n", SKYPIAX_P_LOG, fn);
-			fprintf(p->phonebook_writing_fp, ";!\n");
-			fprintf(p->phonebook_writing_fp, ";! Automatically generated configuration file\n");
-			fprintf(p->phonebook_writing_fp, ";! Filename: %s (%s)\n", configfile, fn);
-			fprintf(p->phonebook_writing_fp, ";! Creation Date: %s", date);
-			fprintf(p->phonebook_writing_fp, ";! Generated by: %s, %d\n", __FILE__, __LINE__);
-			fprintf(p->phonebook_writing_fp, ";!\n");
-			fprintf(p->phonebook_writing_fp, "[general]\n\n");
-			fprintf(p->phonebook_writing_fp, "[default]\n");
-		}
-
-  /*******************************************************************************************/
-		//if (fromskype) {
-		if (p->skype) {
-			WARNINGA("About to querying the Skype client 'Contacts', it may take some moments... Don't worry.\n", SKYPIAX_P_LOG);
-			if (p->skype_thread != AST_PTHREADT_NULL) {
-				char msg_to_skype[1024];
-
-				p->skype_friends[0] = '\0';
-				sprintf(msg_to_skype, "#333 SEARCH FRIENDS");
-				if (skypiax_signaling_write(p, msg_to_skype) < 0) {
-					return -1;
-				}
-
-				int friends_count = 0;
-				while (p->skype_friends[0] == '\0') {
-					/* FIXME needs a timeout, can't wait forever!
-					 * eg. when skype is running but not connected! */
-					usleep(100);
-					friends_count++;
-					if (friends_count > 20000) {
-						return -1;	/* FIXME */
-					}
-				}
-
-			}
-
-			if (p->skype_thread != AST_PTHREADT_NULL) {
-				char msg_to_skype[1024];
-
-				if (p->skype_friends[0] != '\0') {
-					char *buf, *where;
-					char **stringp;
-					int skype_dir_file_written = 0;
-
-					buf = p->skype_friends;
-					stringp = &buf;
-					where = strsep(stringp, ", ");
-					while (where) {
-						if (where[0] != '\0') {
-							/*
-							 * So, we have the Skype username (the HANDLE, I think is called).
-							 * But we want to call the names we see in the Skype contact list
-							 * So, let's check the DISPLAYNAME (the end user modified contact name)
-							 * Then, we check the FULLNAME (that appears as it was the DISPLAYNAME
-							 * if the end user has not modify it)
-							 * If we still have neither DISPLAYNAME nor FULLNAME, we'll use the
-							 * Skipe username (the HANDLE)
-							 */
-
-							p->skype_displayname[0] = '\0';
-							sprintf(msg_to_skype, "#765 GET USER %s DISPLAYNAME", where);
-							skypiax_signaling_write(p, msg_to_skype);
-							int displayname_count = 0;
-							while (p->skype_displayname[0] == '\0') {
-								/* FIXME needs a timeout, can't wait forever!
-								 * eg. when skype is running but not connected! */
-								usleep(100);
-								displayname_count++;
-								if (displayname_count > 20000)
-									return -1;	/* FIXME */
-							}
-							if (p->skype_displayname[0] != '\0') {
-								char *where2;
-								char sanitized[300];
-
-								sanitized[0] = '\0';
-
-								where2 = strstr(p->skype_displayname, "DISPLAYNAME ");
-								if (where2) {
-
-									/* there can be some *smart* that makes a displayname
-									 * that is different than first<space>last, */
-									/* maybe initials, simbols, slashes,
-									 * something smartish... let's check */
-
-									if (where2[12] != '\0') {
-										int i = 12;
-										int x = 0;
-										int spaces = 0;
-										int last_char_was_space = 0;
-
-										for (i = 12; i < strlen(where2) && x < 299; i++) {
-											if (!isalnum(where2[i])) {
-												if (!isblank(where2[i])) {
-													/* bad char */
-													continue;
-												}
-												/* is a space */
-												if (last_char_was_space == 1)	/* do not write 2 consecutive spaces */
-													continue;
-												last_char_was_space = 1;
-												sanitized[x] = ' ';
-												x++;
-												continue;
-											}
-											/* is alphanum */
-											last_char_was_space = 0;
-											sanitized[x] = where2[i];
-											x++;
-											continue;
-										}
-
-										sanitized[x] = '\0';
-										if (spaces == 0) {
-										}
-										DEBUGA_SKYPE("sanitized=|%s|, where=|%s|, where2=|%s|\n", SKYPIAX_P_LOG, sanitized, where, &where2[12]);
-									}
-
-									if (where2[12] != '\0') {
-										skypiax_dir_entry_extension++;
-										if (where[0] == '+' || isdigit(where[0])) {	/* is a skypeout number */
-											fprintf(p->phonebook_writing_fp,
-													"%s  => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n",
-													where, sanitized, "no",
-													p->skypiax_dir_entry_extension_prefix, "2", skypiax_dir_entry_extension, "yes", "not_specified");
-										} else {	/* is a skype name */
-											fprintf(p->phonebook_writing_fp,
-													"%s  => ,%sSKY,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n",
-													where, sanitized, "no",
-													p->skypiax_dir_entry_extension_prefix, "1", skypiax_dir_entry_extension, "yes", "not_specified");
-										}
-										skype_dir_file_written = 1;
-
-									}
-								}
-							}
-							p->skype_displayname[0] = '\0';
-
-							p->skype_fullname[0] = '\0';
-							sprintf(msg_to_skype, "#222 GET USER %s FULLNAME", where);
-							skypiax_signaling_write(p, msg_to_skype);
-							int fullname_count = 0;
-							while (p->skype_fullname[0] == '\0') {
-								/* FIXME needs a timeout, can't wait forever!
-								 * eg. when skype is running but not connected! */
-								usleep(100);
-								fullname_count++;
-								if (fullname_count > 20000)
-									return -1;	/* FIXME */
-							}
-							if (p->skype_fullname[0] != '\0') {
-								char *where2;
-								char sanitized[300];
-
-								where2 = strstr(p->skype_fullname, "FULLNAME ");
-								if (where2) {
-
-									/* there can be some *smart* that makes a fullname
-									 * that is different than first<space>last, */
-									/* maybe initials, simbols, slashes,
-									 *  something smartish... let's check */
-
-									if (where2[9] != '\0') {
-										int i = 9;
-										int x = 0;
-										int spaces = 0;
-										int last_char_was_space = 0;
-
-										for (i = 9; i < strlen(where2) && x < 299; i++) {
-											if (!isalnum(where2[i])) {
-												if (!isblank(where2[i])) {
-													/* bad char */
-													continue;
-												}
-												/* is a space */
-												if (last_char_was_space == 1)	/* do not write 2 consecutive spaces */
-													continue;
-												last_char_was_space = 1;
-												sanitized[x] = ' ';
-												x++;
-												continue;
-											}
-											/* alphanum */
-											last_char_was_space = 0;
-											sanitized[x] = where2[i];
-											x++;
-											continue;
-										}
-
-										sanitized[x] = '\0';
-										if (spaces == 0) {
-										}
-										DEBUGA_SKYPE("sanitized=|%s|, where=|%s|, where2=|%s|\n", SKYPIAX_P_LOG, sanitized, where, &where2[9]);
-									}
-
-									if (skype_dir_file_written == 0) {
-										skypiax_dir_entry_extension++;
-										if (where2[9] != '\0') {
-											if (where[0] == '+' || isdigit(where[0])) {	/* is a skypeout number */
-												fprintf(p->phonebook_writing_fp,
-														"%s  => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n",
-														where, sanitized, "no",
-														p->skypiax_dir_entry_extension_prefix, "2", skypiax_dir_entry_extension, "yes", "not_specified");
-											} else {	/* is a skype name */
-												fprintf(p->phonebook_writing_fp,
-														"%s  => ,%sSKY,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n",
-														where, sanitized, "no",
-														p->skypiax_dir_entry_extension_prefix, "1", skypiax_dir_entry_extension, "yes", "not_specified");
-
-											}
-
-										} else {
-											if (where[0] == '+' || isdigit(where[0])) {	/* is a skypeout number */
-												fprintf(p->phonebook_writing_fp,
-														"%s  => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n",
-														where, where, "no", p->skypiax_dir_entry_extension_prefix,
-														"2", skypiax_dir_entry_extension, "yes", "not_specified");
-											} else {	/* is a skype name */
-												fprintf(p->phonebook_writing_fp,
-														"%s  => ,%sSKY,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n",
-														where, where, "no", p->skypiax_dir_entry_extension_prefix,
-														"1", skypiax_dir_entry_extension, "yes", "not_specified");
-
-											}
-										}
-									}
-
-									skype_dir_file_written = 0;
-
-								}
-
-							}
-							p->skype_fullname[0] = '\0';
-
-						}
-						where = strsep(stringp, ", ");
-					}
-
-					p->skype_friends[0] = '\0';
-				}
-			}
-		} else {
-
-			ast_cli(fd, "Skype not configured on the 'current' console, not importing from Skype client!\n");
-		}
-		//}
-  /*******************************************************************************************/
-  /*******************************************************************************************/
-	} else {
-		ast_cli(fd, "\n\nfailed to open the skypiax_dir.conf configuration file: %s\n", fn);
-		ERRORA("failed to open the skypiax_dir.conf configuration file: %s\n", SKYPIAX_P_LOG, fn);
-		return RESULT_FAILURE;
-	}
-
-	fclose(p->phonebook_writing_fp);
-	//skypiax_dir_create_extensions();
-
-	return RESULT_SUCCESS;
-}
-
-private_t *find_available_skypiax_interface(void)
-{
-	private_t *p;
-	int found = 0;
-
-	/* lock the interfaces' list */
-	LOKKA(&skypiax_iflock);
-	/* make a pointer to the first interface in the interfaces list */
-	p = skypiax_iflist;
-	/* Search for the requested interface and verify if is unowned */
-	while (p) {
-		if (!p->owner) {
-			DEBUGA_PBX("Interface is NOT OWNED by a channel\n", SKYPIAX_P_LOG);
-			found = 1;
-			/* we found the requested interface, bail out from the while loop */
-			break;
-		} else {
-			/* interface owned by a channel */
-			DEBUGA_PBX("Interface is OWNED by a channel\n", SKYPIAX_P_LOG);
-		}
-		/* not yet found, next please */
-		p = p->next;
-	}
-
-	/* lock the interfaces' list */
-	UNLOCKA(&skypiax_iflock);
-
-	if (found)
-		return p;
-	else
-		return NULL;
-}
-
-/************************************************/
-#ifdef ASTERISK_VERSION_1_4
-#ifndef AST_MODULE
-#define AST_MODULE "chan_skypiax"
-#endif
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Skypiax, Audio-Serial Driver");
-#endif /* ASTERISK_VERSION_1_4 */
-
-/* rewriting end */
-/*******************************************************************************/
diff --git a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/cyg_no_pthread_kill.c b/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/cyg_no_pthread_kill.c
deleted file mode 100644
index df2da1868a..0000000000
--- a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/cyg_no_pthread_kill.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-#define PRINTMSGCYG
-
-extern int option_debug;
-int cyg_no_pthreadkill(int thread, int sig);
-
-int cyg_no_pthreadkill(int thread, int sig)
-{
-#ifdef PRINTMSGCYG
-	if (option_debug) {
-		printf
-			("\n\nHere there would have been a pthread_kill() on thread [%-7lx], with sig=%d, but it has been substituted by this printf in file cyg_no_pthread_kill.c because CYGWIN does not support sending a signal to a one only thread :-(\n\n",
-			 (unsigned long int) thread, sig);
-	}
-#endif // PRINTMSGCYG
-	return 0;
-}
diff --git a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/skypiax.conf b/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/skypiax.conf
deleted file mode 100644
index 445c65536a..0000000000
--- a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/skypiax.conf
+++ /dev/null
@@ -1,207 +0,0 @@
-;;;;;;;; 
-;;;;;;;; 
-;;;;;;; Skypiax Asterisk Driver 
-;;;;;;; 
-;;;;;;; Configuration file 
-;;;;;;; lines beginning with semicolon (" are ignored (commented out)
-;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;
-;;;;;;; The first interface (named skypeclient)
-;;;;;;[skypeclient] 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;; general settings, valid on all platforms
-;;;;;;;
-;;;;;;; 
-;;;;;;; Default language 
-;;;;;;; 
-;;;;;;language=en 
-;;;;;;; 
-;;;;;;; Default context (in extensions.conf, can be overridden with @context syntax) 
-;;;;;;; 
-;;;;;;context=default 
-;;;;;;; 
-;;;;;;; Default extension (in extensions.conf) where incoming calls land
-;;;;;;; 
-;;;;;;extension=s 
-;;;;;;; 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;; Debugging settings, valid globally for all interfaces on all platforms
-;;;;;;;
-;;;;;;; the debug values are global for all the interfaces.
-;;;;;;;
-;;;;;;; default is no skypiax debugging output, you **have** to activate debugging here to obtain debugging from skypiax
-;;;;;;;
-;;;;;;; To see the debugging output you have to "set debug 100" from the Asterisk CLI or launch
-;;;;;;; Asterisk with -ddddddddddd option, and have the logger.conf file activating debug info for console and messages
-;;;;;;;
-;;;;;;; You can activate each of the following separately, but you can't disactivate. Eg: debug_at=no does not subtract debug_at from debug_all
-;;;;;;; debug_all activate all possible debugging info
-;;;;;;;
-;;;;;;;debug_all=yes
-;;;;;;debug_skype=yes
-;;;;;;debug_pbx=yes
-;;;;;;;debug_sound=yes
-;;;;;;;debug_locks=yes
-;;;;;;;debug_monitorlocks=yes
-;;;;;;
-;;;;;;skype=yes ; legacy setting, leave it to yes
-;;;;;;X11_display=:101
-;;;;;;tcp_cli_port=11234
-;;;;;;tcp_srv_port=11235
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;; audio boost settings, valid for all platforms, to compensate for different input/output audio signal levels
-;;;;;;; tweak it if you get horrible (or not hearable) sound
-;;;;;;;
-;;;;;;;boost can be positive or negative (-40 to +40) in db
-;;;;;;;experiment to find which values are best for your computer
-;;;;;;playback_boost=0 ; 
-;;;;;;capture_boost=0 ; 
-;;;;;;
-;;; [skypiax1] 
-;;; language=en 
-;;; context=default 
-;;; extension=s 
-;;; debug_skype=yes
-;;; debug_pbx=yes
-;;; skype=yes ; legacy setting, leave it to yes
-;;; playback_boost=0 ; 
-;;; capture_boost=0 ; 
-;;; X11_display=:101
-;;; tcp_cli_port=15576
-;;; tcp_srv_port=15577
-;;; skype_user=skypiax1
-;;; 
-;;; [skypiax2] 
-;;; language=en 
-;;; context=default 
-;;; extension=s 
-;;; debug_skype=yes
-;;; debug_pbx=yes
-;;; skype=yes ; legacy setting, leave it to yes
-;;; playback_boost=0 ; 
-;;; capture_boost=0 ; 
-;;; X11_display=:102
-;;; tcp_cli_port=15578
-;;; tcp_srv_port=15579
-;;; skype_user=skypiax2
-;;; 
-;;; [skypiax3] 
-;;; language=en 
-;;; context=default 
-;;; extension=s 
-;;; debug_skype=yes
-;;; debug_pbx=yes
-;;; skype=yes ; legacy setting, leave it to yes
-;;; playback_boost=0 ; 
-;;; capture_boost=0 ; 
-;;; X11_display=:103
-;;; tcp_cli_port=15580
-;;; tcp_srv_port=15581
-;;; skype_user=skypiax3
-;;; 
-[skypiax4] 
-language=en 
-context=default 
-extension=s 
-debug_skype=yes
-debug_pbx=yes
-skype=yes ; legacy setting, leave it to yes
-playback_boost=0 ; 
-capture_boost=0 ; 
-X11_display=:104
-tcp_cli_port=15582
-tcp_srv_port=15583
-skype_user=skypiax4
-
-[skypiax5] 
-language=en 
-context=default 
-extension=s 
-debug_skype=yes
-debug_pbx=yes
-skype=yes ; legacy setting, leave it to yes
-playback_boost=0 ; 
-capture_boost=0 ; 
-X11_display=:105
-tcp_cli_port=15584
-tcp_srv_port=15585
-skype_user=skypiax5
-
-[skypiax6] 
-language=en 
-context=default 
-extension=s 
-debug_skype=yes
-debug_pbx=yes
-skype=yes ; legacy setting, leave it to yes
-playback_boost=0 ; 
-capture_boost=0 ; 
-X11_display=:106
-tcp_cli_port=15586
-tcp_srv_port=16586
-skype_user=skypiax6
-
-;;; [skypiax17] 
-;;; language=en 
-;;; context=default 
-;;; extension=s 
-;;; debug_skype=yes
-;;; debug_pbx=yes
-;;; skype=yes ; legacy setting, leave it to yes
-;;; playback_boost=0 ; 
-;;; capture_boost=0 ; 
-;;; X11_display=:117
-;;; tcp_cli_port=15587
-;;; tcp_srv_port=15588
-;;; skype_user=skypiax17
-;;; 
-;;; [skypiax18] 
-;;; language=en 
-;;; context=default 
-;;; extension=s 
-;;; debug_skype=yes
-;;; debug_pbx=yes
-;;; skype=yes ; legacy setting, leave it to yes
-;;; playback_boost=0 ; 
-;;; capture_boost=0 ; 
-;;; X11_display=:118
-;;; tcp_cli_port=15589
-;;; tcp_srv_port=15590
-;;; skype_user=skypiax18
-;;; 
-;;; [skypiax19] 
-;;; language=en 
-;;; context=default 
-;;; extension=s 
-;;; debug_skype=yes
-;;; debug_pbx=yes
-;;; skype=yes ; legacy setting, leave it to yes
-;;; playback_boost=0 ; 
-;;; capture_boost=0 ; 
-;;; X11_display=:119
-;;; tcp_cli_port=15591
-;;; tcp_srv_port=15592
-;;; skype_user=skypiax19
-;;; 
-;;; [skypiax20] 
-;;; language=en 
-;;; context=default 
-;;; extension=s 
-;;; debug_skype=yes
-;;; debug_pbx=yes
-;;; skype=yes ; legacy setting, leave it to yes
-;;; playback_boost=0 ; 
-;;; capture_boost=0 ; 
-;;; X11_display=:120
-;;; tcp_cli_port=15593
-;;; tcp_srv_port=15594
-;;; skype_user=skypiax20
-;;; 
-;;; 
-;;; 
diff --git a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/skypiax.h b/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/skypiax.h
deleted file mode 100644
index d960f80a07..0000000000
--- a/src/mod/endpoints/mod_skypopen/old-stuff/asterisk/skypiax.h
+++ /dev/null
@@ -1,427 +0,0 @@
-//indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90
-#ifndef _SKYPIAX_H_
-#define _SKYPIAX_H_
-
-#ifndef SKYPIAX_SVN_VERSION
-#define SKYPIAX_SVN_VERSION "????NO_REVISION???"
-#endif
-
-#include <asterisk/version.h>	/* needed here for conditional compilation on version.h */
-  /* the following #defs are for LINUX */
-#ifndef __CYGWIN__
-#ifndef ASTERISK_VERSION_1_6
-#ifndef ASTERISK_VERSION_1_4
-#ifndef ASTERISK_VERSION_1_2
-#define ASTERISK_VERSION_1_4
-#if(ASTERISK_VERSION_NUM == 999999)
-#undef ASTERISK_VERSION_1_4
-#elif(ASTERISK_VERSION_NUM < 10400)
-#undef ASTERISK_VERSION_1_4
-#endif /* ASTERISK_VERSION_NUM == 999999 || ASTERISK_VERSION_NUM < 10400 */
-#endif /* ASTERISK_VERSION_1_2 */
-#endif /* ASTERISK_VERSION_1_4 */
-#endif /* ASTERISK_VERSION_1_6 */
-#ifdef ASTERISK_VERSION_1_2
-#undef ASTERISK_VERSION_1_4
-#endif /* ASTERISK_VERSION_1_2 */
-#ifdef ASTERISK_VERSION_1_6
-#define ASTERISK_VERSION_1_4
-#endif /* ASTERISK_VERSION_1_6 */
-#define SKYPIAX_SKYPE
-#define WANT_SKYPE_X11
-#endif /* NOT __CYGWIN__ */
-  /* the following #defs are for WINDOWS */
-#ifdef __CYGWIN__
-#undef ASTERISK_VERSION_1_4
-#undef ASTERISK_VERSION_1_6
-#define SKYPIAX_SKYPE
-#undef WANT_SKYPE_X11
-#endif /* __CYGWIN__ */
-
-/* INCLUDES */
-#ifdef ASTERISK_VERSION_1_6
-#include <asterisk.h>			/* some asterisk-devel package do not contains asterisk.h, but seems that is needed for the 1.6 series, at least from trunk */
-#endif /* ASTERISK_VERSION_1_6 */
-#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <math.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <string.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <ctype.h>
-#ifndef ASTERISK_VERSION_1_4
-#include <stdlib.h>
-#include <stdio.h>
-#endif /* ASTERISK_VERSION_1_4 */
-#include <asterisk/frame.h>
-#include <asterisk/channel.h>
-#include <asterisk/module.h>
-#include <asterisk/options.h>
-#include <asterisk/pbx.h>
-#include <asterisk/config.h>
-#include <asterisk/cli.h>
-#include <asterisk/causes.h>
-#include <asterisk/endian.h>
-#include <asterisk/lock.h>
-#include <asterisk/devicestate.h>
-#include <asterisk/file.h>
-#include <asterisk/say.h>
-#ifdef ASTERISK_VERSION_1_6
-#include <asterisk/astobj2.h>
-#include <asterisk/paths.h>
-#endif /* ASTERISK_VERSION_1_6 */
-#ifdef ASTERISK_VERSION_1_4
-#include <asterisk/stringfields.h>
-#include <asterisk/abstract_jb.h>
-#include <asterisk/logger.h>
-#include <asterisk/utils.h>
-#endif /* ASTERISK_VERSION_1_4 */
-#ifdef ASTERISK_VERSION_1_2
-#include <asterisk/utils.h>
-#include <asterisk/logger.h>
-#endif /* ASTERISK_VERSION_1_2 */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-//#include "skypiax_spandsp.h"
-#ifdef __CYGWIN__
-#include <windows.h>
-#endif /* __CYGWIN__ */
-#ifdef WANT_SKYPE_X11
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#endif /*  WANT_SKYPE_X11 */
-#ifndef AST_DIGIT_ANYDIG
-#define AST_DIGIT_ANYDIG "0123456789*#"
-#else
-#warning Please review Skypiax AST_DIGIT_ANYDIG
-#endif
-#ifndef _ASTERISK_H
-#define AST_CONFIG_MAX_PATH 255	/* defined in asterisk.h, but some asterisk-devel package do not contains asterisk.h */
-extern char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];
-int ast_register_atexit(void (*func) (void));	/* in asterisk.h, but some asterisk-devel package do not contains asterisk.h */
-void ast_unregister_atexit(void (*func) (void));	/* in asterisk.h, but some asterisk-devel package do not contains asterisk.h */
-#endif
-
-/* DEFINITIONS */
-#define SAMPLERATE_SKYPIAX 8000
-#define SAMPLES_PER_FRAME SAMPLERATE_SKYPIAX/50
-#define SKYPIAX_DIR_CONFIG "directoriax.conf"
-
-/* LUIGI RIZZO's magic */
-/* boost support. BOOST_SCALE * 10 ^(BOOST_MAX/20) must
- * be representable in 16 bits to avoid overflows.
- */
-#define	BOOST_SCALE	(1<<9)
-#define	BOOST_MAX	40			/* slightly less than 7 bits */
-/* call flow from the device */
-#define 	CALLFLOW_CALL_IDLE  AST_STATE_DOWN
-#define 	CALLFLOW_INCOMING_RING  AST_STATE_RING
-#define 	CALLFLOW_CALL_DIALING   AST_STATE_DIALING
-#define 	CALLFLOW_CALL_LINEBUSY   AST_STATE_BUSY
-#define 	CALLFLOW_CALL_ACTIVE   300
-#define 	CALLFLOW_INCOMING_HANGUP   100
-#define 	CALLFLOW_CALL_RELEASED   101
-#define 	CALLFLOW_CALL_NOCARRIER   102
-#define 	CALLFLOW_CALL_INFLUX   103
-#define 	CALLFLOW_CALL_INCOMING   104
-#define 	CALLFLOW_CALL_FAILED   105
-#define 	CALLFLOW_CALL_NOSERVICE   106
-#define 	CALLFLOW_CALL_OUTGOINGRESTRICTED   107
-#define 	CALLFLOW_CALL_SECURITYFAIL   108
-#define 	CALLFLOW_CALL_NOANSWER   109
-#define 	CALLFLOW_STATUS_FINISHED   110
-#define 	CALLFLOW_STATUS_CANCELLED   111
-#define 	CALLFLOW_STATUS_FAILED   112
-#define 	CALLFLOW_STATUS_REFUSED   113
-#define 	CALLFLOW_STATUS_RINGING   114
-#define 	CALLFLOW_STATUS_INPROGRESS   115
-#define 	CALLFLOW_STATUS_UNPLACED   116
-#define 	CALLFLOW_STATUS_ROUTING   117
-#define 	CALLFLOW_STATUS_EARLYMEDIA   118
-#define 	AST_STATE_HANGUP_REQUESTED   200
-  //FIXME CALLFLOW_INCOMING_CALLID to be removed
-#define 	CALLFLOW_INCOMING_CALLID   1019
-/* debugging bitmask */
-#define DEBUG_SOUND 1
-#define DEBUG_SERIAL 2
-#define DEBUG_SKYPE 4
-#define DEBUG_AT 8
-#define DEBUG_FBUS2 16
-#define DEBUG_CALL 32
-#define DEBUG_LOCKS 64
-#define DEBUG_PBX 128
-#define DEBUG_MONITORLOCKS 256
-#define DEBUG_ALL DEBUG_SOUND|DEBUG_SERIAL|DEBUG_SKYPE|DEBUG_AT|DEBUG_FBUS2|DEBUG_CALL|DEBUG_PBX|DEBUG_LOCKS|DEBUG_MONITORLOCKS
-/* wrappers for ast_log */
-#define DEBUGA_SOUND(...)  if (skypiax_debug & DEBUG_SOUND) ast_log(LOG_DEBUG, 		"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SOUND  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_SERIAL(...)  if (skypiax_debug & DEBUG_SERIAL) ast_log(LOG_DEBUG, 	"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SERIAL %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_SKYPE(...)  if (skypiax_debug & DEBUG_SKYPE) ast_log(LOG_DEBUG, 		"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SKYPE  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_AT(...)  if (skypiax_debug & DEBUG_AT) ast_log(LOG_DEBUG, 		"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_AT     %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_FBUS2(...)  if (skypiax_debug & DEBUG_FBUS2) ast_log(LOG_DEBUG, 		"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_FBUS2  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_CALL(...)  if (skypiax_debug & DEBUG_CALL) ast_log(LOG_DEBUG, 		"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_CALL   %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define DEBUGA_PBX(...)  if (skypiax_debug & DEBUG_PBX) ast_log(LOG_DEBUG, 		"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_PBX    %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define ERRORA(...)  ast_log(LOG_ERROR, 						"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][ERROR        %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define NOTICA(...)  ast_log(LOG_NOTICE, 						"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][NOTICE      %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-#define WARNINGA(...)  ast_log(LOG_WARNING, 						"rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][WARNING    %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
-/* macros for logging */
-#define SKYPIAX_P_LOG p ? p->owner : NULL, (unsigned long)pthread_self(), __LINE__, p ? p->name ? p->name : "none" : "none", p ? p->owner ? p->owner->_state : -1 : -1,  p ? p->interface_state : -1, p ? p->skype_callflow : -1
-#define SKYPIAX_TMP_LOG tmp ? tmp->owner : NULL, (unsigned long)pthread_self(), __LINE__, tmp ? tmp->name ? tmp->name : "none" : "none", tmp ? tmp->owner ? tmp->owner->_state : -1 : -1,  tmp ? tmp->interface_state : -1, tmp ? tmp->skype_callflow : -1
-/* logging wrappers for ast_mutex_lock and ast_mutex_unlock */
-#define LOKKA(x)  if (skypiax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] going to lock %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); if (ast_mutex_lock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (skypiax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] locked %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????");
-#define UNLOCKA(x)  if (skypiax_debug & DEBUG_LOCKS)  ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] going to unlock %p (%s)\n",  SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); if (ast_mutex_unlock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (skypiax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS  %-5d][%-10s][%2d,%2d,%2d] unlocked %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????");
-#define PUSHA_UNLOCKA(x)    pthread_cleanup_push(skypiax_unlocka_log, (void *) x);
-#define POPPA_UNLOCKA(x)    pthread_cleanup_pop(0);
-#define MONITORLOKKA(x)  if (skypiax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS  %-5d][%-10s][%2d,%2d,%2d] going to lock %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" :  "?????"); if (ast_mutex_lock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (skypiax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS  %-5d][%-10s][%2d,%2d,%2d] locked %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????");
-#define MONITORUNLOCKA(x)  if (skypiax_debug & DEBUG_MONITORLOCKS)  ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS  %-5d][%-10s][%2d,%2d,%2d] going to unlock %p (%s)\n",  SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); if (ast_mutex_unlock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n");   if (skypiax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS  %-5d][%-10s][%2d,%2d,%2d] unlocked %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????");
-/* macros used for config file parsing (luigi rizzo)*/
-#define 	M_BOOL(tag, dst)   M_F(tag, (dst) = ast_true(__val) )
-#define 	M_END(x)   x;
-#define 	M_F(tag, f)   if (!strcasecmp((__s), tag)) { f; } else
-#ifdef ASTERISK_VERSION_1_6
-#define 	M_START(var, val)   const char *__s = var; const char *__val = val;
-#else
-#define 	M_START(var, val)   char *__s = var; char *__val = val;
-#endif /* ASTERISK_VERSION_1_6 */
-#define 	M_STR(tag, dst)   M_F(tag, ast_copy_string(dst, __val, sizeof(dst)))
-#define 	M_UINT(tag, dst)   M_F(tag, (dst) = strtoul(__val, NULL, 0) )
-
-#define 	SKYPIAX_FRAME_SIZE   160
-
-/* SKYPIAX INTERNAL STRUCTS */
-/*!
- * \brief structure for exchanging messages with the skype client
- */
-#ifdef WANT_SKYPE_X11
-struct AsteriskHandles {
-	Window skype_win;
-	Display *disp;
-	Window win;
-	int fdesc[2];
-};
-#else /* WANT_SKYPE_X11 */
-struct AsteriskHandles {
-	HWND win32_hInit_MainWindowHandle;
-	HWND win32_hGlobal_SkypeAPIWindowHandle;
-	int fdesc[2];
-};
-#endif /* WANT_SKYPE_X11 */
-
-#ifndef WIN32
-struct SkypiaxHandles {
-	Window skype_win;
-	Display *disp;
-	Window win;
-	int api_connected;
-	int fdesc[2];
-};
-#else //WIN32
-
-struct SkypiaxHandles {
-	HWND win32_hInit_MainWindowHandle;
-	HWND win32_hGlobal_SkypeAPIWindowHandle;
-	HINSTANCE win32_hInit_ProcessHandle;
-	char win32_acInit_WindowClassName[128];
-	UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach;
-	UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover;
-	int api_connected;
-	int fdesc[2];
-};
-
-#endif //WIN32
-
-/*!
- * \brief PVT structure for a skypiax interface (channel), created by skypiax_mkif
- */
-struct skypiax_pvt {
-	char *name;					/*!< \brief 'name' of the interface (channel) */
-	int interface_state;		/*!< \brief 'state' of the interface (channel) */
-	struct ast_channel *owner;	/*!< \brief channel we belong to, possibly NULL */
-	struct skypiax_pvt *next;	/*!< \brief Next interface (channel) in list */
-	char context[AST_MAX_EXTENSION];	/*!< \brief default Asterisk dialplan context for this interface */
-	char language[MAX_LANGUAGE];	/*!< \brief default Asterisk dialplan language for this interface */
-	char exten[AST_MAX_EXTENSION];	/*!< \brief default Asterisk dialplan extension for this interface */
-	int skypiax_sound_rate;		/*!< \brief rate of the sound device, in Hz, eg: 8000 */
-	int skypiax_sound_capt_fd;	/*!< \brief file descriptor for sound capture dev */
-	char callid_name[50];
-	char callid_number[50];
-	pthread_t controldev_thread;	/*!< \brief serial control thread for this interface, running during the call */
-	double playback_boost;
-	double capture_boost;
-	int stripmsd;
-	pthread_t skype_thread;
-	struct AsteriskHandles AsteriskHandlesAst;
-	struct SkypiaxHandles SkypiaxHandles;
-	char skype_call_id[512];
-	int skype_call_ongoing;
-	char skype_friends[4096];
-	char skype_fullname[512];
-	char skype_displayname[512];
-	int skype_callflow;			/*!< \brief 'callflow' of the skype interface (as opposed to phone interface) */
-	int skype;					/*!< \brief config flag, bool, Skype support on this interface (0 if false, -1 if true) */
-	int control_to_send;
-	int audiopipe[2];
-	int audioskypepipe[2];
-	pthread_t tcp_srv_thread;
-	pthread_t tcp_cli_thread;
-	short audiobuf[160];
-	int audiobuf_is_loaded;
-
-	//int phonebook_listing;
-	//int phonebook_querying;
-	//int phonebook_listing_received_calls;
-
-	//int phonebook_first_entry;
-	//int phonebook_last_entry;
-	//int phonebook_number_lenght;
-	//int phonebook_text_lenght;
-	FILE *phonebook_writing_fp;
-	int skypiax_dir_entry_extension_prefix;
-#ifdef WIN32
-	unsigned short tcp_cli_port;
-	unsigned short tcp_srv_port;
-#else
-	int tcp_cli_port;
-	int tcp_srv_port;
-#endif
-	char X11_display[256];
-
-	struct ast_frame read_frame;
-
-	char skype_user[256];
-	char skype_password[256];
-	char destination[256];
-	char session_uuid_str[512 + 1];
-	pthread_t signaling_thread;
-};
-
-typedef struct skypiax_pvt private_t;
-/* FUNCTIONS */
-
-/* module helpers functions */
-int load_module(void);
-int unload_module(void);
-int usecount(void);
-char *description(void);
-char *key(void);
-
-/* chan_skypiax internal functions */
-void skypiax_unlocka_log(void *x);
-
-void *do_skypeapi_thread(void *data);
-//int skypiax2skype(struct ast_channel *c, void *data);
-//int skype2skypiax(struct ast_channel *c, void *data);
-//void skypiax_disconnect(void);
-int skypiax_signaling_write(struct skypiax_pvt *p, char *msg_to_skype);
-int skypiax_signaling_read(struct skypiax_pvt *p);
-int skypiax_console_skype(int fd, int argc, char *argv[]);
-#ifdef WANT_SKYPE_X11
-int X11_errors_handler(Display * dpy, XErrorEvent * err);
-int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P);
-int skypiax_present(struct SkypiaxHandles *SkypiaxHandles);
-void skypiax_clean_disp(void *data);
-#endif /* WANT_SKYPE_X11 */
-#ifdef __CYGWIN__
-
-int win32_Initialize_CreateWindowClass(private_t * tech_pvt);
-void win32_DeInitialize_DestroyWindowClass(private_t * tech_pvt);
-int win32_Initialize_CreateMainWindow(private_t * tech_pvt);
-void win32_DeInitialize_DestroyMainWindow(private_t * tech_pvt);
-#endif /* __CYGWIN__ */
-
-/* CHAN_SKYPIAX.C */
-int skypiax_queue_control(struct ast_channel *chan, int control);
-struct skypiax_pvt *skypiax_console_find_desc(char *dev);
-int skypiax_serial_call(struct skypiax_pvt *p, char *dstr);
-
-/* FUNCTIONS */
-/* PBX interface functions */
-struct ast_channel *skypiax_request(const char *type, int format, void *data, int *cause);
-int skypiax_answer(struct ast_channel *c);
-int skypiax_hangup(struct ast_channel *c);
-int skypiax_originate_call(struct ast_channel *c, char *idest, int timeout);
-struct ast_frame *skypiax_read(struct ast_channel *chan);
-int skypiax_write(struct ast_channel *c, struct ast_frame *f);
-int skypiax_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
-#ifndef ASTERISK_VERSION_1_4
-int skypiax_indicate(struct ast_channel *c, int cond);
-#else
-int skypiax_indicate(struct ast_channel *c, int cond, const void *data, size_t datalen);
-#endif
-int skypiax_devicestate(void *data);
-#ifdef ASTERISK_VERSION_1_4
-int skypiax_digitsend_begin(struct ast_channel *ast, char digit);
-int skypiax_digitsend_end(struct ast_channel *ast, char digit, unsigned int duration);
-#else /* ASTERISK_VERSION_1_4 */
-int skypiax_digitsend(struct ast_channel *ast, char digit);
-#endif /* ASTERISK_VERSION_1_4 */
-
-/* chan_skypiax internal functions */
-
-struct skypiax_pvt *skypiax_mkif(struct ast_config *cfg, char *ctg, int is_first_category);
-struct ast_channel *skypiax_new(struct skypiax_pvt *p, int state, char *context);
-int skypiax_restart_monitor(void);
-void *skypiax_do_monitor(void *data);
-int skypiax_sound_boost(struct ast_frame *f, double boost);
-int skypiax_sound_init(struct skypiax_pvt *p);
-int skypiax_sound_shutdown(struct skypiax_pvt *p);
-struct ast_frame *skypiax_sound_read(struct skypiax_pvt *p);
-int skypiax_sound_write(struct skypiax_pvt *p, struct ast_frame *f);
-void *skypiax_do_controldev_thread(void *data);
-#ifdef ASTERISK_VERSION_1_6
-void skypiax_store_boost(const char *s, double *boost);
-#else
-void skypiax_store_boost(char *s, double *boost);
-#endif /* ASTERISK_VERSION_1_6 */
-int skypiax_console_set_active(int fd, int argc, char *argv[]);
-int skypiax_console_hangup(int fd, int argc, char *argv[]);
-int skypiax_console_playback_boost(int fd, int argc, char *argv[]);
-int skypiax_console_capture_boost(int fd, int argc, char *argv[]);
-int skypiax_console_skypiax(int fd, int argc, char *argv[]);
-int skypiax_console_dial(int fd, int argc, char *argv[]);
-int skypiax_audio_init(struct skypiax_pvt *p);
-//struct ast_frame *skypiax_audio_read(struct skypiax_pvt *p);
-int skypiax_audio_read(struct skypiax_pvt *p);
-void *skypiax_do_tcp_srv_thread(void *data);
-int skypiax_audio_write(struct skypiax_pvt *p, struct ast_frame *f);
-void *skypiax_do_tcp_cli_thread(void *data);
-int skypiax_call(struct skypiax_pvt *p, char *idest, int timeout);
-int skypiax_console_skypiax_dir_import(int fd, int argc, char *argv[]);
-
-void *skypiax_do_tcp_srv_thread_func(void *obj);
-void *skypiax_do_tcp_cli_thread_func(void *obj);
-void *skypiax_do_skypeapi_thread_func(void *obj);
-int dtmf_received(private_t * tech_pvt, char *value);
-int start_audio_threads(private_t * tech_pvt);
-int new_inbound_channel(private_t * tech_pvt);
-int outbound_channel_answered(private_t * tech_pvt);
-int skypiax_senddigit(struct skypiax_pvt *p, char digit);
-int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype);
-#if defined(WIN32) && !defined(__CYGWIN__)
-int skypiax_pipe_read(switch_file_t * pipe, short *buf, int howmany);
-int skypiax_pipe_write(switch_file_t * pipe, short *buf, int howmany);
-/* Visual C do not have strsep ? */
-char *strsep(char **stringp, const char *delim);
-#else
-int skypiax_pipe_read(int pipe, short *buf, int howmany);
-int skypiax_pipe_write(int pipe, short *buf, int howmany);
-#endif /* WIN32 */
-int skypiax_close_socket(unsigned int fd);
-private_t *find_available_skypiax_interface(void);
-int remote_party_is_ringing(private_t * tech_pvt);
-int remote_party_is_early_media(private_t * tech_pvt);
-#define		SKYPIAX_STATE_DOWN		AST_STATE_DOWN
-#define		SKYPIAX_STATE_RING		AST_STATE_RING
-#define		SKYPIAX_STATE_DIALING	AST_STATE_DIALING
-#define		SKYPIAX_STATE_BUSY		AST_STATE_BUSY
-#define		SKYPIAX_STATE_UP		AST_STATE_UP
-#define		SKYPIAX_STATE_RINGING	AST_STATE_RINGING
-#define		SKYPIAX_STATE_PRERING	AST_STATE_PRERING
-#define		SKYPIAX_STATE_RESERVED	AST_STATE_RESERVED
-#define 	SKYPIAX_STATE_HANGUP_REQUESTED   200
-#endif /* _SKYPIAX_H_ */
diff --git a/src/mod/endpoints/mod_skypopen/old-stuff/dummy.c b/src/mod/endpoints/mod_skypopen/old-stuff/dummy.c
deleted file mode 100644
index 1a369dcc4f..0000000000
--- a/src/mod/endpoints/mod_skypopen/old-stuff/dummy.c
+++ /dev/null
@@ -1,821 +0,0 @@
-/*
- *  Dummy soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *
- *   This program 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.
- *
- *   This program 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
- *
- */
-
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/jiffies.h>
-#include <linux/slab.h>
-#include <linux/time.h>
-#include <linux/wait.h>
-#include <linux/moduleparam.h>
-#include <sound/core.h>
-#include <sound/control.h>
-#include <sound/tlv.h>
-#include <sound/pcm.h>
-#include <sound/rawmidi.h>
-#include <sound/initval.h>
-
-
-MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
-MODULE_DESCRIPTION("Dummy soundcard (/dev/null)");
-MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{ALSA,Dummy soundcard}}");
-
-#define MAX_PCM_DEVICES		4
-#define MAX_PCM_SUBSTREAMS	128
-#define MAX_MIDI_DEVICES	2
-
-
-/* defaults */
-#ifndef MAX_BUFFER_SIZE
-#define MAX_BUFFER_SIZE		(64*1024)
-#endif
-#ifndef MAX_PERIOD_SIZE
-#define MAX_PERIOD_SIZE		MAX_BUFFER_SIZE
-#endif
-#ifndef USE_FORMATS
-#define USE_FORMATS 		(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE)
-#endif
-#ifndef USE_RATE
-#define USE_RATE		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000
-#define USE_RATE_MIN		5500
-#define USE_RATE_MAX		48000
-#endif
-#ifndef USE_CHANNELS_MIN
-#define USE_CHANNELS_MIN 	1
-#endif
-#ifndef USE_CHANNELS_MAX
-#define USE_CHANNELS_MAX 	2
-#endif
-#ifndef USE_PERIODS_MIN
-#define USE_PERIODS_MIN 	10
-#endif
-#ifndef USE_PERIODS_MAX
-#define USE_PERIODS_MAX 	1024
-#endif
-#ifndef add_playback_constraints
-#define add_playback_constraints(x) 0
-#endif
-#ifndef add_capture_constraints
-#define add_capture_constraints(x) 0
-#endif
-
-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */
-static int enable[SNDRV_CARDS] = { 1,[1 ... (SNDRV_CARDS - 1)] = 0 };
-static int pcm_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1 };
-static int pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 128 };
-
-
-module_param_array(index, int, NULL, 0444);
-MODULE_PARM_DESC(index, "Index value for dummy soundcard.");
-module_param_array(id, charp, NULL, 0444);
-MODULE_PARM_DESC(id, "ID string for dummy soundcard.");
-module_param_array(enable, bool, NULL, 0444);
-MODULE_PARM_DESC(enable, "Enable this dummy soundcard.");
-module_param_array(pcm_devs, int, NULL, 0444);
-MODULE_PARM_DESC(pcm_devs, "PCM devices # (0-4) for dummy driver.");
-module_param_array(pcm_substreams, int, NULL, 0444);
-MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-64) for dummy driver.");
-
-static struct platform_device *devices[SNDRV_CARDS];
-static struct timer_list dummytimer;
-static int dummystarted = 0;
-static int dummyindex = 0;
-static spinlock_t dummylock;
-struct dummydpcm {
-	struct snd_pcm_substream *substream;
-	struct snd_dummy_pcm *dpcm;
-	int started;
-	int elapsed;
-};
-static struct dummydpcm dummydpcms[MAX_PCM_SUBSTREAMS];
-
-#define MIXER_ADDR_MASTER	0
-#define MIXER_ADDR_LINE		1
-#define MIXER_ADDR_MIC		2
-#define MIXER_ADDR_SYNTH	3
-#define MIXER_ADDR_CD		4
-#define MIXER_ADDR_LAST		4
-
-static void snd_card_dummy_pcm_timer_function(unsigned long data);
-struct snd_dummy {
-	struct snd_card *card;
-	struct snd_pcm *pcm;
-	spinlock_t mixer_lock;
-	int mixer_volume[MIXER_ADDR_LAST + 1][2];
-	int capture_source[MIXER_ADDR_LAST + 1][2];
-};
-
-struct snd_dummy_pcm {
-	struct snd_dummy *dummy;
-	//spinlock_t lock;
-	//struct timer_list timer;
-	unsigned int pcm_buffer_size;
-	unsigned int pcm_period_size;
-	unsigned int pcm_bps;		/* bytes per second */
-	unsigned int pcm_hz;		/* HZ */
-	unsigned int pcm_irq_pos;	/* IRQ position */
-	unsigned int pcm_buf_pos;	/* position in buffer */
-	struct snd_pcm_substream *substream;
-};
-
-
-static inline void snd_card_dummy_pcm_timer_start(struct snd_dummy_pcm *dpcm)
-{
-	int i;
-	int found = 0;
-
-	for (i = 0; i < dummyindex + 1; i++) {
-		//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
-			//printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
-		//}
-
-		if (dummydpcms[i].dpcm == dpcm) {
-			dummydpcms[i].started = 1;
-			found = 1;
-		}
-	}
-	//if (!found) {
-		//printk("skypopen: start, NOT found?\n");
-	//}
-}
-
-static inline void snd_card_dummy_pcm_timer_stop(struct snd_dummy_pcm *dpcm)
-{
-	int i;
-	int found = 0;
-
-	for (i = 0; i < dummyindex + 1; i++) {
-
-		//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
-			//printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
-		//}
-		if (dummydpcms[i].dpcm == dpcm) {
-			dummydpcms[i].started = 0;
-			dummydpcms[i].elapsed = 0;
-			found = 1;
-		}
-	}
-	if (!found) {
-	} else {
-	}
-}
-
-static int snd_card_dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_dummy_pcm *dpcm = runtime->private_data;
-	int err = 0;
-
-	spin_lock_bh(&dummylock);
-	switch (cmd) {
-	case SNDRV_PCM_TRIGGER_START:
-	case SNDRV_PCM_TRIGGER_RESUME:
-		snd_card_dummy_pcm_timer_start(dpcm);
-		break;
-	case SNDRV_PCM_TRIGGER_STOP:
-	case SNDRV_PCM_TRIGGER_SUSPEND:
-		snd_card_dummy_pcm_timer_stop(dpcm);
-		break;
-	default:
-		err = -EINVAL;
-		break;
-	}
-	spin_unlock_bh(&dummylock);
-	return 0;
-}
-
-static int snd_card_dummy_pcm_prepare(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_dummy_pcm *dpcm = runtime->private_data;
-	int bps;
-
-	bps = snd_pcm_format_width(runtime->format) * runtime->rate * runtime->channels / 8;
-
-	if (bps <= 0)
-		return -EINVAL;
-
-	dpcm->pcm_bps = bps;
-	dpcm->pcm_hz = HZ;
-	dpcm->pcm_buffer_size = snd_pcm_lib_buffer_bytes(substream);
-	dpcm->pcm_period_size = snd_pcm_lib_period_bytes(substream);
-	dpcm->pcm_irq_pos = 0;
-	dpcm->pcm_buf_pos = 0;
-	snd_pcm_format_set_silence(runtime->format, runtime->dma_area, bytes_to_samples(runtime, runtime->dma_bytes));
-
-	return 0;
-}
-
-static void snd_card_dummy_pcm_timer_function(unsigned long data)
-{
-	struct snd_dummy_pcm *dpcm = NULL;
-	int i;
-
-
-	dummytimer.expires = 1 + jiffies;
-	add_timer(&dummytimer);
-
-	//spin_lock_bh(&dummylock);
-	for (i = 0; i < dummyindex + 1; i++) {
-
-#if 0
-		if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
-			printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
-		}
-#endif
-		if (dummydpcms[i].started != 1)
-			continue;
-		dpcm = dummydpcms[i].dpcm;
-#if 0
-		if (dpcm == NULL) {
-			printk("dummy: timer_func %d %d NULL: continue\n", __LINE__, i);
-			continue;
-		}
-#endif
-		//spin_lock_bh(&dpcm->lock);
-		dpcm->pcm_irq_pos += dpcm->pcm_bps * 1;
-		dpcm->pcm_buf_pos += dpcm->pcm_bps * 1;
-		dpcm->pcm_buf_pos %= dpcm->pcm_buffer_size * dpcm->pcm_hz;
-		if (dpcm->pcm_irq_pos >= dpcm->pcm_period_size * dpcm->pcm_hz) {
-			dpcm->pcm_irq_pos %= dpcm->pcm_period_size * dpcm->pcm_hz;
-			//spin_unlock_bh(&dpcm->lock);
-			//snd_pcm_period_elapsed(dpcm->substream);
-			dummydpcms[i].elapsed = 1;
-		} else {
-			//spin_unlock_bh(&dpcm->lock);
-		}
-	}
-	//spin_unlock_bh(&dummylock);
-	for (i = 0; i < dummyindex + 1; i++) {
-
-#if 0
-		if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
-			printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
-		}
-#endif
-		if (dummydpcms[i].started != 1)
-			continue;
-		dpcm = dummydpcms[i].dpcm;
-#if 0
-		if (dpcm == NULL) {
-			printk("dummy: timer_func %d %d NULL: continue\n", __LINE__, i);
-			continue;
-		}
-#endif
-		if (dummydpcms[i].elapsed){
-			snd_pcm_period_elapsed(dpcm->substream);
-			dummydpcms[i].elapsed = 0;
-		}
-	}
-
-}
-
-static snd_pcm_uframes_t snd_card_dummy_pcm_pointer(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_dummy_pcm *dpcm = runtime->private_data;
-
-	//return bytes_to_frames(runtime, dpcm->pcm_buf_pos / dpcm->pcm_hz);
-	return (dpcm->pcm_buf_pos / dpcm->pcm_hz) / 2;
-}
-
-static struct snd_pcm_hardware snd_card_dummy_playback = {
-	.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_MMAP_VALID),
-	//.info = (SNDRV_PCM_INFO_INTERLEAVED),
-	.formats = USE_FORMATS,
-	.rates = USE_RATE,
-	.rate_min = USE_RATE_MIN,
-	.rate_max = USE_RATE_MAX,
-	.channels_min = USE_CHANNELS_MIN,
-	.channels_max = USE_CHANNELS_MAX,
-	.buffer_bytes_max = MAX_BUFFER_SIZE,
-	//.period_bytes_min = 256,
-	.period_bytes_min = 2048,
-	.period_bytes_max = MAX_PERIOD_SIZE,
-	.periods_min = USE_PERIODS_MIN,
-	.periods_max = USE_PERIODS_MAX,
-	.fifo_size = 0,
-};
-
-static struct snd_pcm_hardware snd_card_dummy_capture = {
-	.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_MMAP_VALID),
-	//.info = (SNDRV_PCM_INFO_INTERLEAVED),
-	.formats = USE_FORMATS,
-	.rates = USE_RATE,
-	.rate_min = USE_RATE_MIN,
-	.rate_max = USE_RATE_MAX,
-	.channels_min = USE_CHANNELS_MIN,
-	.channels_max = USE_CHANNELS_MAX,
-	.buffer_bytes_max = MAX_BUFFER_SIZE,
-	//.period_bytes_min = 256,
-	.period_bytes_min = 2048,
-	.period_bytes_max = MAX_PERIOD_SIZE,
-	.periods_min = USE_PERIODS_MIN,
-	.periods_max = USE_PERIODS_MAX,
-	.fifo_size = 0,
-};
-
-static void snd_card_dummy_runtime_free(struct snd_pcm_runtime *runtime)
-{
-	int i;
-
-	spin_lock_bh(&dummylock);
-
-	for (i = 0; i < dummyindex; i++) {
-
-		if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
-			printk("dummy, %s:%d, i=%d, dummyindex=%d \n", __FILE__, __LINE__, i, dummyindex);
-		}
-		if ((dummydpcms[i].dpcm == runtime->private_data)) {
-			dummydpcms[i].started = 0;
-			dummydpcms[i].elapsed = 0;
-		} else {
-		}
-	}
-
-	spin_unlock_bh(&dummylock);
-	kfree(runtime->private_data);
-}
-
-static int snd_card_dummy_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hw_params)
-{
-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_card_dummy_hw_free(struct snd_pcm_substream *substream)
-{
-	return snd_pcm_lib_free_pages(substream);
-}
-
-static struct snd_dummy_pcm *new_pcm_stream(struct snd_pcm_substream *substream)
-{
-	struct snd_dummy_pcm *dpcm;
-	int i;
-	int found = 0;
-
-	dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
-	if (!dpcm) {
-		printk("dummy, %s:%d, dummyindex=%d NO MEMORY!!!!\n", __FILE__, __LINE__, dummyindex);
-		return dpcm;
-	}
-	//init_timer(&dpcm->timer);
-	//spin_lock_init(&dpcm->lock);
-	dpcm->substream = substream;
-
-	spin_lock_bh(&dummylock);
-	for (i = 0; i < dummyindex; i++) {
-
-		//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
-			//printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
-		//}
-		if ((dummydpcms[i].substream == substream)) {
-			found = 1;
-			break;
-		}
-
-	}
-
-	if (!found) {
-
-		dummydpcms[dummyindex].substream = substream;
-		dummyindex++;
-	}
-
-
-
-	found = 0;
-	for (i = 0; i < dummyindex; i++) {
-
-		//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
-			//printk("dummy, %s:%d, i=%d, dummyindex=%d dpcm=%p\n", __FILE__, __LINE__, i, dummyindex, dpcm);
-		//}
-		if (dummydpcms[i].substream == substream) {
-			dummydpcms[i].dpcm = dpcm;
-			dummydpcms[i].started = 0;
-			dummydpcms[i].elapsed = 0;
-			found = 1;
-			break;
-		}
-
-	}
-
-	spin_unlock_bh(&dummylock);
-	//if (!found) {
-		//printk("skypopen dummyindex=%d NOT found????\n", dummyindex);
-	//}
-	return dpcm;
-}
-
-static int snd_card_dummy_playback_open(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_dummy_pcm *dpcm;
-	int err;
-
-	if ((dpcm = new_pcm_stream(substream)) == NULL)
-		return -ENOMEM;
-	runtime->private_data = dpcm;
-	/* makes the infrastructure responsible for freeing dpcm */
-	runtime->private_free = snd_card_dummy_runtime_free;
-	runtime->hw = snd_card_dummy_playback;
-	if (substream->pcm->device & 1) {
-		runtime->hw.info &= ~SNDRV_PCM_INFO_INTERLEAVED;
-		runtime->hw.info |= SNDRV_PCM_INFO_NONINTERLEAVED;
-	}
-	if (substream->pcm->device & 2)
-		runtime->hw.info &= ~(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID);
-	err = add_playback_constraints(runtime);
-	if (err < 0)
-		return err;
-
-	return 0;
-}
-
-static int snd_card_dummy_capture_open(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_dummy_pcm *dpcm;
-	int err;
-
-	if ((dpcm = new_pcm_stream(substream)) == NULL)
-		return -ENOMEM;
-	runtime->private_data = dpcm;
-	/* makes the infrastructure responsible for freeing dpcm */
-	runtime->private_free = snd_card_dummy_runtime_free;
-	runtime->hw = snd_card_dummy_capture;
-	if (substream->pcm->device == 1) {
-		runtime->hw.info &= ~SNDRV_PCM_INFO_INTERLEAVED;
-		runtime->hw.info |= SNDRV_PCM_INFO_NONINTERLEAVED;
-	}
-	if (substream->pcm->device & 2)
-		runtime->hw.info &= ~(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID);
-	err = add_capture_constraints(runtime);
-	if (err < 0)
-		return err;
-
-	return 0;
-}
-
-static int snd_card_dummy_playback_close(struct snd_pcm_substream *substream)
-{
-	snd_card_dummy_pcm_timer_stop(substream->private_data);
-	return 0;
-}
-
-static int snd_card_dummy_capture_close(struct snd_pcm_substream *substream)
-{
-	snd_card_dummy_pcm_timer_stop(substream->private_data);
-	return 0;
-}
-
-static struct snd_pcm_ops snd_card_dummy_playback_ops = {
-	.open = snd_card_dummy_playback_open,
-	.close = snd_card_dummy_playback_close,
-	.ioctl = snd_pcm_lib_ioctl,
-	.hw_params = snd_card_dummy_hw_params,
-	.hw_free = snd_card_dummy_hw_free,
-	.prepare = snd_card_dummy_pcm_prepare,
-	.trigger = snd_card_dummy_pcm_trigger,
-	.pointer = snd_card_dummy_pcm_pointer,
-};
-
-static struct snd_pcm_ops snd_card_dummy_capture_ops = {
-	.open = snd_card_dummy_capture_open,
-	.close = snd_card_dummy_capture_close,
-	.ioctl = snd_pcm_lib_ioctl,
-	.hw_params = snd_card_dummy_hw_params,
-	.hw_free = snd_card_dummy_hw_free,
-	.prepare = snd_card_dummy_pcm_prepare,
-	.trigger = snd_card_dummy_pcm_trigger,
-	.pointer = snd_card_dummy_pcm_pointer,
-};
-
-static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device, int substreams)
-{
-	struct snd_pcm *pcm;
-	int err;
-
-	err = snd_pcm_new(dummy->card, "Dummy PCM", device, substreams, substreams, &pcm);
-	if (err < 0)
-		return err;
-	dummy->pcm = pcm;
-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_card_dummy_playback_ops);
-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_card_dummy_capture_ops);
-	pcm->private_data = dummy;
-	pcm->info_flags = 0;
-	strcpy(pcm->name, "Dummy PCM");
-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, snd_dma_continuous_data(GFP_KERNEL), 128 * 1024, 1024 * 1024);
-
-	return 0;
-}
-
-#define DUMMY_VOLUME(xname, xindex, addr) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
-  .name = xname, .index = xindex, \
-  .info = snd_dummy_volume_info, \
-  .get = snd_dummy_volume_get, .put = snd_dummy_volume_put, \
-  .private_value = addr, \
-  .tlv = { .p = db_scale_dummy } }
-
-static int snd_dummy_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 2;
-	uinfo->value.integer.min = -50;
-	uinfo->value.integer.max = 100;
-	return 0;
-}
-
-static int snd_dummy_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
-	int addr = kcontrol->private_value;
-
-	if (in_irq())
-		printk("dummy: line %d we are in HARDWARE IRQ\n", __LINE__);
-	spin_lock_bh(&dummy->mixer_lock);
-	ucontrol->value.integer.value[0] = dummy->mixer_volume[addr][0];
-	ucontrol->value.integer.value[1] = dummy->mixer_volume[addr][1];
-	spin_unlock_bh(&dummy->mixer_lock);
-	return 0;
-}
-
-static int snd_dummy_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
-	int change, addr = kcontrol->private_value;
-	int left, right;
-
-	if (in_irq())
-		printk("dummy: line %d we are in HARDWARE IRQ\n", __LINE__);
-	left = ucontrol->value.integer.value[0];
-	if (left < -50)
-		left = -50;
-	if (left > 100)
-		left = 100;
-	right = ucontrol->value.integer.value[1];
-	if (right < -50)
-		right = -50;
-	if (right > 100)
-		right = 100;
-	spin_lock_bh(&dummy->mixer_lock);
-	change = dummy->mixer_volume[addr][0] != left || dummy->mixer_volume[addr][1] != right;
-	dummy->mixer_volume[addr][0] = left;
-	dummy->mixer_volume[addr][1] = right;
-	spin_unlock_bh(&dummy->mixer_lock);
-	return change;
-}
-
-static const DECLARE_TLV_DB_SCALE(db_scale_dummy, -4500, 30, 0);
-
-#define DUMMY_CAPSRC(xname, xindex, addr) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_dummy_capsrc_info, \
-  .get = snd_dummy_capsrc_get, .put = snd_dummy_capsrc_put, \
-  .private_value = addr }
-
-#define snd_dummy_capsrc_info	snd_ctl_boolean_stereo_info
-
-static int snd_dummy_capsrc_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
-	int addr = kcontrol->private_value;
-
-	if (in_irq())
-		printk("dummy: line %d we are in HARDWARE IRQ\n", __LINE__);
-	spin_lock_bh(&dummy->mixer_lock);
-	ucontrol->value.integer.value[0] = dummy->capture_source[addr][0];
-	ucontrol->value.integer.value[1] = dummy->capture_source[addr][1];
-	spin_unlock_bh(&dummy->mixer_lock);
-	return 0;
-}
-
-static int snd_dummy_capsrc_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
-	int change, addr = kcontrol->private_value;
-	int left, right;
-
-	if (in_irq())
-		printk("dummy: line %d we are in HARDWARE IRQ\n", __LINE__);
-	left = ucontrol->value.integer.value[0] & 1;
-	right = ucontrol->value.integer.value[1] & 1;
-	spin_lock_bh(&dummy->mixer_lock);
-	change = dummy->capture_source[addr][0] != left && dummy->capture_source[addr][1] != right;
-	dummy->capture_source[addr][0] = left;
-	dummy->capture_source[addr][1] = right;
-	spin_unlock_bh(&dummy->mixer_lock);
-	return change;
-}
-
-static struct snd_kcontrol_new snd_dummy_controls[] = {
-	DUMMY_VOLUME("Master Volume", 0, MIXER_ADDR_MASTER),
-	DUMMY_CAPSRC("Master Capture Switch", 0, MIXER_ADDR_MASTER),
-	DUMMY_VOLUME("Synth Volume", 0, MIXER_ADDR_SYNTH),
-	DUMMY_CAPSRC("Synth Capture Switch", 0, MIXER_ADDR_SYNTH),
-	DUMMY_VOLUME("Line Volume", 0, MIXER_ADDR_LINE),
-	DUMMY_CAPSRC("Line Capture Switch", 0, MIXER_ADDR_LINE),
-	DUMMY_VOLUME("Mic Volume", 0, MIXER_ADDR_MIC),
-	DUMMY_CAPSRC("Mic Capture Switch", 0, MIXER_ADDR_MIC),
-	DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_CD),
-	DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD)
-};
-
-static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)
-{
-	struct snd_card *card = dummy->card;
-	unsigned int idx;
-	int err;
-
-	return 0;					//XXX no mixer
-	spin_lock_init(&dummy->mixer_lock);
-	strcpy(card->mixername, "Dummy Mixer");
-
-	for (idx = 0; idx < ARRAY_SIZE(snd_dummy_controls); idx++) {
-		err = snd_ctl_add(card, snd_ctl_new1(&snd_dummy_controls[idx], dummy));
-		if (err < 0)
-			return err;
-	}
-	return 0;
-}
-
-static int __devinit snd_dummy_probe(struct platform_device *devptr)
-{
-	struct snd_card *card;
-	struct snd_dummy *dummy;
-	int idx, err;
-	int dev = devptr->id;
-
-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-	sizeof(struct snd_dummy), &card);
-	if (err < 0)
-	return err;
-
-	dummy = card->private_data;
-	dummy->card = card;
-	for (idx = 0; idx < MAX_PCM_DEVICES && idx < pcm_devs[dev]; idx++) {
-		if (pcm_substreams[dev] < 1)
-			pcm_substreams[dev] = 1;
-		if (pcm_substreams[dev] > MAX_PCM_SUBSTREAMS)
-			pcm_substreams[dev] = MAX_PCM_SUBSTREAMS;
-		err = snd_card_dummy_pcm(dummy, idx, pcm_substreams[dev]);
-		if (err < 0)
-			goto __nodev;
-	}
-	//err = snd_card_dummy_new_mixer(dummy);
-	//if (err < 0)
-		//goto __nodev;
-	strcpy(card->driver, "Dummy");
-	strcpy(card->shortname, "Dummy");
-	sprintf(card->longname, "Dummy %i", dev + 1);
-
-	snd_card_set_dev(card, &devptr->dev);
-
-	err = snd_card_register(card);
-	if (err == 0) {
-		platform_set_drvdata(devptr, card);
-		return 0;
-	}
-  __nodev:
-	snd_card_free(card);
-	return err;
-}
-
-static int __devexit snd_dummy_remove(struct platform_device *devptr)
-{
-
-	del_timer(&dummytimer);
-	snd_card_free(platform_get_drvdata(devptr));
-	platform_set_drvdata(devptr, NULL);
-	return 0;
-}
-
-#ifdef CONFIG_PM
-static int snd_dummy_suspend(struct platform_device *pdev, pm_message_t state)
-{
-	struct snd_card *card = platform_get_drvdata(pdev);
-	struct snd_dummy *dummy = card->private_data;
-
-	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-	snd_pcm_suspend_all(dummy->pcm);
-	return 0;
-}
-
-static int snd_dummy_resume(struct platform_device *pdev)
-{
-	struct snd_card *card = platform_get_drvdata(pdev);
-
-	snd_power_change_state(card, SNDRV_CTL_POWER_D0);
-	return 0;
-}
-#endif
-
-#define SND_DUMMY_DRIVER	"snd_dummy"
-
-static struct platform_driver snd_dummy_driver = {
-	.probe = snd_dummy_probe,
-	.remove = __devexit_p(snd_dummy_remove),
-#ifdef CONFIG_PM
-	.suspend = snd_dummy_suspend,
-	.resume = snd_dummy_resume,
-#endif
-	.driver = {
-			   .name = SND_DUMMY_DRIVER},
-};
-
-static void snd_dummy_unregister_all(void)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(devices); ++i)
-		platform_device_unregister(devices[i]);
-	platform_driver_unregister(&snd_dummy_driver);
-}
-
-static int __init alsa_card_dummy_init(void)
-{
-	int i, cards, err;
-
-	err = platform_driver_register(&snd_dummy_driver);
-	if (err < 0)
-		return err;
-
-	if (!dummystarted) {
-		dummystarted = 1;
-		spin_lock_init(&dummylock);
-
-		spin_lock_bh(&dummylock);
-		for (i = 0; i < MAX_PCM_SUBSTREAMS; i++) {
-
-			//if (i > MAX_PCM_SUBSTREAMS || dummyindex > MAX_PCM_SUBSTREAMS) {
-				//printk("dummy, %s:%d, i=%d, dummyindex=%d \n", __FILE__, __LINE__, i, dummyindex);
-			//}
-			dummydpcms[i].substream = NULL;
-			dummydpcms[i].dpcm = NULL;
-			dummydpcms[i].started = 0;
-			dummydpcms[i].elapsed = 0;
-		}
-		init_timer(&dummytimer);
-		dummytimer.data = (unsigned long) &dummydpcms;
-		dummytimer.function = snd_card_dummy_pcm_timer_function;
-		dummytimer.expires = 1 + jiffies;
-		add_timer(&dummytimer);
-		printk("snd-dummy skypopen driver version: 9, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
-		spin_unlock_bh(&dummylock);
-	}
-
-
-	cards = 0;
-	for (i = 0; i < SNDRV_CARDS; i++) {
-		struct platform_device *device;
-		if (!enable[i])
-			continue;
-		device = platform_device_register_simple(SND_DUMMY_DRIVER, i, NULL, 0);
-		if (IS_ERR(device))
-			continue;
-		if (!platform_get_drvdata(device)) {
-			platform_device_unregister(device);
-			continue;
-		}
-		devices[i] = device;
-		cards++;
-	}
-	if (!cards) {
-#ifdef MODULE
-		printk(KERN_ERR "Dummy soundcard not found or device busy\n");
-#endif
-		snd_dummy_unregister_all();
-		return -ENODEV;
-	}
-	return 0;
-}
-
-static void __exit alsa_card_dummy_exit(void)
-{
-	del_timer(&dummytimer);
-	snd_dummy_unregister_all();
-}
-
-module_init(alsa_card_dummy_init)
-	module_exit(alsa_card_dummy_exit)
diff --git a/src/mod/endpoints/mod_skypopen/old-stuff/pcm_lib.c b/src/mod/endpoints/mod_skypopen/old-stuff/pcm_lib.c
deleted file mode 100644
index 3155bf05e9..0000000000
--- a/src/mod/endpoints/mod_skypopen/old-stuff/pcm_lib.c
+++ /dev/null
@@ -1,2182 +0,0 @@
-/*
- *  Digital Audio (PCM) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *                   Abramo Bagnara <abramo@alsa-project.org>
- *
- *
- *   This program 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.
- *
- *   This program 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
- *
- */
-
-#include <linux/slab.h>
-#include <linux/time.h>
-#include <linux/math64.h>
-#include <sound/core.h>
-#include <sound/control.h>
-#include <sound/info.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/timer.h>
-
-/*
- * fill ring buffer with silence
- * runtime->silence_start: starting pointer to silence area
- * runtime->silence_filled: size filled with silence
- * runtime->silence_threshold: threshold from application
- * runtime->silence_size: maximal size from application
- *
- * when runtime->silence_size >= runtime->boundary - fill processed area with silence immediately
- */
-void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_uframes_t new_hw_ptr)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_uframes_t frames, ofs, transfer;
-
-	if (runtime->silence_size < runtime->boundary) {
-		snd_pcm_sframes_t noise_dist, n;
-		if (runtime->silence_start != runtime->control->appl_ptr) {
-			n = runtime->control->appl_ptr - runtime->silence_start;
-			if (n < 0)
-				n += runtime->boundary;
-			if ((snd_pcm_uframes_t)n < runtime->silence_filled)
-				runtime->silence_filled -= n;
-			else
-				runtime->silence_filled = 0;
-			runtime->silence_start = runtime->control->appl_ptr;
-		}
-		if (runtime->silence_filled >= runtime->buffer_size)
-			return;
-		noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;
-		if (noise_dist >= (snd_pcm_sframes_t) runtime->silence_threshold)
-			return;
-		frames = runtime->silence_threshold - noise_dist;
-		if (frames > runtime->silence_size)
-			frames = runtime->silence_size;
-	} else {
-		if (new_hw_ptr == ULONG_MAX) {	/* initialization */
-			snd_pcm_sframes_t avail = snd_pcm_playback_hw_avail(runtime);
-			runtime->silence_filled = avail > 0 ? avail : 0;
-			runtime->silence_start = (runtime->status->hw_ptr +
-						  runtime->silence_filled) %
-						 runtime->boundary;
-		} else {
-			ofs = runtime->status->hw_ptr;
-			frames = new_hw_ptr - ofs;
-			if ((snd_pcm_sframes_t)frames < 0)
-				frames += runtime->boundary;
-			runtime->silence_filled -= frames;
-			if ((snd_pcm_sframes_t)runtime->silence_filled < 0) {
-				runtime->silence_filled = 0;
-				runtime->silence_start = new_hw_ptr;
-			} else {
-				runtime->silence_start = ofs;
-			}
-		}
-		frames = runtime->buffer_size - runtime->silence_filled;
-	}
-	if (snd_BUG_ON(frames > runtime->buffer_size))
-		return;
-	if (frames == 0)
-		return;
-	ofs = runtime->silence_start % runtime->buffer_size;
-	while (frames > 0) {
-		transfer = ofs + frames > runtime->buffer_size ? runtime->buffer_size - ofs : frames;
-		if (runtime->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED ||
-		    runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {
-			if (substream->ops->silence) {
-				int err;
-				err = substream->ops->silence(substream, -1, ofs, transfer);
-				snd_BUG_ON(err < 0);
-			} else {
-				char *hwbuf = runtime->dma_area + frames_to_bytes(runtime, ofs);
-				snd_pcm_format_set_silence(runtime->format, hwbuf, transfer * runtime->channels);
-			}
-		} else {
-			unsigned int c;
-			unsigned int channels = runtime->channels;
-			if (substream->ops->silence) {
-				for (c = 0; c < channels; ++c) {
-					int err;
-					err = substream->ops->silence(substream, c, ofs, transfer);
-					snd_BUG_ON(err < 0);
-				}
-			} else {
-				size_t dma_csize = runtime->dma_bytes / channels;
-				for (c = 0; c < channels; ++c) {
-					char *hwbuf = runtime->dma_area + (c * dma_csize) + samples_to_bytes(runtime, ofs);
-					snd_pcm_format_set_silence(runtime->format, hwbuf, transfer);
-				}
-			}
-		}
-		runtime->silence_filled += transfer;
-		frames -= transfer;
-		ofs = 0;
-	}
-}
-
-static void pcm_debug_name(struct snd_pcm_substream *substream,
-			   char *name, size_t len)
-{
-	snprintf(name, len, "pcmC%dD%d%c:%d",
-		 substream->pcm->card->number,
-		 substream->pcm->device,
-		 substream->stream ? 'c' : 'p',
-		 substream->number);
-}
-
-#define XRUN_DEBUG_BASIC	(1<<0)
-#define XRUN_DEBUG_STACK	(1<<1)	/* dump also stack */
-#define XRUN_DEBUG_JIFFIESCHECK	(1<<2)	/* do jiffies check */
-#define XRUN_DEBUG_PERIODUPDATE	(1<<3)	/* full period update info */
-#define XRUN_DEBUG_HWPTRUPDATE	(1<<4)	/* full hwptr update info */
-#define XRUN_DEBUG_LOG		(1<<5)	/* show last 10 positions on err */
-#define XRUN_DEBUG_LOGONCE	(1<<6)	/* do above only once */
-
-#ifdef CONFIG_SND_PCM_XRUN_DEBUG
-
-#define xrun_debug(substream, mask) \
-			((substream)->pstr->xrun_debug & (mask))
-#else
-#define xrun_debug(substream, mask)	0
-#endif
-
-#define dump_stack_on_xrun(substream) do {			\
-		if (xrun_debug(substream, XRUN_DEBUG_STACK))	\
-			dump_stack();				\
-	} while (0)
-
-static void xrun(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-
-	if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)
-		snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp);
-	snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
-	if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {
-		char name[16];
-		pcm_debug_name(substream, name, sizeof(name));
-		snd_printd(KERN_DEBUG "XRUN: %s\n", name);
-		dump_stack_on_xrun(substream);
-	}
-}
-
-#ifdef CONFIG_SND_PCM_XRUN_DEBUG
-#define hw_ptr_error(substream, fmt, args...)				\
-	do {								\
-		if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {		\
-			xrun_log_show(substream);			\
-			if (printk_ratelimit()) {			\
-				snd_printd("PCM: " fmt, ##args);	\
-			}						\
-			dump_stack_on_xrun(substream);			\
-		}							\
-	} while (0)
-
-#define XRUN_LOG_CNT	10
-
-struct hwptr_log_entry {
-	unsigned long jiffies;
-	snd_pcm_uframes_t pos;
-	snd_pcm_uframes_t period_size;
-	snd_pcm_uframes_t buffer_size;
-	snd_pcm_uframes_t old_hw_ptr;
-	snd_pcm_uframes_t hw_ptr_base;
-};
-
-struct snd_pcm_hwptr_log {
-	unsigned int idx;
-	unsigned int hit: 1;
-	struct hwptr_log_entry entries[XRUN_LOG_CNT];
-};
-
-static void xrun_log(struct snd_pcm_substream *substream,
-		     snd_pcm_uframes_t pos)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_pcm_hwptr_log *log = runtime->hwptr_log;
-	struct hwptr_log_entry *entry;
-
-	if (log == NULL) {
-		log = kzalloc(sizeof(*log), GFP_ATOMIC);
-		if (log == NULL)
-			return;
-		runtime->hwptr_log = log;
-	} else {
-		if (xrun_debug(substream, XRUN_DEBUG_LOGONCE) && log->hit)
-			return;
-	}
-	entry = &log->entries[log->idx];
-	entry->jiffies = jiffies;
-	entry->pos = pos;
-	entry->period_size = runtime->period_size;
-	entry->buffer_size = runtime->buffer_size;;
-	entry->old_hw_ptr = runtime->status->hw_ptr;
-	entry->hw_ptr_base = runtime->hw_ptr_base;
-	log->idx = (log->idx + 1) % XRUN_LOG_CNT;
-}
-
-static void xrun_log_show(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_hwptr_log *log = substream->runtime->hwptr_log;
-	struct hwptr_log_entry *entry;
-	char name[16];
-	unsigned int idx;
-	int cnt;
-
-	if (log == NULL)
-		return;
-	if (xrun_debug(substream, XRUN_DEBUG_LOGONCE) && log->hit)
-		return;
-	pcm_debug_name(substream, name, sizeof(name));
-	for (cnt = 0, idx = log->idx; cnt < XRUN_LOG_CNT; cnt++) {
-		entry = &log->entries[idx];
-		if (entry->period_size == 0)
-			break;
-		snd_printd("hwptr log: %s: j=%lu, pos=%ld/%ld/%ld, "
-			   "hwptr=%ld/%ld\n",
-			   name, entry->jiffies, (unsigned long)entry->pos,
-			   (unsigned long)entry->period_size,
-			   (unsigned long)entry->buffer_size,
-			   (unsigned long)entry->old_hw_ptr,
-			   (unsigned long)entry->hw_ptr_base);
-		idx++;
-		idx %= XRUN_LOG_CNT;
-	}
-	log->hit = 1;
-}
-
-#else /* ! CONFIG_SND_PCM_XRUN_DEBUG */
-
-#define hw_ptr_error(substream, fmt, args...) do { } while (0)
-#define xrun_log(substream, pos)	do { } while (0)
-#define xrun_log_show(substream)	do { } while (0)
-
-#endif
-
-int snd_pcm_update_state(struct snd_pcm_substream *substream,
-			 struct snd_pcm_runtime *runtime)
-{
-	snd_pcm_uframes_t avail;
-
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-		avail = snd_pcm_playback_avail(runtime);
-	else
-		avail = snd_pcm_capture_avail(runtime);
-	if (avail > runtime->avail_max)
-		runtime->avail_max = avail;
-	if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
-		if (avail >= runtime->buffer_size) {
-			snd_pcm_drain_done(substream);
-			return -EPIPE;
-		}
-	} else {
-		if (avail >= runtime->stop_threshold) {
-			xrun(substream);
-			return -EPIPE;
-		}
-	}
-	if (avail >= runtime->control->avail_min)
-		wake_up(runtime->twake ? &runtime->tsleep : &runtime->sleep);
-	return 0;
-}
-
-static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
-				  unsigned int in_interrupt)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_uframes_t pos;
-	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_base;
-	snd_pcm_sframes_t hdelta, delta;
-	unsigned long jdelta;
-
-	old_hw_ptr = runtime->status->hw_ptr;
-	pos = substream->ops->pointer(substream);
-	if (pos == SNDRV_PCM_POS_XRUN) {
-		xrun(substream);
-		return -EPIPE;
-	}
-	if (pos >= runtime->buffer_size) {
-		if (printk_ratelimit()) {
-			char name[16];
-			pcm_debug_name(substream, name, sizeof(name));
-			xrun_log_show(substream);
-			snd_printd(KERN_ERR  "BUG: %s, pos = %ld, "
-				   "buffer size = %ld, period size = %ld\n",
-				   name, pos, runtime->buffer_size,
-				   runtime->period_size);
-		}
-		pos = 0;
-	}
-	pos -= pos % runtime->min_align;
-	if (xrun_debug(substream, XRUN_DEBUG_LOG))
-		xrun_log(substream, pos);
-	hw_base = runtime->hw_ptr_base;
-	new_hw_ptr = hw_base + pos;
-	if (in_interrupt) {
-		/* we know that one period was processed */
-		/* delta = "expected next hw_ptr" for in_interrupt != 0 */
-		delta = runtime->hw_ptr_interrupt + runtime->period_size;
-		if (delta > new_hw_ptr) {
-			hw_base += runtime->buffer_size;
-			if (hw_base >= runtime->boundary)
-				hw_base = 0;
-			new_hw_ptr = hw_base + pos;
-			goto __delta;
-		}
-	}
-	/* new_hw_ptr might be lower than old_hw_ptr in case when */
-	/* pointer crosses the end of the ring buffer */
-	if (new_hw_ptr < old_hw_ptr) {
-		hw_base += runtime->buffer_size;
-		if (hw_base >= runtime->boundary)
-			hw_base = 0;
-		new_hw_ptr = hw_base + pos;
-	}
-      __delta:
-	delta = (new_hw_ptr - old_hw_ptr) % runtime->boundary;
-	if (xrun_debug(substream, in_interrupt ?
-			XRUN_DEBUG_PERIODUPDATE : XRUN_DEBUG_HWPTRUPDATE)) {
-		char name[16];
-		pcm_debug_name(substream, name, sizeof(name));
-		snd_printd("%s_update: %s: pos=%u/%u/%u, "
-			   "hwptr=%ld/%ld/%ld/%ld\n",
-			   in_interrupt ? "period" : "hwptr",
-			   name,
-			   (unsigned int)pos,
-			   (unsigned int)runtime->period_size,
-			   (unsigned int)runtime->buffer_size,
-			   (unsigned long)delta,
-			   (unsigned long)old_hw_ptr,
-			   (unsigned long)new_hw_ptr,
-			   (unsigned long)runtime->hw_ptr_base);
-	}
-	/* something must be really wrong */
-	if (delta >= runtime->buffer_size + runtime->period_size) {
-		hw_ptr_error(substream,
-			       "Unexpected hw_pointer value %s"
-			       "(stream=%i, pos=%ld, new_hw_ptr=%ld, "
-			       "old_hw_ptr=%ld)\n",
-				     in_interrupt ? "[Q] " : "[P]",
-				     substream->stream, (long)pos,
-				     (long)new_hw_ptr, (long)old_hw_ptr);
-		return 0;
-	}
-
-	/* Do jiffies check only in xrun_debug mode */
-	if (!xrun_debug(substream, XRUN_DEBUG_JIFFIESCHECK))
-		goto no_jiffies_check;
-
-	/* Skip the jiffies check for hardwares with BATCH flag.
-	 * Such hardware usually just increases the position at each IRQ,
-	 * thus it can't give any strange position.
-	 */
-	if (runtime->hw.info & SNDRV_PCM_INFO_BATCH)
-		goto no_jiffies_check;
-	hdelta = delta;
-	if (hdelta < runtime->delay)
-		goto no_jiffies_check;
-	hdelta -= runtime->delay;
-	jdelta = jiffies - runtime->hw_ptr_jiffies;
-	if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) {
-		delta = jdelta /
-			(((runtime->period_size * HZ) / runtime->rate)
-								+ HZ/100);
-		/* move new_hw_ptr according jiffies not pos variable */
-		new_hw_ptr = old_hw_ptr;
-		hw_base = delta;
-		/* use loop to avoid checks for delta overflows */
-		/* the delta value is small or zero in most cases */
-		while (delta > 0) {
-			new_hw_ptr += runtime->period_size;
-			if (new_hw_ptr >= runtime->boundary)
-				new_hw_ptr -= runtime->boundary;
-			delta--;
-		}
-		/* align hw_base to buffer_size */
-		hw_ptr_error(substream,
-			     "hw_ptr skipping! %s"
-			     "(pos=%ld, delta=%ld, period=%ld, "
-			     "jdelta=%lu/%lu/%lu, hw_ptr=%ld/%ld)\n",
-			     in_interrupt ? "[Q] " : "",
-			     (long)pos, (long)hdelta,
-			     (long)runtime->period_size, jdelta,
-			     ((hdelta * HZ) / runtime->rate), hw_base,
-			     (unsigned long)old_hw_ptr,
-			     (unsigned long)new_hw_ptr);
-		/* reset values to proper state */
-		delta = 0;
-		hw_base = new_hw_ptr - (new_hw_ptr % runtime->buffer_size);
-	}
- no_jiffies_check:
-	if (delta > runtime->period_size + runtime->period_size / 2) {
-		hw_ptr_error(substream,
-			     "Lost interrupts? %s"
-			     "(stream=%i, delta=%ld, new_hw_ptr=%ld, "
-			     "old_hw_ptr=%ld)\n",
-			     in_interrupt ? "[Q] " : "",
-			     substream->stream, (long)delta,
-			     (long)new_hw_ptr,
-			     (long)old_hw_ptr);
-	}
-
-	if (runtime->status->hw_ptr == new_hw_ptr)
-		return 0;
-
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
-	    runtime->silence_size > 0)
-		snd_pcm_playback_silence(substream, new_hw_ptr);
-
-	if (in_interrupt) {
-		runtime->hw_ptr_interrupt = new_hw_ptr -
-				(new_hw_ptr % runtime->period_size);
-	}
-	runtime->hw_ptr_base = hw_base;
-	runtime->status->hw_ptr = new_hw_ptr;
-	runtime->hw_ptr_jiffies = jiffies;
-	if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)
-		snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp);
-
-	return snd_pcm_update_state(substream, runtime);
-}
-
-/* CAUTION: call it with irq disabled */
-int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)
-{
-	return snd_pcm_update_hw_ptr0(substream, 0);
-}
-
-/**
- * snd_pcm_set_ops - set the PCM operators
- * @pcm: the pcm instance
- * @direction: stream direction, SNDRV_PCM_STREAM_XXX
- * @ops: the operator table
- *
- * Sets the given PCM operators to the pcm instance.
- */
-void snd_pcm_set_ops(struct snd_pcm *pcm, int direction, struct snd_pcm_ops *ops)
-{
-	struct snd_pcm_str *stream = &pcm->streams[direction];
-	struct snd_pcm_substream *substream;
-
-	for (substream = stream->substream; substream != NULL; substream = substream->next)
-		substream->ops = ops;
-}
-
-EXPORT_SYMBOL(snd_pcm_set_ops);
-
-/**
- * snd_pcm_sync - set the PCM sync id
- * @substream: the pcm substream
- *
- * Sets the PCM sync identifier for the card.
- */
-void snd_pcm_set_sync(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-
-	runtime->sync.id32[0] = substream->pcm->card->number;
-	runtime->sync.id32[1] = -1;
-	runtime->sync.id32[2] = -1;
-	runtime->sync.id32[3] = -1;
-}
-
-EXPORT_SYMBOL(snd_pcm_set_sync);
-
-/*
- *  Standard ioctl routine
- */
-
-static inline unsigned int div32(unsigned int a, unsigned int b,
-				 unsigned int *r)
-{
-	if (b == 0) {
-		*r = 0;
-		return UINT_MAX;
-	}
-	*r = a % b;
-	return a / b;
-}
-
-static inline unsigned int div_down(unsigned int a, unsigned int b)
-{
-	if (b == 0)
-		return UINT_MAX;
-	return a / b;
-}
-
-static inline unsigned int div_up(unsigned int a, unsigned int b)
-{
-	unsigned int r;
-	unsigned int q;
-	if (b == 0)
-		return UINT_MAX;
-	q = div32(a, b, &r);
-	if (r)
-		++q;
-	return q;
-}
-
-static inline unsigned int mul(unsigned int a, unsigned int b)
-{
-	if (a == 0)
-		return 0;
-	if (div_down(UINT_MAX, a) < b)
-		return UINT_MAX;
-	return a * b;
-}
-
-static inline unsigned int muldiv32(unsigned int a, unsigned int b,
-				    unsigned int c, unsigned int *r)
-{
-	uint64_t n = (u_int64_t) a * b;
-	if (c == 0) {
-		snd_BUG_ON(!n);
-		*r = 0;
-		return UINT_MAX;
-	}
-	n = div_u64_rem(n, c, r);
-	if (n >= UINT_MAX) {
-		*r = 0;
-		return UINT_MAX;
-	}
-	return n;
-}
-
-/**
- * snd_interval_refine - refine the interval value of configurator
- * @i: the interval value to refine
- * @v: the interval value to refer to
- *
- * Refines the interval value with the reference value.
- * The interval is changed to the range satisfying both intervals.
- * The interval status (min, max, integer, etc.) are evaluated.
- *
- * Returns non-zero if the value is changed, zero if not changed.
- */
-int snd_interval_refine(struct snd_interval *i, const struct snd_interval *v)
-{
-	int changed = 0;
-	if (snd_BUG_ON(snd_interval_empty(i)))
-		return -EINVAL;
-	if (i->min < v->min) {
-		i->min = v->min;
-		i->openmin = v->openmin;
-		changed = 1;
-	} else if (i->min == v->min && !i->openmin && v->openmin) {
-		i->openmin = 1;
-		changed = 1;
-	}
-	if (i->max > v->max) {
-		i->max = v->max;
-		i->openmax = v->openmax;
-		changed = 1;
-	} else if (i->max == v->max && !i->openmax && v->openmax) {
-		i->openmax = 1;
-		changed = 1;
-	}
-	if (!i->integer && v->integer) {
-		i->integer = 1;
-		changed = 1;
-	}
-	if (i->integer) {
-		if (i->openmin) {
-			i->min++;
-			i->openmin = 0;
-		}
-		if (i->openmax) {
-			i->max--;
-			i->openmax = 0;
-		}
-	} else if (!i->openmin && !i->openmax && i->min == i->max)
-		i->integer = 1;
-	if (snd_interval_checkempty(i)) {
-		snd_interval_none(i);
-		return -EINVAL;
-	}
-	return changed;
-}
-
-EXPORT_SYMBOL(snd_interval_refine);
-
-static int snd_interval_refine_first(struct snd_interval *i)
-{
-	if (snd_BUG_ON(snd_interval_empty(i)))
-		return -EINVAL;
-	if (snd_interval_single(i))
-		return 0;
-	i->max = i->min;
-	i->openmax = i->openmin;
-	if (i->openmax)
-		i->max++;
-	return 1;
-}
-
-static int snd_interval_refine_last(struct snd_interval *i)
-{
-	if (snd_BUG_ON(snd_interval_empty(i)))
-		return -EINVAL;
-	if (snd_interval_single(i))
-		return 0;
-	i->min = i->max;
-	i->openmin = i->openmax;
-	if (i->openmin)
-		i->min--;
-	return 1;
-}
-
-void snd_interval_mul(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c)
-{
-	if (a->empty || b->empty) {
-		snd_interval_none(c);
-		return;
-	}
-	c->empty = 0;
-	c->min = mul(a->min, b->min);
-	c->openmin = (a->openmin || b->openmin);
-	c->max = mul(a->max,  b->max);
-	c->openmax = (a->openmax || b->openmax);
-	c->integer = (a->integer && b->integer);
-}
-
-/**
- * snd_interval_div - refine the interval value with division
- * @a: dividend
- * @b: divisor
- * @c: quotient
- *
- * c = a / b
- *
- * Returns non-zero if the value is changed, zero if not changed.
- */
-void snd_interval_div(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c)
-{
-	unsigned int r;
-	if (a->empty || b->empty) {
-		snd_interval_none(c);
-		return;
-	}
-	c->empty = 0;
-	c->min = div32(a->min, b->max, &r);
-	c->openmin = (r || a->openmin || b->openmax);
-	if (b->min > 0) {
-		c->max = div32(a->max, b->min, &r);
-		if (r) {
-			c->max++;
-			c->openmax = 1;
-		} else
-			c->openmax = (a->openmax || b->openmin);
-	} else {
-		c->max = UINT_MAX;
-		c->openmax = 0;
-	}
-	c->integer = 0;
-}
-
-/**
- * snd_interval_muldivk - refine the interval value
- * @a: dividend 1
- * @b: dividend 2
- * @k: divisor (as integer)
- * @c: result
-  *
- * c = a * b / k
- *
- * Returns non-zero if the value is changed, zero if not changed.
- */
-void snd_interval_muldivk(const struct snd_interval *a, const struct snd_interval *b,
-		      unsigned int k, struct snd_interval *c)
-{
-	unsigned int r;
-	if (a->empty || b->empty) {
-		snd_interval_none(c);
-		return;
-	}
-	c->empty = 0;
-	c->min = muldiv32(a->min, b->min, k, &r);
-	c->openmin = (r || a->openmin || b->openmin);
-	c->max = muldiv32(a->max, b->max, k, &r);
-	if (r) {
-		c->max++;
-		c->openmax = 1;
-	} else
-		c->openmax = (a->openmax || b->openmax);
-	c->integer = 0;
-}
-
-/**
- * snd_interval_mulkdiv - refine the interval value
- * @a: dividend 1
- * @k: dividend 2 (as integer)
- * @b: divisor
- * @c: result
- *
- * c = a * k / b
- *
- * Returns non-zero if the value is changed, zero if not changed.
- */
-void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,
-		      const struct snd_interval *b, struct snd_interval *c)
-{
-	unsigned int r;
-	if (a->empty || b->empty) {
-		snd_interval_none(c);
-		return;
-	}
-	c->empty = 0;
-	c->min = muldiv32(a->min, k, b->max, &r);
-	c->openmin = (r || a->openmin || b->openmax);
-	if (b->min > 0) {
-		c->max = muldiv32(a->max, k, b->min, &r);
-		if (r) {
-			c->max++;
-			c->openmax = 1;
-		} else
-			c->openmax = (a->openmax || b->openmin);
-	} else {
-		c->max = UINT_MAX;
-		c->openmax = 0;
-	}
-	c->integer = 0;
-}
-
-/* ---- */
-
-
-/**
- * snd_interval_ratnum - refine the interval value
- * @i: interval to refine
- * @rats_count: number of ratnum_t
- * @rats: ratnum_t array
- * @nump: pointer to store the resultant numerator
- * @denp: pointer to store the resultant denominator
- *
- * Returns non-zero if the value is changed, zero if not changed.
- */
-int snd_interval_ratnum(struct snd_interval *i,
-			unsigned int rats_count, struct snd_ratnum *rats,
-			unsigned int *nump, unsigned int *denp)
-{
-	unsigned int best_num, best_den;
-	int best_diff;
-	unsigned int k;
-	struct snd_interval t;
-	int err;
-	unsigned int result_num, result_den;
-	int result_diff;
-
-	best_num = best_den = best_diff = 0;
-	for (k = 0; k < rats_count; ++k) {
-		unsigned int num = rats[k].num;
-		unsigned int den;
-		unsigned int q = i->min;
-		int diff;
-		if (q == 0)
-			q = 1;
-		den = div_up(num, q);
-		if (den < rats[k].den_min)
-			continue;
-		if (den > rats[k].den_max)
-			den = rats[k].den_max;
-		else {
-			unsigned int r;
-			r = (den - rats[k].den_min) % rats[k].den_step;
-			if (r != 0)
-				den -= r;
-		}
-		diff = num - q * den;
-		if (diff < 0)
-			diff = -diff;
-		if (best_num == 0 ||
-		    diff * best_den < best_diff * den) {
-			best_diff = diff;
-			best_den = den;
-			best_num = num;
-		}
-	}
-	if (best_den == 0) {
-		i->empty = 1;
-		return -EINVAL;
-	}
-	t.min = div_down(best_num, best_den);
-	t.openmin = !!(best_num % best_den);
-
-	result_num = best_num;
-	result_diff = best_diff;
-	result_den = best_den;
-	best_num = best_den = best_diff = 0;
-	for (k = 0; k < rats_count; ++k) {
-		unsigned int num = rats[k].num;
-		unsigned int den;
-		unsigned int q = i->max;
-		int diff;
-		if (q == 0) {
-			i->empty = 1;
-			return -EINVAL;
-		}
-		den = div_down(num, q);
-		if (den > rats[k].den_max)
-			continue;
-		if (den < rats[k].den_min)
-			den = rats[k].den_min;
-		else {
-			unsigned int r;
-			r = (den - rats[k].den_min) % rats[k].den_step;
-			if (r != 0)
-				den += rats[k].den_step - r;
-		}
-		diff = q * den - num;
-		if (diff < 0)
-			diff = -diff;
-		if (best_num == 0 ||
-		    diff * best_den < best_diff * den) {
-			best_diff = diff;
-			best_den = den;
-			best_num = num;
-		}
-	}
-	if (best_den == 0) {
-		i->empty = 1;
-		return -EINVAL;
-	}
-	t.max = div_up(best_num, best_den);
-	t.openmax = !!(best_num % best_den);
-	t.integer = 0;
-	err = snd_interval_refine(i, &t);
-	if (err < 0)
-		return err;
-
-	if (snd_interval_single(i)) {
-		if (best_diff * result_den < result_diff * best_den) {
-			result_num = best_num;
-			result_den = best_den;
-		}
-		if (nump)
-			*nump = result_num;
-		if (denp)
-			*denp = result_den;
-	}
-	return err;
-}
-
-EXPORT_SYMBOL(snd_interval_ratnum);
-
-/**
- * snd_interval_ratden - refine the interval value
- * @i: interval to refine
- * @rats_count: number of struct ratden
- * @rats: struct ratden array
- * @nump: pointer to store the resultant numerator
- * @denp: pointer to store the resultant denominator
- *
- * Returns non-zero if the value is changed, zero if not changed.
- */
-static int snd_interval_ratden(struct snd_interval *i,
-			       unsigned int rats_count, struct snd_ratden *rats,
-			       unsigned int *nump, unsigned int *denp)
-{
-	unsigned int best_num, best_diff, best_den;
-	unsigned int k;
-	struct snd_interval t;
-	int err;
-
-	best_num = best_den = best_diff = 0;
-	for (k = 0; k < rats_count; ++k) {
-		unsigned int num;
-		unsigned int den = rats[k].den;
-		unsigned int q = i->min;
-		int diff;
-		num = mul(q, den);
-		if (num > rats[k].num_max)
-			continue;
-		if (num < rats[k].num_min)
-			num = rats[k].num_max;
-		else {
-			unsigned int r;
-			r = (num - rats[k].num_min) % rats[k].num_step;
-			if (r != 0)
-				num += rats[k].num_step - r;
-		}
-		diff = num - q * den;
-		if (best_num == 0 ||
-		    diff * best_den < best_diff * den) {
-			best_diff = diff;
-			best_den = den;
-			best_num = num;
-		}
-	}
-	if (best_den == 0) {
-		i->empty = 1;
-		return -EINVAL;
-	}
-	t.min = div_down(best_num, best_den);
-	t.openmin = !!(best_num % best_den);
-
-	best_num = best_den = best_diff = 0;
-	for (k = 0; k < rats_count; ++k) {
-		unsigned int num;
-		unsigned int den = rats[k].den;
-		unsigned int q = i->max;
-		int diff;
-		num = mul(q, den);
-		if (num < rats[k].num_min)
-			continue;
-		if (num > rats[k].num_max)
-			num = rats[k].num_max;
-		else {
-			unsigned int r;
-			r = (num - rats[k].num_min) % rats[k].num_step;
-			if (r != 0)
-				num -= r;
-		}
-		diff = q * den - num;
-		if (best_num == 0 ||
-		    diff * best_den < best_diff * den) {
-			best_diff = diff;
-			best_den = den;
-			best_num = num;
-		}
-	}
-	if (best_den == 0) {
-		i->empty = 1;
-		return -EINVAL;
-	}
-	t.max = div_up(best_num, best_den);
-	t.openmax = !!(best_num % best_den);
-	t.integer = 0;
-	err = snd_interval_refine(i, &t);
-	if (err < 0)
-		return err;
-
-	if (snd_interval_single(i)) {
-		if (nump)
-			*nump = best_num;
-		if (denp)
-			*denp = best_den;
-	}
-	return err;
-}
-
-/**
- * snd_interval_list - refine the interval value from the list
- * @i: the interval value to refine
- * @count: the number of elements in the list
- * @list: the value list
- * @mask: the bit-mask to evaluate
- *
- * Refines the interval value from the list.
- * When mask is non-zero, only the elements corresponding to bit 1 are
- * evaluated.
- *
- * Returns non-zero if the value is changed, zero if not changed.
- */
-int snd_interval_list(struct snd_interval *i, unsigned int count, unsigned int *list, unsigned int mask)
-{
-        unsigned int k;
-	struct snd_interval list_range;
-
-	if (!count) {
-		i->empty = 1;
-		return -EINVAL;
-	}
-	snd_interval_any(&list_range);
-	list_range.min = UINT_MAX;
-	list_range.max = 0;
-        for (k = 0; k < count; k++) {
-		if (mask && !(mask & (1 << k)))
-			continue;
-		if (!snd_interval_test(i, list[k]))
-			continue;
-		list_range.min = min(list_range.min, list[k]);
-		list_range.max = max(list_range.max, list[k]);
-        }
-	return snd_interval_refine(i, &list_range);
-}
-
-EXPORT_SYMBOL(snd_interval_list);
-
-static int snd_interval_step(struct snd_interval *i, unsigned int min, unsigned int step)
-{
-	unsigned int n;
-	int changed = 0;
-	n = (i->min - min) % step;
-	if (n != 0 || i->openmin) {
-		i->min += step - n;
-		changed = 1;
-	}
-	n = (i->max - min) % step;
-	if (n != 0 || i->openmax) {
-		i->max -= n;
-		changed = 1;
-	}
-	if (snd_interval_checkempty(i)) {
-		i->empty = 1;
-		return -EINVAL;
-	}
-	return changed;
-}
-
-/* Info constraints helpers */
-
-/**
- * snd_pcm_hw_rule_add - add the hw-constraint rule
- * @runtime: the pcm runtime instance
- * @cond: condition bits
- * @var: the variable to evaluate
- * @func: the evaluation function
- * @private: the private data pointer passed to function
- * @dep: the dependent variables
- *
- * Returns zero if successful, or a negative error code on failure.
- */
-int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
-			int var,
-			snd_pcm_hw_rule_func_t func, void *private,
-			int dep, ...)
-{
-	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
-	struct snd_pcm_hw_rule *c;
-	unsigned int k;
-	va_list args;
-	va_start(args, dep);
-	if (constrs->rules_num >= constrs->rules_all) {
-		struct snd_pcm_hw_rule *new;
-		unsigned int new_rules = constrs->rules_all + 16;
-		new = kcalloc(new_rules, sizeof(*c), GFP_KERNEL);
-		if (!new)
-			return -ENOMEM;
-		if (constrs->rules) {
-			memcpy(new, constrs->rules,
-			       constrs->rules_num * sizeof(*c));
-			kfree(constrs->rules);
-		}
-		constrs->rules = new;
-		constrs->rules_all = new_rules;
-	}
-	c = &constrs->rules[constrs->rules_num];
-	c->cond = cond;
-	c->func = func;
-	c->var = var;
-	c->private = private;
-	k = 0;
-	while (1) {
-		if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps)))
-			return -EINVAL;
-		c->deps[k++] = dep;
-		if (dep < 0)
-			break;
-		dep = va_arg(args, int);
-	}
-	constrs->rules_num++;
-	va_end(args);
-	return 0;
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_rule_add);
-
-/**
- * snd_pcm_hw_constraint_mask - apply the given bitmap mask constraint
- * @runtime: PCM runtime instance
- * @var: hw_params variable to apply the mask
- * @mask: the bitmap mask
- *
- * Apply the constraint of the given bitmap mask to a 32-bit mask parameter.
- */
-int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
-			       uint32_t mask)
-{
-	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
-	struct snd_mask *maskp = constrs_mask(constrs, var);
-	*maskp->bits &= mask;
-	memset(maskp->bits + 1, 0, (SNDRV_MASK_MAX-32) / 8); /* clear rest */
-	if (*maskp->bits == 0)
-		return -EINVAL;
-	return 0;
-}
-
-/**
- * snd_pcm_hw_constraint_mask64 - apply the given bitmap mask constraint
- * @runtime: PCM runtime instance
- * @var: hw_params variable to apply the mask
- * @mask: the 64bit bitmap mask
- *
- * Apply the constraint of the given bitmap mask to a 64-bit mask parameter.
- */
-int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
-				 uint64_t mask)
-{
-	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
-	struct snd_mask *maskp = constrs_mask(constrs, var);
-	maskp->bits[0] &= (uint32_t)mask;
-	maskp->bits[1] &= (uint32_t)(mask >> 32);
-	memset(maskp->bits + 2, 0, (SNDRV_MASK_MAX-64) / 8); /* clear rest */
-	if (! maskp->bits[0] && ! maskp->bits[1])
-		return -EINVAL;
-	return 0;
-}
-
-/**
- * snd_pcm_hw_constraint_integer - apply an integer constraint to an interval
- * @runtime: PCM runtime instance
- * @var: hw_params variable to apply the integer constraint
- *
- * Apply the constraint of integer to an interval parameter.
- */
-int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var)
-{
-	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
-	return snd_interval_setinteger(constrs_interval(constrs, var));
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_constraint_integer);
-
-/**
- * snd_pcm_hw_constraint_minmax - apply a min/max range constraint to an interval
- * @runtime: PCM runtime instance
- * @var: hw_params variable to apply the range
- * @min: the minimal value
- * @max: the maximal value
- *
- * Apply the min/max range constraint to an interval parameter.
- */
-int snd_pcm_hw_constraint_minmax(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
-				 unsigned int min, unsigned int max)
-{
-	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
-	struct snd_interval t;
-	t.min = min;
-	t.max = max;
-	t.openmin = t.openmax = 0;
-	t.integer = 0;
-	return snd_interval_refine(constrs_interval(constrs, var), &t);
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_constraint_minmax);
-
-static int snd_pcm_hw_rule_list(struct snd_pcm_hw_params *params,
-				struct snd_pcm_hw_rule *rule)
-{
-	struct snd_pcm_hw_constraint_list *list = rule->private;
-	return snd_interval_list(hw_param_interval(params, rule->var), list->count, list->list, list->mask);
-}
-
-
-/**
- * snd_pcm_hw_constraint_list - apply a list of constraints to a parameter
- * @runtime: PCM runtime instance
- * @cond: condition bits
- * @var: hw_params variable to apply the list constraint
- * @l: list
- *
- * Apply the list of constraints to an interval parameter.
- */
-int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,
-			       unsigned int cond,
-			       snd_pcm_hw_param_t var,
-			       struct snd_pcm_hw_constraint_list *l)
-{
-	return snd_pcm_hw_rule_add(runtime, cond, var,
-				   snd_pcm_hw_rule_list, l,
-				   var, -1);
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_constraint_list);
-
-static int snd_pcm_hw_rule_ratnums(struct snd_pcm_hw_params *params,
-				   struct snd_pcm_hw_rule *rule)
-{
-	struct snd_pcm_hw_constraint_ratnums *r = rule->private;
-	unsigned int num = 0, den = 0;
-	int err;
-	err = snd_interval_ratnum(hw_param_interval(params, rule->var),
-				  r->nrats, r->rats, &num, &den);
-	if (err >= 0 && den && rule->var == SNDRV_PCM_HW_PARAM_RATE) {
-		params->rate_num = num;
-		params->rate_den = den;
-	}
-	return err;
-}
-
-/**
- * snd_pcm_hw_constraint_ratnums - apply ratnums constraint to a parameter
- * @runtime: PCM runtime instance
- * @cond: condition bits
- * @var: hw_params variable to apply the ratnums constraint
- * @r: struct snd_ratnums constriants
- */
-int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime,
-				  unsigned int cond,
-				  snd_pcm_hw_param_t var,
-				  struct snd_pcm_hw_constraint_ratnums *r)
-{
-	return snd_pcm_hw_rule_add(runtime, cond, var,
-				   snd_pcm_hw_rule_ratnums, r,
-				   var, -1);
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_constraint_ratnums);
-
-static int snd_pcm_hw_rule_ratdens(struct snd_pcm_hw_params *params,
-				   struct snd_pcm_hw_rule *rule)
-{
-	struct snd_pcm_hw_constraint_ratdens *r = rule->private;
-	unsigned int num = 0, den = 0;
-	int err = snd_interval_ratden(hw_param_interval(params, rule->var),
-				  r->nrats, r->rats, &num, &den);
-	if (err >= 0 && den && rule->var == SNDRV_PCM_HW_PARAM_RATE) {
-		params->rate_num = num;
-		params->rate_den = den;
-	}
-	return err;
-}
-
-/**
- * snd_pcm_hw_constraint_ratdens - apply ratdens constraint to a parameter
- * @runtime: PCM runtime instance
- * @cond: condition bits
- * @var: hw_params variable to apply the ratdens constraint
- * @r: struct snd_ratdens constriants
- */
-int snd_pcm_hw_constraint_ratdens(struct snd_pcm_runtime *runtime,
-				  unsigned int cond,
-				  snd_pcm_hw_param_t var,
-				  struct snd_pcm_hw_constraint_ratdens *r)
-{
-	return snd_pcm_hw_rule_add(runtime, cond, var,
-				   snd_pcm_hw_rule_ratdens, r,
-				   var, -1);
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_constraint_ratdens);
-
-static int snd_pcm_hw_rule_msbits(struct snd_pcm_hw_params *params,
-				  struct snd_pcm_hw_rule *rule)
-{
-	unsigned int l = (unsigned long) rule->private;
-	int width = l & 0xffff;
-	unsigned int msbits = l >> 16;
-	struct snd_interval *i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);
-	if (snd_interval_single(i) && snd_interval_value(i) == width)
-		params->msbits = msbits;
-	return 0;
-}
-
-/**
- * snd_pcm_hw_constraint_msbits - add a hw constraint msbits rule
- * @runtime: PCM runtime instance
- * @cond: condition bits
- * @width: sample bits width
- * @msbits: msbits width
- */
-int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime,
-				 unsigned int cond,
-				 unsigned int width,
-				 unsigned int msbits)
-{
-	unsigned long l = (msbits << 16) | width;
-	return snd_pcm_hw_rule_add(runtime, cond, -1,
-				    snd_pcm_hw_rule_msbits,
-				    (void*) l,
-				    SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_constraint_msbits);
-
-static int snd_pcm_hw_rule_step(struct snd_pcm_hw_params *params,
-				struct snd_pcm_hw_rule *rule)
-{
-	unsigned long step = (unsigned long) rule->private;
-	return snd_interval_step(hw_param_interval(params, rule->var), 0, step);
-}
-
-/**
- * snd_pcm_hw_constraint_step - add a hw constraint step rule
- * @runtime: PCM runtime instance
- * @cond: condition bits
- * @var: hw_params variable to apply the step constraint
- * @step: step size
- */
-int snd_pcm_hw_constraint_step(struct snd_pcm_runtime *runtime,
-			       unsigned int cond,
-			       snd_pcm_hw_param_t var,
-			       unsigned long step)
-{
-	return snd_pcm_hw_rule_add(runtime, cond, var,
-				   snd_pcm_hw_rule_step, (void *) step,
-				   var, -1);
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_constraint_step);
-
-static int snd_pcm_hw_rule_pow2(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule)
-{
-	static unsigned int pow2_sizes[] = {
-		1<<0, 1<<1, 1<<2, 1<<3, 1<<4, 1<<5, 1<<6, 1<<7,
-		1<<8, 1<<9, 1<<10, 1<<11, 1<<12, 1<<13, 1<<14, 1<<15,
-		1<<16, 1<<17, 1<<18, 1<<19, 1<<20, 1<<21, 1<<22, 1<<23,
-		1<<24, 1<<25, 1<<26, 1<<27, 1<<28, 1<<29, 1<<30
-	};
-	return snd_interval_list(hw_param_interval(params, rule->var),
-				 ARRAY_SIZE(pow2_sizes), pow2_sizes, 0);
-}
-
-/**
- * snd_pcm_hw_constraint_pow2 - add a hw constraint power-of-2 rule
- * @runtime: PCM runtime instance
- * @cond: condition bits
- * @var: hw_params variable to apply the power-of-2 constraint
- */
-int snd_pcm_hw_constraint_pow2(struct snd_pcm_runtime *runtime,
-			       unsigned int cond,
-			       snd_pcm_hw_param_t var)
-{
-	return snd_pcm_hw_rule_add(runtime, cond, var,
-				   snd_pcm_hw_rule_pow2, NULL,
-				   var, -1);
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_constraint_pow2);
-
-static void _snd_pcm_hw_param_any(struct snd_pcm_hw_params *params,
-				  snd_pcm_hw_param_t var)
-{
-	if (hw_is_mask(var)) {
-		snd_mask_any(hw_param_mask(params, var));
-		params->cmask |= 1 << var;
-		params->rmask |= 1 << var;
-		return;
-	}
-	if (hw_is_interval(var)) {
-		snd_interval_any(hw_param_interval(params, var));
-		params->cmask |= 1 << var;
-		params->rmask |= 1 << var;
-		return;
-	}
-	snd_BUG();
-}
-
-void _snd_pcm_hw_params_any(struct snd_pcm_hw_params *params)
-{
-	unsigned int k;
-	memset(params, 0, sizeof(*params));
-	for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k <= SNDRV_PCM_HW_PARAM_LAST_MASK; k++)
-		_snd_pcm_hw_param_any(params, k);
-	for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++)
-		_snd_pcm_hw_param_any(params, k);
-	params->info = ~0U;
-}
-
-EXPORT_SYMBOL(_snd_pcm_hw_params_any);
-
-/**
- * snd_pcm_hw_param_value - return @params field @var value
- * @params: the hw_params instance
- * @var: parameter to retrieve
- * @dir: pointer to the direction (-1,0,1) or %NULL
- *
- * Return the value for field @var if it's fixed in configuration space
- * defined by @params. Return -%EINVAL otherwise.
- */
-int snd_pcm_hw_param_value(const struct snd_pcm_hw_params *params,
-			   snd_pcm_hw_param_t var, int *dir)
-{
-	if (hw_is_mask(var)) {
-		const struct snd_mask *mask = hw_param_mask_c(params, var);
-		if (!snd_mask_single(mask))
-			return -EINVAL;
-		if (dir)
-			*dir = 0;
-		return snd_mask_value(mask);
-	}
-	if (hw_is_interval(var)) {
-		const struct snd_interval *i = hw_param_interval_c(params, var);
-		if (!snd_interval_single(i))
-			return -EINVAL;
-		if (dir)
-			*dir = i->openmin;
-		return snd_interval_value(i);
-	}
-	return -EINVAL;
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_param_value);
-
-void _snd_pcm_hw_param_setempty(struct snd_pcm_hw_params *params,
-				snd_pcm_hw_param_t var)
-{
-	if (hw_is_mask(var)) {
-		snd_mask_none(hw_param_mask(params, var));
-		params->cmask |= 1 << var;
-		params->rmask |= 1 << var;
-	} else if (hw_is_interval(var)) {
-		snd_interval_none(hw_param_interval(params, var));
-		params->cmask |= 1 << var;
-		params->rmask |= 1 << var;
-	} else {
-		snd_BUG();
-	}
-}
-
-EXPORT_SYMBOL(_snd_pcm_hw_param_setempty);
-
-static int _snd_pcm_hw_param_first(struct snd_pcm_hw_params *params,
-				   snd_pcm_hw_param_t var)
-{
-	int changed;
-	if (hw_is_mask(var))
-		changed = snd_mask_refine_first(hw_param_mask(params, var));
-	else if (hw_is_interval(var))
-		changed = snd_interval_refine_first(hw_param_interval(params, var));
-	else
-		return -EINVAL;
-	if (changed) {
-		params->cmask |= 1 << var;
-		params->rmask |= 1 << var;
-	}
-	return changed;
-}
-
-
-/**
- * snd_pcm_hw_param_first - refine config space and return minimum value
- * @pcm: PCM instance
- * @params: the hw_params instance
- * @var: parameter to retrieve
- * @dir: pointer to the direction (-1,0,1) or %NULL
- *
- * Inside configuration space defined by @params remove from @var all
- * values > minimum. Reduce configuration space accordingly.
- * Return the minimum.
- */
-int snd_pcm_hw_param_first(struct snd_pcm_substream *pcm,
-			   struct snd_pcm_hw_params *params,
-			   snd_pcm_hw_param_t var, int *dir)
-{
-	int changed = _snd_pcm_hw_param_first(params, var);
-	if (changed < 0)
-		return changed;
-	if (params->rmask) {
-		int err = snd_pcm_hw_refine(pcm, params);
-		if (snd_BUG_ON(err < 0))
-			return err;
-	}
-	return snd_pcm_hw_param_value(params, var, dir);
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_param_first);
-
-static int _snd_pcm_hw_param_last(struct snd_pcm_hw_params *params,
-				  snd_pcm_hw_param_t var)
-{
-	int changed;
-	if (hw_is_mask(var))
-		changed = snd_mask_refine_last(hw_param_mask(params, var));
-	else if (hw_is_interval(var))
-		changed = snd_interval_refine_last(hw_param_interval(params, var));
-	else
-		return -EINVAL;
-	if (changed) {
-		params->cmask |= 1 << var;
-		params->rmask |= 1 << var;
-	}
-	return changed;
-}
-
-
-/**
- * snd_pcm_hw_param_last - refine config space and return maximum value
- * @pcm: PCM instance
- * @params: the hw_params instance
- * @var: parameter to retrieve
- * @dir: pointer to the direction (-1,0,1) or %NULL
- *
- * Inside configuration space defined by @params remove from @var all
- * values < maximum. Reduce configuration space accordingly.
- * Return the maximum.
- */
-int snd_pcm_hw_param_last(struct snd_pcm_substream *pcm,
-			  struct snd_pcm_hw_params *params,
-			  snd_pcm_hw_param_t var, int *dir)
-{
-	int changed = _snd_pcm_hw_param_last(params, var);
-	if (changed < 0)
-		return changed;
-	if (params->rmask) {
-		int err = snd_pcm_hw_refine(pcm, params);
-		if (snd_BUG_ON(err < 0))
-			return err;
-	}
-	return snd_pcm_hw_param_value(params, var, dir);
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_param_last);
-
-/**
- * snd_pcm_hw_param_choose - choose a configuration defined by @params
- * @pcm: PCM instance
- * @params: the hw_params instance
- *
- * Choose one configuration from configuration space defined by @params.
- * The configuration chosen is that obtained fixing in this order:
- * first access, first format, first subformat, min channels,
- * min rate, min period time, max buffer size, min tick time
- */
-int snd_pcm_hw_params_choose(struct snd_pcm_substream *pcm,
-			     struct snd_pcm_hw_params *params)
-{
-	static int vars[] = {
-		SNDRV_PCM_HW_PARAM_ACCESS,
-		SNDRV_PCM_HW_PARAM_FORMAT,
-		SNDRV_PCM_HW_PARAM_SUBFORMAT,
-		SNDRV_PCM_HW_PARAM_CHANNELS,
-		SNDRV_PCM_HW_PARAM_RATE,
-		SNDRV_PCM_HW_PARAM_PERIOD_TIME,
-		SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
-		SNDRV_PCM_HW_PARAM_TICK_TIME,
-		-1
-	};
-	int err, *v;
-
-	for (v = vars; *v != -1; v++) {
-		if (*v != SNDRV_PCM_HW_PARAM_BUFFER_SIZE)
-			err = snd_pcm_hw_param_first(pcm, params, *v, NULL);
-		else
-			err = snd_pcm_hw_param_last(pcm, params, *v, NULL);
-		if (snd_BUG_ON(err < 0))
-			return err;
-	}
-	return 0;
-}
-
-static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream,
-				   void *arg)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	unsigned long flags;
-	snd_pcm_stream_lock_irqsave(substream, flags);
-	if (snd_pcm_running(substream) &&
-	    snd_pcm_update_hw_ptr(substream) >= 0)
-		runtime->status->hw_ptr %= runtime->buffer_size;
-	else
-		runtime->status->hw_ptr = 0;
-	snd_pcm_stream_unlock_irqrestore(substream, flags);
-	return 0;
-}
-
-static int snd_pcm_lib_ioctl_channel_info(struct snd_pcm_substream *substream,
-					  void *arg)
-{
-	struct snd_pcm_channel_info *info = arg;
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int width;
-	if (!(runtime->info & SNDRV_PCM_INFO_MMAP)) {
-		info->offset = -1;
-		return 0;
-	}
-	width = snd_pcm_format_physical_width(runtime->format);
-	if (width < 0)
-		return width;
-	info->offset = 0;
-	switch (runtime->access) {
-	case SNDRV_PCM_ACCESS_MMAP_INTERLEAVED:
-	case SNDRV_PCM_ACCESS_RW_INTERLEAVED:
-		info->first = info->channel * width;
-		info->step = runtime->channels * width;
-		break;
-	case SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED:
-	case SNDRV_PCM_ACCESS_RW_NONINTERLEAVED:
-	{
-		size_t size = runtime->dma_bytes / runtime->channels;
-		info->first = info->channel * size * 8;
-		info->step = width;
-		break;
-	}
-	default:
-		snd_BUG();
-		break;
-	}
-	return 0;
-}
-
-static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream,
-				       void *arg)
-{
-	struct snd_pcm_hw_params *params = arg;
-	snd_pcm_format_t format;
-	int channels, width;
-
-	params->fifo_size = substream->runtime->hw.fifo_size;
-	if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_FIFO_IN_FRAMES)) {
-		format = params_format(params);
-		channels = params_channels(params);
-		width = snd_pcm_format_physical_width(format);
-		params->fifo_size /= width * channels;
-	}
-	return 0;
-}
-
-/**
- * snd_pcm_lib_ioctl - a generic PCM ioctl callback
- * @substream: the pcm substream instance
- * @cmd: ioctl command
- * @arg: ioctl argument
- *
- * Processes the generic ioctl commands for PCM.
- * Can be passed as the ioctl callback for PCM ops.
- *
- * Returns zero if successful, or a negative error code on failure.
- */
-int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,
-		      unsigned int cmd, void *arg)
-{
-	switch (cmd) {
-	case SNDRV_PCM_IOCTL1_INFO:
-		return 0;
-	case SNDRV_PCM_IOCTL1_RESET:
-		return snd_pcm_lib_ioctl_reset(substream, arg);
-	case SNDRV_PCM_IOCTL1_CHANNEL_INFO:
-		return snd_pcm_lib_ioctl_channel_info(substream, arg);
-	case SNDRV_PCM_IOCTL1_FIFO_SIZE:
-		return snd_pcm_lib_ioctl_fifo_size(substream, arg);
-	}
-	return -ENXIO;
-}
-
-EXPORT_SYMBOL(snd_pcm_lib_ioctl);
-
-/**
- * snd_pcm_period_elapsed - update the pcm status for the next period
- * @substream: the pcm substream instance
- *
- * This function is called from the interrupt handler when the
- * PCM has processed the period size.  It will update the current
- * pointer, wake up sleepers, etc.
- *
- * Even if more than one periods have elapsed since the last call, you
- * have to call this only once.
- */
-void snd_pcm_period_elapsed(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime;
-	unsigned long flags;
-
-	if (PCM_RUNTIME_CHECK(substream))
-		return;
-	runtime = substream->runtime;
-
-	if (runtime->transfer_ack_begin)
-		runtime->transfer_ack_begin(substream);
-
-	//giovanni snd_pcm_stream_lock_irqsave(substream, flags); //giovanni
-	if (!snd_pcm_running(substream) ||
-	    snd_pcm_update_hw_ptr0(substream, 1) < 0)
-		goto _end;
-
-	if (substream->timer_running)
-		snd_timer_interrupt(substream->timer, 1);
- _end:
-	//giovanni snd_pcm_stream_unlock_irqrestore(substream, flags); //giovanni
-	if (runtime->transfer_ack_end)
-		runtime->transfer_ack_end(substream);
-	kill_fasync(&runtime->fasync, SIGIO, POLL_IN);
-}
-
-EXPORT_SYMBOL(snd_pcm_period_elapsed);
-
-/*
- * Wait until avail_min data becomes available
- * Returns a negative error code if any error occurs during operation.
- * The available space is stored on availp.  When err = 0 and avail = 0
- * on the capture stream, it indicates the stream is in DRAINING state.
- */
-static int wait_for_avail_min(struct snd_pcm_substream *substream,
-			      snd_pcm_uframes_t *availp)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int is_playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
-	wait_queue_t wait;
-	int err = 0;
-	snd_pcm_uframes_t avail = 0;
-	long tout;
-
-	init_waitqueue_entry(&wait, current);
-	add_wait_queue(&runtime->tsleep, &wait);
-	for (;;) {
-		if (signal_pending(current)) {
-			err = -ERESTARTSYS;
-			break;
-		}
-		set_current_state(TASK_INTERRUPTIBLE);
-		//giovanni snd_pcm_stream_unlock_irq(substream);
-		tout = schedule_timeout(msecs_to_jiffies(10000));
-		//giovanni snd_pcm_stream_lock_irq(substream);
-		switch (runtime->status->state) {
-		case SNDRV_PCM_STATE_SUSPENDED:
-			err = -ESTRPIPE;
-			goto _endloop;
-		case SNDRV_PCM_STATE_XRUN:
-			err = -EPIPE;
-			goto _endloop;
-		case SNDRV_PCM_STATE_DRAINING:
-			if (is_playback)
-				err = -EPIPE;
-			else
-				avail = 0; /* indicate draining */
-			goto _endloop;
-		case SNDRV_PCM_STATE_OPEN:
-		case SNDRV_PCM_STATE_SETUP:
-		case SNDRV_PCM_STATE_DISCONNECTED:
-			err = -EBADFD;
-			goto _endloop;
-		}
-		if (!tout) {
-			snd_printd("%s write error (DMA or IRQ trouble?)\n",
-				   is_playback ? "playback" : "capture");
-			err = -EIO;
-			break;
-		}
-		if (is_playback)
-			avail = snd_pcm_playback_avail(runtime);
-		else
-			avail = snd_pcm_capture_avail(runtime);
-		if (avail >= runtime->control->avail_min)
-			break;
-	}
- _endloop:
-	remove_wait_queue(&runtime->tsleep, &wait);
-	*availp = avail;
-	return err;
-}
-
-static int snd_pcm_lib_write_transfer(struct snd_pcm_substream *substream,
-				      unsigned int hwoff,
-				      unsigned long data, unsigned int off,
-				      snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int err;
-	char __user *buf = (char __user *) data + frames_to_bytes(runtime, off);
-	if (substream->ops->copy) {
-		if ((err = substream->ops->copy(substream, -1, hwoff, buf, frames)) < 0)
-			return err;
-	} else {
-		char *hwbuf = runtime->dma_area + frames_to_bytes(runtime, hwoff);
-		if (copy_from_user(hwbuf, buf, frames_to_bytes(runtime, frames)))
-			return -EFAULT;
-	}
-	return 0;
-}
-
-typedef int (*transfer_f)(struct snd_pcm_substream *substream, unsigned int hwoff,
-			  unsigned long data, unsigned int off,
-			  snd_pcm_uframes_t size);
-
-static snd_pcm_sframes_t snd_pcm_lib_write1(struct snd_pcm_substream *substream,
-					    unsigned long data,
-					    snd_pcm_uframes_t size,
-					    int nonblock,
-					    transfer_f transfer)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_uframes_t xfer = 0;
-	snd_pcm_uframes_t offset = 0;
-	int err = 0;
-
-	if (size == 0)
-		return 0;
-
-	//giovanni snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_PREPARED:
-	case SNDRV_PCM_STATE_RUNNING:
-	case SNDRV_PCM_STATE_PAUSED:
-		break;
-	case SNDRV_PCM_STATE_XRUN:
-		err = -EPIPE;
-		goto _end_unlock;
-	case SNDRV_PCM_STATE_SUSPENDED:
-		err = -ESTRPIPE;
-		goto _end_unlock;
-	default:
-		err = -EBADFD;
-		goto _end_unlock;
-	}
-
-	runtime->twake = 1;
-	while (size > 0) {
-		snd_pcm_uframes_t frames, appl_ptr, appl_ofs;
-		snd_pcm_uframes_t avail;
-		snd_pcm_uframes_t cont;
-		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING)
-			snd_pcm_update_hw_ptr(substream);
-		avail = snd_pcm_playback_avail(runtime);
-		if (!avail) {
-			if (nonblock) {
-				err = -EAGAIN;
-				goto _end_unlock;
-			}
-			err = wait_for_avail_min(substream, &avail);
-			if (err < 0)
-				goto _end_unlock;
-		}
-		frames = size > avail ? avail : size;
-		cont = runtime->buffer_size - runtime->control->appl_ptr % runtime->buffer_size;
-		if (frames > cont)
-			frames = cont;
-		if (snd_BUG_ON(!frames)) {
-			runtime->twake = 0;
-			//giovanni snd_pcm_stream_unlock_irq(substream);
-			return -EINVAL;
-		}
-		appl_ptr = runtime->control->appl_ptr;
-		appl_ofs = appl_ptr % runtime->buffer_size;
-		//giovanni snd_pcm_stream_unlock_irq(substream);
-		err = transfer(substream, appl_ofs, data, offset, frames);
-		//giovanni snd_pcm_stream_lock_irq(substream);
-		if (err < 0)
-			goto _end_unlock;
-		switch (runtime->status->state) {
-		case SNDRV_PCM_STATE_XRUN:
-			err = -EPIPE;
-			goto _end_unlock;
-		case SNDRV_PCM_STATE_SUSPENDED:
-			err = -ESTRPIPE;
-			goto _end_unlock;
-		default:
-			break;
-		}
-		appl_ptr += frames;
-		if (appl_ptr >= runtime->boundary)
-			appl_ptr -= runtime->boundary;
-		runtime->control->appl_ptr = appl_ptr;
-		if (substream->ops->ack)
-			substream->ops->ack(substream);
-
-		offset += frames;
-		size -= frames;
-		xfer += frames;
-		if (runtime->status->state == SNDRV_PCM_STATE_PREPARED &&
-		    snd_pcm_playback_hw_avail(runtime) >= (snd_pcm_sframes_t)runtime->start_threshold) {
-			err = snd_pcm_start(substream);
-			if (err < 0)
-				goto _end_unlock;
-		}
-	}
- _end_unlock:
-	runtime->twake = 0;
-	if (xfer > 0 && err >= 0)
-		snd_pcm_update_state(substream, runtime);
-	//giovanni snd_pcm_stream_unlock_irq(substream);
-	return xfer > 0 ? (snd_pcm_sframes_t)xfer : err;
-}
-
-/* sanity-check for read/write methods */
-static int pcm_sanity_check(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime;
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	if (snd_BUG_ON(!substream->ops->copy && !runtime->dma_area))
-		return -EINVAL;
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-		return -EBADFD;
-	return 0;
-}
-
-snd_pcm_sframes_t snd_pcm_lib_write(struct snd_pcm_substream *substream, const void __user *buf, snd_pcm_uframes_t size)
-{
-	struct snd_pcm_runtime *runtime;
-	int nonblock;
-	int err;
-
-	err = pcm_sanity_check(substream);
-	if (err < 0)
-		return err;
-	runtime = substream->runtime;
-	nonblock = !!(substream->f_flags & O_NONBLOCK);
-
-	if (runtime->access != SNDRV_PCM_ACCESS_RW_INTERLEAVED &&
-	    runtime->channels > 1)
-		return -EINVAL;
-	return snd_pcm_lib_write1(substream, (unsigned long)buf, size, nonblock,
-				  snd_pcm_lib_write_transfer);
-}
-
-EXPORT_SYMBOL(snd_pcm_lib_write);
-
-static int snd_pcm_lib_writev_transfer(struct snd_pcm_substream *substream,
-				       unsigned int hwoff,
-				       unsigned long data, unsigned int off,
-				       snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int err;
-	void __user **bufs = (void __user **)data;
-	int channels = runtime->channels;
-	int c;
-	if (substream->ops->copy) {
-		if (snd_BUG_ON(!substream->ops->silence))
-			return -EINVAL;
-		for (c = 0; c < channels; ++c, ++bufs) {
-			if (*bufs == NULL) {
-				if ((err = substream->ops->silence(substream, c, hwoff, frames)) < 0)
-					return err;
-			} else {
-				char __user *buf = *bufs + samples_to_bytes(runtime, off);
-				if ((err = substream->ops->copy(substream, c, hwoff, buf, frames)) < 0)
-					return err;
-			}
-		}
-	} else {
-		/* default transfer behaviour */
-		size_t dma_csize = runtime->dma_bytes / channels;
-		for (c = 0; c < channels; ++c, ++bufs) {
-			char *hwbuf = runtime->dma_area + (c * dma_csize) + samples_to_bytes(runtime, hwoff);
-			if (*bufs == NULL) {
-				snd_pcm_format_set_silence(runtime->format, hwbuf, frames);
-			} else {
-				char __user *buf = *bufs + samples_to_bytes(runtime, off);
-				if (copy_from_user(hwbuf, buf, samples_to_bytes(runtime, frames)))
-					return -EFAULT;
-			}
-		}
-	}
-	return 0;
-}
-
-snd_pcm_sframes_t snd_pcm_lib_writev(struct snd_pcm_substream *substream,
-				     void __user **bufs,
-				     snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime;
-	int nonblock;
-	int err;
-
-	err = pcm_sanity_check(substream);
-	if (err < 0)
-		return err;
-	runtime = substream->runtime;
-	nonblock = !!(substream->f_flags & O_NONBLOCK);
-
-	if (runtime->access != SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)
-		return -EINVAL;
-	return snd_pcm_lib_write1(substream, (unsigned long)bufs, frames,
-				  nonblock, snd_pcm_lib_writev_transfer);
-}
-
-EXPORT_SYMBOL(snd_pcm_lib_writev);
-
-static int snd_pcm_lib_read_transfer(struct snd_pcm_substream *substream,
-				     unsigned int hwoff,
-				     unsigned long data, unsigned int off,
-				     snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int err;
-	char __user *buf = (char __user *) data + frames_to_bytes(runtime, off);
-	if (substream->ops->copy) {
-		if ((err = substream->ops->copy(substream, -1, hwoff, buf, frames)) < 0)
-			return err;
-	} else {
-		char *hwbuf = runtime->dma_area + frames_to_bytes(runtime, hwoff);
-		if (copy_to_user(buf, hwbuf, frames_to_bytes(runtime, frames)))
-			return -EFAULT;
-	}
-	return 0;
-}
-
-static snd_pcm_sframes_t snd_pcm_lib_read1(struct snd_pcm_substream *substream,
-					   unsigned long data,
-					   snd_pcm_uframes_t size,
-					   int nonblock,
-					   transfer_f transfer)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_uframes_t xfer = 0;
-	snd_pcm_uframes_t offset = 0;
-	int err = 0;
-
-	if (size == 0)
-		return 0;
-
-	//giovanni snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_PREPARED:
-		if (size >= runtime->start_threshold) {
-			err = snd_pcm_start(substream);
-			if (err < 0)
-				goto _end_unlock;
-		}
-		break;
-	case SNDRV_PCM_STATE_DRAINING:
-	case SNDRV_PCM_STATE_RUNNING:
-	case SNDRV_PCM_STATE_PAUSED:
-		break;
-	case SNDRV_PCM_STATE_XRUN:
-		err = -EPIPE;
-		goto _end_unlock;
-	case SNDRV_PCM_STATE_SUSPENDED:
-		err = -ESTRPIPE;
-		goto _end_unlock;
-	default:
-		err = -EBADFD;
-		goto _end_unlock;
-	}
-
-	runtime->twake = 1;
-	while (size > 0) {
-		snd_pcm_uframes_t frames, appl_ptr, appl_ofs;
-		snd_pcm_uframes_t avail;
-		snd_pcm_uframes_t cont;
-		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING)
-			snd_pcm_update_hw_ptr(substream);
-		avail = snd_pcm_capture_avail(runtime);
-		if (!avail) {
-			if (runtime->status->state ==
-			    SNDRV_PCM_STATE_DRAINING) {
-				snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);
-				goto _end_unlock;
-			}
-			if (nonblock) {
-				err = -EAGAIN;
-				goto _end_unlock;
-			}
-			err = wait_for_avail_min(substream, &avail);
-			if (err < 0)
-				goto _end_unlock;
-			if (!avail)
-				continue; /* draining */
-		}
-		frames = size > avail ? avail : size;
-		cont = runtime->buffer_size - runtime->control->appl_ptr % runtime->buffer_size;
-		if (frames > cont)
-			frames = cont;
-		if (snd_BUG_ON(!frames)) {
-			runtime->twake = 0;
-			//giovanni snd_pcm_stream_unlock_irq(substream);
-			return -EINVAL;
-		}
-		appl_ptr = runtime->control->appl_ptr;
-		appl_ofs = appl_ptr % runtime->buffer_size;
-		//giovanni snd_pcm_stream_unlock_irq(substream);
-		err = transfer(substream, appl_ofs, data, offset, frames);
-		//giovanni snd_pcm_stream_lock_irq(substream);
-		if (err < 0)
-			goto _end_unlock;
-		switch (runtime->status->state) {
-		case SNDRV_PCM_STATE_XRUN:
-			err = -EPIPE;
-			goto _end_unlock;
-		case SNDRV_PCM_STATE_SUSPENDED:
-			err = -ESTRPIPE;
-			goto _end_unlock;
-		default:
-			break;
-		}
-		appl_ptr += frames;
-		if (appl_ptr >= runtime->boundary)
-			appl_ptr -= runtime->boundary;
-		runtime->control->appl_ptr = appl_ptr;
-		if (substream->ops->ack)
-			substream->ops->ack(substream);
-
-		offset += frames;
-		size -= frames;
-		xfer += frames;
-	}
- _end_unlock:
-	runtime->twake = 0;
-	if (xfer > 0 && err >= 0)
-		snd_pcm_update_state(substream, runtime);
-	//giovanni snd_pcm_stream_unlock_irq(substream);
-	return xfer > 0 ? (snd_pcm_sframes_t)xfer : err;
-}
-
-snd_pcm_sframes_t snd_pcm_lib_read(struct snd_pcm_substream *substream, void __user *buf, snd_pcm_uframes_t size)
-{
-	struct snd_pcm_runtime *runtime;
-	int nonblock;
-	int err;
-
-	err = pcm_sanity_check(substream);
-	if (err < 0)
-		return err;
-	runtime = substream->runtime;
-	nonblock = !!(substream->f_flags & O_NONBLOCK);
-	if (runtime->access != SNDRV_PCM_ACCESS_RW_INTERLEAVED)
-		return -EINVAL;
-	return snd_pcm_lib_read1(substream, (unsigned long)buf, size, nonblock, snd_pcm_lib_read_transfer);
-}
-
-EXPORT_SYMBOL(snd_pcm_lib_read);
-
-static int snd_pcm_lib_readv_transfer(struct snd_pcm_substream *substream,
-				      unsigned int hwoff,
-				      unsigned long data, unsigned int off,
-				      snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int err;
-	void __user **bufs = (void __user **)data;
-	int channels = runtime->channels;
-	int c;
-	if (substream->ops->copy) {
-		for (c = 0; c < channels; ++c, ++bufs) {
-			char __user *buf;
-			if (*bufs == NULL)
-				continue;
-			buf = *bufs + samples_to_bytes(runtime, off);
-			if ((err = substream->ops->copy(substream, c, hwoff, buf, frames)) < 0)
-				return err;
-		}
-	} else {
-		snd_pcm_uframes_t dma_csize = runtime->dma_bytes / channels;
-		for (c = 0; c < channels; ++c, ++bufs) {
-			char *hwbuf;
-			char __user *buf;
-			if (*bufs == NULL)
-				continue;
-
-			hwbuf = runtime->dma_area + (c * dma_csize) + samples_to_bytes(runtime, hwoff);
-			buf = *bufs + samples_to_bytes(runtime, off);
-			if (copy_to_user(buf, hwbuf, samples_to_bytes(runtime, frames)))
-				return -EFAULT;
-		}
-	}
-	return 0;
-}
-
-snd_pcm_sframes_t snd_pcm_lib_readv(struct snd_pcm_substream *substream,
-				    void __user **bufs,
-				    snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime;
-	int nonblock;
-	int err;
-
-	err = pcm_sanity_check(substream);
-	if (err < 0)
-		return err;
-	runtime = substream->runtime;
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-		return -EBADFD;
-
-	nonblock = !!(substream->f_flags & O_NONBLOCK);
-	if (runtime->access != SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)
-		return -EINVAL;
-	return snd_pcm_lib_read1(substream, (unsigned long)bufs, frames, nonblock, snd_pcm_lib_readv_transfer);
-}
-
-EXPORT_SYMBOL(snd_pcm_lib_readv);
diff --git a/src/mod/endpoints/mod_skypopen/old-stuff/pcm_native.c b/src/mod/endpoints/mod_skypopen/old-stuff/pcm_native.c
deleted file mode 100644
index 36ee1efba4..0000000000
--- a/src/mod/endpoints/mod_skypopen/old-stuff/pcm_native.c
+++ /dev/null
@@ -1,3493 +0,0 @@
-/*
- *  Digital Audio (PCM) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *
- *
- *   This program 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.
- *
- *   This program 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
- *
- */
-
-#include <linux/mm.h>
-#include <linux/file.h>
-#include <linux/slab.h>
-#include <linux/smp_lock.h>
-#include <linux/time.h>
-#include <linux/pm_qos_params.h>
-#include <linux/uio.h>
-#include <linux/dma-mapping.h>
-#include <linux/math64.h>
-#include <sound/core.h>
-#include <sound/control.h>
-#include <sound/info.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/timer.h>
-#include <sound/minors.h>
-#include <asm/io.h>
-
-/*
- *  Compatibility
- */
-
-struct snd_pcm_hw_params_old {
-	unsigned int flags;
-	unsigned int masks[SNDRV_PCM_HW_PARAM_SUBFORMAT -
-			   SNDRV_PCM_HW_PARAM_ACCESS + 1];
-	struct snd_interval intervals[SNDRV_PCM_HW_PARAM_TICK_TIME -
-					SNDRV_PCM_HW_PARAM_SAMPLE_BITS + 1];
-	unsigned int rmask;
-	unsigned int cmask;
-	unsigned int info;
-	unsigned int msbits;
-	unsigned int rate_num;
-	unsigned int rate_den;
-	snd_pcm_uframes_t fifo_size;
-	unsigned char reserved[64];
-};
-
-#ifdef CONFIG_SND_SUPPORT_OLD_API
-#define SNDRV_PCM_IOCTL_HW_REFINE_OLD _IOWR('A', 0x10, struct snd_pcm_hw_params_old)
-#define SNDRV_PCM_IOCTL_HW_PARAMS_OLD _IOWR('A', 0x11, struct snd_pcm_hw_params_old)
-
-static int snd_pcm_hw_refine_old_user(struct snd_pcm_substream *substream,
-				      struct snd_pcm_hw_params_old __user * _oparams);
-static int snd_pcm_hw_params_old_user(struct snd_pcm_substream *substream,
-				      struct snd_pcm_hw_params_old __user * _oparams);
-#endif
-static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream);
-
-/*
- *
- */
-
-DEFINE_RWLOCK(snd_pcm_link_rwlock);
-EXPORT_SYMBOL(snd_pcm_link_rwlock);
-
-static DECLARE_RWSEM(snd_pcm_link_rwsem);
-
-static inline mm_segment_t snd_enter_user(void)
-{
-	mm_segment_t fs = get_fs();
-	set_fs(get_ds());
-	return fs;
-}
-
-static inline void snd_leave_user(mm_segment_t fs)
-{
-	set_fs(fs);
-}
-
-
-
-int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info)
-{
-	struct snd_pcm_runtime *runtime;
-	struct snd_pcm *pcm = substream->pcm;
-	struct snd_pcm_str *pstr = substream->pstr;
-
-	memset(info, 0, sizeof(*info));
-	info->card = pcm->card->number;
-	info->device = pcm->device;
-	info->stream = substream->stream;
-	info->subdevice = substream->number;
-	strlcpy(info->id, pcm->id, sizeof(info->id));
-	strlcpy(info->name, pcm->name, sizeof(info->name));
-	info->dev_class = pcm->dev_class;
-	info->dev_subclass = pcm->dev_subclass;
-	info->subdevices_count = pstr->substream_count;
-	info->subdevices_avail = pstr->substream_count - pstr->substream_opened;
-	strlcpy(info->subname, substream->name, sizeof(info->subname));
-	runtime = substream->runtime;
-	/* AB: FIXME!!! This is definitely nonsense */
-	if (runtime) {
-		info->sync = runtime->sync;
-		substream->ops->ioctl(substream, SNDRV_PCM_IOCTL1_INFO, info);
-	}
-	return 0;
-}
-
-int snd_pcm_info_user(struct snd_pcm_substream *substream,
-		      struct snd_pcm_info __user * _info)
-{
-	struct snd_pcm_info *info;
-	int err;
-
-	info = kmalloc(sizeof(*info), GFP_KERNEL);
-	if (! info)
-		return -ENOMEM;
-	err = snd_pcm_info(substream, info);
-	if (err >= 0) {
-		if (copy_to_user(_info, info, sizeof(*info)))
-			err = -EFAULT;
-	}
-	kfree(info);
-	return err;
-}
-
-#undef RULES_DEBUG
-
-#ifdef RULES_DEBUG
-#define HW_PARAM(v) [SNDRV_PCM_HW_PARAM_##v] = #v
-char *snd_pcm_hw_param_names[] = {
-	HW_PARAM(ACCESS),
-	HW_PARAM(FORMAT),
-	HW_PARAM(SUBFORMAT),
-	HW_PARAM(SAMPLE_BITS),
-	HW_PARAM(FRAME_BITS),
-	HW_PARAM(CHANNELS),
-	HW_PARAM(RATE),
-	HW_PARAM(PERIOD_TIME),
-	HW_PARAM(PERIOD_SIZE),
-	HW_PARAM(PERIOD_BYTES),
-	HW_PARAM(PERIODS),
-	HW_PARAM(BUFFER_TIME),
-	HW_PARAM(BUFFER_SIZE),
-	HW_PARAM(BUFFER_BYTES),
-	HW_PARAM(TICK_TIME),
-};
-#endif
-
-int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
-		      struct snd_pcm_hw_params *params)
-{
-	unsigned int k;
-	struct snd_pcm_hardware *hw;
-	struct snd_interval *i = NULL;
-	struct snd_mask *m = NULL;
-	struct snd_pcm_hw_constraints *constrs = &substream->runtime->hw_constraints;
-	unsigned int rstamps[constrs->rules_num];
-	unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1];
-	unsigned int stamp = 2;
-	int changed, again;
-
-	params->info = 0;
-	params->fifo_size = 0;
-	if (params->rmask & (1 << SNDRV_PCM_HW_PARAM_SAMPLE_BITS))
-		params->msbits = 0;
-	if (params->rmask & (1 << SNDRV_PCM_HW_PARAM_RATE)) {
-		params->rate_num = 0;
-		params->rate_den = 0;
-	}
-
-	for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k <= SNDRV_PCM_HW_PARAM_LAST_MASK; k++) {
-		m = hw_param_mask(params, k);
-		if (snd_mask_empty(m))
-			return -EINVAL;
-		if (!(params->rmask & (1 << k)))
-			continue;
-#ifdef RULES_DEBUG
-		printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]);
-		printk("%04x%04x%04x%04x -> ", m->bits[3], m->bits[2], m->bits[1], m->bits[0]);
-#endif
-		changed = snd_mask_refine(m, constrs_mask(constrs, k));
-#ifdef RULES_DEBUG
-		printk("%04x%04x%04x%04x\n", m->bits[3], m->bits[2], m->bits[1], m->bits[0]);
-#endif
-		if (changed)
-			params->cmask |= 1 << k;
-		if (changed < 0)
-			return changed;
-	}
-
-	for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) {
-		i = hw_param_interval(params, k);
-		if (snd_interval_empty(i))
-			return -EINVAL;
-		if (!(params->rmask & (1 << k)))
-			continue;
-#ifdef RULES_DEBUG
-		printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]);
-		if (i->empty)
-			printk("empty");
-		else
-			printk("%c%u %u%c",
-			       i->openmin ? '(' : '[', i->min,
-			       i->max, i->openmax ? ')' : ']');
-		printk(" -> ");
-#endif
-		changed = snd_interval_refine(i, constrs_interval(constrs, k));
-#ifdef RULES_DEBUG
-		if (i->empty)
-			printk("empty\n");
-		else
-			printk("%c%u %u%c\n",
-			       i->openmin ? '(' : '[', i->min,
-			       i->max, i->openmax ? ')' : ']');
-#endif
-		if (changed)
-			params->cmask |= 1 << k;
-		if (changed < 0)
-			return changed;
-	}
-
-	for (k = 0; k < constrs->rules_num; k++)
-		rstamps[k] = 0;
-	for (k = 0; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++)
-		vstamps[k] = (params->rmask & (1 << k)) ? 1 : 0;
-	do {
-		again = 0;
-		for (k = 0; k < constrs->rules_num; k++) {
-			struct snd_pcm_hw_rule *r = &constrs->rules[k];
-			unsigned int d;
-			int doit = 0;
-			if (r->cond && !(r->cond & params->flags))
-				continue;
-			for (d = 0; r->deps[d] >= 0; d++) {
-				if (vstamps[r->deps[d]] > rstamps[k]) {
-					doit = 1;
-					break;
-				}
-			}
-			if (!doit)
-				continue;
-#ifdef RULES_DEBUG
-			printk(KERN_DEBUG "Rule %d [%p]: ", k, r->func);
-			if (r->var >= 0) {
-				printk("%s = ", snd_pcm_hw_param_names[r->var]);
-				if (hw_is_mask(r->var)) {
-					m = hw_param_mask(params, r->var);
-					printk("%x", *m->bits);
-				} else {
-					i = hw_param_interval(params, r->var);
-					if (i->empty)
-						printk("empty");
-					else
-						printk("%c%u %u%c",
-						       i->openmin ? '(' : '[', i->min,
-						       i->max, i->openmax ? ')' : ']');
-				}
-			}
-#endif
-			changed = r->func(params, r);
-#ifdef RULES_DEBUG
-			if (r->var >= 0) {
-				printk(" -> ");
-				if (hw_is_mask(r->var))
-					printk("%x", *m->bits);
-				else {
-					if (i->empty)
-						printk("empty");
-					else
-						printk("%c%u %u%c",
-						       i->openmin ? '(' : '[', i->min,
-						       i->max, i->openmax ? ')' : ']');
-				}
-			}
-			printk("\n");
-#endif
-			rstamps[k] = stamp;
-			if (changed && r->var >= 0) {
-				params->cmask |= (1 << r->var);
-				vstamps[r->var] = stamp;
-				again = 1;
-			}
-			if (changed < 0)
-				return changed;
-			stamp++;
-		}
-	} while (again);
-	if (!params->msbits) {
-		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);
-		if (snd_interval_single(i))
-			params->msbits = snd_interval_value(i);
-	}
-
-	if (!params->rate_den) {
-		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
-		if (snd_interval_single(i)) {
-			params->rate_num = snd_interval_value(i);
-			params->rate_den = 1;
-		}
-	}
-
-	hw = &substream->runtime->hw;
-	if (!params->info)
-		params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;
-	if (!params->fifo_size) {
-		m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
-		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
-		if (snd_mask_min(m) == snd_mask_max(m) &&
-                    snd_interval_min(i) == snd_interval_max(i)) {
-			changed = substream->ops->ioctl(substream,
-					SNDRV_PCM_IOCTL1_FIFO_SIZE, params);
-			if (changed < 0)
-				return changed;
-		}
-	}
-	params->rmask = 0;
-	return 0;
-}
-
-EXPORT_SYMBOL(snd_pcm_hw_refine);
-
-static int snd_pcm_hw_refine_user(struct snd_pcm_substream *substream,
-				  struct snd_pcm_hw_params __user * _params)
-{
-	struct snd_pcm_hw_params *params;
-	int err;
-
-	params = memdup_user(_params, sizeof(*params));
-	if (IS_ERR(params))
-		return PTR_ERR(params);
-
-	err = snd_pcm_hw_refine(substream, params);
-	if (copy_to_user(_params, params, sizeof(*params))) {
-		if (!err)
-			err = -EFAULT;
-	}
-
-	kfree(params);
-	return err;
-}
-
-static int period_to_usecs(struct snd_pcm_runtime *runtime)
-{
-	int usecs;
-
-	if (! runtime->rate)
-		return -1; /* invalid */
-
-	/* take 75% of period time as the deadline */
-	usecs = (750000 / runtime->rate) * runtime->period_size;
-	usecs += ((750000 % runtime->rate) * runtime->period_size) /
-		runtime->rate;
-
-	return usecs;
-}
-
-static int calc_boundary(struct snd_pcm_runtime *runtime)
-{
-	uint64_t boundary;
-
-	boundary = (uint64_t)runtime->buffer_size *
-		   (uint64_t)runtime->period_size;
-#if BITS_PER_LONG < 64
-	/* try to find lowest common multiple for buffer and period */
-	if (boundary > LONG_MAX - runtime->buffer_size) {
-		uint32_t remainder = -1;
-		uint32_t divident = runtime->buffer_size;
-		uint32_t divisor = runtime->period_size;
-		while (remainder) {
-			remainder = divident % divisor;
-			if (remainder) {
-				divident = divisor;
-				divisor = remainder;
-			}
-		}
-		boundary = div_u64(boundary, divisor);
-		if (boundary > LONG_MAX - runtime->buffer_size)
-			return -ERANGE;
-	}
-#endif
-	if (boundary == 0)
-		return -ERANGE;
-	runtime->boundary = boundary;
-	while (runtime->boundary * 2 <= LONG_MAX - runtime->buffer_size)
-		runtime->boundary *= 2;
-	return 0;
-}
-
-static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
-			     struct snd_pcm_hw_params *params)
-{
-	struct snd_pcm_runtime *runtime;
-	int err, usecs;
-	unsigned int bits;
-	snd_pcm_uframes_t frames;
-
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_OPEN:
-	case SNDRV_PCM_STATE_SETUP:
-	case SNDRV_PCM_STATE_PREPARED:
-		break;
-	default:
-		snd_pcm_stream_unlock_irq(substream);
-		return -EBADFD;
-	}
-	snd_pcm_stream_unlock_irq(substream);
-#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
-	if (!substream->oss.oss)
-#endif
-		if (atomic_read(&substream->mmap_count))
-			return -EBADFD;
-
-	params->rmask = ~0U;
-	err = snd_pcm_hw_refine(substream, params);
-	if (err < 0)
-		goto _error;
-
-	err = snd_pcm_hw_params_choose(substream, params);
-	if (err < 0)
-		goto _error;
-
-	if (substream->ops->hw_params != NULL) {
-		err = substream->ops->hw_params(substream, params);
-		if (err < 0)
-			goto _error;
-	}
-
-	runtime->access = params_access(params);
-	runtime->format = params_format(params);
-	runtime->subformat = params_subformat(params);
-	runtime->channels = params_channels(params);
-	runtime->rate = params_rate(params);
-	runtime->period_size = params_period_size(params);
-	runtime->periods = params_periods(params);
-	runtime->buffer_size = params_buffer_size(params);
-	runtime->info = params->info;
-	runtime->rate_num = params->rate_num;
-	runtime->rate_den = params->rate_den;
-
-	bits = snd_pcm_format_physical_width(runtime->format);
-	runtime->sample_bits = bits;
-	bits *= runtime->channels;
-	runtime->frame_bits = bits;
-	frames = 1;
-	while (bits % 8 != 0) {
-		bits *= 2;
-		frames *= 2;
-	}
-	runtime->byte_align = bits / 8;
-	runtime->min_align = frames;
-
-	/* Default sw params */
-	runtime->tstamp_mode = SNDRV_PCM_TSTAMP_NONE;
-	runtime->period_step = 1;
-	runtime->control->avail_min = runtime->period_size;
-	runtime->start_threshold = 1;
-	runtime->stop_threshold = runtime->buffer_size;
-	runtime->silence_threshold = 0;
-	runtime->silence_size = 0;
-	err = calc_boundary(runtime);
-	if (err < 0)
-		goto _error;
-
-	snd_pcm_timer_resolution_change(substream);
-	runtime->status->state = SNDRV_PCM_STATE_SETUP;
-
-	pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
-				substream->latency_id);
-	if ((usecs = period_to_usecs(runtime)) >= 0)
-		pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY,
-					substream->latency_id, usecs);
-	return 0;
- _error:
-	/* hardware might be unuseable from this time,
-	   so we force application to retry to set
-	   the correct hardware parameter settings */
-	runtime->status->state = SNDRV_PCM_STATE_OPEN;
-	if (substream->ops->hw_free != NULL)
-		substream->ops->hw_free(substream);
-	return err;
-}
-
-static int snd_pcm_hw_params_user(struct snd_pcm_substream *substream,
-				  struct snd_pcm_hw_params __user * _params)
-{
-	struct snd_pcm_hw_params *params;
-	int err;
-
-	params = memdup_user(_params, sizeof(*params));
-	if (IS_ERR(params))
-		return PTR_ERR(params);
-
-	err = snd_pcm_hw_params(substream, params);
-	if (copy_to_user(_params, params, sizeof(*params))) {
-		if (!err)
-			err = -EFAULT;
-	}
-
-	kfree(params);
-	return err;
-}
-
-static int snd_pcm_hw_free(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime;
-	int result = 0;
-
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_SETUP:
-	case SNDRV_PCM_STATE_PREPARED:
-		break;
-	default:
-		snd_pcm_stream_unlock_irq(substream);
-		return -EBADFD;
-	}
-	snd_pcm_stream_unlock_irq(substream);
-	if (atomic_read(&substream->mmap_count))
-		return -EBADFD;
-	if (substream->ops->hw_free)
-		result = substream->ops->hw_free(substream);
-	runtime->status->state = SNDRV_PCM_STATE_OPEN;
-	pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
-		substream->latency_id);
-	return result;
-}
-
-static int snd_pcm_sw_params(struct snd_pcm_substream *substream,
-			     struct snd_pcm_sw_params *params)
-{
-	struct snd_pcm_runtime *runtime;
-	int err;
-
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	snd_pcm_stream_lock_irq(substream);
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN) {
-		snd_pcm_stream_unlock_irq(substream);
-		return -EBADFD;
-	}
-	snd_pcm_stream_unlock_irq(substream);
-
-	if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST)
-		return -EINVAL;
-	if (params->avail_min == 0)
-		return -EINVAL;
-	if (params->silence_size >= runtime->boundary) {
-		if (params->silence_threshold != 0)
-			return -EINVAL;
-	} else {
-		if (params->silence_size > params->silence_threshold)
-			return -EINVAL;
-		if (params->silence_threshold > runtime->buffer_size)
-			return -EINVAL;
-	}
-	err = 0;
-	snd_pcm_stream_lock_irq(substream);
-	runtime->tstamp_mode = params->tstamp_mode;
-	runtime->period_step = params->period_step;
-	runtime->control->avail_min = params->avail_min;
-	runtime->start_threshold = params->start_threshold;
-	runtime->stop_threshold = params->stop_threshold;
-	runtime->silence_threshold = params->silence_threshold;
-	runtime->silence_size = params->silence_size;
-        params->boundary = runtime->boundary;
-	if (snd_pcm_running(substream)) {
-		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
-		    runtime->silence_size > 0)
-			snd_pcm_playback_silence(substream, ULONG_MAX);
-		err = snd_pcm_update_state(substream, runtime);
-	}
-	snd_pcm_stream_unlock_irq(substream);
-	return err;
-}
-
-static int snd_pcm_sw_params_user(struct snd_pcm_substream *substream,
-				  struct snd_pcm_sw_params __user * _params)
-{
-	struct snd_pcm_sw_params params;
-	int err;
-	if (copy_from_user(&params, _params, sizeof(params)))
-		return -EFAULT;
-	err = snd_pcm_sw_params(substream, &params);
-	if (copy_to_user(_params, &params, sizeof(params)))
-		return -EFAULT;
-	return err;
-}
-
-int snd_pcm_status(struct snd_pcm_substream *substream,
-		   struct snd_pcm_status *status)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-
-	//giovanni snd_pcm_stream_lock_irq(substream);
-	status->state = runtime->status->state;
-	status->suspended_state = runtime->status->suspended_state;
-	if (status->state == SNDRV_PCM_STATE_OPEN)
-		goto _end;
-	status->trigger_tstamp = runtime->trigger_tstamp;
-	if (snd_pcm_running(substream)) {
-		snd_pcm_update_hw_ptr(substream);
-		if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) {
-			status->tstamp = runtime->status->tstamp;
-			goto _tstamp_end;
-		}
-	}
-	snd_pcm_gettime(runtime, &status->tstamp);
- _tstamp_end:
-	status->appl_ptr = runtime->control->appl_ptr;
-	status->hw_ptr = runtime->status->hw_ptr;
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		status->avail = snd_pcm_playback_avail(runtime);
-		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING ||
-		    runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
-			status->delay = runtime->buffer_size - status->avail;
-			status->delay += runtime->delay;
-		} else
-			status->delay = 0;
-	} else {
-		status->avail = snd_pcm_capture_avail(runtime);
-		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING)
-			status->delay = status->avail + runtime->delay;
-		else
-			status->delay = 0;
-	}
-	status->avail_max = runtime->avail_max;
-	status->overrange = runtime->overrange;
-	runtime->avail_max = 0;
-	runtime->overrange = 0;
- _end:
- 	//giovanni snd_pcm_stream_unlock_irq(substream);
-	return 0;
-}
-
-static int snd_pcm_status_user(struct snd_pcm_substream *substream,
-			       struct snd_pcm_status __user * _status)
-{
-	struct snd_pcm_status status;
-	int res;
-
-	memset(&status, 0, sizeof(status));
-	res = snd_pcm_status(substream, &status);
-	if (res < 0)
-		return res;
-	if (copy_to_user(_status, &status, sizeof(status)))
-		return -EFAULT;
-	return 0;
-}
-
-static int snd_pcm_channel_info(struct snd_pcm_substream *substream,
-				struct snd_pcm_channel_info * info)
-{
-	struct snd_pcm_runtime *runtime;
-	unsigned int channel;
-
-	channel = info->channel;
-	runtime = substream->runtime;
-	//giovanni snd_pcm_stream_lock_irq(substream);
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN) {
-		//giovanni snd_pcm_stream_unlock_irq(substream);
-		return -EBADFD;
-	}
-	//giovanni snd_pcm_stream_unlock_irq(substream);
-	if (channel >= runtime->channels)
-		return -EINVAL;
-	memset(info, 0, sizeof(*info));
-	info->channel = channel;
-	return substream->ops->ioctl(substream, SNDRV_PCM_IOCTL1_CHANNEL_INFO, info);
-}
-
-static int snd_pcm_channel_info_user(struct snd_pcm_substream *substream,
-				     struct snd_pcm_channel_info __user * _info)
-{
-	struct snd_pcm_channel_info info;
-	int res;
-
-	if (copy_from_user(&info, _info, sizeof(info)))
-		return -EFAULT;
-	res = snd_pcm_channel_info(substream, &info);
-	if (res < 0)
-		return res;
-	if (copy_to_user(_info, &info, sizeof(info)))
-		return -EFAULT;
-	return 0;
-}
-
-static void snd_pcm_trigger_tstamp(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (runtime->trigger_master == NULL)
-		return;
-	if (runtime->trigger_master == substream) {
-		snd_pcm_gettime(runtime, &runtime->trigger_tstamp);
-	} else {
-		snd_pcm_trigger_tstamp(runtime->trigger_master);
-		runtime->trigger_tstamp = runtime->trigger_master->runtime->trigger_tstamp;
-	}
-	runtime->trigger_master = NULL;
-}
-
-struct action_ops {
-	int (*pre_action)(struct snd_pcm_substream *substream, int state);
-	int (*do_action)(struct snd_pcm_substream *substream, int state);
-	void (*undo_action)(struct snd_pcm_substream *substream, int state);
-	void (*post_action)(struct snd_pcm_substream *substream, int state);
-};
-
-/*
- *  this functions is core for handling of linked stream
- *  Note: the stream state might be changed also on failure
- *  Note2: call with calling stream lock + link lock
- */
-static int snd_pcm_action_group(struct action_ops *ops,
-				struct snd_pcm_substream *substream,
-				int state, int do_lock)
-{
-	struct snd_pcm_substream *s = NULL;
-	struct snd_pcm_substream *s1;
-	int res = 0;
-
-	snd_pcm_group_for_each_entry(s, substream) {
-		if (do_lock && s != substream)
-			spin_lock_nested(&s->self_group.lock,
-					 SINGLE_DEPTH_NESTING);
-		res = ops->pre_action(s, state);
-		if (res < 0)
-			goto _unlock;
-	}
-	snd_pcm_group_for_each_entry(s, substream) {
-		res = ops->do_action(s, state);
-		if (res < 0) {
-			if (ops->undo_action) {
-				snd_pcm_group_for_each_entry(s1, substream) {
-					if (s1 == s) /* failed stream */
-						break;
-					ops->undo_action(s1, state);
-				}
-			}
-			s = NULL; /* unlock all */
-			goto _unlock;
-		}
-	}
-	snd_pcm_group_for_each_entry(s, substream) {
-		ops->post_action(s, state);
-	}
- _unlock:
-	if (do_lock) {
-		/* unlock streams */
-		snd_pcm_group_for_each_entry(s1, substream) {
-			if (s1 != substream)
-				spin_unlock(&s1->self_group.lock);
-			if (s1 == s)	/* end */
-				break;
-		}
-	}
-	return res;
-}
-
-/*
- *  Note: call with stream lock
- */
-static int snd_pcm_action_single(struct action_ops *ops,
-				 struct snd_pcm_substream *substream,
-				 int state)
-{
-	int res;
-
-	res = ops->pre_action(substream, state);
-	if (res < 0)
-		return res;
-	res = ops->do_action(substream, state);
-	if (res == 0)
-		ops->post_action(substream, state);
-	else if (ops->undo_action)
-		ops->undo_action(substream, state);
-	return res;
-}
-
-/*
- *  Note: call with stream lock
- */
-static int snd_pcm_action(struct action_ops *ops,
-			  struct snd_pcm_substream *substream,
-			  int state)
-{
-	int res;
-
-	if (snd_pcm_stream_linked(substream)) {
-		if (!spin_trylock(&substream->group->lock)) {
-			spin_unlock(&substream->self_group.lock);
-			spin_lock(&substream->group->lock);
-			spin_lock(&substream->self_group.lock);
-		}
-		res = snd_pcm_action_group(ops, substream, state, 1);
-		spin_unlock(&substream->group->lock);
-	} else {
-		res = snd_pcm_action_single(ops, substream, state);
-	}
-	return res;
-}
-
-/*
- *  Note: don't use any locks before
- */
-static int snd_pcm_action_lock_irq(struct action_ops *ops,
-				   struct snd_pcm_substream *substream,
-				   int state)
-{
-	int res;
-
-	read_lock_irq(&snd_pcm_link_rwlock);
-	if (snd_pcm_stream_linked(substream)) {
-		spin_lock(&substream->group->lock);
-		spin_lock(&substream->self_group.lock);
-		res = snd_pcm_action_group(ops, substream, state, 1);
-		spin_unlock(&substream->self_group.lock);
-		spin_unlock(&substream->group->lock);
-	} else {
-		spin_lock(&substream->self_group.lock);
-		res = snd_pcm_action_single(ops, substream, state);
-		spin_unlock(&substream->self_group.lock);
-	}
-	read_unlock_irq(&snd_pcm_link_rwlock);
-	return res;
-}
-
-/*
- */
-static int snd_pcm_action_nonatomic(struct action_ops *ops,
-				    struct snd_pcm_substream *substream,
-				    int state)
-{
-	int res;
-
-	down_read(&snd_pcm_link_rwsem);
-	if (snd_pcm_stream_linked(substream))
-		res = snd_pcm_action_group(ops, substream, state, 0);
-	else
-		res = snd_pcm_action_single(ops, substream, state);
-	up_read(&snd_pcm_link_rwsem);
-	return res;
-}
-
-/*
- * start callbacks
- */
-static int snd_pcm_pre_start(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (runtime->status->state != SNDRV_PCM_STATE_PREPARED)
-		return -EBADFD;
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
-	    !snd_pcm_playback_data(substream))
-		return -EPIPE;
-	runtime->trigger_master = substream;
-	return 0;
-}
-
-static int snd_pcm_do_start(struct snd_pcm_substream *substream, int state)
-{
-	if (substream->runtime->trigger_master != substream)
-		return 0;
-	return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_START);
-}
-
-static void snd_pcm_undo_start(struct snd_pcm_substream *substream, int state)
-{
-	if (substream->runtime->trigger_master == substream)
-		substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_STOP);
-}
-
-static void snd_pcm_post_start(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_trigger_tstamp(substream);
-	runtime->hw_ptr_jiffies = jiffies;
-	runtime->status->state = state;
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
-	    runtime->silence_size > 0)
-		snd_pcm_playback_silence(substream, ULONG_MAX);
-	if (substream->timer)
-		snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSTART,
-				 &runtime->trigger_tstamp);
-}
-
-static struct action_ops snd_pcm_action_start = {
-	.pre_action = snd_pcm_pre_start,
-	.do_action = snd_pcm_do_start,
-	.undo_action = snd_pcm_undo_start,
-	.post_action = snd_pcm_post_start
-};
-
-/**
- * snd_pcm_start - start all linked streams
- * @substream: the PCM substream instance
- */
-int snd_pcm_start(struct snd_pcm_substream *substream)
-{
-	return snd_pcm_action(&snd_pcm_action_start, substream,
-			      SNDRV_PCM_STATE_RUNNING);
-}
-
-/*
- * stop callbacks
- */
-static int snd_pcm_pre_stop(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-		return -EBADFD;
-	runtime->trigger_master = substream;
-	return 0;
-}
-
-static int snd_pcm_do_stop(struct snd_pcm_substream *substream, int state)
-{
-	if (substream->runtime->trigger_master == substream &&
-	    snd_pcm_running(substream))
-		substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_STOP);
-	return 0; /* unconditonally stop all substreams */
-}
-
-static void snd_pcm_post_stop(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (runtime->status->state != state) {
-		snd_pcm_trigger_tstamp(substream);
-		if (substream->timer)
-			snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSTOP,
-					 &runtime->trigger_tstamp);
-		runtime->status->state = state;
-	}
-	wake_up(&runtime->sleep);
-	wake_up(&runtime->tsleep);
-}
-
-static struct action_ops snd_pcm_action_stop = {
-	.pre_action = snd_pcm_pre_stop,
-	.do_action = snd_pcm_do_stop,
-	.post_action = snd_pcm_post_stop
-};
-
-/**
- * snd_pcm_stop - try to stop all running streams in the substream group
- * @substream: the PCM substream instance
- * @state: PCM state after stopping the stream
- *
- * The state of each stream is then changed to the given state unconditionally.
- */
-int snd_pcm_stop(struct snd_pcm_substream *substream, int state)
-{
-	return snd_pcm_action(&snd_pcm_action_stop, substream, state);
-}
-
-EXPORT_SYMBOL(snd_pcm_stop);
-
-/**
- * snd_pcm_drain_done - stop the DMA only when the given stream is playback
- * @substream: the PCM substream
- *
- * After stopping, the state is changed to SETUP.
- * Unlike snd_pcm_stop(), this affects only the given stream.
- */
-int snd_pcm_drain_done(struct snd_pcm_substream *substream)
-{
-	return snd_pcm_action_single(&snd_pcm_action_stop, substream,
-				     SNDRV_PCM_STATE_SETUP);
-}
-
-/*
- * pause callbacks
- */
-static int snd_pcm_pre_pause(struct snd_pcm_substream *substream, int push)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (!(runtime->info & SNDRV_PCM_INFO_PAUSE))
-		return -ENOSYS;
-	if (push) {
-		if (runtime->status->state != SNDRV_PCM_STATE_RUNNING)
-			return -EBADFD;
-	} else if (runtime->status->state != SNDRV_PCM_STATE_PAUSED)
-		return -EBADFD;
-	runtime->trigger_master = substream;
-	return 0;
-}
-
-static int snd_pcm_do_pause(struct snd_pcm_substream *substream, int push)
-{
-	if (substream->runtime->trigger_master != substream)
-		return 0;
-	/* The jiffies check in snd_pcm_update_hw_ptr*() is done by
-	 * a delta betwen the current jiffies, this gives a large enough
-	 * delta, effectively to skip the check once.
-	 */
-	substream->runtime->hw_ptr_jiffies = jiffies - HZ * 1000;
-	return substream->ops->trigger(substream,
-				       push ? SNDRV_PCM_TRIGGER_PAUSE_PUSH :
-					      SNDRV_PCM_TRIGGER_PAUSE_RELEASE);
-}
-
-static void snd_pcm_undo_pause(struct snd_pcm_substream *substream, int push)
-{
-	if (substream->runtime->trigger_master == substream)
-		substream->ops->trigger(substream,
-					push ? SNDRV_PCM_TRIGGER_PAUSE_RELEASE :
-					SNDRV_PCM_TRIGGER_PAUSE_PUSH);
-}
-
-static void snd_pcm_post_pause(struct snd_pcm_substream *substream, int push)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_trigger_tstamp(substream);
-	if (push) {
-		runtime->status->state = SNDRV_PCM_STATE_PAUSED;
-		if (substream->timer)
-			snd_timer_notify(substream->timer,
-					 SNDRV_TIMER_EVENT_MPAUSE,
-					 &runtime->trigger_tstamp);
-		wake_up(&runtime->sleep);
-		wake_up(&runtime->tsleep);
-	} else {
-		runtime->status->state = SNDRV_PCM_STATE_RUNNING;
-		if (substream->timer)
-			snd_timer_notify(substream->timer,
-					 SNDRV_TIMER_EVENT_MCONTINUE,
-					 &runtime->trigger_tstamp);
-	}
-}
-
-static struct action_ops snd_pcm_action_pause = {
-	.pre_action = snd_pcm_pre_pause,
-	.do_action = snd_pcm_do_pause,
-	.undo_action = snd_pcm_undo_pause,
-	.post_action = snd_pcm_post_pause
-};
-
-/*
- * Push/release the pause for all linked streams.
- */
-static int snd_pcm_pause(struct snd_pcm_substream *substream, int push)
-{
-	return snd_pcm_action(&snd_pcm_action_pause, substream, push);
-}
-
-#ifdef CONFIG_PM
-/* suspend */
-
-static int snd_pcm_pre_suspend(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)
-		return -EBUSY;
-	runtime->trigger_master = substream;
-	return 0;
-}
-
-static int snd_pcm_do_suspend(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (runtime->trigger_master != substream)
-		return 0;
-	if (! snd_pcm_running(substream))
-		return 0;
-	substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_SUSPEND);
-	return 0; /* suspend unconditionally */
-}
-
-static void snd_pcm_post_suspend(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_trigger_tstamp(substream);
-	if (substream->timer)
-		snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSUSPEND,
-				 &runtime->trigger_tstamp);
-	runtime->status->suspended_state = runtime->status->state;
-	runtime->status->state = SNDRV_PCM_STATE_SUSPENDED;
-	wake_up(&runtime->sleep);
-	wake_up(&runtime->tsleep);
-}
-
-static struct action_ops snd_pcm_action_suspend = {
-	.pre_action = snd_pcm_pre_suspend,
-	.do_action = snd_pcm_do_suspend,
-	.post_action = snd_pcm_post_suspend
-};
-
-/**
- * snd_pcm_suspend - trigger SUSPEND to all linked streams
- * @substream: the PCM substream
- *
- * After this call, all streams are changed to SUSPENDED state.
- */
-int snd_pcm_suspend(struct snd_pcm_substream *substream)
-{
-	int err;
-	unsigned long flags;
-
-	if (! substream)
-		return 0;
-
-	snd_pcm_stream_lock_irqsave(substream, flags);
-	err = snd_pcm_action(&snd_pcm_action_suspend, substream, 0);
-	snd_pcm_stream_unlock_irqrestore(substream, flags);
-	return err;
-}
-
-EXPORT_SYMBOL(snd_pcm_suspend);
-
-/**
- * snd_pcm_suspend_all - trigger SUSPEND to all substreams in the given pcm
- * @pcm: the PCM instance
- *
- * After this call, all streams are changed to SUSPENDED state.
- */
-int snd_pcm_suspend_all(struct snd_pcm *pcm)
-{
-	struct snd_pcm_substream *substream;
-	int stream, err = 0;
-
-	if (! pcm)
-		return 0;
-
-	for (stream = 0; stream < 2; stream++) {
-		for (substream = pcm->streams[stream].substream;
-		     substream; substream = substream->next) {
-			/* FIXME: the open/close code should lock this as well */
-			if (substream->runtime == NULL)
-				continue;
-			err = snd_pcm_suspend(substream);
-			if (err < 0 && err != -EBUSY)
-				return err;
-		}
-	}
-	return 0;
-}
-
-EXPORT_SYMBOL(snd_pcm_suspend_all);
-
-/* resume */
-
-static int snd_pcm_pre_resume(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (!(runtime->info & SNDRV_PCM_INFO_RESUME))
-		return -ENOSYS;
-	runtime->trigger_master = substream;
-	return 0;
-}
-
-static int snd_pcm_do_resume(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (runtime->trigger_master != substream)
-		return 0;
-	/* DMA not running previously? */
-	if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING &&
-	    (runtime->status->suspended_state != SNDRV_PCM_STATE_DRAINING ||
-	     substream->stream != SNDRV_PCM_STREAM_PLAYBACK))
-		return 0;
-	return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_RESUME);
-}
-
-static void snd_pcm_undo_resume(struct snd_pcm_substream *substream, int state)
-{
-	if (substream->runtime->trigger_master == substream &&
-	    snd_pcm_running(substream))
-		substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_SUSPEND);
-}
-
-static void snd_pcm_post_resume(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_trigger_tstamp(substream);
-	if (substream->timer)
-		snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MRESUME,
-				 &runtime->trigger_tstamp);
-	runtime->status->state = runtime->status->suspended_state;
-}
-
-static struct action_ops snd_pcm_action_resume = {
-	.pre_action = snd_pcm_pre_resume,
-	.do_action = snd_pcm_do_resume,
-	.undo_action = snd_pcm_undo_resume,
-	.post_action = snd_pcm_post_resume
-};
-
-static int snd_pcm_resume(struct snd_pcm_substream *substream)
-{
-	struct snd_card *card = substream->pcm->card;
-	int res;
-
-	snd_power_lock(card);
-	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) >= 0)
-		res = snd_pcm_action_lock_irq(&snd_pcm_action_resume, substream, 0);
-	snd_power_unlock(card);
-	return res;
-}
-
-#else
-
-static int snd_pcm_resume(struct snd_pcm_substream *substream)
-{
-	return -ENOSYS;
-}
-
-#endif /* CONFIG_PM */
-
-/*
- * xrun ioctl
- *
- * Change the RUNNING stream(s) to XRUN state.
- */
-static int snd_pcm_xrun(struct snd_pcm_substream *substream)
-{
-	struct snd_card *card = substream->pcm->card;
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int result;
-
-	snd_power_lock(card);
-	if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
-		result = snd_power_wait(card, SNDRV_CTL_POWER_D0);
-		if (result < 0)
-			goto _unlock;
-	}
-
-	snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_XRUN:
-		result = 0;	/* already there */
-		break;
-	case SNDRV_PCM_STATE_RUNNING:
-		result = snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
-		break;
-	default:
-		result = -EBADFD;
-	}
-	snd_pcm_stream_unlock_irq(substream);
- _unlock:
-	snd_power_unlock(card);
-	return result;
-}
-
-/*
- * reset ioctl
- */
-static int snd_pcm_pre_reset(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_RUNNING:
-	case SNDRV_PCM_STATE_PREPARED:
-	case SNDRV_PCM_STATE_PAUSED:
-	case SNDRV_PCM_STATE_SUSPENDED:
-		return 0;
-	default:
-		return -EBADFD;
-	}
-}
-
-static int snd_pcm_do_reset(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int err = substream->ops->ioctl(substream, SNDRV_PCM_IOCTL1_RESET, NULL);
-	if (err < 0)
-		return err;
-	runtime->hw_ptr_base = 0;
-	runtime->hw_ptr_interrupt = runtime->status->hw_ptr -
-		runtime->status->hw_ptr % runtime->period_size;
-	runtime->silence_start = runtime->status->hw_ptr;
-	runtime->silence_filled = 0;
-	return 0;
-}
-
-static void snd_pcm_post_reset(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	runtime->control->appl_ptr = runtime->status->hw_ptr;
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
-	    runtime->silence_size > 0)
-		snd_pcm_playback_silence(substream, ULONG_MAX);
-}
-
-static struct action_ops snd_pcm_action_reset = {
-	.pre_action = snd_pcm_pre_reset,
-	.do_action = snd_pcm_do_reset,
-	.post_action = snd_pcm_post_reset
-};
-
-static int snd_pcm_reset(struct snd_pcm_substream *substream)
-{
-	return snd_pcm_action_nonatomic(&snd_pcm_action_reset, substream, 0);
-}
-
-/*
- * prepare ioctl
- */
-/* we use the second argument for updating f_flags */
-static int snd_pcm_pre_prepare(struct snd_pcm_substream *substream,
-			       int f_flags)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN ||
-	    runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED)
-		return -EBADFD;
-	if (snd_pcm_running(substream))
-		return -EBUSY;
-	substream->f_flags = f_flags;
-	return 0;
-}
-
-static int snd_pcm_do_prepare(struct snd_pcm_substream *substream, int state)
-{
-	int err;
-	err = substream->ops->prepare(substream);
-	if (err < 0)
-		return err;
-	return snd_pcm_do_reset(substream, 0);
-}
-
-static void snd_pcm_post_prepare(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	runtime->control->appl_ptr = runtime->status->hw_ptr;
-	runtime->status->state = SNDRV_PCM_STATE_PREPARED;
-}
-
-static struct action_ops snd_pcm_action_prepare = {
-	.pre_action = snd_pcm_pre_prepare,
-	.do_action = snd_pcm_do_prepare,
-	.post_action = snd_pcm_post_prepare
-};
-
-/**
- * snd_pcm_prepare - prepare the PCM substream to be triggerable
- * @substream: the PCM substream instance
- * @file: file to refer f_flags
- */
-static int snd_pcm_prepare(struct snd_pcm_substream *substream,
-			   struct file *file)
-{
-	int res;
-	struct snd_card *card = substream->pcm->card;
-	int f_flags;
-
-	if (file)
-		f_flags = file->f_flags;
-	else
-		f_flags = substream->f_flags;
-
-	snd_power_lock(card);
-	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) >= 0)
-		res = snd_pcm_action_nonatomic(&snd_pcm_action_prepare,
-					       substream, f_flags);
-	snd_power_unlock(card);
-	return res;
-}
-
-/*
- * drain ioctl
- */
-
-static int snd_pcm_pre_drain_init(struct snd_pcm_substream *substream, int state)
-{
-	substream->runtime->trigger_master = substream;
-	return 0;
-}
-
-static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream, int state)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		switch (runtime->status->state) {
-		case SNDRV_PCM_STATE_PREPARED:
-			/* start playback stream if possible */
-			if (! snd_pcm_playback_empty(substream)) {
-				snd_pcm_do_start(substream, SNDRV_PCM_STATE_DRAINING);
-				snd_pcm_post_start(substream, SNDRV_PCM_STATE_DRAINING);
-			}
-			break;
-		case SNDRV_PCM_STATE_RUNNING:
-			runtime->status->state = SNDRV_PCM_STATE_DRAINING;
-			break;
-		default:
-			break;
-		}
-	} else {
-		/* stop running stream */
-		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING) {
-			int new_state = snd_pcm_capture_avail(runtime) > 0 ?
-				SNDRV_PCM_STATE_DRAINING : SNDRV_PCM_STATE_SETUP;
-			snd_pcm_do_stop(substream, new_state);
-			snd_pcm_post_stop(substream, new_state);
-		}
-	}
-	return 0;
-}
-
-static void snd_pcm_post_drain_init(struct snd_pcm_substream *substream, int state)
-{
-}
-
-static struct action_ops snd_pcm_action_drain_init = {
-	.pre_action = snd_pcm_pre_drain_init,
-	.do_action = snd_pcm_do_drain_init,
-	.post_action = snd_pcm_post_drain_init
-};
-
-static int snd_pcm_drop(struct snd_pcm_substream *substream);
-
-/*
- * Drain the stream(s).
- * When the substream is linked, sync until the draining of all playback streams
- * is finished.
- * After this call, all streams are supposed to be either SETUP or DRAINING
- * (capture only) state.
- */
-static int snd_pcm_drain(struct snd_pcm_substream *substream,
-			 struct file *file)
-{
-	struct snd_card *card;
-	struct snd_pcm_runtime *runtime;
-	struct snd_pcm_substream *s;
-	wait_queue_t wait;
-	int result = 0;
-	int nonblock = 0;
-
-	card = substream->pcm->card;
-	runtime = substream->runtime;
-
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-		return -EBADFD;
-
-	snd_power_lock(card);
-	if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
-		result = snd_power_wait(card, SNDRV_CTL_POWER_D0);
-		if (result < 0) {
-			snd_power_unlock(card);
-			return result;
-		}
-	}
-
-	if (file) {
-		if (file->f_flags & O_NONBLOCK)
-			nonblock = 1;
-	} else if (substream->f_flags & O_NONBLOCK)
-		nonblock = 1;
-
-	down_read(&snd_pcm_link_rwsem);
-	snd_pcm_stream_lock_irq(substream);
-	/* resume pause */
-	if (runtime->status->state == SNDRV_PCM_STATE_PAUSED)
-		snd_pcm_pause(substream, 0);
-
-	/* pre-start/stop - all running streams are changed to DRAINING state */
-	result = snd_pcm_action(&snd_pcm_action_drain_init, substream, 0);
-	if (result < 0)
-		goto unlock;
-	/* in non-blocking, we don't wait in ioctl but let caller poll */
-	if (nonblock) {
-		result = -EAGAIN;
-		goto unlock;
-	}
-
-	for (;;) {
-		long tout;
-		struct snd_pcm_runtime *to_check;
-		if (signal_pending(current)) {
-			result = -ERESTARTSYS;
-			break;
-		}
-		/* find a substream to drain */
-		to_check = NULL;
-		snd_pcm_group_for_each_entry(s, substream) {
-			if (s->stream != SNDRV_PCM_STREAM_PLAYBACK)
-				continue;
-			runtime = s->runtime;
-			if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
-				to_check = runtime;
-				break;
-			}
-		}
-		if (!to_check)
-			break; /* all drained */
-		init_waitqueue_entry(&wait, current);
-		add_wait_queue(&to_check->sleep, &wait);
-		set_current_state(TASK_INTERRUPTIBLE);
-		snd_pcm_stream_unlock_irq(substream);
-		up_read(&snd_pcm_link_rwsem);
-		snd_power_unlock(card);
-		tout = schedule_timeout(10 * HZ);
-		snd_power_lock(card);
-		down_read(&snd_pcm_link_rwsem);
-		snd_pcm_stream_lock_irq(substream);
-		remove_wait_queue(&to_check->sleep, &wait);
-		if (tout == 0) {
-			if (substream->runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)
-				result = -ESTRPIPE;
-			else {
-				snd_printd("playback drain error (DMA or IRQ trouble?)\n");
-				snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);
-				result = -EIO;
-			}
-			break;
-		}
-	}
-
- unlock:
-	snd_pcm_stream_unlock_irq(substream);
-	up_read(&snd_pcm_link_rwsem);
-	snd_power_unlock(card);
-
-	return result;
-}
-
-/*
- * drop ioctl
- *
- * Immediately put all linked substreams into SETUP state.
- */
-static int snd_pcm_drop(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime;
-	struct snd_card *card;
-	int result = 0;
-
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	card = substream->pcm->card;
-
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN ||
-	    runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED ||
-	    runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)
-		return -EBADFD;
-
-	snd_pcm_stream_lock_irq(substream);
-	/* resume pause */
-	if (runtime->status->state == SNDRV_PCM_STATE_PAUSED)
-		snd_pcm_pause(substream, 0);
-
-	snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);
-	/* runtime->control->appl_ptr = runtime->status->hw_ptr; */
-	snd_pcm_stream_unlock_irq(substream);
-
-	return result;
-}
-
-
-/* WARNING: Don't forget to fput back the file */
-static struct file *snd_pcm_file_fd(int fd)
-{
-	struct file *file;
-	struct inode *inode;
-	unsigned int minor;
-
-	file = fget(fd);
-	if (!file)
-		return NULL;
-	inode = file->f_path.dentry->d_inode;
-	if (!S_ISCHR(inode->i_mode) ||
-	    imajor(inode) != snd_major) {
-		fput(file);
-		return NULL;
-	}
-	minor = iminor(inode);
-	if (!snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_PLAYBACK) &&
-	    !snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_CAPTURE)) {
-		fput(file);
-		return NULL;
-	}
-	return file;
-}
-
-/*
- * PCM link handling
- */
-static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)
-{
-	int res = 0;
-	struct file *file;
-	struct snd_pcm_file *pcm_file;
-	struct snd_pcm_substream *substream1;
-
-	file = snd_pcm_file_fd(fd);
-	if (!file)
-		return -EBADFD;
-	pcm_file = file->private_data;
-	substream1 = pcm_file->substream;
-	down_write(&snd_pcm_link_rwsem);
-	write_lock_irq(&snd_pcm_link_rwlock);
-	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN ||
-	    substream->runtime->status->state != substream1->runtime->status->state) {
-		res = -EBADFD;
-		goto _end;
-	}
-	if (snd_pcm_stream_linked(substream1)) {
-		res = -EALREADY;
-		goto _end;
-	}
-	if (!snd_pcm_stream_linked(substream)) {
-		substream->group = kmalloc(sizeof(struct snd_pcm_group), GFP_ATOMIC);
-		if (substream->group == NULL) {
-			res = -ENOMEM;
-			goto _end;
-		}
-		spin_lock_init(&substream->group->lock);
-		INIT_LIST_HEAD(&substream->group->substreams);
-		list_add_tail(&substream->link_list, &substream->group->substreams);
-		substream->group->count = 1;
-	}
-	list_add_tail(&substream1->link_list, &substream->group->substreams);
-	substream->group->count++;
-	substream1->group = substream->group;
- _end:
-	write_unlock_irq(&snd_pcm_link_rwlock);
-	up_write(&snd_pcm_link_rwsem);
-	fput(file);
-	return res;
-}
-
-static void relink_to_local(struct snd_pcm_substream *substream)
-{
-	substream->group = &substream->self_group;
-	INIT_LIST_HEAD(&substream->self_group.substreams);
-	list_add_tail(&substream->link_list, &substream->self_group.substreams);
-}
-
-static int snd_pcm_unlink(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_substream *s;
-	int res = 0;
-
-	down_write(&snd_pcm_link_rwsem);
-	write_lock_irq(&snd_pcm_link_rwlock);
-	if (!snd_pcm_stream_linked(substream)) {
-		res = -EALREADY;
-		goto _end;
-	}
-	list_del(&substream->link_list);
-	substream->group->count--;
-	if (substream->group->count == 1) {	/* detach the last stream, too */
-		snd_pcm_group_for_each_entry(s, substream) {
-			relink_to_local(s);
-			break;
-		}
-		kfree(substream->group);
-	}
-	relink_to_local(substream);
-       _end:
-	write_unlock_irq(&snd_pcm_link_rwlock);
-	up_write(&snd_pcm_link_rwsem);
-	return res;
-}
-
-/*
- * hw configurator
- */
-static int snd_pcm_hw_rule_mul(struct snd_pcm_hw_params *params,
-			       struct snd_pcm_hw_rule *rule)
-{
-	struct snd_interval t;
-	snd_interval_mul(hw_param_interval_c(params, rule->deps[0]),
-		     hw_param_interval_c(params, rule->deps[1]), &t);
-	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
-}
-
-static int snd_pcm_hw_rule_div(struct snd_pcm_hw_params *params,
-			       struct snd_pcm_hw_rule *rule)
-{
-	struct snd_interval t;
-	snd_interval_div(hw_param_interval_c(params, rule->deps[0]),
-		     hw_param_interval_c(params, rule->deps[1]), &t);
-	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
-}
-
-static int snd_pcm_hw_rule_muldivk(struct snd_pcm_hw_params *params,
-				   struct snd_pcm_hw_rule *rule)
-{
-	struct snd_interval t;
-	snd_interval_muldivk(hw_param_interval_c(params, rule->deps[0]),
-			 hw_param_interval_c(params, rule->deps[1]),
-			 (unsigned long) rule->private, &t);
-	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
-}
-
-static int snd_pcm_hw_rule_mulkdiv(struct snd_pcm_hw_params *params,
-				   struct snd_pcm_hw_rule *rule)
-{
-	struct snd_interval t;
-	snd_interval_mulkdiv(hw_param_interval_c(params, rule->deps[0]),
-			 (unsigned long) rule->private,
-			 hw_param_interval_c(params, rule->deps[1]), &t);
-	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
-}
-
-static int snd_pcm_hw_rule_format(struct snd_pcm_hw_params *params,
-				  struct snd_pcm_hw_rule *rule)
-{
-	unsigned int k;
-	struct snd_interval *i = hw_param_interval(params, rule->deps[0]);
-	struct snd_mask m;
-	struct snd_mask *mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
-	snd_mask_any(&m);
-	for (k = 0; k <= SNDRV_PCM_FORMAT_LAST; ++k) {
-		int bits;
-		if (! snd_mask_test(mask, k))
-			continue;
-		bits = snd_pcm_format_physical_width(k);
-		if (bits <= 0)
-			continue; /* ignore invalid formats */
-		if ((unsigned)bits < i->min || (unsigned)bits > i->max)
-			snd_mask_reset(&m, k);
-	}
-	return snd_mask_refine(mask, &m);
-}
-
-static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params,
-				       struct snd_pcm_hw_rule *rule)
-{
-	struct snd_interval t;
-	unsigned int k;
-	t.min = UINT_MAX;
-	t.max = 0;
-	t.openmin = 0;
-	t.openmax = 0;
-	for (k = 0; k <= SNDRV_PCM_FORMAT_LAST; ++k) {
-		int bits;
-		if (! snd_mask_test(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), k))
-			continue;
-		bits = snd_pcm_format_physical_width(k);
-		if (bits <= 0)
-			continue; /* ignore invalid formats */
-		if (t.min > (unsigned)bits)
-			t.min = bits;
-		if (t.max < (unsigned)bits)
-			t.max = bits;
-	}
-	t.integer = 1;
-	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
-}
-
-#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 12
-#error "Change this table"
-#endif
-
-static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,
-                                 48000, 64000, 88200, 96000, 176400, 192000 };
-
-const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {
-	.count = ARRAY_SIZE(rates),
-	.list = rates,
-};
-
-static int snd_pcm_hw_rule_rate(struct snd_pcm_hw_params *params,
-				struct snd_pcm_hw_rule *rule)
-{
-	struct snd_pcm_hardware *hw = rule->private;
-	return snd_interval_list(hw_param_interval(params, rule->var),
-				 snd_pcm_known_rates.count,
-				 snd_pcm_known_rates.list, hw->rates);
-}
-
-static int snd_pcm_hw_rule_buffer_bytes_max(struct snd_pcm_hw_params *params,
-					    struct snd_pcm_hw_rule *rule)
-{
-	struct snd_interval t;
-	struct snd_pcm_substream *substream = rule->private;
-	t.min = 0;
-	t.max = substream->buffer_bytes_max;
-	t.openmin = 0;
-	t.openmax = 0;
-	t.integer = 1;
-	return snd_interval_refine(hw_param_interval(params, rule->var), &t);
-}
-
-int snd_pcm_hw_constraints_init(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
-	int k, err;
-
-	for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k <= SNDRV_PCM_HW_PARAM_LAST_MASK; k++) {
-		snd_mask_any(constrs_mask(constrs, k));
-	}
-
-	for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) {
-		snd_interval_any(constrs_interval(constrs, k));
-	}
-
-	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_CHANNELS));
-	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_BUFFER_SIZE));
-	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_BUFFER_BYTES));
-	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_SAMPLE_BITS));
-	snd_interval_setinteger(constrs_interval(constrs, SNDRV_PCM_HW_PARAM_FRAME_BITS));
-
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT,
-				   snd_pcm_hw_rule_format, NULL,
-				   SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
-				  snd_pcm_hw_rule_sample_bits, NULL,
-				  SNDRV_PCM_HW_PARAM_FORMAT,
-				  SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
-				  snd_pcm_hw_rule_div, NULL,
-				  SNDRV_PCM_HW_PARAM_FRAME_BITS, SNDRV_PCM_HW_PARAM_CHANNELS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FRAME_BITS,
-				  snd_pcm_hw_rule_mul, NULL,
-				  SNDRV_PCM_HW_PARAM_SAMPLE_BITS, SNDRV_PCM_HW_PARAM_CHANNELS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FRAME_BITS,
-				  snd_pcm_hw_rule_mulkdiv, (void*) 8,
-				  SNDRV_PCM_HW_PARAM_PERIOD_BYTES, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FRAME_BITS,
-				  snd_pcm_hw_rule_mulkdiv, (void*) 8,
-				  SNDRV_PCM_HW_PARAM_BUFFER_BYTES, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-				  snd_pcm_hw_rule_div, NULL,
-				  SNDRV_PCM_HW_PARAM_FRAME_BITS, SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-				  snd_pcm_hw_rule_mulkdiv, (void*) 1000000,
-				  SNDRV_PCM_HW_PARAM_PERIOD_SIZE, SNDRV_PCM_HW_PARAM_PERIOD_TIME, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-				  snd_pcm_hw_rule_mulkdiv, (void*) 1000000,
-				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_BUFFER_TIME, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIODS,
-				  snd_pcm_hw_rule_div, NULL,
-				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-				  snd_pcm_hw_rule_div, NULL,
-				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_PERIODS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-				  snd_pcm_hw_rule_mulkdiv, (void*) 8,
-				  SNDRV_PCM_HW_PARAM_PERIOD_BYTES, SNDRV_PCM_HW_PARAM_FRAME_BITS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-				  snd_pcm_hw_rule_muldivk, (void*) 1000000,
-				  SNDRV_PCM_HW_PARAM_PERIOD_TIME, SNDRV_PCM_HW_PARAM_RATE, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
-				  snd_pcm_hw_rule_mul, NULL,
-				  SNDRV_PCM_HW_PARAM_PERIOD_SIZE, SNDRV_PCM_HW_PARAM_PERIODS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
-				  snd_pcm_hw_rule_mulkdiv, (void*) 8,
-				  SNDRV_PCM_HW_PARAM_BUFFER_BYTES, SNDRV_PCM_HW_PARAM_FRAME_BITS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
-				  snd_pcm_hw_rule_muldivk, (void*) 1000000,
-				  SNDRV_PCM_HW_PARAM_BUFFER_TIME, SNDRV_PCM_HW_PARAM_RATE, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
-				  snd_pcm_hw_rule_muldivk, (void*) 8,
-				  SNDRV_PCM_HW_PARAM_PERIOD_SIZE, SNDRV_PCM_HW_PARAM_FRAME_BITS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
-				  snd_pcm_hw_rule_muldivk, (void*) 8,
-				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_FRAME_BITS, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_TIME,
-				  snd_pcm_hw_rule_mulkdiv, (void*) 1000000,
-				  SNDRV_PCM_HW_PARAM_PERIOD_SIZE, SNDRV_PCM_HW_PARAM_RATE, -1);
-	if (err < 0)
-		return err;
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_TIME,
-				  snd_pcm_hw_rule_mulkdiv, (void*) 1000000,
-				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, SNDRV_PCM_HW_PARAM_RATE, -1);
-	if (err < 0)
-		return err;
-	return 0;
-}
-
-int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_pcm_hardware *hw = &runtime->hw;
-	int err;
-	unsigned int mask = 0;
-
-        if (hw->info & SNDRV_PCM_INFO_INTERLEAVED)
-		mask |= 1 << SNDRV_PCM_ACCESS_RW_INTERLEAVED;
-        if (hw->info & SNDRV_PCM_INFO_NONINTERLEAVED)
-		mask |= 1 << SNDRV_PCM_ACCESS_RW_NONINTERLEAVED;
-	if (hw->info & SNDRV_PCM_INFO_MMAP) {
-		if (hw->info & SNDRV_PCM_INFO_INTERLEAVED)
-			mask |= 1 << SNDRV_PCM_ACCESS_MMAP_INTERLEAVED;
-		if (hw->info & SNDRV_PCM_INFO_NONINTERLEAVED)
-			mask |= 1 << SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED;
-		if (hw->info & SNDRV_PCM_INFO_COMPLEX)
-			mask |= 1 << SNDRV_PCM_ACCESS_MMAP_COMPLEX;
-	}
-	err = snd_pcm_hw_constraint_mask(runtime, SNDRV_PCM_HW_PARAM_ACCESS, mask);
-	if (err < 0)
-		return err;
-
-	err = snd_pcm_hw_constraint_mask64(runtime, SNDRV_PCM_HW_PARAM_FORMAT, hw->formats);
-	if (err < 0)
-		return err;
-
-	err = snd_pcm_hw_constraint_mask(runtime, SNDRV_PCM_HW_PARAM_SUBFORMAT, 1 << SNDRV_PCM_SUBFORMAT_STD);
-	if (err < 0)
-		return err;
-
-	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS,
-					   hw->channels_min, hw->channels_max);
-	if (err < 0)
-		return err;
-
-	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE,
-					   hw->rate_min, hw->rate_max);
-	if (err < 0)
-		return err;
-
-	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
-					   hw->period_bytes_min, hw->period_bytes_max);
-	if (err < 0)
-		return err;
-
-	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIODS,
-					   hw->periods_min, hw->periods_max);
-	if (err < 0)
-		return err;
-
-	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
-					   hw->period_bytes_min, hw->buffer_bytes_max);
-	if (err < 0)
-		return err;
-
-	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
-				  snd_pcm_hw_rule_buffer_bytes_max, substream,
-				  SNDRV_PCM_HW_PARAM_BUFFER_BYTES, -1);
-	if (err < 0)
-		return err;
-
-	/* FIXME: remove */
-	if (runtime->dma_bytes) {
-		err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 0, runtime->dma_bytes);
-		if (err < 0)
-			return -EINVAL;
-	}
-
-	if (!(hw->rates & (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))) {
-		err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-					  snd_pcm_hw_rule_rate, hw,
-					  SNDRV_PCM_HW_PARAM_RATE, -1);
-		if (err < 0)
-			return err;
-	}
-
-	/* FIXME: this belong to lowlevel */
-	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
-
-	return 0;
-}
-
-static void pcm_release_private(struct snd_pcm_substream *substream)
-{
-	snd_pcm_unlink(substream);
-}
-
-void snd_pcm_release_substream(struct snd_pcm_substream *substream)
-{
-	substream->ref_count--;
-	if (substream->ref_count > 0)
-		return;
-
-	snd_pcm_drop(substream);
-	if (substream->hw_opened) {
-		if (substream->ops->hw_free != NULL)
-			substream->ops->hw_free(substream);
-		substream->ops->close(substream);
-		substream->hw_opened = 0;
-	}
-	if (substream->pcm_release) {
-		substream->pcm_release(substream);
-		substream->pcm_release = NULL;
-	}
-	snd_pcm_detach_substream(substream);
-}
-
-EXPORT_SYMBOL(snd_pcm_release_substream);
-
-int snd_pcm_open_substream(struct snd_pcm *pcm, int stream,
-			   struct file *file,
-			   struct snd_pcm_substream **rsubstream)
-{
-	struct snd_pcm_substream *substream;
-	int err;
-
-	err = snd_pcm_attach_substream(pcm, stream, file, &substream);
-	if (err < 0)
-		return err;
-	if (substream->ref_count > 1) {
-		*rsubstream = substream;
-		return 0;
-	}
-
-	err = snd_pcm_hw_constraints_init(substream);
-	if (err < 0) {
-		snd_printd("snd_pcm_hw_constraints_init failed\n");
-		goto error;
-	}
-
-	if ((err = substream->ops->open(substream)) < 0)
-		goto error;
-
-	substream->hw_opened = 1;
-
-	err = snd_pcm_hw_constraints_complete(substream);
-	if (err < 0) {
-		snd_printd("snd_pcm_hw_constraints_complete failed\n");
-		goto error;
-	}
-
-	*rsubstream = substream;
-	return 0;
-
- error:
-	snd_pcm_release_substream(substream);
-	return err;
-}
-
-EXPORT_SYMBOL(snd_pcm_open_substream);
-
-static int snd_pcm_open_file(struct file *file,
-			     struct snd_pcm *pcm,
-			     int stream,
-			     struct snd_pcm_file **rpcm_file)
-{
-	struct snd_pcm_file *pcm_file;
-	struct snd_pcm_substream *substream;
-	struct snd_pcm_str *str;
-	int err;
-
-	if (rpcm_file)
-		*rpcm_file = NULL;
-
-	err = snd_pcm_open_substream(pcm, stream, file, &substream);
-	if (err < 0)
-		return err;
-
-	pcm_file = kzalloc(sizeof(*pcm_file), GFP_KERNEL);
-	if (pcm_file == NULL) {
-		snd_pcm_release_substream(substream);
-		return -ENOMEM;
-	}
-	pcm_file->substream = substream;
-	if (substream->ref_count == 1) {
-		str = substream->pstr;
-		substream->file = pcm_file;
-		substream->pcm_release = pcm_release_private;
-	}
-	file->private_data = pcm_file;
-	if (rpcm_file)
-		*rpcm_file = pcm_file;
-	return 0;
-}
-
-static int snd_pcm_playback_open(struct inode *inode, struct file *file)
-{
-	struct snd_pcm *pcm;
-	int err = nonseekable_open(inode, file);
-	if (err < 0)
-		return err;
-	pcm = snd_lookup_minor_data(iminor(inode),
-				    SNDRV_DEVICE_TYPE_PCM_PLAYBACK);
-	return snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK);
-}
-
-static int snd_pcm_capture_open(struct inode *inode, struct file *file)
-{
-	struct snd_pcm *pcm;
-	int err = nonseekable_open(inode, file);
-	if (err < 0)
-		return err;
-	pcm = snd_lookup_minor_data(iminor(inode),
-				    SNDRV_DEVICE_TYPE_PCM_CAPTURE);
-	return snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE);
-}
-
-static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)
-{
-	int err;
-	struct snd_pcm_file *pcm_file;
-	wait_queue_t wait;
-
-	if (pcm == NULL) {
-		err = -ENODEV;
-		goto __error1;
-	}
-	err = snd_card_file_add(pcm->card, file);
-	if (err < 0)
-		goto __error1;
-	if (!try_module_get(pcm->card->module)) {
-		err = -EFAULT;
-		goto __error2;
-	}
-	init_waitqueue_entry(&wait, current);
-	add_wait_queue(&pcm->open_wait, &wait);
-	mutex_lock(&pcm->open_mutex);
-	while (1) {
-		err = snd_pcm_open_file(file, pcm, stream, &pcm_file);
-		if (err >= 0)
-			break;
-		if (err == -EAGAIN) {
-			if (file->f_flags & O_NONBLOCK) {
-				err = -EBUSY;
-				break;
-			}
-		} else
-			break;
-		set_current_state(TASK_INTERRUPTIBLE);
-		mutex_unlock(&pcm->open_mutex);
-		schedule();
-		mutex_lock(&pcm->open_mutex);
-		if (signal_pending(current)) {
-			err = -ERESTARTSYS;
-			break;
-		}
-	}
-	remove_wait_queue(&pcm->open_wait, &wait);
-	mutex_unlock(&pcm->open_mutex);
-	if (err < 0)
-		goto __error;
-	return err;
-
-      __error:
-	module_put(pcm->card->module);
-      __error2:
-      	snd_card_file_remove(pcm->card, file);
-      __error1:
-      	return err;
-}
-
-static int snd_pcm_release(struct inode *inode, struct file *file)
-{
-	struct snd_pcm *pcm;
-	struct snd_pcm_substream *substream;
-	struct snd_pcm_file *pcm_file;
-
-	pcm_file = file->private_data;
-	substream = pcm_file->substream;
-	if (snd_BUG_ON(!substream))
-		return -ENXIO;
-	pcm = substream->pcm;
-	mutex_lock(&pcm->open_mutex);
-	snd_pcm_release_substream(substream);
-	kfree(pcm_file);
-	mutex_unlock(&pcm->open_mutex);
-	wake_up(&pcm->open_wait);
-	module_put(pcm->card->module);
-	snd_card_file_remove(pcm->card, file);
-	return 0;
-}
-
-static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *substream,
-						 snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_sframes_t appl_ptr;
-	snd_pcm_sframes_t ret;
-	snd_pcm_sframes_t hw_avail;
-
-	if (frames == 0)
-		return 0;
-
-	snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_PREPARED:
-		break;
-	case SNDRV_PCM_STATE_DRAINING:
-	case SNDRV_PCM_STATE_RUNNING:
-		if (snd_pcm_update_hw_ptr(substream) >= 0)
-			break;
-		/* Fall through */
-	case SNDRV_PCM_STATE_XRUN:
-		ret = -EPIPE;
-		goto __end;
-	case SNDRV_PCM_STATE_SUSPENDED:
-		ret = -ESTRPIPE;
-		goto __end;
-	default:
-		ret = -EBADFD;
-		goto __end;
-	}
-
-	hw_avail = snd_pcm_playback_hw_avail(runtime);
-	if (hw_avail <= 0) {
-		ret = 0;
-		goto __end;
-	}
-	if (frames > (snd_pcm_uframes_t)hw_avail)
-		frames = hw_avail;
-	appl_ptr = runtime->control->appl_ptr - frames;
-	if (appl_ptr < 0)
-		appl_ptr += runtime->boundary;
-	runtime->control->appl_ptr = appl_ptr;
-	ret = frames;
- __end:
-	snd_pcm_stream_unlock_irq(substream);
-	return ret;
-}
-
-static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substream,
-						snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_sframes_t appl_ptr;
-	snd_pcm_sframes_t ret;
-	snd_pcm_sframes_t hw_avail;
-
-	if (frames == 0)
-		return 0;
-
-	snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_PREPARED:
-	case SNDRV_PCM_STATE_DRAINING:
-		break;
-	case SNDRV_PCM_STATE_RUNNING:
-		if (snd_pcm_update_hw_ptr(substream) >= 0)
-			break;
-		/* Fall through */
-	case SNDRV_PCM_STATE_XRUN:
-		ret = -EPIPE;
-		goto __end;
-	case SNDRV_PCM_STATE_SUSPENDED:
-		ret = -ESTRPIPE;
-		goto __end;
-	default:
-		ret = -EBADFD;
-		goto __end;
-	}
-
-	hw_avail = snd_pcm_capture_hw_avail(runtime);
-	if (hw_avail <= 0) {
-		ret = 0;
-		goto __end;
-	}
-	if (frames > (snd_pcm_uframes_t)hw_avail)
-		frames = hw_avail;
-	appl_ptr = runtime->control->appl_ptr - frames;
-	if (appl_ptr < 0)
-		appl_ptr += runtime->boundary;
-	runtime->control->appl_ptr = appl_ptr;
-	ret = frames;
- __end:
-	snd_pcm_stream_unlock_irq(substream);
-	return ret;
-}
-
-static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *substream,
-						  snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_sframes_t appl_ptr;
-	snd_pcm_sframes_t ret;
-	snd_pcm_sframes_t avail;
-
-	if (frames == 0)
-		return 0;
-
-	snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_PREPARED:
-	case SNDRV_PCM_STATE_PAUSED:
-		break;
-	case SNDRV_PCM_STATE_DRAINING:
-	case SNDRV_PCM_STATE_RUNNING:
-		if (snd_pcm_update_hw_ptr(substream) >= 0)
-			break;
-		/* Fall through */
-	case SNDRV_PCM_STATE_XRUN:
-		ret = -EPIPE;
-		goto __end;
-	case SNDRV_PCM_STATE_SUSPENDED:
-		ret = -ESTRPIPE;
-		goto __end;
-	default:
-		ret = -EBADFD;
-		goto __end;
-	}
-
-	avail = snd_pcm_playback_avail(runtime);
-	if (avail <= 0) {
-		ret = 0;
-		goto __end;
-	}
-	if (frames > (snd_pcm_uframes_t)avail)
-		frames = avail;
-	appl_ptr = runtime->control->appl_ptr + frames;
-	if (appl_ptr >= (snd_pcm_sframes_t)runtime->boundary)
-		appl_ptr -= runtime->boundary;
-	runtime->control->appl_ptr = appl_ptr;
-	ret = frames;
- __end:
-	snd_pcm_stream_unlock_irq(substream);
-	return ret;
-}
-
-static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *substream,
-						 snd_pcm_uframes_t frames)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	snd_pcm_sframes_t appl_ptr;
-	snd_pcm_sframes_t ret;
-	snd_pcm_sframes_t avail;
-
-	if (frames == 0)
-		return 0;
-
-	snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_PREPARED:
-	case SNDRV_PCM_STATE_DRAINING:
-	case SNDRV_PCM_STATE_PAUSED:
-		break;
-	case SNDRV_PCM_STATE_RUNNING:
-		if (snd_pcm_update_hw_ptr(substream) >= 0)
-			break;
-		/* Fall through */
-	case SNDRV_PCM_STATE_XRUN:
-		ret = -EPIPE;
-		goto __end;
-	case SNDRV_PCM_STATE_SUSPENDED:
-		ret = -ESTRPIPE;
-		goto __end;
-	default:
-		ret = -EBADFD;
-		goto __end;
-	}
-
-	avail = snd_pcm_capture_avail(runtime);
-	if (avail <= 0) {
-		ret = 0;
-		goto __end;
-	}
-	if (frames > (snd_pcm_uframes_t)avail)
-		frames = avail;
-	appl_ptr = runtime->control->appl_ptr + frames;
-	if (appl_ptr >= (snd_pcm_sframes_t)runtime->boundary)
-		appl_ptr -= runtime->boundary;
-	runtime->control->appl_ptr = appl_ptr;
-	ret = frames;
- __end:
-	snd_pcm_stream_unlock_irq(substream);
-	return ret;
-}
-
-static int snd_pcm_hwsync(struct snd_pcm_substream *substream)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int err;
-
-	snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_DRAINING:
-		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-			goto __badfd;
-	case SNDRV_PCM_STATE_RUNNING:
-		if ((err = snd_pcm_update_hw_ptr(substream)) < 0)
-			break;
-		/* Fall through */
-	case SNDRV_PCM_STATE_PREPARED:
-	case SNDRV_PCM_STATE_SUSPENDED:
-		err = 0;
-		break;
-	case SNDRV_PCM_STATE_XRUN:
-		err = -EPIPE;
-		break;
-	default:
-	      __badfd:
-		err = -EBADFD;
-		break;
-	}
-	snd_pcm_stream_unlock_irq(substream);
-	return err;
-}
-
-static int snd_pcm_delay(struct snd_pcm_substream *substream,
-			 snd_pcm_sframes_t __user *res)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int err;
-	snd_pcm_sframes_t n = 0;
-
-	//giovanni snd_pcm_stream_lock_irq(substream);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_DRAINING:
-		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-			goto __badfd;
-	case SNDRV_PCM_STATE_RUNNING:
-		if ((err = snd_pcm_update_hw_ptr(substream)) < 0)
-			break;
-		/* Fall through */
-	case SNDRV_PCM_STATE_PREPARED:
-	case SNDRV_PCM_STATE_SUSPENDED:
-		err = 0;
-		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-			n = snd_pcm_playback_hw_avail(runtime);
-		else
-			n = snd_pcm_capture_avail(runtime);
-		n += runtime->delay;
-		break;
-	case SNDRV_PCM_STATE_XRUN:
-		err = -EPIPE;
-		break;
-	default:
-	      __badfd:
-		err = -EBADFD;
-		break;
-	}
-	//giovanni snd_pcm_stream_unlock_irq(substream);
-	if (!err)
-		if (put_user(n, res))
-			err = -EFAULT;
-	return err;
-}
-
-static int snd_pcm_sync_ptr(struct snd_pcm_substream *substream,
-			    struct snd_pcm_sync_ptr __user *_sync_ptr)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_pcm_sync_ptr sync_ptr;
-	volatile struct snd_pcm_mmap_status *status;
-	volatile struct snd_pcm_mmap_control *control;
-	int err;
-
-	memset(&sync_ptr, 0, sizeof(sync_ptr));
-	if (get_user(sync_ptr.flags, (unsigned __user *)&(_sync_ptr->flags)))
-		return -EFAULT;
-	if (copy_from_user(&sync_ptr.c.control, &(_sync_ptr->c.control), sizeof(struct snd_pcm_mmap_control)))
-		return -EFAULT;
-	status = runtime->status;
-	control = runtime->control;
-	if (sync_ptr.flags & SNDRV_PCM_SYNC_PTR_HWSYNC) {
-		err = snd_pcm_hwsync(substream);
-		if (err < 0)
-			return err;
-	}
-	//giovanni snd_pcm_stream_lock_irq(substream);
-	if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_APPL))
-		control->appl_ptr = sync_ptr.c.control.appl_ptr;
-	else
-		sync_ptr.c.control.appl_ptr = control->appl_ptr;
-	if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN))
-		control->avail_min = sync_ptr.c.control.avail_min;
-	else
-		sync_ptr.c.control.avail_min = control->avail_min;
-	sync_ptr.s.status.state = status->state;
-	sync_ptr.s.status.hw_ptr = status->hw_ptr;
-	sync_ptr.s.status.tstamp = status->tstamp;
-	sync_ptr.s.status.suspended_state = status->suspended_state;
-	//giovanni snd_pcm_stream_unlock_irq(substream);
-	if (copy_to_user(_sync_ptr, &sync_ptr, sizeof(sync_ptr)))
-		return -EFAULT;
-	return 0;
-}
-
-static int snd_pcm_tstamp(struct snd_pcm_substream *substream, int __user *_arg)
-{
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	int arg;
-
-	if (get_user(arg, _arg))
-		return -EFAULT;
-	if (arg < 0 || arg > SNDRV_PCM_TSTAMP_TYPE_LAST)
-		return -EINVAL;
-	runtime->tstamp_type = SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY;
-	if (arg == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC)
-		runtime->tstamp_type = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC;
-	return 0;
-}
-
-static int snd_pcm_common_ioctl1(struct file *file,
-				 struct snd_pcm_substream *substream,
-				 unsigned int cmd, void __user *arg)
-{
-	switch (cmd) {
-	case SNDRV_PCM_IOCTL_PVERSION:
-		return put_user(SNDRV_PCM_VERSION, (int __user *)arg) ? -EFAULT : 0;
-	case SNDRV_PCM_IOCTL_INFO:
-		return snd_pcm_info_user(substream, arg);
-	case SNDRV_PCM_IOCTL_TSTAMP:	/* just for compatibility */
-		return 0;
-	case SNDRV_PCM_IOCTL_TTSTAMP:
-		return snd_pcm_tstamp(substream, arg);
-	case SNDRV_PCM_IOCTL_HW_REFINE:
-		return snd_pcm_hw_refine_user(substream, arg);
-	case SNDRV_PCM_IOCTL_HW_PARAMS:
-		return snd_pcm_hw_params_user(substream, arg);
-	case SNDRV_PCM_IOCTL_HW_FREE:
-		return snd_pcm_hw_free(substream);
-	case SNDRV_PCM_IOCTL_SW_PARAMS:
-		return snd_pcm_sw_params_user(substream, arg);
-	case SNDRV_PCM_IOCTL_STATUS:
-		return snd_pcm_status_user(substream, arg);
-	case SNDRV_PCM_IOCTL_CHANNEL_INFO:
-		return snd_pcm_channel_info_user(substream, arg);
-	case SNDRV_PCM_IOCTL_PREPARE:
-		return snd_pcm_prepare(substream, file);
-	case SNDRV_PCM_IOCTL_RESET:
-		return snd_pcm_reset(substream);
-	case SNDRV_PCM_IOCTL_START:
-		return snd_pcm_action_lock_irq(&snd_pcm_action_start, substream, SNDRV_PCM_STATE_RUNNING);
-	case SNDRV_PCM_IOCTL_LINK:
-		return snd_pcm_link(substream, (int)(unsigned long) arg);
-	case SNDRV_PCM_IOCTL_UNLINK:
-		return snd_pcm_unlink(substream);
-	case SNDRV_PCM_IOCTL_RESUME:
-		return snd_pcm_resume(substream);
-	case SNDRV_PCM_IOCTL_XRUN:
-		return snd_pcm_xrun(substream);
-	case SNDRV_PCM_IOCTL_HWSYNC:
-		return snd_pcm_hwsync(substream);
-	case SNDRV_PCM_IOCTL_DELAY:
-		return snd_pcm_delay(substream, arg);
-	case SNDRV_PCM_IOCTL_SYNC_PTR:
-		return snd_pcm_sync_ptr(substream, arg);
-#ifdef CONFIG_SND_SUPPORT_OLD_API
-	case SNDRV_PCM_IOCTL_HW_REFINE_OLD:
-		return snd_pcm_hw_refine_old_user(substream, arg);
-	case SNDRV_PCM_IOCTL_HW_PARAMS_OLD:
-		return snd_pcm_hw_params_old_user(substream, arg);
-#endif
-	case SNDRV_PCM_IOCTL_DRAIN:
-		return snd_pcm_drain(substream, file);
-	case SNDRV_PCM_IOCTL_DROP:
-		return snd_pcm_drop(substream);
-	case SNDRV_PCM_IOCTL_PAUSE:
-	{
-		int res;
-		snd_pcm_stream_lock_irq(substream);
-		res = snd_pcm_pause(substream, (int)(unsigned long)arg);
-		snd_pcm_stream_unlock_irq(substream);
-		return res;
-	}
-	}
-	snd_printd("unknown ioctl = 0x%x\n", cmd);
-	return -ENOTTY;
-}
-
-static int snd_pcm_playback_ioctl1(struct file *file,
-				   struct snd_pcm_substream *substream,
-				   unsigned int cmd, void __user *arg)
-{
-	if (snd_BUG_ON(!substream))
-		return -ENXIO;
-	if (snd_BUG_ON(substream->stream != SNDRV_PCM_STREAM_PLAYBACK))
-		return -EINVAL;
-	switch (cmd) {
-	case SNDRV_PCM_IOCTL_WRITEI_FRAMES:
-	{
-		struct snd_xferi xferi;
-		struct snd_xferi __user *_xferi = arg;
-		struct snd_pcm_runtime *runtime = substream->runtime;
-		snd_pcm_sframes_t result;
-		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-			return -EBADFD;
-		if (put_user(0, &_xferi->result))
-			return -EFAULT;
-		if (copy_from_user(&xferi, _xferi, sizeof(xferi)))
-			return -EFAULT;
-		result = snd_pcm_lib_write(substream, xferi.buf, xferi.frames);
-		__put_user(result, &_xferi->result);
-		return result < 0 ? result : 0;
-	}
-	case SNDRV_PCM_IOCTL_WRITEN_FRAMES:
-	{
-		struct snd_xfern xfern;
-		struct snd_xfern __user *_xfern = arg;
-		struct snd_pcm_runtime *runtime = substream->runtime;
-		void __user **bufs;
-		snd_pcm_sframes_t result;
-		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-			return -EBADFD;
-		if (runtime->channels > 128)
-			return -EINVAL;
-		if (put_user(0, &_xfern->result))
-			return -EFAULT;
-		if (copy_from_user(&xfern, _xfern, sizeof(xfern)))
-			return -EFAULT;
-
-		bufs = memdup_user(xfern.bufs,
-				   sizeof(void *) * runtime->channels);
-		if (IS_ERR(bufs))
-			return PTR_ERR(bufs);
-		result = snd_pcm_lib_writev(substream, bufs, xfern.frames);
-		kfree(bufs);
-		__put_user(result, &_xfern->result);
-		return result < 0 ? result : 0;
-	}
-	case SNDRV_PCM_IOCTL_REWIND:
-	{
-		snd_pcm_uframes_t frames;
-		snd_pcm_uframes_t __user *_frames = arg;
-		snd_pcm_sframes_t result;
-		if (get_user(frames, _frames))
-			return -EFAULT;
-		if (put_user(0, _frames))
-			return -EFAULT;
-		result = snd_pcm_playback_rewind(substream, frames);
-		__put_user(result, _frames);
-		return result < 0 ? result : 0;
-	}
-	case SNDRV_PCM_IOCTL_FORWARD:
-	{
-		snd_pcm_uframes_t frames;
-		snd_pcm_uframes_t __user *_frames = arg;
-		snd_pcm_sframes_t result;
-		if (get_user(frames, _frames))
-			return -EFAULT;
-		if (put_user(0, _frames))
-			return -EFAULT;
-		result = snd_pcm_playback_forward(substream, frames);
-		__put_user(result, _frames);
-		return result < 0 ? result : 0;
-	}
-	}
-	return snd_pcm_common_ioctl1(file, substream, cmd, arg);
-}
-
-static int snd_pcm_capture_ioctl1(struct file *file,
-				  struct snd_pcm_substream *substream,
-				  unsigned int cmd, void __user *arg)
-{
-	if (snd_BUG_ON(!substream))
-		return -ENXIO;
-	if (snd_BUG_ON(substream->stream != SNDRV_PCM_STREAM_CAPTURE))
-		return -EINVAL;
-	switch (cmd) {
-	case SNDRV_PCM_IOCTL_READI_FRAMES:
-	{
-		struct snd_xferi xferi;
-		struct snd_xferi __user *_xferi = arg;
-		struct snd_pcm_runtime *runtime = substream->runtime;
-		snd_pcm_sframes_t result;
-		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-			return -EBADFD;
-		if (put_user(0, &_xferi->result))
-			return -EFAULT;
-		if (copy_from_user(&xferi, _xferi, sizeof(xferi)))
-			return -EFAULT;
-		result = snd_pcm_lib_read(substream, xferi.buf, xferi.frames);
-		__put_user(result, &_xferi->result);
-		return result < 0 ? result : 0;
-	}
-	case SNDRV_PCM_IOCTL_READN_FRAMES:
-	{
-		struct snd_xfern xfern;
-		struct snd_xfern __user *_xfern = arg;
-		struct snd_pcm_runtime *runtime = substream->runtime;
-		void *bufs;
-		snd_pcm_sframes_t result;
-		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-			return -EBADFD;
-		if (runtime->channels > 128)
-			return -EINVAL;
-		if (put_user(0, &_xfern->result))
-			return -EFAULT;
-		if (copy_from_user(&xfern, _xfern, sizeof(xfern)))
-			return -EFAULT;
-
-		bufs = memdup_user(xfern.bufs,
-				   sizeof(void *) * runtime->channels);
-		if (IS_ERR(bufs))
-			return PTR_ERR(bufs);
-		result = snd_pcm_lib_readv(substream, bufs, xfern.frames);
-		kfree(bufs);
-		__put_user(result, &_xfern->result);
-		return result < 0 ? result : 0;
-	}
-	case SNDRV_PCM_IOCTL_REWIND:
-	{
-		snd_pcm_uframes_t frames;
-		snd_pcm_uframes_t __user *_frames = arg;
-		snd_pcm_sframes_t result;
-		if (get_user(frames, _frames))
-			return -EFAULT;
-		if (put_user(0, _frames))
-			return -EFAULT;
-		result = snd_pcm_capture_rewind(substream, frames);
-		__put_user(result, _frames);
-		return result < 0 ? result : 0;
-	}
-	case SNDRV_PCM_IOCTL_FORWARD:
-	{
-		snd_pcm_uframes_t frames;
-		snd_pcm_uframes_t __user *_frames = arg;
-		snd_pcm_sframes_t result;
-		if (get_user(frames, _frames))
-			return -EFAULT;
-		if (put_user(0, _frames))
-			return -EFAULT;
-		result = snd_pcm_capture_forward(substream, frames);
-		__put_user(result, _frames);
-		return result < 0 ? result : 0;
-	}
-	}
-	return snd_pcm_common_ioctl1(file, substream, cmd, arg);
-}
-
-static long snd_pcm_playback_ioctl(struct file *file, unsigned int cmd,
-				   unsigned long arg)
-{
-	struct snd_pcm_file *pcm_file;
-
-	pcm_file = file->private_data;
-
-	if (((cmd >> 8) & 0xff) != 'A')
-		return -ENOTTY;
-
-	return snd_pcm_playback_ioctl1(file, pcm_file->substream, cmd,
-				       (void __user *)arg);
-}
-
-static long snd_pcm_capture_ioctl(struct file *file, unsigned int cmd,
-				  unsigned long arg)
-{
-	struct snd_pcm_file *pcm_file;
-
-	pcm_file = file->private_data;
-
-	if (((cmd >> 8) & 0xff) != 'A')
-		return -ENOTTY;
-
-	return snd_pcm_capture_ioctl1(file, pcm_file->substream, cmd,
-				      (void __user *)arg);
-}
-
-int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
-			 unsigned int cmd, void *arg)
-{
-	mm_segment_t fs;
-	int result;
-
-	fs = snd_enter_user();
-	switch (substream->stream) {
-	case SNDRV_PCM_STREAM_PLAYBACK:
-		result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
-						 (void __user *)arg);
-		break;
-	case SNDRV_PCM_STREAM_CAPTURE:
-		result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
-						(void __user *)arg);
-		break;
-	default:
-		result = -EINVAL;
-		break;
-	}
-	snd_leave_user(fs);
-	return result;
-}
-
-EXPORT_SYMBOL(snd_pcm_kernel_ioctl);
-
-static ssize_t snd_pcm_read(struct file *file, char __user *buf, size_t count,
-			    loff_t * offset)
-{
-	struct snd_pcm_file *pcm_file;
-	struct snd_pcm_substream *substream;
-	struct snd_pcm_runtime *runtime;
-	snd_pcm_sframes_t result;
-
-	pcm_file = file->private_data;
-	substream = pcm_file->substream;
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-		return -EBADFD;
-	if (!frame_aligned(runtime, count))
-		return -EINVAL;
-	count = bytes_to_frames(runtime, count);
-	result = snd_pcm_lib_read(substream, buf, count);
-	if (result > 0)
-		result = frames_to_bytes(runtime, result);
-	return result;
-}
-
-static ssize_t snd_pcm_write(struct file *file, const char __user *buf,
-			     size_t count, loff_t * offset)
-{
-	struct snd_pcm_file *pcm_file;
-	struct snd_pcm_substream *substream;
-	struct snd_pcm_runtime *runtime;
-	snd_pcm_sframes_t result;
-
-	pcm_file = file->private_data;
-	substream = pcm_file->substream;
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-		return -EBADFD;
-	if (!frame_aligned(runtime, count))
-		return -EINVAL;
-	count = bytes_to_frames(runtime, count);
-	result = snd_pcm_lib_write(substream, buf, count);
-	if (result > 0)
-		result = frames_to_bytes(runtime, result);
-	return result;
-}
-
-static ssize_t snd_pcm_aio_read(struct kiocb *iocb, const struct iovec *iov,
-			     unsigned long nr_segs, loff_t pos)
-
-{
-	struct snd_pcm_file *pcm_file;
-	struct snd_pcm_substream *substream;
-	struct snd_pcm_runtime *runtime;
-	snd_pcm_sframes_t result;
-	unsigned long i;
-	void __user **bufs;
-	snd_pcm_uframes_t frames;
-
-	pcm_file = iocb->ki_filp->private_data;
-	substream = pcm_file->substream;
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-		return -EBADFD;
-	if (nr_segs > 1024 || nr_segs != runtime->channels)
-		return -EINVAL;
-	if (!frame_aligned(runtime, iov->iov_len))
-		return -EINVAL;
-	frames = bytes_to_samples(runtime, iov->iov_len);
-	bufs = kmalloc(sizeof(void *) * nr_segs, GFP_KERNEL);
-	if (bufs == NULL)
-		return -ENOMEM;
-	for (i = 0; i < nr_segs; ++i)
-		bufs[i] = iov[i].iov_base;
-	result = snd_pcm_lib_readv(substream, bufs, frames);
-	if (result > 0)
-		result = frames_to_bytes(runtime, result);
-	kfree(bufs);
-	return result;
-}
-
-static ssize_t snd_pcm_aio_write(struct kiocb *iocb, const struct iovec *iov,
-			      unsigned long nr_segs, loff_t pos)
-{
-	struct snd_pcm_file *pcm_file;
-	struct snd_pcm_substream *substream;
-	struct snd_pcm_runtime *runtime;
-	snd_pcm_sframes_t result;
-	unsigned long i;
-	void __user **bufs;
-	snd_pcm_uframes_t frames;
-
-	pcm_file = iocb->ki_filp->private_data;
-	substream = pcm_file->substream;
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-		return -EBADFD;
-	if (nr_segs > 128 || nr_segs != runtime->channels ||
-	    !frame_aligned(runtime, iov->iov_len))
-		return -EINVAL;
-	frames = bytes_to_samples(runtime, iov->iov_len);
-	bufs = kmalloc(sizeof(void *) * nr_segs, GFP_KERNEL);
-	if (bufs == NULL)
-		return -ENOMEM;
-	for (i = 0; i < nr_segs; ++i)
-		bufs[i] = iov[i].iov_base;
-	result = snd_pcm_lib_writev(substream, bufs, frames);
-	if (result > 0)
-		result = frames_to_bytes(runtime, result);
-	kfree(bufs);
-	return result;
-}
-
-static unsigned int snd_pcm_playback_poll(struct file *file, poll_table * wait)
-{
-	struct snd_pcm_file *pcm_file;
-	struct snd_pcm_substream *substream;
-	struct snd_pcm_runtime *runtime;
-        unsigned int mask;
-	snd_pcm_uframes_t avail;
-
-	pcm_file = file->private_data;
-
-	substream = pcm_file->substream;
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-
-	poll_wait(file, &runtime->sleep, wait);
-
-	//giovanni snd_pcm_stream_lock_irq(substream);
-	avail = snd_pcm_playback_avail(runtime);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_RUNNING:
-	case SNDRV_PCM_STATE_PREPARED:
-	case SNDRV_PCM_STATE_PAUSED:
-		if (avail >= runtime->control->avail_min) {
-			mask = POLLOUT | POLLWRNORM;
-			break;
-		}
-		/* Fall through */
-	case SNDRV_PCM_STATE_DRAINING:
-		mask = 0;
-		break;
-	default:
-		mask = POLLOUT | POLLWRNORM | POLLERR;
-		break;
-	}
-	//giovanni snd_pcm_stream_unlock_irq(substream);
-	return mask;
-}
-
-static unsigned int snd_pcm_capture_poll(struct file *file, poll_table * wait)
-{
-	struct snd_pcm_file *pcm_file;
-	struct snd_pcm_substream *substream;
-	struct snd_pcm_runtime *runtime;
-        unsigned int mask;
-	snd_pcm_uframes_t avail;
-
-	pcm_file = file->private_data;
-
-	substream = pcm_file->substream;
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-
-	poll_wait(file, &runtime->sleep, wait);
-
-	//giovanni snd_pcm_stream_lock_irq(substream);
-	avail = snd_pcm_capture_avail(runtime);
-	switch (runtime->status->state) {
-	case SNDRV_PCM_STATE_RUNNING:
-	case SNDRV_PCM_STATE_PREPARED:
-	case SNDRV_PCM_STATE_PAUSED:
-		if (avail >= runtime->control->avail_min) {
-			mask = POLLIN | POLLRDNORM;
-			break;
-		}
-		mask = 0;
-		break;
-	case SNDRV_PCM_STATE_DRAINING:
-		if (avail > 0) {
-			mask = POLLIN | POLLRDNORM;
-			break;
-		}
-		/* Fall through */
-	default:
-		mask = POLLIN | POLLRDNORM | POLLERR;
-		break;
-	}
-	//giovanni snd_pcm_stream_unlock_irq(substream);
-	return mask;
-}
-
-/*
- * mmap support
- */
-
-/*
- * Only on coherent architectures, we can mmap the status and the control records
- * for effcient data transfer.  On others, we have to use HWSYNC ioctl...
- */
-#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_ALPHA)
-/*
- * mmap status record
- */
-static int snd_pcm_mmap_status_fault(struct vm_area_struct *area,
-						struct vm_fault *vmf)
-{
-	struct snd_pcm_substream *substream = area->vm_private_data;
-	struct snd_pcm_runtime *runtime;
-
-	if (substream == NULL)
-		return VM_FAULT_SIGBUS;
-	runtime = substream->runtime;
-	vmf->page = virt_to_page(runtime->status);
-	get_page(vmf->page);
-	return 0;
-}
-
-static const struct vm_operations_struct snd_pcm_vm_ops_status =
-{
-	.fault =	snd_pcm_mmap_status_fault,
-};
-
-static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file *file,
-			       struct vm_area_struct *area)
-{
-	struct snd_pcm_runtime *runtime;
-	long size;
-	if (!(area->vm_flags & VM_READ))
-		return -EINVAL;
-	runtime = substream->runtime;
-	size = area->vm_end - area->vm_start;
-	if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)))
-		return -EINVAL;
-	area->vm_ops = &snd_pcm_vm_ops_status;
-	area->vm_private_data = substream;
-	area->vm_flags |= VM_RESERVED;
-	return 0;
-}
-
-/*
- * mmap control record
- */
-static int snd_pcm_mmap_control_fault(struct vm_area_struct *area,
-						struct vm_fault *vmf)
-{
-	struct snd_pcm_substream *substream = area->vm_private_data;
-	struct snd_pcm_runtime *runtime;
-
-	if (substream == NULL)
-		return VM_FAULT_SIGBUS;
-	runtime = substream->runtime;
-	vmf->page = virt_to_page(runtime->control);
-	get_page(vmf->page);
-	return 0;
-}
-
-static const struct vm_operations_struct snd_pcm_vm_ops_control =
-{
-	.fault =	snd_pcm_mmap_control_fault,
-};
-
-static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file *file,
-				struct vm_area_struct *area)
-{
-	struct snd_pcm_runtime *runtime;
-	long size;
-	if (!(area->vm_flags & VM_READ))
-		return -EINVAL;
-	runtime = substream->runtime;
-	size = area->vm_end - area->vm_start;
-	if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control)))
-		return -EINVAL;
-	area->vm_ops = &snd_pcm_vm_ops_control;
-	area->vm_private_data = substream;
-	area->vm_flags |= VM_RESERVED;
-	return 0;
-}
-#else /* ! coherent mmap */
-/*
- * don't support mmap for status and control records.
- */
-static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file *file,
-			       struct vm_area_struct *area)
-{
-	return -ENXIO;
-}
-static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file *file,
-				struct vm_area_struct *area)
-{
-	return -ENXIO;
-}
-#endif /* coherent mmap */
-
-static inline struct page *
-snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long ofs)
-{
-	void *vaddr = substream->runtime->dma_area + ofs;
-#if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)
-	if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
-		return virt_to_page(CAC_ADDR(vaddr));
-#endif
-#if defined(CONFIG_PPC32) && defined(CONFIG_NOT_COHERENT_CACHE)
-	if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) {
-		dma_addr_t addr = substream->runtime->dma_addr + ofs;
-		addr -= get_dma_offset(substream->dma_buffer.dev.dev);
-		/* assume dma_handle set via pfn_to_phys() in
-		 * mm/dma-noncoherent.c
-		 */
-		return pfn_to_page(addr >> PAGE_SHIFT);
-	}
-#endif
-	return virt_to_page(vaddr);
-}
-
-/*
- * fault callback for mmapping a RAM page
- */
-static int snd_pcm_mmap_data_fault(struct vm_area_struct *area,
-						struct vm_fault *vmf)
-{
-	struct snd_pcm_substream *substream = area->vm_private_data;
-	struct snd_pcm_runtime *runtime;
-	unsigned long offset;
-	struct page * page;
-	size_t dma_bytes;
-
-	if (substream == NULL)
-		return VM_FAULT_SIGBUS;
-	runtime = substream->runtime;
-	offset = vmf->pgoff << PAGE_SHIFT;
-	dma_bytes = PAGE_ALIGN(runtime->dma_bytes);
-	if (offset > dma_bytes - PAGE_SIZE)
-		return VM_FAULT_SIGBUS;
-	if (substream->ops->page)
-		page = substream->ops->page(substream, offset);
-	else
-		page = snd_pcm_default_page_ops(substream, offset);
-	if (!page)
-		return VM_FAULT_SIGBUS;
-	get_page(page);
-	vmf->page = page;
-	return 0;
-}
-
-static const struct vm_operations_struct snd_pcm_vm_ops_data = {
-	.open =		snd_pcm_mmap_data_open,
-	.close =	snd_pcm_mmap_data_close,
-};
-
-static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = {
-	.open =		snd_pcm_mmap_data_open,
-	.close =	snd_pcm_mmap_data_close,
-	.fault =	snd_pcm_mmap_data_fault,
-};
-
-#ifndef ARCH_HAS_DMA_MMAP_COHERENT
-/* This should be defined / handled globally! */
-#ifdef CONFIG_ARM
-#define ARCH_HAS_DMA_MMAP_COHERENT
-#endif
-#endif
-
-/*
- * mmap the DMA buffer on RAM
- */
-static int snd_pcm_default_mmap(struct snd_pcm_substream *substream,
-				struct vm_area_struct *area)
-{
-	area->vm_flags |= VM_RESERVED;
-#ifdef ARCH_HAS_DMA_MMAP_COHERENT
-	if (!substream->ops->page &&
-	    substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
-		return dma_mmap_coherent(substream->dma_buffer.dev.dev,
-					 area,
-					 substream->runtime->dma_area,
-					 substream->runtime->dma_addr,
-					 area->vm_end - area->vm_start);
-#endif /* ARCH_HAS_DMA_MMAP_COHERENT */
-	/* mmap with fault handler */
-	area->vm_ops = &snd_pcm_vm_ops_data_fault;
-	return 0;
-}
-
-/*
- * mmap the DMA buffer on I/O memory area
- */
-#if SNDRV_PCM_INFO_MMAP_IOMEM
-int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream,
-			   struct vm_area_struct *area)
-{
-	long size;
-	unsigned long offset;
-
-	area->vm_page_prot = pgprot_noncached(area->vm_page_prot);
-	area->vm_flags |= VM_IO;
-	size = area->vm_end - area->vm_start;
-	offset = area->vm_pgoff << PAGE_SHIFT;
-	if (io_remap_pfn_range(area, area->vm_start,
-				(substream->runtime->dma_addr + offset) >> PAGE_SHIFT,
-				size, area->vm_page_prot))
-		return -EAGAIN;
-	return 0;
-}
-
-EXPORT_SYMBOL(snd_pcm_lib_mmap_iomem);
-#endif /* SNDRV_PCM_INFO_MMAP */
-
-/* mmap callback with pgprot_noncached */
-int snd_pcm_lib_mmap_noncached(struct snd_pcm_substream *substream,
-			       struct vm_area_struct *area)
-{
-	area->vm_page_prot = pgprot_noncached(area->vm_page_prot);
-	return snd_pcm_default_mmap(substream, area);
-}
-EXPORT_SYMBOL(snd_pcm_lib_mmap_noncached);
-
-/*
- * mmap DMA buffer
- */
-int snd_pcm_mmap_data(struct snd_pcm_substream *substream, struct file *file,
-		      struct vm_area_struct *area)
-{
-	struct snd_pcm_runtime *runtime;
-	long size;
-	unsigned long offset;
-	size_t dma_bytes;
-	int err;
-
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		if (!(area->vm_flags & (VM_WRITE|VM_READ)))
-			return -EINVAL;
-	} else {
-		if (!(area->vm_flags & VM_READ))
-			return -EINVAL;
-	}
-	runtime = substream->runtime;
-	if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
-		return -EBADFD;
-	if (!(runtime->info & SNDRV_PCM_INFO_MMAP))
-		return -ENXIO;
-	if (runtime->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED ||
-	    runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)
-		return -EINVAL;
-	size = area->vm_end - area->vm_start;
-	offset = area->vm_pgoff << PAGE_SHIFT;
-	dma_bytes = PAGE_ALIGN(runtime->dma_bytes);
-	if ((size_t)size > dma_bytes)
-		return -EINVAL;
-	if (offset > dma_bytes - size)
-		return -EINVAL;
-
-	area->vm_ops = &snd_pcm_vm_ops_data;
-	area->vm_private_data = substream;
-	if (substream->ops->mmap)
-		err = substream->ops->mmap(substream, area);
-	else
-		err = snd_pcm_default_mmap(substream, area);
-	if (!err)
-		atomic_inc(&substream->mmap_count);
-	return err;
-}
-
-EXPORT_SYMBOL(snd_pcm_mmap_data);
-
-static int snd_pcm_mmap(struct file *file, struct vm_area_struct *area)
-{
-	struct snd_pcm_file * pcm_file;
-	struct snd_pcm_substream *substream;
-	unsigned long offset;
-
-	pcm_file = file->private_data;
-	substream = pcm_file->substream;
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-
-	offset = area->vm_pgoff << PAGE_SHIFT;
-	switch (offset) {
-	case SNDRV_PCM_MMAP_OFFSET_STATUS:
-		if (pcm_file->no_compat_mmap)
-			return -ENXIO;
-		return snd_pcm_mmap_status(substream, file, area);
-	case SNDRV_PCM_MMAP_OFFSET_CONTROL:
-		if (pcm_file->no_compat_mmap)
-			return -ENXIO;
-		return snd_pcm_mmap_control(substream, file, area);
-	default:
-		return snd_pcm_mmap_data(substream, file, area);
-	}
-	return 0;
-}
-
-static int snd_pcm_fasync(int fd, struct file * file, int on)
-{
-	struct snd_pcm_file * pcm_file;
-	struct snd_pcm_substream *substream;
-	struct snd_pcm_runtime *runtime;
-
-	pcm_file = file->private_data;
-	substream = pcm_file->substream;
-	if (PCM_RUNTIME_CHECK(substream))
-		return -ENXIO;
-	runtime = substream->runtime;
-	return fasync_helper(fd, file, on, &runtime->fasync);
-}
-
-/*
- * ioctl32 compat
- */
-#ifdef CONFIG_COMPAT
-#include "pcm_compat.c"
-#else
-#define snd_pcm_ioctl_compat	NULL
-#endif
-
-/*
- *  To be removed helpers to keep binary compatibility
- */
-
-#ifdef CONFIG_SND_SUPPORT_OLD_API
-#define __OLD_TO_NEW_MASK(x) ((x&7)|((x&0x07fffff8)<<5))
-#define __NEW_TO_OLD_MASK(x) ((x&7)|((x&0xffffff00)>>5))
-
-static void snd_pcm_hw_convert_from_old_params(struct snd_pcm_hw_params *params,
-					       struct snd_pcm_hw_params_old *oparams)
-{
-	unsigned int i;
-
-	memset(params, 0, sizeof(*params));
-	params->flags = oparams->flags;
-	for (i = 0; i < ARRAY_SIZE(oparams->masks); i++)
-		params->masks[i].bits[0] = oparams->masks[i];
-	memcpy(params->intervals, oparams->intervals, sizeof(oparams->intervals));
-	params->rmask = __OLD_TO_NEW_MASK(oparams->rmask);
-	params->cmask = __OLD_TO_NEW_MASK(oparams->cmask);
-	params->info = oparams->info;
-	params->msbits = oparams->msbits;
-	params->rate_num = oparams->rate_num;
-	params->rate_den = oparams->rate_den;
-	params->fifo_size = oparams->fifo_size;
-}
-
-static void snd_pcm_hw_convert_to_old_params(struct snd_pcm_hw_params_old *oparams,
-					     struct snd_pcm_hw_params *params)
-{
-	unsigned int i;
-
-	memset(oparams, 0, sizeof(*oparams));
-	oparams->flags = params->flags;
-	for (i = 0; i < ARRAY_SIZE(oparams->masks); i++)
-		oparams->masks[i] = params->masks[i].bits[0];
-	memcpy(oparams->intervals, params->intervals, sizeof(oparams->intervals));
-	oparams->rmask = __NEW_TO_OLD_MASK(params->rmask);
-	oparams->cmask = __NEW_TO_OLD_MASK(params->cmask);
-	oparams->info = params->info;
-	oparams->msbits = params->msbits;
-	oparams->rate_num = params->rate_num;
-	oparams->rate_den = params->rate_den;
-	oparams->fifo_size = params->fifo_size;
-}
-
-static int snd_pcm_hw_refine_old_user(struct snd_pcm_substream *substream,
-				      struct snd_pcm_hw_params_old __user * _oparams)
-{
-	struct snd_pcm_hw_params *params;
-	struct snd_pcm_hw_params_old *oparams = NULL;
-	int err;
-
-	params = kmalloc(sizeof(*params), GFP_KERNEL);
-	if (!params)
-		return -ENOMEM;
-
-	oparams = memdup_user(_oparams, sizeof(*oparams));
-	if (IS_ERR(oparams)) {
-		err = PTR_ERR(oparams);
-		goto out;
-	}
-	snd_pcm_hw_convert_from_old_params(params, oparams);
-	err = snd_pcm_hw_refine(substream, params);
-	snd_pcm_hw_convert_to_old_params(oparams, params);
-	if (copy_to_user(_oparams, oparams, sizeof(*oparams))) {
-		if (!err)
-			err = -EFAULT;
-	}
-
-	kfree(oparams);
-out:
-	kfree(params);
-	return err;
-}
-
-static int snd_pcm_hw_params_old_user(struct snd_pcm_substream *substream,
-				      struct snd_pcm_hw_params_old __user * _oparams)
-{
-	struct snd_pcm_hw_params *params;
-	struct snd_pcm_hw_params_old *oparams = NULL;
-	int err;
-
-	params = kmalloc(sizeof(*params), GFP_KERNEL);
-	if (!params)
-		return -ENOMEM;
-
-	oparams = memdup_user(_oparams, sizeof(*oparams));
-	if (IS_ERR(oparams)) {
-		err = PTR_ERR(oparams);
-		goto out;
-	}
-	snd_pcm_hw_convert_from_old_params(params, oparams);
-	err = snd_pcm_hw_params(substream, params);
-	snd_pcm_hw_convert_to_old_params(oparams, params);
-	if (copy_to_user(_oparams, oparams, sizeof(*oparams))) {
-		if (!err)
-			err = -EFAULT;
-	}
-
-	kfree(oparams);
-out:
-	kfree(params);
-	return err;
-}
-#endif /* CONFIG_SND_SUPPORT_OLD_API */
-
-#ifndef CONFIG_MMU
-static unsigned long snd_pcm_get_unmapped_area(struct file *file,
-					       unsigned long addr,
-					       unsigned long len,
-					       unsigned long pgoff,
-					       unsigned long flags)
-{
-	struct snd_pcm_file *pcm_file = file->private_data;
-	struct snd_pcm_substream *substream = pcm_file->substream;
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	unsigned long offset = pgoff << PAGE_SHIFT;
-
-	switch (offset) {
-	case SNDRV_PCM_MMAP_OFFSET_STATUS:
-		return (unsigned long)runtime->status;
-	case SNDRV_PCM_MMAP_OFFSET_CONTROL:
-		return (unsigned long)runtime->control;
-	default:
-		return (unsigned long)runtime->dma_area + offset;
-	}
-}
-#else
-# define snd_pcm_get_unmapped_area NULL
-#endif
-
-/*
- *  Register section
- */
-
-const struct file_operations snd_pcm_f_ops[2] = {
-	{
-		.owner =		THIS_MODULE,
-		.write =		snd_pcm_write,
-		.aio_write =		snd_pcm_aio_write,
-		.open =			snd_pcm_playback_open,
-		.release =		snd_pcm_release,
-		.llseek =		no_llseek,
-		.poll =			snd_pcm_playback_poll,
-		.unlocked_ioctl =	snd_pcm_playback_ioctl,
-		.compat_ioctl = 	snd_pcm_ioctl_compat,
-		.mmap =			snd_pcm_mmap,
-		.fasync =		snd_pcm_fasync,
-		.get_unmapped_area =	snd_pcm_get_unmapped_area,
-	},
-	{
-		.owner =		THIS_MODULE,
-		.read =			snd_pcm_read,
-		.aio_read =		snd_pcm_aio_read,
-		.open =			snd_pcm_capture_open,
-		.release =		snd_pcm_release,
-		.llseek =		no_llseek,
-		.poll =			snd_pcm_capture_poll,
-		.unlocked_ioctl =	snd_pcm_capture_ioctl,
-		.compat_ioctl = 	snd_pcm_ioctl_compat,
-		.mmap =			snd_pcm_mmap,
-		.fasync =		snd_pcm_fasync,
-		.get_unmapped_area =	snd_pcm_get_unmapped_area,
-	}
-};
diff --git a/src/mod/endpoints/mod_skypopen/oss/Makefile b/src/mod/endpoints/mod_skypopen/oss/Makefile
deleted file mode 100644
index 40b25f0e25..0000000000
--- a/src/mod/endpoints/mod_skypopen/oss/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Comment/uncomment the following line to disable/enable debugging
-#DEBUG = y
-#LDDINC=
-
-# Add your debugging flag (or not) to CFLAGS
-ifeq ($(DEBUG),y)
-  DEBFLAGS = -O -g -DSKYPOPEN_DEBUG # "-O" is needed to expand inlines
-else
-  DEBFLAGS = -O2 -Wall
-endif
-
-EXTRA_CFLAGS += $(DEBFLAGS)
-EXTRA_CFLAGS += -I$(LDDINC)
-
-ifneq ($(KERNELRELEASE),)
-# call from kernel build system
-
-skypopen-objs := main.o
-
-obj-m	:= skypopen.o
-
-else
-
-KERNELDIR ?= /lib/modules/$(shell uname -r)/build
-PWD       := $(shell pwd)
-
-modules:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD) LDDINC=$(PWD)/../include modules
-
-endif
-
-
-
-clean:
-	rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions
-
-depend .depend dep:
-	$(CC) $(EXTRA_CFLAGS) -M *.c > .depend
-
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
diff --git a/src/mod/endpoints/mod_skypopen/oss/main.c b/src/mod/endpoints/mod_skypopen/oss/main.c
deleted file mode 100644
index 32acb46790..0000000000
--- a/src/mod/endpoints/mod_skypopen/oss/main.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * main.c -- the bare skypopen char module
- *
- * Copyright (C) 2010 Giovanni Maruzzelli
- * Copyright (C) 2001 Alessandro Rubini and Jonathan Corbet
- * Copyright (C) 2001 O'Reilly & Associates
- *
- * The source code in this file can be freely used, adapted,
- * and redistributed in source or binary form, so long as an
- * acknowledgment appears in derived source files.  The citation
- * should list that the code comes from the book "Linux Device
- * Drivers" by Alessandro Rubini and Jonathan Corbet, published
- * by O'Reilly & Associates.   No warranty is attached;
- * we cannot take responsibility for errors or fitness for use.
- *
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-
-#include <linux/kernel.h>	/* printk() */
-#include <linux/slab.h>		/* kmalloc() */
-#include <linux/fs.h>		/* everything... */
-#include <linux/errno.h>	/* error codes */
-#include <linux/types.h>	/* size_t */
-#include <linux/proc_fs.h>
-#include <linux/fcntl.h>	/* O_ACCMODE */
-#include <linux/seq_file.h>
-#include <linux/cdev.h>
-
-#include <asm/uaccess.h>	/* copy_*_user */
-
-#include <linux/soundcard.h>
-#include <linux/delay.h>
-#include <linux/hrtimer.h>
-#include <linux/sched.h>
-#include <linux/time.h>
-#include <linux/jiffies.h>
-#include <linux/hrtimer.h>
-#include <linux/ktime.h>
-
-#include "skypopen.h"		/* local definitions */
-
-
-/*
- * Our parameters which can be set at load time.
- */
-
-int skypopen_major =   SKYPOPEN_MAJOR;
-int skypopen_minor =   SKYPOPEN_MINOR;
-int skypopen_nr_devs = SKYPOPEN_NR_DEVS;	/* number of bare skypopen devices */
-
-module_param(skypopen_major, int, S_IRUGO);
-module_param(skypopen_minor, int, S_IRUGO);
-module_param(skypopen_nr_devs, int, S_IRUGO);
-
-MODULE_AUTHOR("Original: Alessandro Rubini, Jonathan Corbet. Modified by: Giovanni Maruzzelli for FreeSWITCH skypopen");
-MODULE_LICENSE("Dual BSD/GPL");
-
-static struct skypopen_dev *skypopen_devices;	/* allocated in skypopen_init_module */
-
-static int unload = 0;
-
-#ifndef WANT_HRTIMER
-void my_timer_callback_inq( unsigned long data )
-{
-	struct skypopen_dev *dev = (void *)data;
-
-	wake_up_interruptible(&dev->inq);
-	mod_timer( &dev->timer_inq, jiffies + msecs_to_jiffies(SKYPOPEN_SLEEP) );
-
-}
-
-void my_timer_callback_outq( unsigned long data )
-{
-	struct skypopen_dev *dev = (void *)data;
-
-	wake_up_interruptible(&dev->outq);
-	mod_timer( &dev->timer_outq, jiffies + msecs_to_jiffies(SKYPOPEN_SLEEP) );
-}
-#else// WANT_HRTIMER
-
-#ifndef CENTOS_5
-static enum hrtimer_restart my_hrtimer_callback_inq( struct hrtimer *timer_inq )
-{
-	struct skypopen_dev *dev = container_of(timer_inq, struct skypopen_dev, timer_inq);
-
-	if(unload)
-		return HRTIMER_NORESTART;
-
-	hrtimer_forward(&dev->timer_inq, timer_inq->_softexpires, ktime_set(0, SKYPOPEN_SLEEP * 1000000));
-	wake_up_interruptible(&dev->inq);
-
-	return HRTIMER_RESTART;
-}
-static enum hrtimer_restart my_hrtimer_callback_outq( struct hrtimer *timer_outq )
-{
-	struct skypopen_dev *dev = container_of(timer_outq, struct skypopen_dev, timer_outq);
-
-	if(unload)
-		return HRTIMER_NORESTART;
-
-	hrtimer_forward(&dev->timer_outq, timer_outq->_softexpires, ktime_set(0, SKYPOPEN_SLEEP * 1000000));
-	wake_up_interruptible(&dev->outq);
-
-	return HRTIMER_RESTART;
-}
-#else// CENTOS_5
-static int my_hrtimer_callback_inq( struct hrtimer *timer_inq )
-{
-	struct skypopen_dev *dev = container_of(timer_inq, struct skypopen_dev, timer_inq);
-
-	if(unload)
-		return HRTIMER_NORESTART;
-
-	hrtimer_forward(&dev->timer_inq, timer_inq->expires, ktime_set(0, SKYPOPEN_SLEEP * 1000000));
-	wake_up_interruptible(&dev->inq);
-
-	return HRTIMER_RESTART;
-}
-static int my_hrtimer_callback_outq( struct hrtimer *timer_outq )
-{
-	struct skypopen_dev *dev = container_of(timer_outq, struct skypopen_dev, timer_outq);
-
-	if(unload)
-		return HRTIMER_NORESTART;
-
-	hrtimer_forward(&dev->timer_outq, timer_outq->expires, ktime_set(0, SKYPOPEN_SLEEP * 1000000));
-	wake_up_interruptible(&dev->outq);
-
-	return HRTIMER_RESTART;
-}
-#endif// CENTOS_5
-#endif// WANT_HRTIMER
-
-/* The clone-specific data structure includes a key field */
-
-struct skypopen_listitem {
-	struct skypopen_dev device;
-	dev_t key;
-	struct list_head list;
-
-};
-
-/* The list of devices, and a lock to protect it */
-static LIST_HEAD(skypopen_c_list);
-#ifdef WANT_DEFINE_SPINLOCK
-static DEFINE_SPINLOCK(skypopen_c_lock);
-#else // WANT_DEFINE_SPINLOCK
-static spinlock_t skypopen_c_lock = SPIN_LOCK_UNLOCKED;
-#endif // WANT_DEFINE_SPINLOCK
-
-/* Look for a device or create one if missing */
-static struct skypopen_dev *skypopen_c_lookfor_device(dev_t key)
-{
-	struct skypopen_listitem *lptr;
-#ifdef WANT_HRTIMER
-#endif// WANT_HRTIMER
-
-	list_for_each_entry(lptr, &skypopen_c_list, list) {
-		if (lptr->key == key)
-			return &(lptr->device);
-	}
-
-	/* not found */
-	lptr = kmalloc(sizeof(struct skypopen_listitem), GFP_KERNEL);
-	if (!lptr)
-		return NULL;
-
-	/* initialize the device */
-	memset(lptr, 0, sizeof(struct skypopen_listitem));
-	lptr->key = key;
-
-	init_waitqueue_head(&lptr->device.inq);
-	init_waitqueue_head(&lptr->device.outq);
-
-#ifndef WANT_HRTIMER
-	setup_timer( &lptr->device.timer_inq, my_timer_callback_inq, (long int)lptr );
-	setup_timer( &lptr->device.timer_outq, my_timer_callback_outq, (long int)lptr );
-	printk( "Starting skypopen OSS driver read timer (%dms) skype client:(%d)\n", SKYPOPEN_SLEEP, current->tgid );
-	mod_timer( &lptr->device.timer_inq, jiffies + msecs_to_jiffies(SKYPOPEN_SLEEP) );
-	printk( "Starting skypopen OSS driver write timer (%dms) skype client:(%d)\n", SKYPOPEN_SLEEP, current->tgid );
-	mod_timer( &lptr->device.timer_outq, jiffies + msecs_to_jiffies(SKYPOPEN_SLEEP) );
-#endif// WANT_HRTIMER
-
-	/* place it in the list */
-	list_add(&lptr->list, &skypopen_c_list);
-
-	return &(lptr->device);
-}
-
-/*
- * Open and close
- */
-static int skypopen_c_open(struct inode *inode, struct file *filp)
-{
-	struct skypopen_dev *dev;
-	dev_t key;
-
-	key = current->tgid;
-
-	/* look for a skypopenc device in the list */
-	spin_lock(&skypopen_c_lock);
-	dev = skypopen_c_lookfor_device(key);
-	if (dev){
-		dev->opened++;
-	}
-	spin_unlock(&skypopen_c_lock);
-
-	if (!dev)
-		return -ENOMEM;
-
-	/* then, everything else is copied from the bare skypopen device */
-	filp->private_data = dev;
-	return 0;          /* success */
-}
-
-static int skypopen_c_release(struct inode *inode, struct file *filp)
-{
-	dev_t key;
-	struct skypopen_dev *dev = filp->private_data;
-	int ret;
-
-	key = current->tgid;
-
-	spin_lock(&skypopen_c_lock);
-	dev->opened--;
-	spin_unlock(&skypopen_c_lock);
-
-	if(!dev->opened){
-#ifdef WANT_HRTIMER
-		if(dev->timer_inq_started){
-			ret = hrtimer_cancel( &dev->timer_inq );
-			//printk( "Stopped skypopen OSS driver read HRtimer skype client:(%d) ret=%d\n", key, ret);
-			dev->timer_inq_started=0;
-		}
-		if(dev->timer_outq_started){
-			ret = hrtimer_cancel( &dev->timer_outq );
-			//printk( "Stopped skypopen OSS driver write HRtimer skype client:(%d) ret=%d\n", key, ret);
-			dev->timer_outq_started=0;
-		}
-#endif// WANT_HRTIMER
-	}
-	return 0;
-}
-
-
-
-/*************************************************************/
-
-static ssize_t skypopen_read(struct file *filp, char __user *buf, size_t count,
-		loff_t *f_pos)
-{
-	DEFINE_WAIT(wait);
-	struct skypopen_dev *dev = filp->private_data;
-	dev_t key;
-
-	key = current->tgid;
-
-	if(unload)
-		return -1;
-
-#ifdef WANT_HRTIMER
-	if(dev->timer_inq_started == 0){
-		ktime_t ktime_inq;
-
-		ktime_inq = ktime_set( 0, SKYPOPEN_SLEEP * 1000000);
-		hrtimer_init( &dev->timer_inq, CLOCK_MONOTONIC, HRTIMER_MODE_REL );
-		dev->timer_inq.function = &my_hrtimer_callback_inq;
-		hrtimer_start( &dev->timer_inq, ktime_inq, HRTIMER_MODE_REL );
-		dev->timer_inq_started = 1;
-		//printk( "Started skypopen OSS driver read HRtimer skype client:(%d) \n", key);
-	}
-#endif// WANT_HRTIMER
-
-	//printk("READ\n");
-	prepare_to_wait(&dev->inq, &wait, TASK_INTERRUPTIBLE);
-	schedule();
-	finish_wait(&dev->inq, &wait);
-	return count;
-}
-
-static ssize_t skypopen_write(struct file *filp, const char __user *buf, size_t count,
-		loff_t *f_pos)
-{
-	DEFINE_WAIT(wait);
-	struct skypopen_dev *dev = filp->private_data;
-	dev_t key;
-
-	key = current->tgid;
-
-	if(unload)
-		return -1;
-
-#ifdef WANT_HRTIMER
-	if(dev->timer_outq_started == 0){
-		ktime_t ktime_outq;
-
-		ktime_outq = ktime_set( 0, SKYPOPEN_SLEEP * 1000000);
-		hrtimer_init( &dev->timer_outq, CLOCK_MONOTONIC, HRTIMER_MODE_REL );
-		dev->timer_outq.function = &my_hrtimer_callback_outq;
-		hrtimer_start( &dev->timer_outq, ktime_outq, HRTIMER_MODE_REL );
-		dev->timer_outq_started = 1;
-		//printk( "Started skypopen OSS driver write HRtimer skype client:(%d) \n", key);
-	}
-#endif// WANT_HRTIMER
-
-	//printk("WRITE\n");
-	prepare_to_wait(&dev->outq, &wait, TASK_INTERRUPTIBLE);
-	schedule();
-	finish_wait(&dev->outq, &wait);
-	return count;
-
-}
-/*
- * The ioctl() implementation
- */
-
-#ifndef HAVE_UNLOCKED_IOCTL
-static int skypopen_ioctl(struct inode *inode, struct file *filp,
-		unsigned int cmd, unsigned long arg)
-{
-	void __user *argp = (void __user *)arg;
-	int __user *p = argp;
-
-	switch (cmd) {
-		case OSS_GETVERSION:
-			return put_user(SOUND_VERSION, p);
-		case SNDCTL_DSP_GETBLKSIZE:
-			return put_user(SKYPOPEN_BLK, p);
-		case SNDCTL_DSP_GETFMTS:
-			return put_user(28731, p);
-
-		default:
-			return 0;
-	}
-
-}
-#else// HAVE_UNLOCKED_IOCTL
-static long skypopen_unlocked_ioctl(struct file *filp,
-		unsigned int cmd, unsigned long arg)
-{
-	void __user *argp = (void __user *)arg;
-	int __user *p = argp;
-
-	switch (cmd) {
-		case OSS_GETVERSION:
-			return put_user(SOUND_VERSION, p);
-		case SNDCTL_DSP_GETBLKSIZE:
-			return put_user(SKYPOPEN_BLK, p);
-		case SNDCTL_DSP_GETFMTS:
-			return put_user(28731, p);
-
-		default:
-			return 0;
-	}
-
-}
-#endif// HAVE_UNLOCKED_IOCTL
-
-struct file_operations skypopen_fops = {
-	.owner =    THIS_MODULE,
-	.llseek =   no_llseek,
-	.read =     skypopen_read,
-	.write =    skypopen_write,
-#ifndef HAVE_UNLOCKED_IOCTL
-	.ioctl =    skypopen_ioctl,
-#else// HAVE_UNLOCKED_IOCTL
-	.unlocked_ioctl =    skypopen_unlocked_ioctl,
-#endif// HAVE_UNLOCKED_IOCTL
-	.open =     skypopen_c_open,
-	.release =  skypopen_c_release,
-};
-
-/*
- * Finally, the module stuff
- */
-
-/*
- * The cleanup function is used to handle initialization failures as well.
- * Thefore, it must be careful to work correctly even if some of the items
- * have not been initialized
- */
-
-void skypopen_cleanup_module(void)
-{
-	int i;
-	int ret;
-	struct skypopen_listitem *lptr, *next;
-	dev_t devno = MKDEV(skypopen_major, skypopen_minor);
-
-
-	unload = 1;
-
-	msleep(100);
-
-	/* Get rid of our char dev entries */
-	if (skypopen_devices) {
-		for (i = 0; i < skypopen_nr_devs; i++) {
-			cdev_del(&skypopen_devices[i].cdev);
-		}
-		kfree(skypopen_devices);
-	}
-
-	/* And all the cloned devices */
-	list_for_each_entry_safe(lptr, next, &skypopen_c_list, list) {
-#ifndef WANT_HRTIMER
-		ret= del_timer( &lptr->device.timer_inq );
-		printk( "Stopped skypopen OSS driver read timer\n");
-		ret= del_timer( &lptr->device.timer_outq );
-		printk( "Stopped skypopen OSS driver write timer\n");
-#else// WANT_HRTIMER
-		if(lptr->device.timer_inq_started){
-			ret = hrtimer_cancel( &lptr->device.timer_inq );
-			printk( "Stopped skypopen OSS driver read HRtimer\n");
-		}
-		if(lptr->device.timer_outq_started){
-			ret = hrtimer_cancel( &lptr->device.timer_outq );
-			printk( "Stopped skypopen OSS driver write HRtimer\n");
-		}
-
-#endif// WANT_HRTIMER
-		list_del(&lptr->list);
-		kfree(lptr);
-	}
-	/* cleanup_module is never called if registering failed */
-	unregister_chrdev_region(devno, skypopen_nr_devs);
-	printk("skypopen OSS driver unloaded\n");
-
-}
-
-
-/*
- * Set up the char_dev structure for this device.
- */
-static void skypopen_setup_cdev(struct skypopen_dev *dev, int index)
-{
-	int err, devno = MKDEV(skypopen_major, skypopen_minor + index);
-
-	cdev_init(&dev->cdev, &skypopen_fops);
-	dev->cdev.owner = THIS_MODULE;
-	dev->cdev.ops = &skypopen_fops;
-	err = cdev_add (&dev->cdev, devno, 1);
-	/* Fail gracefully if need be */
-	if (err)
-		printk(KERN_NOTICE "Error %d adding skypopen%d", err, index);
-}
-
-
-
-int skypopen_init_module(void)
-{
-	int result, i;
-	dev_t dev = 0;
-
-	printk("skypopen OSS driver loading (www.freeswitch.org)\n");
-
-	/*
-	 * Get a range of minor numbers to work with, asking for a dynamic
-	 * major unless directed otherwise at load time.
-	 */
-	if (skypopen_major) {
-		dev = MKDEV(skypopen_major, skypopen_minor);
-		result = register_chrdev_region(dev, skypopen_nr_devs, "dsp");
-	} else {
-		result = alloc_chrdev_region(&dev, skypopen_minor, skypopen_nr_devs,
-				"dsp");
-		skypopen_major = MAJOR(dev);
-	}
-	if (result < 0) {
-		printk(KERN_WARNING "skypopen OSS driver: can't get major %d\n", skypopen_major);
-		return result;
-	}
-
-	/*
-	 * allocate the devices -- we can't have them static, as the number
-	 * can be specified at load time
-	 */
-	skypopen_devices = kmalloc(skypopen_nr_devs * sizeof(struct skypopen_dev), GFP_KERNEL);
-	if (!skypopen_devices) {
-		result = -ENOMEM;
-		goto fail;  /* Make this more graceful */
-	}
-	memset(skypopen_devices, 0, skypopen_nr_devs * sizeof(struct skypopen_dev));
-
-	/* Initialize each device. */
-	for (i = 0; i < skypopen_nr_devs; i++) {
-		skypopen_setup_cdev(&skypopen_devices[i], i);
-	}
-
-	/* At this point call the init function for any friend device */
-	dev = MKDEV(skypopen_major, skypopen_minor + skypopen_nr_devs);
-	return 0; /* succeed */
-
-fail:
-	skypopen_cleanup_module();
-	return result;
-}
-
-module_init(skypopen_init_module);
-module_exit(skypopen_cleanup_module);
diff --git a/src/mod/endpoints/mod_skypopen/oss/skypopen.h b/src/mod/endpoints/mod_skypopen/oss/skypopen.h
deleted file mode 100644
index 3486bccdd1..0000000000
--- a/src/mod/endpoints/mod_skypopen/oss/skypopen.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * skypopen.h -- definitions for the char module
- *
- * Copyright (C) 2010 Giovanni Maruzzelli
- * Copyright (C) 2001 Alessandro Rubini and Jonathan Corbet
- * Copyright (C) 2001 O'Reilly & Associates
- *
- * The source code in this file can be freely used, adapted,
- * and redistributed in source or binary form, so long as an
- * acknowledgment appears in derived source files.  The citation
- * should list that the code comes from the book "Linux Device
- * Drivers" by Alessandro Rubini and Jonathan Corbet, published
- * by O'Reilly & Associates.   No warranty is attached;
- * we cannot take responsibility for errors or fitness for use.
- *
- * $Id: skypopen.h,v 1.15 2004/11/04 17:51:18 rubini Exp $
- */
-
-#ifndef _SKYPOPEN_H_
-#define _SKYPOPEN_H_
-
-#include <linux/version.h>
-#include <linux/ioctl.h> /* needed for the _IOW etc stuff used later */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)
-#include <asm/switch_to.h>		/* cli(), *_flags */
-#else
-#include <asm/system.h>		/* cli(), *_flags */
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)
-
-
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 18)
-#define CENTOS_5
-#define WANT_HRTIMER /* undef this only if you don't want to use High Resolution Timers (why?) */
-#endif /* CentOS 5.x */
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
-#define WANT_HRTIMER
-#endif /* HRTIMER */
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)
-#define WANT_DEFINE_SPINLOCK
-#endif /* DEFINE_SPINLOCK */
-
-#define SKYPOPEN_BLK 1920
-#define SKYPOPEN_SLEEP 20
-
-
-#define SKYPOPEN_MAJOR 14   /* dynamic major by default */
-#define SKYPOPEN_MINOR 3   /* dynamic major by default */
-#define SKYPOPEN_NR_DEVS 1    /* not useful, I'm too lazy to remove it */
-
-#ifdef CENTOS_5
-#define HRTIMER_MODE_REL HRTIMER_REL
-#endif// CENTOS_5
-
-struct skypopen_dev {
-	struct cdev cdev;	  /* Char device structure		*/
-	wait_queue_head_t inq; /* read and write queues */
-	wait_queue_head_t outq; /* read and write queues */
-#ifndef WANT_HRTIMER
-	struct timer_list timer_inq;
-	struct timer_list timer_outq;
-#else// WANT_HRTIMER
-	struct hrtimer timer_inq;
-	struct hrtimer timer_outq;
-#endif// WANT_HRTIMER
-	int timer_inq_started;
-	int timer_outq_started;
-	int opened;
-};
-
-
-/*
- * The different configurable parameters
- */
-extern int skypopen_major;     /* main.c */
-extern int skypopen_nr_devs;
-
-#endif /* _SKYPOPEN_H_ */
diff --git a/src/mod/endpoints/mod_skypopen/skypopen.h b/src/mod/endpoints/mod_skypopen/skypopen.h
deleted file mode 100644
index a38a42c915..0000000000
--- a/src/mod/endpoints/mod_skypopen/skypopen.h
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * This module (mod_gsmopen) has been contributed by:
- *
- * Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * Maintainer: Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * mod_skypopen.c -- Skype compatible Endpoint Module
- *
- */
-
-
-#include <switch.h>
-
-#ifndef WIN32
-#include <sys/time.h>
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-
-// CLOUDTREE (Thomas Hazel)
-#define XIO_ERROR_BY_SETJMP
-//#define XIO_ERROR_BY_UCONTEXT
-
-// CLOUDTREE (Thomas Hazel)
-#ifdef XIO_ERROR_BY_SETJMP
-#include "setjmp.h"
-#endif
-// CLOUDTREE (Thomas Hazel)
-#ifdef XIO_ERROR_BY_UCONTEXT
-#include "ucontext.h"
-#endif
-
-#endif //WIN32
-
-#define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
-#include <spandsp.h>
-#include <spandsp/version.h>
-
-#ifndef WIN32
-#include <netinet/tcp.h>
-#endif
-
-#ifdef _MSC_VER
-//Windows macro  for FD_SET includes a warning C4127: conditional expression is constant
-#pragma warning(push)
-#pragma warning(disable:4127)
-#endif
-
-#define MY_EVENT_INCOMING_CHATMESSAGE "skypopen::incoming_chatmessage"
-#define MY_EVENT_INCOMING_RAW "skypopen::incoming_raw"
-
-#define SAMPLERATE_SKYPOPEN 16000
-#define MS_SKYPOPEN 20
-#define SAMPLES_PER_FRAME (SAMPLERATE_SKYPOPEN/(1000/MS_SKYPOPEN))
-#define BYTES_PER_FRAME (SAMPLES_PER_FRAME * sizeof(short))
-
-#ifndef SKYPOPEN_SVN_VERSION
-#define SKYPOPEN_SVN_VERSION switch_version_full()
-#endif /* SKYPOPEN_SVN_VERSION */
-
-typedef enum {
-	TFLAG_IO = (1 << 0),
-	TFLAG_INBOUND = (1 << 1),
-	TFLAG_OUTBOUND = (1 << 2),
-	TFLAG_DTMF = (1 << 3),
-	TFLAG_VOICE = (1 << 4),
-	TFLAG_HANGUP = (1 << 5),
-	TFLAG_LINEAR = (1 << 6),
-	TFLAG_PROGRESS = (1 << 7),
-	TFLAG_BREAK = (1 << 8)
-} TFLAGS;
-
-typedef enum {
-	GFLAG_MY_CODEC_PREFS = (1 << 0)
-} GFLAGS;
-
-#define DEBUGA_SKYPE(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"%-*s  [%s ] [DEBUG_SKYPE  %-5d][%-15s][%s,%s] " __VA_ARGS__ );
-#define DEBUGA_CALL(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"%-*s  [%s ] [DEBUG_CALL  %-5d][%-15s][%s,%s] " __VA_ARGS__ );
-#define DEBUGA_PBX(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 		"%-*s  [%s ] [DEBUG_PBX  %-5d][%-15s][%s,%s] " __VA_ARGS__ );
-#define ERRORA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 		"%-*s   [%s ] [ERRORA       %-5d][%-15s][%s,%s] " __VA_ARGS__ );
-#define WARNINGA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 		"%-*s[%s ] [WARNINGA     %-5d][%-15s][%s,%s] " __VA_ARGS__ );
-#define NOTICA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, 		"%-*s [%s ] [NOTICA       %-5d][%-15s][%s,%s] " __VA_ARGS__ );
-
-#define SKYPOPEN_P_LOG (int)((20 - (strlen(__FILE__))) + ((__LINE__ - 1000) < 0) + ((__LINE__ - 100) < 0)), " ", SKYPOPEN_SVN_VERSION, __LINE__, tech_pvt ? tech_pvt->name ? tech_pvt->name : "none" : "none", tech_pvt ? interface_status[tech_pvt->interface_state] : "N/A", tech_pvt ? skype_callflow[tech_pvt->skype_callflow] : "N/A"
-
-/*********************************/
-#define SKYPOPEN_CAUSE_NORMAL		1
-/*********************************/
-#define SKYPOPEN_FRAME_DTMF			1
-/*********************************/
-#define SKYPOPEN_CONTROL_RINGING		1
-#define SKYPOPEN_CONTROL_ANSWER		2
-
-/*********************************/
-// CLOUDTREE (Thomas Hazel)
-#define SKYPOPEN_RINGING_INIT		0
-#define SKYPOPEN_RINGING_PRE		1
-
-/*********************************/
-#define		SKYPOPEN_STATE_IDLE					0
-#define		SKYPOPEN_STATE_DOWN					1
-#define		SKYPOPEN_STATE_RING					2
-#define		SKYPOPEN_STATE_DIALING				3
-#define		SKYPOPEN_STATE_BUSY					4
-#define		SKYPOPEN_STATE_UP					5
-#define		SKYPOPEN_STATE_RINGING				6
-#define		SKYPOPEN_STATE_PRERING				7
-#define		SKYPOPEN_STATE_ERROR_DOUBLE_CALL		8
-#define		SKYPOPEN_STATE_SELECTED				9
-#define 	SKYPOPEN_STATE_HANGUP_REQUESTED		10
-#define		SKYPOPEN_STATE_PREANSWER				11
-#define		SKYPOPEN_STATE_DEAD				12
-/*********************************/
-/* call flow from the device */
-#define 	CALLFLOW_CALL_IDLE					0
-#define 	CALLFLOW_CALL_DOWN					1
-#define 	CALLFLOW_INCOMING_RING				2
-#define 	CALLFLOW_CALL_DIALING				3
-#define 	CALLFLOW_CALL_LINEBUSY				4
-#define 	CALLFLOW_CALL_ACTIVE				5
-#define 	CALLFLOW_INCOMING_HANGUP			6
-#define 	CALLFLOW_CALL_RELEASED				7
-#define 	CALLFLOW_CALL_NOCARRIER				8
-#define 	CALLFLOW_CALL_INFLUX				9
-#define 	CALLFLOW_CALL_INCOMING				10
-#define 	CALLFLOW_CALL_FAILED				11
-#define 	CALLFLOW_CALL_NOSERVICE				12
-#define 	CALLFLOW_CALL_OUTGOINGRESTRICTED	13
-#define 	CALLFLOW_CALL_SECURITYFAIL			14
-#define 	CALLFLOW_CALL_NOANSWER				15
-#define 	CALLFLOW_STATUS_FINISHED			16
-#define 	CALLFLOW_STATUS_CANCELLED			17
-#define 	CALLFLOW_STATUS_FAILED				18
-#define 	CALLFLOW_STATUS_REFUSED				19
-#define 	CALLFLOW_STATUS_RINGING				20
-#define 	CALLFLOW_STATUS_INPROGRESS			21
-#define 	CALLFLOW_STATUS_UNPLACED			22
-#define 	CALLFLOW_STATUS_ROUTING				23
-#define 	CALLFLOW_STATUS_EARLYMEDIA			24
-#define 	CALLFLOW_INCOMING_CALLID			25
-#define 	CALLFLOW_STATUS_REMOTEHOLD			26
-
-/*********************************/
-
-#define SKYPOPEN_MAX_INTERFACES 64
-
-#ifndef WIN32
-struct SkypopenHandles {
-	Window skype_win;
-	Display *disp;
-	Window win;
-	int currentuserhandle;
-	int api_connected;
-	int fdesc[2];
-
-	// CLOUDTREE (Thomas Hazel)
-#ifdef XIO_ERROR_BY_SETJMP
-	jmp_buf ioerror_context;
-#endif
-#ifdef XIO_ERROR_BY_UCONTEXT
-	ucontext_t ioerror_context;
-#endif
-
-	// CLOUDTREE (Thomas Hazel) - is there a capable freeswitch list?
-	switch_bool_t managed;
-	void *prev;
-	void *next;
-};
-
-// CLOUDTREE (Thomas Hazel) - is there a capable freeswitch list?
-struct SkypopenList {
-	int entries;
-	void *head;
-	void *tail;
-};
-
-// CLOUDTREE (Thomas Hazel) - is there a capable freeswitch list?
-struct SkypopenHandles *skypopen_list_add(struct SkypopenList *list, struct SkypopenHandles *x);
-struct SkypopenHandles *skypopen_list_find(struct SkypopenList *list, struct SkypopenHandles *x);
-struct SkypopenHandles *skypopen_list_remove_by_value(struct SkypopenList *list, Display * display);
-struct SkypopenHandles *skypopen_list_remove_by_reference(struct SkypopenList *list, struct SkypopenHandles *x);
-int skypopen_list_size(struct SkypopenList *list);
-
-#else //WIN32
-
-struct SkypopenHandles {
-	HWND win32_hInit_MainWindowHandle;
-	HWND win32_hGlobal_SkypeAPIWindowHandle;
-	HINSTANCE win32_hInit_ProcessHandle;
-	char win32_acInit_WindowClassName[128];
-	UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach;
-	UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover;
-	int currentuserhandle;
-	int api_connected;
-	switch_file_t *fdesc[2];
-};
-#endif //WIN32
-
-#define MAX_CHATS 10
-
-struct chat {
-	char chatname[256];
-	char dialog_partner[256];
-};
-typedef struct chat chat_t;
-
-#define MAX_CHATMESSAGES 10
-
-struct chatmessage {
-	char id[256];
-	char type[256];
-	char chatname[256];
-	char from_handle[256];
-	char from_dispname[256];
-	char body[512];
-};
-typedef struct chatmessage chatmessage_t;
-struct private_object {
-	unsigned int flags;
-	switch_codec_t read_codec;
-	switch_codec_t write_codec;
-	switch_frame_t read_frame;
-	unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	char session_uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	switch_caller_profile_t *caller_profile;
-	switch_mutex_t *mutex;
-	switch_mutex_t *flag_mutex;
-
-	char interface_id[80];
-	char name[80];
-	char dialplan[80];
-	char context[80];
-	char dial_regex[256];
-	char fail_dial_regex[256];
-	char hold_music[256];
-	char type[256];
-	char X11_display[256];
-#ifdef WIN32
-	unsigned short tcp_cli_port;
-	unsigned short tcp_srv_port;
-#else
-	int tcp_cli_port;
-	int tcp_srv_port;
-#endif
-	struct SkypopenHandles SkypopenHandles;
-
-	// CLOUDTREE (Thomas Hazel)
-	char ringing_state;
-
-	int interface_state;
-	char language[80];
-	char exten[80];
-	int skypopen_sound_rate;
-	char callid_name[50];
-	char callid_number[50];
-	double playback_boost;
-	double capture_boost;
-	int stripmsd;
-	char skype_call_id[512];
-	int skype_call_ongoing;
-	char skype_friends[4096];
-	char skype_fullname[512];
-	char skype_displayname[512];
-	int skype_callflow;
-	int skype;
-	int control_to_send;
-#ifdef WIN32
-	switch_file_t *audiopipe_srv[2];
-	switch_file_t *audiopipe_cli[2];
-	switch_file_t *skypopen_sound_capt_fd;
-#else							/* WIN32 */
-	int audiopipe_srv[2];
-	int audiopipe_cli[2];
-	int skypopen_sound_capt_fd;
-#endif							/* WIN32 */
-	switch_thread_t *tcp_srv_thread;
-	switch_thread_t *tcp_cli_thread;
-	switch_thread_t *skypopen_signaling_thread;
-	switch_thread_t *skypopen_api_thread;
-	short audiobuf[SAMPLES_PER_FRAME];
-	int audiobuf_is_loaded;
-	short audiobuf_cli[SAMPLES_PER_FRAME];
-	switch_mutex_t *mutex_audio_cli;
-	int flag_audio_cli;
-	short audiobuf_srv[SAMPLES_PER_FRAME];
-	switch_mutex_t *mutex_audio_srv;
-	int flag_audio_srv;
-	switch_mutex_t *mutex_thread_audio_cli;
-	switch_mutex_t *mutex_thread_audio_srv;
-
-	FILE *phonebook_writing_fp;
-	int skypopen_dir_entry_extension_prefix;
-	char skype_user[256];
-	char initial_skype_user[256];
-	char skype_password[256];
-	char destination[256];
-	struct timeval answer_time;
-	struct timeval ring_time;
-
-	struct timeval transfer_time;
-	char transfer_callid_number[50];
-	char skype_transfer_call_id[512];
-	int running;
-	uint32_t ib_calls;
-	uint32_t ob_calls;
-	uint32_t ib_failed_calls;
-	uint32_t ob_failed_calls;
-
-	chatmessage_t chatmessages[MAX_CHATMESSAGES];
-	chat_t chats[MAX_CHATS];
-	uint32_t report_incoming_chatmessages;
-	switch_timer_t timer_read;
-	switch_timer_t timer_read_srv;
-	switch_timer_t timer_write;
-	int begin_to_write;
-	int begin_to_read;
-	dtmf_rx_state_t dtmf_state;
-	switch_time_t old_dtmf_timestamp;
-	switch_buffer_t *write_buffer;
-	switch_buffer_t *read_buffer;
-	int silent_mode;
-	int write_silence_when_idle;
-	int setsockopt;
-	char answer_id[256];
-	char answer_value[256];
-	char ring_id[256];
-	char ring_value[256];
-
-	char message[4096];
-	char skype_voicemail_id[512];
-	char skype_voicemail_id_greeting[512];
-};
-
-typedef struct private_object private_t;
-
-void *SWITCH_THREAD_FUNC skypopen_api_thread_func(switch_thread_t *thread, void *obj);
-int skypopen_audio_read(private_t *tech_pvt);
-int skypopen_audio_init(private_t *tech_pvt);
-int skypopen_signaling_write(private_t *tech_pvt, char *msg_to_skype);
-int skypopen_signaling_read(private_t *tech_pvt);
-
-int skypopen_call(private_t *tech_pvt, char *idest, int timeout);
-int skypopen_senddigit(private_t *tech_pvt, char digit);
-
-void *skypopen_do_tcp_srv_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC skypopen_do_tcp_srv_thread(switch_thread_t *thread, void *obj);
-
-void *skypopen_do_tcp_cli_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC skypopen_do_tcp_cli_thread(switch_thread_t *thread, void *obj);
-
-void *skypopen_do_skypeapi_thread_func(void *obj);
-void *SWITCH_THREAD_FUNC skypopen_do_skypeapi_thread(switch_thread_t *thread, void *obj);
-int dtmf_received(private_t *tech_pvt, char *value);
-int start_audio_threads(private_t *tech_pvt);
-int new_inbound_channel(private_t *tech_pvt);
-int outbound_channel_answered(private_t *tech_pvt);
-int skypopen_signaling_write(private_t *tech_pvt, char *msg_to_skype);
-#if defined(WIN32) && !defined(__CYGWIN__)
-int skypopen_pipe_read(switch_file_t *pipe, short *buf, int howmany);
-int skypopen_pipe_write(switch_file_t *pipe, short *buf, int howmany);
-/* Visual C do not have strsep ? */
-char *strsep(char **stringp, const char *delim);
-#else
-int skypopen_pipe_read(int pipe, short *buf, int howmany);
-int skypopen_pipe_write(int pipe, short *buf, int howmany);
-#endif /* WIN32 */
-int skypopen_close_socket(unsigned int fd);
-private_t *find_available_skypopen_interface_rr(private_t *tech_pvt_calling);
-int remote_party_is_ringing(private_t *tech_pvt);
-int remote_party_is_early_media(private_t *tech_pvt);
-int skypopen_answer(private_t *tech_pvt);
-int skypopen_transfer(private_t *tech_pvt);
-#ifndef WIN32
-int skypopen_socket_create_and_bind(private_t *tech_pvt, int *which_port);
-#else
-int skypopen_socket_create_and_bind(private_t *tech_pvt, unsigned short *which_port);
-#endif //WIN32
-int incoming_chatmessage(private_t *tech_pvt, int which);
-int next_port(void);
-int skypopen_partner_handle_ring(private_t *tech_pvt);
-int skypopen_answered(private_t *tech_pvt);
-int inbound_channel_answered(private_t *tech_pvt);
diff --git a/src/mod/endpoints/mod_skypopen/skypopen_protocol.c b/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
deleted file mode 100644
index d001af16ab..0000000000
--- a/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
+++ /dev/null
@@ -1,2197 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * This module (mod_gsmopen) has been contributed by:
- *
- * Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * Maintainer: Giovanni Maruzzelli <gmaruzz@gmail.com>
- *
- * skypopen_protocol.c -- Low Level Interface for mod_skypopen
- *
- */
-
-
-#include "skypopen.h"
-
-#ifdef ASTERISK
-#define skypopen_sleep usleep
-#define skypopen_strncpy strncpy
-#define tech_pvt p
-extern int skypopen_debug;
-extern char *skypopen_console_active;
-#else /* FREESWITCH */
-#define skypopen_sleep switch_sleep
-#define skypopen_strncpy switch_copy_string
-extern switch_memory_pool_t *skypopen_module_pool;
-extern switch_endpoint_interface_t *skypopen_endpoint_interface;
-#endif /* ASTERISK */
-int samplerate_skypopen = SAMPLERATE_SKYPOPEN;
-
-extern int running;
-extern char *interface_status[];
-extern char *skype_callflow[];
-
-/*************************************/
-/* suspicious globals FIXME */
-#ifdef WIN32
-DWORD win32_dwThreadId;
-#else
-
-// CLOUDTREE (Thomas Hazel)
-static int global_x_error = Success;
-extern struct SkypopenList global_handles_list;
-extern switch_status_t remove_interface(char *the_interface, switch_bool_t force);
-
-#endif /* WIN32 */
-/*************************************/
-#ifndef WIN32
-int skypopen_socket_create_and_bind(private_t *tech_pvt, int *which_port)
-#else
-int skypopen_socket_create_and_bind(private_t *tech_pvt, unsigned short *which_port)
-#endif							//WIN32
-{
-	int s = -1;
-	struct sockaddr_in my_addr;
-#ifndef WIN32
-	int start_port = 6001;
-	unsigned int size = sizeof(int);
-#else
-	unsigned short start_port = 6001;
-	int size = sizeof(int);
-#endif //WIN32
-	int sockbufsize = 0;
-	int flag = 0;
-
-
-	memset(&my_addr, 0, sizeof(my_addr));
-	my_addr.sin_family = AF_INET;
-	my_addr.sin_addr.s_addr = htonl(0x7f000001);	/* use the localhost */
-
-	if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-		ERRORA("socket Error\n", SKYPOPEN_P_LOG);
-		return -1;
-	}
-
-	if (*which_port != 0)
-		start_port = *which_port;
-#ifdef WIN32
-	start_port = (unsigned short) next_port();
-#else
-	start_port = (unsigned short) next_port();
-#endif
-	my_addr.sin_port = htons(start_port);
-	*which_port = start_port;
-	while (bind(s, (struct sockaddr *) &my_addr, sizeof(struct sockaddr)) < 0) {
-		DEBUGA_SKYPE("*which_port=%d, tech_pvt->tcp_cli_port=%d, tech_pvt->tcp_srv_port=%d\n", SKYPOPEN_P_LOG, *which_port, tech_pvt->tcp_cli_port,
-					 tech_pvt->tcp_srv_port);
-		DEBUGA_SKYPE("bind errno=%d, error: %s\n", SKYPOPEN_P_LOG, errno, strerror(errno));
-		start_port++;
-		my_addr.sin_port = htons(start_port);
-		*which_port = start_port;
-		DEBUGA_SKYPE("*which_port=%d, tech_pvt->tcp_cli_port=%d, tech_pvt->tcp_srv_port=%d\n", SKYPOPEN_P_LOG, *which_port, tech_pvt->tcp_cli_port,
-					 tech_pvt->tcp_srv_port);
-
-		if (start_port > 65000) {
-			ERRORA("NO MORE PORTS! *which_port=%d, tech_pvt->tcp_cli_port=%d, tech_pvt->tcp_srv_port=%d\n", SKYPOPEN_P_LOG, *which_port,
-				   tech_pvt->tcp_cli_port, tech_pvt->tcp_srv_port);
-			return -1;
-		}
-	}
-
-	DEBUGA_SKYPE("Binded! *which_port=%d, tech_pvt->tcp_cli_port=%d, tech_pvt->tcp_srv_port=%d\n", SKYPOPEN_P_LOG, *which_port, tech_pvt->tcp_cli_port,
-				 tech_pvt->tcp_srv_port);
-
-	sockbufsize = 0;
-	size = sizeof(int);
-	getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, &size);
-	DEBUGA_SKYPE("1 SO_RCVBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
-	sockbufsize = 0;
-	size = sizeof(int);
-	getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, &size);
-	DEBUGA_SKYPE("1 SO_SNDBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
-
-
-
-#ifdef WIN32
-	sockbufsize = SAMPLES_PER_FRAME * 8;
-#else
-	sockbufsize = SAMPLES_PER_FRAME * 8;
-#endif //WIN32
-	size = sizeof(int);
-	if (tech_pvt->setsockopt) {
-		setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, size);
-	}
-
-	sockbufsize = 0;
-	size = sizeof(int);
-	getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, &size);
-	DEBUGA_SKYPE("2 SO_RCVBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
-
-#ifdef WIN32
-	sockbufsize = SAMPLES_PER_FRAME * 8;
-#else
-	sockbufsize = SAMPLES_PER_FRAME * 8;
-#endif //WIN32
-	size = sizeof(int);
-	if (tech_pvt->setsockopt) {
-		setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, size);
-	}
-
-	sockbufsize = 0;
-	size = sizeof(int);
-	getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, &size);
-	DEBUGA_SKYPE("2 SO_SNDBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
-
-	flag = 0;
-	getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, &size);
-	DEBUGA_SKYPE("TCP_NODELAY is %d\n", SKYPOPEN_P_LOG, flag);
-	flag = 1;
-	if (tech_pvt->setsockopt) {
-		setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, size);
-	}
-	flag = 0;
-	getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, &size);
-	DEBUGA_SKYPE("TCP_NODELAY is %d\n", SKYPOPEN_P_LOG, flag);
-
-
-
-
-	return s;
-}
-
-int skypopen_signaling_read(private_t *tech_pvt)
-{
-	char read_from_pipe[4096];
-	char message[4096];
-	char message_2[4096];
-	char *buf, obj[512] = "", id[512] = "", prop[512] = "", value[512] = "", *where;
-	char **stringp = NULL;
-	int a;
-	unsigned int howmany;
-	unsigned int i;
-
-	memset(read_from_pipe, 0, 4096);
-	memset(message, 0, 4096);
-	memset(message_2, 0, 4096);
-
-	howmany = skypopen_pipe_read(tech_pvt->SkypopenHandles.fdesc[0], (short *) read_from_pipe, sizeof(read_from_pipe));
-
-	a = 0;
-	for (i = 0; i < howmany; i++) {
-		message[a] = read_from_pipe[i];
-		a++;
-
-		if (read_from_pipe[i] == '\0') {
-			//if (!strstr(message, "DURATION")) {
-			DEBUGA_SKYPE("READING: |||%s||| \n", SKYPOPEN_P_LOG, message);
-			strncpy(tech_pvt->message, message, sizeof(tech_pvt->message));
-			//}
-			if (!strcasecmp(message, "SILENT_MODE OFF")) {
-				if (tech_pvt->silent_mode) {
-					DEBUGA_SKYPE("Resetting SILENT_MODE on skype_call: %s.\n", SKYPOPEN_P_LOG, id);
-					skypopen_signaling_write(tech_pvt, "SET SILENT_MODE ON");
-					//switch_sleep(1000);
-				}
-			}
-			if (!strcasecmp(message, "ERROR 68")) {
-				DEBUGA_SKYPE
-					("If I don't connect immediately, please give the Skype client authorization to be connected by Skypopen (and to not ask you again)\n",
-					 SKYPOPEN_P_LOG);
-				skypopen_sleep(1000000);
-				skypopen_signaling_write(tech_pvt, "PROTOCOL 999");
-				skypopen_sleep(20000);
-				return 0;
-			}
-			if (!strncasecmp(message, "ERROR 92 CALL", 12)) {
-				ERRORA("Skype got ERROR: |||%s|||, the (skypeout) number we called was not recognized as valid\n", SKYPOPEN_P_LOG, message);
-				tech_pvt->skype_callflow = CALLFLOW_STATUS_FINISHED;
-				DEBUGA_SKYPE("skype_call now is DOWN\n", SKYPOPEN_P_LOG);
-				tech_pvt->skype_call_id[0] = '\0';
-
-				if (tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED) {
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-					return CALLFLOW_INCOMING_HANGUP;
-				} else {
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-				}
-			}
-
-			if (!strncasecmp(message, "ERROR", 4)) {
-				if (!strncasecmp(message, "ERROR 96 CALL", 12)) {
-					DEBUGA_SKYPE
-						("Skype got ERROR: |||%s|||, we are trying to use this interface to make or receive a call, but another call is half-active on this interface. Let's the previous one to continue.\n",
-						 SKYPOPEN_P_LOG, message);
-				} else if (!strncasecmp(message, "ERROR 99 CALL", 12)) {
-					DEBUGA_SKYPE("Skype got ERROR: |||%s|||, another call is active on this interface\n\n\n", SKYPOPEN_P_LOG, message);
-					tech_pvt->interface_state = SKYPOPEN_STATE_ERROR_DOUBLE_CALL;
-				} else if (!strncasecmp(message, "ERROR 531 VOICEMAIL", 18)) {
-					NOTICA("Skype got ERROR about VOICEMAIL, no problem: |||%s|||\n", SKYPOPEN_P_LOG, message);
-				} else if (!strncasecmp(message, "ERROR 529 VOICEMAIL", 18)) {
-					NOTICA("Skype got ERROR about VOICEMAIL, no problem: |||%s|||\n", SKYPOPEN_P_LOG, message);
-				} else if (!strncasecmp(message, "ERROR 592 ALTER CALL", 19)) {
-					NOTICA("Skype got ERROR about TRANSFERRING, no problem: |||%s|||\n", SKYPOPEN_P_LOG, message);
-				} else if (!strncasecmp(message, "ERROR 559 CALL", 13) | !strncasecmp(message, "ERROR 556 CALL", 13)) {
-					if (tech_pvt->interface_state == SKYPOPEN_STATE_PREANSWER) {
-						DEBUGA_SKYPE("Skype got ERROR about a failed action (probably TRYING to ANSWER A CALL), let's go down: |||%s|||\n", SKYPOPEN_P_LOG,
-									 message);
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_FINISHED;
-						DEBUGA_SKYPE("skype_call now is DOWN\n", SKYPOPEN_P_LOG);
-						tech_pvt->skype_call_id[0] = '\0';
-						tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-						return CALLFLOW_INCOMING_HANGUP;
-
-					} else {
-						DEBUGA_SKYPE("Skype got ERROR about a failed action (probably TRYING to HANGUP A CALL), no problem: |||%s|||\n", SKYPOPEN_P_LOG,
-									 message);
-					}
-				} else if (!strncasecmp(message, "ERROR 36 Not online", 18)) {
-					char msg_to_skype[256];
-					ERRORA("Skype client is not online, eg: not connected to Skype network, probably got a temporary net outage: |||%s|||\n",
-						   SKYPOPEN_P_LOG, message);
-					if (strlen(tech_pvt->skype_call_id)) {
-						sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-					}
-					if (strlen(tech_pvt->ring_id)) {
-						sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->ring_id);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-					}
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-					return CALLFLOW_INCOMING_HANGUP;
-				} else if (!strncasecmp(message, "ERROR 589 ALTER CALL", 19)) {
-					char msg_to_skype[256];
-					DEBUGA_SKYPE("Skype client was not able to correctly manage tcp audio sockets, probably got a local or remote hangup: |||%s|||\n",
-								 SKYPOPEN_P_LOG, message);
-					if (strlen(tech_pvt->skype_call_id)) {
-						sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-					}
-					if (strlen(tech_pvt->ring_id)) {
-						sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", tech_pvt->ring_id);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-					}
-					tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-					return CALLFLOW_INCOMING_HANGUP;
-				} else {
-					ERRORA("Skype got ERROR: |||%s|||\n", SKYPOPEN_P_LOG, message);
-					tech_pvt->skype_callflow = CALLFLOW_STATUS_FINISHED;
-					ERRORA("skype_call now is DOWN\n", SKYPOPEN_P_LOG);
-					tech_pvt->skype_call_id[0] = '\0';
-
-					if (tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED) {
-						tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-						return CALLFLOW_INCOMING_HANGUP;
-					} else {
-						tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-					}
-				}
-			}
-
-			skypopen_strncpy(message_2, message, sizeof(message) - 1);
-			buf = message;
-			stringp = &buf;
-			where = strsep(stringp, " ");
-			if (!where) {
-				WARNINGA("Skype MSG without spaces: %s\n", SKYPOPEN_P_LOG, message);
-			}
-
-			if (!strcasecmp(message, "CURRENTUSERHANDLE")) {
-				skypopen_strncpy(obj, where, sizeof(obj) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(id, where, sizeof(id) - 1);
-				if (!strcasecmp(id, tech_pvt->skype_user)) {
-					tech_pvt->SkypopenHandles.currentuserhandle = 1;
-					DEBUGA_SKYPE
-						("Skype MSG: message: %s, currentuserhandle: %s, cuh: %s, skype_user: %s!\n",
-						 SKYPOPEN_P_LOG, message, obj, id, tech_pvt->skype_user);
-				}
-			}
-			if (!strcasecmp(message, "USER")) {
-				skypopen_strncpy(obj, where, sizeof(obj) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(id, where, sizeof(id) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(prop, where, sizeof(prop) - 1);
-				if (!strcasecmp(prop, "RECEIVEDAUTHREQUEST")) {
-					char msg_to_skype[256];
-					DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s!\n", SKYPOPEN_P_LOG, message, obj, id, prop);
-					sprintf(msg_to_skype, "SET USER %s ISAUTHORIZED TRUE", id);
-					skypopen_signaling_write(tech_pvt, msg_to_skype);
-				}
-			}
-			if (!strcasecmp(message, "MESSAGE")) {
-				skypopen_strncpy(obj, where, sizeof(obj) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(id, where, sizeof(id) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(prop, where, sizeof(prop) - 1);
-				if (!strcasecmp(prop, "STATUS")) {
-					where = strsep(stringp, " ");
-					skypopen_strncpy(value, where, sizeof(value) - 1);
-					if (!strcasecmp(value, "RECEIVED")) {
-						char msg_to_skype[256];
-						DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s value: %s!\n", SKYPOPEN_P_LOG, message, obj, id, prop, value);
-						//TODO: authomatically flag messages as read based on config param
-						sprintf(msg_to_skype, "SET MESSAGE %s SEEN", id);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-					}
-				} else if (!strcasecmp(prop, "BODY")) {
-					char msg_to_skype[256];
-					DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s!\n", SKYPOPEN_P_LOG, message, obj, id, prop);
-					//TODO: authomatically flag messages as read based on config param
-					sprintf(msg_to_skype, "SET MESSAGE %s SEEN", id);
-					skypopen_signaling_write(tech_pvt, msg_to_skype);
-				}
-			}
-			if (!strcasecmp(message, "CHAT")) {
-				char msg_to_skype[256];
-				int i;
-				int found;
-
-				skypopen_strncpy(obj, where, sizeof(obj) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(id, where, sizeof(id) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(prop, where, sizeof(prop) - 1);
-				skypopen_strncpy(value, *stringp, sizeof(value) - 1);
-
-				if (!strcasecmp(prop, "STATUS") && !strcasecmp(value, "DIALOG")) {
-					DEBUGA_SKYPE("CHAT %s is DIALOG\n", SKYPOPEN_P_LOG, id);
-					sprintf(msg_to_skype, "GET CHAT %s DIALOG_PARTNER", id);
-					skypopen_signaling_write(tech_pvt, msg_to_skype);
-				}
-
-				if (!strcasecmp(prop, "DIALOG_PARTNER")) {
-					DEBUGA_SKYPE("CHAT %s has DIALOG_PARTNER %s\n", SKYPOPEN_P_LOG, id, value);
-					found = 0;
-					for (i = 0; i < MAX_CHATS; i++) {
-						if (strlen(tech_pvt->chats[i].chatname) == 0 || !strcmp(tech_pvt->chats[i].chatname, id)) {
-							strncpy(tech_pvt->chats[i].chatname, id, sizeof(tech_pvt->chats[i].chatname));
-							strncpy(tech_pvt->chats[i].dialog_partner, value, sizeof(tech_pvt->chats[i].dialog_partner));
-							found = 1;
-							break;
-						}
-					}
-					if (!found) {
-						ERRORA("why we do not have a chats slot free? we have more than %d chats in parallel?\n", SKYPOPEN_P_LOG, MAX_CHATS);
-					}
-
-					DEBUGA_SKYPE("CHAT %s is in position %d in the chats array, chatname=%s, dialog_partner=%s\n", SKYPOPEN_P_LOG, id, i,
-								 tech_pvt->chats[i].chatname, tech_pvt->chats[i].dialog_partner);
-				}
-
-			}
-
-
-			if (!strcasecmp(message, "CHATMESSAGE")) {
-				char msg_to_skype[256];
-				int i;
-				int found;
-
-				skypopen_strncpy(obj, where, sizeof(obj) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(id, where, sizeof(id) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(prop, where, sizeof(prop) - 1);
-				skypopen_strncpy(value, *stringp, sizeof(value) - 1);
-
-				if (!tech_pvt->report_incoming_chatmessages) {
-					if (!strcasecmp(prop, "STATUS") && !strcasecmp(value, "RECEIVED")) {
-						sprintf(msg_to_skype, "SET CHATMESSAGE %s SEEN", id);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-					}
-				} else {
-					if (!strcasecmp(prop, "STATUS") && !strcasecmp(value, "RECEIVED")) {
-						DEBUGA_SKYPE("RECEIVED CHATMESSAGE %s, let's see which type it is\n", SKYPOPEN_P_LOG, id);
-						sprintf(msg_to_skype, "GET CHATMESSAGE %s TYPE", id);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-					}
-
-					if (!strcasecmp(prop, "TYPE") && !strcasecmp(value, "SAID")) {
-						DEBUGA_SKYPE("CHATMESSAGE %s is of type SAID, let's get the other infos\n", SKYPOPEN_P_LOG, id);
-						found = 0;
-						for (i = 0; i < MAX_CHATMESSAGES; i++) {
-							if (strlen(tech_pvt->chatmessages[i].id) == 0) {
-								strncpy(tech_pvt->chatmessages[i].id, id, sizeof(tech_pvt->chatmessages[i].id));
-								strncpy(tech_pvt->chatmessages[i].type, value, sizeof(tech_pvt->chatmessages[i].type));
-								found = 1;
-								break;
-							}
-						}
-						if (!found) {
-							ERRORA("why we do not have a chatmessages slot free? we have more than %d chatmessages in parallel?\n", SKYPOPEN_P_LOG,
-								   MAX_CHATMESSAGES);
-						} else {
-							DEBUGA_SKYPE("CHATMESSAGE %s is in position %d in the chatmessages array, type=%s, id=%s\n", SKYPOPEN_P_LOG, id, i,
-										 tech_pvt->chatmessages[i].type, tech_pvt->chatmessages[i].id);
-							sprintf(msg_to_skype, "GET CHATMESSAGE %s CHATNAME", id);
-							skypopen_signaling_write(tech_pvt, msg_to_skype);
-							//skypopen_sleep(1000);
-							sprintf(msg_to_skype, "GET CHATMESSAGE %s FROM_HANDLE", id);
-							skypopen_signaling_write(tech_pvt, msg_to_skype);
-							//skypopen_sleep(1000);
-							sprintf(msg_to_skype, "GET CHATMESSAGE %s FROM_DISPNAME", id);
-							skypopen_signaling_write(tech_pvt, msg_to_skype);
-							//skypopen_sleep(1000);
-							sprintf(msg_to_skype, "GET CHATMESSAGE %s BODY", id);
-							skypopen_signaling_write(tech_pvt, msg_to_skype);
-						}
-					}
-
-					if (!strcasecmp(prop, "CHATNAME")) {
-						DEBUGA_SKYPE("CHATMESSAGE %s belongs to the CHAT %s\n", SKYPOPEN_P_LOG, id, value);
-						found = 0;
-						for (i = 0; i < MAX_CHATMESSAGES; i++) {
-							if (!strcmp(tech_pvt->chatmessages[i].id, id)) {
-								strncpy(tech_pvt->chatmessages[i].chatname, value, sizeof(tech_pvt->chatmessages[i].chatname));
-								found = 1;
-								break;
-							}
-						}
-						if (!found) {
-							DEBUGA_SKYPE("why chatmessage %s was not found in the chatmessages array??\n", SKYPOPEN_P_LOG, id);
-						}
-					}
-					if (!strcasecmp(prop, "FROM_HANDLE")) {
-						DEBUGA_SKYPE("CHATMESSAGE %s was sent by FROM_HANDLE %s\n", SKYPOPEN_P_LOG, id, value);
-						found = 0;
-						for (i = 0; i < MAX_CHATMESSAGES; i++) {
-							if (!strcmp(tech_pvt->chatmessages[i].id, id)) {
-								strncpy(tech_pvt->chatmessages[i].from_handle, value, sizeof(tech_pvt->chatmessages[i].from_handle));
-								found = 1;
-								break;
-							}
-						}
-						if (!found) {
-							DEBUGA_SKYPE("why chatmessage %s was not found in the chatmessages array??\n", SKYPOPEN_P_LOG, id);
-						}
-
-					}
-					if (!strcasecmp(prop, "FROM_DISPNAME")) {
-						DEBUGA_SKYPE("CHATMESSAGE %s was sent by FROM_DISPNAME %s\n", SKYPOPEN_P_LOG, id, value);
-						found = 0;
-						for (i = 0; i < MAX_CHATMESSAGES; i++) {
-							if (!strcmp(tech_pvt->chatmessages[i].id, id)) {
-								strncpy(tech_pvt->chatmessages[i].from_dispname, value, sizeof(tech_pvt->chatmessages[i].from_dispname));
-								found = 1;
-								break;
-							}
-						}
-						if (!found) {
-							DEBUGA_SKYPE("why chatmessage %s was not found in the chatmessages array??\n", SKYPOPEN_P_LOG, id);
-						}
-
-					}
-					if (!strcasecmp(prop, "BODY")) {
-						DEBUGA_SKYPE("CHATMESSAGE %s has BODY %s\n", SKYPOPEN_P_LOG, id, value);
-						found = 0;
-						for (i = 0; i < MAX_CHATMESSAGES; i++) {
-							if (!strcmp(tech_pvt->chatmessages[i].id, id)) {
-								strncpy(tech_pvt->chatmessages[i].body, value, sizeof(tech_pvt->chatmessages[i].body));
-								found = 1;
-								break;
-							}
-						}
-						if (!found) {
-							DEBUGA_SKYPE("why chatmessage %s was not found in the chatmessages array??\n", SKYPOPEN_P_LOG, id);
-						} else {
-							DEBUGA_SKYPE
-								("CHATMESSAGE %s is in position %d in the chatmessages array, type=%s, id=%s, chatname=%s, from_handle=%s, from_dispname=%s, body=%s\n",
-								 SKYPOPEN_P_LOG, id, i, tech_pvt->chatmessages[i].type, tech_pvt->chatmessages[i].id, tech_pvt->chatmessages[i].chatname,
-								 tech_pvt->chatmessages[i].from_handle, tech_pvt->chatmessages[i].from_dispname, tech_pvt->chatmessages[i].body);
-							if (strcmp(tech_pvt->chatmessages[i].from_handle, tech_pvt->skype_user)) {	//if the message was not sent by myself
-								incoming_chatmessage(tech_pvt, i);
-								memset(&tech_pvt->chatmessages[i], '\0', sizeof(tech_pvt->chatmessages[i]));
-
-								sprintf(msg_to_skype, "SET CHATMESSAGE %s SEEN", id);
-								skypopen_signaling_write(tech_pvt, msg_to_skype);
-							} else {
-								DEBUGA_SKYPE
-									("CHATMESSAGE %s is in position %d in the chatmessages array, type=%s, id=%s, chatname=%s, from_handle=%s, from_dispname=%s, body=%s NOT DELETED\n",
-									 SKYPOPEN_P_LOG, id, i, tech_pvt->chatmessages[i].type, tech_pvt->chatmessages[i].id, tech_pvt->chatmessages[i].chatname,
-									 tech_pvt->chatmessages[i].from_handle, tech_pvt->chatmessages[i].from_dispname, tech_pvt->chatmessages[i].body);
-								memset(&tech_pvt->chatmessages[i], '\0', sizeof(tech_pvt->chatmessages[i]));
-								DEBUGA_SKYPE("chatmessage %s HAS BEEN DELETED\n", SKYPOPEN_P_LOG, id);
-							}
-
-						}
-
-					}
-				}
-
-			}
-
-
-			if (!strcasecmp(message, "VOICEMAIL")) {
-				char msg_to_skype[1024];
-
-				skypopen_strncpy(obj, where, sizeof(obj) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(id, where, sizeof(id) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(prop, where, sizeof(prop) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(value, where, sizeof(value) - 1);
-				where = strsep(stringp, " ");
-
-				//DEBUGA_SKYPE
-				//("Skype MSG: message: %s, obj: %s, id: %s, prop: %s, value: %s,where: %s!\n",
-				//SKYPOPEN_P_LOG, message, obj, id, prop, value, where ? where : "NULL");
-
-				if (!strcasecmp(prop, "STATUS") && !strcasecmp(value, "RECORDING") ) {
-					DEBUGA_SKYPE("VOICEMAIL %s INPUT\n", SKYPOPEN_P_LOG, id);
-					sprintf(msg_to_skype, "ALTER VOICEMAIL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port);
-					skypopen_signaling_write(tech_pvt, msg_to_skype);
-				} else if (!strcasecmp(prop, "STATUS") && !strcasecmp(value, "PLAYING") ) {
-					DEBUGA_SKYPE("VOICEMAIL %s OUTPUT\n", SKYPOPEN_P_LOG, id);
-					sprintf(msg_to_skype, "ALTER VOICEMAIL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port);
-					skypopen_signaling_write(tech_pvt, msg_to_skype);
-					sprintf(tech_pvt->skype_voicemail_id_greeting, "%s", id);
-
-				} else if (!strcasecmp(prop, "TYPE") && !strcasecmp(value, "OUTGOING") ) {
-					DEBUGA_SKYPE("VOICEMAIL OUTGOING id is %s\n", SKYPOPEN_P_LOG, id);
-					sprintf(tech_pvt->skype_voicemail_id, "%s", id);
-				} else if (!strcasecmp(prop, "STATUS") && !strcasecmp(value, "PLAYED") ) {
-					//switch_ivr_broadcast( tech_pvt->session_uuid_str, "gentones::%(500,0,800)",SMF_ECHO_ALEG|SMF_ECHO_BLEG);
-					switch_ivr_broadcast( tech_pvt->session_uuid_str, "gentones::%(500,0,800)",SMF_ECHO_BLEG);
-					memset(tech_pvt->skype_voicemail_id_greeting, '\0', sizeof(tech_pvt->skype_voicemail_id_greeting));
-
-				}
-			}
-
-			if (!strcasecmp(message, "CALL")) {
-				skypopen_strncpy(obj, where, sizeof(obj) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(id, where, sizeof(id) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(prop, where, sizeof(prop) - 1);
-				where = strsep(stringp, " ");
-				skypopen_strncpy(value, where, sizeof(value) - 1);
-				where = strsep(stringp, " ");
-
-				//DEBUGA_SKYPE
-				//("Skype MSG: message: %s, obj: %s, id: %s, prop: %s, value: %s,where: %s!\n",
-				//SKYPOPEN_P_LOG, message, obj, id, prop, value, where ? where : "NULL");
-
-				if (!strcasecmp(prop, "PARTNER_HANDLE")) {
-					if (tech_pvt->interface_state == SKYPOPEN_STATE_IDLE) {
-						/* we are NOT inside an active call */
-						DEBUGA_SKYPE("Call %s go to skypopen_partner_handle_ring\n", SKYPOPEN_P_LOG, id);
-						skypopen_strncpy(tech_pvt->ring_id, id, sizeof(tech_pvt->ring_id));
-						skypopen_strncpy(tech_pvt->ring_value, value, sizeof(tech_pvt->ring_value));
-						skypopen_strncpy(tech_pvt->answer_id, id, sizeof(tech_pvt->answer_id));
-						skypopen_strncpy(tech_pvt->answer_value, value, sizeof(tech_pvt->answer_value));
-						skypopen_partner_handle_ring(tech_pvt);
-					} else {
-						/* we are inside an active call */
-						if (!strcasecmp(tech_pvt->skype_call_id, id)) {
-							/* this is the call in which we are calling out */
-							DEBUGA_SKYPE("Call %s DO NOTHING\n", SKYPOPEN_P_LOG, id);
-						} else {
-							DEBUGA_SKYPE("Call %s TRY TRANSFER\n", SKYPOPEN_P_LOG, id);
-							skypopen_strncpy(tech_pvt->ring_id, id, sizeof(tech_pvt->ring_id));
-							skypopen_strncpy(tech_pvt->ring_value, value, sizeof(tech_pvt->ring_value));
-							skypopen_strncpy(tech_pvt->answer_id, id, sizeof(tech_pvt->answer_id));
-							skypopen_strncpy(tech_pvt->answer_value, value, sizeof(tech_pvt->answer_value));
-							skypopen_transfer(tech_pvt);
-						}
-					}
-				}
-				if (!strcasecmp(prop, "PARTNER_DISPNAME")) {
-					snprintf(tech_pvt->callid_name, sizeof(tech_pvt->callid_name) - 1, "%s%s%s", value, where ? " " : "", where ? where : "");
-				}
-				if (!strcasecmp(prop, "CONF_ID") && !strcasecmp(value, "0")) {
-				}
-				if (!strcasecmp(prop, "CONF_ID") && strcasecmp(value, "0")) {
-					DEBUGA_SKYPE("the skype_call %s is a conference call\n", SKYPOPEN_P_LOG, id);
-				}
-				if (!strcasecmp(prop, "DTMF")) {
-					DEBUGA_SKYPE("Call %s received a DTMF: %s\n", SKYPOPEN_P_LOG, id, value);
-					dtmf_received(tech_pvt, value);
-				}
-				if (!strcasecmp(prop, "FAILUREREASON")) {
-					DEBUGA_SKYPE("Skype FAILED on skype_call %s. Let's wait for the FAILED message.\n", SKYPOPEN_P_LOG, id);
-				}
-#if 0
-#ifndef WIN32
-				if (!strcasecmp(prop, "DURATION")) {	/* each 20 seconds, we zero the buffers and sync the timers */
-					if (!((atoi(value) % 20))) {
-						if (tech_pvt->read_buffer) {
-							switch_mutex_lock(tech_pvt->mutex_audio_srv);
-							switch_buffer_zero(tech_pvt->read_buffer);
-							if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
-								switch_core_timer_sync(&tech_pvt->timer_read);
-							}
-							if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
-								switch_core_timer_sync(&tech_pvt->timer_read_srv);
-							}
-							switch_mutex_unlock(tech_pvt->mutex_audio_srv);
-						}
-
-						if (tech_pvt->write_buffer) {
-							switch_mutex_lock(tech_pvt->mutex_audio_cli);
-							switch_buffer_zero(tech_pvt->write_buffer);
-							if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
-								switch_core_timer_sync(&tech_pvt->timer_write);
-							}
-							switch_mutex_unlock(tech_pvt->mutex_audio_cli);
-						}
-						DEBUGA_SKYPE("Synching audio on skype_call: %s.\n", SKYPOPEN_P_LOG, id);
-					}
-				}
-#endif //WIN32
-#endif //0
-				if (!strcasecmp(prop, "DURATION") && (!strcasecmp(value, "1"))) {
-					if (strcasecmp(id, tech_pvt->skype_call_id)) {
-						skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-						DEBUGA_SKYPE("We called a Skype contact and he answered us on skype_call: %s.\n", SKYPOPEN_P_LOG, id);
-					}
-				}
-
-				if (!strcasecmp(prop, "DURATION") && (tech_pvt->interface_state == SKYPOPEN_STATE_ERROR_DOUBLE_CALL)) {
-					char msg_to_skype[1024];
-					skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-					WARNINGA("We are in a double call situation, trying to get out hanging up call id: %s.\n", SKYPOPEN_P_LOG, id);
-					sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
-					skypopen_signaling_write(tech_pvt, msg_to_skype);
-					sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
-					skypopen_signaling_write(tech_pvt, msg_to_skype);
-					//skypopen_sleep(10000);
-				}
-
-
-				if (!strcasecmp(prop, "VM_DURATION") && (!strcasecmp(value, "0"))) {
-					char msg_to_skype[1024];
-
-					NOTICA("We called a Skype contact and he started Skype voicemail on our skype_call: %s.\n", SKYPOPEN_P_LOG, id);
-
-					if (!strlen(tech_pvt->session_uuid_str)) {
-						DEBUGA_SKYPE("no tech_pvt->session_uuid_str\n", SKYPOPEN_P_LOG);
-					}
-					if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
-						if (!strlen(tech_pvt->session_uuid_str) || !strlen(tech_pvt->skype_call_id)
-								|| !strcasecmp(tech_pvt->skype_call_id, id)) {
-							skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-							DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPOPEN_P_LOG, id);
-
-							if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA) {
-								tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
-								tech_pvt->interface_state = SKYPOPEN_STATE_UP;
-
-								if (tech_pvt->tcp_cli_thread == NULL) {
-									DEBUGA_SKYPE("START start_audio_threads\n", SKYPOPEN_P_LOG);
-									if (start_audio_threads(tech_pvt)) {
-										WARNINGA("start_audio_threads FAILED\n", SKYPOPEN_P_LOG);
-										return CALLFLOW_INCOMING_HANGUP;
-									}
-								}
-							}
-							tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
-							if (skypopen_answered(tech_pvt) != SWITCH_STATUS_SUCCESS) {
-								sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
-								skypopen_signaling_write(tech_pvt, msg_to_skype);
-							}
-						} else {
-							DEBUGA_SKYPE("I'm on %s, skype_call %s is NOT MY call, ignoring\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, id);
-						}
-					} else {
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
-						DEBUGA_SKYPE("Back from REMOTEHOLD!\n", SKYPOPEN_P_LOG);
-					}
-				}
-
-				if (!strcasecmp(prop, "STATUS")) {
-
-					if (!strcasecmp(value, "RINGING")) {
-						char msg_to_skype[1024];
-						if (tech_pvt->interface_state == SKYPOPEN_STATE_IDLE) {
-							// CLOUDTREE (Thomas Hazel)
-							skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-
-							/* we are NOT inside an active call */
-							DEBUGA_SKYPE("NO ACTIVE calls in this moment, skype_call %s is RINGING, to ask PARTNER_DISPNAME and PARTNER_HANDLE\n",
-										 SKYPOPEN_P_LOG, id);
-							sprintf(msg_to_skype, "GET CALL %s PARTNER_DISPNAME", id);
-							skypopen_signaling_write(tech_pvt, msg_to_skype);
-							//skypopen_sleep(100);
-							sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id);
-							skypopen_signaling_write(tech_pvt, msg_to_skype);
-							//skypopen_sleep(10000);
-						} else {
-							/* we are inside an active call */
-							if (!strcasecmp(tech_pvt->skype_call_id, id)) {
-								// CLOUDTREE (Thomas Hazel)
-								tech_pvt->ringing_state = SKYPOPEN_RINGING_PRE;
-
-								/* this is the call in which we are calling out */
-								tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING;
-								tech_pvt->interface_state = SKYPOPEN_STATE_RINGING;
-								skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-								DEBUGA_SKYPE("Our remote party in skype_call %s is RINGING\n", SKYPOPEN_P_LOG, id);
-								if (remote_party_is_ringing(tech_pvt) != SWITCH_STATUS_SUCCESS) {
-									DEBUGA_SKYPE
-										("We are getting the RINGING from a call we probably canceled, trying to get out hanging up call id: %s.\n",
-										 SKYPOPEN_P_LOG, id);
-									sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id);
-									skypopen_signaling_write(tech_pvt, msg_to_skype);
-									sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
-									skypopen_signaling_write(tech_pvt, msg_to_skype);
-									tech_pvt->skype_call_id[0] = '\0';
-									// CLOUDTREE (Thomas Hazel)
-									tech_pvt->ringing_state = SKYPOPEN_RINGING_INIT;
-									tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
-									tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-									DEBUGA_SKYPE("we're now DOWN\n", SKYPOPEN_P_LOG);
-									return CALLFLOW_INCOMING_HANGUP;
-
-								}
-							} else {
-								DEBUGA_SKYPE
-									("We are in another call, but skype_call %s is RINGING on us, let's ask PARTNER_HANDLE, so maybe we'll TRANSFER\n",
-									 SKYPOPEN_P_LOG, id);
-								sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id);
-								skypopen_signaling_write(tech_pvt, msg_to_skype);
-								//skypopen_sleep(10000);
-							}
-						}
-					} else if (!strcasecmp(value, "EARLYMEDIA")) {
-						char msg_to_skype[1024];
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_EARLYMEDIA;
-						tech_pvt->interface_state = SKYPOPEN_STATE_DIALING;
-						DEBUGA_SKYPE("Our remote party in skype_call %s is EARLYMEDIA\n", SKYPOPEN_P_LOG, id);
-						if (tech_pvt->tcp_cli_thread == NULL) {
-							DEBUGA_SKYPE("START start_audio_threads\n", SKYPOPEN_P_LOG);
-							if (start_audio_threads(tech_pvt)) {
-								ERRORA("start_audio_threads FAILED\n", SKYPOPEN_P_LOG);
-								return CALLFLOW_INCOMING_HANGUP;
-							}
-						}
-						//skypopen_sleep(1000);
-						sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-						//skypopen_sleep(1000);
-						sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-
-						remote_party_is_early_media(tech_pvt);
-					} else if (!strcasecmp(value, "MISSED") || !strcasecmp(value, "FINISHED")) {
-						if (!strcasecmp(tech_pvt->skype_call_id, id)) {
-							DEBUGA_SKYPE("skype_call %s is MY call, now I'm going DOWN\n", SKYPOPEN_P_LOG, id);
-							if (tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED) {
-								return CALLFLOW_INCOMING_HANGUP;
-							} else {
-								tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-							}
-						} else {
-							DEBUGA_SKYPE("skype_call %s is NOT MY call, ignoring\n", SKYPOPEN_P_LOG, id);
-						}
-
-					} else if (!strcasecmp(value, "CANCELLED")) {
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_CANCELLED;
-						DEBUGA_SKYPE("we tried to call Skype on skype_call %s and Skype has now CANCELLED\n", SKYPOPEN_P_LOG, id);
-						tech_pvt->skype_call_id[0] = '\0';
-						if (tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED) {
-							tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-							return CALLFLOW_INCOMING_HANGUP;
-						} else {
-							tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-						}
-					} else if (!strcasecmp(value, "FAILED")) {
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_FAILED;
-						DEBUGA_SKYPE("we tried to call Skype on skype_call %s and Skype has now FAILED\n", SKYPOPEN_P_LOG, id);
-						tech_pvt->skype_call_id[0] = '\0';
-						skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-						tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-						return CALLFLOW_INCOMING_HANGUP;
-					} else if (!strcasecmp(value, "REFUSED")) {
-						if (!strcasecmp(id, tech_pvt->skype_call_id)) {
-							/* this is the id of the call we are in, probably we generated it */
-							tech_pvt->skype_callflow = CALLFLOW_STATUS_REFUSED;
-							DEBUGA_SKYPE("we tried to call Skype on skype_call %s and Skype has now REFUSED\n", SKYPOPEN_P_LOG, id);
-							skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-							tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-							tech_pvt->skype_call_id[0] = '\0';
-							return CALLFLOW_INCOMING_HANGUP;
-						} else {
-							/* we're here because were us that refused an incoming call */
-							DEBUGA_SKYPE("we REFUSED skype_call %s\n", SKYPOPEN_P_LOG, id);
-						}
-					} else if (!strcasecmp(value, "TRANSFERRING")) {
-						DEBUGA_SKYPE("skype_call %s is transferring\n", SKYPOPEN_P_LOG, id);
-					} else if (!strcasecmp(value, "TRANSFERRED")) {
-						DEBUGA_SKYPE("skype_call %s has been transferred\n", SKYPOPEN_P_LOG, id);
-					} else if (!strcasecmp(value, "ROUTING")) {
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_ROUTING;
-						tech_pvt->interface_state = SKYPOPEN_STATE_DIALING;
-						skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-						DEBUGA_SKYPE("skype_call: %s is now ROUTING\n", SKYPOPEN_P_LOG, id);
-					} else if (!strcasecmp(value, "UNPLACED")) {
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_UNPLACED;
-						tech_pvt->interface_state = SKYPOPEN_STATE_DIALING;
-						skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-						DEBUGA_SKYPE("skype_call: %s is now UNPLACED\n", SKYPOPEN_P_LOG, id);
-					} else if (!strcasecmp(value, "INPROGRESS")) {
-						char msg_to_skype[1024];
-
-						if (!strlen(tech_pvt->session_uuid_str)) {
-							DEBUGA_SKYPE("no tech_pvt->session_uuid_str\n", SKYPOPEN_P_LOG);
-						}
-						if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
-							if (!strlen(tech_pvt->session_uuid_str) || !strlen(tech_pvt->skype_call_id)
-								|| !strcasecmp(tech_pvt->skype_call_id, id)) {
-								skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-								DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPOPEN_P_LOG, id);
-
-								if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA) {
-									tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
-									tech_pvt->interface_state = SKYPOPEN_STATE_UP;
-
-									if (tech_pvt->tcp_cli_thread == NULL) {
-										DEBUGA_SKYPE("START start_audio_threads\n", SKYPOPEN_P_LOG);
-										if (start_audio_threads(tech_pvt)) {
-											WARNINGA("start_audio_threads FAILED\n", SKYPOPEN_P_LOG);
-											return CALLFLOW_INCOMING_HANGUP;
-										}
-									}
-									//skypopen_sleep(1000);
-									sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, tech_pvt->tcp_cli_port);
-									skypopen_signaling_write(tech_pvt, msg_to_skype);
-									//skypopen_sleep(1000);
-									sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, tech_pvt->tcp_srv_port);
-									skypopen_signaling_write(tech_pvt, msg_to_skype);
-								}
-								tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
-								if (skypopen_answered(tech_pvt) != SWITCH_STATUS_SUCCESS) {
-									sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
-									skypopen_signaling_write(tech_pvt, msg_to_skype);
-								}
-							} else {
-								DEBUGA_SKYPE("I'm on %s, skype_call %s is NOT MY call, ignoring\n", SKYPOPEN_P_LOG, tech_pvt->skype_call_id, id);
-							}
-						} else {
-							tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
-							DEBUGA_SKYPE("Back from REMOTEHOLD!\n", SKYPOPEN_P_LOG);
-						}
-
-					} else if (!strcasecmp(value, "LOCALHOLD")) {
-						char msg_to_skype[256];
-						DEBUGA_SKYPE("skype_call: %s is now LOCALHOLD, let's hangup\n", SKYPOPEN_P_LOG, id);
-						sprintf(msg_to_skype, "ALTER CALL %s HANGUP", id);
-						skypopen_signaling_write(tech_pvt, msg_to_skype);
-					} else if (!strcasecmp(value, "REMOTEHOLD")) {
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_REMOTEHOLD;
-						DEBUGA_SKYPE("skype_call: %s is now REMOTEHOLD\n", SKYPOPEN_P_LOG, id);
-
-					} else if (!strcasecmp(value, "BUSY")) {
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_FAILED;
-						DEBUGA_SKYPE
-							("we tried to call Skype on skype_call %s and remote party (destination) was BUSY. Our outbound call has failed\n",
-							 SKYPOPEN_P_LOG, id);
-						skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-						tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-						tech_pvt->skype_call_id[0] = '\0';
-						//skypopen_sleep(1000);
-						return CALLFLOW_INCOMING_HANGUP;
-					} else if (!strcasecmp(value, "WAITING_REDIAL_COMMAND")) {
-						tech_pvt->skype_callflow = CALLFLOW_STATUS_FAILED;
-						DEBUGA_SKYPE
-							("we tried to call Skype on skype_call %s and remote party (destination) has rejected us (WAITING_REDIAL_COMMAND). Our outbound call has failed\n",
-							 SKYPOPEN_P_LOG, id);
-						skypopen_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
-						tech_pvt->interface_state = SKYPOPEN_STATE_DOWN;
-						tech_pvt->skype_call_id[0] = '\0';
-						//skypopen_sleep(1000);
-						return CALLFLOW_INCOMING_HANGUP;
-					} else if (!strncmp(value, "VM_", 2)) {
-						DEBUGA_SKYPE ("Our skype_call %s is in Skype voicemail: %s\n", SKYPOPEN_P_LOG, id, value);
-					} else {
-						WARNINGA("skype_call: %s, STATUS: %s is not recognized\n", SKYPOPEN_P_LOG, id, value);
-					}
-				}				//STATUS
-			}					//CALL
-			/* the "numbered" messages that follows are used by the directory application, not yet ported */
-			if (!strcasecmp(message, "#333")) {
-				memset(tech_pvt->skype_friends, 0, 4096);
-				skypopen_strncpy(tech_pvt->skype_friends, &message_2[11], 4095);
-			}
-			if (!strcasecmp(message, "#222")) {
-				memset(tech_pvt->skype_fullname, 0, 512);
-				skypopen_strncpy(tech_pvt->skype_fullname, &message_2[10], 511);
-			}
-			if (!strcasecmp(message, "#765")) {
-				memset(tech_pvt->skype_displayname, 0, 512);
-				skypopen_strncpy(tech_pvt->skype_displayname, &message_2[10], 511);
-			}
-			a = 0;
-		}						//message end
-	}							//read_from_pipe
-	return 0;
-}
-
-void *skypopen_do_tcp_srv_thread_func(void *obj)
-{
-	private_t *tech_pvt = obj;
-	int s;
-	unsigned int len;
-#if defined(WIN32) && !defined(__CYGWIN__)
-	int sin_size;
-	int size = sizeof(int);
-#else /* WIN32 */
-	unsigned int sin_size;
-	unsigned int size = sizeof(int);
-#endif /* WIN32 */
-	unsigned int fd;
-	short srv_in[SAMPLES_PER_FRAME * 10];
-	struct sockaddr_in remote_addr;
-	int sockbufsize = 0;
-
-	s = skypopen_socket_create_and_bind(tech_pvt, &tech_pvt->tcp_srv_port);
-	if (s < 0) {
-		ERRORA("skypopen_socket_create_and_bind error!\n", SKYPOPEN_P_LOG);
-		return NULL;
-	}
-	DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPOPEN_P_LOG);
-
-	listen(s, 6);
-
-	sin_size = sizeof(remote_addr);
-
-	while (tech_pvt && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN
-		   && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
-			   || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
-			   || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
-
-		unsigned int fdselectgio;
-		int rtgio;
-		fd_set fsgio;
-		struct timeval togio;
-
-		if (!(running && tech_pvt->running))
-			break;
-		FD_ZERO(&fsgio);
-		togio.tv_usec = MS_SKYPOPEN * 1000;
-		togio.tv_sec = 0;
-		fdselectgio = s;
-		FD_SET(fdselectgio, &fsgio);
-
-		rtgio = select(fdselectgio + 1, &fsgio, NULL, NULL, &togio);
-
-		if (rtgio) {
-
-			while (s > 0 && (fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) {
-				DEBUGA_SKYPE("ACCEPTED here I send you %d\n", SKYPOPEN_P_LOG, tech_pvt->tcp_srv_port);
-
-				sockbufsize = 0;
-				size = sizeof(int);
-				getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, &size);
-				DEBUGA_SKYPE("3 SO_RCVBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
-				sockbufsize = 0;
-				size = sizeof(int);
-				getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, &size);
-				DEBUGA_SKYPE("3 SO_SNDBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
-
-
-				if (!(running && tech_pvt->running))
-					break;
-				while (tech_pvt && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN
-					   && tech_pvt->interface_state != SKYPOPEN_STATE_IDLE
-					   && tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED
-					   && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
-						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
-						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
-
-					unsigned int fdselect;
-					int rt = 1;
-					fd_set fs;
-					struct timeval to;
-					int nospace;
-
-					if (!(running && tech_pvt->running))
-						break;
-#if 1
-					fdselect = fd;
-					FD_ZERO(&fs);
-					FD_SET(fdselect, &fs);
-					to.tv_usec = MS_SKYPOPEN * 1000 * 3;
-					to.tv_sec = 0;
-#endif //0
-
-					if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
-						switch_core_timer_next(&tech_pvt->timer_read_srv);
-					} else {
-						skypopen_sleep(20000);
-
-					}
-					rt = select(fdselect + 1, &fs, NULL, NULL, &to);
-					if (rt > 0) {
-
-						if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
-							len = recv(fd, (char *) srv_in, BYTES_PER_FRAME * 2, 0);
-						} else {
-							//skypopen_sleep(10000);
-							continue;
-						}
-						if (tech_pvt->begin_to_read == 0) {
-							DEBUGA_SKYPE("len=%d\n", SKYPOPEN_P_LOG, len);
-							//skypopen_sleep(10000);
-							continue;
-						}
-
-						if (len == -1) {
-							DEBUGA_SKYPE("len=%d, error: %s\n", SKYPOPEN_P_LOG, len, strerror(errno));
-							break;
-						}
-						nospace = 0;
-						if (len > 0) {
-							switch_mutex_lock(tech_pvt->mutex_audio_srv);
-							if (tech_pvt->read_buffer) {
-								if (switch_buffer_freespace(tech_pvt->read_buffer) < len) {
-									switch_buffer_zero(tech_pvt->read_buffer);
-									switch_buffer_write(tech_pvt->read_buffer, srv_in, len);
-									nospace = 1;
-								} else {
-									switch_buffer_write(tech_pvt->read_buffer, srv_in, len);
-								}
-							}
-							switch_mutex_unlock(tech_pvt->mutex_audio_srv);
-							if (nospace) {
-								DEBUGA_SKYPE("NO SPACE in READ BUFFER: there was no space for: %d\n", SKYPOPEN_P_LOG, len);
-							}
-						} else if (len == 0) {
-							DEBUGA_SKYPE("CLOSED\n", SKYPOPEN_P_LOG);
-							break;
-						} else {
-							DEBUGA_SKYPE("len=%d\n", SKYPOPEN_P_LOG, len);
-						}
-
-					} else if (rt == 0) {
-						continue;
-					} else {
-						DEBUGA_SKYPE("SRV rt=%d\n", SKYPOPEN_P_LOG, rt);
-						break;
-					}
-
-				}
-
-				DEBUGA_SKYPE("Skype incoming audio GONE\n", SKYPOPEN_P_LOG);
-				tech_pvt->skype_callflow = CALLFLOW_INCOMING_HANGUP;
-				skypopen_close_socket(fd);
-				break;
-			}
-			break;
-		}
-	}
-
-	DEBUGA_SKYPE("incoming audio (read) server (I am it) EXITING\n", SKYPOPEN_P_LOG);
-	skypopen_close_socket(s);
-	s = -1;
-	//DEBUGA_SKYPE("debugging_hangup PRE srv lock\n", SKYPOPEN_P_LOG);
-	switch_mutex_lock(tech_pvt->mutex_thread_audio_srv);
-	//DEBUGA_SKYPE("debugging_hangup srv lock\n", SKYPOPEN_P_LOG);
-	tech_pvt->tcp_srv_thread = NULL;
-	switch_mutex_unlock(tech_pvt->mutex_thread_audio_srv);
-	//DEBUGA_SKYPE("debugging_hangup srv unlock\n", SKYPOPEN_P_LOG);
-	return NULL;
-}
-
-void *skypopen_do_tcp_cli_thread_func(void *obj)
-{
-	private_t *tech_pvt = obj;
-	int s;
-	struct sockaddr_in remote_addr;
-	unsigned int len;
-	unsigned int fd;
-	short cli_out[SAMPLES_PER_FRAME * 2 * 10];
-#ifdef WIN32
-	int sin_size;
-	int size = sizeof(int);
-#else
-	unsigned int sin_size;
-	unsigned int size = sizeof(int);
-#endif /* WIN32 */
-	int sockbufsize = 0;
-
-	s = skypopen_socket_create_and_bind(tech_pvt, &tech_pvt->tcp_cli_port);
-	if (s < 0) {
-		ERRORA("skypopen_socket_create_and_bind error!\n", SKYPOPEN_P_LOG);
-		return NULL;
-	}
-
-
-
-	DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPOPEN_P_LOG);
-
-	listen(s, 6);
-
-	sin_size = sizeof(remote_addr);
-
-	while (tech_pvt && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN
-		   && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
-			   || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
-			   || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
-
-		unsigned int fdselectgio;
-		int rtgio;
-		fd_set fsgio;
-		struct timeval togio;
-
-		if (!(running && tech_pvt->running))
-			break;
-		FD_ZERO(&fsgio);
-		togio.tv_usec = MS_SKYPOPEN * 1000 * 3;
-		togio.tv_sec = 0;
-		fdselectgio = s;
-		FD_SET(fdselectgio, &fsgio);
-
-		rtgio = select(fdselectgio + 1, &fsgio, NULL, NULL, &togio);
-
-		if (rtgio) {
-
-			while (s > 0 && (fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) {
-				DEBUGA_SKYPE("ACCEPTED here you send me %d\n", SKYPOPEN_P_LOG, tech_pvt->tcp_cli_port);
-
-				sockbufsize = 0;
-				size = sizeof(int);
-				getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, &size);
-				DEBUGA_SKYPE("4 SO_RCVBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
-				sockbufsize = 0;
-				size = sizeof(int);
-				getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, &size);
-				DEBUGA_SKYPE("4 SO_SNDBUF is %d, size is %d\n", SKYPOPEN_P_LOG, sockbufsize, size);
-
-
-
-				if (!(running && tech_pvt->running))
-					break;
-				while (tech_pvt && tech_pvt->interface_state != SKYPOPEN_STATE_DOWN
-					   && tech_pvt->interface_state != SKYPOPEN_STATE_IDLE
-					   && tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED
-					   && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
-						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
-						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
-					size_t bytes_to_write;
-
-					if (!(running && tech_pvt->running))
-						break;
-
-					if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next
-						&& tech_pvt->interface_state != SKYPOPEN_STATE_HANGUP_REQUESTED) {
-						switch_core_timer_next(&tech_pvt->timer_write);
-					} else {
-						skypopen_sleep(20000);
-					}
-
-					if (tech_pvt->begin_to_write == 0) {
-						memset(cli_out, 255, sizeof(cli_out));
-						bytes_to_write = BYTES_PER_FRAME;
-						len = send(fd, (char *) cli_out, bytes_to_write, 0);
-						if (len == -1) {
-							DEBUGA_SKYPE("len=%d, error: %s\n", SKYPOPEN_P_LOG, len, strerror(errno));
-							break;
-						}
-						//skypopen_sleep(10000);
-						continue;
-					} else {
-
-						bytes_to_write = 0;
-
-						if (tech_pvt->skype_callflow == CALLFLOW_INCOMING_HANGUP) {
-							break;
-						}
-						switch_mutex_lock(tech_pvt->mutex_audio_cli);
-						if (tech_pvt->write_buffer && switch_buffer_inuse(tech_pvt->write_buffer)) {
-							bytes_to_write = switch_buffer_read(tech_pvt->write_buffer, cli_out, BYTES_PER_FRAME);
-						}
-						switch_mutex_unlock(tech_pvt->mutex_audio_cli);
-
-						if (!bytes_to_write) {
-							if (tech_pvt->write_silence_when_idle) {
-								memset(cli_out, 255, sizeof(cli_out));
-								bytes_to_write = BYTES_PER_FRAME;
-								//DEBUGA_SKYPE("WRITE Silence!\n", SKYPOPEN_P_LOG);
-							} else {
-								continue;
-							}
-						}
-						/* send the 16khz frame to the Skype client waiting for incoming audio to be sent to the remote party */
-						if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
-							len = send(fd, (char *) cli_out, bytes_to_write, 0);
-							if (len == -1) {
-								DEBUGA_SKYPE("len=%d, error: %s\n", SKYPOPEN_P_LOG, len, strerror(errno));
-								break;
-							}
-							if (len != bytes_to_write) {
-								DEBUGA_SKYPE("len=%d\n", SKYPOPEN_P_LOG, len);
-							}
-						}
-					}
-
-				}
-				DEBUGA_SKYPE("Skype outbound audio GONE\n", SKYPOPEN_P_LOG);
-				tech_pvt->skype_callflow = CALLFLOW_INCOMING_HANGUP;
-				skypopen_close_socket(fd);
-				break;
-			}
-			break;
-		}
-	}
-
-	DEBUGA_SKYPE("outbound audio server (I am it) EXITING\n", SKYPOPEN_P_LOG);
-	skypopen_close_socket(s);
-	s = -1;
-	//DEBUGA_SKYPE("debugging_hangup PRE cli lock\n", SKYPOPEN_P_LOG);
-	switch_mutex_lock(tech_pvt->mutex_thread_audio_cli);
-	//DEBUGA_SKYPE("debugging_hangup cli lock\n", SKYPOPEN_P_LOG);
-	tech_pvt->tcp_cli_thread = NULL;
-	switch_mutex_unlock(tech_pvt->mutex_thread_audio_cli);
-	//DEBUGA_SKYPE("debugging_hangup cli unlock\n", SKYPOPEN_P_LOG);
-	return NULL;
-}
-
-int skypopen_senddigit(private_t *tech_pvt, char digit)
-{
-	char msg_to_skype[1024];
-
-	DEBUGA_SKYPE("DIGIT received: %c\n", SKYPOPEN_P_LOG, digit);
-	if (digit != 'a' && digit != 'A' && digit != 'b' && digit != 'B' && digit != 'c' && digit != 'C' && digit != 'd' && digit != 'D') {
-		sprintf(msg_to_skype, "SET CALL %s DTMF %c", tech_pvt->skype_call_id, digit);
-		skypopen_signaling_write(tech_pvt, msg_to_skype);
-	} else {
-		WARNINGA("Received DTMF DIGIT \"%c\", but not relayed to Skype client because Skype client accepts only 0-9*#\n", SKYPOPEN_P_LOG, digit);
-	}
-
-	return 0;
-}
-
-int skypopen_call(private_t *tech_pvt, char *rdest, int timeout)
-{
-	char msg_to_skype[1024];
-
-	DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPOPEN_P_LOG, rdest);
-
-	sprintf(msg_to_skype, "CALL %s", rdest);
-	if (skypopen_signaling_write(tech_pvt, msg_to_skype) < 0) {
-		ERRORA("failed to communicate with Skype client, now exit\n", SKYPOPEN_P_LOG);
-		return -1;
-	}
-	return 0;
-}
-
-/***************************/
-/* PLATFORM SPECIFIC */
-/***************************/
-#if defined(WIN32) && !defined(__CYGWIN__)
-int skypopen_pipe_read(switch_file_t *pipe, short *buf, int howmany)
-{
-	switch_size_t quantity;
-
-	quantity = howmany;
-
-	switch_file_read(pipe, buf, &quantity);
-
-	howmany = (int)quantity;
-
-	return howmany;
-}
-
-int skypopen_pipe_write(switch_file_t *pipe, short *buf, int howmany)
-{
-	switch_size_t quantity;
-
-	quantity = howmany;
-
-	switch_file_write(pipe, buf, &quantity);
-
-	howmany = (int)quantity;
-
-	return howmany;
-}
-
-int skypopen_close_socket(unsigned int fd)
-{
-	int res;
-
-	res = closesocket(fd);
-
-	return res;
-}
-
-int skypopen_audio_init(private_t *tech_pvt)
-{
-	switch_status_t rv;
-	rv = switch_file_pipe_create(&tech_pvt->audiopipe_srv[0], &tech_pvt->audiopipe_srv[1], skypopen_module_pool);
-	rv = switch_file_pipe_create(&tech_pvt->audiopipe_cli[0], &tech_pvt->audiopipe_cli[1], skypopen_module_pool);
-	return 0;
-}
-#else /* WIN32 */
-int skypopen_pipe_read(int pipe, short *buf, int howmany)
-{
-	howmany = read(pipe, buf, howmany);
-	return howmany;
-}
-
-int skypopen_pipe_write(int pipe, short *buf, int howmany)
-{
-	if (buf) {
-		howmany = write(pipe, buf, howmany);
-		return howmany;
-	} else {
-		return 0;
-	}
-}
-
-int skypopen_close_socket(unsigned int fd)
-{
-	int res;
-
-	res = close(fd);
-
-	return res;
-}
-
-int skypopen_audio_init(private_t *tech_pvt)
-{
-	if (pipe(tech_pvt->audiopipe_srv)) {
-		fcntl(tech_pvt->audiopipe_srv[0], F_SETFL, O_NONBLOCK);
-		fcntl(tech_pvt->audiopipe_srv[1], F_SETFL, O_NONBLOCK);
-	}
-	if (pipe(tech_pvt->audiopipe_cli)) {
-		fcntl(tech_pvt->audiopipe_cli[0], F_SETFL, O_NONBLOCK);
-		fcntl(tech_pvt->audiopipe_cli[1], F_SETFL, O_NONBLOCK);
-	}
-
-/* this pipe is the audio fd for asterisk to poll on during a call. FS do not use it */
-	tech_pvt->skypopen_sound_capt_fd = tech_pvt->audiopipe_srv[0];
-
-	return 0;
-}
-#endif /* WIN32 */
-
-#ifdef WIN32
-
-enum {
-	SKYPECONTROLAPI_ATTACH_SUCCESS = 0,	/*  Client is successfully
-										   attached and API window handle can be found
-										   in wParam parameter */
-	SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION = 1,	/*  Skype has acknowledged
-														   connection request and is waiting
-														   for confirmation from the user. */
-	/*  The client is not yet attached
-	 * and should wait for SKYPECONTROLAPI_ATTACH_SUCCESS message */
-	SKYPECONTROLAPI_ATTACH_REFUSED = 2,	/*  User has explicitly
-										   denied access to client */
-	SKYPECONTROLAPI_ATTACH_NOT_AVAILABLE = 3,	/*  API is not available
-												   at the moment.
-												   For example, this happens when no user
-												   is currently logged in. */
-	/*  Client should wait for
-	 * SKYPECONTROLAPI_ATTACH_API_AVAILABLE
-	 * broadcast before making any further */
-	/*  connection attempts. */
-	SKYPECONTROLAPI_ATTACH_API_AVAILABLE = 0x8001
-};
-
-/* Visual C do not have strsep? */
-char
-    *strsep(char **stringp, const char *delim)
-{
-	char *res;
-
-	if (!stringp || !*stringp || !**stringp)
-		return (char *) 0;
-
-	res = *stringp;
-	while (**stringp && !strchr(delim, **stringp))
-		++(*stringp);
-
-	if (**stringp) {
-		**stringp = '\0';
-		++(*stringp);
-	}
-
-	return res;
-}
-
-int skypopen_signaling_write(private_t *tech_pvt, char *msg_to_skype)
-{
-	static char acInputRow[1024];
-	COPYDATASTRUCT oCopyData;
-
-	DEBUGA_SKYPE("SENDING: |||%s||||\n", SKYPOPEN_P_LOG, msg_to_skype);
-
-	sprintf(acInputRow, "%s", msg_to_skype);
-	/*  send command to skype */
-	oCopyData.dwData = 0;
-	oCopyData.lpData = acInputRow;
-	oCopyData.cbData = strlen(acInputRow) + 1;
-	if (oCopyData.cbData != 1) {
-		if (SendMessage
-			(tech_pvt->SkypopenHandles.win32_hGlobal_SkypeAPIWindowHandle, WM_COPYDATA,
-			 (WPARAM) tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle, (LPARAM) & oCopyData) == FALSE) {
-			ERRORA("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypopen, then launch Skypopen and try again.\n", SKYPOPEN_P_LOG);
-			return -1;
-		}
-	}
-
-	return 0;
-
-}
-
-LRESULT APIENTRY skypopen_present(HWND hWindow, UINT uiMessage, WPARAM uiParam, LPARAM ulParam)
-{
-	LRESULT lReturnCode;
-	int fIssueDefProc;
-	private_t *tech_pvt = NULL;
-
-	lReturnCode = 0;
-	fIssueDefProc = 0;
-	tech_pvt = (private_t *)(intptr_t) GetWindowLong(hWindow, GWLP_USERDATA);
-
-	if (!running) {
-		DEBUGA_SKYPE("let's DIE!\n", SKYPOPEN_P_LOG);
-		tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle = NULL;
-		PostQuitMessage(0);
-		return lReturnCode;
-	}
-	switch (uiMessage) {
-	case WM_CREATE:
-		tech_pvt = (private_t *) ((LPCREATESTRUCT) ulParam)->lpCreateParams;
-		SetWindowLong(hWindow, GWLP_USERDATA, (LONG) (intptr_t)tech_pvt);
-		DEBUGA_SKYPE("got CREATE\n", SKYPOPEN_P_LOG);
-		break;
-	case WM_DESTROY:
-		DEBUGA_SKYPE("got DESTROY\n", SKYPOPEN_P_LOG);
-		tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle = NULL;
-		PostQuitMessage(0);
-		break;
-	case WM_COPYDATA:
-		if (tech_pvt->SkypopenHandles.win32_hGlobal_SkypeAPIWindowHandle == (HWND) uiParam) {
-			unsigned int howmany;
-			char msg_from_skype[2048];
-
-			PCOPYDATASTRUCT poCopyData = (PCOPYDATASTRUCT) ulParam;
-
-			memset(msg_from_skype, '\0', sizeof(msg_from_skype));
-			skypopen_strncpy(msg_from_skype, (const char *) poCopyData->lpData, sizeof(msg_from_skype) - 2);
-
-			howmany = strlen(msg_from_skype) + 1;
-			howmany = skypopen_pipe_write(tech_pvt->SkypopenHandles.fdesc[1], (short *) msg_from_skype, howmany);
-			lReturnCode = 1;
-		}
-		break;
-	default:
-		if (tech_pvt && tech_pvt->SkypopenHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach) {
-			if (uiMessage == tech_pvt->SkypopenHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach) {
-				switch (ulParam) {
-				case SKYPECONTROLAPI_ATTACH_SUCCESS:
-					if (!tech_pvt->SkypopenHandles.currentuserhandle) {
-						//DEBUGA_SKYPE("\n\n\tConnected to Skype API!\n", SKYPOPEN_P_LOG);
-						tech_pvt->SkypopenHandles.api_connected = 1;
-						tech_pvt->SkypopenHandles.win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam;
-						tech_pvt->SkypopenHandles.win32_hGlobal_SkypeAPIWindowHandle = tech_pvt->SkypopenHandles.win32_hGlobal_SkypeAPIWindowHandle;
-					}
-					break;
-				case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION:
-					skypopen_sleep(20000);
-					break;
-				case SKYPECONTROLAPI_ATTACH_REFUSED:
-					ERRORA("Skype client refused to be connected by Skypopen!\n", SKYPOPEN_P_LOG);
-					break;
-				case SKYPECONTROLAPI_ATTACH_NOT_AVAILABLE:
-					ERRORA("Skype API not (yet?) available\n", SKYPOPEN_P_LOG);
-					break;
-				case SKYPECONTROLAPI_ATTACH_API_AVAILABLE:
-					DEBUGA_SKYPE("Skype API available\n", SKYPOPEN_P_LOG);
-					skypopen_sleep(20000);
-					break;
-				default:
-					WARNINGA("GOT AN UNKNOWN SKYPE WINDOWS MSG\n", SKYPOPEN_P_LOG);
-				}
-				lReturnCode = 1;
-				break;
-			}
-		}
-		fIssueDefProc = 1;
-		break;
-	}
-	if (fIssueDefProc)
-		lReturnCode = DefWindowProc(hWindow, uiMessage, uiParam, ulParam);
-	return (lReturnCode);
-}
-
-int win32_Initialize_CreateWindowClass(private_t *tech_pvt)
-{
-	unsigned char *paucUUIDString;
-	RPC_STATUS lUUIDResult;
-	int fReturnStatus;
-	UUID oUUID;
-
-	fReturnStatus = 0;
-	lUUIDResult = UuidCreate(&oUUID);
-	tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle = (HINSTANCE) OpenProcess(PROCESS_DUP_HANDLE, FALSE, GetCurrentProcessId());
-	if (tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle != NULL && (lUUIDResult == RPC_S_OK || lUUIDResult == RPC_S_UUID_LOCAL_ONLY)) {
-		if (UuidToString(&oUUID, &paucUUIDString) == RPC_S_OK) {
-			WNDCLASS oWindowClass;
-
-			strcpy(tech_pvt->SkypopenHandles.win32_acInit_WindowClassName, "Skype-API-Skypopen-");
-			strcat(tech_pvt->SkypopenHandles.win32_acInit_WindowClassName, (char *) paucUUIDString);
-
-			oWindowClass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
-			oWindowClass.lpfnWndProc = (WNDPROC) & skypopen_present;
-			oWindowClass.cbClsExtra = 0;
-			oWindowClass.cbWndExtra = 0;
-			oWindowClass.hInstance = tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle;
-			oWindowClass.hIcon = NULL;
-			oWindowClass.hCursor = NULL;
-			oWindowClass.hbrBackground = NULL;
-			oWindowClass.lpszMenuName = NULL;
-			oWindowClass.lpszClassName = tech_pvt->SkypopenHandles.win32_acInit_WindowClassName;
-
-			if (RegisterClass(&oWindowClass) != 0)
-				fReturnStatus = 1;
-
-			RpcStringFree(&paucUUIDString);
-		}
-	}
-	if (fReturnStatus == 0)
-		CloseHandle(tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle);
-	tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle = NULL;
-	return (fReturnStatus);
-}
-
-void win32_DeInitialize_DestroyWindowClass(private_t *tech_pvt)
-{
-	UnregisterClass(tech_pvt->SkypopenHandles.win32_acInit_WindowClassName, tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle);
-	CloseHandle(tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle);
-	tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle = NULL;
-}
-
-int win32_Initialize_CreateMainWindow(private_t *tech_pvt)
-{
-	tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle =
-		CreateWindowEx(WS_EX_APPWINDOW | WS_EX_WINDOWEDGE,
-					   tech_pvt->SkypopenHandles.win32_acInit_WindowClassName, "",
-					   WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT,
-					   128, 128, NULL, 0, tech_pvt->SkypopenHandles.win32_hInit_ProcessHandle, tech_pvt);
-	return (tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle != NULL ? 1 : 0);
-}
-
-void win32_DeInitialize_DestroyMainWindow(private_t *tech_pvt)
-{
-	if (tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle != NULL)
-		DestroyWindow(tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle), tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle = NULL;
-}
-
-void *skypopen_do_skypeapi_thread_func(void *obj)
-{
-	private_t *tech_pvt = obj;
-#if defined(WIN32) && !defined(__CYGWIN__)
-	switch_status_t rv;
-
-	switch_file_pipe_create(&tech_pvt->SkypopenHandles.fdesc[0], &tech_pvt->SkypopenHandles.fdesc[1], skypopen_module_pool);
-	rv = switch_file_pipe_create(&tech_pvt->SkypopenHandles.fdesc[0], &tech_pvt->SkypopenHandles.fdesc[1], skypopen_module_pool);
-#else /* WIN32 */
-	if (pipe(tech_pvt->SkypopenHandles.fdesc)) {
-		fcntl(tech_pvt->SkypopenHandles.fdesc[0], F_SETFL, O_NONBLOCK);
-		fcntl(tech_pvt->SkypopenHandles.fdesc[1], F_SETFL, O_NONBLOCK);
-	}
-#endif /* WIN32 */
-
-	tech_pvt->SkypopenHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach = RegisterWindowMessage("SkypeControlAPIAttach");
-	tech_pvt->SkypopenHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover = RegisterWindowMessage("SkypeControlAPIDiscover");
-
-	skypopen_sleep(200000);		//0,2 sec
-
-	if (tech_pvt->SkypopenHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0
-		&& tech_pvt->SkypopenHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover != 0) {
-		if (win32_Initialize_CreateWindowClass(tech_pvt)) {
-			if (win32_Initialize_CreateMainWindow(tech_pvt)) {
-				if (SendMessage
-					(HWND_BROADCAST,
-					 tech_pvt->SkypopenHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover,
-					 (WPARAM) tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle, 0) != 0) {
-					tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle = tech_pvt->SkypopenHandles.win32_hInit_MainWindowHandle;
-					while (running && tech_pvt->running) {
-						MSG oMessage;
-						if (!(running && tech_pvt->running))
-							break;
-						while (GetMessage(&oMessage, 0, 0, 0)) {
-							TranslateMessage(&oMessage);
-							DispatchMessage(&oMessage);
-						}
-					}
-				}
-				win32_DeInitialize_DestroyMainWindow(tech_pvt);
-			}
-			win32_DeInitialize_DestroyWindowClass(tech_pvt);
-		}
-	}
-	tech_pvt->skypopen_api_thread = NULL;
-	DEBUGA_SKYPE("EXITING\n", SKYPOPEN_P_LOG);
-	return NULL;
-}
-
-#else /* NOT WIN32 */
-
-// CLOUDTREE (Thomas Hazel)
-int xio_error_handler(Display * dpy)
-{
-	private_t *tech_pvt = NULL;
-	struct SkypopenHandles *handle;
-
-	ERRORA("Fatal display error for %d, %s\n", SKYPOPEN_P_LOG, skypopen_list_size(&global_handles_list), dpy->display_name);
-
-	handle = skypopen_list_remove_by_value(&global_handles_list, dpy);
-	if (handle != NULL) {
-#ifdef XIO_ERROR_BY_SETJMP
-		siglongjmp(handle->ioerror_context, 1);
-#endif
-#ifdef XIO_ERROR_BY_UCONTEXT
-		setcontext(&handle->ioerror_context);
-#endif
-	}
-
-	ERRORA("Fatal display error for %p, %s - failed to siglongjmp\n", SKYPOPEN_P_LOG, (void *) handle, dpy->display_name);
-
-	return 0;
-}
-
-int xio_error_handler2(Display * dpy, XErrorEvent * err)
-{
-	private_t *tech_pvt = NULL;
-	struct SkypopenHandles *handle;
-	global_x_error = err->error_code;
-
-	ERRORA("Received error code %d from X Server\n\n", SKYPOPEN_P_LOG, global_x_error);
-	ERRORA("Display error for %d, %s\n", SKYPOPEN_P_LOG, skypopen_list_size(&global_handles_list), dpy->display_name);
-
-	handle = skypopen_list_remove_by_value(&global_handles_list, dpy);
-	if (handle != NULL) {
-#ifdef XIO_ERROR_BY_SETJMP
-		siglongjmp(handle->ioerror_context, 1);
-#endif
-#ifdef XIO_ERROR_BY_UCONTEXT
-		setcontext(&handle->ioerror_context);
-#endif
-	}
-
-	ERRORA("Fatal display error for %p, %s - failed to siglongjmp\n", SKYPOPEN_P_LOG, (void *) handle, dpy->display_name);
-
-	return 0;
-}
-
-
-int X11_errors_handler(Display * dpy, XErrorEvent * err)
-{
-	private_t *tech_pvt = NULL;
-	(void) dpy;
-
-	global_x_error = err->error_code;
-	ERRORA("Received error code %d from X Server\n\n", SKYPOPEN_P_LOG, global_x_error);
-	return 0;					/*  ignore the error */
-}
-
-int skypopen_send_message(private_t *tech_pvt, const char *message_P)
-{
-	struct SkypopenHandles *SkypopenHandles = &tech_pvt->SkypopenHandles;
-	Window w_P = SkypopenHandles->skype_win;
-	Display *disp = SkypopenHandles->disp;
-	Window handle_P = SkypopenHandles->win;
-
-
-	Atom atom1 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
-	Atom atom2 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE", False);
-	unsigned int pos = 0;
-	unsigned int len = strlen(message_P);
-	XEvent e;
-
-	//skypopen_sleep(1000);
-	//XFlush(disp);
-
-	memset(&e, 0, sizeof(e));
-	e.xclient.type = ClientMessage;
-	e.xclient.message_type = atom1;	/*  leading message */
-	e.xclient.display = disp;
-	e.xclient.window = handle_P;
-	e.xclient.format = 8;
-
-	// CLOUDTREE (Thomas Hazel)
-	global_x_error = Success;
-
-	do {
-		unsigned int i;
-		for (i = 0; i < 20 && i + pos <= len; ++i)
-			e.xclient.data.b[i] = message_P[i + pos];
-		XSendEvent(disp, w_P, False, 0, &e);
-
-		e.xclient.message_type = atom2;	/*  following messages */
-		pos += i;
-	} while (pos <= len);
-
-	XFlush(disp);
-
-	// CLOUDTREE (Thomas Hazel)
-	if (global_x_error != Success) {
-		ERRORA("Sending message failed with status %d\n", SKYPOPEN_P_LOG, global_x_error);
-		tech_pvt->running = 0;
-		return 0;
-	}
-
-	return 1;
-}
-
-int skypopen_signaling_write(private_t *tech_pvt, char *msg_to_skype)
-{
-
-	DEBUGA_SKYPE("SENDING: |||%s||||\n", SKYPOPEN_P_LOG, msg_to_skype);
-
-
-	if (!skypopen_send_message(tech_pvt, msg_to_skype)) {
-		ERRORA
-			("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypopen, then restart Skype, then launch Skypopen and try again.\n",
-			 SKYPOPEN_P_LOG);
-		return -1;
-	}
-
-	return 0;
-
-}
-
-int skypopen_present(struct SkypopenHandles *SkypopenHandles)
-{
-	Atom skype_inst = XInternAtom(SkypopenHandles->disp, "_SKYPE_INSTANCE", True);
-
-	Atom type_ret;
-	int format_ret;
-	unsigned long nitems_ret;
-	unsigned long bytes_after_ret;
-	unsigned char *prop;
-	int status;
-	private_t *tech_pvt = NULL;
-
-	status =
-		XGetWindowProperty(SkypopenHandles->disp, DefaultRootWindow(SkypopenHandles->disp),
-						   skype_inst, 0, 1, False, XA_WINDOW, &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, &prop);
-
-	/*  sanity check */
-	if (status != Success || format_ret != 32 || nitems_ret != 1) {
-		SkypopenHandles->skype_win = (Window) - 1;
-		DEBUGA_SKYPE("Skype instance not found\n", SKYPOPEN_P_LOG);
-		running = 0;
-		SkypopenHandles->api_connected = 0;
-		return 0;
-	}
-
-	SkypopenHandles->skype_win = *(const unsigned long *) prop & 0xffffffff;
-	DEBUGA_SKYPE("Skype instance found with id #%d\n", SKYPOPEN_P_LOG, (unsigned int) SkypopenHandles->skype_win);
-	SkypopenHandles->api_connected = 1;
-	return 1;
-}
-
-void skypopen_clean_disp(void *data)
-{
-
-	int *dispptr;
-	int disp;
-	private_t *tech_pvt = NULL;
-
-	dispptr = data;
-	disp = *dispptr;
-
-	if (disp) {
-		DEBUGA_SKYPE("to be destroyed disp %d\n", SKYPOPEN_P_LOG, disp);
-		close(disp);
-		DEBUGA_SKYPE("destroyed disp\n", SKYPOPEN_P_LOG);
-	} else {
-		DEBUGA_SKYPE("NOT destroyed disp\n", SKYPOPEN_P_LOG);
-	}
-	DEBUGA_SKYPE("OUT destroyed disp\n", SKYPOPEN_P_LOG);
-	skypopen_sleep(20000);
-}
-
-void *skypopen_do_skypeapi_thread_func(void *obj)
-{
-
-	private_t *tech_pvt = obj;
-	struct SkypopenHandles *SkypopenHandles;
-	char buf[512];
-	Display *disp = NULL;
-	Window root = -1;
-	Window win = -1;
-	int xfd;
-	fd_set xfds;
-
-	if (!strlen(tech_pvt->X11_display))
-		strcpy(tech_pvt->X11_display, getenv("DISPLAY"));
-
-	if (!tech_pvt->tcp_srv_port)
-		tech_pvt->tcp_srv_port = 10160;
-
-	if (!tech_pvt->tcp_cli_port)
-		tech_pvt->tcp_cli_port = 10161;
-
-	if (pipe(tech_pvt->SkypopenHandles.fdesc)) {
-		fcntl(tech_pvt->SkypopenHandles.fdesc[0], F_SETFL, O_NONBLOCK);
-		fcntl(tech_pvt->SkypopenHandles.fdesc[1], F_SETFL, O_NONBLOCK);
-	}
-	SkypopenHandles = &tech_pvt->SkypopenHandles;
-	disp = XOpenDisplay(tech_pvt->X11_display);
-	if (!disp) {
-		ERRORA("Cannot open X Display '%s', exiting skype thread\n", SKYPOPEN_P_LOG, tech_pvt->X11_display);
-		running = 0;
-
-		// CLOUDTREE (Thomas Hazel)
-		tech_pvt->skypopen_api_thread = NULL;
-		remove_interface(tech_pvt->skype_user, FALSE);
-		return NULL;
-	} else {
-		DEBUGA_SKYPE("X Display '%s' opened\n", SKYPOPEN_P_LOG, tech_pvt->X11_display);
-	}
-
-	// CLOUDTREE (Thomas Hazel)
-#ifndef WIN32
-	{
-		char interfacename[256];
-
-		skypopen_list_add(&global_handles_list, SkypopenHandles);
-		sprintf(interfacename, "#%s", tech_pvt->name);
-
-#ifdef XIO_ERROR_BY_SETJMP
-		if (sigsetjmp(SkypopenHandles->ioerror_context, 1) != 0) {
-			switch_core_session_t *session = NULL;
-			tech_pvt->interface_state = SKYPOPEN_STATE_DEAD;
-			ERRORA("Fatal display error for %s - successed to jump\n", SKYPOPEN_P_LOG, tech_pvt->X11_display);
-
-			session = switch_core_session_locate(tech_pvt->session_uuid_str);
-			if (session) {
-				switch_channel_t *channel = switch_core_session_get_channel(session);
-
-				if (channel) {
-
-					switch_mutex_lock(tech_pvt->flag_mutex);
-					switch_clear_flag(tech_pvt, TFLAG_IO);
-					switch_clear_flag(tech_pvt, TFLAG_VOICE);
-					if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
-						switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
-					}
-					switch_mutex_unlock(tech_pvt->flag_mutex);
-
-
-					switch_core_session_rwunlock(session);
-					WARNINGA("Closing session for %s\n", SKYPOPEN_P_LOG, interfacename);
-					switch_channel_hangup(channel, SWITCH_CAUSE_CRASH);
-				} else {
-					WARNINGA("NO CHANNEL ?\n", SKYPOPEN_P_LOG);
-					switch_core_session_rwunlock(session);
-				}
-			}
-
-			WARNINGA("Removing skype interface %s\n", SKYPOPEN_P_LOG, interfacename);
-			remove_interface(interfacename, TRUE);
-			return NULL;
-		}
-#endif
-#ifdef XIO_ERROR_BY_UCONTEXT
-		getcontext(&SkypopenHandles->ioerror_context);
-
-		if (skypopen_list_find(&global_handles_list, SkypopenHandles) == NULL) {
-			switch_core_session_t *session = NULL;
-			tech_pvt->interface_state = SKYPOPEN_STATE_DEAD;
-			ERRORA("Fatal display error for %s - successed to jump\n", SKYPOPEN_P_LOG, tech_pvt->X11_display);
-
-			session = switch_core_session_locate(tech_pvt->session_uuid_str);
-			if (session) {
-				switch_channel_t *channel = switch_core_session_get_channel(session);
-
-
-				if (channel) {
-					switch_mutex_lock(tech_pvt->flag_mutex);
-					switch_clear_flag(tech_pvt, TFLAG_IO);
-					switch_clear_flag(tech_pvt, TFLAG_VOICE);
-					if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
-						switch_clear_flag(tech_pvt, TFLAG_PROGRESS);
-					}
-					switch_mutex_unlock(tech_pvt->flag_mutex);
-
-
-					switch_core_session_rwunlock(session);
-					WARNINGA("Closing session for %s\n", SKYPOPEN_P_LOG, interfacename);
-					switch_channel_hangup(channel, SWITCH_CAUSE_CRASH);
-
-				} else {
-					WARNINGA("NO CHANNEL ?\n", SKYPOPEN_P_LOG);
-				}
-				//skypopen_sleep(500000);
-			}
-
-			WARNINGA("Removing skype interface %s\n", SKYPOPEN_P_LOG, interfacename);
-			//tech_pvt->skypopen_api_thread = NULL;
-			remove_interface(interfacename, TRUE);
-			//XCloseDisplay(disp);
-			return NULL;
-		}
-#endif
-	}
-#endif /* NOT WIN32 */
-
-	xfd = XConnectionNumber(disp);
-	fcntl(xfd, F_SETFD, FD_CLOEXEC);
-
-	SkypopenHandles->disp = disp;
-
-	if (skypopen_present(SkypopenHandles)) {
-		root = DefaultRootWindow(disp);
-		win = XCreateSimpleWindow(disp, root, 0, 0, 1, 1, 0, BlackPixel(disp, DefaultScreen(disp)), BlackPixel(disp, DefaultScreen(disp)));
-
-		SkypopenHandles->win = win;
-
-		snprintf(buf, 512, "NAME skypopen");
-
-		if (!skypopen_send_message(tech_pvt, buf)) {
-			ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypopen again\n", SKYPOPEN_P_LOG);
-
-			// CLOUDTREE (Thomas Hazel)
-#ifndef WIN32
-			skypopen_list_remove_by_reference(&global_handles_list, SkypopenHandles);
-#endif
-
-			XCloseDisplay(disp);
-			running = 0;
-			return NULL;
-		}
-
-		snprintf(buf, 512, "PROTOCOL 999");
-		if (!skypopen_send_message(tech_pvt, buf)) {
-			ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypopen again\n", SKYPOPEN_P_LOG);
-
-			// CLOUDTREE (Thomas Hazel)
-#ifndef WIN32
-			skypopen_list_remove_by_reference(&global_handles_list, SkypopenHandles);
-#endif
-
-			XCloseDisplay(disp);
-			running = 0;
-			return NULL;
-		}
-
-		{
-			/* perform an events loop */
-			XEvent an_event;
-			char buf[21];		/*  can't be longer */
-			char buffer[17000];
-			char continuebuffer[17000];
-			char *b;
-			int i;
-			int continue_is_broken = 0;
-			int there_were_continues = 0;
-			struct timeval tv;
-			Atom atom_begin = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
-			Atom atom_continue = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE", False);
-
-			memset(buffer, '\0', 17000);
-			memset(continuebuffer, '\0', 17000);
-			b = buffer;
-
-			while (running && tech_pvt->running) {
-
-
-				FD_ZERO(&xfds);
-				FD_SET(xfd, &xfds);
-
-				tv.tv_usec = 100000;
-				tv.tv_sec = 0;
-
-
-
-				if (select(xfd + 1, &xfds, 0, 0, &tv)) {
-
-					while (XPending(disp)) {
-
-
-
-						XNextEvent(disp, &an_event);
-						if (!(running && tech_pvt->running))
-							break;
-						switch (an_event.type) {
-						case ClientMessage:
-
-							if (an_event.xclient.format != 8) {
-								//skypopen_sleep(1000); //0.1 msec
-								break;
-							}
-
-							for (i = 0; i < 20 && an_event.xclient.data.b[i] != '\0'; ++i)
-								buf[i] = an_event.xclient.data.b[i];
-
-							buf[i] = '\0';
-
-							if (an_event.xclient.message_type == atom_begin) {
-								if (strlen(buffer)) {
-									unsigned int howmany;
-									howmany = strlen(b) + 1;
-									howmany = write(SkypopenHandles->fdesc[1], b, howmany);
-									WARNINGA
-										("A begin atom while the previous message is not closed???? value of previous message (between vertical bars) is=|||%s|||, will be lost\n",
-										 SKYPOPEN_P_LOG, buffer);
-									memset(buffer, '\0', 17000);
-								}
-								if (continue_is_broken) {
-									continue_is_broken = 0;
-									there_were_continues = 1;
-								}
-							}
-							if (an_event.xclient.message_type == atom_continue) {
-								if (!strlen(buffer)) {
-									WARNINGA
-										("Got a 'continue' XAtom without a previous 'begin'. It's value (between vertical bars) is=|||%s|||, let's store it and hope next 'begin' will be the good one\n",
-										 SKYPOPEN_P_LOG, buf);
-									strcat(continuebuffer, buf);
-									continue_is_broken = 1;
-									if (!strncmp(buf, "ognised identity", 15)) {
-										WARNINGA
-											("Got a 'continue' XAtom without a previous 'begin'. It's value (between vertical bars) is=|||%s|||. Let's introduce a 1 second delay.\n",
-											 SKYPOPEN_P_LOG, buf);
-										skypopen_sleep(1000000);	//1 sec
-									}
-									skypopen_sleep(20000);	//20 msec
-									break;
-								}
-							}
-							if (continue_is_broken) {
-								XFlush(disp);
-								skypopen_sleep(20000);	//20 msec
-								WARNINGA("continue_is_broken\n", SKYPOPEN_P_LOG);
-								continue;
-							}
-							strcat(buffer, buf);
-							strcat(buffer, continuebuffer);
-							memset(continuebuffer, '\0', 17000);
-
-							if (i < 20 || there_were_continues) {	/* last fragment */
-								unsigned int howmany;
-
-								howmany = strlen(b) + 1;
-								howmany = write(SkypopenHandles->fdesc[1], b, howmany);
-								memset(buffer, '\0', 17000);
-								//XFlush(disp);
-								there_were_continues = 0;
-							}
-							//skypopen_sleep(1000); //0.1 msec
-							break;
-						default:
-							//skypopen_sleep(1000); //0.1 msec
-							break;
-						}		//switch event.type
-					}			//while XPending
-					XFlush(disp);
-
-				}				// if select
-			}					//while running
-
-
-
-
-
-		}
-	} else {
-		ERRORA("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypopen\n", SKYPOPEN_P_LOG);
-		running = 0;
-	}
-
-	DEBUGA_SKYPE("EXITING\n", SKYPOPEN_P_LOG);
-
-	// CLOUDTREE (Thomas Hazel)
-#ifndef WIN32
-	skypopen_list_remove_by_reference(&global_handles_list, SkypopenHandles);
-#endif
-
-	tech_pvt->skypopen_api_thread = NULL;
-	return NULL;
-
-}
-#endif // WIN32
-
-int inbound_channel_answered(private_t *tech_pvt)
-{
-	int res = 0;
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	session = switch_core_session_locate(tech_pvt->session_uuid_str);
-	if (session) {
-		channel = switch_core_session_get_channel(session);
-
-		if (channel) {
-			switch_mutex_lock(tech_pvt->flag_mutex);
-			switch_set_flag(tech_pvt, TFLAG_IO);
-			switch_mutex_unlock(tech_pvt->flag_mutex);
-		} else {
-			ERRORA("no channel\n", SKYPOPEN_P_LOG);
-		}
-		switch_core_session_rwunlock(session);
-	} else {
-		ERRORA("no session\n", SKYPOPEN_P_LOG);
-
-	}
-	return res;
-}
-
-
-int skypopen_answered(private_t *tech_pvt)
-{
-
-	int res = SWITCH_STATUS_SUCCESS;
-	switch_core_session_t *session = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (strlen(tech_pvt->session_uuid_str)) {
-		session = switch_core_session_locate(tech_pvt->session_uuid_str);
-		if (session) {
-			channel = switch_core_session_get_channel(session);
-
-			if (channel) {
-				if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-					tech_pvt->interface_state = SKYPOPEN_STATE_UP;
-					DEBUGA_SKYPE("Outbound Channel Answered! session_uuid_str=%s\n", SKYPOPEN_P_LOG, tech_pvt->session_uuid_str);
-					outbound_channel_answered(tech_pvt);
-				} else {
-					DEBUGA_SKYPE("answered Inbound Channel!\n\n\n\n", SKYPOPEN_P_LOG);
-					inbound_channel_answered(tech_pvt);
-				}
-
-			} else {
-				ERRORA("no channel after INPROGRESS?\n", SKYPOPEN_P_LOG);
-				return SWITCH_STATUS_FALSE;
-			}
-			switch_core_session_rwunlock(session);
-		} else {
-			WARNINGA("no session after INPROGRESS, let's hangup\n", SKYPOPEN_P_LOG);
-			return SWITCH_STATUS_FALSE;
-		}
-	} else {
-		WARNINGA("no tech_pvt->session_uuid_str after INPROGRESS, let's hangup\n", SKYPOPEN_P_LOG);
-		return SWITCH_STATUS_FALSE;
-	}
-	return res;
-}
diff --git a/src/mod/endpoints/mod_sofia/Makefile.am b/src/mod/endpoints/mod_sofia/Makefile.am
index c813f9f597..3a5d295ddb 100644
--- a/src/mod/endpoints/mod_sofia/Makefile.am
+++ b/src/mod/endpoints/mod_sofia/Makefile.am
@@ -38,7 +38,8 @@ test_sipp_based_tests_CFLAGS = $(AM_CFLAGS) $(SOFIA_SIP_CFLAGS) -DSWITCH_TEST_BA
 test_sipp_based_tests_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)
 test_sipp_based_tests_LDADD = libsofiamod.la $(SOFIA_SIP_LIBS)
 
-TESTS = test/test_sofia_funcs.sh test/test_nuafail test/test_run_sipp.sh
+TESTS = test/test_sofia_funcs.sh test/test_nuafail
+#TESTS += test/test_run_sipp.sh
 
 if ISMAC
 mod_sofia_la_LDFLAGS += -framework CoreFoundation -framework SystemConfiguration
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 0b74b89c9d..c41ed9b2e3 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -54,7 +54,7 @@ switch_endpoint_interface_t *sofia_endpoint_interface;
 
 #define STRLEN 15
 
-void mod_sofia_shutdown_cleanup();
+void mod_sofia_shutdown_cleanup(void);
 static switch_status_t sofia_on_init(switch_core_session_t *session);
 
 static switch_status_t sofia_on_exchange_media(switch_core_session_t *session);
@@ -348,6 +348,7 @@ static int hangup_cause_to_sip(switch_call_cause_t cause)
 	case SWITCH_CAUSE_BUSY_EVERYWHERE:
 		return 600;
 	case SWITCH_CAUSE_DECLINE:
+	case SWITCH_CAUSE_REJECT_ALL:
 		return 603;
 	case SWITCH_CAUSE_DOES_NOT_EXIST_ANYWHERE:
 		return 604;
@@ -472,7 +473,7 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
 		switch_core_hash_delete_locked(tech_pvt->profile->chat_hash, tech_pvt->hash_key, tech_pvt->profile->flag_mutex);
 	}
 
-	if (session && tech_pvt->profile->pres_type) {
+	if (tech_pvt->profile->pres_type) {
 		char *sql = switch_mprintf("delete from sip_dialogs where uuid='%q'", switch_core_session_get_uuid(session));
 		switch_assert(sql);
 		sofia_glue_execute_sql_now(tech_pvt->profile, &sql, SWITCH_TRUE);
@@ -487,7 +488,7 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
 	if (sofia_test_pflag(tech_pvt->profile, PFLAG_DESTROY)) {
 		sofia_set_flag(tech_pvt, TFLAG_BYE);
 	} else if (tech_pvt->nh && !sofia_test_flag(tech_pvt, TFLAG_BYE)) {
-		char reason[128] = "";
+		char *reason = switch_core_session_sprintf(session, "");
 		char *bye_headers = sofia_glue_get_extra_headers(channel, SOFIA_SIP_BYE_HEADER_PREFIX);
 		const char *val = NULL;
 		const char *max_forwards = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE);
@@ -498,15 +499,15 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
 
 		if (!val || switch_false(val)) {
 			if ((val = switch_channel_get_variable(tech_pvt->channel, "sip_reason"))) {
-				switch_snprintf(reason, sizeof(reason), "%s", val);
+				reason = switch_core_session_sprintf(session, "%s", val);
 			} else {
 				if ((switch_channel_test_flag(channel, CF_INTERCEPT) || cause == SWITCH_CAUSE_PICKED_OFF || cause == SWITCH_CAUSE_LOSE_RACE)
 					&& !switch_true(switch_channel_get_variable(channel, "ignore_completed_elsewhere"))) {
-					switch_snprintf(reason, sizeof(reason), "SIP;cause=200;text=\"Call completed elsewhere\"");
+					reason = switch_core_session_sprintf(session, "SIP;cause=200;text=\"Call completed elsewhere\"");
 				} else if (cause > 0 && cause < 128) {
-					switch_snprintf(reason, sizeof(reason), "Q.850;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause));
+					reason = switch_core_session_sprintf(session, "Q.850;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause));
 				} else {
-					switch_snprintf(reason, sizeof(reason), "SIP;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause));
+					reason = switch_core_session_sprintf(session, "SIP;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause));
 				}
 			}
 		}
@@ -789,7 +790,7 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
 			switch_core_media_prepare_codecs(tech_pvt->session, SWITCH_TRUE);
 			tech_pvt->mparams.local_sdp_str = NULL;
 			switch_core_media_choose_port(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO, 0);
-			switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+			switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 		} else if (is_3pcc_proxy) {
 
 			if (!(sofia_test_pflag(tech_pvt->profile, PFLAG_3PCC_PROXY))) {
@@ -801,7 +802,7 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
 			} else {
 				switch_core_media_choose_port(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO, 0);
 				switch_core_media_prepare_codecs(session, 1);
-				switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, NULL, 0, NULL, 1);
+				switch_core_media_gen_local_sdp(session, SDP_OFFER, NULL, 0, NULL, 1);
 				sofia_set_flag_locked(tech_pvt, TFLAG_3PCC);
 			}
 
@@ -888,7 +889,7 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
 
 				switch_core_media_prepare_codecs(tech_pvt->session, SWITCH_TRUE);
 
-				if (zstr(r_sdp) || sofia_media_tech_media(tech_pvt, r_sdp, SDP_TYPE_REQUEST) != SWITCH_STATUS_SUCCESS) {
+				if (zstr(r_sdp) || sofia_media_tech_media(tech_pvt, r_sdp, SDP_OFFER) != SWITCH_STATUS_SUCCESS) {
 					switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR");
 					//switch_mutex_lock(tech_pvt->sofia_mutex);
 					//nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END());
@@ -903,7 +904,7 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
 			return status;
 		}
 
-		switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+		switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 		if (sofia_media_activate_rtp(tech_pvt) != SWITCH_STATUS_SUCCESS) {
 			switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 		}
@@ -1338,6 +1339,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 
 	if (msg->message_id == SWITCH_MESSAGE_INDICATE_SIGNAL_DATA) {
 		sofia_dispatch_event_t *de = (sofia_dispatch_event_t *) msg->pointer_arg;
+
+		switch_core_session_lock_codec_write(session);
 		switch_mutex_lock(tech_pvt->sofia_mutex);
 		if (switch_core_session_in_thread(session)) {
 			de->session = session;
@@ -1345,8 +1348,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 
 		sofia_process_dispatch_event(&de);
 
-
 		switch_mutex_unlock(tech_pvt->sofia_mutex);
+		switch_core_session_unlock_codec_write(session);
 		goto end;
 	}
 
@@ -1362,6 +1365,9 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 
 	/* ones that do not need to lock sofia mutex */
 	switch (msg->message_id) {
+	case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY:
+	case SWITCH_MESSAGE_RESAMPLE_EVENT:
+		goto end;
 	case SWITCH_MESSAGE_INDICATE_KEEPALIVE:
 		{
 			if (msg->numeric_arg) {
@@ -1522,6 +1528,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 	}
 
 	/* ones that do need to lock sofia mutex */
+	switch_core_session_lock_codec_write(session);
 	switch_mutex_lock(tech_pvt->sofia_mutex);
 
 	if (switch_channel_down(channel) || sofia_test_flag(tech_pvt, TFLAG_BYE)) {
@@ -1556,7 +1563,9 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 			tech_pvt->proxy_refer_uuid = (char *)msg->string_array_arg[0];
 		} else if (!switch_channel_var_true(tech_pvt->channel, "sip_refer_continue_after_reply")) {
 			switch_mutex_unlock(tech_pvt->sofia_mutex);
+			switch_core_session_unlock_codec_write(session);
 			sofia_wait_for_reply(tech_pvt, 9999, 10);
+			switch_core_session_lock_codec_write(session);
 			switch_mutex_lock(tech_pvt->sofia_mutex);
 
 			if ((var = switch_channel_get_variable(tech_pvt->channel, "sip_refer_reply"))) {
@@ -1597,7 +1606,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 			ip = switch_channel_get_variable(channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE);
 			port = switch_channel_get_variable(channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE);
 			if (ip && port) {
-				switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, ip, (switch_port_t)atoi(port), msg->string_arg, 1);
+				switch_core_media_gen_local_sdp(session, SDP_OFFER, ip, (switch_port_t)atoi(port), msg->string_arg, 1);
 			}
 
 			if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
@@ -1782,7 +1791,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 				if (switch_channel_direction(tech_pvt->channel) == SWITCH_CALL_DIRECTION_INBOUND) {
 
 					switch_core_media_prepare_codecs(tech_pvt->session, SWITCH_TRUE);
-					if (sofia_media_tech_media(tech_pvt, r_sdp, SDP_TYPE_REQUEST) != SWITCH_STATUS_SUCCESS) {
+					if (sofia_media_tech_media(tech_pvt, r_sdp, SDP_OFFER) != SWITCH_STATUS_SUCCESS) {
 						switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR");
 						status = SWITCH_STATUS_FALSE;
 						goto end_lock;
@@ -1792,7 +1801,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 			}
 
 
-			switch_core_media_set_sdp_codec_string(tech_pvt->session, r_sdp, SDP_TYPE_RESPONSE);
+			switch_core_media_set_sdp_codec_string(tech_pvt->session, r_sdp, SDP_ANSWER);
 			switch_channel_set_variable(tech_pvt->channel, "absolute_codec_string", switch_channel_get_variable(tech_pvt->channel, "ep_codec_string"));
 			switch_core_media_prepare_codecs(tech_pvt->session, SWITCH_TRUE);
 
@@ -1801,7 +1810,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 				goto end_lock;
 			}
 
-			switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, NULL, 0, NULL, 1);
+			switch_core_media_gen_local_sdp(session, SDP_OFFER, NULL, 0, NULL, 1);
 
 			if (!msg->numeric_arg) {
 				if (send_invite) {
@@ -2205,11 +2214,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 													argv[i], (double)((double)(MAX_REDIR + 1 - i))/1000);
 								}
 							} else {
-								if (i == argc - 1) {
-									switch_snprintf(newdest + strlen(newdest), len - strlen(newdest), "\"unknown\" <%s>", argv[i]);
-								} else {
-									switch_snprintf(newdest + strlen(newdest), len - strlen(newdest), "\"unknown\" <%s>,", argv[i]);
-								}
+								switch_snprintf(newdest + strlen(newdest), len - strlen(newdest), "\"unknown\" <%s>", argv[i]);
 							}
 						} else {
 							if (i == argc - 1) {
@@ -2259,7 +2264,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 				switch_channel_clear_flag(tech_pvt->channel, CF_AWAITING_STREAM_CHANGE);
 
 				switch_core_session_local_crypto_key(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO);
-				switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+				switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 						
 				if (sofia_use_soa(tech_pvt)) {
 					nua_respond(tech_pvt->nh, SIP_200_OK,
@@ -2394,6 +2399,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 								/* Unlock the session signal to allow the ack to make it in */
 								// Maybe we should timeout?
 								switch_mutex_unlock(tech_pvt->sofia_mutex);
+								switch_core_session_unlock_codec_write(session);
 
 								while (switch_channel_ready(channel) && !sofia_test_flag(tech_pvt, TFLAG_3PCC_HAS_ACK)) {
 									switch_ivr_parse_all_events(session);
@@ -2401,6 +2407,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 								}
 
 								/*  Regain lock on sofia */
+								switch_core_session_lock_codec_write(session);
 								switch_mutex_lock(tech_pvt->sofia_mutex);
 
 								switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "3PCC-PROXY, Done waiting for ACK\n");
@@ -2587,7 +2594,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 
 
 							switch_core_media_prepare_codecs(tech_pvt->session, SWITCH_TRUE);
-							if (zstr(r_sdp) || sofia_media_tech_media(tech_pvt, r_sdp, SDP_TYPE_REQUEST) != SWITCH_STATUS_SUCCESS) {
+							if (zstr(r_sdp) || sofia_media_tech_media(tech_pvt, r_sdp, SDP_OFFER) != SWITCH_STATUS_SUCCESS) {
 								switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
 												  "CODEC NEGOTIATION ERROR.  SDP:\n%s\n", r_sdp ? r_sdp : "NO SDP!");
 								switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR");
@@ -2602,7 +2609,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 						switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 						goto end_lock;
 					}
-					switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+					switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 					if (sofia_media_activate_rtp(tech_pvt) != SWITCH_STATUS_SUCCESS) {
 						switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 					}
@@ -2709,6 +2716,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 	//}
 
 	switch_mutex_unlock(tech_pvt->sofia_mutex);
+	switch_core_session_unlock_codec_write(session);
 
   end:
 
@@ -3258,8 +3266,6 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl
 	switch_hash_index_t *hi;
 	void *val;
 	const void *vvar;
-	int c = 0;
-	int ac = 0;
 	const char *header = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>";
 
 	if (argc > 0) {
@@ -3469,7 +3475,6 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl
 		if (sofia_test_pflag(profile, PFLAG_RUNNING)) {
 
 			if (strcmp(vvar, profile->name)) {
-				ac++;
 				stream->write_function(stream, "<alias>\n<name>%s</name>\n<type>%s</type>\n<data>%s</data>\n<state>%s</state>\n</alias>\n", vvar, "alias",
 									   profile->name, "ALIASED");
 			} else {
@@ -3495,8 +3500,6 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl
 									   profile->inuse);
 				}
 
-				c++;
-
 				for (gp = profile->gateways; gp; gp = gp->next) {
 					switch_assert(gp->state < REG_STATE_LAST);
 					stream->write_function(stream, "<gateway>\n<name>%s</name>\n<type>%s</type>\n<data>%s</data>\n<state>%s</state>\n</gateway>\n",
@@ -4313,6 +4316,8 @@ SWITCH_STANDARD_API(sofia_presence_data_function)
 		user = argv[1];
 	}
 
+	if (!user) goto end;
+
 	if ((domain = strchr(user, '@'))) {
 		*domain++ = '\0';
 		if ((concat = strchr(domain, '/'))) {
@@ -4329,8 +4334,6 @@ SWITCH_STANDARD_API(sofia_presence_data_function)
 		domain = dup_domain;
 	}
 
-	if (!user) goto end;
-
 	if (zstr(profile_name) || strcmp(profile_name, "*") || zstr(domain)) {
 		if (!zstr(profile_name)) {
 			profile = sofia_glue_find_profile(profile_name);
@@ -6836,7 +6839,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sofia_load)
 	return status;
 }
 
-void mod_sofia_shutdown_cleanup() {
+void mod_sofia_shutdown_cleanup(void) {
 	int sanity = 0;
 	int i;
 	switch_status_t st;
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index bfd682c1f1..8e2b1b483c 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -776,7 +776,7 @@ struct sofia_profile {
 	int watchdog_enabled;
 	switch_mutex_t *gw_mutex;
 	uint32_t queued_events;
-	uint32_t last_cseq;
+	switch_uint31_t last_cseq;
 	int tls_only;
 	int tls_verify_date;
 	enum tport_tls_verify_policy tls_verify_policy;
diff --git a/src/mod/endpoints/mod_sofia/sip-dig.c b/src/mod/endpoints/mod_sofia/sip-dig.c
index e89f5aef44..10a0a26763 100644
--- a/src/mod/endpoints/mod_sofia/sip-dig.c
+++ b/src/mod/endpoints/mod_sofia/sip-dig.c
@@ -82,9 +82,6 @@
  * <dt>-6</dt>
  * <dd>Query IP6 addresses (AAAA records).
  * </dd>
- * <dt>-v</dt>
- * <dd>Be verbatim.
- * </dd>
  * <dt></dt>
  * <dd>
  * </dd>
@@ -201,7 +198,7 @@ switch_bool_t verify_ip(sres_record_t **answers, const char *ip, switch_bool_t i
 switch_status_t sip_dig_function(_In_opt_z_ const char *cmd, _In_opt_ switch_core_session_t *session, _In_ switch_stream_handle_t *stream)
 
 {
-	int o_sctp = 1, o_tls_sctp = 1, o_verbatim = 1;
+	int o_sctp = 1, o_tls_sctp = 1;
 	int family = 0, multiple = 0;
 	char const *string;
 	url_t *uri = NULL;
@@ -247,9 +244,7 @@ switch_status_t sip_dig_function(_In_opt_z_ const char *cmd, _In_opt_ switch_cor
 	}
 
 	while (argv[i] && argv[i][0] == '-') {
-		if (strcmp(argv[i], "-v") == 0) {
-			o_verbatim++;
-		} else if (strcmp(argv[i], "-6") == 0) {
+		if (strcmp(argv[i], "-6") == 0) {
 			dig->ip6 = ++family;
 		} else if (strcmp(argv[i], "-4") == 0) {
 			dig->ip4 = ++family;
@@ -815,8 +810,12 @@ sres_record_t ** dig_addr_simple(struct dig *dig,
 								uint16_t type) 
 {
 	sres_record_t **answers = NULL;
+	int error;
 
-	sres_blocking_query(dig->sres, type, host, 0, &answers);
+	error = sres_blocking_query(dig->sres, type, host, 0, &answers);
+	if (error < 0) {
+		return NULL;
+	}
 
 	return answers;
 }
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index f14b574adf..a370b52442 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -2818,7 +2818,10 @@ void event_handler(switch_event_t *event)
 
 			if ((sptr = strstr(fixed_contact_str, needle))) {
 				char *origsptr = strstr(contact_str, needle);
-				eptr = strchr(++origsptr, ';');
+
+				if (origsptr) {
+					eptr = strchr(++origsptr, ';');
+				}
 			} else {
 				sptr = strchr(fixed_contact_str, '\0') - 1;
 			}
@@ -4173,7 +4176,7 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag,
 
 			if (extension_in_contact) {
 				if (rfc_5626) {
-					format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d>%s" : "<sip:%s@%s:%d%s>%s";
+					format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d%s>%s" : "<sip:%s@%s:%d%s>%s";
 					gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension,
 							sipip,
 							sofia_glue_transport_has_tls(gateway->register_transport) ?
@@ -6680,7 +6683,7 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 		tech_pvt->mparams.last_sdp_response = NULL;
 
 		if (sip->sip_payload && sip->sip_payload->pl_data) {
-			switch_core_media_set_sdp_codec_string(session, sip->sip_payload->pl_data, SDP_TYPE_RESPONSE);
+			switch_core_media_set_sdp_codec_string(session, sip->sip_payload->pl_data, SDP_ANSWER);
 
 			if (!zstr(tech_pvt->mparams.prev_sdp_response) && !strcmp(tech_pvt->mparams.prev_sdp_response, sip->sip_payload->pl_data)) {
 				tech_pvt->mparams.last_sdp_response = tech_pvt->mparams.prev_sdp_response;
@@ -7503,9 +7506,9 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 					switch_channel_mark_pre_answered(channel);
 				}
                 //if ((sofia_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) || switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND)) {
-				//	switch_core_media_set_sdp_codec_string(session, r_sdp, status < 200 ? SDP_TYPE_REQUEST : SDP_TYPE_RESPONSE);
+				//	switch_core_media_set_sdp_codec_string(session, r_sdp, status < 200 ? SDP_OFFER : SDP_ANSWER);
 				//}
-				switch_core_media_set_sdp_codec_string(session, r_sdp, SDP_TYPE_REQUEST);
+				switch_core_media_set_sdp_codec_string(session, r_sdp, SDP_OFFER);
 				sofia_glue_pass_sdp(tech_pvt, (char *) r_sdp);
 				sofia_set_flag(tech_pvt, TFLAG_NEW_SDP);
 
@@ -7677,7 +7680,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 					}
 
 				} else {
-					if (sofia_media_tech_media(tech_pvt, (char *) r_sdp, SDP_TYPE_REQUEST) != SWITCH_STATUS_SUCCESS) {
+					if (sofia_media_tech_media(tech_pvt, (char *) r_sdp, SDP_OFFER) != SWITCH_STATUS_SUCCESS) {
 						switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR");
 						nua_respond(nh, SIP_488_NOT_ACCEPTABLE, 
 								TAG_IF(!zstr(session_id_header), SIPTAG_HEADER_STR(session_id_header)),TAG_END());
@@ -7773,7 +7776,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 				switch_core_media_prepare_codecs(tech_pvt->session, SWITCH_FALSE);
 
 				if (tech_pvt->mparams.num_codecs) {
-					match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_REQUEST);
+					match = sofia_media_negotiate_sdp(session, r_sdp, SDP_OFFER);
 				}
 
 				if (!match) {
@@ -7782,7 +7785,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 								TAG_IF(!zstr(session_id_header), SIPTAG_HEADER_STR(session_id_header)),TAG_END());
 					}
 				} else {
-					switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+					switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 					switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED");
 					sofia_set_flag_locked(tech_pvt, TFLAG_READY);
 
@@ -7906,7 +7909,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 					uint8_t match = 0;
 
 					if (tech_pvt->mparams.num_codecs) {
-						match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_REQUEST);
+						match = sofia_media_negotiate_sdp(session, r_sdp, SDP_OFFER);
 					}
 
 					if (!match) {
@@ -7989,10 +7992,11 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 						switch_channel_hangup(channel, SWITCH_CAUSE_MANDATORY_IE_MISSING);
 					} else {
 						switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP");
+						switch_channel_set_flag(channel, CF_3PCC);
 						switch_core_media_choose_port(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO, 0);
 						switch_core_media_prepare_codecs(session, 1);
 						switch_channel_set_state(channel, CS_HIBERNATE);
-						switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, NULL, 0, NULL, 0);
+						switch_core_media_gen_local_sdp(session, SDP_OFFER, NULL, 0, NULL, 0);
 						sofia_set_flag_locked(tech_pvt, TFLAG_3PCC);
 
 						if (sofia_use_soa(tech_pvt)) {
@@ -8064,10 +8068,10 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 			switch_channel_set_flag(channel, CF_NOSDP_REINVITE);
 
 			if (switch_channel_var_true(channel, "sip_unhold_nosdp")) {
-				switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, "sendrecv",
+				switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, "sendrecv",
 												zstr(tech_pvt->mparams.local_sdp_str) || !switch_channel_test_flag(channel, CF_PROXY_MODE));
 			} else {
-				switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL,
+				switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL,
 											zstr(tech_pvt->mparams.local_sdp_str) || !switch_channel_test_flag(channel, CF_PROXY_MODE));
 			}
 
@@ -8113,13 +8117,13 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 			sofia_set_flag(tech_pvt, TFLAG_SDP);
 
 
-			match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_RESPONSE);
+			match = sofia_media_negotiate_sdp(session, r_sdp, SDP_ANSWER);
 			if (match) {
 				if (switch_core_media_choose_port(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO, 0) != SWITCH_STATUS_SUCCESS) {
 					goto done;
 				}
 
-				switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+				switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 
 				if (sofia_media_activate_rtp(tech_pvt) != SWITCH_STATUS_SUCCESS) {
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Early Media RTP Error!\n");
@@ -8188,7 +8192,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 
 
 										switch_core_media_prepare_codecs(tech_pvt->session, SWITCH_TRUE);
-										if (sofia_media_tech_media(tech_pvt, r_sdp, SDP_TYPE_REQUEST) != SWITCH_STATUS_SUCCESS) {
+										if (sofia_media_tech_media(tech_pvt, r_sdp, SDP_OFFER) != SWITCH_STATUS_SUCCESS) {
 											switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR");
 											switch_core_session_rwunlock(other_session);
 											switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
@@ -8207,7 +8211,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 									}
 								}
 
-								switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 1);
+								switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 1);
 
 								if (sofia_use_soa(tech_pvt)) {
 									nua_respond(tech_pvt->nh, SIP_200_OK,
@@ -8317,7 +8321,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 								switch_channel_set_flag(tech_pvt->channel, CF_REINVITE);
 
 								if (tech_pvt->mparams.num_codecs){
-									match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_REQUEST);
+									match = sofia_media_negotiate_sdp(session, r_sdp, SDP_OFFER);
 								}
 
 								if (!match) {
@@ -8366,7 +8370,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 
 
 
-								switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+								switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 								if (sofia_use_soa(tech_pvt)){
 									nua_respond(tech_pvt->nh, SIP_200_OK,
 												SIPTAG_CONTACT_STR(tech_pvt->reply_contact),
@@ -8416,7 +8420,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 					switch_channel_set_flag(tech_pvt->channel, CF_REINVITE);
 
 					if (tech_pvt->mparams.num_codecs) {
-						match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_REQUEST);
+						match = sofia_media_negotiate_sdp(session, r_sdp, SDP_OFFER);
 					}
 
 
@@ -8435,7 +8439,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 							goto done;
 						}
 
-						switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+						switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 
 						if (sofia_media_activate_rtp(tech_pvt) != SWITCH_STATUS_SUCCESS) {
 							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Reinvite RTP Error!\n");
@@ -8459,7 +8463,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 				if (is_ok) {
 
 					if (switch_core_session_local_crypto_key(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO)) {
-						switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+						switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 					}
 
 					if (!switch_channel_test_flag(tech_pvt->channel, CF_AWAITING_STREAM_CHANGE)) {
@@ -8504,13 +8508,13 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 
 
 			if (tech_pvt->mparams.num_codecs) {
-				match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_RESPONSE);
+				match = sofia_media_negotiate_sdp(session, r_sdp, SDP_ANSWER);
 			}
 			if (match) {
 				if (switch_core_media_choose_port(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO, 0) != SWITCH_STATUS_SUCCESS) {
 					goto done;
 				}
-				switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+				switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Processing updated SDP\n");
 				switch_channel_set_flag(tech_pvt->channel, CF_REINVITE);
@@ -8568,9 +8572,9 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 
 				if (tech_pvt->mparams.num_codecs) {
 					if (sofia_test_flag(tech_pvt, TFLAG_GOT_ACK)) {
-						match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_REQUEST);
+						match = sofia_media_negotiate_sdp(session, r_sdp, SDP_OFFER);
 					} else {
-						match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_RESPONSE);
+						match = sofia_media_negotiate_sdp(session, r_sdp, SDP_ANSWER);
 					}
 				}
 
@@ -8665,7 +8669,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 					uint8_t match = 0;
 
 
-					match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_RESPONSE);
+					match = sofia_media_negotiate_sdp(session, r_sdp, SDP_ANSWER);
 
 
 					sofia_set_flag_locked(tech_pvt, TFLAG_ANS);
@@ -10463,7 +10467,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
 
 
 	if (r_sdp) {
-		switch_core_media_set_sdp_codec_string(session, r_sdp, SDP_TYPE_REQUEST);
+		switch_core_media_set_sdp_codec_string(session, r_sdp, SDP_OFFER);
 	}
 
 
diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 8c9dfcc57a..1452a7cf0f 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -929,9 +929,9 @@ char *sofia_glue_get_extra_headers(switch_channel_t *channel, const char *prefix
 				if ( !exclude_regex || !(/*proceed*/ switch_regex_perform(name, exclude_regex, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
 					const char *hname = name + strlen(prefix);
 					stream.write_function(&stream, "%s: %s\r\n", hname, value);
-					switch_regex_safe_free(re);
 				} else {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ignoring Extra Header [%s] , matches exclude_outgoing_extra_header [%s]\n", name, exclude_regex);
+					switch_regex_safe_free(re);
 				}
 			}
 		}
@@ -1158,7 +1158,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
 	}
 
 	if (!switch_channel_get_private(tech_pvt->channel, "t38_options") || zstr(tech_pvt->mparams.local_sdp_str)) {
-		switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, NULL, 0, NULL, 0);
+		switch_core_media_gen_local_sdp(session, SDP_OFFER, NULL, 0, NULL, 0);
 	}
 
 	sofia_set_flag_locked(tech_pvt, TFLAG_READY);
@@ -2282,8 +2282,7 @@ int sofia_recover_callback(switch_core_session_t *session)
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	private_object_t *tech_pvt = NULL;
 	sofia_profile_t *profile = NULL;
-	const char *tmp;
-	const char *rr;
+	const char *tmp, *rr, *use_uuid;
 	int r = 0;
 	const char *profile_name = switch_channel_get_variable_dup(channel, "recovery_profile_name", SWITCH_FALSE, -1);
 	int swap = switch_channel_var_true(channel, "dlg_req_swap_direction");
@@ -2374,17 +2373,13 @@ int sofia_recover_callback(switch_core_session_t *session)
 										   );
 	}
 
-	if (session) {
-		const char *use_uuid;
-
-		if ((use_uuid = switch_channel_get_variable(channel, "origination_uuid"))) {
-			if (switch_core_session_set_uuid(session, use_uuid) == SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s set UUID=%s\n", switch_channel_get_name(channel),
-								  use_uuid);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "%s set UUID=%s FAILED\n",
-								  switch_channel_get_name(channel), use_uuid);
-			}
+	if ((use_uuid = switch_channel_get_variable(channel, "origination_uuid"))) {
+		if (switch_core_session_set_uuid(session, use_uuid) == SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s set UUID=%s\n", switch_channel_get_name(channel),
+							  use_uuid);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "%s set UUID=%s FAILED\n",
+							  switch_channel_get_name(channel), use_uuid);
 		}
 	}
 
diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index b8576ae7f5..48ad579411 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -1621,7 +1621,6 @@ void *SWITCH_THREAD_FUNC sofia_presence_event_thread_run(switch_thread_t *thread
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Event Thread Started\n");
 
 	while (mod_sofia_globals.running == 1) {
-		int count = 0;
 
 		if (switch_queue_pop(mod_sofia_globals.presence_queue, &pop) == SWITCH_STATUS_SUCCESS) {
 			switch_event_t *event = (switch_event_t *) pop;
@@ -1656,7 +1655,6 @@ void *SWITCH_THREAD_FUNC sofia_presence_event_thread_run(switch_thread_t *thread
 			}
 
 			switch_event_destroy(&event);
-			count++;
 		}
 	}
 
@@ -2114,12 +2112,12 @@ static int sofia_dialog_probe_callback(void *pArg, int argc, char **argv, char *
 
 #define SOFIA_PRESENCE_COLLISION_DELTA 50
 #define SOFIA_PRESENCE_ROLLOVER_YEAR (86400 * 365 * SOFIA_PRESENCE_COLLISION_DELTA)
-static uint32_t check_presence_epoch(void)
+static switch_uint31_t check_presence_epoch(void)
 {
 	time_t now = switch_epoch_time_now(NULL);
-	uint32_t callsequence = (uint32_t)((now - mod_sofia_globals.presence_epoch) * SOFIA_PRESENCE_COLLISION_DELTA);
+	switch_uint31_t callsequence = { .value = (uint32_t)((now - mod_sofia_globals.presence_epoch) * SOFIA_PRESENCE_COLLISION_DELTA) };
 
-	if (!mod_sofia_globals.presence_year || callsequence >= SOFIA_PRESENCE_ROLLOVER_YEAR) {
+	if (!mod_sofia_globals.presence_year || callsequence.value >= SOFIA_PRESENCE_ROLLOVER_YEAR) {
 		struct tm tm;
 		switch_mutex_lock(mod_sofia_globals.mutex);
 		tm = *(localtime(&now));
@@ -2127,7 +2125,7 @@ static uint32_t check_presence_epoch(void)
 		if (tm.tm_year != mod_sofia_globals.presence_year) {
 			mod_sofia_globals.presence_epoch = (uint32_t)now - (tm.tm_yday * 86400) - (tm.tm_hour * 60 * 60) - (tm.tm_min * 60) - tm.tm_sec;
 			mod_sofia_globals.presence_year = tm.tm_year;
-			callsequence = (uint32_t)(((uint32_t)now - mod_sofia_globals.presence_epoch) * SOFIA_PRESENCE_COLLISION_DELTA);
+			callsequence.value = (uint32_t)(((uint32_t)now - mod_sofia_globals.presence_epoch) * SOFIA_PRESENCE_COLLISION_DELTA);
 		}
 
 		switch_mutex_unlock(mod_sofia_globals.mutex);
@@ -2138,17 +2136,17 @@ static uint32_t check_presence_epoch(void)
 
 uint32_t sofia_presence_get_cseq(sofia_profile_t *profile)
 {
-	uint32_t callsequence;
+	switch_uint31_t callsequence;
 	int diff = 0;
 
 	switch_mutex_lock(profile->ireg_mutex);
 
 	callsequence = check_presence_epoch();
 
-	if (profile->last_cseq) {
-		diff = callsequence - profile->last_cseq;
+	if (profile->last_cseq.value) {
+		diff = (int)callsequence.value - (int)profile->last_cseq.value;
 		if (diff <= 0 && diff > -100000) {
-			callsequence = ++profile->last_cseq;
+			callsequence.value = ++profile->last_cseq.value;
 		}
 	}
 
@@ -2156,8 +2154,7 @@ uint32_t sofia_presence_get_cseq(sofia_profile_t *profile)
 
 	switch_mutex_unlock(profile->ireg_mutex);
 
-	return callsequence;
-
+	return (uint32_t)callsequence.value;
 }
 
 
diff --git a/src/mod/endpoints/mod_sofia/test/sipp-based-tests.c b/src/mod/endpoints/mod_sofia/test/sipp-based-tests.c
index 60a7b61a3a..7b2d7964c9 100644
--- a/src/mod/endpoints/mod_sofia/test/sipp-based-tests.c
+++ b/src/mod/endpoints/mod_sofia/test/sipp-based-tests.c
@@ -90,7 +90,7 @@ static const char *test_wait_for_chan_var(switch_channel_t *channel, const char
 	return var;
 }
 
-static switch_bool_t has_ipv6() 
+static switch_bool_t has_ipv6(void)
 {
 	switch_stream_handle_t stream = { 0 };
 	SWITCH_STANDARD_STREAM(stream);
@@ -110,7 +110,7 @@ static switch_bool_t has_ipv6()
 	return SWITCH_TRUE;
 }
 
-static void register_gw()
+static void register_gw(void)
 {
 	switch_stream_handle_t stream = { 0 };
 	SWITCH_STANDARD_STREAM(stream);
@@ -118,7 +118,7 @@ static void register_gw()
 	switch_safe_free(stream.data);
 }
 
-static void unregister_gw()
+static void unregister_gw(void)
 {
 	switch_stream_handle_t stream = { 0 };
 	SWITCH_STANDARD_STREAM(stream);
diff --git a/src/mod/endpoints/mod_unicall/Makefile.am b/src/mod/endpoints/mod_unicall/Makefile.am
deleted file mode 100644
index 1fcfc78b5b..0000000000
--- a/src/mod/endpoints/mod_unicall/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_unicall
-
-mod_LTLIBRARIES = mod_unicall.la
-mod_unicall_la_SOURCES  = mod_unicall.c
-mod_unicall_la_CFLAGS   = $(AM_CFLAGS)
-mod_unicall_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_unicall_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/endpoints/mod_unicall/mod_unicall.c b/src/mod/endpoints/mod_unicall/mod_unicall.c
deleted file mode 100644
index ee4d65e9ef..0000000000
--- a/src/mod/endpoints/mod_unicall/mod_unicall.c
+++ /dev/null
@@ -1,1900 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005/2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- * Steve Underwood 0.0.1 <steveu@coppice.org>
- *
- *
- * mod_unicall.c -- UniCall endpoint module
- *
- */
-
-/* This is a work in progress. Unfinished. Non-functional */
-
-#include <switch.h>
-#include <unicall.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_unicall_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_unicall_shutdown);
-//SWITCH_MODULE_RUNTIME_FUNCTION(mod_unicall_runtime);
-SWITCH_MODULE_DEFINITION(mod_unicall, mod_unicall_load, mod_unicall_shutdown, NULL);	//mod_unicall_runtime);
-
-#define MAX_SPANS 128
-
-switch_endpoint_interface_t *unicall_endpoint_interface;
-static switch_memory_pool_t *module_pool = NULL;
-static volatile int running = 1;
-
-typedef struct {
-	int span;
-	const char *id;
-	const char *protocol_class;
-	const char *protocol_variant;
-	int protocol_end;
-	int outgoing_ok;
-	char *dialplan;
-	char *context;
-	int fd;
-	uc_t *uc;
-} span_data_t;
-
-span_data_t *span_data[MAX_SPANS];
-
-typedef enum {
-	TFLAG_IO = (1 << 0),
-	TFLAG_INBOUND = (1 << 1),
-	TFLAG_OUTBOUND = (1 << 2),
-	TFLAG_DTMF = (1 << 3),
-	TFLAG_VOICE = (1 << 4),
-	TFLAG_HANGUP = (1 << 5),
-	TFLAG_LINEAR = (1 << 6),
-	TFLAG_CODEC = (1 << 7),
-	TFLAG_BREAK = (1 << 8)
-} TFLAGS;
-
-typedef enum {
-	GFLAG_MY_CODEC_PREFS = (1 << 0)
-} GFLAGS;
-
-
-static struct {
-	int debug;
-	/*! Requested frame duration, in ms */
-	uint32_t frame_duration;
-	int dtmf_on;
-	int dtmf_off;
-	int suppress_dtmf_tone;
-	int ignore_dtmf_tone;
-	char *dialplan;
-	char *codec_string;
-	char *codec_order[SWITCH_MAX_CODECS];
-	int codec_order_last;
-	char *codec_rates_string;
-	char *codec_rates[SWITCH_MAX_CODECS];
-	int codec_rates_last;
-	unsigned int flags;
-	int calls;
-	int configured_spans;
-	switch_hash_t *call_hash;
-	switch_mutex_t *mutex;
-	switch_mutex_t *hash_mutex;
-	switch_mutex_t *channel_mutex;
-} globals;
-
-typedef struct {
-	unsigned int flags;
-	switch_codec_t read_codec;
-	switch_codec_t write_codec;
-	switch_frame_t read_frame;
-	uint8_t databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	switch_core_session_t *session;
-	switch_caller_profile_t *caller_profile;
-	switch_mutex_t *mutex;
-	switch_mutex_t *flag_mutex;
-	//switch_thread_cond_t *cond;
-	uc_t *uc;
-} private_t;
-
-
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
-
-
-
-static switch_status_t unicall_on_init(switch_core_session_t *session);
-static switch_status_t unicall_on_routing(switch_core_session_t *session);
-static switch_status_t unicall_on_execute(switch_core_session_t *session);
-static switch_status_t unicall_on_hangup(switch_core_session_t *session);
-static switch_status_t unicall_on_exchange_media(switch_core_session_t *session);
-static switch_status_t unicall_on_soft_execute(switch_core_session_t *session);
-
-static switch_call_cause_t unicall_outgoing_channel(switch_core_session_t *session,
-													switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session,
-													switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause);
-static switch_status_t unicall_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t unicall_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t unicall_kill_channel(switch_core_session_t *session, int sig);
-static switch_status_t unicall_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf);
-static switch_status_t unicall_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg);
-static switch_status_t unicall_receive_event(switch_core_session_t *session, switch_event_t *event);
-
-static void unicall_message(int level, const char *s)
-{
-	int switch_level;
-
-	switch (level) {
-	case UC_LOG_NONE:
-		switch_level = SWITCH_LOG_CRIT;
-		break;
-	case UC_LOG_ERROR:
-		switch_level = SWITCH_LOG_ERROR;
-		break;
-	case UC_LOG_WARNING:
-		switch_level = SWITCH_LOG_WARNING;
-		break;
-	case UC_LOG_PROTOCOL_ERROR:
-		switch_level = SWITCH_LOG_ERROR;
-		break;
-	case UC_LOG_PROTOCOL_WARNING:
-		switch_level = SWITCH_LOG_WARNING;
-		break;
-	case UC_LOG_INFO:
-		switch_level = SWITCH_LOG_NOTICE;
-		//switch_level = SWITCH_LOG_NOTICE;
-		break;
-	case UC_LOG_FLOW:
-	case UC_LOG_FLOW_2:
-	case UC_LOG_FLOW_3:
-	case UC_LOG_CAS:
-	case UC_LOG_TONE:
-	case UC_LOG_DEBUG_1:
-	case UC_LOG_DEBUG_2:
-	case UC_LOG_DEBUG_3:
-		switch_level = SWITCH_LOG_DEBUG;
-		break;
-	default:
-		switch_level = SWITCH_LOG_CRIT;
-		break;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, switch_level, s);
-}
-
-static void unicall_report(const char *s)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, s);
-}
-
-#if 0
-static switch_call_cause_t unicall_incoming_channel(zap_sigmsg_t *sigmsg, switch_core_session_t **sp)
-{
-	switch_core_session_t *session = NULL;
-	private_t *tech_pvt = NULL;
-	switch_channel_t *channel = NULL;
-	char name[128];
-
-	*sp = NULL;
-
-	if (!(session = switch_core_session_request_uuid(freetdm_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL, switch_event_get_header(var_event, "origination_uuid")))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Initialization Error!\n");
-		return ZAP_FAIL;
-	}
-
-	switch_core_session_add_stream(session, NULL);
-
-	tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t));
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	if (tech_init(tech_pvt, session, sigmsg->channel) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Initialization Error!\n");
-		switch_core_session_destroy(&session);
-		return ZAP_FAIL;
-	}
-
-	*sigmsg->channel->caller_data.collected = '\0';
-
-	if (sigmsg->channel->caller_data.cid_name[0] == '\0')
-		switch_set_string(sigmsg->channel->caller_data.cid_name, sigmsg->channel->chan_name);
-
-	if (sigmsg->channel->caller_data.cid_num.digits[0] == '\0') {
-		if (sigmsg->channel->caller_data.ani.digits[0] != '\0')
-			switch_set_string(sigmsg->channel->caller_data.cid_num.digits, sigmsg->channel->caller_data.ani.digits);
-		else
-			switch_set_string(sigmsg->channel->caller_data.cid_num.digits, sigmsg->channel->chan_number);
-	}
-
-	tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
-														 "UniCall",
-														 SPAN_CONFIG[sigmsg->channel->span_id].dialplan,
-														 sigmsg->channel->caller_data.cid_name,
-														 sigmsg->channel->caller_data.cid_num.digits,
-														 NULL,
-														 sigmsg->channel->caller_data.ani.digits,
-														 sigmsg->channel->caller_data.aniII,
-														 sigmsg->channel->caller_data.rdnis.digits,
-														 (char *) modname,
-														 SPAN_CONFIG[sigmsg->channel->span_id].context, sigmsg->channel->caller_data.dnis.digits);
-	assert(tech_pvt->caller_profile != NULL);
-
-	if (sigmsg->channel->caller_data.screen == 1 || sigmsg->channel->caller_data.screen == 3)
-		switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_SCREEN);
-
-	if (sigmsg->channel->caller_data.pres)
-		switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER);
-
-	snprintf(name, sizeof(name), "UNICALL/%u:%u/%s", sigmsg->channel->span_id, sigmsg->channel->chan_id, tech_pvt->caller_profile->destination_number);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connect inbound channel %s\n", name);
-	switch_channel_set_name(channel, name);
-	switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
-
-	switch_channel_set_state(channel, CS_INIT);
-	if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Error spawning thread\n");
-		switch_core_session_destroy(&session);
-		return ZAP_FAIL;
-	}
-
-	if (zap_channel_add_token(sigmsg->channel, switch_core_session_get_uuid(session), 0) != ZAP_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Error adding token\n");
-		switch_core_session_destroy(&session);
-		return ZAP_FAIL;
-	}
-	*sp = session;
-
-	return ZAP_SUCCESS;
-}
-#endif
-
-static void on_devicefail(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	//switch_channel_t *channel;
-	//private_t *tech_pvt;
-
-	//tech_pvt = switch_core_session_get_private(session);
-	//assert(tech_pvt != NULL);
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_devicefail\n");
-}
-
-static void on_protocolfail(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	//switch_channel_t *channel;
-	//private_t *tech_pvt;
-
-	//tech_pvt = switch_core_session_get_private(session);
-	//assert(tech_pvt != NULL);
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_protocolfail\n");
-}
-
-static void on_sigchanstatus(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	//switch_channel_t *channel;
-	//private_t *tech_pvt;
-
-	//tech_pvt = switch_core_session_get_private(session);
-	//assert(tech_pvt != NULL);
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_sigchanstatus\n");
-}
-
-static void on_detected(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	//switch_channel_t *channel;
-	//private_t *tech_pvt;
-	//struct channel_map *chanmap;
-	//char name[128];
-
-	//tech_pvt = switch_core_session_get_private(session);
-	//assert(tech_pvt != NULL);
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_detected\n");
-	switch_mutex_lock(globals.channel_mutex);
-
-	//chanmap = spri->private_info;
-
-#if 0
-	if ((session = switch_core_session_locate(chanmap->map[e->offered.channel]))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "--Duplicate detected on channel s%dc%d (ignored)\n", spri->span, e->offered.channel);
-		switch_core_session_rwunlock(session);
-		switch_mutex_unlock(globals.channel_mutex);
-		return;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG,
-					  SWITCH_LOG_NOTICE,
-					  "-- Detected on channel s%dc%d (from %s to %s)\n",
-					  spri->span, e->offered.channel, e->offered.parms.originating_number, e->offered.parms.destination_number);
-
-	switch_mutex_unlock(chanmap->mutex);
-
-	//pri_proceeding(spri->pri, e->offered.call, e->offered.channel, 0);
-	//pri_acknowledge(spri->pri, e->offered.call, e->offered.channel, 0);
-
-	switch_mutex_unlock(chanmap->mutex);
-
-	if ((session = unicall_incoming_channel(sigmsg, &session))) {
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create new inbound channel!\n");
-	}
-#endif
-	switch_mutex_unlock(globals.channel_mutex);
-}
-
-static void on_offered(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	//switch_channel_t *channel;
-	//private_t *tech_pvt;
-	//struct channel_map *chanmap;
-	//char name[128];
-
-	//tech_pvt = switch_core_session_get_private(session);
-	//assert(tech_pvt != NULL);
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_offered\n");
-}
-
-static void on_requestmoreinfo(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_requestmoreinfo\n");
-}
-
-static void on_accepted(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_accepted\n");
-}
-
-static void on_callinfo(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_callinfo\n");
-}
-
-static void on_facility(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_facility\n");
-}
-
-static void on_dialednumber(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_dialednumber\n");
-}
-
-static void on_dialing(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_dialing\n");
-}
-
-static void on_sendmoreinfo(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_sendmoreinfo\n");
-}
-
-static void on_proceeding(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	//struct channel_map *chanmap;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_proceeding\n");
-
-#if 0
-	chanmap = spri->private_info;
-
-	if ((session = switch_core_session_locate(chanmap->map[e->proceeding.channel]))) {
-		switch_core_session_message_t *msg;
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "-- Proceeding on channel s%dc%d\n", spri->span, e->proceeding.channel);
-
-		channel = switch_core_session_get_channel(session);
-		assert(channel != NULL);
-
-		switch_core_session_pass_indication(session, SWITCH_MESSAGE_INDICATE_PROGRESS);
-		switch_channel_mark_pre_answered(channel);
-
-		switch_core_session_rwunlock(session);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG,
-						  SWITCH_LOG_NOTICE, "-- Proceeding on channel s%dc%d but it's not in use?\n", spri->span, e->proceeding.channel);
-	}
-#endif
-}
-
-static void on_alerting(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	//struct channel_map *chanmap;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_alerting\n");
-
-#if 0
-	chanmap = spri->private_info;
-
-	if ((session = switch_core_session_locate(chanmap->map[e->alerting.channel]))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "-- Ringing on channel s%dc%d\n", spri->span, e->alerting.channel);
-		channel = switch_core_session_get_channel(session);
-		assert(channel != NULL);
-
-		switch_core_session_pass_indication(session, SWITCH_MESSAGE_INDICATE_RINGING);
-		switch_channel_mark_ring_ready(channel);
-
-		switch_core_session_rwunlock(session);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "-- Ringing on channel s%dc%d %s but it's not in use?\n", spri->span, e->alerting.channel,
-						  chanmap->map[e->alerting.channel]);
-	}
-#endif
-}
-
-static void on_connected(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_connected\n");
-}
-
-static void on_answered(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_answered\n");
-}
-
-static void on_fardisconnected(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_fardisconnected\n");
-}
-
-static void on_dropcall(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_dropcall\n");
-}
-
-static void on_releasecall(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_releasecall\n");
-}
-
-static void on_farblocked(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	//switch_channel_t *channel;
-	//private_t *tech_pvt;
-
-	//tech_pvt = switch_core_session_get_private(session);
-	//assert(tech_pvt != NULL);
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_farblocked\n");
-}
-
-static void on_farunblocked(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	//switch_channel_t *channel;
-	//private_t *tech_pvt;
-
-	//tech_pvt = switch_core_session_get_private(session);
-	//assert(tech_pvt != NULL);
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_farunblocked\n");
-}
-
-static void on_localblocked(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	//switch_channel_t *channel;
-	//private_t *tech_pvt;
-
-	//tech_pvt = switch_core_session_get_private(session);
-	//assert(tech_pvt != NULL);
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_localblocked\n");
-}
-
-static void on_localunblocked(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	//switch_channel_t *channel;
-	//private_t *tech_pvt;
-
-	//tech_pvt = switch_core_session_get_private(session);
-	//assert(tech_pvt != NULL);
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_localunblocked\n");
-}
-
-static void on_alarm(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_alarm\n");
-}
-
-static void on_resetlinedev(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_resetlinedev\n");
-}
-
-static void on_l2frame(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_l2frame\n");
-}
-
-static void on_l2bufferfull(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_l2bufferfull\n");
-}
-
-static void on_l2nobuffer(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_l2nobuffer\n");
-}
-
-static void on_usrinfo(uc_t *uc, switch_core_session_t *session, uc_event_t *e)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "on_usrinfo\n");
-}
-
-static void handle_uc_event(uc_t *uc, void *user_data, uc_event_t *e)
-{
-	switch_core_session_t *session;
-
-	session = (switch_core_session_t *) user_data;
-	assert(session != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "event %s\n", uc_event_to_str(e->e));
-	switch (e->e) {
-	case UC_EVENT_DEVICEFAIL:
-		on_devicefail(uc, session, e);
-		break;
-	case UC_EVENT_PROTOCOLFAIL:
-		on_protocolfail(uc, session, e);
-		break;
-	case UC_EVENT_SIGCHANSTATUS:
-		on_sigchanstatus(uc, session, e);
-		break;
-	case UC_EVENT_DETECTED:
-		on_detected(uc, session, e);
-		break;
-	case UC_EVENT_OFFERED:
-		on_offered(uc, session, e);
-		break;
-	case UC_EVENT_REQUESTMOREINFO:
-		on_requestmoreinfo(uc, session, e);
-		break;
-	case UC_EVENT_ACCEPTED:
-		on_accepted(uc, session, e);
-		break;
-	case UC_EVENT_CALLINFO:
-		on_callinfo(uc, session, e);
-		break;
-	case UC_EVENT_FACILITY:
-		on_facility(uc, session, e);
-		break;
-	case UC_EVENT_DIALEDNUMBER:
-		on_dialednumber(uc, session, e);
-		break;
-	case UC_EVENT_DIALING:
-		on_dialing(uc, session, e);
-		break;
-	case UC_EVENT_SENDMOREINFO:
-		on_sendmoreinfo(uc, session, e);
-		break;
-	case UC_EVENT_PROCEEDING:
-		on_proceeding(uc, session, e);
-		break;
-	case UC_EVENT_ALERTING:
-		on_alerting(uc, session, e);
-		break;
-	case UC_EVENT_CONNECTED:
-		on_connected(uc, session, e);
-		break;
-	case UC_EVENT_ANSWERED:
-		on_answered(uc, session, e);
-		break;
-	case UC_EVENT_FARDISCONNECTED:
-		on_fardisconnected(uc, session, e);
-		break;
-	case UC_EVENT_DROPCALL:
-		on_dropcall(uc, session, e);
-		break;
-	case UC_EVENT_RELEASECALL:
-		on_releasecall(uc, session, e);
-		break;
-	case UC_EVENT_FARBLOCKED:
-		on_farblocked(uc, session, e);
-		break;
-	case UC_EVENT_FARUNBLOCKED:
-		on_farunblocked(uc, session, e);
-		break;
-	case UC_EVENT_LOCALBLOCKED:
-		on_localblocked(uc, session, e);
-		break;
-	case UC_EVENT_LOCALUNBLOCKED:
-		on_localunblocked(uc, session, e);
-		break;
-	case UC_EVENT_ALARM:
-		on_alarm(uc, session, e);
-		break;
-	case UC_EVENT_RESETLINEDEV:
-		on_resetlinedev(uc, session, e);
-		break;
-	case UC_EVENT_L2FRAME:
-		on_l2frame(uc, session, e);
-		break;
-	case UC_EVENT_L2BUFFERFULL:
-		on_l2bufferfull(uc, session, e);
-		break;
-	case UC_EVENT_L2NOBUFFER:
-		on_l2nobuffer(uc, session, e);
-		break;
-	case UC_EVENT_USRINFO:
-		on_usrinfo(uc, session, e);
-		break;
-	default:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unknown unicall event %d\n", e->e);
-		break;
-	}
-}
-
-static void tech_init(private_t *tech_pvt, switch_core_session_t *session)
-{
-	tech_pvt->read_frame.data = tech_pvt->databuf;
-	tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
-	switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-	switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-	switch_core_session_set_private(session, tech_pvt);
-	tech_pvt->session = session;
-}
-
-/*
-   State methods. They get called when the state changes to the specified state.
-   Returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next,
-   so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
-*/
-static switch_status_t unicall_on_init(switch_core_session_t *session)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_on_init(%p)\n", (void *) session);
-
-	switch_set_flag_locked(tech_pvt, TFLAG_IO);
-
-	switch_mutex_lock(globals.mutex);
-	globals.calls++;
-	switch_mutex_unlock(globals.mutex);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unicall_on_routing(switch_core_session_t *session)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_on_routing(%p)\n", (void *) session);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s channel routing\n", switch_channel_get_name(channel));
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unicall_on_execute(switch_core_session_t *session)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_on_execute(%p)\n", (void *) session);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s channel execute\n", switch_channel_get_name(channel));
-
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unicall_on_destroy(switch_core_session_t *session)
-{
-	//switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	//channel = switch_core_session_get_channel(session);
-	//assert(channel != NULL);
-
-	tech_pvt = switch_core_session_get_private(session);
-
-	if (tech_pvt) {
-		if (switch_core_codec_ready(&tech_pvt->read_codec))
-			switch_core_codec_destroy(&tech_pvt->read_codec);
-		if (switch_core_codec_ready(&tech_pvt->write_codec))
-			switch_core_codec_destroy(&tech_pvt->write_codec);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t unicall_on_hangup(switch_core_session_t *session)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_on_hangup(%p)\n", (void *) session);
-
-	switch_clear_flag_locked(tech_pvt, TFLAG_IO);
-	switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
-	//switch_thread_cond_signal(tech_pvt->cond);
-
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s channel hangup\n", switch_channel_get_name(channel));
-
-#if 0
-	if ((ret = uc_call_control(uc, UC_OP_DROPCALL, crn, (void *) (intptr_t) switch_channel_get_cause(channel))) < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Drop call failed - %s\n", uc_ret_to_str(ret));
-		return SWITCH_STATUS_FAILED;
-	}
-	/*endif */
-#endif
-
-	switch_mutex_lock(globals.mutex);
-	if (--globals.calls < 0)
-		globals.calls = 0;
-	switch_mutex_unlock(globals.mutex);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unicall_kill_channel(switch_core_session_t *session, int sig)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_kill_channel(%p, %d)\n", (void *) session, sig);
-
-	switch (sig) {
-	case SWITCH_SIG_KILL:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_kill_channel(%p, %d) SIG_KILL\n", (void *) session, sig);
-		switch_clear_flag_locked(tech_pvt, TFLAG_IO);
-		switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
-		switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-		//switch_thread_cond_signal(tech_pvt->cond);
-		break;
-	case SWITCH_SIG_BREAK:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_kill_channel(%p, %d) SIG_BREAK\n", (void *) session, sig);
-		switch_set_flag_locked(tech_pvt, TFLAG_BREAK);
-		break;
-	default:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_kill_channel(%p, %d) DEFAULT\n", (void *) session, sig);
-		break;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unicall_on_exchange_media(switch_core_session_t *session)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_on_exchange_media(%p)\n", (void *) session);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unicall_on_soft_execute(switch_core_session_t *session)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_on_soft_execute(%p)\n", (void *) session);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unicall_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
-{
-	private_t *tech_pvt = switch_core_session_get_private(session);
-	switch_assert(tech_pvt != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_send_dtmf(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unicall_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-	//switch_time_t started = switch_time_now();
-	//unsigned int elapsed;
-	switch_byte_t *data;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_read_frame(%p)\n", (void *) session);
-
-	tech_pvt->read_frame.flags = SFF_NONE;
-	*frame = NULL;
-
-	while (switch_test_flag(tech_pvt, TFLAG_IO)) {
-		if (switch_test_flag(tech_pvt, TFLAG_BREAK)) {
-			switch_clear_flag(tech_pvt, TFLAG_BREAK);
-			data = (switch_byte_t *) tech_pvt->read_frame.data;
-			data[0] = 65;
-			data[1] = 0;
-			tech_pvt->read_frame.datalen = 2;
-			tech_pvt->read_frame.flags = SFF_CNG;
-			*frame = &tech_pvt->read_frame;
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		if (!switch_test_flag(tech_pvt, TFLAG_IO))
-			return SWITCH_STATUS_FALSE;
-
-		if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) {
-			switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
-			if (!tech_pvt->read_frame.datalen)
-				continue;
-			*frame = &tech_pvt->read_frame;
-#if SWITCH_BYTE_ORDER == __BIG_ENDIAN
-			if (switch_test_flag(tech_pvt, TFLAG_LINEAR))
-				switch_swap_linear((*frame)->data, (int) (*frame)->datalen / 2);
-#endif
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		switch_cond_next();
-	}
-
-	return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t unicall_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
-{
-	switch_channel_t *channel = NULL;
-	private_t *tech_pvt = NULL;
-	//switch_frame_t *pframe;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_write_frame(%p)\n", (void *) session);
-
-	if (!switch_test_flag(tech_pvt, TFLAG_IO))
-		return SWITCH_STATUS_FALSE;
-#if SWITCH_BYTE_ORDER == __BIG_ENDIAN
-	if (switch_test_flag(tech_pvt, TFLAG_LINEAR))
-		switch_swap_linear(frame->data, (int) frame->datalen / sizeof(int16_t));
-#endif
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t redirect_audio(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "redirect_audio(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t transmit_text(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "transmit_text(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t answer(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "answer(%p)\n", (void *) session);
-
-#if 0
-	if ((ret = uc_call_control(uc, UC_OP_ANSWERCALL, crn, NULL)) < 0) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Answer call failed - %s\n", uc_ret_to_str(ret));
-		return SWITCH_STATUS_FAILED;
-	}
-	/*endif */
-#endif
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t progress(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "progress(%p)\n", (void *) session);
-
-#if 0
-	if ((ret = uc_call_control(uc, UC_OP_ACCEPTCALL, crn, NULL)) < 0) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Accept call failed - %s\n", uc_ret_to_str(ret));
-		return SWITCH_STATUS_FAILED;
-	}
-	/*endif */
-#endif
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t bridge(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "bridge(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unbridge(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unbridge(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t transfer(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "transfer(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t ringing(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "ringing(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t media(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "media(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t nomedia(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "nomedia(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t hold(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "hold(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unhold(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unhold(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t redirect(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "redirect(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t respond(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "respond(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t broadcast(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "broadcast(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t media_redirect(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "media_redirect(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t deflect(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "deflect(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t video_refresh_req(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "video_refresh_req(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t display(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch_channel_t *channel;
-	private_t *tech_pvt;
-	uc_t *uc;
-
-	channel = switch_core_session_get_channel(session);
-	assert(channel != NULL);
-	tech_pvt = switch_core_session_get_private(session);
-	assert(tech_pvt != NULL);
-	uc = tech_pvt->uc;
-	assert(uc != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "display(%p)\n", (void *) session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unicall_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-	switch (msg->message_id) {
-	case SWITCH_MESSAGE_REDIRECT_AUDIO:
-		return redirect_audio(session, msg);
-	case SWITCH_MESSAGE_TRANSMIT_TEXT:
-		return transmit_text(session, msg);
-	case SWITCH_MESSAGE_INDICATE_ANSWER:
-		return answer(session, msg);
-	case SWITCH_MESSAGE_INDICATE_PROGRESS:
-		return progress(session, msg);
-	case SWITCH_MESSAGE_INDICATE_BRIDGE:
-		return bridge(session, msg);
-	case SWITCH_MESSAGE_INDICATE_UNBRIDGE:
-		return unbridge(session, msg);
-	case SWITCH_MESSAGE_INDICATE_TRANSFER:
-		return transfer(session, msg);
-	case SWITCH_MESSAGE_INDICATE_RINGING:
-		return ringing(session, msg);
-	case SWITCH_MESSAGE_INDICATE_MEDIA:
-		return media(session, msg);
-	case SWITCH_MESSAGE_INDICATE_NOMEDIA:
-		return nomedia(session, msg);
-	case SWITCH_MESSAGE_INDICATE_HOLD:
-		return hold(session, msg);
-	case SWITCH_MESSAGE_INDICATE_UNHOLD:
-		return unhold(session, msg);
-	case SWITCH_MESSAGE_INDICATE_REDIRECT:
-		return redirect(session, msg);
-	case SWITCH_MESSAGE_INDICATE_RESPOND:
-		return respond(session, msg);
-	case SWITCH_MESSAGE_INDICATE_BROADCAST:
-		return broadcast(session, msg);
-	case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT:
-		return media_redirect(session, msg);
-	case SWITCH_MESSAGE_INDICATE_DEFLECT:
-		return deflect(session, msg);
-	case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ:
-		return video_refresh_req(session, msg);
-	case SWITCH_MESSAGE_INDICATE_DISPLAY:
-		return display(session, msg);
-	default:
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unicall_receive_message(%p) %d\n", (void *) session, msg->message_id);
-		break;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
-   that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
-*/
-static switch_call_cause_t unicall_outgoing_channel(switch_core_session_t *session,
-													switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session,
-													switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause)
-{
-	private_t *tech_pvt;
-	switch_channel_t *channel;
-	switch_caller_profile_t *caller_profile;
-	uc_t *uc;
-	uc_makecall_t makecall;
-	uc_callparms_t *callparms;
-	int screen;
-	int hide;
-	char name[128];
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unicall_outgoing_channel(%p)\n", (void *) session);
-
-	if ((*new_session = switch_core_session_request(unicall_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool)) == NULL) {
-		return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-	}
-
-	switch_core_session_add_stream(*new_session, NULL);
-	if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
-		switch_core_session_destroy(new_session);
-		return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-	}
-	channel = switch_core_session_get_channel(*new_session);
-	tech_init(tech_pvt, *new_session);
-
-	if (outbound_profile == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Doh! no caller profile\n");
-		switch_core_session_destroy(new_session);
-		return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-	}
-	snprintf(name, sizeof(name), "UNICALL/%s", outbound_profile->destination_number);
-	switch_channel_set_name(channel, name);
-
-	caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
-	switch_channel_set_caller_profile(channel, caller_profile);
-	tech_pvt->caller_profile = caller_profile;
-
-	uc = tech_pvt->uc;
-
-	if ((callparms = uc_new_callparms(NULL)) == NULL)
-		return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-
-	//uc_callparm_bear_cap_transfer_cap(callparms, cap);
-	//uc_callparm_bear_cap_transfer_mode(callparms, mode);
-	//uc_callparm_bear_cap_transfer_rate(callparms, rate);
-	//uc_callparm_userinfo_layer1_protocol(callparms, prot);
-	//uc_callparm_user_rate(callparms, rate);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "destination '%s'\n", outbound_profile->destination_number);
-	uc_callparm_set_destination_number(callparms, outbound_profile->destination_number);
-	uc_callparm_set_destination_ton(callparms, outbound_profile->destination_number_ton);
-	uc_callparm_set_destination_npi(callparms, outbound_profile->destination_number_numplan);
-	//uc_callparm_set_destination_sub_addr_number(callparms, num);
-	//uc_callparm_set_destination_sub_addr_ton(callparms, ton);
-	//uc_callparm_set_destination_sub_addr_npi(callparms, npi);
-
-	//uc_callparm_set_redirecting_cause(callparms, cause);
-	//uc_callparm_set_redirecting_presentation(callparms, pres);
-	uc_callparm_set_redirecting_number(callparms, outbound_profile->rdnis);
-	uc_callparm_set_redirecting_ton(callparms, outbound_profile->rdnis_ton);
-	uc_callparm_set_redirecting_npi(callparms, outbound_profile->rdnis_numplan);
-	//uc_callparm_set_redirecting_subaddr(callparms, num);
-	//uc_callparm_set_redirecting_subaddr_ton(callparms, ton);
-	//uc_callparm_set_redirecting_subaddr_npi(callparms, npi);
-
-	//uc_callparm_set_original_called_number(callparms, num);
-	//uc_callparm_set_original_called_number_ton(callparms, ton);
-	//uc_callparm_set_original_called_number_npi(callparms, npi);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "caller id name '%s'\n", outbound_profile->caller_id_name);
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "caller id number '%s'\n", outbound_profile->caller_id_number);
-	uc_callparm_set_originating_name(callparms, outbound_profile->caller_id_name);
-	uc_callparm_set_originating_number(callparms, outbound_profile->caller_id_number);
-	screen = switch_test_flag(outbound_profile, SWITCH_CPF_SCREEN);
-	hide = switch_test_flag(outbound_profile, SWITCH_CPF_HIDE_NUMBER);
-	if (!screen && !hide)
-		uc_callparm_set_originating_presentation(callparms, UC_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED);
-	else if (!screen && hide)
-		uc_callparm_set_originating_presentation(callparms, UC_PRES_PROHIB_USER_NUMBER_NOT_SCREENED);
-	else if (screen && !hide)
-		uc_callparm_set_originating_presentation(callparms, UC_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN);
-	else
-		uc_callparm_set_originating_presentation(callparms, UC_PRES_PROHIB_USER_NUMBER_PASSED_SCREEN);
-	uc_callparm_set_originating_ton(callparms, outbound_profile->caller_ton);
-	uc_callparm_set_originating_npi(callparms, outbound_profile->caller_numplan);
-	//uc_callparm_set_originating_sub_addr_number(callparms, num);
-	//uc_callparm_set_originating_sub_addr_ton(callparms, ton);
-	//uc_callparm_set_originating_sub_addr_npi(callparms, npi);
-
-	uc_callparm_set_calling_party_category(callparms, UC_CALLER_CATEGORY_NATIONAL_SUBSCRIBER_CALL);
-
-	makecall.callparms = callparms;
-	makecall.call = NULL;
-
-#if 0
-	if ((ret = uc_call_control(uc, UC_OP_MAKECALL, 0, (void *) &makecall)) < 0) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "Make call failed - %s\n", uc_ret_to_str(ret));
-		return SWITCH_STATUS_FAILED;
-	}
-	/*endif */
-#endif
-	free(callparms);
-
-
-	switch_channel_set_state(channel, CS_INIT);
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "unicall_outgoing_channel(%p) SUCCESS\n", (void *) session);
-	return SWITCH_CAUSE_SUCCESS;
-}
-
-static switch_status_t unicall_receive_event(switch_core_session_t *session, switch_event_t *event)
-{
-	struct private_object *tech_pvt = switch_core_session_get_private(session);
-	char *body = switch_event_get_body(event);
-
-	switch_assert(tech_pvt != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unicall_receive_event(%p)\n", (void *) session);
-
-	if (body == NULL)
-		body = "";
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static void *SWITCH_THREAD_FUNC unicall_thread_run(switch_thread_t *thread, void *obj)
-{
-	fd_set read;
-	fd_set write;
-	fd_set oob;
-	int fd;
-	int ret;
-	switch_event_t *s_event;
-	uc_t *uc = (uc_t *) obj;
-
-#if 0
-	switch_mutex_init(&chanmap.mutex, SWITCH_MUTEX_NESTED, module_pool);
-#endif
-
-	if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_uc._tcp");
-		switch_event_fire(&s_event);
-	}
-
-	uc_get_device_handle(uc, 0, &fd);
-	if ((ret = uc_call_control(uc, UC_OP_UNBLOCK, 0, (void *) (intptr_t) - 1)) < 0)
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Unblock failed - %s\n", uc_ret_to_str(ret));
-	/*endif */
-	FD_ZERO(&read);
-	FD_ZERO(&write);
-	FD_ZERO(&oob);
-	for (;;) {
-		FD_SET(fd, &read);
-		//FD_SET(fd, &write);
-		//FD_SET(fd, &oob);
-
-		if (select(fd + 1, &read, NULL, NULL, NULL)) {
-			if (FD_ISSET(fd, &read)) {
-				uc_check_event(uc);
-				uc_schedule_run(uc);
-			}
-		}
-	}
-
-	uc_delete(uc);
-	return NULL;
-}
-
-static void unicall_thread_launch(uc_t *uc)
-{
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-
-	switch_threadattr_create(&thd_attr, module_pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&thread, thd_attr, unicall_thread_run, uc, module_pool);
-}
-
-switch_state_handler_table_t unicall_state_handlers = {
-	/*.on_init */ unicall_on_init,
-	/*.on_routing */ unicall_on_routing,
-	/*.on_execute */ unicall_on_execute,
-	/*.on_hangup */ unicall_on_hangup,
-	/*.on_exchange_media */ unicall_on_exchange_media,
-	/*.on_soft_execute */ unicall_on_soft_execute,
-	/*.on_consume_media */ NULL,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ NULL,
-	/*.on_destroy */ unicall_on_destroy
-};
-
-switch_io_routines_t unicall_io_routines = {
-	/*.outgoing_channel */ unicall_outgoing_channel,
-	/*.read_frame */ unicall_read_frame,
-	/*.write_frame */ unicall_write_frame,
-	/*.kill_channel */ unicall_kill_channel,
-	/*.send_dtmf */ unicall_send_dtmf,
-	/*.receive_message */ unicall_receive_message,
-	/*.receive_event */ unicall_receive_event
-};
-
-static switch_status_t config_unicall(int reload)
-{
-	const char *cf = "unicall.conf";
-	switch_xml_t cfg;
-	switch_xml_t xml;
-	switch_xml_t settings;
-	switch_xml_t param;
-	switch_xml_t spans;
-	switch_xml_t span;
-	int current_span = 0;
-	int min_span = 0;
-	int max_span = 0;
-	int logging_level;
-	int i;
-	char *id;
-	span_data_t *sp;
-
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Opening of %s failed\n", cf);
-		return SWITCH_STATUS_TERM;
-	}
-
-	if ((settings = switch_xml_child(cfg, "settings"))) {
-		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!strcmp(var, "debug")) {
-				globals.debug = atoi(val);
-			} else if (!strcmp(var, "ms-per-frame")) {
-				globals.frame_duration = atoi(val);
-			} else if (!strcmp(var, "dtmf-on")) {
-				globals.dtmf_on = atoi(val);
-			} else if (!strcmp(var, "dtmf-off")) {
-				globals.dtmf_off = atoi(val);
-			} else if (!strcmp(var, "dialplan")) {
-				set_global_dialplan(val);
-			} else if (!strcmp(var, "suppress-dtmf-tone")) {
-				globals.suppress_dtmf_tone = switch_true(val);
-			} else if (!strcmp(var, "ignore-dtmf-tone")) {
-				globals.ignore_dtmf_tone = switch_true(val);
-			}
-		}
-	}
-	spans = switch_xml_child(cfg, "spans");
-	id = NULL;
-	for (span = switch_xml_child(spans, "span"); span; span = span->next) {
-		id = (char *) switch_xml_attr(span, "id");
-
-		current_span = 0;
-
-		if (id) {
-			char *p;
-
-			min_span = atoi(id);
-			if ((p = strchr(id, '-'))) {
-				p++;
-				max_span = atoi(p);
-			} else {
-				max_span = min_span;
-			}
-			if (min_span < 1 || max_span < min_span) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid Span Config! [%s]\n", id);
-				continue;
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing SPAN ID!\n");
-			continue;
-		}
-		for (i = min_span; i <= max_span; i++) {
-			current_span = i;
-
-			if (current_span <= 0 || current_span >= MAX_SPANS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid SPAN %d!\n", current_span);
-				current_span = 0;
-				continue;
-			}
-			if (span_data[current_span] == NULL) {
-				if ((span_data[current_span] = switch_core_alloc(module_pool, sizeof(*span_data[current_span]))) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "MEMORY ERROR\n");
-					break;
-				}
-				sp = span_data[current_span];
-				memset(sp, 0, sizeof(*sp));
-				sp->span = current_span;
-				sp->protocol_class = NULL;
-				sp->protocol_variant = NULL;
-				sp->protocol_end = UC_MODE_CPE;
-				sp->outgoing_ok = TRUE;
-			}
-			sp = span_data[current_span];
-			sp->id = strdup(id);
-			for (param = switch_xml_child(span, "param"); param; param = param->next) {
-				char *var = (char *) switch_xml_attr_soft(param, "name");
-				char *val = (char *) switch_xml_attr_soft(param, "value");
-
-				if (strcmp(var, "protocol-class") == 0) {
-					sp->protocol_class = strdup(val);
-				} else if (strcmp(var, "protocol-variant") == 0) {
-					sp->protocol_variant = strdup(val);
-				} else if (strcmp(var, "protocol-end") == 0) {
-					if (strcasecmp(val, "co") == 0)
-						sp->protocol_end = UC_MODE_CO;
-					else if (strcasecmp(val, "cpe") == 0)
-						sp->protocol_end = UC_MODE_CPE;
-					else if (strcasecmp(val, "peer") == 0)
-						sp->protocol_end = UC_MODE_PEER;
-					else
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "UNKNOWN protocol-end TYPE %s\n", val);
-				} else if (strcmp(var, "outgoing-allowed") == 0) {
-					sp->outgoing_ok = switch_true(var);
-				} else if (strcmp(var, "dialplan") == 0) {
-					sp->dialplan = strdup(val);
-				} else if (strcmp(var, "context") == 0) {
-					sp->context = strdup(val);
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "UNKNOWN PARAMETER %s\n", var);
-				}
-			}
-		}
-	}
-	switch_xml_free(xml);
-
-	if (globals.dialplan == NULL)
-		set_global_dialplan("XML");
-
-	globals.configured_spans = 0;
-	for (current_span = 1; current_span < MAX_SPANS; current_span++) {
-		if (span_data[current_span]) {
-			sp = span_data[current_span];
-			if ((sp->uc = uc_create(sp->id, sp->protocol_class, sp->protocol_variant, sp->protocol_end, sp->outgoing_ok)) == NULL) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot launch span %d\n", current_span);
-				return SWITCH_STATUS_FALSE;
-			}
-			uc_get_device_handle(sp->uc, 0, &sp->fd);
-			uc_set_signaling_callback(sp->uc, handle_uc_event, (void *) (intptr_t) current_span);
-			logging_level = UC_LOG_SEVERITY_MASK | UC_LOG_SHOW_TAG | UC_LOG_SHOW_PROTOCOL;
-			uc_set_logging(sp->uc, logging_level, 1, sp->id);
-
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Launched span %d\n", current_span);
-			unicall_thread_launch(sp->uc);
-			switch_mutex_lock(globals.hash_mutex);
-			globals.configured_spans++;
-			switch_mutex_unlock(globals.hash_mutex);
-		}
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_unicall_load)
-{
-	int logging_level;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-	uc_start();
-	uc_set_error_handler(unicall_report);
-	uc_set_message_handler(unicall_message);
-	logging_level = UC_LOG_SEVERITY_MASK;
-	uc_set_logging(NULL, logging_level, 1, NULL);
-
-	memset(span_data, 0, sizeof(span_data));
-
-	module_pool = pool;
-
-	memset(&globals, 0, sizeof(globals));
-	switch_core_hash_init(&globals.call_hash);
-	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool);
-	switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, module_pool);
-	switch_mutex_init(&globals.channel_mutex, SWITCH_MUTEX_NESTED, module_pool);
-
-	if ((status = config_unicall(FALSE)) != SWITCH_STATUS_SUCCESS)
-		return status;
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	unicall_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-	unicall_endpoint_interface->interface_name = "unicall";
-	unicall_endpoint_interface->io_routines = &unicall_io_routines;
-	unicall_endpoint_interface->state_handler = &unicall_state_handlers;
-
-	/* Indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/*
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_unicall_runtime)
-{
-    return SWITCH_STATUS_TERM;
-}
-*/
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_unicall_shutdown)
-{
-	int x = 0;
-
-	for (x = 0, running = -1; running && x <= 100; x++)
-		switch_yield(20000);
-	uc_end();
-	return SWITCH_STATUS_SUCCESS;
-}
diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index e7defb99aa..36aba6db5e 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -43,7 +43,7 @@ SWITCH_MODULE_DEFINITION(mod_verto, mod_verto_load, mod_verto_shutdown, mod_vert
 #define HTTP_CHUNK_SIZE 1024 * 32
 #define EP_NAME "verto.rtc"
 //#define WSS_STANDALONE 1
-#include "ks.h"
+#include "libks/ks.h"
 
 #include <mod_verto.h>
 #ifndef WIN32
@@ -823,7 +823,6 @@ static void set_perm(const char *str, switch_event_t **event, switch_bool_t add)
 {
 	char delim = ',';
 	char *cur, *next;
-	int count = 0;
 	char *edup;
 
 	if (!zstr(str)) {
@@ -836,7 +835,7 @@ static void set_perm(const char *str, switch_event_t **event, switch_bool_t add)
 		switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS);
 	}
 	
-	if (!zstr(str)) {
+	if (!zstr(str) && event && *event) {
 		edup = strdup(str);
 		switch_assert(edup);
 
@@ -844,7 +843,7 @@ static void set_perm(const char *str, switch_event_t **event, switch_bool_t add)
 			delim = ' ';
 		}
 
-		for (cur = edup; cur; count++) {
+		for (cur = edup; cur;) {
 			if ((next = strchr(cur, delim))) {
 				*next++ = '\0';
 			}
@@ -1059,7 +1058,7 @@ static switch_bool_t check_auth(jsock_t *jsock, cJSON *params, int *code, char *
 			*code = CODE_AUTH_FAILED;
 			switch_snprintf(message, mlen, "Login Incorrect");
 			login_fire_custom_event(jsock, params, 0, "Login Incorrect");
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Login incorrect for user: %s domain: %s\n", id, domain ? domain : "N/A");
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Login incorrect for user: %s domain: %s\n", id, domain);
 		} else {
 			switch_xml_t x_param, x_params;
 			const char *use_passwd = NULL, *verto_context = NULL, *verto_dialplan = NULL;
@@ -1321,7 +1320,7 @@ static void tech_reattach(verto_pvt_t *tech_pvt, jsock_t *jsock)
 	switch_channel_set_flag(tech_pvt->channel, CF_REATTACHED);
 	switch_channel_set_flag(tech_pvt->channel, CF_REINVITE);
 	switch_channel_set_flag(tech_pvt->channel, CF_RECOVERING);
-	switch_core_media_gen_local_sdp(tech_pvt->session, SDP_TYPE_REQUEST, NULL, 0, NULL, 0);
+	switch_core_media_gen_local_sdp(tech_pvt->session, SDP_OFFER, NULL, 0, NULL, 0);
 	switch_channel_clear_flag(tech_pvt->channel, CF_REINVITE);
 	switch_channel_clear_flag(tech_pvt->channel, CF_RECOVERING);
 	switch_core_session_request_video_refresh(tech_pvt->session);
@@ -1894,10 +1893,12 @@ authed:
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
 								  "%d request [%s] matched expr [%s]\n", proceed, request->uri, expression);
 				request->uri = rule->value;
+				switch_regex_safe_free(re);
 				break;
 			}
 
 			rule = rule->next;
+			switch_regex_safe_free(re);
 		}
 	}
 
@@ -2406,7 +2407,7 @@ static switch_status_t verto_connect(switch_core_session_t *session, const char
 				}
 			}
 
-			switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, NULL, 0, NULL, 0);
+			switch_core_media_gen_local_sdp(session, SDP_OFFER, NULL, 0, NULL, 0);
 		}
 
         msg = jrpc_new_req(method, tech_pvt->call_id, &params);
@@ -2642,7 +2643,7 @@ static switch_status_t verto_media(switch_core_session_t *session)
 	switch_core_media_prepare_codecs(tech_pvt->session, SWITCH_TRUE);
 
 	if (tech_pvt->r_sdp) {
-		if (verto_tech_media(tech_pvt, tech_pvt->r_sdp, SDP_TYPE_REQUEST) != SWITCH_STATUS_SUCCESS) {
+		if (verto_tech_media(tech_pvt, tech_pvt->r_sdp, SDP_OFFER) != SWITCH_STATUS_SUCCESS) {
 			switch_channel_set_variable(tech_pvt->channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR");
 			return SWITCH_STATUS_FALSE;
 		}
@@ -2654,7 +2655,7 @@ static switch_status_t verto_media(switch_core_session_t *session)
 		return status;
 	}
 
-	switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+	switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 
 	if (switch_core_media_activate_rtp(tech_pvt->session) != SWITCH_STATUS_SUCCESS) {
 		switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
@@ -2964,7 +2965,7 @@ static switch_bool_t verto__answer_func(const char *method, cJSON *params, jsock
 		switch_channel_set_variable(tech_pvt->channel, SWITCH_R_SDP_VARIABLE, sdp);
 		switch_channel_set_variable(tech_pvt->channel, "verto_client_address", jsock->name);
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote SDP %s:\n%s\n", switch_channel_get_name(tech_pvt->channel), sdp);
-		switch_core_media_set_sdp_codec_string(session, sdp, SDP_TYPE_RESPONSE);
+		switch_core_media_set_sdp_codec_string(session, sdp, SDP_ANSWER);
 
 		if (!switch_channel_var_true(switch_core_session_get_channel(session),"verto_skip_set_user")) {
 			switch_ivr_set_user(session, jsock->uid);
@@ -2979,7 +2980,7 @@ static switch_bool_t verto__answer_func(const char *method, cJSON *params, jsock
 		if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE)) {
 			pass_sdp(tech_pvt);
 		} else {
-			if (verto_tech_media(tech_pvt, tech_pvt->r_sdp, SDP_TYPE_RESPONSE) != SWITCH_STATUS_SUCCESS) {
+			if (verto_tech_media(tech_pvt, tech_pvt->r_sdp, SDP_ANSWER) != SWITCH_STATUS_SUCCESS) {
 				switch_channel_set_variable(tech_pvt->channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR");
 				cJSON_AddItemToObject(obj, "message", cJSON_CreateString("CODEC ERROR"));
 				err = 1;
@@ -3449,8 +3450,8 @@ static switch_bool_t verto__modify_func(const char *method, cJSON *params, jsock
 			//switch_channel_set_flag(tech_pvt->channel, CF_VIDEO_BREAK);
 			//switch_core_session_kill_channel(tech_pvt->session, SWITCH_SIG_BREAK);
 
-			if (switch_core_media_negotiate_sdp(tech_pvt->session, tech_pvt->r_sdp, &p, SDP_TYPE_REQUEST)) {
-				switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+			if (switch_core_media_negotiate_sdp(tech_pvt->session, tech_pvt->r_sdp, &p, SDP_OFFER)) {
+				switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 		
 				if (switch_core_media_activate_rtp(tech_pvt->session) != SWITCH_STATUS_SUCCESS) {
 					switch_channel_set_variable(tech_pvt->channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "MEDIA ERROR");
@@ -3607,8 +3608,8 @@ static switch_bool_t verto__attach_func(const char *method, cJSON *params, jsock
 	//switch_channel_set_flag(tech_pvt->channel, CF_VIDEO_BREAK);
 	//switch_core_session_kill_channel(tech_pvt->session, SWITCH_SIG_BREAK);
 
-	if (switch_core_media_negotiate_sdp(tech_pvt->session, tech_pvt->r_sdp, &p, SDP_TYPE_RESPONSE)) {
-		//switch_core_media_gen_local_sdp(session, SDP_TYPE_RESPONSE, NULL, 0, NULL, 0);
+	if (switch_core_media_negotiate_sdp(tech_pvt->session, tech_pvt->r_sdp, &p, SDP_ANSWER)) {
+		//switch_core_media_gen_local_sdp(session, SDP_ANSWER, NULL, 0, NULL, 0);
 		
 		if (switch_core_media_activate_rtp(tech_pvt->session) != SWITCH_STATUS_SUCCESS) {
 			switch_channel_set_variable(tech_pvt->channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "MEDIA ERROR");
@@ -3866,6 +3867,15 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
 		cJSON *i, *indialog =  cJSON_GetObjectItem(msg, "inDialog");
 		const char *body = cJSON_GetObjectCstr(msg, "body");
 		switch_bool_t is_dialog = indialog && (indialog->type == cJSON_True || (indialog->type == cJSON_String && switch_true(indialog->valuestring)));
+		const char *context = NULL;
+
+		switch_mutex_lock(jsock->flag_mutex);
+
+		if (!(context = switch_event_get_header(jsock->vars, "user_context"))) {
+			context = switch_either(jsock->context, jsock->profile->context);
+		}
+
+		switch_mutex_unlock(jsock->flag_mutex);
 
 		if (!zstr(to)) {
 			if (strchr(to, '+')) {
@@ -3902,6 +3912,8 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
 				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call_id", call_id);
 			}
 
+			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "context", context);
+
 			switch_event_add_body(event, "%s", body);
 
 			if (strcasecmp(proto, VERTO_CHAT_PROTO)) {
@@ -3954,7 +3966,7 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
 	cJSON *obj = cJSON_CreateObject(), *vobj = NULL, *dedEnc = NULL, *mirrorInput, *bandwidth = NULL, *canvas = NULL;
 	switch_core_session_t *session = NULL;
 	switch_channel_t *channel;
-	switch_event_t *var_event;
+	switch_event_t *var_event = NULL;
 	switch_call_cause_t reason = SWITCH_CAUSE_INVALID_MSG_UNSPECIFIED, cancel_cause = 0;
 	switch_caller_profile_t *caller_profile;
 	int err = 0;
@@ -4010,7 +4022,7 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
 	tech_pvt->channel = channel;
 	tech_pvt->jsock_uuid = switch_core_session_strdup(session, jsock->uuid_str);
 	tech_pvt->r_sdp = switch_core_session_strdup(session, sdp);
-	switch_core_media_set_sdp_codec_string(session, sdp, SDP_TYPE_REQUEST);
+	switch_core_media_set_sdp_codec_string(session, sdp, SDP_OFFER);
 	switch_core_session_set_private_class(session, tech_pvt, SWITCH_PVT_SECONDARY);
 
 	tech_pvt->call_id = switch_core_session_strdup(session, call_id);
@@ -4756,14 +4768,12 @@ static int start_jsock(verto_profile_t *profile, ks_socket_t sock, int family)
 
  error:
 
-	if (jsock) {
-		if (jsock->client_socket != KS_SOCK_INVALID) {
-			close_socket(&jsock->client_socket);
-		}
-
-		switch_core_destroy_memory_pool(&pool);
+	if (jsock->client_socket != KS_SOCK_INVALID) {
+		close_socket(&jsock->client_socket);
 	}
 
+	switch_core_destroy_memory_pool(&pool);
+
 	return -1;
 }
 
@@ -5581,8 +5591,6 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl
 {
 	verto_profile_t *profile = NULL;
 	jsock_t *jsock;
-	int cp = 0;
-	int cc = 0;
 	const char *header = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>";
 	int i;
 
@@ -5596,14 +5604,12 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl
 			stream->write_function(stream, "<profile>\n<name>%s</name>\n<type>%s</type>\n<data>%s</data>\n<state>%s</state>\n</profile>\n", profile->name, "profile", tmpurl, (profile->running) ? "RUNNING" : "DOWN");
 			switch_safe_free(tmpurl);
 		}
-		cp++;
 
 		switch_mutex_lock(profile->mutex);
 		for(jsock = profile->jsock_head; jsock; jsock = jsock->next) {
 			char *tmpname = switch_mprintf("%s@%s", jsock->id, jsock->domain);
 			stream->write_function(stream, "<client>\n<profile>%s</profile>\n<name>%s</name>\n<type>%s</type>\n<data>%s</data>\n<state>%s (%s)</state>\n</client>\n", profile->name, tmpname, "client", jsock->name,
 									 (!zstr(jsock->uid)) ? "CONN_REG" : "CONN_NO_REG",  (jsock->ptype & PTYPE_CLIENT_SSL) ? "WSS": "WS");
-			cc++;
 			switch_safe_free(tmpname);
 		}
 		switch_mutex_unlock(profile->mutex);
@@ -5613,7 +5619,7 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl
 	return SWITCH_STATUS_SUCCESS;
 }
 
-static cJSON *json_status()
+static cJSON *json_status(void)
 {
 	cJSON *obj, *profiles, *jprofile, *users, *user;
 	verto_profile_t *profile = NULL;
@@ -6742,14 +6748,14 @@ static void mod_verto_ks_logger(const char *file, const char *func, int line, in
 	va_end(ap);
 }
 
-static void verto_event_free_subclass() 
+static void verto_event_free_subclass(void)
 {
 	switch_event_free_subclass(MY_EVENT_LOGIN);
 	switch_event_free_subclass(MY_EVENT_CLIENT_DISCONNECT);
 	switch_event_free_subclass(MY_EVENT_CLIENT_CONNECT);
 }
 
-static void verto_destroy_globals_hash_tables()
+static void verto_destroy_globals_hash_tables(void)
 {
 	if (verto_globals.method_hash) {
 		switch_core_hash_destroy(&verto_globals.method_hash);
diff --git a/src/mod/endpoints/mod_verto/mod_verto.h b/src/mod/endpoints/mod_verto/mod_verto.h
index f3326f605d..f13e8ef2b9 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.h
+++ b/src/mod/endpoints/mod_verto/mod_verto.h
@@ -62,7 +62,7 @@
 #include <openssl/ssl.h>
 #include "mcast.h"
 
-#include "ks.h"
+#include "libks/ks.h"
 
 #define MAX_QUEUE_LEN 100000
 #define MAX_MISSED 500
diff --git a/src/mod/event_handlers/mod_amqp/mod_amqp_command.c b/src/mod/event_handlers/mod_amqp/mod_amqp_command.c
index 2789a6e252..48cdf55ce4 100644
--- a/src/mod/event_handlers/mod_amqp/mod_amqp_command.c
+++ b/src/mod/event_handlers/mod_amqp/mod_amqp_command.c
@@ -231,7 +231,7 @@ static void mod_amqp_command_response(mod_amqp_command_profile_t *profile, char
 	}
 
 	/* Construct the api response */
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Preparing api command response: [%s]\n", (char *)stream.data);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Preparing api command response: [%s]\n", (char *)stream.data);
 	message = cJSON_CreateObject();
 
 	cJSON_AddItemToObject(message, "output", cJSON_CreateString((const char *) stream.data));
diff --git a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
index 20259251de..3ec8b060df 100644
--- a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
+++ b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
@@ -272,7 +272,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
 }
 
 
-static void do_rotate_all()
+static void do_rotate_all(void)
 {
 	switch_hash_index_t *hi;
 	void *val;
@@ -294,7 +294,7 @@ static void do_rotate_all()
 }
 
 
-static void do_teardown()
+static void do_teardown(void)
 {
 	switch_hash_index_t *hi;
 	void *val;
diff --git a/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c b/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
index d15f748eb7..bd7bf8e26c 100644
--- a/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
+++ b/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
@@ -1998,7 +1998,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_erlang_event_runtime)
 	struct ei_cnode_s ec;
 	ErlConnect conn;
 	int clientfd;
-	switch_os_socket_t epmdfd;
+	switch_os_socket_t epmdfd = SWITCH_SOCK_INVALID;
 	switch_socket_t *epmd_sock = NULL;
 
 	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
index 70331a95e2..935f726ee1 100644
--- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -173,7 +173,7 @@ static switch_status_t socket_logger(const switch_log_node_t *node, switch_log_l
 	switch_status_t qstatus;
 	switch_mutex_lock(globals.listener_mutex);
 	for (l = listen_list.listeners; l; l = l->next) {
-		if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level) {
+		if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level && switch_test_flag(l, LFLAG_RUNNING)) {
 			switch_log_node_t *dnode = switch_log_node_dup(node);
 			qstatus = switch_queue_trypush(l->log_queue, dnode); 
 			if (qstatus == SWITCH_STATUS_SUCCESS) {
@@ -302,7 +302,7 @@ static void event_handler(switch_event_t *event)
 			}
 		}
 
-		if (l->expire_time || !switch_test_flag(l, LFLAG_EVENTS)) {
+		if (l->expire_time || !switch_test_flag(l, LFLAG_EVENTS) || !switch_test_flag(l, LFLAG_RUNNING)) {
 			last = l;
 			continue;
 		}
@@ -866,7 +866,7 @@ SWITCH_STANDARD_API(event_sink_function)
 		char *loglevel = switch_event_get_header(stream->param_event, "loglevel");
 		switch_memory_pool_t *pool;
 		char *next, *cur;
-		uint32_t count = 0, key_count = 0;
+		uint32_t key_count = 0;
 		uint8_t custom = 0;
 		char *edup;
 
@@ -925,7 +925,7 @@ SWITCH_STANDARD_API(event_sink_function)
 				delim = ' ';
 			}
 
-			for (cur = edup; cur; count++) {
+			for (cur = edup; cur;) {
 				switch_event_types_t type;
 
 				if ((next = strchr(cur, delim))) {
@@ -1846,7 +1846,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
 				if (allowed_events) {
 					char delim = ',';
 					char *cur, *next;
-					int count = 0, custom = 0, key_count = 0;
+					int custom = 0;
 
 					switch_set_flag(listener, LFLAG_AUTH_EVENTS);
 
@@ -1862,7 +1862,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
 						delim = ' ';
 					}
 
-					for (cur = edup; cur; count++) {
+					for (cur = edup; cur;) {
 						switch_event_types_t type;
 
 						if ((next = strchr(cur, delim))) {
@@ -1872,7 +1872,6 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
 						if (custom) {
 							switch_core_hash_insert(listener->allowed_event_hash, cur, MARKER);
 						} else if (switch_name_event(cur, &type) == SWITCH_STATUS_SUCCESS) {
-							key_count++;
 							if (type == SWITCH_EVENT_ALL) {
 								uint32_t x = 0;
 								switch_set_flag(listener, LFLAG_ALL_EVENTS_AUTHED);
@@ -1904,7 +1903,6 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
 				if (allowed_api) {
 					char delim = ',';
 					char *cur, *next;
-					int count = 0;
 
 					switch_snprintf(api_reply, sizeof(api_reply), "Allowed-API: %s\n", allowed_api);
 
@@ -1916,7 +1914,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
 						delim = ' ';
 					}
 
-					for (cur = edup; cur; count++) {
+					for (cur = edup; cur;) {
 						if ((next = strchr(cur, delim))) {
 							*next++ = '\0';
 						}
@@ -2540,14 +2538,14 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
 
 	} else if (!strncasecmp(cmd, "nixevent", 8)) {
 		char *next, *cur;
-		uint32_t count = 0, key_count = 0;
+		uint32_t key_count = 0;
 		uint8_t custom = 0;
 
 		strip_cr(cmd);
 		cur = cmd + 8;
 
 		if ((cur = strchr(cur, ' '))) {
-			for (cur++; cur; count++) {
+			for (cur++; cur;) {
 				switch_event_types_t type;
 
 				if ((next = strchr(cur, ' '))) {
diff --git a/src/mod/event_handlers/mod_event_zmq/Makefile.am b/src/mod/event_handlers/mod_event_zmq/Makefile.am
deleted file mode 100644
index 1b171a69c0..0000000000
--- a/src/mod/event_handlers/mod_event_zmq/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_event_zmq
-ZMQ=zeromq-2.1.9
-
-ZMQ_BASEURL=http://download.zeromq.org
-ZMQ_BASEURL_ALT=http://download.zeromq.org/historic
-
-ZMQ_DIR=$(switch_srcdir)/libs/$(ZMQ)
-ZMQ_BUILDDIR=$(switch_builddir)/libs/$(ZMQ)
-ZMQ_LA=$(ZMQ_BUILDDIR)/src/libzmq.la
-
-mod_LTLIBRARIES = mod_event_zmq.la
-mod_event_zmq_la_SOURCES  = mod_event_zmq.cpp
-mod_event_zmq_la_CFLAGS   = $(AM_CFLAGS)
-mod_event_zmq_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(ZMQ_DIR)/include -I$(switch_srcdir)/libs/libteletone/src/
-mod_event_zmq_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(ZMQ_LA)
-mod_event_zmq_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
-
-BUILT_SOURCES=$(ZMQ_LA)
-
-$(ZMQ_DIR):
-	$(GETLIB) $(ZMQ_BASEURL) $(ZMQ).tar.gz || $(GETLIB) $(ZMQ_BASEURL_ALT) $(ZMQ).tar.gz
-	sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' $(ZMQ_DIR)/configure.in > $(ZMQ_DIR)/configure.in.tmp && \
-		mv $(ZMQ_DIR)/configure.in.tmp $(ZMQ_DIR)/configure.in
-	cd $(ZMQ_DIR) && ./autogen.sh
-
-$(ZMQ_BUILDDIR)/Makefile: $(ZMQ_DIR)
-	mkdir -p $(ZMQ_BUILDDIR)
-	cd $(ZMQ_BUILDDIR) && $(DEFAULT_VARS) $(ZMQ_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(ZMQ_DIR)
-	$(TOUCH_TARGET)
-
-$(ZMQ_LA): $(ZMQ_BUILDDIR)/Makefile
-	cd $(ZMQ_BUILDDIR) && $(MAKE)
-	$(TOUCH_TARGET)
diff --git a/src/mod/event_handlers/mod_event_zmq/mod_event_zmq.cpp b/src/mod/event_handlers/mod_event_zmq/mod_event_zmq.cpp
deleted file mode 100644
index b7f517bac2..0000000000
--- a/src/mod/event_handlers/mod_event_zmq/mod_event_zmq.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-#include <switch.h>
-#include <zmq.hpp>
-#include <exception>
-#include <stdexcept>
-#include <memory>
-
-#include "mod_event_zmq.h"
-
-namespace mod_event_zmq {
-
-// Handles publishing events out to clients
-class ZmqEventPublisher {
-public:
-	ZmqEventPublisher(zmq::context_t &context) :
-		_publisher(context, ZMQ_PUB)
-	{
-		_publisher.bind("tcp://*:5556");
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Listening for clients\n");
-	}
-
-	void PublishEvent(const switch_event_t *event) {
-		// Serialize the event into a JSON string
-		char* pjson;
-		switch_event_serialize_json(const_cast<switch_event_t*>(event), &pjson);
-
-		// Use the JSON string as the message body
-		zmq::message_t msg(pjson, strlen(pjson), free_message_data, NULL);
-
-		// Send the message
-		_publisher.send(msg);
-	}
-
-private:
-	static void free_message_data(void *data, void *hint) {
-		free (data);
-	}
-
-	zmq::socket_t _publisher;
-};
-
-class char_msg : public zmq::message_t {
-public:
-	char_msg() : zmq::message_t(sizeof(char)) { }
-	char_msg(char data) : zmq::message_t(sizeof(char)) {
-		*char_data() = data;
-	}
-
-	char* char_data() {
-		return static_cast<char*>(this->data());
-	}
-};
-
-// Handles global inititalization and teardown of the module
-class ZmqModule {
-public:
-	ZmqModule(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) :
-		_context(1), _term_rep(_context, ZMQ_REP), _term_req(_context, ZMQ_REQ), _publisher(_context) {
-
-		// Set up the term messaging connection
-		_term_rep.bind(TERM_URI);
-		_term_req.connect(TERM_URI);
-
-		// Subscribe to all switch events of any subclass
-		// Store a pointer to ourself in the user data
-		if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, static_cast<void*>(&_publisher), &_node)
-				!= SWITCH_STATUS_SUCCESS) {
-			throw std::runtime_error("Couldn't bind to switch events.");
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Subscribed to events\n");
-
-		// Create our module interface registration
-		*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Module loaded\n");
-	}
-
-	void Listen() {
-		// All we do is sit here and block the run loop thread so it doesn't return
-		// it seems that if you want to keep your module running you can't return from the run loop
-
-		char_msg msg;
-		while(true) {
-			// Listen for term message
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Entered run loop, waiting for term message\n");
-			_term_rep.recv(&msg);
-			if(*msg.char_data() == MODULE_TERM_REQ_MESSAGE) {
-				// Ack term message
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Got term message, sending ack and leaving run loop\n");
-
-				*msg.char_data() = MODULE_TERM_ACK_MESSAGE;
-				_term_rep.send(msg);
-
-				break;
-			}
-		}
-	}
-
-	void Shutdown() {
-		// Send term message
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutdown requested, sending term message to runloop\n");
-		char_msg msg(MODULE_TERM_REQ_MESSAGE);
-		_term_req.send(msg);
-
-		while(true) {
-			// Wait for the term ack message
-			_term_req.recv(&msg);
-			if(*msg.char_data() == MODULE_TERM_ACK_MESSAGE) {
-				// Continue shutdown
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Got term ack message, continuing shutdown\n");
-				break;
-			}
-		}
-	}
-
-	~ZmqModule() {
-		// Unsubscribe from the switch events
-		switch_event_unbind(&_node);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Module shut down\n");
-	}
-
-private:
-	// Dispatches events to the publisher
-	static void event_handler(switch_event_t *event) {
-		try {
-			ZmqEventPublisher *publisher = static_cast<ZmqEventPublisher*>(event->bind_user_data);
-			publisher->PublishEvent(event);
-		} catch(std::exception ex) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error publishing event via 0MQ: %s\n", ex.what());
-		} catch(...) { // Exceptions must not propogate to C caller
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown error publishing event via 0MQ\n");
-		}
-	}
-
-	switch_event_node_t *_node;
-
-	zmq::context_t _context;
-	zmq::socket_t _term_rep;
-	zmq::socket_t _term_req;
-
-	ZmqEventPublisher _publisher;
-};
-
-//*****************************//
-//           GLOBALS           //
-//*****************************//
-std::auto_ptr<ZmqModule> module;
-
-
-//*****************************//
-//  Module interface funtions  //
-//*****************************//
-SWITCH_MODULE_LOAD_FUNCTION(load) {
-	try {
-		module.reset(new ZmqModule(module_interface, pool));
-		return SWITCH_STATUS_SUCCESS;
-	} catch(...) { // Exceptions must not propogate to C caller
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error loading 0MQ module\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-}
-
-SWITCH_MODULE_RUNTIME_FUNCTION(runtime) {
-	try {
-		// Begin listening for clients
-		module->Listen();
-	} catch(std::exception &ex) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error listening for clients: %s\n", ex.what());
-	} catch(...) { // Exceptions must not propogate to C caller
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown error listening for clients\n");
-	}
-
-	// Tell the switch to stop calling this runtime loop
-	return SWITCH_STATUS_TERM;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(shutdown) {
-	try {
-		// Tell the module to shutdown
-		module->Shutdown();
-
-		// Free the module object
-		module.reset();
-	} catch(std::exception &ex) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error shutting down module: %s\n", ex.what());
-	} catch(...) { // Exceptions must not propogate to C caller
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown error shutting down module\n");
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-}
diff --git a/src/mod/event_handlers/mod_event_zmq/mod_event_zmq.h b/src/mod/event_handlers/mod_event_zmq/mod_event_zmq.h
deleted file mode 100644
index a60c720d74..0000000000
--- a/src/mod/event_handlers/mod_event_zmq/mod_event_zmq.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef MOD_EVENT_ZMQ_H
-#define MOD_EVENT_ZMQ_H
-
-namespace mod_event_zmq {
-static const char MODULE_TERM_REQ_MESSAGE = 1;
-static const char MODULE_TERM_ACK_MESSAGE = 2;
-
-static const char *TERM_URI = "inproc://mod_event_zmq_term";
-
-SWITCH_MODULE_LOAD_FUNCTION(load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(shutdown);
-SWITCH_MODULE_RUNTIME_FUNCTION(runtime);
-
-extern "C" {
-SWITCH_MODULE_DEFINITION(mod_event_zmq, load, shutdown, runtime);
-};
-
-}
-
-#endif // MOD_EVENT_ZMQ_H
diff --git a/src/mod/event_handlers/mod_kazoo/Makefile.am b/src/mod/event_handlers/mod_kazoo/Makefile.am
deleted file mode 100644
index 36e7a9ea4a..0000000000
--- a/src/mod/event_handlers/mod_kazoo/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_kazoo
-
-if HAVE_ERLANG
-
-KAZOO_DEFS=kazoo_definitions.o
-
-mod_LTLIBRARIES = mod_kazoo.la
-mod_kazoo_la_SOURCES  = mod_kazoo.c kazoo_utils.c kazoo_dptools.c kazoo_tweaks.c
-mod_kazoo_la_SOURCES  += kazoo_api.c kazoo_commands.c kazoo_config.c
-mod_kazoo_la_SOURCES  += kazoo_message.c
-mod_kazoo_la_SOURCES  += kazoo_ei_config.c kazoo_ei_utils.c kazoo_event_stream.c
-mod_kazoo_la_SOURCES  += kazoo_fetch_agent.c kazoo_node.c
-mod_kazoo_la_SOURCES  += kazoo_endpoints.c
-mod_kazoo_la_SOURCES  += kazoo_cdr.c
-mod_kazoo_la_SOURCES  += kz_node.c
-
-mod_kazoo_la_CFLAGS   = $(AM_CFLAGS) @ERLANG_CFLAGS@ -D_REENTRANT -DERLANG_VERSION=@ERLANG_VERSION@ -DERLANG_MAJOR=@ERLANG_MAJOR@ -DERLANG_MINOR=@ERLANG_MINOR@
-mod_kazoo_la_LIBADD   = $(KAZOO_DEFS) $(switch_builddir)/libfreeswitch.la
-mod_kazoo_la_LDFLAGS  = -avoid-version -module -no-undefined -shared @ERLANG_LDFLAGS@
-
-BUILT_SOURCES = $(KAZOO_DEFS)
-
-$(KAZOO_DEFS): kazoo.conf.xml
-
-.S.o: $<
-	@$(CC) $(CFLAGS) -o $@ -c $<
-
-install-exec-am:
-	@install `which epmd` $(DESTDIR)$(bindir)/fs_epmd
-
-else
-install: error
-all: error
-error:
-	$(error You must install erlang to build this module)
-endif
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo.conf.xml b/src/mod/event_handlers/mod_kazoo/kazoo.conf.xml
deleted file mode 100644
index 4422af121b..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo.conf.xml
+++ /dev/null
@@ -1,1275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration name="kazoo.conf"
-	description="General purpose Erlang C-node produced to better fit the Kazoo project">
-	<settings>
-		<param name="listen-ip" value="0.0.0.0" />
-		<param name="listen-port" value="6031" />
-		<!--<param name="cookie-file" value="/etc/freeswitch/autoload_configs/.erlang.cookie"/> -->
-		<param name="cookie" value="change_me" />
-		<param name="shortname" value="false" />
-		<param name="nodename" value="freeswitch" />
-		<!--<param name="kazoo-var-prefix" value="ecallmgr" />-->
-		<!--<param name="compat-rel" value="12"/>-->
-		<param name="send-all-headers" value="false" />
-
-		<param name="event-stream-preallocate" value="8192" />
-		<param name="receive-msg-preallocate" value="8192" />
-		<param name="node-worker-threads" value="5" />
-		<param name="receive-timeout" value="1" />
-		<param name="event-stream-framing" value="4" />
-
-	</settings>
-
-	<variables>
-		<variable name="UNIX_EPOCH_IN_GREGORIAN" value="62167219200" />
-	</variables>
-
-	<definitions>
-		<definition name="msg-id">
-			<field name="Event-Date-Timestamp" as="Msg-ID" />
-		</definition>
-
-		<definition name="timestamp">
-			<field name="Timestamp" type="expand"
-				value="${expr(ceil((${Event-Date-Timestamp} / 1000000) + ${UNIX_EPOCH_IN_GREGORIAN}))}"
-				serialize-as="number" />
-		</definition>
-
-		<definition name="call-interaction">
-			<field name="Call-Interaction" type="static" serialize-as="object">
-				<fields verbose="false">
-					<field name="variable_Call-Interaction-ID" as="Id" />
-					<field name="Key" type="expand"
-						value="${regex(${variable_Call-Interaction-ID}|([^-]*)-(.*)|%2)}" />
-					<field name="Timestamp" type="expand"
-						value="${regex(${variable_Call-Interaction-ID}|([^-]*)-(.*)|%1)}"
-						serialize-as="number" />
-					<field name="Is-Root" type="expand"
-						value="${cond(${variable_Call-Interaction-ID} == ${variable_Original-Call-Interaction-ID} ? true : false)}"
-						serialize-as="boolean" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="debug-call">
-			<filters>
-				<filter
-					name="${first-of(variable_debug_call|Call-Debug|#${Call-Debug})}"
-					type="include" value="true" />
-			</filters>
-			<field name="Call-Debug" type="static" serialize-as="object">
-				<fields verbose="true" />
-			</field>
-		</definition>
-
-		<definition name="originated-legs">
-			<filters>
-				<filter name="variable_originated_legs" type="include"
-					compare="exists" />
-			</filters>
-			<field name="Other-Legs" type="static" serialize-as="object">
-				<fields verbose="false">
-					<field name="variable_originated_legs" as="Callee" />
-					<field name="variable_originate_causes" as="Causes" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="transfer-history">
-			<filters>
-				<filter name="variable_transfer_history" type="include"
-					compare="exists" />
-			</filters>
-			<field name="Transfer-History" type="expand"
-				value="${kz_json_history(${variable_transfer_history})}"
-				serialize-as="raw" />
-		</definition>
-
-		<definition name="transfer-source">
-			<filters>
-				<filter name="variable_transfer_source" type="include"
-					compare="exists" />
-			</filters>
-			<field name="Transfer-Source" type="expand"
-				value="${kz_json_history(variable_transfer_source)}" serialize-as="raw" />
-		</definition>
-
-		<definition name="interaction-id">
-			<field name="variable_Call-Interaction-ID" as="Call-Interaction-ID" />
-			<field name="Call-Interaction-Is-Root" type="static" value="true"
-				serialize-as="boolean">
-				<filters>
-					<filter name="variable_Call-Interaction-ID" type="include"
-						compare="field" value="variable_Original-Call-Interaction-ID" />
-					<filter name="${first-of(Event-Subclass|Event-Name|#none)}"
-						type="include" compare="list" value="CHANNEL_DESTROY|KZ_CDR" />
-				</filters>
-			</field>
-		</definition>
-
-		<definition name="Metaflow-Control">
-			<field name="Metaflow-Control" type="static" serialize-as="object">
-				<filters>
-					<filter name="ecallmgr" type="include" compare="prefix"
-						value="variable_Metaflow-Control-" />
-				</filters>
-				<fields verbose="false">
-					<field name="variable_Metaflow-Control-" type="prefix"
-						exclude-prefix="true" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="Call-Control">
-			<field name="Call-Control" type="static" serialize-as="object">
-				<filters>
-					<filter name="ecallmgr" type="include" compare="prefix"
-						value="variable_Call-Control-" />
-				</filters>
-				<fields verbose="false">
-					<field name="variable_Call-Control-" type="prefix"
-						exclude-prefix="true" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="Control">
-			<field name="Call-Control" type="reference" />
-			<field name="Metaflow-Control" type="reference" />
-		</definition>
-
-		<definition name="Privacy">
-			<field name="Privacy" type="static" serialize-as="object">
-				<fields verbose="false">
-					<field name="Caller-Privacy-Hide-Number" as="Hide-Number"
-						serialize-as="boolean" />
-					<field name="Caller-Privacy-Hide-Name" as="Hide-Name"
-						serialize-as="boolean" />
-					<field name="Caller-Screen-Bit" as="Screen-Bit" serialize-as="boolean" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="Custom-Channel-Vars">
-			<field name="Custom-Channel-Vars" type="static" serialize-as="object">
-				<fields verbose="false">
-					<field name="X-ecallmgr_" type="prefix" exclude-prefix="true" />
-					<field name="variable_sip_h_X-ecallmgr_" type="prefix"
-						exclude-prefix="true" />
-					<field name="variable_ecallmgr_" type="prefix"
-						exclude-prefix="true" />
-
-					<field name="Fetch-UUID" as="Fetch-ID" />
-
-					<field name="Referred-To" type="expand"
-						value="sip:${regex(${url_decode(${variable_sip_refer_to})}|&lt;sips?:(.*)&gt;|%1)}">
-						<filters>
-							<filter name="variable_sip_refer_to" type="include"
-								compare="exists" />
-						</filters>
-					</field>
-					<field name="variable_sip_h_Referred-By" as="Referred-By" />
-
-					<field name="variable_presence_id" as="Presence-ID" />
-
-					<field name="redirect" type="group">
-						<filters>
-							<filter name="variable_sip_redirected_by" type="include"
-								compare="exists" />
-						</filters>
-						<fields verbose="false">
-							<field name="Redirected-By" type="expand"
-								value="sip:${regex(${variable_sip_redirected_by}|&lt;sips?:(.*)&gt;|%1)}" />
-							<field name="Redirected-Reason" type="expand"
-								value="${regex(${variable_sip_redirected_by}|reason=(.*)|%1)}" />
-						</fields>
-					</field>
-
-					<field name="Caller-Privacy-Hide-Number" as="Privacy-Hide-Number"
-						serialize-as="boolean" />
-					<field name="Caller-Privacy-Hide-Name" as="Privacy-Hide-Name"
-						serialize-as="boolean" />
-
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="Custom-Application-Vars">
-			<field name="Custom-Application-Vars" type="static"
-				serialize-as="object">
-				<filters>
-					<filter name="ecallmgr" type="include" compare="prefix"
-						value="variable_cav_" />
-				</filters>
-				<fields verbose="false">
-					<field name="variable_cav_" type="prefix" exclude-prefix="true" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="Custom-SIP-Headers">
-			<field name="Custom-SIP-Headers" type="static" serialize-as="object">
-				<filters>
-					<filter name="ecallmgr" type="include" compare="prefix"
-						value="variable_sip_h_" />
-				</filters>
-				<fields verbose="false">
-					<field name="variable_sip_h_" type="prefix" exclude-prefix="true" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="to-did">
-			<field name="To-DID" type="first-of"
-				value="variable_ecallmgr_E164-Destination|variable_ecallmgr_Original-Number|Caller-Destination-Number" />
-		</definition>
-
-		<definition name="from-network">
-			<field name="From-Network-Addr" type="first-of"
-				value="variable_sip_h_X-AUTH-IP|variable_sip_received_ip" />
-			<field name="From-Network-Port" type="first-of"
-				value="variable_sip_h_X-AUTH-PORT|variable_sip_received_port" />
-		</definition>
-
-		<definition name="call-direction">
-			<field name="Call-Direction" />
-		</definition>
-
-		<definition name="caller-id">
-			<field name="Caller-ID-Number" type="first-of"
-				value="variable_origination_caller_id_number|variable_effective_caller_id_number|Caller-Caller-ID-Number" />
-			<field name="Caller-ID-Name" type="first-of"
-				value="variable_origination_caller_id_name|variable_effective_caller_id_name|Caller-Caller-ID-Name" />
-			<field name="Callee-ID-Number" type="first-of"
-				value="variable_origination_callee_id_number|variable_effective_callee_id_number|Caller-Callee-ID-Number|Other-Leg-Caller-ID-Number" />
-			<field name="Callee-ID-Name" type="first-of"
-				value="variable_origination_callee_id_name|variable_effective_callee_id_name|Caller-Callee-ID-Name|Other-Leg-Caller-ID-Name" />
-		</definition>
-
-		<definition name="other-leg">
-			<field name="Other-Leg-Direction" />
-			<field name="Other-Leg-Caller-ID-Name" />
-			<field name="Other-Leg-Caller-ID-Number" />
-			<field name="Other-Leg-Destination-Number" />
-			<field name="Other-Leg-Call-ID" type="first-of"
-				value="Other-Leg-Unique-ID|Other-Leg-Call-ID|variable_origination_uuid" />
-		</definition>
-
-		<definition name="application">
-			<field name="Application-Name" type="first-of"
-				value="Application-UUID-Name|kazoo_application_name|Application|Event-Subclass" />
-			<field name="Application-Response" type="first-of"
-				value="kazoo_application_response|Application-Response" />
-		</definition>
-
-		<definition name="raw-application">
-			<field name="Raw-Application-Name" type="first-of"
-				value="kazoo_application_name|Application|Event-Subclass" />
-			<field name="Application-Data" as="Raw-Application-Data" />
-		</definition>
-
-		<definition name="application-all">
-			<field name="raw-application" type="reference" />
-			<field name="application" type="reference" />
-		</definition>
-
-		<definition name="application-uuid">
-			<field name="application-all" type="reference" />
-			<field name="Application-UUID" type="first-of"
-				value="app_uuid|variable_app_uuid|Application-UUID" />
-		</definition>
-
-		<definition name="Switch-URI">
-			<field name="variable_Switch-URI" as="Switch-URI" />
-		</definition>
-
-		<definition name="freeswitch-url">
-			<field name="FreeSWITCH-Hostname" as="Media-Server" />
-			<field name="FreeSWITCH-Hostname" as="Switch-Hostname" />
-			<field name="Switch-Nodename" />
-			<field name="variable_Switch-URL" as="Switch-URL" />
-			<field name="Switch-URI" type="reference" />
-		</definition>
-
-		<definition name="loopback">
-			<field name="variable_is_loopback" as="Channel-Is-Loopback"
-				serialize-as="boolean" />
-			<field name="Loopback" type="group">
-				<filters>
-					<filter name="variable_is_loopback" type="include" compare="value"
-						value="1" />
-				</filters>
-				<fields verbose="false">
-					<field name="variable_loopback_leg" as="Channel-Loopback-Leg" />
-					<field name="variable_other_loopback_leg_uuid" as="Channel-Loopback-Other-Leg-ID" />
-					<field name="variable_loopback_bowout" as="Channel-Loopback-Bowout"
-						serialize-as="boolean" />
-					<field name="variable_loopback_bowout_on_execute" as="Channel-Loopback-Bowout-Execute"
-						serialize-as="boolean" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="caller-context">
-			<field name="variable_sofia_profile_name" as="Caller-Profile" />
-			<field name="Caller-Context" />
-			<field name="Caller-Dialplan" />
-			<field name="Caller-Destination-Number" />
-		</definition>
-
-		<definition name="hunt-context">
-			<field name="variable_sofia_profile_name" as="Hunt-Profile" />
-			<field name="Hunt-Context" />
-			<field name="Hunt-Dialplan" />
-			<field name="Hunt-Destination-Number" />
-			<field name="Request" type="expand"
-				value="${Hunt-Destination-Number}@${first-of(variable_sip_invite_domain|variable_sip_to_host|variable_sip_req_host|variable_ecallmgr_Realm)}" />
-			<field name="To" type="expand"
-				value="${Hunt-Destination-Number}@${first-of(variable_sip_invite_domain|variable_sip_to_host|variable_sip_req_host|variable_ecallmgr_Realm)}" />
-			<field name="From" type="expand"
-				value="${first-of(Hunt-Caller-ID-Number|origination_callee_id_number|variable_sip_from_user)}@${first-of(variable_sip_invite_domain|variable_sip_from_host|variable_sip_req_host|variable_ecallmgr_Realm)}" />
-		</definition>
-
-		<definition name="sip-tags">
-			<field name="variable_sip_to_tag" as="To-Tag" />
-			<field name="variable_sip_from_tag" as="From-Tag" />
-		</definition>
-
-		<definition name="channel-state">
-			<!-- erlang strips CS_ from beginning, lets do that -->
-			<field name="Channel-State" type="expand"
-				value="${regex(${Channel-State}|^CS_(.*)$|%1)}" />
-			<field name="Channel-Call-State" />
-			<field name="Channel-Name" />
-			<field name="Answer-State" />
-		</definition>
-
-		<definition name="presence-id">
-			<field name="variable_presence_id" as="Presence-ID" />
-		</definition>
-
-
-		<definition name="call_event_headers">
-			<field name="Event-Category" type="static" value="call_event" />
-			<field name="Event-Name" type="first-of"
-				value="kazoo_event_name|Event-Subclass|Event-Name" />
-			<field name="Event-Date-Timestamp" as="Msg-ID" />
-			<field name="Timestamp" type="expand"
-				value="${expr(ceil((${Event-Date-Timestamp} / 1000000) + ${UNIX_EPOCH_IN_GREGORIAN}))}"
-				serialize-as="number" />
-			<field name="variable_sip_origination_call_uuid" as="Origination-Call-ID" />
-			<field name="Call-ID" type="first-of"
-				value="Unique-ID|Caller-Unique-ID|caller-unique-id" />
-			<field name="Caller-Channel-Created-Time" as="Channel-Created-Time" />
-
-			<field name="Switch-Nodename" as="Node" />
-
-			<field name="variable_sip_invite_domain" as="Domain-Name" />
-			<field name="App-Name" type="static" value="freeswitch" />
-			<field name="App-Version" type="static" value="1.0" />
-		</definition>
-
-		<definition name="user-agent">
-			<field name="variable_sip_user_agent" as="User-Agent" />
-		</definition>
-
-
-		<definition name="call_event">
-			<field name="call_event_headers" type="reference" />
-			<field name="application-all" type="reference" />
-			<field name="call-direction" type="reference" />
-			<field name="channel-state" type="reference" />
-			<field name="caller-id" type="reference" />
-			<field name="caller-context" type="reference" />
-			<field name="sip-tags" type="reference" />
-			<field name="presence-id" type="reference" />
-			<field name="loopback" type="reference" />
-			<field name="freeswitch-url" type="reference" />
-			<field name="other-leg" type="reference" />
-			<field name="user-agent" type="reference" />
-			<field name="Custom-Channel-Vars" type="reference" />
-			<field name="Custom-Application-Vars" type="reference" />
-			<field name="Control" type="reference" />
-			<field name="debug-call" type="reference" />
-		</definition>
-
-		<definition name="fetch-info">
-			<field name="Event-Category" type="static" value="fetch" />
-			<field name="App-Name" type="static" value="freeswitch" />
-			<field name="App-Version" type="static" value="1.0" />
-			<field name="Switch-Nodename" as="Node" />
-			<field name="Fetch-UUID" />
-			<field name="Fetch-UUID" as="Msg-ID" />
-			<field name="Call-ID" type="first-of" value="Unique-ID" />
-			<field name="Fetch-Section" />
-			<field name="Fetch-Timeout" />
-			<field name="Fetch-Timestamp-Micro" />
-			<field name="Kazoo-Bundle" as="Fetch-Version" />
-			<field name="Custom-SIP-Headers" type="reference" />
-			<field name="Custom-Channel-Vars" type="reference" />
-			<field name="Custom-Application-Vars" type="reference" />
-			<field name="freeswitch-url" type="reference" />
-			<field name="Control" type="reference" />
-			<field name="Privacy" type="reference" />
-			<field name="debug-call" type="reference" />
-
-		</definition>
-
-		<definition name="destination-number">
-			<field name="Destination-Number" type="first-of"
-				value="Hunt-Destination-Number|Caller-Destination-Number" />
-		</definition>
-
-		<definition name="from-to">
-			<field name="Request" type="first-of"
-				value="variable_sip_req_uri|variable_sip_loopback_req_uri|variable_sip_to_uri" />
-			<field name="To" type="first-of"
-				value="variable_sip_to_uri|variable_sip_req_uri|variable_sip_loopback_req_uri" />
-			<field name="variable_sip_to_uri" as="To-URI" />
-			<field name="From" type="first-of"
-				value="variable_sip_from_uri|variable_presence_id|variable_sip_loopback_from_uri" />
-			<field name="variable_sip_from_uri" as="From-URI" />
-		</definition>
-
-		<definition name="sdp">
-			<field name="variable_switch_r_sdp" as="Remote-SDP" />
-			<field name="variable_rtp_local_sdp_str" as="Local-SDP" />
-		</definition>
-
-		<definition name="call-duration">
-			<field name="variable_duration" as="Duration-Seconds"
-				serialize-as="number" />
-			<field name="variable_progresssec" as="Ringing-Seconds"
-				serialize-as="number" />
-			<field name="Billing-Seconds" type="expand"
-				value="${expr(ceil(${variable_billmsec} / 1000))}" serialize-as="number" />
-		</definition>
-
-		<definition name="hangup-disposition">
-			<field name="Disposition" type="first-of"
-				value="variable_originate_disposition|variable_endpoint_disposition" />
-		</definition>
-
-		<definition name="hangup-code">
-			<field name="Hangup-Code" type="first-of"
-				value="variable_proto_specific_hangup_cause|variable_last_bridge_proto_specific_hangup_cause" />
-		</definition>
-
-		<definition name="hangup-cause">
-			<field name="Hangup-Cause" type="first-of"
-				value="variable_originate_failed_cause|variable_bridge_hangup_cause|variable_hangup_cause|Hangup-Cause">
-				<filters>
-					<filter name="variable_current_application" type="include"
-						compare="value" value="bridge" />
-				</filters>
-			</field>
-			<field name="Hangup-Cause" type="first-of"
-				value="variable_originate_failed_cause|variable_hangup_cause|variable_bridge_hangup_cause|Hangup-Cause">
-				<filters>
-					<filter name="variable_current_application" type="exclude"
-						compare="value" value="bridge" />
-				</filters>
-			</field>
-		</definition>
-
-		<definition name="hangup-fields">
-			<field name="hangup-code" type="reference" />
-			<field name="hangup-cause" type="reference" />
-			<field name="hangup-disposition" type="reference" />
-		</definition>
-
-		<definition name="conference-caller-id">
-			<field name="CONF-CALLER-ID-IN" type="group">
-				<filters>
-					<filter name="Call-Direction" type="include" compare="value"
-						value="inbound" />
-				</filters>
-				<fields verbose="false">
-					<field name="Caller-Caller-ID-Name" as="Caller-ID-Name" />
-					<field name="Caller-Caller-ID-Number" as="Caller-ID-Number" />
-				</fields>
-			</field>
-			<field name="CONF-CALLER-ID-OUT" type="group">
-				<filters>
-					<filter name="Call-Direction" type="include" compare="value"
-						value="outbound" />
-				</filters>
-				<fields verbose="false">
-					<field name="variable_origination_callee_id_name" as="Caller-ID-Name" />
-					<field name="variable_origination_callee_id_number" as="Caller-ID-Number" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="conference-bgdial">
-			<field name="Dial-Result" type="static" serialize-as="object">
-				<filters>
-					<filter name="Action" type="include" compare="value" value="bgdial-result" />
-				</filters>
-				<fields verbose="false">
-					<field name="Result" />
-					<field name="Job-UUID" />
-					<field name="Peer-UUID" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="conference-vars">
-			<field name="Conference-Vars" type="static" serialize-as="object">
-				<fields verbose="false">
-					<field name="Conference-" type="prefix" exclude-prefix="true" />
-					<field name="Account-ID" type="first-of"
-						value="Account-ID|Conference-Account-ID|variable_ecallmgr_Account-ID" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="conference-channel-vars">
-			<field name="Conference-Channel-Vars" type="static"
-				serialize-as="object">
-				<fields verbose="false">
-					<field name="variable_conference_moderator" as="Is-Moderator"
-						serialize-as="boolean" />
-					<field name="Floor" serialize-as="boolean" />
-					<field name="Video" serialize-as="boolean" />
-					<field name="See" serialize-as="boolean" />
-					<field name="Speak" serialize-as="boolean" />
-					<field name="Hear" serialize-as="boolean" />
-					<field name="Talking" serialize-as="boolean" />
-					<field name="Mute-Detect" serialize-as="boolean" />
-
-					<field name="Energy-Level" serialize-as="number" />
-					<field name="Current-Energy" serialize-as="number" />
-					<field name="Member-ID" serialize-as="number" />
-
-					<field name="Member-Ghost" serialize-as="boolean" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="conference-event">
-			<field name="Event-Category" type="static" value="conference" />
-			<field name="Event-Name" type="static" value="event" />
-			<field name="Switch-Nodename" as="Node" />
-			<field name="Core-UUID" />
-			<field name="freeswitch-url" type="reference" />
-			<field name="App-Name" type="static" value="freeswitch" />
-			<field name="App-Version" type="static" value="1.0" />
-			<field name="Action" as="Event" />
-			<field name="Conference-Name" as="Conference-ID" />
-			<field name="Conference-Unique-ID" as="Instance-ID" />
-			<field name="Conference-Node" />
-			<field name="Conference-Profile" as="Profile" />
-			<field name="Unique-ID" as="Call-ID" />
-			<field name="Account-ID" type="first-of"
-				value="Conference-Account-ID|variable_ecallmgr_Account-ID" />
-
-			<field name="conference-caller-id" type="reference" />
-
-			<field name="Channel-Presence-ID" />
-			<field name="Member-ID" as="Participant-ID" serialize-as="number" />
-			<field name="Custom-Channel-Vars" type="reference" />
-			<field name="Custom-Application-Vars" type="reference" />
-			<field name="conference-vars" type="reference" />
-			<field name="conference-channel-vars" type="reference" />
-			<field name="conference-bgdial" type="reference" />
-		</definition>
-
-		<definition name="recording_vars">
-			<field name="Recording" type="static" serialize-as="object">
-				<filters>
-					<filter name="recording" type="include" compare="prefix"
-						value="Recording-Variable-" />
-				</filters>
-				<fields verbose="false">
-					<field name="Recording-Variable-" type="prefix"
-						exclude-prefix="true" />
-				</fields>
-			</field>
-		</definition>
-
-		<definition name="recording">
-			<field name="Application-Name" type="static" value="record" />
-			<field name="Application-Response" type="first-of"
-				value="Record-File-Path|kazoo_application_response" />
-			<field name="recording_vars" type="reference" />
-		</definition>
-
-		<definition name="fax_data">
-			<field name="variable_fax_success" as="Fax-Success"
-				serialize-as="boolean" />
-			<field name="variable_has_t38" as="Fax-T38-Used" serialize-as="boolean" />
-			<field name="variable_fax_t38_status" as="Fax-T38-Status" />
-			<field name="variable_fax_ecm_used" as="Fax-ECM-Used"
-				serialize-as="boolean" />
-			<field name="variable_fax_ecm_requested" as="Fax-ECM-Requested"
-				serialize-as="boolean" />
-			<field name="variable_fax_document_transferred_pages" as="Fax-Transferred-Pages"
-				serialize-as="number" />
-			<field name="variable_fax_document_total_pages" as="Fax-Total-Pages"
-				serialize-as="number" />
-			<field name="variable_fax_bad_rows" as="Fax-Bad-Rows"
-				serialize-as="number" />
-			<field name="variable_fax_transfer_rate" as="Fax-Transfer-Rate"
-				serialize-as="number" />
-			<field name="variable_fax_local_station_id" as="Fax-Local-Station-ID" />
-			<field name="variable_fax_remote_station_id" as="Fax-Remote-Station-ID" />
-			<field name="variable_fax_remote_country" as="Fax-Remote-Country" />
-			<field name="variable_fax_remote_vendor" as="Fax-Remote-Vendor" />
-			<field name="variable_fax_remote_model" as="Fax-Remote-Model" />
-			<field name="variable_fax_image_resolution" as="Fax-Image-Resolution" />
-			<field name="variable_fax_file_image_resolution" as="Fax-File-Image-Resolution" />
-			<field name="variable_fax_image_size" as="Fax-Image-Size"
-				serialize-as="number" />
-			<field name="variable_fax_image_pixel_size" as="Fax-Image-Pixel-Size" />
-			<field name="variable_fax_file_image_pixel_size" as="Fax-File-Image-Pixel-Size" />
-			<field name="variable_fax_longest_bad_row_run" as="Fax-Longest-Bad-Row-Run"
-				serialize-as="number" />
-			<field name="variable_fax_encoding" as="Fax-Encoding" />
-			<field name="variable_fax_encoding_name" as="Fax-Encoding-Name" />
-			<field name="variable_fax_timezone" as="Fax-Timezone" />
-			<field name="variable_fax_ident" as="Fax-Identity-Number" />
-			<field name="variable_fax_header" as="Fax-Identity-Name" />
-			<field name="variable_fax_doc_id" as="Fax-Doc-ID" />
-			<field name="variable_fax_doc_database" as="Fax-Doc-DB" />
-
-		</definition>
-
-		<definition name="fax_event">
-			<field name="call_event_headers" type="reference" />
-			<field name="Event-Name" type="static" value="CHANNEL_FAX_STATUS" />
-			<field name="Application-Data" type="static" serialize-as="object">
-				<fields verbose="false">
-					<field name="fax_data" type="reference" />
-				</fields>
-			</field>
-			<field name="user-agent" as="reference" />
-			<field name="Custom-Channel-Vars" type="reference" />
-			<field name="Custom-Application-Vars" type="reference" />
-		</definition>
-
-		<definition name="voice_dialplan">
-			<field name="fetch-info" type="reference" />
-			<field name="Timestamp" type="expand"
-				value="${expr(ceil((${Event-Date-Timestamp} / 1000000) + ${UNIX_EPOCH_IN_GREGORIAN}))}"
-				serialize-as="number" />
-			<field name="Unique-ID" as="Call-ID" />
-			<field name="variable_sip_invite_domain" as="Domain-Name" />
-			<field name="call-direction" type="reference" />
-			<field name="caller-id" type="reference" />
-			<field name="from-network" type="reference" />
-			<field name="user-agent" type="reference" />
-			<field name="from-to" type="reference" />
-			<field name="to-did" type="reference" />
-			<field name="loopback" type="reference" />
-			<field name="sip-tags" type="reference" />
-			<field name="freeswitch-url" type="reference" />
-			<field name="destination-number" type="reference" />
-			<field name="Resource-Type" type="static" value="audio" />
-			<field name="hunt-context" type="reference" />
-			<field name="Call-Setup" type="static" value="true"
-				serialize-as="boolean" />
-
-			<field name="Event-Category" type="static" value="dialplan" />
-			<field name="Event-Name" type="static" value="route_req" />
-			<field name="Hunt-Context" as="Fetch-Key-Value" />
-		</definition>
-
-	</definitions>
-
-
-	<event-handlers>
-		<profile name="default">
-			<events>
-				<event name="CHANNEL_CREATE">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="from-to" type="reference" />
-						<field name="to-did" type="reference" />
-						<field name="destination-number" type="reference" />
-						<field name="debug-call" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_ANSWER">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="from-to" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_DESTROY">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="from-to" type="reference" />
-						<field name="other-leg" type="reference" />
-						<field name="sdp" type="reference" />
-						<field name="call-duration" type="reference" />
-						<field name="hangup-fields" type="reference" />
-						<field name="variable_Media-Recordings" as="Media-Recordings" />
-						<field name="debug-call" type="reference" />
-						<field name="transfer-history" type="reference" />
-						<field name="originated-legs" type="reference" />
-
-					</fields>
-					<filters>
-						<filter name="variable_hangup_cause" type="exclude"
-							compare="value" value="CALL_REJECTED" />
-					</filters>
-
-				</event>
-
-				<event name="CHANNEL_PROGRESS">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="from-to" type="reference" />
-						<field name="debug-call" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_PROGRESS_MEDIA">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="from-to" type="reference" />
-						<field name="debug-call" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_BRIDGE">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="Bridge-A-Unique-ID" />
-						<field name="Bridge-B-Unique-ID" />
-						<field name="debug-call" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_UNBRIDGE">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="Bridge-A-Unique-ID" />
-						<field name="Bridge-B-Unique-ID" />
-						<field name="application-uuid" type="reference" />
-						<field name="Application-Response" type="first-of"
-							value="variable_originate_disposition|#FAIL" />
-						<field name="Disposition" type="first-of"
-							value="variable_originate_disposition|variable_endpoint_disposition" />
-
-						<field name="debug-call" type="reference" />
-					</fields>
-				</event>
-
-				<event name="sofia::intercepted">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="Event-Name" type="static" value="CHANNEL_INTERCEPTED" />
-						<field name="Intercepted-By" type="first-of"
-							value="variable_intercepted_by|intercepted_by" />
-					</fields>
-
-					<routing-key>
-						<param name="format_fields" value="#call,#CHANNEL_INTERCEPTED,Unique-ID" />
-					</routing-key>
-
-				</event>
-
-				<event name="sofia::replaced">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="Event-Name" type="static" value="CHANNEL_REPLACED" />
-						<field name="att_xfer_replaced_by" type="first-of" as="Replaced-By"
-							value="variable_att_xfer_replaced_by|att_xfer_replaced_by" />
-					</fields>
-
-					<routing-key>
-						<param name="format_fields" value="#call,#CHANNEL_REPLACED,Unique-ID" />
-					</routing-key>
-
-				</event>
-
-				<event name="sofia::transferor">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="Event-Name" type="static" value="CHANNEL_TRANSFEROR" />
-					</fields>
-
-					<routing-key>
-						<param name="format_fields" value="#call,#CHANNEL_TRANSFEROR,Unique-ID" />
-					</routing-key>
-
-				</event>
-
-				<event name="sofia::transferee">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="Event-Name" type="static" value="CHANNEL_TRANSFEREE" />
-					</fields>
-
-					<routing-key>
-						<param name="format_fields" value="#call,#CHANNEL_TRANSFEREE,Unique-ID" />
-					</routing-key>
-
-				</event>
-
-				<event name="DTMF">
-					<filters>
-						<filter name="variable_conference_name" type="exclude"
-							compare="exists" />
-					</filters>
-					<fields verbose="false">
-						<field name="call_event_headers" type="reference" />
-						<field name="Custom-Channel-Vars" type="reference" />
-						<field name="Custom-Application-Vars" type="reference" />
-						<field name="DTMF-Digit" />
-						<field name="DTMF-Duration" serialize-as="number" />
-					</fields>
-				</event>
-
-				<event name="DETECTED_TONE">
-					<fields verbose="true">
-						<field name="call_event_headers" type="reference" />
-						<field name="Custom-Channel-Vars" type="reference" />
-						<field name="Custom-Application-Vars" type="reference" />
-					</fields>
-				</event>
-
-				<event name="RECORD_START">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="recording" type="reference" />
-
-						<field name="debug-call" type="reference" />
-					</fields>
-				</event>
-
-				<event name="RECORD_STOP">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="recording" type="reference" />
-						<field name="variable_playback_terminator_used" as="Terminator" />
-						<field name="variable_record_ms" as="Length" />
-						<field name="from-to" type="reference" />
-						<field name="variable_silence_hits_exhausted" as="Silence-Terminated"
-							serialize-as="boolean" />
-						<field name="Silence-Terminated" type="expand"
-							value="${cond(${variable_record_silence_hits} == 0 ? true : false)}"
-							serialize-as="boolean">
-							<filters>
-								<filter name="variable_silence_hits_exhausted" type="exclude"
-									compare="exists" />
-							</filters>
-						</field>
-
-						<field name="debug-call" type="reference" />
-
-					</fields>
-				</event>
-
-				<event name="conference::maintenance">
-					<fields verbose="false">
-						<field name="conference-event" type="reference" />
-					</fields>
-				</event>
-
-				<event name="kazoo::noop">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="application-uuid" type="reference" />
-						<field name="Application-Name" type="static" value="noop" />
-						<field name="kazoo_application_response" as="Application-Response" />
-						<field name="debug-call" type="reference" />
-					</fields>
-				</event>
-
-				<event name="kazoo::masquerade">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="application-uuid" type="reference" />
-						<field name="Application-Response" type="first-of"
-							value="variable_endpoint_disposition|variable_originate_disposition|#FAIL" />
-						<field name="Disposition" type="first-of"
-							value="variable_originate_disposition|variable_endpoint_disposition" />
-						<field name="Bridge-Hangup-Cause" type="first-of"
-							value="variable_bridge_hangup_cause|variable_last_bridge_hangup_cause" />
-						<field name="variable_endpoint_disposition" as="Endpoint-Disposition" />
-						<field name="variable_transfer_disposition" as="Transfer-Disposition" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_EXECUTE_COMPLETE">
-					<filters>
-						<filter type="exclude" compare="value" name="Application-UUID"
-							value="null" />
-						<filter type="include" compare="exists"
-							name="variable_Call-Control-Queue" />
-						<filter type="include" compare="exists" name="Application-UUID-Name" />
-						<filter type="exclude" name="Application-UUID-Name" value="set" />
-						<filter type="exclude" name="Application" value="set" />
-						<filter name="Application" value="park" />
-						<filter name="Application" value="export" />
-						<filter name="Application" value="event" />
-						<filter name="Application" value="unshift" />
-						<filter name="Application" value="kz_multiset" />
-						<filter name="Application" value="kz_multiunset" />
-						<filter name="Application" value="kz_prefix_unset" />
-						<filter name="Application" value="kz_export" />
-						<filter name="Application" value="ring_ready" />
-						<filter name="Application" value="log" />
-						<filter name="Application" value="execute_extension" />
-						<filter name="Application" value="bridge" />
-					</filters>
-
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="application-uuid" type="reference" />
-						<field name="Application-Response" type="first-of"
-							value="Application-Response|variable_originate_disposition|variable_endpoint_disposition|#NONE" />
-						<field name="Disposition" type="first-of"
-							value="variable_originate_disposition|variable_endpoint_disposition" />
-						<field name="Bridge-Hangup-Cause" type="first-of"
-							value="variable_bridge_hangup_cause|variable_last_bridge_hangup_cause" />
-						<field name="variable_endpoint_disposition" as="Endpoint-Disposition" />
-						<field name="variable_transfer_disposition" as="Transfer-Disposition" />
-
-						<field name="debug-call" type="reference" />
-					</fields>
-
-				</event>
-
-				<event name="spandsp::txfaxnegociateresult">
-					<fields verbose="false">
-						<field name="fax_event" type="reference" />
-						<field name="Application-Name" type="static" value="send_fax" />
-						<field name="Application-Event" type="static" value="negociateresult" />
-						<field name="Call-ID" type="first-of"
-							value="variable_sip_origination_call_uuid|Unique-ID" />
-					</fields>
-
-				</event>
-
-				<event name="spandsp::txfaxpageresult">
-					<fields verbose="false">
-						<field name="fax_event" type="reference" />
-						<field name="Application-Name" type="static" value="send_fax" />
-						<field name="Application-Event" type="static" value="pageresult" />
-						<field name="Call-ID" type="first-of"
-							value="variable_sip_origination_call_uuid|Unique-ID" />
-					</fields>
-
-				</event>
-
-				<event name="spandsp::txfaxresult">
-					<fields verbose="true">
-						<field name="fax_event" type="reference" />
-						<field name="Application-Name" type="static" value="send_fax" />
-						<field name="Application-Event" type="static" value="result" />
-						<field name="Call-ID" type="first-of"
-							value="variable_sip_origination_call_uuid|Unique-ID" />
-					</fields>
-
-				</event>
-
-				<event name="spandsp::rxfaxnegociateresult">
-					<fields verbose="false">
-						<field name="fax_event" type="reference" />
-						<field name="Application-Name" type="static" value="receive_fax" />
-						<field name="Application-Event" type="static" value="negociateresult" />
-					</fields>
-				</event>
-
-				<event name="spandsp::rxfaxpageresult">
-					<fields verbose="false">
-						<field name="fax_event" type="reference" />
-						<field name="Application-Name" type="static" value="receive_fax" />
-						<field name="Application-Event" type="static" value="pageresult" />
-					</fields>
-				</event>
-
-				<event name="spandsp::rxfaxresult">
-					<fields verbose="true">
-						<field name="fax_event" type="reference" />
-						<field name="Application-Name" type="static" value="receive_fax" />
-						<field name="Application-Event" type="static" value="result" />
-					</fields>
-				</event>
-
-				<event name="PRESENCE_IN">
-					<fields verbose="true">
-						<field name="call_event" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_DATA">
-					<filters>
-						<filter type="exclude" compare="exists" name="API-Command" />
-					</filters>
-					<fields verbose="true">
-						<field name="call_event" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_SYNC">
-					<fields verbose="true">
-						<field name="call_event" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CALL_SECURE">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="Custom-Channel-Vars" type="reference" />
-						<field name="Custom-Application-Vars" type="reference" />
-						<field name="debug-call" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CALL_UPDATE">
-					<fields verbose="true">
-						<field name="call_event" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_HOLD">
-					<fields verbose="true">
-						<field name="call_event" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_UNHOLD">
-					<fields verbose="true">
-						<field name="call_event" type="reference" />
-					</fields>
-				</event>
-
-				<event name="loopback::bowout">
-					<fields verbose="true">
-						<field name="call_event" type="reference" />
-						<field name="Event-Name" type="static" value="CHANNEL_REPLACED" />
-						<field name="Resigning-UUID" as="Call-ID" />
-						<field name="Resigning-UUID" />
-						<field name="Resigning-Peer-UUID" />
-						<field name="Acquired-UUID" />
-						<field name="Acquired-UUID" as="Replaced-By" />
-					</fields>
-				</event>
-
-				<event name="loopback::direct">
-					<fields verbose="true">
-						<field name="call_event" type="reference" />
-						<field name="Event-Name" type="static" value="CHANNEL_DIRECT" />
-						<field name="Resigning-UUID" as="Call-ID" />
-						<field name="Resigning-UUID" />
-						<field name="Resigning-Peer-UUID" />
-						<field name="Acquired-UUID" />
-						<field name="Acquired-UUID" as="Replaced-By" />
-						<field name="Connecting-Leg-A-UUID" />
-						<field name="Connecting-Leg-B-UUID" />
-					</fields>
-				</event>
-
-				<event name="HEARTBEAT">
-					<fields verbose="true">
-						<field name="Core-UUID" />
-						<field name="FreeSWITCH-Hostname" as="AS-FreeSWITCH-Hostname" />
-						<field name="First-Expanded-FreeSWITCH-Hostname" type="expand"
-							value="${FreeSWITCH-Hostname}" />
-						<field name="Second-Expanded-FreeSWITCH-Hostname" type="expand"
-							value="${Event-Date-Timestamp}@${FreeSWITCH-Hostname}" />
-						<field name="Event-Category" type="static" value="myfreeswitch-category" />
-						<field name="Event-Info" as="FreeSWITCH-Is-Ready" />
-						<field name="First-Check-First-Of" type="first-of"
-							value="Event-Calling-Line-Number|Event-Sequence" />
-						<field name="Second-Check-First-Of" type="first-of"
-							value="Non-Existing|Event-Calling-Line-Number|Event-Sequence" />
-						<field name="FreeSWITCH" type="start-with" />
-						<field name="Session-Since-Startup" serialize-as="number" />
-					</fields>
-				</event>
-
-				<event name="ROUTE_WINNER">
-					<fields verbose="false">
-						<field name="Event-Category" type="static" value="dialplan" />
-						<field name="Event-Subclass" as="Event-Name" />
-						<field name="Unique-ID" as="Call-ID" />
-						<field name="Fetch-UUID" />
-						<field name="Fetch-Winning-PID" />
-						<field name="Controller-Queue" />
-						<field name="Controller-PID" />
-						<field name="Request-From-PID" as="Reply-To-PID" />
-						<field name="App-Name" type="static" value="mod_kazoo" />
-						<field name="App-Version" type="static" value="1.0" />
-						<field name="Custom-Channel-Vars" type="reference" />
-					</fields>
-				</event>
-
-				<event name="CHANNEL_METAFLOW">
-					<fields verbose="false">
-						<field name="call_event" type="reference" />
-						<field name="from-to" type="reference" />
-						<field name="user-agent" type="reference" />
-						<field name="Metaflow-Collected-Digits" />
-					</fields>
-				</event>
-
-				<event name="KZ_CDR">
-					<fields verbose="false">
-						<field name="Event-Category" type="static" value="cdr" />
-						<field name="Event-Name" type="static" value="report" />
-						<field name="msg-id" type="reference" />
-						<field name="App-Name" type="static" value="freeswitch" />
-						<field name="App-Version" type="static" value="1.0" />
-						<field name="timestamp" type="reference" />
-						<field name="Unique-ID" as="Call-ID" />
-						<field name="Caller-Channel-Created-Time" as="Channel-Created-Time"
-							serialize-as="number" />
-						<field name="Core-UUID" as="Node" />
-						<field name="variable_domain_name" as="Domain-Name" />
-						<field name="variable_ecallmgr_Account-ID" as="Account-ID" />
-						<field name="call-interaction" type="reference" />
-						<field name="call-direction" type="reference" />
-						<field name="channel-state" type="reference" />
-						<field name="caller-id" type="reference" />
-						<field name="caller-context" type="reference" />
-						<field name="sip-tags" type="reference" />
-						<field name="presence-id" type="reference" />
-						<field name="loopback" type="reference" />
-						<field name="freeswitch-url" type="reference" />
-						<field name="user-agent" type="reference" />
-						<field name="Custom-Channel-Vars" type="reference" />
-						<field name="Custom-Application-Vars" type="reference" />
-						<field name="Control" type="reference" />
-						<field name="from-to" type="reference" />
-						<field name="other-leg" type="reference" />
-						<field name="sdp" type="reference" />
-						<field name="call-duration" type="reference" />
-						<field name="hangup-fields" type="reference" />
-						<field name="variable_Media-Recordings" as="Media-Recordings"
-							as-array="true" />
-						<field name="transfer-history" type="reference" />
-						<field name="originated-legs" type="reference" />
-						<field name="Extended-Data" type="static" serialize-as="object">
-							<fields verbose="false">
-								<field name="_json_callflow" as="Channel-CallFlow"
-									serialize-as="raw" />
-								<field name="_json_channel_stats" as="Channel-Stats"
-									serialize-as="raw" />
-								<field name="_json_application_log" as="Channel-Application-Log"
-									serialize-as="raw" />
-							</fields>
-						</field>
-						<field name="debug-call" type="reference" />
-					</fields>
-					<filters>
-						<filter name="${variable_Call-Control-Node}" type="include"
-							compare="field" value="Target-Node" />
-						<filter name="variable_hangup_cause" type="exclude"
-							compare="value" value="CALL_REJECTED" />
-						<filter name="variable_hangup_cause" type="exclude"
-							compare="value" value="WRONG_CALL_STATE" />
-					</filters>
-				</event>
-
-			</events>
-		</profile>
-	</event-handlers>
-
-	<fetch-handlers>
-
-		<profile name="configuration">
-
-			<fields verbose="true">
-				<field name="fetch-info" type="reference" />
-			</fields>
-
-			<params>
-				<param name="fetch-timeout" value="3500000" />
-				<param name="fetch-section" value="configuration" />
-			</params>
-
-			<logging>
-				<log name="info" value="SWITCH_LOG_INFO" />
-				<log name="success" value="SWITCH_LOG_INFO" />
-				<log name="time" value="SWITCH_LOG_INFO" />
-			</logging>
-
-		</profile>
-
-		<profile name="dialplan" profile-type="fetch">
-
-			<fields verbose="false">
-				<field name="voice_dialplan" type="reference" />
-				<field name="debug-call" type="reference" />
-			</fields>
-
-			<params>
-				<param name="fetch-timeout" value="3500000" />
-				<param name="fetch-section" value="dialplan" />
-			</params>
-
-		</profile>
-
-		<profile name="directory">
-
-			<fields verbose="true">
-				<field name="fetch-info" type="reference" />
-			</fields>
-
-			<params>
-				<param name="fetch-timeout" value="3500000" />
-				<param name="fetch-section" value="directory" />
-			</params>
-
-		</profile>
-
-		<profile name="channels">
-
-			<fields verbose="true">
-				<field name="fetch-info" type="reference" />
-				<field name="Event-Category" type="static" value="channels" />
-				<field name="Event-Name" type="static" value="channel_req" />
-			</fields>
-
-			<params>
-				<param name="fetch-timeout" value="3500000" />
-				<param name="fetch-section" value="channels" />
-			</params>
-
-		</profile>
-
-		<profile name="languages">
-
-			<fields verbose="true">
-				<field name="fetch-info" type="reference" />
-				<field name="Event-Category" type="static" value="languages" />
-				<field name="Event-Name" type="static" value="language_req" />
-			</fields>
-
-			<params>
-				<param name="fetch-timeout" value="3500000" />
-				<param name="fetch-section" value="languages" />
-			</params>
-
-		</profile>
-
-		<profile name="chatplan">
-
-			<fields verbose="true">
-				<field name="fetch-info" type="reference" />
-			</fields>
-
-			<params>
-				<param name="fetch-timeout" value="3500000" />
-				<param name="fetch-section" value="chatplan" />
-			</params>
-
-			<logging>
-				<log name="info" value="SWITCH_LOG_INFO" />
-				<log name="success" value="SWITCH_LOG_INFO" />
-				<log name="time" value="SWITCH_LOG_INFO" />
-			</logging>
-
-		</profile>
-
-	</fetch-handlers>
-
-</configuration>
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_api.c b/src/mod/event_handlers/mod_kazoo/kazoo_api.c
deleted file mode 100644
index 96f9ff7bb4..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_api.c
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Karl Anderson <karl@2600hz.com>
- * Darren Schreiber <darren@2600hz.com>
- *
- *
- * mod_kazoo.c -- Socket Controlled Event Handler
- *
- */
-#include "mod_kazoo.h"
-
-#define KAZOO_DESC "kazoo information"
-#define KAZOO_SYNTAX "<command> [<args>]"
-
-#define API_COMMAND_DISCONNECT 0
-#define API_COMMAND_REMOTE_IP 1
-#define API_COMMAND_STREAMS 2
-#define API_COMMAND_BINDINGS 3
-#define API_COMMAND_OPTION 4
-
-#define API_NODE_OPTION_FRAMING 0
-#define API_NODE_OPTION_KEEPALIVE 1
-#define API_NODE_OPTION_LEGACY 2
-#define API_NODE_OPTION_MAX 99
-
-static const char *node_runtime_options[] = {
-		"event-stream-framing",
-		"event-stream-keepalive",
-		"enable-legacy",
-		NULL
-};
-
-static int api_find_node_option(char *option) {
-	int i;
-	for(i = 0; node_runtime_options[i] != NULL; i++) {
-		if(!strcasecmp(option, node_runtime_options[i])) {
-			return i;
-		}
-	}
-	return API_NODE_OPTION_MAX;
-}
-
-static switch_status_t api_get_node_option(ei_node_t *ei_node, switch_stream_handle_t *stream, char *arg) {
-	int option = api_find_node_option(arg);
-	switch_status_t ret = SWITCH_STATUS_SUCCESS;
-	switch (option) {
-	case API_NODE_OPTION_FRAMING:
-		stream->write_function(stream, "+OK %i", ei_node->event_stream_framing);
-		break;
-
-	case API_NODE_OPTION_KEEPALIVE:
-		stream->write_function(stream, "+OK %i", ei_node->event_stream_keepalive);
-		break;
-
-	case API_NODE_OPTION_LEGACY:
-		stream->write_function(stream, "+OK %s", ei_node->legacy ? "true" : "false");
-		break;
-
-	default:
-		stream->write_function(stream, "-ERR invalid option %s", arg);
-		ret = SWITCH_STATUS_NOTFOUND;
-		break;
-	}
-
-	return ret;
-}
-
-static switch_status_t api_set_node_option(ei_node_t *ei_node, switch_stream_handle_t *stream, char *name, char *value) {
-	int option = api_find_node_option(name);
-	short val;
-	switch_status_t ret = SWITCH_STATUS_SUCCESS;
-	switch (option) {
-	case API_NODE_OPTION_FRAMING:
-		val = atoi(value);
-		if (val != 1 && val != 2 && val != 4) {
-			stream->write_function(stream, "-ERR Invalid event stream framing value (%i)", val);
-			ret = SWITCH_STATUS_GENERR;
-		} else {
-			stream->write_function(stream, "+OK %i", val);
-			ei_node->event_stream_framing = val;
-		}
-		break;
-
-	case API_NODE_OPTION_KEEPALIVE:
-		val = switch_true(value);
-		stream->write_function(stream, "+OK %i", val);
-		ei_node->event_stream_keepalive = val;
-		break;
-
-	case API_NODE_OPTION_LEGACY:
-		ei_node->legacy = switch_true(value);
-		stream->write_function(stream, "+OK %s", ei_node->legacy ? "true" : "false");
-		break;
-
-	default:
-		stream->write_function(stream, "-ERR invalid option %s", name);
-		ret = SWITCH_STATUS_NOTFOUND;
-		break;
-	}
-
-	return ret;
-}
-
-static switch_status_t api_erlang_status(switch_stream_handle_t *stream) {
-	switch_sockaddr_t *sa;
-	uint16_t port;
-	char ipbuf[48];
-	const char *ip_addr;
-	ei_node_t *ei_node;
-
-	switch_socket_addr_get(&sa, SWITCH_FALSE, kazoo_globals.acceptor);
-
-	port = switch_sockaddr_get_port(sa);
-	ip_addr = switch_get_addr(ipbuf, sizeof (ipbuf), sa);
-
-	stream->write_function(stream, "Running %s\n", VERSION);
-	stream->write_function(stream, "Listening for new Erlang connections on %s:%u with cookie %s\n", ip_addr, port, kazoo_globals.ei_cookie);
-	stream->write_function(stream, "Registered as Erlang node %s, visible as %s\n", kazoo_globals.ei_cnode.thisnodename, kazoo_globals.ei_cnode.thisalivename);
-
-	if (kazoo_globals.ei_compat_rel) {
-		stream->write_function(stream, "Using Erlang compatibility mode: %d\n", kazoo_globals.ei_compat_rel);
-	}
-
-	switch_thread_rwlock_rdlock(kazoo_globals.ei_nodes_lock);
-	ei_node = kazoo_globals.ei_nodes;
-	if (!ei_node) {
-		stream->write_function(stream, "No erlang nodes connected\n");
-	} else {
-		stream->write_function(stream, "Connected to:\n");
-		while(ei_node != NULL) {
-			unsigned int year, day, hour, min, sec, delta;
-
-			delta = (switch_micro_time_now() - ei_node->created_time) / 1000000;
-			sec = delta % 60;
-			min = delta / 60 % 60;
-			hour = delta / 3600 % 24;
-			day = delta / 86400 % 7;
-			year = delta / 31556926 % 12;
-			stream->write_function(stream, "  %s (%s:%d) up %d years, %d days, %d hours, %d minutes, %d seconds\n"
-								   ,ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port, year, day, hour, min, sec);
-			ei_node = ei_node->next;
-		}
-	}
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t api_erlang_event_filter(switch_stream_handle_t *stream) {
-	switch_hash_index_t *hi = NULL;
-	int column = 0;
-	int idx = 0;
-
-	for (hi = (switch_hash_index_t *)switch_core_hash_first_iter(kazoo_globals.event_filter, hi); hi; hi = switch_core_hash_next(&hi)) {
-		const void *key;
-		void *val;
-		switch_core_hash_this(hi, &key, NULL, &val);
-		stream->write_function(stream, "%-50s", (char *)key);
-		if (++column > 2) {
-			stream->write_function(stream, "\n");
-			column = 0;
-		}
-	}
-
-	if (++column > 2) {
-		stream->write_function(stream, "\n");
-	}
-
-	while(kazoo_globals.kazoo_var_prefixes[idx] != NULL) {
-		char var[100];
-		char *prefix = kazoo_globals.kazoo_var_prefixes[idx];
-		sprintf(var, "%s*", prefix);
-		stream->write_function(stream, "%-50s", var);
-		idx++;
-	}
-
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t api_erlang_nodes_list(switch_stream_handle_t *stream) {
-	ei_node_t *ei_node;
-
-	switch_thread_rwlock_rdlock(kazoo_globals.ei_nodes_lock);
-	ei_node = kazoo_globals.ei_nodes;
-	while(ei_node != NULL) {
-		stream->write_function(stream, "%s (%s)\n", ei_node->peer_nodename, ei_node->remote_ip);
-		ei_node = ei_node->next;
-	}
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t api_erlang_nodes_count(switch_stream_handle_t *stream) {
-	ei_node_t *ei_node;
-	int count = 0;
-
-	switch_thread_rwlock_rdlock(kazoo_globals.ei_nodes_lock);
-	ei_node = kazoo_globals.ei_nodes;
-	while(ei_node != NULL) {
-		count++;
-		ei_node = ei_node->next;
-	}
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-
-	stream->write_function(stream, "%d\n", count);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t api_complete_erlang_node(const char *line, const char *cursor, switch_console_callback_match_t **matches) {
-	switch_console_callback_match_t *my_matches = NULL;
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	ei_node_t *ei_node;
-
-	switch_thread_rwlock_rdlock(kazoo_globals.ei_nodes_lock);
-	ei_node = kazoo_globals.ei_nodes;
-	while(ei_node != NULL) {
-		switch_console_push_match(&my_matches, ei_node->peer_nodename);
-		ei_node = ei_node->next;
-	}
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-
-	if (my_matches) {
-		*matches = my_matches;
-		status = SWITCH_STATUS_SUCCESS;
-	}
-
-	return status;
-}
-
-static switch_status_t handle_node_api_event_stream(ei_event_stream_t *event_stream, switch_stream_handle_t *stream) {
-	ei_event_binding_t *binding;
-	int column = 0;
-
-	switch_mutex_lock(event_stream->socket_mutex);
-	if (event_stream->connected == SWITCH_FALSE) {
-		switch_sockaddr_t *sa;
-		uint16_t port;
-		char ipbuf[48] = {0};
-		const char *ip_addr;
-
-		switch_socket_addr_get(&sa, SWITCH_TRUE, event_stream->acceptor);
-		port = switch_sockaddr_get_port(sa);
-		ip_addr = switch_get_addr(ipbuf, sizeof (ipbuf), sa);
-
-		if (zstr(ip_addr)) {
-			ip_addr = kazoo_globals.ip;
-		}
-
-		stream->write_function(stream, "%s:%d -> disconnected\n"
-							   ,ip_addr, port);
-	} else {
-		unsigned int year, day, hour, min, sec, delta;
-
-		delta = (switch_micro_time_now() - event_stream->connected_time) / 1000000;
-		sec = delta % 60;
-		min = delta / 60 % 60;
-		hour = delta / 3600 % 24;
-		day = delta / 86400 % 7;
-		year = delta / 31556926 % 12;
-
-		stream->write_function(stream, "%s:%d -> %s:%d for %d years, %d days, %d hours, %d minutes, %d seconds\n"
-							   ,event_stream->local_ip, event_stream->local_port
-							   ,event_stream->remote_ip, event_stream->remote_port
-							   ,year, day, hour, min, sec);
-	}
-
-	binding = event_stream->bindings;
-	while(binding != NULL) {
-		if (binding->type == SWITCH_EVENT_CUSTOM) {
-			stream->write_function(stream, "CUSTOM %-43s", binding->subclass_name);
-		} else {
-			stream->write_function(stream, "%-50s", switch_event_name(binding->type));
-		}
-
-		if (++column > 2) {
-			stream->write_function(stream, "\n");
-			column = 0;
-		}
-
-		binding = binding->next;
-	}
-	switch_mutex_unlock(event_stream->socket_mutex);
-
-	if (!column) {
-		stream->write_function(stream, "\n");
-	} else {
-		stream->write_function(stream, "\n\n");
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_node_api_event_streams(ei_node_t *ei_node, switch_stream_handle_t *stream) {
-	ei_event_stream_t *event_stream;
-
-	switch_mutex_lock(ei_node->event_streams_mutex);
-	event_stream = ei_node->event_streams;
-	while(event_stream != NULL) {
-		handle_node_api_event_stream(event_stream, stream);
-		event_stream = event_stream->next;
-	}
-	switch_mutex_unlock(ei_node->event_streams_mutex);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_node_api_command(ei_node_t *ei_node, switch_stream_handle_t *stream, uint32_t command) {
-	unsigned int year, day, hour, min, sec, delta;
-
-	switch (command) {
-	case API_COMMAND_DISCONNECT:
-		stream->write_function(stream, "Disconnecting erlang node %s at managers request\n", ei_node->peer_nodename);
-		switch_clear_flag(ei_node, LFLAG_RUNNING);
-		break;
-	case API_COMMAND_REMOTE_IP:
-		delta = (switch_micro_time_now() - ei_node->created_time) / 1000000;
-		sec = delta % 60;
-		min = delta / 60 % 60;
-		hour = delta / 3600 % 24;
-		day = delta / 86400 % 7;
-		year = delta / 31556926 % 12;
-
-		stream->write_function(stream, "Uptime           %d years, %d days, %d hours, %d minutes, %d seconds\n", year, day, hour, min, sec);
-		stream->write_function(stream, "Local Address    %s:%d\n", ei_node->local_ip, ei_node->local_port);
-		stream->write_function(stream, "Remote Address   %s:%d\n", ei_node->remote_ip, ei_node->remote_port);
-		break;
-	case API_COMMAND_STREAMS:
-		handle_node_api_event_streams(ei_node, stream);
-		break;
-	case API_COMMAND_BINDINGS:
-		handle_api_command_streams(ei_node, stream);
-		break;
-	default:
-		break;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t api_erlang_node_command(switch_stream_handle_t *stream, const char *nodename, uint32_t command) {
-	ei_node_t *ei_node;
-
-	switch_thread_rwlock_rdlock(kazoo_globals.ei_nodes_lock);
-	ei_node = kazoo_globals.ei_nodes;
-	while(ei_node != NULL) {
-		int length = strlen(ei_node->peer_nodename);
-
-		if (!strncmp(ei_node->peer_nodename, nodename, length)) {
-			handle_node_api_command(ei_node, stream, command);
-			switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		ei_node = ei_node->next;
-	}
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-
-	return SWITCH_STATUS_NOTFOUND;
-}
-
-static switch_status_t handle_node_api_command_arg(ei_node_t *ei_node, switch_stream_handle_t *stream, uint32_t command, char *arg) {
-
-	switch (command) {
-	case API_COMMAND_OPTION:
-		return api_get_node_option(ei_node, stream, arg);
-		break;
-	default:
-		break;
-	}
-
-	return SWITCH_STATUS_NOTFOUND;
-}
-
-static switch_status_t handle_node_api_command_args(ei_node_t *ei_node, switch_stream_handle_t *stream, uint32_t command, int argc, char *argv[]) {
-
-	switch (command) {
-	case API_COMMAND_OPTION:
-		return api_set_node_option(ei_node, stream, argv[0], argv[1]);
-		break;
-	default:
-		break;
-	}
-
-	return SWITCH_STATUS_NOTFOUND;
-}
-
-static switch_status_t api_erlang_node_command_arg(switch_stream_handle_t *stream, const char *nodename, uint32_t command, char *arg) {
-	ei_node_t *ei_node;
-	switch_status_t ret = SWITCH_STATUS_NOTFOUND;
-
-	switch_thread_rwlock_rdlock(kazoo_globals.ei_nodes_lock);
-	ei_node = kazoo_globals.ei_nodes;
-	while(ei_node != NULL) {
-		int length = strlen(ei_node->peer_nodename);
-
-		if (!strncmp(ei_node->peer_nodename, nodename, length)) {
-			ret = handle_node_api_command_arg(ei_node, stream, command, arg);
-			switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-			return ret ;
-		}
-
-		ei_node = ei_node->next;
-	}
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-
-	return ret;
-}
-
-static switch_status_t api_erlang_node_command_args(switch_stream_handle_t *stream, const char *nodename, uint32_t command, int argc, char *argv[]) {
-	ei_node_t *ei_node;
-	switch_status_t ret = SWITCH_STATUS_NOTFOUND;
-
-	switch_thread_rwlock_rdlock(kazoo_globals.ei_nodes_lock);
-	ei_node = kazoo_globals.ei_nodes;
-	while(ei_node != NULL) {
-		int length = strlen(ei_node->peer_nodename);
-
-		if (!strncmp(ei_node->peer_nodename, nodename, length)) {
-			ret = handle_node_api_command_args(ei_node, stream, command, argc, argv);
-			switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-			return ret;
-		}
-
-		ei_node = ei_node->next;
-	}
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-
-	return ret;
-}
-
-SWITCH_STANDARD_API(exec_api_cmd)
-{
-	char *argv[1024] = { 0 };
-	int unknown_command = 1, argc = 0;
-	char *mycmd = NULL;
-
-	const char *usage_string = "USAGE:\n"
-		"--------------------------------------------------------------------------------------------------------------------\n"
-		"erlang status                            - provides an overview of the current status\n"
-		"erlang event_filter                      - lists the event headers that will be sent to Erlang nodes\n"
-		"erlang nodes list                        - lists connected Erlang nodes (usefull for monitoring tools)\n"
-		"erlang nodes count                       - provides a count of connected Erlang nodes (usefull for monitoring tools)\n"
-		"erlang node <node_name> disconnect       - disconnects an Erlang node\n"
-		"erlang node <node_name> connection       - Shows the connection info\n"
-		"erlang node <node_name> event_streams    - lists the event streams for an Erlang node\n"
-		"erlang node <node_name> fetch_bindings   - lists the XML fetch bindings for an Erlang node\n"
-		"---------------------------------------------------------------------------------------------------------------------\n";
-
-	if (zstr(cmd)) {
-		stream->write_function(stream, "%s", usage_string);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (!(mycmd = strdup(cmd))) {
-		return SWITCH_STATUS_MEMERR;
-	}
-
-	if (!(argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
-		stream->write_function(stream, "%s", usage_string);
-		switch_safe_free(mycmd);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (zstr(argv[0])) {
-		stream->write_function(stream, "%s", usage_string);
-		switch_safe_free(mycmd);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (!strncmp(argv[0], "status", 7)) {
-		unknown_command = 0;
-		api_erlang_status(stream);
-	} else if (!strncmp(argv[0], "event_filter", 13)) {
-		unknown_command = 0;
-		api_erlang_event_filter(stream);
-	} else if (!strncmp(argv[0], "nodes", 6) && !zstr(argv[1])) {
-		if (!strncmp(argv[1], "list", 6)) {
-			unknown_command = 0;
-			api_erlang_nodes_list(stream);
-		} else if (!strncmp(argv[1], "count", 6)) {
-			unknown_command = 0;
-			api_erlang_nodes_count(stream);
-		}
-	} else if (!strncmp(argv[0], "node", 6) && !zstr(argv[1]) && !zstr(argv[2])) {
-		if (!strncmp(argv[2], "disconnect", 11)) {
-			unknown_command = 0;
-			api_erlang_node_command(stream, argv[1], API_COMMAND_DISCONNECT);
-		} else if (!strncmp(argv[2], "connection", 11)) {
-			unknown_command = 0;
-			api_erlang_node_command(stream, argv[1], API_COMMAND_REMOTE_IP);
-		} else if (!strncmp(argv[2], "event_streams", 14)) {
-			unknown_command = 0;
-			api_erlang_node_command(stream, argv[1], API_COMMAND_STREAMS);
-		} else if (!strncmp(argv[2], "fetch_bindings", 15)) {
-			unknown_command = 0;
-			api_erlang_node_command(stream, argv[1], API_COMMAND_BINDINGS);
-		} else if (!strncmp(argv[2], "option", 7) && !zstr(argv[3])) {
-			unknown_command = 0;
-			if(argc > 4 && !zstr(argv[4]))
-				api_erlang_node_command_args(stream, argv[1], API_COMMAND_OPTION, argc - 3, &argv[3]);
-			else
-				api_erlang_node_command_arg(stream, argv[1], API_COMMAND_OPTION, argv[3]);
-		}
-	}
-
-	if (unknown_command) {
-		stream->write_function(stream, "%s", usage_string);
-	}
-
-	switch_safe_free(mycmd);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-void add_cli_api(switch_loadable_module_interface_t **module_interface)
-{
-	switch_api_interface_t *api_interface = NULL;
-	SWITCH_ADD_API(api_interface, "erlang", KAZOO_DESC, exec_api_cmd, KAZOO_SYNTAX);
-	switch_console_set_complete("add erlang status");
-	switch_console_set_complete("add erlang event_filter");
-	switch_console_set_complete("add erlang nodes list");
-	switch_console_set_complete("add erlang nodes count");
-	switch_console_set_complete("add erlang node ::erlang::node disconnect");
-	switch_console_set_complete("add erlang node ::erlang::node connection");
-	switch_console_set_complete("add erlang node ::erlang::node event_streams");
-	switch_console_set_complete("add erlang node ::erlang::node fetch_bindings");
-	switch_console_add_complete_func("::erlang::node", api_complete_erlang_node);
-
-}
-
-void remove_cli_api()
-{
-	switch_console_set_complete("del erlang");
-	switch_console_del_complete_func("::erlang::node");
-
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_cdr.c b/src/mod/event_handlers/mod_kazoo/kazoo_cdr.c
deleted file mode 100644
index fef66f8be3..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_cdr.c
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Luis Azedo <luis@2600hz.com>
- *
- * mod_hacks.c -- hacks with state handlers
- *
- */
-#include "mod_kazoo.h"
-
-#define MY_EVENT_JSON_CDR "KZ_CDR"
-
-#define maybe_add_json_string(_json, _name, _string) \
-	if (!zstr(_string)) cJSON_AddItemToObject(_json, _name, cJSON_CreateString((char *)_string))
-
-static void kz_switch_ivr_set_json_profile_data(cJSON *json, switch_caller_profile_t *caller_profile)
-{
-	cJSON *soft = NULL;
-	profile_node_t *pn = NULL;
-
-	maybe_add_json_string(json, "Username", caller_profile->username);
-	maybe_add_json_string(json, "Dialplan", caller_profile->dialplan);
-	maybe_add_json_string(json, "ANI", caller_profile->ani);
-	maybe_add_json_string(json, "ANIII", caller_profile->aniii);
-	maybe_add_json_string(json, "Caller-ID-Name", caller_profile->caller_id_name);
-	maybe_add_json_string(json, "Caller-ID-Number", caller_profile->caller_id_number);
-	maybe_add_json_string(json, "Caller-ID-Original-Name", caller_profile->orig_caller_id_name);
-	maybe_add_json_string(json, "Caller-ID-Original-Number", caller_profile->orig_caller_id_number);
-	maybe_add_json_string(json, "Network-Address", caller_profile->network_addr);
-	maybe_add_json_string(json, "RDNIS", caller_profile->rdnis);
-	maybe_add_json_string(json, "Destination-Number", caller_profile->destination_number);
-	maybe_add_json_string(json, "Callee-ID-Name", caller_profile->callee_id_name);
-	maybe_add_json_string(json, "Callee-ID-Number", caller_profile->callee_id_number);
-	maybe_add_json_string(json, "UUID", caller_profile->uuid);
-	maybe_add_json_string(json, "Source", caller_profile->source);
-	maybe_add_json_string(json, "Context", caller_profile->context);
-	maybe_add_json_string(json, "Channel-Name", caller_profile->chan_name);
-	maybe_add_json_string(json, "Profile-UUID", caller_profile->uuid_str);
-	maybe_add_json_string(json, "Profile-Clone-Of", caller_profile->clone_of);
-	maybe_add_json_string(json, "Transfer-Source", caller_profile->transfer_source);
-	cJSON_AddItemToObject(json, "Direction", cJSON_CreateString(caller_profile->direction == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound"));
-	cJSON_AddItemToObject(json, "Logical-Direction", cJSON_CreateString(caller_profile->logical_direction == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound"));
-
-	soft = cJSON_CreateObject();
-	for (pn = caller_profile->soft; pn; pn = pn->next) {
-		maybe_add_json_string(soft, pn->var, pn->val);
-	}
-
-	cJSON_AddItemToObject(json, "Directory", soft);
-}
-
-SWITCH_DECLARE(void) kz_switch_ivr_set_json_call_flaws(cJSON *json, switch_core_session_t *session, switch_media_type_t type)
-{
-	const char *name = (type == SWITCH_MEDIA_TYPE_VIDEO) ? "Video" : "Audio";
-	cJSON *j_stat;
-	switch_rtp_stats_t *stats = switch_core_media_get_stats(session, type, NULL);
-
-	if (!stats) return;
-
-	if (!stats->inbound.error_log && !stats->outbound.error_log) return;
-
-	j_stat = cJSON_CreateObject();
-	cJSON_AddItemToObject(json, name, j_stat);
-
-	if (stats->inbound.error_log) {
-		cJSON *j_err_log, *j_err, *j_in;
-		switch_error_period_t *ep;
-
-		j_in = cJSON_CreateObject();
-		cJSON_AddItemToObject(j_stat, "Inbound", j_in);
-
-		j_err_log = cJSON_CreateArray();
-		cJSON_AddItemToObject(j_in, "Error-Log", j_err_log);
-
-		for(ep = stats->inbound.error_log; ep; ep = ep->next) {
-
-			if (!(ep->start && ep->stop)) continue;
-
-			j_err = cJSON_CreateObject();
-
-			cJSON_AddItemToObject(j_err, "Start", cJSON_CreateNumber(ep->start));
-			cJSON_AddItemToObject(j_err, "Stop", cJSON_CreateNumber(ep->stop));
-			cJSON_AddItemToObject(j_err, "Flaws", cJSON_CreateNumber(ep->flaws));
-			cJSON_AddItemToObject(j_err, "Consecutive-Flaws", cJSON_CreateNumber(ep->consecutive_flaws));
-			cJSON_AddItemToObject(j_err, "Duration-MS", cJSON_CreateNumber((ep->stop - ep->start) / 1000));
-			cJSON_AddItemToArray(j_err_log, j_err);
-		}
-	}
-
-	if (stats->outbound.error_log) {
-		cJSON *j_err_log, *j_err, *j_out;
-		switch_error_period_t *ep;
-
-		j_out = cJSON_CreateObject();
-		cJSON_AddItemToObject(j_stat, "Outbound", j_out);
-
-		j_err_log = cJSON_CreateArray();
-		cJSON_AddItemToObject(j_out, "Error-Log", j_err_log);
-
-		for(ep = stats->outbound.error_log; ep; ep = ep->next) {
-
-			if (!(ep->start && ep->stop)) continue;
-
-			j_err = cJSON_CreateObject();
-
-			cJSON_AddItemToObject(j_err, "Start", cJSON_CreateNumber(ep->start));
-			cJSON_AddItemToObject(j_err, "Stop", cJSON_CreateNumber(ep->stop));
-			cJSON_AddItemToObject(j_err, "Flaws", cJSON_CreateNumber(ep->flaws));
-			cJSON_AddItemToObject(j_err, "Consecutive-Flaws", cJSON_CreateNumber(ep->consecutive_flaws));
-			cJSON_AddItemToObject(j_err, "Duration-MS", cJSON_CreateNumber((ep->stop - ep->start) / 1000));
-			cJSON_AddItemToArray(j_err_log, j_err);
-		}
-	}
-}
-
-#define add_jstat(_j, _i, _s)											\
-	switch_snprintf(var_val, sizeof(var_val), "%" SWITCH_SIZE_T_FMT, _i); \
-	cJSON_AddItemToObject(_j, _s, cJSON_CreateNumber(_i))
-
-SWITCH_DECLARE(void) kz_switch_ivr_set_json_call_stats(cJSON *json, switch_core_session_t *session, switch_media_type_t type)
-{
-	const char *name = (type == SWITCH_MEDIA_TYPE_VIDEO) ? "Video" : "Audio";
-	cJSON *j_stat, *j_in, *j_out;
-	switch_rtp_stats_t *stats = switch_core_media_get_stats(session, type, NULL);
-	char var_val[35] = "";
-
-	if (!stats) return;
-
-	j_stat = cJSON_CreateObject();
-	j_in = cJSON_CreateObject();
-	j_out = cJSON_CreateObject();
-
-	cJSON_AddItemToObject(json, name, j_stat);
-	cJSON_AddItemToObject(j_stat, "Inbound", j_in);
-	cJSON_AddItemToObject(j_stat, "Outbound", j_out);
-
-	stats->inbound.std_deviation = sqrt(stats->inbound.variance);
-
-	add_jstat(j_in, stats->inbound.raw_bytes, "Raw-Bytes");
-	add_jstat(j_in, stats->inbound.media_bytes, "Media-Bytes");
-	add_jstat(j_in, stats->inbound.packet_count, "Packet-Count");
-	add_jstat(j_in, stats->inbound.media_packet_count, "Media-Packet-Count");
-	add_jstat(j_in, stats->inbound.skip_packet_count, "Skip-Packet-Count");
-	add_jstat(j_in, stats->inbound.jb_packet_count, "Jitter-Packet-Count");
-	add_jstat(j_in, stats->inbound.dtmf_packet_count, "DTMF-Packet-Count");
-	add_jstat(j_in, stats->inbound.cng_packet_count, "CNG-Packet-Count");
-	add_jstat(j_in, stats->inbound.flush_packet_count, "Flush-Packet-Count");
-	add_jstat(j_in, stats->inbound.largest_jb_size, "Largest-JB-Size");
-	add_jstat(j_in, stats->inbound.min_variance, "Jitter-Min-Variance");
-	add_jstat(j_in, stats->inbound.max_variance, "Jitter-Max-Variance");
-	add_jstat(j_in, stats->inbound.lossrate, "Jitter-Loss-Rate");
-	add_jstat(j_in, stats->inbound.burstrate, "Jitter-Burst-Rate");
-	add_jstat(j_in, stats->inbound.mean_interval, "Mean-Interval");
-	add_jstat(j_in, stats->inbound.flaws, "Flaw-Total");
-	add_jstat(j_in, stats->inbound.R, "Quality-Percentage");
-	add_jstat(j_in, stats->inbound.mos, "MOS");
-
-
-	add_jstat(j_out, stats->outbound.raw_bytes, "Raw-Bytes");
-	add_jstat(j_out, stats->outbound.media_bytes, "Media-Bytes");
-	add_jstat(j_out, stats->outbound.packet_count, "Packet-Count");
-	add_jstat(j_out, stats->outbound.media_packet_count, "Media-Packet-Count");
-	add_jstat(j_out, stats->outbound.skip_packet_count, "Skip-Packet-Count");
-	add_jstat(j_out, stats->outbound.dtmf_packet_count, "DTMF-Packet-Count");
-	add_jstat(j_out, stats->outbound.cng_packet_count, "CNG-Packet-Count");
-	add_jstat(j_out, stats->rtcp.packet_count, "RTCP-Packet-Count");
-	add_jstat(j_out, stats->rtcp.octet_count, "RTCP-Octet-Count");
-}
-
-static switch_status_t kz_report_channel_flaws(switch_core_session_t *session, switch_event_t *cdr_event)
-{
-	cJSON *callStats = cJSON_CreateObject();
-
-	kz_switch_ivr_set_json_call_flaws(callStats, session, SWITCH_MEDIA_TYPE_AUDIO);
-	kz_switch_ivr_set_json_call_flaws(callStats, session, SWITCH_MEDIA_TYPE_VIDEO);
-
-	switch_event_add_header_string_nodup(cdr_event, SWITCH_STACK_BOTTOM, "_json_channel_media_errors", cJSON_PrintUnformatted(callStats));
-
-	cJSON_Delete(callStats);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t kz_report_channel_stats(switch_core_session_t *session, switch_event_t *cdr_event)
-{
-	cJSON *callStats = cJSON_CreateObject();
-
-	kz_switch_ivr_set_json_call_stats(callStats, session, SWITCH_MEDIA_TYPE_AUDIO);
-	kz_switch_ivr_set_json_call_stats(callStats, session, SWITCH_MEDIA_TYPE_VIDEO);
-
-	switch_event_add_header_string_nodup(cdr_event, SWITCH_STACK_BOTTOM, "_json_channel_stats", cJSON_PrintUnformatted(callStats));
-
-	cJSON_Delete(callStats);
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t kz_report_app_log(switch_core_session_t *session, switch_event_t *cdr_event)
-{
-	switch_app_log_t *ap, *app_log = switch_core_session_get_app_log(session);
-	cJSON *j_apps = NULL;
-
-	if (!app_log) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	j_apps = cJSON_CreateArray();
-
-	for (ap = app_log; ap; ap = ap->next) {
-		cJSON *j_application = cJSON_CreateObject();
-		cJSON_AddItemToObject(j_application, "app_name", cJSON_CreateString(ap->app));
-		cJSON_AddItemToObject(j_application, "app_data", cJSON_CreateString(ap->arg));
-		cJSON_AddItemToObject(j_application, "app_stamp", cJSON_CreateNumber(ap->stamp));
-		cJSON_AddItemToArray(j_apps, j_application);
-	}
-
-	switch_event_add_header_string_nodup(cdr_event, SWITCH_STACK_BOTTOM, "_json_application_log", cJSON_PrintUnformatted(j_apps));
-
-	cJSON_Delete(j_apps);
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t kz_report_callflow_extension(switch_caller_profile_t *caller_profile, cJSON *j_profile)
-{
-	cJSON *j_caller_extension, *j_caller_extension_apps, *j_application, *j_inner_extension;
-	if (caller_profile->caller_extension) {
-		switch_caller_application_t *ap;
-
-		j_caller_extension = cJSON_CreateObject();
-		j_caller_extension_apps = cJSON_CreateArray();
-
-		cJSON_AddItemToObject(j_profile, "extension", j_caller_extension);
-
-		cJSON_AddItemToObject(j_caller_extension, "name", cJSON_CreateString(caller_profile->caller_extension->extension_name));
-		cJSON_AddItemToObject(j_caller_extension, "number", cJSON_CreateString(caller_profile->caller_extension->extension_number));
-		cJSON_AddItemToObject(j_caller_extension, "applications", j_caller_extension_apps);
-
-		if (caller_profile->caller_extension->current_application) {
-			cJSON_AddItemToObject(j_caller_extension, "current_app", cJSON_CreateString(caller_profile->caller_extension->current_application->application_name));
-		}
-
-		for (ap = caller_profile->caller_extension->applications; ap; ap = ap->next) {
-			j_application = cJSON_CreateObject();
-
-			cJSON_AddItemToArray(j_caller_extension_apps, j_application);
-
-			if (ap == caller_profile->caller_extension->current_application) {
-				cJSON_AddItemToObject(j_application, "last_executed", cJSON_CreateString("true"));
-			}
-			cJSON_AddItemToObject(j_application, "app_name", cJSON_CreateString(ap->application_name));
-			cJSON_AddItemToObject(j_application, "app_data", cJSON_CreateString(switch_str_nil(ap->application_data)));
-		}
-
-		if (caller_profile->caller_extension->children) {
-			switch_caller_profile_t *cp = NULL;
-			j_inner_extension = cJSON_CreateArray();
-			cJSON_AddItemToObject(j_caller_extension, "sub_extensions", j_inner_extension);
-			for (cp = caller_profile->caller_extension->children; cp; cp = cp->next) {
-
-				if (!cp->caller_extension) {
-					continue;
-				}
-
-				j_caller_extension = cJSON_CreateObject();
-				cJSON_AddItemToArray(j_inner_extension, j_caller_extension);
-
-				cJSON_AddItemToObject(j_caller_extension, "name", cJSON_CreateString(cp->caller_extension->extension_name));
-				cJSON_AddItemToObject(j_caller_extension, "number", cJSON_CreateString(cp->caller_extension->extension_number));
-
-				cJSON_AddItemToObject(j_caller_extension, "dialplan", cJSON_CreateString((char *)cp->dialplan));
-
-				if (cp->caller_extension->current_application) {
-					cJSON_AddItemToObject(j_caller_extension, "current_app", cJSON_CreateString(cp->caller_extension->current_application->application_name));
-				}
-
-				j_caller_extension_apps = cJSON_CreateArray();
-				cJSON_AddItemToObject(j_caller_extension, "applications", j_caller_extension_apps);
-				for (ap = cp->caller_extension->applications; ap; ap = ap->next) {
-					j_application = cJSON_CreateObject();
-					cJSON_AddItemToArray(j_caller_extension_apps, j_application);
-
-					if (ap == cp->caller_extension->current_application) {
-						cJSON_AddItemToObject(j_application, "last_executed", cJSON_CreateString("true"));
-					}
-					cJSON_AddItemToObject(j_application, "app_name", cJSON_CreateString(ap->application_name));
-					cJSON_AddItemToObject(j_application, "app_data", cJSON_CreateString(switch_str_nil(ap->application_data)));
-				}
-			}
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t kz_report_callflow(switch_core_session_t *session, switch_event_t *cdr_event)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_caller_profile_t *caller_profile;
-	cJSON *j_main_cp, *j_times, *j_callflow, *j_profile, *j_o;
-
-
-	caller_profile = switch_channel_get_caller_profile(channel);
-
-	j_callflow = cJSON_CreateArray();
-
-	while (caller_profile) {
-
-		j_profile = cJSON_CreateObject();
-
-		if (!zstr(caller_profile->dialplan)) {
-			cJSON_AddItemToObject(j_profile, "dialplan", cJSON_CreateString((char *)caller_profile->dialplan));
-		}
-
-		if (!zstr(caller_profile->profile_index)) {
-			cJSON_AddItemToObject(j_profile, "profile_index", cJSON_CreateString((char *)caller_profile->profile_index));
-		}
-
-		kz_report_callflow_extension(caller_profile, j_profile);
-
-		j_main_cp = cJSON_CreateObject();
-		cJSON_AddItemToObject(j_profile, "Caller-Profile", j_main_cp);
-
-		kz_switch_ivr_set_json_profile_data(j_main_cp, caller_profile);
-
-		if (caller_profile->originator_caller_profile) {
-			j_o = cJSON_CreateObject();
-			cJSON_AddItemToObject(j_main_cp, "originator", j_o);
-			kz_switch_ivr_set_json_profile_data(j_o, caller_profile->originator_caller_profile);
-			kz_report_callflow_extension(caller_profile->originator_caller_profile, j_o);
-		}
-
-		if (caller_profile->originatee_caller_profile) {
-			j_o = cJSON_CreateObject();
-			cJSON_AddItemToObject(j_main_cp, "originatee", j_o);
-			kz_switch_ivr_set_json_profile_data(j_o, caller_profile->originatee_caller_profile);
-			kz_report_callflow_extension(caller_profile->originatee_caller_profile, j_o);
-		}
-
-		if (caller_profile->times) {
-			j_times = cJSON_CreateObject();
-			cJSON_AddItemToObject(j_profile, "Time", j_times);
-			cJSON_AddItemToObject(j_times, "Created", cJSON_CreateNumber(caller_profile->times->created));
-			cJSON_AddItemToObject(j_times, "Profile-Created", cJSON_CreateNumber(caller_profile->times->profile_created));
-			cJSON_AddItemToObject(j_times, "Progress", cJSON_CreateNumber(caller_profile->times->progress));
-			cJSON_AddItemToObject(j_times, "Progress-Media", cJSON_CreateNumber(caller_profile->times->progress_media));
-			cJSON_AddItemToObject(j_times, "Answered", cJSON_CreateNumber(caller_profile->times->answered));
-			cJSON_AddItemToObject(j_times, "Bridged", cJSON_CreateNumber(caller_profile->times->bridged));
-			cJSON_AddItemToObject(j_times, "Last-Hold", cJSON_CreateNumber(caller_profile->times->last_hold));
-			cJSON_AddItemToObject(j_times, "Hold-Accumulated", cJSON_CreateNumber(caller_profile->times->hold_accum));
-			cJSON_AddItemToObject(j_times, "Hangup", cJSON_CreateNumber(caller_profile->times->hungup));
-			cJSON_AddItemToObject(j_times, "Resurrect", cJSON_CreateNumber(caller_profile->times->resurrected));
-			cJSON_AddItemToObject(j_times, "Transfer", cJSON_CreateNumber(caller_profile->times->transferred));
-		}
-		cJSON_AddItemToArray(j_callflow, j_profile);
-		caller_profile = caller_profile->next;
-	}
-
-	switch_event_add_header_string_nodup(cdr_event, SWITCH_STACK_BOTTOM, "_json_callflow", cJSON_PrintUnformatted(j_callflow));
-
-	cJSON_Delete(j_callflow);
-
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-
-#define ORIGINATED_LEGS_VARIABLE "originated_legs"
-#define ORIGINATED_LEGS_ITEM_DELIM ';'
-
-#define ORIGINATE_CAUSES_VARIABLE "originate_causes"
-#define ORIGINATE_CAUSES_ITEM_DELIM ';'
-
-static switch_status_t kz_report_originated_legs(switch_core_session_t *session, switch_event_t *cdr_event)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	cJSON *j_originated = cJSON_CreateArray();
-	const char *originated_legs_var = NULL, *originate_causes_var = NULL;
-	int idx = 0;
-
-	while(1) {
-		char *argv_leg[10] = { 0 }, *argv_cause[10] = { 0 };
-		char *originated_legs, *originate_causes;
-		cJSON *j_originated_leg;
-		originated_legs_var = switch_channel_get_variable_dup(channel, ORIGINATED_LEGS_VARIABLE, SWITCH_FALSE, idx);
-		originate_causes_var = switch_channel_get_variable_dup(channel, ORIGINATE_CAUSES_VARIABLE, SWITCH_FALSE, idx);
-
-		if (zstr(originated_legs_var) || zstr(originate_causes_var)) {
-			break;
-		}
-
-		originated_legs = strdup(originated_legs_var);
-		originate_causes = strdup(originate_causes_var);
-
-		switch_separate_string(originated_legs, ORIGINATED_LEGS_ITEM_DELIM, argv_leg, (sizeof(argv_leg) / sizeof(argv_leg[0])));
-		switch_separate_string(originate_causes, ORIGINATE_CAUSES_ITEM_DELIM, argv_cause, (sizeof(argv_cause) / sizeof(argv_cause[0])));
-
-		j_originated_leg = cJSON_CreateObject();
-		cJSON_AddItemToObject(j_originated_leg, "Call-ID", cJSON_CreateString(argv_leg[0]));
-		cJSON_AddItemToObject(j_originated_leg, "Caller-ID-Name", cJSON_CreateString(argv_leg[1]));
-		cJSON_AddItemToObject(j_originated_leg, "Caller-ID-Number", cJSON_CreateString(argv_leg[2]));
-		cJSON_AddItemToObject(j_originated_leg, "Result", cJSON_CreateString(argv_cause[1]));
-
-		cJSON_AddItemToArray(j_originated, j_originated_leg);
-
-		switch_safe_free(originated_legs);
-		switch_safe_free(originate_causes);
-
-		idx++;
-	}
-
-	switch_event_add_header_string_nodup(cdr_event, SWITCH_STACK_BOTTOM, "_json_originated_legs", cJSON_PrintUnformatted(j_originated));
-
-	cJSON_Delete(j_originated);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-#define MAX_HISTORY 50
-#define HST_ARRAY_DELIM "|:"
-#define HST_ITEM_DELIM ':'
-
-static void kz_report_transfer_history_item(char* value, cJSON *json)
-{
-	char *argv[4] = { 0 };
-	char *item = strdup(value);
-	int argc = switch_separate_string(item, HST_ITEM_DELIM, argv, (sizeof(argv) / sizeof(argv[0])));
-	cJSON *jitem = cJSON_CreateObject();
-	char *epoch = NULL, *callid = NULL, *type = NULL;
-	int add = 0;
-	if(argc == 4) {
-		add = 1;
-		epoch = argv[0];
-		callid = argv[1];
-		type = argv[2];
-
-		if(!strncmp(type, "bl_xfer", 7)) {
-			//char *split = strchr(argv[3], '/');
-			//if(split) *(split++) = '\0';
-			cJSON_AddItemToObject(jitem, "Caller-Profile-ID", cJSON_CreateString(callid));
-			cJSON_AddItemToObject(jitem, "Type", cJSON_CreateString("blind"));
-			cJSON_AddItemToObject(jitem, "Extension", cJSON_CreateString(argv[3]));
-			cJSON_AddItemToObject(jitem, "Timestamp", cJSON_CreateNumber(strtod(epoch, NULL)));
-		} else if(!strncmp(type, "att_xfer", 8)) {
-			char *split = strchr(argv[3], '/');
-			if(split) {
-				*(split++) = '\0';
-				cJSON_AddItemToObject(jitem, "Caller-Profile-ID", cJSON_CreateString(callid));
-				cJSON_AddItemToObject(jitem, "Type", cJSON_CreateString("attended"));
-				cJSON_AddItemToObject(jitem, "Transferee", cJSON_CreateString(argv[3]));
-				cJSON_AddItemToObject(jitem, "Transferer", cJSON_CreateString(split));
-				cJSON_AddItemToObject(jitem, "Timestamp", cJSON_CreateNumber(strtod(epoch, NULL)));
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "TRANSFER TYPE '%s' NOT HANDLED => %s\n", type, item);
-				add = 0;
-			}
-		} else if(!strncmp(type, "uuid_br", 7)) {
-			cJSON_AddItemToObject(jitem, "Caller-Profile-ID", cJSON_CreateString(callid));
-			cJSON_AddItemToObject(jitem, "Type", cJSON_CreateString("bridge"));
-			cJSON_AddItemToObject(jitem, "Other-Leg", cJSON_CreateString(argv[3]));
-			cJSON_AddItemToObject(jitem, "Timestamp", cJSON_CreateNumber(strtod(epoch, NULL)));
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "TRANSFER TYPE '%s' NOT HANDLED => %s\n", type, item);
-			add = 0;
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "TRANSFER TYPE SPLIT ERROR %i => %s\n", argc, item);
-	}
-	if(add) {
-		cJSON_AddItemToArray(json, jitem);
-	} else {
-		cJSON_Delete(jitem);
-	}
-	switch_safe_free(item);
-}
-
-static switch_status_t kz_report_transfer_history(switch_core_session_t *session, switch_event_t *cdr_event, const char* var_name)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	cJSON *j_transfer = NULL;
-	char *tmp_history = NULL, *history = NULL, *argv[MAX_HISTORY] = { 0 };
-	char event_header[50];
-	int n, argc = 0;
-	const char *transfer_var = switch_channel_get_variable_dup(channel, var_name, SWITCH_FALSE, -1);
-	if (zstr(transfer_var)) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (!(tmp_history = strdup(transfer_var))) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	sprintf(event_header, "_json_%s", var_name);
-	history = tmp_history;
-	j_transfer = cJSON_CreateArray();
-
-	if (!strncmp(history, "ARRAY::", 7)) {
-		history += 7;
-		argc = switch_separate_string_string(history, HST_ARRAY_DELIM, argv, (sizeof(argv) / sizeof(argv[0])));
-		for(n=0; n < argc; n++) {
-			kz_report_transfer_history_item(argv[n], j_transfer);
-		}
-		switch_event_add_header_string_nodup(cdr_event, SWITCH_STACK_BOTTOM, event_header, cJSON_PrintUnformatted(j_transfer));
-	} else if (strchr(history, HST_ITEM_DELIM)) {
-		kz_report_transfer_history_item(history, j_transfer);
-		switch_event_add_header_string_nodup(cdr_event, SWITCH_STACK_BOTTOM, event_header, cJSON_PrintUnformatted(j_transfer));
-	}
-	cJSON_Delete(j_transfer);
-	switch_safe_free(tmp_history);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t kz_report(switch_core_session_t *session, switch_event_t *cdr_event)
-{
-	kz_report_app_log(session, cdr_event);
-	kz_report_callflow(session, cdr_event);
-	kz_report_channel_stats(session, cdr_event);
-	kz_report_channel_flaws(session, cdr_event);
-	kz_report_originated_legs(session, cdr_event);
-	kz_report_transfer_history(session, cdr_event, SWITCH_TRANSFER_HISTORY_VARIABLE);
-	kz_report_transfer_history(session, cdr_event, SWITCH_TRANSFER_SOURCE_VARIABLE);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t kz_cdr_on_reporting(switch_core_session_t *session)
-{
-	switch_event_t *cdr_event = NULL;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-
-	if (switch_event_create_subclass(&cdr_event, SWITCH_EVENT_CUSTOM, MY_EVENT_JSON_CDR) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "error creating event for report data!\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	kz_report(session, cdr_event);
-	switch_channel_event_set_data(channel, cdr_event);
-	switch_event_fire(&cdr_event);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_state_handler_table_t kz_cdr_state_handlers = {
-	/*.on_init */ NULL,
-	/*.on_routing */ NULL,
-	/*.on_execute */ NULL,
-	/*.on_hangup */ NULL,
-	/*.on_exchange_media */ NULL,
-	/*.on_soft_execute */ NULL,
-	/*.on_consume_media */ NULL,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ kz_cdr_on_reporting
-};
-
-
-static void kz_cdr_register_state_handlers()
-{
-	switch_core_add_state_handler(&kz_cdr_state_handlers);
-}
-
-static void kz_cdr_unregister_state_handlers()
-{
-	switch_core_remove_state_handler(&kz_cdr_state_handlers);
-}
-
-static void kz_cdr_register_events()
-{
-	if (switch_event_reserve_subclass(MY_EVENT_JSON_CDR) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", MY_EVENT_JSON_CDR);
-	}
-}
-
-static void kz_cdr_unregister_events()
-{
-	switch_event_free_subclass(MY_EVENT_JSON_CDR);
-}
-
-
-void kz_cdr_start()
-{
-	kz_cdr_register_events();
-	kz_cdr_register_state_handlers();
-}
-
-void kz_cdr_stop()
-{
-	kz_cdr_unregister_state_handlers();
-	kz_cdr_unregister_events();
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_commands.c b/src/mod/event_handlers/mod_kazoo/kazoo_commands.c
deleted file mode 100644
index 6d956376a8..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_commands.c
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Karl Anderson <karl@2600hz.com>
- * Darren Schreiber <darren@2600hz.com>
- *
- *
- * kazoo_commands.c -- clones of mod_commands commands slightly modified for kazoo
- *
- */
-#include "mod_kazoo.h"
-#include <curl/curl.h>
-#include <switch_curl.h>
-
-#define UUID_SET_DESC "Set a variable"
-#define UUID_SET_SYNTAX "<uuid> <var> [value]"
-
-#define UUID_MULTISET_DESC "Set multiple variables"
-#define UUID_MULTISET_SYNTAX "<uuid> <var>=<value>;<var>=<value>..."
-
-#define KZ_HTTP_PUT_DESC "upload a local freeswitch file to a url"
-#define KZ_HTTP_PUT_SYNTAX "localfile url"
-
-#define KZ_FIRST_OF_DESC "returns first-of existing event header in params"
-#define KZ_FIRST_OF_SYNTAX "list of headers to check"
-
-#define MAX_FIRST_OF 25
-
-SWITCH_STANDARD_API(kz_first_of)
-{
-	char delim = '|';
-	char *mycmd = NULL, *mycmd_dup = NULL, *argv[MAX_FIRST_OF] = { 0 };
-	int n, argc = 0;
-	switch_event_header_t *header = NULL;
-	switch_channel_t *channel = NULL;
-
-	if (zstr(cmd)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid arg\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	if ( session ) {
-		channel = switch_core_session_get_channel(session);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "GOT CHANNEL\n");
-	}
-
-	mycmd_dup = mycmd = strdup(cmd);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "FIRST-OF %s\n", mycmd);
-	if (!zstr(mycmd) && *mycmd == '^' && *(mycmd+1) == '^') {
-		mycmd += 2;
-		delim = *mycmd++;
-	}
-	argc = switch_separate_string(mycmd, delim, argv, (sizeof(argv) / sizeof(argv[0])));
-	for(n=0; n < argc; n++) {
-		char* item = argv[n];
-		if(*item == '#' || *item == '!' || *item == '?') {
-			if(*(++item) != '\0') {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "RETURNING default %s\n", item);
-				stream->write_function(stream, item);
-				break;
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "CHECKING %s\n", item);
-			if (channel) {
-				const char *var = switch_channel_get_variable_dup(channel, item, SWITCH_FALSE, -1);
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "CHECKING CHANNEL %s\n", item);
-				if (var) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "GOT FROM CHANNEL %s => %s\n", item, var);
-					stream->write_function(stream, var);
-					break;
-				}
-				if (!strncmp(item, "variable_", 9)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "CHECKING CHANNEL %s\n", item+9);
-					var = switch_channel_get_variable_dup(channel, item+9, SWITCH_FALSE, -1);
-					if (var) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "GOT FROM CHANNEL %s => %s\n", item+9, var);
-						stream->write_function(stream, var);
-						break;
-					}
-				}
-			}
-			header = switch_event_get_header_ptr(stream->param_event, item);
-			if(header) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "RETURNING %s : %s\n", item, header->value);
-				stream->write_function(stream, header->value);
-				break;
-			}
-		}
-	}
-
-	switch_safe_free(mycmd_dup);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t kz_uuid_setvar(int urldecode, const char *cmd,  switch_core_session_t *session,  switch_stream_handle_t *stream)
-{
-	switch_core_session_t *psession = NULL;
-	char *mycmd = NULL, *argv[3] = { 0 };
-	int argc = 0;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-		if ((argc == 2 || argc == 3) && !zstr(argv[0])) {
-			char *uuid = argv[0];
-			char *var_name = argv[1];
-			char *var_value = NULL;
-
-			if (argc == 3) {
-				var_value = argv[2];
-			}
-
-			if ((psession = switch_core_session_locate(uuid))) {
-				switch_channel_t *channel;
-				switch_event_t *event;
-				channel = switch_core_session_get_channel(psession);
-
-				if (zstr(var_name)) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
-					stream->write_function(stream, "-ERR No variable specified\n");
-				} else {
-					if(urldecode) {
-						switch_url_decode(var_value);
-					}
-					switch_channel_set_variable(channel, var_name, var_value);
-					kz_check_set_profile_var(channel, var_name, var_value);
-					stream->write_function(stream, "+OK\n");
-				}
-
-				if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-					switch_channel_event_set_data(channel, event);
-					switch_event_fire(&event);
-				}
-
-				switch_core_session_rwunlock(psession);
-
-			} else {
-				stream->write_function(stream, "-ERR No such channel!\n");
-			}
-			goto done;
-		}
-	}
-
-	stream->write_function(stream, "-USAGE: %s\n", UUID_SET_SYNTAX);
-
-  done:
-	switch_safe_free(mycmd);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(uuid_setvar_function)
-{
-	return kz_uuid_setvar(0, cmd, session, stream);
-}
-
-SWITCH_STANDARD_API(uuid_setvar_encoded_function)
-{
-	return kz_uuid_setvar(1, cmd, session, stream);
-}
-
-switch_status_t kz_uuid_setvar_multi(int urldecode, const char *cmd,  switch_core_session_t *session,  switch_stream_handle_t *stream)
-{
-	switch_core_session_t *psession = NULL;
-	char delim = ';';
-	char *mycmd = NULL, *vars, *argv[64] = { 0 };
-	int argc = 0;
-	char *var_name, *var_value = NULL;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		char *uuid = mycmd;
-		if (!(vars = strchr(uuid, ' '))) {
-			goto done;
-		}
-		*vars++ = '\0';
-		if (*vars == '^' && *(vars+1) == '^') {
-			vars += 2;
-			delim = *vars++;
-		}
-		if ((psession = switch_core_session_locate(uuid))) {
-			switch_channel_t *channel = switch_core_session_get_channel(psession);
-			switch_event_t *event;
-			int x, y = 0;
-			argc = switch_separate_string(vars, delim, argv, (sizeof(argv) / sizeof(argv[0])));
-
-			for (x = 0; x < argc; x++) {
-				var_name = argv[x];
-				if (var_name && (var_value = strchr(var_name, '='))) {
-					*var_value++ = '\0';
-				}
-				if (zstr(var_name)) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
-					stream->write_function(stream, "-ERR No variable specified\n");
-				} else {
-					if(urldecode) {
-						switch_url_decode(var_value);
-					}
-					switch_channel_set_variable(channel, var_name, var_value);
-					kz_check_set_profile_var(channel, var_name, var_value);
-
-					y++;
-				}
-			}
-
-                        /* keep kazoo nodes in sync */
-			if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-				switch_channel_event_set_data(channel, event);
-				switch_event_fire(&event);
-			}
-
-			switch_core_session_rwunlock(psession);
-			if (y) {
-				stream->write_function(stream, "+OK\n");
-				goto done;
-			}
-		} else {
-			stream->write_function(stream, "-ERR No such channel!\n");
-		}
-	}
-
-	stream->write_function(stream, "-USAGE: %s\n", UUID_MULTISET_SYNTAX);
-
-  done:
-	switch_safe_free(mycmd);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(uuid_setvar_multi_function)
-{
-	return kz_uuid_setvar_multi(0, cmd, session, stream);
-}
-
-SWITCH_STANDARD_API(uuid_setvar_multi_encoded_function)
-{
-	return kz_uuid_setvar_multi(1, cmd, session, stream);
-}
-
-static size_t body_callback(char *buffer, size_t size, size_t nitems, void *userdata)
-{
-	return size * nitems;
-}
-
-static size_t header_callback(char *buffer, size_t size, size_t nitems, void *userdata)
-{
-	switch_event_t* event = (switch_event_t*)userdata;
-	int len = strlen(buffer);
-	char buf[1024];
-	if(len > 2 && len < 1024) {
-		snprintf(buf, sizeof(buf), "%s", buffer);
-		switch_event_add_header_string(event, SWITCH_STACK_PUSH | SWITCH_STACK_BOTTOM, "Reply-Headers", buf);
-	}
-	return nitems * size;
-}
-
-SWITCH_STANDARD_API(kz_http_put)
-{
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_memory_pool_t *lpool = NULL;
-	switch_memory_pool_t *pool = NULL;
-	char *args = NULL;
-	char *argv[10] = { 0 };
-	int argc = 0;
-	switch_event_t *params = NULL;
-	char *url = NULL;
-	char *filename = NULL;
-	int delete_file = 0;
-
-	switch_curl_slist_t *headers = NULL;  /* optional linked-list of HTTP headers */
-	char *ext;  /* file extension, used for MIME type identification */
-	const char *mime_type = "application/octet-stream";
-	char *buf = NULL;
-	char *error = NULL;
-
-	CURL *curl_handle = NULL;
-	long httpRes = 0;
-	struct stat file_info = {0};
-	FILE *file_to_put = NULL;
-
-	if (session) {
-		pool = switch_core_session_get_pool(session);
-	} else {
-		switch_core_new_memory_pool(&lpool);
-		pool = lpool;
-	}
-
-	if (zstr(cmd)) {
-		stream->write_function(stream, "USAGE: %s\n", KZ_HTTP_PUT_SYNTAX);
-		status = SWITCH_STATUS_SUCCESS;
-		goto done;
-	}
-
-	args = strdup(cmd);
-	argc = switch_separate_string(args, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-	if (argc != 2) {
-		stream->write_function(stream, "USAGE: %s\n", KZ_HTTP_PUT_SYNTAX);
-		status = SWITCH_STATUS_SUCCESS;
-		goto done;
-	}
-
-	/* parse params and get profile */
-	url = switch_core_strdup(pool, argv[0]);
-	if (*url == '{') {
-		if (switch_event_create_brackets(url, '{', '}', ',', &params, &url, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) {
-			status = SWITCH_STATUS_FALSE;
-			stream->write_function(stream, "-ERR error parsing parameters\n");
-			goto done;
-		}
-	}
-
-	filename = switch_core_strdup(pool, argv[1]);
-
-	/* guess what type of mime content this is going to be */
-	if ((ext = strrchr(filename, '.'))) {
-		ext++;
-		if (!(mime_type = switch_core_mime_ext2type(ext))) {
-			mime_type = "application/octet-stream";
-		}
-	}
-
-	buf = switch_mprintf("Content-Type: %s", mime_type);
-	headers = switch_curl_slist_append(headers, buf);
-
-	/* open file and get the file size */
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "opening %s for upload to %s\n", filename, url);
-
-	/* libcurl requires FILE* */
- 	file_to_put = fopen(filename, "rb");
-	if (!file_to_put) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fopen() error: %s\n", strerror(errno));
-		stream->write_function(stream, "-ERR error opening file\n");
-		status = SWITCH_STATUS_FALSE;
-		goto done;
-	}
-
-	if (fstat(fileno(file_to_put), &file_info) == -1) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "fstat() error: %s\n", strerror(errno));
-		stream->write_function(stream, "-ERR fstat error\n");
-		goto done;
-	}
-
-	curl_handle = switch_curl_easy_init();
-	if (!curl_handle) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "switch_curl_easy_init() failure\n");
-		status = SWITCH_STATUS_FALSE;
-		stream->write_function(stream, "-ERR switch_curl_easy init failure\n");
-		goto done;
-	}
-	switch_curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_PUT, 1);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_URL, url);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_READDATA, file_to_put);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t)file_info.st_size);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_FAILONERROR, 1);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-kazoo/1.0");
-	switch_curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, stream->param_event);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, header_callback);
-	switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, body_callback);
-
-	switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0L);
-	switch_curl_easy_perform(curl_handle);
-	switch_curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes);
-	switch_curl_easy_cleanup(curl_handle);
-
-	if (httpRes == 200 || httpRes == 201 || httpRes == 202 || httpRes == 204) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s saved to %s\n", filename, url);
-		switch_event_add_header(stream->param_event, SWITCH_STACK_BOTTOM, "API-Output", "%s saved to %s", filename, url);
-		stream->write_function(stream, "+OK %s saved to %s", filename, url);
-		delete_file = 1;
-	} else {
-		error = switch_mprintf("Received HTTP error %ld trying to save %s to %s", httpRes, filename, url);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s\n", error);
-		switch_event_add_header(stream->param_event, SWITCH_STACK_BOTTOM, "API-Error", "%s", error);
-		switch_event_add_header(stream->param_event, SWITCH_STACK_BOTTOM, "API-HTTP-Error", "%ld", httpRes);
-		stream->write_function(stream, "-ERR %s", error);
-		status = SWITCH_STATUS_GENERR;
-	}
-
-done:
-	if (file_to_put) {
-		fclose(file_to_put);
-		if(delete_file) {
-			remove(filename);
-		}
-	}
-
-	if (headers) {
-		switch_curl_slist_free_all(headers);
-	}
-
-	switch_safe_free(buf);
-	switch_safe_free(error);
-
-	switch_safe_free(args);
-
-	if (lpool) {
-		switch_core_destroy_memory_pool(&lpool);
-	}
-
-	if (params) {
-		switch_event_destroy(&params);
-	}
-
-	return status;
-}
-
-SWITCH_STANDARD_API(kz_expand_api)
-{
-	char *p = NULL, *input = NULL;
-	char *uuid = NULL, *mycmd;
-
-	if (zstr(cmd)) {
-		stream->write_function(stream, "-ERR invalid input");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	if (!(mycmd = strdup(cmd))) {
-		stream->write_function(stream, "-ERR no memory");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	if (!strncasecmp(mycmd, "uuid:", 5)) {
-		uuid = mycmd + 5;
-		if ((input = strchr(uuid, ' ')) != NULL) {
-			*input++ = '\0';
-		} else {
-			stream->write_function(stream, "-ERR invalid argument");
-			switch_safe_free(mycmd);
-			return SWITCH_STATUS_GENERR;
-		}
-	} else {
-		input = mycmd;
-	}
-
-	p = kz_expand(input, uuid);
-	stream->write_function(stream, "+OK %s", p);
-	if (p != input) {
-		switch_safe_free(p);
-	}
-	switch_safe_free(mycmd);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(kz_eval_api)
-{
-	char *p = NULL, *input = NULL;
-	char *uuid = NULL, *mycmd;
-	switch_core_session_t *nsession = NULL;
-	switch_channel_t *channel = NULL;
-
-
-	if (zstr(cmd)) {
-		stream->write_function(stream, "-ERR invalid input");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	if (!(mycmd = strdup(cmd))) {
-		stream->write_function(stream, "-ERR no memory");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	if (!strncasecmp(mycmd, "uuid:", 5)) {
-		uuid = mycmd + 5;
-		if ((input = strchr(uuid, ' ')) != NULL) {
-			*input++ = '\0';
-			if ((nsession = switch_core_session_locate(uuid)) != NULL) {
-				channel = switch_core_session_get_channel(nsession);
-			} else {
-				stream->write_function(stream, "-ERR invalid session");
-				switch_safe_free(mycmd);
-				return SWITCH_STATUS_GENERR;
-			}
-		} else {
-			stream->write_function(stream, "-ERR invalid argument");
-			switch_safe_free(mycmd);
-			return SWITCH_STATUS_GENERR;
-		}
-	} else if (session == NULL) {
-		stream->write_function(stream, "-ERR invalid argument");
-		switch_safe_free(mycmd);
-		return SWITCH_STATUS_GENERR;
-	} else {
-		channel = switch_core_session_get_channel(session);
-		input = mycmd;
-	}
-
-	p = switch_channel_expand_variables_check(channel, input, NULL, NULL, 0);
-	stream->write_function(stream, "+OK %s", p);
-	if (p != input) {
-		switch_safe_free(p);
-	}
-	switch_safe_free(mycmd);
-	if (nsession) {
-		switch_core_session_rwunlock(nsession);
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-#define KZ_CONTACT_DESC "returns kazoo contact"
-#define KZ_CONTACT_SYNTAX "endpoint@account"
-
-SWITCH_STANDARD_API(kz_contact_fun)
-{
-	switch_event_t *params = NULL;
-	const char *var = NULL;
-	switch_xml_t xml_node = NULL;
-	switch_xml_t xml_root = NULL;
-
-	const char *reply = "error/subscriber_absent";
-
-	if (!cmd) {
-		stream->write_function(stream, "%s", reply);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
-	switch_assert(params);
-	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", "call");
-	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Fetch-Exclude-Cache", "true");
-
-	/*
-	if (stream->param_event) {
-		switch_event_merge(params, stream->param_event);
-	}
-	*/
-
-	/*
-	if (session) {
-		switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Fetch-Call-UUID", switch_core_session_get_uuid(session));
-	} else if (stream->param_event && (var = switch_event_get_header(stream->param_event, "ent_originate_aleg_uuid")) != NULL) {
-		switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Fetch-Call-UUID", var);
-	}
-	*/
-
-	if (switch_xml_locate("directory", "location", "id", cmd, &xml_root, &xml_node, params, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) {
-		stream->write_function(stream, "%s", reply);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	var = switch_xml_attr(xml_node, "value");
-	if (!zstr(var)) {
-		reply = var;
-	}
-
-	stream->write_function(stream, "%s", reply);
-
-	switch_xml_free(xml_root);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-void add_kz_commands(switch_loadable_module_interface_t **module_interface) {
-	switch_api_interface_t *api_interface = NULL;
-	SWITCH_ADD_API(api_interface, "kz_uuid_setvar_multi", UUID_SET_DESC, uuid_setvar_multi_function, UUID_MULTISET_SYNTAX);
-	SWITCH_ADD_API(api_interface, "kz_uuid_setvar_multi_encoded", UUID_SET_DESC, uuid_setvar_multi_encoded_function, UUID_MULTISET_SYNTAX);
-	switch_console_set_complete("add kz_uuid_setvar_multi ::console::list_uuid");
-	switch_console_set_complete("add kz_uuid_setvar_multi_encoded ::console::list_uuid");
-	SWITCH_ADD_API(api_interface, "kz_uuid_setvar", UUID_MULTISET_DESC, uuid_setvar_function, UUID_SET_SYNTAX);
-	SWITCH_ADD_API(api_interface, "kz_uuid_setvar_encoded", UUID_MULTISET_DESC, uuid_setvar_encoded_function, UUID_SET_SYNTAX);
-	switch_console_set_complete("add kz_uuid_setvar ::console::list_uuid");
-	switch_console_set_complete("add kz_uuid_setvar_encoded ::console::list_uuid");
-	SWITCH_ADD_API(api_interface, "kz_http_put", KZ_HTTP_PUT_DESC, kz_http_put, KZ_HTTP_PUT_SYNTAX);
-	SWITCH_ADD_API(api_interface, "first-of", KZ_FIRST_OF_DESC, kz_first_of, KZ_FIRST_OF_SYNTAX);
-	SWITCH_ADD_API(api_interface, "kz_expand", KZ_FIRST_OF_DESC, kz_expand_api, KZ_FIRST_OF_SYNTAX);
-	SWITCH_ADD_API(api_interface, "kz_eval", KZ_FIRST_OF_DESC, kz_eval_api, KZ_FIRST_OF_SYNTAX);
-	SWITCH_ADD_API(api_interface, "kz_contact", KZ_CONTACT_DESC, kz_contact_fun, KZ_CONTACT_SYNTAX);
-}
-
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_config.c b/src/mod/event_handlers/mod_kazoo/kazoo_config.c
deleted file mode 100644
index a64677074b..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_config.c
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
-* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-* Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
-*
-* Version: MPL 1.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-*
-* The Initial Developer of the Original Code is
-* Anthony Minessale II <anthm@freeswitch.org>
-* Portions created by the Initial Developer are Copyright (C)
-* the Initial Developer. All Rights Reserved.
-*
-* Based on mod_skel by
-* Anthony Minessale II <anthm@freeswitch.org>
-*
-* Contributor(s):
-*
-* Daniel Bryars <danb@aeriandi.com>
-* Tim Brown <tim.brown@aeriandi.com>
-* Anthony Minessale II <anthm@freeswitch.org>
-* William King <william.king@quentustech.com>
-* Mike Jerris <mike@jerris.com>
-*
-* kazoo.c -- Sends FreeSWITCH events to an AMQP broker
-*
-*/
-
-#include "mod_kazoo.h"
-
-static const char *LOG_LEVEL_NAMES[] = {
-		"SWITCH_LOG_DEBUG10",
-		"SWITCH_LOG_DEBUG9",
-		"SWITCH_LOG_DEBUG8",
-		"SWITCH_LOG_DEBUG7",
-		"SWITCH_LOG_DEBUG6",
-		"SWITCH_LOG_DEBUG5",
-		"SWITCH_LOG_DEBUG4",
-		"SWITCH_LOG_DEBUG3",
-		"SWITCH_LOG_DEBUG2",
-		"SWITCH_LOG_DEBUG1",
-		"SWITCH_LOG_DEBUG",
-		"SWITCH_LOG_INFO",
-		"SWITCH_LOG_NOTICE",
-		"SWITCH_LOG_WARNING",
-		"SWITCH_LOG_ERROR",
-		"SWITCH_LOG_CRIT",
-		"SWITCH_LOG_ALERT",
-		"SWITCH_LOG_CONSOLE",
-		"SWITCH_LOG_INVALID",
-		"SWITCH_LOG_UNINIT",
-		NULL
-};
-
-static const switch_log_level_t LOG_LEVEL_VALUES[] = {
-		SWITCH_LOG_DEBUG10,
-		SWITCH_LOG_DEBUG9,
-		SWITCH_LOG_DEBUG8,
-		SWITCH_LOG_DEBUG7,
-		SWITCH_LOG_DEBUG6,
-		SWITCH_LOG_DEBUG5,
-		SWITCH_LOG_DEBUG4,
-		SWITCH_LOG_DEBUG3,
-		SWITCH_LOG_DEBUG2,
-		SWITCH_LOG_DEBUG1,
-		SWITCH_LOG_DEBUG,
-		SWITCH_LOG_INFO,
-		SWITCH_LOG_NOTICE,
-		SWITCH_LOG_WARNING,
-		SWITCH_LOG_ERROR,
-		SWITCH_LOG_CRIT,
-		SWITCH_LOG_ALERT,
-		SWITCH_LOG_CONSOLE,
-		SWITCH_LOG_INVALID,
-		SWITCH_LOG_UNINIT
-};
-
-switch_log_level_t log_str2level(const char *str)
-{
-	int x = 0;
-	switch_log_level_t level = SWITCH_LOG_INVALID;
-
-	if (switch_is_number(str)) {
-		x = atoi(str);
-
-		if (x > SWITCH_LOG_INVALID) {
-			return SWITCH_LOG_INVALID - 1;
-		} else if (x < 0) {
-			return 0;
-		} else {
-			return x;
-		}
-	}
-
-
-	for (x = 0;; x++) {
-		if (!LOG_LEVEL_NAMES[x]) {
-			break;
-		}
-
-		if (!strcasecmp(LOG_LEVEL_NAMES[x], str)) {
-			level = LOG_LEVEL_VALUES[x]; //(switch_log_level_t) x;
-			break;
-		}
-	}
-
-	return level;
-}
-
-switch_status_t kazoo_config_loglevels(switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_loglevels_ptr *ptr)
-{
-	switch_xml_t xml_level, xml_logging;
-	kazoo_loglevels_ptr loglevels = (kazoo_loglevels_ptr) switch_core_alloc(pool, sizeof(kazoo_loglevels_t));
-
-	loglevels->failed_log_level = SWITCH_LOG_ALERT;
-	loglevels->filtered_event_log_level = SWITCH_LOG_DEBUG1;
-	loglevels->filtered_field_log_level = SWITCH_LOG_DEBUG1;
-	loglevels->info_log_level = SWITCH_LOG_INFO;
-	loglevels->warn_log_level = SWITCH_LOG_WARNING;
-	loglevels->success_log_level = SWITCH_LOG_DEBUG;
-	loglevels->time_log_level = SWITCH_LOG_DEBUG1;
-	loglevels->trace_log_level = SWITCH_LOG_DEBUG1;
-	loglevels->debug_log_level = SWITCH_LOG_DEBUG;
-	loglevels->error_log_level = SWITCH_LOG_ERROR;
-	loglevels->hashing_log_level = SWITCH_LOG_DEBUG1;
-
-	if ((xml_logging = switch_xml_child(cfg, "logging")) != NULL) {
-		for (xml_level = switch_xml_child(xml_logging, "log"); xml_level; xml_level = xml_level->next) {
-			char *var = (char *) switch_xml_attr_soft(xml_level, "name");
-			char *val = (char *) switch_xml_attr_soft(xml_level, "value");
-
-			if (!var) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "logging param missing 'name' attribute\n");
-				continue;
-			}
-
-			if (!val) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "logging param[%s] missing 'value' attribute\n", var);
-				continue;
-			}
-
-			if (!strncmp(var, "success", 7)) {
-				loglevels->success_log_level = log_str2level(val);
-			} else if (!strncmp(var, "failed", 6)) {
-				loglevels->failed_log_level = log_str2level(val);
-			} else if (!strncmp(var, "info", 4)) {
-				loglevels->info_log_level = log_str2level(val);
-			} else if (!strncmp(var, "warn", 4)) {
-				loglevels->warn_log_level = log_str2level(val);
-			} else if (!strncmp(var, "time", 4)) {
-				loglevels->time_log_level = log_str2level(val);
-			} else if (!strncmp(var, "filtered-event", 14)) {
-				loglevels->filtered_event_log_level = log_str2level(val);
-			} else if (!strncmp(var, "filtered-field", 14)) {
-				loglevels->filtered_field_log_level = log_str2level(val);
-			} else if (!strncmp(var, "trace", 5)) {
-				loglevels->trace_log_level = log_str2level(val);
-			} else if (!strncmp(var, "debug", 5)) {
-				loglevels->debug_log_level = log_str2level(val);
-			} else if (!strncmp(var, "error", 5)) {
-				loglevels->error_log_level = log_str2level(val);
-			} else if (!strncmp(var, "hashing", 7)) {
-				loglevels->hashing_log_level = log_str2level(val);
-			}
-		} /* xml_level for loop */
-	}
-
-	*ptr = loglevels;
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-switch_status_t kazoo_config_filters(switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_filter_ptr *ptr)
-{
-	switch_xml_t filters, filter;
-//	char *routing_key = NULL;
-	kazoo_filter_ptr root = NULL, prv = NULL, cur = NULL;
-
-
-	if ((filters = switch_xml_child(cfg, "filters")) != NULL) {
-		for (filter = switch_xml_child(filters, "filter"); filter; filter = filter->next) {
-			const char *var = switch_xml_attr(filter, "name");
-			const char *val = switch_xml_attr(filter, "value");
-			const char *type = switch_xml_attr(filter, "type");
-			const char *compare = switch_xml_attr(filter, "compare");
-			cur = (kazoo_filter_ptr) switch_core_alloc(pool, sizeof(kazoo_filter));
-			memset(cur, 0, sizeof(kazoo_filter));
-			if(prv == NULL) {
-				root = prv = cur;
-			} else {
-				prv->next = cur;
-				prv = cur;
-			}
-			cur->type = FILTER_EXCLUDE;
-			cur->compare = FILTER_COMPARE_VALUE;
-
-			if(var)
-				cur->name = switch_core_strdup(pool, var);
-
-			if(val)
-				cur->value = switch_core_strdup(pool, val);
-
-			if(type) {
-				if (!strncmp(type, "exclude", 7)) {
-					cur->type = FILTER_EXCLUDE;
-				} else if (!strncmp(type, "include", 7)) {
-						cur->type = FILTER_INCLUDE;
-				}
-			}
-
-			if(compare) {
-				if (!strncmp(compare, "value", 7)) {
-					cur->compare = FILTER_COMPARE_VALUE;
-				} else if (!strncmp(compare, "prefix", 6)) {
-						cur->compare = FILTER_COMPARE_PREFIX;
-				} else if (!strncmp(compare, "list", 4)) {
-						cur->compare = FILTER_COMPARE_LIST;
-				} else if (!strncmp(compare, "exists", 6)) {
-						cur->compare = FILTER_COMPARE_EXISTS;
-				} else if (!strncmp(compare, "regex", 5)) {
-						cur->compare = FILTER_COMPARE_REGEX;
-				} else if (!strncmp(compare, "field", 5)) {
-						cur->compare = FILTER_COMPARE_FIELD;
-				}
-			}
-
-			if(cur->value == NULL)
-				cur->compare = FILTER_COMPARE_EXISTS;
-
-			if(cur->compare == FILTER_COMPARE_LIST) {
-				cur->list.size = switch_separate_string(cur->value, '|', cur->list.value, MAX_LIST_FIELDS);
-			}
-
-		}
-
-	}
-
-	*ptr = root;
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-switch_status_t kazoo_config_field(kazoo_config_ptr definitions, switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_field_ptr *ptr)
-{
-	const char *var = switch_xml_attr(cfg, "name");
-	const char *val = switch_xml_attr(cfg, "value");
-	const char *as = switch_xml_attr(cfg, "as");
-	const char *type = switch_xml_attr(cfg, "type");
-	const char *exclude_prefix = switch_xml_attr(cfg, "exclude-prefix");
-	const char *serialize_as = switch_xml_attr(cfg, "serialize-as");
-	const char *as_array = switch_xml_attr(cfg, "as-array");
-	kazoo_field_ptr cur = (kazoo_field_ptr) switch_core_alloc(pool, sizeof(kazoo_field));
-	cur->in_type = FIELD_NONE;
-	cur->out_type = JSON_NONE;
-
-	if(var)
-		cur->name = switch_core_strdup(pool, var);
-
-	if(val)
-		cur->value = switch_core_strdup(pool, val);
-
-	if(as)
-		cur->as = switch_core_strdup(pool, as);
-
-	if(type) {
-		if (!strncmp(type, "copy", 4)) {
-			cur->in_type = FIELD_COPY;
-		} else if (!strncmp(type, "static", 6)) {
-			cur->in_type = FIELD_STATIC;
-		} else if (!strncmp(type, "first-of", 8)) {
-			cur->in_type = FIELD_FIRST_OF;
-		} else if (!strncmp(type, "expand", 6)) {
-			cur->in_type = FIELD_EXPAND;
-		} else if (!strncmp(type, "prefix", 10)) {
-			cur->in_type = FIELD_PREFIX;
-		} else if (!strncmp(type, "group", 5)) {
-			cur->in_type = FIELD_GROUP;
-		} else if (!strncmp(type, "reference", 9)) {
-			cur->in_type = FIELD_REFERENCE;
-		}
-	}
-
-	if(serialize_as) {
-		if (!strncmp(serialize_as, "string", 5)) {
-			cur->out_type = JSON_STRING;
-		} else if (!strncmp(serialize_as, "number", 6)) {
-			cur->out_type = JSON_NUMBER;
-		} else if (!strncmp(serialize_as, "boolean", 7)) {
-			cur->out_type = JSON_BOOLEAN;
-		} else if (!strncmp(serialize_as, "object", 6)) {
-			cur->out_type = JSON_OBJECT;
-		} else if (!strncmp(serialize_as, "raw", 6)) {
-			cur->out_type = JSON_RAW;
-		}
-	}
-
-	if(as_array) {
-		cur->out_type_as_array = switch_true(as_array);
-	}
-
-	if(exclude_prefix)
-		cur->exclude_prefix = switch_true(exclude_prefix);
-
-	kazoo_config_filters(pool, cfg, &cur->filter);
-	kazoo_config_fields(definitions, pool, cfg, &cur->children);
-
-	if(cur->children != NULL
-			&& (cur->in_type == FIELD_STATIC)
-			&& (cur->out_type == JSON_NONE)
-			) {
-		cur->out_type = JSON_OBJECT;
-	}
-	if(cur->in_type == FIELD_NONE) {
-		cur->in_type = FIELD_COPY;
-	}
-
-	if(cur->out_type == JSON_NONE) {
-		cur->out_type = JSON_STRING;
-	}
-
-	if(cur->in_type == FIELD_FIRST_OF) {
-		cur->list.size = switch_separate_string(cur->value, '|', cur->list.value, MAX_LIST_FIELDS);
-	}
-
-	if(cur->in_type == FIELD_REFERENCE) {
-		cur->ref = (kazoo_definition_ptr)switch_core_hash_find(definitions->hash, cur->name);
-		if(cur->ref == NULL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "referenced field %s not found\n", cur->name);
-		}
-	}
-
-	*ptr = cur;
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-switch_status_t kazoo_config_fields_loop(kazoo_config_ptr definitions, switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_field_ptr *ptr)
-{
-	switch_xml_t field;
-	kazoo_field_ptr root = NULL, prv = NULL;
-
-
-	for (field = switch_xml_child(cfg, "field"); field; field = field->next) {
-		kazoo_field_ptr cur = NULL;
-		kazoo_config_field(definitions, pool, field, &cur);
-		if(root == NULL) {
-			root = prv = cur;
-		} else {
-			prv->next = cur;
-			prv = cur;
-		}
-	}
-
-	*ptr = root;
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-switch_status_t kazoo_config_fields(kazoo_config_ptr definitions, switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_fields_ptr *ptr)
-{
-	switch_xml_t fields;
-	kazoo_fields_ptr root = NULL;
-
-
-	if ((fields = switch_xml_child(cfg, "fields")) != NULL) {
-		const char *verbose = switch_xml_attr(fields, "verbose");
-		root = (kazoo_fields_ptr) switch_core_alloc(pool, sizeof(kazoo_fields));
-		root->verbose = SWITCH_TRUE;
-		if(verbose) {
-			root->verbose = switch_true(verbose);
-		}
-
-		kazoo_config_fields_loop(definitions, pool, fields, &root->head);
-
-	}
-
-	*ptr = root;
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-kazoo_config_ptr kazoo_config_event_handlers(kazoo_config_ptr definitions, switch_xml_t cfg)
-{
-	switch_xml_t xml_profiles = NULL, xml_profile = NULL;
-	kazoo_config_ptr profiles = NULL;
-	switch_memory_pool_t *pool = NULL;
-
-	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "error creating memory pool for producers\n");
-		return NULL;
-	}
-
-	profiles = switch_core_alloc(pool, sizeof(kazoo_config));
-	profiles->pool = pool;
-	switch_core_hash_init(&profiles->hash);
-
-	if ((xml_profiles = switch_xml_child(cfg, "event-handlers"))) {
-		if ((xml_profile = switch_xml_child(xml_profiles, "profile"))) {
-			for (; xml_profile; xml_profile = xml_profile->next) {
-				const char *name = switch_xml_attr(xml_profile, "name");
-				if(name == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "missing attr name\n" );
-					continue;
-				}
-				kazoo_config_event_handler(definitions, profiles, xml_profile, NULL);
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unable to locate a event-handler profile for kazoo\n" );
-		}
-	} else {
-		destroy_config(&profiles);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "unable to locate event-handlers section for kazoo, using default\n" );
-	}
-
-	return profiles;
-
-}
-
-kazoo_config_ptr kazoo_config_fetch_handlers(kazoo_config_ptr definitions, switch_xml_t cfg)
-{
-	switch_xml_t xml_profiles = NULL, xml_profile = NULL;
-	kazoo_config_ptr profiles = NULL;
-	switch_memory_pool_t *pool = NULL;
-
-	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "error creating memory pool for producers\n");
-		return NULL;
-	}
-
-	profiles = switch_core_alloc(pool, sizeof(kazoo_config));
-	profiles->pool = pool;
-	switch_core_hash_init(&profiles->hash);
-
-	if ((xml_profiles = switch_xml_child(cfg, "fetch-handlers"))) {
-		if ((xml_profile = switch_xml_child(xml_profiles, "profile"))) {
-			for (; xml_profile; xml_profile = xml_profile->next) {
-				const char *name = switch_xml_attr(xml_profile, "name");
-				if(name == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "missing attr name\n" );
-					continue;
-				}
-				kazoo_config_fetch_handler(definitions, profiles, xml_profile, NULL);
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unable to locate a fetch-handler profile for kazoo\n" );
-		}
-	} else {
-		destroy_config(&profiles);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "unable to locate fetch-handlers section for kazoo, using default\n" );
-	}
-
-	return profiles;
-
-}
-
-
-switch_status_t kazoo_config_definition(kazoo_config_ptr root, switch_xml_t cfg)
-{
-	kazoo_definition_ptr definition = NULL;
-	char *name = (char *) switch_xml_attr_soft(cfg, "name");
-
-	if (zstr(name)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to load kazoo profile, check definition missing name attr\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	definition = switch_core_alloc(root->pool, sizeof(kazoo_definition));
-	definition->name = switch_core_strdup(root->pool, name);
-
-	kazoo_config_filters(root->pool, cfg, &definition->filter);
-	kazoo_config_fields_loop(root, root->pool, cfg, &definition->head);
-
-	if ( switch_core_hash_insert(root->hash, name, (void *) definition) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to insert new definition [%s] into kazoo definitions hash\n", name);
-		return SWITCH_STATUS_GENERR;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "definition[%s] successfully configured\n", definition->name);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-kazoo_config_ptr kazoo_config_definitions(switch_xml_t cfg)
-{
-	switch_xml_t xml_definitions = NULL, xml_definition = NULL;
-	kazoo_config_ptr definitions = NULL;
-	switch_memory_pool_t *pool = NULL;
-
-	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "error creating memory pool for definitions\n");
-		return NULL;
-	}
-
-	definitions = switch_core_alloc(pool, sizeof(kazoo_config));
-	definitions->pool = pool;
-	switch_core_hash_init(&definitions->hash);
-
-	if ((xml_definitions = switch_xml_child(cfg, "definitions"))) {
-		if ((xml_definition = switch_xml_child(xml_definitions, "definition"))) {
-			for (; xml_definition; xml_definition = xml_definition->next)	{
-				kazoo_config_definition(definitions, xml_definition);
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "no definitions for kazoo\n" );
-		}
-	} else {
-		destroy_config(&definitions);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "unable to locate definitions section for kazoo, using default\n" );
-	}
-
-	return definitions;
-}
-
-void destroy_config(kazoo_config_ptr *ptr)
-{
-	kazoo_config_ptr config = NULL;
-	switch_memory_pool_t *pool;
-
-	if (!ptr || !*ptr) {
-		return;
-	}
-	config = *ptr;
-	pool = config->pool;
-
-	switch_core_hash_destroy(&(config->hash));
-	switch_core_destroy_memory_pool(&pool);
-
-	*ptr = NULL;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_config.h b/src/mod/event_handlers/mod_kazoo/kazoo_config.h
deleted file mode 100644
index d0117fda5f..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_config.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-* Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
-*
-* Version: MPL 1.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-*
-* The Initial Developer of the Original Code is
-* Anthony Minessale II <anthm@freeswitch.org>
-* Portions created by the Initial Developer are Copyright (C)
-* the Initial Developer. All Rights Reserved.
-*
-* Based on mod_skel by
-* Anthony Minessale II <anthm@freeswitch.org>
-*
-* Contributor(s):
-*
-* Daniel Bryars <danb@aeriandi.com>
-* Tim Brown <tim.brown@aeriandi.com>
-* Anthony Minessale II <anthm@freeswitch.org>
-* William King <william.king@quentustech.com>
-* Mike Jerris <mike@jerris.com>
-*
-* kazoo.c -- Sends FreeSWITCH events to an AMQP broker
-*
-*/
-
-#ifndef KAZOO_CONFIG_H
-#define KAZOO_CONFIG_H
-
-#include <switch.h>
-
-
-struct kazoo_config_t {
-	  switch_hash_t *hash;
-	  switch_memory_pool_t *pool;
-};
-
-switch_status_t kazoo_config_loglevels(switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_loglevels_ptr *ptr);
-switch_status_t kazoo_config_filters(switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_filter_ptr *ptr);
-switch_status_t kazoo_config_fields(kazoo_config_ptr definitions, switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_fields_ptr *ptr);
-
-switch_status_t kazoo_config_event_handler(kazoo_config_ptr definitions, kazoo_config_ptr root, switch_xml_t cfg, kazoo_event_profile_ptr *ptr);
-switch_status_t kazoo_config_fetch_handler(kazoo_config_ptr definitions, kazoo_config_ptr root, switch_xml_t cfg, kazoo_fetch_profile_ptr *ptr);
-kazoo_config_ptr kazoo_config_event_handlers(kazoo_config_ptr definitions, switch_xml_t cfg);
-kazoo_config_ptr kazoo_config_fetch_handlers(kazoo_config_ptr definitions, switch_xml_t cfg);
-kazoo_config_ptr kazoo_config_definitions(switch_xml_t cfg);
-switch_status_t kazoo_config_field(kazoo_config_ptr definitions, switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_field_ptr *ptr);
-void destroy_config(kazoo_config_ptr *ptr);
-
-#endif /* KAZOO_CONFIG_H */
-
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_definitions.S b/src/mod/event_handlers/mod_kazoo/kazoo_definitions.S
deleted file mode 100644
index 0bbe0137cb..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_definitions.S
+++ /dev/null
@@ -1,8 +0,0 @@
-    .global kz_default_config
-    .global kz_default_config_size
-    .section .rodata
-kz_default_config:
-    .incbin "kazoo.conf.xml"
-1:
-kz_default_config_size:
-    .int 1b - kz_default_config
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_defs.h b/src/mod/event_handlers/mod_kazoo/kazoo_defs.h
deleted file mode 100644
index 7fe86dd354..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_defs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef KAZOO_DEFS_H_
-#define KAZOO_DEFS_H_
-
-#define INTERACTION_VARIABLE "Call-Interaction-ID"
-
-#define UNIX_EPOCH_IN_GREGORIAN 62167219200
-#define UNIX_EPOCH_IN_GREGORIAN_STR "62167219200"
-
-#endif /* KAZOO_DEFS_H_ */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_dptools.c b/src/mod/event_handlers/mod_kazoo/kazoo_dptools.c
deleted file mode 100644
index 5a01650969..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_dptools.c
+++ /dev/null
@@ -1,980 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Karl Anderson <karl@2600hz.com>
- * Darren Schreiber <darren@2600hz.com>
- *
- *
- * kazoo_dptools.c -- clones of mod_dptools commands slightly modified for kazoo
- *
- */
-#include "mod_kazoo.h"
-
-#define SET_SHORT_DESC "Set a channel variable"
-#define SET_LONG_DESC "Set a channel variable for the channel calling the application."
-#define SET_SYNTAX "<varname>=<value>"
-
-#define MULTISET_SHORT_DESC "Set many channel variables"
-#define MULTISET_LONG_DESC "Set many channel variables for the channel calling the application"
-#define MULTISET_SYNTAX "[^^<delim>]<varname>=<value> <var2>=<val2>"
-
-#define UNSET_SHORT_DESC "Unset a channel variable"
-#define UNSET_LONG_DESC "Unset a channel variable for the channel calling the application."
-#define UNSET_SYNTAX "<varname>"
-
-#define MULTIUNSET_SHORT_DESC "Unset many channel variables"
-#define MULTIUNSET_LONG_DESC "Unset many channel variables for the channel calling the application."
-#define MULTIUNSET_SYNTAX "[^^<delim>]<varname> <var2> <var3>"
-
-#define EXPORT_SHORT_DESC "Export many channel variables"
-#define EXPORT_LONG_DESC "Export many channel variables for the channel calling the application"
-#define EXPORT_SYNTAX "[^^<delim>]<varname>=<value> <var2>=<val2>"
-
-#define PREFIX_UNSET_SHORT_DESC "clear variables by prefix"
-#define PREFIX_UNSET_LONG_DESC "clears the channel variables that start with prefix supplied"
-#define PREFIX_UNSET_SYNTAX "<prefix>"
-
-#define UUID_MULTISET_SHORT_DESC "Set many channel variables"
-#define UUID_MULTISET_LONG_DESC "Set many channel variables for a specific channel"
-#define UUID_MULTISET_SYNTAX "<uuid> [^^<delim>]<varname>=<value> <var2>=<val2>"
-
-#define KZ_ENDLESS_PLAYBACK_SHORT_DESC "Playback File Endlessly until break"
-#define KZ_ENDLESS_PLAYBACK_LONG_DESC "Endlessly Playback a file to the channel until a break occurs"
-#define KZ_ENDLESS_PLAYBACK_SYNTAX "<path>"
-
-#define NOOP_SHORT_DESC "no operation"
-#define NOOP_LONG_DESC "no operation. serves as a control point"
-#define NOOP_SYNTAX "[<noop-id>]"
-
-static void base_set (switch_core_session_t *session, const char *data, int urldecode, switch_stack_t stack)
-{
-	char *var, *val = NULL;
-
-	if (zstr(data)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
-	} else {
-		switch_channel_t *channel = switch_core_session_get_channel(session);
-		char *expanded = NULL;
-
-		var = switch_core_session_strdup(session, data);
-
-		if (!(val = strchr(var, '='))) {
-			val = strchr(var, ',');
-		}
-
-		if (val) {
-			*val++ = '\0';
-			if (zstr(val)) {
-				val = NULL;
-			}
-		}
-
-		if (val) {
-			if(urldecode) {
-				switch_url_decode(val);
-			}
-			expanded = switch_channel_expand_variables(channel, val);
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s SET [%s]=[%s] => [%s]\n", switch_channel_get_name(channel), var, val,
-						  expanded ? expanded : "UNDEF");
-		switch_channel_add_variable_var_check(channel, var, expanded, SWITCH_FALSE, stack);
-		kz_check_set_profile_var(channel, var, expanded);
-		if (expanded && expanded != val) {
-			switch_safe_free(expanded);
-		}
-	}
-}
-
-static int kz_is_exported(switch_core_session_t *session, char *varname)
-{
-	char *array[256] = {0};
-	int i, argc;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	const char *exports = switch_channel_get_variable(channel, SWITCH_EXPORT_VARS_VARIABLE);
-	char *arg = switch_core_session_strdup(session, exports);
-	argc = switch_split(arg, ',', array);
-	for(i=0; i < argc; i++) {
-		if(!strcasecmp(array[i], varname))
-			return 1;
-	}
-
-	return 0;
-}
-
-static void base_export (switch_core_session_t *session, const char *data, int urldecode, switch_stack_t stack)
-{
-        char *var, *val = NULL;
-
-        if (zstr(data)) {
-                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
-        } else {
-                switch_channel_t *channel = switch_core_session_get_channel(session);
-                char *expanded = NULL;
-
-                var = switch_core_session_strdup(session, data);
-
-                if (!(val = strchr(var, '='))) {
-                        val = strchr(var, ',');
-                }
-
-                if (val) {
-                        *val++ = '\0';
-                        if (zstr(val)) {
-                                val = NULL;
-                        }
-                }
-
-				if (val) {
-					if(urldecode) {
-						switch_url_decode(val);
-					}
-					expanded = switch_channel_expand_variables(channel, val);
-
-					if(!kz_is_exported(session, var)) {
-						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s EXPORT [%s]=[%s]\n", switch_channel_get_name(channel), var, expanded ? expanded : "UNDEF");
-						switch_channel_export_variable_var_check(channel, var, expanded, SWITCH_EXPORT_VARS_VARIABLE, SWITCH_FALSE);
-					} else {
-						if(strcmp(switch_str_nil(switch_channel_get_variable_dup(channel, var, SWITCH_FALSE, -1)), expanded)) {
-							switch_channel_set_variable(channel, var, expanded);
-						}
-					}
-					if (expanded && expanded != val) {
-						switch_safe_free(expanded);
-					}
-				}
-        }
-}
-
-SWITCH_STANDARD_APP(prefix_unset_function)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_event_header_t *ei = NULL;
-	switch_event_t *clear;
-	char *arg = (char *) data;
-
-	if(switch_event_create(&clear, SWITCH_EVENT_CLONE) != SWITCH_STATUS_SUCCESS) {
-		return;
-	}
-
-	for (ei = switch_channel_variable_first(channel); ei; ei = ei->next) {
-		const char *name = ei->name;
-		char *value = ei->value;
-		if (!strncasecmp(name, arg, strlen(arg))) {
-			switch_event_add_header_string(clear, SWITCH_STACK_BOTTOM, name, value);
-		}
-	}
-
-	switch_channel_variable_last(channel);
-	for (ei = clear->headers; ei; ei = ei->next) {
-		char *varname = ei->name;
-		switch_channel_set_variable(channel, varname, NULL);
-	}
-
-	switch_event_destroy(&clear);
-}
-
-void kz_multiset(switch_core_session_t *session, const char* data, int urldecode)
-{
-	char delim = ' ';
-	char *arg = (char *) data;
-	switch_event_t *event;
-
-	if (!zstr(arg) && *arg == '^' && *(arg+1) == '^') {
-		arg += 2;
-		delim = *arg++;
-	}
-
-	if(delim != '\0') {
-		switch_channel_t *channel = switch_core_session_get_channel(session);
-		if (arg) {
-			char *array[256] = {0};
-			int i, argc;
-
-			arg = switch_core_session_strdup(session, arg);
-			argc = switch_split(arg, delim, array);
-
-			for(i = 0; i < argc; i++) {
-				base_set(session, array[i], urldecode, SWITCH_STACK_BOTTOM);
-			}
-		}
-		if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-			switch_channel_event_set_data(channel, event);
-			switch_event_fire(&event);
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "multiset with empty args\n");
-	}
-}
-
-SWITCH_STANDARD_APP(multiset_function)
-{
-	kz_multiset(session, data, 0);
-}
-
-SWITCH_STANDARD_APP(multiset_encoded_function)
-{
-	kz_multiset(session, data, 1);
-}
-
-void kz_uuid_multiset(switch_core_session_t *session, const char* data, int urldecode)
-{
-	char delim = ' ';
-	char *arg0 = (char *) data;
-	char *arg = strchr(arg0, ' ');
-	switch_event_t *event;
-
-
-	if(arg == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "uuid_multiset with invalid args\n");
-		return;
-	}
-	*arg = '\0';
-	arg++;
-
-	if(zstr(arg0)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "uuid_multiset with invalid uuid\n");
-		return;
-	}
-
-
-	if (!zstr(arg) && *arg == '^' && *(arg+1) == '^') {
-		arg += 2;
-		delim = *arg++;
-	}
-
-	if(delim != '\0') {
-		switch_core_session_t *uuid_session = NULL;
-		if ((uuid_session = switch_core_session_locate(arg0)) != NULL) {
-			switch_channel_t *uuid_channel = switch_core_session_get_channel(uuid_session);
-			if (arg) {
-				char *array[256] = {0};
-				int i, argc;
-
-				arg = switch_core_session_strdup(session, arg);
-				argc = switch_split(arg, delim, array);
-
-				for(i = 0; i < argc; i++) {
-					base_set(uuid_session, array[i], urldecode, SWITCH_STACK_BOTTOM);
-				}
-			}
-			if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-				switch_channel_event_set_data(uuid_channel, event);
-				switch_event_fire(&event);
-			}
-			switch_core_session_rwunlock(uuid_session);
-		} else {
-			base_set(session, data, urldecode, SWITCH_STACK_BOTTOM);
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "multiset with empty args\n");
-	}
-}
-
-SWITCH_STANDARD_APP(uuid_multiset_function)
-{
-	kz_uuid_multiset(session, data, 0);
-}
-
-SWITCH_STANDARD_APP(uuid_multiset_encoded_function)
-{
-	kz_uuid_multiset(session, data, 1);
-}
-
-void kz_set(switch_core_session_t *session, const char* data, int urldecode) {
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_event_t *event;
-
-	base_set(session, data, urldecode, SWITCH_STACK_BOTTOM);
-
-	if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-		switch_channel_event_set_data(channel, event);
-		switch_event_fire(&event);
-	}
-}
-
-SWITCH_STANDARD_APP(set_function)
-{
-	kz_set(session, data, 0);
-}
-
-SWITCH_STANDARD_APP(set_encoded_function)
-{
-	kz_set(session, data, 1);
-}
-
-SWITCH_STANDARD_APP(unset_function) {
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_event_t *event;
-
-	if (zstr(data)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "UNSET [%s]\n", (char *) data);
-		switch_channel_set_variable(switch_core_session_get_channel(session), data, NULL);
-	}
-
-	if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-		switch_channel_event_set_data(channel, event);
-		switch_event_fire(&event);
-	}
-}
-
-SWITCH_STANDARD_APP(multiunset_function) {
-	char delim = ' ';
-	char *arg = (char *) data;
-
-	if (!zstr(arg) && *arg == '^' && *(arg+1) == '^') {
-		arg += 2;
-		delim = *arg++;
-	}
-
-	if(delim != '\0') {
-		if (arg) {
-			char *array[256] = {0};
-			int i, argc;
-
-			arg = switch_core_session_strdup(session, arg);
-			argc = switch_split(arg, delim, array);
-
-			for(i = 0; i < argc; i++) {
-				switch_channel_set_variable(switch_core_session_get_channel(session), array[i], NULL);
-			}
-
-		} else {
-			switch_channel_set_variable(switch_core_session_get_channel(session), arg, NULL);
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "multiunset with empty args\n");
-	}
-}
-
-
-void kz_export(switch_core_session_t *session, const char* data, int urldecode)
-{
-    char delim = ' ';
-    char *arg = (char *) data;
-
-    if (!zstr(arg) && *arg == '^' && *(arg+1) == '^') {
-            arg += 2;
-            delim = *arg++;
-    }
-
-    if(delim != '\0') {
-		if (arg) {
-				char *array[256] = {0};
-				int i, argc;
-
-				arg = switch_core_session_strdup(session, arg);
-				argc = switch_split(arg, delim, array);
-
-				for(i = 0; i < argc; i++) {
-						base_export(session, array[i], urldecode, SWITCH_STACK_BOTTOM);
-				}
-		} else {
-				base_export(session, data, urldecode, SWITCH_STACK_BOTTOM);
-		}
-    } else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "export with empty args\n");
-    }
-}
-
-SWITCH_STANDARD_APP(export_function)
-{
-	kz_export(session, data, 0);
-}
-
-SWITCH_STANDARD_APP(export_encoded_function)
-{
-	kz_export(session, data, 1);
-}
-
-// copied from mod_dptools with allow SWITCH_STATUS_BREAK
-SWITCH_STANDARD_APP(kz_endless_playback_function)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	const char *file = data;
-
-	while (switch_channel_ready(channel)) {
-		status = switch_ivr_play_file(session, NULL, file, NULL);
-
-		if (status != SWITCH_STATUS_SUCCESS) {
-			break;
-		}
-	}
-
-	switch (status) {
-	case SWITCH_STATUS_SUCCESS:
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "FILE PLAYED");
-		break;
-	case SWITCH_STATUS_BREAK:
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "PLAYBACK_INTERRUPTED");
-		break;
-	case SWITCH_STATUS_NOTFOUND:
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "FILE NOT FOUND");
-		break;
-	default:
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "PLAYBACK ERROR");
-		break;
-	}
-
-}
-
-SWITCH_STANDARD_APP(kz_moh_function)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_file_handle_t fh = { 0 };
-	const char *var_samples = switch_channel_get_variable_dup(channel, "moh_playback_samples", SWITCH_FALSE, -1);
-	unsigned int samples =  0;
-	char * my_data = NULL;
-
-	if (var_samples) {
-		fh.samples = samples = atoi(var_samples);
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "SETTING SAMPLES %d\n", samples);
-	}
-
-	switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "");
-
-	/*
-	 * hack for proper position
-	 */
-	if (!strncmp(data, "http_cache://", 13) && session) {
-		switch_channel_t *channel = switch_core_session_get_channel(session);
-		char * resolve = switch_mprintf("${http_get({prefetch=true}%s)}", data+13);
-		my_data = switch_channel_expand_variables_check(channel, resolve, NULL, NULL, 0);
-	} else {
-		my_data = strdup(data);
-	}
-
-	status = switch_ivr_play_file(session, &fh, my_data, NULL);
-//	status = switch_ivr_play_file(session, &fh, data, NULL);
-
-	switch_assert(!(fh.flags & SWITCH_FILE_OPEN));
-
-	switch (status) {
-	case SWITCH_STATUS_SUCCESS:
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "MOH PLAYED SUCCESS\n");
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "MOH FILE PLAYED");
-		switch_channel_set_variable(channel, "moh_playback_samples", "0");
-		break;
-	case SWITCH_STATUS_BREAK:
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "MOH PLAYED BREAK\n");
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "MOH FILE PLAYED");
-		if ((var_samples = switch_channel_get_variable_dup(channel, "playback_samples", SWITCH_FALSE, -1)) != NULL) {
-			samples += atoi(var_samples);
-			if (samples >= fh.samples) {
-				samples = 0;
-			}
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "SETTING MOH SAMPLES %d\n", samples);
-			switch_channel_set_variable_printf(channel, "moh_playback_samples", "%d", samples);
-		}
-		break;
-	case SWITCH_STATUS_NOTFOUND:
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "MOH PLAYED NOT FOUND\n");
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "MOH FILE NOT FOUND");
-		break;
-	default:
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "MOH PLAYED DEFAULT\n");
-		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "MOH PLAYBACK ERROR");
-		break;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "MOH duration %" SWITCH_INT64_T_FMT "\n", fh.duration);
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "MOH offset_pos %d\n", fh.offset_pos);
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "MOH pos %" SWITCH_INT64_T_FMT "\n", fh.pos);
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "MOH sample_count %" SWITCH_SIZE_T_FMT "\n", fh.sample_count);
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "MOH samples %d\n", fh.samples);
-
-	switch_safe_free(my_data);
-}
-
-SWITCH_STANDARD_APP(noop_function)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	const char *response = uuid_str;
-
-	if (zstr(data)) {
-		switch_uuid_str(uuid_str, sizeof(uuid_str));
-	} else {
-		response = data;
-	}
-
-	switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, response);
-}
-
-SWITCH_STANDARD_APP(kz_restore_caller_id_function)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_caller_profile_t *cp = switch_channel_get_caller_profile(channel);
-	cp->caller_id_name = cp->orig_caller_id_name;
-	cp->caller_id_number = cp->orig_caller_id_number;
-}
-
-SWITCH_STANDARD_APP(kz_audio_bridge_function)
-{
-	switch_channel_t *caller_channel = switch_core_session_get_channel(session);
-	switch_core_session_t *peer_session = NULL;
-	switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
-	switch_status_t status = SWITCH_STATUS_FALSE;
-
-	if (zstr(data)) {
-		return;
-	}
-
-	status = switch_ivr_originate(session, &peer_session, &cause, data, 0, NULL, NULL, NULL, NULL, NULL, SOF_NONE, NULL, NULL);
-
-	if (status != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Originate Failed.  Cause: %s\n", switch_channel_cause2str(cause));
-
-		switch_channel_set_variable(caller_channel, "originate_failed_cause", switch_channel_cause2str(cause));
-		switch_channel_set_variable(caller_channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, switch_channel_cause2str(cause));
-		switch_channel_handle_cause(caller_channel, cause);
-
-		return;
-	} else {
-		const char* uuid = switch_core_session_get_uuid(session);
-		const char* peer_uuid = switch_core_session_get_uuid(peer_session);
-
-
-		switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session);
-		if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE)) ||
-			switch_true(switch_channel_get_variable(peer_channel, SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE))) {
-			switch_channel_set_flag(caller_channel, CF_BYPASS_MEDIA_AFTER_BRIDGE);
-		}
-
-		while(1) {
-			const char *xfer_uuid;
-			switch_channel_state_t a_state , a_running_state;
-			switch_channel_state_t b_state , b_running_state;
-			status = switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL);
-
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "BRIDGE RESULT %i\n", status);
-			if(status  != 0) {
-				break;
-			}
-
-			a_state = switch_channel_get_state(caller_channel);
-			a_running_state = switch_channel_get_running_state(caller_channel);
-
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "A STATE %s  %s =>  %s , %s\n", switch_channel_state_name(a_running_state), switch_channel_state_name(a_state), uuid, peer_uuid);
-
-			if(a_state >= CS_HANGUP) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "A HANGUP =  %s , %s\n", uuid, peer_uuid);
-				break;
-			}
-
-			b_state = switch_channel_get_state(peer_channel);
-			b_running_state = switch_channel_get_running_state(peer_channel);
-
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "B STATE %s  %s =>  %s , %s\n", switch_channel_state_name(b_running_state), switch_channel_state_name(b_state), uuid, peer_uuid);
-
-			if(b_state >= CS_HANGUP) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "B HANGUP = %s , %s\n", uuid, peer_uuid);
-				switch_channel_set_variable(caller_channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, switch_channel_cause2str(switch_channel_get_cause(peer_channel)));
-				break;
-			}
-
-			if(!(xfer_uuid=switch_channel_get_variable(caller_channel, "att_xfer_peer_uuid"))) {
-				if(!(xfer_uuid=switch_channel_get_variable(peer_channel, "att_xfer_peer_uuid"))) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "XFER UUID NULL\n");
-					break;
-				}
-			}
-
-			switch_channel_set_variable(caller_channel, "att_xfer_peer_uuid", NULL);
-			switch_channel_set_variable(peer_channel, "att_xfer_peer_uuid", NULL);
-
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "WAIT 1\n");
-
-			switch_channel_clear_flag(peer_channel, CF_UUID_BRIDGE_ORIGINATOR);
-			switch_channel_set_state(peer_channel, CS_RESET);
-			switch_channel_wait_for_state(peer_channel, NULL, CS_RESET);
-			switch_channel_clear_state_handler(peer_channel, NULL);
-
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "WAIT 3\n");
-
-			switch_channel_set_flag(caller_channel, CF_UUID_BRIDGE_ORIGINATOR);
-			switch_channel_clear_flag(caller_channel, CF_TRANSFER);
-			switch_channel_clear_flag(caller_channel, CF_REDIRECT);
-			switch_channel_set_flag(peer_channel, CF_UUID_BRIDGE_ORIGINATOR);
-			switch_channel_clear_flag(peer_channel, CF_TRANSFER);
-			switch_channel_clear_flag(peer_channel, CF_REDIRECT);
-
-			if(!switch_channel_media_up(caller_channel)) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "A MEDIA DOWN HANGUP = %s, %s , %s\n", xfer_uuid, uuid, peer_uuid);
-			}
-			if(!switch_channel_media_up(peer_channel)) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "B MEDIA DOWN HANGUP = %s, %s , %s\n", xfer_uuid, uuid, peer_uuid);
-			}
-			switch_channel_set_state(caller_channel, CS_EXECUTE);
-			switch_channel_set_state(peer_channel, CS_EXECUTE);
-
-
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "XFER LOOP %s %s , %s\n", xfer_uuid, uuid, peer_uuid);
-
-		}
-
-		if (peer_session) {
-			switch_core_session_rwunlock(peer_session);
-		}
-	}
-}
-
-SWITCH_STANDARD_APP(kz_audio_bridge_uuid_function)
-{
-	switch_core_session_t *peer_session = NULL;
-	const char * peer_uuid = NULL;
-
-	if (zstr(data)) {
-		return;
-	}
-
-	peer_uuid = switch_core_session_strdup(session, data);
-	if (peer_uuid && (peer_session = switch_core_session_locate(peer_uuid))) {
-		switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL);
-	}
-
-	if (peer_session) {
-		switch_core_session_rwunlock(peer_session);
-	}
-}
-
-
-struct kz_att_keys {
-	const char *attxfer_cancel_key;
-	const char *attxfer_hangup_key;
-	const char *attxfer_conf_key;
-};
-
-static switch_status_t kz_att_xfer_on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
-{
-	switch_core_session_t *peer_session = (switch_core_session_t *) buf;
-	if (!buf || !peer_session) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	switch (itype) {
-	case SWITCH_INPUT_TYPE_DTMF:
-		{
-			switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
-			switch_channel_t *channel = switch_core_session_get_channel(session);
-			switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session);
-			struct kz_att_keys *keys = switch_channel_get_private(channel, "__kz_keys");
-
-			if (dtmf->digit == *keys->attxfer_hangup_key) {
-				switch_channel_hangup(channel, SWITCH_CAUSE_ATTENDED_TRANSFER);
-				return SWITCH_STATUS_FALSE;
-			}
-
-			if (dtmf->digit == *keys->attxfer_cancel_key) {
-				switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING);
-				return SWITCH_STATUS_FALSE;
-			}
-
-			if (dtmf->digit == *keys->attxfer_conf_key) {
-				switch_caller_extension_t *extension = NULL;
-				const char *app = "three_way";
-				const char *app_arg = switch_core_session_get_uuid(session);
-				const char *holding = switch_channel_get_variable(channel, SWITCH_SOFT_HOLDING_UUID_VARIABLE);
-				switch_core_session_t *b_session;
-
-				if (holding && (b_session = switch_core_session_locate(holding))) {
-					switch_channel_t *b_channel = switch_core_session_get_channel(b_session);
-					if (!switch_channel_ready(b_channel)) {
-						app = "intercept";
-					}
-					switch_core_session_rwunlock(b_session);
-				}
-
-				if ((extension = switch_caller_extension_new(peer_session, app, app_arg)) == 0) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
-					abort();
-				}
-
-				switch_caller_extension_add_application(peer_session, extension, app, app_arg);
-				switch_channel_set_caller_extension(peer_channel, extension);
-				switch_channel_set_state(peer_channel, CS_RESET);
-				switch_channel_wait_for_state(peer_channel, channel, CS_RESET);
-				switch_channel_set_state(peer_channel, CS_EXECUTE);
-				switch_channel_set_variable(channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE, NULL);
-				return SWITCH_STATUS_FALSE;
-			}
-
-		}
-		break;
-	default:
-		break;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t kz_att_xfer_tmp_hanguphook(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_state_t state = switch_channel_get_state(channel);
-
-	if (state == CS_HANGUP || state == CS_ROUTING) {
-		const char *bond = switch_channel_get_variable(channel, SWITCH_SOFT_HOLDING_UUID_VARIABLE);
-
-		if (!zstr(bond)) {
-			switch_core_session_t *b_session;
-
-			if ((b_session = switch_core_session_locate(bond))) {
-				switch_channel_t *b_channel = switch_core_session_get_channel(b_session);
-				if (switch_channel_up(b_channel)) {
-					switch_channel_set_flag(b_channel, CF_REDIRECT);
-				}
-				switch_core_session_rwunlock(b_session);
-			}
-		}
-
-		switch_core_event_hook_remove_state_change(session, kz_att_xfer_tmp_hanguphook);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t kz_att_xfer_hanguphook(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_state_t state = switch_channel_get_state(channel);
-	const char *id = NULL;
-	const char *peer_uuid = NULL;
-
-	if (state == CS_HANGUP || state == CS_ROUTING) {
-		if ((id = switch_channel_get_variable(channel, "xfer_uuids"))) {
-			switch_stream_handle_t stream = { 0 };
-			SWITCH_STANDARD_STREAM(stream);
-			if ((peer_uuid = switch_channel_get_variable(channel, "xfer_peer_uuid"))) {
-				switch_core_session_t *peer_session = NULL;
-				if ((peer_session = switch_core_session_locate(peer_uuid)) != NULL ) {
-					switch_ivr_transfer_recordings(session, peer_session);
-					switch_core_session_rwunlock(peer_session);
-				}
-			}
-			switch_api_execute("uuid_bridge", id, NULL, &stream);
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "\nHangup Command uuid_bridge(%s):\n%s\n", id,
-							  switch_str_nil((char *) stream.data));
-			switch_safe_free(stream.data);
-		}
-
-		switch_core_event_hook_remove_state_change(session, kz_att_xfer_hanguphook);
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static void kz_att_xfer_set_result(switch_channel_t *channel, switch_status_t status)
-{
-	switch_channel_set_variable(channel, SWITCH_ATT_XFER_RESULT_VARIABLE, status == SWITCH_STATUS_SUCCESS ? "success" : "failure");
-}
-
-struct kz_att_obj {
-	switch_core_session_t *session;
-	const char *data;
-	int running;
-};
-
-void *SWITCH_THREAD_FUNC kz_att_thread_run(switch_thread_t *thread, void *obj)
-{
-	struct kz_att_obj *att = (struct kz_att_obj *) obj;
-	struct kz_att_keys *keys = NULL;
-	switch_core_session_t *session = att->session;
-	switch_core_session_t *peer_session = NULL;
-	const char *data = att->data;
-	switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
-	switch_channel_t *channel = switch_core_session_get_channel(session), *peer_channel = NULL;
-	const char *bond = NULL;
-	switch_bool_t follow_recording = switch_true(switch_channel_get_variable(channel, "recording_follow_attxfer"));
-	const char *attxfer_cancel_key = NULL, *attxfer_hangup_key = NULL, *attxfer_conf_key = NULL;
-	int br = 0;
-	switch_event_t *event = NULL;
-	switch_core_session_t *b_session = NULL;
-	switch_channel_t *b_channel = NULL;
-
-	att->running = 1;
-
-	if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
-		return NULL;
-	}
-
-	bond = switch_channel_get_partner_uuid(channel);
-	if ((b_session = switch_core_session_locate(bond)) == NULL) {
-		switch_core_session_rwunlock(session);
-		return NULL;
-	}
-	switch_channel_set_variable(channel, SWITCH_SOFT_HOLDING_UUID_VARIABLE, bond);
-	switch_core_event_hook_add_state_change(session, kz_att_xfer_tmp_hanguphook);
-
-	if (switch_ivr_originate(session, &peer_session, &cause, data, 0, NULL, NULL, NULL, NULL, NULL, SOF_NONE, NULL, NULL)
-		!= SWITCH_STATUS_SUCCESS || !peer_session) {
-		switch_channel_set_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE, bond);
-		goto end;
-	}
-
-	peer_channel = switch_core_session_get_channel(peer_session);
-	switch_channel_set_flag(peer_channel, CF_INNER_BRIDGE);
-	switch_channel_set_flag(channel, CF_INNER_BRIDGE);
-
-	if (!(attxfer_cancel_key = switch_channel_get_variable(channel, "attxfer_cancel_key"))) {
-		if (!(attxfer_cancel_key = switch_channel_get_variable(peer_channel, "attxfer_cancel_key"))) {
-			attxfer_cancel_key = "#";
-		}
-	}
-
-	if (!(attxfer_hangup_key = switch_channel_get_variable(channel, "attxfer_hangup_key"))) {
-		if (!(attxfer_hangup_key = switch_channel_get_variable(peer_channel, "attxfer_hangup_key"))) {
-			attxfer_hangup_key = "*";
-		}
-	}
-
-	if (!(attxfer_conf_key = switch_channel_get_variable(channel, "attxfer_conf_key"))) {
-		if (!(attxfer_conf_key = switch_channel_get_variable(peer_channel, "attxfer_conf_key"))) {
-			attxfer_conf_key = "0";
-		}
-	}
-
-	keys = switch_core_session_alloc(session, sizeof(*keys));
-	keys->attxfer_cancel_key = switch_core_session_strdup(session, attxfer_cancel_key);
-	keys->attxfer_hangup_key = switch_core_session_strdup(session, attxfer_hangup_key);
-	keys->attxfer_conf_key = switch_core_session_strdup(session, attxfer_conf_key);
-	switch_channel_set_private(channel, "__kz_keys", keys);
-
-	switch_channel_set_variable(channel, "att_xfer_peer_uuid", switch_core_session_get_uuid(peer_session));
-
-	switch_ivr_multi_threaded_bridge(session, peer_session, kz_att_xfer_on_dtmf, peer_session, NULL);
-
-	switch_channel_clear_flag(peer_channel, CF_INNER_BRIDGE);
-	switch_channel_clear_flag(channel, CF_INNER_BRIDGE);
-
-	if (switch_channel_down(peer_channel)) {
-		switch_core_session_rwunlock(peer_session);
-		switch_channel_set_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE, bond);
-		goto end;
-	}
-
-	/*
-	 * we're emiting the transferee event so that callctl can update
-	 */
-	b_channel = switch_core_session_get_channel(b_session);
-	if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, "sofia::transferee") == SWITCH_STATUS_SUCCESS) {
-		switch_channel_event_set_data(b_channel, event);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "att_xfer_replaced_call_id", switch_core_session_get_uuid(peer_session));
-		switch_event_fire(&event);
-	}
-
-	if (!switch_channel_ready(channel)) {
-		switch_status_t status;
-
-		if (follow_recording) {
-			switch_ivr_transfer_recordings(session, peer_session);
-		}
-		status = switch_ivr_uuid_bridge(switch_core_session_get_uuid(peer_session), bond);
-		kz_att_xfer_set_result(peer_channel, status);
-		br++;
-	} else {
-		// switch_channel_set_variable_printf(b_channel, "xfer_uuids", "%s %s", switch_core_session_get_uuid(peer_session), switch_core_session_get_uuid(session));
-		switch_channel_set_variable_printf(channel, "xfer_uuids", "%s %s", switch_core_session_get_uuid(peer_session), bond);
-		switch_channel_set_variable(channel, "xfer_peer_uuid", switch_core_session_get_uuid(peer_session));
-
-		switch_core_event_hook_add_state_change(session, kz_att_xfer_hanguphook);
-		// switch_core_event_hook_add_state_change(b_session, kz_att_xfer_hanguphook);
-	}
-
-/*
- * this was commented so that the existing bridge
- * doesn't end
- *
-		if (!br) {
-			switch_status_t status = switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), bond);
-			att_xfer_set_result(channel, status);
-		}
-*/
-
-	switch_core_session_rwunlock(peer_session);
-
-  end:
-
-	switch_core_event_hook_remove_state_change(session, kz_att_xfer_tmp_hanguphook);
-
-	switch_channel_set_variable(channel, SWITCH_SOFT_HOLDING_UUID_VARIABLE, NULL);
-	switch_channel_clear_flag(channel, CF_XFER_ZOMBIE);
-
-	switch_core_session_rwunlock(b_session);
-	switch_core_session_rwunlock(session);
-	att->running = 0;
-
-	return NULL;
-}
-
-SWITCH_STANDARD_APP(kz_att_xfer_function)
-{
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	switch_memory_pool_t *pool = switch_core_session_get_pool(session);
-	struct kz_att_obj *att;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-
-	switch_threadattr_create(&thd_attr, pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_threadattr_detach_set(thd_attr, 1);
-
-	att = switch_core_session_alloc(session, sizeof(*att));
-	att->running = -1;
-	att->session = session;
-	att->data = switch_core_session_strdup(session, data);
-	switch_thread_create(&thread, thd_attr, kz_att_thread_run, att, pool);
-
-	while(att->running && switch_channel_up(channel)) {
-		switch_yield(100000);
-	}
-}
-
-void add_kz_dptools(switch_loadable_module_interface_t **module_interface) {
-	switch_application_interface_t *app_interface = NULL;
-	SWITCH_ADD_APP(app_interface, "kz_set", SET_SHORT_DESC, SET_LONG_DESC, set_function, SET_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_set_encoded", SET_SHORT_DESC, SET_LONG_DESC, set_encoded_function, SET_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_multiset", MULTISET_SHORT_DESC, MULTISET_LONG_DESC, multiset_function, MULTISET_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_multiset_encoded", MULTISET_SHORT_DESC, MULTISET_LONG_DESC, multiset_encoded_function, MULTISET_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_unset", UNSET_SHORT_DESC, UNSET_LONG_DESC, unset_function, UNSET_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_multiunset", MULTISET_SHORT_DESC, MULTISET_LONG_DESC, multiunset_function, MULTIUNSET_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_export", EXPORT_SHORT_DESC, EXPORT_LONG_DESC, export_function, EXPORT_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_export_encoded", EXPORT_SHORT_DESC, EXPORT_LONG_DESC, export_encoded_function, EXPORT_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_prefix_unset", PREFIX_UNSET_SHORT_DESC, PREFIX_UNSET_LONG_DESC, prefix_unset_function, PREFIX_UNSET_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_uuid_multiset", UUID_MULTISET_SHORT_DESC, UUID_MULTISET_LONG_DESC, uuid_multiset_function, UUID_MULTISET_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_uuid_multiset_encoded", UUID_MULTISET_SHORT_DESC, UUID_MULTISET_LONG_DESC, uuid_multiset_encoded_function, UUID_MULTISET_SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC | SAF_ZOMBIE_EXEC);
-	SWITCH_ADD_APP(app_interface, "kz_endless_playback", KZ_ENDLESS_PLAYBACK_SHORT_DESC, KZ_ENDLESS_PLAYBACK_LONG_DESC, kz_endless_playback_function, KZ_ENDLESS_PLAYBACK_SYNTAX, SAF_NONE);
-	SWITCH_ADD_APP(app_interface, "kz_restore_caller_id", NOOP_SHORT_DESC, NOOP_LONG_DESC, kz_restore_caller_id_function, NOOP_SYNTAX, SAF_NONE);
-	SWITCH_ADD_APP(app_interface, "noop", NOOP_SHORT_DESC, NOOP_LONG_DESC, noop_function, NOOP_SYNTAX, SAF_NONE);
-	SWITCH_ADD_APP(app_interface, "kz_bridge", "Bridge Audio", "Bridge the audio between two sessions", kz_audio_bridge_function, "<channel_url>", SAF_SUPPORT_NOMEDIA|SAF_SUPPORT_TEXT_ONLY);
-	SWITCH_ADD_APP(app_interface, "kz_bridge_uuid", "Bridge Audio", "Bridge the audio between two sessions", kz_audio_bridge_uuid_function, "<channel_url>", SAF_SUPPORT_NOMEDIA|SAF_SUPPORT_TEXT_ONLY);
-	SWITCH_ADD_APP(app_interface, "kz_att_xfer", "Attended Transfer", "Attended Transfer", kz_att_xfer_function, "<channel_url>", SAF_NONE);
-	SWITCH_ADD_APP(app_interface, "kz_moh", "Kazoo MOH Playback", "Kazoo MOH Playback", kz_moh_function, "", SAF_NONE);
-}
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_ei.h b/src/mod/event_handlers/mod_kazoo/kazoo_ei.h
deleted file mode 100644
index 5f617b5f1d..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_ei.h
+++ /dev/null
@@ -1,295 +0,0 @@
-#ifndef KAZOO_EI_H
-#define KAZOO_EI_H
-
-#include <switch.h>
-#include <ei.h>
-
-#define MODNAME "mod_kazoo"
-#define BUNDLE "community"
-#define RELEASE "v1.5.0-1"
-#define VERSION "mod_kazoo v1.5.0-1 community"
-
-#define KZ_MAX_SEPARATE_STRINGS 10
-#define HOSTNAME_MAX 1024
-#define NODENAME_MAX 1024
-
-typedef enum {KAZOO_FETCH_PROFILE, KAZOO_EVENT_PROFILE} kazoo_profile_type;
-
-typedef enum {ERLANG_TUPLE, ERLANG_MAP} kazoo_json_term;
-
-typedef struct ei_xml_agent_s ei_xml_agent_t;
-typedef ei_xml_agent_t *ei_xml_agent_ptr;
-
-typedef struct kazoo_event kazoo_event_t;
-typedef kazoo_event_t *kazoo_event_ptr;
-
-typedef struct kazoo_event_profile kazoo_event_profile_t;
-typedef kazoo_event_profile_t *kazoo_event_profile_ptr;
-
-typedef struct kazoo_fetch_profile kazoo_fetch_profile_t;
-typedef kazoo_fetch_profile_t *kazoo_fetch_profile_ptr;
-
-typedef struct kazoo_config_t kazoo_config;
-typedef kazoo_config *kazoo_config_ptr;
-
-#include "kazoo_fields.h"
-#include "kazoo_config.h"
-
-struct ei_send_msg_s {
-	ei_x_buff buf;
-	erlang_pid pid;
-};
-typedef struct ei_send_msg_s ei_send_msg_t;
-
-struct ei_received_msg_s {
-	ei_x_buff buf;
-	erlang_msg msg;
-};
-typedef struct ei_received_msg_s ei_received_msg_t;
-
-
-typedef struct ei_event_stream_s ei_event_stream_t;
-typedef struct ei_node_s ei_node_t;
-
-struct ei_event_binding_s {
-	char id[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	switch_event_node_t *node;
-	switch_event_types_t type;
-	const char *subclass_name;
-	ei_event_stream_t* stream;
-	kazoo_event_ptr event;
-
-	struct ei_event_binding_s *next;
-};
-typedef struct ei_event_binding_s ei_event_binding_t;
-
-struct ei_event_stream_s {
-	switch_memory_pool_t *pool;
-	ei_event_binding_t *bindings;
-	switch_queue_t *queue;
-	switch_socket_t *acceptor;
-	switch_pollset_t *pollset;
-	switch_pollfd_t *pollfd;
-	switch_socket_t *socket;
-	switch_mutex_t *socket_mutex;
-	switch_bool_t connected;
-	switch_time_t connected_time;
-	char remote_ip[48];
-	uint16_t remote_port;
-	char local_ip[48];
-	uint16_t local_port;
-	erlang_pid pid;
-	uint32_t flags;
-	ei_node_t *node;
-	short event_stream_framing;
-	short event_stream_keepalive;
-	switch_interval_time_t queue_timeout;
-	struct ei_event_stream_s *next;
-};
-
-struct ei_node_s {
-	int nodefd;
-	switch_atomic_t pending_bgapi;
-	switch_atomic_t receive_handlers;
-	switch_memory_pool_t *pool;
-	ei_event_stream_t *event_streams;
-	switch_mutex_t *event_streams_mutex;
-	switch_queue_t *send_msgs;
-	switch_queue_t *received_msgs;
-	char *peer_nodename;
-	switch_time_t created_time;
-	switch_socket_t *socket;
-	char remote_ip[48];
-	uint16_t remote_port;
-	char local_ip[48];
-	uint16_t local_port;
-	uint32_t flags;
-	int legacy;
-	short event_stream_framing;
-	short event_stream_keepalive;
-	switch_interval_time_t event_stream_queue_timeout;
-	switch_interval_time_t receiver_queue_timeout;
-	switch_interval_time_t sender_queue_timeout;
-	struct ei_node_s *next;
-};
-
-
-struct xml_fetch_reply_s {
-	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	char *xml_str;
-	struct xml_fetch_reply_s *next;
-};
-typedef struct xml_fetch_reply_s xml_fetch_reply_t;
-
-struct fetch_handler_s {
-	erlang_pid pid;
-	struct fetch_handler_s *next;
-};
-typedef struct fetch_handler_s fetch_handler_t;
-
-struct ei_xml_client_s {
-	ei_node_t *ei_node;
-	fetch_handler_t *fetch_handlers;
-	struct ei_xml_client_s *next;
-};
-typedef struct ei_xml_client_s ei_xml_client_t;
-
-struct ei_xml_agent_s {
-	switch_memory_pool_t *pool;
-	switch_xml_section_t section;
-	switch_thread_rwlock_t *lock;
-	ei_xml_client_t *clients;
-	switch_mutex_t *current_client_mutex;
-	ei_xml_client_t *current_client;
-	switch_mutex_t *replies_mutex;
-	switch_thread_cond_t *new_reply;
-	xml_fetch_reply_t *replies;
-	kazoo_fetch_profile_ptr profile;
-
-};
-
-struct kz_globals_s {
-	switch_memory_pool_t *pool;
-	switch_atomic_t threads;
-	switch_socket_t *acceptor;
-	struct ei_cnode_s ei_cnode;
-	switch_thread_rwlock_t *ei_nodes_lock;
-	ei_node_t *ei_nodes;
-
-	switch_xml_binding_t *config_fetch_binding;
-	switch_xml_binding_t *directory_fetch_binding;
-	switch_xml_binding_t *dialplan_fetch_binding;
-	switch_xml_binding_t *channels_fetch_binding;
-	switch_xml_binding_t *languages_fetch_binding;
-	switch_xml_binding_t *chatplan_fetch_binding;
-
-	switch_hash_t *event_filter;
-	int epmdfd;
-	int node_worker_threads;
-	switch_bool_t nat_map;
-	switch_bool_t ei_shortname;
-	int ei_compat_rel;
-	char *ip;
-	char *hostname;
-	struct hostent* hostname_ent;
-	char *ei_cookie;
-	char *ei_nodename;
-	uint32_t flags;
-	int send_all_headers;
-	int send_all_private_headers;
-	int connection_timeout;
-	int ei_receive_timeout;
-	switch_interval_time_t node_sender_queue_timeout;
-	switch_interval_time_t node_receiver_queue_timeout;
-	int receive_msg_preallocate;
-	int event_stream_preallocate;
-	int send_msg_batch;
-	short event_stream_framing;
-	short event_stream_keepalive;
-	switch_interval_time_t event_stream_queue_timeout;
-	switch_port_t port;
-	int config_fetched;
-	int io_fault_tolerance;
-	switch_interval_time_t io_fault_tolerance_sleep;
-	kazoo_event_profile_ptr events;
-	kazoo_config_ptr definitions;
-	kazoo_config_ptr event_handlers;
-	kazoo_config_ptr fetch_handlers;
-	kazoo_json_term  json_encoding;
-
-	char **profile_vars_prefixes;
-	char **kazoo_var_prefixes;
-
-	int legacy_events;
-	uint8_t tweaks[KZ_TWEAK_MAX];
-	switch_bool_t expand_headers_on_fetch;
-
-	switch_interval_time_t delay_before_initial_fetch;
-
-
-};
-typedef struct kz_globals_s kz_globals_t;
-extern kz_globals_t kazoo_globals;
-
-/* kazoo_event_stream.c */
-ei_event_stream_t *find_event_stream(ei_event_stream_t *event_streams, const erlang_pid *from);
-
-//ei_event_stream_t *new_event_stream(ei_event_stream_t **event_streams, const erlang_pid *from);
-ei_event_stream_t *new_event_stream(ei_node_t *ei_node, const erlang_pid *from);
-
-
-switch_status_t remove_event_stream(ei_event_stream_t **event_streams, const erlang_pid *from);
-switch_status_t remove_event_streams(ei_event_stream_t **event_streams);
-unsigned long get_stream_port(const ei_event_stream_t *event_stream);
-switch_status_t add_event_binding(ei_event_stream_t *event_stream, const char *event_name);
-//switch_status_t add_event_binding(ei_event_stream_t *event_stream, const switch_event_types_t event_type, const char *subclass_name);
-switch_status_t remove_event_binding(ei_event_stream_t *event_stream, const switch_event_types_t event_type, const char *subclass_name);
-switch_status_t remove_event_bindings(ei_event_stream_t *event_stream);
-
-/* kazoo_node.c */
-switch_status_t new_kazoo_node(int nodefd, ErlConnect *conn);
-
-/* kazoo_ei_utils.c */
-void close_socket(switch_socket_t **sock);
-void close_socketfd(int *sockfd);
-switch_socket_t *create_socket_with_port(switch_memory_pool_t *pool, switch_port_t port);
-switch_socket_t *create_socket(switch_memory_pool_t *pool);
-switch_status_t create_ei_cnode(const char *ip_addr, const char *name, struct ei_cnode_s *ei_cnode);
-switch_status_t ei_compare_pids(const erlang_pid *pid1, const erlang_pid *pid2);
-void ei_encode_switch_event_headers(ei_x_buff *ebuf, switch_event_t *event);
-void ei_encode_switch_event_headers_2(ei_x_buff *ebuf, switch_event_t *event, int decode);
-void ei_encode_json(ei_x_buff *ebuf, cJSON *JObj);
-void ei_link(ei_node_t *ei_node, erlang_pid * from, erlang_pid * to);
-void ei_encode_switch_event(ei_x_buff * ebuf, switch_event_t *event);
-int ei_helper_send(ei_node_t *ei_node, erlang_pid* to, ei_x_buff *buf);
-int ei_decode_atom_safe(char *buf, int *index, char *dst);
-int ei_decode_string_or_binary_limited(char *buf, int *index, int maxsize, char *dst);
-int ei_decode_string_or_binary(char *buf, int *index, char **dst);
-switch_status_t create_acceptor();
-switch_hash_t *create_default_filter();
-void kz_erl_init();
-void kz_erl_shutdown();
-SWITCH_DECLARE(switch_status_t) ei_queue_pop(switch_queue_t *queue, void **data, switch_interval_time_t timeout);
-
-void fetch_config();
-
-switch_status_t kazoo_load_config();
-void kazoo_destroy_config();
-void kz_set_hostname();
-
-#define _ei_x_encode_string(buf, string) { ei_x_encode_binary(buf, string, strlen(string)); }
-
-/* kazoo_fetch_agent.c */
-switch_status_t bind_fetch_agents();
-switch_status_t unbind_fetch_agents();
-switch_status_t remove_xml_clients(ei_node_t *ei_node);
-switch_status_t add_fetch_handler(ei_node_t *ei_node, erlang_pid *from, switch_xml_binding_t *binding);
-switch_status_t remove_fetch_handlers(ei_node_t *ei_node, erlang_pid *from);
-switch_status_t fetch_reply(char *uuid_str, char *xml_str, switch_xml_binding_t *binding);
-switch_status_t handle_api_command_streams(ei_node_t *ei_node, switch_stream_handle_t *stream);
-
-void bind_event_profiles(kazoo_event_ptr event);
-void rebind_fetch_profiles(kazoo_config_ptr fetch_handlers);
-switch_status_t kazoo_config_handlers(switch_xml_t cfg);
-
-/* runtime */
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_kazoo_runtime);
-
-
-
-#define kz_test_tweak(flag) (kazoo_globals.tweaks[flag] ? 1 : 0)
-#define kz_set_tweak(flag) kazoo_globals.tweaks[flag] = 1
-#define kz_clear_tweak(flag) kazoo_globals.tweaks[flag] = 0
-
-#endif /* KAZOO_EI_H */
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_ei_config.c b/src/mod/event_handlers/mod_kazoo/kazoo_ei_config.c
deleted file mode 100644
index f1726b677b..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_ei_config.c
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
-* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-* Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
-*
-* Version: MPL 1.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-*
-* The Initial Developer of the Original Code is
-* Anthony Minessale II <anthm@freeswitch.org>
-* Portions created by the Initial Developer are Copyright (C)
-* the Initial Developer. All Rights Reserved.
-*
-* Based on mod_skel by
-* Anthony Minessale II <anthm@freeswitch.org>
-*
-* Contributor(s):
-*
-* Daniel Bryars <danb@aeriandi.com>
-* Tim Brown <tim.brown@aeriandi.com>
-* Anthony Minessale II <anthm@freeswitch.org>
-* William King <william.king@quentustech.com>
-* Mike Jerris <mike@jerris.com>
-*
-* kazoo.c -- Sends FreeSWITCH events to an AMQP broker
-*
-*/
-
-#include "mod_kazoo.h"
-
-#define KZ_DEFAULT_STREAM_PRE_ALLOCATE 8192
-
-#define KAZOO_DECLARE_GLOBAL_STRING_FUNC(fname, vname) static void __attribute__((__unused__)) fname(const char *string) { if (!string) return;\
-		if (vname) {free(vname); vname = NULL;}vname = strdup(string);} static void fname(const char *string)
-
-KAZOO_DECLARE_GLOBAL_STRING_FUNC(set_pref_ip, kazoo_globals.ip);
-KAZOO_DECLARE_GLOBAL_STRING_FUNC(set_pref_ei_cookie, kazoo_globals.ei_cookie);
-KAZOO_DECLARE_GLOBAL_STRING_FUNC(set_pref_ei_nodename, kazoo_globals.ei_nodename);
-//KAZOO_DECLARE_GLOBAL_STRING_FUNC(set_pref_kazoo_var_prefix, kazoo_globals.kazoo_var_prefix);
-
-static int read_cookie_from_file(char *filename) {
-	int fd;
-	char cookie[MAXATOMLEN + 1];
-	char *end;
-	struct stat buf;
-
-	if (!stat(filename, &buf)) {
-		if ((buf.st_mode & S_IRWXG) || (buf.st_mode & S_IRWXO)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s must only be accessible by owner only.\n", filename);
-			return 2;
-		}
-		if (buf.st_size > MAXATOMLEN) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s contains a cookie larger than the maximum atom size of %d.\n", filename, MAXATOMLEN);
-			return 2;
-		}
-		fd = open(filename, O_RDONLY);
-		if (fd < 1) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to open cookie file %s : %d.\n", filename, errno);
-			return 2;
-		}
-
-		if (read(fd, cookie, MAXATOMLEN) < 1) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to read cookie file %s : %d.\n", filename, errno);
-		}
-
-		cookie[MAXATOMLEN] = '\0';
-
-		/* replace any end of line characters with a null */
-		if ((end = strchr(cookie, '\n'))) {
-			*end = '\0';
-		}
-
-		if ((end = strchr(cookie, '\r'))) {
-			*end = '\0';
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set cookie from file %s: %s\n", filename, cookie);
-
-		set_pref_ei_cookie(cookie);
-		return 0;
-	} else {
-		/* don't error here, because we might be blindly trying to read $HOME/.erlang.cookie, and that can fail silently */
-		return 1;
-	}
-}
-
-void kz_set_hostname()
-{
-	if (kazoo_globals.hostname == NULL) {
-		char hostname[NODENAME_MAX];
-		memcpy(hostname, switch_core_get_hostname(), NODENAME_MAX);
-		kazoo_globals.hostname_ent = gethostbyname(hostname);
-		if(kazoo_globals.hostname_ent != NULL) {
-			kazoo_globals.hostname = switch_core_strdup(kazoo_globals.pool, kazoo_globals.hostname_ent->h_name);
-		} else {
-			kazoo_globals.hostname = switch_core_strdup(kazoo_globals.pool, hostname);
-		}
-	}
-}
-
-switch_status_t kazoo_ei_config(switch_xml_t cfg) {
-	switch_xml_t child, param;
-	char* kazoo_var_prefix = NULL;
-	char* profile_vars_prefix = NULL;
-	char* sep_array[KZ_MAX_SEPARATE_STRINGS];
-	int array_len, i;
-	kazoo_globals.send_all_headers = 0;
-	kazoo_globals.send_all_private_headers = 1;
-	kazoo_globals.connection_timeout = 500;
-	kazoo_globals.ei_receive_timeout = 200;
-	kazoo_globals.receive_msg_preallocate = 2000;
-	kazoo_globals.event_stream_preallocate = KZ_DEFAULT_STREAM_PRE_ALLOCATE;
-	kazoo_globals.send_msg_batch = 10;
-	kazoo_globals.event_stream_framing = 2;
-	kazoo_globals.event_stream_keepalive = 1;
-	kazoo_globals.event_stream_queue_timeout = 200000;
-	kazoo_globals.node_receiver_queue_timeout = 100000;
-	kazoo_globals.node_sender_queue_timeout = 0;
-	kazoo_globals.port = 0;
-	kazoo_globals.io_fault_tolerance = 3;
-	kazoo_globals.io_fault_tolerance_sleep = 100000; // 100 ms
-	kazoo_globals.json_encoding = ERLANG_TUPLE;
-	kazoo_globals.delay_before_initial_fetch = 10000000;
-
-	kazoo_globals.legacy_events = SWITCH_FALSE;
-	kazoo_globals.expand_headers_on_fetch = SWITCH_TRUE;
-
-	kz_set_tweak(KZ_TWEAK_INTERACTION_ID);
-	kz_set_tweak(KZ_TWEAK_EXPORT_VARS);
-	kz_set_tweak(KZ_TWEAK_SWITCH_URI);
-	kz_set_tweak(KZ_TWEAK_REPLACES_CALL_ID);
-	kz_set_tweak(KZ_TWEAK_LOOPBACK_VARS);
-	kz_set_tweak(KZ_TWEAK_CALLER_ID);
-	kz_set_tweak(KZ_TWEAK_TRANSFERS);
-	kz_set_tweak(KZ_TWEAK_BRIDGE);
-	kz_set_tweak(KZ_TWEAK_BRIDGE_REPLACES_ALEG);
-	kz_set_tweak(KZ_TWEAK_BRIDGE_REPLACES_CALL_ID);
-	kz_set_tweak(KZ_TWEAK_BRIDGE_VARIABLES);
-	kz_set_tweak(KZ_TWEAK_RESTORE_CALLER_ID_ON_BLIND_XFER);
-
-
-
-	if ((child = switch_xml_child(cfg, "settings"))) {
-		for (param = switch_xml_child(child, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!strcmp(var, "listen-ip")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set bind ip address: %s\n", val);
-				set_pref_ip(val);
-			} else if (!strcmp(var, "listen-port")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set bind port: %s\n", val);
-				kazoo_globals.port = atoi(val);
-			} else if (!strcmp(var, "cookie")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set cookie: %s\n", val);
-				set_pref_ei_cookie(val);
-			} else if (!strcmp(var, "cookie-file")) {
-				if (read_cookie_from_file(val) == 1) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to read cookie from %s\n", val);
-				}
-			} else if (!strcmp(var, "nodename")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set node name: %s\n", val);
-				set_pref_ei_nodename(val);
-			} else if (!strcmp(var, "shortname")) {
-				kazoo_globals.ei_shortname = switch_true(val);
-			} else if (!strcmp(var, "kazoo-var-prefix")) {
-				kazoo_var_prefix = switch_core_strdup(kazoo_globals.pool, val);
-			} else if (!strcmp(var, "set-profile-vars-prefix")) {
-				profile_vars_prefix = switch_core_strdup(kazoo_globals.pool, val);
-			} else if (!strcmp(var, "compat-rel")) {
-				if (atoi(val) >= 7)
-					kazoo_globals.ei_compat_rel = atoi(val);
-				else
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid compatibility release '%s' specified\n", val);
-			} else if (!strcmp(var, "nat-map")) {
-				kazoo_globals.nat_map = switch_true(val);
-			} else if (!strcmp(var, "send-all-headers")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set send-all-headers: %s\n", val);
-				kazoo_globals.send_all_headers = switch_true(val);
-			} else if (!strcmp(var, "send-all-private-headers")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set send-all-private-headers: %s\n", val);
-				kazoo_globals.send_all_private_headers = switch_true(val);
-			} else if (!strcmp(var, "connection-timeout")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set connection-timeout: %s\n", val);
-				kazoo_globals.connection_timeout = atoi(val);
-			} else if (!strcmp(var, "receive-timeout")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set receive-timeout: %s\n", val);
-				kazoo_globals.ei_receive_timeout = atoi(val);
-			} else if (!strcmp(var, "receive-msg-preallocate")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set receive-msg-preallocate: %s\n", val);
-				kazoo_globals.receive_msg_preallocate = atoi(val);
-			} else if (!strcmp(var, "event-stream-preallocate")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set event-stream-preallocate: %s\n", val);
-				kazoo_globals.event_stream_preallocate = atoi(val);
-			} else if (!strcmp(var, "send-msg-batch-size")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set send-msg-batch-size: %s\n", val);
-				kazoo_globals.send_msg_batch = atoi(val);
-			} else if (!strcmp(var, "event-stream-framing")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set event-stream-framing: %s\n", val);
-				kazoo_globals.event_stream_framing = atoi(val);
-
-			} else if (!strcmp(var, "event-stream-keep-alive")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set event-stream-keep-alive: %s\n", val);
-				kazoo_globals.event_stream_keepalive = switch_true(val);
-
-			} else if (!strcmp(var, "io-fault-tolerance")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set io-fault-tolerance: %s\n", val);
-				kazoo_globals.io_fault_tolerance = atoi(val);
-			} else if (!strcmp(var, "io-fault-tolerance-sleep-micro")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set %s : %s\n", var, val);
-				kazoo_globals.io_fault_tolerance_sleep = atoi(val);
-			} else if (!strcmp(var, "io-fault-tolerance-sleep-ms")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set %s : %s\n", var, val);
-				kazoo_globals.io_fault_tolerance_sleep = atoi(val) * 1000;
-			} else if (!strcmp(var, "io-fault-tolerance-sleep-sec")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set %s : %s\n", var, val);
-				kazoo_globals.io_fault_tolerance_sleep = atoi(val) * 1000000;
-
-
-			} else if (!strcmp(var, "node-worker-threads")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set node-worker-threads: %s\n", val);
-				kazoo_globals.node_worker_threads = atoi(val);
-			} else if (!strcmp(var, "json-term-encoding")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set json-term-encoding: %s\n", val);
-				if(!strcmp(val, "map")) {
-					kazoo_globals.json_encoding = ERLANG_MAP;
-				}
-			} else if (!strcmp(var, "legacy-events")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set legacy-events: %s\n", val);
-				kazoo_globals.legacy_events = switch_true(val);
-			} else if (!strcmp(var, "expand-headers-on-fetch")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set expand-headers-on-fetch: %s\n", val);
-				kazoo_globals.expand_headers_on_fetch = switch_true(val);
-			} else if (!strcmp(var, "node-receiver-queue-timeout")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set %s : %s\n", var, val);
-				kazoo_globals.node_receiver_queue_timeout = atoi(val);
-			} else if (!strcmp(var, "node-sender-queue-timeout")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set %s : %s\n", var, val);
-				kazoo_globals.node_sender_queue_timeout = atoi(val);
-			} else if (!strcmp(var, "event-stream-queue-timeout")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set %s : %s\n", var, val);
-				kazoo_globals.event_stream_queue_timeout = atoi(val);
-			} else if (!strcmp(var, "delay-before-initial-fetch-micro")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set %s : %s\n", var, val);
-				kazoo_globals.delay_before_initial_fetch = atoi(val);
-			} else if (!strcmp(var, "delay-before-initial-fetch-ms")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set %s : %s\n", var, val);
-				kazoo_globals.delay_before_initial_fetch = atoi(val) * 1000;
-			} else if (!strcmp(var, "delay-before-initial-fetch-sec")) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set %s : %s\n", var, val);
-				kazoo_globals.delay_before_initial_fetch = atoi(val) * 1000000;
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "unknown config option %s : %s\n", var, val);
-			}
-		}
-	}
-
-	if ((child = switch_xml_child(cfg, "tweaks"))) {
-		char *default_tweaks = (char *) switch_xml_attr_soft(child, "default");
-		if (default_tweaks && !zstr(default_tweaks)) {
-			int i, v = switch_true(default_tweaks) ? 1 : 0;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set tweak default : %s\n", default_tweaks);
-			for (i = 0; i < KZ_TWEAK_MAX; i++) kazoo_globals.tweaks[i] = v;
-		}
-		for (param = switch_xml_child(child, "tweak"); param; param = param->next) {
-			kz_tweak_t tweak = KZ_TWEAK_MAX;
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-			if(var && val && kz_name_tweak(var, &tweak) == SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set tweak %s : %s\n", var, val);
-				if(switch_true(val)) {
-					kz_set_tweak(tweak);
-				} else {
-					kz_clear_tweak(tweak);
-				}
-			}
-		}
-	}
-
-	if ((child = switch_xml_child(cfg, "variables"))) {
-		for (param = switch_xml_child(child, "variable"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-			if(var && val) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set core variable %s : %s\n", var, val);
-				switch_core_set_variable(var, val);
-			}
-		}
-	}
-
-	if ((child = switch_xml_child(cfg, "event-filter"))) {
-		switch_hash_t *filter;
-
-		switch_core_hash_init(&filter);
-		for (param = switch_xml_child(child, "header"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			switch_core_hash_insert(filter, var, "1");
-		}
-		kazoo_globals.event_filter = filter;
-	}
-
-	if (kazoo_globals.receive_msg_preallocate < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid receive message preallocate value, disabled\n");
-		kazoo_globals.receive_msg_preallocate = 0;
-	}
-
-	if (kazoo_globals.event_stream_preallocate < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid event stream preallocate value, disabled\n");
-		kazoo_globals.event_stream_preallocate = 0;
-	}
-
-	if (kazoo_globals.send_msg_batch < 1) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid send message batch size, reverting to default\n");
-		kazoo_globals.send_msg_batch = 10;
-	}
-
-	if (kazoo_globals.io_fault_tolerance < 1) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid I/O fault tolerance, reverting to default\n");
-		kazoo_globals.io_fault_tolerance = 10;
-	}
-
-	if (!kazoo_globals.event_filter) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Event filter not found in configuration, using default\n");
-		kazoo_globals.event_filter = create_default_filter();
-	}
-
-	if (kazoo_globals.event_stream_framing < 1 || kazoo_globals.event_stream_framing > 4) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid event stream framing value, using default\n");
-		kazoo_globals.event_stream_framing = 2;
-	}
-
-	if (zstr(kazoo_var_prefix)) {
-		kazoo_var_prefix = switch_core_strdup(kazoo_globals.pool, "ecallmgr_;cav_");
-	}
-
-	if (zstr(profile_vars_prefix)) {
-		profile_vars_prefix = switch_core_strdup(kazoo_globals.pool, "effective_;origination_");
-	}
-
-	kazoo_globals.kazoo_var_prefixes = switch_core_alloc(kazoo_globals.pool, sizeof(char*) * KZ_MAX_SEPARATE_STRINGS);
-	array_len = switch_separate_string(kazoo_var_prefix, ';', sep_array, KZ_MAX_SEPARATE_STRINGS - 1);
-	for(i=0; i < array_len; i++) {
-		char var[100];
-		sprintf(var, "variable_%s", sep_array[i]);
-		kazoo_globals.kazoo_var_prefixes[i] = switch_core_strdup(kazoo_globals.pool, var);
-	}
-
-	kazoo_globals.profile_vars_prefixes = switch_core_alloc(kazoo_globals.pool, sizeof(char*) * KZ_MAX_SEPARATE_STRINGS);
-	array_len = switch_separate_string(profile_vars_prefix, ';', sep_array, KZ_MAX_SEPARATE_STRINGS - 1);
-	for(i=0; i < array_len; i++) {
-		kazoo_globals.profile_vars_prefixes[i] = switch_core_strdup(kazoo_globals.pool, sep_array[i]);
-	}
-
-	if (!kazoo_globals.node_worker_threads) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Number of node worker threads not found in configuration, using default\n");
-		kazoo_globals.node_worker_threads = 10;
-	}
-
-	if (zstr(kazoo_globals.ip)) {
-		set_pref_ip("0.0.0.0");
-	}
-
-	if (zstr(kazoo_globals.ei_cookie)) {
-		int res;
-		char *home_dir = getenv("HOME");
-		char path_buf[1024];
-
-		if (!zstr(home_dir)) {
-			/* $HOME/.erlang.cookie */
-			switch_snprintf(path_buf, sizeof (path_buf), "%s%s%s", home_dir, SWITCH_PATH_SEPARATOR, ".erlang.cookie");
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for cookie at path: %s\n", path_buf);
-
-			res = read_cookie_from_file(path_buf);
-			if (res) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No cookie or valid cookie file specified, using default cookie\n");
-				set_pref_ei_cookie("ClueCon");
-			}
-		}
-	}
-
-	if (!kazoo_globals.ei_nodename) {
-		set_pref_ei_nodename("freeswitch");
-	}
-
-	if (!kazoo_globals.nat_map) {
-		kazoo_globals.nat_map = 0;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t kazoo_config_handlers(switch_xml_t cfg)
-{
-		switch_xml_t def = NULL;
-		switch_xml_t child, param;
-		char* xml = NULL;
-		kazoo_config_ptr definitions = NULL, fetch_handlers = NULL, event_handlers = NULL;
-		kazoo_event_profile_ptr events = NULL;
-
-		xml = strndup(kz_default_config, kz_default_config_size);
-		def = switch_xml_parse_str_dup(xml);
-
-		kz_xml_process(def);
-		kz_xml_process(cfg);
-
-		if ((child = switch_xml_child(cfg, "variables"))) {
-			for (param = switch_xml_child(child, "variable"); param; param = param->next) {
-				char *var = (char *) switch_xml_attr_soft(param, "name");
-				char *val = (char *) switch_xml_attr_soft(param, "value");
-				if(var && val) {
-					switch_core_set_variable(var, val);
-				}
-			}
-		} else if ((child = switch_xml_child(def, "variables"))) {
-			for (param = switch_xml_child(child, "variable"); param; param = param->next) {
-				char *var = (char *) switch_xml_attr_soft(param, "name");
-				char *val = (char *) switch_xml_attr_soft(param, "value");
-				if(var && val) {
-					switch_core_set_variable(var, val);
-				}
-			}
-		}
-
-		definitions = kazoo_config_definitions(cfg);
-		if(definitions == NULL) {
-			if(kazoo_globals.definitions == NULL) {
-				definitions = kazoo_config_definitions(def);
-			} else {
-				definitions = kazoo_globals.definitions;
-			}
-		}
-
-		fetch_handlers = kazoo_config_fetch_handlers(definitions, cfg);
-		if(fetch_handlers == NULL) {
-			if(kazoo_globals.fetch_handlers == NULL) {
-				fetch_handlers = kazoo_config_fetch_handlers(definitions, def);
-			} else {
-				fetch_handlers = kazoo_globals.fetch_handlers;
-			}
-		}
-
-		event_handlers = kazoo_config_event_handlers(definitions, cfg);
-		if(event_handlers == NULL) {
-			if(kazoo_globals.event_handlers == NULL) {
-				event_handlers = kazoo_config_event_handlers(definitions, def);
-			} else {
-				event_handlers = kazoo_globals.event_handlers;
-			}
-		}
-
-		if(event_handlers != NULL) {
-			events = (kazoo_event_profile_ptr) switch_core_hash_find(event_handlers->hash, "default");
-		}
-
-		if(events == NULL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get default handler for events\n");
-			destroy_config(&event_handlers);
-			event_handlers = kazoo_config_event_handlers(definitions, def);
-			events = (kazoo_event_profile_ptr) switch_core_hash_find(event_handlers->hash, "default");
-		}
-
-		if(kazoo_globals.events != events) {
-			bind_event_profiles(events->events);
-			kazoo_globals.events = events;
-		}
-
-		if(kazoo_globals.event_handlers != event_handlers) {
-			kazoo_config_ptr tmp = kazoo_globals.event_handlers;
-			kazoo_globals.event_handlers = event_handlers;
-			destroy_config(&tmp);
-		}
-
-		if(kazoo_globals.fetch_handlers != fetch_handlers) {
-			kazoo_config_ptr tmp = kazoo_globals.fetch_handlers;
-			kazoo_globals.fetch_handlers = fetch_handlers;
-			rebind_fetch_profiles(fetch_handlers);
-			destroy_config(&tmp);
-		}
-
-		if(kazoo_globals.definitions != definitions) {
-			kazoo_config_ptr tmp = kazoo_globals.definitions;
-			kazoo_globals.definitions = definitions;
-			destroy_config(&tmp);
-		}
-
-
-		switch_xml_free(def);
-		switch_safe_free(xml);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t kazoo_load_config()
-{
-	char *cf = "kazoo.conf";
-	switch_xml_t cfg, xml;
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open configuration file %s\n", cf);
-		return SWITCH_STATUS_FALSE;
-	} else {
-		kazoo_ei_config(cfg);
-		kazoo_config_handlers(cfg);
-		switch_xml_free(xml);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-void kazoo_destroy_config()
-{
-	destroy_config(&kazoo_globals.event_handlers);
-	destroy_config(&kazoo_globals.fetch_handlers);
-	destroy_config(&kazoo_globals.definitions);
-}
-
-switch_status_t kazoo_config_events(kazoo_config_ptr definitions, switch_memory_pool_t *pool, switch_xml_t cfg, kazoo_event_profile_ptr profile)
-{
-	switch_xml_t events, event;
-	kazoo_event_ptr prv = NULL, cur = NULL;
-
-
-	if ((events = switch_xml_child(cfg, "events")) != NULL) {
-		for (event = switch_xml_child(events, "event"); event; event = event->next) {
-			const char *var = switch_xml_attr(event, "name");
-			cur = (kazoo_event_ptr) switch_core_alloc(pool, sizeof(kazoo_event_t));
-			memset(cur, 0, sizeof(kazoo_event_t));
-			if(prv == NULL) {
-				profile->events = prv = cur;
-			} else {
-				prv->next = cur;
-				prv = cur;
-			}
-			cur->profile = profile;
-			cur->name = switch_core_strdup(pool, var);
-			kazoo_config_filters(pool, event, &cur->filter);
-			kazoo_config_fields(definitions, pool, event, &cur->fields);
-			if (switch_xml_child(event, "logging") != NULL) {
-				kazoo_config_loglevels(pool, event, &cur->logging);
-			}
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-
-switch_status_t kazoo_config_fetch_handler(kazoo_config_ptr definitions, kazoo_config_ptr root, switch_xml_t cfg, kazoo_fetch_profile_ptr *ptr)
-{
-	kazoo_fetch_profile_ptr profile = NULL;
-	switch_xml_t params, param;
-	switch_xml_section_t fetch_section;
-	int fetch_timeout = 2000000;
-	switch_memory_pool_t *pool = NULL;
-
-	char *name = (char *) switch_xml_attr_soft(cfg, "name");
-	if (zstr(name)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "missing name in profile\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error allocation pool for new profile : %s\n", name);
-		return SWITCH_STATUS_GENERR;
-	}
-
-	profile = switch_core_alloc(pool, sizeof(kazoo_fetch_profile_t));
-	profile->pool = pool;
-	profile->root = root;
-	profile->name = switch_core_strdup(profile->pool, name);
-
-	fetch_section = switch_xml_parse_section_string(name);
-
-	if ((params = switch_xml_child(cfg, "params")) != NULL) {
-		for (param = switch_xml_child(params, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!var) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Profile[%s] param missing 'name' attribute\n", name);
-				continue;
-			}
-
-			if (!val) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Profile[%s] param[%s] missing 'value' attribute\n", name, var);
-				continue;
-			}
-
-			if (!strncmp(var, "fetch-timeout", 13)) {
-				fetch_timeout = atoi(val);
-			} else if (!strncmp(var, "fetch-section", 13)) {
-				fetch_section = switch_xml_parse_section_string(val);
-			}
-		}
-	}
-
-	if (fetch_section == SWITCH_XML_SECTION_RESULT) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Fetch Profile[%s] invalid fetch-section: %s\n", name, switch_xml_toxml(cfg, SWITCH_FALSE));
-		goto err;
-	}
-
-
-	profile->fetch_timeout = fetch_timeout;
-	profile->section = fetch_section;
-	kazoo_config_fields(definitions, pool, cfg, &profile->fields);
-	kazoo_config_loglevels(pool, cfg, &profile->logging);
-
-	if(root) {
-		if ( switch_core_hash_insert(root->hash, name, (void *) profile) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to insert new fetch profile [%s] into kazoo profile hash\n", name);
-			goto err;
-		}
-	}
-
-	if(ptr)
-		*ptr = profile;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "fetch handler profile %s successfully configured\n", name);
-	return SWITCH_STATUS_SUCCESS;
-
- err:
-	/* Cleanup */
-    if(pool) {
-    	switch_core_destroy_memory_pool(&pool);
-    }
-	return SWITCH_STATUS_GENERR;
-
-}
-
-switch_status_t kazoo_config_event_handler(kazoo_config_ptr definitions, kazoo_config_ptr root, switch_xml_t cfg, kazoo_event_profile_ptr *ptr)
-{
-	kazoo_event_profile_ptr profile = NULL;
-	switch_memory_pool_t *pool = NULL;
-
-	char *name = (char *) switch_xml_attr_soft(cfg, "name");
-	if (zstr(name)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "missing name in profile\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error allocation pool for new profile : %s\n", name);
-		return SWITCH_STATUS_GENERR;
-	}
-
-	profile = switch_core_alloc(pool, sizeof(kazoo_event_profile_t));
-	profile->pool = pool;
-	profile->root = root;
-	profile->name = switch_core_strdup(profile->pool, name);
-
-	kazoo_config_filters(pool, cfg, &profile->filter);
-	kazoo_config_fields(definitions, pool, cfg, &profile->fields);
-	kazoo_config_events(definitions, pool, cfg, profile);
-	kazoo_config_loglevels(pool, cfg, &profile->logging);
-
-	if(root) {
-		if ( switch_core_hash_insert(root->hash, name, (void *) profile) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to insert new profile [%s] into kazoo profile hash\n", name);
-			goto err;
-		}
-	}
-
-	if(ptr)
-		*ptr = profile;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "event handler profile %s successfully configured\n", name);
-	return SWITCH_STATUS_SUCCESS;
-
- err:
-	/* Cleanup */
-    if(pool) {
-    	switch_core_destroy_memory_pool(&pool);
-    }
-	return SWITCH_STATUS_GENERR;
-
-}
-
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_ei_utils.c b/src/mod/event_handlers/mod_kazoo/kazoo_ei_utils.c
deleted file mode 100644
index ef45af0ea3..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_ei_utils.c
+++ /dev/null
@@ -1,1089 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- * Andrew Thompson <andrew@hijacked.us>
- * Rob Charlton <rob.charlton@savageminds.com>
- * Karl Anderson <karl@2600hz.com>
- *
- * Original from mod_erlang_event.
- * ei_helpers.c -- helper functions for ei
- *
- */
-#include "mod_kazoo.h"
-
-/* Stolen from code added to ei in R12B-5.
- * Since not everyone has this version yet;
- * provide our own version.
- * */
-
-#define put8(s,n) do {							\
-        (s)[0] = (char)((n) & 0xff);			\
-        (s) += 1;								\
-	} while (0)
-
-#define put32be(s,n) do {						\
-        (s)[0] = ((n) >>  24) & 0xff;			\
-        (s)[1] = ((n) >>  16) & 0xff;			\
-        (s)[2] = ((n) >>  8) & 0xff;			\
-        (s)[3] = (n) & 0xff;					\
-        (s) += 4;								\
-	} while (0)
-
-#ifdef EI_DEBUG
-static void ei_x_print_reg_msg(ei_x_buff *buf, char *dest, int send) {
-	char *mbuf = NULL;
-	int i = 1;
-
-	ei_s_print_term(&mbuf, buf->buff, &i);
-
-	if (send) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoded term %s to '%s'\n", mbuf, dest);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoded term %s for '%s'\n", mbuf, dest);
-	}
-
-	free(mbuf);
-}
-
-static void ei_x_print_msg(ei_x_buff *buf, erlang_pid *pid, int send) {
-	char *pbuf = NULL;
-	int i = 0;
-	ei_x_buff pidbuf;
-
-	ei_x_new(&pidbuf);
-	ei_x_encode_pid(&pidbuf, pid);
-
-	ei_s_print_term(&pbuf, pidbuf.buff, &i);
-
-	ei_x_print_reg_msg(buf, pbuf, send);
-	free(pbuf);
-}
-#endif
-
-void ei_encode_switch_event_headers(ei_x_buff *ebuf, switch_event_t *event)
-{
-	ei_encode_switch_event_headers_2(ebuf, event, 1);
-}
-
-void ei_encode_switch_event_headers_2(ei_x_buff *ebuf, switch_event_t *event, int encode)
-{
-	switch_event_header_t *hp;
-	char *uuid = switch_event_get_header(event, "unique-id");
-	int i;
-
-	for (i = 0, hp = event->headers; hp; hp = hp->next, i++)
-		;
-
-	if (event->body)
-		i++;
-
-	ei_x_encode_list_header(ebuf, i + 1);
-
-	if (uuid) {
-		char *unique_id = switch_event_get_header(event, "unique-id");
-		ei_x_encode_binary(ebuf, unique_id, strlen(unique_id));
-	} else {
-		ei_x_encode_atom(ebuf, "undefined");
-	}
-
-	for (hp = event->headers; hp; hp = hp->next) {
-		ei_x_encode_tuple_header(ebuf, 2);
-		ei_x_encode_binary(ebuf, hp->name, strlen(hp->name));
-		if (encode) {
-			switch_url_decode(hp->value);
-		}
-		ei_x_encode_binary(ebuf, hp->value, strlen(hp->value));
-	}
-
-	if (event->body) {
-		ei_x_encode_tuple_header(ebuf, 2);
-		ei_x_encode_binary(ebuf, "body", strlen("body"));
-		ei_x_encode_binary(ebuf, event->body, strlen(event->body));
-	}
-
-	ei_x_encode_empty_list(ebuf);
-}
-
-int ei_json_child_count(cJSON *JObj)
-{
-	int mask = cJSON_False | cJSON_True | cJSON_NULL | cJSON_Number | cJSON_String | cJSON_Array | cJSON_Object | cJSON_Raw;
-
-	cJSON *item = JObj->child;
-	int i = 0;
-	while (item) {
-		if (item->type & mask)
-			i++;
-		item = item->next;
-	}
-	return i;
-
-}
-
-void ei_encode_json_array(ei_x_buff *ebuf, cJSON *JObj)
-{
-	cJSON *item;
-	int count = ei_json_child_count(JObj);
-
-	ei_x_encode_list_header(ebuf, count);
-	if (count == 0)
-		return;
-
-	item = JObj->child;
-	while (item) {
-		switch (item->type){
-		case cJSON_String:
-			ei_x_encode_binary(ebuf, item->valuestring, strlen(item->valuestring));
-			break;
-
-		case cJSON_Number:
-			if ((fabs(((double) item->valueint) - item->valuedouble) <= DBL_EPSILON) && (item->valuedouble <= INT_MAX) && (item->valuedouble >= INT_MIN)) {
-				ei_x_encode_longlong(ebuf, item->valueint);
-			} else {
-				if (fmod(item->valuedouble, 1) == 0) {
-					ei_x_encode_ulonglong(ebuf, item->valuedouble);
-				} else {
-					ei_x_encode_double(ebuf, item->valuedouble);
-				}
-			}
-			break;
-
-		case cJSON_True:
-			ei_x_encode_boolean(ebuf, 1);
-			break;
-
-		case cJSON_False:
-			ei_x_encode_boolean(ebuf, 0);
-			break;
-
-		case cJSON_Object:
-			ei_encode_json(ebuf, item);
-			break;
-
-		case cJSON_Array:
-			ei_encode_json_array(ebuf, item);
-			break;
-
-		case cJSON_Raw: {
-			cJSON *Decoded = cJSON_Parse(item->valuestring);
-			if (!Decoded) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR DECODING RAW JSON %s\n", item->valuestring);
-				ei_x_encode_tuple_header(ebuf, 0);
-			} else {
-				ei_encode_json(ebuf, Decoded);
-				cJSON_Delete(Decoded);
-			}
-			break;
-		}
-
-		case cJSON_NULL:
-			ei_x_encode_atom(ebuf, "null");
-			break;
-
-		default:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NOT ENCODED %i\n", item->type);
-			break;
-
-		}
-		item = item->next;
-	}
-
-	ei_x_encode_empty_list(ebuf);
-
-}
-
-void ei_encode_json(ei_x_buff *ebuf, cJSON *JObj)
-{
-	cJSON *item;
-	int count = ei_json_child_count(JObj);
-
-	if (kazoo_globals.json_encoding == ERLANG_TUPLE) {
-		ei_x_encode_tuple_header(ebuf, 1);
-		ei_x_encode_list_header(ebuf, count);
-	} else {
-		ei_x_encode_map_header(ebuf, count);
-	}
-
-	if (count == 0)
-		return;
-
-	item = JObj->child;
-	while (item) {
-		if (kazoo_globals.json_encoding == ERLANG_TUPLE) {
-			ei_x_encode_tuple_header(ebuf, 2);
-		}
-		ei_x_encode_binary(ebuf, item->string, strlen(item->string));
-
-		switch (item->type){
-		case cJSON_String:
-			ei_x_encode_binary(ebuf, item->valuestring, strlen(item->valuestring));
-			break;
-
-		case cJSON_Number:
-			if ((fabs(((double) item->valueint) - item->valuedouble) <= DBL_EPSILON) && (item->valuedouble <= INT_MAX) && (item->valuedouble >= INT_MIN)) {
-				ei_x_encode_longlong(ebuf, item->valueint);
-			} else {
-				if (fmod(item->valuedouble, 1) == 0) {
-					ei_x_encode_ulonglong(ebuf, item->valuedouble);
-				} else {
-					ei_x_encode_double(ebuf, item->valuedouble);
-				}
-			}
-			break;
-
-		case cJSON_True:
-			ei_x_encode_boolean(ebuf, 1);
-			break;
-
-		case cJSON_False:
-			ei_x_encode_boolean(ebuf, 0);
-			break;
-
-		case cJSON_Object:
-			ei_encode_json(ebuf, item);
-			break;
-
-		case cJSON_Array:
-			ei_encode_json_array(ebuf, item);
-			break;
-
-		case cJSON_Raw: {
-			cJSON *Decoded = cJSON_Parse(item->valuestring);
-			if (!Decoded) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR DECODING RAW JSON %s\n", item->valuestring);
-				ei_x_encode_tuple_header(ebuf, 0);
-			} else {
-				ei_encode_json(ebuf, Decoded);
-				cJSON_Delete(Decoded);
-			}
-			break;
-		}
-
-		case cJSON_NULL:
-			ei_x_encode_atom(ebuf, "null");
-			break;
-
-		default:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NOT ENCODED %i\n", item->type);
-			break;
-
-		}
-		item = item->next;
-	}
-
-	if (kazoo_globals.json_encoding == ERLANG_TUPLE) {
-		ei_x_encode_empty_list(ebuf);
-	}
-
-}
-
-void close_socket(switch_socket_t ** sock)
-{
-	if (*sock) {
-		switch_socket_shutdown(*sock, SWITCH_SHUTDOWN_READWRITE);
-		switch_socket_close(*sock);
-		*sock = NULL;
-	}
-}
-
-void close_socketfd(int *sockfd)
-{
-	if (*sockfd) {
-		shutdown(*sockfd, SHUT_RDWR);
-		close(*sockfd);
-	}
-}
-
-switch_socket_t *create_socket_with_port(switch_memory_pool_t *pool, switch_port_t port)
-{
-	switch_sockaddr_t *sa;
-	switch_socket_t *socket;
-
-	if (switch_sockaddr_info_get(&sa, kazoo_globals.ip, SWITCH_UNSPEC, port, 0, pool)) {
-		return NULL;
-	}
-
-	if (switch_socket_create(&socket, switch_sockaddr_get_family(sa), SOCK_STREAM, SWITCH_PROTO_TCP, pool)) {
-		return NULL;
-	}
-
-	if (switch_socket_opt_set(socket, SWITCH_SO_REUSEADDR, 1)) {
-		return NULL;
-	}
-
-	if (switch_socket_bind(socket, sa)) {
-		return NULL;
-	}
-
-	if (switch_socket_listen(socket, 5)) {
-		return NULL;
-	}
-
-	if (kazoo_globals.nat_map && switch_nat_get_type()) {
-		switch_nat_add_mapping(port, SWITCH_NAT_TCP, NULL, SWITCH_FALSE);
-	}
-
-	return socket;
-}
-
-switch_socket_t *create_socket(switch_memory_pool_t *pool)
-{
-	return create_socket_with_port(pool, 0);
-
-}
-
-switch_status_t create_ei_cnode(const char *ip_addr, const char *name, struct ei_cnode_s *ei_cnode)
-{
-	char hostname[EI_MAXHOSTNAMELEN + 1];
-	char nodename[MAXNODELEN + 1];
-	char cnodename[EI_MAXALIVELEN + 1];
-	char *atsign;
-
-	/* copy the erlang interface nodename into something we can modify */
-	strncpy(cnodename, name, EI_MAXALIVELEN);
-
-	if ((atsign = strchr(cnodename, '@'))) {
-		/* we got a qualified node name, don't guess the host/domain */
-		snprintf(nodename, MAXNODELEN + 1, "%s", name);
-		/* truncate the alivename at the @ */
-		*atsign++ = '\0';
-		strncpy(hostname, atsign, EI_MAXHOSTNAMELEN);
-	} else {
-		strncpy(hostname, kazoo_globals.hostname, EI_MAXHOSTNAMELEN);
-		snprintf(nodename, MAXNODELEN + 1, "%s@%s", name, hostname);
-	}
-
-	if (kazoo_globals.ei_shortname) {
-		char *off;
-		if ((off = strchr(nodename, '.'))) {
-			*off = '\0';
-		}
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "creating nodename: %s\n", nodename);
-
-	/* init the ec stuff */
-	if (ei_connect_xinit(ei_cnode, hostname, cnodename, nodename, (Erl_IpAddr) ip_addr, kazoo_globals.ei_cookie, 0) < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to initialize the erlang interface connection structure\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t ei_compare_pids(const erlang_pid *pid1, const erlang_pid *pid2)
-{
-	if ((!strcmp(pid1->node, pid2->node)) && pid1->creation == pid2->creation && pid1->num == pid2->num && pid1->serial == pid2->serial) {
-		return SWITCH_STATUS_SUCCESS;
-	} else {
-		return SWITCH_STATUS_FALSE;
-	}
-}
-
-void ei_link(ei_node_t *ei_node, erlang_pid * from, erlang_pid * to)
-{
-	char msgbuf[2048];
-	char *s;
-	int index = 0;
-
-	index = 5; /* max sizes: */
-	ei_encode_version(msgbuf, &index); /*   1 */
-	ei_encode_tuple_header(msgbuf, &index, 3);
-	ei_encode_long(msgbuf, &index, ERL_LINK);
-	ei_encode_pid(msgbuf, &index, from); /* 268 */
-	ei_encode_pid(msgbuf, &index, to); /* 268 */
-
-	/* 5 byte header missing */
-	s = msgbuf;
-	put32be(s, index - 4); /*   4 */
-	put8(s, ERL_PASS_THROUGH); /*   1 */
-	/* sum:  542 */
-
-	if (write(ei_node->nodefd, msgbuf, index) == -1) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to link to process on %s\n", ei_node->peer_nodename);
-	}
-}
-
-void ei_encode_switch_event(ei_x_buff *ebuf, switch_event_t *event)
-{
-	ei_x_encode_tuple_header(ebuf, 2);
-	ei_x_encode_atom(ebuf, "event");
-	ei_encode_switch_event_headers(ebuf, event);
-}
-
-int ei_helper_send(ei_node_t *ei_node, erlang_pid *to, ei_x_buff *buf)
-{
-	int ret = 0;
-
-	if (ei_node->nodefd) {
-#ifdef EI_DEBUG
-		ei_x_print_msg(buf, to, 1);
-#endif
-		ret = ei_send(ei_node->nodefd, to, buf->buff, buf->index);
-	}
-
-	return ret;
-}
-
-int ei_decode_atom_safe(char *buf, int *index, char *dst)
-{
-	int type, size;
-
-	ei_get_type(buf, index, &type, &size);
-
-	if (type != ERL_ATOM_EXT) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unexpected erlang term type %d (size %d), needed atom\n", type, size);
-		return -1;
-	} else if (size > MAXATOMLEN) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested decoding of atom with size %d into a buffer of size %d\n", size, MAXATOMLEN);
-		return -1;
-	} else {
-		return ei_decode_atom(buf, index, dst);
-	}
-}
-
-int ei_decode_string_or_binary(char *buf, int *index, char **dst)
-{
-	int type, size, res;
-	long len;
-
-	ei_get_type(buf, index, &type, &size);
-
-	if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT && type != ERL_LIST_EXT && type != ERL_NIL_EXT) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unexpected erlang term type %d (size %d), needed binary or string\n", type, size);
-		return -1;
-	}
-
-	*dst = malloc(size + 1);
-
-	if (type == ERL_NIL_EXT) {
-		res = 0;
-		**dst = '\0';
-	} else if (type == ERL_BINARY_EXT) {
-		res = ei_decode_binary(buf, index, *dst, &len);
-		(*dst)[len] = '\0';
-	} else {
-		res = ei_decode_string(buf, index, *dst);
-	}
-
-	return res;
-}
-
-int ei_decode_string_or_binary_limited(char *buf, int *index, int maxsize, char *dst)
-{
-	int type, size, res;
-	long len;
-
-	ei_get_type(buf, index, &type, &size);
-
-	if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT && type != ERL_LIST_EXT && type != ERL_NIL_EXT) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unexpected erlang term type %d (size %d), needed binary or string\n", type, size);
-		return -1;
-	}
-
-	if (size > maxsize) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested decoding of %s with size %d into a buffer of size %d\n",
-		                  type == ERL_BINARY_EXT ? "binary" : "string", size, maxsize);
-		return -1;
-	}
-
-	if (type == ERL_NIL_EXT) {
-		res = 0;
-		*dst = '\0';
-	} else if (type == ERL_BINARY_EXT) {
-		res = ei_decode_binary(buf, index, dst, &len);
-		dst[len] = '\0'; /* binaries aren't null terminated */
-	} else {
-		res = ei_decode_string(buf, index, dst);
-	}
-
-	return res;
-}
-
-switch_status_t create_acceptor()
-{
-	switch_sockaddr_t *sa;
-	uint16_t port;
-	char ipbuf[48];
-	const char *ip_addr;
-
-	/* if the config has specified an erlang release compatibility then pass that along to the erlang interface */
-	if (kazoo_globals.ei_compat_rel) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Compatability with OTP R%d requested\n", kazoo_globals.ei_compat_rel);
-		ei_set_compat_rel(kazoo_globals.ei_compat_rel);
-	}
-
-	if (!(kazoo_globals.acceptor = create_socket_with_port(kazoo_globals.pool, kazoo_globals.port))) {
-		return SWITCH_STATUS_SOCKERR;
-	}
-
-	switch_socket_addr_get(&sa, SWITCH_FALSE, kazoo_globals.acceptor);
-
-	port = switch_sockaddr_get_port(sa);
-	ip_addr = switch_get_addr(ipbuf, sizeof(ipbuf), sa);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Erlang connection acceptor listening on %s:%u\n", ip_addr, port);
-
-	/* try to initialize the erlang interface */
-	if (create_ei_cnode(ip_addr, kazoo_globals.ei_nodename, &kazoo_globals.ei_cnode) != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_SOCKERR;
-	}
-
-	/* tell the erlang port manager where we can be reached.  this returns a file descriptor pointing to epmd or -1 */
-	if ((kazoo_globals.epmdfd = ei_publish(&kazoo_globals.ei_cnode, port)) == -1) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to publish port to epmd, trying to start epmd via system()\n");
-		if (system("fs_epmd -daemon")) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-			                  "Failed to start epmd manually! Is epmd in $PATH? If not, start it yourself or run an erl shell with -sname or -name\n");
-			return SWITCH_STATUS_SOCKERR;
-		}
-		switch_yield(100000);
-		if ((kazoo_globals.epmdfd = ei_publish(&kazoo_globals.ei_cnode, port)) == -1) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to publish port to epmd AGAIN\n");
-			return SWITCH_STATUS_SOCKERR;
-		}
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to epmd and published erlang cnode name %s at port %d\n", kazoo_globals.ei_cnode.thisnodename,
-	                  port);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_hash_t *create_default_filter()
-{
-	switch_hash_t *filter;
-
-	switch_core_hash_init(&filter);
-
-	switch_core_hash_insert(filter, "Acquired-UUID", "1");
-	switch_core_hash_insert(filter, "action", "1");
-	switch_core_hash_insert(filter, "Action", "1");
-	switch_core_hash_insert(filter, "alt_event_type", "1");
-	switch_core_hash_insert(filter, "Answer-State", "1");
-	switch_core_hash_insert(filter, "Application", "1");
-	switch_core_hash_insert(filter, "Application-Data", "1");
-	switch_core_hash_insert(filter, "Application-Name", "1");
-	switch_core_hash_insert(filter, "Application-Response", "1");
-	switch_core_hash_insert(filter, "att_xfer_replaced_by", "1");
-	switch_core_hash_insert(filter, "Auth-Method", "1");
-	switch_core_hash_insert(filter, "Auth-Realm", "1");
-	switch_core_hash_insert(filter, "Auth-User", "1");
-	switch_core_hash_insert(filter, "Bridge-A-Unique-ID", "1");
-	switch_core_hash_insert(filter, "Bridge-B-Unique-ID", "1");
-	switch_core_hash_insert(filter, "Call-Direction", "1");
-	switch_core_hash_insert(filter, "Caller-Callee-ID-Name", "1");
-	switch_core_hash_insert(filter, "Caller-Callee-ID-Number", "1");
-	switch_core_hash_insert(filter, "Caller-Caller-ID-Name", "1");
-	switch_core_hash_insert(filter, "Caller-Caller-ID-Number", "1");
-	switch_core_hash_insert(filter, "Caller-Screen-Bit", "1");
-	switch_core_hash_insert(filter, "Caller-Privacy-Hide-Name", "1");
-	switch_core_hash_insert(filter, "Caller-Privacy-Hide-Number", "1");
-	switch_core_hash_insert(filter, "Caller-Context", "1");
-	switch_core_hash_insert(filter, "Caller-Controls", "1");
-	switch_core_hash_insert(filter, "Caller-Destination-Number", "1");
-	switch_core_hash_insert(filter, "Caller-Dialplan", "1");
-	switch_core_hash_insert(filter, "Caller-Network-Addr", "1");
-	switch_core_hash_insert(filter, "Caller-Unique-ID", "1");
-	switch_core_hash_insert(filter, "Call-ID", "1");
-	switch_core_hash_insert(filter, "Channel-Call-State", "1");
-	switch_core_hash_insert(filter, "Channel-Call-UUID", "1");
-	switch_core_hash_insert(filter, "Channel-Presence-ID", "1");
-	switch_core_hash_insert(filter, "Channel-State", "1");
-	switch_core_hash_insert(filter, "Chat-Permissions", "1");
-	switch_core_hash_insert(filter, "Conference-Name", "1");
-	switch_core_hash_insert(filter, "Conference-Profile-Name", "1");
-	switch_core_hash_insert(filter, "Conference-Unique-ID", "1");
-	switch_core_hash_insert(filter, "contact", "1");
-	switch_core_hash_insert(filter, "Detected-Tone", "1");
-	switch_core_hash_insert(filter, "dialog_state", "1");
-	switch_core_hash_insert(filter, "direction", "1");
-	switch_core_hash_insert(filter, "Distributed-From", "1");
-	switch_core_hash_insert(filter, "DTMF-Digit", "1");
-	switch_core_hash_insert(filter, "DTMF-Duration", "1");
-	switch_core_hash_insert(filter, "Event-Date-Timestamp", "1");
-	switch_core_hash_insert(filter, "Event-Name", "1");
-	switch_core_hash_insert(filter, "Event-Subclass", "1");
-	switch_core_hash_insert(filter, "expires", "1");
-	switch_core_hash_insert(filter, "Expires", "1");
-	switch_core_hash_insert(filter, "Ext-SIP-IP", "1");
-	switch_core_hash_insert(filter, "File", "1");
-	switch_core_hash_insert(filter, "FreeSWITCH-Hostname", "1");
-	switch_core_hash_insert(filter, "from", "1");
-	switch_core_hash_insert(filter, "Hunt-Destination-Number", "1");
-	switch_core_hash_insert(filter, "ip", "1");
-	switch_core_hash_insert(filter, "Message-Account", "1");
-	switch_core_hash_insert(filter, "metadata", "1");
-	switch_core_hash_insert(filter, "old_node_channel_uuid", "1");
-	switch_core_hash_insert(filter, "Other-Leg-Callee-ID-Name", "1");
-	switch_core_hash_insert(filter, "Other-Leg-Callee-ID-Number", "1");
-	switch_core_hash_insert(filter, "Other-Leg-Caller-ID-Name", "1");
-	switch_core_hash_insert(filter, "Other-Leg-Caller-ID-Number", "1");
-	switch_core_hash_insert(filter, "Other-Leg-Destination-Number", "1");
-	switch_core_hash_insert(filter, "Other-Leg-Direction", "1");
-	switch_core_hash_insert(filter, "Other-Leg-Unique-ID", "1");
-	switch_core_hash_insert(filter, "Other-Leg-Channel-Name", "1");
-	switch_core_hash_insert(filter, "Participant-Type", "1");
-	switch_core_hash_insert(filter, "Path", "1");
-	switch_core_hash_insert(filter, "profile_name", "1");
-	switch_core_hash_insert(filter, "Profiles", "1");
-	switch_core_hash_insert(filter, "proto-specific-event-name", "1");
-	switch_core_hash_insert(filter, "Raw-Application-Data", "1");
-	switch_core_hash_insert(filter, "realm", "1");
-	switch_core_hash_insert(filter, "Resigning-UUID", "1");
-	switch_core_hash_insert(filter, "set", "1");
-	switch_core_hash_insert(filter, "sip_auto_answer", "1");
-	switch_core_hash_insert(filter, "sip_auth_method", "1");
-	switch_core_hash_insert(filter, "sip_from_host", "1");
-	switch_core_hash_insert(filter, "sip_from_user", "1");
-	switch_core_hash_insert(filter, "sip_to_host", "1");
-	switch_core_hash_insert(filter, "sip_to_user", "1");
-	switch_core_hash_insert(filter, "sub-call-id", "1");
-	switch_core_hash_insert(filter, "technology", "1");
-	switch_core_hash_insert(filter, "to", "1");
-	switch_core_hash_insert(filter, "Unique-ID", "1");
-	switch_core_hash_insert(filter, "URL", "1");
-	switch_core_hash_insert(filter, "username", "1");
-	switch_core_hash_insert(filter, "variable_channel_is_moving", "1");
-	switch_core_hash_insert(filter, "variable_collected_digits", "1");
-	switch_core_hash_insert(filter, "variable_current_application", "1");
-	switch_core_hash_insert(filter, "variable_current_application_data", "1");
-	switch_core_hash_insert(filter, "variable_domain_name", "1");
-	switch_core_hash_insert(filter, "variable_effective_caller_id_name", "1");
-	switch_core_hash_insert(filter, "variable_effective_caller_id_number", "1");
-	switch_core_hash_insert(filter, "variable_holding_uuid", "1");
-	switch_core_hash_insert(filter, "variable_hold_music", "1");
-	switch_core_hash_insert(filter, "variable_media_group_id", "1");
-	switch_core_hash_insert(filter, "variable_originate_disposition", "1");
-	switch_core_hash_insert(filter, "variable_origination_uuid", "1");
-	switch_core_hash_insert(filter, "variable_playback_terminator_used", "1");
-	switch_core_hash_insert(filter, "variable_presence_id", "1");
-	switch_core_hash_insert(filter, "variable_record_ms", "1");
-	switch_core_hash_insert(filter, "variable_recovered", "1");
-	switch_core_hash_insert(filter, "variable_silence_hits_exhausted", "1");
-	switch_core_hash_insert(filter, "variable_sip_auth_realm", "1");
-	switch_core_hash_insert(filter, "variable_sip_from_host", "1");
-	switch_core_hash_insert(filter, "variable_sip_from_user", "1");
-	switch_core_hash_insert(filter, "variable_sip_from_tag", "1");
-	switch_core_hash_insert(filter, "variable_sip_h_X-AUTH-IP", "1");
-	switch_core_hash_insert(filter, "variable_sip_received_ip", "1");
-	switch_core_hash_insert(filter, "variable_sip_to_host", "1");
-	switch_core_hash_insert(filter, "variable_sip_to_user", "1");
-	switch_core_hash_insert(filter, "variable_sip_to_tag", "1");
-	switch_core_hash_insert(filter, "variable_sofia_profile_name", "1");
-	switch_core_hash_insert(filter, "variable_transfer_history", "1");
-	switch_core_hash_insert(filter, "variable_user_name", "1");
-	switch_core_hash_insert(filter, "variable_endpoint_disposition", "1");
-	switch_core_hash_insert(filter, "variable_originate_disposition", "1");
-	switch_core_hash_insert(filter, "variable_bridge_hangup_cause", "1");
-	switch_core_hash_insert(filter, "variable_hangup_cause", "1");
-	switch_core_hash_insert(filter, "variable_last_bridge_proto_specific_hangup_cause", "1");
-	switch_core_hash_insert(filter, "variable_proto_specific_hangup_cause", "1");
-	switch_core_hash_insert(filter, "VM-Call-ID", "1");
-	switch_core_hash_insert(filter, "VM-sub-call-id", "1");
-	switch_core_hash_insert(filter, "whistle_application_name", "1");
-	switch_core_hash_insert(filter, "whistle_application_response", "1");
-	switch_core_hash_insert(filter, "whistle_event_name", "1");
-	switch_core_hash_insert(filter, "kazoo_application_name", "1");
-	switch_core_hash_insert(filter, "kazoo_application_response", "1");
-	switch_core_hash_insert(filter, "kazoo_event_name", "1");
-	switch_core_hash_insert(filter, "sip_auto_answer_notify", "1");
-	switch_core_hash_insert(filter, "eavesdrop_group", "1");
-	switch_core_hash_insert(filter, "origination_caller_id_name", "1");
-	switch_core_hash_insert(filter, "origination_caller_id_number", "1");
-	switch_core_hash_insert(filter, "origination_callee_id_name", "1");
-	switch_core_hash_insert(filter, "origination_callee_id_number", "1");
-	switch_core_hash_insert(filter, "sip_auth_username", "1");
-	switch_core_hash_insert(filter, "sip_auth_password", "1");
-	switch_core_hash_insert(filter, "effective_caller_id_name", "1");
-	switch_core_hash_insert(filter, "effective_caller_id_number", "1");
-	switch_core_hash_insert(filter, "effective_callee_id_name", "1");
-	switch_core_hash_insert(filter, "effective_callee_id_number", "1");
-	switch_core_hash_insert(filter, "variable_destination_number", "1");
-	switch_core_hash_insert(filter, "variable_effective_callee_id_name", "1");
-	switch_core_hash_insert(filter, "variable_effective_callee_id_number", "1");
-	switch_core_hash_insert(filter, "variable_record_silence_hits", "1");
-	switch_core_hash_insert(filter, "variable_refer_uuid", "1");
-	switch_core_hash_insert(filter, "variable_sip_call_id", "1");
-	switch_core_hash_insert(filter, "variable_sip_h_Referred-By", "1");
-	switch_core_hash_insert(filter, "variable_sip_h_X-AUTH-PORT", "1");
-	switch_core_hash_insert(filter, "variable_sip_loopback_req_uri", "1");
-	switch_core_hash_insert(filter, "variable_sip_received_port", "1");
-	switch_core_hash_insert(filter, "variable_sip_refer_to", "1");
-	switch_core_hash_insert(filter, "variable_sip_req_host", "1");
-	switch_core_hash_insert(filter, "variable_sip_req_uri", "1");
-	switch_core_hash_insert(filter, "variable_transfer_source", "1");
-	switch_core_hash_insert(filter, "variable_uuid", "1");
-
-	/* Registration headers */
-	switch_core_hash_insert(filter, "call-id", "1");
-	switch_core_hash_insert(filter, "profile-name", "1");
-	switch_core_hash_insert(filter, "from-user", "1");
-	switch_core_hash_insert(filter, "from-host", "1");
-	switch_core_hash_insert(filter, "presence-hosts", "1");
-	switch_core_hash_insert(filter, "contact", "1");
-	switch_core_hash_insert(filter, "rpid", "1");
-	switch_core_hash_insert(filter, "status", "1");
-	switch_core_hash_insert(filter, "expires", "1");
-	switch_core_hash_insert(filter, "to-user", "1");
-	switch_core_hash_insert(filter, "to-host", "1");
-	switch_core_hash_insert(filter, "network-ip", "1");
-	switch_core_hash_insert(filter, "network-port", "1");
-	switch_core_hash_insert(filter, "username", "1");
-	switch_core_hash_insert(filter, "realm", "1");
-	switch_core_hash_insert(filter, "user-agent", "1");
-
-	switch_core_hash_insert(filter, "Hangup-Cause", "1");
-	switch_core_hash_insert(filter, "Unique-ID", "1");
-	switch_core_hash_insert(filter, "variable_switch_r_sdp", "1");
-	switch_core_hash_insert(filter, "variable_rtp_local_sdp_str", "1");
-	switch_core_hash_insert(filter, "variable_sip_to_uri", "1");
-	switch_core_hash_insert(filter, "variable_sip_from_uri", "1");
-	switch_core_hash_insert(filter, "variable_sip_user_agent", "1");
-	switch_core_hash_insert(filter, "variable_duration", "1");
-	switch_core_hash_insert(filter, "variable_billsec", "1");
-	switch_core_hash_insert(filter, "variable_billmsec", "1");
-	switch_core_hash_insert(filter, "variable_progresssec", "1");
-	switch_core_hash_insert(filter, "variable_progress_uepoch", "1");
-	switch_core_hash_insert(filter, "variable_progress_media_uepoch", "1");
-	switch_core_hash_insert(filter, "variable_start_uepoch", "1");
-	switch_core_hash_insert(filter, "variable_digits_dialed", "1");
-	switch_core_hash_insert(filter, "Member-ID", "1");
-	switch_core_hash_insert(filter, "Floor", "1");
-	switch_core_hash_insert(filter, "Video", "1");
-	switch_core_hash_insert(filter, "Hear", "1");
-	switch_core_hash_insert(filter, "Speak", "1");
-	switch_core_hash_insert(filter, "Talking", "1");
-	switch_core_hash_insert(filter, "Current-Energy", "1");
-	switch_core_hash_insert(filter, "Energy-Level", "1");
-	switch_core_hash_insert(filter, "Mute-Detect", "1");
-
-	/* RTMP headers */
-	switch_core_hash_insert(filter, "RTMP-Session-ID", "1");
-	switch_core_hash_insert(filter, "RTMP-Profile", "1");
-	switch_core_hash_insert(filter, "RTMP-Flash-Version", "1");
-	switch_core_hash_insert(filter, "RTMP-SWF-URL", "1");
-	switch_core_hash_insert(filter, "RTMP-TC-URL", "1");
-	switch_core_hash_insert(filter, "RTMP-Page-URL", "1");
-	switch_core_hash_insert(filter, "User", "1");
-	switch_core_hash_insert(filter, "Domain", "1");
-
-	/* Fax headers */
-	switch_core_hash_insert(filter, "variable_fax_bad_rows", "1");
-	switch_core_hash_insert(filter, "variable_fax_document_total_pages", "1");
-	switch_core_hash_insert(filter, "variable_fax_document_transferred_pages", "1");
-	switch_core_hash_insert(filter, "variable_fax_ecm_used", "1");
-	switch_core_hash_insert(filter, "variable_fax_result_code", "1");
-	switch_core_hash_insert(filter, "variable_fax_result_text", "1");
-	switch_core_hash_insert(filter, "variable_fax_success", "1");
-	switch_core_hash_insert(filter, "variable_fax_transfer_rate", "1");
-	switch_core_hash_insert(filter, "variable_fax_local_station_id", "1");
-	switch_core_hash_insert(filter, "variable_fax_remote_station_id", "1");
-	switch_core_hash_insert(filter, "variable_fax_remote_country", "1");
-	switch_core_hash_insert(filter, "variable_fax_remote_vendor", "1");
-	switch_core_hash_insert(filter, "variable_fax_remote_model", "1");
-	switch_core_hash_insert(filter, "variable_fax_image_resolution", "1");
-	switch_core_hash_insert(filter, "variable_fax_file_image_resolution", "1");
-	switch_core_hash_insert(filter, "variable_fax_image_size", "1");
-	switch_core_hash_insert(filter, "variable_fax_image_pixel_size", "1");
-	switch_core_hash_insert(filter, "variable_fax_file_image_pixel_size", "1");
-	switch_core_hash_insert(filter, "variable_fax_longest_bad_row_run", "1");
-	switch_core_hash_insert(filter, "variable_fax_encoding", "1");
-	switch_core_hash_insert(filter, "variable_fax_encoding_name", "1");
-	switch_core_hash_insert(filter, "variable_fax_header", "1");
-	switch_core_hash_insert(filter, "variable_fax_ident", "1");
-	switch_core_hash_insert(filter, "variable_fax_timezone", "1");
-	switch_core_hash_insert(filter, "variable_fax_doc_id", "1");
-	switch_core_hash_insert(filter, "variable_fax_doc_database", "1");
-	switch_core_hash_insert(filter, "variable_has_t38", "1");
-
-	/* Secure headers */
-	switch_core_hash_insert(filter, "variable_sdp_secure_savp_only", "1");
-	switch_core_hash_insert(filter, "variable_rtp_has_crypto", "1");
-	switch_core_hash_insert(filter, "variable_rtp_secure_media", "1");
-	switch_core_hash_insert(filter, "variable_rtp_secure_media_confirmed", "1");
-	switch_core_hash_insert(filter, "variable_rtp_secure_media_confirmed_audio", "1");
-	switch_core_hash_insert(filter, "variable_rtp_secure_media_confirmed_video", "1");
-	switch_core_hash_insert(filter, "sdp_secure_savp_only", "1");
-	switch_core_hash_insert(filter, "rtp_has_crypto", "1");
-	switch_core_hash_insert(filter, "rtp_secure_media", "1");
-	switch_core_hash_insert(filter, "rtp_secure_media_confirmed", "1");
-	switch_core_hash_insert(filter, "rtp_secure_media_confirmed_audio", "1");
-	switch_core_hash_insert(filter, "rtp_secure_media_confirmed_video", "1");
-
-	/* Device Redirect headers */
-	switch_core_hash_insert(filter, "variable_last_bridge_hangup_cause", "1");
-	switch_core_hash_insert(filter, "variable_sip_redirected_by", "1");
-	switch_core_hash_insert(filter, "intercepted_by", "1");
-	switch_core_hash_insert(filter, "variable_bridge_uuid", "1");
-	switch_core_hash_insert(filter, "Record-File-Path", "1");
-
-	/* Loopback headers */
-	switch_core_hash_insert(filter, "variable_loopback_bowout_on_execute", "1");
-	switch_core_hash_insert(filter, "variable_loopback_bowout", "1");
-	switch_core_hash_insert(filter, "variable_other_loopback_leg_uuid", "1");
-	switch_core_hash_insert(filter, "variable_loopback_leg", "1");
-	switch_core_hash_insert(filter, "variable_is_loopback", "1");
-
-	// SMS
-	switch_core_hash_insert(filter, "Message-ID", "1");
-	switch_core_hash_insert(filter, "Delivery-Failure", "1");
-	switch_core_hash_insert(filter, "Delivery-Result-Code", "1");
-
-	return filter;
-}
-
-static void fetch_config_filters(switch_memory_pool_t *pool)
-{
-	char *cf = "kazoo.conf";
-	switch_xml_t cfg, xml, child, param;
-	switch_event_t *params;
-
-	switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
-	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Action", "request-filter");
-
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, params))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open configuration file %s\n", cf);
-	} else {
-		if ((child = switch_xml_child(cfg, "event-filter"))) {
-			switch_hash_t *filter;
-			switch_hash_t *old_filter;
-
-			switch_core_hash_init(&filter);
-			for (param = switch_xml_child(child, "header"); param; param = param->next) {
-				char *var = (char *) switch_xml_attr_soft(param, "name");
-				switch_core_hash_insert(filter, var, "1");
-			}
-
-			old_filter = kazoo_globals.event_filter;
-			kazoo_globals.event_filter = filter;
-			if (old_filter) {
-				switch_core_hash_destroy(&old_filter);
-			}
-		}
-
-		kazoo_globals.config_fetched = 1;
-		switch_xml_free(xml);
-	}
-	switch_event_destroy(&params);
-
-}
-
-static void fetch_config_handlers(switch_memory_pool_t *pool)
-{
-	char *cf = "kazoo.conf";
-	switch_xml_t cfg, xml;
-	switch_event_t *params;
-
-	switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
-	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Action", "request-handlers");
-
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, params))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open configuration file %s\n", cf);
-	} else {
-		kazoo_config_handlers(cfg);
-		kazoo_globals.config_fetched = 1;
-		switch_xml_free(xml);
-	}
-	switch_event_destroy(&params);
-
-}
-
-static void *SWITCH_THREAD_FUNC fetch_config_exec(switch_thread_t *thread, void *obj)
-{
-	switch_memory_pool_t *pool = (switch_memory_pool_t *) obj;
-	ei_node_t *node;
-	int fetch_filters = 0, fetch_handlers = 0;
-
-	// give some time for node initialization
-	switch_sleep(kazoo_globals.delay_before_initial_fetch);
-
-	for (node = kazoo_globals.ei_nodes; node != NULL; node = node->next) {
-		if (node->legacy ) {
-			fetch_filters++;
-		} else {
-			fetch_handlers++;
-		}
-	}
-
-	if (fetch_filters) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "fetching filters for kazoo\n");
-		fetch_config_filters(pool);
-	}
-
-	if (fetch_handlers) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "fetching kazoo handlers\n");
-		fetch_config_handlers(pool);
-	}
-
-	kazoo_globals.config_fetched = 1;
-
-	return NULL;
-}
-
-void fetch_config()
-{
-	switch_memory_pool_t *pool;
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	switch_uuid_t uuid;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "scheduling fetch for kazoo config\n");
-
-	switch_core_new_memory_pool(&pool);
-
-	switch_threadattr_create(&thd_attr, pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-
-	switch_uuid_get(&uuid);
-	switch_thread_create(&thread, thd_attr, fetch_config_exec, pool, pool);
-
-}
-
-#ifdef WITH_KAZOO_ERL_SHUTDOWN
-#if (ERLANG_MAJOR == 10 && ERLANG_MINOR >= 3) || ERLANG_MAJOR >= 11
-typedef struct ei_mutex_s {
-#ifdef __WIN32__
-	HANDLE lock;
-#elif VXWORKS
-	SEM_ID lock;
-#else /* unix */
-#if defined(HAVE_MIT_PTHREAD_H) || defined(HAVE_PTHREAD_H)
-	pthread_mutex_t *lock;
-#else /* ! (HAVE_MIT_PTHREAD_H || HAVE_PTHREAD_H) */
-	void *dummy; /* Actually never used */
-#endif /* ! (HAVE_MIT_PTHREAD_H || HAVE_PTHREAD_H) */
-#endif /* unix */
-}ei_mutex_t;
-
-typedef struct ei_socket_info_s {
-	int socket;
-	ei_socket_callbacks *cbs;
-	void *ctx;
-	int dist_version;
-	ei_cnode cnode; /* A copy, not a pointer. We don't know when freed */
-	char cookie[EI_MAX_COOKIE_SIZE+1];
-}ei_socket_info;
-
-extern ei_socket_info *ei_sockets;
-extern ei_mutex_t* ei_sockets_lock;
-extern int ei_n_sockets;
-extern int ei_sz_sockets;
-
-int ei_mutex_free(ei_mutex_t *l, int nblock);
-
-#endif
-#endif
-
-void kz_erl_init()
-{
-#if (ERLANG_MAJOR == 10 && ERLANG_MINOR >= 3) || ERLANG_MAJOR >= 11
-	ei_init();
-#endif
-}
-
-void kz_erl_shutdown()
-{
-#ifdef WITH_KAZOO_ERL_SHUTDOWN
-#if (ERLANG_MAJOR == 10 && ERLANG_MINOR >= 3) || ERLANG_MAJOR >= 11
-	ei_mutex_free(ei_sockets_lock, 1);
-	ei_sockets_lock = NULL;
-	free(ei_sockets);
-	ei_sockets = NULL;
-	ei_n_sockets = ei_sz_sockets = 0;
-#endif
-#endif
-}
-
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_kazoo_runtime)
-{
-	switch_os_socket_t os_socket;
-
-	if (create_acceptor() != SWITCH_STATUS_SUCCESS) {
-		// TODO: what would we need to clean up here
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to create erlang connection acceptor!\n");
-		close_socket(&kazoo_globals.acceptor);
-		return SWITCH_STATUS_TERM;
-	}
-
-	switch_atomic_inc(&kazoo_globals.threads);
-	switch_os_sock_get(&os_socket, kazoo_globals.acceptor);
-
-	while (switch_test_flag(&kazoo_globals, LFLAG_RUNNING)) {
-		int nodefd;
-		ErlConnect conn;
-
-		/* zero out errno because ei_accept doesn't differentiate between a */
-		/* failed authentication or a socket failure, or a client version */
-		/* mismatch or a godzilla attack (and a godzilla attack is highly likely) */
-		errno = 0;
-
-		/* wait here for an erlang node to connect, timming out to check if our module is still running every now-and-again */
-		if ((nodefd = ei_accept_tmo(&kazoo_globals.ei_cnode, (int) os_socket, &conn, kazoo_globals.connection_timeout)) == ERL_ERROR) {
-			if (erl_errno == ETIMEDOUT) {
-				continue;
-			} else if (errno) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Erlang connection acceptor socket error %d %d\n", erl_errno, errno);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
-				                  "Erlang node connection failed - ensure your cookie matches '%s' and you are using a good nodename\n", kazoo_globals.ei_cookie);
-			}
-			continue;
-		}
-
-		if (!switch_test_flag(&kazoo_globals, LFLAG_RUNNING)) {
-			break;
-		}
-
-		/* NEW ERLANG NODE CONNECTION! Hello friend! */
-		new_kazoo_node(nodefd, &conn);
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Erlang connection acceptor shut down\n");
-
-	switch_atomic_dec(&kazoo_globals.threads);
-
-	return SWITCH_STATUS_TERM;
-}
-
-SWITCH_DECLARE(switch_status_t) ei_queue_pop(switch_queue_t *queue, void **data, switch_interval_time_t timeout)
-{
-	if (timeout == 0) {
-		return switch_queue_trypop(queue, data);
-	} else {
-		return switch_queue_pop_timeout(queue, data, timeout);
-	}
-}
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_endpoints.c b/src/mod/event_handlers/mod_kazoo/kazoo_endpoints.c
deleted file mode 100644
index 4ddfeddae4..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_endpoints.c
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Karl Anderson <karl@2600hz.com>
- * Darren Schreiber <darren@2600hz.com>
- *
- *
- * kazoo_dptools.c -- clones of mod_dptools commands slightly modified for kazoo
- *
- */
-#include "mod_kazoo.h"
-
-#define INTERACTION_VARIABLE "Call-Interaction-ID"
-
-static const char *x_bridge_variables[] = {
-		"Call-Control-Queue",
-		"Call-Control-PID",
-		"Call-Control-Node",
-		INTERACTION_VARIABLE,
-		"ecallmgr_Ecallmgr-Node",
-		"sip_h_k-cid",
-		"Switch-URI",
-		"Switch-URL",
-		NULL
-};
-
-static void kz_tweaks_variables_to_event(switch_core_session_t *session, switch_event_t *event)
-{
-	int i;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	for(i = 0; x_bridge_variables[i] != NULL; i++) {
-		const char *val = switch_channel_get_variable_dup(channel, x_bridge_variables[i], SWITCH_FALSE, -1);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, x_bridge_variables[i], val);
-	}
-}
-
-static switch_call_cause_t kz_endpoint_outgoing_channel(switch_core_session_t *session,
-							switch_event_t *var_event,
-							switch_caller_profile_t *outbound_profile_in,
-							switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-							switch_call_cause_t *cancel_cause)
-{
-	switch_xml_t x_user = NULL, x_param, x_params, x_callfwd;
-	char *user = NULL, *domain = NULL, *dup_domain = NULL, *dialed_user = NULL;
-	char *dest = NULL;
-	switch_call_cause_t cause = SWITCH_CAUSE_NONE;
-	unsigned int timelimit = SWITCH_DEFAULT_TIMEOUT;
-	switch_channel_t *new_channel = NULL;
-	switch_event_t *params = NULL, *var_event_orig = var_event;
-	char stupid[128] = "";
-	const char *skip = NULL, *var = NULL;
-	switch_core_session_t *a_session = NULL, *e_session = NULL;
-	cJSON * ctx = NULL;
-	const char *endpoint_dial = NULL;
-	const char *callforward_dial = NULL;
-	const char *failover_dial = NULL;
-	char *b_failover_dial = NULL;
-	const char *endpoint_separator = NULL;
-	const char *varval = NULL;
-	char *d_dest = NULL;
-	switch_channel_t *channel = NULL;
-	switch_originate_flag_t myflags = SOF_NONE;
-	char *cid_name_override = NULL;
-	char *cid_num_override = NULL;
-	switch_event_t *event = NULL;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_caller_profile_t *outbound_profile = NULL;
-
-
-	if (zstr(outbound_profile_in->destination_number)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "NO DESTINATION NUMBER\n");
-		goto done;
-	}
-
-	user = strdup(outbound_profile_in->destination_number);
-
-	if (!user)
-		goto done;
-
-	if ((domain = strchr(user, '@'))) {
-		*domain++ = '\0';
-	} else {
-		domain = switch_core_get_domain(SWITCH_TRUE);
-		dup_domain = domain;
-	}
-
-	if (!domain) {
-		goto done;
-	}
-
-
-	switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
-	switch_assert(params);
-	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "as_channel", "true");
-	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", "user_call");
-	if (session) {
-		switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(session));
-	}
-
-	if (var_event) {
-		switch_event_merge(params, var_event);
-	}
-
-	if (var_event && (skip = switch_event_get_header(var_event, "user_recurse_variables")) && switch_false(skip)) {
-		if ((var = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE)) || (var = switch_event_get_header(var_event, "leg_timeout"))) {
-			timelimit = atoi(var);
-		}
-		var_event = NULL;
-	}
-
-	if (switch_xml_locate_user_merged("id", user, domain, NULL, &x_user, params) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", user, domain);
-		cause = SWITCH_CAUSE_SUBSCRIBER_ABSENT;
-		goto done;
-	}
-
-	if (var_event) {
-		const char * str_ctx = switch_event_get_header(var_event, "kz-endpoint-runtime-context");
-		if ( str_ctx  ) {
-			ctx = cJSON_Parse(str_ctx);
-			if (ctx) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "call context parsed => %s\n", str_ctx);
-			}
-		}
-	}
-
-	if ((x_params = switch_xml_child(x_user, "variables"))) {
-		for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
-			const char *pvar = switch_xml_attr_soft(x_param, "name");
-			const char *val = switch_xml_attr(x_param, "value");
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "adding variable to var_event => %s = %s\n", pvar, val);
-			if (!var_event) {
-				switch_event_create(&var_event, SWITCH_EVENT_GENERAL);
-			} else {
-				switch_event_del_header(var_event, pvar);
-			}
-			switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, pvar, val);
-		}
-	}
-
-	if ((x_params = switch_xml_child(x_user, "params"))) {
-		for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) {
-			const char *pvar = switch_xml_attr_soft(x_param, "name");
-			const char *val = switch_xml_attr(x_param, "value");
-
-			if (!strcasecmp(pvar, "endpoint-dial-string")) {
-				endpoint_dial = val;
-			} else if (!strcasecmp(pvar, "callforward-dial-string")) {
-				callforward_dial = val;
-			} else if (!strcasecmp(pvar, "endpoint-separator")) {
-				endpoint_separator = val;
-			} else if (!strncasecmp(pvar, "dial-var-", 9)) {
-				if (!var_event) {
-					switch_event_create(&var_event, SWITCH_EVENT_GENERAL);
-				} else {
-					switch_event_del_header(var_event, pvar + 9);
-				}
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "adding dialog var to var_event => %s = %s\n", pvar + 9, val);
-				switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, pvar + 9, val);
-			}
-		}
-	}
-
-	x_callfwd = switch_xml_child(x_user, "call-forward");
-	if (x_callfwd) {
-		switch_bool_t call_fwd_is_substitute = SWITCH_FALSE,
-				call_fwd_is_failover = SWITCH_FALSE,
-				call_fwd_direct_calls_only = SWITCH_FALSE,
-				call_fwd_is_valid = SWITCH_TRUE;
-		for (x_param = switch_xml_child(x_callfwd, "variable"); x_param; x_param = x_param->next) {
-			const char *var = switch_xml_attr_soft(x_param, "name");
-			const char *val = switch_xml_attr(x_param, "value");
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "cfw %s => %s\n", var, val);
-			if (!strcasecmp(var, "Is-Substitute")) {
-				call_fwd_is_substitute = switch_true(val);
-			} else if (!strcasecmp(var, "Is-Failover")) {
-				call_fwd_is_failover = switch_true(val);
-			} else if (!strcasecmp(var, "Direct-Calls-Only")) {
-				call_fwd_direct_calls_only = switch_true(val);
-			}
-		}
-
-		if (call_fwd_direct_calls_only) {
-			call_fwd_is_valid = SWITCH_FALSE;
-			if (ctx ) {
-				cJSON *json_flags = cJSON_GetObjectItem(ctx, "Flags");
-				if (json_flags && json_flags->type == cJSON_Array) {
-					cJSON *item;
-					cJSON_ArrayForEach(item, json_flags) {
-						if (!strcmp(item->valuestring, "direct_call")) {
-							call_fwd_is_valid = SWITCH_TRUE;
-							break;
-						}
-					}
-					if (!call_fwd_is_valid) {
-						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "call fwd requires direct_call and it was not found\n");
-					}
-				}
-			}
-		}
-
-		if (!call_fwd_is_valid) {
-			dest = endpoint_dial ? strdup(endpoint_dial) : strdup("");
-		} else if (call_fwd_is_failover) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "setting failover => %s\n", callforward_dial);
-			dest = endpoint_dial ? strdup(endpoint_dial) : strdup("");
-			failover_dial = callforward_dial;
-		} else if (call_fwd_is_substitute) {
-			dest = callforward_dial ? strdup(callforward_dial) : strdup("");
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "setting call fwd substitute => %s\n", dest);
-		} else {
-			dest = switch_mprintf("%s%s%s", endpoint_dial ? endpoint_dial : "", (endpoint_dial ? endpoint_separator ? endpoint_separator : "," : ""), callforward_dial);
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "setting call fwd append => %s => %s\n", callforward_dial, dest);
-		}
-	} else {
-		dest = endpoint_dial ? strdup(endpoint_dial) : strdup("");
-	}
-
-	dialed_user = (char *)switch_xml_attr(x_user, "id");
-
-	if (var_event) {
-		switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "dialed_user", dialed_user);
-		switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "dialed_domain", domain);
-	}
-
-	if (!dest) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No dial-string available, please check your user directory.\n");
-		cause = SWITCH_CAUSE_MANDATORY_IE_MISSING;
-		goto done;
-	}
-
-	if (var_event) {
-		cid_name_override = switch_event_get_header(var_event, "origination_caller_id_name");
-		cid_num_override = switch_event_get_header(var_event, "origination_caller_id_number");
-	}
-
-	if(session) {
-		a_session = session;
-	} else if(var_event) {
-		const char* uuid_e_session = switch_event_get_header(var_event, "ent_originate_aleg_uuid");
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHECKING ORIGINATE-UUID : %s\n", uuid_e_session);
-		if (uuid_e_session && (e_session = switch_core_session_locate(uuid_e_session)) != NULL) {
-			a_session = e_session;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FOUND ORIGINATE-UUID : %s\n", uuid_e_session);
-		}
-	}
-
-	if (a_session) {
-		switch_event_create(&event, SWITCH_EVENT_GENERAL);
-		channel = switch_core_session_get_channel(a_session);
-		if ((varval = switch_channel_get_variable(channel, SWITCH_CALL_TIMEOUT_VARIABLE))
-			|| (var_event && (varval = switch_event_get_header(var_event, "leg_timeout")))) {
-			timelimit = atoi(varval);
-		}
-		switch_channel_event_set_data(channel, event);
-
-		switch_channel_set_variable(channel, "dialed_user", dialed_user);
-		switch_channel_set_variable(channel, "dialed_domain", domain);
-
-	} else {
-		if (var_event) {
-			switch_event_dup(&event, var_event);
-			switch_event_del_header(event, "dialed_user");
-			switch_event_del_header(event, "dialed_domain");
-			if ((varval = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE)) ||
-				(varval = switch_event_get_header(var_event, "leg_timeout"))) {
-				timelimit = atoi(varval);
-			}
-		} else {
-			switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS);
-			switch_assert(event);
-		}
-
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_user", dialed_user);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_domain", domain);
-	}
-
-	if ((x_params = switch_xml_child(x_user, "profile-variables"))) {
-		for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
-			const char *pvar = switch_xml_attr_soft(x_param, "name");
-			const char *val = switch_xml_attr(x_param, "value");
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "adding profile variable to event => %s = %s\n", pvar, val);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, pvar, val);
-		}
-	}
-
-	if ((x_params = switch_xml_child(x_user, "variables"))) {
-		for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
-			const char *pvar = switch_xml_attr_soft(x_param, "name");
-			const char *val = switch_xml_attr(x_param, "value");
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "adding variable to event => %s = %s\n", pvar, val);
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, pvar, val);
-		}
-	}
-
-	if ((x_params = switch_xml_child(x_user, "params"))) {
-		for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) {
-			const char *pvar = switch_xml_attr_soft(x_param, "name");
-			const char *val = switch_xml_attr(x_param, "value");
-
-			if (!strncasecmp(pvar, "dial-var-", 9)) {
-				switch_event_del_header(event, pvar + 9);
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "adding dialog var to event => %s = %s\n", pvar + 9, val);
-				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, pvar + 9, val);
-			}
-		}
-	}
-
-	// add runtime vars to event for expand
-	if (ctx) {
-		kz_expand_json_to_event(ctx, event, "kz_ctx");
-	}
-
-	d_dest = kz_event_expand_headers(event, dest);
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "dialing %s => %s\n", dest, d_dest);
-
-	if(failover_dial) {
-		b_failover_dial = kz_event_expand_headers(event, failover_dial);
-	}
-
-	if (var_event) {
-		kz_expand_headers(event, var_event);
-	}
-
-	switch_event_destroy(&event);
-
-
-	if ((flags & SOF_NO_LIMITS)) {
-		myflags |= SOF_NO_LIMITS;
-	}
-
-	if ((flags & SOF_FORKED_DIAL)) {
-		myflags |= SOF_NOBLOCK;
-	}
-
-	if ( a_session ) {
-		if(var_event) {
-			kz_tweaks_variables_to_event(a_session, var_event);
-		}
-	}
-
-	if(e_session) {
-		switch_core_session_rwunlock(e_session);
-	}
-
-	switch_snprintf(stupid, sizeof(stupid), "kz/%s", dialed_user);
-	if (switch_stristr(stupid, d_dest)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Waddya Daft? You almost called '%s' in an infinate loop!\n", stupid);
-		cause = SWITCH_CAUSE_INVALID_IE_CONTENTS;
-		goto done;
-	}
-
-	//
-	outbound_profile = outbound_profile_in;
-	/*
-	outbound_profile = switch_caller_profile_dup(outbound_profile_in->pool, outbound_profile_in);
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG1, "CHECKING CALLER-ID\n");
-	if ((x_params = switch_xml_child(x_user, "profile-variables"))) {
-		const char* val = NULL;
-		outbound_profile->soft = NULL;
-		for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
-			const char *pvar = switch_xml_attr(x_param, "name");
-			const char *val = switch_xml_attr(x_param, "value");
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG1, "setting profile var %s = %s\n", pvar, val);
-			switch_caller_profile_set_var(outbound_profile, pvar, val);
-		}
-		// * TODO * verify onnet/offnet
-		if((val=switch_caller_get_field_by_name(outbound_profile, "Endpoint-Caller-ID-Name"))) {
-			outbound_profile->callee_id_name = val;
-			outbound_profile->orig_caller_id_name = val;
-		}
-		if((val=switch_caller_get_field_by_name(outbound_profile, "Endpoint-Caller-ID-Number"))) {
-			outbound_profile->callee_id_number = val;
-			outbound_profile->orig_caller_id_number = val;
-		}
-	}
-	*/
-
-	status = switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL,
-	 	                         cid_name_override, cid_num_override, outbound_profile, var_event, myflags,
-	 	                         cancel_cause, NULL);
-
-	if (status != SWITCH_STATUS_SUCCESS && b_failover_dial) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "trying failover => %s\n", failover_dial);
-		status = switch_ivr_originate(session, new_session, &cause, b_failover_dial, timelimit, NULL,
-		 	                         cid_name_override, cid_num_override, outbound_profile, var_event, myflags,
-		 	                         cancel_cause, NULL);
-	}
-
-	if (status == SWITCH_STATUS_SUCCESS) {
-		const char *context;
-		switch_caller_profile_t *cp;
-
-		if (var_event) {
-			switch_event_del_header(var_event, "origination_uuid");
-		}
-
-		new_channel = switch_core_session_get_channel(*new_session);
-
-		if ((context = switch_channel_get_variable(new_channel, "user_context"))) {
-			if ((cp = switch_channel_get_caller_profile(new_channel))) {
-				cp->context = switch_core_strdup(cp->pool, context);
-			}
-		}
-
-
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG1, "CHECKING CALLER-ID\n");
-		if ((x_params = switch_xml_child(x_user, "profile-variables"))) {
-			switch_caller_profile_t *cp = switch_channel_get_caller_profile(new_channel);
-			const char* val = NULL;
-			cp->soft = NULL;
-			for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
-				const char *pvar = switch_xml_attr(x_param, "name");
-				const char *val = switch_xml_attr(x_param, "value");
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG1, "setting profile var %s = %s\n", pvar, val);
-				switch_channel_set_profile_var(new_channel, pvar, val);
-				//switch_caller_profile_set_var(cp, pvar, val);
-			}
-			// * TODO * verify onnet/offnet
-			if((val=switch_caller_get_field_by_name(cp, "Endpoint-Caller-ID-Name"))) {
-					cp->callee_id_name = val;
-					cp->orig_caller_id_name = val;
-			}
-			if((val=switch_caller_get_field_by_name(cp, "Endpoint-Caller-ID-Number"))) {
-				cp->callee_id_number = val;
-				cp->orig_caller_id_number = val;
-			}
-		}
-		switch_core_session_rwunlock(*new_session);
-	}
-
-  done:
-
-	if (d_dest && d_dest != dest) {
-		switch_safe_free(d_dest);
-	}
-
-	if(b_failover_dial && b_failover_dial != failover_dial) {
-		switch_safe_free(b_failover_dial);
-	}
-
-	switch_safe_free(dest);
-
-  	if (ctx) {
-  		cJSON_Delete(ctx);
-  	}
-
-	if (x_user) {
-		switch_xml_free(x_user);
-	}
-
-	if (params) {
-		switch_event_destroy(&params);
-	}
-
-	if (var_event && var_event_orig != var_event) {
-		switch_event_destroy(&var_event);
-	}
-
-	switch_safe_free(user);
-	switch_safe_free(dup_domain);
-	return cause;
-}
-
-
-/* kazoo endpoint */
-
-
-switch_io_routines_t kz_endpoint_io_routines = {
-	/*.outgoing_channel */ kz_endpoint_outgoing_channel
-};
-
-void add_kz_endpoints(switch_loadable_module_interface_t **module_interface) {
-	switch_endpoint_interface_t *kz_endpoint_interface;
-	kz_endpoint_interface = (switch_endpoint_interface_t *) switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-	kz_endpoint_interface->interface_name = "kz";
-	kz_endpoint_interface->io_routines = &kz_endpoint_io_routines;
-}
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_event_stream.c b/src/mod/event_handlers/mod_kazoo/kazoo_event_stream.c
deleted file mode 100644
index 3d1f18326b..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_event_stream.c
+++ /dev/null
@@ -1,750 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Karl Anderson <karl@2600hz.com>
- * Darren Schreiber <darren@2600hz.com>
- *
- *
- * kazoo_event_streams.c -- Event Publisher
- *
- */
-#include "mod_kazoo.h"
-
-#define MAX_FRAMING 4
-
-/* Blatantly repurposed from switch_eventc */
-static char *my_dup(const char *s) {
-	size_t len = strlen(s) + 1;
-	void *new = malloc(len);
-	switch_assert(new);
-
-	return (char *) memcpy(new, s, len);
-}
-
-#ifndef DUP
-#define DUP(str) my_dup(str)
-#endif
-
-static const char* private_headers[] = {"variable_sip_h_", "sip_h_", "P-", "X-"};
-
-static int is_private_header(const char *name) {
-	int i;
-	for(i=0; i < 4; i++) {
-		if(!strncmp(name, private_headers[i], strlen(private_headers[i]))) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int is_kazoo_var(char* header)
-{
-	int idx = 0;
-	while(kazoo_globals.kazoo_var_prefixes[idx] != NULL) {
-		char *prefix = kazoo_globals.kazoo_var_prefixes[idx];
-		if(!strncasecmp(header, prefix, strlen(prefix))) {
-			return 1;
-		}
-		idx++;
-	}
-
-	return 0;
-}
-
-static switch_status_t kazoo_event_dup(switch_event_t **clone, switch_event_t *event, switch_hash_t *filter) {
-	switch_event_header_t *header;
-
-	if (switch_event_create_subclass(clone, SWITCH_EVENT_CLONE, event->subclass_name) != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_GENERR;
-	}
-
-	(*clone)->event_id = event->event_id;
-	(*clone)->event_user_data = event->event_user_data;
-	(*clone)->bind_user_data = event->bind_user_data;
-	(*clone)->flags = event->flags;
-
-	for (header = event->headers; header; header = header->next) {
-		if (event->subclass_name && !strcmp(header->name, "Event-Subclass")) {
-			continue;
-		}
-
-		if (!is_kazoo_var(header->name)
-			&& filter
-			&& !switch_core_hash_find(filter, header->name)
-			&& (!kazoo_globals.send_all_headers)
-			&& (!(kazoo_globals.send_all_private_headers && is_private_header(header->name)))
-			)
-			{
-				continue;
-			}
-
-        if (header->idx) {
-            int i;
-            for (i = 0; i < header->idx; i++) {
-                switch_event_add_header_string(*clone, SWITCH_STACK_PUSH, header->name, header->array[i]);
-            }
-        } else {
-            switch_event_add_header_string(*clone, SWITCH_STACK_BOTTOM, header->name, header->value);
-        }
-    }
-
-    if (event->body) {
-        (*clone)->body = DUP(event->body);
-    }
-
-    (*clone)->key = event->key;
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-static int encode_event_old(switch_event_t *event, ei_x_buff *ebuf) {
-	switch_event_t *clone = NULL;
-
-	if (kazoo_event_dup(&clone, event, kazoo_globals.event_filter) != SWITCH_STATUS_SUCCESS) {
-		return 0;
-	}
-
-	ei_encode_switch_event(ebuf, clone);
-
-	switch_event_destroy(&clone);
-
-	return 1;
-}
-
-static int encode_event_new(switch_event_t *event, ei_x_buff *ebuf) {
-	kazoo_message_ptr msg = NULL;
-	ei_event_binding_t *event_binding = (ei_event_binding_t *) event->bind_user_data;
-
-	msg =  kazoo_message_create_event(event, event_binding->event, kazoo_globals.events);
-
-	if(msg == NULL) {
-		return 0;
-	}
-
-	ei_x_encode_tuple_header(ebuf, 3);
-	ei_x_encode_atom(ebuf, "event");
-	if(kazoo_globals.json_encoding == ERLANG_TUPLE) {
-		ei_x_encode_atom(ebuf, "json");
-	} else {
-		ei_x_encode_atom(ebuf, "map");
-	}
-	ei_encode_json(ebuf, msg->JObj);
-
-	kazoo_message_destroy(&msg);
-
-	return 1;
-}
-
-/*
- * event_handler is duplicated when there are 2+ nodes connected
- * with the same bindings
- * we should maintain a list of event_streams in event_binding struct
- * and build a ref count in the message
- *
- */
-static void event_handler(switch_event_t *event) {
-	ei_event_binding_t *event_binding = (ei_event_binding_t *) event->bind_user_data;
-	ei_event_stream_t *event_stream = event_binding->stream;
-	ei_x_buff *ebuf = NULL;
-	int res = 0;
-
-	/* if mod_kazoo or the event stream isn't running dont push a new event */
-	if (!switch_test_flag(event_stream, LFLAG_RUNNING) || !switch_test_flag(&kazoo_globals, LFLAG_RUNNING)) {
-		return;
-	}
-
-	kz_event_decode(event);
-
-	switch_malloc(ebuf, sizeof(*ebuf));
-	if(ebuf == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate erlang buffer for mod_kazoo message\n");
-		return;
-	}
-	memset(ebuf, 0, sizeof(*ebuf));
-
-	if(kazoo_globals.event_stream_preallocate > 0) {
-		ebuf->buff = malloc(kazoo_globals.event_stream_preallocate);
-		ebuf->buffsz = kazoo_globals.event_stream_preallocate;
-		ebuf->index = 0;
-		if(ebuf->buff == NULL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not pre-allocate memory for mod_kazoo message\n");
-			switch_safe_free(ebuf);
-			return;
-		}
-	} else {
-		ei_x_new(ebuf);
-	}
-
-	ebuf->index = MAX_FRAMING;
-
-	ei_x_encode_version(ebuf);
-
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Target-Node", event_binding->stream->node->peer_nodename);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Switch-Nodename", kazoo_globals.ei_cnode.thisnodename);
-
-	if(event_stream->node->legacy) {
-		res = encode_event_old(event, ebuf);
-	} else {
-		res = encode_event_new(event, ebuf);
-	}
-
-	switch_event_del_header(event, "Switch-Nodename");
-	switch_event_del_header(event, "Target-Node");
-
-	if(!res) {
-		ei_x_free(ebuf);
-		switch_safe_free(ebuf);
-		return;
-	}
-
-	if (kazoo_globals.event_stream_preallocate > 0 && ebuf->buffsz > kazoo_globals.event_stream_preallocate) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "increased event stream buffer size to %d\n", ebuf->buffsz);
-	}
-
-	if (switch_queue_trypush(event_stream->queue, ebuf) != SWITCH_STATUS_SUCCESS) {
-			/* if we couldn't place the cloned event into the listeners */
-			/* event queue make sure we destroy it, real good like */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error placing the event in the listeners queue\n");
-		ei_x_free(ebuf);
-		switch_safe_free(ebuf);
-	}
-
-}
-
-static void *SWITCH_THREAD_FUNC event_stream_loop(switch_thread_t *thread, void *obj) {
-    ei_event_stream_t *event_stream = (ei_event_stream_t *) obj;
-	ei_event_binding_t *event_binding;
-	switch_sockaddr_t *sa;
-	uint16_t port;
-    char ipbuf[48];
-    const char *ip_addr;
-	void *pop;
-	short event_stream_framing;
-	short event_stream_keepalive;
-	short ok = 1;
-
-	switch_atomic_inc(&kazoo_globals.threads);
-
-	switch_assert(event_stream != NULL);
-
-	event_stream_framing = event_stream->event_stream_framing;
-	event_stream_keepalive = event_stream->event_stream_keepalive;
-
-	/* figure out what socket we just opened */
-	switch_socket_addr_get(&sa, SWITCH_FALSE, event_stream->acceptor);
-	port = switch_sockaddr_get_port(sa);
-    ip_addr = switch_get_addr(ipbuf, sizeof(ipbuf), sa);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting erlang event stream %p on %s:%u for %s <%d.%d.%d>\n"
-					  ,(void *)event_stream, ip_addr, port, event_stream->pid.node, event_stream->pid.creation
-					  ,event_stream->pid.num, event_stream->pid.serial);
-
-	while (switch_test_flag(event_stream, LFLAG_RUNNING) && switch_test_flag(&kazoo_globals, LFLAG_RUNNING) && ok) {
-		const switch_pollfd_t *fds;
-		int32_t numfds;
-
-		/* check if a new connection is pending */
-		if (switch_pollset_poll(event_stream->pollset, 0, &numfds, &fds) == SWITCH_STATUS_SUCCESS) {
-			int32_t i;
-			for (i = 0; i < numfds; i++) {
-				switch_socket_t *newsocket;
-
-				/* accept the new client connection */
-				if (switch_socket_accept(&newsocket, event_stream->acceptor, event_stream->pool) == SWITCH_STATUS_SUCCESS) {
-					switch_sockaddr_t *sa;
-
-                    if (switch_socket_opt_set(newsocket, SWITCH_SO_NONBLOCK, TRUE)) {
-                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Couldn't set socket as non-blocking\n");
-                    }
-
-                    if (event_stream_keepalive) {
-                    	if (switch_socket_opt_set(newsocket, SWITCH_SO_KEEPALIVE, TRUE)) {
-                    		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Couldn't set socket keep-alive\n");
-                    	}
-                    }
-
-                    if (switch_socket_opt_set(newsocket, SWITCH_SO_TCP_NODELAY, 1)) {
-                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Couldn't disable Nagle.\n");
-                    }
-
-					/* close the current client, if there is one */
-					close_socket(&event_stream->socket);
-
-					switch_mutex_lock(event_stream->socket_mutex);
-					/* start sending to the new client */
-					event_stream->socket = newsocket;
-
-					switch_socket_addr_get(&sa, SWITCH_TRUE, newsocket);
-					event_stream->remote_port = switch_sockaddr_get_port(sa);
-					switch_get_addr(event_stream->remote_ip, sizeof (event_stream->remote_ip), sa);
-
-					switch_socket_addr_get(&sa, SWITCH_FALSE, newsocket);
-					event_stream->local_port = switch_sockaddr_get_port(sa);
-					switch_get_addr(event_stream->local_ip, sizeof (event_stream->local_ip), sa);
-
-					event_stream->connected = SWITCH_TRUE;
-					event_stream->connected_time = switch_micro_time_now();
-
-					switch_mutex_unlock(event_stream->socket_mutex);
-
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Erlang event stream %p client %s:%u\n", (void *)event_stream, event_stream->remote_ip, event_stream->remote_port);
-				}
-			}
-		}
-
-		/* if there was an event waiting in our queue send it to the client */
-		if (ei_queue_pop(event_stream->queue, &pop, event_stream->queue_timeout) == SWITCH_STATUS_SUCCESS) {
-			ei_x_buff *ebuf = (ei_x_buff *) pop;
-
-			if (event_stream->socket) {
-				switch_size_t size = 1, expected = 0;
-				switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-				if(ebuf->index >= pow(2, 8 * event_stream_framing)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "sending frame size %d with insufficient frame capacity, change event_stream_framing here and tcp_packet_type in ecallmgr\n", ebuf->index);
-				} else {
-					if(event_stream_framing) {
-						int index = ebuf->index - MAX_FRAMING;
-						char byte;
-						short i = event_stream_framing;
-						while (i) {
-							byte = index >> (8 * --i);
-							ebuf->buff[MAX_FRAMING - i - 1] = byte;
-						}
-					}
-					expected = size = (switch_size_t)ebuf->index - MAX_FRAMING + event_stream_framing;
-					if((status = switch_socket_send(event_stream->socket, ebuf->buff + (MAX_FRAMING - event_stream_framing), &size)) != SWITCH_STATUS_SUCCESS) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error %d sending event stream\n", status);
-						ok = 0;
-					} else if(expected != size) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error sending event stream, sent bytes is different of expected\n");
-						ok = 0;
-					}
-				}
-			}
-
-			ei_x_free(ebuf);
-			switch_safe_free(ebuf);
-		}
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down erlang event stream %p\n", (void *)event_stream);
-
-	/* unbind from the system events */
-	event_binding = event_stream->bindings;
-	while(event_binding != NULL) {
-		switch_event_unbind(&event_binding->node);
-		event_binding = event_binding->next;
-	}
-	event_stream->bindings = NULL;
-
-	/* clear and destroy any remaining queued events */
-	while (switch_queue_trypop(event_stream->queue, &pop) == SWITCH_STATUS_SUCCESS) {
-		ei_x_buff *ebuf = (ei_x_buff *) pop;
-		ei_x_free(ebuf);
-		switch_safe_free(ebuf);
-	}
-
-	/* remove the acceptor pollset */
-	switch_pollset_remove(event_stream->pollset, event_stream->pollfd);
-
-	/* close any open sockets */
-	close_socket(&event_stream->acceptor);
-
-	switch_mutex_lock(event_stream->socket_mutex);
-	event_stream->connected = SWITCH_FALSE;
-	close_socket(&event_stream->socket);
-	switch_mutex_unlock(event_stream->socket_mutex);
-
-	switch_mutex_destroy(event_stream->socket_mutex);
-
-	/* clean up the memory */
-	switch_core_destroy_memory_pool(&event_stream->pool);
-
-	switch_atomic_dec(&kazoo_globals.threads);
-
-	return NULL;
-}
-
-ei_event_stream_t *new_event_stream(ei_node_t *ei_node, const erlang_pid *from) {
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	switch_memory_pool_t *pool = NULL;
-	ei_event_stream_t *event_stream;
-	ei_event_stream_t **event_streams = &ei_node->event_streams;
-
-	/* create memory pool for this event stream */
-	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory: How many Alzheimer's patients does it take to screw in a light bulb? To get to the other side.\n");
-		return NULL;
-	}
-
-	/* from the memory pool, allocate the event stream structure */
-	if (!(event_stream = switch_core_alloc(pool, sizeof (*event_stream)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory: I may have Alzheimers but at least I dont have Alzheimers.\n");
-		goto cleanup;
-	}
-
-	/* prepare the event stream */
-	memset(event_stream, 0, sizeof(*event_stream));
-	event_stream->bindings = NULL;
-	event_stream->pool = pool;
-	event_stream->connected = SWITCH_FALSE;
-	event_stream->node = ei_node;
-	event_stream->event_stream_framing = ei_node->event_stream_framing;
-	event_stream->event_stream_keepalive = ei_node->event_stream_keepalive;
-	event_stream->queue_timeout = ei_node->event_stream_queue_timeout;
-	memcpy(&event_stream->pid, from, sizeof(erlang_pid));
-	switch_queue_create(&event_stream->queue, MAX_QUEUE_LEN, pool);
-
-	/* create a socket for accepting the event stream client */
-    if (!(event_stream->acceptor = create_socket(pool))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Like car accidents, most hardware problems are due to driver error.\n");
-		goto cleanup;
-    }
-
-	if (switch_socket_opt_set(event_stream->acceptor, SWITCH_SO_NONBLOCK, TRUE)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Hey, it compiles!\n");
-		goto cleanup;
-	}
-
-	/* create a pollset so we can efficiently check for new client connections */
-	if (switch_pollset_create(&event_stream->pollset, 1000, pool, 0) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "My software never has bugs. It just develops random features.\n");
-		goto cleanup;
-	}
-
-	switch_socket_create_pollfd(&event_stream->pollfd, event_stream->acceptor, SWITCH_POLLIN | SWITCH_POLLERR, NULL, pool);
-	if (switch_pollset_add(event_stream->pollset, event_stream->pollfd) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "If you saw a heat wave, would you wave back?\n");
-		goto cleanup;
-	}
-
-	switch_mutex_init(&event_stream->socket_mutex, SWITCH_MUTEX_DEFAULT, pool);
-
-	/* add the new event stream to the link list
-	 * since the event streams link list is only
-	 * accessed from the same thread no locks
-	 * are required */
-	if (!*event_streams) {
-		*event_streams = event_stream;
-	} else {
-		event_stream->next = *event_streams;
-		*event_streams = event_stream;
-	}
-
-	/* when we start we are running */
-	switch_set_flag(event_stream, LFLAG_RUNNING);
-
-	switch_threadattr_create(&thd_attr, event_stream->pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&thread, thd_attr, event_stream_loop, event_stream, event_stream->pool);
-
-	return event_stream;
-
-cleanup:
-
-	if (event_stream) {
-		/* remove the acceptor pollset */
-		if (event_stream->pollset) {
-			switch_pollset_remove(event_stream->pollset, event_stream->pollfd);
-		}
-
-		/* close any open sockets */
-		if (event_stream->acceptor) {
-			close_socket(&event_stream->acceptor);
-		}
-	}
-
-	/* clean up the memory */
-	switch_core_destroy_memory_pool(&pool);
-
-    return NULL;
-
-}
-
-unsigned long get_stream_port(const ei_event_stream_t *event_stream) {
-	switch_sockaddr_t *sa;
-	switch_socket_addr_get(&sa, SWITCH_FALSE, event_stream->acceptor);
-	return (unsigned long) switch_sockaddr_get_port(sa);
-}
-
-ei_event_stream_t *find_event_stream(ei_event_stream_t *event_stream, const erlang_pid *from) {
-	while (event_stream != NULL) {
-		if (ei_compare_pids(&event_stream->pid, from) == SWITCH_STATUS_SUCCESS) {
-			return event_stream;
-		}
-		event_stream = event_stream->next;
-	}
-
-	return NULL;
-}
-
-switch_status_t remove_event_stream(ei_event_stream_t **event_streams, const erlang_pid *from) {
-	ei_event_stream_t *event_stream, *prev = NULL;
-	int found = 0;
-
-	/* if there are no event bindings there is nothing to do */
-	if (!*event_streams) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	/* try to find the event stream for the client process */
-	event_stream = *event_streams;
-	while(event_stream != NULL) {
-		if (ei_compare_pids(&event_stream->pid, from) == SWITCH_STATUS_SUCCESS) {
-			found = 1;
-			break;
-		}
-
-		prev = event_stream;
-		event_stream = event_stream->next;
-	}
-
-	if (found) {
-		/* if we found an event stream remove it from
-		 * from the link list */
-		if (!prev) {
-			*event_streams = event_stream->next;
-		} else {
-			prev->next = event_stream->next;
-		}
-
-		/* stop the event stream thread */
-		switch_clear_flag(event_stream, LFLAG_RUNNING);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t remove_event_streams(ei_event_stream_t **event_streams) {
-	ei_event_stream_t *event_stream = *event_streams;
-
-	while(event_stream != NULL) {
-		/* stop the event bindings publisher thread */
-		switch_clear_flag(event_stream, LFLAG_RUNNING);
-
-		event_stream = event_stream->next;
-	}
-
-	*event_streams = NULL;
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-void bind_event_profile(ei_event_binding_t *event_binding, kazoo_event_ptr event)
-{
-	switch_event_types_t event_type;
-	while(event != NULL) {
-	   	if (switch_name_event(event->name, &event_type) != SWITCH_STATUS_SUCCESS) {
-	   		event_type = SWITCH_EVENT_CUSTOM;
-	   	}
-	   	if(event_binding->type != SWITCH_EVENT_CUSTOM
-				&& event_binding->type == event_type) {
-				break;
-		}
-		if (event_binding->type == SWITCH_EVENT_CUSTOM
-				&& event_binding->type == event_type
-				&& !strcasecmp(event_binding->subclass_name, event->name)) {
-				break;
-		}
-		event = event->next;
-	}
-	event_binding->event = event;
-	if(event == NULL && (!event_binding->stream->node->legacy)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "event binding to an event without profile in non legacy mode => %s - %s\n",switch_event_name(event_binding->type), event_binding->subclass_name);
-	}
-}
-
-void bind_event_profiles(kazoo_event_ptr event)
-{
-	ei_node_t *ei_node = kazoo_globals.ei_nodes;
-	while(ei_node) {
-		ei_event_stream_t *event_streams = ei_node->event_streams;
-		while(event_streams) {
-			ei_event_binding_t *bindings = event_streams->bindings;
-			while(bindings) {
-				bind_event_profile(bindings, event);
-				bindings = bindings->next;
-			}
-			event_streams = event_streams->next;
-		}
-		ei_node = ei_node->next;
-	}
-}
-
-switch_status_t add_event_binding(ei_event_stream_t *event_stream, const char *event_name) {
-	ei_event_binding_t *event_binding = event_stream->bindings;
-	switch_event_types_t event_type;
-
-	if(!strcasecmp(event_name, "CUSTOM")) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-   	if (switch_name_event(event_name, &event_type) != SWITCH_STATUS_SUCCESS) {
-   		event_type = SWITCH_EVENT_CUSTOM;
-   	}
-
-	/* check if the event binding already exists, ignore if so */
-	while(event_binding != NULL) {
-		if (event_binding->type == SWITCH_EVENT_CUSTOM) {
-			if(event_type == SWITCH_EVENT_CUSTOM
-				&& event_name
-				&& event_binding->subclass_name
-				&& !strcasecmp(event_name, event_binding->subclass_name)) {
-					return SWITCH_STATUS_SUCCESS;
-				}
-		} else if (event_binding->type == event_type) {
-			return SWITCH_STATUS_SUCCESS;
-		}
-		event_binding = event_binding->next;
-	}
-
-	/* from the event stream memory pool, allocate the event binding structure */
-	if (!(event_binding = switch_core_alloc(event_stream->pool, sizeof (*event_binding)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of random-access memory, attempting write-only memory\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	/* prepare the event binding struct */
-	event_binding->stream = event_stream;
-	event_binding->type = event_type;
-	if(event_binding->type == SWITCH_EVENT_CUSTOM) {
-		event_binding->subclass_name = switch_core_strdup(event_stream->pool, event_name);
-	} else {
-		event_binding->subclass_name = SWITCH_EVENT_SUBCLASS_ANY;
-	}
-	event_binding->next = NULL;
-
-	bind_event_profile(event_binding, kazoo_globals.events->events);
-
-
-	/* bind to the event with a unique ID and capture the event_node pointer */
-	switch_uuid_str(event_binding->id, sizeof(event_binding->id));
-	if (switch_event_bind_removable(event_binding->id, event_type, event_binding->subclass_name, event_handler, event_binding, &event_binding->node) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to bind to event %s %s!\n"
-						  ,switch_event_name(event_binding->type), event_binding->subclass_name ? event_binding->subclass_name : "");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding event binding %s to stream %p for %s <%d.%d.%d>: %s %s\n"
-					  ,event_binding->id, (void *)event_stream, event_stream->pid.node, event_stream->pid.creation
-					  ,event_stream->pid.num, event_stream->pid.serial, switch_event_name(event_binding->type)
-					  ,event_binding->subclass_name ? event_binding->subclass_name : "");
-
-	/* add the new binding to the list */
-	if (!event_stream->bindings) {
-		event_stream->bindings = event_binding;
-	} else {
-		event_binding->next = event_stream->bindings;
-		event_stream->bindings = event_binding;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t remove_event_binding(ei_event_stream_t *event_stream, const switch_event_types_t event_type, const char *subclass_name) {
-	ei_event_binding_t *event_binding = event_stream->bindings, *prev = NULL;
-	int found = 0;
-
-	/* if there are no bindings then there is nothing to do */
-	if (!event_binding) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	/* try to find the event binding specified */
-	while(event_binding != NULL) {
-		if (event_binding->type == SWITCH_EVENT_CUSTOM
-			&& subclass_name
-			&& event_binding->subclass_name
-			&& !strcmp(subclass_name, event_binding->subclass_name)) {
-			found = 1;
-			break;
-		} else if (event_binding->type == event_type) {
-			found = 1;
-			break;
-		}
-
-		prev = event_binding;
-		event_binding = event_binding->next;
-	}
-
-	if (found) {
-		/* if the event binding exists, unbind from the system */
-		switch_event_unbind(&event_binding->node);
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing event binding %s from %p for %s <%d.%d.%d>: %s %s\n"
-						  ,event_binding->id, (void *)event_stream, event_stream->pid.node, event_stream->pid.creation
-						  ,event_stream->pid.num, event_stream->pid.serial, switch_event_name(event_binding->type)
-						  ,event_binding->subclass_name ? event_binding->subclass_name : "");
-
-		/* remove the event binding from the list */
-		if (!prev) {
-			event_stream->bindings = event_binding->next;
-		} else {
-			prev->next = event_binding->next;
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t remove_event_bindings(ei_event_stream_t *event_stream) {
-	ei_event_binding_t *event_binding = event_stream->bindings;
-
-	/* if there are no bindings then there is nothing to do */
-	if (!event_binding) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	/* try to find the event binding specified */
-	while(event_binding != NULL) {
-		/* if the event binding exists, unbind from the system */
-		switch_event_unbind(&event_binding->node);
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing event binding %s from %p for %s <%d.%d.%d>: %s %s\n"
-						  ,event_binding->id, (void *)event_stream, event_stream->pid.node, event_stream->pid.creation
-						  ,event_stream->pid.num, event_stream->pid.serial, switch_event_name(event_binding->type)
-						  ,event_binding->subclass_name ? event_binding->subclass_name : "");
-
-		event_binding = event_binding->next;
-	}
-
-	event_stream->bindings = NULL;
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_fetch_agent.c b/src/mod/event_handlers/mod_kazoo/kazoo_fetch_agent.c
deleted file mode 100644
index 5023e39344..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_fetch_agent.c
+++ /dev/null
@@ -1,803 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Karl Anderson <karl@2600hz.com>
- * Darren Schreiber <darren@2600hz.com>
- *
- *
- * kazoo_fetch.c -- XML fetch request handler
- *
- */
-#include "mod_kazoo.h"
-
-static const char *fetch_uuid_sources[] = {
-		"Fetch-Call-UUID",
-		"refer-from-channel-id",
-		"sip_call_id",
-		NULL
-};
-
-static char *xml_section_to_string(switch_xml_section_t section) {
-	switch(section) {
-	case SWITCH_XML_SECTION_CONFIG:
-		return "configuration";
-	case SWITCH_XML_SECTION_DIRECTORY:
-		return "directory";
-	case SWITCH_XML_SECTION_DIALPLAN:
-		return "dialplan";
-	case SWITCH_XML_SECTION_CHATPLAN:
-		return "chatplan";
-	case SWITCH_XML_SECTION_CHANNELS:
-		return "channels";
-	case SWITCH_XML_SECTION_LANGUAGES:
-		return "languages";
-	default:
-		return "unknown";
-	}
-}
-
-static char *expand_vars(char *xml_str) {
-	char *var, *val;
-	char *rp = xml_str; /* read pointer */
-	char *ep, *wp, *buff; /* end pointer, write pointer, write buffer */
-
-	if (!(strstr(xml_str, "$${"))) {
-		return xml_str;
-	}
-
-	switch_zmalloc(buff, strlen(xml_str) * 2);
-	wp = buff;
-	ep = buff + (strlen(xml_str) * 2) - 1;
-
-	while (*rp && wp < ep) {
-		if (*rp == '$' && *(rp + 1) == '$' && *(rp + 2) == '{') {
-			char *e = switch_find_end_paren(rp + 2, '{', '}');
-
-			if (e) {
-				rp += 3;
-				var = rp;
-				*e++ = '\0';
-				rp = e;
-
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "trying to expand %s \n", var);
-				if ((val = switch_core_get_variable_dup(var))) {
-					char *p;
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "expanded %s to %s\n", var, val);
-					for (p = val; p && *p && wp <= ep; p++) {
-						*wp++ = *p;
-					}
-					switch_safe_free(val);
-				}
-				continue;
-			}
-		}
-
-		*wp++ = *rp++;
-	}
-
-	*wp++ = '\0';
-
-	switch_safe_free(xml_str);
-	return buff;
-}
-
-static switch_xml_t fetch_handler(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data) {
-	switch_xml_t xml = NULL;
-	switch_uuid_t uuid;
-	switch_time_t now = 0;
-	ei_xml_agent_t *agent = (ei_xml_agent_t *) user_data;
-	ei_xml_client_t *client;
-	fetch_handler_t *fetch_handler;
-	xml_fetch_reply_t reply, *pending, *prev = NULL;
-	switch_event_t *event = params;
-	kazoo_fetch_profile_ptr profile = agent->profile;
-	const char *fetch_call_id;
-	ei_send_msg_t *send_msg = NULL;
-	int sent = 0;
-
-	now = switch_micro_time_now();
-
-	if (!switch_test_flag(&kazoo_globals, LFLAG_RUNNING)) {
-		return xml;
-	}
-
-	/* read-lock the agent */
-	switch_thread_rwlock_rdlock(agent->lock);
-
-	/* serialize access to current, used to round-robin requests */
-	/* TODO: check kazoo_globals for round-robin boolean or loop all clients */
-	switch_mutex_lock(agent->current_client_mutex);
-	if (!agent->current_client) {
-		client = agent->clients;
-	} else {
-		client = agent->current_client;
-	}
-	if (client) {
-		agent->current_client = client->next;
-	}
-	switch_mutex_unlock(agent->current_client_mutex);
-
-	/* no client, no work required */
-	if (!client || !client->fetch_handlers) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "No %s XML erlang handler currently available\n"
-						  ,section);
-		switch_thread_rwlock_unlock(agent->lock);
-		return xml;
-	}
-
-	/* no profile, no work required */
-	if (!profile) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "weird case where client is available but there's no profile for %s. try reloading mod_kazoo.\n"
-						  ,section);
-		switch_thread_rwlock_unlock(agent->lock);
-		return xml;
-	}
-
-	if(event == NULL) {
-		if (switch_event_create(&event, SWITCH_EVENT_GENERAL) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error creating event for fetch handler\n");
-			return xml;
-		}
-	}
-
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Switch-Nodename", kazoo_globals.ei_cnode.thisnodename);
-
-	/* prepare the reply collector */
-	switch_uuid_get(&uuid);
-	switch_uuid_format(reply.uuid_str, &uuid);
-	reply.next = NULL;
-	reply.xml_str = NULL;
-
-	if(switch_event_get_header(event, "Unique-ID") == NULL) {
-		int i;
-		for(i = 0; fetch_uuid_sources[i] != NULL; i++) {
-			if((fetch_call_id = switch_event_get_header(event, fetch_uuid_sources[i])) != NULL) {
-				switch_core_session_t *session = NULL;
-				if((session = switch_core_session_locate(fetch_call_id)) != NULL) {
-					switch_channel_t *channel = switch_core_session_get_channel(session);
-					uint32_t verbose = switch_channel_test_flag(channel, CF_VERBOSE_EVENTS);
-					switch_channel_set_flag(channel, CF_VERBOSE_EVENTS);
-					switch_channel_event_set_data(channel, event);
-					switch_channel_set_flag_value(channel, CF_VERBOSE_EVENTS, verbose);
-					switch_core_session_rwunlock(session);
-					break;
-				}
-			}
-		}
-	}
-
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Fetch-UUID", reply.uuid_str);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Fetch-Section", section);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Fetch-Tag", tag_name);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Fetch-Key-Name", key_name);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Fetch-Key-Value", key_value);
-	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Fetch-Timeout", "%u", profile->fetch_timeout);
-	switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Fetch-Timestamp-Micro", "%" SWITCH_UINT64_T_FMT, (uint64_t)now);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Kazoo-Version", VERSION);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Kazoo-Bundle", BUNDLE);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Kazoo-Release", RELEASE);
-
-	kz_event_decode(event);
-
-	switch_malloc(send_msg, sizeof(*send_msg));
-
-	if(client->ei_node->legacy) {
-		ei_x_new_with_version(&send_msg->buf);
-		ei_x_encode_tuple_header(&send_msg->buf, 7);
-		ei_x_encode_atom(&send_msg->buf, "fetch");
-		ei_x_encode_atom(&send_msg->buf, section);
-		_ei_x_encode_string(&send_msg->buf, tag_name ? tag_name : "undefined");
-		_ei_x_encode_string(&send_msg->buf, key_name ? key_name : "undefined");
-		_ei_x_encode_string(&send_msg->buf, key_value ? key_value : "undefined");
-		_ei_x_encode_string(&send_msg->buf, reply.uuid_str);
-		ei_encode_switch_event_headers(&send_msg->buf, event);
-	} else {
-		kazoo_message_ptr msg = kazoo_message_create_fetch(event, profile);
-		ei_x_new_with_version(&send_msg->buf);
-		ei_x_encode_tuple_header(&send_msg->buf, 2);
-		ei_x_encode_atom(&send_msg->buf, "fetch");
-		ei_encode_json(&send_msg->buf, msg->JObj);
-		kazoo_message_destroy(&msg);
-	}
-
-	/* add our reply placeholder to the replies list */
-	switch_mutex_lock(agent->replies_mutex);
-	if (!agent->replies) {
-		agent->replies = &reply;
-	} else {
-		reply.next = agent->replies;
-		agent->replies = &reply;
-	}
-	switch_mutex_unlock(agent->replies_mutex);
-
-	fetch_handler = client->fetch_handlers;
-	while (fetch_handler != NULL && sent == 0) {
-		memcpy(&send_msg->pid, &fetch_handler->pid, sizeof(erlang_pid));
-		if (switch_queue_trypush(client->ei_node->send_msgs, send_msg) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to send %s XML request to %s <%d.%d.%d>\n"
-							  ,section
-							  ,fetch_handler->pid.node
-							  ,fetch_handler->pid.creation
-							  ,fetch_handler->pid.num
-							  ,fetch_handler->pid.serial);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending %s XML request (%s) to %s <%d.%d.%d>\n"
-							  ,section
-							  ,reply.uuid_str
-							  ,fetch_handler->pid.node
-							  ,fetch_handler->pid.creation
-							  ,fetch_handler->pid.num
-							  ,fetch_handler->pid.serial);
-			sent = 1;
-		}
-		fetch_handler = fetch_handler->next;
-	}
-
-	if(!sent) {
-		ei_x_free(&send_msg->buf);
-		switch_safe_free(send_msg);
-	}
-
-	if(params == NULL)
-		switch_event_destroy(&event);
-
-	/* wait for a reply (if there isnt already one...amazingly improbable but lets not take shortcuts */
-    switch_mutex_lock(agent->replies_mutex);
-
-	switch_thread_rwlock_unlock(agent->lock);
-
-	if (!reply.xml_str) {
-		switch_time_t timeout;
-
-		timeout = switch_micro_time_now() + 3000000;
-		while (switch_micro_time_now() < timeout) {
-			/* unlock the replies list and go to sleep, calculate a three second timeout before we started the loop
-			 * plus 100ms to add a little hysteresis between the timeout and the while loop */
-			switch_thread_cond_timedwait(agent->new_reply, agent->replies_mutex, (timeout - switch_micro_time_now() + 100000));
-
-			/* if we woke up (and therefore have locked replies again) check if we got our reply
-			 * otherwise we either timed-out (the while condition will fail) or one of
-			 * our sibling processes got a reply and we should go back to sleep */
-			if (reply.xml_str) {
-				break;
-			}
-		}
-	}
-
-	/* find our reply placeholder in the linked list and remove it */
-	pending = agent->replies;
-	while (pending != NULL) {
-		if (pending->uuid_str == reply.uuid_str) {
-			break;
-		}
-
-		prev = pending;
-		pending = pending->next;
-	}
-
-	if (pending) {
-		if (!prev) {
-			agent->replies = reply.next;
-		} else {
-			prev->next = reply.next;
-		}
-	}
-
-	/* we are done with the replies link-list */
-	switch_mutex_unlock(agent->replies_mutex);
-
-	/* after all that did we get what we were after?! */
-	if (reply.xml_str) {
-		/* HELL YA WE DID */
-		if (kazoo_globals.expand_headers_on_fetch) {
-			reply.xml_str = expand_vars(reply.xml_str);
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received %s XML (%s) after %dms: %s\n"
-						  ,section
-						  ,reply.uuid_str
-						  ,(unsigned int) (switch_micro_time_now() - now) / 1000
-						  ,reply.xml_str);
-		if ((xml = switch_xml_parse_str_dynamic(reply.xml_str, SWITCH_FALSE)) == NULL) {
-			switch_safe_free(reply.xml_str);
-		}
-	} else {
-		/* facepalm */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Request for %s XML (%s) timed-out after %dms\n"
-						  ,section
-						  ,reply.uuid_str
-						  ,(unsigned int) (switch_micro_time_now() - now) / 1000);
-	}
-
-	return xml;
-}
-
-void bind_fetch_profile(ei_xml_agent_t *agent, kazoo_config_ptr fetch_handlers)
-{
-	switch_hash_index_t *hi;
-	kazoo_fetch_profile_ptr val = NULL, ptr = NULL;
-
-	if (!fetch_handlers) return;
-
-	for (hi = switch_core_hash_first(fetch_handlers->hash); hi; hi = switch_core_hash_next(&hi)) {
-		switch_core_hash_this(hi, NULL, NULL, (void**) &val);
-		if (val && val->section == agent->section) {
-			ptr = val;
-			break;
-		}
-	}
-	agent->profile = ptr;
-	switch_safe_free(hi);
-}
-
-void rebind_fetch_profiles(kazoo_config_ptr fetch_handlers)
-{
-	if(kazoo_globals.config_fetch_binding != NULL)
-		bind_fetch_profile((ei_xml_agent_t *) switch_xml_get_binding_user_data(kazoo_globals.config_fetch_binding), fetch_handlers);
-
-	if(kazoo_globals.directory_fetch_binding != NULL)
-		bind_fetch_profile((ei_xml_agent_t *) switch_xml_get_binding_user_data(kazoo_globals.directory_fetch_binding), fetch_handlers);
-
-	if(kazoo_globals.dialplan_fetch_binding != NULL)
-		bind_fetch_profile((ei_xml_agent_t *) switch_xml_get_binding_user_data(kazoo_globals.dialplan_fetch_binding), fetch_handlers);
-
-	if(kazoo_globals.channels_fetch_binding != NULL)
-		bind_fetch_profile((ei_xml_agent_t *) switch_xml_get_binding_user_data(kazoo_globals.channels_fetch_binding), fetch_handlers);
-
-	if(kazoo_globals.languages_fetch_binding != NULL)
-		bind_fetch_profile((ei_xml_agent_t *) switch_xml_get_binding_user_data(kazoo_globals.languages_fetch_binding), fetch_handlers);
-
-	if(kazoo_globals.chatplan_fetch_binding != NULL)
-		bind_fetch_profile((ei_xml_agent_t *) switch_xml_get_binding_user_data(kazoo_globals.chatplan_fetch_binding), fetch_handlers);
-}
-
-static switch_status_t bind_fetch_agent(switch_xml_section_t section, switch_xml_binding_t **binding) {
-	switch_memory_pool_t *pool = NULL;
-	ei_xml_agent_t *agent;
-
-	/* create memory pool for this xml search binging (lives for duration of mod_kazoo runtime) */
-	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory: They're not people; they're hippies!\n");
-		return SWITCH_STATUS_MEMERR;
-	}
-
-	/* allocate some memory to store the fetch bindings for this section */
-    if (!(agent = switch_core_alloc(pool, sizeof (*agent)))) {
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory: Oh, Jesus tap-dancing Christ!\n");
-        return SWITCH_STATUS_MEMERR;
-    }
-
-	/* try to bind to the switch */
-	if (switch_xml_bind_search_function_ret(fetch_handler, section, agent, binding) != SWITCH_STATUS_SUCCESS) {
-		switch_core_destroy_memory_pool(&pool);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not bind to FreeSWITCH %s XML requests\n"
-						  ,xml_section_to_string(section));
-		return SWITCH_STATUS_GENERR;
-	}
-
-	agent->pool = pool;
-	agent->section = section;
-	switch_thread_rwlock_create(&agent->lock, pool);
-	agent->clients = NULL;
-	switch_mutex_init(&agent->current_client_mutex, SWITCH_MUTEX_DEFAULT, pool);
-	agent->current_client = NULL;
-	switch_mutex_init(&agent->replies_mutex, SWITCH_MUTEX_DEFAULT, pool);
-	switch_thread_cond_create(&agent->new_reply, pool);
-	agent->replies = NULL;
-
-	bind_fetch_profile(agent, kazoo_globals.fetch_handlers);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bound to %s XML requests\n"
-					  ,xml_section_to_string(section));
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t unbind_fetch_agent(switch_xml_binding_t **binding) {
-	ei_xml_agent_t *agent;
-	ei_xml_client_t *client;
-
-	if(*binding == NULL)
-		return SWITCH_STATUS_GENERR;
-
-	/* get a pointer to our user_data */
-	agent = (ei_xml_agent_t *)switch_xml_get_binding_user_data(*binding);
-
-	/* unbind from the switch */
-	switch_xml_unbind_search_function(binding);
-
-	/* LOCK ALL THE THINGS */
-	switch_thread_rwlock_wrlock(agent->lock);
-	switch_mutex_lock(agent->current_client_mutex);
-	switch_mutex_lock(agent->replies_mutex);
-
-	/* cleanly destroy each client */
-	client = agent->clients;
-	while(client != NULL) {
-		ei_xml_client_t *tmp_client = client;
-		fetch_handler_t *fetch_handler;
-
-		fetch_handler = client->fetch_handlers;
-		while(fetch_handler != NULL) {
-			fetch_handler_t *tmp_fetch_handler = fetch_handler;
-
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removed %s XML handler %s <%d.%d.%d>\n"
-							  ,xml_section_to_string(agent->section)
-							  ,fetch_handler->pid.node
-							  ,fetch_handler->pid.creation
-							  ,fetch_handler->pid.num
-							  ,fetch_handler->pid.serial);
-
-			fetch_handler = fetch_handler->next;
-			switch_safe_free(tmp_fetch_handler);
-		}
-
-		client = client->next;
-		switch_safe_free(tmp_client);
-	}
-
-	/* keep the pointers clean, even if its just for a moment */
-	agent->clients = NULL;
-	agent->current_client = NULL;
-
-	/* release the locks! */
-	switch_thread_rwlock_unlock(agent->lock);
-	switch_mutex_unlock(agent->current_client_mutex);
-	switch_mutex_unlock(agent->replies_mutex);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Unbound from %s XML requests\n"
-					  ,xml_section_to_string(agent->section));
-
-	/* cleanly destroy the bindings */
-	switch_thread_rwlock_destroy(agent->lock);
-	switch_mutex_destroy(agent->current_client_mutex);
-	switch_mutex_destroy(agent->replies_mutex);
-	switch_thread_cond_destroy(agent->new_reply);
-	switch_core_destroy_memory_pool(&agent->pool);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t remove_xml_client(ei_node_t *ei_node, switch_xml_binding_t *binding) {
-	ei_xml_agent_t *agent;
-	ei_xml_client_t *client, *prev = NULL;
-	int found = 0;
-
-	if(binding == NULL)
-		return SWITCH_STATUS_GENERR;
-
-	agent = (ei_xml_agent_t *)switch_xml_get_binding_user_data(binding);
-
-	/* write-lock the agent */
-	switch_thread_rwlock_wrlock(agent->lock);
-
-	client = agent->clients;
-	while (client != NULL) {
-		if (client->ei_node == ei_node) {
-			found = 1;
-			break;
-		}
-
-		prev = client;
-		client = client->next;
-	}
-
-	if (found) {
-		fetch_handler_t *fetch_handler;
-
-		if (!prev) {
-			agent->clients = client->next;
-		} else {
-			prev->next = client->next;
-		}
-
-		/* the mutex lock is not required since we have the write lock
-		 * but hey its fun and safe so do it anyway */
-		switch_mutex_lock(agent->current_client_mutex);
-		if (agent->current_client == client) {
-			agent->current_client = agent->clients;
-		}
-		switch_mutex_unlock(agent->current_client_mutex);
-
-		fetch_handler = client->fetch_handlers;
-		while(fetch_handler != NULL) {
-			fetch_handler_t *tmp_fetch_handler = fetch_handler;
-
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removed %s XML handler %s <%d.%d.%d>\n"
-							  ,xml_section_to_string(agent->section)
-							  ,fetch_handler->pid.node
-							  ,fetch_handler->pid.creation
-							  ,fetch_handler->pid.num
-							  ,fetch_handler->pid.serial);
-
-			fetch_handler = fetch_handler->next;
-			switch_safe_free(tmp_fetch_handler);
-		}
-
-		switch_safe_free(client);
-	}
-
-	switch_thread_rwlock_unlock(agent->lock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static ei_xml_client_t *add_xml_client(ei_node_t *ei_node, ei_xml_agent_t *agent) {
-    ei_xml_client_t *client;
-
-	switch_malloc(client, sizeof(*client));
-
-	client->ei_node = ei_node;
-	client->fetch_handlers = NULL;
-	client->next = NULL;
-
-	if (agent->clients) {
-		client->next = agent->clients;
-	}
-
-	agent->clients = client;
-
-	return client;
-}
-
-static ei_xml_client_t *find_xml_client(ei_node_t *ei_node, ei_xml_agent_t *agent) {
-    ei_xml_client_t *client;
-
-	client = agent->clients;
-	while (client != NULL) {
-		if (client->ei_node == ei_node) {
-			return client;
-		}
-
-		client = client->next;
-	}
-
-	return NULL;
-}
-
-static switch_status_t remove_fetch_handler(ei_node_t *ei_node, erlang_pid *from, switch_xml_binding_t *binding) {
-	ei_xml_agent_t *agent;
-	ei_xml_client_t *client;
-	fetch_handler_t *fetch_handler, *prev = NULL;
-	int found = 0;
-
-	agent = (ei_xml_agent_t *)switch_xml_get_binding_user_data(binding);
-
-    /* write-lock the agent */
-    switch_thread_rwlock_wrlock(agent->lock);
-
-	if (!(client = find_xml_client(ei_node, agent))) {
-		switch_thread_rwlock_unlock(agent->lock);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	fetch_handler = client->fetch_handlers;
-	while (fetch_handler != NULL) {
-		if (ei_compare_pids(&fetch_handler->pid, from) == SWITCH_STATUS_SUCCESS) {
-			found = 1;
-			break;
-		}
-
-		prev = fetch_handler;
-		fetch_handler = fetch_handler->next;
-	}
-
-	if (found) {
-		if (!prev) {
-			client->fetch_handlers = fetch_handler->next;
-		} else {
-			prev->next = fetch_handler->next;
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removed %s XML handler %s <%d.%d.%d>\n"
-						  ,xml_section_to_string(agent->section)
-						  ,fetch_handler->pid.node
-						  ,fetch_handler->pid.creation
-						  ,fetch_handler->pid.num
-						  ,fetch_handler->pid.serial);
-
-		switch_safe_free(fetch_handler);
-	}
-
-	switch_thread_rwlock_unlock(agent->lock);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_api_command_stream(ei_node_t *ei_node, switch_stream_handle_t *stream, switch_xml_binding_t *binding) {
-	ei_xml_agent_t *agent;
-    ei_xml_client_t *client;
-
-	if (!binding) {
-		return SWITCH_STATUS_GENERR;
-	}
-
-	agent = (ei_xml_agent_t *)switch_xml_get_binding_user_data(binding);
-
-	/* read-lock the agent */
-	switch_thread_rwlock_rdlock(agent->lock);
-	client = agent->clients;
-	while (client != NULL) {
-		if (client->ei_node == ei_node) {
-			fetch_handler_t *fetch_handler;
-			fetch_handler = client->fetch_handlers;
-			while (fetch_handler != NULL) {
-				stream->write_function(stream, "XML %s handler <%d.%d.%d>\n"
-									   ,xml_section_to_string(agent->section)
-									   ,fetch_handler->pid.creation
-									   ,fetch_handler->pid.num
-									   ,fetch_handler->pid.serial);
-				fetch_handler = fetch_handler->next;
-			}
-			break;
-		}
-
-		client = client->next;
-	}
-	switch_thread_rwlock_unlock(agent->lock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t bind_fetch_agents() {
-	bind_fetch_agent(SWITCH_XML_SECTION_CONFIG, &kazoo_globals.config_fetch_binding);
-	bind_fetch_agent(SWITCH_XML_SECTION_DIRECTORY, &kazoo_globals.directory_fetch_binding);
-	bind_fetch_agent(SWITCH_XML_SECTION_DIALPLAN, &kazoo_globals.dialplan_fetch_binding);
-	bind_fetch_agent(SWITCH_XML_SECTION_CHANNELS, &kazoo_globals.channels_fetch_binding);
-	bind_fetch_agent(SWITCH_XML_SECTION_LANGUAGES, &kazoo_globals.languages_fetch_binding);
-	bind_fetch_agent(SWITCH_XML_SECTION_CHATPLAN, &kazoo_globals.chatplan_fetch_binding);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t unbind_fetch_agents() {
-	unbind_fetch_agent(&kazoo_globals.config_fetch_binding);
-	unbind_fetch_agent(&kazoo_globals.directory_fetch_binding);
-	unbind_fetch_agent(&kazoo_globals.dialplan_fetch_binding);
-	unbind_fetch_agent(&kazoo_globals.channels_fetch_binding);
-	unbind_fetch_agent(&kazoo_globals.languages_fetch_binding);
-	unbind_fetch_agent(&kazoo_globals.chatplan_fetch_binding);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t remove_xml_clients(ei_node_t *ei_node) {
-	remove_xml_client(ei_node, kazoo_globals.config_fetch_binding);
-	remove_xml_client(ei_node, kazoo_globals.directory_fetch_binding);
-	remove_xml_client(ei_node, kazoo_globals.dialplan_fetch_binding);
-	remove_xml_client(ei_node, kazoo_globals.channels_fetch_binding);
-	remove_xml_client(ei_node, kazoo_globals.languages_fetch_binding);
-	remove_xml_client(ei_node, kazoo_globals.chatplan_fetch_binding);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t add_fetch_handler(ei_node_t *ei_node, erlang_pid *from, switch_xml_binding_t *binding) {
-	ei_xml_agent_t *agent;
-	ei_xml_client_t *client;
-	fetch_handler_t *fetch_handler;
-
-	if(binding == NULL)
-		return SWITCH_STATUS_GENERR;
-
-	agent = (ei_xml_agent_t *)switch_xml_get_binding_user_data(binding);
-
-    /* write-lock the agent */
-    switch_thread_rwlock_wrlock(agent->lock);
-
-	if (!(client = find_xml_client(ei_node, agent))) {
-		client = add_xml_client(ei_node, agent);
-	}
-
-	fetch_handler = client->fetch_handlers;
-    while (fetch_handler != NULL) {
-		if (ei_compare_pids(&fetch_handler->pid, from) == SWITCH_STATUS_SUCCESS) {
-			switch_thread_rwlock_unlock(agent->lock);
-            return SWITCH_STATUS_SUCCESS;
-        }
-        fetch_handler = fetch_handler->next;
-    }
-
-	switch_malloc(fetch_handler, sizeof(*fetch_handler));
-
-	memcpy(&fetch_handler->pid, from, sizeof(erlang_pid));;
-
-	fetch_handler->next = NULL;
-	if (client->fetch_handlers) {
-		fetch_handler->next = client->fetch_handlers;
-	}
-
-	client->fetch_handlers = fetch_handler;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Added %s XML handler %s <%d.%d.%d>\n"
-					  ,xml_section_to_string(agent->section)
-					  ,fetch_handler->pid.node
-					  ,fetch_handler->pid.creation
-					  ,fetch_handler->pid.num
-					  ,fetch_handler->pid.serial);
-
-	switch_thread_rwlock_unlock(agent->lock);
-
-	ei_link(ei_node, ei_self(&kazoo_globals.ei_cnode), from);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t remove_fetch_handlers(ei_node_t *ei_node, erlang_pid *from) {
-	remove_fetch_handler(ei_node, from, kazoo_globals.config_fetch_binding);
-	remove_fetch_handler(ei_node, from, kazoo_globals.directory_fetch_binding);
-	remove_fetch_handler(ei_node, from, kazoo_globals.dialplan_fetch_binding);
-	remove_fetch_handler(ei_node, from, kazoo_globals.channels_fetch_binding);
-	remove_fetch_handler(ei_node, from, kazoo_globals.languages_fetch_binding);
-	remove_fetch_handler(ei_node, from, kazoo_globals.chatplan_fetch_binding);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t fetch_reply(char *uuid_str, char *xml_str, switch_xml_binding_t *binding) {
-	ei_xml_agent_t *agent;
-	xml_fetch_reply_t *reply;
-	switch_status_t status = SWITCH_STATUS_NOTFOUND;
-
-	agent = (ei_xml_agent_t *)switch_xml_get_binding_user_data(binding);
-
-    switch_mutex_lock(agent->replies_mutex);
-	reply = agent->replies;
-	while (reply != NULL) {
-		if (!strncmp(reply->uuid_str, uuid_str, SWITCH_UUID_FORMATTED_LENGTH)) {
-			if (!reply->xml_str) {
-				reply->xml_str = xml_str;
-				switch_thread_cond_broadcast(agent->new_reply);
-				status = SWITCH_STATUS_SUCCESS;
-			}
-			break;
-		}
-
-		reply = reply->next;
-	}
-    switch_mutex_unlock(agent->replies_mutex);
-
-	return status;
-}
-
-switch_status_t handle_api_command_streams(ei_node_t *ei_node, switch_stream_handle_t *stream) {
-	handle_api_command_stream(ei_node, stream, kazoo_globals.config_fetch_binding);
-	handle_api_command_stream(ei_node, stream, kazoo_globals.directory_fetch_binding);
-	handle_api_command_stream(ei_node, stream, kazoo_globals.dialplan_fetch_binding);
-	handle_api_command_stream(ei_node, stream, kazoo_globals.channels_fetch_binding);
-	handle_api_command_stream(ei_node, stream, kazoo_globals.languages_fetch_binding);
-	handle_api_command_stream(ei_node, stream, kazoo_globals.chatplan_fetch_binding);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_fields.h b/src/mod/event_handlers/mod_kazoo/kazoo_fields.h
deleted file mode 100644
index 8d17378768..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_fields.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-* Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
-*
-* Version: MPL 1.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-*
-* The Initial Developer of the Original Code is
-* Anthony Minessale II <anthm@freeswitch.org>
-* Portions created by the Initial Developer are Copyright (C)
-* the Initial Developer. All Rights Reserved.
-*
-* Based on mod_skel by
-* Anthony Minessale II <anthm@freeswitch.org>
-*
-* Contributor(s):
-*
-* Daniel Bryars <danb@aeriandi.com>
-* Tim Brown <tim.brown@aeriandi.com>
-* Anthony Minessale II <anthm@freeswitch.org>
-* William King <william.king@quentustech.com>
-* Mike Jerris <mike@jerris.com>
-*
-* kazoo.c -- Sends FreeSWITCH events to an AMQP broker
-*
-*/
-
-#ifndef KAZOO_FIELDS_H
-#define KAZOO_FIELDS_H
-
-#include <switch.h>
-
-#define MAX_LIST_FIELDS 25
-
-typedef struct kazoo_log_levels kazoo_loglevels_t;
-typedef kazoo_loglevels_t *kazoo_loglevels_ptr;
-
-struct kazoo_log_levels
-{
-	switch_log_level_t success_log_level;
-	switch_log_level_t failed_log_level;
-	switch_log_level_t warn_log_level;
-	switch_log_level_t info_log_level;
-	switch_log_level_t time_log_level;
-	switch_log_level_t filtered_event_log_level;
-	switch_log_level_t filtered_field_log_level;
-	switch_log_level_t trace_log_level;
-	switch_log_level_t debug_log_level;
-	switch_log_level_t error_log_level;
-	switch_log_level_t hashing_log_level;
-
-};
-
-typedef struct kazoo_logging kazoo_logging_t;
-typedef kazoo_logging_t *kazoo_logging_ptr;
-
-struct kazoo_logging
-{
-	kazoo_loglevels_ptr levels;
-	const char *profile_name;
-	const char *event_name;
-};
-
-typedef struct kazoo_list_s {
-  char *value[MAX_LIST_FIELDS];
-  int size;
-} kazoo_list_t;
-
-typedef enum {
-	FILTER_COMPARE_REGEX,
-	FILTER_COMPARE_LIST,
-	FILTER_COMPARE_VALUE,
-	FILTER_COMPARE_PREFIX,
-	FILTER_COMPARE_EXISTS,
-	FILTER_COMPARE_FIELD
-
-} kazoo_filter_compare_type;
-
-typedef enum {
-	FILTER_EXCLUDE,
-	FILTER_INCLUDE,
-	FILTER_ENSURE
-} kazoo_filter_type;
-
-typedef struct kazoo_filter_t {
-	kazoo_filter_type type;
-	kazoo_filter_compare_type compare;
-	char* name;
-	char* value;
-	kazoo_list_t list;
-	struct kazoo_filter_t* next;
-} kazoo_filter, *kazoo_filter_ptr;
-
-
-typedef enum {
-	JSON_NONE,
-	JSON_STRING,
-	JSON_NUMBER,
-	JSON_BOOLEAN,
-	JSON_OBJECT,
-	JSON_RAW
-} kazoo_json_field_type;
-
-typedef enum {
-	FIELD_NONE,
-	FIELD_COPY,
-	FIELD_STATIC,
-	FIELD_FIRST_OF,
-	FIELD_EXPAND,
-	FIELD_PREFIX,
-	FIELD_OBJECT,
-	FIELD_GROUP,
-	FIELD_REFERENCE
-
-} kazoo_field_type;
-
-typedef struct kazoo_field_t kazoo_field;
-typedef kazoo_field *kazoo_field_ptr;
-
-typedef struct kazoo_fields_t kazoo_fields;
-typedef kazoo_fields *kazoo_fields_ptr;
-
-typedef struct kazoo_definition_t kazoo_definition;
-typedef kazoo_definition *kazoo_definition_ptr;
-
-struct kazoo_field_t {
-	char* name;
-	char* value;
-	char* as;
-	kazoo_list_t list;
-	switch_bool_t exclude_prefix;
-	kazoo_field_type in_type;
-	kazoo_json_field_type out_type;
-	int out_type_as_array;
-	kazoo_filter_ptr filter;
-
-	kazoo_definition_ptr ref;
-	kazoo_field_ptr next;
-	kazoo_fields_ptr children;
-};
-
-struct kazoo_fields_t {
-	kazoo_field_ptr head;
-	int verbose;
-};
-
-
-struct kazoo_definition_t {
-	char* name;
-	kazoo_field_ptr head;
-	kazoo_filter_ptr filter;
-};
-
-struct kazoo_event {
-	kazoo_event_profile_ptr profile;
-	char *name;
-	kazoo_fields_ptr fields;
-	kazoo_filter_ptr filter;
-	kazoo_loglevels_ptr logging;
-
-	kazoo_event_t* next;
-};
-
-struct kazoo_event_profile {
-	char *name;
-	kazoo_config_ptr root;
-	switch_bool_t running;
-	switch_memory_pool_t *pool;
-	kazoo_filter_ptr filter;
-	kazoo_fields_ptr fields;
-	kazoo_event_ptr events;
-
-	kazoo_loglevels_ptr logging;
-};
-
-struct kazoo_fetch_profile {
-	char *name;
-	kazoo_config_ptr root;
-	switch_bool_t running;
-	switch_memory_pool_t *pool;
-	kazoo_fields_ptr fields;
-	int fetch_timeout;
-	switch_mutex_t *fetch_reply_mutex;
-	switch_hash_t *fetch_reply_hash;
-	switch_xml_binding_t *fetch_binding;
-	switch_xml_section_t section;
-
-	kazoo_loglevels_ptr logging;
-};
-
-#endif /* KAZOO_FIELDS_H */
-
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_message.c b/src/mod/event_handlers/mod_kazoo/kazoo_message.c
deleted file mode 100644
index e43d656b4c..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_message.c
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
-* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-* Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
-*
-* Version: MPL 1.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-*
-* The Initial Developer of the Original Code is
-* Anthony Minessale II <anthm@freeswitch.org>
-* Portions created by the Initial Developer are Copyright (C)
-* the Initial Developer. All Rights Reserved.
-*
-* Based on mod_skel by
-* Anthony Minessale II <anthm@freeswitch.org>
-*
-* Contributor(s):
-*
-* Daniel Bryars <danb@aeriandi.com>
-* Tim Brown <tim.brown@aeriandi.com>
-* Anthony Minessale II <anthm@freeswitch.org>
-* William King <william.king@quentustech.com>
-* Mike Jerris <mike@jerris.com>
-*
-* kazoo.c -- Sends FreeSWITCH events to an AMQP broker
-*
-*/
-
-#include "mod_kazoo.h"
-
-/* deletes then add */
-void kazoo_cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item)
-{
-	cJSON_DeleteItemFromObject(object, string);
-	cJSON_AddItemToObject(object, string, item);
-}
-
-static int inline filter_compare(switch_event_t* evt, kazoo_filter_ptr filter, kazoo_logging_ptr logging)
-{
-	switch_event_header_t *header;
-	int hasValue = 0, n;
-	char *value = NULL, *expr = NULL;
-
-	switch(filter->compare) {
-
-	case FILTER_COMPARE_EXISTS:
-		hasValue = switch_event_get_header(evt, filter->name) != NULL ? 1 : 0;
-		switch_log_printf(SWITCH_CHANNEL_LOG, logging->levels->trace_log_level, "profile[%s] event %s checking if %s exists => %s\n", logging->profile_name, logging->event_name, filter->name, hasValue ? "true" : "false");
-		break;
-
-	case FILTER_COMPARE_VALUE:
-		if (*filter->name == '$') {
-			value = expr = kz_event_expand_headers(evt, filter->name);
-		} else {
-			value = switch_event_get_header(evt, filter->name);
-		}
-		hasValue = value ? !strcmp(value, filter->value) : 0;
-		switch_log_printf(SWITCH_CHANNEL_LOG, logging->levels->trace_log_level, "profile[%s] event %s compare value %s to %s => %s == %s => %s\n", logging->profile_name, logging->event_name, filter->name, filter->value, value, filter->value, hasValue ? "true" : "false");
-		break;
-
-	case FILTER_COMPARE_FIELD:
-		if (*filter->name == '$') {
-			value = expr = kz_event_expand_headers(evt, filter->name);
-		} else {
-			value = switch_event_get_header(evt, filter->name);
-		}
-		hasValue = value ? !strcmp(value, switch_event_get_header_nil(evt, filter->value)) : 0;
-		switch_log_printf(SWITCH_CHANNEL_LOG, logging->levels->trace_log_level, "profile[%s] event %s compare field %s to %s => %s == %s => %s\n", logging->profile_name, logging->event_name, filter->name, filter->value, value, switch_event_get_header_nil(evt, filter->value), hasValue ? "true" : "false");
-		break;
-
-	case FILTER_COMPARE_PREFIX:
-		for (header = evt->headers; header; header = header->next) {
-			if(!strncmp(header->name, filter->value, strlen(filter->value))) {
-				hasValue = 1;
-				break;
-			}
-		}
-		break;
-
-	case FILTER_COMPARE_LIST:
-		if (*filter->name == '$') {
-			value = expr = kz_event_expand_headers(evt, filter->name);
-		} else {
-			value = switch_event_get_header(evt, filter->name);
-		}
-		if(value) {
-			for(n = 0; n < filter->list.size; n++) {
-				if(!strncmp(value, filter->list.value[n], strlen(filter->list.value[n]))) {
-					hasValue = 1;
-					break;
-				}
-			}
-		}
-		break;
-
-	case FILTER_COMPARE_REGEX:
-		break;
-
-	default:
-		break;
-	}
-
-	switch_safe_free(expr);
-
-	return hasValue;
-}
-
-static kazoo_filter_ptr inline filter_event(switch_event_t* evt, kazoo_filter_ptr filter, kazoo_logging_ptr logging)
-{
-	while(filter) {
-		int hasValue = filter_compare(evt, filter, logging);
-		if(filter->type == FILTER_EXCLUDE) {
-			if(hasValue)
-				break;
-		} else if(filter->type == FILTER_INCLUDE) {
-			if(!hasValue)
-				break;
-		}
-		filter = filter->next;
-	}
-	return filter;
-}
-
-static void kazoo_event_init_json_fields(switch_event_t *event, cJSON *json)
-{
-	switch_event_header_t *hp;
-	for (hp = event->headers; hp; hp = hp->next) {
-		if (strncmp(hp->name, "_json_", 6)) {
-			if (hp->idx) {
-				cJSON *a = cJSON_CreateArray();
-				int i;
-
-				for(i = 0; i < hp->idx; i++) {
-					cJSON_AddItemToArray(a, cJSON_CreateString(hp->array[i]));
-				}
-
-				cJSON_AddItemToObject(json, hp->name, a);
-
-			} else {
-				cJSON_AddItemToObject(json, hp->name, cJSON_CreateString(hp->value));
-			}
-		}
-	}
-}
-
-static switch_status_t kazoo_event_init_json(kazoo_fields_ptr fields1, kazoo_fields_ptr fields2, switch_event_t* evt, cJSON** clone)
-{
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	if( (fields2 && fields2->verbose)
-			|| (fields1 && fields1->verbose)
-			|| ( (!fields2) &&  (!fields1)) ) {
-		*clone = cJSON_CreateObject();
-		if((*clone) == NULL) {
-			status = SWITCH_STATUS_GENERR;
-		} else {
-			kazoo_event_init_json_fields(evt, *clone);
-		}
-	} else {
-		*clone = cJSON_CreateObject();
-		if((*clone) == NULL) {
-			status = SWITCH_STATUS_GENERR;
-		}
-	}
-	return status;
-}
-
-static cJSON * kazoo_event_json_value(kazoo_json_field_type type, const char *value) {
-	cJSON *item = NULL;
-	switch(type) {
-	case JSON_STRING:
-		item = cJSON_CreateString(value);
-		break;
-
-	case JSON_NUMBER:
-		item = cJSON_CreateNumber(strtod(value, NULL));
-		break;
-
-	case JSON_BOOLEAN:
-		item = cJSON_CreateBool(switch_true(value));
-		break;
-
-	case JSON_OBJECT:
-		item = cJSON_CreateObject();
-		break;
-
-	case JSON_RAW:
-		item = cJSON_Parse(value);
-		if (!item) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "parse from raw error!\n");
-			item = cJSON_CreateRaw(value);
-		}
-		break;
-
-	default:
-		break;
-	};
-
-	return item;
-}
-
-static cJSON * kazoo_event_add_json_value(cJSON *dst, kazoo_field_ptr field, const char *as, const char *value) {
-	cJSON *item = NULL;
-	if(value || field->out_type == JSON_OBJECT) {
-		if((item = kazoo_event_json_value(field->out_type, value)) != NULL) {
-			kazoo_cJSON_AddItemToObject(dst, as, item);
-		}
-	}
-	return item;
-}
-
-
-cJSON * kazoo_event_add_field_to_json(cJSON *dst, switch_event_t *src, kazoo_field_ptr field)
-{
-	switch_event_header_t *header;
-	char *expanded;
-	int i, n;
-	cJSON *item = NULL;
-
-	switch(field->in_type) {
-		case FIELD_COPY:
-			if (!strcmp(field->name, "_body")) {
-				item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, src->body);
-			} else if((header = switch_event_get_header_ptr(src, field->name)) != NULL) {
-				if (header->idx) {
-					item = cJSON_CreateArray();
-					for(i = 0; i < header->idx; i++) {
-						cJSON_AddItemToArray(item, kazoo_event_json_value(field->out_type, header->array[i]));
-					}
-					kazoo_cJSON_AddItemToObject(dst, field->as ? field->as : field->name, item);
-				} else if (field->out_type_as_array) {
-					item = cJSON_CreateArray();
-					cJSON_AddItemToArray(item, kazoo_event_json_value(field->out_type, header->value));
-					kazoo_cJSON_AddItemToObject(dst, field->as ? field->as : field->name, item);
-				} else {
-					item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, header->value);
-				}
-			}
-			break;
-
-		case FIELD_EXPAND:
-			expanded = kz_event_expand_headers(src, field->value);
-			if(expanded != NULL && !zstr(expanded)) {
-				item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, expanded);
-				if(expanded != field->value) {
-					free(expanded);
-				}
-			}
-			break;
-
-		case FIELD_FIRST_OF:
-			for(n = 0; n < field->list.size; n++) {
-				if(*field->list.value[n] == '#') {
-					item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, ++field->list.value[n]);
-					break;
-				} else {
-					header = switch_event_get_header_ptr(src, field->list.value[n]);
-					if(header) {
-						if (header->idx) {
-							item = cJSON_CreateArray();
-							for(i = 0; i < header->idx; i++) {
-								cJSON_AddItemToArray(item, kazoo_event_json_value(field->out_type, header->array[i]));
-							}
-							kazoo_cJSON_AddItemToObject(dst, field->as ? field->as : field->name, item);
-						} else {
-							item = kazoo_event_add_json_value(dst, field, field->as ? field->as : field->name, header->value);
-						}
-						break;
-					}
-				}
-			}
-			break;
-
-		case FIELD_PREFIX:
-			for (header = src->headers; header; header = header->next) {
-				if(!strncmp(header->name, field->name, strlen(field->name))) {
-					if (header->idx) {
-						cJSON *array = cJSON_CreateArray();
-						for(i = 0; i < header->idx; i++) {
-							cJSON_AddItemToArray(array, kazoo_event_json_value(field->out_type, header->array[i]));
-						}
-						kazoo_cJSON_AddItemToObject(dst, field->exclude_prefix ? header->name+strlen(field->name) : header->name, array);
-					} else {
-						kazoo_event_add_json_value(dst, field, field->exclude_prefix ? header->name+strlen(field->name) : header->name, header->value);
-					}
-				}
-			}
-			break;
-
-		case FIELD_STATIC:
-			item = kazoo_event_add_json_value(dst, field, field->name, field->value);
-			break;
-
-		case FIELD_GROUP:
-			item = dst;
-			break;
-
-		default:
-			break;
-	}
-
-    return item;
-}
-
-static switch_status_t kazoo_event_add_fields_to_json(kazoo_logging_ptr logging, cJSON *dst, switch_event_t *src, kazoo_field_ptr field) {
-
-	kazoo_filter_ptr filter;
-	cJSON *item = NULL;
-	while(field) {
-		if(field->in_type == FIELD_REFERENCE) {
-			if(field->ref) {
-				if((filter = filter_event(src, field->ref->filter, logging)) != NULL) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, logging->levels->filtered_field_log_level, "profile[%s] event %s, referenced field %s filtered by settings %s : %s\n", logging->profile_name, logging->event_name, field->ref->name, filter->name, filter->value);
-				} else {
-					kazoo_event_add_fields_to_json(logging, dst, src, field->ref->head);
-				}
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "profile[%s] event %s, referenced field %s not found\n", logging->profile_name, logging->event_name, field->name);
-			}
-		} else {
-			if((filter = filter_event(src, field->filter, logging)) != NULL) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, logging->levels->filtered_field_log_level, "profile[%s] event %s, field %s filtered by settings %s : %s\n", logging->profile_name, logging->event_name, field->name, filter->name, filter->value);
-			} else {
-				item = kazoo_event_add_field_to_json(dst, src, field);
-				if(field->children && item != NULL) {
-					if(field->children->verbose && field->out_type == JSON_OBJECT) {
-						kazoo_event_init_json_fields(src, item);
-					}
-					kazoo_event_add_fields_to_json(logging, field->out_type == JSON_OBJECT ? item : dst, src, field->children->head);
-				}
-			}
-		}
-
-		field = field->next;
-	}
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-#define EVENT_TIMESTAMP_FIELD "Event-Date-Timestamp"
-#define JSON_TIMESTAMP_FIELD "Event-Timestamp"
-
-static switch_status_t kazoo_event_add_timestamp(switch_event_t* evt, cJSON* JObj)
-{
-	switch_event_header_t *header;
-	cJSON *item = NULL;
-	if((header = switch_event_get_header_ptr(evt, EVENT_TIMESTAMP_FIELD)) != NULL) {
-		if ((item = kazoo_event_json_value(JSON_NUMBER, header->value)) != NULL) {
-			kazoo_cJSON_AddItemToObject(JObj, JSON_TIMESTAMP_FIELD, item);
-			return SWITCH_STATUS_SUCCESS;
-		}
-	}
-	return SWITCH_STATUS_NOTFOUND;
-}
-
-kazoo_message_ptr kazoo_message_create_event(switch_event_t* evt, kazoo_event_ptr event, kazoo_event_profile_ptr profile)
-{
-	kazoo_message_ptr message;
-	cJSON *JObj = NULL;
-	kazoo_filter_ptr filtered;
-	kazoo_logging_t logging;
-
-	logging.levels = profile->logging;
-	logging.event_name = evt->subclass_name ? evt->subclass_name : switch_event_get_header_nil(evt, "Event-Name");
-	logging.profile_name = profile->name;
-
-	message = malloc(sizeof(kazoo_message_t));
-	if(message == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error allocating memory for serializing event to json\n");
-		return NULL;
-	}
-	memset(message, 0, sizeof(kazoo_message_t));
-
-	if(profile->filter) {
-		// filtering
-		if((filtered = filter_event(evt, profile->filter, &logging)) != NULL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, logging.levels->filtered_event_log_level, "profile[%s] event %s filtered by profile settings %s : %s\n", logging.profile_name, logging.event_name, filtered->name, filtered->value);
-			kazoo_message_destroy(&message);
-			return NULL;
-		}
-	}
-
-	if (event->logging) {
-		logging.levels = event->logging;
-	}
-
-	if (event && event->filter) {
-		if((filtered = filter_event(evt, event->filter, &logging)) != NULL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, logging.levels->filtered_event_log_level, "profile[%s] event %s filtered by event settings %s : %s\n", logging.profile_name, logging.event_name, filtered->name, filtered->value);
-			kazoo_message_destroy(&message);
-			return NULL;
-		}
-	}
-
-	kazoo_event_init_json(profile->fields, event ? event->fields : NULL, evt, &JObj);
-
-	kazoo_event_add_timestamp(evt, JObj);
-
-	if(profile->fields)
-		kazoo_event_add_fields_to_json(&logging, JObj, evt, profile->fields->head);
-
-	if(event && event->fields)
-		kazoo_event_add_fields_to_json(&logging, JObj, evt, event->fields->head);
-
-	message->JObj = JObj;
-
-
-	return message;
-
-
-}
-
-kazoo_message_ptr kazoo_message_create_fetch(switch_event_t* evt, kazoo_fetch_profile_ptr profile)
-{
-	kazoo_message_ptr message;
-	cJSON *JObj = NULL;
-	kazoo_logging_t logging;
-
-	logging.levels = profile->logging;
-	logging.event_name = switch_event_get_header_nil(evt, "Event-Name");
-	logging.profile_name = profile->name;
-
-	message = malloc(sizeof(kazoo_message_t));
-	if(message == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error allocating memory for serializing event to json\n");
-		return NULL;
-	}
-	memset(message, 0, sizeof(kazoo_message_t));
-
-
-	kazoo_event_init_json(profile->fields, NULL, evt, &JObj);
-
-	kazoo_event_add_timestamp(evt, JObj);
-
-	if(profile->fields)
-		kazoo_event_add_fields_to_json(&logging, JObj, evt, profile->fields->head);
-
-	message->JObj = JObj;
-
-
-	return message;
-
-
-}
-
-
-void kazoo_message_destroy(kazoo_message_ptr *msg)
-{
-	if (!msg || !*msg) return;
-	if((*msg)->JObj != NULL)
-		cJSON_Delete((*msg)->JObj);
-	switch_safe_free(*msg);
-
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_message.h b/src/mod/event_handlers/mod_kazoo/kazoo_message.h
deleted file mode 100644
index eade6c4e7b..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_message.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-* Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
-*
-* Version: MPL 1.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
-*
-* The Initial Developer of the Original Code is
-* Anthony Minessale II <anthm@freeswitch.org>
-* Portions created by the Initial Developer are Copyright (C)
-* the Initial Developer. All Rights Reserved.
-*
-* Based on mod_skel by
-* Anthony Minessale II <anthm@freeswitch.org>
-*
-* Contributor(s):
-*
-* Daniel Bryars <danb@aeriandi.com>
-* Tim Brown <tim.brown@aeriandi.com>
-* Anthony Minessale II <anthm@freeswitch.org>
-* William King <william.king@quentustech.com>
-* Mike Jerris <mike@jerris.com>
-*
-* kazoo.c -- Sends FreeSWITCH events to an AMQP broker
-*
-*/
-
-#ifndef KAZOO_MESSAGE_H
-#define KAZOO_MESSAGE_H
-
-#include <switch.h>
-
-typedef struct {
-    uint64_t timestamp;
-    uint64_t start;
-    uint64_t filter;
-    uint64_t serialize;
-    uint64_t print;
-    uint64_t rk;
-} kazoo_message_times_t, *kazoo_message_times_ptr;
-
-typedef struct {
-    cJSON *JObj;
-} kazoo_message_t, *kazoo_message_ptr;
-
-void kazoo_cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
-cJSON * kazoo_event_add_field_to_json(cJSON *dst, switch_event_t *src, kazoo_field_ptr field);
-kazoo_message_ptr kazoo_message_create_event(switch_event_t* evt, kazoo_event_ptr event, kazoo_event_profile_ptr profile);
-kazoo_message_ptr kazoo_message_create_fetch(switch_event_t* evt, kazoo_fetch_profile_ptr profile);
-
-void kazoo_message_destroy(kazoo_message_ptr *msg);
-
-
-#endif /* KAZOO_MESSAGE_H */
-
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_node.c b/src/mod/event_handlers/mod_kazoo/kazoo_node.c
deleted file mode 100644
index feb8970a86..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_node.c
+++ /dev/null
@@ -1,1684 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- * Andrew Thompson <andrew@hijacked.us>
- * Rob Charlton <rob.charlton@savageminds.com>
- * Darren Schreiber <d@d-man.org>
- * Mike Jerris <mike@jerris.com>
- * Tamas Cseke <tamas.cseke@virtual-call-center.eu>
- *
- *
- * handle_msg.c -- handle messages received from erlang nodes
- *
- */
-#include "mod_kazoo.h"
-
-struct api_command_struct_s {
-	char *cmd;
-	char *arg;
-	ei_node_t *ei_node;
-	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	erlang_pid pid;
-	switch_memory_pool_t *pool;
-};
-typedef struct api_command_struct_s api_command_struct_t;
-
-static char *REQUEST_ATOMS[] = {
-	"noevents",
-	"exit",
-	"link",
-	"nixevent",
-	"sendevent",
-	"sendmsg",
-	"commands",
-	"command",
-	"bind",
-	"getpid",
-	"version",
-	"bgapi",
-	"api",
-	"event",
-	"fetch_reply",
-	"config",
-	"bgapi4",
-	"api4",
-	"json_api"
-};
-
-typedef enum {
-	REQUEST_NOEVENTS,
-	REQUEST_EXIT,
-	REQUEST_LINK,
-	REQUEST_NIXEVENT,
-	REQUEST_SENDEVENT,
-	REQUEST_SENDMSG,
-	REQUEST_COMMANDS,
-	REQUEST_COMMAND,
-	REQUEST_BIND,
-	REQUEST_GETPID,
-	REQUEST_VERSION,
-	REQUEST_BGAPI,
-	REQUEST_API,
-	REQUEST_EVENT,
-	REQUEST_FETCH_REPLY,
-	REQUEST_CONFIG,
-	REQUEST_BGAPI4,
-	REQUEST_API4,
-	REQUEST_JSON_API,
-	REQUEST_MAX
-} request_atoms_t;
-
-static switch_status_t find_request(char *atom, int *request) {
-	int i;
-	for (i = 0; i < REQUEST_MAX; i++) {
-		if(!strncmp(atom, REQUEST_ATOMS[i], MAXATOMLEN)) {
-			*request = i;
-			return SWITCH_STATUS_SUCCESS;
-		}
-	}
-
-	return SWITCH_STATUS_FALSE;
-}
-
-static void destroy_node_handler(ei_node_t *ei_node) {
-	int pending = 0;
-	void *pop;
-	switch_memory_pool_t *pool = ei_node->pool;
-
-	switch_clear_flag(ei_node, LFLAG_RUNNING);
-
-	/* wait for pending bgapi requests to complete */
-	while ((pending = switch_atomic_read(&ei_node->pending_bgapi))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for %d pending bgapi requests to complete\n", pending);
-		switch_yield(500000);
-	}
-
-	/* wait for receive handlers to complete */
-	while ((pending = switch_atomic_read(&ei_node->receive_handlers))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for %d receive handlers to complete\n", pending);
-		switch_yield(500000);
-	}
-
-	switch_mutex_lock(ei_node->event_streams_mutex);
-	remove_event_streams(&ei_node->event_streams);
-	switch_mutex_unlock(ei_node->event_streams_mutex);
-
-	remove_xml_clients(ei_node);
-
-	while (switch_queue_trypop(ei_node->received_msgs, &pop) == SWITCH_STATUS_SUCCESS) {
-		ei_received_msg_t *received_msg = (ei_received_msg_t *) pop;
-
-		ei_x_free(&received_msg->buf);
-		switch_safe_free(received_msg);
-	}
-
-	while (switch_queue_trypop(ei_node->send_msgs, &pop) == SWITCH_STATUS_SUCCESS) {
-		ei_send_msg_t *send_msg = (ei_send_msg_t *) pop;
-
-		ei_x_free(&send_msg->buf);
-		switch_safe_free(send_msg);
-	}
-
-	close_socketfd(&ei_node->nodefd);
-
-	switch_mutex_destroy(ei_node->event_streams_mutex);
-
-	switch_core_destroy_memory_pool(&pool);
-}
-
-static switch_status_t add_to_ei_nodes(ei_node_t *this_ei_node) {
-	switch_thread_rwlock_wrlock(kazoo_globals.ei_nodes_lock);
-
-	if (!kazoo_globals.ei_nodes) {
-		kazoo_globals.ei_nodes = this_ei_node;
-	} else {
-		this_ei_node->next = kazoo_globals.ei_nodes;
-		kazoo_globals.ei_nodes = this_ei_node;
-	}
-
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t remove_from_ei_nodes(ei_node_t *this_ei_node) {
-	ei_node_t *ei_node, *prev = NULL;
-	int found = 0;
-
-	switch_thread_rwlock_wrlock(kazoo_globals.ei_nodes_lock);
-
-	/* try to find the event bindings list for the requestor */
-	ei_node = kazoo_globals.ei_nodes;
-	while(ei_node != NULL) {
-		if (ei_node == this_ei_node) {
-			found = 1;
-			break;
-		}
-
-		prev = ei_node;
-		ei_node = ei_node->next;
-	}
-
-	if (found) {
-		if (!prev) {
-			kazoo_globals.ei_nodes = this_ei_node->next;
-		} else {
-			prev->next = ei_node->next;
-		}
-	}
-
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-void kazoo_event_add_unique_header_string(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *data) {
-	if(!switch_event_get_header_ptr(event, header_name))
-		switch_event_add_header_string(event, stack, header_name, data);
-}
-
-
-SWITCH_DECLARE(switch_status_t) kazoo_api_execute(const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream, char** reply)
-{
-	switch_api_interface_t *api;
-	switch_status_t status;
-	char *arg_used;
-	char *cmd_used;
-	int  fire_event = 0;
-	char *arg_expanded = NULL;
-	switch_event_t* evt;
-
-	switch_assert(stream != NULL);
-	switch_assert(stream->data != NULL);
-	switch_assert(stream->write_function != NULL);
-
-	switch_event_create(&evt, SWITCH_EVENT_GENERAL);
-	arg_expanded = switch_event_expand_headers(evt, arg);
-	switch_event_destroy(&evt);
-
-	cmd_used = (char *) cmd;
-	arg_used = arg_expanded;
-
-	if (!stream->param_event) {
-		switch_event_create(&stream->param_event, SWITCH_EVENT_API);
-		fire_event = 1;
-	}
-
-	if (stream->param_event) {
-		if (cmd_used && *cmd_used) {
-			switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command", cmd_used);
-		}
-		if (arg_used && *arg_used) {
-			switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command-Argument", arg_used);
-		}
-		if (arg_expanded && *arg_expanded) {
-			switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Command-Argument-Expanded", arg_expanded);
-		}
-	}
-
-
-	if (cmd_used && (api = switch_loadable_module_get_api_interface(cmd_used)) != 0) {
-		if ((status = api->function(arg_used, session, stream)) != SWITCH_STATUS_SUCCESS) {
-			kazoo_event_add_unique_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Result", "error");
-			kazoo_event_add_unique_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Error", stream->data);
-		} else {
-			kazoo_event_add_unique_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Result", "success");
-			kazoo_event_add_unique_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Output", stream->data);
-		}
-		UNPROTECT_INTERFACE(api);
-	} else {
-		status = SWITCH_STATUS_FALSE;
-		kazoo_event_add_unique_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Result", "error");
-		kazoo_event_add_unique_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "API-Error", "invalid command");
-	}
-
-	if (stream->param_event && fire_event) {
-		switch_event_fire(&stream->param_event);
-	}
-
-	if (cmd_used != cmd) {
-		switch_safe_free(cmd_used);
-	}
-
-	if (arg_used != arg_expanded) {
-		switch_safe_free(arg_used);
-	}
-
-	if (arg_expanded != arg) {
-		switch_safe_free(arg_expanded);
-	}
-
-	return status;
-}
-
-static switch_status_t api_exec_stream(char *cmd, char *arg, switch_stream_handle_t *stream, char **reply) {
-        switch_status_t status = SWITCH_STATUS_FALSE;
-
-        if (kazoo_api_execute(cmd, arg, NULL, stream, reply) != SWITCH_STATUS_SUCCESS) {
-                if(stream->data && strlen(stream->data)) {
-                         *reply = strdup(stream->data);
-                         status = SWITCH_STATUS_FALSE;
-                } else {
-                        *reply = switch_mprintf("%s: Command not found", cmd);
-                        status = SWITCH_STATUS_NOTFOUND;
-                }
-        } else if (!stream->data || !strlen(stream->data)) {
-                *reply = switch_mprintf("%s: Command returned no output", cmd);
-                status = SWITCH_STATUS_SUCCESS;
-        } else {
-                *reply = strdup(stream->data);
-                status = SWITCH_STATUS_SUCCESS;
-        }
-
-        return status;
-}
-
-static switch_status_t api_exec(char *cmd, char *arg, char **reply) {
-	switch_stream_handle_t stream = { 0 };
-	switch_status_t status = SWITCH_STATUS_FALSE;
-
-	SWITCH_STANDARD_STREAM(stream);
-
-	status = api_exec_stream(cmd, arg, &stream, reply);
-
-	switch_safe_free(stream.data);
-
-	return status;
-}
-
-static void *SWITCH_THREAD_FUNC bgapi3_exec(switch_thread_t *thread, void *obj) {
-	api_command_struct_t *acs = (api_command_struct_t *) obj;
-	switch_memory_pool_t *pool = acs->pool;
-	char *reply = NULL;
-	char *cmd = acs->cmd;
-	char *arg = acs->arg;
-	ei_node_t *ei_node = acs->ei_node;
-	ei_send_msg_t *send_msg;
-
-	if(!switch_test_flag(ei_node, LFLAG_RUNNING) || !switch_test_flag(&kazoo_globals, LFLAG_RUNNING)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Ignoring command while shuting down\n");
-		switch_atomic_dec(&ei_node->pending_bgapi);
-		return NULL;
-	}
-
-	switch_malloc(send_msg, sizeof(*send_msg));
-	memcpy(&send_msg->pid, &acs->pid, sizeof(erlang_pid));
-
-	ei_x_new_with_version(&send_msg->buf);
-
-	ei_x_encode_tuple_header(&send_msg->buf, 3);
-
-	if (api_exec(cmd, arg, &reply) == SWITCH_STATUS_SUCCESS) {
-		ei_x_encode_atom(&send_msg->buf, "bgok");
-	} else {
-		ei_x_encode_atom(&send_msg->buf, "bgerror");
-	}
-
-	_ei_x_encode_string(&send_msg->buf, acs->uuid_str);
-	_ei_x_encode_string(&send_msg->buf, reply);
-
-	if (switch_queue_trypush(ei_node->send_msgs, send_msg) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to send bgapi response %s to %s <%d.%d.%d>\n"
-						  ,acs->uuid_str
-						  ,acs->pid.node
-						  ,acs->pid.creation
-						  ,acs->pid.num
-						  ,acs->pid.serial);
-		ei_x_free(&send_msg->buf);
-		switch_safe_free(send_msg);
-	}
-
-	switch_atomic_dec(&ei_node->pending_bgapi);
-
-	switch_safe_free(reply);
-	switch_safe_free(acs->arg);
-	switch_core_destroy_memory_pool(&pool);
-
-	return NULL;
-}
-
-
-static void *SWITCH_THREAD_FUNC bgapi4_exec(switch_thread_t *thread, void *obj) {
-	api_command_struct_t *acs = (api_command_struct_t *) obj;
-	switch_memory_pool_t *pool = acs->pool;
-	char *reply = NULL;
-	char *cmd = acs->cmd;
-	char *arg = acs->arg;
-	ei_node_t *ei_node = acs->ei_node;
-	ei_send_msg_t *send_msg;
-	switch_stream_handle_t stream = { 0 };
-
-	if(!switch_test_flag(ei_node, LFLAG_RUNNING) || !switch_test_flag(&kazoo_globals, LFLAG_RUNNING)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Ignoring command while shuting down\n");
-		switch_atomic_dec(&ei_node->pending_bgapi);
-		return NULL;
-	}
-
-	SWITCH_STANDARD_STREAM(stream);
-	switch_event_create(&stream.param_event, SWITCH_EVENT_API);
-
-	switch_malloc(send_msg, sizeof(*send_msg));
-	memcpy(&send_msg->pid, &acs->pid, sizeof(erlang_pid));
-
-	ei_x_new_with_version(&send_msg->buf);
-	ei_x_encode_tuple_header(&send_msg->buf, (stream.param_event ? 4 : 3));
-
-	if (api_exec_stream(cmd, arg, &stream, &reply) == SWITCH_STATUS_SUCCESS) {
-		ei_x_encode_atom(&send_msg->buf, "bgok");
-	} else {
-		ei_x_encode_atom(&send_msg->buf, "bgerror");
-	}
-
-	_ei_x_encode_string(&send_msg->buf, acs->uuid_str);
-	_ei_x_encode_string(&send_msg->buf, reply);
-
-	if (stream.param_event) {
-		ei_encode_switch_event_headers_2(&send_msg->buf, stream.param_event, 0);
-	}
-
-	if (switch_queue_trypush(ei_node->send_msgs, send_msg) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to send bgapi response %s to %s <%d.%d.%d>\n"
-						  ,acs->uuid_str
-						  ,acs->pid.node
-						  ,acs->pid.creation
-						  ,acs->pid.num
-						  ,acs->pid.serial);
-		ei_x_free(&send_msg->buf);
-		switch_safe_free(send_msg);
-	}
-
-	switch_atomic_dec(&ei_node->pending_bgapi);
-
-	if (stream.param_event) {
-		switch_event_fire(&stream.param_event);
-	}
-
-	switch_safe_free(reply);
-	switch_safe_free(acs->arg);
-	switch_core_destroy_memory_pool(&pool);
-	switch_safe_free(stream.data);
-
-	return NULL;
-}
-
-static void log_sendmsg_request(char *uuid, switch_event_t *event)
-{
-	char *cmd = switch_event_get_header(event, "call-command");
-	unsigned long cmd_hash;
-	switch_ssize_t hlen = -1;
-	unsigned long CMD_EXECUTE = switch_hashfunc_default("execute", &hlen);
-	unsigned long CMD_XFEREXT = switch_hashfunc_default("xferext", &hlen);
-
-	if (zstr(cmd)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "log|%s|invalid \n", uuid);
-		DUMP_EVENT(event);
-		return;
-	}
-
-	cmd_hash = switch_hashfunc_default(cmd, &hlen);
-
-	if (cmd_hash == CMD_EXECUTE) {
-		char *app_name = switch_event_get_header(event, "execute-app-name");
-		char *app_arg = switch_event_get_header(event, "execute-app-arg");
-
-		if(app_name) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "log|%s|executing %s %s \n", uuid, app_name, switch_str_nil(app_arg));
-		}
-	} else if (cmd_hash == CMD_XFEREXT) {
-		switch_event_header_t *hp;
-
-		for (hp = event->headers; hp; hp = hp->next) {
-			char *app_name;
-			char *app_arg;
-
-			if (!strcasecmp(hp->name, "application")) {
-				app_name = strdup(hp->value);
-				app_arg = strchr(app_name, ' ');
-
-				if (app_arg) {
-					*app_arg++ = '\0';
-				}
-
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "log|%s|building xferext extension: %s %s\n", uuid, app_name, app_arg);
-				switch_safe_free(app_name);
-			}
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "log|%s|transfered call to xferext extension\n", uuid);
-	}
-}
-
-static switch_status_t build_event(switch_event_t *event, ei_x_buff * buf) {
-	int propslist_length, arity;
-	int n=0;
-
-	if(!event) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (ei_decode_list_header(buf->buff, &buf->index, &propslist_length)) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	while (!ei_decode_tuple_header(buf->buff, &buf->index, &arity) && n < propslist_length) {
-		char key[1024];
-		char *value;
-
-		if (arity != 2) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (ei_decode_string_or_binary_limited(buf->buff, &buf->index, sizeof(key), key)) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (ei_decode_string_or_binary(buf->buff, &buf->index, &value)) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (!strcmp(key, "body")) {
-			switch_safe_free(event->body);
-			event->body = value;
-		} else	{
-			if(!strcasecmp(key, "Call-ID")) {
-				switch_core_session_t *session = NULL;
-				if(!zstr(value)) {
-					if ((session = switch_core_session_locate(value)) != NULL) {
-						switch_channel_t *channel = switch_core_session_get_channel(session);
-						switch_channel_event_set_data(channel, event);
-						switch_core_session_rwunlock(session);
-					}
-				}
-			}
-			switch_event_add_header_string_nodup(event, SWITCH_STACK_BOTTOM, key, value);
-		}
-		n++;
-	}
-	ei_skip_term(buf->buff, &buf->index);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t erlang_response_badarg(ei_x_buff * rbuf) {
-	if (rbuf) {
-		ei_x_encode_tuple_header(rbuf, 2);
-		ei_x_encode_atom(rbuf, "error");
-		ei_x_encode_atom(rbuf, "badarg");
-	}
-
-	return SWITCH_STATUS_GENERR;
-}
-
-static switch_status_t erlang_response_baduuid(ei_x_buff * rbuf) {
-	if (rbuf) {
-		ei_x_format_wo_ver(rbuf, "{~a,~a}", "error", "baduuid");
-	}
-
-	return SWITCH_STATUS_NOTFOUND;
-}
-
-static switch_status_t erlang_response_notimplemented(ei_x_buff * rbuf) {
-	if (rbuf) {
-		ei_x_encode_tuple_header(rbuf, 2);
-		ei_x_encode_atom(rbuf, "error");
-		ei_x_encode_atom(rbuf, "not_implemented");
-	}
-
-	return SWITCH_STATUS_NOTFOUND;
-}
-
-static switch_status_t erlang_response_ok(ei_x_buff *rbuf) {
-	if (rbuf) {
-		ei_x_encode_atom(rbuf, "ok");
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t erlang_response_ok_uuid(ei_x_buff *rbuf, const char * uuid) {
-	if (rbuf) {
-		ei_x_encode_tuple_header(rbuf, 2);
-		ei_x_encode_atom(rbuf, "ok");
-		ei_x_encode_binary(rbuf, uuid, strlen(uuid));
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_request_noevents(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	ei_event_stream_t *event_stream;
-
-	switch_mutex_lock(ei_node->event_streams_mutex);
-	if ((event_stream = find_event_stream(ei_node->event_streams, pid))) {
-		remove_event_bindings(event_stream);
-	}
-	switch_mutex_unlock(ei_node->event_streams_mutex);
-
-	return erlang_response_ok(rbuf);
-}
-
-static switch_status_t handle_request_exit(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	switch_clear_flag(ei_node, LFLAG_RUNNING);
-
-	return erlang_response_ok(rbuf);
-}
-
-static switch_status_t handle_request_link(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	ei_link(ei_node, ei_self(&kazoo_globals.ei_cnode), pid);
-
-	return erlang_response_ok(rbuf);
-}
-
-static switch_status_t handle_request_nixevent(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	char event_name[MAXATOMLEN + 1];
-	switch_event_types_t event_type;
-	ei_event_stream_t *event_stream;
-	int custom = 0, length = 0;
-	int i;
-
-	if (ei_decode_list_header(buf->buff, &buf->index, &length)
-		|| length == 0) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	switch_mutex_lock(ei_node->event_streams_mutex);
-	if (!(event_stream = find_event_stream(ei_node->event_streams, pid))) {
-		switch_mutex_unlock(ei_node->event_streams_mutex);
-		return erlang_response_ok(rbuf);
-	}
-
-	for (i = 1; i <= length; i++) {
-		if (ei_decode_atom_safe(buf->buff, &buf->index, event_name)) {
-			switch_mutex_unlock(ei_node->event_streams_mutex);
-			return erlang_response_badarg(rbuf);
-		}
-
-		if (custom) {
-			remove_event_binding(event_stream, SWITCH_EVENT_CUSTOM, event_name);
-		} else if (switch_name_event(event_name, &event_type) == SWITCH_STATUS_SUCCESS) {
-			switch (event_type) {
-
-			case SWITCH_EVENT_CUSTOM:
-				custom++;
-				break;
-
-			case SWITCH_EVENT_ALL:
-			{
-				switch_event_types_t type;
-				for (type = 0; type < SWITCH_EVENT_ALL; type++) {
-					if(type != SWITCH_EVENT_CUSTOM) {
-						remove_event_binding(event_stream, type, NULL);
-					}
-				}
-				break;
-			}
-
-			default:
-				remove_event_binding(event_stream, event_type, NULL);
-			}
-		} else {
-			switch_mutex_unlock(ei_node->event_streams_mutex);
-			return erlang_response_badarg(rbuf);
-		}
-	}
-	switch_mutex_unlock(ei_node->event_streams_mutex);
-
-	return erlang_response_ok(rbuf);
-}
-
-static switch_status_t handle_request_sendevent(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	char event_name[MAXATOMLEN + 1];
-	char subclass_name[MAXATOMLEN + 1];
-	switch_event_types_t event_type;
-	switch_event_t *event = NULL;
-
-	if (ei_decode_atom_safe(buf->buff, &buf->index, event_name)
-		|| switch_name_event(event_name, &event_type) != SWITCH_STATUS_SUCCESS)
-        {
-			return erlang_response_badarg(rbuf);
-        }
-
-	if (!strncasecmp(event_name, "CUSTOM", MAXATOMLEN)) {
-		if(ei_decode_atom(buf->buff, &buf->index, subclass_name)) {
-			return erlang_response_badarg(rbuf);
-		}
-		switch_event_create_subclass(&event, event_type, subclass_name);
-	} else {
-		switch_event_create(&event, event_type);
-	}
-
-	if (build_event(event, buf) == SWITCH_STATUS_SUCCESS) {
-		switch_event_fire(&event);
-		return erlang_response_ok(rbuf);
-	}
-
-	if(event) {
-		switch_event_destroy(&event);
-	}
-
-	return erlang_response_badarg(rbuf);
-}
-
-static switch_status_t handle_request_command(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	switch_core_session_t *session;
-	switch_event_t *event = NULL;
-	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	switch_uuid_t cmd_uuid;
-	char cmd_uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-
-	if (ei_decode_string_or_binary_limited(buf->buff, &buf->index, sizeof(uuid_str), uuid_str)) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (zstr_buf(uuid_str) || !(session = switch_core_session_locate(uuid_str))) {
-		return erlang_response_baduuid(rbuf);
-	}
-
-	switch_uuid_get(&cmd_uuid);
-	switch_uuid_format(cmd_uuid_str, &cmd_uuid);
-
-	switch_event_create(&event, SWITCH_EVENT_COMMAND);
-	if (build_event(event, buf) != SWITCH_STATUS_SUCCESS) {
-		switch_core_session_rwunlock(session);
-		return erlang_response_badarg(rbuf);
-	}
-
-	log_sendmsg_request(uuid_str, event);
-	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-uuid", cmd_uuid_str);
-
-	switch_core_session_queue_private_event(session, &event, SWITCH_FALSE);
-	switch_core_session_rwunlock(session);
-
-	return erlang_response_ok_uuid(rbuf, cmd_uuid_str);
-}
-
-static switch_status_t handle_request_commands(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	switch_core_session_t *session;
-	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	int propslist_length, n;
-	switch_uuid_t cmd_uuid;
-	char cmd_uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-
-	if (ei_decode_string_or_binary_limited(buf->buff, &buf->index, sizeof(uuid_str), uuid_str)) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (zstr_buf(uuid_str) || !(session = switch_core_session_locate(uuid_str))) {
-		return erlang_response_baduuid(rbuf);
-	}
-
-	switch_uuid_get(&cmd_uuid);
-	switch_uuid_format(cmd_uuid_str, &cmd_uuid);
-
-	if (ei_decode_list_header(buf->buff, &buf->index, &propslist_length)) {
-		switch_core_session_rwunlock(session);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	for(n = 0; n < propslist_length; n++) {
-		switch_event_t *event = NULL;
-		switch_event_create(&event, SWITCH_EVENT_COMMAND);
-		if (build_event(event, buf) != SWITCH_STATUS_SUCCESS) {
-			switch_core_session_rwunlock(session);
-			return erlang_response_badarg(rbuf);
-		}
-		log_sendmsg_request(uuid_str, event);
-		if(n == (propslist_length - 1)) {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-uuid", cmd_uuid_str);
-		} else {
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-uuid", "null");
-//			switch_event_del_header_val(event, "event-uuid-name", NULL);
-		}
-		switch_core_session_queue_private_event(session, &event, SWITCH_FALSE);
-	}
-
-	switch_core_session_rwunlock(session);
-
-	return erlang_response_ok_uuid(rbuf, cmd_uuid_str);
-
-}
-
-static switch_status_t handle_request_sendmsg(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	switch_core_session_t *session;
-	switch_event_t *event = NULL;
-	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-
-	if (ei_decode_string_or_binary_limited(buf->buff, &buf->index, sizeof(uuid_str), uuid_str)) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (zstr_buf(uuid_str) || !(session = switch_core_session_locate(uuid_str))) {
-		return erlang_response_baduuid(rbuf);
-	}
-
-	switch_event_create(&event, SWITCH_EVENT_SEND_MESSAGE);
-	if (build_event(event, buf) != SWITCH_STATUS_SUCCESS) {
-		switch_core_session_rwunlock(session);
-		return erlang_response_badarg(rbuf);
-	}
-
-	log_sendmsg_request(uuid_str, event);
-
-	switch_core_session_queue_private_event(session, &event, SWITCH_FALSE);
-	switch_core_session_rwunlock(session);
-
-	return erlang_response_ok(rbuf);
-}
-
-static switch_status_t handle_request_config(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-
-	fetch_config();
-	return erlang_response_ok(rbuf);
-}
-
-static switch_status_t handle_request_bind(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	char section_str[MAXATOMLEN + 1];
-	switch_xml_section_t section;
-
-	if (ei_decode_atom_safe(buf->buff, &buf->index, section_str)
-		|| !(section = switch_xml_parse_section_string(section_str))) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	switch(section) {
-	case SWITCH_XML_SECTION_CONFIG:
-		add_fetch_handler(ei_node, pid, kazoo_globals.config_fetch_binding);
-		if(!kazoo_globals.config_fetched) {
-			kazoo_globals.config_fetched = 1;
-			fetch_config();
-		}
-		break;
-	case SWITCH_XML_SECTION_DIRECTORY:
-		add_fetch_handler(ei_node, pid, kazoo_globals.directory_fetch_binding);
-		break;
-	case SWITCH_XML_SECTION_DIALPLAN:
-		add_fetch_handler(ei_node, pid, kazoo_globals.dialplan_fetch_binding);
-		break;
-	case SWITCH_XML_SECTION_CHANNELS:
-		add_fetch_handler(ei_node, pid, kazoo_globals.channels_fetch_binding);
-		break;
-	case SWITCH_XML_SECTION_LANGUAGES:
-		add_fetch_handler(ei_node, pid, kazoo_globals.languages_fetch_binding);
-		break;
-	case SWITCH_XML_SECTION_CHATPLAN:
-		add_fetch_handler(ei_node, pid, kazoo_globals.chatplan_fetch_binding);
-		break;
-	default:
-		return erlang_response_badarg(rbuf);
-	}
-
-	return erlang_response_ok(rbuf);
-}
-
-static switch_status_t handle_request_getpid(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	if (rbuf) {
-		ei_x_encode_tuple_header(rbuf, 2);
-		ei_x_encode_atom(rbuf, "ok");
-		ei_x_encode_pid(rbuf, ei_self(&kazoo_globals.ei_cnode));
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_request_version(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	if (rbuf) {
-		ei_x_encode_tuple_header(rbuf, 2);
-		ei_x_encode_atom(rbuf, "ok");
-		_ei_x_encode_string(rbuf, VERSION);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_request_bgapi(switch_thread_start_t func, ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	api_command_struct_t *acs = NULL;
-	switch_memory_pool_t *pool;
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	switch_uuid_t uuid;
-	char cmd[MAXATOMLEN + 1];
-
-	if (ei_decode_atom_safe(buf->buff, &buf->index, cmd)) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	switch_core_new_memory_pool(&pool);
-	acs = switch_core_alloc(pool, sizeof(*acs));
-
-	if (ei_decode_string_or_binary(buf->buff, &buf->index, &acs->arg)) {
-		switch_core_destroy_memory_pool(&pool);
-		return erlang_response_badarg(rbuf);
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "bgexec: %s(%s)\n", cmd, acs->arg);
-
-	acs->pool = pool;
-	acs->ei_node = ei_node;
-	acs->cmd = switch_core_strdup(pool, cmd);
-	memcpy(&acs->pid, pid, sizeof(erlang_pid));
-
-	switch_threadattr_create(&thd_attr, acs->pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-
-	switch_uuid_get(&uuid);
-	switch_uuid_format(acs->uuid_str, &uuid);
-	switch_thread_create(&thread, thd_attr, func, acs, acs->pool);
-
-	switch_atomic_inc(&ei_node->pending_bgapi);
-
-	if (rbuf) {
-		ei_x_encode_tuple_header(rbuf, 2);
-		ei_x_encode_atom(rbuf, "ok");
-		_ei_x_encode_string(rbuf, acs->uuid_str);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_request_bgapi3(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-        return handle_request_bgapi(bgapi3_exec, ei_node, pid, buf, rbuf);
-}
-
-static switch_status_t handle_request_bgapi4(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-        return handle_request_bgapi(bgapi4_exec, ei_node, pid, buf, rbuf);
-}
-
-static switch_status_t handle_request_api4(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	char cmd[MAXATOMLEN + 1];
-	char *arg;
-	switch_stream_handle_t stream = { 0 };
-
-	SWITCH_STANDARD_STREAM(stream);
-	switch_event_create(&stream.param_event, SWITCH_EVENT_API);
-
-	if (ei_decode_atom_safe(buf->buff, &buf->index, cmd)) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (ei_decode_string_or_binary(buf->buff, &buf->index, &arg)) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "exec: %s(%s)\n", cmd, arg);
-
-	if (rbuf) {
-		char *reply;
-		switch_status_t status;
-
-		status = api_exec_stream(cmd, arg, &stream, &reply);
-
-		if (status == SWITCH_STATUS_SUCCESS) {
-			ei_x_encode_tuple_header(rbuf, 2);
-			ei_x_encode_atom(rbuf, "ok");
-		} else {
-			ei_x_encode_tuple_header(rbuf, (stream.param_event ? 3 : 2));
-			ei_x_encode_atom(rbuf, "error");
-		}
-
-		_ei_x_encode_string(rbuf, reply);
-
-		if (stream.param_event && status != SWITCH_STATUS_SUCCESS) {
-			ei_encode_switch_event_headers(rbuf, stream.param_event);
-		}
-
-		switch_safe_free(reply);
-	}
-
-	if (stream.param_event) {
-		switch_event_fire(&stream.param_event);
-	}
-
-	switch_safe_free(arg);
-	switch_safe_free(stream.data);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_request_json_api(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf)
-{
-    char *arg;
-	cJSON *jcmd = NULL;
-	switch_core_session_t *session = NULL;
-	const char *uuid = NULL;
-	char *response = NULL;
-	const char *parse_end = NULL;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-    if (ei_decode_string_or_binary(buf->buff, &buf->index, &arg)) {
-            return erlang_response_badarg(rbuf);
-    }
-
-    jcmd = cJSON_ParseWithOpts(arg, &parse_end, 0);
-
-	if (!jcmd) {
-	    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "json api error: %s\n", parse_end);
-   		ei_x_encode_tuple_header(rbuf, 2);
-   		ei_x_encode_atom(rbuf, "error");
-   		ei_x_encode_tuple_header(rbuf, 2);
-   		ei_x_encode_atom(rbuf, "parse_error");
-   		_ei_x_encode_string(rbuf, parse_end);
-		switch_safe_free(arg);
-   		return status;
-	}
-
-	if ((uuid = cJSON_GetObjectCstr(jcmd, "uuid"))) {
-		if (!(session = switch_core_session_locate(uuid))) {
-			cJSON_Delete(jcmd);
-			switch_safe_free(arg);
-			return erlang_response_baduuid(rbuf);
-		}
-	}
-
-	status = switch_json_api_execute(jcmd, session, NULL);
-    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "json api (%i): %s\n", status , arg);
-
-   	response = cJSON_PrintUnformatted(jcmd);
-	ei_x_encode_tuple_header(rbuf, 2);
-	if (status == SWITCH_STATUS_SUCCESS) {
-		ei_x_encode_atom(rbuf, "ok");
-	} else {
-		ei_x_encode_atom(rbuf, "error");
-	}
-	_ei_x_encode_string(rbuf, response);
-	switch_safe_free(response);
-
-    cJSON_Delete(jcmd);
-    switch_safe_free(arg);
-
-	if (session) {
-		switch_core_session_rwunlock(session);
-	}
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_request_api(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	char cmd[MAXATOMLEN + 1];
-	char *arg;
-
-	if (ei_decode_atom_safe(buf->buff, &buf->index, cmd)) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (ei_decode_string_or_binary(buf->buff, &buf->index, &arg)) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "exec: %s(%s)\n", cmd, arg);
-
-	if (rbuf) {
-		char *reply;
-
-		ei_x_encode_tuple_header(rbuf, 2);
-
-		if (api_exec(cmd, arg, &reply) == SWITCH_STATUS_SUCCESS) {
-			ei_x_encode_atom(rbuf, "ok");
-		} else {
-			ei_x_encode_atom(rbuf, "error");
-		}
-
-		_ei_x_encode_string(rbuf, reply);
-		switch_safe_free(reply);
-	}
-
-	switch_safe_free(arg);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_request_event(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	char event_name[MAXATOMLEN + 1];
-	ei_event_stream_t *event_stream;
-	int length = 0;
-	int i;
-
-	if (ei_decode_list_header(buf->buff, &buf->index, &length) || !length) {
-		return erlang_response_badarg(rbuf);
-	}
-
-	switch_mutex_lock(ei_node->event_streams_mutex);
-	if (!(event_stream = find_event_stream(ei_node->event_streams, pid))) {
-		event_stream = new_event_stream(ei_node, pid);
-		/* ensure we are notified if the requesting processes dies so we can clean up */
-		ei_link(ei_node, ei_self(&kazoo_globals.ei_cnode), pid);
-	}
-
-	for (i = 1; i <= length; i++) {
-		if (ei_decode_atom_safe(buf->buff, &buf->index, event_name)) {
-			switch_mutex_unlock(ei_node->event_streams_mutex);
-			return erlang_response_badarg(rbuf);
-		}
-		add_event_binding(event_stream, event_name);
-	}
-	switch_mutex_unlock(ei_node->event_streams_mutex);
-
-	if (rbuf) {
-		ei_x_encode_tuple_header(rbuf, 2);
-		ei_x_encode_atom(rbuf, "ok");
-
-		ei_x_encode_tuple_header(rbuf, 2);
-		ei_x_encode_string(rbuf, ei_node->local_ip);
-		ei_x_encode_ulong(rbuf, get_stream_port(event_stream));
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t handle_request_fetch_reply(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	char section_str[MAXATOMLEN + 1];
-	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	char *xml_str;
-	switch_xml_section_t section;
-	switch_status_t result;
-
-	if (ei_decode_atom_safe(buf->buff, &buf->index, section_str)
-		|| !(section = switch_xml_parse_section_string(section_str))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Ignoring a fetch reply without a configuration section\n");
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (ei_decode_string_or_binary_limited(buf->buff, &buf->index, sizeof(uuid_str), uuid_str)
-		|| zstr_buf(uuid_str)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Ignoring a fetch reply without request UUID\n");
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (ei_decode_string_or_binary(buf->buff, &buf->index, &xml_str)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Ignoring a fetch reply without XML : %s \n", uuid_str);
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (zstr(xml_str)) {
-		switch_safe_free(xml_str);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Ignoring an empty fetch reply : %s\n", uuid_str);
-		return erlang_response_badarg(rbuf);
-	}
-
-	switch(section) {
-	case SWITCH_XML_SECTION_CONFIG:
-		result = fetch_reply(uuid_str, xml_str, kazoo_globals.config_fetch_binding);
-		break;
-	case SWITCH_XML_SECTION_DIRECTORY:
-		result = fetch_reply(uuid_str, xml_str, kazoo_globals.directory_fetch_binding);
-		break;
-	case SWITCH_XML_SECTION_DIALPLAN:
-		result = fetch_reply(uuid_str, xml_str, kazoo_globals.dialplan_fetch_binding);
-		break;
-	case SWITCH_XML_SECTION_CHANNELS:
-		result = fetch_reply(uuid_str, xml_str, kazoo_globals.channels_fetch_binding);
-		break;
-	case SWITCH_XML_SECTION_LANGUAGES:
-		result = fetch_reply(uuid_str, xml_str, kazoo_globals.languages_fetch_binding);
-		break;
-	case SWITCH_XML_SECTION_CHATPLAN:
-		result = fetch_reply(uuid_str, xml_str, kazoo_globals.chatplan_fetch_binding);
-		break;
-	default:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received fetch reply %s for an unknown configuration section: %s : %s\n", uuid_str, section_str, xml_str);
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (result == SWITCH_STATUS_SUCCESS) {
-		return erlang_response_ok(rbuf);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received fetch reply %s is unknown or has expired : %s\n", uuid_str, xml_str);
-		return erlang_response_baduuid(rbuf);
-	}
-}
-
-static switch_status_t handle_kazoo_request(ei_node_t *ei_node, erlang_pid *pid, ei_x_buff *buf, ei_x_buff *rbuf) {
-	char atom[MAXATOMLEN + 1];
-	int type, size, arity = 0, request;
-
-	/* ...{_, _}} | ...atom()} = Buf */
-	ei_get_type(buf->buff, &buf->index, &type, &size);
-
-	/* is_tuple(Type) */
-	if (type == ERL_SMALL_TUPLE_EXT) {
-		/* ..._, _} = Buf */
-		ei_decode_tuple_header(buf->buff, &buf->index, &arity);
-	}
-
-	if (ei_decode_atom_safe(buf->buff, &buf->index, atom)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received mod_kazoo message that did not contain a command (ensure you are using Kazoo v2.14+).\n");
-		return erlang_response_badarg(rbuf);
-	}
-
-	if (find_request(atom, &request) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received mod_kazoo message for unimplemented feature (ensure you are using Kazoo v2.14+): %s\n", atom);
-		return erlang_response_badarg(rbuf);
-	}
-
-	switch(request) {
-	case REQUEST_NOEVENTS:
-		return handle_request_noevents(ei_node, pid, buf, rbuf);
-	case REQUEST_EXIT:
-		return handle_request_exit(ei_node, pid, buf, rbuf);
-	case REQUEST_LINK:
-		return handle_request_link(ei_node, pid, buf, rbuf);
-	case REQUEST_NIXEVENT:
-		return handle_request_nixevent(ei_node, pid, buf, rbuf);
-	case REQUEST_SENDEVENT:
-		return handle_request_sendevent(ei_node, pid, buf, rbuf);
-	case REQUEST_SENDMSG:
-		return handle_request_sendmsg(ei_node, pid, buf, rbuf);
-	case REQUEST_COMMAND:
-		return handle_request_command(ei_node, pid, buf, rbuf);
-	case REQUEST_COMMANDS:
-		return handle_request_commands(ei_node, pid, buf, rbuf);
-	case REQUEST_BIND:
-		return handle_request_bind(ei_node, pid, buf, rbuf);
-	case REQUEST_GETPID:
-		return handle_request_getpid(ei_node, pid, buf, rbuf);
-	case REQUEST_VERSION:
-		return handle_request_version(ei_node, pid, buf, rbuf);
-	case REQUEST_BGAPI:
-		return handle_request_bgapi3(ei_node, pid, buf, rbuf);
-	case REQUEST_API:
-		return handle_request_api(ei_node, pid, buf, rbuf);
-	case REQUEST_EVENT:
-		return handle_request_event(ei_node, pid, buf, rbuf);
-	case REQUEST_FETCH_REPLY:
-		return handle_request_fetch_reply(ei_node, pid, buf, rbuf);
-	case REQUEST_CONFIG:
-		return handle_request_config(ei_node, pid, buf, rbuf);
-	case REQUEST_BGAPI4:
-		return handle_request_bgapi4(ei_node, pid, buf, rbuf);
-	case REQUEST_API4:
-		return handle_request_api4(ei_node, pid, buf, rbuf);
-	case REQUEST_JSON_API:
-		return handle_request_json_api(ei_node, pid, buf, rbuf);
-	default:
-		return erlang_response_notimplemented(rbuf);
-	}
-}
-
-static switch_status_t handle_mod_kazoo_request(ei_node_t *ei_node, erlang_msg *msg, ei_x_buff *buf) {
-	char atom[MAXATOMLEN + 1];
-	int version, type, size, arity;
-
-	buf->index = 0;
-	ei_decode_version(buf->buff, &buf->index, &version);
-	ei_get_type(buf->buff, &buf->index, &type, &size);
-
-	/* is_tuple(Type) */
-	if (type != ERL_SMALL_TUPLE_EXT) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received erlang message of an unexpected type (ensure you are using Kazoo v2.14+).\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	ei_decode_tuple_header(buf->buff, &buf->index, &arity);
-
-	if (ei_decode_atom_safe(buf->buff, &buf->index, atom)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received erlang message tuple that did not start with an atom (ensure you are using Kazoo v2.14+).\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	/* {'$gen_cast', {_, _}} = Buf */
-	if (arity == 2 && !strncmp(atom, "$gen_cast", 9)) {
-		return handle_kazoo_request(ei_node, &msg->from, buf, NULL);
-        /* {'$gen_call', {_, _}, {_, _}} = Buf */
-	} else if (arity == 3 && !strncmp(atom, "$gen_call", 9)) {
-		switch_status_t status;
-		ei_send_msg_t *send_msg = NULL;
-		erlang_ref ref;
-
-		switch_malloc(send_msg, sizeof(*send_msg));
-		ei_x_new_with_version(&send_msg->buf);
-
-		/* ...{_, _}, {_, _}} = Buf */
-		ei_get_type(buf->buff, &buf->index, &type, &size);
-
-		/* is_tuple(Type) */
-		if (type != ERL_SMALL_TUPLE_EXT) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received erlang call message of an unexpected type (ensure you are using Kazoo v2.14+).\n");
-			ei_x_free(&send_msg->buf);
-			switch_safe_free(send_msg);
-			return SWITCH_STATUS_GENERR;
-		}
-
-		/* ..._, _}, {_, _}} = Buf */
-		ei_decode_tuple_header(buf->buff, &buf->index, &arity);
-
-		/* ...pid(), _}, {_, _}} = Buf */
-		if (ei_decode_pid(buf->buff, &buf->index, &send_msg->pid)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received erlang call without a reply pid (ensure you are using Kazoo v2.14+).\n");
-			ei_x_free(&send_msg->buf);
-			switch_safe_free(send_msg);
-			return SWITCH_STATUS_GENERR;
-		}
-
-		/* ...ref()}, {_, _}} = Buf */
-		if (ei_decode_ref(buf->buff, &buf->index, &ref)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received erlang call without a reply tag (ensure you are using Kazoo v2.14+).\n");
-			ei_x_free(&send_msg->buf);
-			switch_safe_free(send_msg);
-			return SWITCH_STATUS_GENERR;
-		}
-
-		/* send_msg->buf = {ref(), ... */
-		ei_x_encode_tuple_header(&send_msg->buf, 2);
-		ei_x_encode_ref(&send_msg->buf, &ref);
-
-		status = handle_kazoo_request(ei_node, &msg->from, buf, &send_msg->buf);
-
-		if (switch_queue_trypush(ei_node->send_msgs, send_msg) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error queuing reply\n");
-			ei_x_free(&send_msg->buf);
-			switch_safe_free(send_msg);
-		}
-
-		return status;
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received inappropriate erlang message (ensure you are using Kazoo v2.14+)\n");
-		return SWITCH_STATUS_GENERR;
-	}
-}
-
-/* fake enough of the net_kernel module to be able to respond to net_adm:ping */
-static switch_status_t handle_net_kernel_request(ei_node_t *ei_node, erlang_msg *msg, ei_x_buff *buf) {
-	int version, size, type, arity;
-	char atom[MAXATOMLEN + 1];
-	ei_send_msg_t *send_msg = NULL;
-	erlang_ref ref;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received net_kernel message, attempting to reply\n");
-
-	switch_malloc(send_msg, sizeof(*send_msg));
-	ei_x_new_with_version(&send_msg->buf);
-
-	buf->index = 0;
-	ei_decode_version(buf->buff, &buf->index, &version);
-	ei_get_type(buf->buff, &buf->index, &type, &size);
-
-	/* is_tuple(Buff) */
-	if (type != ERL_SMALL_TUPLE_EXT) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received net_kernel message of an unexpected type\n");
-		goto error;
-	}
-
-	ei_decode_tuple_header(buf->buff, &buf->index, &arity);
-
-	/* {_, _, _} = Buf */
-	if (arity != 3) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received net_kernel tuple has an unexpected arity\n");
-		goto error;
-	}
-
-	/* {'$gen_call', _, _} = Buf */
-	if (ei_decode_atom_safe(buf->buff, &buf->index, atom) || strncmp(atom, "$gen_call", 9)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received net_kernel message tuple does not begin with the atom '$gen_call'\n");
-		goto error;
-	}
-
-	ei_get_type(buf->buff, &buf->index, &type, &size);
-
-	/* {_, Sender, _}=Buff, is_tuple(Sender) */
-	if (type != ERL_SMALL_TUPLE_EXT) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Second element of the net_kernel tuple is an unexpected type\n");
-		goto error;
-	}
-
-	ei_decode_tuple_header(buf->buff, &buf->index, &arity);
-
-	/* {_, _}=Sender */
-	if (arity != 2) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Second element of the net_kernel message has an unexpected arity\n");
-		goto error;
-	}
-
-	/* {Pid, Ref}=Sender */
-	if (ei_decode_pid(buf->buff, &buf->index, &send_msg->pid) || ei_decode_ref(buf->buff, &buf->index, &ref)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Unable to decode erlang pid or ref of the net_kernel tuple second element\n");
-		goto error;
-	}
-
-	ei_get_type(buf->buff, &buf->index, &type, &size);
-
-	/* {_, _, Request}=Buff, is_tuple(Request) */
-	if (type != ERL_SMALL_TUPLE_EXT) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Third element of the net_kernel message is an unexpected type\n");
-		goto error;
-	}
-
-	ei_decode_tuple_header(buf->buff, &buf->index, &arity);
-
-	/* {_, _}=Request */
-	if (arity != 2) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Third element of the net_kernel message has an unexpected arity\n");
-		goto error;
-	}
-
-	/* {is_auth, _}=Request */
-	if (ei_decode_atom_safe(buf->buff, &buf->index, atom) || strncmp(atom, "is_auth", MAXATOMLEN)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "The net_kernel message third element does not begin with the atom 'is_auth'\n");
-		goto error;
-	}
-
-	/* To ! {Tag, Reply} */
-	ei_x_encode_tuple_header(&send_msg->buf, 2);
-	ei_x_encode_ref(&send_msg->buf, &ref);
-	ei_x_encode_atom(&send_msg->buf, "yes");
-
-	if (switch_queue_trypush(ei_node->send_msgs, send_msg) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to queue net kernel message\n");
-		goto error;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-error:
-	ei_x_free(&send_msg->buf);
-	switch_safe_free(send_msg);
-	return SWITCH_STATUS_GENERR;
-}
-
-static switch_status_t handle_erl_send(ei_node_t *ei_node, erlang_msg *msg, ei_x_buff *buf) {
-	if (!strncmp(msg->toname, "net_kernel", MAXATOMLEN)) {
-		return handle_net_kernel_request(ei_node, msg, buf);
-	} else if (!strncmp(msg->toname, "mod_kazoo", MAXATOMLEN)) {
-		return handle_mod_kazoo_request(ei_node, msg, buf);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received erlang message to unknown process \"%s\" (ensure you are using Kazoo v2.14+).\n", msg->toname);
-		return SWITCH_STATUS_GENERR;
-	}
-}
-
-static switch_status_t handle_erl_msg(ei_node_t *ei_node, erlang_msg *msg, ei_x_buff *buf) {
-	switch (msg->msgtype) {
-	case ERL_SEND:
-	case ERL_REG_SEND:
-		return handle_erl_send(ei_node, msg, buf);
-	case ERL_LINK:
-		/* we received an erlang link request?	Should we be linking or are they linking to us and this just informs us? */
-		return SWITCH_STATUS_SUCCESS;
-	case ERL_UNLINK:
-		/* we received an erlang unlink request?  Same question as the ERL_LINK, are we expected to do something? */
-		return SWITCH_STATUS_SUCCESS;
-	case ERL_EXIT:
-		/* we received a notice that a process we were linked to has exited, clean up any bindings */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received erlang exit notice for %s <%d.%d.%d>\n", msg->from.node, msg->from.creation, msg->from.num, msg->from.serial);
-
-		switch_mutex_lock(ei_node->event_streams_mutex);
-		remove_event_stream(&ei_node->event_streams, &msg->from);
-		switch_mutex_unlock(ei_node->event_streams_mutex);
-
-		remove_fetch_handlers(ei_node, &msg->from);
-		return SWITCH_STATUS_SUCCESS;
-	case ERL_EXIT2:
-		/* erlang nodes appear to send both the old and new style exit notices so just ignore these */
-		return SWITCH_STATUS_FALSE;
-	default:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Received unexpected erlang message type %d\n", (int) (msg->msgtype));
-		return SWITCH_STATUS_FALSE;
-	}
-}
-
-static void *SWITCH_THREAD_FUNC receive_handler(switch_thread_t *thread, void *obj) {
-	ei_node_t *ei_node = (ei_node_t *) obj;
-
-	switch_atomic_inc(&kazoo_globals.threads);
-	switch_atomic_inc(&ei_node->receive_handlers);
-
-	switch_assert(ei_node != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting erlang receive handler %p: %s (%s:%d)\n", (void *)ei_node, ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port);
-
-	while (switch_test_flag(ei_node, LFLAG_RUNNING) && switch_test_flag(&kazoo_globals, LFLAG_RUNNING)) {
-		void *pop = NULL;
-
-		if (ei_queue_pop(ei_node->received_msgs, &pop, ei_node->receiver_queue_timeout) == SWITCH_STATUS_SUCCESS) {
-			ei_received_msg_t *received_msg = (ei_received_msg_t *) pop;
-			handle_erl_msg(ei_node, &received_msg->msg, &received_msg->buf);
-			ei_x_free(&received_msg->buf);
-			switch_safe_free(received_msg);
-		}
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutdown erlang receive handler %p: %s (%s:%d)\n", (void *)ei_node, ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port);
-
-	switch_atomic_dec(&ei_node->receive_handlers);
-	switch_atomic_dec(&kazoo_globals.threads);
-
-	return NULL;
-}
-
-static void *SWITCH_THREAD_FUNC handle_node(switch_thread_t *thread, void *obj) {
-	ei_node_t *ei_node = (ei_node_t *) obj;
-	ei_received_msg_t *received_msg = NULL;
-	int fault_count = 0;
-
-	switch_atomic_inc(&kazoo_globals.threads);
-
-	switch_assert(ei_node != NULL);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting node request handler %p: %s (%s:%d)\n", (void *)ei_node, ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port);
-
-	add_to_ei_nodes(ei_node);
-
-	while (switch_test_flag(ei_node, LFLAG_RUNNING) && switch_test_flag(&kazoo_globals, LFLAG_RUNNING)) {
-		int status;
-		int send_msg_count = 0;
-		void *pop = NULL;
-
-		if (!received_msg) {
-			switch_malloc(received_msg, sizeof(*received_msg));
-			/* create a new buf for the erlang message and a rbuf for the reply */
-			if(kazoo_globals.receive_msg_preallocate > 0) {
-				switch_malloc(received_msg->buf.buff, kazoo_globals.receive_msg_preallocate);
-				received_msg->buf.buffsz = kazoo_globals.receive_msg_preallocate;
-				received_msg->buf.index = 0;
-				if(received_msg->buf.buff == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not pre-allocate memory for mod_kazoo message\n");
-					goto exit;
-				}
-			} else {
-				ei_x_new(&received_msg->buf);
-			}
-		} else {
-			received_msg->buf.index = 0;
-		}
-
-		while (++send_msg_count <= kazoo_globals.send_msg_batch
-			   && ei_queue_pop(ei_node->send_msgs, &pop, ei_node->sender_queue_timeout) == SWITCH_STATUS_SUCCESS) {
-			ei_send_msg_t *send_msg = (ei_send_msg_t *) pop;
-			ei_helper_send(ei_node, &send_msg->pid, &send_msg->buf);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sent erlang message to %s <%d.%d.%d>\n"
-							  ,send_msg->pid.node
-							  ,send_msg->pid.creation
-							  ,send_msg->pid.num
-							  ,send_msg->pid.serial);
-			ei_x_free(&send_msg->buf);
-			switch_safe_free(send_msg);
-		}
-
-		/* wait for a erlang message, or timeout to check if the module is still running */
-		status = ei_xreceive_msg_tmo(ei_node->nodefd, &received_msg->msg, &received_msg->buf, kazoo_globals.ei_receive_timeout);
-
-		switch (status) {
-		case ERL_TICK:
-			/* erlang nodes send ticks to eachother to validate they are still reachable, we dont have to do anything here */
-			fault_count = 0;
-			break;
-		case ERL_MSG:
-			fault_count = 0;
-
-			if (kazoo_globals.receive_msg_preallocate > 0 && received_msg->buf.buffsz > kazoo_globals.receive_msg_preallocate) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "increased received message buffer size to %d\n", received_msg->buf.buffsz);
-			}
-
-			if (switch_queue_trypush(ei_node->received_msgs, received_msg) != SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to push erlang received message from %s <%d.%d.%d> into queue\n", received_msg->msg.from.node, received_msg->msg.from.creation, received_msg->msg.from.num, received_msg->msg.from.serial);
-				ei_x_free(&received_msg->buf);
-				switch_safe_free(received_msg);
-			}
-
-			received_msg = NULL;
-			break;
-		case ERL_ERROR:
-			switch (erl_errno) {
-			case ETIMEDOUT:
-			case EAGAIN:
-				/* if ei_xreceive_msg_tmo just timed out, ignore it and let the while loop check if we are still running */
-				/* the erlang lib just wants us to try to receive again, so we will! */
-				fault_count = 0;
-				break;
-			case EMSGSIZE:
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Erlang communication fault with node %p %s (%s:%d): my spoon is too big\n", (void *)ei_node, ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port);
-				switch_clear_flag(ei_node, LFLAG_RUNNING);
-				break;
-			case EIO:
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Erlang communication fault with node %p %s (%s:%d): socket closed or I/O error [fault count %d]\n", (void *)ei_node, ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port, ++fault_count);
-
-				if (fault_count >= kazoo_globals.io_fault_tolerance) {
-					switch_clear_flag(ei_node, LFLAG_RUNNING);
-				} else {
-					switch_sleep(kazoo_globals.io_fault_tolerance_sleep);
-				}
-
-				break;
-			default:
-				/* OH NOS! something has gone horribly wrong, shutdown the connection if status set by ei_xreceive_msg_tmo is less than or equal to 0 */
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Erlang communication fault with node %p %s (%s:%d): erl_errno=%d errno=%d\n", (void *)ei_node, ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port, erl_errno, errno);
-				if (status < 0) {
-					switch_clear_flag(ei_node, LFLAG_RUNNING);
-				}
-				break;
-			}
-			break;
-		default:
-			/* HUH? didnt plan for this, whatevs shutdown the connection if status set by ei_xreceive_msg_tmo is less than or equal to 0 */
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unexpected erlang receive status %p %s (%s:%d): %d\n", (void *)ei_node, ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port, status);
-			if (status < 0) {
-				switch_clear_flag(ei_node, LFLAG_RUNNING);
-			}
-			break;
-		}
-	}
-
- exit:
-
-    if (received_msg) {
-		ei_x_free(&received_msg->buf);
-		switch_safe_free(received_msg);
-	}
-
-	remove_from_ei_nodes(ei_node);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutdown erlang node handler %p: %s (%s:%d)\n", (void *)ei_node, ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port);
-
-	destroy_node_handler(ei_node);
-
-	switch_atomic_dec(&kazoo_globals.threads);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutdown Complete for erlang node handler %p: %s (%s:%d)\n", (void *)ei_node, ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port);
-
-	return NULL;
-}
-
-/* Create a thread to wait for messages from an erlang node and process them */
-switch_status_t new_kazoo_node(int nodefd, ErlConnect *conn) {
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	switch_memory_pool_t *pool = NULL;
-	switch_sockaddr_t *sa;
-	ei_node_t *ei_node;
-	int i = 0;
-
-	/* create memory pool for this erlang node */
-	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory: Too bad drinking scotch isn't a paying job or Kenny's dad would be a millionare!\n");
-		return SWITCH_STATUS_MEMERR;
-	}
-
-	/* from the erlang node's memory pool, allocate some memory for the structure */
-	if (!(ei_node = switch_core_alloc(pool, sizeof (*ei_node)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory: Stan, don't you know the first law of physics? Anything that's fun costs at least eight dollars.\n");
-		return SWITCH_STATUS_MEMERR;
-	}
-
-	memset(ei_node, 0, sizeof(*ei_node));
-
-	/* store the location of our pool */
-	ei_node->pool = pool;
-
-	/* save the file descriptor that the erlang interface lib uses to communicate with the new node */
-	ei_node->nodefd = nodefd;
-	ei_node->peer_nodename = switch_core_strdup(ei_node->pool, conn->nodename);
-	ei_node->created_time = switch_micro_time_now();
-	ei_node->legacy = kazoo_globals.legacy_events;
-	ei_node->event_stream_framing = kazoo_globals.event_stream_framing;
-	ei_node->event_stream_keepalive = kazoo_globals.event_stream_keepalive;
-	ei_node->event_stream_queue_timeout = kazoo_globals.event_stream_queue_timeout;
-	ei_node->receiver_queue_timeout = kazoo_globals.node_receiver_queue_timeout;
-	ei_node->sender_queue_timeout = kazoo_globals.node_sender_queue_timeout;
-
-	/* store the IP and node name we are talking with */
-	switch_os_sock_put(&ei_node->socket, (switch_os_socket_t *)&nodefd, pool);
-
-	switch_socket_addr_get(&sa, SWITCH_TRUE, ei_node->socket);
-	ei_node->remote_port = switch_sockaddr_get_port(sa);
-	switch_get_addr(ei_node->remote_ip, sizeof (ei_node->remote_ip), sa);
-
-	switch_socket_addr_get(&sa, SWITCH_FALSE, ei_node->socket);
-	ei_node->local_port = switch_sockaddr_get_port(sa);
-	switch_get_addr(ei_node->local_ip, sizeof (ei_node->local_ip), sa);
-
-	switch_queue_create(&ei_node->send_msgs, MAX_QUEUE_LEN, pool);
-	switch_queue_create(&ei_node->received_msgs, MAX_QUEUE_LEN, pool);
-
-	switch_mutex_init(&ei_node->event_streams_mutex, SWITCH_MUTEX_DEFAULT, pool);
-
-	/* when we start we are running */
-	switch_set_flag(ei_node, LFLAG_RUNNING);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "New erlang connection from node %s (%s:%d) -> (%s:%d)\n", ei_node->peer_nodename, ei_node->remote_ip, ei_node->remote_port, ei_node->local_ip, ei_node->local_port);
-
-	for(i = 0; i < kazoo_globals.node_worker_threads; i++) {
-		switch_threadattr_create(&thd_attr, ei_node->pool);
-		switch_threadattr_detach_set(thd_attr, 1);
-		switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-		switch_thread_create(&thread, thd_attr, receive_handler, ei_node, ei_node->pool);
-	}
-
-	switch_threadattr_create(&thd_attr, ei_node->pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&thread, thd_attr, handle_node, ei_node, ei_node->pool);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_tweaks.c b/src/mod/event_handlers/mod_kazoo/kazoo_tweaks.c
deleted file mode 100644
index e647871855..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_tweaks.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Luis Azedo <luis@2600hz.com>
- *
- * mod_hacks.c -- hacks with state handlers
- *
- */
-#include "mod_kazoo.h"
-
-static char *TWEAK_NAMES[] = {
-	"interaction-id",
-	"export-vars",
-	"switch-uri",
-	"replaces-call-id",
-	"loopback-vars",
-	"caller-id",
-	"transfers",
-	"bridge",
-	"bridge-replaces-aleg",
-	"bridge-replaces-call-id",
-	"bridge-variables",
-	"restore-caller-id-on-blind-xfer"
-};
-
-static const char *bridge_variables[] = {
-		"Call-Control-Queue",
-		"Call-Control-PID",
-		"Call-Control-Node",
-		INTERACTION_VARIABLE,
-		"ecallmgr_Ecallmgr-Node",
-		"sip_h_k-cid",
-		"Switch-URI",
-		"Switch-URL",
-		NULL
-};
-
-static switch_status_t kz_tweaks_signal_bridge_on_hangup(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_event_t *my_event;
-
-	const char *peer_uuid = switch_channel_get_variable(channel, "Bridge-B-Unique-ID");
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "tweak signal bridge on hangup: %s , %s\n", switch_core_session_get_uuid(session), peer_uuid);
-
-	if (switch_event_create(&my_event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(my_event, SWITCH_STACK_BOTTOM, "Bridge-A-Unique-ID", switch_core_session_get_uuid(session));
-		switch_event_add_header_string(my_event, SWITCH_STACK_BOTTOM, "Bridge-B-Unique-ID", peer_uuid);
-		switch_channel_event_set_data(channel, my_event);
-		switch_event_fire(&my_event);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static const switch_state_handler_table_t kz_tweaks_signal_bridge_state_handlers = {
-	/*.on_init */ NULL,
-	/*.on_routing */ NULL,
-	/*.on_execute */ NULL,
-	/*.on_hangup */ kz_tweaks_signal_bridge_on_hangup,
-	/*.on_exchange_media */ NULL,
-	/*.on_soft_execute */ NULL,
-	/*.on_consume_media */ NULL,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ NULL,
-	/*.on_destroy */ NULL
-};
-
-static void kz_tweaks_handle_bridge_variables(switch_event_t *event)
-{
-	switch_core_session_t *a_session = NULL, *b_session = NULL;
-	const char *a_leg = switch_event_get_header(event, "Bridge-A-Unique-ID");
-	const char *b_leg = switch_event_get_header(event, "Bridge-B-Unique-ID");
-	const char *reentry = switch_event_get_header(event, "Bridge-Event-Processed");
-	int i;
-
-	if (!kz_test_tweak(KZ_TWEAK_BRIDGE_VARIABLES)) return;
-
-	if(reentry) return;
-
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(a_leg), SWITCH_LOG_DEBUG, "tweak bridge event handler: variables : %s , %s\n", a_leg, b_leg);
-
-	if (a_leg && (a_session = switch_core_session_locate(a_leg)) != NULL) {
-		switch_channel_t *a_channel = switch_core_session_get_channel(a_session);
-		switch_channel_timetable_t *a_times = switch_channel_get_timetable(a_channel);
-		if(b_leg && (b_session = switch_core_session_locate(b_leg)) != NULL) {
-			switch_channel_t *b_channel = switch_core_session_get_channel(b_session);
-			switch_channel_timetable_t *b_times = switch_channel_get_timetable(b_channel);
-			if (a_times->created <= b_times->created) {
-				for(i = 0; bridge_variables[i] != NULL; i++) {
-					const char *val = switch_channel_get_variable_dup(a_channel, bridge_variables[i], SWITCH_FALSE, -1);
-					switch_channel_set_variable(b_channel, bridge_variables[i], val);
-				}
-			} else {
-				for(i = 0; bridge_variables[i] != NULL; i++) {
-					const char *val = switch_channel_get_variable_dup(b_channel, bridge_variables[i], SWITCH_FALSE, -1);
-					switch_channel_set_variable(a_channel, bridge_variables[i], val);
-				}
-			}
-			switch_core_session_rwunlock(b_session);
-		}
-		switch_core_session_rwunlock(a_session);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(a_leg), SWITCH_LOG_DEBUG1, "NOT FOUND : %s\n", a_leg);
-	}
-}
-
-static void kz_tweaks_handle_bridge_replaces_call_id(switch_event_t *event)
-{
-	switch_event_t *my_event;
-
-	const char *replaced_call_id =	switch_event_get_header(event, "variable_sip_replaces_call_id");
-	const char *peer_uuid = switch_event_get_header(event, "Unique-ID");
-	const char *reentry = switch_event_get_header(event, "Bridge-Event-Processed");
-
-	if (!kz_test_tweak(KZ_TWEAK_BRIDGE_REPLACES_CALL_ID)) return;
-
-	if(reentry) return;
-
-	if(replaced_call_id) {
-		switch_core_session_t *call_session = NULL;
-		const char *call_id = switch_event_get_header(event, "Bridge-B-Unique-ID");
-		if (call_id && (call_session = switch_core_session_locate(call_id)) != NULL) {
-			switch_channel_t *call_channel = switch_core_session_get_channel(call_session);
-			if (switch_event_create(&my_event, SWITCH_EVENT_CHANNEL_BRIDGE) == SWITCH_STATUS_SUCCESS) {
-				switch_event_add_header_string(my_event, SWITCH_STACK_BOTTOM, "Bridge-A-Unique-ID", switch_core_session_get_uuid(call_session));
-				switch_event_add_header_string(my_event, SWITCH_STACK_BOTTOM, "Bridge-B-Unique-ID", peer_uuid);
-				switch_event_add_header_string(my_event, SWITCH_STACK_BOTTOM, "Bridge-Event-Processed", "true");
-				switch_channel_event_set_data(call_channel, my_event);
-				switch_event_fire(&my_event);
-			}
-			switch_channel_set_variable(call_channel, "Bridge-B-Unique-ID", peer_uuid);
-			switch_channel_add_state_handler(call_channel, &kz_tweaks_signal_bridge_state_handlers);
-			switch_core_session_rwunlock(call_session);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "NOT FOUND : %s\n", call_id);
-		}
-	}
-}
-
-static void kz_tweaks_channel_bridge_event_handler(switch_event_t *event)
-{
-	if (!kz_test_tweak(KZ_TWEAK_BRIDGE)) return;
-
-	kz_tweaks_handle_bridge_replaces_call_id(event);
-	kz_tweaks_handle_bridge_variables(event);
-}
-
-// TRANSFERS
-
-static void kz_tweaks_channel_replaced_event_handler(switch_event_t *event)
-{
-	const char *uuid = switch_event_get_header(event, "Unique-ID");
-	const char *replaced_by = switch_event_get_header(event, "att_xfer_replaced_by");
-
-	if (!kz_test_tweak(KZ_TWEAK_TRANSFERS)) return;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "REPLACED : %s , %s\n", uuid, replaced_by);
-}
-
-static void kz_tweaks_channel_intercepted_event_handler(switch_event_t *event)
-{
-	const char *uuid = switch_event_get_header(event, "Unique-ID");
-	const char *peer_uuid = switch_event_get_header(event, "intercepted_by");
-
-	if (!kz_test_tweak(KZ_TWEAK_TRANSFERS)) return;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "INTERCEPTED : %s => %s\n", uuid, peer_uuid);
-}
-
-static void kz_tweaks_channel_transferor_event_handler(switch_event_t *event)
-{
-	switch_core_session_t *uuid_session = NULL;
-	switch_event_t *evt = NULL;
-	const char *uuid = switch_event_get_header(event, "Unique-ID");
-
-	const char *orig_call_id = switch_event_get_header(event, "att_xfer_original_call_id");
-	const char *dest_peer_uuid = switch_event_get_header(event, "att_xfer_destination_peer_uuid");
-	const char *dest_call_id = switch_event_get_header(event, "att_xfer_destination_call_id");
-
-	const char *file = switch_event_get_header(event, "Event-Calling-File");
-	const char *func = switch_event_get_header(event, "Event-Calling-Function");
-	const char *line = switch_event_get_header(event, "Event-Calling-Line-Number");
-
-	if (!kz_test_tweak(KZ_TWEAK_TRANSFERS)) return;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TRANSFEROR : %s , %s , %s, %s, %s , %s , %s \n", uuid, orig_call_id, dest_peer_uuid, dest_call_id, file, func, line);
-	if ((uuid_session = switch_core_session_locate(uuid)) != NULL) {
-		switch_channel_t *uuid_channel = switch_core_session_get_channel(uuid_session);
-		const char* interaction_id = switch_channel_get_variable_dup(uuid_channel, INTERACTION_VARIABLE, SWITCH_TRUE, -1);
-		// set to uuid & peer_uuid
-		if(interaction_id != NULL) {
-			switch_core_session_t *session = NULL;
-			if(dest_call_id && (session = switch_core_session_locate(dest_call_id)) != NULL) {
-				switch_channel_t *channel = switch_core_session_get_channel(session);
-				const char* prv_interaction_id = switch_channel_get_variable_dup(channel, INTERACTION_VARIABLE, SWITCH_TRUE, -1);
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LOCATING UUID PRV : %s : %s\n", prv_interaction_id, interaction_id);
-				switch_channel_set_variable(channel, INTERACTION_VARIABLE, interaction_id);
-				if (switch_event_create(&evt, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-					switch_channel_event_set_data(channel, evt);
-					switch_event_fire(&evt);
-				}
-				switch_core_session_rwunlock(session);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TRANSFEROR NO UUID SESSION: %s , %s , %s \n", uuid, dest_call_id, dest_peer_uuid);
-			}
-			if(dest_peer_uuid && (session = switch_core_session_locate(dest_peer_uuid)) != NULL) {
-				switch_channel_t *channel = switch_core_session_get_channel(session);
-				const char* prv_interaction_id = switch_channel_get_variable_dup(channel, INTERACTION_VARIABLE, SWITCH_TRUE, -1);
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LOCATING PEER UUID PRV : %s : %s\n", prv_interaction_id, interaction_id);
-				switch_channel_set_variable(channel, INTERACTION_VARIABLE, interaction_id);
-				if (switch_event_create(&evt, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-					switch_channel_event_set_data(channel, evt);
-					switch_event_fire(&evt);
-				}
-				switch_core_session_rwunlock(session);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TRANSFEROR NO PEER SESSION: %s , %s , %s \n", uuid, dest_call_id, dest_peer_uuid);
-			}
-			if(orig_call_id && (session = switch_core_session_locate(orig_call_id)) != NULL) {
-				switch_channel_t *channel = switch_core_session_get_channel(session);
-				const char* prv_interaction_id = switch_channel_get_variable_dup(channel, INTERACTION_VARIABLE, SWITCH_TRUE, -1);
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LOCATING PEER UUID PRV : %s : %s\n", prv_interaction_id, interaction_id);
-				switch_channel_set_variable(channel, INTERACTION_VARIABLE, interaction_id);
-				if (switch_event_create(&evt, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-					switch_channel_event_set_data(channel, evt);
-					switch_event_fire(&evt);
-				}
-				switch_core_session_rwunlock(session);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TRANSFEROR NO PEER SESSION: %s , %s , %s \n", uuid, dest_call_id, dest_peer_uuid);
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TRANSFEROR ID = NULL : %s , %s , %s \n", uuid, dest_call_id, dest_peer_uuid);
-		}
-		switch_core_session_rwunlock(uuid_session);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SESSION NOT FOUND : %s\n", uuid);
-	}
-}
-
-static void kz_tweaks_channel_transferee_event_handler(switch_event_t *event)
-{
-	const char *uuid = switch_event_get_header(event, "Unique-ID");
-	const char *replaced_by_uuid = switch_event_get_header(event, "att_xfer_replaced_call_id");
-
-	if (!kz_test_tweak(KZ_TWEAK_TRANSFERS)) return;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TRANSFEREE : %s replaced by %s\n", uuid, replaced_by_uuid);
-}
-
-// END TRANSFERS
-
-
-static switch_status_t kz_tweaks_handle_loopback(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_t *a_channel = NULL;
-	const char * loopback_leg = NULL;
-	const char * loopback_aleg = NULL;
-	switch_core_session_t *a_session = NULL;
-	switch_event_t *event = NULL;
-	switch_event_header_t *header = NULL;
-	switch_event_t *to_add = NULL;
-	switch_event_t *to_remove = NULL;
-	switch_caller_profile_t *caller;
-	int n = 0;
-
-	if (!kz_test_tweak(KZ_TWEAK_LOOPBACK_VARS)) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	caller = switch_channel_get_caller_profile(channel);
-	if(strncmp(caller->source, "mod_loopback", 12))
-		return SWITCH_STATUS_SUCCESS;
-
-	if((loopback_leg = switch_channel_get_variable(channel, "loopback_leg")) == NULL)
-		return SWITCH_STATUS_SUCCESS;
-
-	if(strncmp(loopback_leg, "B", 1))
-		return SWITCH_STATUS_SUCCESS;
-
-	switch_channel_get_variables(channel, &event);
-	switch_event_create_plain(&to_add, SWITCH_EVENT_CHANNEL_DATA);
-	switch_event_create_plain(&to_remove, SWITCH_EVENT_CHANNEL_DATA);
-
-	for(header = event->headers; header; header = header->next) {
-		if(!strncmp(header->name, "Export-Loopback-", 16)) {
-			kz_switch_event_add_variable_name_printf(to_add, SWITCH_STACK_BOTTOM, header->value, "%s", header->name+16);
-			switch_channel_set_variable(channel, header->name, NULL);
-			n++;
-		} else if(!strncmp(header->name, "sip_loopback_", 13)) {
-			kz_switch_event_add_variable_name_printf(to_add, SWITCH_STACK_BOTTOM, header->value, "sip_%s", header->name+13);
-		} else if(!strncmp(header->name, "ecallmgr_", 9)) {
-			switch_event_add_header_string(to_remove, SWITCH_STACK_BOTTOM, header->name, header->value);
-		}
-	}
-	if(n) {
-		for(header = to_remove->headers; header; header = header->next) {
-			switch_channel_set_variable(channel, header->name, NULL);
-		}
-	}
-
-	for(header = to_add->headers; header; header = header->next) {
-		switch_channel_set_variable(channel, header->name, header->value);
-	}
-
-	// cleanup leg A
-	loopback_aleg = switch_channel_get_variable(channel, "other_loopback_leg_uuid");
-	if(loopback_aleg != NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "found loopback a-leg uuid - %s\n", loopback_aleg);
-		if ((a_session = switch_core_session_locate(loopback_aleg))) {
-			a_channel = switch_core_session_get_channel(a_session);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "found loopback session a - %s\n", loopback_aleg);
-			switch_channel_del_variable_prefix(a_channel, "Export-Loopback-");
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Couldn't locate loopback session a - %s\n", loopback_aleg);
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Couldn't find loopback a-leg uuid!\n");
-	}
-
-	/*
-	 *  set Interaction-ID
-	 *  if we're not crossing account boundaries
-	 */
-	if (kz_test_tweak(KZ_TWEAK_INTERACTION_ID)) {
-		if (a_channel) {
-			const char *interaction_id = switch_channel_get_variable_dup(a_channel, INTERACTION_VARIABLE, SWITCH_FALSE, -1);
-			const char *a_account_id  = switch_channel_get_variable_dup(a_channel, "ecallmgr_Account-ID", SWITCH_FALSE, -1);
-			const char *b_account_id  = switch_channel_get_variable_dup(channel, "ecallmgr_Account-ID", SWITCH_FALSE, -1);
-			if ((!a_account_id) || (!b_account_id) || (!strcmp(a_account_id, b_account_id))) {
-				switch_channel_set_variable(channel, INTERACTION_VARIABLE, interaction_id);
-			}
-		}
-	}
-
-	if (a_session){
-		switch_core_session_rwunlock(a_session);
-	}
-	switch_event_destroy(&event);
-	switch_event_destroy(&to_add);
-	switch_event_destroy(&to_remove);
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static void kz_tweaks_handle_caller_id(switch_core_session_t *session)
-{
-	if (kz_test_tweak(KZ_TWEAK_CALLER_ID)) {
-		switch_channel_t *channel = switch_core_session_get_channel(session);
-		switch_caller_profile_t* caller = switch_channel_get_caller_profile(channel);
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "CHECKING CALLER-ID\n");
-		if (caller && switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND) {
-			const char* val = NULL;
-			if((val=switch_caller_get_field_by_name(caller, "Endpoint-Caller-ID-Name"))) {
-				caller->caller_id_name = val;
-				caller->orig_caller_id_name = val;
-			}
-			if((val=switch_caller_get_field_by_name(caller, "Endpoint-Caller-ID-Number"))) {
-				caller->caller_id_number = val;
-				caller->orig_caller_id_number = val;
-			}
-		}
-	}
-}
-
-static switch_status_t kz_tweaks_handle_nightmare_xfer_interaction_id(switch_core_session_t *session)
-{
-	if (kz_test_tweak(KZ_TWEAK_INTERACTION_ID)) {
-		switch_core_session_t *replace_session = NULL;
-		switch_channel_t *channel = switch_core_session_get_channel(session);
-		const char *replaced_call_id = switch_channel_get_variable(channel, "sip_replaces_call_id");
-		const char *core_uuid = switch_channel_get_variable(channel, "sip_h_X-FS-From-Core-UUID");
-		const char *partner_uuid = switch_channel_get_variable(channel, "sip_h_X-FS-Refer-Partner-UUID");
-		const char *interaction_id = switch_channel_get_variable(channel, "sip_h_X-FS-Call-Interaction-ID");
-		if(core_uuid && partner_uuid && replaced_call_id && interaction_id) {
-			switch_channel_set_variable(channel, INTERACTION_VARIABLE, interaction_id);
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "checking nightmare xfer tweak for %s\n", switch_channel_get_uuid(channel));
-			if ((replace_session = switch_core_session_locate(replaced_call_id))) {
-				switch_channel_t *replaced_call_channel = switch_core_session_get_channel(replace_session);
-				switch_channel_set_variable(replaced_call_channel, INTERACTION_VARIABLE, interaction_id);
-				switch_core_session_rwunlock(replace_session);
-			}
-			if ((replace_session = switch_core_session_locate(partner_uuid))) {
-				switch_channel_t *replaced_call_channel = switch_core_session_get_channel(replace_session);
-				switch_channel_set_variable(replaced_call_channel, INTERACTION_VARIABLE, interaction_id);
-				switch_core_session_rwunlock(replace_session);
-			}
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t kz_tweaks_handle_replaces_call_id(switch_core_session_t *session)
-{
-	if (kz_test_tweak(KZ_TWEAK_REPLACES_CALL_ID)) {
-		switch_core_session_t *replace_call_session = NULL;
-		switch_event_t *event;
-		switch_channel_t *channel = switch_core_session_get_channel(session);
-		const char *replaced_call_id = switch_channel_get_variable(channel, "sip_replaces_call_id");
-		const char *core_uuid = switch_channel_get_variable(channel, "sip_h_X-FS-From-Core-UUID");
-		if((!core_uuid) && replaced_call_id) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "checking replaces header tweak for %s\n", replaced_call_id);
-			if ((replace_call_session = switch_core_session_locate(replaced_call_id))) {
-				switch_channel_t *replaced_call_channel = switch_core_session_get_channel(replace_call_session);
-				int i;
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "setting bridge variables from %s to %s\n", replaced_call_id, switch_channel_get_uuid(channel));
-				for(i = 0; bridge_variables[i] != NULL; i++) {
-					const char *val = switch_channel_get_variable_dup(replaced_call_channel, bridge_variables[i], SWITCH_TRUE, -1);
-					switch_channel_set_variable(channel, bridge_variables[i], val);
-				}
-				if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) {
-					switch_channel_event_set_data(channel, event);
-					switch_event_fire(&event);
-				}
-				switch_core_session_rwunlock(replace_call_session);
-			}
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-
-static switch_status_t kz_tweaks_handle_switch_uri(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	if (kz_test_tweak(KZ_TWEAK_SWITCH_URI)) {
-		const char *profile_url = switch_channel_get_variable(channel, "sofia_profile_url");
-		if(profile_url) {
-			int n = strcspn(profile_url, "@");
-			switch_channel_set_variable(channel, "Switch-URL", profile_url);
-			switch_channel_set_variable_printf(channel, "Switch-URI", "sip:%s", n > 0 ? profile_url + n + 1 : profile_url);
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static char * kz_tweaks_new_interaction_id()
-{
-	long int first = (switch_micro_time_now() / 1000000) + UNIX_EPOCH_IN_GREGORIAN;
-	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	switch_uuid_t uuid;
-	switch_uuid_get(&uuid);
-	switch_uuid_format(uuid_str, &uuid);
-	uuid_str[8] = '\0';
-	return switch_mprintf("%ld-%s", first, uuid_str);
-}
-
-static void kz_tweaks_handle_interaction_id(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	char * val = NULL;
-	switch_core_session_t *peer_session = NULL;
-	const char* peer_interaction_id = NULL;
-
-	if (kz_test_tweak(KZ_TWEAK_INTERACTION_ID)) {
-		val = kz_tweaks_new_interaction_id();
-		if (val) {
-			switch_channel_set_variable(channel, "Original-"INTERACTION_VARIABLE, val);
-			if(switch_core_session_get_partner(session, &peer_session) == SWITCH_STATUS_SUCCESS) {
-				switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session);
-				peer_interaction_id = switch_channel_get_variable_dup(peer_channel, INTERACTION_VARIABLE, SWITCH_FALSE, -1);
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "PEER_SESSION => %s\n", peer_interaction_id);
-				if(peer_interaction_id) {
-					switch_channel_set_variable(channel, INTERACTION_VARIABLE, peer_interaction_id);
-				}
-				switch_core_session_rwunlock(peer_session);
-			} else if (!switch_channel_get_variable_dup(channel, INTERACTION_VARIABLE, SWITCH_FALSE, -1)) {
-				switch_channel_set_variable(channel, INTERACTION_VARIABLE, val);
-			}
-		}
-
-		switch_safe_free(val);
-	}
-
-}
-
-static switch_status_t kz_outgoing_channel(switch_core_session_t * session, switch_event_t * event, switch_caller_profile_t * cp, switch_core_session_t * peer_session, switch_originate_flag_t flag)
-{
-	if (kz_test_tweak(KZ_TWEAK_INTERACTION_ID)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "GOT OUTGOING\n");
-		if (peer_session) {
-			switch_channel_t *channel = switch_core_session_get_channel(session);
-			const char* interaction_id = switch_channel_get_variable_dup(channel, INTERACTION_VARIABLE, SWITCH_FALSE, -1);
-			switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session);
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SESSION && PEER_SESSION => %s\n", interaction_id );
-			if (interaction_id) {
-				switch_channel_set_variable(peer_channel, INTERACTION_VARIABLE, interaction_id);
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "NO SESSION && PEER_SESSION\n");
-		}
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t kz_tweaks_register_handle_blind_xfer(switch_core_session_t *session)
-{
-	if (kz_test_tweak(KZ_TWEAK_RESTORE_CALLER_ID_ON_BLIND_XFER)) {
-		switch_channel_t *channel = switch_core_session_get_channel(session);
-		switch_channel_set_variable(channel, "execute_on_blind_transfer", "kz_restore_caller_id");
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t kz_tweaks_on_init(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "checking tweaks for %s\n", switch_channel_get_uuid(channel));
-	switch_channel_set_flag(channel, CF_VERBOSE_EVENTS);
-	switch_core_event_hook_add_outgoing_channel(session, kz_outgoing_channel);
-	kz_tweaks_handle_interaction_id(session);
-	kz_tweaks_handle_switch_uri(session);
-	kz_tweaks_handle_caller_id(session);
-	kz_tweaks_handle_nightmare_xfer_interaction_id(session);
-	kz_tweaks_handle_replaces_call_id(session);
-	kz_tweaks_handle_loopback(session);
-	kz_tweaks_register_handle_blind_xfer(session);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_state_handler_table_t kz_tweaks_state_handlers = {
-	/*.on_init */ kz_tweaks_on_init,
-	/*.on_routing */ NULL,
-	/*.on_execute */ NULL,
-	/*.on_hangup */ NULL,
-	/*.on_exchange_media */ NULL,
-	/*.on_soft_execute */ NULL,
-	/*.on_consume_media */ NULL,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ NULL,
-	/*.on_destroy */ NULL
-};
-
-
-static void kz_tweaks_register_state_handlers()
-{
-/*
- * we may need two handlers
- * one with SSH_FLAG_PRE_EXEC
- * and another without it
- * mod_loopback tweaks needs post-init (SSH_FLAG_PRE_EXEC off)
- *
- * kz_tweaks_state_handlers.flags = SSH_FLAG_PRE_EXEC;
- *
- */
-	switch_core_add_state_handler(&kz_tweaks_state_handlers);
-}
-
-static void kz_tweaks_unregister_state_handlers()
-{
-	switch_core_remove_state_handler(&kz_tweaks_state_handlers);
-}
-
-static void kz_tweaks_bind_events()
-{
-	if (switch_event_bind("kz_tweaks", SWITCH_EVENT_CHANNEL_BRIDGE, SWITCH_EVENT_SUBCLASS_ANY, kz_tweaks_channel_bridge_event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
-	        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind to channel_bridge event!\n");
-	}
-	if (switch_event_bind("kz_tweaks", SWITCH_EVENT_CUSTOM, "sofia::replaced", kz_tweaks_channel_replaced_event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
-	        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind to channel_bridge event!\n");
-	}
-	if (switch_event_bind("kz_tweaks", SWITCH_EVENT_CUSTOM, "sofia::intercepted", kz_tweaks_channel_intercepted_event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
-	        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind to channel_bridge event!\n");
-	}
-	if (switch_event_bind("kz_tweaks", SWITCH_EVENT_CUSTOM, "sofia::transferor", kz_tweaks_channel_transferor_event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
-	        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind to channel_bridge event!\n");
-	}
-	if (switch_event_bind("kz_tweaks", SWITCH_EVENT_CUSTOM, "sofia::transferee", kz_tweaks_channel_transferee_event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
-	        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind to channel_bridge event!\n");
-	}
-}
-
-static void kz_tweaks_unbind_events()
-{
-	switch_event_unbind_callback(kz_tweaks_channel_bridge_event_handler);
-	switch_event_unbind_callback(kz_tweaks_channel_replaced_event_handler);
-	switch_event_unbind_callback(kz_tweaks_channel_intercepted_event_handler);
-	switch_event_unbind_callback(kz_tweaks_channel_transferor_event_handler);
-	switch_event_unbind_callback(kz_tweaks_channel_transferee_event_handler);
-}
-
-void kz_tweaks_add_core_variables()
-{
-	switch_core_set_variable("UNIX_EPOCH_IN_GREGORIAN", UNIX_EPOCH_IN_GREGORIAN_STR);
-}
-
-void kz_tweaks_start()
-{
-	kz_tweaks_add_core_variables();
-	kz_tweaks_register_state_handlers();
-	kz_tweaks_bind_events();
-}
-
-void kz_tweaks_stop()
-{
-	kz_tweaks_unbind_events();
-	kz_tweaks_unregister_state_handlers();
-}
-
-SWITCH_DECLARE(const char *) kz_tweak_name(kz_tweak_t tweak)
-{
-	return TWEAK_NAMES[tweak];
-}
-
-SWITCH_DECLARE(switch_status_t) kz_name_tweak(const char *name, kz_tweak_t *type)
-{
-	kz_tweak_t x;
-	for (x = 0; x < KZ_TWEAK_MAX; x++) {
-		if (!strcasecmp(name, TWEAK_NAMES[x])) {
-			*type = x;
-			return SWITCH_STATUS_SUCCESS;
-		}
-	}
-
-	return SWITCH_STATUS_FALSE;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
-
-
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_tweaks.h b/src/mod/event_handlers/mod_kazoo/kazoo_tweaks.h
deleted file mode 100644
index 11cf5f6561..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_tweaks.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <switch.h>
-
-typedef enum {
-	KZ_TWEAK_INTERACTION_ID,
-	KZ_TWEAK_EXPORT_VARS,
-	KZ_TWEAK_SWITCH_URI,
-	KZ_TWEAK_REPLACES_CALL_ID,
-	KZ_TWEAK_LOOPBACK_VARS,
-	KZ_TWEAK_CALLER_ID,
-	KZ_TWEAK_TRANSFERS,
-	KZ_TWEAK_BRIDGE,
-	KZ_TWEAK_BRIDGE_REPLACES_ALEG,
-	KZ_TWEAK_BRIDGE_REPLACES_CALL_ID,
-	KZ_TWEAK_BRIDGE_VARIABLES,
-	KZ_TWEAK_RESTORE_CALLER_ID_ON_BLIND_XFER,
-
-	/* No new flags below this line */
-	KZ_TWEAK_MAX
-} kz_tweak_t;
-
-void kz_tweaks_start();
-void kz_tweaks_stop();
-SWITCH_DECLARE(const char *) kz_tweak_name(kz_tweak_t tweak);
-SWITCH_DECLARE(switch_status_t) kz_name_tweak(const char *name, kz_tweak_t *type);
-
-
-#define kz_test_tweak(flag) (kazoo_globals.tweaks[flag] ? 1 : 0)
-#define kz_set_tweak(flag) kazoo_globals.tweaks[flag] = 1
-#define kz_clear_tweak(flag) kazoo_globals.tweaks[flag] = 0
-
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_utils.c b/src/mod/event_handlers/mod_kazoo/kazoo_utils.c
deleted file mode 100644
index 951707d179..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_utils.c
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- * Andrew Thompson <andrew@hijacked.us>
- * Rob Charlton <rob.charlton@savageminds.com>
- * Karl Anderson <karl@2600hz.com>
- *
- * Original from mod_erlang_event.
- * ei_helpers.c -- helper functions for ei
- *
- */
-#include "mod_kazoo.h"
-
-#define kz_resize(l) {\
-char *dp;\
-olen += (len + l + block);\
-cpos = c - data;\
-if ((dp = realloc(data, olen))) {\
-	data = dp;\
-	c = data + cpos;\
-	memset(c, 0, olen - cpos);\
- }}                           \
-
-
-void kz_check_set_profile_var(switch_channel_t *channel, char* var, char *val)
-{
-	int idx = 0;
-	while(kazoo_globals.profile_vars_prefixes[idx] != NULL) {
-		char *prefix = kazoo_globals.profile_vars_prefixes[idx];
-		if (!strncasecmp(var, prefix, strlen(prefix))) {
-			switch_channel_set_profile_var(channel, var + strlen(prefix), val);
-
-		}
-		idx++;
-	}
-}
-
-SWITCH_DECLARE(switch_status_t) kz_switch_core_merge_variables(switch_event_t *event)
-{
-	switch_event_t *global_vars;
-	switch_status_t status = switch_core_get_variables(&global_vars);
-	if(status == SWITCH_STATUS_SUCCESS) {
-		switch_event_merge(event, global_vars);
-		switch_event_destroy(&global_vars);
-	}
-	return status;
-}
-
-SWITCH_DECLARE(switch_status_t) kz_switch_core_base_headers_for_expand(switch_event_t **event)
-{
-	switch_status_t status = SWITCH_STATUS_GENERR;
-	*event = NULL;
-	if(switch_event_create(event, SWITCH_EVENT_GENERAL) == SWITCH_STATUS_SUCCESS) {
-		status = kz_switch_core_merge_variables(*event);
-	}
-	return status;
-}
-
-SWITCH_DECLARE(switch_status_t) kz_expand_api_execute(const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream)
-{
-	switch_api_interface_t *api;
-	switch_status_t status;
-	char *arg_used;
-	char *cmd_used;
-
-	switch_assert(stream != NULL);
-	switch_assert(stream->data != NULL);
-	switch_assert(stream->write_function != NULL);
-
-	cmd_used = switch_strip_whitespace(cmd);
-	arg_used = switch_strip_whitespace(arg);
-
-	if (cmd_used && (api = switch_loadable_module_get_api_interface(cmd_used)) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "executing [%s] => [%s]\n", cmd_used, arg_used);
-		if ((status = api->function(arg_used, session, stream)) != SWITCH_STATUS_SUCCESS) {
-			stream->write_function(stream, "COMMAND RETURNED ERROR!\n");
-		}
-		UNPROTECT_INTERFACE(api);
-	} else {
-		status = SWITCH_STATUS_FALSE;
-		stream->write_function(stream, "INVALID COMMAND!\n");
-	}
-
-	if (cmd_used != cmd) {
-		switch_safe_free(cmd_used);
-	}
-
-	if (arg_used != arg) {
-		switch_safe_free(arg_used);
-	}
-
-	return status;
-}
-
-
-SWITCH_DECLARE(char *) kz_event_expand_headers_check(switch_event_t *event, const char *in, switch_event_t *var_list, switch_event_t *api_list, uint32_t recur)
-{
-	char *p, *c = NULL;
-	char *data, *indup, *endof_indup;
-	size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128;
-	const char *sub_val = NULL;
-	char *cloned_sub_val = NULL, *expanded_sub_val = NULL;
-	char *func_val = NULL;
-	int nv = 0;
-	char *gvar = NULL, *sb = NULL;
-
-	if (recur > 100) {
-		return (char *) in;
-	}
-
-	if (zstr(in)) {
-		return (char *) in;
-	}
-
-	nv = switch_string_var_check_const(in) || switch_string_has_escaped_data(in);
-
-	if (!nv) {
-		return (char *) in;
-	}
-
-	nv = 0;
-	olen = strlen(in) + 1;
-	indup = strdup(in);
-	switch_assert(indup);
-	endof_indup = end_of_p(indup) + 1;
-
-	if ((data = malloc(olen))) {
-		memset(data, 0, olen);
-		c = data;
-		for (p = indup; p && p < endof_indup && *p; p++) {
-			int global = 0;
-			vtype = 0;
-
-			if (*p == '\\') {
-				if (*(p + 1) == '$') {
-					nv = 1;
-					p++;
-					if (*(p + 1) == '$') {
-						p++;
-					}
-				} else if (*(p + 1) == '\'') {
-					p++;
-					continue;
-				} else if (*(p + 1) == '\\') {
-					if (len + 1 >= olen) {
-						kz_resize(1);
-					}
-
-					*c++ = *p++;
-					len++;
-					continue;
-				}
-			}
-
-			if (*p == '$' && !nv) {
-				if (*(p + 1) == '$') {
-					p++;
-					global++;
-				}
-
-				if (*(p + 1)) {
-					if (*(p + 1) == '{') {
-						vtype = global ? 3 : 1;
-					} else {
-						nv = 1;
-					}
-				} else {
-					nv = 1;
-				}
-			}
-
-			if (nv) {
-				if (len + 1 >= olen) {
-					kz_resize(1);
-				}
-
-				*c++ = *p;
-				len++;
-				nv = 0;
-				continue;
-			}
-
-			if (vtype) {
-				char *s = p, *e, *vname, *vval = NULL;
-				size_t nlen;
-
-				s++;
-
-				if ((vtype == 1 || vtype == 3) && *s == '{') {
-					br = 1;
-					s++;
-				}
-
-				e = s;
-				vname = s;
-				while (*e) {
-					if (br == 1 && *e == '}') {
-						br = 0;
-						*e++ = '\0';
-						break;
-					}
-
-					if (br > 0) {
-						if (e != s && *e == '{') {
-							br++;
-						} else if (br > 1 && *e == '}') {
-							br--;
-						}
-					}
-
-					e++;
-				}
-				p = e > endof_indup ? endof_indup : e;
-
-				vval = NULL;
-				for(sb = vname; sb && *sb; sb++) {
-					if (*sb == ' ') {
-						vval = sb;
-						break;
-					} else if (*sb == '(') {
-						vval = sb;
-						br = 1;
-						break;
-					}
-				}
-
-				if (vval) {
-					e = vval - 1;
-					*vval++ = '\0';
-
-					while (*e == ' ') {
-						*e-- = '\0';
-					}
-					e = vval;
-
-					while (e && *e) {
-						if (*e == '(') {
-							br++;
-						} else if (br > 1 && *e == ')') {
-							br--;
-						} else if (br == 1 && *e == ')') {
-							*e = '\0';
-							break;
-						}
-						e++;
-					}
-
-					vtype = 2;
-				}
-
-				if (vtype == 1 || vtype == 3) {
-					char *expanded = NULL;
-					int offset = 0;
-					int ooffset = 0;
-					char *ptr;
-					int idx = -1;
-
-					if ((expanded = kz_event_expand_headers_check(event, (char *) vname, var_list, api_list, recur+1)) == vname) {
-						expanded = NULL;
-					} else {
-						vname = expanded;
-					}
-					if ((ptr = strchr(vname, ':'))) {
-						*ptr++ = '\0';
-						offset = atoi(ptr);
-						if ((ptr = strchr(ptr, ':'))) {
-							ptr++;
-							ooffset = atoi(ptr);
-						}
-					}
-
-					if ((ptr = strchr(vname, '[')) && strchr(ptr, ']')) {
-						*ptr++ = '\0';
-						idx = atoi(ptr);
-					}
-
-					if (vtype == 3 || !(sub_val = switch_event_get_header_idx(event, vname, idx))) {
-						switch_safe_free(gvar);
-						if ((gvar = switch_core_get_variable_dup(vname))) {
-							sub_val = gvar;
-						}
-
-						if (var_list && !switch_event_check_permission_list(var_list, vname)) {
-							sub_val = "<Variable Expansion Permission Denied>";
-						}
-
-
-						if ((expanded_sub_val = kz_event_expand_headers_check(event, sub_val, var_list, api_list, recur+1)) == sub_val) {
-							expanded_sub_val = NULL;
-						} else {
-							sub_val = expanded_sub_val;
-						}
-					}
-
-					if (sub_val) {
-						if (offset || ooffset) {
-							cloned_sub_val = strdup(sub_val);
-							switch_assert(cloned_sub_val);
-							sub_val = cloned_sub_val;
-						}
-
-						if (offset >= 0) {
-							sub_val += offset;
-						} else if ((size_t) abs(offset) <= strlen(sub_val)) {
-							sub_val = cloned_sub_val + (strlen(cloned_sub_val) + offset);
-						}
-
-						if (ooffset > 0 && (size_t) ooffset < strlen(sub_val)) {
-							if ((ptr = (char *) sub_val + ooffset)) {
-								*ptr = '\0';
-							}
-						}
-					}
-
-					switch_safe_free(expanded);
-				} else {
-					char *expanded = NULL;
-					char *expanded_vname = NULL;
-
-					if ((expanded_vname = kz_event_expand_headers_check(event, (char *) vname, var_list, api_list, recur+1)) == vname) {
-						expanded_vname = NULL;
-					} else {
-						vname = expanded_vname;
-					}
-
-					if ((expanded = kz_event_expand_headers_check(event, vval, var_list, api_list, recur+1)) == vval) {
-						expanded = NULL;
-					} else {
-						vval = expanded;
-					}
-
-					if (!switch_core_test_flag(SCF_API_EXPANSION) || (api_list && !switch_event_check_permission_list(api_list, vname))) {
-						func_val = NULL;
-						sub_val = "<API execute Permission Denied>";
-					} else {
-						switch_stream_handle_t stream = { 0 };
-
-						SWITCH_STANDARD_STREAM(stream);
-						stream.param_event = event;
-						if (kz_expand_api_execute(vname, vval, NULL, &stream) == SWITCH_STATUS_SUCCESS) {
-							func_val = stream.data;
-							sub_val = func_val;
-						} else {
-							free(stream.data);
-						}
-					}
-
-					switch_safe_free(expanded);
-					switch_safe_free(expanded_vname);
-				}
-				if ((nlen = sub_val ? strlen(sub_val) : 0)) {
-					if (len + nlen >= olen) {
-						kz_resize(nlen);
-					}
-
-					len += nlen;
-					strcat(c, sub_val);
-					c += nlen;
-				}
-
-				switch_safe_free(func_val);
-				switch_safe_free(cloned_sub_val);
-				switch_safe_free(expanded_sub_val);
-				sub_val = NULL;
-				vname = NULL;
-				br = 0;
-			}
-
-			if (sp) {
-				if (len + 1 >= olen) {
-					kz_resize(1);
-				}
-
-				*c++ = ' ';
-				sp = 0;
-				len++;
-			}
-
-			if (*p == '$') {
-				p--;
-			} else {
-				if (len + 1 >= olen) {
-					kz_resize(1);
-				}
-
-				*c++ = *p;
-				len++;
-			}
-		}
-	}
-	free(indup);
-	switch_safe_free(gvar);
-
-	return data;
-}
-
-SWITCH_DECLARE(char *) kz_event_expand_headers(switch_event_t *event, const char *in)
-{
-	return kz_event_expand_headers_check(event, in, NULL, NULL, 0);
-}
-
-SWITCH_DECLARE(char *) kz_event_expand_headers_pool(switch_memory_pool_t *pool, switch_event_t *event, char *val)
-{
-	char *expanded;
-	char *dup = NULL;
-
-	expanded = kz_event_expand_headers(event, val);
-	dup = switch_core_strdup(pool, expanded);
-
-	if (expanded != val) {
-		free(expanded);
-	}
-
-	return dup;
-}
-
-SWITCH_DECLARE(char *) kz_expand(const char *in, const char *uuid)
-{
-	switch_event_t *event = NULL;
-	char *ret = NULL;
-	kz_switch_core_base_headers_for_expand(&event);
-	if (uuid != NULL) {
-		switch_core_session_t *nsession = NULL;
-		if ((nsession = switch_core_session_locate(uuid))) {
-			switch_channel_event_set_data(switch_core_session_get_channel(nsession), event);
-			switch_core_session_rwunlock(nsession);
-		}
-	}
-	ret = kz_event_expand_headers_check(event, in, NULL, NULL, 0);
-	switch_event_destroy(&event);
-	return ret;
-}
-
-SWITCH_DECLARE(char *) kz_expand_pool(switch_memory_pool_t *pool, const char *in)
-{
-	char *expanded;
-	char *dup = NULL;
-
-	if(!(expanded = kz_expand(in, NULL))) {
-		return NULL;
-	}
-	dup = switch_core_strdup(pool, expanded);
-
-	if (expanded != in) {
-		switch_safe_free(expanded);
-	}
-
-	return dup;
-}
-
-char* kz_switch_event_get_first_of(switch_event_t *event, const char *list[])
-{
-	switch_event_header_t *header = NULL;
-	int i = 0;
-	while(list[i] != NULL) {
-		if((header = switch_event_get_header_ptr(event, list[i])) != NULL)
-			break;
-		i++;
-	}
-	if(header != NULL) {
-		return header->value;
-	} else {
-		return "nodomain";
-	}
-}
-
-SWITCH_DECLARE(switch_status_t) kz_switch_event_add_variable_name_printf(switch_event_t *event, switch_stack_t stack, const char *val, const char *fmt, ...)
-{
-	int ret = 0;
-	char *varname;
-	va_list ap;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-	switch_assert(event != NULL);
-
-
-	va_start(ap, fmt);
-	ret = switch_vasprintf(&varname, fmt, ap);
-	va_end(ap);
-
-	if (ret == -1) {
-		return SWITCH_STATUS_MEMERR;
-	}
-
-	status = switch_event_add_header_string(event, stack, varname, val);
-
-	free(varname);
-
-	return status;
-}
-
-SWITCH_DECLARE(switch_status_t) kz_expand_json_to_event(cJSON *json, switch_event_t *event, char * prefix)
-{
-	char * fmt = switch_mprintf("%s%s%%s", prefix ? prefix : "", prefix ? "_" : "");
-	if (event) {
-		cJSON *item = NULL;
-		char *response = NULL;
-		cJSON_ArrayForEach(item, json) {
-			if (item->type == cJSON_String) {
-				response = strdup(item->valuestring);
-			} else if (item->type == cJSON_Object) {
-				char * fmt1 = switch_mprintf(fmt, item->string);
-				kz_expand_json_to_event(item, event, fmt1);
-				switch_safe_free(fmt1);
-				continue;
-			} else {
-				response = cJSON_PrintUnformatted(item);
-			}
-			kz_switch_event_add_variable_name_printf(event, SWITCH_STACK_BOTTOM, response, fmt, item->string);
-			switch_safe_free(response);
-		}
-	}
-
-	switch_safe_free(fmt);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_DECLARE(switch_xml_t) kz_xml_child(switch_xml_t xml, const char *name)
-{
-	xml = (xml) ? xml->child : NULL;
-	while (xml && strcasecmp(name, xml->name))
-		xml = xml->sibling;
-	return xml;
-}
-
-void kz_xml_process(switch_xml_t cfg)
-{
-	switch_xml_t xml_process;
-	for (xml_process = kz_xml_child(cfg, "X-PRE-PROCESS"); xml_process; xml_process = xml_process->next) {
-		const char *cmd = switch_xml_attr(xml_process, "cmd");
-		const char *data = switch_xml_attr(xml_process, "data");
-		if(cmd != NULL && !strcasecmp(cmd, "set") && data) {
-			char *name = (char *) data;
-			char *val = strchr(name, '=');
-
-			if (val) {
-				char *ve = val++;
-				while (*val && *val == ' ') {
-					val++;
-				}
-				*ve-- = '\0';
-				while (*ve && *ve == ' ') {
-					*ve-- = '\0';
-				}
-			}
-
-			if (name && val) {
-				switch_core_set_variable(name, val);
-			}
-		}
-	}
-
-}
-
-void kz_event_decode(switch_event_t *event)
-{
-	switch_event_header_t *hp;
-	int i;
-	for (hp = event->headers; hp; hp = hp->next) {
-		if (strncmp(hp->name, "_json_", 6)) {
-			if (hp->idx) {
-				for(i = 0; i < hp->idx; i++) {
-					switch_url_decode(hp->array[i]);
-				}
-			} else {
-				switch_url_decode(hp->value);
-			}
-		}
-	}
-}
-
-void kz_expand_headers(switch_event_t *resolver, switch_event_t *event) {
-	switch_event_t *clone = NULL;
-	switch_event_header_t *header = NULL;
-	switch_event_create_plain(&clone, event->event_id);
-
-	for(header = event->headers; header; header = header->next) {
-		char *expanded = kz_event_expand_headers(resolver, header->value);
-		if (expanded != header->value) {
-			switch_event_add_header_string(clone, SWITCH_STACK_BOTTOM, header->name, expanded);
-			switch_safe_free(expanded);
-		}
-	}
-
-	/* we don't want to force unique headers
-	 * so we delete and then merge
-	 */
-	for(header = clone->headers; header; header = header->next) {
-		switch_event_del_header(event, header->name);
-	}
-
-	switch_event_merge(event, clone);
-
-	switch_event_destroy(&clone);
-}
-
-void kz_expand_headers_self(switch_event_t *event) {
-	kz_expand_headers(event, event);
-}
-
-char * kz_expand_vars(char *xml_str) {
-	return kz_expand_vars_pool(xml_str, NULL);
-}
-
-char * kz_expand_vars_pool(char *xml_str, switch_memory_pool_t *pool) {
-	char *var, *val;
-	char *rp = xml_str; /* read pointer */
-	char *ep, *wp, *buff; /* end pointer, write pointer, write buffer */
-
-	if (!(strstr(xml_str, "$${"))) {
-		return xml_str;
-	}
-
-	switch_zmalloc(buff, strlen(xml_str) * 2);
-	wp = buff;
-	ep = buff + (strlen(xml_str) * 2) - 1;
-
-	while (*rp && wp < ep) {
-		if (*rp == '$' && *(rp + 1) == '$' && *(rp + 2) == '{') {
-			char *e = switch_find_end_paren(rp + 2, '{', '}');
-
-			if (e) {
-				rp += 3;
-				var = rp;
-				*e++ = '\0';
-				rp = e;
-
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "trying to expand %s \n", var);
-				if ((val = switch_core_get_variable_dup(var))) {
-					char *p;
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "expanded %s to %s\n", var, val);
-					for (p = val; p && *p && wp <= ep; p++) {
-						*wp++ = *p;
-					}
-					switch_safe_free(val);
-				}
-				continue;
-			}
-		}
-
-		*wp++ = *rp++;
-	}
-
-	*wp++ = '\0';
-
-	if(pool) {
-		char * ret = switch_core_strdup(pool, buff);
-		switch_safe_free(buff);
-		return ret;
-	} else {
-		switch_safe_free(xml_str);
-		return buff;
-	}
-
-}
-
-switch_status_t kz_json_api(const char * command, cJSON *args, cJSON **res)
-{
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	cJSON *req = cJSON_CreateObject();
-	cJSON_AddItemToObject(req, "command", cJSON_CreateString(command));
-	cJSON_AddItemToObject(req, "data", args ? args : cJSON_CreateObject());
-	status = switch_json_api_execute(req, NULL, res);
-	cJSON_Delete(req);
-	return status;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_utils.h b/src/mod/event_handlers/mod_kazoo/kazoo_utils.h
deleted file mode 100644
index cb5549c760..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kazoo_utils.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <switch.h>
-
-#ifdef __cplusplus
-#define KZ_BEGIN_EXTERN_C       extern "C" {
-#define KZ_END_EXTERN_C         }
-#else
-#define KZ_BEGIN_EXTERN_C
-#define KZ_END_EXTERN_C
-#endif
-
-KZ_BEGIN_EXTERN_C
-
-void kz_check_set_profile_var(switch_channel_t *channel, char* var, char *val);
-
-SWITCH_DECLARE(switch_status_t) kz_switch_core_merge_variables(switch_event_t *event);
-
-SWITCH_DECLARE(switch_status_t) kz_switch_core_base_headers_for_expand(switch_event_t **event);
-
-SWITCH_DECLARE(switch_status_t) kz_expand_api_execute(const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream);
-
-SWITCH_DECLARE(char *) kz_event_expand_headers_check(switch_event_t *event, const char *in, switch_event_t *var_list, switch_event_t *api_list, uint32_t recur);
-
-SWITCH_DECLARE(char *) kz_event_expand_headers(switch_event_t *event, const char *in);
-
-SWITCH_DECLARE(char *) kz_event_expand_headers_pool(switch_memory_pool_t *pool, switch_event_t *event, char *val);
-
-SWITCH_DECLARE(char *) kz_expand(const char *in, const char *uuid);
-
-SWITCH_DECLARE(char *) kz_expand_pool(switch_memory_pool_t *pool, const char *in);
-
-char* kz_switch_event_get_first_of(switch_event_t *event, const char *list[]);
-
-SWITCH_DECLARE(switch_status_t) kz_switch_event_add_variable_name_printf(switch_event_t *event, switch_stack_t stack, const char *val, const char *fmt, ...);
-
-SWITCH_DECLARE(switch_xml_t) kz_xml_child(switch_xml_t xml, const char *name);
-
-void kz_xml_process(switch_xml_t cfg);
-void kz_event_decode(switch_event_t *event);
-
-char * kz_expand_vars(char *xml_str);
-void kz_expand_headers(switch_event_t *resolver, switch_event_t *event);
-void kz_expand_headers_self(switch_event_t *event);
-
-char * kz_expand_vars_pool(char *xml_str, switch_memory_pool_t *pool);
-switch_status_t kz_json_api(const char * command, cJSON *args, cJSON **res);
-
-SWITCH_DECLARE(switch_status_t) kz_expand_json_to_event(cJSON *json, switch_event_t *event, char * prefix);
-
-KZ_END_EXTERN_C
diff --git a/src/mod/event_handlers/mod_kazoo/kz_node.c b/src/mod/event_handlers/mod_kazoo/kz_node.c
deleted file mode 100644
index 1c50d0586e..0000000000
--- a/src/mod/event_handlers/mod_kazoo/kz_node.c
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "mod_kazoo.h"
-
-static int kz_nodes_module_names_array_callback(void *pArg, const char *module_name)
-{
-	cJSON *json = (cJSON *) pArg;
-	if(!strstr(module_name, "CORE")) {
-		cJSON_AddItemToArray(json, cJSON_CreateString(module_name));
-	}
-	return 0;
-}
-
-void kz_nodes_collect_media_role(cJSON *container)
-{
-	cJSON *retval = NULL;
-	if(kz_json_api("sofia.status.info", NULL, &retval) == SWITCH_STATUS_SUCCESS) {
-		if(retval != NULL && (!(retval->type & cJSON_NULL))) {
-			cJSON_AddItemToObject(container, "Media", cJSON_Duplicate(retval, 1));
-		}
-	}
-	if(retval) {
-		cJSON_Delete(retval);
-	}
-}
-
-void kz_nodes_collect_modules(cJSON *container)
-{
-	cJSON *modules = cJSON_CreateObject();
-	cJSON *loaded = cJSON_CreateArray();
-	cJSON *available = cJSON_CreateArray();
-	switch_loadable_module_enumerate_available(SWITCH_GLOBAL_dirs.mod_dir, kz_nodes_module_names_array_callback, available);
-	switch_loadable_module_enumerate_loaded(kz_nodes_module_names_array_callback, loaded);
-	cJSON_AddItemToObject(modules, "available", available);
-	cJSON_AddItemToObject(modules, "loaded", loaded);
-	cJSON_AddItemToObject(container, "Modules", modules);
-}
-
-void kz_nodes_collect_runtime(cJSON *container)
-{
-	cJSON *retval = NULL;
-	if(kz_json_api("status", NULL, &retval) == SWITCH_STATUS_SUCCESS) {
-		if(retval != NULL && (!(retval->type & cJSON_NULL))) {
-			cJSON *val = cJSON_Duplicate(retval, 1);
-			cJSON_AddItemToObject(val, "Core-UUID", cJSON_CreateString(switch_core_get_uuid()));
-			cJSON_AddItemToObject(container, "Runtime-Info", val);
-		}
-	}
-	if(retval) {
-		cJSON_Delete(retval);
-	}
-}
-
-void kz_nodes_collect_apps(cJSON *container)
-{
-	cJSON *apps = cJSON_CreateObject();
-	cJSON *app = cJSON_CreateObject();
-	cJSON_AddItemToObject(app, "Uptime", cJSON_CreateNumber(switch_core_uptime()));
-	cJSON_AddItemToObject(apps, "freeswitch", app);
-	cJSON_AddItemToObject(container, "WhApps", apps);
-}
-
-void kz_nodes_collect_roles(cJSON *container)
-{
-	cJSON *roles = cJSON_CreateObject();
-	cJSON_AddItemToObject(container, "Roles", roles);
-	kz_nodes_collect_media_role(roles);
-}
-
-cJSON * kz_node_create()
-{
-	cJSON *node = cJSON_CreateObject();
-
-	kz_nodes_collect_apps(node);
-	kz_nodes_collect_runtime(node);
-	kz_nodes_collect_modules(node);
-	kz_nodes_collect_roles(node);
-
-	return node;
-}
-
-SWITCH_STANDARD_JSON_API(kz_node_info_json_function)
-{
-	cJSON * ret = kz_node_create();
-	*json_reply = ret;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-void add_kz_node(switch_loadable_module_interface_t **module_interface)
-{
-	switch_json_api_interface_t *json_api_interface = NULL;
-	SWITCH_ADD_JSON_API(json_api_interface, "node.info", "JSON node API", kz_node_info_json_function, "");
-}
diff --git a/src/mod/event_handlers/mod_kazoo/mod_kazoo.c b/src/mod/event_handlers/mod_kazoo/mod_kazoo.c
deleted file mode 100644
index 15b8fb469c..0000000000
--- a/src/mod/event_handlers/mod_kazoo/mod_kazoo.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2012, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Karl Anderson <karl@2600hz.com>
- * Darren Schreiber <darren@2600hz.com>
- *
- *
- * mod_kazoo.c -- Socket Controlled Event Handler
- *
- */
-#include "mod_kazoo.h"
-
-kz_globals_t kazoo_globals = {0};
-
-
-
-SWITCH_MODULE_DEFINITION(mod_kazoo, mod_kazoo_load, mod_kazoo_shutdown, mod_kazoo_runtime);
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_kazoo_load)
-{
-	kz_erl_init();
-
-	memset(&kazoo_globals, 0, sizeof(kazoo_globals));
-	kazoo_globals.pool = pool;
-	kz_set_hostname();
-	if(kazoo_load_config() != SWITCH_STATUS_SUCCESS) {
-		// TODO: what would we need to clean up here?
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Improper configuration!\n");
-		return SWITCH_STATUS_TERM;
-	}
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	switch_thread_rwlock_create(&kazoo_globals.ei_nodes_lock, pool);
-
-	switch_set_flag(&kazoo_globals, LFLAG_RUNNING);
-
-	/* create all XML fetch agents */
-	bind_fetch_agents();
-
-	/* create an api for cli debug commands */
-	add_cli_api(module_interface);
-
-	/* add our modified commands */
-	add_kz_commands(module_interface);
-
-	/* add our modified dptools */
-	add_kz_dptools(module_interface);
-
-	/* add our endpoints */
-	add_kz_endpoints(module_interface);
-
-	/* add our kz_node api */
-	add_kz_node(module_interface);
-
-	/* add tweaks */
-	kz_tweaks_start();
-
-	/* add our cdr */
-	kz_cdr_start();
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_kazoo_shutdown) {
-	int sanity = 0;
-
-	remove_cli_api();
-
-	kz_cdr_stop();
-
-	kz_tweaks_stop();
-
-	/* stop taking new requests and start shuting down the threads */
-	switch_clear_flag(&kazoo_globals, LFLAG_RUNNING);
-
-	/* give everyone time to cleanly shutdown */
-	while (switch_atomic_read(&kazoo_globals.threads)) {
-		switch_yield(100000);
-		if (++sanity >= 200) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to kill all threads, continuing. This probably wont end well.....good luck!\n");
-			break;
-		}
-	}
-
-	/* close the connection to epmd and the acceptor */
-	close_socketfd(&kazoo_globals.epmdfd);
-	close_socket(&kazoo_globals.acceptor);
-
-	/* remove all XML fetch agents */
-	unbind_fetch_agents();
-
-	if (kazoo_globals.event_filter) {
-		switch_core_hash_destroy(&kazoo_globals.event_filter);
-	}
-
-	switch_thread_rwlock_wrlock(kazoo_globals.ei_nodes_lock);
-	switch_thread_rwlock_unlock(kazoo_globals.ei_nodes_lock);
-	switch_thread_rwlock_destroy(kazoo_globals.ei_nodes_lock);
-
-	/* Close the port we reserved for uPnP/Switch behind firewall, if necessary */
-	if (kazoo_globals.nat_map && switch_nat_get_type()) {
-		switch_nat_del_mapping(kazoo_globals.port, SWITCH_NAT_TCP);
-	}
-
-	kazoo_destroy_config();
-
-	/* clean up our allocated preferences */
-	switch_safe_free(kazoo_globals.ip);
-	switch_safe_free(kazoo_globals.ei_cookie);
-	switch_safe_free(kazoo_globals.ei_nodename);
-
-	kz_erl_shutdown();
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_kazoo/mod_kazoo.h b/src/mod/event_handlers/mod_kazoo/mod_kazoo.h
deleted file mode 100644
index 37fdd861e7..0000000000
--- a/src/mod/event_handlers/mod_kazoo/mod_kazoo.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <switch.h>
-#include <switch_event.h>
-#include <switch_json.h>
-#include <ei.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <float.h>
-
-#define MAX_ACL 100
-#define CMD_BUFLEN 1024 * 1000
-#define MAX_QUEUE_LEN 25000
-#define MAX_MISSED 500
-#define MAX_PID_CHARS 255
-
-extern const char kz_default_config[];
-extern const int kz_default_config_size;
-
-#include "kazoo_defs.h"
-#include "kazoo_tweaks.h"
-#include "kazoo_ei.h"
-#include "kazoo_message.h"
-#include "kazoo_utils.h"
-
-typedef enum {
-	LFLAG_RUNNING = (1 << 0)
-} event_flag_t;
-
-
-/* kazoo_commands.c */
-void add_kz_commands(switch_loadable_module_interface_t **module_interface);
-
-/* kazoo_dptools.c */
-void add_kz_dptools(switch_loadable_module_interface_t **module_interface);
-
-/* kazoo_api.c */
-void add_cli_api(switch_loadable_module_interface_t **module_interface);
-void remove_cli_api();
-
-/* kazoo_utils.c */
-/*
-SWITCH_DECLARE(switch_status_t) kz_switch_core_merge_variables(switch_event_t *event);
-SWITCH_DECLARE(switch_status_t) kz_switch_core_base_headers_for_expand(switch_event_t **event);
-void kz_check_set_profile_var(switch_channel_t *channel, char* var, char *val);
-char* kz_switch_event_get_first_of(switch_event_t *event, const char *list[]);
-SWITCH_DECLARE(switch_status_t) kz_switch_event_add_variable_name_printf(switch_event_t *event, switch_stack_t stack, const char *val, const char *fmt, ...);
-void kz_xml_process(switch_xml_t cfg);
-void kz_event_decode(switch_event_t *event);
-char * kz_expand_vars(char *xml_str);
-char * kz_expand_vars_pool(char *xml_str, switch_memory_pool_t *pool);
-SWITCH_DECLARE(char *) kz_event_expand_headers(switch_event_t *event, const char *in);
-SWITCH_DECLARE(char *) kz_expand(const char *in);
-SWITCH_DECLARE(char *) kz_expand_pool(switch_memory_pool_t *pool, const char *in);
-switch_status_t kz_json_api(const char * command, cJSON *args, cJSON **res);
-*/
-
-/* kazoo_endpoints.c */
-void add_kz_endpoints(switch_loadable_module_interface_t **module_interface);
-
-/* kazoo_cdr.c */
-void kz_cdr_start();
-void kz_cdr_stop();
-
-/* kazoo_tweaks.c */
-void kz_tweaks_start();
-void kz_tweaks_stop();
-SWITCH_DECLARE(const char *) kz_tweak_name(kz_tweak_t tweak);
-SWITCH_DECLARE(switch_status_t) kz_name_tweak(const char *name, kz_tweak_t *type);
-
-/* kazoo_node.c */
-void add_kz_node(switch_loadable_module_interface_t **module_interface);
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_kazoo_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_kazoo_shutdown);
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/src/mod/event_handlers/mod_radius_cdr/Makefile.am b/src/mod/event_handlers/mod_radius_cdr/Makefile.am
deleted file mode 100644
index b8a09eebdc..0000000000
--- a/src/mod/event_handlers/mod_radius_cdr/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_radius_cdr
-
-RADCLIENT_VERSION=1.1.7
-RADCLIENT=freeradius-client-$(RADCLIENT_VERSION)
-RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT)
-RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT)
-RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib
-RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la
-
-mod_LTLIBRARIES = mod_radius_cdr.la
-mod_radius_cdr_la_SOURCES  = mod_radius_cdr.c
-mod_radius_cdr_la_CFLAGS   = $(AM_CFLAGS) -I$(RADCLIENT_DIR)/include
-mod_radius_cdr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(RADCLIENT_LA)
-mod_radius_cdr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
-BUILT_SOURCES=$(RADCLIENT_LA)
-
-$(RADCLIENT_DIR):
-	$(GETLIB) $(RADCLIENT).tar.gz
-
-$(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
-	mkdir -p $(RADCLIENT_BUILDDIR)
-	cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
-	$(TOUCH_TARGET)
-
-$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
-	cd $(RADCLIENT_BUILDDIR) && CFLAGS="$(CFLAGS)" $(MAKE)
-	$(TOUCH_TARGET)
-
-
diff --git a/src/mod/event_handlers/mod_radius_cdr/README b/src/mod/event_handlers/mod_radius_cdr/README
deleted file mode 100644
index 1734d6b8fa..0000000000
--- a/src/mod/event_handlers/mod_radius_cdr/README
+++ /dev/null
@@ -1,98 +0,0 @@
-mod_radius_cdr - A cdr Accounting module for FreeSWITCH.
-
-cparker at segv dot org
-
-=========================================================================================
-
-Currently, this is in it's infancy, and is still being worked on.  It is not
-yet enabled by default in building.
-
-Comments, code, patches are always welcome.  :)
-
-=========================================================================================
-
-Pre-reqs:
-
-In order to use this module you will need to have the CVS head of the freeradius-client
-library installed.
-
-CVS version as of June 14, 2007 or later will be sufficient.
-
-Instructions on how to retrieve and install this can be found here:
-
-   http://wiki.freeradius.org/Radiusclient
-
-=========================================================================================
-
-Building:
-
-1) Compile and install freeradius-client library.
-
-2) Edit the top level 'configure.in'.  At approx line 336 you need to add:
-
----
-AC_CONFIG_FILES([Makefile
-                src/Makefile
-                src/mod/Makefile
-                src/mod/event_handlers/mod_cdr/Makefile
-+               src/mod/event_handlers/mod_radius_cdr/Makefile
-                src/mod/endpoints/mod_sofia/Makefile
-                src/include/switch_am_config.h
-                build/getlib.sh
-                build/modmake.rules])
----
-
-3) Rerun bootstrap, re-run configure
-
-4) Edit the top-level 'modules.conf'.  Add the following entry:
-
-...
-event_handlers/mod_radius_cdr
-...
-
-5) Run make, and make install.  Make sure the module is built and installed.
-
-6) Configure FreeSWITCH to load mod_radius_cdr
-
-   - Copy the 'mod_radius_cdr.conf.xml' file to the FreeSWITCH conf directory
-   - Copy the 'radius/' directory to the FreeSWITCH conf directory
-   - Edit 'conf/modules.conf' to load mod_radius_cdr
-   - Edit 'conf/freeswitch.xml' to include 'mod_radius_cdr.conf.xml'
-
-=========================================================================================
-
-Here's a sample RADIUS transaction ( logged to a detail file via FreeRADIUS server ):
-
-Fri Jun  8 08:23:10 2007
-        Acct-Status-Type = Start
-        Acct-Session-Id = "d734ff5e-bf04-4045-8cb3-f5744574808b"
-        Freeswitch-Src = "8478797989"
-        Freeswitch-CLID = "Chris Parker"
-        Freeswitch-Dst = "888"
-        Freeswitch-Dialplan = "XML"
-        NAS-Port = 0
-        Acct-Delay-Time = 0
-        NAS-IP-Address = 127.0.0.1
-        Client-IP-Address = 127.0.0.1
-        Acct-Unique-Session-Id = "4b7754541b5902fa"
-        Timestamp = 1181308990
-
-Fri Jun  8 08:23:31 2007
-        Acct-Status-Type = Stop
-        Acct-Session-Id = "d734ff5e-bf04-4045-8cb3-f5744574808b"
-        Freeswitch-Hangupcause = Normal-Clearing
-        Freeswitch-Src = "8478797989"
-        Freeswitch-CLID = "Chris Parker"
-        Freeswitch-Dst = "888"
-        Freeswitch-Dialplan = "XML"
-        Freeswitch-Lastapp = "bridge"
-        Freeswitch-Billusec = 21460442
-        NAS-Port = 0
-        Acct-Delay-Time = 0
-        NAS-IP-Address = 127.0.0.1
-        Client-IP-Address = 127.0.0.1
-        Acct-Unique-Session-Id = "4b7754541b5902fa"
-        Timestamp = 1181309011
-
-
-
diff --git a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c b/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
deleted file mode 100644
index 490a7911f1..0000000000
--- a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
+++ /dev/null
@@ -1,869 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Chris Parker <cparker@segv.org>
- * Mathieu Rene <mrene@avgs.ca>
- *
- *
- * mod_radius_cdr.c -- RADIUS CDR Module
- *
- */
-
-#include <switch.h>
-#include <sys/stat.h>
-#include <freeradius-client.h>
-#include "mod_radius_cdr.h"
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_radius_cdr_shutdown);
-SWITCH_MODULE_DEFINITION(mod_radius_cdr, mod_radius_cdr_load, mod_radius_cdr_shutdown, NULL);
-
-static struct {
-	int shutdown;
-	switch_thread_rwlock_t *rwlock;
-} globals = {
-0};
-
-static char cf[] = "mod_radius_cdr.conf";
-static char my_dictionary[PATH_MAX];
-static char my_seqfile[PATH_MAX];
-static char *my_deadtime;		/* 0 */
-static char *my_timeout;		/* 5 */
-static char *my_retries;		/* 3 */
-static char my_servers[SERVER_MAX][255];
-static const char *my_timezone="";		/* Asia/Tokyo */
-
-static rc_handle *my_radius_init(void)
-{
-	int i = 0;
-	rc_handle *rad_config;
-
-	rad_config = rc_new();
-
-	if (rad_config == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing rc_handle!\n");
-		return NULL;
-	}
-
-	rad_config = rc_config_init(rad_config);
-
-	if (rad_config == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error initializing radius config!\n");
-		rc_destroy(rad_config);
-		return NULL;
-	}
-
-	/* Some hardcoded ( for now ) defaults needed to initialize radius */
-	if (rc_add_config(rad_config, "auth_order", "radius", "mod_radius_cdr.c", 0) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting auth_order = radius failed\n");
-		rc_destroy(rad_config);
-		return NULL;
-	}
-
-	if (rc_add_config(rad_config, "seqfile", my_seqfile, "mod_radius_cdr.c", 0) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting seqfile = %s failed\n", my_seqfile);
-		rc_destroy(rad_config);
-		return NULL;
-	}
-
-
-	/* Add the module configs to initialize rad_config */
-
-	for (i = 0; i < SERVER_MAX && my_servers[i][0] != '\0'; i++) {
-		if (rc_add_config(rad_config, "acctserver", my_servers[i], cf, 0) != 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting acctserver = %s failed\n", my_servers[i]);
-			rc_destroy(rad_config);
-			return NULL;
-		}
-	}
-
-	if (rc_add_config(rad_config, "dictionary", my_dictionary, cf, 0) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed setting dictionary = %s failed\n", my_dictionary);
-		rc_destroy(rad_config);
-		return NULL;
-	}
-
-	if (rc_add_config(rad_config, "radius_deadtime", my_deadtime, cf, 0) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting radius_deadtime = %s failed\n", my_deadtime);
-		rc_destroy(rad_config);
-		return NULL;
-	}
-
-	if (rc_add_config(rad_config, "radius_timeout", my_timeout, cf, 0) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting radius_timeout = %s failed\n", my_timeout);
-		rc_destroy(rad_config);
-		return NULL;
-	}
-
-	if (rc_add_config(rad_config, "radius_retries", my_retries, cf, 0) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting radius_retries = %s failed\n", my_retries);
-		rc_destroy(rad_config);
-		return NULL;
-	}
-
-	/* Read the dictionary file(s) */
-	if (rc_read_dictionary(rad_config, rc_conf_str(rad_config, "dictionary")) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "reading dictionary file(s): %s\n", my_dictionary);
-		rc_destroy(rad_config);
-		return NULL;
-	}
-
-	return rad_config;
-}
-
-static switch_status_t my_on_routing(switch_core_session_t *session)
-{
-	switch_xml_t cdr = NULL;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	rc_handle *rad_config;
-	switch_status_t retval = SWITCH_STATUS_TERM;
-	VALUE_PAIR *send = NULL;
-	uint32_t client_port = 0;
-	uint32_t framed_addr = 0;
-	uint32_t status_type = PW_STATUS_START;
-	switch_time_t callstartdate = 0;
-	switch_time_t callanswerdate = 0;
-	switch_time_t callenddate = 0;
-	switch_time_t calltransferdate = 0;
-	const char *signal_bond = NULL;
-
-	char *uuid_str;
-
-	switch_time_exp_t tm;
-	switch_time_exp_t requested_tm;
-	char buffer[32];
-
-	char *radius_avpair_data;
-	char *delim;
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_routing\n");
-
-	if (globals.shutdown) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (channel) {
-		const char *disable_flag = switch_channel_get_variable(channel, "disable_radius_start");
-		if (switch_true(disable_flag)) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "[mod_radius_cdr] Not Sending RADIUS Start\n");
-			return SWITCH_STATUS_SUCCESS;
-		}
-	}
-
-	switch_thread_rwlock_rdlock(globals.rwlock);
-
-	rad_config = my_radius_init();
-
-	if (rad_config == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius, Start packet not logged.\n");
-		goto end;
-	}
-
-	if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) {
-		uuid_str = switch_core_session_get_uuid(session);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "[mod_radius_cdr] Error Generating Data!\n");
-		goto end;
-	}
-
-	/* GMT offset may change according daylight saving rules. Evaluating GMT offset each time */
-	if (zstr(my_timezone)) {
-		switch_time_exp_lt(&requested_tm, switch_micro_time_now());
-	} else {
-		switch_time_exp_tz_name(my_timezone, &requested_tm, switch_micro_time_now());
-	}
-
-	/* Create the radius packet */
-
-	/* Set Status Type */
-	if (rc_avpair_add(rad_config, &send, PW_ACCT_STATUS_TYPE, &status_type, -1, 0) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "[mod_radius_cdr] Failed setting Acct-Status-Type: Start\n");
-		rc_destroy(rad_config);
-		goto end;
-	}
-
-	if (rc_avpair_add(rad_config, &send, PW_ACCT_SESSION_ID, uuid_str, -1, 0) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "[mod_radius_cdr] Failed adding Acct-Session-ID: %s\n", uuid_str);
-		rc_destroy(rad_config);
-		goto end;
-	}
-
-	/* Add VSAs */
-
-	if (channel) {
-		/*switch_call_cause_t   cause; */
-		switch_caller_profile_t *profile;
-		const char *radius_avpair = switch_channel_get_variable(channel, "radius_avpair");
-
-		/*
-		   cause = switch_channel_get_cause(channel);
-		   if (rc_avpair_add(rad_config, &send, PW_FS_HANGUPCAUSE, &cause, -1, PW_FS_PEC) == NULL) {
-		   switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Hangupcause: %d\n", cause);
-		   rc_destroy(rad_config);
-		   return SWITCH_STATUS_TERM;
-		   }
-		 */
-
-		if ((signal_bond = switch_channel_get_partner_uuid(channel)) && !zstr(signal_bond)) {
-			if (rc_avpair_add(rad_config, &send, PW_FS_OTHER_LEG_ID, (void*) signal_bond, -1, PW_FS_PEC) == NULL) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "[mod_radius_cdr] Failed adding Freeswitch-Other-Leg-Id: %s\n", uuid_str);
-				rc_destroy(rad_config);
-				goto end;
-			}
-		}
-
-		profile = switch_channel_get_caller_profile(channel);
-
-		if (profile) {
-
-			callstartdate = profile->times->created;
-			callanswerdate = profile->times->answered;
-			calltransferdate = profile->times->transferred;
-			callenddate = profile->times->hungup;
-
-			if (profile->username) {
-				if (rc_avpair_add(rad_config, &send, PW_USER_NAME, (void *) profile->username, -1, 0) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding User-Name: %s\n", profile->username);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->caller_id_number) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *) profile->caller_id_number, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", profile->caller_id_number);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->caller_id_name) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_CLID, (void *) profile->caller_id_name, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->destination_number) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_DST, (void *) profile->destination_number, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Dst: %s\n", profile->destination_number);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->dialplan) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, (void *) profile->dialplan, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->network_addr) {
-				inet_pton(AF_INET, (void *) profile->network_addr, &framed_addr);
-				framed_addr = htonl(framed_addr);
-				if (rc_avpair_add(rad_config, &send, PW_FRAMED_IP_ADDRESS, &framed_addr, -1, 0) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Framed-IP-Address: %s\n", profile->network_addr);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->rdnis) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_RDNIS, (void *) profile->rdnis, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-RDNIS: %s\n", profile->rdnis);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->context) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_CONTEXT, (void *) profile->context, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Context: %s\n", profile->context);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->ani) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_ANI, (void *) profile->ani, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-ANI: %s\n", profile->ani);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->aniii) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_ANIII, (void *) profile->aniii, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-ANIII: %s\n", profile->aniii);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->source) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_SOURCE, (void *) profile->source, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Source: %s\n", profile->source);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (callstartdate > 0) {
-				switch_time_exp_tz(&tm, callstartdate, requested_tm.tm_gmtoff);
-				switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-								tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-								tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-				if (rc_avpair_add(rad_config, &send, PW_FS_CALLSTARTDATE, &buffer, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Callstartdate: %s\n", buffer);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (callanswerdate > 0) {
-				switch_time_exp_tz(&tm, callanswerdate, requested_tm.tm_gmtoff);
-				switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-								tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-								tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-				if (rc_avpair_add(rad_config, &send, PW_FS_CALLANSWERDATE, &buffer, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Callanswerdate: %s\n", buffer);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (calltransferdate > 0) {
-				switch_time_exp_tz(&tm, calltransferdate, requested_tm.tm_gmtoff);
-				switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-								tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-								tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-				if (rc_avpair_add(rad_config, &send, PW_FS_CALLTRANSFERDATE, &buffer, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Calltransferdate: %s\n", buffer);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (callenddate > 0) {
-				switch_time_exp_tz(&tm, callenddate, requested_tm.tm_gmtoff);
-				switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-								tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-								tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-				if (rc_avpair_add(rad_config, &send, PW_FS_CALLENDDATE, &buffer, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Callenddate: %s\n", buffer);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (profile->caller_extension && profile->caller_extension->last_application && profile->caller_extension->last_application->application_name) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP,
-								  (void *) profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Lastapp: %s\n", profile->source);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (radius_avpair) {
-				radius_avpair_data = strdup(radius_avpair + (strncmp(radius_avpair, "ARRAY::", 7) ? 0 : 7));
-				do {
-					delim = strstr(radius_avpair_data, "|:");
-
-					if (delim) {
-						*delim = '\0';
-					}
-
-					if (rc_avpair_add(rad_config, &send, PW_FS_AVPAIR, (void *) radius_avpair_data, -1, PW_FS_PEC) == NULL) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-AVPair: %s\n", radius_avpair_data);
-						rc_destroy(rad_config);
-						goto end;
-					}
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "added Freeswitch-AVPair: %s\n", radius_avpair_data);
-
-					if (delim) {
-						radius_avpair_data = delim + 2;
-					}
-				} while (delim);
-			}
-
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "profile == NULL\n");
-		}
-	}
-
-	if (rc_acct(rad_config, client_port, send) == OK_RC) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "[mod_radius_cdr] RADIUS Accounting OK\n");
-		retval = SWITCH_STATUS_SUCCESS;
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "[mod_radius_cdr] RADIUS Accounting Failed\n");
-		retval = SWITCH_STATUS_TERM;
-	}
-	rc_avpair_free(send);
-	rc_destroy(rad_config);
-  end:
-	switch_xml_free(cdr);
-	switch_thread_rwlock_unlock(globals.rwlock);
-	return (retval);
-}
-
-static switch_status_t my_on_reporting(switch_core_session_t *session)
-{
-	switch_xml_t cdr = NULL;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	rc_handle *rad_config;
-	switch_status_t retval = SWITCH_STATUS_TERM;
-	VALUE_PAIR *send = NULL;
-	uint32_t client_port = 0;
-	uint32_t framed_addr = 0;
-	uint32_t status_type = PW_STATUS_STOP;
-	switch_time_t callstartdate = 0;
-	switch_time_t callanswerdate = 0;
-	switch_time_t callenddate = 0;
-	switch_time_t calltransferdate = 0;
-	switch_time_t billusec = 0;
-	uint32_t billsec = 0;
-	char *uuid_str;
-
-	switch_time_exp_t tm;
-	switch_time_exp_t requested_tm;
-
-	char buffer[32] = "";
-
-	char *radius_avpair_data;
-	char *delim;
-
-	if (globals.shutdown) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-
-	if (channel) {
-		const char *disable_flag = switch_channel_get_variable(channel, "disable_radius_stop");
-		if (switch_true(disable_flag)) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "[mod_radius_cdr] Not Sending RADIUS Stop\n");
-			return SWITCH_STATUS_SUCCESS;
-		}
-	}
-
-	switch_thread_rwlock_rdlock(globals.rwlock);
-
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_reporting\n");
-
-	rad_config = my_radius_init();
-
-	if (rad_config == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius, session not logged.\n");
-		goto end;
-	}
-
-	if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) {
-		uuid_str = switch_core_session_get_uuid(session);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "[mod_radius_cdr] Error Generating Data!\n");
-		goto end;
-	}
-
-	/* GMT offset may change according daylight saving rules. Evaluating GMT offset each time */
-	if (zstr(my_timezone)) {
-		switch_time_exp_lt(&requested_tm, time(NULL));
-	} else {
-		switch_time_exp_tz_name(my_timezone, &requested_tm, time(NULL));
-	}
-
-	/* Create the radius packet */
-
-	/* Set Status Type */
-	if (rc_avpair_add(rad_config, &send, PW_ACCT_STATUS_TYPE, &status_type, -1, 0) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Acct-Session-ID: %s\n", uuid_str);
-		rc_destroy(rad_config);
-		goto end;
-	}
-
-	if (rc_avpair_add(rad_config, &send, PW_ACCT_SESSION_ID, uuid_str, -1, 0) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Acct-Session-ID: %s\n", uuid_str);
-		rc_destroy(rad_config);
-		goto end;
-	}
-
-	/* Add VSAs */
-
-	if (channel) {
-		switch_call_cause_t cause;
-		switch_caller_profile_t *profile;
-		const char *radius_avpair = switch_channel_get_variable(channel, "radius_avpair");
-
-		cause = switch_channel_get_cause(channel);
-		if (rc_avpair_add(rad_config, &send, PW_FS_HANGUPCAUSE, &cause, -1, PW_FS_PEC) == NULL) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Hangupcause: %d\n", cause);
-			rc_destroy(rad_config);
-			goto end;
-		}
-
-		profile = switch_channel_get_caller_profile(channel);
-
-		if (profile) {
-
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "[mod_radius_cdr] Calculating billable time\n");
-
-			/* calculate billable time */
-			callstartdate = profile->times->created;
-			callanswerdate = profile->times->answered;
-			calltransferdate = profile->times->transferred;
-			callenddate = profile->times->hungup;
-
-			if (switch_channel_test_flag(channel, CF_ANSWERED)) {
-				if (callstartdate && callanswerdate) {
-					if (callenddate)
-						billusec = callenddate - callanswerdate;
-					else if (calltransferdate)
-						billusec = calltransferdate - callanswerdate;
-				}
-			} else if (switch_channel_test_flag(channel, CF_TRANSFER)) {
-				if (callanswerdate && calltransferdate)
-					billusec = calltransferdate - callanswerdate;
-			}
-			billsec = (billusec / 1000000);
-
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "[mod_radius_cdr] Finished calculating billable time\n");
-
-			if (profile->username) {
-				if (rc_avpair_add(rad_config, &send, PW_USER_NAME, (void *) profile->username, -1, 0) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding User-Name: %s\n", profile->username);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->caller_id_number) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *) profile->caller_id_number, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", profile->caller_id_number);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->caller_id_name) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_CLID, (void *) profile->caller_id_name, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->destination_number) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_DST, (void *) profile->destination_number, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Dst: %s\n", profile->destination_number);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->dialplan) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, (void *) profile->dialplan, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->network_addr) {
-				inet_pton(AF_INET, (void *) profile->network_addr, &framed_addr);
-				framed_addr = htonl(framed_addr);
-				if (rc_avpair_add(rad_config, &send, PW_FRAMED_IP_ADDRESS, &framed_addr, -1, 0) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Framed-IP-Address: %s\n", profile->network_addr);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->rdnis) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_RDNIS, (void *) profile->rdnis, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-RDNIS: %s\n", profile->rdnis);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->context) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_CONTEXT, (void *) profile->context, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Context: %s\n", profile->context);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->ani) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_ANI, (void *) profile->ani, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-ANI: %s\n", profile->ani);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->aniii) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_ANIII, (void *) profile->aniii, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-ANIII: %s\n", profile->aniii);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->source) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_SOURCE, (void *) profile->source, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Source: %s\n", profile->source);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (profile->caller_extension && profile->caller_extension->last_application && profile->caller_extension->last_application->application_name) {
-				if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP,
-								  (void *) profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Lastapp: %s\n", profile->source);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-			if (rc_avpair_add(rad_config, &send, PW_FS_BILLUSEC, &billusec, -1, PW_FS_PEC) == NULL) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Billusec: %u\n", (uint32_t) billusec);
-				rc_destroy(rad_config);
-				goto end;
-			}
-
-			if (callstartdate > 0) {
-				switch_time_exp_tz(&tm, callstartdate, requested_tm.tm_gmtoff);
-				switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-								tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-								tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-				if (rc_avpair_add(rad_config, &send, PW_FS_CALLSTARTDATE, &buffer, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Callstartdate: %s\n", buffer);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (callanswerdate > 0) {
-				switch_time_exp_tz(&tm, callanswerdate, requested_tm.tm_gmtoff);
-				switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-								tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-								tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-				if (rc_avpair_add(rad_config, &send, PW_FS_CALLANSWERDATE, &buffer, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Callanswerdate: %s\n", buffer);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (calltransferdate > 0) {
-				switch_time_exp_tz(&tm, calltransferdate, requested_tm.tm_gmtoff);
-				switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-								tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-								tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-				if (rc_avpair_add(rad_config, &send, PW_FS_CALLTRANSFERDATE, &buffer, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Calltransferdate: %s\n", buffer);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (callenddate > 0) {
-				switch_time_exp_tz(&tm, callenddate, requested_tm.tm_gmtoff);
-				switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-								tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-								tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-				if (rc_avpair_add(rad_config, &send, PW_FS_CALLENDDATE, &buffer, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Callenddate: %s\n", buffer);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (rc_avpair_add(rad_config, &send, PW_ACCT_SESSION_TIME, &billsec, -1, 0) == NULL) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Acct-Session-Time: %u\n", billsec);
-				rc_destroy(rad_config);
-				goto end;
-			}
-
-			{
-				const char *direction_str = profile->direction == SWITCH_CALL_DIRECTION_INBOUND ? "inbound" : "outbound";
-
-				if (rc_avpair_add(rad_config, &send, PW_FS_DIRECTION, (void *) direction_str, -1, PW_FS_PEC) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "failed adding Freeswitch-Direction: %s\n", direction_str);
-					rc_destroy(rad_config);
-					goto end;
-				}
-			}
-
-			if (radius_avpair) {
-				radius_avpair_data = strdup(radius_avpair + (strncmp(radius_avpair, "ARRAY::", 7) ? 0 : 7));
-				do {
-					delim = strstr(radius_avpair_data, "|:");
-
-					if (delim) {
-						*delim = '\0';
-					}
-
-					if (rc_avpair_add(rad_config, &send, PW_FS_AVPAIR, (void *) radius_avpair_data, -1, PW_FS_PEC) == NULL) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-AVPair: %s\n", radius_avpair_data);
-						rc_destroy(rad_config);
-						goto end;
-					}
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "added Freeswitch-AVPair: %s\n", radius_avpair_data);
-
-					if (delim) {
-						radius_avpair_data = delim + 2;
-					}
-				} while (delim);
-			}
-
-		} else {				/* no profile, can't create data to send */
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "profile == NULL\n");
-		}
-	}
-
-	if (rc_acct(rad_config, client_port, send) == OK_RC) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "RADIUS Accounting OK\n");
-		retval = SWITCH_STATUS_SUCCESS;
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "RADIUS Accounting Failed\n");
-		retval = SWITCH_STATUS_TERM;
-	}
-	rc_avpair_free(send);
-	rc_destroy(rad_config);
-
-  end:
-	switch_xml_free(cdr);
-	switch_thread_rwlock_unlock(globals.rwlock);
-	return (retval);
-}
-
-static switch_status_t load_config(void)
-{
-	switch_xml_t cfg, xml, settings, param;
-
-	int num_servers = 0;
-	int i = 0;
-	static char *tz_name;
-
-	my_timeout = "5";
-	my_retries = "3";
-	my_deadtime = "0";
-	strncpy(my_seqfile, "/var/run/radius.seq", PATH_MAX - 1);
-	strncpy(my_dictionary, "/usr/local/freeswitch/conf/radius/dictionary", PATH_MAX - 1);
-
-	for (i = 0; i < SERVER_MAX; i++) {
-		my_servers[i][0] = '\0';
-	}
-
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
-		return SWITCH_STATUS_TERM;
-	}
-
-	if ((settings = switch_xml_child(cfg, "settings"))) {
-		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!strcmp(var, "acctserver")) {
-				if (num_servers < SERVER_MAX) {
-					strncpy(my_servers[num_servers], val, 255 - 1);
-					num_servers++;
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-									  "you can only specify %d radius servers, ignoring excess server entry\n", SERVER_MAX);
-				}
-			} else if (!strcmp(var, "dictionary")) {
-				strncpy(my_dictionary, val, PATH_MAX - 1);
-			} else if (!strcmp(var, "seqfile")) {
-				strncpy(my_seqfile, val, PATH_MAX - 1);
-			} else if (!strcmp(var, "radius_timeout")) {
-				my_timeout = strdup(val);
-			} else if (!strcmp(var, "radius_retries")) {
-				my_retries = strdup(val);
-			} else if (!strcmp(var, "radius_deadtime")) {
-				my_deadtime = strdup(val);
-			} else if (!strcmp(var, "timezone")) {
-				tz_name = strdup(val);
-			}
-		}
-	}
-
-	switch_xml_free(xml);
-
-	if (num_servers < 1) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "you must specify at least 1 radius server\n");
-		return SWITCH_STATUS_TERM;
-	}
-
-	if (!zstr(tz_name)) {
-		if (switch_lookup_timezone(tz_name)) {
-			my_timezone= tz_name;
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find timezone %s\n, Setting timezone to GMT", tz_name);
-			my_timezone= "GMT";
-		}
-	}
-
-	/* If we made it this far, we succeeded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static const switch_state_handler_table_t state_handlers = {
-	/*.on_init */ NULL,
-	/*.on_routing */ my_on_routing,
-	/*.on_execute */ NULL,
-	/*.on_hangup */ NULL,
-	/*.on_exchange_media */ NULL,
-	/*.on_soft_execute */ NULL,
-	/*.on_consume_media */ NULL,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ my_on_reporting
-};
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load)
-{
-
-	switch_thread_rwlock_create(&globals.rwlock, pool);
-
-	if (load_config() != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_TERM;
-	}
-
-	/* test global state handlers */
-	switch_core_add_state_handler(&state_handlers);
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_radius_cdr_shutdown)
-{
-
-	globals.shutdown = 1;
-	switch_core_remove_state_handler(&state_handlers);
-	switch_thread_rwlock_wrlock(globals.rwlock);
-	switch_thread_rwlock_unlock(globals.rwlock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml b/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml
deleted file mode 100644
index fea5194b81..0000000000
--- a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<configuration name="mod_radius_cdr.conf" description="RADIUS CDR Configuration">
-	<settings>
-		<!-- location of the radius dictionary file -->
-		<param name="dictionary" value="/usr/local/freeswitch/conf/radius/dictionary"/>
-		<!-- location of the radius sequence file -->
-		<param name="seqfile" value="/var/run/radius.seq"/>
-
-		<!-- accounting servers, up to 8 allowed -->
-		<!-- value is "host:port:secret", port is optional -->
-		<!-- use IP ADDRESSES, not hostnames -->
-		<param name="acctserver" value="127.0.0.1:1813:testing123"/>
-		<param name="acctserver" value="10.0.0.254:1813:testing123"/>
-		<param name="acctserver" value="192.168.10.10:1813:testing123"/>
-
-		<!-- number of retries for each server -->
-		<param name="radius_retries" value="3"/>
-		<!-- number of seconds to wait between retries -->
-		<param name="radius_timeout" value="5"/>
-		<!-- The length of time in seconds that we skip a nonresponsive RADIUS
-			 server for transaction requests. Server(s) being in the "dead" state
-			 are tried only after all other non-dead servers have been tried and
-			 failed or timeouted. The deadtime interval starts when the server
-			 does not respond to an authentication/accounting request transmissions.
-			 When the interval expires, the "dead" server would be re-tried again,
-			 and if it's still down then it will be considered "dead" for another
-			 such interval and so on. This option is no-op if there is only one
-			 server in the list. Set to 0 in order to disable the feature. -->
-		<param name="radius_deadtime" value="0"/>
-		<!-- Timezone name from "autoload_configs/timezones.conf.xml".
-			 All time related values will be adjusted for this timezone.
-			 If param is not provided used is local server timezone -->
-		<!-- <param name="timezone" value="Asia/Tokyo"/> -->
-	</settings>
-</configuration>
-
diff --git a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h b/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h
deleted file mode 100644
index 0257f61303..0000000000
--- a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module
- * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module
- *
- * The Initial Developer of the Original Code is
- * Chris Parker <cparker AT segv.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Chris Parker <cparker AT segv.org>
- *
- * Description: Contains definitions and structs used by the radius cdr module.
- *
- * mod_radius_cdr.h
- *
- */
-
-#ifndef MODRADIUSCDR
-#define MODRADIUSCDR
-
-#define	PW_FS_PEC		27880
-
-#define PW_FS_AVPAIR		1
-#define PW_FS_CLID		2
-#define PW_FS_DIALPLAN		3
-#define PW_FS_SRC		4
-#define PW_FS_DST		5
-#define PW_FS_SRC_CHANNEL	6
-#define PW_FS_DST_CHANNEL	7
-#define PW_FS_ANI		8
-#define PW_FS_ANIII		9
-#define PW_FS_LASTAPP		10
-#define PW_FS_LASTDATA		11
-#define PW_FS_DISPOSITION	12
-#define PW_FS_HANGUPCAUSE	13
-#define PW_FS_BILLUSEC		15
-#define PW_FS_AMAFLAGS		16
-#define PW_FS_RDNIS		17
-#define PW_FS_CONTEXT		18
-#define PW_FS_SOURCE		19
-#define PW_FS_CALLSTARTDATE	20
-#define PW_FS_CALLANSWERDATE	21
-#define PW_FS_CALLTRANSFERDATE	22
-#define PW_FS_CALLENDDATE	23
-#define PW_FS_DIRECTION	24
-#define PW_FS_OTHER_LEG_ID 25
-
-
-#endif
diff --git a/src/mod/event_handlers/mod_radius_cdr/radius/dictionary b/src/mod/event_handlers/mod_radius_cdr/radius/dictionary
deleted file mode 100644
index c126e685d4..0000000000
--- a/src/mod/event_handlers/mod_radius_cdr/radius/dictionary
+++ /dev/null
@@ -1,353 +0,0 @@
-#
-# Updated 97/06/13 to livingston-radius-2.01 miquels@cistron.nl
-#
-#	This file contains dictionary translations for parsing
-#	requests and generating responses.  All transactions are
-#	composed of Attribute/Value Pairs.  The value of each attribute
-#	is specified as one of 4 data types.  Valid data types are:
-#
-#	string - 0-253 octets
-#	ipaddr - 4 octets in network byte order
-#	integer - 32 bit value in big endian order (high byte first)
-#	date - 32 bit value in big endian order - seconds since
-#					00:00:00 GMT,  Jan.  1,  1970
-#
-#	Enumerated values are stored in the user file with dictionary
-#	VALUE translations for easy administration.
-#
-#	Example:
-#
-#	ATTRIBUTE	  VALUE
-#	---------------   -----
-#	Framed-Protocol = PPP
-#	7		= 1	(integer encoding)
-#
-
-#
-#	Following are the proper new names. Use these.
-#
-ATTRIBUTE	User-Name		1	string
-ATTRIBUTE	Password		2	string
-ATTRIBUTE	CHAP-Password		3	string
-ATTRIBUTE	NAS-IP-Address		4	ipaddr
-ATTRIBUTE	NAS-Port-Id		5	integer
-ATTRIBUTE	Service-Type		6	integer
-ATTRIBUTE	Framed-Protocol		7	integer
-ATTRIBUTE	Framed-IP-Address	8	ipaddr
-ATTRIBUTE	Framed-IP-Netmask	9	ipaddr
-ATTRIBUTE	Framed-Routing		10	integer
-ATTRIBUTE	Filter-Id		11	string
-ATTRIBUTE	Framed-MTU		12	integer
-ATTRIBUTE	Framed-Compression	13	integer
-ATTRIBUTE	Login-IP-Host		14	ipaddr
-ATTRIBUTE	Login-Service		15	integer
-ATTRIBUTE	Login-TCP-Port		16	integer
-ATTRIBUTE	Reply-Message		18	string
-ATTRIBUTE	Callback-Number		19	string
-ATTRIBUTE	Callback-Id		20	string
-ATTRIBUTE	Framed-Route		22	string
-ATTRIBUTE	Framed-IPX-Network	23	ipaddr
-ATTRIBUTE	State			24	string
-ATTRIBUTE	Class			25	string
-ATTRIBUTE	Vendor-Specific		26	string
-ATTRIBUTE	Session-Timeout		27	integer
-ATTRIBUTE	Idle-Timeout		28	integer
-ATTRIBUTE	Termination-Action	29	integer
-ATTRIBUTE	Called-Station-Id	30	string
-ATTRIBUTE	Calling-Station-Id	31	string
-ATTRIBUTE	NAS-Identifier		32	string
-ATTRIBUTE	Proxy-State		33	string
-ATTRIBUTE	Login-LAT-Service	34	string
-ATTRIBUTE	Login-LAT-Node		35	string
-ATTRIBUTE	Login-LAT-Group		36	string
-ATTRIBUTE	Framed-AppleTalk-Link	37	integer
-ATTRIBUTE	Framed-AppleTalk-Network	38	integer
-ATTRIBUTE	Framed-AppleTalk-Zone	39	string
-ATTRIBUTE	Acct-Status-Type	40	integer
-ATTRIBUTE	Acct-Delay-Time		41	integer
-ATTRIBUTE	Acct-Input-Octets	42	integer
-ATTRIBUTE	Acct-Output-Octets	43	integer
-ATTRIBUTE	Acct-Session-Id		44	string
-ATTRIBUTE	Acct-Authentic		45	integer
-ATTRIBUTE	Acct-Session-Time	46	integer
-ATTRIBUTE	Acct-Input-Packets	47	integer
-ATTRIBUTE	Acct-Output-Packets	48	integer
-ATTRIBUTE	Acct-Terminate-Cause	49	integer
-ATTRIBUTE	Acct-Multi-Session-Id	50	string
-ATTRIBUTE	Acct-Link-Count		51	integer
-ATTRIBUTE	Event-Timestamp		55	integer
-ATTRIBUTE	CHAP-Challenge		60	string
-ATTRIBUTE	NAS-Port-Type		61	integer
-ATTRIBUTE	Port-Limit		62	integer
-ATTRIBUTE	Login-LAT-Port		63	integer
-ATTRIBUTE	Connect-Info		77	string
-
-#
-#	RFC3162 IPv6 attributes
-#
-ATTRIBUTE	NAS-IPv6-Address	95	string
-ATTRIBUTE	Framed-Interface-Id	96	string
-ATTRIBUTE	Framed-IPv6-Prefix	97	string
-ATTRIBUTE	Login-IPv6-Host		98	string
-ATTRIBUTE	Framed-IPv6-Route	99	string
-ATTRIBUTE	Framed-IPv6-Pool	100	string
-
-#
-#	Experimental Non Protocol Attributes used by Cistron-Radiusd
-#
-ATTRIBUTE	Huntgroup-Name		221	string
-ATTRIBUTE	User-Category		1029	string
-ATTRIBUTE	Group-Name		1030	string
-ATTRIBUTE	Simultaneous-Use	1034	integer
-ATTRIBUTE	Strip-User-Name		1035	integer
-ATTRIBUTE	Fall-Through		1036	integer
-ATTRIBUTE	Add-Port-To-IP-Address	1037	integer
-ATTRIBUTE	Exec-Program		1038	string
-ATTRIBUTE	Exec-Program-Wait	1039	string
-ATTRIBUTE	Hint			1040	string
-
-#
-#	Non-Protocol Attributes
-#	These attributes are used internally by the server
-#
-ATTRIBUTE	Expiration		  21	date
-ATTRIBUTE	Auth-Type		1000	integer
-ATTRIBUTE	Menu			1001	string
-ATTRIBUTE	Termination-Menu	1002	string
-ATTRIBUTE	Prefix			1003	string
-ATTRIBUTE	Suffix			1004	string
-ATTRIBUTE	Group			1005	string
-ATTRIBUTE	Crypt-Password		1006	string
-ATTRIBUTE	Connect-Rate		1007	integer
-
-#
-#	Integer Translations
-#
-
-#	User Types
-
-VALUE		Service-Type		Login-User		1
-VALUE		Service-Type		Framed-User		2
-VALUE		Service-Type		Callback-Login-User	3
-VALUE		Service-Type		Callback-Framed-User	4
-VALUE		Service-Type		Outbound-User		5
-VALUE		Service-Type		Administrative-User	6
-VALUE		Service-Type		NAS-Prompt-User		7
-
-#	Framed Protocols
-
-VALUE		Framed-Protocol		PPP			1
-VALUE		Framed-Protocol		SLIP			2
-
-#	Framed Routing Values
-
-VALUE		Framed-Routing		None			0
-VALUE		Framed-Routing		Broadcast		1
-VALUE		Framed-Routing		Listen			2
-VALUE		Framed-Routing		Broadcast-Listen	3
-
-#	Framed Compression Types
-
-VALUE		Framed-Compression	None			0
-VALUE		Framed-Compression	Van-Jacobson-TCP-IP	1
-
-#	Login Services
-
-VALUE		Login-Service		Telnet			0
-VALUE		Login-Service		Rlogin			1
-VALUE		Login-Service		TCP-Clear		2
-VALUE		Login-Service		PortMaster		3
-
-#	Status Types
-
-VALUE		Acct-Status-Type	Start			1
-VALUE		Acct-Status-Type	Stop			2
-VALUE		Acct-Status-Type	Alive			3
-VALUE		Acct-Status-Type	Accounting-On		7
-VALUE		Acct-Status-Type	Accounting-Off		8
-
-#	Authentication Types
-
-VALUE		Acct-Authentic		RADIUS			1
-VALUE		Acct-Authentic		Local			2
-VALUE		Acct-Authentic		PowerLink128		100
-
-#	Termination Options
-
-VALUE		Termination-Action	Default			0
-VALUE		Termination-Action	RADIUS-Request		1
-
-#	NAS Port Types, available in 3.3.1 and later
-
-VALUE		NAS-Port-Type		Async			0
-VALUE		NAS-Port-Type		Sync			1
-VALUE		NAS-Port-Type		ISDN			2
-VALUE		NAS-Port-Type		ISDN-V120		3
-VALUE		NAS-Port-Type		ISDN-V110		4
-
-#	Acct Terminate Causes, available in 3.3.2 and later
-
-VALUE           Acct-Terminate-Cause    User-Request            1
-VALUE           Acct-Terminate-Cause    Lost-Carrier            2
-VALUE           Acct-Terminate-Cause    Lost-Service            3
-VALUE           Acct-Terminate-Cause    Idle-Timeout            4
-VALUE           Acct-Terminate-Cause    Session-Timeout         5
-VALUE           Acct-Terminate-Cause    Admin-Reset             6
-VALUE           Acct-Terminate-Cause    Admin-Reboot            7
-VALUE           Acct-Terminate-Cause    Port-Error              8
-VALUE           Acct-Terminate-Cause    NAS-Error               9
-VALUE           Acct-Terminate-Cause    NAS-Request             10
-VALUE           Acct-Terminate-Cause    NAS-Reboot              11
-VALUE           Acct-Terminate-Cause    Port-Unneeded           12
-VALUE           Acct-Terminate-Cause    Port-Preempted          13
-VALUE           Acct-Terminate-Cause    Port-Suspended          14
-VALUE           Acct-Terminate-Cause    Service-Unavailable     15
-VALUE           Acct-Terminate-Cause    Callback                16
-VALUE           Acct-Terminate-Cause    User-Error              17
-VALUE           Acct-Terminate-Cause    Host-Request            18
-
-#
-#	Non-Protocol Integer Translations
-#
-
-VALUE		Auth-Type		Local			0
-VALUE		Auth-Type		System			1
-VALUE		Auth-Type		SecurID			2
-VALUE		Auth-Type		Crypt-Local		3
-VALUE		Auth-Type		Reject			4
-
-#
-#	Cistron extensions
-#
-VALUE		Auth-Type		Pam			253
-VALUE		Auth-Type		Accept			254
-
-#
-#	Experimental Non-Protocol Integer Translations for Cistron-Radiusd
-#
-VALUE		Fall-Through		No			0
-VALUE		Fall-Through		Yes			1
-VALUE		Add-Port-To-IP-Address	No			0
-VALUE		Add-Port-To-IP-Address	Yes			1
-
-#
-#	Configuration Values
-#	uncomment these two lines to turn account expiration on
-#
-
-#VALUE		Server-Config		Password-Expiration	30
-#VALUE		Server-Config		Password-Warning	5
-
-# -*- text -*-
-#
-# dictionary.freeswitch
-#
-# cparker@segv.org
-#
-# Version:	$Id: $
-#
-
-VENDOR		Freeswitch				27880
-
-#
-#	Standard attribute
-#
-BEGIN-VENDOR	Freeswitch
-
-ATTRIBUTE	Freeswitch-AVPair			1	string	Freeswitch
-ATTRIBUTE	Freeswitch-CLID				2	string	Freeswitch
-ATTRIBUTE	Freeswitch-Dialplan			3	string  Freeswitch
-ATTRIBUTE	Freeswitch-Src				4	string  Freeswitch
-ATTRIBUTE	Freeswitch-Dst				5	string  Freeswitch
-ATTRIBUTE	Freeswitch-Src-Channel			6	string  Freeswitch
-ATTRIBUTE	Freeswitch-Dst-Channel			7	string  Freeswitch
-ATTRIBUTE	Freeswitch-Ani				8	string  Freeswitch
-ATTRIBUTE	Freeswitch-Aniii			9	string  Freeswitch
-ATTRIBUTE	Freeswitch-Lastapp			10	string  Freeswitch
-ATTRIBUTE	Freeswitch-Lastdata			11	string  Freeswitch
-ATTRIBUTE	Freeswitch-Disposition			12	string  Freeswitch
-ATTRIBUTE	Freeswitch-Hangupcause			13	integer Freeswitch
-ATTRIBUTE	Freeswitch-Billusec			15	integer Freeswitch
-ATTRIBUTE	Freeswitch-AMAFlags			16	integer Freeswitch
-ATTRIBUTE	Freeswitch-RDNIS			17      string  Freeswitch
-ATTRIBUTE	Freeswitch-Context                      18      string  Freeswitch
-ATTRIBUTE	Freeswitch-Source                       19      string  Freeswitch
-ATTRIBUTE	Freeswitch-Callstartdate		20	string  Freeswitch
-ATTRIBUTE	Freeswitch-Callanswerdate		21	string  Freeswitch
-ATTRIBUTE	Freeswitch-Calltransferdate		22	string  Freeswitch
-ATTRIBUTE	Freeswitch-Callenddate			23	string  Freeswitch
-ATTRIBUTE	Freeswitch-Direction			24	string  Freeswitch
-ATTRIBUTE	Freeswitch-Other-Leg-Id			25	string	Freeswitch
-
-#
-#  Freeswitch-Hangupcause
-#
-VALUE		Freeswitch-Hangupcause		None				0
-VALUE		Freeswitch-Hangupcause		Unallocated-Number		1
-VALUE		Freeswitch-Hangupcause		No-Route-Transit-Net		2
-VALUE		Freeswitch-Hangupcause		No-Route-Destination		3
-VALUE		Freeswitch-Hangupcause		Channel-Unacceptable		6
-VALUE		Freeswitch-Hangupcause		Call-Awarded-Delivery		7
-VALUE		Freeswitch-Hangupcause		Normal-Clearing			16
-VALUE		Freeswitch-Hangupcause		User-Busy			17
-VALUE		Freeswitch-Hangupcause		No-User-Response		18
-VALUE		Freeswitch-Hangupcause		No-Answer			19
-VALUE		Freeswitch-Hangupcause		Subscriber-Absent		20
-VALUE		Freeswitch-Hangupcause		Call-Rejected			21
-VALUE		Freeswitch-Hangupcause		Number-Changed			22
-VALUE		Freeswitch-Hangupcause		Redirecto-To-New-Destination	23
-VALUE		Freeswitch-Hangupcause		Exchange-Routing-Error		25
-VALUE		Freeswitch-Hangupcause		Destination-Out-Of-Order	27
-VALUE		Freeswitch-Hangupcause		Invalid-Number-Format		28
-VALUE		Freeswitch-Hangupcause		Facility-Rejected		29
-VALUE		Freeswitch-Hangupcause		Response-To-Status-Enquiry	30
-VALUE		Freeswitch-Hangupcause		Normal-Unspecified		31
-VALUE		Freeswitch-Hangupcause		Normal-Circuit-Congestion	34
-VALUE		Freeswitch-Hangupcause		Network-Out-Of-Order		38
-VALUE		Freeswitch-Hangupcause		Normal-Temporary-Failure	41
-VALUE		Freeswitch-Hangupcause		Switch-Congestion		42
-VALUE		Freeswitch-Hangupcause		Access-Info-Discarded		43
-VALUE		Freeswitch-Hangupcause		Requested-Chan-Unavail		44
-VALUE		Freeswitch-Hangupcause		Pre-Empted			45
-VALUE		Freeswitch-Hangupcause		Facility-Not-Subscribed		50
-VALUE		Freeswitch-Hangupcause		Outgoing-Call-Barred		52
-VALUE		Freeswitch-Hangupcause		Incoming-Call-Barred		54
-VALUE		Freeswitch-Hangupcause		Bearercapability-Notauth	57
-VALUE		Freeswitch-Hangupcause		Bearercapability-Notavail	58
-VALUE		Freeswitch-Hangupcause		Service-Unavailable		63
-VALUE		Freeswitch-Hangupcause		Bearercapability-Notimpl	65
-VALUE		Freeswitch-Hangupcause		Chan-Not-Implemented		66
-VALUE		Freeswitch-Hangupcause		Facility-Not-Implemented	69
-VALUE		Freeswitch-Hangupcause		Service-Not-Implemented		79
-VALUE		Freeswitch-Hangupcause		Invalid-Call-Reference		81
-VALUE		Freeswitch-Hangupcause		Incompatible-Destination	88
-VALUE		Freeswitch-Hangupcause		Invalid-Msg-Unspecified		95
-VALUE		Freeswitch-Hangupcause		Mandatory-IE-Missing		96
-VALUE		Freeswitch-Hangupcause		Message-Type-Nonexist		97
-VALUE		Freeswitch-Hangupcause		Wrong-Message			98
-VALUE		Freeswitch-Hangupcause		IE-Nonexist			99
-VALUE		Freeswitch-Hangupcause		Invalid-IE-Contents		100
-VALUE		Freeswitch-Hangupcause		Wrong-Call-State		101
-VALUE		Freeswitch-Hangupcause		Recovery-On-Timer-Expire	102
-VALUE		Freeswitch-Hangupcause		Mandatory-IE-Length-Error	103
-VALUE		Freeswitch-Hangupcause		Protocol-Error			111
-VALUE		Freeswitch-Hangupcause		Interworking			127
-VALUE		Freeswitch-Hangupcause		Success				142
-VALUE		Freeswitch-Hangupcause		Originator-Cancel		487
-VALUE		Freeswitch-Hangupcause		Crash				500
-VALUE		Freeswitch-Hangupcause		System-Shutdown			501
-VALUE		Freeswitch-Hangupcause		Lose-Race			502
-VALUE		Freeswitch-Hangupcause		Manager-Request			503
-VALUE		Freeswitch-Hangupcause		Blind-Transfer			600
-VALUE		Freeswitch-Hangupcause		Attended-Transfer		601
-VALUE		Freeswitch-Hangupcause		Allotted-Timeout		602
-VALUE		Freeswitch-Hangupcause		User-Challenge			603
-VALUE		Freeswitch-Hangupcause		Media-Timeout			604
-VALUE		Freeswitch-Hangupcause		Picked-Off			605
-VALUE		Freeswitch-Hangupcause		User-Not-Registered		606
-
-#
-#
-#
-
-END-VENDOR	Freeswitch
diff --git a/src/mod/event_handlers/mod_rayo/Makefile.am b/src/mod/event_handlers/mod_rayo/Makefile.am
deleted file mode 100644
index a9ca95d51b..0000000000
--- a/src/mod/event_handlers/mod_rayo/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_rayo
-
-IKS_DIR=$(switch_srcdir)/libs/iksemel
-IKS_BUILDDIR=$(switch_builddir)/libs/iksemel
-IKS_LA=$(IKS_BUILDDIR)/src/libiksemel.la
-
-noinst_LTLIBRARIES = librayomod.la
-librayomod_la_SOURCES = mod_rayo.c iks_helpers.c nlsml.c rayo_components.c rayo_cpa_component.c rayo_cpa_detector.c rayo_elements.c rayo_fax_components.c
-librayomod_la_SOURCES += rayo_input_component.c rayo_output_component.c rayo_prompt_component.c rayo_record_component.c sasl.c srgs.c xmpp_streams.c rayo_exec_component.c
-librayomod_la_CFLAGS = $(AM_CFLAGS) -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS)
-
-mod_LTLIBRARIES = mod_rayo.la
-mod_rayo_la_SOURCES  = 
-mod_rayo_la_CFLAGS   = $(AM_CFLAGS) -I$(IKS_DIR)/include $(PCRE_CFLAGS)
-mod_rayo_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(IKS_LA) $(PCRE_LIBS) librayomod.la
-mod_rayo_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
-
-BUILT_SOURCES=$(IKS_LA)
-
-$(IKS_LA): $(IKS_BUILDDIR) $(IKS_DIR) $(IKS_DIR)/.update
-	@cd $(IKS_BUILDDIR) && $(MAKE)
-	@$(TOUCH_TARGET)
-
-noinst_PROGRAMS = test/test_iks test/test_nlsml test/test_srgs
-
-test_test_iks_SOURCES = test/test_iks.c
-test_test_iks_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\"
-test_test_iks_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)
-test_test_iks_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS) $(switch_builddir)/libfreeswitch.la
-
-test_test_nlsml_SOURCES = test/test_nlsml.c
-test_test_nlsml_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\"
-test_test_nlsml_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)
-test_test_nlsml_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS) $(switch_builddir)/libfreeswitch.la
-
-test_test_srgs_SOURCES = test/test_srgs.c
-test_test_srgs_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\"
-test_test_srgs_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)
-test_test_srgs_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS) $(switch_builddir)/libfreeswitch.la
-
-
-TESTS = $(noinst_PROGRAMS)
-
diff --git a/src/mod/event_handlers/mod_rayo/conf/autoload_configs/rayo.conf.xml b/src/mod/event_handlers/mod_rayo/conf/autoload_configs/rayo.conf.xml
deleted file mode 100644
index 9f525c597c..0000000000
--- a/src/mod/event_handlers/mod_rayo/conf/autoload_configs/rayo.conf.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<configuration name="rayo.conf" description="Rayo server config">
-
-	<!-- rayo params -->
-	<settings>
-		<!-- ends idle calls : unbridged calls that have not been controlled by client in some time -->
-		<param name="max-idle-sec" value="300"/>
-		<!-- conference profile to use for mixers- sla = shared line appearance / conference /w no audio -->
-		<param name="mixer-conf-profile" value="sla"/>
-		<!-- if true, to attribute in offer uses URI instead of name/number -->
-		<param name="offer-uri" value="true"/>
-		<!-- how offers are distributed to clients (all, first, random). -->
-		<param name="offer-algorithm" value="all"/>
-		<!-- If offer is not answered after timeout, next client is offered (based on algorithm picked).
-		     If no other clients are available, the call is rejected.  Set to 0 to disable -->
-		<param name="offer-timeout-ms" value="5000"/>
-		<!-- if true, channel variables are added to rayo client offer -->
-		<param name="add-variables-to-offer" value="false"/>
-                <!-- if true, channel variables are added to offer, ringing, answered, and end events sent to rayo clients -->
-		<param name="add-variables-to-events" value="false"/>
-	</settings>
-
-	<!-- record component params -->
-	<record>
-		<param name="record-file-prefix" value="$${recordings_dir}/"/>
-	</record>
-
-	<!-- input component params -->
-	<input>
-		<param name="default-recognizer" value="pocketsphinx"/>
-	</input>
-
-	<!-- send/receivefax component params -->
-	<fax>
-		<!-- where to store incoming faxes -->
-		<param name="receivefax-file-prefix" value="/tmp/"/>
-	</fax>
-
-	<!-- Call progress analysis configuration -->
-	<!-- Define CPA detectors.  These are sources for Rayo CPA signal events -->
-	<!-- Detectors must fire an event that can be translated by mod_rayo into a CPA signal event -->
-	<cpa>
-		<!-- map DTMF events to CPA -->
-		<detector name="core_dtmf_event">
-			<event class="DTMF" value-header="DTMF-Digit" duration-header="DTMF-Duration">
-				<signal-type value="dtmf"/>
-			</event>
-		</detector>
-
-		<!-- map mod_spandsp fax detector to the Rayo CPA events. Fires DETECTED_FAX_* event once and quits. -->
-		<detector name="mod_spandsp_fax_ced">
-			<start application="spandsp_start_fax_detect" data="event 'Event-Name=CUSTOM,Event-Subclass=DETECTED_FAX_CED' 500 ced"/>
-			<stop application="spandsp_stop_fax_detect" data=""/>
-			<event class="CUSTOM" subclass="DETECTED_FAX_CED">
-				<signal-type value="fax-ced"/>
-			</event>
-		</detector>
-
-		<detector name="mod_spandsp_fax_cng">
-			<start application="spandsp_start_fax_detect" data="event 'Event-Name=CUSTOM,Event-Subclass=DETECTED_FAX_CNG' 500"/>
-			<stop application="spandsp_stop_fax_detect" data=""/>
-			<event class="CUSTOM" subclass="DETECTED_FAX_CNG">
-				<signal-type value="fax-cng"/>
-			</event>
-		</detector>
-
-		<!-- map mod_spandsp call progress tone detector to Rayo CPA signal events.  Fires DETECTED_TONE events until stopped. -->
-		<detector name="mod_spandsp_tone">
-			<start application="spandsp_start_tone_detect" data="1"/>
-			<stop application="spandsp_stop_tone_detect" data=""/>
-			<!-- map tone events to Rayo CPA signal type -->
-			<event class="DETECTED_TONE" type-header="Detected-Tone">
-				<signal-type header-value="SIT" value="sit"/>
-				<signal-type header-value="BUSY_TONE" value="busy"/>
-				<signal-type header-value="REORDER_TONE" value="congestion"/>
-				<signal-type header-value="RING_TONE" value="ring"/>
-			</event>
-		</detector>
-
-		<!-- map mod_avmd detector to Rayo CPA beep event.  Fires avmd::beep event once. -->
-		<detector name="mod_avmd">
-			<start application="avmd" data=""/>
-			<stop application="avmd" data="stop"/>
-			<event class="CUSTOM" subclass="avmd::beep">
-				<signal-type value="beep"/>
-			</event>
-		</detector>
-
-		<!-- Alternative beep detector using mod_vmd.  Fires vmd::beep events until stopped. -->
-		<!--detector name="mod_vmd">
-			<start application="vmd" data=""/>
-			<stop application="vmd" data="stop"/>
-			<event class="CUSTOM" subclass="vmd::beep">
-				<signal-type value="beep"/>
-			</event>
-		</detector-->
-	</cpa>
-
-	<!-- XMPP server domain -->
-	<domain name="$${rayo_domain_name}" shared-secret="ClueCon">
-	<!-- use this instead if you want secure XMPP client to server connections.  Put .crt and .key file in freeswitch/certs -->
-	<!--domain name="$${rayo_domain_name}" shared-secret="ClueCon" cert="$${base_dir}/certs/$${rayo_domain_name}.crt" key="$${base_dir}/certs/$${rayo_domain_name}.key"-->
-
-		<!-- Listeners for new Rayo client connections -->
-		<!--listen type="c2s" port="5222" address="$${local_ip_v4}" acl="rayo-clients"/-->
-		<listen type="c2s" port="5222" address="$${rayo_ip}" acl=""/>
-
-		<!-- Listeners for new server connections -->
-		<!--listen type="s2s" port="5269" address="$${local_ip_v4}" acl="rayo-servers"/-->
-
-		<!-- servers to connect to -->
-		<!--connect port="5269" address="node.example.com" domain="example.com"/-->
-
-		<!-- Authorized users -->
-		<users>
-			<user name="usera" password="1"/>
-		</users>
-	</domain>
-
-	<!-- URI mapping to endpoint / gateway -->
-	<dial-gateways>
-		<dial-gateway uriprefix="default" dialprefix="sofia/gateway/outbound/" strip="0"/>
-		<dial-gateway uriprefix="sip:" dialprefix="sofia/external/" strip="0"/>
-		<dial-gateway uriprefix="tel:" dialprefix="sofia/gateway/outbound/" strip="4"/>
-		<!-- pass through user and sofia unaltered -->
-		<dial-gateway uriprefix="user/" dialprefix="" strip=""/>
-		<dial-gateway uriprefix="sofia/" dialprefix="" strip=""/>
-		<dial-gateway uriprefix="loopback/" dialprefix="" strip=""/>
-	</dial-gateways>
-
-	<!-- IQ request aliases.  Used mainly for testing purposes or for controlling a rayo call via the console -->
-	<aliases>
-		<alias name="detect" target="call" args="1"><![CDATA[<input xmlns="urn:xmpp:rayo:input:1" mode="cpa"><grammar url="urn:xmpp:rayo:cpa:$1:1"/></input>]]></alias>
-		<alias name="detect-once" target="call" args="1"><![CDATA[<input xmlns="urn:xmpp:rayo:input:1" mode="cpa"><grammar url="urn:xmpp:rayo:cpa:$1:1?terminate=true"/></input>]]></alias>
-		<alias name="detect-tones" target="call"><![CDATA[<input xmlns="urn:xmpp:rayo:input:1" mode="cpa"><grammar url="urn:xmpp:rayo:cpa:busy:1"/><grammar url="urn:xmpp:rayo:cpa:congestion:1"/><grammar url="urn:xmpp:rayo:cpa:sit:1"/></input>]]></alias>
-		<alias name="ping" target="external"><![CDATA[<iq type="get"><ping xmlns="urn:xmpp:ping"/></iq>]]></alias>
-		<alias name="dial" target="server" args="2"><![CDATA[<dial xmlns="urn:xmpp:rayo:1" from="$1" to="$2"/>]]></alias>
-		<alias name="answer" target="call"><![CDATA[<answer xmlns="urn:xmpp:rayo:1"/>]]></alias>
-		<alias name="hangup" target="call"><![CDATA[<hangup xmlns="urn:xmpp:rayo:1"/>]]></alias>
-		<alias name="join" target="call" args="1"><![CDATA[<join xmlns="urn:xmpp:rayo:1" call-uri="xmpp:$1"/>]]></alias>
-		<alias name="join_mixer_duplex" target="call" args="1"><![CDATA[<join xmlns="urn:xmpp:rayo:1" mixer-name="$1" direction="duplex"/>]]></alias>
-		<alias name="join_mixer_send" target="call" args="1"><![CDATA[<join xmlns="urn:xmpp:rayo:1" mixer-name="$1" direction="send"/>]]></alias>
-		<alias name="join_mixer_recv" target="call" args="1"><![CDATA[<join xmlns="urn:xmpp:rayo:1" mixer-name="$1" direction="recv"/>]]></alias>
-		<alias name="unjoin_mixer" target="call" args="1"><![CDATA[<unjoin xmlns="urn:xmpp:rayo:1" mixer-name="$1"/>]]></alias>
-		<alias name="unjoin" target="call"><![CDATA[<unjoin xmlns="urn:xmpp:rayo:1"/>]]></alias>
-		<alias name="unjoin_call" target="call" args="1"><![CDATA[<unjoin xmlns="urn:xmpp:rayo:1" call-uri="xmpp:$1"/>]]></alias>
-		<alias name="stop" target="component"><![CDATA[<stop xmlns="urn:xmpp:rayo:ext:1"/>]]></alias>
-		<alias name="output_bad" target="call"><![CDATA[<output xmlns="urn:xmpp:rayo:output:1" repeat-time="100"></output>]]></alias>
-		<alias name="pause" target="output"><![CDATA[<pause xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="resume" target="output"><![CDATA[<resume xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="speed-up" target="output"><![CDATA[<speed-up xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="speed-down" target="output"><![CDATA[<speed-down xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="volume-up" target="output"><![CDATA[<volume-up xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="volume-down" target="output"><![CDATA[<volume-down xmlns="urn:xmpp:rayo:output:1"/>]]></alias>
-		<alias name="receivefax" target="call"><![CDATA[<receivefax xmlns="urn:xmpp:rayo:fax:1"/>]]></alias>
-		<alias name="sendfax" target="call" args="1"><![CDATA[<sendfax xmlns="urn:xmpp:rayo:fax:1"><document xmlns="urn:xmpp:rayo:fax:1" url="$1"/></sendfax>]]></alias>
-		<alias name="record" target="call"><![CDATA[<record xmlns="urn:xmpp:rayo:record:1"/>]]></alias>
-		<alias name="record_pause" target="record"><![CDATA[<pause xmlns="urn:xmpp:rayo:record:1"/>]]></alias>
-		<alias name="record_resume" target="record"><![CDATA[<resume xmlns="urn:xmpp:rayo:record:1"/>]]></alias>
-		<alias name="prompt_barge" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="5">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_no_barge" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="false">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="5">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_long" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_multi_digit" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><item repeat="1-4"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></item></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_terminator" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000" terminator="#">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><item repeat="1-4"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></item></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_input_bad" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-times="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtf" initial-timeout="5000" inter-digit-timeout="3000" terminator="#">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><item repeat="1-4"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></item></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="prompt_output_bad" target="call">
-			<![CDATA[
-				<prompt xmlns="urn:xmpp:rayo:prompt:1" barge-in="true">
-					<output xmlns="urn:xmpp:rayo:output:1" repeat-time="100">
-						<document content-type="application/ssml+xml">
-							<![CDATA[<speak><p>Please press a digit.</p></speak>]]]]><![CDATA[>
-						</document>
-					</output>
-					<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000" terminator="#">
-						<grammar content-type="application/srgs+xml">
-							<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><item repeat="1-4"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></item></rule></grammar>]]]]><![CDATA[>
-						</grammar>
-					</input>
-				</prompt>
-			]]>
-		</alias>
-		<alias name="input" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="dtmf" initial-timeout="5000" inter-digit-timeout="3000">
-					<grammar content-type="application/srgs+xml">
-						<![CDATA[<grammar mode="dtmf"><rule id="digit" scope="public"><one-of><item>0</item><item>1</item><item>2</item><item>3</item><item>4</item><item>5</item><item>6</item><item>7</item><item>8</item><item>9</item></one-of></rule></grammar>]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>
-
-		<alias name="input_voice_yesno_pocketsphinx" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="voice" recognizer="pocketsphinx" max-silence="5000" initial-timeout="5000">
-					<grammar content-type="application/srgs+xml>
-					<![CDATA[
-						<grammar xmlns="http://www.w3.org/2001/06/grammar"
-							xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-							xsi:schemaLocation="http://www.w3.org/2001/06/grammar http://www.w3.org/TR/speech-grammar/grammar.xsd"
-							xml:lang="en-US" version="1.0">
-								<rule id="yesno"><one-of><item>yes</item><item>no</item></one-of></rule></grammar>
-					]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>
-
-		<alias name="input_voice_yesno_default" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="voice" max-silence="5000" initial-timeout="5000">
-					<grammar content-type="application/srgs+xml>
-					<![CDATA[
-						<grammar xmlns="http://www.w3.org/2001/06/grammar"
-							xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-							xsi:schemaLocation="http://www.w3.org/2001/06/grammar http://www.w3.org/TR/speech-grammar/grammar.xsd"
-							xml:lang="en-US" version="1.0">
-								<rule id="yesno"><one-of><item>yes</item><item>no</item></one-of></rule></grammar>
-					]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>
-
-	</aliases>
-
-</configuration>
diff --git a/src/mod/event_handlers/mod_rayo/gateway/README b/src/mod/event_handlers/mod_rayo/gateway/README
deleted file mode 100644
index 18c4f4b678..0000000000
--- a/src/mod/event_handlers/mod_rayo/gateway/README
+++ /dev/null
@@ -1,24 +0,0 @@
-# Still a work in progress...
-
-# Compile on CentOS 6.4
-erlc -I /usr/lib64/ejabberd/include mod_rayo_gateway.erl
-
-# Install in ejabberd
-cp mod_rayo_gateway.beam /usr/lib64/ejabberd/ebin/
-
-vi /etc/ejabberd/ejabberd.cfg
-      %%
-      %% Modules enabled in all ejabberd virtual hosts
-      %%
-      {modules,
-       [
-        ...
-	{mod_rayo_gateway,[]},
-        ...
-       ]}.
-
-ejabberdctl debug
-(ejabberd@jabber)1> l(mod_rayo_gateway).
-{module,mod_rayo_gateway}
-(ejabberd@jabber)2>
-
diff --git a/src/mod/event_handlers/mod_rayo/gateway/mod_rayo_gateway.erl b/src/mod/event_handlers/mod_rayo/gateway/mod_rayo_gateway.erl
deleted file mode 100644
index 72bcd48ea2..0000000000
--- a/src/mod/event_handlers/mod_rayo/gateway/mod_rayo_gateway.erl
+++ /dev/null
@@ -1,759 +0,0 @@
-%%
-%% Copyright (c) 2013 Grasshopper
-%%
-%% Permission is hereby granted, free of charge, to any person obtaining a copy
-%% of this software and associated documentation files (the "Software"), to deal
-%% in the Software without restriction, including without limitation the rights
-%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-%% copies of the Software, and to permit persons to whom the Software is
-%% furnished to do so, subject to the following conditions:
-%% 
-%% The above copyright notice and this permission notice shall be included in
-%% all copies or substantial portions of the Software.
-%% 
-%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-%% THE SOFTWARE.
-%%
-%% Contributors:
-%%   Chris Rienzo <chris.rienzo@grasshopper.com>
-%%
-%% Maintainer: Chris Rienzo <chris.rienzo@grasshopper.com>
-%%
-%% mod_rayo_gateway.erl -- ejabberd Rayo gateway module
-%%
--module(mod_rayo_gateway).
-
--include("ejabberd.hrl").
--include("jlib.hrl").
-
--behavior(gen_server).
--behavior(gen_mod).
-
-%%  JID mappings
-%%
-%%  Entity          Internal JID                     Mapped JID
-%%  ======          ===============                  ===============
-%%  Client          user@domain/resource             gateway@internal_domain/gw-resource
-%%  Node            node_domain                      external_domain
-%%  Call            uuid@node_domain                 node_domain|uuid@external_domain
-%%  Call Resource   uuid@node_domain/resource        node_domain|uuid@external_domain/resource
-%%  Mixer           name@node_domain                 node_domain|name@external_domain
-%%  Mixer Resource  name@node_domain/resource        node_domain|name@external_domain/resource
-
-%% TODO don't allow nodes to act as clients
-%% TODO don't allow clients to act as nodes
-
--export([
-	start_link/2,
-	start/2,
-	stop/1,
-	init/1,
-	handle_call/3,
-	handle_cast/2,
-	handle_info/2,
-	terminate/2,
-	code_change/3,
-	route_internal/3,
-	route_external/3
-]).
-
--define(PROCNAME, ejabberd_mod_rayo_gateway).
--define(NS_RAYO, "urn:xmpp:rayo:1").
--define(NS_PING, "urn:xmpp:ping").
-
--record(rayo_config, {name, value}).
--record(rayo_clients, {jid, status}).
--record(rayo_nodes, {jid, status}).
--record(rayo_entities, {external_jid, internal_jid, dcp_jid, type}).
-
-start_link(Host, Opts) ->
-	Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-	gen_server:start_link({local, Proc}, ?MODULE, [Host, Opts], []).
-
-% Start the module process
-start(Host, Opts) ->
-	Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-	ChildSpec = {Proc,
-		{?MODULE, start_link, [Host, Opts]},
-		temporary,
-		1000,
-		worker,
-		[?MODULE]},
-	supervisor:start_child(ejabberd_sup, ChildSpec).
-
-% Shutdown the module
-stop(Host) ->
-	Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-	gen_server:call(Proc, stop),
-	supervisor:terminate_child(ejabberd_sup, Proc),
-	supervisor:delete_child(ejabberd_sup, Proc).
-
-% Initialize the module
-init([Host, Opts]) ->
-	?DEBUG("MOD_RAYO_GATEWAY: Starting", []),
-
-	mnesia:delete_table(rayo_clients),
-	mnesia:create_table(rayo_clients, [{attributes, record_info(fields, rayo_clients)}]),
-	mnesia:delete_table(rayo_nodes),
-	mnesia:create_table(rayo_nodes, [{attributes, record_info(fields, rayo_nodes)}]),
-	mnesia:delete_table(rayo_entities),
-	mnesia:create_table(rayo_entities, [{attributes, record_info(fields, rayo_entities)}, {index, [internal_jid]}]),
-	mnesia:delete_table(rayo_config),
-	mnesia:create_table(rayo_config, [{attributes, record_info(fields, rayo_config)}]),
-
-	{A1,A2,A3} = now(),
-	random:seed(A1, A2, A3),
-
-	% create virtual domains
-	InternalDomain = gen_mod:get_opt_host(Host, Opts, "rayo-int.@HOST@"),
-	ExternalDomain = gen_mod:get_opt_host(Host, Opts, "rayo.@HOST@"),
-	{ok, Hostname} = inet:gethostname(),
-	InternalClient = "gateway@" ++ InternalDomain ++ "/" ++ Hostname ++ "-" ++ integer_to_list(random:uniform(65535)),
-	?DEBUG("MOD_RAYO_GATEWAY: InternalDomain = ~p, ExternalDomain = ~p, InternalClient = ~p", [InternalDomain, ExternalDomain, InternalClient]),
-	mnesia:transaction(
-		fun() ->
-			mnesia:write(#rayo_config{name = "internal_domain", value = InternalDomain}),
-			mnesia:write(#rayo_config{name = "internal_client", value = InternalClient}),
-			mnesia:write(#rayo_config{name = "external_domain", value = ExternalDomain})
-		end
-	),
-
-	% set up routes to virtual domains
-	ejabberd_router:register_route(InternalDomain, {apply, ?MODULE, route_internal}),
-	ejabberd_router:register_route(ExternalDomain, {apply, ?MODULE, route_external}),
-	{ok, Host}.
-
-handle_call(stop, _From, Host) ->
-	{stop, normal, ok, Host}.
-
-handle_cast(_Msg, Host) ->
-	{noreply, Host}.
-
-handle_info(_Msg, Host) ->
-	{noreply, Host}.
-
-terminate(_Reason, Host) ->
-	ejabberd_router:unregister_route(Host),
-	ok.
-
-code_change(_OldVsn, Host, _Extra) ->
-	{ok, Host}.
-
-register_rayo_node(Jid) ->
-	Write = fun() ->
-		mnesia:write(#rayo_nodes{jid = Jid, status = "online" })
-	end,
-	Result = mnesia:transaction(Write),
-	?DEBUG("MOD_RAYO_GATEWAY: register node: ~p, result = ~p, ~p nodes total", [jlib:jid_to_string(Jid), Result, num_rayo_nodes()]),
-	case num_clients() >= 1 of
-		true ->
-			ejabberd_router:route(internal_client(), Jid, online_presence());
-		_ ->
-			ok
-	end,
-	ok.
-
-% TODO call this when s2s connection is dropped
-unregister_rayo_node(Jid) ->
-	Delete = fun() ->
-		mnesia:delete({rayo_nodes, Jid})
-	end,
-	Result = mnesia:transaction(Delete),
-	Size = mnesia:table_info(rayo_nodes, size),
-	?DEBUG("MOD_RAYO_GATEWAY: unregister node: ~p, result = ~p, ~p nodes total", [jlib:jid_to_string(Jid), Result, Size]),
-	ok.
-
-% Add client
-register_rayo_client(Jid) ->
-	Write = fun() ->
-		mnesia:write(#rayo_clients{jid = Jid, status = "online" })
-	end,
-	Result = mnesia:transaction(Write),
-	Size = num_clients(),
-	?DEBUG("MOD_RAYO_GATEWAY: register client: ~p, result = ~p, ~p clients total", [jlib:jid_to_string(Jid), Result, Size]),
-	case Size of
-		1 ->
-			route_to_list(internal_client(), all_rayo_nodes(), online_presence());
-		_ ->
-			ok
-	end,
-	ok.
-
-% Remove client
-% TODO call this when c2s connection is dropped
-unregister_rayo_client(Jid) ->
-	Delete = fun() ->
-		mnesia:delete({rayo_clients, Jid})
-	end,
-	Result = mnesia:transaction(Delete),
-	Size = num_clients(),
-	?DEBUG("MOD_RAYO_GATEWAY: unregister client: ~p, result = ~p, ~p clients total", [jlib:jid_to_string(Jid), Result, Size]),
-	case Size of
-		0 ->
-			route_to_list(internal_client(), all_rayo_nodes(), offline_presence());
-		_ ->
-			ok
-	end,
-	ok.
-
-% Add node entity
-register_rayo_node_entity(ExtJid, IntJid, DcpJid, Type) ->
-	Write = fun() ->
-		mnesia:write(#rayo_entities{external_jid = ExtJid, internal_jid = IntJid, dcp_jid = DcpJid, type = Type})
-	end,
-	Result = mnesia:transaction(Write),
-	Size = mnesia:table_info(rayo_entities, size),
-	?DEBUG("MOD_RAYO_GATEWAY: register entity: ~p, result = ~p, ~p entities total", [jlib:jid_to_string(ExtJid), Result, Size]),
-	ok.
-
-% Remove node entity
-unregister_rayo_node_entity(ExtJid) ->
-	Delete = fun() ->
-		mnesia:delete({rayo_entities, ExtJid})
-	end,
-	Result = mnesia:transaction(Delete),
-	Size = mnesia:table_info(rayo_entities, size),
-	?DEBUG("MOD_RAYO_GATEWAY: unregister entity: ~p, result = ~p, ~p entities total", [jlib:jid_to_string(ExtJid), Result, Size]),
-	ok.
-
-% find node entity given enitity's (or its component's) internal JID
-find_rayo_node_entity_by_int_jid(IntJid) ->
-	% remove resource from JID to find component's parent call/mixer
-	case mnesia:dirty_index_read(rayo_entities, jlib:jid_remove_resource(IntJid), #rayo_entities.internal_jid) of
-		[Entity | _] ->
-			Entity;
-		_ ->
-			none
-	end.
-
-% find node entity given enitity's (or its component's) external JID
-find_rayo_node_entity_by_ext_jid(ExtJid) ->
-	% remove resource from JID to find component's parent call/mixer
-	case mnesia:dirty_read(rayo_entities, jlib:jid_remove_resource(ExtJid)) of
-		[Entity | _] ->
-			Entity;
-		_ ->
-			none
-	end.
-
-% find entity Definitive Controlling Party JID given entity external JID
-find_rayo_node_entity_dcp_by_ext_jid(ExtJid) ->
-	case find_rayo_node_entity_by_ext_jid(ExtJid) of
-		{rayo_entities, _, _, DcpJid, _} ->
-			DcpJid;
-		_ ->
-			none
-	end.
-
-% find entity Definitive Controlling Party JID given entity internal JID
-find_rayo_node_entity_dcp_by_int_jid(IntJid) ->
-	case find_rayo_node_entity_by_int_jid(IntJid) of
-		{rayo_entities, _, _, DcpJid, _} ->
-			DcpJid;
-		_ ->
-			none
-	end.
-
-% create External JID from Internal JID
-% intnode@intdomain/resource -> intdomain-intnode@extdomain/resource
-create_external_jid({jid, Node, Domain, Resource, _, _, _}) ->
-	jlib:make_jid(Domain ++ "|" ++ Node, jlib:jid_to_string(external_domain()), Resource).
-
-% create Internal JID from External JID
-% intdomain-intnode@extdomain/resource -> intnode@intdomain/resource
-create_internal_jid({jid, Node, _Domain, Resource, _, _, _}) ->
-	% TODO use rayo_entities to lookup node... it's safer
-	Idx = string:str(Node, "|"),
-	case Idx > 0 of
-		true ->
-			jlib:make_jid(string:substr(Node, Idx + 1), string:substr(Node, 1, Idx - 1), Resource);
-		false ->
-			none
-	end.
-
-% Take control of entity
-% Return {true, internal entity JID} if successful
-set_entity_dcp(PcpJid, EntityJid) ->
-	SetDcp = fun() ->
-		case mnesia:wread(rayo_entities, EntityJid) of
-			[{rayo_entities, EntityJid, InternalJid, none, Type}] ->
-				% take control
-				case mnesia:write(#rayo_entities{external_jid = EntityJid, internal_jid = InternalJid, dcp_jid = PcpJid, type = Type}) of
-					ok ->
-						{true, InternalJid};
-					Else ->
-						{error, Else}
-				end;
-			_ ->
-				{false, []}
-		end
-	end,
-	{_, Result} = mnesia:transaction(SetDcp),
-	Result.
-
-% Check if PCP has control of entity
-% Return {true, internal entity JID} if true
-is_entity_dcp(PcpJid, EntityJid) ->
-	% quick check first
-	case mnesia:dirty_read(rayo_entities, EntityJid) of
-		[{rayo_entities, EntityJid, _, none, _}] ->
-			% take control
-			set_entity_dcp(PcpJid, EntityJid);
-		[{rayo_entities, EntityJid, InternalJid, PcpJid, _}] ->
-			{true, InternalJid};
-		[{rayo_entities, EntityJid, InternalJid, _, _}] ->
-			{false, InternalJid};
-		[] ->
-			?DEBUG("MOD_RAYO_GATEWAY: no match for EntityJid ~p", [EntityJid]),
-			{false, none}
-	end.
-
-% Handle presence to external domain
-route_external(From, {jid, [], _Domain, [], [], _LDomain, []} = To, {xmlelement, "presence", _Attrs, _Els} = Presence) ->
-	?DEBUG("MOD_RAYO_GATEWAY: got client presence ~n~p", [Presence]),
-	route_client_presence(From, To, Presence),
-	ok;
-
-% Handle presence to external domain resource
-route_external(From, To, {xmlelement, "presence", _Attrs, _Els} = Presence) ->
-	?DEBUG("MOD_RAYO_GATEWAY: got client presence to mixer ~n~p", [Presence]),
-	% TODO check if actually being sent to mixer...
-	route_client_presence_to_mixer(From, To, Presence),
-	ok;
-
-% Handle <message> to external domain
-route_external(_From, _To, {xmlelement, "message", _Attrs, _Els} = Message) ->
-	% ignore
-	?DEBUG("MOD_RAYO_GATEWAY: got client message ~n~p", [Message]),
-	ok;
-
-% Handle <iq> to external domain
-route_external(From, {jid, [], _Domain, [], [], _LDomain, []} = To, {xmlelement, "iq", _Attrs, _Els} = IQ) ->
-	?DEBUG("MOD_RAYO_GATEWAY: got client iq to gateway ~n~p", [IQ]),
-	case get_attribute_as_list(IQ, "type", "") of
-		"get" ->
-			case get_element(IQ, ?NS_PING, "ping") of
-				undefined ->
-					route_error_reply(To, From, IQ, ?ERR_BAD_REQUEST);
-				_ ->
-					route_result_reply(To, From, IQ)
-			end;
-		"set" ->
-			case get_element(IQ, ?NS_RAYO, "dial") of
-				undefined->
-					route_error_reply(To, From, IQ, ?ERR_BAD_REQUEST);
-				_ ->
-					route_dial_call(To, From, IQ)
-			end;
-		"" ->
-			route_error_reply(To, From, IQ, ?ERR_BAD_REQUEST)
-	end,
-	ok;
-
-% Handle <iq> to external domain resource
-route_external(From, To, {xmlelement, "iq", _Attrs, _Els} = IQ) ->
-	?DEBUG("MOD_RAYO_GATEWAY: got client iq ~n~p", [IQ]),
-	case is_entity_dcp(From, To) of
-		{true, _} ->
-			IntFrom = internal_client(),
-			IntTo = create_internal_jid(To),
-			route_iq_request(IntFrom, IntTo, IQ, fun(IQReply) -> route_iq_response(From, To, IQ, IQReply) end);
-		{false, _} ->
-			route_error_reply(To, From, IQ, ?ERR_CONFLICT);
-		_ ->
-			route_error_reply(To, From, IQ, ?ERR_BAD_REQUEST)
-	end,
-	ok.
-
-% Handle <presence> to internal domain
-route_internal(From, {jid, [], _Domain, [], [], _LDomain, []} = To, {xmlelement, "presence", _Attrs, _Els} = Presence) ->
-	?DEBUG("MOD_RAYO_GATEWAY: got node presence to internal domain ~n~p", [Presence]),
-	route_server_presence(From, To, Presence),
-	ok;
-
-% Handle <presence> to internal domain resource
-route_internal(From, To, {xmlelement, "presence", _Attrs, _Els} = Presence) ->
-	?DEBUG("MOD_RAYO_GATEWAY: got node presence to internal domain ~n~p", [Presence]),
-	case To =:= internal_client() of
-		true ->
-			route_server_presence(From, To, Presence);
-		false ->
-			% TODO implement
-			ok
-	end,
-	ok;
-
-% Handle <message> to internal domain
-route_internal(_From, _To, {xmlelement, "message", _Attrs, _Els} = Message) ->
-	?DEBUG("MOD_RAYO_GATEWAY: got node message ~n~p", [Message]),
-	% ignore
-	ok;
-
-% Handle <iq> to internal domain.
-route_internal(From, {jid, [], _Domain, [], [], _LDomain, []} = To, {xmlelement, "iq", _Attrs, _Els} = IQ) ->
-	?DEBUG("MOD_RAYO_GATEWAY: got node iq ~n~p", [IQ]),
-	case get_attribute_as_list(IQ, "type", "") of
-		"get" ->
-			case get_element(IQ, ?NS_PING, "ping") of
-				undefined ->
-					route_error_reply(To, From, IQ, ?ERR_BAD_REQUEST);
-				_ ->
-					route_result_reply(To, From, IQ)
-			end;
-		"result" ->
-			ejabberd_local:process_iq_reply(From, To, jlib:iq_query_or_response_info(IQ));
-		"error" ->
-			ejabberd_local:process_iq_reply(From, To, jlib:iq_query_or_response_info(IQ));
-		"" ->
-			% don't allow get/set from nodes
-			route_error_reply(To, From, IQ, ?ERR_BAD_REQUEST)
-	end,
-	ok;
-
-% Handle <iq> to internal domain resource.
-route_internal(From, To, {xmlelement, "iq", _Attrs, _Els} = IQ) ->
-	?DEBUG("MOD_RAYO_GATEWAY: got node iq ~n~p", [IQ]),
-	case get_attribute_as_list(IQ, "type", "") of
-		"result" ->
-			ejabberd_local:process_iq_reply(From, To, jlib:iq_query_or_response_info(IQ));
-		"error" ->
-			ejabberd_local:process_iq_reply(From, To, jlib:iq_query_or_response_info(IQ));
-		_ ->
-			% Don't allow get/set from nodes
-			route_error_reply(To, From, IQ, ?ERR_BAD_REQUEST)
-	end,
-	ok.
-
-% Process presence message from rayo node
-route_rayo_node_presence(From, _To, Presence) ->
-	case get_attribute_as_list(Presence, "type", "") of
-		"" ->
-			case get_element(Presence, "show") of
-				undefined ->
-					?DEBUG("MOD_RAYO_GATEWAY: ignoring empty presence", []);
-				Show ->
-					case get_cdata_as_list(Show) of
-						"chat" ->
-							register_rayo_node(From);
-						"dnd" ->
-							unregister_rayo_node(From);
-						"xa" ->
-							unregister_rayo_node(From);
-						"" ->
-							unregister_rayo_node(From)
-					end
-			end;
-		"unavailable" ->
-			%TODO broadcast end instead?
-			unregister_rayo_node(From)
-	end,
-	ok.
-
-% Process presence from call
-route_call_presence(From, _To, Presence) ->
-	%TODO join/unjoin mixer events
-	case get_attribute_as_list(Presence, "type", "") of
-		"" ->
-			case get_element(Presence, ?NS_RAYO, "offer") of
-				undefined ->
-					route_rayo_entity_stanza(From, Presence);
-				_ ->
-					route_offer_call(From, Presence)
-			end;
-		"unavailable" ->
-			case get_element(Presence, ?NS_RAYO, "end") of
-				undefined ->
-					route_rayo_entity_stanza(From, Presence);
-				_ ->
-					route_rayo_entity_stanza(From, Presence),
-					unregister_rayo_node_entity(create_external_jid(From))
-			end
-	end,
-	ok.
-
-% presence from node
-route_server_presence({jid, [], _Domain, [], [], _LDomain, []} = From, To, Presence) ->
-	route_rayo_node_presence(From, To, Presence),
-	ok;
-
-% presence from call/mixer
-route_server_presence(From, To, Presence) ->
-	% TODO mixer
-	route_call_presence(From, To, Presence),
-	ok.
-
-% presence from Rayo Client
-route_client_presence(From, _To, Presence) ->
-	case get_attribute_as_list(Presence, "type", "") of
-		"" ->
-			case get_element(Presence, "show") of
-				undefined ->
-					?DEBUG("MOD_RAYO_GATEWAY: ignoring empty presence", []);
-				Show ->
-					case get_cdata_as_list(Show) of
-						"chat" ->
-							register_rayo_client(From);
-						"dnd" ->
-							unregister_rayo_client(From);
-						_ ->
-							unregister_rayo_client(From)
-					end
-			end;
-		"unavailable" ->
-			unregister_rayo_client(From);
-		_ ->
-			ok
-	end,
-	ok.
-
-% route client directed presence to mixer
-route_client_presence_to_mixer(_From, _To, _Presence) ->
-	% TODO
-	ok.
-
-% Handle offer to client
-route_offer_call(From, Offer) ->
-	% Any clients available?
-	case pick_client() of
-		none ->
-			% TODO reject?
-			ok;
-		ClientDcp ->
-			% Remember call
-			ExtFrom = create_external_jid(From),
-			register_rayo_node_entity(ExtFrom, From, ClientDcp, call),
-			ejabberd_router:route(ExtFrom, ClientDcp, Offer)
-	end,
-	ok.
-
-% convert URI to a JID
-uri_to_jid(Uri) ->
-	JidString = case string:str(Uri, "xmpp:") of
-		1 ->
-			string:substr(Uri, 6);
-		_ ->
-			Uri
-	end,
-	jlib:string_to_jid(JidString).
-
-% convert internal IQ reply to an external reply
-create_external_iq_reply(OrigIQ, {xmlelement, _, _, Els} = IQReply) ->
-	IQId = get_attribute_as_list(OrigIQ, "id", ""),
-	IQType = get_attribute_as_list(IQReply, "type", ""),
-	{xmlelement, "iq", [{"id", IQId}, {"type", IQType}], Els}.
-
-% Process dial response
-route_dial_call_response(OrigFrom, OrigTo, OrigIQ, timeout) ->
-	% TODO retry on different node?
-	route_iq_response(OrigFrom, OrigTo, OrigIQ, timeout);
-
-route_dial_call_response(OrigFrom, OrigTo, OrigIQ, IQReply) ->
-	?DEBUG("MOD_RAYO_GATEWAY: IQ response for ~p", [OrigIQ]),
-	IQReplyPacket = jlib:iq_to_xml(IQReply),
-	case get_element(IQReplyPacket, "error") of
-		undefined ->
-			case get_element(IQReplyPacket, "ref") of
-				undefined ->
-					ok;
-				Ref ->
-					IntJid = uri_to_jid(get_attribute_as_list(Ref, "uri", "")),
-					register_rayo_node_entity(create_external_jid(IntJid), IntJid, OrigFrom, call)
-			end;
-		_ ->
-			ok
-	end,
-	ejabberd_router:route(OrigTo, OrigFrom, create_external_iq_reply(OrigIQ, IQReplyPacket)),
-	ok.
-
-% Forward dial to node
-route_dial_call(From, To, Dial) ->
-	% any nodes available?
-	case num_rayo_nodes() > 0 of
-		true ->
-			IntFrom = internal_client(),
-			case pick_rayo_node() of
-				none ->
-					route_error_reply(To, From, Dial, ?ERR_SERVICE_UNAVAILABLE);
-				NodeJid ->
-					route_iq_request(IntFrom, NodeJid, Dial, fun(IQReply) -> route_dial_call_response(From, To, Dial, IQReply) end)
-			end;
-		_ ->
-			route_error_reply(To, From, Dial, ?ERR_RESOURCE_CONSTRAINT)
-	end.
-
-% return configuration value given name
-config_value(Name) ->
-	case catch mnesia:dirty_read(rayo_config, Name) of
-		[{rayo_config, Name, Value}] ->
-			Value;
-		_ ->
-			""
-	end.
-
-% return internal client name
-internal_client() ->
-	jlib:string_to_jid(config_value("internal_client")).
-
-% return internal domain name
-internal_domain() ->
-	jlib:string_to_jid(config_value("internal_domain")).
-
-% return external domain name
-external_domain() ->
-	jlib:string_to_jid(config_value("external_domain")).
-
-% return number of registered clients
-num_clients() ->
-	mnesia:table_info(rayo_clients, size).
-
-% return all registered client JIDs
-all_clients() ->
-	case mnesia:transaction(fun() -> mnesia:all_keys(rayo_clients) end) of
-		{atomic, Keys} ->
-			Keys;
-		_ ->
-			[]
-	end.
-
-% pick a registered client
-pick_client() ->
-	% pick at random for now...
-	case all_clients() of
-		[] ->
-			none;
-		AllClients ->
-			lists:nth(random:uniform(length(AllClients)), AllClients)
-	end.
-
-% pick a registered node
-pick_rayo_node() ->
-	% pick at random for now...
-	case all_rayo_nodes() of
-		[] ->
-			none;
-		AllNodes ->
-			lists:nth(random:uniform(length(AllNodes)), AllNodes)
-	end.
-
-% return number of registered rayo nodes
-num_rayo_nodes() ->
-	mnesia:table_info(rayo_nodes, size).
-
-% return all rayo node JIDs
-all_rayo_nodes() ->
-	case mnesia:transaction(fun() -> mnesia:all_keys(rayo_nodes) end) of
-		{atomic, Keys} ->
-			Keys;
-		_ ->
-			[]
-	end.
-
-presence(Status) ->
-	{xmlelement, "presence", [], [
-		{xmlelement, "show", [], [
-			{xmlcdata, Status}
-		]}
-	]}.
-
-online_presence() ->
-	presence(<<"chat">>).
-
-offline_presence() ->
-	presence(<<"dnd">>).
-
-route_to_list(From, ToList, Stanza) ->
-	lists:map(fun(To) -> ejabberd_router:route(From, To, Stanza) end, ToList),
-	ok.
-
-% route stanza from entity
-route_rayo_entity_stanza(From, Stanza) ->
-	case find_rayo_node_entity_dcp_by_int_jid(From) of
-		none ->
-			?DEBUG("MOD_RAYO_GATEWAY: Failed to find DCP for ~p", [From]),
-			ok;
-		DcpJid ->
- 			ejabberd_router:route(create_external_jid(From), DcpJid, Stanza)
- 	end,
-	ok.
-
-% route IQ response from node to client
-route_iq_response(OrigFrom, OrigTo, OrigIQ, timeout) ->
-	route_error_reply(OrigTo, OrigFrom, OrigIQ, ?ERR_REMOTE_SERVER_TIMEOUT),
-	ok;
-
-route_iq_response(OrigFrom, OrigTo, OrigIQ, IQReply) ->
-	?DEBUG("MOD_RAYO_GATEWAY: IQ response for ~p", [OrigIQ]),
-	ejabberd_router:route(OrigTo, OrigFrom, create_external_iq_reply(OrigIQ, jlib:iq_to_xml(IQReply))),
-	ok.
-
-% route IQ from client to node
-route_iq_request(From, To, {xmlelement, "iq", _Atts, Els}, ResponseCallback) ->
-	ejabberd_local:route_iq(From, To, #iq{type = set, sub_el = Els}, ResponseCallback),
-	ok.
-
-% route IQ error given request
-route_error_reply(From, To, IQ, Reason) ->
-	ejabberd_router:route(From, To, jlib:make_error_reply(IQ, Reason)),
-	ok.
-
-% route IQ result given request
-route_result_reply(From, To, IQ) ->
-	ejabberd_router:route(From, To, jlib:make_result_iq_reply(IQ)),
-	ok.
-
-% XML parsing helpers
-
-get_element(Element, Name) ->
-	case xml:get_subtag(Element, Name) of
-		false ->
-			undefined;
-		Subtag ->
-			Subtag
-	end.
-
-get_element(Element, NS, Name) ->
-	case get_element(Element, Name) of
-		undefined ->
-			undefined;
-		Subtag ->
-			case get_attribute_as_list(Subtag, "xmlns", "") of
-				"" ->
-					undefined;
-				NS ->
-					Subtag
-			end
-	end.
-
-get_cdata_as_list(undefined) ->
-	"";
-
-get_cdata_as_list(Element) ->
-	xml:get_tag_cdata(Element).
-
-get_element_cdata_as_list(Element, Name) ->
-	get_cdata_as_list(get_element(Element, Name)).
-
-get_element_cdata_as_list(Element, NS, Name) ->
-	get_cdata_as_list(get_element(Element, NS, Name)).
-
-get_element_attribute_as_list(Element, Name, AttrName, Default) ->
-	get_attribute_as_list(get_element(Element, Name), AttrName, Default).
-
-get_element_attribute_as_list(Element, NS, Name, AttrName, Default) ->
-	get_attribute_as_list(get_element(Element, NS, Name), AttrName, Default).
-
-get_attribute_as_list(undefined, _Name, _Default) ->
-	undefined;
-
-get_attribute_as_list(Element, Name, Default) ->
-	case xml:get_tag_attr_s(Name, Element) of
-		"" ->
-			Default;
-		Attr ->
-			Attr
-	end.
diff --git a/src/mod/event_handlers/mod_rayo/iks_helpers.c b/src/mod/event_handlers/mod_rayo/iks_helpers.c
deleted file mode 100644
index 2f293aabb7..0000000000
--- a/src/mod/event_handlers/mod_rayo/iks_helpers.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2014, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * iks_helpers.c -- iksemel helpers
- *
- */
-#include "iks_helpers.h"
-#include <switch.h>
-#include <openssl/hmac.h>
-#include <openssl/sha.h>
-
-#undef XMPP_ERROR
-#define XMPP_ERROR(def_name, name, type) \
-	const struct xmpp_error def_name##_val = { name, type }; \
-	const struct xmpp_error *def_name = &def_name##_val;
-#include "xmpp_errors.def"
-
-/**
- * Create a <presence> event
- * @param name the event name
- * @param namespace the event namespace
- * @param from
- * @param to
- * @return the event XML node
- */
-iks *iks_new_presence(const char *name, const char *namespace, const char *from, const char *to)
-{
-	iks *event = iks_new("presence");
-	iks *x;
-	/* iks makes copies of attrib name and value */
-	iks_insert_attrib(event, "from", from);
-	iks_insert_attrib(event, "to", to);
-	x = iks_insert(event, name);
-	if (!zstr(namespace)) {
-		iks_insert_attrib(x, "xmlns", namespace);
-	}
-	return event;
-}
-
-/**
- * Create error response from request
- * @param req the request
- * @param from
- * @param to
- * @param err the XMPP stanza error
- * @return the error response
- */
-iks *iks_new_error(iks *req, const struct xmpp_error *err)
-{
-	iks *response = iks_copy(req);
-	iks *x;
-
-	/* <iq> */
-	iks_insert_attrib(response, "from", iks_find_attrib(req, "to"));
-	iks_insert_attrib(response, "to", iks_find_attrib(req, "from"));
-	iks_insert_attrib(response, "type", "error");
-
-	/* <error> */
-	x = iks_insert(response, "error");
-	iks_insert_attrib(x, "type", err->type);
-
-	/* e.g. <feature-not-implemented> */
-	x = iks_insert(x, err->name);
-	iks_insert_attrib(x, "xmlns", IKS_NS_XMPP_STANZAS);
-
-	return response;
-}
-
-/**
- * Create error response from request
- * @param req the request
- * @param from
- * @param to
- * @param err the XMPP stanza error
- * @param detail_text optional text to include in message
- * @return the <iq> error response
- */
-iks *iks_new_error_detailed(iks *req, const struct xmpp_error *err, const char *detail_text)
-{
-	iks *reply = iks_new_error(req, err);
-	if (!zstr(detail_text)) {
-		iks *error = iks_find(reply, "error");
-		iks *text = iks_insert(error, "text");
-		iks_insert_attrib(text, "xml:lang", "en");
-		iks_insert_attrib(text, "xmlns", IKS_NS_XMPP_STANZAS);
-		iks_insert_cdata(text, detail_text, strlen(detail_text));
-	}
-	return reply;
-}
-
-/**
- * Create error response from request
- * @param req the request
- * @param from
- * @param to
- * @param err the XMPP stanza error
- * @param detail_text_format format string
- * @param ...
- * @return the error response
- */
-iks *iks_new_error_detailed_printf(iks *req, const struct xmpp_error *err, const char *detail_text_format, ...)
-{
-	iks *reply = NULL;
-	char *data;
-	va_list ap;
-	int ret;
-
-	va_start(ap, detail_text_format);
-	ret = switch_vasprintf(&data, detail_text_format, ap);
-	va_end(ap);
-
-	if (ret == -1) {
-		return NULL;
-	}
-	reply = iks_new_error_detailed(req, err, data);
-	free(data);
-	return reply;
-}
-
-/**
- * Create <iq> result response from request
- * @param iq the request
- * @return the result response
- */
-iks *iks_new_iq_result(iks *iq)
-{
-	iks *response = iks_new("iq");
-	iks_insert_attrib(response, "from", iks_find_attrib(iq, "to"));
-	iks_insert_attrib(response, "to", iks_find_attrib(iq, "from"));
-	iks_insert_attrib(response, "type", "result");
-	iks_insert_attrib(response, "id", iks_find_attrib(iq, "id"));
-	return response;
-}
-
-/**
- * Get attribute value of node, returning empty string if non-existent or not set.
- * @param xml the XML node to search
- * @param attrib the Attribute name
- * @return the attribute value
- */
-const char *iks_find_attrib_soft(iks *xml, const char *attrib)
-{
-	char *value = iks_find_attrib(xml, attrib);
-	return zstr(value) ? "" : value;
-}
-
-/**
- * Get attribute value of node, returning default value if missing.  The default value
- * is set in the node if missing.
- * @param xml the XML node to search
- * @param attrib the Attribute name
- * @return the attribute value
- */
-const char *iks_find_attrib_default(iks *xml, const char *attrib, const char *def)
-{
-	char *value = iks_find_attrib(xml, attrib);
-	if (!value) {
-		iks_insert_attrib(xml, attrib, def);
-		return def;
-	}
-	return value;
-}
-
-/**
- * Get attribute integer value of node
- * @param xml the XML node to search
- * @param attrib the Attribute name
- * @return the attribute value
- */
-int iks_find_int_attrib(iks *xml, const char *attrib)
-{
-	return atoi(iks_find_attrib_soft(xml, attrib));
-}
-
-/**
- * Get attribute boolean value of node
- * @param xml the XML node to search
- * @param attrib the Attribute name
- * @return the attribute value
- */
-int iks_find_bool_attrib(iks *xml, const char *attrib)
-{
-	return switch_true(iks_find_attrib_soft(xml, attrib));
-}
-
-/**
- * Get attribute double value of node
- * @param xml the XML node to search
- * @param attrib the Attribute name
- * @return the attribute value
- */
-double iks_find_decimal_attrib(iks *xml, const char *attrib)
-{
-	return atof(iks_find_attrib_soft(xml, attrib));
-}
-
-/**
- * Get attribute character value of node
- * @param xml the XML node to search
- * @param attrib the Attribute name
- * @return the attribute value
- */
-char iks_find_char_attrib(iks *xml, const char *attrib)
-{
-	return iks_find_attrib_soft(xml, attrib)[0];
-}
-
-/**
- * Convert iksemel XML node type to string
- * @param type the XML node type
- * @return the string value of type or "UNKNOWN"
- */
-const char *iks_node_type_to_string(int type)
-{
-	switch(type) {
-		case IKS_NODE_START: return "NODE_START";
-		case IKS_NODE_NORMAL: return "NODE_NORMAL";
-		case IKS_NODE_ERROR: return "NODE_ERROR";
-		case IKS_NODE_STOP: return "NODE_START";
-		default: return "NODE_UNKNOWN";
-	}
-}
-
-/**
- * Convert iksemel error code to string
- * @param err the iksemel error code
- * @return the string value of error or "UNKNOWN"
- */
-const char *iks_net_error_to_string(int err)
-{
-	switch (err) {
-		case IKS_OK: return "OK";
-		case IKS_NOMEM: return "NOMEM";
-		case IKS_BADXML: return "BADXML";
-		case IKS_HOOK: return "HOOK";
-		case IKS_NET_NODNS: return "NET_NODNS";
-		case IKS_NET_NOSOCK: return "NET_NOSOCK";
-		case IKS_NET_NOCONN: return "NET_NOCONN";
-		case IKS_NET_RWERR: return "NET_RWERR";
-		case IKS_NET_NOTSUPP: return "NET_NOTSUPP";
-		case IKS_NET_TLSFAIL: return "NET_TLSFAIL";
-		case IKS_NET_DROPPED: return "NET_DROPPED";
-		case IKS_NET_UNKNOWN: return "NET_UNKNOWN";
-		default: return "UNKNOWN";
-	}
-}
-
-/**
- * Insert attribute using format string
- * @param xml node to insert attribute into
- * @param name of attribute
- * @param fmt format string
- * @param ... format string args
- */
-iks *iks_insert_attrib_printf(iks *xml, const char *name, const char *fmt, ...)
-{
-	iks *node;
-	char *data;
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = switch_vasprintf(&data, fmt, ap);
-	va_end(ap);
-
-	if (ret == -1) {
-		return NULL;
-	}
-	node = iks_insert_attrib(xml, name, data);
-	free(data);
-
-	return node;
-}
-
-/**
- * @param value to match
- * @param rule to check
- * @return true if value is one of the comma-separated values in rule
- */
-int value_matches(const char *value, const char *rule)
-{
-	if (rule && *rule && value && *value && !strchr(value, ',')) {
-		const char *begin = strstr(rule, value);
-		const char *end = begin + strlen(value);
-		if (!begin) {
-			return 0;
-		}
-		if ((begin == rule || *(begin - 1) == ',') && (*end == ',' || *end == '\0')) {
-				return 1;
-		}
-		/* substring matched... try farther down the string */
-		return value_matches(value, end);
-	}
-	return 0;
-}
-
-/**
- * Validate boolean
- * @param value
- * @return SWTICH_TRUE if boolean
- */
-int iks_attrib_is_bool(const char *value)
-{
-	if (value && *value && (!strcasecmp("true", value) || !strcasecmp("false", value))) {
-		return SWITCH_TRUE;
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * Validate integer
- * @param value
- * @return SWTICH_TRUE if not negative
- */
-int iks_attrib_is_not_negative(const char *value)
-{
-	if (value && *value && switch_is_number(value)) {
-		int value_i = atoi(value);
-		if (value_i >= 0) {
-			return SWITCH_TRUE;
-		}
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * Validate integer
- * @param value
- * @return SWTICH_TRUE if positive
- */
-int iks_attrib_is_positive(const char *value)
-{
-	if (value && *value && switch_is_number(value)) {
-		int value_i = atoi(value);
-		if (value_i > 0) {
-			return SWITCH_TRUE;
-		}
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * Validate integer
- * @param value
- * @return SWTICH_TRUE if positive or -1
- */
-int iks_attrib_is_positive_or_neg_one(const char *value)
-{
-	if (value && *value && switch_is_number(value)) {
-		int value_i = atoi(value);
-		if (value_i == -1 || value_i > 0) {
-			return SWITCH_TRUE;
-		}
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * Validate string
- * @param value
- * @return SWTICH_TRUE
- */
-int iks_attrib_is_any(const char *value)
-{
-	return SWITCH_TRUE;
-}
-
-/**
- * Validate decimal
- * @param value
- * @return SWTICH_TRUE if 0.0 <= x <= 1.0
- */
-int iks_attrib_is_decimal_between_zero_and_one(const char *value)
-{
-	if (value && *value && switch_is_number(value)) {
-		double value_d = atof(value);
-		if (value_d >= 0.0 && value_d <= 1.0) {
-			return SWITCH_TRUE;
-		}
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * Validate dtmf digit
- * @param value
- * @return SWITCH_TRUE if 0-9,a,b,c,d,A,B,C,D,*,#
- */
-int iks_attrib_is_dtmf_digit(const char *value)
-{
-	if (value && *value && strlen(value) == 1) {
-		switch (*value) {
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-			case 'A':
-			case 'a':
-			case 'B':
-			case 'b':
-			case 'C':
-			case 'c':
-			case 'D':
-			case 'd':
-			case '*':
-			case '#':
-				return SWITCH_TRUE;
-		}
-	}
-	return SWITCH_FALSE;
-}
-
-/**
- * @param fn to evaluate attribute
- * @param attrib to evaluate
- * @return true if not set or is valid
- */
-int validate_optional_attrib(iks_attrib_validation_function fn, const char *attrib)
-{
-	if (!attrib || !*attrib) {
-		return SWITCH_TRUE;
-	}
-	return fn(attrib);
-}
-
-#define IKS_SHA256_HEX_DIGEST_LENGTH ((SHA256_DIGEST_LENGTH * 2) + 1)
-
-/**
- * Convert hash to a hex string.
- * @param hash hash to convert
- * @param str buffer to store hash - this buffer must be hashlen * 2 + 1 in size.
- */
-static void iks_hash_to_hex_string(unsigned char *hash, int hashlen, unsigned char *str)
-{
-	static const char *HEX = "0123456789abcdef";
-	int i;
-
-	/* convert to hex string with in-place algorithm */
-	for (i = hashlen - 1; i >= 0; i--) {
-		str[i * 2 + 1] = HEX[hash[i] & 0x0f];
-		str[i * 2] = HEX[(hash[i] >> 4) & 0x0f];
-	}
-	str[hashlen * 2] = '\0';
-}
-
-/**
- * Generate SHA-256 hash of value as hex string
- * @param data to hash
- * @param datalen length of data to hash
- * @return hash as a hex string
- */
-static void iks_sha256_hex_string(const unsigned char *data, int datalen, unsigned char *hash)
-{
-	/* hash data */
-	SHA256(data, datalen, hash);
-	iks_hash_to_hex_string(hash, SHA256_DIGEST_LENGTH, hash);
-}
-
-/**
- * Generate HMAC SHA-256
- * @param key the key
- * @param keylen length of key
- * @param message the message
- * @param messagelen length of message
- * @param hash buffer to store the hash - must be IKS_SHA256_HEX_DIGEST_LENGTH
- */
-static void iks_hmac_sha256_hex_string(const unsigned char *key, int keylen, const unsigned char *message, int messagelen, unsigned char *hash)
-{
-	unsigned int hash_len = SHA256_DIGEST_LENGTH;
-	HMAC(EVP_sha256(), key, keylen, message, messagelen, hash, &hash_len);
-	iks_hash_to_hex_string(hash, SHA256_DIGEST_LENGTH, hash);
-}
-
-/**
- * Generate server dialback key.  free() the returned value
- * @param secret originating server shared secret
- * @param receiving_server domain
- * @param originating_server domain
- * @param stream_id stream ID
- * @return the dialback key
- */
-char *iks_server_dialback_key(const char *secret, const char *receiving_server, const char *originating_server, const char *stream_id)
-{
-	if (!zstr(secret) && !zstr(receiving_server) && !zstr(originating_server) && !zstr(stream_id)) {
-		unsigned char secret_hash[IKS_SHA256_HEX_DIGEST_LENGTH];
-		unsigned char *message = NULL;
-		unsigned char *dialback_key = malloc(sizeof(unsigned char) * IKS_SHA256_HEX_DIGEST_LENGTH);
-		iks_sha256_hex_string((unsigned char *)secret, strlen(secret), secret_hash);
-		message = (unsigned char *)switch_mprintf("%s %s %s", receiving_server, originating_server, stream_id);
-		iks_hmac_sha256_hex_string(secret_hash, strlen((char *)secret_hash), message, strlen((char *)message), dialback_key);
-		free(message);
-		return (char *)dialback_key;
-	}
-	return NULL;
-}
-
-/**
- * Print base 64 encoded SHA-1 hash
- * @param sha hash to print
- * @param buf to store baes 64 encoded hash
- */
-void iks_sha_print_base64(iksha *sha, char *buf)
-{
-	int i;
-	char hex_digit[3] = { 0 };
-	char hex_buf[SHA_1_HASH_BUF_SIZE];
-	unsigned char bin_buf[SHA_1_HASH_BUF_SIZE / 2];
-	iks_sha_print(sha, hex_buf);
-
-	/* convert hex string to octets */
-	for (i = 0; i < SHA_1_HASH_BUF_SIZE; i += 2) {
-		hex_digit[0] = hex_buf[i];
-		hex_digit[1] = hex_buf[i + 1];
-		bin_buf[i / 2] = strtol(hex_digit, NULL, 16);
-	}
-
-	switch_b64_encode(bin_buf, SHA_1_HASH_BUF_SIZE / 2, (unsigned char *)buf, SHA_1_HASH_BUF_SIZE);
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/iks_helpers.h b/src/mod/event_handlers/mod_rayo/iks_helpers.h
deleted file mode 100644
index b98dbf5be6..0000000000
--- a/src/mod/event_handlers/mod_rayo/iks_helpers.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * iks_helpers.h -- iksemel constants and helpers
- *
- */
-#ifndef IKS_EXT_H
-#define IKS_EXT_H
-
-#include <iksemel.h>
-#include <switch.h>
-
-#define SHA_1_HASH_BUF_SIZE 40
-
-#define IKS_JABBER_SERVER_PORT 5269
-
-#define IKS_NS_XMPP_DISCO "http://jabber.org/protocol/disco#info"
-#define IKS_NS_XMPP_PING "urn:xmpp:ping"
-#define IKS_NS_XMPP_STANZAS "urn:ietf:params:xml:ns:xmpp-stanzas"
-#define IKS_NS_XMPP_STREAMS "http://etherx.jabber.org/streams"
-#define IKS_NS_XMPP_DIALBACK "jabber:server:dialback"
-#define IKS_NS_XMPP_TLS "urn:ietf:params:xml:ns:xmpp-tls"
-#define IKS_NS_XMPP_ENTITY_CAPABILITIES "http://jabber.org/protocol/caps"
-
-struct xmpp_error {
-	const char *name;
-	const char *type;
-};
-
-#undef XMPP_ERROR
-#define XMPP_ERROR(def_name, name, type) \
-	extern const struct xmpp_error *def_name;
-#include "xmpp_errors.def"
-
-/* See RFC-3920 XMPP core for error definitions */
-SWITCH_DECLARE(iks *) iks_new_presence(const char *name, const char *namespace, const char *from, const char *to);
-SWITCH_DECLARE(iks *) iks_new_error(iks *iq, const struct xmpp_error *err);
-SWITCH_DECLARE(iks *) iks_new_error_detailed(iks *iq, const struct xmpp_error *err, const char *detail_text);
-SWITCH_DECLARE(iks *) iks_new_error_detailed_printf(iks *iq, const struct xmpp_error *err, const char *detail_text_format, ...);
-SWITCH_DECLARE(iks *) iks_new_iq_result(iks *iq);
-SWITCH_DECLARE(const char *) iks_find_attrib_soft(iks *xml, const char *attrib);
-SWITCH_DECLARE(const char *) iks_find_attrib_default(iks *xml, const char *attrib, const char *def);
-SWITCH_DECLARE(int) iks_find_bool_attrib(iks *xml, const char *attrib);
-SWITCH_DECLARE(int) iks_find_int_attrib(iks *xml, const char *attrib);
-SWITCH_DECLARE(char) iks_find_char_attrib(iks *xml, const char *attrib);
-SWITCH_DECLARE(double) iks_find_decimal_attrib(iks *xml, const char *attrib);
-SWITCH_DECLARE(const char *) iks_node_type_to_string(int type);
-SWITCH_DECLARE(const char *) iks_net_error_to_string(int err);
-SWITCH_DECLARE(iks *) iks_insert_attrib_printf(iks *xml, const char *name, const char *fmt, ...);
-
-SWITCH_DECLARE(char *) iks_server_dialback_key(const char *secret, const char *receiving_server, const char *originating_server, const char *stream_id);
-SWITCH_DECLARE(void) iks_sha_print_base64(iksha *sha, char *buf);
-
-/** A function to validate attribute value */
-typedef int (*iks_attrib_validation_function)(const char *);
-
-SWITCH_DECLARE(int) validate_optional_attrib(iks_attrib_validation_function fn, const char *attrib);
-
-#define ELEMENT_DECL(name) SWITCH_DECLARE(int) VALIDATE_##name(iks *node);
-#define ELEMENT(name) int VALIDATE_##name(iks *node) { int result = 1; if (!node) return 0;
-#define ATTRIB(name, def, rule) result &= iks_attrib_is_##rule(iks_find_attrib_default(node, #name, #def));
-#define OPTIONAL_ATTRIB(name, def, rule) result &= validate_optional_attrib(iks_attrib_is_##rule, iks_find_attrib_default(node, #name, #def));
-#define STRING_ATTRIB(name, def, rule) result &= value_matches(iks_find_attrib_default(node, #name, #def), rule);
-#define ELEMENT_END return result; }
-
-SWITCH_DECLARE(int) value_matches(const char *value, const char *rule);
-
-SWITCH_DECLARE(int) iks_attrib_is_bool(const char *value);
-SWITCH_DECLARE(int) iks_attrib_is_not_negative(const char *value);
-SWITCH_DECLARE(int) iks_attrib_is_positive(const char *value);
-SWITCH_DECLARE(int) iks_attrib_is_positive_or_neg_one(const char *value);
-SWITCH_DECLARE(int) iks_attrib_is_any(const char *value);
-SWITCH_DECLARE(int) iks_attrib_is_decimal_between_zero_and_one(const char *value);
-SWITCH_DECLARE(int) iks_attrib_is_dtmf_digit(const char *value);
-
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.c b/src/mod/event_handlers/mod_rayo/mod_rayo.c
deleted file mode 100644
index 6ed46489a7..0000000000
--- a/src/mod/event_handlers/mod_rayo/mod_rayo.c
+++ /dev/null
@@ -1,5406 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * mod_rayo.c -- Rayo server / node implementation.  Allows MxN clustering of FreeSWITCH and Rayo Clients (like Adhearsion)
- *
- */
-#include <switch.h>
-#include <iksemel.h>
-
-#include "mod_rayo.h"
-#include "rayo_components.h"
-#include "rayo_elements.h"
-#include "xmpp_streams.h"
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_rayo_shutdown);
-SWITCH_MODULE_LOAD_FUNCTION(mod_rayo_load);
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_rayo_runtime);
-SWITCH_MODULE_DEFINITION(mod_rayo, mod_rayo_load, mod_rayo_shutdown, mod_rayo_runtime);
-
-#define RAYO_CAUSE_HANGUP SWITCH_CAUSE_NORMAL_CLEARING
-#define RAYO_CAUSE_DECLINE SWITCH_CAUSE_CALL_REJECTED
-#define RAYO_CAUSE_BUSY SWITCH_CAUSE_USER_BUSY
-#define RAYO_CAUSE_ERROR SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE
-
-#define RAYO_END_REASON_HANGUP "hungup"
-#define RAYO_END_REASON_HANGUP_LOCAL "hangup-command"
-#define RAYO_END_REASON_TIMEOUT "timeout"
-#define RAYO_END_REASON_BUSY "busy"
-#define RAYO_END_REASON_REJECT "rejected"
-#define RAYO_END_REASON_ERROR "error"
-
-#define RAYO_SIP_REQUEST_HEADER "sip_h_"
-#define RAYO_SIP_RESPONSE_HEADER "sip_rh_"
-#define RAYO_SIP_PROVISIONAL_RESPONSE_HEADER "sip_ph_"
-#define RAYO_SIP_BYE_RESPONSE_HEADER "sip_bye_h_"
-
-#define RAYO_CONFIG_FILE "rayo.conf"
-
-#define JOINED_CALL 1
-#define JOINED_MIXER 2
-
-#define OFFER_ALL 0
-#define OFFER_FIRST 1
-#define OFFER_RANDOM 2
-
-struct rayo_actor;
-struct rayo_client;
-struct rayo_call;
-
-#define rayo_call_get_uuid(call) RAYO_ID(call)
-
-/**
- * Function pointer wrapper for the handlers hash
- */
-struct rayo_xmpp_handler {
-	const char *from_type;
-	const char *from_subtype;
-	const char *to_type;
-	const char *to_subtype;
-	rayo_actor_xmpp_handler fn;
-};
-
-/**
- * Client availability
- */
-enum presence_status {
-	PS_UNKNOWN = -1,
-	PS_OFFLINE = 0,
-	PS_ONLINE = 1
-};
-
-/**
- * A xmpp peer server that routes messages to/from clients
- */
-struct rayo_peer_server {
-	/** base class */
-	struct rayo_actor base;
-	/** clients connected via this server */
-	switch_hash_t *clients;
-};
-#define RAYO_PEER_SERVER(x) ((struct rayo_peer_server *)x)
-
-/**
- * A Rayo client that controls calls
- */
-struct rayo_client {
-	/** base class */
-	struct rayo_actor base;
-	/** availability */
-	enum presence_status availability;
-	/** set if reachable via s2s */
-	struct rayo_peer_server *peer_server;
-	/** domain or full JID to route to */
-	const char *route;
-	/** time when last probe was sent */
-	switch_time_t last_probe;
-};
-#define RAYO_CLIENT(x) ((struct rayo_client *)x)
-
-/**
- * A call controlled by a Rayo client
- */
-struct rayo_call {
-	/** actor base class */
-	struct rayo_actor base;
-	/** Definitive controlling party JID */
-	char *dcp_jid;
-	/** Potential controlling parties (have sent offers to) */
-	switch_hash_t *pcps;
-	/** Available controlling parties (not sent offers to) */
-	switch_hash_t *acps;
-	/** Number of available controlling parties */
-	int num_acps;
-	/** current idle start time */
-	switch_time_t idle_start_time;
-	/** true if fax is in progress */
-	int faxing;
-	/** 1 if joined to call, 2 if joined to mixer */
-	int joined;
-	/** pending join */
-	iks *pending_join_request;
-	/** ID of joined party TODO this will be many mixers / calls */
-	const char *joined_id;
-	/** set if response needs to be sent to IQ request */
-	const char *dial_request_id;
-	/** channel destroy event */
-	switch_event_t *end_event;
-	/** True if ringing event sent to client */
-	int ringing_sent;
-	/** true if rayo app has started */
-	int rayo_app_started;
-	/** delayed delivery of answer event because rayo APP wasn't started yet */
-	switch_event_t *answer_event;
-	/** True if request to create this call failed */
-	int dial_request_failed;
-};
-
-/**
- * A conference
- */
-struct rayo_mixer {
-	/** actor base class */
-	struct rayo_actor base;
-	/** member JIDs */
-	switch_hash_t *members;
-	/** subscriber JIDs */
-	switch_hash_t *subscribers;
-};
-
-/**
- * A member of a mixer
- */
-struct rayo_mixer_member {
-	/** JID of member */
-	const char *jid;
-	/** Controlling party JID */
-	const char *dcp_jid;
-};
-
-/**
- * A subscriber to mixer events
- */
-struct rayo_mixer_subscriber {
-	/** JID of client */
-	const char *jid;
-	/** Number of client's calls in mixer */
-	int ref_count;
-};
-
-/**
- * Module state
- */
-static struct {
-	/** module memory pool */
-	switch_memory_pool_t *pool;
-	/** Rayo <iq> set commands mapped to functions */
-	switch_hash_t *command_handlers;
-	/** Rayo <presence> events mapped to functions */
-	switch_hash_t *event_handlers;
-	/** Active Rayo actors mapped by JID */
-	switch_hash_t *actors;
-	/** Rayo actors pending destruction */
-	switch_hash_t *destroy_actors;
-	/** Active Rayo actors mapped by internal ID */
-	switch_hash_t *actors_by_id;
-	/** synchronizes access to actors */
-	switch_mutex_t *actors_mutex;
-	/** map of DCP JID to client */
-	switch_hash_t *clients_roster;
-	/** synchronizes access to available clients */
-	switch_mutex_t *clients_mutex;
-	/** server for calls/mixers/etc */
-	struct rayo_actor *server;
-	/** Maximum idle time before call is considered abandoned */
-	int max_idle_ms;
-	/** Conference profile to use for mixers */
-	char *mixer_conf_profile;
-	/** to URI prefixes mapped to gateways */
-	switch_hash_t *dial_gateways;
-	/** synchronizes access to dial gateways */
-	switch_mutex_t *dial_gateways_mutex;
-	/** console command aliases */
-	switch_hash_t *cmd_aliases;
-	/** global console */
-	struct rayo_client *console;
-	/** XMPP context */
-	struct xmpp_stream_context *xmpp_context;
-	/** number of message threads */
-	int num_message_threads;
-	/** message delivery queue */
-	switch_queue_t *msg_queue;
-	/** in progress offer queue */
-	switch_queue_t *offer_queue;
-	/** shutdown flag */
-	int shutdown;
-	/** prevents context shutdown until all threads are finished */
-	switch_thread_rwlock_t *shutdown_rwlock;
-	/** if true, URI is put in from/to of offer if available */
-	int offer_uri;
-	/** if true, pause inbound calling if all clients are offline */
-	int pause_when_offline;
-	/** flag to reduce log noise */
-	int offline_logged;
-	/** if true, channel variables are added to offer */
-	int add_variables_to_offer;
-	/** if true, channel variables are added to answered, ringing, end events */
-	int add_variables_to_events;
-	/** How to distribute offers to clients */
-	int offer_algorithm;
-	/** How long to wait for offer response before retrying */
-	int offer_timeout_us;
-} globals;
-
-/**
- * An outbound dial gateway
- */
-struct dial_gateway {
-	/** URI prefix to match */
-	const char *uri_prefix;
-	/** dial prefix to match */
-	const char *dial_prefix;
-	/** number of digits to strip from dialstring */
-	int strip;
-};
-
-static void rayo_call_send(struct rayo_actor *call, struct rayo_message *msg);
-static void rayo_server_send(struct rayo_actor *server, struct rayo_message *msg);
-static void rayo_mixer_send(struct rayo_actor *mixer, struct rayo_message *msg);
-static void rayo_component_send(struct rayo_actor *component, struct rayo_message *msg);
-static void rayo_client_send(struct rayo_actor *client, struct rayo_message *msg);
-static void rayo_console_client_send(struct rayo_actor *client, struct rayo_message *msg);
-
-static void on_client_presence(struct rayo_client *rclient, iks *node);
-
-typedef switch_bool_t (* rayo_actor_match_fn)(struct rayo_actor *);
-
-static switch_bool_t is_call_actor(struct rayo_actor *actor);
-
-static void rayo_call_send_end(struct rayo_call *call, switch_event_t *event, int local_hangup, const char *cause_str, const char *cause_q850_str);
-
-
-/**
- * Entity features returned by service discovery
- */
-struct entity_identity {
-	/** identity category */
-	const char *category;
-	/** identity type */
-	const char *type;
-};
-
-static struct entity_identity rayo_server_identity = { "server", "im" };
-static const char *rayo_server_features[] = { IKS_NS_XMPP_ENTITY_CAPABILITIES, IKS_NS_XMPP_DISCO, RAYO_NS, RAYO_CPA_NS, RAYO_FAX_NS, 0 };
-
-static struct entity_identity rayo_mixer_identity = { "client", "rayo_mixer" };
-static const char *rayo_mixer_features[] = { 0 };
-
-static struct entity_identity rayo_call_identity = { "client", "rayo_call" };
-static const char *rayo_call_features[] = { 0 };
-
-/**
- * Calculate SHA-1 hash of entity capabilities
- * @param identity of entity
- * @param features of identity (NULL terminated)
- * @return base64 hash (free when done)
- */
-static char *calculate_entity_sha1_ver(struct entity_identity *identity, const char **features)
-{
-	int i;
-	const char *feature;
-	char ver[SHA_1_HASH_BUF_SIZE + 1] = { 0 };
-	iksha *sha;
-
-	sha = iks_sha_new();
-	iks_sha_hash(sha, (const unsigned char *)identity->category, strlen(identity->category), 0);
-	iks_sha_hash(sha, (const unsigned char *)"/", 1, 0);
-	iks_sha_hash(sha, (const unsigned char *)identity->type, strlen(identity->type), 0);
-	iks_sha_hash(sha, (const unsigned char *)"//", 2, 0);
-	i = 0;
-	while ((feature = features[i++])) {
-		iks_sha_hash(sha, (const unsigned char *)"<", 1, 0);
-		iks_sha_hash(sha, (const unsigned char *)feature, strlen(feature), 0);
-	}
-	iks_sha_hash(sha, (const unsigned char *)"<", 1, 1);
-	iks_sha_print_base64(sha, ver);
-	iks_sha_delete(sha);
-
-	return strdup(ver);
-}
-
-/**
- * @param msg to check
- * @return true if message was sent by admin client (console)
- */
-static int is_admin_client_message(struct rayo_message *msg)
-{
-	return !zstr(msg->from_jid) && !strcmp(RAYO_JID(globals.console), msg->from_jid);
-}
-
-/**
- * @param msg to check
- * @return true if from/to bare JIDs match
- */
-static int is_internal_message(struct rayo_message *msg)
-{
-	return msg->from && msg->to && (iks_id_cmp(msg->from, msg->to, IKS_ID_PARTIAL) == 0);
-}
-
-/**
- * Presence status
- * @param status the presence status
- * @return the string value of status
- */
-static const char *presence_status_to_string(enum presence_status status)
-{
-	switch(status) {
-		case PS_OFFLINE: return "OFFLINE";
-		case PS_ONLINE: return "ONLINE";
-		case PS_UNKNOWN: return "UNKNOWN";
-	}
-	return "UNKNOWN";
-}
-
-/**
- * Get rayo cause code from FS hangup cause
- * @param cause FS hangup cause
- * @return rayo end cause
- */
-static const char *switch_cause_to_rayo_cause(switch_call_cause_t cause)
-{
-	switch (cause) {
-		case SWITCH_CAUSE_NONE:
-		case SWITCH_CAUSE_NORMAL_CLEARING:
-			return RAYO_END_REASON_HANGUP;
-
-		case SWITCH_CAUSE_UNALLOCATED_NUMBER:
-		case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET:
-		case SWITCH_CAUSE_NO_ROUTE_DESTINATION:
-		case SWITCH_CAUSE_CHANNEL_UNACCEPTABLE:
-			return RAYO_END_REASON_ERROR;
-
-		case SWITCH_CAUSE_CALL_AWARDED_DELIVERED:
-			return RAYO_END_REASON_HANGUP;
-
-		case SWITCH_CAUSE_USER_BUSY:
-			return RAYO_END_REASON_BUSY;
-
-		case SWITCH_CAUSE_NO_USER_RESPONSE:
-		case SWITCH_CAUSE_NO_ANSWER:
-			return RAYO_END_REASON_TIMEOUT;
-
-		case SWITCH_CAUSE_SUBSCRIBER_ABSENT:
-			return RAYO_END_REASON_ERROR;
-
-		case SWITCH_CAUSE_CALL_REJECTED:
-			return RAYO_END_REASON_REJECT;
-
-		case SWITCH_CAUSE_NUMBER_CHANGED:
-		case SWITCH_CAUSE_REDIRECTION_TO_NEW_DESTINATION:
-		case SWITCH_CAUSE_EXCHANGE_ROUTING_ERROR:
-		case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
-		case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
-			return RAYO_END_REASON_ERROR;
-
-		case SWITCH_CAUSE_FACILITY_REJECTED:
-			return RAYO_END_REASON_REJECT;
-
-		case SWITCH_CAUSE_RESPONSE_TO_STATUS_ENQUIRY:
-		case SWITCH_CAUSE_NORMAL_UNSPECIFIED:
-			return RAYO_END_REASON_HANGUP;
-
-		case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION:
-		case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER:
-		case SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE:
-		case SWITCH_CAUSE_SWITCH_CONGESTION:
-		case SWITCH_CAUSE_ACCESS_INFO_DISCARDED:
-		case SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL:
-		case SWITCH_CAUSE_PRE_EMPTED:
-		case SWITCH_CAUSE_FACILITY_NOT_SUBSCRIBED:
-		case SWITCH_CAUSE_OUTGOING_CALL_BARRED:
-		case SWITCH_CAUSE_INCOMING_CALL_BARRED:
-		case SWITCH_CAUSE_BEARERCAPABILITY_NOTAUTH:
-		case SWITCH_CAUSE_BEARERCAPABILITY_NOTAVAIL:
-		case SWITCH_CAUSE_SERVICE_UNAVAILABLE:
-		case SWITCH_CAUSE_BEARERCAPABILITY_NOTIMPL:
-		case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
-		case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED:
-		case SWITCH_CAUSE_SERVICE_NOT_IMPLEMENTED:
-		case SWITCH_CAUSE_INVALID_CALL_REFERENCE:
-		case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION:
-		case SWITCH_CAUSE_INVALID_MSG_UNSPECIFIED:
-		case SWITCH_CAUSE_MANDATORY_IE_MISSING:
-			return RAYO_END_REASON_ERROR;
-
-		case SWITCH_CAUSE_MESSAGE_TYPE_NONEXIST:
-		case SWITCH_CAUSE_WRONG_MESSAGE:
-		case SWITCH_CAUSE_IE_NONEXIST:
-		case SWITCH_CAUSE_INVALID_IE_CONTENTS:
-		case SWITCH_CAUSE_WRONG_CALL_STATE:
-		case SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE:
-		case SWITCH_CAUSE_MANDATORY_IE_LENGTH_ERROR:
-		case SWITCH_CAUSE_PROTOCOL_ERROR:
-			return RAYO_END_REASON_ERROR;
-
-		case SWITCH_CAUSE_INTERWORKING:
-		case SWITCH_CAUSE_SUCCESS:
-		case SWITCH_CAUSE_ORIGINATOR_CANCEL:
-			return RAYO_END_REASON_HANGUP;
-
-		case SWITCH_CAUSE_CRASH:
-		case SWITCH_CAUSE_SYSTEM_SHUTDOWN:
-		case SWITCH_CAUSE_LOSE_RACE:
-		case SWITCH_CAUSE_MANAGER_REQUEST:
-		case SWITCH_CAUSE_BLIND_TRANSFER:
-		case SWITCH_CAUSE_ATTENDED_TRANSFER:
-		case SWITCH_CAUSE_ALLOTTED_TIMEOUT:
-		case SWITCH_CAUSE_USER_CHALLENGE:
-		case SWITCH_CAUSE_MEDIA_TIMEOUT:
-		case SWITCH_CAUSE_PICKED_OFF:
-		case SWITCH_CAUSE_USER_NOT_REGISTERED:
-		case SWITCH_CAUSE_PROGRESS_TIMEOUT:
-		case SWITCH_CAUSE_INVALID_GATEWAY:
-		case SWITCH_CAUSE_GATEWAY_DOWN:
-		case SWITCH_CAUSE_INVALID_URL:
-		case SWITCH_CAUSE_INVALID_PROFILE:
-		case SWITCH_CAUSE_NO_PICKUP:
-		case SWITCH_CAUSE_SRTP_READ_ERROR:
-			return RAYO_END_REASON_ERROR;
-		default:
-			break;
-	}
-	return RAYO_END_REASON_HANGUP;
-}
-
-/**
- * Add <header> to node
- * @param node to add <header> to
- * @param name of header
- * @param value of header
- */
-static void add_header(iks *node, const char *name, const char *value)
-{
-	if (!zstr(name) && !zstr(value)) {
-		iks *header = iks_insert(node, "header");
-		iks_insert_attrib(header, "name", name);
-		iks_insert_attrib(header, "value", value);
-	}
-}
-
-/**
- * Add SIP <header>s to node
- * @param node to add <header> to
- * @param event source
- * @param add_variables true if channel variables should be added
- */
-static void add_headers_to_event(iks *node, switch_event_t *event, int add_variables)
-{
-	switch_event_header_t *header;
-	/* get all variables prefixed with sip_h_ */
-	for (header = event->headers; header; header = header->next) {
-		if (!strncmp("variable_sip_h_", header->name, 15)) {
-			if (!zstr(header->name)) {
-				add_header(node, header->name + 15, header->value);
-			}
-		} else if (add_variables && !strncmp("variable_", header->name, 9)) {
-			if (!zstr(header->name)) {
-				char header_name[1024];
-				snprintf(header_name, 1024, "variable-%s", header->name + 9);
-				add_header(node, header_name, header->value);
-			}
-		}
-	}
-}
-
-/**
- * Add SIP <header>s to node
- * @param node to add <header> to
- * @param add_variables true if channel variables should be added
- */
-static void add_channel_headers_to_event(iks *node, switch_channel_t *channel, int add_variables)
-{
-	switch_event_header_t *var;
-
-	/* add all SIP header variables and (if configured) all other variables */
-	for (var = switch_channel_variable_first(channel); var; var = var->next) {
-		if (!strncmp("sip_h_", var->name, 6)) {
-			add_header(node, var->name + 6, var->value);
-		}
-		if (add_variables) {
-			char var_name[1024];
-			snprintf(var_name, 1024, "variable-%s", var->name);
-			add_header(node, var_name, var->value);
-		}
-	}
-	switch_channel_variable_last(channel);
-}
-
-static void pause_inbound_calling(void)
-{
-	int32_t arg = 1;
-	switch_mutex_lock(globals.clients_mutex);
-	switch_core_session_ctl(SCSC_PAUSE_INBOUND, &arg);
-	if (!globals.offline_logged) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Pausing inbound calling\n");
-		globals.offline_logged = 1;
-	}
-	switch_mutex_unlock(globals.clients_mutex);
-}
-
-static void resume_inbound_calling(void)
-{
-	int32_t arg = 0;
-	switch_mutex_lock(globals.clients_mutex);
-	switch_core_session_ctl(SCSC_PAUSE_INBOUND, &arg);
-	if (globals.offline_logged) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Resuming inbound calling\n");
-		globals.offline_logged = 0;
-	}
-	switch_mutex_unlock(globals.clients_mutex);
-}
-
-/**
- * Check online status of rayo client(s) and pause/resume the server
- */
-static void pause_when_offline(void)
-{
-	if (globals.pause_when_offline) {
-		int is_online = 0;
-		switch_hash_index_t *hi;
-
-		switch_mutex_lock(globals.clients_mutex);
-
-		for (hi = switch_core_hash_first(globals.clients_roster); hi; hi = switch_core_hash_next(&hi)) {
-			const void *key;
-			void *client;
-			switch_core_hash_this(hi, &key, NULL, &client);
-			switch_assert(client);
-			if (RAYO_CLIENT(client)->availability == PS_ONLINE) {
-				is_online = 1;
-				break;
-			}
-		}
-		switch_safe_free(hi);
-
-		if (is_online) {
-			resume_inbound_calling();
-		} else {
-			pause_inbound_calling();
-		}
-
-		switch_mutex_unlock(globals.clients_mutex);
-	}
-}
-
-/**
- * Send event to clients
- * @param from event sender
- * @param rayo_event the event to send
- * @param online_only only send to online clients
- */
-static void broadcast_event(struct rayo_actor *from, iks *rayo_event, int online_only)
-{
-	switch_hash_index_t *hi = NULL;
-	switch_mutex_lock(globals.clients_mutex);
-	for (hi = switch_core_hash_first(globals.clients_roster); hi; hi = switch_core_hash_next(&hi)) {
-		struct rayo_client *rclient;
-		const void *key;
-		void *val;
-		switch_core_hash_this(hi, &key, NULL, &val);
-		rclient = (struct rayo_client *)val;
-		switch_assert(rclient);
-
-		if (!online_only || rclient->availability == PS_ONLINE) {
-			iks_insert_attrib(rayo_event, "to", RAYO_JID(rclient));
-			RAYO_SEND_MESSAGE_DUP(from, RAYO_JID(rclient), rayo_event);
-		}
-	}
-	switch_mutex_unlock(globals.clients_mutex);
-}
-
-/**
- * Add an outbound dialing gateway
- * @param uri_prefix to match
- * @param dial_prefix to use
- * @param strip number of digits to strip from dialstring
- */
-static void dial_gateway_add(const char *uri_prefix, const char *dial_prefix, int strip)
-{
-	struct dial_gateway *gateway = switch_core_alloc(globals.pool, sizeof(*gateway));
-	gateway->uri_prefix = uri_prefix ? switch_core_strdup(globals.pool, uri_prefix) : "";
-	gateway->dial_prefix = dial_prefix ? switch_core_strdup(globals.pool, dial_prefix) : "";
-	gateway->strip = strip > 0 ? strip : 0;
-	switch_core_hash_insert(globals.dial_gateways, uri_prefix, gateway);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dial-gateway uriprefix = %s, dialprefix = %s, strip = %i\n", uri_prefix, dial_prefix, strip);
-}
-
-/**
- * Find outbound dial gateway for the specified dialstring
- */
-static struct dial_gateway *dial_gateway_find(const char *uri)
-{
-	switch_hash_index_t *hi = NULL;
-	int match_len = 0;
-	struct dial_gateway *gateway = (struct dial_gateway *)switch_core_hash_find(globals.dial_gateways, "default");
-
-	/* find longest prefix match */
-	switch_mutex_lock(globals.dial_gateways_mutex);
-	for (hi = switch_core_hash_first(globals.dial_gateways); hi; hi = switch_core_hash_next(&hi)) {
-		struct dial_gateway *candidate = NULL;
-		const void *prefix;
-		int prefix_len = 0;
-		void *val;
-		switch_core_hash_this(hi, &prefix, NULL, &val);
-		candidate = (struct dial_gateway *)val;
-		switch_assert(candidate);
-
-		prefix_len = strlen(prefix);
-		if (!zstr(prefix) && !strncmp(prefix, uri, prefix_len) && prefix_len > match_len) {
-			match_len = prefix_len;
-			gateway = candidate;
-		}
-	}
-	switch_mutex_unlock(globals.dial_gateways_mutex);
-	return gateway;
-}
-
-/**
- * Add command handler function
- * @param name the command name
- * @param handler the command handler function
- */
-static void rayo_command_handler_add(const char *name, struct rayo_xmpp_handler *handler)
-{
-	char full_name[1024];
-	full_name[1023] = '\0';
-	snprintf(full_name, sizeof(full_name) - 1, "%s:%s:%s", handler->to_type, handler->to_subtype, name);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding command: %s\n", full_name);
-	switch_core_hash_insert(globals.command_handlers, full_name, handler);
-}
-
-/**
- * Add command handler function
- * @param type the actor type
- * @param subtype the actor subtype
- * @param name the command name
- * @param fn the command callback function
- */
-void rayo_actor_command_handler_add(const char *type, const char *subtype, const char *name, rayo_actor_xmpp_handler fn)
-{
-	struct rayo_xmpp_handler *handler = switch_core_alloc(globals.pool, sizeof (*handler));
-	handler->to_type = zstr(type) ? "" : switch_core_strdup(globals.pool, type);
-	handler->to_subtype = zstr(subtype) ? "" : switch_core_strdup(globals.pool, subtype);
-	handler->fn = fn;
-	rayo_command_handler_add(name, handler);
-}
-
-/**
- * Get command handler function from hash
- * @param hash the hash to search
- * @param msg the command
- * @return the command handler function or NULL
- */
-rayo_actor_xmpp_handler rayo_actor_command_handler_find(struct rayo_actor *actor, struct rayo_message *msg)
-{
-	iks *iq = msg->payload;
-	const char *iq_type = iks_find_attrib_soft(iq, "type");
-	iks *command = iks_first_tag(iq);
-	const char *name = "";
-	const char *namespace = "";
-	struct rayo_xmpp_handler *handler = NULL;
-	char full_name[1024];
-
-	full_name[1023] = '\0';
-	if (command) {
-		name = iks_name(command);
-		namespace = iks_find_attrib_soft(command, "xmlns");
-		if (zstr(name)) {
-			name = "";
-		}
-	}
-
-	snprintf(full_name, sizeof(full_name) - 1, "%s:%s:%s:%s:%s", actor->type, actor->subtype, iq_type, namespace, name);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, looking for %s command\n", RAYO_JID(actor), full_name);
-	handler = (struct rayo_xmpp_handler *)switch_core_hash_find(globals.command_handlers, full_name);
-	if (handler) {
-		return handler->fn;
-	}
-
-	return NULL;
-}
-
-/**
- * Add event handler function
- * @param name the event name
- * @param handler the event handler function
- */
-static void rayo_event_handler_add(const char *name, struct rayo_xmpp_handler *handler)
-{
-	char full_name[1024];
-	full_name[1023] = '\0';
-	snprintf(full_name, sizeof(full_name) - 1, "%s:%s:%s:%s:%s", handler->from_type, handler->from_subtype, handler->to_type, handler->to_subtype, name);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding event: %s\n", full_name);
-	switch_core_hash_insert(globals.event_handlers, full_name, handler);
-}
-
-/**
- * Add event handler function
- * @param from_type the source actor type
- * @param from_subtype the source actor subtype
- * @param to_type the destination actor type
- * @param to_subtype the destination actor subtype
- * @param name the event name
- * @param fn the event callback function
- */
-void rayo_actor_event_handler_add(const char *from_type, const char *from_subtype, const char *to_type, const char *to_subtype, const char *name, rayo_actor_xmpp_handler fn)
-{
-	struct rayo_xmpp_handler *handler = switch_core_alloc(globals.pool, sizeof (*handler));
-	handler->from_type = zstr(from_type) ? "" : switch_core_strdup(globals.pool, from_type);
-	handler->from_subtype = zstr(from_subtype) ? "" : switch_core_strdup(globals.pool, from_subtype);
-	handler->to_type = zstr(to_type) ? "" : switch_core_strdup(globals.pool, to_type);
-	handler->to_subtype = zstr(to_subtype) ? "" : switch_core_strdup(globals.pool, to_subtype);
-	handler->fn = fn;
-	rayo_event_handler_add(name, handler);
-}
-
-/**
- * Get event handler function from hash
- * @param actor the event destination
- * @param msg the event
- * @return the event handler function or NULL
- */
-rayo_actor_xmpp_handler rayo_actor_event_handler_find(struct rayo_actor *actor, struct rayo_message *msg)
-{
-	iks *presence = msg->payload;
-	iks *event = iks_first_tag(presence);
-	if (event) {
-		struct rayo_xmpp_handler *handler = NULL;
-		const char *presence_type = iks_find_attrib_soft(presence, "type");
-		const char *event_name = iks_name(event);
-		const char *event_namespace = iks_find_attrib_soft(event, "xmlns");
-		char full_name[1024];
-		full_name[1023] = '\0';
-		if (zstr(event_name)) {
-			return NULL;
-		}
-		snprintf(full_name, sizeof(full_name) - 1, "%s:%s:%s:%s:%s:%s:%s", msg->from_type, msg->from_subtype, actor->type, actor->subtype, presence_type, event_namespace, event_name);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s => %s, looking for %s event handler\n", msg->from_jid, RAYO_JID(actor), full_name);
-		handler = (struct rayo_xmpp_handler *)switch_core_hash_find(globals.event_handlers, full_name);
-		if (handler) {
-			return handler->fn;
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s => %s, event missing child element\n", msg->from_jid, RAYO_JID(actor));
-	}
-	return NULL;
-}
-
-/**
- * Clean up a message
- * @param msg to destroy
- */
-void rayo_message_destroy(struct rayo_message *msg)
-{
-	if (msg) {
-		if (msg->payload) {
-			iks_delete(msg->payload);
-		}
-		switch_safe_free(msg->to_jid);
-		switch_safe_free(msg->from_jid);
-		switch_safe_free(msg->from_type);
-		switch_safe_free(msg->from_subtype);
-		switch_safe_free(msg->file);
-		free(msg);
-	}
-}
-
-/**
- * Remove payload from message
- */
-iks *rayo_message_remove_payload(struct rayo_message *msg)
-{
-	iks *payload = msg->payload;
-	msg->payload = NULL;
-	msg->from = NULL;
-	msg->to = NULL;
-	return payload;
-}
-
-/**
- * Thread that delivers internal XMPP messages
- * @param thread this thread
- * @param obj unused
- * @return NULL
- */
-static void *SWITCH_THREAD_FUNC deliver_message_thread(switch_thread_t *thread, void *obj)
-{
-	struct rayo_message *msg = NULL;
-	switch_thread_rwlock_rdlock(globals.shutdown_rwlock);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New message delivery thread\n");
-	while (!globals.shutdown) {
-		if (switch_queue_pop(globals.msg_queue, (void *)&msg) == SWITCH_STATUS_SUCCESS) {
-			struct rayo_actor *actor = RAYO_LOCATE(msg->to_jid);
-			if (actor) {
-				/* deliver to actor */
-				switch_mutex_lock(actor->mutex);
-				switch_log_printf(SWITCH_CHANNEL_ID_LOG, msg->file, "", msg->line, "", SWITCH_LOG_DEBUG, "Deliver %s => %s %s\n", msg->from_jid, msg->to_jid, iks_string(iks_stack(msg->payload), msg->payload));
-				actor->send_fn(actor, msg);
-				switch_mutex_unlock(actor->mutex);
-				RAYO_RELEASE(actor);
-			} else if (!msg->is_reply) {
-				/* unknown actor */
-				RAYO_SEND_REPLY(globals.server, msg->from_jid, iks_new_error(msg->payload, STANZA_ERROR_ITEM_NOT_FOUND));
-			}
-			rayo_message_destroy(msg);
-		}
-	}
-
-	/* clean up remaining messages */
-	while(switch_queue_trypop(globals.msg_queue, (void *)&msg) == SWITCH_STATUS_SUCCESS) {
-		rayo_message_destroy(msg);
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Message delivery thread finished\n");
-	switch_thread_rwlock_unlock(globals.shutdown_rwlock);
-	return NULL;
-}
-
-/**
- * Create a new message thread
- * @param pool to use
- */
-static void start_deliver_message_thread(switch_memory_pool_t *pool)
-{
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	switch_threadattr_create(&thd_attr, pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&thread, thd_attr, deliver_message_thread, NULL, pool);
-}
-
-/**
- * Stop all threads
- */
-static void stop_all_threads(void)
-{
-	globals.shutdown = 1;
-	if (globals.msg_queue) {
-		switch_queue_interrupt_all(globals.msg_queue);
-	}
-	if (globals.offer_queue) {
-		switch_queue_interrupt_all(globals.offer_queue);
-	}
-	if (globals.shutdown_rwlock) {
-		switch_thread_rwlock_wrlock(globals.shutdown_rwlock);
-	}
-}
-
-/**
- * Send message to actor addressed by JID
- * @param from actor sending the message
- * @param to destination JID
- * @param payload the message payload to deliver
- * @param dup true if payload is to be copied
- * @param reply true if a reply
- * @param file file name
- * @param line line number
- */
-void rayo_message_send(struct rayo_actor *from, const char *to, iks *payload, int dup, int reply, const char *file, int line)
-{
-	const char *msg_name;
-	struct rayo_message *msg = malloc(sizeof(*msg));
-	switch_assert(msg);
-	if (dup) {
-		msg->payload = iks_copy(payload);
-	} else {
-		msg->payload = payload;
-	}
-	msg->is_reply = reply;
-	msg->to_jid = strdup(zstr(to) ? "" : to);
-	if (!zstr(msg->to_jid)) {
-		msg->to = iks_id_new(iks_stack(msg->payload), msg->to_jid);
-	}
-	msg->from_jid = strdup(RAYO_JID(from));
-	if (!zstr(msg->from_jid)) {
-		msg->from = iks_id_new(iks_stack(msg->payload), msg->from_jid);
-	}
-	msg->from_type = strdup(zstr(from->type) ? "" : from->type);
-	msg->from_subtype = strdup(zstr(from->subtype) ? "" : from->subtype);
-	msg->file = strdup(file);
-	msg->line = line;
-
-	/* add timestamp to presence events */
-	msg_name = iks_name(msg->payload);
-	if (!zstr(msg_name) && !strcmp("presence", msg_name)) {
-		/* don't add timestamp if there already is one */
-		iks *delay = iks_find(msg->payload, "delay");
-		if (!delay || strcmp("urn:xmpp:delay", iks_find_attrib_soft(delay, "xmlns"))) {
-			switch_time_exp_t tm;
-			char timestamp[80];
-			switch_size_t retsize;
-			delay = iks_insert(msg->payload, "delay");
-			iks_insert_attrib(delay, "xmlns", "urn:xmpp:delay");
-			switch_time_exp_tz(&tm, switch_time_now(), 0);
-			switch_strftime_nocheck(timestamp, &retsize, sizeof(timestamp), "%Y-%m-%dT%TZ", &tm);
-			iks_insert_attrib_printf(delay, "stamp", "%s", timestamp);
-		}
-	}
-
-	if (switch_queue_trypush(globals.msg_queue, msg) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "failed to queue message!\n");
-		rayo_message_destroy(msg);
-	}
-}
-
-/**
- * Get access to Rayo actor with JID.
- * @param jid the JID
- * @return the actor or NULL.  Call RAYO_RELEASE() when done with pointer.
- */
-struct rayo_actor *rayo_actor_locate(const char *jid, const char *file, int line)
-{
-	struct rayo_actor *actor = NULL;
-	switch_mutex_lock(globals.actors_mutex);
-	if (!strncmp("xmpp:", jid, 5)) {
-		jid = jid + 5;
-	}
-	actor = (struct rayo_actor *)switch_core_hash_find(globals.actors, jid);
-	if (actor) {
-		if (!actor->destroy) {
-			actor->ref_count++;
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Locate (jid) %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_WARNING, "Locate (jid) %s: already marked for destruction!\n", jid);
-			actor = NULL;
-		}
-	}
-	switch_mutex_unlock(globals.actors_mutex);
-	return actor;
-}
-
-/**
- * Get exclusive access to Rayo actor with internal ID
- * @param id the internal ID
- * @return the actor or NULL.  Call RAYO_RELEASE() when done with pointer.
- */
-struct rayo_actor *rayo_actor_locate_by_id(const char *id, const char *file, int line)
-{
-	struct rayo_actor *actor = NULL;
-	if (!zstr(id)) {
-		switch_mutex_lock(globals.actors_mutex);
-		actor = (struct rayo_actor *)switch_core_hash_find(globals.actors_by_id, id);
-		if (actor) {
-			if (!actor->destroy) {
-				actor->ref_count++;
-				switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Locate (id) %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_WARNING, "Locate (id) %s: already marked for destruction!\n", id);
-				actor = NULL;
-			}
-		}
-		switch_mutex_unlock(globals.actors_mutex);
-	}
-	return actor;
-}
-
-/**
- * Destroy a rayo actor
- */
-void rayo_actor_destroy(struct rayo_actor *actor, const char *file, int line)
-{
-	switch_memory_pool_t *pool = actor->pool;
-	switch_mutex_lock(globals.actors_mutex);
-	if (!actor->destroy) {
-		switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Destroy %s requested: ref_count = %i\n", RAYO_JID(actor), actor->ref_count);
-		switch_core_hash_delete(globals.actors, RAYO_JID(actor));
-		if (!zstr(actor->id)) {
-			switch_core_hash_delete(globals.actors_by_id, actor->id);
-		}
-	}
-	actor->destroy = 1;
-	if (actor->ref_count <= 0) {
-		if (actor->ref_count < 0) {
-			/* too many unlocks detected! */
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_WARNING, "Destroying %s, ref_count = %i\n", RAYO_JID(actor), actor->ref_count);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Destroying %s\n", RAYO_JID(actor));
-		}
-		switch_core_hash_delete(globals.destroy_actors, RAYO_JID(actor));
-		switch_mutex_unlock(globals.actors_mutex);
-		/* safe to destroy parent now */
-		if (actor->cleanup_fn) {
-			actor->cleanup_fn(actor);
-		}
-		if (actor->parent) {
-			RAYO_RELEASE(actor->parent);
-		}
-		switch_core_destroy_memory_pool(&pool);
-	} else {
-		switch_core_hash_insert(globals.destroy_actors, RAYO_JID(actor), actor);
-		switch_mutex_unlock(globals.actors_mutex);
-	}
-}
-
-/**
- * Increment actor ref count - locks from destruction.
- */
-void rayo_actor_retain(struct rayo_actor *actor, const char *file, int line)
-{
-	if (actor) {
-		switch_mutex_lock(globals.actors_mutex);
-		actor->ref_count++;
-		switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Lock %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count);
-		switch_mutex_unlock(globals.actors_mutex);
-	}
-}
-
-/**
- * Release rayo actor reference
- */
-void rayo_actor_release(struct rayo_actor *actor, const char *file, int line)
-{
-	if (actor) {
-		switch_mutex_lock(globals.actors_mutex);
-		actor->ref_count--;
-		if (actor->ref_count < 0) {
-			/* too many unlocks detected! */
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_WARNING, "Release %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Release %s: ref count = %i\n", RAYO_JID(actor), actor->ref_count);
-		}
-		if (actor->ref_count <= 0 && actor->destroy) {
-			rayo_actor_destroy(actor, file, line);
-		}
-		switch_mutex_unlock(globals.actors_mutex);
-	}
-}
-
-/**
- * Get next number in sequence
- */
-int rayo_actor_seq_next(struct rayo_actor *actor)
-{
-	int seq;
-	switch_mutex_lock(actor->mutex);
-	seq = actor->seq++;
-	switch_mutex_unlock(actor->mutex);
-	return seq;
-}
-
-#define RAYO_CALL_LOCATE(call_uri) rayo_call_locate(call_uri, __FILE__, __LINE__)
-/**
- * Get access to Rayo call data.  Use to access call data outside channel thread.
- * @param call_uri the Rayo XMPP URI
- * @return the call or NULL.
- */
-static struct rayo_call *rayo_call_locate(const char *call_uri, const char *file, int line)
-{
-	struct rayo_actor *actor = rayo_actor_locate(call_uri, file, line);
-	if (actor && is_call_actor(actor)) {
-		return RAYO_CALL(actor);
-	} else if (actor) {
-		RAYO_RELEASE(actor);
-	}
-	return NULL;
-}
-
-#define RAYO_CALL_LOCATE_BY_ID(call_uuid) rayo_call_locate_by_id(call_uuid, __FILE__, __LINE__)
-/**
- * Get access to Rayo call data.  Use to access call data outside channel thread.
- * @param call_uuid the FreeSWITCH call UUID
- * @return the call or NULL.
- */
-static struct rayo_call *rayo_call_locate_by_id(const char *call_uuid, const char *file, int line)
-{
-	struct rayo_actor *actor = rayo_actor_locate_by_id(call_uuid, file, line);
-	if (actor && is_call_actor(actor)) {
-		return RAYO_CALL(actor);
-	} else if (actor) {
-		RAYO_RELEASE(actor);
-	}
-	return NULL;
-}
-
-/**
- * Send <end> event to DCP and PCPs
- */
-static void rayo_call_send_end(struct rayo_call *call, switch_event_t *event, int local_hangup, const char *cause_str, const char *cause_q850_str)
-{
-	int no_offered_clients = 1;
-	switch_hash_index_t *hi = NULL;
-	iks *revent;
-	iks *end;
-	const char *dcp_jid = rayo_call_get_dcp_jid(call);
-
-	/* build call end event */
-	revent = iks_new_presence("end", RAYO_NS, RAYO_JID(call), "foo");
-	iks_insert_attrib(revent, "type", "unavailable");
-	end = iks_find(revent, "end");
-
-	if (local_hangup) {
-		iks_insert(end, RAYO_END_REASON_HANGUP_LOCAL);
-	} else {
-		/* remote hangup... translate to specific rayo reason */
-		iks *reason;
-		switch_call_cause_t cause = SWITCH_CAUSE_NONE;
-		if (!zstr(cause_str)) {
-			cause = switch_channel_str2cause(cause_str);
-		}
-		reason = iks_insert(end, switch_cause_to_rayo_cause(cause));
-		if (!zstr(cause_q850_str)) {
-			iks_insert_attrib(reason, "platform-code", cause_q850_str);
-		}
-	}
-
-	#if 0
-	if (event) {
-		char *event_str;
-		if (switch_event_serialize(event, &event_str, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "%s\n", event_str);
-			switch_safe_free(event_str);
-		}
-	}
-	#endif
-
-	/* add signaling headers */
-	if (event) {
-		add_headers_to_event(end, event, globals.add_variables_to_events);
-	}
-
-	/* send <end> to all offered clients */
-	for (hi = switch_core_hash_first(call->pcps); hi; hi = switch_core_hash_next(&hi)) {
-		const void *key;
-		void *val;
-		const char *client_jid = NULL;
-		switch_core_hash_this(hi, &key, NULL, &val);
-		client_jid = (const char *)key;
-		switch_assert(client_jid);
-		iks_insert_attrib(revent, "to", client_jid);
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "Sending <end> to offered client %s\n", client_jid);
-		RAYO_SEND_MESSAGE_DUP(call, client_jid, revent);
-		no_offered_clients = 0;
-	}
-
-	if (no_offered_clients && !zstr(dcp_jid)) {
-		/* send to DCP only */
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "Sending <end> to DCP %s\n", dcp_jid);
-		iks_insert_attrib(revent, "to", dcp_jid);
-		RAYO_SEND_MESSAGE_DUP(call, dcp_jid, revent);
-	}
-
-	iks_delete(revent);
-}
-
-/**
- * Fire <end> event when call is cleaned up completely
- */
-static void rayo_call_cleanup(struct rayo_actor *actor)
-{
-	struct rayo_call *call = RAYO_CALL(actor);
-	switch_event_t *event = call->end_event;
-	const char *dcp_jid = rayo_call_get_dcp_jid(call);
-
-	if (!event || call->dial_request_failed) {
-		/* destroyed before FS session was created (in originate, for example) */
-		goto done;
-	}
-
-	/* send call unjoined event, if not already sent */
-	if (call->joined && call->joined_id) {
-		if (!zstr(dcp_jid)) {
-			iks *unjoined;
-			iks *uevent = iks_new_presence("unjoined", RAYO_NS, RAYO_JID(call), dcp_jid);
-			unjoined = iks_find(uevent, "unjoined");
-			iks_insert_attrib_printf(unjoined, "call-uri", "%s", call->joined_id);
-			RAYO_SEND_MESSAGE(call, dcp_jid, uevent);
-		}
-	}
-
-	rayo_call_send_end(call,
-		event,
-		switch_true(switch_event_get_header(event, "variable_rayo_local_hangup")),
-		switch_event_get_header(event, "variable_hangup_cause"),
-		switch_event_get_header(event, "variable_hangup_cause_q850"));
-
-done:
-
-	/* lost the race: pending join failed... send IQ result to client now. */
-	if (call->pending_join_request) {
-		iks *request = call->pending_join_request;
-		iks *result = iks_new_error_detailed(request, STANZA_ERROR_ITEM_NOT_FOUND, "call ended");
-		call->pending_join_request = NULL;
-		RAYO_SEND_REPLY(call, iks_find_attrib_soft(request, "from"), result);
-		iks_delete(call->pending_join_request);
-	}
-
-	if (event) {
-		switch_event_destroy(&event);
-	}
-	if (call->answer_event) {
-		switch_event_destroy(&call->answer_event);
-	}
-	switch_core_hash_destroy(&call->pcps);
-	switch_core_hash_destroy(&call->acps);
-}
-
-/**
- * @param call the Rayo call
- * @return the Rayo call DCP JID
- */
-const char *rayo_call_get_dcp_jid(struct rayo_call *call)
-{
-	return call->dcp_jid;
-}
-
-/**
- * @param call the Rayo call
- * @return true if joined (or a join is in progress)
- */
-int rayo_call_is_joined(struct rayo_call *call)
-{
-	return call->joined || call->pending_join_request;
-}
-
-/**
- * @param call to check if faxing
- * @return true if faxing is in progress
- */
-int rayo_call_is_faxing(struct rayo_call *call)
-{
-	return call->faxing;
-}
-
-/**
- * Set faxing flag
- * @param call the call to flag
- * @param faxing true if faxing is in progress
- */
-void rayo_call_set_faxing(struct rayo_call *call, int faxing)
-{
-	call->faxing = faxing;
-}
-
-#define RAYO_MIXER_LOCATE(mixer_name) rayo_mixer_locate(mixer_name, __FILE__, __LINE__)
-/**
- * Get access to Rayo mixer data.
- * @param mixer_name the mixer name
- * @return the mixer or NULL. Call RAYO_RELEASE() when done with mixer pointer.
- */
-static struct rayo_mixer *rayo_mixer_locate(const char *mixer_name, const char *file, int line)
-{
-	struct rayo_actor *actor = rayo_actor_locate_by_id(mixer_name, file, line);
-	if (actor && !strcmp(RAT_MIXER, actor->type)) {
-		return RAYO_MIXER(actor);
-	} else if (actor) {
-		RAYO_RELEASE(actor);
-	}
-	return NULL;
-}
-
-/**
- * Default message handler - drops messages
- */
-void rayo_actor_send_ignore(struct rayo_actor *to, struct rayo_message *msg)
-{
-	switch_log_printf(SWITCH_CHANNEL_ID_LOG, msg->file, "", msg->line, "", SWITCH_LOG_WARNING, "%s, dropping unexpected message to %s.\n", msg->from_jid, RAYO_JID(to));
-}
-
-#define RAYO_ACTOR_INIT(actor, pool, type, subtype, id, jid, cleanup, send) rayo_actor_init(actor, pool, type, subtype, id, jid, cleanup, send, NULL, __FILE__, __LINE__)
-#define RAYO_ACTOR_INIT_PARENT(actor, pool, type, subtype, id, jid, cleanup, send, parent) rayo_actor_init(actor, pool, type, subtype, id, jid, cleanup, send, parent, __FILE__, __LINE__)
-
-/**
- * Initialize a rayo actor
- * @param actor to initialize
- * @param pool to use
- * @param type of actor (MIXER, CALL, SERVER, COMPONENT)
- * @param subtype of actor (input/output/prompt)
- * @param id internal ID
- * @param jid external ID
- * @param cleanup function
- * @param send sent message handler
- * @param parent of actor
- * @param file that called this function
- * @param line that called this function
- * @return the actor or NULL if JID conflict
- */
-static struct rayo_actor *rayo_actor_init(struct rayo_actor *actor, switch_memory_pool_t *pool, const char *type, const char *subtype, const char *id, const char *jid, rayo_actor_cleanup_fn cleanup, rayo_actor_send_fn send, struct rayo_actor *parent, const char *file, int line)
-{
-	char *domain;
-	actor->type = switch_core_strdup(pool, type);
-	actor->subtype = switch_core_strdup(pool, subtype);
-	actor->pool = pool;
-	if (!zstr(id)) {
-		actor->id = switch_core_strdup(pool, id);
-	}
-	/* TODO validate JID with regex */
-	if (!zstr(jid)) {
-		RAYO_JID(actor) = switch_core_strdup(pool, jid);
-		if (!(domain = strrchr(RAYO_JID(actor), '@'))) {
-			RAYO_DOMAIN(actor) = RAYO_JID(actor);
-		} else if (!zstr(++domain)) {
-			RAYO_DOMAIN(actor) = switch_core_strdup(pool, domain);
-			/* strip resource from domain if it exists */
-			domain = strrchr(RAYO_DOMAIN(actor), '/');
-			if (domain) {
-				*domain = '\0';
-			}
-		}
-	}
-	actor->seq = 1;
-	actor->ref_count = 1;
-	actor->destroy = 0;
-	actor->cleanup_fn = cleanup;
-	if (send == NULL) {
-		actor->send_fn = rayo_actor_send_ignore;
-	} else {
-		actor->send_fn = send;
-	}
-
-	actor->parent = parent;
-	if (!actor->parent) {
-		switch_mutex_init(&actor->mutex, SWITCH_MUTEX_NESTED, pool);
-	} else {
-		/* inherit mutex from parent */
-		actor->mutex = actor->parent->mutex;
-
-		/* prevent parent destruction */
-		RAYO_RETAIN(actor->parent);
-	}
-
-	/* add to hash of actors, so commands can route to call */
-	switch_mutex_lock(globals.actors_mutex);
-	if (!zstr(jid)) {
-		if (switch_core_hash_find(globals.actors, RAYO_JID(actor))) {
-			/* duplicate JID, give up! */
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_NOTICE, "JID conflict! %s\n", RAYO_JID(actor));
-			switch_mutex_unlock(globals.actors_mutex);
-			if (actor->parent) {
-				/* unlink from parent */
-				RAYO_RELEASE(actor->parent);
-				actor->parent = NULL;
-			}
-			return NULL;
-		}
-		switch_core_hash_insert(globals.actors, RAYO_JID(actor), actor);
-	}
-	if (!zstr(id)) {
-		if (switch_core_hash_find(globals.actors_by_id, actor->id)) {
-			/* duplicate ID - only log for now... */
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "ID conflict! %s\n", actor->id);
-		}
-		switch_core_hash_insert(globals.actors_by_id, actor->id, actor);
-	}
-	switch_mutex_unlock(globals.actors_mutex);
-
-	switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Init %s\n", RAYO_JID(actor));
-
-	return actor;
-}
-
-/**
- * Initialize rayo call
- * @return the call or NULL if JID conflict
- */
-static struct rayo_call *rayo_call_init(struct rayo_call *call, switch_memory_pool_t *pool, const char *uuid, const char *file, int line)
-{
-	char *call_jid;
-	char uuid_id_buf[SWITCH_UUID_FORMATTED_LENGTH + 1];
-
-	if (zstr(uuid)) {
-		switch_uuid_str(uuid_id_buf, sizeof(uuid_id_buf));
-		uuid = uuid_id_buf;
-	}
-	call_jid = switch_mprintf("%s@%s", uuid, RAYO_JID(globals.server));
-
-	call = RAYO_CALL(rayo_actor_init(RAYO_ACTOR(call), pool, RAT_CALL, "", uuid, call_jid, rayo_call_cleanup, rayo_call_send, NULL, file, line));
-	if (call) {
-		call->dcp_jid = "";
-		call->idle_start_time = switch_micro_time_now();
-		call->joined = 0;
-		call->joined_id = NULL;
-		call->ringing_sent = 0;
-		call->pending_join_request = NULL;
-		call->dial_request_id = NULL;
-		call->end_event = NULL;
-		call->dial_request_failed = 0;
-		call->rayo_app_started = 0;
-		call->answer_event = NULL;
-		switch_core_hash_init(&call->pcps);
-		switch_core_hash_init(&call->acps);
-		call->num_acps = 0;
-	}
-
-	switch_safe_free(call_jid);
-
-	return call;
-}
-
-#define rayo_call_create(uuid) _rayo_call_create(uuid, __FILE__, __LINE__)
-/**
- * Create Rayo call
- * @param uuid uuid to assign call, if NULL one is picked
- * @param file file that called this function
- * @param line number of file that called this function
- * @return the call, or NULL if JID conflict
- */
-static struct rayo_call *_rayo_call_create(const char *uuid, const char *file, int line)
-{
-	switch_memory_pool_t *pool;
-	struct rayo_call *call;
-	switch_core_new_memory_pool(&pool);
-	call = switch_core_alloc(pool, sizeof(*call));
-	call = rayo_call_init(call, pool, uuid, file, line);
-	if (!call) {
-		switch_core_destroy_memory_pool(&pool);
-	}
-	return call;
-}
-
-/**
- * Mixer destructor
- */
-static void rayo_mixer_cleanup(struct rayo_actor *actor)
-{
-	struct rayo_mixer *mixer = RAYO_MIXER(actor);
-	switch_core_hash_destroy(&mixer->members);
-	switch_core_hash_destroy(&mixer->subscribers);
-}
-
-/**
- * Initialize mixer
- * @return the mixer or NULL if JID conflict
- */
-static struct rayo_mixer *rayo_mixer_init(struct rayo_mixer *mixer, switch_memory_pool_t *pool, const char *name, const char *file, int line)
-{
-	char *mixer_jid = switch_mprintf("%s@%s", name, RAYO_JID(globals.server));
-	mixer = RAYO_MIXER(rayo_actor_init(RAYO_ACTOR(mixer), pool, RAT_MIXER, "", name, mixer_jid, rayo_mixer_cleanup, rayo_mixer_send, NULL, file, line));
-	if (mixer) {
-		switch_core_hash_init(&mixer->members);
-		switch_core_hash_init(&mixer->subscribers);
-	}
-	switch_safe_free(mixer_jid);
-	return mixer;
-}
-
-#define rayo_mixer_create(name) _rayo_mixer_create(name, __FILE__, __LINE__)
-/**
- * Create Rayo mixer
- * @param name of this mixer
- * @return the mixer or NULL if JID conflict
- */
-static struct rayo_mixer *_rayo_mixer_create(const char *name, const char *file, int line)
-{
-	switch_memory_pool_t *pool;
-	struct rayo_mixer *mixer = NULL;
-	switch_core_new_memory_pool(&pool);
-	mixer = rayo_mixer_init(switch_core_alloc(pool, sizeof(*mixer)), pool, name, file, line);
-	if (!mixer) {
-		switch_core_destroy_memory_pool(&pool);
-	}
-	return mixer;
-}
-
-/**
- * Initialize Rayo component
- * @param type of this component
- * @param subtype of this component
- * @param id internal ID of this component
- * @param parent the parent that owns this component
- * @param client_jid the client that created this component
- * @param cleanup optional cleanup function
- * @param file file that called this function
- * @param line line number that called this function
- * @return the component or NULL if JID conflict
- */
-struct rayo_component *_rayo_component_init(struct rayo_component *component, switch_memory_pool_t *pool, const char *type, const char *subtype, const char *id, struct rayo_actor *parent, const char *client_jid, rayo_actor_cleanup_fn cleanup, const char *file, int line)
-{
-	char *ref = switch_mprintf("%s-%d", subtype, rayo_actor_seq_next(parent));
-	char *jid = switch_mprintf("%s/%s", RAYO_JID(parent), ref);
-	if (zstr(id)) {
-		id = jid;
-	}
-
-	component = RAYO_COMPONENT(rayo_actor_init(RAYO_ACTOR(component), pool, type, subtype, id, jid, cleanup, rayo_component_send, parent, file, line));
-	if (component) {
-		component->client_jid = switch_core_strdup(pool, client_jid);
-		component->ref = switch_core_strdup(pool, ref);
-	}
-
-	switch_safe_free(ref);
-	switch_safe_free(jid);
-	return component;
-}
-
-/**
- * Send XMPP message to client
- */
-void rayo_client_send(struct rayo_actor *client, struct rayo_message *msg)
-{
-	xmpp_stream_context_send(globals.xmpp_context, RAYO_CLIENT(client)->route, msg->payload);
-}
-
-/**
- * Cleanup rayo client
- */
-static void rayo_client_cleanup(struct rayo_actor *actor)
-{
-	/* remove session from map */
-	switch_mutex_lock(globals.clients_mutex);
-	if (!zstr(RAYO_JID(actor))) {
-		switch_core_hash_delete(globals.clients_roster, RAYO_JID(actor));
-		if (RAYO_CLIENT(actor)->peer_server) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Removing %s from peer server %s\n", RAYO_JID(actor), RAYO_JID(RAYO_CLIENT(actor)->peer_server));
-			switch_core_hash_delete(RAYO_CLIENT(actor)->peer_server->clients, RAYO_JID(actor));
-		}
-	}
-	switch_mutex_unlock(globals.clients_mutex);
-
-	pause_when_offline();
-}
-
-/**
- * Initialize rayo client
- * @param pool the memory pool for this client
- * @param jid for this client
- * @param route to this client
- * @param availability of client
- * @param send message transmission function
- * @param peer_server NULL if locally connected client
- * @return the new client or NULL if JID conflict
- */
-static struct rayo_client *rayo_client_init(struct rayo_client *client, switch_memory_pool_t *pool, const char *jid, const char *route, enum presence_status availability, rayo_actor_send_fn send, struct rayo_peer_server *peer_server)
-{
-	client = RAYO_CLIENT(RAYO_ACTOR_INIT(RAYO_ACTOR(client), pool, RAT_CLIENT, "", jid, jid, rayo_client_cleanup, send));
-	if (client) {
-		client->availability = availability;
-		client->peer_server = peer_server;
-		client->last_probe = 0;
-		if (route) {
-			client->route = switch_core_strdup(pool, route);
-		}
-
-		/* make client available for offers */
-		switch_mutex_lock(globals.clients_mutex);
-		switch_core_hash_insert(globals.clients_roster, RAYO_JID(client), client);
-		if (peer_server) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Adding %s to peer server %s\n", RAYO_JID(client), RAYO_JID(peer_server));
-			switch_core_hash_insert(peer_server->clients, RAYO_JID(client), client);
-		}
-		switch_mutex_unlock(globals.clients_mutex);
-	}
-
-	pause_when_offline();
-
-	return client;
-}
-
-/**
- * Create a new Rayo client
- * @param jid for this client
- * @param route to this client
- * @param availability of client
- * @param send message transmission function
- * @param peer_server NULL if locally connected client
- * @return the new client or NULL
- */
-static struct rayo_client *rayo_client_create(const char *jid, const char *route, enum presence_status availability, rayo_actor_send_fn send, struct rayo_peer_server *peer_server)
-{
-	switch_memory_pool_t *pool;
-	struct rayo_client *rclient = NULL;
-
-	switch_core_new_memory_pool(&pool);
-	if (!(rclient = switch_core_alloc(pool, sizeof(*rclient)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n");
-		return NULL;
-	}
-	rclient = rayo_client_init(rclient, pool, jid, route, availability, send, peer_server);
-	if (!rclient) {
-		switch_core_destroy_memory_pool(&pool);
-	}
-	return rclient;
-}
-
-/**
- * Send XMPP message to peer server
- */
-void rayo_peer_server_send(struct rayo_actor *server, struct rayo_message *msg)
-{
-	xmpp_stream_context_send(globals.xmpp_context, RAYO_JID(server), msg->payload);
-}
-
-/**
- * Destroy peer server and its associated clients
- */
-static void rayo_peer_server_cleanup(struct rayo_actor *actor)
-{
-	switch_hash_index_t *hi = NULL;
-	struct rayo_peer_server *rserver = RAYO_PEER_SERVER(actor);
-
-	/* a little messy... client will remove itself from the peer server when it is destroyed,
-	 * however, there is no guarantee the client will actually be destroyed now so
-	 * the server must remove the client.
-	 */
-	switch_mutex_lock(globals.clients_mutex);
-	while ((hi = switch_core_hash_first_iter(rserver->clients, hi))) {
-		const void *key;
-		void *client;
-		switch_core_hash_this(hi, &key, NULL, &client);
-		switch_assert(client);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Removing %s from peer server %s\n", RAYO_JID(client), RAYO_JID(rserver));
-		switch_core_hash_delete(rserver->clients, key);
-		RAYO_CLIENT(client)->peer_server = NULL;
-		RAYO_RELEASE(client);
-		RAYO_DESTROY(client);
-	}
-	switch_core_hash_destroy(&rserver->clients);
-	switch_mutex_unlock(globals.clients_mutex);
-}
-
-/**
- * Create a new Rayo peer server
- * @param jid of this server
- * @return the peer server
- */
-static struct rayo_peer_server *rayo_peer_server_create(const char *jid)
-{
-	switch_memory_pool_t *pool;
-	struct rayo_peer_server *rserver = NULL;
-
-	switch_core_new_memory_pool(&pool);
-	if (!(rserver = switch_core_alloc(pool, sizeof(*rserver)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n");
-		return NULL;
-	}
-	rserver = RAYO_PEER_SERVER(RAYO_ACTOR_INIT(RAYO_ACTOR(rserver), pool, RAT_PEER_SERVER, "", jid, jid, rayo_peer_server_cleanup, rayo_peer_server_send));
-	if (rserver) {
-		switch_core_hash_init(&rserver->clients);
-	} else {
-		switch_core_destroy_memory_pool(&pool);
-	}
-	return rserver;
-}
-
-/**
- * Check if message sender has control of offered call.
- * @param call the Rayo call
- * @param msg the message
- * @return 1 if sender has call control, 0 if sender does not have control
- */
-static int has_call_control(struct rayo_call *call, struct rayo_message *msg)
-{
-	return (!strcmp(rayo_call_get_dcp_jid(call), msg->from_jid) || is_internal_message(msg) || is_admin_client_message(msg));
-}
-
-/**
- * Check if message sender has control of offered call. Take control if nobody else does.
- * @param call the Rayo call
- * @param session the session
- * @param msg the message
- * @return 1 if sender has call control
- */
-static int take_call_control(struct rayo_call *call, switch_core_session_t *session, struct rayo_message *msg)
-{
-	int control = 0;
-
-	/* nobody in charge */
-	if (zstr(call->dcp_jid)) {
-		/* was offered to this session? */
-		if (!zstr(msg->from_jid) && switch_core_hash_find(call->pcps, msg->from_jid)) {
-			/* take charge */
-			call->dcp_jid = switch_core_strdup(RAYO_POOL(call), msg->from_jid);
-			switch_channel_set_variable(switch_core_session_get_channel(session), "rayo_dcp_jid", rayo_call_get_dcp_jid(call));
-			control = 1;
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_INFO, "%s has control of call\n", rayo_call_get_dcp_jid(call));
-		}
-	} else if (has_call_control(call, msg)) {
-		control = 1;
-	}
-
-	if (!control) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_INFO, "%s does not have control of call\n", msg->from_jid);
-	}
-
-	return control;
-}
-
-/**
- * Check Rayo server command for errors.
- * @param server the server
- * @param msg the command
- * @return 1 if OK
- */
-static iks *rayo_server_command_ok(struct rayo_actor *server, struct rayo_message *msg)
-{
-	iks *node = msg->payload;
-	iks *response = NULL;
-	int bad = zstr(iks_find_attrib(node, "id"));
-
-	if (bad) {
-		response = iks_new_error(node, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	return response;
-}
-
-/**
- * Check Rayo call command for errors.
- * @param call the Rayo call
- * @param session the session
- * @param msg the command
- * @return 1 if OK
- */
-static iks *rayo_call_command_ok(struct rayo_call *call, switch_core_session_t *session, struct rayo_message *msg)
-{
-	iks *node = msg->payload;
-	iks *response = NULL;
-	int bad = zstr(iks_find_attrib(node, "id"));
-
-	if (bad) {
-		response = iks_new_error(node, STANZA_ERROR_BAD_REQUEST);
-	} else if (!take_call_control(call, session, msg)) {
-		response = iks_new_error(node, STANZA_ERROR_CONFLICT);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, %s conflict\n", msg->from_jid, RAYO_JID(call));
-	}
-
-	return response;
-}
-
-/**
- * Check Rayo component command for errors.
- * @param component the component
- * @param msg the command
- * @return 0 if error
- */
-static iks *rayo_component_command_ok(struct rayo_component *component, struct rayo_message *msg)
-{
-	iks *node = msg->payload;
-	iks *response = NULL;
-	char *from = iks_find_attrib(node, "from");
-	int bad = zstr(iks_find_attrib(node, "id"));
-
-	if (bad) {
-		response = iks_new_error(node, STANZA_ERROR_BAD_REQUEST);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, %s bad request\n", msg->from_jid, RAYO_JID(component));
-	} else if (strcmp(component->client_jid, from) && !is_admin_client_message(msg) && !is_internal_message(msg)) {
-		/* does not have control of this component */
-		response = iks_new_error(node, STANZA_ERROR_CONFLICT);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, %s conflict\n", msg->from_jid, RAYO_JID(component));
-	}
-
-	return response;
-}
-
-/**
- * Handle server message
- */
-void rayo_server_send(struct rayo_actor *server, struct rayo_message *msg)
-{
-	iks *response = NULL;
-	rayo_actor_xmpp_handler handler = NULL;
-	iks *iq = msg->payload;
-
-	if (!strcmp("presence", iks_name(iq))) {
-		/* this is a hack - message from internal console */
-		struct rayo_actor *client = RAYO_LOCATE(msg->from_jid);
-		if (client) {
-			if (!strcmp(RAT_CLIENT, client->type)) {
-				on_client_presence(RAYO_CLIENT(client), iq);
-			}
-			RAYO_RELEASE(client);
-		}
-		return;
-	}
-
-	/* is this a command a server supports? */
-	handler = rayo_actor_command_handler_find(server, msg);
-	if (!handler) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, no handler function for command to %s\n", msg->from_jid, RAYO_JID(server));
-		if (!msg->is_reply) {
-			RAYO_SEND_REPLY(server, msg->from_jid, iks_new_error(iq, STANZA_ERROR_FEATURE_NOT_IMPLEMENTED));
-		}
-		return;
-	}
-
-	/* is the command valid? */
-	if (!(response = rayo_server_command_ok(server, msg))) {
-		response = handler(server, msg, NULL);
-	}
-
-	if (response) {
-		if (!msg->is_reply) {
-			RAYO_SEND_REPLY(server, msg->from_jid, response);
-		} else {
-			iks_delete(response);
-		}
-	}
-}
-
-/**
- * Handle call message
- */
-void rayo_call_send(struct rayo_actor *call, struct rayo_message *msg)
-{
-	rayo_actor_xmpp_handler handler = NULL;
-	iks *stanza = msg->payload;
-	switch_core_session_t *session;
-	iks *response = NULL;
-
-	if (!strcmp("message", iks_name(stanza))) {
-		const char *type = iks_find_attrib_soft(stanza, "type");
-
-		if (!strcmp("normal", type)) {
-			const char *body = iks_find_cdata(stanza, "body");
-			if (!zstr(body)) {
-				switch_event_t *event;
-				if (switch_event_create(&event, SWITCH_EVENT_SEND_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "content-type", "text/plain");
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "uuid", rayo_call_get_uuid(RAYO_CALL(call)));
-					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "subject", iks_find_cdata(stanza, "subject"));
-					switch_event_add_body(event, "%s", body);
-					switch_event_fire(&event);
-				}
-			} else if (!msg->is_reply) {
-				RAYO_SEND_REPLY(call, msg->from_jid, iks_new_error_detailed(stanza, STANZA_ERROR_BAD_REQUEST, "missing body"));
-			}
-		} else if (!msg->is_reply) {
-			RAYO_SEND_REPLY(call, msg->from_jid, iks_new_error(stanza, STANZA_ERROR_FEATURE_NOT_IMPLEMENTED));
-		}
-		return;
-	}
-
-	/* is this a command a call supports? */
-	handler = rayo_actor_command_handler_find(call, msg);
-	if (!handler) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, no handler function for command\n", RAYO_JID(call));
-		if (!msg->is_reply) {
-			RAYO_SEND_REPLY(call, msg->from_jid, iks_new_error(stanza, STANZA_ERROR_FEATURE_NOT_IMPLEMENTED));
-		}
-		return;
-	}
-
-	/* is the session still available? */
-	session = switch_core_session_locate(rayo_call_get_uuid(RAYO_CALL(call)));
-	if (!session) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, session not found\n", RAYO_JID(call));
-		if (!msg->is_reply) {
-			RAYO_SEND_REPLY(call, msg->from_jid, iks_new_error(stanza, STANZA_ERROR_ITEM_NOT_FOUND));
-		}
-		return;
-	}
-
-	/* is the command valid? */
-	if (!(response = rayo_call_command_ok(RAYO_CALL(call), session, msg))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, executing command\n", RAYO_JID(call));
-		response = handler(call, msg, session);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, done executing command\n", RAYO_JID(call));
-	}
-	switch_core_session_rwunlock(session);
-
-	if (response) {
-		if (!msg->is_reply) {
-			RAYO_SEND_REPLY(call, msg->from_jid, response);
-		} else {
-			iks_delete(response);
-		}
-	}
-}
-
-/**
- * Handle mixer message
- */
-void rayo_mixer_send(struct rayo_actor *mixer, struct rayo_message *msg)
-{
-	rayo_actor_xmpp_handler handler = NULL;
-	iks *iq = msg->payload;
-	iks *response = NULL;
-
-	/* is this a command a mixer supports? */
-	handler = rayo_actor_command_handler_find(mixer, msg);
-	if (!handler) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, no handler function for command\n", RAYO_JID(mixer));
-		if (!msg->is_reply) {
-			RAYO_SEND_REPLY(mixer, msg->from_jid, iks_new_error(iq, STANZA_ERROR_FEATURE_NOT_IMPLEMENTED));
-		}
-		return;
-	}
-
-	/* execute the command */
-	response = handler(mixer, msg, NULL);
-	if (response) {
-		if (!msg->is_reply) {
-			RAYO_SEND_REPLY(mixer, msg->from_jid, response);
-		} else {
-			iks_delete(response);
-		}
-	}
-}
-
-/**
- * Handle mixer message
- */
-void rayo_component_send(struct rayo_actor *component, struct rayo_message *msg)
-{
-	rayo_actor_xmpp_handler handler = NULL;
-	iks *xml_msg = msg->payload;
-	iks *response = NULL;
-
-	if (!strcmp("iq", iks_name(xml_msg))) {
-		/* is this a command a component supports? */
-		handler = rayo_actor_command_handler_find(component, msg);
-		if (!handler) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, no component handler function for command\n", RAYO_JID(component));
-			if (!msg->is_reply) {
-				RAYO_SEND_REPLY(component, msg->from_jid, iks_new_error(xml_msg, STANZA_ERROR_FEATURE_NOT_IMPLEMENTED));
-			}
-			return;
-		}
-
-		/* is the command valid? */
-		if (!(response = rayo_component_command_ok(RAYO_COMPONENT(component), msg))) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, executing command\n", RAYO_JID(component));
-			response = handler(component, msg, NULL);
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, done executing command\n", RAYO_JID(component));
-		}
-
-		if (response) {
-			if (!msg->is_reply) {
-				RAYO_SEND_REPLY(component, msg->from_jid, response);
-			} else {
-				iks_delete(response);
-			}
-			return;
-		}
-	} else if (!strcmp("presence", iks_name(xml_msg))) {
-		/* is this an event the component wants? */
-		handler = rayo_actor_event_handler_find(component, msg);
-		if (!handler) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, no component handler function for event\n", RAYO_JID(component));
-			return;
-		}
-
-		/* forward the event */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, forwarding event\n", RAYO_JID(component));
-		response = handler(component, msg, NULL);
-		if (response) {
-			if (!msg->is_reply) {
-				RAYO_SEND_REPLY(component, msg->from_jid, response);
-			} else {
-				iks_delete(response);
-			}
-		}
-	}
-}
-
-/**
- * Add signaling headers to channel -- only works on SIP
- * @param session the channel
- * @param iq_cmd the request containing <header>
- * @param type header type
- */
-static void add_signaling_headers(switch_core_session_t *session, iks *iq_cmd, const char *type)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	iks *header = NULL;
-	for (header = iks_find(iq_cmd, "header"); header; header = iks_next_tag(header)) {
-		if (!strcmp("header", iks_name(header))) {
-			const char *name = iks_find_attrib_soft(header, "name");
-			const char *value = iks_find_attrib_soft(header, "value");
-			if (!zstr(name) && !zstr(value)) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Adding header: %s: %s\n", name, value);
-				switch_channel_set_variable_name_printf(channel, value, "%s%s", type, name);
-			}
-		}
-	}
-}
-
-/**
- * Handle <iq><accept> request
- * @param call the Rayo call
- * @param session the session
- * @param node the <iq> node
- */
-static iks *on_rayo_accept(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *node = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	iks *response = NULL;
-
-	/* send ringing */
-	add_signaling_headers(session, iks_find(node, "accept"), RAYO_SIP_RESPONSE_HEADER);
-	switch_channel_pre_answer(switch_core_session_get_channel(session));
-	response = iks_new_iq_result(node);
-	return response;
-}
-
-/**
- * Handle <iq><answer> request
- * @param call the Rayo call
- * @param session the session
- * @param node the <iq> node
- */
-static iks *on_rayo_answer(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *node = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	iks *response = NULL;
-
-	/* send answer to call */
-	add_signaling_headers(session, iks_find(node, "answer"), RAYO_SIP_RESPONSE_HEADER);
-	switch_channel_answer(switch_core_session_get_channel(session));
-	response = iks_new_iq_result(node);
-	return response;
-}
-
-/**
- * Handle <iq><redirect> request
- * @param call the Rayo call
- * @param session the session
- * @param node the <iq> node
- */
-static iks *on_rayo_redirect(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *node = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	iks *response = NULL;
-	iks *redirect = iks_find(node, "redirect");
-	char *redirect_to = iks_find_attrib(redirect, "to");
-
-	if (zstr(redirect_to)) {
-		response = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "Missing redirect to attrib");
-	} else if (switch_channel_test_flag(channel, CF_ANSWERED)) {
-		/* call is answered- must deflect */
-		switch_core_session_message_t msg = { 0 };
-		add_signaling_headers(session, redirect, RAYO_SIP_REQUEST_HEADER);
-		msg.from = __FILE__;
-		msg.string_arg = switch_core_session_strdup(session, redirect_to);
-		msg.message_id = SWITCH_MESSAGE_INDICATE_DEFLECT;
-		switch_core_session_receive_message(session, &msg);
-		response = iks_new_iq_result(node);
-	} else if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND) {
-		/* Inbound call not answered - redirect */
-		switch_core_session_message_t msg = { 0 };
-		add_signaling_headers(session, redirect, RAYO_SIP_RESPONSE_HEADER);
-		msg.from = __FILE__;
-		msg.string_arg = switch_core_session_strdup(session, redirect_to);
-		msg.message_id = SWITCH_MESSAGE_INDICATE_REDIRECT;
-		switch_core_session_receive_message(session, &msg);
-		response = iks_new_iq_result(node);
-	} else {
-		response = iks_new_error_detailed(node, STANZA_ERROR_UNEXPECTED_REQUEST, "Call must be answered");
-	}
-	return response;
-}
-
-/**
- * Handle <iq><hangup> or <iq><reject> request
- * @param call the Rayo call
- * @param session the session
- * @param node the <iq> node
- */
-static iks *on_rayo_hangup(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *node = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	iks *response = NULL;
-	iks *hangup = iks_first_tag(node);
-	iks *reason = iks_first_tag(hangup);
-	int hangup_cause = RAYO_CAUSE_HANGUP;
-
-	/* get hangup cause */
-	if (!reason && !strcmp("hangup", iks_name(hangup))) {
-		/* no reason in <hangup> */
-		hangup_cause = RAYO_CAUSE_HANGUP;
-	} else if (reason && !strcmp("reject", iks_name(hangup))) {
-		char *reason_name = iks_name(reason);
-		/* reason required for <reject> */
-		if (!strcmp("busy", reason_name)) {
-			hangup_cause = RAYO_CAUSE_BUSY;
-		} else if (!strcmp("decline", reason_name)) {
-			hangup_cause = RAYO_CAUSE_DECLINE;
-		} else if (!strcmp("error", reason_name)) {
-			hangup_cause = RAYO_CAUSE_ERROR;
-		} else {
-			response = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "invalid reject reason");
-		}
-	} else {
-		response = iks_new_error(node, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	/* do hangup */
-	if (!response) {
-		switch_channel_set_variable(switch_core_session_get_channel(session), "rayo_local_hangup", "true");
-		add_signaling_headers(session, hangup, RAYO_SIP_REQUEST_HEADER);
-		add_signaling_headers(session, hangup, RAYO_SIP_RESPONSE_HEADER);
-		switch_ivr_kill_uuid(rayo_call_get_uuid(call), hangup_cause);
-		response = iks_new_iq_result(node);
-	}
-
-	return response;
-}
-
-/**
- * Join calls together
- * @param call the call that joins
- * @param session the session
- * @param msg the rayo join message
- * @param call_uri to join
- * @param media mode (direct/bridge)
- * @return the response
- */
-static iks *join_call(struct rayo_call *call, switch_core_session_t *session, struct rayo_message *msg, const char *call_uri, const char *media)
-{
-	iks *node = msg->payload;
-	iks *response = NULL;
-	/* take call out of media path if media = "direct" */
-	int do_direct = !strcmp("direct", media);
-
-	/* check if joining to rayo call */
-	struct rayo_call *b_call = RAYO_CALL_LOCATE(call_uri);
-	if (b_call) {
-		if (!call->rayo_app_started) {
-			/* A-leg not under rayo control yet */
-			response = iks_new_error_detailed(node, STANZA_ERROR_UNEXPECTED_REQUEST, "a-leg is not ready to join");
-		} else if (!b_call->rayo_app_started) {
-			/* B-leg not under rayo control yet */
-			response = iks_new_error_detailed(node, STANZA_ERROR_UNEXPECTED_REQUEST, "b-leg is not ready to join");
-		} else if (!has_call_control(b_call, msg)) {
-			/* not allowed to join to this call */
-			response = iks_new_error(node, STANZA_ERROR_NOT_ALLOWED);
-		} else if (b_call->joined) {
-			/* don't support multiple joined calls */
-			response = iks_new_error_detailed(node, STANZA_ERROR_CONFLICT, "multiple joined calls not supported");
-		} else {
-			/* bridge this call to call-uri */
-			if (do_direct) {
-				switch_channel_set_flag(switch_core_session_get_channel(session), CF_BYPASS_MEDIA_AFTER_BRIDGE);
-			} else {
-				switch_channel_clear_flag(switch_core_session_get_channel(session), CF_BYPASS_MEDIA_AFTER_BRIDGE);
-				switch_channel_pre_answer(switch_core_session_get_channel(session));
-			}
-			call->pending_join_request = iks_copy(node);
-			if (switch_ivr_uuid_bridge(rayo_call_get_uuid(call), rayo_call_get_uuid(b_call)) != SWITCH_STATUS_SUCCESS) {
-				iks *request = call->pending_join_request;
-				iks *result = iks_new_error(request, STANZA_ERROR_SERVICE_UNAVAILABLE);
-				call->pending_join_request = NULL;
-				RAYO_SEND_REPLY(call, iks_find_attrib_soft(request, "from"), result);
-				iks_delete(call->pending_join_request);
-			}
-		}
-		RAYO_RELEASE(b_call);
-	} else {
-		/* not a rayo call */
-		response = iks_new_error_detailed(node, STANZA_ERROR_SERVICE_UNAVAILABLE, "b-leg is gone");
-	}
-	return response;
-}
-
-/**
- * Execute command on session's conference
- * @param session to execute conference API on
- * @param conf_name of conference
- * @param command to send to conference
- * @param node IQ request
- * @return response on failure
- */
-static iks *exec_conference_api(switch_core_session_t *session, const char *conf_name, const char *command, iks *node)
-{
-	iks *response = NULL;
-	switch_stream_handle_t stream = { 0 };
-	const char *conf_member_id = switch_channel_get_variable(switch_core_session_get_channel(session), "conference_member_id");
-	SWITCH_STANDARD_STREAM(stream);
-	switch_api_execute("conference", switch_core_session_sprintf(session, "%s %s %s", conf_name, command, conf_member_id), NULL, &stream);
-	if (!zstr(stream.data) && strncmp("+OK", stream.data, 3)) {
-		response = iks_new_error_detailed_printf(node, STANZA_ERROR_SERVICE_UNAVAILABLE, "%s", stream.data);
-	}
-	switch_safe_free(stream.data);
-	return response;
-}
-
-/**
- * Execute conference app on session
- * @param session to execute conference API on
- * @param command to send to conference (conference name, member flags, etc)
- * @param node IQ request
- * @return response on failure
- */
-static iks *exec_conference_app(switch_core_session_t *session, const char *command, iks *node)
-{
-	iks *response = NULL;
-	switch_event_t *execute_event = NULL;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-
-	/* conference requires local media on channel */
-	if (!switch_channel_media_ready(channel) && switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) {
-		/* shit */
-		response = iks_new_error_detailed(node, STANZA_ERROR_INTERNAL_SERVER_ERROR, "failed to start media");
-		return response;
-	}
-
-	/* send execute conference event to session */
-	if (switch_event_create(&execute_event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "call-command", "execute");
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-name", "conference");
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-arg", command);
-		//switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "event_uuid", uuid);
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "event-lock", "true");
-		if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) {
-			switch_channel_set_flag(channel, CF_BLOCK_BROADCAST_UNTIL_MEDIA);
-		}
-
-		if (switch_core_session_queue_private_event(session, &execute_event, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) {
-			response = iks_new_error_detailed(node, STANZA_ERROR_INTERNAL_SERVER_ERROR, "failed to join mixer (queue event failed)");
-			if (execute_event) {
-				switch_event_destroy(&execute_event);
-			}
-			return response;
-		}
-	}
-	return response;
-}
-
-/**
- * Join call to a mixer
- * @param call the call that joins
- * @param session the session
- * @param msg the join request
- * @param mixer_name the mixer to join
- * @param direction the media direction
- * @return the response
- */
-static iks *join_mixer(struct rayo_call *call, switch_core_session_t *session, struct rayo_message *msg, const char *mixer_name, const char *direction)
-{
-	iks *node = msg->payload;
-	iks *response = NULL;
-
-	if (!call->rayo_app_started) {
-		/* A-leg not under rayo control yet */
-		response = iks_new_error_detailed(node, STANZA_ERROR_UNEXPECTED_REQUEST, "call is not ready to join");
-	} else if (call->joined_id) {
-		/* adjust join conference params */
-		if (!strcmp("duplex", direction)) {
-			if ((response = exec_conference_api(session, mixer_name, "unmute", node)) ||
-				(response = exec_conference_api(session, mixer_name, "undeaf", node))) {
-				return response;
-			}
-		} else if (!strcmp("recv", direction)) {
-			if ((response = exec_conference_api(session, mixer_name, "mute", node)) ||
-				(response = exec_conference_api(session, mixer_name, "undeaf", node))) {
-				return response;
-			}
-		} else {
-			if ((response = exec_conference_api(session, mixer_name, "unmute", node)) ||
-				(response = exec_conference_api(session, mixer_name, "deaf", node))) {
-				return response;
-			}
-		}
-		response = iks_new_iq_result(node);
-	} else {
-		/* join new conference */
-		const char *conf_args = switch_core_session_sprintf(session, "%s@%s", mixer_name, globals.mixer_conf_profile);
-		if (!strcmp("send", direction)) {
-			conf_args = switch_core_session_sprintf(session, "%s+flags{deaf}", conf_args);
-		} else if (!strcmp("recv", direction)) {
-			conf_args = switch_core_session_sprintf(session, "%s+flags{mute}", conf_args);
-		}
-
-		call->pending_join_request = iks_copy(node);
-		response = exec_conference_app(session, conf_args, node);
-		if (response) {
-			iks_delete(call->pending_join_request);
-			call->pending_join_request = NULL;
-		}
-	}
-	return response;
-}
-
-/**
- * Handle <iq><join> request
- * @param call the Rayo call
- * @param session the session
- * @param msg the rayo join message
- */
-static iks *on_rayo_join(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	iks *response = NULL;
-	iks *join = iks_find(msg->payload, "join");
-	const char *join_id;
-	const char *mixer_name;
-	const char *call_uri;
-
-	/* validate input attributes */
-	if (!VALIDATE_RAYO_JOIN(join)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Bad join attrib\n");
-		response = iks_new_error(msg->payload, STANZA_ERROR_BAD_REQUEST);
-		goto done;
-	}
-	mixer_name = iks_find_attrib(join, "mixer-name");
-	call_uri = iks_find_attrib(join, "call-uri");
-
-	if (!zstr(mixer_name)) {
-		join_id = mixer_name;
-	} else {
-		join_id = call_uri;
-	}
-
-	/* can't join both mixer and call */
-	if (!zstr(mixer_name) && !zstr(call_uri)) {
-		response = iks_new_error_detailed(msg->payload, STANZA_ERROR_BAD_REQUEST, "mixer-name and call-uri are mutually exclusive");
-		goto done;
-	}
-
-	/* need to join *something* */
-	if (zstr(mixer_name) && zstr(call_uri)) {
-		response = iks_new_error_detailed(msg->payload, STANZA_ERROR_BAD_REQUEST, "mixer-name or call-uri is required");
-		goto done;
-	}
-
-	if ((RAYO_CALL(call)->joined == JOINED_CALL) ||
-		(RAYO_CALL(call)->joined == JOINED_MIXER && strcmp(RAYO_CALL(call)->joined_id, join_id))) {
-		/* already joined */
-		response = iks_new_error_detailed(msg->payload, STANZA_ERROR_CONFLICT, "call is already joined");
-		goto done;
-	}
-
-	if (rayo_call_is_faxing(RAYO_CALL(call))) {
-		/* can't join a call while it's faxing */
-		response = iks_new_error_detailed(msg->payload, STANZA_ERROR_UNEXPECTED_REQUEST, "fax is in progress");
-		goto done;
-	}
-
-	if (RAYO_CALL(call)->pending_join_request) {
-		/* don't allow concurrent join requests */
-		response = iks_new_error_detailed(msg->payload, STANZA_ERROR_UNEXPECTED_REQUEST, "(un)join request is pending");
-		goto done;
-	}
-
-	if (!zstr(mixer_name)) {
-		/* join conference */
-		response = join_mixer(RAYO_CALL(call), session, msg, mixer_name, iks_find_attrib(join, "direction"));
-	} else {
-		/* bridge calls */
-		response = join_call(RAYO_CALL(call), session, msg, call_uri, iks_find_attrib(join, "media"));
-	}
-
-done:
-	return response;
-}
-
-/**
- * unjoin call to a bridge
- * @param call the call that unjoined
- * @param session the session
- * @param msg the unjoin request
- * @param call_uri the b-leg xmpp URI
- * @return the response
- */
-static iks *unjoin_call(struct rayo_call *call, switch_core_session_t *session, struct rayo_message *msg, const char *call_uri)
-{
-	iks *node = msg->payload;
-	iks *response = NULL;
-
-	if (!strcmp(call_uri, call->joined_id)) {
-		/* unbridge call */
-		call->pending_join_request = iks_copy(node);
-		switch_ivr_park_session(session);
-	} else {
-		/* not bridged or wrong b-leg URI */
-		response = iks_new_error_detailed_printf(node, STANZA_ERROR_SERVICE_UNAVAILABLE, "expected URI: %s", call->joined_id);
-	}
-
-	return response;
-}
-
-/**
- * unjoin call to a mixer
- * @param call the call that unjoined
- * @param session the session
- * @param msg the unjoin request
- * @param mixer_name the mixer name
- * @return the response
- */
-static iks *unjoin_mixer(struct rayo_call *call, switch_core_session_t *session, struct rayo_message *msg, const char *mixer_name)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	const char *conf_member_id = switch_channel_get_variable(channel, "conference_member_id");
-	const char *conf_name = switch_channel_get_variable(channel, "conference_name");
-	iks *node = msg->payload;
-	iks *response = NULL;
-
-	/* not conferenced, or wrong conference */
-	if (zstr(conf_name) || strcmp(mixer_name, conf_name)) {
-		response = iks_new_error_detailed_printf(node, STANZA_ERROR_SERVICE_UNAVAILABLE, "not joined to %s", mixer_name);
-		goto done;
-	} else if (zstr(conf_member_id)) {
-		/* shouldn't happen */
-		response = iks_new_error_detailed(node, STANZA_ERROR_SERVICE_UNAVAILABLE, "channel doesn't have conference member ID");
-		goto done;
-	}
-
-	/* kick the member */
-	response = exec_conference_api(session, mixer_name, "hup", node);
-	if (!response) {
-		/* ack command */
-		response = iks_new_iq_result(node);
-	}
-
-done:
-
-	return response;
-}
-
-/**
- * Handle <iq><unjoin> request
- * @param call the Rayo call
- * @param session the session
- * @param node the <iq> node
- */
-static iks *on_rayo_unjoin(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	iks *response = NULL;
-	iks *unjoin = iks_find(msg->payload, "unjoin");
-	const char *call_uri = iks_find_attrib(unjoin, "call-uri");
-	const char *mixer_name = iks_find_attrib(unjoin, "mixer-name");
-
-	if (!zstr(call_uri) && !zstr(mixer_name)) {
-		response = iks_new_error(msg->payload, STANZA_ERROR_BAD_REQUEST);
-	} else if (RAYO_CALL(call)->pending_join_request) {
-		/* need to let pending request finish first */
-		response = iks_new_error_detailed(msg->payload, STANZA_ERROR_UNEXPECTED_REQUEST, "(un)join request is pending");
-	} else if (!RAYO_CALL(call)->joined) {
-		/* not joined to anything */
-		response = iks_new_error_detailed(msg->payload, STANZA_ERROR_SERVICE_UNAVAILABLE, "not joined to anything");
-	} else if (RAYO_CALL(call)->joined == JOINED_MIXER && !zstr(call_uri)) {
-		/* joined to mixer, not call */
-		response = iks_new_error_detailed(msg->payload, STANZA_ERROR_SERVICE_UNAVAILABLE, "not joined to call");
-	} else if (RAYO_CALL(call)->joined == JOINED_CALL && !zstr(mixer_name)) {
-		/* joined to call, not mixer */
-		response = iks_new_error_detailed(msg->payload, STANZA_ERROR_SERVICE_UNAVAILABLE, "not joined to mixer");
-	} else if (!zstr(call_uri)) {
-		response = unjoin_call(RAYO_CALL(call), session, msg, call_uri);
-	} else if (!zstr(mixer_name)) {
-		response = unjoin_mixer(RAYO_CALL(call), session, msg, mixer_name);
-	} else {
-		/* unjoin everything */
-		if (RAYO_CALL(call)->joined == JOINED_MIXER) {
-			response = unjoin_mixer(RAYO_CALL(call), session, msg, RAYO_CALL(call)->joined_id);
-		} else if (RAYO_CALL(call)->joined == JOINED_CALL) {
-			response = unjoin_call(RAYO_CALL(call), session, msg, RAYO_CALL(call)->joined_id);
-		} else {
-			/* shouldn't happen */
-			response = iks_new_error(msg->payload, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-		}
-	}
-
-	return response;
-}
-
-/**
- * @return 1 if display name is valid
- */
-static int is_valid_display_name(char *display)
-{
-	if (zstr(display)) {
-		return 0;
-	}
-	return 1;
-}
-
-/**
- * @return 1 if SIP URI is valid
- */
-static int is_valid_sip_uri(char *uri)
-{
-	/* just some basic checks to prevent failure when passing URI as caller ID */
-	if (zstr(uri) || strchr(uri, '<') || strchr(uri, '>')) {
-		return 0;
-	}
-	return 1;
-}
-
-#define RAYO_URI_SCHEME_UNKNOWN 0
-#define RAYO_URI_SCHEME_TEL 1
-#define RAYO_URI_SCHEME_SIP 2
-
-/**
- * Parse dial "from" parameter
- * @param pool to use
- * @param from the parameter to parse
- * @param uri the URI
- * @param display the display name
- * @return scheme
- */
-static int parse_dial_from(switch_memory_pool_t *pool, const char *from, char **uri, char **display)
-{
-	if (!zstr(from)) {
-		char *l_display = switch_core_strdup(pool, from);
-		char *l_uri;
-
-		*display = NULL;
-		*uri = NULL;
-
-		/* TODO regex would be better */
-
-		/* split display-name and URI */
-		l_uri = strrchr(l_display, ' ');
-		if (l_uri) {
-			*l_uri++ = '\0';
-			if (!zstr(l_display)) {
-				/* remove "" from display-name */
-				if (l_display[0] == '"') {
-					int len;
-					*l_display++ = '\0';
-					len = strlen(l_display);
-					if (len < 2 || l_display[len - 1] != '"') {
-						return RAYO_URI_SCHEME_UNKNOWN;
-					}
-					l_display[len - 1] = '\0';
-				}
-				if (!is_valid_display_name(l_display)) {
-					return RAYO_URI_SCHEME_UNKNOWN;
-				}
-				*display = l_display;
-			}
-		} else {
-			l_uri = l_display;
-		}
-		if (zstr(l_uri)) {
-			return RAYO_URI_SCHEME_UNKNOWN;
-		}
-
-		/* remove <> from URI */
-		if (l_uri[0] == '<') {
-			int len;
-			*l_uri++ = '\0';
-			len = strlen(l_uri);
-			if (len < 2 || l_uri[len - 1] != '>') {
-				return RAYO_URI_SCHEME_UNKNOWN;
-			}
-			l_uri[len - 1] = '\0';
-			if (zstr(l_uri)) {
-				return RAYO_URI_SCHEME_UNKNOWN;
-			}
-		}
-		*uri = l_uri;
-
-		/* figure out URI scheme and validate it */
-		if (!strncmp("sip:", l_uri, 4) || !strncmp("sips:", l_uri, 5)) {
-			/* validate SIP URI */
-			if (is_valid_sip_uri(l_uri)) {
-				return RAYO_URI_SCHEME_SIP;
-			}
-		} else if (!strncmp("tel:", l_uri, 4)) {
-			l_uri += 4;
-			*uri = l_uri;
-		}
-		if (!zstr(l_uri)) {
-			return RAYO_URI_SCHEME_TEL;
-		}
-	}
-	return RAYO_URI_SCHEME_UNKNOWN;
-}
-
-struct dial_thread_data {
-	switch_memory_pool_t *pool;
-	iks *node;
-};
-
-
-/**
- * Thread that handles originating new calls
- * @param thread this thread
- * @param obj the Rayo client
- * @return NULL
- */
-static void *SWITCH_THREAD_FUNC rayo_dial_thread(switch_thread_t *thread, void *user)
-{
-	struct dial_thread_data *dtdata = (struct dial_thread_data *)user;
-	iks *iq = dtdata->node;
-	iks *dial = iks_find(iq, "dial");
-	iks *response = NULL;
-	const char *dcp_jid = iks_find_attrib(iq, "from");
-	const char *dial_to = iks_find_attrib(dial, "to");
-	char *dial_to_dup = NULL;
-	const char *dial_from = iks_find_attrib(dial, "from");
-	const char *dial_timeout_ms = iks_find_attrib(dial, "timeout");
-	const char *requested_call_uri = iks_find_attrib(dial, "uri");
-	const char *uuid = NULL;
-	switch_event_t *originate_vars = NULL;
-	struct dial_gateway *gateway = NULL;
-	struct rayo_call *call = NULL;
-	uint32_t dial_timeout_sec = 0;
-
-	/* TODO dial_to needs validation */
-
-	/* Check if optional URI is valid. */
-	if (!zstr(requested_call_uri)) {
-
-		/* Split node and domain from URI */
-		char *requested_call_uri_dup = switch_core_strdup(dtdata->pool, requested_call_uri);
-		char *requested_call_uri_domain = strchr(requested_call_uri_dup, '@');
-		if (requested_call_uri_domain) {
-			*requested_call_uri_domain = '\0';
-			requested_call_uri_domain++;
-		}
-
-		/* is domain missing */
-		if (zstr(requested_call_uri_domain)) {
-			response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad uri");
-			goto done;
-		}
-
-		/* is domain correct? */
-		if (strcmp(requested_call_uri_domain, RAYO_JID(globals.server))) {
-			response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad uri (invalid domain)");
-			goto done;
-		}
-
-		/* is node identifier missing? */
-		if (zstr(requested_call_uri_dup)) {
-			response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad uri (missing node)");
-			goto done;
-		}
-
-		/* strip optional xmpp: from node identifier */
-		if (!strncasecmp("xmpp:", requested_call_uri_dup, 5)) {
-			requested_call_uri_dup += 5;
-			if (zstr(requested_call_uri_dup)) {
-				response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad uri (missing node)");
-				goto done;
-			}
-		}
-
-		/* success! */
-		uuid = requested_call_uri_dup;
-	}
-
-	/* create call and link to DCP */
-	call = rayo_call_create(uuid);
-	if (!call) {
-		response = iks_new_error(iq, STANZA_ERROR_CONFLICT);
-		goto done;
-	}
-	call->dcp_jid = switch_core_strdup(RAYO_POOL(call), dcp_jid);
-	call->dial_request_id = switch_core_strdup(RAYO_POOL(call), iks_find_attrib_soft(iq, "id"));
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_INFO, "%s has control of call\n", dcp_jid);
-	uuid = switch_core_strdup(dtdata->pool, rayo_call_get_uuid(call));
-
-	/* create container for origination variables */
-	if (switch_event_create_plain(&originate_vars, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) {
-		abort();
-	}
-
-	/* add dialstring vars to origination variables */
-	if (*dial_to == '{') {
-		dial_to_dup = switch_core_strdup(dtdata->pool, dial_to);
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "dial: parsing dialstring channel variables\n");
-		switch_event_create_brackets(dial_to_dup, '{', '}', ',', &originate_vars, (char **)&dial_to, SWITCH_FALSE);
-	}
-
-	/* set originate channel variables */
-	switch_event_add_header_string(originate_vars, SWITCH_STACK_BOTTOM, "origination_uuid", rayo_call_get_uuid(call));
-	switch_event_add_header_string(originate_vars, SWITCH_STACK_BOTTOM, "rayo_dcp_jid", dcp_jid);
-	switch_event_add_header_string(originate_vars, SWITCH_STACK_BOTTOM, "rayo_call_jid", RAYO_JID(call));
-
-	if (!zstr(dial_from)) {
-		char *from_uri = NULL;
-		char *from_display;
-		int scheme = parse_dial_from(dtdata->pool, dial_from, &from_uri, &from_display);
-		if (scheme == RAYO_URI_SCHEME_UNKNOWN) {
-			response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad from URI");
-			goto done;
-		} else if (scheme == RAYO_URI_SCHEME_SIP) {
-			/* SIP URI */
-			if (!zstr(from_uri)) {
-				switch_event_add_header_string(originate_vars, SWITCH_STACK_BOTTOM, "sip_from_uri", from_uri);
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "dial: sip_from_uri=%s\n", from_uri);
-			}
-			if (!zstr(from_display)) {
-				switch_event_add_header_string(originate_vars, SWITCH_STACK_BOTTOM, "sip_from_display", from_display);
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "dial: sip_from_display=%s\n", from_display);
-			}
-		}
-		if (!zstr(from_uri)) {
-			switch_event_add_header_string(originate_vars, SWITCH_STACK_BOTTOM, "origination_caller_id_number", from_uri);
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "dial: origination_caller_id_number=%s\n", from_uri);
-		}
-		if (!zstr(from_display)) {
-			switch_event_add_header_string(originate_vars, SWITCH_STACK_BOTTOM, "origination_caller_id_name", from_display);
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "dial: origination_caller_id_name=%s\n", from_display);
-		} else if (scheme == RAYO_URI_SCHEME_TEL && !zstr(from_uri)) {
-			/* set caller ID name to same as number if telephone number and a name wasn't specified */
-			switch_event_add_header_string(originate_vars, SWITCH_STACK_BOTTOM, "origination_caller_id_name", from_uri);
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "dial: origination_caller_id_name=%s\n", from_uri);
-		}
-	}
-	if (!zstr(dial_timeout_ms) && switch_is_number(dial_timeout_ms)) {
-		dial_timeout_sec = round((double)atoi(dial_timeout_ms) / 1000.0);
-	}
-
-	/* set outbound signaling headers - only works on SIP */
-	{
-		iks *header = NULL;
-		for (header = iks_find(dial, "header"); header; header = iks_next_tag(header)) {
-			if (!strcmp("header", iks_name(header))) {
-				const char *name = iks_find_attrib_soft(header, "name");
-				const char *value = iks_find_attrib_soft(header, "value");
-				if (!zstr(name) && !zstr(value)) {
-					char *header_name = switch_core_sprintf(dtdata->pool, "%s%s", RAYO_SIP_REQUEST_HEADER, name);
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "dial: Adding SIP header: %s: %s\n", name, value);
-					switch_event_add_header_string(originate_vars, SWITCH_STACK_BOTTOM, header_name, value);
-				}
-			}
-		}
-	}
-
-	/* build dialstring and dial call */
-	gateway = dial_gateway_find(dial_to);
-	if (gateway) {
-		iks *join = iks_find(dial, "join");
-		const char *dial_to_stripped = dial_to + gateway->strip;
-		switch_core_session_t *called_session = NULL;
-		switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
-		const char *dialstring = NULL;
-
-		if (join) {
-			/* check join args */
-			const char *call_uri = iks_find_attrib(join, "call-uri");
-			const char *mixer_name = iks_find_attrib(join, "mixer-name");
-
-			if (!zstr(call_uri) && !zstr(mixer_name)) {
-				/* can't join both */
-				response = iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-				goto done;
-			} else if (zstr(call_uri) && zstr(mixer_name)) {
-				/* nobody to join to? */
-				response = iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-				goto done;
-			} else if (!zstr(call_uri)) {
-				/* bridge */
-				struct rayo_call *peer_call = RAYO_CALL_LOCATE(call_uri);
-				/* is peer call available? */
-				if (!peer_call) {
-					response = iks_new_error_detailed(iq, STANZA_ERROR_SERVICE_UNAVAILABLE, "peer call not found");
-					goto done;
-				} else if (peer_call->joined) {
-					response = iks_new_error_detailed(iq, STANZA_ERROR_SERVICE_UNAVAILABLE, "peer call already joined");
-					RAYO_RELEASE(peer_call);
-					goto done;
-				}
-				switch_event_add_header(originate_vars, SWITCH_STACK_BOTTOM, "rayo_origination_args", "bridge %s", rayo_call_get_uuid(peer_call));
-				RAYO_RELEASE(peer_call);
-			} else {
-				/* conference */
-				switch_event_add_header(originate_vars, SWITCH_STACK_BOTTOM, "rayo_origination_args", "conference %s@%s", mixer_name, globals.mixer_conf_profile);
-			}
-		}
-
-		dialstring = switch_core_sprintf(dtdata->pool, "%s%s", gateway->dial_prefix, dial_to_stripped);
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "dial: Using dialstring: %s\n", dialstring);
-
-		/* <iq><ref> response will be sent when originate event is received- otherwise error is returned */
-		if (switch_ivr_originate(NULL, &called_session, &cause, dialstring, dial_timeout_sec, NULL, NULL, NULL, NULL, originate_vars, SOF_NONE, NULL, NULL) == SWITCH_STATUS_SUCCESS && called_session) {
-			/* start APP */
-			switch_caller_extension_t *extension = NULL;
-			switch_channel_t *called_channel = switch_core_session_get_channel(called_session);
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "dial: Call originated\n");
-			if ((extension = switch_caller_extension_new(called_session, "rayo", NULL)) == 0) {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_CRIT, "Memory Error!\n");
-				abort();
-			}
-			switch_caller_extension_add_application(called_session, extension, "rayo", NULL);
-			switch_channel_set_caller_extension(called_channel, extension);
-			switch_channel_set_state(called_channel, CS_EXECUTE);
-			switch_core_session_rwunlock(called_session);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "dial: Failed to originate call: %s\n", switch_channel_cause2str(cause));
-			switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-			if (!zstr(call->dial_request_id)) {
-				call->dial_request_failed = 1;
-				call->dial_request_id = NULL;
-
-				/* map failure reason to iq error */
-				switch (cause) {
-					case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER:
-						/* out of sessions, typically */
-						response = iks_new_error_detailed(iq, STANZA_ERROR_RESOURCE_CONSTRAINT, "DESTINATION_OUT_OF_ORDER");
-						break;
-					case SWITCH_CAUSE_SUBSCRIBER_ABSENT:
-					case SWITCH_CAUSE_USER_NOT_REGISTERED: {
-						/* call session was never created, so we must fake it so that a call error is sent and
-						   not a dial error */
-						/* send ref response to DCP immediately followed with failure */
-						iks *ref;
-						iks *ref_response = iks_new("iq");
-						iks_insert_attrib(ref_response, "from", RAYO_JID(globals.server));
-						iks_insert_attrib(ref_response, "to", dcp_jid);
-						iks_insert_attrib(ref_response, "id", iks_find_attrib_soft(iq, "id"));
-						iks_insert_attrib(ref_response, "type", "result");
-						ref = iks_insert(ref_response, "ref");
-						iks_insert_attrib(ref, "xmlns", RAYO_NS);
-						iks_insert_attrib_printf(ref, "uri", "xmpp:%s", RAYO_JID(call));
-						RAYO_SEND_MESSAGE(globals.server, dcp_jid, ref_response);
-
-						/* send subscriber-absent call hangup reason */
-						rayo_call_send_end(call, NULL, 0, "SUBSCRIBER_ABSENT", "20");
-
-						/* destroy call */
-						RAYO_DESTROY(call);
-						RAYO_RELEASE(call);
-						break;
-					}
-					case SWITCH_CAUSE_EXCHANGE_ROUTING_ERROR:
-						/* max forwards */
-						response = iks_new_error_detailed(iq, STANZA_ERROR_RESOURCE_CONSTRAINT, "EXCHANGE_ROUTING_ERROR");
-						break;
-					case SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED:
-						/* unsupported endpoint type */
-						response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "CHAN_NOT_IMPLEMENTED");
-						break;
-					case SWITCH_CAUSE_INVALID_URL:
-						response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "INVALID_URL");
-						break;
-					case SWITCH_CAUSE_INVALID_GATEWAY:
-						response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "INVALID_GATEWAY");
-						break;
-					case SWITCH_CAUSE_INVALID_PROFILE:
-						response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "INVALID_PROFILE");
-						break;
-					case SWITCH_CAUSE_SYSTEM_SHUTDOWN:
-						response = iks_new_error_detailed(iq, STANZA_ERROR_RESOURCE_CONSTRAINT, "SYSTEM_SHUTDOWN");
-						break;
-					case SWITCH_CAUSE_GATEWAY_DOWN:
-						response = iks_new_error_detailed(iq, STANZA_ERROR_RESOURCE_CONSTRAINT, "GATEWAY_DOWN");
-						break;
-					case SWITCH_CAUSE_INVALID_NUMBER_FORMAT:
-						response = iks_new_error_detailed(iq, STANZA_ERROR_RESOURCE_CONSTRAINT, "INVALID_NUMBER_FORMAT");
-						break;
-					default:
-						response = iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, switch_channel_cause2str(cause));
-						break;
-				}
-			}
-			switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-		}
-	} else {
-		/* will only happen if misconfigured */
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_CRIT, "dial: No dial gateway found for %s!\n", dial_to);
-		call->dial_request_failed = 1;
-		call->dial_request_id = NULL;
-		response = iks_new_error_detailed_printf(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "dial: No dial gateway found for %s!\n", dial_to);
-		goto done;
-	}
-
-done:
-
-	/* response when error */
-	if (response) {
-		/* send response to client */
-		RAYO_SEND_REPLY(globals.server, iks_find_attrib(response, "to"), response);
-
-		/* destroy call */
-		if (call) {
-			RAYO_DESTROY(call);
-			RAYO_RELEASE(call);
-		}
-	}
-
-	iks_delete(iq);
-
-	if (originate_vars) {
-		switch_event_destroy(&originate_vars);
-	}
-
-	{
-		switch_memory_pool_t *pool = dtdata->pool;
-		switch_core_destroy_memory_pool(&pool);
-	}
-
-	return NULL;
-}
-
-/**
- * Dial a new call
- * @param server handling the call
- * @param msg the request
- */
-static iks *on_rayo_dial(struct rayo_actor *server, struct rayo_message *msg, void *data)
-{
-	iks *node = msg->payload;
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	iks *dial = iks_find(node, "dial");
-	iks *response = NULL;
-	const char *dial_to = iks_find_attrib(dial, "to");
-
-	if (zstr(dial_to)) {
-		response = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "missing dial to attribute");
-	} else if (strchr(dial_to, ' ')) {
-		response = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "malformed dial string");
-	} else {
-		switch_memory_pool_t *pool;
-		struct dial_thread_data *dtdata = NULL;
-		switch_core_new_memory_pool(&pool);
-		dtdata = switch_core_alloc(pool, sizeof(*dtdata));
-		dtdata->pool = pool;
-		dtdata->node = iks_copy(node);
-
-		iks_insert_attrib(dtdata->node, "from", msg->from_jid); /* save DCP jid in case it isn't specified */
-
-		/* start dial thread */
-		switch_threadattr_create(&thd_attr, pool);
-		switch_threadattr_detach_set(thd_attr, 1);
-		switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-		switch_thread_create(&thread, thd_attr, rayo_dial_thread, dtdata, pool);
-	}
-
-	return response;
-}
-
-struct exec_thread_data {
-	switch_memory_pool_t *pool;
-	iks *node;
-};
-
-/**
- * Thread that handles executing server APIs
- * @param thread this thread
- * @param user the API request
- * @return NULL
- */
-static void *SWITCH_THREAD_FUNC rayo_exec_thread(switch_thread_t *thread, void *user)
-{
-	struct exec_thread_data *etdata = (struct exec_thread_data *)user;
-	iks *response = NULL;
-	iks *exec = iks_find(etdata->node, "exec");
-	const char *api = iks_find_attrib(exec, "api");
-	const char *args = iks_find_attrib_soft(exec, "args");
-	switch_stream_handle_t stream = { 0 };
-	SWITCH_STANDARD_STREAM(stream);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BGAPI EXEC: %s %s\n", api, args);
-	if (switch_api_execute(api, args, NULL, &stream) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BGAPI EXEC FAILURE\n");
-		response = iks_new_error_detailed(etdata->node, STANZA_ERROR_BAD_REQUEST, "Failed to execute API");
-	} else {
-		iks *api_result = NULL;
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BGAPI EXEC RESULT: %s\n", (char *)stream.data);
-		response = iks_new_iq_result(etdata->node);
-		api_result = iks_insert(response, "response");
-		iks_insert_attrib(api_result, "xmlns", RAYO_NS);
-		iks_insert_attrib(api_result, "response", zstr((char *)stream.data) ? "" : (char *)stream.data);
-	}
-
-	RAYO_SEND_REPLY(globals.server, iks_find_attrib(response, "to"), response);
-
-	switch_safe_free(stream.data);
-	{
-		switch_memory_pool_t *pool = etdata->pool;
-		switch_core_destroy_memory_pool(&pool);
-	}
-	return NULL;
-}
-
-/**
- * Execute an API on the server
- * @param server handling the call
- * @param msg the request
- */
-static iks *on_rayo_exec(struct rayo_actor *server, struct rayo_message *msg, void *data)
-{
-	iks *node = msg->payload;
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	iks *exec = iks_find(node, "exec");
-	iks *response = NULL;
-	const char *api = iks_find_attrib_soft(exec, "api");
-
-	if (zstr(api)) {
-		response = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "missing <exec> api attribute");
-	} else {
-		struct exec_thread_data *etdata = NULL;
-		switch_memory_pool_t *pool = NULL;
-		switch_core_new_memory_pool(&pool);
-		etdata = switch_core_alloc(pool, sizeof(*etdata));
-		etdata->pool = pool;
-		etdata->node = iks_copy(node);
-
-		/* start exec thread */
-		switch_threadattr_create(&thd_attr, pool);
-		switch_threadattr_detach_set(thd_attr, 1);
-		switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-		switch_thread_create(&thread, thd_attr, rayo_exec_thread, etdata, pool);
-	}
-	return response;
-}
-
-/**
- * Handle <iq><ping> request
- * @param rclient the Rayo client
- * @param server the Rayo server
- * @param node the <iq> node
- * @return NULL
- */
-static iks *on_iq_xmpp_ping(struct rayo_actor *server, struct rayo_message *msg, void *data)
-{
-	iks *node = msg->payload;
-	iks *pong = iks_new("iq");
-	char *from = iks_find_attrib(node, "from");
-	char *to = iks_find_attrib(node, "to");
-
-	if (zstr(from)) {
-		from = msg->from_jid;
-	}
-
-	if (zstr(to)) {
-		to = RAYO_JID(server);
-	}
-
-	iks_insert_attrib(pong, "type", "result");
-	iks_insert_attrib(pong, "from", to);
-	iks_insert_attrib(pong, "to", from);
-	iks_insert_attrib(pong, "id", iks_find_attrib(node, "id"));
-
-	return pong;
-}
-
-/**
- * Handle service discovery request
- * @param rclient the Rayo client
- * @param server the Rayo server
- * @param node the <iq> node
- * @return NULL
- */
-static iks *on_iq_get_xmpp_disco(struct rayo_actor *server, struct rayo_message *msg, void *data)
-{
-	iks *node = msg->payload;
-	iks *response = NULL;
-	iks *x;
-	iks *feature;
-	iks *identity;
-	int i = 0;
-	const char *feature_string;
-	response = iks_new_iq_result(node);
-	x = iks_insert(response, "query");
-	iks_insert_attrib(x, "xmlns", IKS_NS_XMPP_DISCO);
-	identity = iks_insert(x, "identity");
-	iks_insert_attrib(identity, "category", rayo_server_identity.category);
-	iks_insert_attrib(identity, "type", rayo_server_identity.type);
-	i = 0;
-	while((feature_string = rayo_server_features[i++])) {
-		feature = iks_insert(x, "feature");
-		iks_insert_attrib(feature, "var", feature_string);
-	}
-
-	/* TODO The response MUST also include features for the application formats and transport methods supported by
-	 * the responding entity, as described in the relevant specifications.
-	 */
-
-	return response;
-}
-
-/**
- * Handle message from client
- * @param rclient that sent the command
- * @param message the message
- */
-static void on_client_message(struct rayo_client *rclient, iks *message)
-{
-	const char *to = iks_find_attrib(message, "to");
-
-	/* must be directed to a client */
-	if (zstr(to)) {
-		return;
-	}
-
-	/* assume client source */
-	if (zstr(iks_find_attrib(message, "from"))) {
-		iks_insert_attrib(message, "from", RAYO_JID(rclient));
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, recv message, availability = %s\n", RAYO_JID(rclient), presence_status_to_string(rclient->availability));
-
-	RAYO_SEND_MESSAGE_DUP(rclient, to, message);
-}
-
-/**
- * Handle <presence> message from a client
- * @param rclient the client
- * @param node the presence message
- */
-static void on_client_presence(struct rayo_client *rclient, iks *node)
-{
-	char *type = iks_find_attrib(node, "type");
-	enum presence_status status = PS_UNKNOWN;
-
-	/*
-	   From RFC-6121:
-	   Entity is available when <presence/> received.
-	   Entity is unavailable when <presence type='unavailable'/> is received.
-
-	   From Rayo-XEP:
-	   Entity is available when <presence to='foo' from='bar'><show>chat</show></presence> is received.
-	   Entity is unavailable when <presence to='foo' from='bar'><show>dnd</show></presence> is received.
-	*/
-
-	/* figure out if online/offline */
-	if (zstr(type)) {
-		/* <presence><show>chat</show></presence> */
-		char *status_str = iks_find_cdata(node, "show");
-		if (!zstr(status_str)) {
-			if (!strcmp("chat", status_str)) {
-				status = PS_ONLINE;
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s got chat presence\n", RAYO_JID(rclient));
-			} else if (!strcmp("dnd", status_str)) {
-				status = PS_OFFLINE;
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s got dnd presence\n", RAYO_JID(rclient));
-			}
-		} else {
-			/* <presence/> */
-			status = PS_ONLINE;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s got empty presence\n", RAYO_JID(rclient));
-		}
-	} else if (!strcmp("unavailable", type)) {
-		status = PS_OFFLINE;
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s got unavailable presence\n", RAYO_JID(rclient));
-	} else if (!strcmp("error", type)) {
-		/* TODO presence error */
-	} else if (!strcmp("probe", type)) {
-		/* TODO presence probe */
-	} else if (!strcmp("subscribe", type)) {
-		/* TODO presence subscribe */
-	} else if (!strcmp("subscribed", type)) {
-		/* TODO presence subscribed */
-	} else if (!strcmp("unsubscribe", type)) {
-		/* TODO presence unsubscribe */
-	} else if (!strcmp("unsubscribed", type)) {
-		/* TODO presence unsubscribed */
-	}
-
-	if (status == PS_ONLINE && rclient->availability != PS_ONLINE) {
-		rclient->availability = PS_ONLINE;
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s is ONLINE\n", RAYO_JID(rclient));
-	} else if (status == PS_OFFLINE && rclient->availability != PS_OFFLINE) {
-		rclient->availability = PS_OFFLINE;
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s is OFFLINE\n", RAYO_JID(rclient));
-	}
-
-	/* destroy if not a local client (connected via peer_server) and is OFFLINE */
-	if (rclient->peer_server && rclient->availability == PS_OFFLINE) {
-		RAYO_DESTROY(rclient);
-		RAYO_RELEASE(rclient);
-	}
-
-	pause_when_offline();
-}
-
-/**
- * Handle command from client
- * @param rclient that sent the command
- * @param iq the command
- */
-static void rayo_client_command_recv(struct rayo_client *rclient, iks *iq)
-{
-	iks *command = iks_first_tag(iq);
-	const char *to = iks_find_attrib(iq, "to");
-
-	/* assume server destination */
-	if (zstr(to)) {
-		to = RAYO_JID(globals.server);
-		iks_insert_attrib(iq, "to", to);
-	}
-
-	/* assume client source */
-	if (zstr(iks_find_attrib(iq, "from"))) {
-		iks_insert_attrib(iq, "from", RAYO_JID(rclient));
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, recv iq, availability = %s\n", RAYO_JID(rclient), presence_status_to_string(rclient->availability));
-
-	if (command) {
-		RAYO_SEND_MESSAGE_DUP(rclient, to, iq);
-	} else {
-		const char *type = iks_find_attrib_soft(iq, "type");
-		if (strcmp("error", type) && strcmp("result", type)) {
-			RAYO_SEND_REPLY(globals.server, RAYO_JID(rclient), iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "empty IQ request"));
-		}
-	}
-}
-
-/**
- * Send event to mixer subscribers
- * @param mixer the mixer
- * @param rayo_event the event to send
- */
-static void broadcast_mixer_event(struct rayo_mixer *mixer, iks *rayo_event)
-{
-	switch_hash_index_t *hi = NULL;
-	switch_mutex_lock(RAYO_ACTOR(mixer)->mutex);
-	for (hi = switch_core_hash_first(mixer->subscribers); hi; hi = switch_core_hash_next(&hi)) {
-		const void *key;
-		void *val;
-		struct rayo_mixer_subscriber *subscriber;
-		switch_core_hash_this(hi, &key, NULL, &val);
-		subscriber = (struct rayo_mixer_subscriber *)val;
-		switch_assert(subscriber);
-		iks_insert_attrib(rayo_event, "to", subscriber->jid);
-		RAYO_SEND_MESSAGE_DUP(mixer, subscriber->jid, rayo_event);
-	}
-	switch_mutex_unlock(RAYO_ACTOR(mixer)->mutex);
-}
-
-/**
- * Handle mixer delete member event
- */
-static void on_mixer_delete_member_event(struct rayo_mixer *mixer, switch_event_t *event)
-{
-	iks *delete_member_event, *x;
-	const char *uuid = switch_event_get_header(event, "Unique-ID");
-	struct rayo_call *call;
-	struct rayo_mixer_member *member;
-	struct rayo_mixer_subscriber *subscriber;
-
-	/* not a rayo mixer */
-	if (!mixer) {
-		return;
-	}
-
-	/* remove member from mixer */
-	switch_mutex_lock(RAYO_ACTOR(mixer)->mutex);
-	member = (struct rayo_mixer_member *)switch_core_hash_find(mixer->members, uuid);
-	if (!member) {
-		/* not a member */
-		switch_mutex_unlock(RAYO_ACTOR(mixer)->mutex);
-		return;
-	}
-	switch_core_hash_delete(mixer->members, uuid);
-	switch_mutex_unlock(RAYO_ACTOR(mixer)->mutex);
-
-	/* flag call as available to join another mixer */
-	call = RAYO_CALL_LOCATE_BY_ID(uuid);
-	if (call) {
-		switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-		call->joined = 0;
-		call->joined_id = NULL;
-		switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-		RAYO_RELEASE(call);
-	}
-
-	/* send mixer unjoined event to member DCP */
-	delete_member_event = iks_new_presence("unjoined", RAYO_NS, member->jid, member->dcp_jid);
-	x = iks_find(delete_member_event, "unjoined");
-	iks_insert_attrib(x, "mixer-name", rayo_mixer_get_name(mixer));
-	RAYO_SEND_MESSAGE(mixer, member->dcp_jid, delete_member_event);
-
-	/* broadcast member unjoined event to subscribers */
-	delete_member_event = iks_new_presence("unjoined", RAYO_NS, RAYO_JID(mixer), "");
-	x = iks_find(delete_member_event, "unjoined");
-	iks_insert_attrib_printf(x, "call-uri", "xmpp:%s@%s", uuid, RAYO_JID(globals.server));
-	broadcast_mixer_event(mixer, delete_member_event);
-	iks_delete(delete_member_event);
-
-	/* remove member DCP as subscriber to mixer */
-	switch_mutex_lock(RAYO_ACTOR(mixer)->mutex);
-	subscriber = (struct rayo_mixer_subscriber *)switch_core_hash_find(mixer->subscribers, member->dcp_jid);
-	if (subscriber) {
-		subscriber->ref_count--;
-		if (subscriber->ref_count <= 0) {
-			switch_core_hash_delete(mixer->subscribers, member->dcp_jid);
-		}
-	}
-	switch_mutex_unlock(RAYO_ACTOR(mixer)->mutex);
-}
-
-/**
- * Handle mixer destroy event
- */
-static void on_mixer_destroy_event(struct rayo_mixer *mixer, switch_event_t *event)
-{
-	if (mixer) {
-		iks *presence;
-
-		/* notify online clients of mixer destruction */
-		presence = iks_new("presence");
-		iks_insert_attrib(presence, "from", RAYO_JID(mixer));
-		iks_insert_attrib(presence, "type", "unavailable");
-		broadcast_event(RAYO_ACTOR(mixer), presence, 1);
-		iks_delete(presence);
-
-		/* remove from hash and destroy */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, destroying mixer: %s\n", RAYO_JID(mixer), rayo_mixer_get_name(mixer));
-		RAYO_RELEASE(mixer); /* release original lock */
-		RAYO_DESTROY(mixer);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "destroy: NULL mixer\n");
-	}
-}
-
-/**
- * Handle mixer add member event
- */
-static void on_mixer_add_member_event(struct rayo_mixer *mixer, switch_event_t *event)
-{
-	iks *add_member_event = NULL, *x;
-	const char *uuid = switch_event_get_header(event, "Unique-ID");
-	struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(uuid);
-	struct rayo_mixer *lmixer = NULL;
-
-	if (!mixer) {
-		char *ver;
-		iks *presence, *c;
-
-		/* new mixer */
-		const char *mixer_name = switch_event_get_header(event, "Conference-Name");
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "creating mixer: %s\n", mixer_name);
-		mixer = rayo_mixer_create(mixer_name);
-		if (mixer) {
-			/* notify online clients of mixer presence */
-			ver = calculate_entity_sha1_ver(&rayo_mixer_identity, rayo_mixer_features);
-
-			presence = iks_new_presence("c", IKS_NS_XMPP_ENTITY_CAPABILITIES, RAYO_JID(mixer), "");
-			c = iks_find(presence, "c");
-			iks_insert_attrib(c, "hash", "sha-1");
-			iks_insert_attrib(c, "node", RAYO_MIXER_NS);
-			iks_insert_attrib(c, "ver", ver);
-			free(ver);
-
-			broadcast_event(RAYO_ACTOR(mixer), presence, 1);
-		} else {
-			/* must have lost the race to another add member event...  there should be a mixer with mixer_name already */
-			mixer = lmixer = RAYO_MIXER_LOCATE(mixer_name);
-			if (!mixer) {
-				/* this is unexpected */
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "failed to find mixer: %s\n", mixer_name);
-				return;
-			}
-		}
-	}
-
-	if (call) {
-		struct rayo_mixer_member *member = NULL;
-		/* add member DCP as subscriber to mixer */
-		struct rayo_mixer_subscriber *subscriber;
-		switch_mutex_lock(RAYO_ACTOR(mixer)->mutex);
-		subscriber = (struct rayo_mixer_subscriber *)switch_core_hash_find(mixer->subscribers, call->dcp_jid);
-		if (!subscriber) {
-			subscriber = switch_core_alloc(RAYO_POOL(mixer), sizeof(*subscriber));
-			subscriber->ref_count = 0;
-			subscriber->jid = switch_core_strdup(RAYO_POOL(mixer), call->dcp_jid);
-			switch_core_hash_insert(mixer->subscribers, call->dcp_jid, subscriber);
-		}
-		subscriber->ref_count++;
-
-		/* add call as member of mixer */
-		member = switch_core_alloc(RAYO_POOL(mixer), sizeof(*member));
-		member->jid = switch_core_strdup(RAYO_POOL(mixer), RAYO_JID(call));
-		member->dcp_jid = subscriber->jid;
-		switch_core_hash_insert(mixer->members, uuid, member);
-
-		switch_mutex_unlock(RAYO_ACTOR(mixer)->mutex);
-
-		switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-		call->joined = JOINED_MIXER;
-		call->joined_id = switch_core_strdup(RAYO_POOL(call), rayo_mixer_get_name(mixer));
-
-		/* send IQ result to client now. */
-		if (call->pending_join_request) {
-			iks *request = call->pending_join_request;
-			iks *result = iks_new_iq_result(request);
-			iks *ref = iks_insert(result, "ref");
-			iks_insert_attrib(ref, "xmlns", RAYO_NS);
-			iks_insert_attrib_printf(ref, "uri", "xmpp:%s", RAYO_JID(mixer));
-			call->pending_join_request = NULL;
-			RAYO_SEND_REPLY(call, iks_find_attrib_soft(request, "from"), result);
-			iks_delete(request);
-		}
-		switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-
-		/* send mixer joined event to member DCP */
-		add_member_event = iks_new_presence("joined", RAYO_NS, RAYO_JID(call), call->dcp_jid);
-		x = iks_find(add_member_event, "joined");
-		iks_insert_attrib(x, "mixer-name", rayo_mixer_get_name(mixer));
-		RAYO_SEND_MESSAGE(call, call->dcp_jid, add_member_event);
-
-		RAYO_RELEASE(call);
-	}
-
-	/* broadcast member joined event to subscribers */
-	add_member_event = iks_new_presence("joined", RAYO_NS, RAYO_JID(mixer), "");
-	x = iks_find(add_member_event, "joined");
-	iks_insert_attrib_printf(x, "call-uri", "xmpp:%s@%s", uuid, RAYO_JID(globals.server));
-	broadcast_mixer_event(mixer, add_member_event);
-	iks_delete(add_member_event);
-
-	if (lmixer) {
-		RAYO_RELEASE(lmixer);
-	}
-}
-
-/**
- * Receives mixer events from FreeSWITCH core and routes them to the proper Rayo client(s).
- * @param event received from FreeSWITCH core.  It will be destroyed by the core after this function returns.
- */
-static void route_mixer_event(switch_event_t *event)
-{
-	const char *action = switch_event_get_header(event, "Action");
-	const char *profile = switch_event_get_header(event, "Conference-Profile-Name");
-	const char *mixer_name = switch_event_get_header(event, "Conference-Name");
-	struct rayo_mixer *mixer = NULL;
-
-	if (strcmp(profile, globals.mixer_conf_profile)) {
-		/* don't care about other conferences */
-		goto done;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "looking for mixer: %s\n", mixer_name);
-	mixer = RAYO_MIXER_LOCATE(mixer_name);
-
-	if (!strcmp("add-member", action)) {
-		on_mixer_add_member_event(mixer, event);
-	} else if (!strcmp("conference-destroy", action)) {
-		on_mixer_destroy_event(mixer, event);
-	} else if (!strcmp("del-member", action)) {
-		on_mixer_delete_member_event(mixer, event);
-	}
-	/* TODO speaking events */
-
-done:
-	RAYO_RELEASE(mixer);
-}
-
-/**
- * Handle call originate event - create rayo call and send <iq><ref> to client.
- * @param rclient The Rayo client
- * @param event the originate event
- */
-static void on_call_originate_event(struct rayo_client *rclient, switch_event_t *event)
-{
-	const char *uuid = switch_event_get_header(event, "Unique-ID");
-	struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(uuid);
-
-	if (call) {
-		iks *response, *ref;
-
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(RAYO_ID(call)), SWITCH_LOG_DEBUG, "Got originate event\n");
-
-		switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-		if (!zstr(call->dial_request_id)) {
-			/* send response to DCP */
-			response = iks_new("iq");
-			iks_insert_attrib(response, "from", RAYO_JID(globals.server));
-			iks_insert_attrib(response, "to", rayo_call_get_dcp_jid(call));
-			iks_insert_attrib(response, "id", call->dial_request_id);
-			iks_insert_attrib(response, "type", "result");
-			ref = iks_insert(response, "ref");
-			iks_insert_attrib(ref, "xmlns", RAYO_NS);
-
-			iks_insert_attrib_printf(ref, "uri", "xmpp:%s", RAYO_JID(call));
-			RAYO_SEND_MESSAGE(call, RAYO_JID(rclient), response);
-			call->dial_request_id = NULL;
-		}
-		switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-	}
-	RAYO_RELEASE(call);
-}
-
-/**
- * Handle call end event
- * @param event the hangup event
- */
-static void on_call_end_event(switch_event_t *event)
-{
-	struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(switch_event_get_header(event, "Unique-ID"));
-
-	if (call) {
-#if 0
-		char *event_str;
-		if (switch_event_serialize(event, &event_str, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_DEBUG, "%s\n", event_str);
-			switch_safe_free(event_str);
-		}
-#endif
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(RAYO_ID(call)), SWITCH_LOG_DEBUG, "Got channel destroy event\n");
-
-		switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-		if (zstr(call->dial_request_id) && !call->dial_request_failed) {
-			switch_event_dup(&call->end_event, event);
-			RAYO_DESTROY(call);
-			RAYO_RELEASE(call); /* decrement ref from creation */
-		}
-		switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-		RAYO_RELEASE(call); /* decrement this ref */
-	}
-}
-
-/**
- * Handle call answer event
- * @param rclient the Rayo client
- * @param event the answer event
- */
-static void on_call_answer_event(struct rayo_client *rclient, switch_event_t *event)
-{
-	struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(switch_event_get_header(event, "Unique-ID"));
-	if (call) {
-		switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-		if (call->rayo_app_started) {
-			iks *revent = iks_new_presence("answered", RAYO_NS,
-				switch_event_get_header(event, "variable_rayo_call_jid"),
-				switch_event_get_header(event, "variable_rayo_dcp_jid"));
-			add_headers_to_event(iks_find(revent, "answered"), event, globals.add_variables_to_events);
-			RAYO_SEND_MESSAGE(call, RAYO_JID(rclient), revent);
-		} else if (!call->answer_event) {
-			/* delay sending this event until the rayo APP has started */
-			switch_event_dup(&call->answer_event, event);
-		}
-		switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-		RAYO_RELEASE(call);
-	}
-}
-
-/**
- * Handle call ringing event
- * @param rclient the Rayo client
- * @param event the ringing event
- */
-static void on_call_ringing_event(struct rayo_client *rclient, switch_event_t *event)
-{
-	const char *call_direction = switch_event_get_header(event, "Call-Direction");
-	if (call_direction && !strcmp(call_direction, "outbound")) {
-		struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(switch_event_get_header(event, "Unique-ID"));
-		if (call) {
-			switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-			if (!call->ringing_sent) {
-				iks *revent = iks_new_presence("ringing", RAYO_NS,
-					switch_event_get_header(event, "variable_rayo_call_jid"),
-					switch_event_get_header(event, "variable_rayo_dcp_jid"));
-				add_headers_to_event(iks_find(revent, "ringing"), event, globals.add_variables_to_events);
-				call->ringing_sent = 1;
-				RAYO_SEND_MESSAGE(call, RAYO_JID(rclient), revent);
-			}
-			switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-			RAYO_RELEASE(call);
-		}
-	}
-}
-
-/**
- * Handle call bridge event
- * @param rclient the Rayo client
- * @param event the bridge event
- */
-static void on_call_bridge_event(struct rayo_client *rclient, switch_event_t *event)
-{
-	const char *a_uuid = switch_event_get_header(event, "Unique-ID");
-	const char *b_uuid = switch_event_get_header(event, "Bridge-B-Unique-ID");
-	struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(a_uuid);
-	struct rayo_call *b_call;
-
-	if (call) {
-		iks *revent;
-		iks *joined;
-
-		call->joined = JOINED_CALL;
-		call->joined_id = switch_core_sprintf(RAYO_POOL(call), "xmpp:%s@%s", b_uuid, RAYO_JID(globals.server));
-
-		/* send IQ result to client now. */
-		if (call->pending_join_request) {
-			iks *request = call->pending_join_request;
-			iks *result = iks_new_iq_result(request);
-			call->pending_join_request = NULL;
-			RAYO_SEND_REPLY(call, iks_find_attrib_soft(request, "from"), result);
-			iks_delete(request);
-		}
-
-		b_call = RAYO_CALL_LOCATE_BY_ID(b_uuid);
-		if (b_call) {
-			b_call->joined = JOINED_CALL;
-			b_call->joined_id = switch_core_sprintf(RAYO_POOL(b_call), "xmpp:%s@%s", a_uuid, RAYO_JID(globals.server));
-
-			/* send IQ result to client now. */
-			if (b_call->pending_join_request) {
-				iks *request = b_call->pending_join_request;
-				iks *result = iks_new_iq_result(request);
-				b_call->pending_join_request = NULL;
-				RAYO_SEND_REPLY(call, iks_find_attrib_soft(request, "from"), result);
-				iks_delete(request);
-			}
-
-			/* send B-leg event */
-			revent = iks_new_presence("joined", RAYO_NS, RAYO_JID(b_call), rayo_call_get_dcp_jid(b_call));
-			joined = iks_find(revent, "joined");
-			iks_insert_attrib_printf(joined, "call-uri", "%s", b_call->joined_id);
-
-			RAYO_SEND_MESSAGE(b_call, rayo_call_get_dcp_jid(b_call), revent);
-			RAYO_RELEASE(b_call);
-		}
-
-		/* send A-leg event */
-		revent = iks_new_presence("joined", RAYO_NS,
-			switch_event_get_header(event, "variable_rayo_call_jid"),
-			switch_event_get_header(event, "variable_rayo_dcp_jid"));
-		joined = iks_find(revent, "joined");
-		iks_insert_attrib_printf(joined, "call-uri", "%s", call->joined_id);
-
-		RAYO_SEND_MESSAGE(call, RAYO_JID(rclient), revent);
-
-		RAYO_RELEASE(call);
-	}
-}
-
-/**
- * Handle call park event - this is fired after unjoining a call
- * @param rclient the Rayo client
- * @param event the unbridge event
- */
-static void on_call_park_event(struct rayo_client *rclient, switch_event_t *event)
-{
-	const char *a_uuid = switch_event_get_header(event, "Unique-ID");
-	struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(a_uuid);
-
-	if (call) {
-		if (call->joined) {
-			iks *revent;
-			iks *unjoined;
-			const char *joined_id = call->joined_id;
-
-			call->joined = 0;
-			call->joined_id = NULL;
-
-			/* send IQ result to client now. */
-			if (call->pending_join_request) {
-				iks *request = call->pending_join_request;
-				iks *result = iks_new_iq_result(request);
-				call->pending_join_request = NULL;
-				RAYO_SEND_REPLY(call, iks_find_attrib_soft(request, "from"), result);
-				iks_delete(request);
-			}
-
-			/* send A-leg event */
-			revent = iks_new_presence("unjoined", RAYO_NS,
-				switch_event_get_header(event, "variable_rayo_call_jid"),
-				switch_event_get_header(event, "variable_rayo_dcp_jid"));
-			unjoined = iks_find(revent, "unjoined");
-			iks_insert_attrib_printf(unjoined, "call-uri", "%s", joined_id);
-			RAYO_SEND_MESSAGE(call, RAYO_JID(rclient), revent);
-		}
-		RAYO_RELEASE(call);
-	}
-}
-
-/**
- * Handle call execute application event
- * @param rclient the Rayo client
- * @param event the execute event
- */
-static void on_call_execute_event(struct rayo_client *rclient, switch_event_t *event)
-{
-	struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(switch_event_get_header(event, "Unique-ID"));
-	if (call) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(RAYO_ID(call)), SWITCH_LOG_DEBUG, "Application %s execute\n", switch_event_get_header(event, "Application"));
-		RAYO_RELEASE(call);
-	}
-}
-
-/**
- * Handle call execute application complete event
- * @param rclient the Rayo client
- * @param event the execute complete event
- */
-static void on_call_execute_complete_event(struct rayo_client *rclient, switch_event_t *event)
-{
-	struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(switch_event_get_header(event, "Unique-ID"));
-	if (call) {
-		const char *app = switch_event_get_header(event, "Application");
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(RAYO_ID(call)), SWITCH_LOG_DEBUG, "Application %s execute complete: %s \n",
-			app,
-			switch_event_get_header(event, "Application-Response"));
-		RAYO_RELEASE(call);
-	}
-}
-
-/**
- * Handle events to deliver to client connection
- * @param rclient the Rayo client connection to receive the event
- * @param event the event.
- */
-static void rayo_client_handle_event(struct rayo_client *rclient, switch_event_t *event)
-{
-	if (event) {
-		switch (event->event_id) {
-		case SWITCH_EVENT_CHANNEL_ORIGINATE:
-			on_call_originate_event(rclient, event);
-			break;
-		case SWITCH_EVENT_CHANNEL_PROGRESS:
-		case SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA:
-			on_call_ringing_event(rclient, event);
-			break;
-		case SWITCH_EVENT_CHANNEL_ANSWER:
-			on_call_answer_event(rclient, event);
-			break;
-		case SWITCH_EVENT_CHANNEL_BRIDGE:
-			on_call_bridge_event(rclient, event);
-			break;
-		case SWITCH_EVENT_CHANNEL_PARK:
-			on_call_park_event(rclient, event);
-			break;
-		case SWITCH_EVENT_CHANNEL_EXECUTE:
-			on_call_execute_event(rclient, event);
-			break;
-		case SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE:
-			on_call_execute_complete_event(rclient, event);
-			break;
-		default:
-			/* don't care */
-			break;
-		}
-	}
-}
-
-/**
- * Receives events from FreeSWITCH core and routes them to the proper Rayo client.
- * @param event received from FreeSWITCH core.  It will be destroyed by the core after this function returns.
- */
-static void route_call_event(switch_event_t *event)
-{
-	char *uuid = switch_event_get_header(event, "unique-id");
-	char *dcp_jid = switch_event_get_header(event, "variable_rayo_dcp_jid");
-	char *event_subclass = switch_event_get_header(event, "Event-Subclass");
-
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "got event %s %s\n", switch_event_name(event->event_id), zstr(event_subclass) ? "" : event_subclass);
-
-	/* this event is for a rayo client */
-	if (!zstr(dcp_jid)) {
-		struct rayo_actor *actor;
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "%s rayo event %s\n", dcp_jid, switch_event_name(event->event_id));
-
-		actor = RAYO_LOCATE(dcp_jid);
-		if (actor && !strcmp(RAT_CLIENT, actor->type)) {
-			/* route to client */
-			rayo_client_handle_event(RAYO_CLIENT(actor), event);
-		} else {
-			/* TODO orphaned call... maybe allow events to queue so they can be delivered on reconnect? */
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Orphaned call event %s to %s\n", switch_event_name(event->event_id), dcp_jid);
-		}
-		RAYO_RELEASE(actor);
-	}
-}
-
-/**
- * Create server.
- * @param domain the domain name
- * @return the domain
- */
-static struct rayo_actor *rayo_server_create(const char *domain)
-{
-	switch_memory_pool_t *pool;
-	struct rayo_actor *new_server = NULL;
-
-	switch_core_new_memory_pool(&pool);
-	new_server = switch_core_alloc(pool, sizeof(*new_server));
-	RAYO_ACTOR_INIT(RAYO_ACTOR(new_server), pool, RAT_SERVER, "", domain, domain, NULL, rayo_server_send);
-
-	return new_server;
-}
-
-/**
- * Create an offer for a call
- * @param call the call
- * @param session the session
- * @return the offer
- */
-static iks *rayo_create_offer(struct rayo_call *call, switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel);
-	iks *presence = iks_new("presence");
-	iks *c = iks_insert(presence, "c");
-	iks *offer = iks_insert(presence, "offer");
-	const char *val;
-	char *ver;
-
-	/* <presence> */
-	iks_insert_attrib(presence, "from", RAYO_JID(call));
-
-	/* <c> */
-	ver = calculate_entity_sha1_ver(&rayo_call_identity, rayo_call_features);
-	iks_insert_attrib(c, "xmlns", IKS_NS_XMPP_ENTITY_CAPABILITIES);
-	iks_insert_attrib(c, "hash", "sha-1");
-	iks_insert_attrib(c, "node", RAYO_CALL_NS);
-	iks_insert_attrib(c, "ver", ver);
-	free(ver);
-
-	/* <offer> */
-	iks_insert_attrib(offer, "xmlns", RAYO_NS);
-	if (globals.offer_uri && (val = switch_channel_get_variable(channel, "sip_from_uri"))) {
-		/* is a SIP call - pass the URI */
-		if (!strchr(val, ':')) {
-			iks_insert_attrib_printf(offer, "from", "sip:%s", val);
-		} else {
-			iks_insert_attrib(offer, "from", val);
-		}
-	} else {
-		/* pass caller ID */
-		iks_insert_attrib(offer, "from", profile->caller_id_number);
-	}
-
-	if (globals.offer_uri && (val = switch_channel_get_variable(channel, "sip_to_uri"))) {
-		/* is a SIP call - pass the URI */
-		if (!strchr(val, ':')) {
-			iks_insert_attrib_printf(offer, "to", "sip:%s", val);
-		} else {
-			iks_insert_attrib(offer, "to", val);
-		}
-	} else {
-		/* pass dialed number */
-		iks_insert_attrib(offer, "to", profile->destination_number);
-	}
-
-	add_header(offer, "from", switch_channel_get_variable(channel, "sip_full_from"));
-	add_header(offer, "to", switch_channel_get_variable(channel, "sip_full_to"));
-	add_header(offer, "via", switch_channel_get_variable(channel, "sip_full_via"));
-	add_channel_headers_to_event(offer, channel, globals.add_variables_to_offer);
-
-	return presence;
-}
-
-/**
- * Monitor rayo call activity - detect idle
- */
-static switch_status_t rayo_call_on_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int i)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	struct rayo_call *call = (struct rayo_call *)switch_channel_get_private(channel, "rayo_call_private");
-	if (call) {
-		switch_time_t now = switch_micro_time_now();
-		switch_time_t idle_start = call->idle_start_time;
-		int idle_duration_ms = (now - idle_start) / 1000;
-		/* detect idle session (rayo-client has stopped controlling call) and terminate call */
-		if (rayo_call_is_joined(call) || rayo_call_is_faxing(call) || RAYO_ACTOR(call)->ref_count > 1) {
-			call->idle_start_time = now;
-		} else if (idle_duration_ms > globals.max_idle_ms) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Ending abandoned call.  idle_duration_ms = %i ms\n", idle_duration_ms);
-			switch_channel_hangup(channel, RAYO_CAUSE_HANGUP);
-		}
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * @param rclient to check
- * @param offer_filters optional list of username or username@server to match with client JID.
- * @param offer_filter_count
- * @return 1 if client is online and optional filter(s) match the client.  0 otherwise.
- */
-static int should_offer_to_client(struct rayo_client *rclient, char **offer_filters, int offer_filter_count)
-{
-	if (rclient->availability != PS_ONLINE) {
-		return 0;
-	}
-
-	if (offer_filter_count == 0) {
-		/* online and no filters to match */
-		return 1;
-	} else {
-		/* check if one of the filters matches the client */
-		int i;
-		const char *client_jid = RAYO_JID(rclient);
-		size_t client_jid_len = strlen(client_jid);
-		for (i = 0; i < offer_filter_count; i++) {
-			char *offer_filter = offer_filters[i];
-			if (!zstr(offer_filter)) {
-				size_t offer_filter_len = strlen(offer_filter);
-				if (strchr(offer_filter, '@')) {
-					if (offer_filter_len <= client_jid_len && !strncmp(offer_filter, client_jid, offer_filter_len)) {
-						/* username + server match */
-						return 1;
-					}
-				} else if (offer_filter_len < client_jid_len && !strncmp(offer_filter, client_jid, offer_filter_len) && client_jid[offer_filter_len] == '@') {
-					/* username match */
-					return 1;
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-/**
- * Offered call information
- */
-struct offered_call_info {
-	/** Call JID */
-	char *call_jid;
-	/** Time this offer expires */
-	switch_time_t offer_time;
-};
-
-/**
- * Deliver offer message to next available client(s)
- */
-static int send_offer_to_clients(struct rayo_call *from_call, switch_core_session_t *session)
-{
-	int i = 0;
-	int selection = 0;
-	int sent = 0;
-	switch_hash_index_t *hi = NULL;
-	iks *offer = NULL;
-
-	if (from_call->num_acps <= 0) {
-		return 0;
-	}
-
-	if (globals.offer_algorithm == OFFER_RANDOM) {
-		/* pick client at (not really) random */
-		selection = rand() % from_call->num_acps;
-	} else if (globals.offer_algorithm == OFFER_FIRST) {
-		/* send to first client */
-		selection = 0;
-	} else {
-		/* send to all clients */
-		selection = -1;
-	}
-
-	for (hi = switch_core_hash_first(from_call->acps); hi; hi = switch_core_hash_next(&hi)) {
-		if (i++ == selection || selection == -1) {
-			const char *to_client_jid = NULL;
-			const void *key;
-			void *val;
-
-			/* get client jid to send to */
-			switch_core_hash_this(hi, &key, NULL, &val);
-			to_client_jid = (const char *)key;
-			switch_assert(to_client_jid);
-
-			/* send offer to client, remembering jid as PCP */
-			if (!offer) {
-				offer = rayo_create_offer(from_call, session);
-			}
-			switch_core_hash_insert(from_call->pcps, to_client_jid, "1");
-			iks_insert_attrib(offer, "to", to_client_jid);
-			RAYO_SEND_MESSAGE_DUP(from_call, to_client_jid, offer);
-
-			sent = 1;
-			from_call->num_acps--;
-
-			if (selection != -1) {
-				break;
-			}
-		}
-	}
-	switch_safe_free(hi);
-
-	if (sent) {
-		/* remove offered client JID(s) from list of available clients */
-		hi = NULL;
-		for (hi = switch_core_hash_first(from_call->pcps); hi; hi = switch_core_hash_next(&hi)) {
-			const char *to_client_jid = NULL;
-			const void *key;
-			void *val;
-
-			/* get client jid that was sent offer */
-			switch_core_hash_this(hi, &key, NULL, &val);
-			to_client_jid = (const char *)key;
-			switch_assert(to_client_jid);
-
-			/* remove client jid from available controlling parties */
-			switch_core_hash_delete(from_call->acps, to_client_jid);
-		}
-		switch_safe_free(hi);
-
-		/* remember when offer was sent for this call to track timeouts */
-		if (globals.offer_timeout_us > 0) {
-			struct offered_call_info *offered_call;
-			switch_zmalloc(offered_call, sizeof(*offered_call));
-			offered_call->offer_time = switch_micro_time_now();
-			offered_call->call_jid = strdup(RAYO_JID(from_call));
-			if (switch_queue_trypush(globals.offer_queue, offered_call) != SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Failed to queue offered call info!  Offer timeout won't work on this call\n");
-				switch_safe_free(offered_call->call_jid);
-				switch_safe_free(offered_call);
-			}
-		}
-	}
-
-	if (offer) {
-		iks_delete(offer);
-	}
-
-	return sent;
-}
-
-/**
- * Thread that monitors for timed out offers
- * @param thread this thread
- * @param obj unused
- * @return NULL
- */
-static void *SWITCH_THREAD_FUNC offer_timeout_thread(switch_thread_t *thread, void *obj)
-{
-	struct offered_call_info *next_offer;
-	switch_thread_rwlock_rdlock(globals.shutdown_rwlock);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New offer timeout thread\n");
-	while (!globals.shutdown) {
-		if (switch_queue_pop(globals.offer_queue, (void *)&next_offer) == SWITCH_STATUS_SUCCESS) {
-			switch_time_t now = switch_micro_time_now();
-			switch_time_t offer_timeout = next_offer->offer_time + globals.offer_timeout_us;
-
-			/* wait for timeout */
-			while (offer_timeout > now && !globals.shutdown) {
-				switch_time_t remain = offer_timeout - now;
-				remain = remain > 500000 ? 500000 : remain;
-				switch_sleep(remain);
-				now = switch_micro_time_now();
-			}
-
-			/* check if offer was accepted - it is accepted if the call has a DCP (definitive controlling party) */
-			if (!globals.shutdown) {
-				struct rayo_call *call = RAYO_CALL_LOCATE(next_offer->call_jid);
-				if (call) {
-					switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-					if (zstr(rayo_call_get_dcp_jid(call))) {
-						switch_core_session_t *session = switch_core_session_locate(rayo_call_get_uuid(call));
-						if (session) {
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, offer timeout\n", RAYO_JID(call));
-							if (!send_offer_to_clients(call, session)) {
-								/* nobody to offer to, end call */
-								switch_channel_t *channel = switch_core_session_get_channel(session);
-								switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, no more clients to offer, ending call\n", RAYO_JID(call));
-								switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE);
-							}
-							switch_core_session_rwunlock(session);
-						}
-					}
-					switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-					RAYO_RELEASE(call);
-				}
-			}
-
-			switch_safe_free(next_offer->call_jid);
-			switch_safe_free(next_offer);
-		}
-	}
-
-	/* clean up queue */
-	while(switch_queue_trypop(globals.offer_queue, (void *)&next_offer) == SWITCH_STATUS_SUCCESS) {
-		switch_safe_free(next_offer->call_jid);
-		switch_safe_free(next_offer);
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Offer timeout thread finished\n");
-	switch_thread_rwlock_unlock(globals.shutdown_rwlock);
-
-	return NULL;
-}
-
-/**
- * Create a new offer timeout thread
- * @param pool to use
- */
-static void start_offer_timeout_thread(switch_memory_pool_t *pool)
-{
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	switch_threadattr_create(&thd_attr, pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&thread, thd_attr, offer_timeout_thread, NULL, pool);
-}
-
-#define RAYO_USAGE "[client username 1,client username n]"
-/**
- * Offer call and park channel
- */
-SWITCH_STANDARD_APP(rayo_app)
-{
-	int ok = 0;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(switch_core_session_get_uuid(session));
-	const char *app = ""; /* optional app to execute */
-	const char *app_args = ""; /* app args */
-
-	/* don't need to keep call reference count incremented in session- call is destroyed after all apps finish */
-	if (call) {
-		RAYO_RELEASE(call);
-	}
-
-	/* is outbound call already under control? */
-	if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-		const char *origination_args = switch_channel_get_variable(channel, "rayo_origination_args");
-		/* check origination args */
-		if (!zstr(origination_args)) {
-			char *argv[2] = { 0 };
-			char *args = switch_core_session_strdup(session, origination_args);
-			int argc = switch_separate_string(args, ' ', argv, sizeof(argv) / sizeof(argv[0]));
-			if (argc) {
-				if (!strcmp("conference", argv[0])) {
-					app = "conference";
-					app_args = argv[1];
-				} else if (!strcmp("bridge", argv[0])) {
-					app = "intercept";
-					app_args = argv[1];
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Invalid rayo args: %s\n", data);
-					goto done;
-				}
-			}
-		}
-		if (!call) {
-			/* this scenario can only happen if a call was originated through a mechanism other than <dial>
-			   and then the rayo APP was executed to offer control */
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Outbound call that wasn't created with <dial>, will try to offer control\n");
-		}
-		ok = 1;
-	}
-
-	if (!call) {
-		/* offer control */
-		switch_hash_index_t *hi = NULL;
-		char *clients_to_offer[16] = { 0 };
-		int clients_to_offer_count = 0;
-
-		call = rayo_call_create(switch_core_session_get_uuid(session));
-		if (!call) {
-			/* nothing that can be done to recover... */
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Failed to create call entity!\n");
-			switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE);
-			return;
-		}
-
-		switch_channel_set_variable(switch_core_session_get_channel(session), "rayo_call_jid", RAYO_JID(call));
-
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Offering call for Rayo 3PCC\n");
-
-		if (!zstr(data)) {
-			char *data_dup = switch_core_session_strdup(session, data);
-			clients_to_offer_count = switch_separate_string(data_dup, ',', clients_to_offer, sizeof(clients_to_offer) / sizeof(clients_to_offer[0]));
-		}
-
-		/* It is now safe for inbound call to be fully controlled by rayo client */
-		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND) {
-			switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-			call->rayo_app_started = 1;
-			switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-		}
-
-		/* Offer call to all (or specified) ONLINE clients */
-		switch_mutex_lock(globals.clients_mutex);
-		for (hi = switch_core_hash_first(globals.clients_roster); hi; hi = switch_core_hash_next(&hi)) {
-			struct rayo_client *rclient;
-			const void *key;
-			void *val;
-			switch_core_hash_this(hi, &key, NULL, &val);
-			rclient = (struct rayo_client *)val;
-			switch_assert(rclient);
-
-			/* find clients available to take calls */
-			if (should_offer_to_client(rclient, clients_to_offer, clients_to_offer_count)) {
-				switch_core_hash_insert(call->acps, RAYO_JID(rclient), "1");
-				call->num_acps++;
-			}
-		}
-		ok = send_offer_to_clients(call, session);
-
-		switch_mutex_unlock(globals.clients_mutex);
-
-		/* nobody to offer to */
-		if (!ok) {
-			pause_when_offline();
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Rejecting rayo call - there are no online rayo clients to offer call to\n");
-			switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE);
-		}
-	}
-
-done:
-
-	if (ok) {
-		switch_channel_set_private(switch_core_session_get_channel(session), "rayo_call_private", call);
-		switch_channel_set_variable(channel, "hangup_after_bridge", "false");
-		switch_channel_set_variable(channel, "transfer_after_bridge", "");
-		switch_channel_set_variable(channel, "park_after_bridge", "true");
-		switch_channel_set_variable(channel, "hold_hangup_xfer_exten", "park:inline:");
-		switch_channel_set_variable(channel, SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE, "-1"); /* required so that output mixing works */
-		switch_core_event_hook_add_read_frame(session, rayo_call_on_read_frame);
-
-		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-			/* At this point, this outbound call might already be under control of a rayo client that is waiting for answer before sending
-			  commands.  The answered event might have been sent before we are ready to execute commands, so we delayed sending
-			  those events if the rayo APP hadn't started yet.  This delay would have only been a few milliseconds.
-			*/
-			switch_mutex_lock(RAYO_ACTOR(call)->mutex);
-			call->rayo_app_started = 1;
-			if (call->answer_event) {
-				struct rayo_client *rclient = RAYO_CLIENT(RAYO_LOCATE(rayo_call_get_dcp_jid(call)));
-				if (rclient) {
-					on_call_answer_event(rclient, call->answer_event);
-					switch_event_destroy(&call->answer_event);
-					RAYO_RELEASE(rclient);
-				}
-			}
-			switch_mutex_unlock(RAYO_ACTOR(call)->mutex);
-
-			/* Outbound calls might have a nested join to another call or conference - do that now */
-			if (!zstr(app)) {
-				switch_core_session_execute_application(session, app, app_args);
-			}
-		}
-
-		/* Ready for remote control */
-		switch_ivr_park(session, NULL);
-	}
-}
-
-/**
- * Stream locates client
- */
-static struct rayo_actor *xmpp_stream_client_locate(struct xmpp_stream *stream, const char *jid)
-{
-	struct rayo_actor *actor = NULL;
-	if (xmpp_stream_is_s2s(stream)) {
-		actor = RAYO_LOCATE(jid);
-		if (!actor) {
-			/* previously unknown client - add it */
-			struct rayo_peer_server *rserver = RAYO_PEER_SERVER(xmpp_stream_get_private(stream));
-			actor = RAYO_ACTOR(rayo_client_create(jid, xmpp_stream_get_jid(stream), PS_UNKNOWN, rayo_client_send, rserver));
-			RAYO_RETAIN(actor);
-		} else if (strcmp(RAT_CLIENT, actor->type)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, not a client: %s\n", xmpp_stream_get_jid(stream), jid);
-			RAYO_RELEASE(actor);
-			actor = NULL;
-		}
-	} else {
-		actor = RAYO_ACTOR(xmpp_stream_get_private(stream));
-		RAYO_RETAIN(actor);
-	}
-	return actor;
-}
-
-/**
- * Handle stream resource binding
- * @param stream the new stream
- */
-static int on_xmpp_stream_bind(struct xmpp_stream *stream)
-{
-	if (!xmpp_stream_is_s2s(stream)) {
-		/* client belongs to stream */
-		struct rayo_client *client = rayo_client_create(xmpp_stream_get_jid(stream), xmpp_stream_get_jid(stream), PS_OFFLINE, rayo_client_send, NULL);
-		if (client) {
-			xmpp_stream_set_private(stream, client);
-		} else {
-			/* this went really bad... */
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "failed to create client entity!\n");
-			return 0;
-		}
-	}
-	return 1;
-}
-
-/**
- * Handle new stream creation
- * @param stream the new stream
- */
-static int on_xmpp_stream_ready(struct xmpp_stream *stream)
-{
-	if (xmpp_stream_is_s2s(stream)) {
-		if (xmpp_stream_is_incoming(stream)) {
-			/* peer server belongs to a s2s inbound stream */
-			struct rayo_peer_server *peer = rayo_peer_server_create(xmpp_stream_get_jid(stream));
-			if (peer) {
-				xmpp_stream_set_private(stream, peer);
-			} else {
-				/* this went really bad... */
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "failed to create peer server entity!\n");
-				return 0;
-			}
-		} else {
-			/* send directed presence to domain */
-			iks *presence = iks_new("presence");
-			iks *x;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "sending server presence\n");
-
-			iks_insert_attrib(presence, "from", RAYO_JID(globals.server));
-			iks_insert_attrib(presence, "to", xmpp_stream_get_jid(stream));
-			x = iks_insert(presence, "show");
-			iks_insert_cdata(x, "chat", 4);
-			RAYO_SEND_MESSAGE(globals.server, xmpp_stream_get_jid(stream), presence);
-		}
-	}
-	return 1;
-}
-
-/**
- * Checks client availability.  If unknown, client presence is probed.
- * @param rclient to check
- */
-static void rayo_client_presence_check(struct rayo_client *rclient)
-{
-	if (rclient->availability == PS_UNKNOWN) {
-		/* for now, set online */
-		rclient->availability = PS_ONLINE;
-	}
-}
-
-/**
- * Handle stream stanza
- * @param stream the stream
- * @param stanza the stanza to process
- */
-static void on_xmpp_stream_recv(struct xmpp_stream *stream, iks *stanza)
-{
-	const char *name = iks_name(stanza);
-	if (!strcmp("iq", name)) {
-		const char *from = iks_find_attrib_soft(stanza, "from");
-		struct rayo_actor *actor = xmpp_stream_client_locate(stream, from);
-		if (actor) {
-			rayo_client_presence_check(RAYO_CLIENT(actor));
-			rayo_client_command_recv(RAYO_CLIENT(actor), stanza);
-			RAYO_RELEASE(actor);
-		}
-	} else if (!strcmp("presence", name)) {
-		const char *from = iks_find_attrib_soft(stanza, "from");
-		struct rayo_actor *actor = xmpp_stream_client_locate(stream, from);
-		if (actor) {
-			on_client_presence(RAYO_CLIENT(actor), stanza);
-			RAYO_RELEASE(actor);
-		}
-	} else if (!strcmp("message", name)) {
-		const char *from = iks_find_attrib_soft(stanza, "from");
-		struct rayo_actor *actor = xmpp_stream_client_locate(stream, from);
-		if (actor) {
-			rayo_client_presence_check(RAYO_CLIENT(actor));
-			on_client_message(RAYO_CLIENT(actor), stanza);
-			RAYO_RELEASE(actor);
-		}
-	}
-}
-
-/**
- * Handle stream destruction
- */
-static void on_xmpp_stream_destroy(struct xmpp_stream *stream)
-{
-	/* destroy peer server / client associated with this stream */
-	void *actor = xmpp_stream_get_private(stream);
-	if (actor) {
-		RAYO_RELEASE(actor);
-		RAYO_DESTROY(actor);
-	}
-}
-
-/**
- * A command alias
- */
-struct rayo_cmd_alias {
-	/** number of additional arguments for alias */
-	int args;
-	/** the alias template */
-	const char *cmd;
-};
-
-/**
- * Add an alias to an API command
- * @param alias_name
- * @param alias_target
- * @param alias_cmd
- * @param alias_args
- */
-static void rayo_add_cmd_alias(const char *alias_name, const char *alias_target, const char *alias_cmd, const char *alias_args)
-{
-	struct rayo_cmd_alias *alias = switch_core_alloc(globals.pool, sizeof(*alias));
-	alias->args = 0;
-	if (switch_is_number(alias_args)) {
-		alias->args = atoi(alias_args);
-		if (alias->args < 0) {
-			alias->args = 0;
-		}
-	}
-	alias->cmd = alias_cmd;
-	switch_core_hash_insert(globals.cmd_aliases, alias_name, alias);
-
-	/* set up autocomplete of alias */
-	if (zstr(alias_target)) {
-		alias_target = "all";
-	}
-	switch_console_set_complete(switch_core_sprintf(globals.pool, "add rayo %s ::rayo::list_%s", alias_name, alias_target));
-}
-
-/**
- * Process module XML configuration
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS on successful configuration
- */
-static switch_status_t do_config(switch_memory_pool_t *pool, const char *config_file)
-{
-	switch_xml_t cfg, xml;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Configuring module\n");
-	if (!(xml = switch_xml_open_cfg(config_file, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", config_file);
-		return SWITCH_STATUS_TERM;
-	}
-
-	/* set defaults */
-	globals.max_idle_ms = 30000;
-	globals.mixer_conf_profile = "sla";
-	globals.num_message_threads = 8;
-	globals.offer_uri = 1;
-	globals.pause_when_offline = 0;
-	globals.add_variables_to_offer = 0;
-	globals.add_variables_to_events = 0;
-	globals.offer_timeout_us = 5000000;
-	globals.offer_algorithm = OFFER_ALL;
-
-	/* get params */
-	{
-		switch_xml_t settings = switch_xml_child(cfg, "settings");
-		if (settings) {
-			switch_xml_t param;
-			for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-				const char *var = switch_xml_attr_soft(param, "name");
-				const char *val = switch_xml_attr_soft(param, "value");
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "param: %s = %s\n", var, val);
-				if (!strcasecmp(var, "max-idle-sec")) {
-					if (switch_is_number(val)) {
-						int max_idle_sec = atoi(val);
-						if (max_idle_sec > 0) {
-							globals.max_idle_ms = max_idle_sec * 1000;
-						}
-					}
-				} else if (!strcasecmp(var, "mixer-conf-profile")) {
-					if (!zstr(val)) {
-						globals.mixer_conf_profile = switch_core_strdup(pool, val);
-					}
-				} else if (!strcasecmp(var, "message-threads")) {
-					if (switch_is_number(val)) {
-						int num_message_threads = atoi(val);
-						if (num_message_threads > 0) {
-							globals.num_message_threads = num_message_threads;
-						}
-					}
-				} else if (!strcasecmp(var, "offer-uri")) {
-					if (switch_false(val)) {
-						globals.offer_uri = 0;
-					}
-				} else if (!strcasecmp(var, "pause-when-offline")) {
-					if (switch_true(val)) {
-						globals.pause_when_offline = 1;
-					}
-				} else if (!strcasecmp(var, "add-variables-to-offer")) {
-					if (switch_true(val)) {
-						globals.add_variables_to_offer = 1;
-					}
-				} else if (!strcasecmp(var, "add-variables-to-events")) {
-					if (switch_true(val)) {
-						globals.add_variables_to_offer = 1;
-						globals.add_variables_to_events = 1;
-					}
-				} else if (!strcasecmp(var, "offer-timeout-ms")) {
-					int offer_timeout_ms = 0;
-					if (switch_is_number(val) && (offer_timeout_ms = atoi(val)) >= 0  && offer_timeout_ms < 120000) {
-						globals.offer_timeout_us = offer_timeout_ms * 1000;
-					} else {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring invalid value for offer-timeout-ms \"%s\"\n", val);
-					}
-				} else if (!strcasecmp(var, "offer-algorithm")) {
-					if (zstr(val)) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No value for offer-algorithm\n");
-					} else if (!strcasecmp(val, "all")) {
-						globals.offer_algorithm = OFFER_ALL;
-					} else if (!strcasecmp(val, "first")) {
-						globals.offer_algorithm = OFFER_FIRST;
-					} else if (!strcasecmp(val, "random")) {
-						globals.offer_algorithm = OFFER_RANDOM;
-					} else {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring invalid value for offer-algorithm \"%s\"\n", val);
-					}
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unsupported param: %s\n", var);
-				}
-			}
-		}
-	}
-
-	/* configure dial gateways */
-	{
-		switch_xml_t dial_gateways = switch_xml_child(cfg, "dial-gateways");
-
-		/* set defaults */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting default dial-gateways\n");
-		dial_gateway_add("default", "sofia/gateway/outbound/", 0);
-		dial_gateway_add("tel:", "sofia/gateway/outbound/", 4);
-		dial_gateway_add("user", "", 0);
-		dial_gateway_add("sofia", "", 0);
-
-		if (dial_gateways) {
-			switch_xml_t dg;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting configured dial-gateways\n");
-			for (dg = switch_xml_child(dial_gateways, "dial-gateway"); dg; dg = dg->next) {
-				const char *uri_prefix = switch_xml_attr_soft(dg, "uriprefix");
-				const char *dial_prefix = switch_xml_attr_soft(dg, "dialprefix");
-				const char *strip_str = switch_xml_attr_soft(dg, "strip");
-				int strip = 0;
-
-				if (!zstr(strip_str) && switch_is_number(strip_str)) {
-					strip = atoi(strip_str);
-					if (strip < 0) {
-						strip = 0;
-					}
-				}
-				if (!zstr(uri_prefix)) {
-					dial_gateway_add(uri_prefix, dial_prefix, strip);
-				}
-			}
-		}
-	}
-
-	/* configure domain */
-	{
-		switch_xml_t domain = switch_xml_child(cfg, "domain");
-		if (domain) {
-			switch_xml_t l;
-			const char *shared_secret = switch_xml_attr_soft(domain, "shared-secret");
-			const char *name = switch_xml_attr_soft(domain, "name");
-			const char *cert = switch_xml_attr_soft(domain, "cert");
-			const char *key = switch_xml_attr_soft(domain, "key");
-			if (zstr(name)) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing <domain name=\"... failed to configure rayo server\n");
-				status = SWITCH_STATUS_FALSE;
-				goto done;
-			}
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Rayo domain set to %s\n", name);
-
-			if (zstr(shared_secret)) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Missing shared secret for %s domain.  Server dialback will not work\n", name);
-			}
-
-			globals.xmpp_context = xmpp_stream_context_create(name, shared_secret, on_xmpp_stream_bind, on_xmpp_stream_ready, on_xmpp_stream_recv, on_xmpp_stream_destroy);
-			globals.server = rayo_server_create(name);
-
-			/* set up TLS */
-			if (!zstr(cert)) {
-				xmpp_stream_context_add_cert(globals.xmpp_context, cert);
-			}
-			if (!zstr(key)) {
-				xmpp_stream_context_add_key(globals.xmpp_context, key);
-			}
-
-			/* configure authorized users for this domain */
-			l = switch_xml_child(domain, "users");
-			if (l) {
-				switch_xml_t u;
-				for (u = switch_xml_child(l, "user"); u; u = u->next) {
-					const char *user = switch_xml_attr_soft(u, "name");
-					const char *password = switch_xml_attr_soft(u, "password");
-					xmpp_stream_context_add_user(globals.xmpp_context, user, password);
-				}
-			}
-
-			/* get listeners for this domain */
-			for (l = switch_xml_child(domain, "listen"); l; l = l->next) {
-				const char *address = switch_xml_attr_soft(l, "address");
-				const char *port = switch_xml_attr_soft(l, "port");
-				const char *type = switch_xml_attr_soft(l, "type");
-				const char *acl = switch_xml_attr_soft(l, "acl");
-				int is_s2s = 0;
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s listener: %s:%s\n", type, address, port);
-				is_s2s = !strcmp("s2s", type);
-				if (!is_s2s && strcmp("c2s", type)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Type must be \"c2s\" or \"s2s\"!\n");
-					status = SWITCH_STATUS_FALSE;
-					goto done;
-				}
-				if (zstr(address)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing address!\n");
-					status = SWITCH_STATUS_FALSE;
-					goto done;
-				}
-				if (!zstr(port) && !switch_is_number(port)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Port must be an integer!\n");
-					status = SWITCH_STATUS_FALSE;
-					goto done;
-				}
-				if (xmpp_stream_context_listen(globals.xmpp_context, address, atoi(port), is_s2s, acl) != SWITCH_STATUS_SUCCESS) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to create %s listener: %s:%s\n", type, address, port);
- 				}
-			}
-
-			/* get outbound server connections */
-			for (l = switch_xml_child(domain, "connect"); l; l = l->next) {
-				const char *domain = switch_xml_attr_soft(l, "domain");
-				const char *address = switch_xml_attr_soft(l, "address");
-				const char *port = switch_xml_attr_soft(l, "port");
-				if (!zstr(port) && !switch_is_number(port)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Outbound server port must be an integer!\n");
-					status = SWITCH_STATUS_FALSE;
-					goto done;
-				}
-				if (zstr(address) && zstr(domain)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing outbound server address!\n");
-					status = SWITCH_STATUS_FALSE;
-					goto done;
-				}
-				xmpp_stream_context_connect(globals.xmpp_context, domain, address, atoi(port));
-			}
-		}
-	}
-
-	/* get aliases */
-	{
-		switch_xml_t aliases = switch_xml_child(cfg, "aliases");
-		if (aliases) {
-			switch_xml_t alias;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting configured aliases\n");
-			for (alias = switch_xml_child(aliases, "alias"); alias; alias = alias->next) {
-				const char *alias_name = switch_xml_attr_soft(alias, "name");
-				const char *alias_target = switch_xml_attr_soft(alias, "target");
-				const char *alias_args = switch_xml_attr_soft(alias, "args");
-				if (!zstr(alias_name) && !zstr(alias->txt)) {
-					rayo_add_cmd_alias(alias_name, switch_core_strdup(pool, alias_target), switch_core_strdup(pool, alias->txt), switch_core_strdup(pool, alias_args));
-				}
-			}
-		}
-	}
-
-done:
-	switch_xml_free(xml);
-
-	return status;
-}
-
-/**
- * Dump rayo actor stats
- */
-static void rayo_actor_dump(struct rayo_actor *actor, switch_stream_handle_t *stream)
-{
-	if (!strcmp(RAT_CLIENT, actor->type)) {
-		stream->write_function(stream, "TYPE='%s',SUBTYPE='%s',ID='%s',JID='%s',DOMAIN='%s',REFS=%i,STATUS='%s'", actor->type, actor->subtype, actor->id, RAYO_JID(actor), RAYO_DOMAIN(actor), actor->ref_count, presence_status_to_string(RAYO_CLIENT(actor)->availability));
-	} else {
-		stream->write_function(stream, "TYPE='%s',SUBTYPE='%s',ID='%s',JID='%s',DOMAIN='%s',REFS=%i", actor->type, actor->subtype, actor->id, RAYO_JID(actor), RAYO_DOMAIN(actor), actor->ref_count);
-	}
-}
-
-/**
- * Dump rayo actors
- */
-static int dump_api(const char *cmd, switch_stream_handle_t *stream)
-{
-	switch_hash_index_t *hi;
-	if (!zstr(cmd)) {
-		return 0;
-	}
-
-	stream->write_function(stream, "\nENTITIES\n");
-	switch_mutex_lock(globals.actors_mutex);
-	for (hi = switch_core_hash_first(globals.actors); hi; hi = switch_core_hash_next(&hi)) {
-		struct rayo_actor *actor = NULL;
-		const void *key;
-		void *val;
-		switch_core_hash_this(hi, &key, NULL, &val);
-		actor = (struct rayo_actor *)val;
-		switch_assert(actor);
-		stream->write_function(stream, "        ");
-		rayo_actor_dump(actor, stream);
-		stream->write_function(stream, "\n");
-	}
-
-	for (hi = switch_core_hash_first(globals.destroy_actors); hi; hi = switch_core_hash_next(&hi)) {
-		struct rayo_actor *actor = NULL;
-		const void *key;
-		void *val;
-		switch_core_hash_this(hi, &key, NULL, &val);
-		actor = (struct rayo_actor *)val;
-		switch_assert(actor);
-		stream->write_function(stream, "(DEAD)  ");
-		rayo_actor_dump(actor, stream);
-		stream->write_function(stream, "\n");
-	}
-	switch_mutex_unlock(globals.actors_mutex);
-
-	xmpp_stream_context_dump(globals.xmpp_context, stream);
-
-	return 1;
-}
-
-/**
- * Process response to console command_api
- */
-void rayo_console_client_send(struct rayo_actor *actor, struct rayo_message *msg)
-{
-	iks *response = msg->payload;
-
-	if (response) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\nRECV: from %s, %s\n", msg->from_jid, iks_string(iks_stack(response), response));
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\nRECV: (null) from %s\n", msg->from_jid);
-	}
-}
-
-/**
- * Create a new Rayo console client
- * @return the new client or NULL
- */
-static struct rayo_client *rayo_console_client_create(void)
-{
-	struct rayo_client *client = NULL;
-	char *jid = NULL;
-	char id[SWITCH_UUID_FORMATTED_LENGTH + 1] = { 0 };
-	switch_uuid_str(id, sizeof(id));
-	jid = switch_mprintf("%s@%s/console", id, RAYO_JID(globals.server));
-	client = rayo_client_create(jid, NULL, PS_OFFLINE, rayo_console_client_send, NULL);
-	free(jid);
-	return client;
-}
-
-/**
- * Send command from console
- */
-static void send_console_command(struct rayo_client *client, const char *to, const char *command_str)
-{
-	iks *command = NULL;
-	iksparser *p = iks_dom_new(&command);
-
-	if (iks_parse(p, command_str, 0, 1) == IKS_OK && command) {
-		char *str;
-		iks *iq = NULL;
-
-		/* is command already wrapped in IQ? */
-		if (!strcmp(iks_name(command), "iq")) {
-			/* command already IQ */
-			iq = command;
-		} else {
-			/* create IQ to wrap command */
-			iq = iks_new_within("iq", iks_stack(command));
-			iks_insert_node(iq, command);
-		}
-
-		/* fill in command attribs */
-		iks_insert_attrib(iq, "to", to);
-		if (!iks_find_attrib(iq, "type")) {
-			iks_insert_attrib(iq, "type", "set");
-		}
-		if (!iks_find_attrib(iq, "id")) {
-			iks_insert_attrib_printf(iq, "id", "console-%i", RAYO_SEQ_NEXT(client));
-		}
-		iks_insert_attrib(iq, "from", RAYO_JID(client));
-
-		/* send command */
-		str = iks_string(iks_stack(iq), iq);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\nSEND: to %s, %s\n", to, str);
-		rayo_client_command_recv(client, iq);
-		iks_delete(command);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "bad request xml\n");
-	}
-	iks_parser_delete(p);
-}
-
-/**
- * Send command to rayo actor
- */
-static int command_api(char *cmd, switch_stream_handle_t *stream)
-{
-	char *argv[2] = { 0 };
-	if (!zstr(cmd)) {
-		int argc = switch_separate_string(cmd, ' ', argv, sizeof(argv) / sizeof(argv[0]));
-		if (argc != 2) {
-			return 0;
-		}
-	} else {
-		return 0;
-	}
-
-	/* send command */
-	send_console_command(globals.console, argv[0], argv[1]);
-	stream->write_function(stream, "+OK\n");
-
-	return 1;
-}
-
-/**
- * Send command to rayo actor
- */
-static int alias_api(struct rayo_cmd_alias *alias, char *args, switch_stream_handle_t *stream)
-{
-	char *argv[10] = { 0 };
-	int argc, i;
-	char *cmd;
-	char *jid;
-
-	if (zstr(alias->cmd)) {
-		stream->write_function(stream, "-ERR missing alias template.  Check configuration.\n");
-	}
-
-	if (zstr(args)) {
-		stream->write_function(stream, "-ERR no args\n");
-		return 1;
-	}
-
-	/* check args */
-	argc = switch_separate_string(args, ' ', argv, sizeof(argv) / sizeof(argv[0]));
-	if (argc != alias->args + 1) {
-		stream->write_function(stream, "-ERR wrong number of args (%i/%i)\n", argc, alias->args + 1);
-		return 1;
-	}
-
-	jid = argv[0];
-
-	/* build command from args */
-	cmd = strdup(alias->cmd);
-	for (i = 1; i < argc; i++) {
-		char *cmd_new;
-		char to_replace[12] = { 0 };
-		sprintf(to_replace, "$%i", i);
-		cmd_new = switch_string_replace(cmd, to_replace, argv[i]);
-		free(cmd);
-		cmd = cmd_new;
-	}
-
-	/* send command */
-	send_console_command(globals.console, jid, cmd);
-	stream->write_function(stream, "+OK\n");
-	free(cmd);
-
-	return 1;
-}
-
-/**
- * Send message from console
- */
-static void send_console_message(struct rayo_client *client, const char *to, const char *type, const char *message_str)
-{
-	iks *message = NULL, *x;
-	message = iks_new("message");
-	iks_insert_attrib(message, "to", to);
-	iks_insert_attrib(message, "from", RAYO_JID(client));
-	iks_insert_attrib_printf(message, "id", "console-%i", RAYO_SEQ_NEXT(client));
-	iks_insert_attrib(message, "type", type);
-	x = iks_insert(message, "body");
-	iks_insert_cdata(x, message_str, strlen(message_str));
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\nSEND: to %s, %s\n", to, iks_string(iks_stack(message), message));
-	RAYO_SEND_MESSAGE(client, to, message);
-}
-
-/**
- * Send message to rayo actor
- */
-static int message_api(char *cmd, switch_stream_handle_t *stream)
-{
-	char *argv[3] = { 0 };
-	if (!zstr(cmd)) {
-		int argc = switch_separate_string(cmd, ' ', argv, sizeof(argv) / sizeof(argv[0]));
-		if (argc != 3) {
-			return 0;
-		}
-	} else {
-		return 0;
-	}
-
-	/* send message */
-	send_console_message(globals.console, argv[0], argv[1], argv[2]);
-	stream->write_function(stream, "+OK\n");
-
-	return 1;
-}
-
-/**
- * Send presence from console
- */
-static void send_console_presence(struct rayo_client *client, const char *to, int is_online)
-{
-	iks *presence = NULL, *x;
-	presence = iks_new("presence");
-	iks_insert_attrib(presence, "to", to);
-	iks_insert_attrib(presence, "from", RAYO_JID(client));
-	iks_insert_attrib_printf(presence, "id", "console-%i", RAYO_SEQ_NEXT(client));
-	if (!is_online) {
-		iks_insert_attrib(presence, "type", "unavailable");
-	}
-	x = iks_insert(presence, "show");
-	iks_insert_cdata(x, is_online ? "chat" : "dnd", 0);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\nSEND: to %s, %s\n", to, iks_string(iks_stack(presence), presence));
-	RAYO_SEND_MESSAGE(client, to, presence);
-}
-
-/**
- * Send console presence
- */
-static int presence_api(char *cmd, switch_stream_handle_t *stream)
-{
-	int is_online = 0;
-	char *argv[2] = { 0 };
-	if (!zstr(cmd)) {
-		int argc = switch_separate_string(cmd, ' ', argv, sizeof(argv) / sizeof(argv[0]));
-		if (argc != 2) {
-			return 0;
-		}
-	} else {
-		return 0;
-	}
-
-	if (!strcmp("online", argv[1])) {
-		is_online = 1;
-	} else if (strcmp("offline", argv[1])) {
-		return 0;
-	}
-
-	/* send presence */
-	send_console_presence(globals.console, argv[0], is_online);
-	stream->write_function(stream, "+OK\n");
-	return 1;
-}
-
-#define RAYO_API_SYNTAX "status | (<alias> <jid>) | (cmd <jid> <command>) | (msg <jid> <message text>) | (presence <jid> <online|offline>)"
-SWITCH_STANDARD_API(rayo_api)
-{
-	struct rayo_cmd_alias *alias;
-	char *cmd_dup = NULL;
-	char *argv[2] = { 0 };
-	int success = 0;
-
-	if (zstr(cmd) ) {
-		goto done;
-	}
-
-	cmd_dup = strdup(cmd);
-	switch_separate_string(cmd_dup, ' ', argv, sizeof(argv) / sizeof(argv[0]));
-
-	/* check if a command alias */
-	alias = switch_core_hash_find(globals.cmd_aliases, argv[0]);
-
-	if (alias) {
-		success = alias_api(alias, argv[1], stream);
-	} else if (!strcmp("cmd", argv[0])) {
-		success = command_api(argv[1], stream);
-	} else if (!strcmp("status", argv[0])) {
-		success = dump_api(argv[1], stream);
-	} else if (!strcmp("msg", argv[0])) {
-		success = message_api(argv[1], stream);
-	} else if (!strcmp("presence", argv[0])) {
-		success = presence_api(argv[1], stream);
-	}
-
-done:
-	if (!success) {
-		stream->write_function(stream, "-ERR: USAGE %s\n", RAYO_API_SYNTAX);
-	}
-
-	switch_safe_free(cmd_dup);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Console auto-completion for actors given validation function
- */
-static switch_status_t list_actors(const char *line, const char *cursor, switch_console_callback_match_t **matches, rayo_actor_match_fn match)
-{
-	switch_hash_index_t *hi;
-	void *val;
-	const void *vvar;
-	switch_console_callback_match_t *my_matches = NULL;
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	struct rayo_actor *actor;
-
-	switch_mutex_lock(globals.actors_mutex);
-	for (hi = switch_core_hash_first(globals.actors); hi; hi = switch_core_hash_next(&hi)) {
-		switch_core_hash_this(hi, &vvar, NULL, &val);
-
-		actor = (struct rayo_actor *) val;
-		if (match(actor)) {
-			switch_console_push_match(&my_matches, (const char *) vvar);
-		}
-	}
-	switch_mutex_unlock(globals.actors_mutex);
-
-	if (my_matches) {
-		*matches = my_matches;
-		status = SWITCH_STATUS_SUCCESS;
-	}
-
-	return status;
-}
-
-/**
- * @return true if internal actor
- */
-static switch_bool_t is_internal_actor(struct rayo_actor *actor)
-{
-	return strcmp(RAT_CLIENT, actor->type) && strcmp(RAT_PEER_SERVER, actor->type);
-}
-
-/**
- * Console auto-completion for all internal actors
- */
-static switch_status_t list_internal(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	return list_actors(line, cursor, matches, is_internal_actor);
-}
-
-/**
- * @return true if external actor
- */
-static switch_bool_t is_external_actor(struct rayo_actor *actor)
-{
-	return !strcmp(RAT_CLIENT, actor->type) || !strcmp(RAT_PEER_SERVER, actor->type);
-}
-
-/**
- * Console auto-completion for all external actors
- */
-static switch_status_t list_external(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	return list_actors(line, cursor, matches, is_external_actor);
-}
-
-/**
- * @return true
- */
-static switch_bool_t is_any_actor(struct rayo_actor *actor)
-{
-	return SWITCH_TRUE;
-}
-
-/**
- * Console auto-completion for all actors
- */
-static switch_status_t list_all(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	return list_actors(line, cursor, matches, is_any_actor);
-}
-
-/**
- * @return true if a server
- */
-static switch_bool_t is_server_actor(struct rayo_actor *actor)
-{
-	return !strcmp(RAT_SERVER, actor->type);
-}
-
-/**
- * Console auto-completion for all servers
- */
-static switch_status_t list_server(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	return list_actors(line, cursor, matches, is_server_actor);
-}
-
-/**
- * @return true if a call
- */
-static switch_bool_t is_call_actor(struct rayo_actor *actor)
-{
-	return !strcmp(RAT_CALL, actor->type);
-}
-
-/**
- * Console auto-completion for all calls
- */
-static switch_status_t list_call(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	return list_actors(line, cursor, matches, is_call_actor);
-}
-
-/**
- * @return true if a component
- */
-switch_bool_t is_component_actor(struct rayo_actor *actor)
-{
-	return !strncmp(RAT_COMPONENT, actor->type, strlen(RAT_COMPONENT));
-}
-
-/**
- * Console auto-completion for all components
- */
-static switch_status_t list_component(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	return list_actors(line, cursor, matches, is_component_actor);
-}
-
-/**
- * @return true if a record component
- */
-static switch_bool_t is_record_actor(struct rayo_actor *actor)
-{
-	return is_component_actor(actor) && !strcmp(actor->subtype, "record");
-}
-
-/**
- * Console auto-completion for all components
- */
-static switch_status_t list_record(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	return list_actors(line, cursor, matches, is_record_actor);
-}
-
-/**
- * @return true if an output component
- */
-static switch_bool_t is_output_actor(struct rayo_actor *actor)
-{
-	return is_component_actor(actor) && !strcmp(actor->subtype, "output");
-}
-
-/**
- * Console auto-completion for all components
- */
-static switch_status_t list_output(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	return list_actors(line, cursor, matches, is_output_actor);
-}
-
-/**
- * @return true if an input component
- */
-static switch_bool_t is_input_actor(struct rayo_actor *actor)
-{
-	return is_component_actor(actor) && !strcmp(actor->subtype, "input");
-}
-
-/**
- * Console auto-completion for all components
- */
-static switch_status_t list_input(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	return list_actors(line, cursor, matches, is_input_actor);
-}
-
-/**
- * Shutdown module on load failure or shutdown from FreeSWITCH core
- */
-static switch_status_t do_shutdown(void)
-{
-	switch_console_del_complete_func("::rayo::list_all");
-	switch_console_del_complete_func("::rayo::list_internal");
-	switch_console_del_complete_func("::rayo::list_external");
-	switch_console_del_complete_func("::rayo::list_server");
-	switch_console_del_complete_func("::rayo::list_call");
-	switch_console_del_complete_func("::rayo::list_component");
-	switch_console_del_complete_func("::rayo::list_record");
-	switch_console_del_complete_func("::rayo::list_output");
-	switch_console_del_complete_func("::rayo::list_input");
-	switch_console_set_complete("del rayo");
-
-	/* stop XMPP streams */
-	if (globals.xmpp_context) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for XMPP threads to stop\n");
-		xmpp_stream_context_destroy(globals.xmpp_context);
-	}
-
-	/* stop threads */
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for message and offer timeout threads to stop\n");
-	stop_all_threads();
-
-	if (globals.console) {
-		RAYO_RELEASE(globals.console);
-		RAYO_DESTROY(globals.console);
-		globals.console = NULL;
-	}
-
-	if (globals.server) {
-		RAYO_RELEASE(globals.server);
-		RAYO_DESTROY(globals.server);
-		globals.server = NULL;
-	}
-
-	rayo_components_shutdown();
-
-	switch_event_unbind_callback(route_call_event);
-	switch_event_unbind_callback(on_call_end_event);
-	switch_event_unbind_callback(route_mixer_event);
-
-	if (globals.command_handlers) {
-		switch_core_hash_destroy(&globals.command_handlers);
-	}
-	if (globals.event_handlers) {
-		switch_core_hash_destroy(&globals.event_handlers);
-	}
-	if (globals.clients_roster) {
-		switch_core_hash_destroy(&globals.clients_roster);
-	}
-	if (globals.actors) {
-		switch_core_hash_destroy(&globals.actors);
-	}
-	if (globals.destroy_actors) {
-		switch_core_hash_destroy(&globals.destroy_actors);
-	}
-	if (globals.actors_by_id) {
-		switch_core_hash_destroy(&globals.actors_by_id);
-	}
-	if (globals.dial_gateways) {
-		switch_core_hash_destroy(&globals.dial_gateways);
-	}
-	if (globals.cmd_aliases) {
-		switch_core_hash_destroy(&globals.cmd_aliases);
-	}
-
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Load module
- */
-SWITCH_MODULE_LOAD_FUNCTION(mod_rayo_load)
-{
-	switch_api_interface_t *api_interface;
-	switch_application_interface_t *app_interface;
-
-
-	if (switch_event_reserve_subclass("rayo::cpa") != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", "rayo::cpa");
-		return SWITCH_STATUS_TERM;
-	}
-
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading module\n");
-
-	memset(&globals, 0, sizeof(globals));
-	globals.pool = pool;
-	switch_core_hash_init(&globals.command_handlers);
-	switch_core_hash_init(&globals.event_handlers);
-	switch_core_hash_init(&globals.clients_roster);
-	switch_mutex_init(&globals.clients_mutex, SWITCH_MUTEX_NESTED, pool);
-	switch_core_hash_init(&globals.actors);
-	switch_core_hash_init(&globals.destroy_actors);
-	switch_core_hash_init(&globals.actors_by_id);
-	switch_mutex_init(&globals.actors_mutex, SWITCH_MUTEX_NESTED, pool);
-	switch_core_hash_init(&globals.dial_gateways);
-	switch_mutex_init(&globals.dial_gateways_mutex, SWITCH_MUTEX_NESTED, pool);
-	switch_core_hash_init(&globals.cmd_aliases);
-	switch_thread_rwlock_create(&globals.shutdown_rwlock, pool);
-	switch_queue_create(&globals.msg_queue, 25000, pool);
-	switch_queue_create(&globals.offer_queue, 25000, pool);
-	globals.offline_logged = 1;
-
-	/* server commands */
-	rayo_actor_command_handler_add(RAT_SERVER, "", "get:"IKS_NS_XMPP_PING":ping", on_iq_xmpp_ping);
-	rayo_actor_command_handler_add(RAT_SERVER, "", "get:"IKS_NS_XMPP_DISCO":query", on_iq_get_xmpp_disco);
-	rayo_actor_command_handler_add(RAT_SERVER, "", "set:"RAYO_NS":dial", on_rayo_dial);
-	rayo_actor_command_handler_add(RAT_SERVER, "", "set:"RAYO_NS":exec", on_rayo_exec);
-
-	/* Rayo call commands */
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_NS":accept", on_rayo_accept);
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_NS":answer", on_rayo_answer);
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_NS":redirect", on_rayo_redirect);
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_NS":reject", on_rayo_hangup); /* handles both reject and hangup */
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_NS":hangup", on_rayo_hangup); /* handles both reject and hangup */
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_NS":join", on_rayo_join);
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_NS":unjoin", on_rayo_unjoin);
-
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_ORIGINATE, NULL, route_call_event, NULL);
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA, NULL, route_call_event, NULL);
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_PROGRESS, NULL, route_call_event, NULL);
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_ANSWER, NULL, route_call_event, NULL);
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_BRIDGE, NULL, route_call_event, NULL);
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_PARK, NULL, route_call_event, NULL);
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_EXECUTE, NULL, route_call_event, NULL);
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE, NULL, route_call_event, NULL);
-
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_DESTROY, NULL, on_call_end_event, NULL);
-
-	switch_event_bind(modname, SWITCH_EVENT_CUSTOM, "conference::maintenance", route_mixer_event, NULL);
-
-	SWITCH_ADD_APP(app_interface, "rayo", "Offer call control to Rayo client(s)", "", rayo_app, RAYO_USAGE, SAF_SUPPORT_NOMEDIA);
-	SWITCH_ADD_API(api_interface, "rayo", "Query rayo status", rayo_api, RAYO_API_SYNTAX);
-
-	/* set up rayo components */
-	if (rayo_components_load(module_interface, pool, RAYO_CONFIG_FILE) != SWITCH_STATUS_SUCCESS) {
-		goto error;
-	}
-
-	/* configure / open sockets */
-	if(do_config(globals.pool, RAYO_CONFIG_FILE) != SWITCH_STATUS_SUCCESS) {
-		goto error;
-	}
-
-	/* create admin client */
-	globals.console = rayo_console_client_create();
-	if (!globals.console) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to create console client entity!\n");
-		goto error;
-	}
-
-	/* start up message threads */
-	{
-		int i;
-		for (i = 0; i < globals.num_message_threads; i++) {
-			start_deliver_message_thread(pool);
-		}
-	}
-	start_offer_timeout_thread(pool);
-
-	switch_console_set_complete("add rayo status");
-	switch_console_set_complete("add rayo msg ::rayo::list_all");
-	switch_console_set_complete("add rayo msg ::rayo::list_all chat");
-	switch_console_set_complete("add rayo msg ::rayo::list_all groupchat");
-	switch_console_set_complete("add rayo msg ::rayo::list_all headline");
-	switch_console_set_complete("add rayo msg ::rayo::list_all normal");
-	switch_console_set_complete("add rayo presence ::rayo::list_server online");
-	switch_console_set_complete("add rayo presence ::rayo::list_server offline");
-	switch_console_add_complete_func("::rayo::list_all", list_all);
-	switch_console_add_complete_func("::rayo::list_internal", list_internal);
-	switch_console_add_complete_func("::rayo::list_external", list_external);
-	switch_console_add_complete_func("::rayo::list_server", list_server);
-	switch_console_add_complete_func("::rayo::list_call", list_call);
-	switch_console_add_complete_func("::rayo::list_component", list_component);
-	switch_console_add_complete_func("::rayo::list_record", list_record);
-	switch_console_add_complete_func("::rayo::list_output", list_output);
-	switch_console_add_complete_func("::rayo::list_input", list_input);
-
-	return SWITCH_STATUS_SUCCESS;
-
- error:
-	switch_event_free_subclass("rayo::cpa");
-	do_shutdown();
-	return SWITCH_STATUS_TERM;
-
-}
-
-/**
- * Shutdown module.  Notifies threads to stop.
- */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_rayo_shutdown)
-{
-	switch_status_t result;
-
-	switch_event_free_subclass("rayo::cpa");
-	result = do_shutdown();
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Module shutdown\n");
-	return result;
-}
-
-/**
- * Checks status of connected clients
- */
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_rayo_runtime)
-{
-	if (globals.pause_when_offline) {
-		switch_thread_rwlock_rdlock(globals.shutdown_rwlock);
-		while (!globals.shutdown) {
-			switch_sleep(1000 * 1000); /* 1 second */
-			pause_when_offline();
-		}
-		switch_thread_rwlock_unlock(globals.shutdown_rwlock);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Runtime thread is done\n");
-	}
-	return SWITCH_STATUS_TERM;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.h b/src/mod/event_handlers/mod_rayo/mod_rayo.h
deleted file mode 100644
index 2d066c4e21..0000000000
--- a/src/mod/event_handlers/mod_rayo/mod_rayo.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * mod_rayo.h -- Rayo server / node implementation.  Allows MxN clustering of FreeSWITCH and Rayo Clients (like Adhearsion)
- *
- */
-#ifndef MOD_RAYO_H
-#define MOD_RAYO_H
-
-#include <switch.h>
-#include <iksemel.h>
-
-#include "iks_helpers.h"
-
-#define RAYO_VERSION "1"
-#define RAYO_BASE "urn:xmpp:rayo:"
-
-#define RAYO_NS RAYO_BASE RAYO_VERSION
-#define RAYO_CLIENT_NS RAYO_BASE "client:" RAYO_VERSION
-#define RAYO_CALL_NS RAYO_BASE "call:" RAYO_VERSION
-#define RAYO_MIXER_NS RAYO_BASE "mixer:" RAYO_VERSION
-
-#define RAYO_CPA_BASE RAYO_BASE "cpa:"
-#define RAYO_CPA_NS RAYO_CPA_BASE RAYO_VERSION
-
-#define RAT_CALL "CALL"
-#define RAT_COMPONENT "COMPONENT"
-#define RAT_CALL_COMPONENT RAT_COMPONENT"_CALL"
-#define RAT_MIXER "MIXER"
-#define RAT_MIXER_COMPONENT RAT_COMPONENT"_MIXER"
-#define RAT_SERVER "SERVER"
-#define RAT_PEER_SERVER "PEER_SERVER"
-#define RAT_CLIENT "CLIENT"
-
-struct rayo_actor;
-struct rayo_call;
-struct rayo_mixer;
-struct rayo_component;
-
-/**
- * A message sent to an actor
- */
-struct rayo_message {
-	iks *payload;
-	char *to_jid;
-	iksid *to;
-	char *from_jid;
-	iksid *from;
-	char *from_type;
-	char *from_subtype;
-	int is_reply;
-	char *file;
-	int line;
-};
-
-typedef void (* rayo_actor_cleanup_fn)(struct rayo_actor *);
-typedef void (* rayo_actor_send_fn)(struct rayo_actor *, struct rayo_message *);
-
-/**
- * A rayo actor - this is an entity that can be controlled by a rayo client
- */
-struct rayo_actor {
-	/** Type of actor */
-	char *type;
-	/** Sub-type of actor */
-	char *subtype;
-	/** domain part of JID */
-	char *domain;
-	/** Internal ID */
-	char *id;
-	/** actor JID */
-	char *jid;
-	/** Actor pool */
-	switch_memory_pool_t *pool;
-	/** synchronizes access to this actor */
-	switch_mutex_t *mutex;
-	/** an atomically incrementing sequence for this actor */
-	int seq;
-	/** number of users of this actor */
-	int ref_count;
-	/** destroy flag */
-	int destroy;
-	/** XMPP message handling function */
-	rayo_actor_send_fn send_fn;
-	/** optional cleanup */
-	rayo_actor_cleanup_fn cleanup_fn;
-	/** optional parent */
-	struct rayo_actor *parent;
-};
-
-/**
- * A Rayo component
- */
-struct rayo_component {
-	/** base actor class */
-	struct rayo_actor base;
-	/** owning client JID */
-	const char *client_jid;
-	/** external ref */
-	const char *ref;
-	/** true if component has completed */
-	int complete;
-};
-
-#define RAYO_ACTOR(x) ((struct rayo_actor *)x)
-#define RAYO_COMPONENT(x) ((struct rayo_component *)x)
-#define RAYO_CALL(x) ((struct rayo_call *)x)
-#define RAYO_MIXER(x) ((struct rayo_mixer *)x)
-
-SWITCH_DECLARE(void) rayo_message_send(struct rayo_actor *from, const char *to, iks *payload, int dup, int reply, const char *file, int line);
-SWITCH_DECLARE(void) rayo_message_destroy(struct rayo_message *msg);
-SWITCH_DECLARE(iks *) rayo_message_remove_payload(struct rayo_message *msg);
-#define RAYO_SEND_MESSAGE(from, to, payload) rayo_message_send(RAYO_ACTOR(from), to, payload, 0, 0, __FILE__, __LINE__)
-#define RAYO_SEND_MESSAGE_DUP(from, to, payload) rayo_message_send(RAYO_ACTOR(from), to, payload, 1, 0, __FILE__, __LINE__)
-#define RAYO_SEND_REPLY(from, to, payload) rayo_message_send(RAYO_ACTOR(from), to, payload, 0, 1, __FILE__, __LINE__)
-#define RAYO_SEND_REPLY_DUP(from, to, payload) rayo_message_send(RAYO_ACTOR(from), to, payload, 1, 1, __FILE__, __LINE__)
-
-SWITCH_DECLARE(struct rayo_actor *) rayo_actor_locate(const char *jid, const char *file, int line);
-SWITCH_DECLARE(struct rayo_actor *) rayo_actor_locate_by_id(const char *id, const char *file, int line);
-SWITCH_DECLARE(int) rayo_actor_seq_next(struct rayo_actor *actor);
-SWITCH_DECLARE(void) rayo_actor_retain(struct rayo_actor *actor, const char *file, int line);
-SWITCH_DECLARE(void) rayo_actor_release(struct rayo_actor *actor, const char *file, int line);
-SWITCH_DECLARE(void) rayo_actor_destroy(struct rayo_actor *actor, const char *file, int line);
-
-#define RAYO_LOCATE(jid) rayo_actor_locate(jid, __FILE__, __LINE__)
-#define RAYO_LOCATE_BY_ID(id) rayo_actor_locate_by_id(id, __FILE__, __LINE__)
-#define RAYO_SET_EVENT_FN(actor, event) rayo_actor_set_event_fn(RAYO_ACTOR(actor), event)
-#define RAYO_DOMAIN(x) RAYO_ACTOR(x)->domain
-#define RAYO_JID(x) RAYO_ACTOR(x)->jid
-#define RAYO_ID(x) RAYO_ACTOR(x)->id
-#define RAYO_POOL(x) RAYO_ACTOR(x)->pool
-#define RAYO_RETAIN(x) rayo_actor_retain(RAYO_ACTOR(x), __FILE__, __LINE__)
-#define RAYO_RELEASE(x) rayo_actor_release(RAYO_ACTOR(x), __FILE__, __LINE__)
-#define RAYO_DESTROY(x) rayo_actor_destroy(RAYO_ACTOR(x), __FILE__, __LINE__)
-#define RAYO_SEQ_NEXT(x) rayo_actor_seq_next(RAYO_ACTOR(x))
-
-SWITCH_DECLARE(int) rayo_call_is_joined(struct rayo_call *call);
-SWITCH_DECLARE(int) rayo_call_is_faxing(struct rayo_call *call);
-SWITCH_DECLARE(void) rayo_call_set_faxing(struct rayo_call *call, int faxing);
-SWITCH_DECLARE(const char *) rayo_call_get_dcp_jid(struct rayo_call *call);
-
-#define rayo_mixer_get_name(mixer) RAYO_ID(mixer)
-
-#define rayo_component_init(component, pool, type, subtype, id, parent, client_jid) _rayo_component_init(component, pool, type, subtype, id, parent, client_jid, NULL, __FILE__, __LINE__)
-#define rayo_component_init_cleanup(component, pool, type, subtype, id, parent, client_jid, cleanup) _rayo_component_init(component, pool, type, subtype, id, parent, client_jid, cleanup, __FILE__, __LINE__)
-SWITCH_DECLARE(struct rayo_component *) _rayo_component_init(struct rayo_component *component, switch_memory_pool_t *pool, const char *type, const char *subtype, const char *id, struct rayo_actor *parent, const char *client_jid, rayo_actor_cleanup_fn cleanup, const char *file, int line);
-SWITCH_DECLARE(switch_bool_t) is_component_actor(struct rayo_actor *);
-
-typedef iks *(*rayo_actor_xmpp_handler)(struct rayo_actor *, struct rayo_message *, void *);
-SWITCH_DECLARE(void) rayo_actor_command_handler_add(const char *type, const char *subtype, const char *name, rayo_actor_xmpp_handler fn);
-SWITCH_DECLARE(void) rayo_actor_event_handler_add(const char *from_type, const char *from_subtype, const char *to_type, const char *to_subtype, const char *name, rayo_actor_xmpp_handler fn);
-
-#endif
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/nlsml.c b/src/mod/event_handlers/mod_rayo/nlsml.c
deleted file mode 100644
index 61730127c4..0000000000
--- a/src/mod/event_handlers/mod_rayo/nlsml.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * nlsml.c -- Parses / creates NLSML results
- *
- */
-#include <switch.h>
-#include <iksemel.h>
-
-#include "nlsml.h"
-#include "iks_helpers.h"
-
-struct nlsml_parser;
-
-/** function to handle tag attributes */
-typedef int (* tag_attribs_fn)(struct nlsml_parser *, char **);
-/** function to handle tag CDATA */
-typedef int (* tag_cdata_fn)(struct nlsml_parser *, char *, size_t);
-
-/**
- * Tag definition
- */
-struct tag_def {
-	tag_attribs_fn attribs_fn;
-	tag_cdata_fn cdata_fn;
-	switch_bool_t is_root;
-	switch_hash_t *children_tags;
-};
-
-/**
- * library configuration
- */
-typedef struct {
-	/** true if initialized */
-	switch_bool_t init;
-	/** Mapping of tag name to definition */
-	switch_hash_t *tag_defs;
-	/** library memory pool */
-	switch_memory_pool_t *pool;
-} nlsml_globals;
-static nlsml_globals globals = { 0 };
-
-/**
- * The node in the XML tree
- */
-struct nlsml_node {
-	/** tag name */
-	const char *name;
-	/** tag definition */
-	struct tag_def *tag_def;
-	/** parent to this node */
-	struct nlsml_node *parent;
-};
-
-/**
- * The SAX parser state
- */
-struct nlsml_parser {
-	/** current node */
-	struct nlsml_node *cur;
-	/** optional UUID for logging */
-	const char *uuid;
-	/** true if a match exists */
-	int match;
-	/** true if noinput */
-	int noinput;
-	/** true if nomatch */
-	int nomatch;
-};
-
-/**
- * Tag def destructor
- */
-static void destroy_tag_def(void *ptr)
-{
-    struct tag_def *tag = (struct tag_def *) ptr;
-	if (tag->children_tags) {
-		switch_core_hash_destroy(&tag->children_tags);
-	}
-}
-
-/**
- * Add a definition for a tag
- * @param tag the name
- * @param attribs_fn the function to handle the tag attributes
- * @param cdata_fn the function to handler the tag CDATA
- * @param children_tags comma-separated list of valid child tag names
- * @return the definition
- */
-static struct tag_def *add_tag_def(const char *tag, tag_attribs_fn attribs_fn, tag_cdata_fn cdata_fn, const char *children_tags)
-{
-	struct tag_def *def = switch_core_alloc(globals.pool, sizeof(*def));
-	switch_core_hash_init(&def->children_tags);
-	if (!zstr(children_tags)) {
-		char *children_tags_dup = switch_core_strdup(globals.pool, children_tags);
-		char *tags[32] = { 0 };
-		int tag_count = switch_separate_string(children_tags_dup, ',', tags, sizeof(tags) / sizeof(tags[0]));
-		if (tag_count) {
-			int i;
-			for (i = 0; i < tag_count; i++) {
-				switch_core_hash_insert(def->children_tags, tags[i], tags[i]);
-			}
-		}
-	}
-	def->attribs_fn = attribs_fn;
-	def->cdata_fn = cdata_fn;
-	def->is_root = SWITCH_FALSE;
-	switch_core_hash_insert_destructor(globals.tag_defs, tag, def, destroy_tag_def);
-	return def;
-}
-
-/**
- * Add a definition for a root tag
- * @param tag the name
- * @param attribs_fn the function to handle the tag attributes
- * @param cdata_fn the function to handler the tag CDATA
- * @param children_tags comma-separated list of valid child tag names
- * @return the definition
- */
-static struct tag_def *add_root_tag_def(const char *tag, tag_attribs_fn attribs_fn, tag_cdata_fn cdata_fn, const char *children_tags)
-{
-	struct tag_def *def = add_tag_def(tag, attribs_fn, cdata_fn, children_tags);
-	def->is_root = SWITCH_TRUE;
-	return def;
-}
-
-/**
- * Handle tag attributes
- * @param parser the parser
- * @param name the tag name
- * @param atts the attributes
- * @return IKS_OK if OK IKS_BADXML on parse failure
- */
-static int process_tag(struct nlsml_parser *parser, const char *name, char **atts)
-{
-	struct nlsml_node *cur = parser->cur;
-	if (cur->tag_def->is_root && cur->parent == NULL) {
-		/* no parent for ROOT tags */
-		return cur->tag_def->attribs_fn(parser, atts);
-	} else if (!cur->tag_def->is_root && cur->parent) {
-		/* check if this child is allowed by parent node */
-		struct tag_def *parent_def = cur->parent->tag_def;
-		if (switch_core_hash_find(parent_def->children_tags, "ANY") ||
-			switch_core_hash_find(parent_def->children_tags, name)) {
-			return cur->tag_def->attribs_fn(parser, atts);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_INFO, "<%s> cannot be a child of <%s>\n", name, cur->parent->name);
-		}
-	} else if (cur->tag_def->is_root && cur->parent != NULL) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_INFO, "<%s> must be the root element\n", name);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_INFO, "<%s> cannot be a root element\n", name);
-	}
-	return IKS_BADXML;
-}
-
-/**
- * Handle tag attributes that are ignored
- * @param parser the parser
- * @param atts the attributes
- * @return IKS_OK
- */
-static int process_attribs_ignore(struct nlsml_parser *parser, char **atts)
-{
-	return IKS_OK;
-}
-
-/**
- * Handle CDATA that is ignored
- * @param parser the parser
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_OK
- */
-static int process_cdata_ignore(struct nlsml_parser *parser, char *data, size_t len)
-{
-	return IKS_OK;
-}
-
-/**
- * Handle CDATA that is not allowed
- * @param parser the parser
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_BADXML if any printable characters
- */
-static int process_cdata_bad(struct nlsml_parser *parser, char *data, size_t len)
-{
-	int i;
-	for (i = 0; i < len; i++) {
-		if (isgraph(data[i])) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_INFO, "Unexpected CDATA for <%s>\n", parser->cur->name);
-			return IKS_BADXML;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Handle CDATA with match text
- * @param parser the parser
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_OK
- */
-static int process_cdata_match(struct nlsml_parser *parser, char *data, size_t len)
-{
-	int i;
-	for (i = 0; i < len; i++) {
-		if (isgraph(data[i])) {
-			parser->match++;
-			return IKS_OK;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Handle nomatch
- * @param parser the parser
- * @param atts the attributes
- * @return IKS_OK
- */
-static int process_nomatch(struct nlsml_parser *parser, char **atts)
-{
-	parser->nomatch++;
-	return IKS_OK;
-}
-
-/**
- * Handle noinput
- * @param parser the parser
- * @param atts the attributes
- * @return IKS_OK
- */
-static int process_noinput(struct nlsml_parser *parser, char **atts)
-{
-	parser->noinput++;
-	return IKS_OK;
-}
-
-/**
- * Process a tag
- */
-static int tag_hook(void *user_data, char *name, char **atts, int type)
-{
-	int result = IKS_OK;
-	struct nlsml_parser *parser = (struct nlsml_parser *)user_data;
-
-	if (type == IKS_OPEN || type == IKS_SINGLE) {
-		struct nlsml_node *child_node = malloc(sizeof(*child_node));
-		switch_assert(child_node);
-		child_node->name = name;
-		child_node->tag_def = switch_core_hash_find(globals.tag_defs, name);
-		if (!child_node->tag_def) {
-			child_node->tag_def = switch_core_hash_find(globals.tag_defs, "ANY");
-		}
-		child_node->parent = parser->cur;
-		parser->cur = child_node;
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_DEBUG1, "<%s>\n", name);
-		result = process_tag(parser, name, atts);
-	}
-
-	if (type == IKS_CLOSE || type == IKS_SINGLE) {
-		struct nlsml_node *node = parser->cur;
-		parser->cur = node->parent;
-		free(node);
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_DEBUG1, "</%s>\n", name);
-	}
-
-	return result;
-}
-
-/**
- * Process cdata
- * @param user_data the parser
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_OK
- */
-static int cdata_hook(void *user_data, char *data, size_t len)
-{
-	struct nlsml_parser *parser = (struct nlsml_parser *)user_data;
-	if (!parser) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Missing parser\n");
-		return IKS_BADXML;
-	}
-	if (parser->cur) {
-		struct tag_def *def = parser->cur->tag_def;
-		if (def) {
-			return def->cdata_fn(parser, data, len);
-		}
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_INFO, "Missing definition for <%s>\n", parser->cur->name);
-		return IKS_BADXML;
-	}
-	return IKS_OK;
-}
-
-/**
- * Parse the result, looking for noinput/nomatch/match
- * @param nlsml_result the NLSML result to parse
- * @param uuid optional UUID for logging
- * @return true if successful
- */
-enum nlsml_match_type nlsml_parse(const char *nlsml_result, const char *uuid)
-{
-	struct nlsml_parser parser = { 0 };
-	int result = NMT_BAD_XML;
-	iksparser *p = NULL;
-	parser.uuid = uuid;
-
-	if (!zstr(nlsml_result)) {
-		p = iks_sax_new(&parser, tag_hook, cdata_hook);
-		if (iks_parse(p, nlsml_result, 0, 1) == IKS_OK) {
-			/* check result */
-			if (parser.match) {
-				result = NMT_MATCH;
-				goto end;
-			}
-			if (parser.nomatch) {
-				result = NMT_NOMATCH;
-				goto end;
-			}
-			if (parser.noinput) {
-				result = NMT_NOINPUT;
-				goto end;
-			}
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser.uuid), SWITCH_LOG_INFO, "NLSML result does not have match/noinput/nomatch!\n");
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser.uuid), SWITCH_LOG_INFO, "Failed to parse NLSML!\n");
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser.uuid), SWITCH_LOG_INFO, "Missing NLSML result\n");
-	}
- end:
-
-	while (parser.cur) {
-		struct nlsml_node *node = parser.cur;
-		parser.cur = node->parent;
-		free(node);
-	}
-
-	if ( p ) {
-		iks_parser_delete(p);
-	}
-	return result;
-}
-
-#define NLSML_NS "http://www.ietf.org/xml/ns/mrcpv2"
-
-/**
- * Makes NLSML result to conform to mrcpv2
- * @param result the potentially non-conforming result
- * @return the conforming result
- */
-iks *nlsml_normalize(const char *result)
-{
-	iks *result_xml = NULL;
-	iksparser *p = iks_dom_new(&result_xml);
-	if (iks_parse(p, result, 0, 1) == IKS_OK && result_xml) {
-		/* for now, all that is needed is to set the proper namespace */
-		iks_insert_attrib(result_xml, "xmlns", NLSML_NS);
-	} else {
-		/* unexpected ... */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Failed to normalize NLSML result: %s\n", result);
-		if (result_xml) {
-			iks_delete(result_xml);
-		}
-	}
-	iks_parser_delete(p);
-	return result_xml;
-}
-
-/**
- * @return true if digit is a DTMF
- */
-static int isdtmf(const char digit)
-{
-	switch(digit) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case '*':
-	case '#':
-	case 'a':
-	case 'A':
-	case 'b':
-	case 'B':
-	case 'c':
-	case 'C':
-	case 'd':
-	case 'D':
-		return 1;
-	}
-	return 0;
-}
-
-/**
- * Construct an NLSML result for match
- * @param match the matching digits or text
- * @param interpretation the optional digit interpretation
- * @param mode dtmf or speech
- * @param confidence 0-100
- * @return the NLSML <result>
- */
-iks *nlsml_create_match(const char *match, const char *interpretation, const char *mode, int confidence)
-{
-	iks *result = iks_new("result");
-	iks_insert_attrib(result, "xmlns", NLSML_NS);
-	iks_insert_attrib(result, "xmlns:xf", "http://www.w3.org/2000/xforms");
-	if (!zstr(match)) {
-		iks *interpretation_node = iks_insert(result, "interpretation");
-		iks *input_node = iks_insert(interpretation_node, "input");
-		iks *instance_node = iks_insert(interpretation_node, "instance");
-		iks_insert_attrib(input_node, "mode", mode);
-		iks_insert_attrib_printf(input_node, "confidence", "%d", confidence);
-		iks_insert_cdata(input_node, match, strlen(match));
-		if (zstr(interpretation)) {
-			iks_insert_cdata(instance_node, match, strlen(match));
-		} else {
-			iks_insert_cdata(instance_node, interpretation, strlen(interpretation));
-		}
-	}
-	return result;
-}
-
-/**
- * Construct an NLSML result for match
- * @param match the matching digits or text
- * @param interpretation the optional digit interpretation
- * @return the NLSML <result>
- */
-iks *nlsml_create_dtmf_match(const char *digits, const char *interpretation)
-{
-	iks *result = NULL;
-	int first = 1;
-	int i;
-	int num_digits = strlen(digits);
-	switch_stream_handle_t stream = { 0 };
-	SWITCH_STANDARD_STREAM(stream);
-	for (i = 0; i < num_digits; i++) {
-		if (isdtmf(digits[i])) {
-			if (first) {
-				stream.write_function(&stream, "%c", digits[i]);
-				first = 0;
-			} else {
-				stream.write_function(&stream, " %c", digits[i]);
-			}
-		}
-	}
-	result = nlsml_create_match((const char *)stream.data, interpretation, "dtmf", 100);
-	switch_safe_free(stream.data);
-	return result;
-}
-
-/**
- * Initialize NLSML parser.  This function is not thread safe.
- */
-int nlsml_init(void)
-{
-	if (globals.init) {
-		return 1;
-	}
-
-	globals.init = SWITCH_TRUE;
-	switch_core_new_memory_pool(&globals.pool);
-	switch_core_hash_init(&globals.tag_defs);
-
-	add_root_tag_def("result", process_attribs_ignore, process_cdata_ignore, "interpretation");
-	add_tag_def("interpretation", process_attribs_ignore, process_cdata_ignore, "input,model,xf:model,instance,xf:instance");
-	add_tag_def("input", process_attribs_ignore, process_cdata_match, "input,nomatch,noinput");
-	add_tag_def("noinput", process_noinput, process_cdata_bad, "");
-	add_tag_def("nomatch", process_nomatch, process_cdata_ignore, "");
-	add_tag_def("model", process_attribs_ignore, process_cdata_ignore, "ANY");
-	add_tag_def("xf:model", process_attribs_ignore, process_cdata_ignore, "ANY");
-	add_tag_def("instance", process_attribs_ignore, process_cdata_ignore, "ANY");
-	add_tag_def("xf:instance", process_attribs_ignore, process_cdata_ignore, "ANY");
-	add_tag_def("ANY", process_attribs_ignore, process_cdata_ignore, "ANY");
-
-	return 1;
-}
-
-/**
- * Destruction of NLSML parser environment
- */
-void nlsml_destroy(void)
-{
-	if (globals.init) {
-		if (globals.tag_defs) {
-			switch_core_hash_destroy(&globals.tag_defs);
-			globals.tag_defs = NULL;
-		}
-		if (globals.pool) {
-			switch_core_destroy_memory_pool(&globals.pool);
-			globals.pool = NULL;
-		}
-		globals.init = SWITCH_FALSE;
-	}
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/nlsml.h b/src/mod/event_handlers/mod_rayo/nlsml.h
deleted file mode 100644
index 35f79adc26..0000000000
--- a/src/mod/event_handlers/mod_rayo/nlsml.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * nlsml.h -- Parses / creates NLSML results
- *
- */
-#ifndef NLSML_H
-#define NLSML_H
-
-#include <iksemel.h>
-#include <switch.h>
-
-enum nlsml_match_type {
-	NMT_BAD_XML,
-	NMT_MATCH,
-	NMT_NOINPUT,
-	NMT_NOMATCH
-};
-
-SWITCH_DECLARE(int) nlsml_init(void);
-SWITCH_DECLARE(void) nlsml_destroy(void);
-SWITCH_DECLARE(enum nlsml_match_type) nlsml_parse(const char *result, const char *uuid);
-SWITCH_DECLARE(iks *) nlsml_normalize(const char *result);
-SWITCH_DECLARE(iks *) nlsml_create_dtmf_match(const char *digits, const char *interpretation);
-SWITCH_DECLARE(iks *) nlsml_create_match(const char *digits, const char *interpretation, const char *mode, int confidence);
-
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/rayo_components.c b/src/mod/event_handlers/mod_rayo/rayo_components.c
deleted file mode 100644
index 2d303fe3bb..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_components.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_components.c -- Rayo component interface
- *
- */
-#include "rayo_components.h"
-
-#include <switch.h>
-#include "mod_rayo.h"
-#include "iks_helpers.h"
-
-/**
- * Get access to Rayo component data.
- * @param id the component internal ID
- * @return the component or NULL. Call rayo_component_unlock() when done with component pointer.
- */
-struct rayo_component *rayo_component_locate(const char *id, const char *file, int line)
-{
-	struct rayo_actor *actor = rayo_actor_locate_by_id(id, file, line);
-	if (actor && is_component_actor(actor)) {
-		return RAYO_COMPONENT(actor);
-	} else if (actor) {
-		 RAYO_RELEASE(actor);
-	}
-	return NULL;
-}
-
-/**
- * Send component start reply
- * @param component the component
- * @param iq the start request
- */
-void rayo_component_send_start(struct rayo_component *component, iks *iq)
-{
-	iks *response = iks_new_iq_result(iq);
-	iks *ref = iks_insert(response, "ref");
-	iks_insert_attrib(ref, "xmlns", RAYO_NS);
-	iks_insert_attrib_printf(ref, "uri", "xmpp:%s", RAYO_JID(component));
-	RAYO_SEND_REPLY(component, iks_find_attrib(response, "to"), response);
-}
-
-/**
- * Create component complete event
- * @param component the component
- * @param reason_str the completion reason
- * @param reason_namespace the completion reason namespace
- * @param meta metadata to add as child
- * @param child_of_complete if true metadata is child of complete instead of reason
- * @return the event
- */
-iks *rayo_component_create_complete_event_with_metadata(struct rayo_component *component, const char *reason_str, const char *reason_namespace, iks *meta, int child_of_complete)
-{
-	iks *response = iks_new("presence");
-	iks *complete;
-	iks *reason;
-	iks_insert_attrib(response, "from", RAYO_JID(component));
-	iks_insert_attrib(response, "to", component->client_jid);
-	iks_insert_attrib(response, "type", "unavailable");
-	complete = iks_insert(response, "complete");
-	iks_insert_attrib(complete, "xmlns", RAYO_EXT_NS);
-	reason = iks_insert(complete, reason_str);
-	iks_insert_attrib(reason, "xmlns", reason_namespace);
-	if (meta) {
-		meta = iks_copy_within(meta, iks_stack(response));
-		if (child_of_complete) {
-			iks_insert_node(complete, meta);
-		} else {
-			iks_insert_node(reason, meta);
-		}
-	}
-
-	return response;
-}
-
-/**
- * Create component complete event
- * @param component the component
- * @param reason the completion reason
- * @param reason_namespace the completion reason namespace
- * @return the event
- */
-iks *rayo_component_create_complete_event(struct rayo_component *component, const char *reason, const char *reason_namespace)
-{
-	return rayo_component_create_complete_event_with_metadata(component, reason, reason_namespace, NULL, 0);
-}
-
-/**
- * Send rayo component complete event
- */
-void rayo_component_send_complete_event(struct rayo_component *component, iks *response)
-{
-	component->complete = 1;
-	RAYO_SEND_REPLY(component, iks_find_attrib(response, "to"), response);
-	RAYO_RELEASE(component);
-	RAYO_DESTROY(component);
-}
-
-/**
- * Send rayo complete
- */
-void rayo_component_send_complete(struct rayo_component *component, const char *reason, const char *reason_namespace)
-{
-	rayo_component_send_complete_event(component, rayo_component_create_complete_event(component, reason, reason_namespace));
-}
-
-/**
- * Send rayo complete
- */
-void rayo_component_send_complete_with_metadata(struct rayo_component *component, const char *reason, const char *reason_namespace, iks *meta, int child_of_complete)
-{
-	rayo_component_send_complete_event(component, rayo_component_create_complete_event_with_metadata(component, reason, reason_namespace, meta, child_of_complete));
-}
-
-/**
- * Send rayo complete
- */
-void rayo_component_send_complete_with_metadata_string(struct rayo_component *component, const char *reason, const char *reason_namespace, const char *meta, int child_of_complete)
-{
-	iks *meta_xml = NULL;
-	iksparser *p = iks_dom_new(&meta_xml);
-	if (iks_parse(p, meta, 0, 1) != IKS_OK) {
-		/* unexpected ... */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s Failed to parse metadata for complete event: %s\n",
-			RAYO_JID(component), meta);
-		/* send without... */
-		rayo_component_send_complete(component, reason, reason_namespace);
-	} else {
-		rayo_component_send_complete_with_metadata(component, reason, reason_namespace, meta_xml, child_of_complete);
-	}
-	if (meta_xml) {
-		iks_delete(meta_xml);
-	}
-	iks_parser_delete(p);
-}
-
-/**
- * Background API data
- */
-struct component_bg_api_cmd {
-	const char *cmd;
-	const char *args;
-	switch_memory_pool_t *pool;
-	struct rayo_component *component;
-};
-
-/**
- * Thread that outputs to component
- * @param thread this thread
- * @param obj the Rayo mixer context
- * @return NULL
- */
-static void *SWITCH_THREAD_FUNC component_bg_api_thread(switch_thread_t *thread, void *obj)
-{
-	struct component_bg_api_cmd *cmd = (struct component_bg_api_cmd *)obj;
-	switch_stream_handle_t stream = { 0 };
-	switch_memory_pool_t *pool = cmd->pool;
-	SWITCH_STANDARD_STREAM(stream);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BGAPI EXEC: %s %s\n", cmd->cmd, cmd->args);
-	if (switch_api_execute(cmd->cmd, cmd->args, NULL, &stream) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BGAPI EXEC FAILURE\n");
-		rayo_component_send_complete(cmd->component, COMPONENT_COMPLETE_ERROR);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BGAPI EXEC RESULT: %s\n", (char *)stream.data);
-	}
-	switch_safe_free(stream.data);
-	switch_core_destroy_memory_pool(&pool);
-	return NULL;
-}
-
-/**
- * Run a background API command
- * @param cmd API command
- * @param args API args
- */
-void rayo_component_api_execute_async(struct rayo_component *component, const char *cmd, const char *args)
-{
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	struct component_bg_api_cmd *bg_cmd = NULL;
-	switch_memory_pool_t *pool;
-
-	/* set up command */
-	switch_core_new_memory_pool(&pool);
-	bg_cmd = switch_core_alloc(pool, sizeof(*bg_cmd));
-	bg_cmd->pool = pool;
-	bg_cmd->cmd = switch_core_strdup(pool, cmd);
-	bg_cmd->args = switch_core_strdup(pool, args);
-	bg_cmd->component = component;
-
-	/* create thread */
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s BGAPI START\n", RAYO_JID(component));
-	switch_threadattr_create(&thd_attr, pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&thread, thd_attr, component_bg_api_thread, bg_cmd, pool);
-}
-
-/**
- * Handle configuration
- */
-switch_status_t rayo_components_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file)
-{
-	if (rayo_input_component_load(module_interface, pool, config_file) != SWITCH_STATUS_SUCCESS ||
-		rayo_output_component_load(module_interface, pool, config_file) != SWITCH_STATUS_SUCCESS ||
-		rayo_prompt_component_load(module_interface, pool, config_file) != SWITCH_STATUS_SUCCESS ||
-		rayo_record_component_load(module_interface, pool, config_file) != SWITCH_STATUS_SUCCESS ||
-		rayo_fax_components_load(module_interface, pool, config_file) != SWITCH_STATUS_SUCCESS ||
-		rayo_exec_component_load(module_interface, pool, config_file) != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_TERM;
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Handle shutdown
- */
-switch_status_t rayo_components_shutdown(void)
-{
-	rayo_input_component_shutdown();
-	rayo_output_component_shutdown();
-	rayo_prompt_component_shutdown();
-	rayo_record_component_shutdown();
-	rayo_fax_components_shutdown();
-	rayo_exec_component_shutdown();
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/rayo_components.h b/src/mod/event_handlers/mod_rayo/rayo_components.h
deleted file mode 100644
index 9be7881a4e..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_components.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * components.c -- Rayo component implementations
- *
- */
-#ifndef RAYO_COMPONENTS_H
-#define RAYO_COMPONENTS_H
-
-#include <switch.h>
-#include <iksemel.h>
-
-#include "mod_rayo.h"
-
-#define RAYO_EXT_NS RAYO_BASE "ext:" RAYO_VERSION
-#define RAYO_EXT_COMPLETE_NS RAYO_BASE "ext:complete:" RAYO_VERSION
-
-#define RAYO_OUTPUT_NS RAYO_BASE "output:" RAYO_VERSION
-#define RAYO_OUTPUT_COMPLETE_NS RAYO_BASE "output:complete:" RAYO_VERSION
-
-#define RAYO_INPUT_NS RAYO_BASE "input:" RAYO_VERSION
-#define RAYO_INPUT_COMPLETE_NS RAYO_BASE "input:complete:" RAYO_VERSION
-
-#define RAYO_RECORD_NS RAYO_BASE "record:" RAYO_VERSION
-#define RAYO_RECORD_COMPLETE_NS RAYO_BASE "record:complete:" RAYO_VERSION
-
-#define RAYO_PROMPT_NS RAYO_BASE "prompt:" RAYO_VERSION
-#define RAYO_PROMPT_COMPLETE_NS RAYO_BASE "prompt:complete:" RAYO_VERSION
-
-#define RAYO_FAX_NS RAYO_BASE "fax:" RAYO_VERSION
-#define RAYO_FAX_COMPLETE_NS RAYO_BASE "fax:complete:" RAYO_VERSION
-
-#define RAYO_EXEC_NS RAYO_BASE "exec:" RAYO_VERSION
-#define RAYO_EXEC_COMPLETE_NS RAYO_BASE "exec:complete:" RAYO_VERSION
-
-#define COMPONENT_COMPLETE_STOP "stop", RAYO_EXT_COMPLETE_NS
-#define COMPONENT_COMPLETE_ERROR "error", RAYO_EXT_COMPLETE_NS
-#define COMPONENT_COMPLETE_HANGUP "hangup", RAYO_EXT_COMPLETE_NS
-#define COMPONENT_COMPLETE_DONE "done", RAYO_EXT_COMPLETE_NS
-
-SWITCH_DECLARE(switch_status_t) rayo_components_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file);
-SWITCH_DECLARE(switch_status_t) rayo_input_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file);
-SWITCH_DECLARE(switch_status_t) rayo_output_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file);
-SWITCH_DECLARE(switch_status_t) rayo_prompt_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file);
-SWITCH_DECLARE(switch_status_t) rayo_record_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file);
-SWITCH_DECLARE(switch_status_t) rayo_fax_components_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file);
-SWITCH_DECLARE(switch_status_t) rayo_exec_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file);
-
-SWITCH_DECLARE(switch_status_t) rayo_components_shutdown(void);
-SWITCH_DECLARE(switch_status_t) rayo_input_component_shutdown(void);
-SWITCH_DECLARE(switch_status_t) rayo_output_component_shutdown(void);
-SWITCH_DECLARE(switch_status_t) rayo_prompt_component_shutdown(void);
-SWITCH_DECLARE(switch_status_t) rayo_record_component_shutdown(void);
-SWITCH_DECLARE(switch_status_t) rayo_fax_components_shutdown(void);
-SWITCH_DECLARE(switch_status_t) rayo_exec_component_shutdown(void);
-
-SWITCH_DECLARE(void) rayo_component_send_start(struct rayo_component *component, iks *iq);
-SWITCH_DECLARE(void) rayo_component_send_iq_error(struct rayo_component *component, iks *iq, const char *error_name, const char *error_type);
-SWITCH_DECLARE(void) rayo_component_send_iq_error_detailed(struct rayo_component *component, iks *iq, const char *error_name, const char *error_type, const char *detail);
-SWITCH_DECLARE(void) rayo_component_send_complete(struct rayo_component *component, const char *reason, const char *reason_namespace);
-SWITCH_DECLARE(void) rayo_component_send_complete_event(struct rayo_component *component, iks *response);
-SWITCH_DECLARE(void) rayo_component_send_complete_with_metadata(struct rayo_component *component, const char *reason, const char *reason_namespace, iks *meta, int child_of_complete);
-SWITCH_DECLARE(void) rayo_component_send_complete_with_metadata_string(struct rayo_component *component, const char *reason, const char *reason_namespace, const char *meta, int child_of_complete);
-
-SWITCH_DECLARE(iks *) rayo_component_create_complete_event(struct rayo_component *component, const char *reason, const char *reason_namespace);
-SWITCH_DECLARE(iks *) rayo_component_create_complete_event_with_metadata(struct rayo_component *component, const char *reason, const char *reason_namespace, iks *meta, int child_of_complete);
-
-SWITCH_DECLARE(void) rayo_component_api_execute_async(struct rayo_component *component, const char *cmd, const char *args);
-
-#define RAYO_COMPONENT_LOCATE(id) rayo_component_locate(id, __FILE__, __LINE__)
-SWITCH_DECLARE(struct rayo_component *) rayo_component_locate(const char *id, const char *file, int line);
-
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
-
diff --git a/src/mod/event_handlers/mod_rayo/rayo_cpa_component.c b/src/mod/event_handlers/mod_rayo/rayo_cpa_component.c
deleted file mode 100644
index 15dcd74aa7..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_cpa_component.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2014, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_cpa_component.c -- input component "cpa" mode implementation
- */
-#include <switch.h>
-
-#include "rayo_cpa_component.h"
-#include "mod_rayo.h"
-#include "rayo_components.h"
-#include "rayo_cpa_detector.h"
-
-/**
- * Module globals
- */
-static struct {
-	/** signal subscribers */
-	switch_hash_t *subscribers;
-	/** synchronizes access to subscribers */
-	switch_mutex_t *subscribers_mutex;
-	/** module pool */
-	switch_memory_pool_t *pool;
-} globals;
-
-/**
- * A CPA signal monitored by this component
- */
-struct cpa_signal {
-	/** name of this signal */
-	const char *name;
-	/** true if signal causes component termination */
-	int terminate;
-};
-
-/**
- * CPA component state
- */
-struct cpa_component {
-	/** component base class */
-	struct rayo_component base;
-	/** true if ready to forward detector events */
-	int ready;
-	/** signals this component wants */
-	switch_hash_t *signals;
-};
-
-#define CPA_COMPONENT(x) ((struct cpa_component *)x)
-
-typedef void (* subscriber_execute_fn)(const char *jid, void *user_data);
-
-/**
- * Request signals
- */
-static void subscribe(const char *uuid, const char *signal_type, const char *jid)
-{
-	char *key = switch_mprintf("%s:%s", uuid, signal_type);
-	switch_mutex_lock(globals.subscribers_mutex);
-	{
-		switch_hash_t *signal_subscribers = switch_core_hash_find(globals.subscribers, key);
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Subscribe %s => %s\n", signal_type, jid);
-		if (!signal_subscribers) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Create %s subscriber hash\n", signal_type);
-			switch_core_hash_init(&signal_subscribers);
-			switch_core_hash_insert(globals.subscribers, key, signal_subscribers);
-		}
-		switch_core_hash_insert(signal_subscribers, jid, "1");
-	}
-	switch_mutex_unlock(globals.subscribers_mutex);
-	switch_safe_free(key);
-}
-
-/**
- * Stop receiving signals
- */
-static void unsubscribe(const char *uuid, const char *signal_type, const char *jid)
-{
-	char *key = switch_mprintf("%s:%s", uuid, signal_type);
-	switch_mutex_lock(globals.subscribers_mutex);
-	{
-		switch_hash_t *signal_subscribers = switch_core_hash_find(globals.subscribers, key);
-		if (signal_subscribers) {
-			switch_core_hash_delete(signal_subscribers, jid);
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Unsubscribe %s => %s\n", signal_type, jid);
-
-			/* clean up hash if empty */
-			if (switch_core_hash_empty(signal_subscribers)) {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Destroy %s subscriber hash\n", signal_type);
-				switch_core_hash_destroy(&signal_subscribers);
-				switch_core_hash_delete(globals.subscribers, key);
-			}
-		}
-	}
-	switch_mutex_unlock(globals.subscribers_mutex);
-	switch_safe_free(key);
-}
-
-/**
- * Execute function for each subscriber
- */
-static void subscriber_execute(const char *uuid, const char *signal_type, subscriber_execute_fn callback, void *user_data)
-{
-	switch_event_t *subscriber_list = NULL;
-	switch_event_header_t *subscriber = NULL;
-
-	/* fetch list of subscribers */
-	char *key = switch_mprintf("%s:%s", uuid, signal_type);
-	switch_event_create_subclass(&subscriber_list, SWITCH_EVENT_CLONE, NULL);
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Subscriber execute %s\n", signal_type);
-	switch_mutex_lock(globals.subscribers_mutex);
-	{
-		switch_hash_index_t *hi = NULL;
-		switch_hash_t *signal_subscribers = switch_core_hash_find(globals.subscribers, key);
-		if (signal_subscribers) {
-			for (hi = switch_core_hash_first(signal_subscribers); hi; hi = switch_core_hash_next(&hi)) {
-				const void *jid;
-				void *dont_care;
-				switch_core_hash_this(hi, &jid, NULL, &dont_care);
-				switch_event_add_header_string(subscriber_list, SWITCH_STACK_BOTTOM, "execute", (const char *)jid);
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "No subscribers for %s\n", signal_type);
-		}
-	}
-	switch_mutex_unlock(globals.subscribers_mutex);
-	switch_safe_free(key);
-
-	/* execute function for each subscriber */
-	for (subscriber = subscriber_list->headers; subscriber; subscriber = subscriber->next) {
-		callback(subscriber->value, user_data);
-	}
-
-	switch_event_destroy(&subscriber_list);
-}
-
-/**
- * Stop all CPA detectors
- */
-static void stop_cpa_detectors(struct cpa_component *cpa)
-{
-	if (cpa->signals) {
-		switch_hash_index_t *hi = NULL;
-		for (hi = switch_core_hash_first(cpa->signals); hi; hi = switch_core_hash_next(&hi)) {
-			const void *signal_type;
-			void *cpa_signal = NULL;
-			switch_core_hash_this(hi, &signal_type, NULL, &cpa_signal);
-			if (cpa_signal) {
-				rayo_cpa_detector_stop(RAYO_ACTOR(cpa)->parent->id, ((struct cpa_signal *)cpa_signal)->name);
-				unsubscribe(RAYO_ACTOR(cpa)->parent->id, ((struct cpa_signal *)cpa_signal)->name, RAYO_JID(cpa));
-			}
-		}
-		switch_core_hash_destroy(&cpa->signals);
-		cpa->signals = NULL;
-	}
-	unsubscribe(RAYO_ACTOR(cpa)->parent->id, "hangup", RAYO_JID(cpa));
-}
-
-/**
- * Stop execution of CPA component
- */
-static iks *stop_cpa_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	stop_cpa_detectors(CPA_COMPONENT(component));
-	rayo_component_send_complete(RAYO_COMPONENT(component), COMPONENT_COMPLETE_STOP);
-	return iks_new_iq_result(msg->payload);
-}
-
-/**
- * Forward CPA signal to client
- */
-static void rayo_cpa_detector_event(const char *jid, void *user_data)
-{
-	struct rayo_actor *component = RAYO_LOCATE(jid);
-	if (component) {
-		if (CPA_COMPONENT(component)->ready) {
-			switch_event_t *event = (switch_event_t *)user_data;
-			const char *signal_type = switch_event_get_header(event, "signal-type");
-			struct cpa_signal *cpa_signal = switch_core_hash_find(CPA_COMPONENT(component)->signals, signal_type);
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(component->parent->id), SWITCH_LOG_DEBUG, "Handling CPA event\n");
-			if (cpa_signal) {
-				const char *value = switch_event_get_header(event, "value");
-				const char *duration = switch_event_get_header(event, "duration");
-				if (cpa_signal->terminate) {
-					iks *complete_event;
-					iks *signal_xml;
-
-					stop_cpa_detectors(CPA_COMPONENT(component));
-
-					/* send complete event to client */
-					complete_event = rayo_component_create_complete_event(RAYO_COMPONENT(component), "signal", RAYO_CPA_NS);
-					signal_xml = iks_find(complete_event, "complete");
-					signal_xml = iks_find(signal_xml, "signal");
-					iks_insert_attrib(signal_xml, "type", signal_type);
-					if (!zstr(value)) {
-						iks_insert_attrib(signal_xml, "value", value);
-					}
-					if (!zstr(duration)) {
-						iks_insert_attrib(signal_xml, "duration", duration);
-					}
-					rayo_component_send_complete_event(RAYO_COMPONENT(component), complete_event);
-				} else {
-					/* send event to client */
-					iks *signal_event = iks_new_presence("signal", RAYO_CPA_NS, RAYO_JID(component), RAYO_COMPONENT(component)->client_jid);
-					iks *signal_xml = iks_find(signal_event, "signal");
-					iks_insert_attrib(signal_xml, "type", signal_type);
-					if (!zstr(value)) {
-						iks_insert_attrib(signal_xml, "value", value);
-					}
-					if (!zstr(duration)) {
-						iks_insert_attrib(signal_xml, "duration", duration);
-					}
-					RAYO_SEND_REPLY(component, RAYO_COMPONENT(component)->client_jid, signal_event);
-				}
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(component->parent->id), SWITCH_LOG_DEBUG, "Skipping CPA event\n");
-		}
-		RAYO_RELEASE(component);
-	}
-}
-
-/**
- * Handle CPA signal-type event
- */
-static void on_rayo_cpa_detector_event(switch_event_t *event)
-{
-	subscriber_execute(switch_event_get_header(event, "Unique-ID"), switch_event_get_header(event, "signal-type"), rayo_cpa_detector_event, event);
-}
-
-/**
- * Handle CPA completion because of hangup
- */
-static void rayo_cpa_component_hangup(const char *jid, void *user_data)
-{
-	struct rayo_actor *component = RAYO_LOCATE(jid);
-	if (component) {
-		stop_cpa_detectors(CPA_COMPONENT(component));
-		rayo_component_send_complete(RAYO_COMPONENT(component), COMPONENT_COMPLETE_HANGUP);
-		RAYO_RELEASE(component);
-	}
-}
-
-/**
- * Handle hungup call event
- */
-static void on_channel_hangup_complete_event(switch_event_t *event)
-{
-	subscriber_execute(switch_event_get_header(event, "Unique-ID"), "hangup", rayo_cpa_component_hangup, event);
-}
-
-/**
- * Start CPA
- */
-iks *rayo_cpa_component_start(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *iq = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	iks *input = iks_find(iq, "input");
-	switch_memory_pool_t *pool = NULL;
-	struct cpa_component *component = NULL;
-	int have_grammar = 0;
-	iks *grammar = NULL;
-
-	/* create CPA component */
-	switch_core_new_memory_pool(&pool);
-	component = switch_core_alloc(pool, sizeof(*component));
-	component = CPA_COMPONENT(rayo_component_init((struct rayo_component *)component, pool, RAT_CALL_COMPONENT, "cpa", NULL, call, iks_find_attrib(iq, "from")));
-	if (!component) {
-		switch_core_destroy_memory_pool(&pool);
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create CPA entity");
-	}
-
-	switch_core_hash_init(&component->signals);
-
-	/* start CPA detectors */
-	for (grammar = iks_find(input, "grammar"); grammar; grammar = iks_next_tag(grammar)) {
-		if (!strcmp("grammar", iks_name(grammar))) {
-			const char *error_str = "";
-			const char *url = iks_find_attrib_soft(grammar, "url");
-			char *url_dup;
-			char *url_params;
-
-			if (zstr(url)) {
-				stop_cpa_detectors(component);
-				RAYO_RELEASE(component);
-				RAYO_DESTROY(component);
-				return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Missing grammar URL");
-			}
-			have_grammar = 1;
-
-			url_dup = strdup(url);
-			switch_assert(url_dup);
-			if ((url_params = strchr(url_dup, '?'))) {
-				*url_params = '\0';
-				url_params++;
-			}
-
-			if (switch_core_hash_find(component->signals, url)) {
-				free(url_dup);
-				stop_cpa_detectors(component);
-				RAYO_RELEASE(component);
-				RAYO_DESTROY(component);
-				return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Duplicate URL");
-			}
-
-			/* start detector */
-			/* TODO return better reasons... */
-			if (rayo_cpa_detector_start(switch_core_session_get_uuid(session), url_dup, &error_str)) {
-				struct cpa_signal *cpa_signal = switch_core_alloc(pool, sizeof(*cpa_signal));
-				cpa_signal->terminate = !zstr(url_params) && strstr(url_params, "terminate=true");
-				cpa_signal->name = switch_core_strdup(pool, url_dup);
-				switch_core_hash_insert(component->signals, cpa_signal->name, cpa_signal);
-				subscribe(switch_core_session_get_uuid(session), cpa_signal->name, RAYO_JID(component));
-			} else {
-				free(url_dup);
-				stop_cpa_detectors(component);
-				RAYO_RELEASE(component);
-				RAYO_DESTROY(component);
-				return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, error_str);
-			}
-
-			free(url_dup);
-		}
-	}
-
-	if (!have_grammar) {
-		stop_cpa_detectors(component);
-		RAYO_RELEASE(component);
-		RAYO_DESTROY(component);
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "No grammar defined");
-	}
-
-	/* acknowledge command */
-	rayo_component_send_start(RAYO_COMPONENT(component), iq);
-
-	/* TODO hangup race condition */
-	subscribe(switch_core_session_get_uuid(session), "hangup", RAYO_JID(component));
-
-	/* ready to forward detector events */
-	component->ready = 1;
-
-	return NULL;
-}
-
-/**
- * Load input CPA
- * @param module_interface
- * @param pool memory pool
- * @param config_file
- * @return SWITCH_STATUS_SUCCESS if successfully loaded
- */
-switch_status_t rayo_cpa_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file)
-{
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "cpa", "set:"RAYO_EXT_NS":stop", stop_cpa_component);
-	switch_event_bind("rayo_cpa_component", SWITCH_EVENT_CUSTOM, "rayo::cpa", on_rayo_cpa_detector_event, NULL);
-	switch_event_bind("rayo_cpa_component", SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE, NULL, on_channel_hangup_complete_event, NULL);
-
-	globals.pool = pool;
-	switch_core_hash_init(&globals.subscribers);
-	switch_mutex_init(&globals.subscribers_mutex, SWITCH_MUTEX_NESTED, pool);
-
-	return rayo_cpa_detector_load(module_interface, pool, config_file);
-}
-
-/**
- * Stop input CPA
- */
-void rayo_cpa_component_shutdown(void)
-{
-	switch_event_unbind_callback(on_rayo_cpa_detector_event);
-	switch_event_unbind_callback(on_channel_hangup_complete_event);
-	rayo_cpa_detector_shutdown();
-	if (globals.subscribers) {
-		switch_core_hash_destroy(&globals.subscribers);
-	}
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/rayo_cpa_component.h b/src/mod/event_handlers/mod_rayo/rayo_cpa_component.h
deleted file mode 100644
index 442ec1f4c8..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_cpa_component.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2014, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_cpa_component.h -- Rayo call progress analysis component
- *
- */
-#ifndef RAYO_CPA_COMPONENT_H
-#define RAYO_CPA_COMPONENT_H
-
-#include <switch.h>
-#include <iksemel.h>
-
-#include "mod_rayo.h"
-
-SWITCH_DECLARE(switch_status_t) rayo_cpa_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file);
-SWITCH_DECLARE(void) rayo_cpa_component_shutdown(void);
-SWITCH_DECLARE(iks *) rayo_cpa_component_start(struct rayo_actor *call, struct rayo_message *msg, void *session_data);
-
-#endif
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.c b/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.c
deleted file mode 100644
index 6a85db561b..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2014-2015, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_cpa_detector.c -- Glue to normalize events from and to allow multiple instantiation of various detectors in FreeSWITCH
- */
-
-#include "rayo_cpa_detector.h"
-
-static struct {
-	/** detectors supported by this module mapped by signal-type */
-	switch_hash_t *detectors;
-	/** synchronizes access to detectors */
-	switch_mutex_t *detectors_mutex;
-} globals;
-
-struct rayo_cpa_detector;
-
-/**
- * Detector definition
- */
-struct rayo_cpa_detector {
-	/** unique internal name of this detector */
-	const char *name;
-	/** detector ID */
-	const char *uuid;
-	/** start detection APP */
-	const char *start_app;
-	/** args to pass to start detection app */
-	const char *start_app_args;
-	/** stop detection APP */
-	const char *stop_app;
-	/** args to pass to stop detection app */
-	const char *stop_app_args;
-	/** (optional) name of header to get the signal type from */
-	const char *signal_type_header;
-	/** (optional) where to get the signal value from the event */
-	const char *signal_value_header;
-	/** (optional) where to get the signal duration from the event */
-	const char *signal_duration_header;
-	/** detector event to signal type mapping */
-	switch_hash_t *signal_type_map;
-};
-
-/**
- * Detection state
- */
-struct rayo_cpa_detector_state {
-	/** reference count */
-	int refs;
-};
-
-/**
- * Start detecting
- * @param call_uuid call to detect signal on
- * @param signal_ns namespace of signal to detect
- * @param error_detail on failure, describes the error
- * @return 1 if successful, 0 if failed
- */
-int rayo_cpa_detector_start(const char *call_uuid, const char *signal_ns, const char **error_detail)
-{
-	struct rayo_cpa_detector *detector = switch_core_hash_find(globals.detectors, signal_ns);
-	switch_core_session_t *session;
-	if (detector) {
-		if (zstr(detector->start_app)) {
-			/* nothing to do */
-			return 1;
-		}
-		session = switch_core_session_locate(call_uuid);
-		if (session) {
-			struct rayo_cpa_detector_state *detector_state = switch_channel_get_private(switch_core_session_get_channel(session), detector->uuid);
-			if (detector_state) {
-				/* detector is already running */
-				detector_state->refs++;
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Start detector %s, refs = %d\n", detector->name, detector_state->refs);
-				switch_core_session_rwunlock(session);
-				return 1;
-			}
-			detector_state = switch_core_session_alloc(session, sizeof(*detector_state));
-			detector_state->refs = 1;
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Starting detector %s, refs = 1\n", detector->name);
-			switch_channel_set_private(switch_core_session_get_channel(session), detector->uuid, detector_state);
-			switch_core_session_execute_application_async(session, detector->start_app, zstr(detector->start_app_args) ? NULL : detector->start_app_args);
-			switch_core_session_rwunlock(session);
-			return 1;
-		} else {
-			*error_detail = "session gone";
-			return 0;
-		}
-	}
-	*error_detail = "detector not supported";
-	return 0;
-}
-
-/**
- * Stop detecting
- * @param call_uuid call to stop detecting signal on
- * @param signal_ns name of signal to stop detecting
- */
-void rayo_cpa_detector_stop(const char *call_uuid, const char *signal_ns)
-{
-	struct rayo_cpa_detector *detector = switch_core_hash_find(globals.detectors, signal_ns);
-	switch_core_session_t *session;
-	if (detector) {
-		if (zstr(detector->stop_app)) {
-			/* nothing to do */
-			return;
-		}
-		session = switch_core_session_locate(call_uuid);
-		if (session) {
-			struct rayo_cpa_detector_state *detector_state = switch_channel_get_private(switch_core_session_get_channel(session), detector->uuid);
-			if (detector_state) {
-				detector_state->refs--;
-				if (detector_state->refs < 0) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Stop detector %s refs = %d\n", detector->name, detector_state->refs);
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Stop detector %s refs = %d\n", detector->name, detector_state->refs);
-				}
-				if (detector_state->refs == 0) {
-					/* nobody interested in detector events- shut it down */
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Stopping detector %s\n", detector->name);
-					switch_core_session_execute_application_async(session, detector->stop_app, zstr(detector->stop_app_args) ? NULL : detector->stop_app_args);
-					switch_channel_set_private(switch_core_session_get_channel(session), detector->uuid, NULL);
-				}
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Detector %s is already stopped\n", detector->name);
-			}
-			switch_core_session_rwunlock(session);
-		}
-	}
-}
-
-/**
- * Handle event from detector
- */
-static void rayo_cpa_detector_event(switch_event_t *event)
-{
-	struct rayo_cpa_detector *detector = (struct rayo_cpa_detector *)event->bind_user_data;
-	if (detector) {
-		const char *signal_type = "rayo_default";
-		if (!zstr(detector->signal_type_header)) {
-			signal_type = switch_event_get_header(event, detector->signal_type_header);
-		}
-		if (!zstr(signal_type)) {
-			signal_type = switch_core_hash_find(detector->signal_type_map, signal_type);
-		}
-		if (!zstr(signal_type)) {
-			switch_event_t *cpa_event;
-			const char *uuid = switch_event_get_header(event, "Unique-ID");
-			if (zstr(uuid)) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Detector %s %s event is missing call UUID!\n", detector->name, signal_type);
-				return;
-			}
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Got Rayo CPA event %s\n", signal_type);
-			if (switch_event_create_subclass(&cpa_event, SWITCH_EVENT_CUSTOM, "rayo::cpa") == SWITCH_STATUS_SUCCESS) {
-				switch_event_add_header_string(cpa_event, SWITCH_STACK_BOTTOM, "Unique-ID", uuid);
-				switch_event_add_header_string(cpa_event, SWITCH_STACK_BOTTOM, "detector-name", detector->name);
-				switch_event_add_header_string(cpa_event, SWITCH_STACK_BOTTOM, "detector-uuid", detector->uuid);
-				switch_event_add_header(cpa_event, SWITCH_STACK_BOTTOM, "signal-type", "%s%s:%s", RAYO_CPA_BASE, signal_type, RAYO_VERSION);
-				if (!zstr(detector->signal_value_header)) {
-					const char *value = switch_event_get_header(event, detector->signal_value_header);
-					if (!zstr(value)) {
-						switch_event_add_header_string(cpa_event, SWITCH_STACK_BOTTOM, "value", value);
-					}
-				}
-				if (!zstr(detector->signal_duration_header)) {
-					const char *duration = switch_event_get_header(event, detector->signal_duration_header);
-					if (!zstr(duration)) {
-						switch_event_add_header_string(cpa_event, SWITCH_STACK_BOTTOM, "duration", duration);
-					}
-				}
-				switch_event_fire(&cpa_event);
-			}
-		} else {
-			/* couldn't map event to Rayo signal-type */
-			const char *event_name = switch_event_get_header(event, "Event-Name");
-			const char *event_subclass = switch_event_get_header(event, "Event-Subclass");
-			if (zstr(event_subclass)) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Failed to find Rayo signal-type for event %s\n", event_name);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Failed to find Rayo signal-type for event %s %s\n", event_name, event_subclass);
-			}
-		}
-	}
-}
-
-#define RAYO_CPA_DETECTOR_SYNTAX  "rayo_cpa <uuid> <signal-type> <start|stop>"
-SWITCH_STANDARD_API(rayo_cpa_detector_api)
-{
-	char *cmd_dup = NULL;
-	char *argv[4] = { 0 };
-	int argc = 0;
-
-	if (zstr(cmd)) {
-		stream->write_function(stream, "-ERR: USAGE %s\n", RAYO_CPA_DETECTOR_SYNTAX);
-		goto done;
-	}
-
-	cmd_dup = strdup(cmd);
-	argc = switch_separate_string(cmd_dup, ' ', argv, sizeof(argv) / sizeof(argv[0]));
-
-	if (argc != 3) {
-		stream->write_function(stream, "-ERR: USAGE %s\n", RAYO_CPA_DETECTOR_SYNTAX);
-	} else {
-		const char *err_reason = NULL;
-		if (!strcmp(argv[2], "stop")) {
-			rayo_cpa_detector_stop(argv[0], argv[1]);
-			stream->write_function(stream, "+OK\n");
-		} else if (!strcmp(argv[2], "start")) {
-			if (!rayo_cpa_detector_start(argv[0], argv[1], &err_reason)) {
-				if (err_reason) {
-					stream->write_function(stream, "-ERR: %s\n", err_reason);
-				} else {
-					stream->write_function(stream, "-ERR\n");
-				}
-			} else {
-				stream->write_function(stream, "+OK\n");
-			}
-		} else {
-			stream->write_function(stream, "-ERR: USAGE %s\n", RAYO_CPA_DETECTOR_SYNTAX);
-		}
-	}
-
-done:
-	switch_safe_free(cmd_dup);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Detector definition destructor
- */
-static void destroy_detector(void *ptr)
-{
-    struct rayo_cpa_detector *detector = (struct rayo_cpa_detector *) ptr;
-	if (detector->signal_type_map) {
-		switch_core_hash_destroy(&detector->signal_type_map);
-	}
-}
-
-/**
- * Configure CPA
- */
-static switch_status_t do_config(switch_memory_pool_t *pool, const char *config_file)
-{
-	switch_xml_t cfg, xml, cpa_xml;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_hash_t *bound_events;
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Configuring CPA\n");
-	if (!(xml = switch_xml_open_cfg(config_file, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", config_file);
-		return SWITCH_STATUS_TERM;
-	}
-
-	switch_core_hash_init(&bound_events);
-
-	cpa_xml = switch_xml_child(cfg, "cpa");
-	if (cpa_xml) {
-		switch_xml_t detector_xml;
-
-		for (detector_xml = switch_xml_child(cpa_xml, "detector"); detector_xml; detector_xml = detector_xml->next) {
-			switch_xml_t start_xml, stop_xml, event_xml;
-			struct rayo_cpa_detector *detector;
-			char id[SWITCH_UUID_FORMATTED_LENGTH + 1] = { 0 };
-			const char *name = switch_xml_attr_soft(detector_xml, "name");
-			if (zstr(name)) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing name of CPA detector!\n");
-				status = SWITCH_STATUS_TERM;
-				goto done;
-			}
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CPA detector: %s\n", name);
-			detector = switch_core_alloc(pool, sizeof(*detector));
-			switch_core_hash_init(&detector->signal_type_map);
-			detector->name = switch_core_strdup(pool, name);
-			switch_uuid_str(id, sizeof(id));
-			detector->uuid = switch_core_strdup(pool, id);
-
-			start_xml = switch_xml_child(detector_xml, "start");
-			if (start_xml) {
-				detector->start_app = switch_core_strdup(pool, switch_xml_attr_soft(start_xml, "application"));
-				detector->start_app_args = switch_core_strdup(pool, switch_xml_attr_soft(start_xml, "data"));
-			}
-
-			stop_xml = switch_xml_child(detector_xml, "stop");
-			if (stop_xml) {
-				detector->stop_app = switch_core_strdup(pool, switch_xml_attr_soft(stop_xml, "application"));
-				detector->stop_app_args = switch_core_strdup(pool, switch_xml_attr_soft(stop_xml, "data"));
-			}
-
-			event_xml = switch_xml_child(detector_xml, "event");
-			if (event_xml) {
-				int event_ok = 0;
-				switch_xml_t signal_type_xml;
-				const char *event_class = switch_xml_attr_soft(event_xml, "class");
-				const char *event_subclass = switch_xml_attr_soft(event_xml, "subclass");
-				switch_event_types_t event_type;
-				if (zstr(event_class)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing event class for CPA detector: %s\n", detector->name);
-					status = SWITCH_STATUS_TERM;
-					goto done;
-				}
-
-				if (switch_name_event(event_class, &event_type) != SWITCH_STATUS_SUCCESS) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid event class %s for CPA detector: %s\n", event_class, detector->name);
-					status = SWITCH_STATUS_TERM;
-					goto done;
-				}
-
-				/* bind detector to event if not already done... */
-				{
-					struct rayo_cpa_detector *bound_detector;
-					const char *event_name = switch_core_sprintf(pool, "%s %s", event_class, event_subclass);
-					if (!(bound_detector = switch_core_hash_find(bound_events, event_name))) {
-						/* not yet bound */
-						if (zstr(event_subclass)) {
-							event_subclass = NULL;
-						}
-						switch_event_bind("rayo_cpa_detector", event_type, event_subclass, rayo_cpa_detector_event, detector);
-						switch_core_hash_insert(bound_events, event_name, detector); /* mark as bound */
-					} else if (bound_detector != detector) {
-						/* can't have multiple detectors generating the same event! */
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Detector %s attempted to bind to event %s that is already bound by %s\n", detector->name, event_name, bound_detector->name);
-						status = SWITCH_STATUS_TERM;
-						goto done;
-					}
-				}
-
-				/* configure native event -> rayo CPA event mapping */
-				detector->signal_type_header = switch_core_strdup(pool, switch_xml_attr_soft(event_xml, "type-header"));
-				detector->signal_value_header = switch_core_strdup(pool, switch_xml_attr_soft(event_xml, "value-header"));
-				detector->signal_duration_header = switch_core_strdup(pool, switch_xml_attr_soft(event_xml, "duration-header"));
-
-				/* configure native event type -> rayo CPA signal type mapping */
-				for (signal_type_xml = switch_xml_child(event_xml, "signal-type"); signal_type_xml; signal_type_xml = signal_type_xml->next) {
-					const char *header_value = switch_core_strdup(pool, switch_xml_attr_soft(signal_type_xml, "header-value"));
-					const char *signal_type = switch_core_strdup(pool, switch_xml_attr_soft(signal_type_xml, "value"));
-					if (zstr(signal_type)) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Detector %s missing signal-type value!\n", detector->name);
-						status = SWITCH_STATUS_TERM;
-						goto done;
-					} else {
-						/* add signal-type to detector mapping if not already done for this detector */
-						const char *signal_type_ns = switch_core_sprintf(pool, "%s%s:%s", RAYO_CPA_BASE, signal_type, RAYO_VERSION);
-						struct rayo_cpa_detector *bound_detector = switch_core_hash_find(globals.detectors, signal_type_ns);
-						if (!bound_detector) {
-							switch_core_hash_insert_destructor(globals.detectors, signal_type_ns, detector, destroy_detector);
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding CPA %s => %s\n", signal_type_ns, detector->name);
-							event_ok = 1;
-						} else if (bound_detector == detector) {
-							/* detector has multiple signal-type configs w/ same value */
-							event_ok = 1;
-						} else {
-							/* multiple detectors with same signal-type value */
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Detector %s configured to handle signal-type %s that is already handled by %s\n", detector->name, signal_type, bound_detector->name);
-							status = SWITCH_STATUS_TERM;
-							goto done;
-						}
-					}
-
-					/* map event value to signal-type */
-					if (zstr(header_value)) {
-						switch_core_hash_insert(detector->signal_type_map, "rayo_default", signal_type);
-					} else {
-						switch_core_hash_insert(detector->signal_type_map, header_value, signal_type);
-					}
-				}
-
-				if (!event_ok) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Detector %s is missing Rayo signal-type for event\n", detector->name);
-					status = SWITCH_STATUS_TERM;
-					goto done;
-				}
-			}
-		}
-	}
-
-done:
-	switch_core_hash_destroy(&bound_events);
-	switch_xml_free(xml);
-
-	return status;
-}
-
-/**
- * Console auto-completion for signal types
- */
-static switch_status_t rayo_cpa_detector_signal_types(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	switch_hash_index_t *hi;
-	void *val;
-	const void *vvar;
-	switch_console_callback_match_t *my_matches = NULL;
-
-	switch_mutex_lock(globals.detectors_mutex);
-	for (hi = switch_core_hash_first(globals.detectors); hi; hi = switch_core_hash_next(&hi)) {
-		switch_core_hash_this(hi, &vvar, NULL, &val);
-		switch_console_push_match(&my_matches, (const char *) vvar);
-	}
-	switch_mutex_unlock(globals.detectors_mutex);
-
-	if (my_matches) {
-		*matches = my_matches;
-		status = SWITCH_STATUS_SUCCESS;
-	}
-
-	return status;
-}
-
-/**
- * Load CPA signal detection features
- * @param module_interface
- * @param pool memory pool
- * @param config_file
- * @return SWITCH_STATUS_SUCCESS if successfully loaded
- */
-switch_status_t rayo_cpa_detector_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file)
-{
-	switch_api_interface_t *api_interface;
-
-	switch_core_hash_init(&globals.detectors);
-	switch_mutex_init(&globals.detectors_mutex, SWITCH_MUTEX_NESTED, pool);
-
-	if (do_config(pool, config_file) != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_TERM;
-	}
-
-	SWITCH_ADD_API(api_interface, "rayo_cpa", "Query rayo status", rayo_cpa_detector_api, RAYO_CPA_DETECTOR_SYNTAX);
-
-	switch_console_set_complete("add rayo_cpa ::console::list_uuid ::rayo_cpa::list_signal_types start");
-	switch_console_set_complete("add rayo_cpa ::console::list_uuid ::rayo_cpa::list_signal_types stop");
-	switch_console_add_complete_func("::rayo_cpa::list_signal_types", rayo_cpa_detector_signal_types);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Disable CPA signal detection features
- */
-void rayo_cpa_detector_shutdown(void)
-{
-	switch_console_set_complete("del rayo_cpa");
-	switch_console_del_complete_func("::rayo_cpa::list_signal_types");
-	if (globals.detectors) {
-		switch_core_hash_destroy(&globals.detectors);
-	}
-	switch_event_unbind_callback(rayo_cpa_detector_event);
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.h b/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.h
deleted file mode 100644
index fec720dadf..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2014, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_cpa_detector.h -- Rayo call progress analysis
- *
- */
-#ifndef RAYO_CPA_DETECTOR_H
-#define RAYO_CPA_DETECTOR_H
-
-#include <switch.h>
-
-#include "mod_rayo.h"
-
-SWITCH_DECLARE(switch_status_t) rayo_cpa_detector_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file);
-SWITCH_DECLARE(void) rayo_cpa_detector_shutdown(void);
-SWITCH_DECLARE(int) rayo_cpa_detector_start(const char *call_uuid, const char *signal_ns, const char **error_detail);
-SWITCH_DECLARE(void) rayo_cpa_detector_stop(const char *call_uuid, const char *signal_ns);
-
-#endif
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/rayo_elements.c b/src/mod/event_handlers/mod_rayo/rayo_elements.c
deleted file mode 100644
index 14e9c61c55..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_elements.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_elements.c -- Rayo XML element definition
- *
- */
-#include "rayo_elements.h"
-
-/**
- * <input> component validation
- */
-ELEMENT(RAYO_INPUT)
-	ATTRIB(xmlns,, any)
-	STRING_ATTRIB(mode, any, "any,dtmf,voice,cpa")
-	OPTIONAL_ATTRIB(terminator,, dtmf_digit)
-	ATTRIB(recognizer,, any)
-	ATTRIB(language, en-US, any)
-	ATTRIB(initial-timeout, -1, positive_or_neg_one)
-	ATTRIB(inter-digit-timeout, -1, positive_or_neg_one)
-	ATTRIB(sensitivity, 0.5, decimal_between_zero_and_one)
-	ATTRIB(min-confidence, 0, decimal_between_zero_and_one)
-	ATTRIB(max-silence, -1, positive_or_neg_one)
-	STRING_ATTRIB(match-content-type, application/nlsml+xml, "application/nlsml+xml")
-	/* internal attribs for prompt support */
-	ATTRIB(barge-event, false, bool)
-	ATTRIB(start-timers, true, bool)
-ELEMENT_END
-
-/**
- * <join> command validation
- */
-ELEMENT(RAYO_JOIN)
-	ATTRIB(xmlns,, any)
-	STRING_ATTRIB(direction, duplex, "send,recv,duplex")
-	STRING_ATTRIB(media, bridge, "bridge,direct")
-	ATTRIB(call-uri,, any)
-	ATTRIB(mixer-name,, any)
-ELEMENT_END
-
-/**
- * <output> component validation
- */
-ELEMENT(RAYO_OUTPUT)
-	ATTRIB(xmlns,, any)
-	ATTRIB(start-offset, 0, not_negative)
-	ATTRIB(start-paused, false, bool)
-	ATTRIB(repeat-interval, 0, not_negative)
-	ATTRIB(repeat-times, 1, not_negative)
-	ATTRIB(max-time, -1, positive_or_neg_one)
-	ATTRIB(renderer,, any)
-	ATTRIB(voice,, any)
-	STRING_ATTRIB(direction, out, "out,in")
-ELEMENT_END
-
-/**
- * <output><seek> validation
- */
-ELEMENT(RAYO_OUTPUT_SEEK)
-	ATTRIB(xmlns,, any)
-	STRING_ATTRIB(direction,, "forward,back")
-	ATTRIB(amount,-1, positive)
-ELEMENT_END
-
-/**
- * <prompt> component validation
- */
-ELEMENT(RAYO_PROMPT)
-	ATTRIB(xmlns,, any)
-	ATTRIB(barge-in, true, bool)
-ELEMENT_END
-
-/**
- * <receivefax> command validation
- */
-ELEMENT(RAYO_RECEIVEFAX)
-	ATTRIB(xmlns,, any)
-ELEMENT_END
-
-/**
- * <record> component validation
- */
-ELEMENT(RAYO_RECORD)
-	ATTRIB(xmlns,, any)
-	ATTRIB(format, wav, any)
-	ATTRIB(start-beep, false, bool)
-	ATTRIB(stop-beep, false, bool)
-	ATTRIB(start-paused, false, bool)
-	ATTRIB(max-duration, -1, positive_or_neg_one)
-	ATTRIB(initial-timeout, -1, positive_or_neg_one)
-	ATTRIB(final-timeout, -1, positive_or_neg_one)
-	STRING_ATTRIB(direction, duplex, "duplex,send,recv")
-	ATTRIB(mix, false, bool)
-ELEMENT_END
-
-/**
- * <sendfax> command validation
- */
-ELEMENT(RAYO_SENDFAX)
-	ATTRIB(xmlns,, any)
-ELEMENT_END
-
-/**
- * <app> command validation
- */
-ELEMENT(RAYO_APP)
-	ATTRIB(xmlns,, any)
-	ATTRIB(app,, any)
-	OPTIONAL_ATTRIB(args,, any)
-ELEMENT_END
-
-
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
-
diff --git a/src/mod/event_handlers/mod_rayo/rayo_elements.h b/src/mod/event_handlers/mod_rayo/rayo_elements.h
deleted file mode 100644
index dc67a9fa4b..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_elements.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_elements.h -- Rayo XML elements
- *
- */
-#ifndef RAYO_ELEMENTS_H
-#define RAYO_ELEMENTS_H
-
-#include "iks_helpers.h"
-
-ELEMENT_DECL(RAYO_INPUT)
-ELEMENT_DECL(RAYO_JOIN)
-ELEMENT_DECL(RAYO_OUTPUT)
-ELEMENT_DECL(RAYO_OUTPUT_SEEK)
-ELEMENT_DECL(RAYO_PROMPT)
-ELEMENT_DECL(RAYO_RECEIVEFAX)
-ELEMENT_DECL(RAYO_RECORD)
-ELEMENT_DECL(RAYO_SENDFAX)
-ELEMENT_DECL(RAYO_APP)
-
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
-
diff --git a/src/mod/event_handlers/mod_rayo/rayo_exec_component.c b/src/mod/event_handlers/mod_rayo/rayo_exec_component.c
deleted file mode 100644
index a918f0136d..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_exec_component.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_exec_component.c -- Rayo call application execution component
- *
- */
-#include "rayo_components.h"
-#include "rayo_elements.h"
-
-
-/**
- * An exec component
- */
-struct exec_component {
-	/** component base class */
-	struct rayo_component base;
-	/** Dialplan app */
-	const char *app;
-	/** Dialplan app args */
-	char *args;
-};
-
-#define EXEC_COMPONENT(x) ((struct exec_component *)x)
-
-/**
- * Wrapper for executing dialplan app
- */
-SWITCH_STANDARD_APP(rayo_app_exec)
-{
-	if (!zstr(data)) {
-		struct rayo_component *component = RAYO_COMPONENT_LOCATE(data);
-		if (component) {
-			switch_status_t status;
-			switch_channel_set_variable(switch_core_session_get_channel(session), SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "");
-			status = switch_core_session_execute_application(session, EXEC_COMPONENT(component)->app, EXEC_COMPONENT(component)->args);
-			if (status != SWITCH_STATUS_SUCCESS) {
-				rayo_component_send_complete(component, COMPONENT_COMPLETE_ERROR);
-			} else {
-				const char *resp = switch_channel_get_variable(switch_core_session_get_channel(session), SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE);
-				if (zstr(resp)) {
-					rayo_component_send_complete(component, COMPONENT_COMPLETE_DONE);
-				} else {
-					/* send complete event to client */
-					iks *response = iks_new("app");
-					iks_insert_attrib(response, "xmlns", RAYO_EXEC_COMPLETE_NS);
-					iks_insert_attrib(response, "response", resp);
-					rayo_component_send_complete_with_metadata(component, COMPONENT_COMPLETE_DONE, response, 1);
-					iks_delete(response);
-				}
-			}
-			RAYO_RELEASE(component);
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Missing rayo exec component JID\n");
-	}
-	switch_channel_set_variable(switch_core_session_get_channel(session), SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "");
-}
-
-/**
- * Create a record component
- */
-static struct rayo_component *exec_component_create(struct rayo_actor *call, const char *client_jid, iks *exec)
-{
-	switch_memory_pool_t *pool;
-	struct exec_component *exec_component = NULL;
-
-	switch_core_new_memory_pool(&pool);
-	exec_component = switch_core_alloc(pool, sizeof(*exec_component));
-	exec_component = EXEC_COMPONENT(rayo_component_init(RAYO_COMPONENT(exec_component), pool, RAT_CALL_COMPONENT, "exec", NULL, call, client_jid));
-	if (exec_component) {
-		exec_component->app = switch_core_strdup(pool, iks_find_attrib_soft(exec, "app"));
-		exec_component->args = switch_core_strdup(pool, iks_find_attrib_soft(exec, "args"));
-	} else {
-		switch_core_destroy_memory_pool(&pool);
-		return NULL;
-	}
-
-	return RAYO_COMPONENT(exec_component);
-}
-
-/**
- * Execute dialplan APP on rayo call
- */
-static iks *start_exec_app_component(struct rayo_actor *call, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *exec = iks_find(iq, "app");
-	struct rayo_component *exec_component = NULL;
-	switch_core_session_t *session = NULL;
-
-	/* validate record attributes */
-	if (!VALIDATE_RAYO_APP(exec)) {
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	exec_component = exec_component_create(call, iks_find_attrib(iq, "from"), exec);
-	if (!exec_component) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create exec entity");
-	}
-
-	session = switch_core_session_locate(call->id);
-	if (session) {
-		if (switch_core_session_execute_application_async(session, switch_core_session_strdup(session, "rayo-app-exec"), switch_core_session_strdup(session, RAYO_JID(exec_component))) != SWITCH_STATUS_SUCCESS) {
-			switch_core_session_rwunlock(session);
-			RAYO_RELEASE(exec_component);
-			RAYO_DESTROY(exec_component);
-			return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "failed to execute app");
-		}
-		switch_core_session_rwunlock(session);
-	} else {
-		RAYO_RELEASE(exec_component);
-		RAYO_DESTROY(exec_component);
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Call is gone");
-	}
-
-	rayo_component_send_start(exec_component, iq);
-
-	return NULL;
-}
-
-/**
- * Initialize exec component
- * @param module_interface
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_exec_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file)
-{
-	switch_application_interface_t *app_interface;
-	SWITCH_ADD_APP(app_interface, "rayo-app-exec", "Wrapper dialplan app for internal use only", "", rayo_app_exec, "", SAF_SUPPORT_NOMEDIA | SAF_ZOMBIE_EXEC);
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_EXEC_NS":app", start_exec_app_component);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Shutdown exec component
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_exec_component_shutdown(void)
-{
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/rayo_fax_components.c b/src/mod/event_handlers/mod_rayo/rayo_fax_components.c
deleted file mode 100644
index b605702005..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_fax_components.c
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2014, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_fax_components.c -- Rayo receivefax and sendfax components implementation
- *
- */
-#include "rayo_components.h"
-#include "rayo_elements.h"
-
-/**
- * settings
- */
-static struct {
-	const char *file_prefix;
-} globals;
-
-struct fax_component {
-	/** component base class */
-	struct rayo_component base;
-	/** Flag to stop fax */
-	int stop;
-};
-
-#define FAX_COMPONENT(x) ((struct fax_component *)x)
-
-struct receivefax_component {
-	/** fax component base class */
-	struct fax_component base;
-	/** true if HTTP PUT needs to be done after fax is received */
-	int http_put_after_receive;
-	/** fax stored on local filesystem */
-	const char *local_filename;
-	/** fax final target (may be same as local filename) */
-	const char *filename;
-};
-
-#define RECEIVEFAX_COMPONENT(x) ((struct receivefax_component *)x)
-
-#define FAX_FINISH "finish", RAYO_FAX_COMPLETE_NS
-
-/**
- * Start execution of call sendfax component
- * @param call the call to send fax to
- * @param msg the original request
- * @param session_data the call's session
- */
-static iks *start_sendfax_component(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *iq = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	struct fax_component *sendfax_component = NULL;
-	iks *sendfax = iks_find(iq, "sendfax");
-	iks *response = NULL;
-	switch_event_t *execute_event = NULL;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_memory_pool_t *pool;
-	iks *document;
-	const char *fax_document;
-	const char *fax_header;
-	const char *fax_identity;
-	const char *pages;
-
-	/* validate attributes */
-	if (!VALIDATE_RAYO_SENDFAX(sendfax)) {
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	/* fax is only allowed if the call is not currently joined */
-	if (rayo_call_is_joined(RAYO_CALL(call))) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "can't send fax on a joined call");
-	}
-
-	if (rayo_call_is_faxing(RAYO_CALL(call))) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "fax already in progress");
-	}
-
-	/* get fax document */
-	document = iks_find(sendfax, "document");
-	if (!document) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "missing document");
-	}
-	fax_document = iks_find_attrib_soft(document, "url");
-	if (zstr(fax_document)) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "missing document url");
-	}
-
-	/* is valid URL type? */
-	if (!strncasecmp(fax_document, "http://", 7) || !strncasecmp(fax_document, "https://", 8)) {
-		switch_stream_handle_t stream = { 0 };
-		SWITCH_STANDARD_STREAM(stream);
-		/* need to fetch document from server... */
-		switch_api_execute("http_get", fax_document, session, &stream);
-		if (!zstr(stream.data) && !strncmp(fax_document, SWITCH_PATH_SEPARATOR, strlen(SWITCH_PATH_SEPARATOR))) {
-			fax_document = switch_core_session_strdup(session, stream.data);
-		} else {
-			switch_safe_free(stream.data);
-			return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "failed to fetch document");
-		}
-		switch_safe_free(stream.data);
-	} else if (!strncasecmp(fax_document, "file://", 7)) {
-		fax_document = fax_document + 7;
-		if (zstr(fax_document)) {
-			return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "invalid file:// url");
-		}
-	} else if (strncasecmp(fax_document, SWITCH_PATH_SEPARATOR, strlen(SWITCH_PATH_SEPARATOR))) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "unsupported url type");
-	}
-
-	/* does document exist? */
-	if (switch_file_exists(fax_document, NULL) != SWITCH_STATUS_SUCCESS) {
-		return iks_new_error_detailed_printf(iq, STANZA_ERROR_BAD_REQUEST, "file not found: %s", fax_document);
-	}
-
-	/* get fax identity and header */
-	fax_identity = iks_find_attrib_soft(document, "identity");
-	if (!zstr(fax_identity)) {
-		switch_channel_set_variable(channel, "fax_ident", fax_identity);
-	} else {
-		switch_channel_set_variable(channel, "fax_ident", NULL);
-	}
-	fax_header = iks_find_attrib_soft(document, "header");
-	if (!zstr(fax_header)) {
-		switch_channel_set_variable(channel, "fax_header", fax_header);
-	} else {
-		switch_channel_set_variable(channel, "fax_header", NULL);
-	}
-
-	/* get pages to send */
-	pages = iks_find_attrib_soft(document, "pages");
-	if (!zstr(pages)) {
-		if (switch_regex_match(pages, "[1-9][0-9]*(-[1-9][0-9]*)?") == SWITCH_STATUS_FALSE) {
-			return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "invalid pages value");
-		} else {
-			int start = 0;
-			int end = 0;
-			char *pages_dup = switch_core_session_strdup(session, pages);
-			char *sep = strchr(pages_dup, '-');
-			if (sep) {
-				*sep = '\0';
-				sep++;
-				end = atoi(sep);
-			}
-			start = atoi(pages_dup);
-			if (end && end < start) {
-				return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "invalid pages value");
-			}
-			switch_channel_set_variable(channel, "fax_start_page", pages_dup);
-			switch_channel_set_variable(channel, "fax_end_page", sep);
-		}
-	} else {
-		switch_channel_set_variable(channel, "fax_start_page", NULL);
-		switch_channel_set_variable(channel, "fax_end_page", NULL);
-	}
-
-	/* create sendfax component */
-	switch_core_new_memory_pool(&pool);
-	sendfax_component = switch_core_alloc(pool, sizeof(*sendfax_component));
-	sendfax_component = FAX_COMPONENT(rayo_component_init((struct rayo_component *)sendfax_component, pool, RAT_CALL_COMPONENT, "sendfax", NULL, call, iks_find_attrib(iq, "from")));
-	if (!sendfax_component) {
-		switch_core_destroy_memory_pool(&pool);
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create sendfax entity");
-	}
-
-	/* add channel variable so that fax component can be located from fax events */
-	switch_channel_set_variable(channel, "rayo_fax_jid", RAYO_JID(sendfax_component));
-
-	/* clear fax result variables */
-	switch_channel_set_variable(channel, "fax_success", NULL);
-	switch_channel_set_variable(channel, "fax_result_code", NULL);
-	switch_channel_set_variable(channel, "fax_result_text", NULL);
-	switch_channel_set_variable(channel, "fax_document_transferred_pages", NULL);
-	switch_channel_set_variable(channel, "fax_document_total_pages", NULL);
-	switch_channel_set_variable(channel, "fax_image_resolution", NULL);
-	switch_channel_set_variable(channel, "fax_image_size", NULL);
-	switch_channel_set_variable(channel, "fax_bad_rows", NULL);
-	switch_channel_set_variable(channel, "fax_transfer_rate", NULL);
-	switch_channel_set_variable(channel, "fax_ecm_used", NULL);
-	switch_channel_set_variable(channel, "fax_local_station_id", NULL);
-	switch_channel_set_variable(channel, "fax_remote_station_id", NULL);
-
-	rayo_call_set_faxing(RAYO_CALL(call), 1);
-
-	/* execute txfax APP */
-	if (switch_event_create(&execute_event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "call-command", "execute");
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-name", "txfax");
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-arg", fax_document);
-		if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) {
-			switch_channel_set_flag(channel, CF_BLOCK_BROADCAST_UNTIL_MEDIA);
-		}
-
-		if (switch_core_session_queue_private_event(session, &execute_event, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) {
-			response = iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "failed to txfax (queue event failed)");
-			if (execute_event) {
-				switch_event_destroy(&execute_event);
-			}
-			rayo_call_set_faxing(RAYO_CALL(call), 0);
-			RAYO_RELEASE(sendfax_component);
-		} else {
-			/* component starting... */
-			rayo_component_send_start(RAYO_COMPONENT(sendfax_component), iq);
-		}
-	} else {
-		response = iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "failed to create txfax event");
-		rayo_call_set_faxing(RAYO_CALL(call), 0);
-		RAYO_RELEASE(sendfax_component);
-	}
-
-	return response;
-}
-
-/**
- * Start execution of call receivefax component
- * @param call the call to receive fax from
- * @param msg the original request
- * @param session_data the call's session
- */
-static iks *start_receivefax_component(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *iq = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	struct receivefax_component *receivefax_component = NULL;
-	iks *receivefax = iks_find(iq, "receivefax");
-	iks *response = NULL;
-	switch_event_t *execute_event = NULL;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_memory_pool_t *pool;
-	int file_no;
-
-	/* validate attributes */
-	if (!VALIDATE_RAYO_RECEIVEFAX(receivefax)) {
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	/* fax is only allowed if the call is not currently joined */
-	if (rayo_call_is_joined(RAYO_CALL(call))) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "can't receive fax on a joined call");
-	}
-
-	if (rayo_call_is_faxing(RAYO_CALL(call))) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "fax already in progress");
-	}
-
-	/* create receivefax component */
-	switch_core_new_memory_pool(&pool);
-	receivefax_component = switch_core_alloc(pool, sizeof(*receivefax_component));
-	receivefax_component = RECEIVEFAX_COMPONENT(rayo_component_init((struct rayo_component *)receivefax_component, pool, RAT_CALL_COMPONENT, "receivefax", NULL, call, iks_find_attrib(iq, "from")));
-	if (!receivefax_component) {
-		switch_core_destroy_memory_pool(&pool);
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create sendfax entity");
-	}
-	file_no = rayo_actor_seq_next(call);
-	receivefax_component->filename = switch_core_sprintf(pool, "%s%s%s-%d.tif",
-		globals.file_prefix, SWITCH_PATH_SEPARATOR, switch_core_session_get_uuid(session), file_no);
-	if (!strncmp(receivefax_component->filename, "http://", 7) || !strncmp(receivefax_component->filename, "https://", 8)) {
-		/* This is an HTTP URL, need to PUT after fax is received */
-		receivefax_component->local_filename = switch_core_sprintf(pool, "%s%s%s-%d",
-			SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, switch_core_session_get_uuid(session), file_no);
-		receivefax_component->http_put_after_receive = 1;
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s save fax to HTTP URL\n", RAYO_JID(receivefax_component));
-	} else {
-		/* assume file.. */
-		receivefax_component->local_filename = receivefax_component->filename;
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s save fax to local file\n", RAYO_JID(receivefax_component));
-	}
-
-	/* add channel variable so that fax component can be located from fax events */
-	switch_channel_set_variable(channel, "rayo_fax_jid", RAYO_JID(receivefax_component));
-
-	/* clear fax result variables */
-	switch_channel_set_variable(channel, "fax_success", NULL);
-	switch_channel_set_variable(channel, "fax_result_code", NULL);
-	switch_channel_set_variable(channel, "fax_result_text", NULL);
-	switch_channel_set_variable(channel, "fax_document_transferred_pages", NULL);
-	switch_channel_set_variable(channel, "fax_document_total_pages", NULL);
-	switch_channel_set_variable(channel, "fax_image_resolution", NULL);
-	switch_channel_set_variable(channel, "fax_image_size", NULL);
-	switch_channel_set_variable(channel, "fax_bad_rows", NULL);
-	switch_channel_set_variable(channel, "fax_transfer_rate", NULL);
-	switch_channel_set_variable(channel, "fax_ecm_used", NULL);
-	switch_channel_set_variable(channel, "fax_local_station_id", NULL);
-	switch_channel_set_variable(channel, "fax_remote_station_id", NULL);
-
-	rayo_call_set_faxing(RAYO_CALL(call), 1);
-
-	/* execute rxfax APP */
-	if (switch_event_create(&execute_event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "call-command", "execute");
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-name", "rxfax");
-		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-arg", receivefax_component->local_filename);
-		if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) {
-			switch_channel_set_flag(channel, CF_BLOCK_BROADCAST_UNTIL_MEDIA);
-		}
-
-		if (switch_core_session_queue_private_event(session, &execute_event, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) {
-			response = iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "failed to rxfax (queue event failed)");
-			if (execute_event) {
-				switch_event_destroy(&execute_event);
-			}
-			rayo_call_set_faxing(RAYO_CALL(call), 0);
-			RAYO_RELEASE(receivefax_component);
-		} else {
-			/* component starting... */
-			rayo_component_send_start(RAYO_COMPONENT(receivefax_component), iq);
-		}
-	} else {
-		response = iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "failed to create rxfax event");
-		rayo_call_set_faxing(RAYO_CALL(call), 0);
-		RAYO_RELEASE(receivefax_component);
-	}
-
-	return response;
-}
-
-/**
- * Stop execution of fax component
- */
-static iks *stop_fax_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	switch_core_session_t *session = switch_core_session_locate(component->parent->id);
-	FAX_COMPONENT(component)->stop = 1;
-	if (session) {
-		switch_core_session_execute_application_async(session, "stopfax", "");
-		switch_core_session_rwunlock(session);
-	}
-	return iks_new_iq_result(iq);
-}
-
-/**
- * Add fax metadata to result
- * @param event source of metadata
- * @param name of metadata
- * @param result to add metadata to
- */
-static void insert_fax_metadata(switch_event_t *event, const char *name, iks *result)
-{
-	char actual_name[256];
-	const char *value;
-	snprintf(actual_name, sizeof(actual_name), "variable_%s", name);
-	actual_name[sizeof(actual_name) - 1] = '\0';
-	value = switch_event_get_header(event, actual_name);
-	if (!zstr(value)) {
-		iks *metadata = iks_insert(result, "metadata");
-		iks_insert_attrib(metadata, "xmlns", RAYO_FAX_COMPLETE_NS);
-		iks_insert_attrib(metadata, "name", name);
-		iks_insert_attrib(metadata, "value", value);
-	}
-}
-
-/**
- * Handle fax completion event from FreeSWITCH core
- * @param event received from FreeSWITCH core.  It will be destroyed by the core after this function returns.
- */
-static void on_execute_complete_event(switch_event_t *event)
-{
-	const char *application = switch_event_get_header(event, "Application");
-
-	if (!zstr(application) && (!strcmp(application, "rxfax") || !strcmp(application, "txfax"))) {
-		int is_rxfax = !strcmp(application, "rxfax");
-		const char *uuid = switch_event_get_header(event, "Unique-ID");
-		const char *fax_jid = switch_event_get_header(event, "variable_rayo_fax_jid");
-		struct rayo_actor *component;
-		if (!zstr(fax_jid) && (component = RAYO_LOCATE(fax_jid))) {
-			iks *result;
-			iks *complete;
-			iks *fax;
-			int have_fax_document = 1;
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Got result for %s\n", fax_jid);
-
-			/* RX only: transfer HTTP document and delete local copy */
-			if (is_rxfax && RECEIVEFAX_COMPONENT(component)->http_put_after_receive && switch_file_exists(RECEIVEFAX_COMPONENT(component)->local_filename, RAYO_POOL(component)) == SWITCH_STATUS_SUCCESS) {
-				char *cmd = switch_core_sprintf(RAYO_POOL(component), "%s %s", RECEIVEFAX_COMPONENT(component)->filename, RECEIVEFAX_COMPONENT(component)->local_filename);
-				switch_stream_handle_t stream = { 0 };
-				SWITCH_STANDARD_STREAM(stream);
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s PUT fax to %s\n", RAYO_JID(component), RECEIVEFAX_COMPONENT(component)->filename);
-				switch_api_execute("http_put", cmd, NULL, &stream);
-				/* check if successful */
-				if (!zstr(stream.data) && strncmp(stream.data, "+OK", 3)) {
-					/* PUT failed */
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s PUT fax %s to %s failed: %s\n", RAYO_JID(component), RECEIVEFAX_COMPONENT(component)->local_filename, RECEIVEFAX_COMPONENT(component)->filename, (char *)stream.data);
-					have_fax_document = 0;
-				}
-				switch_safe_free(stream.data)
-				switch_file_remove(RECEIVEFAX_COMPONENT(component)->local_filename, RAYO_POOL(component));
-			}
-
-			/* successful fax? */
-			if (have_fax_document && switch_true(switch_event_get_header(event, "variable_fax_success"))) {
-				result = rayo_component_create_complete_event(RAYO_COMPONENT(component), FAX_FINISH);
-			} else if (have_fax_document && FAX_COMPONENT(component)->stop)  {
-				result = rayo_component_create_complete_event(RAYO_COMPONENT(component), COMPONENT_COMPLETE_STOP);
-			} else {
-				result = rayo_component_create_complete_event(RAYO_COMPONENT(component), COMPONENT_COMPLETE_ERROR);
-			}
-			complete = iks_find(result, "complete");
-
-			/* RX only: add fax document information */
-			if (is_rxfax && have_fax_document) {
-				const char *pages = switch_event_get_header(event, "variable_fax_document_transferred_pages");
-				if (!zstr(pages) && switch_is_number(pages) && atoi(pages) > 0) {
-					const char *resolution = switch_event_get_header(event, "variable_fax_file_image_resolution");
-					const char *size = switch_event_get_header(event, "variable_fax_image_size");
-
-					fax = iks_insert(complete, "fax");
-					iks_insert_attrib(fax, "xmlns", RAYO_FAX_COMPLETE_NS);
-
-					if (RECEIVEFAX_COMPONENT(component)->http_put_after_receive) {
-						iks_insert_attrib(fax, "url", RECEIVEFAX_COMPONENT(component)->filename);
-					} else {
-						/* convert absolute path to file:// URI */
-						iks_insert_attrib_printf(fax, "url", "file://%s", RECEIVEFAX_COMPONENT(component)->filename);
-					}
-
-					if (!zstr(resolution)) {
-						iks_insert_attrib(fax, "resolution", resolution);
-					}
-					if (!zstr(size)) {
-						iks_insert_attrib(fax, "size", size);
-					}
-					iks_insert_attrib(fax, "pages", pages);
-				}
-			}
-
-			/* add metadata from event */
-			insert_fax_metadata(event, "fax_success", complete);
-			insert_fax_metadata(event, "fax_result_code", complete);
-			insert_fax_metadata(event, "fax_result_text", complete);
-			insert_fax_metadata(event, "fax_document_transferred_pages", complete);
-			insert_fax_metadata(event, "fax_document_total_pages", complete);
-			insert_fax_metadata(event, "fax_image_resolution", complete);
-			insert_fax_metadata(event, "fax_image_size", complete);
-			insert_fax_metadata(event, "fax_bad_rows", complete);
-			insert_fax_metadata(event, "fax_transfer_rate", complete);
-			insert_fax_metadata(event, "fax_ecm_used", complete);
-			insert_fax_metadata(event, "fax_local_station_id", complete);
-			insert_fax_metadata(event, "fax_remote_station_id", complete);
-
-			/* flag faxing as done */
-			rayo_call_set_faxing(RAYO_CALL(component->parent), 0);
-
-			rayo_component_send_complete_event(RAYO_COMPONENT(component), result);
-
-			RAYO_RELEASE(component);
-		}
-	}
-}
-
-/**
- * Process module XML configuration
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS on successful configuration
- */
-static switch_status_t do_config(switch_memory_pool_t *pool, const char *config_file)
-{
-	switch_xml_t cfg, xml;
-
-	/* set defaults */
-	globals.file_prefix = switch_core_sprintf(pool, "%s%s", SWITCH_GLOBAL_dirs.recordings_dir, SWITCH_PATH_SEPARATOR);
-
-	if (!(xml = switch_xml_open_cfg(config_file, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", config_file);
-		return SWITCH_STATUS_TERM;
-	}
-
-	/* get params */
-	{
-		switch_xml_t settings = switch_xml_child(cfg, "fax");
-		if (settings) {
-			switch_xml_t param;
-			for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-				const char *var = switch_xml_attr_soft(param, "name");
-				const char *val = switch_xml_attr_soft(param, "value");
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "param: %s = %s\n", var, val);
-				if (!strcasecmp(var, "receivefax-file-prefix")) {
-					if (!zstr(val)) {
-						globals.file_prefix = switch_core_strdup(pool, val);
-					}
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unsupported param: %s\n", var);
-				}
-			}
-		}
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "receivefax-file-prefix = %s\n", globals.file_prefix);
-
-	switch_xml_free(xml);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Initialize fax components
- * @param module_interface
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_fax_components_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file)
-{
-	if (do_config(pool, config_file) != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_TERM;
-	}
-
-	switch_event_bind("rayo_fax_components", SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE, NULL, on_execute_complete_event, NULL);
-
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_FAX_NS":receivefax", start_receivefax_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "receivefax", "set:"RAYO_EXT_NS":stop", stop_fax_component);
-
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_FAX_NS":sendfax", start_sendfax_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "sendfax", "set:"RAYO_EXT_NS":stop", stop_fax_component);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Shutdown fax components
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_fax_components_shutdown(void)
-{
-	switch_event_unbind_callback(on_execute_complete_event);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
-
diff --git a/src/mod/event_handlers/mod_rayo/rayo_input_component.c b/src/mod/event_handlers/mod_rayo/rayo_input_component.c
deleted file mode 100644
index 84a8e745cc..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_input_component.c
+++ /dev/null
@@ -1,1160 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2015, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_input_component.c -- Rayo input component implementation
- *
- */
-#include "rayo_components.h"
-#include "rayo_cpa_component.h"
-#include "rayo_elements.h"
-#include "srgs.h"
-#include "nlsml.h"
-
-#define MAX_DTMF 256
-
-#define INPUT_MATCH_TAG "match"
-#define INPUT_MATCH INPUT_MATCH_TAG, RAYO_INPUT_COMPLETE_NS
-#define INPUT_NOINPUT "noinput", RAYO_INPUT_COMPLETE_NS
-#define INPUT_NOMATCH "nomatch", RAYO_INPUT_COMPLETE_NS
-
-#define RAYO_INPUT_COMPONENT_PRIVATE_VAR "__rayo_input_component"
-
-struct input_handler;
-
-static struct {
-	/** grammar parser */
-	struct srgs_parser *parser;
-	/** default recognizer to use if none specified */
-	const char *default_recognizer;
-} globals;
-
-/**
- * Input component state
- */
-struct input_component {
-	/** component base class */
-	struct rayo_component base;
-	/** true if speech detection */
-	int speech_mode;
-	/** Number of collected digits */
-	int num_digits;
-	/** Terminating digit */
-	char term_digit;
-	/** The collected digits */
-	char digits[MAX_DTMF + 1];
-	/** grammar to match */
-	struct srgs_grammar *grammar;
-	/** time when last digit was received */
-	switch_time_t last_digit_time;
-	/** timeout before first digit is received */
-	int initial_timeout;
-	/** maximum silence allowed */
-	int max_silence;
-	/** minimum speech detection confidence */
-	double min_confidence;
-	/** sensitivity to background noise */
-	double sensitivity;
-	/** timeout after first digit is received */
-	int inter_digit_timeout;
-	/** stop flag */
-	int stop;
-	/** true if input timers started */
-	int start_timers;
-	/** true if event fired for first digit / start of speech */
-	int barge_event;
-	/** optional language to use */
-	const char *language;
-	/** optional recognizer to use */
-	const char *recognizer;
-	/** global data */
-	struct input_handler *handler;
-};
-
-#define INPUT_COMPONENT(x) ((struct input_component *)x)
-
-/**
- * Call input state
- */
-struct input_handler {
-	/** media bug to monitor frames / control input lifecycle */
-	switch_media_bug_t *bug;
-	/** active voice input component */
-	struct input_component *voice_component;
-	/** active dtmf input components */
-	switch_hash_t *dtmf_components;
-	/** synchronizes media bug and dtmf callbacks */
-	switch_mutex_t *mutex;
-	/** last recognizer used */
-	const char *last_recognizer;
-};
-
-/**
- * @param digit1 to match
- * @param digit2 to match
- * @return true if matching
- */
-static int digit_test(char digit1, char digit2)
-{
-	return digit1 && digit2 && tolower(digit1) == tolower(digit2);
-}
-
-/**
- * Send match event to client
- */
-static void send_match_event(struct rayo_component *component, iks *result)
-{
-	iks *event = rayo_component_create_complete_event(RAYO_COMPONENT(component), INPUT_MATCH);
-	iks *match = iks_find(iks_find(event, "complete"), INPUT_MATCH_TAG);
-	iks_insert_attrib(match, "content-type", "application/nlsml+xml");
-	iks_insert_cdata(match, iks_string(iks_stack(result), result), 0);
-	rayo_component_send_complete_event(component, event);
-}
-
-/**
- * Send barge-in event to client
- */
-static void send_barge_event(struct rayo_component *component)
-{
-	iks *event = iks_new("presence");
-	iks *x;
-	iks_insert_attrib(event, "from", RAYO_JID(component));
-	iks_insert_attrib(event, "to", component->client_jid);
-	x = iks_insert(event, "start-of-input");
-	iks_insert_attrib(x, "xmlns", RAYO_INPUT_NS);
-	RAYO_SEND_REPLY(component, component->client_jid, event);
-}
-
-/**
- * Check if dtmf component has timed out
- */
-static switch_status_t dtmf_component_check_timeout(struct input_component *component, switch_core_session_t *session)
-{
-	/* check for stopped component */
-	if (component->stop) {
-		rayo_component_send_complete(RAYO_COMPONENT(component), COMPONENT_COMPLETE_STOP);
-
-		/* let handler know component is done */
-		return SWITCH_STATUS_FALSE;
-	}
-
-	/* check for timeout */
-	if (component->start_timers) {
-		int elapsed_ms = (switch_micro_time_now() - component->last_digit_time) / 1000;
-		if (component->num_digits && component->inter_digit_timeout > 0 && elapsed_ms > component->inter_digit_timeout) {
-			enum srgs_match_type match;
-			const char *interpretation = NULL;
-
-			/* we got some input, check for match */
-			match = srgs_grammar_match(component->grammar, component->digits, &interpretation);
-			if (match == SMT_MATCH || match == SMT_MATCH_END) {
-				iks *result = nlsml_create_dtmf_match(component->digits, interpretation);
-				/* notify of match */
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "MATCH = %s\n", component->digits);
-				send_match_event(RAYO_COMPONENT(component), result);
-				iks_delete(result);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "inter-digit-timeout\n");
-				rayo_component_send_complete(RAYO_COMPONENT(component), INPUT_NOMATCH);
-			}
-
-			/* let handler know component is done */
-			return SWITCH_STATUS_FALSE;
-		} else if (!component->num_digits && component->initial_timeout > 0 && elapsed_ms > component->initial_timeout) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "initial-timeout\n");
-			rayo_component_send_complete(RAYO_COMPONENT(component), INPUT_NOINPUT);
-
-			/* let handler know component is done */
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Process DTMF press for a specific component
- * @param component to receive DTMF
- * @param session
- * @param dtmf
- * @param direction
- * @return SWITCH_STATUS_FALSE if component is done
- */
-static switch_status_t dtmf_component_on_dtmf(struct input_component *component, switch_core_session_t *session, const switch_dtmf_t *dtmf, switch_dtmf_direction_t direction)
-{
-	int is_term_digit = 0;
-	enum srgs_match_type match;
-	const char *interpretation = NULL;
-
-	is_term_digit = digit_test(component->term_digit, dtmf->digit);
-
-	if (!is_term_digit) {
-		component->digits[component->num_digits] = dtmf->digit;
-		component->num_digits++;
-		component->digits[component->num_digits] = '\0';
-		component->last_digit_time = switch_micro_time_now();
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Collected digits = \"%s\"\n", component->digits);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Collected term digit = \"%c\"\n", dtmf->digit);
-	}
-
-	match = srgs_grammar_match(component->grammar, component->digits, &interpretation);
-
-	if (is_term_digit) {
-		/* finalize result if terminating digit was pressed */
-		if (match == SMT_MATCH_PARTIAL) {
-			match = SMT_NO_MATCH;
-		} else if (match == SMT_MATCH) {
-			match = SMT_MATCH_END;
-		}
-	} else if (component->num_digits >= MAX_DTMF) {
-		/* maximum digits collected and still not a definitive match */
-		if (match != SMT_MATCH_END) {
-			match = SMT_NO_MATCH;
-		}
-	}
-
-	switch (match) {
-		case SMT_MATCH:
-		case SMT_MATCH_PARTIAL: {
-			/* need more digits */
-			if (component->num_digits == 1) {
-				send_barge_event(RAYO_COMPONENT(component));
-			}
-			break;
-		}
-		case SMT_NO_MATCH: {
-			/* notify of no-match and remove input component */
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "NO MATCH = %s\n", component->digits);
-			rayo_component_send_complete(RAYO_COMPONENT(component), INPUT_NOMATCH);
-
-			/* let handler know component is done */
-			return SWITCH_STATUS_FALSE;
-		}
-		case SMT_MATCH_END: {
-			iks *result = nlsml_create_dtmf_match(component->digits, interpretation);
-			/* notify of match and remove input component */
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "MATCH = %s\n", component->digits);
-			send_match_event(RAYO_COMPONENT(component), result);
-			iks_delete(result);
-
-			/* let handler know component is done */
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-	/* still need more input */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Process DTMF press on call
- */
-static switch_status_t input_handler_on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf, switch_dtmf_direction_t direction)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	struct input_handler *handler = (struct input_handler *)switch_channel_get_private(channel, RAYO_INPUT_COMPONENT_PRIVATE_VAR);
-
-	if (handler) {
-		switch_event_t *components_to_remove = NULL;
-		switch_hash_index_t *hi;
-
-		switch_mutex_lock(handler->mutex);
-
-		/* check input on each component */
-		for (hi = switch_core_hash_first(handler->dtmf_components); hi; hi = switch_core_hash_next(&hi)) {
-			const void *jid;
-			void *component;
-			switch_core_hash_this(hi, &jid, NULL, &component);
-			if (dtmf_component_on_dtmf(INPUT_COMPONENT(component), session, dtmf, direction) != SWITCH_STATUS_SUCCESS) {
-				if (!components_to_remove) {
-					switch_event_create_subclass(&components_to_remove, SWITCH_EVENT_CLONE, NULL);
-				}
-				switch_event_add_header_string(components_to_remove, SWITCH_STACK_BOTTOM, "done", RAYO_JID(component));
-			}
-		}
-
-		/* remove any finished components */
-		if (components_to_remove) {
-			switch_event_header_t *component_to_remove = NULL;
-			for (component_to_remove = components_to_remove->headers; component_to_remove; component_to_remove = component_to_remove->next) {
-				switch_core_hash_delete(handler->dtmf_components, component_to_remove->value);
-			}
-			switch_event_destroy(&components_to_remove);
-		}
-
-		switch_mutex_unlock(handler->mutex);
-	}
-    return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Monitor for input
- */
-static switch_bool_t input_handler_bug_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
-{
-	switch_core_session_t *session = switch_core_media_bug_get_session(bug);
-	struct input_handler *handler = (struct input_handler *)user_data;
-	switch_hash_index_t *hi;
-
-	switch_mutex_lock(handler->mutex);
-
-	switch(type) {
-		case SWITCH_ABC_TYPE_INIT: {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Adding DTMF callback\n");
-			switch_core_event_hook_add_recv_dtmf(session, input_handler_on_dtmf);
-			break;
-		}
-		case SWITCH_ABC_TYPE_READ_REPLACE: {
-			switch_frame_t *rframe = switch_core_media_bug_get_read_replace_frame(bug);
-			switch_event_t *components_to_remove = NULL;
-
-			/* check timeout/stop on each component */
-			for (hi = switch_core_hash_first(handler->dtmf_components); hi; hi = switch_core_hash_next(&hi)) {
-				const void *jid;
-				void *component;
-				switch_core_hash_this(hi, &jid, NULL, &component);
-				if (dtmf_component_check_timeout(INPUT_COMPONENT(component), session) != SWITCH_STATUS_SUCCESS) {
-					if (!components_to_remove) {
-						switch_event_create_subclass(&components_to_remove, SWITCH_EVENT_CLONE, NULL);
-					}
-					switch_event_add_header_string(components_to_remove, SWITCH_STACK_BOTTOM, "done", RAYO_JID(component));
-				}
-			}
-
-			/* remove any finished components */
-			if (components_to_remove) {
-				switch_event_header_t *component_to_remove = NULL;
-				for (component_to_remove = components_to_remove->headers; component_to_remove; component_to_remove = component_to_remove->next) {
-					switch_core_hash_delete(handler->dtmf_components, component_to_remove->value);
-				}
-				switch_event_destroy(&components_to_remove);
-			}
-
-			switch_core_media_bug_set_read_replace_frame(bug, rframe);
-			break;
-		}
-		case SWITCH_ABC_TYPE_CLOSE:
-			/* complete all components */
-			for (hi = switch_core_hash_first(handler->dtmf_components); hi; hi = switch_core_hash_next(&hi)) {
-				const void *jid;
-				void *component;
-				switch_core_hash_this(hi, &jid, NULL, &component);
-				rayo_component_send_complete(RAYO_COMPONENT(component), COMPONENT_COMPLETE_HANGUP);
-			}
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Removing DTMF callback\n");
-			switch_core_event_hook_remove_recv_dtmf(session, input_handler_on_dtmf);
-			switch_core_hash_destroy(&handler->dtmf_components);
-			break;
-		default:
-			break;
-	}
-	switch_mutex_unlock(handler->mutex);
-	return SWITCH_TRUE;
-}
-
-/**
- * Validate input request
- * @param input request to validate
- * @param error message
- * @return 0 if error, 1 if valid
- */
-static int validate_call_input(iks *input, const char **error)
-{
-	iks *grammar;
-	const char *content_type;
-	int has_grammar = 0;
-	int use_mrcp = 0;
-
-	/* validate input attributes */
-	if (!VALIDATE_RAYO_INPUT(input)) {
-		*error = "Bad <input> attrib value";
-		return 0;
-	}
-
-	use_mrcp = !strncmp("unimrcp", iks_find_attrib(input, "recognizer") ? iks_find_attrib(input, "recognizer") : globals.default_recognizer, 7);
-
-	/* validate grammar elements */
-	for (grammar = iks_find(input, "grammar"); grammar; grammar = iks_next_tag(grammar)) {
-		/* is this a grammar? */
-		if (strcmp("grammar", iks_name(grammar))) {
-			continue;
-		}
-		content_type = iks_find_attrib(grammar, "content-type");
-		if (zstr(content_type)) {
-			/* grammar URL */
-			if (zstr(iks_find_attrib(grammar, "url"))) {
-				*error = "url or content-type must be set";
-				return 0;
-			} else if (!use_mrcp) {
-				*error = "url only supported with unimrcp recognizer";
-				return 0;
-			}
-		} else {
-			/* inline grammar / only support srgs */
-			if (!zstr(iks_find_attrib(grammar, "url"))) {
-				*error = "url not allowed with content-type";
-				return 0;
-			} else if (strcmp("application/srgs+xml", content_type) && strcmp("text/plain", content_type)) {
-				*error = "Unsupported content type";
-				return 0;
-			}
-
-			/* missing inline grammar body */
-			if (zstr(iks_find_cdata(input, "grammar"))) {
-				*error = "Grammar content is missing";
-				return 0;
-			}
-		}
-		has_grammar = 1;
-	}
-
-	if (!has_grammar) {
-		*error = "Missing <grammar>";
-		return 0;
-	}
-
-	return 1;
-}
-
-static char *setup_grammars_pocketsphinx(struct input_component *component, switch_core_session_t *session, iks *input, const struct xmpp_error **stanza_error, const char **error_detail)
-{
-	const char *jsgf_path;
-	switch_stream_handle_t grammar = { 0 };
-	SWITCH_STANDARD_STREAM(grammar);
-
-	/* transform SRGS grammar to JSGF */
-	if (!(component->grammar = srgs_parse(globals.parser, iks_find_cdata(input, "grammar")))) {
-		*stanza_error = STANZA_ERROR_BAD_REQUEST;
-		*error_detail = "Failed to parse grammar body";
-		switch_safe_free(grammar.data);
-		return NULL;
-	}
-
-	jsgf_path = srgs_grammar_to_jsgf_file(component->grammar, SWITCH_GLOBAL_dirs.grammar_dir, "gram");
-	if (!jsgf_path) {
-		*stanza_error = STANZA_ERROR_BAD_REQUEST;
-		*error_detail = "Grammar conversion to JSGF error";
-		switch_safe_free(grammar.data);
-		return NULL;
-	}
-
-	/* build pocketsphinx grammar string */
-	grammar.write_function(&grammar,
-		"{start-input-timers=%s,no-input-timeout=%d,speech-timeout=%d,confidence-threshold=%d}%s",
-		component->start_timers ? "true" : "false",
-		component->initial_timeout,
-		component->max_silence,
-		(int)ceil(component->min_confidence * 100.0),
-		jsgf_path);
-
-	return (char *)grammar.data;
-}
-
-static char *setup_grammars_unimrcp(struct input_component *component, switch_core_session_t *session, iks *input, const struct xmpp_error **stanza_error, const char **error_detail)
-{
-	iks *grammar_tag;
-	switch_asr_handle_t *ah;
-	switch_stream_handle_t grammar_uri_list = { 0 };
-	SWITCH_STANDARD_STREAM(grammar_uri_list);
-
-	/* unlock handler mutex, otherwise deadlock will happen when switch_ivr_detect_speech_init adds a new media bug */
-	switch_mutex_unlock(component->handler->mutex);
-	ah = switch_core_session_alloc(session, sizeof(*ah));
-	if (switch_ivr_detect_speech_init(session, component->recognizer, "", ah) != SWITCH_STATUS_SUCCESS) {
-		switch_mutex_lock(component->handler->mutex);
-		*stanza_error = STANZA_ERROR_INTERNAL_SERVER_ERROR;
-		*error_detail = "Failed to initialize recognizer";
-		switch_safe_free(grammar_uri_list.data);
-		return NULL;
-	}
-	switch_mutex_lock(component->handler->mutex);
-
-	/* handle input config */
-	switch_core_asr_text_param(ah, "start-input-timers", component->start_timers ? "true" : "false");
-	switch_core_asr_text_param(ah, "confidence-threshold", switch_core_sprintf(RAYO_POOL(component), "%f", component->min_confidence));
-	switch_core_asr_text_param(ah, "sensitivity-level", switch_core_sprintf(RAYO_POOL(component), "%f", component->sensitivity));
-	if (component->initial_timeout > 0) {
-		switch_core_asr_text_param(ah, "no-input-timeout", switch_core_sprintf(RAYO_POOL(component), "%d", component->initial_timeout));
-	}
-	if (component->max_silence > 0) {
-		switch_core_asr_text_param(ah, "speech-complete-timeout", switch_core_sprintf(RAYO_POOL(component), "%d", component->max_silence));
-		switch_core_asr_text_param(ah, "speech-incomplete-timeout", switch_core_sprintf(RAYO_POOL(component), "%d", component->max_silence));
-	}
-	if (!zstr(component->language)) {
-		switch_core_asr_text_param(ah, "speech-language", component->language);
-	}
-	if (!strcmp(iks_find_attrib_soft(input, "mode"), "any") || !strcmp(iks_find_attrib_soft(input, "mode"), "dtmf")) {
-		/* set dtmf params */
-		if (component->inter_digit_timeout > 0) {
-			switch_core_asr_text_param(ah, "dtmf-interdigit-timeout", switch_core_sprintf(RAYO_POOL(component), "%d", component->inter_digit_timeout));
-		}
-		if (component->term_digit) {
-			switch_core_asr_text_param(ah, "dtmf-term-char", switch_core_sprintf(RAYO_POOL(component), "%c", component->term_digit));
-		}
-	}
-
-	/* override input configs w/ custom headers */
-	{
-		iks *header = NULL;
-		for (header = iks_find(input, "header"); header; header = iks_next_tag(header)) {
-			if (!strcmp("header", iks_name(header))) {
-				const char *name = iks_find_attrib_soft(header, "name");
-				const char *value = iks_find_attrib_soft(header, "value");
-				if (!zstr(name) && !zstr(value)) {
-					switch_core_asr_text_param(ah, (char *)name, value);
-				}
-			}
-		}
-	}
-
-	switch_core_asr_text_param(ah, "start-recognize", "false");
-	switch_core_asr_text_param(ah, "define-grammar", "true");
-	for (grammar_tag = iks_find(input, "grammar"); grammar_tag; grammar_tag = iks_next_tag(grammar_tag)) {
-		const char *grammar_name;
-		iks *grammar_cdata;
-		const char *grammar;
-
-		/* is this a grammar? */
-		if (strcmp("grammar", iks_name(grammar_tag))) {
-			continue;
-		}
-
-		if (!zstr(iks_find_attrib_soft(grammar_tag, "content-type"))) {
-			/* get the srgs contained in this grammar */
-			if (!(grammar_cdata = iks_child(grammar_tag)) || iks_type(grammar_cdata) != IKS_CDATA) {
-				*stanza_error = STANZA_ERROR_BAD_REQUEST;
-				*error_detail = "Missing grammar";
-				switch_safe_free(grammar_uri_list.data);
-				return NULL;
-			}
-			grammar = switch_core_sprintf(RAYO_POOL(component), "inline:%s", iks_cdata(grammar_cdata));
-		} else {
-			/* Grammar is at a URL */
-			grammar = iks_find_attrib_soft(grammar_tag, "url");
-			if (zstr(grammar)) {
-				*stanza_error = STANZA_ERROR_BAD_REQUEST;
-				*error_detail = "Missing grammar";
-				switch_safe_free(grammar_uri_list.data);
-				return NULL;
-			}
-			if (strncasecmp(grammar, "http", 4) && strncasecmp(grammar, "file", 4)) {
-				*stanza_error = STANZA_ERROR_BAD_REQUEST;
-				*error_detail = "Bad URL";
-				switch_safe_free(grammar_uri_list.data);
-				return NULL;
-			}
-		}
-		grammar_name = switch_core_sprintf(RAYO_POOL(component), "grammar-%d", rayo_actor_seq_next(RAYO_ACTOR(component)));
-
-		/* DEFINE-GRAMMAR */
-		/* unlock handler mutex, otherwise deadlock will happen if switch_ivr_detect_speech_load_grammar removes the media bug */
-		switch_mutex_unlock(component->handler->mutex);
-		if (switch_ivr_detect_speech_load_grammar(session, grammar, grammar_name) != SWITCH_STATUS_SUCCESS) {
-			switch_mutex_lock(component->handler->mutex);
-			*stanza_error = STANZA_ERROR_INTERNAL_SERVER_ERROR;
-			*error_detail = "Failed to load grammar";
-			switch_safe_free(grammar_uri_list.data);
-			return NULL;
-		}
-		switch_mutex_lock(component->handler->mutex);
-
-		/* add grammar to uri-list */
-		grammar_uri_list.write_function(&grammar_uri_list, "session:%s\r\n", grammar_name);
-	}
-	switch_core_asr_text_param(ah, "start-recognize", "true");
-	switch_core_asr_text_param(ah, "define-grammar", "false");
-
-	return (char *)grammar_uri_list.data;
-}
-
-static char *setup_grammars_unknown(struct input_component *component, switch_core_session_t *session, iks *input, const struct xmpp_error **stanza_error, const char **error_detail)
-{
-	switch_stream_handle_t grammar = { 0 };
-	SWITCH_STANDARD_STREAM(grammar);
-	grammar.write_function(&grammar, "%s", iks_find_cdata(input, "grammar"));
-	return (char *)grammar.data;
-}
-
-/**
- * Start call input on voice resource
- */
-static iks *start_call_voice_input(struct input_component *component, switch_core_session_t *session, iks *input, iks *iq, int barge_in)
-{
-	struct input_handler *handler = component->handler;
-	char *grammar = NULL;
-	const struct xmpp_error *stanza_error = NULL;
-	const char *error_detail = NULL;
-
-	if (component->speech_mode && handler->voice_component) {
-		/* don't allow multi voice input */
-		RAYO_RELEASE(component);
-		RAYO_DESTROY(component);
-		return iks_new_error_detailed(iq, STANZA_ERROR_CONFLICT, "Multiple voice input is not allowed");
-	}
-
-	handler->voice_component = component;
-
-	if (zstr(component->recognizer)) {
-		component->recognizer = globals.default_recognizer;
-	}
-
-	/* if recognition engine is different, we can't handle this request */
-	if (!zstr(handler->last_recognizer) && strcmp(component->recognizer, handler->last_recognizer)) {
-		handler->voice_component = NULL;
-		RAYO_RELEASE(component);
-		RAYO_DESTROY(component);
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Must use the same recognizer for the entire call");
-	} else if (zstr(handler->last_recognizer)) {
-		handler->last_recognizer = switch_core_session_strdup(session, component->recognizer);
-	}
-
-	if (!strcmp(component->recognizer, "pocketsphinx")) {
-		grammar = setup_grammars_pocketsphinx(component, session, input, &stanza_error, &error_detail);
-	} else if (!strncmp(component->recognizer, "unimrcp", strlen("unimrcp"))) {
-		grammar = setup_grammars_unimrcp(component, session, input, &stanza_error, &error_detail);
-	} else {
-		grammar = setup_grammars_unknown(component, session, input, &stanza_error, &error_detail);
-	}
-
-	if (!grammar) {
-		handler->voice_component = NULL;
-		RAYO_RELEASE(component);
-		RAYO_DESTROY(component);
-		return iks_new_error_detailed(iq, stanza_error, error_detail);
-	}
-
-	/* acknowledge command */
-	rayo_component_send_start(RAYO_COMPONENT(component), iq);
-
-	/* start speech detection */
-	switch_channel_set_variable(switch_core_session_get_channel(session), "fire_asr_events", "true");
-	/* unlock handler mutex, otherwise deadlock will happen if switch_ivr_detect_speech adds a media bug */
-	switch_mutex_unlock(handler->mutex);
-	if (switch_ivr_detect_speech(session, component->recognizer, grammar, "mod_rayo_grammar", "", NULL) != SWITCH_STATUS_SUCCESS) {
-		switch_mutex_lock(handler->mutex);
-		handler->voice_component = NULL;
-		rayo_component_send_complete(RAYO_COMPONENT(component), COMPONENT_COMPLETE_ERROR);
-	} else {
-		switch_mutex_lock(handler->mutex);
-	}
-	switch_safe_free(grammar);
-
-	return NULL;
-}
-
-/**
- * Start call input on DTMF resource
- */
-static iks *start_call_dtmf_input(struct input_component *component, switch_core_session_t *session, iks *input, iks *iq, int barge_in)
-{
-	/* parse the grammar */
-	if (!(component->grammar = srgs_parse(globals.parser, iks_find_cdata(input, "grammar")))) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Failed to parse grammar body\n");
-		RAYO_RELEASE(component);
-		RAYO_DESTROY(component);
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Failed to parse grammar body");
-	}
-
-	component->last_digit_time = switch_micro_time_now();
-
-	/* acknowledge command */
-	rayo_component_send_start(RAYO_COMPONENT(component), iq);
-
-	/* start dtmf input detection */
-	switch_core_hash_insert(component->handler->dtmf_components, RAYO_JID(component), component);
-
-	return NULL;
-}
-
-/**
- * Start call input for the given component
- * @param component the input or prompt component
- * @param session the session
- * @param input the input request
- * @param iq the original input/prompt request
- */
-static iks *start_call_input(struct input_component *component, switch_core_session_t *session, iks *input, iks *iq, int barge_in)
-{
-	iks *result = NULL;
-
-	/* set up input component for new detection */
-	struct input_handler *handler = (struct input_handler *)switch_channel_get_private(switch_core_session_get_channel(session), RAYO_INPUT_COMPONENT_PRIVATE_VAR);
-	if (!handler) {
-		/* create input component */
-		handler = switch_core_session_alloc(session, sizeof(*handler));
-		switch_mutex_init(&handler->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-		switch_core_hash_init(&handler->dtmf_components);
-		switch_channel_set_private(switch_core_session_get_channel(session), RAYO_INPUT_COMPONENT_PRIVATE_VAR, handler);
-		handler->last_recognizer = "";
-
-		/* fire up media bug to monitor lifecycle */
-		if (switch_core_media_bug_add(session, "rayo_input_component", NULL, input_handler_bug_callback, handler, 0, SMBF_READ_REPLACE, &handler->bug) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Failed to create input handler media bug\n");
-			RAYO_RELEASE(component);
-			RAYO_DESTROY(component);
-			return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create input handler media bug");
-		}
-	}
-
-	switch_mutex_lock(handler->mutex);
-
-	if (!handler->dtmf_components) {
-		/* handler bug was destroyed */
-		switch_mutex_unlock(handler->mutex);
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Input handler media bug is closed\n");
-		RAYO_RELEASE(component);
-		RAYO_DESTROY(component);
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Input handler media bug is closed\n");
-	}
-
-	component->grammar = NULL;
-	component->num_digits = 0;
-	component->digits[0] = '\0';
-	component->stop = 0;
-	component->initial_timeout = iks_find_int_attrib(input, "initial-timeout");
-	component->inter_digit_timeout = iks_find_int_attrib(input, "inter-digit-timeout");
-	component->max_silence = iks_find_int_attrib(input, "max-silence");
-	component->min_confidence = iks_find_decimal_attrib(input, "min-confidence");
-	component->sensitivity = iks_find_decimal_attrib(input, "sensitivity");
-	component->barge_event = iks_find_bool_attrib(input, "barge-event");
-	component->start_timers = iks_find_bool_attrib(input, "start-timers");
-	component->term_digit = iks_find_char_attrib(input, "terminator");
-	component->recognizer = switch_core_strdup(RAYO_POOL(component), iks_find_attrib_soft(input, "recognizer"));
-	component->language = switch_core_strdup(RAYO_POOL(component), iks_find_attrib_soft(input, "language"));
-	component->handler = handler;
-	component->speech_mode = strcmp(iks_find_attrib_soft(input, "mode"), "dtmf");
-
-	if (component->speech_mode) {
-		result = start_call_voice_input(component, session, input, iq, barge_in);
-	} else {
-		result = start_call_dtmf_input(component, session, input, iq, barge_in);
-	}
-
-	switch_mutex_unlock(handler->mutex);
-
-	return result;
-}
-
-/**
- * Create input component id for session.
- * @param session requesting component
- * @param input request
- * @return the ID
- */
-static char *create_input_component_id(switch_core_session_t *session, iks *input)
-{
-	const char *mode = "unk";
-	if (input) {
-		mode = iks_find_attrib_soft(input, "mode");
-		if (!strcmp(mode, "dtmf")) {
-			return NULL;
-		}
-		if (!strcmp(mode, "any")) {
-			mode = "voice";
-		}
-	}
-	return switch_core_session_sprintf(session, "%s-input-%s", switch_core_session_get_uuid(session), mode);
-}
-
-/**
- * Release any resources consumed by this input component
- */
-static void input_component_cleanup(struct rayo_actor *component)
-{
-	if (INPUT_COMPONENT(component)->speech_mode) {
-		switch_core_session_t *session = switch_core_session_locate(component->parent->id);
-		if (session) {
-			switch_ivr_stop_detect_speech(session);
-			switch_core_session_rwunlock(session);
-		}
-	}
-}
-
-/**
- * Start execution of input component
- */
-static iks *start_call_input_component(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *iq = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	iks *input = iks_find(iq, "input");
-	char *component_id = create_input_component_id(session, input);
-	switch_memory_pool_t *pool = NULL;
-	struct input_component *input_component = NULL;
-	const char *error = NULL;
-
-	/* Start CPA */
-	if (!strcmp(iks_find_attrib_soft(input, "mode"), "cpa")) {
-		return rayo_cpa_component_start(call, msg, session_data);
-	}
-
-	/* start input */
-	if (!validate_call_input(input, &error)) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, error);
-	}
-
-	switch_core_new_memory_pool(&pool);
-	input_component = switch_core_alloc(pool, sizeof(*input_component));
-	input_component = INPUT_COMPONENT(rayo_component_init_cleanup(RAYO_COMPONENT(input_component), pool, RAT_CALL_COMPONENT, "input", component_id, call, iks_find_attrib(iq, "from"), input_component_cleanup));
-	if (!input_component) {
-		switch_core_destroy_memory_pool(&pool);
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create input entity");
-	}
-	return start_call_input(input_component, session, input, iq, 0);
-}
-
-/**
- * Stop execution of input component
- */
-static iks *stop_call_input_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	struct input_component *input_component = INPUT_COMPONENT(component);
-
-	if (input_component && !input_component->stop) {
-		switch_core_session_t *session = switch_core_session_locate(component->parent->id);
-		if (session) {
-			switch_mutex_lock(input_component->handler->mutex);
-			input_component->stop = 1;
-			if (input_component->speech_mode) {
-				switch_mutex_unlock(input_component->handler->mutex);
-				switch_ivr_stop_detect_speech(session);
-				switch_mutex_lock(input_component->handler->mutex);
-				rayo_component_send_complete(RAYO_COMPONENT(component), COMPONENT_COMPLETE_STOP);
-			}
-			switch_mutex_unlock(input_component->handler->mutex);
-			switch_core_session_rwunlock(session);
-		}
-	}
-	return iks_new_iq_result(iq);
-}
-
-/**
- * Start input component timers
- */
-static iks *start_timers_call_input_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	struct input_component *input_component = INPUT_COMPONENT(component);
-	if (input_component) {
-		switch_core_session_t *session = switch_core_session_locate(component->parent->id);
-		if (session) {
-			switch_mutex_lock(input_component->handler->mutex);
-			if (input_component->speech_mode) {
-				switch_mutex_unlock(input_component->handler->mutex);
-				switch_ivr_detect_speech_start_input_timers(session);
-				switch_mutex_lock(input_component->handler->mutex);
-			} else {
-				input_component->last_digit_time = switch_micro_time_now();
-				input_component->start_timers = 1;
-			}
-			switch_mutex_unlock(input_component->handler->mutex);
-			switch_core_session_rwunlock(session);
-		}
-	}
-	return iks_new_iq_result(iq);
-}
-
-/**
- * Get text / error from result
- */
-static const char *get_detected_speech_result_text(cJSON *result_json, double *confidence, const char **error_text)
-{
-	const char *result_text = NULL;
-	const char *text = cJSON_GetObjectCstr(result_json, "text");
-	if (confidence) {
-		*confidence = 0.0;
-	}
-	if (!zstr(text)) {
-		cJSON *json_confidence = cJSON_GetObjectItem(result_json, "confidence");
-		if (json_confidence && json_confidence->valuedouble > 0.0) {
-			*confidence = json_confidence->valuedouble;
-		} else {
-			*confidence = 0.99;
-		}
-		result_text = text;
-	} else if (error_text) {
-		*error_text = cJSON_GetObjectCstr(result_json, "error");
-	}
-	return result_text;
-}
-
-/**
- * Handle speech detection event
- */
-static void on_detected_speech_event(switch_event_t *event)
-{
-	const char *speech_type = switch_event_get_header(event, "Speech-Type");
-	char *event_str = NULL;
-	const char *uuid = switch_event_get_header(event, "Unique-ID");
-	switch_event_serialize(event, &event_str, SWITCH_FALSE);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", event_str);
-	if (!speech_type || !uuid) {
-		return;
-	}
-
-	if (!strcasecmp("detected-speech", speech_type)) {
-		char *component_id = switch_mprintf("%s-input-voice", uuid);
-		struct rayo_component *component = RAYO_COMPONENT_LOCATE(component_id);
-
-		switch_safe_free(component_id);
-		if (component) {
-			const char *result = switch_event_get_body(event);
-
-			switch_mutex_lock(INPUT_COMPONENT(component)->handler->mutex);
-			INPUT_COMPONENT(component)->handler->voice_component = NULL;
-			switch_mutex_unlock(INPUT_COMPONENT(component)->handler->mutex);
-
-			if (zstr(result)) {
-				rayo_component_send_complete(component, INPUT_NOMATCH);
-			} else {
-				if (result[0] == '{') {
-					// internal FS JSON format
-					cJSON *json_result = cJSON_Parse(result);
-					if (json_result) {
-						// examine result to determine what happened
-						double confidence = 0.0;
-						const char *error_text = NULL;
-						const char *result_text = NULL;
-						result_text = get_detected_speech_result_text(json_result, &confidence, &error_text);
-						if (!zstr(result_text)) {
-							// got result... send as NLSML
-							iks *result = nlsml_create_match(result_text, NULL, "speech", (int)(confidence * 100.0));
-							/* notify of match */
-							switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "MATCH = %s\n", result_text);
-							send_match_event(RAYO_COMPONENT(component), result);
-							iks_delete(result);
-						} else if (zstr(error_text)) {
-							// unknown error
-							switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_WARNING, "No matching text nor error in result: %s!\n", result);
-							rayo_component_send_complete(component, INPUT_NOMATCH);
-						} else if (!strcmp(error_text, "no_input")) {
-							// no input error
-							rayo_component_send_complete(component, INPUT_NOINPUT);
-						} else if (!strcmp(error_text, "no_match")) {
-							// no match error
-							rayo_component_send_complete(component, INPUT_NOMATCH);
-						} else {
-							// generic error
-							iks *response = rayo_component_create_complete_event(component, COMPONENT_COMPLETE_ERROR);
-							iks *error = NULL;
-							if ((error = iks_find(response, "complete"))) {
-								if ((error = iks_find(error, "error"))) {
-									iks_insert_cdata(error, error_text, strlen(error_text));
-								}
-							}
-							rayo_component_send_complete_event(component, response);
-						}
-						cJSON_Delete(json_result);
-					} else {
-						// failed to parse JSON result
-						switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_WARNING, "Failed to parse JSON result: %s!\n", result);
-						rayo_component_send_complete(component, INPUT_NOMATCH);
-					}
-				} else if (strchr(result, '<')) {
-					/* got an XML result */
-					enum nlsml_match_type match_type = nlsml_parse(result, uuid);
-					switch (match_type) {
-					case NMT_NOINPUT:
-						rayo_component_send_complete(component, INPUT_NOINPUT);
-						break;
-					case NMT_MATCH: {
-						iks *result_xml = nlsml_normalize(result);
-						send_match_event(RAYO_COMPONENT(component), result_xml);
-						iks_delete(result_xml);
-						break;
-					}
-					case NMT_BAD_XML:
-						switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_WARNING, "Failed to parse NLSML result: %s!\n", result);
-						rayo_component_send_complete(component, INPUT_NOMATCH);
-						break;
-					case NMT_NOMATCH:
-						rayo_component_send_complete(component, INPUT_NOMATCH);
-						break;
-					default:
-						switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_CRIT, "Unknown NLSML match type: %i, %s!\n", match_type, result);
-						rayo_component_send_complete(component, INPUT_NOMATCH);
-						break;
-					}
-				} else if (strstr(result, "002")) {
-					/* Completion-Cause: 002 no-input-timeout */
-					rayo_component_send_complete(component, INPUT_NOINPUT);
-				} else if (strstr(result, "004") || strstr(result, "005") || strstr(result, "006") || strstr(result, "009") || strstr(result, "010")) {
-					/* Completion-Cause: 004 gram-load-failure */
-					/* Completion-Cause: 005 gram-comp-failure */
-					/* Completion-Cause: 006 error */
-					/* Completion-Cause: 009 uri-failure */
-					/* Completion-Cause: 010 language-unsupported */
-					iks *response = rayo_component_create_complete_event(component, COMPONENT_COMPLETE_ERROR);
-					const char *error_reason = switch_event_get_header(event, "ASR-Completion-Reason");
-					if (!zstr(error_reason)) {
-						iks *error;
-						if ((error = iks_find(response, "complete"))) {
-							if ((error = iks_find(error, "error"))) {
-								iks_insert_cdata(error, error_reason, strlen(error_reason));
-							}
-						}
-					}
-					rayo_component_send_complete_event(component, response);
-				} else {
-					/* assume no match */
-					/* Completion-Cause: 001 no-match */
-					/* Completion-Cause: 003 recognition-timeout */
-					/* Completion-Cause: 007 speech-too-early */
-					/* Completion-Cause: 008 too-much-speech-timeout */
-					rayo_component_send_complete(component, INPUT_NOMATCH);
-				}
-			}
-			RAYO_RELEASE(component);
-		}
-	} else if (!strcasecmp("begin-speaking", speech_type)) {
-		char *component_id = switch_mprintf("%s-input-voice", uuid);
-		struct rayo_component *component = RAYO_COMPONENT_LOCATE(component_id);
-		switch_safe_free(component_id);
-		if (component && INPUT_COMPONENT(component)->barge_event) {
-			send_barge_event(component);
-		}
-		RAYO_RELEASE(component);
-	} else if (!strcasecmp("closed", speech_type)) {
-		char *component_id = switch_mprintf("%s-input-voice", uuid);
-		struct rayo_component *component = RAYO_COMPONENT_LOCATE(component_id);
-		switch_safe_free(component_id);
-		if (component) {
-			char *channel_state = switch_event_get_header(event, "Channel-State");
-			switch_mutex_lock(INPUT_COMPONENT(component)->handler->mutex);
-			INPUT_COMPONENT(component)->handler->voice_component = NULL;
-			switch_mutex_unlock(INPUT_COMPONENT(component)->handler->mutex);
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Recognizer closed\n");
-			if (channel_state && !strcmp("CS_HANGUP", channel_state)) {
-				rayo_component_send_complete(component, COMPONENT_COMPLETE_HANGUP);
-			} else {
-				/* shouldn't get here... */
-				rayo_component_send_complete(component, COMPONENT_COMPLETE_ERROR);
-			}
-			RAYO_RELEASE(component);
-		}
-	}
-	switch_safe_free(event_str);
-}
-
-/**
- * Process module XML configuration
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS on successful configuration
- */
-static switch_status_t do_config(switch_memory_pool_t *pool, const char *config_file)
-{
-	switch_xml_t cfg, xml;
-
-	/* set defaults */
-	globals.default_recognizer = "pocketsphinx";
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Configuring module\n");
-	if (!(xml = switch_xml_open_cfg(config_file, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", config_file);
-		return SWITCH_STATUS_TERM;
-	}
-
-	/* get params */
-	{
-		switch_xml_t settings = switch_xml_child(cfg, "input");
-		if (settings) {
-			switch_xml_t param;
-			for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-				const char *var = switch_xml_attr_soft(param, "name");
-				const char *val = switch_xml_attr_soft(param, "value");
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "param: %s = %s\n", var, val);
-				if (!strcasecmp(var, "default-recognizer")) {
-					if (!zstr(val)) {
-						globals.default_recognizer = switch_core_strdup(pool, val);
-					}
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unsupported param: %s\n", var);
-				}
-			}
-		}
-	}
-
-	switch_xml_free(xml);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Initialize input component
- * @param module_interface
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_input_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file)
-{
-	if (do_config(pool, config_file) != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_TERM;
-	}
-
-	srgs_init();
-	nlsml_init();
-
-	globals.parser = srgs_parser_new(NULL);
-
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_INPUT_NS":input", start_call_input_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "input", "set:"RAYO_EXT_NS":stop", stop_call_input_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "input", "set:"RAYO_INPUT_NS":start-timers", start_timers_call_input_component);
-	switch_event_bind("rayo_input_component", SWITCH_EVENT_DETECTED_SPEECH, SWITCH_EVENT_SUBCLASS_ANY, on_detected_speech_event, NULL);
-
-	return rayo_cpa_component_load(module_interface, pool, config_file);
-}
-
-/**
- * Shutdown input component
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_input_component_shutdown(void)
-{
-	switch_event_unbind_callback(on_detected_speech_event);
-
-	if (globals.parser) {
-		srgs_parser_destroy(globals.parser);
-	}
-	srgs_destroy();
-	nlsml_destroy();
-
-	rayo_cpa_component_shutdown();
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
-
diff --git a/src/mod/event_handlers/mod_rayo/rayo_output_component.c b/src/mod/event_handlers/mod_rayo/rayo_output_component.c
deleted file mode 100644
index 6ea607e33b..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_output_component.c
+++ /dev/null
@@ -1,1410 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * output_component.c -- Rayo output component implementation
- *
- */
-#include "rayo_components.h"
-#include "rayo_elements.h"
-
-/**
- * An output component
- */
-struct output_component {
-	/** component base class */
-	struct rayo_component base;
-	/** document to play */
-	iks *document;
-	/** where to start playing in document */
-	int start_offset_ms;
-	/** maximum time to play */
-	int max_time_ms;
-	/** silence between repeats */
-	int repeat_interval_ms;
-	/** number of times to repeat */
-	int repeat_times;
-	/** true if started paused */
-	switch_bool_t start_paused;
-	/** true if stopped */
-	int stop;
-	/** output renderer to use */
-	const char *renderer;
-	/** optional headers to pass to renderer */
-	const char *headers;
-	/** audio direction */
-	const char *direction;
-};
-
-#define OUTPUT_FINISH "finish", RAYO_OUTPUT_COMPLETE_NS
-#define OUTPUT_MAX_TIME "max-time", RAYO_OUTPUT_COMPLETE_NS
-
-#define OUTPUT_COMPONENT(x) ((struct output_component *)x)
-
-/**
- * Create new output component
- */
-static struct rayo_component *create_output_component(struct rayo_actor *actor, const char *type, iks *output, const char *client_jid)
-{
-	switch_memory_pool_t *pool;
-	struct output_component *output_component = NULL;
-
-	switch_core_new_memory_pool(&pool);
-	output_component = switch_core_alloc(pool, sizeof(*output_component));
-	output_component = OUTPUT_COMPONENT(rayo_component_init((struct rayo_component *)output_component, pool, type, "output", NULL, actor, client_jid));
-	if (output_component) {
-		output_component->document = iks_copy(output);
-		output_component->start_offset_ms = iks_find_int_attrib(output, "start-offset");
-		output_component->repeat_interval_ms = iks_find_int_attrib(output, "repeat-interval");
-		output_component->repeat_times = iks_find_int_attrib(output, "repeat-times");
-		output_component->max_time_ms = iks_find_int_attrib(output, "max-time");
-		output_component->start_paused = iks_find_bool_attrib(output, "start-paused");
-		output_component->renderer = switch_core_strdup(RAYO_POOL(output_component), iks_find_attrib_soft(output, "renderer"));
-		output_component->direction = strcmp(iks_find_attrib_soft(output, "direction"), "in") ? "m" : "mr";
-		output_component->headers = NULL;
-		/* get custom headers */
-		{
-			switch_stream_handle_t headers = { 0 };
-			iks *header = NULL;
-			int first = 1;
-			SWITCH_STANDARD_STREAM(headers);
-			for (header = iks_find(output, "header"); header; header = iks_next_tag(header)) {
-				if (!strcmp("header", iks_name(header))) {
-					const char *name = iks_find_attrib_soft(header, "name");
-					const char *value = iks_find_attrib_soft(header, "value");
-					if (!zstr(name) && !zstr(value)) {
-						headers.write_function(&headers, "%s%s=%s", first ? "{" : ",", name, value);
-						first = 0;
-					}
-				}
-			}
-			if (headers.data && !first) {
-				headers.write_function(&headers, "}");
-				output_component->headers = switch_core_strdup(RAYO_POOL(output_component), (char *)headers.data);
-			}
-			switch_safe_free(headers.data);
-		}
-	} else {
-		switch_core_destroy_memory_pool(&pool);
-	}
-
-	return RAYO_COMPONENT(output_component);
-}
-
-/**
- * Start execution of call output component
- * @param component to start
- * @param session the session to output to
- * @param output the output request
- * @param iq the original request
- */
-static iks *start_call_output(struct rayo_component *component, switch_core_session_t *session, iks *output, iks *iq)
-{
-	switch_stream_handle_t stream = { 0 };
-
-	/* acknowledge command */
-	rayo_component_send_start(component, iq);
-
-	/* build playback command */
-	SWITCH_STANDARD_STREAM(stream);
-	stream.write_function(&stream, "{id=%s,session=%s,pause=%s",
-		RAYO_JID(component), switch_core_session_get_uuid(session),
-		OUTPUT_COMPONENT(component)->start_paused ? "true" : "false");
-	if (OUTPUT_COMPONENT(component)->max_time_ms > 0) {
-		stream.write_function(&stream, ",timeout=%i", OUTPUT_COMPONENT(component)->max_time_ms);
-	}
-	if (OUTPUT_COMPONENT(component)->start_offset_ms > 0) {
-		stream.write_function(&stream, ",start_offset_ms=%i", OUTPUT_COMPONENT(component)->start_offset_ms);
-	}
-	stream.write_function(&stream, "}fileman://rayo://%s", RAYO_JID(component));
-
-	if (switch_ivr_displace_session(session, stream.data, 0, OUTPUT_COMPONENT(component)->direction) == SWITCH_STATUS_SUCCESS) {
-		RAYO_RELEASE(component);
-	} else {
-		if (component->complete) {
-			/* component is already destroyed */
-			RAYO_RELEASE(component);
-		} else {
-			/* need to destroy component */
-			if (OUTPUT_COMPONENT(component)->document) {
-				iks_delete(OUTPUT_COMPONENT(component)->document);
-			}
-			if (switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-				rayo_component_send_complete(component, COMPONENT_COMPLETE_HANGUP);
-			} else {
-				rayo_component_send_complete(component, COMPONENT_COMPLETE_ERROR);
-			}
-		}
-	}
-	switch_safe_free(stream.data);
-	return NULL;
-}
-
-/**
- * Start execution of call output component
- */
-static iks *start_call_output_component(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *iq = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	struct rayo_component *output_component = NULL;
-	iks *output = iks_find(iq, "output");
-	iks *document = NULL;
-
-	/* validate output attributes */
-	if (!VALIDATE_RAYO_OUTPUT(output)) {
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	/* check if <document> exists */
-	document = iks_find(output, "document");
-	if (!document) {
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	output_component = create_output_component(call, RAT_CALL_COMPONENT, output, iks_find_attrib(iq, "from"));
-	if (!output_component) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create output entity");
-	}
-	return start_call_output(output_component, session, output, iq);
-}
-
-/**
- * Start execution of mixer output component
- */
-static iks *start_mixer_output_component(struct rayo_actor *mixer, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	struct rayo_component *component = NULL;
-	iks *output = iks_find(iq, "output");
-	iks *document = NULL;
-	switch_stream_handle_t stream = { 0 };
-
-	/* validate output attributes */
-	if (!VALIDATE_RAYO_OUTPUT(output)) {
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	/* check if <document> exists */
-	document = iks_find(output, "document");
-	if (!document) {
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	component = create_output_component(mixer, RAT_MIXER_COMPONENT, output, iks_find_attrib(iq, "from"));
-	if (!component) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create output entity");
-	}
-
-	/* build conference command */
-	SWITCH_STANDARD_STREAM(stream);
-	stream.write_function(&stream, "%s play ", rayo_mixer_get_name(RAYO_MIXER(mixer)), RAYO_ID(component));
-
-	stream.write_function(&stream, "{id=%s,pause=%s",
-		RAYO_JID(component),
-		OUTPUT_COMPONENT(component)->start_paused ? "true" : "false");
-	if (OUTPUT_COMPONENT(component)->max_time_ms > 0) {
-		stream.write_function(&stream, ",timeout=%i", OUTPUT_COMPONENT(component)->max_time_ms);
-	}
-	if (OUTPUT_COMPONENT(component)->start_offset_ms > 0) {
-		stream.write_function(&stream, ",start_offset_ms=%i", OUTPUT_COMPONENT(component)->start_offset_ms);
-	}
-	stream.write_function(&stream, "}fileman://rayo://%s", RAYO_JID(component));
-
-	/* acknowledge command */
-	rayo_component_send_start(component, iq);
-
-	rayo_component_api_execute_async(component, "conference", stream.data);
-
-	switch_safe_free(stream.data);
-	RAYO_RELEASE(component);
-
-	return NULL;
-}
-
-/**
- * Stop execution of output component
- */
-static iks *stop_output_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *result = NULL;
-	switch_core_session_t *session = NULL;
-	switch_stream_handle_t stream = { 0 };
-	char *command = switch_mprintf("%s stop", RAYO_JID(component));
-	SWITCH_STANDARD_STREAM(stream);
-	OUTPUT_COMPONENT(component)->stop = 1;
-	if (!strcmp(RAYO_ACTOR(component)->type, RAT_CALL_COMPONENT)) {
-		session = (switch_core_session_t *)data;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s stopping\n", RAYO_JID(component));
-	switch_api_execute("fileman", command, NULL, &stream);
-	if (!zstr((char *)stream.data) && !strncmp((char *)stream.data, "+OK", 3)) {
-		result = iks_new_iq_result(iq);
-	} else if (session && switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-		result = iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "call has ended");
-	} else if (!zstr((char *)stream.data)) {
-		result = iks_new_error_detailed_printf(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "%s", (char *)stream.data);
-	} else {
-		result = iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-	}
-	switch_safe_free(stream.data);
-	switch_safe_free(command);
-	return result;
-}
-
-/**
- * Pause execution of output component
- */
-static iks *pause_output_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *result = NULL;
-	switch_core_session_t *session = NULL;
-	switch_stream_handle_t stream = { 0 };
-	char *command = switch_mprintf("%s pause", RAYO_JID(component));
-	SWITCH_STANDARD_STREAM(stream);
-	if (!strcmp(RAYO_ACTOR(component)->type, RAT_CALL_COMPONENT)) {
-		session = (switch_core_session_t *)data;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s pausing\n", RAYO_JID(component));
-	switch_api_execute("fileman", command, NULL, &stream);
-	if (!zstr((char *)stream.data) && !strncmp((char *)stream.data, "+OK", 3)) {
-		result = iks_new_iq_result(iq);
-	} else if (session && switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-		result = iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "call has ended");
-	} else if (!zstr((char *)stream.data)) {
-		result = iks_new_error_detailed_printf(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "%s", (char *)stream.data);
-	} else {
-		result = iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-	}
-	switch_safe_free(stream.data);
-	switch_safe_free(command);
-	return result;
-}
-
-/**
- * Resume execution of output component
- */
-static iks *resume_output_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *result = NULL;
-	switch_core_session_t *session = NULL;
-	switch_stream_handle_t stream = { 0 };
-	char *command = switch_mprintf("%s resume", RAYO_JID(component));
-	SWITCH_STANDARD_STREAM(stream);
-	if (!strcmp(RAYO_ACTOR(component)->type, RAT_CALL_COMPONENT)) {
-		session = (switch_core_session_t *)data;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s resuming\n", RAYO_JID(component));
-	switch_api_execute("fileman", command, NULL, &stream);
-	if (!zstr((char *)stream.data) && !strncmp((char *)stream.data, "+OK", 3)) {
-		result = iks_new_iq_result(iq);
-	} else if (session && switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-		result = iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "call has ended");
-	} else if (!zstr((char *)stream.data)) {
-		result = iks_new_error_detailed_printf(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "%s", (char *)stream.data);
-	} else {
-		result = iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-	}
-	switch_safe_free(stream.data);
-	switch_safe_free(command);
-	return result;
-}
-
-/**
- * Speed up execution of output component
- */
-static iks *speed_up_output_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *result = NULL;
-	switch_core_session_t *session = NULL;
-	switch_stream_handle_t stream = { 0 };
-	char *command = switch_mprintf("%s speed:+", RAYO_JID(component));
-	SWITCH_STANDARD_STREAM(stream);
-	if (!strcmp(RAYO_ACTOR(component)->type, RAT_CALL_COMPONENT)) {
-		session = (switch_core_session_t *)data;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s speeding up\n", RAYO_JID(component));
-	switch_api_execute("fileman", command, NULL, &stream);
-	if (!zstr((char *)stream.data) && !strncmp((char *)stream.data, "+OK", 3)) {
-		result = iks_new_iq_result(iq);
-	} else if (session && switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-		result = iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "call has ended");
-	} else if (!zstr((char *)stream.data)) {
-		result = iks_new_error_detailed_printf(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "%s", (char *)stream.data);
-	} else {
-		result = iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-	}
-	switch_safe_free(stream.data);
-	switch_safe_free(command);
-	return result;
-}
-
-/**
- * Slow down execution of output component
- */
-static iks *speed_down_output_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *result = NULL;
-	switch_core_session_t *session = NULL;
-	switch_stream_handle_t stream = { 0 };
-	char *command = switch_mprintf("%s speed:-", RAYO_JID(component));
-	SWITCH_STANDARD_STREAM(stream);
-	if (!strcmp(RAYO_ACTOR(component)->type, RAT_CALL_COMPONENT)) {
-		session = (switch_core_session_t *)data;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s slowing down\n", RAYO_JID(component));
-	switch_api_execute("fileman", command, NULL, &stream);
-	if (!zstr((char *)stream.data) && !strncmp((char *)stream.data, "+OK", 3)) {
-		result = iks_new_iq_result(iq);
-	} else if (session && switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-		result = iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "call has ended");
-	} else if (!zstr((char *)stream.data)) {
-		result = iks_new_error_detailed_printf(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "%s", (char *)stream.data);
-	} else {
-		result = iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-	}
-	switch_safe_free(stream.data);
-	switch_safe_free(command);
-	return result;
-}
-
-/**
- * Increase volume of output component
- */
-static iks *volume_up_output_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *result = NULL;
-	switch_core_session_t *session = NULL;
-	switch_stream_handle_t stream = { 0 };
-	char *command = switch_mprintf("%s volume:+", RAYO_JID(component));
-	SWITCH_STANDARD_STREAM(stream);
-	if (!strcmp(RAYO_ACTOR(component)->type, RAT_CALL_COMPONENT)) {
-		session = (switch_core_session_t *)data;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s increasing volume\n", RAYO_JID(component));
-	switch_api_execute("fileman", command, NULL, &stream);
-	if (!zstr((char *)stream.data) && !strncmp((char *)stream.data, "+OK", 3)) {
-		result = iks_new_iq_result(iq);
-	} else if (session && switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-		result = iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "call has ended");
-	} else if (!zstr((char *)stream.data)) {
-		result = iks_new_error_detailed_printf(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "%s", (char *)stream.data);
-	} else {
-		result = iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-	}
-	switch_safe_free(stream.data);
-	switch_safe_free(command);
-	return result;
-}
-
-/**
- * Lower volume of output component
- */
-static iks *volume_down_output_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *result = NULL;
-	switch_core_session_t *session = NULL;
-	switch_stream_handle_t stream = { 0 };
-	char *command = switch_mprintf("%s volume:-", RAYO_JID(component));
-	SWITCH_STANDARD_STREAM(stream);
-	if (!strcmp(RAYO_ACTOR(component)->type, RAT_CALL_COMPONENT)) {
-		session = (switch_core_session_t *)data;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s lowering volume\n", RAYO_JID(component));
-	switch_api_execute("fileman", command, NULL, &stream);
-	if (!zstr((char *)stream.data) && !strncmp((char *)stream.data, "+OK", 3)) {
-		result = iks_new_iq_result(iq);
-	} else if (session && switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-		result = iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "call has ended");
-	} else if (!zstr((char *)stream.data)) {
-		result = iks_new_error_detailed_printf(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "%s", (char *)stream.data);
-	} else {
-		result = iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-	}
-	switch_safe_free(stream.data);
-	switch_safe_free(command);
-	return result;
-}
-
-/**
- * Seek output component
- */
-static iks *seek_output_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *seek = iks_find(iq, "seek");
-
-	if (VALIDATE_RAYO_OUTPUT_SEEK(seek)) {
-		iks *result = NULL;
-		switch_core_session_t *session = NULL;
-		int is_forward = !strcmp("forward", iks_find_attrib(seek, "direction"));
-		int amount_ms = iks_find_int_attrib(seek, "amount");
-		char *command = switch_mprintf("%s seek:%s%i", RAYO_JID(component),
-			is_forward ? "+" : "-", amount_ms);
-		switch_stream_handle_t stream = { 0 };
-		SWITCH_STANDARD_STREAM(stream);
-		if (!strcmp(RAYO_ACTOR(component)->type, RAT_CALL_COMPONENT)) {
-			session = (switch_core_session_t *)data;
-		}
-
-		switch_api_execute("fileman", command, NULL, &stream);
-		if (!zstr((char *)stream.data) && !strncmp((char *)stream.data, "+OK", 3)) {
-			result = iks_new_iq_result(iq);
-		} else if (session && switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-			result = iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "call has ended");
-		} else if (!zstr((char *)stream.data)) {
-			result = iks_new_error_detailed_printf(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "%s", (char *)stream.data);
-		} else {
-			result = iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-		}
-		switch_safe_free(stream.data);
-		switch_safe_free(command);
-
-		return result;
-	}
-	return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-}
-
-/**
- * Rayo document playback state
- */
-struct rayo_file_context {
-	/** handle to current file */
-	switch_file_handle_t fh;
-	/** current document being played */
-	iks *cur_doc;
-	/** current file string being played */
-	char *ssml;
-	/** The component */
-	struct rayo_component *component;
-	/** number of times played */
-	int play_count;
-	/** have any files successfully opened? */
-	int could_open;
-};
-
-/**
- * open next file for reading
- * @param handle the file handle
- */
-static switch_status_t next_file(switch_file_handle_t *handle)
-{
-	int loops = 0;
-	struct rayo_file_context *context = handle->private_info;
-	struct output_component *output = context->component ? OUTPUT_COMPONENT(context->component) : NULL;
-
-	if (!output) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing output component!\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-  top:
-
-	if (switch_test_flag((&context->fh), SWITCH_FILE_OPEN)) {
-		switch_core_file_close(&context->fh);
-	}
-
-	if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
-		/* unsupported */
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (!context->cur_doc) {
-		context->cur_doc = iks_find(output->document, "document");
-		if (!context->cur_doc) {
-			iks_delete(output->document);
-			output->document = NULL;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Missing <document>\n");
-			return SWITCH_STATUS_FALSE;
-		}
-	} else {
-		context->cur_doc = iks_next_tag(context->cur_doc);
-	}
-
-	/* done? */
-	if (!context->cur_doc) {
-		if (context->could_open && ++loops < 2 && (output->repeat_times == 0 || ++context->play_count < output->repeat_times)) {
-			/* repeat all document(s) */
-			if (!output->repeat_interval_ms) {
-				goto top;
-			}
-		} else {
-			/* no more files to play */
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Done playing\n");
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-	if (!context->cur_doc) {
-		/* play silence between repeats */
-		switch_safe_free(context->ssml);
-		context->ssml = switch_mprintf("silence_stream://%i", output->repeat_interval_ms);
-	} else {
-		/* play next document */
-		iks *speak = NULL;
-
-		switch_safe_free(context->ssml);
-		context->ssml = NULL;
- 		speak = iks_find(context->cur_doc, "speak");
-		if (speak) {
-			/* <speak> is child node */
-			char *ssml_str = iks_string(NULL, speak);
-			if (zstr(output->renderer)) {
-				/* FS must parse the SSML */
-				context->ssml = switch_mprintf("ssml://%s", ssml_str);
-			} else {
-				/* renderer will parse the SSML */
-				if (!zstr(output->headers) && !strncmp("unimrcp", output->renderer, 7)) {
-					/* pass MRCP headers */
-					context->ssml = switch_mprintf("tts://%s||%s%s", output->renderer, output->headers, ssml_str);
-				} else {
-					context->ssml = switch_mprintf("tts://%s||%s", output->renderer, ssml_str);
-				}
-			}
-			iks_free(ssml_str);
-		} else if (iks_has_children(context->cur_doc)) {
-			/* check if <speak> is in CDATA */
-			const char *ssml_str = NULL;
-			iks *ssml = iks_child(context->cur_doc);
-			if (ssml && iks_type(ssml) == IKS_CDATA) {
-				ssml_str = iks_cdata(ssml);
-			}
-			if (zstr(ssml_str)) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Missing <document> CDATA\n");
-				return SWITCH_STATUS_FALSE;
-			}
-			if (zstr(output->renderer)) {
-				/* FS must parse the SSML */
-				context->ssml = switch_mprintf("ssml://%s", ssml_str);
-			} else {
-				/* renderer will parse the SSML */
-				if (!zstr(output->headers) && !strncmp("unimrcp", output->renderer, 7)) {
-					/* pass MRCP headers */
-					context->ssml = switch_mprintf("tts://%s||%s%s", output->renderer, output->headers, ssml_str);
-				} else {
-					context->ssml = switch_mprintf("tts://%s||%s", output->renderer, ssml_str);
-				}
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Missing <speak>\n");
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-	if (switch_core_file_open(&context->fh, context->ssml, handle->channels, handle->samplerate, handle->flags, NULL) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Failed to open %s\n", context->ssml);
-		goto top;
-	} else {
-		context->could_open = 1;
-	}
-
-	handle->samples = context->fh.samples;
-	handle->format = context->fh.format;
-	handle->sections = context->fh.sections;
-	handle->seekable = context->fh.seekable;
-	handle->speed = context->fh.speed;
-	handle->vol = context->fh.vol;
-	handle->offset_pos = context->fh.offset_pos;
-	handle->interval = context->fh.interval;
-
-	if (switch_test_flag((&context->fh), SWITCH_FILE_NATIVE)) {
-		switch_set_flag_locked(handle, SWITCH_FILE_NATIVE);
-	} else {
-		switch_clear_flag_locked(handle, SWITCH_FILE_NATIVE);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Transforms Rayo document into sub-format and opens file_string.
- * @param handle
- * @param path the inline Rayo document
- * @return SWITCH_STATUS_SUCCESS if opened
- */
-static switch_status_t rayo_file_open(switch_file_handle_t *handle, const char *path)
-{
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	struct rayo_file_context *context = switch_core_alloc(handle->memory_pool, sizeof(*context));
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Got path %s\n", path);
-
-	context->component = RAYO_COMPONENT_LOCATE(path);
-
-	if (context->component) {
-		handle->private_info = context;
-		context->cur_doc = NULL;
-		context->play_count = 0;
-		context->could_open = 0;
-		status = next_file(handle);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "File error! %s\n", path);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (status != SWITCH_STATUS_SUCCESS && context->component) {
-		/* complete error event will be sent by calling thread */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Status = %i\n", status);
-		RAYO_RELEASE(context->component);
-	}
-
-	return status;
-}
-
-/**
- * Close SSML document.
- * @param handle
- * @return SWITCH_STATUS_SUCCESS
- */
-static switch_status_t rayo_file_close(switch_file_handle_t *handle)
-{
-	struct rayo_file_context *context = (struct rayo_file_context *)handle->private_info;
-
-	if (context && context->component) {
-		struct output_component *output = OUTPUT_COMPONENT(context->component);
-
-		/* send completion and destroy */
-		if (!strcmp(RAYO_ACTOR(context->component)->type, RAT_CALL_COMPONENT)) {
-			/* call output... check for hangup */
-			switch_core_session_t *session = switch_core_session_locate(RAYO_ACTOR(context->component)->parent->id);
-			if (session) {
-				if (switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) {
-					rayo_component_send_complete(context->component, COMPONENT_COMPLETE_HANGUP);
-				} else if (output->stop) {
-					rayo_component_send_complete(context->component, COMPONENT_COMPLETE_STOP);
-				} else {
-					rayo_component_send_complete(context->component, OUTPUT_FINISH);
-				}
-				switch_core_session_rwunlock(session);
-			} else {
-				/* session is gone */
-				rayo_component_send_complete(context->component, COMPONENT_COMPLETE_HANGUP);
-			}
-		} else if (output->stop) {
-			rayo_component_send_complete(context->component, COMPONENT_COMPLETE_STOP);
-		} else {
-			/* mixer output... finished */
-			rayo_component_send_complete(context->component, OUTPUT_FINISH);
-		}
-		/* TODO timed out */
-
-		/* cleanup internals */
-		switch_safe_free(context->ssml);
-		context->ssml = NULL;
-		if (output->document) {
-			iks_delete(output->document);
-			output->document = NULL;
-		}
-
-		/* close SSML file */
-		if (switch_test_flag((&context->fh), SWITCH_FILE_OPEN)) {
-			return switch_core_file_close(&context->fh);
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Read from SSML document
- * @param handle
- * @param data
- * @param len
- * @return
- */
-static switch_status_t rayo_file_read(switch_file_handle_t *handle, void *data, size_t *len)
-{
-	switch_status_t status;
-	struct rayo_file_context *context = (struct rayo_file_context *)handle->private_info;
-	size_t llen = *len;
-
-	if (OUTPUT_COMPONENT(context->component)->stop) {
-		return SWITCH_STATUS_FALSE;
-	} else {
-		status = switch_core_file_read(&context->fh, data, len);
-		if (status != SWITCH_STATUS_SUCCESS) {
-			if ((status = next_file(handle)) != SWITCH_STATUS_SUCCESS) {
-				return status;
-			}
-			*len = llen;
-			status = switch_core_file_read(&context->fh, data, len);
-		}
-	}
-
-	return status;
-}
-
-/**
- * Seek file
- */
-static switch_status_t rayo_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence)
-{
-	struct rayo_file_context *context = handle->private_info;
-
-	if (samples == 0 && whence == SWITCH_SEEK_SET) {
-		/* restart from beginning */
-		context->cur_doc = NULL;
-		context->play_count = 0;
-		return next_file(handle);
-	}
-
-	if (!handle->seekable) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "File is not seekable\n");
-		return SWITCH_STATUS_NOTIMPL;
-	}
-
-	return switch_core_file_seek(&context->fh, cur_sample, samples, whence);
-}
-
-/**
- * Manages access to fileman controls
- */
-struct {
-	/** synchronizes access to fileman hash */
-	switch_mutex_t *mutex;
-	/** fileman mapped by id */
-	switch_hash_t *hash;
-} fileman_globals;
-
-#define FILE_STARTBYTES 1024 * 32
-#define FILE_BLOCKSIZE 1024 * 8
-#define FILE_BUFSIZE 1024 * 64
-
-/**
- * Fileman playback state
- */
-struct fileman_file_context {
-	/** handle to current file */
-	switch_file_handle_t fh;
-	/** file buffer */
-	int16_t *abuf;
-	/** end of file */
-	int eof;
-	/** maximum size of a packet in 2-byte samples */
-	switch_size_t max_frame_len;
-	/** optional session UUID */
-	const char *uuid;
-	/** fileman control ID */
-	const char *id;
-	/** done flag */
-	int done;
-};
-
-/**
- * Wraps file with interface that can be controlled by fileman flags
- * @param handle
- * @param path the file to play
- * @return SWITCH_STATUS_SUCCESS if opened
- */
-static switch_status_t fileman_file_open(switch_file_handle_t *handle, const char *path)
-{
-	int start_offset_ms = 0;
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	struct fileman_file_context *context = switch_core_alloc(handle->memory_pool, sizeof(*context));
-	handle->private_info = context;
-
-	if (handle->params) {
-		const char *id = switch_event_get_header(handle->params, "id");
-		const char *uuid = switch_event_get_header(handle->params, "session");
-		const char *start_offset_ms_str = switch_event_get_header(handle->params, "start_offset_ms");
-		if (!zstr(id)) {
-			context->id = switch_core_strdup(handle->memory_pool, id);
-		}
-		if (!zstr(uuid)) {
-			context->uuid = switch_core_strdup(handle->memory_pool, uuid);
-		}
-		if (!zstr(start_offset_ms_str) && switch_is_number(start_offset_ms_str)) {
-			start_offset_ms = atoi(start_offset_ms_str);
-			if (start_offset_ms < 0) {
-				start_offset_ms = 0;
-			}
-		}
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Got path %s\n", path);
-
-	if ((status = switch_core_file_open(&context->fh, path, handle->channels, handle->samplerate, handle->flags, NULL)) != SWITCH_STATUS_SUCCESS) {
-		return status;
-	}
-
-	/* set up handle for external control */
-	if (!context->id) {
-		/* use filename as ID */
-		context->id = switch_core_strdup(handle->memory_pool, path);
-	}
-	switch_mutex_lock(fileman_globals.mutex);
-	if (!switch_core_hash_find(fileman_globals.hash, context->id)) {
-		switch_core_hash_insert(fileman_globals.hash, context->id, handle);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_WARNING, "Duplicate fileman ID: %s\n", context->id);
-		return SWITCH_STATUS_FALSE;
-	}
-	switch_mutex_unlock(fileman_globals.mutex);
-
-	context->max_frame_len = (handle->samplerate / 1000 * SWITCH_MAX_INTERVAL);
-	switch_zmalloc(context->abuf, FILE_STARTBYTES * sizeof(*context->abuf));
-
-	if (!context->fh.audio_buffer) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Create audio buffer\n");
-		switch_buffer_create_dynamic(&context->fh.audio_buffer, FILE_BLOCKSIZE, FILE_BUFSIZE, 0);
-		switch_assert(context->fh.audio_buffer);
-	}
-
-	handle->samples = context->fh.samples;
-	handle->format = context->fh.format;
-	handle->sections = context->fh.sections;
-	handle->seekable = context->fh.seekable;
-	handle->speed = context->fh.speed;
-	handle->vol = context->fh.vol;
-	handle->offset_pos = context->fh.offset_pos;
-	handle->interval = context->fh.interval;
-
-	if (switch_test_flag((&context->fh), SWITCH_FILE_NATIVE)) {
-		switch_set_flag_locked(handle, SWITCH_FILE_NATIVE);
-	} else {
-		switch_clear_flag_locked(handle, SWITCH_FILE_NATIVE);
-	}
-
-	if (handle->params && switch_true(switch_event_get_header(handle->params, "pause"))) {
-		switch_set_flag_locked(handle, SWITCH_FILE_PAUSE);
-	}
-
-	if (handle->seekable && start_offset_ms) {
-		unsigned int pos = 0;
-		int32_t target = start_offset_ms * (handle->samplerate / 1000);
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "seek to position %d\n", target);
-		switch_core_file_seek(&context->fh, &pos, target, SEEK_SET);
-	}
-
-	return status;
-}
-
-/**
- * Close file.
- * @param handle
- * @return SWITCH_STATUS_SUCCESS
- */
-static switch_status_t fileman_file_close(switch_file_handle_t *handle)
-{
-	struct fileman_file_context *context = (struct fileman_file_context *)handle->private_info;
-	switch_file_handle_t *fh = &context->fh;
-
-	if (context->id) {
-		switch_mutex_lock(fileman_globals.mutex);
-		switch_core_hash_delete(fileman_globals.hash, context->id);
-		switch_mutex_unlock(fileman_globals.mutex);
-	}
-
-	if (switch_test_flag(fh, SWITCH_FILE_OPEN)) {
-		free(context->abuf);
-
-		if (fh->audio_buffer) {
-			switch_buffer_destroy(&fh->audio_buffer);
-		}
-
-		if (fh->sp_audio_buffer) {
-			switch_buffer_destroy(&fh->sp_audio_buffer);
-		}
-		return switch_core_file_close(fh);
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Write to file
- * @param handle
- * @param data
- * @param len
- * @return
- */
-static switch_status_t fileman_file_write(switch_file_handle_t *handle, void *data, size_t *len)
-{
-	struct fileman_file_context *context = (struct fileman_file_context *)handle->private_info;
-	switch_file_handle_t *fh = &context->fh;
-	if (!switch_test_flag(handle, SWITCH_FILE_PAUSE)) {
-		return switch_core_file_write(fh, data, len);
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Read from file
- * @param handle
- * @param data
- * @param len
- * @return
- */
-static switch_status_t fileman_file_read(switch_file_handle_t *handle, void *data, size_t *len)
-{
-	struct fileman_file_context *context = (struct fileman_file_context *)handle->private_info;
-	switch_file_handle_t *fh = &context->fh;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_size_t o_len = 0;
-
-	/* anything called "_len" is measured in 2-byte samples */
-
-	if (switch_test_flag(fh, SWITCH_FILE_NATIVE)) {
-		return switch_core_file_read(fh, data, len);
-	}
-
-	//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "len = %"SWITCH_SIZE_T_FMT"\n", *len);
-	if (*len > context->max_frame_len) {
-		*len = context->max_frame_len;
-	}
-
-	for (;;) {
-		int do_speed = 1;
-		size_t read_bytes = 0;
-
-		if (context->done) {
-			/* done with this file */
-			status = SWITCH_STATUS_FALSE;
-			goto done;
-		} else if (switch_test_flag(handle, SWITCH_FILE_PAUSE)) {
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Read pause frame\n");
-			memset(context->abuf, 255, *len * 2);
-			do_speed = 0;
-			o_len = *len;
-		} else if (fh->sp_audio_buffer && (context->eof || (switch_buffer_inuse(fh->sp_audio_buffer) > (switch_size_t) (*len * 2)))) {
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Read speed frame\n");
-			/* get next speed frame */
-			if (!(read_bytes = switch_buffer_read(fh->sp_audio_buffer, context->abuf, *len * 2))) {
-				/* This is the reverse of what happens in switch_ivr_play_file... i think that implementation is wrong */
-				if (context->eof) {
-					/* done with file */
-					status = SWITCH_STATUS_FALSE;
-					goto done;
-				} else {
-					/* try again to fetch frame */
-					continue;
-				}
-			}
-
-			/* pad short frame with silence */
-			if (read_bytes < *len * 2) {
-				//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Padding speed frame %"SWITCH_SIZE_T_FMT" bytes\n", (context->frame_len * 2) - read_bytes);
-				memset(context->abuf + read_bytes, 255, (*len * 2) - read_bytes);
-			}
-			o_len = *len;
-			do_speed = 0;
-		} else if (fh->audio_buffer && (context->eof || (switch_buffer_inuse(fh->audio_buffer) > (switch_size_t) (*len * 2)))) {
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "(2) Read audio frame\n");
-			/* get next file frame */
-			if (!(read_bytes = switch_buffer_read(fh->audio_buffer, context->abuf, *len * 2))) {
-				if (context->eof) {
-					/* done with file */
-					status = SWITCH_STATUS_FALSE;
-					goto done;
-				} else {
-					/* try again to fetch frame */
-					continue;
-				}
-			}
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "(2) Read audio frame %"SWITCH_SIZE_T_FMT" bytes\n", read_bytes);
-			fh->offset_pos += read_bytes / 2;
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "(2) file pos = %i\n", fh->offset_pos);
-
-			/* pad short frame with silence */
-			if (read_bytes < (*len * 2)) {
-				//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Padding audio frame %"SWITCH_SIZE_T_FMT" bytes\n", (context->frame_len * 2) - read_bytes);
-				memset(context->abuf + read_bytes, 255, (*len * 2) - read_bytes);
-			}
-
-			o_len = *len;
-		} else {
-			if (context->eof) {
-				/* done with file */
-				status = SWITCH_STATUS_FALSE;
-				goto done;
-			}
-			o_len = FILE_STARTBYTES / 2;
-			if (switch_core_file_read(fh, context->abuf, &o_len) != SWITCH_STATUS_SUCCESS) {
-				context->eof++;
-				/* at end of file... need to clear buffers before giving up */
-				continue;
-			}
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Read file %"SWITCH_SIZE_T_FMT" bytes\n", o_len * 2);
-
-			/* add file data to audio bufer */
-			switch_buffer_write(fh->audio_buffer, context->abuf, o_len * 2);
-
-			read_bytes = switch_buffer_read(fh->audio_buffer, context->abuf, *len * 2);
-			o_len = read_bytes / 2;
-			fh->offset_pos += o_len;
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Read audio frame %"SWITCH_SIZE_T_FMT" bytes\n", read_bytes);
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "file pos = %i\n", fh->offset_pos);
-		}
-
-		if (o_len <= 0) {
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "o_len <= 0 (%"SWITCH_SIZE_T_FMT")\n", o_len);
-			status = SWITCH_STATUS_FALSE;
-			goto done;
-		}
-
-		/* limit speed... there is a .25 factor change in packet size relative to original packet size for each increment.
-		   Too many increments and we cause badness when (factor * speed * o_len) > o_len */
-		if (handle->speed > 2) {
-			handle->speed = 2;
-		} else if (handle->speed < -2) {
-			handle->speed = -2;
-		}
-
-		if (switch_test_flag(fh, SWITCH_FILE_SEEK)) {
-			/* file position has changed flush the buffer */
-			switch_buffer_zero(fh->audio_buffer);
-			switch_clear_flag_locked(fh, SWITCH_FILE_SEEK);
-		}
-
-		/* generate speed frames */
-		if (handle->speed && do_speed) {
-			float factor = 0.25f * abs(handle->speed);
-			switch_size_t new_len, supplement_len, step_len;
-			short *bp = context->abuf;
-			switch_size_t wrote_len = 0;
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Generate speed frame (%i)\n", handle->speed);
-
-			supplement_len = (int) (factor * o_len);
-			if (!supplement_len) {
-				supplement_len = 1;
-			}
-			new_len = (handle->speed > 0) ? o_len - supplement_len : o_len + supplement_len;
-
-			step_len = (handle->speed > 0) ? (new_len / supplement_len) : (o_len / supplement_len);
-
-			if (!fh->sp_audio_buffer) {
-				switch_buffer_create_dynamic(&fh->sp_audio_buffer, 1024, 1024, 0);
-			}
-
-			while ((wrote_len + step_len) < new_len) {
-				switch_buffer_write(fh->sp_audio_buffer, bp, step_len * 2);
-				wrote_len += step_len;
-				bp += step_len;
-				if (handle->speed > 0) {
-					bp++;
-				} else {
-					float f;
-					short s;
-					f = (float) (*bp + *(bp + 1) + *(bp - 1));
-					f /= 3;
-					s = (short) f;
-					switch_buffer_write(fh->sp_audio_buffer, &s, 2);
-					wrote_len++;
-				}
-			}
-			if (wrote_len < new_len) {
-				switch_size_t r_len = new_len - wrote_len;
-				switch_buffer_write(fh->sp_audio_buffer, bp, r_len * 2);
-			}
-			continue;
-		}
-
-		/* adjust volume on frame */
-		if (handle->vol) {
-			//switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Adjust volume to = %i\n", handle->vol);
-			switch_change_sln_volume(context->abuf, *len, handle->vol);
-		}
-		break;
-	}
-
-done:
-
-	/* copy frame over to return to caller */
-	memcpy(data, context->abuf, *len * 2);
-	handle->offset_pos = context->fh.offset_pos;
-
-	return status;
-}
-
-/**
- * Seek file
- */
-static switch_status_t fileman_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence)
-{
-	struct fileman_file_context *context = handle->private_info;
-
-	if (!handle->seekable) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_WARNING, "File is not seekable\n");
-		return SWITCH_STATUS_NOTIMPL;
-	}
-	return switch_core_file_seek(&context->fh, cur_sample, samples, whence);
-}
-
-/**
- * Process fileman command
- */
-static switch_status_t fileman_process_cmd(const char *cmd, switch_file_handle_t *fhp)
-{
-	if (zstr(cmd)) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (fhp) {
-		struct fileman_file_context *context = (struct fileman_file_context *)fhp->private_info;
-		if (!switch_test_flag(fhp, SWITCH_FILE_OPEN)) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (!strncasecmp(cmd, "speed", 5)) {
-			char *p;
-
-			if ((p = strchr(cmd, ':'))) {
-				p++;
-				if (*p == '+' || *p == '-') {
-					int step;
-					if (!(step = atoi(p))) {
-						if (*p == '+') {
-							step = 1;
-						} else {
-							step = -1;
-						}
-					}
-					fhp->speed += step;
-				} else {
-					int speed = atoi(p);
-					fhp->speed = speed;
-				}
-				return SWITCH_STATUS_SUCCESS;
-			}
-
-			return SWITCH_STATUS_FALSE;
-
-		} else if (!strncasecmp(cmd, "volume", 6)) {
-			char *p;
-
-			if ((p = strchr(cmd, ':'))) {
-				p++;
-				if (*p == '+' || *p == '-') {
-					int step;
-					if (!(step = atoi(p))) {
-						if (*p == '+') {
-							step = 1;
-						} else {
-							step = -1;
-						}
-					}
-					fhp->vol += step;
-				} else {
-					int vol = atoi(p);
-					fhp->vol = vol;
-				}
-				return SWITCH_STATUS_SUCCESS;
-			}
-
-			if (fhp->vol) {
-				switch_normalize_volume(fhp->vol);
-			}
-
-			return SWITCH_STATUS_FALSE;
-		} else if (!strcasecmp(cmd, "pause")) {
-			switch_set_flag_locked(fhp, SWITCH_FILE_PAUSE);
-			return SWITCH_STATUS_SUCCESS;
-		} else if (!strcasecmp(cmd, "resume")) {
-			switch_clear_flag_locked(fhp, SWITCH_FILE_PAUSE);
-			return SWITCH_STATUS_SUCCESS;
-		} else if (!strcasecmp(cmd, "stop")) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "Stopping file\n");
-			context->done = 1;
-			switch_set_flag_locked(fhp, SWITCH_FILE_DONE);
-			return SWITCH_STATUS_SUCCESS;
-		} else if (!strcasecmp(cmd, "truncate")) {
-			switch_core_file_truncate(fhp, 0);
-		} else if (!strcasecmp(cmd, "restart")) {
-			unsigned int pos = 0;
-			fhp->speed = 0;
-			switch_core_file_seek(fhp, &pos, 0, SEEK_SET);
-			return SWITCH_STATUS_SUCCESS;
-		} else if (!strncasecmp(cmd, "seek", 4)) {
-			unsigned int samps = 0;
-			unsigned int pos = 0;
-			char *p;
-
-			if ((p = strchr(cmd, ':'))) {
-				p++;
-				if (*p == '+' || *p == '-') {
-					int step;
-					int32_t target;
-					if (!(step = atoi(p))) {
-						if (*p == '+') {
-							step = 1000;
-						} else {
-							step = -1000;
-						}
-					}
-
-					samps = step * (fhp->samplerate / 1000);
-					target = (int32_t)fhp->pos + samps;
-
-					if (target < 0) {
-						target = 0;
-					}
-
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "seek to position %d\n", target);
-					switch_core_file_seek(fhp, &pos, target, SEEK_SET);
-
-				} else {
-					samps = switch_atoui(p) * (fhp->samplerate / 1000);
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(context->uuid), SWITCH_LOG_DEBUG, "seek to position %d\n", samps);
-					switch_core_file_seek(fhp, &pos, samps, SEEK_SET);
-				}
-			}
-
-			return SWITCH_STATUS_SUCCESS;
-		}
-	}
-
-	if (!strcmp(cmd, "true") || !strcmp(cmd, "undefined")) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	return SWITCH_STATUS_FALSE;
-}
-
-#define FILEMAN_SYNTAX "<id> <cmd>:<val>"
-SWITCH_STANDARD_API(fileman_api)
-{
-	char *mycmd = NULL, *argv[4] = { 0 };
-	int argc = 0;
-
-	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
-		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-		if (argc >= 2 && !zstr(argv[0])) {
-			char *id = argv[0];
-			char *cmd = argv[1];
-			switch_file_handle_t *fh = NULL;
-			switch_mutex_lock(fileman_globals.mutex);
-			fh = (switch_file_handle_t *)switch_core_hash_find(fileman_globals.hash, id);
-			if (fh) {
-				if (fileman_process_cmd(cmd, fh) == SWITCH_STATUS_SUCCESS) {
-					stream->write_function(stream, "+OK\n");
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "fileman API failed for file %s\n", zstr(fh->file_path) ? "<null>" : fh->file_path);
-					stream->write_function(stream, "-ERR API call failed");
-				}
-				switch_mutex_unlock(fileman_globals.mutex);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "fileman API failed for ID %s\n", zstr(id) ? "<null>" : id);
-				switch_mutex_unlock(fileman_globals.mutex);
-				stream->write_function(stream, "-ERR file handle not found\n");
-			}
-			goto done;
-		}
-	}
-
-	stream->write_function(stream, "-USAGE: %s\n", FILEMAN_SYNTAX);
-
-  done:
-	switch_safe_free(mycmd);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static char *rayo_supported_formats[] = { "rayo", NULL };
-static char *fileman_supported_formats[] = { "fileman", NULL };
-
-/**
- * Initialize output component
- * @param module_interface
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_output_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file)
-{
-	switch_api_interface_t *api_interface;
-	switch_file_interface_t *file_interface;
-
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_OUTPUT_NS":output", start_call_output_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "output", "set:"RAYO_EXT_NS":stop", stop_output_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":pause", pause_output_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":resume", resume_output_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":speed-up", speed_up_output_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":speed-down", speed_down_output_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":volume-up", volume_up_output_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":volume-down", volume_down_output_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":seek", seek_output_component);
-
-	rayo_actor_command_handler_add(RAT_MIXER, "", "set:"RAYO_OUTPUT_NS":output", start_mixer_output_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "output", "set:"RAYO_EXT_NS":stop", stop_output_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":pause", pause_output_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":resume", resume_output_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":speed-up", speed_up_output_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":speed-down", speed_down_output_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":volume-up", volume_up_output_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":volume-down", volume_down_output_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "output", "set:"RAYO_OUTPUT_NS":seek", seek_output_component);
-
-	file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
-	file_interface->interface_name = "mod_rayo";
-	file_interface->extens = rayo_supported_formats;
-	file_interface->file_open = rayo_file_open;
-	file_interface->file_close = rayo_file_close;
-	file_interface->file_read = rayo_file_read;
-	file_interface->file_seek = rayo_file_seek;
-
-	switch_mutex_init(&fileman_globals.mutex, SWITCH_MUTEX_NESTED, pool);
-	switch_core_hash_init(&fileman_globals.hash);
-
-	file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
-	file_interface->interface_name = "mod_rayo";
-	file_interface->extens = fileman_supported_formats;
-	file_interface->file_open = fileman_file_open;
-	file_interface->file_close = fileman_file_close;
-	file_interface->file_write = fileman_file_write;
-	file_interface->file_read = fileman_file_read;
-	file_interface->file_seek = fileman_file_seek;
-
-	SWITCH_ADD_API(api_interface, "fileman", "Manage file audio", fileman_api, FILEMAN_SYNTAX);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Shutdown output component
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_output_component_shutdown(void)
-{
-	if (fileman_globals.hash) {
-		switch_core_hash_destroy(&fileman_globals.hash);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
-
diff --git a/src/mod/event_handlers/mod_rayo/rayo_prompt_component.c b/src/mod/event_handlers/mod_rayo/rayo_prompt_component.c
deleted file mode 100644
index 15add81d79..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_prompt_component.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2015, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * rayo_prompt_component.c -- Rayo prompt component implementation
- *
- */
-#include "rayo_components.h"
-#include "rayo_elements.h"
-
-enum prompt_component_state {
-	/* initial state - no barge */
-	PCS_START_OUTPUT,
-	/* playing prompt */
-	PCS_OUTPUT,
-	/* start input - no barge */
-	PCS_START_INPUT,
-	/* input starting - start timers needed */
-	PCS_START_INPUT_TIMERS,
-	/* initial state - barge in */
-	PCS_START_OUTPUT_BARGE,
-	/* start input for barge-in */
-	PCS_START_INPUT_OUTPUT,
-	/* playing and detecting */
-	PCS_INPUT_OUTPUT,
-	/* barge in on output */
-	PCS_STOP_OUTPUT,
-	/* detecting */
-	PCS_INPUT,
-	/* finishing, stop output */
-	PCS_DONE_STOP_OUTPUT,
-	/* finished */
-	PCS_DONE
-};
-
-/**
- * Prompt state
- */
-struct prompt_component {
-	struct rayo_component base;
-	enum prompt_component_state state;
-	iks *iq;
-	iks *complete;
-	const char *input_jid;
-	const char *output_jid;
-	const char *start_timers_request_id;
-};
-
-#define PROMPT_COMPONENT(x) ((struct prompt_component *)x)
-
-static const char *prompt_component_state_to_string(enum prompt_component_state state)
-{
-	switch(state) {
-		case PCS_START_OUTPUT_BARGE: return "START_OUTPUT_BARGE";
-		case PCS_START_OUTPUT: return "START_OUTPUT";
-		case PCS_START_INPUT_OUTPUT: return "START_INPUT_OUTPUT";
-		case PCS_START_INPUT: return "START_INPUT";
-		case PCS_START_INPUT_TIMERS: return "START_INPUT_TIMERS";
-		case PCS_INPUT_OUTPUT: return "INPUT_OUTPUT";
-		case PCS_STOP_OUTPUT: return "STOP_OUTPUT";
-		case PCS_INPUT: return "INPUT";
-		case PCS_OUTPUT: return "OUTPUT";
-		case PCS_DONE_STOP_OUTPUT: return "DONE_STOP_OUTPUT";
-		case PCS_DONE: return "DONE";
-	}
-	return "UNKNOWN";
-}
-
-/**
- * Send input-timers-started event
- */
-void rayo_component_send_input_timers_started_event(struct rayo_component *component)
-{
-	iks *event = iks_new("presence");
-	iks *x;
-	iks_insert_attrib(event, "from", RAYO_JID(component));
-	iks_insert_attrib(event, "to", component->client_jid);
-	x = iks_insert(event, "input-timers-started");
-	iks_insert_attrib(x, "xmlns", RAYO_PROMPT_NS);
-	RAYO_SEND_REPLY(component, component->client_jid, event);
-}
-
-/**
- * Send stop to component
- */
-static void rayo_component_send_stop(struct rayo_actor *from, const char *to)
-{
-	iks *stop = iks_new("iq");
-	iks *x;
-	iks_insert_attrib(stop, "from", RAYO_JID(from));
-	iks_insert_attrib(stop, "to", to);
-	iks_insert_attrib(stop, "type", "set");
-	iks_insert_attrib_printf(stop, "id", "mod_rayo-prompt-%d", RAYO_SEQ_NEXT(from));
-	x = iks_insert(stop, "stop");
-	iks_insert_attrib(x, "xmlns", RAYO_EXT_NS);
-	RAYO_SEND_MESSAGE(from, to, stop);
-}
-
-/**
- * Start input component
- */
-static void start_input(struct prompt_component *prompt, int start_timers, int barge_event)
-{
-	iks *iq = iks_new("iq");
-	iks *input = iks_find(PROMPT_COMPONENT(prompt)->iq, "prompt");
-	input = iks_find(input, "input");
-	iks_insert_attrib(iq, "from", RAYO_JID(prompt));
-	iks_insert_attrib(iq, "to", RAYO_JID(RAYO_ACTOR(prompt)->parent));
-	iks_insert_attrib_printf(iq, "id", "mod_rayo-prompt-%d", RAYO_SEQ_NEXT(prompt));
-	iks_insert_attrib(iq, "type", "set");
-	input = iks_copy_within(input, iks_stack(iq));
-	iks_insert_attrib(input, "start-timers", start_timers ? "true" : "false");
-	iks_insert_attrib(input, "barge-event", barge_event ? "true" : "false");
-	iks_insert_node(iq, input);
-	RAYO_SEND_MESSAGE(prompt, RAYO_JID(RAYO_ACTOR(prompt)->parent), iq);
-}
-
-/**
- * Start input component timers
- */
-static void start_input_timers(struct prompt_component *prompt)
-{
-	iks *x;
-	iks *iq = iks_new("iq");
-	iks_insert_attrib(iq, "from", RAYO_JID(prompt));
-	iks_insert_attrib(iq, "to", prompt->input_jid);
-	iks_insert_attrib(iq, "type", "set");
-	prompt->start_timers_request_id = switch_core_sprintf(RAYO_POOL(prompt), "mod_rayo-prompt-%d", RAYO_SEQ_NEXT(prompt));
-	iks_insert_attrib(iq, "id", prompt->start_timers_request_id);
-	x = iks_insert(iq, "start-timers");
-	iks_insert_attrib(x, "xmlns", RAYO_INPUT_NS);
-	RAYO_SEND_MESSAGE(prompt, prompt->input_jid, iq);
-}
-
-/**
- * Handle start of output.
- */
-static iks *prompt_component_handle_output_start(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) output start\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state));
-
-	switch (PROMPT_COMPONENT(prompt)->state) {
-		case PCS_START_OUTPUT:
-			PROMPT_COMPONENT(prompt)->output_jid = switch_core_strdup(RAYO_POOL(prompt), msg->from_jid);
-			PROMPT_COMPONENT(prompt)->state = PCS_OUTPUT;
-			/* send ref to client */
-			rayo_component_send_start(RAYO_COMPONENT(prompt), PROMPT_COMPONENT(prompt)->iq);
-			break;
-		case PCS_START_OUTPUT_BARGE:
-			PROMPT_COMPONENT(prompt)->output_jid = switch_core_strdup(RAYO_POOL(prompt), msg->from_jid);
-			PROMPT_COMPONENT(prompt)->state = PCS_START_INPUT_OUTPUT;
-			/* start input without timers and with barge events */
-			start_input(PROMPT_COMPONENT(prompt), 0, 1);
-			break;
-		case PCS_OUTPUT:
-		case PCS_START_INPUT_OUTPUT:
-		case PCS_START_INPUT:
-		case PCS_START_INPUT_TIMERS:
-		case PCS_INPUT_OUTPUT:
-		case PCS_STOP_OUTPUT:
-		case PCS_INPUT:
-		case PCS_DONE_STOP_OUTPUT:
-		case PCS_DONE:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, unexpected start output event\n", RAYO_JID(prompt));
-			break;
-	}
-
-	return NULL;
-}
-
-/**
- * Handle start of input.
- */
-static iks *prompt_component_handle_input_start(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) input start\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state));
-
-	switch (PROMPT_COMPONENT(prompt)->state) {
-		case PCS_START_INPUT:
-			PROMPT_COMPONENT(prompt)->input_jid = switch_core_strdup(RAYO_POOL(prompt), msg->from_jid);
-			PROMPT_COMPONENT(prompt)->state = PCS_INPUT;
-			rayo_component_send_input_timers_started_event(RAYO_COMPONENT(prompt));
-			break;
-		case PCS_START_INPUT_OUTPUT:
-			PROMPT_COMPONENT(prompt)->input_jid = switch_core_strdup(RAYO_POOL(prompt), msg->from_jid);
-			PROMPT_COMPONENT(prompt)->state = PCS_INPUT_OUTPUT;
-			/* send ref to client */
-			rayo_component_send_start(RAYO_COMPONENT(prompt), PROMPT_COMPONENT(prompt)->iq);
-			break;
-		case PCS_START_INPUT_TIMERS:
-			PROMPT_COMPONENT(prompt)->input_jid = switch_core_strdup(RAYO_POOL(prompt), msg->from_jid);
-			PROMPT_COMPONENT(prompt)->state = PCS_INPUT;
-			/* send ref to client */
-			rayo_component_send_start(RAYO_COMPONENT(prompt), PROMPT_COMPONENT(prompt)->iq);
-			start_input_timers(PROMPT_COMPONENT(prompt));
-			break;
-		case PCS_DONE:
-			/* stopped by client */
-			PROMPT_COMPONENT(prompt)->input_jid = switch_core_strdup(RAYO_POOL(prompt), msg->from_jid);
-			rayo_component_send_stop(prompt, msg->from_jid);
-			break;
-		case PCS_START_OUTPUT:
-		case PCS_START_OUTPUT_BARGE:
-		case PCS_INPUT_OUTPUT:
-		case PCS_INPUT:
-		case PCS_STOP_OUTPUT:
-		case PCS_OUTPUT:
-		case PCS_DONE_STOP_OUTPUT:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, unexpected start input event\n", RAYO_JID(prompt));
-			break;
-	}
-	return NULL;
-}
-
-/**
- * Handle start of input/output.
- */
-static iks *prompt_component_handle_io_start(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, got <ref> from %s: %s\n",
-		RAYO_JID(prompt), msg->from_jid, iks_string(iks_stack(iq), iq));
-	if (!strcmp("input", msg->from_subtype)) {
-		return prompt_component_handle_input_start(prompt, msg, data);
-	} else if (!strcmp("output", msg->from_subtype)) {
-		return prompt_component_handle_output_start(prompt, msg, data);
-	}
-	return NULL;
-}
-
-/**
- * Handle failure to start timers
- */
-static iks *prompt_component_handle_input_start_timers_error(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	/* this is only expected if input component is gone */
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) start timers error\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state));
-
-	return NULL;
-}
-
-/**
- * Handle input failure.
- */
-static iks *prompt_component_handle_input_error(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *error = iks_find(iq, "error");
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) input error\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state));
-
-	switch (PROMPT_COMPONENT(prompt)->state) {
-		case PCS_START_INPUT_TIMERS:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, <input> error: %s\n", RAYO_JID(prompt), iks_string(iks_stack(iq), iq));
-			PROMPT_COMPONENT(prompt)->state = PCS_DONE;
-
-			/* forward IQ error to client */
-			iq = PROMPT_COMPONENT(prompt)->iq;
-			iks_insert_attrib(iq, "from", RAYO_JID(prompt->parent));
-			iks_insert_attrib(iq, "to", RAYO_COMPONENT(prompt)->client_jid);
-			iks_insert_attrib(iq, "type", "error");
-			iks_insert_node(iq, iks_copy_within(error, iks_stack(iq)));
-			RAYO_SEND_REPLY(prompt, RAYO_COMPONENT(prompt)->client_jid, iq);
-
-			/* done */
-			PROMPT_COMPONENT(prompt)->iq = NULL;
-			RAYO_RELEASE(prompt);
-			RAYO_DESTROY(prompt);
-
-			break;
-
-		case PCS_START_INPUT:
-			PROMPT_COMPONENT(prompt)->state = PCS_DONE;
-			iks_delete(PROMPT_COMPONENT(prompt)->iq);
-			if (iks_find(error, "item-not-found")) {
-				/* call is gone (hangup) */
-				rayo_component_send_complete(RAYO_COMPONENT(prompt), COMPONENT_COMPLETE_HANGUP);
-			} else {
-				/* send presence error to client */
-				rayo_component_send_complete(RAYO_COMPONENT(prompt), COMPONENT_COMPLETE_ERROR);
-			}
-			break;
-		case PCS_START_INPUT_OUTPUT:
-			PROMPT_COMPONENT(prompt)->state = PCS_DONE_STOP_OUTPUT;
-
-			/* forward IQ error to client */
-			iq = PROMPT_COMPONENT(prompt)->iq;
-			iks_insert_attrib(iq, "from", RAYO_JID(prompt->parent));
-			iks_insert_attrib(iq, "to", RAYO_COMPONENT(prompt)->client_jid);
-			iks_insert_attrib(iq, "type", "error");
-			iks_insert_node(iq, iks_copy_within(error, iks_stack(iq)));
-			PROMPT_COMPONENT(prompt)->complete = iks_copy(iq);
-
-			rayo_component_send_stop(prompt, PROMPT_COMPONENT(prompt)->output_jid);
-			break;
-		case PCS_START_OUTPUT:
-		case PCS_START_OUTPUT_BARGE:
-		case PCS_INPUT_OUTPUT:
-		case PCS_STOP_OUTPUT:
-		case PCS_INPUT:
-		case PCS_OUTPUT:
-		case PCS_DONE_STOP_OUTPUT:
-		case PCS_DONE:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, unexpected start input error event\n", RAYO_JID(prompt));
-			break;
-	}
-
-	return NULL;
-}
-
-/**
- * Handle output failure.
- */
-static iks *prompt_component_handle_output_error(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *error = iks_find(iq, "error");
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) output error\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state));
-
-	switch (PROMPT_COMPONENT(prompt)->state) {
-		case PCS_START_OUTPUT:
-		case PCS_START_OUTPUT_BARGE:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, <output> error: %s\n", RAYO_JID(prompt), iks_string(iks_stack(iq), iq));
-			PROMPT_COMPONENT(prompt)->state = PCS_DONE;
-
-			/* forward IQ error to client */
-			iq = PROMPT_COMPONENT(prompt)->iq;
-			iks_insert_attrib(iq, "from", RAYO_JID(prompt->parent));
-			iks_insert_attrib(iq, "to", RAYO_COMPONENT(prompt)->client_jid);
-			iks_insert_attrib(iq, "type", "error");
-			iks_insert_node(iq, iks_copy_within(error, iks_stack(iq)));
-			RAYO_SEND_REPLY(prompt, RAYO_COMPONENT(prompt)->client_jid, iq);
-
-			/* done */
-			PROMPT_COMPONENT(prompt)->iq = NULL;
-			RAYO_RELEASE(prompt);
-			RAYO_DESTROY(prompt);
-
-			break;
-		case PCS_START_INPUT_OUTPUT:
-		case PCS_START_INPUT_TIMERS:
-		case PCS_START_INPUT:
-		case PCS_INPUT_OUTPUT:
-		case PCS_STOP_OUTPUT:
-		case PCS_INPUT:
-		case PCS_OUTPUT:
-		case PCS_DONE_STOP_OUTPUT:
-		case PCS_DONE:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, unexpected start output error event\n", RAYO_JID(prompt));
-			break;
-	}
-
-	return NULL;
-}
-
-/**
- * Handle barge event
- */
-static iks *prompt_component_handle_input_barge(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	iks *presence = msg->payload;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) input barge\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state));
-
-	switch (PROMPT_COMPONENT(prompt)->state) {
-		case PCS_INPUT_OUTPUT:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, got <start-of-input> from %s: %s\n",
-				RAYO_JID(prompt), msg->from_jid, iks_string(iks_stack(presence), presence));
-			PROMPT_COMPONENT(prompt)->state = PCS_STOP_OUTPUT;
-			rayo_component_send_stop(prompt, PROMPT_COMPONENT(prompt)->output_jid);
-			break;
-		case PCS_STOP_OUTPUT:
-		case PCS_INPUT:
-			/* don't care */
-			break;
-		case PCS_OUTPUT:
-		case PCS_START_OUTPUT:
-		case PCS_START_OUTPUT_BARGE:
-		case PCS_START_INPUT:
-		case PCS_START_INPUT_OUTPUT:
-		case PCS_START_INPUT_TIMERS:
-		case PCS_DONE_STOP_OUTPUT:
-		case PCS_DONE:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s, unexpected start output error event\n", RAYO_JID(prompt));
-			break;
-	}
-	return NULL;
-}
-
-/**
- * Handle completion event
- */
-static iks *prompt_component_handle_input_complete(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	iks *presence = msg->payload;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) input complete\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state));
-
-	switch (PROMPT_COMPONENT(prompt)->state) {
-		case PCS_INPUT_OUTPUT:
-			PROMPT_COMPONENT(prompt)->state = PCS_DONE_STOP_OUTPUT;
-			presence = iks_copy(presence);
-			iks_insert_attrib(presence, "from", RAYO_JID(prompt));
-			iks_insert_attrib(presence, "to", RAYO_COMPONENT(prompt)->client_jid);
-			PROMPT_COMPONENT(prompt)->complete = presence;
-			rayo_component_send_stop(prompt, PROMPT_COMPONENT(prompt)->output_jid);
-			break;
-		case PCS_STOP_OUTPUT:
-			PROMPT_COMPONENT(prompt)->state = PCS_DONE_STOP_OUTPUT;
-			presence = iks_copy(presence);
-			iks_insert_attrib(presence, "from", RAYO_JID(prompt));
-			iks_insert_attrib(presence, "to", RAYO_COMPONENT(prompt)->client_jid);
-			PROMPT_COMPONENT(prompt)->complete = presence;
-			break;
-		case PCS_INPUT:
-			PROMPT_COMPONENT(prompt)->state = PCS_DONE;
-			/* pass through */
-		case PCS_DONE:
-			presence = iks_copy(presence);
-			iks_insert_attrib(presence, "from", RAYO_JID(prompt));
-			iks_insert_attrib(presence, "to", RAYO_COMPONENT(prompt)->client_jid);
-			iks_delete(PROMPT_COMPONENT(prompt)->iq);
-			rayo_component_send_complete_event(RAYO_COMPONENT(prompt), presence);
-			break;
-		case PCS_OUTPUT:
-		case PCS_START_OUTPUT:
-		case PCS_START_OUTPUT_BARGE:
-		case PCS_START_INPUT:
-		case PCS_START_INPUT_OUTPUT:
-		case PCS_START_INPUT_TIMERS:
-		case PCS_DONE_STOP_OUTPUT:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s, unexpected start output error event\n", RAYO_JID(prompt));
-			break;
-	}
-
-	return NULL;
-}
-
-/**
- * Forward result
- */
-static iks *prompt_component_handle_result(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-
-	/* forward all results, except for internal ones... */
-	const char *id = iks_find_attrib_soft(iq, "id");
-	if (strncmp("mod_rayo-prompt", id, 15)) {
-		iks_insert_attrib(iq, "from", RAYO_JID(prompt));
-		iks_insert_attrib(iq, "to", RAYO_COMPONENT(prompt)->client_jid);
-		RAYO_SEND_REPLY_DUP(prompt, RAYO_COMPONENT(prompt)->client_jid, iq);
-	} else if (!zstr(PROMPT_COMPONENT(prompt)->start_timers_request_id) && !strcmp(PROMPT_COMPONENT(prompt)->start_timers_request_id, id)) {
-		rayo_component_send_input_timers_started_event(RAYO_COMPONENT(prompt));
-	}
-
-	return NULL;
-}
-
-/**
- * Handle completion event
- */
-static iks *prompt_component_handle_output_complete(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) output complete\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state));
-
-	switch (PROMPT_COMPONENT(prompt)->state) {
-		case PCS_OUTPUT:
-			PROMPT_COMPONENT(prompt)->state = PCS_START_INPUT;
-			/* start input with timers enabled and barge events disabled */
-			start_input(PROMPT_COMPONENT(prompt), 1, 0);
-			break;
-		case PCS_START_INPUT_OUTPUT:
-			/* output finished before input started */
-			PROMPT_COMPONENT(prompt)->state = PCS_START_INPUT_TIMERS;
-			break;
-		case PCS_INPUT_OUTPUT:
-			PROMPT_COMPONENT(prompt)->state = PCS_INPUT;
-			start_input_timers(PROMPT_COMPONENT(prompt));
-			break;
-		case PCS_STOP_OUTPUT:
-			PROMPT_COMPONENT(prompt)->state = PCS_INPUT;
-			start_input_timers(PROMPT_COMPONENT(prompt));
-			break;
-		case PCS_DONE_STOP_OUTPUT:
-			if (PROMPT_COMPONENT(prompt)->complete) {
-				iks_delete(PROMPT_COMPONENT(prompt)->iq);
-				rayo_component_send_complete_event(RAYO_COMPONENT(prompt), PROMPT_COMPONENT(prompt)->complete);
-			}
-			break;
-		case PCS_INPUT:
-			break;
-		case PCS_START_OUTPUT:
-		case PCS_START_OUTPUT_BARGE:
-			/* output most likely failed w/ error */
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s, prompt output finished way too quickly (possible failure), continuing w/ input\n", RAYO_JID(prompt));
-			/* start input with timers enabled and barge events disabled */
-			rayo_component_send_start(RAYO_COMPONENT(prompt), PROMPT_COMPONENT(prompt)->iq);
-			PROMPT_COMPONENT(prompt)->state = PCS_START_INPUT;
-			start_input(PROMPT_COMPONENT(prompt), 1, 0);
-			break;
-		case PCS_START_INPUT:
-		case PCS_START_INPUT_TIMERS:
-		case PCS_DONE:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s, unexpected start output complete event\n", RAYO_JID(prompt));
-			break;
-	}
-
-	return NULL;
-}
-
-/**
- * Start execution of prompt component
- */
-static iks *start_call_prompt_component(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *iq = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	switch_memory_pool_t *pool;
-	struct prompt_component *prompt_component = NULL;
-	iks *prompt = iks_find(iq, "prompt");
-	iks *input;
-	iks *output;
-	iks *cmd;
-
-	if (!VALIDATE_RAYO_PROMPT(prompt)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Bad <prompt> attrib\n");
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad <prompt> attrib value");
-	}
-
-	output = iks_find(prompt, "output");
-	if (!output) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Missing <output>\n");
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Missing <output>");
-	}
-
-	input = iks_find(prompt, "input");
-	if (!input) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Missing <input>\n");
-		return iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Missing <input>");
-	}
-
-	/* create prompt component, linked to call */
-	switch_core_new_memory_pool(&pool);
-	prompt_component = switch_core_alloc(pool, sizeof(*prompt_component));
-	prompt_component = PROMPT_COMPONENT(rayo_component_init(RAYO_COMPONENT(prompt_component), pool, RAT_CALL_COMPONENT, "prompt", NULL, call, iks_find_attrib(iq, "from")));
-	if (!prompt_component) {
-		switch_core_destroy_memory_pool(&pool);
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create prompt entity");
-	}
-	prompt_component->iq = iks_copy(iq);
-
-	/* start output */
-	if (iks_find_bool_attrib(prompt, "barge-in")) {
-		prompt_component->state = PCS_START_OUTPUT_BARGE;
-	} else {
-		prompt_component->state = PCS_START_OUTPUT;
-	}
-	cmd = iks_new("iq");
-	iks_insert_attrib(cmd, "from", RAYO_JID(prompt_component));
-	iks_insert_attrib(cmd, "to", RAYO_JID(call));
-	iks_insert_attrib(cmd, "id", iks_find_attrib(iq, "id"));
-	iks_insert_attrib(cmd, "type", "set");
-	output = iks_copy_within(output, iks_stack(cmd));
-	iks_insert_node(cmd, output);
-	RAYO_SEND_MESSAGE(prompt_component, RAYO_JID(call), cmd);
-
-	return NULL;
-}
-
-/**
- * Stop execution of prompt component
- */
-static iks *stop_call_prompt_component(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	iks *reply = NULL;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) stop prompt\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state));
-
-	switch (PROMPT_COMPONENT(prompt)->state) {
-		case PCS_OUTPUT:
-			/* input hasn't started yet */
-			PROMPT_COMPONENT(prompt)->state = PCS_DONE_STOP_OUTPUT;
-			PROMPT_COMPONENT(prompt)->complete = rayo_component_create_complete_event(RAYO_COMPONENT(prompt), COMPONENT_COMPLETE_STOP);
-			rayo_component_send_stop(prompt, PROMPT_COMPONENT(prompt)->output_jid);
-			break;
-		case PCS_INPUT_OUTPUT:
-		case PCS_INPUT:
-		case PCS_STOP_OUTPUT:
-			/* stopping input will trigger completion */
-			rayo_component_send_stop(prompt, PROMPT_COMPONENT(prompt)->input_jid);
-			break;
-		case PCS_START_INPUT:
-			/* stop input as soon as it starts */
-			PROMPT_COMPONENT(prompt)->state = PCS_DONE;
-			break;
-		case PCS_DONE_STOP_OUTPUT:
-		case PCS_DONE:
-			/* already done */
-			break;
-		case PCS_START_OUTPUT:
-		case PCS_START_OUTPUT_BARGE:
-		case PCS_START_INPUT_OUTPUT:
-		case PCS_START_INPUT_TIMERS:
-			/* ref hasn't been sent yet */
-			reply = iks_new_error(iq, STANZA_ERROR_UNEXPECTED_REQUEST);
-			break;
-	}
-
-	if (!reply) {
-		reply = iks_new_iq_result(iq);
-	}
-	return reply;
-}
-
-/**
- * Pass output component command
- */
-static iks *forward_output_component_request(struct rayo_actor *prompt, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s (%s) %s prompt\n",
-		RAYO_JID(prompt), prompt_component_state_to_string(PROMPT_COMPONENT(prompt)->state), iks_name(iks_first_tag(iq)));
-
-	switch (PROMPT_COMPONENT(prompt)->state) {
-		case PCS_OUTPUT:
-		case PCS_START_INPUT_OUTPUT:
-		case PCS_INPUT_OUTPUT: {
-			/* forward request to output component */
-			iks_insert_attrib(iq, "from", RAYO_JID(prompt));
-			iks_insert_attrib(iq, "to", PROMPT_COMPONENT(prompt)->output_jid);
-			RAYO_SEND_MESSAGE_DUP(prompt, PROMPT_COMPONENT(prompt)->output_jid, iq);
-			return NULL;
-		}
-		case PCS_START_INPUT_TIMERS:
-		case PCS_START_OUTPUT:
-		case PCS_START_OUTPUT_BARGE:
-			/* ref hasn't been sent yet */
-			return iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "too soon");
-			break;
-		case PCS_START_INPUT:
-		case PCS_STOP_OUTPUT:
-		case PCS_DONE_STOP_OUTPUT:
-		case PCS_INPUT:
-		case PCS_DONE:
-			return iks_new_error_detailed(iq, STANZA_ERROR_UNEXPECTED_REQUEST, "output is finished");
-	}
-	return NULL;
-}
-
-/**
- * Initialize prompt component
- * @param module_interface
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_prompt_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file)
-{
-	/* Prompt is a convenience component that wraps <input> and <output> */
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_PROMPT_NS":prompt", start_call_prompt_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "set:"RAYO_EXT_NS":stop", stop_call_prompt_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "result:"RAYO_NS":ref", prompt_component_handle_io_start);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "result::", prompt_component_handle_result);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "error:"RAYO_OUTPUT_NS":output", prompt_component_handle_output_error);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "error:"RAYO_INPUT_NS":input", prompt_component_handle_input_error);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "error:"RAYO_INPUT_NS":start-timers", prompt_component_handle_input_start_timers_error);
-	rayo_actor_event_handler_add(RAT_CALL_COMPONENT, "input", RAT_CALL_COMPONENT, "prompt", ":"RAYO_INPUT_NS":start-of-input", prompt_component_handle_input_barge);
-	rayo_actor_event_handler_add(RAT_CALL_COMPONENT, "input", RAT_CALL_COMPONENT, "prompt", "unavailable:"RAYO_EXT_NS":complete", prompt_component_handle_input_complete);
-	rayo_actor_event_handler_add(RAT_CALL_COMPONENT, "output", RAT_CALL_COMPONENT, "prompt", "unavailable:"RAYO_EXT_NS":complete", prompt_component_handle_output_complete);
-
-	/* wrap output commands */
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "set:"RAYO_OUTPUT_NS":pause", forward_output_component_request);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "set:"RAYO_OUTPUT_NS":resume", forward_output_component_request);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "set:"RAYO_OUTPUT_NS":speed-up", forward_output_component_request);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "set:"RAYO_OUTPUT_NS":speed-down", forward_output_component_request);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "set:"RAYO_OUTPUT_NS":volume-up", forward_output_component_request);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "set:"RAYO_OUTPUT_NS":volume-down", forward_output_component_request);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "prompt", "set:"RAYO_OUTPUT_NS":seek", forward_output_component_request);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Shutdown prompt component
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_prompt_component_shutdown(void)
-{
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
-
diff --git a/src/mod/event_handlers/mod_rayo/rayo_record_component.c b/src/mod/event_handlers/mod_rayo/rayo_record_component.c
deleted file mode 100644
index 82a36d79b8..0000000000
--- a/src/mod/event_handlers/mod_rayo/rayo_record_component.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2014, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * record_component.c -- Rayo record component implementation
- *
- */
-#include "rayo_components.h"
-#include "rayo_elements.h"
-
-/* TODO timeouts / durations are affected by pause/resume */
-
-/**
- * settings
- */
-static struct {
-	const char *record_file_prefix;
-	const char *record_file_format;
-} globals;
-
-/**
- * A record component
- */
-struct record_component {
-	/** component base class */
-	struct rayo_component base;
-	/** maximum duration allowed */
-	int max_duration;
-	/** timeout for total silence */
-	int initial_timeout;
-	/** timeout for silence after initial utterance */
-	int final_timeout;
-	/** duplex/send/recv */
-	const char *direction;
-	/** true if mixed (mono) */
-	int mix;
-	/** true if start beep to be played */
-	int start_beep;
-	/** true if stop beep to be played */
-	int stop_beep;
-	/** time recording started */
-	switch_time_t start_time;
-	/** duration of this recording */
-	int duration_ms;
-	/** path on local filesystem */
-	char *local_file_path;
-	/** true if recording was stopped */
-	int stop;
-};
-
-#define RECORD_COMPONENT(x) ((struct record_component *)x)
-
-/* 1000 Hz beep for 250ms */
-#define RECORD_BEEP "tone_stream://%(250,0,1000)"
-
-#define RECORD_COMPLETE_MAX_DURATION "max-duration", RAYO_RECORD_COMPLETE_NS
-#define RECORD_COMPLETE_INITIAL_TIMEOUT "initial-timeout", RAYO_RECORD_COMPLETE_NS
-#define RECORD_COMPLETE_FINAL_TIMEOUT "final-timeout", RAYO_RECORD_COMPLETE_NS
-
-/**
- * Notify completion of record component
- */
-static void complete_record(struct rayo_component *component, const char *reason, const char *reason_namespace)
-{
-	switch_core_session_t *session = NULL;
-	const char *uuid = RAYO_ACTOR(component)->parent->id;
-	const char *uri = RECORD_COMPONENT(component)->local_file_path;
-	iks *recording;
-	switch_size_t file_size = 0;
-
-	/* TODO this doesn't work with HTTP, improve core RECORD_STOP event so that file size and duration is reported */
-#if 0
-	switch_file_t *file;
-
-	if (switch_file_open(&file, uri, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD, RAYO_POOL(component)) == SWITCH_STATUS_SUCCESS) {
-		file_size = switch_file_get_size(file);
-		switch_file_close(file);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_INFO, "Failed to open %s.\n", uri);
-	}
-#endif
-
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Recording %s done.\n", uri);
-
-	if (RECORD_COMPONENT(component)->stop_beep && (session = switch_core_session_locate(uuid))) {
-		switch_ivr_displace_session(session, RECORD_BEEP, 0, "");
-		switch_core_session_rwunlock(session);
-	}
-
-	/* send complete event to client */
-	recording = iks_new("recording");
-	iks_insert_attrib(recording, "xmlns", RAYO_RECORD_COMPLETE_NS);
-	if (strlen(uri) > strlen(SWITCH_PATH_SEPARATOR) && !strncmp(uri, SWITCH_PATH_SEPARATOR, strlen(SWITCH_PATH_SEPARATOR))) {
-		/* convert absolute path to file:// URI */
-		iks_insert_attrib_printf(recording, "uri", "file://%s", uri);
-	} else {
-		/* is already a URI (hopefully) */
-		iks_insert_attrib(recording, "uri", uri);
-	}
-	iks_insert_attrib_printf(recording, "duration", "%i", RECORD_COMPONENT(component)->duration_ms);
-	iks_insert_attrib_printf(recording, "size", "%"SWITCH_SIZE_T_FMT, file_size);
-	rayo_component_send_complete_with_metadata(component, reason, reason_namespace, recording, 1);
-	iks_delete(recording);
-}
-
-/**
- * Handle RECORD_STOP event from FreeSWITCH.
- * @param event received from FreeSWITCH core.  It will be destroyed by the core after this function returns.
- */
-static void on_call_record_stop_event(switch_event_t *event)
-{
-	const char *file_path = switch_event_get_header(event, "Record-File-Path");
-	struct rayo_component *component = RAYO_COMPONENT_LOCATE(file_path);
-
-	if (component) {
-		const char *completion_cause = switch_event_get_header(event, "Record-Completion-Cause");
-		completion_cause = zstr(completion_cause) ? "" : completion_cause;
-		RECORD_COMPONENT(component)->duration_ms += (switch_micro_time_now() - RECORD_COMPONENT(component)->start_time) / 1000;
-		if (RECORD_COMPONENT(component)->stop) {
-			complete_record(component, COMPONENT_COMPLETE_STOP);
-		} else if (!strcmp(completion_cause, "no-input-timeout")) {
-			complete_record(component, RECORD_COMPLETE_INITIAL_TIMEOUT);
-		} else if (!strcmp(completion_cause, "success-maxtime")) {
-			complete_record(component, RECORD_COMPLETE_MAX_DURATION);
-		} else {
-			/* assume final timeout */
-			complete_record(component, RECORD_COMPLETE_FINAL_TIMEOUT);
-		}
-		RAYO_RELEASE(component);
-	}
-}
-
-/**
- * Create a record component
- */
-static struct rayo_component *record_component_create(struct rayo_actor *actor, const char *type, const char *client_jid, iks *record)
-{
-	switch_memory_pool_t *pool;
-	struct record_component *record_component = NULL;
-	char *local_file_path;
-	char *fs_file_path;
-	switch_bool_t start_paused;
-
-	start_paused = iks_find_bool_attrib(record, "start-paused");
-
-	/* create record filename from session UUID and ref */
-	/* for example: prefix/1234-1234-1234-1234-30.wav */
-	local_file_path = switch_mprintf("%s%s-%i.%s",
-		globals.record_file_prefix,
-		actor->id, rayo_actor_seq_next(actor), iks_find_attrib(record, "format"));
-
-	fs_file_path = switch_mprintf("{pause=%s}fileman://%s",
-		start_paused ? "true" : "false",
-		local_file_path);
-
-	switch_core_new_memory_pool(&pool);
-	record_component = switch_core_alloc(pool, sizeof(*record_component));
-	record_component = RECORD_COMPONENT(rayo_component_init(RAYO_COMPONENT(record_component), pool, type, "record", fs_file_path, actor, client_jid));
-	if (record_component) {
-		record_component->max_duration = iks_find_int_attrib(record, "max-duration");
-		record_component->initial_timeout = iks_find_int_attrib(record, "initial-timeout");
-		record_component->final_timeout = iks_find_int_attrib(record, "final-timeout");
-		record_component->direction = switch_core_strdup(RAYO_POOL(record_component), iks_find_attrib_soft(record, "direction"));
-		record_component->mix = iks_find_bool_attrib(record, "mix");
-		record_component->start_beep = iks_find_bool_attrib(record, "start-beep");
-		record_component->stop_beep = iks_find_bool_attrib(record, "stop-beep");
-		record_component->start_time = start_paused ? 0 : switch_micro_time_now();
-		record_component->local_file_path = switch_core_strdup(RAYO_POOL(record_component), local_file_path);
-	} else {
-		switch_core_destroy_memory_pool(&pool);
-	}
-
-	switch_safe_free(local_file_path);
-	switch_safe_free(fs_file_path);
-
-	return RAYO_COMPONENT(record_component);
-}
-
-/**
- * Start recording call
- * @param session the session to record
- * @param record the record component
- */
-static int start_call_record(switch_core_session_t *session, struct rayo_component *component)
-{
-	struct record_component *record_component = RECORD_COMPONENT(component);
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	int max_duration_sec = 0;
-
-	switch_channel_set_variable(channel, "RECORD_HANGUP_ON_ERROR", "false");
-	switch_channel_set_variable(channel, "RECORD_TOGGLE_ON_REPEAT", "");
-	switch_channel_set_variable(channel, "RECORD_CHECK_BRIDGE", "");
-	switch_channel_set_variable(channel, "RECORD_MIN_SEC", "0");
-	switch_channel_set_variable(channel, "RECORD_STEREO", "");
-	switch_channel_set_variable(channel, "RECORD_READ_ONLY", "");
-	switch_channel_set_variable(channel, "RECORD_WRITE_ONLY", "");
-	switch_channel_set_variable(channel, "RECORD_APPEND", "");
-	switch_channel_set_variable(channel, "RECORD_WRITE_OVER", "true");
-	switch_channel_set_variable(channel, "RECORD_ANSWER_REQ", "");
-	switch_channel_set_variable(channel, "RECORD_SILENCE_THRESHOLD", "200");
-	if (record_component->initial_timeout > 0) {
-		switch_channel_set_variable_printf(channel, "RECORD_INITIAL_TIMEOUT_MS", "%i", record_component->initial_timeout);
-	} else {
-		switch_channel_set_variable(channel, "RECORD_INITIAL_TIMEOUT_MS", "");
-	}
-	if (record_component->final_timeout > 0) {
-		switch_channel_set_variable_printf(channel, "RECORD_FINAL_TIMEOUT_MS", "%i", record_component->final_timeout);
-	} else {
-		switch_channel_set_variable(channel, "RECORD_FINAL_TIMEOUT_MS", "");
-	}
-	/* allow dialplan override for these variables */
-	//switch_channel_set_variable(channel, "RECORD_PRE_BUFFER_FRAMES", "");
-	//switch_channel_set_variable(channel, "record_sample_rate", "");
-	//switch_channel_set_variable(channel, "enable_file_write_buffering", "");
-
-	/* max duration attribute is in milliseconds- convert to seconds */
-	if (record_component->max_duration > 0) {
-		max_duration_sec = ceil((double)(record_component->max_duration - record_component->duration_ms) / 1000.0);
-	}
-
-	if (!strcmp(record_component->direction, "duplex")) {
-		if (!record_component->mix) {
-			/* STEREO */
-			switch_channel_set_variable(channel, "RECORD_STEREO", "true");
-		} /* else MONO (default) */
-	} else if (!strcmp(record_component->direction, "send")) {
-		/* record audio sent from the caller */
-		switch_channel_set_variable(channel, "RECORD_READ_ONLY", "true");
-	} else if (!strcmp(record_component->direction, "recv")) {
-		/* record audio received by the caller */
-		switch_channel_set_variable(channel, "RECORD_WRITE_ONLY", "true");
-	};
-
-	if (record_component->start_beep) {
-		switch_ivr_displace_session(session, RECORD_BEEP, 0, "");
-		record_component->start_time = switch_micro_time_now();
-	}
-
-	if (switch_ivr_record_session(session, (char *)RAYO_ID(component), max_duration_sec, NULL) == SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Recording started: file = %s\n", RAYO_ID(component));
-		return 1;
-	}
-
-	return 0;
-}
-
-/**
- * Start execution of call record component
- */
-static iks *start_call_record_component(struct rayo_actor *call, struct rayo_message *msg, void *session_data)
-{
-	iks *iq = msg->payload;
-	switch_core_session_t *session = (switch_core_session_t *)session_data;
-	struct rayo_component *component = NULL;
-	iks *record = iks_find(iq, "record");
-
-	/* validate record attributes */
-	if (!VALIDATE_RAYO_RECORD(record)) {
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	component = record_component_create(call, RAT_CALL_COMPONENT, iks_find_attrib(iq, "from"), record);
-	if (!component) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create record entity");
-	}
-
-	if (start_call_record(session, component)) {
-		rayo_component_send_start(component, iq);
-	} else {
-		RAYO_RELEASE(component);
-		RAYO_DESTROY(component);
-		return iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-	}
-
-	return NULL;
-}
-
-/**
- * Stop execution of record component
- */
-static iks *stop_call_record_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	switch_core_session_t *session = switch_core_session_locate(component->parent->id);
-	if (session) {
-		RECORD_COMPONENT(component)->stop = 1;
-		switch_ivr_stop_record_session(session, RAYO_ID(component));
-		switch_core_session_rwunlock(session);
-	}
-	return iks_new_iq_result(iq);
-}
-
-/**
- * Pause execution of record component
- */
-static iks *pause_record_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	struct record_component *record = RECORD_COMPONENT(component);
-	switch_stream_handle_t stream = { 0 };
-	char *command = switch_mprintf("%s pause", record->local_file_path);
-	SWITCH_STANDARD_STREAM(stream);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s pausing\n", RAYO_ID(component));
-	if (record->start_time) {
-		record->duration_ms += (switch_micro_time_now() - record->start_time) / 1000;
-		record->start_time = 0;
-	}
-	switch_api_execute("fileman", command, NULL, &stream);
-	switch_safe_free(stream.data);
-	switch_safe_free(command);
-
-	return iks_new_iq_result(iq);
-}
-
-/**
- * Resume execution of record component
- */
-static iks *resume_record_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	struct record_component *record = RECORD_COMPONENT(component);
-	switch_stream_handle_t stream = { 0 };
-	char *command = switch_mprintf("%s resume", record->local_file_path);
-	SWITCH_STANDARD_STREAM(stream);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s resuming\n", RAYO_ID(component));
-	if (!record->start_time) {
-		record->start_time = switch_micro_time_now();
-	}
-	switch_api_execute("fileman", command, NULL, &stream);
-	switch_safe_free(stream.data);
-	switch_safe_free(command);
-
-	return iks_new_iq_result(iq);
-}
-
-/**
- * Handle conference events from FreeSWITCH.
- * @param event received from FreeSWITCH core.  It will be destroyed by the core after this function returns.
- */
-static void on_mixer_record_event(switch_event_t *event)
-{
-	const char *file_path = switch_event_get_header(event, "Path");
-	const char *action = switch_event_get_header(event, "Action");
-	struct rayo_component *component = RAYO_COMPONENT_LOCATE(file_path);
-
-	if (component) {
-		struct record_component *record = RECORD_COMPONENT(component);
-		if (!strcmp("stop-recording", action)) {
-			record->duration_ms += (switch_micro_time_now() - record->start_time) / 1000;
-			if (record->stop) {
-				complete_record(component, COMPONENT_COMPLETE_STOP);
-			} else {
-				/* TODO assume final timeout, for now */
-				complete_record(component, RECORD_COMPLETE_FINAL_TIMEOUT);
-			}
-		}
-		RAYO_RELEASE(component);
-	}
-}
-
-/**
- * Start recording mixer
- * @param record the record component
- */
-static int start_mixer_record(struct rayo_component *component)
-{
-	switch_stream_handle_t stream = { 0 };
-	char *args;
-	SWITCH_STANDARD_STREAM(stream);
-
-	args = switch_mprintf("%s recording start %s", RAYO_ACTOR(component)->parent->id, RAYO_ID(component));
-	switch_api_execute("conference", args, NULL, &stream);
-	switch_safe_free(args);
-	switch_safe_free(stream.data);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording started: file = %s\n", RAYO_ID(component));
-	return 1;
-}
-
-/**
- * Start execution of mixer record component
- */
-static iks *start_mixer_record_component(struct rayo_actor *mixer, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	struct rayo_component *component = NULL;
-	iks *record = iks_find(iq, "record");
-
-	/* validate record attributes */
-	if (!VALIDATE_RAYO_RECORD(record)) {
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	component = record_component_create(mixer, RAT_MIXER_COMPONENT, iks_find_attrib(iq, "from"), record);
-	if (!component) {
-		return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create record entity");
-	}
-
-	/* mixer doesn't allow "send" */
-	if (!strcmp("send", iks_find_attrib_soft(record, "direction"))) {
-		RAYO_RELEASE(component);
-		RAYO_DESTROY(component);
-		return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST);
-	}
-
-	if (start_mixer_record(component)) {
-		rayo_component_send_start(component, iq);
-	} else {
-		RAYO_RELEASE(component);
-		RAYO_DESTROY(component);
-		return iks_new_error(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-	}
-
-	return NULL;
-}
-
-/**
- * Stop execution of record component
- */
-static iks *stop_mixer_record_component(struct rayo_actor *component, struct rayo_message *msg, void *data)
-{
-	iks *iq = msg->payload;
-	char *args;
-	switch_stream_handle_t stream = { 0 };
-	SWITCH_STANDARD_STREAM(stream);
-
-	RECORD_COMPONENT(component)->stop = 1;
-	args = switch_mprintf("%s recording stop %s", component->parent->id, RAYO_ID(component));
-	switch_api_execute("conference", args, NULL, &stream);
-	switch_safe_free(args);
-	switch_safe_free(stream.data);
-
-	return iks_new_iq_result(iq);
-}
-
-/**
- * Process module XML configuration
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS on successful configuration
- */
-static switch_status_t do_config(switch_memory_pool_t *pool, const char *config_file)
-{
-	switch_xml_t cfg, xml;
-
-	/* set defaults */
-	globals.record_file_prefix = switch_core_sprintf(pool, "%s%s", SWITCH_GLOBAL_dirs.recordings_dir, SWITCH_PATH_SEPARATOR);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Configuring module\n");
-	if (!(xml = switch_xml_open_cfg(config_file, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", config_file);
-		return SWITCH_STATUS_TERM;
-	}
-
-	/* get params */
-	{
-		switch_xml_t settings = switch_xml_child(cfg, "record");
-		if (settings) {
-			switch_xml_t param;
-			for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-				const char *var = switch_xml_attr_soft(param, "name");
-				const char *val = switch_xml_attr_soft(param, "value");
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "param: %s = %s\n", var, val);
-				if (!strcasecmp(var, "record-file-prefix")) {
-					if (!zstr(val)) {
-						globals.record_file_prefix = switch_core_strdup(pool, val);
-					}
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unsupported param: %s\n", var);
-				}
-			}
-		}
-	}
-
-	switch_xml_free(xml);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Initialize record component
- * @param module_interface
- * @param pool memory pool to allocate from
- * @param config_file to use
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_record_component_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool, const char *config_file)
-{
-	if (do_config(pool, config_file) != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_TERM;
-	}
-
-	switch_event_bind("rayo_record_component", SWITCH_EVENT_RECORD_STOP, NULL, on_call_record_stop_event, NULL);
-	rayo_actor_command_handler_add(RAT_CALL, "", "set:"RAYO_RECORD_NS":record", start_call_record_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "record", "set:"RAYO_RECORD_NS":pause", pause_record_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "record", "set:"RAYO_RECORD_NS":resume", resume_record_component);
-	rayo_actor_command_handler_add(RAT_CALL_COMPONENT, "record", "set:"RAYO_EXT_NS":stop", stop_call_record_component);
-
-	switch_event_bind("rayo_record_component", SWITCH_EVENT_CUSTOM, "conference::maintenance", on_mixer_record_event, NULL);
-	rayo_actor_command_handler_add(RAT_MIXER, "", "set:"RAYO_RECORD_NS":record", start_mixer_record_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "record", "set:"RAYO_RECORD_NS":pause", pause_record_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "record", "set:"RAYO_RECORD_NS":resume", resume_record_component);
-	rayo_actor_command_handler_add(RAT_MIXER_COMPONENT, "record", "set:"RAYO_EXT_NS":stop", stop_mixer_record_component);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Shutdown record component
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t rayo_record_component_shutdown(void)
-{
-	switch_event_unbind_callback(on_call_record_stop_event);
-	switch_event_unbind_callback(on_mixer_record_event);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
-
diff --git a/src/mod/event_handlers/mod_rayo/sasl.c b/src/mod/event_handlers/mod_rayo/sasl.c
deleted file mode 100644
index 4277ea305b..0000000000
--- a/src/mod/event_handlers/mod_rayo/sasl.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * sasl.c -- SASL functions
- *
- */
-#include <switch.h>
-#include <iksemel.h>
-#include "sasl.h"
-
-/**
- * Parse authzid, authcid, and password tokens from base64 PLAIN auth message.
- * @param message the base-64 encoded authentication message
- * @param authzid the authorization id in the message - free this string when done with parsed message
- * @param authcid the authentication id in the message
- * @param password the password in the message
- */
-void parse_plain_auth_message(const char *message, char **authzid, char **authcid, char **password)
-{
-	char *decoded = iks_base64_decode(message);
-	int maxlen = strlen(message) * 6 / 8 + 1;
-	int pos = 0;
-	*authzid = NULL;
-	*authcid = NULL;
-	*password = NULL;
-	if (decoded == NULL) {
-		goto end;
-	}
-	pos = strlen(decoded) + 1;
-	if (pos >= maxlen) {
-		goto end;
-	}
-	*authcid = strdup(decoded + pos);
-	pos += strlen(*authcid) + 1;
-	if (pos >= maxlen) {
-		goto end;
-	}
-	*password = strdup(decoded + pos);
-	if (zstr(decoded)) {
-		*authzid = strdup(*authcid);
-	} else {
-		*authzid = strdup(decoded);
-	}
-
- end:
-	switch_safe_free(decoded);
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/sasl.h b/src/mod/event_handlers/mod_rayo/sasl.h
deleted file mode 100644
index 641bcfa064..0000000000
--- a/src/mod/event_handlers/mod_rayo/sasl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * sasl.h -- SASL
- *
- */
-#ifndef SASL_H
-#define SASL_H
-
-SWITCH_DECLARE(void) parse_plain_auth_message(const char *message, char **authzid, char **authcid, char **password);
-
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/srgs.c b/src/mod/event_handlers/mod_rayo/srgs.c
deleted file mode 100644
index 7981c24ef2..0000000000
--- a/src/mod/event_handlers/mod_rayo/srgs.c
+++ /dev/null
@@ -1,1683 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2015, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * srgs.c -- Parses / converts / matches SRGS grammars
- *
- */
-#include <switch.h>
-#include <iksemel.h>
-#include <pcre.h>
-
-#include "srgs.h"
-
-#define MAX_RECURSION 100
-#define MAX_TAGS 1024
-
-/** function to handle tag attributes */
-typedef int (* tag_attribs_fn)(struct srgs_grammar *, char **);
-/** function to handle tag CDATA */
-typedef int (* tag_cdata_fn)(struct srgs_grammar *, char *, size_t);
-
-/**
- * Tag definition
- */
-struct tag_def {
-	tag_attribs_fn attribs_fn;
-	tag_cdata_fn cdata_fn;
-	switch_bool_t is_root;
-	switch_hash_t *children_tags;
-};
-
-/**
- * library configuration
- */
-typedef struct {
-	/** true if initialized */
-	switch_bool_t init;
-	/** Mapping of tag name to definition */
-	switch_hash_t *tag_defs;
-	/** library memory pool */
-	switch_memory_pool_t *pool;
-} srgs_globals;
-static srgs_globals globals = { 0 };
-
-/**
- * SRGS node types
- */
-enum srgs_node_type {
-	/** anything */
-	SNT_ANY,
-	/** <grammar> */
-	SNT_GRAMMAR,
-	/** <rule> */
-	SNT_RULE,
-	/** <one-of> */
-	SNT_ONE_OF,
-	/** <item> */
-	SNT_ITEM,
-	/** <ruleref> unresolved reference to node */
-	SNT_UNRESOLVED_REF,
-	/** <ruleref> resolved reference to node */
-	SNT_REF,
-	/** <item> string */
-	SNT_STRING,
-	/** <tag> */
-	SNT_TAG,
-	/** <lexicon> */
-	SNT_LEXICON,
-	/** <example> */
-	SNT_EXAMPLE,
-	/** <token> */
-	SNT_TOKEN,
-	/** <meta> */
-	SNT_META,
-	/** <metadata> */
-	SNT_METADATA
-};
-
-/**
- * <rule> value
- */
-struct rule_value {
-	char is_public;
-	char *id;
-	char *regex;
-};
-
-/**
- * <item> value
- */
-struct item_value {
-	int repeat_min;
-	int repeat_max;
-	const char *weight;
-	int tag;
-};
-
-/**
- * <ruleref> value
- */
-union ref_value {
-	struct srgs_node *node;
-	char *uri;
-};
-
-/**
- * A node in the SRGS parse tree
- */
-struct srgs_node {
-	/** Name of node */
-	const char *name;
-	/** Type of node */
-	enum srgs_node_type type;
-	/** True if node has been inspected for loops */
-	char visited;
-	/** Node value */
-	union {
-		char *root;
-		const char *string;
-		union ref_value ref;
-		struct rule_value rule;
-		struct item_value item;
-	} value;
-	/** parent node */
-	struct srgs_node *parent;
-	/** child node */
-	struct srgs_node *child;
-	/** sibling node */
-	struct srgs_node *next;
-	/** number of child nodes */
-	int num_children;
-	/** tag handling data */
-	struct tag_def *tag_def;
-};
-
-/**
- * A parsed grammar
- */
-struct srgs_grammar {
-	/** grammar memory pool */
-	switch_memory_pool_t *pool;
-	/** current node being parsed */
-	struct srgs_node *cur;
-	/** rule names mapped to node */
-	switch_hash_t *rules;
-	/** possible matching tags */
-	const char *tags[MAX_TAGS + 1];
-	/** number of tags */
-	int tag_count;
-	/** grammar encoding */
-	char *encoding;
-	/** grammar language */
-	char *language;
-	/** true if digit grammar */
-	int digit_mode;
-	/** grammar parse tree root */
-	struct srgs_node *root;
-	/** root rule */
-	struct srgs_node *root_rule;
-	/** compiled grammar regex */
-	pcre *compiled_regex;
-	/** grammar in regex format */
-	char *regex;
-	/** grammar in JSGF format */
-	char *jsgf;
-	/** grammar as JSGF file */
-	char *jsgf_file_name;
-	/** synchronizes access to this grammar */
-	switch_mutex_t *mutex;
-	/** optional uuid for logging */
-	const char *uuid;
-};
-
-/**
- * The SRGS SAX parser
- */
-struct srgs_parser {
-	/** parser memory pool */
-	switch_memory_pool_t *pool;
-	/** grammar cache */
-	switch_hash_t *cache;
-	/** cache mutex */
-	switch_mutex_t *mutex;
-	/** optional uuid for logging */
-	const char *uuid;
-};
-
-/**
- * Convert entity name to node type
- * @param name of entity
- * @return the type or ANY
- */
-static enum srgs_node_type string_to_node_type(char *name)
-{
-	if (!strcmp("grammar", name)) {
-		return SNT_GRAMMAR;
-	}
-	if (!strcmp("item", name)) {
-		return SNT_ITEM;
-	}
-	if (!strcmp("one-of", name)) {
-		return SNT_ONE_OF;
-	}
-	if (!strcmp("ruleref", name)) {
-		return SNT_UNRESOLVED_REF;
-	}
-	if (!strcmp("rule", name)) {
-		return SNT_RULE;
-	}
-	if (!strcmp("tag", name)) {
-		return SNT_TAG;
-	}
-	if (!strcmp("lexicon", name)) {
-		return SNT_LEXICON;
-	}
-	if (!strcmp("example", name)) {
-		return SNT_EXAMPLE;
-	}
-	if (!strcmp("token", name)) {
-		return SNT_TOKEN;
-	}
-	if (!strcmp("meta", name)) {
-		return SNT_META;
-	}
-	if (!strcmp("metadata", name)) {
-		return SNT_METADATA;
-	}
-	return SNT_ANY;
-}
-
-/**
- * Log node
- */
-static void sn_log_node_open(struct srgs_node *node)
-{
-	switch (node->type) {
-		case SNT_ANY:
-		case SNT_METADATA:
-		case SNT_META:
-		case SNT_TOKEN:
-		case SNT_EXAMPLE:
-		case SNT_LEXICON:
-		case SNT_TAG:
-		case SNT_ONE_OF:
-		case SNT_GRAMMAR:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "<%s>\n", node->name);
-			return;
-		case SNT_RULE:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "<rule id='%s' scope='%s'>\n", node->value.rule.id, node->value.rule.is_public ? "public" : "private");
-			return;
-		case SNT_ITEM:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "<item repeat='%i'>\n", node->value.item.repeat_min);
-			return;
-		case SNT_UNRESOLVED_REF:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "<ruleref (unresolved) uri='%s'\n", node->value.ref.uri);
-			return;
-		case SNT_REF:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "<ruleref uri='#%s'>\n", node->value.ref.node->value.rule.id);
-			return;
-		case SNT_STRING:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s\n", node->value.string);
-			return;
-	}
-}
-
-/**
- * Log node
- */
-static void sn_log_node_close(struct srgs_node *node)
-{
-	switch (node->type) {
-		case SNT_GRAMMAR:
-		case SNT_RULE:
-		case SNT_ONE_OF:
-		case SNT_ITEM:
-		case SNT_REF:
-		case SNT_TAG:
-		case SNT_LEXICON:
-		case SNT_EXAMPLE:
-		case SNT_TOKEN:
-		case SNT_META:
-		case SNT_METADATA:
-		case SNT_ANY:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "</%s>\n", node->name);
-			return;
-		case SNT_UNRESOLVED_REF:
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "</ruleref (unresolved)>\n");
-			return;
-		case SNT_STRING:
-			return;
-	}
-}
-
-/**
- * Create a new node
- * @param pool to use
- * @param name of node
- * @param type of node
- * @return the node
- */
-static struct srgs_node *sn_new(switch_memory_pool_t *pool, const char *name, enum srgs_node_type type)
-{
-	struct srgs_node *node = switch_core_alloc(pool, sizeof(*node));
-	node->name = switch_core_strdup(pool, name);
-	node->type = type;
-	return node;
-}
-
-/**
- * @param node to search
- * @return the last sibling of node
- */
-static struct srgs_node *sn_find_last_sibling(struct srgs_node *node)
-{
-	if (node && node->next) {
-		return sn_find_last_sibling(node->next);
-	}
-	return node;
-}
-
-/**
- * Add child node
- * @param pool to use
- * @param parent node to add child to
- * @param name the child node name
- * @param type the child node type
- * @return the child node
- */
-static struct srgs_node *sn_insert(switch_memory_pool_t *pool, struct srgs_node *parent, const char *name, enum srgs_node_type type)
-{
-	struct srgs_node *sibling = parent ? sn_find_last_sibling(parent->child) : NULL;
-	struct srgs_node *child = sn_new(pool, name, type);
-	if (parent) {
-		parent->num_children++;
-		child->parent = parent;
-	}
-	if (sibling) {
-		sibling->next = child;
-	} else if (parent) {
-		parent->child = child;
-	}
-	return child;
-}
-
-/**
- * Add string child node
- * @param pool to use
- * @param parent node to add string to
- * @param string to add - this function does not copy the string
- * @return the string child node
- */
-static struct srgs_node *sn_insert_string(switch_memory_pool_t *pool, struct srgs_node *parent, char *string)
-{
-	struct srgs_node *child = sn_insert(pool, parent, string, SNT_STRING);
-	child->value.string = string;
-	return child;
-}
-
-/**
- * Tag def destructor
- */
-static void destroy_tag_def(void *ptr)
-{
-    struct tag_def *tag = (struct tag_def *) ptr;
-	if (tag->children_tags) {
-		switch_core_hash_destroy(&tag->children_tags);
-	}
-}
-
-/**
- * Add a definition for a tag
- * @param tag the name
- * @param attribs_fn the function to handle the tag attributes
- * @param cdata_fn the function to handler the tag CDATA
- * @param children_tags comma-separated list of valid child tag names
- * @return the definition
- */
-static struct tag_def *add_tag_def(const char *tag, tag_attribs_fn attribs_fn, tag_cdata_fn cdata_fn, const char *children_tags)
-{
-	struct tag_def *def = switch_core_alloc(globals.pool, sizeof(*def));
-	switch_core_hash_init(&def->children_tags);
-	if (!zstr(children_tags)) {
-		char *children_tags_dup = switch_core_strdup(globals.pool, children_tags);
-		char *tags[32] = { 0 };
-		int tag_count = switch_separate_string(children_tags_dup, ',', tags, sizeof(tags) / sizeof(tags[0]));
-		if (tag_count) {
-			int i;
-			for (i = 0; i < tag_count; i++) {
-				switch_core_hash_insert(def->children_tags, tags[i], tags[i]);
-			}
-		}
-	}
-	def->attribs_fn = attribs_fn;
-	def->cdata_fn = cdata_fn;
-	def->is_root = SWITCH_FALSE;
-	switch_core_hash_insert_destructor(globals.tag_defs, tag, def, destroy_tag_def);
-	return def;
-}
-
-/**
- * Add a definition for a root tag
- * @param tag the name
- * @param attribs_fn the function to handle the tag attributes
- * @param cdata_fn the function to handler the tag CDATA
- * @param children_tags comma-separated list of valid child tag names
- * @return the definition
- */
-static struct tag_def *add_root_tag_def(const char *tag, tag_attribs_fn attribs_fn, tag_cdata_fn cdata_fn, const char *children_tags)
-{
-	struct tag_def *def = add_tag_def(tag, attribs_fn, cdata_fn, children_tags);
-	def->is_root = SWITCH_TRUE;
-	return def;
-}
-
-/**
- * Handle tag attributes
- * @param parser the parser
- * @param name the tag name
- * @param atts the attributes
- * @return IKS_OK if OK IKS_BADXML on parse failure
- */
-static int process_tag(struct srgs_grammar *grammar, const char *name, char **atts)
-{
-	struct srgs_node *cur = grammar->cur;
-	if (cur->tag_def->is_root && cur->parent == NULL) {
-		/* no parent for ROOT tags */
-		return cur->tag_def->attribs_fn(grammar, atts);
-	} else if (!cur->tag_def->is_root && cur->parent) {
-		/* check if this child is allowed by parent node */
-		struct tag_def *parent_def = cur->parent->tag_def;
-		if (switch_core_hash_find(parent_def->children_tags, "ANY") ||
-			switch_core_hash_find(parent_def->children_tags, name)) {
-			return cur->tag_def->attribs_fn(grammar, atts);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<%s> cannot be a child of <%s>\n", name, cur->parent->name);
-		}
-	} else if (cur->tag_def->is_root && cur->parent != NULL) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<%s> must be the root element\n", name);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<%s> cannot be a root element\n", name);
-	}
-	return IKS_BADXML;
-}
-
-/**
- * Handle tag attributes that are ignored
- * @param grammar the grammar
- * @param atts the attributes
- * @return IKS_OK
- */
-static int process_attribs_ignore(struct srgs_grammar *grammar, char **atts)
-{
-	return IKS_OK;
-}
-
-/**
- * Handle CDATA that is ignored
- * @param grammar the grammar
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_OK
- */
-static int process_cdata_ignore(struct srgs_grammar *grammar, char *data, size_t len)
-{
-	return IKS_OK;
-}
-
-/**
- * Handle CDATA that is not allowed
- * @param grammar the grammar
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_BADXML if any printable characters
- */
-static int process_cdata_bad(struct srgs_grammar *grammar, char *data, size_t len)
-{
-	int i;
-	for (i = 0; i < len; i++) {
-		if (isgraph(data[i])) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Unexpected CDATA for <%s>\n", grammar->cur->name);
-			return IKS_BADXML;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Process <rule> attributes
- * @param grammar the grammar state
- * @param atts the attributes
- * @return IKS_OK if ok
- */
-static int process_rule(struct srgs_grammar *grammar, char **atts)
-{
-	struct srgs_node *rule = grammar->cur;
-	rule->value.rule.is_public = 0;
-	rule->value.rule.id = NULL;
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("scope", atts[i])) {
-				rule->value.rule.is_public = !zstr(atts[i + 1]) && !strcmp("public", atts[i + 1]);
-			} else if (!strcmp("id", atts[i])) {
-				if (!zstr(atts[i + 1])) {
-					rule->value.rule.id = switch_core_strdup(grammar->pool, atts[i + 1]);
-				}
-			}
-			i += 2;
-		}
-	}
-
-	if (zstr(rule->value.rule.id)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Missing rule ID: %s\n", rule->value.rule.id);
-		return IKS_BADXML;
-	}
-
-	if (switch_core_hash_find(grammar->rules, rule->value.rule.id)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Duplicate rule ID: %s\n", rule->value.rule.id);
-		return IKS_BADXML;
-	}
-	switch_core_hash_insert(grammar->rules, rule->value.rule.id, rule);
-
-	return IKS_OK;
-}
-
-/**
- * Process <ruleref> attributes
- * @param grammar the grammar state
- * @param atts the attributes
- * @return IKS_OK if ok
- */
-static int process_ruleref(struct srgs_grammar *grammar, char **atts)
-{
-	struct srgs_node *ruleref = grammar->cur;
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("uri", atts[i])) {
-				char *uri = atts[i + 1];
-				if (zstr(uri)) {
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Empty <ruleref> uri\n");
-					return IKS_BADXML;
-				}
-				/* only allow local reference */
-				if (uri[0] != '#' || strlen(uri) < 2) {
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Only local rule refs allowed\n");
-					return IKS_BADXML;
-				}
-				ruleref->value.ref.uri = switch_core_strdup(grammar->pool, uri);
-				return IKS_OK;
-			}
-			i += 2;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Process <item> attributes
- * @param grammar the grammar state
- * @param atts the attributes
- * @return IKS_OK if ok
- */
-static int process_item(struct srgs_grammar *grammar, char **atts)
-{
-	struct srgs_node *item = grammar->cur;
-	item->value.item.repeat_min = 1;
-	item->value.item.repeat_max = 1;
-	item->value.item.weight = NULL;
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("repeat", atts[i])) {
-				/* repeats of 0 are not supported by this code */
-				char *repeat = atts[i + 1];
-				if (zstr(repeat)) {
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Empty <item> repeat atribute\n");
-					return IKS_BADXML;
-				}
-				if (switch_is_number(repeat)) {
-					/* single number */
-					int repeat_val = atoi(repeat);
-					if (repeat_val < 1) {
-						switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<item> repeat must be >= 0\n");
-						return IKS_BADXML;
-					}
-					item->value.item.repeat_min = repeat_val;
-					item->value.item.repeat_max = repeat_val;
-				} else {
-					/* range */
-					char *min = switch_core_strdup(grammar->pool, repeat);
-					char *max = strchr(min, '-');
-					if (max) {
-						*max = '\0';
-						max++;
-					} else {
-						switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<item> repeat must be a number or range\n");
-						return IKS_BADXML;
-					}
-					if (switch_is_number(min) && (switch_is_number(max) || zstr(max))) {
-						int min_val = atoi(min);
-						int max_val = zstr(max) ? INT_MAX : atoi(max);
-						/* max must be >= min and > 0
-						   min must be >= 0 */
-						if ((max_val <= 0) || (max_val < min_val) || (min_val < 0)) {
-							switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<item> repeat range invalid\n");
-							return IKS_BADXML;
-						}
-						item->value.item.repeat_min = min_val;
-						item->value.item.repeat_max = max_val;
-					} else {
-						switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<item> repeat range is not a number\n");
-						return IKS_BADXML;
-					}
-				}
-			} else if (!strcmp("weight", atts[i])) {
-				const char *weight = atts[i + 1];
-				if (zstr(weight) || !switch_is_number(weight) || atof(weight) < 0) {
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<item> weight is not a number >= 0\n");
-					return IKS_BADXML;
-				}
-				item->value.item.weight = switch_core_strdup(grammar->pool, weight);
-			}
-			i += 2;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Process <grammar> attributes
- * @param grammar the grammar state
- * @param atts the attributes
- * @return IKS_OK if ok
- */
-static int process_grammar(struct srgs_grammar *grammar, char **atts)
-{
-	if (grammar->root) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Only one <grammar> tag allowed\n");
-		return IKS_BADXML;
-	}
-	grammar->root = grammar->cur;
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("mode", atts[i])) {
-				char *mode = atts[i + 1];
-				if (zstr(mode)) {
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<grammar> mode is missing\n");
-					return IKS_BADXML;
-				}
-				grammar->digit_mode = !strcasecmp(mode, "dtmf");
-			} else if(!strcmp("encoding", atts[i])) {
-				char *encoding = atts[i + 1];
-				if (zstr(encoding)) {
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<grammar> encoding is empty\n");
-					return IKS_BADXML;
-				}
-				grammar->encoding = switch_core_strdup(grammar->pool, encoding);
-			} else if (!strcmp("language", atts[i])) {
-				char *language = atts[i + 1];
-				if (zstr(language)) {
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<grammar> language is empty\n");
-					return IKS_BADXML;
-				}
-				grammar->language = switch_core_strdup(grammar->pool, language);
-			} else if (!strcmp("root", atts[i])) {
-				char *root = atts[i + 1];
-				if (zstr(root)) {
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "<grammar> root is empty\n");
-					return IKS_BADXML;
-				}
-				grammar->cur->value.root = switch_core_strdup(grammar->pool, root);
-			}
-			i += 2;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Process a tag
- */
-static int tag_hook(void *user_data, char *name, char **atts, int type)
-{
-	int result = IKS_OK;
-	struct srgs_grammar *grammar = (struct srgs_grammar *)user_data;
-
-	if (type == IKS_OPEN || type == IKS_SINGLE) {
-		enum srgs_node_type ntype = string_to_node_type(name);
-		grammar->cur = sn_insert(grammar->pool, grammar->cur, name, ntype);
-		grammar->cur->tag_def = switch_core_hash_find(globals.tag_defs, name);
-		if (!grammar->cur->tag_def) {
-			grammar->cur->tag_def = switch_core_hash_find(globals.tag_defs, "ANY");
-		}
-		result = process_tag(grammar, name, atts);
-		sn_log_node_open(grammar->cur);
-	}
-
-	if (type == IKS_CLOSE || type == IKS_SINGLE) {
-		sn_log_node_close(grammar->cur);
-		grammar->cur = grammar->cur->parent;
-	}
-
-	return result;
-}
-
-/**
- * Process <tag> CDATA
- * @param grammar the grammar
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_OK
- */
-static int process_cdata_tag(struct srgs_grammar *grammar, char *data, size_t len)
-{
-	struct srgs_node *item = grammar->cur->parent;
-	if (item && item->type == SNT_ITEM) {
-		if (grammar->tag_count < MAX_TAGS) {
-			/* grammar gets the tag name, item gets the unique tag number */
-			char *tag = switch_core_alloc(grammar->pool, sizeof(char) * (len + 1));
-			tag[len] = '\0';
-			strncpy(tag, data, len);
-			grammar->tags[++grammar->tag_count] = tag;
-			item->value.item.tag = grammar->tag_count;
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "too many <tag>s\n");
-			return IKS_BADXML;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Process CDATA grammar tokens
- * @param grammar the grammar
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_OK
- */
-static int process_cdata_tokens(struct srgs_grammar *grammar, char *data, size_t len)
-{
-	struct srgs_node *string = grammar->cur;
-	int i;
-	if (grammar->digit_mode) {
-		for (i = 0; i < len; i++) {
-			if (isdigit(data[i]) || data[i] == '#' || data[i] == '*') {
-				char *digit = switch_core_alloc(grammar->pool, sizeof(char) * 2);
-				digit[0] = data[i];
-				digit[1] = '\0';
-				string = sn_insert_string(grammar->pool, string, digit);
-				sn_log_node_open(string);
-			}
-		}
-	} else {
-		char *data_dup = switch_core_alloc(grammar->pool, sizeof(char) * (len + 1));
-		char *start = data_dup;
-		char *end = start + len - 1;
-		memcpy(data_dup, data, len);
-		/* remove start whitespace */
-		for (; start && *start && !isgraph(*start); start++) {
-		}
-		if (!zstr(start)) {
-			/* remove end whitespace */
-			for (; end != start && *end && !isgraph(*end); end--) {
-				*end = '\0';
-			}
-			if (!zstr(start)) {
-				sn_insert_string(grammar->pool, string, start);
-			}
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Process cdata
- * @param user_data the grammar
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_OK
- */
-static int cdata_hook(void *user_data, char *data, size_t len)
-{
-	struct srgs_grammar *grammar = (struct srgs_grammar *)user_data;
-	if (!grammar) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Missing grammar\n");
-		return IKS_BADXML;
-	}
-	if (grammar->cur) {
-		if (grammar->cur->tag_def) {
-			return grammar->cur->tag_def->cdata_fn(grammar, data, len);
-		}
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Missing definition for <%s>\n", grammar->cur->name);
-		return IKS_BADXML;
-	}
-	return IKS_OK;
-}
-
-/**
- * Create a new parsed grammar
- * @param parser
- * @return the grammar
- */
-struct srgs_grammar *srgs_grammar_new(struct srgs_parser *parser)
-{
-	switch_memory_pool_t *pool = NULL;
-	struct srgs_grammar *grammar = NULL;
-	switch_core_new_memory_pool(&pool);
-	grammar = switch_core_alloc(pool, sizeof (*grammar));
-	grammar->pool = pool;
-	grammar->root = NULL;
-	grammar->cur = NULL;
-	grammar->uuid = (parser && !zstr(parser->uuid)) ? switch_core_strdup(pool, parser->uuid) : "";
-	switch_core_hash_init(&grammar->rules);
-	switch_mutex_init(&grammar->mutex, SWITCH_MUTEX_NESTED, pool);
-	return grammar;
-}
-
-/**
- * Destroy a parsed grammar
- * @param grammar the grammar
- */
-static void srgs_grammar_destroy(struct srgs_grammar *grammar)
-{
-	switch_memory_pool_t *pool = grammar->pool;
-	if (grammar->compiled_regex) {
-		pcre_free(grammar->compiled_regex);
-	}
-	if (grammar->jsgf_file_name) {
-		switch_file_remove(grammar->jsgf_file_name, pool);
-	}
-	switch_core_hash_destroy(&grammar->rules);
-	switch_core_destroy_memory_pool(&pool);
-}
-
-/**
- * Create a new parser.
- * @param uuid optional uuid for logging
- * @return the created parser
- */
-struct srgs_parser *srgs_parser_new(const char *uuid)
-{
-	switch_memory_pool_t *pool = NULL;
-	struct srgs_parser *parser = NULL;
-	switch_core_new_memory_pool(&pool);
-	if (pool) {
-		parser = switch_core_alloc(pool, sizeof(*parser));
-		parser->pool = pool;
-		parser->uuid = zstr(uuid) ? "" : switch_core_strdup(pool, uuid);
-		switch_core_hash_init(&parser->cache);
-		switch_mutex_init(&parser->mutex, SWITCH_MUTEX_NESTED, pool);
-	}
-	return parser;
-}
-
-/**
- * Destroy the parser.
- * @param parser to destroy
- */
-void srgs_parser_destroy(struct srgs_parser *parser)
-{
-	switch_memory_pool_t *pool = parser->pool;
-	switch_hash_index_t *hi = NULL;
-
-	if (parser->cache) {
-		/* clean up all cached grammars */
-		for (hi = switch_core_hash_first(parser->cache); hi; hi = switch_core_hash_next(&hi)) {
-			struct srgs_grammar *grammar = NULL;
-			const void *key;
-			void *val;
-			switch_core_hash_this(hi, &key, NULL, &val);
-			grammar = (struct srgs_grammar *)val;
-			switch_assert(grammar);
-			srgs_grammar_destroy(grammar);
-		}
-		switch_core_hash_destroy(&parser->cache);
-	}
-	switch_core_destroy_memory_pool(&pool);
-}
-
-/**
- * Create regexes
- * @param grammar the grammar
- * @param node root node
- * @param stream set to NULL
- * @return 1 if successful
- */
-static int create_regexes(struct srgs_grammar *grammar, struct srgs_node *node, switch_stream_handle_t *stream)
-{
-	sn_log_node_open(node);
-	switch (node->type) {
-		case SNT_GRAMMAR:
-			if (node->child) {
-				int num_rules = 0;
-				struct srgs_node *child = node->child;
-				if (grammar->root_rule) {
-					if (!create_regexes(grammar, grammar->root_rule, NULL)) {
-						return 0;
-					}
-					grammar->regex = switch_core_sprintf(grammar->pool, "^%s$", grammar->root_rule->value.rule.regex);
-				} else {
-					switch_stream_handle_t new_stream = { 0 };
-					SWITCH_STANDARD_STREAM(new_stream);
-					if (node->num_children > 1) {
-						new_stream.write_function(&new_stream, "%s", "^(?:");
-					} else {
-						new_stream.write_function(&new_stream, "%s", "^");
-					}
-					for (; child; child = child->next) {
-						if (!create_regexes(grammar, child, &new_stream)) {
-							switch_safe_free(new_stream.data);
-							return 0;
-						}
-						if (child->type == SNT_RULE && child->value.rule.is_public) {
-							if (num_rules > 0) {
-								new_stream.write_function(&new_stream, "%s", "|");
-							}
-							new_stream.write_function(&new_stream, "%s", child->value.rule.regex);
-							num_rules++;
-						}
-					}
-					if (node->num_children > 1) {
-						new_stream.write_function(&new_stream, "%s", ")$");
-					} else {
-						new_stream.write_function(&new_stream, "%s", "$");
-					}
-					grammar->regex = switch_core_strdup(grammar->pool, new_stream.data);
-					switch_safe_free(new_stream.data);
-				}
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_DEBUG, "document regex = %s\n", grammar->regex);
-			}
-			break;
-		case SNT_RULE:
-			if (node->value.rule.regex) {
-				return 1;
-			} else if (node->child) {
-				struct srgs_node *item = node->child;
-				switch_stream_handle_t new_stream = { 0 };
-				SWITCH_STANDARD_STREAM(new_stream);
-				for (; item; item = item->next) {
-					if (!create_regexes(grammar, item, &new_stream)) {
-						switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_DEBUG, "%s regex failed = %s\n", node->value.rule.id, node->value.rule.regex);
-						switch_safe_free(new_stream.data);
-						return 0;
-					}
-				}
-				node->value.rule.regex = switch_core_strdup(grammar->pool, new_stream.data);
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_DEBUG, "%s regex = %s\n", node->value.rule.id, node->value.rule.regex);
-				switch_safe_free(new_stream.data);
-			}
-			break;
-		case SNT_STRING: {
-			int i;
-			for (i = 0; i < strlen(node->value.string); i++) {
-				switch (node->value.string[i]) {
-					case '[':
-					case '\\':
-					case '^':
-					case '$':
-					case '.':
-					case '|':
-					case '?':
-					case '*':
-					case '+':
-					case '(':
-					case ')':
-						/* escape special PCRE regex characters */
-						stream->write_function(stream, "\\%c", node->value.string[i]);
-						break;
-					default:
-						stream->write_function(stream, "%c", node->value.string[i]);
-						break;
-				}
-			}
-			if (node->child) {
-				if (!create_regexes(grammar, node->child, stream)) {
-					return 0;
-				}
-			}
-			break;
-		}
-		case SNT_ITEM:
-			if (node->child) {
-				struct srgs_node *item = node->child;
-				if (node->value.item.repeat_min != 1 || node->value.item.repeat_max != 1 || node->value.item.tag) {
-					if (node->value.item.tag) {
-						stream->write_function(stream, "(?P<tag%d>", node->value.item.tag);
-					} else {
-						stream->write_function(stream, "%s", "(?:");
-					}
-				}
-				for(; item; item = item->next) {
-					if (!create_regexes(grammar, item, stream)) {
-						return 0;
-					}
-				}
-				if (node->value.item.repeat_min != 1 || node->value.item.repeat_max != 1) {
-					if (node->value.item.repeat_min != node->value.item.repeat_max) {
-						if (node->value.item.repeat_min == 0 && node->value.item.repeat_max == INT_MAX) {
-								stream->write_function(stream, ")*");
-						} else if (node->value.item.repeat_min == 0 && node->value.item.repeat_max == 1) {
-								stream->write_function(stream, ")?");
-						} else if (node->value.item.repeat_min == 1 && node->value.item.repeat_max == INT_MAX) {
-							stream->write_function(stream, ")+");
-						} else if (node->value.item.repeat_max == INT_MAX) {
-							stream->write_function(stream, "){%i,1000}", node->value.item.repeat_min);
-						} else {
-							stream->write_function(stream, "){%i,%i}", node->value.item.repeat_min, node->value.item.repeat_max);
-						}
-					} else {
-						stream->write_function(stream, "){%i}", node->value.item.repeat_min);
-					}
-				} else if (node->value.item.tag) {
-					stream->write_function(stream, "%s", ")");
-				}
-			}
-			break;
-		case SNT_ONE_OF:
-			if (node->child) {
-				struct srgs_node *item = node->child;
-				if (node->num_children > 1) {
-					stream->write_function(stream, "%s", "(?:");
-				}
-				for (; item; item = item->next) {
-					if (item != node->child) {
-						stream->write_function(stream, "%s", "|");
-					}
-					if (!create_regexes(grammar, item, stream)) {
-						return 0;
-					}
-				}
-				if (node->num_children > 1) {
-					stream->write_function(stream, "%s", ")");
-				}
-			}
-			break;
-		case SNT_REF: {
-			struct srgs_node *rule = node->value.ref.node;
-			if (!rule->value.rule.regex) {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_DEBUG, "ruleref: create %s regex\n", rule->value.rule.id);
-				if (!create_regexes(grammar, rule, NULL)) {
-					return 0;
-				}
-			}
-			if (!rule->value.rule.regex) {
-				return 0;
-			}
-			stream->write_function(stream, "%s", rule->value.rule.regex);
-			break;
-		}
-		case SNT_ANY:
-		default:
-			/* ignore */
-			return 1;
-	}
-	sn_log_node_close(node);
-	return 1;
-}
-
-/**
- * Compile regex
- */
-static pcre *get_compiled_regex(struct srgs_grammar *grammar)
-{
-	int erroffset = 0;
-	const char *errptr = "";
-	int options = 0;
-	const char *regex;
-
-	if (!grammar) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "grammar is NULL!\n");
-		return NULL;
-	}
-
-	switch_mutex_lock(grammar->mutex);
-	if (!grammar->compiled_regex && (regex = srgs_grammar_to_regex(grammar))) {
-		if (!(grammar->compiled_regex = pcre_compile(regex, options, &errptr, &erroffset, NULL))) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_WARNING, "Failed to compile grammar regex: %s\n", regex);
-		}
-	}
-	switch_mutex_unlock(grammar->mutex);
-	return grammar->compiled_regex;
-}
-
-/**
- * Resolve all unresolved references and detect loops.
- * @param grammar the grammar
- * @param node the current node
- * @param level the recursion level
- */
-static int resolve_refs(struct srgs_grammar *grammar, struct srgs_node *node, int level)
-{
-	sn_log_node_open(node);
-	if (node->visited) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Loop detected.\n");
-		return 0;
-	}
-	node->visited = 1;
-
-	if (level > MAX_RECURSION) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Recursion too deep.\n");
-		return 0;
-	}
-
-	if (node->type == SNT_GRAMMAR && node->value.root) {
-		struct srgs_node *rule = (struct srgs_node *)switch_core_hash_find(grammar->rules, node->value.root);
-		if (!rule) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Root rule not found: %s\n", node->value.root);
-			return 0;
-		}
-		grammar->root_rule = rule;
-	}
-
-	if (node->type == SNT_UNRESOLVED_REF) {
-		/* resolve reference to local rule- drop first character # from URI */
-		struct srgs_node *rule = (struct srgs_node *)switch_core_hash_find(grammar->rules, node->value.ref.uri + 1);
-		if (!rule) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(grammar->uuid), SWITCH_LOG_INFO, "Local rule not found: %s\n", node->value.ref.uri);
-			return 0;
-		}
-
-		/* link to rule */
-		node->type = SNT_REF;
-		node->value.ref.node = rule;
-	}
-
-	/* travel through rule to detect loops */
-	if (node->type == SNT_REF) {
-		if (!resolve_refs(grammar, node->value.ref.node, level + 1)) {
-			return 0;
-		}
-	}
-
-	/* resolve children refs */
-	if (node->child) {
-		struct srgs_node *child = node->child;
-		for (; child; child = child->next) {
-			if (!resolve_refs(grammar, child, level + 1)) {
-				return 0;
-			}
-		}
-	}
-
-	node->visited = 0;
-	sn_log_node_close(node);
-	return 1;
-}
-
-/**
- * Parse the document into rules to match
- * @param parser the parser
- * @param document the document to parse
- * @return the parsed grammar if successful
- */
-struct srgs_grammar *srgs_parse(struct srgs_parser *parser, const char *document)
-{
-	struct srgs_grammar *grammar = NULL;
-	if (!parser) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "NULL parser!!\n");
-		return NULL;
-	}
-
-	if (zstr(document)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_INFO, "Missing grammar document\n");
-		return NULL;
-	}
-
-	/* check for cached grammar */
-	switch_mutex_lock(parser->mutex);
-	grammar = (struct srgs_grammar *)switch_core_hash_find(parser->cache, document);
-	if (!grammar) {
-		int result = 0;
-		iksparser *p;
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_DEBUG, "Parsing new grammar\n");
-		grammar = srgs_grammar_new(parser);
-		p = iks_sax_new(grammar, tag_hook, cdata_hook);
-		if (iks_parse(p, document, 0, 1) == IKS_OK) {
-			if (grammar->root) {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_DEBUG, "Resolving references\n");
-				if (resolve_refs(grammar, grammar->root, 0)) {
-					result = 1;
-				}
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_INFO, "Nothing to parse!\n");
-			}
-		}
-		iks_parser_delete(p);
-		if (result) {
-			switch_core_hash_insert(parser->cache, document, grammar);
-		} else {
-			if (grammar) {
-				srgs_grammar_destroy(grammar);
-				grammar = NULL;
-			}
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_INFO, "Failed to parse grammar\n");
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser->uuid), SWITCH_LOG_DEBUG, "Using cached grammar\n");
-	}
-	switch_mutex_unlock(parser->mutex);
-
-	return grammar;
-}
-
-#define MAX_INPUT_SIZE 128
-#define OVECTOR_SIZE MAX_TAGS
-#define WORKSPACE_SIZE 1024
-
-/**
- * Check if no more digits can be added to input and match
- * @param compiled_regex the regex used in the initial match
- * @param input the input to check
- * @return true if end of match (no more input can be added)
- */
-static int is_match_end(pcre *compiled_regex, const char *input)
-{
-	int ovector[OVECTOR_SIZE];
-	int input_size = strlen(input);
-	char search_input[MAX_INPUT_SIZE + 2];
-	const char *search_set = "0123456789#*ABCD";
-	const char *search = strchr(search_set, input[input_size - 1]); /* start with last digit in input */
-	int i = 0;
-
-	if (!search) {
-		return 0;
-	}
-
-	/* For each digit in search_set, check if input + search_set digit is a potential match.
-	   If so, then this is not a match end.
-	 */
-	sprintf(search_input, "%sZ", input);
-	for (i = 0; i < 16; i++) {
-		int result;
-		if (!*search) {
-			search = search_set;
-		}
-		search_input[input_size] = *search++;
-		result = pcre_exec(compiled_regex, NULL, search_input, input_size + 1, 0, PCRE_PARTIAL,
-			ovector, sizeof(ovector) / sizeof(ovector[0]));
-		if (result > 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not match end\n");
-			return 0;
-		}
-		if (result == PCRE_ERROR_PARTIAL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "partial match possible - not match end\n");
-			return 0;
-		}
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "is match end\n");
-	return 1;
-}
-
-/**
- * Find a match
- * @param grammar the grammar to match
- * @param input the input to compare
- * @param interpretation the (optional) interpretation of the input result
- * @return the match result
- */
-enum srgs_match_type srgs_grammar_match(struct srgs_grammar *grammar, const char *input, const char **interpretation)
-{
-	int result = 0;
-	int ovector[OVECTOR_SIZE];
-	pcre *compiled_regex;
-
-	*interpretation = NULL;
-
-	if (zstr(input)) {
-		return SMT_NO_MATCH;
-	}
-	if (strlen(input) > MAX_INPUT_SIZE) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "input too large: %s\n", input);
-		return SMT_NO_MATCH;
-	}
-
-	if (!(compiled_regex = get_compiled_regex(grammar))) {
-		return SMT_NO_MATCH;
-	}
-	result = pcre_exec(compiled_regex, NULL, input, strlen(input), 0, PCRE_PARTIAL,
-		ovector, OVECTOR_SIZE);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "match = %i\n", result);
-	if (result > 0) {
-		int i;
-		char buffer[MAX_INPUT_SIZE + 1];
-		buffer[MAX_INPUT_SIZE] = '\0';
-
-		/* find matching instance... */
-		for (i = 1; i <= grammar->tag_count; i++) {
-			char substring_name[16] = { 0 };
-			buffer[0] = '\0';
-			snprintf(substring_name, 16, "tag%d", i);
-			if (pcre_copy_named_substring(compiled_regex, input, ovector, result, substring_name, buffer, MAX_INPUT_SIZE) != PCRE_ERROR_NOSUBSTRING && !zstr_buf(buffer)) {
-				*interpretation = grammar->tags[i];
-				break;
-			}
-		}
-
-		if (is_match_end(compiled_regex, input)) {
-			return SMT_MATCH_END;
-		}
-		return SMT_MATCH;
-	}
-	if (result == PCRE_ERROR_PARTIAL) {
-		return SMT_MATCH_PARTIAL;
-	}
-
-	return SMT_NO_MATCH;
-}
-
-/**
- * Generate regex from SRGS document.  Call this after parsing SRGS document.
- * @param parser the parser
- * @return the regex or NULL
- */
-const char *srgs_grammar_to_regex(struct srgs_grammar *grammar)
-{
-	if (!grammar) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "grammar is NULL!\n");
-		return NULL;
-	}
-	switch_mutex_lock(grammar->mutex);
-	if (!grammar->regex && !create_regexes(grammar, grammar->root, NULL)) {
-		switch_mutex_unlock(grammar->mutex);
-		return NULL;
-	}
-	switch_mutex_unlock(grammar->mutex);
-	return grammar->regex;
-}
-
-/**
- * Create JSGF grammar
- * @param parser the parser
- * @param node root node
- * @param stream set to NULL
- * @return 1 if successful
- */
-static int create_jsgf(struct srgs_grammar *grammar, struct srgs_node *node, switch_stream_handle_t *stream)
-{
-	sn_log_node_open(node);
-	switch (node->type) {
-		case SNT_GRAMMAR:
-			if (node->child) {
-				struct srgs_node *child;
-				switch_stream_handle_t new_stream = { 0 };
-				SWITCH_STANDARD_STREAM(new_stream);
-
-				new_stream.write_function(&new_stream, "#JSGF V1.0");
-				if (!zstr(grammar->encoding)) {
-					new_stream.write_function(&new_stream, " %s", grammar->encoding);
-					if (!zstr(grammar->language)) {
-						new_stream.write_function(&new_stream, " %s", grammar->language);
-					}
-				}
-
-				new_stream.write_function(&new_stream,
-					";\ngrammar org.freeswitch.srgs_to_jsgf;\n"
-					"public ");
-
-				/* output root rule */
-				if (grammar->root_rule) {
-					if (!create_jsgf(grammar, grammar->root_rule, &new_stream)) {
-						switch_safe_free(new_stream.data);
-						return 0;
-					}
-				} else {
-					int num_rules = 0;
-					int first = 1;
-
-					for (child = node->child; child; child = child->next) {
-						if (child->type == SNT_RULE && child->value.rule.is_public) {
-							num_rules++;
-						}
-					}
-
-					if (num_rules > 1) {
-						new_stream.write_function(&new_stream, "<root> =");
-						for (child = node->child; child; child = child->next) {
-							if (child->type == SNT_RULE && child->value.rule.is_public) {
-								if (!first) {
-									new_stream.write_function(&new_stream, "%s", " |");
-								}
-								first = 0;
-								new_stream.write_function(&new_stream, " <%s>", child->value.rule.id);
-							}
-						}
-						new_stream.write_function(&new_stream, ";\n");
-					} else {
-						for (child = node->child; child; child = child->next) {
-							if (child->type == SNT_RULE && child->value.rule.is_public) {
-								grammar->root_rule = child;
-								if (!create_jsgf(grammar, child, &new_stream)) {
-									switch_safe_free(new_stream.data);
-									return 0;
-								} else {
-									break;
-								}
-							}
-						}
-					}
-				}
-
-				/* output all rule definitions */
-				for (child = node->child; child; child = child->next) {
-					if (child->type == SNT_RULE && child != grammar->root_rule) {
-						if (!create_jsgf(grammar, child, &new_stream)) {
-							switch_safe_free(new_stream.data);
-							return 0;
-						}
-					}
-				}
-				grammar->jsgf = switch_core_strdup(grammar->pool, new_stream.data);
-				switch_safe_free(new_stream.data);
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "document jsgf = %s\n", grammar->jsgf);
-			}
-			break;
-		case SNT_RULE:
-			if (node->child) {
-				struct srgs_node *item = node->child;
-				stream->write_function(stream, "<%s> =", node->value.rule.id);
-				for (; item; item = item->next) {
-					if (!create_jsgf(grammar, item, stream)) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s jsgf rule failed\n", node->value.rule.id);
-						return 0;
-					}
-				}
-				stream->write_function(stream, ";\n");
-			}
-			break;
-		case SNT_STRING: {
-			int len = strlen(node->value.string);
-			int i;
-			stream->write_function(stream, " ");
-			for (i = 0; i < len; i++) {
-				switch (node->value.string[i]) {
-					case '\\':
-					case '*':
-					case '+':
-					case '/':
-					case '(':
-					case ')':
-					case '[':
-					case ']':
-					case '{':
-					case '}':
-					case '=':
-					case '<':
-					case '>':
-					case ';':
-					case '|':
-						stream->write_function(stream, "\\");
-						break;
-					default:
-						break;
-				}
-				stream->write_function(stream, "%c", node->value.string[i]);
-			}
-			if (node->child) {
-				if (!create_jsgf(grammar, node->child, stream)) {
-					return 0;
-				}
-			}
-			break;
-		}
-		case SNT_ITEM:
-			if (node->child) {
-				struct srgs_node *item;
-				if (node->value.item.repeat_min == 0 && node->value.item.repeat_max == 1) {
-					/* optional item */
-					stream->write_function(stream, " [");
-					for(item = node->child; item; item = item->next) {
-						if (!create_jsgf(grammar, item, stream)) {
-							return 0;
-						}
-					}
-					stream->write_function(stream, " ]");
-				} else {
-					/* minimum repeats */
-					int i;
-					for (i = 0; i < node->value.item.repeat_min; i++) {
-						if (node->value.item.repeat_min != 1 && node->value.item.repeat_max != 1) {
-							stream->write_function(stream, " (");
-						}
-						for(item = node->child; item; item = item->next) {
-							if (!create_jsgf(grammar, item, stream)) {
-								return 0;
-							}
-						}
-						if (node->value.item.repeat_min != 1 && node->value.item.repeat_max != 1) {
-							stream->write_function(stream, " )");
-						}
-					}
-					if (node->value.item.repeat_max == INT_MAX) {
-						stream->write_function(stream, "*");
-					} else {
-						for (;i < node->value.item.repeat_max; i++) {
-							stream->write_function(stream, " [");
-							for(item = node->child; item; item = item->next) {
-								if (!create_jsgf(grammar, item, stream)) {
-									return 0;
-								}
-							}
-							stream->write_function(stream, " ]");
-						}
-					}
-				}
-			}
-			break;
-		case SNT_ONE_OF:
-			if (node->child) {
-				struct srgs_node *item = node->child;
-				if (node->num_children > 1) {
-					stream->write_function(stream, " (");
-				}
-				for (; item; item = item->next) {
-					if (item != node->child) {
-						stream->write_function(stream, " |");
-					}
-					stream->write_function(stream, " (");
-					if (!create_jsgf(grammar, item, stream)) {
-						return 0;
-					}
-					stream->write_function(stream, " )");
-				}
-				if (node->num_children > 1) {
-					stream->write_function(stream, " )");
-				}
-			}
-			break;
-		case SNT_REF: {
-			struct srgs_node *rule = node->value.ref.node;
-			stream->write_function(stream, " <%s>", rule->value.rule.id);
-			break;
-		}
-		case SNT_ANY:
-		default:
-			/* ignore */
-			return 1;
-	}
-	sn_log_node_close(node);
-	return 1;
-}
-
-/**
- * Generate JSGF from SRGS document.  Call this after parsing SRGS document.
- * @param grammar the grammar
- * @return the JSGF document or NULL
- */
-const char *srgs_grammar_to_jsgf(struct srgs_grammar *grammar)
-{
-	if (!grammar) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "grammar is NULL!\n");
-		return NULL;
-	}
-	switch_mutex_lock(grammar->mutex);
-	if (!grammar->jsgf && !create_jsgf(grammar, grammar->root, NULL)) {
-		switch_mutex_unlock(grammar->mutex);
-		return NULL;
-	}
-	switch_mutex_unlock(grammar->mutex);
-	return grammar->jsgf;
-}
-
-/**
- * Generate JSGF file from SRGS document.  Call this after parsing SRGS document.
- * @param grammar the grammar
- * @param basedir the base path to use if file does not already exist
- * @param ext the extension to use
- * @return the path or NULL
- */
-const char *srgs_grammar_to_jsgf_file(struct srgs_grammar *grammar, const char *basedir, const char *ext)
-{
-	if (!grammar) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "grammar is NULL!\n");
-		return NULL;
-	}
-	switch_mutex_lock(grammar->mutex);
-	if (!grammar->jsgf_file_name) {
-		char file_name_buf[SWITCH_UUID_FORMATTED_LENGTH + 1];
-		switch_file_t *file;
-		switch_size_t len;
-		const char *jsgf = srgs_grammar_to_jsgf(grammar);
-                switch_uuid_str(file_name_buf, sizeof(file_name_buf));
-		grammar->jsgf_file_name = switch_core_sprintf(grammar->pool, "%s%s%s.%s", basedir, SWITCH_PATH_SEPARATOR, file_name_buf, ext);
-		if (!jsgf) {
-			switch_mutex_unlock(grammar->mutex);
-			return NULL;
-		}
-
-		/* write grammar to file */
-		if (switch_file_open(&file, grammar->jsgf_file_name, SWITCH_FOPEN_WRITE | SWITCH_FOPEN_TRUNCATE | SWITCH_FOPEN_CREATE, SWITCH_FPROT_OS_DEFAULT, grammar->pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to create jsgf file: %s!\n", grammar->jsgf_file_name);
-			grammar->jsgf_file_name = NULL;
-			switch_mutex_unlock(grammar->mutex);
-			return NULL;
-		}
-		len = strlen(jsgf);
-		switch_file_write(file, jsgf, &len);
-		switch_file_close(file);
-	}
-	switch_mutex_unlock(grammar->mutex);
-	return grammar->jsgf_file_name;
-}
-
-/**
- * Initialize SRGS parser.  This function is not thread safe.
- */
-int srgs_init(void)
-{
-	if (globals.init) {
-		return 1;
-	}
-
-	globals.init = SWITCH_TRUE;
-	switch_core_new_memory_pool(&globals.pool);
-	switch_core_hash_init(&globals.tag_defs);
-
-	add_root_tag_def("grammar", process_grammar, process_cdata_bad, "meta,metadata,lexicon,tag,rule");
-	add_tag_def("ruleref", process_ruleref, process_cdata_bad, "");
-	add_tag_def("token", process_attribs_ignore, process_cdata_ignore, "");
-	add_tag_def("tag", process_attribs_ignore, process_cdata_tag, "");
-	add_tag_def("one-of", process_attribs_ignore, process_cdata_tokens, "item");
-	add_tag_def("item", process_item, process_cdata_tokens, "token,ruleref,item,one-of,tag");
-	add_tag_def("rule", process_rule, process_cdata_tokens, "token,ruleref,item,one-of,tag,example");
-	add_tag_def("example", process_attribs_ignore, process_cdata_ignore, "");
-	add_tag_def("lexicon", process_attribs_ignore, process_cdata_bad, "");
-	add_tag_def("meta", process_attribs_ignore, process_cdata_bad, "");
-	add_tag_def("metadata", process_attribs_ignore, process_cdata_ignore, "ANY");
-	add_tag_def("ANY", process_attribs_ignore, process_cdata_ignore, "ANY");
-
-	return 1;
-}
-
-/**
- * Destruction of SRGS parser environment
- */
-void srgs_destroy(void)
-{
-	if (globals.init) {
-		if (globals.tag_defs) {
-			switch_core_hash_destroy(&globals.tag_defs);
-			globals.tag_defs = NULL;
-		}
-		if (globals.pool) {
-			switch_core_destroy_memory_pool(&globals.pool);
-			globals.pool = NULL;
-		}
-		globals.init = SWITCH_FALSE;
-	}
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/srgs.h b/src/mod/event_handlers/mod_rayo/srgs.h
deleted file mode 100644
index e32b522d33..0000000000
--- a/src/mod/event_handlers/mod_rayo/srgs.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * srgs.h -- Transforms SRGS into regex rules
- *
- */
-#ifndef SRGS_H
-#define SRGS_H
-
-#include <switch.h>
-
-struct srgs_parser;
-struct srgs_grammar;
-
-enum srgs_match_type {
-	/** invalid input */
-	SMT_NO_MATCH,
-	/** matches, can accept more input */
-	SMT_MATCH,
-	/** not yet a match, but valid input so far */
-	SMT_MATCH_PARTIAL,
-	/** matches, cannot accept more input */
-	SMT_MATCH_END
-};
-
-SWITCH_DECLARE(int) srgs_init(void);
-SWITCH_DECLARE(void) srgs_destroy(void);
-SWITCH_DECLARE(struct srgs_parser *) srgs_parser_new(const char *uuid);
-SWITCH_DECLARE(struct srgs_grammar *) srgs_parse(struct srgs_parser *parser, const char *document);
-SWITCH_DECLARE(const char *) srgs_grammar_to_regex(struct srgs_grammar *grammar);
-SWITCH_DECLARE(const char *) srgs_grammar_to_jsgf(struct srgs_grammar *grammar);
-SWITCH_DECLARE(const char *) srgs_grammar_to_jsgf_file(struct srgs_grammar *grammar, const char *basedir, const char *ext);
-SWITCH_DECLARE(enum srgs_match_type) srgs_grammar_match(struct srgs_grammar *grammar, const char *input, const char **interpretation);
-SWITCH_DECLARE(void) srgs_parser_destroy(struct srgs_parser *parser);
-
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/test/test_iks.c b/src/mod/event_handlers/mod_rayo/test/test_iks.c
deleted file mode 100644
index 29b424afc0..0000000000
--- a/src/mod/event_handlers/mod_rayo/test/test_iks.c
+++ /dev/null
@@ -1,216 +0,0 @@
-
-
-#include <switch.h>
-#include <iksemel.h>
-#include <test/switch_test.h>
-#include <iks_helpers.h>
-
-static const char *voxeo_grammar =
-	"<iq id='8847' type='set' from='usera@192.168.1.10/voxeo3' to='e7632f74-8c55-11e2-84b0-e538fa88a1ef@192.168.1.10'><input xmlns='urn:xmpp:rayo:input:1' min-confidence='0.3' mode='DTMF' sensitivity='0.5'><grammar content-type='application/grammar+voxeo'><![CDATA[[1 DIGITS]]]></grammar></input></iq>";
-
-
-static const char *repeating_bracket =
-	"<iq id='8847' type='set' from='usera@192.168.1.10/voxeo3' to='e7632f74-8c55-11e2-84b0-e538fa88a1ef@192.168.1.10'><input xmlns='urn:xmpp:rayo:input:1' min-confidence='0.3' mode='DTMF' sensitivity='0.5'><grammar content-type='application/grammar+voxeo'><![CDATA[[1 DIGITS]>]]]]]]]]] ]] ]]></grammar></input></iq>";
-
-
-static const char *normal_cdata =
-	"<iq id='8847' type='set' from='usera@192.168.1.10/voxeo3' to='e7632f74-8c55-11e2-84b0-e538fa88a1ef@192.168.1.10'><input xmlns='urn:xmpp:rayo:input:1' min-confidence='0.3' mode='DTMF' sensitivity='0.5'><grammar content-type='application/grammar+voxeo'><![CDATA[1 DIGITS]]></grammar></input></iq>";
-
-
-static const char *empty_cdata =
-	"<iq id='8847' type='set' from='usera@192.168.1.10/voxeo3' to='e7632f74-8c55-11e2-84b0-e538fa88a1ef@192.168.1.10'><input xmlns='urn:xmpp:rayo:input:1' min-confidence='0.3' mode='DTMF' sensitivity='0.5'><grammar content-type='application/grammar+voxeo'><![CDATA[]]></grammar></input></iq>";
-
-static const char *rayo_test_srgs =
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" root=\"MAINRULE\">\n"
-	"  <rule id=\"MAINRULE\">\n"
-	"    <one-of>\n"
-	"      <item>\n"
-	"        <item repeat=\"0-1\"> need a</item>\n"
-	"        <item repeat=\"0-1\"> i need a</item>\n"
-	"        <one-of>\n"
-	"          <item> clue </item>\n"
-	"        </one-of>\n"
-	"        <tag> out.concept = \"clue\";</tag>\n"
-	"      </item>\n"
-	"      <item>\n"
-	"        <item repeat=\"0-1\"> have an</item>\n"
-	"        <item repeat=\"0-1\"> i have an</item>\n"
-	"        <one-of>\n"
-	"          <item> answer </item>\n"
-	"        </one-of>\n"
-	"        <tag> out.concept = \"answer\";</tag>\n"
-	"      </item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"</grammar>";
-
-
-#define MATCH 1
-#define NO_MATCH 0
-
-
-/**
- * main program
- */
-FST_BEGIN()
-
-FST_SUITE_BEGIN(iks)
-
-FST_SETUP_BEGIN()
-{
-}
-FST_SETUP_END()
-
-FST_TEARDOWN_BEGIN()
-{
-}
-FST_TEARDOWN_END()
-
-
-FST_TEST_BEGIN(iks_cdata_bug)
-{
-	iks *iq = NULL;
-	iks *input = NULL;
-	iksparser *p = iks_dom_new(&iq);
-	const char *cdata;
-	fst_check(IKS_OK == iks_parse(p, voxeo_grammar, 0, 1));
-	iks_parser_delete(p);
-	fst_check((input = iks_find(iq, "input")));
-	fst_check((cdata = iks_find_cdata(input, "grammar")));
-	fst_check_string_equals("[1 DIGITS]", cdata);
-	iks_delete(iq);
-}
-FST_TEST_END()
-
-FST_TEST_BEGIN(repeating_bracket)
-{
-	iks *iq = NULL;
-	iks *input = NULL;
-	iksparser *p = iks_dom_new(&iq);
-	const char *cdata;
-	fst_check(IKS_OK == iks_parse(p, repeating_bracket, 0, 1));
-	iks_parser_delete(p);
-	fst_check((input = iks_find(iq, "input")));
-	fst_check((cdata = iks_find_cdata(input, "grammar")));
-	fst_check_string_equals("[1 DIGITS]>]]]]]]]]] ]] ", cdata);
-	iks_delete(iq);
-}
-FST_TEST_END()
-
-FST_TEST_BEGIN(normal_cdata)
-{
-	iks *iq = NULL;
-	iks *input = NULL;
-	iksparser *p = iks_dom_new(&iq);
-	const char *cdata;
-	fst_check(IKS_OK == iks_parse(p, normal_cdata, 0, 1));
-	iks_parser_delete(p);
-	fst_check((input = iks_find(iq, "input")));
-	fst_check((cdata = iks_find_cdata(input, "grammar")));
-	fst_check_string_equals("1 DIGITS", cdata);
-	iks_delete(iq);
-}
-FST_TEST_END()
-
-FST_TEST_BEGIN(empty_cdata)
-{
-	iks *iq = NULL;
-	iks *input = NULL;
-	iksparser *p = iks_dom_new(&iq);
-	const char *cdata;
-	fst_check(IKS_OK == iks_parse(p, empty_cdata, 0, 1));
-	iks_parser_delete(p);
-	fst_check((input = iks_find(iq, "input")));
-	fst_check(NULL == (cdata = iks_find_cdata(input, "grammar")));
-	iks_delete(iq);
-}
-FST_TEST_END()
-
-
-FST_TEST_BEGIN(rayo_test_srgs)
-{
-	iks *grammar = NULL;
-	iksparser *p = iks_dom_new(&grammar);
-	fst_check(IKS_OK == iks_parse(p, rayo_test_srgs, 0, 1));
-	iks_parser_delete(p);
-	iks_delete(grammar);
-}
-FST_TEST_END()
-
-FST_TEST_BEGIN(iks_helper_value_matches)
-{
-	fst_check(MATCH == value_matches("1", "1,2,3"));
-	fst_check(MATCH == value_matches("2", "1,2,3"));
-	fst_check(MATCH == value_matches("3", "1,2,3"));
-	fst_check(NO_MATCH == value_matches("4", "1,2,3"));
-	fst_check(NO_MATCH == value_matches("1,2", "1,2,3"));
-	fst_check(NO_MATCH == value_matches(NULL, "1,2,3"));
-	fst_check(NO_MATCH == value_matches(NULL, NULL));
-	fst_check(NO_MATCH == value_matches("1", NULL));
-	fst_check(NO_MATCH == value_matches("", "1,2,3"));
-	fst_check(NO_MATCH == value_matches("", ""));
-	fst_check(NO_MATCH == value_matches("1", ""));
-	fst_check(MATCH == value_matches("duplex", "duplex,send,recv"));
-	fst_check(MATCH == value_matches("send", "duplex,send,recv"));
-	fst_check(MATCH == value_matches("recv", "duplex,send,recv"));
-	fst_check(NO_MATCH == value_matches("sendrecv", "duplex,send,recv"));
-	fst_check(MATCH == value_matches("duplex1", "duplex1,duplex2,duplex3"));
-	fst_check(MATCH == value_matches("duplex2", "duplex1,duplex2,duplex3"));
-	fst_check(MATCH == value_matches("duplex3", "duplex1,duplex2,duplex3"));
-	fst_check(NO_MATCH == value_matches("duplex4", "duplex1,duplex2,duplex3"));
-	fst_check(NO_MATCH == value_matches("duplex", "duplex1,duplex2,duplex3"));
-}
-FST_TEST_END()
-
-FST_TEST_BEGIN(dialback_key)
-{
-	char *dialback_key;
-
-	dialback_key = iks_server_dialback_key("s3cr3tf0rd14lb4ck", "xmpp.example.com", "example.org", "D60000229F");
-	fst_check_string_equals("37c69b1cf07a3f67c04a5ef5902fa5114f2c76fe4a2686482ba5b89323075643", dialback_key);
-	switch_safe_free(dialback_key);
-	fst_check(NULL == (dialback_key = iks_server_dialback_key("", "xmpp.example.com", "example.org", "D60000229F")));
-	switch_safe_free(dialback_key);
-	fst_check(NULL == (dialback_key = iks_server_dialback_key("s3cr3tf0rd14lb4ck", "", "example.org", "D60000229F")));
-	switch_safe_free(dialback_key);
-	fst_check(NULL == (dialback_key = iks_server_dialback_key("s3cr3tf0rd14lb4ck", "xmpp.example.com", "", "D60000229F")));
-	switch_safe_free(dialback_key);
-	fst_check(NULL == (dialback_key = iks_server_dialback_key("s3cr3tf0rd14lb4ck", "xmpp.example.com", "example.org", "")));
-	switch_safe_free(dialback_key);
-	fst_check(NULL == (dialback_key = iks_server_dialback_key(NULL, "xmpp.example.com", "example.org", "D60000229F")));
-	switch_safe_free(dialback_key);
-	fst_check(NULL == (dialback_key = iks_server_dialback_key("s3cr3tf0rd14lb4ck", NULL, "example.org", "D60000229F")));
-	switch_safe_free(dialback_key);
-	fst_check(NULL == (dialback_key = iks_server_dialback_key("s3cr3tf0rd14lb4ck", "xmpp.example.com", NULL, "D60000229F")));
-	switch_safe_free(dialback_key);
-	fst_check(NULL == (dialback_key = iks_server_dialback_key("s3cr3tf0rd14lb4ck", "xmpp.example.com", "example.org", NULL)));
-	switch_safe_free(dialback_key);
-}
-FST_TEST_END()
-
-FST_TEST_BEGIN(validate_dtmf)
-{
-	fst_check(SWITCH_TRUE == iks_attrib_is_dtmf_digit("1"));
-	fst_check(SWITCH_TRUE == iks_attrib_is_dtmf_digit("A"));
-	fst_check(SWITCH_TRUE == iks_attrib_is_dtmf_digit("a"));
-	fst_check(SWITCH_TRUE == iks_attrib_is_dtmf_digit("D"));
-	fst_check(SWITCH_TRUE == iks_attrib_is_dtmf_digit("d"));
-	fst_check(SWITCH_TRUE == iks_attrib_is_dtmf_digit("*"));
-	fst_check(SWITCH_TRUE == iks_attrib_is_dtmf_digit("#"));
-	fst_check(SWITCH_FALSE == iks_attrib_is_dtmf_digit("E"));
-	fst_check(SWITCH_FALSE == iks_attrib_is_dtmf_digit(NULL));
-	fst_check(SWITCH_FALSE == iks_attrib_is_dtmf_digit(""));
-	fst_check(SWITCH_FALSE == iks_attrib_is_dtmf_digit("11"));
-	fst_check(SWITCH_TRUE == validate_optional_attrib(iks_attrib_is_dtmf_digit, "A"));
-	fst_check(SWITCH_TRUE == validate_optional_attrib(iks_attrib_is_dtmf_digit, "1"));
-	fst_check(SWITCH_FALSE == validate_optional_attrib(iks_attrib_is_dtmf_digit, "Z"));
-	fst_check(SWITCH_FALSE == validate_optional_attrib(iks_attrib_is_dtmf_digit, "11"));
-	fst_check(SWITCH_TRUE == validate_optional_attrib(iks_attrib_is_dtmf_digit, NULL));
-	fst_check(SWITCH_TRUE == validate_optional_attrib(iks_attrib_is_dtmf_digit, ""));
-}
-FST_TEST_END()
-
-
-FST_SUITE_END()
-
-FST_END()
diff --git a/src/mod/event_handlers/mod_rayo/test/test_nlsml.c b/src/mod/event_handlers/mod_rayo/test/test_nlsml.c
deleted file mode 100644
index 7319a04f4c..0000000000
--- a/src/mod/event_handlers/mod_rayo/test/test_nlsml.c
+++ /dev/null
@@ -1,343 +0,0 @@
-
-
-#include <switch.h>
-#include <test/switch_test.h>
-#include <nlsml.h>
-
-static const char *nlsml_good =
-	"<result x-model=\"http://theYesNoModel\""
-	" xmlns:xf=\"http://www.w3.org/2000/xforms\""
-	" grammar=\"http://theYesNoGrammar\">"
-	"<interpretation>"
-	"<xf:instance>"
-	"<myApp:yes_no>"
-	"<response>yes</response>"
-	"</myApp:yes_no>"
-	"</xf:instance>"
-	"<input>ok</input>"
-	"</interpretation>"
-	"</result>";
-
-static const char *nlsml_bad =
-	"<result grammar=\"http://grammar\" x-model=\"http://dataModel\"\n"
-	"xmlns:xf=\"http://www.w3.org/2000/xforms\"\n"
-	"  <interpretation/>\n"
-	"</result>\n";
-
-static const char *nlsml_match_with_model_instance =
-	"<result grammar=\"http://grammar\" x-model=\"http://dataModel\"\n"
-	" xmlns:xf=\"http://www.w3.org/2000/xforms\">\"\n"
-	"  <interpretation confidence=\"75\" grammar=\"http://grammar\"\n"
-	"    x-model=\"http://dataModel\"\n"
-	"    xmlns:xf=\"http://www.w3.org/2000/xforms\">\n"
-	"\n"
-	"    <model>\n"
-	"      <xf:group name=\"nameAddress\">\n"
-	"          <string name=\"name\"/>\n"
-	"          <string name=\"street\"/>\n"
-	"          <string name=\"city\"/>\n"
-	"          <string name=\"state\"/>\n"
-	"          <string name=\"zip\">\n"
-	"            <mask>ddddd</mask>\n"
-	"          </string>\n"
-	"      </xf:group>\n"
-	"    </model>\n"
-	"\n"
-	"    <xf:instance name=\"nameAddress\">\n"
-	"      <nameAddress>\n"
-	"          <street confidence=\"75\">123 Maple Street</street>\n"
-	"          <city>Mill Valley</city>\n"
-	"          <state>CA</state>\n"
-	"          <zip>90952</zip>\n"
-	"      </nameAddress>\n"
-	"    </xf:instance>\n"
-	"    <input>\n"
-	"      My address is 123 Maple Street,\n"
-	"      Mill Valley, California, 90952\n"
-	"    </input>n"
-	"  </interpretation>\n"
-	"</result>\n";
-
-static const char *nlsml_multi_input =
-	"<result grammar=\"http://grammar\" x-model=\"http://dataModel\"\n"
-	" xmlns:xf=\"http://www.w3.org/2000/xforms\">\"\n"
-	"  <interpretation confidence=\"75\" grammar=\"http://grammar\"\n"
-	"    x-model=\"http://dataModel\"\n"
-	"    xmlns:xf=\"http://www.w3.org/2000/xforms\">\n"
-	"\n"
-	"    <input>\n"
-	"       <input mode=\"speech\" confidence=\"50\"\n"
-	"         timestamp-start=\"2000-04-03T0:00:00\"\n"
-	"         timestamp-end=\"2000-04-03T0:00:00.2\">fried</input>\n"
-	"       <input mode=\"speech\" confidence=\"100\"\n"
-	"         timestamp-start=\"2000-04-03T0:00:00.25\"\n"
-	"         timestamp-end=\"2000-04-03T0:00:00.6\">onions</input>\n"
-	"    </input>\n"
-	"  </interpretation>\n"
-	"</result>\n";
-
-static const char *nlsml_no_input =
-	"<result grammar=\"http://grammar\" x-model=\"http://dataModel\"\n"
-	" xmlns:xf=\"http://www.w3.org/2000/xforms\">\"\n"
-	"  <interpretation confidence=\"100\" grammar=\"http://grammar\"\n"
-	"    x-model=\"http://dataModel\"\n"
-	"    xmlns:xf=\"http://www.w3.org/2000/xforms\">\n"
-	"\n"
-	"    <input>\n"
-	"       <noinput/>\n"
-	"    </input>\n"
-	"  </interpretation>\n"
-	"</result>\n";
-
-static const char *nlsml_multi_input_dtmf =
-	"<result grammar=\"http://grammar\" x-model=\"http://dataModel\"\n"
-	" xmlns:xf=\"http://www.w3.org/2000/xforms\">\"\n"
-	"  <interpretation confidence=\"100\" grammar=\"http://grammar\"\n"
-	"    x-model=\"http://dataModel\"\n"
-	"    xmlns:xf=\"http://www.w3.org/2000/xforms\">\n"
-	"\n"
-	"    <input>\n"
-	"     <input mode=\"speech\"><nomatch/></input>\n"
-	"     <input mode=\"dtmf\">1 2 3 4</input>\n"
-	"    </input>\n"
-	"  </interpretation>\n"
-	"</result>\n";
-
-static const char *nlsml_meta =
-	"<result grammar=\"http://grammar\" x-model=\"http://dataModel\"\n"
-	" xmlns:xf=\"http://www.w3.org/2000/xforms\">\n"
-	"<interpretation grammar=\"http://toppings\"\n"
-	" xmlns:xf=\"http://www.w3.org/2000/xforms\">\n"
-	"  <input mode=\"speech\">\n"
-	"    what toppings do you have?\n"
-	"  </input>\n"
-	"  <xf:model>\n"
-	"    <xf:group xf:name=\"question\">\n"
-	"      <xf:string xf:name=\"questioned_item\"/>\n"
-	"      <xf:string xf:name=\"questioned_property\"/>\n"
-	"    </xf:group>\n"
-	"  </xf:model>\n"
-	"  <xf:instance>\n"
-	"    <xf:question>\n"
-	"      <xf:questioned_item>toppings</xf:questioned_item>\n"
-	"      <xf:questioned_property>\n"
-	"    availability\n"
-	"      </xf:questioned_property>\n"
-	"    </xf:question>\n"
-	"  </xf:instance>\n"
-	"</interpretation>\n"
-	"</result>\n";
-
-static const char *nlsml_simple_ambiguity =
-	"<result xmlns:xf=\"http://www.w3.org/2000/xforms\"\n"
-	"   grammar=\"http://flight\">\n"
-	"  <interpretation confidence=\"60\">\n"
-	"    <input mode=\"speech\">\n"
-	"      I want to go to Pittsburgh\n"
-	"    </input>\n"
-	"    <xf:model>\n"
-	"      <group name=\"airline\">\n"
-	"        <string name=\"to_city\"/>\n"
-	"      </group>\n"
-	"    </xf:model>\n"
-	"    <xf:instance>\n"
-	"      <myApp:airline>\n"
-	"        <to_city>Pittsburgh</to_city>\n"
-	"      </myApp:airline>\n"
-	"    </xf:instance>\n"
-	"  </interpretation>\n"
-	"  <interpretation confidence=\"40\">\n"
-	"      <input>I want to go to Stockholm</input>\n"
-	"    <xf:model>\n"
-	"      <group name=\"airline\">\n"
-	"        <string name=\"to_city\"/>\n"
-	"      </group>\n"
-	"    </xf:model>\n"
-	"    <xf:instance>\n"
-	"      <myApp:airline>\n"
-	"        <to_city>Stockholm</to_city>\n"
-	"      </myApp:airline>\n"
-	"    </xf:instance>\n"
-	"  </interpretation>\n"
-	"</result>\n";
-
-const char *nlsml_mixed_initiative =
-	"<result xmlns:xf=\"http://www.w3.org/2000/xforms\"\n"
-	"   grammar=\"http://foodorder\">\n"
-	"  <interpretation confidence=\"100\" >\n"
-	"    <xf:model>\n"
-	"      <group name=\"order\">\n"
-	"        <group name=\"food_item\" maxOccurs=\"*\">\n"
-	"          <group name=\"pizza\" >\n"
-	"            <string name=\"ingredients\" maxOccurs=\"*\"/>\n"
-	"          </group>\n"
-	"          <group name=\"burger\">\n"
-	"            <string name=\"ingredients\" maxOccurs=\"*/\">\n"
-	"          </group>\n"
-	"        </group>\n"
-	"        <group name=\"drink_item\" maxOccurs=\"*\">\n"
-	"          <string name=\"size\">\n"
-	"          <string name=\"type\">\n"
-	"        </group>\n"
-	"        <string name=\"delivery_method\"/>\n"
-	"      </group>\n"
-	"    </xf:model>\n"
-	"    <xf:instance>\n"
-	"      <myApp:order>\n"
-	"        <food_item confidence=\"100\">\n"
-	"          <pizza>\n"
-	"            <xf:ingredients confidence=\"100\">\n"
-	"              pepperoni\n"
-	"            </xf:ingredients>\n"
-	"            <xf:ingredients confidence=\"100\">\n"
-	"              cheese\n"
-	"            </xf:ingredients>\n"
-	"          </pizza>\n"
-	"          <pizza>\n"
-	"            <ingredients>sausage</ingredients>\n"
-	"          </pizza>\n"
-	"        </food_item>\n"
-	"        <drink_item confidence=\"100\">\n"
-	"          <size>2-liter</size>\n"
-	"        </drink_item>\n"
-	"        <delivery_method>to go</delivery_method>\n"
-	"      </myApp:order>\n"
-	"    </xf:instance>\n"
-	"      <input mode=\"speech\">I would like 2 pizzas,\n"
-	"         one with pepperoni and cheese, one with sausage\n"
-	"         and a bottle of coke, to go.\n"
-	"      </input>\n"
-	"  </interpretation>\n"
-	"</result>\n";
-
-static const char *nlsml_no_match =
-	"<result grammar=\"http://grammar\" x-model=\"http://dataModel\"\n"
-	" xmlns:xf=\"http://www.w3.org/2000/xforms\">\"\n"
-	"  <interpretation confidence=\"100\" grammar=\"http://grammar\"\n"
-	"    x-model=\"http://dataModel\"\n"
-	"    xmlns:xf=\"http://www.w3.org/2000/xforms\">\n"
-	"\n"
-	"    <input>\n"
-	"     <input mode=\"speech\"><nomatch/></input>\n"
-	"     <input mode=\"dtmf\"><nomatch/></input>\n"
-	"    </input>\n"
-	"  </interpretation>\n"
-	"</result>\n";
-
-
-static const char *nlsml_dtmf_result =
-	"<result xmlns='http://www.ietf.org/xml/ns/mrcpv2' "
-	"xmlns:xf='http://www.w3.org/2000/xforms'><interpretation>"
-	"<input mode='dtmf' confidence='100'>1 2 3 4</input>"
-	"<instance>1 2 3 4</instance>"
-	"</interpretation></result>";
-
-
-static const char *nlsml_good_normalized =
-	"<result x-model='http://theYesNoModel'"
-	" xmlns:xf='http://www.w3.org/2000/xforms'"
-	" grammar='http://theYesNoGrammar'"
-	" xmlns='http://www.ietf.org/xml/ns/mrcpv2'>"
-	"<interpretation>"
-	"<xf:instance>"
-	"<myApp:yes_no>"
-	"<response>yes</response>"
-	"</myApp:yes_no>"
-	"</xf:instance>"
-	"<input>ok</input>"
-	"</interpretation>"
-	"</result>";
-
-
-static const char *nlsml_dtmf_instance_result =
-	"<result xmlns='http://www.ietf.org/xml/ns/mrcpv2' "
-	"xmlns:xf='http://www.w3.org/2000/xforms'><interpretation>"
-	"<input mode='dtmf' confidence='100'>1</input>"
-	"<instance>foo</instance>"
-	"</interpretation></result>";
-
-
-FST_BEGIN()
-
-FST_SUITE_BEGIN(nlsml)
-
-FST_SETUP_BEGIN()
-{
-	fst_requires(nlsml_init());
-}
-FST_SETUP_END()
-
-FST_TEARDOWN_BEGIN()
-{
-}
-FST_TEARDOWN_END()
-
-/**
- * Test parsing NLSML example results
- */
-FST_TEST_BEGIN(parse_nlsml_examples)
-{
-	fst_check(NMT_MATCH == nlsml_parse(nlsml_good, "1234"));
-	fst_check(NMT_BAD_XML == nlsml_parse(nlsml_bad, "1234"));
-	fst_check(NMT_MATCH == nlsml_parse(nlsml_match_with_model_instance, "1234"));
-	fst_check(NMT_MATCH == nlsml_parse(nlsml_multi_input, "1234"));
-	fst_check(NMT_NOINPUT == nlsml_parse(nlsml_no_input, "1234"));
-	fst_check(NMT_MATCH == nlsml_parse(nlsml_multi_input_dtmf, "1234"));
-	fst_check(NMT_MATCH == nlsml_parse(nlsml_meta, "1234"));
-	fst_check(NMT_MATCH == nlsml_parse(nlsml_simple_ambiguity, "1234"));
-	fst_check(NMT_MATCH == nlsml_parse(nlsml_mixed_initiative, "1234"));
-	fst_check(NMT_NOMATCH == nlsml_parse(nlsml_no_match, "1234"));
-}
-FST_TEST_END()
-
-/**
- * Test creating DTMF match result
- */
-FST_TEST_BEGIN(create_dtmf_match)
-{
-	iks *result = nlsml_create_dtmf_match("1234", NULL);
-	char *result_str;
-	fst_requires(result);
-	result_str = iks_string(NULL, result);
-	fst_check_string_equals(nlsml_dtmf_result, result_str);
-	iks_free(result_str);
-	iks_delete(result);
-}
-FST_TEST_END()
-
-
-/**
- * Test creating DTMF match result with instance interpretation
- */
-FST_TEST_BEGIN(create_dtmf_instance)
-{
-	iks *result = nlsml_create_dtmf_match("1", "foo");
-	char *result_str;
-	fst_requires(result);
-	result_str = iks_string(NULL, result);
-	fst_check_string_equals(nlsml_dtmf_instance_result, result_str);
-	iks_free(result_str);
-	iks_delete(result);
-}
-FST_TEST_END()
-
-/**
- * Test NLSML normalization
- */
-FST_TEST_BEGIN(normalize)
-{
-	iks *result = nlsml_normalize(nlsml_good);
-	char *result_str;
-
-	fst_requires(result);
-	result_str = iks_string(NULL, result);
-	fst_check_string_equals(nlsml_good_normalized, result_str);
-	iks_free(result_str);
-	iks_delete(result);
-}
-FST_TEST_END()
-
-
-FST_SUITE_END()
-
-FST_END()
diff --git a/src/mod/event_handlers/mod_rayo/test/test_srgs.c b/src/mod/event_handlers/mod_rayo/test/test_srgs.c
deleted file mode 100644
index 9bd6fc1eb5..0000000000
--- a/src/mod/event_handlers/mod_rayo/test/test_srgs.c
+++ /dev/null
@@ -1,1279 +0,0 @@
-
-
-#include <switch.h>
-#include <test/switch_test.h>
-#include <srgs.h>
-
-
-static const char *adhearsion_menu_grammar =
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" version=\"1.0\" xml:lang=\"en-US\" mode=\"dtmf\" root=\"options\" tag-format=\"semantics/1.0-literals\">"
-	"  <rule id=\"options\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"      <item><tag>0</tag>1</item>\n"
-	"      <item><tag>1</tag>5</item>\n"
-	"      <item><tag>7</tag>7</item>\n"
-	"      <item><tag>3</tag>9</item>\n"
-	"      <item><tag>4</tag>715</item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"</grammar>\n";
-
-static const char *adhearsion_large_menu_grammar =
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" version=\"1.0\" xml:lang=\"en-US\" mode=\"dtmf\" root=\"options\" tag-format=\"semantics/1.0-literals\">"
-	"  <rule id=\"options\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"      <item><tag>0</tag>1</item>\n"
-	"      <item><tag>1</tag>5</item>\n"
-	"      <item><tag>2</tag>7</item>\n"
-	"      <item><tag>3</tag>9</item>\n"
-	"      <item><tag>4</tag>715</item>\n"
-	"      <item><tag>5</tag>716</item>\n"
-	"      <item><tag>6</tag>717</item>\n"
-	"      <item><tag>7</tag>718</item>\n"
-	"      <item><tag>8</tag>719</item>\n"
-	"      <item><tag>9</tag>720</item>\n"
-	"      <item><tag>10</tag>721</item>\n"
-	"      <item><tag>11</tag>722</item>\n"
-	"      <item><tag>12</tag>723</item>\n"
-	"      <item><tag>13</tag>724</item>\n"
-	"      <item><tag>14</tag>725</item>\n"
-	"      <item><tag>15</tag>726</item>\n"
-	"      <item><tag>16</tag>727</item>\n"
-	"      <item><tag>17</tag>728</item>\n"
-	"      <item><tag>18</tag>729</item>\n"
-	"      <item><tag>19</tag>730</item>\n"
-	"      <item><tag>20</tag>731</item>\n"
-	"      <item><tag>21</tag>732</item>\n"
-	"      <item><tag>22</tag>733</item>\n"
-	"      <item><tag>23</tag>734</item>\n"
-	"      <item><tag>24</tag>735</item>\n"
-	"      <item><tag>25</tag>736</item>\n"
-	"      <item><tag>26</tag>737</item>\n"
-	"      <item><tag>27</tag>738</item>\n"
-	"      <item><tag>28</tag>739</item>\n"
-	"      <item><tag>29</tag>740</item>\n"
-	"      <item><tag>30</tag>741</item>\n"
-	"      <item><tag>31</tag>742</item>\n"
-	"      <item><tag>32</tag>743</item>\n"
-	"      <item><tag>33</tag>744</item>\n"
-	"      <item><tag>34</tag>745</item>\n"
-	"      <item><tag>35</tag>746</item>\n"
-	"      <item><tag>36</tag>747</item>\n"
-	"      <item><tag>37</tag>748</item>\n"
-	"      <item><tag>38</tag>749</item>\n"
-	"      <item><tag>39</tag>750</item>\n"
-	"      <item><tag>40</tag>751</item>\n"
-	"      <item><tag>41</tag>752</item>\n"
-	"      <item><tag>42</tag>753</item>\n"
-	"      <item><tag>43</tag>754</item>\n"
-	"      <item><tag>44</tag>755</item>\n"
-	"      <item><tag>45</tag>756</item>\n"
-	"      <item><tag>46</tag>757</item>\n"
-	"      <item><tag>47</tag>758</item>\n"
-	"      <item><tag>48</tag>759</item>\n"
-	"      <item><tag>49</tag>760</item>\n"
-	"      <item><tag>50</tag>761</item>\n"
-	"      <item><tag>51</tag>762</item>\n"
-	"      <item><tag>52</tag>763</item>\n"
-	"      <item><tag>53</tag>764</item>\n"
-	"      <item><tag>54</tag>765</item>\n"
-	"      <item><tag>55</tag>766</item>\n"
-	"      <item><tag>56</tag>767</item>\n"
-	"      <item><tag>57</tag>768</item>\n"
-	"      <item><tag>58</tag>769</item>\n"
-	"      <item><tag>59</tag>770</item>\n"
-	"      <item><tag>60</tag>771</item>\n"
-	"      <item><tag>61</tag>772</item>\n"
-	"      <item><tag>62</tag>773</item>\n"
-	"      <item><tag>63</tag>774</item>\n"
-	"      <item><tag>64</tag>775</item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"</grammar>\n";
-
-static const char *duplicate_tag_grammar =
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" version=\"1.0\" xml:lang=\"en-US\" mode=\"dtmf\" root=\"options\" tag-format=\"semantics/1.0-literals\">"
-	"  <rule id=\"options\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"      <item><tag>2</tag>1</item>\n"
-	"      <item><tag>2</tag>5</item>\n"
-	"      <item><tag>4</tag>7</item>\n"
-	"      <item><tag>4</tag>9</item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"</grammar>\n";
-
-
-static const char *adhearsion_ask_grammar =
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" version=\"1.0\" xml:lang=\"en-US\" mode=\"dtmf\" root=\"inputdigits\">"
-	"  <rule id=\"inputdigits\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"      <item>0</item>\n"
-	"      <item>1</item>\n"
-	"      <item>2</item>\n"
-	"      <item>3</item>\n"
-	"      <item>4</item>\n"
-	"      <item>5</item>\n"
-	"      <item>6</item>\n"
-	"      <item>7</item>\n"
-	"      <item>8</item>\n"
-	"      <item>9</item>\n"
-	"      <item>#</item>\n"
-	"      <item>*</item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"</grammar>\n";
-
-
-static const char *multi_digit_grammar =
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" version=\"1.0\" xml:lang=\"en-US\" mode=\"dtmf\" root=\"misc\">"
-	"  <rule id=\"misc\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"      <item>01</item>\n"
-	"      <item>13</item>\n"
-	"      <item> 24</item>\n"
-	"      <item>36 </item>\n"
-	"      <item>223</item>\n"
-	"      <item>5 5</item>\n"
-	"      <item>63</item>\n"
-	"      <item>76</item>\n"
-	"      <item>8 8 0</item>\n"
-	"      <item>93</item>\n"
-	"      <item> # 2 </item>\n"
-	"      <item>*3</item>\n"
-	"      <item>  27</item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"</grammar>\n";
-
-
-static const char *multi_rule_grammar =
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" version=\"1.0\" xml:lang=\"en-US\" mode=\"dtmf\">"
-	"  <rule id=\"misc\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"      <item>01</item>\n"
-	"      <item>13</item>\n"
-	"      <item> 24</item>\n"
-	"      <item>36 </item>\n"
-	"      <item>5 5</item>\n"
-	"      <item>63</item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"  <rule id=\"misc2\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"      <item>76</item>\n"
-	"      <item>8 8 0</item>\n"
-	"      <item>93</item>\n"
-	"      <item> # 2 </item>\n"
-	"      <item>*3</item>\n"
-	"      <item>  27</item>\n"
-	"      <item>223</item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"</grammar>\n";
-
-
-static const char *rayo_example_grammar =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"digit\">\n"
-	"    <one-of>\n"
-	"       <item> 0 </item>\n"
-	"       <item> 1 </item>\n"
-	"       <item> 2 </item>\n"
-	"       <item> 3 </item>\n"
-	"       <item> 4 </item>\n"
-	"       <item> 5 </item>\n"
-	"       <item> 6 </item>\n"
-	"       <item> 7 </item>\n"
-	"       <item> 8 </item>\n"
-	"       <item> 9 </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"       <item>\n"
-	"         <item repeat=\"4\"><ruleref uri=\"#digit\"/></item>\n"
-	"           #\n"
-	"         </item>"
-	"       <item>"
-	"         * 9 \n"
-	"       </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *bad_ref_grammar =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"digit\">\n"
-	"    <one-of>\n"
-	"       <item> 0 </item>\n"
-	"       <item> 1 </item>\n"
-	"       <item> 2 </item>\n"
-	"       <item> 3 </item>\n"
-	"       <item> 4 </item>\n"
-	"       <item> 5 </item>\n"
-	"       <item> 6 </item>\n"
-	"       <item> 7 </item>\n"
-	"       <item> 8 </item>\n"
-	"       <item> 9 </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"       <item>\n"
-	"         <item repeat=\"4\"><ruleref uri=\"#digi\"/></item>\n"
-	"           #\n"
-	"         </item>"
-	"       <item>"
-	"         * 9 \n"
-	"       </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *adhearsion_ask_grammar_bad =
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" version=\"1.0\" xml:lang=\"en-US\" mode=\"dtmf\" root=\"inputdigits\">"
-	"  <rule id=\"inputdigits\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"      <item>0</item>\n"
-	"      <item>1</item\n"
-	"      <item>2</item>\n"
-	"      <item>3</item>\n"
-	"      <item>4</item>\n"
-	"      <item>5</item>\n"
-	"      <item>6</item>\n"
-	"      <item>7</item>\n"
-	"      <item>8</item>\n"
-	"      <item>9</item>\n"
-	"      <item>#</item>\n"
-	"      <item>*</item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"</grammar>\n";
-
-
-static const char *repeat_item_grammar_bad =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"       <item>\n"
-	"         <item repeat=\"3-1\">4</item>\n"
-	"           #\n"
-	"       </item>"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_grammar_bad2 =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"       <item>\n"
-	"         <item repeat=\"-1\">4</item>\n"
-	"           #\n"
-	"       </item>"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_grammar_bad3 =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"       <item>\n"
-	"         <item repeat=\"1--1\">4</item>\n"
-	"           #\n"
-	"       </item>"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_grammar_bad4 =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"       <item>\n"
-	"         <item repeat=\"ABC\">4</item>\n"
-	"           #\n"
-	"       </item>"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_grammar_bad5 =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"       <item>\n"
-	"         <item repeat=\"\">4</item>\n"
-	"           #\n"
-	"       </item>"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_grammar_bad6 =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"       <item>\n"
-	"         <item repeat=\"1-Z\">4</item>\n"
-	"           #\n"
-	"       </item>"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_grammar =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"digit\">\n"
-	"    <one-of>\n"
-	"       <item> 0 </item>\n"
-	"       <item> 1 </item>\n"
-	"       <item> 2 </item>\n"
-	"       <item> 3 </item>\n"
-	"       <item> 4 </item>\n"
-	"       <item> 5 </item>\n"
-	"       <item> 6 </item>\n"
-	"       <item> 7 </item>\n"
-	"       <item> 8 </item>\n"
-	"       <item> 9 </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"       <item>\n"
-	"         <item repeat=\"4-4\"><ruleref uri=\"#digit\"/></item>\n"
-	"           #\n"
-	"         </item>"
-	"       <item>"
-	"         * 9 \n"
-	"       </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_range_grammar =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"digit\">\n"
-	"    <one-of>\n"
-	"       <item> 0 </item>\n"
-	"       <item> 1 </item>\n"
-	"       <item> 2 </item>\n"
-	"       <item> 3 </item>\n"
-	"       <item> 4 </item>\n"
-	"       <item> 5 </item>\n"
-	"       <item> 6 </item>\n"
-	"       <item> 7 </item>\n"
-	"       <item> 8 </item>\n"
-	"       <item> 9 </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"       <item>\n"
-	"         <item repeat=\"4-6\"><ruleref uri=\"#digit\"/></item>\n"
-	"           #\n"
-	"         </item>"
-	"       <item>"
-	"         * 9 \n"
-	"       </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_optional_grammar =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"digit\">\n"
-	"    <one-of>\n"
-	"       <item> 0 </item>\n"
-	"       <item> 1 </item>\n"
-	"       <item> 2 </item>\n"
-	"       <item> 3 </item>\n"
-	"       <item> 4 </item>\n"
-	"       <item> 5 </item>\n"
-	"       <item> 6 </item>\n"
-	"       <item> 7 </item>\n"
-	"       <item> 8 </item>\n"
-	"       <item> 9 </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"       <item>\n"
-	"         <item repeat=\"0-1\"><ruleref uri=\"#digit\"/></item>\n"
-	"           #\n"
-	"         </item>"
-	"       <item>"
-	"         * 9 \n"
-	"       </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_star_grammar =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"digit\">\n"
-	"    <one-of>\n"
-	"       <item> 0 </item>\n"
-	"       <item> 1 </item>\n"
-	"       <item> 2 </item>\n"
-	"       <item> 3 </item>\n"
-	"       <item> 4 </item>\n"
-	"       <item> 5 </item>\n"
-	"       <item> 6 </item>\n"
-	"       <item> 7 </item>\n"
-	"       <item> 8 </item>\n"
-	"       <item> 9 </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"       <item>\n"
-	"         <item repeat=\"0-\"><ruleref uri=\"#digit\"/></item>\n"
-	"           #\n"
-	"         </item>"
-	"       <item>"
-	"         * 9 \n"
-	"       </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *repeat_item_plus_grammar =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"digit\">\n"
-	"    <one-of>\n"
-	"       <item> 0 </item>\n"
-	"       <item> 1 </item>\n"
-	"       <item> 2 </item>\n"
-	"       <item> 3 </item>\n"
-	"       <item> 4 </item>\n"
-	"       <item> 5 </item>\n"
-	"       <item> 6 </item>\n"
-	"       <item> 7 </item>\n"
-	"       <item> 8 </item>\n"
-	"       <item> 9 </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"    <one-of>\n"
-	"       <item>\n"
-	"         <item repeat=\"1-\"><ruleref uri=\"#digit\"/></item>\n"
-	"           #\n"
-	"         </item>"
-	"       <item>"
-	"         * 9 \n"
-	"       </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-
-static const char *repeat_item_range_ambiguous_grammar =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"digit\">\n"
-	"    <one-of>\n"
-	"       <item> 0 </item>\n"
-	"       <item> 1 </item>\n"
-	"       <item> 2 </item>\n"
-	"       <item> 3 </item>\n"
-	"       <item> 4 </item>\n"
-	"       <item> 5 </item>\n"
-	"       <item> 6 </item>\n"
-	"       <item> 7 </item>\n"
-	"       <item> 8 </item>\n"
-	"       <item> 9 </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"         <item repeat=\"1-3\"><ruleref uri=\"#digit\"/></item>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-
-static const char *repeat_item_range_optional_pound_grammar =
-	"<grammar mode=\"dtmf\" version=\"1.0\""
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\""
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"digit\">\n"
-	"    <one-of>\n"
-	"       <item> 0 </item>\n"
-	"       <item> 1 </item>\n"
-	"       <item> 2 </item>\n"
-	"       <item> 3 </item>\n"
-	"       <item> 4 </item>\n"
-	"       <item> 5 </item>\n"
-	"       <item> 6 </item>\n"
-	"       <item> 7 </item>\n"
-	"       <item> 8 </item>\n"
-	"       <item> 9 </item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"pin\" scope=\"public\">\n"
-	"       <one-of>\n"
-	"         <item>\n"
-	"            <item repeat=\"1-2\"><ruleref uri=\"#digit\"/></item>\n"
-	"            <item repeat=\"0-1\">#</item>\n"
-	"         </item>\n"
-	"         <item repeat=\"3\"><ruleref uri=\"#digit\"/></item>\n"
-	"       </one-of>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-
-/*
-<polite> = please | kindly | oh mighty computer;
-public <command> = [ <polite> ] don't crash;
-*/
-static const char *voice_srgs1 =
-	"<grammar mode=\"voice\" version=\"1.0\"\n"
-	"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-	"    xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                        http://www.w3.org/TR/speech-grammar/grammar.xsd\"\n"
-	"    language\"en-US\"\n"
-	"    xmlns=\"http://www.w3.org/2001/06/grammar\">\n"
-	"\n"
-	"    <rule id=\"polite\">\n"
-	"    <one-of>\n"
-	"      <item>please</item>\n"
-	"      <item>kindly</item>\n"
-	"      <item> oh mighty computer</item>\n"
-	"    </one-of>\n"
-	"    </rule>\n"
-	"\n"
-	"    <rule id=\"command\" scope=\"public\">\n"
-	"       <item repeat=\"0-1\"><ruleref uri=\"#polite\"/></item>\n"
-	"       <item>don't crash</item>\n"
-	"    </rule>\n"
-	"</grammar>\n";
-
-static const char *voice_jsgf =
-	"#JSGF V1.0;\n"
-	"grammar org.freeswitch.srgs_to_jsgf;\n"
-	"public <command> = [ <polite> ] don't crash;\n"
-	"<polite> = ( ( please ) | ( kindly ) | ( oh mighty computer ) );\n";
-
-static const char *rayo_test_srgs =
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" root=\"MAINRULE\">\n"
-	"  <rule id=\"MAINRULE\">\n"
-	"    <one-of>\n"
-	"      <item>\n"
-	"        <item repeat=\"0-1\"> need a</item>\n"
-	"        <item repeat=\"0-1\"> i need a</item>\n"
-	"        <one-of>\n"
-	"          <item> clue </item>\n"
-	"        </one-of>\n"
-	"        <tag> out.concept = \"clue\";</tag>\n"
-	"      </item>\n"
-	"      <item>\n"
-	"        <item repeat=\"0-1\"> have an</item>\n"
-	"        <item repeat=\"0-1\"> i have an</item>\n"
-	"        <one-of>\n"
-	"          <item> answer </item>\n"
-	"        </one-of>\n"
-	"        <tag> out.concept = \"answer\";</tag>\n"
-	"      </item>\n"
-	"    </one-of>\n"
-	"  </rule>\n"
-	"</grammar>";
-
-
-/* removed the ruleref to URL from example */
-static const char *w3c_example_grammar =
-	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-
-	"<!DOCTYPE grammar PUBLIC \"-//W3C//DTD GRAMMAR 1.0//EN\""
-	"                  \"http://www.w3.org/TR/speech-grammar/grammar.dtd\">\n"
-	"\n"
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" xml:lang=\"en\"\n"
-	"         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-	"         xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                             http://www.w3.org/TR/speech-grammar/grammar.xsd\"\n"
-	"         version=\"1.0\" mode=\"voice\" root=\"basicCmd\">\n"
-	"\n"
-	"<meta name=\"author\" content=\"Stephanie Williams\"/>\n"
-	"\n"
-	"<rule id=\"basicCmd\" scope=\"public\">\n"
-	"  <example> please move the window </example>\n"
-	"  <example> open a file </example>\n"
-	"\n"
-	"  <!--ruleref uri=\"http://grammar.example.com/politeness.grxml#startPolite\"/-->\n"
-	"\n"
-	"  <ruleref uri=\"#command\"/>\n"
-	"  <!--ruleref uri=\"http://grammar.example.com/politeness.grxml#endPolite\"/-->\n"
-	"\n"
-	"</rule>\n"
-	"\n"
-	"<rule id=\"command\">\n"
-	"  <ruleref uri=\"#action\"/> <ruleref uri=\"#object\"/>\n"
-	"</rule>\n"
-	"\n"
-	"<rule id=\"action\">\n"
-	"   <one-of>\n"
-	"      <item weight=\"10\"> open   <tag>TAG-CONTENT-1</tag> </item>\n"
-	"      <item weight=\"2\">  close  <tag>TAG-CONTENT-2</tag> </item>\n"
-	"      <item weight=\"1\">  delete <tag>TAG-CONTENT-3</tag> </item>\n"
-	"      <item weight=\"1\">  move   <tag>TAG-CONTENT-4</tag> </item>\n"
-	"    </one-of>\n"
-	"</rule>\n"
-	"\n"
-	"<rule id=\"object\">\n"
-	"  <item repeat=\"0-1\">\n"
-	"    <one-of>\n"
-	"      <item> the </item>\n"
-	"      <item> a </item>\n"
-	"    </one-of>\n"
-	"  </item>\n"
-	"\n"
-	"  <one-of>\n"
-	"      <item> window </item>\n"
-	"      <item> file </item>\n"
-	"      <item> menu </item>\n"
-	"  </one-of>\n"
-	"</rule>\n"
-	"\n"
-	"</grammar>";
-
-
-static const char *metadata_grammar =
-	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-
-	"<!DOCTYPE grammar PUBLIC \"-//W3C//DTD GRAMMAR 1.0//EN\""
-	"                  \"http://www.w3.org/TR/speech-grammar/grammar.dtd\">\n"
-	"\n"
-	"<grammar xmlns=\"http://www.w3.org/2001/06/grammar\" xml:lang=\"en\"\n"
-	"         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-	"         xsi:schemaLocation=\"http://www.w3.org/2001/06/grammar\n"
-	"                             http://www.w3.org/TR/speech-grammar/grammar.xsd\"\n"
-	"         version=\"1.0\" mode=\"voice\" root=\"basicCmd\">\n"
-	"\n"
-	"<meta name=\"author\" content=\"Stephanie Williams\"/>\n"
-	"<metadata>\n"
-	"  <foo>\n"
-	"   <bar>\n"
-	"    <luser/>\n"
-	"   </bar>\n"
-	"  </foo>\n"
-	"</metadata>\n"
-	"\n"
-	"<rule id=\"basicCmd\" scope=\"public\">\n"
-	"  <example> please move the window </example>\n"
-	"  <example> open a file </example>\n"
-	"\n"
-	"  <!--ruleref uri=\"http://grammar.example.com/politeness.grxml#startPolite\"/-->\n"
-	"\n"
-	"  <ruleref uri=\"#command\"/>\n"
-	"  <!--ruleref uri=\"http://grammar.example.com/politeness.grxml#endPolite\"/-->\n"
-	"\n"
-	"</rule>\n"
-	"\n"
-	"<rule id=\"command\">\n"
-	"  <ruleref uri=\"#action\"/> <ruleref uri=\"#object\"/>\n"
-	"</rule>\n"
-	"\n"
-	"<rule id=\"action\">\n"
-	"   <one-of>\n"
-	"      <item weight=\"10\"> open   <tag>TAG-CONTENT-1</tag> </item>\n"
-	"      <item weight=\"2\">  close  <tag>TAG-CONTENT-2</tag> </item>\n"
-	"      <item weight=\"1\">  delete <tag>TAG-CONTENT-3</tag> </item>\n"
-	"      <item weight=\"1\">  move   <tag>TAG-CONTENT-4</tag> </item>\n"
-	"    </one-of>\n"
-	"</rule>\n"
-	"\n"
-	"<rule id=\"object\">\n"
-	"  <item repeat=\"0-1\">\n"
-	"    <one-of>\n"
-	"      <item> the </item>\n"
-	"      <item> a </item>\n"
-	"    </one-of>\n"
-	"  </item>\n"
-	"\n"
-	"  <one-of>\n"
-	"      <item> window </item>\n"
-	"      <item> file </item>\n"
-	"      <item> menu </item>\n"
-	"  </one-of>\n"
-	"</rule>\n"
-	"\n"
-	"</grammar>";
-
-
-FST_BEGIN()
-
-FST_SUITE_BEGIN(srgs)
-
-FST_SETUP_BEGIN()
-{
-	fst_requires(srgs_init());
-}
-FST_SETUP_END()
-
-FST_TEARDOWN_BEGIN()
-{
-}
-FST_TEARDOWN_END()
-
-/**
- * Test matching against adhearsion menu grammar
- */
-FST_TEST_BEGIN(match_adhearsion_menu_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_requires((grammar = srgs_parse(parser, adhearsion_menu_grammar)));
-
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check_string_equals("0", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "2", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "3", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "4", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "5", &interpretation));
-	fst_check_string_equals("1", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "6", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH == srgs_grammar_match(grammar, "7", &interpretation));
-	fst_check_string_equals("7", interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "715", &interpretation));
-	fst_check_string_equals("4", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "8", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "9", &interpretation));
-	fst_check_string_equals("3", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "*", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "27", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "223", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0123456789*#", &interpretation));
-	fst_check(NULL == interpretation);
-
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-/**
- * Test matching against adhearsion menu grammar
- */
-FST_TEST_BEGIN(match_adhearsion_large_menu_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_requires((grammar = srgs_parse(parser, adhearsion_large_menu_grammar)));
-
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check_string_equals("0", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "2", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "3", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "4", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "5", &interpretation));
-	fst_check_string_equals("1", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "6", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH == srgs_grammar_match(grammar, "7", &interpretation));
-	fst_check_string_equals("2", interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "715", &interpretation));
-	fst_check_string_equals("4", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "8", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "9", &interpretation));
-	fst_check_string_equals("3", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "*", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "27", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "223", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0123456789*#", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "761", &interpretation));
-	fst_check_string_equals("50", interpretation);
-
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-/**
- * Test matching with duplicate tags
- */
-FST_TEST_BEGIN(match_duplicate_tag_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_requires((grammar = srgs_parse(parser, duplicate_tag_grammar)));
-
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check_string_equals("2", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "2", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "3", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "4", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "5", &interpretation));
-	fst_check_string_equals("2", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "6", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "7", &interpretation));
-	fst_check_string_equals("4", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "8", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "9", &interpretation));
-	fst_check_string_equals("4", interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "*", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "27", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "223", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0123456789*#", &interpretation));
-	fst_check(NULL == interpretation);
-
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-
-/**
- * Test matching against adhearsion ask grammar
- */
-FST_TEST_BEGIN(match_adhearsion_ask_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_requires((grammar = srgs_parse(parser, adhearsion_ask_grammar)));
-
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "0", &interpretation));
-	fst_check(NULL == interpretation);
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "2", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "3", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "4", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "5", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "6", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "7", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "8", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "9", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "*", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "27", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "223", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0123456789*#", &interpretation));
-
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-/**
- * Test matching against grammar with multiple digits per item
- */
-FST_TEST_BEGIN(match_multi_digit_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_requires((grammar = srgs_parse(parser, multi_digit_grammar)));
-
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "0", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "2", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "3", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "4", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "5", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "6", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "7", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "8", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "9", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "*", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "27", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "223", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0123456789*#", &interpretation));
-
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-FST_TEST_BEGIN(match_multi_rule_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_requires((grammar = srgs_parse(parser, multi_rule_grammar)));
-
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "0", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "2", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "3", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "4", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "5", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "6", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "7", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "8", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "9", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "*", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "27", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "223", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0123456789*#", &interpretation));
-
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-FST_TEST_BEGIN(match_rayo_example_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_requires((grammar = srgs_parse(parser, rayo_example_grammar)));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "0", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "2", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "3", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "4", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "5", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "6", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "7", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "8", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "9", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "*", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "*9", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1234#", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "2321#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "27", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "223", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "0123456789*#", &interpretation));
-
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-
-FST_TEST_BEGIN(parse_grammar)
-{
-	struct srgs_parser *parser;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-
-	fst_check(srgs_parse(parser, adhearsion_ask_grammar));
-	fst_check(NULL == srgs_parse(parser, adhearsion_ask_grammar_bad));
-	fst_check(NULL == srgs_parse(parser, NULL));
-	fst_check(NULL == srgs_parse(NULL, adhearsion_ask_grammar));
-	fst_check(NULL == srgs_parse(NULL, adhearsion_ask_grammar_bad));
-	fst_check(NULL == srgs_parse(parser, bad_ref_grammar));
-
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-FST_TEST_BEGIN(repeat_item_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_check(NULL == srgs_parse(parser, repeat_item_grammar_bad));
-	fst_check(NULL == srgs_parse(parser, repeat_item_grammar_bad2));
-	fst_check(NULL == srgs_parse(parser, repeat_item_grammar_bad3));
-	fst_check(NULL == srgs_parse(parser, repeat_item_grammar_bad4));
-	fst_check(NULL == srgs_parse(parser, repeat_item_grammar_bad5));
-	fst_check(NULL == srgs_parse(parser, repeat_item_grammar_bad6));
-	fst_requires((grammar = srgs_parse(parser, repeat_item_grammar)));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1111#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1111", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1234#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1234", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "11115#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "11115", &interpretation));
-	fst_requires((grammar = srgs_parse(parser, repeat_item_range_grammar)));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1111#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1111", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1234#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1234", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "11115#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "11115", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "111156#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "111156", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "1111567#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "1111567", &interpretation));
-	fst_requires((grammar = srgs_parse(parser, repeat_item_optional_grammar)));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "1111#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "1111", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "1234#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "1234", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "11115#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "11115", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "111156#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "111156", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "1111567#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "1111567", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-	fst_requires((grammar = srgs_parse(parser, repeat_item_plus_grammar)));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1111#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1111", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1234#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1234", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "11115#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "11115", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "111156#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "111156", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "111157#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "111157", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-	fst_requires((grammar = srgs_parse(parser, repeat_item_star_grammar)));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1111#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1111", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1234#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1234", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "11115#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "11115", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "111156#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "111156", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "111157#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "111157", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1#", &interpretation));
-	fst_check(SMT_MATCH_PARTIAL == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A#", &interpretation));
-	fst_check(SMT_NO_MATCH == srgs_grammar_match(grammar, "A", &interpretation));
-
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-FST_TEST_BEGIN(repeat_item_range_ambiguous_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_requires((grammar = srgs_parse(parser, repeat_item_range_ambiguous_grammar)));
-	fst_check(SMT_MATCH == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check(SMT_MATCH == srgs_grammar_match(grammar, "12", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "123", &interpretation));
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-FST_TEST_BEGIN(repeat_item_range_optional_pound_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *interpretation;
-
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-	fst_requires((grammar = srgs_parse(parser, repeat_item_range_optional_pound_grammar)));
-	fst_check(SMT_MATCH == srgs_grammar_match(grammar, "1", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "1#", &interpretation));
-	fst_check(SMT_MATCH == srgs_grammar_match(grammar, "12", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "12#", &interpretation));
-	fst_check(SMT_MATCH_END == srgs_grammar_match(grammar, "123", &interpretation));
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-FST_TEST_BEGIN(jsgf)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	const char *jsgf;
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-
-	fst_requires((grammar = srgs_parse(parser, adhearsion_ask_grammar)));
-	fst_check((jsgf = srgs_grammar_to_jsgf(grammar)));
-	fst_requires((grammar = srgs_parse(parser, voice_srgs1)));
-	fst_check((jsgf = srgs_grammar_to_jsgf(grammar)));
-	fst_check_string_equals(voice_jsgf, jsgf);
-	fst_requires((grammar = srgs_parse(parser, multi_rule_grammar)));
-	fst_check((jsgf = srgs_grammar_to_jsgf(grammar)));
-	fst_requires((grammar = srgs_parse(parser, rayo_test_srgs)));
-	fst_check((jsgf = srgs_grammar_to_jsgf(grammar)));
-	fst_check(NULL == srgs_grammar_to_jsgf(NULL));
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-FST_TEST_BEGIN(w3c_example_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-
-	fst_requires((grammar = srgs_parse(parser, w3c_example_grammar)));
-	fst_check(srgs_grammar_to_jsgf(grammar));
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-
-FST_TEST_BEGIN(metadata_grammar)
-{
-	struct srgs_parser *parser;
-	struct srgs_grammar *grammar;
-	parser = srgs_parser_new("1234");
-	fst_requires(parser);
-
-	fst_requires((grammar = srgs_parse(parser, metadata_grammar)));
-	fst_check(srgs_grammar_to_jsgf(grammar));
-	srgs_parser_destroy(parser);
-}
-FST_TEST_END()
-
-FST_SUITE_END()
-
-FST_END()
-
diff --git a/src/mod/event_handlers/mod_rayo/xmpp_errors.def b/src/mod/event_handlers/mod_rayo/xmpp_errors.def
deleted file mode 100644
index 83adcef503..0000000000
--- a/src/mod/event_handlers/mod_rayo/xmpp_errors.def
+++ /dev/null
@@ -1,20 +0,0 @@
-XMPP_ERROR(STANZA_ERROR_BAD_REQUEST, "bad-request", "modify")
-XMPP_ERROR(STANZA_ERROR_CONFLICT, "conflict", "cancel")
-XMPP_ERROR(STANZA_ERROR_FEATURE_NOT_IMPLEMENTED, "feature-not-implemented", "modify")
-XMPP_ERROR(STANZA_ERROR_FORBIDDEN, "forbidden", "auth")
-XMPP_ERROR(STANZA_ERROR_GONE, "gone", "modify")
-XMPP_ERROR(STANZA_ERROR_INTERNAL_SERVER_ERROR, "internal-server-error", "wait")
-XMPP_ERROR(STANZA_ERROR_ITEM_NOT_FOUND, "item-not-found", "cancel")
-XMPP_ERROR(STANZA_ERROR_JID_MALFORMED, "jid-malformed", "modify")
-XMPP_ERROR(STANZA_ERROR_NOT_ACCEPTABLE, "not-acceptable", "modify")
-XMPP_ERROR(STANZA_ERROR_NOT_ALLOWED, "not-allowed", "cancel")
-XMPP_ERROR(STANZA_ERROR_NOT_AUTHORIZED, "not-authorized", "auth")
-XMPP_ERROR(STANZA_ERROR_RECIPIENT_UNAVAILABLE, "recipient-unavailable", "wait")
-XMPP_ERROR(STANZA_ERROR_REDIRECT, "redirect", "modify")
-XMPP_ERROR(STANZA_ERROR_REGISTRATION_REQUIRED, "registration-required", "auth")
-XMPP_ERROR(STANZA_ERROR_REMOTE_SERVER_NOT_FOUND, "remote-server-not-found", "cancel")
-XMPP_ERROR(STANZA_ERROR_REMOTE_SERVER_TIMEOUT, "remote-server-timeout", "wait")
-XMPP_ERROR(STANZA_ERROR_RESOURCE_CONSTRAINT, "resource-constraint", "wait")
-XMPP_ERROR(STANZA_ERROR_SERVICE_UNAVAILABLE, "service-unavailable", "cancel")
-XMPP_ERROR(STANZA_ERROR_UNDEFINED_CONDITION, "undefined-condition", "wait")
-XMPP_ERROR(STANZA_ERROR_UNEXPECTED_REQUEST, "unexpected-request", "wait")
diff --git a/src/mod/event_handlers/mod_rayo/xmpp_streams.c b/src/mod/event_handlers/mod_rayo/xmpp_streams.c
deleted file mode 100644
index c78fff78e3..0000000000
--- a/src/mod/event_handlers/mod_rayo/xmpp_streams.c
+++ /dev/null
@@ -1,1890 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2015, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * xmpp_streams.c -- XMPP s2s and c2s streams
- *
- */
-#include <switch.h>
-#include <iksemel.h>
-
-#include <openssl/ssl.h>
-
-#include "xmpp_streams.h"
-#include "iks_helpers.h"
-#include "sasl.h"
-
-#define MAX_QUEUE_LEN 25000
-
-/**
- * Context for all streams
- */
-struct xmpp_stream_context {
-	/** memory pool to use */
-	switch_memory_pool_t *pool;
-	/** domain for this context */
-	const char *domain;
-	/** synchronizes access to streams and routes hashes */
-	switch_mutex_t *streams_mutex;
-	/** map of stream JID to routable stream */
-	switch_hash_t *routes;
-	/** map of stream ID to stream */
-	switch_hash_t *streams;
-	/** map of user ID to password */
-	switch_hash_t *users;
-	/** shared secret for server dialback */
-	const char *dialback_secret;
-	/** callback when a new resource is bound */
-	xmpp_stream_bind_callback bind_callback;
-	/** callback when a new stream is ready */
-	xmpp_stream_ready_callback ready_callback;
-	/** callback when a stream is destroyed */
-	xmpp_stream_destroy_callback destroy_callback;
-	/** callback when a stanza is received */
-	xmpp_stream_recv_callback recv_callback;
-	/** context shutdown flag */
-	int shutdown;
-	/** prevents context shutdown until all threads are finished */
-	switch_thread_rwlock_t *shutdown_rwlock;
-	/** path to cert PEM file */
-	const char *cert_pem_file;
-	/** path to key PEM file */
-	const char *key_pem_file;
-};
-
-/**
- * State of a stream
- */
-enum xmpp_stream_state {
-	/** new connection */
-	XSS_CONNECT,
-	/** encrypted comms established */
-	XSS_SECURE,
-	/** remote party authenticated */
-	XSS_AUTHENTICATED,
-	/** client resource bound */
-	XSS_RESOURCE_BOUND,
-	/** ready to accept requests */
-	XSS_READY,
-	/** terminating stream */
-	XSS_SHUTDOWN,
-	/** unrecoverable error */
-	XSS_ERROR,
-	/** destroyed */
-	XSS_DESTROY
-};
-
-/**
- * A client/server stream connection
- */
-struct xmpp_stream {
-	/** stream state */
-	enum xmpp_stream_state state;
-	/** true if server-to-server connection */
-	int s2s;
-	/** true if incoming connection */
-	int incoming;
-	/** Jabber ID of remote party */
-	char *jid;
-	/** stream ID */
-	char *id;
-	/** stream pool */
-	switch_memory_pool_t *pool;
-	/** address of this stream */
-	const char *address;
-	/** port of this stream */
-	int port;
-	/** synchronizes access to this stream */
-	switch_mutex_t *mutex;
-	/** socket to remote party */
-	switch_socket_t *socket;
-	/** socket poll descriptor */
-	switch_pollfd_t *pollfd;
-	/** XML stream parser */
-	iksparser *parser;
-	/** outbound message queue */
-	switch_queue_t *msg_queue;
-	/** true if no activity last poll */
-	int idle;
-	/** context for this stream */
-	struct xmpp_stream_context *context;
-	/** user private data */
-	void *user_private;
-};
-
-/**
- * A socket listening for new connections
- */
-struct xmpp_listener {
-	/** listener pool */
-	switch_memory_pool_t *pool;
-	/** listen address */
-	char *addr;
-	/** listen port */
-	switch_port_t port;
-	/** access control list */
-	const char *acl;
-	/** listen socket */
-	switch_socket_t *socket;
-	/** pollset for listen socket */
-	switch_pollfd_t *read_pollfd;
-	/** true if server to server connections only */
-	int s2s;
-	/** context for new streams */
-	struct xmpp_stream_context *context;
-};
-
-static void xmpp_stream_new_id(struct xmpp_stream *stream);
-static void xmpp_stream_set_id(struct xmpp_stream *stream, const char *id);
-
-/**
- * Convert xmpp stream state to string
- * @param state the xmpp stream state
- * @return the string value of state or "UNKNOWN"
- */
-static const char *xmpp_stream_state_to_string(enum xmpp_stream_state state)
-{
-	switch(state) {
-		case XSS_CONNECT: return "CONNECT";
-		case XSS_SECURE: return "SECURE";
-		case XSS_AUTHENTICATED: return "AUTHENTICATED";
-		case XSS_RESOURCE_BOUND: return "RESOURCE_BOUND";
-		case XSS_READY: return "READY";
-		case XSS_SHUTDOWN: return "SHUTDOWN";
-		case XSS_ERROR: return "ERROR";
-		case XSS_DESTROY: return "DESTROY";
-	}
-	return "UNKNOWN";
-}
-
-/**
- * Handle XMPP stream logging callback
- * @param user_data the xmpp stream
- * @param data the log message
- * @param size of the log message
- * @param is_incoming true if this is a log for a received message
- */
-static void on_stream_log(void *user_data, const char *data, size_t size, int is_incoming)
-{
-	if (size > 0) {
-		struct xmpp_stream *stream = (struct xmpp_stream *)user_data;
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, %s_%s %s %s\n", stream->jid, stream->address, stream->port, stream->s2s ? "s2s" : "c2s",
-			stream->incoming ? "in" : "out", is_incoming ? "RECV" : "SEND", data);
-	}
-}
-
-/**
- * Send stanza to stream.
- */
-static void xmpp_stream_stanza_send(struct xmpp_stream *stream, iks *msg)
-{
-	/* send directly if client or outbound s2s stream */
-	if (!stream->s2s || !stream->incoming) {
-		iks_send(stream->parser, msg);
-		iks_delete(msg);
-	} else {
-		/* route message to outbound server stream */
-		xmpp_stream_context_send(stream->context, stream->jid, msg);
-		iks_delete(msg);
-	}
-}
-
-/**
- * Attach stream to connected socket
- * @param stream the stream
- * @param socket the connected socket
- */
-static void xmpp_stream_set_socket(struct xmpp_stream *stream, switch_socket_t *socket)
-{
-	stream->socket = socket;
-	switch_socket_create_pollset(&stream->pollfd, stream->socket, SWITCH_POLLIN | SWITCH_POLLERR, stream->pool);
-
-	/* connect XMPP stream parser to socket */
-	{
-		switch_os_socket_t os_socket;
-		switch_os_sock_get(&os_socket, stream->socket);
-		iks_connect_fd(stream->parser, os_socket);
-		/* TODO connect error checking */
-	}
-}
-
-/**
- * Assign a new ID to the stream
- * @param stream the stream
- */
-static void xmpp_stream_new_id(struct xmpp_stream *stream)
-{
-	char id[SWITCH_UUID_FORMATTED_LENGTH + 1] = { 0 };
-	switch_uuid_str(id, sizeof(id));
-	xmpp_stream_set_id(stream, id);
-}
-
-/**
- * Send session reply to server <stream> after auth is done
- * @param stream the xmpp stream
- */
-static void xmpp_send_server_header_features(struct xmpp_stream *stream)
-{
-	struct xmpp_stream_context *context = stream->context;
-	char *header = switch_mprintf(
-		"<stream:stream xmlns='"IKS_NS_SERVER"' xmlns:db='"IKS_NS_XMPP_DIALBACK"'"
-		" from='%s' id='%s' xml:lang='en' version='1.0'"
-		" xmlns:stream='"IKS_NS_XMPP_STREAMS"'><stream:features>"
-		"</stream:features>", context->domain, stream->id);
-
-	iks_send_raw(stream->parser, header);
-	free(header);
-}
-
-/**
- * Send bind + session reply to client <stream>
- * @param stream the xmpp stream
- */
-static void xmpp_send_client_header_bind(struct xmpp_stream *stream)
-{
-	struct xmpp_stream_context *context = stream->context;
-	char *header = switch_mprintf(
-		"<stream:stream xmlns='"IKS_NS_CLIENT"' xmlns:db='"IKS_NS_XMPP_DIALBACK"'"
-		" from='%s' id='%s' xml:lang='en' version='1.0'"
-		" xmlns:stream='"IKS_NS_XMPP_STREAMS"'><stream:features>"
-		"<bind xmlns='"IKS_NS_XMPP_BIND"'/>"
-		"<session xmlns='"IKS_NS_XMPP_SESSION"'/>"
-		"</stream:features>", context->domain, stream->id);
-
-	iks_send_raw(stream->parser, header);
-	free(header);
-}
-
-/**
- * Handle <presence> message callback
- * @param stream the stream
- * @param node the presence message
- */
-static void on_stream_presence(struct xmpp_stream *stream, iks *node)
-{
-	struct xmpp_stream_context *context = stream->context;
-	const char *from = iks_find_attrib(node, "from");
-
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, presence, state = %s\n", stream->jid, stream->address, stream->port, xmpp_stream_state_to_string(stream->state));
-
-	if (!from) {
-		if (stream->s2s) {
-			/* from is required in s2s connections */
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, no presence from JID\n", stream->jid, stream->address, stream->port);
-			return;
-		}
-
-		/* use stream JID if a c2s connection */
-		from = stream->jid;
-		if (zstr(from)) {
-			/* error */
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, no presence from JID\n", stream->jid, stream->address, stream->port);
-			return;
-		}
-		iks_insert_attrib(node, "from", from);
-	}
-	if (context->recv_callback) {
-		context->recv_callback(stream, node);
-	}
-}
-
-/**
- * Send <success> reply to xmpp stream <auth>
- * @param stream the xmpp stream.
- */
-static void xmpp_send_auth_success(struct xmpp_stream *stream)
-{
-	iks_send_raw(stream->parser, "<success xmlns='"IKS_NS_XMPP_SASL"'/>");
-}
-
-/**
- * Send <failure> reply to xmpp client <auth>
- * @param stream the xmpp stream to use.
- * @param reason the reason for failure
- */
-static void xmpp_send_auth_failure(struct xmpp_stream *stream, const char *reason)
-{
-	char *reply = switch_mprintf("<failure xmlns='"IKS_NS_XMPP_SASL"'>"
-		"<%s/></failure>", reason);
-	iks_send_raw(stream->parser, reply);
-	free(reply);
-}
-
-/**
- * Validate username and password
- * @param authzid authorization id
- * @param authcid authentication id
- * @param password
- * @return 1 if authenticated
- */
-static int verify_plain_auth(struct xmpp_stream_context *context, const char *authzid, const char *authcid, const char *password)
-{
-	char *correct_password;
-	if (zstr(authzid) || zstr(authcid) || zstr(password)) {
-		return 0;
-	}
-	correct_password = switch_core_hash_find(context->users, authcid);
-	return !zstr(correct_password) && !strcmp(correct_password, password);
-}
-
-/**
- * Send sasl reply to xmpp <stream>
- * @param stream the xmpp stream
- */
-static void xmpp_send_client_header_auth(struct xmpp_stream *stream)
-{
-	struct xmpp_stream_context *context = stream->context;
-	char *header = switch_mprintf(
-		"<stream:stream xmlns='"IKS_NS_CLIENT"' xmlns:db='"IKS_NS_XMPP_DIALBACK"'"
-		" from='%s' id='%s' xml:lang='en' version='1.0'"
-		" xmlns:stream='"IKS_NS_XMPP_STREAMS"'><stream:features>"
-		"<mechanisms xmlns='"IKS_NS_XMPP_SASL"'>"
-		"<mechanism>PLAIN</mechanism>"
-		"</mechanisms></stream:features>", context->domain, stream->id);
-	iks_send_raw(stream->parser, header);
-	free(header);
-}
-
-/**
- * Send sasl + starttls reply to xmpp <stream>
- * @param stream the xmpp stream
- */
-static void xmpp_send_client_header_tls(struct xmpp_stream *stream)
-{
-	if (stream->context->key_pem_file && stream->context->cert_pem_file) {
-		struct xmpp_stream_context *context = stream->context;
-		char *header = switch_mprintf(
-			"<stream:stream xmlns='"IKS_NS_CLIENT"' xmlns:db='"IKS_NS_XMPP_DIALBACK"'"
-			" from='%s' id='%s' xml:lang='en' version='1.0'"
-			" xmlns:stream='"IKS_NS_XMPP_STREAMS"'><stream:features>"
-			"<starttls xmlns='"IKS_NS_XMPP_TLS"'><required/></starttls>"
-			"<mechanisms xmlns='"IKS_NS_XMPP_SASL"'>"
-			"<mechanism>PLAIN</mechanism>"
-			"</mechanisms></stream:features>", context->domain, stream->id);
-		iks_send_raw(stream->parser, header);
-		free(header);
-	} else {
-		/* not set up for TLS, skip it */
-		stream->state = XSS_SECURE;
-		xmpp_send_client_header_auth(stream);
-	}
-}
-
-/**
- * Send sasl reply to xmpp <stream>
- * @param stream the xmpp stream
- */
-static void xmpp_send_server_header_auth(struct xmpp_stream *stream)
-{
-	struct xmpp_stream_context *context = stream->context;
-	char *header = switch_mprintf(
-		"<stream:stream xmlns='"IKS_NS_SERVER"' xmlns:db='"IKS_NS_XMPP_DIALBACK"'"
-		" from='%s' id='%s' xml:lang='en' version='1.0'"
-		" xmlns:stream='"IKS_NS_XMPP_STREAMS"'>"
-		"<stream:features>"
-		"</stream:features>",
-		context->domain, stream->id);
-	iks_send_raw(stream->parser, header);
-	free(header);
-}
-
-/**
- * Send dialback to receiving server
- */
-static void xmpp_send_dialback_key(struct xmpp_stream *stream)
-{
-	struct xmpp_stream_context *context = stream->context;
-	char *dialback_key = iks_server_dialback_key(context->dialback_secret, stream->jid, context->domain, stream->id);
-	if (dialback_key) {
-		char *dialback = switch_mprintf(
-			"<db:result from='%s' to='%s'>%s</db:result>",
-			context->domain, stream->jid,
-			dialback_key);
-		iks_send_raw(stream->parser, dialback);
-		free(dialback);
-		free(dialback_key);
-	} else {
-		/* TODO missing shared secret */
-	}
-}
-
-/**
- * Send initial <stream> header to peer server
- * @param stream the xmpp stream
- */
-static void xmpp_send_outbound_server_header(struct xmpp_stream *stream)
-{
-	struct xmpp_stream_context *context = stream->context;
-	char *header = switch_mprintf(
-		"<stream:stream xmlns='"IKS_NS_SERVER"' xmlns:db='"IKS_NS_XMPP_DIALBACK"'"
-		" from='%s' to='%s' xml:lang='en' version='1.0'"
-		" xmlns:stream='"IKS_NS_XMPP_STREAMS"'>", context->domain, stream->jid);
-	iks_send_raw(stream->parser, header);
-	free(header);
-}
-
-/**
- * Handle <starttls> message.
- * @param the xmpp stream
- * @param node the <starttls> packet
- */
-static void on_stream_starttls(struct xmpp_stream *stream, iks *node)
-{
-	/* wait for handshake to start */
-	if (iks_proceed_tls(stream->parser, stream->context->cert_pem_file, stream->context->key_pem_file) == IKS_OK) {
-		stream->state = XSS_SECURE;
-	} else {
-		stream->state = XSS_ERROR;
-	}
-}
-
-/**
- * Handle <auth> message.  Only PLAIN supported.
- * @param stream the xmpp stream
- * @param node the <auth> packet
- */
-static void on_stream_auth(struct xmpp_stream *stream, iks *node)
-{
-	struct xmpp_stream_context *context = stream->context;
-	const char *xmlns, *mechanism;
-	iks *auth_body;
-
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, auth, state = %s\n", stream->jid, stream->address, stream->port, xmpp_stream_state_to_string(stream->state));
-
-	/* wrong state for authentication */
-	if (stream->state != XSS_SECURE) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_WARNING, "%s, %s:%i, auth UNEXPECTED, state = %s\n", stream->jid, stream->address, stream->port, xmpp_stream_state_to_string(stream->state));
-		/* on_auth unexpected error */
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	/* unsupported authentication type */
-	xmlns = iks_find_attrib_soft(node, "xmlns");
-	if (strcmp(IKS_NS_XMPP_SASL, xmlns)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_WARNING, "%s, %s:%i, auth, state = %s, unsupported namespace: %s!\n", stream->jid, stream->address, stream->port, xmpp_stream_state_to_string(stream->state), xmlns);
-		/* on_auth namespace error */
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	/* unsupported SASL authentication mechanism */
-	mechanism = iks_find_attrib_soft(node, "mechanism");
-	if (strcmp("PLAIN", mechanism)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_WARNING, "%s, %s:%i, auth, state = %s, unsupported SASL mechanism: %s!\n", stream->jid, stream->address, stream->port, xmpp_stream_state_to_string(stream->state), mechanism);
-		xmpp_send_auth_failure(stream, "invalid-mechanism");
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	if ((auth_body = iks_child(node)) && iks_type(auth_body) == IKS_CDATA) {
-		/* get user and password from auth */
-		char *message = iks_cdata(auth_body);
-		char *authzid = NULL, *authcid, *password;
-		/* TODO use library for SASL! */
-		parse_plain_auth_message(message, &authzid, &authcid, &password);
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, auth, state = %s, SASL/PLAIN decoded authzid = \"%s\" authcid = \"%s\"\n", stream->jid, stream->address, stream->port, xmpp_stream_state_to_string(stream->state), authzid, authcid);
-		if (verify_plain_auth(context, authzid, authcid, password)) {
-			stream->jid = switch_core_strdup(stream->pool, authzid);
-			if (!stream->s2s && !strchr(stream->jid, '@')) {
-				/* add missing domain on client stream */
-				stream->jid = switch_core_sprintf(stream->pool, "%s@%s", stream->jid, context->domain);
-			}
-
-			xmpp_send_auth_success(stream);
-			stream->state = XSS_AUTHENTICATED;
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_WARNING, "%s, %s:%i, auth, state = %s, invalid user or password!\n", stream->jid, stream->address, stream->port, xmpp_stream_state_to_string(stream->state));
-			xmpp_send_auth_failure(stream, "not-authorized");
-			stream->state = XSS_ERROR;
-		}
-		switch_safe_free(authzid);
-		switch_safe_free(authcid);
-		switch_safe_free(password);
-	} else {
-		/* missing message */
-		stream->state = XSS_ERROR;
-	}
-}
-
-/**
- * Handle <iq><session> request
- * @param stream the xmpp stream
- * @param node the <iq> node
- * @return NULL
- */
-static iks *on_iq_set_xmpp_session(struct xmpp_stream *stream, iks *node)
-{
-	struct xmpp_stream_context *context = stream->context;
-	iks *reply;
-
-	switch(stream->state) {
-		case XSS_RESOURCE_BOUND: {
-			if (context->ready_callback && !context->ready_callback(stream)) {
-				reply = iks_new_error(node, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-				stream->state = XSS_ERROR;
-			} else {
-				reply = iks_new_iq_result(node);
-				stream->state = XSS_READY;
-
-				/* add to available streams */
-				switch_mutex_lock(context->streams_mutex);
-				switch_core_hash_insert(context->routes, stream->jid, stream);
-				switch_mutex_unlock(context->streams_mutex);
-			}
-
-			break;
-		}
-		case XSS_AUTHENTICATED:
-		case XSS_READY:
-		default:
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_WARNING, "%s, %s:%i, iq UNEXPECTED <session>, state = %s\n", stream->jid, stream->address, stream->port, xmpp_stream_state_to_string(stream->state));
-			reply = iks_new_error(node, STANZA_ERROR_SERVICE_UNAVAILABLE);
-			break;
-	}
-
-	return reply;
-}
-
-/**
- * Handle <iq><bind> request
- * @param stream the xmpp stream
- * @param node the <iq> node
- */
-static iks *on_iq_set_xmpp_bind(struct xmpp_stream *stream, iks *node)
-{
-	iks *reply = NULL;
-
-	switch(stream->state) {
-		case XSS_AUTHENTICATED: {
-			struct xmpp_stream_context *context = stream->context;
-			iks *bind = iks_find(node, "bind");
-			iks *x;
-			/* get optional client resource ID */
-			char *resource_id = iks_find_cdata(bind, "resource");
-
-			/* generate resource ID for client if not already set */
-			if (zstr(resource_id)) {
-				char resource_id_buf[SWITCH_UUID_FORMATTED_LENGTH + 1];
-				switch_uuid_str(resource_id_buf, sizeof(resource_id_buf));
-				resource_id = switch_core_strdup(stream->pool, resource_id_buf);
-			}
-
-			stream->jid = switch_core_sprintf(stream->pool, "%s/%s", stream->jid, resource_id);
-			if (context->bind_callback && !context->bind_callback(stream)) {
-				stream->jid = NULL;
-				reply = iks_new_error(node, STANZA_ERROR_CONFLICT);
-			} else {
-				stream->state = XSS_RESOURCE_BOUND;
-
-				reply = iks_new_iq_result(node);
-				x = iks_insert(reply, "bind");
-				iks_insert_attrib(x, "xmlns", IKS_NS_XMPP_BIND);
-				iks_insert_cdata(iks_insert(x, "jid"), stream->jid, strlen(stream->jid));
-			}
-			break;
-		}
-		default:
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_WARNING, "%s, %s:%i, iq UNEXPECTED <bind>\n", stream->jid, stream->address, stream->port);
-			reply = iks_new_error(node, STANZA_ERROR_NOT_ALLOWED);
-			break;
-	}
-
-	return reply;
-}
-
-/**
- * Handle <iq> message callback
- * @param stream the stream
- * @param iq the packet
- */
-static void on_stream_iq(struct xmpp_stream *stream, iks *iq)
-{
-	struct xmpp_stream_context *context = stream->context;
-	switch(stream->state) {
-		case XSS_CONNECT:
-		case XSS_SECURE: {
-			iks *error = iks_new_error(iq, STANZA_ERROR_NOT_AUTHORIZED);
-			xmpp_stream_stanza_send(stream, error);
-			break;
-		}
-		case XSS_AUTHENTICATED: {
-			iks *cmd = iks_first_tag(iq);
-			if (cmd && !strcmp("bind", iks_name(cmd)) && !strcmp(IKS_NS_XMPP_BIND, iks_find_attrib_soft(cmd, "xmlns"))) {
-				iks *reply = on_iq_set_xmpp_bind(stream, iq);
-				xmpp_stream_stanza_send(stream, reply);
-			} else {
-				iks *error = iks_new_error(iq, STANZA_ERROR_SERVICE_UNAVAILABLE);
-				xmpp_stream_stanza_send(stream, error);
-			}
-			break;
-		}
-		case XSS_RESOURCE_BOUND: {
-			iks *cmd = iks_first_tag(iq);
-			if (cmd && !strcmp("session", iks_name(cmd)) && !strcmp(IKS_NS_XMPP_SESSION, iks_find_attrib_soft(cmd, "xmlns"))) {
-				iks *reply = on_iq_set_xmpp_session(stream, iq);
-				xmpp_stream_stanza_send(stream, reply);
-			} else {
-				iks *error = iks_new_error(iq, STANZA_ERROR_SERVICE_UNAVAILABLE);
-				xmpp_stream_stanza_send(stream, error);
-			}
-			break;
-		}
-		case XSS_READY: {
-			/* client requests */
-			if (context->recv_callback) {
-				context->recv_callback(stream, iq);
-			}
-			break;
-		}
-		case XSS_SHUTDOWN:
-		case XSS_DESTROY:
-		case XSS_ERROR: {
-			iks *error = iks_new_error(iq, STANZA_ERROR_UNEXPECTED_REQUEST);
-			xmpp_stream_stanza_send(stream, error);
-			break;
-		}
-	};
-}
-
-/**
- * Handle </stream>
- * @param stream the stream
- */
-static void on_stream_stop(struct xmpp_stream *stream)
-{
-	if (stream->state != XSS_SHUTDOWN) {
-		iks_send_raw(stream->parser, "</stream:stream>");
-	}
-	stream->state = XSS_DESTROY;
-}
-
-/**
- * Handle <stream> from a client
- * @param stream the stream
- * @param node the stream message
- */
-static void on_client_stream_start(struct xmpp_stream *stream, iks *node)
-{
-	struct xmpp_stream_context *context = stream->context;
-	const char *to = iks_find_attrib_soft(node, "to");
-	const char *xmlns = iks_find_attrib_soft(node, "xmlns");
-
-	/* to is optional, must be server domain if set */
-	if (!zstr(to) && strcmp(context->domain, to)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, wrong server domain!\n", stream->jid, stream->address, stream->port);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	/* xmlns = client */
-	if (zstr(xmlns) || strcmp(xmlns, IKS_NS_CLIENT)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, wrong stream namespace!\n", stream->jid, stream->address, stream->port);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	switch (stream->state) {
-		case XSS_CONNECT:
-			xmpp_send_client_header_tls(stream);
-			break;
-		case XSS_SECURE:
-			xmpp_send_client_header_auth(stream);
-			break;
-		case XSS_AUTHENTICATED:
-			/* client bind required */
-			xmpp_stream_new_id(stream);
-			xmpp_send_client_header_bind(stream);
-			break;
-		case XSS_SHUTDOWN:
-			/* strange... I expect IKS_NODE_STOP, this is a workaround. */
-			stream->state = XSS_DESTROY;
-			break;
-		case XSS_RESOURCE_BOUND:
-		case XSS_READY:
-		case XSS_ERROR:
-		case XSS_DESTROY:
-			/* bad state */
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, bad state!\n", stream->jid, stream->address, stream->port);
-			stream->state = XSS_ERROR;
-			break;
-	}
-}
-
-/**
- * Handle <db:result type='valid'>
- */
-static void on_stream_dialback_result_valid(struct xmpp_stream *stream, iks *node)
-{
-	struct xmpp_stream_context *context = stream->context;
-
-	/* TODO check domain pair and allow access if pending request exists */
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, valid dialback result\n", stream->jid, stream->address, stream->port);
-
-	if (context->ready_callback && !context->ready_callback(stream)) {
-		stream->state = XSS_ERROR;
-	} else {
-		/* this stream is routable */
-		stream->state = XSS_READY;
-
-		/* add to available streams */
-		switch_mutex_lock(context->streams_mutex);
-		switch_core_hash_insert(context->routes, stream->jid, stream);
-		switch_mutex_unlock(context->streams_mutex);
-	}
-}
-
-/**
- * Handle <db:result type='valid'>
- */
-static void on_stream_dialback_result_invalid(struct xmpp_stream *stream, iks *node)
-{
-	/* close stream */
-	stream->state = XSS_ERROR;
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, invalid dialback result!\n", stream->jid, stream->address, stream->port);
-}
-
-/**
- * Handle <db:result type='error'>
- */
-static void on_stream_dialback_result_error(struct xmpp_stream *stream, iks *node)
-{
-	/* close stream */
-	stream->state = XSS_ERROR;
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, error dialback result!\n", stream->jid, stream->address, stream->port);
-}
-
-/**
- * Handle <db:result>
- */
-static void on_stream_dialback_result_key(struct xmpp_stream *stream, iks *node)
-{
-	struct xmpp_stream_context *context = stream->context;
-	const char *from = iks_find_attrib_soft(node, "from");
-	const char *to = iks_find_attrib_soft(node, "to");
-	iks *cdata = iks_child(node);
-	iks *reply;
-	const char *dialback_key = NULL;
-
-	if (cdata && iks_type(cdata) == IKS_CDATA) {
-		dialback_key = iks_cdata(cdata);
-	}
-	if (zstr(dialback_key)) {
-		iks *error = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "Missing dialback key");
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, dialback result missing key!\n", stream->jid, stream->address, stream->port);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	if (zstr(from)) {
-		iks *error = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "Missing from");
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, dialback result missing from!\n", stream->jid, stream->address, stream->port);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	if (zstr(to)) {
-		iks *error = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "Missing to");
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, dialback result missing to!\n", stream->jid, stream->address, stream->port);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	if (strcmp(context->domain, to)) {
-		iks *error = iks_new_error(node, STANZA_ERROR_ITEM_NOT_FOUND);
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, invalid domain!\n", stream->jid, stream->address, stream->port);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	/* this stream is not routable */
-	stream->state = XSS_READY;
-	stream->jid = switch_core_strdup(stream->pool, from);
-
-	if (context->ready_callback && !context->ready_callback(stream)) {
-		iks *error = iks_new_error(node, STANZA_ERROR_INTERNAL_SERVER_ERROR);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	/* TODO validate key */
-	reply = iks_new("db:result");
-	iks_insert_attrib(reply, "from", to);
-	iks_insert_attrib(reply, "to", from);
-	iks_insert_attrib(reply, "type", "valid");
-	iks_send(stream->parser, reply);
-	iks_delete(reply);
-}
-
-/**
- * Handle <db:result>
- */
-static void on_stream_dialback_result(struct xmpp_stream *stream, iks *node)
-{
-	const char *type = iks_find_attrib_soft(node, "type");
-
-	if (stream->state == XSS_ERROR || stream->state == XSS_DESTROY) {
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	if (zstr(type)) {
-		on_stream_dialback_result_key(stream, node);
-	} else if (!strcmp("valid", type)) {
-		on_stream_dialback_result_valid(stream, node);
-	} else if (!strcmp("invalid", type)) {
-		on_stream_dialback_result_invalid(stream, node);
-	} else if (!strcmp("error", type)) {
-		on_stream_dialback_result_error(stream, node);
-	}
-}
-
-/**
- * Handle <db:verify>
- */
-static void on_stream_dialback_verify(struct xmpp_stream *stream, iks *node)
-{
-	struct xmpp_stream_context *context = stream->context;
-	const char *from = iks_find_attrib_soft(node, "from");
-	const char *id = iks_find_attrib_soft(node, "id");
-	const char *to = iks_find_attrib_soft(node, "to");
-	iks *cdata = iks_child(node);
-	iks *reply;
-	const char *dialback_key = NULL;
-	char *expected_key = NULL;
-	int valid;
-
-	if (stream->state == XSS_ERROR || stream->state == XSS_DESTROY) {
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	if (cdata && iks_type(cdata) == IKS_CDATA) {
-		dialback_key = iks_cdata(cdata);
-	}
-	if (zstr(dialback_key)) {
-		iks *error = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "Missing dialback key");
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, dialback verify missing key!\n", stream->jid, stream->address, stream->port);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		return;
-	}
-
-	if (zstr(id)) {
-		iks *error = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "Missing id");
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, dialback verify missing stream ID!\n", stream->jid, stream->address, stream->port);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		return;
-	}
-
-	if (zstr(from)) {
-		iks *error = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "Missing from");
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, dialback verify missing from!\n", stream->jid, stream->address, stream->port);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		return;
-	}
-
-	if (zstr(to)) {
-		iks *error = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "Missing to");
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, dialback verify missing to!\n", stream->jid, stream->address, stream->port);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		return;
-	}
-
-	if (strcmp(context->domain, to)) {
-		iks *error = iks_new_error(node, STANZA_ERROR_ITEM_NOT_FOUND);
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, invalid domain!\n", stream->jid, stream->address, stream->port);
-		iks_send(stream->parser, error);
-		iks_delete(error);
-		return;
-	}
-
-	expected_key = iks_server_dialback_key(context->dialback_secret, from, to, id);
-	valid = expected_key && !strcmp(expected_key, dialback_key);
-
-	reply = iks_new("db:verify");
-	iks_insert_attrib(reply, "from", to);
-	iks_insert_attrib(reply, "to", from);
-	iks_insert_attrib(reply, "id", id);
-	iks_insert_attrib(reply, "type", valid ? "valid" : "invalid");
-	iks_send(stream->parser, reply);
-	iks_delete(reply);
-	free(expected_key);
-
-	if (!valid) {
-		/* close the stream */
-		stream->state = XSS_ERROR;
-	}
-}
-
-/**
- * Handle <stream> from an outbound peer server
- */
-static void on_outbound_server_stream_start(struct xmpp_stream *stream, iks *node)
-{
-	const char *xmlns = iks_find_attrib_soft(node, "xmlns");
-
-	/* xmlns = server */
-	if (zstr(xmlns) || strcmp(xmlns, IKS_NS_SERVER)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, wrong stream namespace!\n", stream->jid, stream->address, stream->port);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	switch (stream->state) {
-		case XSS_CONNECT: {
-			/* get stream ID and send dialback */
-			const char *id = iks_find_attrib_soft(node, "id");
-			if (zstr(id)) {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, missing stream ID!\n", stream->jid, stream->address, stream->port);
-				stream->state = XSS_ERROR;
-				return;
-			}
-			xmpp_stream_set_id(stream, id);
-
-			/* send dialback */
-			xmpp_send_dialback_key(stream);
-			break;
-		}
-		case XSS_SHUTDOWN:
-			/* strange... I expect IKS_NODE_STOP, this is a workaround. */
-			stream->state = XSS_DESTROY;
-			break;
-		case XSS_SECURE:
-		case XSS_AUTHENTICATED:
-		case XSS_RESOURCE_BOUND:
-		case XSS_READY:
-		case XSS_ERROR:
-		case XSS_DESTROY:
-			/* bad state */
-			stream->state = XSS_ERROR;
-			break;
-	}
-}
-
-/**
- * Handle <stream> from an inbound peer server
- * @param stream the stream
- * @param node the stream message
- */
-static void on_inbound_server_stream_start(struct xmpp_stream *stream, iks *node)
-{
-	struct xmpp_stream_context *context = stream->context;
-	const char *to = iks_find_attrib_soft(node, "to");
-	const char *xmlns = iks_find_attrib_soft(node, "xmlns");
-
-	/* to is required, must be server domain */
-	if (zstr(to) || strcmp(context->domain, to)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, wrong server domain!\n", stream->jid, stream->address, stream->port);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	/* xmlns = server */
-	if (zstr(xmlns) || strcmp(xmlns, IKS_NS_SERVER)) {
-		switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, wrong stream namespace!\n", stream->jid, stream->address, stream->port);
-		stream->state = XSS_ERROR;
-		return;
-	}
-
-	switch (stream->state) {
-		case XSS_CONNECT:
-			xmpp_send_server_header_auth(stream);
-			break;
-		case XSS_SECURE:
-			break;
-		case XSS_AUTHENTICATED: {
-			if (context->ready_callback && !context->ready_callback(stream)) {
-				stream->state = XSS_ERROR;
-				break;
-			}
-
-			/* all set */
-			xmpp_send_server_header_features(stream);
-			stream->state = XSS_READY;
-
-			/* add to available streams */
-			switch_mutex_lock(context->streams_mutex);
-			switch_core_hash_insert(context->routes, stream->jid, stream);
-			switch_mutex_unlock(context->streams_mutex);
-			break;
-		}
-		case XSS_SHUTDOWN:
-			/* strange... I expect IKS_NODE_STOP, this is a workaround. */
-			stream->state = XSS_DESTROY;
-			break;
-		case XSS_RESOURCE_BOUND:
-		case XSS_READY:
-		case XSS_ERROR:
-		case XSS_DESTROY:
-			/* bad state */
-			stream->state = XSS_ERROR;
-			break;
-	}
-}
-
-/**
- * Handle XML stream callback
- * @param user_data the xmpp stream
- * @param type stream type (start/normal/stop/etc)
- * @param node optional XML node
- * @return IKS_OK
- */
-static int on_stream(void *user_data, int type, iks *node)
-{
-	struct xmpp_stream *stream = (struct xmpp_stream *)user_data;
-
-	stream->idle = 0;
-
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, state = %s, node type = %s\n", stream->jid, stream->address, stream->port, xmpp_stream_state_to_string(stream->state), iks_node_type_to_string(type));
-
-	switch(type) {
-		case IKS_NODE_START:
-			/* <stream> */
-			if (node) {
-				if (stream->s2s) {
-					if (stream->incoming) {
-						on_inbound_server_stream_start(stream, node);
-					} else {
-						on_outbound_server_stream_start(stream, node);
-					}
-				} else {
-					on_client_stream_start(stream, node);
-				}
-			} else {
-				stream->state = XSS_ERROR;
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, missing node!\n", stream->jid, stream->address, stream->port);
-			}
-			break;
-		case IKS_NODE_NORMAL:
-			/* stanza */
-			if (node) {
-				const char *name = iks_name(node);
-				if (!strcmp("iq", name) || !strcmp("message", name)) {
-					on_stream_iq(stream, node);
-				} else if (!strcmp("presence", name)) {
-					on_stream_presence(stream, node);
-				} else if (!strcmp("auth", name)) {
-					on_stream_auth(stream, node);
-				} else if (!strcmp("starttls", name)) {
-					on_stream_starttls(stream, node);
-				} else if (!strcmp("db:result", name)) {
-					on_stream_dialback_result(stream, node);
-				} else if (!strcmp("db:verify", name)) {
-					on_stream_dialback_verify(stream, node);
-				} else {
-					/* unknown first-level element */
-					switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, unknown first-level element: %s\n", stream->jid, stream->address, stream->port, name);
-				}
-			}
-			break;
-		case IKS_NODE_ERROR:
-			/* <error> */
-			break;
-		case IKS_NODE_STOP:
-			on_stream_stop(stream);
-			break;
-	}
-
-	if (node) {
-		iks_delete(node);
-	}
-
-	return IKS_OK;
-}
-
-/**
- * Cleanup xmpp stream
- */
-static void xmpp_stream_destroy(struct xmpp_stream *stream)
-{
-	struct xmpp_stream_context *context = stream->context;
-	switch_memory_pool_t *pool = stream->pool;
-	stream->state = XSS_DESTROY;
-
-	/* remove from available streams */
-	switch_mutex_lock(context->streams_mutex);
-	if (stream->jid) {
-		switch_core_hash_delete(context->routes, stream->jid);
-	}
-	if (stream->id) {
-		switch_core_hash_delete(context->streams, stream->id);
-	}
-	switch_mutex_unlock(context->streams_mutex);
-
-	/* close connection */
-	if (stream->parser) {
-		iks_disconnect(stream->parser);
-		iks_parser_delete(stream->parser);
-	}
-
-	if (stream->socket) {
-		switch_socket_shutdown(stream->socket, SWITCH_SHUTDOWN_READWRITE);
-		switch_socket_close(stream->socket);
-	}
-
-	/* flush pending messages */
-	if (stream->msg_queue) {
-		char *msg;
-		while (switch_queue_trypop(stream->msg_queue, (void *)&msg) == SWITCH_STATUS_SUCCESS) {
-			iks_free(msg);
-		}
-	}
-
-	if (context->destroy_callback) {
-		context->destroy_callback(stream);
-	}
-
-	switch_core_destroy_memory_pool(&pool);
-}
-
-/**
- * @param stream the xmpp stream to check
- * @return 0 if stream is dead
- */
-static int xmpp_stream_ready(struct xmpp_stream *stream)
-{
-	return stream->state != XSS_ERROR && stream->state != XSS_DESTROY;
-}
-
-#define KEEP_ALIVE_INTERVAL_NS (60 * 1000 * 1000)
-
-/**
- * Thread that handles xmpp XML stream
- * @param thread this thread
- * @param obj the xmpp stream
- * @return NULL
- */
-static void *SWITCH_THREAD_FUNC xmpp_stream_thread(switch_thread_t *thread, void *obj)
-{
-	struct xmpp_stream *stream = (struct xmpp_stream *)obj;
-	struct xmpp_stream_context *context = stream->context;
-	int err_count = 0;
-	switch_time_t last_activity = 0;
-	int ping_id = 1;
-
-	if (stream->incoming) {
-		switch_thread_rwlock_rdlock(context->shutdown_rwlock);
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s:%i, New %s_%s stream\n", stream->address, stream->port, stream->s2s ? "s2s" : "c2s", stream->incoming ? "in" : "out");
-
-	if (stream->s2s && !stream->incoming) {
-		xmpp_send_outbound_server_header(stream);
-	}
-
-	while (xmpp_stream_ready(stream)) {
-		char *msg;
-		int result;
-		switch_time_t now = switch_micro_time_now();
-
-		/* read any messages from client */
-		stream->idle = 1;
-		result = iks_recv(stream->parser, 0);
-		switch (result) {
-		case IKS_OK:
-			err_count = 0;
-			break;
-		case IKS_NET_TLSFAIL:
-		case IKS_NET_RWERR:
-		case IKS_NET_NOCONN:
-		case IKS_NET_NOSOCK:
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, iks_recv() error = %s, ending session\n", stream->jid, stream->address, stream->port, iks_net_error_to_string(result));
-			stream->state = XSS_ERROR;
-			goto done;
-		default:
-			if (err_count++ == 0) {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, iks_recv() error = %s\n", stream->jid, stream->address, stream->port, iks_net_error_to_string(result));
-			}
-			if (err_count >= 50) {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, too many iks_recv() error = %s, ending session\n", stream->jid, stream->address, stream->port, iks_net_error_to_string(result));
-				stream->state = XSS_ERROR;
-				goto done;
-			}
-		}
-
-		/* send queued stanzas once stream is authorized for outbound stanzas */
-		if (!stream->s2s || stream->state == XSS_READY) {
-			while (switch_queue_trypop(stream->msg_queue, (void *)&msg) == SWITCH_STATUS_SUCCESS) {
-				if (!stream->s2s || !stream->incoming) {
-					iks_send_raw(stream->parser, msg);
-				} else {
-					/* TODO sent out wrong stream! */
-				}
-				iks_free(msg);
-				stream->idle = 0;
-			}
-		}
-
-		/* check for shutdown */
-		if (stream->state != XSS_DESTROY && context->shutdown && stream->state != XSS_SHUTDOWN) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_INFO, "%s, %s:%i, detected shutdown\n", stream->jid, stream->address, stream->port);
-			iks_send_raw(stream->parser, "</stream:stream>");
-			stream->state = XSS_SHUTDOWN;
-			stream->idle = 0;
-		}
-
-		if (stream->idle) {
-			int fdr = 0;
-
-			/* send keep-alive ping if idle for a long time */
-			if (stream->s2s && !stream->incoming && stream->state == XSS_READY && now - last_activity > KEEP_ALIVE_INTERVAL_NS) {
-				char *ping = switch_mprintf("<iq to=\"%s\" from=\"%s\" type=\"get\" id=\"internal-%d\"><ping xmlns=\""IKS_NS_XMPP_PING"\"/></iq>",
-					stream->jid, stream->context->domain, ping_id++);
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_DEBUG, "%s, %s:%i, keep alive\n", stream->jid, stream->address, stream->port);
-				last_activity = now;
-				iks_send_raw(stream->parser, ping);
-				free(ping);
-			}
-
-			switch_poll(stream->pollfd, 1, &fdr, 20000);
-		} else {
-			last_activity = now;
-			switch_os_yield();
-		}
-	}
-
-  done:
-
-	if (stream->incoming) {
-		xmpp_stream_destroy(stream);
-		switch_thread_rwlock_unlock(context->shutdown_rwlock);
-	}
-
-	return NULL;
-}
-
-/**
- * Initialize the xmpp stream
- * @param context the stream context
- * @param stream the stream to initialize
- * @param pool for this stream
- * @param address remote address
- * @param port remote port
- * @param s2s true if a server-to-server stream
- * @param incoming true if incoming stream
- * @return the stream
- */
-static struct xmpp_stream *xmpp_stream_init(struct xmpp_stream_context *context, struct xmpp_stream *stream, switch_memory_pool_t *pool, const char *address, int port, int s2s, int incoming)
-{
-	stream->context = context;
-	stream->pool = pool;
-	if (incoming) {
-		xmpp_stream_new_id(stream);
-	}
-	switch_mutex_init(&stream->mutex, SWITCH_MUTEX_NESTED, pool);
-	if (!zstr(address)) {
-		stream->address = switch_core_strdup(pool, address);
-	}
-	if (port > 0) {
-		stream->port = port;
-	}
-	stream->s2s = s2s;
-	stream->incoming = incoming;
-	switch_queue_create(&stream->msg_queue, MAX_QUEUE_LEN, pool);
-
-	/* set up XMPP stream parser */
-	stream->parser = iks_stream_new(stream->s2s ? IKS_NS_SERVER : IKS_NS_CLIENT, stream, on_stream);
-
-	/* enable logging of XMPP stream */
-	iks_set_log_hook(stream->parser, on_stream_log);
-
-	return stream;
-}
-
-/**
- * Create a new xmpp stream
- * @param context the stream context
- * @param pool the memory pool for this stream
- * @param address remote address
- * @param port remote port
- * @param s2s true if server-to-server stream
- * @param incoming true if incoming stream
- * @return the new stream or NULL
- */
-static struct xmpp_stream *xmpp_stream_create(struct xmpp_stream_context *context, switch_memory_pool_t *pool, const char *address, int port, int s2s, int incoming)
-{
-	struct xmpp_stream *stream = NULL;
-	if (!(stream = switch_core_alloc(pool, sizeof(*stream)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n");
-		return NULL;
-	}
-	return xmpp_stream_init(context, stream, pool, address, port, s2s, incoming);
-}
-
-/**
- * Thread that handles XMPP XML stream
- * @param thread this thread
- * @param obj the XMPP stream
- * @return NULL
- */
-static void *SWITCH_THREAD_FUNC xmpp_outbound_stream_thread(switch_thread_t *thread, void *obj)
-{
-	struct xmpp_stream *stream = (struct xmpp_stream *)obj;
-	struct xmpp_stream_context *context = stream->context;
-	switch_socket_t *socket;
-	int warned = 0;
-
-	switch_thread_rwlock_rdlock(context->shutdown_rwlock);
-
-	/* connect to server */
-	while (!context->shutdown) {
-		struct xmpp_stream *new_stream = NULL;
-		switch_memory_pool_t *pool;
-		switch_sockaddr_t *sa;
-
-		if (switch_sockaddr_info_get(&sa, stream->address, SWITCH_UNSPEC, stream->port, 0, stream->pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s:%i, failed to get sockaddr info!\n", stream->address, stream->port);
-			goto fail;
-		}
-
-		if (switch_socket_create(&socket, switch_sockaddr_get_family(sa), SOCK_STREAM, SWITCH_PROTO_TCP, stream->pool) != SWITCH_STATUS_SUCCESS) {
-			if (!warned) {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_ERROR, "%s:%i, failed to create socket!\n", stream->address, stream->port);
-			}
-			goto sock_fail;
-		}
-
-		switch_socket_opt_set(socket, SWITCH_SO_KEEPALIVE, 1);
-		switch_socket_opt_set(socket, SWITCH_SO_TCP_NODELAY, 1);
-
-		if (switch_socket_connect(socket, sa) != SWITCH_STATUS_SUCCESS) {
-			if (!warned) {
-				switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_ERROR, "%s:%i, Socket Error!\n", stream->address, stream->port);
-			}
-			goto sock_fail;
-		}
-
-		if (warned) {
-			switch_log_printf(SWITCH_CHANNEL_UUID_LOG(stream->id), SWITCH_LOG_ERROR, "%s:%i, connected!\n", stream->address, stream->port);
-			warned = 0;
-		}
-
-		/* run the stream thread */
-		xmpp_stream_set_socket(stream, socket);
-		xmpp_stream_thread(thread, stream);
-
-		/* re-establish connection if not shutdown */
-		if (!context->shutdown) {
-			/* create new stream for reconnection */
-			switch_core_new_memory_pool(&pool);
-			new_stream = xmpp_stream_create(stream->context, pool, stream->address, stream->port, 1, 0);
-			new_stream->jid = switch_core_strdup(pool, stream->jid);
-			xmpp_stream_destroy(stream);
-			stream = new_stream;
-
-			switch_yield(1000 * 1000); /* 1000 ms */
-			continue;
-		}
-		break;
-
-   sock_fail:
-		if (socket) {
-			switch_socket_close(socket);
-			socket = NULL;
-		}
-		if (!warned) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error! Could not connect to %s:%i\n", stream->address, stream->port);
-			warned = 1;
-		}
-		switch_yield(1000 * 1000); /* 1000 ms */
-	}
-
-  fail:
-
-	xmpp_stream_destroy(stream);
-
-	switch_thread_rwlock_unlock(context->shutdown_rwlock);
-	return NULL;
-}
-
-/**
- * Set the id for this stream
- * @param stream
- * @param id
- */
-static void xmpp_stream_set_id(struct xmpp_stream *stream, const char *id)
-{
-	struct xmpp_stream_context *context = stream->context;
-	if (!zstr(stream->id)) {
-		switch_mutex_lock(context->streams_mutex);
-		switch_core_hash_delete(context->streams, stream->id);
-		switch_mutex_unlock(context->streams_mutex);
-	}
-	if (!zstr(id)) {
-		stream->id = switch_core_strdup(stream->pool, id);
-		switch_mutex_lock(context->streams_mutex);
-		switch_core_hash_insert(context->streams, stream->id, stream);
-		switch_mutex_unlock(context->streams_mutex);
-	} else {
-		stream->id = NULL;
-	}
-}
-
-/**
- * Destroy the listener
- * @param server the server
- */
-static void xmpp_listener_destroy(struct xmpp_listener *listener)
-{
-	switch_memory_pool_t *pool = listener->pool;
-
-	/* shutdown socket */
-	if (listener->socket) {
-		switch_socket_shutdown(listener->socket, SWITCH_SHUTDOWN_READWRITE);
-		switch_socket_close(listener->socket);
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "xmpp listener %s:%u closed\n", listener->addr, listener->port);
-	switch_core_destroy_memory_pool(&pool);
-}
-
-/**
- * Open a new XMPP stream with a peer server
- * @param peer_domain of server - if not set, address is used
- * @param peer_address of server - if not set, domain is used
- * @param peer_port of server - if not set default port is used
- */
-switch_status_t xmpp_stream_context_connect(struct xmpp_stream_context *context, const char *peer_domain, const char *peer_address, int peer_port)
-{
-	struct xmpp_stream *stream;
-	switch_memory_pool_t *pool;
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-
-	if (peer_port <= 0) {
-		peer_port = IKS_JABBER_SERVER_PORT;
-	}
-
-	if (zstr(peer_address)) {
-		peer_address = peer_domain;
-	} else if (zstr(peer_domain)) {
-		peer_domain = peer_address;
-	}
-
-	/* start outbound stream thread */
-	switch_core_new_memory_pool(&pool);
-	stream = xmpp_stream_create(context, pool, peer_address, peer_port, 1, 0);
-	stream->jid = switch_core_strdup(pool, peer_domain);
-	switch_threadattr_create(&thd_attr, pool);
-			switch_threadattr_detach_set(thd_attr, 1);
-			switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-			switch_thread_create(&thread, thd_attr, xmpp_outbound_stream_thread, stream, pool);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Thread that listens for new XMPP connections
- * @param thread this thread
- * @param obj the listener
- * @return NULL
- */
-static void *SWITCH_THREAD_FUNC xmpp_listener_thread(switch_thread_t *thread, void *obj)
-{
-	struct xmpp_listener *listener = (struct xmpp_listener *)obj;
-	struct xmpp_stream_context *context = listener->context;
-	switch_memory_pool_t *pool = NULL;
-	uint32_t errs = 0;
-	int warned = 0;
-
-	switch_thread_rwlock_rdlock(context->shutdown_rwlock);
-
-	/* bind to XMPP port */
-	while (!context->shutdown) {
-		switch_status_t rv;
-		switch_sockaddr_t *sa;
-		rv = switch_sockaddr_info_get(&sa, listener->addr, SWITCH_UNSPEC, listener->port, 0, listener->pool);
-		if (rv)
-			goto fail;
-		rv = switch_socket_create(&listener->socket, switch_sockaddr_get_family(sa), SOCK_STREAM, SWITCH_PROTO_TCP, listener->pool);
-		if (rv)
-			goto sock_fail;
-		rv = switch_socket_opt_set(listener->socket, SWITCH_SO_REUSEADDR, 1);
-		if (rv)
-			goto sock_fail;
-#ifdef WIN32
-		/* Enable dual-stack listening on Windows (if the listening address is IPv6), it's default on Linux */
-		if (switch_sockaddr_get_family(sa) == AF_INET6) {
-			rv = switch_socket_opt_set(listener->socket, SWITCH_SO_IPV6_V6ONLY, 0);
-			if (rv) goto sock_fail;
-		}
-#endif
-		rv = switch_socket_bind(listener->socket, sa);
-		if (rv)
-			goto sock_fail;
-		rv = switch_socket_listen(listener->socket, 5);
-		if (rv)
-			goto sock_fail;
-
-		rv = switch_socket_create_pollset(&listener->read_pollfd, listener->socket, SWITCH_POLLIN | SWITCH_POLLERR, listener->pool);
-		if (rv) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Create pollset for %s listener socket %s:%u error!\n", listener->s2s ? "s2s" : "c2s", listener->addr, listener->port);
-			goto sock_fail;
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "xmpp %s listener bound to %s:%u\n", listener->s2s ? "s2s" : "c2s", listener->addr, listener->port);
-
-		break;
-   sock_fail:
-		if (listener->socket) {
-			switch_socket_close(listener->socket);
-			listener->socket = NULL;
-		}
-		if (!warned) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error! xmpp %s listener could not bind to %s:%u\n", listener->s2s ? "s2s" : "c2s", listener->addr, listener->port);
-			warned = 1;
-		}
-		switch_yield(1000 * 100); /* 100 ms */
-	}
-
-	/* Listen for XMPP client connections */
-	while (!context->shutdown) {
-		switch_socket_t *socket = NULL;
-		switch_status_t rv;
-		int32_t fdr;
-
-		if (pool == NULL && switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create memory pool for new client connection!\n");
-			goto fail;
-		}
-
-		/* is there a new connection? */
-		rv = switch_poll(listener->read_pollfd, 1, &fdr, 1000 * 1000 /* 1000 ms */);
-		if (rv != SWITCH_STATUS_SUCCESS) {
-			continue;
-		}
-
-		/* accept the connection */
-		if (switch_socket_accept(&socket, listener->socket, pool)) {
-			if (context->shutdown) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Shutting down xmpp listener\n");
-				goto end;
-			} else {
-				/* I wish we could use strerror_r here but its not defined everywhere =/ */
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Accept connection error [%s]\n", strerror(errno));
-				if (++errs > 100) {
-					goto end;
-				}
-			}
-		} else { /* got a new connection */
-			switch_thread_t *thread;
-			switch_threadattr_t *thd_attr = NULL;
-			struct xmpp_stream *stream;
-			switch_sockaddr_t *sa = NULL;
-			char remote_ip[50] = { 0 };
-			int remote_port = 0;
-
-			errs = 0;
-
-			/* get remote address and port */
-			if (switch_socket_addr_get(&sa, SWITCH_TRUE, socket) == SWITCH_STATUS_SUCCESS && sa) {
-				switch_get_addr(remote_ip, sizeof(remote_ip), sa);
-				remote_port = switch_sockaddr_get_port(sa);
-			}
-
-			if (zstr_buf(remote_ip)) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to get IP of incoming connection.\n");
-				switch_socket_shutdown(socket, SWITCH_SHUTDOWN_READWRITE);
-				switch_socket_close(socket);
-				continue;
-			}
-
-			/* check if connection is allowed */
-			if (listener->acl) {
-				if (!switch_check_network_list_ip(remote_ip, listener->acl)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ACL %s denies access to %s.\n", listener->acl, remote_ip);
-					switch_socket_shutdown(socket, SWITCH_SHUTDOWN_READWRITE);
-					switch_socket_close(socket);
-					continue;
-				}
-			}
-
-			/* start connection thread */
-			if (!(stream = xmpp_stream_create(context, pool, remote_ip, remote_port, listener->s2s, 1))) {
-				switch_socket_shutdown(socket, SWITCH_SHUTDOWN_READWRITE);
-				switch_socket_close(socket);
-				break;
-			}
-			xmpp_stream_set_socket(stream, socket);
-			pool = NULL; /* connection now owns the pool */
-			switch_threadattr_create(&thd_attr, stream->pool);
-			switch_threadattr_detach_set(thd_attr, 1);
-			switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-			switch_thread_create(&thread, thd_attr, xmpp_stream_thread, stream, stream->pool);
-		}
-	}
-
-  end:
-
-	if (pool) {
-		switch_core_destroy_memory_pool(&pool);
-	}
-
-  fail:
-
-	xmpp_listener_destroy(listener);
-
-	switch_thread_rwlock_unlock(context->shutdown_rwlock);
-	return NULL;
-}
-
-/**
- * Add a new socket to listen for XMPP client/server connections.
- * @param context the XMPP context
- * @param addr the IP address
- * @param port the port
- * @param is_s2s true if s2s
- * @param acl name of optional access control list
- * @return SWITCH_STATUS_SUCCESS if successful
- */
-switch_status_t xmpp_stream_context_listen(struct xmpp_stream_context *context, const char *addr, int port, int is_s2s, const char *acl)
-{
-	switch_memory_pool_t *pool;
-	struct xmpp_listener *new_listener = NULL;
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-
-	if (zstr(addr)) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_core_new_memory_pool(&pool);
-	new_listener = switch_core_alloc(pool, sizeof(*new_listener));
-	new_listener->pool = pool;
-	new_listener->addr = switch_core_strdup(pool, addr);
-	if (!zstr(acl)) {
-		new_listener->acl = switch_core_strdup(pool, acl);
-	}
-
-	new_listener->s2s = is_s2s;
-	if (port <= 0) {
-		new_listener->port = is_s2s ? IKS_JABBER_SERVER_PORT : IKS_JABBER_PORT;
-	} else {
-		new_listener->port = port;
-	}
-	new_listener->context = context;
-
-	/* start the server thread */
-	switch_threadattr_create(&thd_attr, pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&thread, thd_attr, xmpp_listener_thread, new_listener, pool);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Queue a message for delivery
- */
-void xmpp_stream_context_send(struct xmpp_stream_context *context, const char *jid, iks *msg)
-{
-	if (!zstr(jid)) {
-		if (msg) {
-			struct xmpp_stream *stream;
-			switch_mutex_lock(context->streams_mutex);
-			stream = switch_core_hash_find(context->routes, jid);
-			if (stream) {
-				char *raw = iks_string(NULL, msg);
-				if (switch_queue_trypush(stream->msg_queue, raw) != SWITCH_STATUS_SUCCESS) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s, %s:%i, failed to deliver outbound message via %s!\n", stream->jid, stream->address, stream->port, jid);
-					iks_free(raw);
-				}
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s stream is gone\n", jid);
-				/* TODO automatically open connection if valid domain JID? */
-			}
-			switch_mutex_unlock(context->streams_mutex);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "missing message\n");
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "missing stream JID\n");
-	}
-}
-
-/**
- * Dump xmpp stream stats
- */
-void xmpp_stream_context_dump(struct xmpp_stream_context *context, switch_stream_handle_t *stream)
-{
-	switch_hash_index_t *hi;
-	switch_mutex_lock(context->streams_mutex);
-	stream->write_function(stream, "\nACTIVE STREAMS\n");
-	for (hi = switch_core_hash_first(context->streams); hi; hi = switch_core_hash_next(&hi)) {
-		struct xmpp_stream *s = NULL;
-		const void *key;
-		void *val;
-		switch_core_hash_this(hi, &key, NULL, &val);
-		s = (struct xmpp_stream *)val;
-		switch_assert(s);
-		stream->write_function(stream, "        TYPE='%s_%s',ID='%s',JID='%s',REMOTE_ADDRESS='%s',REMOTE_PORT=%i,STATE='%s'\n", s->s2s ? "s2s" : "c2s", s->incoming ? "in" : "out", s->id, s->jid, s->address, s->port, xmpp_stream_state_to_string(s->state));
-	}
-	switch_mutex_unlock(context->streams_mutex);
-}
-
-/**
- * Create a new XMPP stream context
- * @param domain for new streams
- * @param domain_secret domain shared secret for server dialback
- * @param bind_cb callback function when a resource is bound to a new stream
- * @param ready callback function when new stream is ready
- * @param recv callback function when a new stanza is received
- * @param destroy callback function when a stream is destroyed
- * @return the context
- */
-struct xmpp_stream_context *xmpp_stream_context_create(const char *domain, const char *domain_secret, xmpp_stream_bind_callback bind_cb, xmpp_stream_ready_callback ready, xmpp_stream_recv_callback recv, xmpp_stream_destroy_callback destroy)
-{
-	switch_memory_pool_t *pool;
-	struct xmpp_stream_context *context;
-
-	switch_core_new_memory_pool(&pool);
-	context = switch_core_alloc(pool, sizeof(*context));
-	context->pool = pool;
-	switch_mutex_init(&context->streams_mutex, SWITCH_MUTEX_NESTED, context->pool);
-	switch_core_hash_init(&context->routes);
-	switch_core_hash_init(&context->streams);
-	context->dialback_secret = switch_core_strdup(context->pool, domain_secret);
-	context->bind_callback = bind_cb;
-	context->ready_callback = ready;
-	context->destroy_callback = destroy;
-	context->recv_callback = recv;
-	context->shutdown = 0;
-	context->domain = switch_core_strdup(context->pool, domain);
-	switch_thread_rwlock_create(&context->shutdown_rwlock, context->pool);
-	switch_core_hash_init(&context->users);
-
-	return context;
-}
-
-/**
- * Add an authorized user
- * @param context the context to add user to
- * @param user the username
- * @param password the password
- */
-void xmpp_stream_context_add_user(struct xmpp_stream_context *context, const char *user, const char *password)
-{
-	switch_core_hash_insert(context->users, user, switch_core_strdup(context->pool, password));
-}
-
-/**
- * Destroy an XMPP stream context.  All open streams are closed.
- * @param context to destroy
- */
-void xmpp_stream_context_destroy(struct xmpp_stream_context *context)
-{
-	switch_memory_pool_t *pool;
-	context->shutdown = 1;
-	/* wait for threads to finish */
-	switch_thread_rwlock_wrlock(context->shutdown_rwlock);
-	switch_core_hash_destroy(&context->routes);
-	switch_core_hash_destroy(&context->streams);
-	switch_core_hash_destroy(&context->users);
-	pool = context->pool;
-	switch_core_destroy_memory_pool(&pool);
-}
-
-/**
- * @param stream
- * @return true if server-to-server stream
- */
-int xmpp_stream_is_s2s(struct xmpp_stream *stream)
-{
-	return stream->s2s;
-}
-
-/**
- * @param stream
- * @return true if incoming stream
- */
-int xmpp_stream_is_incoming(struct xmpp_stream *stream)
-{
-	return stream->incoming;
-}
-
-/**
- * @param stream
- * @return the stream JID
- */
-const char *xmpp_stream_get_jid(struct xmpp_stream *stream)
-{
-	return stream->jid;
-}
-
-/**
- * Set private data for this stream
- */
-void xmpp_stream_set_private(struct xmpp_stream *stream, void *user_private)
-{
-	stream->user_private = user_private;
-}
-
-/**
- * Get private data for this stream
- */
-void *xmpp_stream_get_private(struct xmpp_stream *stream)
-{
-	return stream->user_private;
-}
-
-/**
- * Add PEM cert file to stream for new SSL connections
- */
-void xmpp_stream_context_add_cert(struct xmpp_stream_context *context, const char *cert_pem_file)
-{
-	context->cert_pem_file = switch_core_strdup(context->pool, cert_pem_file);
-}
-
-/**
- * Add PEM key file to stream for new SSL connections
- */
-void xmpp_stream_context_add_key(struct xmpp_stream_context *context, const char *key_pem_file)
-{
-	context->key_pem_file = switch_core_strdup(context->pool, key_pem_file);
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/event_handlers/mod_rayo/xmpp_streams.h b/src/mod/event_handlers/mod_rayo/xmpp_streams.h
deleted file mode 100644
index b7ee04383b..0000000000
--- a/src/mod/event_handlers/mod_rayo/xmpp_streams.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2018, Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * xmpp_streams.h -- XMPP in/out s2s and in c2s streams
- *
- */
-#ifndef XMPP_STREAMS_H
-#define XMPP_STREAMS_H
-
-struct xmpp_stream;
-struct xmpp_stream_context;
-
-typedef int (* xmpp_stream_bind_callback)(struct xmpp_stream *stream);
-typedef int (* xmpp_stream_ready_callback)(struct xmpp_stream *stream);
-typedef void (* xmpp_stream_recv_callback)(struct xmpp_stream *stream, iks *stanza);
-typedef void (* xmpp_stream_destroy_callback)(struct xmpp_stream *stream);
-
-SWITCH_DECLARE(struct xmpp_stream_context *) xmpp_stream_context_create(const char *domain, const char *domain_secret, xmpp_stream_bind_callback bind_cb, xmpp_stream_ready_callback ready, xmpp_stream_recv_callback recv, xmpp_stream_destroy_callback destroy);
-SWITCH_DECLARE(void) xmpp_stream_context_add_cert(struct xmpp_stream_context *context, const char *cert_pem_file);
-SWITCH_DECLARE(void) xmpp_stream_context_add_key(struct xmpp_stream_context *context, const char *key_pem_file);
-SWITCH_DECLARE(void) xmpp_stream_context_add_user(struct xmpp_stream_context *context, const char *user, const char *password);
-SWITCH_DECLARE(void) xmpp_stream_context_dump(struct xmpp_stream_context *context, switch_stream_handle_t *stream);
-SWITCH_DECLARE(void) xmpp_stream_context_destroy(struct xmpp_stream_context *context);
-SWITCH_DECLARE(void) xmpp_stream_context_send(struct xmpp_stream_context *context, const char *jid, iks *stanza);
-
-SWITCH_DECLARE(switch_status_t) xmpp_stream_context_listen(struct xmpp_stream_context *context, const char *addr, int port, int is_s2s, const char *acl);
-SWITCH_DECLARE(switch_status_t) xmpp_stream_context_connect(struct xmpp_stream_context *context, const char *peer_domain, const char *peer_address, int peer_port);
-
-SWITCH_DECLARE(int) xmpp_stream_is_s2s(struct xmpp_stream *stream);
-SWITCH_DECLARE(int) xmpp_stream_is_incoming(struct xmpp_stream *stream);
-SWITCH_DECLARE(const char *) xmpp_stream_get_jid(struct xmpp_stream *stream);
-SWITCH_DECLARE(void) xmpp_stream_set_private(struct xmpp_stream *stream, void *user_private);
-SWITCH_DECLARE(void *) xmpp_stream_get_private(struct xmpp_stream *stream);
-
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/src/mod/formats/mod_opusfile/mod_opusfile.c b/src/mod/formats/mod_opusfile/mod_opusfile.c
index 1560142263..a065108f5c 100644
--- a/src/mod/formats/mod_opusfile/mod_opusfile.c
+++ b/src/mod/formats/mod_opusfile/mod_opusfile.c
@@ -654,6 +654,7 @@ static switch_status_t switch_opusstream_stream_decode(opus_stream_context_t *co
 					}
 					switch_goto_status(SWITCH_STATUS_SUCCESS, end);
 				}
+				break;
 			case OP_EREAD:	/*An underlying read operation failed. This may signal a truncation attack from an <https:> source.*/
 			
 			case OP_EFAULT: /*	An internal memory allocation failed. */
diff --git a/src/mod/formats/mod_png/mod_png.c b/src/mod/formats/mod_png/mod_png.c
index 36e38e9c83..fbbe6aaf20 100644
--- a/src/mod/formats/mod_png/mod_png.c
+++ b/src/mod/formats/mod_png/mod_png.c
@@ -215,7 +215,7 @@ static switch_status_t png_file_read_video(switch_file_handle_t *handle, switch_
 		switch_goto_status(SWITCH_STATUS_FALSE, end);
 	}
 
-	if ((flags && SVR_BLOCK)) {
+	if ((flags & SVR_BLOCK)) {
 		switch_yield(33000);
 		have_frame = 1;
 	} else if ((context->reads++ % 20) == 0) {
diff --git a/src/mod/formats/mod_portaudio_stream/Makefile.am b/src/mod/formats/mod_portaudio_stream/Makefile.am
deleted file mode 100644
index 207a1b792f..0000000000
--- a/src/mod/formats/mod_portaudio_stream/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_portaudio_stream
-MODPA_DIR=$(switch_srcdir)/src/mod/endpoints/mod_portaudio
-
-if HAVE_PORTAUDIO
-mod_LTLIBRARIES = mod_portaudio_stream.la
-mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c ../../endpoints/mod_portaudio/pablio.c ../../endpoints/mod_portaudio/pa_ringbuffer.c
-mod_portaudio_stream_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_stream_la_CPPFLAGS = -I. -I$(MODPA_DIR) $(PORTAUDIO_CFLAGS) $(AM_CPPFLAGS)
-mod_portaudio_stream_la_LIBADD = $(PORTAUDIO_LIBS) $(switch_builddir)/libfreeswitch.la
-mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared
-if ISMAC
-mod_portaudio_stream_la_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
-endif
-else
-install: error
-all: error
-error:
-	$(error You must install portaudio19-dev to build $(MODNAME))
-endif
diff --git a/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c b/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c
deleted file mode 100644
index e0878a0fe7..0000000000
--- a/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c
+++ /dev/null
@@ -1,615 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * mod_portaudio_stream.c -- Portaudio Streaming interface Audio
- *
- */
-#include "switch.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include "pablio.h"
-
-#define DEFAULT_PREBUFFER_SIZE 1024 * 64
-#define SAMPLE_TYPE  paInt16
-#define PREFERRED_RATE  8000
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_stream_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_portaudio_stream_shutdown);
-SWITCH_MODULE_DEFINITION(mod_portaudio_stream, mod_portaudio_stream_load, mod_portaudio_stream_shutdown, NULL);
-static switch_memory_pool_t *module_pool = NULL;
-
-struct portaudio_stream_source;
-
-static struct {
-	int running;
-	int threads;
-	switch_mutex_t *mutex;
-	switch_hash_t *source_hash;
-
-} globals;
-
-
-struct portaudio_stream_context {
-	struct portaudio_stream_source *source;
-	switch_mutex_t *audio_mutex;
-	switch_buffer_t *audio_buffer;
-	int err;
-	const char *func;
-	const char *file;
-	int line;
-	switch_file_handle_t *handle;
-	struct portaudio_stream_context *next;
-};
-
-typedef struct portaudio_stream_context portaudio_stream_context_t;
-
-struct portaudio_stream_source {
-	char *sourcename;
-	int sourcedev;
-	int rate;
-	int interval;
-	char *timer_name;
-	int total;
-	int ready;
-	int stopped;
-	uint8_t channels;
-	switch_size_t samples;
-	uint32_t prebuf;
-	portaudio_stream_context_t *context_list;
-	switch_mutex_t *mutex;
-	switch_memory_pool_t *pool;
-	switch_thread_rwlock_t *rwlock;
-	PABLIO_Stream *audio_stream;
-	switch_frame_t read_frame;
-	switch_timer_t timer;
-	switch_codec_t read_codec;
-	switch_codec_t write_codec;
-	switch_mutex_t *device_lock;
-	unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-};
-
-typedef struct portaudio_stream_source portaudio_stream_source_t;
-
-
-
-static int get_dev_by_number(char *numstr, int in)
-{
-	int numDevices = Pa_GetDeviceCount();
-	const PaDeviceInfo *pdi;
-	char *end_ptr;
-	int number;
-
-	number = (int) strtol(numstr, &end_ptr, 10);
-
-	if (end_ptr == numstr || number < 0) {
-		return -1;
-	}
-
-	if (number > -1 && number < numDevices && (pdi = Pa_GetDeviceInfo(number))) {
-		if (in && pdi->maxInputChannels) {
-			return number;
-		} else if (!in && pdi->maxOutputChannels) {
-			return number;
-		}
-	}
-
-	return -1;
-}
-
-static int get_dev_by_name(char *name, int in)
-{
-	int i;
-	int numDevices;
-	const PaDeviceInfo *pdi;
-	numDevices = Pa_GetDeviceCount();
-
-	if (numDevices < 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices);
-		return -2;
-	}
-
-	for (i = 0; i < numDevices; i++) {
-		int match = 0;
-		pdi = Pa_GetDeviceInfo(i);
-
-		if (zstr(name)) {
-			match = 1;
-		} else if (pdi && pdi->name && strstr(pdi->name, name)) {
-			match = 1;
-		}
-
-		if (match) {
-			if (in && pdi->maxInputChannels) {
-				return i;
-			} else if (!in && pdi->maxOutputChannels) {
-				return i;
-			}
-		}
-	}
-
-	return -1;
-}
-
-static switch_status_t engage_device(portaudio_stream_source_t *source, int restart)
-{
-	PaStreamParameters inputParameters, outputParameters;
-	PaError err;
-	int sample_rate = source->rate;
-	int codec_ms = source->interval;
-
-	switch_mutex_init(&source->device_lock, SWITCH_MUTEX_NESTED, module_pool);
-
-	if (source->timer.timer_interface) {
-		switch_core_timer_sync(&source->timer);
-	}
-
-	if (source->audio_stream) {
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (!switch_core_codec_ready(&source->read_codec)) {
-		if (switch_core_codec_init(&source->read_codec,
-								   "L16",
-								   NULL, NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
-								   NULL) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-	switch_assert(source->read_codec.implementation);
-
-	if (!switch_core_codec_ready(&source->write_codec)) {
-		if (switch_core_codec_init(&source->write_codec,
-								   "L16",
-								   NULL, NULL,
-								   sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-			switch_core_codec_destroy(&source->read_codec);
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-
-	if (!source->timer.timer_interface) {
-		if (switch_core_timer_init(&source->timer,
-								   source->timer_name, codec_ms, source->read_codec.implementation->samples_per_packet,
-								   module_pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
-			switch_core_codec_destroy(&source->read_codec);
-			switch_core_codec_destroy(&source->write_codec);
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-	source->read_frame.rate = sample_rate;
-	source->read_frame.codec = &source->read_codec;
-
-	switch_mutex_lock(source->device_lock);
-	/* LOCKED ************************************************************************************************** */
-	inputParameters.device = source->sourcedev;
-	inputParameters.channelCount = 1;
-	inputParameters.sampleFormat = SAMPLE_TYPE;
-	inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency;
-	inputParameters.hostApiSpecificStreamInfo = NULL;
-	outputParameters.device = source->sourcedev;
-	outputParameters.channelCount = 1;
-	outputParameters.sampleFormat = SAMPLE_TYPE;
-	outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
-	outputParameters.hostApiSpecificStreamInfo = NULL;
-
-
-	err = OpenAudioStream(&source->audio_stream, &inputParameters, NULL, sample_rate, paClipOff, source->read_codec.implementation->samples_per_packet, 0);
-	/* UNLOCKED ************************************************************************************************* */
-	if (err != paNoError) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening audio device retrying\n");
-		switch_yield(1000000);
-		err = OpenAudioStream(&source->audio_stream, &inputParameters, &outputParameters, sample_rate, paClipOff,
-							  source->read_codec.implementation->samples_per_packet, 0);
-	}
-
-	switch_mutex_unlock(source->device_lock);
-	if (err != paNoError) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device\n");
-		switch_core_codec_destroy(&source->read_codec);
-		switch_core_timer_destroy(&source->timer);
-		return SWITCH_STATUS_FALSE;
-	}
-
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void *obj)
-{
-	portaudio_stream_source_t *source = obj;
-	portaudio_stream_context_t *cp;
-	int samples;
-	int bused, bytesToWrite;
-
-
-	switch_mutex_lock(globals.mutex);
-	globals.threads++;
-	switch_mutex_unlock(globals.mutex);
-
-	if (!source->prebuf) {
-		source->prebuf = DEFAULT_PREBUFFER_SIZE;
-	}
-
-
-
-	switch_mutex_lock(globals.mutex);
-	switch_core_hash_insert(globals.source_hash, source->sourcename, source);
-	switch_mutex_unlock(globals.mutex);
-
-
-	switch_thread_rwlock_create(&source->rwlock, source->pool);
-
-	if (engage_device(source, 0) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, " Dev %d cant be engaged !\n", (int) source->sourcedev);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, " Dev %d engaged at %d rate!\n", (int) source->sourcedev, (int) source->rate);
-		if (globals.running && !source->stopped) {
-			source->ready = 1;
-
-			if (!source->audio_stream) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Audio Stream wops!\n");
-				source->stopped = 0;
-				source->ready = 0;
-			} else {
-				while (globals.running && !source->stopped) {
-					switch_mutex_lock(source->device_lock);
-					samples = ReadAudioStream(source->audio_stream, source->databuf,
-								  source->read_codec.implementation->samples_per_packet, 0, &source->timer);
-					switch_mutex_unlock(source->device_lock);
-
-
-					if (samples) {
-						bytesToWrite = source->samples;
-						if (samples < bytesToWrite) {
-							bytesToWrite = samples;
-						}
-						bytesToWrite *= source->audio_stream->bytesPerFrame;
-
-						if (source->total) {
-
-							switch_mutex_lock(source->mutex);
-							for (cp = source->context_list; cp; cp = cp->next) {
-
-								switch_mutex_lock(cp->audio_mutex);
-
-								bused = switch_buffer_inuse(cp->audio_buffer);
-								if (bused > source->samples * 768) {
-									switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Leaking stream handle! [%s() %s:%d] %d used %d max\n",
-													  cp->func, cp->file, cp->line, (int) bused, (int) (source->samples * 768));
-									switch_buffer_zero(cp->audio_buffer);
-								} else {
-									switch_buffer_write(cp->audio_buffer, source->databuf, bytesToWrite);
-								}
-
-								switch_mutex_unlock(cp->audio_mutex);
-							}
-							switch_mutex_unlock(source->mutex);
-						}
-
-					}
-
-				}
-			}
-
-		}
-	}
-
-
-	source->ready = 0;
-
-	switch_mutex_lock(globals.mutex);
-	switch_core_hash_delete(globals.source_hash, source->sourcename);
-	switch_mutex_unlock(globals.mutex);
-
-	switch_thread_rwlock_wrlock(source->rwlock);
-	switch_thread_rwlock_unlock(source->rwlock);
-
-
-	switch_mutex_lock(source->device_lock);
-	CloseAudioStream(source->audio_stream);
-	if (switch_core_codec_ready(&source->read_codec)) {
-		switch_core_codec_destroy(&source->read_codec);
-		switch_core_codec_destroy(&source->write_codec);
-	}
-	if (switch_core_codec_ready(&source->write_codec)) {
-		switch_core_codec_destroy(&source->write_codec);
-	}
-	switch_mutex_unlock(source->device_lock);
-
-
-	switch_core_destroy_memory_pool(&source->pool);
-
-	switch_mutex_lock(globals.mutex);
-	globals.threads--;
-	switch_mutex_unlock(globals.mutex);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, " thread ending succesfully !\n");
-	switch_thread_exit(thread, SWITCH_STATUS_SUCCESS);
-
-	return NULL;
-}
-
-
-static switch_status_t portaudio_stream_file_open(switch_file_handle_t *handle, const char *path)
-{
-	portaudio_stream_context_t *context;
-	portaudio_stream_source_t *source;
-	switch_memory_pool_t *pool;
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	uint32_t rate = PREFERRED_RATE;
-	char *npath;
-	int devNumber;
-	int tmp;
-
-	handle->pre_buffer_datalen = 0;
-
-	if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This format does not support writing! (yet)\n");
-		return status;
-	}
-
-	npath = switch_core_strdup(module_pool, path);
-
-	tmp = handle->samplerate;
-	if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 48000) {
-		rate = tmp;
-	}
-
-	if (*path == '#') {
-		devNumber = get_dev_by_number(npath + 1, 1);
-	} else {
-		devNumber = get_dev_by_name(npath, 1);
-	}
-	npath = switch_mprintf("device-%d at %d", devNumber, rate);
-
-	switch_mutex_lock(globals.mutex);
-	source = switch_core_hash_find(globals.source_hash, npath);
-
-	/* dev isnt there, try to start thread */
-	if (!source) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, " source isnt Created, create and start thread!\n");
-
-		if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, " :S no pool\n");
-		} else {
-			source = switch_core_alloc(pool, sizeof(*source));
-			if (source != NULL) {
-				source->pool = pool;
-				source->sourcedev = devNumber;
-				source->sourcename = switch_core_strdup(source->pool, npath);
-				source->rate = rate;
-				source->interval = 20;
-				source->channels = 1;
-				source->timer_name = "soft";
-				source->prebuf = DEFAULT_PREBUFFER_SIZE;
-				source->stopped = 0;
-				source->ready = 0;
-				source->samples = switch_samples_per_packet(source->rate, source->interval);
-
-				switch_mutex_init(&source->mutex, SWITCH_MUTEX_NESTED, source->pool);
-
-				switch_threadattr_create(&thd_attr, source->pool);
-				switch_threadattr_detach_set(thd_attr, 1);
-
-				switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-				switch_thread_create(&thread, thd_attr, read_stream_thread, source, source->pool);
-			}
-		}
-	}
-	switch_mutex_unlock(globals.mutex);
-	switch_yield(1000000);
-	/* dev already engaged */
-	if (source) {
-
-		/*wait for source to be ready */
-		while (source->ready == 0) {
-			switch_yield(100000);
-		}
-
-		if (switch_thread_rwlock_tryrdlock(source->rwlock) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, " error rwlock !\n");
-			source = NULL;
-		}
-	}
-
-	if (source) {
-		status = SWITCH_STATUS_SUCCESS;
-
-		if ((context = switch_core_alloc(handle->memory_pool, sizeof(*context))) == 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, " error allocating context!\n");
-			status = SWITCH_STATUS_MEMERR;
-		} else {
-			/* everything goes fine at this point */
-			handle->samples = 0;
-			handle->samplerate = source->rate;
-			handle->channels = 1;
-			handle->format = 0;
-			handle->sections = 0;
-			handle->seekable = 0;
-			handle->speed = 0;
-			handle->private_info = context;
-			handle->interval = source->interval;
-
-			switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, handle->memory_pool);
-			if (switch_buffer_create_dynamic(&context->audio_buffer, 512, 1024, 0) != SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
-				status = SWITCH_STATUS_MEMERR;
-			} else {
-				/* context created... then continue */
-				context->source = source;
-				context->file = handle->file;
-				context->func = handle->func;
-				context->line = handle->line;
-				context->handle = handle;
-				switch_mutex_lock(source->mutex);
-				context->next = source->context_list;
-				source->context_list = context;
-				source->total++;
-				switch_mutex_unlock(source->mutex);
-			}
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown source %s\n", path);
-		status = SWITCH_STATUS_FALSE;
-	}
-
-	return status;
-}
-
-
-static switch_status_t portaudio_stream_file_close(switch_file_handle_t *handle)
-{
-	portaudio_stream_context_t *cp, *last = NULL, *context = handle->private_info;
-
-
-	switch_mutex_lock(context->source->mutex);
-	for (cp = context->source->context_list; cp; cp = cp->next) {
-		if (cp == context) {
-			if (last) {
-				last->next = cp->next;
-			} else {
-				context->source->context_list = cp->next;
-			}
-			break;
-		}
-		last = cp;
-	}
-	context->source->total--;
-	switch_mutex_unlock(context->source->mutex);
-	switch_buffer_destroy(&context->audio_buffer);
-	switch_thread_rwlock_unlock(context->source->rwlock);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t portaudio_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len)
-{
-	portaudio_stream_context_t *context = handle->private_info;
-	switch_size_t bytes = 0;
-	int bytesPerSample = context->source->audio_stream->bytesPerFrame;
-	size_t need = *len * bytesPerSample;
-
-	if (!context->source->ready) {
-		*len = 0;
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_mutex_lock(context->audio_mutex);
-	if ((bytes = switch_buffer_read(context->audio_buffer, data, need))) {
-		*len = bytes / bytesPerSample;
-	} else {
-		if (need > 2560) {
-			need = 2560;
-		}
-		memset(data, 255, need);
-		*len = need / bytesPerSample;
-	}
-	switch_mutex_unlock(context->audio_mutex);
-
-
-
-	handle->sample_count += *len;
-	return SWITCH_STATUS_SUCCESS;
-
-
-}
-
-/* Registration */
-
-static char *supported_formats[SWITCH_MAX_CODECS] = { 0 };
-
-static void shutdown_event_handler(switch_event_t *event)
-{
-	globals.running = 0;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_stream_load)
-{
-	switch_file_interface_t *file_interface;
-	supported_formats[0] = "portaudio_stream";
-
-	module_pool = pool;
-
-	Pa_Initialize();
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
-	file_interface->interface_name = modname;
-	file_interface->extens = supported_formats;
-	file_interface->file_open = portaudio_stream_file_open;
-	file_interface->file_close = portaudio_stream_file_close;
-	file_interface->file_read = portaudio_stream_file_read;
-
-	if (switch_event_bind(modname, SWITCH_EVENT_SHUTDOWN, SWITCH_EVENT_SUBCLASS_ANY, shutdown_event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind shutdown event handler!\n");
-	}
-
-	memset(&globals, 0, sizeof(globals));
-	globals.running = 1;
-	globals.threads = 0;
-	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool);
-	switch_core_hash_init(&globals.source_hash);
-
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_portaudio_stream_shutdown)
-{
-	globals.running = 0;
-	switch_event_unbind_callback(shutdown_event_handler);
-
-	while (globals.threads > 0) {
-		switch_yield(100000);
-	}
-
-	Pa_Terminate();
-
-	switch_core_hash_destroy(&globals.source_hash);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/formats/mod_shout/Makefile.am b/src/mod/formats/mod_shout/Makefile.am
index ace4ce4af4..6318d312a0 100644
--- a/src/mod/formats/mod_shout/Makefile.am
+++ b/src/mod/formats/mod_shout/Makefile.am
@@ -7,8 +7,8 @@ if HAVE_MP3LAME
 
 mod_LTLIBRARIES = mod_shout.la
 mod_shout_la_SOURCES  = mod_shout.c
-mod_shout_la_CFLAGS   = $(AM_CFLAGS)
-mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) $(SHOUT_CFLAGS) $(MP3LAME_CFLAGS) $(MPG123_CFLAGS)
+mod_shout_la_CFLAGS   = $(AM_CFLAGS) -DSHOUT_VERSION=$(SHOUT_VERSION) -DSHOUT_MAJOR_VERSION=$(SHOUT_MAJOR_VERSION) -DSHOUT_MINOR_VERSION=$(SHOUT_MINOR_VERSION) -DSHOUT_PATCH_VERSION=$(SHOUT_PATCH_VERSION)
+mod_shout_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) $(SHOUT_CFLAGS) $(MP3LAME_CFLAGS) $(MPG123_CFLAGS) -DSHOUT_VERSION=$(SHOUT_VERSION) -DSHOUT_MAJOR_VERSION=$(SHOUT_MAJOR_VERSION) -DSHOUT_MINOR_VERSION=$(SHOUT_MINOR_VERSION) -DSHOUT_PATCH_VERSION=$(SHOUT_PATCH_VERSION)
 mod_shout_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_shout_la_LDFLAGS  = $(CURL_LIBS) -avoid-version -module -no-undefined -shared $(SHOUT_LIBS) $(MP3LAME_LIBS) $(MPG123_LIBS)
 
diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c
index 14cba068d3..be05ba5c32 100644
--- a/src/mod/formats/mod_shout/mod_shout.c
+++ b/src/mod/formats/mod_shout/mod_shout.c
@@ -51,6 +51,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown);
 SWITCH_MODULE_DEFINITION(mod_shout, mod_shout_load, mod_shout_shutdown, NULL);
 
+#define CHECK_SHOUT_MIN_VERSION(major, minor, patch) \
+		(SHOUT_MAJOR_VERSION > major || \
+		(SHOUT_MAJOR_VERSION == major && SHOUT_MINOR_VERSION > minor) || \
+		(SHOUT_MAJOR_VERSION == major && SHOUT_MINOR_VERSION == minor && SHOUT_PATCH_VERSION >= patch))
+
 static char *supported_formats[SWITCH_MAX_CODECS] = { 0 };
 
 static struct {
@@ -463,7 +468,11 @@ static size_t stream_callback(void *ptr, size_t size, size_t nmemb, void *data)
 	return 0;
 }
 
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x072000)
+static int progress_callback(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
+#else
 static int progress_callback(void *clientp,   double dltotal,   double dlnow,   double ultotal,   double ulnow)
+#endif
 {
 	shout_context_t *context = (shout_context_t *) clientp;
 	return context->err;
@@ -496,8 +505,13 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
 	switch_mutex_unlock(context->audio_mutex);
 	curl_handle = switch_curl_easy_init();
 	switch_curl_easy_setopt(curl_handle, CURLOPT_URL, context->stream_url);
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x072000)
+	curl_easy_setopt(curl_handle, CURLOPT_XFERINFOFUNCTION, progress_callback);
+	curl_easy_setopt(curl_handle, CURLOPT_XFERINFODATA, (void *)context);
+#else
 	curl_easy_setopt(curl_handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
 	curl_easy_setopt(curl_handle, CURLOPT_PROGRESSDATA, (void *)context);
+#endif
 	switch_curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
 	switch_curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
 	switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, stream_callback);
@@ -862,12 +876,20 @@ static switch_status_t shout_file_open(switch_file_handle_t *handle, const char
 				goto error;
 			}
 
+#if (CHECK_SHOUT_MIN_VERSION(2, 4, 6))
+			if (shout_set_meta(context->shout, SHOUT_META_URL, "http://www.freeswitch.org") != SHOUTERR_SUCCESS) {
+#else
 			if (shout_set_url(context->shout, "http://www.freeswitch.org") != SHOUTERR_SUCCESS) {
+#endif
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting name: %s\n", shout_get_error(context->shout));
 				goto error;
 			}
 
+#if (CHECK_SHOUT_MIN_VERSION(2, 4, 6))
+			if (shout_set_meta(context->shout, SHOUT_META_DESCRIPTION, "FreeSWITCH mod_shout Broadcasting Module") != SHOUTERR_SUCCESS) {
+#else
 			if (shout_set_description(context->shout, "FreeSWITCH mod_shout Broadcasting Module") != SHOUTERR_SUCCESS) {
+#endif
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting description: %s\n", shout_get_error(context->shout));
 				goto error;
 			}
@@ -877,7 +899,11 @@ static switch_status_t shout_file_open(switch_file_handle_t *handle, const char
 				goto error;
 			}
 
+#if (CHECK_SHOUT_MIN_VERSION(2, 4, 6))
+			if (shout_set_content_format(context->shout, SHOUT_FORMAT_MP3, SHOUT_USAGE_AUDIO, NULL) != SHOUTERR_SUCCESS) {
+#else
 			if (shout_set_format(context->shout, SHOUT_FORMAT_MP3) != SHOUTERR_SUCCESS) {
+#endif
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting format: %s\n", shout_get_error(context->shout));
 				goto error;
 			}
@@ -1127,21 +1153,33 @@ static switch_status_t shout_file_set_string(switch_file_handle_t *handle, switc
 
 	switch (col) {
 	case SWITCH_AUDIO_COL_STR_TITLE:
+#if (CHECK_SHOUT_MIN_VERSION(2, 4, 6))
+		if (shout_set_meta(context->shout, SHOUT_META_NAME, string) == SHOUTERR_SUCCESS) {
+#else
 		if (shout_set_name(context->shout, string) == SHOUTERR_SUCCESS) {
+#endif
 			status = SWITCH_STATUS_SUCCESS;
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting name: %s\n", shout_get_error(context->shout));
 		}
 		break;
 	case SWITCH_AUDIO_COL_STR_COMMENT:
+#if (CHECK_SHOUT_MIN_VERSION(2, 4, 6))
+		if (shout_set_meta(context->shout, SHOUT_META_URL, string) == SHOUTERR_SUCCESS) {
+#else
 		if (shout_set_url(context->shout, string) == SHOUTERR_SUCCESS) {
+#endif
 			status = SWITCH_STATUS_SUCCESS;
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting name: %s\n", shout_get_error(context->shout));
 		}
 		break;
 	case SWITCH_AUDIO_COL_STR_ARTIST:
+#if (CHECK_SHOUT_MIN_VERSION(2, 4, 6))
+		if (shout_set_meta(context->shout, SHOUT_META_DESCRIPTION, string) == SHOUTERR_SUCCESS) {
+#else
 		if (shout_set_description(context->shout, string) == SHOUTERR_SUCCESS) {
+#endif
 			status = SWITCH_STATUS_SUCCESS;
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting name: %s\n", shout_get_error(context->shout));
diff --git a/src/mod/formats/mod_ssml/Makefile.am b/src/mod/formats/mod_ssml/Makefile.am
deleted file mode 100644
index c3a6d83710..0000000000
--- a/src/mod/formats/mod_ssml/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_ssml
-
-IKS_DIR=$(switch_srcdir)/libs/iksemel
-IKS_BUILDDIR=$(switch_builddir)/libs/iksemel
-IKS_LA=$(IKS_BUILDDIR)/src/libiksemel.la
-
-noinst_LTLIBRARIES = libssmlmod.la
-libssmlmod_la_SOURCES  = mod_ssml.c
-libssmlmod_la_CFLAGS   = $(AM_CFLAGS) -I$(IKS_DIR)/include
-
-mod_LTLIBRARIES = mod_ssml.la
-mod_ssml_la_SOURCES  = mod_ssml.c
-mod_ssml_la_CFLAGS   = $(AM_CFLAGS) -I$(IKS_DIR)/include
-mod_ssml_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(IKS_LA)
-mod_ssml_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
-
-noinst_PROGRAMS = test/test_tts_format
-
-test_test_tts_format_SOURCES = test/test_tts_format.c
-test_test_tts_format_CFLAGS = $(AM_CFLAGS) -I. -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\"
-test_test_tts_format_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)
-test_test_tts_format_LDADD = libssmlmod.la $(IKS_LA)
-
-TESTS = $(noinst_PROGRAMS)
-
-BUILT_SOURCES=$(IKS_LA)
-
-$(IKS_LA): $(IKS_BUILDDIR) $(IKS_DIR) $(IKS_DIR)/.update
-	@cd $(IKS_DIR) && $(MAKE)
-	@$(TOUCH_TARGET)
-
-deps: $(IKS_LA)
diff --git a/src/mod/formats/mod_ssml/conf/autoload_configs/ssml.conf.xml b/src/mod/formats/mod_ssml/conf/autoload_configs/ssml.conf.xml
deleted file mode 100644
index a3e732f88d..0000000000
--- a/src/mod/formats/mod_ssml/conf/autoload_configs/ssml.conf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<configuration name="ssml.conf" description="SSML parser config">
-
-	<!-- voices in order of preference -->
-	<tts-voices>
-		<voice name="slt" language="en-US" gender="female" prefix="tts://flite|slt|"/>
-		<voice name="kal" language="en-US" gender="male" prefix="tts://flite|kal|"/>
-		<voice name="rms" language="en-US" gender="male" prefix="tts://flite|rms|"/>
-		<voice name="awb" language="en-US" gender="male" prefix="tts://flite|awb|"/>
-	</tts-voices>
-
-	<!-- maps ISO language to say module -->
-	<language-map>
-		<language iso="en-US" say-module="en" language="en"/>
-	</language-map>
-
-	<!-- say voices in order of preference -->
-	<say-voices>
-		<voice name="callie" language="en-US" gender="female" prefix="$${sounds_dir}/en/us/callie/"/>
-	</say-voices>
-
-	<!-- map interpret-as to say macros -->
-	<macros>
-		<macro name="ordinal" type="number" method="counted"/>
-		<macro name="cardinal" type="number" method="pronounced"/>
-		<macro name="characters" type="name_spelled" method="pronounced"/>
-		<macro name="telephone" type="telephone_number" method="pronounced"/>
-	</macros>
-
-</configuration>
diff --git a/src/mod/formats/mod_ssml/mod_ssml.c b/src/mod/formats/mod_ssml/mod_ssml.c
deleted file mode 100644
index 90df8ba8c2..0000000000
--- a/src/mod/formats/mod_ssml/mod_ssml.c
+++ /dev/null
@@ -1,1251 +0,0 @@
-/*
- * mod_ssml for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2013-2014,2016 Grasshopper
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mod_ssml for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is Grasshopper
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Chris Rienzo <chris.rienzo@grasshopper.com>
- *
- * mod_ssml.c -- SSML audio rendering format
- *
- */
-#include <switch.h>
-#include <iksemel.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_ssml_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_ssml_shutdown);
-SWITCH_MODULE_DEFINITION(mod_ssml, mod_ssml_load, mod_ssml_shutdown, NULL);
-
-#define MAX_VOICE_FILES 256
-#define MAX_VOICE_PRIORITY 999
-#define VOICE_NAME_PRIORITY 1000
-#define VOICE_GENDER_PRIORITY 1000
-#define VOICE_LANG_PRIORITY 1000000
-
-struct ssml_parser;
-
-/** function to handle tag attributes */
-typedef int (* tag_attribs_fn)(struct ssml_parser *, char **);
-/** function to handle tag CDATA */
-typedef int (* tag_cdata_fn)(struct ssml_parser *, char *, size_t);
-
-/**
- * Tag definition
- */
-struct tag_def {
-	tag_attribs_fn attribs_fn;
-	tag_cdata_fn cdata_fn;
-	switch_bool_t is_root;
-	switch_hash_t *children_tags;
-};
-
-/**
- * Module configuration
- */
-static struct {
-	/** Mapping of mod-name-language-gender to voice */
-	switch_hash_t *voice_cache;
-	/** Mapping of voice names */
-	switch_hash_t *say_voice_map;
-	/** Synchronizes access to say_voice_map */
-	switch_mutex_t *say_voice_map_mutex;
-	/** Mapping of voice names */
-	switch_hash_t *tts_voice_map;
-	/** Synchronizes access to tts_voice_map */
-	switch_mutex_t *tts_voice_map_mutex;
-	/** Mapping of interpret-as value to macro */
-	switch_hash_t *interpret_as_map;
-	/** Mapping of ISO language code to say-module */
-	switch_hash_t *language_map;
-	/** Mapping of tag name to definition */
-	switch_hash_t *tag_defs;
-	/** module memory pool */
-	switch_memory_pool_t *pool;
-} globals;
-
-/**
- * A say language
- */
-struct language {
-	/** The ISO language code */
-	char *iso;
-	/** The FreeSWITCH language code */
-	char *language;
-	/** The say module name */
-	char *say_module;
-};
-
-/**
- * A say macro
- */
-struct macro {
-	/** interpret-as name (cardinal...) */
-	char *name;
-	/** language (en-US, en-UK, ...) */
-	char *language;
-	/** type (number, items, persons, messages...) */
-	char *type;
-	/** method (pronounced, counted, iterated...) */
-	char *method;
-};
-
-/**
- * A TTS voice
- */
-struct voice {
-	/** higher priority = more likely to pick */
-	int priority;
-	/** voice gender */
-	char *gender;
-	/** voice name / macro */
-	char *name;
-	/** voice language */
-	char *language;
-	/** internal file prefix */
-	char *prefix;
-};
-
-#define TAG_LEN 32
-#define NAME_LEN 128
-#define LANGUAGE_LEN 6
-#define GENDER_LEN 8
-
-/**
- * SSML voice state
- */
-struct ssml_node {
-	/** tag name */
-	char tag_name[TAG_LEN];
-	/** requested name */
-	char name[NAME_LEN];
-	/** requested language */
-	char language[LANGUAGE_LEN];
-	/** requested gender */
-	char gender[GENDER_LEN];
-	/** voice to use */
-	struct voice *tts_voice;
-	/** say macro to use */
-	struct macro *say_macro;
-	/** tag handling data */
-	struct tag_def *tag_def;
-	/** previous node */
-	struct ssml_node *parent_node;
-};
-
-/**
- * A file to play
- */
-struct ssml_file {
-	/** prefix to add to file handle */
-	char *prefix;
-	/** the file to play */
-	const char *name;
-};
-
-/**
- * SSML parser state
- */
-struct ssml_parser {
-	/** current attribs */
-	struct ssml_node *cur_node;
-	/** files to play */
-	struct ssml_file *files;
-	/** number of files */
-	int num_files;
-	/** max files to play */
-	int max_files;
-	/** memory pool to use */
-	switch_memory_pool_t *pool;
-	/** desired sample rate */
-	int sample_rate;
-};
-
-/**
- * SSML playback state
- */
-struct ssml_context {
-	/** handle to current file */
-	switch_file_handle_t fh;
-	/** files to play */
-	struct ssml_file *files;
-	/** number of files */
-	int num_files;
-	/** current file being played */
-	int index;
-};
-
-/**
- * Add a definition for a tag
- * @param tag the name
- * @param attribs_fn the function to handle the tag attributes
- * @param cdata_fn the function to handler the tag CDATA
- * @param children_tags comma-separated list of valid child tag names
- * @return the definition
- */
-static struct tag_def *add_tag_def(const char *tag, tag_attribs_fn attribs_fn, tag_cdata_fn cdata_fn, const char *children_tags)
-{
-	struct tag_def *def = switch_core_alloc(globals.pool, sizeof(*def));
-	switch_core_hash_init(&def->children_tags);
-	if (!zstr(children_tags)) {
-		char *children_tags_dup = switch_core_strdup(globals.pool, children_tags);
-		char *tags[32] = { 0 };
-		int tag_count = switch_separate_string(children_tags_dup, ',', tags, sizeof(tags) / sizeof(tags[0]));
-		if (tag_count) {
-			int i;
-			for (i = 0; i < tag_count; i++) {
-				switch_core_hash_insert(def->children_tags, tags[i], tags[i]);
-			}
-		}
-	}
-	def->attribs_fn = attribs_fn;
-	def->cdata_fn = cdata_fn;
-	def->is_root = SWITCH_FALSE;
-	switch_core_hash_insert(globals.tag_defs, tag, def);
-	return def;
-}
-
-/**
- * Add a definition for a root tag
- * @param tag the name
- * @param attribs_fn the function to handle the tag attributes
- * @param cdata_fn the function to handler the tag CDATA
- * @param children_tags comma-separated list of valid child tag names
- * @return the definition
- */
-static struct tag_def *add_root_tag_def(const char *tag, tag_attribs_fn attribs_fn, tag_cdata_fn cdata_fn, const char *children_tags)
-{
-	struct tag_def *def = add_tag_def(tag, attribs_fn, cdata_fn, children_tags);
-	def->is_root = SWITCH_TRUE;
-	return def;
-}
-
-/**
- * Handle tag attributes
- * @param parser the parser
- * @param name the tag name
- * @param atts the attributes
- * @return IKS_OK if OK IKS_BADXML on parse failure
- */
-static int process_tag(struct ssml_parser *parser, const char *name, char **atts)
-{
-	struct tag_def *def = switch_core_hash_find(globals.tag_defs, name);
-	if (def) {
-		parser->cur_node->tag_def = def;
-		if (def->is_root && parser->cur_node->parent_node == NULL) {
-			/* no parent for ROOT tags */
-			return def->attribs_fn(parser, atts);
-		} else if (!def->is_root && parser->cur_node->parent_node) {
-			/* check if this child is allowed by parent node */
-			struct tag_def *parent_def = parser->cur_node->parent_node->tag_def;
-			if (switch_core_hash_find(parent_def->children_tags, "ANY") ||
-				switch_core_hash_find(parent_def->children_tags, name)) {
-				return def->attribs_fn(parser, atts);
-			}
-		}
-	}
-	return IKS_BADXML;
-}
-
-/**
- * Handle CDATA that is ignored
- * @param parser the parser
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_OK
- */
-static int process_cdata_ignore(struct ssml_parser *parser, char *data, size_t len)
-{
-	return IKS_OK;
-}
-
-/**
- * Handle CDATA that is not allowed
- * @param parser the parser
- * @param data the CDATA
- * @param len the CDATA length
- * @return IKS_BADXML
- */
-static int process_cdata_bad(struct ssml_parser *parser, char *data, size_t len)
-{
-	int i;
-	for (i = 0; i < len; i++) {
-		if (isgraph(data[i])) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Unexpected CDATA for <%s>\n", parser->cur_node->tag_name);
-			return IKS_BADXML;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Score the voice on how close it is to desired language, name, and gender
- * @param voice the voice to score
- * @param cur_node the desired voice attributes
- * @param lang_required if true, language must match
- * @return the score
- */
-static int score_voice(struct voice *voice, struct ssml_node *cur_node, int lang_required)
-{
-	/* language > gender,name > priority */
-	int score = voice->priority;
-	if (!zstr_buf(cur_node->gender) && !strcmp(cur_node->gender, voice->gender)) {
-		score += VOICE_GENDER_PRIORITY;
-	}
-	if (!zstr_buf(cur_node->name) && !strcmp(cur_node->name, voice->name)) {
-		score += VOICE_NAME_PRIORITY;
-	}
-	if (!zstr_buf(cur_node->language) && !strcmp(cur_node->language, voice->language)) {
-		score += VOICE_LANG_PRIORITY;
-	} else if (lang_required) {
-		score = 0;
-	}
-	return score;
-}
-
-/**
- * Search for best voice based on attributes
- * @param cur_node the desired voice attributes
- * @param map the map to search
- * @param type "say" or "tts"
- * @param lang_required if true, language must match
- * @return the voice or NULL
- */
-static struct voice *find_voice(struct ssml_node *cur_node, switch_hash_t *map, char *type, int lang_required)
-{
-	switch_hash_index_t *hi = NULL;
-	struct voice *voice = NULL;
-	char *lang_name_gender = NULL;
-	int best_score = 0;
-
-	/* check cache */
-	lang_name_gender = switch_mprintf("%s-%s-%s-%s", type, cur_node->language, cur_node->name, cur_node->gender);
-	voice = (struct voice *)switch_core_hash_find(globals.voice_cache, lang_name_gender);
-	if (voice) {
-		/* that was easy! */
-		goto done;
-	}
-
-	/* find best language, name, gender match */
-	for (hi = switch_core_hash_first(map); hi; hi = switch_core_hash_next(&hi)) {
-		const void *key;
-		void *val;
-		struct voice *candidate;
-		int candidate_score = 0;
-		switch_core_hash_this(hi, &key, NULL, &val);
-		candidate = (struct voice *)val;
-		candidate_score = score_voice(candidate, cur_node, lang_required);
-		if (candidate_score > 0 && candidate_score > best_score) {
-			voice = candidate;
-			best_score = candidate_score;
-		}
-	}
-
-	/* remember for next time */
-	if (voice) {
-		switch_core_hash_insert(globals.voice_cache, lang_name_gender, voice);
-	}
-
-done:
-	switch_safe_free(lang_name_gender);
-
-	return voice;
-}
-
-/**
- * Search for best voice based on attributes
- * @param cur_node the desired voice attributes
- * @return the voice or NULL
- */
-static struct voice *find_tts_voice(struct ssml_node *cur_node)
-{
-	struct voice *v;
-	switch_mutex_lock(globals.tts_voice_map_mutex);
-	v = find_voice(cur_node, globals.tts_voice_map, "tts", 0);
-	switch_mutex_unlock(globals.tts_voice_map_mutex);
-	return v;
-}
-
-/**
- * Search for best voice based on attributes
- * @param cur_node the desired voice attributes
- * @return the voice or NULL
- */
-static struct voice *find_say_voice(struct ssml_node *cur_node)
-{
-	struct voice *v;
-	switch_mutex_lock(globals.say_voice_map_mutex);
-	v = find_voice(cur_node, globals.say_voice_map, "say", 1);
-	switch_mutex_unlock(globals.say_voice_map_mutex);
-	return v;
-}
-
-/**
- * Handle tag attributes that are ignored
- * @param parser the parser
- * @param atts the attributes
- * @return IKS_OK
- */
-static int process_attribs_ignore(struct ssml_parser *parsed_data, char **atts)
-{
-	struct ssml_node *cur_node = parsed_data->cur_node;
-	cur_node->tts_voice = find_tts_voice(cur_node);
-	return IKS_OK;
-}
-
-/**
- * open next file for reading
- * @param handle the file handle
- */
-static switch_status_t next_file(switch_file_handle_t *handle)
-{
-	struct ssml_context *context = handle->private_info;
-	const char *file;
-
-  top:
-
-	context->index++;
-
-	if (switch_test_flag((&context->fh), SWITCH_FILE_OPEN)) {
-		switch_core_file_close(&context->fh);
-	}
-
-	if (context->index >= context->num_files) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-
-	file = context->files[context->index].name;
-	context->fh.prefix = context->files[context->index].prefix;
-
-	if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
-		/* unsupported */
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_core_file_open(&context->fh, file, handle->channels, handle->samplerate, handle->flags, NULL) != SWITCH_STATUS_SUCCESS) {
-		goto top;
-	}
-
-	handle->samples = context->fh.samples;
-	handle->format = context->fh.format;
-	handle->sections = context->fh.sections;
-	handle->seekable = context->fh.seekable;
-	handle->speed = context->fh.speed;
-	handle->interval = context->fh.interval;
-
-	if (switch_test_flag((&context->fh), SWITCH_FILE_NATIVE)) {
-		switch_set_flag_locked(handle, SWITCH_FILE_NATIVE);
-	} else {
-		switch_clear_flag_locked(handle, SWITCH_FILE_NATIVE);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Process xml:lang attribute
- */
-static int process_xml_lang(struct ssml_parser *parsed_data, char **atts)
-{
-	struct ssml_node *cur_node = parsed_data->cur_node;
-
-	/* only allow language change in <speak>, <p>, and <s> */
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("xml:lang", atts[i])) {
-				if (!zstr(atts[i + 1])) {
-					snprintf(cur_node->language, LANGUAGE_LEN, "%s", atts[i + 1]);
-				}
-			}
-			i += 2;
-		}
-	}
-	cur_node->tts_voice = find_tts_voice(cur_node);
-	return IKS_OK;
-}
-
-/**
- * Process <voice>
- */
-static int process_voice(struct ssml_parser *parsed_data, char **atts)
-{
-	struct ssml_node *cur_node = parsed_data->cur_node;
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("xml:lang", atts[i])) {
-				if (!zstr(atts[i + 1])) {
-					snprintf(cur_node->language, LANGUAGE_LEN, "%s", atts[i + 1]);
-				}
-			} else if (!strcmp("name", atts[i])) {
-				if (!zstr(atts[i + 1])) {
-					snprintf(cur_node->name, NAME_LEN, "%s", atts[i + 1]);
-				}
-			} else if (!strcmp("gender", atts[i])) {
-				if (!zstr(atts[i + 1])) {
-					snprintf(cur_node->gender, GENDER_LEN, "%s", atts[i + 1]);
-				}
-			}
-			i += 2;
-		}
-	}
-	cur_node->tts_voice = find_tts_voice(cur_node);
-	return IKS_OK;
-}
-
-/**
- * Process <say-as>
- */
-static int process_say_as(struct ssml_parser *parsed_data, char **atts)
-{
-	struct ssml_node *cur_node = parsed_data->cur_node;
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("interpret-as", atts[i])) {
-				char *interpret_as = atts[i + 1];
-				if (!zstr(interpret_as)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "interpret-as: %s\n", atts[i + 1]);
-					cur_node->say_macro = (struct macro *)switch_core_hash_find(globals.interpret_as_map, interpret_as);
-				}
-				break;
-			}
-			i += 2;
-		}
-	}
-	cur_node->tts_voice = find_tts_voice(cur_node);
-	return IKS_OK;
-}
-
-/**
- * Process <break>- this is a period of silence
- */
-static int process_break(struct ssml_parser *parsed_data, char **atts)
-{
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("time", atts[i])) {
-				char *t = atts[i + 1];
-				if (!zstr(t) && parsed_data->num_files < parsed_data->max_files) {
-					int timeout_ms = 0;
-					char *unit;
-					if ((unit = strstr(t, "ms"))) {
-						*unit = '\0';
-						if (switch_is_number(t)) {
-							timeout_ms = atoi(t);
-						}
-					} else if ((unit = strstr(t, "s"))) {
-						*unit = '\0';
-						if (switch_is_number(t)) {
-							timeout_ms = atoi(t) * 1000;
-						}
-					}
-					if (timeout_ms > 0) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding <break>: \"%s\"\n", t);
-						parsed_data->files[parsed_data->num_files].name = switch_core_sprintf(parsed_data->pool, "silence_stream://%i", timeout_ms);
-						parsed_data->files[parsed_data->num_files++].prefix = NULL;
-					}
-				}
-				return IKS_OK;
-			}
-			i += 2;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Process <audio>- this is a URL to play
- */
-static int process_audio(struct ssml_parser *parsed_data, char **atts)
-{
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("src", atts[i])) {
-				char *src = atts[i + 1];
-				ikstack *stack = NULL;
-				if (!zstr(src) && parsed_data->num_files < parsed_data->max_files) {
-					/* get the URI */
-					if (strchr(src, '&')) {
-						stack = iks_stack_new(256, 0);
-						src = iks_unescape(stack, src, strlen(src));
-					}
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding <audio>: \"%s\"\n", src);
-					parsed_data->files[parsed_data->num_files].name = switch_core_strdup(parsed_data->pool, src);
-					parsed_data->files[parsed_data->num_files++].prefix = NULL;
-					if (stack) {
-						iks_stack_delete(&stack);
-					}
-				}
-				return IKS_OK;
-			}
-			i += 2;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Process a tag
- */
-static int tag_hook(void *user_data, char *name, char **atts, int type)
-{
-	int result = IKS_OK;
-	struct ssml_parser *parsed_data = (struct ssml_parser *)user_data;
-	struct ssml_node *parent_node = parsed_data->cur_node;
-
-	if (type == IKS_OPEN || type == IKS_SINGLE) {
-		struct ssml_node *new_node = malloc(sizeof *new_node);
-		switch_assert(new_node);
-		if (parent_node) {
-			/* inherit parent attribs */
-			*new_node = *parent_node;
-			new_node->parent_node = parent_node;
-		} else {
-			new_node->name[0] = '\0';
-			new_node->language[0] = '\0';
-			new_node->gender[0] = '\0';
-			new_node->parent_node = NULL;
-		}
-		new_node->tts_voice = NULL;
-		new_node->say_macro = NULL;
-		snprintf(new_node->tag_name, TAG_LEN, "%s", name);
-		parsed_data->cur_node = new_node;
-		result = process_tag(parsed_data, name, atts);
-	}
-
-	if (type == IKS_CLOSE || type == IKS_SINGLE) {
-		if (parsed_data->cur_node) {
-			struct ssml_node *parent_node = parsed_data->cur_node->parent_node;
-			free(parsed_data->cur_node);
-			parsed_data->cur_node = parent_node;
-		}
-	}
-
-	return result;
-}
-
-/**
- * Try to get file(s) from say module
- * @param parsed_data
- * @param to_say
- * @return 1 if successful
- */
-static int get_file_from_macro(struct ssml_parser *parsed_data, char *to_say)
-{
-	struct ssml_node *cur_node = parsed_data->cur_node;
-	struct macro *say_macro = cur_node->say_macro;
-	struct voice *say_voice = find_say_voice(cur_node);
-	struct language *language;
-	char *file_string = NULL;
-	char *gender = NULL;
-	switch_say_interface_t *si;
-
-	/* voice is required */
-	if (!say_voice) {
-		return 0;
-	}
-
-	language = switch_core_hash_find(globals.language_map, say_voice->language);
-	/* language is required */
-	if (!language) {
-		return 0;
-	}
-
-	/* TODO need to_say gender, not voice gender */
-	gender = "neuter";
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Trying macro: %s, %s, %s, %s, %s\n", language->language, to_say, say_macro->type, say_macro->method, gender);
-
-	if ((si = switch_loadable_module_get_say_interface(language->say_module)) && si->say_string_function) {
-		switch_say_args_t say_args = {0};
-		say_args.type = switch_ivr_get_say_type_by_name(say_macro->type);
-		say_args.method = switch_ivr_get_say_method_by_name(say_macro->method);
-		say_args.gender = switch_ivr_get_say_gender_by_name(gender);
-		say_args.ext = "wav";
-		si->say_string_function(NULL, to_say, &say_args, &file_string);
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding macro: \"%s\", prefix=\"%s\"\n", file_string, say_voice->prefix);
-	if (!zstr(file_string)) {
-		parsed_data->files[parsed_data->num_files].name = switch_core_strdup(parsed_data->pool, file_string);
-		parsed_data->files[parsed_data->num_files++].prefix = switch_core_strdup(parsed_data->pool, say_voice->prefix);
-		return 1;
-	}
-	switch_safe_free(file_string);
-
-	return 0;
-}
-
-/**
- * Get TTS file for voice
- */
-static int get_file_from_voice(struct ssml_parser *parsed_data, char *to_say)
-{
-	struct ssml_node *cur_node = parsed_data->cur_node;
-	if (cur_node->tts_voice) {
-		char *file = switch_core_sprintf(parsed_data->pool, "%s%s", cur_node->tts_voice->prefix, to_say);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding <%s>: \"%s\"\n", cur_node->tag_name, file);
-		parsed_data->files[parsed_data->num_files].name = file;
-		parsed_data->files[parsed_data->num_files++].prefix = NULL;
-		return 1;
-	}
-	return 0;
-}
-
-/**
- * Get TTS from CDATA
- */
-static int process_cdata_tts(struct ssml_parser *parsed_data, char *data, size_t len)
-{
-	struct ssml_node *cur_node = parsed_data->cur_node;
-	if (!len) {
-		return IKS_OK;
-	}
-	if (cur_node && parsed_data->num_files < parsed_data->max_files) {
-		int i = 0;
-		int empty = 1;
-		char *to_say;
-
-		/* is CDATA empty? */
-		for (i = 0; i < len && empty; i++) {
-			empty &= !isgraph(data[i]);
-		}
-		if (empty) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Skipping empty tts\n");
-			return IKS_OK;
-		}
-
-		/* try macro */
-		to_say = malloc(len + 1);
-		switch_assert(to_say);
-		snprintf(to_say, len + 1, "%s", data);
-		if (!cur_node->say_macro || !get_file_from_macro(parsed_data, to_say)) {
-			/* use voice instead */
-			if (!get_file_from_voice(parsed_data, to_say)) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No TTS voices available to render text!\n");
-			}
-		}
-		free(to_say);
-		return IKS_OK;
-	}
-	return IKS_BADXML;
-}
-
-/**
- * Process <sub>- this is an alias for text to speak
- */
-static int process_sub(struct ssml_parser *parsed_data, char **atts)
-{
-	if (atts) {
-		int i = 0;
-		while (atts[i]) {
-			if (!strcmp("alias", atts[i])) {
-				char *alias = atts[i + 1];
-				if (!zstr(alias)) {
-					return process_cdata_tts(parsed_data, alias, strlen(alias));
-				}
-				return IKS_BADXML;
-			}
-			i += 2;
-		}
-	}
-	return IKS_OK;
-}
-
-/**
- * Process cdata
- */
-static int cdata_hook(void *user_data, char *data, size_t len)
-{
-	struct ssml_parser *parsed_data = (struct ssml_parser *)user_data;
-	if (!parsed_data) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Missing parser\n");
-		return IKS_BADXML;
-	}
-	if (parsed_data->cur_node) {
-		struct tag_def *handler = switch_core_hash_find(globals.tag_defs, parsed_data->cur_node->tag_name);
-		if (handler) {
-			return handler->cdata_fn(parsed_data, data, len);
-		}
-		return IKS_BADXML;
-	}
-	return IKS_OK;
-}
-
-/**
- * Transforms SSML into file_string format and opens file_string.
- * @param handle
- * @param path the inline SSML
- * @return SWITCH_STATUS_SUCCESS if opened
- */
-static switch_status_t ssml_file_open(switch_file_handle_t *handle, const char *path)
-{
-	switch_status_t status = SWITCH_STATUS_FALSE;
-	struct ssml_context *context = switch_core_alloc(handle->memory_pool, sizeof(*context));
-	struct ssml_parser *parsed_data = switch_core_alloc(handle->memory_pool, sizeof(*parsed_data));
-	iksparser *parser = iks_sax_new(parsed_data, tag_hook, cdata_hook);
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Open: %s\n", path);
-
-	parsed_data->cur_node = NULL;
-	parsed_data->files = switch_core_alloc(handle->memory_pool, sizeof(struct ssml_file) * MAX_VOICE_FILES);
-	parsed_data->max_files = MAX_VOICE_FILES;
-	parsed_data->num_files = 0;
-	parsed_data->pool = handle->memory_pool;
-	parsed_data->sample_rate = handle->samplerate;
-
-	if (iks_parse(parser, path, 0, 1) == IKS_OK) {
-		if (parsed_data->num_files) {
-			context->files = parsed_data->files;
-			context->num_files = parsed_data->num_files;
-			context->index = -1;
-			handle->private_info = context;
-			status = next_file(handle);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No files to play: %s\n", path);
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Parse error: %s, num_files = %i\n", path, parsed_data->num_files);
-	}
-
-	iks_parser_delete(parser);
-
-	return status;
-}
-
-/**
- * Close SSML document.
- * @param handle
- * @return SWITCH_STATUS_SUCCESS
- */
-static switch_status_t ssml_file_close(switch_file_handle_t *handle)
-{
-	struct ssml_context *context = (struct ssml_context *)handle->private_info;
-	if (switch_test_flag((&context->fh), SWITCH_FILE_OPEN)) {
-		return switch_core_file_close(&context->fh);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Read from SSML document
- * @param handle
- * @param data
- * @param len
- * @return
- */
-static switch_status_t ssml_file_read(switch_file_handle_t *handle, void *data, size_t *len)
-{
-	switch_status_t status;
-	struct ssml_context *context = (struct ssml_context *)handle->private_info;
-	size_t llen = *len;
-
-	status = switch_core_file_read(&context->fh, data, len);
-	if (status != SWITCH_STATUS_SUCCESS) {
-		if ((status = next_file(handle)) != SWITCH_STATUS_SUCCESS) {
-			return status;
-		}
-		*len = llen;
-		status = switch_core_file_read(&context->fh, data, len);
-	}
-	return status;
-}
-
-/**
- * Seek file
- */
-static switch_status_t ssml_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence)
-{
-	struct ssml_context *context = handle->private_info;
-
-	if (samples == 0 && whence == SWITCH_SEEK_SET) {
-		/* restart from beginning */
-		context->index = -1;
-		return next_file(handle);
-	}
-
-	if (!handle->seekable) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "File is not seekable\n");
-		return SWITCH_STATUS_NOTIMPL;
-	}
-
-	return switch_core_file_seek(&context->fh, cur_sample, samples, whence);
-}
-
-/**
- * TTS playback state
- */
-struct tts_context {
-	/** handle to TTS engine */
-	switch_speech_handle_t sh;
-	/** TTS flags */
-	switch_speech_flag_t flags;
-	/** maximum number of samples to read at a time */
-	int max_frame_size;
-	/** done flag */
-	int done;
-};
-
-/**
- * Do TTS as file format
- * @param handle
- * @param path the inline SSML
- * @return SWITCH_STATUS_SUCCESS if opened
- */
-static switch_status_t tts_file_open(switch_file_handle_t *handle, const char *path)
-{
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	struct tts_context *context = switch_core_alloc(handle->memory_pool, sizeof(*context));
-	char *arg_string = switch_core_strdup(handle->memory_pool, path);
-	char *args[3] = { 0 };
-	int argc = switch_separate_string(arg_string, '|', args, (sizeof(args) / sizeof(args[0])));
-	char *module;
-	char *voice;
-	char *document;
-
-	/* path is module:(optional)profile|voice|{param1=val1,param2=val2}TTS document */
-	if (argc != 3) {
-		return SWITCH_STATUS_FALSE;
-	}
-	module = args[0];
-	voice = args[1];
-	document = args[2];
-
-	memset(context, 0, sizeof(*context));
-	context->flags = SWITCH_SPEECH_FLAG_NONE;
-	if ((status = switch_core_speech_open(&context->sh, module, voice, handle->samplerate, handle->interval, handle->channels, &context->flags, NULL)) == SWITCH_STATUS_SUCCESS) {
-		if (handle->params) {
-			const char *channel_uuid = switch_event_get_header(handle->params, "channel-uuid");
-			if (!zstr(channel_uuid)) {
-				switch_core_speech_text_param_tts(&context->sh, "channel-uuid", channel_uuid);
-			}
-		}
-		if ((status = switch_core_speech_feed_tts(&context->sh, document, &context->flags)) == SWITCH_STATUS_SUCCESS) {
-			handle->channels = 1;
-			handle->samples = 0;
-			handle->format = 0;
-			handle->sections = 0;
-			handle->seekable = 0;
-			handle->speed = 0;
-			context->max_frame_size = handle->samplerate / 1000 * SWITCH_MAX_INTERVAL;
-		} else {
-			switch_core_speech_close(&context->sh, &context->flags);
-		}
-	}
-	handle->private_info = context;
-	return status;
-}
-
-/**
- * Read audio from TTS engine
- * @param handle
- * @param data
- * @param len
- * @return
- */
-static switch_status_t tts_file_read(switch_file_handle_t *handle, void *data, size_t *len)
-{
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	struct tts_context *context = (struct tts_context *)handle->private_info;
-	switch_size_t rlen;
-
-	if (*len > context->max_frame_size) {
-		*len = context->max_frame_size;
-	}
-	rlen = *len * 2; /* rlen (bytes) = len (samples) * 2 */
-
-	if (!context->done) {
-		context->flags = SWITCH_SPEECH_FLAG_BLOCKING;
-		if ((status = switch_core_speech_read_tts(&context->sh, data, &rlen, &context->flags))) {
-			context->done = 1;
-		}
-	} else {
-		switch_core_speech_flush_tts(&context->sh);
-		memset(data, 0, rlen);
-		status = SWITCH_STATUS_FALSE;
-	}
-	*len = rlen / 2; /* len (samples) = rlen (bytes) / 2 */
-	return status;
-}
-
-/**
- * Close TTS engine
- * @param handle
- * @return SWITCH_STATUS_SUCCESS
- */
-static switch_status_t tts_file_close(switch_file_handle_t *handle)
-{
-	struct tts_context *context = (struct tts_context *)handle->private_info;
-	switch_core_speech_close(&context->sh, &context->flags);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/**
- * Configure voices
- * @param pool memory pool to use
- * @param map voice map to load
- * @param type type of voices (for logging)
- */
-static void do_config_voices(switch_memory_pool_t *pool, switch_xml_t voices, switch_hash_t *map, const char *type)
-{
-	if (voices) {
-		int priority = MAX_VOICE_PRIORITY;
-		switch_xml_t voice;
-		for (voice = switch_xml_child(voices, "voice"); voice; voice = voice->next) {
-			const char *name = switch_xml_attr_soft(voice, "name");
-			const char *language = switch_xml_attr_soft(voice, "language");
-			const char *gender = switch_xml_attr_soft(voice, "gender");
-			const char *prefix = switch_xml_attr_soft(voice, "prefix");
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s map (%s, %s, %s) = %s\n", type, name, language, gender, prefix);
-			if (!zstr(name) && !zstr(prefix)) {
-				struct voice *v = (struct voice *)switch_core_alloc(pool, sizeof(*v));
-				v->name = switch_core_strdup(pool, name);
-				v->language = switch_core_strdup(pool, language);
-				v->gender = switch_core_strdup(pool, gender);
-				v->prefix = switch_core_strdup(pool, prefix);
-				v->priority = priority--;
-				switch_core_hash_insert(map, name, v);
-			}
-		}
-	}
-}
-
-/**
- * Set default configuration when no XML configuration is present.
- * @param pool memory pool to use
- * @return SWITCH_STATUS_SUCCESS if module is configured
- */
-static switch_status_t do_default_config(switch_memory_pool_t *pool)
-{
-	struct voice *v = NULL;
-	struct language *l = NULL;
-	struct macro *m = NULL;
-	const char *sounds_dir = switch_core_get_variable("sounds_dir");
-
-	/* add TTS voice */
-	v = switch_core_alloc(pool, sizeof(*v));
-	v->name = "slt";
-	v->language = "en-US";
-	v->gender = "female";
-	v->prefix = "tts://flite|slt|";
-	v->priority = MAX_VOICE_PRIORITY;
-	switch_core_hash_insert(globals.tts_voice_map, "slt", v);
-
-	/* add Say voice */
-	v = switch_core_alloc(pool, sizeof(*v));
-	v->name = "callie";
-	v->language = "en-US";
-	v->gender = "female";
-	v->prefix = switch_core_sprintf(pool, "%s/en/us/callie/", sounds_dir ? sounds_dir : "");
-	switch_core_hash_insert(globals.say_voice_map, "callie", v);
-
-	/* Add ISO language to Say language mapping */
-	l = switch_core_alloc(pool, sizeof(*l));
-	l->iso = "en-US";
-	l->say_module = "en";
-	l->language = "en";
-	switch_core_hash_insert(globals.language_map, "en-US", l);
-
-	/* Map interpret-as to Say */
-	m = switch_core_alloc(pool, sizeof(*m));
-	m->name = "ordinal";
-	m->method = "counted";
-	m->type = "number";
-	switch_core_hash_insert(globals.interpret_as_map, "ordinal", m);
-
-	m = switch_core_alloc(pool, sizeof(*m));
-	m->name = "cardinal";
-	m->method = "pronounced";
-	m->type = "number";
-	switch_core_hash_insert(globals.interpret_as_map, "cardinal", m);
-
-	m = switch_core_alloc(pool, sizeof(*m));
-	m->name = "characters";
-	m->method = "pronounced";
-	m->type = "name_spelled";
-	switch_core_hash_insert(globals.interpret_as_map, "characters", m);
-
-	m = switch_core_alloc(pool, sizeof(*m));
-	m->name = "telephone";
-	m->method = "pronounced";
-	m->type = "telephone_number";
-	switch_core_hash_insert(globals.interpret_as_map, "telephone", m);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-/**
- * Configure module
- * @param pool memory pool to use
- * @return SWITCH_STATUS_SUCCESS if module is configured
- */
-static switch_status_t do_config(switch_memory_pool_t *pool)
-{
-	char *cf = "ssml.conf";
-	switch_xml_t cfg, xml;
-
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "open of %s failed, using default configuration\n", cf);
-		return do_default_config(pool);
-	}
-
-	/* get voices */
-	do_config_voices(pool, switch_xml_child(cfg, "tts-voices"), globals.tts_voice_map, "tts");
-	do_config_voices(pool, switch_xml_child(cfg, "say-voices"), globals.say_voice_map, "say");
-
-	/* get languages */
-	{
-		switch_xml_t languages = switch_xml_child(cfg, "language-map");
-		if (languages) {
-			switch_xml_t language;
-			for (language = switch_xml_child(languages, "language"); language; language = language->next) {
-				const char *iso = switch_xml_attr_soft(language, "iso");
-				const char *say_module = switch_xml_attr_soft(language, "say-module");
-				const char *lang = switch_xml_attr_soft(language, "language");
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "language map: %s = (%s, %s) \n", iso, say_module, lang);
-				if (!zstr(iso) && !zstr(say_module) && !zstr(lang)) {
-					struct language *l = (struct language *)switch_core_alloc(pool, sizeof(*l));
-					l->iso = switch_core_strdup(pool, iso);
-					l->say_module = switch_core_strdup(pool, say_module);
-					l->language = switch_core_strdup(pool, lang);
-					switch_core_hash_insert(globals.language_map, iso, l);
-				}
-			}
-		}
-	}
-
-	/* get macros */
-	{
-		switch_xml_t macros = switch_xml_child(cfg, "macros");
-		if (macros) {
-			switch_xml_t macro;
-			for (macro = switch_xml_child(macros, "macro"); macro; macro = macro->next) {
-				const char *name = switch_xml_attr_soft(macro, "name");
-				const char *method = switch_xml_attr_soft(macro, "method");
-				const char *type = switch_xml_attr_soft(macro, "type");
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "macro: %s = (%s, %s) \n", name, method, type);
-				if (!zstr(name) && !zstr(type)) {
-					struct macro *m = (struct macro *)switch_core_alloc(pool, sizeof(*m));
-					m->name = switch_core_strdup(pool, name);
-					m->method = switch_core_strdup(pool, method);
-					m->type = switch_core_strdup(pool, type);
-					switch_core_hash_insert(globals.interpret_as_map, name, m);
-				}
-			}
-		}
-	}
-
-	switch_xml_free(xml);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static char *ssml_supported_formats[] = { "ssml", NULL };
-static char *tts_supported_formats[] = { "tts", NULL };
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_ssml_load)
-{
-	switch_file_interface_t *file_interface;
-
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
-	file_interface->interface_name = modname;
-	file_interface->extens = ssml_supported_formats;
-	file_interface->file_open = ssml_file_open;
-	file_interface->file_close = ssml_file_close;
-	file_interface->file_read = ssml_file_read;
-	file_interface->file_seek = ssml_file_seek;
-
-	file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
-	file_interface->interface_name = modname;
-	file_interface->extens = tts_supported_formats;
-	file_interface->file_open = tts_file_open;
-	file_interface->file_close = tts_file_close;
-	file_interface->file_read = tts_file_read;
-	/* TODO allow skip ahead if TTS supports it
-	 * file_interface->file_seek = tts_file_seek;
-	 */
-
-	globals.pool = pool;
-	switch_core_hash_init(&globals.voice_cache);
-	switch_core_hash_init(&globals.tts_voice_map);
-	switch_mutex_init(&globals.tts_voice_map_mutex, SWITCH_MUTEX_NESTED, pool);
-	switch_core_hash_init(&globals.say_voice_map);
-	switch_mutex_init(&globals.say_voice_map_mutex, SWITCH_MUTEX_NESTED, pool);
-	switch_core_hash_init(&globals.interpret_as_map);
-	switch_core_hash_init(&globals.language_map);
-	switch_core_hash_init(&globals.tag_defs);
-
-	add_root_tag_def("speak", process_xml_lang, process_cdata_tts, "audio,break,emphasis,mark,phoneme,prosody,say-as,voice,sub,p,s,lexicon,metadata,meta");
-	add_tag_def("p", process_xml_lang, process_cdata_tts, "audio,break,emphasis,mark,phoneme,prosody,say-as,voice,sub,s");
-	add_tag_def("s", process_xml_lang, process_cdata_tts, "audio,break,emphasis,mark,phoneme,prosody,say-as,voice,sub");
-	add_tag_def("voice", process_voice, process_cdata_tts, "audio,break,emphasis,mark,phoneme,prosody,say-as,voice,sub,p,s");
-	add_tag_def("prosody", process_attribs_ignore, process_cdata_tts, "audio,break,emphasis,mark,phoneme,prosody,say-as,voice,sub,p,s");
-	add_tag_def("audio", process_audio, process_cdata_tts, "audio,break,emphasis,mark,phoneme,prosody,say-as,voice,sub,p,s,desc");
-	add_tag_def("desc", process_attribs_ignore, process_cdata_ignore, "");
-	add_tag_def("emphasis", process_attribs_ignore, process_cdata_tts, "audio,break,emphasis,mark,phoneme,prosody,say-as,voice,sub");
-	add_tag_def("say-as", process_say_as, process_cdata_tts, "");
-	add_tag_def("sub", process_sub, process_cdata_ignore, "");
-	add_tag_def("phoneme", process_attribs_ignore, process_cdata_tts, "");
-	add_tag_def("break", process_break, process_cdata_bad, "");
-	add_tag_def("mark", process_attribs_ignore, process_cdata_bad, "");
-	add_tag_def("lexicon", process_attribs_ignore, process_cdata_bad, "");
-	add_tag_def("metadata", process_attribs_ignore, process_cdata_ignore, "ANY");
-	add_tag_def("meta", process_attribs_ignore, process_cdata_bad, "");
-
-	return do_config(pool);
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_ssml_shutdown)
-{
-	switch_core_hash_destroy(&globals.voice_cache);
-	switch_core_hash_destroy(&globals.tts_voice_map);
-	switch_core_hash_destroy(&globals.say_voice_map);
-	switch_core_hash_destroy(&globals.interpret_as_map);
-	switch_core_hash_destroy(&globals.language_map);
-	{
-		switch_hash_index_t *hi = NULL;
-		for (hi = switch_core_hash_first(globals.tag_defs); hi; hi = switch_core_hash_next(&hi)) {
-			const void *key;
-			struct tag_def *def;
-			switch_core_hash_this(hi, &key, NULL, (void *)&def);
-			switch_core_hash_destroy(&def->children_tags);
-		}
-	}
-	switch_core_hash_destroy(&globals.tag_defs);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/formats/mod_vlc/mod_vlc.c b/src/mod/formats/mod_vlc/mod_vlc.c
index af83330d07..6b725515f4 100644
--- a/src/mod/formats/mod_vlc/mod_vlc.c
+++ b/src/mod/formats/mod_vlc/mod_vlc.c
@@ -1096,7 +1096,8 @@ static switch_status_t vlc_file_read(switch_file_handle_t *handle, void *data, s
 		switch_thread_cond_wait(context->cond, context->cond_mutex);
 		status = libvlc_media_get_state(context->m);
 	}
-	switch_mutex_lock(context->cond_mutex);
+
+	switch_mutex_unlock(context->cond_mutex);
 
 	if (context->err == 1) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VLC error\n");
diff --git a/src/mod/languages/mod_java/modjava.c b/src/mod/languages/mod_java/modjava.c
index 899fee2b60..9c38bdb70f 100644
--- a/src/mod/languages/mod_java/modjava.c
+++ b/src/mod/languages/mod_java/modjava.c
@@ -189,107 +189,108 @@ SWITCH_STANDARD_APP(java_function)
 
 static switch_status_t load_config(JavaVMOption **javaOptions, int *optionCount, vm_control_t * vmControl)
 {
-    switch_xml_t cfg, xml;
-    switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_xml_t cfg, xml;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	char *derr = NULL;
 
-    xml = switch_xml_open_cfg("java.conf", &cfg, NULL);
-    if (xml)
-    {
-        switch_xml_t javavm;
-        switch_xml_t options;
-        switch_xml_t startup;
-        switch_xml_t shutdown;
+	xml = switch_xml_open_cfg("java.conf", &cfg, NULL);
+	if (xml) {
+		switch_xml_t javavm;
+		switch_xml_t options;
+		switch_xml_t startup;
+		switch_xml_t shutdown;
 
-        javavm = switch_xml_child(cfg, "javavm");
-        if (javavm != NULL)
-        {
-            const char *path = switch_xml_attr_soft(javavm, "path");
-            if (path != NULL)
-            {
+		javavm = switch_xml_child(cfg, "javavm");
+		if (javavm != NULL) {
+			const char *path = switch_xml_attr_soft(javavm, "path");
+
+			if (path != NULL) {
 				javaVMHandle = switch_dso_open(path, 0, &derr);
 				if (derr || !javaVMHandle) {
                     switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error loading %s\n", path);
+					switch_safe_free(derr);
 				}
-            }
-            else
-            {
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Java VM path specified in java.conf.xml\n");
-                status = SWITCH_STATUS_FALSE;
-            }
-        }
-        else
-        {
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Java VM specified in java.conf.xml\n");
-            status = SWITCH_STATUS_FALSE;
-            goto close;
-        }
+			} else {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Java VM path specified in java.conf.xml\n");
+				status = SWITCH_STATUS_FALSE;
+			}
+		} else {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Java VM specified in java.conf.xml\n");
+				status = SWITCH_STATUS_FALSE;
+				goto close;
+		}
+
+		options = switch_xml_child(cfg, "options");
+		if (options != NULL) {
+			switch_xml_t option;
+			int i = 0;
+
+			*optionCount = 0;
+
+			for (option = switch_xml_child(options, "option"); option; option = option->next) {
+				const char *value = switch_xml_attr_soft(option, "value");
+
+				if (value != NULL) {
+					++*optionCount;
+				}
+			}
+
+			*optionCount += 1;
+			*javaOptions = switch_core_alloc(memoryPool, (switch_size_t)(*optionCount * sizeof(JavaVMOption)));
+			if (*javaOptions == NULL) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory!\n");
+				status = SWITCH_STATUS_FALSE;
+				goto close;
+			}
+
+			for (option = switch_xml_child(options, "option"); option; option = option->next) {
+				const char *value = switch_xml_attr_soft(option, "value");
+
+				if (value == NULL) {
+					continue;
+				}
+
+				(*javaOptions)[i].optionString = switch_core_strdup(memoryPool, value);
+				if ((*javaOptions)[i].optionString == NULL) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory!\n");
+					status = SWITCH_STATUS_FALSE;
+					goto close;
+				}
+
+				++i;
+			}
 
-        options = switch_xml_child(cfg, "options");
-        if (options != NULL)
-        {
-            switch_xml_t option;
-            int i = 0;
-            *optionCount = 0;
-            for (option = switch_xml_child(options, "option"); option; option = option->next)
-            {
-                const char *value = switch_xml_attr_soft(option, "value");
-                if (value != NULL)
-                    ++*optionCount;
-            }
-            *optionCount += 1;
-            *javaOptions = switch_core_alloc(memoryPool, (switch_size_t)(*optionCount * sizeof(JavaVMOption)));
-            if (*javaOptions == NULL)
-            {
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory!\n");
-                status = SWITCH_STATUS_FALSE;
-                goto close;
-            }
-            for (option = switch_xml_child(options, "option"); option; option = option->next)
-            {
-                const char *value = switch_xml_attr_soft(option, "value");
-                if (value == NULL)
-                    continue;
-                (*javaOptions)[i].optionString = switch_core_strdup(memoryPool, value);
-                if ((*javaOptions)[i].optionString == NULL)
-                {
-                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory!\n");
-                    status = SWITCH_STATUS_FALSE;
-                    goto close;
-                }
-                ++i;
-            }
 			(*javaOptions)[i].optionString = switch_core_sprintf(memoryPool, "-Djava.library.path=%s", SWITCH_GLOBAL_dirs.mod_dir);
-        }
+		}
 
-	/*
-	<startup class="net/cog/fs/system/Control" method="startup" arg="start up arg"/>
-	<shutdown class="net/cog/fs/system/Control" method="shutdown" arg="shutdown arg"/>
-	*/
+		/*
+		<startup class="net/cog/fs/system/Control" method="startup" arg="start up arg"/>
+		<shutdown class="net/cog/fs/system/Control" method="shutdown" arg="shutdown arg"/>
+		*/
 
-        memset(vmControl, 0, sizeof(struct vm_control));
-        startup = switch_xml_child(cfg, "startup");
-        if (startup != NULL) {
-            vmControl->startup.class = switch_xml_attr_soft(startup, "class");
-            vmControl->startup.method = switch_xml_attr_soft(startup, "method");
-            vmControl->startup.arg = switch_xml_attr_soft(startup, "arg");
-        }
-        shutdown = switch_xml_child(cfg, "shutdown");
-        if (shutdown != NULL) {
-            vmControl->shutdown.class = switch_xml_attr_soft(shutdown, "class");
-            vmControl->shutdown.method = switch_xml_attr_soft(shutdown, "method");
-            vmControl->shutdown.arg = switch_xml_attr_soft(shutdown, "arg");
-        }
+		memset(vmControl, 0, sizeof(struct vm_control));
+		startup = switch_xml_child(cfg, "startup");
+		if (startup != NULL) {
+			vmControl->startup.class = switch_xml_attr_soft(startup, "class");
+			vmControl->startup.method = switch_xml_attr_soft(startup, "method");
+			vmControl->startup.arg = switch_xml_attr_soft(startup, "arg");
+		}
 
-    close:
-        switch_xml_free(xml);
-    }
-    else
-    {
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening java.conf.xml\n");
-        status = SWITCH_STATUS_FALSE;
-    }
-    return status;
+		shutdown = switch_xml_child(cfg, "shutdown");
+		if (shutdown != NULL) {
+			vmControl->shutdown.class = switch_xml_attr_soft(shutdown, "class");
+			vmControl->shutdown.method = switch_xml_attr_soft(shutdown, "method");
+			vmControl->shutdown.arg = switch_xml_attr_soft(shutdown, "arg");
+		}
+
+	  close:
+		switch_xml_free(xml);
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening java.conf.xml\n");
+		status = SWITCH_STATUS_FALSE;
+	}
+
+	return status;
 }
 
 static switch_status_t create_java_vm(JavaVMOption *options, int optionCount, vm_control_t * vmControl)
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
index 89614987b5..51de531a35 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
@@ -2129,6 +2129,46 @@ SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_LOST_BURST_CAPTURE_get___()
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_uint31_t_value_set___(void * jarg1, unsigned int jarg2) {
+  switch_uint31_t *arg1 = (switch_uint31_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_uint31_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->value = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_uint31_t_value_get___(void * jarg1) {
+  unsigned int jresult ;
+  switch_uint31_t *arg1 = (switch_uint31_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_uint31_t *)jarg1; 
+  result = (unsigned int) ((arg1)->value);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_FreeSWITCHfNative_new_switch_uint31_t___() {
+  void * jresult ;
+  switch_uint31_t *result = 0 ;
+  
+  result = (switch_uint31_t *)new switch_uint31_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_delete_switch_uint31_t___(void * jarg1) {
+  switch_uint31_t *arg1 = (switch_uint31_t *) 0 ;
+  
+  arg1 = (switch_uint31_t *)jarg1; 
+  delete arg1;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_dtmf_t_digit_set___(void * jarg1, char jarg2) {
   switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
   char arg2 ;
@@ -3361,6 +3401,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_SWITCH_MAX_MANAGEMENT_BUFFER
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_SWITCH_RAND_MAX_get___() {
+  int jresult ;
+  int result;
+  
+  result = (int)(0x7fff);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_error_period_t_start_set___(void * jarg1, long long jarg2) {
   error_period *arg1 = (error_period *) 0 ;
   int64_t arg2 ;
@@ -15498,6 +15548,22 @@ SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_core_session_unlock_
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_core_codec_lock_full___(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_codec_lock_full(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_core_codec_unlock_full___(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_codec_unlock_full(arg1);
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_core_session_get_read_impl___(void * jarg1, void * jarg2) {
   int jresult ;
   switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -21077,6 +21143,22 @@ SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_frame_free___(void *
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_is_uint_in_range___(char * jarg1, unsigned int jarg2, unsigned int jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  unsigned int arg2 ;
+  unsigned int arg3 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  arg3 = (unsigned int)jarg3; 
+  result = (switch_bool_t)switch_is_uint_in_range((char const *)arg1,arg2,arg3);
+  jresult = (int)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_is_number___(char * jarg1) {
   int jresult ;
   char *arg1 = (char *) 0 ;
@@ -23505,6 +23587,16 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_memory_usage_strea
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_rand___() {
+  int jresult ;
+  int result;
+  
+  result = (int)switch_rand();
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_profile_node_t_var_set___(void * jarg1, char * jarg2) {
   profile_node_s *arg1 = (profile_node_s *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -33245,6 +33337,50 @@ SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_microsecon
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_max_ptime_set___(void * jarg1, int jarg2) {
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->max_ptime = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_max_ptime_get___(void * jarg1) {
+  int jresult ;
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  result = (int) ((arg1)->max_ptime);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_min_ptime_set___(void * jarg1, int jarg2) {
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->min_ptime = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_min_ptime_get___(void * jarg1) {
+  int jresult ;
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  result = (int) ((arg1)->min_ptime);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_stereo_set___(void * jarg1, int jarg2) {
   switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
   int arg2 ;
@@ -33267,6 +33403,28 @@ SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_stereo_get
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_sprop_stereo_set___(void * jarg1, int jarg2) {
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->sprop_stereo = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_sprop_stereo_get___(void * jarg1) {
+  int jresult ;
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  result = (int) ((arg1)->sprop_stereo);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_codec_fmtp_private_info_set___(void * jarg1, void * jarg2) {
   switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
   void *arg2 = (void *) 0 ;
@@ -36802,6 +36960,44 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_channel_get_variab
 }
 
 
+SWIGEXPORT char * SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_channel_get_variable_strdup___(void * jarg1, char * jarg2) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_channel_get_variable_strdup(arg1,(char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_channel_get_variable_buf___(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_size_t arg4 ;
+  switch_size_t *argp4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  argp4 = (switch_size_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (switch_status_t)switch_channel_get_variable_buf(arg1,(char const *)arg2,arg3,arg4);
+  jresult = (int)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_switch_channel_get_variables___(void * jarg1, void * jarg2) {
   int jresult ;
   switch_channel_t *arg1 = (switch_channel_t *) 0 ;
@@ -45117,6 +45313,50 @@ SWIGEXPORT unsigned char SWIGSTDCALL CSharp_FreeSWITCHfNative_icand_t_ready_get_
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_icand_t_responsive_set___(void * jarg1, unsigned char jarg2) {
+  icand_s *arg1 = (icand_s *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (icand_s *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->responsive = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_FreeSWITCHfNative_icand_t_responsive_get___(void * jarg1) {
+  unsigned char jresult ;
+  icand_s *arg1 = (icand_s *) 0 ;
+  uint8_t result;
+  
+  arg1 = (icand_s *)jarg1; 
+  result = (uint8_t) ((arg1)->responsive);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_icand_t_use_candidate_set___(void * jarg1, unsigned char jarg2) {
+  icand_s *arg1 = (icand_s *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (icand_s *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->use_candidate = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_FreeSWITCHfNative_icand_t_use_candidate_get___(void * jarg1) {
+  unsigned char jresult ;
+  icand_s *arg1 = (icand_s *) 0 ;
+  uint8_t result;
+  
+  arg1 = (icand_s *)jarg1; 
+  result = (uint8_t) ((arg1)->use_candidate);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_FreeSWITCHfNative_new_icand_t___() {
   void * jresult ;
   icand_s *result = 0 ;
@@ -45145,6 +45385,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_MAX_CAND_get___() {
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_FreeSWITCHfNative_MAX_CAND_IDX_COUNT_get___() {
+  int jresult ;
+  int result;
+  
+  result = (int)(2);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_FreeSWITCHfNative_ice_t_cands_set___(void * jarg1, void * jarg2) {
   ice_s *arg1 = (ice_s *) 0 ;
   icand_t (*arg2)[2] ;
diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs
index 6483ed103b..bfcee9310e 100644
--- a/src/mod/languages/mod_managed/managed/swig.cs
+++ b/src/mod/languages/mod_managed/managed/swig.cs
@@ -9283,6 +9283,14 @@ else
     freeswitchPINVOKE.switch_core_session_unlock_codec_read(SWIGTYPE_p_switch_core_session.getCPtr(session));
   }
 
+  public static void switch_core_codec_lock_full(SWIGTYPE_p_switch_core_session session) {
+    freeswitchPINVOKE.switch_core_codec_lock_full(SWIGTYPE_p_switch_core_session.getCPtr(session));
+  }
+
+  public static void switch_core_codec_unlock_full(SWIGTYPE_p_switch_core_session session) {
+    freeswitchPINVOKE.switch_core_codec_unlock_full(SWIGTYPE_p_switch_core_session.getCPtr(session));
+  }
+
   public static switch_status_t switch_core_session_get_read_impl(SWIGTYPE_p_switch_core_session session, switch_codec_implementation impp) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_get_read_impl(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_codec_implementation.getCPtr(impp));
     return ret;
@@ -10932,6 +10940,11 @@ else
     return ret;
   }
 
+  public static switch_bool_t switch_is_uint_in_range(string str, uint from, uint to) {
+    switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_is_uint_in_range(str, from, to);
+    return ret;
+  }
+
   public static switch_bool_t switch_is_number(string str) {
     switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_is_number(str);
     return ret;
@@ -11580,6 +11593,11 @@ else
     return ret;
   }
 
+  public static int switch_rand() {
+    int ret = freeswitchPINVOKE.switch_rand();
+    return ret;
+  }
+
   public static switch_caller_extension switch_caller_extension_new(SWIGTYPE_p_switch_core_session session, string extension_name, string extension_number) {
     global::System.IntPtr cPtr = freeswitchPINVOKE.switch_caller_extension_new(SWIGTYPE_p_switch_core_session.getCPtr(session), extension_name, extension_number);
     switch_caller_extension ret = (cPtr == global::System.IntPtr.Zero) ? null : new switch_caller_extension(cPtr, false);
@@ -11884,6 +11902,17 @@ else
     return ret;
   }
 
+  public static string switch_channel_get_variable_strdup(SWIGTYPE_p_switch_channel channel, string varname) {
+    string ret = freeswitchPINVOKE.switch_channel_get_variable_strdup(SWIGTYPE_p_switch_channel.getCPtr(channel), varname);
+    return ret;
+  }
+
+  public static switch_status_t switch_channel_get_variable_buf(SWIGTYPE_p_switch_channel channel, string varname, string buf, SWIGTYPE_p_switch_size_t buflen) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_get_variable_buf(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, buf, SWIGTYPE_p_switch_size_t.getCPtr(buflen));
+    if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
   public static switch_status_t switch_channel_get_variables(SWIGTYPE_p_switch_channel channel, SWIGTYPE_p_p_switch_event arg1) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_get_variables(SWIGTYPE_p_switch_channel.getCPtr(channel), SWIGTYPE_p_p_switch_event.getCPtr(arg1));
     return ret;
@@ -15163,6 +15192,7 @@ else
   public static readonly int SWITCH_MAX_STATE_HANDLERS = freeswitchPINVOKE.SWITCH_MAX_STATE_HANDLERS_get();
   public static readonly int SWITCH_CORE_QUEUE_LEN = freeswitchPINVOKE.SWITCH_CORE_QUEUE_LEN_get();
   public static readonly int SWITCH_MAX_MANAGEMENT_BUFFER_LEN = freeswitchPINVOKE.SWITCH_MAX_MANAGEMENT_BUFFER_LEN_get();
+  public static readonly int SWITCH_RAND_MAX = freeswitchPINVOKE.SWITCH_RAND_MAX_get();
   public static readonly int SWITCH_RTP_CNG_PAYLOAD = freeswitchPINVOKE.SWITCH_RTP_CNG_PAYLOAD_get();
   public static readonly int SWITCH_MEDIA_TYPE_TOTAL = freeswitchPINVOKE.SWITCH_MEDIA_TYPE_TOTAL_get();
   public static readonly int SWITCH_SOCK_INVALID = freeswitchPINVOKE.SWITCH_SOCK_INVALID_get();
@@ -15223,6 +15253,7 @@ else
   public static readonly string SWITCH_RTP_CRYPTO_KEY_80 = freeswitchPINVOKE.SWITCH_RTP_CRYPTO_KEY_80_get();
   public static readonly int SWITCH_RTP_BUNDLE_INTERNAL_PT = freeswitchPINVOKE.SWITCH_RTP_BUNDLE_INTERNAL_PT_get();
   public static readonly int MAX_CAND = freeswitchPINVOKE.MAX_CAND_get();
+  public static readonly int MAX_CAND_IDX_COUNT = freeswitchPINVOKE.MAX_CAND_IDX_COUNT_get();
   public static readonly int SWITCH_XML_BUFSIZE = freeswitchPINVOKE.SWITCH_XML_BUFSIZE_get();
 }
 
@@ -15958,6 +15989,18 @@ class freeswitchPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_LOST_BURST_CAPTURE_get___")]
   public static extern int LOST_BURST_CAPTURE_get();
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_uint31_t_value_set___")]
+  public static extern void switch_uint31_t_value_set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_uint31_t_value_get___")]
+  public static extern uint switch_uint31_t_value_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_new_switch_uint31_t___")]
+  public static extern global::System.IntPtr new_switch_uint31_t();
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_delete_switch_uint31_t___")]
+  public static extern void delete_switch_uint31_t(global::System.Runtime.InteropServices.HandleRef jarg1);
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_dtmf_t_digit_set___")]
   public static extern void switch_dtmf_t_digit_set(global::System.Runtime.InteropServices.HandleRef jarg1, char jarg2);
 
@@ -16258,6 +16301,9 @@ class freeswitchPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_SWITCH_MAX_MANAGEMENT_BUFFER_LEN_get___")]
   public static extern int SWITCH_MAX_MANAGEMENT_BUFFER_LEN_get();
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_SWITCH_RAND_MAX_get___")]
+  public static extern int SWITCH_RAND_MAX_get();
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_error_period_t_start_set___")]
   public static extern void switch_error_period_t_start_set(global::System.Runtime.InteropServices.HandleRef jarg1, long jarg2);
 
@@ -19276,6 +19322,12 @@ class freeswitchPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_core_session_unlock_codec_read___")]
   public static extern void switch_core_session_unlock_codec_read(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_core_codec_lock_full___")]
+  public static extern void switch_core_codec_lock_full(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_core_codec_unlock_full___")]
+  public static extern void switch_core_codec_unlock_full(global::System.Runtime.InteropServices.HandleRef jarg1);
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_core_session_get_read_impl___")]
   public static extern int switch_core_session_get_read_impl(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
@@ -20575,6 +20627,9 @@ class freeswitchPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_frame_free___")]
   public static extern int switch_frame_free(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_is_uint_in_range___")]
+  public static extern int switch_is_uint_in_range(string jarg1, uint jarg2, uint jarg3);
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_is_number___")]
   public static extern int switch_is_number(string jarg1);
 
@@ -21079,6 +21134,9 @@ class freeswitchPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_memory_usage_stream___")]
   public static extern string switch_memory_usage_stream(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_rand___")]
+  public static extern int switch_rand();
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_profile_node_t_var_set___")]
   public static extern void profile_node_t_var_set(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
 
@@ -23614,12 +23672,30 @@ class freeswitchPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_microseconds_per_packet_get___")]
   public static extern int switch_codec_fmtp_microseconds_per_packet_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_max_ptime_set___")]
+  public static extern void switch_codec_fmtp_max_ptime_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_max_ptime_get___")]
+  public static extern int switch_codec_fmtp_max_ptime_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_min_ptime_set___")]
+  public static extern void switch_codec_fmtp_min_ptime_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_min_ptime_get___")]
+  public static extern int switch_codec_fmtp_min_ptime_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_stereo_set___")]
   public static extern void switch_codec_fmtp_stereo_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_stereo_get___")]
   public static extern int switch_codec_fmtp_stereo_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_sprop_stereo_set___")]
+  public static extern void switch_codec_fmtp_sprop_stereo_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_sprop_stereo_get___")]
+  public static extern int switch_codec_fmtp_sprop_stereo_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_codec_fmtp_private_info_set___")]
   public static extern void switch_codec_fmtp_private_info_set(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
@@ -24487,6 +24563,12 @@ class freeswitchPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_channel_get_variable_dup___")]
   public static extern string switch_channel_get_variable_dup(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, int jarg3, int jarg4);
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_channel_get_variable_strdup___")]
+  public static extern string switch_channel_get_variable_strdup(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_channel_get_variable_buf___")]
+  public static extern int switch_channel_get_variable_buf(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3, global::System.Runtime.InteropServices.HandleRef jarg4);
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_switch_channel_get_variables___")]
   public static extern int switch_channel_get_variables(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
@@ -26272,6 +26354,18 @@ class freeswitchPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_icand_t_ready_get___")]
   public static extern byte icand_t_ready_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_icand_t_responsive_set___")]
+  public static extern void icand_t_responsive_set(global::System.Runtime.InteropServices.HandleRef jarg1, byte jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_icand_t_responsive_get___")]
+  public static extern byte icand_t_responsive_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_icand_t_use_candidate_set___")]
+  public static extern void icand_t_use_candidate_set(global::System.Runtime.InteropServices.HandleRef jarg1, byte jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_icand_t_use_candidate_get___")]
+  public static extern byte icand_t_use_candidate_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_new_icand_t___")]
   public static extern global::System.IntPtr new_icand_t();
 
@@ -26281,6 +26375,9 @@ class freeswitchPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_MAX_CAND_get___")]
   public static extern int MAX_CAND_get();
 
+  [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_MAX_CAND_IDX_COUNT_get___")]
+  public static extern int MAX_CAND_IDX_COUNT_get();
+
   [global::System.Runtime.InteropServices.DllImport("mod_managed", EntryPoint="CSharp_FreeSWITCHfNative_ice_t_cands_set___")]
   public static extern void ice_t_cands_set(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
@@ -28292,6 +28389,26 @@ public class icand_t : global::System.IDisposable {
     } 
   }
 
+  public byte responsive {
+    set {
+      freeswitchPINVOKE.icand_t_responsive_set(swigCPtr, value);
+    } 
+    get {
+      byte ret = freeswitchPINVOKE.icand_t_responsive_get(swigCPtr);
+      return ret;
+    } 
+  }
+
+  public byte use_candidate {
+    set {
+      freeswitchPINVOKE.icand_t_use_candidate_set(swigCPtr, value);
+    } 
+    get {
+      byte ret = freeswitchPINVOKE.icand_t_use_candidate_get(swigCPtr);
+      return ret;
+    } 
+  }
+
   public icand_t() : this(freeswitchPINVOKE.new_icand_t(), true) {
   }
 
@@ -31066,7 +31183,8 @@ public enum switch_call_cause_t {
   SWITCH_CAUSE_BAD_IDENTITY_INFO = 821,
   SWITCH_CAUSE_UNSUPPORTED_CERTIFICATE = 822,
   SWITCH_CAUSE_INVALID_IDENTITY = 823,
-  SWITCH_CAUSE_STALE_DATE = 824
+  SWITCH_CAUSE_STALE_DATE = 824,
+  SWITCH_CAUSE_REJECT_ALL = 825
 }
 
 }
@@ -32781,6 +32899,7 @@ public enum switch_codec_control_command_t {
   SCC_VIDEO_RESET,
   SCC_AUDIO_PACKET_LOSS,
   SCC_AUDIO_ADJUST_BITRATE,
+  SCC_AUDIO_VAD,
   SCC_DEBUG,
   SCC_CODEC_SPECIFIC
 }
@@ -32905,6 +33024,26 @@ public class switch_codec_fmtp : global::System.IDisposable {
     } 
   }
 
+  public int max_ptime {
+    set {
+      freeswitchPINVOKE.switch_codec_fmtp_max_ptime_set(swigCPtr, value);
+    } 
+    get {
+      int ret = freeswitchPINVOKE.switch_codec_fmtp_max_ptime_get(swigCPtr);
+      return ret;
+    } 
+  }
+
+  public int min_ptime {
+    set {
+      freeswitchPINVOKE.switch_codec_fmtp_min_ptime_set(swigCPtr, value);
+    } 
+    get {
+      int ret = freeswitchPINVOKE.switch_codec_fmtp_min_ptime_get(swigCPtr);
+      return ret;
+    } 
+  }
+
   public int stereo {
     set {
       freeswitchPINVOKE.switch_codec_fmtp_stereo_set(swigCPtr, value);
@@ -32915,6 +33054,16 @@ public class switch_codec_fmtp : global::System.IDisposable {
     } 
   }
 
+  public int sprop_stereo {
+    set {
+      freeswitchPINVOKE.switch_codec_fmtp_sprop_stereo_set(swigCPtr, value);
+    } 
+    get {
+      int ret = freeswitchPINVOKE.switch_codec_fmtp_sprop_stereo_get(swigCPtr);
+      return ret;
+    } 
+  }
+
   public SWIGTYPE_p_void private_info {
     set {
       freeswitchPINVOKE.switch_codec_fmtp_private_info_set(swigCPtr, SWIGTYPE_p_void.getCPtr(value));
@@ -44944,8 +45093,8 @@ public class switch_scheduler_task : global::System.IDisposable {
 namespace FreeSWITCH.Native {
 
 public enum switch_sdp_type_t {
-  SDP_TYPE_REQUEST,
-  SDP_TYPE_RESPONSE
+  SDP_OFFER,
+  SDP_ANSWER
 }
 
 }
@@ -47222,6 +47371,64 @@ public class switch_timer_interface : global::System.IDisposable {
 
 namespace FreeSWITCH.Native {
 
+public class switch_uint31_t : global::System.IDisposable {
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+  protected bool swigCMemOwn;
+
+  internal switch_uint31_t(global::System.IntPtr cPtr, bool cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+  }
+
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(switch_uint31_t obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~switch_uint31_t() {
+    Dispose();
+  }
+
+  public virtual void Dispose() {
+    lock(this) {
+      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          freeswitchPINVOKE.delete_switch_uint31_t(swigCPtr);
+        }
+        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+      }
+      global::System.GC.SuppressFinalize(this);
+    }
+  }
+
+  public uint value {
+    set {
+      freeswitchPINVOKE.switch_uint31_t_value_set(swigCPtr, value);
+    } 
+    get {
+      uint ret = freeswitchPINVOKE.switch_uint31_t_value_get(swigCPtr);
+      return ret;
+    } 
+  }
+
+  public switch_uint31_t() : this(freeswitchPINVOKE.new_switch_uint31_t(), true) {
+  }
+
+}
+
+}
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.12
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace FreeSWITCH.Native {
+
 public class switch_unicast_conninfo : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
diff --git a/src/mod/languages/mod_python3/mod_python3.c b/src/mod/languages/mod_python3/mod_python3.c
index ca05f18710..263c2de1d4 100644
--- a/src/mod/languages/mod_python3/mod_python3.c
+++ b/src/mod/languages/mod_python3/mod_python3.c
@@ -86,6 +86,9 @@ static void print_python_error(const char * script)
 {
 	PyObject *pyType = NULL, *pyValue = NULL, *pyTraceback = NULL, *pyString = NULL;
 	PyObject *pyModule=NULL, *pyFunction = NULL, *pyResult = NULL;
+#if PY_VERSION_HEX >= 0x030B0000
+	PyCodeObject *pcode = NULL;
+#endif
 	char * buffer = (char*) malloc( 20 * 1024  * sizeof(char));
 	/* Variables for the traceback */
 	PyTracebackObject * pyTB = NULL/*, *pyTB2 = NULL*/;
@@ -153,10 +156,23 @@ static void print_python_error(const char * script)
 
 		/* Traceback */
 		do {
-			sprintf((char*)sTemp, "\n\tFile: \"%s\", line %i, in %s",
+#if PY_VERSION_HEX >= 0x030B0000
+			if (pyTB->tb_frame != NULL) {
+				pcode = PyFrame_GetCode(pyTB->tb_frame);
+			} else {
+				pcode = NULL;
+			}
+
+			snprintf((char*)sTemp, sizeof(sTemp), "\n\tFile: \"%s\", line %i, in %s",
+					(pcode)?PyString_AsString(pcode->co_filename):"",
+					pyTB->tb_lineno,
+					(pcode)?PyString_AsString(pcode->co_name):"" );
+#else
+			snprintf((char*)sTemp, sizeof(sTemp), "\n\tFile: \"%s\", line %i, in %s",
 					PyString_AsString(pyTB->tb_frame->f_code->co_filename),
 					pyTB->tb_lineno,
 					PyString_AsString(pyTB->tb_frame->f_code->co_name) );
+#endif
 			strcat(buffer, (char*)sTemp);
 
 			pyTB=pyTB->tb_next;
diff --git a/src/mod/languages/mod_v8/src/fsglobal.cpp b/src/mod/languages/mod_v8/src/fsglobal.cpp
index 99a0626f8f..c360955687 100644
--- a/src/mod/languages/mod_v8/src/fsglobal.cpp
+++ b/src/mod/languages/mod_v8/src/fsglobal.cpp
@@ -169,6 +169,7 @@ JS_GLOBAL_FUNCTION_IMPL_STATIC(FetchURLHash)
 			} else {
 				/* The var exists, but is wrong type - exit with error */
 				info.GetIsolate()->ThrowException(String::NewFromUtf8(info.GetIsolate(), "Second argument is the name of an existing var of the wrong type"));
+
 				return;
 			}
 		} else if (info.Length() > 1 && info[1]->IsArray()) {
@@ -177,6 +178,7 @@ JS_GLOBAL_FUNCTION_IMPL_STATIC(FetchURLHash)
 		} else if (info.Length() > 1) {
 			/* The var exists, but is wrong type - exit with error */
 			info.GetIsolate()->ThrowException(String::NewFromUtf8(info.GetIsolate(), "Second argument is of the wrong type"));
+
 			return;
 		} else {
 			/* Second argument doesn't exist, this is also ok. The hash will be returned as the result */
@@ -185,6 +187,11 @@ JS_GLOBAL_FUNCTION_IMPL_STATIC(FetchURLHash)
 		}
 
 		curl_handle = switch_curl_easy_init();
+		if (!curl_handle) {
+			info.GetIsolate()->ThrowException(String::NewFromUtf8(info.GetIsolate(), "Failed to initiate curl easy session."));
+
+			return;
+		}
 
 		if (!strncasecmp(js_safe_str(*url), "https", 5)) {
 			switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
@@ -224,14 +231,22 @@ JS_GLOBAL_FUNCTION_IMPL_STATIC(FetchURLFile)
 		const char *url = NULL, *filename = NULL;
 		String::Utf8Value str1(info[0]);
 		String::Utf8Value str2(info[1]);
+
 		url = js_safe_str(*str1);
 		filename = js_safe_str(*str2);
 
 		curl_handle = switch_curl_easy_init();
+		if (!curl_handle) {
+			info.GetIsolate()->ThrowException(String::NewFromUtf8(info.GetIsolate(), "Failed to initiate curl easy session."));
+
+			return;
+		}
+
 		if (!strncasecmp(url, "https", 5)) {
 			switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
 			switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
 		}
+
 		config_data.isolate = info.GetIsolate();
 
 		if ((config_data.fileHandle = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) {
@@ -245,13 +260,14 @@ JS_GLOBAL_FUNCTION_IMPL_STATIC(FetchURLFile)
 
 			switch_curl_easy_perform(curl_handle);
 
-			switch_curl_easy_cleanup(curl_handle);
 			close(config_data.fileHandle);
 			info.GetReturnValue().Set(true);
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open file [%s]\n", filename);
 			info.GetReturnValue().Set(false);
 		}
+
+		switch_curl_easy_cleanup(curl_handle);
 	} else {
 		info.GetIsolate()->ThrowException(String::NewFromUtf8(info.GetIsolate(), "Invalid arguments"));
 	}
@@ -270,12 +286,19 @@ JS_GLOBAL_FUNCTION_IMPL_STATIC(FetchURL)
 	if (info.Length() >= 1) {
 		const char *url;
 		String::Utf8Value str(info[0]);
+
 		url = js_safe_str(*str);
 		if (info.Length() > 1) {
 			buffer_size = info[1]->Int32Value();
 		}
 
 		curl_handle = switch_curl_easy_init();
+		if (!curl_handle) {
+			info.GetIsolate()->ThrowException(String::NewFromUtf8(info.GetIsolate(), "Failed to initiate curl easy session."));
+
+			return;
+		}
+
 		if (!strncasecmp(url, "https", 5)) {
 			switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
 			switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
@@ -289,6 +312,7 @@ JS_GLOBAL_FUNCTION_IMPL_STATIC(FetchURL)
 		if (config_data.buffer == NULL) {
 			info.GetIsolate()->ThrowException(String::NewFromUtf8(info.GetIsolate(), "Failed to allocate data buffer."));
 			switch_curl_easy_cleanup(curl_handle);
+
 			return;
 		}
 
diff --git a/src/mod/languages/mod_v8/src/fssession.cpp b/src/mod/languages/mod_v8/src/fssession.cpp
index d3bc77ae13..2510457175 100644
--- a/src/mod/languages/mod_v8/src/fssession.cpp
+++ b/src/mod/languages/mod_v8/src/fssession.cpp
@@ -671,7 +671,7 @@ JS_SESSION_FUNCTION_IMPL(SayPhrase)
 		String::Utf8Value str(info[2]);
 		tmp = js_safe_str(*str);
 		if (!zstr(tmp.c_str())) {
-			phrase_lang = tmp;
+			phrase_lang = std::move(tmp);
 		}
 	}
 
diff --git a/src/mod/loggers/mod_logfile/mod_logfile.c b/src/mod/loggers/mod_logfile/mod_logfile.c
index 877403c5b6..e79e23129a 100644
--- a/src/mod/loggers/mod_logfile/mod_logfile.c
+++ b/src/mod/loggers/mod_logfile/mod_logfile.c
@@ -98,6 +98,8 @@ static switch_status_t mod_logfile_openlogfile(logfile_profile_t *profile, switc
 
 	stat = switch_file_open(&afd, profile->logfile, flags, SWITCH_FPROT_OS_DEFAULT, module_pool);
 	if (stat != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "logfile %s open error, status=%d\n", profile->logfile, stat);
+
 		return SWITCH_STATUS_FALSE;
 	}
 
@@ -459,7 +461,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load)
 		if ((profiles = switch_xml_child(cfg, "profiles"))) {
 			for (xprofile = switch_xml_child(profiles, "profile"); xprofile; xprofile = xprofile->next) {
 				if (load_profile(xprofile) != SWITCH_STATUS_SUCCESS) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error loading profile.");
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error loading profile.\n");
 				}
 			}
 		}
diff --git a/src/mod/loggers/mod_raven/Makefile.am b/src/mod/loggers/mod_raven/Makefile.am
deleted file mode 100644
index f62beb9081..0000000000
--- a/src/mod/loggers/mod_raven/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_raven
-
-mod_LTLIBRARIES = mod_raven.la
-mod_raven_la_SOURCES  = mod_raven.c
-mod_raven_la_CFLAGS   = $(AM_CFLAGS)
-mod_raven_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_raven_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/loggers/mod_raven/conf/autoload_configs/raven.conf.xml b/src/mod/loggers/mod_raven/conf/autoload_configs/raven.conf.xml
deleted file mode 100644
index 95125e9e85..0000000000
--- a/src/mod/loggers/mod_raven/conf/autoload_configs/raven.conf.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration name="raven.conf" description="Raven Logger">
-  <settings>
-    <param name="uri" value=""/>
-    <param name="key" value=""/>
-    <param name="secret" value=""/>
-    <param name="key" value=""/>
-    <param name="project" value=""/>
-    <param name="loglevel" value="err"/>
-    <param name="uuid" value="true"/>
-  </settings>
-</configuration>
diff --git a/src/mod/loggers/mod_raven/mod_raven.c b/src/mod/loggers/mod_raven/mod_raven.c
deleted file mode 100644
index 335294673c..0000000000
--- a/src/mod/loggers/mod_raven/mod_raven.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2010, James Martelletti <james@nerdc0re.com>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * James Martelletti <james@nerdc0re.com>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Tamas Cseke <tamas.cseke@vcc.live>
- *
- * mod_raven.c -- Raven Logging
- *
- */
-#include <switch.h>
-#include <zlib.h>
-#include <switch_curl.h>
-
-#define RAVEN_ZLIB_CHUNK 16384
-#define RAVEN_VERSION "5"
-#define RAVEN_UA "freeswitch-raven/1.0"
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_raven_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_raven_shutdown);
-SWITCH_MODULE_DEFINITION(mod_raven, mod_raven_load, mod_raven_shutdown, NULL);
-
-static switch_status_t load_config(void);
-
-static struct {
-	char *uri;
-	char *key;
-	char *secret;
-	char *project;
-	switch_bool_t log_uuid;
-	switch_log_level_t log_level;
-} globals;
-
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_uri, globals.uri);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_key, globals.key);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_secret, globals.secret);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_project, globals.project);
-
-static switch_loadable_module_interface_t raven_module_interface = {
-	/*.module_name */ modname,
-	/*.endpoint_interface */ NULL,
-	/*.timer_interface */ NULL,
-	/*.dialplan_interface */ NULL,
-	/*.codec_interface */ NULL,
-	/*.application_interface */ NULL,
-	/*.api_interface */ NULL,
-	/*.file_interface */ NULL,
-	/*.speech_interface */ NULL,
-	/*.directory_interface */ NULL
-};
-
-static switch_status_t encode(const char *raw, int raw_len, char **encoded_out)
-{
-    z_stream stream;
-    unsigned char *encoded = NULL, *compressed = NULL;
-    int ret;
-	switch_size_t compressed_size = 0, compressed_len = 0, need_bytes;
-
-    stream.zalloc = Z_NULL;
-    stream.zfree = Z_NULL;
-    stream.opaque = Z_NULL;
-    ret = deflateInit(&stream, Z_DEFAULT_COMPRESSION);
-    if (ret != Z_OK) {
-		return SWITCH_STATUS_FALSE;
-    }
-
-    stream.next_in = (unsigned char *)raw;
-    stream.avail_in = raw_len;
-
-    do {
-		compressed_size += RAVEN_ZLIB_CHUNK;
-		compressed = realloc(compressed, compressed_size + 1);
-		switch_assert(compressed != NULL);
-
-		stream.avail_out = compressed_size - compressed_len;
-		stream.next_out = compressed + compressed_len;
-
-		ret = deflate(&stream, Z_FINISH);
-		assert(ret != Z_STREAM_ERROR);
-		compressed_len = compressed_size - stream.avail_out;
-    } while (stream.avail_in != 0);
-
-	deflateEnd(&stream);
-
-	need_bytes = compressed_len * 3 + 1;
-	encoded = malloc(need_bytes);
-	switch_assert(encoded);
-	memset(encoded, 0, need_bytes);
-	switch_b64_encode(compressed, compressed_len, encoded, need_bytes);
-
-	switch_safe_free(compressed);
-
-    *encoded_out = (char *)encoded;
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t raven_capture(const char *userdata, const char *message, const char *level, const char *file, const char *func, int line)
-{
-    cJSON* json, *fingerprint;
-    char *raw_body;
-    char *encoded_body = NULL;
-    switch_time_t timestamp = switch_micro_time_now();
-    switch_status_t status = SWITCH_STATUS_SUCCESS;
-	char uuid[SWITCH_UUID_FORMATTED_LENGTH + 1];
-
-	switch_uuid_str(uuid, sizeof(uuid));
-    json = cJSON_CreateObject();
-    cJSON_AddStringToObject(json, "event_id", (const char *)uuid);
-    cJSON_AddNumberToObject(json, "timestamp", timestamp);
-    cJSON_AddStringToObject(json, "platform", RAVEN_UA);
-    cJSON_AddStringToObject(json, "project", globals.project);
-    cJSON_AddStringToObject(json, "server_name", switch_core_get_hostname());
-    cJSON_AddStringToObject(json, "level", level);
-
-	if (globals.log_uuid && !zstr(userdata)) {
-		cJSON_AddItemToObject(json, "message", cJSON_CreateStringPrintf("%s %s", userdata, message));
-	} else {
-		cJSON_AddStringToObject(json, "message", message);
-	}
-
-    fingerprint = cJSON_CreateArray();
-    cJSON_AddItemToArray(fingerprint, cJSON_CreateString(file));
-    cJSON_AddItemToArray(fingerprint, cJSON_CreateString(func));
-    cJSON_AddItemToArray(fingerprint, cJSON_CreateNumber(line));
-    cJSON_AddItemToObject(json, "fingerprint", fingerprint);
-
-    raw_body = cJSON_PrintUnformatted(json);
-
-    if ((status = encode(raw_body, strlen(raw_body), &encoded_body)) == SWITCH_STATUS_SUCCESS) {
-		int response;
-		CURL *curl_handle = switch_curl_easy_init();
-		switch_curl_slist_t * list = NULL;
-		char *auth_header = switch_mprintf("X-Sentry-Auth: Sentry sentry_version=%s,"
-										   " sentry_client=%s,"
-										   " sentry_timestamp=%d,"
-										   " sentry_key=%s,"
-										   " sentry_secret=%s",
-										   RAVEN_VERSION, RAVEN_UA,
-										   timestamp, globals.key, globals.secret);
-
-		char *url = switch_mprintf( "%s/api/%s/store/", globals.uri, globals.project);
-		switch_curl_easy_setopt(curl_handle, CURLOPT_URL,url);
-		switch_curl_easy_setopt(curl_handle, CURLOPT_POST, 1);
-		switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1);
-        switch_curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, encoded_body);
-        switch_curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDSIZE, strlen(encoded_body));
-
-		switch_curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, RAVEN_UA);
-
-		list = switch_curl_slist_append(list, auth_header);
-		list = switch_curl_slist_append(list, "Content-Type: application/octet-stream");
-		switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, list);
-
-		if (!strncasecmp(globals.uri, "https", 5)) {
-			switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
-			switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
-		}
-
-		switch_curl_easy_perform(curl_handle);
-		switch_curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &response);
-
-		if (response != 200) {
-			status = SWITCH_STATUS_FALSE;
-		}
-
-		switch_curl_easy_cleanup(curl_handle);
-		switch_curl_slist_free_all(list);
-		switch_safe_free(url);
-		switch_safe_free(auth_header);
-    }
-
-    switch_safe_free(raw_body);
-    switch_safe_free(encoded_body);
-    cJSON_Delete(json);
-
-    return status;
-}
-
-
-static switch_status_t mod_raven_logger(const switch_log_node_t *node, switch_log_level_t level)
-{
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-	if (level != SWITCH_LOG_CONSOLE && !zstr(node->data)) {
-		const char * raven_level;
-
-		switch (level) {
-		case SWITCH_LOG_DEBUG:
-			raven_level = "debug";
-			break;
-		case SWITCH_LOG_INFO:
-			raven_level = "info";
-			break;
-		case SWITCH_LOG_NOTICE:
-		case SWITCH_LOG_WARNING:
-			raven_level = "warning";
-			break;
-		case SWITCH_LOG_ERROR:
-			raven_level = "error";
-			break;
-		case SWITCH_LOG_CRIT:
-		case SWITCH_LOG_ALERT:
-			raven_level = "fatal";
-			break;
-		default:
-			raven_level = "debug";
-			break;
-		}
-
-		status = raven_capture(node->userdata, node->data, raven_level, node->file, node->func, node->line);
-	}
-
-	return status;
-}
-
-static switch_status_t load_config(void)
-{
-	char *cf = "raven.conf";
-	switch_xml_t cfg, xml, settings, param;
-
-	globals.log_level = SWITCH_LOG_WARNING;
-	globals.log_uuid = SWITCH_TRUE;
-
-	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if ((settings = switch_xml_child(cfg, "settings"))) {
-		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-			char *var = (char *) switch_xml_attr_soft(param, "name");
-			char *val = (char *) switch_xml_attr_soft(param, "value");
-
-			if (!strcmp(var, "uri")) {
-				set_global_uri(val);
-			} else if (!strcmp(var, "key")) {
-				set_global_key(val);
-			} else if (!strcmp(var, "secret")) {
-				set_global_secret(val);
-			} else if (!strcmp(var, "project")) {
-				set_global_project(val);
-			} else if (!strcasecmp(var, "loglevel") && !zstr(val)) {
-				globals.log_level = switch_log_str2level(val);
-				if (globals.log_level == SWITCH_LOG_INVALID) {
-					globals.log_level = SWITCH_LOG_WARNING;
-				}
-			} else if (!strcasecmp(var, "uuid")) {
-				globals.log_uuid = switch_true(val);
-			}
-		}
-	}
-	switch_xml_free(xml);
-
-	if (zstr(globals.uri) || zstr(globals.project) || zstr(globals.key) || zstr(globals.secret)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing parameter\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_raven_load)
-{
-	switch_status_t status;
-	*module_interface = &raven_module_interface;
-
-	memset(&globals, 0, sizeof(globals));
-
-	if ((status = load_config()) != SWITCH_STATUS_SUCCESS) {
-		return status;
-	}
-
-	switch_log_bind_logger(mod_raven_logger, globals.log_level, SWITCH_FALSE);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_raven_shutdown)
-{
-	switch_safe_free(globals.uri);
-	switch_safe_free(globals.key);
-	switch_safe_free(globals.secret);
-	switch_safe_free(globals.project);
-
-	switch_log_unbind_logger(mod_raven_logger);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
index 4e3bd81f78..8a6efbf544 100644
--- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
+++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
@@ -88,7 +88,7 @@ static size_t httpCallBack(char *buffer, size_t size, size_t nitems, void *outst
 	return size * nitems;
 }
 
-static switch_status_t set_xml_cdr_log_dirs()
+static switch_status_t set_xml_cdr_log_dirs(void)
 {
 	switch_time_exp_t tm;
 	char *path = NULL;
@@ -254,7 +254,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
 #endif
 				int wrote;
 				wrote = write(fd, xml_text, (unsigned) strlen(xml_text));
-				wrote++;
+				(void)wrote;
 				close(fd);
 			} else {
 				char ebuf[512] = { 0 };
@@ -427,7 +427,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
 #endif
 				int wrote;
 				wrote = write(fd, xml_text, (unsigned) strlen(xml_text));
-				wrote++;
+				(void)wrote;
 				close(fd);
 			} else {
 				char ebuf[512] = { 0 };
diff --git a/src/mod/xml_int/mod_xml_radius/.gitignore b/src/mod/xml_int/mod_xml_radius/.gitignore
deleted file mode 100644
index bb7ad3d288..0000000000
--- a/src/mod/xml_int/mod_xml_radius/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-freeradius-client*
\ No newline at end of file
diff --git a/src/mod/xml_int/mod_xml_radius/00_dialplan_auth.xml b/src/mod/xml_int/mod_xml_radius/00_dialplan_auth.xml
deleted file mode 100644
index 2e17abbfdd..0000000000
--- a/src/mod/xml_int/mod_xml_radius/00_dialplan_auth.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<include>
-
-  <extension name="auth" continue="true">
-    <condition field="${radius_auth_result}" expression="^$">
-      <action application="radius_auth" inline="true"/>
-    </condition>
-  </extension>
-
-  <extension name="rejections">
-    <condition field="${radius_auth_result}" expression="^2$">
-      <action application="hangup" data="CALL_REJECTED"/>
-    </condition>
-  </extension>
-
-  <extension name="timeouts">
-    <condition field="${radius_auth_result}" expression="^1$">
-      <action application="hangup" data="SWITCH_CONGESTION"/>
-    </condition>
-  </extension>
-
-  <extension name="originate_leg" continue="true">
-    <condition>
-      <action application="export" data="nolocal:h323-call-origin=originate"/>
-    </condition>
-  </extension>
-</include>
-
diff --git a/src/mod/xml_int/mod_xml_radius/Makefile.am b/src/mod/xml_int/mod_xml_radius/Makefile.am
deleted file mode 100644
index bfac0040c1..0000000000
--- a/src/mod/xml_int/mod_xml_radius/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_xml_radius
-
-RADCLIENT_VERSION=1.1.7
-RADCLIENT=freeradius-client-$(RADCLIENT_VERSION)
-RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT)
-RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT)
-RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib
-RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la
-
-mod_LTLIBRARIES = mod_xml_radius.la
-mod_xml_radius_la_SOURCES  = mod_xml_radius.c
-mod_xml_radius_la_CFLAGS   = $(AM_CFLAGS) -I$(RADCLIENT_DIR)/include
-mod_xml_radius_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(RADCLIENT_LA)
-mod_xml_radius_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
-
-BUILT_SOURCES=$(RADCLIENT_LA)
-
-$(RADCLIENT_DIR):
-	$(GETLIB) $(RADCLIENT).tar.gz
-
-$(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
-	mkdir -p $(RADCLIENT_BUILDDIR)
-	cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
-	$(TOUCH_TARGET)
-
-$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
-	cd $(RADCLIENT_BUILDDIR) && CFLAGS="$(CFLAGS)" $(MAKE)
-	$(TOUCH_TARGET)
-
-
diff --git a/src/mod/xml_int/mod_xml_radius/config.c.diff b/src/mod/xml_int/mod_xml_radius/config.c.diff
deleted file mode 100644
index 962c1e5844..0000000000
--- a/src/mod/xml_int/mod_xml_radius/config.c.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- ../../../../libs/freeradius-client-1.1.6/lib/config.c	2012-08-18 22:13:13.000000000 -0700
-+++ ./config.c	2012-08-18 22:14:08.000000000 -0700
-@@ -301,6 +301,8 @@
- 	int i;
- 	SERVER *authservers;
- 	SERVER *acctservers;
-+	OPTION *acct;
-+	OPTION *auth;
- 
-         rh->config_options = malloc(sizeof(config_options_default));
-         if (rh->config_options == NULL) 
-@@ -311,8 +313,8 @@
-         }
-         memcpy(rh->config_options, &config_options_default, sizeof(config_options_default));
- 
--        authservers = rc_conf_srv(rh, "authserver"); 
--	acctservers = rc_conf_srv(rh, "acctserver");
-+	acct = find_option(rh, "acctserver", OT_ANY);
-+	auth = find_option(rh, "authserver", OT_ANY);
- 	authservers = malloc(sizeof(SERVER));
- 	acctservers = malloc(sizeof(SERVER));
- 
-@@ -334,6 +336,8 @@
- 		acctservers->name[i] = NULL;
- 		acctservers->secret[i] = NULL;
- 	} 
-+	acct->val = acctservers;
-+	auth->val = authservers;
- 	return rh;
- }
- 
-@@ -894,11 +898,15 @@
- 			continue;
- 		if (rh->config_options[i].type == OT_SRV) {
- 		        serv = (SERVER *)rh->config_options[i].val;
--			for (j = 0; j < serv->max; j++)
-+			for (j = 0; j < serv->max; j++) {
- 				free(serv->name[j]);
--			free(serv);
--		} else {
-+				free(serv->secret[j]);
-+			}
- 			free(rh->config_options[i].val);
-+			rh->config_options[i].val = NULL;
-+			
-+		} else {
-+		  free(rh->config_options[i].val);
- 		}
- 	}
- 	free(rh->config_options);
diff --git a/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary b/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary
deleted file mode 100644
index 431d92c544..0000000000
--- a/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary
+++ /dev/null
@@ -1,244 +0,0 @@
-#
-# Updated 97/06/13 to livingston-radius-2.01 miquels@cistron.nl
-#
-#	This file contains dictionary translations for parsing
-#	requests and generating responses.  All transactions are
-#	composed of Attribute/Value Pairs.  The value of each attribute
-#	is specified as one of 4 data types.  Valid data types are:
-#
-#	string - 0-253 octets
-#	ipaddr - 4 octets in network byte order
-#	integer - 32 bit value in big endian order (high byte first)
-#	date - 32 bit value in big endian order - seconds since
-#					00:00:00 GMT,  Jan.  1,  1970
-#
-#	Enumerated values are stored in the user file with dictionary
-#	VALUE translations for easy administration.
-#
-#	Example:
-#
-#	ATTRIBUTE	  VALUE
-#	---------------   -----
-#	Framed-Protocol = PPP
-#	7		= 1	(integer encoding)
-#
-
-#
-#	Following are the proper new names. Use these.
-#
-$INCLUDE /usr/local/src/freeswitch/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary.cisco
-$INCLUDE /usr/local/src/freeswitch/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary.rfc5090
-
-ATTRIBUTE	User-Name		1	string
-ATTRIBUTE	Password		2	string
-ATTRIBUTE	CHAP-Password		3	string
-ATTRIBUTE	NAS-IP-Address		4	ipaddr
-ATTRIBUTE	NAS-Port-Id		5	integer
-ATTRIBUTE	Service-Type		6	integer
-ATTRIBUTE	Framed-Protocol		7	integer
-ATTRIBUTE	Framed-IP-Address	8	ipaddr
-ATTRIBUTE	Framed-IP-Netmask	9	ipaddr
-ATTRIBUTE	Framed-Routing		10	integer
-ATTRIBUTE	Filter-Id		11	string
-ATTRIBUTE	Framed-MTU		12	integer
-ATTRIBUTE	Framed-Compression	13	integer
-ATTRIBUTE	Login-IP-Host		14	ipaddr
-ATTRIBUTE	Login-Service		15	integer
-ATTRIBUTE	Login-TCP-Port		16	integer
-ATTRIBUTE	Reply-Message		18	string
-ATTRIBUTE	Callback-Number		19	string
-ATTRIBUTE	Callback-Id		20	string
-ATTRIBUTE	Framed-Route		22	string
-ATTRIBUTE	Framed-IPX-Network	23	ipaddr
-ATTRIBUTE	State			24	string
-ATTRIBUTE	Class			25	string
-ATTRIBUTE	Vendor-Specific		26	string
-ATTRIBUTE	Session-Timeout		27	integer
-ATTRIBUTE	Idle-Timeout		28	integer
-ATTRIBUTE	Termination-Action	29	integer
-ATTRIBUTE	Called-Station-Id	30	string
-ATTRIBUTE	Calling-Station-Id	31	string
-ATTRIBUTE	NAS-Identifier		32	string
-ATTRIBUTE	Proxy-State		33	string
-ATTRIBUTE	Login-LAT-Service	34	string
-ATTRIBUTE	Login-LAT-Node		35	string
-ATTRIBUTE	Login-LAT-Group		36	string
-ATTRIBUTE	Framed-AppleTalk-Link	37	integer
-ATTRIBUTE	Framed-AppleTalk-Network	38	integer
-ATTRIBUTE	Framed-AppleTalk-Zone	39	string
-ATTRIBUTE	Acct-Status-Type	40	integer
-ATTRIBUTE	Acct-Delay-Time		41	integer
-ATTRIBUTE	Acct-Input-Octets	42	integer
-ATTRIBUTE	Acct-Output-Octets	43	integer
-ATTRIBUTE	Acct-Session-Id		44	string
-ATTRIBUTE	Acct-Authentic		45	integer
-ATTRIBUTE	Acct-Session-Time	46	integer
-ATTRIBUTE	Acct-Input-Packets	47	integer
-ATTRIBUTE	Acct-Output-Packets	48	integer
-ATTRIBUTE	Acct-Terminate-Cause	49	integer
-ATTRIBUTE	Acct-Multi-Session-Id	50	string
-ATTRIBUTE	Acct-Link-Count		51	integer
-ATTRIBUTE	Event-Timestamp		55	integer
-ATTRIBUTE	CHAP-Challenge		60	string
-ATTRIBUTE	NAS-Port-Type		61	integer
-ATTRIBUTE	Port-Limit		62	integer
-ATTRIBUTE	Login-LAT-Port		63	integer
-ATTRIBUTE	Connect-Info		77	string
-
-#
-#	RFC3162 IPv6 attributes
-#
-ATTRIBUTE	NAS-IPv6-Address	95	string
-ATTRIBUTE	Framed-Interface-Id	96	string
-ATTRIBUTE	Framed-IPv6-Prefix	97	string
-ATTRIBUTE	Login-IPv6-Host		98	string
-ATTRIBUTE	Framed-IPv6-Route	99	string
-ATTRIBUTE	Framed-IPv6-Pool	100	string
-
-#
-#	Experimental Non Protocol Attributes used by Cistron-Radiusd
-#
-ATTRIBUTE	Huntgroup-Name		221	string
-ATTRIBUTE	User-Category		1029	string
-ATTRIBUTE	Group-Name		1030	string
-ATTRIBUTE	Simultaneous-Use	1034	integer
-ATTRIBUTE	Strip-User-Name		1035	integer
-ATTRIBUTE	Fall-Through		1036	integer
-ATTRIBUTE	Add-Port-To-IP-Address	1037	integer
-ATTRIBUTE	Exec-Program		1038	string
-ATTRIBUTE	Exec-Program-Wait	1039	string
-ATTRIBUTE	Hint			1040	string
-
-#
-#	Non-Protocol Attributes
-#	These attributes are used internally by the server
-#
-ATTRIBUTE	Expiration		  21	date
-ATTRIBUTE	Auth-Type		1000	integer
-ATTRIBUTE	Menu			1001	string
-ATTRIBUTE	Termination-Menu	1002	string
-ATTRIBUTE	Prefix			1003	string
-ATTRIBUTE	Suffix			1004	string
-ATTRIBUTE	Group			1005	string
-ATTRIBUTE	Crypt-Password		1006	string
-ATTRIBUTE	Connect-Rate		1007	integer
-
-#
-#	Integer Translations
-#
-
-#	User Types
-
-VALUE		Service-Type		Login-User		1
-VALUE		Service-Type		Framed-User		2
-VALUE		Service-Type		Callback-Login-User	3
-VALUE		Service-Type		Callback-Framed-User	4
-VALUE		Service-Type		Outbound-User		5
-VALUE		Service-Type		Administrative-User	6
-VALUE		Service-Type		NAS-Prompt-User		7
-
-#	Framed Protocols
-
-VALUE		Framed-Protocol		PPP			1
-VALUE		Framed-Protocol		SLIP			2
-
-#	Framed Routing Values
-
-VALUE		Framed-Routing		None			0
-VALUE		Framed-Routing		Broadcast		1
-VALUE		Framed-Routing		Listen			2
-VALUE		Framed-Routing		Broadcast-Listen	3
-
-#	Framed Compression Types
-
-VALUE		Framed-Compression	None			0
-VALUE		Framed-Compression	Van-Jacobson-TCP-IP	1
-
-#	Login Services
-
-VALUE		Login-Service		Telnet			0
-VALUE		Login-Service		Rlogin			1
-VALUE		Login-Service		TCP-Clear		2
-VALUE		Login-Service		PortMaster		3
-
-#	Status Types
-
-VALUE		Acct-Status-Type	Start			1
-VALUE		Acct-Status-Type	Stop			2
-VALUE		Acct-Status-Type	Alive			3
-VALUE		Acct-Status-Type	Accounting-On		7
-VALUE		Acct-Status-Type	Accounting-Off		8
-
-#	Authentication Types
-
-VALUE		Acct-Authentic		RADIUS			1
-VALUE		Acct-Authentic		Local			2
-VALUE		Acct-Authentic		PowerLink128		100
-
-#	Termination Options
-
-VALUE		Termination-Action	Default			0
-VALUE		Termination-Action	RADIUS-Request		1
-
-#	NAS Port Types, available in 3.3.1 and later
-
-VALUE		NAS-Port-Type		Async			0
-VALUE		NAS-Port-Type		Sync			1
-VALUE		NAS-Port-Type		ISDN			2
-VALUE		NAS-Port-Type		ISDN-V120		3
-VALUE		NAS-Port-Type		ISDN-V110		4
-
-#	Acct Terminate Causes, available in 3.3.2 and later
-
-VALUE           Acct-Terminate-Cause    User-Request            1
-VALUE           Acct-Terminate-Cause    Lost-Carrier            2
-VALUE           Acct-Terminate-Cause    Lost-Service            3
-VALUE           Acct-Terminate-Cause    Idle-Timeout            4
-VALUE           Acct-Terminate-Cause    Session-Timeout         5
-VALUE           Acct-Terminate-Cause    Admin-Reset             6
-VALUE           Acct-Terminate-Cause    Admin-Reboot            7
-VALUE           Acct-Terminate-Cause    Port-Error              8
-VALUE           Acct-Terminate-Cause    NAS-Error               9
-VALUE           Acct-Terminate-Cause    NAS-Request             10
-VALUE           Acct-Terminate-Cause    NAS-Reboot              11
-VALUE           Acct-Terminate-Cause    Port-Unneeded           12
-VALUE           Acct-Terminate-Cause    Port-Preempted          13
-VALUE           Acct-Terminate-Cause    Port-Suspended          14
-VALUE           Acct-Terminate-Cause    Service-Unavailable     15
-VALUE           Acct-Terminate-Cause    Callback                16
-VALUE           Acct-Terminate-Cause    User-Error              17
-VALUE           Acct-Terminate-Cause    Host-Request            18
-
-#
-#	Non-Protocol Integer Translations
-#
-
-VALUE		Auth-Type		Local			0
-VALUE		Auth-Type		System			1
-VALUE		Auth-Type		SecurID			2
-VALUE		Auth-Type		Crypt-Local		3
-VALUE		Auth-Type		Reject			4
-
-#
-#	Cistron extensions
-#
-VALUE		Auth-Type		Pam			253
-VALUE		Auth-Type		Accept			254
-
-#
-#	Experimental Non-Protocol Integer Translations for Cistron-Radiusd
-#
-VALUE		Fall-Through		No			0
-VALUE		Fall-Through		Yes			1
-VALUE		Add-Port-To-IP-Address	No			0
-VALUE		Add-Port-To-IP-Address	Yes			1
-
-#
-#	Configuration Values
-#	uncomment these two lines to turn account expiration on
-#
-
-#VALUE		Server-Config		Password-Expiration	30
-#VALUE		Server-Config		Password-Warning	5
-
-
diff --git a/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary.cisco b/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary.cisco
deleted file mode 100644
index b61c9d27cc..0000000000
--- a/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary.cisco
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- text -*-
-#
-# dictionary.cisco
-#
-#		Accounting VSAs originally by
-#		"Marcelo M. Sosa Lugones" <marcelo@sosa.com.ar>
-#
-# Version:	$Id$
-#
-#  For documentation on Cisco RADIUS attributes, see:
-#
-# http://www.cisco.com/univercd/cc/td/doc/product/access/acs_serv/vapp_dev/vsaig3.htm
-#
-#  For general documentation on Cisco RADIUS configuration, see:
-#
-# http://www.cisco.com/en/US/partner/tech/tk583/tk547/tsd_technology_support_sub-protocol_home.html
-#
-
-VENDOR		Cisco				9
-
-#
-#	Standard attribute
-#
-#BEGIN-VENDOR	Cisco
-
-ATTRIBUTE	Cisco-AVPair				1	string vendor=Cisco
-ATTRIBUTE	Cisco-NAS-Port				2	string vendor=Cisco
-
-#
-#  T.37 Store-and-Forward attributes.
-#
-ATTRIBUTE	Cisco-Fax-Account-Id-Origin		3	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Msg-Id			4	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Pages				5	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Coverpage-Flag		6	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Modem-Time			7	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Connect-Speed			8	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Recipient-Count		9	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Process-Abort-Flag		10	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Dsn-Address			11	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Dsn-Flag			12	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Mdn-Address			13	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Mdn-Flag			14	string vendor=Cisco
-ATTRIBUTE	Cisco-Fax-Auth-Status			15	string vendor=Cisco
-ATTRIBUTE	Cisco-Email-Server-Address		16	string vendor=Cisco
-ATTRIBUTE	Cisco-Email-Server-Ack-Flag		17	string vendor=Cisco
-ATTRIBUTE	Cisco-Gateway-Id			18	string vendor=Cisco
-ATTRIBUTE	Cisco-Call-Type				19	string vendor=Cisco
-ATTRIBUTE	Cisco-Port-Used				20	string vendor=Cisco
-ATTRIBUTE	Cisco-Abort-Cause			21	string vendor=Cisco
-
-#
-#  Voice over IP attributes.
-#
-ATTRIBUTE	h323-remote-address			23	string vendor=Cisco
-ATTRIBUTE	h323-conf-id				24	string vendor=Cisco
-ATTRIBUTE	h323-setup-time				25	string vendor=Cisco
-ATTRIBUTE	h323-call-origin			26	string vendor=Cisco
-ATTRIBUTE	h323-call-type				27	string vendor=Cisco
-ATTRIBUTE	h323-connect-time			28	string vendor=Cisco
-ATTRIBUTE	h323-disconnect-time			29	string vendor=Cisco
-ATTRIBUTE	h323-disconnect-cause			30	string vendor=Cisco
-ATTRIBUTE	h323-voice-quality			31	string vendor=Cisco
-ATTRIBUTE	h323-gw-id				33	string vendor=Cisco
-ATTRIBUTE	h323-incoming-conf-id			35	string vendor=Cisco
-
-ATTRIBUTE	Cisco-Policy-Up				37	string vendor=Cisco
-ATTRIBUTE	Cisco-Policy-Down			38	string vendor=Cisco
-
-ATTRIBUTE	sip-conf-id				100	string vendor=Cisco
-ATTRIBUTE	h323-credit-amount			101	string vendor=Cisco
-ATTRIBUTE	h323-credit-time			102	string vendor=Cisco
-ATTRIBUTE	h323-return-code			103	string vendor=Cisco
-ATTRIBUTE	h323-prompt-id				104	string vendor=Cisco
-ATTRIBUTE	h323-time-and-day			105	string vendor=Cisco
-ATTRIBUTE	h323-redirect-number			106	string vendor=Cisco
-ATTRIBUTE	h323-preferred-lang			107	string vendor=Cisco
-ATTRIBUTE	h323-redirect-ip-address		108	string vendor=Cisco
-ATTRIBUTE	h323-billing-model			109	string vendor=Cisco
-ATTRIBUTE	h323-currency				110	string vendor=Cisco
-ATTRIBUTE	subscriber				111	string vendor=Cisco
-ATTRIBUTE	gw-rxd-cdn				112	string vendor=Cisco
-ATTRIBUTE	gw-final-xlated-cdn			113	string vendor=Cisco
-ATTRIBUTE	remote-media-address			114	string vendor=Cisco
-ATTRIBUTE	release-source				115	string vendor=Cisco
-ATTRIBUTE	gw-rxd-cgn				116	string vendor=Cisco
-ATTRIBUTE	gw-final-xlated-cgn			117	string vendor=Cisco
-
-# SIP Attributes
-ATTRIBUTE	call-id					141	string vendor=Cisco
-ATTRIBUTE	session-protocol			142	string vendor=Cisco
-ATTRIBUTE	method					143	string vendor=Cisco
-ATTRIBUTE	prev-hop-via				144	string vendor=Cisco
-ATTRIBUTE	prev-hop-ip				145	string vendor=Cisco
-ATTRIBUTE	incoming-req-uri			146	string vendor=Cisco
-ATTRIBUTE	outgoing-req-uri			147	string vendor=Cisco
-ATTRIBUTE	next-hop-ip				148	string vendor=Cisco
-ATTRIBUTE	next-hop-dn				149	string vendor=Cisco
-ATTRIBUTE	sip-hdr					150	string vendor=Cisco
-
-#
-#	Extra attributes sent by the Cisco, if you configure
-#	"radius-server vsa accounting" (requires IOS11.2+).
-#
-ATTRIBUTE	Cisco-Multilink-ID			187	integer vendor=Cisco
-ATTRIBUTE	Cisco-Num-In-Multilink			188	integer vendor=Cisco
-ATTRIBUTE	Cisco-Pre-Input-Octets			190	integer vendor=Cisco
-ATTRIBUTE	Cisco-Pre-Output-Octets			191	integer vendor=Cisco
-ATTRIBUTE	Cisco-Pre-Input-Packets			192	integer vendor=Cisco
-ATTRIBUTE	Cisco-Pre-Output-Packets		193	integer vendor=Cisco
-ATTRIBUTE	Cisco-Maximum-Time			194	integer vendor=Cisco
-ATTRIBUTE	Cisco-Disconnect-Cause			195	integer vendor=Cisco
-ATTRIBUTE	Cisco-Data-Rate				197	integer vendor=Cisco
-ATTRIBUTE	Cisco-PreSession-Time			198	integer vendor=Cisco
-ATTRIBUTE	Cisco-PW-Lifetime			208	integer vendor=Cisco
-ATTRIBUTE	Cisco-IP-Direct				209	integer vendor=Cisco
-ATTRIBUTE	Cisco-PPP-VJ-Slot-Comp			210	integer vendor=Cisco
-ATTRIBUTE	Cisco-PPP-Async-Map			212	integer vendor=Cisco
-ATTRIBUTE	Cisco-IP-Pool-Definition		217	string vendor=Cisco
-ATTRIBUTE	Cisco-Assign-IP-Pool			218	integer vendor=Cisco
-ATTRIBUTE	Cisco-Route-IP				228	integer vendor=Cisco
-ATTRIBUTE	Cisco-Link-Compression			233	integer vendor=Cisco
-ATTRIBUTE	Cisco-Target-Util			234	integer vendor=Cisco
-ATTRIBUTE	Cisco-Maximum-Channels			235	integer vendor=Cisco
-ATTRIBUTE	Cisco-Data-Filter			242	integer vendor=Cisco
-ATTRIBUTE	Cisco-Call-Filter			243	integer vendor=Cisco
-ATTRIBUTE	Cisco-Idle-Limit			244	integer vendor=Cisco
-ATTRIBUTE	Cisco-Subscriber-Password		249	string vendor=Cisco
-ATTRIBUTE	Cisco-Account-Info			250	string vendor=Cisco
-ATTRIBUTE	Cisco-Service-Info			251	string vendor=Cisco
-ATTRIBUTE	Cisco-Command-Code			252	string vendor=Cisco
-ATTRIBUTE	Cisco-Control-Info			253	string vendor=Cisco
-ATTRIBUTE	Cisco-Xmit-Rate				255	integer vendor=Cisco
-
-VALUE	Cisco-Disconnect-Cause		Unknown			2
-VALUE	Cisco-Disconnect-Cause		CLID-Authentication-Failure 4
-VALUE	Cisco-Disconnect-Cause		No-Carrier		10
-VALUE	Cisco-Disconnect-Cause		Lost-Carrier		11
-VALUE	Cisco-Disconnect-Cause		No-Detected-Result-Codes 12
-VALUE	Cisco-Disconnect-Cause		User-Ends-Session	20
-VALUE	Cisco-Disconnect-Cause		Idle-Timeout		21
-VALUE	Cisco-Disconnect-Cause		Exit-Telnet-Session	22
-VALUE	Cisco-Disconnect-Cause		No-Remote-IP-Addr	23
-VALUE	Cisco-Disconnect-Cause		Exit-Raw-TCP		24
-VALUE	Cisco-Disconnect-Cause		Password-Fail		25
-VALUE	Cisco-Disconnect-Cause		Raw-TCP-Disabled	26
-VALUE	Cisco-Disconnect-Cause		Control-C-Detected	27
-VALUE	Cisco-Disconnect-Cause		EXEC-Program-Destroyed	28
-VALUE	Cisco-Disconnect-Cause		Timeout-PPP-LCP		40
-VALUE	Cisco-Disconnect-Cause		Failed-PPP-LCP-Negotiation 41
-VALUE	Cisco-Disconnect-Cause		Failed-PPP-PAP-Auth-Fail 42
-VALUE	Cisco-Disconnect-Cause		Failed-PPP-CHAP-Auth	43
-VALUE	Cisco-Disconnect-Cause		Failed-PPP-Remote-Auth	44
-VALUE	Cisco-Disconnect-Cause		PPP-Remote-Terminate	45
-VALUE	Cisco-Disconnect-Cause		PPP-Closed-Event	46
-VALUE	Cisco-Disconnect-Cause		Session-Timeout		100
-VALUE	Cisco-Disconnect-Cause		Session-Failed-Security	101
-VALUE	Cisco-Disconnect-Cause		Session-End-Callback	102
-VALUE	Cisco-Disconnect-Cause		Invalid-Protocol	120
-
-#END-VENDOR	Cisco
diff --git a/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary.rfc5090 b/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary.rfc5090
deleted file mode 100644
index 4feda43628..0000000000
--- a/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary.rfc5090
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- text -*-
-#
-#	Attributes and values defined in RFC 5090.
-#	http://www.ietf.org/rfc/rfc5090.txt
-#
-#	$Id$
-#
-ATTRIBUTE	Digest-Response				103	string
-ATTRIBUTE	Digest-Realm				104	string
-ATTRIBUTE	Digest-Nonce				105	string
-ATTRIBUTE	Digest-Response-Auth			106	string
-ATTRIBUTE	Digest-Nextnonce			107	string
-ATTRIBUTE	Digest-Method				108	string
-ATTRIBUTE	Digest-URI				109	string
-ATTRIBUTE	Digest-Qop				110	string
-ATTRIBUTE	Digest-Algorithm			111	string
-ATTRIBUTE	Digest-Entity-Body-Hash			112	string
-ATTRIBUTE	Digest-CNonce				113	string
-ATTRIBUTE	Digest-Nonce-Count			114	string
-ATTRIBUTE	Digest-Username				115	string
-ATTRIBUTE	Digest-Opaque				116	string
-ATTRIBUTE	Digest-Auth-Param			117	string
-ATTRIBUTE	Digest-AKA-Auts				118	string
-ATTRIBUTE	Digest-Domain				119	string
-ATTRIBUTE	Digest-Stale				120	string
-ATTRIBUTE	Digest-HA1				121	string
-ATTRIBUTE	SIP-AOR					122	string
diff --git a/src/mod/xml_int/mod_xml_radius/mod_xml_radius.c b/src/mod/xml_int/mod_xml_radius/mod_xml_radius.c
deleted file mode 100644
index f35966145f..0000000000
--- a/src/mod/xml_int/mod_xml_radius/mod_xml_radius.c
+++ /dev/null
@@ -1,1237 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * William King <william.king@quentustech.com>
- *
- * mod_xml_radius.c -- Radius authentication and authorization
- *
- */
-#include <switch.h>
-#include <freeradius-client.h>
-
-static struct {
-	switch_memory_pool_t *pool;
-	switch_xml_t auth_invite_configs;
-	switch_xml_t auth_reg_configs;
-	switch_xml_t auth_app_configs;
-	switch_xml_t acct_start_configs;
-	switch_xml_t acct_end_configs;
-	/* xml read write lock */
-} globals = {0};
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_xml_radius_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_radius_shutdown);
-SWITCH_MODULE_DEFINITION(mod_xml_radius, mod_xml_radius_load, mod_xml_radius_shutdown, NULL);
-
-int GLOBAL_DEBUG = 0;
-/*
- * Time format 0:
- * 20:16:33.479 UTC Thu May 02 2013
- *
- * Time format 1:
- * 2013-05-03T00:53:26.139798+0400
- *
- */
-int GLOBAL_TIME_FORMAT = 0;
-char *GLOBAL_TIME_ZONE = "UTC";
-static char radattrdays[7][4] = {
-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-static char radattrmonths[12][4] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-switch_status_t mod_xml_radius_new_handle(rc_handle **new_handle, switch_xml_t xml) {
-	switch_xml_t server, param;
-
-	if ( (*new_handle = rc_new()) == NULL ) {
-		goto err;
-	}
-
-	if ( rc_config_init(*new_handle) == NULL ) {
-		*new_handle = NULL;
-		goto err;
-	}
-
-	if (rc_add_config(*new_handle, "auth_order", "radius", "mod_radius_cdr.c", 0) != 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error adding auth_order\n");
-		goto err;
-	}
-
-	if ((server = switch_xml_child(xml, "connection")) == NULL ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'connection' section in config file.\n");
-		goto err;
-	}
-
-	for (param = switch_xml_child(server, "param"); param; param = param->next) {
-		char *var = (char *) switch_xml_attr_soft(param, "name");
-		char *val = (char *) switch_xml_attr_soft(param, "value");
-
-		if ( GLOBAL_DEBUG ) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Attempting to add param '%s' with value '%s' \n", var, val);
-		}
-
-		if (strncmp(var, "dictionary", 10) == 0) {
-			if ( rc_read_dictionary(*new_handle, val) != 0) {
-				goto err;
-			}
-		} else if (rc_add_config(*new_handle, var, val, "mod_xml_radius", 0) != 0) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error adding param '%s' with value '%s' \n", var, val);
-			goto err;
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
- err:
-	if ( *new_handle ) {
-		rc_destroy( *new_handle );
-		*new_handle = NULL;
-	}
-	return SWITCH_STATUS_GENERR;
-}
-
-switch_status_t do_config()
-{
-	char *conf = "xml_radius.conf";
-	switch_xml_t xml, cfg, tmp, server, param;
-	int serv, timeout, deadtime, retries, dict, seq;
-
-	/* TODO:
-	   1. Fix read/write lock on configs
-	      a. read new configs
-	      b. Create replacement xml and vas objects
-		  c. Get the write lock.
-		  d. Replace xml and vas objects
-		  e. unlock and return.
-	   2. Don't manually check for proper configs. Use the function in the client library
-	   3. Add api that would reload configs
-	 */
-
-	if (!(xml = switch_xml_open_cfg(conf, &cfg, NULL))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", conf);
-		goto err;
-	}
-
-	serv = timeout = deadtime = retries = dict = seq = 0;
-	if ((tmp = switch_xml_dup(switch_xml_child(cfg, "auth_invite"))) != NULL ) {
-		if ( (server = switch_xml_child(tmp, "connection")) != NULL) {
-				for (param = switch_xml_child(server, "param"); param; param = param->next) {
-					char *var = (char *) switch_xml_attr_soft(param, "name");
-					if ( strncmp(var, "authserver", 10) == 0 ) {
-						serv = 1;
-					} else if ( strncmp(var, "radius_timeout", 14) == 0 ) {
-						timeout = 1;
-					} else if ( strncmp(var, "radius_deadtime", 15) == 0 ) {
-						deadtime = 1;
-					} else if ( strncmp(var, "radius_retries", 14) == 0 ) {
-						retries = 1;
-					} else if ( strncmp(var, "dictionary", 10) == 0 ) {
-						dict = 1;
-					} else if ( strncmp(var, "seqfile", 7) == 0 ) {
-						seq = 1;
-					}
-				}
-
-				if ( serv && timeout && deadtime && retries && dict && seq ) {
-					globals.auth_invite_configs = tmp;
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing a require section for radius connections\n");
-					goto err;
-				}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'connection' section for auth_invite\n");
-			goto err;
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Could not find 'auth_invite' section in config file.\n");
-	}
-
-	serv = timeout = deadtime = retries = dict = seq = 0;
-	if ((tmp = switch_xml_dup(switch_xml_child(cfg, "auth_reg"))) != NULL ) {
-		if ( (server = switch_xml_child(tmp, "connection")) != NULL) {
-				for (param = switch_xml_child(server, "param"); param; param = param->next) {
-					char *var = (char *) switch_xml_attr_soft(param, "name");
-					if ( strncmp(var, "authserver", 10) == 0 ) {
-						serv = 1;
-					} else if ( strncmp(var, "radius_timeout", 14) == 0 ) {
-						timeout = 1;
-					} else if ( strncmp(var, "radius_deadtime", 15) == 0 ) {
-						deadtime = 1;
-					} else if ( strncmp(var, "radius_retries", 14) == 0 ) {
-						retries = 1;
-					} else if ( strncmp(var, "dictionary", 10) == 0 ) {
-						dict = 1;
-					} else if ( strncmp(var, "seqfile", 7) == 0 ) {
-						seq = 1;
-					}
-				}
-
-				if ( serv && timeout && deadtime && retries && dict && seq ) {
-					globals.auth_reg_configs = tmp;
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing a require section for radius connections\n");
-					goto err;
-				}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'connection' section for auth_invite\n");
-			goto err;
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Could not find 'auth_reg' section in config file.\n");
-	}
-
-	if ((tmp = switch_xml_child(cfg, "global")) != NULL ) {
-		for (param = switch_xml_child(tmp, "param"); param; param = param->next) {
-			char *name = (char *) switch_xml_attr_soft(param, "name");
-			char *value = (char *) switch_xml_attr_soft(param, "value");
-			if ( strncmp(name, "time_format", 11) == 0 && value != NULL ) {
-				GLOBAL_TIME_FORMAT = atoi(value);
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Time format changed to %d\n", GLOBAL_TIME_FORMAT);
-			}
-			if ( strncmp(name, "time_zone", 9) == 0 && value != NULL ) {
-				GLOBAL_TIME_ZONE = value;
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Time zone changed to %s\n", GLOBAL_TIME_ZONE);
-			}
-			if ( strncmp(name, "debug", 5) == 0 && value != NULL ) {
-				GLOBAL_DEBUG = atoi(value);
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Debug changed to %d\n", GLOBAL_DEBUG);
-			}
-		}
-	}
-
-	serv = timeout = deadtime = retries = dict = seq = 0;
-	if ((tmp = switch_xml_dup(switch_xml_child(cfg, "auth_app"))) != NULL ) {
-		if ( (server = switch_xml_child(tmp, "connection")) != NULL) {
-				for (param = switch_xml_child(server, "param"); param; param = param->next) {
-					char *var = (char *) switch_xml_attr_soft(param, "name");
-					if ( strncmp(var, "authserver", 10) == 0 ) {
-						serv = 1;
-					} else if ( strncmp(var, "radius_timeout", 14) == 0 ) {
-						timeout = 1;
-					} else if ( strncmp(var, "radius_deadtime", 15) == 0 ) {
-						deadtime = 1;
-					} else if ( strncmp(var, "radius_retries", 14) == 0 ) {
-						retries = 1;
-					} else if ( strncmp(var, "dictionary", 10) == 0 ) {
-						dict = 1;
-					} else if ( strncmp(var, "seqfile", 7) == 0 ) {
-						seq = 1;
-					}
-				}
-
-				if ( serv && timeout && deadtime && retries && dict && seq ) {
-					globals.auth_app_configs = tmp;
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing a require section for radius connections\n");
-					goto err;
-				}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'connection' section for auth_app\n");
-			goto err;
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Could not find 'auth_app' section in config file.\n");
-	}
-
-	serv = timeout = deadtime = retries = dict = seq = 0;
-	if (( tmp = switch_xml_dup(switch_xml_child(cfg, "acct_start"))) != NULL ) {
-		if ( (server = switch_xml_child(tmp, "connection")) != NULL) {
-				for (param = switch_xml_child(server, "param"); param; param = param->next) {
-					char *var = (char *) switch_xml_attr_soft(param, "name");
-					if ( strncmp(var, "acctserver", 10) == 0 ) {
-						serv = 1;
-					} else if ( strncmp(var, "radius_timeout", 14) == 0 ) {
-						timeout = 1;
-					} else if ( strncmp(var, "radius_deadtime", 15) == 0 ) {
-						deadtime = 1;
-					} else if ( strncmp(var, "radius_retries", 14) == 0 ) {
-						retries = 1;
-					} else if ( strncmp(var, "dictionary", 10) == 0 ) {
-						dict = 1;
-					} else if ( strncmp(var, "seqfile", 7) == 0 ) {
-						seq = 1;
-					}
-				}
-
-				if ( serv && timeout && deadtime && retries && dict && seq ) {
-					globals.acct_start_configs = tmp;
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing a require section for radius connections\n");
-					goto err;
-				}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'connection' section for acct_start\n");
-			goto err;
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Could not find 'acct_start' section in config file.\n");
-	}
-
-	serv = timeout = deadtime = retries = dict = seq = 0;
-	if (( tmp = switch_xml_dup(switch_xml_child(cfg, "acct_end"))) != NULL ) {
-		if ( (server = switch_xml_child(tmp, "connection")) != NULL) {
-				for (param = switch_xml_child(server, "param"); param; param = param->next) {
-					char *var = (char *) switch_xml_attr_soft(param, "name");
-					if ( strncmp(var, "acctserver", 10) == 0 ) {
-						serv = 1;
-					} else if ( strncmp(var, "radius_timeout", 14) == 0 ) {
-						timeout = 1;
-					} else if ( strncmp(var, "radius_deadtime", 15) == 0 ) {
-						deadtime = 1;
-					} else if ( strncmp(var, "radius_retries", 14) == 0 ) {
-						retries = 1;
-					} else if ( strncmp(var, "dictionary", 10) == 0 ) {
-						dict = 1;
-					} else if ( strncmp(var, "seqfile", 7) == 0 ) {
-						seq = 1;
-					}
-				}
-
-				if ( serv && timeout && deadtime && retries && dict && seq ) {
-					globals.acct_end_configs = tmp;
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing a require section for radius connections\n");
-					goto err;
-				}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'connection' section for acct_end\n");
-			goto err;
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Could not find 'acct_end' section in config file.\n");
-	}
-
-	if ( xml ) {
-		switch_xml_free(xml);
-		xml = NULL;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
- err:
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: Configuration error\n");
-	if ( xml ) {
-		switch_xml_free(xml);
-		xml = NULL;
-	}
-
-	return SWITCH_STATUS_GENERR;
-}
-
-switch_status_t mod_xml_radius_add_params(switch_core_session_t *session, switch_event_t *params, rc_handle *handle, VALUE_PAIR **send, switch_xml_t fields)
-{
-	switch_xml_t param;
-	void *av_value = NULL;
-
-	if ( (param = switch_xml_child(fields, "param")) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to locate a param under the fields section\n");
-		goto err;
-	}
-
-	for (; param; param = param->next) {
-		DICT_ATTR *attribute = NULL;
-		DICT_VENDOR *vendor = NULL;
-		int attr_num = 0, vend_num = 0;
-
-		char *var = (char *) switch_xml_attr(param, "name");
-		char *vend = (char *) switch_xml_attr(param, "vendor");
-		char *variable = (char *) switch_xml_attr(param, "variable");
-		char *variable_secondary = (char *) switch_xml_attr(param, "variable_secondary");
-		char *val_default = (char *) switch_xml_attr(param, "default");
-		char *skip_if_set = (char *) switch_xml_attr(param, "skip_if_set");
-		char *format = (char *) switch_xml_attr(param, "format");
-		char *other_leg = (char *) switch_xml_attr(param, "other_leg");
-                char *regex = (char *) switch_xml_attr(param, "regex");
-
-		attribute = rc_dict_findattr(handle, var);
-
-		if ( attribute == NULL ) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: Could not locate attribute '%s' in the configured dictionary\n", var);
-			goto err;
-		}
-
-		if ( GLOBAL_DEBUG ) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: dict attr '%s' value '%d' type '%d'\n",
-							  attribute->name, attribute->value, attribute->type);
-		}
-
-		attr_num = attribute->value;
-
-		if ( vend ) {
-			vendor = rc_dict_findvend(handle, vend);
-
-			if ( vendor == NULL ) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: Could not locate vendor '%s' in the configured dictionary %p\n",
-								  vend, vend);
-				goto err;
-			}
-
-			if ( GLOBAL_DEBUG ) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: dict vend name '%s' vendorpec '%d'\n",
-								  vendor->vendorname, vendor->vendorpec);
-			}
-
-			vend_num = vendor->vendorpec;
-		}
-
-		if ( var ) {
-			if ( session ) {
-				switch_channel_t *channel = switch_core_session_get_channel(session);
-				if ( skip_if_set && switch_channel_get_variable(channel, skip_if_set) ) {
-					goto end_loop;
-				}
-
-				/*  Accounting only */
-				if ( strncmp( var, "h323-setup-time", 15) == 0 ) {
-					switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel);
-					switch_time_t time = profile->times->created;
-					switch_time_exp_t tm;
-
-					if ( !time ) {
-						goto end_loop;
-					}
-
-					switch_time_exp_lt(&tm, time);
-
-					if ( GLOBAL_TIME_FORMAT == 1 ) {
-						av_value = switch_mprintf("%02u:%02u:%02u.%03u %s %s %s %02u %04u",
-												  tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec/1000,
-												  GLOBAL_TIME_ZONE, radattrdays[tm.tm_wday], radattrmonths[tm.tm_mon],
-												  tm.tm_mday, tm.tm_year + 1900);
-					} else {
-						av_value = switch_mprintf("%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-												  tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-												  tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec,
-												  tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-					}
-
-					if (rc_avpair_add(handle, send, attr_num, av_value, -1, vend_num) == NULL) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add option to handle\n");
-						goto err;
-					}
-					if ( GLOBAL_DEBUG ) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: value: %s\n", (char *) av_value);
-					}
-				} else if ( strncmp( var, "h323-connect-time", 17) == 0 ) {
-					switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel);
-					switch_time_t time = profile->times->answered;
-					switch_time_exp_t tm;
-
-					if ( !time ) {
-						goto end_loop;
-					}
-
-					switch_time_exp_lt(&tm, time);
-
-					if ( GLOBAL_TIME_FORMAT == 1 ) {
-						av_value = switch_mprintf("%02u:%02u:%02u.%03u %s %s %s %02u %04u",
-												  tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec/1000,
-												  GLOBAL_TIME_ZONE, radattrdays[tm.tm_wday], radattrmonths[tm.tm_mon],
-												  tm.tm_mday, tm.tm_year + 1900);
-					} else {
-						av_value = switch_mprintf("%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-												  tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-												  tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec,
-												  tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-					}
-
-					if (rc_avpair_add(handle, send, attr_num, av_value, -1, vend_num) == NULL) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add option to handle\n");
-						goto err;
-					}
-					if ( GLOBAL_DEBUG ) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: value: %s\n", (char *) av_value);
-					}
-				} else if ( strncmp( var, "h323-disconnect-time", 20) == 0 ) {
-					switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel);
-					switch_time_t time = profile->times->hungup;
-					switch_time_exp_t tm;
-
-					if ( !time ) {
-						if ( variable_secondary != NULL && strncmp(variable_secondary, "now", 3) == 0 ) {
-							time = switch_time_now();
-						} else {
-							goto end_loop;
-						}
-					}
-
-					switch_time_exp_lt(&tm, time);
-
-					if ( GLOBAL_TIME_FORMAT == 1 ) {
-						av_value = switch_mprintf("%02u:%02u:%02u.%03u %s %s %s %02u %04u",
-												  tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec/1000,
-												  GLOBAL_TIME_ZONE, radattrdays[tm.tm_wday], radattrmonths[tm.tm_mon],
-												  tm.tm_mday, tm.tm_year + 1900);
-					} else {
-						av_value = switch_mprintf("%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
-												  tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-												  tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec,
-												  tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600);
-					}
-
-					if (rc_avpair_add(handle, send, attr_num, av_value, -1, vend_num) == NULL) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add option to handle\n");
-						goto err;
-					}
-					if ( GLOBAL_DEBUG ) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: value: %s\n", (char *) av_value);
-					}
-				} else if ( strncmp( var, "h323-disconnect-cause", 21) == 0 ) {
-					switch_call_cause_t cause = switch_channel_get_cause(channel);
-					av_value = switch_mprintf("h323-disconnect-cause=%x", cause);
-					if (rc_avpair_add(handle, send, 30, av_value, -1, 9) == NULL) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add disconnect cause \n");
-						goto err;
-					}
-
-				} else {
-					if ( format == NULL ) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing format attribute for %s variable\n", variable);
-						goto err;
-					}
-
-					if ( attribute->type == 0 ) {
-						const char *val = NULL;
-
-						if ( other_leg ) {
-							val = switch_channel_get_variable_partner(channel, variable);
-							if ( val == NULL && variable_secondary != NULL) {
-								val = switch_channel_get_variable_partner(channel, variable_secondary);
-							}
-						} else {
-							val = switch_channel_get_variable(channel, variable);
-							if ( val == NULL && variable_secondary != NULL) {
-								val = switch_channel_get_variable(channel, variable_secondary);
-							}
-						}
-
-						if ( regex && val ) {
-                                                        switch_regex_t *re = NULL;
-                                                        int ovector[30];
-                                                        int proceed;
-                                                        char replace[1024] = "";
-                                                        proceed = 0;
-                                                        proceed = switch_regex_perform(val, regex, &re, ovector, sizeof(ovector) / sizeof(ovector[0]));
-                                                        if ( proceed > 0 ) {
-                                                            switch_regex_copy_substring(val, ovector, proceed, proceed - 1, replace, sizeof(replace));
-							    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "original value: %s, regex: %s, result: %s\n", val, regex, replace);
-                                                            val = replace;
-                                                        }
-                                                        else {
-							    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "original value: %s, regex: %s, result: nomatch, value left intact\n", val, regex);
-                                                        }
-                                                        switch_regex_safe_free(re);
-						}
-
-						if ( val == NULL && val_default != NULL) {
-							av_value = switch_mprintf(format, val_default);
-						} else {
-							av_value = switch_mprintf(format, val);
-						}
-
-						if ( GLOBAL_DEBUG ) {
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: value: %s\n", (char *) av_value);
-						}
-
-						if (rc_avpair_add(handle, send, attr_num, av_value, -1, vend_num) == NULL) {
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-											  "mod_xml_radius: failed to add option with val '%s' to handle\n", (char *) av_value);
-							goto err;
-						}
-					} else if ( attribute->type == 1 ) {
-						const char *data = switch_channel_get_variable(channel, variable);
-						int number = 0;
-
-						if ( data ) {
-							number = atoi(data);
-						}
-
-						if (rc_avpair_add(handle, send, attr_num, &number, -1, vend_num) == NULL) {
-							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-											  "mod_xml_radius: failed to add option with value '%d' to handle\n", number);
-							goto err;
-						}
-					}
-				}
-			} else if ( params ) {
-				/* Auth only */
-				char *tmp = switch_event_get_header(params, variable);
-
-				if ( GLOBAL_DEBUG ) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: param var '%s' val: %s\n", variable, tmp);
-				}
-
-				if ( tmp == NULL ) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: Unable to locate '%s' on the event\n", variable);
-					goto err;
-				}
-
-				av_value = switch_mprintf(format, tmp);
-				if (rc_avpair_add(handle, send, attr_num, av_value, -1, vend_num) == NULL) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add option to handle\n");
-					goto err;
-				}
-			} else {
-				goto err;
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: all params must have a name attribute\n");
-			goto err;
-		}
-
-	end_loop:
-		if ( av_value != NULL ) {
-			free(av_value);
-			av_value  = NULL;
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
- err:
-	if ( av_value != NULL ) {
-		free(av_value);
-		av_value  = NULL;
-	}
-	return SWITCH_STATUS_GENERR;
-
-}
-
-/* static switch_status_t name (_In_opt_z_ const char *cmd, _In_opt_ switch_core_session_t *session, _In_ switch_stream_handle_t *stream) */
-SWITCH_STANDARD_API(mod_xml_radius_debug_api)
-{
-	if ( !strncmp(cmd, "on", 2) ) {
-		GLOBAL_DEBUG = 1;
-	} else if ( !strncmp(cmd, "off", 3)){
-		GLOBAL_DEBUG = 0;
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Valid options are [yes|no]\n" );
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "debug is %s\n", (GLOBAL_DEBUG ? "on" : "off") );
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_xml_t mod_xml_radius_auth_invite(switch_event_t *params) {
-	int result = 0, param_idx = 0;
-	VALUE_PAIR *send = NULL, *recv = NULL, *service_vp = NULL;
-	char msg[512 * 10 + 1] = {0};
-	uint32_t service = PW_AUTHENTICATE_ONLY;
-	rc_handle *new_handle = NULL;
-	switch_xml_t fields, xml, dir, dom, usr, vars, var;
-	char name[512], value[512], *strtmp;
-
-	if (GLOBAL_DEBUG ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: starting invite authentication\n");
-	}
-
-	if ( mod_xml_radius_new_handle(&new_handle, globals.auth_invite_configs) != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to load radius handle for digest invite authentication\n");
-		goto err;
-	}
-
-	if ( new_handle == NULL ) {
-		goto err;
-	}
-
-	if ((fields = switch_xml_child(globals.auth_invite_configs, "fields")) == NULL ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'fields' section in config file.\n");
-		goto err;
-	}
-
-	if ( mod_xml_radius_add_params(NULL, params, new_handle, &send, fields) != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to add params to rc_handle\n");
-		goto err;
-	}
-
-	if (rc_avpair_add(new_handle, &send, PW_SERVICE_TYPE, &service, -1, 0) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add option to handle\n");
-		goto err;
-	}
-
-	result = rc_auth(new_handle, 0, send, &recv, msg);
-
-	if ( GLOBAL_DEBUG ){
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: result(RC=%d) %s \n", result, msg);
-	}
-
-	if ( result != 0 ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: Failed to authenticate\n");
-		goto err;
-	}
-
-	xml = switch_xml_new("document");
-	switch_xml_set_attr_d(xml, "type", "freeswitch/xml");
-	dir = switch_xml_add_child_d(xml, "section", 0);
-	switch_xml_set_attr_d(dir, "name", "directory");
-	dom = switch_xml_add_child_d(dir, "domain", 0);
-	switch_xml_set_attr_d(dom, "name", switch_event_get_header(params, "domain"));
-	usr = switch_xml_add_child_d(dom, "user", 0);
-	vars = switch_xml_add_child_d(usr, "variables", 0);
-
-	switch_xml_set_attr_d(usr, "id", switch_event_get_header(params, "user"));
-
-	var = switch_xml_add_child_d(vars, "variable", param_idx++);
-	switch_xml_set_attr_d(var, "name", "radius_auth_result");
-	switch_xml_set_attr_d(var, "value", "0");
-
-	service_vp = recv;
-	while (service_vp != NULL) {
-		rc_avpair_tostr(new_handle, service_vp, name, 512, value, 512);
-		if ( GLOBAL_DEBUG )
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "\tattribute (%s)[%s] found in radius packet\n", name, value);
-		var = switch_xml_add_child_d(vars, "variable", param_idx++);
-		strtmp = strdup(name);
-		switch_xml_set_attr_d(var, "name", strtmp);
-		free(strtmp);
-		strtmp = strdup(value);
-		switch_xml_set_attr_d(var, "value", strtmp);
-		free(strtmp);
-		service_vp = service_vp->next;
-	}
-
-	if ( GLOBAL_DEBUG ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XML: %s \n", switch_xml_toxml(xml, 1));
-	}
-
-	if ( recv ) {
-		rc_avpair_free(recv);
-		recv = NULL;
-	}
-	if ( send ) {
-		rc_avpair_free(send);
-		send = NULL;
-	}
-	if ( new_handle ) {
-		rc_destroy(new_handle);
-		new_handle = NULL;
-	}
-	return xml;
- err:
-	if ( recv ) {
-		rc_avpair_free(recv);
-		recv = NULL;
-	}
-	if ( send ) {
-		rc_avpair_free(send);
-		send = NULL;
-	}
-	if ( new_handle ) {
-		rc_destroy(new_handle);
-		new_handle = NULL;
-	}
-
-	return NULL;
-}
-
-switch_xml_t mod_xml_radius_auth_reg(switch_event_t *params) {
-	int result = 0, param_idx = 0;
-	VALUE_PAIR *send = NULL, *recv = NULL, *service_vp = NULL;
-	char msg[512 * 10 + 1] = {0};
-	uint32_t service = PW_AUTHENTICATE_ONLY;
-	rc_handle *new_handle = NULL;
-	switch_xml_t fields, xml, dir, dom, usr, vars, var;
-	char name[512], value[512], *strtmp;
-
-	if (GLOBAL_DEBUG ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: starting registration authentication\n");
-	}
-
-	if ( mod_xml_radius_new_handle(&new_handle, globals.auth_reg_configs) != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to load radius handle for registration authentication\n");
-		goto err;
-	}
-
-	if ( new_handle == NULL ) {
-		goto err;
-	}
-
-	if ((fields = switch_xml_child(globals.auth_reg_configs, "fields")) == NULL ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'fields' section in config file.\n");
-		goto err;
-	}
-
-	if ( mod_xml_radius_add_params(NULL, params, new_handle, &send, fields) != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to add params to rc_handle\n");
-		goto err;
-	}
-
-	if (rc_avpair_add(new_handle, &send, PW_SERVICE_TYPE, &service, -1, 0) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add option to handle\n");
-		goto err;
-	}
-
-	result = rc_auth(new_handle, 0, send, &recv, msg);
-
-	if ( GLOBAL_DEBUG ){
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: result(RC=%d) %s \n", result, msg);
-	}
-
-	if ( result != 0 ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: Failed to authenticate\n");
-		goto err;
-	}
-
-	xml = switch_xml_new("document");
-	switch_xml_set_attr_d(xml, "type", "freeswitch/xml");
-	dir = switch_xml_add_child_d(xml, "section", 0);
-	switch_xml_set_attr_d(dir, "name", "directory");
-	dom = switch_xml_add_child_d(dir, "domain", 0);
-	switch_xml_set_attr_d(dom, "name", switch_event_get_header(params, "domain"));
-	usr = switch_xml_add_child_d(dom, "user", 0);
-	vars = switch_xml_add_child_d(usr, "variables", 0);
-
-	switch_xml_set_attr_d(usr, "id", switch_event_get_header(params, "user"));
-
-	service_vp = recv;
-	while (service_vp != NULL) {
-		rc_avpair_tostr(new_handle, service_vp, name, 512, value, 512);
-		if ( GLOBAL_DEBUG )
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "\tattribute (%s)[%s] found in radius packet\n", name, value);
-		var = switch_xml_add_child_d(vars, "variable", param_idx++);
-		strtmp = strdup(name);
-		switch_xml_set_attr_d(var, "name", strtmp);
-		free(strtmp);
-		strtmp = strdup(value);
-		switch_xml_set_attr_d(var, "value", strtmp);
-		free(strtmp);
-		service_vp = service_vp->next;
-	}
-
-	if ( GLOBAL_DEBUG ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XML: %s \n", switch_xml_toxml(xml, 1));
-	}
-
-	if ( recv ) {
-		rc_avpair_free(recv);
-		recv = NULL;
-	}
-	if ( send ) {
-		rc_avpair_free(send);
-		send = NULL;
-	}
-	if ( new_handle ) {
-		rc_destroy(new_handle);
-		new_handle = NULL;
-	}
-
-	return xml;
- err:
-	if ( recv ) {
-		rc_avpair_free(recv);
-		recv = NULL;
-	}
-	if ( send ) {
-		rc_avpair_free(send);
-		send = NULL;
-	}
-	if ( new_handle ) {
-		rc_destroy(new_handle);
-		new_handle = NULL;
-	}
-
-	return NULL;
-}
-
-static switch_xml_t mod_xml_radius_directory_search(const char *section, const char *tag_name, const char *key_name, const char *key_value,
-													switch_event_t *params,	void *user_data)
-{
-	char *event_buf = NULL;
-	switch_xml_t xml = NULL;
-	char *auth_method = switch_event_get_header(params,"sip_auth_method");
-
-
-	if ( GLOBAL_DEBUG ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: starting authentication\n");
-		switch_event_serialize(params, &event_buf, SWITCH_TRUE);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event: %s \n", event_buf);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "\nSection: %s \nTag: %s\nKey_name: %s\nKey_value: %s\n",
-						  section, tag_name, key_name, key_value);
-	}
-
-	if ( auth_method == NULL) {
-		return NULL;
-	}
-
-	if ( strncmp( "INVITE", auth_method, 6) == 0) {
-		xml = mod_xml_radius_auth_invite(params);
-	} else if ( strncmp( "REGISTER", auth_method, 8) == 0) {
-		xml = mod_xml_radius_auth_reg(params);
-	} else {
-		xml = NULL;
-	}
-
-	return xml;
-}
-
-switch_status_t mod_xml_radius_check_conditions(switch_channel_t *channel, switch_xml_t conditions) {
-	switch_xml_t condition, param;
-	char *channel_var = NULL;
-	const char *channel_val = NULL;
-	char *regex = NULL;
-	char *anti = NULL;
-	int all_matched = 1;
-	int result = 0;
-
-	if ( (condition = switch_xml_child(conditions, "condition")) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to locate a condition under the conditions section\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	for (; condition; condition = condition->next) {
-
-		if ( (param = switch_xml_child(condition, "param")) == NULL) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to locate a param under this condition\n");
-			return SWITCH_STATUS_FALSE;
-		}
-
-		all_matched = 1;
-		for (; param && all_matched; param = param->next) {
-			channel_var = (char *) switch_xml_attr(param, "var");
-			regex = (char *) switch_xml_attr(param, "regex");
-			anti = (char *) switch_xml_attr(param, "anti");
-
-			if ( channel_var == NULL || regex == NULL ) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Improperly constructed mod_radius condition: %s %s\n", channel_var, regex);
-				continue;
-			}
-
-			if ( ( channel_val = switch_channel_get_variable(channel, channel_var) ) == NULL ) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-								  "Improperly constructed mod_radius condition, no such channel variable: %s %s\n", channel_var, regex);
-				continue;
-			}
-
-			result = ( switch_regex_match( channel_val, regex) != SWITCH_STATUS_SUCCESS);
-			if (( anti == NULL && result ) || ( anti != NULL && !result ) ){
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Didn't match: %s == %s \n", switch_channel_get_variable(channel, channel_var), regex);
-				all_matched = 0;
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Result of %s match: %s == %s \n",
-								  anti, switch_channel_get_variable(channel, channel_var), regex);
-			}
-		}
-
-		if ( all_matched ) {
-			return SWITCH_STATUS_SUCCESS;
-		}
-	}
-
-	return SWITCH_STATUS_FALSE;
-}
-
-switch_status_t mod_xml_radius_accounting_start(switch_core_session_t *session){
-	VALUE_PAIR *send = NULL;
-	uint32_t service = PW_STATUS_START;
-	rc_handle *new_handle = NULL;
-	switch_xml_t fields, conditions;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-
-	if (GLOBAL_DEBUG ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: starting accounting start\n");
-		switch_core_session_execute_application(session, "info", NULL);
-	}
-
-	/* If there are conditions defined, and none of them pass, then skip this accounting */
-	if ((conditions = switch_xml_child(globals.acct_start_configs, "conditions")) != NULL &&
-		mod_xml_radius_check_conditions(channel, conditions) != SWITCH_STATUS_SUCCESS ) {
-		goto end;
-	}
-
-	if ( mod_xml_radius_new_handle(&new_handle, globals.acct_start_configs) != SWITCH_STATUS_SUCCESS || new_handle == NULL ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create new accounting_start handle for call: %s\n",
-						  switch_channel_get_variable(channel, "uuid"));
-		goto end;
-	}
-
-	if ((fields = switch_xml_child(globals.acct_start_configs, "fields")) == NULL ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'fields' section in config file.\n");
-		goto end;
-	}
-
-	if ( mod_xml_radius_add_params(session, NULL, new_handle, &send, fields) != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to add params to rc_handle\n");
-		goto end;
-	}
-
-	if (rc_avpair_add(new_handle, &send, PW_ACCT_STATUS_TYPE, &service, -1, 0) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add option to handle\n");
-		goto end;
-	}
-
-	if (rc_acct(new_handle, 0, send) == OK_RC) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "mod_xml_radius:  Accounting Start success\n");
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius:  Accounting Start failed\n");
-	}
-
- end:
-	if ( send ) {
-		rc_avpair_free(send);
-		send = NULL;
-	}
-	if ( new_handle ) {
-		rc_destroy(new_handle);
-		new_handle = NULL;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t mod_xml_radius_accounting_end(switch_core_session_t *session){
-	VALUE_PAIR *send = NULL;
-	uint32_t service = PW_STATUS_STOP;
-	rc_handle *new_handle = NULL;
-	switch_xml_t fields = NULL, conditions = NULL;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-
-	if (GLOBAL_DEBUG ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: starting accounting stop\n");
-		switch_core_session_execute_application(session, "info", NULL);
-	}
-
-	/* If there are conditions defined, and none of them pass, then skip this accounting */
-	if ((conditions = switch_xml_child(globals.acct_end_configs, "conditions")) != NULL &&
-		mod_xml_radius_check_conditions(channel, conditions) != SWITCH_STATUS_SUCCESS ) {
-		goto end;
-	}
-
-	if ( mod_xml_radius_new_handle(&new_handle, globals.acct_end_configs) != SWITCH_STATUS_SUCCESS || new_handle == NULL ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create new accounting_end handle for call: %s\n",
-						  switch_channel_get_variable(channel, "uuid"));
-		goto end;
-	}
-
-	if ((fields = switch_xml_child(globals.acct_end_configs, "fields")) == NULL ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'fields' section in config file.\n");
-		goto end;
-	}
-
-	if ( mod_xml_radius_add_params(session, NULL, new_handle, &send, fields) != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to add params to rc_handle\n");
-		goto end;
-	}
-
-	if (rc_avpair_add(new_handle, &send, PW_ACCT_STATUS_TYPE, &service, -1, 0) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add option to handle\n");
-		goto end;
-	}
-
-	if (rc_acct(new_handle, 0, send) == OK_RC) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "mod_xml_radius:  Accounting Stop success\n");
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius:  Accounting Stop failed\n");
-	}
-
- end:
-	if ( send ) {
-		rc_avpair_free(send);
-		send = NULL;
-	}
-	if ( new_handle) {
-		rc_destroy(new_handle);
-		new_handle = NULL;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_APP(radius_auth_handle)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	int result = 0;
-	VALUE_PAIR *send = NULL, *recv = NULL, *service_vp = NULL;
-	char msg[512 * 10 + 1] = {0};
-	uint32_t service = PW_AUTHENTICATE_ONLY;
-	rc_handle *new_handle = NULL;
-	switch_xml_t fields;
-	char name[512], value[512], *temp = NULL;
-
-	if (GLOBAL_DEBUG ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: starting app authentication\n");
-	}
-
-	if ( mod_xml_radius_new_handle(&new_handle, globals.auth_app_configs) != SWITCH_STATUS_SUCCESS || new_handle == NULL ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create new authentication handle for call: %s\n",
-						  switch_channel_get_variable(channel, "uuid"));
-		goto err;
-	}
-
-	if ((fields = switch_xml_child(globals.auth_app_configs, "fields")) == NULL ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find 'fields' section in config file.\n");
-		goto err;
-	}
-
-	if ( mod_xml_radius_add_params(session, NULL, new_handle, &send, fields) != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to add params to rc_handle\n");
-		goto err;
-	}
-
-	if (rc_avpair_add(new_handle, &send, PW_SERVICE_TYPE, &service, -1, 0) == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: failed to add option to handle\n");
-		goto err;
-	}
-
-	result = rc_auth(new_handle, 0, send, &recv, msg);
-
-	if ( GLOBAL_DEBUG ){
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: result(RC=%d) %s \n", result, msg);
-	}
-	temp = switch_mprintf("%d",result);
-	switch_channel_set_variable(channel, "radius_auth_result", temp);
-	free(temp);
-	temp = NULL;
-
-	if ( result != 0 ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: Failed to authenticate, authentication result: %d \n", result);
-		goto err;
-	}
-
-
-	service_vp = recv;
-	while (service_vp != NULL) {
-		rc_avpair_tostr(new_handle, service_vp, name, 512, value, 512);
-		if ( GLOBAL_DEBUG )
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "\tattribute (%s)[%s] found in radius packet\n", name, value);
-
-		switch_channel_set_variable(channel, name, value);
-		service_vp = service_vp->next;
-	}
-
-	if ( recv ) {
-		rc_avpair_free(recv);
-		recv = NULL;
-	}
-	if ( send ) {
-		rc_avpair_free(send);
-		send = NULL;
-	}
-	if ( new_handle ) {
-		rc_destroy(new_handle);
-		new_handle = NULL;
-	}
-
-	return;
- err:
-	if ( recv ) {
-		rc_avpair_free(recv);
-		recv = NULL;
-	}
-	if ( send ) {
-		rc_avpair_free(send);
-		send = NULL;
-	}
-	if ( new_handle ) {
-		rc_destroy(new_handle);
-		new_handle = NULL;
-	}
-	return;
-}
-
-static const switch_state_handler_table_t state_handlers = {
-	/*.on_init */ NULL,
-	/*.on_routing */ mod_xml_radius_accounting_start,
-	/*.on_execute */ NULL,
-	/*.on_hangup */ NULL,
-	/*.on_exchange_media */ NULL,
-	/*.on_soft_execute */ NULL,
-	/*.on_consume_media */ NULL,
-	/*.on_hibernate */ NULL,
-	/*.on_reset */ NULL,
-	/*.on_park */ NULL,
-	/*.on_reporting */ mod_xml_radius_accounting_end
-};
-
-
-/* switch_status_t name (switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
-SWITCH_MODULE_LOAD_FUNCTION(mod_xml_radius_load)
-{
-	switch_api_interface_t *mod_xml_radius_api_interface;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_application_interface_t *app_interface;
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-	memset(&globals, 0, sizeof(globals));
-	globals.pool = pool;
-
-	if ( GLOBAL_DEBUG != 0 ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: loading\n");
-	}
-
-	if ( (status = do_config()) != SWITCH_STATUS_SUCCESS ) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mod_xml_radius: Failed to load configs\n");
-		return SWITCH_STATUS_TERM;
-	}
-
-	if ( globals.auth_invite_configs && globals.auth_reg_configs ) {
-		status = switch_xml_bind_search_function(mod_xml_radius_directory_search, switch_xml_parse_section_string("directory"), NULL);
-	}
-
-	SWITCH_ADD_API(mod_xml_radius_api_interface, "xml_radius_debug", "mod_xml_radius toggle debug", mod_xml_radius_debug_api, NULL);
-
-	switch_core_add_state_handler(&state_handlers);
-
-	SWITCH_ADD_APP(app_interface, "radius_auth", NULL, NULL, radius_auth_handle, "radius_auth", SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC);
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_radius_shutdown)
-{
-	switch_core_remove_state_handler(&state_handlers);
-	switch_xml_unbind_search_function_ptr(mod_xml_radius_directory_search);
-
-	if ( globals.auth_invite_configs ) {
-		switch_xml_free(globals.auth_invite_configs);
-	}
-	if ( globals.auth_reg_configs ) {
-		switch_xml_free(globals.auth_reg_configs);
-	}
-	if ( globals.auth_app_configs ) {
-		switch_xml_free(globals.auth_app_configs);
-	}
-	if ( globals.acct_start_configs ) {
-		switch_xml_free(globals.acct_start_configs);
-	}
-	if ( globals.acct_end_configs ) {
-		switch_xml_free(globals.acct_end_configs);
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml b/src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml
deleted file mode 100644
index 028ace286a..0000000000
--- a/src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<configuration name="xml_radius.conf" description="Radius XML Gateway">
-  <!--
-     auth_invite is only called when a directory lookup is done on an inbound invite. Usually that means a digest auth challenge on the invite.
-
-     auth_reg is only called on the actual registration.
-
-     auth_app is used when an invite is in the dialplan. If your profile requires digest auth then this isn't needed.
-              but if your profile is doing only ip authentication this allows you to authenticate the call without the need for digest auth.
-
-     acct_start happens when the call goes into the state 'routing' which means it is starting the dialplan
-  -->
-  <auth_invite>
-    <connection name="testing">
-      <param name="authserver" value="127.0.0.1:1812:testing123"/>
-      <param name="radius_timeout" value="10"/>
-      <param name="radius_retries" value="2"/>
-      <param name="radius_deadtime" value="0"/>
-      <param name="dictionary" value="/usr/local/src/freeswitch/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary"/>
-      <param name="seqfile" value="/var/run/radius.seq"/>
-    </connection>
-    <fields>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="src-gw-ip=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
-      <param vendor="Cisco" name="h323-conf-id" variable="Core-UUID" format="%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="request-type=number"/>
-      <param name="Called-Station-Id" variable="sip_to_user" format="%s"/>
-      <param name="Calling-Station-Id" variable="sip_from_user" format="%s"/>
-      <param name="User-Name" variable="sip_from_user" format="%s"/>
-      <param name="Digest-Response" variable="sip_auth_response" format="%s"/>
-      <param name="Digest-Realm" variable="sip_auth_realm" format="%s"/>
-      <param name="Digest-Nonce" variable="sip_auth_nonce" format="%s"/>
-      <param name="Digest-Username" variable="sip_auth_username" format="%s"/>
-      <param name="Digest-URI" variable="sip_auth_uri" format="%s"/>
-      <param name="Digest-Method" variable="sip_auth_method" format="%s"/>
-      <param name="Digest-Algorithm" variable="sip_auth_method" format="MD5"/>
-      <param name="Digest-Qop" variable="sip_auth_qop" format="%s"/>
-      <param name="Digest-CNonce" variable="sip_auth_cnonce" format="%s"/>
-      <param name="Digest-Nonce-Count" variable="sip_auth_nc" format="%s"/>
-    </fields>
-  </auth_invite>
-  <auth_reg>
-    <connection name="testing">
-      <param name="authserver" value="127.0.0.1:1812:testing123"/>
-      <param name="radius_timeout" value="10"/>
-      <param name="radius_retries" value="2"/>
-      <param name="radius_deadtime" value="0"/>
-      <param name="dictionary" value="/usr/local/src/freeswitch/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary"/>
-      <param name="seqfile" value="/var/run/radius.seq"/>
-    </connection>
-    <fields>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="request-type=user"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="src-gw-ip=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
-      <param name="User-Name" variable="sip_from_user" format="%s"/>
-      <param name="Digest-Response" variable="sip_auth_response" format="%s"/>
-      <param name="Digest-Realm" variable="sip_auth_realm" format="%s"/>
-      <param name="Digest-Nonce" variable="sip_auth_nonce" format="%s"/>
-      <param name="Digest-Username" variable="sip_auth_username" format="%s"/>
-      <param name="Digest-URI" variable="sip_auth_uri" format="%s"/>
-      <param name="Digest-Method" variable="sip_auth_method" format="%s"/>
-      <param name="Digest-Algorithm" variable="sip_auth_method" format="MD5"/>
-      <param name="Digest-Qop" variable="sip_auth_qop" format="%s"/>
-      <param name="Digest-CNonce" variable="sip_auth_cnonce" format="%s"/>
-      <param name="Digest-Nonce-Count" variable="sip_auth_nc" format="%s"/>
-    </fields>
-  </auth_reg>
-  <auth_app>
-    <connection name="testing">
-      <param name="authserver" value="127.0.0.1:1812:testing123"/>
-      <param name="radius_timeout" value="10"/>
-      <param name="radius_retries" value="2"/>
-      <param name="radius_deadtime" value="0"/>
-      <param name="dictionary" value="/usr/local/src/freeswitch/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary"/>
-      <param name="seqfile" value="/var/run/radius.seq"/>
-    </connection>
-    <fields>
-      <param vendor="Cisco" name="h323-conf-id" variable_secondary="uuid" variable="originating_leg_uuid" format="%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="uuid" format="h323-call-id=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_network_ip" format="src-gw-ip=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-number-in=%s" />
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_user" format="dst-number-in=%s" />
-      <param name="Called-Station-Id" variable="sip_to_user" format="%s"/>
-      <param name="Calling-Station-Id" variable="sip_from_user" format="%s"/>
-    </fields>
-  </auth_app>
-  <auth_reg>
-    <connection name="testing">
-      <param name="authserver" value="127.0.0.1:1812:testing123"/>
-      <param name="radius_timeout" value="10"/>
-      <param name="radius_retries" value="2"/>
-      <param name="radius_deadtime" value="0"/>
-      <param name="dictionary" value="/usr/share/freeradius/dictionary.cisco"/>
-      <param name="seqfile" value="/var/run/radius.seq"/>
-    </connection>
-    <fields>
-    </fields>
-  </auth_reg>
-  <acct_start>
-    <connection name="testing">
-      <param name="acctserver" value="127.0.0.1:1813:testing123"/>
-      <param name="radius_timeout" value="10"/>
-      <param name="radius_retries" value="0"/>
-      <param name="radius_deadtime" value="0"/>
-      <param name="dictionary" value="/usr/local/src/freeswitch/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary"/>
-      <param name="seqfile" value="/var/run/radius.seq"/>
-    </connection>
-    <fields>
-      <param vendor="Cisco" name="h323-call-origin" variable="h323-call-origin" default="answer" format="%s"/>
-      <param vendor="Cisco" name="h323-conf-id" variable_secondary="uuid" variable="originating_leg_uuid" format="%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="uuid" format="h323-call-id=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_contact_host" format="src-gw-ip=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-gw-name=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-number-in=%s" />
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-number-out=%s" />
-      <param name="Calling-Station-Id" variable="sip_from_user" variable_secondary="ani" format="%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_host" format="dst-gw-ip=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="destination_number" format="dst-gw-name=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="destination_number" format="dst-number-in=%s" />
-      <param vendor="Cisco" name="Cisco-AVPair" variable="destination_number" format="dst-number-out=%s" />
-      <param name="Called-Station-Id" variable="destination_number" format="%s"/>
-      <param vendor="Cisco" name="h323-setup-time"/>
-    </fields>
-  <conditions>
-    <condition>
-      <!-- anti="true" will cause any leg that matches to not be logged -->
-      <param var="sip_to_host" regex="^8\.8\.8\.8" anti="true"/>
-    </condition>
-  </conditions>
-  </acct_start>
-  <acct_end>
-    <connection name="testing">
-      <param name="acctserver" value="127.0.0.1:1813:testing123"/>
-      <param name="radius_timeout" value="10"/>
-      <param name="radius_retries" value="0"/>
-      <param name="radius_deadtime" value="0"/>
-      <param name="dictionary" value="/usr/local/src/freeswitch/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary"/>
-      <param name="seqfile" value="/var/run/radius.seq"/>
-    </connection>
-    <fields>
-      <param vendor="Cisco" name="h323-call-origin" variable="h323-call-origin" default="answer" format="%s"/>
-      <param vendor="Cisco" name="h323-conf-id" variable_secondary="uuid" variable="originating_leg_uuid" format="%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="uuid" format="h323-call-id=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_contact_host" format="src-gw-ip=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-gw-name=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-number-in=%s" />
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-number-out=%s" />
-      <param name="Calling-Station-Id" variable="sip_from_user" variable_secondary="ani" format="%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_host" format="dst-gw-ip=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_user" variable_secondary="dialed_extension" format="dst-gw-name=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_user" variable_secondary="dialed_extension" format="dst-number-in=%s" />
-      <param name="Called-Station-Id" variable="destination_number" format="%s"/>
-      <param vendor="Cisco" name="h323-setup-time"/>
-      <param vendor="Cisco" name="h323-connect-time"/>
-      <param vendor="Cisco" name="h323-disconnect-time"/>
-      <param vendor="Cisco" name="h323-disconnect-cause"/>
-      <param name="Acct-Session-Time" variable="billsec" format="%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable_secondary="progressmsec" variable="progress_mediamsec" format="pdd-time=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="destination_number" format="dst-number-out=%s"/>
-    </fields>
-  <conditions>
-    <condition>
-      <param var="sip_to_host" regex="^8\.8\.8\.8" anti="true"/>
-    </condition>
-  </conditions>
-  </acct_end>
-</configuration>
diff --git a/src/switch.c b/src/switch.c
index 19a3d93fad..5011ff2d46 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -101,7 +101,7 @@ static void handle_SIGTERM(int sig)
 }
 
 /* kill a freeswitch process running in background mode */
-static int freeswitch_kill_background()
+static int freeswitch_kill_background(void)
 {
 	FILE *f;					/* FILE handle to open the pid file */
 	char path[PATH_MAX] = "";		/* full path of the PID file */
diff --git a/src/switch_apr.c b/src/switch_apr.c
index 9bc5d8a759..bd6cfdec56 100644
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -74,7 +74,16 @@
 #if (defined(HAVE_LIBMD5) || defined(HAVE_LIBMD) || defined(HAVE_MD5INIT))
 #include <md5.h>
 #elif defined(HAVE_LIBCRYPTO)
-#include <openssl/md5.h>
+	#ifndef OPENSSL_VERSION_NUMBER
+		#include <openssl/opensslv.h>
+	#endif
+	#if OPENSSL_VERSION_NUMBER < 0x30000000
+		#include <openssl/md5.h>
+	#else
+		#include <openssl/evp.h>
+	#endif
+#else
+	#include <apr_md5.h>
 #endif
 
 #ifndef WIN32
@@ -1174,11 +1183,24 @@ SWITCH_DECLARE(switch_status_t) switch_md5(unsigned char digest[SWITCH_MD5_DIGES
 
 	return SWITCH_STATUS_SUCCESS;
 #elif defined(HAVE_LIBCRYPTO)
-	MD5_CTX md5_context;
+	#if OPENSSL_VERSION_NUMBER < 0x30000000
+		MD5_CTX md5_context;
 
-	MD5_Init(&md5_context);
-	MD5_Update(&md5_context, input, inputLen);
-	MD5_Final(digest, &md5_context);
+		MD5_Init(&md5_context);
+		MD5_Update(&md5_context, input, inputLen);
+		MD5_Final(digest, &md5_context);
+	#else
+		EVP_MD_CTX *md5_context;
+
+		/* MD5_Init */
+		md5_context = EVP_MD_CTX_new();
+		EVP_DigestInit_ex(md5_context, EVP_md5(), NULL);
+		/* MD5_Update */
+		EVP_DigestUpdate(md5_context, input, inputLen);
+		/* MD5_Final */
+		EVP_DigestFinal_ex(md5_context, digest, NULL);
+		EVP_MD_CTX_free(md5_context);
+	#endif
 
 	return SWITCH_STATUS_SUCCESS;
 #else
diff --git a/src/switch_channel.c b/src/switch_channel.c
index ea3f66c246..66e18a323c 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -135,6 +135,7 @@ static struct switch_cause_table CAUSE_CHART[] = {
 	{"UNSUPPORTED_CERTIFICATE", SWITCH_CAUSE_UNSUPPORTED_CERTIFICATE},
 	{"INVALID_IDENTITY", SWITCH_CAUSE_INVALID_IDENTITY},
 	{"STALE_DATE", SWITCH_CAUSE_STALE_DATE},
+	{"REJECT_ALL", SWITCH_CAUSE_REJECT_ALL},
 	{NULL, 0}
 };
 
@@ -1021,6 +1022,24 @@ SWITCH_DECLARE(const char *) switch_channel_get_variable_dup(switch_channel_t *c
 	return r;
 }
 
+SWITCH_DECLARE(const char *) switch_channel_get_variable_strdup(switch_channel_t *channel, const char *varname)
+{
+	const char *value = switch_channel_get_variable_dup(channel, varname, SWITCH_FALSE, -1);
+
+	return value ? (const char *)strdup(value) : NULL;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_channel_get_variable_buf(switch_channel_t *channel, const char *varname, char *buf, switch_size_t buflen)
+{
+	const char *value = switch_channel_get_variable_dup(channel, varname, SWITCH_FALSE, -1);
+
+	if (value && buf && buflen && switch_copy_string(buf, value, buflen)) {
+		return SWITCH_STATUS_SUCCESS;
+	}
+
+	return SWITCH_STATUS_FALSE;
+}
+
 SWITCH_DECLARE(const char *) switch_channel_get_variable_partner(switch_channel_t *channel, const char *varname)
 {
 	const char *uuid;
@@ -3053,12 +3072,12 @@ SWITCH_DECLARE(const switch_state_handler_table_t *) switch_channel_get_state_ha
 
 	switch_assert(channel != NULL);
 
-	if (index >= SWITCH_MAX_STATE_HANDLERS || index > channel->state_handler_index) {
-		return NULL;
+	switch_mutex_lock(channel->state_mutex);
+
+	if (index < SWITCH_MAX_STATE_HANDLERS && index <= channel->state_handler_index) {
+		h = channel->state_handlers[index];
 	}
 
-	switch_mutex_lock(channel->state_mutex);
-	h = channel->state_handlers[index];
 	switch_mutex_unlock(channel->state_mutex);
 
 	return h;
@@ -3066,12 +3085,13 @@ SWITCH_DECLARE(const switch_state_handler_table_t *) switch_channel_get_state_ha
 
 SWITCH_DECLARE(void) switch_channel_clear_state_handler(switch_channel_t *channel, const switch_state_handler_table_t *state_handler)
 {
-	int index, i = channel->state_handler_index;
+	int index, i;
 	const switch_state_handler_table_t *new_handlers[SWITCH_MAX_STATE_HANDLERS] = { 0 };
 
 	switch_assert(channel != NULL);
 
 	switch_mutex_lock(channel->state_mutex);
+	i = channel->state_handler_index;
 	channel->state_handler_index = 0;
 
 	if (state_handler) {
diff --git a/src/switch_console.c b/src/switch_console.c
index 8e26fec749..2157fda8a2 100644
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -1849,7 +1849,7 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string)
 			SWITCH_STANDARD_STREAM(mystream);
 
 			if (!strcasecmp(argv[0], "stickyadd")) {
-				mystream.write_function(&mystream, "insert into complete values (1,");
+				mystream.write_function(&mystream, "insert into complete (sticky, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, hostname) values (1,");
 				for (x = 0; x < 10; x++) {
 					if (argv[x + 1] && !strcasecmp(argv[x + 1], "_any_")) {
 						mystream.write_function(&mystream, "%s", "'', ");
@@ -1865,7 +1865,7 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string)
 				switch_core_sql_exec(mystream.data);
 				status = SWITCH_STATUS_SUCCESS;
 			} else if (!strcasecmp(argv[0], "add")) {
-				mystream.write_function(&mystream, "insert into complete values (0,");
+				mystream.write_function(&mystream, "insert into complete (sticky, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, hostname) values (0,");
 				for (x = 0; x < 10; x++) {
 					if (argv[x + 1] && !strcasecmp(argv[x + 1], "_any_")) {
 						mystream.write_function(&mystream, "%s", "'', ");
diff --git a/src/switch_core.c b/src/switch_core.c
index cf2343482a..7ec10d8885 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -147,7 +147,7 @@ static void check_ip(void)
 	} else if (strcmp(hostname, runtime.hostname)) {
 		if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) {
 			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "condition", "hostname-change");
-			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "old-hostname", hostname ? hostname : "nil");
+			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "old-hostname", hostname);
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "new-hostname", runtime.hostname);
 			switch_event_fire(&event);
 		}
@@ -3566,7 +3566,7 @@ SWITCH_DECLARE(int) switch_stream_system(const char *cmd, switch_stream_handle_t
 	}
 }
 
-SWITCH_DECLARE(uint16_t) switch_core_get_rtp_port_range_start_port()
+SWITCH_DECLARE(uint16_t) switch_core_get_rtp_port_range_start_port(void)
 {
 	uint16_t start_port = 0;
 
@@ -3577,7 +3577,7 @@ SWITCH_DECLARE(uint16_t) switch_core_get_rtp_port_range_start_port()
 	return start_port;
 }
 
-SWITCH_DECLARE(uint16_t) switch_core_get_rtp_port_range_end_port()
+SWITCH_DECLARE(uint16_t) switch_core_get_rtp_port_range_end_port(void)
 {
 	uint16_t end_port = 0;
 
diff --git a/src/switch_core_cert.c b/src/switch_core_cert.c
index c4fdd84210..64f497ea1a 100644
--- a/src/switch_core_cert.c
+++ b/src/switch_core_cert.c
@@ -287,7 +287,10 @@ SWITCH_DECLARE(int) switch_core_gen_certs(const char *prefix)
 
 	//bio_err=BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	mkcert(&x509, &pkey, 4096, 0, 36500);
+	if (!mkcert(&x509, &pkey, 4096, 0, 36500)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Certificate generation failed\n");
+		goto end;
+	}
 
 	//RSA_print_fp(stdout, pkey->pkey.rsa, 0);
 	//X509_print_fp(stdout, x509);
@@ -410,7 +413,9 @@ static int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days
 {
 	X509 *x;
 	EVP_PKEY *pk;
+#if OPENSSL_VERSION_NUMBER < 0x30000000
 	RSA *rsa;
+#endif
 	X509_NAME *name=NULL;
 
 	switch_assert(pkeyp);
@@ -432,7 +437,26 @@ static int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days
 		x = *x509p;
 	}
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x30000000
+	{
+		EVP_PKEY_CTX *ctx;
+
+		ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
+		/* Setup the key context */
+		if ((!ctx) || (EVP_PKEY_keygen_init(ctx) <= 0) || (EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits) <= 0)) {
+			abort();
+			goto err;
+		}
+
+		/* Generate key */
+		if (EVP_PKEY_generate(ctx, &pk) <= 0) {
+			abort();
+			goto err;
+		}
+
+		EVP_PKEY_CTX_free(ctx);
+	}
+#elif OPENSSL_VERSION_NUMBER >= 0x10100000
 	rsa = RSA_new();
 	{
 		static const BN_ULONG ULONG_RSA_F4 = RSA_F4;
@@ -449,11 +473,13 @@ static int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days
 	rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
 #endif
 
+#if OPENSSL_VERSION_NUMBER < 0x30000000
 	if (!EVP_PKEY_assign_RSA(pk, rsa)) {
 		abort();
 	}
 
 	rsa = NULL;
+#endif
 
 	X509_set_version(x, 2);
 	ASN1_INTEGER_set(X509_get_serialNumber(x), serial);
@@ -476,13 +502,21 @@ static int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days
 	 */
 	X509_set_issuer_name(x, name);
 
-	if (!X509_sign(x, pk, EVP_sha1()))
+#if OPENSSL_VERSION_NUMBER >= 0x30000000
+	if (!X509_sign(x, pk, EVP_sha256())) {
+#else
+	if (!X509_sign(x, pk, EVP_sha1())) {
+#endif
 		goto err;
+	}
 
 	*x509p = x;
 	*pkeyp = pk;
+
 	return(1);
- err:
+err:
+	ERR_print_errors_fp(stdout);
+
 	return(0);
 }
 
diff --git a/src/switch_core_codec.c b/src/switch_core_codec.c
index 69883f8122..5cedbed6e0 100644
--- a/src/switch_core_codec.c
+++ b/src/switch_core_codec.c
@@ -59,6 +59,27 @@ SWITCH_DECLARE(void) switch_core_session_unset_read_codec(switch_core_session_t
 	switch_mutex_unlock(session->codec_read_mutex);
 }
 
+SWITCH_DECLARE(void) switch_core_codec_lock_full(switch_core_session_t *session)
+{
+	do {
+		if (switch_mutex_trylock(session->codec_write_mutex) == SWITCH_STATUS_SUCCESS) {
+			if (switch_mutex_trylock(session->codec_read_mutex) == SWITCH_STATUS_SUCCESS) {
+				return;
+			}
+
+			switch_mutex_unlock(session->codec_write_mutex);
+		}
+
+		switch_cond_next();
+	} while (1);
+}
+
+SWITCH_DECLARE(void) switch_core_codec_unlock_full(switch_core_session_t *session)
+{
+	switch_mutex_unlock(session->codec_read_mutex);
+	switch_mutex_unlock(session->codec_write_mutex);
+}
+
 SWITCH_DECLARE(void) switch_core_session_lock_codec_write(switch_core_session_t *session)
 {
 	switch_mutex_lock(session->codec_write_mutex);
@@ -120,8 +141,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_real_read_codec(switch_c
 			}
 		} else { /* replace real_read_codec */
 			switch_codec_t *cur_codec;
+
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Original read codec replaced with %s:%d\n",
-							  switch_channel_get_name(session->channel), codec->implementation->iananame, codec->implementation->ianacode);
+							  switch_channel_get_name(session->channel), codec->implementation ? codec->implementation->iananame : "undefined", codec->implementation ? codec->implementation->ianacode : -1);
 			/* Set real_read_codec to front of the list of read_codecs */
 			cur_codec = session->read_codec;
 			while (cur_codec != NULL) {
@@ -129,8 +151,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_real_read_codec(switch_c
 					cur_codec->next = codec;
 					break;
 				}
+
 				cur_codec = cur_codec->next;
 			}
+
 			session->real_read_codec = codec;
 			session->real_read_impl = *codec->implementation;
 
@@ -154,6 +178,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_real_read_codec(switch_c
 				session->bug_codec.implementation->iananame, session->bug_codec.implementation->ianacode);
 			switch_core_codec_destroy(&session->bug_codec);
 		}
+
 		switch_thread_rwlock_unlock(session->bug_rwlock);
 	} else {
 		status = SWITCH_STATUS_FALSE;
@@ -169,6 +194,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_real_read_codec(switch_c
 			if (session->read_impl.actual_samples_per_second != session->read_impl.samples_per_second) {
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", session->read_impl.samples_per_second);
 			}
+
 			switch_event_fire(&event);
 		}
 
@@ -191,6 +217,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_real_read_codec(switch_c
 	}
 
 	switch_mutex_unlock(session->codec_read_mutex);
+
 	return status;
 }
 
@@ -221,7 +248,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_s
 				goto end;
 			}
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Push codec %s:%d\n",
-							  switch_channel_get_name(session->channel), codec->implementation->iananame, codec->implementation->ianacode);
+							  switch_channel_get_name(session->channel), codec->implementation ? codec->implementation->iananame : "undefined", codec->implementation ? codec->implementation->ianacode : -1);
 			codec->next = session->read_codec;
 			session->read_codec = codec;
 			if (codec->implementation) {
diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 912d5a5012..de5d0eff74 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -110,7 +110,7 @@ struct switch_rtp_text_factory_s {
 };
 
 
-typedef struct switch_rtp_engine_s {
+struct switch_rtp_engine_s {
 	switch_secure_settings_t ssec[CRYPTO_INVALID+1];
 	switch_rtp_crypto_key_type_t crypto_type;
 
@@ -204,7 +204,7 @@ typedef struct switch_rtp_engine_s {
 	void *engine_user_data;
 	int8_t engine_function_running;
 	switch_frame_buffer_t *write_fb;
-} switch_rtp_engine_t;
+};
 
 #define MAX_REJ_STREAMS 10
 
@@ -713,7 +713,7 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
 
 	for (pmap = engine->payload_map; pmap && pmap->allocated; pmap = pmap->next) {
 
-		if (sdp_type == SDP_TYPE_RESPONSE) {
+		if (sdp_type == SDP_ANSWER) {
 			switch(type) {
 			case SWITCH_MEDIA_TYPE_TEXT:
 				exists = (type == pmap->type && !strcasecmp(name, pmap->iananame));
@@ -722,14 +722,11 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
 				exists = (type == pmap->type && !strcasecmp(name, pmap->iananame) && pmap->pt == pt && (!pmap->rate || rate == pmap->rate) && (!pmap->ptime || pmap->ptime == ptime));
 				break;
 			case SWITCH_MEDIA_TYPE_VIDEO:
-				if (sdp_type == SDP_TYPE_RESPONSE) {
-					exists = (pmap->sdp_type == SDP_TYPE_REQUEST && type == pmap->type && !strcasecmp(name, pmap->iananame));
-				} else {
-					exists = (type == pmap->type && !strcasecmp(name, pmap->iananame));
-				}
+				exists = (pmap->sdp_type == SDP_OFFER && type == pmap->type && !strcasecmp(name, pmap->iananame));
+
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "CHECK PMAP %s:%s %d %s:%s %d ... %d\n", 
-								  name, sdp_type == SDP_TYPE_REQUEST ? "REQ" : "RES", pt, 
-								  pmap->iananame, pmap->sdp_type == SDP_TYPE_REQUEST ? "REQ" : "RES", pmap->pt, exists);
+								  name, "RES", pt,
+								  pmap->iananame, pmap->sdp_type == SDP_OFFER ? "REQ" : "RES", pmap->pt, exists);
 								  
 
 				break;
@@ -800,7 +797,7 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
 	}
 
 	if (!zstr(fmtp)) {
-		if (sdp_type == SDP_TYPE_REQUEST || !exists) {
+		if (sdp_type == SDP_OFFER || !exists) {
 			pmap->rm_fmtp = switch_core_strdup(session->pool, fmtp);
 		}
 	}
@@ -810,7 +807,7 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
 	pmap->recv_pt = (switch_payload_t) pt;
 
 
-	if (sdp_type == SDP_TYPE_REQUEST || !exists) {
+	if (sdp_type == SDP_OFFER || !exists) {
 		pmap->pt = (switch_payload_t) pt;
 	}
 
@@ -821,7 +818,7 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
 	if (!exists) {
 		pmap->sdp_type = sdp_type;
 
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "ADD PMAP %s %s %d\n", sdp_type == SDP_TYPE_REQUEST ? "REQ" : "RES", name, pt);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "ADD PMAP %s %s %d\n", sdp_type == SDP_OFFER ? "REQ" : "RES", name, pt);
 
 		if (pmap == engine->payload_map) {
 			engine->pmap_tail = pmap;
@@ -1170,7 +1167,7 @@ static uint32_t parse_lifetime_mki(const char **p, const char *end)
 					val += ((**p) - '0') * i;
 				}
 				res |= (val & 0x000000ff);					/* MKI_SIZE */
-			} else if (isdigit(*(field_begin + 1)) && (field_begin + 2) && (*(field_begin + 2) == '^') && (field_begin + 3) && isdigit(*(field_begin + 3))) {
+			} else if (isdigit(*(field_begin + 1)) && (*(field_begin + 2) == '^') && isdigit(*(field_begin + 3))) {
 				res |= (CRYPTO_KEY_MATERIAL_LIFETIME << 24);
 				val = ((uint32_t) (*(field_begin + 1) - '0')) << 8;
 				res |= val;									/* LIFETIME base. */
@@ -1727,7 +1724,7 @@ SWITCH_DECLARE(int) switch_core_session_check_incoming_crypto(switch_core_sessio
 			const char *a = switch_stristr("AE", engine->ssec[engine->crypto_type].remote_crypto_key);
 			const char *b = switch_stristr("AE", crypto);
 
-			if (sdp_type == SDP_TYPE_REQUEST) {
+			if (sdp_type == SDP_OFFER) {
 				if (!vval) {
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Unsupported Crypto [%s]\n", crypto);
 					goto end;
@@ -2069,13 +2066,13 @@ SWITCH_DECLARE(switch_status_t) switch_media_handle_create(switch_media_handle_t
 		switch_mutex_init(&session->media_handle->control_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
 
 		session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO].ssrc =
-			(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO] + (uint32_t) time(NULL));
+			(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO] + (switch_time_t) time(NULL));
 
 		session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO].ssrc =
-			(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO] + (uint32_t) time(NULL) / 2);
+			(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO] + (switch_time_t) time(NULL) / 2);
 
 		session->media_handle->engines[SWITCH_MEDIA_TYPE_TEXT].ssrc =
-			(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_TEXT] + (uint32_t) time(NULL) / 2);
+			(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_TEXT] + (switch_time_t) time(NULL) / 2);
 
 
 
@@ -2524,7 +2521,7 @@ static void check_jb_sync(switch_core_session_t *session)
 	}
 
 	if (!jb_sync_msec && frames) {
-		jb_sync_msec = (double)(1000 / fps) * frames;
+		jb_sync_msec = ((double)1000 / fps) * frames;
 	}
 
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session),
@@ -3601,11 +3598,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_set_codec(switch_core_session_
 	int resetting = 0;
 	switch_media_handle_t *smh;
 	switch_rtp_engine_t *a_engine;
-	switch_time_t start = switch_micro_time_now();
 
 	switch_assert(session);
 
-retry:
+	switch_core_codec_lock_full(session);
+
 	switch_mutex_lock(session->codec_init_mutex);
 
 	if (!(smh = session->media_handle)) {
@@ -3627,17 +3624,7 @@ retry:
 			(uint32_t) a_engine->read_impl.microseconds_per_packet / 1000 != a_engine->cur_payload_map->codec_ms ||
 			a_engine->read_impl.samples_per_second != a_engine->cur_payload_map->rm_rate ) {
 
-			if (switch_core_session_try_reset(session, 0, 0) != SWITCH_STATUS_SUCCESS) {
-				switch_time_t elapsed = switch_micro_time_now() - start;
-				if (elapsed > 1000000) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Could not reset session in %"SWITCH_TIME_T_FMT" us. Give up.\n", elapsed);
-					switch_goto_status(SWITCH_STATUS_FALSE, end);
-				}
-
-				switch_mutex_unlock(session->codec_init_mutex);
-				switch_yield(10000);
-				goto retry;
-			}
+			switch_core_session_reset(session, 0, 0);
 
 			switch_channel_audio_sync(session->channel);
 
@@ -3651,9 +3638,6 @@ retry:
 							  a_engine->cur_payload_map->codec_ms,
 							  a_engine->cur_payload_map->rm_rate);
 
-			switch_yield(a_engine->read_impl.microseconds_per_packet);
-			switch_core_session_lock_codec_write(session);
-			switch_core_session_lock_codec_read(session);
 			resetting = 1;
 			switch_yield(a_engine->read_impl.microseconds_per_packet);
 			switch_core_codec_destroy(&a_engine->read_codec);
@@ -3767,12 +3751,12 @@ retry:
 
 	if (resetting) {
 	    switch_channel_execute_on(session->channel, "execute_on_audio_change");
-	    switch_core_session_unlock_codec_write(session);
-	    switch_core_session_unlock_codec_read(session);
 	}
 
 	switch_mutex_unlock(session->codec_init_mutex);
 
+	switch_core_codec_unlock_full(session);
+
 	return status;
 }
 static void clear_ice(switch_core_session_t *session, switch_media_type_t type)
@@ -4178,10 +4162,15 @@ static switch_status_t check_ice(switch_media_handle_t *smh, switch_media_type_t
 
 				argc = switch_split(data, ' ', fields);
 
+				if (argc < 6 || !switch_is_uint_in_range(fields[1], 1, MAX_CAND_IDX_COUNT)) {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(smh->session), SWITCH_LOG_WARNING, "Invalid data\n");
+					continue;
+				}
+
 				cid = fields[1] ? atoi(fields[1]) - 1 : 0;
 
-				if (argc < 6 || engine->ice_in.cand_idx[cid] >= MAX_CAND - 1) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(smh->session), SWITCH_LOG_WARNING, "Invalid data\n");
+				if (engine->ice_in.cand_idx[cid] >= MAX_CAND - 1) {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(smh->session), SWITCH_LOG_WARNING, "Too many candidates\n");
 					continue;
 				}
 
@@ -4261,7 +4250,7 @@ static switch_status_t check_ice(switch_media_handle_t *smh, switch_media_type_t
 	
  relay:
 	
-	for (cid = 0; cid < 2; cid++) {
+	for (cid = 0; cid < MAX_CAND_IDX_COUNT; cid++) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(smh->session), SWITCH_LOG_DEBUG, "Searching for %s candidate.\n", cid ? "rtcp" : "rtp");
 
 		for (ai = 0; ai < engine->cand_acl_count; ai++) {
@@ -4510,19 +4499,28 @@ struct matches {
 	int codec_idx;
 };
 
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
 static void greedy_sort(switch_media_handle_t *smh, struct matches *matches, int m_idx, const switch_codec_implementation_t **codec_array, int total_codecs)
 {
 	int j = 0, f = 0, g;
 	struct matches mtmp[MAX_MATCHES] = { { 0 } };
+
+	m_idx = MIN(m_idx, MAX_MATCHES);
+
 	for(j = 0; j < m_idx; j++) {
 		*&mtmp[j] = *&matches[j];
-					}
-	for (g = 0; g < smh->mparams->num_codecs && g < total_codecs; g++) {
+	}
+
+	for (g = 0; g < smh->mparams->num_codecs && g < total_codecs && f < MAX_MATCHES; g++) {
 		const switch_codec_implementation_t *imp = codec_array[g];
 
 		for(j = 0; j < m_idx; j++) {
-			if (mtmp[j].imp == imp) {
+			if (mtmp[j].imp && mtmp[j].imp == imp) {
 				*&matches[f++] = *&mtmp[j];
+				mtmp[j].imp = NULL;
 			}
 		}
 	}
@@ -4621,9 +4619,10 @@ static void check_stream_changes(switch_core_session_t *session, const char *r_s
 {
 	switch_core_session_t *other_session = NULL;
 	switch_core_session_message_t *msg;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
 
-	switch_core_session_get_partner(session, &other_session);
-
+	status = switch_core_session_get_partner(session, &other_session);
+	(void)status;
 
 	if (switch_channel_test_flag(session->channel, CF_STREAM_CHANGED)) {
 		switch_channel_clear_flag(session->channel, CF_STREAM_CHANGED);
@@ -4632,7 +4631,7 @@ static void check_stream_changes(switch_core_session_t *session, const char *r_s
 			switch_channel_set_flag(other_session->channel, CF_PROCESSING_STREAM_CHANGE);
 			switch_channel_set_flag(session->channel, CF_AWAITING_STREAM_CHANGE);
 
-			if (sdp_type == SDP_TYPE_REQUEST && r_sdp) {
+			if (sdp_type == SDP_OFFER && r_sdp) {
 				const char *filter_codec_string = switch_channel_get_variable(session->channel, "filter_codec_string");
 				
 				switch_channel_set_variable(session->channel, "codec_string", NULL);
@@ -4653,19 +4652,21 @@ static void check_stream_changes(switch_core_session_t *session, const char *r_s
 	}
 
 	if (other_session) {
-		if (sdp_type == SDP_TYPE_RESPONSE && switch_channel_test_flag(session->channel, CF_PROCESSING_STREAM_CHANGE)) {
+		if (sdp_type == SDP_ANSWER && switch_channel_test_flag(session->channel, CF_PROCESSING_STREAM_CHANGE)) {
 			switch_channel_clear_flag(session->channel, CF_PROCESSING_STREAM_CHANGE);
 			
 			if (switch_channel_test_flag(other_session->channel, CF_AWAITING_STREAM_CHANGE)) {
 				uint8_t proceed = 1;
 				const char *sdp_in, *other_ep;
+				uint8_t res = 0;
 
 				if ((other_ep = switch_channel_get_variable(session->channel, "ep_codec_string"))) {
 					switch_channel_set_variable(other_session->channel, "codec_string", other_ep);
 				}
 
 				sdp_in = switch_channel_get_variable(other_session->channel, SWITCH_R_SDP_VARIABLE);
-				switch_core_media_negotiate_sdp(other_session, sdp_in, &proceed, SDP_TYPE_REQUEST);
+				res = switch_core_media_negotiate_sdp(other_session, sdp_in, &proceed, SDP_OFFER);
+				(void)res;
 				switch_core_media_activate_rtp(other_session);
 				msg = switch_core_session_alloc(other_session, sizeof(*msg));
 				msg->message_id = SWITCH_MESSAGE_INDICATE_RESPOND;
@@ -4712,11 +4713,11 @@ SWITCH_DECLARE(void) switch_core_media_set_smode(switch_core_session_t *session,
 	engine->pass_codecs = 0;
 	
 	if (switch_channel_var_true(session->channel, "rtp_pass_codecs_on_stream_change")) {
-		if (sdp_type == SDP_TYPE_REQUEST && switch_channel_test_flag(session->channel, CF_REINVITE) && 
+		if (sdp_type == SDP_OFFER && switch_channel_test_flag(session->channel, CF_REINVITE) && 
 			switch_channel_media_up(session->channel) && (pass_codecs || old_smode != smode)) {
 
 			if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
-				switch_core_media_set_smode(other_session, type, opp_smode, SDP_TYPE_REQUEST);
+				switch_core_media_set_smode(other_session, type, opp_smode, SDP_OFFER);
 				switch_channel_set_flag(session->channel, CF_STREAM_CHANGED);
 				switch_core_session_rwunlock(other_session);
 			}
@@ -4749,7 +4750,7 @@ static void switch_core_media_set_rmode(switch_core_session_t *session, switch_m
 
 	if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
 
-		if (sdp_type == SDP_TYPE_RESPONSE && (switch_channel_test_flag(other_session->channel, CF_REINVITE) || switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_OUTBOUND)) {
+		if (sdp_type == SDP_ANSWER && (switch_channel_test_flag(other_session->channel, CF_REINVITE) || switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_OUTBOUND)) {
 			switch_core_media_set_smode(other_session, type, rmode, sdp_type);
 		}
 
@@ -4773,7 +4774,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	const char *val;
 	const char *crypto = NULL;
-	int got_crypto = 0, got_video_crypto = 0, got_audio = 0, saw_audio = 0, saw_video = 0, got_avp = 0, got_video_avp = 0, got_video_savp = 0, got_savp = 0, got_udptl = 0, got_webrtc = 0, got_text = 0, got_text_crypto = 0, got_msrp = 0;
+	int got_crypto = 0, got_video_crypto = 0, got_audio = 0, saw_audio = 0, saw_video = 0, got_avp = 0, got_savp = 0, got_udptl = 0, got_webrtc = 0, got_text = 0, got_text_crypto = 0, got_msrp = 0;
 	int scrooge = 0;
 	sdp_parser_t *parser = NULL;
 	sdp_session_t *sdp;
@@ -4969,14 +4970,10 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 		if (m->m_proto == sdp_proto_srtp || m->m_proto == sdp_proto_extended_srtp) {
 			if (m->m_type == sdp_media_audio) {
 				got_savp++;
-			} else {
-				got_video_savp++;
 			}
 		} else if (m->m_proto == sdp_proto_rtp) {
 			if (m->m_type == sdp_media_audio) {
 				got_avp++;
-			} else {
-				got_video_avp++;
 			}
 		} else if (m->m_proto == sdp_proto_udptl) {
 			got_udptl++;
@@ -5100,7 +5097,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 					switch_channel_clear_app_flag_key("T38", session->channel, CF_APP_T38);
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s T38 REFUSE on %s\n",
 									  switch_channel_get_name(channel),
-									  sdp_type == SDP_TYPE_RESPONSE ? "response" : "request");
+									  sdp_type == SDP_ANSWER ? "response" : "request");
 
 					restore_pmaps(a_engine);
 					fmatch = 0;
@@ -5113,7 +5110,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s T38 ACCEPT on %s\n",
 									  switch_channel_get_name(channel),
-									  sdp_type == SDP_TYPE_RESPONSE ? "response" : "request");
+									  sdp_type == SDP_ANSWER ? "response" : "request");
 
 					if (switch_channel_test_app_flag_key("T38", session->channel, CF_APP_T38)) {
 						if (proceed) *proceed = 0;
@@ -5218,7 +5215,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s T38 %s POSSIBLE on %s\n",
 								  switch_channel_get_name(channel),
 								  fmatch ? "IS" : "IS NOT",
-								  sdp_type == SDP_TYPE_RESPONSE ? "response" : "request");
+								  sdp_type == SDP_ANSWER ? "response" : "request");
 
 
 				goto done;
@@ -5250,7 +5247,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 
 			switch_core_media_set_rmode(smh->session, SWITCH_MEDIA_TYPE_AUDIO, sdp_media_flow(m->m_mode), sdp_type);
 
-			if (sdp_type == SDP_TYPE_REQUEST) {
+			if (sdp_type == SDP_OFFER) {
 				switch(a_engine->rmode) {
 				case SWITCH_MEDIA_FLOW_RECVONLY:
 					switch_core_media_set_smode(smh->session, SWITCH_MEDIA_TYPE_AUDIO, SWITCH_MEDIA_FLOW_SENDONLY, sdp_type);
@@ -5316,7 +5313,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 				switch_channel_set_variable(session->channel, "media_audio_mode", NULL);
 			}
 
-			if (sdp_type == SDP_TYPE_RESPONSE) {
+			if (sdp_type == SDP_ANSWER) {
 				if (inactive) {
 					// When freeswitch had previously sent inactive in sip request. it should remain inactive otherwise smode should be sendrecv
 					if (a_engine->smode==SWITCH_MEDIA_FLOW_INACTIVE) {
@@ -5508,6 +5505,10 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 						} else if (!strcasecmp(map->rm_encoding, "opus")) {
 							map_channels = 1;
 						}
+
+						if (codec_fmtp.max_ptime) {
+							maxptime = codec_fmtp.max_ptime;
+						}
 					}
 				}
 
@@ -5556,6 +5557,13 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 							/* ptime does not match */
 							match = 0;
 
+							if (nm_idx >= MAX_MATCHES) {
+								switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
+												  "Audio Codec Compare [%s:%d:%u:%u:%d:%u:%d] was not saved as a near-match. Too many. Ignoring.\n",
+												  imp->iananame, imp->ianacode, codec_rate, imp->actual_samples_per_second, imp->microseconds_per_packet / 1000, bit_rate, imp->number_of_channels);
+								continue;
+							}
+
 							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
 											  "Audio Codec Compare [%s:%d:%u:%d:%u:%d] is saved as a near-match\n",
 											  imp->iananame, imp->ianacode, codec_rate, imp->microseconds_per_packet / 1000, bit_rate, imp->number_of_channels);
@@ -5824,7 +5832,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 
 				if (smh->mparams->dtmf_type == DTMF_AUTO || smh->mparams->dtmf_type == DTMF_2833 ||
 					switch_channel_test_flag(session->channel, CF_LIBERAL_DTMF)) {
-					if (sdp_type == SDP_TYPE_REQUEST) {
+					if (sdp_type == SDP_OFFER) {
 						smh->mparams->te = smh->mparams->recv_te = (switch_payload_t) best_te;
 						switch_channel_set_variable(session->channel, "dtmf_type", "rfc2833");
 						smh->mparams->dtmf_type = DTMF_2833;
@@ -5892,7 +5900,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 														 map->rm_encoding,
 														 NULL,
 														 NULL,
-														 SDP_TYPE_REQUEST,
+														 SDP_OFFER,
 														 map->rm_pt,
 														 1000,
 														 0,
@@ -5970,7 +5978,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 			
 			switch_core_media_set_rmode(smh->session, SWITCH_MEDIA_TYPE_VIDEO, sdp_media_flow(m->m_mode), sdp_type);
 			
-			if (sdp_type == SDP_TYPE_REQUEST) {
+			if (sdp_type == SDP_OFFER) {
 				sdp_bandwidth_t *bw;
 				int tias = 0;
 
@@ -6136,7 +6144,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 						vmatch = strcasecmp(rm_encoding, imp->iananame) ? 0 : 1;
 					}
 
-					if (sdp_type == SDP_TYPE_RESPONSE && consider_video_fmtp && vmatch && !zstr(map->rm_fmtp) && !zstr(smh->fmtps[i])) {
+					if (sdp_type == SDP_ANSWER && consider_video_fmtp && vmatch && !zstr(map->rm_fmtp) && !zstr(smh->fmtps[i])) {
 						almost_vmatch = 1;
 						vmatch = !strcasecmp(smh->fmtps[i], map->rm_fmtp);
 					}
@@ -6164,10 +6172,18 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 										  imp->iananame, map->rm_pt);
 
 						m_idx++;
+
+						if (m_idx >= MAX_MATCHES) {
+							break;
+						}
 					}
 
 					vmatch = 0;
 				}
+
+				if (m_idx >= MAX_MATCHES) {
+					break;
+				}
 			}
 
 			if (consider_video_fmtp && (!m_idx || almost_vmatch)) {
@@ -6303,7 +6319,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 												 "L16",
 												 NULL,
 												 NULL,
-												 SDP_TYPE_REQUEST,
+												 SDP_OFFER,
 												 97,
 												 8000,
 												 20,
@@ -6360,7 +6376,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 		if (switch_channel_test_flag(channel, CF_VIDEO) && !saw_video) {
 			//switch_core_media_set_rmode(smh->session, SWITCH_MEDIA_TYPE_VIDEO, SWITCH_MEDIA_FLOW_INACTIVE, sdp_type);
 
-			if (sdp_type == SDP_TYPE_REQUEST) {
+			if (sdp_type == SDP_OFFER) {
 				switch_core_media_set_smode(smh->session, SWITCH_MEDIA_TYPE_VIDEO, SWITCH_MEDIA_FLOW_INACTIVE, sdp_type);
 			}
 		}
@@ -6714,6 +6730,7 @@ static void *SWITCH_THREAD_FUNC video_write_thread(switch_thread_t *thread, void
 	float fps = 15.0f;
 	switch_image_t *last_frame = NULL;
 	int last_w = 0, last_h = 0, kps = 0;
+	switch_status_t res;
 
 	if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
 		return NULL;
@@ -6721,10 +6738,12 @@ static void *SWITCH_THREAD_FUNC video_write_thread(switch_thread_t *thread, void
 
 	if (!(smh = session->media_handle)) {
 		switch_core_session_rwunlock(session);
+
 		return NULL;
 	}
 
-	switch_core_session_get_partner(session, &b_session);
+	res = switch_core_session_get_partner(session, &b_session);
+	(void)res;
 
 	switch_channel_set_flag(session->channel, CF_VIDEO_WRITING);
 
@@ -6745,7 +6764,6 @@ static void *SWITCH_THREAD_FUNC video_write_thread(switch_thread_t *thread, void
 	fr.buflen = buflen - 12;
 	switch_core_media_gen_key_frame(session);
 
-
 	if (smh->video_write_fh) {
 		if (smh->video_write_fh->mm.fps) {
 			fps = smh->video_write_fh->mm.fps;
@@ -6785,8 +6803,6 @@ static void *SWITCH_THREAD_FUNC video_write_thread(switch_thread_t *thread, void
 		   switch_channel_up_nosig(session->channel) && smh->video_write_fh && switch_test_flag(smh->video_write_fh, SWITCH_FILE_OPEN)) {
 		switch_status_t wstatus = SWITCH_STATUS_FALSE;
 
-
-
 		switch_core_timer_next(&timer);
 
 		switch_mutex_lock(v_engine->mh.file_write_mutex);
@@ -6829,12 +6845,14 @@ static void *SWITCH_THREAD_FUNC video_write_thread(switch_thread_t *thread, void
 				switch_set_flag_locked(smh->video_write_fh, SWITCH_FILE_FLAG_VIDEO_EOF);
 			}
 		}
+
 		switch_mutex_unlock(v_engine->mh.file_write_mutex);
 	}
 
 	if (last_frame) {
 		int x = 0;
 		switch_rgb_color_t bgcolor;
+
 		switch_color_set_rgb(&bgcolor, "#000000");
 		switch_img_fill(last_frame, 0, 0, last_frame->d_w, last_frame->d_h, &bgcolor);
 		fr.img = last_frame;
@@ -6845,12 +6863,12 @@ static void *SWITCH_THREAD_FUNC video_write_thread(switch_thread_t *thread, void
 			fr.flags = SFF_USE_VIDEO_TIMESTAMP|SFF_RAW_RTP|SFF_RAW_RTP_PARSE_FRAME;
 			switch_core_session_write_video_frame(session, &fr, SWITCH_IO_FLAG_FORCE, 0);
 		}
+
 		switch_core_media_gen_key_frame(session);
 		switch_core_session_request_video_refresh(session);
 		switch_img_free(&last_frame);
 	}
 
-
 	switch_core_timer_destroy(&timer);
 
 	switch_core_session_rwunlock(session);
@@ -6860,7 +6878,6 @@ static void *SWITCH_THREAD_FUNC video_write_thread(switch_thread_t *thread, void
 		switch_core_session_rwunlock(b_session);
 	}
 
-	
 	v_engine->thread_write_lock = 0;
 	switch_mutex_unlock(smh->write_mutex[SWITCH_MEDIA_TYPE_VIDEO]);
 
@@ -7413,7 +7430,7 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
 	switch_status_t status;
 	switch_frame_t *read_frame = NULL;
 	switch_media_handle_t *smh;
-	uint32_t loops = 0, xloops = 0, vloops = 0;
+	uint32_t loops = 0, xloops = 0;
 	switch_image_t *blank_img = NULL;
 	switch_frame_t fr = { 0 };
 	unsigned char *buf = NULL;
@@ -7538,8 +7555,6 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
 			continue;
 		}
 
-		vloops++;
-
 		send_blank = blank_enabled || switch_channel_test_flag(channel, CF_VIDEO_ECHO);
 
 		if (switch_channel_test_flag(channel, CF_VIDEO_READY) && !switch_test_flag(read_frame, SFF_CNG)) {
@@ -8735,7 +8750,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi
 											   a_engine->cur_payload_map->remote_sdp_ip,
 											   a_engine->cur_payload_map->remote_sdp_port,
 											   a_engine->cur_payload_map->pt,
-											   a_engine->read_impl.samples_per_packet,
+											   strcasecmp("opus", a_engine->read_impl.iananame) ? a_engine->read_impl.samples_per_packet : 
+											   a_engine->read_impl.samples_per_second * (a_engine->read_impl.microseconds_per_packet / 1000) / 1000,
 											   a_engine->cur_payload_map->codec_ms * 1000,
 											   flags, timer_name, &err, switch_core_session_get_pool(session),
 											   0, 0);
@@ -9690,7 +9706,7 @@ static const char *get_media_profile_name(switch_core_session_t *session, int se
 static char *get_setup(switch_rtp_engine_t *engine, switch_core_session_t *session, switch_sdp_type_t sdp_type)
 {
 
-	if (sdp_type == SDP_TYPE_REQUEST) {
+	if (sdp_type == SDP_OFFER) {
 		engine->dtls_controller = 0;
 		engine->new_dtls = 1;
 		engine->new_ice = 1;
@@ -9791,7 +9807,7 @@ static void generate_m(switch_core_session_t *session, char *buf, size_t buflen,
 	}
 
 	if (smh->mparams->dtmf_type == DTMF_2833 && smh->mparams->te > 95) {
-		if (sdp_type == SDP_TYPE_RESPONSE) {
+		if (sdp_type == SDP_ANSWER) {
 			switch_rtp_engine_t *a_engine = &smh->engines[SWITCH_MEDIA_TYPE_AUDIO];
 			if (a_engine) {
 				payload_map_t *pmap;
@@ -9897,7 +9913,7 @@ static void generate_m(switch_core_session_t *session, char *buf, size_t buflen,
 
 
 	if ((smh->mparams->dtmf_type == DTMF_2833 || switch_channel_test_flag(session->channel, CF_LIBERAL_DTMF)) && smh->mparams->te > 95) {
-		if (smh->mparams->dtmf_type == DTMF_2833 && sdp_type == SDP_TYPE_RESPONSE) {
+		if (smh->mparams->dtmf_type == DTMF_2833 && sdp_type == SDP_ANSWER) {
 			switch_rtp_engine_t *a_engine = &smh->engines[SWITCH_MEDIA_TYPE_AUDIO];
 			if (a_engine) {
 				payload_map_t *pmap;
@@ -10246,7 +10262,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 		v_engine->rtcp_mux = -1;
 	}
 
-	if ((a_engine->rtcp_mux != -1 && v_engine->rtcp_mux != -1) && (sdp_type == SDP_TYPE_REQUEST)) {
+	if ((a_engine->rtcp_mux != -1 && v_engine->rtcp_mux != -1) && (sdp_type == SDP_OFFER)) {
 		a_engine->rtcp_mux = 1;
 		v_engine->rtcp_mux = 1;
 	}
@@ -10329,7 +10345,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 				continue;
 			}
 
-			if (sdp_type == SDP_TYPE_REQUEST) {
+			if (sdp_type == SDP_OFFER) {
 				for (j = 0; j < SWITCH_MAX_CODECS; j++) {
 					if (smh->rates[j] == 0) {
 						break;
@@ -10347,7 +10363,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 			continue;
 		}
 
-		if (sdp_type == SDP_TYPE_REQUEST) {
+		if (sdp_type == SDP_OFFER) {
 			switch_core_session_t *orig_session = NULL;
 
 			switch_core_session_get_partner(session, &orig_session);
@@ -10508,7 +10524,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 	}
 
 	if (!smh->owner_id) {
-		smh->owner_id = (uint32_t) switch_epoch_time_now(NULL) - port;
+		smh->owner_id = (uint32_t)(switch_time_t)switch_epoch_time_now(NULL) - port;
 	}
 
 	if (!smh->session_id) {
@@ -11162,7 +11178,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 					}
 				}
 
-				if (sdp_type == SDP_TYPE_REQUEST) {
+				if (sdp_type == SDP_OFFER) {
 					fir++;
 					pli++;
 					nack++;
@@ -11423,7 +11439,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 
 	// RTP TEXT
 
-	if (sdp_type == SDP_TYPE_RESPONSE && !switch_channel_test_flag(session->channel, CF_RTT)) {
+	if (sdp_type == SDP_ANSWER && !switch_channel_test_flag(session->channel, CF_RTT)) {
 		if (switch_channel_test_flag(session->channel, CF_TEXT_SDP_RECVD)) {
 			switch_channel_clear_flag(session->channel, CF_TEXT_SDP_RECVD);
 			switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "m=text 0 %s 19\r\n",
@@ -11438,7 +11454,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 		t_engine->t140_pt = 0;
 		t_engine->red_pt = 0;
 
-		if (sdp_type == SDP_TYPE_REQUEST) {
+		if (sdp_type == SDP_OFFER) {
 			t_engine->t140_pt = 96;
 			t_engine->red_pt = 97;
 
@@ -11447,7 +11463,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 											  "red",
 											  NULL,
 											  NULL,
-											  SDP_TYPE_REQUEST,
+											  SDP_OFFER,
 											  t_engine->red_pt,
 											  1000,
 											  0,
@@ -11459,7 +11475,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
 											  "t140",
 											  NULL,
 											  NULL,
-											  SDP_TYPE_REQUEST,
+											  SDP_OFFER,
 											  t_engine->t140_pt,
 											  1000,
 											  0,
@@ -11818,7 +11834,7 @@ SWITCH_DECLARE(void) switch_core_media_set_udptl_image_sdp(switch_core_session_t
 	}
 
 	if (!smh->owner_id) {
-		smh->owner_id = (uint32_t) switch_epoch_time_now(NULL) - port;
+		smh->owner_id = (uint32_t)(switch_time_t)switch_epoch_time_now(NULL) - port;
 	}
 
 	if (!smh->session_id) {
@@ -11960,7 +11976,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session)
 												 "PROXY",
 												 NULL,
 												 NULL,
-												 SDP_TYPE_RESPONSE,
+												 SDP_ANSWER,
 												 0,
 												 8000,
 												 20,
@@ -12032,7 +12048,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session)
 				family = strchr(smh->mparams->sipip, ':') ? "IP6" : "IP4";
 
 				if (!smh->owner_id) {
-					smh->owner_id = (uint32_t) switch_epoch_time_now(NULL) * 31821U + 13849U;
+					smh->owner_id = (uint32_t)(switch_time_t) switch_epoch_time_now(NULL) * 31821U + 13849U;
 				}
 
 				if (!smh->session_id) {
@@ -12117,7 +12133,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session)
 														 "PROXY-VID",
 														 NULL,
 														 NULL,
-														 SDP_TYPE_RESPONSE,
+														 SDP_ANSWER,
 														 0,
 														 90000,
 														 90000,
@@ -12180,7 +12196,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session)
 														 "PROXY-TXT",
 														 NULL,
 														 NULL,
-														 SDP_TYPE_RESPONSE,
+														 SDP_ANSWER,
 														 0,
 														 90000,
 														 90000,
@@ -13081,7 +13097,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se
 					switch_core_media_prepare_codecs(session, 1);
 					clear_pmaps(a_engine);
 					clear_pmaps(v_engine);
-					switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, ip, (switch_port_t)atoi(port), NULL, 1);
+					switch_core_media_gen_local_sdp(session, SDP_OFFER, ip, (switch_port_t)atoi(port), NULL, 1);
 				}
 			}
 
@@ -13133,7 +13149,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se
 				switch_core_media_prepare_codecs(session, SWITCH_TRUE);
 				switch_core_media_check_video_codecs(session);
 				
-				switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, NULL, 0, NULL, 1);
+				switch_core_media_gen_local_sdp(session, SDP_OFFER, NULL, 0, NULL, 1);
 			}
 
 			if (msg->numeric_arg && switch_core_session_get_partner(session, &nsession) == SWITCH_STATUS_SUCCESS) {
@@ -13570,6 +13586,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 		if (zstr(attr->a_name)) {
 			continue;
 		}
+
 		if (!strcasecmp(attr->a_name, "ptime")) {
 			dptime = atoi(attr->a_value);
 			break;
@@ -13582,22 +13599,27 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 		if ((m->m_type == sdp_media_audio || m->m_type == sdp_media_video) && m->m_port) {
 			for (map = m->m_rtpmaps; map; map = map->rm_next) {
 				int found = 0;
+
 				for (attr = m->m_attributes; attr && found < 2; attr = attr->a_next) {
 					if (zstr(attr->a_name)) {
 						continue;
 					}
+
 					if (!strcasecmp(attr->a_name, "ptime") && attr->a_value) {
 						ptime = atoi(attr->a_value);
 						found++;
 					}
+
 					if (!strcasecmp(attr->a_name, "rtcp-mux")) {
 						if (switch_channel_var_true(channel, "rtcp_mux_auto_detect")) {
 							switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "setting rtcp-mux from sdp\n");
 							switch_channel_set_variable(channel, "rtcp_mux", "true");
 						}
+
 						found++;
 					}
 				}
+
 				switch_core_media_add_payload_map(session,
 												  m->m_type == sdp_media_audio ? SWITCH_MEDIA_TYPE_AUDIO : SWITCH_MEDIA_TYPE_VIDEO,
 												  map->rm_encoding,
@@ -13623,11 +13645,13 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 				if (zstr(attr->a_name)) {
 					continue;
 				}
+
 				if (!strcasecmp(attr->a_name, "ptime") && attr->a_value) {
 					ptime = atoi(attr->a_value);
 					break;
 				}
 			}
+
 			connection = sdp->sdp_connection;
 			if (m->m_connections) {
 				connection = m->m_connections;
@@ -13641,7 +13665,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 			if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND || prefer_sdp) {
 				for (map = m->m_rtpmaps; map; map = map->rm_next) {
 
-					if (map->rm_pt > 127 || already_did[map->rm_pt]) {
+					if (already_did[map->rm_pt]) {
 						continue;
 					}
 
@@ -13662,19 +13686,20 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 						if (match) {
 							add_audio_codec(map, imp, ptime, buf, sizeof(buf));
 						}
-
 					}
 				}
 
 			} else {
 				for (i = 0; i < num_codecs; i++) {
 					const switch_codec_implementation_t *imp = codecs[i];
+
 					if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO || imp->ianacode > 127 || already_did[imp->ianacode]) {
 						continue;
 					}
+
 					for (map = m->m_rtpmaps; map; map = map->rm_next) {
 
-						if (map->rm_pt > 127 || already_did[map->rm_pt]) {
+						if (already_did[map->rm_pt]) {
 							continue;
 						}
 
@@ -13707,11 +13732,10 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 				break;
 			}
 
-
 			if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND || prefer_sdp) {
 				for (map = m->m_rtpmaps; map; map = map->rm_next) {
 
-					if (map->rm_pt > 127 || already_did[map->rm_pt]) {
+					if (already_did[map->rm_pt]) {
 						continue;
 					}
 
@@ -13735,11 +13759,11 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 							} else {
 								switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s.%s", imp->modname, imp->iananame);
 							}
+
 							already_did[imp->ianacode] = 1;
 						}
 					}
 				}
-
 			} else {
 				for (i = 0; i < num_codecs; i++) {
 					const switch_codec_implementation_t *imp = codecs[i];
@@ -13755,7 +13779,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 
 					for (map = m->m_rtpmaps; map; map = map->rm_next) {
 
-						if (map->rm_pt > 127 || already_did[map->rm_pt]) {
+						if (already_did[map->rm_pt]) {
 							continue;
 						}
 
@@ -13776,6 +13800,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 							} else {
 								switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s.%s", imp->modname, imp->iananame);
 							}
+
 							already_did[imp->ianacode] = 1;
 						}
 					}
@@ -13937,7 +13962,7 @@ SWITCH_DECLARE(void) switch_core_media_check_outgoing_proxy(switch_core_session_
 											 "PROXY",
 											 NULL,
 											 NULL,
-											 SDP_TYPE_RESPONSE,
+											 SDP_ANSWER,
 											 0,
 											 8000,
 											 20,
@@ -13953,7 +13978,7 @@ SWITCH_DECLARE(void) switch_core_media_check_outgoing_proxy(switch_core_session_
 												 "PROXY-VID",
 												 NULL,
 												 NULL,
-												 SDP_TYPE_RESPONSE,
+												 SDP_ANSWER,
 												 0,
 												 90000,
 												 90000,
@@ -13974,7 +13999,7 @@ SWITCH_DECLARE(void) switch_core_media_check_outgoing_proxy(switch_core_session_
 												 "PROXY-TXT",
 												 NULL,
 												 NULL,
-												 SDP_TYPE_RESPONSE,
+												 SDP_ANSWER,
 												 0,
 												 1000,
 												 1000,
@@ -14128,7 +14153,7 @@ SWITCH_DECLARE (void) switch_core_media_recover_session(switch_core_session_t *s
 		}
 	}
 
-	switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, NULL, 0, NULL, 1);
+	switch_core_media_gen_local_sdp(session, SDP_OFFER, NULL, 0, NULL, 1);
 	switch_core_media_set_video_codec(session, 1);
 
 	if (switch_core_media_activate_rtp(session) != SWITCH_STATUS_SUCCESS) {
@@ -14249,7 +14274,7 @@ SWITCH_DECLARE(char *) switch_core_media_filter_sdp(const char *sdp_str, const c
 	switch_size_t len;
 	const char *i;
 	char *o;
-	int in_m = 0, m_tally = 0, slash = 0;
+	int in_m = 0, slash = 0;
 	int number = 0, skip = 0;
 	int remove = !strcasecmp(cmd, "remove");
 	int only = !strcasecmp(cmd, "only");
@@ -14283,7 +14308,6 @@ SWITCH_DECLARE(char *) switch_core_media_filter_sdp(const char *sdp_str, const c
 
 		if (*i == 'm' && *(i+1) == '=') {
 			in_m = 1;
-			m_tally++;
 		}
 
 		if (in_m) {
@@ -14987,7 +15011,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
 {
 	switch_status_t status = SWITCH_STATUS_FALSE;
 	switch_io_event_hook_video_read_frame_t *ptr;
-	uint32_t loops = 0;
 	switch_media_handle_t *smh;
 	int is_keyframe = 0;
 
@@ -14999,8 +15022,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
 
  top:
 
-	loops++;
-
 	if (switch_channel_down_nosig(session->channel)) {
 		return SWITCH_STATUS_FALSE;
 	}
@@ -16421,7 +16442,21 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
 	return status;
 }
 
+SWITCH_DECLARE(switch_rtp_engine_t *) switch_core_media_get_engine(switch_core_session_t *session, int media_type)
+{
+    if (!session) return NULL;
 
+    return &session->media_handle->engines[media_type];
+}
+
+SWITCH_DECLARE(switch_codec_t*) switch_core_media_get_codec(switch_core_session_t *session, switch_media_type_t type)
+{
+    switch_rtp_engine_t *engine = switch_core_media_get_engine(session, type);
+
+    if (!engine) return NULL;
+
+    return &engine->read_codec;
+}
 
 /* For Emacs:
  * Local Variables:
diff --git a/src/switch_core_memory.c b/src/switch_core_memory.c
index 7d3f4adbd7..77be1812c5 100644
--- a/src/switch_core_memory.c
+++ b/src/switch_core_memory.c
@@ -501,9 +501,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_destroy_memory_pool(switch_m
 #if APR_POOL_DEBUG
 		fspr_pool_destroy_debug(tmp_pool, func);
 #else
-		fspr_pool_destroy(tmp_pool);
+		if (tmp_pool) {
+			fspr_pool_destroy(tmp_pool);
+		}
 #endif
 #ifdef USE_MEM_LOCK
+
 		switch_mutex_unlock(memory_manager.mem_lock);
 #endif
 	}
diff --git a/src/switch_core_port_allocator.c b/src/switch_core_port_allocator.c
index 3bbed2a351..2ed956c6fb 100644
--- a/src/switch_core_port_allocator.c
+++ b/src/switch_core_port_allocator.c
@@ -150,12 +150,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_request_port(switch_c
 	switch_mutex_lock(alloc->mutex);
 	srand((unsigned) ((unsigned) (intptr_t) port_ptr + (unsigned) (intptr_t) switch_thread_self() + switch_micro_time_now()));
 
-	while (alloc->track_used < alloc->track_len) {
+	while (alloc->track_len && alloc->track_used < alloc->track_len) {
 		uint32_t index;
 		uint32_t tries = 0;
 
 		/* randomly pick a port */
-		index = rand() % alloc->track_len;
+		index = switch_rand() % alloc->track_len;
 
 		/* if it is used walk up the list to find a free one */
 		while (alloc->track[index] && tries < alloc->track_len) {
diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index a103a6e964..94944faa2f 100644
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -799,6 +799,7 @@ static const char *message_names[] = {
 	"DEFLECT",
 	"VIDEO_REFRESH_REQ",
 	"DISPLAY",
+	"MEDIA_PARAMS",
 	"TRANSCODING_NECESSARY",
 	"AUDIO_SYNC",
 	"VIDEO_SYNC",
@@ -1391,6 +1392,8 @@ SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session, s
 {
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 
+	switch_core_codec_lock_full(session);
+
 	if (reset_read_codec) {
 		switch_core_session_set_read_codec(session, NULL);
 		if (session->sdata && switch_core_codec_ready(&session->sdata->codec)) {
@@ -1424,6 +1427,8 @@ SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session, s
 	switch_clear_flag(session, SSF_WARN_TRANSCODE);
 	switch_ivr_deactivate_unicast(session);
 	switch_channel_clear_flag(channel, CF_BREAK);
+
+	switch_core_codec_unlock_full(session);
 }
 
 
diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 5a75aeb573..165c9bd8b1 100644
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -702,7 +702,7 @@ static switch_status_t switch_cache_db_execute_sql_real(switch_cache_db_handle_t
 	case SCDB_TYPE_ODBC:
 		{
 			type = "ODBC";
-			status = switch_odbc_handle_exec(dbh->native_handle.odbc_dbh, sql, NULL, &errmsg);
+			status = switch_odbc_handle_exec(dbh->native_handle.odbc_dbh, sql, NULL, &errmsg) == SWITCH_ODBC_SUCCESS ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 		}
 		break;
 	case SCDB_TYPE_CORE_DB:
@@ -904,7 +904,7 @@ SWITCH_DECLARE(char *) switch_cache_db_execute_sql2str(switch_cache_db_handle_t
 		break;
 	case SCDB_TYPE_ODBC:
 		{
-			status = switch_odbc_handle_exec_string(dbh->native_handle.odbc_dbh, sql, str, len, err);
+			status = switch_odbc_handle_exec_string(dbh->native_handle.odbc_dbh, sql, str, len, err) == SWITCH_ODBC_SUCCESS ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 		}
 		break;
 	case SCDB_TYPE_DATABASE_INTERFACE:
@@ -1189,7 +1189,7 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_event_callback(switc
 		break;
 	case SCDB_TYPE_ODBC:
 		{
-			status = switch_odbc_handle_callback_exec(dbh->native_handle.odbc_dbh, sql, helper_callback, &h, err);
+			status = switch_odbc_handle_callback_exec(dbh->native_handle.odbc_dbh, sql, helper_callback, &h, err) == SWITCH_ODBC_SUCCESS ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 		}
 		break;
 	case SCDB_TYPE_CORE_DB:
@@ -1248,7 +1248,7 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_event_callback_err(s
 		break;
 	case SCDB_TYPE_ODBC:
 		{
-			status = switch_odbc_handle_callback_exec(dbh->native_handle.odbc_dbh, sql, helper_callback, &h, err);
+			status = switch_odbc_handle_callback_exec(dbh->native_handle.odbc_dbh, sql, helper_callback, &h, err) == SWITCH_ODBC_SUCCESS ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 			if (err && *err) {
 				(*err_callback)(pdata, (const char*)*err);
 			}
@@ -1305,7 +1305,7 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_callback(switch_cach
 		break;
 	case SCDB_TYPE_ODBC:
 		{
-			status = switch_odbc_handle_callback_exec(dbh->native_handle.odbc_dbh, sql, callback, pdata, err);
+			status = switch_odbc_handle_callback_exec(dbh->native_handle.odbc_dbh, sql, callback, pdata, err) == SWITCH_ODBC_SUCCESS ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 		}
 		break;
 	case SCDB_TYPE_CORE_DB:
@@ -1358,7 +1358,7 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_callback_err(switch_
 		break;
 	case SCDB_TYPE_ODBC:
 		{
-			status = switch_odbc_handle_callback_exec(dbh->native_handle.odbc_dbh, sql, callback, pdata, err);
+			status = switch_odbc_handle_callback_exec(dbh->native_handle.odbc_dbh, sql, callback, pdata, err) == SWITCH_ODBC_SUCCESS ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 			if (err && *err) {
 				(*err_callback)(pdata, (const char*)*err);
 			}
@@ -2065,6 +2065,7 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
 	switch_status_t status;
 	uint32_t ttl = 0;
 	uint32_t i;
+	switch_status_t res;
 
 	if (!zstr(qm->pre_trans_execute)) {
 		switch_cache_db_execute_sql_real(qm->event_db, qm->pre_trans_execute, &errmsg);
@@ -2126,7 +2127,8 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
 
 		for (i = 0; (qm->max_trans == 0 || ttl <= qm->max_trans) && (i < qm->numq); i++) {
 			switch_mutex_lock(qm->mutex);
-			switch_queue_trypop(qm->sql_queue[i], &pop);
+			res = switch_queue_trypop(qm->sql_queue[i], &pop);
+			(void)res;
 			switch_mutex_unlock(qm->mutex);
 			if (pop) break;
 		}
@@ -2138,6 +2140,7 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
 				switch_mutex_unlock(qm->mutex);
 				ttl++;
 			}
+
 			switch_safe_free(pop);
 			if (status != SWITCH_STATUS_SUCCESS) break;
 		} else {
@@ -2153,7 +2156,6 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
 		}
 	}
 
-
  end:
 
 	switch(qm->event_db->type) {
@@ -2190,11 +2192,11 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
 		}
 	}
 
-
 	switch_mutex_lock(qm->mutex);
 	for (i = 0; i < qm->numq; i++) {
 		qm->written[i] = qm->pre_written[i];
 	}
+
 	switch_mutex_unlock(qm->mutex);
 
 	return ttl;
diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index fe71a6400a..cd234a30e5 100644
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -98,6 +98,7 @@ SWITCH_DECLARE(Event *) EventConsumer::pop(int block, int timeout)
 	void *pop = NULL;
 	Event *ret = NULL;
 	switch_event_t *event;
+	switch_status_t res;
 
 	if (!ready) {
 		return NULL;
@@ -105,14 +106,16 @@ SWITCH_DECLARE(Event *) EventConsumer::pop(int block, int timeout)
 
 	if (block) {
 		if (timeout > 0) {
-			switch_queue_pop_timeout(events, &pop, (switch_interval_time_t) timeout * 1000); // millisec rather than microsec
+			res = switch_queue_pop_timeout(events, &pop, (switch_interval_time_t) timeout * 1000); // millisec rather than microsec
 		} else {
-			switch_queue_pop(events, &pop);
+			res = switch_queue_pop(events, &pop);
 		}
 	} else {
-		switch_queue_trypop(events, &pop);
+		res = switch_queue_trypop(events, &pop);
 	}
 
+	(void)res;
+
 	if ((event = (switch_event_t *) pop)) {
 		ret = new Event(event, 1);
 	}
@@ -138,9 +141,7 @@ SWITCH_DECLARE(void) EventConsumer::cleanup()
 
 	node_index = 0;
 
-	if (events) {
-		switch_queue_interrupt_all(events);
-	}
+	switch_queue_interrupt_all(events);
 
 	while(switch_queue_trypop(events, &pop) == SWITCH_STATUS_SUCCESS) {
 		switch_event_t *event = (switch_event_t *) pop;
diff --git a/src/switch_curl.c b/src/switch_curl.c
index c99a5f61de..0a8cb682c3 100644
--- a/src/switch_curl.c
+++ b/src/switch_curl.c
@@ -58,11 +58,17 @@ SWITCH_DECLARE(void) switch_curl_destroy(void)
 	curl_global_cleanup();
 }
 
-SWITCH_DECLARE(switch_status_t) switch_curl_process_form_post_params(switch_event_t *event, switch_CURL *curl_handle, struct curl_httppost **formpostp)
+SWITCH_DECLARE(switch_status_t) switch_curl_process_mime(switch_event_t *event, switch_CURL *curl_handle, switch_curl_mime **mimep)
 {
-
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+	curl_mime *mime = NULL;
+	curl_mimepart *part = NULL;
+	uint8_t added = 0;
+	switch_CURLcode curl_code = CURLE_OK;
+#else
 	struct curl_httppost *formpost=NULL;
 	struct curl_httppost *lastptr=NULL;
+#endif
 	switch_event_header_t *hp;
 	int go = 0;
 
@@ -77,39 +83,110 @@ SWITCH_DECLARE(switch_status_t) switch_curl_process_form_post_params(switch_even
 		return SWITCH_STATUS_FALSE;
 	}
 
-	for (hp = event->headers; hp; hp = hp->next) {
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+	mime = curl_mime_init(curl_handle);
+#endif
 
+	for (hp = event->headers; hp; hp = hp->next) {
 		if (!strncasecmp(hp->name, "attach_file:", 12)) {
 			char *pname = strdup(hp->name + 12);
 
 			if (pname) {
 				char *fname = strchr(pname, ':');
+
 				if (fname) {
 					*fname++ = '\0';
 
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+					part = curl_mime_addpart(mime);
+					if ((curl_code = curl_mime_name(part, pname))) {
+						free(pname);
+						goto error;
+					}
+
+					if ((curl_code = curl_mime_filename(part, fname))) {
+						free(pname);
+						goto error;
+					}
+
+					if ((curl_code = curl_mime_filedata(part, hp->value))) {
+						free(pname);
+						goto error;
+					}
+
+					added++;
+#else
 					curl_formadd(&formpost,
 								 &lastptr,
 								 CURLFORM_COPYNAME, pname,
 								 CURLFORM_FILENAME, fname,
 								 CURLFORM_FILE, hp->value,
 								 CURLFORM_END);
+#endif
 				}
+
 				free(pname);
 			}
 		} else {
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+			part = curl_mime_addpart(mime);
+			if ((curl_code = curl_mime_name(part, hp->name))) {
+				goto error;
+			}
+
+			if ((curl_code = curl_mime_data(part, hp->value, CURL_ZERO_TERMINATED))) {
+				goto error;
+			}
+
+			added++;
+#else
 			curl_formadd(&formpost,
 						 &lastptr,
 						 CURLFORM_COPYNAME, hp->name,
 						 CURLFORM_COPYCONTENTS, hp->value,
 						 CURLFORM_END);
-
+#endif
 		}
 	}
 
-	*formpostp = formpost;
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+ error:
+	if (curl_code) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CURL error occured. Error code: %d Error msg: [%s]\n", curl_code, switch_curl_easy_strerror(curl_code));
+	}
+
+	if (!added) {
+		curl_mime_free(mime);
+		mime = NULL;
+	}
+
+	*mimep = mime;
+#else
+	*mimep = formpost;
+#endif
 
 	return SWITCH_STATUS_SUCCESS;
+}
 
+SWITCH_DECLARE(void) switch_curl_mime_free(switch_curl_mime **mimep)
+{
+	if (mimep && *mimep) {
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+		curl_mime_free(*mimep);
+#else
+		curl_formfree(*mimep);
+#endif
+		mimep = NULL;
+	}
+}
+
+SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_setopt_mime(switch_CURL *curl_handle, switch_curl_mime *mime)
+{
+#if defined(LIBCURL_VERSION_NUM) && (LIBCURL_VERSION_NUM >= 0x073800)
+	return curl_easy_setopt(curl_handle, CURLOPT_MIMEPOST, mime);
+#else
+	return curl_easy_setopt(curl_handle, CURLOPT_HTTPPOST, mime);
+#endif
 }
 
 /* For Emacs:
diff --git a/src/switch_event.c b/src/switch_event.c
index be49f2fc14..8a8c8d6c35 100644
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -553,6 +553,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void)
 	switch_hash_index_t *hi;
 	const void *var;
 	void *val;
+	switch_status_t res;
 
 	if (switch_core_test_flag(SCF_MINIMAL)) {
 		return SWITCH_STATUS_SUCCESS;
@@ -565,7 +566,8 @@ SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void)
 	unsub_all_switch_event_channel();
 
 	if (EVENT_CHANNEL_DISPATCH_QUEUE) {
-		switch_queue_trypush(EVENT_CHANNEL_DISPATCH_QUEUE, NULL);
+		res = switch_queue_trypush(EVENT_CHANNEL_DISPATCH_QUEUE, NULL);
+		(void)res;
 		switch_queue_interrupt_all(EVENT_CHANNEL_DISPATCH_QUEUE);
 	}
 
@@ -573,10 +575,10 @@ SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void)
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping dispatch queues\n");
 
 		for(x = 0; x < (uint32_t)DISPATCH_THREAD_COUNT; x++) {
-			switch_queue_trypush(EVENT_DISPATCH_QUEUE, NULL);
+			res = switch_queue_trypush(EVENT_DISPATCH_QUEUE, NULL);
+			(void)res;
 		}
 
-
 		switch_queue_interrupt_all(EVENT_DISPATCH_QUEUE);
 
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping dispatch threads\n");
@@ -595,6 +597,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void)
 		if (THREAD_COUNT == last) {
 			x++;
 		}
+
 		last = THREAD_COUNT;
 	}
 
@@ -651,7 +654,6 @@ SWITCH_DECLARE(void) switch_event_launch_dispatch_threads(uint32_t max)
 {
 	switch_threadattr_t *thd_attr;
 	uint32_t index = 0;
-	int launched = 0;
 	uint32_t sanity = 200;
 
 	switch_memory_pool_t *pool = RUNTIME_POOL;
@@ -682,7 +684,6 @@ SWITCH_DECLARE(void) switch_event_launch_dispatch_threads(uint32_t max)
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Create additional event dispatch thread %d\n", index);
 		}
-		launched++;
 	}
 
 	SOFT_MAX_DISPATCH = index;
@@ -2073,15 +2074,18 @@ SWITCH_DECLARE(switch_status_t) switch_event_bind_removable(const char *id, swit
 		switch_mutex_lock(CUSTOM_HASH_MUTEX);
 
 		if (!(subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name))) {
-			switch_event_reserve_subclass_detailed(id, subclass_name);
-			subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name);
-			subclass->bind = 1;
+			if (switch_event_reserve_subclass_detailed(id, subclass_name) == SWITCH_STATUS_SUCCESS) {
+				if ((subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name))) {
+					subclass->bind = 1;
+				}
+			}
 		}
 
 		switch_mutex_unlock(CUSTOM_HASH_MUTEX);
 
 		if (!subclass) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not reserve subclass. '%s'\n", subclass_name);
+
 			return SWITCH_STATUS_FALSE;
 		}
 	}
@@ -2096,6 +2100,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_bind_removable(const char *id, swit
 		if (subclass_name) {
 			event_node->subclass_name = DUP(subclass_name);
 		}
+
 		event_node->callback = callback;
 		event_node->user_data = user_data;
 
@@ -2954,14 +2959,17 @@ static void ecd_deliver(event_channel_data_t **ecdP)
 		int x_argc = switch_separate_string_string(key, (char*) sep, x_argv, SWITCH_CHANNEL_DISPATCH_MAX_KEY_PARTS);
 		char buf[1024];
 		int i, r;
+
 		for(i=x_argc - 1; i > 0; i--) {
 			int z;
+
 			memset(buf, 0, 1024);
-			sprintf(buf, "%s", x_argv[0]);
+			switch_snprintf(buf, sizeof(buf), "%s", x_argv[0]);
 			for(z=1; z < i; z++) {
 				strcat(buf, sep);
-				strcat(buf, x_argv[z]);
+				strncat(buf, x_argv[z], sizeof(buf) - strlen(buf) - 1);
 			}
+
 			r = _switch_event_channel_broadcast(buf, ecd->event_channel, ecd->json, ecd->key, ecd->id);
 			t += r;
 			if (r && switch_core_test_flag(SCF_EVENT_CHANNEL_HIERARCHY_DELIVERY_ONCE)) {
@@ -2970,11 +2978,13 @@ static void ecd_deliver(event_channel_data_t **ecdP)
 		}
 	} else {
 		char *p = NULL;
+
 		if ((p = strchr(key, '.'))) {
 			*p = '\0';
 			t += _switch_event_channel_broadcast(key, ecd->event_channel, ecd->json, ecd->key, ecd->id);
 		}
 	}
+
 	switch_safe_free(key);
 
 	t += _switch_event_channel_broadcast(SWITCH_EVENT_CHANNEL_GLOBAL, ecd->event_channel, ecd->json, ecd->key, ecd->id);
@@ -2982,6 +2992,7 @@ static void ecd_deliver(event_channel_data_t **ecdP)
 	if(t == 0) {
 		if (switch_core_test_flag(SCF_EVENT_CHANNEL_LOG_UNDELIVERABLE_JSON)) {
 			char *json = cJSON_Print(ecd->json);
+
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "no subscribers for %s , %s => %s\n", ecd->event_channel, ecd->key, json);
 			switch_safe_free(json);
 		} else {
diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 77d957fb7c..1443f989cf 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -1788,6 +1788,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
 
 		if (switch_channel_test_flag(channel, CF_MEDIA_TRANS)) {
 			switch_core_session_rwunlock(session);
+
 			return SWITCH_STATUS_INUSE;
 		}
 
@@ -1798,6 +1799,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
 		}
 
 		if (switch_channel_test_flag(channel, CF_PROXY_MODE)) {
+			switch_status_t res = SWITCH_STATUS_SUCCESS;
+
 			status = SWITCH_STATUS_SUCCESS;
 
 			/* If we had early media in bypass mode before, it is no longer relevant */
@@ -1816,6 +1819,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
 			if (switch_core_session_receive_message(session, &msg) != SWITCH_STATUS_SUCCESS) {
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't re-establsh media on %s\n", switch_channel_get_name(channel));
 				switch_core_session_rwunlock(session);
+
 				return SWITCH_STATUS_GENERR;
 			}
 
@@ -1832,7 +1836,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
 				switch_channel_wait_for_flag(channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000, NULL);
 				switch_channel_wait_for_flag(channel, CF_MEDIA_ACK, SWITCH_TRUE, 10000, NULL);
 				switch_channel_wait_for_flag(channel, CF_MEDIA_SET, SWITCH_TRUE, 10000, NULL);
-				switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
+				res = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
 			}
 
 			if ((flags & SMF_REBRIDGE)
@@ -1844,10 +1848,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
 				switch_channel_wait_for_flag(other_channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000, NULL);
 				switch_channel_wait_for_flag(other_channel, CF_MEDIA_ACK, SWITCH_TRUE, 10000, NULL);
 				switch_channel_wait_for_flag(other_channel, CF_MEDIA_SET, SWITCH_TRUE, 10000, NULL);
-				switch_core_session_read_frame(other_session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
+				res = switch_core_session_read_frame(other_session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
 				switch_channel_clear_state_handler(other_channel, NULL);
 				switch_core_session_rwunlock(other_session);
 			}
+
+			(void)res;
+
 			if (other_channel) {
 				switch_channel_clear_state_handler(channel, NULL);
 			}
@@ -1862,6 +1869,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
 			} else {
 				switch_ivr_uuid_bridge(uuid, other_uuid);
 			}
+
 			switch_channel_wait_for_flag(channel, CF_BRIDGED, SWITCH_TRUE, 1000, NULL);
 			switch_channel_wait_for_flag(other_channel, CF_BRIDGED, SWITCH_TRUE, 1000, NULL);
 		}
@@ -2143,7 +2151,7 @@ SWITCH_DECLARE(void) switch_ivr_check_hold(switch_core_session_t *session)
 		msg.message_id = SWITCH_MESSAGE_INDICATE_MEDIA_RENEG;
 		msg.from = __FILE__;
 
-		switch_core_media_set_smode(session, SWITCH_MEDIA_TYPE_AUDIO, SWITCH_MEDIA_FLOW_SENDRECV, SDP_TYPE_REQUEST);
+		switch_core_media_set_smode(session, SWITCH_MEDIA_TYPE_AUDIO, SWITCH_MEDIA_FLOW_SENDRECV, SDP_OFFER);
 		switch_core_session_receive_message(session, &msg);
 	}
 
@@ -2806,11 +2814,13 @@ SWITCH_DECLARE(int) switch_ivr_set_xml_call_stats(switch_xml_t xml, switch_core_
 static int switch_ivr_set_xml_chan_var(switch_xml_t xml, const char *var, const char *val, int off)
 {
 	char *data;
-	switch_size_t dlen = strlen(val) * 3 + 1;
+	switch_size_t dlen;
 	switch_xml_t variable;
 
 	if (!val) val = "";
 
+	dlen = strlen(val) * 3 + 1;
+
 	if (!zstr(var) && ((variable = switch_xml_add_child_d(xml, var, off++)))) {
 		if ((data = malloc(dlen))) {
 			memset(data, 0, dlen);
diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index 9a33b43340..4075f0adce 100644
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -474,7 +474,7 @@ static dm_match_t switch_ivr_dmachine_check_match(switch_ivr_dmachine_t *dmachin
 
 	if (is_timeout) {
 		if (both_bp) {
-			r_bp = exact_bp ? exact_bp : both_bp;
+			r_bp = exact_bp;
 		}
 	}
 
diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index f23549713b..99c70991bd 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -186,15 +186,16 @@ struct key_collect {
 static void *SWITCH_THREAD_FUNC collect_thread_run(switch_thread_t *thread, void *obj)
 {
 	struct key_collect *collect = (struct key_collect *) obj;
-	switch_channel_t *channel = switch_core_session_get_channel(collect->session);
+	switch_channel_t *channel = NULL;
 	char buf[10] = SWITCH_BLANK_STRING;
 	switch_application_interface_t *application_interface = NULL;
 
-	if (collect->session) {
-		if (switch_core_session_read_lock(collect->session) != SWITCH_STATUS_SUCCESS) {
-			return NULL;
-		}
-	} else {
+	if (!collect->session) {
+		return NULL;
+	}
+
+	channel = switch_core_session_get_channel(collect->session);
+	if (switch_core_session_read_lock(collect->session) != SWITCH_STATUS_SUCCESS) {
 		return NULL;
 	}
 
@@ -232,6 +233,7 @@ static void *SWITCH_THREAD_FUNC collect_thread_run(switch_thread_t *thread, void
 			switch_channel_set_flag(channel, CF_WINNER);
 			switch_channel_set_variable(channel, "group_dial_status", "winner");
 		}
+
 		goto wbreak;
 	}
 
@@ -271,6 +273,7 @@ static void *SWITCH_THREAD_FUNC collect_thread_run(switch_thread_t *thread, void
 			switch_ivr_play_file(collect->session, NULL, collect->error_file, NULL);
 		}
 	}
+
   wbreak:
 
 	switch_core_session_rwunlock(collect->session);
@@ -317,8 +320,10 @@ static int check_per_channel_timeouts(originate_global_t *oglobals,
 				delayed_min = oglobals->originate_status[i].per_channel_delay_start;
 			}
 		}
-		early_exit_time = delayed_min - (uint32_t) elapsed;
+
+		early_exit_time = delayed_min - (uint32_t)(switch_time_t) elapsed;
 	}
+
 	for (i = 0; i < max; i++) {
 		if (oglobals->originate_status[i].peer_channel && oglobals->originate_status[i].per_channel_delay_start &&
 			(elapsed > oglobals->originate_status[i].per_channel_delay_start || active_channels == 0)) {
@@ -331,6 +336,7 @@ static int check_per_channel_timeouts(originate_global_t *oglobals,
 						oglobals->originate_status[i].per_channel_timelimit_sec = 1;
 					}
 				}
+
 				if (oglobals->originate_status[i].per_channel_progress_timelimit_sec) {
 					if (oglobals->originate_status[i].per_channel_progress_timelimit_sec > early_exit_time) {
 						/* IN theory this check is not needed ( should just be if !0 then -= with no else), if its not 0 it should always be greater.... */
@@ -339,6 +345,7 @@ static int check_per_channel_timeouts(originate_global_t *oglobals,
 						oglobals->originate_status[i].per_channel_progress_timelimit_sec = 1;
 					}
 				}
+
 				oglobals->originate_status[i].per_channel_delay_start -= delayed_min;
 			} else {
 				oglobals->originate_status[i].per_channel_delay_start = 0;
@@ -1302,7 +1309,7 @@ static switch_status_t setup_ringback(originate_global_t *oglobals, originate_st
 		}
 	}
 
-	if (oglobals->session && (read_codec = switch_core_session_get_read_codec(oglobals->session))) {
+	if ((read_codec = switch_core_session_get_read_codec(oglobals->session))) {
 		if (ringback_data && switch_is_file_path(ringback_data)) {
 			if (!(strrchr(ringback_data, '.') || strstr(ringback_data, SWITCH_URL_SEPARATOR))) {
 				ringback->asis++;
@@ -4958,9 +4965,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_enterprise_orig_and_bridge(switch_cor
 			switch_ivr_multi_threaded_bridge(session, peer_session, func, a_key, b_key);
 		}
 
-		if (peer_session) {
-			switch_core_session_rwunlock(peer_session);
-		}
+		switch_core_session_rwunlock(peer_session);
 	}
 
 	return status;
@@ -5023,9 +5028,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_orig_and_bridge(switch_core_session_t
 			switch_ivr_multi_threaded_bridge(session, peer_session, func, a_key, b_key);
 		}
 
-		if (peer_session) {
-			switch_core_session_rwunlock(peer_session);
-		}
+		switch_core_session_rwunlock(peer_session);
 	}
 
 	return status;
diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index 25486eee7f..2ac77be19d 100644
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -1271,7 +1271,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 	int sleep_val_i = 250;
 	int eof = 0;
 	switch_size_t bread = 0;
-	int l16 = 0;
 	switch_codec_implementation_t read_impl = { 0 };
 	char *file_dup;
 	char *argv[128] = { 0 };
@@ -1334,10 +1333,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 
 	arg_recursion_check_start(args);
 
-	if (!zstr(read_impl.iananame) && !strcasecmp(read_impl.iananame, "l16")) {
-		l16++;
-	}
-
 	if (play_delimiter) {
 		file_dup = switch_core_session_strdup(session, file);
 		argc = switch_separate_string(file_dup, play_delimiter, argv, (sizeof(argv) / sizeof(argv[0])));
@@ -2828,6 +2823,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session
 	}
 
 	switch_core_speech_feed_tts(sh, text, &flags);
+
+	if ((sh->flags & SWITCH_SPEECH_FLAG_MULTI)) {
+		flags = SWITCH_SPEECH_FLAG_DONE;
+		switch_core_speech_feed_tts(sh, "DONE", &flags);
+	}
+
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Speaking text: %s\n", text);
 	switch_safe_free(tmp);
 	text = NULL;
@@ -3207,6 +3208,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_soft_hold(switch_core_session_t *sess
 	const char *other_uuid, *moh = NULL;
 	int moh_br = 0;
 	switch_input_args_t args = { 0 };
+	switch_status_t res;
+
 	args.input_callback = hold_on_dtmf;
 	args.buf = (void *) unhold_key;
 	args.buflen = (uint32_t) strlen(unhold_key);
@@ -3237,11 +3240,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_soft_hold(switch_core_session_t *sess
 			}
 
 			if (!zstr(moh) && strcasecmp(moh, "silence")) {
-				switch_ivr_play_file(session, NULL, moh, &args);
+				res = switch_ivr_play_file(session, NULL, moh, &args);
 			} else {
-				switch_ivr_collect_digits_callback(session, &args, 0, 0);
+				res = switch_ivr_collect_digits_callback(session, &args, 0, 0);
 			}
 
+			(void)res;
+
 			if (moh_br) {
 				switch_channel_stop_broadcast(other_channel);
 			}
@@ -3251,10 +3256,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_soft_hold(switch_core_session_t *sess
 
 			return SWITCH_STATUS_SUCCESS;
 		}
-
 	}
 
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Channel %s is not in a bridge\n", switch_channel_get_name(channel));
+
 	return SWITCH_STATUS_FALSE;
 
 }
diff --git a/src/switch_jitterbuffer.c b/src/switch_jitterbuffer.c
index d68b269024..655fa022c2 100644
--- a/src/switch_jitterbuffer.c
+++ b/src/switch_jitterbuffer.c
@@ -44,6 +44,8 @@
 
 struct switch_jb_s;
 
+static inline int check_jb_size(switch_jb_t *jb);
+
 typedef struct switch_jb_node_s {
 	struct switch_jb_s *parent;
 	switch_rtp_packet_t packet;
@@ -56,6 +58,29 @@ typedef struct switch_jb_node_s {
 	switch_bool_t complete_frame_mark;
 } switch_jb_node_t;
 
+typedef struct switch_jb_stats_s {
+	uint32_t reset_too_big;
+	uint32_t reset_missing_frames;
+	uint32_t reset_ts_jump;
+	uint32_t reset_error;
+	uint32_t reset;
+	uint32_t size_max;
+	uint32_t size_est;
+	uint32_t acceleration;
+	uint32_t expand;
+	uint32_t jitter_max_ms;
+	int estimate_ms;
+	int buffer_size_ms;
+} switch_jb_stats_t;
+
+typedef struct switch_jb_jitter_s {
+	double *estimate;
+	uint32_t samples_per_second;
+	uint32_t samples_per_frame;
+	uint32_t drop_gap;
+	switch_jb_stats_t stats;
+} switch_jb_jitter_t;
+
 struct switch_jb_s {
 	struct switch_jb_node_s *node_list;
 	uint32_t last_target_seq;
@@ -104,6 +129,7 @@ struct switch_jb_s {
 	switch_jb_flag_t flags;
 	switch_jb_type_t type;
 	switch_core_session_t *session;
+	switch_jb_jitter_t jitter;
 	switch_channel_t *channel;
 	uint32_t buffer_lag;
 	uint32_t flush;
@@ -112,6 +138,8 @@ struct switch_jb_s {
 	uint32_t period_len;
 	uint32_t nack_saved_the_day;
 	uint32_t nack_didnt_save_the_day;
+	switch_bool_t elastic;
+	switch_codec_t *codec;
 };
 
 
@@ -233,6 +261,7 @@ static inline switch_jb_node_t *new_node(switch_jb_t *jb)
 
 		if (jb->allocated_nodes > jb->max_frame_len * mult) {
 			jb_debug(jb, 2, "ALLOCATED FRAMES TOO HIGH! %d\n", jb->allocated_nodes);
+			jb->jitter.stats.reset_too_big++;
 			switch_jb_reset(jb);
 			switch_mutex_unlock(jb->list_mutex);
 			return NULL;
@@ -332,6 +361,26 @@ static inline void hide_nodes(switch_jb_t *jb)
 	switch_mutex_unlock(jb->list_mutex);
 }
 
+static inline switch_bool_t packet_vad(switch_jb_t *jb, switch_rtp_packet_t *packet, switch_size_t len) {
+	void *payload = packet ? (packet->ebody ? packet->ebody : packet->body) : NULL;
+	uint16_t payload_len = len;
+
+	if (payload && payload_len > 0) {
+		switch_bool_t ret = SWITCH_FALSE, *ret_p = &ret;
+		switch_codec_control_type_t ret_t;
+
+		switch_core_media_codec_control(jb->session, SWITCH_MEDIA_TYPE_AUDIO,
+						SWITCH_IO_WRITE, SCC_AUDIO_VAD,
+						SCCT_STRING, (void *)payload,
+						SCCT_INT, (void *)&payload_len,
+						&ret_t, (void *)&ret_p);
+
+		return ret;
+	}
+
+	return SWITCH_TRUE;
+}
+
 static inline void drop_ts(switch_jb_t *jb, uint32_t ts)
 {
 	switch_jb_node_t *np;
@@ -667,6 +716,7 @@ static inline void add_node(switch_jb_t *jb, switch_rtp_packet_t *packet, switch
 
 		if (((seq_diff >= 100) || (ts_diff > (900000 * 5)))) {
 			jb_debug(jb, 2, "CHANGE DETECTED, PUNT %u\n", abs(((int)ntohs(packet->header.seq) - ntohs(jb->highest_wrote_seq))));
+			jb->jitter.stats.reset_ts_jump++;
 			switch_jb_reset(jb);
 		}
 	}
@@ -732,6 +782,12 @@ static inline void increment_seq(switch_jb_t *jb)
 	jb->target_seq = htons((ntohs(jb->target_seq) + 1));
 }
 
+static inline void decrement_seq(switch_jb_t *jb)
+{
+	jb->last_target_seq = jb->target_seq;
+	jb->target_seq = htons((ntohs(jb->target_seq) - 1));
+}
+
 static inline void set_read_seq(switch_jb_t *jb, uint16_t seq)
 {
 	jb->last_target_seq = seq;
@@ -854,13 +910,156 @@ static inline switch_status_t jb_next_packet_by_ts(switch_jb_t *jb, switch_jb_no
 
 }
 
+static inline int check_jb_size(switch_jb_t *jb)
+{
+	switch_jb_node_t *np;
+	uint16_t seq_hs, target_seq_hs;
+	uint16_t l_seq = 0;
+	uint16_t h_seq = 0;
+	uint16_t count = 0;
+	uint16_t old = 0;
+
+	switch_mutex_lock(jb->list_mutex);
+
+	target_seq_hs = ntohs(jb->target_seq);
+
+	for (np = jb->node_list; np; np = np->next) {
+		if (!np->visible) {
+			continue;
+		}
+
+		seq_hs = ntohs(np->packet.header.seq);
+		if (target_seq_hs > seq_hs) {
+			hide_node(np, SWITCH_FALSE);
+			old++;
+			continue;
+		}
+
+		if (count == 0) {
+			l_seq = h_seq = seq_hs;
+		}
+
+		count++;
+
+		if (seq_hs < l_seq) {
+			l_seq = seq_hs;
+		}
+
+		if (seq_hs > h_seq) {
+			h_seq = seq_hs;
+		}
+	}
+
+	if (count > jb->jitter.stats.size_max) {
+		jb->jitter.stats.size_max = count;
+	}
+
+	if (jb->jitter.stats.size_est == 0) {
+		jb->jitter.stats.size_est = count;
+	} else {
+		jb->jitter.stats.size_est = ((99 * jb->jitter.stats.size_est) + (1 * count)) / 100;
+	}
+
+	/* update the stats every x packets */
+	if (target_seq_hs % 50 == 0) {
+		int packet_ms = jb->jitter.samples_per_frame / (jb->jitter.samples_per_second / 1000);
+
+		jb->jitter.stats.estimate_ms = (*jb->jitter.estimate) / jb->jitter.samples_per_second * 1000;
+		if (jb->channel) {
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_size_max_ms", "%u", jb->jitter.stats.size_max * packet_ms);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_size_est_ms", "%u", jb->jitter.stats.size_est * packet_ms);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_acceleration_ms", "%u", jb->jitter.stats.acceleration * packet_ms);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_expand_ms", "%u", jb->jitter.stats.expand * packet_ms);
+		}
+
+		if (jb->jitter.stats.jitter_max_ms < jb->jitter.stats.estimate_ms) {
+			jb->jitter.stats.jitter_max_ms = jb->jitter.stats.estimate_ms;
+		}
+
+		if (jb->channel) {
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_jitter_max_ms", "%u", jb->jitter.stats.jitter_max_ms);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_jitter_est_ms", "%u", jb->jitter.stats.estimate_ms);
+		}
+	}
+
+	if (old) {
+		sort_free_nodes(jb);
+	}
+
+	switch_mutex_unlock(jb->list_mutex);
+
+	jb_debug(jb, SWITCH_LOG_INFO, "JITTER buffersize %u == %u old[%u] target[%u] seq[%u|%u]\n", count, h_seq - l_seq + 1, old, target_seq_hs, l_seq, h_seq);
+
+	return count;
+}
+
+static inline switch_status_t jb_next_packet_by_seq_with_acceleration(switch_jb_t *jb, switch_jb_node_t **nodep)
+{
+	switch_status_t status = jb_next_packet_by_seq(jb, nodep);
+	switch_rtp_packet_t *packet;
+	uint32_t len;
+	uint16_t seq = ntohs(jb->target_seq);
+
+	/* When using a Codec that provides voice activity detection ex. Opus, use it to
+	   select packet to drop/accelerate. */
+
+	if (jb->elastic && jb->jitter.estimate && (jb->visible_nodes * jb->jitter.samples_per_frame) > 0 && jb->jitter.samples_per_second) {
+		int visible_not_old = check_jb_size(jb);
+
+		jb->jitter.stats.estimate_ms = (int)((*jb->jitter.estimate) / ((jb->jitter.samples_per_second)) * 1000);
+		jb->jitter.stats.buffer_size_ms = (int)((visible_not_old * jb->jitter.samples_per_frame) / (jb->jitter.samples_per_second / 1000));
+
+		/* We try to accelerate in order to remove delay when the jitter buffer is 3x larger than the estimation. */
+		if (jb->jitter.stats.buffer_size_ms > (3 * jb->jitter.stats.estimate_ms) && jb->jitter.stats.buffer_size_ms > 60) {
+			if (status == SWITCH_STATUS_SUCCESS) {
+				packet = &(*nodep)->packet;
+				seq = ntohs((*nodep)->packet.header.seq);
+				len = (*nodep)->len;
+			}
+
+			if (jb->jitter.drop_gap > 0) {
+				jb_debug(jb, SWITCH_LOG_INFO, "JITTER estimation %dms buffersize %d/%d %dms seq:%u [drop-gap][%d]\n",
+						 jb->jitter.stats.estimate_ms, jb->complete_frames, jb->frame_len, jb->jitter.stats.buffer_size_ms, seq, jb->jitter.drop_gap);
+				jb->jitter.drop_gap--;
+			} else {
+				if (status != SWITCH_STATUS_SUCCESS || packet_vad(jb, packet, len) == SWITCH_FALSE) {
+					jb->jitter.drop_gap = 3;
+					if (status != SWITCH_STATUS_SUCCESS) {
+						jb_debug(jb, SWITCH_LOG_INFO, "JITTER estimation n/a buffersize %d/%d %dms seq:%u [drop-missing/no-plc]\n",
+								 jb->complete_frames, jb->frame_len, jb->jitter.stats.buffer_size_ms, seq);
+					} else {
+						jb_debug(jb, SWITCH_LOG_INFO, "JITTER estimation %dms buffersize %d/%d %dms seq:%u ACCELERATE [drop]\n",
+								 jb->jitter.stats.estimate_ms, jb->complete_frames, jb->frame_len, jb->jitter.stats.buffer_size_ms, seq);
+					}
+
+					jb->jitter.stats.acceleration++;
+
+					return jb_next_packet_by_seq(jb, nodep);
+				} else {
+					jb_debug(jb, SWITCH_LOG_INFO, "JITTER estimation %dms buffersize %d/%d %dms seq:%u [drop-skip-vad]\n",
+							 jb->jitter.stats.estimate_ms, jb->complete_frames, jb->frame_len, jb->jitter.stats.buffer_size_ms, seq);
+				}
+			}
+		} else {
+			jb_debug(jb, 2, "JITTER estimation %dms buffersize %d/%d %dms\n",
+					 jb->jitter.stats.estimate_ms, jb->complete_frames, jb->frame_len, jb->jitter.stats.buffer_size_ms);
+		}
+	}
+
+	return status;
+}
+
 static inline switch_status_t jb_next_packet(switch_jb_t *jb, switch_jb_node_t **nodep)
 {
 	if (jb->samples_per_frame) {
 		return jb_next_packet_by_ts(jb, nodep);
-	} else {
-		return jb_next_packet_by_seq(jb, nodep);
 	}
+
+	if (jb->elastic && jb->jitter.estimate) {
+		return jb_next_packet_by_seq_with_acceleration(jb, nodep);
+	}
+
+	return jb_next_packet_by_seq(jb, nodep);
 }
 
 static inline void free_nodes(switch_jb_t *jb)
@@ -877,16 +1076,58 @@ SWITCH_DECLARE(void) switch_jb_ts_mode(switch_jb_t *jb, uint32_t samples_per_fra
 	switch_core_inthash_init(&jb->node_hash_ts);
 }
 
+SWITCH_DECLARE(void) switch_jb_set_jitter_estimator(switch_jb_t *jb, double *jitter, uint32_t samples_per_frame, uint32_t samples_per_second)
+{
+	if (jb && jitter) {
+		memset(&jb->jitter, 0, sizeof(switch_jb_jitter_t));
+		if (jb->channel) {
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_max_ms", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_size_ms", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_acceleration_ms", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_expand_ms", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_jitter_max_ms", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_jitter_ms", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_count", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_too_big", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_missing_frames", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_ts_jump", "%u", 0);
+			switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_error", "%u", 0);
+		}
+
+		jb->jitter.estimate = jitter;
+		jb->jitter.samples_per_frame = samples_per_frame;
+		jb->jitter.samples_per_second = samples_per_second;
+		jb->jitter.drop_gap = 5;
+	}
+}
+
 SWITCH_DECLARE(void) switch_jb_set_session(switch_jb_t *jb, switch_core_session_t *session)
 {
 	const char *var;
 
 	if (session) {
+		jb->codec = switch_core_session_get_read_codec(session);
 		jb->session = session;
 		jb->channel = switch_core_session_get_channel(session);
-		if (jb->type == SJB_VIDEO && !switch_test_flag(jb, SJB_QUEUE_ONLY) && 
+		if (jb->type == SJB_AUDIO) {
+			if (!strcmp(jb->codec->implementation->iananame, "opus")) {
+				if (switch_channel_var_true(jb->channel, "rtp_jitter_buffer_accelerate")) {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "audio codec is %s, accelerate on\n", jb->codec->implementation->iananame);
+					jb->elastic = SWITCH_TRUE;
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "audio codec is %s, accelerate off\n", jb->codec->implementation->iananame);
+					jb->elastic = SWITCH_FALSE;
+				}
+			} else {
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG1, "audio codec is not Opus: %s\n", jb->codec->implementation->iananame);
+				jb->elastic = SWITCH_FALSE;
+			}
+		}
+
+		if (jb->type == SJB_VIDEO && !switch_test_flag(jb, SJB_QUEUE_ONLY) &&
 			(var = switch_channel_get_variable_dup(jb->channel, "jb_video_low_bitrate", SWITCH_FALSE, -1))) {
 			int tmp = atoi(var);
+
 			if (tmp >= 128 && tmp <= 10240) {
 				jb->video_low_bitrate = (uint32_t)tmp;
 			}
@@ -932,6 +1173,14 @@ SWITCH_DECLARE(void) switch_jb_debug_level(switch_jb_t *jb, uint8_t level)
 
 SWITCH_DECLARE(void) switch_jb_reset(switch_jb_t *jb)
 {
+	jb->jitter.stats.reset++;
+	if (jb->channel) {
+		switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_count", "%u", jb->jitter.stats.reset);
+		switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_too_big", "%u", jb->jitter.stats.reset_too_big);
+		switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_missing_frames", "%u", jb->jitter.stats.reset_missing_frames);
+		switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_ts_jump", "%u", jb->jitter.stats.reset_ts_jump);
+		switch_channel_set_variable_printf(jb->channel, "rtp_jb_reset_error", "%u", jb->jitter.stats.reset_error);
+	}
 
 	if (jb->type == SJB_VIDEO) {
 		switch_mutex_lock(jb->mutex);
@@ -943,13 +1192,13 @@ SWITCH_DECLARE(void) switch_jb_reset(switch_jb_t *jb)
 			switch_core_session_request_video_refresh(jb->session);
 		}
 	}
-	
+
 	jb_debug(jb, 2, "%s", "RESET BUFFER\n");
 
 	switch_mutex_lock(jb->mutex);
 	hide_nodes(jb);
 	switch_mutex_unlock(jb->mutex);
-	
+
 	jb->drop_flag = 0;
 	jb->last_target_seq = 0;
 	jb->target_seq = 0;
@@ -1257,9 +1506,9 @@ SWITCH_DECLARE(switch_status_t) switch_jb_put_packet(switch_jb_t *jb, switch_rtp
 		if (got > want) {
 			if (got - want > jb->max_frame_len && got - want > 17) {
 				jb_debug(jb, 2, "Missing %u frames, Resetting\n", got - want);
+				jb->jitter.stats.reset_missing_frames++;
 				switch_jb_reset(jb);
 			} else {
-
 				if (jb->type != SJB_VIDEO && jb->frame_len < got - want) {
 					jb_frame_inc(jb, 1);
 				}
@@ -1434,6 +1683,7 @@ SWITCH_DECLARE(switch_status_t) switch_jb_get_packet(switch_jb_t *jb, switch_rtp
 			switch(status) {
 			case SWITCH_STATUS_RESTART:
 				jb_debug(jb, 2, "%s", "Error encountered\n");
+				jb->jitter.stats.reset_error++;
 				switch_jb_reset(jb);
 				switch_goto_status(SWITCH_STATUS_RESTART, end);
 			case SWITCH_STATUS_NOTFOUND:
@@ -1444,7 +1694,24 @@ SWITCH_DECLARE(switch_status_t) switch_jb_get_packet(switch_jb_t *jb, switch_rtp
 					jb_debug(jb, 2, "%s", "Too many frames not found, RESIZE\n");
 					switch_goto_status(SWITCH_STATUS_RESTART, end);
 				} else {
-					jb_debug(jb, 2, "%s", "Frame not found suggest PLC\n");
+					if (jb->elastic) {
+						int visible_not_old = check_jb_size(jb);
+
+						jb->jitter.stats.estimate_ms = (int)((*jb->jitter.estimate) / ((jb->jitter.samples_per_second)) * 1000);
+						jb->jitter.stats.buffer_size_ms = (int)((visible_not_old * jb->jitter.samples_per_frame) / (jb->jitter.samples_per_second / 1000));
+						/* When playing PLC, we take the oportunity to expand the buffer if the jitter buffer is smaller than the 3x the estimated jitter. */
+						if (jb->jitter.stats.buffer_size_ms < (3 * jb->jitter.stats.estimate_ms)) {
+							jb_debug(jb, SWITCH_LOG_INFO, "JITTER estimation %dms buffersize %d/%d %dms EXPAND [plc]\n",
+									 jb->jitter.stats.estimate_ms, jb->complete_frames, jb->frame_len, jb->jitter.stats.buffer_size_ms);
+							jb->jitter.stats.expand++;
+							decrement_seq(jb);
+						} else {
+							jb_debug(jb, 2, "%s", "Frame not found suggest PLC\n");
+						}
+					} else {
+						jb_debug(jb, 2, "%s", "Frame not found suggest PLC\n");
+					}
+
 					plc = 1;
 					switch_goto_status(SWITCH_STATUS_NOTFOUND, end);
 				}
@@ -1452,20 +1719,13 @@ SWITCH_DECLARE(switch_status_t) switch_jb_get_packet(switch_jb_t *jb, switch_rtp
 		}
 	}
 
-	if (node) {
-		status = SWITCH_STATUS_SUCCESS;
+	*packet = node->packet;
+	*len = node->len;
+	jb->last_len = *len;
+	packet->header.version = 2;
+	hide_node(node, SWITCH_TRUE);
 
-		*packet = node->packet;
-		*len = node->len;
-		jb->last_len = *len;
-		packet->header.version = 2;
-		hide_node(node, SWITCH_TRUE);
-
-		jb_debug(jb, 2, "GET packet ts:%u seq:%u %s\n", ntohl(packet->header.ts), ntohs(packet->header.seq), packet->header.m ? " <MARK>" : "");
-
-	} else {
-		status = SWITCH_STATUS_MORE_DATA;
-	}
+	jb_debug(jb, 2, "GET packet ts:%u seq:%u %s\n", ntohl(packet->header.ts), ntohs(packet->header.seq), packet->header.m ? " <MARK>" : "");
 
  end:
 
diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index f782e89f6e..bacd2f012a 100644
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -115,12 +115,11 @@ static void *SWITCH_THREAD_FUNC switch_loadable_module_exec(switch_thread_t *thr
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	switch_core_thread_session_t *ts = obj;
 	switch_loadable_module_t *module = ts->objs[0];
-	int restarts;
 
 	switch_assert(thread != NULL);
 	switch_assert(module != NULL);
 
-	for (restarts = 0; status != SWITCH_STATUS_TERM && !module->shutting_down; restarts++) {
+	while (status != SWITCH_STATUS_TERM && !module->shutting_down) {
 		status = module->switch_module_runtime();
 	}
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Thread ended for %s\n", module->module_interface->module_name);
diff --git a/src/switch_log.c b/src/switch_log.c
index 74a5713635..563a554510 100644
--- a/src/switch_log.c
+++ b/src/switch_log.c
@@ -246,7 +246,7 @@ SWITCH_DECLARE(cJSON *) switch_log_node_to_json(const switch_log_node_t *node, i
 	return json;
 }
 
-static switch_log_node_t *switch_log_node_alloc()
+static switch_log_node_t *switch_log_node_alloc(void)
 {
 	switch_log_node_t *node = NULL;
 #ifdef SWITCH_LOG_RECYCLE
diff --git a/src/switch_msrp.c b/src/switch_msrp.c
index 1f5db7ac20..9fd84d846b 100644
--- a/src/switch_msrp.c
+++ b/src/switch_msrp.c
@@ -99,7 +99,7 @@ static switch_bool_t msrp_check_success_report(switch_msrp_msg_t *msrp_msg)
 	return (msrp_h_success_report && !strcmp(msrp_h_success_report, "yes"));
 }
 
-static void msrp_deinit_ssl()
+static void msrp_deinit_ssl(void)
 {
 	globals.ssl_ready = 0;
 	if (globals.ssl_ctx) {
@@ -112,7 +112,7 @@ static void msrp_deinit_ssl()
 	}
 }
 
-static void msrp_init_ssl()
+static void msrp_init_ssl(void)
 {
 	const char *err = "";
 
@@ -187,7 +187,7 @@ static void msrp_init_ssl()
 
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ip, globals.ip);
 
-static switch_status_t load_config()
+static switch_status_t load_config(void)
 {
 	char *cf = "msrp.conf";
 	switch_xml_t cfg, xml = NULL, settings, param;
@@ -286,12 +286,12 @@ sock_fail:
 	return rv;
 }
 
-SWITCH_DECLARE(const char *) switch_msrp_listen_ip()
+SWITCH_DECLARE(const char *) switch_msrp_listen_ip(void)
 {
 	return globals.ip;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_msrp_init()
+SWITCH_DECLARE(switch_status_t) switch_msrp_init(void)
 {
 	switch_memory_pool_t *pool;
 	switch_thread_t *thread;
@@ -346,7 +346,7 @@ SWITCH_DECLARE(switch_status_t) switch_msrp_init()
 	return SWITCH_STATUS_SUCCESS;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_msrp_destroy()
+SWITCH_DECLARE(switch_status_t) switch_msrp_destroy(void)
 {
 	switch_status_t st = SWITCH_STATUS_SUCCESS;
 	switch_socket_t *sock;
@@ -1622,7 +1622,7 @@ SWITCH_DECLARE (switch_status_t) switch_msrp_perform_send(switch_msrp_session_t
 	return status;
 }
 
-SWITCH_DECLARE(switch_msrp_msg_t *) switch_msrp_msg_create()
+SWITCH_DECLARE(switch_msrp_msg_t *) switch_msrp_msg_create(void)
 {
 	switch_msrp_msg_t *msg = malloc(sizeof(switch_msrp_msg_t));
 	switch_assert(msg);
diff --git a/src/switch_packetizer.c b/src/switch_packetizer.c
index 05688f8a86..c9cdcbf3e7 100644
--- a/src/switch_packetizer.c
+++ b/src/switch_packetizer.c
@@ -160,8 +160,6 @@ SWITCH_DECLARE(switch_status_t) switch_packetizer_feed_extradata(switch_packetiz
 	p += 5;
 	left -= 5;
 
-	if (left < 0) return SWITCH_STATUS_FALSE;
-
 	//sps
 	n_sps = *p & 0x1f;
 	p += 1;
@@ -267,7 +265,7 @@ SWITCH_DECLARE(switch_status_t) switch_packetizer_feed(switch_packetizer_t *pack
 			context->nalus[i].eat = p;
 		} else {
 			context->nalus[i].len = p - context->nalus[i].start;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "#%d %x len=%u\n", i, *context->nalus[i].start, context->nalus[i].len);
+			//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "#%d %x len=%u\n", i, *context->nalus[i].start, context->nalus[i].len);
 			while (!(*p++)) ; /* eat the sync bytes, what ever 0 0 1 or 0 0 0 1 */
 			i++;
 			context->nalus[i].start = p;
@@ -309,8 +307,8 @@ SWITCH_DECLARE(switch_status_t) switch_packetizer_read(switch_packetizer_t *pack
 	nri = nalu_hdr & 0x60;
 
 	if (real_slice_size > slice_size) real_slice_size = slice_size;
-	if (frame->buflen < slice_size) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "frame buffer too small %u < %u\n", frame->buflen, slice_size);
+	if (frame->datalen < slice_size) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "frame buffer too small %u < %u\n", frame->datalen, slice_size);
 		return SWITCH_STATUS_FALSE;
 	}
 
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index ad9f8eef1c..46e13253b7 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -185,6 +185,10 @@ typedef struct {
 	char body[SWITCH_RTCP_MAX_BUF_LEN];
 } rtcp_msg_t;
 
+typedef struct {
+	switch_rtcp_hdr_t header;
+	uint32_t ssrc;
+} sdes_ssrc_t;
 
 typedef enum {
 	VAD_FIRE_TALK = (1 << 0),
@@ -254,16 +258,17 @@ typedef struct {
 	uint8_t sending;
 	uint8_t ready;
 	uint8_t rready;
-	uint8_t init;
+	uint8_t initializing;
 	int missed_count;
 	char last_sent_id[13];
 	switch_time_t last_ok;
+	uint8_t cand_responsive;
 } switch_rtp_ice_t;
 
 struct switch_rtp;
 
-static void switch_rtp_dtls_init();
-static void switch_rtp_dtls_destroy();
+static void switch_rtp_dtls_init(void);
+static void switch_rtp_dtls_destroy(void);
 
 #define MAX_DTLS_MTU 4096
 
@@ -401,7 +406,6 @@ struct switch_rtp {
 	char *eff_remote_host_str;
 	switch_time_t first_stun;
 	switch_time_t last_stun;
-	uint32_t wrong_addrs;
 	uint32_t samples_per_interval;
 	uint32_t samples_per_second;
 	uint32_t conf_samples_per_interval;
@@ -474,7 +478,11 @@ struct switch_rtp {
 	payload_map_t *pmap_tail;
 	kalman_estimator_t *estimators[KALMAN_SYSTEM_MODELS];
 	cusum_kalman_detector_t *detectors[KALMAN_SYSTEM_MODELS];
-	int ice_adj;
+	switch_time_t last_adj;
+	switch_time_t adj_window;
+	uint32_t elapsed_stun;
+	uint32_t elapsed_media;
+	uint32_t elapsed_adj;
 	uint8_t has_rtp;
 	uint8_t has_rtcp;
 	uint8_t has_ice;
@@ -540,9 +548,25 @@ static void switch_rtp_change_ice_dest(switch_rtp_t *rtp_session, switch_rtp_ice
 {
 	int is_rtcp = ice == &rtp_session->rtcp_ice;
 	const char *err = "";
+	int i;
+	uint8_t ice_cand_found_idx = 0;
+
+	for (i = 0; i < ice->ice_params->cand_idx[ice->proto]; i++) {
+		if (!strcmp(host, ice->ice_params->cands[i][ice->proto].con_addr) && port == ice->ice_params->cands[i][ice->proto].con_port) {
+			ice_cand_found_idx = i;
+		}
+	}
+
+	if (!ice_cand_found_idx) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "ICE candidate [%s:%d] replaced with [%s:%d]\n",
+			ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, host, port);
+		ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr = switch_core_strdup(rtp_session->pool, host);
+		ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port = port;
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "ICE chosen candidate [%s:%d] set to idx [%d]\n", host, port, ice_cand_found_idx);
+		ice->ice_params->chosen[ice->proto] = ice_cand_found_idx;
+	}
 
-	ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr = switch_core_strdup(rtp_session->pool, host);
-	ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port = port;
 	ice->missed_count = 0;
 
 	if (is_rtcp) {
@@ -796,7 +820,41 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
 							rtp_msg_t *send_msg, void *data, uint32_t datalen, switch_payload_t payload, uint32_t timestamp, switch_frame_flag_t *flags);
 
 
-static switch_status_t ice_out(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice)
+#define MEDIA_TOO_LONG 2000
+#define STUN_TOO_LONG 20000
+#define ADJ_TOO_LONG 1000
+
+static void calc_elapsed(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice)
+{
+	switch_time_t ref_point;
+	switch_time_t now;
+
+	now = switch_micro_time_now();
+
+	if (ice->last_ok && (!rtp_session->dtls || rtp_session->dtls->state == DS_READY)) {
+		ref_point = ice->last_ok;
+	} else {
+		ref_point = rtp_session->first_stun;
+	}
+
+	if (!ref_point) ref_point = now;
+
+	rtp_session->elapsed_stun = (unsigned int) ((now - ref_point) / 1000);
+
+	if (rtp_session->last_media) {
+		rtp_session->elapsed_media = (unsigned int) ((now - rtp_session->last_media) / 1000);
+	} else {
+		rtp_session->elapsed_media = MEDIA_TOO_LONG + 1;
+	}
+
+	if (rtp_session->last_adj) {
+		rtp_session->elapsed_adj = (unsigned int) ((now - rtp_session->last_adj) / 1000);
+	} else {
+		rtp_session->elapsed_adj = ADJ_TOO_LONG + 1;
+	}
+}
+
+static switch_status_t ice_out(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, switch_bool_t force)
 {
 	uint8_t buf[256] = { 0 };
 	switch_stun_packet_t *packet;
@@ -812,7 +870,7 @@ static switch_status_t ice_out(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice)
 		return SWITCH_STATUS_BREAK;
 	}
 
-	if (ice->next_run && ice->next_run > now) {
+	if (!force && ice->next_run && ice->next_run >= now) {
 		return SWITCH_STATUS_BREAK;
 	}
 
@@ -907,8 +965,19 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 	int ok = 1;
 	uint32_t *pri = NULL;
 	int is_rtcp = ice == &rtp_session->rtcp_ice;
-	uint32_t elapsed;
-	switch_time_t ref_point;
+	switch_channel_t *channel;
+	int i;
+	switch_sockaddr_t *from_addr = rtp_session->from_addr;
+	const char *from_host = NULL;
+	switch_port_t from_port = 0;
+	char faddr_buf[80] = "";
+
+	if (is_rtcp) {
+		from_addr = rtp_session->rtcp_from_addr;
+	}
+
+	from_host = switch_get_addr(faddr_buf, sizeof(faddr_buf), from_addr);
+	from_port = switch_sockaddr_get_port(from_addr);
 
 	//if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {
 	//	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_WARNING, "WTF OK %s CALL\n", rtp_type(rtp_session));
@@ -931,6 +1000,7 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 		cpylen = sizeof(buf);
 	}
 
+	channel = switch_core_session_get_channel(rtp_session->session);
 
 	memcpy(buf, data, cpylen);
 	packet = switch_stun_packet_parse(buf, (uint32_t)cpylen);
@@ -946,14 +1016,7 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 		rtp_session->first_stun = rtp_session->last_stun;
 	}
 
-	if (ice->last_ok && (!rtp_session->dtls || rtp_session->dtls->state == DS_READY)) {
-		ref_point = ice->last_ok;
-	} else {
-		ref_point = rtp_session->first_stun;
-	}
-
-	elapsed = (unsigned int) ((switch_micro_time_now() - ref_point) / 1000);
-
+	calc_elapsed(rtp_session, ice);
 
 	end_buf = buf + ((sizeof(buf) > packet->header.length) ? packet->header.length : sizeof(buf));
 
@@ -968,6 +1031,12 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 		case SWITCH_STUN_ATTR_USE_CAND:
 			{
 				ice->rready = 1;
+				for (i = 0; i < ice->ice_params->cand_idx[ice->proto]; i++) {
+					if (!strcmp(ice->ice_params->cands[i][ice->proto].con_addr, from_host) && ice->ice_params->cands[i][ice->proto].con_port == from_port) {
+						ice->ice_params->cands[i][ice->proto].use_candidate = 1;
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG6, "Got USE-CANDIDATE on %s:%d\n", ice->ice_params->cands[i][ice->proto].con_addr, ice->ice_params->cands[i][ice->proto].con_port);
+					}
+				}
 			}
 			break;
 		case SWITCH_STUN_ATTR_ERROR_CODE:
@@ -1048,18 +1117,33 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 
 		if (packet->header.type == SWITCH_STUN_BINDING_RESPONSE) {
 			ok = 1;
-			if (!ice->rready) {
-				if (rtp_session->flags[SWITCH_RTP_FLAG_RTCP_MUX]) {
-					rtp_session->ice.rready = 1;
-					rtp_session->rtcp_ice.rready = 1;
-				} else {
-					ice->rready = 1;
-				}
 
-				if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {
-					switch_core_session_video_reinit(rtp_session->session);
+			if (rtp_session->flags[SWITCH_RTP_FLAG_RTCP_MUX]) {
+				rtp_session->ice.rready = 1;
+				rtp_session->rtcp_ice.rready = 1;
+			} else {
+				ice->rready = 1;
+			}
+
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG6, "Received STUN Binding Response from %s\n", from_host);
+
+			if (ice->ice_params) {
+				for (i = 0; i < ice->ice_params->cand_idx[ice->proto]; i++) {
+					if (!strcmp(ice->ice_params->cands[i][ice->proto].con_addr, from_host) && ice->ice_params->cands[i][ice->proto].con_port == from_port) {
+						ice->ice_params->cands[i][ice->proto].responsive = 1;
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "Marked ICE candidate %s:%d as responsive\n", ice->ice_params->cands[i][ice->proto].con_addr, ice->ice_params->cands[i][ice->proto].con_port);
+						if (!strcmp(ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, from_host) && ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port == from_port) {
+							ice->cand_responsive = 1;
+							ice->initializing = 0;
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "Chosen ICE candidate %s:%d is responsive\n", ice->ice_params->cands[i][ice->proto].con_addr, ice->ice_params->cands[i][ice->proto].con_port);
+						}
+					}
 				}
 			}
+
+			if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {
+				switch_core_session_video_reinit(rtp_session->session);
+			}
 		}
 
 		if (!ok && ice == &rtp_session->ice && rtp_session->rtcp_ice.ice_params && pri &&
@@ -1084,7 +1168,7 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 			switch_port_t port = 0;
 			char *host = NULL;
 
-			if (elapsed > 20000 && pri) {
+			if (rtp_session->elapsed_stun > STUN_TOO_LONG && pri) {
 				int i, j;
 				uint32_t old;
 				//const char *tx_host;
@@ -1176,6 +1260,7 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_WARNING, "missed too many: %d, looking for new ICE dest.\n",
 						  ice->missed_count);
 		ice->rready = 0;
+		ice->cand_responsive = 0;
 		ok = 1;
 	}
 
@@ -1185,9 +1270,8 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 	//}
 
 	if (ok) {
-		const char *host = NULL, *host2 = NULL;
-		switch_port_t port = 0, port2 = 0;
-		char buf[80] = "";
+		const char *host2 = NULL;
+		switch_port_t port2 = 0;
 		char buf2[80] = "";
 
 		if (packet->header.type == SWITCH_STUN_BINDING_REQUEST) {
@@ -1196,16 +1280,13 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 			const char *remote_ip;
 			switch_size_t bytes;
 			char ipbuf[50];
-			switch_sockaddr_t *from_addr = rtp_session->from_addr;
 			switch_socket_t *sock_output = rtp_session->sock_output;
 			uint8_t do_adj = 0;
 			switch_time_t now = switch_micro_time_now();
 			int cmp = 0;
-			int cur_idx = -1;//, is_relay = 0;
-			int i;
-			
+			int cur_idx = -1, is_relay = 0, is_responsive = 0, use_candidate = 0;
+
 			if (is_rtcp) {
-				from_addr = rtp_session->rtcp_from_addr;
 				sock_output = rtp_session->rtcp_sock_output;
 			}
 
@@ -1231,58 +1312,123 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 
 			bytes = switch_stun_packet_length(rpacket);
 
-			host = switch_get_addr(buf, sizeof(buf), from_addr);
-			port = switch_sockaddr_get_port(from_addr);
 			host2 = switch_get_addr(buf2, sizeof(buf2), ice->addr);
 			port2 = switch_sockaddr_get_port(ice->addr);
 			cmp = switch_cmp_addr(from_addr, ice->addr, SWITCH_FALSE);
 
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG2,
-							  "STUN from %s:%d %s\n", host, port, cmp ? "EXPECTED" : "IGNORED");
+			for (i = 0; i < ice->ice_params->cand_idx[ice->proto]; i++) {
+				if (!strcmp(ice->ice_params->cands[i][ice->proto].con_addr, from_host) && ice->ice_params->cands[i][ice->proto].con_port == from_port) {
+					if (!strcasecmp(ice->ice_params->cands[i][ice->proto].cand_type, "relay")) {
+						is_relay = 1;
+					}
 
-			if (ice->init && !cmp && switch_cmp_addr(from_addr, ice->addr, SWITCH_TRUE)) {
-				do_adj++;
-				rtp_session->ice_adj++;
-				rtp_session->wrong_addrs = 0;
-				ice->init = 0;
-			}
-			
-			if (cmp) {
-				ice->last_ok = now;
-				rtp_session->wrong_addrs = 0;
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG10, "ICE %d dt:%d i:%d i2:%d w:%d cmp:%d adj:%d\n", elapsed, (rtp_session->dtls && rtp_session->dtls->state != DS_READY), !ice->ready, !ice->rready, rtp_session->wrong_addrs, switch_cmp_addr(from_addr, ice->addr, SWITCH_TRUE), rtp_session->ice_adj);
+					if (ice->ice_params->cands[i][ice->proto].responsive) {
+						is_responsive = 1;
+					}
 
-				if ((rtp_session->dtls && rtp_session->dtls->state != DS_READY) ||
-					((!ice->ready || !ice->rready) && (rtp_session->wrong_addrs > 2 || switch_cmp_addr(from_addr, ice->addr, SWITCH_TRUE)) &&
-					 rtp_session->ice_adj < 10)) {
-					do_adj++;
-					rtp_session->ice_adj++;
-					rtp_session->wrong_addrs = 0;
-				} else if (rtp_session->wrong_addrs > 10 || elapsed >= 5000) {
-					do_adj++;
-				}
-
-				if (!do_adj) {
-					rtp_session->wrong_addrs++;
-				}
-
-				for (i = 0; i < ice->ice_params->cand_idx[ice->proto]; i++) {
-					if (!strcmp(ice->ice_params->cands[i][ice->proto].con_addr, host)) {
-						cur_idx = i;
-						//if (!strcasecmp(ice->ice_params->cands[i][ice->proto].cand_type, "relay")) {
-						//	is_relay = 1;
-						//}
+					if (ice->ice_params->cands[i][ice->proto].use_candidate) {
+						use_candidate = 1;
 					}
 				}
-				
-				
-				if (ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type &&
-					!strcasecmp(ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type, "relay")) {
+			}
+
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5,
+				"%s %s STUN from %s:%d %s is_relay: %d is_responsive: %d use_candidate: %d ready: %d, rready: %d\n", switch_channel_get_name(channel), rtp_type(rtp_session), from_host, from_port, cmp ? "EXPECTED" : "IGNORED",
+				is_relay, is_responsive, use_candidate, ice->ready, ice->rready);
+
+			if (ice->initializing && !cmp) {
+				if (!rtp_session->adj_window && (!ice->ready || !ice->rready || (!rtp_session->dtls || rtp_session->dtls->state != DS_READY))) {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE set ADJUST window to 10 seconds on binding request from %s:%d (is_relay: %d, is_responsivie: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+						switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp", from_host, from_port, is_relay, is_responsive, use_candidate,
+						ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
+
+					rtp_session->adj_window = now + 10000000;
+				}
+
+				if (rtp_session->adj_window) {
+					if (rtp_session->adj_window > now) {
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE check: %d >= 3000 or window closed and not from relay on binding request from %s:%d (is_relay: %d, is_responsive: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+							switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp", rtp_session->elapsed_stun, from_host, from_port, is_relay, is_responsive, use_candidate,
+							ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
+
+						if (!is_relay && (rtp_session->elapsed_stun >= 3000 || rtp_session->adj_window == (now + 10000000))) {
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE ADJUST HIT 1 on binding request from %s:%d (is_relay: %d, is_responsive: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+								switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp", from_host, from_port, is_relay, is_responsive, use_candidate,
+								ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
+
+							do_adj++;
+							rtp_session->last_adj = now;
+						}
+					} else {
+						rtp_session->adj_window = 0;
+					}
+				}
+
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE CHECK SAME IP DIFFT PORT %d %d on binding request from %s:%d (is_relay: %d, is_responsive: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+					switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp",ice->initializing, switch_cmp_addr(from_addr, ice->addr, SWITCH_TRUE), from_host, from_port, is_relay, is_responsive, use_candidate,
+					ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
+
+				if (!do_adj && (switch_cmp_addr(from_addr, ice->addr, SWITCH_TRUE) || use_candidate)) {
 					do_adj++;
+					rtp_session->last_adj = now;
+
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE ADJUST HIT 2 on binding request from %s:%d (is_relay: %d, is_responsive: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+						switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp", from_host, from_port, is_relay, is_responsive, use_candidate,
+						ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
 				}
 			}
-			
+
+			if (cmp) {
+				ice->last_ok = now;
+			} else if (!do_adj) {
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "ICE %d/%d dt:%d i:%d i2:%d cmp:%d\n", rtp_session->elapsed_stun, rtp_session->elapsed_media, (rtp_session->dtls && rtp_session->dtls->state != DS_READY), !ice->ready, !ice->rready, switch_cmp_addr(from_addr, ice->addr, SWITCH_TRUE));
+
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE ADJUST ELAPSED vs 1000 %d on binding request from %s:%d (is_relay: %d, is_responsive: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+					switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp" ,rtp_session->elapsed_adj, from_host, from_port, is_relay, is_responsive, use_candidate,
+					ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
+
+				if (rtp_session->elapsed_adj > 1000) {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE IF DTLS NOT READY or %d >= 3000 or media too long %d or stun too long %d on binding request from %s:%d (is_relay: %d, is_responsive: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+						switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp", rtp_session->elapsed_stun, rtp_session->elapsed_media >= MEDIA_TOO_LONG,
+						rtp_session->elapsed_stun >= STUN_TOO_LONG, from_host, from_port, is_relay, is_responsive, use_candidate,
+						ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
+
+					if (!is_relay && ((rtp_session->dtls && rtp_session->dtls->state != DS_READY) ||
+						((!ice->ready || !ice->rready) && (rtp_session->elapsed_stun >= 3000 || switch_cmp_addr(from_addr, ice->addr, SWITCH_TRUE))))) {
+
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE ADJUST HIT 3 on binding request from %s:%d (is_relay: %d, is_responsive: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+							switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp", from_host, from_port, is_relay, is_responsive, use_candidate,
+							ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
+
+						do_adj++;
+						rtp_session->last_adj = now;
+					} else if (is_relay && ice->initializing && rtp_session->elapsed_stun >= 1000) {
+
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE ADJUST HIT 4 (FLIP TO TURN) on binding request from %s:%d (is_relay: %d, is_responsive: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+							switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp", from_host, from_port, is_relay, is_responsive, use_candidate,
+							ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
+
+						do_adj++;
+						rtp_session->last_adj = now;
+					} else if ((ice->initializing && rtp_session->elapsed_stun >= 3000) ||
+						(rtp_session->elapsed_media >= MEDIA_TOO_LONG || rtp_session->elapsed_stun >= STUN_TOO_LONG)) {
+
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "%s %s %s ICE ADJUST HIT 5 on binding request from %s:%d (is_relay: %d, is_responsive: %d, use_candidate: %d) Current cand: %s:%d typ: %s\n",
+							switch_channel_get_name(channel), rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp", from_host, from_port, is_relay, is_responsive, use_candidate,
+							ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_addr, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].con_port, ice->ice_params->cands[ice->ice_params->chosen[ice->proto]][ice->proto].cand_type);
+
+						do_adj++;
+						rtp_session->last_adj = now;
+					}
+
+					for (i = 0; i < ice->ice_params->cand_idx[ice->proto]; i++) {
+						if (!strcmp(ice->ice_params->cands[i][ice->proto].con_addr, from_host)) {
+							cur_idx = i;
+						}
+					}
+				}
+			}
+
 			if ((ice->type & ICE_VANILLA) && ice->ice_params && do_adj) {
 				ice->missed_count = 0;
 				ice->rready = 1;
@@ -1294,15 +1440,29 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_NOTICE,
 								  "Auto Changing %s stun/%s/dtls port from %s:%u to %s:%u idx:%d\n", rtp_type(rtp_session), is_rtcp ? "rtcp" : "rtp",
 								  host2, port2,
-								  host, port, cur_idx);
+								  from_host, from_port, cur_idx);
+
+				switch_rtp_change_ice_dest(rtp_session, ice, from_host, from_port);
+
+				ice->cand_responsive = is_responsive;
+				if (ice->cand_responsive) {
+					ice->initializing = 0;
+				}
 
-				switch_rtp_change_ice_dest(rtp_session, ice, host, port);
 				ice->last_ok = now;
-				rtp_session->wrong_addrs = 0;
 			}
 			//if (cmp) {
 			switch_socket_sendto(sock_output, from_addr, 0, (void *) rpacket, &bytes);
 			//}
+
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG6, "Send STUN Binding Response to %s:%u\n", from_host, from_port);
+
+			if (ice->initializing && !is_responsive) {
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "Send STUN Binding Request on ICE candidate still unresponsive to %s:%u\n", from_host, from_port);
+				if (ice_out(rtp_session, ice, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) {
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_WARNING, "Error sending STUN Binding Request on ICE candidate still unresponsive to %s:%u\n", from_host, from_port);
+				}
+			}
 		}
 	} else if (packet->header.type == SWITCH_STUN_BINDING_ERROR_RESPONSE) {
 
@@ -1353,7 +1513,6 @@ SWITCH_DECLARE(void) switch_srtp_err_to_txt(srtp_err_status_t stat, char **msg)
 	else if (stat == srtp_err_status_read_fail) *msg="couldn't read data";
 	else if (stat == srtp_err_status_write_fail) *msg="couldn't write data";
 	else if (stat == srtp_err_status_parse_err) *msg="error parsing data";
-	else if (stat == srtp_err_status_write_fail) *msg="couldn't read data";
 	else if (stat == srtp_err_status_encode_err) *msg="error encoding data";
 	else if (stat == srtp_err_status_semaphore_err) *msg="error while using semaphores";
 	else if (stat == srtp_err_status_pfkey_err) *msg="error while using pfkey ";
@@ -1661,7 +1820,7 @@ static void rtcp_generate_sender_info(switch_rtp_t *rtp_session, struct switch_r
 			);
 }
 
-static inline uint32_t calc_local_lsr_now() 
+static inline uint32_t calc_local_lsr_now(void)
 {
 	switch_time_t now;
 	uint32_t ntp_sec, ntp_usec, lsr_now, sec;
@@ -2073,9 +2232,9 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
 		struct switch_rtcp_report_block *rtcp_report_block = NULL;
 		switch_size_t rtcp_bytes = sizeof(struct switch_rtcp_hdr_s)+sizeof(uint32_t); /* add size of the packet header and the ssrc */
 		switch_rtcp_hdr_t *sdes;
+		sdes_ssrc_t *sdes_ssrc;
 		uint8_t *p;
 		switch_size_t sdes_bytes = sizeof(struct switch_rtcp_hdr_s);
-		uint32_t *ssrc;
 		switch_rtcp_sdes_unit_t *unit;
 		switch_bool_t is_only_receiver = FALSE;
 
@@ -2271,14 +2430,13 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
 
 		//SDES + CNAME
 		p = (uint8_t *) (&rtp_session->rtcp_send_msg) + rtcp_bytes;
-		sdes = (switch_rtcp_hdr_t *) p;
+		sdes_ssrc = (sdes_ssrc_t *) p;
+		sdes = &sdes_ssrc->header;
 		sdes->version = 2;
 		sdes->type = _RTCP_PT_SDES;
 		sdes->count = 1;
 		sdes->p = 0;
-		p = (uint8_t *) (sdes) + sdes_bytes;
-		ssrc = (uint32_t *) p;
-		*ssrc = htonl(rtp_session->ssrc);
+		sdes_ssrc->ssrc = htonl(rtp_session->ssrc);
 		sdes_bytes += sizeof(uint32_t);
 
 
@@ -2359,7 +2517,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
 	}
 
 	if (rtp_session->ice.ice_user) {
-		if (ice_out(rtp_session, &rtp_session->ice) == SWITCH_STATUS_GENERR) {
+		if (ice_out(rtp_session, &rtp_session->ice, SWITCH_FALSE) == SWITCH_STATUS_GENERR) {
 			ret = -1;
 			goto end;
 		}
@@ -2367,7 +2525,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
 
 	if (!rtp_session->flags[SWITCH_RTP_FLAG_RTCP_MUX]) {
 		if (rtp_session->rtcp_ice.ice_user) {
-			if (ice_out(rtp_session, &rtp_session->rtcp_ice) == SWITCH_STATUS_GENERR) {
+			if (ice_out(rtp_session, &rtp_session->rtcp_ice, SWITCH_FALSE) == SWITCH_STATUS_GENERR) {
 				ret = -1;
 				goto end;
 			}
@@ -2853,10 +3011,9 @@ SWITCH_DECLARE(void) switch_rtp_reset(switch_rtp_t *rtp_session)
 	memset(&rtp_session->ts_norm, 0, sizeof(rtp_session->ts_norm));
 
 	rtp_session->last_stun = rtp_session->first_stun = 0;
-	rtp_session->wrong_addrs = 0;
 	rtp_session->rtcp_sent_packets = 0;
 	rtp_session->rtcp_last_sent = 0;
-	rtp_session->ice_adj = 0;
+	rtp_session->last_adj = 0;
 
 	//switch_rtp_del_dtls(rtp_session, DTLS_TYPE_RTP|DTLS_TYPE_RTCP);
 	switch_rtp_set_flag(rtp_session, SWITCH_RTP_FLAG_PAUSE);
@@ -2866,6 +3023,7 @@ SWITCH_DECLARE(void) switch_rtp_reset(switch_rtp_t *rtp_session)
 	if (rtp_session->ice.ready) {
 		switch_rtp_reset_vb(rtp_session);
 		rtp_session->ice.ready = rtp_session->ice.rready = 0;
+		rtp_session->ice.cand_responsive = 0;
 	}
 
 }
@@ -3211,13 +3369,31 @@ static int do_dtls(switch_rtp_t *rtp_session, switch_dtls_t *dtls)
 	int r = 0, ret = 0, len;
 	switch_size_t bytes;
 	unsigned char buf[MAX_DTLS_MTU] = "";
-	int ready = rtp_session->ice.ice_user ? (rtp_session->ice.rready && rtp_session->ice.ready) : 1;
+	uint8_t is_ice = rtp_session->ice.ice_user ? 1 : 0;
+	int ready = is_ice ? (rtp_session->ice.rready && rtp_session->ice.ready) : 1;
 	int pending;
 
 	if (!dtls->bytes && !ready) {
 		return 0;
 	}
 
+	if (is_ice && !(rtp_session->ice.type & ICE_LITE) && !rtp_session->ice.cand_responsive) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG6, "Got DTLS packet but candidate is not responsive\n");
+
+		return 0;
+	}
+
+	if (is_ice && !switch_cmp_addr(rtp_session->from_addr, rtp_session->ice.addr, SWITCH_TRUE)) {
+		char tmp_buf1[80] = "";
+		char tmp_buf2[80] = "";
+		const char *host_from = switch_get_addr(tmp_buf1, sizeof(tmp_buf1), rtp_session->from_addr);
+		const char *host_ice_cur_addr = switch_get_addr(tmp_buf2, sizeof(tmp_buf2), rtp_session->ice.addr);
+
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG5, "Got DTLS packet from [%s] whilst current ICE negotiated address is [%s]. Ignored.\n", host_from, host_ice_cur_addr);
+
+		return 0;
+	}
+
 	if (dtls->bytes > 0 && dtls->data) {
 		ret = BIO_write(dtls->read_bio, dtls->data, (int)dtls->bytes);
 		if (ret <= 0) {
@@ -3494,7 +3670,7 @@ static BIO_METHOD dtls_bio_filter_methods = {
 static BIO_METHOD *dtls_bio_filter_methods = NULL;
 #endif
 
-static void switch_rtp_dtls_init() {
+static void switch_rtp_dtls_init(void) {
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
 	dtls_bio_filter_methods = BIO_meth_new(BIO_TYPE_FILTER | BIO_get_new_index(), "DTLS filter");
 	BIO_meth_set_write(dtls_bio_filter_methods, dtls_bio_filter_write);
@@ -3504,7 +3680,7 @@ static void switch_rtp_dtls_init() {
 #endif
 }
 
-static void switch_rtp_dtls_destroy() {
+static void switch_rtp_dtls_destroy(void) {
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
 	if (dtls_bio_filter_methods) {
 		BIO_meth_free(dtls_bio_filter_methods);
@@ -3643,8 +3819,10 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_dtls(switch_rtp_t *rtp_session, d
 	unsigned long ssl_ctx_error = 0;
 	const SSL_METHOD *ssl_method;
 	SSL_CTX *ssl_ctx;
+#if OPENSSL_VERSION_NUMBER < 0x30000000
 	BIO *bio;
 	DH *dh;
+#endif
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 #ifndef OPENSSL_NO_EC
 #if OPENSSL_VERSION_NUMBER < 0x10002000L
@@ -3723,6 +3901,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_dtls(switch_rtp_t *rtp_session, d
 
 	switch_assert(dtls->ssl_ctx);
 
+#if OPENSSL_VERSION_NUMBER < 0x30000000
 	bio = BIO_new_file(dtls->pem, "r");
 	dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
 	BIO_free(bio);
@@ -3730,7 +3909,11 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_dtls(switch_rtp_t *rtp_session, d
 		SSL_CTX_set_tmp_dh(dtls->ssl_ctx, dh);
 		DH_free(dh);
 	}
-
+#else
+	if(!SSL_CTX_set_dh_auto(dtls->ssl_ctx, 1)) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_ERROR, "Failed enable auto DH!\n");
+	}
+#endif
 	SSL_CTX_set_mode(dtls->ssl_ctx, SSL_MODE_AUTO_RETRY);
 
 	//SSL_CTX_set_verify(dtls->ssl_ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
@@ -3935,12 +4118,6 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_crypto_key(switch_rtp_t *rtp_sess
 			case SWITCH_RTP_CRYPTO_RECV:
 				switch_channel_set_variable(channel, "srtp_remote_crypto_key", (const char *)b64_key);
 				break;
-			case SWITCH_RTP_CRYPTO_SEND_RTCP:
-				switch_channel_set_variable(channel, "srtcp_local_crypto_key", (const char *)b64_key);
-				break;
-			case SWITCH_RTP_CRYPTO_RECV_RTCP:
-				switch_channel_set_variable(channel, "srtcp_remote_crypto_key", (const char *)b64_key);
-				break;
 			default:
 				break;
 		}
@@ -3953,12 +4130,6 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_crypto_key(switch_rtp_t *rtp_sess
 			case SWITCH_RTP_CRYPTO_RECV:
 				switch_channel_set_variable(channel, "srtp_remote_video_crypto_key", (const char *)b64_key);
 				break;
-			case SWITCH_RTP_CRYPTO_SEND_RTCP:
-				switch_channel_set_variable(channel, "srtcp_local_video_crypto_key", (const char *)b64_key);
-				break;
-			case SWITCH_RTP_CRYPTO_RECV_RTCP:
-				switch_channel_set_variable(channel, "srtcp_remote_video_crypto_key", (const char *)b64_key);
-				break;
 			default:
 				break;
 			}
@@ -3971,12 +4142,6 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_crypto_key(switch_rtp_t *rtp_sess
 			case SWITCH_RTP_CRYPTO_RECV:
 				switch_channel_set_variable(channel, "srtp_remote_audio_crypto_key", (const char *)b64_key);
 				break;
-			case SWITCH_RTP_CRYPTO_SEND_RTCP:
-				switch_channel_set_variable(channel, "srtcp_local_audio_crypto_key", (const char *)b64_key);
-				break;
-			case SWITCH_RTP_CRYPTO_RECV_RTCP:
-				switch_channel_set_variable(channel, "srtcp_remote_audio_crypto_key", (const char *)b64_key);
-				break;
 			default:
 				break;
 			}
@@ -4070,6 +4235,20 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_crypto_key(switch_rtp_t *rtp_sess
 			switch_channel_set_variable(channel, "rtp_has_crypto", "AES_CM_256_HMAC_SHA1_32");
 		}
 		break;
+	case AES_CM_192_HMAC_SHA1_80:
+		srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80(&policy->rtp);
+		srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80(&policy->rtcp);
+		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+			switch_channel_set_variable(channel, "rtp_has_crypto", "AES_CM_192_HMAC_SHA1_80");
+		}
+		break;
+	case AES_CM_192_HMAC_SHA1_32:
+		srtp_crypto_policy_set_aes_cm_192_hmac_sha1_32(&policy->rtp);
+		srtp_crypto_policy_set_aes_cm_192_hmac_sha1_32(&policy->rtcp);
+		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+			switch_channel_set_variable(channel, "rtp_has_crypto", "AES_CM_192_HMAC_SHA1_32");
+		}
+		break;
 	case AES_CM_128_NULL_AUTH:
 		srtp_crypto_policy_set_aes_cm_128_null_auth(&policy->rtp);
 		srtp_crypto_policy_set_aes_cm_128_null_auth(&policy->rtcp);
@@ -4079,6 +4258,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_crypto_key(switch_rtp_t *rtp_sess
 		}
 		break;
 	default:
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_ERROR, "Missing crypto type!\n");
 		break;
 	}
 
@@ -4336,8 +4516,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
 	if (rtp_session->flags[SWITCH_RTP_FLAG_ENABLE_RTCP]) {
 		switch_sockaddr_create(&rtp_session->rtcp_from_addr, pool);
 	}
-	rtp_session->seq = (uint16_t) rand();
-	rtp_session->ssrc = (uint32_t) ((intptr_t) rtp_session + (uint32_t) switch_epoch_time_now(NULL));
+
+	rtp_session->seq = (uint16_t) switch_rand();
+	rtp_session->ssrc = (uint32_t) ((intptr_t) rtp_session + (switch_time_t) switch_epoch_time_now(NULL));
 #ifdef DEBUG_TS_ROLLOVER
 	rtp_session->last_write_ts = TS_ROLLOVER_START;
 #endif
@@ -4677,6 +4858,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *
 		READ_INC(rtp_session);
 		status = switch_jb_create(&rtp_session->jb, SJB_AUDIO, queue_frames, max_queue_frames, rtp_session->pool);
 		switch_jb_set_session(rtp_session->jb, rtp_session->session);
+		switch_jb_set_jitter_estimator(rtp_session->jb, &rtp_session->stats.rtcp.inter_jitter, samples_per_packet, samples_per_second);
 		if (switch_true(switch_channel_get_variable_dup(switch_core_session_get_channel(rtp_session->session), "jb_use_timestamps", SWITCH_FALSE, -1))) {
 			switch_jb_ts_mode(rtp_session->jb, samples_per_packet, samples_per_second);
 		}
@@ -4774,11 +4956,13 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_ice(switch_rtp_t *rtp_sessio
 		switch_snprintf(user_ice, sizeof(user_ice), "%s:%s", rlogin, login);
 		switch_snprintf(luser_ice, sizeof(luser_ice), "%s%s", rlogin, login);
 		ice->ready = ice->rready = 0;
+		ice->cand_responsive = 0;
 	} else {
 		switch_snprintf(ice_user, sizeof(ice_user), "%s%s", login, rlogin);
 		switch_snprintf(user_ice, sizeof(user_ice), "%s%s", rlogin, login);
 		switch_snprintf(luser_ice, sizeof(luser_ice), "");
 		ice->ready = ice->rready = 1;
+		ice->cand_responsive = 0;
 	}
 
 	ice->ice_user = switch_core_strdup(rtp_session->pool, ice_user);
@@ -4789,7 +4973,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_ice(switch_rtp_t *rtp_sessio
 	ice->pass = "";
 	ice->rpass = "";
 	ice->next_run = switch_micro_time_now();
-	ice->init = 1;
+	ice->initializing = 1;
 
 	if (password) {
 		ice->pass = switch_core_strdup(rtp_session->pool, password);
@@ -4947,7 +5131,7 @@ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session)
 		}
 
 		if (rtp_session->flags[SWITCH_RTP_FLAG_ENABLE_RTCP]) {
-			if (rtp_session->rtcp_sock_input && rtp_session->rtcp_sock_input != rtp_session->sock_input) {
+			if (rtp_session->sock_input && rtp_session->rtcp_sock_input && rtp_session->rtcp_sock_input != rtp_session->sock_input) {
 				ping_socket(rtp_session);
 				switch_socket_shutdown(rtp_session->rtcp_sock_input, SWITCH_SHUTDOWN_READWRITE);
 			}
@@ -5494,7 +5678,6 @@ static switch_size_t do_flush(switch_rtp_t *rtp_session, int force, switch_size_
 {
 	int was_blocking = 0;
 	switch_size_t bytes;
-	uint32_t flushed = 0;
 	switch_size_t bytes_out = 0;
 
 	if (!switch_rtp_ready(rtp_session)) {
@@ -5576,8 +5759,6 @@ static switch_size_t do_flush(switch_rtp_t *rtp_session, int force, switch_size_
 #endif
 					}
 
-					flushed++;
-
 					rtp_session->stats.inbound.raw_bytes += bytes;
 					rtp_session->stats.inbound.flush_packet_count++;
 					rtp_session->stats.inbound.packet_count++;
@@ -5738,7 +5919,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
 		/* version 2 probably rtp */
 		rtp_session->has_rtp = (rtp_session->recv_msg.header.version == 2);
 
-		if (rtp_session->media_timeout) {
+		if (rtp_session->media_timeout || rtp_session->ice.ice_user) {
 			rtp_session->last_media = switch_micro_time_now();
 		}
 
@@ -8075,7 +8256,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
 		/* If the marker was set, and the timestamp seems to have started over - set a new SSRC, to indicate this is a new stream */
 		if (m && !switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND) && (rtp_session->rtp_bugs & RTP_BUG_CHANGE_SSRC_ON_MARKER) &&
 			(rtp_session->flags[SWITCH_RTP_FLAG_RESET] || (rtp_session->ts <= rtp_session->last_write_ts && rtp_session->last_write_ts > 0))) {
-			switch_rtp_set_ssrc(rtp_session, (uint32_t) ((intptr_t) rtp_session + (uint32_t) switch_epoch_time_now(NULL)));
+			switch_rtp_set_ssrc(rtp_session, (uint32_t) ((intptr_t) rtp_session + (switch_time_t) switch_epoch_time_now(NULL)));
 		}
 
 		if (!switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO) && !switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_UDPTL)) {
@@ -8086,11 +8267,11 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
 	if (switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO)) {
 		int external = (flags && *flags & SFF_EXTERNAL);
 		/* Normalize the timestamps to our own base by generating a made up starting point then adding the measured deltas to that base
-		   so if the timestamps and ssrc of the source change, it will not break the other end's jitter bufffer / decoder etc *cough* CHROME *cough*
+		   so if the timestamps and ssrc of the source change, it will not break the other end's jitter buffer / decoder etc *cough* CHROME *cough*
 		 */
 
 		if (!rtp_session->ts_norm.ts) {
-			rtp_session->ts_norm.ts = (uint32_t) rand() % 1000000 + 1;
+			rtp_session->ts_norm.ts = (uint32_t) switch_rand() % 1000000 + 1;
 		}
 
 		if (!rtp_session->ts_norm.last_ssrc || send_msg->header.ssrc != rtp_session->ts_norm.last_ssrc || rtp_session->ts_norm.last_external != external) {
@@ -8339,9 +8520,9 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
 			}
 
 			if (!rtp_session->flags[SWITCH_RTP_FLAG_SECURE_SEND_MKI]) {
-				stat = srtp_protect(rtp_session->send_ctx[rtp_session->srtp_idx_rtp], &send_msg->header, &sbytes);
+				stat = srtp_protect(rtp_session->send_ctx[rtp_session->srtp_idx_rtp], send_msg, &sbytes);
 			} else {
-				stat = srtp_protect_mki(rtp_session->send_ctx[rtp_session->srtp_idx_rtp], &send_msg->header, &sbytes, 1, SWITCH_CRYPTO_MKI_INDEX);
+				stat = srtp_protect_mki(rtp_session->send_ctx[rtp_session->srtp_idx_rtp], send_msg, &sbytes, 1, SWITCH_CRYPTO_MKI_INDEX);
 			}
 
 			if (stat) {
@@ -8863,9 +9044,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_write_raw(switch_rtp_t *rtp_session,
 			}
 
 			if (!rtp_session->flags[SWITCH_RTP_FLAG_SECURE_SEND_MKI]) {
-				stat = srtp_protect(rtp_session->send_ctx[rtp_session->srtp_idx_rtp], &rtp_session->write_msg.header, &sbytes);
+				stat = srtp_protect(rtp_session->send_ctx[rtp_session->srtp_idx_rtp], &rtp_session->write_msg, &sbytes);
 			} else {
-				stat = srtp_protect_mki(rtp_session->send_ctx[rtp_session->srtp_idx_rtp], &rtp_session->write_msg.header, &sbytes, 1, SWITCH_CRYPTO_MKI_INDEX);
+				stat = srtp_protect_mki(rtp_session->send_ctx[rtp_session->srtp_idx_rtp], &rtp_session->write_msg, &sbytes, 1, SWITCH_CRYPTO_MKI_INDEX);
 			}
 
 			if (stat) {
diff --git a/src/switch_speex.c b/src/switch_speex.c
index 122ae79a73..5a97b082f2 100644
--- a/src/switch_speex.c
+++ b/src/switch_speex.c
@@ -470,7 +470,7 @@ static switch_status_t switch_speex_destroy(switch_codec_t *codec)
 /**
  * read default settings from speex.conf
  */
-static void load_configuration()
+static void load_configuration(void)
 {
 	switch_xml_t xml = NULL, cfg = NULL;
 
diff --git a/src/switch_stun.c b/src/switch_stun.c
index b0ff45b3dc..d58dd6fd93 100644
--- a/src/switch_stun.c
+++ b/src/switch_stun.c
@@ -135,7 +135,7 @@ SWITCH_DECLARE(void) switch_stun_random_string(char *buf, uint16_t len, char *se
 	max = (int) strlen(set);
 
 	for (x = 0; x < len; x++) {
-		int j = (int) (max * 1.0 * rand() / (RAND_MAX + 1.0));
+		int j = (int) (max * 1.0 * switch_rand() / (SWITCH_RAND_MAX + 1.0));
 		buf[x] = set[j];
 	}
 }
@@ -401,13 +401,17 @@ SWITCH_DECLARE(uint8_t) switch_stun_packet_attribute_get_mapped_address(switch_s
 SWITCH_DECLARE(uint8_t) switch_stun_packet_attribute_get_xor_mapped_address(switch_stun_packet_attribute_t *attribute, switch_stun_packet_header_t *header, char *ipstr, switch_size_t iplen, uint16_t *port)
 {
 	switch_stun_ip_t *ip;
+	switch_stun_ipv6_t *ipv6;
 	uint8_t x, *i;
 	char *p = ipstr;
 
 	ip = (switch_stun_ip_t *) attribute->value;
 
 	if (ip->family == 2) {
-		uint8_t *v6addr = (uint8_t *) &ip->address;
+		uint8_t *v6addr;
+
+		ipv6 = (switch_stun_ipv6_t *)attribute->value;
+		v6addr = (uint8_t *) &ipv6->address;
 		v6_xor(v6addr, (uint8_t *)header->id);
 		inet_ntop(AF_INET6, v6addr, ipstr, iplen);
 	} else {
@@ -696,8 +700,11 @@ SWITCH_DECLARE(char *) switch_stun_host_lookup(const char *host, switch_memory_p
 {
 	switch_sockaddr_t *addr = NULL;
 	char buf[30];
+	switch_status_t res;
+
+	res = switch_sockaddr_info_get(&addr, host, SWITCH_UNSPEC, 0, 0, pool);
+	(void)res;
 
-	switch_sockaddr_info_get(&addr, host, SWITCH_UNSPEC, 0, 0, pool);
 	return switch_core_strdup(pool, switch_str_nil(switch_get_addr(buf, sizeof(buf), addr)));
 
 }
@@ -720,6 +727,7 @@ SWITCH_DECLARE(switch_status_t) switch_stun_lookup(char **ip,
 	int funny = 0;
 	int size = sizeof(buf);
 	int xlen = sizeof(switch_stun_packet_header_t);
+	switch_status_t res;
 
 	switch_assert(err);
 
@@ -729,25 +737,30 @@ SWITCH_DECLARE(switch_status_t) switch_stun_lookup(char **ip,
 
 	*err = "Success";
 
-	switch_sockaddr_info_get(&from_addr, NULL, SWITCH_UNSPEC, 0, 0, pool);
+	res = switch_sockaddr_info_get(&from_addr, NULL, SWITCH_UNSPEC, 0, 0, pool);
+	(void)res;
 
 	if (switch_sockaddr_info_get(&local_addr, *ip, SWITCH_UNSPEC, *port, 0, pool) != SWITCH_STATUS_SUCCESS) {
 		*err = "Local Address Error!";
+
 		return SWITCH_STATUS_FALSE;
 	}
 
 	if (switch_sockaddr_info_get(&remote_addr, stunip, SWITCH_UNSPEC, stunport, 0, pool) != SWITCH_STATUS_SUCCESS) {
 		*err = "Remote Address Error!";
+
 		return SWITCH_STATUS_FALSE;
 	}
 
 	if (switch_socket_create(&sock, AF_INET, SOCK_DGRAM, 0, pool) != SWITCH_STATUS_SUCCESS) {
 		*err = "Socket Error!";
+
 		return SWITCH_STATUS_FALSE;
 	}
 
 	if (switch_socket_bind(sock, local_addr) != SWITCH_STATUS_SUCCESS) {
 		*err = "Bind Error!";
+
 		return SWITCH_STATUS_FALSE;
 	}
 
@@ -779,7 +792,6 @@ SWITCH_DECLARE(switch_status_t) switch_stun_lookup(char **ip,
 	*ip = NULL;
 	*port = 0;
 
-
 	for (;;) {
 		bytes = sizeof(buf);
 		if (switch_socket_recvfrom(from_addr, sock, 0, (char *) &buf, &bytes) == SWITCH_STATUS_SUCCESS && bytes > 0) {
@@ -790,10 +802,12 @@ SWITCH_DECLARE(switch_status_t) switch_stun_lookup(char **ip,
 			*err = "Timeout";
 			switch_socket_shutdown(sock, SWITCH_SHUTDOWN_READWRITE);
 			switch_socket_close(sock);
+
 			return SWITCH_STATUS_TIMEOUT;
 		}
 		switch_cond_next();
 	}
+
 	switch_socket_close(sock);
 
 	if (funny) {
@@ -803,14 +817,15 @@ SWITCH_DECLARE(switch_status_t) switch_stun_lookup(char **ip,
 	packet = switch_stun_packet_parse(start, size);
 	if (!packet) {
 		*err = "Invalid STUN/ICE packet";
+
 		return SWITCH_STATUS_FALSE;
 	}
+
 	end_buf = buf + ((sizeof(buf) > packet->header.length) ? packet->header.length : sizeof(buf));
 
 	switch_stun_packet_first_attribute(packet, attr);
 	switch_assert(attr);
 
-
 	do {
 		switch (attr->type) {
 		case SWITCH_STUN_ATTR_MAPPED_ADDRESS:
@@ -818,6 +833,7 @@ SWITCH_DECLARE(switch_status_t) switch_stun_lookup(char **ip,
 				switch_stun_ip_t *tmp = (switch_stun_ip_t *) attr->value;
 				tmp->address ^= ntohl(0xabcdabcd);
 			}
+
 			switch_stun_packet_attribute_get_mapped_address(attr, rip, sizeof(rip), &rport);
 			break;
 		case SWITCH_STUN_ATTR_XOR_MAPPED_ADDRESS:
@@ -831,12 +847,15 @@ SWITCH_DECLARE(switch_status_t) switch_stun_lookup(char **ip,
 		if (!switch_stun_packet_next_attribute(attr, end_buf)) {
 			break;
 		}
+
 		xlen += 4 + switch_stun_attribute_padded_length(attr);
+
 	} while (xlen <= packet->header.length);
 
 	if (packet->header.type == SWITCH_STUN_BINDING_RESPONSE) {
 		*ip = switch_core_strdup(pool, rip);
 		*port = rport;
+
 		return SWITCH_STATUS_SUCCESS;
 	} else {
 		*err = "Invalid Reply";
diff --git a/src/switch_time.c b/src/switch_time.c
index 445e698f9b..1ee581453a 100644
--- a/src/switch_time.c
+++ b/src/switch_time.c
@@ -1173,9 +1173,8 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
 			} else {
 				if (tfd > -1 && globals.RUNNING == 1) {
 					uint64_t exp;
-					int r;
-					r = read(tfd, &exp, sizeof(exp));
-					r++;
+					read(tfd, &exp, sizeof(exp));
+					(void)exp;
 				} else {
 					switch_time_t timediff = runtime.reference - ts;
 
@@ -1385,10 +1384,13 @@ SWITCH_DECLARE(const char *) switch_lookup_timezone(const char *tz_name)
 		return NULL;
 	}
 
+	switch_mutex_lock(globals.mutex);
 	if ((value = switch_core_hash_find(TIMEZONES_LIST.hash, tz_name)) == NULL) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timezone '%s' not found!\n", tz_name);
 	}
 
+	switch_mutex_unlock(globals.mutex);
+
 	return value;
 }
 
@@ -1523,7 +1525,7 @@ SWITCH_MODULE_LOAD_FUNCTION(softtimer_load)
 #endif
 
 	memset(&globals, 0, sizeof(globals));
-	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool);
+	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
 
 	if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
@@ -1600,18 +1602,21 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown)
 	DeleteCriticalSection(&timer_section);
 #endif
 
+	if (NODE) {
+		switch_event_unbind(&NODE);
+	}
+
+	switch_mutex_lock(globals.mutex);
 	if (TIMEZONES_LIST.hash) {
 		switch_core_hash_destroy(&TIMEZONES_LIST.hash);
 	}
 
+	switch_mutex_unlock(globals.mutex);
+
 	if (TIMEZONES_LIST.pool) {
 		switch_core_destroy_memory_pool(&TIMEZONES_LIST.pool);
 	}
 
-	if (NODE) {
-		switch_event_unbind(&NODE);
-	}
-
 	return SWITCH_STATUS_SUCCESS;
 }
 
diff --git a/src/switch_utils.c b/src/switch_utils.c
index d8b830943a..1293ca3fbd 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -139,13 +139,10 @@ struct switch_frame_buffer_s {
 static switch_frame_t *find_free_frame(switch_frame_buffer_t *fb, switch_frame_t *orig)
 {
 	switch_frame_node_t *np;
-	int x = 0;
 
 	switch_mutex_lock(fb->mutex);
 
 	for (np = fb->head; np; np = np->next) {
-		x++;
-
 		if (!np->inuse && ((orig->packet && np->frame->packet) || (!orig->packet && !np->frame->packet))) {
 
 			if (np == fb->head) {
@@ -750,7 +747,7 @@ SWITCH_DECLARE(int) switch_parse_cidr(const char *string, ip_t *ip, ip_t *mask,
 	ip_t *maskv = mask;
 	ip_t *ipv = ip;
 
-	switch_copy_string(host, string, sizeof(host)-1);
+	switch_copy_string(host, string, sizeof(host) - 1);
 	bit_str = strchr(host, '/');
 
 	if (!bit_str) {
@@ -761,22 +758,20 @@ SWITCH_DECLARE(int) switch_parse_cidr(const char *string, ip_t *ip, ip_t *mask,
 	bits = atoi(bit_str);
 	ipv6 = strchr(string, ':');
 	if (ipv6) {
-		int i,n;
+		int32_t i, n;
+		uint32_t k;
+
 		if (bits < 0 || bits > 128) {
 			return -2;
 		}
+
 		bits = atoi(bit_str);
 		switch_inet_pton(AF_INET6, host, (unsigned char *)ip);
-		for (n=bits,i=0 ;i < 16; i++){
-			if (n >= 8) {
-				maskv->v6.s6_addr[i] = 0xFF;
-				n -= 8;
-			} else if (n < 8) {
-				maskv->v6.s6_addr[i] = 0xFF & ~(0xFF >> n);
-				n -= n;
-			} else if (n == 0) {
-				maskv->v6.s6_addr[i] = 0x00;
-			}
+
+		for (n = bits, i = 0; i < 16; i++) {
+			k = (n > 8) ? 8 : n;
+			maskv->v6.s6_addr[i] = 0xFF & ~(0xFF >> k);	/* k = 0 gives 0x00, k = 8 gives 0xFF */
+			n -= k;
 		}
 	} else {
 		if (bits < 0 || bits > 32) {
@@ -789,6 +784,7 @@ SWITCH_DECLARE(int) switch_parse_cidr(const char *string, ip_t *ip, ip_t *mask,
 
 		maskv->v4 = 0xFFFFFFFF & ~(0xFFFFFFFF >> bits);
 	}
+
 	*bitp = bits;
 
 	return 0;
@@ -1080,7 +1076,7 @@ SWITCH_DECLARE(switch_size_t) switch_b64_decode(const char *in, char *out, switc
 		l64[(int) switch_b64_table[i]] = (char) i;
 	}
 
-	for (ip = in; ip && *ip; ip++) {
+	for (ip = in; ip && *ip && (*ip != '='); ip++) {
 		c = l64[(int) *ip];
 		if (c == -1) {
 			continue;
@@ -1164,7 +1160,7 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
 		switch_safe_free(dupfile);
 	}
 
-	switch_snprintf(filename, 80, "%s%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, (int) switch_epoch_time_now(NULL), rand() & 0xffff);
+	switch_snprintf(filename, 80, "%s%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, (int)(switch_time_t) switch_epoch_time_now(NULL), switch_rand() & 0xffff);
 
 	if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644)) > -1) {
 		if (file) {
@@ -1610,6 +1606,30 @@ SWITCH_DECLARE(char *) switch_separate_paren_args(char *str)
 	return args;
 }
 
+SWITCH_DECLARE(switch_bool_t) switch_is_uint_in_range(const char *str, unsigned int from, unsigned int to)
+{
+	unsigned int number;
+	const char *original_str = str;
+
+	if (str == NULL || *str == '\0' || from > to) {
+		return SWITCH_FALSE;
+	}
+
+	for (; *str != '\0'; str++) {
+		if (!isdigit(*str)) {
+			return SWITCH_FALSE;
+		}
+	}
+
+	number = atoi(original_str);
+
+	if (number < from || number > to) {
+		return SWITCH_FALSE;
+	}
+
+	return SWITCH_TRUE;
+}
+
 SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str)
 {
 	const char *p;
@@ -1995,7 +2015,7 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int *ma
 	}
 
   doh:
-	if (tmp_socket > 0) {
+	if (tmp_socket >= 0) {
 		close(tmp_socket);
 	}
 #endif
@@ -2383,7 +2403,7 @@ SWITCH_DECLARE(int) switch_cmp_addr(switch_sockaddr_t *sa1, switch_sockaddr_t *s
 			return (s1->sin_addr.s_addr == s2->sin_addr.s_addr && s1->sin_port == s2->sin_port);
 		}
 	case AF_INET6:
-		if (s16->sin6_addr.s6_addr && s26->sin6_addr.s6_addr) {
+		{
 			int i;
 
 			if (!ip_only) {
@@ -2437,7 +2457,7 @@ SWITCH_DECLARE(int) switch_cp_addr(switch_sockaddr_t *sa1, switch_sockaddr_t *sa
 
 		return 1;
 	case AF_INET6:
-		if (s16->sin6_addr.s6_addr && s26->sin6_addr.s6_addr) {
+		{
 			int i;
 
 			s16->sin6_port = s26->sin6_port;
@@ -4791,6 +4811,67 @@ done:
 	return status;
 }
 
+SWITCH_DECLARE(int) switch_rand(void)
+{
+	uint32_t random_number = 0;
+#ifdef WIN32
+	BCRYPT_ALG_HANDLE hAlgorithm = NULL;
+	NTSTATUS status = BCryptOpenAlgorithmProvider(&hAlgorithm, BCRYPT_RNG_ALGORITHM, NULL, 0);
+
+	if (!BCRYPT_SUCCESS(status)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "BCryptOpenAlgorithmProvider failed with status %d\n", status);
+
+		return 1;
+	}
+
+	status = BCryptGenRandom(hAlgorithm, (PUCHAR)&random_number, sizeof(random_number), 0);
+	if (!BCRYPT_SUCCESS(status)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "BCryptGenRandom failed with status %d\n", status);
+
+		BCryptCloseAlgorithmProvider(hAlgorithm, 0);
+
+		return 1;
+	}
+
+	BCryptCloseAlgorithmProvider(hAlgorithm, 0);
+
+	/* Make sure we return from 0 to SWITCH_RAND_MAX */
+	return (random_number & (SWITCH_RAND_MAX));
+#elif defined(__unix__) || defined(__APPLE__)
+	int random_fd = open("/dev/urandom", O_RDONLY);
+	ssize_t result;
+	char error_msg[100];
+
+	if (random_fd == -1) {
+		strncpy(error_msg, strerror(errno), sizeof(error_msg) - 1);
+		error_msg[sizeof(error_msg) - 1] = '\0';
+
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open failed: %s\n", error_msg);
+
+		return 1;
+	}
+
+	result = read(random_fd, &random_number, sizeof(random_number));
+	if (result < 0) {
+		strncpy(error_msg, strerror(errno), sizeof(error_msg) - 1);
+		error_msg[sizeof(error_msg) - 1] = '\0';
+
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "read failed: %s\n", error_msg);
+
+		close(random_fd);
+
+		return 1;
+	}
+	
+	close(random_fd);
+
+	/* Make sure we return from 0 to SWITCH_RAND_MAX */
+	return (random_number & (SWITCH_RAND_MAX));
+#else
+	return rand();
+#endif
+}
+
 /* For Emacs:
  * Local Variables:
  * mode:c
diff --git a/src/switch_vad.c b/src/switch_vad.c
index 6118c0237e..74d131331b 100644
--- a/src/switch_vad.c
+++ b/src/switch_vad.c
@@ -206,7 +206,9 @@ SWITCH_DECLARE(switch_vad_state_t) switch_vad_process(switch_vad_t *vad, int16_t
 			j += vad->channels;
 		}
 
-		score = (uint32_t) (energy / (samples / vad->divisor));
+		if (samples && vad->divisor && samples >= vad->divisor) {
+			score = (uint32_t)(energy / (samples / vad->divisor));
+		}
 #ifdef SWITCH_HAVE_FVAD
 	}
 #endif
diff --git a/src/switch_vpx.c b/src/switch_vpx.c
index e35d87712f..e65db6b6c8 100644
--- a/src/switch_vpx.c
+++ b/src/switch_vpx.c
@@ -1238,7 +1238,7 @@ static switch_status_t switch_vpx_decode(switch_codec_t *codec, switch_frame_t *
 
 		if (context->last_received_seq && context->last_received_seq + 1 != frame->seq) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, VPX_SWITCH_LOG_LEVEL, "Packet loss detected last=%d got=%d lost=%d\n", context->last_received_seq, frame->seq, frame->seq - context->last_received_seq);
-			if (is_keyframe && context->vpx_packet_buffer) switch_buffer_zero(context->vpx_packet_buffer);
+			if (is_keyframe) switch_buffer_zero(context->vpx_packet_buffer);
 		}
 
 		context->last_received_seq = frame->seq;
@@ -1853,7 +1853,7 @@ static void parse_codecs(my_vpx_cfg_t *my_cfg, switch_xml_t codecs)
 	}
 }
 
-static void load_config()
+static void load_config(void)
 {
 	switch_xml_t cfg = NULL, xml = NULL;
 	my_vpx_cfg_t *my_cfg = NULL;
diff --git a/src/switch_xml.c b/src/switch_xml.c
index 80b7553907..d54294df92 100644
--- a/src/switch_xml.c
+++ b/src/switch_xml.c
@@ -550,15 +550,22 @@ SWITCH_DECLARE(const char **) switch_xml_pi(switch_xml_t xml, const char *target
 	switch_xml_root_t root = (switch_xml_root_t) xml;
 	int i = 0;
 
-	if (!root)
+	if (!root) {
 		return (const char **) SWITCH_XML_NIL;
-	while (root->xml.parent)
+	}
+
+	while (root && root->xml.parent) {
 		root = (switch_xml_root_t) root->xml.parent;	/* root tag */
+	}
+
 	if (!root || !root->pi) {
 		return (const char **) SWITCH_XML_NIL;
 	}
-	while (root->pi[i] && strcmp(target, root->pi[i][0]))
+
+	while (root->pi[i] && strcmp(target, root->pi[i][0])) {
 		i++;					/* find target */
+	}
+
 	return (const char **) ((root->pi[i]) ? root->pi[i] + 1 : SWITCH_XML_NIL);
 }
 
@@ -1146,7 +1153,7 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str(char *s, switch_size_t len)
 				return switch_xml_err(root, d, "unclosed <!--");
 		} else if (!strncmp(s, "![CDATA[", 8)) {	/* cdata */
 			if ((s = strstr(s, "]]>"))) {
-				if (root && root->cur) {
+				if (root->cur) {
 					root->cur->flags |= SWITCH_XML_CDATA;
 				}
 				switch_xml_char_content(root, d + 8, (s += 2) - d - 10, 'c');
@@ -1213,10 +1220,18 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_fp(FILE * fp)
 		}
 	} while (s && l == SWITCH_XML_BUFSIZE);
 
-	if (!s)
+	if (!s) {
 		return NULL;
-	root = (switch_xml_root_t) switch_xml_parse_str(s, len);
+	}
+
+	if (!(root = (switch_xml_root_t) switch_xml_parse_str(s, len))) {
+		free(s);
+
+		return NULL;
+	}
+
 	root->dynamic = 1;			/* so we know to free s in switch_xml_free() */
+
 	return &root->xml;
 }
 
@@ -1232,9 +1247,8 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_fd(int fd)
 
 	if (fd < 0)
 		return NULL;
-	fstat(fd, &st);
 
-	if (!st.st_size) {
+	if (fstat(fd, &st) == -1 || !st.st_size) {
 		return NULL;
 	}
 
@@ -1243,8 +1257,10 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_fd(int fd)
 	if (!(0<(l = read(fd, m, st.st_size)))
 		|| !(root = (switch_xml_root_t) switch_xml_parse_str((char *) m, l))) {
 		free(m);
+
 		return NULL;
 	}
+
 	root->dynamic = 1;		/* so we know to free s in switch_xml_free() */
 
 	return &root->xml;
@@ -1637,8 +1653,7 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file_simple(const char *file)
 	switch_xml_root_t root;
 
 	if ((fd = open(file, O_RDONLY, 0)) > -1) {
-		fstat(fd, &st);
-		if (!st.st_size) {
+		if (fstat(fd, &st) == -1 || !st.st_size) {
 			close(fd);
 			goto error;
 		}
@@ -1659,6 +1674,7 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file_simple(const char *file)
 
 		root->dynamic = 1;
 		close(fd);
+
 		return &root->xml;
 	}
 
@@ -1710,6 +1726,7 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file)
 		if ( rename(new_file_tmp,new_file) ) {
 			goto done;
 		}
+
 		if ((fd = open(new_file, O_RDONLY, 0)) > -1) {
 			if ((xml = switch_xml_parse_fd(fd))) {
 				if (strcmp(abs, SWITCH_GLOBAL_filenames.conf_name)) {
@@ -1717,8 +1734,8 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file)
 					new_file = NULL;
 				}
 			}
+
 			close(fd);
-			fd = -1;
 		}
 	}
 
@@ -1731,10 +1748,6 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file)
 		write_fd = NULL;
 	}
 
-	if (fd > -1) {
-		close(fd);
-	}
-
 	switch_safe_free(new_file_tmp);
 	switch_safe_free(new_file);
 
@@ -2256,7 +2269,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *key,
 		switch_event_destroy(&my_params);
 	}
 
-	if (status != SWITCH_STATUS_SUCCESS && root && *root) {
+	if (status != SWITCH_STATUS_SUCCESS && *root) {
 		switch_xml_free(*root);
 		*root = NULL;
 		*domain = NULL;
diff --git a/support-d/gdb/README.md b/support-d/gdb/README.md
new file mode 100644
index 0000000000..d3d198c5b5
--- /dev/null
+++ b/support-d/gdb/README.md
@@ -0,0 +1,76 @@
+`gdb` scripts
+-----------
+
+Originally from: https://github.com/facebook/folly/tree/593b6e76881042031b7f21d898c8e0874ea79fe0/folly/experimental/gdb
+
+This directory contains a collection of `gdb` scripts that we have found helpful.
+These scripts use the [gdb extension Python API](https://sourceware.org/gdb/current/onlinedocs/gdb/Python.html#Python).
+
+### How to run the scripts
+
+To run the scripts, fire up `gdb` and load a script with `source -v`. Example:
+
+```lang=bash
+$ gdb -p 123456
+(gdb) source -v ./folly/experimental/gdb/deadlock.py
+Type "deadlock" to detect deadlocks.
+# At this point, any new commands defined in `deadlock.py` are available.
+(gdb) deadlock
+Found deadlock!
+...
+```
+
+### What does each script do?
+
+#### `deadlock.py` - Detect deadlocks
+
+Consider the following program that always deadlocks:
+
+```lang=cpp
+void deadlock3() {
+  std::mutex m1, m2, m3;
+  folly::Baton<> b1, b2, b3;
+
+  auto t1 = std::thread([&m1, &m2, &b1, &b2] {
+    std::lock_guard<std::mutex> g1(m1);
+    b1.post();
+    b2.wait();
+    std::lock_guard<std::mutex> g2(m2);
+  });
+
+  auto t2 = std::thread([&m3, &m2, &b3, &b2] {
+    std::lock_guard<std::mutex> g2(m2);
+    b2.post();
+    b3.wait();
+    std::lock_guard<std::mutex> g3(m3);
+  });
+
+  auto t3 = std::thread([&m3, &m1, &b3, &b1] {
+    std::lock_guard<std::mutex> g3(m3);
+    b3.post();
+    b1.wait();
+    std::lock_guard<std::mutex> g1(m1);
+  });
+
+  t1.join();
+  t2.join();
+  t3.join();
+}
+```
+
+The `deadlock.py` script introduces a new `deadlock` command that can help
+us identify the threads and mutexes involved with the deadlock.
+
+```lang=bash
+$ gdb -p 2174496
+(gdb) source -v ./folly/experimental/gdb/deadlock.py
+Type "deadlock" to detect deadlocks.
+(gdb) deadlock
+Found deadlock!
+Thread 2 (LWP 2174497) is waiting on mutex (0x00007ffcff42a4c0) held by Thread 3 (LWP 2174498)
+Thread 3 (LWP 2174498) is waiting on mutex (0x00007ffcff42a4f0) held by Thread 4 (LWP 2174499)
+Thread 4 (LWP 2174499) is waiting on mutex (0x00007ffcff42a490) held by Thread 2 (LWP 2174497)
+```
+
+NOTE: This script only works on Linux and requires debug symbols to be installed
+for the `pthread` library.
diff --git a/support-d/gdb/deadlock.py b/support-d/gdb/deadlock.py
new file mode 100644
index 0000000000..feeae0713f
--- /dev/null
+++ b/support-d/gdb/deadlock.py
@@ -0,0 +1,474 @@
+#!/usr/bin/env python3
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import re
+from collections import defaultdict
+from enum import Enum
+
+import gdb
+
+
+class DiGraph:
+    """
+    Adapted from networkx: http://networkx.github.io/
+    Represents a directed graph. Edges can store (key, value) attributes.
+    """
+
+    def __init__(self):
+        # Map of node -> set of nodes
+        self.adjacency_map = {}
+        # Map of (node1, node2) -> map string -> arbitrary attribute
+        # This will not be copied in subgraph()
+        self.attributes_map = {}
+
+    def neighbors(self, node):
+        return self.adjacency_map.get(node, set())
+
+    def edges(self):
+        edges = []
+        for node, neighbors in self.adjacency_map.items():
+            for neighbor in neighbors:
+                edges.append((node, neighbor))
+        return edges
+
+    def nodes(self):
+        return self.adjacency_map.keys()
+
+    def attributes(self, node1, node2):
+        return self.attributes_map[(node1, node2)]
+
+    def add_edge(self, node1, node2, **kwargs):
+        if node1 not in self.adjacency_map:
+            self.adjacency_map[node1] = set()
+        if node2 not in self.adjacency_map:
+            self.adjacency_map[node2] = set()
+        self.adjacency_map[node1].add(node2)
+        self.attributes_map[(node1, node2)] = kwargs
+
+    def remove_node(self, node):
+        self.adjacency_map.pop(node, None)
+        for _, neighbors in self.adjacency_map.items():
+            neighbors.discard(node)
+
+    def subgraph(self, nodes):
+        graph = DiGraph()
+        for node in nodes:
+            for neighbor in self.neighbors(node):
+                if neighbor in nodes:
+                    graph.add_edge(node, neighbor)
+        return graph
+
+    def node_link_data(self):
+        """
+        Returns the graph as a dictionary in a format that can be
+        serialized.
+        """
+        data = {
+            "directed": True,
+            "multigraph": False,
+            "graph": {},
+            "links": [],
+            "nodes": [],
+        }
+
+        # Do one pass to build a map of node -> position in nodes
+        node_to_number = {}
+        for node in self.adjacency_map.keys():
+            node_to_number[node] = len(data["nodes"])
+            data["nodes"].append({"id": node})
+
+        # Do another pass to build the link information
+        for node, neighbors in self.adjacency_map.items():
+            for neighbor in neighbors:
+                link = self.attributes_map[(node, neighbor)].copy()
+                link["source"] = node_to_number[node]
+                link["target"] = node_to_number[neighbor]
+                data["links"].append(link)
+        return data
+
+
+def strongly_connected_components(G):  # noqa: C901
+    """
+    Adapted from networkx: http://networkx.github.io/
+    Parameters
+    ----------
+    G : DiGraph
+    Returns
+    -------
+    comp : generator of sets
+        A generator of sets of nodes, one for each strongly connected
+        component of G.
+    """
+    preorder = {}
+    lowlink = {}
+    scc_found = {}
+    scc_queue = []
+    i = 0  # Preorder counter
+    for source in G.nodes():
+        if source not in scc_found:
+            queue = [source]
+            while queue:
+                v = queue[-1]
+                if v not in preorder:
+                    i = i + 1
+                    preorder[v] = i
+                done = 1
+                v_nbrs = G.neighbors(v)
+                for w in v_nbrs:
+                    if w not in preorder:
+                        queue.append(w)
+                        done = 0
+                        break
+                if done == 1:
+                    lowlink[v] = preorder[v]
+                    for w in v_nbrs:
+                        if w not in scc_found:
+                            if preorder[w] > preorder[v]:
+                                lowlink[v] = min([lowlink[v], lowlink[w]])
+                            else:
+                                lowlink[v] = min([lowlink[v], preorder[w]])
+                    queue.pop()
+                    if lowlink[v] == preorder[v]:
+                        scc_found[v] = True
+                        scc = {v}
+                        while scc_queue and preorder[scc_queue[-1]] > preorder[v]:
+                            k = scc_queue.pop()
+                            scc_found[k] = True
+                            scc.add(k)
+                        yield scc
+                    else:
+                        scc_queue.append(v)
+
+
+def simple_cycles(G):  # noqa: C901
+    """
+    Adapted from networkx: http://networkx.github.io/
+    Parameters
+    ----------
+    G : DiGraph
+    Returns
+    -------
+    cycle_generator: generator
+       A generator that produces elementary cycles of the graph.
+       Each cycle is represented by a list of nodes along the cycle.
+    """
+
+    def _unblock(thisnode, blocked, B):
+        stack = {thisnode}
+        while stack:
+            node = stack.pop()
+            if node in blocked:
+                blocked.remove(node)
+                stack.update(B[node])
+                B[node].clear()
+
+    # Johnson's algorithm requires some ordering of the nodes.
+    # We assign the arbitrary ordering given by the strongly connected comps
+    # There is no need to track the ordering as each node removed as processed.
+    # save the actual graph so we can mutate it here
+    # We only take the edges because we do not want to
+    # copy edge and node attributes here.
+    subG = G.subgraph(G.nodes())
+    sccs = list(strongly_connected_components(subG))
+    while sccs:
+        scc = sccs.pop()
+        # order of scc determines ordering of nodes
+        startnode = scc.pop()
+        # Processing node runs 'circuit' routine from recursive version
+        path = [startnode]
+        blocked = set()  # vertex: blocked from search?
+        closed = set()  # nodes involved in a cycle
+        blocked.add(startnode)
+        B = defaultdict(set)  # graph portions that yield no elementary circuit
+        stack = [(startnode, list(subG.neighbors(startnode)))]
+        while stack:
+            thisnode, nbrs = stack[-1]
+            if nbrs:
+                nextnode = nbrs.pop()
+                if nextnode == startnode:
+                    yield path[:]
+                    closed.update(path)
+                elif nextnode not in blocked:
+                    path.append(nextnode)
+                    stack.append((nextnode, list(subG.neighbors(nextnode))))
+                    closed.discard(nextnode)
+                    blocked.add(nextnode)
+                    continue
+            # done with nextnode... look for more neighbors
+            if not nbrs:  # no more nbrs
+                if thisnode in closed:
+                    _unblock(thisnode, blocked, B)
+                else:
+                    for nbr in subG.neighbors(thisnode):
+                        if thisnode not in B[nbr]:
+                            B[nbr].add(thisnode)
+                stack.pop()
+                path.pop()
+        # done processing this node
+        subG.remove_node(startnode)
+        H = subG.subgraph(scc)  # make smaller to avoid work in SCC routine
+        sccs.extend(list(strongly_connected_components(H)))
+
+
+def find_cycle(graph):
+    """
+    Looks for a cycle in the graph. If found, returns the first cycle.
+    If nodes a1, a2, ..., an are in a cycle, then this returns:
+        [(a1,a2), (a2,a3), ... (an-1,an), (an, a1)]
+    Otherwise returns an empty list.
+    """
+    cycles = list(simple_cycles(graph))
+    if cycles:
+        nodes = cycles[0]
+        nodes.append(nodes[0])
+        edges = []
+        prev = nodes[0]
+        for node in nodes[1:]:
+            edges.append((prev, node))
+            prev = node
+        return edges
+    else:
+        return []
+
+
+def get_stacktrace(thread_id):
+    """
+    Returns the stack trace for the thread id as a list of strings.
+    """
+    gdb.execute("thread %d" % thread_id, from_tty=False, to_string=True)
+    output = gdb.execute("bt", from_tty=False, to_string=True)
+    stacktrace_lines = output.strip().split("\n")
+    return stacktrace_lines
+
+
+def is_thread_blocked_with_frame(
+    thread_id, top_line, expected_top_lines, expected_frame
+):
+    """
+    Returns True if we found expected_top_line in top_line, and
+    we found the expected_frame in the thread's stack trace.
+    """
+    if all(expected not in top_line for expected in expected_top_lines):
+        return False
+    stacktrace_lines = get_stacktrace(thread_id)
+    return any(expected_frame in line for line in stacktrace_lines)
+
+
+class MutexType(Enum):
+    """Types of mutexes that we can detect deadlocks."""
+
+    PTHREAD_MUTEX_T = "pthread_mutex_t"
+    PTHREAD_RWLOCK_T = "pthread_rwlock_t"
+
+    @staticmethod
+    def get_mutex_type(thread_id, top_line):
+        """
+        Returns the probable mutex type, based on the first line
+        of the thread's stack. Returns None if not found.
+        """
+
+        WAITLIST = [
+            "__lll_lock_wait",
+            "futex_abstimed_wait",
+            "futex_abstimed_wait_cancelable",
+            "futex_reltimed_wait",
+            "futex_reltimed_wait_cancelable",
+            "futex_wait",
+            "futex_wait_cancelable",
+        ]
+
+        if is_thread_blocked_with_frame(thread_id, top_line, WAITLIST, "pthread_mutex"):
+            return MutexType.PTHREAD_MUTEX_T
+        if is_thread_blocked_with_frame(
+            thread_id, top_line, WAITLIST, "pthread_rwlock"
+        ):
+            return MutexType.PTHREAD_RWLOCK_T
+        return None
+
+    @staticmethod
+    def get_mutex_owner_and_address_func_for_type(mutex_type):
+        """
+        Returns a function to resolve the mutex owner and address for
+        the given type. The returned function f has the following
+        signature:
+
+            f: args: (map of thread lwp -> thread id), blocked thread lwp
+               returns: (lwp of thread owning mutex, mutex address)
+                        or (None, None) if not found.
+
+        Returns None if there is no function for this mutex_type.
+        """
+        if mutex_type == MutexType.PTHREAD_MUTEX_T:
+            return get_pthread_mutex_t_owner_and_address
+        if mutex_type == MutexType.PTHREAD_RWLOCK_T:
+            return get_pthread_rwlock_t_owner_and_address
+        return None
+
+
+def print_cycle(graph, lwp_to_thread_id, cycle):
+    """Prints the threads and mutexes involved in the deadlock."""
+    for m, n in cycle:
+        print(
+            "Thread %d (LWP %d) is waiting on %s (0x%016x) held by "
+            "Thread %d (LWP %d)"
+            % (
+                lwp_to_thread_id[m],
+                m,
+                graph.attributes(m, n)["mutex_type"].value,
+                graph.attributes(m, n)["mutex"],
+                lwp_to_thread_id[n],
+                n,
+            )
+        )
+
+
+def get_thread_info():
+    """
+    Returns a pair of:
+    - map of LWP -> thread ID
+    - map of blocked threads LWP -> potential mutex type
+    """
+    # LWP -> thread ID
+    lwp_to_thread_id = {}
+
+    # LWP -> potential mutex type it is blocked on
+    blocked_threads = {}
+
+    output = gdb.execute("info threads", from_tty=False, to_string=True)
+    lines = output.strip().split("\n")[1:]
+    regex = re.compile(r"[\s\*]*(\d+).*Thread.*\(LWP (\d+)\).*")
+    for line in lines:
+        try:
+            thread_id = int(regex.match(line).group(1))
+            thread_lwp = int(regex.match(line).group(2))
+            lwp_to_thread_id[thread_lwp] = thread_id
+            mutex_type = MutexType.get_mutex_type(thread_id, line)
+            if mutex_type:
+                blocked_threads[thread_lwp] = mutex_type
+        except Exception:
+            continue
+
+    return (lwp_to_thread_id, blocked_threads)
+
+
+def get_pthread_mutex_t_owner_and_address(lwp_to_thread_id, thread_lwp):
+    """
+    Finds the thread holding the mutex that this thread is blocked on.
+    Returns a pair of (lwp of thread owning mutex, mutex address),
+    or (None, None) if not found.
+    """
+    # Go up the stack to the pthread_mutex_lock frame
+    gdb.execute(
+        "thread %d" % lwp_to_thread_id[thread_lwp], from_tty=False, to_string=True
+    )
+    gdb.execute("frame 1", from_tty=False, to_string=True)
+
+    # Get the owner of the mutex by inspecting the internal
+    # fields of the mutex.
+    try:
+        mutex_info = gdb.parse_and_eval("mutex").dereference()
+        mutex_owner_lwp = int(mutex_info["__data"]["__owner"])
+        return (mutex_owner_lwp, int(mutex_info.address))
+    except gdb.error:
+        return (None, None)
+
+
+def get_pthread_rwlock_t_owner_and_address(lwp_to_thread_id, thread_lwp):
+    """
+    If the thread is waiting on a write-locked pthread_rwlock_t, this will
+    return the pair of:
+        (lwp of thread that is write-owning the mutex, mutex address)
+    or (None, None) if not found, or if the mutex is read-locked.
+    """
+    # Go up the stack to the pthread_rwlock_{rd|wr}lock frame
+    gdb.execute(
+        "thread %d" % lwp_to_thread_id[thread_lwp], from_tty=False, to_string=True
+    )
+    gdb.execute("frame 2", from_tty=False, to_string=True)
+
+    # Get the owner of the mutex by inspecting the internal
+    # fields of the mutex.
+    try:
+        rwlock_info = gdb.parse_and_eval("rwlock").dereference()
+        rwlock_data = rwlock_info["__data"]
+        field_names = ["__cur_writer", "__writer"]
+        fields = rwlock_data.type.fields()
+        field = [f for f in fields if f.name in field_names][0]
+        rwlock_owner_lwp = int(rwlock_data[field])
+        # We can only track the owner if it is currently write-locked.
+        # If it is not write-locked or if it is currently read-locked,
+        # possibly by multiple threads, we cannot find the owner.
+        if rwlock_owner_lwp != 0:
+            return (rwlock_owner_lwp, int(rwlock_info.address))
+        else:
+            return (None, None)
+    except gdb.error:
+        return (None, None)
+
+
+class Deadlock(gdb.Command):
+    """Detects deadlocks"""
+
+    def __init__(self):
+        super(Deadlock, self).__init__("deadlock", gdb.COMMAND_NONE)
+
+    def invoke(self, arg, from_tty):
+        """Prints the threads and mutexes in a deadlock, if it exists."""
+        lwp_to_thread_id, blocked_threads = get_thread_info()
+
+        # Nodes represent threads. Edge (A,B) exists if thread A
+        # is waiting on a mutex held by thread B.
+        graph = DiGraph()
+
+        # Go through all the blocked threads and see which threads
+        # they are blocked on, and build the thread wait graph.
+        for thread_lwp, mutex_type in blocked_threads.items():
+            get_owner_and_address_func = (
+                MutexType.get_mutex_owner_and_address_func_for_type(mutex_type)
+            )
+            if not get_owner_and_address_func:
+                continue
+            mutex_owner_lwp, mutex_address = get_owner_and_address_func(
+                lwp_to_thread_id, thread_lwp
+            )
+            if mutex_owner_lwp and mutex_address:
+                graph.add_edge(
+                    thread_lwp,
+                    mutex_owner_lwp,
+                    mutex=mutex_address,
+                    mutex_type=mutex_type,
+                )
+
+        # A deadlock exists if there is a cycle in the graph.
+        cycle = find_cycle(graph)
+        if cycle:
+            print("Found deadlock!")
+            print_cycle(graph, lwp_to_thread_id, cycle)
+        else:
+            print("No deadlock detected. " "Do you have debug symbols installed?")
+
+
+def load():
+    # instantiate the Deadlock command
+    Deadlock()
+    print('Type "deadlock" to detect deadlocks.')
+
+
+def info():
+    return "Detect deadlocks"
+
+
+if __name__ == "__main__":
+    load()
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index e2cec69089..719152d6df 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/build/modmake.rulesam
 noinst_PROGRAMS = switch_event switch_hash switch_ivr_originate switch_utils switch_core switch_console switch_vpx switch_core_file \
 			   switch_ivr_play_say switch_core_codec switch_rtp switch_xml
 noinst_PROGRAMS += switch_core_video switch_core_db switch_vad switch_packetizer switch_core_session test_sofia switch_ivr_async switch_core_asr switch_log
-
+noinst_PROGRAMS += test_tts_format
 noinst_PROGRAMS+= switch_hold switch_sip
 
 if HAVE_PCAP
diff --git a/tests/unit/collect-test-logs.sh b/tests/unit/collect-test-logs.sh
index fd2a5f9d9a..40efd654c1 100755
--- a/tests/unit/collect-test-logs.sh
+++ b/tests/unit/collect-test-logs.sh
@@ -1,34 +1,99 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-echo "Collecting test logs"
-LOG_DIR=./logs
-html="<html><h3>There are failed unit-tests:</h3><table>"
-logs=$(find $LOG_DIR -type f -iname "*.html" -print | sort)
-logs_found=0
-olddirname=""
-for name in $logs
-do
-	logname=$(basename $name)
-	testname=$(echo $logname | awk -F 'log_run-tests_' '{print $2}' | awk -F '.html' '{print $1}')
-	testpath="${testname//!/\/}"
-	dirname=$(dirname $testpath)
-	test=$(basename $testpath)
-	if [ "$olddirname" != "$dirname" ]; then
-		html+="<tr align=\"left\"><th><br>$dirname</th></tr>" ;
-		olddirname=$dirname ;
-	fi
-	html+="<tr align=\"left\"><td><a href="$logname">$test</a>"
-	backtrace="backtrace_$testname.txt"
-	if test -f "${LOG_DIR}/$backtrace"; then
-		html+=". Core dumped, backtrace is available <a href=\"$backtrace\">here</a>"
-	fi
-	html+="</td></tr>"
-	logs_found=1
+### shfmt -w -s -ci -sr -kp -fn tests/unit/collect-test-logs.sh
+
+#------------------------------------------------------------------------------
+# Collects test logs and generates an HTML report
+# of failed unit tests with links to backtraces
+#------------------------------------------------------------------------------
+
+# Configuration with default value
+LOG_DIR="./logs"
+PRINT_TO_CONSOLE=0
+
+# Parse command line arguments
+while [[ $# -gt 0 ]]; do
+	case $1 in
+		-p | --print)
+			if ! command -v html2text > /dev/null 2>&1; then
+				echo "Error: html2text is required for printing HTML contents"
+				echo "Please install html2text and try again"
+				exit 1
+			fi
+			PRINT_TO_CONSOLE=1
+			shift
+			;;
+		-d | --dir)
+			if [ -z "$2" ]; then
+				echo "Error: Log directory path is required for -d|--dir option"
+				exit 1
+			fi
+			LOG_DIR="$2"
+			shift 2
+			;;
+		*)
+			echo "Unknown option: $1"
+			echo "Usage: $0 [-p|--print] [-d|--dir DIR]"
+			exit 1
+			;;
+	esac
 done
 
+# Initialize HTML
+echo "Collecting test logs"
+html="<html><head><title>Failed Unit Tests Report</title></head><body><h3>There are failed unit-tests:</h3><table>"
+
+# Find all HTML log files and sort them
+logs=$(find "$LOG_DIR" -type f -iname "*.html" -print | sort)
+logs_found=0
+olddirname=""
+
+# Process each log file
+for name in $logs; do
+	# Extract test information
+	logname=$(basename "$name")
+	testname=$(echo "$logname" | awk -F 'log_run-tests_' '{print $2}' | awk -F '.html' '{print $1}')
+	testpath="${testname//!/\/}"
+	dirname=$(dirname "$testpath")
+	test=$(basename "$testpath")
+
+	# Add directory header if it's new
+	if [ "$olddirname" != "$dirname" ]; then
+		html+="<tr align=\"left\"><th><br>$dirname</th></tr>"
+		olddirname=$dirname
+	fi
+
+	# Add test entry
+	html+="<tr align=\"left\"><td><a href=\"$logname\">$test</a>"
+
+	# Check for backtrace
+	backtrace="backtrace_$testname.txt"
+	if test -f "${LOG_DIR}/$backtrace"; then
+		if [ $PRINT_TO_CONSOLE -eq 1 ]; then
+			echo "Core dumped, backtrace:"
+			cat $backtrace
+			echo
+		fi
+
+		html+=". Core dumped, backtrace is available <a href=\"$backtrace\">here</a>"
+	fi
+
+	html+="</td></tr>"
+	logs_found=1
+
+	# Print current log file if requested
+	if [ $PRINT_TO_CONSOLE -eq 1 ]; then
+		echo "=== Contents of $name ==="
+		html2text "$name"
+		echo "=== End of $name ==="
+		echo
+	fi
+done
+
+# Generate report if logs were found
 if [ $logs_found -ne 0 ]; then
-	html+="</table></html>"
-	echo $html > $LOG_DIR/artifacts.html
+	html+="</table></body></html>"
+	echo "$html" > "$LOG_DIR/artifacts.html"
 	exit 1
 fi
 
diff --git a/src/mod/formats/mod_ssml/test/freeswitch.xml b/tests/unit/conf_tts_format/freeswitch.xml
similarity index 100%
rename from src/mod/formats/mod_ssml/test/freeswitch.xml
rename to tests/unit/conf_tts_format/freeswitch.xml
diff --git a/tests/unit/run-tests-docker.sh b/tests/unit/run-tests-docker.sh
new file mode 100755
index 0000000000..91e52d3b3d
--- /dev/null
+++ b/tests/unit/run-tests-docker.sh
@@ -0,0 +1,165 @@
+#!/usr/bin/env bash
+
+### shfmt -w -s -ci -sr -kp -fn tests/unit/run-tests-docker.sh
+
+#------------------------------------------------------------------------------
+# Docker Test Runner
+# Parallel test execution in Docker with configurable CPU and container counts
+#------------------------------------------------------------------------------
+
+# Exit on error
+set -e
+
+# Global exit status
+GLOBAL_EXIT_STATUS=0
+
+# Default values
+SOFIA_SIP_PATH=""
+FREESWITCH_PATH=""
+IMAGE_TAG="ci.local"
+BASE_IMAGE=""
+MAX_CONTAINERS="1"
+CPUS_PER_CONTAINER="1"
+CONTAINER_IDS_FILE=$(mktemp)
+OUTPUT_DIR=""
+
+# Parse command line arguments
+while [[ $# -gt 0 ]]; do
+	case $1 in
+		--sofia-sip-path)
+			SOFIA_SIP_PATH="$2"
+			shift
+			;;
+		--freeswitch-path)
+			FREESWITCH_PATH="$2"
+			shift
+			;;
+		--image-tag)
+			IMAGE_TAG="$2"
+			shift
+			;;
+		--base-image)
+			BASE_IMAGE="$2"
+			shift
+			;;
+		--max-containers)
+			MAX_CONTAINERS="$2"
+			shift
+			;;
+		--cpus)
+			CPUS_PER_CONTAINER="$2"
+			shift
+			;;
+		--output-dir)
+			OUTPUT_DIR="$2"
+			shift
+			;;
+		*)
+			echo "Unknown parameter: $1"
+			exit 1
+			;;
+	esac
+	shift
+done
+
+# Validate paths exist
+if [ ! -d "$SOFIA_SIP_PATH" ]; then
+	echo "Error: Sofia-SIP path does not exist: $SOFIA_SIP_PATH"
+	exit 1
+fi
+
+if [ ! -d "$FREESWITCH_PATH" ]; then
+	echo "Error: FreeSWITCH path does not exist: $FREESWITCH_PATH"
+	exit 1
+fi
+
+# Validate output directory is provided (required for test results)
+if [ -z "$OUTPUT_DIR" ]; then
+	echo "Error: Output directory must be specified with --output-dir"
+	exit 1
+fi
+
+# Create output directory
+mkdir -p "$OUTPUT_DIR"
+
+# Define build log file
+BUILD_LOG="$OUTPUT_DIR/docker_build.log"
+
+echo "Starting Docker build..."
+
+# Build Docker image and redirect output to log file
+if ! docker build \
+	--build-arg BUILDER_IMAGE="$BASE_IMAGE" \
+	--build-context sofia-sip="$SOFIA_SIP_PATH" \
+	--build-context freeswitch="$FREESWITCH_PATH" \
+	--file "$FREESWITCH_PATH/.github/docker/debian/bookworm/amd64/CI/Dockerfile" \
+	--tag "$IMAGE_TAG" \
+	"$FREESWITCH_PATH/.github/docker/debian" > "$BUILD_LOG" 2>&1; then
+	echo "Docker build failed! Build log:"
+	cat "$BUILD_LOG"
+	exit 1
+fi
+
+echo "Build completed successfully! Build log saved to: $BUILD_LOG"
+
+# Get working directory from image
+CONTAINER_WORKDIR=$(docker inspect "$IMAGE_TAG" --format='{{.Config.WorkingDir}}')
+if [ -z "$CONTAINER_WORKDIR" ]; then
+	echo "Error: Could not determine container working directory"
+	exit 1
+fi
+
+# Start test containers with output directory mounted
+echo "Starting $MAX_CONTAINERS containers..."
+
+for i in $(seq 1 "$MAX_CONTAINERS"); do
+	CTID=$(docker run --privileged \
+		--cpus "$CPUS_PER_CONTAINER" \
+		--volume "$OUTPUT_DIR:$CONTAINER_WORKDIR/$OUTPUT_DIR" \
+		--detach \
+		"$IMAGE_TAG" \
+		--output-dir "$OUTPUT_DIR" \
+		$MAX_CONTAINERS $i)
+	echo "$CTID $i" >> "$CONTAINER_IDS_FILE"
+	echo "Started container: $CTID (index: $i)"
+done
+
+echo "All containers started successfully!"
+
+# Wait for containers to finish and collect results
+echo "Waiting for containers to finish..."
+while read -r line; do
+	CTID=$(echo "$line" | cut -d' ' -f1)
+	INDEX=$(echo "$line" | cut -d' ' -f2)
+
+	docker wait "$CTID" > /dev/null 2>&1
+	EXIT_CODE=$(docker inspect "$CTID" --format='{{.State.ExitCode}}')
+
+	# Save container logs to output directory
+	docker logs "$CTID" > "$OUTPUT_DIR/$CTID.log" 2>&1
+	echo "Container logs saved to: $OUTPUT_DIR/$CTID.log"
+
+	if [ "$EXIT_CODE" -ne 0 ]; then
+		echo "Container $CTID (index: $INDEX) failed with exit code: $EXIT_CODE"
+		GLOBAL_EXIT_STATUS=1
+
+		tail -n 50 "$OUTPUT_DIR/$CTID.log"
+	else
+		echo "Container $CTID (index: $INDEX) completed successfully"
+	fi
+
+done < "$CONTAINER_IDS_FILE"
+
+# Clean up temporary files
+rm -f "$CONTAINER_IDS_FILE"
+
+echo "Test outputs have been saved to: $OUTPUT_DIR"
+
+# Exit with global status
+if [ "$GLOBAL_EXIT_STATUS" -eq 0 ]; then
+	echo "All containers completed successfully!"
+else
+	echo "One or more containers failed!"
+fi
+
+exit $GLOBAL_EXIT_STATUS
diff --git a/tests/unit/run-tests.mk b/tests/unit/run-tests.mk
new file mode 100644
index 0000000000..8c260cfa2a
--- /dev/null
+++ b/tests/unit/run-tests.mk
@@ -0,0 +1,5 @@
+.DEFAULT:
+	./test.sh "$@"
+
+all: $(TEST_LIST)
+
diff --git a/tests/unit/run-tests.sh b/tests/unit/run-tests.sh
index bda6a32571..c0e97ae0b0 100755
--- a/tests/unit/run-tests.sh
+++ b/tests/unit/run-tests.sh
@@ -1,28 +1,202 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-# "print_tests" returns relative paths to all the tests
-TESTS=$(make -s -C ../.. print_tests)
+### shfmt -w -s -ci -sr -kp -fn tests/unit/run-tests.sh
 
-echo "-----------------------------------------------------------------";
-echo "Starting tests";
-echo "Tests found: ${TESTS}";
-echo "-----------------------------------------------------------------";
-echo "Starting" > pids.txt
-for i in $TESTS
-do
-    echo "Testing $i" ;
-    ./test.sh "$i" &
-    pid=($!)
-    pids+=($pid)
-    echo "$pid $i" >> pids.txt
-    echo "----------------" ;
+#------------------------------------------------------------------------------
+# Test Runner Script
+# Runs tests in chunks, distributing them across processors
+# Supports moving test artifacts to specified output directory
+#------------------------------------------------------------------------------
+
+# Exit on error, undefined vars, and propagate pipe failures
+set -euo pipefail
+
+# Global variable for test failures
+declare -i TESTS_FAILED=0
+
+# Function to show usage
+show_usage()
+{
+	echo "Usage: $0 [chunks] [chunk_number] [options]"
+	echo "  chunks        : Number of chunks to split tests into (default: 1)"
+	echo "  chunk_number  : Which chunk to run (default: 1)"
+	echo "Options:"
+	echo "  --dry-run     : Show test distribution without running tests"
+	echo "  --output-dir  : Directory to store test artifacts (will be created if needed)"
+	echo "  -h|--help     : Show this help message"
+	exit 1
+}
+
+# Function to validate numeric input
+validate_number()
+{
+	local val=$1
+	local name=$2
+
+	if ! [[ $val =~ ^[0-9]+$ ]]; then
+		echo "Error: $name must be a positive number, got: $val"
+		exit 1
+	fi
+
+	if [ "$val" -lt 1 ]; then
+		echo "Error: $name must be greater than 0, got: $val"
+		exit 1
+	fi
+}
+
+# Function to format duration in human-readable form
+format_duration()
+{
+	local duration=$1
+	local minutes=$((duration / 60))
+	local seconds=$((duration % 60))
+	printf "%02d:%02d" $minutes $seconds
+}
+
+# Function to move test artifacts to output directory
+move_artifacts()
+{
+	local output_dir=$1
+
+	# Create output directory if it doesn't exist
+	mkdir -p "$output_dir"
+
+	# Move HTML logs and backtrace files if they exist
+	# Using || true to prevent script failure if no files match
+	(mv log_run-tests_*.html "$output_dir" 2> /dev/null || true)
+	(mv backtrace_*.txt "$output_dir" 2> /dev/null || true)
+
+	# Check if any files were moved
+	if [ -n "$(ls -A "$output_dir" 2> /dev/null)" ]; then
+		echo "Test artifacts moved to: $output_dir"
+	else
+		echo "No test artifacts found to move"
+	fi
+}
+
+# Parse command line arguments
+chunks=1
+chunk_number=1
+dry_run=false
+output_dir=""
+
+while [[ $# -gt 0 ]]; do
+	case $1 in
+		--dry-run)
+			dry_run=true
+			shift
+			;;
+		--output-dir)
+			if [ -n "${2:-}" ]; then
+				output_dir="$2"
+				shift 2
+			else
+				echo "Error: --output-dir requires a directory path"
+				exit 1
+			fi
+			;;
+		-h | --help)
+			show_usage
+			;;
+		*)
+			if [[ $chunks -eq 1 ]]; then
+				chunks=$1
+			elif [[ $chunk_number -eq 1 ]]; then
+				chunk_number=$1
+			else
+				echo "Error: Unknown argument $1"
+				show_usage
+			fi
+			shift
+			;;
+	esac
 done
 
-for pid in "${pids[@]}"
-do
-  echo "$pid waiting" >> pids.txt
-  wait "$pid"
-  echo "$pid finished" >> pids.txt
+# Validate numeric inputs
+validate_number "$chunks" "chunks"
+validate_number "$chunk_number" "chunk_number"
+
+# Validate chunk parameters
+if [ "$chunk_number" -gt "$chunks" ]; then
+	echo "Error: chunk_number ($chunk_number) cannot be greater than total chunks ($chunks)"
+	exit 1
+fi
+
+# Get list of tests from make
+echo "Fetching test list..."
+TESTS=$(make -s -C ../.. print_tests 2>/dev/null) || {
+	echo "Error: Failed to fetch test list"
+	exit 1
+}
+
+# Split tests into array
+IFS=$'\n' read -d '' -r -a all_tests <<< "$TESTS" || true # || true to handle last line without newline
+
+# Check if any tests were found
+if [ ${#all_tests[@]} -eq 0 ]; then
+	echo "Error: No tests found!"
+	exit 1
+fi
+
+# Get total number of tests from array length
+total_tests=${#all_tests[@]}
+
+# Select tests for this chunk
+chunk_tests=()
+for ((i = chunk_number - 1; i < total_tests; i += chunks)); do
+	chunk_tests+=("${all_tests[$i]}")
 done
 
-echo "Done running tests!"
\ No newline at end of file
+# Size of this chunk
+chunk_size=${#chunk_tests[@]}
+
+# Print execution information
+echo ""
+echo "Test Distribution Information:"
+echo "Total tests found: $total_tests"
+echo "Chunk size: $chunk_size"
+echo "Running chunk $chunk_number/$chunks"
+if [ -n "$output_dir" ]; then
+	echo "Artifacts will be stored in: $output_dir"
+fi
+echo ""
+echo "Tests to be executed:"
+for i in "${!chunk_tests[@]}"; do
+	printf "%3d) %s\n" "$((i + 1))" "${chunk_tests[$i]}"
+done
+echo ""
+
+# Exit here if dry run
+if [ "$dry_run" = true ]; then
+	echo "Dry run complete. Use without --dry-run to execute tests."
+	exit 0
+fi
+
+# Record start time
+start_time=$(date +%s)
+
+# Run tests sequentially within the chunk
+if ! make -f run-tests.mk TEST_LIST="${chunk_tests[*]}"; then
+	TESTS_FAILED=1
+fi
+
+# Move artifacts if output directory was specified
+if [ -n "$output_dir" ]; then
+	move_artifacts "$output_dir"
+fi
+
+# Record end time and calculate duration
+end_time=$(date +%s)
+duration=$((end_time - start_time))
+
+# Print timing results and statistics
+echo ""
+echo "Execution Summary for chunk $chunk_number/$chunks:"
+echo "Started at : $(date -d @$start_time '+%Y-%m-%d %H:%M:%S')"
+echo "Finished at: $(date -d @$end_time '+%Y-%m-%d %H:%M:%S')"
+echo "Duration   : $(format_duration $duration)"
+echo "Status     : $([ $TESTS_FAILED -eq 0 ] && echo "SUCCESS" || echo "FAILED")"
+echo ""
+
+# Exit with appropriate status code
+exit $TESTS_FAILED
diff --git a/tests/unit/switch_core.c b/tests/unit/switch_core.c
index e51c4e2b1d..295e4e0ff1 100644
--- a/tests/unit/switch_core.c
+++ b/tests/unit/switch_core.c
@@ -53,6 +53,107 @@ FST_CORE_BEGIN("./conf")
 		}
 		FST_TEARDOWN_END()
 
+		FST_TEST_BEGIN(test_switch_rand)
+		{
+			int i, c = 0;
+
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "\nLet's generate a few random numbers.\n");
+
+			for (i = 0; i < 10; i++) {
+				uint32_t rnd = switch_rand();
+
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Random number %d\n", rnd);
+
+				if (rnd == 1) {
+					c++;
+				}
+			}
+
+			/* We do not expect all random numbers to be 1 all 10 times. That would mean we have an error OR we are lucky to have 10 random ones! */
+			fst_check(c < 10);
+		}
+		FST_TEST_END()
+
+		FST_TEST_BEGIN(test_switch_uint31_t_overflow)
+		{
+			switch_uint31_t x;
+			uint32_t overflow;
+
+			x.value = 0x7fffffff;
+			x.value++;
+
+			fst_check_int_equals(x.value, 0);
+			x.value++;
+			fst_check_int_equals(x.value, 1);
+			x.value -= 2;
+			fst_check_int_equals(x.value, 0x7fffffff);
+
+			overflow = (uint32_t)0x7fffffff + 1;
+			x.value = overflow;
+			fst_check_int_equals(x.value, 0);
+		}
+		FST_TEST_END()
+
+		FST_TEST_BEGIN(test_switch_parse_cidr_v6)
+		{
+			ip_t ip, mask;
+			uint32_t bits;
+
+			fst_check(!switch_parse_cidr("fe80::/10", &ip, &mask, &bits));
+			fst_check_int_equals(bits, 10);
+			fst_check_int_equals(ip.v6.s6_addr[0], 0xfe);
+			fst_check_int_equals(ip.v6.s6_addr[1], 0x80);
+			fst_check_int_equals(ip.v6.s6_addr[2], 0);
+			fst_check_int_equals(mask.v6.s6_addr[0], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[1], 0xc0);
+			fst_check_int_equals(mask.v6.s6_addr[2], 0);
+
+			fst_check(!switch_parse_cidr("::/0", &ip, &mask, &bits));
+			fst_check_int_equals(bits, 0);
+			fst_check_int_equals(ip.v6.s6_addr[0], 0);
+			fst_check_int_equals(ip.v6.s6_addr[1], 0);
+			fst_check_int_equals(ip.v6.s6_addr[2], 0);
+			fst_check_int_equals(mask.v6.s6_addr[0], 0);
+			fst_check_int_equals(mask.v6.s6_addr[1], 0);
+			fst_check_int_equals(mask.v6.s6_addr[2], 0);
+
+			fst_check(!switch_parse_cidr("::1/128", &ip, &mask, &bits));
+			fst_check_int_equals(bits, 128);
+			fst_check_int_equals(ip.v6.s6_addr[0], 0);
+			fst_check_int_equals(ip.v6.s6_addr[1], 0);
+			fst_check_int_equals(ip.v6.s6_addr[2], 0);
+			fst_check_int_equals(ip.v6.s6_addr[3], 0);
+			fst_check_int_equals(ip.v6.s6_addr[4], 0);
+			fst_check_int_equals(ip.v6.s6_addr[5], 0);
+			fst_check_int_equals(ip.v6.s6_addr[6], 0);
+			fst_check_int_equals(ip.v6.s6_addr[7], 0);
+			fst_check_int_equals(ip.v6.s6_addr[8], 0);
+			fst_check_int_equals(ip.v6.s6_addr[9], 0);
+			fst_check_int_equals(ip.v6.s6_addr[10], 0);
+			fst_check_int_equals(ip.v6.s6_addr[11], 0);
+			fst_check_int_equals(ip.v6.s6_addr[12], 0);
+			fst_check_int_equals(ip.v6.s6_addr[13], 0);
+			fst_check_int_equals(ip.v6.s6_addr[14], 0);
+			fst_check_int_equals(ip.v6.s6_addr[15], 1);
+			fst_check_int_equals(mask.v6.s6_addr[0], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[1], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[2], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[3], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[4], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[5], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[6], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[7], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[8], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[9], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[10], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[11], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[12], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[13], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[14], 0xff);
+			fst_check_int_equals(mask.v6.s6_addr[15], 0xff);
+		}
+		FST_TEST_END()
+
 #if ENABLE_SNPRINTFV_TESTS
 		FST_TEST_BEGIN(test_snprintfv_1)
 		{
@@ -95,6 +196,21 @@ FST_CORE_BEGIN("./conf")
 		FST_TEST_END()
 #endif
 
+		FST_TEST_BEGIN(test_switch_is_number_in_range)
+		{
+			fst_check_int_equals(switch_is_uint_in_range("x5", 0, 10), SWITCH_FALSE);
+			fst_check_int_equals(switch_is_uint_in_range("0", 1, 10), SWITCH_FALSE);
+			fst_check_int_equals(switch_is_uint_in_range("-11", -10, 10), SWITCH_FALSE);
+			fst_check_int_equals(switch_is_uint_in_range("-10", -10, 10), SWITCH_FALSE);
+			fst_check_int_equals(switch_is_uint_in_range("-5", -10, 10), SWITCH_FALSE);
+			fst_check_int_equals(switch_is_uint_in_range("-5", -10, 10), SWITCH_FALSE);
+			fst_check_int_equals(switch_is_uint_in_range("5", -10, 10), SWITCH_FALSE);
+			fst_check_int_equals(switch_is_uint_in_range("0", 0, 10), SWITCH_TRUE);
+			fst_check_int_equals(switch_is_uint_in_range("10", 0, 10), SWITCH_TRUE);
+			fst_check_int_equals(switch_is_uint_in_range("11", 0, 10), SWITCH_FALSE);
+		}
+		FST_TEST_END()
+
 		FST_TEST_BEGIN(test_md5)
 		{
 			char digest[SWITCH_MD5_DIGEST_STRING_SIZE] = { 0 };
@@ -416,6 +532,42 @@ FST_CORE_BEGIN("./conf")
 			fst_requires(hash == NULL);
 		}
 		FST_TEST_END()
+
+		FST_SESSION_BEGIN(test_switch_channel_get_variable_strdup)
+		{
+			const char *val;
+			switch_channel_t *channel = switch_core_session_get_channel(fst_session);
+
+			fst_check(channel);
+
+			switch_channel_set_variable(channel, "test_var", "test_value");
+
+			fst_check(!switch_channel_get_variable_strdup(channel, "test_var_does_not_exist"));
+
+			val = switch_channel_get_variable_strdup(channel, "test_var");
+
+			fst_check(val);
+			fst_check_string_equals(val, "test_value");
+
+			free((char *)val);
+		}
+		FST_SESSION_END()
+
+		FST_SESSION_BEGIN(test_switch_channel_get_variable_buf)
+		{
+			char buf[16] = { 0 };
+			switch_channel_t *channel = switch_core_session_get_channel(fst_session);
+
+			fst_check(channel);
+
+			switch_channel_set_variable(channel, "test_var", "test_value");
+
+			fst_check(switch_channel_get_variable_buf(channel, "test_var", buf, sizeof(buf)) == SWITCH_STATUS_SUCCESS);
+			fst_check_string_equals(buf, "test_value");
+
+			fst_check(switch_channel_get_variable_buf(channel, "test_var_does_not_exist", buf, sizeof(buf)) == SWITCH_STATUS_FALSE);
+		}
+		FST_SESSION_END()
 	}
 	FST_SUITE_END()
 }
diff --git a/tests/unit/switch_core_codec.c b/tests/unit/switch_core_codec.c
index 61a70314a4..2c499e1314 100644
--- a/tests/unit/switch_core_codec.c
+++ b/tests/unit/switch_core_codec.c
@@ -127,6 +127,32 @@ FST_CORE_BEGIN("./conf")
 
 		}
 		FST_TEST_END()
+
+		FST_TEST_BEGIN(test_mod_opus_switch_status_false)
+		{
+			signed char outbuf[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
+			uint32_t decoded_len = 0;
+			uint32_t decoded_rate = 48000;
+			unsigned int flags = 0;
+			switch_codec_t orig_codec = { 0 };
+			switch_status_t status;
+			switch_codec_settings_t codec_settings = { { 0 } };
+			status = switch_core_codec_init(&orig_codec,
+											"OPUS",
+											"mod_opus",
+											NULL,
+											48000,
+											20,
+											1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
+											&codec_settings, fst_pool);
+			fst_check(status == SWITCH_STATUS_SUCCESS);
+
+			status = switch_core_codec_decode(&orig_codec, NULL, "test", 5, 48000, outbuf, &decoded_len, &decoded_rate, &flags);
+			fst_check_int_equals(status, SWITCH_STATUS_FALSE);
+			switch_core_codec_destroy(&orig_codec);
+		}
+		FST_TEST_END()
+
 	}
 	FST_SUITE_END()
 }
diff --git a/tests/unit/switch_packetizer.c b/tests/unit/switch_packetizer.c
index 242ca6ae33..006af5a74b 100644
--- a/tests/unit/switch_packetizer.c
+++ b/tests/unit/switch_packetizer.c
@@ -52,6 +52,7 @@ FST_CORE_BEGIN("conf")
 
 			frame.data = data;
 			frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
+			frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
 			switch_set_flag(&frame, SFF_ENCODED);
 
 			status = switch_packetizer_feed(packetizer, h264data, sizeof(h264data));
@@ -94,6 +95,7 @@ FST_CORE_BEGIN("conf")
 
 			frame.data = data;
 			frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
+			frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
 			switch_set_flag(&frame, SFF_ENCODED);
 
 			status = switch_packetizer_feed(packetizer, h264data, sizeof(h264data));
@@ -138,6 +140,7 @@ FST_CORE_BEGIN("conf")
 //																	1 fps       3 bytes                 1pps        3 bytes
 			frame.data = data;
 			frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
+			frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
 			switch_set_flag(&frame, SFF_ENCODED);
 
 			status = switch_packetizer_feed_extradata(packetizer, extradata, sizeof(extradata));
@@ -210,6 +213,7 @@ FST_CORE_BEGIN("conf")
 
 			frame.data = data;
 			frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
+			frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
 			switch_set_flag(&frame, SFF_ENCODED);
 
 			status = switch_packetizer_feed(packetizer, h264data, sizeof(h264data));
diff --git a/tests/unit/switch_rtp.c b/tests/unit/switch_rtp.c
index 48c0f80d6b..7d22524358 100644
--- a/tests/unit/switch_rtp.c
+++ b/tests/unit/switch_rtp.c
@@ -187,7 +187,7 @@ FST_TEARDOWN_END()
 		 
 		switch_core_media_prepare_codecs(session, SWITCH_FALSE);
 		   
-		match = switch_core_media_negotiate_sdp(session, r_sdp, &p, SDP_TYPE_REQUEST);
+		match = switch_core_media_negotiate_sdp(session, r_sdp, &p, SDP_OFFER);
 		fst_requires(match == 1);
 
 		status = switch_core_media_choose_ports(session, SWITCH_TRUE, SWITCH_FALSE);
diff --git a/tests/unit/switch_rtp_pcap.c b/tests/unit/switch_rtp_pcap.c
index 647e481c8e..eb4993a616 100644
--- a/tests/unit/switch_rtp_pcap.c
+++ b/tests/unit/switch_rtp_pcap.c
@@ -206,7 +206,7 @@ static switch_status_t rtp_test_start_call(switch_core_session_t **psession)
 		return SWITCH_STATUS_FALSE;
 	}
 	   
-	match = switch_core_media_negotiate_sdp(session, r_sdp, &p, SDP_TYPE_REQUEST);
+	match = switch_core_media_negotiate_sdp(session, r_sdp, &p, SDP_OFFER);
 	if (match != 1) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "switch_core_media_negotiate_sdp() failed\n");
 		return SWITCH_STATUS_FALSE;
diff --git a/tests/unit/switch_utils.c b/tests/unit/switch_utils.c
index 1fc291ea96..391ec6e8e6 100644
--- a/tests/unit/switch_utils.c
+++ b/tests/unit/switch_utils.c
@@ -80,6 +80,49 @@ FST_TEST_BEGIN(b64)
 }
 FST_TEST_END()
 
+FST_TEST_BEGIN(b64_pad2)
+{
+    switch_size_t size;
+    char str[] = {0, 0, 0, 0};
+    unsigned char b64_str[128];
+    char decoded_str[128];
+	int i;
+    switch_status_t status = switch_b64_encode((unsigned char *)str, sizeof(str), b64_str, sizeof(b64_str));
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "b64_str: %s\n", b64_str);
+    fst_check(status == SWITCH_STATUS_SUCCESS);
+    fst_check_string_equals((const char *)b64_str, "AAAAAA==");
+
+    size = switch_b64_decode((const char *)b64_str, decoded_str, sizeof(decoded_str));
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "decoded_str: %s\n", decoded_str);
+    fst_check_string_equals(decoded_str, str);
+    fst_check(size == sizeof(str) + 1);
+	for (i = 0; i < sizeof(str); i++) {
+		fst_check(decoded_str[i] == str[i]);
+	}
+}
+FST_TEST_END()
+
+FST_TEST_BEGIN(b64_pad1)
+{
+    switch_size_t size;
+    char str[] = {0, 0, 0, 0, 0};
+    unsigned char b64_str[128];
+    char decoded_str[128];
+	int i;
+    switch_status_t status = switch_b64_encode((unsigned char *)str, sizeof(str), b64_str, sizeof(b64_str));
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "b64_str: %s\n", b64_str);
+    fst_check(status == SWITCH_STATUS_SUCCESS);
+    fst_check_string_equals((const char *)b64_str, "AAAAAAA=");
+
+    size = switch_b64_decode((const char *)b64_str, decoded_str, sizeof(decoded_str));
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "decoded_str: %s\n", decoded_str);
+    fst_check_string_equals(decoded_str, str);
+    fst_check(size == sizeof(str) + 1);
+		for (i = 0; i < sizeof(str); i++) {
+		fst_check(decoded_str[i] == str[i]);
+	}
+}
+FST_TEST_END()
 
 FST_SUITE_END()
 
diff --git a/tests/unit/test.sh b/tests/unit/test.sh
index 89711ca99b..c77fe5592d 100755
--- a/tests/unit/test.sh
+++ b/tests/unit/test.sh
@@ -1,4 +1,14 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+### shfmt -w -s -ci -sr -kp -fn tests/unit/run-tests.sh
+
+#------------------------------------------------------------------------------
+# Test Execution Script
+# Executes unit tests and handles test logs and core dumps
+#------------------------------------------------------------------------------
+
+# Initialize timing
+start_time=$(date +%s)
 
 # All output will be collected here
 TESTSUNITPATH=$PWD
@@ -6,43 +16,74 @@ TESTSUNITPATH=$PWD
 # All relative paths are based on the tree's root
 FSBASEDIR=$(realpath "$PWD/../../")
 
+# Set system limits
+ulimit -c unlimited
+ulimit -a
+
+# Get test identifier from argument
 i=$1
 
-echo "----------------------------------" ;
-echo "Starting test: $i" ;
-echo "----------------------------------" ;
+echo ""
+echo "Starting test: $i"
+echo ""
 
 # Change folder to where the test is
 currenttestpath="$FSBASEDIR/$i"
-cd $(dirname "$currenttestpath")
+cd "$(dirname "$currenttestpath")"
 
 # Tests are unique per module, so need to distinguish them by their directory
 relativedir=$(dirname "$i")
 echo "Relative dir is $relativedir"
 
+# Set up log file path
 file=$(basename -- "$currenttestpath")
-log="$TESTSUNITPATH/log_run-tests_${relativedir//\//!}!$file.html";
+log="$TESTSUNITPATH/log_run-tests_${relativedir//\//!}!$file.html"
 
 # Execute the test
 echo "Start executing $currenttestpath"
-$currenttestpath 2>&1 | tee >(ansi2html > $log) ;
-exitstatus=${PIPESTATUS[0]} ;
+$currenttestpath 2>&1 | tee >(ansi2html > "$log")
+exitstatus=${PIPESTATUS[0]}
 echo "End executing $currenttestpath"
+
+# Record execution time
+end_time=$(date +%s)
+duration=$((end_time - start_time))
+echo "Test $1 took $duration seconds" >> test_times.log
 echo "Exit status is $exitstatus"
 
-if [ "0" -eq $exitstatus ] ; then
-	rm $log ;
+# Handle test results
+if [ "0" -eq "$exitstatus" ]; then
+	rm "$log"
 else
-	echo "*** ./$i exit status is $exitstatus" ;
-	corefilesearch=/cores/core.*.!drone!src!${relativedir//\//!}!.libs!$file.* ;
-	echo $corefilesearch ;
+	echo "*** ./$i exit status is $exitstatus"
+
+	# Search for core dumps
+	corefilesearch="/cores/core.*.!__w!freeswitch!freeswitch!${relativedir//\//!}!.libs!$file.*"
+	echo "$corefilesearch"
+
 	if ls $corefilesearch 1> /dev/null 2>&1; then
-	    echo "coredump found";
-	    coredump=$(ls $corefilesearch) ;
-	    echo $coredump;
-	    echo "set logging file $TESTSUNITPATH/backtrace_${i//\//!}.txt" ;
-	    gdb -ex "set logging file $TESTSUNITPATH/backtrace_${i//\//!}.txt" -ex "set logging on" -ex "set pagination off" -ex "bt full" -ex "bt" -ex "info threads" -ex "thread apply all bt" -ex "thread apply all bt full" -ex "quit" /drone/src/$relativedir/.libs/$file $coredump ;
-	fi ;
-	echo "*** $log was saved" ;
-fi ;
-echo "----------------" ;
+		echo "coredump found"
+		coredump=$(ls $corefilesearch)
+		echo "$coredump"
+
+		# Generate backtrace using GDB
+		gdb \
+			-ex "set logging file $TESTSUNITPATH/backtrace_${i//\//!}.txt" \
+			-ex "set logging on" \
+			-ex "set pagination off" \
+			-ex "bt full" \
+			-ex "bt" \
+			-ex "info threads" \
+			-ex "thread apply all bt" \
+			-ex "thread apply all bt full" \
+			-ex "quit" \
+			"$FSBASEDIR/$relativedir/.libs/$file" \
+			"$coredump"
+	fi
+
+	echo "*** $log was saved"
+
+	exit $exitstatus
+fi
+
+echo ""
diff --git a/tests/unit/test_switch_core.2017.vcxproj b/tests/unit/test_switch_core.2017.vcxproj
index c9e1cd5423..453e4a6bb8 100644
--- a/tests/unit/test_switch_core.2017.vcxproj
+++ b/tests/unit/test_switch_core.2017.vcxproj
@@ -22,7 +22,7 @@
     <ProjectName>test_switch_core</ProjectName>
     <RootNamespace>test_switch_core</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectGuid>{EF62B845-A0CE-44FD-B8E6-475FE87D06C3}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/tests/unit/test_switch_core_codec.2017.vcxproj b/tests/unit/test_switch_core_codec.2017.vcxproj
new file mode 100644
index 0000000000..9c30374327
--- /dev/null
+++ b/tests/unit/test_switch_core_codec.2017.vcxproj
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>test_switch_core_codec</ProjectName>
+    <RootNamespace>test_switch_core_codec</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectGuid>{589A07E7-5DE5-49FD-A62C-27795B806AFB}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(SolutionDir)w32\openssl.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)w32\winlibs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)w32\winlibs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)w32\winlibs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)w32\winlibs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SWITCH_TEST_BASE_DIR_FOR_CONF="..\\..\\tests\\unit\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog />
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>6031;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog />
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>6031;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog />
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>6031;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog />
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>6031;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="switch_core_codec.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SolutionDir)w32\Library\FreeSwitchCore.2017.vcxproj">
+      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/unit/test_switch_core_db.2017.vcxproj b/tests/unit/test_switch_core_db.2017.vcxproj
index 9a419d556d..956e708977 100644
--- a/tests/unit/test_switch_core_db.2017.vcxproj
+++ b/tests/unit/test_switch_core_db.2017.vcxproj
@@ -22,7 +22,7 @@
     <ProjectName>test_switch_core_db</ProjectName>
     <RootNamespace>test_switch_core_db</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectGuid>{580675D7-C1C9-4197-AAC5-00F64FAFDE78}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/tests/unit/test_switch_ivr_originate.2017.vcxproj b/tests/unit/test_switch_ivr_originate.2017.vcxproj
index 78769a0b36..6ca24a11bb 100644
--- a/tests/unit/test_switch_ivr_originate.2017.vcxproj
+++ b/tests/unit/test_switch_ivr_originate.2017.vcxproj
@@ -22,7 +22,7 @@
     <ProjectName>test_switch_ivr_originate</ProjectName>
     <RootNamespace>test_switch_ivr_originate</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectGuid>{69A7464A-9B0D-4804-A108-835229DACF58}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/tests/unit/test_tts_format.2017.vcxproj b/tests/unit/test_tts_format.2017.vcxproj
new file mode 100644
index 0000000000..ddaf9a02f9
--- /dev/null
+++ b/tests/unit/test_tts_format.2017.vcxproj
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>test_tts_format</ProjectName>
+    <RootNamespace>test_tts_format</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectGuid>{3745B86B-6BE8-3E67-FCB9-BE62A6131D67}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)w32\winlibs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)w32\winlibs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)w32\winlibs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)w32\winlibs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SWITCH_TEST_BASE_DIR_FOR_CONF="..\\..\\tests\\unit\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog />
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>6031;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog />
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>6031;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog />
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>6031;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog />
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>6031;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="test_tts_format.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SolutionDir)w32\Library\FreeSwitchCore.2017.vcxproj">
+      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/mod/formats/mod_ssml/test/test_tts_format.c b/tests/unit/test_tts_format.c
similarity index 96%
rename from src/mod/formats/mod_ssml/test/test_tts_format.c
rename to tests/unit/test_tts_format.c
index d3edaf6300..f7c801ec2e 100644
--- a/src/mod/formats/mod_ssml/test/test_tts_format.c
+++ b/tests/unit/test_tts_format.c
@@ -31,9 +31,8 @@
 #include <switch.h>
 #include <test/switch_test.h>
 
-FST_CORE_BEGIN(".")
-
-FST_MODULE_BEGIN(mod_ssml, test_tts_format)
+FST_CORE_BEGIN("./conf_tts_format")
+FST_SUITE_BEGIN(test_tts_format)
 
 FST_SETUP_BEGIN()
 {
@@ -61,6 +60,5 @@ FST_SESSION_BEGIN(tts_channel_uuid)
 }
 FST_SESSION_END()
 
-FST_MODULE_END()
-
+FST_SUITE_END()
 FST_CORE_END()
diff --git a/w32/Library/FreeSwitchCore.2017.vcxproj b/w32/Library/FreeSwitchCore.2017.vcxproj
index 2f7a3239bd..dbb0d5b7d1 100644
--- a/w32/Library/FreeSwitchCore.2017.vcxproj
+++ b/w32/Library/FreeSwitchCore.2017.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}</ProjectGuid>
     <RootNamespace>FreeSwitchCoreLib</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
diff --git a/w32/Setup/Setup.2017.wixproj b/w32/Setup/Setup.2017.wixproj
index dd745e8438..afb0177b2c 100644
--- a/w32/Setup/Setup.2017.wixproj
+++ b/w32/Setup/Setup.2017.wixproj
@@ -13,7 +13,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>FreeSWITCH</OutputName>
     <OutputType>Package</OutputType>
-    <CertificateThumbprint>bf386393c880967b00adbc438aee534de6211774</CertificateThumbprint>
+    <CertificateThumbprint>076ce3c57198fc39443bd87f4aab86dac0aab62d</CertificateThumbprint>
     <TimestampUrl>http://timestamp.comodoca.com</TimestampUrl>
     <SignToolPath Condition=" Exists('$(WindowsSDK80Path)bin\x86\signtool.exe') and '$(SignToolPath)'=='' and '$(PROCESSOR_ARCHITECTURE)'=='x86' ">$(WindowsSDK80Path)bin\x86\signtool.exe</SignToolPath>
     <SignToolPath Condition=" Exists('$(WindowsSDK80Path)bin\x64\signtool.exe') and '$(SignToolPath)'=='' and '$(PROCESSOR_ARCHITECTURE)'=='AMD64' ">$(WindowsSDK80Path)bin\x64\signtool.exe</SignToolPath>
@@ -89,14 +89,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\mod\applications\mod_abstraction\mod_abstraction.2017.vcxproj">
-      <Name>mod_abstraction</Name>
-      <Project>{60c542ee-6882-4ea2-8c21-5ab6db1ba73f}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\applications\mod_avmd\mod_avmd.2017.vcxproj">
       <Name>mod_avmd</Name>
       <Project>{990baa76-89d3-4e38-8479-c7b28784efc8}</Project>
@@ -297,14 +289,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\mod\applications\mod_rss\mod_rss.2017.vcxproj">
-      <Name>mod_rss</Name>
-      <Project>{b69247fa-ecd6-40ed-8e44-5ca6c3baf9a4}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\applications\mod_signalwire\mod_signalwire.2017.vcxproj">
       <Name>mod_signalwire</Name>
       <Project>{b19ae6fc-bfff-428d-b483-3bbeaeccc618}</Project>
@@ -321,14 +305,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\mod\applications\mod_snom\mod_snom.2017.vcxproj">
-      <Name>mod_snom</Name>
-      <Project>{2a3d00c6-588d-4e86-81ac-9ef5ede86e03}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\applications\mod_spandsp\mod_spandsp.2017.vcxproj">
       <Name>mod_spandsp</Name>
       <Project>{1e21afe0-6fdb-41d2-942d-863607c24b91}</Project>
@@ -425,14 +401,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\mod\codecs\mod_h26x\mod_h26x.2017.vcxproj">
-      <Name>mod_h26x</Name>
-      <Project>{2c3c2423-234b-4772-8899-d3b137e5ca35}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\codecs\mod_ilbc\mod_ilbc.2017.vcxproj">
       <Name>mod_ilbc</Name>
       <Project>{d3ec0aff-76fc-4210-a825-9a17410660a3}</Project>
@@ -441,14 +409,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\mod\codecs\mod_isac\mod_iSAC.2017.vcxproj">
-      <Name>mod_iSAC</Name>
-      <Project>{7f1610f1-dd5a-4cf7-8610-30ab12c60add}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\codecs\mod_opus\mod_opus.2017.vcxproj">
       <Name>mod_opus</Name>
       <Project>{64e99cca-3c6f-4aeb-9fa3-cfac711257bb}</Project>
@@ -521,14 +481,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\mod\endpoints\mod_gsmopen\mod_gsmopen.2017.vcxproj">
-      <Name>mod_gsmopen</Name>
-      <Project>{74b120ff-6935-4dfe-a142-cdb6bea99c90}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\endpoints\mod_loopback\mod_loopback.2017.vcxproj">
       <Name>mod_loopback</Name>
       <Project>{b3f424ec-3d8f-417c-b244-3919d5e1a577}</Project>
@@ -537,14 +489,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\mod\endpoints\mod_portaudio\mod_PortAudio.2017.vcxproj">
-      <Name>mod_PortAudio</Name>
-      <Project>{5fd31a25-5d83-4794-8bee-904dad84ce71}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\endpoints\mod_rtc\mod_rtc.2017.vcxproj">
       <Name>mod_rtc</Name>
       <Project>{3884add2-91d0-4cd6-86d3-d5fb2d4aab9e}</Project>
@@ -1032,6 +976,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHConfFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1045,6 +990,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHSoundFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1058,6 +1004,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHhtdocsFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1071,6 +1018,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHimagesFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1084,6 +1032,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHfontsFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1097,6 +1046,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHgrammarFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1111,6 +1061,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHBaseDir">
     </HeatDirectory>
   </Target>
diff --git a/w32/Setup/inno_setup/fscomm.iss b/w32/Setup/inno_setup/fscomm.iss
index 56c28874eb..6e21f8caa3 100644
--- a/w32/Setup/inno_setup/fscomm.iss
+++ b/w32/Setup/inno_setup/fscomm.iss
@@ -66,7 +66,6 @@ Source: {#FreeSWITCH_32bit}\mod\mod_event_socket.dll; DestDir: {app}\mod; Flags:
 Source: {#FreeSWITCH_32bit}\mod\mod_ilbc.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode
 Source: {#FreeSWITCH_32bit}\mod\mod_local_stream.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode
 Source: {#FreeSWITCH_32bit}\mod\mod_loopback.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode
-Source: {#FreeSWITCH_32bit}\mod\mod_PortAudio.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode
 Source: {#FreeSWITCH_32bit}\mod\mod_siren.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode
 Source: {#FreeSWITCH_32bit}\mod\mod_sndfile.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode
 Source: {#FreeSWITCH_32bit}\mod\mod_sofia.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode
diff --git a/w32/download_LDNS.props b/w32/download_LDNS.props
index 445fe9a2b9..0036e1f278 100644
--- a/w32/download_LDNS.props
+++ b/w32/download_LDNS.props
@@ -29,7 +29,7 @@
 
   <Target Name="LDNSDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
       <DownloadPackageTask
-           package="http://files.freeswitch.org/downloads/libs/ldns-1.6.9-1-win.tar.gz"
+           package="http://files.freeswitch.org/downloads/libs/ldns-1.6.9-2-win.tar.gz"
            expectfileordirectory="$(BaseDir)libs\ldns\configure.ac"
            outputfolder=""
            outputfilename=""
diff --git a/w32/download_portaudio.props b/w32/download_portaudio.props
deleted file mode 100644
index 8a9b16049e..0000000000
--- a/w32/download_portaudio.props
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
-  </ImportGroup>
-  <PropertyGroup>
-    <downloadportaudioPropsImported>true</downloadportaudioPropsImported>
-  </PropertyGroup>
-
-  <!--
-       Download Target.
-       Name must be unique.
-       By design, targets are executed only once per project.
-
-       Usage:
-
-       package: URI
-
-       expectfileordirectory: Skips the download and extraction if exists
-
-       outputfolder: Folder to store a downloaded file.
-                     By default "$(BaseDir)libs", if empty
-
-       outputfilename: If not empty, overrides filename from URI.
-                       .exe files don't get extracted
-
-       extractto: Folder to extract an archive to
-   -->
-
-  <Target Name="portaudioDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
-      <DownloadPackageTask
-           package="http://files.freeswitch.org/downloads/libs/pa_stable_v19_20140130.tar.gz"
-           expectfileordirectory="$(BaseDir)libs\portaudio\Makefile.in"
-           outputfolder=""
-           outputfilename=""
-           extractto="$(BaseDir)libs\"
-      />
-  </Target>
-
-</Project>
diff --git a/w32/download_spandsp.props b/w32/download_spandsp.props
index 39b7f2b81b..f02c66a9bd 100644
--- a/w32/download_spandsp.props
+++ b/w32/download_spandsp.props
@@ -29,7 +29,7 @@
 
   <Target Name="SpandspDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
       <DownloadPackageTask
-           package="https://github.com/freeswitch/spandsp/archive/master.zip"
+           package="https://github.com/freeswitch/spandsp/archive/0d2e6ac65e0e8f53d652665a743015a88bf048d4.zip"
            expectfileordirectory="$(BaseDir)libs\spandsp\configure.ac"
            outputfolder=""
            outputfilename="spandsp-$(SpandspVersion).zip"
diff --git a/w32/ffmpeg-version.props b/w32/ffmpeg-version.props
index 012af42ccb..5e4a400557 100644
--- a/w32/ffmpeg-version.props
+++ b/w32/ffmpeg-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <ffmpegVersion>4.1</ffmpegVersion>
+    <ffmpegVersion>5.1.3</ffmpegVersion>
   </PropertyGroup>
   <PropertyGroup>
     <ffmpegVersionImported>true</ffmpegVersionImported>
diff --git a/w32/ffmpeg.props b/w32/ffmpeg.props
index fe039de408..775b588e4c 100644
--- a/w32/ffmpeg.props
+++ b/w32/ffmpeg.props
@@ -21,7 +21,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(ffmpegDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Bcrypt.lib;Secur32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Bcrypt.lib;Secur32.lib;Mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies Condition="'$(Configuration)'=='Debug-openh264' OR '$(Configuration)'=='Release-openh264'">openh264.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
diff --git a/w32/libks-version.props b/w32/libks-version.props
index 44246b4d90..9e013ef808 100644
--- a/w32/libks-version.props
+++ b/w32/libks-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <libksVersion>1.8.2</libksVersion>
+    <libksVersion>2.0.0</libksVersion>
     <libksBuildNumber>1</libksBuildNumber>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/w32/libks.props b/w32/libks.props
index fb7a82f200..df0b9721f3 100644
--- a/w32/libks.props
+++ b/w32/libks.props
@@ -37,7 +37,7 @@
   <Target Name="libksBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
            package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
-           expectfileordirectory="$(libksDir)\binaries\$(Platform)\$(Configuration)\ks.dll" 
+           expectfileordirectory="$(libksDir)\binaries\$(Platform)\$(Configuration)\ks2.dll" 
            outputfolder=""
            outputfilename="" 
            extractto="$(BaseDir)libs\"
@@ -46,7 +46,7 @@
   <Target Name="libksHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
            package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip"
-           expectfileordirectory="$(libksDir)\src\include\libks\ks.h" 
+           expectfileordirectory="$(libksDir)\libks\src\include\libks\ks.h" 
            outputfolder=""
            outputfilename="" 
            extractto="$(BaseDir)libs\"
@@ -58,7 +58,7 @@
         <ItemGroup>  
              <libksFiles Include="$(libksDir)\binaries\$(Platform)\$(Configuration)\*.dll"/>  
         </ItemGroup>  
-        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\ks.dll')"
+        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\ks2.dll')"
             SourceFiles="@(libksFiles)"  
             DestinationFiles="@(libksFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"  
         />  
@@ -67,12 +67,12 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(libksDir)\src\include;$(libksDir)\src\include\libks;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__PRETTY_FUNCTION__=__FUNCSIG__;WIN32;_WINDOWS;SWCLT_VERSION_MAJOR=1;SWCLT_VERSION_MINOR=0;SWCLT_VERSION_REVISION=0;_WIN32_WINNT=0x0600;_WINSOCK_DEPRECATED_NO_WARNINGS=1;WIN32_LEAN_AND_MEAN=1;KS_PLAT_WIN=1;NOMAXMIN=1;_CRT_SECURE_NO_WARNINGS=1;SWCLT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(libksDir)\libks\src\include;$(libksDir)\libks\src\include\libks;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__KS_FUNC__=__FUNCSIG__;WIN32;_WINDOWS;SWCLT_VERSION_MAJOR=1;SWCLT_VERSION_MINOR=0;SWCLT_VERSION_REVISION=0;_WIN32_WINNT=0x0600;_WINSOCK_DEPRECATED_NO_WARNINGS=1;WIN32_LEAN_AND_MEAN=1;KS_PLAT_WIN=1;NOMAXMIN=1;_CRT_SECURE_NO_WARNINGS=1;SWCLT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(libksDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>ks.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ks2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/w32/signalwire-client-c-version.props b/w32/signalwire-client-c-version.props
index 337dc4cc19..db6eb873cb 100644
--- a/w32/signalwire-client-c-version.props
+++ b/w32/signalwire-client-c-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <signalwire-client-cVersion>1.3.2</signalwire-client-cVersion>
+    <signalwire-client-cVersion>2.0.0</signalwire-client-cVersion>
     <signalwire-client-cBuildNumber>1</signalwire-client-cBuildNumber>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/w32/signalwire-client-c.props b/w32/signalwire-client-c.props
index 4d5f917b7e..df82dff00e 100644
--- a/w32/signalwire-client-c.props
+++ b/w32/signalwire-client-c.props
@@ -35,7 +35,7 @@
   <Target Name="signalwire-client-cBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
            package="http://files.freeswitch.org/windows/packages/signalwire-client-c/$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
-           expectfileordirectory="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\signalwire_client.dll" 
+           expectfileordirectory="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\signalwire_client2.dll" 
            outputfolder=""
            outputfilename="" 
            extractto="$(BaseDir)libs\"
@@ -56,7 +56,7 @@
         <ItemGroup>  
              <signalwire-client-cFiles Include="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\*.dll"/>  
         </ItemGroup>  
-        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\signalwire_client.dll')"
+        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\signalwire_client2.dll')"
             SourceFiles="@(signalwire-client-cFiles)"  
             DestinationFiles="@(signalwire-client-cFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"  
         />  
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>signalwire_client.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>signalwire_client2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/w32/spandsp-version.props b/w32/spandsp-version.props
index 7d9cd1cc59..214805b0bf 100644
--- a/w32/spandsp-version.props
+++ b/w32/spandsp-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <SpandspVersion>master</SpandspVersion>
+    <SpandspVersion>0d2e6ac65e0e8f53d652665a743015a88bf048d4</SpandspVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SpandspVersionImported>true</SpandspVersionImported>